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

diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index f5062061c40843c3fa6431dc4f8d30586bd45f5e..c147145a65930bca9d12f8a31ee32d7cc03f8836 100644 (file)
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -378,7 +378,7 @@ static int vring_map_one_sg(const struct vring_virtqueue *vq, struct scatterlist
                 * is initialized by the hardware. Explicitly check/unpoison it
                 * depending on the direction.
                 */
-               kmsan_handle_dma(sg_page(sg), sg->offset, sg->length, direction);
+               kmsan_handle_dma(sg_phys(sg), sg->length, direction);
                *addr = (dma_addr_t)sg_phys(sg);
                return 0;
        }
@@ -3157,7 +3157,7 @@ dma_addr_t virtqueue_dma_map_single_attrs(struct virtqueue *_vq, void *ptr,
        struct vring_virtqueue *vq = to_vvq(_vq);
 
        if (!vq->use_dma_api) {
-               kmsan_handle_dma(virt_to_page(ptr), offset_in_page(ptr), size, dir);
+               kmsan_handle_dma(virt_to_phys(ptr), size, dir);
                return (dma_addr_t)virt_to_phys(ptr);
        }
 

diff --git a/include/linux/kmsan.h b/include/linux/kmsan.h
index 2b1432cc16d5970dc541fb41734cbaf3672eaba6..f2fd221107bbaa177a6bfd609f44cfdf74545a9a 100644 (file)
--- a/include/linux/kmsan.h
+++ b/include/linux/kmsan.h
@@ -182,8 +182,7 @@ void kmsan_iounmap_page_range(unsigned long start, unsigned long end);
 
 /**
  * kmsan_handle_dma() - Handle a DMA data transfer.
- * @page:   first page of the buffer.
- * @offset: offset of the buffer within the first page.
+ * @phys:   physical address of the buffer.
  * @size:   buffer size.
  * @dir:    one of possible dma_data_direction values.
  *
@@ -192,7 +191,7 @@ void kmsan_iounmap_page_range(unsigned long start, unsigned long end);
  * * initializes the buffer, if it is copied from device;
  * * does both, if this is a DMA_BIDIRECTIONAL transfer.
  */
-void kmsan_handle_dma(struct page *page, size_t offset, size_t size,
+void kmsan_handle_dma(phys_addr_t phys, size_t size,
                      enum dma_data_direction dir);
 
 /**
@@ -372,8 +371,8 @@ static inline void kmsan_iounmap_page_range(unsigned long start,
 {
 }
 
-static inline void kmsan_handle_dma(struct page *page, size_t offset,
-                                   size_t size, enum dma_data_direction dir)
+static inline void kmsan_handle_dma(phys_addr_t phys, size_t size,
+                                   enum dma_data_direction dir)
 {
 }
 

diff --git a/kernel/dma/mapping.c b/kernel/dma/mapping.c
index 3ac7d15e095f9355577c7ba9a6084149251a16b9..e47bcf7cc43d74401465ac0f6b6eef358d2c50d8 100644 (file)
--- a/kernel/dma/mapping.c
+++ b/kernel/dma/mapping.c
@@ -172,7 +172,8 @@ dma_addr_t dma_map_page_attrs(struct device *dev, struct page *page,
                addr = iommu_dma_map_phys(dev, phys, size, dir, attrs);
        else
                addr = ops->map_page(dev, page, offset, size, dir, attrs);
-       kmsan_handle_dma(page, offset, size, dir);
+
+       kmsan_handle_dma(phys, size, dir);
        trace_dma_map_phys(dev, phys, addr, size, dir, attrs);
        debug_dma_map_phys(dev, phys, size, dir, addr, attrs);
 

diff --git a/mm/kmsan/hooks.c b/mm/kmsan/hooks.c
index 97de3d6194f075913446ae980ede7e64179b9c09..fa9475e5ec4e9c81f1996b3e90fa6654d09b1643 100644 (file)
--- a/mm/kmsan/hooks.c
+++ b/mm/kmsan/hooks.c
@@ -336,14 +336,16 @@ static void kmsan_handle_dma_page(const void *addr, size_t size,
 }
 
 /* Helper function to handle DMA data transfers. */
-void kmsan_handle_dma(struct page *page, size_t offset, size_t size,
+void kmsan_handle_dma(phys_addr_t phys, size_t size,
                      enum dma_data_direction dir)
 {
-       u64 page_offset, to_go, addr;
+       struct page *page = phys_to_page(phys);
+       u64 page_offset, to_go;
+       void *addr;
 
-       if (PageHighMem(page))
+       if (PhysHighMem(phys))
                return;
-       addr = (u64)page_address(page) + offset;
+       addr = page_to_virt(page);
        /*
         * The kernel may occasionally give us adjacent DMA pages not belonging
         * to the same allocation. Process them separately to avoid triggering

diff --git a/tools/virtio/linux/kmsan.h b/tools/virtio/linux/kmsan.h
index 272b5aa285d5a14053ba1f36063f4c1b8d618daf..6cd2e3efd03dc69da2ff915168fe6ce87ba97e18 100644 (file)
--- a/tools/virtio/linux/kmsan.h
+++ b/tools/virtio/linux/kmsan.h
@@ -4,7 +4,7 @@
 
 #include <linux/gfp.h>
 
-inline void kmsan_handle_dma(struct page *page, size_t offset, size_t size,
+inline void kmsan_handle_dma(phys_addr_t phys, size_t size,
                             enum dma_data_direction dir)
 {
 }