Define EINVAL as device/domain incompatibility
Subsystems (12)
v5 cover Define EINVAL as device/domain incompatibility
This series is to replace the previous EMEDIUMTYPE patch in a VFIO series:
https://lore.kernel.org/kvm/[email protected]/
The purpose is to regulate all existing ->attach_dev callback functions to use EINVAL exclusively for an incompatibility error between a device and a domain. This allows VFIO and IOMMUFD to detect such a soft error, and then try a different domain with the same device.
Among all the patches, the first two are preparatory changes. And then one patch to update kdocs and another three patches for the enforcement effort.
Although it might be ideal to merge the previous VFIO series together with this series, given the number of new changes, the review in the IOMMU list might need a couple of rounds to finalize. Also, considering that v6.0 is at rc5 now, perhaps we could merge this IOMMU series and the VFIO one in different cycles to avoid merge conflicts. If there's less concern for it, I can respin the finalized version of this series with the previous VFIO one to merge together into the VFIO tree.
This series is also available on Github:
https://github.com/nicolinc/iommufd/commits/iommu_attach_dev-v5
Changelog
v5:
* Updated kdocs to correct "attach" narratives
* Updated kdocs to be more concise and accurate
* Added "Reviewed-by" from Kevin to most of changes
* Added "Reviewed-by" from Baolu to the intel_iommu changes
* Added "Reviewed-by" from Jean to the virtio-iommu changes
v4: https://lore.kernel.org/linux-iommu/[email protected]/
* Refined kdocs with Kevin's input
* Fixed an EINVAL conversion in the intel_iommu driver
* Added missing error-out routines in the msm_iommu driver
* Added a missing EINVAL conversion in the virtio-iommu driver
* Updated commit message and added "Reviewed-by" from Kevin to the last patch
v3: https://lore.kernel.org/linux-iommu/[email protected]/
* Added "Reviewed-by" from Vasant to the AMD patch
* Dropped all unnecessary errno enforcement patches
* Updated kdocs and brought back the kdocs for the helpers
* Added a separate patch to propagate "ret" for potential EINVALs
* Converted to ENODEV those existing EINVAL places that are device-specific
v2: https://lore.kernel.org/linux-iommu/[email protected]/
* Fixed kdocs format
* Grouped with the virtio patch from Jean (with a small change)
* Separated previous ENODEV and EINVAL changes to per-driver ones
* Redone some of the changes to have explicit return values in the ->attach_dev() callback functions or their direct sub-functions.
v1: https://lore.kernel.org/linux-iommu/[email protected]/
Thanks!
Nicolin Chen (6):
iommu/msm: Fix error-out routine in msm_iommu_attach_dev() iommu/amd: Drop unnecessary checks in amd_iommu_attach_device()
iommu: Add return value rules to attach_dev op and APIs
iommu: Regulate EINVAL in ->attach_dev callback functions
iommu: Use EINVAL for incompatible device/domain in ->attach_dev
iommu: Propagate return value in ->attach_dev callback functions
drivers/iommu/amd/iommu.c | 12 +---- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 11 +--- drivers/iommu/arm/arm-smmu/arm-smmu.c | 3 -- drivers/iommu/arm/arm-smmu/qcom_iommu.c | 7 +-- drivers/iommu/fsl_pamu.c | 2 +- drivers/iommu/fsl_pamu_domain.c | 4 +- drivers/iommu/intel/iommu.c | 10 ++-- drivers/iommu/intel/pasid.c | 6 ++- drivers/iommu/iommu.c | 24 +++++++++ drivers/iommu/ipmmu-vmsa.c | 2 - drivers/iommu/msm_iommu.c | 59 +++++++++++---------- drivers/iommu/mtk_iommu.c | 4 +- drivers/iommu/omap-iommu.c | 6 +-- drivers/iommu/sprd-iommu.c | 4 +- drivers/iommu/tegra-gart.c | 2 +- drivers/iommu/virtio-iommu.c | 7 ++- include/linux/iommu.h | 12 +++++ 17 files changed, 92 insertions(+), 83 deletions(-)
Signature · 1 line
2.17.1
PATCH v5 1/6 iommu/msm: Fix error-out routine in msm_iommu_attach_dev()
The error-out routine is missing all the reverting pieces for the iop and attached-ctx allocations. And clock enable/disable is unbalanced too.
Fix it by adding __disable_clocks() and calling msm_iommu_detach_dev() at the end of the msm_iommu_attach_dev() if "ret" is non-zero. Also set the master->num to 0 in the detach_dev() since attach_dev() would check it.
--- drivers/iommu/msm_iommu.c | 59 +++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 27 deletions(-)
drivers/iommu/msm_iommu.c +32 -27
@@ -394,6 +394,34 @@ static struct iommu_device *msm_iommu_probe_device(struct device *dev)return &iommu->iommu; } +static void msm_iommu_detach_dev (struct iommu_domain *domain, +struct device *dev) +{ +struct msm_priv *priv =to_msm_priv (domain); +unsigned long flags; +struct msm_iommu_dev *iommu; +struct msm_iommu_ctx_dev *master; +int ret; + +free_io_pgtable_ops (priv->iop); + +spin_lock_irqsave (&msm_iommu_lock, flags); +list_for_each_entry (iommu, &priv->list_attached, dom_node) { + ret =__enable_clocks (iommu); +if (ret) + goto fail; + +list_for_each_entry (master, &iommu->ctx_list, list) { +msm_iommu_free_ctx (iommu->context_map, master->num); +__reset_context (iommu->base, master->num); + master->num =0 ; + } +__disable_clocks (iommu); + } +fail: +spin_unlock_irqrestore (&msm_iommu_lock, flags); +} +static int msm_iommu_attach_dev (struct iommu_domain *domain,struct device *dev) {int ret =0 ;
@@ -418,6 +446,7 @@ static int msm_iommu_attach_dev(struct iommu_domain *domain, struct device *dev)list_for_each_entry (master, &iommu->ctx_list, list) {if (master->num) {dev_err (dev,"domain already attached" ); +__disable_clocks (iommu); ret = -EEXIST ; goto fail; }
@@ -425,6 +454,7 @@ static int msm_iommu_attach_dev(struct iommu_domain *domain, struct device *dev)msm_iommu_alloc_ctx (iommu->context_map,0 , iommu->ncb);if (IS_ERR_VALUE (master->num)) { +__disable_clocks (iommu); ret = -ENODEV ; goto fail; }
@@ -439,37 +469,12 @@ static int msm_iommu_attach_dev(struct iommu_domain *domain, struct device *dev) fail:spin_unlock_irqrestore (&msm_iommu_lock, flags); +if (ret) +msm_iommu_detach_dev (domain, dev);return ret; } -static void msm_iommu_detach_dev (struct iommu_domain *domain, -struct device *dev) -{ -struct msm_priv *priv =to_msm_priv (domain); -unsigned long flags; -struct msm_iommu_dev *iommu; -struct msm_iommu_ctx_dev *master; -int ret; - -free_io_pgtable_ops (priv->iop); - -spin_lock_irqsave (&msm_iommu_lock, flags); -list_for_each_entry (iommu, &priv->list_attached, dom_node) { - ret =__enable_clocks (iommu); -if (ret) - goto fail; - -list_for_each_entry (master, &iommu->ctx_list, list) { -msm_iommu_free_ctx (iommu->context_map, master->num); -__reset_context (iommu->base, master->num); - } -__disable_clocks (iommu); - } -fail: -spin_unlock_irqrestore (&msm_iommu_lock, flags); -} -static int msm_iommu_map (struct iommu_domain *domain,unsigned long iova,phys_addr_t pa,size_t len,int prot,gfp_t gfp) {
Signature · 1 line
2.17.1
Re: [PATCH v5 1/6] iommu/msm: Fix error-out routine in msm_iommu_attach_dev()
Quoted 18 lines · Nicolin Chen
drivers/iommu/msm_iommu.c +10
-0@@ -394,6 +394,34 @@ static struct iommu_device *msm_iommu_probe_device(struct device *dev)return &iommu->iommu; } +static void msm_iommu_detach_dev (struct iommu_domain *domain, +struct device *dev) +{ +struct msm_priv *priv =to_msm_priv (domain); +unsigned long flags; +struct msm_iommu_dev *iommu; +struct msm_iommu_ctx_dev *master; +int ret; + +free_io_pgtable_ops (priv->iop);
drivers/iommu/msm_iommu.c static struct iommu_device *msm_iommu_probe_device(struct device *dev) · line 416
Quoted 10 lines
drivers/iommu/msm_iommu.c +10
-0+ +spin_lock_irqsave (&msm_iommu_lock, flags); +list_for_each_entry (iommu, &priv->list_attached, dom_node) { + ret =__enable_clocks (iommu); +if (ret) + goto fail; + +list_for_each_entry (master, &iommu->ctx_list, list) { +msm_iommu_free_ctx (iommu->context_map, master->num); +__reset_context (iommu->base, master->num);
This isn't safe if the loop in msm_iommu_attach_dev() exits early.
Firstly the it leaves master->num set to -ERRNO so clear_bit will corrupt memory
Secondly if the attach loop gets half way through the remaining entries have master->num == 0 and so the clear_bit() will corrupt an otherwise valid entry.
Fixing all of this properly looks like a big deal, I think we should drop this patch from the series.
Jason
Re: [PATCH v5 1/6] iommu/msm: Fix error-out routine in msm_iommu_attach_dev()
Quoted 27 lines · Jason Gunthorpe
Quoted 10 lines
drivers/iommu/msm_iommu.c +10
-0+static void msm_iommu_detach_dev (struct iommu_domain *domain, +struct device *dev) +{ +struct msm_priv *priv =to_msm_priv (domain); +unsigned long flags; +struct msm_iommu_dev *iommu; +struct msm_iommu_ctx_dev *master; +int ret; + +free_io_pgtable_ops (priv->iop);drivers/iommu/msm_iommu.c static struct iommu_device *msm_iommu_probe_device(struct device *dev) · line 416
Quoted 10 lines
drivers/iommu/msm_iommu.c +10
-0+ +spin_lock_irqsave (&msm_iommu_lock, flags); +list_for_each_entry (iommu, &priv->list_attached, dom_node) { + ret =__enable_clocks (iommu); +if (ret) + goto fail; + +list_for_each_entry (master, &iommu->ctx_list, list) { +msm_iommu_free_ctx (iommu->context_map, master->num); +__reset_context (iommu->base, master->num);This isn't safe if the loop in
msm_iommu_attach_dev()exits early.Firstly the it leaves
master->numset to-ERRNOsoclear_bitwill corrupt memory
Quoted 6 lines
Secondly if the attach loop gets half way through the remaining entries have
master->num== 0 and so theclear_bit()will corrupt an otherwise valid entry.Fixing all of this properly looks like a big deal, I think we should drop this patch from the series.
OK. Let me resend a version dropping this one. Thanks!
PATCH v5 2/6 iommu/amd: Drop unnecessary checks in amd_iommu_attach_device()
In reply to Nicolin ChenThe same checks are done in amd_iommu_probe_device(). If any of them fails there, then the device won't get a group, so there's no way for it to even reach amd_iommu_attach_device anymore.
--- drivers/iommu/amd/iommu.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)
drivers/iommu/amd/iommu.c +2 -10
@@ -2135,21 +2135,13 @@ static void amd_iommu_detach_device(struct iommu_domain *dom,static int amd_iommu_attach_device (struct iommu_domain *dom,struct device *dev) { +struct iommu_dev_data *dev_data =dev_iommu_priv_get (dev);struct protection_domain *domain =to_pdomain (dom); -struct iommu_dev_data *dev_data; -struct amd_iommu *iommu; +struct amd_iommu *iommu =rlookup_amd_iommu (dev);int ret; -if (!check_device (dev)) -return -EINVAL ; - - dev_data =dev_iommu_priv_get (dev); dev_data->defer_attach = false; - iommu =rlookup_amd_iommu (dev); -if (!iommu) -return -EINVAL ; -if (dev_data->domain)detach_device (dev);
Signature · 1 line
2.17.1
Re: [PATCH v5 2/6] iommu/amd: Drop unnecessary checks in amd_iommu_attach_device()
Quoted 4 lines · Nicolin Chen
The same checks are done in
amd_iommu_probe_device(). If any of them fails there, then the device won't get a group, so there's no way for it to even reachamd_iommu_attach_deviceanymore.
Quoted 8 lines
Suggested-by Robin Murphy <[email protected]>Cc Joerg Roedel <[email protected]>Cc Suravee Suthikulpanit <[email protected]>Reviewed-by Vasant Hegde <[email protected]>Signed-off-by Nicolin Chen <[email protected]>--- drivers/iommu/amd/iommu.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)
Jason
PATCH v5 3/6 iommu: Add return value rules to attach_dev op and APIs
In reply to Nicolin ChenCases like VFIO wish to attach a device to an existing domain that was not allocated specifically from the device. This raises a condition where the IOMMU driver can fail the domain attach because the domain and device are incompatible with each other.
This is a soft failure that can be resolved by using a different domain.
Provide a dedicated errno EINVAL from the IOMMU driver during attach that the reason why the attach failed is because of domain incompatibility.
VFIO can use this to know that the attach is a soft failure and it should continue searching. Otherwise, the attach will be a hard failure and VFIO will return the code to userspace.
Update kdocs to add rules of return value to the attach_dev op and APIs.
--- drivers/iommu/iommu.c | 24 ++++++++++++++++++++++++ include/linux/iommu.h | 12 ++++++++++++ 2 files changed, 36 insertions(+)
drivers/iommu/iommu.c +24 -0
@@ -1975,6 +1975,18 @@ static int __iommu_attach_device(struct iommu_domain *domain,return ret; } +/** +* iommu_attach_device - Attach an IOMMU domain to a device +* @domain: IOMMU domain to attach +* @dev: Device that will be attached +* +* Returns 0 on success and error code on failure +* +* Note that EINVAL can be treated as a soft failure, indicating +* that certain configuration of the domain is incompatible with +* the device. In this case attaching a different domain to the +* device may succeed. +*/ int iommu_attach_device (struct iommu_domain *domain,struct device *dev) {struct iommu_group *group;
@@ -2101,6 +2113,18 @@ static int __iommu_attach_group(struct iommu_domain *domain,return ret; } +/** +* iommu_attach_group - Attach an IOMMU domain to an IOMMU group +* @domain: IOMMU domain to attach +* @group: IOMMU group that will be attached +* +* Returns 0 on success and error code on failure +* +* Note that EINVAL can be treated as a soft failure, indicating +* that certain configuration of the domain is incompatible with +* the group. In this case attaching a different domain to the +* group may succeed. +*/ int iommu_attach_group (struct iommu_domain *domain,struct iommu_group *group) {int ret;
include/linux/iommu.h +12 -0
@@ -266,6 +266,18 @@ struct iommu_ops {/** * struct iommu_domain_ops - domain specific operations * @attach_dev: attach an iommu domain to a device +* Return: +* * 0 - success +* * EINVAL - can indicate that device and domain are incompatible due to +* some previous configuration of the domain, in which case the +* driver shouldn't log an error, since it is legitimate for a +* caller to test reuse of existing domains. Otherwise, it may +* still represent some other fundamental problem +* * ENOMEM - out of memory +* * ENOSPC - non-ENOMEM type of resource allocation failures +* * EBUSY - device is attached to a domain and cannot be changed +* * ENODEV - device specific errors, not able to be attached +* * <others> - treated as ENODEV by the caller. Use is discouraged * @detach_dev: detach an iommu domain from a device * @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
Signature · 1 line
2.17.1
Re: [PATCH v5 3/6] iommu: Add return value rules to attach_dev op and APIs
Quoted 16 lines · Nicolin Chen
Cases like VFIO wish to attach a device to an existing domain that was not allocated specifically from the device. This raises a condition where the IOMMU driver can fail the domain attach because the domain and device are incompatible with each other.
This is a soft failure that can be resolved by using a different domain.
Provide a dedicated errno EINVAL from the IOMMU driver during attach that the reason why the attach failed is because of domain incompatibility.
VFIO can use this to know that the attach is a soft failure and it should continue searching. Otherwise, the attach will be a hard failure and VFIO will return the code to userspace.
Update kdocs to add rules of return value to the
attach_devop and APIs.
Quoted 7 lines
Suggested-by Jason Gunthorpe <[email protected]>Reviewed-by Kevin Tian <[email protected]>Signed-off-by Nicolin Chen <[email protected]>--- drivers/iommu/iommu.c | 24 ++++++++++++++++++++++++ include/linux/iommu.h | 12 ++++++++++++ 2 files changed, 36 insertions(+)
Jason
PATCH v5 4/6 iommu: Regulate EINVAL in ->attach_dev callback functions
In reply to Nicolin ChenFollowing the new rules in include/linux/iommu.h kdocs, EINVAL now can be used to indicate that domain and device are incompatible by a caller that treats it as a soft failure and tries attaching to another domain.
On the other hand, there are ->attach_dev callback functions returning it for obvious device-specific errors. They will result in some inefficiency in the caller handling routine.
Update these places to corresponding errnos following the new rules.
--- drivers/iommu/fsl_pamu.c | 2 +- drivers/iommu/fsl_pamu_domain.c | 4 ++-- drivers/iommu/intel/pasid.c | 6 ++++-- drivers/iommu/mtk_iommu.c | 2 +- drivers/iommu/omap-iommu.c | 4 ++-- drivers/iommu/virtio-iommu.c | 2 +- 6 files changed, 11 insertions(+), 9 deletions(-)
drivers/iommu/fsl_pamu.c +1 -1
@@ -211,7 +211,7 @@ int pamu_config_ppaace(int liodn, u32 omi, u32 stashid, int prot) ppaace->op_encode.index_ot.omi = omi; }else if (~omi !=0 ) {pr_debug ("bad operation mapping index: %d\n" , omi); -return -EINVAL ; +return -ENODEV ; }/* configure stash id */
drivers/iommu/fsl_pamu_domain.c +2 -2
@@ -258,7 +258,7 @@ static int fsl_pamu_attach_device(struct iommu_domain *domain, liodn =of_get_property (dev->of_node,"fsl,liodn" , &len);if (!liodn) {pr_debug ("missing fsl,liodn property at %pOF\n" , dev->of_node); -return -EINVAL ; +return -ENODEV ; }spin_lock_irqsave (&dma_domain->domain_lock, flags);
@@ -267,7 +267,7 @@ static int fsl_pamu_attach_device(struct iommu_domain *domain,if (liodn[i] >=PAACE_NUMBER_ENTRIES ) {pr_debug ("Invalid liodn %d, attach device failed for %pOF\n" , liodn[i], dev->of_node); - ret = -EINVAL ; + ret = -ENODEV ;break ; }
drivers/iommu/intel/pasid.c +4 -2
@@ -101,8 +101,10 @@ int intel_pasid_alloc_table(struct device *dev)might_sleep (); info =dev_iommu_priv_get (dev); -if (WARN_ON (!info || !dev_is_pci (dev) || info->pasid_table)) -return -EINVAL ; +if (WARN_ON (!info || !dev_is_pci (dev))) +return -ENODEV ; +if (WARN_ON (info->pasid_table)) +return -EEXIST ; pasid_table =kzalloc (sizeof (*pasid_table),GFP_KERNEL );if (!pasid_table)
drivers/iommu/mtk_iommu.c +1 -1
@@ -607,7 +607,7 @@ static int mtk_iommu_domain_finalise(struct mtk_iommu_domain *dom, dom->iop =alloc_io_pgtable_ops (ARM_V7S , &dom->cfg, data);if (!dom->iop) {dev_err (data->dev,"Failed to alloc io pgtable\n" ); -return -EINVAL ; +return -ENOMEM ; }/* Update our support page sizes bitmap */
drivers/iommu/omap-iommu.c +2 -2
@@ -1414,7 +1414,7 @@ static int omap_iommu_attach_init(struct device *dev, odomain->num_iommus =omap_iommu_count (dev);if (!odomain->num_iommus) -return -EINVAL ; +return -ENODEV ; odomain->iommus =kcalloc (odomain->num_iommus,sizeof (*iommu),GFP_ATOMIC );
@@ -1464,7 +1464,7 @@ omap_iommu_attach_dev(struct iommu_domain *domain, struct device *dev)if (!arch_data || !arch_data->iommu_dev) {dev_err (dev,"device doesn't have an associated iommu\n" ); -return -EINVAL ; +return -ENODEV ; }spin_lock (&omap_domain->lock);
drivers/iommu/virtio-iommu.c +1 -1
@@ -669,7 +669,7 @@ static int viommu_domain_finalise(struct viommu_endpoint *vdev,dev_err (vdev->dev,"granule 0x%lx larger than system page size 0x%lx\n" , viommu_page_size,PAGE_SIZE ); -return -EINVAL ; +return -ENODEV ; } ret = ida_alloc_range(&viommu->domain_ids, viommu->first_domain,
Signature · 1 line
2.17.1
Re: [PATCH v5 4/6] iommu: Regulate EINVAL in ->attach_dev callback functions
Quoted 14 lines · Nicolin Chen
Following the new rules in
include/linux/iommu.hkdocs, EINVAL now can be used to indicate that domain and device are incompatible by a caller that treats it as a soft failure and tries attaching to another domain.On the other hand, there are ->attach_dev callback functions returning it for obvious device-specific errors. They will result in some inefficiency in the caller handling routine.
Update these places to corresponding errnos following the new rules.
Reviewed-by Jean-Philippe Brucker <[email protected]>Reviewed-by Lu Baolu <[email protected]>Reviewed-by Kevin Tian <[email protected]>Signed-off-by Nicolin Chen <[email protected]>
Quoted 8 lines
--- drivers/iommu/fsl_pamu.c | 2 +- drivers/iommu/fsl_pamu_domain.c | 4 ++-- drivers/iommu/intel/pasid.c | 6 ++++-- drivers/iommu/mtk_iommu.c | 2 +- drivers/iommu/omap-iommu.c | 4 ++-- drivers/iommu/virtio-iommu.c | 2 +- 6 files changed, 11 insertions(+), 9 deletions(-)
Jason
PATCH v5 5/6 iommu: Use EINVAL for incompatible device/domain in ->attach_dev
In reply to Nicolin ChenFollowing the new rules in include/linux/iommu.h kdocs, update all drivers ->attach_dev callback functions to return EINVAL in the failure paths that are related to domain incompatibility.
Also, drop adjacent error prints to prevent a kernel log spam.
--- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 11 +---------- drivers/iommu/arm/arm-smmu/arm-smmu.c | 3 --- drivers/iommu/arm/arm-smmu/qcom_iommu.c | 7 +------ drivers/iommu/intel/iommu.c | 10 +++------- drivers/iommu/ipmmu-vmsa.c | 2 -- drivers/iommu/omap-iommu.c | 2 +- drivers/iommu/sprd-iommu.c | 4 +--- drivers/iommu/tegra-gart.c | 2 +- drivers/iommu/virtio-iommu.c | 3 +-- 9 files changed, 9 insertions(+), 35 deletions(-)
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +1 -10
@@ -2429,23 +2429,14 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev) goto out_unlock; } }else if (smmu_domain->smmu != smmu) { -dev_err (dev, -"cannot attach to SMMU %s (upstream of %s)\n" , -dev_name (smmu_domain->smmu->dev), -dev_name (smmu->dev)); - ret = -ENXIO ; + ret = -EINVAL ; goto out_unlock; }else if (smmu_domain->stage ==ARM_SMMU_DOMAIN_S1 && master->ssid_bits != smmu_domain->s1_cfg.s1cdmax) { -dev_err (dev, -"cannot attach to incompatible domain (%u SSID bits != %u)\n" , - smmu_domain->s1_cfg.s1cdmax, master->ssid_bits); ret = -EINVAL ; goto out_unlock; }else if (smmu_domain->stage ==ARM_SMMU_DOMAIN_S1 && smmu_domain->stall_enabled != master->stall_enabled) { -dev_err (dev,"cannot attach to stall-%s domain\n" , - smmu_domain->stall_enabled ?"enabled" :"disabled" ); ret = -EINVAL ; goto out_unlock; }
drivers/iommu/arm/arm-smmu/arm-smmu.c +0 -3
@@ -1167,9 +1167,6 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev)* different SMMUs. */ if (smmu_domain->smmu != smmu) { -dev_err (dev, -"cannot attach to SMMU %s whilst already attached to domain on SMMU %s\n" , -dev_name (smmu_domain->smmu->dev),dev_name (smmu->dev)); ret = -EINVAL ; goto rpm_put; }
drivers/iommu/arm/arm-smmu/qcom_iommu.c +1 -6
@@ -381,13 +381,8 @@ static int qcom_iommu_attach_dev(struct iommu_domain *domain, struct device *dev* Sanity check the domain. We don't support domains across * different IOMMUs. */ -if (qcom_domain->iommu != qcom_iommu) { -dev_err (dev,"cannot attach to IOMMU %s while already " -"attached to domain on IOMMU %s\n" , -dev_name (qcom_domain->iommu->dev), -dev_name (qcom_iommu->dev)); +if (qcom_domain->iommu != qcom_iommu)return -EINVAL ; - }return 0 ; }
drivers/iommu/intel/iommu.c +3 -7
@@ -4181,19 +4181,15 @@ static int prepare_domain_attach_device(struct iommu_domain *domain,return -ENODEV ;if (dmar_domain->force_snooping && !ecap_sc_support (iommu->ecap)) -return -EOPNOTSUPP ; +return -EINVAL ;/* check if this iommu agaw is sufficient for max mapped address */ addr_width =agaw_to_width (iommu->agaw);if (addr_width >cap_mgaw (iommu->cap)) addr_width =cap_mgaw (iommu->cap); -if (dmar_domain->max_addr > (1LL << addr_width)) { -dev_err (dev,"%s: iommu width (%d) is not " -"sufficient for the mapped address (%llx)\n" , - __func__, addr_width, dmar_domain->max_addr); -return -EFAULT ; - } +if (dmar_domain->max_addr > (1LL << addr_width)) +return -EINVAL ; dmar_domain->gaw = addr_width;/*
drivers/iommu/ipmmu-vmsa.c +0 -2
@@ -628,8 +628,6 @@ static int ipmmu_attach_device(struct iommu_domain *io_domain,* Something is wrong, we can't attach two devices using * different IOMMUs to the same domain. */ -dev_err (dev,"Can't attach IPMMU %s to domain on IPMMU %s\n" , -dev_name (mmu->dev),dev_name (domain->mmu->dev)); ret = -EINVAL ; }else dev_info (dev,"Reusing IPMMU context %u\n" , domain->context_id);
drivers/iommu/omap-iommu.c +1 -1
@@ -1472,7 +1472,7 @@ omap_iommu_attach_dev(struct iommu_domain *domain, struct device *dev)/* only a single client device can be attached to a domain */ if (omap_domain->dev) {dev_err (dev,"iommu domain is already attached\n" ); - ret = -EBUSY ; + ret = -EINVAL ; goto out; }
drivers/iommu/sprd-iommu.c +1 -3
@@ -237,10 +237,8 @@ static int sprd_iommu_attach_device(struct iommu_domain *domain,struct sprd_iommu_domain *dom =to_sprd_domain (domain);size_t pgt_size =sprd_iommu_pgt_size (domain); -if (dom->sdev) { -pr_err ("There's already a device attached to this domain.\n" ); +if (dom->sdev)return -EINVAL ; - } dom->pgt_va =dma_alloc_coherent (sdev->dev, pgt_size, &dom->pgt_pa,GFP_KERNEL );if (!dom->pgt_va)
drivers/iommu/tegra-gart.c +1 -1
@@ -112,7 +112,7 @@ static int gart_iommu_attach_dev(struct iommu_domain *domain,spin_lock (&gart->dom_lock);if (gart->active_domain && gart->active_domain != domain) { - ret = -EBUSY ; + ret = -EINVAL ; }else if (dev_iommu_priv_get (dev) != domain) {dev_iommu_priv_set (dev, domain); gart->active_domain = domain;
drivers/iommu/virtio-iommu.c +1 -2
@@ -733,8 +733,7 @@ static int viommu_attach_dev(struct iommu_domain *domain, struct device *dev)*/ ret =viommu_domain_finalise (vdev, domain); }else if (vdomain->viommu != vdev->viommu) { -dev_err (dev,"cannot attach to foreign vIOMMU\n" ); - ret = -EXDEV ; + ret = -EINVAL ; }mutex_unlock (&vdomain->mutex);
Signature · 1 line
2.17.1
Re: [PATCH v5 5/6] iommu: Use EINVAL for incompatible device/domain in ->attach_dev
Quoted 10 lines · Nicolin Chen
Following the new rules in
include/linux/iommu.hkdocs, update all drivers ->attach_dev callback functions to return EINVAL in the failure paths that are related to domain incompatibility.Also, drop adjacent error prints to prevent a kernel log spam.
Reviewed-by Jean-Philippe Brucker <[email protected]>Reviewed-by Lu Baolu <[email protected]>Reviewed-by Kevin Tian <[email protected]>Signed-off-by Nicolin Chen <[email protected]>
Quoted 11 lines
--- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 11 +---------- drivers/iommu/arm/arm-smmu/arm-smmu.c | 3 --- drivers/iommu/arm/arm-smmu/qcom_iommu.c | 7 +------ drivers/iommu/intel/iommu.c | 10 +++------- drivers/iommu/ipmmu-vmsa.c | 2 -- drivers/iommu/omap-iommu.c | 2 +- drivers/iommu/sprd-iommu.c | 4 +--- drivers/iommu/tegra-gart.c | 2 +- drivers/iommu/virtio-iommu.c | 3 +-- 9 files changed, 9 insertions(+), 35 deletions(-)
Jason
PATCH v5 6/6 iommu: Propagate return value in ->attach_dev callback functions
In reply to Nicolin ChenThe mtk_iommu and virtio drivers have places in the ->attach_dev callback functions that return hardcode errnos instead of the returned values, but callers of these ->attach_dv callback functions may care. Propagate them directly without the extra conversions.
--- drivers/iommu/mtk_iommu.c | 2 +- drivers/iommu/virtio-iommu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/iommu/mtk_iommu.c +1 -1
@@ -666,7 +666,7 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain, ret =mtk_iommu_domain_finalise (dom, frstdata, region_id);if (ret) {mutex_unlock (&dom->mutex); -return -ENODEV ; +return ret; } dom->bank = &data->bank[bankid]; }
drivers/iommu/virtio-iommu.c +1 -1
@@ -696,7 +696,7 @@ static int viommu_domain_finalise(struct viommu_endpoint *vdev,if (ret) {ida_free (&viommu->domain_ids, vdomain->id); vdomain->viommu =NULL ; -return -EOPNOTSUPP ; +return ret; } }
Signature · 1 line
2.17.1
Re: [PATCH v5 6/6] iommu: Propagate return value in ->attach_dev callback functions
Quoted 5 lines · Nicolin Chen
The
mtk_iommuand virtio drivers have places in the ->attach_dev callback functions that return hardcode errnos instead of the returned values, but callers of these ->attach_dv callback functions may care. Propagate them directly without the extra conversions.
Quoted 7 lines
Reviewed-by Kevin Tian <[email protected]>Reviewed-by Jean-Philippe Brucker <[email protected]>Signed-off-by Nicolin Chen <[email protected]>--- drivers/iommu/mtk_iommu.c | 2 +- drivers/iommu/virtio-iommu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Jason
Re: [PATCH v5 6/6] iommu: Propagate return value in ->attach_dev callback functions
In reply to Nicolin ChenQuoted 8 lines · Nicolin Chen
The
mtk_iommuand virtio drivers have places in the ->attach_dev callback
functions that return hardcode errnos instead of the returned values, but
callers of these ->attach_dv callback functions may care. Propagate them
directly without the extra conversions.
Quoted 8 lines
Reviewed-by Kevin Tian <[email protected]>Reviewed-by Jean-Philippe Brucker <[email protected]>Signed-off-by Nicolin Chen <[email protected]>--- drivers/iommu/mtk_iommu.c | 2 +- drivers/iommu/virtio-iommu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Thanks.