Support attaching PASID to the blocked_domain
Subsystems (5)
v3 cover Support attaching PASID to the blocked_domain
During the review of iommufd pasid series, Kevin and Jason suggested attaching PASID to the blocked domain hence replacing the usage of remove_dev_pasid() op [1]. This makes sense as it makes the PASID path aligned with the RID path which attaches the RID to the blocked_domain when it is to be blocked. To do it, it requires passing the old domain to the iommu driver. This has been done in [2].
This series makes the Intel iommu driver, ARM SMMUv3 driver and AMD iommu driver support attaching PASID to the blocked domain. And in the end remove the remove_dev_pasid op from iommu_ops.
[1] https://lore.kernel.org/linux-iommu/[email protected]/
[2] https://lore.kernel.org/linux-iommu/[email protected]/
v3:
- Add a patch to check remove_dev_pasid() in iommu_attach_device_pasid()
- Split patch 01 of v2 into two patches, drop the r-b of this patch due the split.
- Add AMD iommu blocked domain pasid support (Jason)
- Remove the remove_dev_pasid op as all the iommu drivers that support pasid attach have supported attaching pasid to blocked domain.
v2: https://lore.kernel.org/linux-iommu/[email protected]/#t
- Add Kevin's r-b
- Adjust the order of patch 03 of v1, it should be the first patch (Baolu)
v1: https://lore.kernel.org/linux-iommu/[email protected]/
Regards,
Yi Liu
Jason Gunthorpe (1):
iommu/arm-smmu-v3: Make the blocked domain support PASID
Yi Liu (6):
iommu: Prevent pasid attach if no ops->remove_dev_pasid
iommu: Consolidate the ops->remove_dev_pasid usage into a helper
iommu: Detaching pasid by attaching to the blocked_domain iommu/vt-d: Make the blocked domain support PASID iommu/amd: Make the blocked domain support PASID
iommu: Remove the remove_dev_pasid op
drivers/iommu/amd/iommu.c | 10 ++++++++- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 12 +++++------ drivers/iommu/intel/iommu.c | 15 ++++++++++---- drivers/iommu/iommu.c | 23 ++++++++++++++------- include/linux/iommu.h | 5 ----- 5 files changed, 42 insertions(+), 23 deletions(-)
Signature · 1 line
2.34.1
PATCH v3 1/7 iommu: Prevent pasid attach if no ops->remove_dev_pasid
driver should implement both set_dev_pasid and remove_dev_pasid op, otherwise it is a problem how to detach pasid. In reality, it is impossible that an iommu driver implements set_dev_pasid() but no remove_dev_pasid() op. However, it is better to check it.
--- drivers/iommu/iommu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/iommu/iommu.c +3 -1
@@ -3454,11 +3454,13 @@ int iommu_attach_device_pasid(struct iommu_domain *domain, struct iommu_attach_handle *handle) {/* Caller must be a probed driver on dev */ +const struct iommu_ops *ops =dev_iommu_ops (dev);struct iommu_group *group = dev->iommu_group;struct group_device *device;int ret; -if (!domain->ops->set_dev_pasid) +if (!domain->ops->set_dev_pasid || + !ops->remove_dev_pasid)return -EOPNOTSUPP ;if (!group)
Signature · 1 line
2.34.1
Re: [PATCH v3 1/7] iommu: Prevent pasid attach if no ops->remove_dev_pasid
Quoted 9 lines · Yi Liu
driver should implement both
set_dev_pasidandremove_dev_pasidop, otherwise it is a problem how to detach pasid. In reality, it is impossible that an iommu driver implementsset_dev_pasid()but noremove_dev_pasid()op. However, it is better to check it.Signed-off-by Yi Liu <[email protected]>--- drivers/iommu/iommu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
I was wondering if we really needed this, but it does make the patches a bit easier to understand
Jason
Tian, Kevin
Reviewed-byRE: [PATCH v3 1/7] iommu: Prevent pasid attach if no ops->remove_dev_pasid
Quoted 16 lines
From: Jason Gunthorpe <[email protected]>
Sent: Tuesday, November 5, 2024 11:42 PMQuoted 1 line · Yi Liu
driver should implement both
set_dev_pasidandremove_dev_pasidop,otherwise
Quoted 2 lines
it is a problem how to detach pasid. In reality, it is impossible that an iommu driver implements
set_dev_pasid()but noremove_dev_pasid()op.However,
Quoted 6 lines
it is better to check it.
Signed-off-by Yi Liu <[email protected]>--- drivers/iommu/iommu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
Quoted 5 lines
I was wondering if we really needed this, but it does make the patches a bit easier to understand
Reviewed-by Jason Gunthorpe <[email protected]>
me too. btw when Vasant's series introduces the PASID flag to domain above checks can be moved to the domain alloc time then here just needs to check whether the domain allows pasid attach.
for now,
and a nit - there is another reference to dev_iommu_ops in this function:
if (!dev_has_iommu(dev) || dev_iommu_ops(dev) != domain->owner ||
could be replaced with ops too.
Re: [PATCH v3 1/7] iommu: Prevent pasid attach if no ops->remove_dev_pasid
Quoted 19 lines · Kevin
Quoted 19 lines
From: Jason Gunthorpe <[email protected]>
Sent: Tuesday, November 5, 2024 11:42 PMQuoted 1 line · Yi Liu
driver should implement both
set_dev_pasidandremove_dev_pasidop,otherwise
Quoted 2 lines
it is a problem how to detach pasid. In reality, it is impossible that an iommu driver implements
set_dev_pasid()but noremove_dev_pasid()op.However,
Quoted 6 lines
it is better to check it.
Signed-off-by Yi Liu <[email protected]>--- drivers/iommu/iommu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)I was wondering if we really needed this, but it does make the patches a bit easier to understand
Quoted 7 lines
Quoted 2 lines
Reviewed-by Jason Gunthorpe <[email protected]>me too. btw when Vasant's series introduces the PASID flag to domain above checks can be moved to the domain alloc time then here just needs to check whether the domain allows pasid attach.
hmmm. Are we sure all the caller of iommu_attach_device_pasid() will allocate domain with this flag? Besides iommufd, idxd driver would also call iommu_attach_device_pasid(), and it uses the DMA domain of the device. I suppose this domain is allocated with the pasid flag.
Given that Vasant's series has been queued and this series is based on that. It might make sense to drop this patch. If the pasid capable domain can be allocated successfully, the iommu driver already indicates it has the ability to support set_dev_pasid and the undo op.
Quoted 10 lines
for now,
Reviewed-by Kevin Tian <[email protected]>and a nit - there is another reference to
dev_iommu_opsin this function:if (!dev_has_iommu(dev) || dev_iommu_ops(dev) != domain->owner ||could be replaced with ops too.
If we decide to keep this patch, I'll add it.
Signature · 2 lines
Regards, Yi Liu
PATCH v3 2/7 iommu: Consolidate the ops->remove_dev_pasid usage into a helper
In reply to Yi LiuAdd a wrapper for the ops->remove_dev_pasid, this consolidates the iommu_ops fetching and callback invoking. It is also a preparation for starting the transition from using remove_dev_pasid op to detach pasid to the way using blocked_domain to detach pasid.
--- drivers/iommu/iommu.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
drivers/iommu/iommu.c +10 -6
@@ -3400,6 +3400,14 @@ bool iommu_group_dma_owner_claimed(struct iommu_group *group) }EXPORT_SYMBOL_GPL (iommu_group_dma_owner_claimed); +static void iommu_remove_dev_pasid (struct device *dev,ioasid_t pasid, +struct iommu_domain *domain) +{ +const struct iommu_ops *ops =dev_iommu_ops (dev); + + ops->remove_dev_pasid (dev, pasid, domain); +} +static int __iommu_set_group_pasid (struct iommu_domain *domain,struct iommu_group *group,ioasid_t pasid) {
@@ -3418,11 +3426,9 @@ static int __iommu_set_group_pasid(struct iommu_domain *domain, err_revert: last_gdev = device;for_each_group_device (group, device) { -const struct iommu_ops *ops =dev_iommu_ops (device->dev); -if (device == last_gdev)break ; - ops->remove_dev_pasid (device->dev, pasid, domain); +iommu_remove_dev_pasid (device->dev, pasid, domain); }return ret; }
@@ -3432,11 +3438,9 @@ static void __iommu_remove_group_pasid(struct iommu_group *group, struct iommu_domain *domain) {struct group_device *device; -const struct iommu_ops *ops;for_each_group_device (group, device) { - ops =dev_iommu_ops (device->dev); - ops->remove_dev_pasid (device->dev, pasid, domain); +iommu_remove_dev_pasid (device->dev, pasid, domain); } }
Signature · 1 line
2.34.1
Re: [PATCH v3 2/7] iommu: Consolidate the ops->remove_dev_pasid usage into a helper
Quoted 9 lines · Yi Liu
Add a wrapper for the
ops->remove_dev_pasid, this consolidates theiommu_opsfetching and callback invoking. It is also a preparation for starting the transition from usingremove_dev_pasidop to detach pasid to the way usingblocked_domainto detach pasid.Signed-off-by Yi Liu <[email protected]>--- drivers/iommu/iommu.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
Jason
Re: [PATCH v3 2/7] iommu: Consolidate the ops->remove_dev_pasid usage into a helper
In reply to Yi LiuQuoted 6 lines · Yi Liu
Add a wrapper for the
ops->remove_dev_pasid, this consolidates theiommu_opsfetching and callback invoking. It is also a preparation for starting the transition from usingremove_dev_pasidop to detach pasid to the way usingblocked_domainto detach pasid.Signed-off-by Yi Liu <[email protected]>
Quoted 37 lines
--- drivers/iommu/iommu.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)drivers/iommu/iommu.c +9
-3@@ -3400,6 +3400,14 @@ bool iommu_group_dma_owner_claimed(struct iommu_group *group) }EXPORT_SYMBOL_GPL (iommu_group_dma_owner_claimed); +static void iommu_remove_dev_pasid (struct device *dev,ioasid_t pasid, +struct iommu_domain *domain) +{ +const struct iommu_ops *ops =dev_iommu_ops (dev); + + ops->remove_dev_pasid (dev, pasid, domain); +} +static int __iommu_set_group_pasid (struct iommu_domain *domain,struct iommu_group *group,ioasid_t pasid) {@@ -3418,11 +3426,9 @@ static int __iommu_set_group_pasid(struct iommu_domain *domain, err_revert: last_gdev = device;for_each_group_device (group, device) { -const struct iommu_ops *ops =dev_iommu_ops (device->dev); -if (device == last_gdev)break ; - ops->remove_dev_pasid (device->dev, pasid, domain); +iommu_remove_dev_pasid (device->dev, pasid, domain); }return ret; }
drivers/iommu/iommu.c static void __iommu_remove_group_pasid(struct iommu_group *group, · line 3444
Quoted 10 lines
drivers/iommu/iommu.c +1
-3@@ -3432,11 +3438,9 @@ static void __iommu_remove_group_pasid(struct iommu_group *group, struct iommu_domain *domain) {struct group_device *device; -const struct iommu_ops *ops;for_each_group_device (group, device) { - ops =dev_iommu_ops (device->dev); - ops->remove_dev_pasid (device->dev, pasid, domain); +iommu_remove_dev_pasid (device->dev, pasid, domain); }
Now its single statement inside loop. We don't need braces.
-Vasant
RE: [PATCH v3 2/7] iommu: Consolidate the ops->remove_dev_pasid usage into a helper
In reply to Yi LiuQuoted 10 lines
From: Liu, Yi L <[email protected]>
Sent: Monday, November 4, 2024 9:20 PMAdd a wrapper for the
ops->remove_dev_pasid, this consolidates theiommu_ops
fetching and callback invoking. It is also a preparation for starting the transition from usingremove_dev_pasidop to detach pasid to the way usingblocked_domainto detach pasid.Signed-off-by Yi Liu <[email protected]>
PATCH v3 3/7 iommu: Detaching pasid by attaching to the blocked_domain
In reply to Yi LiuThe iommu drivers are on the way to detach pasid by attaching to the blocked domain. However, this cannot be done in one shot. During the transition, iommu core would select between the remove_dev_pasid op and the blocked domain.
--- drivers/iommu/iommu.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
drivers/iommu/iommu.c +14 -2
@@ -3404,8 +3404,18 @@ static void iommu_remove_dev_pasid(struct device *dev, ioasid_t pasid, struct iommu_domain *domain) {const struct iommu_ops *ops =dev_iommu_ops (dev); +struct iommu_domain *blocked_domain = ops->blocked_domain; +int ret =1 ; + +if (blocked_domain && blocked_domain->ops->set_dev_pasid) { + ret = blocked_domain->ops->set_dev_pasid (blocked_domain, + dev, pasid, domain); + }else if (ops->remove_dev_pasid) { + ops->remove_dev_pasid (dev, pasid, domain); + ret =0 ; + } - ops->remove_dev_pasid (dev, pasid, domain); +WARN_ON (ret); } static int __iommu_set_group_pasid(struct iommu_domain *domain,
@@ -3464,7 +3474,9 @@ int iommu_attach_device_pasid(struct iommu_domain *domain,int ret;if (!domain->ops->set_dev_pasid || - !ops->remove_dev_pasid) + (!ops->remove_dev_pasid && + (!ops->blocked_domain || + !ops->blocked_domain->ops->set_dev_pasid)))return -EOPNOTSUPP ;if (!group)
Signature · 1 line
2.34.1
Re: [PATCH v3 3/7] iommu: Detaching pasid by attaching to the blocked_domain
Quoted 10 lines · Yi Liu
The iommu drivers are on the way to detach pasid by attaching to the blocked domain. However, this cannot be done in one shot. During the transition, iommu core would select between the
remove_dev_pasidop and the blocked domain.Suggested-by Kevin Tian <[email protected]>Suggested-by Jason Gunthorpe <[email protected]>Signed-off-by Yi Liu <[email protected]>--- drivers/iommu/iommu.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
Jason
Re: [PATCH v3 3/7] iommu: Detaching pasid by attaching to the blocked_domain
In reply to Yi LiuQuoted 7 lines · Yi Liu
The iommu drivers are on the way to detach pasid by attaching to the blocked domain. However, this cannot be done in one shot. During the transition, iommu core would select between the
remove_dev_pasidop and the blocked domain.Suggested-by Kevin Tian <[email protected]>Suggested-by Jason Gunthorpe <[email protected]>Signed-off-by Yi Liu <[email protected]>
-Vasant
RE: [PATCH v3 3/7] iommu: Detaching pasid by attaching to the blocked_domain
In reply to Yi LiuQuoted 9 lines
From: Liu, Yi L <[email protected]>
Sent: Monday, November 4, 2024 9:20 PMdrivers/iommu/iommu.c +1
-0@@ -3404,8 +3404,18 @@ static void iommu_remove_dev_pasid(struct device *dev, ioasid_t pasid, struct iommu_domain *domain) { const struct iommu_ops *ops = dev_iommu_ops(dev); +struct iommu_domain *blocked_domain = ops->blocked_domain;
drivers/iommu/iommu.c static void iommu_remove_dev_pasid(struct · line 3418
Quoted 10 lines
drivers/iommu/iommu.c +9
-0+int ret =1 ; + +if (blocked_domain && blocked_domain->ops->set_dev_pasid) { + ret = blocked_domain->ops->set_dev_pasid (blocked_domain, + dev, pasid, domain); + }else if (ops->remove_dev_pasid) { + ops->remove_dev_pasid (dev, pasid, domain); + ret =0 ; + }
given ops->remove_dev_pasid is already checked at attach time here could just call it w/o further check.
Re: [PATCH v3 3/7] iommu: Detaching pasid by attaching to the blocked_domain
Quoted 14 lines · Kevin
Quoted 14 lines
From: Liu, Yi L <[email protected]>
Sent: Monday, November 4, 2024 9:20 PMdrivers/iommu/iommu.c +6
-0@@ -3404,8 +3404,18 @@ static void iommu_remove_dev_pasid(struct device *dev, ioasid_t pasid, struct iommu_domain *domain) { const struct iommu_ops *ops = dev_iommu_ops(dev); +struct iommu_domain *blocked_domain = ops->blocked_domain; +int ret =1 ; + +if (blocked_domain && blocked_domain->ops->set_dev_pasid) { + ret = blocked_domain->ops->set_dev_pasid (blocked_domain, + dev, pasid, domain);
Quoted 8 lines
drivers/iommu/iommu.c static void iommu_remove_dev_pasid(struct device *dev, ioasid_t pasid, · line 3417
Quoted 5 lines
drivers/iommu/iommu.c +4
-0+ }else if (ops->remove_dev_pasid) { + ops->remove_dev_pasid (dev, pasid, domain); + ret =0 ; + }given
ops->remove_dev_pasidis already checked at attach time here could just call it w/o further check.
yep. A driver does not pass that check should not get here at all. So either should be valid.
Quoted 1 line
Reviewed-by Kevin Tian <[email protected]>
Signature · 2 lines
Regards, Yi Liu
PATCH v3 4/7 iommu/arm-smmu-v3: Make the blocked domain support PASID
In reply to Yi LiuFrom: Jason Gunthorpe <[email protected]>
The blocked domain is used to park RID to be blocking DMA state. This can be extended to PASID as well. By this, the remove_dev_pasid() op of ARM SMMUv3 can be dropped.
--- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +6 -6
@@ -2961,13 +2961,12 @@ int arm_smmu_set_pasid(struct arm_smmu_master *master,return ret; } -static void arm_smmu_remove_dev_pasid (struct device *dev,ioasid_t pasid, -struct iommu_domain *domain) +static int arm_smmu_blocking_set_dev_pasid (struct iommu_domain *new_domain, +struct device *dev,ioasid_t pasid, +struct iommu_domain *old_domain) { +struct arm_smmu_domain *smmu_domain =to_smmu_domain (old_domain);struct arm_smmu_master *master =dev_iommu_priv_get (dev); -struct arm_smmu_domain *smmu_domain; - - smmu_domain =to_smmu_domain (domain);mutex_lock (&arm_smmu_asid_lock);arm_smmu_clear_cd (master, pasid);
@@ -2988,6 +2987,7 @@ static void arm_smmu_remove_dev_pasid(struct device *dev, ioasid_t pasid, sid_domain->type == IOMMU_DOMAIN_BLOCKED) sid_domain->ops->attach_dev (sid_domain, dev); } +return 0 ; } static void arm_smmu_attach_dev_ste(struct iommu_domain *domain,
@@ -3069,6 +3069,7 @@ static int arm_smmu_attach_dev_blocked(struct iommu_domain *domain,static const struct iommu_domain_ops arm_smmu_blocked_ops = { .attach_dev = arm_smmu_attach_dev_blocked, + .set_dev_pasid = arm_smmu_blocking_set_dev_pasid, };static struct iommu_domain arm_smmu_blocked_domain = {
@@ -3501,7 +3502,6 @@ static struct iommu_ops arm_smmu_ops = { .device_group = arm_smmu_device_group, .of_xlate = arm_smmu_of_xlate, .get_resv_regions = arm_smmu_get_resv_regions, - .remove_dev_pasid = arm_smmu_remove_dev_pasid, .dev_enable_feat = arm_smmu_dev_enable_feature, .dev_disable_feat = arm_smmu_dev_disable_feature, .page_response = arm_smmu_page_response,
Signature · 1 line
2.34.1
PATCH v3 5/7 iommu/vt-d: Make the blocked domain support PASID
In reply to Yi LiuThe blocked domain can be extended to park PASID of a device to be the DMA blocking state. By this the remove_dev_pasid() op is dropped.
--- drivers/iommu/intel/iommu.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/iommu/intel/iommu.c +11 -4
@@ -3414,10 +3414,15 @@ static int blocking_domain_attach_dev(struct iommu_domain *domain,return 0 ; } +static int blocking_domain_set_dev_pasid (struct iommu_domain *domain, +struct device *dev,ioasid_t pasid, +struct iommu_domain *old); +static struct iommu_domain blocking_domain = { .type =IOMMU_DOMAIN_BLOCKED , .ops = &(const struct iommu_domain_ops ) { .attach_dev = blocking_domain_attach_dev, + .set_dev_pasid = blocking_domain_set_dev_pasid, } };
@@ -4291,15 +4296,18 @@ void domain_remove_dev_pasid(struct iommu_domain *domain,kfree (dev_pasid); } -static void intel_iommu_remove_dev_pasid (struct device *dev,ioasid_t pasid, -struct iommu_domain *domain) +static int blocking_domain_set_dev_pasid (struct iommu_domain *domain, +struct device *dev,ioasid_t pasid, +struct iommu_domain *old) {struct device_domain_info *info =dev_iommu_priv_get (dev);struct intel_iommu *iommu = info->iommu;intel_pasid_tear_down_entry (iommu, dev, pasid, false);intel_drain_pasid_prq (dev, pasid); -domain_remove_dev_pasid (domain, dev, pasid); +domain_remove_dev_pasid (old, dev, pasid); + +return 0 ; } struct dev_pasid_info *
@@ -4664,7 +4672,6 @@ const struct iommu_ops intel_iommu_ops = { .dev_disable_feat = intel_iommu_dev_disable_feat, .is_attach_deferred = intel_iommu_is_attach_deferred, .def_domain_type = device_def_domain_type, - .remove_dev_pasid = intel_iommu_remove_dev_pasid, .pgsize_bitmap =SZ_4K , #ifdef CONFIG_INTEL_IOMMU_SVM .page_response = intel_svm_page_response,
Signature · 1 line
2.34.1
Baolu Lu
maintainerRe: [PATCH v3 5/7] iommu/vt-d: Make the blocked domain support PASID
Quoted 23 lines · Yi Liu
drivers/iommu/intel/iommu.c +6
-3@@ -4291,15 +4296,18 @@ void domain_remove_dev_pasid(struct iommu_domain *domain,kfree (dev_pasid); } -static void intel_iommu_remove_dev_pasid (struct device *dev,ioasid_t pasid, -struct iommu_domain *domain) +static int blocking_domain_set_dev_pasid (struct iommu_domain *domain, +struct device *dev,ioasid_t pasid, +struct iommu_domain *old) {struct device_domain_info *info =dev_iommu_priv_get (dev);struct intel_iommu *iommu = info->iommu;intel_pasid_tear_down_entry (iommu, dev, pasid, false);intel_drain_pasid_prq (dev, pasid); -domain_remove_dev_pasid (domain, dev, pasid); +domain_remove_dev_pasid (old, dev, pasid); + +return 0 ; } struct dev_pasid_info *
drivers/iommu/intel/iommu.c const struct iommu_ops intel_iommu_ops = { · line 4667
Quoted 4 lines
drivers/iommu/intel/iommu.c +0
-1@@ -4664,7 +4672,6 @@ const struct iommu_ops intel_iommu_ops = { .dev_disable_feat = intel_iommu_dev_disable_feat, .is_attach_deferred = intel_iommu_is_attach_deferred, .def_domain_type = device_def_domain_type, - .remove_dev_pasid = intel_iommu_remove_dev_pasid,
This will cause iommu_attach_device_pasid() to fail due to the check and failure condition introduced in patch 1/7.
--
baolu
Re: [PATCH v3 5/7] iommu/vt-d: Make the blocked domain support PASID
Quoted 22 lines · Baolu Lu
Quoted 21 lines · Yi Liu
drivers/iommu/intel/iommu.c +6
-3@@ -4291,15 +4296,18 @@ void domain_remove_dev_pasid(struct iommu_domain *domain, kfree(dev_pasid); } -static void intel_iommu_remove_dev_pasid (struct device *dev,ioasid_t pasid, - struct iommu_domain *domain) +static int blocking_domain_set_dev_pasid(struct iommu_domain *domain, + struct device *dev, ioasid_t pasid, + struct iommu_domain *old) { struct device_domain_info *info = dev_iommu_priv_get(dev); struct intel_iommu *iommu = info->iommu; intel_pasid_tear_down_entry(iommu, dev, pasid, false); intel_drain_pasid_prq(dev, pasid); - domain_remove_dev_pasid(domain, dev, pasid); + domain_remove_dev_pasid(old, dev, pasid); + + return 0; }struct
dev_pasid_info*
Quoted 8 lines
drivers/iommu/intel/iommu.c const struct iommu_ops intel_iommu_ops = { · line 4667
Quoted 5 lines
drivers/iommu/intel/iommu.c +0
-1@@ -4664,7 +4672,6 @@ const struct iommu_ops intel_iommu_ops = { .dev_disable_feat = intel_iommu_dev_disable_feat, .is_attach_deferred = intel_iommu_is_attach_deferred, .def_domain_type = device_def_domain_type, - .remove_dev_pasid = intel_iommu_remove_dev_pasid,This will cause
iommu_attach_device_pasid()to fail due to the check and failure condition introduced in patch 1/7.
the check introduced in patch 1 were enhanced in patch 3. So removing remove_dev_pasid op does not fail as intel iommu driver provides blocked domain which has the set_dev_pasid op.
Signature · 2 lines
Regards, Yi Liu
Baolu Lu
maintainerRe: [PATCH v3 5/7] iommu/vt-d: Make the blocked domain support PASID
Quoted 32 lines · Yi Liu
Quoted 22 lines · Baolu Lu
Quoted 21 lines · Yi Liu
drivers/iommu/intel/iommu.c +6
-3@@ -4291,15 +4296,18 @@ void domain_remove_dev_pasid(structiommu_domain *domain, kfree(dev_pasid); } -static void intel_iommu_remove_dev_pasid (struct device *dev,ioasid_t pasid, - struct iommu_domain *domain) +static int blocking_domain_set_dev_pasid(struct iommu_domain *domain, + struct device *dev, ioasid_t pasid, + struct iommu_domain *old) { struct device_domain_info *info = dev_iommu_priv_get(dev); struct intel_iommu *iommu = info->iommu; intel_pasid_tear_down_entry(iommu, dev, pasid, false); intel_drain_pasid_prq(dev, pasid); - domain_remove_dev_pasid(domain, dev, pasid); + domain_remove_dev_pasid(old, dev, pasid); + + return 0; }struct
dev_pasid_info*Quoted 8 lines
drivers/iommu/intel/iommu.c const struct iommu_ops intel_iommu_ops = { · line 4667
Quoted 5 lines
drivers/iommu/intel/iommu.c +0
-1@@ -4664,7 +4672,6 @@ const struct iommu_ops intel_iommu_ops = { .dev_disable_feat = intel_iommu_dev_disable_feat, .is_attach_deferred = intel_iommu_is_attach_deferred, .def_domain_type = device_def_domain_type, - .remove_dev_pasid = intel_iommu_remove_dev_pasid,This will cause
iommu_attach_device_pasid()to fail due to the check and failure condition introduced in patch 1/7.
Quoted 4 lines
the check introduced in patch 1 were enhanced in patch 3. So removing
remove_dev_pasidop does not fail as intel iommu driver provides blocked domain which has theset_dev_pasidop.
Okay, I see. Thanks!
Re: [PATCH v3 5/7] iommu/vt-d: Make the blocked domain support PASID
In reply to Yi LiuQuoted 8 lines · Yi Liu
The blocked domain can be extended to park PASID of a device to be the DMA blocking state. By this the
remove_dev_pasid()op is dropped.Reviewed-by Kevin Tian <[email protected]>Signed-off-by Yi Liu <[email protected]>--- drivers/iommu/intel/iommu.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
Jason
PATCH v3 6/7 iommu/amd: Make the blocked domain support PASID
In reply to Yi LiuThe blocked domain can be extended to park PASID of a device to be the DMA blocking state. By this the remove_dev_pasid() op is dropped.
Remove PASID from old domain and device GCR3 table. No need to attach PASID to the blocked domain as clearing PASID from GCR3 table will make sure all DMAs for that PASID are blocked.
--- drivers/iommu/amd/iommu.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/iommu/amd/iommu.c +9 -1
@@ -2472,10 +2472,19 @@ static int blocked_domain_attach_device(struct iommu_domain *domain,return 0 ; } +static int blocked_domain_set_dev_pasid (struct iommu_domain *domain, +struct device *dev,ioasid_t pasid, +struct iommu_domain *old) +{ +amd_iommu_remove_dev_pasid (dev, pasid, old); +return 0 ; +} +static struct iommu_domain blocked_domain = { .type =IOMMU_DOMAIN_BLOCKED , .ops = &(const struct iommu_domain_ops ) { .attach_dev = blocked_domain_attach_device, + .set_dev_pasid = blocked_domain_set_dev_pasid, } };
@@ -2908,7 +2917,6 @@ const struct iommu_ops amd_iommu_ops = { .def_domain_type = amd_iommu_def_domain_type, .dev_enable_feat = amd_iommu_dev_enable_feature, .dev_disable_feat = amd_iommu_dev_disable_feature, - .remove_dev_pasid = amd_iommu_remove_dev_pasid, .page_response = amd_iommu_page_response, .default_domain_ops = &(const struct iommu_domain_ops ) { .attach_dev = amd_iommu_attach_device,
Signature · 1 line
2.34.1
Re: [PATCH v3 6/7] iommu/amd: Make the blocked domain support PASID
Quoted 7 lines · Yi Liu
The blocked domain can be extended to park PASID of a device to be the DMA blocking state. By this the
remove_dev_pasid()op is dropped.Remove PASID from old domain and device GCR3 table. No need to attach PASID to the blocked domain as clearing PASID from GCR3 table will make sure all DMAs for that PASID are blocked.
Quoted 5 lines
Suggested-by Jason Gunthorpe <[email protected]>Signed-off-by Yi Liu <[email protected]>--- drivers/iommu/amd/iommu.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
Jason
Re: [PATCH v3 6/7] iommu/amd: Make the blocked domain support PASID
In reply to Yi LiuQuoted 9 lines · Yi Liu
The blocked domain can be extended to park PASID of a device to be the DMA blocking state. By this the
remove_dev_pasid()op is dropped.Remove PASID from old domain and device GCR3 table. No need to attach PASID to the blocked domain as clearing PASID from GCR3 table will make sure all DMAs for that PASID are blocked.
Suggested-by Jason Gunthorpe <[email protected]>Signed-off-by Yi Liu <[email protected]>
-Vasant
RE: [PATCH v3 6/7] iommu/amd: Make the blocked domain support PASID
In reply to Yi LiuQuoted 6 lines
From: Liu, Yi L <[email protected]>
Sent: Monday, November 4, 2024 9:21 PMThe blocked domain can be extended to park PASID of a device to be the DMA blocking state. By this the
remove_dev_pasid()op is dropped.
Quoted 6 lines
Remove PASID from old domain and device GCR3 table. No need to attach PASID to the blocked domain as clearing PASID from GCR3 table will make sure all DMAs for that PASID are blocked.
Suggested-by Jason Gunthorpe <[email protected]>Signed-off-by Yi Liu <[email protected]>
PATCH v3 7/7 iommu: Remove the remove_dev_pasid op
In reply to Yi LiuThe iommu drivers that supports PASID have supported attaching pasid to the blocked_domain, hence remove the remove_dev_pasid op from the iommu_ops.
--- drivers/iommu/iommu.c | 17 ++++------------- include/linux/iommu.h | 5 ----- 2 files changed, 4 insertions(+), 18 deletions(-)
drivers/iommu/iommu.c +4 -13
@@ -3405,17 +3405,9 @@ static void iommu_remove_dev_pasid(struct device *dev, ioasid_t pasid, {const struct iommu_ops *ops =dev_iommu_ops (dev);struct iommu_domain *blocked_domain = ops->blocked_domain; -int ret =1 ; -if (blocked_domain && blocked_domain->ops->set_dev_pasid) { - ret = blocked_domain->ops->set_dev_pasid (blocked_domain, - dev, pasid, domain); - }else if (ops->remove_dev_pasid) { - ops->remove_dev_pasid (dev, pasid, domain); - ret =0 ; - } - -WARN_ON (ret); +WARN_ON (blocked_domain->ops->set_dev_pasid (blocked_domain, + dev, pasid, domain)); } static int __iommu_set_group_pasid(struct iommu_domain *domain,
@@ -3474,9 +3466,8 @@ int iommu_attach_device_pasid(struct iommu_domain *domain,int ret;if (!domain->ops->set_dev_pasid || - (!ops->remove_dev_pasid && - (!ops->blocked_domain || - !ops->blocked_domain->ops->set_dev_pasid))) + !ops->blocked_domain || + !ops->blocked_domain->ops->set_dev_pasid)return -EOPNOTSUPP ;if (!group)
include/linux/iommu.h +0 -5
@@ -537,9 +537,6 @@ static inline int __iommu_copy_struct_from_user_array(* - IOMMU_DOMAIN_DMA: must use a dma domain * - 0: use the default setting * @default_domain_ops: the default ops for domains -* @remove_dev_pasid: Remove any translation configurations of a specific -* pasid, so that any DMA transactions with this pasid -* will be blocked by the hardware. * @pgsize_bitmap: bitmap of all possible supported page sizes * @owner: Driver module providing these ops * @identity_domain: An always available, always attachable identity
@@ -586,8 +583,6 @@ struct iommu_ops { struct iommu_page_response *msg);int (*def_domain_type)(struct device *dev); -void (*remove_dev_pasid)(struct device *dev,ioasid_t pasid, -struct iommu_domain *domain);const struct iommu_domain_ops *default_domain_ops;unsigned long pgsize_bitmap;
Signature · 1 line
2.34.1
Re: [PATCH v3 7/7] iommu: Remove the remove_dev_pasid op
Quoted 8 lines · Yi Liu
The iommu drivers that supports PASID have supported attaching pasid to the
blocked_domain, hence remove theremove_dev_pasidop from theiommu_ops.Signed-off-by Yi Liu <[email protected]>--- drivers/iommu/iommu.c | 17 ++++------------- include/linux/iommu.h | 5 ----- 2 files changed, 4 insertions(+), 18 deletions(-)
Jason
Re: [PATCH v3 7/7] iommu: Remove the remove_dev_pasid op
In reply to Yi LiuQuoted 4 lines · Yi Liu
The iommu drivers that supports PASID have supported attaching pasid to the
blocked_domain, hence remove theremove_dev_pasidop from theiommu_ops.Signed-off-by Yi Liu <[email protected]>
-Vasant
RE: [PATCH v3 7/7] iommu: Remove the remove_dev_pasid op
In reply to Yi LiuQuoted 9 lines
From: Liu, Yi L <[email protected]>
Sent: Monday, November 4, 2024 9:21 PMThe iommu drivers that supports PASID have supported attaching pasid to the
blocked_domain, hence remove theremove_dev_pasidop from theiommu_ops.Signed-off-by Yi Liu <[email protected]>