lib/vhost: enable IOMMU for async vhost
PATCH 1/1 lib/vhost: enable IOMMU for async vhost
From: Xuan Ding <[email protected]>
For async copy, it is unsafe to directly use the physical address. and current address translation from GPA to HPA via SW also takes CPU cycles, these can all benefit from IOMMU.
Since the existing DMA engine supports to use platform IOMMU, this patch enables IOMMU for async vhost, which defines IOAT devices to use virtual address instead of physical address.
When set memory table, the frontend's memory will be mapped to the default container of DPDK where IOAT devices has been added into. When DMA copy fails, the virtual address provided to IOAT devices also allow us fallback to SW copy or PA copy.
With IOMMU enabled, to use IOAT devices:
1. IOAT devices must be binded to vfio-pci, rather than igb_uio.
2. DPDK must use "--iova-mode=va".
--- doc/guides/prog_guide/vhost_lib.rst | 17 +++++ lib/vhost/vhost_user.c | 102 ++++------------------------ lib/vhost/virtio_net.c | 30 +++----- 3 files changed, 41 insertions(+), 108 deletions(-)
doc/guides/prog_guide/vhost_lib.rst +17 -0
@@ -420,3 +420,20 @@ Finally, a set of device ops is defined for device specific operations: * ``get_notify_area`` Called to get the notify area info of the queue. + + Vhost async data path + ----------------------------------- +* Address mode + Modern IOAT devices supports to use the IOMMU, which can avoid using + the unsafe HPA. Besides, the CPU cycles took by SW to translate from + GPA to HPA can also be saved. So IOAT devices are defined to use + virtual address instead of physical address. + + With IOMMU enabled, to use IOAT devices: + 1. IOAT devices must be binded to vfio-pci, rather than igb_uio. + 2. DPDK must use ``--iova-mode=va``. + +* Fallback + When the DMA copy fails, the user who implements the transfer_data + callback can fallback to SW copy or fallback to PA through + rte_mem_virt2iova().
lib/vhost/vhost_user.c +14 -88
132 lines not on this page · raw message
lib/vhost/virtio_net.c +10 -20
@@ -980,11 +980,9 @@ async_mbuf_to_desc(struct virtio_net *dev, struct vhost_virtqueue *vq,struct batch_copy_elem *batch_copy = vq->batch_copy_elems;struct virtio_net_hdr_mrg_rxbuf tmp_hdr, *hdr =NULL ;int error =0 ; -uint64_t mapped_len;uint32_t tlen =0 ;int tvec_idx =0 ; -void *hpa;if (unlikely (m ==NULL )) { error =-1 ;
@@ -1074,27 +1072,19 @@ async_mbuf_to_desc(struct virtio_net *dev, struct vhost_virtqueue *vq, cpy_len =RTE_MIN (buf_avail, mbuf_avail); -while (unlikely (cpy_len && cpy_len >= cpy_threshold)) { - hpa = (void *)(uintptr_t )gpa_to_first_hpa (dev, - buf_iova + buf_offset, - cpy_len, &mapped_len); - -if (unlikely (!hpa || mapped_len < cpy_threshold)) -break ; - +if (unlikely (cpy_len >= cpy_threshold)) {async_fill_vec (src_iovec + tvec_idx, - (void *)(uintptr_t )rte_pktmbuf_iova_offset (m, - mbuf_offset), (size_t )mapped_len); + rte_pktmbuf_mtod_offset(m, void *, mbuf_offset), (size_t)cpy_len);async_fill_vec (dst_iovec + tvec_idx, - hpa, (size_t )mapped_len); - - tlen += (uint32_t )mapped_len; - cpy_len -= (uint32_t )mapped_len; - mbuf_avail -= (uint32_t )mapped_len; - mbuf_offset += (uint32_t )mapped_len; - buf_avail -= (uint32_t )mapped_len; - buf_offset += (uint32_t )mapped_len; + (void *)((uintptr_t )(buf_addr + buf_offset)), (size_t )cpy_len); + + tlen += cpy_len; + mbuf_avail -= cpy_len; + mbuf_offset += cpy_len; + buf_avail -= cpy_len; + buf_offset += cpy_len; + cpy_len =0 ; tvec_idx++; }
Signature · 1 line
2.17.1
PATCH v2 1/1 lib/vhost: enable IOMMU for async vhost
From: Xuan Ding <[email protected]>
For async copy, it is unsafe to directly use the physical address. and current address translation from GPA to HPA via SW also takes CPU cycles, these can all benefit from IOMMU.
Since the existing DMA engine supports to use platform IOMMU, this patch enables IOMMU for async vhost, which defines IOAT devices to use virtual address instead of physical address.
When set memory table, the frontend's memory will be mapped to the default container of DPDK where IOAT devices has been added into. When DMA copy fails, the virtual address provided to IOAT devices also allow us fallback to SW copy or PA copy.
With IOMMU enabled, to use IOAT devices:
1. IOAT devices must be binded to vfio-pci, rather than igb_uio.
2. DPDK must use "--iova-mode=va".
---
v2:
* Fixed a format issue.
* Added the dma unmap logic when device is closed.
--- doc/guides/prog_guide/vhost_lib.rst | 20 +++++ lib/vhost/vhost_user.c | 125 +++++++++------------------- lib/vhost/virtio_net.c | 30 +++---- 3 files changed, 69 insertions(+), 106 deletions(-)
doc/guides/prog_guide/vhost_lib.rst +20 -0
@@ -420,3 +420,23 @@ Finally, a set of device ops is defined for device specific operations: * ``get_notify_area`` Called to get the notify area info of the queue. + + Vhost async data path + ----------------------------------- + +* Address mode + + Modern IOAT devices supports to use the IOMMU, which can avoid using + the unsafe HPA. Besides, the CPU cycles took by SW to translate from + GPA to HPA can also be saved. So IOAT devices are defined to use + virtual address instead of physical address. + + With IOMMU enabled, to use IOAT devices: + 1. IOAT devices must be binded to vfio-pci, rather than igb_uio. + 2. DPDK must use ``--iova-mode=va``. + +* Fallback + + When the DMA copy fails, the user who implements the transfer_data + callback can fallback to SW copy or fallback to PA copy through + rte_mem_virt2iova().
lib/vhost/vhost_user.c +39 -86
162 lines not on this page · raw message
lib/vhost/virtio_net.c +10 -20
@@ -980,11 +980,9 @@ async_mbuf_to_desc(struct virtio_net *dev, struct vhost_virtqueue *vq,struct batch_copy_elem *batch_copy = vq->batch_copy_elems;struct virtio_net_hdr_mrg_rxbuf tmp_hdr, *hdr =NULL ;int error =0 ; -uint64_t mapped_len;uint32_t tlen =0 ;int tvec_idx =0 ; -void *hpa;if (unlikely (m ==NULL )) { error =-1 ;
@@ -1074,27 +1072,19 @@ async_mbuf_to_desc(struct virtio_net *dev, struct vhost_virtqueue *vq, cpy_len =RTE_MIN (buf_avail, mbuf_avail); -while (unlikely (cpy_len && cpy_len >= cpy_threshold)) { - hpa = (void *)(uintptr_t )gpa_to_first_hpa (dev, - buf_iova + buf_offset, - cpy_len, &mapped_len); - -if (unlikely (!hpa || mapped_len < cpy_threshold)) -break ; - +if (unlikely (cpy_len >= cpy_threshold)) {async_fill_vec (src_iovec + tvec_idx, - (void *)(uintptr_t )rte_pktmbuf_iova_offset (m, - mbuf_offset), (size_t )mapped_len); + rte_pktmbuf_mtod_offset(m, void *, mbuf_offset), (size_t)cpy_len);async_fill_vec (dst_iovec + tvec_idx, - hpa, (size_t )mapped_len); - - tlen += (uint32_t )mapped_len; - cpy_len -= (uint32_t )mapped_len; - mbuf_avail -= (uint32_t )mapped_len; - mbuf_offset += (uint32_t )mapped_len; - buf_avail -= (uint32_t )mapped_len; - buf_offset += (uint32_t )mapped_len; + (void *)((uintptr_t )(buf_addr + buf_offset)), (size_t )cpy_len); + + tlen += cpy_len; + mbuf_avail -= cpy_len; + mbuf_offset += cpy_len; + buf_avail -= cpy_len; + buf_offset += cpy_len; + cpy_len =0 ; tvec_idx++; }
Signature · 1 line
2.17.1
PATCH v3 1/1 vhost: enable IOMMU for async vhost
In reply to [email protected]From: Xuan Ding <[email protected]>
For async copy, it is unsafe to directly use the physical address. And current address translation from GPA to HPA via SW also takes CPU cycles, these can all benefit from IOMMU.
Since the existing DMA engine supports to use platform IOMMU, this patch enables IOMMU for async vhost, which defines IOAT devices to use virtual address instead of physical address.
When set memory table, the frontend's memory will be mapped to the default container of DPDK where IOAT devices have been added into. When DMA copy fails, the virtual address provided to IOAT devices also allow us fallback to SW copy or PA copy.
With IOMMU enabled, to use IOAT devices:
1. IOAT devices must be binded to vfio-pci, rather than igb_uio.
2. DPDK must use "--iova-mode=va".
---
v3:
* Fixed some typos.
v2:
* Fixed a format issue.
* Added the dma unmap logic when device is closed.
--- doc/guides/prog_guide/vhost_lib.rst | 20 +++++ lib/vhost/vhost_user.c | 125 +++++++++------------------- lib/vhost/virtio_net.c | 30 +++---- 3 files changed, 69 insertions(+), 106 deletions(-)
doc/guides/prog_guide/vhost_lib.rst +20 -0
@@ -420,3 +420,23 @@ Finally, a set of device ops is defined for device specific operations: * ``get_notify_area`` Called to get the notify area info of the queue. + +Vhost async data path +--------------------- + +* Address mode + + Modern IOAT devices support to use the IOMMU, which can avoid using + the unsafe HPA. Besides, the CPU cycles took by SW to translate from + GPA to HPA can also be saved. So IOAT devices are defined to use + virtual address instead of physical address. + + With IOMMU enabled, to use IOAT devices: + 1. IOAT devices must be binded to vfio-pci, rather than igb_uio. + 2. DPDK must use ``--iova-mode=va``. + +* Fallback + + When the DMA copy fails, the user who implements the transfer_data + callback can fallback to SW copy or fallback to PA copy through + rte_mem_virt2iova().
lib/vhost/vhost_user.c +39 -86
162 lines not on this page · raw message
lib/vhost/virtio_net.c +10 -20
@@ -980,11 +980,9 @@ async_mbuf_to_desc(struct virtio_net *dev, struct vhost_virtqueue *vq,struct batch_copy_elem *batch_copy = vq->batch_copy_elems;struct virtio_net_hdr_mrg_rxbuf tmp_hdr, *hdr =NULL ;int error =0 ; -uint64_t mapped_len;uint32_t tlen =0 ;int tvec_idx =0 ; -void *hpa;if (unlikely (m ==NULL )) { error =-1 ;
@@ -1074,27 +1072,19 @@ async_mbuf_to_desc(struct virtio_net *dev, struct vhost_virtqueue *vq, cpy_len =RTE_MIN (buf_avail, mbuf_avail); -while (unlikely (cpy_len && cpy_len >= cpy_threshold)) { - hpa = (void *)(uintptr_t )gpa_to_first_hpa (dev, - buf_iova + buf_offset, - cpy_len, &mapped_len); - -if (unlikely (!hpa || mapped_len < cpy_threshold)) -break ; - +if (unlikely (cpy_len >= cpy_threshold)) {async_fill_vec (src_iovec + tvec_idx, - (void *)(uintptr_t )rte_pktmbuf_iova_offset (m, - mbuf_offset), (size_t )mapped_len); + rte_pktmbuf_mtod_offset(m, void *, mbuf_offset), (size_t)cpy_len);async_fill_vec (dst_iovec + tvec_idx, - hpa, (size_t )mapped_len); - - tlen += (uint32_t )mapped_len; - cpy_len -= (uint32_t )mapped_len; - mbuf_avail -= (uint32_t )mapped_len; - mbuf_offset += (uint32_t )mapped_len; - buf_avail -= (uint32_t )mapped_len; - buf_offset += (uint32_t )mapped_len; + (void *)((uintptr_t )(buf_addr + buf_offset)), (size_t )cpy_len); + + tlen += cpy_len; + mbuf_avail -= cpy_len; + mbuf_offset += cpy_len; + buf_avail -= cpy_len; + buf_offset += cpy_len; + cpy_len =0 ; tvec_idx++; }
Signature · 1 line
2.17.1
Re: [dpdk-dev] [PATCH v3] vhost: enable IOMMU for async vhost
Hi Xuan,
Quoted 9 lines · On 6/3/21 7:30 PM, [email protected] wrote:
From: Xuan Ding <[email protected]>
For async copy, it is unsafe to directly use the physical address. And current address translation from GPA to HPA via SW also takes CPU cycles, these can all benefit from IOMMU.
Since the existing DMA engine supports to use platform IOMMU, this patch enables IOMMU for async vhost, which defines IOAT devices to use virtual address instead of physical address.
We have to keep in mind a generic DMA api is coming, and maybe we want a SW implementation of a dmadev based on memcpy at least for testing/debugging purpose.
Quoted 8 lines
When set memory table, the frontend's memory will be mapped to the default container of DPDK where IOAT devices have been added into. When DMA copy fails, the virtual address provided to IOAT devices also allow us fallback to SW copy or PA copy.
With IOMMU enabled, to use IOAT devices:
1. IOAT devices must be binded to vfio-pci, rather thanigb_uio.
2. DPDK must use "--iova-mode=va".
I think this is problematic, at least we need to check the right iova mode has been selected, but even with doing that it is limiting.
What prevent us to reuse add_guest_pages() alogrithm to implement IOVA_AS_PA?
Quoted 200 lines
Signed-off-by Xuan Ding <[email protected]>---
v3:
* Fixed some typos.v2:
* Fixed a format issue.
* Added the dma unmap logic when device is closed.--- doc/guides/prog_guide/vhost_lib.rst | 20 +++++ lib/vhost/vhost_user.c | 125 +++++++++------------------- lib/vhost/virtio_net.c | 30 +++---- 3 files changed, 69 insertions(+), 106 deletions(-)doc/guides/prog_guide/vhost_lib.rst +20
-0@@ -420,3 +420,23 @@ Finally, a set of device ops is defined for device specific operations: * ``get_notify_area`` Called to get the notify area info of the queue. + +Vhost async data path +--------------------- + +* Address mode + + Modern IOAT devices support to use the IOMMU, which can avoid using + the unsafe HPA. Besides, the CPU cycles took by SW to translate from + GPA to HPA can also be saved. So IOAT devices are defined to use + virtual address instead of physical address. + + With IOMMU enabled, to use IOAT devices: + 1. IOAT devices must be binded to vfio-pci, rather than igb_uio. + 2. DPDK must use ``--iova-mode=va``. + +* Fallback + + When the DMA copy fails, the user who implements the transfer_data + callback can fallback to SW copy or fallback to PA copy through + rte_mem_virt2iova().lib/vhost/vhost_user.c +33
-81@@ -45,6 +45,7 @@#include <rte_common.h> #include <rte_malloc.h> #include <rte_log.h> +#include <rte_vfio.h> #include "iotlb.h" #include "vhost.h" @@ -141,6 +142,34 @@ get_blk_size(int fd)return ret ==-1 ? (uint64_t )-1 : (uint64_t )stat.st_blksize; } +static int +async_dma_map (struct rte_vhost_mem_region *region,bool do_map) +{ +int ret =0 ; +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, + region->host_user_addr, + region->size); +if (ret) { +VHOST_LOG_CONFIG (ERR ,"DMA engine map failed\n" ); +return ret; + } + }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, + region->host_user_addr, + region->size); +if (ret) { +VHOST_LOG_CONFIG (ERR ,"DMA engine unmap failed\n" ); +return ret; + } + } +return ret; +} +static void free_mem_region (struct virtio_net *dev) {@@ -155,6 +184,9 @@ free_mem_region(struct virtio_net *dev)if (reg->host_user_addr) {munmap (reg->mmap_addr, reg->mmap_size);close (reg->fd); + +if (dev->async_copy) +async_dma_map (reg, false); } } }@@ -866,87 +898,6 @@ vhost_user_set_vring_base(struct virtio_net **pdev,return RTE_VHOST_MSG_RESULT_OK ; } -static int -add_one_guest_page (struct virtio_net *dev,uint64_t guest_phys_addr, -uint64_t host_phys_addr,uint64_t size) -{ -struct guest_page *page, *last_page; -struct guest_page *old_pages; - -if (dev->nr_guest_pages == dev->max_guest_pages) { - dev->max_guest_pages *=2 ; - old_pages = dev->guest_pages; - dev->guest_pages =rte_realloc (dev->guest_pages, - dev->max_guest_pages *sizeof (*page), -RTE_CACHE_LINE_SIZE ); -if (dev->guest_pages ==NULL ) { -VHOST_LOG_CONFIG (ERR ,"cannot realloc guest_pages\n" ); -rte_free (old_pages); -return -1 ; - } - } - -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_phys_addr == last_page->host_phys_addr + - last_page->size) { - last_page->size += size; -return 0 ; - } - } - - page = &dev->guest_pages[dev->nr_guest_pages++]; - page->guest_phys_addr = guest_phys_addr; - page->host_phys_addr = host_phys_addr; - page->size = size; - -return 0 ; -} - -static int -add_guest_pages (struct virtio_net *dev,struct rte_vhost_mem_region *reg, -uint64_t page_size) -{ -uint64_t reg_size = reg->size; -uint64_t host_user_addr = reg->host_user_addr; -uint64_t guest_phys_addr = reg->guest_phys_addr; -uint64_t host_phys_addr; -uint64_t size; - - host_phys_addr =rte_mem_virt2iova ((void *)(uintptr_t )host_user_addr); - 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_phys_addr, size) <0 ) -return -1 ; - - host_user_addr += size; - guest_phys_addr += size; - reg_size -= size; - -while (reg_size >0 ) { - size =RTE_MIN (reg_size, page_size); - host_phys_addr =rte_mem_virt2iova ((void *)(uintptr_t ) - host_user_addr); -if (add_one_guest_page (dev, guest_phys_addr, host_phys_addr, - size) <0 ) -return -1 ; - - host_user_addr += size; - guest_phys_addr += size; - reg_size -= size; - } - -/* sort guest page array if over binary search threshold */ -if (dev->nr_guest_pages >=VHOST_BINARY_SEARCH_THRESH ) { -qsort ((void *)dev->guest_pages, dev->nr_guest_pages, -sizeof (struct guest_page ), guest_page_addrcmp); - } - -return 0 ; -} -#ifdef RTE_LIBRTE_VHOST_DEBUG /* TODO: enable it only in debug mode? */ static void@@ -1105,6 +1056,7 @@ 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) {@@ -1158,12 +1110,13 @@ vhost_user_mmap_region(struct virtio_net *dev, region->mmap_size = mmap_size; region->host_user_addr = (uint64_t )(uintptr_t )mmap_addr + mmap_offset;
lib/vhost/vhost_user.c vhost_user_mmap_region(struct virtio_net *dev, · line 1117
Quoted 10 lines
lib/vhost/vhost_user.c +4
-4-if (dev->async_copy) -if (add_guest_pages (dev, region, alignment) <0 ) { -VHOST_LOG_CONFIG (ERR , -"adding guest pages to region failed.\n" ); +if (dev->async_copy) { + ret =async_dma_map (region, true); +if (ret) { +VHOST_LOG_CONFIG (ERR ,"Configure IOMMU for DMA engine failed\n" );return -1 ;
Maybe we're too late in the init already, but I would think we may want to fallback to SW implementation insea
Quoted 61 lines
lib/vhost/vhost_user.c +2
-1- } + } + }VHOST_LOG_CONFIG (INFO , "guest memory region size: 0x%" PRIx64 "\n"lib/vhost/virtio_net.c +10
-20@@ -980,11 +980,9 @@ async_mbuf_to_desc(struct virtio_net *dev, struct vhost_virtqueue *vq,struct batch_copy_elem *batch_copy = vq->batch_copy_elems;struct virtio_net_hdr_mrg_rxbuf tmp_hdr, *hdr =NULL ;int error =0 ; -uint64_t mapped_len;uint32_t tlen =0 ;int tvec_idx =0 ; -void *hpa;if (unlikely (m ==NULL )) { error =-1 ;@@ -1074,27 +1072,19 @@ async_mbuf_to_desc(struct virtio_net *dev, struct vhost_virtqueue *vq, cpy_len =RTE_MIN (buf_avail, mbuf_avail); -while (unlikely (cpy_len && cpy_len >= cpy_threshold)) { - hpa = (void *)(uintptr_t )gpa_to_first_hpa (dev, - buf_iova + buf_offset, - cpy_len, &mapped_len); - -if (unlikely (!hpa || mapped_len < cpy_threshold)) -break ; - +if (unlikely (cpy_len >= cpy_threshold)) {async_fill_vec (src_iovec + tvec_idx, - (void *)(uintptr_t )rte_pktmbuf_iova_offset (m, - mbuf_offset), (size_t )mapped_len); + rte_pktmbuf_mtod_offset(m, void *, mbuf_offset), (size_t)cpy_len);async_fill_vec (dst_iovec + tvec_idx, - hpa, (size_t )mapped_len); - - tlen += (uint32_t )mapped_len; - cpy_len -= (uint32_t )mapped_len; - mbuf_avail -= (uint32_t )mapped_len; - mbuf_offset += (uint32_t )mapped_len; - buf_avail -= (uint32_t )mapped_len; - buf_offset += (uint32_t )mapped_len; + (void *)((uintptr_t )(buf_addr + buf_offset)), (size_t )cpy_len); + + tlen += cpy_len; + mbuf_avail -= cpy_len; + mbuf_offset += cpy_len; + buf_avail -= cpy_len; + buf_offset += cpy_len; + cpy_len =0 ; tvec_idx++; }
Re: [dpdk-dev] [PATCH v3] vhost: enable IOMMU for async vhost
Hi Maxime,
Quoted 19 lines
-----Original Message-----
From: Maxime Coquelin <[email protected]>
Sent: Saturday, June 19, 2021 12:18 AM
To: Ding, Xuan <[email protected]>; Xia, Chenbo <[email protected]>
Cc: [email protected]; Hu, Jiayu <[email protected]>; Pai G, Sunil <[email protected]>; Richardson, Bruce <[email protected]>; Van Haaren, Harry <[email protected]>; Liu, Yong <[email protected]>
Subject: Re: [PATCH v3] vhost: enable IOMMU for async vhostHi Xuan,
Quoted 6 lines · On 6/3/21 7:30 PM, [email protected] wrote:
From: Xuan Ding <[email protected]>
For async copy, it is unsafe to directly use the physical address. And current address translation from GPA to HPA via SW also takes CPU cycles, these can all benefit from IOMMU.
Quoted 7 lines
Quoted 3 lines
Since the existing DMA engine supports to use platform IOMMU, this patch enables IOMMU for async vhost, which defines IOAT devices to use virtual address instead of physical address.
We have to keep in mind a generic DMA api is coming, and maybe we want a SW implementation of a dmadev based on memcpy at least for testing/debugging purpose.
Agree, we need to support SW fallback, and I think this is also what this patch wants to do. Originally, vhost passes IOVA to DMA callbacks; if DPDK in PA mode, we cannot fallback to SW copy. In this patch, vhost passes both VA for pktmbuf and guest's buffer to DMA callbacks, which makes SW fallback possible.
In terms of generic DMA api, no matter it uses VA or IOVA as buffer addresses, I think this design can work, as DMA callback implementations can do address translation anyway.
Quoted 10 lines
Quoted 9 lines
When set memory table, the frontend's memory will be mapped to the default container of DPDK where IOAT devices have been added into. When DMA copy fails, the virtual address provided to IOAT devices also allow us fallback to SW copy or PA copy.
With IOMMU enabled, to use IOAT devices:
1. IOAT devices must be binded to vfio-pci, rather thanigb_uio.
2. DPDK must use "--iova-mode=va".
Quoted 5 lines
I think this is problematic, at least we need to check the right iova mode has been selected, but even with doing that it is limiting.
What prevent us to reuse
add_guest_pages()alogrithm to implementIOVA_AS_PA?
In the original design, vfio doesn't work, as vhost doesn't programs iommu table with guest's memory. Specifically, if DPDK is in VA mode, IOVA passed to DMA callback is VA, but IOMMU cannot find corresponding PA for guest buffers; if DPDK is in PA mode, IOVA passed to DMA callback is PA. In this case, there are random errors for guest buffers when VT-d is enabled, as IOMMU behavior is uncertain. I think supporting vfio is one of reasons of this patch.
One concern about this patch is how to handle when IOVA is PA. If IOVA is PA, IOMMU cannot find correct PA for pktmbuf via VA passed by vhost. But can DMA callback translate VA to PA before calling ioat/dmadev API? IMHO, IOVA as PA with vfio is not a recommended configuration. Do you think it's a must for vhost to support this case?
Thanks,
Jiayu
Quoted 295 lines
doc/guides/prog_guide/vhost_lib.rst Finally, a set of device ops is defined for device
Quoted 23 lines
Signed-off-by Xuan Ding <[email protected]>---
v3:
* Fixed some typos.v2:
* Fixed a format issue.
* Added the dma unmap logic when device is closed.--- doc/guides/prog_guide/vhost_lib.rst | 20 +++++ lib/vhost/vhost_user.c | 125 +++++++++------------------- lib/vhost/virtio_net.c | 30 +++---- 3 files changed, 69 insertions(+), 106 deletions(-)doc/guides/prog_guide/vhost_lib.rst +0
-0@@ -420,3 +420,23 @@ Finally, a set of device ops is defined for devicespecific operations:
Quoted 36 lines
doc/guides/prog_guide/vhost_lib.rst +20
-0* ``get_notify_area`` Called to get the notify area info of the queue. + +Vhost async data path +--------------------- + +* Address mode + + Modern IOAT devices support to use the IOMMU, which can avoid using + the unsafe HPA. Besides, the CPU cycles took by SW to translate from + GPA to HPA can also be saved. So IOAT devices are defined to use + virtual address instead of physical address. + + With IOMMU enabled, to use IOAT devices: + 1. IOAT devices must be binded to vfio-pci, rather than igb_uio. + 2. DPDK must use ``--iova-mode=va``. + +* Fallback + + When the DMA copy fails, the user who implements the transfer_data + callback can fallback to SW copy or fallback to PA copy through + rte_mem_virt2iova().lib/vhost/vhost_user.c index renamed from lib/vhost/vhost_user.c +0
-0
8f0eba6412..c33fa784ff100644lib/vhost/vhost_user.c +1
-0@@ -45,6 +45,7 @@#include <rte_common.h> #include <rte_malloc.h> #include <rte_log.h> +#include <rte_vfio.h> #include "iotlb.h" #include "vhost.h" lib/vhost/vhost_user.c get_blk_size(int fd) · line 149
Quoted 8 lines
lib/vhost/vhost_user.c +6
-0@@ -141,6 +142,34 @@ get_blk_size(int fd)return ret ==-1 ? (uint64_t )-1 : (uint64_t )stat.st_blksize; } +static int +async_dma_map (struct rte_vhost_mem_region *region,bool do_map) { +int ret =0 ; +if (do_map) { +/* Add mapped region into the default container of DPDK. */ + ret =rte_vfio_container_dma_map(RTE_VFIO_DEFAULT_CONTAINER_FD,
lib/vhost/vhost_user.c get_blk_size(int fd)
Quoted 5 lines
lib/vhost/vhost_user.c +5
-0+ region->host_user_addr, + region->host_user_addr, + region->size); +if (ret) { + VHOST_LOG_CONFIG(ERR, "DMA engine mapfailed\n");
lib/vhost/vhost_user.c get_blk_size(int fd)
Quoted 4 lines
lib/vhost/vhost_user.c +4
-0+return ret; + } + }else { +/* Remove mapped region from the default container of DPDK. */
lib/vhost/vhost_user.c get_blk_size(int fd) · line 159
Quoted 1 line
lib/vhost/vhost_user.c +1
-0+ ret =rte_vfio_container_dma_unmap(RTE_VFIO_DEFAULT_CONTAINER_FD,
lib/vhost/vhost_user.c get_blk_size(int fd)
Quoted 5 lines
lib/vhost/vhost_user.c +5
-0+ region->host_user_addr, + region->host_user_addr, + region->size); +if (ret) { + VHOST_LOG_CONFIG(ERR, "DMA engine unmapfailed\n");
lib/vhost/vhost_user.c vhost_user_set_vring_base(struct virtio_net
Quoted 19 lines
lib/vhost/vhost_user.c +9
-0+return ret; + } + } +return ret; +} +static void free_mem_region(struct virtio_net *dev) { @@ -155,6 +184,9 @@ free_mem_region(struct virtio_net *dev) if (reg->host_user_addr) {munmap (reg->mmap_addr, reg->mmap_size);close (reg->fd); + +if (dev->async_copy) +async_dma_map (reg, false); } } }@@ -866,87 +898,6 @@ vhost_user_set_vring_base(struct virtio_net**pdev,
Quoted 5 lines
lib/vhost/vhost_user.c +0
-2return RTE_VHOST_MSG_RESULT_OK ; } -static int -add_one_guest_page(struct virtio_net *dev, uint64_t guest_phys_addr,lib/vhost/vhost_user.c vhost_user_set_vring_base(struct virtio_net **pdev,
Quoted 10 lines
lib/vhost/vhost_user.c +0
-10- uint64_t host_phys_addr, uint64_t size) -{ -struct guest_page *page, *last_page; -struct guest_page *old_pages; - -if (dev->nr_guest_pages == dev->max_guest_pages) { - dev->max_guest_pages *=2 ; - old_pages = dev->guest_pages; - dev->guest_pages = rte_realloc(dev->guest_pages, - dev->max_guest_pages *
sizeof(*page),lib/vhost/vhost_user.c vhost_user_set_vring_base(struct virtio_net **pdev,
Quoted 3 lines
lib/vhost/vhost_user.c +0
-3- RTE_CACHE_LINE_SIZE); -if (dev->guest_pages ==NULL ) { - VHOST_LOG_CONFIG(ERR, "cannot reallocguest_pages\n");
Quoted 15 lines
lib/vhost/vhost_user.c +0
-15-rte_free (old_pages); -return -1 ; - } - } - -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_phys_addr == last_page->host_phys_addr + - last_page->size) { - last_page->size += size; -return 0 ; - } - } -lib/vhost/vhost_user.c vhost_user_set_vring_base(struct virtio_net **pdev,
Quoted 10 lines
lib/vhost/vhost_user.c +0
-10- page = &dev->guest_pages[dev->nr_guest_pages++]; - page->guest_phys_addr = guest_phys_addr; - page->host_phys_addr = host_phys_addr; - page->size = size; - -return 0 ; -} - -static int -add_guest_pages(struct virtio_net *dev, struct rte_vhost_mem_region*reg,
lib/vhost/vhost_user.c vhost_user_set_vring_base(struct virtio_net **pdev,
Quoted 9 lines
lib/vhost/vhost_user.c +0
-9- uint64_t page_size) -{ -uint64_t reg_size = reg->size; -uint64_t host_user_addr = reg->host_user_addr; -uint64_t guest_phys_addr = reg->guest_phys_addr; -uint64_t host_phys_addr; -uint64_t size; - - host_phys_addr = rte_mem_virt2iova((void*)(uintptr_t)host_user_addr);
lib/vhost/vhost_user.c vhost_user_set_vring_base(struct virtio_net **pdev,
Quoted 4 lines
lib/vhost/vhost_user.c +0
-4- 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_phys_addr, size)< 0)
lib/vhost/vhost_user.c vhost_user_set_vring_base(struct virtio_net **pdev,
Quoted 11 lines
lib/vhost/vhost_user.c +0
-11-return -1 ; - - host_user_addr += size; - guest_phys_addr += size; - reg_size -= size; - -while (reg_size >0 ) { - size =RTE_MIN (reg_size, page_size); - host_phys_addr =rte_mem_virt2iova ((void *)(uintptr_t ) - host_user_addr); - if (add_one_guest_page(dev, guest_phys_addr,
host_phys_addr,lib/vhost/vhost_user.c vhost_user_mmap_region(struct virtio_net
Quoted 28 lines
lib/vhost/vhost_user.c +2
-17- size) < 0) -return -1 ; - - host_user_addr += size; - guest_phys_addr += size; - reg_size -= size; - } - -/* sort guest page array if over binary search threshold */ -if (dev->nr_guest_pages >=VHOST_BINARY_SEARCH_THRESH ) { -qsort ((void *)dev->guest_pages, dev->nr_guest_pages, -sizeof (struct guest_page ), guest_page_addrcmp); - } - -return 0 ; -} -#ifdef RTE_LIBRTE_VHOST_DEBUG /* TODO: enable it only in debug mode? */ static void @@ -1105,6 +1056,7 @@ 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) {@@ -1158,12 +1110,13 @@ vhost_user_mmap_region(struct virtio_net*dev,
lib/vhost/vhost_user.c vhost_user_mmap_region(struct virtio_net *dev,
Quoted 8 lines
lib/vhost/vhost_user.c +0
-4region->mmap_size = mmap_size; region->host_user_addr = (uint64_t )(uintptr_t )mmap_addr + mmap_offset; -if (dev->async_copy) -if (add_guest_pages (dev, region, alignment) <0 ) { - VHOST_LOG_CONFIG(ERR, - "adding guest pages to regionfailed.\n");
lib/vhost/vhost_user.c vhost_user_mmap_region(struct virtio_net *dev,
Quoted 4 lines
lib/vhost/vhost_user.c +4
-0+if (dev->async_copy) { + ret =async_dma_map (region, true); +if (ret) { + VHOST_LOG_CONFIG(ERR, "Configure IOMMU forDMA engine failed\n");
lib/vhost/vhost_user.c vhost_user_mmap_region(struct virtio_net *dev, · line 1117
Quoted 1 line
lib/vhost/vhost_user.c +0
-0return -1 ;Maybe we're too late in the init already, but I would think we may want to fallback to SW implementation insea
lib/vhost/virtio_net.c async_mbuf_to_desc(struct virtio_net *dev, struct
Quoted 11 lines
lib/vhost/vhost_user.c +2
-1- } + } + } VHOST_LOG_CONFIG(INFO,lib/vhost/vhost_user.c +0
-0"guest memory region size: 0x%" PRIx64"\n" lib/vhost/virtio_net.c index renamed from lib/vhost/virtio_net.c +0
-0
8da8a86a10..88110d2cb3100644lib/vhost/virtio_net.c +0
-0@@ -980,11 +980,9 @@ async_mbuf_to_desc(struct virtio_net *dev, struct
vhost_virtqueue*vq,Quoted 19 lines
lib/vhost/virtio_net.c +0
-5struct batch_copy_elem *batch_copy = vq->batch_copy_elems;struct virtio_net_hdr_mrg_rxbuf tmp_hdr, *hdr =NULL ;int error =0 ; -uint64_t mapped_len;uint32_t tlen =0 ;int tvec_idx =0 ; -void *hpa;if (unlikely (m ==NULL )) { error =-1 ;@@ -1074,27 +1072,19 @@ async_mbuf_to_desc(struct virtio_net *dev,struct vhost_virtqueue *vq, cpy_len =RTE_MIN (buf_avail, mbuf_avail); -while (unlikely (cpy_len && cpy_len >= cpy_threshold)) { - hpa = (void *)(uintptr_t)gpa_to_first_hpa(dev, - buf_iova + buf_offset,lib/vhost/virtio_net.c async_mbuf_to_desc(struct virtio_net *dev, · line 1078
Quoted 10 lines
lib/vhost/virtio_net.c +2
-7- cpy_len, &mapped_len); - -if (unlikely (!hpa || mapped_len < cpy_threshold)) -break ; - +if (unlikely (cpy_len >= cpy_threshold)) { async_fill_vec(src_iovec + tvec_idx, - (void *)(uintptr_t )rte_pktmbuf_iova_offset (m, - mbuf_offset), (size_t )mapped_len); + rte_pktmbuf_mtod_offset(m, void *,
mbuf_offset),lib/vhost/virtio_net.c async_mbuf_to_desc(struct virtio_net *dev, struct vhost_virtqueue *vq,
Quoted 12 lines
lib/vhost/virtio_net.c +2
-8+(size_t)cpy_len); async_fill_vec(dst_iovec + tvec_idx, - hpa, (size_t )mapped_len); - - tlen += (uint32_t )mapped_len; - cpy_len -= (uint32_t )mapped_len; - mbuf_avail -= (uint32_t )mapped_len; - mbuf_offset += (uint32_t )mapped_len; - buf_avail -= (uint32_t )mapped_len; - buf_offset += (uint32_t )mapped_len; + (void *)((uintptr_t)(buf_addr + buf_offset)),(size_t)cpy_len);
Quoted 11 lines
lib/vhost/virtio_net.c +7
-0+ + tlen += cpy_len; + mbuf_avail -= cpy_len; + mbuf_offset += cpy_len; + buf_avail -= cpy_len; + buf_offset += cpy_len; + cpy_len =0 ; tvec_idx++; }
Re: [dpdk-dev] [PATCH v3] vhost: enable IOMMU for async vhost
In reply to Maxime CoquelinHi Maxime,
Replies are inline.
Quoted 18 lines
-----Original Message-----
From: Maxime Coquelin <[email protected]>
Sent: Saturday, June 19, 2021 12:18 AM
To: Ding, Xuan <[email protected]>; Xia, Chenbo <[email protected]>
Cc: [email protected]; Hu, Jiayu <[email protected]>; Pai G, Sunil <[email protected]>; Richardson, Bruce <[email protected]>; Van Haaren, Harry <[email protected]>; Liu, Yong <[email protected]>
Subject: Re: [PATCH v3] vhost: enable IOMMU for async vhostHi Xuan,
Quoted 6 lines · On 6/3/21 7:30 PM, [email protected] wrote:
From: Xuan Ding <[email protected]>
For async copy, it is unsafe to directly use the physical address. And current address translation from GPA to HPA via SW also takes CPU cycles, these can all benefit from IOMMU.
Quoted 7 lines
Quoted 3 lines
Since the existing DMA engine supports to use platform IOMMU, this patch enables IOMMU for async vhost, which defines IOAT devices to use virtual address instead of physical address.
We have to keep in mind a generic DMA api is coming, and maybe we want a SW implementation of a dmadev based on memcpy at least for testing/debugging purpose.
I noticed the generic dmadev model is under discussion. To support a SW implementation, the VA mode support is needed, this is also the problem that this patch hopes to solve. Traditionally, DMA engine can only use physical address in PA mode.
Quoted 6 lines
Quoted 6 lines
When set memory table, the frontend's memory will be mapped to the default container of DPDK where IOAT devices have been added into. When DMA copy fails, the virtual address provided to IOAT devices also allow us fallback to SW copy or PA copy.
Quoted 6 lines
Quoted 3 lines
With IOMMU enabled, to use IOAT devices:
1. IOAT devices must be binded to vfio-pci, rather thanigb_uio.
2. DPDK must use "--iova-mode=va".I think this is problematic, at least we need to check the right iova mode has been selected, but even with doing that it is limiting.
As a library, vhost is not aware of the device selected address(PA or VA) and current DPDK iova mode. To some extent, this patch is a proposal. With device fed with VA, SW fallback can be supported.
And VA can also be translated to PA through rte_mem_virt2iova(). Finally, the address selected by the device is determined by callback. Not vice versa.
If the DMA callback implementer follows this design, SW fallback can be supported. I would be very grateful if you could provide some insights for this design. :)
Quoted 3 lines
What prevent us to reuse
add_guest_pages()alogrithm to implementIOVA_AS_PA?
If IOVA is PA, it's not easy to translate PA to VA to support SW implementation. Until now, I don't have any good ideas to be compatible with IOVA_AS_PA and IOVA_AS_VA at the same time, because it requires vhost library to select PA/VA for DMA device according to different DPDK iova mode.
Thanks,
Xuan
Quoted 291 lines
Quoted 11 lines
Signed-off-by Xuan Ding <[email protected]>---
v3:
* Fixed some typos.v2:
* Fixed a format issue.
* Added the dma unmap logic when device is closed.Review
Quoted 7 lines
--- doc/guides/prog_guide/vhost_lib.rst | 20 +++++ lib/vhost/vhost_user.c | 125 +++++++++------------------- lib/vhost/virtio_net.c | 30 +++---- 3 files changed, 69 insertions(+), 106 deletions(-)(quoted diff) +0
-0
b/doc/guides/prog_guide/vhost_lib.rstdoc/guides/prog_guide/vhost_lib.rst Finally, a set of device ops is defined for device
Quoted 4 lines
index
d18fb98910..5777f0da96100644doc/guides/prog_guide/vhost_lib.rst +0
-0@@ -420,3 +420,23 @@ Finally, a set of device ops is defined for devicespecific operations:
Quoted 36 lines
doc/guides/prog_guide/vhost_lib.rst +20
-0* ``get_notify_area`` Called to get the notify area info of the queue. + +Vhost async data path +--------------------- + +* Address mode + + Modern IOAT devices support to use the IOMMU, which can avoid using + the unsafe HPA. Besides, the CPU cycles took by SW to translate from + GPA to HPA can also be saved. So IOAT devices are defined to use + virtual address instead of physical address. + + With IOMMU enabled, to use IOAT devices: + 1. IOAT devices must be binded to vfio-pci, rather than igb_uio. + 2. DPDK must use ``--iova-mode=va``. + +* Fallback + + When the DMA copy fails, the user who implements the transfer_data + callback can fallback to SW copy or fallback to PA copy through + rte_mem_virt2iova().lib/vhost/vhost_user.c +1
-0@@ -45,6 +45,7 @@#include <rte_common.h> #include <rte_malloc.h> #include <rte_log.h> +#include <rte_vfio.h> #include "iotlb.h" #include "vhost.h" lib/vhost/vhost_user.c get_blk_size(int fd) · line 151
Quoted 10 lines
lib/vhost/vhost_user.c +7
-0@@ -141,6 +142,34 @@ get_blk_size(int fd)return ret ==-1 ? (uint64_t )-1 : (uint64_t )stat.st_blksize; } +static int +async_dma_map (struct rte_vhost_mem_region *region,bool do_map) +{ +int ret =0 ; +if (do_map) { +/* Add mapped region into the default container of DPDK. */ + ret =rte_vfio_container_dma_map(RTE_VFIO_DEFAULT_CONTAINER_FD,
lib/vhost/vhost_user.c get_blk_size(int fd)
Quoted 9 lines
lib/vhost/vhost_user.c +9
-0+ region->host_user_addr, + region->host_user_addr, + region->size); +if (ret) { +VHOST_LOG_CONFIG (ERR ,"DMA engine map failed\n" ); +return ret; + } + }else { +/* Remove mapped region from the default container of DPDK. */
lib/vhost/vhost_user.c get_blk_size(int fd) · line 161
Quoted 1 line
lib/vhost/vhost_user.c +1
-0+ ret =rte_vfio_container_dma_unmap(RTE_VFIO_DEFAULT_CONTAINER_FD,
lib/vhost/vhost_user.c get_blk_size(int fd)
Quoted 5 lines
lib/vhost/vhost_user.c +5
-0+ region->host_user_addr, + region->host_user_addr, + region->size); +if (ret) { + VHOST_LOG_CONFIG(ERR, "DMA engine unmapfailed\n");
Quoted 28 lines
lib/vhost/vhost_user.c +9
-5+return ret; + } + } +return ret; +} +static void free_mem_region (struct virtio_net *dev) {@@ -155,6 +184,9 @@ free_mem_region(struct virtio_net *dev)if (reg->host_user_addr) {munmap (reg->mmap_addr, reg->mmap_size);close (reg->fd); + +if (dev->async_copy) +async_dma_map (reg, false); } } }@@ -866,87 +898,6 @@ vhost_user_set_vring_base(struct virtio_net **pdev,return RTE_VHOST_MSG_RESULT_OK ; } -static int -add_one_guest_page (struct virtio_net *dev,uint64_t guest_phys_addr, -uint64_t host_phys_addr,uint64_t size) -{ -struct guest_page *page, *last_page;lib/vhost/vhost_user.c vhost_user_set_vring_base(struct virtio_net **pdev, · line 883
Quoted 10 lines
lib/vhost/vhost_user.c +0
-10-struct guest_page *old_pages; - -if (dev->nr_guest_pages == dev->max_guest_pages) { - dev->max_guest_pages *=2 ; - old_pages = dev->guest_pages; - dev->guest_pages =rte_realloc (dev->guest_pages, - dev->max_guest_pages *sizeof (*page), -RTE_CACHE_LINE_SIZE ); -if (dev->guest_pages ==NULL ) { - VHOST_LOG_CONFIG(ERR, "cannot reallocguest_pages\n");
Quoted 28 lines
lib/vhost/vhost_user.c +0
-28-rte_free (old_pages); -return -1 ; - } - } - -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_phys_addr == last_page->host_phys_addr + - last_page->size) { - last_page->size += size; -return 0 ; - } - } - - page = &dev->guest_pages[dev->nr_guest_pages++]; - page->guest_phys_addr = guest_phys_addr; - page->host_phys_addr = host_phys_addr; - page->size = size; - -return 0 ; -} - -static int -add_guest_pages (struct virtio_net *dev,struct rte_vhost_mem_region *reg, -uint64_t page_size) -{ -uint64_t reg_size = reg->size;lib/vhost/vhost_user.c vhost_user_set_vring_base(struct virtio_net **pdev,
Quoted 10 lines
lib/vhost/vhost_user.c +0
-10-uint64_t host_user_addr = reg->host_user_addr; -uint64_t guest_phys_addr = reg->guest_phys_addr; -uint64_t host_phys_addr; -uint64_t size; - - host_phys_addr =rte_mem_virt2iova ((void *)(uintptr_t )host_user_addr); - 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_phys_addr, size) <0)
Quoted 40 lines
lib/vhost/vhost_user.c +1
-28-return -1 ; - - host_user_addr += size; - guest_phys_addr += size; - reg_size -= size; - -while (reg_size >0 ) { - size =RTE_MIN (reg_size, page_size); - host_phys_addr =rte_mem_virt2iova ((void *)(uintptr_t ) - host_user_addr); -if (add_one_guest_page (dev, guest_phys_addr, host_phys_addr, - size) <0 ) -return -1 ; - - host_user_addr += size; - guest_phys_addr += size; - reg_size -= size; - } - -/* sort guest page array if over binary search threshold */ -if (dev->nr_guest_pages >=VHOST_BINARY_SEARCH_THRESH ) { -qsort ((void *)dev->guest_pages, dev->nr_guest_pages, -sizeof (struct guest_page ), guest_page_addrcmp); - } - -return 0 ; -} -#ifdef RTE_LIBRTE_VHOST_DEBUG /* TODO: enable it only in debug mode? */ static void@@ -1105,6 +1056,7 @@ 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) {lib/vhost/vhost_user.c vhost_user_mmap_region(struct virtio_net *dev, · line 1111
Quoted 2 lines
lib/vhost/vhost_user.c +0
-0@@ -1158,12 +1110,13 @@ vhost_user_mmap_region(struct virtio_net *dev, region->mmap_size = mmap_size; region->host_user_addr = (uint64_t)(uintptr_t)mmap_addr +
mmap_offset;lib/vhost/vhost_user.c vhost_user_mmap_region(struct virtio_net *dev,
Quoted 5 lines
lib/vhost/vhost_user.c +0
-4-if (dev->async_copy) -if (add_guest_pages (dev, region, alignment) <0 ) { - VHOST_LOG_CONFIG(ERR, - "adding guest pages to regionfailed.\n");
lib/vhost/vhost_user.c vhost_user_mmap_region(struct virtio_net *dev,
Quoted 4 lines
lib/vhost/vhost_user.c +4
-0+if (dev->async_copy) { + ret =async_dma_map (region, true); +if (ret) { + VHOST_LOG_CONFIG(ERR, "Configure IOMMU for DMAengine failed\n");
lib/vhost/vhost_user.c vhost_user_mmap_region(struct virtio_net *dev, · line 1117
Quoted 1 line
lib/vhost/vhost_user.c +0
-0return -1 ;Maybe we're too late in the init already, but I would think we may want to fallback to SW implementation insea
lib/vhost/virtio_net.c async_mbuf_to_desc(struct virtio_net *dev, struct
Quoted 11 lines
lib/vhost/vhost_user.c +2
-1- } + } + }VHOST_LOG_CONFIG (INFO , "guest memory region size: 0x%" PRIx64 "\n"lib/vhost/virtio_net.c +0
-0@@ -980,11 +980,9 @@ async_mbuf_to_desc(struct virtio_net *dev, struct
vhost_virtqueue*vq,lib/vhost/virtio_net.c async_mbuf_to_desc(struct virtio_net *dev,
Quoted 12 lines
lib/vhost/virtio_net.c +0
-2struct batch_copy_elem *batch_copy = vq->batch_copy_elems;struct virtio_net_hdr_mrg_rxbuf tmp_hdr, *hdr =NULL ;int error =0 ; -uint64_t mapped_len;uint32_t tlen =0 ;int tvec_idx =0 ; -void *hpa;if (unlikely (m ==NULL )) { error =-1 ;@@ -1074,27 +1072,19 @@ async_mbuf_to_desc(struct virtio_net *dev,struct
vhost_virtqueue*vq,Quoted 6 lines
lib/vhost/virtio_net.c +0
-3cpy_len =RTE_MIN (buf_avail, mbuf_avail); -while (unlikely (cpy_len && cpy_len >= cpy_threshold)) { - hpa = (void *)(uintptr_t)gpa_to_first_hpa(dev, - buf_iova + buf_offset,lib/vhost/virtio_net.c async_mbuf_to_desc(struct virtio_net *dev, struct vhost_virtqueue *vq,
Quoted 10 lines
lib/vhost/virtio_net.c +2
-7- cpy_len, &mapped_len); - -if (unlikely (!hpa || mapped_len < cpy_threshold)) -break ; - +if (unlikely (cpy_len >= cpy_threshold)) { async_fill_vec(src_iovec + tvec_idx, - (void *)(uintptr_t )rte_pktmbuf_iova_offset (m, - mbuf_offset), (size_t )mapped_len); + rte_pktmbuf_mtod_offset(m, void *,
mbuf_offset), (size_t)cpy_len);lib/vhost/virtio_net.c async_mbuf_to_desc(struct virtio_net *dev, struct vhost_virtqueue *vq,
Quoted 11 lines
lib/vhost/virtio_net.c +1
-8async_fill_vec(dst_iovec + tvec_idx, - hpa, (size_t )mapped_len); - - tlen += (uint32_t )mapped_len; - cpy_len -= (uint32_t )mapped_len; - mbuf_avail -= (uint32_t )mapped_len; - mbuf_offset += (uint32_t )mapped_len; - buf_avail -= (uint32_t )mapped_len; - buf_offset += (uint32_t )mapped_len; + (void *)((uintptr_t)(buf_addr + buf_offset)),(size_t)cpy_len);
Quoted 11 lines
lib/vhost/virtio_net.c +7
-0+ + tlen += cpy_len; + mbuf_avail -= cpy_len; + mbuf_offset += cpy_len; + buf_avail -= cpy_len; + buf_offset += cpy_len; + cpy_len =0 ; tvec_idx++; }
Re: [dpdk-dev] [PATCH v3] vhost: enable IOMMU for async vhost
Hi Xuan,
Quoted 45 lines · Xuan
Hi Maxime,
Replies are inline.
Quoted 18 lines
-----Original Message-----
From: Maxime Coquelin <[email protected]>
Sent: Saturday, June 19, 2021 12:18 AM
To: Ding, Xuan <[email protected]>; Xia, Chenbo <[email protected]>
Cc: [email protected]; Hu, Jiayu <[email protected]>; Pai G, Sunil <[email protected]>; Richardson, Bruce <[email protected]>; Van Haaren, Harry <[email protected]>; Liu, Yong <[email protected]>
Subject: Re: [PATCH v3] vhost: enable IOMMU for async vhostHi Xuan,
Quoted 6 lines · On 6/3/21 7:30 PM, [email protected] wrote:
From: Xuan Ding <[email protected]>
For async copy, it is unsafe to directly use the physical address. And current address translation from GPA to HPA via SW also takes CPU cycles, these can all benefit from IOMMU.
Quoted 7 lines
Quoted 3 lines
Since the existing DMA engine supports to use platform IOMMU, this patch enables IOMMU for async vhost, which defines IOAT devices to use virtual address instead of physical address.
We have to keep in mind a generic DMA api is coming, and maybe we want a SW implementation of a dmadev based on memcpy at least for testing/debugging purpose.
I noticed the generic dmadev model is under discussion. To support a SW implementation, the VA mode support is needed, this is also the problem that this patch hopes to solve. Traditionally, DMA engine can only use physical address in PA mode.
Quoted 10 lines
Quoted 9 lines
When set memory table, the frontend's memory will be mapped to the default container of DPDK where IOAT devices have been added into. When DMA copy fails, the virtual address provided to IOAT devices also allow us fallback to SW copy or PA copy.
With IOMMU enabled, to use IOAT devices:
1. IOAT devices must be binded to vfio-pci, rather thanigb_uio.
2. DPDK must use "--iova-mode=va".
Quoted 5 lines
Quoted 2 lines
I think this is problematic, at least we need to check the right iova mode has been selected, but even with doing that it is limiting.
As a library, vhost is not aware of the device selected address(PA or VA) and current DPDK iova mode. To some extent, this patch is a proposal.
If I'm not mistaken, the DMA device driver init should fail if it does not support the DPDK IOVA mode.
Then, on Vhost lib side, you should be able to get the IOVA mode by using the rte_eal_iova_mode() API.
Quoted 7 lines
With device fed with VA, SW fallback can be supported.
And VA can also be translated to PA throughrte_mem_virt2iova(). Finally, the address selected by the device is determined by callback. Not vice versa.If the DMA callback implementer follows this design, SW fallback can be supported. I would be very grateful if you could provide some insights for this design. :)
TBH, I find the async design too much complicated.
Having some descriptors handled by the DMA engine, others by the CPU makes it extremly hard to debug. Also, it makes Vhost library use less deterministic.
Quoted 5 lines
Quoted 3 lines
What prevent us to reuse
add_guest_pages()alogrithm to implementIOVA_AS_PA?If IOVA is PA, it's not easy to translate PA to VA to support SW implementation.
What prevent you to use dev->guest_pages[] in that case to do the translations?
Quoted 3 lines
Until now, I don't have any good ideas to be compatible with
IOVA_AS_PAandIOVA_AS_VAat the same time, because it requires vhost library to select PA/VA for DMA device according to different DPDK iova mode.
If the DMA device claims to support IOVA_AS_PA at probe time, it should be useable by the vhost library. It might not be the more efficient mode, but we cannot just have a comment in the documenation saying that IOVA_AS_VA is the only supported mode, without any safety check in the code itself.
Regards,
Maxime
Quoted 295 lines
Thanks,
XuanQuoted 291 lines
Quoted 11 lines
Signed-off-by Xuan Ding <[email protected]>---
v3:
* Fixed some typos.v2:
* Fixed a format issue.
* Added the dma unmap logic when device is closed.Review
Quoted 7 lines
--- doc/guides/prog_guide/vhost_lib.rst | 20 +++++ lib/vhost/vhost_user.c | 125 +++++++++------------------- lib/vhost/virtio_net.c | 30 +++---- 3 files changed, 69 insertions(+), 106 deletions(-)(quoted diff) +0
-0
b/doc/guides/prog_guide/vhost_lib.rstdoc/guides/prog_guide/vhost_lib.rst Finally, a set of device ops is defined for device
Quoted 4 lines
index
d18fb98910..5777f0da96100644doc/guides/prog_guide/vhost_lib.rst +0
-0@@ -420,3 +420,23 @@ Finally, a set of device ops is defined for devicespecific operations:
Quoted 36 lines
doc/guides/prog_guide/vhost_lib.rst +20
-0* ``get_notify_area`` Called to get the notify area info of the queue. + +Vhost async data path +--------------------- + +* Address mode + + Modern IOAT devices support to use the IOMMU, which can avoid using + the unsafe HPA. Besides, the CPU cycles took by SW to translate from + GPA to HPA can also be saved. So IOAT devices are defined to use + virtual address instead of physical address. + + With IOMMU enabled, to use IOAT devices: + 1. IOAT devices must be binded to vfio-pci, rather than igb_uio. + 2. DPDK must use ``--iova-mode=va``. + +* Fallback + + When the DMA copy fails, the user who implements the transfer_data + callback can fallback to SW copy or fallback to PA copy through + rte_mem_virt2iova().lib/vhost/vhost_user.c +1
-0@@ -45,6 +45,7 @@#include <rte_common.h> #include <rte_malloc.h> #include <rte_log.h> +#include <rte_vfio.h> #include "iotlb.h" #include "vhost.h" lib/vhost/vhost_user.c get_blk_size(int fd) · line 151
Quoted 10 lines
lib/vhost/vhost_user.c +7
-0@@ -141,6 +142,34 @@ get_blk_size(int fd)return ret ==-1 ? (uint64_t )-1 : (uint64_t )stat.st_blksize; } +static int +async_dma_map (struct rte_vhost_mem_region *region,bool do_map) +{ +int ret =0 ; +if (do_map) { +/* Add mapped region into the default container of DPDK. */ + ret =rte_vfio_container_dma_map(RTE_VFIO_DEFAULT_CONTAINER_FD,
lib/vhost/vhost_user.c get_blk_size(int fd)
Quoted 9 lines
lib/vhost/vhost_user.c +9
-0+ region->host_user_addr, + region->host_user_addr, + region->size); +if (ret) { +VHOST_LOG_CONFIG (ERR ,"DMA engine map failed\n" ); +return ret; + } + }else { +/* Remove mapped region from the default container of DPDK. */
lib/vhost/vhost_user.c get_blk_size(int fd) · line 161
Quoted 1 line
lib/vhost/vhost_user.c +1
-0+ ret =rte_vfio_container_dma_unmap(RTE_VFIO_DEFAULT_CONTAINER_FD,
lib/vhost/vhost_user.c get_blk_size(int fd)
Quoted 5 lines
lib/vhost/vhost_user.c +5
-0+ region->host_user_addr, + region->host_user_addr, + region->size); +if (ret) { + VHOST_LOG_CONFIG(ERR, "DMA engine unmapfailed\n");
Quoted 28 lines
lib/vhost/vhost_user.c +9
-5+return ret; + } + } +return ret; +} +static void free_mem_region (struct virtio_net *dev) {@@ -155,6 +184,9 @@ free_mem_region(struct virtio_net *dev)if (reg->host_user_addr) {munmap (reg->mmap_addr, reg->mmap_size);close (reg->fd); + +if (dev->async_copy) +async_dma_map (reg, false); } } }@@ -866,87 +898,6 @@ vhost_user_set_vring_base(struct virtio_net **pdev,return RTE_VHOST_MSG_RESULT_OK ; } -static int -add_one_guest_page (struct virtio_net *dev,uint64_t guest_phys_addr, -uint64_t host_phys_addr,uint64_t size) -{ -struct guest_page *page, *last_page;lib/vhost/vhost_user.c vhost_user_set_vring_base(struct virtio_net **pdev, · line 883
Quoted 10 lines
lib/vhost/vhost_user.c +0
-10-struct guest_page *old_pages; - -if (dev->nr_guest_pages == dev->max_guest_pages) { - dev->max_guest_pages *=2 ; - old_pages = dev->guest_pages; - dev->guest_pages =rte_realloc (dev->guest_pages, - dev->max_guest_pages *sizeof (*page), -RTE_CACHE_LINE_SIZE ); -if (dev->guest_pages ==NULL ) { - VHOST_LOG_CONFIG(ERR, "cannot reallocguest_pages\n");
Quoted 28 lines
lib/vhost/vhost_user.c +0
-28-rte_free (old_pages); -return -1 ; - } - } - -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_phys_addr == last_page->host_phys_addr + - last_page->size) { - last_page->size += size; -return 0 ; - } - } - - page = &dev->guest_pages[dev->nr_guest_pages++]; - page->guest_phys_addr = guest_phys_addr; - page->host_phys_addr = host_phys_addr; - page->size = size; - -return 0 ; -} - -static int -add_guest_pages (struct virtio_net *dev,struct rte_vhost_mem_region *reg, -uint64_t page_size) -{ -uint64_t reg_size = reg->size;lib/vhost/vhost_user.c vhost_user_set_vring_base(struct virtio_net **pdev,
Quoted 10 lines
lib/vhost/vhost_user.c +0
-10-uint64_t host_user_addr = reg->host_user_addr; -uint64_t guest_phys_addr = reg->guest_phys_addr; -uint64_t host_phys_addr; -uint64_t size; - - host_phys_addr =rte_mem_virt2iova ((void *)(uintptr_t )host_user_addr); - 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_phys_addr, size) <0)
Quoted 40 lines
lib/vhost/vhost_user.c +1
-28-return -1 ; - - host_user_addr += size; - guest_phys_addr += size; - reg_size -= size; - -while (reg_size >0 ) { - size =RTE_MIN (reg_size, page_size); - host_phys_addr =rte_mem_virt2iova ((void *)(uintptr_t ) - host_user_addr); -if (add_one_guest_page (dev, guest_phys_addr, host_phys_addr, - size) <0 ) -return -1 ; - - host_user_addr += size; - guest_phys_addr += size; - reg_size -= size; - } - -/* sort guest page array if over binary search threshold */ -if (dev->nr_guest_pages >=VHOST_BINARY_SEARCH_THRESH ) { -qsort ((void *)dev->guest_pages, dev->nr_guest_pages, -sizeof (struct guest_page ), guest_page_addrcmp); - } - -return 0 ; -} -#ifdef RTE_LIBRTE_VHOST_DEBUG /* TODO: enable it only in debug mode? */ static void@@ -1105,6 +1056,7 @@ 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) {lib/vhost/vhost_user.c vhost_user_mmap_region(struct virtio_net *dev, · line 1111
Quoted 2 lines
lib/vhost/vhost_user.c +0
-0@@ -1158,12 +1110,13 @@ vhost_user_mmap_region(struct virtio_net *dev, region->mmap_size = mmap_size; region->host_user_addr = (uint64_t)(uintptr_t)mmap_addr +
mmap_offset;lib/vhost/vhost_user.c vhost_user_mmap_region(struct virtio_net *dev,
Quoted 5 lines
lib/vhost/vhost_user.c +0
-4-if (dev->async_copy) -if (add_guest_pages (dev, region, alignment) <0 ) { - VHOST_LOG_CONFIG(ERR, - "adding guest pages to regionfailed.\n");
lib/vhost/vhost_user.c vhost_user_mmap_region(struct virtio_net *dev,
Quoted 4 lines
lib/vhost/vhost_user.c +4
-0+if (dev->async_copy) { + ret =async_dma_map (region, true); +if (ret) { + VHOST_LOG_CONFIG(ERR, "Configure IOMMU for DMAengine failed\n");
lib/vhost/vhost_user.c vhost_user_mmap_region(struct virtio_net *dev, · line 1117
Quoted 1 line
lib/vhost/vhost_user.c +0
-0return -1 ;Maybe we're too late in the init already, but I would think we may want to fallback to SW implementation insea
lib/vhost/virtio_net.c async_mbuf_to_desc(struct virtio_net *dev, struct
Quoted 11 lines
lib/vhost/vhost_user.c +2
-1- } + } + }VHOST_LOG_CONFIG (INFO , "guest memory region size: 0x%" PRIx64 "\n"lib/vhost/virtio_net.c +0
-0@@ -980,11 +980,9 @@ async_mbuf_to_desc(struct virtio_net *dev, struct
vhost_virtqueue*vq,lib/vhost/virtio_net.c async_mbuf_to_desc(struct virtio_net *dev,
Quoted 12 lines
lib/vhost/virtio_net.c +0
-2struct batch_copy_elem *batch_copy = vq->batch_copy_elems;struct virtio_net_hdr_mrg_rxbuf tmp_hdr, *hdr =NULL ;int error =0 ; -uint64_t mapped_len;uint32_t tlen =0 ;int tvec_idx =0 ; -void *hpa;if (unlikely (m ==NULL )) { error =-1 ;@@ -1074,27 +1072,19 @@ async_mbuf_to_desc(struct virtio_net *dev,struct
vhost_virtqueue*vq,Quoted 6 lines
lib/vhost/virtio_net.c +0
-3cpy_len =RTE_MIN (buf_avail, mbuf_avail); -while (unlikely (cpy_len && cpy_len >= cpy_threshold)) { - hpa = (void *)(uintptr_t)gpa_to_first_hpa(dev, - buf_iova + buf_offset,lib/vhost/virtio_net.c async_mbuf_to_desc(struct virtio_net *dev, struct vhost_virtqueue *vq,
Quoted 10 lines
lib/vhost/virtio_net.c +2
-7- cpy_len, &mapped_len); - -if (unlikely (!hpa || mapped_len < cpy_threshold)) -break ; - +if (unlikely (cpy_len >= cpy_threshold)) { async_fill_vec(src_iovec + tvec_idx, - (void *)(uintptr_t )rte_pktmbuf_iova_offset (m, - mbuf_offset), (size_t )mapped_len); + rte_pktmbuf_mtod_offset(m, void *,
mbuf_offset), (size_t)cpy_len);lib/vhost/virtio_net.c async_mbuf_to_desc(struct virtio_net *dev, struct vhost_virtqueue *vq,
Quoted 11 lines
lib/vhost/virtio_net.c +1
-8async_fill_vec(dst_iovec + tvec_idx, - hpa, (size_t )mapped_len); - - tlen += (uint32_t )mapped_len; - cpy_len -= (uint32_t )mapped_len; - mbuf_avail -= (uint32_t )mapped_len; - mbuf_offset += (uint32_t )mapped_len; - buf_avail -= (uint32_t )mapped_len; - buf_offset += (uint32_t )mapped_len; + (void *)((uintptr_t)(buf_addr + buf_offset)),(size_t)cpy_len);
Quoted 11 lines
lib/vhost/virtio_net.c +7
-0+ + tlen += cpy_len; + mbuf_avail -= cpy_len; + mbuf_offset += cpy_len; + buf_avail -= cpy_len; + buf_offset += cpy_len; + cpy_len =0 ; tvec_idx++; }
Re: [dpdk-dev] [PATCH v3] vhost: enable IOMMU for async vhost
Hi Maxime,
Quoted 62 lines
-----Original Message-----
From: Maxime Coquelin <[email protected]>
Sent: Tuesday, June 29, 2021 5:23 PM
To: Ding, Xuan <[email protected]>; Xia, Chenbo <[email protected]>
Cc: [email protected]; Hu, Jiayu <[email protected]>; Pai G, Sunil <[email protected]>; Richardson, Bruce <[email protected]>; Van Haaren, Harry <[email protected]>; Liu, Yong <[email protected]>; Jiang, Cheng1 <[email protected]>
Subject: Re: [PATCH v3] vhost: enable IOMMU for async vhostHi Xuan,
Quoted 10 lines · Xuan
Hi Maxime,
Replies are inline.
Quoted 6 lines
-----Original Message-----
From: Maxime Coquelin <[email protected]>
Sent: Saturday, June 19, 2021 12:18 AM
To: Ding, Xuan <[email protected]>; Xia, Chenbo <[email protected]>
Cc: [email protected]; Hu, Jiayu <[email protected]>; Pai G, Sunil <[email protected]>; Richardson, Bruce <[email protected]>;Van
Quoted 38 lines
Quoted 12 lines
Haaren, Harry <[email protected]>; Liu, Yong <[email protected]>
Subject: Re: [PATCH v3] vhost: enable IOMMU for async vhostHi Xuan,
Quoted 6 lines · On 6/3/21 7:30 PM, [email protected] wrote:
From: Xuan Ding <[email protected]>
For async copy, it is unsafe to directly use the physical address. And current address translation from GPA to HPA via SW also takes CPU cycles, these can all benefit from IOMMU.
Quoted 7 lines
Quoted 3 lines
Since the existing DMA engine supports to use platform IOMMU, this patch enables IOMMU for async vhost, which defines IOAT devices to use virtual address instead of physical address.
We have to keep in mind a generic DMA api is coming, and maybe we want a SW implementation of a dmadev based on memcpy at least for testing/debugging purpose.
I noticed the generic dmadev model is under discussion. To support a SW implementation, the VA mode support is needed, this is also the problem that this patch hopes to solve. Traditionally, DMA engine can only use physical address in PA mode.
Quoted 12 lines
Quoted 9 lines
When set memory table, the frontend's memory will be mapped to the default container of DPDK where IOAT devices have been added into. When DMA copy fails, the virtual address provided to IOAT devices also allow us fallback to SW copy or PA copy.
With IOMMU enabled, to use IOAT devices:
1. IOAT devices must be binded to vfio-pci, rather thanigb_uio.
2. DPDK must use "--iova-mode=va".I think this is problematic, at least we need to check the right iova mode has been selected, but even with doing that it is limiting.
Quoted 8 lines
Quoted 2 lines
As a library, vhost is not aware of the device selected address(PA or VA) and current DPDK iova mode. To some extent, this patch is a proposal.
If I'm not mistaken, the DMA device driver init should fail if it does not support the DPDK IOVA mode.
Then, on Vhost lib side, you should be able to get the IOVA mode by using the
rte_eal_iova_mode()API.
Get your point, if the Vhost lib is able to get the IOVA mode, I think it is possible to be compatible with different DPDK IOVA mode. I will work out a new patch to pass iova to callback instead of virtual address only.
Quoted 6 lines
Quoted 6 lines
With device fed with VA, SW fallback can be supported.
And VA can also be translated to PA throughrte_mem_virt2iova(). Finally, the address selected by the device is determined by callback. Not vice versa.
Quoted 8 lines
Quoted 1 line
If the DMA callback implementer follows this design, SW fallback can be
supported.
Quoted 1 line
I would be very grateful if you could provide some insights for this design. :)
TBH, I find the async design too much complicated.
Having some descriptors handled by the DMA engine, others by the CPU makes it extremly hard to debug. Also, it makes Vhost library use less deterministic.
Here is to consider the difference in copy efficiency. In the case of small packages (less than threshold), the performance of CPU copy is better. When the package length is bigger than the threshold, the DMA engine copy will get a big performance improvement.
Quoted 9 lines
Quoted 6 lines
Quoted 4 lines
What prevent us to reuse
add_guest_pages()alogrithm to implementIOVA_AS_PA?If IOVA is PA, it's not easy to translate PA to VA to support SW implementation.
What prevent you to use dev->guest_pages[] in that case to do the translations?
Yes, you are right, use rte_mem_iova2virt() can help to do so.
Quoted 10 lines
Quoted 4 lines
Until now, I don't have any good ideas to be compatible with
IOVA_AS_PAandIOVA_AS_VAat the same time, because it requires vhost library to select PA/VA for DMA device according to different DPDK iova mode.If the DMA device claims to support
IOVA_AS_PAat probe time, it should be useable by the vhost library. It might not be the more efficient mode, but we cannot just have a comment in the documenation saying thatIOVA_AS_VAis the only supported mode, without any safety check in the code itself.
Compatible with IOVA_AS_PA is possible, the reason for IOVA_AS_VA design is because VA is easier to operate. Thus some compatibility is sacrificed.
I will adopt your suggestion, thanks very much!
Regards,
Xuan
Quoted 302 lines
Regards,
MaximeQuoted 104 lines
Thanks,
XuanQuoted 101 lines
Quoted 11 lines
Signed-off-by Xuan Ding <[email protected]>---
v3:
* Fixed some typos.v2:
* Fixed a format issue.
* Added the dma unmap logic when device is closed.Review
Quoted 7 lines
--- doc/guides/prog_guide/vhost_lib.rst | 20 +++++ lib/vhost/vhost_user.c | 125 +++++++++------------------- lib/vhost/virtio_net.c | 30 +++---- 3 files changed, 69 insertions(+), 106 deletions(-)(quoted diff) +0
-0
b/doc/guides/prog_guide/vhost_lib.rstdoc/guides/prog_guide/vhost_lib.rst Finally, a set of device ops is defined for device
Quoted 4 lines
index
d18fb98910..5777f0da96100644doc/guides/prog_guide/vhost_lib.rst +0
-0@@ -420,3 +420,23 @@ Finally, a set of device ops is defined for devicespecific operations:
Quoted 36 lines
doc/guides/prog_guide/vhost_lib.rst +20
-0* ``get_notify_area`` Called to get the notify area info of the queue. + +Vhost async data path +--------------------- + +* Address mode + + Modern IOAT devices support to use the IOMMU, which can avoid using + the unsafe HPA. Besides, the CPU cycles took by SW to translate from + GPA to HPA can also be saved. So IOAT devices are defined to use + virtual address instead of physical address. + + With IOMMU enabled, to use IOAT devices: + 1. IOAT devices must be binded to vfio-pci, rather than igb_uio. + 2. DPDK must use ``--iova-mode=va``. + +* Fallback + + When the DMA copy fails, the user who implements the transfer_data + callback can fallback to SW copy or fallback to PA copy through + rte_mem_virt2iova().lib/vhost/vhost_user.c +1
-0@@ -45,6 +45,7 @@#include <rte_common.h> #include <rte_malloc.h> #include <rte_log.h> +#include <rte_vfio.h> #include "iotlb.h" #include "vhost.h" lib/vhost/vhost_user.c get_blk_size(int fd) · line 151
Quoted 10 lines
lib/vhost/vhost_user.c +7
-0@@ -141,6 +142,34 @@ get_blk_size(int fd)return ret ==-1 ? (uint64_t )-1 : (uint64_t )stat.st_blksize; } +static int +async_dma_map (struct rte_vhost_mem_region *region,bool do_map) +{ +int ret =0 ; +if (do_map) { +/* Add mapped region into the default container of DPDK. */ + ret =rte_vfio_container_dma_map(RTE_VFIO_DEFAULT_CONTAINER_FD,
lib/vhost/vhost_user.c get_blk_size(int fd)
Quoted 9 lines
lib/vhost/vhost_user.c +9
-0+ region->host_user_addr, + region->host_user_addr, + region->size); +if (ret) { +VHOST_LOG_CONFIG (ERR ,"DMA engine map failed\n" ); +return ret; + } + }else { +/* Remove mapped region from the default container of DPDK. */
lib/vhost/vhost_user.c get_blk_size(int fd) · line 161
Quoted 1 line
lib/vhost/vhost_user.c +1
-0+ ret =rte_vfio_container_dma_unmap(RTE_VFIO_DEFAULT_CONTAINER_FD,
lib/vhost/vhost_user.c get_blk_size(int fd)
Quoted 5 lines
lib/vhost/vhost_user.c +5
-0+ region->host_user_addr, + region->host_user_addr, + region->size); +if (ret) { + VHOST_LOG_CONFIG(ERR, "DMA engine unmapfailed\n");
Quoted 12 lines
lib/vhost/vhost_user.c +6
-0+return ret; + } + } +return ret; +} +static void free_mem_region (struct virtio_net *dev) {@@ -155,6 +184,9 @@ free_mem_region(struct virtio_net *dev)if (reg->host_user_addr) {munmap (reg->mmap_addr, reg->mmap_size);Quoted 8 lines
Quoted 8 lines
lib/vhost/vhost_user.c vhost_user_set_vring_base(struct virtio_net
Quoted 8 lines
lib/vhost/vhost_user.c +3
-0close (reg->fd); + +if (dev->async_copy) +async_dma_map (reg, false); } } }@@ -866,87 +898,6 @@ vhost_user_set_vring_base(struct virtio_net**pdev,
Quoted 36 lines
Quoted 36 lines
Quoted 8 lines
lib/vhost/vhost_user.c +0
-5return RTE_VHOST_MSG_RESULT_OK ; } -static int -add_one_guest_page (struct virtio_net *dev,uint64_t guest_phys_addr, -uint64_t host_phys_addr,uint64_t size) -{ -struct guest_page *page, *last_page;lib/vhost/vhost_user.c vhost_user_set_vring_base(struct virtio_net **pdev,
Quoted 10 lines
lib/vhost/vhost_user.c +0
-10-struct guest_page *old_pages; - -if (dev->nr_guest_pages == dev->max_guest_pages) { - dev->max_guest_pages *=2 ; - old_pages = dev->guest_pages; - dev->guest_pages =rte_realloc (dev->guest_pages, - dev->max_guest_pages *sizeof (*page), -RTE_CACHE_LINE_SIZE ); -if (dev->guest_pages ==NULL ) { - VHOST_LOG_CONFIG(ERR, "cannot reallocguest_pages\n");
Quoted 17 lines
lib/vhost/vhost_user.c +0
-17-rte_free (old_pages); -return -1 ; - } - } - -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_phys_addr == last_page->host_phys_addr + - last_page->size) { - last_page->size += size; -return 0 ; - } - } - - page = &dev->guest_pages[dev->nr_guest_pages++]; - page->guest_phys_addr = guest_phys_addr;Quoted 8 lines
Quoted 8 lines
lib/vhost/vhost_user.c vhost_user_set_vring_base(struct virtio_net **pdev,
Quoted 8 lines
lib/vhost/vhost_user.c +0
-8- page->host_phys_addr = host_phys_addr; - page->size = size; - -return 0 ; -} - -static int -add_guest_pages(struct virtio_net *dev, struct rte_vhost_mem_region*reg,
Quoted 51 lines
Quoted 51 lines
lib/vhost/vhost_user.c vhost_user_set_vring_base(struct virtio_net **pdev,
Quoted 13 lines
lib/vhost/vhost_user.c +0
-13- uint64_t page_size) -{ -uint64_t reg_size = reg->size; -uint64_t host_user_addr = reg->host_user_addr; -uint64_t guest_phys_addr = reg->guest_phys_addr; -uint64_t host_phys_addr; -uint64_t size; - - host_phys_addr =rte_mem_virt2iova ((void *)(uintptr_t )host_user_addr); - 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_phys_addr, size) <0)
Quoted 37 lines
lib/vhost/vhost_user.c +1
-28-return -1 ; - - host_user_addr += size; - guest_phys_addr += size; - reg_size -= size; - -while (reg_size >0 ) { - size =RTE_MIN (reg_size, page_size); - host_phys_addr =rte_mem_virt2iova ((void *)(uintptr_t ) - host_user_addr); -if (add_one_guest_page (dev, guest_phys_addr, host_phys_addr, - size) <0 ) -return -1 ; - - host_user_addr += size; - guest_phys_addr += size; - reg_size -= size; - } - -/* sort guest page array if over binary search threshold */ -if (dev->nr_guest_pages >=VHOST_BINARY_SEARCH_THRESH ) { -qsort ((void *)dev->guest_pages, dev->nr_guest_pages, -sizeof (struct guest_page ), guest_page_addrcmp); - } - -return 0 ; -} -#ifdef RTE_LIBRTE_VHOST_DEBUG /* TODO: enable it only in debug mode? */ static void@@ -1105,6 +1056,7 @@ vhost_user_mmap_region(struct virtio_net *dev,uint64_t mmap_size;uint64_t alignment;int populate; +int ret;Quoted 3 lines
Quoted 3 lines
lib/vhost/vhost_user.c vhost_user_mmap_region(struct virtio_net
Quoted 3 lines
lib/vhost/vhost_user.c +0
-0/* Check for memory_size + mmap_offset overflow */ if (mmap_offset >= -region->size) {@@ -1158,12 +1110,13 @@ vhost_user_mmap_region(struct virtio_net*dev,
Quoted 85 lines
Quoted 84 lines
lib/vhost/vhost_user.c vhost_user_mmap_region(struct virtio_net · line 1111
Quoted 2 lines
lib/vhost/vhost_user.c +0
-0region->mmap_size = mmap_size; region->host_user_addr = (uint64_t)(uintptr_t)mmap_addr +
mmap_offset;lib/vhost/vhost_user.c vhost_user_mmap_region(struct virtio_net *dev,
Quoted 5 lines
lib/vhost/vhost_user.c +0
-4-if (dev->async_copy) -if (add_guest_pages (dev, region, alignment) <0 ) { - VHOST_LOG_CONFIG(ERR, - "adding guest pages to regionfailed.\n");
lib/vhost/vhost_user.c vhost_user_mmap_region(struct virtio_net *dev,
Quoted 4 lines
lib/vhost/vhost_user.c +4
-0+if (dev->async_copy) { + ret =async_dma_map (region, true); +if (ret) { + VHOST_LOG_CONFIG(ERR, "Configure IOMMU for DMAengine failed\n");
lib/vhost/vhost_user.c vhost_user_mmap_region(struct virtio_net *dev, · line 1117
Quoted 1 line
lib/vhost/vhost_user.c +0
-0return -1 ;Maybe we're too late in the init already, but I would think we may want to fallback to SW implementation insea
lib/vhost/virtio_net.c async_mbuf_to_desc(struct virtio_net *dev, struct
Quoted 11 lines
lib/vhost/vhost_user.c +2
-1- } + } + }VHOST_LOG_CONFIG (INFO , "guest memory region size: 0x%" PRIx64 "\n"lib/vhost/virtio_net.c +0
-0@@ -980,11 +980,9 @@ async_mbuf_to_desc(struct virtio_net *dev, struct
vhost_virtqueue*vq,lib/vhost/virtio_net.c async_mbuf_to_desc(struct virtio_net *dev,
Quoted 12 lines
lib/vhost/virtio_net.c +0
-2struct batch_copy_elem *batch_copy = vq->batch_copy_elems;struct virtio_net_hdr_mrg_rxbuf tmp_hdr, *hdr =NULL ;int error =0 ; -uint64_t mapped_len;uint32_t tlen =0 ;int tvec_idx =0 ; -void *hpa;if (unlikely (m ==NULL )) { error =-1 ;@@ -1074,27 +1072,19 @@ async_mbuf_to_desc(struct virtio_net *dev,struct
vhost_virtqueue*vq,Quoted 6 lines
lib/vhost/virtio_net.c +0
-3cpy_len =RTE_MIN (buf_avail, mbuf_avail); -while (unlikely (cpy_len && cpy_len >= cpy_threshold)) { - hpa = (void *)(uintptr_t)gpa_to_first_hpa(dev, - buf_iova + buf_offset,lib/vhost/virtio_net.c async_mbuf_to_desc(struct virtio_net *dev, struct vhost_virtqueue *vq,
Quoted 10 lines
lib/vhost/virtio_net.c +2
-7- cpy_len, &mapped_len); - -if (unlikely (!hpa || mapped_len < cpy_threshold)) -break ; - +if (unlikely (cpy_len >= cpy_threshold)) { async_fill_vec(src_iovec + tvec_idx, - (void *)(uintptr_t )rte_pktmbuf_iova_offset (m, - mbuf_offset), (size_t )mapped_len); + rte_pktmbuf_mtod_offset(m, void *,
mbuf_offset), (size_t)cpy_len);lib/vhost/virtio_net.c async_mbuf_to_desc(struct virtio_net *dev, struct vhost_virtqueue *vq,
Quoted 11 lines
lib/vhost/virtio_net.c +1
-8async_fill_vec(dst_iovec + tvec_idx, - hpa, (size_t )mapped_len); - - tlen += (uint32_t )mapped_len; - cpy_len -= (uint32_t )mapped_len; - mbuf_avail -= (uint32_t )mapped_len; - mbuf_offset += (uint32_t )mapped_len; - buf_avail -= (uint32_t )mapped_len; - buf_offset += (uint32_t )mapped_len; + (void *)((uintptr_t)(buf_addr + buf_offset)),(size_t)cpy_len);
Quoted 11 lines
lib/vhost/virtio_net.c +7
-0+ + tlen += cpy_len; + mbuf_avail -= cpy_len; + mbuf_offset += cpy_len; + buf_avail -= cpy_len; + buf_offset += cpy_len; + cpy_len =0 ; tvec_idx++; }
v4 cover vhost: add IOMMU support in async data path
In reply to [email protected]This patch series expands the capability of DMA devices to use IOMMU. When application tells the library the DMA device is bound to vfio, the IOMMU will be programmed for guest memory.
v4:
* Added the compatibility with IOVA_AS_PA.
* Revised the commit log that the IOMMU capability is added for DMA device.
* Changed single patch to patchset, added a new flag parsing in example.
v3:
* Fixed some typos.
v2:
* Fixed a format issue.
* Added the dma unmap logic when device is closed.
Xuan Ding (2):
vhost: enable IOMMU for async vhost
example/vhost: add dma vfio parsing
doc/guides/prog_guide/vhost_lib.rst | 9 ++++++ doc/guides/sample_app_ug/vhost.rst | 7 +++++ examples/vhost/main.c | 16 +++++++++- lib/vhost/rte_vhost.h | 1 + lib/vhost/socket.c | 9 ++++++ lib/vhost/vhost.h | 1 + lib/vhost/vhost_user.c | 46 ++++++++++++++++++++++++++++- 7 files changed, 87 insertions(+), 2 deletions(-)
Signature · 1 line
2.17.1
PATCH v4 1/2 vhost: enable IOMMU for async vhost
The use of IOMMU has many advantages, such as isolation and address translation. This patch extends the capbility of DMA engine to use IOMMU if the DMA device is bound to vfio.
When set memory table, the guest memory will be mapped into the default container of DPDK.
--- doc/guides/prog_guide/vhost_lib.rst | 9 ++++++ lib/vhost/rte_vhost.h | 1 + lib/vhost/socket.c | 9 ++++++ lib/vhost/vhost.h | 1 + lib/vhost/vhost_user.c | 46 ++++++++++++++++++++++++++++- 5 files changed, 65 insertions(+), 1 deletion(-)
doc/guides/prog_guide/vhost_lib.rst +9 -0
@@ -118,6 +118,15 @@ The following is an overview of some key Vhost API functions: It is disabled by default. + - ``RTE_VHOST_USER_ASYNC_USE_VFIO`` + + In asynchronous data path, vhost liarary is not aware of which driver + (igb_uio/vfio) the DMA device is bound to. Application should pass + this flag to tell vhost library whether IOMMU should be programmed + for guest memory. + + It is disabled by default. + - ``RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS`` Since v16.04, the vhost library forwards checksum and gso requests for
lib/vhost/rte_vhost.h +1 -0
@@ -37,6 +37,7 @@ extern "C" {#define RTE_VHOST_USER_LINEARBUF_SUPPORT (1ULL << 6)#define RTE_VHOST_USER_ASYNC_COPY (1ULL << 7)#define RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS (1ULL << 8) +#define RTE_VHOST_USER_ASYNC_USE_VFIO (1ULL << 9)/* Features. */ #ifndef VIRTIO_NET_F_GUEST_ANNOUNCE
lib/vhost/socket.c +9 -0
@@ -42,6 +42,7 @@ struct vhost_user_socket {bool extbuf;bool linearbuf;bool async_copy; +bool async_use_vfio;bool net_compliant_ol_flags;/*
@@ -243,6 +244,13 @@ vhost_user_add_connection(int fd, struct vhost_user_socket *vsocket) dev->async_copy =1 ; } +if (vsocket->async_use_vfio) { + dev =get_device (vid); + +if (dev) + dev->async_use_vfio =1 ; + } +VHOST_LOG_CONFIG (INFO ,"new device, handle is %d\n" , vid);if (vsocket->notify_ops->new_connection) {
@@ -879,6 +887,7 @@ rte_vhost_driver_register(const char *path, uint64_t flags) vsocket->extbuf = flags &RTE_VHOST_USER_EXTBUF_SUPPORT ; vsocket->linearbuf = flags &RTE_VHOST_USER_LINEARBUF_SUPPORT ; vsocket->async_copy = flags &RTE_VHOST_USER_ASYNC_COPY ; + vsocket->async_use_vfio = flags &RTE_VHOST_USER_ASYNC_USE_VFIO ; vsocket->net_compliant_ol_flags = flags &RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS ; if (vsocket->async_copy &&
lib/vhost/vhost.h +1 -0
@@ -370,6 +370,7 @@ struct virtio_net {int16_t broadcast_rarp;uint32_t nr_vring;int async_copy; +int async_use_vfio;int extbuf;int linearbuf;struct vhost_virtqueue *virtqueue[VHOST_MAX_QUEUE_PAIRS *2 ];
lib/vhost/vhost_user.c +45 -1
82 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v4 2/2 example/vhost: add dma vfio parsing
In reply to Xuan DingThis patch adds the dma-vfio argument parsing for async vhost driver. This argument can help to determine whether IOMMU needs to be programmed for guest memory.
--- doc/guides/sample_app_ug/vhost.rst | 7 +++++++ examples/vhost/main.c | 16 +++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-)
doc/guides/sample_app_ug/vhost.rst +7 -0
@@ -176,6 +176,13 @@ operation. The index of the device corresponds to the socket file in order, that means vhost device 0 is created through the first socket file, vhost device 1 is created through the second socket file, and so on. +**--dma-vfio** +This parameter is used to specify whether the IOMMU needs to be programmed. +If the DMA device is bound to vfio, IOMMU dma mapping will be setup for +guest memory. If igb_uio is bound by DMA device, there is no need to do +IOMMU dma mapping. It is a supplementary parameter for async vhost-user +driver and it is disabled by default. + Common Issues -------------
examples/vhost/main.c +15 -1
@@ -89,6 +89,8 @@ static uint32_t enable_tx_csum;/* Disable TSO offload */ static uint32_t enable_tso; +static uint32_t dma_use_vfio =0 ; +static int client_mode;static int builtin_net_driver;
@@ -472,7 +474,8 @@ us_vhost_usage(const char *prgname)" --tso [0|1] disable/enable TCP segment offload.\n" " --client register a vhost-user socket as client mode.\n" " --dma-type register dma type for your vhost async driver. For example \"ioat\" for now.\n" -" --dmas register dma channel for specific vhost device.\n" , +" --dmas register dma channel for specific vhost device.\n" +" --dma-vfio [0|1]: 0: DMA device uses igb_uio, 1: DMA device uses vfio\n" , prgname); }
@@ -503,6 +506,8 @@ enum {OPT_DMA_TYPE_NUM , #define OPT_DMAS "dmas"OPT_DMAS_NUM , +#define OPT_DMA_VFIO "dma-vfio" + OPT_DMA_VFIO_NUM, };/*
@@ -542,6 +547,8 @@ us_vhost_parse_args(int argc, char **argv) NULL, OPT_DMA_TYPE_NUM}, {OPT_DMAS , required_argument, NULL, OPT_DMAS_NUM}, + {OPT_DMA_VFIO, required_argument, + NULL, OPT_DMA_VFIO_NUM}, {NULL, 0, 0, 0}, };
@@ -679,6 +686,10 @@ us_vhost_parse_args(int argc, char **argv) }break ; +case OPT_DMA_VFIO_NUM : + dma_use_vfio =1 ; +break ; +case OPT_CLIENT_NUM : client_mode =1 ;break ;
@@ -1788,6 +1799,9 @@ main(int argc, char *argv[])if (client_mode) flags |=RTE_VHOST_USER_CLIENT ; +if (dma_use_vfio) + flags |=RTE_VHOST_USER_ASYNC_USE_VFIO ; +/* Register vhost user driver to handle vhost messages. */ for (i =0 ; i < nb_sockets; i++) {char *file = socket_files + i *PATH_MAX ;
Signature · 1 line
2.17.1
v5 cover vhost: add IOMMU support in async data path
In reply to [email protected]This patch series expands the capability of DMA devices to use IOMMU. When application informs the library the DMA device is bound to vfio, the IOMMU will be programmed for guest memory.
v5:
* Fixed a coding style issue.
v4:
* Added the compatibility with IOVA_AS_PA.
* Revised the commit log that the IOMMU capability is added for DMA
* device.
* Changed single patch to patchset, added a new flag parsing in example.
v3:
* Fixed some typos.
v2:
* Fixed a format issue.
* Added the dma unmap logic when device is closed.
Xuan Ding (2):
vhost: enable IOMMU for async vhost
example/vhost: add dma vfio parsing
doc/guides/prog_guide/vhost_lib.rst | 9 ++++++ doc/guides/sample_app_ug/vhost.rst | 7 +++++ examples/vhost/main.c | 16 +++++++++- lib/vhost/rte_vhost.h | 1 + lib/vhost/socket.c | 9 ++++++ lib/vhost/vhost.h | 1 + lib/vhost/vhost_user.c | 46 ++++++++++++++++++++++++++++- 7 files changed, 87 insertions(+), 2 deletions(-)
Signature · 1 line
2.17.1
PATCH v5 1/2 vhost: enable IOMMU for async vhost
The use of IOMMU has many advantages, such as isolation and address translation. This patch extends the capbility of DMA engine to use IOMMU if the DMA device is bound to vfio.
When set memory table, the guest memory will be mapped into the default container of DPDK.
--- doc/guides/prog_guide/vhost_lib.rst | 9 ++++++ lib/vhost/rte_vhost.h | 1 + lib/vhost/socket.c | 9 ++++++ lib/vhost/vhost.h | 1 + lib/vhost/vhost_user.c | 46 ++++++++++++++++++++++++++++- 5 files changed, 65 insertions(+), 1 deletion(-)
doc/guides/prog_guide/vhost_lib.rst +9 -0
@@ -118,6 +118,15 @@ The following is an overview of some key Vhost API functions: It is disabled by default. + - ``RTE_VHOST_USER_ASYNC_USE_VFIO`` + + In asynchronous data path, vhost liarary is not aware of which driver + (igb_uio/vfio) the DMA device is bound to. Application should pass + this flag to tell vhost library whether IOMMU should be programmed + for guest memory. + + It is disabled by default. + - ``RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS`` Since v16.04, the vhost library forwards checksum and gso requests for
lib/vhost/rte_vhost.h +1 -0
@@ -37,6 +37,7 @@ extern "C" {#define RTE_VHOST_USER_LINEARBUF_SUPPORT (1ULL << 6)#define RTE_VHOST_USER_ASYNC_COPY (1ULL << 7)#define RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS (1ULL << 8) +#define RTE_VHOST_USER_ASYNC_USE_VFIO (1ULL << 9)/* Features. */ #ifndef VIRTIO_NET_F_GUEST_ANNOUNCE
lib/vhost/socket.c +9 -0
@@ -42,6 +42,7 @@ struct vhost_user_socket {bool extbuf;bool linearbuf;bool async_copy; +bool async_use_vfio;bool net_compliant_ol_flags;/*
@@ -243,6 +244,13 @@ vhost_user_add_connection(int fd, struct vhost_user_socket *vsocket) dev->async_copy =1 ; } +if (vsocket->async_use_vfio) { + dev =get_device (vid); + +if (dev) + dev->async_use_vfio =1 ; + } +VHOST_LOG_CONFIG (INFO ,"new device, handle is %d\n" , vid);if (vsocket->notify_ops->new_connection) {
@@ -879,6 +887,7 @@ rte_vhost_driver_register(const char *path, uint64_t flags) vsocket->extbuf = flags &RTE_VHOST_USER_EXTBUF_SUPPORT ; vsocket->linearbuf = flags &RTE_VHOST_USER_LINEARBUF_SUPPORT ; vsocket->async_copy = flags &RTE_VHOST_USER_ASYNC_COPY ; + vsocket->async_use_vfio = flags &RTE_VHOST_USER_ASYNC_USE_VFIO ; vsocket->net_compliant_ol_flags = flags &RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS ; if (vsocket->async_copy &&
lib/vhost/vhost.h +1 -0
@@ -370,6 +370,7 @@ struct virtio_net {int16_t broadcast_rarp;uint32_t nr_vring;int async_copy; +int async_use_vfio;int extbuf;int linearbuf;struct vhost_virtqueue *virtqueue[VHOST_MAX_QUEUE_PAIRS *2 ];
lib/vhost/vhost_user.c +45 -1
82 lines not on this page · raw message
Signature · 1 line
2.17.1
Re: [dpdk-dev] [PATCH v5 1/2] vhost: enable IOMMU for async vhost
Quoted 129 lines · Xuan Ding
The use of IOMMU has many advantages, such as isolation and address translation. This patch extends the capbility of DMA engine to use IOMMU if the DMA device is bound to vfio.
When set memory table, the guest memory will be mapped into the default container of DPDK.
Signed-off-by Xuan Ding <[email protected]>--- doc/guides/prog_guide/vhost_lib.rst | 9 ++++++ lib/vhost/rte_vhost.h | 1 + lib/vhost/socket.c | 9 ++++++ lib/vhost/vhost.h | 1 + lib/vhost/vhost_user.c | 46 ++++++++++++++++++++++++++++- 5 files changed, 65 insertions(+), 1 deletion(-)doc/guides/prog_guide/vhost_lib.rst +9
-0@@ -118,6 +118,15 @@ The following is an overview of some key Vhost API functions: It is disabled by default. + - ``RTE_VHOST_USER_ASYNC_USE_VFIO`` + + In asynchronous data path, vhost liarary is not aware of which driver + (igb_uio/vfio) the DMA device is bound to. Application should pass + this flag to tell vhost library whether IOMMU should be programmed + for guest memory. + + It is disabled by default. + - ``RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS`` Since v16.04, the vhost library forwards checksum and gso requests forlib/vhost/rte_vhost.h +1
-0@@ -37,6 +37,7 @@ extern "C" {#define RTE_VHOST_USER_LINEARBUF_SUPPORT (1ULL << 6)#define RTE_VHOST_USER_ASYNC_COPY (1ULL << 7)#define RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS (1ULL << 8) +#define RTE_VHOST_USER_ASYNC_USE_VFIO (1ULL << 9)/* Features. */ #ifndef VIRTIO_NET_F_GUEST_ANNOUNCE lib/vhost/socket.c +9
-0@@ -42,6 +42,7 @@ struct vhost_user_socket {bool extbuf;bool linearbuf;bool async_copy; +bool async_use_vfio;bool net_compliant_ol_flags;/* @@ -243,6 +244,13 @@ vhost_user_add_connection(int fd, struct vhost_user_socket *vsocket) dev->async_copy =1 ; } +if (vsocket->async_use_vfio) { + dev =get_device (vid); + +if (dev) + dev->async_use_vfio =1 ; + } +VHOST_LOG_CONFIG (INFO ,"new device, handle is %d\n" , vid);if (vsocket->notify_ops->new_connection) {@@ -879,6 +887,7 @@ rte_vhost_driver_register(const char *path, uint64_t flags) vsocket->extbuf = flags &RTE_VHOST_USER_EXTBUF_SUPPORT ; vsocket->linearbuf = flags &RTE_VHOST_USER_LINEARBUF_SUPPORT ; vsocket->async_copy = flags &RTE_VHOST_USER_ASYNC_COPY ; + vsocket->async_use_vfio = flags &RTE_VHOST_USER_ASYNC_USE_VFIO ; vsocket->net_compliant_ol_flags = flags &RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS ; if (vsocket->async_copy &&lib/vhost/vhost.h +1
-0@@ -370,6 +370,7 @@ struct virtio_net {int16_t broadcast_rarp;uint32_t nr_vring;int async_copy; +int async_use_vfio;int extbuf;int linearbuf;struct vhost_virtqueue *virtqueue[VHOST_MAX_QUEUE_PAIRS *2 ];lib/vhost/vhost_user.c +20
-0@@ -45,6 +45,7 @@#include <rte_common.h> #include <rte_malloc.h> #include <rte_log.h> +#include <rte_vfio.h> #include "iotlb.h" #include "vhost.h" @@ -141,6 +142,36 @@ get_blk_size(int fd)return ret ==-1 ? (uint64_t )-1 : (uint64_t )stat.st_blksize; } +static int +async_dma_map (struct rte_vhost_mem_region *region,bool do_map) +{ +int ret =0 ; +uint64_t host_iova; + 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) { +VHOST_LOG_CONFIG (ERR ,"DMA engine map failed\n" ); +return ret; + } + }else { +/* Remove mapped region from the default container of DPDK. */ + ret = rte_vfio_container_dma_unmap(RTE_VFIO_DEFAULT_CONTAINER_FD,
lib/vhost/vhost_user.c get_blk_size(int fd) · line 173
Quoted 10 lines
lib/vhost/vhost_user.c +10
-0+ region->host_user_addr, + host_iova, + region->size); +if (ret) { +VHOST_LOG_CONFIG (ERR ,"DMA engine unmap failed\n" ); +return ret; + } + } +return ret; +}
We've been discussing this off list with Xuan, and unfortunately this is a blocker for now.
Currently, the x86 IOMMU does not support partial unmap - the segments have to be unmapped exactly the same addr/len as they were mapped. We also concatenate adjacent mappings to prevent filling up the DMA mapping entry table with superfluous entries.
This means that, when two unrelated mappings are contiguous in memory (e.g. if you map regions 1 and 2 independently, but they happen to be sitting right next to each other in virtual memory), we cannot later unmap one of them because, even though these are two separate mappings as far as kernel VFIO infrastructure is concerned, the mapping gets compacted and looks like one single mapping to VFIO, so DPDK API will not let us unmap region 1 without also unmapping region 2.
The proper fix for this problem would be to always map memory page-by-page regardless of where it comes from (we already do that for internal memory, but not for external). However, the reason this works for internal memory is because when mapping internal memory segments, *we know the page size*. For external memory segments, there is no such guarantee, so we cannot deduce page size for a given memory segment, and thus can't map things page-by-page.
So, the proper fix for it would be to add page size to the VFIO DMA API. Unfortunately, it probably has to wait until 21.11 because it is an API change.
The slightly hacky fix for this would be to forego user mem map concatenation and trust that user is not going to do anything stupid, and will not spam the VFIO DMA API without reason. I would rather not go down this road, but this could be an option in this case.
Thoughts?
Signature · 2 lines
Thanks, Anatoly
Re: [dpdk-dev] [PATCH v5 1/2] vhost: enable IOMMU for async vhost
Quoted 168 lines · Anatoly
Quoted 130 lines · Xuan Ding
The use of IOMMU has many advantages, such as isolation and address translation. This patch extends the capbility of DMA engine to use IOMMU if the DMA device is bound to vfio.
When set memory table, the guest memory will be mapped into the default container of DPDK.
Signed-off-by Xuan Ding <[email protected]>---
doc/guides/prog_guide/vhost_lib.rst| 9 ++++++ lib/vhost/rte_vhost.h | 1 + lib/vhost/socket.c | 9 ++++++ lib/vhost/vhost.h | 1 + lib/vhost/vhost_user.c | 46 ++++++++++++++++++++++++++++-5 files changed, 65 insertions(+), 1 deletion(-)doc/guides/prog_guide/vhost_lib.rst +0
-0@@ -118,6 +118,15 @@ The following is an overview of some key VhostAPI functions:
It is disabled by default.
+ - ``RTE_VHOST_USER_ASYNC_USE_VFIO``
+
+ In asynchronous data path, vhost liarary is not aware of which driver
+ (igb_uio/vfio) the DMA device is bound to. Application should pass + this flag to tell vhost library whether IOMMU should be programmed + for guest memory.doc/guides/prog_guide/vhost_lib.rst +3
-0+ + It is disabled by default. +- ``RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS``
Since v16.04, the vhost library forwards checksum and gso requests forlib/vhost/rte_vhost.h +1
-0@@ -37,6 +37,7 @@ extern "C" { #define RTE_VHOST_USER_LINEARBUF_SUPPORT (1ULL << 6) #define RTE_VHOST_USER_ASYNC_COPY (1ULL << 7) #define RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS (1ULL << 8) +#define RTE_VHOST_USER_ASYNC_USE_VFIO (1ULL << 9) /* Features. */ #ifndef VIRTIO_NET_F_GUEST_ANNOUNCElib/vhost/socket.c +8
-0@@ -42,6 +42,7 @@ struct vhost_user_socket { bool extbuf; bool linearbuf; bool async_copy; + bool async_use_vfio; bool net_compliant_ol_flags; /*@@ -243,6 +244,13 @@ vhost_user_add_connection(int fd, struct vhost_user_socket *vsocket) dev->async_copy = 1; } + if (vsocket->async_use_vfio) { + dev = get_device(vid); + + if (dev) + dev->async_use_vfio = 1; + } + VHOST_LOG_CONFIG(INFO, "new device, handle is %d\n", vid); if (vsocket->notify_ops->new_connection) {@@ -879,6 +887,7 @@ rte_vhost_driver_register(const char *path, uint64_t flags) vsocket->extbuf = flags & RTE_VHOST_USER_EXTBUF_SUPPORT; vsocket->linearbuf = flags & RTE_VHOST_USER_LINEARBUF_SUPPORT; vsocket->async_copy = flags & RTE_VHOST_USER_ASYNC_COPY; + vsocket->async_use_vfio = flags & RTE_VHOST_USER_ASYNC_USE_VFIO;
vsocket->net_compliant_ol_flags= flags &RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS;
if (vsocket->async_copy&&lib/vhost/vhost.h +1
-0@@ -370,6 +370,7 @@ struct virtio_net { int16_t broadcast_rarp; uint32_t nr_vring; int async_copy; + int async_use_vfio; int extbuf; int linearbuf; struct vhost_virtqueue *virtqueue[VHOST_MAX_QUEUE_PAIRS * 2];lib/vhost/vhost_user.c +1
-0@@ -45,6 +45,7 @@ #include <rte_common.h> #include <rte_malloc.h> #include <rte_log.h> +#include <rte_vfio.h> #include "iotlb.h" #include "vhost.h"@@ -141,6 +142,36 @@ get_blk_size(int fd) return ret == -1 ? (uint64_t)-1 : (uint64_t)stat.st_blksize; }+static int
lib/vhost/vhost_user.c +5
-0+async_dma_map(struct rte_vhost_mem_region *region, bool do_map) +{ + int ret = 0; + uint64_t host_iova; + 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) {
+VHOST_LOG_CONFIG(ERR, "DMA engine map failed\n"); + return ret;
+ }
+ } 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,Quoted 8 lines
+
region->size);
+ if (ret) {
+VHOST_LOG_CONFIG(ERR, "DMA engine unmap failed\n"); + return ret;
+ }
+ }
+ return ret;
+}We've been discussing this off list with Xuan, and unfortunately this is a blocker for now.
Currently, the x86 IOMMU does not support partial unmap - the segments have to be unmapped exactly the same addr/len as they were mapped. We also concatenate adjacent mappings to prevent filling up the DMA mapping entry table with superfluous entries.
This means that, when two unrelated mappings are contiguous in memory (e.g. if you map regions 1 and 2 independently, but they happen to be sitting right next to each other in virtual memory), we cannot later unmap one of them because, even though these are two separate mappings as far as kernel VFIO infrastructure is concerned, the mapping gets compacted and looks like one single mapping to VFIO, so DPDK API will not let us unmap region 1 without also unmapping region 2.
The proper fix for this problem would be to always map memory page-by-page regardless of where it comes from (we already do that for internal memory, but not for external). However, the reason this works for internal memory is because when mapping internal memory segments, *we know the page size*. For external memory segments, there is no such guarantee, so we cannot deduce page size for a given memory segment, and thus can't map things page-by-page.
So, the proper fix for it would be to add page size to the VFIO DMA API. Unfortunately, it probably has to wait until 21.11 because it is an API change.
Quoted 7 lines
The slightly hacky fix for this would be to forego user mem map concatenation and trust that user is not going to do anything stupid, and will not spam the VFIO DMA API without reason. I would rather not go down this road, but this could be an option in this case.
Thoughts?
Thanks Anatoly for the detailed description of the issue. It may be possible to either create a versioned symbol for this API change, or maybe even to have a temporary internal API.
But I think this series in its current form is not acceptable, so waiting for v21.11 would be the best option (we may want to send the deprecation notice in this release though).
In this series, I don't like the user application has to pass a flag to state whether the DMA engine uses VFIO or not. AFAICT, this new revision does not implement what was discussed in the previous one, i.e. supporting both IOVA_AS_VA and IOVA_AS_PA.
Regards,
Maxime
Re: [dpdk-dev] [PATCH v5 1/2] vhost: enable IOMMU for async vhost
Hi Maxime,
Quoted 200 lines
-----Original Message-----
From: Maxime Coquelin <[email protected]>
Sent: Monday, July 5, 2021 8:46 PM
To: Burakov, Anatoly <[email protected]>; Ding, Xuan <[email protected]>; Xia, Chenbo <[email protected]>; Thomas Monjalon <[email protected]>; David Marchand <[email protected]>
Cc: [email protected]; Hu, Jiayu <[email protected]>; Pai G, Sunil <[email protected]>; Richardson, Bruce <[email protected]>; Van Haaren, Harry <[email protected]>; Liu, Yong <[email protected]>; Ma, WenwuX <[email protected]>
Subject: Re: [dpdk-dev] [PATCH v5 1/2] vhost: enable IOMMU for async vhostQuoted 71 lines · Anatoly
Quoted 70 lines · Xuan Ding
The use of IOMMU has many advantages, such as isolation and address translation. This patch extends the capbility of DMA engine to use IOMMU if the DMA device is bound to vfio.
When set memory table, the guest memory will be mapped into the default container of DPDK.
Signed-off-by Xuan Ding <[email protected]>---
doc/guides/prog_guide/vhost_lib.rst| 9 ++++++ lib/vhost/rte_vhost.h | 1 + lib/vhost/socket.c | 9 ++++++ lib/vhost/vhost.h | 1 + lib/vhost/vhost_user.c | 46 ++++++++++++++++++++++++++++-5 files changed, 65 insertions(+), 1 deletion(-)doc/guides/prog_guide/vhost_lib.rst +0
-0@@ -118,6 +118,15 @@ The following is an overview of some key VhostAPI functions:
It is disabled by default.
+ - ``RTE_VHOST_USER_ASYNC_USE_VFIO``
+
+ In asynchronous data path, vhost liarary is not aware of which driver
+ (igb_uio/vfio) the DMA device is bound to. Application should pass + this flag to tell vhost library whether IOMMU should be programmed + for guest memory.doc/guides/prog_guide/vhost_lib.rst +3
-0+ + It is disabled by default. +- ``RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS``
Since v16.04, the vhost library forwards checksum and gso requests forlib/vhost/rte_vhost.h +1
-0@@ -37,6 +37,7 @@ extern "C" { #define RTE_VHOST_USER_LINEARBUF_SUPPORT (1ULL << 6) #define RTE_VHOST_USER_ASYNC_COPY (1ULL << 7) #define RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS (1ULL << 8) +#define RTE_VHOST_USER_ASYNC_USE_VFIO (1ULL << 9) /* Features. */ #ifndef VIRTIO_NET_F_GUEST_ANNOUNCElib/vhost/socket.c +7
-0@@ -42,6 +42,7 @@ struct vhost_user_socket { bool extbuf; bool linearbuf; bool async_copy; + bool async_use_vfio; bool net_compliant_ol_flags; /*@@ -243,6 +244,13 @@ vhost_user_add_connection(int fd, struct vhost_user_socket *vsocket) dev->async_copy = 1; } + if (vsocket->async_use_vfio) { + dev = get_device(vid); + + if (dev) + dev->async_use_vfio = 1; + } +Quoted 8 lines
lib/vhost/socket.c rte_vhost_driver_register(const char *path, · line 891
Quoted 8 lines
lib/vhost/socket.c +1
-0VHOST_LOG_CONFIG(INFO, "new device, handle is %d\n", vid); if (vsocket->notify_ops->new_connection) {@@ -879,6 +887,7 @@ rte_vhost_driver_register(const char *path, uint64_t flags) vsocket->extbuf = flags & RTE_VHOST_USER_EXTBUF_SUPPORT; vsocket->linearbuf = flags & RTE_VHOST_USER_LINEARBUF_SUPPORT; vsocket->async_copy = flags & RTE_VHOST_USER_ASYNC_COPY; + vsocket->async_use_vfio = flags &
RTE_VHOST_USER_ASYNC_USE_VFIO;Quoted 31 lines
Quoted 31 lines
vsocket->net_compliant_ol_flags= flags &RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS;
if (vsocket->async_copy&&lib/vhost/vhost.h +1
-0@@ -370,6 +370,7 @@ struct virtio_net { int16_t broadcast_rarp; uint32_t nr_vring; int async_copy; + int async_use_vfio; int extbuf; int linearbuf; struct vhost_virtqueue *virtqueue[VHOST_MAX_QUEUE_PAIRS * 2];lib/vhost/vhost_user.c +1
-0@@ -45,6 +45,7 @@ #include <rte_common.h> #include <rte_malloc.h> #include <rte_log.h> +#include <rte_vfio.h> #include "iotlb.h" #include "vhost.h"@@ -141,6 +142,36 @@ get_blk_size(int fd) return ret == -1 ? (uint64_t)-1 : (uint64_t)stat.st_blksize; }+static int
+async_dma_map(structrte_vhost_mem_region*region, booldo_map)Quoted 8 lines
Quoted 8 lines
+{
+ int ret = 0;
+uint64_thost_iova;
+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,
Quoted 30 lines
Quoted 13 lines
+
region->host_user_addr,
+host_iova,
+region->size);
+ if (ret) {
+VHOST_LOG_CONFIG(ERR, "DMA engine map failed\n"); + return ret;
+ }
+ } 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,Quoted 8 lines
+
region->size);
+ if (ret) {
+VHOST_LOG_CONFIG(ERR, "DMA engine unmap failed\n"); + return ret;
+ }
+ }
+ return ret;
+}We've been discussing this off list with Xuan, and unfortunately this is a blocker for now.
Currently, the x86 IOMMU does not support partial unmap - the segments have to be unmapped exactly the same addr/len as they were mapped. We also concatenate adjacent mappings to prevent filling up the DMA mapping entry table with superfluous entries.
Quoted 4 lines
This means that, when two unrelated mappings are contiguous in memory (e.g. if you map regions 1 and 2 independently, but they happen to be sitting right next to each other in virtual memory), we cannot later unmap one of them because, even though these are two separate
mappings
Quoted 10 lines
as far as kernel VFIO infrastructure is concerned, the mapping gets compacted and looks like one single mapping to VFIO, so DPDK API will not let us unmap region 1 without also unmapping region 2.
The proper fix for this problem would be to always map memory page-by-page regardless of where it comes from (we already do that for internal memory, but not for external). However, the reason this works for internal memory is because when mapping internal memory segments, *we know the page size*. For external memory segments, there is no such guarantee, so we cannot deduce page size for a given memory segment,
and
Quoted 6 lines
thus can't map things page-by-page.
So, the proper fix for it would be to add page size to the VFIO DMA API. Unfortunately, it probably has to wait until 21.11 because it is an API change.
Quoted 7 lines
The slightly hacky fix for this would be to forego user mem map concatenation and trust that user is not going to do anything stupid, and will not spam the VFIO DMA API without reason. I would rather not go down this road, but this could be an option in this case.
Thoughts?
Thanks Anatoly for the detailed description of the issue. It may be possible to either create a versioned symbol for this API change, or maybe even to have a temporary internal API.
Quoted 8 lines
But I think this series in its current form is not acceptable, so waiting for v21.11 would be the best option (we may want to send the deprecation notice in this release though).
In this series, I don't like the user application has to pass a flag to state whether the DMA engine uses VFIO or not. AFAICT, this new revision does not implement what was discussed in the previous one, i.e. supporting both
IOVA_AS_VAandIOVA_AS_PA.
Thanks for your comments. Here I hope to explain some questions:
1. Whether both IOVA_AS_VA and IOVA_AS_PA are supported now?
A: Both IOVA_AS_PA and IOVA_AS_VA are supported now. In this version, the virtual address is replaced with iova address of mapped region, and the iova address is selected to program the IOMMU instead of virtual address only.
2. Why a flag is chosen to be passed by application?
A: Yes, as we discussed before, the rte_eal_iova_mode() API can be used to get the IOVA mode, so as to determine whether IOMMU should be programmed. However, in the implementation process, I found a problem. That is how to distinguish the VFIO PA and IGB_UIO PA. Because for VFIO cases, we should always program the IOMMU. While in IGB_UIO cases, it depends on IOMMU capability of platform.
So a flag is selected, but this requires the application to do extra things. I find another solution, is to use
#ifdef VFIO_PRESENT
If(rte_vfio_is_enabled("vfio"))
program_iommu;#endif
Because all the devices are managed by DPDK, we can follow DPDK to do the decision. Does this make sense for you, or any some suggestions?
3. The partial unmap issue
A: Thanks Anatoly for the detailed explanation. This problem was found in reconnection cases. After our off list discussion, the solution requires rte_vfio_container_dma_map/unmap API change. Here I want to consult if there are some hope for versioned symbol or a temporary internal API be used in this release.
Thanks for your time!
Regards,
Xuan
Quoted 3 lines
Regards,
Maxime
Re: [dpdk-dev] [PATCH v5 1/2] vhost: enable IOMMU for async vhost
Quoted 217 lines · Xuan
Hi Maxime,
Quoted 200 lines
-----Original Message-----
From: Maxime Coquelin <[email protected]>
Sent: Monday, July 5, 2021 8:46 PM
To: Burakov, Anatoly <[email protected]>; Ding, Xuan <[email protected]>; Xia, Chenbo <[email protected]>; Thomas Monjalon <[email protected]>; David Marchand <[email protected]>
Cc: [email protected]; Hu, Jiayu <[email protected]>; Pai G, Sunil <[email protected]>; Richardson, Bruce <[email protected]>; Van Haaren, Harry <[email protected]>; Liu, Yong <[email protected]>; Ma, WenwuX <[email protected]>
Subject: Re: [dpdk-dev] [PATCH v5 1/2] vhost: enable IOMMU for async vhostQuoted 71 lines · Anatoly
Quoted 70 lines · Xuan Ding
The use of IOMMU has many advantages, such as isolation and address translation. This patch extends the capbility of DMA engine to use IOMMU if the DMA device is bound to vfio.
When set memory table, the guest memory will be mapped into the default container of DPDK.
Signed-off-by Xuan Ding <[email protected]>--- doc/guides/prog_guide/vhost_lib.rst | 9 ++++++ lib/vhost/rte_vhost.h | 1 + lib/vhost/socket.c | 9 ++++++ lib/vhost/vhost.h | 1 + lib/vhost/vhost_user.c | 46 ++++++++++++++++++++++++++++- 5 files changed, 65 insertions(+), 1 deletion(-)doc/guides/prog_guide/vhost_lib.rst +0
-0@@ -118,6 +118,15 @@ The following is an overview of some key VhostAPI functions:
It is disabled by default.
+ - ``RTE_VHOST_USER_ASYNC_USE_VFIO``doc/guides/prog_guide/vhost_lib.rst +2
-0+ + In asynchronous data path, vhost liarary is not aware of whichdriver
doc/guides/prog_guide/vhost_lib.rst +6
-0+ (igb_uio/vfio) the DMA device is bound to. Application should pass + this flag to tell vhost library whether IOMMU should be programmed + for guest memory. + + It is disabled by default. + - ``RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS`` Since v16.04, the vhost library forwards checksum and gsorequests for
lib/vhost/rte_vhost.h +1
-0@@ -37,6 +37,7 @@ extern "C" {#define RTE_VHOST_USER_LINEARBUF_SUPPORT (1ULL << 6)#define RTE_VHOST_USER_ASYNC_COPY (1ULL << 7)#define RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS (1ULL << 8) +#define RTE_VHOST_USER_ASYNC_USE_VFIO (1ULL << 9)/* Features. */ #ifndef VIRTIO_NET_F_GUEST_ANNOUNCE lib/vhost/socket.c +7
-0@@ -42,6 +42,7 @@ struct vhost_user_socket {bool extbuf;bool linearbuf;bool async_copy; +bool async_use_vfio;bool net_compliant_ol_flags;/* @@ -243,6 +244,13 @@ vhost_user_add_connection(int fd, struct vhost_user_socket *vsocket) dev->async_copy = 1; } + if (vsocket->async_use_vfio) { + dev =get_device (vid); + +if (dev) + dev->async_use_vfio =1 ; + } +Quoted 8 lines
lib/vhost/socket.c rte_vhost_driver_register(const char *path, · line 891
Quoted 8 lines
lib/vhost/socket.c +1
-0VHOST_LOG_CONFIG (INFO ,"new device, handle is %d\n" , vid);if (vsocket->notify_ops->new_connection) {@@ -879,6 +887,7 @@ rte_vhost_driver_register(const char *path, uint64_t flags) vsocket->extbuf = flags & RTE_VHOST_USER_EXTBUF_SUPPORT; vsocket->linearbuf = flags &RTE_VHOST_USER_LINEARBUF_SUPPORT ; vsocket->async_copy = flags &RTE_VHOST_USER_ASYNC_COPY ; + vsocket->async_use_vfio = flags &
RTE_VHOST_USER_ASYNC_USE_VFIO;Quoted 31 lines
Quoted 31 lines
lib/vhost/socket.c +0
-0vsocket->net_compliant_ol_flags = flags &RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS ;if (vsocket->async_copy &&lib/vhost/vhost.h +1
-0@@ -370,6 +370,7 @@ struct virtio_net {int16_t broadcast_rarp;uint32_t nr_vring;int async_copy; +int async_use_vfio;int extbuf;int linearbuf;struct vhost_virtqueue *virtqueue[VHOST_MAX_QUEUE_PAIRS *2 ];lib/vhost/vhost_user.c +2
-0@@ -45,6 +45,7 @@#include <rte_common.h> #include <rte_malloc.h> #include <rte_log.h> +#include <rte_vfio.h> #include "iotlb.h" #include "vhost.h" @@ -141,6 +142,36 @@ get_blk_size(int fd)return ret ==-1 ? (uint64_t )-1 : (uint64_t )stat.st_blksize; } +static int +async_dma_map (struct rte_vhost_mem_region *region,bool do_map)Quoted 8 lines
lib/vhost/vhost_user.c get_blk_size(int fd)
Quoted 8 lines
lib/vhost/vhost_user.c +7
-0+{ +int ret =0 ; +uint64_t host_iova; + 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,
Quoted 30 lines
Quoted 11 lines
lib/vhost/vhost_user.c +10
-0+ region->host_user_addr, + host_iova, + region->size); +if (ret) { +VHOST_LOG_CONFIG (ERR ,"DMA engine map failed\n" ); +return ret; + } + }else { +/* Remove mapped region from the default container of DPDK. */ + ret = rte_vfio_container_dma_unmap(RTE_VFIO_DEFAULT_CONTAINER_FD,lib/vhost/vhost_user.c get_blk_size(int fd) · line 173
Quoted 10 lines
lib/vhost/vhost_user.c +10
-0+ region->host_user_addr, + host_iova, + region->size); +if (ret) { +VHOST_LOG_CONFIG (ERR ,"DMA engine unmap failed\n" ); +return ret; + } + } +return ret; +}We've been discussing this off list with Xuan, and unfortunately this is a blocker for now.
Currently, the x86 IOMMU does not support partial unmap - the segments have to be unmapped exactly the same addr/len as they were mapped. We also concatenate adjacent mappings to prevent filling up the DMA mapping entry table with superfluous entries.
Quoted 4 lines
This means that, when two unrelated mappings are contiguous in memory (e.g. if you map regions 1 and 2 independently, but they happen to be sitting right next to each other in virtual memory), we cannot later unmap one of them because, even though these are two separate
mappings
Quoted 10 lines
as far as kernel VFIO infrastructure is concerned, the mapping gets compacted and looks like one single mapping to VFIO, so DPDK API will not let us unmap region 1 without also unmapping region 2.
The proper fix for this problem would be to always map memory page-by-page regardless of where it comes from (we already do that for internal memory, but not for external). However, the reason this works for internal memory is because when mapping internal memory segments, *we know the page size*. For external memory segments, there is no such guarantee, so we cannot deduce page size for a given memory segment,
and
Quoted 6 lines
thus can't map things page-by-page.
So, the proper fix for it would be to add page size to the VFIO DMA API. Unfortunately, it probably has to wait until 21.11 because it is an API change.
Quoted 7 lines
The slightly hacky fix for this would be to forego user mem map concatenation and trust that user is not going to do anything stupid, and will not spam the VFIO DMA API without reason. I would rather not go down this road, but this could be an option in this case.
Thoughts?
Thanks Anatoly for the detailed description of the issue. It may be possible to either create a versioned symbol for this API change, or maybe even to have a temporary internal API.
Quoted 8 lines
But I think this series in its current form is not acceptable, so waiting for v21.11 would be the best option (we may want to send the deprecation notice in this release though).
In this series, I don't like the user application has to pass a flag to state whether the DMA engine uses VFIO or not. AFAICT, this new revision does not implement what was discussed in the previous one, i.e. supporting both
IOVA_AS_VAandIOVA_AS_PA.Thanks for your comments. Here I hope to explain some questions:
1. Whether bothIOVA_AS_VAandIOVA_AS_PAare supported now?
A: BothIOVA_AS_PAandIOVA_AS_VAare supported now. In this version, the virtual address is replaced with iova address of mapped region, and the iova address is selected to program the IOMMU instead of virtual address only.
Quoted 7 lines
2. Why a flag is chosen to be passed by application?
A: Yes, as we discussed before, therte_eal_iova_mode()API can be used to get the IOVA mode, so as to determine whether IOMMU should be programmed. However, in the implementation process, I found a problem. That is how to distinguish the VFIO PA andIGB_UIOPA. Because for VFIO cases, we should always program the IOMMU. While inIGB_UIOcases, it depends on IOMMU capability of platform.
How does one program IOMMU with igb_uio? I was under impression that igb_uio (and uio_pci_generic for that matter) does not provide such facilities.
Quoted 10 lines
So a flag is selected, but this requires the application to do extra things. I find another solution, is to use
#ifdef VFIO_PRESENT If(rte_vfio_is_enabled("vfio")) program_iommu;#endif
Because all the devices are managed by DPDK, we can follow DPDK to do the decision. Does this make sense for you, or any some suggestions?
IMO the #ifdef is not needed. The API will always work, it's just that if VFIO is not compiled, it'll just compile down to noops.
Quoted 7 lines
3. The partial unmap issue
A: Thanks Anatoly for the detailed explanation. This problem was found in reconnection cases. After our off list discussion, the solution requires rte_vfio_container_dma_map/unmap API change. Here I want to consult if there are some hope for versioned symbol or a temporary internal API be used in this release.
I don't think we can add a versioned symbol in this release unless there's an exception to rc1 feature freeze. I also don't like the idea of a temporary internal API because vhost is not in EAL, it's a library - meaning, the "internal" API has to in fact be external API, added to the .map file etc., otherwise it won't work with shared library builds.
That said, i'm not an expert on versioning, so maybe there are other ways i'm not aware of, or i have some misconceptions about how it works :)
Quoted 10 lines
Thanks for your time!
Regards,
XuanQuoted 3 lines
Regards,
Maxime
Signature · 2 lines
Thanks, Anatoly
Re: [dpdk-dev] [PATCH v5 1/2] vhost: enable IOMMU for async vhost
Quoted 222 lines · Anatoly
Quoted 221 lines · Xuan
Hi Maxime,
Quoted 218 lines
-----Original Message-----
From: Maxime Coquelin <[email protected]>
Sent: Monday, July 5, 2021 8:46 PM
To: Burakov, Anatoly <[email protected]>; Ding, Xuan <[email protected]>; Xia, Chenbo <[email protected]>; Thomas Monjalon <[email protected]>; David Marchand <[email protected]>
Cc: [email protected]; Hu, Jiayu <[email protected]>; Pai G, Sunil <[email protected]>; Richardson, Bruce <[email protected]>; Van Haaren, Harry <[email protected]>; Liu, Yong <[email protected]>; Ma, WenwuX <[email protected]>
Subject: Re: [dpdk-dev] [PATCH v5 1/2] vhost: enable IOMMU for async vhostQuoted 74 lines · Anatoly
Quoted 73 lines · Xuan Ding
The use of IOMMU has many advantages, such as isolation and address translation. This patch extends the capbility of DMA engine to use IOMMU if the DMA device is bound to vfio.
When set memory table, the guest memory will be mapped into the default container of DPDK.
Signed-off-by Xuan Ding <[email protected]>---
doc/guides/prog_guide/vhost_lib.rst| 9 ++++++ lib/vhost/rte_vhost.h | 1 + lib/vhost/socket.c | 9 ++++++ lib/vhost/vhost.h | 1 + lib/vhost/vhost_user.c | 46
++++++++++++++++++++++++++++-5 files changed, 65 insertions(+), 1 deletion(-)doc/guides/prog_guide/vhost_lib.rst +0
-0@@ -118,6 +118,15 @@ The following is an overview of some key VhostAPI functions:
It is disabled by default.
+ - ``RTE_VHOST_USER_ASYNC_USE_VFIO``
+
+ In asynchronous data path, vhost liarary is not aware of which driver
+ (igb_uio/vfio) the DMA device is bound to. Application should pass
+ this flag to tell vhost library whether IOMMU should be programmed
+ for guest memory.doc/guides/prog_guide/vhost_lib.rst +3
-0+ + It is disabled by default. +- ``RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS``
Since v16.04, the vhost library forwards checksum and gso requests forlib/vhost/rte_vhost.h +1
-0@@ -37,6 +37,7 @@ extern "C" { #define RTE_VHOST_USER_LINEARBUF_SUPPORT (1ULL << 6) #define RTE_VHOST_USER_ASYNC_COPY (1ULL << 7) #define RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS (1ULL << 8) +#define RTE_VHOST_USER_ASYNC_USE_VFIO (1ULL << 9) /* Features. */ #ifndef VIRTIO_NET_F_GUEST_ANNOUNCElib/vhost/socket.c +7
-0@@ -42,6 +42,7 @@ struct vhost_user_socket { bool extbuf; bool linearbuf; bool async_copy; + bool async_use_vfio; bool net_compliant_ol_flags; /*@@ -243,6 +244,13 @@ vhost_user_add_connection(int fd, struct vhost_user_socket *vsocket) dev->async_copy = 1; } + if (vsocket->async_use_vfio) { + dev = get_device(vid); + + if (dev) + dev->async_use_vfio = 1; + } +Quoted 8 lines
lib/vhost/socket.c rte_vhost_driver_register(const char *path, · line 891
Quoted 8 lines
lib/vhost/socket.c +1
-0VHOST_LOG_CONFIG(INFO, "new device, handle is %d\n", vid); if (vsocket->notify_ops->new_connection) {@@ -879,6 +887,7 @@ rte_vhost_driver_register(const char *path, uint64_t flags) vsocket->extbuf = flags & RTE_VHOST_USER_EXTBUF_SUPPORT; vsocket->linearbuf = flags & RTE_VHOST_USER_LINEARBUF_SUPPORT; vsocket->async_copy = flags & RTE_VHOST_USER_ASYNC_COPY; + vsocket->async_use_vfio = flags &
RTE_VHOST_USER_ASYNC_USE_VFIO;Quoted 32 lines
Quoted 32 lines
vsocket->net_compliant_ol_flags= flags &RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS;
if (vsocket->async_copy&&lib/vhost/vhost.h +1
-0@@ -370,6 +370,7 @@ struct virtio_net { int16_t broadcast_rarp; uint32_t nr_vring; int async_copy; + int async_use_vfio; int extbuf; int linearbuf;struct vhost_virtqueue *virtqueue[VHOST_MAX_QUEUE_PAIRS * 2];
lib/vhost/vhost_user.c +1
-0@@ -45,6 +45,7 @@ #include <rte_common.h> #include <rte_malloc.h> #include <rte_log.h> +#include <rte_vfio.h> #include "iotlb.h" #include "vhost.h"@@ -141,6 +142,36 @@ get_blk_size(int fd) return ret == -1 ? (uint64_t)-1 : (uint64_t)stat.st_blksize; }+static int
+async_dma_map(structrte_vhost_mem_region*region, booldo_map)Quoted 8 lines
Quoted 8 lines
+{
+ int ret = 0;
+uint64_thost_iova;
+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,
Quoted 33 lines
Quoted 14 lines
+
region->host_user_addr,
+host_iova,
+region->size);
+ if (ret) {
+VHOST_LOG_CONFIG(ERR, "DMA engine map failed\n"); + return ret;
+ }
+ } 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,Quoted 8 lines
+
region->size);
+ if (ret) {
+VHOST_LOG_CONFIG(ERR, "DMA engine unmap failed\n"); + return ret;
+ }
+ }
+ return ret;
+}We've been discussing this off list with Xuan, and unfortunately this is
a blocker for now.Currently, the x86 IOMMU does not support partial unmap - the segments have to be unmapped exactly the same addr/len as they were mapped. We also concatenate adjacent mappings to prevent filling up the DMA mapping
entry table with superfluous entries.Quoted 4 lines
This means that, when two unrelated mappings are contiguous in memory (e.g. if you map regions 1 and 2 independently, but they happen to be sitting right next to each other in virtual memory), we cannot later unmap one of them because, even though these are two separate
mappings
Quoted 10 lines
as far as kernel VFIO infrastructure is concerned, the mapping gets compacted and looks like one single mapping to VFIO, so DPDK API will not let us unmap region 1 without also unmapping region 2.
The proper fix for this problem would be to always map memory page-by-page regardless of where it comes from (we already do that for internal memory, but not for external). However, the reason this works for internal memory is because when mapping internal memory segments, *we know the page size*. For external memory segments, there is no such guarantee, so we cannot deduce page size for a given memory segment,
and
Quoted 7 lines
thus can't map things page-by-page.
So, the proper fix for it would be to add page size to the VFIO DMA API.
Unfortunately, it probably has to wait until 21.11 because it is an API change.Quoted 8 lines
The slightly hacky fix for this would be to forego user mem map concatenation and trust that user is not going to do anything stupid, and will not spam the VFIO DMA API without reason. I would rather not go
down this road, but this could be an option in this case.Thoughts?
Thanks Anatoly for the detailed description of the issue. It may be possible to either create a versioned symbol for this API change, or maybe even to have a temporary internal API.
But I think this series in its current form is not acceptable, so waiting for v21.11 would be the best option (we may want to send the deprecation notice in this release though).
In this series, I don't like the user application has to pass a flag to state whether the DMA engine uses VFIO or not. AFAICT, this new revision does not implement what was discussed in the previous one, i.e. supporting both
IOVA_AS_VAandIOVA_AS_PA.
Quoted 6 lines
Quoted 6 lines
Thanks for your comments. Here I hope to explain some questions:
1. Whether bothIOVA_AS_VAandIOVA_AS_PAare supported now?
A: BothIOVA_AS_PAandIOVA_AS_VAare supported now. In this version, the virtual address is replaced with iova address of mapped region, and the iova
address is selected to program the IOMMU instead of virtual address only.
Good!
Quoted 10 lines
Quoted 9 lines
2. Why a flag is chosen to be passed by application?
A: Yes, as we discussed before, therte_eal_iova_mode()API can be used to
get the IOVA mode, so as to determine whether IOMMU should be programmed. However, in the implementation process, I found a problem. That is how to distinguish the VFIO PA andIGB_UIOPA. Because for VFIO cases, we should always program the IOMMU. While inIGB_UIOcases, it depends on IOMMU capability of platform.
Quoted 3 lines
How does one program IOMMU with
igb_uio? I was under impression thatigb_uio(anduio_pci_genericfor that matter) does not provide such facilities.
+1
Quoted 9 lines
Quoted 9 lines
So a flag is selected, but this requires the application to do extra things.
I find another solution, is to use
#ifdefVFIO_PRESENT
If(rte_vfio_is_enabled("vfio"))
program_iommu;
#endif
Quoted 5 lines
Quoted 2 lines
Because all the devices are managed by DPDK, we can follow DPDK to do the decision. Does this make sense for you, or any some suggestions?
IMO the #ifdef is not needed. The API will always work, it's just that if VFIO is not compiled, it'll just compile down to noops.
Agree the #ifdef is not necessary.
To be clear, rte_vfio_is_enabled() check is going to be done in the Vhost library, making this transparent to the application?
Quoted 8 lines
Quoted 7 lines
3. The partial unmap issue
A: Thanks Anatoly for the detailed explanation. This problem was found in reconnection cases. After our off list discussion, the solution requires rte_vfio_container_dma_map/unmap API change. Here I want to consult if there are some hope for versioned symbol or a temporary internal API be used in this release.
Quoted 8 lines
I don't think we can add a versioned symbol in this release unless there's an exception to rc1 feature freeze. I also don't like the idea of a temporary internal API because vhost is not in EAL, it's a library
- meaning, the "internal" API has to in fact be external API, added to the .map file etc., otherwise it won't work with shared library builds.That said, i'm not an expert on versioning, so maybe there are other ways i'm not aware of, or i have some misconceptions about how it works :)
Ok, it maybe indeed be better to wait for v21.11, it is too late for this release.
Thanks,
Maxime
Quoted 12 lines
Quoted 10 lines
Thanks for your time!
Regards,
XuanQuoted 3 lines
Regards,
Maxime
Re: [dpdk-dev] [PATCH v5 1/2] vhost: enable IOMMU for async vhost
Hi,
Quoted 259 lines
-----Original Message-----
From: Maxime Coquelin <[email protected]>
Sent: Tuesday, July 6, 2021 5:32 PM
To: Burakov, Anatoly <[email protected]>; Ding, Xuan <[email protected]>; Xia, Chenbo <[email protected]>; Thomas Monjalon <[email protected]>; David Marchand <[email protected]>
Cc: [email protected]; Hu, Jiayu <[email protected]>; Pai G, Sunil <[email protected]>; Richardson, Bruce <[email protected]>; Van Haaren, Harry <[email protected]>; Liu, Yong <[email protected]>; Ma, WenwuX <[email protected]>
Subject: Re: [dpdk-dev] [PATCH v5 1/2] vhost: enable IOMMU for async vhostQuoted 92 lines · Anatoly
Quoted 91 lines · Xuan
Hi Maxime,
Quoted 89 lines
-----Original Message-----
From: Maxime Coquelin <[email protected]>
Sent: Monday, July 5, 2021 8:46 PM
To: Burakov, Anatoly <[email protected]>; Ding, Xuan <[email protected]>; Xia, Chenbo <[email protected]>; Thomas Monjalon <[email protected]>; David Marchand <[email protected]>
Cc: [email protected]; Hu, Jiayu <[email protected]>; Pai G, Sunil <[email protected]>; Richardson, Bruce <[email protected]>; Van Haaren, Harry <[email protected]>; Liu, Yong <[email protected]>; Ma, WenwuX <[email protected]>
Subject: Re: [dpdk-dev] [PATCH v5 1/2] vhost: enable IOMMU for async vhostQuoted 72 lines · Anatoly
Quoted 71 lines · Xuan Ding
The use of IOMMU has many advantages, such as isolation and address translation. This patch extends the capbility of DMA engine to use IOMMU if the DMA device is bound to vfio.
When set memory table, the guest memory will be mapped into the default container of DPDK.
Signed-off-by Xuan Ding <[email protected]>---
doc/guides/prog_guide/vhost_lib.rst| 9 ++++++ lib/vhost/rte_vhost.h | 1 + lib/vhost/socket.c | 9 ++++++ lib/vhost/vhost.h | 1 + lib/vhost/vhost_user.c | 46
++++++++++++++++++++++++++++-5 files changed, 65 insertions(+), 1 deletion(-)doc/guides/prog_guide/vhost_lib.rst +0
-0@@ -118,6 +118,15 @@ The following is an overview of some key VhostAPI functions:
It is disabled by default.
+ - ``RTE_VHOST_USER_ASYNC_USE_VFIO``
+
+ In asynchronous data path, vhost liarary is not aware of which driver
+ (igb_uio/vfio) the DMA device is bound to. Application should pass
+ this flag to tell vhost library whether IOMMU should be programmed
+ for guest memory.doc/guides/prog_guide/vhost_lib.rst +3
-0+ + It is disabled by default. +- ``RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS``
Since v16.04, the vhost library forwards checksum and gso requests forlib/vhost/rte_vhost.h +1
-0@@ -37,6 +37,7 @@ extern "C" { #define RTE_VHOST_USER_LINEARBUF_SUPPORT (1ULL << 6) #define RTE_VHOST_USER_ASYNC_COPY (1ULL << 7) #define RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS (1ULL << 8) +#define RTE_VHOST_USER_ASYNC_USE_VFIO (1ULL << 9) /* Features. */ #ifndef VIRTIO_NET_F_GUEST_ANNOUNCElib/vhost/socket.c +5
-0@@ -42,6 +42,7 @@ struct vhost_user_socket { bool extbuf; bool linearbuf; bool async_copy; + bool async_use_vfio; bool net_compliant_ol_flags; /*@@ -243,6 +244,13 @@ vhost_user_add_connection(int fd, struct vhost_user_socket *vsocket) dev->async_copy = 1; } + if (vsocket->async_use_vfio) { + dev = get_device(vid); + + if (dev) + dev->async_use_vfio = 1;Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
lib/vhost/socket.c +2
-0+ } + VHOST_LOG_CONFIG(INFO, "new device, handle is %d\n", vid); if (vsocket->notify_ops->new_connection) {@@ -879,6 +887,7 @@ rte_vhost_driver_register(const char *path, uint64_t flags) vsocket->extbuf = flags & RTE_VHOST_USER_EXTBUF_SUPPORT;
vsocket->linearbuf= flags &
RTE_VHOST_USER_LINEARBUF_SUPPORT;Quoted 122 lines
Quoted 122 lines
Quoted 121 lines
Quoted 2 lines
Quoted 2 lines
vsocket->async_copy= flags &RTE_VHOST_USER_ASYNC_COPY; +vsocket->async_use_vfio= flags &
RTE_VHOST_USER_ASYNC_USE_VFIO;Quoted 32 lines
Quoted 32 lines
vsocket->net_compliant_ol_flags= flags &RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS;
if (vsocket->async_copy&&lib/vhost/vhost.h +1
-0@@ -370,6 +370,7 @@ struct virtio_net { int16_t broadcast_rarp; uint32_t nr_vring; int async_copy; + int async_use_vfio; int extbuf; int linearbuf;struct vhost_virtqueue *virtqueue[VHOST_MAX_QUEUE_PAIRS * 2];
lib/vhost/vhost_user.c +1
-0@@ -45,6 +45,7 @@ #include <rte_common.h> #include <rte_malloc.h> #include <rte_log.h> +#include <rte_vfio.h> #include "iotlb.h" #include "vhost.h"@@ -141,6 +142,36 @@ get_blk_size(int fd) return ret == -1 ? (uint64_t)-1 : (uint64_t)stat.st_blksize; }+static int
+async_dma_map(structrte_vhost_mem_region*region, booldo_map)Quoted 8 lines
Quoted 8 lines
+{
+ int ret = 0;
+uint64_thost_iova;
+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,
Quoted 33 lines
Quoted 14 lines
+
region->host_user_addr,
+host_iova,
+region->size);
+ if (ret) {
+VHOST_LOG_CONFIG(ERR, "DMA engine map failed\n"); + return ret;
+ }
+ } 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,Quoted 8 lines
+
region->size);
+ if (ret) {
+VHOST_LOG_CONFIG(ERR, "DMA engine unmap failed\n"); + return ret;
+ }
+ }
+ return ret;
+}We've been discussing this off list with Xuan, and unfortunately this is
a blocker for now.Currently, the x86 IOMMU does not support partial unmap - the segments have to be unmapped exactly the same addr/len as they were mapped. We also concatenate adjacent mappings to prevent filling up the DMA mapping
entry table with superfluous entries.Quoted 4 lines
This means that, when two unrelated mappings are contiguous in memory (e.g. if you map regions 1 and 2 independently, but they happen to be sitting right next to each other in virtual memory), we cannot later unmap one of them because, even though these are two separate
mappings
Quoted 10 lines
as far as kernel VFIO infrastructure is concerned, the mapping gets compacted and looks like one single mapping to VFIO, so DPDK API will not let us unmap region 1 without also unmapping region 2.
The proper fix for this problem would be to always map memory page-by-page regardless of where it comes from (we already do that for internal memory, but not for external). However, the reason this works for internal memory is because when mapping internal memory segments, *we know the page size*. For external memory segments, there is no such guarantee, so we cannot deduce page size for a given memory segment,
and
Quoted 7 lines
thus can't map things page-by-page.
So, the proper fix for it would be to add page size to the VFIO DMA API.
Unfortunately, it probably has to wait until 21.11 because it is an API change.Quoted 8 lines
The slightly hacky fix for this would be to forego user mem map concatenation and trust that user is not going to do anything stupid, and will not spam the VFIO DMA API without reason. I would rather not go
down this road, but this could be an option in this case.Thoughts?
Thanks Anatoly for the detailed description of the issue. It may be possible to either create a versioned symbol for this API change, or maybe even to have a temporary internal API.
But I think this series in its current form is not acceptable, so waiting for v21.11 would be the best option (we may want to send the deprecation notice in this release though).
In this series, I don't like the user application has to pass a flag to state whether the DMA engine uses VFIO or not. AFAICT, this new revision does not implement what was discussed in the previous one, i.e. supporting both
IOVA_AS_VAandIOVA_AS_PA.Quoted 6 lines
Quoted 6 lines
Thanks for your comments. Here I hope to explain some questions:
1. Whether bothIOVA_AS_VAandIOVA_AS_PAare supported now?
A: BothIOVA_AS_PAandIOVA_AS_VAare supported now. In this version, the virtual address is replaced with iova address of mapped region, and the iova
address is selected to program the IOMMU instead of virtual address only.Good!
Quoted 5 lines
Quoted 5 lines
2. Why a flag is chosen to be passed by application?
A: Yes, as we discussed before, therte_eal_iova_mode()API can be used to
get the IOVA mode, so as to determine whether IOMMU should beprogrammed.
Quoted 5 lines
Quoted 4 lines
However, in the implementation process, I found a problem. That is how to distinguish the VFIO PA and
IGB_UIOPA. Because for VFIO cases, we should always program the IOMMU. While inIGB_UIOcases, it depends on IOMMU capability of platform.
Quoted 5 lines
Quoted 3 lines
How does one program IOMMU with
igb_uio? I was under impression thatigb_uio(anduio_pci_genericfor that matter) does not provide such facilities.+1
Maybe some misunderstanding in this sentence here.
In our design, if rte_eal_vfio_is_enabled("vfio") is true, iommu will be programmed. True means vfio module is modprobed.
But there is an exception here, that is, even if vfio module is modprobed, DPDK user still bind all the devices to igb_uio.
This situation can be distinguished in DPDK eal initialization, because the resource mapping is according to the driver loaded by each device(rte_pci_map_device).
But in our scenario, this judgment is somewhat weak. Because we cannot get the device driver info in vhost library. I also think it is unreasonable for vhost to do this. Only trust that users will not use it like this. Thoughts for this scenario?
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
So a flag is selected, but this requires the application to do extra things.
I find another solution, is to use
#ifdefVFIO_PRESENT
If(rte_vfio_is_enabled("vfio"))
program_iommu;
#endif
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
Because all the devices are managed by DPDK, we can follow DPDK to do the decision. Does this make sense for you, or any some suggestions?
IMO the #ifdef is not needed. The API will always work, it's just that if VFIO is not compiled, it'll just compile down to noops.
Agree the #ifdef is not necessary.
Thanks, I will remove the #ifdef in next version.
Only use rte_vfio_is_enabled("vfio").
Quoted 3 lines
To be clear,
rte_vfio_is_enabled()check is going to be done in the Vhost library, making this transparent to the application?
Yes, you are right :)
The check will be done in vhost library, application does not need to do additional things.
Quoted 9 lines
Quoted 9 lines
Quoted 8 lines
3. The partial unmap issue
A: Thanks Anatoly for the detailed explanation. This problem was found in reconnection cases. After our off list discussion, the solution requires rte_vfio_container_dma_map/unmap API change. Here I want to consult if there are some hope for versioned symbol or a temporary internal API be used in this release.
Quoted 5 lines
Quoted 5 lines
I don't think we can add a versioned symbol in this release unless there's an exception to rc1 feature freeze. I also don't like the idea of a temporary internal API because vhost is not in EAL, it's a library
- meaning, the "internal" API has to in fact be external API, added to the .map file etc., otherwise it won't work with shared library builds.
Get it, thanks for your suggestion.
Quoted 6 lines
Quoted 3 lines
That said, i'm not an expert on versioning, so maybe there are other ways i'm not aware of, or i have some misconceptions about how it works :)
Ok, it maybe indeed be better to wait for v21.11, it is too late for this release.
Agree, so I will send a new version in v21.11.
Thanks,
Xuan
Quoted 16 lines
Thanks,
MaximeQuoted 12 lines
Quoted 10 lines
Thanks for your time!
Regards,
XuanQuoted 3 lines
Regards,
Maxime
Re: [dpdk-dev] [PATCH v5 1/2] vhost: enable IOMMU for async vhost
Quoted 274 lines · Xuan
Hi,
Quoted 259 lines
-----Original Message-----
From: Maxime Coquelin <[email protected]>
Sent: Tuesday, July 6, 2021 5:32 PM
To: Burakov, Anatoly <[email protected]>; Ding, Xuan <[email protected]>; Xia, Chenbo <[email protected]>; Thomas Monjalon <[email protected]>; David Marchand <[email protected]>
Cc: [email protected]; Hu, Jiayu <[email protected]>; Pai G, Sunil <[email protected]>; Richardson, Bruce <[email protected]>; Van Haaren, Harry <[email protected]>; Liu, Yong <[email protected]>; Ma, WenwuX <[email protected]>
Subject: Re: [dpdk-dev] [PATCH v5 1/2] vhost: enable IOMMU for async vhostQuoted 92 lines · Anatoly
Quoted 91 lines · Xuan
Hi Maxime,
Quoted 89 lines
-----Original Message-----
From: Maxime Coquelin <[email protected]>
Sent: Monday, July 5, 2021 8:46 PM
To: Burakov, Anatoly <[email protected]>; Ding, Xuan <[email protected]>; Xia, Chenbo <[email protected]>; Thomas Monjalon <[email protected]>; David Marchand <[email protected]>
Cc: [email protected]; Hu, Jiayu <[email protected]>; Pai G, Sunil <[email protected]>; Richardson, Bruce <[email protected]>; Van Haaren, Harry <[email protected]>; Liu, Yong <[email protected]>; Ma, WenwuX <[email protected]>
Subject: Re: [dpdk-dev] [PATCH v5 1/2] vhost: enable IOMMU for async vhostQuoted 72 lines · Anatoly
Quoted 71 lines · Xuan Ding
The use of IOMMU has many advantages, such as isolation and address translation. This patch extends the capbility of DMA engine to use IOMMU if the DMA device is bound to vfio.
When set memory table, the guest memory will be mapped into the default container of DPDK.
Signed-off-by Xuan Ding <[email protected]>--- doc/guides/prog_guide/vhost_lib.rst | 9 ++++++ lib/vhost/rte_vhost.h | 1 + lib/vhost/socket.c | 9 ++++++ lib/vhost/vhost.h | 1 + lib/vhost/vhost_user.c | 46 ++++++++++++++++++++++++++++- 5 files changed, 65 insertions(+), 1 deletion(-)doc/guides/prog_guide/vhost_lib.rst +0
-0@@ -118,6 +118,15 @@ The following is an overview of some key VhostAPI functions:
It is disabled by default.
+ - ``RTE_VHOST_USER_ASYNC_USE_VFIO``doc/guides/prog_guide/vhost_lib.rst +2
-0+ + In asynchronous data path, vhost liarary is not aware of whichdriver
+ (igb_uio/vfio) the DMA device is bound to. Application should
pass
+ this flag to tell vhost library whether IOMMU should be
programmeddoc/guides/prog_guide/vhost_lib.rst +4
-0+ for guest memory. + + It is disabled by default. + - ``RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS`` Since v16.04, the vhost library forwards checksum and gsorequests for
lib/vhost/rte_vhost.h +1
-0@@ -37,6 +37,7 @@ extern "C" {#define RTE_VHOST_USER_LINEARBUF_SUPPORT (1ULL << 6)#define RTE_VHOST_USER_ASYNC_COPY (1ULL << 7)#define RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS (1ULL << 8) +#define RTE_VHOST_USER_ASYNC_USE_VFIO (1ULL << 9)/* Features. */ #ifndef VIRTIO_NET_F_GUEST_ANNOUNCE lib/vhost/socket.c +5
-0@@ -42,6 +42,7 @@ struct vhost_user_socket {bool extbuf;bool linearbuf;bool async_copy; +bool async_use_vfio;bool net_compliant_ol_flags;/* @@ -243,6 +244,13 @@ vhost_user_add_connection(int fd, struct vhost_user_socket *vsocket) dev->async_copy = 1; } + if (vsocket->async_use_vfio) { + dev =get_device (vid); + +if (dev) + dev->async_use_vfio =1 ;Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
lib/vhost/socket.c rte_vhost_driver_register(const char *path, · line 889
Quoted 8 lines
lib/vhost/socket.c +2
-0+ } +VHOST_LOG_CONFIG (INFO ,"new device, handle is %d\n" , vid);if (vsocket->notify_ops->new_connection) {@@ -879,6 +887,7 @@ rte_vhost_driver_register(const char *path, uint64_t flags) vsocket->extbuf = flags & RTE_VHOST_USER_EXTBUF_SUPPORT; vsocket->linearbuf = flags &
RTE_VHOST_USER_LINEARBUF_SUPPORT;Quoted 122 lines
Quoted 122 lines
Quoted 121 lines
Quoted 2 lines
lib/vhost/socket.c rte_vhost_driver_register(const char *path, · line 891
Quoted 2 lines
lib/vhost/socket.c +1
-0vsocket->async_copy = flags &RTE_VHOST_USER_ASYNC_COPY ; + vsocket->async_use_vfio = flags &
RTE_VHOST_USER_ASYNC_USE_VFIO;Quoted 32 lines
Quoted 32 lines
lib/vhost/socket.c +0
-0vsocket->net_compliant_ol_flags = flags &RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS ;if (vsocket->async_copy &&lib/vhost/vhost.h +1
-0@@ -370,6 +370,7 @@ struct virtio_net {int16_t broadcast_rarp;uint32_t nr_vring;int async_copy; +int async_use_vfio;int extbuf;int linearbuf; struct vhost_virtqueue *virtqueue[VHOST_MAX_QUEUE_PAIRS *2];
lib/vhost/vhost_user.c +2
-0@@ -45,6 +45,7 @@#include <rte_common.h> #include <rte_malloc.h> #include <rte_log.h> +#include <rte_vfio.h> #include "iotlb.h" #include "vhost.h" @@ -141,6 +142,36 @@ get_blk_size(int fd)return ret ==-1 ? (uint64_t )-1 : (uint64_t )stat.st_blksize; } +static int +async_dma_map (struct rte_vhost_mem_region *region,bool do_map)Quoted 8 lines
lib/vhost/vhost_user.c get_blk_size(int fd) · line 153
Quoted 8 lines
lib/vhost/vhost_user.c +7
-0+{ +int ret =0 ; +uint64_t host_iova; + 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,
Quoted 33 lines
Quoted 12 lines
lib/vhost/vhost_user.c +9
-0+ region->host_user_addr, + host_iova, + region->size); +if (ret) { +VHOST_LOG_CONFIG (ERR ,"DMA engine map failed\n" ); +return ret; + } + }else { +/* Remove mapped region from the default container of DPDK. */
+ ret =
rte_vfio_container_dma_unmap(RTE_VFIO_DEFAULT_CONTAINER_FD,lib/vhost/vhost_user.c
Quoted 10 lines
lib/vhost/vhost_user.c +10
-0+ region->host_user_addr, + host_iova, + region->size); +if (ret) { +VHOST_LOG_CONFIG (ERR ,"DMA engine unmap failed\n" ); +return ret; + } + } +return ret; +}We've been discussing this off list with Xuan, and unfortunately this is
a blocker for now.Currently, the x86 IOMMU does not support partial unmap - the segments have to be unmapped exactly the same addr/len as they were mapped. We also concatenate adjacent mappings to prevent filling up the DMA mapping
entry table with superfluous entries.Quoted 4 lines
This means that, when two unrelated mappings are contiguous in memory (e.g. if you map regions 1 and 2 independently, but they happen to be sitting right next to each other in virtual memory), we cannot later unmap one of them because, even though these are two separate
mappings
Quoted 10 lines
as far as kernel VFIO infrastructure is concerned, the mapping gets compacted and looks like one single mapping to VFIO, so DPDK API will not let us unmap region 1 without also unmapping region 2.
The proper fix for this problem would be to always map memory page-by-page regardless of where it comes from (we already do that for internal memory, but not for external). However, the reason this works for internal memory is because when mapping internal memory segments, *we know the page size*. For external memory segments, there is no such guarantee, so we cannot deduce page size for a given memory segment,
and
Quoted 7 lines
thus can't map things page-by-page.
So, the proper fix for it would be to add page size to the VFIO DMA API.
Unfortunately, it probably has to wait until 21.11 because it is an API change.Quoted 8 lines
The slightly hacky fix for this would be to forego user mem map concatenation and trust that user is not going to do anything stupid, and will not spam the VFIO DMA API without reason. I would rather not go
down this road, but this could be an option in this case.Thoughts?
Thanks Anatoly for the detailed description of the issue. It may be possible to either create a versioned symbol for this API change, or maybe even to have a temporary internal API.
But I think this series in its current form is not acceptable, so waiting for v21.11 would be the best option (we may want to send the deprecation notice in this release though).
In this series, I don't like the user application has to pass a flag to state whether the DMA engine uses VFIO or not. AFAICT, this new revision does not implement what was discussed in the previous one, i.e. supporting both
IOVA_AS_VAandIOVA_AS_PA.Quoted 6 lines
Quoted 6 lines
Thanks for your comments. Here I hope to explain some questions:
1. Whether bothIOVA_AS_VAandIOVA_AS_PAare supported now?
A: BothIOVA_AS_PAandIOVA_AS_VAare supported now. In this version, the virtual address is replaced with iova address of mapped region, and the iova
address is selected to program the IOMMU instead of virtual address only.Good!
Quoted 5 lines
Quoted 5 lines
2. Why a flag is chosen to be passed by application?
A: Yes, as we discussed before, therte_eal_iova_mode()API can be used to
get the IOVA mode, so as to determine whether IOMMU should beprogrammed.
Quoted 5 lines
Quoted 4 lines
However, in the implementation process, I found a problem. That is how to distinguish the VFIO PA and
IGB_UIOPA. Because for VFIO cases, we should always program the IOMMU. While inIGB_UIOcases, it depends on IOMMU capability of platform.Quoted 5 lines
Quoted 3 lines
How does one program IOMMU with
igb_uio? I was under impression thatigb_uio(anduio_pci_genericfor that matter) does not provide such facilities.+1
Maybe some misunderstanding in this sentence here.
In our design, ifrte_eal_vfio_is_enabled("vfio")is true, iommu will be programmed. True means vfio module is modprobed.But there is an exception here, that is, even if vfio module is modprobed, DPDK user still bind all the devices to
igb_uio.
Quoted 6 lines
This situation can be distinguished in DPDK eal initialization, because the resource mapping is according to the driver loaded by each
device(rte_pci_map_device).But in our scenario, this judgment is somewhat weak. Because we cannot get the device driver info in vhost library. I also think it is unreasonable for vhost to do this. Only trust that users will not use it like this. Thoughts for this scenario?
I don't see how igb_uio would make any difference at all. If you are using igb_uio, you *don't have DMA mapping at all* and will use raw physical addresses. Assuming your code supports this, that's all you're ever going to get. The point of VFIO is to have memory regions that are mapped for DMA *because real physical addresses are assumed to be not available*. When you're using igb_uio, you effectively do have DMA access to the entire memory, and thus can bypass IOMMU altogether (assuming you're using passthrough mode).
Bottom line: do VFIO DMA mapping unconditionally. If VFIO is active - great, the memory will be DMA mapped. If it's not active - no harm will ever be done by mapping the memory for DMA anyway.
Signature · 2 lines
Thanks, Anatoly
Re: [dpdk-dev] [PATCH v5 1/2] vhost: enable IOMMU for async vhost
Hi Anatoly,
Quoted 310 lines
-----Original Message-----
From: Burakov, Anatoly <[email protected]>
Sent: Wednesday, July 7, 2021 8:18 PM
To: Ding, Xuan <[email protected]>; Maxime Coquelin <[email protected]>; Xia, Chenbo <[email protected]>; Thomas Monjalon <[email protected]>; David Marchand <[email protected]>
Cc: [email protected]; Hu, Jiayu <[email protected]>; Pai G, Sunil <[email protected]>; Richardson, Bruce <[email protected]>; Van Haaren, Harry <[email protected]>; Liu, Yong <[email protected]>; Ma, WenwuX <[email protected]>
Subject: Re: [dpdk-dev] [PATCH v5 1/2] vhost: enable IOMMU for async vhostQuoted 11 lines · Xuan
Hi,
Quoted 9 lines
-----Original Message-----
From: Maxime Coquelin <[email protected]>
Sent: Tuesday, July 6, 2021 5:32 PM
To: Burakov, Anatoly <[email protected]>; Ding, Xuan <[email protected]>; Xia, Chenbo <[email protected]>; Thomas Monjalon <[email protected]>; David Marchand <[email protected]>
Cc: [email protected]; Hu, Jiayu <[email protected]>; Pai G, Sunil <[email protected]>; Richardson, Bruce <[email protected]>;Van
Quoted 1 line
Quoted 1 line
Haaren, Harry <[email protected]>; Liu, Yong
Quoted 9 lines
Quoted 9 lines
Ma, WenwuX <[email protected]>
Subject: Re: [dpdk-dev] [PATCH v5 1/2] vhost: enable IOMMU for async vhostQuoted 3 lines · Anatoly
Quoted 2 lines · Xuan
Hi Maxime,
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
-----Original Message-----
From: Maxime Coquelin <[email protected]>
Sent: Monday, July 5, 2021 8:46 PM
To: Burakov, Anatoly <[email protected]>; Ding, Xuan <[email protected]>; Xia, Chenbo <[email protected]>; Thomas Monjalon <[email protected]>; David Marchand <[email protected]>
Cc: [email protected]; Hu, Jiayu <[email protected]>; Pai G, Sunil <[email protected]>; Richardson, BruceQuoted 26 lines
Quoted 26 lines
Quoted 26 lines
Quoted 26 lines
Quoted 26 lines
Van Haaren, Harry <[email protected]>; Liu, Yong <[email protected]>; Ma, WenwuX <[email protected]>
Subject: Re: [dpdk-dev] [PATCH v5 1/2] vhost: enable IOMMU for async vhostQuoted 18 lines · Anatoly
Quoted 17 lines · Xuan Ding
The use of IOMMU has many advantages, such as isolation and address translation. This patch extends the capbility of DMA engine to use IOMMU if the DMA device is bound to vfio.
When set memory table, the guest memory will be mapped into the default container of DPDK.
Signed-off-by Xuan Ding <[email protected]>--- doc/guides/prog_guide/vhost_lib.rst | 9 ++++++ lib/vhost/rte_vhost.h | 1 + lib/vhost/socket.c | 9 ++++++ lib/vhost/vhost.h | 1 + lib/vhost/vhost_user.c | 46 ++++++++++++++++++++++++++++- 5 files changed, 65 insertions(+), 1 deletion(-)Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
doc/guides/prog_guide/vhost_lib.rst The following is an overview of some key
Quoted 6 lines
doc/guides/prog_guide/vhost_lib.rst +0
-0@@ -118,6 +118,15 @@ The following is an overview of some keyVhost
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
API functions:
It is disabled by default.
+ - ``RTE_VHOST_USER_ASYNC_USE_VFIO``doc/guides/prog_guide/vhost_lib.rst +2
-0+ + In asynchronous data path, vhost liarary is not aware of whichdriver
+ (igb_uio/vfio) the DMA device is bound to. Application should
pass
+ this flag to tell vhost library whether IOMMU should be
programmeddoc/guides/prog_guide/vhost_lib.rst +4
-0+ for guest memory. + + It is disabled by default. + - ``RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS`` Since v16.04, the vhost library forwards checksum and gsorequests for
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
lib/vhost/rte_vhost.h extern "C" { · line 39
Quoted 8 lines
lib/vhost/rte_vhost.h +0
-0@@ -37,6 +37,7 @@ extern "C" {#define RTE_VHOST_USER_LINEARBUF_SUPPORT (1ULL << 6)#define RTE_VHOST_USER_ASYNC_COPY (1ULL << 7)#define RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS (1ULL <<8)
Quoted 99 lines
Quoted 99 lines
Quoted 23 lines
Quoted 23 lines
Quoted 23 lines
Quoted 23 lines
Quoted 23 lines
lib/vhost/rte_vhost.h +1
-0+#define RTE_VHOST_USER_ASYNC_USE_VFIO (1ULL << 9)/* Features. */ #ifndef VIRTIO_NET_F_GUEST_ANNOUNCE lib/vhost/socket.c +5
-0@@ -42,6 +42,7 @@ struct vhost_user_socket {bool extbuf;bool linearbuf;bool async_copy; +bool async_use_vfio;bool net_compliant_ol_flags;/* @@ -243,6 +244,13 @@ vhost_user_add_connection(int fd, struct vhost_user_socket *vsocket) dev->async_copy = 1; } + if (vsocket->async_use_vfio) { + dev =get_device (vid); + +if (dev) + dev->async_use_vfio =1 ;Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
lib/vhost/socket.c rte_vhost_driver_register(const char *path, · line 889
Quoted 8 lines
lib/vhost/socket.c +2
-0+ } +VHOST_LOG_CONFIG (INFO ,"new device, handle is %d\n" , vid);if (vsocket->notify_ops->new_connection) {@@ -879,6 +887,7 @@ rte_vhost_driver_register(const char *path, uint64_t flags) vsocket->extbuf = flags & RTE_VHOST_USER_EXTBUF_SUPPORT; vsocket->linearbuf = flags &
RTE_VHOST_USER_LINEARBUF_SUPPORT;Quoted 67 lines
Quoted 67 lines
Quoted 67 lines
Quoted 2 lines
lib/vhost/socket.c rte_vhost_driver_register(const char *path, · line 891
Quoted 2 lines
lib/vhost/socket.c +1
-0vsocket->async_copy = flags &RTE_VHOST_USER_ASYNC_COPY ; + vsocket->async_use_vfio = flags &
RTE_VHOST_USER_ASYNC_USE_VFIO;Quoted 32 lines
Quoted 32 lines
lib/vhost/socket.c +0
-0vsocket->net_compliant_ol_flags = flags &RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS ;if (vsocket->async_copy &&lib/vhost/vhost.h +1
-0@@ -370,6 +370,7 @@ struct virtio_net {int16_t broadcast_rarp;uint32_t nr_vring;int async_copy; +int async_use_vfio;int extbuf;int linearbuf; struct vhost_virtqueue *virtqueue[VHOST_MAX_QUEUE_PAIRS *2];
lib/vhost/vhost_user.c +2
-0@@ -45,6 +45,7 @@#include <rte_common.h> #include <rte_malloc.h> #include <rte_log.h> +#include <rte_vfio.h> #include "iotlb.h" #include "vhost.h" @@ -141,6 +142,36 @@ get_blk_size(int fd)return ret ==-1 ? (uint64_t )-1 : (uint64_t )stat.st_blksize; } +static int +async_dma_map (struct rte_vhost_mem_region *region,bool do_map)Quoted 8 lines
lib/vhost/vhost_user.c get_blk_size(int fd) · line 153
Quoted 8 lines
lib/vhost/vhost_user.c +7
-0+{ +int ret =0 ; +uint64_t host_iova; + 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,
Quoted 23 lines
Quoted 22 lines
lib/vhost/vhost_user.c +9
-0+ region->host_user_addr, + host_iova, + region->size); +if (ret) { +VHOST_LOG_CONFIG (ERR ,"DMA engine map failed\n" ); +return ret; + } + }else { +/* Remove mapped region from the default container of DPDK. */
+ ret =
rte_vfio_container_dma_unmap(RTE_VFIO_DEFAULT_CONTAINER_FD,lib/vhost/vhost_user.c +10
-0+ region->host_user_addr, + host_iova, + region->size); +if (ret) { +VHOST_LOG_CONFIG (ERR ,"DMA engine unmap failed\n" ); +return ret; + } + } +return ret; +}Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
We've been discussing this off list with Xuan, and unfortunately this is
a blocker for now.Currently, the x86 IOMMU does not support partial unmap - the
segments
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
have to be unmapped exactly the same addr/len as they were mapped.
We
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
also concatenate adjacent mappings to prevent filling up the DMA mapping
entry table with superfluous entries.This means that, when two unrelated mappings are contiguous in
memory
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 3 lines
(e.g. if you map regions 1 and 2 independently, but they happen to be sitting right next to each other in virtual memory), we cannot later unmap one of them because, even though these are two separate
mappings
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
as far as kernel VFIO infrastructure is concerned, the mapping gets compacted and looks like one single mapping to VFIO, so DPDK API will not let us unmap region 1 without also unmapping region 2.
The proper fix for this problem would be to always map memory page-by-page regardless of where it comes from (we already do that for internal memory, but not for external). However, the reason this works for internal memory is because when mapping internal memory
segments,
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
*we know the page size*. For external memory segments, there is no
such
Quoted 26 lines
Quoted 26 lines
Quoted 26 lines
Quoted 26 lines
Quoted 26 lines
Quoted 1 line
guarantee, so we cannot deduce page size for a given memory segment,
and
Quoted 7 lines
thus can't map things page-by-page.
So, the proper fix for it would be to add page size to the VFIO DMA API.
Unfortunately, it probably has to wait until 21.11 because it is an API change.Quoted 8 lines
The slightly hacky fix for this would be to forego user mem map concatenation and trust that user is not going to do anything stupid, and will not spam the VFIO DMA API without reason. I would rather not go
down this road, but this could be an option in this case.Thoughts?
Thanks Anatoly for the detailed description of the issue. It may be possible to either create a versioned symbol for this API change, or maybe even to have a temporary internal API.
But I think this series in its current form is not acceptable, so waiting for v21.11 would be the best option (we may want to send the deprecation notice in this release though).
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 4 lines
In this series, I don't like the user application has to pass a flag to state whether the DMA engine uses VFIO or not. AFAICT, this new revision does not implement what was discussed in the previous one, i.e. supporting both
IOVA_AS_VAandIOVA_AS_PA.Thanks for your comments. Here I hope to explain some questions:
1. Whether bothIOVA_AS_VAandIOVA_AS_PAare supported now?
A: BothIOVA_AS_PAandIOVA_AS_VAare supported now. In this version,the
Quoted 7 lines
Quoted 7 lines
Quoted 3 lines
Quoted 3 lines
virtual address is replaced with iova address of mapped region, and the iova
address is selected to program the IOMMU instead of virtual address only.Good!
Quoted 1 line
Quoted 1 line
Quoted 7 lines
Quoted 7 lines
Quoted 4 lines
Quoted 4 lines
2. Why a flag is chosen to be passed by application?
A: Yes, as we discussed before, therte_eal_iova_mode()API can be used to
get the IOVA mode, so as to determine whether IOMMU should beprogrammed.
Quoted 2 lines
Quoted 2 lines
However, in the implementation process, I found a problem. That is how to distinguish the VFIO PA and
IGB_UIOPA. Because for VFIO cases, weshould
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
always program the IOMMU. While in
IGB_UIOcases, it depends onIOMMU
Quoted 10 lines
Quoted 7 lines
Quoted 5 lines
Quoted 1 line
capability of platform.
How does one program IOMMU with
igb_uio? I was under impression thatigb_uio(anduio_pci_genericfor that matter) does not provide such facilities.+1
Maybe some misunderstanding in this sentence here.
In our design, ifrte_eal_vfio_is_enabled("vfio")is true, iommu will beprogrammed.
Quoted 6 lines
True means vfio module is modprobed.
But there is an exception here, that is, even if vfio module is modprobed, DPDK user still bind all the devices to
igb_uio.This situation can be distinguished in DPDK eal initialization, because the
resource mapping
Quoted 5 lines
is according to the driver loaded by each
device(rte_pci_map_device).But in our scenario, this judgment is somewhat weak. Because we cannot get the device driver info in vhost library. I also think it is unreasonable for vhost to do this. Only trust that users will not use it like this. Thoughts for this scenario?
Quoted 8 lines
I don't see how
igb_uiowould make any difference at all. If you are usingigb_uio, you *don't have DMA mapping at all* and will use raw physical addresses. Assuming your code supports this, that's all you're ever going to get. The point of VFIO is to have memory regions that are mapped for DMA *because real physical addresses are assumed to be not available*. When you're usingigb_uio, you effectively do have DMA access to the entire memory, and thus can bypass IOMMU altogether (assuming you're using passthrough mode).
My concern is exactly here.
In igb_uio cases, although devices are not added to the default container in eal init, but the "IOMMU programming" actually happens when the rte_vfio_container_dma_map() is called. It is no harm but it is also unnecessary.
Quoted 4 lines
Bottom line: do VFIO DMA mapping unconditionally. If VFIO is active - great, the memory will be DMA mapped. If it's not active - no harm will ever be done by mapping the memory for DMA anyway.
Do VFIO DMA mapping unconditionally, do you mean the rte_eal_vfio_is_enabled() is unnecessary? What if the platform does not have IOMMU?
Thanks very much.
Regards,
Xuan
Quoted 4 lines
--
Thanks,
Anatoly
Re: [dpdk-dev] [PATCH v5 1/2] vhost: enable IOMMU for async vhost
Quoted 321 lines · Xuan
Hi Anatoly,
Quoted 310 lines
-----Original Message-----
From: Burakov, Anatoly <[email protected]>
Sent: Wednesday, July 7, 2021 8:18 PM
To: Ding, Xuan <[email protected]>; Maxime Coquelin <[email protected]>; Xia, Chenbo <[email protected]>; Thomas Monjalon <[email protected]>; David Marchand <[email protected]>
Cc: [email protected]; Hu, Jiayu <[email protected]>; Pai G, Sunil <[email protected]>; Richardson, Bruce <[email protected]>; Van Haaren, Harry <[email protected]>; Liu, Yong <[email protected]>; Ma, WenwuX <[email protected]>
Subject: Re: [dpdk-dev] [PATCH v5 1/2] vhost: enable IOMMU for async vhostQuoted 11 lines · Xuan
Hi,
Quoted 9 lines
-----Original Message-----
From: Maxime Coquelin <[email protected]>
Sent: Tuesday, July 6, 2021 5:32 PM
To: Burakov, Anatoly <[email protected]>; Ding, Xuan <[email protected]>; Xia, Chenbo <[email protected]>; Thomas Monjalon <[email protected]>; David Marchand <[email protected]>
Cc: [email protected]; Hu, Jiayu <[email protected]>; Pai G, Sunil <[email protected]>; Richardson, Bruce <[email protected]>;Van
Quoted 1 line
Quoted 1 line
Haaren, Harry <[email protected]>; Liu, Yong
Quoted 9 lines
Quoted 9 lines
Ma, WenwuX <[email protected]>
Subject: Re: [dpdk-dev] [PATCH v5 1/2] vhost: enable IOMMU for async vhostQuoted 3 lines · Anatoly
Quoted 2 lines · Xuan
Hi Maxime,
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
-----Original Message-----
From: Maxime Coquelin <[email protected]>
Sent: Monday, July 5, 2021 8:46 PM
To: Burakov, Anatoly <[email protected]>; Ding, Xuan <[email protected]>; Xia, Chenbo <[email protected]>; Thomas Monjalon <[email protected]>; David Marchand <[email protected]>
Cc: [email protected]; Hu, Jiayu <[email protected]>; Pai G, Sunil <[email protected]>; Richardson, BruceQuoted 26 lines
Quoted 26 lines
Quoted 26 lines
Quoted 26 lines
Quoted 26 lines
Van Haaren, Harry <[email protected]>; Liu, Yong <[email protected]>; Ma, WenwuX <[email protected]>
Subject: Re: [dpdk-dev] [PATCH v5 1/2] vhost: enable IOMMU for async vhostQuoted 18 lines · Anatoly
Quoted 17 lines · Xuan Ding
The use of IOMMU has many advantages, such as isolation and address translation. This patch extends the capbility of DMA engine to use IOMMU if the DMA device is bound to vfio.
When set memory table, the guest memory will be mapped into the default container of DPDK.
Signed-off-by Xuan Ding <[email protected]>--- doc/guides/prog_guide/vhost_lib.rst | 9 ++++++ lib/vhost/rte_vhost.h | 1 + lib/vhost/socket.c | 9 ++++++ lib/vhost/vhost.h | 1 + lib/vhost/vhost_user.c | 46 ++++++++++++++++++++++++++++- 5 files changed, 65 insertions(+), 1 deletion(-)Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
doc/guides/prog_guide/vhost_lib.rst The following is an overview of some key
Quoted 6 lines
doc/guides/prog_guide/vhost_lib.rst +0
-0@@ -118,6 +118,15 @@ The following is an overview of some keyVhost
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
API functions:
It is disabled by default.
+ - ``RTE_VHOST_USER_ASYNC_USE_VFIO``doc/guides/prog_guide/vhost_lib.rst +2
-0+ + In asynchronous data path, vhost liarary is not aware of whichdriver
+ (igb_uio/vfio) the DMA device is bound to. Application should
pass
+ this flag to tell vhost library whether IOMMU should be
programmeddoc/guides/prog_guide/vhost_lib.rst +4
-0+ for guest memory. + + It is disabled by default. + - ``RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS`` Since v16.04, the vhost library forwards checksum and gsorequests for
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
lib/vhost/rte_vhost.h extern "C" { · line 39
Quoted 8 lines
lib/vhost/rte_vhost.h +0
-0@@ -37,6 +37,7 @@ extern "C" {#define RTE_VHOST_USER_LINEARBUF_SUPPORT (1ULL << 6)#define RTE_VHOST_USER_ASYNC_COPY (1ULL << 7)#define RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS (1ULL <<8)
Quoted 99 lines
Quoted 99 lines
Quoted 23 lines
Quoted 23 lines
Quoted 23 lines
Quoted 23 lines
Quoted 23 lines
lib/vhost/rte_vhost.h +1
-0+#define RTE_VHOST_USER_ASYNC_USE_VFIO (1ULL << 9)/* Features. */ #ifndef VIRTIO_NET_F_GUEST_ANNOUNCE lib/vhost/socket.c +5
-0@@ -42,6 +42,7 @@ struct vhost_user_socket {bool extbuf;bool linearbuf;bool async_copy; +bool async_use_vfio;bool net_compliant_ol_flags;/* @@ -243,6 +244,13 @@ vhost_user_add_connection(int fd, struct vhost_user_socket *vsocket) dev->async_copy = 1; } + if (vsocket->async_use_vfio) { + dev =get_device (vid); + +if (dev) + dev->async_use_vfio =1 ;Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
lib/vhost/socket.c rte_vhost_driver_register(const char *path, · line 889
Quoted 8 lines
lib/vhost/socket.c +2
-0+ } +VHOST_LOG_CONFIG (INFO ,"new device, handle is %d\n" , vid);if (vsocket->notify_ops->new_connection) {@@ -879,6 +887,7 @@ rte_vhost_driver_register(const char *path, uint64_t flags) vsocket->extbuf = flags & RTE_VHOST_USER_EXTBUF_SUPPORT; vsocket->linearbuf = flags &
RTE_VHOST_USER_LINEARBUF_SUPPORT;Quoted 67 lines
Quoted 67 lines
Quoted 67 lines
Quoted 2 lines
lib/vhost/socket.c rte_vhost_driver_register(const char *path, · line 891
Quoted 2 lines
lib/vhost/socket.c +1
-0vsocket->async_copy = flags &RTE_VHOST_USER_ASYNC_COPY ; + vsocket->async_use_vfio = flags &
RTE_VHOST_USER_ASYNC_USE_VFIO;Quoted 32 lines
Quoted 32 lines
lib/vhost/socket.c +0
-0vsocket->net_compliant_ol_flags = flags &RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS ;if (vsocket->async_copy &&lib/vhost/vhost.h +1
-0@@ -370,6 +370,7 @@ struct virtio_net {int16_t broadcast_rarp;uint32_t nr_vring;int async_copy; +int async_use_vfio;int extbuf;int linearbuf; struct vhost_virtqueue *virtqueue[VHOST_MAX_QUEUE_PAIRS *2];
lib/vhost/vhost_user.c +2
-0@@ -45,6 +45,7 @@#include <rte_common.h> #include <rte_malloc.h> #include <rte_log.h> +#include <rte_vfio.h> #include "iotlb.h" #include "vhost.h" @@ -141,6 +142,36 @@ get_blk_size(int fd)return ret ==-1 ? (uint64_t )-1 : (uint64_t )stat.st_blksize; } +static int +async_dma_map (struct rte_vhost_mem_region *region,bool do_map)Quoted 8 lines
lib/vhost/vhost_user.c get_blk_size(int fd) · line 153
Quoted 8 lines
lib/vhost/vhost_user.c +7
-0+{ +int ret =0 ; +uint64_t host_iova; + 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,
Quoted 23 lines
Quoted 22 lines
lib/vhost/vhost_user.c +9
-0+ region->host_user_addr, + host_iova, + region->size); +if (ret) { +VHOST_LOG_CONFIG (ERR ,"DMA engine map failed\n" ); +return ret; + } + }else { +/* Remove mapped region from the default container of DPDK. */
+ ret =
rte_vfio_container_dma_unmap(RTE_VFIO_DEFAULT_CONTAINER_FD,lib/vhost/vhost_user.c +10
-0+ region->host_user_addr, + host_iova, + region->size); +if (ret) { +VHOST_LOG_CONFIG (ERR ,"DMA engine unmap failed\n" ); +return ret; + } + } +return ret; +}Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
We've been discussing this off list with Xuan, and unfortunately this is
a blocker for now.Currently, the x86 IOMMU does not support partial unmap - the
segments
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
have to be unmapped exactly the same addr/len as they were mapped.
We
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
also concatenate adjacent mappings to prevent filling up the DMA mapping
entry table with superfluous entries.This means that, when two unrelated mappings are contiguous in
memory
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 3 lines
(e.g. if you map regions 1 and 2 independently, but they happen to be sitting right next to each other in virtual memory), we cannot later unmap one of them because, even though these are two separate
mappings
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
as far as kernel VFIO infrastructure is concerned, the mapping gets compacted and looks like one single mapping to VFIO, so DPDK API will not let us unmap region 1 without also unmapping region 2.
The proper fix for this problem would be to always map memory page-by-page regardless of where it comes from (we already do that for internal memory, but not for external). However, the reason this works for internal memory is because when mapping internal memory
segments,
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
*we know the page size*. For external memory segments, there is no
such
Quoted 26 lines
Quoted 26 lines
Quoted 26 lines
Quoted 26 lines
Quoted 26 lines
Quoted 1 line
guarantee, so we cannot deduce page size for a given memory segment,
and
Quoted 7 lines
thus can't map things page-by-page.
So, the proper fix for it would be to add page size to the VFIO DMA API.
Unfortunately, it probably has to wait until 21.11 because it is an API change.Quoted 8 lines
The slightly hacky fix for this would be to forego user mem map concatenation and trust that user is not going to do anything stupid, and will not spam the VFIO DMA API without reason. I would rather not go
down this road, but this could be an option in this case.Thoughts?
Thanks Anatoly for the detailed description of the issue. It may be possible to either create a versioned symbol for this API change, or maybe even to have a temporary internal API.
But I think this series in its current form is not acceptable, so waiting for v21.11 would be the best option (we may want to send the deprecation notice in this release though).
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 4 lines
In this series, I don't like the user application has to pass a flag to state whether the DMA engine uses VFIO or not. AFAICT, this new revision does not implement what was discussed in the previous one, i.e. supporting both
IOVA_AS_VAandIOVA_AS_PA.Thanks for your comments. Here I hope to explain some questions:
1. Whether bothIOVA_AS_VAandIOVA_AS_PAare supported now?
A: BothIOVA_AS_PAandIOVA_AS_VAare supported now. In this version,the
Quoted 7 lines
Quoted 7 lines
Quoted 3 lines
Quoted 3 lines
virtual address is replaced with iova address of mapped region, and the iova
address is selected to program the IOMMU instead of virtual address only.Good!
Quoted 1 line
Quoted 1 line
Quoted 7 lines
Quoted 7 lines
Quoted 4 lines
Quoted 4 lines
2. Why a flag is chosen to be passed by application?
A: Yes, as we discussed before, therte_eal_iova_mode()API can be used to
get the IOVA mode, so as to determine whether IOMMU should beprogrammed.
Quoted 2 lines
Quoted 2 lines
However, in the implementation process, I found a problem. That is how to distinguish the VFIO PA and
IGB_UIOPA. Because for VFIO cases, weshould
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
always program the IOMMU. While in
IGB_UIOcases, it depends onIOMMU
Quoted 10 lines
Quoted 7 lines
Quoted 5 lines
Quoted 1 line
capability of platform.
How does one program IOMMU with
igb_uio? I was under impression thatigb_uio(anduio_pci_genericfor that matter) does not provide such facilities.+1
Maybe some misunderstanding in this sentence here.
In our design, ifrte_eal_vfio_is_enabled("vfio")is true, iommu will beprogrammed.
Quoted 6 lines
True means vfio module is modprobed.
But there is an exception here, that is, even if vfio module is modprobed, DPDK user still bind all the devices to
igb_uio.This situation can be distinguished in DPDK eal initialization, because the
resource mapping
Quoted 5 lines
is according to the driver loaded by each
device(rte_pci_map_device).But in our scenario, this judgment is somewhat weak. Because we cannot get the device driver info in vhost library. I also think it is unreasonable for vhost to do this. Only trust that users will not use it like this. Thoughts for this scenario?
Quoted 8 lines
I don't see how
igb_uiowould make any difference at all. If you are usingigb_uio, you *don't have DMA mapping at all* and will use raw physical addresses. Assuming your code supports this, that's all you're ever going to get. The point of VFIO is to have memory regions that are mapped for DMA *because real physical addresses are assumed to be not available*. When you're usingigb_uio, you effectively do have DMA access to the entire memory, and thus can bypass IOMMU altogether (assuming you're using passthrough mode).
Quoted 4 lines
My concern is exactly here.
Inigb_uiocases, although devices are not added to the default container in eal init, but the "IOMMU programming" actually happens when therte_vfio_container_dma_map()is called. It is no harm but it is also unnecessary.
Yes, it is unnecessary, but it's also not actively harmful, which means you can still do it without any regard as to whether you do or don't have IOMMU :)
Think of a hybrid VFIO/igb_uio setup - some NICs will have VFIO, some will have igb_uio. The igb_uio-bound NICs will not care if you have mapped anything for DMA because they don't go through IOMMU, things will "just work". The VFIO-bound NICs will get the memory mapped, because they are the ones who actually need the DMA mapping.
So, what you get is, if you do VFIO DMA mapping unconditionally, 1) NICs with igb_uio won't care about this, and 2) NICs with VFIO will benefit. You're not "mapping" the NICs, you're mapping the memory you're accessing with those NICs. You need it to be accessible to both, but since you have no way of knowing whether 1) any of the current HW needs VFIO, and 2) any of *future hotplugged* HW needs VFIO, the easiest way to solve this problem is just to map things regardless, and live with the "unnecessary" but harmless mapping in the worst case.
Quoted 11 lines
Quoted 5 lines
Bottom line: do VFIO DMA mapping unconditionally. If VFIO is active - great, the memory will be DMA mapped. If it's not active - no harm will ever be done by mapping the memory for DMA anyway.
Do VFIO DMA mapping unconditionally, do you mean the
rte_eal_vfio_is_enabled()is unnecessary? What if the platform does not have IOMMU?Thanks very much.
If the platform has no IOMMU, the API call will just not do anything useful, so no harm done.
Quoted 7 lines
Regards,
XuanQuoted 4 lines
--
Thanks,
Anatoly
Signature · 2 lines
Thanks, Anatoly
Re: [dpdk-dev] [PATCH v5 1/2] vhost: enable IOMMU for async vhost
Quoted 331 lines · Anatoly
Quoted 321 lines · Xuan
Hi Anatoly,
Quoted 310 lines
-----Original Message-----
From: Burakov, Anatoly <[email protected]>
Sent: Wednesday, July 7, 2021 8:18 PM
To: Ding, Xuan <[email protected]>; Maxime Coquelin <[email protected]>; Xia, Chenbo <[email protected]>; Thomas Monjalon <[email protected]>; David Marchand <[email protected]>
Cc: [email protected]; Hu, Jiayu <[email protected]>; Pai G, Sunil <[email protected]>; Richardson, Bruce <[email protected]>; Van Haaren, Harry <[email protected]>; Liu, Yong <[email protected]>; Ma, WenwuX <[email protected]>
Subject: Re: [dpdk-dev] [PATCH v5 1/2] vhost: enable IOMMU for async vhostQuoted 11 lines · Xuan
Hi,
Quoted 9 lines
-----Original Message-----
From: Maxime Coquelin <[email protected]>
Sent: Tuesday, July 6, 2021 5:32 PM
To: Burakov, Anatoly <[email protected]>; Ding, Xuan <[email protected]>; Xia, Chenbo <[email protected]>; Thomas Monjalon <[email protected]>; David Marchand <[email protected]>
Cc: [email protected]; Hu, Jiayu <[email protected]>; Pai G, Sunil <[email protected]>; Richardson, Bruce <[email protected]>;Van
Quoted 1 line
Quoted 1 line
Haaren, Harry <[email protected]>; Liu, Yong
Quoted 9 lines
Quoted 9 lines
Ma, WenwuX <[email protected]>
Subject: Re: [dpdk-dev] [PATCH v5 1/2] vhost: enable IOMMU for async vhostQuoted 3 lines · Anatoly
Quoted 2 lines · Xuan
Hi Maxime,
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
-----Original Message-----
From: Maxime Coquelin <[email protected]>
Sent: Monday, July 5, 2021 8:46 PM
To: Burakov, Anatoly <[email protected]>; Ding, Xuan <[email protected]>; Xia, Chenbo <[email protected]>; Thomas Monjalon <[email protected]>; David Marchand <[email protected]>
Cc: [email protected]; Hu, Jiayu <[email protected]>; Pai G, Sunil <[email protected]>; Richardson, BruceQuoted 26 lines
Quoted 26 lines
Quoted 26 lines
Quoted 26 lines
Quoted 26 lines
Van Haaren, Harry <[email protected]>; Liu, Yong <[email protected]>; Ma, WenwuX <[email protected]>
Subject: Re: [dpdk-dev] [PATCH v5 1/2] vhost: enable IOMMU for async vhostQuoted 18 lines · Anatoly
Quoted 17 lines · Xuan Ding
The use of IOMMU has many advantages, such as isolation and address translation. This patch extends the capbility of DMA engine to use IOMMU if the DMA device is bound to vfio.
When set memory table, the guest memory will be mapped into the default container of DPDK.
Signed-off-by Xuan Ding <[email protected]>--- doc/guides/prog_guide/vhost_lib.rst | 9 ++++++ lib/vhost/rte_vhost.h | 1 + lib/vhost/socket.c | 9 ++++++ lib/vhost/vhost.h | 1 + lib/vhost/vhost_user.c | 46 ++++++++++++++++++++++++++++- 5 files changed, 65 insertions(+), 1 deletion(-)Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
doc/guides/prog_guide/vhost_lib.rst The following is an overview of some key
Quoted 6 lines
doc/guides/prog_guide/vhost_lib.rst +0
-0@@ -118,6 +118,15 @@ The following is an overview of some keyVhost
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
API functions:
It is disabled by default.
+ - ``RTE_VHOST_USER_ASYNC_USE_VFIO``doc/guides/prog_guide/vhost_lib.rst +2
-0+ + In asynchronous data path, vhost liarary is not aware of whichdriver
+ (igb_uio/vfio) the DMA device is bound to. Application should
pass
+ this flag to tell vhost library whether IOMMU should be
programmeddoc/guides/prog_guide/vhost_lib.rst +4
-0+ for guest memory. + + It is disabled by default. + - ``RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS`` Since v16.04, the vhost library forwards checksum and gsorequests for
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
lib/vhost/rte_vhost.h extern "C" { · line 39
Quoted 8 lines
lib/vhost/rte_vhost.h +0
-0@@ -37,6 +37,7 @@ extern "C" {#define RTE_VHOST_USER_LINEARBUF_SUPPORT (1ULL << 6)#define RTE_VHOST_USER_ASYNC_COPY (1ULL << 7)#define RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS (1ULL <<8)
Quoted 99 lines
Quoted 99 lines
Quoted 23 lines
Quoted 23 lines
Quoted 23 lines
Quoted 23 lines
Quoted 23 lines
lib/vhost/rte_vhost.h +1
-0+#define RTE_VHOST_USER_ASYNC_USE_VFIO (1ULL << 9)/* Features. */ #ifndef VIRTIO_NET_F_GUEST_ANNOUNCE lib/vhost/socket.c +5
-0@@ -42,6 +42,7 @@ struct vhost_user_socket {bool extbuf;bool linearbuf;bool async_copy; +bool async_use_vfio;bool net_compliant_ol_flags;/* @@ -243,6 +244,13 @@ vhost_user_add_connection(int fd, struct vhost_user_socket *vsocket) dev->async_copy = 1; } + if (vsocket->async_use_vfio) { + dev =get_device (vid); + +if (dev) + dev->async_use_vfio =1 ;Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
lib/vhost/socket.c rte_vhost_driver_register(const char *path, · line 889
Quoted 8 lines
lib/vhost/socket.c +2
-0+ } +VHOST_LOG_CONFIG (INFO ,"new device, handle is %d\n" , vid);if (vsocket->notify_ops->new_connection) {@@ -879,6 +887,7 @@ rte_vhost_driver_register(const char *path, uint64_t flags) vsocket->extbuf = flags & RTE_VHOST_USER_EXTBUF_SUPPORT; vsocket->linearbuf = flags &
RTE_VHOST_USER_LINEARBUF_SUPPORT;Quoted 67 lines
Quoted 67 lines
Quoted 67 lines
Quoted 2 lines
lib/vhost/socket.c rte_vhost_driver_register(const char *path, · line 891
Quoted 2 lines
lib/vhost/socket.c +1
-0vsocket->async_copy = flags &RTE_VHOST_USER_ASYNC_COPY ; + vsocket->async_use_vfio = flags &
RTE_VHOST_USER_ASYNC_USE_VFIO;Quoted 32 lines
Quoted 32 lines
lib/vhost/socket.c +0
-0vsocket->net_compliant_ol_flags = flags &RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS ;if (vsocket->async_copy &&lib/vhost/vhost.h +1
-0@@ -370,6 +370,7 @@ struct virtio_net {int16_t broadcast_rarp;uint32_t nr_vring;int async_copy; +int async_use_vfio;int extbuf;int linearbuf; struct vhost_virtqueue *virtqueue[VHOST_MAX_QUEUE_PAIRS *2];
lib/vhost/vhost_user.c +2
-0@@ -45,6 +45,7 @@#include <rte_common.h> #include <rte_malloc.h> #include <rte_log.h> +#include <rte_vfio.h> #include "iotlb.h" #include "vhost.h" @@ -141,6 +142,36 @@ get_blk_size(int fd)return ret ==-1 ? (uint64_t )-1 : (uint64_t )stat.st_blksize; } +static int +async_dma_map (struct rte_vhost_mem_region *region,bool do_map)Quoted 8 lines
lib/vhost/vhost_user.c get_blk_size(int fd) · line 153
Quoted 8 lines
lib/vhost/vhost_user.c +7
-0+{ +int ret =0 ; +uint64_t host_iova; + 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,
Quoted 23 lines
Quoted 22 lines
lib/vhost/vhost_user.c +9
-0+ region->host_user_addr, + host_iova, + region->size); +if (ret) { +VHOST_LOG_CONFIG (ERR ,"DMA engine map failed\n" ); +return ret; + } + }else { +/* Remove mapped region from the default container of DPDK. */
+ ret =
rte_vfio_container_dma_unmap(RTE_VFIO_DEFAULT_CONTAINER_FD,lib/vhost/vhost_user.c +10
-0+ region->host_user_addr, + host_iova, + region->size); +if (ret) { +VHOST_LOG_CONFIG (ERR ,"DMA engine unmap failed\n" ); +return ret; + } + } +return ret; +}Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
We've been discussing this off list with Xuan, and unfortunately this is
a blocker for now.Currently, the x86 IOMMU does not support partial unmap - the
segments
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
have to be unmapped exactly the same addr/len as they were mapped.
We
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
also concatenate adjacent mappings to prevent filling up the DMA mapping
entry table with superfluous entries.This means that, when two unrelated mappings are contiguous in
memory
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 3 lines
(e.g. if you map regions 1 and 2 independently, but they happen to be sitting right next to each other in virtual memory), we cannot later unmap one of them because, even though these are two separate
mappings
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
as far as kernel VFIO infrastructure is concerned, the mapping gets compacted and looks like one single mapping to VFIO, so DPDK API will not let us unmap region 1 without also unmapping region 2.
The proper fix for this problem would be to always map memory page-by-page regardless of where it comes from (we already do that for internal memory, but not for external). However, the reason this works for internal memory is because when mapping internal memory
segments,
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
*we know the page size*. For external memory segments, there is no
such
Quoted 26 lines
Quoted 26 lines
Quoted 26 lines
Quoted 26 lines
Quoted 26 lines
Quoted 1 line
guarantee, so we cannot deduce page size for a given memory segment,
and
Quoted 7 lines
thus can't map things page-by-page.
So, the proper fix for it would be to add page size to the VFIO DMA API.
Unfortunately, it probably has to wait until 21.11 because it is an API change.Quoted 8 lines
The slightly hacky fix for this would be to forego user mem map concatenation and trust that user is not going to do anything stupid, and will not spam the VFIO DMA API without reason. I would rather not go
down this road, but this could be an option in this case.Thoughts?
Thanks Anatoly for the detailed description of the issue. It may be possible to either create a versioned symbol for this API change, or maybe even to have a temporary internal API.
But I think this series in its current form is not acceptable, so waiting for v21.11 would be the best option (we may want to send the deprecation notice in this release though).
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 4 lines
In this series, I don't like the user application has to pass a flag to state whether the DMA engine uses VFIO or not. AFAICT, this new revision does not implement what was discussed in the previous one, i.e. supporting both
IOVA_AS_VAandIOVA_AS_PA.Thanks for your comments. Here I hope to explain some questions:
1. Whether bothIOVA_AS_VAandIOVA_AS_PAare supported now?
A: BothIOVA_AS_PAandIOVA_AS_VAare supported now. In this version,the
Quoted 7 lines
Quoted 7 lines
Quoted 3 lines
Quoted 3 lines
virtual address is replaced with iova address of mapped region, and the iova
address is selected to program the IOMMU instead of virtual address only.Good!
Quoted 1 line
Quoted 1 line
Quoted 7 lines
Quoted 7 lines
Quoted 4 lines
Quoted 4 lines
2. Why a flag is chosen to be passed by application?
A: Yes, as we discussed before, therte_eal_iova_mode()API can be used to
get the IOVA mode, so as to determine whether IOMMU should beprogrammed.
Quoted 2 lines
Quoted 2 lines
However, in the implementation process, I found a problem. That is how to distinguish the VFIO PA and
IGB_UIOPA. Because for VFIO cases, weshould
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
always program the IOMMU. While in
IGB_UIOcases, it depends onIOMMU
Quoted 10 lines
Quoted 7 lines
Quoted 5 lines
Quoted 1 line
capability of platform.
How does one program IOMMU with
igb_uio? I was under impression thatigb_uio(anduio_pci_genericfor that matter) does not provide such facilities.+1
Maybe some misunderstanding in this sentence here.
In our design, ifrte_eal_vfio_is_enabled("vfio")is true, iommu will beprogrammed.
Quoted 6 lines
True means vfio module is modprobed.
But there is an exception here, that is, even if vfio module is modprobed, DPDK user still bind all the devices to
igb_uio.This situation can be distinguished in DPDK eal initialization, because the
resource mapping
Quoted 5 lines
is according to the driver loaded by each
device(rte_pci_map_device).But in our scenario, this judgment is somewhat weak. Because we cannot get the device driver info in vhost library. I also think it is unreasonable for vhost to do this. Only trust that users will not use it like this. Thoughts for this scenario?
Quoted 8 lines
I don't see how
igb_uiowould make any difference at all. If you are usingigb_uio, you *don't have DMA mapping at all* and will use raw physical addresses. Assuming your code supports this, that's all you're ever going to get. The point of VFIO is to have memory regions that are mapped for DMA *because real physical addresses are assumed to be not available*. When you're usingigb_uio, you effectively do have DMA access to the entire memory, and thus can bypass IOMMU altogether (assuming you're using passthrough mode).Quoted 4 lines
My concern is exactly here.
Inigb_uiocases, although devices are not added to the default container in eal init, but the "IOMMU programming" actually happens when therte_vfio_container_dma_map()is called. It is no harm but it is also unnecessary.Yes, it is unnecessary, but it's also not actively harmful, which means you can still do it without any regard as to whether you do or don't have IOMMU :)
Quoted 6 lines
Think of a hybrid VFIO/igb_uio setup - some NICs will have VFIO, some will have
igb_uio. The igb_uio-bound NICs will not care if you have mapped anything for DMA because they don't go through IOMMU, things will "just work". The VFIO-bound NICs will get the memory mapped, because they are the ones who actually need the DMA mapping.
Do we even support a hybrid setup. I would have thought that was just asking for problems and should be considered an unsupported configuration?
Re: [dpdk-dev] [PATCH v5 1/2] vhost: enable IOMMU for async vhost
In reply to Burakov, AnatolyQuoted 394 lines
-----Original Message-----
From: Burakov, Anatoly <[email protected]>
Sent: Wednesday, July 7, 2021 10:34 PM
To: Ding, Xuan <[email protected]>; Maxime Coquelin <[email protected]>; Xia, Chenbo <[email protected]>; Thomas Monjalon <[email protected]>; David Marchand <[email protected]>
Cc: [email protected]; Hu, Jiayu <[email protected]>; Pai G, Sunil <[email protected]>; Richardson, Bruce <[email protected]>; Van Haaren, Harry <[email protected]>; Liu, Yong <[email protected]>; Ma, WenwuX <[email protected]>
Subject: Re: [dpdk-dev] [PATCH v5 1/2] vhost: enable IOMMU for async vhostQuoted 11 lines · Xuan
Hi Anatoly,
Quoted 9 lines
-----Original Message-----
From: Burakov, Anatoly <[email protected]>
Sent: Wednesday, July 7, 2021 8:18 PM
To: Ding, Xuan <[email protected]>; Maxime Coquelin <[email protected]>; Xia, Chenbo <[email protected]>; Thomas Monjalon <[email protected]>; David Marchand <[email protected]>
Cc: [email protected]; Hu, Jiayu <[email protected]>; Pai G, Sunil <[email protected]>; Richardson, Bruce<[email protected]>; Van
Quoted 1 line
Quoted 1 line
Haaren, Harry <[email protected]>; Liu, Yong
Quoted 2 lines
Quoted 2 lines
Ma, WenwuX <[email protected]>
Subject: Re: [dpdk-dev] [PATCH v5 1/2] vhost: enable IOMMU for asyncvhost
Quoted 4 lines
Quoted 4 lines · Xuan
Quoted 2 lines
Hi,
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
-----Original Message-----
From: Maxime Coquelin <[email protected]>
Sent: Tuesday, July 6, 2021 5:32 PM
To: Burakov, Anatoly <[email protected]>; Ding, Xuan <[email protected]>; Xia, Chenbo <[email protected]>; Thomas Monjalon <[email protected]>; David Marchand <[email protected]>
Cc: [email protected]; Hu, Jiayu <[email protected]>; Pai G, Sunil <[email protected]>; Richardson, BruceQuoted 5 lines
Quoted 5 lines
Van
Quoted 1 line
Quoted 1 line
Haaren, Harry <[email protected]>; Liu, Yong
Quoted 2 lines
Quoted 2 lines
Ma, WenwuX <[email protected]>
Subject: Re: [dpdk-dev] [PATCH v5 1/2] vhost: enable IOMMU for asyncvhost
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines · Anatoly
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines · Xuan
Quoted 7 lines
Hi Maxime,
Quoted 5 lines
-----Original Message-----
From: Maxime Coquelin <[email protected]>
Sent: Monday, July 5, 2021 8:46 PM
To: Burakov, Anatoly <[email protected]>; Ding, Xuan <[email protected]>; Xia, Chenbo <[email protected]>;Thomas
Quoted 8 lines
Quoted 8 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Monjalon <[email protected]>; David Marchand <[email protected]>
Cc: [email protected]; Hu, Jiayu <[email protected]>; Pai G, Sunil <[email protected]>; Richardson, BruceQuoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Van Haaren, Harry <[email protected]>; Liu, Yong <[email protected]>; Ma, WenwuX <[email protected]>
Subject: Re: [dpdk-dev] [PATCH v5 1/2] vhost: enable IOMMU forasync
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
vhost
Quoted 2 lines · Anatoly
Quoted 1 line · Xuan Ding
The use of IOMMU has many advantages, such as isolation and
address
Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
translation. This patch extends the capbility of DMA engine to use IOMMU if the DMA device is bound to vfio.
When set memory table, the guest memory will be mapped into the default container of DPDK.
Signed-off-by Xuan Ding <[email protected]>--- doc/guides/prog_guide/vhost_lib.rst | 9 ++++++ lib/vhost/rte_vhost.h | 1 + lib/vhost/socket.c | 9 ++++++ lib/vhost/vhost.h | 1 + lib/vhost/vhost_user.c | 46 ++++++++++++++++++++++++++++- 5 files changed, 65 insertions(+), 1 deletion(-)Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
doc/guides/prog_guide/vhost_lib.rst The following is an overview of some
Quoted 6 lines
doc/guides/prog_guide/vhost_lib.rst +0
-0@@ -118,6 +118,15 @@ The following is an overview of somekey
Quoted 18 lines
Quoted 18 lines
Vhost
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
API functions:
It is disabled by default.
+ - ``RTE_VHOST_USER_ASYNC_USE_VFIO``doc/guides/prog_guide/vhost_lib.rst +2
-0+ + In asynchronous data path, vhost liarary is not aware of whichdriver
+ (igb_uio/vfio) the DMA device is bound to. Application should
pass
+ this flag to tell vhost library whether IOMMU should be
programmeddoc/guides/prog_guide/vhost_lib.rst +4
-0+ for guest memory. + + It is disabled by default. + - ``RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS`` Since v16.04, the vhost library forwards checksum and gsorequests for
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
lib/vhost/rte_vhost.h extern "C" { · line 39
Quoted 8 lines
lib/vhost/rte_vhost.h +0
-0@@ -37,6 +37,7 @@ extern "C" {#define RTE_VHOST_USER_LINEARBUF_SUPPORT (1ULL << 6)#define RTE_VHOST_USER_ASYNC_COPY (1ULL << 7)#define RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS (1ULL <<
Quoted 16 lines
Quoted 16 lines
8)
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
lib/vhost/rte_vhost.h +1
-0+#define RTE_VHOST_USER_ASYNC_USE_VFIO (1ULL << 9)/* Features. */ #ifndef VIRTIO_NET_F_GUEST_ANNOUNCE lib/vhost/socket.c +0
-0Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
lib/vhost/socket.c vhost_user_add_connection(int fd,
Quoted 8 lines
lib/vhost/socket.c +1
-0@@ -42,6 +42,7 @@ struct vhost_user_socket {bool extbuf;bool linearbuf;bool async_copy; +bool async_use_vfio;bool net_compliant_ol_flags;/* @@ -243,6 +244,13 @@ vhost_user_add_connection(int fd,struct
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
lib/vhost/socket.c vhost_user_add_connection(int fd, · line 254
Quoted 11 lines
lib/vhost/socket.c +6
-0vhost_user_socket *vsocket) dev->async_copy = 1; } + if (vsocket->async_use_vfio) { + dev =get_device (vid); + +if (dev) + dev->async_use_vfio =1 ; + } + VHOST_LOG_CONFIG(INFO, "new device, handle is %d\n",vid);
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
lib/vhost/socket.c rte_vhost_driver_register(const char
Quoted 2 lines
lib/vhost/socket.c +0
-0if (vsocket->notify_ops->new_connection) {@@ -879,6 +887,7 @@ rte_vhost_driver_register(const char*path,
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
lib/vhost/socket.c rte_vhost_driver_register(const char · line 888
Quoted 2 lines
lib/vhost/socket.c +0
-0uint64_t flags) vsocket->extbuf = flags &
RTE_VHOST_USER_EXTBUF_SUPPORT;Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
lib/vhost/socket.c rte_vhost_driver_register(const char · line 889
Quoted 1 line
lib/vhost/socket.c +0
-0vsocket->linearbuf = flags &
RTE_VHOST_USER_LINEARBUF_SUPPORT;Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
lib/vhost/socket.c +0
-0vsocket->async_copy = flags &
RTE_VHOST_USER_ASYNC_COPY;Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
Quoted 1 line
lib/vhost/socket.c rte_vhost_driver_register(const char · line 891
Quoted 1 line
lib/vhost/socket.c +1
-0+ vsocket->async_use_vfio = flags &
RTE_VHOST_USER_ASYNC_USE_VFIO;Quoted 7 lines
Quoted 7 lines
lib/vhost/socket.c +0
-0vsocket->net_compliant_ol_flags = flags &RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS ;if (vsocket->async_copy &&lib/vhost/vhost.h +0
-0Quoted 8 lines
lib/vhost/vhost.h struct virtio_net { · line 376
Quoted 8 lines
lib/vhost/vhost.h +1
-0@@ -370,6 +370,7 @@ struct virtio_net {int16_t broadcast_rarp;uint32_t nr_vring;int async_copy; +int async_use_vfio;int extbuf;int linearbuf;struct vhost_virtqueue *virtqueue[VHOST_MAX_QUEUE_PAIRS *
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
2];
lib/vhost/vhost_user.c +0
-0@@ -45,6 +45,7 @@#include <rte_common.h> #include <rte_malloc.h> #include <rte_log.h> Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
lib/vhost/vhost_user.c get_blk_size(int fd) · line 145
Quoted 8 lines
lib/vhost/vhost_user.c +2
-0+#include <rte_vfio.h> #include "iotlb.h" #include "vhost.h" @@ -141,6 +142,36 @@ get_blk_size(int fd)return ret ==-1 ? (uint64_t )-1 : (uint64_t )stat.st_blksize; } +static int +async_dma_map(struct rte_vhost_mem_region *region, bool
do_map)Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
lib/vhost/vhost_user.c get_blk_size(int fd) · line 152
Quoted 7 lines
lib/vhost/vhost_user.c +6
-0+{ +int ret =0 ; +uint64_t host_iova; + host_iova =rte_mem_virt2iova ((void *)(uintptr_t )region->host_user_addr); +if (do_map) { +/* Add mapped region into the default container of DPDK. */
Quoted 14 lines
Quoted 14 lines
Quoted 14 lines
Quoted 14 lines
Quoted 14 lines
Quoted 14 lines
Quoted 14 lines
Quoted 1 line
lib/vhost/vhost_user.c get_blk_size(int fd) · line 153
Quoted 1 line
lib/vhost/vhost_user.c +1
-0+ ret =rte_vfio_container_dma_map(RTE_VFIO_DEFAULT_CONTAINER_FD,
Quoted 12 lines
Quoted 12 lines
lib/vhost/vhost_user.c +9
-0+ region->host_user_addr, + host_iova, + region->size); +if (ret) { +VHOST_LOG_CONFIG (ERR ,"DMA engine map failed\n" ); +return ret; + } + }else { +/* Remove mapped region from the default container of DPDK. */
+ ret =rte_vfio_container_dma_unmap(RTE_VFIO_DEFAULT_CONTAINER_FD,
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
lib/vhost/vhost_user.c
Quoted 5 lines
lib/vhost/vhost_user.c +5
-0+ region->host_user_addr, + host_iova, + region->size); +if (ret) { + VHOST_LOG_CONFIG(ERR, "DMA engine unmapfailed\n");
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 5 lines
lib/vhost/vhost_user.c +5
-0+return ret; + } + } +return ret; +}Quoted 7 lines
Quoted 7 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
We've been discussing this off list with Xuan, and unfortunately this is
a blocker for now.Currently, the x86 IOMMU does not support partial unmap - the
segments
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
have to be unmapped exactly the same addr/len as they were
mapped.
Quoted 8 lines
Quoted 8 lines
We
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
also concatenate adjacent mappings to prevent filling up the DMA mapping
entry table with superfluous entries.This means that, when two unrelated mappings are contiguous in
memory
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
(e.g. if you map regions 1 and 2 independently, but they happen to
be
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 2 lines
sitting right next to each other in virtual memory), we cannot later unmap one of them because, even though these are two separate
mappings
Quoted 2 lines
as far as kernel VFIO infrastructure is concerned, the mapping gets compacted and looks like one single mapping to VFIO, so DPDK API
will
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
not let us unmap region 1 without also unmapping region 2.
The proper fix for this problem would be to always map memory page-by-page regardless of where it comes from (we already do
that for
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
internal memory, but not for external). However, the reason this
works
Quoted 3 lines
Quoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
for internal memory is because when mapping internal memory
segments,
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
*we know the page size*. For external memory segments, there is
no
Quoted 2 lines
Quoted 2 lines
such
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
guarantee, so we cannot deduce page size for a given memory
segment,
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
and
Quoted 5 lines
thus can't map things page-by-page.
So, the proper fix for it would be to add page size to the VFIO DMA API.
Unfortunately, it probably has to wait until 21.11 because it is anAPI
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
change.
The slightly hacky fix for this would be to forego user mem map concatenation and trust that user is not going to do anything
stupid,
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
and will not spam the VFIO DMA API without reason. I would
rather
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 5 lines
not go
down this road, but this could be an option in this case.Thoughts?
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Thanks Anatoly for the detailed description of the issue. It may be possible to either create a versioned symbol for this API change, or maybe even to have a temporary internal API.
But I think this series in its current form is not acceptable, so waiting for v21.11 would be the best option (we may want to send
the
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
deprecation notice in this release though).
In this series, I don't like the user application has to pass a flag to state whether the DMA engine uses VFIO or not. AFAICT, this new
revision
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 2 lines
does not implement what was discussed in the previous one, i.e. supporting both
IOVA_AS_VAandIOVA_AS_PA.Thanks for your comments. Here I hope to explain some questions:
1. Whether bothIOVA_AS_VAandIOVA_AS_PAare supported now?
A: BothIOVA_AS_PAandIOVA_AS_VAare supported now. In thisversion,
Quoted 4 lines
Quoted 4 lines
the
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
virtual address is replaced with iova address of mapped region, and the iova
address is selected to program the IOMMU instead of virtual addressonly.
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Good!
Quoted 5 lines
Quoted 5 lines
2. Why a flag is chosen to be passed by application?
A: Yes, as we discussed before, therte_eal_iova_mode()API can be used to
get the IOVA mode, so as to determine whether IOMMU should beprogrammed.
Quoted 1 line
Quoted 1 line
However, in the implementation process, I found a problem. That is
how to
Quoted 7 lines
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
distinguish the VFIO PA and
IGB_UIOPA. Because for VFIO cases, weshould
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
always program the IOMMU. While in
IGB_UIOcases, it depends onIOMMU
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 1 line
capability of platform.
How does one program IOMMU with
igb_uio? I was under impressionthat
Quoted 10 lines
Quoted 10 lines
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
igb_uio(anduio_pci_genericfor that matter) does not provide such facilities.+1
Maybe some misunderstanding in this sentence here.
In our design, ifrte_eal_vfio_is_enabled("vfio")is true, iommu will beprogrammed.
Quoted 2 lines
True means vfio module is modprobed.
Quoted 8 lines
Quoted 8 lines
Quoted 4 lines
But there is an exception here, that is, even if vfio module is modprobed, DPDK user still bind all the devices to
igb_uio.This situation can be distinguished in DPDK eal initialization, because the
resource mapping
Quoted 3 lines
is according to the driver loaded by each
device(rte_pci_map_device).But in our scenario, this judgment is somewhat weak. Because we cannot
get
Quoted 1 line
Quoted 1 line
Quoted 1 line
the device driver info in vhost library. I also think it is unreasonable for
vhost to
Quoted 1 line
Quoted 1 line
Quoted 1 line
do this. Only trust that users will not use it like this. Thoughts for this
scenario?
Quoted 10 lines
Quoted 9 lines
I don't see how
igb_uiowould make any difference at all. If you are usingigb_uio, you *don't have DMA mapping at all* and will use raw physical addresses. Assuming your code supports this, that's all you're ever going to get. The point of VFIO is to have memory regions that are mapped for DMA *because real physical addresses are assumed to be not available*. When you're usingigb_uio, you effectively do have DMA access to the entire memory, and thus can bypass IOMMU altogether (assuming you're using passthrough mode).Quoted 2 lines
My concern is exactly here.
Inigb_uiocases, although devices are not added to the default container ineal init,
Quoted 1 line
but the "IOMMU programming" actually happens when the
rte_vfio_container_dma_map()is called.Quoted 1 line
It is no harm but it is also unnecessary.
Yes, it is unnecessary, but it's also not actively harmful, which means you can still do it without any regard as to whether you do or don't have IOMMU :)
Think of a hybrid VFIO/igb_uio setup - some NICs will have VFIO, some will have
igb_uio. The igb_uio-bound NICs will not care if you have mapped anything for DMA because they don't go through IOMMU, things will
"just work". The VFIO-bound NICs will get the memory mapped, because they are the ones who actually need the DMA mapping.
Quoted 8 lines
So, what you get is, if you do VFIO DMA mapping unconditionally, 1) NICs with
igb_uiowon't care about this, and 2) NICs with VFIO will benefit. You're not "mapping" the NICs, you're mapping the memory you're accessing with those NICs. You need it to be accessible to both, but since you have no way of knowing whether 1) any of the current HW needs VFIO, and 2) any of *future hotplugged* HW needs VFIO, the easiest way to solve this problem is just to map things regardless, and live with the "unnecessary" but harmless mapping in the worst case.
Get your point! It's just such a worst case bothers me.
I have been thinking about how to avoid the igb_uio case programming IOMMU. But I cannot realize this just through a judgement.
Since it is harmless in this case, not to mention, a platform without IOMMU won’t do anything useful. I think it works to program IOMMU unconditionally.
Quoted 8 lines
Quoted 8 lines
Quoted 6 lines
Bottom line: do VFIO DMA mapping unconditionally. If VFIO is active - great, the memory will be DMA mapped. If it's not active - no harm will ever be done by mapping the memory for DMA anyway.
Do VFIO DMA mapping unconditionally, do you mean the
Quoted 8 lines
rte_eal_vfio_is_enabled()is unnecessary?Quoted 4 lines
What if the platform does not have IOMMU?
Thanks very much.
If the platform has no IOMMU, the API call will just not do anything useful, so no harm done.
So the only thing remained is the API change for page-by-page mapping in next release.
Thanks,
Xuan
Quoted 13 lines
Quoted 8 lines
Regards,
XuanQuoted 4 lines
--
Thanks,
Anatoly--
Thanks,
Anatoly
PATCH v5 2/2 example/vhost: add dma vfio parsing
In reply to Xuan DingThis patch adds the dma-vfio argument parsing for async vhost driver. This argument can help to determine whether IOMMU needs to be programmed for guest memory.
--- doc/guides/sample_app_ug/vhost.rst | 7 +++++++ examples/vhost/main.c | 16 +++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-)
doc/guides/sample_app_ug/vhost.rst +7 -0
@@ -176,6 +176,13 @@ operation. The index of the device corresponds to the socket file in order, that means vhost device 0 is created through the first socket file, vhost device 1 is created through the second socket file, and so on. +**--dma-vfio** +This parameter is used to specify whether the IOMMU needs to be programmed. +If the DMA device is bound to vfio, IOMMU dma mapping will be setup for +guest memory. If igb_uio is bound by DMA device, there is no need to do +IOMMU dma mapping. It is a supplementary parameter for async vhost-user +driver and it is disabled by default. + Common Issues -------------
examples/vhost/main.c +15 -1
@@ -89,6 +89,8 @@ static uint32_t enable_tx_csum;/* Disable TSO offload */ static uint32_t enable_tso; +static uint32_t dma_use_vfio; +static int client_mode;static int builtin_net_driver;
@@ -472,7 +474,8 @@ us_vhost_usage(const char *prgname)" --tso [0|1] disable/enable TCP segment offload.\n" " --client register a vhost-user socket as client mode.\n" " --dma-type register dma type for your vhost async driver. For example \"ioat\" for now.\n" -" --dmas register dma channel for specific vhost device.\n" , +" --dmas register dma channel for specific vhost device.\n" +" --dma-vfio [0|1]: 0: DMA device uses igb_uio, 1: DMA device uses vfio\n" , prgname); }
@@ -503,6 +506,8 @@ enum {OPT_DMA_TYPE_NUM , #define OPT_DMAS "dmas"OPT_DMAS_NUM , +#define OPT_DMA_VFIO "dma-vfio" + OPT_DMA_VFIO_NUM, };/*
@@ -542,6 +547,8 @@ us_vhost_parse_args(int argc, char **argv) NULL, OPT_DMA_TYPE_NUM}, {OPT_DMAS , required_argument, NULL, OPT_DMAS_NUM}, + {OPT_DMA_VFIO, required_argument, + NULL, OPT_DMA_VFIO_NUM}, {NULL, 0, 0, 0}, };
@@ -679,6 +686,10 @@ us_vhost_parse_args(int argc, char **argv) }break ; +case OPT_DMA_VFIO_NUM : + dma_use_vfio =1 ; +break ; +case OPT_CLIENT_NUM : client_mode =1 ;break ;
@@ -1788,6 +1799,9 @@ main(int argc, char *argv[])if (client_mode) flags |=RTE_VHOST_USER_CLIENT ; +if (dma_use_vfio) + flags |=RTE_VHOST_USER_ASYNC_USE_VFIO ; +/* Register vhost user driver to handle vhost messages. */ for (i =0 ; i < nb_sockets; i++) {char *file = socket_files + i *PATH_MAX ;
Signature · 1 line
2.17.1