From: Baolu Lu <baolu.lu@linux.intel.com>
To: Nicolin Chen <nicolinc@nvidia.com>,
joro@8bytes.org, will@kernel.org, robin.murphy@arm.com,
dwmw2@infradead.org, yong.wu@mediatek.com,
matthias.bgg@gmail.com
Cc: baolu.lu@linux.intel.com, jgg@nvidia.com, kevin.tian@intel.com,
iommu@lists.linux.dev, linux-kernel@vger.kernel.org,
linux-mediatek@lists.infradead.org,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v4 4/6] iommu: Regulate EINVAL in ->attach_dev callback functions
Date: Thu, 22 Sep 2022 10:14:19 +0800 [thread overview]
Message-ID: <01645bfa-a897-05cd-9934-a057e1d79fff@linux.intel.com> (raw)
In-Reply-To: <6c48822600154314778157ab7f72a7b55f5e2c65.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, 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.
>
> Signed-off-by: Nicolin Chen <nicolinc@nvidia.com>
> ---
> 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(-)
>
> diff --git a/drivers/iommu/fsl_pamu.c b/drivers/iommu/fsl_pamu.c
> index 0d03f837a5d4..2eb3211c8167 100644
> --- a/drivers/iommu/fsl_pamu.c
> +++ b/drivers/iommu/fsl_pamu.c
> @@ -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 */
> diff --git a/drivers/iommu/fsl_pamu_domain.c b/drivers/iommu/fsl_pamu_domain.c
> index 011f9ab7f743..b4a1c0f79c3e 100644
> --- a/drivers/iommu/fsl_pamu_domain.c
> +++ b/drivers/iommu/fsl_pamu_domain.c
> @@ -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;
> }
>
> diff --git a/drivers/iommu/intel/pasid.c b/drivers/iommu/intel/pasid.c
> index c5e7e8b020a5..aff1a9caa496 100644
> --- a/drivers/iommu/intel/pasid.c
> +++ b/drivers/iommu/intel/pasid.c
> @@ -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)
> diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
> index 7e363b1f24df..be1a7d1cc630 100644
> --- a/drivers/iommu/mtk_iommu.c
> +++ b/drivers/iommu/mtk_iommu.c
> @@ -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 */
> diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c
> index d9cf2820c02e..447e40d55918 100644
> --- a/drivers/iommu/omap-iommu.c
> +++ b/drivers/iommu/omap-iommu.c
> @@ -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);
> diff --git a/drivers/iommu/virtio-iommu.c b/drivers/iommu/virtio-iommu.c
> index 80151176ba12..4c652773fd6c 100644
> --- a/drivers/iommu/virtio-iommu.c
> +++ b/drivers/iommu/virtio-iommu.c
> @@ -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,
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
next prev parent reply other threads:[~2022-09-22 2:21 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 [this message]
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
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=01645bfa-a897-05cd-9934-a057e1d79fff@linux.intel.com \
--to=baolu.lu@linux.intel.com \
--cc=dwmw2@infradead.org \
--cc=iommu@lists.linux.dev \
--cc=jgg@nvidia.com \
--cc=joro@8bytes.org \
--cc=kevin.tian@intel.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=nicolinc@nvidia.com \
--cc=robin.murphy@arm.com \
--cc=will@kernel.org \
--cc=yong.wu@mediatek.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).