linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: Baolu Lu <baolu.lu@linux.intel.com>
To: Nicolin Chen <nicolinc@nvidia.com>,
	joro@8bytes.org, suravee.suthikulpanit@amd.com, will@kernel.org,
	robin.murphy@arm.com, robdclark@gmail.com, dwmw2@infradead.org,
	agross@kernel.org, bjorn.andersson@linaro.org,
	matthias.bgg@gmail.com, orsonzhai@gmail.com,
	baolin.wang@linux.alibaba.com, zhang.lyra@gmail.com,
	jean-philippe@linaro.org, sricharan@codeaurora.org
Cc: quic_saipraka@quicinc.com, konrad.dybcio@somainline.org,
	virtualization@lists.linux-foundation.org,
	thierry.reding@gmail.com, jon@solid-run.com,
	jonathanh@nvidia.com, iommu@lists.linux.dev,
	yong.wu@mediatek.com, jgg@nvidia.com, yangyingliang@huawei.com,
	kevin.tian@intel.com, linux-arm-msm@vger.kernel.org,
	christophe.jaillet@wanadoo.fr, thunder.leizhen@huawei.com,
	linux-tegra@vger.kernel.org, tglx@linutronix.de,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org,
	shameerali.kolothum.thodi@huawei.com,
	linux-mediatek@lists.infradead.org, baolu.lu@linux.intel.com
Subject: Re: [PATCH v4 5/6] iommu: Use EINVAL for incompatible device/domain in ->attach_dev
Date: Thu, 22 Sep 2022 10:16:46 +0800	[thread overview]
Message-ID: <055d057e-0074-9164-8958-c892c53361b8@linux.intel.com> (raw)
In-Reply-To: <4469b88b4460fc230b8c394f806c134e627aa5bd.1663744983.git.nicolinc@nvidia.com>

On 9/21/22 4:23 PM, Nicolin Chen wrote:
> Following 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.
> 
> Signed-off-by: Nicolin Chen <nicolinc@nvidia.com>
> ---
>   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(-)
> 
> diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
> index d32b02336411..f96f8aad8280 100644
> --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
> +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
> @@ -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;
>   	}
> diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu.c b/drivers/iommu/arm/arm-smmu/arm-smmu.c
> index dfa82df00342..dbd12da31707 100644
> --- a/drivers/iommu/arm/arm-smmu/arm-smmu.c
> +++ b/drivers/iommu/arm/arm-smmu/arm-smmu.c
> @@ -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;
>   	}
> diff --git a/drivers/iommu/arm/arm-smmu/qcom_iommu.c b/drivers/iommu/arm/arm-smmu/qcom_iommu.c
> index 17235116d3bb..37c5ddc212c1 100644
> --- a/drivers/iommu/arm/arm-smmu/qcom_iommu.c
> +++ b/drivers/iommu/arm/arm-smmu/qcom_iommu.c
> @@ -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;
>   }
> diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
> index 1f2cd43cf9bc..51ef42b1bd4e 100644
> --- a/drivers/iommu/intel/iommu.c
> +++ b/drivers/iommu/intel/iommu.c
> @@ -4158,19 +4158,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;
>   
>   	/*
> diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
> index 1d42084d0276..f5217a4cb9b3 100644
> --- a/drivers/iommu/ipmmu-vmsa.c
> +++ b/drivers/iommu/ipmmu-vmsa.c
> @@ -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);
> diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c
> index 447e40d55918..be12f49140c7 100644
> --- a/drivers/iommu/omap-iommu.c
> +++ b/drivers/iommu/omap-iommu.c
> @@ -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;
>   	}
>   
> diff --git a/drivers/iommu/sprd-iommu.c b/drivers/iommu/sprd-iommu.c
> index 511959c8a14d..945576039c9e 100644
> --- a/drivers/iommu/sprd-iommu.c
> +++ b/drivers/iommu/sprd-iommu.c
> @@ -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)
> diff --git a/drivers/iommu/tegra-gart.c b/drivers/iommu/tegra-gart.c
> index e5ca3cf1a949..ed53279d1106 100644
> --- a/drivers/iommu/tegra-gart.c
> +++ b/drivers/iommu/tegra-gart.c
> @@ -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;
> diff --git a/drivers/iommu/virtio-iommu.c b/drivers/iommu/virtio-iommu.c
> index 4c652773fd6c..87128266b6e3 100644
> --- a/drivers/iommu/virtio-iommu.c
> +++ b/drivers/iommu/virtio-iommu.c
> @@ -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);
>   

For iommu/vt-d changes:

Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>

Best regards,
baolu

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  reply	other threads:[~2022-09-22  2:24 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-21  8:22 [PATCH v4 0/6] Define EINVAL as device/domain incompatibility Nicolin Chen
2022-09-21  8:23 ` [PATCH v4 3/6] iommu: Add return value rules to attach_dev op and APIs Nicolin Chen
2022-09-22  2:02   ` Baolu Lu
2022-09-22  5:09     ` Nicolin Chen
2022-09-22  8:17   ` Tian, Kevin
2022-09-22  8:38     ` Nicolin Chen
2022-09-21  8:23 ` [PATCH v4 4/6] iommu: Regulate EINVAL in ->attach_dev callback functions Nicolin Chen
2022-09-22  2:14   ` Baolu Lu
2022-09-22  8:18   ` Tian, Kevin
2022-09-21  8:23 ` [PATCH v4 5/6] iommu: Use EINVAL for incompatible device/domain in ->attach_dev Nicolin Chen
2022-09-22  2:16   ` Baolu Lu [this message]
2022-09-22  8:19   ` Tian, Kevin
2022-09-21  8:23 ` [PATCH v4 6/6] iommu: Propagate return value in ->attach_dev callback functions Nicolin Chen
2022-09-21  8:55 ` [PATCH v4 0/6] Define EINVAL as device/domain incompatibility Jean-Philippe Brucker

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=055d057e-0074-9164-8958-c892c53361b8@linux.intel.com \
    --to=baolu.lu@linux.intel.com \
    --cc=agross@kernel.org \
    --cc=baolin.wang@linux.alibaba.com \
    --cc=bjorn.andersson@linaro.org \
    --cc=christophe.jaillet@wanadoo.fr \
    --cc=dwmw2@infradead.org \
    --cc=iommu@lists.linux.dev \
    --cc=jean-philippe@linaro.org \
    --cc=jgg@nvidia.com \
    --cc=jon@solid-run.com \
    --cc=jonathanh@nvidia.com \
    --cc=joro@8bytes.org \
    --cc=kevin.tian@intel.com \
    --cc=konrad.dybcio@somainline.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mediatek@lists.infradead.org \
    --cc=linux-tegra@vger.kernel.org \
    --cc=matthias.bgg@gmail.com \
    --cc=nicolinc@nvidia.com \
    --cc=orsonzhai@gmail.com \
    --cc=quic_saipraka@quicinc.com \
    --cc=robdclark@gmail.com \
    --cc=robin.murphy@arm.com \
    --cc=shameerali.kolothum.thodi@huawei.com \
    --cc=sricharan@codeaurora.org \
    --cc=suravee.suthikulpanit@amd.com \
    --cc=tglx@linutronix.de \
    --cc=thierry.reding@gmail.com \
    --cc=thunder.leizhen@huawei.com \
    --cc=virtualization@lists.linux-foundation.org \
    --cc=will@kernel.org \
    --cc=yangyingliang@huawei.com \
    --cc=yong.wu@mediatek.com \
    --cc=zhang.lyra@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).