vfio: expose virtual Shared Virtual Addressing to VMs
Subsystems (5)
v4 cover vfio: expose virtual Shared Virtual Addressing to VMs
Shared Virtual Addressing (SVA), a.k.a, Shared Virtual Memory (SVM) on Intel platforms allows address space sharing between device DMA and applications. SVA can reduce programming complexity and enhance security.
This VFIO series is intended to expose SVA usage to VMs. i.e. Sharing guest application address space with passthru devices. This is called vSVA in this series. The whole vSVA enabling requires QEMU/VFIO/IOMMU changes. For IOMMU and QEMU changes, they are in separate series (listed in the "Related series").
The high-level architecture for SVA virtualization is as below, the key design of vSVA support is to utilize the dual-stage IOMMU translation ( also known as IOMMU nesting translation) capability in host IOMMU.
.-------------. .---------------------------.
| vIOMMU | | Guest process CR3, FL only|
| | '---------------------------' .----------------/
| PASID Entry |--- PASID cache flush -
'-------------' |
| | V
| | CR3 in GPA
'-------------'
Guest
------| Shadow |--------------------------|--------
v v v
Host
.-------------. .----------------------.
| pIOMMU | | Bind FL for GVA-GPA |
| | '----------------------'
.----------------/ |
| PASID Entry | V (Nested xlate)
'----------------\.------------------------------.
| | |SL for GPA-HPA, default domain|
| | '------------------------------'
'-------------'Where:
- FL = First level/stage one page tables
- SL = Second level/stage two page tables
Patch Overview:
1. a refactor to vfio_iommu_type1 ioctl (patch 0001)
2. reports IOMMU nesting info to userspace ( patch 0002, 0003 and 0014)
3. vfio support for PASID allocation and free for VMs (patch 0004, 0005, 0006)
4. vfio support for binding guest page table to host (patch 0007, 0008, 0009)
5. vfio support for IOMMU cache invalidation from VMs (patch 0010)
6. vfio support for vSVA usage on IOMMU-backed mdevs (patch 0011)
7. expose PASID capability to VM (patch 0012)
8. add doc for VFIO dual stage control (patch 0013)
The complete vSVA kernel upstream patches are divided into three phases:
1. Common APIs and PCI device direct assignment
2. IOMMU-backed Mediated Device assignment
3. Page Request Services (PRS) support
This patchset is aiming for the phase 1 and phase 2, and based on Jacob's below series.
*) [PATCH v3 0/5] IOMMU user API enhancement - wip
https://lore.kernel.org/linux-iommu/[email protected]/
*) [PATCH 00/10] IOASID extensions for guest SVA - wip
https://lkml.org/lkml/2020/3/25/874
The latest IOASID code added below new interface for itertate all PASIDs of an ioasid_set. The implementation is not sent out yet as Jacob needs some cleanup, it can be found in branch vsva-linux-5.8-rc3-v4 on github (mentioned below):
int ioasid_set_for_each_ioasid(int sid, void (*fn)(ioasid_t id, void *data), void *data);
Complete set for current vSVA can be found in below branch.
https://github.com/luxis1999/linux-vsva.git: vsva-linux-5.8-rc3-v4
The corresponding QEMU patch series is included in below branch:
https://github.com/luxis1999/qemu.git: vsva_5.8_rc3_qemu_rfcv7
Regards,
Yi Liu
Changelog:
- Patch v3 -> Patch v4:
a) Address comments against v3
b) Add rb from Stefan on patch 14/15
Patch v3: https://lore.kernel.org/linux-iommu/[email protected]/
- Patch v2 -> Patch v3:
a) Rebase on top of Jacob's v3 iommu uapi patchset
b) Address comments from Kevin and Stefan Hajnoczi
c) Reuse DOMAIN_ATTR_NESTING to get iommu nesting info
d) Drop [PATCH v2 07/15] iommu/uapi: Add iommu_gpasid_unbind_data
Patch v2: https://lore.kernel.org/linux-iommu/[email protected]/#r
- Patch v1 -> Patch v2:
a) Refactor vfio_iommu_type1_ioctl() per suggestion from Christoph
Hellwig.
b) Re-sequence the patch series for better bisect support.
c) Report IOMMU nesting cap info in detail instead of a format in
v1.
d) Enforce one group per nesting type container for vfio iommu type1
driver.
e) Build the vfio_mm related code from vfio.c to be a separate
vfio_pasid.ko.
f) Add PASID ownership check in IOMMU driver.
g) Adopted to latest IOMMU UAPI design. Removed IOMMU UAPI version
check. Added iommu_gpasid_unbind_data for unbind requests from
userspace.
h) Define a single ioctl:VFIO_IOMMU_NESTING_OP for bind/unbind_gtbl
and cahce_invld.
i) Document dual stage control in vfio.rst.
Patch v1: https://lore.kernel.org/linux-iommu/[email protected]/
- RFC v3 -> Patch v1:
a) Address comments to the PASID request(alloc/free) path
b) Report PASID alloc/free availabitiy to user-space
c) Add a vfio_iommu_type1 parameter to support pasid quota tuning
d) Adjusted to latest ioasid code implementation. e.g. remove the
code for tracking the allocated PASIDs as latest ioasid code
will track it, VFIO could use ioasid_free_set() to free all
PASIDs.
RFC v3: https://lore.kernel.org/linux-iommu/[email protected]/
- RFC v2 -> v3:
a) Refine the whole patchset to fit the roughly parts in this series
b) Adds complete vfio PASID management framework. e.g. pasid alloc,
free, reclaim in VM crash/down and per-VM PASID quota to prevent
PASID abuse.
c) Adds IOMMU uAPI version check and page table format check to ensure
version compatibility and hardware compatibility.
d) Adds vSVA vfio support for IOMMU-backed mdevs.
RFC v2: https://lore.kernel.org/linux-iommu/[email protected]/
- RFC v1 -> v2:
Dropped vfio: VFIO_IOMMU_ATTACH/DETACH_PASID_TABLE.
RFC v1: https://lore.kernel.org/linux-iommu/[email protected]/
---
Eric Auger (1):
vfio: Document dual stage control
Liu Yi L (13):
vfio/type1: Refactor vfio_iommu_type1_ioctl()
iommu: Report domain nesting info
iommu/smmu: Report empty domain nesting info vfio/type1: Report iommu nesting info to userspace
vfio: Add PASID allocation/free support iommu/vt-d: Support setting ioasid set to domain vfio/type1: Add VFIO_IOMMU_PASID_REQUEST (alloc/free) iommu/vt-d: Check ownership for PASIDs from user-space vfio/type1: Support binding guest page tables to PASID vfio/type1: Allow invalidating first-level/stage IOMMU cache vfio/type1: Add vSVA support for IOMMU-backed mdevs vfio/pci: Expose PCIe PASID capability to guest iommu/vt-d: Support reporting nesting capability info
Yi Sun (1):
iommu: Pass domain to sva_unbind_gpasid()
Documentation/driver-api/vfio.rst | 67 +++ drivers/iommu/arm-smmu-v3.c | 29 +- drivers/iommu/arm-smmu.c | 29 +- drivers/iommu/intel/iommu.c | 107 ++++- drivers/iommu/intel/svm.c | 10 +- drivers/iommu/iommu.c | 2 +- drivers/vfio/Kconfig | 6 + drivers/vfio/Makefile | 1 + drivers/vfio/pci/vfio_pci_config.c | 2 +- drivers/vfio/vfio_iommu_type1.c | 819 ++++++++++++++++++++++++++++--------- drivers/vfio/vfio_pasid.c | 192 +++++++++ include/linux/intel-iommu.h | 23 +- include/linux/iommu.h | 4 +- include/linux/vfio.h | 54 +++ include/uapi/linux/iommu.h | 78 ++++ include/uapi/linux/vfio.h | 85 ++++ 16 files changed, 1309 insertions(+), 199 deletions(-) create mode 100644 drivers/vfio/vfio_pasid.c
Signature · 6 lines
2.7.4 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v4 1/15 vfio/type1: Refactor vfio_iommu_type1_ioctl()
This patch refactors the vfio_iommu_type1_ioctl() to use switch instead of if-else, and each cmd got a helper function.
--- drivers/vfio/vfio_iommu_type1.c | 392 ++++++++++++++++++++++------------------ 1 file changed, 213 insertions(+), 179 deletions(-)
drivers/vfio/vfio_iommu_type1.c +213 -179
@@ -2453,6 +2453,23 @@ static int vfio_domains_have_iommu_cache(struct vfio_iommu *iommu)return ret; } +static int vfio_iommu_type1_check_extension (struct vfio_iommu *iommu, +unsigned long arg) +{ +switch (arg) { +case VFIO_TYPE1_IOMMU : +case VFIO_TYPE1v2_IOMMU: +case VFIO_TYPE1_NESTING_IOMMU : +return 1 ; +case VFIO_DMA_CC_IOMMU : +if (!iommu) +return 0 ; +return vfio_domains_have_iommu_cache (iommu); +default : +return 0 ; + } +} +static int vfio_iommu_iova_add_cap (struct vfio_info_cap *caps,struct vfio_iommu_type1_info_cap_iova_range *cap_iovas,size_t size)
@@ -2529,238 +2546,255 @@ static int vfio_iommu_migration_build_caps(struct vfio_iommu *iommu,return vfio_info_add_capability (caps, &cap_mig.header,sizeof (cap_mig)); } -static long vfio_iommu_type1_ioctl (void *iommu_data, -unsigned int cmd,unsigned long arg) +static int vfio_iommu_type1_get_info (struct vfio_iommu *iommu, +unsigned long arg) { -struct vfio_iommu *iommu = iommu_data; +struct vfio_iommu_type1_info info;unsigned long minsz; +struct vfio_info_cap caps = { .buf =NULL , .size =0 }; +unsigned long capsz; +int ret; -if (cmd ==VFIO_CHECK_EXTENSION ) { -switch (arg) { -case VFIO_TYPE1_IOMMU : -case VFIO_TYPE1v2_IOMMU: -case VFIO_TYPE1_NESTING_IOMMU : -return 1 ; -case VFIO_DMA_CC_IOMMU : -if (!iommu) -return 0 ; -return vfio_domains_have_iommu_cache (iommu); -default : -return 0 ; - } - }else if (cmd ==VFIO_IOMMU_GET_INFO ) { -struct vfio_iommu_type1_info info; -struct vfio_info_cap caps = { .buf =NULL , .size =0 }; -unsigned long capsz; -int ret; - - minsz = offsetofend(struct vfio_iommu_type1_info, iova_pgsizes); + minsz = offsetofend(struct vfio_iommu_type1_info, iova_pgsizes); -/* For backward compatibility, cannot require this */ - capsz = offsetofend(struct vfio_iommu_type1_info, cap_offset); +/* For backward compatibility, cannot require this */ + capsz = offsetofend(struct vfio_iommu_type1_info, cap_offset); -if (copy_from_user (&info, (void __user *)arg, minsz)) -return -EFAULT ; +if (copy_from_user (&info, (void __user *)arg, minsz)) +return -EFAULT ; -if (info.argsz < minsz) -return -EINVAL ; +if (info.argsz < minsz) +return -EINVAL ; -if (info.argsz >= capsz) { - minsz = capsz; - info.cap_offset =0 ;/* output, no-recopy necessary */ - } +if (info.argsz >= capsz) { + minsz = capsz; + info.cap_offset =0 ;/* output, no-recopy necessary */ + } -mutex_lock (&iommu->lock); - info.flags =VFIO_IOMMU_INFO_PGSIZES ; +mutex_lock (&iommu->lock); + info.flags =VFIO_IOMMU_INFO_PGSIZES ; - info.iova_pgsizes = iommu->pgsize_bitmap; + info.iova_pgsizes = iommu->pgsize_bitmap; - ret =vfio_iommu_migration_build_caps (iommu, &caps); + ret =vfio_iommu_migration_build_caps (iommu, &caps); -if (!ret) - ret =vfio_iommu_iova_build_caps (iommu, &caps); +if (!ret) + ret =vfio_iommu_iova_build_caps (iommu, &caps); -mutex_unlock (&iommu->lock); +mutex_unlock (&iommu->lock); -if (ret) -return ret; +if (ret) +return ret; -if (caps.size) { - info.flags |=VFIO_IOMMU_INFO_CAPS ; +if (caps.size) { + info.flags |=VFIO_IOMMU_INFO_CAPS ; -if (info.argsz <sizeof (info) + caps.size) { - info.argsz =sizeof (info) + caps.size; - }else { -vfio_info_cap_shift (&caps,sizeof (info)); -if (copy_to_user ((void __user *)arg + -sizeof (info), caps.buf, - caps.size)) { -kfree (caps.buf); -return -EFAULT ; - } - info.cap_offset =sizeof (info); +if (info.argsz <sizeof (info) + caps.size) { + info.argsz =sizeof (info) + caps.size; + }else { +vfio_info_cap_shift (&caps,sizeof (info)); +if (copy_to_user ((void __user *)arg + +sizeof (info), caps.buf, + caps.size)) { +kfree (caps.buf); +return -EFAULT ; } - -kfree (caps.buf); + info.cap_offset =sizeof (info); } -return copy_to_user ((void __user *)arg, &info, minsz) ? - -EFAULT :0 ; +kfree (caps.buf); + } - }else if (cmd ==VFIO_IOMMU_MAP_DMA ) { -struct vfio_iommu_type1_dma_map map; -uint32_t mask =VFIO_DMA_MAP_FLAG_READ | -VFIO_DMA_MAP_FLAG_WRITE ; +return copy_to_user ((void __user *)arg, &info, minsz) ? + -EFAULT :0 ; +} - minsz = offsetofend(struct vfio_iommu_type1_dma_map, size); +static int vfio_iommu_type1_map_dma (struct vfio_iommu *iommu, +unsigned long arg) +{ +struct vfio_iommu_type1_dma_map map; +unsigned long minsz; +uint32_t mask =VFIO_DMA_MAP_FLAG_READ | +VFIO_DMA_MAP_FLAG_WRITE ; -if (copy_from_user (&map, (void __user *)arg, minsz)) -return -EFAULT ; + minsz = offsetofend(struct vfio_iommu_type1_dma_map, size); -if (map.argsz < minsz || map.flags & ~mask) -return -EINVAL ; +if (copy_from_user (&map, (void __user *)arg, minsz)) +return -EFAULT ; -return vfio_dma_do_map (iommu, &map); +if (map.argsz < minsz || map.flags & ~mask) +return -EINVAL ; - }else if (cmd ==VFIO_IOMMU_UNMAP_DMA ) { -struct vfio_iommu_type1_dma_unmap unmap; -struct vfio_bitmap bitmap = {0 }; -int ret; +return vfio_dma_do_map (iommu, &map); +} - minsz = offsetofend(struct vfio_iommu_type1_dma_unmap, size); +static int vfio_iommu_type1_unmap_dma (struct vfio_iommu *iommu, +unsigned long arg) +{ +struct vfio_iommu_type1_dma_unmap unmap; +struct vfio_bitmap bitmap = {0 }; +unsigned long minsz; +long ret; -if (copy_from_user (&unmap, (void __user *)arg, minsz)) -return -EFAULT ; + minsz = offsetofend(struct vfio_iommu_type1_dma_unmap, size); -if (unmap.argsz < minsz || - unmap.flags & ~VFIO_DMA_UNMAP_FLAG_GET_DIRTY_BITMAP ) -return -EINVAL ; +if (copy_from_user (&unmap, (void __user *)arg, minsz)) +return -EFAULT ; -if (unmap.flags &VFIO_DMA_UNMAP_FLAG_GET_DIRTY_BITMAP ) { -unsigned long pgshift; +if (unmap.argsz < minsz || + unmap.flags & ~VFIO_DMA_UNMAP_FLAG_GET_DIRTY_BITMAP ) +return -EINVAL ; -if (unmap.argsz < (minsz +sizeof (bitmap))) -return -EINVAL ; +if (unmap.flags &VFIO_DMA_UNMAP_FLAG_GET_DIRTY_BITMAP ) { +unsigned long pgshift; -if (copy_from_user (&bitmap, - (void __user *)(arg + minsz), -sizeof (bitmap))) -return -EFAULT ; +if (unmap.argsz < (minsz +sizeof (bitmap))) +return -EINVAL ; -if (!access_ok ((void __user *)bitmap.data, bitmap.size)) -return -EINVAL ; +if (copy_from_user (&bitmap, + (void __user *)(arg + minsz), +sizeof (bitmap))) +return -EFAULT ; - pgshift =__ffs (bitmap.pgsize); - ret =verify_bitmap_size (unmap.size >> pgshift, - bitmap.size); -if (ret) -return ret; - } +if (!access_ok ((void __user *)bitmap.data, bitmap.size)) +return -EINVAL ; - ret =vfio_dma_do_unmap (iommu, &unmap, &bitmap); + pgshift =__ffs (bitmap.pgsize); + ret =verify_bitmap_size (unmap.size >> pgshift, + bitmap.size);if (ret)return ret; + } + + ret =vfio_dma_do_unmap (iommu, &unmap, &bitmap); +if (ret) +return ret; -return copy_to_user ((void __user *)arg, &unmap, minsz) ? +return copy_to_user ((void __user *)arg, &unmap, minsz) ? -EFAULT :0 ; - }else if (cmd ==VFIO_IOMMU_DIRTY_PAGES ) { -struct vfio_iommu_type1_dirty_bitmap dirty; -uint32_t mask =VFIO_IOMMU_DIRTY_PAGES_FLAG_START | -VFIO_IOMMU_DIRTY_PAGES_FLAG_STOP | -VFIO_IOMMU_DIRTY_PAGES_FLAG_GET_BITMAP ; -int ret =0 ; +} -if (!iommu->v2) -return -EACCES ; +static int vfio_iommu_type1_dirty_pages (struct vfio_iommu *iommu, +unsigned long arg) +{ +struct vfio_iommu_type1_dirty_bitmap dirty; +uint32_t mask =VFIO_IOMMU_DIRTY_PAGES_FLAG_START | +VFIO_IOMMU_DIRTY_PAGES_FLAG_STOP | +VFIO_IOMMU_DIRTY_PAGES_FLAG_GET_BITMAP ; +unsigned long minsz; +int ret =0 ; - minsz = offsetofend(struct vfio_iommu_type1_dirty_bitmap, - flags); +if (!iommu->v2) +return -EACCES ; -if (copy_from_user (&dirty, (void __user *)arg, minsz)) -return -EFAULT ; + minsz = offsetofend(struct vfio_iommu_type1_dirty_bitmap, + flags); -if (dirty.argsz < minsz || dirty.flags & ~mask) -return -EINVAL ; +if (copy_from_user (&dirty, (void __user *)arg, minsz)) +return -EFAULT ; + +if (dirty.argsz < minsz || dirty.flags & ~mask) +return -EINVAL ; + +/* only one flag should be set at a time */ +if (__ffs (dirty.flags) !=__fls (dirty.flags)) +return -EINVAL ; + +if (dirty.flags &VFIO_IOMMU_DIRTY_PAGES_FLAG_START ) { +size_t pgsize; -/* only one flag should be set at a time */ -if (__ffs (dirty.flags) !=__fls (dirty.flags)) +mutex_lock (&iommu->lock); + pgsize =1 <<__ffs (iommu->pgsize_bitmap); +if (!iommu->dirty_page_tracking) { + ret =vfio_dma_bitmap_alloc_all (iommu, pgsize); +if (!ret) + iommu->dirty_page_tracking = true; + } +mutex_unlock (&iommu->lock); +return ret; + }else if (dirty.flags &VFIO_IOMMU_DIRTY_PAGES_FLAG_STOP ) { +mutex_lock (&iommu->lock); +if (iommu->dirty_page_tracking) { + iommu->dirty_page_tracking = false; +vfio_dma_bitmap_free_all (iommu); + } +mutex_unlock (&iommu->lock); +return 0 ; + }else if (dirty.flags & +VFIO_IOMMU_DIRTY_PAGES_FLAG_GET_BITMAP ) { +struct vfio_iommu_type1_dirty_bitmap_get range; +unsigned long pgshift; +size_t data_size = dirty.argsz - minsz; +size_t iommu_pgsize; + +if (!data_size || data_size <sizeof (range))return -EINVAL ; -if (dirty.flags &VFIO_IOMMU_DIRTY_PAGES_FLAG_START ) { -size_t pgsize; +if (copy_from_user (&range, (void __user *)(arg + minsz), +sizeof (range))) +return -EFAULT ; -mutex_lock (&iommu->lock); - pgsize =1 <<__ffs (iommu->pgsize_bitmap); -if (!iommu->dirty_page_tracking) { - ret =vfio_dma_bitmap_alloc_all (iommu, pgsize); -if (!ret) - iommu->dirty_page_tracking = true; - } -mutex_unlock (&iommu->lock); +if (range.iova + range.size < range.iova) +return -EINVAL ; +if (!access_ok ((void __user *)range.bitmap.data, + range.bitmap.size)) +return -EINVAL ; + + pgshift =__ffs (range.bitmap.pgsize); + ret =verify_bitmap_size (range.size >> pgshift, + range.bitmap.size); +if (ret)return ret; - }else if (dirty.flags &VFIO_IOMMU_DIRTY_PAGES_FLAG_STOP ) { -mutex_lock (&iommu->lock); -if (iommu->dirty_page_tracking) { - iommu->dirty_page_tracking = false; -vfio_dma_bitmap_free_all (iommu); - } -mutex_unlock (&iommu->lock); -return 0 ; - }else if (dirty.flags & -VFIO_IOMMU_DIRTY_PAGES_FLAG_GET_BITMAP ) { -struct vfio_iommu_type1_dirty_bitmap_get range; -unsigned long pgshift; -size_t data_size = dirty.argsz - minsz; -size_t iommu_pgsize; - -if (!data_size || data_size <sizeof (range)) -return -EINVAL ; - -if (copy_from_user (&range, (void __user *)(arg + minsz), -sizeof (range))) -return -EFAULT ; -if (range.iova + range.size < range.iova) -return -EINVAL ; -if (!access_ok ((void __user *)range.bitmap.data, - range.bitmap.size)) -return -EINVAL ; +mutex_lock (&iommu->lock); - pgshift =__ffs (range.bitmap.pgsize); - ret =verify_bitmap_size (range.size >> pgshift, - range.bitmap.size); -if (ret) -return ret; + iommu_pgsize = (size_t )1 <<__ffs (iommu->pgsize_bitmap); -mutex_lock (&iommu->lock); +/* allow only smallest supported pgsize */ +if (range.bitmap.pgsize != iommu_pgsize) { + ret = -EINVAL ; + goto out_unlock; + } +if (range.iova & (iommu_pgsize -1 )) { + ret = -EINVAL ; + goto out_unlock; + } +if (!range.size || range.size & (iommu_pgsize -1 )) { + ret = -EINVAL ; + goto out_unlock; + } - iommu_pgsize = (size_t )1 <<__ffs (iommu->pgsize_bitmap); +if (iommu->dirty_page_tracking) + ret =vfio_iova_dirty_bitmap (range.bitmap.data, + iommu, range.iova, range.size, + range.bitmap.pgsize); +else + ret = -EINVAL ; +out_unlock: +mutex_unlock (&iommu->lock); -/* allow only smallest supported pgsize */ -if (range.bitmap.pgsize != iommu_pgsize) { - ret = -EINVAL ; - goto out_unlock; - } -if (range.iova & (iommu_pgsize -1 )) { - ret = -EINVAL ; - goto out_unlock; - } -if (!range.size || range.size & (iommu_pgsize -1 )) { - ret = -EINVAL ; - goto out_unlock; - } +return ret; + } -if (iommu->dirty_page_tracking) - ret =vfio_iova_dirty_bitmap (range.bitmap.data, - iommu, range.iova, range.size, - range.bitmap.pgsize); -else - ret = -EINVAL ; -out_unlock: -mutex_unlock (&iommu->lock); +return -EINVAL ; +} -return ret; - } +static long vfio_iommu_type1_ioctl (void *iommu_data, +unsigned int cmd,unsigned long arg) +{ +struct vfio_iommu *iommu = iommu_data; + +switch (cmd) { +case VFIO_CHECK_EXTENSION : +return vfio_iommu_type1_check_extension (iommu, arg); +case VFIO_IOMMU_GET_INFO : +return vfio_iommu_type1_get_info (iommu, arg); +case VFIO_IOMMU_MAP_DMA : +return vfio_iommu_type1_map_dma (iommu, arg); +case VFIO_IOMMU_UNMAP_DMA : +return vfio_iommu_type1_unmap_dma (iommu, arg); +case VFIO_IOMMU_DIRTY_PAGES : +return vfio_iommu_type1_dirty_pages (iommu, arg); }return -ENOTTY ;
Signature · 6 lines
2.7.4 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v4 01/15] vfio/type1: Refactor vfio_iommu_type1_ioctl()
Hi Yi,
Quoted 2 lines · Liu Yi L
This patch refactors the
vfio_iommu_type1_ioctl()to use switch instead of if-else, and each cmd got a helper function.
command
Quoted 170 lines
Cc Kevin Tian <[email protected]>CC Jacob Pan <[email protected]>Cc Alex Williamson <[email protected]>Cc Eric Auger <[email protected]>Cc Jean-Philippe Brucker <[email protected]>Cc Joerg Roedel <[email protected]>Cc Lu Baolu <[email protected]>Suggested-by Christoph Hellwig <[email protected]>Signed-off-by Liu Yi L <[email protected]>--- drivers/vfio/vfio_iommu_type1.c | 392 ++++++++++++++++++++++------------------ 1 file changed, 213 insertions(+), 179 deletions(-)drivers/vfio/vfio_iommu_type1.c +59
-63@@ -2453,6 +2453,23 @@ static int vfio_domains_have_iommu_cache(struct vfio_iommu *iommu)return ret; } +static int vfio_iommu_type1_check_extension (struct vfio_iommu *iommu, +unsigned long arg) +{ +switch (arg) { +case VFIO_TYPE1_IOMMU : +case VFIO_TYPE1v2_IOMMU: +case VFIO_TYPE1_NESTING_IOMMU : +return 1 ; +case VFIO_DMA_CC_IOMMU : +if (!iommu) +return 0 ; +return vfio_domains_have_iommu_cache (iommu); +default : +return 0 ; + } +} +static int vfio_iommu_iova_add_cap (struct vfio_info_cap *caps,struct vfio_iommu_type1_info_cap_iova_range *cap_iovas,size_t size)@@ -2529,238 +2546,255 @@ static int vfio_iommu_migration_build_caps(struct vfio_iommu *iommu,return vfio_info_add_capability (caps, &cap_mig.header,sizeof (cap_mig)); } -static long vfio_iommu_type1_ioctl (void *iommu_data, -unsigned int cmd,unsigned long arg) +static int vfio_iommu_type1_get_info (struct vfio_iommu *iommu, +unsigned long arg) { -struct vfio_iommu *iommu = iommu_data; +struct vfio_iommu_type1_info info;unsigned long minsz; +struct vfio_info_cap caps = { .buf =NULL , .size =0 }; +unsigned long capsz; +int ret; -if (cmd ==VFIO_CHECK_EXTENSION ) { -switch (arg) { -case VFIO_TYPE1_IOMMU : -case VFIO_TYPE1v2_IOMMU: -case VFIO_TYPE1_NESTING_IOMMU : -return 1 ; -case VFIO_DMA_CC_IOMMU : -if (!iommu) -return 0 ; -return vfio_domains_have_iommu_cache (iommu); -default : -return 0 ; - } - }else if (cmd ==VFIO_IOMMU_GET_INFO ) { -struct vfio_iommu_type1_info info; -struct vfio_info_cap caps = { .buf =NULL , .size =0 }; -unsigned long capsz; -int ret; - - minsz = offsetofend(struct vfio_iommu_type1_info, iova_pgsizes); + minsz = offsetofend(struct vfio_iommu_type1_info, iova_pgsizes); -/* For backward compatibility, cannot require this */ - capsz = offsetofend(struct vfio_iommu_type1_info, cap_offset); +/* For backward compatibility, cannot require this */ + capsz = offsetofend(struct vfio_iommu_type1_info, cap_offset); -if (copy_from_user (&info, (void __user *)arg, minsz)) -return -EFAULT ; +if (copy_from_user (&info, (void __user *)arg, minsz)) +return -EFAULT ; -if (info.argsz < minsz) -return -EINVAL ; +if (info.argsz < minsz) +return -EINVAL ; -if (info.argsz >= capsz) { - minsz = capsz; - info.cap_offset =0 ;/* output, no-recopy necessary */ - } +if (info.argsz >= capsz) { + minsz = capsz; + info.cap_offset =0 ;/* output, no-recopy necessary */ + } -mutex_lock (&iommu->lock); - info.flags =VFIO_IOMMU_INFO_PGSIZES ; +mutex_lock (&iommu->lock); + info.flags =VFIO_IOMMU_INFO_PGSIZES ; - info.iova_pgsizes = iommu->pgsize_bitmap; + info.iova_pgsizes = iommu->pgsize_bitmap; - ret =vfio_iommu_migration_build_caps (iommu, &caps); + ret =vfio_iommu_migration_build_caps (iommu, &caps); -if (!ret) - ret =vfio_iommu_iova_build_caps (iommu, &caps); +if (!ret) + ret =vfio_iommu_iova_build_caps (iommu, &caps); -mutex_unlock (&iommu->lock); +mutex_unlock (&iommu->lock); -if (ret) -return ret; +if (ret) +return ret; -if (caps.size) { - info.flags |=VFIO_IOMMU_INFO_CAPS ; +if (caps.size) { + info.flags |=VFIO_IOMMU_INFO_CAPS ; -if (info.argsz <sizeof (info) + caps.size) { - info.argsz =sizeof (info) + caps.size; - }else { -vfio_info_cap_shift (&caps,sizeof (info)); -if (copy_to_user ((void __user *)arg + -sizeof (info), caps.buf, - caps.size)) { -kfree (caps.buf); -return -EFAULT ; - } - info.cap_offset =sizeof (info); +if (info.argsz <sizeof (info) + caps.size) { + info.argsz =sizeof (info) + caps.size; + }else { +vfio_info_cap_shift (&caps,sizeof (info)); +if (copy_to_user ((void __user *)arg + +sizeof (info), caps.buf, + caps.size)) { +kfree (caps.buf); +return -EFAULT ; } - -kfree (caps.buf); + info.cap_offset =sizeof (info); } -return copy_to_user ((void __user *)arg, &info, minsz) ? - -EFAULT :0 ; +kfree (caps.buf); + } - }else if (cmd ==VFIO_IOMMU_MAP_DMA ) { -struct vfio_iommu_type1_dma_map map; -uint32_t mask =VFIO_DMA_MAP_FLAG_READ | -VFIO_DMA_MAP_FLAG_WRITE ; +return copy_to_user ((void __user *)arg, &info, minsz) ? + -EFAULT :0 ;
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_migration_build_caps(struct vfio_iommu *iommu, · line 2618
Quoted 10 lines
drivers/vfio/vfio_iommu_type1.c +8
-1+} - minsz = offsetofend(struct vfio_iommu_type1_dma_map, size); +static int vfio_iommu_type1_map_dma (struct vfio_iommu *iommu, +unsigned long arg) +{ +struct vfio_iommu_type1_dma_map map; +unsigned long minsz; +uint32_t mask =VFIO_DMA_MAP_FLAG_READ | +VFIO_DMA_MAP_FLAG_WRITE ;
nit: may fit into a single line? other examples below.
Quoted 19 lines
drivers/vfio/vfio_iommu_type1.c +6
-9-if (copy_from_user (&map, (void __user *)arg, minsz)) -return -EFAULT ; + minsz = offsetofend(struct vfio_iommu_type1_dma_map, size); -if (map.argsz < minsz || map.flags & ~mask) -return -EINVAL ; +if (copy_from_user (&map, (void __user *)arg, minsz)) +return -EFAULT ; -return vfio_dma_do_map (iommu, &map); +if (map.argsz < minsz || map.flags & ~mask) +return -EINVAL ; - }else if (cmd ==VFIO_IOMMU_UNMAP_DMA ) { -struct vfio_iommu_type1_dma_unmap unmap; -struct vfio_bitmap bitmap = {0 }; -int ret; +return vfio_dma_do_map (iommu, &map);
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_migration_build_caps(struct vfio_iommu *iommu, · line 2637
Quoted 10 lines
drivers/vfio/vfio_iommu_type1.c +8
-1+} - minsz = offsetofend(struct vfio_iommu_type1_dma_unmap, size); +static int vfio_iommu_type1_unmap_dma (struct vfio_iommu *iommu, +unsigned long arg) +{ +struct vfio_iommu_type1_dma_unmap unmap; +struct vfio_bitmap bitmap = {0 }; +unsigned long minsz; +long ret;
int?
Quoted 79 lines
drivers/vfio/vfio_iommu_type1.c +35
-31-if (copy_from_user (&unmap, (void __user *)arg, minsz)) -return -EFAULT ; + minsz = offsetofend(struct vfio_iommu_type1_dma_unmap, size); -if (unmap.argsz < minsz || - unmap.flags & ~VFIO_DMA_UNMAP_FLAG_GET_DIRTY_BITMAP ) -return -EINVAL ; +if (copy_from_user (&unmap, (void __user *)arg, minsz)) +return -EFAULT ; -if (unmap.flags &VFIO_DMA_UNMAP_FLAG_GET_DIRTY_BITMAP ) { -unsigned long pgshift; +if (unmap.argsz < minsz || + unmap.flags & ~VFIO_DMA_UNMAP_FLAG_GET_DIRTY_BITMAP ) +return -EINVAL ; -if (unmap.argsz < (minsz +sizeof (bitmap))) -return -EINVAL ; +if (unmap.flags &VFIO_DMA_UNMAP_FLAG_GET_DIRTY_BITMAP ) { +unsigned long pgshift; -if (copy_from_user (&bitmap, - (void __user *)(arg + minsz), -sizeof (bitmap))) -return -EFAULT ; +if (unmap.argsz < (minsz +sizeof (bitmap))) +return -EINVAL ; -if (!access_ok ((void __user *)bitmap.data, bitmap.size)) -return -EINVAL ; +if (copy_from_user (&bitmap, + (void __user *)(arg + minsz), +sizeof (bitmap))) +return -EFAULT ; - pgshift =__ffs (bitmap.pgsize); - ret =verify_bitmap_size (unmap.size >> pgshift, - bitmap.size); -if (ret) -return ret; - } +if (!access_ok ((void __user *)bitmap.data, bitmap.size)) +return -EINVAL ; - ret =vfio_dma_do_unmap (iommu, &unmap, &bitmap); + pgshift =__ffs (bitmap.pgsize); + ret =verify_bitmap_size (unmap.size >> pgshift, + bitmap.size);if (ret)return ret; + } + + ret =vfio_dma_do_unmap (iommu, &unmap, &bitmap); +if (ret) +return ret; -return copy_to_user ((void __user *)arg, &unmap, minsz) ? +return copy_to_user ((void __user *)arg, &unmap, minsz) ? -EFAULT :0 ; - }else if (cmd ==VFIO_IOMMU_DIRTY_PAGES ) { -struct vfio_iommu_type1_dirty_bitmap dirty; -uint32_t mask =VFIO_IOMMU_DIRTY_PAGES_FLAG_START | -VFIO_IOMMU_DIRTY_PAGES_FLAG_STOP | -VFIO_IOMMU_DIRTY_PAGES_FLAG_GET_BITMAP ; -int ret =0 ; +} -if (!iommu->v2) -return -EACCES ; +static int vfio_iommu_type1_dirty_pages (struct vfio_iommu *iommu, +unsigned long arg) +{ +struct vfio_iommu_type1_dirty_bitmap dirty; +uint32_t mask =VFIO_IOMMU_DIRTY_PAGES_FLAG_START | +VFIO_IOMMU_DIRTY_PAGES_FLAG_STOP | +VFIO_IOMMU_DIRTY_PAGES_FLAG_GET_BITMAP ; +unsigned long minsz; +int ret =0 ;
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_migration_build_caps(struct vfio_iommu *iommu, · line 2691
Quoted 10 lines
drivers/vfio/vfio_iommu_type1.c +4
-4- minsz = offsetofend(struct vfio_iommu_type1_dirty_bitmap, - flags); +if (!iommu->v2) +return -EACCES ; -if (copy_from_user (&dirty, (void __user *)arg, minsz)) -return -EFAULT ; + minsz = offsetofend(struct vfio_iommu_type1_dirty_bitmap, + flags);
single line?
Quoted 27 lines
drivers/vfio/vfio_iommu_type1.c +21
-4-if (dirty.argsz < minsz || dirty.flags & ~mask) -return -EINVAL ; +if (copy_from_user (&dirty, (void __user *)arg, minsz)) +return -EFAULT ; + +if (dirty.argsz < minsz || dirty.flags & ~mask) +return -EINVAL ; + +/* only one flag should be set at a time */ +if (__ffs (dirty.flags) !=__fls (dirty.flags)) +return -EINVAL ; + +if (dirty.flags &VFIO_IOMMU_DIRTY_PAGES_FLAG_START ) { +size_t pgsize; -/* only one flag should be set at a time */ -if (__ffs (dirty.flags) !=__fls (dirty.flags)) +mutex_lock (&iommu->lock); + pgsize =1 <<__ffs (iommu->pgsize_bitmap); +if (!iommu->dirty_page_tracking) { + ret =vfio_dma_bitmap_alloc_all (iommu, pgsize); +if (!ret) + iommu->dirty_page_tracking = true; + } +mutex_unlock (&iommu->lock); +return ret;
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_migration_build_caps(struct vfio_iommu *iommu, · line 2724
Quoted 10 lines
drivers/vfio/vfio_iommu_type1.c +10
-0+ }else if (dirty.flags &VFIO_IOMMU_DIRTY_PAGES_FLAG_STOP ) { +mutex_lock (&iommu->lock); +if (iommu->dirty_page_tracking) { + iommu->dirty_page_tracking = false; +vfio_dma_bitmap_free_all (iommu); + } +mutex_unlock (&iommu->lock); +return 0 ; + }else if (dirty.flags & +VFIO_IOMMU_DIRTY_PAGES_FLAG_GET_BITMAP ) {
single line?
Quoted 33 lines
drivers/vfio/vfio_iommu_type1.c +19
-10+struct vfio_iommu_type1_dirty_bitmap_get range; +unsigned long pgshift; +size_t data_size = dirty.argsz - minsz; +size_t iommu_pgsize; + +if (!data_size || data_size <sizeof (range))return -EINVAL ; -if (dirty.flags &VFIO_IOMMU_DIRTY_PAGES_FLAG_START ) { -size_t pgsize; +if (copy_from_user (&range, (void __user *)(arg + minsz), +sizeof (range))) +return -EFAULT ; -mutex_lock (&iommu->lock); - pgsize =1 <<__ffs (iommu->pgsize_bitmap); -if (!iommu->dirty_page_tracking) { - ret =vfio_dma_bitmap_alloc_all (iommu, pgsize); -if (!ret) - iommu->dirty_page_tracking = true; - } -mutex_unlock (&iommu->lock); +if (range.iova + range.size < range.iova) +return -EINVAL ; +if (!access_ok ((void __user *)range.bitmap.data, + range.bitmap.size)) +return -EINVAL ; + + pgshift =__ffs (range.bitmap.pgsize); + ret =verify_bitmap_size (range.size >> pgshift, + range.bitmap.size); +if (ret)return ret;
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_migration_build_caps(struct vfio_iommu *iommu, · line 2710
Quoted 10 lines
drivers/vfio/vfio_iommu_type1.c +0
-10- }else if (dirty.flags &VFIO_IOMMU_DIRTY_PAGES_FLAG_STOP ) { -mutex_lock (&iommu->lock); -if (iommu->dirty_page_tracking) { - iommu->dirty_page_tracking = false; -vfio_dma_bitmap_free_all (iommu); - } -mutex_unlock (&iommu->lock); -return 0 ; - }else if (dirty.flags & -VFIO_IOMMU_DIRTY_PAGES_FLAG_GET_BITMAP ) {
idem
Quoted 86 lines
drivers/vfio/vfio_iommu_type1.c +33
-46-struct vfio_iommu_type1_dirty_bitmap_get range; -unsigned long pgshift; -size_t data_size = dirty.argsz - minsz; -size_t iommu_pgsize; - -if (!data_size || data_size <sizeof (range)) -return -EINVAL ; - -if (copy_from_user (&range, (void __user *)(arg + minsz), -sizeof (range))) -return -EFAULT ; -if (range.iova + range.size < range.iova) -return -EINVAL ; -if (!access_ok ((void __user *)range.bitmap.data, - range.bitmap.size)) -return -EINVAL ; +mutex_lock (&iommu->lock); - pgshift =__ffs (range.bitmap.pgsize); - ret =verify_bitmap_size (range.size >> pgshift, - range.bitmap.size); -if (ret) -return ret; + iommu_pgsize = (size_t )1 <<__ffs (iommu->pgsize_bitmap); -mutex_lock (&iommu->lock); +/* allow only smallest supported pgsize */ +if (range.bitmap.pgsize != iommu_pgsize) { + ret = -EINVAL ; + goto out_unlock; + } +if (range.iova & (iommu_pgsize -1 )) { + ret = -EINVAL ; + goto out_unlock; + } +if (!range.size || range.size & (iommu_pgsize -1 )) { + ret = -EINVAL ; + goto out_unlock; + } - iommu_pgsize = (size_t )1 <<__ffs (iommu->pgsize_bitmap); +if (iommu->dirty_page_tracking) + ret =vfio_iova_dirty_bitmap (range.bitmap.data, + iommu, range.iova, range.size, + range.bitmap.pgsize); +else + ret = -EINVAL ; +out_unlock: +mutex_unlock (&iommu->lock); -/* allow only smallest supported pgsize */ -if (range.bitmap.pgsize != iommu_pgsize) { - ret = -EINVAL ; - goto out_unlock; - } -if (range.iova & (iommu_pgsize -1 )) { - ret = -EINVAL ; - goto out_unlock; - } -if (!range.size || range.size & (iommu_pgsize -1 )) { - ret = -EINVAL ; - goto out_unlock; - } +return ret; + } -if (iommu->dirty_page_tracking) - ret =vfio_iova_dirty_bitmap (range.bitmap.data, - iommu, range.iova, range.size, - range.bitmap.pgsize); -else - ret = -EINVAL ; -out_unlock: -mutex_unlock (&iommu->lock); +return -EINVAL ; +} -return ret; - } +static long vfio_iommu_type1_ioctl (void *iommu_data, +unsigned int cmd,unsigned long arg) +{ +struct vfio_iommu *iommu = iommu_data; + +switch (cmd) {
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_migration_build_caps(struct vfio_iommu *iommu, · line 2797
Quoted 10 lines
drivers/vfio/vfio_iommu_type1.c +10
-0+case VFIO_CHECK_EXTENSION : +return vfio_iommu_type1_check_extension (iommu, arg); +case VFIO_IOMMU_GET_INFO : +return vfio_iommu_type1_get_info (iommu, arg); +case VFIO_IOMMU_MAP_DMA : +return vfio_iommu_type1_map_dma (iommu, arg); +case VFIO_IOMMU_UNMAP_DMA : +return vfio_iommu_type1_unmap_dma (iommu, arg); +case VFIO_IOMMU_DIRTY_PAGES : +return vfio_iommu_type1_dirty_pages (iommu, arg);
default:
return -ENOTTY; ?
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_migration_build_caps(struct vfio_iommu *iommu,
Quoted 4 lines
drivers/vfio/vfio_iommu_type1.c +0
-0}return -ENOTTY ;
Besides
Thanks
Eric
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
RE: [PATCH v4 01/15] vfio/type1: Refactor vfio_iommu_type1_ioctl()
Hi Eric,
Quoted 9 lines
From: Auger Eric <[email protected]>
Sent: Monday, July 6, 2020 5:34 PMHi Yi,
Quoted 2 lines · Liu Yi L
This patch refactors the
vfio_iommu_type1_ioctl()to use switch instead of if-else, and each cmd got a helper function.command
I see. :-)
Quoted 175 lines
drivers/vfio/vfio_iommu_type1.c static int vfio_domains_have_iommu_cache(struct
Quoted 20 lines
Cc Kevin Tian <[email protected]>CC Jacob Pan <[email protected]>Cc Alex Williamson <[email protected]>Cc Eric Auger <[email protected]>Cc Jean-Philippe Brucker <[email protected]>Cc Joerg Roedel <[email protected]>Cc Lu Baolu <[email protected]>Suggested-by Christoph Hellwig <[email protected]>Signed-off-by Liu Yi L <[email protected]>--- drivers/vfio/vfio_iommu_type1.c | 392 ++++++++++++++++++++++------------------ 1 file changed, 213 insertions(+), 179 deletions(-)(quoted diff) +0
-0
b/drivers/vfio/vfio_iommu_type1.cindex 5e556ac..7accb59 100644drivers/vfio/vfio_iommu_type1.c +0
-0@@ -2453,6 +2453,23 @@ static int vfio_domains_have_iommu_cache(struct
vfio_iommu*iommu)drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_migration_build_caps(struct
Quoted 24 lines
drivers/vfio/vfio_iommu_type1.c +17
-0return ret; } +static int vfio_iommu_type1_check_extension (struct vfio_iommu *iommu, +unsigned long arg) +{ +switch (arg) { +case VFIO_TYPE1_IOMMU : +case VFIO_TYPE1v2_IOMMU: +case VFIO_TYPE1_NESTING_IOMMU : +return 1 ; +case VFIO_DMA_CC_IOMMU : +if (!iommu) +return 0 ; +return vfio_domains_have_iommu_cache (iommu); +default : +return 0 ; + } +} +static int vfio_iommu_iova_add_cap (struct vfio_info_cap *caps,struct vfio_iommu_type1_info_cap_iova_range *cap_iovas,size_t size)@@ -2529,238 +2546,255 @@ static int vfio_iommu_migration_build_caps(struct
vfio_iommu*iommu,Quoted 129 lines
drivers/vfio/vfio_iommu_type1.c +43
-63return vfio_info_add_capability (caps, &cap_mig.header,sizeof (cap_mig)); } -static long vfio_iommu_type1_ioctl (void *iommu_data, -unsigned int cmd,unsigned long arg) +static int vfio_iommu_type1_get_info (struct vfio_iommu *iommu, +unsigned long arg) { -struct vfio_iommu *iommu = iommu_data; +struct vfio_iommu_type1_info info;unsigned long minsz; +struct vfio_info_cap caps = { .buf =NULL , .size =0 }; +unsigned long capsz; +int ret; -if (cmd ==VFIO_CHECK_EXTENSION ) { -switch (arg) { -case VFIO_TYPE1_IOMMU : -case VFIO_TYPE1v2_IOMMU: -case VFIO_TYPE1_NESTING_IOMMU : -return 1 ; -case VFIO_DMA_CC_IOMMU : -if (!iommu) -return 0 ; -return vfio_domains_have_iommu_cache (iommu); -default : -return 0 ; - } - }else if (cmd ==VFIO_IOMMU_GET_INFO ) { -struct vfio_iommu_type1_info info; -struct vfio_info_cap caps = { .buf =NULL , .size =0 }; -unsigned long capsz; -int ret; - - minsz = offsetofend(struct vfio_iommu_type1_info, iova_pgsizes); + minsz = offsetofend(struct vfio_iommu_type1_info, iova_pgsizes); -/* For backward compatibility, cannot require this */ - capsz = offsetofend(struct vfio_iommu_type1_info, cap_offset); +/* For backward compatibility, cannot require this */ + capsz = offsetofend(struct vfio_iommu_type1_info, cap_offset); -if (copy_from_user (&info, (void __user *)arg, minsz)) -return -EFAULT ; +if (copy_from_user (&info, (void __user *)arg, minsz)) +return -EFAULT ; -if (info.argsz < minsz) -return -EINVAL ; +if (info.argsz < minsz) +return -EINVAL ; -if (info.argsz >= capsz) { - minsz = capsz; - info.cap_offset =0 ;/* output, no-recopy necessary */ - } +if (info.argsz >= capsz) { + minsz = capsz; + info.cap_offset =0 ;/* output, no-recopy necessary */ + } -mutex_lock (&iommu->lock); - info.flags =VFIO_IOMMU_INFO_PGSIZES ; +mutex_lock (&iommu->lock); + info.flags =VFIO_IOMMU_INFO_PGSIZES ; - info.iova_pgsizes = iommu->pgsize_bitmap; + info.iova_pgsizes = iommu->pgsize_bitmap; - ret =vfio_iommu_migration_build_caps (iommu, &caps); + ret =vfio_iommu_migration_build_caps (iommu, &caps); -if (!ret) - ret =vfio_iommu_iova_build_caps (iommu, &caps); +if (!ret) + ret =vfio_iommu_iova_build_caps (iommu, &caps); -mutex_unlock (&iommu->lock); +mutex_unlock (&iommu->lock); -if (ret) -return ret; +if (ret) +return ret; -if (caps.size) { - info.flags |=VFIO_IOMMU_INFO_CAPS ; +if (caps.size) { + info.flags |=VFIO_IOMMU_INFO_CAPS ; -if (info.argsz <sizeof (info) + caps.size) { - info.argsz =sizeof (info) + caps.size; - }else { -vfio_info_cap_shift (&caps,sizeof (info)); -if (copy_to_user ((void __user *)arg + -sizeof (info), caps.buf, - caps.size)) { -kfree (caps.buf); -return -EFAULT ; - } - info.cap_offset =sizeof (info); +if (info.argsz <sizeof (info) + caps.size) { + info.argsz =sizeof (info) + caps.size; + }else { +vfio_info_cap_shift (&caps,sizeof (info)); +if (copy_to_user ((void __user *)arg + +sizeof (info), caps.buf, + caps.size)) { +kfree (caps.buf); +return -EFAULT ; } - -kfree (caps.buf); + info.cap_offset =sizeof (info); } -return copy_to_user ((void __user *)arg, &info, minsz) ? - -EFAULT :0 ; +kfree (caps.buf); + } - }else if (cmd ==VFIO_IOMMU_MAP_DMA ) { -struct vfio_iommu_type1_dma_map map; -uint32_t mask =VFIO_DMA_MAP_FLAG_READ | -VFIO_DMA_MAP_FLAG_WRITE ; +return copy_to_user ((void __user *)arg, &info, minsz) ? + -EFAULT :0 ; +}
Quoted 9 lines
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_migration_build_caps(struct vfio_iommu *iommu, · line 2618
Quoted 8 lines
drivers/vfio/vfio_iommu_type1.c +7
-1- minsz = offsetofend(struct vfio_iommu_type1_dma_map, size); +static int vfio_iommu_type1_map_dma (struct vfio_iommu *iommu, +unsigned long arg) +{ +struct vfio_iommu_type1_dma_map map; +unsigned long minsz; +uint32_t mask =VFIO_DMA_MAP_FLAG_READ | +VFIO_DMA_MAP_FLAG_WRITE ;nit: may fit into a single line? other examples below.
yes, I can do it.
Quoted 20 lines
Quoted 20 lines
drivers/vfio/vfio_iommu_type1.c +6
-9-if (copy_from_user (&map, (void __user *)arg, minsz)) -return -EFAULT ; + minsz = offsetofend(struct vfio_iommu_type1_dma_map, size); -if (map.argsz < minsz || map.flags & ~mask) -return -EINVAL ; +if (copy_from_user (&map, (void __user *)arg, minsz)) +return -EFAULT ; -return vfio_dma_do_map (iommu, &map); +if (map.argsz < minsz || map.flags & ~mask) +return -EINVAL ; - }else if (cmd ==VFIO_IOMMU_UNMAP_DMA ) { -struct vfio_iommu_type1_dma_unmap unmap; -struct vfio_bitmap bitmap = {0 }; -int ret; +return vfio_dma_do_map (iommu, &map); }
Quoted 9 lines
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_migration_build_caps(struct vfio_iommu *iommu, · line 2637
Quoted 8 lines
drivers/vfio/vfio_iommu_type1.c +7
-1- minsz = offsetofend(struct vfio_iommu_type1_dma_unmap, size); +static int vfio_iommu_type1_unmap_dma (struct vfio_iommu *iommu, +unsigned long arg) +{ +struct vfio_iommu_type1_dma_unmap unmap; +struct vfio_bitmap bitmap = {0 }; +unsigned long minsz; +long ret;int?
it is "long" in original code. do you want me to change it? I can do it if it's preferred.
Quoted 85 lines
Quoted 85 lines
drivers/vfio/vfio_iommu_type1.c +37
-33-if (copy_from_user (&unmap, (void __user *)arg, minsz)) -return -EFAULT ; + minsz = offsetofend(struct vfio_iommu_type1_dma_unmap, size); -if (unmap.argsz < minsz || - unmap.flags & ~VFIO_DMA_UNMAP_FLAG_GET_DIRTY_BITMAP ) -return -EINVAL ; +if (copy_from_user (&unmap, (void __user *)arg, minsz)) +return -EFAULT ; -if (unmap.flags &VFIO_DMA_UNMAP_FLAG_GET_DIRTY_BITMAP ) { -unsigned long pgshift; +if (unmap.argsz < minsz || + unmap.flags & ~VFIO_DMA_UNMAP_FLAG_GET_DIRTY_BITMAP ) +return -EINVAL ; -if (unmap.argsz < (minsz +sizeof (bitmap))) -return -EINVAL ; +if (unmap.flags &VFIO_DMA_UNMAP_FLAG_GET_DIRTY_BITMAP ) { +unsigned long pgshift; -if (copy_from_user (&bitmap, - (void __user *)(arg + minsz), -sizeof (bitmap))) -return -EFAULT ; +if (unmap.argsz < (minsz +sizeof (bitmap))) +return -EINVAL ; -if (!access_ok ((void __user *)bitmap.data, bitmap.size)) -return -EINVAL ; +if (copy_from_user (&bitmap, + (void __user *)(arg + minsz), +sizeof (bitmap))) +return -EFAULT ; - pgshift =__ffs (bitmap.pgsize); - ret =verify_bitmap_size (unmap.size >> pgshift, - bitmap.size); -if (ret) -return ret; - } +if (!access_ok ((void __user *)bitmap.data, bitmap.size)) +return -EINVAL ; - ret =vfio_dma_do_unmap (iommu, &unmap, &bitmap); + pgshift =__ffs (bitmap.pgsize); + ret =verify_bitmap_size (unmap.size >> pgshift, + bitmap.size);if (ret)return ret; + } + + ret =vfio_dma_do_unmap (iommu, &unmap, &bitmap); +if (ret) +return ret; -return copy_to_user ((void __user *)arg, &unmap, minsz) ? +return copy_to_user ((void __user *)arg, &unmap, minsz) ? -EFAULT :0 ; - }else if (cmd ==VFIO_IOMMU_DIRTY_PAGES ) { -struct vfio_iommu_type1_dirty_bitmap dirty; -uint32_t mask =VFIO_IOMMU_DIRTY_PAGES_FLAG_START | -VFIO_IOMMU_DIRTY_PAGES_FLAG_STOP | -VFIO_IOMMU_DIRTY_PAGES_FLAG_GET_BITMAP ; -int ret =0 ; +} -if (!iommu->v2) -return -EACCES ; +static int vfio_iommu_type1_dirty_pages (struct vfio_iommu *iommu, +unsigned long arg) +{ +struct vfio_iommu_type1_dirty_bitmap dirty; +uint32_t mask =VFIO_IOMMU_DIRTY_PAGES_FLAG_START | +VFIO_IOMMU_DIRTY_PAGES_FLAG_STOP | +VFIO_IOMMU_DIRTY_PAGES_FLAG_GET_BITMAP ; +unsigned long minsz; +int ret =0 ; - minsz = offsetofend(struct vfio_iommu_type1_dirty_bitmap, - flags); +if (!iommu->v2) +return -EACCES ;
Quoted 5 lines
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_migration_build_caps(struct vfio_iommu *iommu, · line 2691
Quoted 4 lines
drivers/vfio/vfio_iommu_type1.c +2
-2-if (copy_from_user (&dirty, (void __user *)arg, minsz)) -return -EFAULT ; + minsz = offsetofend(struct vfio_iommu_type1_dirty_bitmap, + flags);single line?
got it.
Quoted 30 lines
Quoted 30 lines
drivers/vfio/vfio_iommu_type1.c +24
-4-if (dirty.argsz < minsz || dirty.flags & ~mask) -return -EINVAL ; +if (copy_from_user (&dirty, (void __user *)arg, minsz)) +return -EFAULT ; + +if (dirty.argsz < minsz || dirty.flags & ~mask) +return -EINVAL ; + +/* only one flag should be set at a time */ +if (__ffs (dirty.flags) !=__fls (dirty.flags)) +return -EINVAL ; + +if (dirty.flags &VFIO_IOMMU_DIRTY_PAGES_FLAG_START ) { +size_t pgsize; -/* only one flag should be set at a time */ -if (__ffs (dirty.flags) !=__fls (dirty.flags)) +mutex_lock (&iommu->lock); + pgsize =1 <<__ffs (iommu->pgsize_bitmap); +if (!iommu->dirty_page_tracking) { + ret =vfio_dma_bitmap_alloc_all (iommu, pgsize); +if (!ret) + iommu->dirty_page_tracking = true; + } +mutex_unlock (&iommu->lock); +return ret; + }else if (dirty.flags &VFIO_IOMMU_DIRTY_PAGES_FLAG_STOP ) { +mutex_lock (&iommu->lock); +if (iommu->dirty_page_tracking) {
Quoted 8 lines
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_migration_build_caps(struct vfio_iommu *iommu, · line 2724
Quoted 7 lines
drivers/vfio/vfio_iommu_type1.c +7
-0+ iommu->dirty_page_tracking = false; +vfio_dma_bitmap_free_all (iommu); + } +mutex_unlock (&iommu->lock); +return 0 ; + }else if (dirty.flags & +VFIO_IOMMU_DIRTY_PAGES_FLAG_GET_BITMAP ) {single line?
yep.
Quoted 37 lines
Quoted 37 lines
drivers/vfio/vfio_iommu_type1.c +19
-14+struct vfio_iommu_type1_dirty_bitmap_get range; +unsigned long pgshift; +size_t data_size = dirty.argsz - minsz; +size_t iommu_pgsize; + +if (!data_size || data_size <sizeof (range))return -EINVAL ; -if (dirty.flags &VFIO_IOMMU_DIRTY_PAGES_FLAG_START ) { -size_t pgsize; +if (copy_from_user (&range, (void __user *)(arg + minsz), +sizeof (range))) +return -EFAULT ; -mutex_lock (&iommu->lock); - pgsize =1 <<__ffs (iommu->pgsize_bitmap); -if (!iommu->dirty_page_tracking) { - ret =vfio_dma_bitmap_alloc_all (iommu, pgsize); -if (!ret) - iommu->dirty_page_tracking = true; - } -mutex_unlock (&iommu->lock); +if (range.iova + range.size < range.iova) +return -EINVAL ; +if (!access_ok ((void __user *)range.bitmap.data, + range.bitmap.size)) +return -EINVAL ; + + pgshift =__ffs (range.bitmap.pgsize); + ret =verify_bitmap_size (range.size >> pgshift, + range.bitmap.size); +if (ret)return ret; - }else if (dirty.flags &VFIO_IOMMU_DIRTY_PAGES_FLAG_STOP ) { -mutex_lock (&iommu->lock); -if (iommu->dirty_page_tracking) { - iommu->dirty_page_tracking = false;
Quoted 8 lines
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_migration_build_caps(struct vfio_iommu *iommu,
Quoted 6 lines
drivers/vfio/vfio_iommu_type1.c +0
-6-vfio_dma_bitmap_free_all (iommu); - } -mutex_unlock (&iommu->lock); -return 0 ; - }else if (dirty.flags & -VFIO_IOMMU_DIRTY_PAGES_FLAG_GET_BITMAP ){
idem
well received. :-)
Quoted 89 lines
Quoted 89 lines
drivers/vfio/vfio_iommu_type1.c +36
-46-struct vfio_iommu_type1_dirty_bitmap_get range; -unsigned long pgshift; -size_t data_size = dirty.argsz - minsz; -size_t iommu_pgsize; - -if (!data_size || data_size <sizeof (range)) -return -EINVAL ; - -if (copy_from_user (&range, (void __user *)(arg + minsz), -sizeof (range))) -return -EFAULT ; -if (range.iova + range.size < range.iova) -return -EINVAL ; -if (!access_ok ((void __user *)range.bitmap.data, - range.bitmap.size)) -return -EINVAL ; +mutex_lock (&iommu->lock); - pgshift =__ffs (range.bitmap.pgsize); - ret =verify_bitmap_size (range.size >> pgshift, - range.bitmap.size); -if (ret) -return ret; + iommu_pgsize = (size_t )1 <<__ffs (iommu->pgsize_bitmap); -mutex_lock (&iommu->lock); +/* allow only smallest supported pgsize */ +if (range.bitmap.pgsize != iommu_pgsize) { + ret = -EINVAL ; + goto out_unlock; + } +if (range.iova & (iommu_pgsize -1 )) { + ret = -EINVAL ; + goto out_unlock; + } +if (!range.size || range.size & (iommu_pgsize -1 )) { + ret = -EINVAL ; + goto out_unlock; + } - iommu_pgsize = (size_t )1 <<__ffs (iommu->pgsize_bitmap); +if (iommu->dirty_page_tracking) + ret =vfio_iova_dirty_bitmap (range.bitmap.data, + iommu, range.iova, range.size, + range.bitmap.pgsize); +else + ret = -EINVAL ; +out_unlock: +mutex_unlock (&iommu->lock); -/* allow only smallest supported pgsize */ -if (range.bitmap.pgsize != iommu_pgsize) { - ret = -EINVAL ; - goto out_unlock; - } -if (range.iova & (iommu_pgsize -1 )) { - ret = -EINVAL ; - goto out_unlock; - } -if (!range.size || range.size & (iommu_pgsize -1 )) { - ret = -EINVAL ; - goto out_unlock; - } +return ret; + } -if (iommu->dirty_page_tracking) - ret =vfio_iova_dirty_bitmap (range.bitmap.data, - iommu, range.iova, range.size, - range.bitmap.pgsize); -else - ret = -EINVAL ; -out_unlock: -mutex_unlock (&iommu->lock); +return -EINVAL ; +} -return ret; - } +static long vfio_iommu_type1_ioctl (void *iommu_data, +unsigned int cmd,unsigned long arg) { +struct vfio_iommu *iommu = iommu_data; + +switch (cmd) { +case VFIO_CHECK_EXTENSION : +return vfio_iommu_type1_check_extension (iommu, arg); +case VFIO_IOMMU_GET_INFO : +return vfio_iommu_type1_get_info (iommu, arg);
Quoted 8 lines
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_migration_build_caps(struct vfio_iommu *iommu, · line 2797
Quoted 6 lines
drivers/vfio/vfio_iommu_type1.c +6
-0+case VFIO_IOMMU_MAP_DMA : +return vfio_iommu_type1_map_dma (iommu, arg); +case VFIO_IOMMU_UNMAP_DMA : +return vfio_iommu_type1_unmap_dma (iommu, arg); +case VFIO_IOMMU_DIRTY_PAGES : +return vfio_iommu_type1_dirty_pages (iommu, arg);default:
return-ENOTTY; ?
got it.
Quoted 7 lines
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_migration_build_caps(struct vfio_iommu *iommu,
Quoted 4 lines
drivers/vfio/vfio_iommu_type1.c +0
-0}return -ENOTTY ;Besides
Reviewed-by Eric Auger <[email protected]>
thanks.
Regards,
Yi Liu
Quoted 3 lines
Thanks
Eric
Re: [PATCH v4 01/15] vfio/type1: Refactor vfio_iommu_type1_ioctl()
Hi Yi,
Quoted 231 lines · Yi L
Hi Eric,
Quoted 9 lines
From: Auger Eric <[email protected]>
Sent: Monday, July 6, 2020 5:34 PMHi Yi,
Quoted 2 lines · Liu Yi L
This patch refactors the
vfio_iommu_type1_ioctl()to use switch instead of if-else, and each cmd got a helper function.command
I see. :-)
Quoted 175 lines
drivers/vfio/vfio_iommu_type1.c static int vfio_domains_have_iommu_cache(struct
Quoted 20 lines
Cc Kevin Tian <[email protected]>CC Jacob Pan <[email protected]>Cc Alex Williamson <[email protected]>Cc Eric Auger <[email protected]>Cc Jean-Philippe Brucker <[email protected]>Cc Joerg Roedel <[email protected]>Cc Lu Baolu <[email protected]>Suggested-by Christoph Hellwig <[email protected]>Signed-off-by Liu Yi L <[email protected]>--- drivers/vfio/vfio_iommu_type1.c | 392 ++++++++++++++++++++++------------------ 1 file changed, 213 insertions(+), 179 deletions(-)(quoted diff) +0
-0
b/drivers/vfio/vfio_iommu_type1.cindex 5e556ac..7accb59 100644drivers/vfio/vfio_iommu_type1.c +0
-0@@ -2453,6 +2453,23 @@ static int vfio_domains_have_iommu_cache(struct
vfio_iommu*iommu)drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_migration_build_caps(struct
Quoted 24 lines
drivers/vfio/vfio_iommu_type1.c +17
-0return ret; } +static int vfio_iommu_type1_check_extension (struct vfio_iommu *iommu, +unsigned long arg) +{ +switch (arg) { +case VFIO_TYPE1_IOMMU : +case VFIO_TYPE1v2_IOMMU: +case VFIO_TYPE1_NESTING_IOMMU : +return 1 ; +case VFIO_DMA_CC_IOMMU : +if (!iommu) +return 0 ; +return vfio_domains_have_iommu_cache (iommu); +default : +return 0 ; + } +} +static int vfio_iommu_iova_add_cap (struct vfio_info_cap *caps,struct vfio_iommu_type1_info_cap_iova_range *cap_iovas,size_t size)@@ -2529,238 +2546,255 @@ static int vfio_iommu_migration_build_caps(struct
vfio_iommu*iommu,Quoted 129 lines
drivers/vfio/vfio_iommu_type1.c +43
-63return vfio_info_add_capability (caps, &cap_mig.header,sizeof (cap_mig)); } -static long vfio_iommu_type1_ioctl (void *iommu_data, -unsigned int cmd,unsigned long arg) +static int vfio_iommu_type1_get_info (struct vfio_iommu *iommu, +unsigned long arg) { -struct vfio_iommu *iommu = iommu_data; +struct vfio_iommu_type1_info info;unsigned long minsz; +struct vfio_info_cap caps = { .buf =NULL , .size =0 }; +unsigned long capsz; +int ret; -if (cmd ==VFIO_CHECK_EXTENSION ) { -switch (arg) { -case VFIO_TYPE1_IOMMU : -case VFIO_TYPE1v2_IOMMU: -case VFIO_TYPE1_NESTING_IOMMU : -return 1 ; -case VFIO_DMA_CC_IOMMU : -if (!iommu) -return 0 ; -return vfio_domains_have_iommu_cache (iommu); -default : -return 0 ; - } - }else if (cmd ==VFIO_IOMMU_GET_INFO ) { -struct vfio_iommu_type1_info info; -struct vfio_info_cap caps = { .buf =NULL , .size =0 }; -unsigned long capsz; -int ret; - - minsz = offsetofend(struct vfio_iommu_type1_info, iova_pgsizes); + minsz = offsetofend(struct vfio_iommu_type1_info, iova_pgsizes); -/* For backward compatibility, cannot require this */ - capsz = offsetofend(struct vfio_iommu_type1_info, cap_offset); +/* For backward compatibility, cannot require this */ + capsz = offsetofend(struct vfio_iommu_type1_info, cap_offset); -if (copy_from_user (&info, (void __user *)arg, minsz)) -return -EFAULT ; +if (copy_from_user (&info, (void __user *)arg, minsz)) +return -EFAULT ; -if (info.argsz < minsz) -return -EINVAL ; +if (info.argsz < minsz) +return -EINVAL ; -if (info.argsz >= capsz) { - minsz = capsz; - info.cap_offset =0 ;/* output, no-recopy necessary */ - } +if (info.argsz >= capsz) { + minsz = capsz; + info.cap_offset =0 ;/* output, no-recopy necessary */ + } -mutex_lock (&iommu->lock); - info.flags =VFIO_IOMMU_INFO_PGSIZES ; +mutex_lock (&iommu->lock); + info.flags =VFIO_IOMMU_INFO_PGSIZES ; - info.iova_pgsizes = iommu->pgsize_bitmap; + info.iova_pgsizes = iommu->pgsize_bitmap; - ret =vfio_iommu_migration_build_caps (iommu, &caps); + ret =vfio_iommu_migration_build_caps (iommu, &caps); -if (!ret) - ret =vfio_iommu_iova_build_caps (iommu, &caps); +if (!ret) + ret =vfio_iommu_iova_build_caps (iommu, &caps); -mutex_unlock (&iommu->lock); +mutex_unlock (&iommu->lock); -if (ret) -return ret; +if (ret) +return ret; -if (caps.size) { - info.flags |=VFIO_IOMMU_INFO_CAPS ; +if (caps.size) { + info.flags |=VFIO_IOMMU_INFO_CAPS ; -if (info.argsz <sizeof (info) + caps.size) { - info.argsz =sizeof (info) + caps.size; - }else { -vfio_info_cap_shift (&caps,sizeof (info)); -if (copy_to_user ((void __user *)arg + -sizeof (info), caps.buf, - caps.size)) { -kfree (caps.buf); -return -EFAULT ; - } - info.cap_offset =sizeof (info); +if (info.argsz <sizeof (info) + caps.size) { + info.argsz =sizeof (info) + caps.size; + }else { +vfio_info_cap_shift (&caps,sizeof (info)); +if (copy_to_user ((void __user *)arg + +sizeof (info), caps.buf, + caps.size)) { +kfree (caps.buf); +return -EFAULT ; } - -kfree (caps.buf); + info.cap_offset =sizeof (info); } -return copy_to_user ((void __user *)arg, &info, minsz) ? - -EFAULT :0 ; +kfree (caps.buf); + } - }else if (cmd ==VFIO_IOMMU_MAP_DMA ) { -struct vfio_iommu_type1_dma_map map; -uint32_t mask =VFIO_DMA_MAP_FLAG_READ | -VFIO_DMA_MAP_FLAG_WRITE ; +return copy_to_user ((void __user *)arg, &info, minsz) ? + -EFAULT :0 ; +}Quoted 9 lines
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_migration_build_caps(struct vfio_iommu *iommu, · line 2618
Quoted 8 lines
drivers/vfio/vfio_iommu_type1.c +7
-1- minsz = offsetofend(struct vfio_iommu_type1_dma_map, size); +static int vfio_iommu_type1_map_dma (struct vfio_iommu *iommu, +unsigned long arg) +{ +struct vfio_iommu_type1_dma_map map; +unsigned long minsz; +uint32_t mask =VFIO_DMA_MAP_FLAG_READ | +VFIO_DMA_MAP_FLAG_WRITE ;nit: may fit into a single line? other examples below.
yes, I can do it.
Quoted 20 lines
Quoted 20 lines
drivers/vfio/vfio_iommu_type1.c +6
-9-if (copy_from_user (&map, (void __user *)arg, minsz)) -return -EFAULT ; + minsz = offsetofend(struct vfio_iommu_type1_dma_map, size); -if (map.argsz < minsz || map.flags & ~mask) -return -EINVAL ; +if (copy_from_user (&map, (void __user *)arg, minsz)) +return -EFAULT ; -return vfio_dma_do_map (iommu, &map); +if (map.argsz < minsz || map.flags & ~mask) +return -EINVAL ; - }else if (cmd ==VFIO_IOMMU_UNMAP_DMA ) { -struct vfio_iommu_type1_dma_unmap unmap; -struct vfio_bitmap bitmap = {0 }; -int ret; +return vfio_dma_do_map (iommu, &map); }Quoted 9 lines
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_migration_build_caps(struct vfio_iommu *iommu, · line 2637
Quoted 8 lines
drivers/vfio/vfio_iommu_type1.c +7
-1- minsz = offsetofend(struct vfio_iommu_type1_dma_unmap, size); +static int vfio_iommu_type1_unmap_dma (struct vfio_iommu *iommu, +unsigned long arg) +{ +struct vfio_iommu_type1_dma_unmap unmap; +struct vfio_bitmap bitmap = {0 }; +unsigned long minsz; +long ret;int?
Quoted 2 lines
it is "long" in original code. do you want me to change it? I can do it if it's preferred.
I am checking your branch and I think
"331e33d2960c vfio iommu: Update UNMAP_DMA ioctl to get dirty bitmap before unmap"
turned it into an int
Thanks
Eric
Quoted 300 lines
Quoted 86 lines
Quoted 86 lines
drivers/vfio/vfio_iommu_type1.c +37
-33-if (copy_from_user (&unmap, (void __user *)arg, minsz)) -return -EFAULT ; + minsz = offsetofend(struct vfio_iommu_type1_dma_unmap, size); -if (unmap.argsz < minsz || - unmap.flags & ~VFIO_DMA_UNMAP_FLAG_GET_DIRTY_BITMAP ) -return -EINVAL ; +if (copy_from_user (&unmap, (void __user *)arg, minsz)) +return -EFAULT ; -if (unmap.flags &VFIO_DMA_UNMAP_FLAG_GET_DIRTY_BITMAP ) { -unsigned long pgshift; +if (unmap.argsz < minsz || + unmap.flags & ~VFIO_DMA_UNMAP_FLAG_GET_DIRTY_BITMAP ) +return -EINVAL ; -if (unmap.argsz < (minsz +sizeof (bitmap))) -return -EINVAL ; +if (unmap.flags &VFIO_DMA_UNMAP_FLAG_GET_DIRTY_BITMAP ) { +unsigned long pgshift; -if (copy_from_user (&bitmap, - (void __user *)(arg + minsz), -sizeof (bitmap))) -return -EFAULT ; +if (unmap.argsz < (minsz +sizeof (bitmap))) +return -EINVAL ; -if (!access_ok ((void __user *)bitmap.data, bitmap.size)) -return -EINVAL ; +if (copy_from_user (&bitmap, + (void __user *)(arg + minsz), +sizeof (bitmap))) +return -EFAULT ; - pgshift =__ffs (bitmap.pgsize); - ret =verify_bitmap_size (unmap.size >> pgshift, - bitmap.size); -if (ret) -return ret; - } +if (!access_ok ((void __user *)bitmap.data, bitmap.size)) +return -EINVAL ; - ret =vfio_dma_do_unmap (iommu, &unmap, &bitmap); + pgshift =__ffs (bitmap.pgsize); + ret =verify_bitmap_size (unmap.size >> pgshift, + bitmap.size);if (ret)return ret; + } + + ret =vfio_dma_do_unmap (iommu, &unmap, &bitmap); +if (ret) +return ret; -return copy_to_user ((void __user *)arg, &unmap, minsz) ? +return copy_to_user ((void __user *)arg, &unmap, minsz) ? -EFAULT :0 ; - }else if (cmd ==VFIO_IOMMU_DIRTY_PAGES ) { -struct vfio_iommu_type1_dirty_bitmap dirty; -uint32_t mask =VFIO_IOMMU_DIRTY_PAGES_FLAG_START | -VFIO_IOMMU_DIRTY_PAGES_FLAG_STOP | -VFIO_IOMMU_DIRTY_PAGES_FLAG_GET_BITMAP ; -int ret =0 ; +} -if (!iommu->v2) -return -EACCES ; +static int vfio_iommu_type1_dirty_pages (struct vfio_iommu *iommu, +unsigned long arg) +{ +struct vfio_iommu_type1_dirty_bitmap dirty; +uint32_t mask =VFIO_IOMMU_DIRTY_PAGES_FLAG_START | +VFIO_IOMMU_DIRTY_PAGES_FLAG_STOP | +VFIO_IOMMU_DIRTY_PAGES_FLAG_GET_BITMAP ; +unsigned long minsz; +int ret =0 ; - minsz = offsetofend(struct vfio_iommu_type1_dirty_bitmap, - flags); +if (!iommu->v2) +return -EACCES ;Quoted 5 lines
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_migration_build_caps(struct vfio_iommu *iommu, · line 2691
Quoted 4 lines
drivers/vfio/vfio_iommu_type1.c +2
-2-if (copy_from_user (&dirty, (void __user *)arg, minsz)) -return -EFAULT ; + minsz = offsetofend(struct vfio_iommu_type1_dirty_bitmap, + flags);single line?
got it.
Quoted 30 lines
Quoted 30 lines
drivers/vfio/vfio_iommu_type1.c +24
-4-if (dirty.argsz < minsz || dirty.flags & ~mask) -return -EINVAL ; +if (copy_from_user (&dirty, (void __user *)arg, minsz)) +return -EFAULT ; + +if (dirty.argsz < minsz || dirty.flags & ~mask) +return -EINVAL ; + +/* only one flag should be set at a time */ +if (__ffs (dirty.flags) !=__fls (dirty.flags)) +return -EINVAL ; + +if (dirty.flags &VFIO_IOMMU_DIRTY_PAGES_FLAG_START ) { +size_t pgsize; -/* only one flag should be set at a time */ -if (__ffs (dirty.flags) !=__fls (dirty.flags)) +mutex_lock (&iommu->lock); + pgsize =1 <<__ffs (iommu->pgsize_bitmap); +if (!iommu->dirty_page_tracking) { + ret =vfio_dma_bitmap_alloc_all (iommu, pgsize); +if (!ret) + iommu->dirty_page_tracking = true; + } +mutex_unlock (&iommu->lock); +return ret; + }else if (dirty.flags &VFIO_IOMMU_DIRTY_PAGES_FLAG_STOP ) { +mutex_lock (&iommu->lock); +if (iommu->dirty_page_tracking) {Quoted 8 lines
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_migration_build_caps(struct vfio_iommu *iommu, · line 2724
Quoted 7 lines
drivers/vfio/vfio_iommu_type1.c +7
-0+ iommu->dirty_page_tracking = false; +vfio_dma_bitmap_free_all (iommu); + } +mutex_unlock (&iommu->lock); +return 0 ; + }else if (dirty.flags & +VFIO_IOMMU_DIRTY_PAGES_FLAG_GET_BITMAP ) {single line?
yep.
Quoted 37 lines
Quoted 37 lines
drivers/vfio/vfio_iommu_type1.c +19
-14+struct vfio_iommu_type1_dirty_bitmap_get range; +unsigned long pgshift; +size_t data_size = dirty.argsz - minsz; +size_t iommu_pgsize; + +if (!data_size || data_size <sizeof (range))return -EINVAL ; -if (dirty.flags &VFIO_IOMMU_DIRTY_PAGES_FLAG_START ) { -size_t pgsize; +if (copy_from_user (&range, (void __user *)(arg + minsz), +sizeof (range))) +return -EFAULT ; -mutex_lock (&iommu->lock); - pgsize =1 <<__ffs (iommu->pgsize_bitmap); -if (!iommu->dirty_page_tracking) { - ret =vfio_dma_bitmap_alloc_all (iommu, pgsize); -if (!ret) - iommu->dirty_page_tracking = true; - } -mutex_unlock (&iommu->lock); +if (range.iova + range.size < range.iova) +return -EINVAL ; +if (!access_ok ((void __user *)range.bitmap.data, + range.bitmap.size)) +return -EINVAL ; + + pgshift =__ffs (range.bitmap.pgsize); + ret =verify_bitmap_size (range.size >> pgshift, + range.bitmap.size); +if (ret)return ret; - }else if (dirty.flags &VFIO_IOMMU_DIRTY_PAGES_FLAG_STOP ) { -mutex_lock (&iommu->lock); -if (iommu->dirty_page_tracking) { - iommu->dirty_page_tracking = false;Quoted 8 lines
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_migration_build_caps(struct vfio_iommu *iommu,
Quoted 6 lines
drivers/vfio/vfio_iommu_type1.c +0
-6-vfio_dma_bitmap_free_all (iommu); - } -mutex_unlock (&iommu->lock); -return 0 ; - }else if (dirty.flags & -VFIO_IOMMU_DIRTY_PAGES_FLAG_GET_BITMAP ){
idemwell received. :-)
Quoted 89 lines
Quoted 89 lines
drivers/vfio/vfio_iommu_type1.c +36
-46-struct vfio_iommu_type1_dirty_bitmap_get range; -unsigned long pgshift; -size_t data_size = dirty.argsz - minsz; -size_t iommu_pgsize; - -if (!data_size || data_size <sizeof (range)) -return -EINVAL ; - -if (copy_from_user (&range, (void __user *)(arg + minsz), -sizeof (range))) -return -EFAULT ; -if (range.iova + range.size < range.iova) -return -EINVAL ; -if (!access_ok ((void __user *)range.bitmap.data, - range.bitmap.size)) -return -EINVAL ; +mutex_lock (&iommu->lock); - pgshift =__ffs (range.bitmap.pgsize); - ret =verify_bitmap_size (range.size >> pgshift, - range.bitmap.size); -if (ret) -return ret; + iommu_pgsize = (size_t )1 <<__ffs (iommu->pgsize_bitmap); -mutex_lock (&iommu->lock); +/* allow only smallest supported pgsize */ +if (range.bitmap.pgsize != iommu_pgsize) { + ret = -EINVAL ; + goto out_unlock; + } +if (range.iova & (iommu_pgsize -1 )) { + ret = -EINVAL ; + goto out_unlock; + } +if (!range.size || range.size & (iommu_pgsize -1 )) { + ret = -EINVAL ; + goto out_unlock; + } - iommu_pgsize = (size_t )1 <<__ffs (iommu->pgsize_bitmap); +if (iommu->dirty_page_tracking) + ret =vfio_iova_dirty_bitmap (range.bitmap.data, + iommu, range.iova, range.size, + range.bitmap.pgsize); +else + ret = -EINVAL ; +out_unlock: +mutex_unlock (&iommu->lock); -/* allow only smallest supported pgsize */ -if (range.bitmap.pgsize != iommu_pgsize) { - ret = -EINVAL ; - goto out_unlock; - } -if (range.iova & (iommu_pgsize -1 )) { - ret = -EINVAL ; - goto out_unlock; - } -if (!range.size || range.size & (iommu_pgsize -1 )) { - ret = -EINVAL ; - goto out_unlock; - } +return ret; + } -if (iommu->dirty_page_tracking) - ret =vfio_iova_dirty_bitmap (range.bitmap.data, - iommu, range.iova, range.size, - range.bitmap.pgsize); -else - ret = -EINVAL ; -out_unlock: -mutex_unlock (&iommu->lock); +return -EINVAL ; +} -return ret; - } +static long vfio_iommu_type1_ioctl (void *iommu_data, +unsigned int cmd,unsigned long arg) { +struct vfio_iommu *iommu = iommu_data; + +switch (cmd) { +case VFIO_CHECK_EXTENSION : +return vfio_iommu_type1_check_extension (iommu, arg); +case VFIO_IOMMU_GET_INFO : +return vfio_iommu_type1_get_info (iommu, arg);Quoted 8 lines
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_migration_build_caps(struct vfio_iommu *iommu, · line 2797
Quoted 6 lines
drivers/vfio/vfio_iommu_type1.c +6
-0+case VFIO_IOMMU_MAP_DMA : +return vfio_iommu_type1_map_dma (iommu, arg); +case VFIO_IOMMU_UNMAP_DMA : +return vfio_iommu_type1_unmap_dma (iommu, arg); +case VFIO_IOMMU_DIRTY_PAGES : +return vfio_iommu_type1_dirty_pages (iommu, arg);default:
return-ENOTTY; ?got it.
Quoted 7 lines
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_migration_build_caps(struct vfio_iommu *iommu,
Quoted 4 lines
drivers/vfio/vfio_iommu_type1.c +0
-0}return -ENOTTY ;Besides
Reviewed-by Eric Auger <[email protected]>thanks.
Regards,
Yi LiuQuoted 3 lines
Thanks
Eric
RE: [PATCH v4 01/15] vfio/type1: Refactor vfio_iommu_type1_ioctl()
Hi Eric,
Quoted 239 lines
From: Auger Eric <[email protected]>
Sent: Monday, July 6, 2020 8:56 PMHi Yi,
Quoted 233 lines · Yi L
Hi Eric,
Quoted 9 lines
From: Auger Eric <[email protected]>
Sent: Monday, July 6, 2020 5:34 PMHi Yi,
Quoted 2 lines · Liu Yi L
This patch refactors the
vfio_iommu_type1_ioctl()to use switch instead of if-else, and each cmd got a helper function.command
I see. :-)
Quoted 177 lines
Quoted 20 lines
Cc Kevin Tian <[email protected]>CC Jacob Pan <[email protected]>Cc Alex Williamson <[email protected]>Cc Eric Auger <[email protected]>Cc Jean-Philippe Brucker <[email protected]>Cc Joerg Roedel <[email protected]>Cc Lu Baolu <[email protected]>Suggested-by Christoph Hellwig <[email protected]>Signed-off-by Liu Yi L <[email protected]>--- drivers/vfio/vfio_iommu_type1.c | 392 ++++++++++++++++++++++------------------ 1 file changed, 213 insertions(+), 179 deletions(-)(quoted diff) +0
-0
b/drivers/vfio/vfio_iommu_type1.cindex 5e556ac..7accb59 100644drivers/vfio/vfio_iommu_type1.c +0
-0@@ -2453,6 +2453,23 @@ static intQuoted 1 line
vfio_domains_have_iommu_cache(struct
vfio_iommu*iommu)Quoted 24 lines
drivers/vfio/vfio_iommu_type1.c +17
-0return ret; } +static int vfio_iommu_type1_check_extension (struct vfio_iommu *iommu, +unsigned long arg) +{ +switch (arg) { +case VFIO_TYPE1_IOMMU : +case VFIO_TYPE1v2_IOMMU: +case VFIO_TYPE1_NESTING_IOMMU : +return 1 ; +case VFIO_DMA_CC_IOMMU : +if (!iommu) +return 0 ; +return vfio_domains_have_iommu_cache (iommu); +default : +return 0 ; + } +} +static int vfio_iommu_iova_add_cap (struct vfio_info_cap *caps,struct vfio_iommu_type1_info_cap_iova_range *cap_iovas,size_t size)@@ -2529,238 +2546,255 @@ static intQuoted 1 line
vfio_iommu_migration_build_caps(struct
vfio_iommu*iommu,Quoted 129 lines
return vfio_info_add_capability(caps, &cap_mig.header,
sizeof(cap_mig)); }drivers/vfio/vfio_iommu_type1.c +43
-63-static long vfio_iommu_type1_ioctl (void *iommu_data, -unsigned int cmd,unsigned long arg) +static int vfio_iommu_type1_get_info (struct vfio_iommu *iommu, +unsigned long arg) { -struct vfio_iommu *iommu = iommu_data; +struct vfio_iommu_type1_info info;unsigned long minsz; +struct vfio_info_cap caps = { .buf =NULL , .size =0 }; +unsigned long capsz; +int ret; -if (cmd ==VFIO_CHECK_EXTENSION ) { -switch (arg) { -case VFIO_TYPE1_IOMMU : -case VFIO_TYPE1v2_IOMMU: -case VFIO_TYPE1_NESTING_IOMMU : -return 1 ; -case VFIO_DMA_CC_IOMMU : -if (!iommu) -return 0 ; -return vfio_domains_have_iommu_cache (iommu); -default : -return 0 ; - } - }else if (cmd ==VFIO_IOMMU_GET_INFO ) { -struct vfio_iommu_type1_info info; -struct vfio_info_cap caps = { .buf =NULL , .size =0 }; -unsigned long capsz; -int ret; - - minsz = offsetofend(struct vfio_iommu_type1_info, iova_pgsizes); + minsz = offsetofend(struct vfio_iommu_type1_info, iova_pgsizes); -/* For backward compatibility, cannot require this */ - capsz = offsetofend(struct vfio_iommu_type1_info, cap_offset); +/* For backward compatibility, cannot require this */ + capsz = offsetofend(struct vfio_iommu_type1_info, cap_offset); -if (copy_from_user (&info, (void __user *)arg, minsz)) -return -EFAULT ; +if (copy_from_user (&info, (void __user *)arg, minsz)) +return -EFAULT ; -if (info.argsz < minsz) -return -EINVAL ; +if (info.argsz < minsz) +return -EINVAL ; -if (info.argsz >= capsz) { - minsz = capsz; - info.cap_offset =0 ;/* output, no-recopy necessary */ - } +if (info.argsz >= capsz) { + minsz = capsz; + info.cap_offset =0 ;/* output, no-recopy necessary */ + } -mutex_lock (&iommu->lock); - info.flags =VFIO_IOMMU_INFO_PGSIZES ; +mutex_lock (&iommu->lock); + info.flags =VFIO_IOMMU_INFO_PGSIZES ; - info.iova_pgsizes = iommu->pgsize_bitmap; + info.iova_pgsizes = iommu->pgsize_bitmap; - ret =vfio_iommu_migration_build_caps (iommu, &caps); + ret =vfio_iommu_migration_build_caps (iommu, &caps); -if (!ret) - ret =vfio_iommu_iova_build_caps (iommu, &caps); +if (!ret) + ret =vfio_iommu_iova_build_caps (iommu, &caps); -mutex_unlock (&iommu->lock); +mutex_unlock (&iommu->lock); -if (ret) -return ret; +if (ret) +return ret; -if (caps.size) { - info.flags |=VFIO_IOMMU_INFO_CAPS ; +if (caps.size) { + info.flags |=VFIO_IOMMU_INFO_CAPS ; -if (info.argsz <sizeof (info) + caps.size) { - info.argsz =sizeof (info) + caps.size; - }else { -vfio_info_cap_shift (&caps,sizeof (info)); -if (copy_to_user ((void __user *)arg + -sizeof (info), caps.buf, - caps.size)) { -kfree (caps.buf); -return -EFAULT ; - } - info.cap_offset =sizeof (info); +if (info.argsz <sizeof (info) + caps.size) { + info.argsz =sizeof (info) + caps.size; + }else { +vfio_info_cap_shift (&caps,sizeof (info)); +if (copy_to_user ((void __user *)arg + +sizeof (info), caps.buf, + caps.size)) { +kfree (caps.buf); +return -EFAULT ; } - -kfree (caps.buf); + info.cap_offset =sizeof (info); } -return copy_to_user ((void __user *)arg, &info, minsz) ? - -EFAULT :0 ; +kfree (caps.buf); + } - }else if (cmd ==VFIO_IOMMU_MAP_DMA ) { -struct vfio_iommu_type1_dma_map map; -uint32_t mask =VFIO_DMA_MAP_FLAG_READ | -VFIO_DMA_MAP_FLAG_WRITE ; +return copy_to_user ((void __user *)arg, &info, minsz) ? + -EFAULT :0 ; +}Quoted 9 lines
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_migration_build_caps(struct vfio_iommu *iommu, · line 2618
Quoted 8 lines
drivers/vfio/vfio_iommu_type1.c +7
-1- minsz = offsetofend(struct vfio_iommu_type1_dma_map, size); +static int vfio_iommu_type1_map_dma (struct vfio_iommu *iommu, +unsigned long arg) +{ +struct vfio_iommu_type1_dma_map map; +unsigned long minsz; +uint32_t mask =VFIO_DMA_MAP_FLAG_READ | +VFIO_DMA_MAP_FLAG_WRITE ;nit: may fit into a single line? other examples below.
yes, I can do it.
Quoted 29 lines
Quoted 18 lines
drivers/vfio/vfio_iommu_type1.c +5
-9-if (copy_from_user (&map, (void __user *)arg, minsz)) -return -EFAULT ; + minsz = offsetofend(struct vfio_iommu_type1_dma_map, size); -if (map.argsz < minsz || map.flags & ~mask) -return -EINVAL ; +if (copy_from_user (&map, (void __user *)arg, minsz)) +return -EFAULT ; -return vfio_dma_do_map (iommu, &map); +if (map.argsz < minsz || map.flags & ~mask) +return -EINVAL ; - }else if (cmd ==VFIO_IOMMU_UNMAP_DMA ) { -struct vfio_iommu_type1_dma_unmap unmap; -struct vfio_bitmap bitmap = {0 }; -int ret;drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_migration_build_caps(struct vfio_iommu *iommu, · line 2637
Quoted 10 lines
drivers/vfio/vfio_iommu_type1.c +8
-1+return vfio_dma_do_map (iommu, &map); } - minsz = offsetofend(struct vfio_iommu_type1_dma_unmap, size); +static int vfio_iommu_type1_unmap_dma (struct vfio_iommu *iommu, +unsigned long arg) +{ +struct vfio_iommu_type1_dma_unmap unmap; +struct vfio_bitmap bitmap = {0 }; +unsigned long minsz; +long ret;int?
Quoted 8 lines
Quoted 2 lines
it is "long" in original code. do you want me to change it? I can do it if it's preferred.
I am checking your branch and I think
"331e33d2960cvfio iommu: UpdateUNMAP_DMAioctl to get dirty bitmap before unmap"turned it into an int
oh, yes. it is. thanks for spotting it.
Regards,
Yi Liu
Quoted 304 lines
Thanks
Eric
Quoted 300 lines
Quoted 86 lines
Quoted 86 lines
drivers/vfio/vfio_iommu_type1.c +37
-33-if (copy_from_user (&unmap, (void __user *)arg, minsz)) -return -EFAULT ; + minsz = offsetofend(struct vfio_iommu_type1_dma_unmap, size); -if (unmap.argsz < minsz || - unmap.flags & ~VFIO_DMA_UNMAP_FLAG_GET_DIRTY_BITMAP ) -return -EINVAL ; +if (copy_from_user (&unmap, (void __user *)arg, minsz)) +return -EFAULT ; -if (unmap.flags &VFIO_DMA_UNMAP_FLAG_GET_DIRTY_BITMAP ) { -unsigned long pgshift; +if (unmap.argsz < minsz || + unmap.flags & ~VFIO_DMA_UNMAP_FLAG_GET_DIRTY_BITMAP ) +return -EINVAL ; -if (unmap.argsz < (minsz +sizeof (bitmap))) -return -EINVAL ; +if (unmap.flags &VFIO_DMA_UNMAP_FLAG_GET_DIRTY_BITMAP ) { +unsigned long pgshift; -if (copy_from_user (&bitmap, - (void __user *)(arg + minsz), -sizeof (bitmap))) -return -EFAULT ; +if (unmap.argsz < (minsz +sizeof (bitmap))) +return -EINVAL ; -if (!access_ok ((void __user *)bitmap.data, bitmap.size)) -return -EINVAL ; +if (copy_from_user (&bitmap, + (void __user *)(arg + minsz), +sizeof (bitmap))) +return -EFAULT ; - pgshift =__ffs (bitmap.pgsize); - ret =verify_bitmap_size (unmap.size >> pgshift, - bitmap.size); -if (ret) -return ret; - } +if (!access_ok ((void __user *)bitmap.data, bitmap.size)) +return -EINVAL ; - ret =vfio_dma_do_unmap (iommu, &unmap, &bitmap); + pgshift =__ffs (bitmap.pgsize); + ret =verify_bitmap_size (unmap.size >> pgshift, + bitmap.size);if (ret)return ret; + } + + ret =vfio_dma_do_unmap (iommu, &unmap, &bitmap); +if (ret) +return ret; -return copy_to_user ((void __user *)arg, &unmap, minsz) ? +return copy_to_user ((void __user *)arg, &unmap, minsz) ? -EFAULT :0 ; - }else if (cmd ==VFIO_IOMMU_DIRTY_PAGES ) { -struct vfio_iommu_type1_dirty_bitmap dirty; -uint32_t mask =VFIO_IOMMU_DIRTY_PAGES_FLAG_START | -VFIO_IOMMU_DIRTY_PAGES_FLAG_STOP | -VFIO_IOMMU_DIRTY_PAGES_FLAG_GET_BITMAP ; -int ret =0 ; +} -if (!iommu->v2) -return -EACCES ; +static int vfio_iommu_type1_dirty_pages (struct vfio_iommu *iommu, +unsigned long arg) +{ +struct vfio_iommu_type1_dirty_bitmap dirty; +uint32_t mask =VFIO_IOMMU_DIRTY_PAGES_FLAG_START | +VFIO_IOMMU_DIRTY_PAGES_FLAG_STOP | +VFIO_IOMMU_DIRTY_PAGES_FLAG_GET_BITMAP ; +unsigned long minsz; +int ret =0 ; - minsz = offsetofend(struct vfio_iommu_type1_dirty_bitmap, - flags); +if (!iommu->v2) +return -EACCES ;Quoted 5 lines
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_migration_build_caps(struct vfio_iommu *iommu, · line 2691
Quoted 4 lines
drivers/vfio/vfio_iommu_type1.c +2
-2-if (copy_from_user (&dirty, (void __user *)arg, minsz)) -return -EFAULT ; + minsz = offsetofend(struct vfio_iommu_type1_dirty_bitmap, + flags);single line?
got it.
Quoted 30 lines
Quoted 30 lines
drivers/vfio/vfio_iommu_type1.c +24
-4-if (dirty.argsz < minsz || dirty.flags & ~mask) -return -EINVAL ; +if (copy_from_user (&dirty, (void __user *)arg, minsz)) +return -EFAULT ; + +if (dirty.argsz < minsz || dirty.flags & ~mask) +return -EINVAL ; + +/* only one flag should be set at a time */ +if (__ffs (dirty.flags) !=__fls (dirty.flags)) +return -EINVAL ; + +if (dirty.flags &VFIO_IOMMU_DIRTY_PAGES_FLAG_START ) { +size_t pgsize; -/* only one flag should be set at a time */ -if (__ffs (dirty.flags) !=__fls (dirty.flags)) +mutex_lock (&iommu->lock); + pgsize =1 <<__ffs (iommu->pgsize_bitmap); +if (!iommu->dirty_page_tracking) { + ret =vfio_dma_bitmap_alloc_all (iommu, pgsize); +if (!ret) + iommu->dirty_page_tracking = true; + } +mutex_unlock (&iommu->lock); +return ret; + }else if (dirty.flags &VFIO_IOMMU_DIRTY_PAGES_FLAG_STOP ) { +mutex_lock (&iommu->lock); +if (iommu->dirty_page_tracking) {Quoted 8 lines
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_migration_build_caps(struct vfio_iommu *iommu, · line 2724
Quoted 7 lines
drivers/vfio/vfio_iommu_type1.c +7
-0+ iommu->dirty_page_tracking = false; +vfio_dma_bitmap_free_all (iommu); + } +mutex_unlock (&iommu->lock); +return 0 ; + }else if (dirty.flags & +VFIO_IOMMU_DIRTY_PAGES_FLAG_GET_BITMAP ) {single line?
yep.
Quoted 37 lines
Quoted 37 lines
drivers/vfio/vfio_iommu_type1.c +19
-14+struct vfio_iommu_type1_dirty_bitmap_get range; +unsigned long pgshift; +size_t data_size = dirty.argsz - minsz; +size_t iommu_pgsize; + +if (!data_size || data_size <sizeof (range))return -EINVAL ; -if (dirty.flags &VFIO_IOMMU_DIRTY_PAGES_FLAG_START ) { -size_t pgsize; +if (copy_from_user (&range, (void __user *)(arg + minsz), +sizeof (range))) +return -EFAULT ; -mutex_lock (&iommu->lock); - pgsize =1 <<__ffs (iommu->pgsize_bitmap); -if (!iommu->dirty_page_tracking) { - ret =vfio_dma_bitmap_alloc_all (iommu, pgsize); -if (!ret) - iommu->dirty_page_tracking = true; - } -mutex_unlock (&iommu->lock); +if (range.iova + range.size < range.iova) +return -EINVAL ; +if (!access_ok ((void __user *)range.bitmap.data, + range.bitmap.size)) +return -EINVAL ; + + pgshift =__ffs (range.bitmap.pgsize); + ret =verify_bitmap_size (range.size >> pgshift, + range.bitmap.size); +if (ret)return ret; - }else if (dirty.flags &VFIO_IOMMU_DIRTY_PAGES_FLAG_STOP ) { -mutex_lock (&iommu->lock); -if (iommu->dirty_page_tracking) { - iommu->dirty_page_tracking = false;Quoted 8 lines
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_migration_build_caps(struct vfio_iommu *iommu,
Quoted 6 lines
drivers/vfio/vfio_iommu_type1.c +0
-6-vfio_dma_bitmap_free_all (iommu); - } -mutex_unlock (&iommu->lock); -return 0 ; - }else if (dirty.flags & -VFIO_IOMMU_DIRTY_PAGES_FLAG_GET_BITMAP ){
idemwell received. :-)
Quoted 89 lines
Quoted 89 lines
drivers/vfio/vfio_iommu_type1.c +36
-46-struct vfio_iommu_type1_dirty_bitmap_get range; -unsigned long pgshift; -size_t data_size = dirty.argsz - minsz; -size_t iommu_pgsize; - -if (!data_size || data_size <sizeof (range)) -return -EINVAL ; - -if (copy_from_user (&range, (void __user *)(arg + minsz), -sizeof (range))) -return -EFAULT ; -if (range.iova + range.size < range.iova) -return -EINVAL ; -if (!access_ok ((void __user *)range.bitmap.data, - range.bitmap.size)) -return -EINVAL ; +mutex_lock (&iommu->lock); - pgshift =__ffs (range.bitmap.pgsize); - ret =verify_bitmap_size (range.size >> pgshift, - range.bitmap.size); -if (ret) -return ret; + iommu_pgsize = (size_t )1 <<__ffs (iommu->pgsize_bitmap); -mutex_lock (&iommu->lock); +/* allow only smallest supported pgsize */ +if (range.bitmap.pgsize != iommu_pgsize) { + ret = -EINVAL ; + goto out_unlock; + } +if (range.iova & (iommu_pgsize -1 )) { + ret = -EINVAL ; + goto out_unlock; + } +if (!range.size || range.size & (iommu_pgsize -1 )) { + ret = -EINVAL ; + goto out_unlock; + } - iommu_pgsize = (size_t )1 <<__ffs (iommu->pgsize_bitmap); +if (iommu->dirty_page_tracking) + ret =vfio_iova_dirty_bitmap (range.bitmap.data, + iommu, range.iova, range.size, + range.bitmap.pgsize); +else + ret = -EINVAL ; +out_unlock: +mutex_unlock (&iommu->lock); -/* allow only smallest supported pgsize */ -if (range.bitmap.pgsize != iommu_pgsize) { - ret = -EINVAL ; - goto out_unlock; - } -if (range.iova & (iommu_pgsize -1 )) { - ret = -EINVAL ; - goto out_unlock; - } -if (!range.size || range.size & (iommu_pgsize -1 )) { - ret = -EINVAL ; - goto out_unlock; - } +return ret; + } -if (iommu->dirty_page_tracking) - ret =vfio_iova_dirty_bitmap (range.bitmap.data, - iommu, range.iova, range.size, - range.bitmap.pgsize); -else - ret = -EINVAL ; -out_unlock: -mutex_unlock (&iommu->lock); +return -EINVAL ; +} -return ret; - } +static long vfio_iommu_type1_ioctl (void *iommu_data, +unsigned int cmd,unsigned long arg) { +struct vfio_iommu *iommu = iommu_data; + +switch (cmd) { +case VFIO_CHECK_EXTENSION : +return vfio_iommu_type1_check_extension (iommu, arg); +case VFIO_IOMMU_GET_INFO : +return vfio_iommu_type1_get_info (iommu, arg);Quoted 8 lines
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_migration_build_caps(struct vfio_iommu *iommu, · line 2797
Quoted 6 lines
drivers/vfio/vfio_iommu_type1.c +6
-0+case VFIO_IOMMU_MAP_DMA : +return vfio_iommu_type1_map_dma (iommu, arg); +case VFIO_IOMMU_UNMAP_DMA : +return vfio_iommu_type1_unmap_dma (iommu, arg); +case VFIO_IOMMU_DIRTY_PAGES : +return vfio_iommu_type1_dirty_pages (iommu, arg);default:
return-ENOTTY; ?got it.
Quoted 7 lines
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_migration_build_caps(struct vfio_iommu *iommu, · line 2800
Quoted 4 lines
drivers/vfio/vfio_iommu_type1.c +0
-0}return -ENOTTY ;Besides
Reviewed-by Eric Auger <[email protected]>thanks.
Regards,
Yi LiuQuoted 3 lines
Thanks
Eric
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v4 2/15 iommu: Report domain nesting info
In reply to Liu Yi LIOMMUs that support nesting translation needs report the capability info to userspace, e.g. the format of first level/stage paging structures.
This patch reports nesting info by DOMAIN_ATTR_NESTING. Caller can get nesting info after setting DOMAIN_ATTR_NESTING.
---
v3 -> v4:
*) split the SMMU driver changes to be a separate patch *) move the @addr_width and @pasid_bits from vendor specific
part to generic part.
*) tweak the description for the @features field of struct
iommu_nesting_info.
*) add description on the @data[] field of struct iommu_nesting_info
v2 -> v3:
*) remvoe cap/ecap_mask in iommu_nesting_info.
*) reuse DOMAIN_ATTR_NESTING to get nesting info.
*) return an empty iommu_nesting_info for SMMU drivers per Jean'
suggestion.
--- include/uapi/linux/iommu.h | 78 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+)
include/uapi/linux/iommu.h +78 -0
@@ -332,4 +332,82 @@ struct iommu_gpasid_bind_data { } vendor; }; +/* +* struct iommu_nesting_info - Information for nesting-capable IOMMU. +* user space should check it before using +* nesting capability. +* +* @size: size of the whole structure +* @format: PASID table entry format, the same definition with +* @format of struct iommu_gpasid_bind_data. +* @features: supported nesting features. +* @flags: currently reserved for future extension. +* @addr_width: The output addr width of first level/stage translation +* @pasid_bits: Maximum supported PASID bits, 0 represents no PASID +* support. +* @data: vendor specific cap info. data[] structure type can be deduced +* from @format field. +* +* +===============+======================================================+ +* | feature | Notes | +* +===============+======================================================+ +* | SYSWIDE_PASID | PASIDs are managed in system-wide, instead of per | +* | | device. When a device is assigned to userspace or | +* | | VM, proper uAPI (userspace driver framework uAPI, | +* | | e.g. VFIO) must be used to allocate/free PASIDs for | +* | | the assigned device. | +* +---------------+------------------------------------------------------+ +* | BIND_PGTBL | The owner of the first level/stage page table must | +* | | explicitly bind the page table to associated PASID | +* | | (either the one specified in bind request or the | +* | | default PASID of iommu domain), through userspace | +* | | driver framework uAPI (e.g. VFIO_IOMMU_NESTING_OP). | +* +---------------+------------------------------------------------------+ +* | CACHE_INVLD | The owner of the first level/stage page table must | +* | | explicitly invalidate the IOMMU cache through uAPI | +* | | provided by userspace driver framework (e.g. VFIO) | +* | | according to vendor-specific requirement when | +* | | changing the page table. | +* +---------------+------------------------------------------------------+ +* +* @data[] types defined for @format: +* +================================+=====================================+ +* | @format | @data[] | +* +================================+=====================================+ +* | IOMMU_PASID_FORMAT_INTEL_VTD | struct iommu_nesting_info_vtd | +* +--------------------------------+-------------------------------------+ +* +*/ +struct iommu_nesting_info { +__u32 size; +__u32 format; +__u32 features; +#define IOMMU_NESTING_FEAT_SYSWIDE_PASID (1 << 0) +#define IOMMU_NESTING_FEAT_BIND_PGTBL (1 << 1) +#define IOMMU_NESTING_FEAT_CACHE_INVLD (1 << 2) +__u32 flags; +__u16 addr_width; +__u16 pasid_bits; +__u32 padding; +__u8 data[]; +}; + +/* +* struct iommu_nesting_info_vtd - Intel VT-d specific nesting info +* +* +* @flags: VT-d specific flags. Currently reserved for future +* extension. +* @cap_reg: Describe basic capabilities as defined in VT-d capability +* register. +* @ecap_reg: Describe the extended capabilities as defined in VT-d +* extended capability register. +*/ +struct iommu_nesting_info_vtd { +__u32 flags; +__u32 padding; +__u64 cap_reg; +__u64 ecap_reg; +}; +#endif /* _UAPI_IOMMU_H */
Signature · 6 lines
2.7.4 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v4 02/15] iommu: Report domain nesting info
Quoted 1 line · Liu Yi L
IOMMUs that support nesting translation needs report the capability info
need to report
Quoted 37 lines
to userspace, e.g. the format of first level/stage paging structures.
This patch reports nesting info by
DOMAIN_ATTR_NESTING. Caller can get nesting info after settingDOMAIN_ATTR_NESTING.Cc Kevin Tian <[email protected]>CC Jacob Pan <[email protected]>Cc Alex Williamson <[email protected]>Cc Eric Auger <[email protected]>Cc Jean-Philippe Brucker <[email protected]>Cc Joerg Roedel <[email protected]>Cc Lu Baolu <[email protected]>Signed-off-by Liu Yi L <[email protected]>Signed-off-by Jacob Pan <[email protected]>---
v3 -> v4:
*) split the SMMU driver changes to be a separate patch *) move the @addr_width and @pasid_bits from vendor specific
part to generic part.
*) tweak the description for the @features field of struct
iommu_nesting_info.
*) add description on the @data[] field of structiommu_nesting_infov2 -> v3:
*) remvoe cap/ecap_mask iniommu_nesting_info.
*) reuseDOMAIN_ATTR_NESTINGto get nesting info.
*) return an emptyiommu_nesting_infofor SMMU drivers per Jean'
suggestion.--- include/uapi/linux/iommu.h | 78 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+)include/uapi/linux/iommu.h +0
-0
include/uapi/linux/iommu.h struct iommu_gpasid_bind_data { · line 338
Quoted 7 lines
include/uapi/linux/iommu.h +4
-0@@ -332,4 +332,82 @@ struct iommu_gpasid_bind_data { } vendor; }; +/* +* struct iommu_nesting_info - Information for nesting-capable IOMMU. +* user space should check it before using +* nesting capability.
alignment?
include/uapi/linux/iommu.h struct iommu_gpasid_bind_data { · line 342
Quoted 4 lines
include/uapi/linux/iommu.h +4
-0+* +* @size: size of the whole structure +* @format: PASID table entry format, the same definition with +* @format of struct iommu_gpasid_bind_data.
the same definition as struct iommu_gpasid_bind_data @format?
Quoted 19 lines
include/uapi/linux/iommu.h +19
-0+* @features: supported nesting features. +* @flags: currently reserved for future extension. +* @addr_width: The output addr width of first level/stage translation +* @pasid_bits: Maximum supported PASID bits, 0 represents no PASID +* support. +* @data: vendor specific cap info. data[] structure type can be deduced +* from @format field. +* +* +===============+======================================================+ +* | feature | Notes | +* +===============+======================================================+ +* | SYSWIDE_PASID | PASIDs are managed in system-wide, instead of per | +* | | device. When a device is assigned to userspace or | +* | | VM, proper uAPI (userspace driver framework uAPI, | +* | | e.g. VFIO) must be used to allocate/free PASIDs for | +* | | the assigned device. | +* +---------------+------------------------------------------------------+ +* | BIND_PGTBL | The owner of the first level/stage page table must | +* | | explicitly bind the page table to associated PASID |
include/uapi/linux/iommu.h struct iommu_gpasid_bind_data { · line 371
Quoted 10 lines
include/uapi/linux/iommu.h +10
-0+* | | (either the one specified in bind request or the | +* | | default PASID of iommu domain), through userspace | +* | | driver framework uAPI (e.g. VFIO_IOMMU_NESTING_OP). | +* +---------------+------------------------------------------------------+ +* | CACHE_INVLD | The owner of the first level/stage page table must | +* | | explicitly invalidate the IOMMU cache through uAPI | +* | | provided by userspace driver framework (e.g. VFIO) | +* | | according to vendor-specific requirement when | +* | | changing the page table. | +* +---------------+------------------------------------------------------+
Do you foresee cases where BIND_PGTBL and CACHE_INVLD shouldn't be exposed as features?
Quoted 6 lines
include/uapi/linux/iommu.h +6
-0+* +* @data[] types defined for @format: +* +================================+=====================================+ +* | @format | @data[] | +* +================================+=====================================+ +* | IOMMU_PASID_FORMAT_INTEL_VTD | struct iommu_nesting_info_vtd |
include/uapi/linux/iommu.h struct iommu_gpasid_bind_data { · line 387
Quoted 10 lines
include/uapi/linux/iommu.h +10
-0+* +--------------------------------+-------------------------------------+ +* +*/ +struct iommu_nesting_info { +__u32 size; +__u32 format; +__u32 features; +#define IOMMU_NESTING_FEAT_SYSWIDE_PASID (1 << 0) +#define IOMMU_NESTING_FEAT_BIND_PGTBL (1 << 1) +#define IOMMU_NESTING_FEAT_CACHE_INVLD (1 << 2)
In other structs the values seem to be defined before the field
include/uapi/linux/iommu.h struct iommu_gpasid_bind_data { · line 397
Quoted 10 lines
include/uapi/linux/iommu.h +10
-0+__u32 flags; +__u16 addr_width; +__u16 pasid_bits; +__u32 padding; +__u8 data[]; +}; + +/* +* struct iommu_nesting_info_vtd - Intel VT-d specific nesting info +*
spurious line
Quoted 7 lines
include/uapi/linux/iommu.h +6
-0+* +* @flags: VT-d specific flags. Currently reserved for future +* extension. +* @cap_reg: Describe basic capabilities as defined in VT-d capability +* register. +* @ecap_reg: Describe the extended capabilities as defined in VT-d
include/uapi/linux/iommu.h struct iommu_gpasid_bind_data { · line 413
Quoted 10 lines
include/uapi/linux/iommu.h +9
-0+* extended capability register. +*/ +struct iommu_nesting_info_vtd { +__u32 flags; +__u32 padding; +__u64 cap_reg; +__u64 ecap_reg; +}; +#endif /* _UAPI_IOMMU_H */
Thanks
Eric
RE: [PATCH v4 02/15] iommu: Report domain nesting info
Hi Eric,
Quoted 47 lines
From: Auger Eric <[email protected]>
Sent: Monday, July 6, 2020 5:34 PMQuoted 1 line · Liu Yi L
IOMMUs that support nesting translation needs report the capability info
need to report
Quoted 23 lines
to userspace, e.g. the format of first level/stage paging structures.
This patch reports nesting info by
DOMAIN_ATTR_NESTING. Caller can get nesting info after settingDOMAIN_ATTR_NESTING.Cc Kevin Tian <[email protected]>CC Jacob Pan <[email protected]>Cc Alex Williamson <[email protected]>Cc Eric Auger <[email protected]>Cc Jean-Philippe Brucker <[email protected]>Cc Joerg Roedel <[email protected]>Cc Lu Baolu <[email protected]>Signed-off-by Liu Yi L <[email protected]>Signed-off-by Jacob Pan <[email protected]>---
v3 -> v4:
*) split the SMMU driver changes to be a separate patch *) move the @addr_width and @pasid_bits from vendor specific
part to generic part.
*) tweak the description for the @features field of struct
iommu_nesting_info.
*) add description on the @data[] field of structiommu_nesting_infoQuoted 7 lines
v2 -> v3:
*) remvoe cap/ecap_mask iniommu_nesting_info.
*) reuseDOMAIN_ATTR_NESTINGto get nesting info.
*) return an emptyiommu_nesting_infofor SMMU drivers per Jean'
suggestion.--- include/uapi/linux/iommu.h | 78++++++++++++++++++++++++++++++++++++++++++++++
Quoted 10 lines
1 file changed, 78 insertions(+)include/uapi/linux/iommu.h +0
-0@@ -332,4 +332,82 @@ struct iommu_gpasid_bind_data { } vendor; };
Quoted 5 lines
include/uapi/linux/iommu.h struct iommu_gpasid_bind_data { · line 338
Quoted 4 lines
include/uapi/linux/iommu.h +4
-0+/* +* struct iommu_nesting_info - Information for nesting-capable IOMMU. +* user space should check it before using +* nesting capability. alignment?
oh, yes, will do it.
Quoted 5 lines
include/uapi/linux/iommu.h struct iommu_gpasid_bind_data { · line 342
Quoted 4 lines
include/uapi/linux/iommu.h +4
-0+* +* @size: size of the whole structure +* @format: PASID table entry format, the same definition with +* @format of struct iommu_gpasid_bind_data. the same definition as struct
iommu_gpasid_bind_data@format?
right. yours is much better.
Quoted 33 lines
include/uapi/linux/iommu.h struct iommu_gpasid_bind_data { · line 372
Quoted 9 lines
include/uapi/linux/iommu.h +9
-0+* @features: supported nesting features. +* @flags: currently reserved for future extension. +* @addr_width: The output addr width of first level/stage translation +* @pasid_bits: Maximum supported PASID bits, 0 represents no PASID +* support. +* @data: vendor specific cap info. data[] structure type can be deduced +* from @format field. +* +* +===============+===================================================
===+include/uapi/linux/iommu.h struct iommu_gpasid_bind_data { · line 353
Quoted 2 lines
include/uapi/linux/iommu.h +2
-0+* | feature | Notes | +* +===============+===================================================
===+Quoted 8 lines
include/uapi/linux/iommu.h +8
-0+* | SYSWIDE_PASID | PASIDs are managed in system-wide, instead of per | +* | | device. When a device is assigned to userspace or | +* | | VM, proper uAPI (userspace driver framework uAPI, | +* | | e.g. VFIO) must be used to allocate/free PASIDs for | +* | | the assigned device. | +* +---------------+------------------------------------------------------+ +* | BIND_PGTBL | The owner of the first level/stage page table must | +* | | explicitly bind the page table to associated PASID | include/uapi/linux/iommu.h struct iommu_gpasid_bind_data { · line 371
Quoted 10 lines
include/uapi/linux/iommu.h +10
-0+* | | (either the one specified in bind request or the | +* | | default PASID of iommu domain), through userspace | +* | | driver framework uAPI (e.g. VFIO_IOMMU_NESTING_OP). | +* +---------------+------------------------------------------------------+ +* | CACHE_INVLD | The owner of the first level/stage page table must | +* | | explicitly invalidate the IOMMU cache through uAPI | +* | | provided by userspace driver framework (e.g. VFIO) | +* | | according to vendor-specific requirement when | +* | | changing the page table. | +* +---------------+------------------------------------------------------+
Quoted 2 lines
Do you foresee cases where
BIND_PGTBLandCACHE_INVLDshouldn't be exposed as features?
sorry, I didn't quite get it. could you explain a little bit more. :-)
Quoted 9 lines
include/uapi/linux/iommu.h struct iommu_gpasid_bind_data { · line 379
Quoted 3 lines
include/uapi/linux/iommu.h +3
-0+* +* @data[] types defined for @format: +* +================================+==================================
===+include/uapi/linux/iommu.h struct iommu_gpasid_bind_data { · line 376
Quoted 2 lines
include/uapi/linux/iommu.h +2
-0+* | @format | @data[] | +* +================================+==================================
===+
Quoted 12 lines
include/uapi/linux/iommu.h struct iommu_gpasid_bind_data { · line 387
Quoted 11 lines
include/uapi/linux/iommu.h +11
-0+* | IOMMU_PASID_FORMAT_INTEL_VTD | struct iommu_nesting_info_vtd | +* +--------------------------------+-------------------------------------+ +* +*/ +struct iommu_nesting_info { +__u32 size; +__u32 format; +__u32 features; +#define IOMMU_NESTING_FEAT_SYSWIDE_PASID (1 << 0) +#define IOMMU_NESTING_FEAT_BIND_PGTBL (1 << 1) +#define IOMMU_NESTING_FEAT_CACHE_INVLD (1 << 2)In other structs the values seem to be defined before the field
not sure. :-) I mimics the below struct from uapi/vfio.h
struct vfio_iommu_type1_dma_map {
__u32 argsz;
__u32 flags;
#define VFIO_DMA_MAP_FLAG_READ (1 << 0) /* readable from device */
#define VFIO_DMA_MAP_FLAG_WRITE (1 << 1) /* writable from device */
__u64 vaddr; /* Process virtual address */
__u64 iova; /* IO virtual address */
__u64 size; /* Size of mapping (bytes) */};
Quoted 11 lines
include/uapi/linux/iommu.h struct iommu_gpasid_bind_data { · line 397
Quoted 10 lines
include/uapi/linux/iommu.h +10
-0+__u32 flags; +__u16 addr_width; +__u16 pasid_bits; +__u32 padding; +__u8 data[]; +}; + +/* +* struct iommu_nesting_info_vtd - Intel VT-d specific nesting info +* spurious line
yes, will remove this line.
Regards,
Yi Liu
Quoted 19 lines
Quoted 7 lines
include/uapi/linux/iommu.h +6
-0+* +* @flags: VT-d specific flags. Currently reserved for future +* extension. +* @cap_reg: Describe basic capabilities as defined in VT-d capability +* register. +* @ecap_reg: Describe the extended capabilities as defined in VT-d include/uapi/linux/iommu.h struct iommu_gpasid_bind_data { · line 413
Quoted 10 lines
include/uapi/linux/iommu.h +9
-0+* extended capability register. +*/ +struct iommu_nesting_info_vtd { +__u32 flags; +__u32 padding; +__u64 cap_reg; +__u64 ecap_reg; +}; +#endif /* _UAPI_IOMMU_H */ Thanks
Quoted 1 line
Eric
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v4 02/15] iommu: Report domain nesting info
Quoted 98 lines · Yi L
Hi Eric,
Quoted 47 lines
From: Auger Eric <[email protected]>
Sent: Monday, July 6, 2020 5:34 PMQuoted 1 line · Liu Yi L
IOMMUs that support nesting translation needs report the capability info
need to report
Quoted 23 lines
to userspace, e.g. the format of first level/stage paging structures.
This patch reports nesting info by
DOMAIN_ATTR_NESTING. Caller can get nesting info after settingDOMAIN_ATTR_NESTING.Cc Kevin Tian <[email protected]>CC Jacob Pan <[email protected]>Cc Alex Williamson <[email protected]>Cc Eric Auger <[email protected]>Cc Jean-Philippe Brucker <[email protected]>Cc Joerg Roedel <[email protected]>Cc Lu Baolu <[email protected]>Signed-off-by Liu Yi L <[email protected]>Signed-off-by Jacob Pan <[email protected]>---
v3 -> v4:
*) split the SMMU driver changes to be a separate patch *) move the @addr_width and @pasid_bits from vendor specific
part to generic part.
*) tweak the description for the @features field of struct
iommu_nesting_info.
*) add description on the @data[] field of structiommu_nesting_infoQuoted 7 lines
v2 -> v3:
*) remvoe cap/ecap_mask iniommu_nesting_info.
*) reuseDOMAIN_ATTR_NESTINGto get nesting info.
*) return an emptyiommu_nesting_infofor SMMU drivers per Jean'
suggestion.--- include/uapi/linux/iommu.h | 78++++++++++++++++++++++++++++++++++++++++++++++
Quoted 10 lines
1 file changed, 78 insertions(+)include/uapi/linux/iommu.h +0
-0@@ -332,4 +332,82 @@ struct iommu_gpasid_bind_data { } vendor; };Quoted 5 lines
include/uapi/linux/iommu.h struct iommu_gpasid_bind_data { · line 338
Quoted 4 lines
include/uapi/linux/iommu.h +4
-0+/* +* struct iommu_nesting_info - Information for nesting-capable IOMMU. +* user space should check it before using +* nesting capability. alignment?
oh, yes, will do it.
Quoted 5 lines
include/uapi/linux/iommu.h struct iommu_gpasid_bind_data { · line 342
Quoted 4 lines
include/uapi/linux/iommu.h +4
-0+* +* @size: size of the whole structure +* @format: PASID table entry format, the same definition with +* @format of struct iommu_gpasid_bind_data. the same definition as struct
iommu_gpasid_bind_data@format?right. yours is much better.
Quoted 33 lines
include/uapi/linux/iommu.h struct iommu_gpasid_bind_data { · line 372
Quoted 9 lines
include/uapi/linux/iommu.h +9
-0+* @features: supported nesting features. +* @flags: currently reserved for future extension. +* @addr_width: The output addr width of first level/stage translation +* @pasid_bits: Maximum supported PASID bits, 0 represents no PASID +* support. +* @data: vendor specific cap info. data[] structure type can be deduced +* from @format field. +* +* +===============+===================================================
===+include/uapi/linux/iommu.h struct iommu_gpasid_bind_data { · line 353
Quoted 2 lines
include/uapi/linux/iommu.h +2
-0+* | feature | Notes | +* +===============+===================================================
===+Quoted 18 lines
include/uapi/linux/iommu.h +18
-0+* | SYSWIDE_PASID | PASIDs are managed in system-wide, instead of per | +* | | device. When a device is assigned to userspace or | +* | | VM, proper uAPI (userspace driver framework uAPI, | +* | | e.g. VFIO) must be used to allocate/free PASIDs for | +* | | the assigned device. | +* +---------------+------------------------------------------------------+ +* | BIND_PGTBL | The owner of the first level/stage page table must | +* | | explicitly bind the page table to associated PASID | +* | | (either the one specified in bind request or the | +* | | default PASID of iommu domain), through userspace | +* | | driver framework uAPI (e.g. VFIO_IOMMU_NESTING_OP). | +* +---------------+------------------------------------------------------+ +* | CACHE_INVLD | The owner of the first level/stage page table must | +* | | explicitly invalidate the IOMMU cache through uAPI | +* | | provided by userspace driver framework (e.g. VFIO) | +* | | according to vendor-specific requirement when | +* | | changing the page table. | +* +---------------+------------------------------------------------------+
Quoted 4 lines
Quoted 2 lines
Do you foresee cases where
BIND_PGTBLandCACHE_INVLDshouldn't be exposed as features?sorry, I didn't quite get it. could you explain a little bit more. :-)
For SYSWIDE_PASID I understand SMMU won't advertise it. But do you foresee any nested implementation not requesting the owner of the tables to bind and invalidate caches. So I understand those 2 features would always be supported?
Quoted 23 lines
Quoted 10 lines
include/uapi/linux/iommu.h struct iommu_gpasid_bind_data { · line 379
Quoted 4 lines
include/uapi/linux/iommu.h +3
-0+* +* @data[] types defined for @format: +* +================================+==================================
===+include/uapi/linux/iommu.h struct iommu_gpasid_bind_data { · line 376
Quoted 2 lines
include/uapi/linux/iommu.h +2
-0+* | @format | @data[] | +* +================================+==================================
===+Quoted 12 lines
include/uapi/linux/iommu.h struct iommu_gpasid_bind_data { · line 387
Quoted 11 lines
include/uapi/linux/iommu.h +11
-0+* | IOMMU_PASID_FORMAT_INTEL_VTD | struct iommu_nesting_info_vtd | +* +--------------------------------+-------------------------------------+ +* +*/ +struct iommu_nesting_info { +__u32 size; +__u32 format; +__u32 features; +#define IOMMU_NESTING_FEAT_SYSWIDE_PASID (1 << 0) +#define IOMMU_NESTING_FEAT_BIND_PGTBL (1 << 1) +#define IOMMU_NESTING_FEAT_CACHE_INVLD (1 << 2)In other structs the values seem to be defined before the field
Quoted 1 line
not sure. :-) I mimics the below struct from
uapi/vfio.h
Yep I noticed that afterwards. In IOMMU uapi it looks the opposite though. So I would alignto the style in the same file but that's not a big deal.
Quoted 23 lines
struct vfio_iommu_type1_dma_map { __u32 argsz; __u32 flags; #define VFIO_DMA_MAP_FLAG_READ (1 << 0) /* readable from device */ #define VFIO_DMA_MAP_FLAG_WRITE (1 << 1) /* writable from device */ __u64 vaddr; /* Process virtual address */ __u64 iova; /* IO virtual address */ __u64 size; /* Size of mapping (bytes) */};
Quoted 11 lines
include/uapi/linux/iommu.h struct iommu_gpasid_bind_data { · line 397
Quoted 10 lines
include/uapi/linux/iommu.h +10
-0+__u32 flags; +__u16 addr_width; +__u16 pasid_bits; +__u32 padding; +__u8 data[]; +}; + +/* +* struct iommu_nesting_info_vtd - Intel VT-d specific nesting info +* spurious line
Quoted 26 lines
yes, will remove this line.
Regards,
Yi LiuQuoted 20 lines
Quoted 7 lines
include/uapi/linux/iommu.h +6
-0+* +* @flags: VT-d specific flags. Currently reserved for future +* extension. +* @cap_reg: Describe basic capabilities as defined in VT-d capability +* register. +* @ecap_reg: Describe the extended capabilities as defined in VT-d include/uapi/linux/iommu.h struct iommu_gpasid_bind_data { · line 413
Quoted 10 lines
include/uapi/linux/iommu.h +9
-0+* extended capability register. +*/ +struct iommu_nesting_info_vtd { +__u32 flags; +__u32 padding; +__u64 cap_reg; +__u64 ecap_reg; +}; +#endif /* _UAPI_IOMMU_H */ Thanks
Eric
Thanks
Eric
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
RE: [PATCH v4 02/15] iommu: Report domain nesting info
Quoted 107 lines
From: Auger Eric <[email protected]>
Sent: Monday, July 6, 2020 9:01 PMQuoted 58 lines · Yi L
Hi Eric,
Quoted 48 lines
From: Auger Eric <[email protected]>
Sent: Monday, July 6, 2020 5:34 PMQuoted 2 lines · Liu Yi L
IOMMUs that support nesting translation needs report the capability info
need to report
Quoted 23 lines
to userspace, e.g. the format of first level/stage paging structures.
This patch reports nesting info by
DOMAIN_ATTR_NESTING. Caller can get nesting info after settingDOMAIN_ATTR_NESTING.Cc Kevin Tian <[email protected]>CC Jacob Pan <[email protected]>Cc Alex Williamson <[email protected]>Cc Eric Auger <[email protected]>Cc Jean-Philippe Brucker <[email protected]>Cc Joerg Roedel <[email protected]>Cc Lu Baolu <[email protected]>Signed-off-by Liu Yi L <[email protected]>Signed-off-by Jacob Pan <[email protected]>---
v3 -> v4:
*) split the SMMU driver changes to be a separate patch *) move the @addr_width and @pasid_bits from vendor specific
part to generic part.
*) tweak the description for the @features field of struct
iommu_nesting_info.
*) add description on the @data[] field of structiommu_nesting_infoQuoted 7 lines
v2 -> v3:
*) remvoe cap/ecap_mask iniommu_nesting_info.
*) reuseDOMAIN_ATTR_NESTINGto get nesting info.
*) return an emptyiommu_nesting_infofor SMMU drivers per Jean'
suggestion.--- include/uapi/linux/iommu.h | 78++++++++++++++++++++++++++++++++++++++++++++++
Quoted 10 lines
1 file changed, 78 insertions(+)include/uapi/linux/iommu.h +0
-0@@ -332,4 +332,82 @@ struct iommu_gpasid_bind_data { } vendor; };Quoted 5 lines
include/uapi/linux/iommu.h struct iommu_gpasid_bind_data { · line 338
Quoted 4 lines
include/uapi/linux/iommu.h +4
-0+/* +* struct iommu_nesting_info - Information for nesting-capable IOMMU. +* user space should check it before using +* nesting capability. alignment?
oh, yes, will do it.
Quoted 18 lines
Quoted 5 lines
include/uapi/linux/iommu.h struct iommu_gpasid_bind_data { · line 342
Quoted 4 lines
include/uapi/linux/iommu.h +4
-0+* +* @size: size of the whole structure +* @format: PASID table entry format, the same definition with +* @format of struct iommu_gpasid_bind_data. the same definition as struct
iommu_gpasid_bind_data@format?right. yours is much better.
Quoted 10 lines
Quoted 9 lines
include/uapi/linux/iommu.h +9
-0+* @features: supported nesting features. +* @flags: currently reserved for future extension. +* @addr_width: The output addr width of first level/stage translation +* @pasid_bits: Maximum supported PASID bits, 0 represents no PASID +* support. +* @data: vendor specific cap info. data[] structure type can be deduced +* from @format field. +* +* +===============+===================================================
Quoted 4 lines
Quoted 4 lines
===+
Quoted 2 lines
include/uapi/linux/iommu.h +2
-0+* | feature | Notes | +* +===============+===================================================
Quoted 21 lines
Quoted 21 lines
===+
Quoted 20 lines
include/uapi/linux/iommu.h +20
-0+* | SYSWIDE_PASID | PASIDs are managed in system-wide, instead of per | +* | | device. When a device is assigned to userspace or | +* | | VM, proper uAPI (userspace driver framework uAPI, | +* | | e.g. VFIO) must be used to allocate/free PASIDs for | +* | | the assigned device. | +* +---------------+------------------------------------------------------+ +* | BIND_PGTBL | The owner of the first level/stage page table must | +* | | explicitly bind the page table to associated PASID | +* | | (either the one specified in bind request or the | +* | | default PASID of iommu domain), through userspace | +* | | driver framework uAPI (e.g. VFIO_IOMMU_NESTING_OP). | +* +---------------+------------------------------------------------------+ +* | CACHE_INVLD | The owner of the first level/stage page table must | +* | | explicitly invalidate the IOMMU cache through uAPI | +* | | provided by userspace driver framework (e.g. VFIO) | +* | | according to vendor-specific requirement when | +* | | changing the page table. | +* ++---------------+------------------------------------------------- +-----+
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
Do you foresee cases where
BIND_PGTBLandCACHE_INVLDshouldn't be exposed as features?sorry, I didn't quite get it. could you explain a little bit more. :-)
For
SYSWIDE_PASIDI understand SMMU won't advertise it. But do you foresee any nested implementation not requesting the owner of the tables to bind and invalidate caches. So I understand those 2 features would always be supported?
I think BIND_PGTBL is optional as ARM will bind guest pasid table to host. As for CACHE_INVLD, per current nesting implementations, looks all stage-1/level-1 owner should issue cache invalidation when stage-1/level-1 changed. But still added it here per the comments from Kevin. :-)
"So far this assumption is correct but it may not be true when thinking forward. For example, a vendor might find a way to allow the owner of 1st-level page table to directly invalidate cache w/o going through host IOMMU driver. From this angle I feel explicitly reporting this capability is more robust."
Regards,
Yi Liu
Quoted 28 lines
Quoted 5 lines
Quoted 5 lines
include/uapi/linux/iommu.h struct iommu_gpasid_bind_data { · line 379
Quoted 4 lines
include/uapi/linux/iommu.h +3
-0+* +* @data[] types defined for @format: +* +================================+==================================
Quoted 4 lines
Quoted 4 lines
===+
Quoted 2 lines
include/uapi/linux/iommu.h +2
-0+* | @format | @data[] | +* +================================+==================================
Quoted 2 lines
Quoted 2 lines
===+
Quoted 1 line
include/uapi/linux/iommu.h +1
-0+* | IOMMU_PASID_FORMAT_INTEL_VTD | struct iommu_nesting_info_vtd |
Quoted 14 lines
Quoted 13 lines
include/uapi/linux/iommu.h struct iommu_gpasid_bind_data { · line 387
Quoted 12 lines
include/uapi/linux/iommu.h +12
-0+* ++--------------------------------+--------------------------------- +----+ +* +*/ +struct iommu_nesting_info { +__u32 size; +__u32 format; +__u32 features; +#define IOMMU_NESTING_FEAT_SYSWIDE_PASID (1 << 0) +#define IOMMU_NESTING_FEAT_BIND_PGTBL (1 << 1) +#define IOMMU_NESTING_FEAT_CACHE_INVLD (1 << 2)In other structs the values seem to be defined before the field
Quoted 3 lines
Quoted 1 line
not sure. :-) I mimics the below struct from
uapi/vfio.hYep I noticed that afterwards. In IOMMU uapi it looks the opposite though. So I would alignto the style in the same file but that's not a big deal.
I see, may align with other iommu uapi. :-)
Regards,
Yi Liu
Quoted 47 lines
Quoted 47 lines
struct vfio_iommu_type1_dma_map { __u32 argsz; __u32 flags; #define VFIO_DMA_MAP_FLAG_READ (1 << 0) /* readable from device */ #define VFIO_DMA_MAP_FLAG_WRITE (1 << 1) /* writable from device */ __u64 vaddr; /* Process virtual address */ __u64 iova; /* IO virtual address */ __u64 size; /* Size of mapping (bytes) */};
Quoted 11 lines
include/uapi/linux/iommu.h struct iommu_gpasid_bind_data { · line 397
Quoted 10 lines
include/uapi/linux/iommu.h +10
-0+__u32 flags; +__u16 addr_width; +__u16 pasid_bits; +__u32 padding; +__u8 data[]; +}; + +/* +* struct iommu_nesting_info_vtd - Intel VT-d specific nesting info +* spurious line
yes, will remove this line.
Regards,
Yi LiuQuoted 19 lines
Quoted 7 lines
include/uapi/linux/iommu.h +6
-0+* +* @flags: VT-d specific flags. Currently reserved for future +* extension. +* @cap_reg: Describe basic capabilities as defined in VT-d capability +* register. +* @ecap_reg: Describe the extended capabilities as defined in VT-d include/uapi/linux/iommu.h struct iommu_gpasid_bind_data { · line 413
Quoted 10 lines
include/uapi/linux/iommu.h +9
-0+* extended capability register. +*/ +struct iommu_nesting_info_vtd { +__u32 flags; +__u32 padding; +__u64 cap_reg; +__u64 ecap_reg; +}; +#endif /* _UAPI_IOMMU_H */ Thanks
Quoted 6 lines
Quoted 2 lines
Quoted 1 line
Eric
Thanks
Eric
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v4 3/15 iommu/smmu: Report empty domain nesting info
In reply to Liu Yi L--- drivers/iommu/arm-smmu-v3.c | 29 +++++++++++++++++++++++++++-- drivers/iommu/arm-smmu.c | 29 +++++++++++++++++++++++++++-- 2 files changed, 54 insertions(+), 4 deletions(-)
drivers/iommu/arm-smmu-v3.c +27 -2
@@ -3019,6 +3019,32 @@ static struct iommu_group *arm_smmu_device_group(struct device *dev)return group; } +static int arm_smmu_domain_nesting_info (struct arm_smmu_domain *smmu_domain, +void *data) +{ +struct iommu_nesting_info *info = (struct iommu_nesting_info *) data; +u32 size; + +if (!info || smmu_domain->stage !=ARM_SMMU_DOMAIN_NESTED ) +return -ENODEV ; + + size =sizeof (struct iommu_nesting_info ); + +/* +* if provided buffer size is not equal to the size, should +* return 0 and also the expected buffer size to caller. +*/ +if (info->size != size) { + info->size = size; +return 0 ; + } + +/* report an empty iommu_nesting_info for now */ +memset (info,0x0 , size); + info->size = size; +return 0 ; +} +static int arm_smmu_domain_get_attr (struct iommu_domain *domain,enum iommu_attr attr,void *data) {
@@ -3028,8 +3054,7 @@ static int arm_smmu_domain_get_attr(struct iommu_domain *domain,case IOMMU_DOMAIN_UNMANAGED :switch (attr) {case DOMAIN_ATTR_NESTING : - *(int *)data = (smmu_domain->stage ==ARM_SMMU_DOMAIN_NESTED ); -return 0 ; +return arm_smmu_domain_nesting_info (smmu_domain, data);default :return -ENODEV ; }
drivers/iommu/arm-smmu.c +27 -2
@@ -1506,6 +1506,32 @@ static struct iommu_group *arm_smmu_device_group(struct device *dev)return group; } +static int arm_smmu_domain_nesting_info (struct arm_smmu_domain *smmu_domain, +void *data) +{ +struct iommu_nesting_info *info = (struct iommu_nesting_info *) data; +u32 size; + +if (!info || smmu_domain->stage !=ARM_SMMU_DOMAIN_NESTED ) +return -ENODEV ; + + size =sizeof (struct iommu_nesting_info ); + +/* +* if provided buffer size is not equal to the size, should +* return 0 and also the expected buffer size to caller. +*/ +if (info->size != size) { + info->size = size; +return 0 ; + } + +/* report an empty iommu_nesting_info for now */ +memset (info,0x0 , size); + info->size = size; +return 0 ; +} +static int arm_smmu_domain_get_attr (struct iommu_domain *domain,enum iommu_attr attr,void *data) {
@@ -1515,8 +1541,7 @@ static int arm_smmu_domain_get_attr(struct iommu_domain *domain,case IOMMU_DOMAIN_UNMANAGED :switch (attr) {case DOMAIN_ATTR_NESTING : - *(int *)data = (smmu_domain->stage ==ARM_SMMU_DOMAIN_NESTED ); -return 0 ; +return arm_smmu_domain_nesting_info (smmu_domain, data);default :return -ENODEV ; }
Signature · 6 lines
2.7.4 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v4 03/15] iommu/smmu: Report empty domain nesting info
Hi Yi,
Please add a commit message: instead of returning a boolean for DOMAIN_ATTR_NESTING, arm_smmu_domain_get_attr() returns a iommu_nesting_info handle.
Quoted 26 lines · Liu Yi L
Cc Will Deacon <[email protected]>Cc Robin Murphy <[email protected]>Cc Eric Auger <[email protected]>Cc Jean-Philippe Brucker <[email protected]>Suggested-by Jean-Philippe Brucker <[email protected]>Signed-off-by Liu Yi L <[email protected]>Signed-off-by Jacob Pan <[email protected]>--- drivers/iommu/arm-smmu-v3.c | 29 +++++++++++++++++++++++++++-- drivers/iommu/arm-smmu.c | 29 +++++++++++++++++++++++++++-- 2 files changed, 54 insertions(+), 4 deletions(-)drivers/iommu/arm-smmu-v3.c +6
-0@@ -3019,6 +3019,32 @@ static struct iommu_group *arm_smmu_device_group(struct device *dev)return group; } +static int arm_smmu_domain_nesting_info (struct arm_smmu_domain *smmu_domain, +void *data) +{ +struct iommu_nesting_info *info = (struct iommu_nesting_info *) data; +u32 size; +
drivers/iommu/arm-smmu-v3.c static struct iommu_group *arm_smmu_device_group(struct device *dev) · line 3037
Quoted 10 lines
drivers/iommu/arm-smmu-v3.c +10
-0+if (!info || smmu_domain->stage !=ARM_SMMU_DOMAIN_NESTED ) +return -ENODEV ; + + size =sizeof (struct iommu_nesting_info ); + +/* +* if provided buffer size is not equal to the size, should +* return 0 and also the expected buffer size to caller. +*/ +if (info->size != size) {
< size?
drivers/iommu/arm-smmu-v3.c static struct iommu_group *arm_smmu_device_group(struct device *dev) · line 3044
Quoted 7 lines
drivers/iommu/arm-smmu-v3.c +7
-0+ info->size = size; +return 0 ; + } + +/* report an empty iommu_nesting_info for now */ +memset (info,0x0 , size); + info->size = size;
For info, the current SMMU NESTED mode is not enabling any nesting. It just forces the usage of the 2st stage instead of stage1 for single stage translation.
Thanks
Eric
Quoted 64 lines
drivers/iommu/arm-smmu-v3.c +4
-2+return 0 ; +} +static int arm_smmu_domain_get_attr (struct iommu_domain *domain,enum iommu_attr attr,void *data) {@@ -3028,8 +3054,7 @@ static int arm_smmu_domain_get_attr(struct iommu_domain *domain,case IOMMU_DOMAIN_UNMANAGED :switch (attr) {case DOMAIN_ATTR_NESTING : - *(int *)data = (smmu_domain->stage ==ARM_SMMU_DOMAIN_NESTED ); -return 0 ; +return arm_smmu_domain_nesting_info (smmu_domain, data);default :return -ENODEV ; }drivers/iommu/arm-smmu.c +27
-2@@ -1506,6 +1506,32 @@ static struct iommu_group *arm_smmu_device_group(struct device *dev)return group; } +static int arm_smmu_domain_nesting_info (struct arm_smmu_domain *smmu_domain, +void *data) +{ +struct iommu_nesting_info *info = (struct iommu_nesting_info *) data; +u32 size; + +if (!info || smmu_domain->stage !=ARM_SMMU_DOMAIN_NESTED ) +return -ENODEV ; + + size =sizeof (struct iommu_nesting_info ); + +/* +* if provided buffer size is not equal to the size, should +* return 0 and also the expected buffer size to caller. +*/ +if (info->size != size) { + info->size = size; +return 0 ; + } + +/* report an empty iommu_nesting_info for now */ +memset (info,0x0 , size); + info->size = size; +return 0 ; +} +static int arm_smmu_domain_get_attr (struct iommu_domain *domain,enum iommu_attr attr,void *data) {@@ -1515,8 +1541,7 @@ static int arm_smmu_domain_get_attr(struct iommu_domain *domain,case IOMMU_DOMAIN_UNMANAGED :switch (attr) {case DOMAIN_ATTR_NESTING : - *(int *)data = (smmu_domain->stage ==ARM_SMMU_DOMAIN_NESTED ); -return 0 ; +return arm_smmu_domain_nesting_info (smmu_domain, data);default :return -ENODEV ; }
RE: [PATCH v4 03/15] iommu/smmu: Report empty domain nesting info
Hi Eric,
Quoted 7 lines
From: Auger Eric <[email protected]>
Hi Yi,
Please add a commit message: instead of returning a boolean for
DOMAIN_ATTR_NESTING,arm_smmu_domain_get_attr()returns aiommu_nesting_infohandle.
will do. thanks for the suggestion.
Quoted 25 lines · Liu Yi L
drivers/iommu/arm-smmu-v3.c static struct iommu_group
Quoted 17 lines
Cc Will Deacon <[email protected]>Cc Robin Murphy <[email protected]>Cc Eric Auger <[email protected]>Cc Jean-Philippe Brucker <[email protected]>Suggested-by Jean-Philippe Brucker <[email protected]>Signed-off-by Liu Yi L <[email protected]>Signed-off-by Jacob Pan <[email protected]>--- drivers/iommu/arm-smmu-v3.c | 29 +++++++++++++++++++++++++++-- drivers/iommu/arm-smmu.c | 29 +++++++++++++++++++++++++++-- 2 files changed, 54 insertions(+), 4 deletions(-)drivers/iommu/arm-smmu-v3.c +0
-0@@ -3019,6 +3019,32 @@ static struct iommu_group*arm_smmu_device_group(struct device *dev)
drivers/iommu/arm-smmu-v3.c static struct iommu_group *arm_smmu_device_group(struct device *dev)
Quoted 4 lines
drivers/iommu/arm-smmu-v3.c +1
-0return group; } +static int arm_smmu_domain_nesting_info(struct arm_smmu_domain
*smmu_domain,
Quoted 16 lines
Quoted 5 lines
drivers/iommu/arm-smmu-v3.c +5
-0+ void *data) +{ +struct iommu_nesting_info *info = (struct iommu_nesting_info *) data; +u32 size; +drivers/iommu/arm-smmu-v3.c static struct iommu_group *arm_smmu_device_group(struct device *dev) · line 3037
Quoted 10 lines
drivers/iommu/arm-smmu-v3.c +10
-0+if (!info || smmu_domain->stage !=ARM_SMMU_DOMAIN_NESTED ) +return -ENODEV ; + + size =sizeof (struct iommu_nesting_info ); + +/* +* if provided buffer size is not equal to the size, should +* return 0 and also the expected buffer size to caller. +*/ +if (info->size != size) {< size?
< size may work as well. but I'd like the caller provide exact buffer size. not sure if it is demand in kernel. do you have any suggestion?
Quoted 9 lines
drivers/iommu/arm-smmu-v3.c static struct iommu_group *arm_smmu_device_group(struct device *dev) · line 3044
Quoted 7 lines
drivers/iommu/arm-smmu-v3.c +7
-0+ info->size = size; +return 0 ; + } + +/* report an empty iommu_nesting_info for now */ +memset (info,0x0 , size); + info->size = size;For info, the current SMMU NESTED mode is not enabling any nesting. It just forces the usage of the 2st stage instead of stage1 for single stage translation.
yep. The intention is as below:
" However it requires changing the get_attr(NESTING) implementations in both SMMU drivers as a precursor of this series, to avoid breaking VFIO_TYPE1_NESTING_IOMMU on Arm. Since we haven't yet defined the nesting_info structs for SMMUv2 and v3, I suppose we could return an empty struct iommu_nesting_info for now?"
https://lore.kernel.org/linux-iommu/20200617143909.GA886590@myrica/
do you think any other needs to be done for now?
Regards,
Yi Liu
Quoted 73 lines
Thanks
Eric
drivers/iommu/arm-smmu-v3.c static struct iommu_group *arm_smmu_device_group(struct device *dev)
Quoted 5 lines
drivers/iommu/arm-smmu-v3.c +3
-0+return 0 ; +} +static int arm_smmu_domain_get_attr (struct iommu_domain *domain, enum iommu_attr attr, void *data) { @@ -3028,8 +3054,7 @@
drivers/iommu/arm-smmu-v3.c static int arm_smmu_domain_get_attr(struct iommu_domain *domain,
Quoted 5 lines
drivers/iommu/arm-smmu-v3.c +0
-0static int arm_smmu_domain_get_attr(struct iommu_domain *domain,drivers/iommu/arm-smmu-v3.c +0
-1case IOMMU_DOMAIN_UNMANAGED :switch (attr) {case DOMAIN_ATTR_NESTING : - *(int *)data = (smmu_domain->stage ==
ARM_SMMU_DOMAIN_NESTED);drivers/iommu/arm-smmu-v3.c
Quoted 2 lines
drivers/iommu/arm-smmu-v3.c +1
-1-return 0 ; + return arm_smmu_domain_nesting_info(smmu_domain,data);
drivers/iommu/arm-smmu.c static struct iommu_group
Quoted 8 lines
drivers/iommu/arm-smmu-v3.c +0
-0default :return -ENODEV ; }drivers/iommu/arm-smmu.c index renamed from drivers/iommu/arm-smmu.c +0
-0243bc4c..908607d 100644
drivers/iommu/arm-smmu.c +0
-0@@ -1506,6 +1506,32 @@ static struct iommu_group*arm_smmu_device_group(struct device *dev)
drivers/iommu/arm-smmu.c static struct iommu_group · line 1509
Quoted 4 lines
drivers/iommu/arm-smmu.c +1
-0return group; } +static int arm_smmu_domain_nesting_info(struct arm_smmu_domain
*smmu_domain,Quoted 17 lines
drivers/iommu/arm-smmu.c +17
-0+ void *data) +{ +struct iommu_nesting_info *info = (struct iommu_nesting_info *) data; +u32 size; + +if (!info || smmu_domain->stage !=ARM_SMMU_DOMAIN_NESTED ) +return -ENODEV ; + + size =sizeof (struct iommu_nesting_info ); + +/* +* if provided buffer size is not equal to the size, should +* return 0 and also the expected buffer size to caller. +*/ +if (info->size != size) { + info->size = size; +return 0 ;drivers/iommu/arm-smmu.c static struct iommu_group · line 1536
Quoted 10 lines
drivers/iommu/arm-smmu.c +8
-0+ } + +/* report an empty iommu_nesting_info for now */ +memset (info,0x0 , size); + info->size = size; +return 0 ; +} +static int arm_smmu_domain_get_attr (struct iommu_domain *domain, enum iommu_attr attr, void *data) { @@ -1515,8 +1541,7 @@
drivers/iommu/arm-smmu.c
Quoted 5 lines
drivers/iommu/arm-smmu.c +0
-0static int arm_smmu_domain_get_attr(struct iommu_domain *domain,drivers/iommu/arm-smmu.c +0
-1case IOMMU_DOMAIN_UNMANAGED :switch (attr) {case DOMAIN_ATTR_NESTING : - *(int *)data = (smmu_domain->stage ==
ARM_SMMU_DOMAIN_NESTED);drivers/iommu/arm-smmu.c
Quoted 2 lines
drivers/iommu/arm-smmu.c +1
-1-return 0 ; + return arm_smmu_domain_nesting_info(smmu_domain,data);
Quoted 4 lines
drivers/iommu/arm-smmu.c +0
-0default :return -ENODEV ; }
Re: [PATCH v4 03/15] iommu/smmu: Report empty domain nesting info
Hi Yi,
Quoted 54 lines · Yi L
Hi Eric,
Quoted 7 lines
From: Auger Eric <[email protected]>
Hi Yi,
Please add a commit message: instead of returning a boolean for
DOMAIN_ATTR_NESTING,arm_smmu_domain_get_attr()returns aiommu_nesting_infohandle.will do. thanks for the suggestion.
Quoted 25 lines · Liu Yi L
drivers/iommu/arm-smmu-v3.c static struct iommu_group
Quoted 17 lines
Cc Will Deacon <[email protected]>Cc Robin Murphy <[email protected]>Cc Eric Auger <[email protected]>Cc Jean-Philippe Brucker <[email protected]>Suggested-by Jean-Philippe Brucker <[email protected]>Signed-off-by Liu Yi L <[email protected]>Signed-off-by Jacob Pan <[email protected]>--- drivers/iommu/arm-smmu-v3.c | 29 +++++++++++++++++++++++++++-- drivers/iommu/arm-smmu.c | 29 +++++++++++++++++++++++++++-- 2 files changed, 54 insertions(+), 4 deletions(-)drivers/iommu/arm-smmu-v3.c +0
-0@@ -3019,6 +3019,32 @@ static struct iommu_group*arm_smmu_device_group(struct device *dev)
drivers/iommu/arm-smmu-v3.c static struct iommu_group *arm_smmu_device_group(struct device *dev)
Quoted 4 lines
drivers/iommu/arm-smmu-v3.c +1
-0return group; } +static int arm_smmu_domain_nesting_info(struct arm_smmu_domain
*smmu_domain,Quoted 16 lines
Quoted 5 lines
drivers/iommu/arm-smmu-v3.c +5
-0+ void *data) +{ +struct iommu_nesting_info *info = (struct iommu_nesting_info *) data; +u32 size; +drivers/iommu/arm-smmu-v3.c static struct iommu_group *arm_smmu_device_group(struct device *dev) · line 3037
Quoted 10 lines
drivers/iommu/arm-smmu-v3.c +10
-0+if (!info || smmu_domain->stage !=ARM_SMMU_DOMAIN_NESTED ) +return -ENODEV ; + + size =sizeof (struct iommu_nesting_info ); + +/* +* if provided buffer size is not equal to the size, should +* return 0 and also the expected buffer size to caller. +*/ +if (info->size != size) {< size?
Quoted 2 lines
< size may work as well. but I'd like the caller provide exact buffer size. not sure if it is demand in kernel. do you have any suggestion?
I just suggested that by analogy with the VFIO argsz
Quoted 13 lines
Quoted 10 lines
drivers/iommu/arm-smmu-v3.c static struct iommu_group *arm_smmu_device_group(struct device *dev) · line 3044
Quoted 8 lines
drivers/iommu/arm-smmu-v3.c +7
-0+ info->size = size; +return 0 ; + } + +/* report an empty iommu_nesting_info for now */ +memset (info,0x0 , size); + info->size = size;For info, the current SMMU NESTED mode is not enabling any nesting. It just forces the usage of the 2st stage instead of stage1 for single stage translation.
yep. The intention is as below:
Quoted 8 lines
" However it requires changing the
get_attr(NESTING)implementations in both SMMU drivers as a precursor of this series, to avoid breakingVFIO_TYPE1_NESTING_IOMMUon Arm. Since we haven't yet defined thenesting_infostructs for SMMUv2 and v3, I suppose we could return an empty structiommu_nesting_infofor now?"
https://lore.kernel.org/linux-iommu/20200617143909.GA886590@myrica/do you think any other needs to be done for now?
I understand this is a prerequisite. It was more as an information. Returning a void struct is a bit weird but at the moment I don't have anything better.
Thanks
Eric
Quoted 78 lines
Regards,
Yi LiuQuoted 73 lines
Thanks
Eric
drivers/iommu/arm-smmu-v3.c static struct iommu_group *arm_smmu_device_group(struct device *dev)
Quoted 5 lines
drivers/iommu/arm-smmu-v3.c +3
-0+return 0 ; +} +static int arm_smmu_domain_get_attr (struct iommu_domain *domain, enum iommu_attr attr, void *data) { @@ -3028,8 +3054,7 @@
drivers/iommu/arm-smmu-v3.c static int arm_smmu_domain_get_attr(struct iommu_domain *domain,
Quoted 5 lines
drivers/iommu/arm-smmu-v3.c +0
-0static int arm_smmu_domain_get_attr(struct iommu_domain *domain,drivers/iommu/arm-smmu-v3.c +0
-1case IOMMU_DOMAIN_UNMANAGED :switch (attr) {case DOMAIN_ATTR_NESTING : - *(int *)data = (smmu_domain->stage ==
ARM_SMMU_DOMAIN_NESTED);drivers/iommu/arm-smmu-v3.c
Quoted 2 lines
drivers/iommu/arm-smmu-v3.c +1
-1-return 0 ; + return arm_smmu_domain_nesting_info(smmu_domain,data);
drivers/iommu/arm-smmu.c static struct iommu_group
Quoted 8 lines
drivers/iommu/arm-smmu-v3.c +0
-0default :return -ENODEV ; }drivers/iommu/arm-smmu.c index renamed from drivers/iommu/arm-smmu.c +0
-0243bc4c..908607d 100644
drivers/iommu/arm-smmu.c +0
-0@@ -1506,6 +1506,32 @@ static struct iommu_group*arm_smmu_device_group(struct device *dev)
drivers/iommu/arm-smmu.c static struct iommu_group · line 1509
Quoted 4 lines
drivers/iommu/arm-smmu.c +1
-0return group; } +static int arm_smmu_domain_nesting_info(struct arm_smmu_domain
*smmu_domain,Quoted 17 lines
drivers/iommu/arm-smmu.c +17
-0+ void *data) +{ +struct iommu_nesting_info *info = (struct iommu_nesting_info *) data; +u32 size; + +if (!info || smmu_domain->stage !=ARM_SMMU_DOMAIN_NESTED ) +return -ENODEV ; + + size =sizeof (struct iommu_nesting_info ); + +/* +* if provided buffer size is not equal to the size, should +* return 0 and also the expected buffer size to caller. +*/ +if (info->size != size) { + info->size = size; +return 0 ;drivers/iommu/arm-smmu.c static struct iommu_group · line 1536
Quoted 10 lines
drivers/iommu/arm-smmu.c +8
-0+ } + +/* report an empty iommu_nesting_info for now */ +memset (info,0x0 , size); + info->size = size; +return 0 ; +} +static int arm_smmu_domain_get_attr (struct iommu_domain *domain, enum iommu_attr attr, void *data) { @@ -1515,8 +1541,7 @@
drivers/iommu/arm-smmu.c
Quoted 5 lines
drivers/iommu/arm-smmu.c +0
-0static int arm_smmu_domain_get_attr(struct iommu_domain *domain,drivers/iommu/arm-smmu.c +0
-1case IOMMU_DOMAIN_UNMANAGED :switch (attr) {case DOMAIN_ATTR_NESTING : - *(int *)data = (smmu_domain->stage ==
ARM_SMMU_DOMAIN_NESTED);drivers/iommu/arm-smmu.c
Quoted 2 lines
drivers/iommu/arm-smmu.c +1
-1-return 0 ; + return arm_smmu_domain_nesting_info(smmu_domain,data);
Quoted 4 lines
drivers/iommu/arm-smmu.c +0
-0default :return -ENODEV ; }
RE: [PATCH v4 03/15] iommu/smmu: Report empty domain nesting info
Hi Eric,
Quoted 60 lines
From: Auger Eric <[email protected]>
Sent: Monday, July 6, 2020 9:22 PMHi Yi,
Quoted 54 lines · Yi L
Hi Eric,
Quoted 7 lines
From: Auger Eric <[email protected]>
Hi Yi,
Please add a commit message: instead of returning a boolean for
DOMAIN_ATTR_NESTING,arm_smmu_domain_get_attr()returns aiommu_nesting_infohandle.will do. thanks for the suggestion.
Quoted 41 lines · Liu Yi L
drivers/iommu/arm-smmu-v3.c static struct iommu_group
Quoted 17 lines
Cc Will Deacon <[email protected]>Cc Robin Murphy <[email protected]>Cc Eric Auger <[email protected]>Cc Jean-Philippe Brucker <[email protected]>Suggested-by Jean-Philippe Brucker <[email protected]>Signed-off-by Liu Yi L <[email protected]>Signed-off-by Jacob Pan <[email protected]>--- drivers/iommu/arm-smmu-v3.c | 29 +++++++++++++++++++++++++++-- drivers/iommu/arm-smmu.c | 29 +++++++++++++++++++++++++++-- 2 files changed, 54 insertions(+), 4 deletions(-)(quoted diff) +0
-0
b/drivers/iommu/arm-smmu-v3.cindex f578677..0c45d4d 100644drivers/iommu/arm-smmu-v3.c +0
-0@@ -3019,6 +3019,32 @@ static struct iommu_group*arm_smmu_device_group(struct device *dev)
drivers/iommu/arm-smmu-v3.c static struct iommu_group *arm_smmu_device_group(struct device *dev)
Quoted 4 lines
drivers/iommu/arm-smmu-v3.c +1
-0return group; } +static int arm_smmu_domain_nesting_info(struct arm_smmu_domain
*smmu_domain,Quoted 5 lines
drivers/iommu/arm-smmu-v3.c +5
-0+ void *data) +{ +struct iommu_nesting_info *info = (struct iommu_nesting_info *) data; +u32 size; +drivers/iommu/arm-smmu-v3.c static struct iommu_group *arm_smmu_device_group(struct device *dev) · line 3037
Quoted 10 lines
drivers/iommu/arm-smmu-v3.c +10
-0+if (!info || smmu_domain->stage !=ARM_SMMU_DOMAIN_NESTED ) +return -ENODEV ; + + size =sizeof (struct iommu_nesting_info ); + +/* +* if provided buffer size is not equal to the size, should +* return 0 and also the expected buffer size to caller. +*/ +if (info->size != size) {< size?
Quoted 4 lines
Quoted 2 lines
< size may work as well. but I'd like the caller provide exact buffer size. not sure if it is demand in kernel. do you have any suggestion?
I just suggested that by analogy with the VFIO argsz
I see. will change it.
Quoted 22 lines
Quoted 11 lines
Quoted 11 lines
drivers/iommu/arm-smmu-v3.c static struct iommu_group *arm_smmu_device_group(struct device *dev) · line 3044
Quoted 9 lines
drivers/iommu/arm-smmu-v3.c +7
-0+ info->size = size; +return 0 ; + } + +/* report an empty iommu_nesting_info for now */ +memset (info,0x0 , size); + info->size = size;For info, the current SMMU NESTED mode is not enabling any nesting. It just forces the usage of the 2st stage instead of stage1 for single stage
translation.
Quoted 10 lines
yep. The intention is as below:
" However it requires changing the
get_attr(NESTING)implementations in both SMMU drivers as a precursor of this series, to avoid breakingVFIO_TYPE1_NESTING_IOMMUon Arm. Since we haven't yet defined thenesting_infostructs for SMMUv2 and v3, I suppose we could return an empty structiommu_nesting_infofor now?"
https://lore.kernel.org/linux-iommu/20200617143909.GA886590@myrica/
Quoted 4 lines
Quoted 1 line
do you think any other needs to be done for now?
I understand this is a prerequisite. It was more as an information. Returning a void struct is a bit weird but at the moment I don't have anything better.
got you. do you think it is necessary to add your statement as a comment here?
Regards,
Yi Liu
Quoted 81 lines
Thanks
Eric
Quoted 78 lines
Regards,
Yi LiuQuoted 73 lines
Thanks
Eric
drivers/iommu/arm-smmu-v3.c static struct iommu_group *arm_smmu_device_group(struct device *dev)
Quoted 5 lines
drivers/iommu/arm-smmu-v3.c +3
-0+return 0 ; +} +static int arm_smmu_domain_get_attr (struct iommu_domain *domain, enum iommu_attr attr, void *data) { @@ -3028,8 +3054,7 @@
drivers/iommu/arm-smmu-v3.c static int arm_smmu_domain_get_attr(struct iommu_domain *domain,
Quoted 5 lines
drivers/iommu/arm-smmu-v3.c +0
-0static int arm_smmu_domain_get_attr(struct iommu_domain *domain,drivers/iommu/arm-smmu-v3.c +0
-1case IOMMU_DOMAIN_UNMANAGED :switch (attr) {case DOMAIN_ATTR_NESTING : - *(int *)data = (smmu_domain->stage ==
ARM_SMMU_DOMAIN_NESTED);drivers/iommu/arm-smmu-v3.c
Quoted 2 lines
drivers/iommu/arm-smmu-v3.c +1
-1-return 0 ; + return arm_smmu_domain_nesting_info(smmu_domain,data);
drivers/iommu/arm-smmu.c static struct iommu_group
Quoted 8 lines
drivers/iommu/arm-smmu-v3.c +0
-0default :return -ENODEV ; }drivers/iommu/arm-smmu.c +0
-0@@ -1506,6 +1506,32 @@ static struct iommu_group*arm_smmu_device_group(struct device *dev)
drivers/iommu/arm-smmu.c static struct iommu_group · line 1509
Quoted 4 lines
drivers/iommu/arm-smmu.c +1
-0return group; } +static int arm_smmu_domain_nesting_info(struct arm_smmu_domain
*smmu_domain,Quoted 17 lines
drivers/iommu/arm-smmu.c +17
-0+ void *data) +{ +struct iommu_nesting_info *info = (struct iommu_nesting_info *) data; +u32 size; + +if (!info || smmu_domain->stage !=ARM_SMMU_DOMAIN_NESTED ) +return -ENODEV ; + + size =sizeof (struct iommu_nesting_info ); + +/* +* if provided buffer size is not equal to the size, should +* return 0 and also the expected buffer size to caller. +*/ +if (info->size != size) { + info->size = size; +return 0 ;drivers/iommu/arm-smmu.c static struct iommu_group · line 1536
Quoted 10 lines
drivers/iommu/arm-smmu.c +8
-0+ } + +/* report an empty iommu_nesting_info for now */ +memset (info,0x0 , size); + info->size = size; +return 0 ; +} +static int arm_smmu_domain_get_attr (struct iommu_domain *domain, enum iommu_attr attr, void *data) { @@ -1515,8 +1541,7 @@
drivers/iommu/arm-smmu.c
Quoted 5 lines
drivers/iommu/arm-smmu.c +0
-0static int arm_smmu_domain_get_attr(struct iommu_domain *domain,drivers/iommu/arm-smmu.c +0
-1case IOMMU_DOMAIN_UNMANAGED :switch (attr) {case DOMAIN_ATTR_NESTING : - *(int *)data = (smmu_domain->stage ==
ARM_SMMU_DOMAIN_NESTED);drivers/iommu/arm-smmu.c
Quoted 2 lines
drivers/iommu/arm-smmu.c +1
-1-return 0 ; + return arm_smmu_domain_nesting_info(smmu_domain,data);
Quoted 4 lines
drivers/iommu/arm-smmu.c +0
-0default :return -ENODEV ; }
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v4 4/15 vfio/type1: Report iommu nesting info to userspace
In reply to Liu Yi LThis patch exports iommu nesting capability info to user space through VFIO. User space is expected to check this info for supported uAPIs (e.g. PASID alloc/free, bind page table, and cache invalidation) and the vendor specific format information for first level/stage page table that will be bound to.
The nesting info is available only after the nesting iommu type is set for a container. Current implementation imposes one limitation - one nesting container should include at most one group. The philosophy of vfio container is having all groups/devices within the container share the same IOMMU context. When vSVA is enabled, one IOMMU context could include one 2nd-level address space and multiple 1st-level address spaces. While the 2nd-leve address space is reasonably sharable by multiple groups , blindly sharing 1st-level address spaces across all groups within the container might instead break the guest expectation. In the future sub/ super container concept might be introduced to allow partial address space sharing within an IOMMU context. But for now let's go with this restriction by requiring singleton container for using nesting iommu features. Below link has the related discussion about this decision.
https://lkml.org/lkml/2020/5/15/1028
---
v3 -> v4:
*) address comments against v3.
v1 -> v2:
*) added in v2
---
drivers/vfio/vfio_iommu_type1.c | 105 +++++++++++++++++++++++++++++++++++----- include/uapi/linux/vfio.h | 16 ++++++ 2 files changed, 109 insertions(+), 12 deletions(-)
drivers/vfio/vfio_iommu_type1.c +93 -12
@@ -62,18 +62,20 @@ MODULE_PARM_DESC(dma_entry_limit, "Maximum number of user DMA mappings per container (65535).");struct vfio_iommu { -struct list_head domain_list; -struct list_head iova_list; -struct vfio_domain *external_domain;/* domain for external user */ -struct mutex lock; -struct rb_root dma_list; -struct blocking_notifier_head notifier; -unsigned int dma_avail; -uint64_t pgsize_bitmap; -bool v2; -bool nesting; -bool dirty_page_tracking; -bool pinned_page_dirty_scope; +struct list_head domain_list; +struct list_head iova_list; +struct vfio_domain *external_domain;/* domain for +external user */ +struct mutex lock; +struct rb_root dma_list; +struct blocking_notifier_head notifier; +unsigned int dma_avail; +uint64_t pgsize_bitmap; +bool v2; +bool nesting; +bool dirty_page_tracking; +bool pinned_page_dirty_scope; +struct iommu_nesting_info *nesting_info; };struct vfio_domain {
@@ -130,6 +132,9 @@ struct vfio_regions {#define IS_IOMMU_CAP_DOMAIN_IN_CONTAINER (iommu) \ (!list_empty(&iommu->domain_list)) +#define IS_DOMAIN_IN_CONTAINER (iommu) ((iommu->external_domain) || \ + (!list_empty(&iommu->domain_list))) +#define DIRTY_BITMAP_BYTES (n) (ALIGN(n, BITS_PER_TYPE(u64)) / BITS_PER_BYTE)/*
@@ -1929,6 +1934,13 @@ static void vfio_iommu_iova_insert_copy(struct vfio_iommu *iommu,list_splice_tail (iova_copy, iova); } + +static void vfio_iommu_release_nesting_info (struct vfio_iommu *iommu) +{ +kfree (iommu->nesting_info); + iommu->nesting_info =NULL ; +} +static int vfio_iommu_type1_attach_group (void *iommu_data,struct iommu_group *iommu_group) {
@@ -1959,6 +1971,12 @@ static int vfio_iommu_type1_attach_group(void *iommu_data, } } +/* Nesting type container can include only one group */ +if (iommu->nesting &&IS_DOMAIN_IN_CONTAINER (iommu)) { +mutex_unlock (&iommu->lock); +return -EINVAL ; + } + group =kzalloc (sizeof (*group),GFP_KERNEL ); domain =kzalloc (sizeof (*domain),GFP_KERNEL );if (!group || !domain) {
@@ -2029,6 +2047,36 @@ static int vfio_iommu_type1_attach_group(void *iommu_data,if (ret) goto out_domain; +/* Nesting cap info is available only after attaching */ +if (iommu->nesting) { +struct iommu_nesting_info tmp; +struct iommu_nesting_info *info; + +/* First get the size of vendor specific nesting info */ + ret =iommu_domain_get_attr (domain->domain, +DOMAIN_ATTR_NESTING , + &tmp); +if (ret) + goto out_detach; + + info =kzalloc (tmp.size,GFP_KERNEL ); +if (!info) { + ret = -ENOMEM ; + goto out_detach; + } + +/* Now get the nesting info */ + info->size = tmp.size; + ret =iommu_domain_get_attr (domain->domain, +DOMAIN_ATTR_NESTING , + info); +if (ret) { +kfree (info); + goto out_detach; + } + iommu->nesting_info = info; + } +/* Get aperture info */ iommu_domain_get_attr (domain->domain,DOMAIN_ATTR_GEOMETRY , &geo);
@@ -2138,6 +2186,7 @@ static int vfio_iommu_type1_attach_group(void *iommu_data,return 0 ; out_detach: +vfio_iommu_release_nesting_info (iommu);vfio_iommu_detach_group (domain, group); out_domain:iommu_domain_free (domain->domain);
@@ -2338,6 +2387,8 @@ static void vfio_iommu_type1_detach_group(void *iommu_data,vfio_iommu_unmap_unpin_all (iommu); elsevfio_iommu_unmap_unpin_reaccount (iommu ); + +vfio_iommu_release_nesting_info (iommu); }iommu_domain_free (domain->domain);list_del (&domain->next);
@@ -2546,6 +2597,30 @@ static int vfio_iommu_migration_build_caps(struct vfio_iommu *iommu,return vfio_info_add_capability (caps, &cap_mig.header,sizeof (cap_mig)); } +static int vfio_iommu_info_add_nesting_cap (struct vfio_iommu *iommu, +struct vfio_info_cap *caps) +{ +struct vfio_info_cap_header *header; +struct vfio_iommu_type1_info_cap_nesting *nesting_cap; +size_t size; + + size =sizeof (*nesting_cap) + iommu->nesting_info->size; + + header =vfio_info_cap_add (caps, size, +VFIO_IOMMU_TYPE1_INFO_CAP_NESTING ,1 ); +if (IS_ERR (header)) +return PTR_ERR (header); + + nesting_cap =container_of (header, + struct vfio_iommu_type1_info_cap_nesting, + header); + +memcpy (&nesting_cap->info, iommu->nesting_info, + iommu->nesting_info->size); + +return 0 ; +} +static int vfio_iommu_type1_get_info (struct vfio_iommu *iommu,unsigned long arg) {
@@ -2586,6 +2661,12 @@ static int vfio_iommu_type1_get_info(struct vfio_iommu *iommu,if (ret)return ret; +if (iommu->nesting_info) { + ret =vfio_iommu_info_add_nesting_cap (iommu, &caps); +if (ret) +return ret; + } +if (caps.size) { info.flags |=VFIO_IOMMU_INFO_CAPS ;
include/uapi/linux/vfio.h +16 -0
@@ -1039,6 +1039,22 @@ struct vfio_iommu_type1_info_cap_migration {__u64 max_dirty_bitmap_size;/* in bytes */ }; +#define VFIO_IOMMU_TYPE1_INFO_CAP_NESTING 3 + +/* +* Reporting nesting info to user space. +* +* @info: the nesting info provided by IOMMU driver. Today +* it is expected to be a struct iommu_nesting_info +* data. +*/ +struct vfio_iommu_type1_info_cap_nesting { +struct vfio_info_cap_header header; +__u32 flags; +__u32 padding; +__u8 info[]; +}; +#define VFIO_IOMMU_GET_INFO _IO(VFIO_TYPE, VFIO_BASE + 12)/**
Signature · 6 lines
2.7.4 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v4 04/15] vfio/type1: Report iommu nesting info to userspace
Yi,
Quoted 6 lines · Liu Yi L
This patch exports iommu nesting capability info to user space through VFIO. User space is expected to check this info for supported uAPIs (e.g. PASID alloc/free, bind page table, and cache invalidation) and the vendor specific format information for first level/stage page table that will be bound to.
Quoted 7 lines
The nesting info is available only after the nesting iommu type is set for a container. Current implementation imposes one limitation - one nesting container should include at most one group. The philosophy of vfio container is having all groups/devices within the container share the same IOMMU context. When vSVA is enabled, one IOMMU context could include one 2nd-level address space and multiple 1st-level address spaces. While the 2nd-leve address space is reasonably sharable by multiple groups
level
Quoted 43 lines
, blindly sharing 1st-level address spaces across all groups within the container might instead break the guest expectation. In the future sub/ super container concept might be introduced to allow partial address space sharing within an IOMMU context. But for now let's go with this restriction by requiring singleton container for using nesting iommu features. Below link has the related discussion about this decision.
https://lkml.org/lkml/2020/5/15/1028
Cc Kevin Tian <[email protected]>CC Jacob Pan <[email protected]>Cc Alex Williamson <[email protected]>Cc Eric Auger <[email protected]>Cc Jean-Philippe Brucker <[email protected]>Cc Joerg Roedel <[email protected]>Cc Lu Baolu <[email protected]>Signed-off-by Liu Yi L <[email protected]>---
v3 -> v4:
*) address comments against v3.v1 -> v2:
*) added in v2
---drivers/vfio/vfio_iommu_type1.c | 105 +++++++++++++++++++++++++++++++++++----- include/uapi/linux/vfio.h | 16 ++++++ 2 files changed, 109 insertions(+), 12 deletions(-)drivers/vfio/vfio_iommu_type1.c +0
-6@@ -62,18 +62,20 @@ MODULE_PARM_DESC(dma_entry_limit, "Maximum number of user DMA mappings per container (65535).");struct vfio_iommu { -struct list_head domain_list; -struct list_head iova_list; -struct vfio_domain *external_domain;/* domain for external user */ -struct mutex lock; -struct rb_root dma_list; -struct blocking_notifier_head notifier;
drivers/vfio/vfio_iommu_type1.c MODULE_PARM_DESC(dma_entry_limit, · line 68
Quoted 10 lines
drivers/vfio/vfio_iommu_type1.c +4
-6-unsigned int dma_avail; -uint64_t pgsize_bitmap; -bool v2; -bool nesting; -bool dirty_page_tracking; -bool pinned_page_dirty_scope; +struct list_head domain_list; +struct list_head iova_list; +struct vfio_domain *external_domain;/* domain for +external user */
nit: put the comment before the field?
Quoted 14 lines
drivers/vfio/vfio_iommu_type1.c +10
-0+struct mutex lock; +struct rb_root dma_list; +struct blocking_notifier_head notifier; +unsigned int dma_avail; +uint64_t pgsize_bitmap; +bool v2; +bool nesting; +bool dirty_page_tracking; +bool pinned_page_dirty_scope; +struct iommu_nesting_info *nesting_info; };struct vfio_domain {
drivers/vfio/vfio_iommu_type1.c struct vfio_regions { · line 136
Quoted 5 lines
drivers/vfio/vfio_iommu_type1.c +2
-0@@ -130,6 +132,9 @@ struct vfio_regions {#define IS_IOMMU_CAP_DOMAIN_IN_CONTAINER (iommu) \ (!list_empty(&iommu->domain_list)) +#define IS_DOMAIN_IN_CONTAINER (iommu) ((iommu->external_domain) || \ + (!list_empty(&iommu->domain_list)))
rename into something like CONTAINER_HAS_DOMAIN()?
Quoted 38 lines
drivers/vfio/vfio_iommu_type1.c +17
-0+#define DIRTY_BITMAP_BYTES (n) (ALIGN(n, BITS_PER_TYPE(u64)) / BITS_PER_BYTE)/* @@ -1929,6 +1934,13 @@ static void vfio_iommu_iova_insert_copy(struct vfio_iommu *iommu,list_splice_tail (iova_copy, iova); } + +static void vfio_iommu_release_nesting_info (struct vfio_iommu *iommu) +{ +kfree (iommu->nesting_info); + iommu->nesting_info =NULL ; +} +static int vfio_iommu_type1_attach_group (void *iommu_data,struct iommu_group *iommu_group) {@@ -1959,6 +1971,12 @@ static int vfio_iommu_type1_attach_group(void *iommu_data, } } +/* Nesting type container can include only one group */ +if (iommu->nesting &&IS_DOMAIN_IN_CONTAINER (iommu)) { +mutex_unlock (&iommu->lock); +return -EINVAL ; + } + group =kzalloc (sizeof (*group),GFP_KERNEL ); domain =kzalloc (sizeof (*domain),GFP_KERNEL );if (!group || !domain) {@@ -2029,6 +2047,36 @@ static int vfio_iommu_type1_attach_group(void *iommu_data,if (ret) goto out_domain; +/* Nesting cap info is available only after attaching */ +if (iommu->nesting) { +struct iommu_nesting_info tmp;
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_type1_attach_group(void *iommu_data, · line 2062
Quoted 10 lines
drivers/vfio/vfio_iommu_type1.c +10
-0+struct iommu_nesting_info *info; + +/* First get the size of vendor specific nesting info */ + ret =iommu_domain_get_attr (domain->domain, +DOMAIN_ATTR_NESTING , + &tmp); +if (ret) + goto out_detach; + + info =kzalloc (tmp.size,GFP_KERNEL );
nit: you may directly use iommu->nesting_info
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_type1_attach_group(void *iommu_data, · line 2074
Quoted 12 lines
drivers/vfio/vfio_iommu_type1.c +12
-0+if (!info) { + ret = -ENOMEM ; + goto out_detach; + } + +/* Now get the nesting info */ + info->size = tmp.size; + ret =iommu_domain_get_attr (domain->domain, +DOMAIN_ATTR_NESTING , + info); +if (ret) { +kfree (info);
... and set it back to NULL here if it fails
Quoted 74 lines
drivers/vfio/vfio_iommu_type1.c +38
-0+ goto out_detach; + } + iommu->nesting_info = info; + } +/* Get aperture info */ iommu_domain_get_attr (domain->domain,DOMAIN_ATTR_GEOMETRY , &geo);@@ -2138,6 +2186,7 @@ static int vfio_iommu_type1_attach_group(void *iommu_data,return 0 ; out_detach: +vfio_iommu_release_nesting_info (iommu);vfio_iommu_detach_group (domain, group); out_domain:iommu_domain_free (domain->domain);@@ -2338,6 +2387,8 @@ static void vfio_iommu_type1_detach_group(void *iommu_data,vfio_iommu_unmap_unpin_all (iommu); elsevfio_iommu_unmap_unpin_reaccount (iommu ); + +vfio_iommu_release_nesting_info (iommu); }iommu_domain_free (domain->domain);list_del (&domain->next);@@ -2546,6 +2597,30 @@ static int vfio_iommu_migration_build_caps(struct vfio_iommu *iommu,return vfio_info_add_capability (caps, &cap_mig.header,sizeof (cap_mig)); } +static int vfio_iommu_info_add_nesting_cap (struct vfio_iommu *iommu, +struct vfio_info_cap *caps) +{ +struct vfio_info_cap_header *header; +struct vfio_iommu_type1_info_cap_nesting *nesting_cap; +size_t size; + + size =sizeof (*nesting_cap) + iommu->nesting_info->size; + + header =vfio_info_cap_add (caps, size, +VFIO_IOMMU_TYPE1_INFO_CAP_NESTING ,1 ); +if (IS_ERR (header)) +return PTR_ERR (header); + + nesting_cap =container_of (header, + struct vfio_iommu_type1_info_cap_nesting, + header); + +memcpy (&nesting_cap->info, iommu->nesting_info, + iommu->nesting_info->size); + +return 0 ; +} +static int vfio_iommu_type1_get_info (struct vfio_iommu *iommu,unsigned long arg) {@@ -2586,6 +2661,12 @@ static int vfio_iommu_type1_get_info(struct vfio_iommu *iommu,if (ret)return ret; +if (iommu->nesting_info) { + ret =vfio_iommu_info_add_nesting_cap (iommu, &caps); +if (ret) +return ret; + } +if (caps.size) { info.flags |=VFIO_IOMMU_INFO_CAPS ;include/uapi/linux/vfio.h +0
-0
include/uapi/linux/vfio.h struct vfio_iommu_type1_info_cap_migration { · line 1042
Quoted 4 lines
include/uapi/linux/vfio.h +1
-0@@ -1039,6 +1039,22 @@ struct vfio_iommu_type1_info_cap_migration {__u64 max_dirty_bitmap_size;/* in bytes */ }; +#define VFIO_IOMMU_TYPE1_INFO_CAP_NESTING 3
You may improve the documentation by taking examples from the above caps.
include/uapi/linux/vfio.h struct vfio_iommu_type1_info_cap_migration { · line 1049
Quoted 7 lines
include/uapi/linux/vfio.h +7
-0+ +/* +* Reporting nesting info to user space. +* +* @info: the nesting info provided by IOMMU driver. Today +* it is expected to be a struct iommu_nesting_info +* data.
Is it expected to change?
include/uapi/linux/vfio.h struct vfio_iommu_type1_info_cap_migration { · line 1053
Quoted 4 lines
include/uapi/linux/vfio.h +4
-0+*/ +struct vfio_iommu_type1_info_cap_nesting { +struct vfio_info_cap_header header; +__u32 flags;
You may document flags.
include/uapi/linux/vfio.h struct vfio_iommu_type1_info_cap_migration { · line 1060
Quoted 8 lines
include/uapi/linux/vfio.h +4
-0+__u32 padding; +__u8 info[]; +}; +#define VFIO_IOMMU_GET_INFO _IO(VFIO_TYPE, VFIO_BASE + 12)/**
Thanks
Eric
RE: [PATCH v4 04/15] vfio/type1: Report iommu nesting info to userspace
Hi Eric,
Quoted 12 lines
From: Auger Eric <[email protected]>
Sent: Monday, July 6, 2020 6:37 PMYi,
Quoted 6 lines · Liu Yi L
This patch exports iommu nesting capability info to user space through VFIO. User space is expected to check this info for supported uAPIs (e.g. PASID alloc/free, bind page table, and cache invalidation) and the vendor specific format information for first level/stage page table that will be bound to.
Quoted 8 lines
Quoted 7 lines
The nesting info is available only after the nesting iommu type is set for a container. Current implementation imposes one limitation - one nesting container should include at most one group. The philosophy of vfio container is having all groups/devices within the container share the same IOMMU context. When vSVA is enabled, one IOMMU context could include one 2nd-level address space and multiple 1st-level address spaces. While the 2nd-leve address space is reasonably sharable by multiple groups
level
oh, yes.
Quoted 47 lines
Quoted 21 lines
, blindly sharing 1st-level address spaces across all groups within the container might instead break the guest expectation. In the future sub/ super container concept might be introduced to allow partial address space sharing within an IOMMU context. But for now let's go with this restriction by requiring singleton container for using nesting iommu features. Below link has the related discussion about this decision.
https://lkml.org/lkml/2020/5/15/1028
Cc Kevin Tian <[email protected]>CC Jacob Pan <[email protected]>Cc Alex Williamson <[email protected]>Cc Eric Auger <[email protected]>Cc Jean-Philippe Brucker <[email protected]>Cc Joerg Roedel <[email protected]>Cc Lu Baolu <[email protected]>Signed-off-by Liu Yi L <[email protected]>---
v3 -> v4:
*) address comments against v3.Quoted 5 lines
v1 -> v2:
*) added in v2
---drivers/vfio/vfio_iommu_type1.c | 105+++++++++++++++++++++++++++++++++++-----
Quoted 20 lines
include/uapi/linux/vfio.h | 16 ++++++ 2 files changed, 109 insertions(+), 12 deletions(-)drivers/vfio/vfio_iommu_type1.c +0
-9@@ -62,18 +62,20 @@ MODULE_PARM_DESC(dma_entry_limit, "Maximum number of user DMA mappings per container (65535).");struct vfio_iommu { -struct list_head domain_list; -struct list_head iova_list; -struct vfio_domain *external_domain;/* domain for external user */ -struct mutex lock; -struct rb_root dma_list; -struct blocking_notifier_head notifier; -unsigned int dma_avail; -uint64_t pgsize_bitmap; -bool v2;
Quoted 8 lines
drivers/vfio/vfio_iommu_type1.c MODULE_PARM_DESC(dma_entry_limit, · line 68
Quoted 7 lines
drivers/vfio/vfio_iommu_type1.c +4
-3-bool nesting; -bool dirty_page_tracking; -bool pinned_page_dirty_scope; +struct list_head domain_list; +struct list_head iova_list; +struct vfio_domain *external_domain;/* domain for +external user */ nit: put the comment before the field?
do you mean below?
+ /* domain for external user */
+ struct vfio_domain *external_domain;
Quoted 12 lines
Quoted 12 lines
drivers/vfio/vfio_iommu_type1.c +10
-0+struct mutex lock; +struct rb_root dma_list; +struct blocking_notifier_head notifier; +unsigned int dma_avail; +uint64_t pgsize_bitmap; +bool v2; +bool nesting; +bool dirty_page_tracking; +bool pinned_page_dirty_scope; +struct iommu_nesting_info *nesting_info; };
Quoted 8 lines
drivers/vfio/vfio_iommu_type1.c struct vfio_regions { · line 136
Quoted 7 lines
drivers/vfio/vfio_iommu_type1.c +2
-0struct vfio_domain {@@ -130,6 +132,9 @@ struct vfio_regions {#define IS_IOMMU_CAP_DOMAIN_IN_CONTAINER (iommu) \ (!list_empty(&iommu->domain_list)) +#define IS_DOMAIN_IN_CONTAINER (iommu) ((iommu->external_domain) || \ + (!list_empty(&iommu->domain_list)))rename into something like
CONTAINER_HAS_DOMAIN()?
got it.
Quoted 39 lines
drivers/vfio/vfio_iommu_type1.c struct vfio_regions { · line 138
Quoted 2 lines
drivers/vfio/vfio_iommu_type1.c +1
-0+#define DIRTY_BITMAP_BYTES (n) (ALIGN(n, BITS_PER_TYPE(u64)) /
BITS_PER_BYTE)drivers/vfio/vfio_iommu_type1.c static void vfio_iommu_iova_insert_copy(struct
Quoted 3 lines
drivers/vfio/vfio_iommu_type1.c +0
-0/* @@ -1929,6 +1934,13 @@ static void vfio_iommu_iova_insert_copy(struct
vfio_iommu*iommu,drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_type1_attach_group(void
Quoted 14 lines
drivers/vfio/vfio_iommu_type1.c +7
-0list_splice_tail (iova_copy, iova); } + +static void vfio_iommu_release_nesting_info (struct vfio_iommu *iommu) +{ +kfree (iommu->nesting_info); + iommu->nesting_info =NULL ; +} +static int vfio_iommu_type1_attach_group (void *iommu_data,struct iommu_group *iommu_group) {@@ -1959,6 +1971,12 @@ static int vfio_iommu_type1_attach_group(void
*iommu_data,drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_type1_attach_group(void
Quoted 13 lines
drivers/vfio/vfio_iommu_type1.c +6
-0} } +/* Nesting type container can include only one group */ +if (iommu->nesting &&IS_DOMAIN_IN_CONTAINER (iommu)) { +mutex_unlock (&iommu->lock); +return -EINVAL ; + } + group =kzalloc (sizeof (*group),GFP_KERNEL ); domain =kzalloc (sizeof (*domain),GFP_KERNEL );if (!group || !domain) {@@ -2029,6 +2047,36 @@ static int vfio_iommu_type1_attach_group(void
*iommu_data,Quoted 3 lines
drivers/vfio/vfio_iommu_type1.c +0
-0if (ret) goto out_domain;
Quoted 14 lines
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_type1_attach_group(void *iommu_data, · line 2062
Quoted 13 lines
drivers/vfio/vfio_iommu_type1.c +13
-0+/* Nesting cap info is available only after attaching */ +if (iommu->nesting) { +struct iommu_nesting_info tmp; +struct iommu_nesting_info *info; + +/* First get the size of vendor specific nesting info */ + ret =iommu_domain_get_attr (domain->domain, +DOMAIN_ATTR_NESTING , + &tmp); +if (ret) + goto out_detach; + + info =kzalloc (tmp.size,GFP_KERNEL );nit: you may directly use
iommu->nesting_info
got you.
Quoted 5 lines
Quoted 5 lines
drivers/vfio/vfio_iommu_type1.c +5
-0+if (!info) { + ret = -ENOMEM ; + goto out_detach; + } +
Quoted 8 lines
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_type1_attach_group(void *iommu_data, · line 2074
Quoted 7 lines
drivers/vfio/vfio_iommu_type1.c +7
-0+/* Now get the nesting info */ + info->size = tmp.size; + ret =iommu_domain_get_attr (domain->domain, +DOMAIN_ATTR_NESTING , + info); +if (ret) { +kfree (info);... and set it back to NULL here if it fails
and maybe no need to free it here as vfio_iommu_release_nesting_info() will free the nesting_info.
Quoted 83 lines
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_type1_attach_group(void *iommu_data,
Quoted 7 lines
drivers/vfio/vfio_iommu_type1.c +5
-0+ goto out_detach; + } + iommu->nesting_info = info; + } +/* Get aperture info */ iommu_domain_get_attr(domain->domain, DOMAIN_ATTR_GEOMETRY,&geo);
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_type1_attach_group(void
Quoted 2 lines
drivers/vfio/vfio_iommu_type1.c +0
-0@@ -2138,6 +2186,7 @@ static int vfio_iommu_type1_attach_group(void
*iommu_data,drivers/vfio/vfio_iommu_type1.c static void vfio_iommu_type1_detach_group(void
Quoted 8 lines
drivers/vfio/vfio_iommu_type1.c +1
-0return 0 ; out_detach: +vfio_iommu_release_nesting_info (iommu);vfio_iommu_detach_group (domain, group); out_domain:iommu_domain_free (domain->domain);@@ -2338,6 +2387,8 @@ static void vfio_iommu_type1_detach_group(void
*iommu_data,drivers/vfio/vfio_iommu_type1.c static void vfio_iommu_type1_detach_group(void *iommu_data,
Quoted 3 lines
drivers/vfio/vfio_iommu_type1.c +0
-0vfio_iommu_unmap_unpin_all (iommu); elsevfio_iommu_unmap_unpin_reaccount(iommu);drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_migration_build_caps(struct
Quoted 6 lines
drivers/vfio/vfio_iommu_type1.c +2
-0+ +vfio_iommu_release_nesting_info (iommu); }iommu_domain_free (domain->domain);list_del (&domain->next);@@ -2546,6 +2597,30 @@ static int vfio_iommu_migration_build_caps(struct
vfio_iommu*iommu,drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_type1_get_info(struct
Quoted 31 lines
drivers/vfio/vfio_iommu_type1.c +24
-0return vfio_info_add_capability (caps, &cap_mig.header,sizeof (cap_mig)); } +static int vfio_iommu_info_add_nesting_cap (struct vfio_iommu *iommu, +struct vfio_info_cap *caps) +{ +struct vfio_info_cap_header *header; +struct vfio_iommu_type1_info_cap_nesting *nesting_cap; +size_t size; + + size =sizeof (*nesting_cap) + iommu->nesting_info->size; + + header =vfio_info_cap_add (caps, size, +VFIO_IOMMU_TYPE1_INFO_CAP_NESTING ,1 ); +if (IS_ERR (header)) +return PTR_ERR (header); + + nesting_cap =container_of (header, + struct vfio_iommu_type1_info_cap_nesting, + header); + +memcpy (&nesting_cap->info, iommu->nesting_info, + iommu->nesting_info->size); + +return 0 ; +} +static int vfio_iommu_type1_get_info (struct vfio_iommu *iommu,unsigned long arg) {@@ -2586,6 +2661,12 @@ static int vfio_iommu_type1_get_info(struct
vfio_iommu*iommu,Quoted 20 lines
drivers/vfio/vfio_iommu_type1.c +6
-0if (ret)return ret; +if (iommu->nesting_info) { + ret =vfio_iommu_info_add_nesting_cap (iommu, &caps); +if (ret) +return ret; + } +if (caps.size) { info.flags |=VFIO_IOMMU_INFO_CAPS ;include/uapi/linux/vfio.h +0
-0@@ -1039,6 +1039,22 @@ struct vfio_iommu_type1_info_cap_migration {__u64 max_dirty_bitmap_size;/* in bytes */ };
Quoted 3 lines
include/uapi/linux/vfio.h struct vfio_iommu_type1_info_cap_migration { · line 1042
Quoted 1 line
include/uapi/linux/vfio.h +1
-0+#define VFIO_IOMMU_TYPE1_INFO_CAP_NESTING 3You may improve the documentation by taking examples from the above caps.
yes, it is. I somehow broke the style. how about below?
/*
* The nesting capability allows to report the related capability
* and info for nesting iommu type.
*
* The structures below define version 1 of this capability. *
* User space should check this cap for setup nesting iommu type. *
* @info: the nesting info provided by IOMMU driver. Today
* it is expected to be a struct iommu_nesting_info
* data.
#define VFIO_IOMMU_TYPE1_INFO_CAP_NESTING 3
struct vfio_iommu_type1_info_cap_nesting {
...
};Quoted 8 lines
include/uapi/linux/vfio.h struct vfio_iommu_type1_info_cap_migration { · line 1049
Quoted 7 lines
include/uapi/linux/vfio.h +7
-0+ +/* +* Reporting nesting info to user space. +* +* @info: the nesting info provided by IOMMU driver. Today +* it is expected to be a struct iommu_nesting_info +* data. Is it expected to change?
honestly, I'm not quite sure on it. I did considered to embed struct iommu_nesting_info here instead of using info[]. but I hesitated as using info[] may leave more flexibility on this struct. how about your opinion? perhaps it's fine to embed the struct iommu_nesting_info here as long as VFIO is setup nesting based on IOMMU UAPI.
Quoted 5 lines
include/uapi/linux/vfio.h struct vfio_iommu_type1_info_cap_migration { · line 1053
Quoted 4 lines
include/uapi/linux/vfio.h +4
-0+*/ +struct vfio_iommu_type1_info_cap_nesting { +struct vfio_info_cap_header header; +__u32 flags;You may document flags.
sure. it's reserved for future.
Regards,
Yi Liu
Quoted 11 lines
include/uapi/linux/vfio.h struct vfio_iommu_type1_info_cap_migration { · line 1060
Quoted 8 lines
include/uapi/linux/vfio.h +4
-0+__u32 padding; +__u8 info[]; +}; +#define VFIO_IOMMU_GET_INFO _IO(VFIO_TYPE, VFIO_BASE + 12)/** Thanks
Eric
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v4 04/15] vfio/type1: Report iommu nesting info to userspace
Hi Yi,
Quoted 83 lines · Yi L
Hi Eric,
Quoted 12 lines
From: Auger Eric <[email protected]>
Sent: Monday, July 6, 2020 6:37 PMYi,
Quoted 6 lines · Liu Yi L
This patch exports iommu nesting capability info to user space through VFIO. User space is expected to check this info for supported uAPIs (e.g. PASID alloc/free, bind page table, and cache invalidation) and the vendor specific format information for first level/stage page table that will be bound to.
Quoted 8 lines
Quoted 7 lines
The nesting info is available only after the nesting iommu type is set for a container. Current implementation imposes one limitation - one nesting container should include at most one group. The philosophy of vfio container is having all groups/devices within the container share the same IOMMU context. When vSVA is enabled, one IOMMU context could include one 2nd-level address space and multiple 1st-level address spaces. While the 2nd-leve address space is reasonably sharable by multiple groups
level
oh, yes.
Quoted 47 lines
Quoted 21 lines
, blindly sharing 1st-level address spaces across all groups within the container might instead break the guest expectation. In the future sub/ super container concept might be introduced to allow partial address space sharing within an IOMMU context. But for now let's go with this restriction by requiring singleton container for using nesting iommu features. Below link has the related discussion about this decision.
https://lkml.org/lkml/2020/5/15/1028
Cc Kevin Tian <[email protected]>CC Jacob Pan <[email protected]>Cc Alex Williamson <[email protected]>Cc Eric Auger <[email protected]>Cc Jean-Philippe Brucker <[email protected]>Cc Joerg Roedel <[email protected]>Cc Lu Baolu <[email protected]>Signed-off-by Liu Yi L <[email protected]>---
v3 -> v4:
*) address comments against v3.Quoted 5 lines
v1 -> v2:
*) added in v2
---drivers/vfio/vfio_iommu_type1.c | 105+++++++++++++++++++++++++++++++++++-----
Quoted 20 lines
include/uapi/linux/vfio.h | 16 ++++++ 2 files changed, 109 insertions(+), 12 deletions(-)drivers/vfio/vfio_iommu_type1.c +0
-9@@ -62,18 +62,20 @@ MODULE_PARM_DESC(dma_entry_limit, "Maximum number of user DMA mappings per container (65535).");struct vfio_iommu { -struct list_head domain_list; -struct list_head iova_list; -struct vfio_domain *external_domain;/* domain for external user */ -struct mutex lock; -struct rb_root dma_list; -struct blocking_notifier_head notifier; -unsigned int dma_avail; -uint64_t pgsize_bitmap; -bool v2;Quoted 8 lines
drivers/vfio/vfio_iommu_type1.c MODULE_PARM_DESC(dma_entry_limit, · line 68
Quoted 7 lines
drivers/vfio/vfio_iommu_type1.c +4
-3-bool nesting; -bool dirty_page_tracking; -bool pinned_page_dirty_scope; +struct list_head domain_list; +struct list_head iova_list; +struct vfio_domain *external_domain;/* domain for +external user */ nit: put the comment before the field?
do you mean below?
Review
Quoted 2 lines
(quoted diff) +2
-0+ /* domain for external user */ + struct vfio_domain *external_domain;
yes that's what I meant
Quoted 188 lines
Quoted 13 lines
Quoted 13 lines
drivers/vfio/vfio_iommu_type1.c +10
-0+struct mutex lock; +struct rb_root dma_list; +struct blocking_notifier_head notifier; +unsigned int dma_avail; +uint64_t pgsize_bitmap; +bool v2; +bool nesting; +bool dirty_page_tracking; +bool pinned_page_dirty_scope; +struct iommu_nesting_info *nesting_info; };Quoted 8 lines
drivers/vfio/vfio_iommu_type1.c struct vfio_regions { · line 136
Quoted 7 lines
drivers/vfio/vfio_iommu_type1.c +2
-0struct vfio_domain {@@ -130,6 +132,9 @@ struct vfio_regions {#define IS_IOMMU_CAP_DOMAIN_IN_CONTAINER (iommu) \ (!list_empty(&iommu->domain_list)) +#define IS_DOMAIN_IN_CONTAINER (iommu) ((iommu->external_domain) || \ + (!list_empty(&iommu->domain_list)))rename into something like
CONTAINER_HAS_DOMAIN()?got it.
Quoted 39 lines
drivers/vfio/vfio_iommu_type1.c struct vfio_regions { · line 138
Quoted 2 lines
drivers/vfio/vfio_iommu_type1.c +1
-0+#define DIRTY_BITMAP_BYTES (n) (ALIGN(n, BITS_PER_TYPE(u64)) /
BITS_PER_BYTE)drivers/vfio/vfio_iommu_type1.c static void vfio_iommu_iova_insert_copy(struct
Quoted 3 lines
drivers/vfio/vfio_iommu_type1.c +0
-0/* @@ -1929,6 +1934,13 @@ static void vfio_iommu_iova_insert_copy(struct
vfio_iommu*iommu,drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_type1_attach_group(void
Quoted 14 lines
drivers/vfio/vfio_iommu_type1.c +7
-0list_splice_tail (iova_copy, iova); } + +static void vfio_iommu_release_nesting_info (struct vfio_iommu *iommu) +{ +kfree (iommu->nesting_info); + iommu->nesting_info =NULL ; +} +static int vfio_iommu_type1_attach_group (void *iommu_data,struct iommu_group *iommu_group) {@@ -1959,6 +1971,12 @@ static int vfio_iommu_type1_attach_group(void
*iommu_data,drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_type1_attach_group(void
Quoted 13 lines
drivers/vfio/vfio_iommu_type1.c +6
-0} } +/* Nesting type container can include only one group */ +if (iommu->nesting &&IS_DOMAIN_IN_CONTAINER (iommu)) { +mutex_unlock (&iommu->lock); +return -EINVAL ; + } + group =kzalloc (sizeof (*group),GFP_KERNEL ); domain =kzalloc (sizeof (*domain),GFP_KERNEL );if (!group || !domain) {@@ -2029,6 +2047,36 @@ static int vfio_iommu_type1_attach_group(void
*iommu_data,Quoted 3 lines
drivers/vfio/vfio_iommu_type1.c +0
-0if (ret) goto out_domain;Quoted 14 lines
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_type1_attach_group(void *iommu_data, · line 2062
Quoted 13 lines
drivers/vfio/vfio_iommu_type1.c +13
-0+/* Nesting cap info is available only after attaching */ +if (iommu->nesting) { +struct iommu_nesting_info tmp; +struct iommu_nesting_info *info; + +/* First get the size of vendor specific nesting info */ + ret =iommu_domain_get_attr (domain->domain, +DOMAIN_ATTR_NESTING , + &tmp); +if (ret) + goto out_detach; + + info =kzalloc (tmp.size,GFP_KERNEL );nit: you may directly use
iommu->nesting_infogot you.
Quoted 5 lines
Quoted 5 lines
drivers/vfio/vfio_iommu_type1.c +5
-0+if (!info) { + ret = -ENOMEM ; + goto out_detach; + } +Quoted 8 lines
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_type1_attach_group(void *iommu_data, · line 2074
Quoted 7 lines
drivers/vfio/vfio_iommu_type1.c +7
-0+/* Now get the nesting info */ + info->size = tmp.size; + ret =iommu_domain_get_attr (domain->domain, +DOMAIN_ATTR_NESTING , + info); +if (ret) { +kfree (info);... and set it back to NULL here if it fails
and maybe no need to free it here as
vfio_iommu_release_nesting_info()will free thenesting_info.Quoted 83 lines
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_type1_attach_group(void *iommu_data,
Quoted 7 lines
drivers/vfio/vfio_iommu_type1.c +5
-0+ goto out_detach; + } + iommu->nesting_info = info; + } +/* Get aperture info */ iommu_domain_get_attr(domain->domain, DOMAIN_ATTR_GEOMETRY,&geo);
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_type1_attach_group(void
Quoted 2 lines
drivers/vfio/vfio_iommu_type1.c +0
-0@@ -2138,6 +2186,7 @@ static int vfio_iommu_type1_attach_group(void
*iommu_data,drivers/vfio/vfio_iommu_type1.c static void vfio_iommu_type1_detach_group(void
Quoted 8 lines
drivers/vfio/vfio_iommu_type1.c +1
-0return 0 ; out_detach: +vfio_iommu_release_nesting_info (iommu);vfio_iommu_detach_group (domain, group); out_domain:iommu_domain_free (domain->domain);@@ -2338,6 +2387,8 @@ static void vfio_iommu_type1_detach_group(void
*iommu_data,drivers/vfio/vfio_iommu_type1.c static void vfio_iommu_type1_detach_group(void *iommu_data,
Quoted 3 lines
drivers/vfio/vfio_iommu_type1.c +0
-0vfio_iommu_unmap_unpin_all (iommu); elsevfio_iommu_unmap_unpin_reaccount(iommu);drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_migration_build_caps(struct
Quoted 6 lines
drivers/vfio/vfio_iommu_type1.c +2
-0+ +vfio_iommu_release_nesting_info (iommu); }iommu_domain_free (domain->domain);list_del (&domain->next);@@ -2546,6 +2597,30 @@ static int vfio_iommu_migration_build_caps(struct
vfio_iommu*iommu,drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_type1_get_info(struct
Quoted 31 lines
drivers/vfio/vfio_iommu_type1.c +24
-0return vfio_info_add_capability (caps, &cap_mig.header,sizeof (cap_mig)); } +static int vfio_iommu_info_add_nesting_cap (struct vfio_iommu *iommu, +struct vfio_info_cap *caps) +{ +struct vfio_info_cap_header *header; +struct vfio_iommu_type1_info_cap_nesting *nesting_cap; +size_t size; + + size =sizeof (*nesting_cap) + iommu->nesting_info->size; + + header =vfio_info_cap_add (caps, size, +VFIO_IOMMU_TYPE1_INFO_CAP_NESTING ,1 ); +if (IS_ERR (header)) +return PTR_ERR (header); + + nesting_cap =container_of (header, + struct vfio_iommu_type1_info_cap_nesting, + header); + +memcpy (&nesting_cap->info, iommu->nesting_info, + iommu->nesting_info->size); + +return 0 ; +} +static int vfio_iommu_type1_get_info (struct vfio_iommu *iommu,unsigned long arg) {@@ -2586,6 +2661,12 @@ static int vfio_iommu_type1_get_info(struct
vfio_iommu*iommu,Quoted 20 lines
drivers/vfio/vfio_iommu_type1.c +6
-0if (ret)return ret; +if (iommu->nesting_info) { + ret =vfio_iommu_info_add_nesting_cap (iommu, &caps); +if (ret) +return ret; + } +if (caps.size) { info.flags |=VFIO_IOMMU_INFO_CAPS ;include/uapi/linux/vfio.h +0
-0@@ -1039,6 +1039,22 @@ struct vfio_iommu_type1_info_cap_migration {__u64 max_dirty_bitmap_size;/* in bytes */ };Quoted 3 lines
include/uapi/linux/vfio.h struct vfio_iommu_type1_info_cap_migration { · line 1042
Quoted 1 line
include/uapi/linux/vfio.h +1
-0+#define VFIO_IOMMU_TYPE1_INFO_CAP_NESTING 3You may improve the documentation by taking examples from the above caps.
yes, it is. I somehow broke the style. how about below?
Quoted 7 lines
/*
* The nesting capability allows to report the related capability
* and info for nesting iommu type.
*
* The structures below define version 1 of this capability. *
* User space should check this cap for setup nesting iommu type.
before setting up stage 1 information? The wording above sounds a bit confusing to me as it can be interpreted as before choosing VFIO_TYPE1_NESTING_IOMMU.
You also need to document it returns the capability only after a group is attached - which looks strange by the way -.
Thanks
Eric
Quoted 49 lines
*
* @info: the nesting info provided by IOMMU driver. Today
* it is expected to be a structiommu_nesting_info
* data.
#defineVFIO_IOMMU_TYPE1_INFO_CAP_NESTING3struct vfio_iommu_type1_info_cap_nesting { ... };Quoted 8 lines
include/uapi/linux/vfio.h struct vfio_iommu_type1_info_cap_migration { · line 1049
Quoted 7 lines
include/uapi/linux/vfio.h +7
-0+ +/* +* Reporting nesting info to user space. +* +* @info: the nesting info provided by IOMMU driver. Today +* it is expected to be a struct iommu_nesting_info +* data. Is it expected to change?
honestly, I'm not quite sure on it. I did considered to embed struct
iommu_nesting_infohere instead of using info[]. but I hesitated as using info[] may leave more flexibility on this struct. how about your opinion? perhaps it's fine to embed the structiommu_nesting_infohere as long as VFIO is setup nesting based on IOMMU UAPI.Quoted 5 lines
include/uapi/linux/vfio.h struct vfio_iommu_type1_info_cap_migration { · line 1053
Quoted 4 lines
include/uapi/linux/vfio.h +4
-0+*/ +struct vfio_iommu_type1_info_cap_nesting { +struct vfio_info_cap_header header; +__u32 flags;You may document flags.
sure. it's reserved for future.
Regards,
Yi LiuQuoted 11 lines
include/uapi/linux/vfio.h struct vfio_iommu_type1_info_cap_migration { · line 1060
Quoted 8 lines
include/uapi/linux/vfio.h +4
-0+__u32 padding; +__u8 info[]; +}; +#define VFIO_IOMMU_GET_INFO _IO(VFIO_TYPE, VFIO_BASE + 12)/** Thanks
Eric
RE: [PATCH v4 04/15] vfio/type1: Report iommu nesting info to userspace
Hi Eric,
Quoted 87 lines
From: Auger Eric < [email protected] >
Sent: Monday, July 6, 2020 9:45 PMHi Yi,
Quoted 81 lines · Yi L
Hi Eric,
Quoted 12 lines
From: Auger Eric <[email protected]>
Sent: Monday, July 6, 2020 6:37 PMYi,
Quoted 6 lines · Liu Yi L
This patch exports iommu nesting capability info to user space through VFIO. User space is expected to check this info for supported uAPIs (e.g. PASID alloc/free, bind page table, and cache invalidation) and the vendor specific format information for first level/stage page table that will be bound to.
Quoted 8 lines
Quoted 7 lines
The nesting info is available only after the nesting iommu type is set for a container. Current implementation imposes one limitation - one nesting container should include at most one group. The philosophy of vfio container is having all groups/devices within the container share the same IOMMU context. When vSVA is enabled, one IOMMU context could include one 2nd-level address space and multiple 1st-level address spaces. While the 2nd-leve address space is reasonably sharable by multiple groups
level
oh, yes.
Quoted 55 lines
Quoted 21 lines
, blindly sharing 1st-level address spaces across all groups within the container might instead break the guest expectation. In the future sub/ super container concept might be introduced to allow partial address space sharing within an IOMMU context. But for now let's go with this restriction by requiring singleton container for using nesting iommu features. Below link has the related discussion about this decision.
https://lkml.org/lkml/2020/5/15/1028
Cc Kevin Tian <[email protected]>CC Jacob Pan <[email protected]>Cc Alex Williamson <[email protected]>Cc Eric Auger <[email protected]>Cc Jean-Philippe Brucker <[email protected]>Cc Joerg Roedel <[email protected]>Cc Lu Baolu <[email protected]>Signed-off-by Liu Yi L <[email protected]>---
v3 -> v4:
*) address comments against v3.Quoted 5 lines
v1 -> v2:
*) added in v2
---drivers/vfio/vfio_iommu_type1.c | 105+++++++++++++++++++++++++++++++++++-----
Quoted 17 lines
include/uapi/linux/vfio.h | 16 ++++++ 2 files changed, 109 insertions(+), 12 deletions(-)drivers/vfio/vfio_iommu_type1.c +0
-6@@ -62,18 +62,20 @@ MODULE_PARM_DESC(dma_entry_limit, "Maximum number of user DMA mappings per container (65535).");struct vfio_iommu { -struct list_head domain_list; -struct list_head iova_list; -struct vfio_domain *external_domain;/* domain for external user */ -struct mutex lock; -struct rb_root dma_list; -struct blocking_notifier_head notifier;drivers/vfio/vfio_iommu_type1.c MODULE_PARM_DESC(dma_entry_limit, · line 68
Quoted 10 lines
drivers/vfio/vfio_iommu_type1.c +4
-6-unsigned int dma_avail; -uint64_t pgsize_bitmap; -bool v2; -bool nesting; -bool dirty_page_tracking; -bool pinned_page_dirty_scope; +struct list_head domain_list; +struct list_head iova_list; +struct vfio_domain *external_domain;/* domain for +external user */ nit: put the comment before the field?
Quoted 5 lines
Review
Quoted 4 lines
do you mean below?
(quoted diff) +2
-0+ /* domain for external user */ + struct vfio_domain *external_domain;yes that's what I meant
got you. :-)
Quoted 196 lines
Quoted 189 lines
Quoted 13 lines
Quoted 13 lines
drivers/vfio/vfio_iommu_type1.c +10
-0+struct mutex lock; +struct rb_root dma_list; +struct blocking_notifier_head notifier; +unsigned int dma_avail; +uint64_t pgsize_bitmap; +bool v2; +bool nesting; +bool dirty_page_tracking; +bool pinned_page_dirty_scope; +struct iommu_nesting_info *nesting_info; };Quoted 6 lines
drivers/vfio/vfio_iommu_type1.c struct vfio_regions { · line 135
Quoted 6 lines
drivers/vfio/vfio_iommu_type1.c +1
-0struct vfio_domain {@@ -130,6 +132,9 @@ struct vfio_regions {#define IS_IOMMU_CAP_DOMAIN_IN_CONTAINER (iommu) \ (!list_empty(&iommu->domain_list)) +#define IS_DOMAIN_IN_CONTAINER (iommu) ((iommu-
external_domain) || \Quoted 2 lines
drivers/vfio/vfio_iommu_type1.c struct vfio_regions { · line 136
Quoted 1 line
drivers/vfio/vfio_iommu_type1.c +1
-0+ (!list_empty(&iommu->domain_list)))rename into something like
CONTAINER_HAS_DOMAIN()?got it.
Quoted 39 lines
drivers/vfio/vfio_iommu_type1.c struct vfio_regions { · line 138
Quoted 2 lines
drivers/vfio/vfio_iommu_type1.c +1
-0+#define DIRTY_BITMAP_BYTES (n) (ALIGN(n, BITS_PER_TYPE(u64)) /
BITS_PER_BYTE)drivers/vfio/vfio_iommu_type1.c static void vfio_iommu_iova_insert_copy(struct
Quoted 3 lines
drivers/vfio/vfio_iommu_type1.c +0
-0/* @@ -1929,6 +1934,13 @@ static void vfio_iommu_iova_insert_copy(struct
vfio_iommu*iommu,drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_type1_attach_group(void
Quoted 14 lines
drivers/vfio/vfio_iommu_type1.c +7
-0list_splice_tail (iova_copy, iova); } + +static void vfio_iommu_release_nesting_info (struct vfio_iommu *iommu) +{ +kfree (iommu->nesting_info); + iommu->nesting_info =NULL ; +} +static int vfio_iommu_type1_attach_group (void *iommu_data,struct iommu_group *iommu_group) {@@ -1959,6 +1971,12 @@ static int vfio_iommu_type1_attach_group(void
*iommu_data,drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_type1_attach_group(void
Quoted 13 lines
drivers/vfio/vfio_iommu_type1.c +6
-0} } +/* Nesting type container can include only one group */ +if (iommu->nesting &&IS_DOMAIN_IN_CONTAINER (iommu)) { +mutex_unlock (&iommu->lock); +return -EINVAL ; + } + group =kzalloc (sizeof (*group),GFP_KERNEL ); domain =kzalloc (sizeof (*domain),GFP_KERNEL );if (!group || !domain) {@@ -2029,6 +2047,36 @@ static int vfio_iommu_type1_attach_group(void
*iommu_data,Quoted 3 lines
drivers/vfio/vfio_iommu_type1.c +0
-0if (ret) goto out_domain;Quoted 14 lines
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_type1_attach_group(void *iommu_data, · line 2062
Quoted 13 lines
drivers/vfio/vfio_iommu_type1.c +13
-0+/* Nesting cap info is available only after attaching */ +if (iommu->nesting) { +struct iommu_nesting_info tmp; +struct iommu_nesting_info *info; + +/* First get the size of vendor specific nesting info */ + ret =iommu_domain_get_attr (domain->domain, +DOMAIN_ATTR_NESTING , + &tmp); +if (ret) + goto out_detach; + + info =kzalloc (tmp.size,GFP_KERNEL );nit: you may directly use
iommu->nesting_infogot you.
Quoted 5 lines
Quoted 5 lines
drivers/vfio/vfio_iommu_type1.c +5
-0+if (!info) { + ret = -ENOMEM ; + goto out_detach; + } +Quoted 8 lines
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_type1_attach_group(void *iommu_data, · line 2074
Quoted 7 lines
drivers/vfio/vfio_iommu_type1.c +7
-0+/* Now get the nesting info */ + info->size = tmp.size; + ret =iommu_domain_get_attr (domain->domain, +DOMAIN_ATTR_NESTING , + info); +if (ret) { +kfree (info);... and set it back to NULL here if it fails
and maybe no need to free it here as
vfio_iommu_release_nesting_info()will free thenesting_info.Quoted 83 lines
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_type1_attach_group(void *iommu_data,
Quoted 7 lines
drivers/vfio/vfio_iommu_type1.c +5
-0+ goto out_detach; + } + iommu->nesting_info = info; + } +/* Get aperture info */ iommu_domain_get_attr(domain->domain, DOMAIN_ATTR_GEOMETRY,&geo);
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_type1_attach_group(void
Quoted 2 lines
drivers/vfio/vfio_iommu_type1.c +0
-0@@ -2138,6 +2186,7 @@ static int vfio_iommu_type1_attach_group(void
*iommu_data,drivers/vfio/vfio_iommu_type1.c static void vfio_iommu_type1_detach_group(void
Quoted 8 lines
drivers/vfio/vfio_iommu_type1.c +1
-0return 0 ; out_detach: +vfio_iommu_release_nesting_info (iommu);vfio_iommu_detach_group (domain, group); out_domain:iommu_domain_free (domain->domain);@@ -2338,6 +2387,8 @@ static void vfio_iommu_type1_detach_group(void
*iommu_data,drivers/vfio/vfio_iommu_type1.c static void vfio_iommu_type1_detach_group(void *iommu_data,
Quoted 3 lines
drivers/vfio/vfio_iommu_type1.c +0
-0vfio_iommu_unmap_unpin_all (iommu); elsevfio_iommu_unmap_unpin_reaccount(iommu);drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_migration_build_caps(struct
Quoted 6 lines
drivers/vfio/vfio_iommu_type1.c +2
-0+ +vfio_iommu_release_nesting_info (iommu); }iommu_domain_free (domain->domain);list_del (&domain->next);@@ -2546,6 +2597,30 @@ static int vfio_iommu_migration_build_caps(struct
vfio_iommu*iommu,drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_type1_get_info(struct
Quoted 31 lines
drivers/vfio/vfio_iommu_type1.c +24
-0return vfio_info_add_capability (caps, &cap_mig.header,sizeof (cap_mig)); } +static int vfio_iommu_info_add_nesting_cap (struct vfio_iommu *iommu, +struct vfio_info_cap *caps) +{ +struct vfio_info_cap_header *header; +struct vfio_iommu_type1_info_cap_nesting *nesting_cap; +size_t size; + + size =sizeof (*nesting_cap) + iommu->nesting_info->size; + + header =vfio_info_cap_add (caps, size, +VFIO_IOMMU_TYPE1_INFO_CAP_NESTING ,1 ); +if (IS_ERR (header)) +return PTR_ERR (header); + + nesting_cap =container_of (header, + struct vfio_iommu_type1_info_cap_nesting, + header); + +memcpy (&nesting_cap->info, iommu->nesting_info, + iommu->nesting_info->size); + +return 0 ; +} +static int vfio_iommu_type1_get_info (struct vfio_iommu *iommu,unsigned long arg) {@@ -2586,6 +2661,12 @@ static int vfio_iommu_type1_get_info(struct
vfio_iommu*iommu,Quoted 20 lines
drivers/vfio/vfio_iommu_type1.c +6
-0if (ret)return ret; +if (iommu->nesting_info) { + ret =vfio_iommu_info_add_nesting_cap (iommu, &caps); +if (ret) +return ret; + } +if (caps.size) { info.flags |=VFIO_IOMMU_INFO_CAPS ;include/uapi/linux/vfio.h +0
-0@@ -1039,6 +1039,22 @@ struct vfio_iommu_type1_info_cap_migration {__u64 max_dirty_bitmap_size;/* in bytes */ };Quoted 3 lines
include/uapi/linux/vfio.h struct vfio_iommu_type1_info_cap_migration { · line 1042
Quoted 1 line
include/uapi/linux/vfio.h +1
-0+#define VFIO_IOMMU_TYPE1_INFO_CAP_NESTING 3You may improve the documentation by taking examples from the above caps.
yes, it is. I somehow broke the style. how about below?
Quoted 7 lines
/*
* The nesting capability allows to report the related capability
* and info for nesting iommu type.
*
* The structures below define version 1 of this capability. *
* User space should check this cap for setup nesting iommu type.
Quoted 4 lines
before setting up stage 1 information? The wording above sounds a bit confusing to me as it can be interpreted as before choosing
VFIO_TYPE1_NESTING_IOMMU.
oh, yep. this cap is available only for nesting type iommu. a.ka. VFIO_TYPE1_NESTING_IOMMU is selected.
Quoted 2 lines
You also need to document it returns the capability only after a group is attached - which looks strange by the way -.
I think this should be aligned with VFIO_IOMMU_GET_INFO usage. GET_INFO is meaningful after VFIO_SET_IOMMU, which includes group attaching.
Regards,
Yi Liu
Quoted 52 lines
Thanks
Eric
Quoted 49 lines
*
* @info: the nesting info provided by IOMMU driver. Today
* it is expected to be a structiommu_nesting_info
* data.
#defineVFIO_IOMMU_TYPE1_INFO_CAP_NESTING3struct vfio_iommu_type1_info_cap_nesting { ... };Quoted 8 lines
include/uapi/linux/vfio.h struct vfio_iommu_type1_info_cap_migration { · line 1049
Quoted 7 lines
include/uapi/linux/vfio.h +7
-0+ +/* +* Reporting nesting info to user space. +* +* @info: the nesting info provided by IOMMU driver. Today +* it is expected to be a struct iommu_nesting_info +* data. Is it expected to change?
honestly, I'm not quite sure on it. I did considered to embed struct
iommu_nesting_infohere instead of using info[]. but I hesitated as using info[] may leave more flexibility on this struct. how about your opinion? perhaps it's fine to embed the structiommu_nesting_infohere as long as VFIO is setup nesting based on IOMMU UAPI.Quoted 5 lines
include/uapi/linux/vfio.h struct vfio_iommu_type1_info_cap_migration { · line 1053
Quoted 4 lines
include/uapi/linux/vfio.h +4
-0+*/ +struct vfio_iommu_type1_info_cap_nesting { +struct vfio_info_cap_header header; +__u32 flags;You may document flags.
sure. it's reserved for future.
Regards,
Yi LiuQuoted 11 lines
include/uapi/linux/vfio.h struct vfio_iommu_type1_info_cap_migration { · line 1060
Quoted 8 lines
include/uapi/linux/vfio.h +4
-0+__u32 padding; +__u8 info[]; +}; +#define VFIO_IOMMU_GET_INFO _IO(VFIO_TYPE, VFIO_BASE + 12)/** Thanks
Eric
RE: [PATCH v4 04/15] vfio/type1: Report iommu nesting info to userspace
Hi Alex,
Eric asked if we will to have data strcut other than struct iommu_nesting_info type in the struct vfio_iommu_type1_info_cap_nesting @info[] field. I'm not quit sure on it. I guess the answer may be not as VFIO's nesting support should based on IOMMU UAPI. how about your opinion?
+#define VFIO_IOMMU_TYPE1_INFO_CAP_NESTING 3
+
+/*
+ * Reporting nesting info to user space.
+ *
+ * @info: the nesting info provided by IOMMU driver. Today
+ * it is expected to be a struct iommu_nesting_info
+ * data.
+ */
+struct vfio_iommu_type1_info_cap_nesting {
+ struct vfio_info_cap_header header;
+ __u32 flags;
+ __u32 padding;
+ __u8 info[];
+};
Regards,
Yi Liu
Quoted 3 lines
From: Liu, Yi L
Sent: Tuesday, July 7, 2020 5:32 PM
[...]
Quoted 34 lines
Quoted 34 lines
Quoted 34 lines
Quoted 9 lines
include/uapi/linux/vfio.h struct vfio_iommu_type1_info_cap_migration { · line 1049
Quoted 8 lines
include/uapi/linux/vfio.h +7
-0+ +/* +* Reporting nesting info to user space. +* +* @info: the nesting info provided by IOMMU driver. Today +* it is expected to be a struct iommu_nesting_info +* data. Is it expected to change?
honestly, I'm not quite sure on it. I did considered to embed struct
iommu_nesting_infohere instead of using info[]. but I hesitated as using info[] may leave more flexibility on this struct. how about your opinion? perhaps it's fine to embed the structiommu_nesting_infohere as long as VFIO is setup nesting based on IOMMU UAPI.Quoted 5 lines
include/uapi/linux/vfio.h struct vfio_iommu_type1_info_cap_migration { · line 1053
Quoted 4 lines
+ */
include/uapi/linux/vfio.h +3
-0+struct vfio_iommu_type1_info_cap_nesting { +struct vfio_info_cap_header header; +__u32 flags;You may document flags.
sure. it's reserved for future.
Regards,
Yi LiuQuoted 6 lines
Quoted 6 lines
include/uapi/linux/vfio.h +4
-0+__u32 padding; +__u8 info[]; +}; +#define VFIO_IOMMU_GET_INFO _IO(VFIO_TYPE, VFIO_BASE + 12)
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 5 lines
Quoted 2 lines
/**
Thanks
Eric
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v4 04/15] vfio/type1: Report iommu nesting info to userspace
Quoted 12 lines · Yi L
Hi Alex,
Eric asked if we will to have data strcut other than struct
iommu_nesting_infotype in the structvfio_iommu_type1_info_cap_nesting@info[] field. I'm not quit sure on it. I guess the answer may be not as VFIO's nesting support should based on IOMMU UAPI. how about your opinion?include/uapi/linux/vfio.h +5
-0+#define VFIO_IOMMU_TYPE1_INFO_CAP_NESTING 3 + +/* +* Reporting nesting info to user space. +*
include/uapi/linux/vfio.h struct vfio_iommu_type1_info_cap_migration { · line 1056
Quoted 10 lines
include/uapi/linux/vfio.h +10
-0+* @info: the nesting info provided by IOMMU driver. Today +* it is expected to be a struct iommu_nesting_info +* data. +*/ +struct vfio_iommu_type1_info_cap_nesting { +struct vfio_info_cap_header header; +__u32 flags; +__u32 padding; +__u8 info[]; +};
It's not a very useful uAPI if the user can't be sure what they're getting out of it. Info capabilities are "cheap", they don't need to be as extensible as an ioctl. It's not clear that we really even need the flags (and therefore the padding), just define it to return the IOMMU uAPI structure with no extensibility. If we need to expose something else, create a new capability. Thanks,
Alex
Quoted 51 lines
Regards,
Yi LiuQuoted 3 lines
From: Liu, Yi L
Sent: Tuesday, July 7, 2020 5:32 PM[...]
Quoted 40 lines
Quoted 40 lines
Quoted 40 lines
Quoted 9 lines
include/uapi/linux/vfio.h struct vfio_iommu_type1_info_cap_migration { · line 1049
Quoted 8 lines
include/uapi/linux/vfio.h +7
-0+ +/* +* Reporting nesting info to user space. +* +* @info: the nesting info provided by IOMMU driver. Today +* it is expected to be a struct iommu_nesting_info +* data. Is it expected to change?
honestly, I'm not quite sure on it. I did considered to embed struct
iommu_nesting_infohere instead of using info[]. but I hesitated as using info[] may leave more flexibility on this struct. how about your opinion? perhaps it's fine to embed the structiommu_nesting_infohere as long as VFIO is setup nesting based on IOMMU UAPI.Quoted 5 lines
include/uapi/linux/vfio.h struct vfio_iommu_type1_info_cap_migration { · line 1053
Quoted 4 lines
+ */
include/uapi/linux/vfio.h +3
-0+struct vfio_iommu_type1_info_cap_nesting { +struct vfio_info_cap_header header; +__u32 flags;You may document flags.
sure. it's reserved for future.
Regards,
Yi LiuQuoted 11 lines
include/uapi/linux/vfio.h struct vfio_iommu_type1_info_cap_migration { · line 1060
Quoted 8 lines
include/uapi/linux/vfio.h +4
-0+__u32 padding; +__u8 info[]; +}; +#define VFIO_IOMMU_GET_INFO _IO(VFIO_TYPE, VFIO_BASE + 12)/** Thanks
Eric
RE: [PATCH v4 04/15] vfio/type1: Report iommu nesting info to userspace
Hi Alex,
Quoted 27 lines
From: Alex Williamson <[email protected]>
Sent: Thursday, July 9, 2020 3:30 AMQuoted 21 lines · Yi L
Hi Alex,
Eric asked if we will to have data strcut other than struct
iommu_nesting_infotype in the structvfio_iommu_type1_info_cap_nesting@info[] field. I'm not quit sure on it. I guess the answer may be not as VFIO's nesting support should based on IOMMU UAPI. how about your opinion?(quoted diff) +14
-0+#define VFIO_IOMMU_TYPE1_INFO_CAP_NESTING 3 + +/* + * Reporting nesting info to user space. + * + * @info: the nesting info provided by IOMMU driver. Today + * it is expected to be a struct iommu_nesting_info + * data. + */ +struct vfio_iommu_type1_info_cap_nesting { + struct vfio_info_cap_header header; + __u32 flags; + __u32 padding; + __u8 info[];
Quoted 8 lines
Quoted 1 line
+};
It's not a very useful uAPI if the user can't be sure what they're getting out of it. Info capabilities are "cheap", they don't need to be as extensible as an ioctl. It's not clear that we really even need the flags (and therefore the padding), just define it to return the IOMMU uAPI structure with no extensibility. If we need to expose something else, create a new capability. Thanks,
thanks for the guiding, then I may embed the struct iommu_nesting_info here. :-)
Regards,
Yi Liu
Quoted 55 lines
Alex
Quoted 2 lines
iommu/[email protected] prd11.prod.outlook.com/
Quoted 49 lines
Regards,
Yi LiuQuoted 3 lines
From: Liu, Yi L
Sent: Tuesday, July 7, 2020 5:32 PM[...]
Quoted 40 lines
Quoted 40 lines
Quoted 40 lines
Quoted 9 lines
Review
Quoted 8 lines
(quoted diff) +7
-0+ +/* + * Reporting nesting info to user space. + * + * @info: the nesting info provided by IOMMU driver. Today + * it is expected to be a struct iommu_nesting_info + * data.Is it expected to change?
honestly, I'm not quite sure on it. I did considered to embed struct
iommu_nesting_infohere instead of using info[]. but I hesitated as using info[] may leave more flexibility on this struct. how about your opinion? perhaps it's fine to embed the structiommu_nesting_infohere as long as VFIO is setup nesting based on IOMMU UAPI.Quoted 5 lines
Review
Quoted 4 lines
+ */
(quoted diff) +3
-0+struct vfio_iommu_type1_info_cap_nesting { + struct vfio_info_cap_header header; + __u32 flags;You may document flags.
sure. it's reserved for future.
Regards,
Yi LiuQuoted 11 lines
Review
Quoted 8 lines
(quoted diff) +4
-0+ __u32 padding; + __u8 info[]; +}; + #define VFIO_IOMMU_GET_INFO _IO(VFIO_TYPE, VFIO_BASE + 12) /**Thanks
Eric
Re: [PATCH v4 04/15] vfio/type1: Report iommu nesting info to userspace
In reply to Liu Yi LHi Yi,
Quoted 202 lines · Liu Yi L
This patch exports iommu nesting capability info to user space through VFIO. User space is expected to check this info for supported uAPIs (e.g. PASID alloc/free, bind page table, and cache invalidation) and the vendor specific format information for first level/stage page table that will be bound to.
The nesting info is available only after the nesting iommu type is set for a container. Current implementation imposes one limitation - one nesting container should include at most one group. The philosophy of vfio container is having all groups/devices within the container share the same IOMMU context. When vSVA is enabled, one IOMMU context could include one 2nd-level address space and multiple 1st-level address spaces. While the 2nd-leve address space is reasonably sharable by multiple groups , blindly sharing 1st-level address spaces across all groups within the container might instead break the guest expectation. In the future sub/ super container concept might be introduced to allow partial address space sharing within an IOMMU context. But for now let's go with this restriction by requiring singleton container for using nesting iommu features. Below link has the related discussion about this decision.
https://lkml.org/lkml/2020/5/15/1028
Cc Kevin Tian <[email protected]>CC Jacob Pan <[email protected]>Cc Alex Williamson <[email protected]>Cc Eric Auger <[email protected]>Cc Jean-Philippe Brucker <[email protected]>Cc Joerg Roedel <[email protected]>Cc Lu Baolu <[email protected]>Signed-off-by Liu Yi L <[email protected]>---
v3 -> v4:
*) address comments against v3.v1 -> v2:
*) added in v2
---drivers/vfio/vfio_iommu_type1.c | 105 +++++++++++++++++++++++++++++++++++----- include/uapi/linux/vfio.h | 16 ++++++ 2 files changed, 109 insertions(+), 12 deletions(-)drivers/vfio/vfio_iommu_type1.c +87
-12@@ -62,18 +62,20 @@ MODULE_PARM_DESC(dma_entry_limit, "Maximum number of user DMA mappings per container (65535).");struct vfio_iommu { -struct list_head domain_list; -struct list_head iova_list; -struct vfio_domain *external_domain;/* domain for external user */ -struct mutex lock; -struct rb_root dma_list; -struct blocking_notifier_head notifier; -unsigned int dma_avail; -uint64_t pgsize_bitmap; -bool v2; -bool nesting; -bool dirty_page_tracking; -bool pinned_page_dirty_scope; +struct list_head domain_list; +struct list_head iova_list; +struct vfio_domain *external_domain;/* domain for +external user */ +struct mutex lock; +struct rb_root dma_list; +struct blocking_notifier_head notifier; +unsigned int dma_avail; +uint64_t pgsize_bitmap; +bool v2; +bool nesting; +bool dirty_page_tracking; +bool pinned_page_dirty_scope; +struct iommu_nesting_info *nesting_info; };struct vfio_domain {@@ -130,6 +132,9 @@ struct vfio_regions {#define IS_IOMMU_CAP_DOMAIN_IN_CONTAINER (iommu) \ (!list_empty(&iommu->domain_list)) +#define IS_DOMAIN_IN_CONTAINER (iommu) ((iommu->external_domain) || \ + (!list_empty(&iommu->domain_list))) +#define DIRTY_BITMAP_BYTES (n) (ALIGN(n, BITS_PER_TYPE(u64)) / BITS_PER_BYTE)/* @@ -1929,6 +1934,13 @@ static void vfio_iommu_iova_insert_copy(struct vfio_iommu *iommu,list_splice_tail (iova_copy, iova); } + +static void vfio_iommu_release_nesting_info (struct vfio_iommu *iommu) +{ +kfree (iommu->nesting_info); + iommu->nesting_info =NULL ; +} +static int vfio_iommu_type1_attach_group (void *iommu_data,struct iommu_group *iommu_group) {@@ -1959,6 +1971,12 @@ static int vfio_iommu_type1_attach_group(void *iommu_data, } } +/* Nesting type container can include only one group */ +if (iommu->nesting &&IS_DOMAIN_IN_CONTAINER (iommu)) { +mutex_unlock (&iommu->lock); +return -EINVAL ; + } + group =kzalloc (sizeof (*group),GFP_KERNEL ); domain =kzalloc (sizeof (*domain),GFP_KERNEL );if (!group || !domain) {@@ -2029,6 +2047,36 @@ static int vfio_iommu_type1_attach_group(void *iommu_data,if (ret) goto out_domain; +/* Nesting cap info is available only after attaching */ +if (iommu->nesting) { +struct iommu_nesting_info tmp; +struct iommu_nesting_info *info; + +/* First get the size of vendor specific nesting info */ + ret =iommu_domain_get_attr (domain->domain, +DOMAIN_ATTR_NESTING , + &tmp); +if (ret) + goto out_detach; + + info =kzalloc (tmp.size,GFP_KERNEL ); +if (!info) { + ret = -ENOMEM ; + goto out_detach; + } + +/* Now get the nesting info */ + info->size = tmp.size; + ret =iommu_domain_get_attr (domain->domain, +DOMAIN_ATTR_NESTING , + info); +if (ret) { +kfree (info); + goto out_detach; + } + iommu->nesting_info = info; + } +/* Get aperture info */ iommu_domain_get_attr (domain->domain,DOMAIN_ATTR_GEOMETRY , &geo);@@ -2138,6 +2186,7 @@ static int vfio_iommu_type1_attach_group(void *iommu_data,return 0 ; out_detach: +vfio_iommu_release_nesting_info (iommu);vfio_iommu_detach_group (domain, group); out_domain:iommu_domain_free (domain->domain);@@ -2338,6 +2387,8 @@ static void vfio_iommu_type1_detach_group(void *iommu_data,vfio_iommu_unmap_unpin_all (iommu); elsevfio_iommu_unmap_unpin_reaccount (iommu ); + +vfio_iommu_release_nesting_info (iommu); }iommu_domain_free (domain->domain);list_del (&domain->next);@@ -2546,6 +2597,30 @@ static int vfio_iommu_migration_build_caps(struct vfio_iommu *iommu,return vfio_info_add_capability (caps, &cap_mig.header,sizeof (cap_mig)); } +static int vfio_iommu_info_add_nesting_cap (struct vfio_iommu *iommu, +struct vfio_info_cap *caps) +{ +struct vfio_info_cap_header *header; +struct vfio_iommu_type1_info_cap_nesting *nesting_cap; +size_t size; + + size =sizeof (*nesting_cap) + iommu->nesting_info->size; + + header =vfio_info_cap_add (caps, size, +VFIO_IOMMU_TYPE1_INFO_CAP_NESTING ,1 ); +if (IS_ERR (header)) +return PTR_ERR (header); + + nesting_cap =container_of (header, + struct vfio_iommu_type1_info_cap_nesting, + header); + +memcpy (&nesting_cap->info, iommu->nesting_info, + iommu->nesting_info->size); + +return 0 ; +} +static int vfio_iommu_type1_get_info (struct vfio_iommu *iommu,unsigned long arg) {
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_type1_get_info(struct vfio_iommu *iommu, · line 2665
Quoted 5 lines
drivers/vfio/vfio_iommu_type1.c +2
-0@@ -2586,6 +2661,12 @@ static int vfio_iommu_type1_get_info(struct vfio_iommu *iommu,if (ret)return ret; +if (iommu->nesting_info) { + ret =vfio_iommu_info_add_nesting_cap (iommu, &caps);
I think this should happen while holding the &iommu->lock because nothing prevents the group from being detached in-between
Thanks
Eric
Quoted 35 lines
drivers/vfio/vfio_iommu_type1.c +4
-0+if (ret) +return ret; + } +if (caps.size) { info.flags |=VFIO_IOMMU_INFO_CAPS ;include/uapi/linux/vfio.h +16
-0@@ -1039,6 +1039,22 @@ struct vfio_iommu_type1_info_cap_migration {__u64 max_dirty_bitmap_size;/* in bytes */ }; +#define VFIO_IOMMU_TYPE1_INFO_CAP_NESTING 3 + +/* +* Reporting nesting info to user space. +* +* @info: the nesting info provided by IOMMU driver. Today +* it is expected to be a struct iommu_nesting_info +* data. +*/ +struct vfio_iommu_type1_info_cap_nesting { +struct vfio_info_cap_header header; +__u32 flags; +__u32 padding; +__u8 info[]; +}; +#define VFIO_IOMMU_GET_INFO _IO(VFIO_TYPE, VFIO_BASE + 12)/**
RE: [PATCH v4 04/15] vfio/type1: Report iommu nesting info to userspace
Hi Eric,
Quoted 218 lines
From: Auger Eric <[email protected]>
Sent: Monday, July 6, 2020 10:07 PMHi Yi,
Quoted 34 lines · Liu Yi L
This patch exports iommu nesting capability info to user space through VFIO. User space is expected to check this info for supported uAPIs (e.g. PASID alloc/free, bind page table, and cache invalidation) and the vendor specific format information for first level/stage page table that will be bound to.
The nesting info is available only after the nesting iommu type is set for a container. Current implementation imposes one limitation - one nesting container should include at most one group. The philosophy of vfio container is having all groups/devices within the container share the same IOMMU context. When vSVA is enabled, one IOMMU context could include one 2nd-level address space and multiple 1st-level address spaces. While the 2nd-leve address space is reasonably sharable by multiple groups , blindly sharing 1st-level address spaces across all groups within the container might instead break the guest expectation. In the future sub/ super container concept might be introduced to allow partial address space sharing within an IOMMU context. But for now let's go with this restriction by requiring singleton container for using nesting iommu features. Below link has the related discussion about this decision.
https://lkml.org/lkml/2020/5/15/1028
Cc Kevin Tian <[email protected]>CC Jacob Pan <[email protected]>Cc Alex Williamson <[email protected]>Cc Eric Auger <[email protected]>Cc Jean-Philippe Brucker <[email protected]>Cc Joerg Roedel <[email protected]>Cc Lu Baolu <[email protected]>Signed-off-by Liu Yi L <[email protected]>---
v3 -> v4:
*) address comments against v3.Quoted 5 lines
v1 -> v2:
*) added in v2
---drivers/vfio/vfio_iommu_type1.c | 105+++++++++++++++++++++++++++++++++++-----
Quoted 41 lines
include/uapi/linux/vfio.h | 16 ++++++ 2 files changed, 109 insertions(+), 12 deletions(-)drivers/vfio/vfio_iommu_type1.c +14
-12@@ -62,18 +62,20 @@ MODULE_PARM_DESC(dma_entry_limit, "Maximum number of user DMA mappings per container (65535).");struct vfio_iommu { -struct list_head domain_list; -struct list_head iova_list; -struct vfio_domain *external_domain;/* domain for external user */ -struct mutex lock; -struct rb_root dma_list; -struct blocking_notifier_head notifier; -unsigned int dma_avail; -uint64_t pgsize_bitmap; -bool v2; -bool nesting; -bool dirty_page_tracking; -bool pinned_page_dirty_scope; +struct list_head domain_list; +struct list_head iova_list; +struct vfio_domain *external_domain;/* domain for +external user */ +struct mutex lock; +struct rb_root dma_list; +struct blocking_notifier_head notifier; +unsigned int dma_avail; +uint64_t pgsize_bitmap; +bool v2; +bool nesting; +bool dirty_page_tracking; +bool pinned_page_dirty_scope; +struct iommu_nesting_info *nesting_info; };struct vfio_domain {drivers/vfio/vfio_iommu_type1.c struct vfio_regions { · line 138
Quoted 7 lines
drivers/vfio/vfio_iommu_type1.c +3
-0@@ -130,6 +132,9 @@ struct vfio_regions {#define IS_IOMMU_CAP_DOMAIN_IN_CONTAINER (iommu) \ (!list_empty(&iommu->domain_list)) +#define IS_DOMAIN_IN_CONTAINER (iommu) ((iommu->external_domain) || \ + (!list_empty(&iommu->domain_list))) +#define DIRTY_BITMAP_BYTES (n) (ALIGN(n, BITS_PER_TYPE(u64)) /
BITS_PER_BYTE)drivers/vfio/vfio_iommu_type1.c static void vfio_iommu_iova_insert_copy(struct
Quoted 3 lines
drivers/vfio/vfio_iommu_type1.c +0
-0/* @@ -1929,6 +1934,13 @@ static void vfio_iommu_iova_insert_copy(struct
vfio_iommu*iommu,drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_type1_attach_group(void
Quoted 14 lines
drivers/vfio/vfio_iommu_type1.c +7
-0list_splice_tail (iova_copy, iova); } + +static void vfio_iommu_release_nesting_info (struct vfio_iommu *iommu) +{ +kfree (iommu->nesting_info); + iommu->nesting_info =NULL ; +} +static int vfio_iommu_type1_attach_group (void *iommu_data,struct iommu_group *iommu_group) {@@ -1959,6 +1971,12 @@ static int vfio_iommu_type1_attach_group(void
*iommu_data,drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_type1_attach_group(void
Quoted 13 lines
drivers/vfio/vfio_iommu_type1.c +6
-0} } +/* Nesting type container can include only one group */ +if (iommu->nesting &&IS_DOMAIN_IN_CONTAINER (iommu)) { +mutex_unlock (&iommu->lock); +return -EINVAL ; + } + group =kzalloc (sizeof (*group),GFP_KERNEL ); domain =kzalloc (sizeof (*domain),GFP_KERNEL );if (!group || !domain) {@@ -2029,6 +2047,36 @@ static int vfio_iommu_type1_attach_group(void
*iommu_data,Quoted 25 lines
drivers/vfio/vfio_iommu_type1.c +22
-0if (ret) goto out_domain; +/* Nesting cap info is available only after attaching */ +if (iommu->nesting) { +struct iommu_nesting_info tmp; +struct iommu_nesting_info *info; + +/* First get the size of vendor specific nesting info */ + ret =iommu_domain_get_attr (domain->domain, +DOMAIN_ATTR_NESTING , + &tmp); +if (ret) + goto out_detach; + + info =kzalloc (tmp.size,GFP_KERNEL ); +if (!info) { + ret = -ENOMEM ; + goto out_detach; + } + +/* Now get the nesting info */ + info->size = tmp.size; + ret = iommu_domain_get_attr(domain->domain, + DOMAIN_ATTR_NESTING,drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_type1_attach_group(void *iommu_data,
Quoted 10 lines
drivers/vfio/vfio_iommu_type1.c +8
-0+ info); +if (ret) { +kfree (info); + goto out_detach; + } + iommu->nesting_info = info; + } +/* Get aperture info */ iommu_domain_get_attr(domain->domain, DOMAIN_ATTR_GEOMETRY,&geo);
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_type1_attach_group(void
Quoted 2 lines
drivers/vfio/vfio_iommu_type1.c +0
-0@@ -2138,6 +2186,7 @@ static int vfio_iommu_type1_attach_group(void
*iommu_data,drivers/vfio/vfio_iommu_type1.c static void vfio_iommu_type1_detach_group(void
Quoted 8 lines
drivers/vfio/vfio_iommu_type1.c +1
-0return 0 ; out_detach: +vfio_iommu_release_nesting_info (iommu);vfio_iommu_detach_group (domain, group); out_domain:iommu_domain_free (domain->domain);@@ -2338,6 +2387,8 @@ static void vfio_iommu_type1_detach_group(void
*iommu_data,drivers/vfio/vfio_iommu_type1.c static void vfio_iommu_type1_detach_group(void *iommu_data,
Quoted 3 lines
drivers/vfio/vfio_iommu_type1.c +0
-0vfio_iommu_unmap_unpin_all (iommu); elsevfio_iommu_unmap_unpin_reaccount(iommu);drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_migration_build_caps(struct
Quoted 6 lines
drivers/vfio/vfio_iommu_type1.c +2
-0+ +vfio_iommu_release_nesting_info (iommu); }iommu_domain_free (domain->domain);list_del (&domain->next);@@ -2546,6 +2597,30 @@ static int vfio_iommu_migration_build_caps(struct
vfio_iommu*iommu,drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_type1_get_info(struct
Quoted 31 lines
drivers/vfio/vfio_iommu_type1.c +24
-0return vfio_info_add_capability (caps, &cap_mig.header,sizeof (cap_mig)); } +static int vfio_iommu_info_add_nesting_cap (struct vfio_iommu *iommu, +struct vfio_info_cap *caps) +{ +struct vfio_info_cap_header *header; +struct vfio_iommu_type1_info_cap_nesting *nesting_cap; +size_t size; + + size =sizeof (*nesting_cap) + iommu->nesting_info->size; + + header =vfio_info_cap_add (caps, size, +VFIO_IOMMU_TYPE1_INFO_CAP_NESTING ,1 ); +if (IS_ERR (header)) +return PTR_ERR (header); + + nesting_cap =container_of (header, + struct vfio_iommu_type1_info_cap_nesting, + header); + +memcpy (&nesting_cap->info, iommu->nesting_info, + iommu->nesting_info->size); + +return 0 ; +} +static int vfio_iommu_type1_get_info (struct vfio_iommu *iommu,unsigned long arg) {@@ -2586,6 +2661,12 @@ static int vfio_iommu_type1_get_info(struct
vfio_iommu*iommu,
Quoted 7 lines
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_type1_get_info(struct vfio_iommu *iommu, · line 2665
Quoted 5 lines
drivers/vfio/vfio_iommu_type1.c +2
-0if (ret)return ret; +if (iommu->nesting_info) { + ret =vfio_iommu_info_add_nesting_cap (iommu, &caps);I think this should happen while holding the
&iommu->lockbecause nothing prevents the group from being detached in-between
yes, you're right. will correct it.
Regards,
Yi Liu
Quoted 38 lines
Thanks
Eric
Quoted 35 lines
drivers/vfio/vfio_iommu_type1.c +4
-0+if (ret) +return ret; + } +if (caps.size) { info.flags |=VFIO_IOMMU_INFO_CAPS ;include/uapi/linux/vfio.h +16
-0@@ -1039,6 +1039,22 @@ struct vfio_iommu_type1_info_cap_migration {__u64 max_dirty_bitmap_size;/* in bytes */ }; +#define VFIO_IOMMU_TYPE1_INFO_CAP_NESTING 3 + +/* +* Reporting nesting info to user space. +* +* @info: the nesting info provided by IOMMU driver. Today +* it is expected to be a struct iommu_nesting_info +* data. +*/ +struct vfio_iommu_type1_info_cap_nesting { +struct vfio_info_cap_header header; +__u32 flags; +__u32 padding; +__u8 info[]; +}; +#define VFIO_IOMMU_GET_INFO _IO(VFIO_TYPE, VFIO_BASE + 12)/**
PATCH v4 5/15 vfio: Add PASID allocation/free support
In reply to Liu Yi LShared Virtual Addressing (a.k.a Shared Virtual Memory) allows sharing multiple process virtual address spaces with the device for simplified programming model. PASID is used to tag an virtual address space in DMA requests and to identify the related translation structure in IOMMU. When a PASID-capable device is assigned to a VM, we want the same capability of using PASID to tag guest process virtual address spaces to achieve virtual SVA (vSVA).
PASID management for guest is vendor specific. Some vendors (e.g. Intel VT-d) requires system-wide managed PASIDs cross all devices, regardless of whether a device is used by host or assigned to guest. Other vendors (e.g. ARM SMMU) may allow PASIDs managed per-device thus could be fully delegated to the guest for assigned devices.
For system-wide managed PASIDs, this patch introduces a vfio module to handle explicit PASID alloc/free requests from guest. Allocated PASIDs are associated to a process (or, mm_struct) in IOASID core. A vfio_mm object is introduced to track mm_struct. Multiple VFIO containers within a process share the same vfio_mm object.
A quota mechanism is provided to prevent malicious user from exhausting available PASIDs. Currently the quota is a global parameter applied to all VFIO devices. In the future per-device quota might be supported too.
---
v3 -> v4:
*) fix lock leam in vfio_mm_get_from_task()
*) drop pasid_quota field in struct vfio_mm
*) vfio_mm_get_from_task() returns ERR_PTR(-ENOTTY) when !CONFIG_VFIO_PASID
v1 -> v2:
*) added in v2, split from the pasid alloc/free support of v1
--- drivers/vfio/Kconfig | 5 ++ drivers/vfio/Makefile | 1 + drivers/vfio/vfio_pasid.c | 152 ++++++++++++++++++++++++++++++++++++++++++++++ include/linux/vfio.h | 28 +++++++++ 4 files changed, 186 insertions(+) create mode 100644 drivers/vfio/vfio_pasid.c
drivers/vfio/Kconfig +5 -0
@@ -19,6 +19,11 @@ config VFIO_VIRQFD depends on VFIO && EVENTFD default n +config VFIO_PASID + tristate + depends on IOASID && VFIO + default n + menuconfig VFIO tristate "VFIO Non-Privileged userspace driver framework" depends on IOMMU_API
drivers/vfio/Makefile +1 -0
@@ -3,6 +3,7 @@ vfio_virqfd-y := virqfd.o obj-$(CONFIG_VFIO) += vfio.o obj-$(CONFIG_VFIO_VIRQFD) += vfio_virqfd.o +obj-$(CONFIG_VFIO_PASID) += vfio_pasid.o obj-$(CONFIG_VFIO_IOMMU_TYPE1) += vfio_iommu_type1.o obj-$(CONFIG_VFIO_IOMMU_SPAPR_TCE) += vfio_iommu_spapr_tce.o obj-$(CONFIG_VFIO_SPAPR_EEH) += vfio_spapr_eeh.o
drivers/vfio/vfio_pasid.c new file +152 -0
152 lines not on this page · raw message
include/linux/vfio.h +28 -0
@@ -97,6 +97,34 @@ extern int vfio_register_iommu_driver(const struct vfio_iommu_driver_ops *ops);extern void vfio_unregister_iommu_driver (const struct vfio_iommu_driver_ops *ops); +struct vfio_mm ; +#if IS_ENABLED (CONFIG_VFIO_PASID ) +extern struct vfio_mm *vfio_mm_get_from_task (struct task_struct *task); +extern void vfio_mm_put (struct vfio_mm *vmm); +extern int vfio_pasid_alloc (struct vfio_mm *vmm,int min,int max); +extern void vfio_pasid_free_range (struct vfio_mm *vmm, +ioasid_t min,ioasid_t max); +#else +static inline struct vfio_mm *vfio_mm_get_from_task (struct task_struct *task) +{ +return ERR_PTR (-ENOTTY ); +} + +static inline void vfio_mm_put (struct vfio_mm *vmm) +{ +} + +static inline int vfio_pasid_alloc (struct vfio_mm *vmm,int min,int max) +{ +return -ENOTTY ; +} + +static inline void vfio_pasid_free_range (struct vfio_mm *vmm, +ioasid_t min,ioasid_t max) +{ +} +#endif /* CONFIG_VFIO_PASID */ +/* * External user API */
Signature · 6 lines
2.7.4 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v4 05/15] vfio: Add PASID allocation/free support
Hi Yi,
Quoted 195 lines · Liu Yi L
Shared Virtual Addressing (a.k.a Shared Virtual Memory) allows sharing multiple process virtual address spaces with the device for simplified programming model. PASID is used to tag an virtual address space in DMA requests and to identify the related translation structure in IOMMU. When a PASID-capable device is assigned to a VM, we want the same capability of using PASID to tag guest process virtual address spaces to achieve virtual SVA (vSVA).
PASID management for guest is vendor specific. Some vendors (e.g. Intel VT-d) requires system-wide managed PASIDs cross all devices, regardless of whether a device is used by host or assigned to guest. Other vendors (e.g. ARM SMMU) may allow PASIDs managed per-device thus could be fully delegated to the guest for assigned devices.
For system-wide managed PASIDs, this patch introduces a vfio module to handle explicit PASID alloc/free requests from guest. Allocated PASIDs are associated to a process (or,
mm_struct) in IOASID core. Avfio_mmobject is introduced to trackmm_struct. Multiple VFIO containers within a process share the samevfio_mmobject.A quota mechanism is provided to prevent malicious user from exhausting available PASIDs. Currently the quota is a global parameter applied to all VFIO devices. In the future per-device quota might be supported too.
Cc Kevin Tian <[email protected]>CC Jacob Pan <[email protected]>Cc Eric Auger <[email protected]>Cc Jean-Philippe Brucker <[email protected]>Cc Joerg Roedel <[email protected]>Cc Lu Baolu <[email protected]>Suggested-by Alex Williamson <[email protected]>Signed-off-by Liu Yi L <[email protected]>---
v3 -> v4:
*) fix lock leam invfio_mm_get_from_task()
*) droppasid_quotafield in structvfio_mm
*)vfio_mm_get_from_task()returnsERR_PTR(-ENOTTY)when !CONFIG_VFIO_PASIDv1 -> v2:
*) added in v2, split from the pasid alloc/free support of v1--- drivers/vfio/Kconfig | 5 ++ drivers/vfio/Makefile | 1 + drivers/vfio/vfio_pasid.c | 152 ++++++++++++++++++++++++++++++++++++++++++++++ include/linux/vfio.h | 28 +++++++++ 4 files changed, 186 insertions(+) create mode 100644 drivers/vfio/vfio_pasid.cdrivers/vfio/Kconfig +5
-0@@ -19,6 +19,11 @@ config VFIO_VIRQFD depends on VFIO && EVENTFD default n +config VFIO_PASID + tristate + depends on IOASID && VFIO + default n + menuconfig VFIO tristate "VFIO Non-Privileged userspace driver framework" depends on IOMMU_APIdrivers/vfio/Makefile +1
-0@@ -3,6 +3,7 @@ vfio_virqfd-y := virqfd.o obj-$(CONFIG_VFIO) += vfio.o obj-$(CONFIG_VFIO_VIRQFD) += vfio_virqfd.o +obj-$(CONFIG_VFIO_PASID) += vfio_pasid.o obj-$(CONFIG_VFIO_IOMMU_TYPE1) += vfio_iommu_type1.o obj-$(CONFIG_VFIO_IOMMU_SPAPR_TCE) += vfio_iommu_spapr_tce.o obj-$(CONFIG_VFIO_SPAPR_EEH) += vfio_spapr_eeh.odrivers/vfio/vfio_pasid.c new file +113
-0@@ -0,0 +1,152 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Copyright (C) 2020 Intel Corporation. +* Author: Liu Yi L <[email protected]> +* +*/ + +#include <linux/vfio.h> +#include <linux/eventfd.h> +#include <linux/file.h> +#include <linux/module.h> +#include <linux/slab.h> +#include <linux/sched/mm.h> + +#define DRIVER_VERSION "0.1" +#define DRIVER_AUTHOR "Liu Yi L <[email protected]>" +#define DRIVER_DESC "PASID management for VFIO bus drivers" + +#define VFIO_DEFAULT_PASID_QUOTA 1000 +static int pasid_quota =VFIO_DEFAULT_PASID_QUOTA ; +module_param_named (pasid_quota, pasid_quota, uint,0444 ); +MODULE_PARM_DESC (pasid_quota, +" Set the quota for max number of PASIDs that an application is allowed to request (default 1000)" ); + +struct vfio_mm_token { +unsigned long long val; +}; + +struct vfio_mm { +struct kref kref; +int ioasid_sid; +struct list_head next; +struct vfio_mm_token token; +}; + +static struct vfio_pasid { +struct mutex vfio_mm_lock; +struct list_head vfio_mm_list; +} vfio_pasid; + +/* called with vfio.vfio_mm_lock held */ +static void vfio_mm_release (struct kref *kref) +{ + struct vfio_mm *vmm = container_of(kref, struct vfio_mm, kref); + +list_del (&vmm->next); +mutex_unlock (&vfio_pasid.vfio_mm_lock); +ioasid_free_set (vmm->ioasid_sid, true); +kfree (vmm); +} + +void vfio_mm_put (struct vfio_mm *vmm) +{ +kref_put_mutex (&vmm->kref, vfio_mm_release, &vfio_pasid.vfio_mm_lock); +} + +static void vfio_mm_get (struct vfio_mm *vmm) +{ +kref_get (&vmm->kref); +} + +struct vfio_mm *vfio_mm_get_from_task (struct task_struct *task) +{ +struct mm_struct *mm =get_task_mm (task); +struct vfio_mm *vmm; +unsigned long long val = (unsigned long long ) mm; +int ret; + +mutex_lock (&vfio_pasid.vfio_mm_lock); +/* Search existing vfio_mm with current mm pointer */ +list_for_each_entry (vmm, &vfio_pasid.vfio_mm_list, next) { +if (vmm->token.val == val) { +vfio_mm_get (vmm); + goto out; + } + } + + vmm =kzalloc (sizeof (*vmm),GFP_KERNEL ); +if (!vmm) { + vmm =ERR_PTR (-ENOMEM ); + goto out; + } + +/* +* IOASID core provides a 'IOASID set' concept to track all +* PASIDs associated with a token. Here we use mm_struct as +* the token and create a IOASID set per mm_struct. All the +* containers of the process share the same IOASID set. +*/ + ret =ioasid_alloc_set ((struct ioasid_set *) mm, pasid_quota, + &vmm->ioasid_sid); +if (ret) { +kfree (vmm); + vmm =ERR_PTR (ret); + goto out; + } + +kref_init (&vmm->kref); + vmm->token.val = val; + +list_add (&vmm->next, &vfio_pasid.vfio_mm_list); +out: +mutex_unlock (&vfio_pasid.vfio_mm_lock); +mmput (mm); +return vmm; +} + +int vfio_pasid_alloc (struct vfio_mm *vmm,int min,int max) +{ +ioasid_t pasid; + + pasid =ioasid_alloc (vmm->ioasid_sid, min, max,NULL ); +
drivers/vfio/vfio_pasid.c line 123
Quoted 10 lines
drivers/vfio/vfio_pasid.c new file +10
-0+return (pasid ==INVALID_IOASID ) ? -ENOSPC : pasid; +} + +void vfio_pasid_free_range (struct vfio_mm *vmm, +ioasid_t min,ioasid_t max) +{ +ioasid_t pasid = min; + +if (min > max) +return ;
nit: is that check really useful?
Quoted 10 lines
drivers/vfio/vfio_pasid.c new file +10
-0+ +/* +* IOASID core will notify PASID users (e.g. IOMMU driver) to +* teardown necessary structures depending on the to-be-freed +* PASID. +*/ +for (; pasid <= max; pasid++) +ioasid_free (pasid); +} +
drivers/vfio/vfio_pasid.c line 143
Quoted 10 lines
drivers/vfio/vfio_pasid.c new file +10
-0+static int __init vfio_pasid_init (void ) +{ +mutex_init (&vfio_pasid.vfio_mm_lock); +INIT_LIST_HEAD (&vfio_pasid.vfio_mm_list); +return 0 ; +} + +static void __exit vfio_pasid_exit(void) +{ +WARN_ON (!list_empty (&vfio_pasid.vfio_mm_list));
Is it acceptable? Don't you need to cleanup everything here instead?
Thanks
Eric
Quoted 39 lines
drivers/vfio/vfio_pasid.c new file +9
-0+} + +module_init (vfio_pasid_init); +module_exit (vfio_pasid_exit); + +MODULE_VERSION (DRIVER_VERSION ); +MODULE_LICENSE ("GPL v2" ); +MODULE_AUTHOR (DRIVER_AUTHOR ); +MODULE_DESCRIPTION (DRIVER_DESC );include/linux/vfio.h +21
-0@@ -97,6 +97,34 @@ extern int vfio_register_iommu_driver(const struct vfio_iommu_driver_ops *ops);extern void vfio_unregister_iommu_driver (const struct vfio_iommu_driver_ops *ops); +struct vfio_mm ; +#if IS_ENABLED (CONFIG_VFIO_PASID ) +extern struct vfio_mm *vfio_mm_get_from_task (struct task_struct *task); +extern void vfio_mm_put (struct vfio_mm *vmm); +extern int vfio_pasid_alloc (struct vfio_mm *vmm,int min,int max); +extern void vfio_pasid_free_range (struct vfio_mm *vmm, +ioasid_t min,ioasid_t max); +#else +static inline struct vfio_mm *vfio_mm_get_from_task (struct task_struct *task) +{ +return ERR_PTR (-ENOTTY ); +} + +static inline void vfio_mm_put (struct vfio_mm *vmm) +{ +} + +static inline int vfio_pasid_alloc (struct vfio_mm *vmm,int min,int max) +{ +return -ENOTTY ; +}
include/linux/vfio.h extern int vfio_register_iommu_driver(const struct vfio_iommu_driver_ops *ops); · line 130
Quoted 10 lines
include/linux/vfio.h +7
-0+ +static inline void vfio_pasid_free_range (struct vfio_mm *vmm, +ioasid_t min,ioasid_t max) +{ +} +#endif /* CONFIG_VFIO_PASID */ +/* * External user API */
Thanks
Eric
RE: [PATCH v4 05/15] vfio: Add PASID allocation/free support
Hi Eric,
Quoted 208 lines
From: Auger Eric <[email protected]>
Sent: Monday, July 6, 2020 10:52 PMHi Yi,
Quoted 32 lines · Liu Yi L
Shared Virtual Addressing (a.k.a Shared Virtual Memory) allows sharing multiple process virtual address spaces with the device for simplified programming model. PASID is used to tag an virtual address space in DMA requests and to identify the related translation structure in IOMMU. When a PASID-capable device is assigned to a VM, we want the same capability of using PASID to tag guest process virtual address spaces to achieve virtual SVA (vSVA).
PASID management for guest is vendor specific. Some vendors (e.g. Intel VT-d) requires system-wide managed PASIDs cross all devices, regardless of whether a device is used by host or assigned to guest. Other vendors (e.g. ARM SMMU) may allow PASIDs managed per-device thus could be fully delegated to the guest for assigned devices.
For system-wide managed PASIDs, this patch introduces a vfio module to handle explicit PASID alloc/free requests from guest. Allocated PASIDs are associated to a process (or,
mm_struct) in IOASID core. Avfio_mmobject is introduced to trackmm_struct. Multiple VFIO containers within a process share the samevfio_mmobject.A quota mechanism is provided to prevent malicious user from exhausting available PASIDs. Currently the quota is a global parameter applied to all VFIO devices. In the future per-device quota might be supported too.
Cc Kevin Tian <[email protected]>CC Jacob Pan <[email protected]>Cc Eric Auger <[email protected]>Cc Jean-Philippe Brucker <[email protected]>Cc Joerg Roedel <[email protected]>Cc Lu Baolu <[email protected]>Suggested-by Alex Williamson <[email protected]>Signed-off-by Liu Yi L <[email protected]>Quoted 5 lines
---
v3 -> v4:
*) fix lock leam invfio_mm_get_from_task()*) droppasid_quotafield in structvfio_mm*)vfio_mm_get_from_task()returnsERR_PTR(-ENOTTY)when !CONFIG_VFIO_PASID
Quoted 7 lines
v1 -> v2:
*) added in v2, split from the pasid alloc/free support of v1--- drivers/vfio/Kconfig | 5 ++ drivers/vfio/Makefile | 1 + drivers/vfio/vfio_pasid.c | 152++++++++++++++++++++++++++++++++++++++++++++++
Quoted 51 lines
include/linux/vfio.h | 28 +++++++++ 4 files changed, 186 insertions(+) create mode 100644 drivers/vfio/vfio_pasid.cdrivers/vfio/Kconfig +5
-0@@ -19,6 +19,11 @@ config VFIO_VIRQFD depends on VFIO && EVENTFD default n +config VFIO_PASID + tristate + depends on IOASID && VFIO + default n + menuconfig VFIO tristate "VFIO Non-Privileged userspace driver framework" depends on IOMMU_APIdrivers/vfio/Makefile +1
-0@@ -3,6 +3,7 @@ vfio_virqfd-y := virqfd.o obj-$(CONFIG_VFIO) += vfio.o obj-$(CONFIG_VFIO_VIRQFD) += vfio_virqfd.o +obj-$(CONFIG_VFIO_PASID) += vfio_pasid.o obj-$(CONFIG_VFIO_IOMMU_TYPE1) += vfio_iommu_type1.o obj-$(CONFIG_VFIO_IOMMU_SPAPR_TCE) += vfio_iommu_spapr_tce.o obj-$(CONFIG_VFIO_SPAPR_EEH) += vfio_spapr_eeh.odrivers/vfio/vfio_pasid.c new file +13
-0@@ -0,0 +1,152 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Copyright (C) 2020 Intel Corporation. +* Author: Liu Yi L <[email protected]> +* +*/ + +#include <linux/vfio.h> +#include <linux/eventfd.h> +#include <linux/file.h> +#include <linux/module.h> +#include <linux/slab.h> +#include <linux/sched/mm.h> drivers/vfio/vfio_pasid.c line 23
Quoted 10 lines
drivers/vfio/vfio_pasid.c new file +10
-0+ +#define DRIVER_VERSION "0.1" +#define DRIVER_AUTHOR "Liu Yi L <[email protected]>" +#define DRIVER_DESC "PASID management for VFIO bus drivers" + +#define VFIO_DEFAULT_PASID_QUOTA 1000 +static int pasid_quota =VFIO_DEFAULT_PASID_QUOTA ; +module_param_named (pasid_quota, pasid_quota, uint,0444 ); +MODULE_PARM_DESC(pasid_quota, + " Set the quota for max number of PASIDs that an application isallowed to request (default 1000)");
Quoted 21 lines
drivers/vfio/vfio_pasid.c new file +21
-0+ +struct vfio_mm_token { +unsigned long long val; +}; + +struct vfio_mm { +struct kref kref; +int ioasid_sid; +struct list_head next; +struct vfio_mm_token token; +}; + +static struct vfio_pasid { +struct mutex vfio_mm_lock; +struct list_head vfio_mm_list; +} vfio_pasid; + +/* called with vfio.vfio_mm_lock held */ +static void vfio_mm_release (struct kref *kref) +{ + struct vfio_mm *vmm = container_of(kref, struct vfio_mm, kref);drivers/vfio/vfio_pasid.c
Quoted 10 lines
drivers/vfio/vfio_pasid.c new file +10
-0+ +list_del (&vmm->next); +mutex_unlock (&vfio_pasid.vfio_mm_lock); +ioasid_free_set (vmm->ioasid_sid, true); +kfree (vmm); +} + +void vfio_mm_put (struct vfio_mm *vmm) +{ + kref_put_mutex(&vmm->kref, vfio_mm_release,&vfio_pasid.vfio_mm_lock);
Quoted 62 lines
drivers/vfio/vfio_pasid.c new file +62
-0+} + +static void vfio_mm_get (struct vfio_mm *vmm) +{ +kref_get (&vmm->kref); +} + +struct vfio_mm *vfio_mm_get_from_task (struct task_struct *task) +{ +struct mm_struct *mm =get_task_mm (task); +struct vfio_mm *vmm; +unsigned long long val = (unsigned long long ) mm; +int ret; + +mutex_lock (&vfio_pasid.vfio_mm_lock); +/* Search existing vfio_mm with current mm pointer */ +list_for_each_entry (vmm, &vfio_pasid.vfio_mm_list, next) { +if (vmm->token.val == val) { +vfio_mm_get (vmm); + goto out; + } + } + + vmm =kzalloc (sizeof (*vmm),GFP_KERNEL ); +if (!vmm) { + vmm =ERR_PTR (-ENOMEM ); + goto out; + } + +/* +* IOASID core provides a 'IOASID set' concept to track all +* PASIDs associated with a token. Here we use mm_struct as +* the token and create a IOASID set per mm_struct. All the +* containers of the process share the same IOASID set. +*/ + ret =ioasid_alloc_set ((struct ioasid_set *) mm, pasid_quota, + &vmm->ioasid_sid); +if (ret) { +kfree (vmm); + vmm =ERR_PTR (ret); + goto out; + } + +kref_init (&vmm->kref); + vmm->token.val = val; + +list_add (&vmm->next, &vfio_pasid.vfio_mm_list); +out: +mutex_unlock (&vfio_pasid.vfio_mm_lock); +mmput (mm); +return vmm; +} + +int vfio_pasid_alloc (struct vfio_mm *vmm,int min,int max) +{ +ioasid_t pasid; + + pasid =ioasid_alloc (vmm->ioasid_sid, min, max,NULL ); + +return (pasid ==INVALID_IOASID ) ? -ENOSPC : pasid; +} +
Quoted 8 lines
drivers/vfio/vfio_pasid.c line 123
Quoted 7 lines
drivers/vfio/vfio_pasid.c new file +7
-0+void vfio_pasid_free_range (struct vfio_mm *vmm, +ioasid_t min,ioasid_t max) +{ +ioasid_t pasid = min; + +if (min > max) +return ;nit: is that check really useful?
looks to be duplicate as vfio_iommu_type1_pasid_request() has done it as well. will remove it.
Quoted 13 lines
Quoted 13 lines
drivers/vfio/vfio_pasid.c new file +13
-0+ +/* +* IOASID core will notify PASID users (e.g. IOMMU driver) to +* teardown necessary structures depending on the to-be-freed +* PASID. +*/ +for (; pasid <= max; pasid++) +ioasid_free (pasid); +} + +static int __init vfio_pasid_init (void ) +{ +mutex_init (&vfio_pasid.vfio_mm_lock);
Quoted 8 lines
drivers/vfio/vfio_pasid.c line 143
Quoted 7 lines
drivers/vfio/vfio_pasid.c new file +7
-0+INIT_LIST_HEAD (&vfio_pasid.vfio_mm_list); +return 0 ; +} + +static void __exit vfio_pasid_exit(void) +{ +WARN_ON (!list_empty (&vfio_pasid.vfio_mm_list));Is it acceptable? Don't you need to cleanup everything here instead?
I guess yes. VFIO_PASID is supposed to be referenced by VFIO_IOMMU_TYPE1 and may be other module. once vfio_pasid_exit() is triggered, that means its user (VFIO_IOMMU_TYPE1) has been removed. Should all the vfio_mm instances should have been released. If not, means there is vfio_mm leak, should be a bug of user module.
Regards,
Yi Liu
Quoted 55 lines
Thanks
Eric
include/linux/vfio.h extern int vfio_register_iommu_driver(const struct
Quoted 14 lines
drivers/vfio/vfio_pasid.c new file +9
-0+} + +module_init (vfio_pasid_init); +module_exit (vfio_pasid_exit); + +MODULE_VERSION (DRIVER_VERSION ); +MODULE_LICENSE ("GPL v2" ); +MODULE_AUTHOR (DRIVER_AUTHOR ); +MODULE_DESCRIPTION (DRIVER_DESC );include/linux/vfio.h +0
-0@@ -97,6 +97,34 @@ extern int vfio_register_iommu_driver(const struct
vfio_iommu_driver_ops*ops);Quoted 25 lines
include/linux/vfio.h +21
-0extern void vfio_unregister_iommu_driver (const struct vfio_iommu_driver_ops *ops); +struct vfio_mm ; +#if IS_ENABLED (CONFIG_VFIO_PASID ) +extern struct vfio_mm *vfio_mm_get_from_task (struct task_struct *task); +extern void vfio_mm_put (struct vfio_mm *vmm); +extern int vfio_pasid_alloc (struct vfio_mm *vmm,int min,int max); +extern void vfio_pasid_free_range (struct vfio_mm *vmm, +ioasid_t min,ioasid_t max); +#else +static inline struct vfio_mm *vfio_mm_get_from_task (struct task_struct *task) +{ +return ERR_PTR (-ENOTTY ); +} + +static inline void vfio_mm_put (struct vfio_mm *vmm) +{ +} + +static inline int vfio_pasid_alloc (struct vfio_mm *vmm,int min,int max) +{ +return -ENOTTY ; +}include/linux/vfio.h extern int vfio_register_iommu_driver(const struct vfio_iommu_driver_ops *ops); · line 130
Quoted 10 lines
include/linux/vfio.h +7
-0+ +static inline void vfio_pasid_free_range (struct vfio_mm *vmm, +ioasid_t min,ioasid_t max) +{ +} +#endif /* CONFIG_VFIO_PASID */ +/* * External user API */ Thanks
Quoted 1 line
Eric
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v4 6/15 iommu/vt-d: Support setting ioasid set to domain
In reply to Liu Yi LFrom IOMMU p.o.v., PASIDs allocated and managed by external components (e.g. VFIO) will be passed in for gpasid_bind/unbind operation. IOMMU needs some knowledge to check the PASID ownership, hence add an interface for those components to tell the PASID owner.
In latest kernel design, PASID ownership is managed by IOASID set where the PASID is allocated from. This patch adds support for setting ioasid set ID to the domains used for nesting/vSVA. Subsequent SVA operations on the PASID will be checked against its IOASID set for proper ownership.
--- drivers/iommu/intel/iommu.c | 16 ++++++++++++++++ include/linux/intel-iommu.h | 4 ++++ include/linux/iommu.h | 1 + 3 files changed, 21 insertions(+)
drivers/iommu/intel/iommu.c +16 -0
@@ -1793,6 +1793,7 @@ static struct dmar_domain *alloc_domain(int flags)if (first_level_by_default ()) domain->flags |=DOMAIN_FLAG_USE_FIRST_LEVEL ; domain->has_iotlb_device = false; + domain->ioasid_sid =INVALID_IOASID_SET ;INIT_LIST_HEAD (&domain->devices);return domain;
@@ -6039,6 +6040,21 @@ intel_iommu_domain_set_attr(struct iommu_domain *domain, }spin_unlock_irqrestore (&device_domain_lock, flags);break ; +case DOMAIN_ATTR_IOASID_SID : +if (!(dmar_domain->flags &DOMAIN_FLAG_NESTING_MODE )) { + ret = -ENODEV ; +break ; + } +if ((dmar_domain->ioasid_sid !=INVALID_IOASID_SET ) && + (dmar_domain->ioasid_sid != (*(int *) data))) { +pr_warn_ratelimited ("multi ioasid_set (%d:%d) setting" , + dmar_domain->ioasid_sid, + (*(int *) data)); + ret = -EBUSY ; +break ; + } + dmar_domain->ioasid_sid = *(int *) data; +break ;default : ret = -EINVAL ;break ;
include/linux/intel-iommu.h +4 -0
@@ -549,6 +549,10 @@ struct dmar_domain {2 == 1GiB, 3 == 512GiB, 4 == 1TiB */ u64 max_addr;/* maximum mapped address */ +int ioasid_sid;/* +* the ioasid set which tracks all +* PASIDs used by the domain. +*/ int default_pasid;/* * The default pasid used for non-SVM * traffic on mediated devices.
include/linux/iommu.h +1 -0
@@ -124,6 +124,7 @@ enum iommu_attr {DOMAIN_ATTR_FSL_PAMUV1 ,DOMAIN_ATTR_NESTING ,/* two stages of translation */ DOMAIN_ATTR_DMA_USE_FLUSH_QUEUE , +DOMAIN_ATTR_IOASID_SID , DOMAIN_ATTR_MAX, };
Signature · 6 lines
2.7.4 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v4 06/15] iommu/vt-d: Support setting ioasid set to domain
Hi Yi,
Quoted 38 lines · Liu Yi L
From IOMMU p.o.v., PASIDs allocated and managed by external components (e.g. VFIO) will be passed in for gpasid_bind/unbind operation. IOMMU needs some knowledge to check the PASID ownership, hence add an interface for those components to tell the PASID owner.
In latest kernel design, PASID ownership is managed by IOASID set where the PASID is allocated from. This patch adds support for setting ioasid set ID to the domains used for nesting/vSVA. Subsequent SVA operations on the PASID will be checked against its IOASID set for proper ownership.
Cc Kevin Tian <[email protected]>CC Jacob Pan <[email protected]>Cc Alex Williamson <[email protected]>Cc Eric Auger <[email protected]>Cc Jean-Philippe Brucker <[email protected]>Cc Joerg Roedel <[email protected]>Cc Lu Baolu <[email protected]>Signed-off-by Liu Yi L <[email protected]>Signed-off-by Jacob Pan <[email protected]>--- drivers/iommu/intel/iommu.c | 16 ++++++++++++++++ include/linux/intel-iommu.h | 4 ++++ include/linux/iommu.h | 1 + 3 files changed, 21 insertions(+)drivers/iommu/intel/iommu.c +1
-0@@ -1793,6 +1793,7 @@ static struct dmar_domain *alloc_domain(int flags)if (first_level_by_default ()) domain->flags |=DOMAIN_FLAG_USE_FIRST_LEVEL ; domain->has_iotlb_device = false; + domain->ioasid_sid =INVALID_IOASID_SET ;INIT_LIST_HEAD (&domain->devices);return domain;
drivers/iommu/intel/iommu.c intel_iommu_domain_set_attr(struct iommu_domain *domain, · line 6043
Quoted 4 lines
drivers/iommu/intel/iommu.c +1
-0@@ -6039,6 +6040,21 @@ intel_iommu_domain_set_attr(struct iommu_domain *domain, }spin_unlock_irqrestore (&device_domain_lock, flags);break ; +case DOMAIN_ATTR_IOASID_SID :
no need to take the device_domain_lock?
drivers/iommu/intel/iommu.c intel_iommu_domain_set_attr(struct iommu_domain *domain, · line 6049
Quoted 6 lines
drivers/iommu/intel/iommu.c +6
-0+if (!(dmar_domain->flags &DOMAIN_FLAG_NESTING_MODE )) { + ret = -ENODEV ; +break ; + } +if ((dmar_domain->ioasid_sid !=INVALID_IOASID_SET ) && + (dmar_domain->ioasid_sid != (*(int *) data))) {
storing *(int *) data) in a local variable would increase the readability of the code I think.
Quoted 32 lines
drivers/iommu/intel/iommu.c +8
-0+pr_warn_ratelimited ("multi ioasid_set (%d:%d) setting" , + dmar_domain->ioasid_sid, + (*(int *) data)); + ret = -EBUSY ; +break ; + } + dmar_domain->ioasid_sid = *(int *) data; +break ;default : ret = -EINVAL ;break ;include/linux/intel-iommu.h +4
-0@@ -549,6 +549,10 @@ struct dmar_domain {2 == 1GiB, 3 == 512GiB, 4 == 1TiB */ u64 max_addr;/* maximum mapped address */ +int ioasid_sid;/* +* the ioasid set which tracks all +* PASIDs used by the domain. +*/ int default_pasid;/* * The default pasid used for non-SVM * traffic on mediated devices. include/linux/iommu.h +0
-0
include/linux/iommu.h enum iommu_attr { · line 130
Quoted 7 lines
include/linux/iommu.h +1
-0@@ -124,6 +124,7 @@ enum iommu_attr {DOMAIN_ATTR_FSL_PAMUV1 ,DOMAIN_ATTR_NESTING ,/* two stages of translation */ DOMAIN_ATTR_DMA_USE_FLUSH_QUEUE , +DOMAIN_ATTR_IOASID_SID , DOMAIN_ATTR_MAX, };
Thanks
Eric
RE: [PATCH v4 06/15] iommu/vt-d: Support setting ioasid set to domain
Hi Eric,
Quoted 42 lines
From: Auger Eric <[email protected]>
Sent: Monday, July 6, 2020 10:52 PMHi Yi,
Quoted 36 lines · Liu Yi L
From IOMMU p.o.v., PASIDs allocated and managed by external components (e.g. VFIO) will be passed in for gpasid_bind/unbind operation. IOMMU needs some knowledge to check the PASID ownership, hence add an interface for those components to tell the PASID owner.
In latest kernel design, PASID ownership is managed by IOASID set where the PASID is allocated from. This patch adds support for setting ioasid set ID to the domains used for nesting/vSVA. Subsequent SVA operations on the PASID will be checked against its IOASID set for proper ownership.
Cc Kevin Tian <[email protected]>CC Jacob Pan <[email protected]>Cc Alex Williamson <[email protected]>Cc Eric Auger <[email protected]>Cc Jean-Philippe Brucker <[email protected]>Cc Joerg Roedel <[email protected]>Cc Lu Baolu <[email protected]>Signed-off-by Liu Yi L <[email protected]>Signed-off-by Jacob Pan <[email protected]>--- drivers/iommu/intel/iommu.c | 16 ++++++++++++++++ include/linux/intel-iommu.h | 4 ++++ include/linux/iommu.h | 1 + 3 files changed, 21 insertions(+)drivers/iommu/intel/iommu.c +1
-0@@ -1793,6 +1793,7 @@ static struct dmar_domain *alloc_domain(int flags)if (first_level_by_default ()) domain->flags |=DOMAIN_FLAG_USE_FIRST_LEVEL ; domain->has_iotlb_device = false; + domain->ioasid_sid =INVALID_IOASID_SET ;INIT_LIST_HEAD (&domain->devices);
Quoted 8 lines
drivers/iommu/intel/iommu.c intel_iommu_domain_set_attr(struct iommu_domain
Quoted 2 lines
drivers/iommu/intel/iommu.c +0
-0return domain;@@ -6039,6 +6040,21 @@ intel_iommu_domain_set_attr(struct iommu_domain*domain,
drivers/iommu/intel/iommu.c intel_iommu_domain_set_attr(struct iommu_domain *domain, · line 6043
Quoted 4 lines
drivers/iommu/intel/iommu.c +1
-0}spin_unlock_irqrestore (&device_domain_lock, flags);break ; +case DOMAIN_ATTR_IOASID_SID :no need to take the
device_domain_lock?
oh, yes. thanks for spotting it.
Quoted 8 lines
drivers/iommu/intel/iommu.c intel_iommu_domain_set_attr(struct iommu_domain *domain, · line 6049
Quoted 6 lines
drivers/iommu/intel/iommu.c +6
-0+if (!(dmar_domain->flags &DOMAIN_FLAG_NESTING_MODE )) { + ret = -ENODEV ; +break ; + } +if ((dmar_domain->ioasid_sid !=INVALID_IOASID_SET ) && + (dmar_domain->ioasid_sid != (*(int *) data))) {storing *(int *) data) in a local variable would increase the readability of the code I think.
will do it. :-)
Regards,
Yi Liu
Quoted 42 lines
Quoted 32 lines
drivers/iommu/intel/iommu.c +8
-0+pr_warn_ratelimited ("multi ioasid_set (%d:%d) setting" , + dmar_domain->ioasid_sid, + (*(int *) data)); + ret = -EBUSY ; +break ; + } + dmar_domain->ioasid_sid = *(int *) data; +break ;default : ret = -EINVAL ;break ;include/linux/intel-iommu.h +4
-0@@ -549,6 +549,10 @@ struct dmar_domain {2 == 1GiB, 3 == 512GiB, 4 == 1TiB */ u64 max_addr;/* maximum mapped address */ +int ioasid_sid;/* +* the ioasid set which tracks all +* PASIDs used by the domain. +*/ int default_pasid;/* * The default pasid used for non-SVM * traffic on mediated devices. include/linux/iommu.h +0
-0include/linux/iommu.h enum iommu_attr { · line 130
Quoted 7 lines
include/linux/iommu.h +1
-0@@ -124,6 +124,7 @@ enum iommu_attr {DOMAIN_ATTR_FSL_PAMUV1 ,DOMAIN_ATTR_NESTING ,/* two stages of translation */ DOMAIN_ATTR_DMA_USE_FLUSH_QUEUE , +DOMAIN_ATTR_IOASID_SID , DOMAIN_ATTR_MAX, };Thanks
Eric
PATCH v4 7/15 vfio/type1: Add VFIO_IOMMU_PASID_REQUEST (alloc/free)
In reply to Liu Yi LThis patch allows user space to request PASID allocation/free, e.g. when serving the request from the guest.
PASIDs that are not freed by userspace are automatically freed when the IOASID set is destroyed when process exits.
---
v3 -> v4:
*) address comments from v3, except the below comment against the range
of PASID_FREE request. needs more help on it.
"> +if (req.range.min > req.range.max)
Is it exploitable that a user can spin the kernel for a long time in the case of a free by calling this with [0, MAX_UINT] regardless of their actual allocations?"
v1 -> v2:
*) move the vfio_mm related code to be a seprate module
*) use a single structure for alloc/free, could support a range of PASIDs *) fetch vfio_mm at group_attach time instead of at iommu driver open time
--- drivers/vfio/Kconfig | 1 + drivers/vfio/vfio_iommu_type1.c | 84 +++++++++++++++++++++++++++++++++++++++++ drivers/vfio/vfio_pasid.c | 10 +++++ include/linux/vfio.h | 6 +++ include/uapi/linux/vfio.h | 36 ++++++++++++++++++ 5 files changed, 137 insertions(+)
drivers/vfio/Kconfig +1 -0
@@ -2,6 +2,7 @@ config VFIO_IOMMU_TYPE1 tristate depends on VFIO + select VFIO_PASID if (X86) default n config VFIO_IOMMU_SPAPR_TCE
drivers/vfio/vfio_iommu_type1.c +84 -0
114 lines not on this page · raw message
drivers/vfio/vfio_pasid.c +10 -0
@@ -53,6 +53,7 @@ void vfio_mm_put(struct vfio_mm *vmm) {kref_put_mutex (&vmm->kref, vfio_mm_release, &vfio_pasid.vfio_mm_lock); } +EXPORT_SYMBOL_GPL (vfio_mm_put);static void vfio_mm_get (struct vfio_mm *vmm) {
@@ -104,6 +105,13 @@ struct vfio_mm *vfio_mm_get_from_task(struct task_struct *task)mmput (mm);return vmm; } +EXPORT_SYMBOL_GPL (vfio_mm_get_from_task); + +int vfio_mm_ioasid_sid (struct vfio_mm *vmm) +{ +return vmm->ioasid_sid; +} +EXPORT_SYMBOL_GPL (vfio_mm_ioasid_sid);int vfio_pasid_alloc (struct vfio_mm *vmm,int min,int max) {
@@ -113,6 +121,7 @@ int vfio_pasid_alloc(struct vfio_mm *vmm, int min, int max)return (pasid ==INVALID_IOASID ) ? -ENOSPC : pasid; } +EXPORT_SYMBOL_GPL (vfio_pasid_alloc);void vfio_pasid_free_range (struct vfio_mm *vmm,ioasid_t min,ioasid_t max)
@@ -130,6 +139,7 @@ void vfio_pasid_free_range(struct vfio_mm *vmm,for (; pasid <= max; pasid++)ioasid_free (pasid); } +EXPORT_SYMBOL_GPL (vfio_pasid_free_range);static int __init vfio_pasid_init (void ) {
include/linux/vfio.h +6 -0
@@ -101,6 +101,7 @@ struct vfio_mm;#if IS_ENABLED (CONFIG_VFIO_PASID )extern struct vfio_mm *vfio_mm_get_from_task (struct task_struct *task);extern void vfio_mm_put (struct vfio_mm *vmm); +int vfio_mm_ioasid_sid (struct vfio_mm *vmm);extern int vfio_pasid_alloc (struct vfio_mm *vmm,int min,int max);extern void vfio_pasid_free_range (struct vfio_mm *vmm,ioasid_t min,ioasid_t max);
@@ -114,6 +115,11 @@ static inline void vfio_mm_put(struct vfio_mm *vmm) { } +static inline int vfio_mm_ioasid_sid (struct vfio_mm *vmm) +{ +return -ENOTTY ; +} +static inline int vfio_pasid_alloc (struct vfio_mm *vmm,int min,int max) {return -ENOTTY ;
include/uapi/linux/vfio.h +36 -0
@@ -1169,6 +1169,42 @@ struct vfio_iommu_type1_dirty_bitmap_get {#define VFIO_IOMMU_DIRTY_PAGES _IO(VFIO_TYPE, VFIO_BASE + 17) +/** +* VFIO_IOMMU_PASID_REQUEST - _IOWR(VFIO_TYPE, VFIO_BASE + 18, +* struct vfio_iommu_type1_pasid_request) +* +* PASID (Processor Address Space ID) is a PCIe concept for tagging +* address spaces in DMA requests. When system-wide PASID allocation +* is required by underlying iommu driver (e.g. Intel VT-d), this +* provides an interface for userspace to request pasid alloc/free +* for its assigned devices. Userspace should check the availability +* of this API through VFIO_IOMMU_GET_INFO. +* +* @flags=VFIO_IOMMU_FLAG_ALLOC_PASID, allocate a single PASID within @range. +* @flags=VFIO_IOMMU_FLAG_FREE_PASID, free the PASIDs within @range. +* @range is [min, max], which means both @min and @max are inclusive. +* ALLOC_PASID and FREE_PASID are mutually exclusive. +* +* returns: allocated PASID value on success, -errno on failure for +* ALLOC_PASID; +* 0 for FREE_PASID operation; +*/ +struct vfio_iommu_type1_pasid_request { +__u32 argsz; +#define VFIO_IOMMU_FLAG_ALLOC_PASID (1 << 0) +#define VFIO_IOMMU_FLAG_FREE_PASID (1 << 1) +__u32 flags; +struct { +__u32 min; +__u32 max; + } range; +}; + +#define VFIO_PASID_REQUEST_MASK (VFIO_IOMMU_FLAG_ALLOC_PASID | \ + VFIO_IOMMU_FLAG_FREE_PASID) + +#define VFIO_IOMMU_PASID_REQUEST _IO(VFIO_TYPE, VFIO_BASE + 18) +/* -------- Additional API for SPAPR TCE (Server POWERPC) IOMMU -------- */ /*
Signature · 6 lines
2.7.4 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v4 07/15] vfio/type1: Add VFIO_IOMMU_PASID_REQUEST (alloc/free)
Hi Yi,
Quoted 178 lines · Liu Yi L
This patch allows user space to request PASID allocation/free, e.g. when serving the request from the guest.
PASIDs that are not freed by userspace are automatically freed when the IOASID set is destroyed when process exits.
Cc Kevin Tian <[email protected]>CC Jacob Pan <[email protected]>Cc Alex Williamson <[email protected]>Cc Eric Auger <[email protected]>Cc Jean-Philippe Brucker <[email protected]>Cc Joerg Roedel <[email protected]>Cc Lu Baolu <[email protected]>Signed-off-by Liu Yi L <[email protected]>Signed-off-by Yi Sun <[email protected]>Signed-off-by Jacob Pan <[email protected]>---
v3 -> v4:
*) address comments from v3, except the below comment against the range
ofPASID_FREErequest. needs more help on it.
"> +if (req.range.min > req.range.max)Is it exploitable that a user can spin the kernel for a long time in the case of a free by calling this with [0,
MAX_UINT] regardless of their actual allocations?"v1 -> v2:
*) move thevfio_mmrelated code to be a seprate module
*) use a single structure for alloc/free, could support a range of PASIDs *) fetchvfio_mmatgroup_attachtime instead of at iommu driver open time--- drivers/vfio/Kconfig | 1 + drivers/vfio/vfio_iommu_type1.c | 84 +++++++++++++++++++++++++++++++++++++++++ drivers/vfio/vfio_pasid.c | 10 +++++ include/linux/vfio.h | 6 +++ include/uapi/linux/vfio.h | 36 ++++++++++++++++++ 5 files changed, 137 insertions(+)drivers/vfio/Kconfig +1
-0@@ -2,6 +2,7 @@ config VFIO_IOMMU_TYPE1 tristate depends on VFIO + select VFIO_PASID if (X86) default n config VFIO_IOMMU_SPAPR_TCEdrivers/vfio/vfio_iommu_type1.c +84
-0@@ -76,6 +76,7 @@ struct vfio_iommu {bool dirty_page_tracking;bool pinned_page_dirty_scope;struct iommu_nesting_info *nesting_info; +struct vfio_mm *vmm; };struct vfio_domain {@@ -1937,6 +1938,11 @@ static void vfio_iommu_iova_insert_copy(struct vfio_iommu *iommu,static void vfio_iommu_release_nesting_info (struct vfio_iommu *iommu) { +if (iommu->vmm) { +vfio_mm_put (iommu->vmm); + iommu->vmm =NULL ; + } +kfree (iommu->nesting_info); iommu->nesting_info =NULL ; }@@ -2075,6 +2081,25 @@ static int vfio_iommu_type1_attach_group(void *iommu_data, goto out_detach; } iommu->nesting_info = info; + +if (info->features &IOMMU_NESTING_FEAT_SYSWIDE_PASID ) { +struct vfio_mm *vmm; +int sid; + + vmm =vfio_mm_get_from_task (current); +if (IS_ERR (vmm)) { + ret =PTR_ERR (vmm); + goto out_detach; + } + iommu->vmm = vmm; + + sid =vfio_mm_ioasid_sid (vmm); + ret =iommu_domain_set_attr (domain->domain, +DOMAIN_ATTR_IOASID_SID , + &sid); +if (ret) + goto out_detach; + } }/* Get aperture info */ @@ -2860,6 +2885,63 @@ static int vfio_iommu_type1_dirty_pages(struct vfio_iommu *iommu,return -EINVAL ; } +static int vfio_iommu_type1_pasid_alloc (struct vfio_iommu *iommu, +unsigned int min, +unsigned int max) +{ +int ret = -EOPNOTSUPP ; + +mutex_lock (&iommu->lock); +if (iommu->vmm) + ret =vfio_pasid_alloc (iommu->vmm, min, max); +mutex_unlock (&iommu->lock); +return ret; +} + +static int vfio_iommu_type1_pasid_free (struct vfio_iommu *iommu, +unsigned int min, +unsigned int max) +{ +int ret = -EOPNOTSUPP ; + +mutex_lock (&iommu->lock); +if (iommu->vmm) { +vfio_pasid_free_range (iommu->vmm, min, max); + ret =0 ; + } +mutex_unlock (&iommu->lock); +return ret; +} + +static int vfio_iommu_type1_pasid_request (struct vfio_iommu *iommu, +unsigned long arg) +{ +struct vfio_iommu_type1_pasid_request req; +unsigned long minsz; + + minsz = offsetofend(struct vfio_iommu_type1_pasid_request, range); + +if (copy_from_user (&req, (void __user *)arg, minsz)) +return -EFAULT ; + +if (req.argsz < minsz || (req.flags & ~VFIO_PASID_REQUEST_MASK )) +return -EINVAL ; + +if (req.range.min > req.range.max) +return -EINVAL ; + +switch (req.flags &VFIO_PASID_REQUEST_MASK ) { +case VFIO_IOMMU_FLAG_ALLOC_PASID : +return vfio_iommu_type1_pasid_alloc (iommu, + req.range.min, req.range.max); +case VFIO_IOMMU_FLAG_FREE_PASID : +return vfio_iommu_type1_pasid_free (iommu, + req.range.min, req.range.max); +default : +return -EINVAL ; + } +} +static long vfio_iommu_type1_ioctl (void *iommu_data,unsigned int cmd,unsigned long arg) {@@ -2876,6 +2958,8 @@ static long vfio_iommu_type1_ioctl(void *iommu_data,return vfio_iommu_type1_unmap_dma (iommu, arg);case VFIO_IOMMU_DIRTY_PAGES :return vfio_iommu_type1_dirty_pages (iommu, arg); +case VFIO_IOMMU_PASID_REQUEST : +return vfio_iommu_type1_pasid_request (iommu, arg); }return -ENOTTY ;drivers/vfio/vfio_pasid.c +0
-0
drivers/vfio/vfio_pasid.c void vfio_mm_put(struct vfio_mm *vmm) · line 56
Quoted 4 lines
drivers/vfio/vfio_pasid.c +1
-0@@ -53,6 +53,7 @@ void vfio_mm_put(struct vfio_mm *vmm) {kref_put_mutex (&vmm->kref, vfio_mm_release, &vfio_pasid.vfio_mm_lock); } +EXPORT_SYMBOL_GPL (vfio_mm_put);
I think this should be belong to [5/15]
drivers/vfio/vfio_pasid.c struct vfio_mm *vfio_mm_get_from_task(struct task_struct *task) · line 108
Quoted 8 lines
drivers/vfio/vfio_pasid.c +1
-0static void vfio_mm_get (struct vfio_mm *vmm) {@@ -104,6 +105,13 @@ struct vfio_mm *vfio_mm_get_from_task(struct task_struct *task)mmput (mm);return vmm; } +EXPORT_SYMBOL_GPL (vfio_mm_get_from_task);
same
drivers/vfio/vfio_pasid.c struct vfio_mm *vfio_mm_get_from_task(struct task_struct *task) · line 110
Quoted 2 lines
drivers/vfio/vfio_pasid.c +2
-0+ +int vfio_mm_ioasid_sid (struct vfio_mm *vmm)
extern?
same
drivers/vfio/vfio_pasid.c int vfio_pasid_alloc(struct vfio_mm *vmm, int min, int max) · line 124
Quoted 12 lines
drivers/vfio/vfio_pasid.c +5
-0+{ +return vmm->ioasid_sid; +} +EXPORT_SYMBOL_GPL (vfio_mm_ioasid_sid);int vfio_pasid_alloc (struct vfio_mm *vmm,int min,int max) {@@ -113,6 +121,7 @@ int vfio_pasid_alloc(struct vfio_mm *vmm, int min, int max)return (pasid ==INVALID_IOASID ) ? -ENOSPC : pasid; } +EXPORT_SYMBOL_GPL (vfio_pasid_alloc);
same
drivers/vfio/vfio_pasid.c void vfio_pasid_free_range(struct vfio_mm *vmm, · line 142
Quoted 8 lines
drivers/vfio/vfio_pasid.c +1
-0void vfio_pasid_free_range (struct vfio_mm *vmm,ioasid_t min,ioasid_t max)@@ -130,6 +139,7 @@ void vfio_pasid_free_range(struct vfio_mm *vmm,for (; pasid <= max; pasid++)ioasid_free (pasid); } +EXPORT_SYMBOL_GPL (vfio_pasid_free_range);
same
Quoted 35 lines
drivers/vfio/vfio_pasid.c +0
-0static int __init vfio_pasid_init (void ) {include/linux/vfio.h +6
-0@@ -101,6 +101,7 @@ struct vfio_mm;#if IS_ENABLED (CONFIG_VFIO_PASID )extern struct vfio_mm *vfio_mm_get_from_task (struct task_struct *task);extern void vfio_mm_put (struct vfio_mm *vmm); +int vfio_mm_ioasid_sid (struct vfio_mm *vmm);extern int vfio_pasid_alloc (struct vfio_mm *vmm,int min,int max);extern void vfio_pasid_free_range (struct vfio_mm *vmm,ioasid_t min,ioasid_t max);@@ -114,6 +115,11 @@ static inline void vfio_mm_put(struct vfio_mm *vmm) { } +static inline int vfio_mm_ioasid_sid (struct vfio_mm *vmm) +{ +return -ENOTTY ; +} +static inline int vfio_pasid_alloc (struct vfio_mm *vmm,int min,int max) {return -ENOTTY ;include/uapi/linux/vfio.h +0
-0@@ -1169,6 +1169,42 @@ struct vfio_iommu_type1_dirty_bitmap_get {#define VFIO_IOMMU_DIRTY_PAGES _IO(VFIO_TYPE, VFIO_BASE + 17)
include/uapi/linux/vfio.h struct vfio_iommu_type1_dirty_bitmap_get { · line 1181
Quoted 10 lines
include/uapi/linux/vfio.h +10
-0+/** +* VFIO_IOMMU_PASID_REQUEST - _IOWR(VFIO_TYPE, VFIO_BASE + 18, +* struct vfio_iommu_type1_pasid_request) +* +* PASID (Processor Address Space ID) is a PCIe concept for tagging +* address spaces in DMA requests. When system-wide PASID allocation +* is required by underlying iommu driver (e.g. Intel VT-d), this +* provides an interface for userspace to request pasid alloc/free +* for its assigned devices. Userspace should check the availability +* of this API through VFIO_IOMMU_GET_INFO.
name the capability?
Quoted 19 lines
include/uapi/linux/vfio.h +18
-0+* +* @flags=VFIO_IOMMU_FLAG_ALLOC_PASID, allocate a single PASID within @range. +* @flags=VFIO_IOMMU_FLAG_FREE_PASID, free the PASIDs within @range. +* @range is [min, max], which means both @min and @max are inclusive. +* ALLOC_PASID and FREE_PASID are mutually exclusive. +* +* returns: allocated PASID value on success, -errno on failure for +* ALLOC_PASID; +* 0 for FREE_PASID operation; +*/ +struct vfio_iommu_type1_pasid_request { +__u32 argsz; +#define VFIO_IOMMU_FLAG_ALLOC_PASID (1 << 0) +#define VFIO_IOMMU_FLAG_FREE_PASID (1 << 1) + __u32 flags;> + struct { +__u32 min; +__u32 max; + } range;
include/uapi/linux/vfio.h struct vfio_iommu_type1_dirty_bitmap_get { · line 1210
Quoted 10 lines
include/uapi/linux/vfio.h +7
-0+}; + +#define VFIO_PASID_REQUEST_MASK (VFIO_IOMMU_FLAG_ALLOC_PASID | \ + VFIO_IOMMU_FLAG_FREE_PASID) + +#define VFIO_IOMMU_PASID_REQUEST _IO(VFIO_TYPE, VFIO_BASE + 18) +/* -------- Additional API for SPAPR TCE (Server POWERPC) IOMMU -------- */ /*
Thanks
Eric
RE: [PATCH v4 07/15] vfio/type1: Add VFIO_IOMMU_PASID_REQUEST (alloc/free)
Hi Eric,
Quoted 191 lines
From: Auger Eric <[email protected]>
Sent: Monday, July 6, 2020 11:18 PMHi Yi,
Quoted 26 lines · Liu Yi L
This patch allows user space to request PASID allocation/free, e.g. when serving the request from the guest.
PASIDs that are not freed by userspace are automatically freed when the IOASID set is destroyed when process exits.
Cc Kevin Tian <[email protected]>CC Jacob Pan <[email protected]>Cc Alex Williamson <[email protected]>Cc Eric Auger <[email protected]>Cc Jean-Philippe Brucker <[email protected]>Cc Joerg Roedel <[email protected]>Cc Lu Baolu <[email protected]>Signed-off-by Liu Yi L <[email protected]>Signed-off-by Yi Sun <[email protected]>Signed-off-by Jacob Pan <[email protected]>---
v3 -> v4:
*) address comments from v3, except the below comment against the range
ofPASID_FREErequest. needs more help on it.
"> +if (req.range.min > req.range.max)Is it exploitable that a user can spin the kernel for a long time in the case of a free by calling this with [0,
MAX_UINT] regardless of their actual allocations?"Quoted 7 lines
v1 -> v2:
*) move thevfio_mmrelated code to be a seprate module
*) use a single structure for alloc/free, could support a range of PASIDs *) fetchvfio_mmatgroup_attachtime instead of at iommu driver open time--- drivers/vfio/Kconfig | 1 + drivers/vfio/vfio_iommu_type1.c | 84+++++++++++++++++++++++++++++++++++++++++
drivers/vfio/vfio_iommu_type1.c static void vfio_iommu_iova_insert_copy(struct
Quoted 30 lines
drivers/vfio/vfio_pasid.c | 10 +++++ include/linux/vfio.h | 6 +++ include/uapi/linux/vfio.h | 36 ++++++++++++++++++ 5 files changed, 137 insertions(+)drivers/vfio/Kconfig +1
-0@@ -2,6 +2,7 @@ config VFIO_IOMMU_TYPE1 tristate depends on VFIO + select VFIO_PASID if (X86) default n config VFIO_IOMMU_SPAPR_TCEdrivers/vfio/vfio_iommu_type1.c +1
-0@@ -76,6 +76,7 @@ struct vfio_iommu {bool dirty_page_tracking;bool pinned_page_dirty_scope;struct iommu_nesting_info *nesting_info; +struct vfio_mm *vmm; };struct vfio_domain {@@ -1937,6 +1938,11 @@ static void vfio_iommu_iova_insert_copy(struct
vfio_iommu*iommu,drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_type1_attach_group(void
Quoted 12 lines
drivers/vfio/vfio_iommu_type1.c +5
-0static void vfio_iommu_release_nesting_info (struct vfio_iommu *iommu) { +if (iommu->vmm) { +vfio_mm_put (iommu->vmm); + iommu->vmm =NULL ; + } +kfree (iommu->nesting_info); iommu->nesting_info =NULL ; }@@ -2075,6 +2081,25 @@ static int vfio_iommu_type1_attach_group(void
*iommu_data,drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_type1_dirty_pages(struct
Quoted 26 lines
drivers/vfio/vfio_iommu_type1.c +19
-0goto out_detach; } iommu->nesting_info = info; + +if (info->features &IOMMU_NESTING_FEAT_SYSWIDE_PASID ) { +struct vfio_mm *vmm; +int sid; + + vmm =vfio_mm_get_from_task (current); +if (IS_ERR (vmm)) { + ret =PTR_ERR (vmm); + goto out_detach; + } + iommu->vmm = vmm; + + sid =vfio_mm_ioasid_sid (vmm); + ret =iommu_domain_set_attr (domain->domain, +DOMAIN_ATTR_IOASID_SID , + &sid); +if (ret) + goto out_detach; + } }/* Get aperture info */ @@ -2860,6 +2885,63 @@ static int vfio_iommu_type1_dirty_pages(struct
vfio_iommu*iommu,Quoted 77 lines
drivers/vfio/vfio_iommu_type1.c +59
-0return -EINVAL ; } +static int vfio_iommu_type1_pasid_alloc (struct vfio_iommu *iommu, +unsigned int min, +unsigned int max) +{ +int ret = -EOPNOTSUPP ; + +mutex_lock (&iommu->lock); +if (iommu->vmm) + ret =vfio_pasid_alloc (iommu->vmm, min, max); +mutex_unlock (&iommu->lock); +return ret; +} + +static int vfio_iommu_type1_pasid_free (struct vfio_iommu *iommu, +unsigned int min, +unsigned int max) +{ +int ret = -EOPNOTSUPP ; + +mutex_lock (&iommu->lock); +if (iommu->vmm) { +vfio_pasid_free_range (iommu->vmm, min, max); + ret =0 ; + } +mutex_unlock (&iommu->lock); +return ret; +} + +static int vfio_iommu_type1_pasid_request (struct vfio_iommu *iommu, +unsigned long arg) +{ +struct vfio_iommu_type1_pasid_request req; +unsigned long minsz; + + minsz = offsetofend(struct vfio_iommu_type1_pasid_request, range); + +if (copy_from_user (&req, (void __user *)arg, minsz)) +return -EFAULT ; + +if (req.argsz < minsz || (req.flags & ~VFIO_PASID_REQUEST_MASK )) +return -EINVAL ; + +if (req.range.min > req.range.max) +return -EINVAL ; + +switch (req.flags &VFIO_PASID_REQUEST_MASK ) { +case VFIO_IOMMU_FLAG_ALLOC_PASID : +return vfio_iommu_type1_pasid_alloc (iommu, + req.range.min, req.range.max); +case VFIO_IOMMU_FLAG_FREE_PASID : +return vfio_iommu_type1_pasid_free (iommu, + req.range.min, req.range.max); +default : +return -EINVAL ; + } +} +static long vfio_iommu_type1_ioctl (void *iommu_data,unsigned int cmd,unsigned long arg) {@@ -2876,6 +2958,8 @@ static long vfio_iommu_type1_ioctl(void *iommu_data,return vfio_iommu_type1_unmap_dma (iommu, arg);case VFIO_IOMMU_DIRTY_PAGES :return vfio_iommu_type1_dirty_pages (iommu, arg); +case VFIO_IOMMU_PASID_REQUEST : +return vfio_iommu_type1_pasid_request (iommu, arg); }return -ENOTTY ;drivers/vfio/vfio_pasid.c +0
-0drivers/vfio/vfio_pasid.c void vfio_mm_put(struct vfio_mm *vmm) · line 54
Quoted 2 lines
drivers/vfio/vfio_pasid.c +0
-0@@ -53,6 +53,7 @@ void vfio_mm_put(struct vfio_mm *vmm) { kref_put_mutex(&vmm->kref, vfio_mm_release,&vfio_pasid.vfio_mm_lock);
Quoted 3 lines
drivers/vfio/vfio_pasid.c void vfio_mm_put(struct vfio_mm *vmm) · line 56
Quoted 2 lines
drivers/vfio/vfio_pasid.c +1
-0} +EXPORT_SYMBOL_GPL (vfio_mm_put);I think this should be belong to [5/15]
yeah, the implementation is in [5/15], but the user is in this patch, so export it in this patch.
Quoted 10 lines
drivers/vfio/vfio_pasid.c struct vfio_mm *vfio_mm_get_from_task(struct
Quoted 4 lines
drivers/vfio/vfio_pasid.c +0
-0static void vfio_mm_get (struct vfio_mm *vmm) {@@ -104,6 +105,13 @@ struct vfio_mm *vfio_mm_get_from_task(struct
task_struct*task)drivers/vfio/vfio_pasid.c struct vfio_mm *vfio_mm_get_from_task(struct task_struct *task) · line 108
Quoted 4 lines
drivers/vfio/vfio_pasid.c +1
-0mmput (mm);return vmm; } +EXPORT_SYMBOL_GPL (vfio_mm_get_from_task);same
the same with above.
Quoted 4 lines
drivers/vfio/vfio_pasid.c struct vfio_mm *vfio_mm_get_from_task(struct task_struct *task) · line 110
Quoted 2 lines
drivers/vfio/vfio_pasid.c +2
-0+ +int vfio_mm_ioasid_sid (struct vfio_mm *vmm)extern?
same
why need extern? as it's used in this patch, so add it in this patch.
Quoted 5 lines
Quoted 5 lines
drivers/vfio/vfio_pasid.c +4
-0+{ +return vmm->ioasid_sid; +} +EXPORT_SYMBOL_GPL (vfio_mm_ioasid_sid);
Quoted 8 lines
drivers/vfio/vfio_pasid.c int vfio_pasid_alloc(struct vfio_mm *vmm, int min, int max) · line 124
Quoted 7 lines
drivers/vfio/vfio_pasid.c +1
-0int vfio_pasid_alloc (struct vfio_mm *vmm,int min,int max) {@@ -113,6 +121,7 @@ int vfio_pasid_alloc(struct vfio_mm *vmm, int min, int max)return (pasid ==INVALID_IOASID ) ? -ENOSPC : pasid; } +EXPORT_SYMBOL_GPL (vfio_pasid_alloc);same
same as above reason. :-)
Quoted 9 lines
drivers/vfio/vfio_pasid.c void vfio_pasid_free_range(struct vfio_mm *vmm, · line 142
Quoted 8 lines
drivers/vfio/vfio_pasid.c +1
-0void vfio_pasid_free_range (struct vfio_mm *vmm,ioasid_t min,ioasid_t max)@@ -130,6 +139,7 @@ void vfio_pasid_free_range(struct vfio_mm *vmm,for (; pasid <= max; pasid++)ioasid_free (pasid); } +EXPORT_SYMBOL_GPL (vfio_pasid_free_range);same
same as above.
Quoted 35 lines
Quoted 35 lines
drivers/vfio/vfio_pasid.c +0
-0static int __init vfio_pasid_init (void ) {include/linux/vfio.h +6
-0@@ -101,6 +101,7 @@ struct vfio_mm;#if IS_ENABLED (CONFIG_VFIO_PASID )extern struct vfio_mm *vfio_mm_get_from_task (struct task_struct *task);extern void vfio_mm_put (struct vfio_mm *vmm); +int vfio_mm_ioasid_sid (struct vfio_mm *vmm);extern int vfio_pasid_alloc (struct vfio_mm *vmm,int min,int max);extern void vfio_pasid_free_range (struct vfio_mm *vmm,ioasid_t min,ioasid_t max);@@ -114,6 +115,11 @@ static inline void vfio_mm_put(struct vfio_mm *vmm) { } +static inline int vfio_mm_ioasid_sid (struct vfio_mm *vmm) +{ +return -ENOTTY ; +} +static inline int vfio_pasid_alloc (struct vfio_mm *vmm,int min,int max) {return -ENOTTY ;include/uapi/linux/vfio.h +0
-0@@ -1169,6 +1169,42 @@ struct vfio_iommu_type1_dirty_bitmap_get {#define VFIO_IOMMU_DIRTY_PAGES _IO(VFIO_TYPE, VFIO_BASE + 17)
Quoted 11 lines
include/uapi/linux/vfio.h struct vfio_iommu_type1_dirty_bitmap_get { · line 1181
Quoted 10 lines
include/uapi/linux/vfio.h +10
-0+/** +* VFIO_IOMMU_PASID_REQUEST - _IOWR(VFIO_TYPE, VFIO_BASE + 18, +* struct vfio_iommu_type1_pasid_request) +* +* PASID (Processor Address Space ID) is a PCIe concept for tagging +* address spaces in DMA requests. When system-wide PASID allocation +* is required by underlying iommu driver (e.g. Intel VT-d), this +* provides an interface for userspace to request pasid alloc/free +* for its assigned devices. Userspace should check the availability +* of this API through VFIO_IOMMU_GET_INFO. name the capability?
yep. will add it.
Regards,
Yi Liu
Quoted 34 lines
include/uapi/linux/vfio.h struct vfio_iommu_type1_dirty_bitmap_get { · line 1183
Quoted 2 lines
include/uapi/linux/vfio.h +2
-0+* +* @flags=VFIO_IOMMU_FLAG_ALLOC_PASID, allocate a single PASID within @range.
Quoted 17 lines
include/uapi/linux/vfio.h +16
-0+* @flags=VFIO_IOMMU_FLAG_FREE_PASID, free the PASIDs within @range. +* @range is [min, max], which means both @min and @max are inclusive. +* ALLOC_PASID and FREE_PASID are mutually exclusive. +* +* returns: allocated PASID value on success, -errno on failure for +* ALLOC_PASID; +* 0 for FREE_PASID operation; +*/ +struct vfio_iommu_type1_pasid_request { +__u32 argsz; +#define VFIO_IOMMU_FLAG_ALLOC_PASID (1 << 0) +#define VFIO_IOMMU_FLAG_FREE_PASID (1 << 1) + __u32 flags;> + struct { +__u32 min; +__u32 max; + } range;include/uapi/linux/vfio.h struct vfio_iommu_type1_dirty_bitmap_get { · line 1210
Quoted 10 lines
include/uapi/linux/vfio.h +7
-0+}; + +#define VFIO_PASID_REQUEST_MASK (VFIO_IOMMU_FLAG_ALLOC_PASID | \ + VFIO_IOMMU_FLAG_FREE_PASID) + +#define VFIO_IOMMU_PASID_REQUEST _IO(VFIO_TYPE, VFIO_BASE + 18) +/* -------- Additional API for SPAPR TCE (Server POWERPC) IOMMU -------- */ /* Thanks
Eric
PATCH v4 8/15 iommu: Pass domain to sva_unbind_gpasid()
In reply to Liu Yi LFrom: Yi Sun <[email protected]>
Current interface is good enough for SVA virtualization on an assigned physical PCI device, but when it comes to mediated devices, a physical device may attached with multiple aux-domains. Also, for guest unbind, the PASID to be unbind should be allocated to the VM. This check requires to know the ioasid_set which is associated with the domain.
So this interface needs to pass in domain info. Then the iommu driver is able to know which domain will be used for the 2nd stage translation of the nesting mode and also be able to do PASID ownership check. This patch passes @domain per the above reason.
---
v2 -> v3:
*) pass in domain info only
*) use ioasid_t for pasid instead of int type
v1 -> v2:
*) added in v2.
--- drivers/iommu/intel/svm.c | 3 ++- drivers/iommu/iommu.c | 2 +- include/linux/intel-iommu.h | 3 ++- include/linux/iommu.h | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-)
drivers/iommu/intel/svm.c +2 -1
@@ -436,7 +436,8 @@ int intel_svm_bind_gpasid(struct iommu_domain *domain, struct device *dev,return ret; } -int intel_svm_unbind_gpasid (struct device *dev,int pasid) +int intel_svm_unbind_gpasid (struct iommu_domain *domain, +struct device *dev,ioasid_t pasid) {struct intel_iommu *iommu =intel_svm_device_to_iommu (dev);struct intel_svm_dev *sdev;
drivers/iommu/iommu.c +1 -1
@@ -2081,7 +2081,7 @@ int __iommu_sva_unbind_gpasid(struct iommu_domain *domain, struct device *dev,if (unlikely (!domain->ops->sva_unbind_gpasid))return -ENODEV ; -return domain->ops->sva_unbind_gpasid (dev, data->hpasid); +return domain->ops->sva_unbind_gpasid (domain, dev, data->hpasid); }EXPORT_SYMBOL_GPL (__iommu_sva_unbind_gpasid);
include/linux/intel-iommu.h +2 -1
@@ -738,7 +738,8 @@ extern int intel_svm_enable_prq(struct intel_iommu *iommu);extern int intel_svm_finish_prq (struct intel_iommu *iommu);int intel_svm_bind_gpasid (struct iommu_domain *domain,struct device *dev,struct iommu_gpasid_bind_data *data); -int intel_svm_unbind_gpasid (struct device *dev,int pasid); +int intel_svm_unbind_gpasid (struct iommu_domain *domain, +struct device *dev,ioasid_t pasid);struct iommu_sva *intel_svm_bind (struct device *dev,struct mm_struct *mm,void *drvdata);void intel_svm_unbind (struct iommu_sva *handle);
include/linux/iommu.h +2 -1
@@ -303,7 +303,8 @@ struct iommu_ops {int (*sva_bind_gpasid)(struct iommu_domain *domain,struct device *dev,struct iommu_gpasid_bind_data *data); -int (*sva_unbind_gpasid)(struct device *dev,int pasid); +int (*sva_unbind_gpasid)(struct iommu_domain *domain, +struct device *dev,ioasid_t pasid);int (*def_domain_type)(struct device *dev);
Signature · 6 lines
2.7.4 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v4 9/15 iommu/vt-d: Check ownership for PASIDs from user-space
In reply to Liu Yi LWhen an IOMMU domain with nesting attribute is used for guest SVA, a system-wide PASID is allocated for binding with the device and the domain. For security reason, we need to check the PASID passsed from user-space. e.g. page table bind/unbind and PASID related cache invalidation.
--- drivers/iommu/intel/iommu.c | 10 ++++++++++ drivers/iommu/intel/svm.c | 7 +++++-- 2 files changed, 15 insertions(+), 2 deletions(-)
drivers/iommu/intel/iommu.c +10 -0
@@ -5437,6 +5437,7 @@ intel_iommu_sva_invalidate(struct iommu_domain *domain, struct device *dev,int granu =0 ;u64 pasid =0 ;u64 addr =0 ; +void *pdata; granu =to_vtd_granularity (cache_type, inv_info->granularity);if (granu == -EINVAL ) {
@@ -5456,6 +5457,15 @@ intel_iommu_sva_invalidate(struct iommu_domain *domain, struct device *dev, (inv_info->granu.addr_info.flags & IOMMU_INV_ADDR_FLAGS_PASID)) pasid = inv_info->granu.addr_info.pasid; + pdata =ioasid_find (dmar_domain->ioasid_sid, pasid,NULL ); +if (!pdata) { + ret = -EINVAL ; + goto out_unlock; + }else if (IS_ERR (pdata)) { + ret =PTR_ERR (pdata); + goto out_unlock; + } +switch (BIT (cache_type)) {case IOMMU_CACHE_INV_TYPE_IOTLB :/* HW will ignore LSB bits based on address mask */
drivers/iommu/intel/svm.c +5 -2
@@ -323,7 +323,7 @@ int intel_svm_bind_gpasid(struct iommu_domain *domain, struct device *dev, dmar_domain =to_dmar_domain (domain);mutex_lock (&pasid_mutex); - svm =ioasid_find (INVALID_IOASID_SET , data->hpasid,NULL ); + svm =ioasid_find (dmar_domain->ioasid_sid, data->hpasid,NULL );if (IS_ERR (svm)) { ret =PTR_ERR (svm); goto out;
@@ -440,6 +440,7 @@ int intel_svm_unbind_gpasid(struct iommu_domain *domain, struct device *dev, ioasid_t pasid) {struct intel_iommu *iommu =intel_svm_device_to_iommu (dev); +struct dmar_domain *dmar_domain;struct intel_svm_dev *sdev;struct intel_svm *svm;int ret = -EINVAL ;
@@ -447,8 +448,10 @@ int intel_svm_unbind_gpasid(struct iommu_domain *domain,if (WARN_ON (!iommu))return -EINVAL ; + dmar_domain =to_dmar_domain (domain); +mutex_lock (&pasid_mutex); - svm =ioasid_find (INVALID_IOASID_SET , pasid,NULL ); + svm =ioasid_find (dmar_domain->ioasid_sid, pasid,NULL );if (!svm) { ret = -EINVAL ; goto out;
Signature · 6 lines
2.7.4 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v4 10/15 vfio/type1: Support binding guest page tables to PASID
In reply to Liu Yi LNesting translation allows two-levels/stages page tables, with 1st level for guest translations (e.g. GVA->GPA), 2nd level for host translations (e.g. GPA->HPA). This patch adds interface for binding guest page tables to a PASID. This PASID must have been allocated to user space before the binding request.
---
v3 -> v4:
*) address comments from Alex on v3
v2 -> v3:
*) use __iommu_sva_unbind_gpasid() for unbind call issued by VFIO
https://lore.kernel.org/linux-iommu/[email protected]/
v1 -> v2:
*) rename subject from "vfio/type1: Bind guest page tables to host" *) remove VFIO_IOMMU_BIND, introduce VFIO_IOMMU_NESTING_OP to support bind/
unbind guet page table
*) replaced vfio_iommu_for_each_dev() with a group level loop since this
series enforces one group per container w/ nesting type as start.
*) rename vfio_bind/unbind_gpasid_fn() to vfio_dev_bind/unbind_gpasid_fn() *) vfio_dev_unbind_gpasid() always successful
*) use vfio_mm->pasid_lock to avoid race between PASID free and page table
bind/unbind
--- drivers/vfio/vfio_iommu_type1.c | 166 ++++++++++++++++++++++++++++++++++++++++ drivers/vfio/vfio_pasid.c | 30 ++++++++ include/linux/vfio.h | 20 +++++ include/uapi/linux/vfio.h | 30 ++++++++ 4 files changed, 246 insertions(+)
drivers/vfio/vfio_iommu_type1.c +166 -0
@@ -149,6 +149,30 @@ struct vfio_regions {#define DIRTY_BITMAP_PAGES_MAX ((u64)INT_MAX)#define DIRTY_BITMAP_SIZE_MAX DIRTY_BITMAP_BYTES(DIRTY_BITMAP_PAGES_MAX) +struct domain_capsule { +struct vfio_group *group; +struct iommu_domain *domain; +void *data; +}; + +/* iommu->lock must be held */ +static struct vfio_group *vfio_find_nesting_group (struct vfio_iommu *iommu) +{ +struct vfio_domain *d; +struct vfio_group *group =NULL ; + +if (!iommu->nesting_info) +return NULL ; + +/* only support singleton container with nesting type */ +list_for_each_entry (d, &iommu->domain_list, next) { +list_for_each_entry (group, &d->group_list, next) { +break ; + } + } +return group; +} +static int put_pfn (unsigned long pfn,int prot); static struct vfio_group *vfio_iommu_find_iommu_group(struct vfio_iommu *iommu,
@@ -2352,6 +2376,48 @@ static int vfio_iommu_resv_refresh(struct vfio_iommu *iommu,return ret; } +static int vfio_dev_bind_gpasid_fn (struct device *dev,void *data) +{ +struct domain_capsule *dc = (struct domain_capsule *)data; +unsigned long arg = *(unsigned long *) dc->data; + +return iommu_sva_bind_gpasid (dc->domain, dev, (void __user *) arg); +} + +static int vfio_dev_unbind_gpasid_fn (struct device *dev,void *data) +{ +struct domain_capsule *dc = (struct domain_capsule *)data; +unsigned long arg = *(unsigned long *) dc->data; + +iommu_sva_unbind_gpasid (dc->domain, dev, (void __user *) arg); +return 0 ; +} + +static int __vfio_dev_unbind_gpasid_fn (struct device *dev,void *data) +{ +struct domain_capsule *dc = (struct domain_capsule *)data; +struct iommu_gpasid_bind_data *unbind_data = + (struct iommu_gpasid_bind_data *) dc->data; + +__iommu_sva_unbind_gpasid (dc->domain, dev, unbind_data); +return 0 ; +} + +static void vfio_group_unbind_gpasid_fn (ioasid_t pasid,void *data) +{ +struct domain_capsule *dc = (struct domain_capsule *) data; +struct iommu_gpasid_bind_data unbind_data; + + unbind_data.argsz = offsetof(struct iommu_gpasid_bind_data , vendor); + unbind_data.flags =0 ; + unbind_data.hpasid = pasid; + + dc->data = &unbind_data; + +iommu_group_for_each_dev (dc->group->iommu_group, + dc, __vfio_dev_unbind_gpasid_fn); +} +static void vfio_iommu_type1_detach_group (void *iommu_data,struct iommu_group *iommu_group) {
@@ -2395,6 +2461,21 @@ static void vfio_iommu_type1_detach_group(void *iommu_data,if (!group)continue ; +if (iommu->nesting_info && iommu->vmm && + (iommu->nesting_info->features & +IOMMU_NESTING_FEAT_BIND_PGTBL )) { +struct domain_capsule dc = { .group = group, + .domain = domain->domain, + .data =NULL }; + +/* +* Unbind page tables bound with system wide PASIDs +* which are allocated to user space. +*/ +vfio_mm_for_each_pasid (iommu->vmm, &dc, + vfio_group_unbind_gpasid_fn); + } +vfio_iommu_detach_group (domain, group); update_dirty_scope = !group->pinned_page_dirty_scope;list_del (&group->next);
@@ -2942,6 +3023,89 @@ static int vfio_iommu_type1_pasid_request(struct vfio_iommu *iommu, } } +static long vfio_iommu_handle_pgtbl_op (struct vfio_iommu *iommu, +bool is_bind,unsigned long arg) +{ +struct iommu_nesting_info *info; +struct domain_capsule dc = { .data = &arg }; +struct vfio_group *group; +struct vfio_domain *domain; +int ret; + +mutex_lock (&iommu->lock); + + info = iommu->nesting_info; +if (!info || !(info->features &IOMMU_NESTING_FEAT_BIND_PGTBL )) { + ret = -EOPNOTSUPP ; + goto out_unlock_iommu; + } + +if (!iommu->vmm) { + ret = -EINVAL ; + goto out_unlock_iommu; + } + + group =vfio_find_nesting_group (iommu); +if (!group) { + ret = -EINVAL ; + goto out_unlock_iommu; + } + + domain =list_first_entry (&iommu->domain_list, + struct vfio_domain, next); + dc.group = group; + dc.domain = domain->domain; + +/* Avoid race with other containers within the same process */ +vfio_mm_pasid_lock (iommu->vmm); + +if (is_bind) { + ret =iommu_group_for_each_dev (group->iommu_group, &dc, + vfio_dev_bind_gpasid_fn); +if (ret) +iommu_group_for_each_dev (group->iommu_group, &dc, + vfio_dev_unbind_gpasid_fn); + }else { +iommu_group_for_each_dev (group->iommu_group, + &dc, vfio_dev_unbind_gpasid_fn); + ret =0 ; + } + +vfio_mm_pasid_unlock (iommu->vmm); +out_unlock_iommu: +mutex_unlock (&iommu->lock); +return ret; +} + +static long vfio_iommu_type1_nesting_op (struct vfio_iommu *iommu, +unsigned long arg) +{ +struct vfio_iommu_type1_nesting_op hdr; +unsigned int minsz; +int ret; + + minsz = offsetofend(struct vfio_iommu_type1_nesting_op, flags); + +if (copy_from_user (&hdr, (void __user *)arg, minsz)) +return -EFAULT ; + +if (hdr.argsz < minsz || hdr.flags & ~VFIO_NESTING_OP_MASK ) +return -EINVAL ; + +switch (hdr.flags &VFIO_NESTING_OP_MASK ) { +case VFIO_IOMMU_NESTING_OP_BIND_PGTBL : + ret =vfio_iommu_handle_pgtbl_op (iommu, true, arg + minsz); +break ; +case VFIO_IOMMU_NESTING_OP_UNBIND_PGTBL : + ret =vfio_iommu_handle_pgtbl_op (iommu, false, arg + minsz); +break ; +default : + ret = -EINVAL ; + } + +return ret; +} +static long vfio_iommu_type1_ioctl (void *iommu_data,unsigned int cmd,unsigned long arg) {
@@ -2960,6 +3124,8 @@ static long vfio_iommu_type1_ioctl(void *iommu_data,return vfio_iommu_type1_dirty_pages (iommu, arg);case VFIO_IOMMU_PASID_REQUEST :return vfio_iommu_type1_pasid_request (iommu, arg); +case VFIO_IOMMU_NESTING_OP : +return vfio_iommu_type1_nesting_op (iommu, arg); }return -ENOTTY ;
drivers/vfio/vfio_pasid.c +30 -0
@@ -29,6 +29,7 @@ struct vfio_mm_token {struct vfio_mm {struct kref kref;int ioasid_sid; +struct mutex pasid_lock;struct list_head next;struct vfio_mm_token token; };
@@ -98,6 +99,7 @@ struct vfio_mm *vfio_mm_get_from_task(struct task_struct *task)kref_init (&vmm->kref); vmm->token.val = val; +mutex_init (&vmm->pasid_lock);list_add (&vmm->next, &vfio_pasid.vfio_mm_list); out:
@@ -135,12 +137,40 @@ void vfio_pasid_free_range(struct vfio_mm *vmm,* IOASID core will notify PASID users (e.g. IOMMU driver) to * teardown necessary structures depending on the to-be-freed * PASID. +* Hold pasid_lock to avoid race with PASID usages like bind/ +* unbind page tables to requested PASID. */ +mutex_lock (&vmm->pasid_lock);for (; pasid <= max; pasid++)ioasid_free (pasid); +mutex_unlock (&vmm->pasid_lock); }EXPORT_SYMBOL_GPL (vfio_pasid_free_range); +int vfio_mm_for_each_pasid (struct vfio_mm *vmm,void *data, +void (*fn)(ioasid_t id,void *data)) +{ +int ret; + +mutex_lock (&vmm->pasid_lock); + ret =ioasid_set_for_each_ioasid (vmm->ioasid_sid, fn, data); +mutex_unlock (&vmm->pasid_lock); +return ret; +} +EXPORT_SYMBOL_GPL (vfio_mm_for_each_pasid); + +void vfio_mm_pasid_lock (struct vfio_mm *vmm) +{ +mutex_lock (&vmm->pasid_lock); +} +EXPORT_SYMBOL_GPL (vfio_mm_pasid_lock); + +void vfio_mm_pasid_unlock (struct vfio_mm *vmm) +{ +mutex_unlock (&vmm->pasid_lock); +} +EXPORT_SYMBOL_GPL (vfio_mm_pasid_unlock); +static int __init vfio_pasid_init (void ) {mutex_init (&vfio_pasid.vfio_mm_lock);
include/linux/vfio.h +20 -0
@@ -105,6 +105,11 @@ int vfio_mm_ioasid_sid(struct vfio_mm *vmm);extern int vfio_pasid_alloc (struct vfio_mm *vmm,int min,int max);extern void vfio_pasid_free_range (struct vfio_mm *vmm,ioasid_t min,ioasid_t max); +extern int vfio_mm_for_each_pasid (struct vfio_mm *vmm,void *data, +void (*fn)(ioasid_t id,void *data)); +extern void vfio_mm_pasid_lock (struct vfio_mm *vmm); +extern void vfio_mm_pasid_unlock (struct vfio_mm *vmm); +#else static inline struct vfio_mm *vfio_mm_get_from_task (struct task_struct *task) {
@@ -129,6 +134,21 @@ static inline void vfio_pasid_free_range(struct vfio_mm *vmm, ioasid_t min, ioasid_t max) { } + +static inline int vfio_mm_for_each_pasid (struct vfio_mm *vmm,void *data, +void (*fn)(ioasid_t id,void *data)) +{ +return -ENOTTY ; +} + +static inline void vfio_mm_pasid_lock (struct vfio_mm *vmm) +{ +} + +static inline void vfio_mm_pasid_unlock (struct vfio_mm *vmm) +{ +} +#endif /* CONFIG_VFIO_PASID */ /*
include/uapi/linux/vfio.h +30 -0
@@ -1205,6 +1205,36 @@ struct vfio_iommu_type1_pasid_request {#define VFIO_IOMMU_PASID_REQUEST _IO(VFIO_TYPE, VFIO_BASE + 18) +/** +* VFIO_IOMMU_NESTING_OP - _IOW(VFIO_TYPE, VFIO_BASE + 19, +* struct vfio_iommu_type1_nesting_op) +* +* This interface allows user space to utilize the nesting IOMMU +* capabilities as reported through VFIO_IOMMU_GET_INFO. +* +* @data[] types defined for each op: +* +=================+===============================================+ +* | NESTING OP | @data[] | +* +=================+===============================================+ +* | BIND_PGTBL | struct iommu_gpasid_bind_data | +* +-----------------+-----------------------------------------------+ +* | UNBIND_PGTBL | struct iommu_gpasid_bind_data | +* +-----------------+-----------------------------------------------+ +* +* returns: 0 on success, -errno on failure. +*/ +struct vfio_iommu_type1_nesting_op { +__u32 argsz; +__u32 flags; +#define VFIO_NESTING_OP_MASK (0xffff)/* lower 16-bits for op */ +__u8 data[]; +}; + +#define VFIO_IOMMU_NESTING_OP_BIND_PGTBL (0) +#define VFIO_IOMMU_NESTING_OP_UNBIND_PGTBL (1) + +#define VFIO_IOMMU_NESTING_OP _IO(VFIO_TYPE, VFIO_BASE + 19) +/* -------- Additional API for SPAPR TCE (Server POWERPC) IOMMU -------- */ /*
Signature · 6 lines
2.7.4 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v4 11/15 vfio/type1: Allow invalidating first-level/stage IOMMU cache
In reply to Liu Yi LThis patch provides an interface allowing the userspace to invalidate IOMMU cache for first-level page table. It is required when the first level IOMMU page table is not managed by the host kernel in the nested translation setup.
---
v1 -> v2:
*) rename from "vfio/type1: Flush stage-1 IOMMU cache for nesting type" *) rename vfio_cache_inv_fn() to vfio_dev_cache_invalidate_fn() *) vfio_dev_cache_inv_fn() always successful
*) remove VFIO_IOMMU_CACHE_INVALIDATE, and reuse VFIO_IOMMU_NESTING_OP
--- drivers/vfio/vfio_iommu_type1.c | 50 +++++++++++++++++++++++++++++++++++++++++ include/uapi/linux/vfio.h | 3 +++ 2 files changed, 53 insertions(+)
drivers/vfio/vfio_iommu_type1.c +50 -0
@@ -3077,6 +3077,53 @@ static long vfio_iommu_handle_pgtbl_op(struct vfio_iommu *iommu,return ret; } +static int vfio_dev_cache_invalidate_fn (struct device *dev,void *data) +{ +struct domain_capsule *dc = (struct domain_capsule *)data; +unsigned long arg = *(unsigned long *) dc->data; + +iommu_cache_invalidate (dc->domain, dev, (void __user *) arg); +return 0 ; +} + +static long vfio_iommu_invalidate_cache (struct vfio_iommu *iommu, +unsigned long arg) +{ +struct domain_capsule dc = { .data = &arg }; +struct vfio_group *group; +struct vfio_domain *domain; +int ret =0 ; +struct iommu_nesting_info *info; + +mutex_lock (&iommu->lock); +/* +* Cache invalidation is required for any nesting IOMMU, +* so no need to check system-wide PASID support. +*/ + info = iommu->nesting_info; +if (!info || !(info->features &IOMMU_NESTING_FEAT_CACHE_INVLD )) { + ret = -EOPNOTSUPP ; + goto out_unlock; + } + + group =vfio_find_nesting_group (iommu); +if (!group) { + ret = -EINVAL ; + goto out_unlock; + } + + domain =list_first_entry (&iommu->domain_list, + struct vfio_domain, next); + dc.group = group; + dc.domain = domain->domain; +iommu_group_for_each_dev (group->iommu_group, &dc, + vfio_dev_cache_invalidate_fn); + +out_unlock: +mutex_unlock (&iommu->lock); +return ret; +} +static long vfio_iommu_type1_nesting_op (struct vfio_iommu *iommu,unsigned long arg) {
@@ -3099,6 +3146,9 @@ static long vfio_iommu_type1_nesting_op(struct vfio_iommu *iommu,case VFIO_IOMMU_NESTING_OP_UNBIND_PGTBL : ret =vfio_iommu_handle_pgtbl_op (iommu, false, arg + minsz);break ; +case VFIO_IOMMU_NESTING_OP_CACHE_INVLD : + ret =vfio_iommu_invalidate_cache (iommu, arg + minsz); +break ;default : ret = -EINVAL ; }
include/uapi/linux/vfio.h +3 -0
@@ -1220,6 +1220,8 @@ struct vfio_iommu_type1_pasid_request {* +-----------------+-----------------------------------------------+ * | UNBIND_PGTBL | struct iommu_gpasid_bind_data | * +-----------------+-----------------------------------------------+ +* | CACHE_INVLD | struct iommu_cache_invalidate_info | +* +-----------------+-----------------------------------------------+ * * returns: 0 on success, -errno on failure. */
@@ -1232,6 +1234,7 @@ struct vfio_iommu_type1_nesting_op {#define VFIO_IOMMU_NESTING_OP_BIND_PGTBL (0)#define VFIO_IOMMU_NESTING_OP_UNBIND_PGTBL (1) +#define VFIO_IOMMU_NESTING_OP_CACHE_INVLD (2)#define VFIO_IOMMU_NESTING_OP _IO(VFIO_TYPE, VFIO_BASE + 19)
Signature · 6 lines
2.7.4 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v4 12/15 vfio/type1: Add vSVA support for IOMMU-backed mdevs
In reply to Liu Yi LRecent years, mediated device pass-through framework (e.g. vfio-mdev) is used to achieve flexible device sharing across domains (e.g. VMs). Also there are hardware assisted mediated pass-through solutions from platform vendors. e.g. Intel VT-d scalable mode which supports Intel Scalable I/O Virtualization technology. Such mdevs are called IOMMU- backed mdevs as there are IOMMU enforced DMA isolation for such mdevs. In kernel, IOMMU-backed mdevs are exposed to IOMMU layer by aux-domain concept, which means mdevs are protected by an iommu domain which is auxiliary to the domain that the kernel driver primarily uses for DMA API. Details can be found in the KVM presentation as below:
https://events19.linuxfoundation.org/wp-content/uploads/2017/12/\
Hardware-Assisted-Mediated-Pass-Through-with-VFIO-Kevin-Tian-Intel.pdf
This patch extends NESTING_IOMMU ops to IOMMU-backed mdev devices. The main requirement is to use the auxiliary domain associated with mdev.
---
v1 -> v2:
*) check the iommu_device to ensure the handling mdev is IOMMU-backed
--- drivers/vfio/vfio_iommu_type1.c | 40 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 4 deletions(-)
drivers/vfio/vfio_iommu_type1.c +36 -4
@@ -2376,20 +2376,41 @@ static int vfio_iommu_resv_refresh(struct vfio_iommu *iommu,return ret; } +static struct device *vfio_get_iommu_device (struct vfio_group *group, +struct device *dev) +{ +if (group->mdev_group) +return vfio_mdev_get_iommu_device (dev); +else +return dev; +} +static int vfio_dev_bind_gpasid_fn (struct device *dev,void *data) {struct domain_capsule *dc = (struct domain_capsule *)data;unsigned long arg = *(unsigned long *) dc->data; +struct device *iommu_device; + + iommu_device =vfio_get_iommu_device (dc->group, dev); +if (!iommu_device) +return -EINVAL ; -return iommu_sva_bind_gpasid (dc->domain, dev, (void __user *) arg); +return iommu_sva_bind_gpasid (dc->domain, iommu_device, + (void __user *) arg); }static int vfio_dev_unbind_gpasid_fn (struct device *dev,void *data) {struct domain_capsule *dc = (struct domain_capsule *)data;unsigned long arg = *(unsigned long *) dc->data; +struct device *iommu_device; -iommu_sva_unbind_gpasid (dc->domain, dev, (void __user *) arg); + iommu_device =vfio_get_iommu_device (dc->group, dev); +if (!iommu_device) +return -EINVAL ; + +iommu_sva_unbind_gpasid (dc->domain, iommu_device, + (void __user *) arg);return 0 ; }
@@ -2398,8 +2419,13 @@ static int __vfio_dev_unbind_gpasid_fn(struct device *dev, void *data)struct domain_capsule *dc = (struct domain_capsule *)data;struct iommu_gpasid_bind_data *unbind_data = (struct iommu_gpasid_bind_data *) dc->data; +struct device *iommu_device; + + iommu_device =vfio_get_iommu_device (dc->group, dev); +if (!iommu_device) +return -EINVAL ; -__iommu_sva_unbind_gpasid (dc->domain, dev, unbind_data); +__iommu_sva_unbind_gpasid (dc->domain, iommu_device, unbind_data);return 0 ; }
@@ -3081,8 +3107,14 @@ static int vfio_dev_cache_invalidate_fn(struct device *dev, void *data) {struct domain_capsule *dc = (struct domain_capsule *)data;unsigned long arg = *(unsigned long *) dc->data; +struct device *iommu_device; + + iommu_device =vfio_get_iommu_device (dc->group, dev); +if (!iommu_device) +return -EINVAL ; -iommu_cache_invalidate (dc->domain, dev, (void __user *) arg); +iommu_cache_invalidate (dc->domain, iommu_device, + (void __user *) arg);return 0 ; }
Signature · 6 lines
2.7.4 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v4 13/15 vfio/pci: Expose PCIe PASID capability to guest
In reply to Liu Yi LThis patch exposes PCIe PASID capability to guest for assigned devices. Existing vfio_pci driver hides it from guest by setting the capability length as 0 in pci_ext_cap_length[].
And this patch only exposes PASID capability for devices which has PCIe PASID extended struture in its configuration space. So VFs, will will not see PASID capability on VFs as VF doesn't implement PASID extended structure in its configuration space. For VF, it is a TODO in future. Related discussion can be found in below link:
https://lkml.org/lkml/2020/4/7/693
---
v1 -> v2:
*) added in v2, but it was sent in a separate patchseries before
--- drivers/vfio/pci/vfio_pci_config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/vfio/pci/vfio_pci_config.c +1 -1
@@ -95,7 +95,7 @@ static const u16 pci_ext_cap_length[PCI_EXT_CAP_ID_MAX + 1] = { [PCI_EXT_CAP_ID_LTR] = PCI_EXT_CAP_LTR_SIZEOF, [PCI_EXT_CAP_ID_SECPCI] = 0, /* not yet */ [PCI_EXT_CAP_ID_PMUX] = 0, /* not yet */ - [PCI_EXT_CAP_ID_PASID] = 0, /* not yet */ + [PCI_EXT_CAP_ID_PASID] = PCI_EXT_CAP_PASID_SIZEOF, };/*
Signature · 6 lines
2.7.4 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v4 14/15 vfio: Document dual stage control
In reply to Liu Yi LFrom: Eric Auger <[email protected]>
The VFIO API was enhanced to support nested stage control: a bunch of new iotcls and usage guideline.
Let's document the process to follow to set up nested mode.
---
v3 -> v4:
*) add review-by from Stefan Hajnoczi
v2 -> v3:
*) address comments from Stefan Hajnoczi
v1 -> v2:
*) new in v2, compared with Eric's original version, pasid table bind
and fault reporting is removed as this series doesn't cover them. Original version from Eric.
https://lkml.org/lkml/2020/3/20/700
--- Documentation/driver-api/vfio.rst | 67 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+)
Documentation/driver-api/vfio.rst +67 -0
@@ -239,6 +239,73 @@ group and can access them as follows:: /* Gratuitous device reset and go... */ ioctl(device, VFIO_DEVICE_RESET); +IOMMU Dual Stage Control +------------------------ + +Some IOMMUs support 2 stages/levels of translation. Stage corresponds to +the ARM terminology while level corresponds to Intel's VTD terminology. +In the following text we use either without distinction. + +This is useful when the guest is exposed with a virtual IOMMU and some +devices are assigned to the guest through VFIO. Then the guest OS can use +stage 1 (GIOVA -> GPA or GVA->GPA), while the hypervisor uses stage 2 for +VM isolation (GPA -> HPA). + +Under dual stage translation, the guest gets ownership of the stage 1 page +tables and also owns stage 1 configuration structures. The hypervisor owns +the root configuration structure (for security reason), including stage 2 +configuration. This works as long as configuration structures and page table +formats are compatible between the virtual IOMMU and the physical IOMMU. + +Assuming the HW supports it, this nested mode is selected by choosing the +VFIO_TYPE1_NESTING_IOMMU type through: + + ioctl(container, VFIO_SET_IOMMU, VFIO_TYPE1_NESTING_IOMMU); + +This forces the hypervisor to use the stage 2, leaving stage 1 available +for guest usage. The guest stage 1 format depends on IOMMU vendor, and +it is the same with the nesting configuration method. User space should +check the format and configuration method after setting nesting type by +using: + + ioctl(container->fd, VFIO_IOMMU_GET_INFO, &nesting_info); + +Details can be found in Documentation/userspace-api/iommu.rst. For Intel +VT-d, each stage 1 page table is bound to host by: + + nesting_op->flags = VFIO_IOMMU_NESTING_OP_BIND_PGTBL; + memcpy(&nesting_op->data, &bind_data, sizeof(bind_data)); + ioctl(container->fd, VFIO_IOMMU_NESTING_OP, nesting_op); + +As mentioned above, guest OS may use stage 1 for GIOVA->GPA or GVA->GPA. +GVA->GPA page tables are available when PASID (Process Address Space ID) +is exposed to guest. e.g. guest with PASID-capable devices assigned. For +such page table binding, the bind_data should include PASID info, which +is allocated by guest itself or by host. This depends on hardware vendor. +e.g. Intel VT-d requires to allocate PASID from host. This requirement is +defined by the Virtual Command Support in VT-d 3.0 spec, guest software +running on VT-d should allocate PASID from host kernel. To allocate PASID +from host, user space should check the IOMMU_NESTING_FEAT_SYSWIDE_PASID +bit of the nesting info reported from host kernel. VFIO reports the nesting +info by VFIO_IOMMU_GET_INFO. User space could allocate PASID from host by: + + req.flags = VFIO_IOMMU_ALLOC_PASID; + ioctl(container, VFIO_IOMMU_PASID_REQUEST, &req); + +With first stage/level page table bound to host, it allows to combine the +guest stage 1 translation along with the hypervisor stage 2 translation to +get final address. + +When the guest invalidates stage 1 related caches, invalidations must be +forwarded to the host through + + nesting_op->flags = VFIO_IOMMU_NESTING_OP_CACHE_INVLD; + memcpy(&nesting_op->data, &inv_data, sizeof(inv_data)); + ioctl(container->fd, VFIO_IOMMU_NESTING_OP, nesting_op); + +Those invalidations can happen at various granularity levels, page, context, +... + VFIO User API -------------------------------------------------------------------------------
Signature · 6 lines
2.7.4 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v4 15/15 iommu/vt-d: Support reporting nesting capability info
In reply to Liu Yi L---
v2 -> v3:
*) remove cap/ecap_mask in iommu_nesting_info.
--- drivers/iommu/intel/iommu.c | 81 +++++++++++++++++++++++++++++++++++++++++++-- include/linux/intel-iommu.h | 16 +++++++++ 2 files changed, 95 insertions(+), 2 deletions(-)
drivers/iommu/intel/iommu.c +79 -2
@@ -5659,12 +5659,16 @@ static inline bool iommu_pasid_support(void)static inline bool nested_mode_support (void ) {struct dmar_drhd_unit *drhd; -struct intel_iommu *iommu; +struct intel_iommu *iommu, *prev =NULL ;bool ret = true;rcu_read_lock ();for_each_active_iommu (iommu, drhd) { -if (!sm_supported (iommu) || !ecap_nest (iommu->ecap)) { +if (!prev) + prev = iommu; +if (!sm_supported (iommu) || !ecap_nest (iommu->ecap) || + (VTD_CAP_MASK & (iommu->cap ^ prev->cap)) || + (VTD_ECAP_MASK & (iommu->ecap ^ prev->ecap))) { ret = false;break ; }
@@ -6073,6 +6077,78 @@ intel_iommu_domain_set_attr(struct iommu_domain *domain,return ret; } +static int intel_iommu_get_nesting_info (struct iommu_domain *domain, +struct iommu_nesting_info *info) +{ +struct dmar_domain *dmar_domain =to_dmar_domain (domain); +u64 cap =VTD_CAP_MASK , ecap =VTD_ECAP_MASK ; +struct device_domain_info *domain_info; +struct iommu_nesting_info_vtd vtd; +unsigned long flags; +u32 size; + +if ((domain->type !=IOMMU_DOMAIN_UNMANAGED ) || + !(dmar_domain->flags &DOMAIN_FLAG_NESTING_MODE )) +return -ENODEV ; + +if (!info) +return -EINVAL ; + + size =sizeof (struct iommu_nesting_info ) + +sizeof (struct iommu_nesting_info_vtd ); +/* +* if provided buffer size is not equal to the size, should +* return 0 and also the expected buffer size to caller. +*/ +if (info->size != size) { + info->size = size; +return 0 ; + } + +spin_lock_irqsave (&device_domain_lock, flags); +/* +* arbitrary select the first domain_info as all nesting +* related capabilities should be consistent across iommu +* units. +*/ + domain_info =list_first_entry (&dmar_domain->devices, + struct device_domain_info, link); + cap &= domain_info->iommu->cap; + ecap &= domain_info->iommu->ecap; +spin_unlock_irqrestore (&device_domain_lock, flags); + + info->format =IOMMU_PASID_FORMAT_INTEL_VTD ; + info->features =IOMMU_NESTING_FEAT_SYSWIDE_PASID | +IOMMU_NESTING_FEAT_BIND_PGTBL | +IOMMU_NESTING_FEAT_CACHE_INVLD ; + info->addr_width = dmar_domain->gaw; + info->pasid_bits =ilog2 (intel_pasid_max_id); + info->padding =0 ; + vtd.flags =0 ; + vtd.padding =0 ; + vtd.cap_reg = cap; + vtd.ecap_reg = ecap; + +memcpy (info->data, &vtd,sizeof (vtd)); +return 0 ; +} + +static int intel_iommu_domain_get_attr (struct iommu_domain *domain, +enum iommu_attr attr,void *data) +{ +switch (attr) { +case DOMAIN_ATTR_NESTING : + { +struct iommu_nesting_info *info = + (struct iommu_nesting_info *) data; + +return intel_iommu_get_nesting_info (domain, info); + } +default : +return -ENODEV ; + } +} +/* * Check that the device does not live on an external facing PCI port that is * marked as untrusted. Such devices should not be able to apply quirks and
@@ -6095,6 +6171,7 @@ const struct iommu_ops intel_iommu_ops = { .domain_alloc = intel_iommu_domain_alloc, .domain_free = intel_iommu_domain_free, .domain_set_attr = intel_iommu_domain_set_attr, + .domain_get_attr = intel_iommu_domain_get_attr, .attach_dev = intel_iommu_attach_device, .detach_dev = intel_iommu_detach_device, .aux_attach_dev = intel_iommu_aux_attach_device,
include/linux/intel-iommu.h +16 -0
@@ -197,6 +197,22 @@#define ecap_max_handle_mask (e) ((e >> 20) & 0xf)#define ecap_sc_support (e) ((e >> 7) & 0x1)/* Snooping Control */ +/* Nesting Support Capability Alignment */ +#define VTD_CAP_FL1GP (1ULL << 56) +#define VTD_CAP_FL5LP (1ULL << 60) +#define VTD_ECAP_PRS (1ULL << 29) +#define VTD_ECAP_ERS (1ULL << 30) +#define VTD_ECAP_SRS (1ULL << 31) +#define VTD_ECAP_EAFS (1ULL << 34) +#define VTD_ECAP_PASID (1ULL << 40) + +/* Only capabilities marked in below MASKs are reported */ +#define VTD_CAP_MASK (VTD_CAP_FL1GP | VTD_CAP_FL5LP) + +#define VTD_ECAP_MASK (VTD_ECAP_PRS | VTD_ECAP_ERS | \ + VTD_ECAP_SRS | VTD_ECAP_EAFS | \ + VTD_ECAP_PASID) +/* Virtual command interface capability */ #define vccap_pasid (v) (((v) & DMA_VCS_PAS))/* PASID allocation */
Signature · 6 lines
2.7.4 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu