Skip to content

Commit 6eb1e76

Browse files
rleonmszyprow
authored andcommitted
kmsan: convert kmsan_handle_dma to use physical addresses
Convert the KMSAN DMA handling function from page-based to physical address-based interface. The refactoring renames kmsan_handle_dma() parameters from accepting (struct page *page, size_t offset, size_t size) to (phys_addr_t phys, size_t size). The existing semantics where callers are expected to provide only kmap memory is continued here. Reviewed-by: Jason Gunthorpe <jgg@nvidia.com> Signed-off-by: Leon Romanovsky <leonro@nvidia.com> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Link: https://lore.kernel.org/r/3557cbaf66e935bc794f37d2b891ef75cbf2c80c.1757423202.git.leonro@nvidia.com
1 parent e53d29f commit 6eb1e76

File tree

5 files changed

+15
-13
lines changed

5 files changed

+15
-13
lines changed

drivers/virtio/virtio_ring.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ static int vring_map_one_sg(const struct vring_virtqueue *vq, struct scatterlist
378378
* is initialized by the hardware. Explicitly check/unpoison it
379379
* depending on the direction.
380380
*/
381-
kmsan_handle_dma(sg_page(sg), sg->offset, sg->length, direction);
381+
kmsan_handle_dma(sg_phys(sg), sg->length, direction);
382382
*addr = (dma_addr_t)sg_phys(sg);
383383
return 0;
384384
}
@@ -3157,7 +3157,7 @@ dma_addr_t virtqueue_dma_map_single_attrs(struct virtqueue *_vq, void *ptr,
31573157
struct vring_virtqueue *vq = to_vvq(_vq);
31583158

31593159
if (!vq->use_dma_api) {
3160-
kmsan_handle_dma(virt_to_page(ptr), offset_in_page(ptr), size, dir);
3160+
kmsan_handle_dma(virt_to_phys(ptr), size, dir);
31613161
return (dma_addr_t)virt_to_phys(ptr);
31623162
}
31633163

include/linux/kmsan.h

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,7 @@ void kmsan_iounmap_page_range(unsigned long start, unsigned long end);
182182

183183
/**
184184
* kmsan_handle_dma() - Handle a DMA data transfer.
185-
* @page: first page of the buffer.
186-
* @offset: offset of the buffer within the first page.
185+
* @phys: physical address of the buffer.
187186
* @size: buffer size.
188187
* @dir: one of possible dma_data_direction values.
189188
*
@@ -192,7 +191,7 @@ void kmsan_iounmap_page_range(unsigned long start, unsigned long end);
192191
* * initializes the buffer, if it is copied from device;
193192
* * does both, if this is a DMA_BIDIRECTIONAL transfer.
194193
*/
195-
void kmsan_handle_dma(struct page *page, size_t offset, size_t size,
194+
void kmsan_handle_dma(phys_addr_t phys, size_t size,
196195
enum dma_data_direction dir);
197196

198197
/**
@@ -372,8 +371,8 @@ static inline void kmsan_iounmap_page_range(unsigned long start,
372371
{
373372
}
374373

375-
static inline void kmsan_handle_dma(struct page *page, size_t offset,
376-
size_t size, enum dma_data_direction dir)
374+
static inline void kmsan_handle_dma(phys_addr_t phys, size_t size,
375+
enum dma_data_direction dir)
377376
{
378377
}
379378

kernel/dma/mapping.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,8 @@ dma_addr_t dma_map_page_attrs(struct device *dev, struct page *page,
172172
addr = iommu_dma_map_phys(dev, phys, size, dir, attrs);
173173
else
174174
addr = ops->map_page(dev, page, offset, size, dir, attrs);
175-
kmsan_handle_dma(page, offset, size, dir);
175+
176+
kmsan_handle_dma(phys, size, dir);
176177
trace_dma_map_phys(dev, phys, addr, size, dir, attrs);
177178
debug_dma_map_phys(dev, phys, size, dir, addr, attrs);
178179

mm/kmsan/hooks.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -336,14 +336,16 @@ static void kmsan_handle_dma_page(const void *addr, size_t size,
336336
}
337337

338338
/* Helper function to handle DMA data transfers. */
339-
void kmsan_handle_dma(struct page *page, size_t offset, size_t size,
339+
void kmsan_handle_dma(phys_addr_t phys, size_t size,
340340
enum dma_data_direction dir)
341341
{
342-
u64 page_offset, to_go, addr;
342+
struct page *page = phys_to_page(phys);
343+
u64 page_offset, to_go;
344+
void *addr;
343345

344-
if (PageHighMem(page))
346+
if (PhysHighMem(phys))
345347
return;
346-
addr = (u64)page_address(page) + offset;
348+
addr = page_to_virt(page);
347349
/*
348350
* The kernel may occasionally give us adjacent DMA pages not belonging
349351
* to the same allocation. Process them separately to avoid triggering

tools/virtio/linux/kmsan.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#include <linux/gfp.h>
66

7-
inline void kmsan_handle_dma(struct page *page, size_t offset, size_t size,
7+
inline void kmsan_handle_dma(phys_addr_t phys, size_t size,
88
enum dma_data_direction dir)
99
{
1010
}

0 commit comments

Comments
 (0)