Move sanity and compatibility tests from the attach_dev callbacks to the new test_dev callback functions. The IOMMU core makes sure an attach_dev call must be invoked after a successful test_dev call.
Following the test_dev guideline, replace dev_err with dev_dbg. Signed-off-by: Nicolin Chen <[email protected]> --- drivers/iommu/intel/iommu.c | 66 +++++++++++++++++++++--------------- drivers/iommu/intel/nested.c | 29 +++++++++++----- drivers/iommu/intel/svm.c | 11 +++--- 3 files changed, 67 insertions(+), 39 deletions(-) diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index f0396591cd9bb..10d422bd463a2 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -3537,6 +3537,26 @@ int paging_domain_compatible(struct iommu_domain *domain, struct device *dev) return 0; } +static int intel_iommu_test_device(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; + + if (pasid != IOMMU_NO_PASID) { + if (WARN_ON_ONCE(!(domain->type & __IOMMU_DOMAIN_PAGING))) + return -EINVAL; + if (!pasid_supported(iommu) || dev_is_real_dma_subdevice(dev)) + return -EOPNOTSUPP; + if (domain->dirty_ops) + return -EINVAL; + if (context_copied(iommu, info->bus, info->devfn)) + return -EBUSY; + } + return paging_domain_compatible(domain, dev); +} + static int intel_iommu_attach_device(struct iommu_domain *domain, struct device *dev, struct iommu_domain *old) @@ -3545,10 +3565,6 @@ static int intel_iommu_attach_device(struct iommu_domain *domain, device_block_translation(dev); - ret = paging_domain_compatible(domain, dev); - if (ret) - return ret; - ret = iopf_for_domain_set(domain, dev); if (ret) return ret; @@ -4151,22 +4167,6 @@ static int intel_iommu_set_dev_pasid(struct iommu_domain *domain, struct dev_pasid_info *dev_pasid; int ret; - if (WARN_ON_ONCE(!(domain->type & __IOMMU_DOMAIN_PAGING))) - return -EINVAL; - - if (!pasid_supported(iommu) || dev_is_real_dma_subdevice(dev)) - return -EOPNOTSUPP; - - if (domain->dirty_ops) - return -EINVAL; - - if (context_copied(iommu, info->bus, info->devfn)) - return -EBUSY; - - ret = paging_domain_compatible(domain, dev); - if (ret) - return ret; - dev_pasid = domain_add_dev_pasid(domain, dev, pasid); if (IS_ERR(dev_pasid)) return PTR_ERR(dev_pasid); @@ -4178,12 +4178,9 @@ static int intel_iommu_set_dev_pasid(struct iommu_domain *domain, if (intel_domain_is_fs_paging(dmar_domain)) ret = domain_setup_first_level(iommu, dmar_domain, dev, pasid, old); - else if (intel_domain_is_ss_paging(dmar_domain)) + else /* paging_domain_compatible() made sure it's ss_paging */ ret = domain_setup_second_level(iommu, dmar_domain, dev, pasid, old); - else if (WARN_ON(true)) - ret = -EINVAL; - if (ret) goto out_unwind_iopf; @@ -4403,6 +4400,21 @@ static int device_setup_pass_through(struct device *dev) context_setup_pass_through_cb, dev); } +static int identity_domain_test_dev(struct iommu_domain *domain, + struct device *dev, ioasid_t pasid, + struct iommu_domain *old) +{ + if (pasid != IOMMU_NO_PASID) { + struct device_domain_info *info = dev_iommu_priv_get(dev); + struct intel_iommu *iommu = info->iommu; + + if (!pasid_supported(iommu) || dev_is_real_dma_subdevice(dev)) + return -EOPNOTSUPP; + } + + return 0; +} + static int identity_domain_attach_dev(struct iommu_domain *domain, struct device *dev, struct iommu_domain *old) @@ -4440,9 +4452,6 @@ static int identity_domain_set_dev_pasid(struct iommu_domain *domain, struct intel_iommu *iommu = info->iommu; int ret; - if (!pasid_supported(iommu) || dev_is_real_dma_subdevice(dev)) - return -EOPNOTSUPP; - ret = iopf_for_domain_replace(domain, old, dev); if (ret) return ret; @@ -4460,12 +4469,14 @@ static int identity_domain_set_dev_pasid(struct iommu_domain *domain, static struct iommu_domain identity_domain = { .type = IOMMU_DOMAIN_IDENTITY, .ops = &(const struct iommu_domain_ops) { + .test_dev = identity_domain_test_dev, .attach_dev = identity_domain_attach_dev, .set_dev_pasid = identity_domain_set_dev_pasid, }, }; const struct iommu_domain_ops intel_fs_paging_domain_ops = { + .test_dev = intel_iommu_test_device, .attach_dev = intel_iommu_attach_device, .set_dev_pasid = intel_iommu_set_dev_pasid, .map_pages = intel_iommu_map_pages, @@ -4479,6 +4490,7 @@ const struct iommu_domain_ops intel_fs_paging_domain_ops = { }; const struct iommu_domain_ops intel_ss_paging_domain_ops = { + .test_dev = intel_iommu_test_device, .attach_dev = intel_iommu_attach_device, .set_dev_pasid = intel_iommu_set_dev_pasid, .map_pages = intel_iommu_map_pages, diff --git a/drivers/iommu/intel/nested.c b/drivers/iommu/intel/nested.c index 760d7aa2ade84..708b8e653d5cd 100644 --- a/drivers/iommu/intel/nested.c +++ b/drivers/iommu/intel/nested.c @@ -18,19 +18,17 @@ #include "iommu.h" #include "pasid.h" -static int intel_nested_attach_dev(struct iommu_domain *domain, - struct device *dev, struct iommu_domain *old) +static int intel_nested_test_dev(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 dmar_domain *dmar_domain = to_dmar_domain(domain); struct intel_iommu *iommu = info->iommu; - unsigned long flags; - int ret = 0; - - device_block_translation(dev); + int ret; if (iommu->agaw < dmar_domain->s2_domain->agaw) { - dev_err_ratelimited(dev, "Adjusted guest address width not compatible\n"); + dev_dbg_ratelimited(dev, "Adjusted guest address width not compatible\n"); return -ENODEV; } @@ -41,10 +39,24 @@ static int intel_nested_attach_dev(struct iommu_domain *domain, */ ret = paging_domain_compatible(&dmar_domain->s2_domain->domain, dev); if (ret) { - dev_err_ratelimited(dev, "s2 domain is not compatible\n"); + dev_dbg_ratelimited(dev, "s2 domain is not compatible\n"); return ret; } + return 0; +} + +static int intel_nested_attach_dev(struct iommu_domain *domain, + struct device *dev, struct iommu_domain *old) +{ + struct device_domain_info *info = dev_iommu_priv_get(dev); + struct dmar_domain *dmar_domain = to_dmar_domain(domain); + struct intel_iommu *iommu = info->iommu; + unsigned long flags; + int ret = 0; + + device_block_translation(dev); + ret = domain_attach_iommu(dmar_domain, iommu); if (ret) { dev_err_ratelimited(dev, "Failed to attach domain to iommu\n"); @@ -192,6 +204,7 @@ static int intel_nested_set_dev_pasid(struct iommu_domain *domain, } static const struct iommu_domain_ops intel_nested_domain_ops = { + .test_dev = intel_nested_test_dev, .attach_dev = intel_nested_attach_dev, .set_dev_pasid = intel_nested_set_dev_pasid, .free = intel_nested_domain_free, diff --git a/drivers/iommu/intel/svm.c b/drivers/iommu/intel/svm.c index e147f71f91b72..5901caa4ceebc 100644 --- a/drivers/iommu/intel/svm.c +++ b/drivers/iommu/intel/svm.c @@ -145,6 +145,12 @@ static int intel_iommu_sva_supported(struct device *dev) return 0; } +static int intel_svm_test_dev(struct iommu_domain *domain, struct device *dev, + ioasid_t pasid, struct iommu_domain *old) +{ + return intel_iommu_sva_supported(dev); +} + static int intel_svm_set_dev_pasid(struct iommu_domain *domain, struct device *dev, ioasid_t pasid, struct iommu_domain *old) @@ -156,10 +162,6 @@ static int intel_svm_set_dev_pasid(struct iommu_domain *domain, unsigned long sflags; int ret = 0; - ret = intel_iommu_sva_supported(dev); - if (ret) - return ret; - dev_pasid = domain_add_dev_pasid(domain, dev, pasid); if (IS_ERR(dev_pasid)) return PTR_ERR(dev_pasid); @@ -195,6 +197,7 @@ static void intel_svm_domain_free(struct iommu_domain *domain) } static const struct iommu_domain_ops intel_svm_domain_ops = { + .test_dev = intel_svm_test_dev, .set_dev_pasid = intel_svm_set_dev_pasid, .free = intel_svm_domain_free }; -- 2.43.0
