iommu: SVA and IOPF refactoring
Subsystems (8)
Lu Baolu
maintainerv9 cover iommu: SVA and IOPF refactoring
Hi folks,
The former part of this series refactors the IOMMU SVA code by assigning an SVA type of iommu_domain to a shared virtual address and replacing sva_bind/unbind iommu ops with set/block_dev_pasid domain ops.
The latter part changes the existing I/O page fault handling framework from only serving SVA to a generic one. Any driver or component could handle the I/O page faults for its domain in its own way by installing an I/O page fault handler.
This series has been functionally tested on an x86 machine and compile tested for all architectures.
This series is also available on github:
[2] https://github.com/LuBaolu/intel-iommu/commits/iommu-sva-refactoring-v9
Please review and suggest.
Best regards,
baolu
Change log:
v9:
- Some minor changes on comments and function names.
- Simplify dev_iommu_get_max_pasids().
v8:
- https://lore.kernel.org/linux-iommu/[email protected]/
- Add support for calculating the max pasids that a device could
consume.
- Replace container_of_safe() with container_of.
- Remove iommu_ops->sva_domain_ops and make sva support through the generic domain_alloc/free() interfaces.
- [Robin] It would be logical to pass IOMMU_DOMAIN_SVA to the normal domain_alloc call, so that driver-internal stuff like context descriptors can be still be hung off the domain as usual (rather than all drivers having to implement some extra internal lookup mechanism
to handle all the SVA domain ops).
- [Robin] I'd just stick the mm pointer in struct iommu_domain, in a
union with the fault handler stuff those are mutually exclusive with SVA.
- https://lore.kernel.org/linux-iommu/[email protected]/
v7:
- https://lore.kernel.org/linux-iommu/[email protected]/
- Remove duplicate array for sva domain.
- Rename detach_dev_pasid to block_dev_pasid.
- Add raw device driver interfaces for iommufd.
- Other misc refinements and patch reorganization.
- Drop "dmaengine: idxd: Separate user and kernel pasid enabling" which has been picked for dmaengine tree.
v6:
- https://lore.kernel.org/linux-iommu/[email protected]/
- Refine the SVA basic data structures.
- Refine arm smmuv3 sva domain allocation.
- Fix a possible lock issue.
v5:
- https://lore.kernel.org/linux-iommu/[email protected]/
- Address review comments from Jean-Philippe Brucker. Very appreciated!
- Remove redundant pci aliases check in device_group_immutable_singleton().
- Treat all buses except PCI as static in immutable singleton check.
- As the sva_bind/unbind() have already guaranteed sva domain free only after iopf_queue_flush_dev(), remove the unnecessary domain refcount.
- Move domain get() out of the list iteration in iopf_handle_group().
v4:
- https://lore.kernel.org/linux-iommu/[email protected]/
- Solve the overlap with another series and make this series self-contained.
- No objection to the abstraction of data structure during v3 review. Hence remove the RFC subject prefix.
- Refine the immutable singleton group code according to Kevin's
comments.
v3:
- https://lore.kernel.org/linux-iommu/[email protected]/
- Rework iommu_group_singleton_lockdown() by adding a flag to the group that positively indicates the group can never have more than one member, even after hot plug.
- Abstract the data structs used for iommu sva in a separated patches to make it easier for review.
- I still keep the RFC prefix in this series as above two significant changes need at least another round review to be finalized.
- Several misc refinements.
v2:
- https://lore.kernel.org/linux-iommu/[email protected]/
- Add sva domain life cycle management to avoid race between unbind and page fault handling.
- Use a single domain for each mm.
- Return a single sva handler for the same binding.
- Add a new helper to meet singleton group requirement.
- Rework the SVA domain allocation for arm smmu v3 driver and move the pasid_bit initialization to device probe.
- Drop the patch "iommu: Handle IO page faults directly".
- Add mmget_not_zero(mm) in SVA page fault handler.
v1:
- https://lore.kernel.org/linux-iommu/[email protected]/
- Initial post.
*** BLURB HERE ***
Lu Baolu (11):
iommu: Add max_pasids field in struct iommu_device
iommu: Add max_pasids field in struct dev_iommu
iommu: Remove SVM_FLAG_SUPERVISOR_MODE support
iommu: Add sva iommu_domain support iommu/vt-d: Add SVA domain support arm-smmu-v3/sva: Add SVA domain support iommu/sva: Refactoring iommu_sva_bind/unbind_device()
iommu: Remove SVA related callbacks from iommu ops
iommu: Prepare IOMMU domain for IOPF
iommu: Per-domain I/O page fault handling
iommu: Rename iommu-sva-lib.{c,h}
include/linux/intel-iommu.h | 12 +-
include/linux/intel-svm.h | 13 -
include/linux/iommu.h | 128 +++++++---
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 19 +-
.../iommu/{iommu-sva-lib.h => iommu-sva.h} | 14 +-
drivers/dma/idxd/cdev.c | 3 +-
drivers/dma/idxd/init.c | 25 +-
.../iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 112 +++++----
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 9 +-
drivers/iommu/intel/dmar.c | 7 +
drivers/iommu/intel/iommu.c | 7 +-
drivers/iommu/intel/svm.c | 149 +++++------
drivers/iommu/io-pgfault.c | 73 ++----
drivers/iommu/iommu-sva-lib.c | 71 ------
drivers/iommu/iommu-sva.c | 229 +++++++++++++++++
drivers/iommu/iommu.c | 237 +++++++++++-------
drivers/misc/uacce/uacce.c | 2 +-
drivers/iommu/Makefile | 2 +-
18 files changed, 649 insertions(+), 463 deletions(-)
rename drivers/iommu/{iommu-sva-lib.h => iommu-sva.h} (83%)
delete mode 100644 drivers/iommu/iommu-sva-lib.c
create mode 100644 drivers/iommu/iommu-sva.cSignature · 1 line
2.25.1
Lu Baolu
maintainerPATCH v9 1/11 iommu: Add max_pasids field in struct iommu_device
Use this field to keep the number of supported PASIDs that an IOMMU hardware is able to support. This is a generic attribute of an IOMMU and lifting it into the per-IOMMU device structure makes it possible to allocate a PASID for device without calls into the IOMMU drivers. Any iommu driver that supports PASID related features should set this field before enabling them on the devices.
In the Intel IOMMU driver, intel_iommu_sm is moved to CONFIG_INTEL_IOMMU enclave so that the pasid_supported() helper could be used in dmar.c without compilation errors.
--- include/linux/intel-iommu.h | 3 ++- include/linux/iommu.h | 2 ++ drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 1 + drivers/iommu/intel/dmar.c | 7 +++++++ 4 files changed, 12 insertions(+), 1 deletion(-)
include/linux/intel-iommu.h +2 -1
@@ -479,7 +479,6 @@ enum {#define VTD_FLAG_IRQ_REMAP_PRE_ENABLED (1 << 1)#define VTD_FLAG_SVM_CAPABLE (1 << 2) -extern int intel_iommu_sm;extern spinlock_t device_domain_lock;#define sm_supported (iommu) (intel_iommu_sm && ecap_smts((iommu)->ecap))
@@ -786,6 +785,7 @@ struct context_entry *iommu_context_addr(struct intel_iommu *iommu, u8 bus,extern const struct iommu_ops intel_iommu_ops;#ifdef CONFIG_INTEL_IOMMU +extern int intel_iommu_sm;extern int iommu_calculate_agaw (struct intel_iommu *iommu);extern int iommu_calculate_max_sagaw (struct intel_iommu *iommu);extern int dmar_disabled;
@@ -802,6 +802,7 @@ static inline int iommu_calculate_max_sagaw(struct intel_iommu *iommu) }#define dmar_disabled (1)#define intel_iommu_enabled (0) +#define intel_iommu_sm (0)#endif static inline const char *decode_prq_descriptor(char *str, size_t size,
include/linux/iommu.h +2 -0
@@ -318,12 +318,14 @@ struct iommu_domain_ops {* @list: Used by the iommu-core to keep a list of registered iommus * @ops: iommu-ops for talking to this iommu * @dev: struct device for sysfs handling +* @max_pasids: number of supported PASIDs */ struct iommu_device {struct list_head list;const struct iommu_ops *ops;struct fwnode_handle *fwnode;struct device *dev; +u32 max_pasids; };/**
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +1 -0
@@ -3546,6 +3546,7 @@ static int arm_smmu_device_hw_probe(struct arm_smmu_device *smmu)/* SID/SSID sizes */ smmu->ssid_bits =FIELD_GET (IDR1_SSIDSIZE , reg); smmu->sid_bits =FIELD_GET (IDR1_SIDSIZE , reg); + smmu->iommu.max_pasids =1UL << smmu->ssid_bits;/* * If the SMMU supports fewer bits than would fill a single L2 stream
drivers/iommu/intel/dmar.c +7 -0
@@ -1123,6 +1123,13 @@ static int alloc_iommu(struct dmar_drhd_unit *drhd)raw_spin_lock_init (&iommu->register_lock); +/* +* A value of N in PSS field of eCap register indicates hardware +* supports PASID field of N+1 bits. +*/ +if (pasid_supported (iommu)) + iommu->iommu.max_pasids =2UL <<ecap_pss (iommu->ecap); +/* * This is only for hotplug; at boot time intel_iommu_enabled won't * be set yet. When intel_iommu_init() runs, it registers the units
Signature · 1 line
2.25.1
RE: [PATCH v9 01/11] iommu: Add max_pasids field in struct iommu_device
Quoted 10 lines
From: Lu Baolu <[email protected]>
Sent: Tuesday, June 21, 2022 10:44 PMUse this field to keep the number of supported PASIDs that an IOMMU hardware is able to support. This is a generic attribute of an IOMMU and lifting it into the per-IOMMU device structure makes it possible to allocate a PASID for device without calls into the IOMMU drivers. Any iommu driver that supports PASID related features should set this field before enabling them on the devices.
Quoted 7 lines
In the Intel IOMMU driver,
intel_iommu_smis moved toCONFIG_INTEL_IOMMU
enclave so that thepasid_supported()helper could be used indmar.cwithout compilation errors.Signed-off-by Lu Baolu <[email protected]>Reviewed-by Jean-Philippe Brucker <[email protected]>
Lu Baolu
maintainerPATCH v9 2/11 iommu: Add max_pasids field in struct dev_iommu
In reply to Lu BaoluUse this field to save the number of PASIDs that a device is able to consume. It is a generic attribute of a device and lifting it into the per-device dev_iommu struct could help to avoid the boilerplate code in various IOMMU drivers.
--- include/linux/iommu.h | 2 ++ drivers/iommu/iommu.c | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+)
include/linux/iommu.h +2 -0
@@ -364,6 +364,7 @@ struct iommu_fault_param {* @fwspec: IOMMU fwspec data * @iommu_dev: IOMMU device this device is linked to * @priv: IOMMU Driver private data +* @max_pasids: number of PASIDs device can consume * * TODO: migrate other per device data pointers under iommu_dev_data, e.g. * struct iommu_group *iommu_group;
@@ -375,6 +376,7 @@ struct dev_iommu {struct iommu_fwspec *fwspec;struct iommu_device *iommu_dev;void *priv; +u32 max_pasids; }; int iommu_device_register(struct iommu_device *iommu,
drivers/iommu/iommu.c +20 -0
@@ -20,6 +20,7 @@#include <linux/idr.h> #include <linux/err.h> #include <linux/pci.h> +#include <linux/pci-ats.h> #include <linux/bitops.h> #include <linux/property.h> #include <linux/fsl/mc.h>
@@ -218,6 +219,24 @@ static void dev_iommu_free(struct device *dev)kfree (param); } +static u32 dev_iommu_get_max_pasids (struct device *dev) +{ +u32 max_pasids =0 , bits =0 ; +int ret; + +if (dev_is_pci (dev)) { + ret =pci_max_pasids (to_pci_dev (dev)); +if (ret >0 ) + max_pasids = ret; + }else { + ret =device_property_read_u32 (dev,"pasid-num-bits" , &bits); +if (!ret) + max_pasids =1UL << bits; + } + +return min_t (u32, max_pasids, dev->iommu->iommu_dev->max_pasids); +} +static int __iommu_probe_device (struct device *dev,struct list_head *group_list) {const struct iommu_ops *ops = dev->bus->iommu_ops;
@@ -243,6 +262,7 @@ static int __iommu_probe_device(struct device *dev, struct list_head *group_list } dev->iommu->iommu_dev = iommu_dev; + dev->iommu->max_pasids =dev_iommu_get_max_pasids (dev); group =iommu_group_get_for_dev (dev);if (IS_ERR (group)) {
Signature · 1 line
2.25.1
RE: [PATCH v9 02/11] iommu: Add max_pasids field in struct dev_iommu
Quoted 19 lines
From: Lu Baolu <[email protected]>
Sent: Tuesday, June 21, 2022 10:44 PMUse this field to save the number of PASIDs that a device is able to consume. It is a generic attribute of a device and lifting it into the per-device
dev_iommustruct could help to avoid the boilerplate code in various IOMMU drivers.Signed-off-by Lu Baolu <[email protected]>--- include/linux/iommu.h | 2 ++ drivers/iommu/iommu.c | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+)include/linux/iommu.h +0
-0
include/linux/iommu.h struct iommu_fault_param { · line 367
Quoted 4 lines
include/linux/iommu.h +1
-0@@ -364,6 +364,7 @@ struct iommu_fault_param {* @fwspec: IOMMU fwspec data * @iommu_dev: IOMMU device this device is linked to * @priv: IOMMU Driver private data +* @max_pasids: number of PASIDs device can consume
... PASIDs *this* device can consume
Lu Baolu
maintainerPATCH v9 3/11 iommu: Remove SVM_FLAG_SUPERVISOR_MODE support
In reply to Lu BaoluThe current kernel DMA with PASID support is based on the SVA with a flag SVM_FLAG_SUPERVISOR_MODE. The IOMMU driver binds the kernel memory address space to a PASID of the device. The device driver programs the device with kernel virtual address (KVA) for DMA access. There have been security and functional issues with this approach:
- The lack of IOTLB synchronization upon kernel page table updates. (vmalloc, module/BPF loading, CONFIG_DEBUG_PAGEALLOC etc.)
- Other than slight more protection, using kernel virtual address (KVA) has little advantage over physical address. There are also no use cases yet where DMA engines need kernel virtual addresses for in-kernel DMA.
This removes SVM_FLAG_SUPERVISOR_MODE support from the IOMMU interface. The device drivers are suggested to handle kernel DMA with PASID through the kernel DMA APIs.
The drvdata parameter in iommu_sva_bind_device() and all callbacks is not needed anymore. Cleanup them as well.
--- include/linux/intel-iommu.h | 3 +- include/linux/intel-svm.h | 13 ----- include/linux/iommu.h | 8 +-- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 5 +- drivers/dma/idxd/cdev.c | 3 +- drivers/dma/idxd/init.c | 25 +------- .../iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 3 +- drivers/iommu/intel/svm.c | 57 +++++-------------- drivers/iommu/iommu.c | 5 +- drivers/misc/uacce/uacce.c | 2 +- 10 files changed, 26 insertions(+), 98 deletions(-)
include/linux/intel-iommu.h +1 -2
@@ -738,8 +738,7 @@ struct intel_iommu *device_to_iommu(struct device *dev, u8 *bus, u8 *devfn);extern void intel_svm_check (struct intel_iommu *iommu);extern int intel_svm_enable_prq (struct intel_iommu *iommu);extern int intel_svm_finish_prq (struct intel_iommu *iommu); -struct iommu_sva *intel_svm_bind (struct device *dev,struct mm_struct *mm, -void *drvdata); +struct iommu_sva *intel_svm_bind (struct device *dev,struct mm_struct *mm);void intel_svm_unbind (struct iommu_sva *handle);u32 intel_svm_get_pasid (struct iommu_sva *handle); int intel_svm_page_response(struct device *dev, struct iommu_fault_event *evt,
include/linux/intel-svm.h +0 -13
@@ -13,17 +13,4 @@#define PRQ_RING_MASK ((0x1000 << PRQ_ORDER) - 0x20)#define PRQ_DEPTH ((0x1000 << PRQ_ORDER) >> 5) -/* -* The SVM_FLAG_SUPERVISOR_MODE flag requests a PASID which can be used only -* for access to kernel addresses. No IOTLB flushes are automatically done -* for kernel mappings; it is valid only for access to the kernel's static -* 1:1 mapping of physical memory — not to vmalloc or even module mappings. -* A future API addition may permit the use of such ranges, by means of an -* explicit IOTLB flush call (akin to the DMA API's unmap method). -* -* It is unlikely that we will ever hook into flush_tlb_kernel_range() to -* do such IOTLB flushes automatically. -*/ -#define SVM_FLAG_SUPERVISOR_MODE BIT(0) -#endif /* __INTEL_SVM_H__ */
include/linux/iommu.h +3 -5
@@ -243,8 +243,7 @@ struct iommu_ops {int (*dev_enable_feat)(struct device *dev,enum iommu_dev_features f);int (*dev_disable_feat)(struct device *dev,enum iommu_dev_features f); -struct iommu_sva *(*sva_bind)(struct device *dev,struct mm_struct *mm, -void *drvdata); +struct iommu_sva *(*sva_bind)(struct device *dev,struct mm_struct *mm);void (*sva_unbind)(struct iommu_sva *handle);u32 (*sva_get_pasid)(struct iommu_sva *handle);
@@ -669,8 +668,7 @@ int iommu_dev_disable_feature(struct device *dev, enum iommu_dev_features f);bool iommu_dev_feature_enabled (struct device *dev,enum iommu_dev_features f);struct iommu_sva *iommu_sva_bind_device (struct device *dev, -struct mm_struct *mm, -void *drvdata); +struct mm_struct *mm);void iommu_sva_unbind_device (struct iommu_sva *handle);u32 iommu_sva_get_pasid (struct iommu_sva *handle);
@@ -1012,7 +1010,7 @@ iommu_dev_disable_feature(struct device *dev, enum iommu_dev_features feat) }static inline struct iommu_sva * -iommu_sva_bind_device (struct device *dev,struct mm_struct *mm,void *drvdata) +iommu_sva_bind_device (struct device *dev,struct mm_struct *mm) {return NULL ; }
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h +2 -3
@@ -754,8 +754,7 @@ bool arm_smmu_master_sva_enabled(struct arm_smmu_master *master);int arm_smmu_master_enable_sva (struct arm_smmu_master *master);int arm_smmu_master_disable_sva (struct arm_smmu_master *master);bool arm_smmu_master_iopf_supported (struct arm_smmu_master *master); -struct iommu_sva *arm_smmu_sva_bind (struct device *dev,struct mm_struct *mm, -void *drvdata); +struct iommu_sva *arm_smmu_sva_bind (struct device *dev,struct mm_struct *mm);void arm_smmu_sva_unbind (struct iommu_sva *handle);u32 arm_smmu_sva_get_pasid (struct iommu_sva *handle);void arm_smmu_sva_notifier_synchronize (void );
@@ -791,7 +790,7 @@ static inline bool arm_smmu_master_iopf_supported(struct arm_smmu_master *master }static inline struct iommu_sva * -arm_smmu_sva_bind (struct device *dev,struct mm_struct *mm,void *drvdata) +arm_smmu_sva_bind (struct device *dev,struct mm_struct *mm) {return ERR_PTR (-ENODEV ); }
drivers/dma/idxd/cdev.c +1 -2
@@ -6,7 +6,6 @@#include <linux/pci.h> #include <linux/device.h> #include <linux/sched/task.h> -#include <linux/intel-svm.h> #include <linux/io-64-nonatomic-lo-hi.h> #include <linux/cdev.h> #include <linux/fs.h>
@@ -100,7 +99,7 @@ static int idxd_cdev_open(struct inode *inode, struct file *filp) filp->private_data = ctx;if (device_user_pasid_enabled (idxd)) { - sva =iommu_sva_bind_device (dev, current->mm,NULL ); + sva =iommu_sva_bind_device (dev, current->mm);if (IS_ERR (sva)) { rc =PTR_ERR (sva);dev_err (dev,"pasid allocation failed: %d\n" , rc);
drivers/dma/idxd/init.c +1 -24
@@ -14,7 +14,6 @@#include <linux/io-64-nonatomic-lo-hi.h> #include <linux/device.h> #include <linux/idr.h> -#include <linux/intel-svm.h> #include <linux/iommu.h> #include <uapi/linux/idxd.h> #include <linux/dmaengine.h>
@@ -466,29 +465,7 @@ static struct idxd_device *idxd_alloc(struct pci_dev *pdev, struct idxd_driver_dstatic int idxd_enable_system_pasid (struct idxd_device *idxd) { -int flags; -unsigned int pasid; -struct iommu_sva *sva; - - flags =SVM_FLAG_SUPERVISOR_MODE ; - - sva =iommu_sva_bind_device (&idxd->pdev->dev,NULL , &flags); -if (IS_ERR (sva)) { -dev_warn (&idxd->pdev->dev, -"iommu sva bind failed: %ld\n" ,PTR_ERR (sva)); -return PTR_ERR (sva); - } - - pasid =iommu_sva_get_pasid (sva); -if (pasid ==IOMMU_PASID_INVALID ) { -iommu_sva_unbind_device (sva); -return -ENODEV ; - } - - idxd->sva = sva; - idxd->pasid = pasid; -dev_dbg (&idxd->pdev->dev,"system pasid: %u\n" , pasid); -return 0 ; +return -EOPNOTSUPP ; }static void idxd_disable_system_pasid (struct idxd_device *idxd)
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c +1 -2
@@ -367,8 +367,7 @@ __arm_smmu_sva_bind(struct device *dev, struct mm_struct *mm)return ERR_PTR (ret); } -struct iommu_sva * -arm_smmu_sva_bind (struct device *dev,struct mm_struct *mm,void *drvdata) +struct iommu_sva *arm_smmu_sva_bind (struct device *dev,struct mm_struct *mm) {struct iommu_sva *handle;struct iommu_domain *domain =iommu_get_domain_for_dev (dev);
drivers/iommu/intel/svm.c +14 -43
116 lines not on this page · raw message
drivers/iommu/iommu.c +2 -3
@@ -2788,7 +2788,6 @@ EXPORT_SYMBOL_GPL(iommu_dev_feature_enabled);* iommu_sva_bind_device() - Bind a process address space to a device * @dev: the device * @mm: the mm to bind, caller must hold a reference to it -* @drvdata: opaque data pointer to pass to bind callback * * Create a bond between device and address space, allowing the device to access * the mm using the returned PASID. If a bond already exists between @device and
@@ -2801,7 +2800,7 @@ EXPORT_SYMBOL_GPL(iommu_dev_feature_enabled);* On error, returns an ERR_PTR value. */ struct iommu_sva * -iommu_sva_bind_device (struct device *dev,struct mm_struct *mm,void *drvdata) +iommu_sva_bind_device (struct device *dev,struct mm_struct *mm) {struct iommu_group *group;struct iommu_sva *handle =ERR_PTR (-EINVAL );
@@ -2826,7 +2825,7 @@ iommu_sva_bind_device(struct device *dev, struct mm_struct *mm, void *drvdata)if (iommu_group_device_count (group) !=1 ) goto out_unlock; - handle = ops->sva_bind (dev, mm, drvdata); + handle = ops->sva_bind (dev, mm); out_unlock:mutex_unlock (&group->mutex);
drivers/misc/uacce/uacce.c +1 -1
@@ -99,7 +99,7 @@ static int uacce_bind_queue(struct uacce_device *uacce, struct uacce_queue *q)if (!(uacce->flags &UACCE_DEV_SVA ))return 0 ; - handle =iommu_sva_bind_device (uacce->parent, current->mm,NULL ); + handle =iommu_sva_bind_device (uacce->parent, current->mm);if (IS_ERR (handle))return PTR_ERR (handle);
Signature · 1 line
2.25.1
Lu Baolu
maintainerPATCH v9 4/11 iommu: Add sva iommu_domain support
In reply to Lu BaoluThe sva iommu_domain represents a hardware pagetable that the IOMMU hardware could use for SVA translation. This adds some infrastructure to support SVA domain in the iommu common layer. It includes:
- Extend the iommu_domain to support a new IOMMU_DOMAIN_SVA domain type. The IOMMU drivers that support SVA should provide the sva domain specific iommu_domain_ops.
- Add a helper to allocate an SVA domain. The iommu_domain_free() is still used to free an SVA domain.
- Add helpers to attach an SVA domain to a device and the reverse operation.
Some buses, like PCI, route packets without considering the PASID value. Thus a DMA target address with PASID might be treated as P2P if the address falls into the MMIO BAR of other devices in the group. To make things simple, the attach/detach interfaces only apply to devices belonging to the singleton groups, and the singleton is immutable in fabric i.e. not affected by hotplug.
The iommu_attach/detach_device_pasid() can be used for other purposes, such as kernel DMA with pasid, mediation device, etc.
--- include/linux/iommu.h | 45 ++++++++++++++++++++- drivers/iommu/iommu.c | 93 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 136 insertions(+), 2 deletions(-)
include/linux/iommu.h +43 -2
@@ -64,6 +64,8 @@ struct iommu_domain_geometry {#define __IOMMU_DOMAIN_PT (1U << 2)/* Domain is identity mapped */ #define __IOMMU_DOMAIN_DMA_FQ (1U << 3)/* DMA-API uses flush queue */ +#define __IOMMU_DOMAIN_SVA (1U << 4)/* Shared process address space */ +/* * This are the possible domain-types *
@@ -77,6 +79,8 @@ struct iommu_domain_geometry {* certain optimizations for these domains * IOMMU_DOMAIN_DMA_FQ - As above, but definitely using batched TLB * invalidation. +* IOMMU_DOMAIN_SVA - DMA addresses are shared process address +* spaces represented by mm_struct's. */ #define IOMMU_DOMAIN_BLOCKED (0U)#define IOMMU_DOMAIN_IDENTITY (__IOMMU_DOMAIN_PT)
@@ -86,15 +90,23 @@ struct iommu_domain_geometry {#define IOMMU_DOMAIN_DMA_FQ (__IOMMU_DOMAIN_PAGING | \ __IOMMU_DOMAIN_DMA_API | \ __IOMMU_DOMAIN_DMA_FQ) +#define IOMMU_DOMAIN_SVA (__IOMMU_DOMAIN_SVA)struct iommu_domain {unsigned type;const struct iommu_domain_ops *ops;unsigned long pgsize_bitmap;/* Bitmap of page sizes in use */ -iommu_fault_handler_t handler; -void *handler_token;struct iommu_domain_geometry geometry;struct iommu_dma_cookie *iova_cookie; +union { +struct {/* IOMMU_DOMAIN_DMA */ +iommu_fault_handler_t handler; +void *handler_token; + }; +struct {/* IOMMU_DOMAIN_SVA */ +struct mm_struct *mm; + }; + }; };static inline bool iommu_is_dma_domain (struct iommu_domain *domain)
@@ -262,6 +274,8 @@ struct iommu_ops {* struct iommu_domain_ops - domain specific operations * @attach_dev: attach an iommu domain to a device * @detach_dev: detach an iommu domain from a device +* @set_dev_pasid: set an iommu domain to a pasid of device +* @block_dev_pasid: block pasid of device from using iommu domain * @map: map a physically contiguous memory region to an iommu domain * @map_pages: map a physically contiguous set of pages of the same size to * an iommu domain.
@@ -282,6 +296,10 @@ struct iommu_ops {struct iommu_domain_ops {int (*attach_dev)(struct iommu_domain *domain,struct device *dev);void (*detach_dev)(struct iommu_domain *domain,struct device *dev); +int (*set_dev_pasid)(struct iommu_domain *domain,struct device *dev, +ioasid_t pasid); +void (*block_dev_pasid)(struct iommu_domain *domain,struct device *dev, +ioasid_t pasid);int (*map)(struct iommu_domain *domain,unsigned long iova,phys_addr_t paddr,size_t size,int prot,gfp_t gfp);
@@ -679,6 +697,12 @@ int iommu_group_claim_dma_owner(struct iommu_group *group, void *owner);void iommu_group_release_dma_owner (struct iommu_group *group);bool iommu_group_dma_owner_claimed (struct iommu_group *group); +struct iommu_domain *iommu_sva_domain_alloc (struct device *dev, +struct mm_struct *mm); +int iommu_attach_device_pasid (struct iommu_domain *domain,struct device *dev, +ioasid_t pasid); +void iommu_detach_device_pasid (struct iommu_domain *domain,struct device *dev, +ioasid_t pasid);#else /* CONFIG_IOMMU_API */ struct iommu_ops {};
@@ -1052,6 +1076,23 @@ static inline bool iommu_group_dma_owner_claimed(struct iommu_group *group) {return false; } + +static inline struct iommu_domain * +iommu_sva_domain_alloc (struct device *dev,struct mm_struct *mm) +{ +return NULL ; +} + +static inline int iommu_attach_device_pasid (struct iommu_domain *domain, +struct device *dev,ioasid_t pasid) +{ +return -ENODEV ; +} + +static inline void iommu_detach_device_pasid (struct iommu_domain *domain, +struct device *dev,ioasid_t pasid) +{ +}#endif /* CONFIG_IOMMU_API */ /**
drivers/iommu/iommu.c +93 -0
120 lines not on this page · raw message
Signature · 1 line
2.25.1
RE: [PATCH v9 04/11] iommu: Add sva iommu_domain support
Quoted 23 lines
From: Lu Baolu <[email protected]>
Sent: Tuesday, June 21, 2022 10:44 PMThe sva
iommu_domainrepresents a hardware pagetable that the IOMMU hardware could use for SVA translation. This adds some infrastructure to support SVA domain in the iommu common layer. It includes:- Extend the
iommu_domainto support a newIOMMU_DOMAIN_SVAdomain
type. The IOMMU drivers that support SVA should provide the sva domain specificiommu_domain_ops.
- Add a helper to allocate an SVA domain. Theiommu_domain_free()is still used to free an SVA domain.
- Add helpers to attach an SVA domain to a device and the reverse operation.Some buses, like PCI, route packets without considering the PASID value. Thus a DMA target address with PASID might be treated as P2P if the address falls into the MMIO BAR of other devices in the group. To make things simple, the attach/detach interfaces only apply to devices belonging to the singleton groups, and the singleton is immutable in fabric i.e. not affected by hotplug.
Quoted 2 lines
The iommu_attach/detach_device_pasid() can be used for other purposes, such as kernel DMA with pasid, mediation device, etc.
I'd split this into two patches. One for adding iommu_attach/ detach_device_pasid() and set/block_dev_pasid ops, and the other for adding SVA.
include/linux/iommu.h struct iommu_domain_geometry { · line 105
Quoted 13 lines
struct
iommu_domain{include/linux/iommu.h +5
-2unsigned type;const struct iommu_domain_ops *ops;unsigned long pgsize_bitmap;/* Bitmap of page sizes in use */ -iommu_fault_handler_t handler; -void *handler_token;struct iommu_domain_geometry geometry;struct iommu_dma_cookie *iova_cookie; +union { +struct {/* IOMMU_DOMAIN_DMA */ +iommu_fault_handler_t handler; +void *handler_token; + };
why is it DMA domain specific? What about unmanaged domain? Unrecoverable fault can happen on any type including SVA. Hence I think above should be domain type agnostic.
Quoted 11 lines
drivers/iommu/iommu.c +6
-0+struct {/* IOMMU_DOMAIN_SVA */ +struct mm_struct *mm; + }; + }; }; + +struct iommu_domain *iommu_sva_domain_alloc(struct device *dev,
drivers/iommu/iommu.c bool iommu_group_dma_owner_claimed(struct iommu_group *group) · line 3290
Quoted 10 lines
drivers/iommu/iommu.c +10
-0+ struct mm_struct *mm) +{ +const struct iommu_ops *ops =dev_iommu_ops (dev); +struct iommu_domain *domain; + + domain = ops->domain_alloc (IOMMU_DOMAIN_SVA ); +if (!domain) +return NULL ; + + domain->type =IOMMU_DOMAIN_SVA ;
It's a bit weird that the type has been specified when calling ops->domain_alloc while it still leaves to the caller to set the type. But this is not caused by this series. could be cleaned up separately.
drivers/iommu/iommu.c bool iommu_group_dma_owner_claimed(struct iommu_group *group) · line 3344
Quoted 6 lines
drivers/iommu/iommu.c +3
-0+ +mutex_lock (&group->mutex); + curr = xa_cmpxchg(&group->pasid_array, pasid, NULL, domain,
GFP_KERNEL);drivers/iommu/iommu.c +2
-0+if (curr) + goto out_unlock;
Need check xa_is_err(old).
Baolu Lu
maintainerRe: [PATCH v9 04/11] iommu: Add sva iommu_domain support
Hi Kevin,
Quoted 23 lines · Kevin
Quoted 23 lines
From: Lu Baolu <[email protected]>
Sent: Tuesday, June 21, 2022 10:44 PMThe sva
iommu_domainrepresents a hardware pagetable that the IOMMU hardware could use for SVA translation. This adds some infrastructure to support SVA domain in the iommu common layer. It includes:- Extend the
iommu_domainto support a newIOMMU_DOMAIN_SVAdomain
type. The IOMMU drivers that support SVA should provide the sva domain specificiommu_domain_ops.
- Add a helper to allocate an SVA domain. Theiommu_domain_free()is still used to free an SVA domain.
- Add helpers to attach an SVA domain to a device and the reverse operation.Some buses, like PCI, route packets without considering the PASID value. Thus a DMA target address with PASID might be treated as P2P if the address falls into the MMIO BAR of other devices in the group. To make things simple, the attach/detach interfaces only apply to devices belonging to the singleton groups, and the singleton is immutable in fabric i.e. not affected by hotplug.
Quoted 6 lines
Quoted 2 lines
The iommu_attach/detach_device_pasid() can be used for other purposes, such as kernel DMA with pasid, mediation device, etc.
I'd split this into two patches. One for adding iommu_attach/
detach_device_pasid()and set/block_dev_pasid ops, and the other for adding SVA.
Yes. Make sense.
Quoted 11 lines
Quoted 11 lines
struct
iommu_domain{
unsigned type;
const structiommu_domain_ops*ops;
unsigned longpgsize_bitmap; /* Bitmap of page sizes in use */include/linux/iommu.h +2
-2-iommu_fault_handler_t handler; -void *handler_token;struct iommu_domain_geometry geometry;struct iommu_dma_cookie *iova_cookie; + union { + struct { /* IOMMU_DOMAIN_DMA */
Quoted 8 lines
include/linux/iommu.h struct iommu_domain_geometry { · line 105
Quoted 3 lines
include/linux/iommu.h +3
-0+iommu_fault_handler_t handler; +void *handler_token; + };why is it DMA domain specific? What about unmanaged domain? Unrecoverable fault can happen on any type including SVA. Hence I think above should be domain type agnostic.
The report_iommu_fault() should be replaced by the new iommu_report_device_fault(). Jean has already started this work.
https://lore.kernel.org/linux-iommu/Yo4Nw9QyllT1RZbd@myrica/
Currently this is only for DMA domains, hence Robin suggested to make it exclude with the SVA domain things.
https://lore.kernel.org/linux-iommu/[email protected]/
Quoted 19 lines
Quoted 19 lines
drivers/iommu/iommu.c +13
-0+struct {/* IOMMU_DOMAIN_SVA */ +struct mm_struct *mm; + }; + }; }; + +struct iommu_domain *iommu_sva_domain_alloc (struct device *dev, +struct mm_struct *mm) +{ +const struct iommu_ops *ops =dev_iommu_ops (dev); +struct iommu_domain *domain; + + domain = ops->domain_alloc (IOMMU_DOMAIN_SVA ); +if (!domain)
Quoted 8 lines
drivers/iommu/iommu.c bool iommu_group_dma_owner_claimed(struct iommu_group *group) · line 3290
Quoted 3 lines
drivers/iommu/iommu.c +3
-0+return NULL ; + + domain->type =IOMMU_DOMAIN_SVA ;It's a bit weird that the type has been specified when calling
ops->domain_allocwhile it still leaves to the caller to set the type. But this is not caused by this series. could be cleaned up separately.
Yes. Robin has patches to refactor the domain allocation interface, let's wait and see what it looks like finally.
Quoted 9 lines
drivers/iommu/iommu.c bool iommu_group_dma_owner_claimed(struct iommu_group *group) · line 3344
Quoted 7 lines
drivers/iommu/iommu.c +3
-0+ +mutex_lock (&group->mutex); + curr = xa_cmpxchg(&group->pasid_array, pasid, NULL, domain,
GFP_KERNEL);drivers/iommu/iommu.c +2
-0+if (curr) + goto out_unlock;Need check
xa_is_err(old).
Either
(1) old entry is a valid pointer, or
(2) xa_is_err(curr)
are failure cases. Hence, "curr == NULL" is the only check we need. Did I miss anything?
Best regards,
baolu
RE: [PATCH v9 04/11] iommu: Add sva iommu_domain support
Quoted 25 lines
From: Baolu Lu <[email protected]>
Sent: Tuesday, June 28, 2022 1:41 PMQuoted 11 lines
Quoted 11 lines
struct
iommu_domain{
unsigned type;
const structiommu_domain_ops*ops;
unsigned longpgsize_bitmap; /* Bitmap of page sizes in use */include/linux/iommu.h +2
-2-iommu_fault_handler_t handler; -void *handler_token;struct iommu_domain_geometry geometry;struct iommu_dma_cookie *iova_cookie; + union { + struct { /* IOMMU_DOMAIN_DMA */Quoted 8 lines
include/linux/iommu.h struct iommu_domain_geometry { · line 105
Quoted 3 lines
include/linux/iommu.h +3
-0+iommu_fault_handler_t handler; +void *handler_token; + };why is it DMA domain specific? What about unmanaged domain? Unrecoverable fault can happen on any type including SVA. Hence I think above should be domain type agnostic.
The
report_iommu_fault()should be replaced by the newiommu_report_device_fault(). Jean has already started this work.
Quoted 7 lines
https://lore.kernel.org/linux-iommu/Yo4Nw9QyllT1RZbd@myrica/
Currently this is only for DMA domains, hence Robin suggested to make it exclude with the SVA domain things.
https://lore.kernel.org/linux-iommu/f3170016-4d7f-e78e-db48-
[email protected]/
Then it's worthy a comment that those two fields are for some legacy fault reporting stuff and DMA type only.
Quoted 10 lines
Quoted 9 lines
drivers/iommu/iommu.c bool iommu_group_dma_owner_claimed(struct iommu_group *group) · line 3344
Quoted 7 lines
drivers/iommu/iommu.c +3
-0+ +mutex_lock (&group->mutex); + curr = xa_cmpxchg(&group->pasid_array, pasid, NULL, domain,
GFP_KERNEL);drivers/iommu/iommu.c +2
-0+if (curr) + goto out_unlock;Need check
xa_is_err(old).
Quoted 3 lines
Either
(1) old entry is a valid pointer, or
return -EBUSY in this case
Quoted 1 line
(2)
xa_is_err(curr)
return xa_err(cur)
Quoted 4 lines
are failure cases. Hence, "curr == NULL" is the only check we need. Did I miss anything?
But now you always return -EBUSY for all kinds of xa errors.
Baolu Lu
maintainerRe: [PATCH v9 04/11] iommu: Add sva iommu_domain support
Quoted 24 lines · Kevin
Quoted 24 lines
From: Baolu Lu<[email protected]>
Sent: Tuesday, June 28, 2022 1:41 PMQuoted 9 lines
Quoted 9 lines
struct iommu_domain { unsigned type; const struct iommu_domain_ops *ops; unsigned long pgsize_bitmap; /* Bitmap of page sizes in use */include/linux/iommu.h +1
-2-iommu_fault_handler_t handler; -void *handler_token;struct iommu_domain_geometry geometry;struct iommu_dma_cookie *iova_cookie; +union {Quoted 8 lines
include/linux/iommu.h struct iommu_domain_geometry { · line 105
Quoted 4 lines
include/linux/iommu.h +4
-0+struct {/* IOMMU_DOMAIN_DMA */ +iommu_fault_handler_t handler; +void *handler_token; + };why is it DMA domain specific? What about unmanaged domain? Unrecoverable fault can happen on any type including SVA. Hence I think above should be domain type agnostic.
The
report_iommu_fault()should be replaced by the newiommu_report_device_fault(). Jean has already started this work.https://lore.kernel.org/linux-iommu/Yo4Nw9QyllT1RZbd@myrica/
Quoted 7 lines
Quoted 5 lines
Currently this is only for DMA domains, hence Robin suggested to make it exclude with the SVA domain things.
https://lore.kernel.org/linux-iommu/f3170016-4d7f-e78e-db48-
[email protected]/Then it's worthy a comment that those two fields are for some legacy fault reporting stuff and DMA type only.
The iommu_fault and SVA fields are exclusive. The former is used for unrecoverable DMA remapping faults, while the latter is only interested in the recoverable page faults.
I will update the commit message with above explanation. Does this work for you?
Best regards,
baolu
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
RE: [PATCH v9 04/11] iommu: Add sva iommu_domain support
Quoted 36 lines
From: Baolu Lu <[email protected]>
Sent: Tuesday, June 28, 2022 7:34 PMQuoted 24 lines · Kevin
Quoted 24 lines
From: Baolu Lu<[email protected]>
Sent: Tuesday, June 28, 2022 1:41 PMQuoted 9 lines
Quoted 9 lines
struct iommu_domain { unsigned type; const struct iommu_domain_ops *ops; unsigned long pgsize_bitmap; /* Bitmap of page sizes in use */include/linux/iommu.h +1
-2-iommu_fault_handler_t handler; -void *handler_token;struct iommu_domain_geometry geometry;struct iommu_dma_cookie *iova_cookie; +union {Quoted 8 lines
include/linux/iommu.h struct iommu_domain_geometry { · line 105
Quoted 4 lines
include/linux/iommu.h +4
-0+struct {/* IOMMU_DOMAIN_DMA */ +iommu_fault_handler_t handler; +void *handler_token; + };why is it DMA domain specific? What about unmanaged domain? Unrecoverable fault can happen on any type including SVA. Hence I think above should be domain type agnostic.
The
report_iommu_fault()should be replaced by the newiommu_report_device_fault(). Jean has already started this work.https://lore.kernel.org/linux-iommu/Yo4Nw9QyllT1RZbd@myrica/
Quoted 7 lines
Quoted 5 lines
Currently this is only for DMA domains, hence Robin suggested to make it exclude with the SVA domain things.
https://lore.kernel.org/linux-iommu/f3170016-4d7f-e78e-db48-
[email protected]/Then it's worthy a comment that those two fields are for some legacy fault reporting stuff and DMA type only.
Quoted 7 lines
The
iommu_faultand SVA fields are exclusive. The former is used for unrecoverable DMA remapping faults, while the latter is only interested in the recoverable page faults.I will update the commit message with above explanation. Does this work for you?
Not exactly. Your earlier explanation is about old vs. new API thus leaving the existing fault handler with current only user is fine.
but this is not related to unrecoverable vs. recoverable. As I said unrecoverable could happen on all domain types. Tying it to DMA-only doesn't make sense and I think in the end the new iommu_report_device_fault() will need support both. Is it not the case?
Baolu Lu
maintainerRe: [PATCH v9 04/11] iommu: Add sva iommu_domain support
Quoted 44 lines · Kevin
Quoted 36 lines
From: Baolu Lu <[email protected]>
Sent: Tuesday, June 28, 2022 7:34 PMQuoted 24 lines · Kevin
Quoted 24 lines
From: Baolu Lu<[email protected]>
Sent: Tuesday, June 28, 2022 1:41 PMQuoted 9 lines
Quoted 9 lines
struct iommu_domain { unsigned type; const struct iommu_domain_ops *ops; unsigned long pgsize_bitmap; /* Bitmap of page sizes in use */include/linux/iommu.h +1
-2-iommu_fault_handler_t handler; -void *handler_token;struct iommu_domain_geometry geometry;struct iommu_dma_cookie *iova_cookie; +union {Quoted 8 lines
include/linux/iommu.h struct iommu_domain_geometry { · line 105
Quoted 4 lines
include/linux/iommu.h +4
-0+struct {/* IOMMU_DOMAIN_DMA */ +iommu_fault_handler_t handler; +void *handler_token; + };why is it DMA domain specific? What about unmanaged domain? Unrecoverable fault can happen on any type including SVA. Hence I think above should be domain type agnostic.
The
report_iommu_fault()should be replaced by the newiommu_report_device_fault(). Jean has already started this work.https://lore.kernel.org/linux-iommu/Yo4Nw9QyllT1RZbd@myrica/
Quoted 7 lines
Quoted 5 lines
Currently this is only for DMA domains, hence Robin suggested to make it exclude with the SVA domain things.
https://lore.kernel.org/linux-iommu/f3170016-4d7f-e78e-db48-
[email protected]/Then it's worthy a comment that those two fields are for some legacy fault reporting stuff and DMA type only.
Quoted 7 lines
The
iommu_faultand SVA fields are exclusive. The former is used for unrecoverable DMA remapping faults, while the latter is only interested in the recoverable page faults.I will update the commit message with above explanation. Does this work for you?
Quoted 8 lines
Not exactly. Your earlier explanation is about old vs. new API thus leaving the existing fault handler with current only user is fine.
but this is not related to unrecoverable vs. recoverable. As I said unrecoverable could happen on all domain types. Tying it to DMA-only doesn't make sense and I think in the end the new
iommu_report_device_fault()will need support both. Is it not the case?
You are right.
The report_iommu_fault() should be replaced by the new iommu_report_device_fault(). Leave the existing fault handler with the existing users and the newly added SVA members should exclude it.
Best regards,
baolu
Baolu Lu
maintainerRe: [PATCH v9 04/11] iommu: Add sva iommu_domain support
In reply to Tian, KevinQuoted 12 lines · Kevin
Quoted 10 lines
Quoted 7 lines
drivers/iommu/iommu.c bool iommu_group_dma_owner_claimed(struct iommu_group *group) · line 3344
Quoted 6 lines
drivers/iommu/iommu.c +3
-0+ +mutex_lock (&group->mutex); + curr = xa_cmpxchg(&group->pasid_array, pasid, NULL, domain,
GFP_KERNEL);drivers/iommu/iommu.c +2
-0+if (curr) + goto out_unlock;Need check
xa_is_err(old).Either
(1) old entry is a valid pointer, or
return
-EBUSYin this case
Quoted 7 lines
Quoted 1 line
(2)
xa_is_err(curr)return
xa_err(cur)Quoted 3 lines
are failure cases. Hence, "curr == NULL" is the only check we need. Did I miss anything?
But now you always return
-EBUSYfor all kinds of xa errors.
Fair enough. Updated like below.
curr = xa_cmpxchg(&group->pasid_array, pasid, NULL, domain,
GFP_KERNEL);
if (curr) {
ret = xa_err(curr) ? : -EBUSY;
goto out_unlock;
}Best regards,
baolu
Lu Baolu
maintainerPATCH v9 5/11 iommu/vt-d: Add SVA domain support
In reply to Lu BaoluAdd support for SVA domain allocation and provide an SVA-specific iommu_domain_ops.
--- include/linux/intel-iommu.h | 5 ++++ drivers/iommu/intel/iommu.c | 2 ++ drivers/iommu/intel/svm.c | 49 +++++++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+)
include/linux/intel-iommu.h +5 -0
@@ -743,6 +743,7 @@ void intel_svm_unbind(struct iommu_sva *handle);u32 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 iommu_domain *intel_svm_domain_alloc (void );struct intel_svm_dev {struct list_head list;
@@ -768,6 +769,10 @@ struct intel_svm { };#else static inline void intel_svm_check (struct intel_iommu *iommu) {} +static inline struct iommu_domain *intel_svm_domain_alloc (void ) +{ +return NULL ; +}#endif #ifdef CONFIG_INTEL_IOMMU_DEBUGFS
drivers/iommu/intel/iommu.c +2 -0
@@ -4298,6 +4298,8 @@ static struct iommu_domain *intel_iommu_domain_alloc(unsigned type)return domain;case IOMMU_DOMAIN_IDENTITY :return &si_domain->domain; +case IOMMU_DOMAIN_SVA : +return intel_svm_domain_alloc ();default :return NULL ; }
drivers/iommu/intel/svm.c +49 -0
52 lines not on this page · raw message
Signature · 1 line
2.25.1
RE: [PATCH v9 05/11] iommu/vt-d: Add SVA domain support
Quoted 7 lines
From: Lu Baolu <[email protected]>
Sent: Tuesday, June 21, 2022 10:44 PMAdd support for SVA domain allocation and provide an SVA-specific
iommu_domain_ops.Signed-off-by Lu Baolu <[email protected]>
Lu Baolu
maintainerPATCH v9 6/11 arm-smmu-v3/sva: Add SVA domain support
In reply to Lu BaoluAdd support for SVA domain allocation and provide an SVA-specific iommu_domain_ops.
--- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 6 ++ .../iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 69 +++++++++++++++++++ drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 3 + 3 files changed, 78 insertions(+)
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h +6 -0
@@ -758,6 +758,7 @@ struct iommu_sva *arm_smmu_sva_bind(struct device *dev, struct mm_struct *mm);void arm_smmu_sva_unbind (struct iommu_sva *handle);u32 arm_smmu_sva_get_pasid (struct iommu_sva *handle);void arm_smmu_sva_notifier_synchronize (void ); +struct iommu_domain *arm_smmu_sva_domain_alloc (void );#else /* CONFIG_ARM_SMMU_V3_SVA */ static inline bool arm_smmu_sva_supported (struct arm_smmu_device *smmu) {
@@ -803,5 +804,10 @@ static inline u32 arm_smmu_sva_get_pasid(struct iommu_sva *handle) }static inline void arm_smmu_sva_notifier_synchronize (void ) {} + +static inline struct iommu_domain *arm_smmu_sva_domain_alloc (void ) +{ +return NULL ; +}#endif /* CONFIG_ARM_SMMU_V3_SVA */ #endif /* _ARM_SMMU_V3_H */
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c +69 -0
72 lines not on this page · raw message
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +3 -0
@@ -1999,6 +1999,9 @@ static struct iommu_domain *arm_smmu_domain_alloc(unsigned type) {struct arm_smmu_domain *smmu_domain; +if (type ==IOMMU_DOMAIN_SVA ) +return arm_smmu_sva_domain_alloc (); + if (type != IOMMU_DOMAIN_UNMANAGED && type != IOMMU_DOMAIN_DMA && type != IOMMU_DOMAIN_DMA_FQ &&
Signature · 1 line
2.25.1
Re: [PATCH v9 06/11] arm-smmu-v3/sva: Add SVA domain support
Quoted 5 lines · Lu Baolu
Add support for SVA domain allocation and provide an SVA-specific
iommu_domain_ops.Signed-off-by Lu Baolu <[email protected]>Reviewed-by Jean-Philippe Brucker <[email protected]>
Have tested the series on aarch64.
Thanks
Quoted 120 lines
--- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 6 ++ .../iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 69 +++++++++++++++++++ drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 3 + 3 files changed, 78 insertions(+)drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h +6
-0@@ -758,6 +758,7 @@ struct iommu_sva *arm_smmu_sva_bind(struct device *dev, struct mm_struct *mm);void arm_smmu_sva_unbind (struct iommu_sva *handle);u32 arm_smmu_sva_get_pasid (struct iommu_sva *handle);void arm_smmu_sva_notifier_synchronize (void ); +struct iommu_domain *arm_smmu_sva_domain_alloc (void );#else /* CONFIG_ARM_SMMU_V3_SVA */ static inline bool arm_smmu_sva_supported (struct arm_smmu_device *smmu) {@@ -803,5 +804,10 @@ static inline u32 arm_smmu_sva_get_pasid(struct iommu_sva *handle) }static inline void arm_smmu_sva_notifier_synchronize (void ) {} + +static inline struct iommu_domain *arm_smmu_sva_domain_alloc (void ) +{ +return NULL ; +}#endif /* CONFIG_ARM_SMMU_V3_SVA */ #endif /* _ARM_SMMU_V3_H */ drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c +69
-0@@ -549,3 +549,72 @@ void arm_smmu_sva_notifier_synchronize(void)*/ mmu_notifier_synchronize (); } + +static int arm_smmu_sva_set_dev_pasid (struct iommu_domain *domain, +struct device *dev,ioasid_t id) +{ +int ret =0 ; +struct mm_struct *mm; +struct iommu_sva *handle; + +if (domain->type !=IOMMU_DOMAIN_SVA ) +return -EINVAL ; + + mm = domain->mm; +if (WARN_ON (!mm)) +return -ENODEV ; + +mutex_lock (&sva_lock); + handle =__arm_smmu_sva_bind (dev, mm); +if (IS_ERR (handle)) + ret =PTR_ERR (handle); +mutex_unlock (&sva_lock); + +return ret; +} + +static void arm_smmu_sva_block_dev_pasid (struct iommu_domain *domain, +struct device *dev,ioasid_t id) +{ +struct mm_struct *mm = domain->mm; +struct arm_smmu_bond *bond =NULL , *t; +struct arm_smmu_master *master =dev_iommu_priv_get (dev); + +mutex_lock (&sva_lock); +list_for_each_entry (t, &master->bonds, list) { +if (t->mm == mm) { + bond = t; +break ; + } + } + +if (!WARN_ON (!bond) &&refcount_dec_and_test (&bond->refs)) { +list_del (&bond->list); +arm_smmu_mmu_notifier_put (bond->smmu_mn); +kfree (bond); + } +mutex_unlock (&sva_lock); +} + +static void arm_smmu_sva_domain_free (struct iommu_domain *domain) +{ +kfree (domain); +} + +static const struct iommu_domain_ops arm_smmu_sva_domain_ops = { + .set_dev_pasid = arm_smmu_sva_set_dev_pasid, + .block_dev_pasid = arm_smmu_sva_block_dev_pasid, + .free = arm_smmu_sva_domain_free, +}; + +struct iommu_domain *arm_smmu_sva_domain_alloc (void ) +{ +struct iommu_domain *domain; + + domain =kzalloc (sizeof (*domain),GFP_KERNEL ); +if (!domain) +return NULL ; + domain->ops = &arm_smmu_sva_domain_ops; + +return domain; +}drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +3
-0@@ -1999,6 +1999,9 @@ static struct iommu_domain *arm_smmu_domain_alloc(unsigned type) {struct arm_smmu_domain *smmu_domain; +if (type ==IOMMU_DOMAIN_SVA ) +return arm_smmu_sva_domain_alloc (); + if (type != IOMMU_DOMAIN_UNMANAGED && type != IOMMU_DOMAIN_DMA && type != IOMMU_DOMAIN_DMA_FQ &&
Baolu Lu
maintainerRe: [PATCH v9 06/11] arm-smmu-v3/sva: Add SVA domain support
Quoted 10 lines · Zhangfei Gao
Quoted 5 lines · Lu Baolu
Add support for SVA domain allocation and provide an SVA-specific
iommu_domain_ops.Signed-off-by Lu Baolu <[email protected]>Reviewed-by Jean-Philippe Brucker <[email protected]>Tested-by Zhangfei Gao <[email protected]>Have tested the series on aarch64.
Thank you very much! Very appreciated for your help!
Best regards,
baolu
Baolu Lu
maintainerRe: [PATCH v9 06/11] arm-smmu-v3/sva: Add SVA domain support
In reply to Zhangfei GaoQuoted 11 lines · Zhangfei Gao
Quoted 5 lines · Lu Baolu
Add support for SVA domain allocation and provide an SVA-specific
iommu_domain_ops.Signed-off-by Lu Baolu <[email protected]>Reviewed-by Jean-Philippe Brucker <[email protected]>Tested-by Zhangfei Gao <[email protected]>Have tested the series on aarch64.
Tony has been helping to validate this series on Intel's platform.
Tony, can I add your Test-by as well in this series?
Best regards,
baolu
Zhu, Tony
Tested-byRE: [PATCH v9 06/11] arm-smmu-v3/sva: Add SVA domain support
I tested the patch and works as expect.
Tony(zhu, xinzhan)
Cube:SHZ1-3W-279
iNet:8821-5077
-----Original Message-----
From: Baolu Lu <[email protected]>
Sent: Tuesday, June 28, 2022 2:13 PM
To: Zhangfei Gao <[email protected]>; Joerg Roedel <[email protected]>; Jason Gunthorpe <[email protected]>; Christoph Hellwig <[email protected]>; Tian, Kevin <[email protected]>; Raj, Ashok <[email protected]>; Will Deacon <[email protected]>; Robin Murphy <[email protected]>; Jean-Philippe Brucker <[email protected]>; Jiang, Dave <[email protected]>; Vinod Koul <[email protected]>; Zhu, Tony <[email protected]>
Cc: [email protected]; Jean-Philippe Brucker <[email protected]>; [email protected]; [email protected]; [email protected]; Pan, Jacob jun <[email protected]>
Subject: Re: [PATCH v9 06/11] arm-smmu-v3/sva: Add SVA domain support
Quoted 11 lines · Zhangfei Gao
Quoted 5 lines · Lu Baolu
Add support for SVA domain allocation and provide an SVA-specific
iommu_domain_ops.Signed-off-by Lu Baolu <[email protected]>Reviewed-by Jean-Philippe Brucker <[email protected]>series on aarch64.
Tony has been helping to validate this series on Intel's platform.
Tony, can I add your Test-by as well in this series?
Best regards,
baolu
Lu Baolu
maintainerPATCH v9 7/11 iommu/sva: Refactoring iommu_sva_bind/unbind_device()
In reply to Lu BaoluThe existing iommu SVA interfaces are implemented by calling the SVA specific iommu ops provided by the IOMMU drivers. There's no need for any SVA specific ops in iommu_ops vector anymore as we can achieve this through the generic attach/detach_dev_pasid domain ops.
This refactors the IOMMU SVA interfaces implementation by using the set/block_pasid_dev ops and align them with the concept of the SVA iommu domain. Put the new SVA code in the sva related file in order to make it self-contained.
--- include/linux/iommu.h | 67 +++++++++++-------- drivers/iommu/iommu-sva-lib.c | 98 ++++++++++++++++++++++++++++ drivers/iommu/iommu.c | 119 ++++++++-------------------------- 3 files changed, 165 insertions(+), 119 deletions(-)
include/linux/iommu.h +39 -28
@@ -39,7 +39,6 @@ struct device;struct iommu_domain ;struct iommu_domain_ops ;struct notifier_block ; -struct iommu_sva ;struct iommu_fault_event ;struct iommu_dma_cookie ;
@@ -57,6 +56,14 @@ struct iommu_domain_geometry {bool force_aperture;/* DMA only allowed in mappable range? */ }; +/** +* struct iommu_sva - handle to a device-mm bond +*/ +struct iommu_sva { +struct device *dev; +refcount_t users; +}; +/* Domain feature flags */ #define __IOMMU_DOMAIN_PAGING (1U << 0)/* Support for iommu_map/unmap */ #define __IOMMU_DOMAIN_DMA_API (1U << 1)/* Domain for use in DMA-API
@@ -105,6 +112,7 @@ struct iommu_domain { };struct {/* IOMMU_DOMAIN_SVA */ struct mm_struct *mm; +struct iommu_sva bond; }; }; };
@@ -638,13 +646,6 @@ struct iommu_fwspec {/* ATS is supported */ #define IOMMU_FWSPEC_PCI_RC_ATS (1 << 0) -/** -* struct iommu_sva - handle to a device-mm bond -*/ -struct iommu_sva { -struct device *dev; -}; -int iommu_fwspec_init (struct device *dev,struct fwnode_handle *iommu_fwnode,const struct iommu_ops *ops);void iommu_fwspec_free (struct device *dev);
@@ -685,11 +686,6 @@ int iommu_dev_enable_feature(struct device *dev, enum iommu_dev_features f);int iommu_dev_disable_feature (struct device *dev,enum iommu_dev_features f);bool iommu_dev_feature_enabled (struct device *dev,enum iommu_dev_features f); -struct iommu_sva *iommu_sva_bind_device (struct device *dev, -struct mm_struct *mm); -void iommu_sva_unbind_device (struct iommu_sva *handle); -u32 iommu_sva_get_pasid (struct iommu_sva *handle); -int iommu_device_use_default_domain (struct device *dev);void iommu_device_unuse_default_domain (struct device *dev);
@@ -703,6 +699,8 @@ int iommu_attach_device_pasid(struct iommu_domain *domain, struct device *dev, ioasid_t pasid);void iommu_detach_device_pasid (struct iommu_domain *domain,struct device *dev,ioasid_t pasid); +struct iommu_domain * +iommu_get_domain_for_dev_pasid (struct device *dev,ioasid_t pasid);#else /* CONFIG_IOMMU_API */ struct iommu_ops {};
@@ -1033,21 +1031,6 @@ iommu_dev_disable_feature(struct device *dev, enum iommu_dev_features feat)return -ENODEV ; } -static inline struct iommu_sva * -iommu_sva_bind_device (struct device *dev,struct mm_struct *mm) -{ -return NULL ; -} - -static inline void iommu_sva_unbind_device (struct iommu_sva *handle) -{ -} - -static inline u32 iommu_sva_get_pasid (struct iommu_sva *handle) -{ -return IOMMU_PASID_INVALID ; -} -static inline struct iommu_fwspec *dev_iommu_fwspec_get (struct device *dev) {return NULL ;
@@ -1093,6 +1076,12 @@ static inline void iommu_detach_device_pasid(struct iommu_domain *domain, struct device *dev, ioasid_t pasid) { } + +static inline struct iommu_domain * +iommu_get_domain_for_dev_pasid (struct device *dev,ioasid_t pasid) +{ +return NULL ; +}#endif /* CONFIG_IOMMU_API */ /**
@@ -1118,4 +1107,26 @@ void iommu_debugfs_setup(void);static inline void iommu_debugfs_setup (void ) {}#endif +#ifdef CONFIG_IOMMU_SVA +struct iommu_sva *iommu_sva_bind_device (struct device *dev, +struct mm_struct *mm); +void iommu_sva_unbind_device (struct iommu_sva *handle); +u32 iommu_sva_get_pasid (struct iommu_sva *handle); +#else +static inline struct iommu_sva * +iommu_sva_bind_device (struct device *dev,struct mm_struct *mm) +{ +return NULL ; +} + +static inline void iommu_sva_unbind_device (struct iommu_sva *handle) +{ +} + +static inline u32 iommu_sva_get_pasid (struct iommu_sva *handle) +{ +return IOMMU_PASID_INVALID ; +} +#endif /* CONFIG_IOMMU_SVA */ +#endif /* __LINUX_IOMMU_H */
drivers/iommu/iommu-sva-lib.c +98 -0
107 lines not on this page · raw message
drivers/iommu/iommu.c +28 -91
128 lines not on this page · raw message
Signature · 1 line
2.25.1
RE: [PATCH v9 07/11] iommu/sva: Refactoring iommu_sva_bind/unbind_device()
drivers/iommu/iommu-sva-lib.c struct mm_struct *iommu_sva_find(ioasid_t pasid) · line 95
Quoted 10 lines
From: Lu Baolu <[email protected]>
Sent: Tuesday, June 21, 2022 10:44 PM
+structiommu_sva*iommu_sva_bind_device(struct device *dev, structmm_struct*mm)drivers/iommu/iommu-sva-lib.c +6
-0+{ +struct iommu_domain *domain; +ioasid_t max_pasids; +int ret = -EINVAL ; + +/* Allocate mm->pasid if necessary. */
this comment is for iommu_sva_alloc_pasid()
Quoted 8 lines
drivers/iommu/iommu-sva-lib.c +8
-0+ max_pasids = dev->iommu->max_pasids; +if (!max_pasids) +return ERR_PTR (-EOPNOTSUPP ); + + ret =iommu_sva_alloc_pasid (mm,1 , max_pasids -1 ); +if (ret) +return ERR_PTR (ret); +
...
Quoted 14 lines
drivers/iommu/iommu-sva-lib.c +14
-0+void iommu_sva_unbind_device (struct iommu_sva *handle) +{ +struct device *dev = handle->dev; +struct iommu_domain *domain = + container_of(handle, struct iommu_domain, bond); +ioasid_t pasid =iommu_sva_get_pasid (handle); + +mutex_lock (&iommu_sva_lock); +if (refcount_dec_and_test (&domain->bond.users)) { +iommu_detach_device_pasid (domain, dev, pasid); +iommu_domain_free (domain); + } +mutex_unlock (&iommu_sva_lock); +}
drivers/iommu/iommu-sva-lib.c struct mm_struct *iommu_sva_find(ioasid_t pasid) · line 169
Quoted 10 lines
drivers/iommu/iommu-sva-lib.c +10
-0+EXPORT_SYMBOL_GPL (iommu_sva_unbind_device); + +u32 iommu_sva_get_pasid (struct iommu_sva *handle) +{ +struct iommu_domain *domain = + container_of(handle, struct iommu_domain, bond); + +return domain->mm->pasid; +} +EXPORT_SYMBOL_GPL (iommu_sva_get_pasid);
Looks this is only used by unbind_device. Just open code it.
Baolu Lu
maintainerRe: [PATCH v9 07/11] iommu/sva: Refactoring iommu_sva_bind/unbind_device()
Quoted 4 lines · Kevin
Quoted 4 lines
From: Lu Baolu <[email protected]>
Sent: Tuesday, June 21, 2022 10:44 PM
+structiommu_sva*iommu_sva_bind_device(struct device *dev, structmm_struct*mm)
Quoted 8 lines
drivers/iommu/iommu-sva-lib.c struct mm_struct *iommu_sva_find(ioasid_t pasid) · line 95
Quoted 6 lines
drivers/iommu/iommu-sva-lib.c +6
-0+{ +struct iommu_domain *domain; +ioasid_t max_pasids; +int ret = -EINVAL ; + +/* Allocate mm->pasid if necessary. */ this comment is for
iommu_sva_alloc_pasid()
Updated.
Quoted 30 lines
Quoted 9 lines
drivers/iommu/iommu-sva-lib.c +8
-0+ max_pasids = dev->iommu->max_pasids; +if (!max_pasids) +return ERR_PTR (-EOPNOTSUPP ); + + ret =iommu_sva_alloc_pasid (mm,1 , max_pasids -1 ); +if (ret) +return ERR_PTR (ret); +...
Quoted 18 lines
drivers/iommu/iommu-sva-lib.c +18
-0+void iommu_sva_unbind_device (struct iommu_sva *handle) +{ +struct device *dev = handle->dev; +struct iommu_domain *domain = + container_of(handle, struct iommu_domain, bond); +ioasid_t pasid =iommu_sva_get_pasid (handle); + +mutex_lock (&iommu_sva_lock); +if (refcount_dec_and_test (&domain->bond.users)) { +iommu_detach_device_pasid (domain, dev, pasid); +iommu_domain_free (domain); + } +mutex_unlock (&iommu_sva_lock); +} +EXPORT_SYMBOL_GPL (iommu_sva_unbind_device); + +u32 iommu_sva_get_pasid (struct iommu_sva *handle) +{
Quoted 8 lines
drivers/iommu/iommu-sva-lib.c struct mm_struct *iommu_sva_find(ioasid_t pasid) · line 169
Quoted 6 lines
drivers/iommu/iommu-sva-lib.c +6
-0+struct iommu_domain *domain = + container_of(handle, struct iommu_domain, bond); + +return domain->mm->pasid; +} +EXPORT_SYMBOL_GPL (iommu_sva_get_pasid);Looks this is only used by
unbind_device. Just open code it.
It's part of current IOMMU/SVA interfaces for the device drivers, and has been used in various drivers.
$ git grep iommu_sva_get_pasid drivers/dma/idxd/cdev.c: pasid = iommu_sva_get_pasid(sva); drivers/iommu/iommu-sva-lib.c: ioasid_t pasid = iommu_sva_get_pasid(handle); drivers/iommu/iommu-sva-lib.c:u32 iommu_sva_get_pasid(struct iommu_sva *handle) drivers/iommu/iommu-sva-lib.c:EXPORT_SYMBOL_GPL(iommu_sva_get_pasid); drivers/misc/uacce/uacce.c: pasid = iommu_sva_get_pasid(handle); include/linux/iommu.h:u32 iommu_sva_get_pasid(struct iommu_sva *handle); include/linux/iommu.h:static inline u32 iommu_sva_get_pasid(struct iommu_sva *handle)
Or, I missed anything?
Best regards,
baolu
RE: [PATCH v9 07/11] iommu/sva: Refactoring iommu_sva_bind/unbind_device()
Quoted 31 lines
From: Baolu Lu <[email protected]>
Sent: Tuesday, June 28, 2022 1:54 PMQuoted 10 lines
drivers/iommu/iommu-sva-lib.c struct mm_struct *iommu_sva_find(ioasid_t pasid) · line 169
Quoted 8 lines
drivers/iommu/iommu-sva-lib.c +8
-0+u32 iommu_sva_get_pasid (struct iommu_sva *handle) +{ +struct iommu_domain *domain = + container_of(handle, struct iommu_domain, bond); + +return domain->mm->pasid; +} +EXPORT_SYMBOL_GPL (iommu_sva_get_pasid);Looks this is only used by
unbind_device. Just open code it.It's part of current IOMMU/SVA interfaces for the device drivers, and has been used in various drivers.
$ git grep iommu_sva_get_pasid drivers/dma/idxd/cdev.c: pasid = iommu_sva_get_pasid(sva); drivers/iommu/iommu-sva-lib.c: ioasid_t pasid = iommu_sva_get_pasid(handle); drivers/iommu/iommu-sva-lib.c:u32 iommu_sva_get_pasid(struct iommu_sva *handle) drivers/iommu/iommu-sva- lib.c:EXPORT_SYMBOL_GPL(iommu_sva_get_pasid); drivers/misc/uacce/uacce.c: pasid = iommu_sva_get_pasid(handle); include/linux/iommu.h:u32 iommu_sva_get_pasid(struct iommu_sva *handle); include/linux/iommu.h:static inline u32 iommu_sva_get_pasid(struct iommu_sva *handle)
Quoted 2 lines
Or, I missed anything?
Forget it. I thought it's a new function introduced in this series. :/
Lu Baolu
maintainerPATCH v9 8/11 iommu: Remove SVA related callbacks from iommu ops
In reply to Lu BaoluThese ops'es have been replaced with the dev_attach/detach_pasid domain ops'es. There's no need for them anymore. Remove them to avoid dead code.
--- include/linux/intel-iommu.h | 3 -- include/linux/iommu.h | 7 --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 16 ------ .../iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 40 --------------- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 3 -- drivers/iommu/intel/iommu.c | 3 -- drivers/iommu/intel/svm.c | 49 ------------------- 7 files changed, 121 deletions(-)
include/linux/intel-iommu.h +0 -3
@@ -738,9 +738,6 @@ struct intel_iommu *device_to_iommu(struct device *dev, u8 *bus, u8 *devfn);extern void intel_svm_check (struct intel_iommu *iommu);extern int intel_svm_enable_prq (struct intel_iommu *iommu);extern int intel_svm_finish_prq (struct intel_iommu *iommu); -struct iommu_sva *intel_svm_bind (struct device *dev,struct mm_struct *mm); -void intel_svm_unbind (struct iommu_sva *handle); -u32 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 iommu_domain *intel_svm_domain_alloc (void );
include/linux/iommu.h +0 -7
@@ -227,9 +227,6 @@ struct iommu_iotlb_gather {* @dev_has/enable/disable_feat: per device entries to check/enable/disable * iommu specific features. * @dev_feat_enabled: check enabled feature -* @sva_bind: Bind process address space to device -* @sva_unbind: Unbind process address space from device -* @sva_get_pasid: Get PASID associated to a SVA handle * @page_response: handle page request response * @def_domain_type: device default domain type, return value: * - IOMMU_DOMAIN_IDENTITY: must use an identity domain
@@ -263,10 +260,6 @@ struct iommu_ops {int (*dev_enable_feat)(struct device *dev,enum iommu_dev_features f);int (*dev_disable_feat)(struct device *dev,enum iommu_dev_features f); -struct iommu_sva *(*sva_bind)(struct device *dev,struct mm_struct *mm); -void (*sva_unbind)(struct iommu_sva *handle); -u32 (*sva_get_pasid)(struct iommu_sva *handle); -int (*page_response)(struct device *dev,struct iommu_fault_event *evt,struct iommu_page_response *msg);
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h +0 -16
@@ -754,9 +754,6 @@ bool arm_smmu_master_sva_enabled(struct arm_smmu_master *master);int arm_smmu_master_enable_sva (struct arm_smmu_master *master);int arm_smmu_master_disable_sva (struct arm_smmu_master *master);bool arm_smmu_master_iopf_supported (struct arm_smmu_master *master); -struct iommu_sva *arm_smmu_sva_bind (struct device *dev,struct mm_struct *mm); -void arm_smmu_sva_unbind (struct iommu_sva *handle); -u32 arm_smmu_sva_get_pasid (struct iommu_sva *handle);void arm_smmu_sva_notifier_synchronize (void );struct iommu_domain *arm_smmu_sva_domain_alloc (void );#else /* CONFIG_ARM_SMMU_V3_SVA */
@@ -790,19 +787,6 @@ static inline bool arm_smmu_master_iopf_supported(struct arm_smmu_master *masterreturn false; } -static inline struct iommu_sva * -arm_smmu_sva_bind (struct device *dev,struct mm_struct *mm) -{ -return ERR_PTR (-ENODEV ); -} - -static inline void arm_smmu_sva_unbind (struct iommu_sva *handle) {} - -static inline u32 arm_smmu_sva_get_pasid (struct iommu_sva *handle) -{ -return IOMMU_PASID_INVALID ; -} -static inline void arm_smmu_sva_notifier_synchronize (void ) {}static inline struct iommu_domain *arm_smmu_sva_domain_alloc (void )
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c +0 -40
@@ -344,11 +344,6 @@ __arm_smmu_sva_bind(struct device *dev, struct mm_struct *mm)if (!bond)return ERR_PTR (-ENOMEM ); -/* Allocate a PASID for this mm if necessary */ - ret =iommu_sva_alloc_pasid (mm,1 , (1U << master->ssid_bits) -1 ); -if (ret) - goto err_free_bond; - bond->mm = mm; bond->sva.dev = dev;refcount_set (&bond->refs,1 );
@@ -367,41 +362,6 @@ __arm_smmu_sva_bind(struct device *dev, struct mm_struct *mm)return ERR_PTR (ret); } -struct iommu_sva *arm_smmu_sva_bind (struct device *dev,struct mm_struct *mm) -{ -struct iommu_sva *handle; -struct iommu_domain *domain =iommu_get_domain_for_dev (dev); -struct arm_smmu_domain *smmu_domain =to_smmu_domain (domain); - -if (smmu_domain->stage !=ARM_SMMU_DOMAIN_S1 ) -return ERR_PTR (-EINVAL ); - -mutex_lock (&sva_lock); - handle =__arm_smmu_sva_bind (dev, mm); -mutex_unlock (&sva_lock); -return handle; -} - -void arm_smmu_sva_unbind (struct iommu_sva *handle) -{ -struct arm_smmu_bond *bond =sva_to_bond (handle); - -mutex_lock (&sva_lock); -if (refcount_dec_and_test (&bond->refs)) { -list_del (&bond->list); -arm_smmu_mmu_notifier_put (bond->smmu_mn); -kfree (bond); - } -mutex_unlock (&sva_lock); -} - -u32 arm_smmu_sva_get_pasid (struct iommu_sva *handle) -{ -struct arm_smmu_bond *bond =sva_to_bond (handle); - -return bond->mm->pasid; -} -bool arm_smmu_sva_supported (struct arm_smmu_device *smmu) {unsigned long reg, fld;
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +0 -3
@@ -2855,9 +2855,6 @@ static struct iommu_ops arm_smmu_ops = { .dev_feat_enabled = arm_smmu_dev_feature_enabled, .dev_enable_feat = arm_smmu_dev_enable_feature, .dev_disable_feat = arm_smmu_dev_disable_feature, - .sva_bind = arm_smmu_sva_bind, - .sva_unbind = arm_smmu_sva_unbind, - .sva_get_pasid = arm_smmu_sva_get_pasid, .page_response = arm_smmu_page_response, .pgsize_bitmap = -1UL, /* Restricted during device attach */ .owner = THIS_MODULE,
drivers/iommu/intel/iommu.c +0 -3
@@ -4921,9 +4921,6 @@ const struct iommu_ops intel_iommu_ops = { .def_domain_type = device_def_domain_type, .pgsize_bitmap =SZ_4K , #ifdef CONFIG_INTEL_IOMMU_SVM - .sva_bind = intel_svm_bind, - .sva_unbind = intel_svm_unbind, - .sva_get_pasid = intel_svm_get_pasid, .page_response = intel_svm_page_response, #endif .default_domain_ops = &(const struct iommu_domain_ops ) {
drivers/iommu/intel/svm.c +0 -49
61 lines not on this page · raw message
Signature · 1 line
2.25.1
Lu Baolu
maintainerPATCH v9 9/11 iommu: Prepare IOMMU domain for IOPF
In reply to Lu BaoluThis adds some mechanisms around the iommu_domain so that the I/O page fault handling framework could route a page fault to the domain and call the fault handler from it.
Add pointers to the page fault handler and its private data in struct iommu_domain. The fault handler will be called with the private data as a parameter once a page fault is routed to the domain. Any kernel component which owns an iommu domain could install handler and its private parameter so that the page fault could be further routed and handled.
This also prepares the SVA implementation to be the first consumer of the per-domain page fault handling model. The I/O page fault handler for SVA is copied to the SVA file with mmget_not_zero() added before mmap_read_lock().
--- include/linux/iommu.h | 3 ++ drivers/iommu/iommu-sva-lib.h | 8 +++++ drivers/iommu/io-pgfault.c | 7 ++++ drivers/iommu/iommu-sva-lib.c | 60 +++++++++++++++++++++++++++++++++++ drivers/iommu/iommu.c | 4 +++ 5 files changed, 82 insertions(+)
include/linux/iommu.h +3 -0
@@ -105,6 +105,9 @@ struct iommu_domain {unsigned long pgsize_bitmap;/* Bitmap of page sizes in use */ struct iommu_domain_geometry geometry;struct iommu_dma_cookie *iova_cookie; +enum iommu_page_response_code (*iopf_handler)(struct iommu_fault *fault, +void *data); +void *fault_data; union { struct { /* IOMMU_DOMAIN_DMA */ iommu_fault_handler_t handler;
drivers/iommu/iommu-sva-lib.h +8 -0
@@ -26,6 +26,8 @@ int iopf_queue_flush_dev(struct device *dev);struct iopf_queue *iopf_queue_alloc (const char *name);void iopf_queue_free (struct iopf_queue *queue);int iopf_queue_discard_partial (struct iopf_queue *queue); +enum iommu_page_response_code +iommu_sva_handle_iopf (struct iommu_fault *fault,void *data);#else /* CONFIG_IOMMU_SVA */ static inline int iommu_queue_iopf (struct iommu_fault *fault,void *cookie)
@@ -63,5 +65,11 @@ static inline int iopf_queue_discard_partial(struct iopf_queue *queue) {return -ENODEV ; } + +static inline enum iommu_page_response_code +iommu_sva_handle_iopf (struct iommu_fault *fault,void *data) +{ +return IOMMU_PAGE_RESP_INVALID ; +}#endif /* CONFIG_IOMMU_SVA */ #endif /* _IOMMU_SVA_LIB_H */
drivers/iommu/io-pgfault.c +7 -0
@@ -181,6 +181,13 @@ static void iopf_handle_group(struct work_struct *work)* request completes, outstanding faults will have been dealt with by the time * the PASID is freed. * +* Any valid page fault will be eventually routed to an iommu domain and the +* page fault handler installed there will get called. The users of this +* handling framework should guarantee that the iommu domain could only be +* freed after the device has stopped generating page faults (or the iommu +* hardware has been set to block the page faults) and the pending page faults +* have been flushed. +* * Return: 0 on success and <0 on error. */ int iommu_queue_iopf (struct iommu_fault *fault,void *cookie)
drivers/iommu/iommu-sva-lib.c +60 -0
63 lines not on this page · raw message
drivers/iommu/iommu.c +4 -0
@@ -29,6 +29,8 @@#include <trace/events/iommu.h> #include <linux/sched/mm.h> +#include "iommu-sva-lib.h" +static struct kset *iommu_group_kset;static DEFINE_IDA (iommu_group_ida);
@@ -3199,6 +3201,8 @@ struct iommu_domain *iommu_sva_domain_alloc(struct device *dev, domain->type =IOMMU_DOMAIN_SVA ;mmgrab (mm); domain->mm = mm; + domain->iopf_handler = iommu_sva_handle_iopf; + domain->fault_data = domain;return domain; }
Signature · 1 line
2.25.1
RE: [PATCH v9 09/11] iommu: Prepare IOMMU domain for IOPF
Quoted 17 lines
From: Lu Baolu <[email protected]>
Sent: Tuesday, June 21, 2022 10:44 PMdrivers/iommu/iommu-sva-lib.c +14
-0+/* +* I/O page fault handler for SVA +*/ +enum iommu_page_response_code +iommu_sva_handle_iopf (struct iommu_fault *fault,void *data) +{ +vm_fault_t ret; +struct mm_struct *mm; +struct vm_area_struct *vma; +unsigned int access_flags =0 ; +struct iommu_domain *domain = data; +unsigned int fault_flags =FAULT_FLAG_REMOTE ; +struct iommu_fault_page_request *prm = &fault->prm; + enum iommu_page_response_code status =
IOMMU_PAGE_RESP_INVALID;
drivers/iommu/iommu-sva-lib.c u32 iommu_sva_get_pasid(struct iommu_sva *handle) · line 189
Quoted 5 lines
drivers/iommu/iommu-sva-lib.c +5
-0+ +if (!(prm->flags &IOMMU_FAULT_PAGE_REQUEST_PASID_VALID )) +return status; + + mm = domain->mm;
What about directly passing domain->mm in as the fault data?
The entire logic here is only about mm instead of domain.
Baolu Lu
maintainerRe: [PATCH v9 09/11] iommu: Prepare IOMMU domain for IOPF
Quoted 25 lines · Kevin
Quoted 17 lines
From: Lu Baolu <[email protected]>
Sent: Tuesday, June 21, 2022 10:44 PMdrivers/iommu/iommu-sva-lib.c +14
-0+/* +* I/O page fault handler for SVA +*/ +enum iommu_page_response_code +iommu_sva_handle_iopf (struct iommu_fault *fault,void *data) +{ +vm_fault_t ret; +struct mm_struct *mm; +struct vm_area_struct *vma; +unsigned int access_flags =0 ; +struct iommu_domain *domain = data; +unsigned int fault_flags =FAULT_FLAG_REMOTE ; +struct iommu_fault_page_request *prm = &fault->prm; + enum iommu_page_response_code status =
IOMMU_PAGE_RESP_INVALID;drivers/iommu/iommu-sva-lib.c u32 iommu_sva_get_pasid(struct iommu_sva *handle) · line 189
Quoted 5 lines
drivers/iommu/iommu-sva-lib.c +5
-0+ +if (!(prm->flags &IOMMU_FAULT_PAGE_REQUEST_PASID_VALID )) +return status; + + mm = domain->mm;What about directly passing
domain->mmin as the fault data?
Quoted 1 line
The entire logic here is only about mm instead of domain.
Yes. Updated.
Best regards,
baolu
Lu Baolu
maintainerPATCH v9 10/11 iommu: Per-domain I/O page fault handling
In reply to Lu BaoluTweak the I/O page fault handling framework to route the page faults to the domain and call the page fault handler retrieved from the domain. This makes the I/O page fault handling framework possible to serve more usage scenarios as long as they have an IOMMU domain and install a page fault handler in it. Some unused functions are also removed to avoid dead code.
The iommu_get_domain_for_dev_pasid() which retrieves attached domain for a {device, PASID} pair is used. It will be used by the page fault handling framework which knows {device, PASID} reported from the iommu driver. We have a guarantee that the SVA domain doesn't go away during IOPF handling, because unbind() waits for pending faults with iopf_queue_flush_dev() before freeing the domain. Hence, there's no need to synchronize life cycle of the iommu domains between the unbind() and the interrupt threads.
--- drivers/iommu/io-pgfault.c | 64 +++++--------------------------------- 1 file changed, 7 insertions(+), 57 deletions(-)
drivers/iommu/io-pgfault.c +7 -57
@@ -69,69 +69,18 @@ static int iopf_complete_group(struct device *dev, struct iopf_fault *iopf,return iommu_page_response (dev, &resp); } -static enum iommu_page_response_code -iopf_handle_single (struct iopf_fault *iopf) -{ -vm_fault_t ret; -struct mm_struct *mm; -struct vm_area_struct *vma; -unsigned int access_flags =0 ; -unsigned int fault_flags =FAULT_FLAG_REMOTE ; -struct iommu_fault_page_request *prm = &iopf->fault.prm; -enum iommu_page_response_code status =IOMMU_PAGE_RESP_INVALID ; - -if (!(prm->flags &IOMMU_FAULT_PAGE_REQUEST_PASID_VALID )) -return status; - - mm =iommu_sva_find (prm->pasid); -if (IS_ERR_OR_NULL (mm)) -return status; - -mmap_read_lock (mm); - - vma =find_extend_vma (mm, prm->addr); -if (!vma) -/* Unmapped area */ - goto out_put_mm; - -if (prm->perm &IOMMU_FAULT_PERM_READ ) - access_flags |=VM_READ ; - -if (prm->perm &IOMMU_FAULT_PERM_WRITE ) { - access_flags |=VM_WRITE ; - fault_flags |=FAULT_FLAG_WRITE ; - } - -if (prm->perm &IOMMU_FAULT_PERM_EXEC ) { - access_flags |=VM_EXEC ; - fault_flags |=FAULT_FLAG_INSTRUCTION ; - } - -if (!(prm->perm &IOMMU_FAULT_PERM_PRIV )) - fault_flags |=FAULT_FLAG_USER ; - -if (access_flags & ~vma->vm_flags) -/* Access fault */ - goto out_put_mm; - - ret =handle_mm_fault (vma, prm->addr, fault_flags,NULL ); - status = ret &VM_FAULT_ERROR ?IOMMU_PAGE_RESP_INVALID : -IOMMU_PAGE_RESP_SUCCESS ; - -out_put_mm: -mmap_read_unlock (mm); -mmput (mm); - -return status; -} -static void iopf_handle_group (struct work_struct *work) {struct iopf_group *group; +struct iommu_domain *domain;struct iopf_fault *iopf, *next;enum iommu_page_response_code status =IOMMU_PAGE_RESP_SUCCESS ; group = container_of(work, struct iopf_group, work); + domain =iommu_get_domain_for_dev_pasid (group->dev, + group->last_fault.fault.prm.pasid); +if (!domain || !domain->iopf_handler) + status =IOMMU_PAGE_RESP_INVALID ;list_for_each_entry_safe (iopf, next, &group->faults, list) {/*
@@ -139,7 +88,8 @@ static void iopf_handle_group(struct work_struct *work)* faults in the group if there is an error. */ if (status ==IOMMU_PAGE_RESP_SUCCESS ) - status =iopf_handle_single (iopf); + status = domain->iopf_handler (&iopf->fault, + domain->fault_data);if (!(iopf->fault.prm.flags &IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE ))
Signature · 1 line
2.25.1
Re: [PATCH v9 10/11] iommu: Per-domain I/O page fault handling
Hi,
Quoted 76 lines · Lu Baolu
Tweak the I/O page fault handling framework to route the page faults to the domain and call the page fault handler retrieved from the domain. This makes the I/O page fault handling framework possible to serve more usage scenarios as long as they have an IOMMU domain and install a page fault handler in it. Some unused functions are also removed to avoid dead code.
The
iommu_get_domain_for_dev_pasid()which retrieves attached domain for a {device, PASID} pair is used. It will be used by the page fault handling framework which knows {device, PASID} reported from the iommu driver. We have a guarantee that the SVA domain doesn't go away during IOPF handling, becauseunbind()waits for pending faults withiopf_queue_flush_dev()before freeing the domain. Hence, there's no need to synchronize life cycle of the iommu domains between theunbind()and the interrupt threads.Signed-off-by Lu Baolu <[email protected]>Reviewed-by Jean-Philippe Brucker <[email protected]>--- drivers/iommu/io-pgfault.c | 64 +++++--------------------------------- 1 file changed, 7 insertions(+), 57 deletions(-)drivers/iommu/io-pgfault.c +0
-46@@ -69,69 +69,18 @@ static int iopf_complete_group(struct device *dev, struct iopf_fault *iopf,return iommu_page_response (dev, &resp); } -static enum iommu_page_response_code -iopf_handle_single (struct iopf_fault *iopf) -{ -vm_fault_t ret; -struct mm_struct *mm; -struct vm_area_struct *vma; -unsigned int access_flags =0 ; -unsigned int fault_flags =FAULT_FLAG_REMOTE ; -struct iommu_fault_page_request *prm = &iopf->fault.prm; -enum iommu_page_response_code status =IOMMU_PAGE_RESP_INVALID ; - -if (!(prm->flags &IOMMU_FAULT_PAGE_REQUEST_PASID_VALID )) -return status; - - mm =iommu_sva_find (prm->pasid); -if (IS_ERR_OR_NULL (mm)) -return status; - -mmap_read_lock (mm); - - vma =find_extend_vma (mm, prm->addr); -if (!vma) -/* Unmapped area */ - goto out_put_mm; - -if (prm->perm &IOMMU_FAULT_PERM_READ ) - access_flags |=VM_READ ; - -if (prm->perm &IOMMU_FAULT_PERM_WRITE ) { - access_flags |=VM_WRITE ; - fault_flags |=FAULT_FLAG_WRITE ; - } - -if (prm->perm &IOMMU_FAULT_PERM_EXEC ) { - access_flags |=VM_EXEC ; - fault_flags |=FAULT_FLAG_INSTRUCTION ; - } - -if (!(prm->perm &IOMMU_FAULT_PERM_PRIV )) - fault_flags |=FAULT_FLAG_USER ; - -if (access_flags & ~vma->vm_flags) -/* Access fault */ - goto out_put_mm; - - ret =handle_mm_fault (vma, prm->addr, fault_flags,NULL );
drivers/iommu/io-pgfault.c static int iopf_complete_group(struct device *dev, struct iopf_fault *iopf, · line 127
Quoted 10 lines
drivers/iommu/io-pgfault.c +0
-10- status = ret &VM_FAULT_ERROR ?IOMMU_PAGE_RESP_INVALID : -IOMMU_PAGE_RESP_SUCCESS ; - -out_put_mm: -mmap_read_unlock (mm); -mmput (mm); - -return status; -} -
Once the iopf_handle_single() is removed, the name of iopf_handle_group() looks a little weired
and confused, does this group mean the iommu group (domain) ? while I take some minutes to
look into the code, oh, means a batch / list / queue of iopfs , and iopf_handle_group() becomes a
generic iopf_handler() .
Doe it make sense to revise the names of iopf_handle_group(), iopf_complete_group, iopf_group in
this patch set ?
Thanks,
Ethan
Quoted 25 lines
drivers/iommu/io-pgfault.c +7
-1static void iopf_handle_group (struct work_struct *work) {struct iopf_group *group; +struct iommu_domain *domain;struct iopf_fault *iopf, *next;enum iommu_page_response_code status =IOMMU_PAGE_RESP_SUCCESS ; group = container_of(work, struct iopf_group, work); + domain =iommu_get_domain_for_dev_pasid (group->dev, + group->last_fault.fault.prm.pasid); +if (!domain || !domain->iopf_handler) + status =IOMMU_PAGE_RESP_INVALID ;list_for_each_entry_safe (iopf, next, &group->faults, list) {/* @@ -139,7 +88,8 @@ static void iopf_handle_group(struct work_struct *work)* faults in the group if there is an error. */ if (status ==IOMMU_PAGE_RESP_SUCCESS ) - status =iopf_handle_single (iopf); + status = domain->iopf_handler (&iopf->fault, + domain->fault_data);if (!(iopf->fault.prm.flags &IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE ))
Signature · 1 line
"firm, enduring, strong, and long-lived"
Baolu Lu
maintainerRe: [PATCH v9 10/11] iommu: Per-domain I/O page fault handling
Hi Ethan,
Quoted 92 lines · Ethan Zhao
Hi,
Quoted 76 lines · Lu Baolu
Tweak the I/O page fault handling framework to route the page faults to the domain and call the page fault handler retrieved from the domain. This makes the I/O page fault handling framework possible to serve more usage scenarios as long as they have an IOMMU domain and install a page fault handler in it. Some unused functions are also removed to avoid dead code.
The
iommu_get_domain_for_dev_pasid()which retrieves attached domain for a {device, PASID} pair is used. It will be used by the page fault handling framework which knows {device, PASID} reported from the iommu driver. We have a guarantee that the SVA domain doesn't go away during IOPF handling, becauseunbind()waits for pending faults withiopf_queue_flush_dev()before freeing the domain. Hence, there's no need to synchronize life cycle of the iommu domains between theunbind()and the interrupt threads.Signed-off-by Lu Baolu <[email protected]>Reviewed-by Jean-Philippe Brucker <[email protected]>---
drivers/iommu/io-pgfault.c| 64 +++++---------------------------------1 file changed, 7 insertions(+), 57 deletions(-)drivers/iommu/io-pgfault.c +0
-46@@ -69,69 +69,18 @@ static int iopf_complete_group(struct device *dev,struct iopf_fault *iopf, return iommu_page_response(dev, &resp); } -static enum iommu_page_response_code -iopf_handle_single (struct iopf_fault *iopf) -{ - vm_fault_t ret; - struct mm_struct *mm; - struct vm_area_struct *vma; - unsigned int access_flags = 0; - unsigned int fault_flags = FAULT_FLAG_REMOTE; - struct iommu_fault_page_request *prm = &iopf->fault.prm; - enum iommu_page_response_code status = IOMMU_PAGE_RESP_INVALID; - - if (!(prm->flags & IOMMU_FAULT_PAGE_REQUEST_PASID_VALID)) - return status; - - mm = iommu_sva_find(prm->pasid); - if (IS_ERR_OR_NULL(mm)) - return status; - - mmap_read_lock(mm); - - vma = find_extend_vma(mm, prm->addr); - if (!vma) - /* Unmapped area */ - goto out_put_mm; - - if (prm->perm & IOMMU_FAULT_PERM_READ) - access_flags |= VM_READ; - - if (prm->perm & IOMMU_FAULT_PERM_WRITE) { - access_flags |= VM_WRITE; - fault_flags |= FAULT_FLAG_WRITE; - } - - if (prm->perm & IOMMU_FAULT_PERM_EXEC) { - access_flags |= VM_EXEC; - fault_flags |= FAULT_FLAG_INSTRUCTION; - } - - if (!(prm->perm & IOMMU_FAULT_PERM_PRIV)) - fault_flags |= FAULT_FLAG_USER; - - if (access_flags & ~vma->vm_flags) - /* Access fault */ - goto out_put_mm; - - ret = handle_mm_fault(vma, prm->addr, fault_flags, NULL);drivers/iommu/io-pgfault.c static int iopf_complete_group(struct device *dev, · line 127
Quoted 10 lines
drivers/iommu/io-pgfault.c +0
-10- status = ret & VM_FAULT_ERROR ? IOMMU_PAGE_RESP_INVALID : - IOMMU_PAGE_RESP_SUCCESS; - -out_put_mm: - mmap_read_unlock(mm); - mmput(mm); - - return status; -} -Once the
iopf_handle_single()is removed, the name ofiopf_handle_group()looks a little weired
Quoted 1 line
and confused, does this group mean the iommu group (domain) ? while I take some minutes to
No. This is not the iommu group. It's page request group defined by the PCI SIG spec. Multiple page requests could be put in a group with a same group id. All page requests in a group could be responded to device in one shot.
Best regards,
baolu
Quoted 38 lines
look into the code, oh, means a batch / list / queue of iopfs , and
iopf_handle_group()becomes ageneric
iopf_handler().Doe it make sense to revise the names of
iopf_handle_group(), iopf_complete_group,iopf_groupinthis patch set ?
Thanks,
Ethan
Quoted 23 lines
drivers/iommu/io-pgfault.c +7
-1static void iopf_handle_group(struct work_struct *work) { struct iopf_group *group; + struct iommu_domain *domain; struct iopf_fault *iopf, *next; enum iommu_page_response_code status = IOMMU_PAGE_RESP_SUCCESS; group = container_of(work, struct iopf_group, work); + domain = iommu_get_domain_for_dev_pasid(group->dev, + group->last_fault.fault.prm.pasid); + if (!domain || !domain->iopf_handler) + status = IOMMU_PAGE_RESP_INVALID; list_for_each_entry_safe(iopf, next, &group->faults, list) { /*@@ -139,7 +88,8 @@ static void iopf_handle_group(struct work_struct*work) * faults in the group if there is an error. */ if (status == IOMMU_PAGE_RESP_SUCCESS) - status = iopf_handle_single(iopf); + status = domain->iopf_handler(&iopf->fault, + domain->fault_data);if (!(iopf->fault.prm.flags &
IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE))
Re: [PATCH v9 10/11] iommu: Per-domain I/O page fault handling
Hi, Baolu
Quoted 96 lines · Baolu Lu
Hi Ethan,
Quoted 93 lines · Ethan Zhao
Hi,
Quoted 77 lines · Lu Baolu
Tweak the I/O page fault handling framework to route the page faults to the domain and call the page fault handler retrieved from the domain. This makes the I/O page fault handling framework possible to serve more usage scenarios as long as they have an IOMMU domain and install a page fault handler in it. Some unused functions are also removed to avoid dead code.
The
iommu_get_domain_for_dev_pasid()which retrieves attached domain for a {device, PASID} pair is used. It will be used by the page fault handling framework which knows {device, PASID} reported from the iommu driver. We have a guarantee that the SVA domain doesn't go away during IOPF handling, becauseunbind()waits for pending faults withiopf_queue_flush_dev()before freeing the domain. Hence, there's no need to synchronize life cycle of the iommu domains between theunbind()and the interrupt threads.Signed-off-by Lu Baolu <[email protected]>Reviewed-by Jean-Philippe Brucker <[email protected]>---
drivers/iommu/io-pgfault.c| 64
+++++---------------------------------1 file changed, 7 insertions(+), 57 deletions(-)drivers/iommu/io-pgfault.c +0
-46@@ -69,69 +69,18 @@ static int iopf_complete_group(struct device *dev, struct iopf_fault *iopf, return iommu_page_response(dev, &resp); } -static enum iommu_page_response_code -iopf_handle_single (struct iopf_fault *iopf) -{ - vm_fault_t ret; - struct mm_struct *mm; - struct vm_area_struct *vma; - unsigned int access_flags = 0; - unsigned int fault_flags = FAULT_FLAG_REMOTE; - struct iommu_fault_page_request *prm = &iopf->fault.prm; - enum iommu_page_response_code status = IOMMU_PAGE_RESP_INVALID; - - if (!(prm->flags & IOMMU_FAULT_PAGE_REQUEST_PASID_VALID)) - return status; - - mm = iommu_sva_find(prm->pasid); - if (IS_ERR_OR_NULL(mm)) - return status; - - mmap_read_lock(mm); - - vma = find_extend_vma(mm, prm->addr); - if (!vma) - /* Unmapped area */ - goto out_put_mm; - - if (prm->perm & IOMMU_FAULT_PERM_READ) - access_flags |= VM_READ; - - if (prm->perm & IOMMU_FAULT_PERM_WRITE) { - access_flags |= VM_WRITE; - fault_flags |= FAULT_FLAG_WRITE; - } - - if (prm->perm & IOMMU_FAULT_PERM_EXEC) { - access_flags |= VM_EXEC; - fault_flags |= FAULT_FLAG_INSTRUCTION; - } - - if (!(prm->perm & IOMMU_FAULT_PERM_PRIV)) - fault_flags |= FAULT_FLAG_USER; - - if (access_flags & ~vma->vm_flags) - /* Access fault */ - goto out_put_mm; - - ret = handle_mm_fault(vma, prm->addr, fault_flags, NULL);drivers/iommu/io-pgfault.c static int iopf_complete_group(struct device · line 127
Quoted 10 lines
drivers/iommu/io-pgfault.c +0
-10- status = ret & VM_FAULT_ERROR ? IOMMU_PAGE_RESP_INVALID : - IOMMU_PAGE_RESP_SUCCESS; - -out_put_mm: - mmap_read_unlock(mm); - mmput(mm); - - return status; -} -Once the
iopf_handle_single()is removed, the name ofiopf_handle_group()looks a little weired
Quoted 6 lines
Quoted 1 line
and confused, does this group mean the iommu group (domain) ? while I take some minutes to
No. This is not the iommu group. It's page request group defined by the PCI SIG spec. Multiple page requests could be put in a group with a same group id. All page requests in a group could be responded to device in one shot.
Thanks your explaination, understand the concept of PCIe PRG. I meant
do we still have the necessity to mention the "group" here in the name
iopf_handle_group(), which one is better ? iopf_handle_prg() or
iopf_handler(), perhaps none of them ? :)
Thanks,
Ethan
Quoted 43 lines
Best regards,
baoluQuoted 38 lines
look into the code, oh, means a batch / list / queue of iopfs , and
iopf_handle_group()becomes ageneric
iopf_handler().Doe it make sense to revise the names of
iopf_handle_group(), iopf_complete_group,iopf_groupinthis patch set ?
Thanks,
Ethan
Quoted 23 lines
drivers/iommu/io-pgfault.c +7
-1static void iopf_handle_group(struct work_struct *work) { struct iopf_group *group; + struct iommu_domain *domain; struct iopf_fault *iopf, *next; enum iommu_page_response_code status = IOMMU_PAGE_RESP_SUCCESS; group = container_of(work, struct iopf_group, work); + domain = iommu_get_domain_for_dev_pasid(group->dev, + group->last_fault.fault.prm.pasid); + if (!domain || !domain->iopf_handler) + status = IOMMU_PAGE_RESP_INVALID; list_for_each_entry_safe(iopf, next, &group->faults, list) { /*@@ -139,7 +88,8 @@ static void iopf_handle_group(struct work_struct*work) * faults in the group if there is an error. */ if (status == IOMMU_PAGE_RESP_SUCCESS) - status = iopf_handle_single(iopf); + status = domain->iopf_handler(&iopf->fault, + domain->fault_data);if (!(iopf->fault.prm.flags &
IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE))
Signature · 1 line
"firm, enduring, strong, and long-lived"
Baolu Lu
maintainerRe: [PATCH v9 10/11] iommu: Per-domain I/O page fault handling
Quoted 106 lines · Ethan Zhao
Hi, Baolu
Quoted 96 lines · Baolu Lu
Hi Ethan,
Quoted 93 lines · Ethan Zhao
Hi,
Quoted 77 lines · Lu Baolu
Tweak the I/O page fault handling framework to route the page faults to the domain and call the page fault handler retrieved from the domain. This makes the I/O page fault handling framework possible to serve more usage scenarios as long as they have an IOMMU domain and install a page fault handler in it. Some unused functions are also removed to avoid dead code.
The
iommu_get_domain_for_dev_pasid()which retrieves attached domain for a {device, PASID} pair is used. It will be used by the page fault handling framework which knows {device, PASID} reported from the iommu driver. We have a guarantee that the SVA domain doesn't go away during IOPF handling, becauseunbind()waits for pending faults withiopf_queue_flush_dev()before freeing the domain. Hence, there's no need to synchronize life cycle of the iommu domains between theunbind()and the interrupt threads.Signed-off-by Lu Baolu <[email protected]>Reviewed-by Jean-Philippe Brucker <[email protected]>---
drivers/iommu/io-pgfault.c| 64
+++++---------------------------------1 file changed, 7 insertions(+), 57 deletions(-)drivers/iommu/io-pgfault.c +0
-46@@ -69,69 +69,18 @@ static int iopf_complete_group(struct device *dev, struct iopf_fault *iopf, return iommu_page_response(dev, &resp); } -static enum iommu_page_response_code -iopf_handle_single (struct iopf_fault *iopf) -{ - vm_fault_t ret; - struct mm_struct *mm; - struct vm_area_struct *vma; - unsigned int access_flags = 0; - unsigned int fault_flags = FAULT_FLAG_REMOTE; - struct iommu_fault_page_request *prm = &iopf->fault.prm; - enum iommu_page_response_code status = IOMMU_PAGE_RESP_INVALID; - - if (!(prm->flags & IOMMU_FAULT_PAGE_REQUEST_PASID_VALID)) - return status; - - mm = iommu_sva_find(prm->pasid); - if (IS_ERR_OR_NULL(mm)) - return status; - - mmap_read_lock(mm); - - vma = find_extend_vma(mm, prm->addr); - if (!vma) - /* Unmapped area */ - goto out_put_mm; - - if (prm->perm & IOMMU_FAULT_PERM_READ) - access_flags |= VM_READ; - - if (prm->perm & IOMMU_FAULT_PERM_WRITE) { - access_flags |= VM_WRITE; - fault_flags |= FAULT_FLAG_WRITE; - } - - if (prm->perm & IOMMU_FAULT_PERM_EXEC) { - access_flags |= VM_EXEC; - fault_flags |= FAULT_FLAG_INSTRUCTION; - } - - if (!(prm->perm & IOMMU_FAULT_PERM_PRIV)) - fault_flags |= FAULT_FLAG_USER; - - if (access_flags & ~vma->vm_flags) - /* Access fault */ - goto out_put_mm; - - ret = handle_mm_fault(vma, prm->addr, fault_flags, NULL);drivers/iommu/io-pgfault.c static int iopf_complete_group(struct device · line 127
Quoted 10 lines
drivers/iommu/io-pgfault.c +0
-10- status = ret & VM_FAULT_ERROR ? IOMMU_PAGE_RESP_INVALID : - IOMMU_PAGE_RESP_SUCCESS; - -out_put_mm: - mmap_read_unlock(mm); - mmput(mm); - - return status; -} -Once the
iopf_handle_single()is removed, the name ofiopf_handle_group()looks a little weiredQuoted 6 lines
Quoted 1 line
and confused, does this group mean the iommu group (domain) ? while I take some minutes to
No. This is not the iommu group. It's page request group defined by the PCI SIG spec. Multiple page requests could be put in a group with a same group id. All page requests in a group could be responded to device in one shot.
Quoted 7 lines
Thanks your explaination, understand the concept of PCIe PRG. I meant
do we still have the necessity to mention the "group" here in the name
iopf_handle_group(), which one is better ?
iopf_handle_prg()oriopf_handler(), perhaps none of them ? :)
Oh! Sorry for the misunderstanding.
I have no strong feeling to change this naming. :-) All the names express what the helper does. Jean is the author of this framework. If he has the same idea as you, I don't mind renaming it in this patch.
Best regards,
baolu
Re: [PATCH v9 10/11] iommu: Per-domain I/O page fault handling
Quoted 17 lines · Baolu Lu
Quoted 17 lines
Quoted 10 lines
Quoted 5 lines
Once the
iopf_handle_single()is removed, the name ofiopf_handle_group()looks a little weiredand confused, does this group mean the iommu group (domain) ? while I take some minutes to
No. This is not the iommu group. It's page request group defined by the PCI SIG spec. Multiple page requests could be put in a group with a same group id. All page requests in a group could be responded to device in one shot.
Thanks your explaination, understand the concept of PCIe PRG. I meant
do we still have the necessity to mention the "group" here in the name
iopf_handle_group(), which one is better ?
iopf_handle_prg()or
Quoted 7 lines
Quoted 1 line
iopf_handler(), perhaps none of them ? :)
Oh! Sorry for the misunderstanding.
I have no strong feeling to change this naming. :-) All the names express what the helper does. Jean is the author of this framework. If he has the same idea as you, I don't mind renaming it in this patch.
I'm not attached to the name, and I see how it could be confusing. Given that io-pgfault is not only for PCIe, 'prg' is not the best here either. iopf_handle_faults(), or just iopf_handler(), seem more suitable.
Thanks,
Jean
Baolu Lu
maintainerRe: [PATCH v9 10/11] iommu: Per-domain I/O page fault handling
Quoted 22 lines · Jean-Philippe Brucker
Quoted 21 lines · Baolu Lu
Quoted 11 lines
Quoted 10 lines
Quoted 5 lines
Once the
iopf_handle_single()is removed, the name ofiopf_handle_group()looks a little weiredand confused, does this group mean the iommu group (domain) ? while I take some minutes to
No. This is not the iommu group. It's page request group defined by the PCI SIG spec. Multiple page requests could be put in a group with a same group id. All page requests in a group could be responded to device in one shot.
Quoted 7 lines
Thanks your explaination, understand the concept of PCIe PRG. I meant
do we still have the necessity to mention the "group" here in the name
iopf_handle_group(), which one is better ?
iopf_handle_prg()oriopf_handler(), perhaps none of them ? :)
Oh! Sorry for the misunderstanding.
Quoted 7 lines
Quoted 3 lines
I have no strong feeling to change this naming. :-) All the names express what the helper does. Jean is the author of this framework. If he has the same idea as you, I don't mind renaming it in this patch.
I'm not attached to the name, and I see how it could be confusing. Given that io-pgfault is not only for PCIe, 'prg' is not the best here either.
iopf_handle_faults(), or justiopf_handler(), seem more suitable.
Okay, so I will rename it to iopf_handle_faults() in this patch.
Best regards,
baolu
Re: [PATCH v9 10/11] iommu: Per-domain I/O page fault handling
In reply to Jean-Philippe BruckerQuoted 17 lines · Jean-Philippe Brucker
Quoted 16 lines · Baolu Lu
Quoted 16 lines
Quoted 9 lines
Quoted 5 lines
Once the
iopf_handle_single()is removed, the name ofiopf_handle_group()looks a little weiredand confused, does this group mean the iommu group (domain) ? while I take some minutes to
No. This is not the iommu group. It's page request group defined by the PCI SIG spec. Multiple page requests could be put in a group with a same group id. All page requests in a group could be responded to device in one shot.
Thanks your explaination, understand the concept of PCIe PRG. I meant
do we still have the necessity to mention the "group" here in the name
iopf_handle_group(), which one is better ?
iopf_handle_prg()oriopf_handler(), perhaps none of them ? :)
Quoted 8 lines
Quoted 5 lines
Oh! Sorry for the misunderstanding.
I have no strong feeling to change this naming. :-) All the names express what the helper does. Jean is the author of this framework. If he has the same idea as you, I don't mind renaming it in this patch.
I'm not attached to the name, and I see how it could be confusing. Given that io-pgfault is not only for PCIe, 'prg' is not the best here either.
iopf_handle_faults(), or justiopf_handler(), seem more suitable.
Both iopf_handle_faults() and iopf_handler() looks straight, iopf_handler()
saves one word 'faults', iopf already has the meaning 'io page fault' , so
iopf_handler() is clear enough I think.
Thanks,
Ethan
Quoted 3 lines
Thanks,
Jean
Signature · 6 lines
"firm, enduring, strong, and long-lived" _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
RE: [PATCH v9 10/11] iommu: Per-domain I/O page fault handling
In reply to Lu BaoluQuoted 10 lines
From: Lu Baolu <[email protected]>
Sent: Tuesday, June 21, 2022 10:44 PMTweak the I/O page fault handling framework to route the page faults to the domain and call the page fault handler retrieved from the domain. This makes the I/O page fault handling framework possible to serve more usage scenarios as long as they have an IOMMU domain and install a page fault handler in it. Some unused functions are also removed to avoid dead code.
Quoted 8 lines
The
iommu_get_domain_for_dev_pasid()which retrieves attached domain for a {device, PASID} pair is used. It will be used by the page fault handling framework which knows {device, PASID} reported from the iommu driver. We have a guarantee that the SVA domain doesn't go away during IOPF handling, becauseunbind()waits for pending faults withiopf_queue_flush_dev()before freeing the domain. Hence, there's no need to synchronize life cycle of the iommu domains between theunbind()and the interrupt threads.
I found iopf_queue_flush_dev() is only called in intel-iommu driver. Did I overlook anything?
drivers/iommu/io-pgfault.c static int iopf_complete_group(struct device *dev, struct iopf_fault *iopf, · line 83
Quoted 13 lines
static void
iopf_handle_group(struct work_struct *work){drivers/iommu/io-pgfault.c +1
-0struct iopf_group *group; +struct iommu_domain *domain;struct iopf_fault *iopf, *next; enum iommu_page_response_code status =
IOMMU_PAGE_RESP_SUCCESS;drivers/iommu/io-pgfault.c +4
-0group = container_of(work, struct iopf_group, work); + domain =iommu_get_domain_for_dev_pasid (group->dev, + group->last_fault.fault.prm.pasid); +if (!domain || !domain->iopf_handler) + status =IOMMU_PAGE_RESP_INVALID ;
Miss a comment on why no refcnt is required on domain as explained in the commit msg.
Re: [PATCH v9 10/11] iommu: Per-domain I/O page fault handling
Quoted 19 lines · Kevin
Quoted 10 lines
From: Lu Baolu <[email protected]>
Sent: Tuesday, June 21, 2022 10:44 PMTweak the I/O page fault handling framework to route the page faults to the domain and call the page fault handler retrieved from the domain. This makes the I/O page fault handling framework possible to serve more usage scenarios as long as they have an IOMMU domain and install a page fault handler in it. Some unused functions are also removed to avoid dead code.
Quoted 8 lines
The
iommu_get_domain_for_dev_pasid()which retrieves attached domain for a {device, PASID} pair is used. It will be used by the page fault handling framework which knows {device, PASID} reported from the iommu driver. We have a guarantee that the SVA domain doesn't go away during IOPF handling, becauseunbind()waits for pending faults withiopf_queue_flush_dev()before freeing the domain. Hence, there's no need to synchronize life cycle of the iommu domains between theunbind()and the interrupt threads.
Quoted 2 lines
I found
iopf_queue_flush_dev()is only called in intel-iommu driver. Did I overlook anything?
The SMMU driver will need it as well when we upstream PRI support. Currently it only supports stall, and that requires the device driver to flush all DMA including stalled transactions *before* calling unbind(), so ne need for iopf_queue_flush_dev() in this case.
Thanks,
Jean
Quoted 17 lines
Quoted 9 lines
static void
iopf_handle_group(struct work_struct *work){drivers/iommu/io-pgfault.c +1
-0struct iopf_group *group; +struct iommu_domain *domain;struct iopf_fault *iopf, *next; enum iommu_page_response_code status =
IOMMU_PAGE_RESP_SUCCESS;drivers/iommu/io-pgfault.c static int iopf_complete_group(struct device *dev, struct iopf_fault *iopf, · line 83
Quoted 5 lines
drivers/iommu/io-pgfault.c +4
-0group = container_of(work, struct iopf_group, work); + domain =iommu_get_domain_for_dev_pasid (group->dev, + group->last_fault.fault.prm.pasid); +if (!domain || !domain->iopf_handler) + status =IOMMU_PAGE_RESP_INVALID ;Miss a comment on why no refcnt is required on domain as explained in the commit msg.
RE: [PATCH v9 10/11] iommu: Per-domain I/O page fault handling
Quoted 27 lines
From: Jean-Philippe Brucker <[email protected]>
Sent: Tuesday, June 28, 2022 5:44 PMQuoted 7 lines · Kevin
Quoted 7 lines
From: Lu Baolu <[email protected]>
Sent: Tuesday, June 21, 2022 10:44 PMTweak the I/O page fault handling framework to route the page faults to the domain and call the page fault handler retrieved from the domain. This makes the I/O page fault handling framework possible to serve more usage scenarios as long as they have an IOMMU domain and install a
page
Quoted 4 lines
Quoted 4 lines
fault handler in it. Some unused functions are also removed to avoid dead code.
The
iommu_get_domain_for_dev_pasid()which retrieves attacheddomain
Quoted 2 lines
Quoted 2 lines
for a {device, PASID} pair is used. It will be used by the page fault handling framework which knows {device, PASID} reported from the
iommu
Quoted 3 lines
Quoted 3 lines
driver. We have a guarantee that the SVA domain doesn't go away during IOPF handling, because
unbind()waits for pending faults withiopf_queue_flush_dev()before freeing the domain. Hence, there's noneed
Quoted 3 lines
Quoted 2 lines
to synchronize life cycle of the iommu domains between the
unbind()and the interrupt threads.
Quoted 8 lines
Quoted 2 lines
I found
iopf_queue_flush_dev()is only called in intel-iommu driver. Did I overlook anything?The SMMU driver will need it as well when we upstream PRI support. Currently it only supports stall, and that requires the device driver to flush all DMA including stalled transactions *before* calling
unbind(), so ne need foriopf_queue_flush_dev()in this case.
then it makes sense. Probably Baolu can add this information in the commit msg so others with similar question can quickly get the point here.
Baolu Lu
maintainerRe: [PATCH v9 10/11] iommu: Per-domain I/O page fault handling
Quoted 36 lines · Kevin
Quoted 27 lines
From: Jean-Philippe Brucker <[email protected]>
Sent: Tuesday, June 28, 2022 5:44 PMQuoted 7 lines · Kevin
Quoted 7 lines
From: Lu Baolu <[email protected]>
Sent: Tuesday, June 21, 2022 10:44 PMTweak the I/O page fault handling framework to route the page faults to the domain and call the page fault handler retrieved from the domain. This makes the I/O page fault handling framework possible to serve more usage scenarios as long as they have an IOMMU domain and install a
page
Quoted 4 lines
Quoted 4 lines
fault handler in it. Some unused functions are also removed to avoid dead code.
The
iommu_get_domain_for_dev_pasid()which retrieves attacheddomain
Quoted 2 lines
Quoted 2 lines
for a {device, PASID} pair is used. It will be used by the page fault handling framework which knows {device, PASID} reported from the
iommu
Quoted 3 lines
Quoted 3 lines
driver. We have a guarantee that the SVA domain doesn't go away during IOPF handling, because
unbind()waits for pending faults withiopf_queue_flush_dev()before freeing the domain. Hence, there's noneed
Quoted 3 lines
Quoted 2 lines
to synchronize life cycle of the iommu domains between the
unbind()and the interrupt threads.Quoted 8 lines
Quoted 2 lines
I found
iopf_queue_flush_dev()is only called in intel-iommu driver. Did I overlook anything?The SMMU driver will need it as well when we upstream PRI support. Currently it only supports stall, and that requires the device driver to flush all DMA including stalled transactions *before* calling
unbind(), so ne need foriopf_queue_flush_dev()in this case.
Quoted 3 lines
then it makes sense. Probably Baolu can add this information in the commit msg so others with similar question can quickly get the point here.
Sure. Updated.
Best regards,
baolu
Baolu Lu
maintainerRe: [PATCH v9 10/11] iommu: Per-domain I/O page fault handling
In reply to Tian, KevinQuoted 8 lines · Kevin
Quoted 8 lines
static void iopf_handle_group(struct work_struct *work) { struct iopf_group *group;(quoted diff) +1
-0+ struct iommu_domain *domain; struct iopf_fault *iopf, *next; enum iommu_page_response_code status =
IOMMU_PAGE_RESP_SUCCESS;
Quoted 7 lines
Review
Quoted 5 lines
group = container_of(work, struct iopf_group, work);(quoted diff) +4
-0+ domain = iommu_get_domain_for_dev_pasid(group->dev, + group->last_fault.fault.prm.pasid); + if (!domain || !domain->iopf_handler) + status = IOMMU_PAGE_RESP_INVALID;Miss a comment on why no refcnt is required on domain as explained in the commit msg.
I had some comments around iommu_queue_iopf() in the previous patch. The iommu_queue_iopf() is the generic page fault handler exposed by iommu core, hence that's the right place to document this.
Post it below as well:
drivers/iommu/io-pgfault.c +0 -0
@@ -181,6 +181,13 @@ static void iopf_handle_group(struct work_struct *work)* request completes, outstanding faults will have been dealt with by
the time
* the PASID is freed.
*
+ * Any valid page fault will be eventually routed to an iommu domain and the
+ * page fault handler installed there will get called. The users of this
+ * handling framework should guarantee that the iommu domain could only be
+ * freed after the device has stopped generating page faults (or the iommu
+ * hardware has been set to block the page faults) and the pending page faults
+ * have been flushed.
+ *
* Return: 0 on success and <0 on error.
*/
int iommu_queue_iopf(struct iommu_fault *fault, void *cookie)
Best regards,
baolu
Lu Baolu
maintainerPATCH v9 11/11 iommu: Rename iommu-sva-lib.{c,h}
In reply to Lu BaoluRename iommu-sva-lib.c[h] to iommu-sva.c[h] as it contains all code for SVA implementation in iommu core.
---
drivers/iommu/{iommu-sva-lib.h => iommu-sva.h} | 6 +++---
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 2 +-
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 2 +-
drivers/iommu/intel/iommu.c | 2 +-
drivers/iommu/intel/svm.c | 2 +-
drivers/iommu/io-pgfault.c | 2 +-
drivers/iommu/{iommu-sva-lib.c => iommu-sva.c} | 2 +-
drivers/iommu/iommu.c | 2 +-
drivers/iommu/Makefile | 2 +-
9 files changed, 11 insertions(+), 11 deletions(-)
rename drivers/iommu/{iommu-sva-lib.h => iommu-sva.h} (95%)
rename drivers/iommu/{iommu-sva-lib.c => iommu-sva.c} (99%)drivers/iommu/iommu-sva.h renamed from drivers/iommu/iommu-sva-lib.h +3 -3
@@ -2,8 +2,8 @@/* * SVA library for IOMMU drivers */ -#ifndef _IOMMU_SVA_LIB_H -#define _IOMMU_SVA_LIB_H +#ifndef _IOMMU_SVA_H +#define _IOMMU_SVA_H#include <linux/ioasid.h> #include <linux/mm_types.h>
@@ -72,4 +72,4 @@ iommu_sva_handle_iopf(struct iommu_fault *fault, void *data)return IOMMU_PAGE_RESP_INVALID ; }#endif /* CONFIG_IOMMU_SVA */ -#endif /* _IOMMU_SVA_LIB_H */ +#endif /* _IOMMU_SVA_H */
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c +1 -1
@@ -10,7 +10,7 @@#include <linux/slab.h> #include "arm-smmu-v3.h" -#include "../../iommu-sva-lib.h" +#include "../../iommu-sva.h" #include "../../io-pgtable-arm.h" struct arm_smmu_mmu_notifier {
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +1 -1
@@ -31,7 +31,7 @@#include <linux/amba/bus.h> #include "arm-smmu-v3.h" -#include "../../iommu-sva-lib.h" +#include "../../iommu-sva.h" static bool disable_bypass = true;module_param (disable_bypass, bool,0444 );
drivers/iommu/intel/iommu.c +1 -1
@@ -27,7 +27,7 @@#include <linux/tboot.h> #include "../irq_remapping.h" -#include "../iommu-sva-lib.h" +#include "../iommu-sva.h" #include "pasid.h" #include "cap_audit.h"
drivers/iommu/intel/svm.c +1 -1
@@ -25,7 +25,7 @@#include "pasid.h" #include "perf.h" -#include "../iommu-sva-lib.h" +#include "../iommu-sva.h" static irqreturn_t prq_event_thread (int irq,void *d);static void intel_svm_drain_prq (struct device *dev,u32 pasid);
drivers/iommu/io-pgfault.c +1 -1
@@ -11,7 +11,7 @@#include <linux/slab.h> #include <linux/workqueue.h> -#include "iommu-sva-lib.h" +#include "iommu-sva.h" /** * struct iopf_queue - IO Page Fault queue
drivers/iommu/iommu-sva.c renamed from drivers/iommu/iommu-sva-lib.c +1 -1
@@ -6,7 +6,7 @@#include <linux/sched/mm.h> #include <linux/iommu.h> -#include "iommu-sva-lib.h" +#include "iommu-sva.h" static DEFINE_MUTEX (iommu_sva_lock);static DECLARE_IOASID_SET (iommu_sva_pasid);
drivers/iommu/iommu.c +1 -1
@@ -29,7 +29,7 @@#include <trace/events/iommu.h> #include <linux/sched/mm.h> -#include "iommu-sva-lib.h" +#include "iommu-sva.h" static struct kset *iommu_group_kset;static DEFINE_IDA (iommu_group_ida);
drivers/iommu/Makefile +1 -1
@@ -27,6 +27,6 @@ obj-$(CONFIG_FSL_PAMU) += fsl_pamu.o fsl_pamu_domain.o obj-$(CONFIG_S390_IOMMU) += s390-iommu.o obj-$(CONFIG_HYPERV_IOMMU) += hyperv-iommu.o obj-$(CONFIG_VIRTIO_IOMMU) += virtio-iommu.o -obj-$(CONFIG_IOMMU_SVA) += iommu-sva-lib.o io-pgfault.o +obj-$(CONFIG_IOMMU_SVA) += iommu-sva.o io-pgfault.o obj-$(CONFIG_SPRD_IOMMU) += sprd-iommu.o obj-$(CONFIG_APPLE_DART) += apple-dart.o
Signature · 1 line
2.25.1
RE: [PATCH v9 11/11] iommu: Rename iommu-sva-lib.{c,h}
Quoted 8 lines
From: Lu Baolu <[email protected]>
Sent: Tuesday, June 21, 2022 10:44 PMRename iommu-sva-lib.c[h] to iommu-sva.c[h] as it contains all code for SVA implementation in iommu core.
Signed-off-by Lu Baolu <[email protected]>Reviewed-by Jean-Philippe Brucker <[email protected]>
Baolu Lu
maintainerHi folks,
Quoted 11 lines · Lu Baolu
Hi folks,
The former part of this series refactors the IOMMU SVA code by assigning an SVA type of
iommu_domainto a shared virtual address and replacing sva_bind/unbind iommu ops with set/block_dev_pasid domain ops.The latter part changes the existing I/O page fault handling framework from only serving SVA to a generic one. Any driver or component could handle the I/O page faults for its domain in its own way by installing an I/O page fault handler.
Quoted 7 lines
This series has been functionally tested on an x86 machine and compile tested for all architectures.
This series is also available on github:
[2]https://github.com/LuBaolu/intel-iommu/commits/iommu-sva-refactoring-v9Please review and suggest.
Just a gentle ping on this series.
Do you have further inputs? I am trying to see if we can merge this series for v5.20. The drivers also depend on it to enable their kernel DMA with PASID.
Sorry to disturb you.
Best regards,
baolu