iommu/vt-d: patches for v5.9
Subsystems (2)
Lu Baolu
maintainerHi Joerg,
Below patches have been piled up for v5.9. It includes:
- Misc tweaks and fixes for vSVA
- Report/response page request events
- Cleanups
Can you please consider them for iommu/next?
Best regards,
Lu Baolu
Jacob Pan (4):
iommu/vt-d: Remove global page support in devTLB flush iommu/vt-d: Fix PASID devTLB invalidation iommu/vt-d: Warn on out-of-range invalidation address iommu/vt-d: Disable multiple GPASID-dev bind
Liu Yi L (3):
iommu/vt-d: Enforce PASID devTLB field mask
iommu/vt-d: Handle non-page aligned address
iommu/vt-d: Fix devTLB flush for vSVA
Lu Baolu (5):
iommu/vt-d: Refactor device_to_iommu() helper iommu/vt-d: Add a helper to get svm and sdev for pasid iommu/vt-d: Report page request faults for guest SVA iommu/vt-d: Add page response ops support iommu/vt-d: Rename intel-pasid.h to pasid.h
drivers/iommu/intel/debugfs.c | 2 +-
drivers/iommu/intel/dmar.c | 25 +-
drivers/iommu/intel/iommu.c | 96 +++--
drivers/iommu/intel/pasid.c | 13 +-
.../iommu/intel/{intel-pasid.h => pasid.h} | 2 +-
drivers/iommu/intel/svm.c | 335 +++++++++++++-----
include/linux/intel-iommu.h | 11 +-
7 files changed, 337 insertions(+), 147 deletions(-)
rename drivers/iommu/intel/{intel-pasid.h => pasid.h} (98%)Signature · 6 lines
2.17.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Lu Baolu
maintainerPATCH 1/12 iommu/vt-d: Enforce PASID devTLB field mask
From: Liu Yi L <[email protected]>
Set proper masks to avoid invalid input spillover to reserved bits.
--- include/linux/intel-iommu.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/linux/intel-iommu.h +2 -2
@@ -381,8 +381,8 @@ enum {#define QI_DEV_EIOTLB_ADDR (a) ((u64)(a) & VTD_PAGE_MASK)#define QI_DEV_EIOTLB_SIZE (((u64)1) << 11) -#define QI_DEV_EIOTLB_GLOB (g) ((u64)g) -#define QI_DEV_EIOTLB_PASID (p) (((u64)p) << 32) +#define QI_DEV_EIOTLB_GLOB (g) ((u64)(g) & 0x1) +#define QI_DEV_EIOTLB_PASID (p) ((u64)((p) & 0xfffff) << 32)#define QI_DEV_EIOTLB_SID (sid) ((u64)((sid) & 0xffff) << 16)#define QI_DEV_EIOTLB_QDEP (qd) ((u64)((qd) & 0x1f) << 4)#define QI_DEV_EIOTLB_PFSID (pfsid) (((u64)(pfsid & 0xf) << 12) | \
Signature · 6 lines
2.17.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Lu Baolu
maintainerPATCH 2/12 iommu/vt-d: Remove global page support in devTLB flush
In reply to Lu BaoluFrom: Jacob Pan <[email protected]>
Global pages support is removed from VT-d spec 3.0 for dev TLB invalidation. This patch is to remove the bits for vSVA. Similar change already made for the native SVA. See the link below.
--- drivers/iommu/intel/dmar.c | 4 +--- drivers/iommu/intel/iommu.c | 4 ++-- include/linux/intel-iommu.h | 3 +-- 3 files changed, 4 insertions(+), 7 deletions(-)
drivers/iommu/intel/dmar.c +1 -3
@@ -1439,8 +1439,7 @@ void qi_flush_piotlb(struct intel_iommu *iommu, u16 did, u32 pasid, u64 addr,/* PASID-based device IOTLB Invalidate */ void qi_flush_dev_iotlb_pasid (struct intel_iommu *iommu,u16 sid,u16 pfsid, -u32 pasid,u16 qdep,u64 addr, -unsigned int size_order,u64 granu) +u32 pasid,u16 qdep,u64 addr,unsigned int size_order) {unsigned long mask =1UL << (VTD_PAGE_SHIFT + size_order -1 );struct qi_desc desc = {.qw1 =0 , .qw2 =0 , .qw3 =0 };
@@ -1448,7 +1447,6 @@ void qi_flush_dev_iotlb_pasid(struct intel_iommu *iommu, u16 sid, u16 pfsid, desc.qw0 =QI_DEV_EIOTLB_PASID (pasid) |QI_DEV_EIOTLB_SID (sid) |QI_DEV_EIOTLB_QDEP (qdep) |QI_DEIOTLB_TYPE |QI_DEV_IOTLB_PFSID (pfsid); - desc.qw1 =QI_DEV_EIOTLB_GLOB (granu);/* * If S bit is 0, we only flush a single page. If S bit is set,
drivers/iommu/intel/iommu.c +2 -2
@@ -5480,7 +5480,7 @@ intel_iommu_sva_invalidate(struct iommu_domain *domain, struct device *dev, info->pfsid, pasid, info->ats_qdep, inv_info->addr_info.addr, - size, granu); + size);break ;case IOMMU_CACHE_INV_TYPE_DEV_IOTLB :if (info->ats_enabled)
@@ -5488,7 +5488,7 @@ intel_iommu_sva_invalidate(struct iommu_domain *domain, struct device *dev, info->pfsid, pasid, info->ats_qdep, inv_info->addr_info.addr, - size, granu); + size); else pr_warn_ratelimited("Passdown device IOTLB flush w/o ATS!\n");break ;
include/linux/intel-iommu.h +1 -2
@@ -381,7 +381,6 @@ enum {#define QI_DEV_EIOTLB_ADDR (a) ((u64)(a) & VTD_PAGE_MASK)#define QI_DEV_EIOTLB_SIZE (((u64)1) << 11) -#define QI_DEV_EIOTLB_GLOB (g) ((u64)(g) & 0x1)#define QI_DEV_EIOTLB_PASID (p) ((u64)((p) & 0xfffff) << 32)#define QI_DEV_EIOTLB_SID (sid) ((u64)((sid) & 0xffff) << 16)#define QI_DEV_EIOTLB_QDEP (qd) ((u64)((qd) & 0x1f) << 4)
@@ -707,7 +706,7 @@ void qi_flush_piotlb(struct intel_iommu *iommu, u16 did, u32 pasid, u64 addr,void qi_flush_dev_iotlb_pasid (struct intel_iommu *iommu,u16 sid,u16 pfsid,u32 pasid,u16 qdep,u64 addr, -unsigned int size_order,u64 granu); +unsigned int size_order);void qi_flush_pasid_cache (struct intel_iommu *iommu,u16 did,u64 granu,int pasid);
Signature · 6 lines
2.17.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Lu Baolu
maintainerPATCH 3/12 iommu/vt-d: Fix PASID devTLB invalidation
In reply to Lu BaoluFrom: Jacob Pan <[email protected]>
DevTLB flush can be used for both DMA request with and without PASIDs. The former uses PASID#0 (RID2PASID), latter uses non-zero PASID for SVA usage.
This patch adds a check for PASID value such that devTLB flush with PASID is used for SVA case. This is more efficient in that multiple PASIDs can be used by a single device, when tearing down a PASID entry we shall flush only the devTLB specific to a PASID.
--- drivers/iommu/intel/pasid.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/iommu/intel/pasid.c +10 -1
@@ -486,7 +486,16 @@ devtlb_invalidation_with_pasid(struct intel_iommu *iommu, qdep = info->ats_qdep; pfsid = info->pfsid; -qi_flush_dev_iotlb (iommu, sid, pfsid, qdep,0 ,64 -VTD_PAGE_SHIFT ); +/* +* When PASID 0 is used, it indicates RID2PASID(DMA request w/o PASID), +* devTLB flush w/o PASID should be used. For non-zero PASID under +* SVA usage, device could do DMA with multiple PASIDs. It is more +* efficient to flush devTLB specific to the PASID. +*/ +if (pasid ==PASID_RID2PASID ) +qi_flush_dev_iotlb (iommu, sid, pfsid, qdep,0 ,64 -VTD_PAGE_SHIFT ); +else +qi_flush_dev_iotlb_pasid (iommu, sid, pfsid, pasid, qdep,0 ,64 -VTD_PAGE_SHIFT ); } void intel_pasid_tear_down_entry(struct intel_iommu *iommu, struct device *dev,
Signature · 6 lines
2.17.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Lu Baolu
maintainerPATCH 5/12 iommu/vt-d: Fix devTLB flush for vSVA
In reply to Lu BaoluFrom: Liu Yi L <[email protected]>
For guest SVA usage, in order to optimize for less VMEXIT, guest request of IOTLB flush also includes device TLB.
On the host side, IOMMU driver performs IOTLB and implicit devTLB invalidation. When PASID-selective granularity is requested by the guest we need to derive the equivalent address range for devTLB instead of using the address information in the UAPI data. The reason for that is, unlike IOTLB flush, devTLB flush does not support PASID-selective granularity. This is to say, we need to set the following in the PASID based devTLB invalidation descriptor:
- entire 64 bit range in address ~(0x1 << 63)
- S bit = 1 (VT-d CH 6.5.2.6).
Without this fix, device TLB flush range is not set properly for PASID selective granularity. This patch also merged devTLB flush code for both implicit and explicit cases.
--- drivers/iommu/intel/iommu.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-)
drivers/iommu/intel/iommu.c +21 -10
@@ -5422,7 +5422,7 @@ intel_iommu_sva_invalidate(struct iommu_domain *domain, struct device *dev, sid =PCI_DEVID (bus, devfn);/* Size is only valid in address selective invalidation */ -if (inv_info->granularity !=IOMMU_INV_GRANU_PASID ) +if (inv_info->granularity ==IOMMU_INV_GRANU_ADDR ) size =to_vtd_size (inv_info->addr_info.granule_size, inv_info->addr_info.nb_granules);
@@ -5431,6 +5431,7 @@ intel_iommu_sva_invalidate(struct iommu_domain *domain, struct device *dev, IOMMU_CACHE_INV_TYPE_NR) {int granu =0 ;u64 pasid =0 ; +u64 addr =0 ; granu =to_vtd_granularity (cache_type, inv_info->granularity);if (granu == -EINVAL ) {
@@ -5470,24 +5471,34 @@ intel_iommu_sva_invalidate(struct iommu_domain *domain, struct device *dev, (granu ==QI_GRAN_NONG_PASID ) ?-1 :1 << size, inv_info->addr_info.flags & IOMMU_INV_ADDR_FLAGS_LEAF); +if (!info->ats_enabled) +break ;/* * Always flush device IOTLB if ATS is enabled. vIOMMU * in the guest may assume IOTLB flush is inclusive, * which is more efficient. */ -if (info->ats_enabled) -qi_flush_dev_iotlb_pasid (iommu, sid, - info->pfsid, pasid, - info->ats_qdep, - inv_info->addr_info.addr, - size); -break ; + fallthrough;case IOMMU_CACHE_INV_TYPE_DEV_IOTLB : +/* +* PASID based device TLB invalidation does not support +* IOMMU_INV_GRANU_PASID granularity but only supports +* IOMMU_INV_GRANU_ADDR. +* The equivalent of that is we set the size to be the +* entire range of 64 bit. User only provides PASID info +* without address info. So we set addr to 0. +*/ +if (inv_info->granularity ==IOMMU_INV_GRANU_PASID ) { + size =64 -VTD_PAGE_SHIFT ; + addr =0 ; + }else if (inv_info->granularity ==IOMMU_INV_GRANU_ADDR ) { + addr = inv_info->addr_info.addr; + } +if (info->ats_enabled)qi_flush_dev_iotlb_pasid (iommu, sid, info->pfsid, pasid, - info->ats_qdep, - inv_info->addr_info.addr, + info->ats_qdep, addr, size);else pr_warn_ratelimited ("Passdown device IOTLB flush w/o ATS!\n" );
Signature · 6 lines
2.17.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Lu Baolu
maintainerPATCH 4/12 iommu/vt-d: Handle non-page aligned address
In reply to Lu BaoluFrom: Liu Yi L <[email protected]>
Address information for device TLB invalidation comes from userspace when device is directly assigned to a guest with vIOMMU support. VT-d requires page aligned address. This patch checks and enforce address to be page aligned, otherwise reserved bits can be set in the invalidation descriptor. Unrecoverable fault will be reported due to non-zero value in the reserved bits.
--- drivers/iommu/intel/dmar.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-)
drivers/iommu/intel/dmar.c +19 -2
@@ -1457,9 +1457,26 @@ void qi_flush_dev_iotlb_pasid(struct intel_iommu *iommu, u16 sid, u16 pfsid,* Max Invs Pending (MIP) is set to 0 for now until we have DIT in * ECAP. */ - desc.qw1 |= addr & ~mask; -if (size_order) +if (addr &GENMASK_ULL (size_order +VTD_PAGE_SHIFT ,0 )) +pr_warn_ratelimited ("Invalidate non-aligned address %llx, order %d\n" , + addr, size_order); + +/* Take page address */ + desc.qw1 =QI_DEV_EIOTLB_ADDR (addr); + +if (size_order) { +/* +* Existing 0s in address below size_order may be the least +* significant bit, we must set them to 1s to avoid having +* smaller size than desired. +*/ + desc.qw1 |=GENMASK_ULL (size_order +VTD_PAGE_SHIFT -1 , +VTD_PAGE_SHIFT ); +/* Clear size_order bit to indicate size */ + desc.qw1 &= ~mask; +/* Set the S bit to indicate flushing more than 1 page */ desc.qw1 |=QI_DEV_EIOTLB_SIZE ; + }qi_submit_sync (iommu, &desc,1 ,0 ); }
Signature · 6 lines
2.17.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Lu Baolu
maintainerPATCH 6/12 iommu/vt-d: Warn on out-of-range invalidation address
In reply to Lu BaoluFrom: Jacob Pan <[email protected]>
For guest requested IOTLB invalidation, address and mask are provided as part of the invalidation data. VT-d HW silently ignores any address bits below the mask. SW shall also allow such case but give warning if address does not align with the mask. This patch relax the fault handling from error to warning and proceed with invalidation request with the given mask.
--- drivers/iommu/intel/iommu.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/iommu/intel/iommu.c +2 -3
@@ -5453,13 +5453,12 @@ intel_iommu_sva_invalidate(struct iommu_domain *domain, struct device *dev,switch (BIT (cache_type)) {case IOMMU_CACHE_INV_TYPE_IOTLB : +/* HW will ignore LSB bits based on address mask */ if (inv_info->granularity ==IOMMU_INV_GRANU_ADDR && size && (inv_info->addr_info.addr & ((BIT (VTD_PAGE_SHIFT + size)) -1 ))) { -pr_err_ratelimited ("Address out of range, 0x%llx, size order %llu\n" , +pr_err_ratelimited ("User address not aligned, 0x%llx, size order %llu\n" , inv_info->addr_info.addr, size); - ret = -ERANGE ; - goto out_unlock; }/*
Signature · 6 lines
2.17.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Lu Baolu
maintainerPATCH 7/12 iommu/vt-d: Disable multiple GPASID-dev bind
In reply to Lu BaoluFrom: Jacob Pan <[email protected]>
For the unlikely use case where multiple aux domains from the same pdev are attached to a single guest and then bound to a single process (thus same PASID) within that guest, we cannot easily support this case by refcounting the number of users. As there is only one SL page table per PASID while we have multiple aux domains thus multiple SL page tables for the same PASID.
Extra unbinding guest PASID can happen due to race between normal and exception cases. Termination of one aux domain may affect others unless we actively track and switch aux domains to ensure the validity of SL page tables and TLB states in the shared PASID entry.
Support for sharing second level PGDs across domains can reduce the complexity but this is not available due to the limitations on VFIO container architecture. We can revisit this decision once sharing PGDs are available.
Overall, the complexity and potential glitch do not warrant this unlikely use case thereby removed by this patch.
--- drivers/iommu/intel/svm.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-)
drivers/iommu/intel/svm.c +9 -13
@@ -277,20 +277,16 @@ int intel_svm_bind_gpasid(struct iommu_domain *domain, struct device *dev, goto out; } +/* +* Do not allow multiple bindings of the same device-PASID since +* there is only one SL page tables per PASID. We may revisit +* once sharing PGD across domains are supported. +*/ for_each_svm_dev (sdev, svm, dev) { -/* -* For devices with aux domains, we should allow -* multiple bind calls with the same PASID and pdev. -*/ -if (iommu_dev_feature_enabled (dev, -IOMMU_DEV_FEAT_AUX )) { - sdev->users++; - }else { -dev_warn_ratelimited (dev, -"Already bound with PASID %u\n" , - svm->pasid); - ret = -EBUSY ; - } +dev_warn_ratelimited (dev, +"Already bound with PASID %u\n" , + svm->pasid); + ret = -EBUSY ; goto out; } }else {
Signature · 6 lines
2.17.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Lu Baolu
maintainerPATCH 8/12 iommu/vt-d: Refactor device_to_iommu() helper
In reply to Lu BaoluIt is refactored in two ways:
- Make it global so that it could be used in other files.
- Make bus/devfn optional so that callers could ignore these two returned values when they only want to get the coresponding iommu pointer.
--- drivers/iommu/intel/iommu.c | 55 +++++++++++-------------------------- drivers/iommu/intel/svm.c | 8 +++--- include/linux/intel-iommu.h | 3 +- 3 files changed, 21 insertions(+), 45 deletions(-)
drivers/iommu/intel/iommu.c +16 -39
@@ -779,16 +779,16 @@ is_downstream_to_pci_bridge(struct device *dev, struct device *bridge)return false; } -static struct intel_iommu *device_to_iommu (struct device *dev,u8 *bus,u8 *devfn) +struct intel_iommu *device_to_iommu (struct device *dev,u8 *bus,u8 *devfn) {struct dmar_drhd_unit *drhd =NULL ; +struct pci_dev *pdev =NULL ;struct intel_iommu *iommu;struct device *tmp; -struct pci_dev *pdev =NULL ;u16 segment =0 ;int i; -if (iommu_dummy (dev)) +if (!dev ||iommu_dummy (dev))return NULL ;if (dev_is_pci (dev)) {
@@ -819,8 +819,10 @@ static struct intel_iommu *device_to_iommu(struct device *dev, u8 *bus, u8 *devfif (pdev && pdev->is_virtfn) goto got_pdev; - *bus = drhd->devices[i].bus; - *devfn = drhd->devices[i].devfn; +if (bus && devfn) { + *bus = drhd->devices[i].bus; + *devfn = drhd->devices[i].devfn; + } goto out; }
@@ -830,8 +832,10 @@ static struct intel_iommu *device_to_iommu(struct device *dev, u8 *bus, u8 *devfif (pdev && drhd->include_all) { got_pdev: - *bus = pdev->bus->number; - *devfn = pdev->devfn; +if (bus && devfn) { + *bus = pdev->bus->number; + *devfn = pdev->devfn; + } goto out; } }
@@ -5152,11 +5156,10 @@ static int aux_domain_add_dev(struct dmar_domain *domain, struct device *dev) {int ret; -u8 bus, devfn;unsigned long flags;struct intel_iommu *iommu; - iommu =device_to_iommu (dev, &bus, &devfn); + iommu =device_to_iommu (dev,NULL ,NULL );if (!iommu)return -ENODEV ;
@@ -5242,9 +5245,8 @@ static int prepare_domain_attach_device(struct iommu_domain *domain,struct dmar_domain *dmar_domain =to_dmar_domain (domain);struct intel_iommu *iommu;int addr_width; -u8 bus, devfn; - iommu =device_to_iommu (dev, &bus, &devfn); + iommu =device_to_iommu (dev,NULL ,NULL );if (!iommu)return -ENODEV ;
@@ -5674,9 +5676,8 @@ static bool intel_iommu_capable(enum iommu_cap cap)static struct iommu_device *intel_iommu_probe_device (struct device *dev) {struct intel_iommu *iommu; -u8 bus, devfn; - iommu =device_to_iommu (dev, &bus, &devfn); + iommu =device_to_iommu (dev,NULL ,NULL );if (!iommu)return ERR_PTR (-ENODEV );
@@ -5689,9 +5690,8 @@ static struct iommu_device *intel_iommu_probe_device(struct device *dev)static void intel_iommu_release_device (struct device *dev) {struct intel_iommu *iommu; -u8 bus, devfn; - iommu =device_to_iommu (dev, &bus, &devfn); + iommu =device_to_iommu (dev,NULL ,NULL );if (!iommu)return ;
@@ -5841,37 +5841,14 @@ static struct iommu_group *intel_iommu_device_group(struct device *dev)return generic_device_group (dev); } -#ifdef CONFIG_INTEL_IOMMU_SVM -struct intel_iommu *intel_svm_device_to_iommu (struct device *dev) -{ -struct intel_iommu *iommu; -u8 bus, devfn; - -if (iommu_dummy (dev)) { -dev_warn (dev, -"No IOMMU translation for device; cannot enable SVM\n" ); -return NULL ; - } - - iommu =device_to_iommu (dev, &bus, &devfn); -if ((!iommu)) { -dev_err (dev,"No IOMMU for device; cannot enable SVM\n" ); -return NULL ; - } - -return iommu; -} -#endif /* CONFIG_INTEL_IOMMU_SVM */ -static int intel_iommu_enable_auxd (struct device *dev) {struct device_domain_info *info;struct intel_iommu *iommu;unsigned long flags; -u8 bus, devfn;int ret; - iommu =device_to_iommu (dev, &bus, &devfn); + iommu =device_to_iommu (dev,NULL ,NULL );if (!iommu || dmar_disabled)return -EINVAL ;
drivers/iommu/intel/svm.c +4 -4
@@ -231,7 +231,7 @@ static LIST_HEAD(global_svm_list);int intel_svm_bind_gpasid (struct iommu_domain *domain,struct device *dev,struct iommu_gpasid_bind_data *data) { -struct intel_iommu *iommu =intel_svm_device_to_iommu (dev); +struct intel_iommu *iommu =device_to_iommu (dev,NULL ,NULL );struct dmar_domain *dmar_domain;struct intel_svm_dev *sdev;struct intel_svm *svm;
@@ -369,7 +369,7 @@ int intel_svm_bind_gpasid(struct iommu_domain *domain, struct device *dev,int intel_svm_unbind_gpasid (struct device *dev,int pasid) { -struct intel_iommu *iommu =intel_svm_device_to_iommu (dev); +struct intel_iommu *iommu =device_to_iommu (dev,NULL ,NULL );struct intel_svm_dev *sdev;struct intel_svm *svm;int ret = -EINVAL ;
@@ -426,7 +426,7 @@ static int intel_svm_bind_mm(struct device *dev, int flags, struct svm_dev_ops *ops, struct mm_struct *mm, struct intel_svm_dev **sd) { - struct intel_iommu *iommu = intel_svm_device_to_iommu(dev); + struct intel_iommu *iommu = device_to_iommu(dev, NULL, NULL);struct device_domain_info *info;struct intel_svm_dev *sdev;struct intel_svm *svm =NULL ;
@@ -604,7 +604,7 @@ static int intel_svm_unbind_mm(struct device *dev, int pasid)struct intel_svm *svm;int ret = -EINVAL ; - iommu =intel_svm_device_to_iommu (dev); + iommu =device_to_iommu (dev,NULL ,NULL );if (!iommu) goto out;
include/linux/intel-iommu.h +1 -2
@@ -729,6 +729,7 @@ void iommu_flush_write_buffer(struct intel_iommu *iommu);int intel_iommu_enable_pasid (struct intel_iommu *iommu,struct device *dev);struct dmar_domain *find_domain (struct device *dev);struct device_domain_info *get_domain_info (struct device *dev); +struct intel_iommu *device_to_iommu (struct device *dev,u8 *bus,u8 *devfn);#ifdef CONFIG_INTEL_IOMMU_SVM extern void intel_svm_check (struct intel_iommu *iommu);
@@ -767,8 +768,6 @@ struct intel_svm {struct list_head devs; struct list_head list; }; - -extern struct intel_iommu *intel_svm_device_to_iommu (struct device *dev);#else static inline void intel_svm_check (struct intel_iommu *iommu) {}#endif
Signature · 6 lines
2.17.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Lu Baolu
maintainerPATCH 9/12 iommu/vt-d: Add a helper to get svm and sdev for pasid
In reply to Lu BaoluThere are several places in the code that need to get the pointers of svm and sdev according to a pasid and device. Add a helper to achieve this for code consolidation and readability.
--- drivers/iommu/intel/svm.c | 115 +++++++++++++++++++++----------------- 1 file changed, 65 insertions(+), 50 deletions(-)
drivers/iommu/intel/svm.c +65 -50
@@ -228,13 +228,57 @@ static LIST_HEAD(global_svm_list); list_for_each_entry((sdev), &(svm)->devs, list) \if ((d) != (sdev)->dev) {}else +static int pasid_to_svm_sdev(struct device *dev, unsigned int pasid, +struct intel_svm **rsvm, +struct intel_svm_dev **rsdev) +{ +struct intel_svm_dev *d, *sdev =NULL ; +struct intel_svm *svm; + +/* The caller should hold the pasid_mutex lock */ +if (WARN_ON (!mutex_is_locked (&pasid_mutex))) +return -EINVAL ; + +if (pasid ==INVALID_IOASID || pasid >=PASID_MAX ) +return -EINVAL ; + + svm =ioasid_find (NULL , pasid,NULL ); +if (IS_ERR (svm)) +return PTR_ERR (svm); + +if (!svm) + goto out; + +/* +* If we found svm for the PASID, there must be at least one device +* bond. +*/ +if (WARN_ON (list_empty (&svm->devs))) +return -EINVAL ; + +rcu_read_lock (); +list_for_each_entry_rcu (d, &svm->devs, list) { +if (d->dev == dev) { + sdev = d; +break ; + } + } +rcu_read_unlock (); + +out: + *rsvm = svm; + *rsdev = sdev; + +return 0 ; +} +int intel_svm_bind_gpasid (struct iommu_domain *domain,struct device *dev,struct iommu_gpasid_bind_data *data) {struct intel_iommu *iommu =device_to_iommu (dev,NULL ,NULL ); +struct intel_svm_dev *sdev =NULL ;struct dmar_domain *dmar_domain; -struct intel_svm_dev *sdev; -struct intel_svm *svm; +struct intel_svm *svm =NULL ;int ret =0 ;if (WARN_ON (!iommu) || !data)
@@ -261,35 +305,23 @@ 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 (NULL , data->hpasid,NULL ); -if (IS_ERR (svm)) { - ret =PTR_ERR (svm); + ret =pasid_to_svm_sdev (dev, data->hpasid, &svm, &sdev); +if (ret) goto out; - } - -if (svm) { -/* -* If we found svm for the PASID, there must be at -* least one device bond, otherwise svm should be freed. -*/ -if (WARN_ON (list_empty (&svm->devs))) { - ret = -EINVAL ; - goto out; - } +if (sdev) {/* * Do not allow multiple bindings of the same device-PASID since * there is only one SL page tables per PASID. We may revisit * once sharing PGD across domains are supported. */ -for_each_svm_dev (sdev, svm, dev) { -dev_warn_ratelimited (dev, -"Already bound with PASID %u\n" , - svm->pasid); - ret = -EBUSY ; - goto out; - } - }else { +dev_warn_ratelimited (dev,"Already bound with PASID %u\n" , + svm->pasid); + ret = -EBUSY ; + goto out; + } + +if (!svm) {/* We come here when PASID has never been bond to a device. */ svm =kzalloc (sizeof (*svm),GFP_KERNEL );if (!svm) {
@@ -372,25 +404,17 @@ int intel_svm_unbind_gpasid(struct device *dev, int pasid)struct intel_iommu *iommu =device_to_iommu (dev,NULL ,NULL );struct intel_svm_dev *sdev;struct intel_svm *svm; -int ret = -EINVAL ; +int ret;if (WARN_ON (!iommu))return -EINVAL ;mutex_lock (&pasid_mutex); - svm =ioasid_find (NULL , pasid,NULL ); -if (!svm) { - ret = -EINVAL ; - goto out; - } - -if (IS_ERR (svm)) { - ret =PTR_ERR (svm); + ret =pasid_to_svm_sdev (dev, pasid, &svm, &sdev); +if (ret) goto out; - } -for_each_svm_dev (sdev, svm, dev) { - ret =0 ; +if (sdev) {if (iommu_dev_feature_enabled (dev,IOMMU_DEV_FEAT_AUX )) sdev->users--;if (!sdev->users) {
@@ -414,7 +438,6 @@ int intel_svm_unbind_gpasid(struct device *dev, int pasid)kfree (svm); } } -break ; } out:mutex_unlock (&pasid_mutex);
@@ -592,7 +615,7 @@ intel_svm_bind_mm(struct device *dev, int flags, struct svm_dev_ops *ops,if (sd) *sd = sdev; ret =0 ; - out: +out:return ret; }
@@ -608,17 +631,11 @@ static int intel_svm_unbind_mm(struct device *dev, int pasid)if (!iommu) goto out; - svm =ioasid_find (NULL , pasid,NULL ); -if (!svm) - goto out; - -if (IS_ERR (svm)) { - ret =PTR_ERR (svm); + ret =pasid_to_svm_sdev (dev, pasid, &svm, &sdev); +if (ret) goto out; - } -for_each_svm_dev (sdev, svm, dev) { - ret =0 ; +if (sdev) { sdev->users--;if (!sdev->users) {list_del_rcu (&sdev->list);
@@ -647,10 +664,8 @@ static int intel_svm_unbind_mm(struct device *dev, int pasid)kfree (svm); } } -break ; } - out: - +out:return ret; }
Signature · 6 lines
2.17.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Lu Baolu
maintainerPATCH 10/12 iommu/vt-d: Report page request faults for guest SVA
In reply to Lu BaoluA pasid might be bound to a page table from a VM guest via the iommu ops.sva_bind_gpasid. In this case, when a DMA page fault is detected on the physical IOMMU, we need to inject the page fault request into the guest. After the guest completes handling the page fault, a page response need to be sent back via the iommu ops.page_response().
This adds support to report a page request fault. Any external module which is interested in handling this fault should regiester a notifier with iommu_register_device_fault_handler().
--- drivers/iommu/intel/svm.c | 103 +++++++++++++++++++++++++++++++------- 1 file changed, 85 insertions(+), 18 deletions(-)
drivers/iommu/intel/svm.c +85 -18
@@ -811,8 +811,63 @@ static void intel_svm_drain_prq(struct device *dev, int pasid) } } +static int prq_to_iommu_prot (struct page_req_dsc *req) +{ +int prot =0 ; + +if (req->rd_req) + prot |=IOMMU_FAULT_PERM_READ ; +if (req->wr_req) + prot |=IOMMU_FAULT_PERM_WRITE ; +if (req->exe_req) + prot |=IOMMU_FAULT_PERM_EXEC ; +if (req->pm_req) + prot |=IOMMU_FAULT_PERM_PRIV ; + +return prot; +} + +static int +intel_svm_prq_report (struct device *dev,struct page_req_dsc *desc) +{ +struct iommu_fault_event event; + +if (!dev || !dev_is_pci (dev)) +return -ENODEV ; + +/* Fill in event data for device specific processing */ +memset (&event,0 ,sizeof (struct iommu_fault_event )); + event.fault.type =IOMMU_FAULT_PAGE_REQ ; + event.fault.prm.addr = desc->addr; + event.fault.prm.pasid = desc->pasid; + event.fault.prm.grpid = desc->prg_index; + event.fault.prm.perm =prq_to_iommu_prot (desc); + +if (desc->lpig) + event.fault.prm.flags |=IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE ; +if (desc->pasid_present) { + event.fault.prm.flags |=IOMMU_FAULT_PAGE_REQUEST_PASID_VALID ; + event.fault.prm.flags |=IOMMU_FAULT_PAGE_RESPONSE_NEEDS_PASID ; + } +if (desc->priv_data_present) { +/* +* Set last page in group bit if private data is present, +* page response is required as it does for LPIG. +* iommu_report_device_fault() doesn't understand this vendor +* specific requirement thus we set last_page as a workaround. +*/ + event.fault.prm.flags |=IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE ; + event.fault.prm.flags |=IOMMU_FAULT_PAGE_REQUEST_PRIV_DATA ; +memcpy (event.fault.prm.private_data, desc->priv_data, +sizeof (desc->priv_data)); + } + +return iommu_report_device_fault (dev, &event); +} +static irqreturn_t prq_event_thread (int irq,void *d) { +struct intel_svm_dev *sdev =NULL ;struct intel_iommu *iommu = d;struct intel_svm *svm =NULL ;int head, tail, handled =0 ;
@@ -824,7 +879,6 @@ static irqreturn_t prq_event_thread(int irq, void *d) tail =dmar_readq (iommu->reg +DMAR_PQT_REG ) &PRQ_RING_MASK ; head =dmar_readq (iommu->reg +DMAR_PQH_REG ) &PRQ_RING_MASK ;while (head != tail) { -struct intel_svm_dev *sdev;struct vm_area_struct *vma;struct page_req_dsc *req;struct qi_desc resp;
@@ -860,6 +914,20 @@ static irqreturn_t prq_event_thread(int irq, void *d) } } +if (!sdev || sdev->sid != req->rid) { +struct intel_svm_dev *t; + + sdev =NULL ; +rcu_read_lock (); +list_for_each_entry_rcu (t, &svm->devs, list) { +if (t->sid == req->rid) { + sdev = t; +break ; + } + } +rcu_read_unlock (); + } + result =QI_RESP_INVALID ;/* Since we're using init_mm.pgd directly, we should never take * any faults on kernel addresses. */
@@ -870,6 +938,17 @@ static irqreturn_t prq_event_thread(int irq, void *d)if (!is_canonical_address (address)) goto bad_req; +/* +* If prq is to be handled outside iommu driver via receiver of +* the fault notifiers, we skip the page response here. +*/ +if (svm->flags &SVM_FLAG_GUEST_MODE ) { +if (sdev && !intel_svm_prq_report (sdev->dev, req)) + goto prq_advance; +else + goto bad_req; + } +/* If the mm is already defunct, don't handle faults. */ if (!mmget_not_zero (svm->mm)) goto bad_req;
@@ -888,24 +967,11 @@ static irqreturn_t prq_event_thread(int irq, void *d) goto invalid; result =QI_RESP_SUCCESS ; - invalid: +invalid:mmap_read_unlock (svm->mm);mmput (svm->mm); - bad_req: -/* Accounting for major/minor faults? */ -rcu_read_lock (); -list_for_each_entry_rcu (sdev, &svm->devs, list) { -if (sdev->sid == req->rid) -break ; - } -/* Other devices can go away, but the drivers are not permitted -* to unbind while any page faults might be in flight. So it's -* OK to drop the 'lock' here now we have it. */ -rcu_read_unlock (); - -if (WARN_ON (&sdev->list == &svm->devs)) - sdev =NULL ; - +bad_req: +WARN_ON (!sdev);if (sdev && sdev->ops && sdev->ops->fault_cb) {int rwxp = (req->rd_req <<3 ) | (req->wr_req <<2 ) | (req->exe_req <<1 ) | (req->pm_req);
@@ -916,7 +982,7 @@ static irqreturn_t prq_event_thread(int irq, void *d)and these can be NULL. Do not use them below this point! */ sdev =NULL ; svm =NULL ; - no_pasid: +no_pasid:if (req->lpig || req->priv_data_present) {/* * Per VT-d spec. v3.0 ch7.7, system software must
@@ -941,6 +1007,7 @@ static irqreturn_t prq_event_thread(int irq, void *d) resp.qw3 =0 ;qi_submit_sync (iommu, &resp,1 ,0 ); } +prq_advance: head = (head +sizeof (*req)) &PRQ_RING_MASK ; }
Signature · 6 lines
2.17.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Lu Baolu
maintainerPATCH 12/12 iommu/vt-d: Rename intel-pasid.h to pasid.h
In reply to Lu BaoluAs Intel VT-d files have been moved to its own subdirectory, the prefix makes no sense. No functional changes.
---
drivers/iommu/intel/debugfs.c | 2 +-
drivers/iommu/intel/iommu.c | 2 +-
drivers/iommu/intel/pasid.c | 2 +-
drivers/iommu/intel/{intel-pasid.h => pasid.h} | 2 +-
drivers/iommu/intel/svm.c | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
rename drivers/iommu/intel/{intel-pasid.h => pasid.h} (98%)drivers/iommu/intel/debugfs.c +1 -1
@@ -15,7 +15,7 @@#include <asm/irq_remapping.h> -#include "intel-pasid.h" +#include "pasid.h" struct tbl_walk {u16 bus;
drivers/iommu/intel/iommu.c +1 -1
@@ -48,7 +48,7 @@#include <trace/events/intel_iommu.h> #include "../irq_remapping.h" -#include "intel-pasid.h" +#include "pasid.h" #define ROOT_SIZE VTD_PAGE_SIZE#define CONTEXT_SIZE VTD_PAGE_SIZE
drivers/iommu/intel/pasid.c +1 -1
@@ -19,7 +19,7 @@#include <linux/pci-ats.h> #include <linux/spinlock.h> -#include "intel-pasid.h" +#include "pasid.h" /* * Intel IOMMU system wide PASID name space:
drivers/iommu/intel/pasid.h renamed from drivers/iommu/intel/intel-pasid.h +1 -1
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0 */ /* -* intel-pasid.h - PASID idr, table and entry header +* pasid.h - PASID idr, table and entry header * * Copyright (C) 2018 Intel Corporation *
drivers/iommu/intel/svm.c +1 -1
@@ -20,7 +20,7 @@#include <linux/ioasid.h> #include <asm/page.h> -#include "intel-pasid.h" +#include "pasid.h" static irqreturn_t prq_event_thread (int irq,void *d);static void intel_svm_drain_prq (struct device *dev,int pasid);
Signature · 6 lines
2.17.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Lu Baolu
maintainerPATCH 11/12 iommu/vt-d: Add page response ops support
In reply to Lu BaoluAfter page requests are handled, software must respond to the device which raised the page request with the result. This is done through the iommu ops.page_response if the request was reported to outside of vendor iommu driver through iommu_report_device_fault(). This adds the VT-d implementation of page_response ops.
--- drivers/iommu/intel/iommu.c | 1 + drivers/iommu/intel/svm.c | 99 +++++++++++++++++++++++++++++++++++++ include/linux/intel-iommu.h | 3 ++ 3 files changed, 103 insertions(+)
drivers/iommu/intel/iommu.c +1 -0
@@ -6073,6 +6073,7 @@ const struct iommu_ops intel_iommu_ops = { .sva_bind = intel_svm_bind, .sva_unbind = intel_svm_unbind, .sva_get_pasid = intel_svm_get_pasid, + .page_response = intel_svm_page_response,#endif };
drivers/iommu/intel/svm.c +99 -0
102 lines not on this page · raw message
include/linux/intel-iommu.h +3 -0
@@ -742,6 +742,9 @@ struct iommu_sva *intel_svm_bind(struct device *dev, struct mm_struct *mm, void *drvdata);void intel_svm_unbind (struct iommu_sva *handle);int intel_svm_get_pasid (struct iommu_sva *handle); +int intel_svm_page_response (struct device *dev,struct iommu_fault_event *evt, +struct iommu_page_response *msg); +struct svm_dev_ops ;struct intel_svm_dev {
Signature · 6 lines
2.17.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Quoted 7 lines · Lu Baolu
Below patches have been piled up for v5.9. It includes:
- Misc tweaks and fixes for vSVA
- Report/response page request events
- CleanupsCan you please consider them for iommu/next?
Applied, thanks Baolu.
For the next round, would you consider using the b4[1] tool to queue your patches? This way you can easily add a Link: tag to the commits, pointing to the original upstream discussion.
I also use b4 and the link it adds to the commits is from your patch-posting, but that does not include the original posting or discussion around a patch.
Thanks,
Joerg
[1] https://people.kernel.org/monsieuricon/introducing-b4-and-patch-attestation
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Lu Baolu
maintainerHi Joerg,
Quoted 19 lines · Joerg Roedel
Quoted 7 lines · Lu Baolu
Below patches have been piled up for v5.9. It includes:
- Misc tweaks and fixes for vSVA
- Report/response page request events
- CleanupsCan you please consider them for iommu/next?
Applied, thanks Baolu.
For the next round, would you consider using the b4[1] tool to queue your patches? This way you can easily add a Link: tag to the commits, pointing to the original upstream discussion.
I also use b4 and the link it adds to the commits is from your patch-posting, but that does not include the original posting or discussion around a patch.
Quoted 6 lines
Thanks,
Joerg
[1] https://people.kernel.org/monsieuricon/introducing-b4-and-patch-attestation
Sure. It's a cool tool! Thanks a lot.
Best regards,
baolu
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu