vhost: fix physical address mapping

When choosing IOVA as PA mode, IOVA is likely to be discontinuous,
which requires page by page mapping for DMA devices. To be consistent,
this patch implements page by page mapping instead of mapping at the
region granularity for both IOVA as VA and PA mode.

Fixes: 7c61fa08b716 ("vhost: enable IOMMU for async vhost")
Cc: stable@dpdk.org
Signed-off-by: Xuan Ding <xuan.ding@intel.com>
Signed-off-by: Yuan Wang <yuanx.wang@intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>

diff --git a/lib/vhost/vhost.h b/lib/vhost/vhost.h
index 56063604146d2589fc510ab9cfa9d78ff8b3ab8f..a9edc271aa7f6fd4457b5c1f0f1839b00d6d259c 100644 (file)
--- a/lib/vhost/vhost.h
+++ b/lib/vhost/vhost.h
@@ -425,6 +425,7 @@ struct vring_packed_desc_event {
 struct guest_page {
        uint64_t guest_phys_addr;
        uint64_t host_iova;
+       uint64_t host_user_addr;
        uint64_t size;
 };
 

diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c
index 8257a92e128c003ef9b5b93d87e93d48a9d6435b..8ee9c3e2dbcc152ce8e35706efa2984647404a82 100644 (file)
--- a/lib/vhost/vhost_user.c
+++ b/lib/vhost/vhost_user.c
@@ -140,57 +140,57 @@ get_blk_size(int fd)
        return ret == -1 ? (uint64_t)-1 : (uint64_t)stat.st_blksize;
 }
 
-static int
-async_dma_map(struct virtio_net *dev, struct rte_vhost_mem_region *region, bool do_map)
+static void
+async_dma_map(struct virtio_net *dev, bool do_map)
 {
-       uint64_t host_iova;
        int ret = 0;
+       uint32_t i;
+       struct guest_page *page;
 
-       host_iova = rte_mem_virt2iova((void *)(uintptr_t)region->host_user_addr);
        if (do_map) {
-               /* Add mapped region into the default container of DPDK. */
-               ret = rte_vfio_container_dma_map(RTE_VFIO_DEFAULT_CONTAINER_FD,
-                                                region->host_user_addr,
-                                                host_iova,
-                                                region->size);
-               if (ret) {
-                       /*
-                        * DMA device may bind with kernel driver, in this case,
-                        * we don't need to program IOMMU manually. However, if no
-                        * device is bound with vfio/uio in DPDK, and vfio kernel
-                        * module is loaded, the API will still be called and return
-                        * with ENODEV/ENOSUP.
-                        *
-                        * DPDK vfio only returns ENODEV/ENOSUP in very similar
-                        * situations(vfio either unsupported, or supported
-                        * but no devices found). Either way, no mappings could be
-                        * performed. We treat it as normal case in async path.
-                        */
-                       if (rte_errno == ENODEV || rte_errno == ENOTSUP)
-                               return 0;
-
-                       VHOST_LOG_CONFIG(ERR, "(%s) DMA engine map failed\n", dev->ifname);
-                       /* DMA mapping errors won't stop VHST_USER_SET_MEM_TABLE. */
-                       return 0;
+               for (i = 0; i < dev->nr_guest_pages; i++) {
+                       page = &dev->guest_pages[i];
+                       ret = rte_vfio_container_dma_map(RTE_VFIO_DEFAULT_CONTAINER_FD,
+                                                        page->host_user_addr,
+                                                        page->host_iova,
+                                                        page->size);
+                       if (ret) {
+                               /*
+                                * DMA device may bind with kernel driver, in this case,
+                                * we don't need to program IOMMU manually. However, if no
+                                * device is bound with vfio/uio in DPDK, and vfio kernel
+                                * module is loaded, the API will still be called and return
+                                * with ENODEV.
+                                *
+                                * DPDK vfio only returns ENODEV in very similar situations
+                                * (vfio either unsupported, or supported but no devices found).
+                                * Either way, no mappings could be performed. We treat it as
+                                * normal case in async path. This is a workaround.
+                                */
+                               if (rte_errno == ENODEV)
+                                       return;
+
+                               /* DMA mapping errors won't stop VHOST_USER_SET_MEM_TABLE. */
+                               VHOST_LOG_CONFIG(ERR, "DMA engine map failed\n");
+                       }
                }
 
        } else {
-               /* Remove mapped region from the default container of DPDK. */
-               ret = rte_vfio_container_dma_unmap(RTE_VFIO_DEFAULT_CONTAINER_FD,
-                                                  region->host_user_addr,
-                                                  host_iova,
-                                                  region->size);
-               if (ret) {
-                       /* like DMA map, ignore the kernel driver case when unmap. */
-                       if (rte_errno == EINVAL)
-                               return 0;
-
-                       VHOST_LOG_CONFIG(ERR, "(%s) DMA engine unmap failed\n", dev->ifname);
-                       return ret;
+               for (i = 0; i < dev->nr_guest_pages; i++) {
+                       page = &dev->guest_pages[i];
+                       ret = rte_vfio_container_dma_unmap(RTE_VFIO_DEFAULT_CONTAINER_FD,
+                                                          page->host_user_addr,
+                                                          page->host_iova,
+                                                          page->size);
+                       if (ret) {
+                               /* like DMA map, ignore the kernel driver case when unmap. */
+                               if (rte_errno == EINVAL)
+                                       return;
+
+                               VHOST_LOG_CONFIG(ERR, "DMA engine unmap failed\n");
+                       }
                }
        }
-
-       return ret;
 }
 
 static void
@@ -202,12 +202,12 @@ free_mem_region(struct virtio_net *dev)
        if (!dev || !dev->mem)
                return;
 
+       if (dev->async_copy && rte_vfio_is_enabled("vfio"))
+               async_dma_map(dev, false);
+
        for (i = 0; i < dev->mem->nregions; i++) {
                reg = &dev->mem->regions[i];
                if (reg->host_user_addr) {
-                       if (dev->async_copy && rte_vfio_is_enabled("vfio"))
-                               async_dma_map(dev, reg, false);
-
                        munmap(reg->mmap_addr, reg->mmap_size);
                        close(reg->fd);
                }
@@ -986,7 +986,7 @@ vhost_user_set_vring_base(struct virtio_net **pdev,
 
 static int
 add_one_guest_page(struct virtio_net *dev, uint64_t guest_phys_addr,
-                  uint64_t host_iova, uint64_t size)
+                  uint64_t host_iova, uint64_t host_user_addr, uint64_t size)
 {
        struct guest_page *page, *last_page;
        struct guest_page *old_pages;
@@ -998,7 +998,7 @@ add_one_guest_page(struct virtio_net *dev, uint64_t guest_phys_addr,
                                        dev->max_guest_pages * sizeof(*page),
                                        RTE_CACHE_LINE_SIZE);
                if (dev->guest_pages == NULL) {
-                       VHOST_LOG_CONFIG(ERR, "(%s) cannot realloc guest_pages\n", dev->ifname);
+                       VHOST_LOG_CONFIG(ERR, "cannot realloc guest_pages\n");
                        rte_free(old_pages);
                        return -1;
                }
@@ -1007,8 +1007,9 @@ add_one_guest_page(struct virtio_net *dev, uint64_t guest_phys_addr,
        if (dev->nr_guest_pages > 0) {
                last_page = &dev->guest_pages[dev->nr_guest_pages - 1];
                /* merge if the two pages are continuous */
-               if (host_iova == last_page->host_iova +
-                                     last_page->size) {
+               if (host_iova == last_page->host_iova + last_page->size &&
+                   guest_phys_addr == last_page->guest_phys_addr + last_page->size &&
+                   host_user_addr == last_page->host_user_addr + last_page->size) {
                        last_page->size += size;
                        return 0;
                }
@@ -1017,6 +1018,7 @@ add_one_guest_page(struct virtio_net *dev, uint64_t guest_phys_addr,
        page = &dev->guest_pages[dev->nr_guest_pages++];
        page->guest_phys_addr = guest_phys_addr;
        page->host_iova  = host_iova;
+       page->host_user_addr = host_user_addr;
        page->size = size;
 
        return 0;
@@ -1036,7 +1038,8 @@ add_guest_pages(struct virtio_net *dev, struct rte_vhost_mem_region *reg,
        size = page_size - (guest_phys_addr & (page_size - 1));
        size = RTE_MIN(size, reg_size);
 
-       if (add_one_guest_page(dev, guest_phys_addr, host_iova, size) < 0)
+       if (add_one_guest_page(dev, guest_phys_addr, host_iova,
+                              host_user_addr, size) < 0)
                return -1;
 
        host_user_addr  += size;
@@ -1048,7 +1051,7 @@ add_guest_pages(struct virtio_net *dev, struct rte_vhost_mem_region *reg,
                host_iova = rte_mem_virt2iova((void *)(uintptr_t)
                                                  host_user_addr);
                if (add_one_guest_page(dev, guest_phys_addr, host_iova,
-                               size) < 0)
+                                      host_user_addr, size) < 0)
                        return -1;
 
                host_user_addr  += size;
@@ -1224,7 +1227,6 @@ vhost_user_mmap_region(struct virtio_net *dev,
        uint64_t mmap_size;
        uint64_t alignment;
        int populate;
-       int ret;
 
        /* Check for memory_size + mmap_offset overflow */
        if (mmap_offset >= -region->size) {
@@ -1281,16 +1283,6 @@ vhost_user_mmap_region(struct virtio_net *dev,
                                        dev->ifname);
                        return -1;
                }
-
-               if (rte_vfio_is_enabled("vfio")) {
-                       ret = async_dma_map(dev, region, true);
-                       if (ret) {
-                               VHOST_LOG_CONFIG(ERR,
-                                       "(%s) configure IOMMU for DMA engine failed\n",
-                                       dev->ifname);
-                               return -1;
-                       }
-               }
        }
 
        VHOST_LOG_CONFIG(INFO, "(%s) guest memory region size: 0x%" PRIx64 "\n",
@@ -1427,6 +1419,9 @@ vhost_user_set_mem_table(struct virtio_net **pdev,
                dev->mem->nregions++;
        }
 
+       if (dev->async_copy && rte_vfio_is_enabled("vfio"))
+               async_dma_map(dev, true);
+
        if (vhost_user_postcopy_register(dev, main_fd, ctx) < 0)
                goto free_mem_table;