iommu: SVA and IOPF refactoring
Subsystems (8)
Lu Baolu
maintainerv8 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-v8
Please review and suggest.
Best regards,
baolu
Change log:
v8:
- 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.
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 | 2 +-
drivers/dma/idxd/init.c | 24 +-
.../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 | 243 +++++++++++-------
drivers/misc/uacce/uacce.c | 2 +-
drivers/iommu/Makefile | 2 +-
18 files changed, 655 insertions(+), 461 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 v8 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 which supports PASID related features should set this field before enabling them on the devices.
--- 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 · 6 lines
2.25.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v8 01/11] iommu: Add max_pasids field in struct iommu_device
Quoted 3 lines · Lu Baolu
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
There is also a per-device attribute that tells what width is supported on each device. When a device enables SVM, for simplicity we were proposing to disable SVM on devices that don't support the full width, since it adds additional complexity on the allocation interface. Is that factored into this?
Quoted 34 lines
to allocate a PASID for device without calls into the IOMMU drivers. Any iommu driver which supports PASID related features should set this field before enabling them on the devices.
Signed-off-by Lu Baolu <[email protected]>Reviewed-by Jean-Philippe Brucker <[email protected]>--- 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 +1
-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;
include/linux/intel-iommu.h static inline int iommu_calculate_max_sagaw(struct intel_iommu *iommu) · line 805
Quoted 4 lines
include/linux/intel-iommu.h +1
-0@@ -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)
Is the above part of this patch? Or should be moved up somewhere?
Quoted 55 lines
include/linux/intel-iommu.h +0
-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
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v8 01/11] iommu: Add max_pasids field in struct iommu_device
Quoted 11 lines · Ashok
Quoted 3 lines · Lu Baolu
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
There is also a per-device attribute that tells what width is supported on each device. When a device enables SVM, for simplicity we were proposing to disable SVM on devices that don't support the full width, since it adds additional complexity on the allocation interface. Is that factored into this?
I would like to see the concept of a 'global PASID' and this is the only place we'd union all the per-device limits together. SVM can optionally use a global PASID and ENQCMD requires it, but I don't want to see the core code assuming everything is ENQCMD.
Jason
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
RE: [PATCH v8 01/11] iommu: Add max_pasids field in struct iommu_device
Quoted 13 lines
From: Jason Gunthorpe <[email protected]>
Sent: Friday, June 10, 2022 7:53 AMQuoted 8 lines · Ashok
Quoted 3 lines · Lu Baolu
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
There is also a per-device attribute that tells what width is supported on each device. When a device enables SVM, for simplicity we were proposing
to
Quoted 9 lines
Quoted 3 lines
disable SVM on devices that don't support the full width, since it adds additional complexity on the allocation interface. Is that factored into this?
I would like to see the concept of a 'global PASID' and this is the only place we'd union all the per-device limits together. SVM can optionally use a global PASID and ENQCMD requires it, but I don't want to see the core code assuming everything is ENQCMD.
Agree. and I think this is what this v8 is leaning toward. The core code simply populates the pasid entry of the target device w/o assuming the pasid is 'local' or 'global'. Then sva helpers actually decides how the pasid is allocated.
Currently only global pasids are supported which is how sva works before. We don't plan to change it in this series.
In parallel Jacob is working on per-device local pasids which will then be used by his DMA API pasid work and also iommufd.
Thanks
Kevin
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Baolu Lu
maintainerRe: [PATCH v8 01/11] iommu: Add max_pasids field in struct iommu_device
In reply to Raj, AshokQuoted 15 lines · Ashok
Quoted 15 lines
include/linux/intel-iommu.h +0
-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;
Quoted 11 lines
include/linux/intel-iommu.h static inline int iommu_calculate_max_sagaw(struct intel_iommu *iommu) · line 805
Quoted 10 lines
include/linux/intel-iommu.h +2
-0#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)Is the above part of this patch? Or should be moved up somewhere?
This is to make pasid_supported() usable in dmar.c. It's only needed by the change in this patch. I should make this clear in the commit message. :-)
Best regards,
baolu
Lu Baolu
maintainerPATCH v8 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 | 26 ++++++++++++++++++++++++++ 2 files changed, 28 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 +26 -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,30 @@ static void dev_iommu_free(struct device *dev)kfree (param); } +static u32 dev_iommu_get_max_pasids (struct device *dev) +{ +u32 max_pasids = dev->iommu->iommu_dev->max_pasids; +u32 num_bits; +int ret; + +if (!max_pasids) +return 0 ; + +if (dev_is_pci (dev)) { + ret =pci_max_pasids (to_pci_dev (dev)); +if (ret <0 ) +return 0 ; + +return min_t (u32, max_pasids, ret); + } + + ret =device_property_read_u32 (dev,"pasid-num-bits" , &num_bits); +if (ret) +return 0 ; + +return min_t (u32, max_pasids,1UL << num_bits); +} +static int __iommu_probe_device (struct device *dev,struct list_head *group_list) {const struct iommu_ops *ops = dev->bus->iommu_ops;
@@ -243,6 +268,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 · 6 lines
2.25.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v8 02/11] iommu: Add max_pasids field in struct dev_iommu
Quoted 36 lines · Lu Baolu
Use 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 | 26 ++++++++++++++++++++++++++ 2 files changed, 28 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 +0
-0
drivers/iommu/iommu.c line 23
Quoted 4 lines
drivers/iommu/iommu.c +1
-0@@ -20,6 +20,7 @@#include <linux/idr.h> #include <linux/err.h> #include <linux/pci.h> +#include <linux/pci-ats.h>
Is this needed for this patch?
Quoted 12 lines
drivers/iommu/iommu.c +5
-0#include <linux/bitops.h> #include <linux/property.h> #include <linux/fsl/mc.h> @@ -218,6 +219,30 @@ static void dev_iommu_free(struct device *dev)kfree (param); } +static u32 dev_iommu_get_max_pasids (struct device *dev) +{ +u32 max_pasids = dev->iommu->iommu_dev->max_pasids; +u32 num_bits; +int ret;
drivers/iommu/iommu.c static void dev_iommu_free(struct device *dev) · line 236
Quoted 10 lines
drivers/iommu/iommu.c +10
-0+ +if (!max_pasids) +return 0 ; + +if (dev_is_pci (dev)) { + ret =pci_max_pasids (to_pci_dev (dev)); +if (ret <0 ) +return 0 ; + +return min_t (u32, max_pasids, ret);
Ah.. that answers my other question to consider device pasid-max. I guess if we need any enforcement of restricting devices that aren't supporting the full PASID, that will be done by some higher layer?
too many returns in this function, maybe setup all returns to the end of the function might be elegant?
Quoted 23 lines
drivers/iommu/iommu.c +10
-0+ } + + ret =device_property_read_u32 (dev,"pasid-num-bits" , &num_bits); +if (ret) +return 0 ; + +return min_t (u32, max_pasids,1UL << num_bits); +} +static int __iommu_probe_device (struct device *dev,struct list_head *group_list) {const struct iommu_ops *ops = dev->bus->iommu_ops;@@ -243,6 +268,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
Baolu Lu
maintainerRe: [PATCH v8 02/11] iommu: Add max_pasids field in struct dev_iommu
Quoted 31 lines · Ashok
Quoted 30 lines · Lu Baolu
Use 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 | 26 ++++++++++++++++++++++++++ 2 files changed, 28 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; };
Quoted 12 lines
drivers/iommu/iommu.c line 23
Quoted 10 lines
include/linux/iommu.h +0
-0int iommu_device_register(struct iommu_device *iommu,drivers/iommu/iommu.c +1
-0@@ -20,6 +20,7 @@#include <linux/idr.h> #include <linux/err.h> #include <linux/pci.h> +#include <linux/pci-ats.h> Is this needed for this patch?
Yes. It's for pci_max_pasids().
Quoted 19 lines
Quoted 19 lines
drivers/iommu/iommu.c +11
-0#include <linux/bitops.h> #include <linux/property.h> #include <linux/fsl/mc.h> @@ -218,6 +219,30 @@ static void dev_iommu_free(struct device *dev)kfree (param); } +static u32 dev_iommu_get_max_pasids (struct device *dev) +{ +u32 max_pasids = dev->iommu->iommu_dev->max_pasids; +u32 num_bits; +int ret; + +if (!max_pasids) +return 0 ; + +if (dev_is_pci (dev)) { + ret =pci_max_pasids (to_pci_dev (dev));
Quoted 8 lines
drivers/iommu/iommu.c static void dev_iommu_free(struct device *dev) · line 236
Quoted 4 lines
drivers/iommu/iommu.c +4
-0+if (ret <0 ) +return 0 ; + +return min_t (u32, max_pasids, ret);Ah.. that answers my other question to consider device pasid-max. I guess if we need any enforcement of restricting devices that aren't supporting the full PASID, that will be done by some higher layer?
The mm->pasid style of SVA is explicitly enabled through iommu_dev_enable_feature(IOMMU_DEV_FEAT_SVA). The IOMMU driver specific restriction might be put there?
Quoted 3 lines
too many returns in this function, maybe setup all returns to the end of the function might be elegant?
I didn't find cleanup room after a quick scan of the code. But sure, let me go through code again offline.
Quoted 16 lines
Quoted 16 lines
drivers/iommu/iommu.c +9
-0+ } + + ret =device_property_read_u32 (dev,"pasid-num-bits" , &num_bits); +if (ret) +return 0 ; + +return min_t (u32, max_pasids,1UL << num_bits); +} +static int __iommu_probe_device (struct device *dev,struct list_head *group_list) {const struct iommu_ops *ops = dev->bus->iommu_ops;@@ -243,6 +268,7 @@ static int __iommu_probe_device(struct device *dev, struct list_head *group_list }
Quoted 8 lines
Quoted 8 lines
drivers/iommu/iommu.c +1
-0dev->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
Best regards,
Baolu
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
RE: [PATCH v8 02/11] iommu: Add max_pasids field in struct dev_iommu
Quoted 35 lines
From: Baolu Lu <[email protected]>
Sent: Friday, June 10, 2022 2:47 PMQuoted 16 lines · Ashok
Quoted 15 lines · Lu Baolu
drivers/iommu/iommu.c +11
-0@@ -218,6 +219,30 @@ static void dev_iommu_free(struct device *dev)kfree (param); } +static u32 dev_iommu_get_max_pasids (struct device *dev) +{ +u32 max_pasids = dev->iommu->iommu_dev->max_pasids; +u32 num_bits; +int ret; + +if (!max_pasids) +return 0 ; + +if (dev_is_pci (dev)) { + ret =pci_max_pasids (to_pci_dev (dev));Quoted 8 lines
drivers/iommu/iommu.c static void dev_iommu_free(struct device *dev) · line 236
Quoted 4 lines
drivers/iommu/iommu.c +4
-0+if (ret <0 ) +return 0 ; + +return min_t (u32, max_pasids, ret);Ah.. that answers my other question to consider device pasid-max. I guess if we need any enforcement of restricting devices that aren't supporting the full PASID, that will be done by some higher layer?
The
mm->pasidstyle of SVA is explicitly enabled throughiommu_dev_enable_feature(IOMMU_DEV_FEAT_SVA). The IOMMU driver specific
restriction might be put there?Quoted 1 line
Quoted 6 lines
Quoted 2 lines
too many returns in this function, maybe setup all returns to the end of the function might be elegant?
I didn't find cleanup room after a quick scan of the code. But sure, let me go through code again offline.
If we do care:
+static u32 dev_iommu_get_max_pasids(struct device *dev) +{
+ u32 max_pasids = 0,
+ u32 num_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", &num_bits);
+ if (!ret)
+ max_pasids = 1UL << num_bits;
+ }
+
+ return min_t(u32, max_pasids, dev->iommu->iommu_dev->max_pasids);
+}
Baolu Lu
maintainerRe: [PATCH v8 02/11] iommu: Add max_pasids field in struct dev_iommu
Quoted 52 lines · Kevin
Quoted 35 lines
From: Baolu Lu <[email protected]>
Sent: Friday, June 10, 2022 2:47 PMQuoted 16 lines · Ashok
Quoted 15 lines · Lu Baolu
drivers/iommu/iommu.c +11
-0@@ -218,6 +219,30 @@ static void dev_iommu_free(struct device *dev)kfree (param); } +static u32 dev_iommu_get_max_pasids (struct device *dev) +{ +u32 max_pasids = dev->iommu->iommu_dev->max_pasids; +u32 num_bits; +int ret; + +if (!max_pasids) +return 0 ; + +if (dev_is_pci (dev)) { + ret =pci_max_pasids (to_pci_dev (dev));Quoted 8 lines
drivers/iommu/iommu.c static void dev_iommu_free(struct device *dev) · line 236
Quoted 4 lines
drivers/iommu/iommu.c +4
-0+if (ret <0 ) +return 0 ; + +return min_t (u32, max_pasids, ret);Ah.. that answers my other question to consider device pasid-max. I guess if we need any enforcement of restricting devices that aren't supporting the full PASID, that will be done by some higher layer?
The
mm->pasidstyle of SVA is explicitly enabled throughiommu_dev_enable_feature(IOMMU_DEV_FEAT_SVA). The IOMMU driver specific
restriction might be put there?Quoted 1 line
Quoted 6 lines
Quoted 2 lines
too many returns in this function, maybe setup all returns to the end of the function might be elegant?
I didn't find cleanup room after a quick scan of the code. But sure, let me go through code again offline.
If we do care:
drivers/iommu/iommu.c +8
-0+static u32 dev_iommu_get_max_pasids (struct device *dev) +{ +u32 max_pasids =0 , + u32 num_bits = 0; +int ret; + +if (dev_is_pci (dev)) { + ret =pci_max_pasids (to_pci_dev (dev));
drivers/iommu/iommu.c static void dev_iommu_free(struct device *dev)
Quoted 10 lines
drivers/iommu/iommu.c +10
-0+if (ret >0 ) + max_pasids = ret; + }else { + ret =device_property_read_u32 (dev,"pasid-num-bits" , &num_bits); +if (!ret) + max_pasids =1UL << num_bits; + } + +return min_t (u32, max_pasids, dev->iommu->iommu_dev->max_pasids); +}
Great! Cleaner and more compact than mine. Thank you!
Best regards,
baolu
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Lu Baolu
maintainerPATCH v8 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 | 2 +- drivers/dma/idxd/init.c | 24 +------- .../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(+), 96 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 -1
@@ -100,7 +100,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 -23
@@ -466,29 +466,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
@@ -2794,7 +2794,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
@@ -2807,7 +2806,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 );
@@ -2832,7 +2831,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 · 6 lines
2.25.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Lu Baolu
maintainerPATCH v8 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,9 @@ 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_SHARED (1U << 4)/* Page table shared from CPU */ +#define __IOMMU_DOMAIN_HOST_VA (1U << 5)/* Host CPU virtual address */ +/* * This are the possible domain-types *
@@ -86,15 +89,24 @@ 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_SHARED | \ + __IOMMU_DOMAIN_HOST_VA)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 · 6 lines
2.25.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v8 04/11] iommu: Add sva iommu_domain support
Hi Baolu
some minor nits.
Quoted 36 lines · Lu Baolu
The 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.
The iommu_attach/detach_device_pasid() can be used for other purposes, such as kernel DMA with pasid, mediation device, etc.
Suggested-by Jean-Philippe Brucker <[email protected]>Suggested-by Jason Gunthorpe <[email protected]>Signed-off-by Lu Baolu <[email protected]>Reviewed-by Jean-Philippe Brucker <[email protected]>--- include/linux/iommu.h | 45 ++++++++++++++++++++- drivers/iommu/iommu.c | 93 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 136 insertions(+), 2 deletions(-)include/linux/iommu.h +0
-0
include/linux/iommu.h struct iommu_domain_geometry { · line 67
Quoted 4 lines
include/linux/iommu.h +1
-0@@ -64,6 +64,9 @@ 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_SHARED (1U << 4)/* Page table shared from CPU */
s/from CPU/with CPU
include/linux/iommu.h struct iommu_domain_geometry { · line 68
Quoted 1 line
include/linux/iommu.h +1
-0+#define __IOMMU_DOMAIN_HOST_VA (1U << 5)/* Host CPU virtual address */
Do you mean general CPU VA? or Host CPU VA, I'm reading the latter as 2nd stage?
include/linux/iommu.h struct iommu_domain_geometry { · line 93
Quoted 10 lines
include/linux/iommu.h +3
-0+/* * This are the possible domain-types * @@ -86,15 +89,24 @@ 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_SHARED | \ + __IOMMU_DOMAIN_HOST_VA)
Doesn't shared automatically mean CPU VA? Do we need another flag?
Quoted 147 lines
include/linux/iommu.h +38
-2struct 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 +33
-0@@ -27,6 +27,7 @@#include <linux/module.h> #include <linux/cc_platform.h> #include <trace/events/iommu.h> +#include <linux/sched/mm.h> static struct kset *iommu_group_kset;static DEFINE_IDA (iommu_group_ida);@@ -39,6 +40,7 @@ struct iommu_group {struct kobject kobj;struct kobject *devices_kobj;struct list_head devices; +struct xarray pasid_array;struct mutex mutex;void *iommu_data;void (*iommu_data_release)(void *iommu_data);@@ -666,6 +668,7 @@ struct iommu_group *iommu_group_alloc(void)mutex_init (&group->mutex);INIT_LIST_HEAD (&group->devices);INIT_LIST_HEAD (&group->entry); +xa_init (&group->pasid_array); ret =ida_simple_get (&iommu_group_ida,0 ,0 ,GFP_KERNEL );if (ret <0 ) {@@ -1961,6 +1964,8 @@ EXPORT_SYMBOL_GPL(iommu_domain_alloc);void iommu_domain_free (struct iommu_domain *domain) { +if (domain->type ==IOMMU_DOMAIN_SVA ) +mmdrop (domain->mm);iommu_put_dma_cookie (domain); domain->ops->free (domain); }@@ -3277,3 +3282,91 @@ bool iommu_group_dma_owner_claimed(struct iommu_group *group)return user; }EXPORT_SYMBOL_GPL (iommu_group_dma_owner_claimed); + +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) +return NULL ; + + domain->type =IOMMU_DOMAIN_SVA ; +mmgrab (mm); + domain->mm = mm; + +return domain; +} + +static bool iommu_group_immutable_singleton (struct iommu_group *group, +struct device *dev) +{ +int count; + +mutex_lock (&group->mutex); + count =iommu_group_device_count (group); +mutex_unlock (&group->mutex); + +if (count !=1 )
drivers/iommu/iommu.c bool iommu_group_dma_owner_claimed(struct iommu_group *group) · line 3322
Quoted 10 lines
drivers/iommu/iommu.c +10
-0+return false; + +/* +* The PCI device could be considered to be fully isolated if all +* devices on the path from the device to the host-PCI bridge are +* protected from peer-to-peer DMA by ACS. +*/ +if (dev_is_pci (dev)) +return pci_acs_path_enabled (to_pci_dev (dev),NULL , +REQ_ACS_FLAGS );
Does this comprehend RCiEP devices? Since they are optional even if ACS is lacking.
Quoted 53 lines
drivers/iommu/iommu.c +50
-0+ +/* +* Otherwise, the device came from DT/ACPI, assume it is static and +* then singleton can know from the device count in the group. +*/ +return true; +} + +int iommu_attach_device_pasid (struct iommu_domain *domain,struct device *dev, +ioasid_t pasid) +{ +struct iommu_group *group; +int ret = -EBUSY ; +void *curr; + +if (!domain->ops->set_dev_pasid) +return -EOPNOTSUPP ; + + group =iommu_group_get (dev); +if (!group || !iommu_group_immutable_singleton (group, dev)) { +iommu_group_put (group); +return -EINVAL ; + } + +mutex_lock (&group->mutex); + curr =xa_cmpxchg (&group->pasid_array, pasid,NULL , domain,GFP_KERNEL ); +if (curr) + goto out_unlock; + ret = domain->ops->set_dev_pasid (domain, dev, pasid); +if (ret) +xa_erase (&group->pasid_array, pasid); +out_unlock: +mutex_unlock (&group->mutex); +iommu_group_put (group); + +return ret; +} + +void iommu_detach_device_pasid (struct iommu_domain *domain,struct device *dev, +ioasid_t pasid) +{ +struct iommu_group *group =iommu_group_get (dev); + +mutex_lock (&group->mutex); + domain->ops->block_dev_pasid (domain, dev, pasid); +xa_erase (&group->pasid_array, pasid); +mutex_unlock (&group->mutex); + +iommu_group_put (group); +}Signature · 1 line
2.25.1
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Baolu Lu
maintainerRe: [PATCH v8 04/11] iommu: Add sva iommu_domain support
Quoted 1 line · Ashok
Hi Baolu
Hi Ashok,
Quoted 2 lines
some minor nits.
Thanks for your comments.
Quoted 41 lines · Lu Baolu
Quoted 39 lines
The 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.
The iommu_attach/detach_device_pasid() can be used for other purposes, such as kernel DMA with pasid, mediation device, etc.
Suggested-by Jean-Philippe Brucker <[email protected]>Suggested-by Jason Gunthorpe <[email protected]>Signed-off-by Lu Baolu <[email protected]>Reviewed-by Jean-Philippe Brucker <[email protected]>--- include/linux/iommu.h | 45 ++++++++++++++++++++- drivers/iommu/iommu.c | 93 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 136 insertions(+), 2 deletions(-)include/linux/iommu.h +0
-0@@ -64,6 +64,9 @@ 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 */
Quoted 3 lines
include/linux/iommu.h struct iommu_domain_geometry { · line 67
Quoted 1 line
include/linux/iommu.h +1
-0+#define __IOMMU_DOMAIN_SHARED (1U << 4)/* Page table shared from CPU */ s/from CPU/with CPU
Sure.
Quoted 5 lines
include/linux/iommu.h struct iommu_domain_geometry { · line 68
Quoted 2 lines
include/linux/iommu.h +1
-0+#define __IOMMU_DOMAIN_HOST_VA (1U << 5)/* Host CPU virtual address */ Do you mean general CPU VA? or Host CPU VA, I'm reading the latter as 2nd stage?
Host CPU VA. In the near future, we will add another flag _GUEST_VA, so that the shared page table types are distiguished.
Quoted 13 lines
include/linux/iommu.h struct iommu_domain_geometry { · line 93
Quoted 11 lines
include/linux/iommu.h +3
-0+/* * This are the possible domain-types * @@ -86,15 +89,24 @@ 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_SHARED | \ + __IOMMU_DOMAIN_HOST_VA)Doesn't shared automatically mean CPU VA? Do we need another flag?
Yes. Shared means CPU VA, but there're many types. Besides above two, we also see the shared KVM/EPT.
Quoted 153 lines
Quoted 153 lines
include/linux/iommu.h +38
-2struct 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 +38
-0@@ -27,6 +27,7 @@#include <linux/module.h> #include <linux/cc_platform.h> #include <trace/events/iommu.h> +#include <linux/sched/mm.h> static struct kset *iommu_group_kset;static DEFINE_IDA (iommu_group_ida);@@ -39,6 +40,7 @@ struct iommu_group {struct kobject kobj;struct kobject *devices_kobj;struct list_head devices; +struct xarray pasid_array;struct mutex mutex;void *iommu_data;void (*iommu_data_release)(void *iommu_data);@@ -666,6 +668,7 @@ struct iommu_group *iommu_group_alloc(void)mutex_init (&group->mutex);INIT_LIST_HEAD (&group->devices);INIT_LIST_HEAD (&group->entry); +xa_init (&group->pasid_array); ret =ida_simple_get (&iommu_group_ida,0 ,0 ,GFP_KERNEL );if (ret <0 ) {@@ -1961,6 +1964,8 @@ EXPORT_SYMBOL_GPL(iommu_domain_alloc);void iommu_domain_free (struct iommu_domain *domain) { +if (domain->type ==IOMMU_DOMAIN_SVA ) +mmdrop (domain->mm);iommu_put_dma_cookie (domain); domain->ops->free (domain); }@@ -3277,3 +3282,91 @@ bool iommu_group_dma_owner_claimed(struct iommu_group *group)return user; }EXPORT_SYMBOL_GPL (iommu_group_dma_owner_claimed); + +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) +return NULL ; + + domain->type =IOMMU_DOMAIN_SVA ; +mmgrab (mm); + domain->mm = mm; + +return domain; +} + +static bool iommu_group_immutable_singleton (struct iommu_group *group, +struct device *dev) +{ +int count; + +mutex_lock (&group->mutex); + count =iommu_group_device_count (group); +mutex_unlock (&group->mutex); + +if (count !=1 ) +return false; + +/* +* The PCI device could be considered to be fully isolated if all +* devices on the path from the device to the host-PCI bridge are
Quoted 8 lines
drivers/iommu/iommu.c bool iommu_group_dma_owner_claimed(struct iommu_group *group) · line 3322
Quoted 5 lines
drivers/iommu/iommu.c +5
-0+* protected from peer-to-peer DMA by ACS. +*/ +if (dev_is_pci (dev)) +return pci_acs_path_enabled (to_pci_dev (dev),NULL , +REQ_ACS_FLAGS );Does this comprehend RCiEP devices? Since they are optional even if ACS is lacking.
Yes. It's already been covered by pci_acs_enabled().
/**
* pci_acs_enabled - test ACS against required flags for a given device
* @pdev: device to test
* @acs_flags: required PCI ACS flags
*
* Return true if the device supports the provided flags. Automatically
* filters out flags that are not implemented on multifunction devices. *
* Note that this interface checks the effective ACS capabilities of the
* device rather than the actual capabilities. For instance, most single
* function endpoints are not required to support ACS because they have no
* opportunity for peer-to-peer access. We therefore return 'true'
* regardless of whether the device exposes an ACS capability. This makes
* it much easier for callers of this function to ignore the actual type
* or topology of the device when testing ACS support.
*/
bool pci_acs_enabled(struct pci_dev *pdev, u16 acs_flags)
Quoted 46 lines
Quoted 46 lines
drivers/iommu/iommu.c +45
-0+ +/* +* Otherwise, the device came from DT/ACPI, assume it is static and +* then singleton can know from the device count in the group. +*/ +return true; +} + +int iommu_attach_device_pasid (struct iommu_domain *domain,struct device *dev, +ioasid_t pasid) +{ +struct iommu_group *group; +int ret = -EBUSY ; +void *curr; + +if (!domain->ops->set_dev_pasid) +return -EOPNOTSUPP ; + + group =iommu_group_get (dev); +if (!group || !iommu_group_immutable_singleton (group, dev)) { +iommu_group_put (group); +return -EINVAL ; + } + +mutex_lock (&group->mutex); + curr =xa_cmpxchg (&group->pasid_array, pasid,NULL , domain,GFP_KERNEL ); +if (curr) + goto out_unlock; + ret = domain->ops->set_dev_pasid (domain, dev, pasid); +if (ret) +xa_erase (&group->pasid_array, pasid); +out_unlock: +mutex_unlock (&group->mutex); +iommu_group_put (group); + +return ret; +} + +void iommu_detach_device_pasid (struct iommu_domain *domain,struct device *dev, +ioasid_t pasid) +{ +struct iommu_group *group =iommu_group_get (dev); + +mutex_lock (&group->mutex); + domain->ops->block_dev_pasid (domain, dev, pasid);
Quoted 8 lines
Quoted 8 lines
drivers/iommu/iommu.c +5
-0+xa_erase (&group->pasid_array, pasid); +mutex_unlock (&group->mutex); + +iommu_group_put (group); +}Signature · 1 line
2.25.1
Best regards,
baolu
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
RE: [PATCH v8 04/11] iommu: Add sva iommu_domain support
Quoted 4 lines
From: Baolu Lu
Sent: Friday, June 10, 2022 3:16 PMQuoted 2 lines
Quoted 2 lines
+#define
__IOMMU_DOMAIN_HOST_VA(1U << 5) /* Host CPU virtual
Quoted 8 lines
address */
Quoted 2 lines
Do you mean general CPU VA? or Host CPU VA, I'm reading the latter as
2nd
Quoted 1 line
stage?
Host CPU VA. In the near future, we will add another flag
_GUEST_VA, so that the shared page table types are distiguished.
How does the kernel knows that an user page table translates guest VA? IMHO I don't think the kernel should care about it except managing all the aspects related to the user page table itself...
Quoted 12 lines
Quoted 8 lines
include/linux/iommu.h struct iommu_domain_geometry { · line 89
Quoted 8 lines
include/linux/iommu.h +1
-0+/* * This are the possible domain-types * @@ -86,15 +89,24 @@ struct iommu_domain_geometry {#define IOMMU_DOMAIN_DMA_FQ (__IOMMU_DOMAIN_PAGING | \Quoted 3 lines
include/linux/iommu.h struct iommu_domain_geometry {
Quoted 3 lines
include/linux/iommu.h +1
-0__IOMMU_DOMAIN_DMA_API | \ __IOMMU_DOMAIN_DMA_FQ) +#define IOMMU_DOMAIN_SVA (__IOMMU_DOMAIN_SHARED |
Quoted 8 lines
\Quoted 3 lines
include/linux/iommu.h struct iommu_domain_geometry { · line 93
Quoted 1 line
include/linux/iommu.h +1
-0+ __IOMMU_DOMAIN_HOST_VA)Doesn't shared automatically mean CPU VA? Do we need another flag?
Yes. Shared means CPU VA, but there're many types. Besides above two, we also see the shared KVM/EPT.
Will the two sharing scenarios share any common code? If not then having a separate flag bit is meaningless.
It might be more straightforward to be:
#define IOMMU_DOMAIN_SVA __IOMMU_DOMAIN_SVA
#define IOMMU_DOMAIN_KVM __IOMMU_DOMAIN_KVM
#define IOMMU_DOMAIN_USER __IOMMU_DOMAIN_USER
Thanks
Kevin
Baolu Lu
maintainerRe: [PATCH v8 04/11] iommu: Add sva iommu_domain support
Quoted 8 lines · Kevin
Quoted 8 lines
From: Baolu Lu
Sent: Friday, June 10, 2022 3:16 PMQuoted 2 lines
Quoted 2 lines
+#define
__IOMMU_DOMAIN_HOST_VA(1U << 5) /* Host CPU virtualaddress */
Quoted 2 lines
Do you mean general CPU VA? or Host CPU VA, I'm reading the latter as
2nd
Quoted 8 lines
Quoted 4 lines
Quoted 1 line
stage?
Host CPU VA. In the near future, we will add another flag
_GUEST_VA, so that the shared page table types are distiguished.How does the kernel knows that an user page table translates guest VA? IMHO I don't think the kernel should care about it except managing all the aspects related to the user page table itself...
Okay.
Quoted 18 lines
Quoted 18 lines
Quoted 9 lines
include/linux/iommu.h struct iommu_domain_geometry { · line 89
Quoted 9 lines
include/linux/iommu.h +1
-0+/* * This are the possible domain-types * @@ -86,15 +89,24 @@ struct iommu_domain_geometry {#define IOMMU_DOMAIN_DMA_FQ (__IOMMU_DOMAIN_PAGING | \Quoted 3 lines
include/linux/iommu.h struct iommu_domain_geometry {
Quoted 3 lines
include/linux/iommu.h +1
-0__IOMMU_DOMAIN_DMA_API | \ __IOMMU_DOMAIN_DMA_FQ) +#define IOMMU_DOMAIN_SVA (__IOMMU_DOMAIN_SHARED |\Quoted 3 lines
include/linux/iommu.h struct iommu_domain_geometry { · line 93
Quoted 1 line
include/linux/iommu.h +1
-0+ __IOMMU_DOMAIN_HOST_VA)Doesn't shared automatically mean CPU VA? Do we need another flag?
Quoted 6 lines
Quoted 3 lines
Yes. Shared means CPU VA, but there're many types. Besides above two, we also see the shared KVM/EPT.
Will the two sharing scenarios share any common code? If not then having a separate flag bit is meaningless.
So far, I haven't seen the need for common code. I've ever thought about the common notifier callback for page table entry update of SVA and KVM. But there has been no feasible plan.
Quoted 6 lines
It might be more straightforward to be:
#define
IOMMU_DOMAIN_SVA__IOMMU_DOMAIN_SVA
#defineIOMMU_DOMAIN_KVM__IOMMU_DOMAIN_KVM
#defineIOMMU_DOMAIN_USER__IOMMU_DOMAIN_USER
I am okay with this and we can add some shared bits later if we need to consolidate any code.
--
Best regards,
baolu
Lu Baolu
maintainerPATCH v8 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 · 6 lines
2.25.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
RE: [PATCH v8 05/11] iommu/vt-d: Add SVA domain support
drivers/iommu/intel/svm.c int intel_svm_page_response(struct device *dev, · line 971
Quoted 10 lines
From: Lu Baolu <[email protected]>
Sent: Tuesday, June 7, 2022 9:50 AMdrivers/iommu/intel/svm.c +7
-0+ +static const struct iommu_domain_ops intel_svm_domain_ops = { + .set_dev_pasid = intel_svm_attach_dev_pasid, + .block_dev_pasid = intel_svm_detach_dev_pasid, + .free = intel_svm_domain_free, +}; +
It's clearer to use set/block for intel callbacks.
Baolu Lu
maintainerRe: [PATCH v8 05/11] iommu/vt-d: Add SVA domain support
Quoted 12 lines · Kevin
drivers/iommu/intel/svm.c int intel_svm_page_response(struct device *dev, · line 971
Quoted 10 lines
From: Lu Baolu <[email protected]>
Sent: Tuesday, June 7, 2022 9:50 AMdrivers/iommu/intel/svm.c +7
-0+ +static const struct iommu_domain_ops intel_svm_domain_ops = { + .set_dev_pasid = intel_svm_attach_dev_pasid, + .block_dev_pasid = intel_svm_detach_dev_pasid, + .free = intel_svm_domain_free, +}; +It's clearer to use set/block for intel callbacks.
Yes. That reads clearer.
--
Best regards,
baolu
Lu Baolu
maintainerPATCH v8 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 · 6 lines
2.25.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Lu Baolu
maintainerPATCH v8 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 · 6 lines
2.25.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Lu Baolu
maintainerPATCH v8 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 · 6 lines
2.25.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Lu Baolu
maintainerPATCH v8 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);
@@ -3205,6 +3207,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 · 6 lines
2.25.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Lu Baolu
maintainerPATCH v8 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 · 6 lines
2.25.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Lu Baolu
maintainerPATCH v8 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 · 6 lines
2.25.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu