From: Robin Murphy <robin.murphy@arm.com>
To: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>,
linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org
Cc: joro@8bytes.org, jean-philippe@linaro.org, will@kernel.org,
prime.zeng@hisilicon.com, linuxarm@openeuler.org
Subject: Re: [PATCH v3] iommu: Check dev->iommu in iommu_dev_xxx functions
Date: Tue, 9 Mar 2021 12:50:29 +0000 [thread overview]
Message-ID: <ed0f8327-a23d-c9fd-672d-a431b3327593@arm.com> (raw)
In-Reply-To: <20210303173611.520-1-shameerali.kolothum.thodi@huawei.com>
On 2021-03-03 17:36, Shameer Kolothum wrote:
> The device iommu probe/attach might have failed leaving dev->iommu
> to NULL and device drivers may still invoke these functions resulting
> in a crash in iommu vendor driver code.
>
> Hence make sure we check that.
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
> Fixes: a3a195929d40 ("iommu: Add APIs for multiple domains per device")
> Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
> ---
> v2 --> v3
> -Removed iommu_ops from struct dev_iommu.
> v1 --> v2:
> -Added iommu_ops to struct dev_iommu based on the discussion with Robin.
> -Rebased against iommu-tree core branch.
> ---
> drivers/iommu/iommu.c | 24 +++++++++++++++---------
> 1 file changed, 15 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
> index d0b0a15dba84..e10cfa99057c 100644
> --- a/drivers/iommu/iommu.c
> +++ b/drivers/iommu/iommu.c
> @@ -2878,10 +2878,12 @@ EXPORT_SYMBOL_GPL(iommu_fwspec_add_ids);
> */
> int iommu_dev_enable_feature(struct device *dev, enum iommu_dev_features feat)
> {
> - const struct iommu_ops *ops = dev->bus->iommu_ops;
> + if (dev->iommu && dev->iommu->iommu_dev) {
> + const struct iommu_ops *ops = dev->iommu->iommu_dev->ops;
>
> - if (ops && ops->dev_enable_feat)
> - return ops->dev_enable_feat(dev, feat);
> + if (ops->dev_enable_feat)
> + return ops->dev_enable_feat(dev, feat);
> + }
>
> return -ENODEV;
> }
> @@ -2894,10 +2896,12 @@ EXPORT_SYMBOL_GPL(iommu_dev_enable_feature);
> */
> int iommu_dev_disable_feature(struct device *dev, enum iommu_dev_features feat)
> {
> - const struct iommu_ops *ops = dev->bus->iommu_ops;
> + if (dev->iommu && dev->iommu->iommu_dev) {
> + const struct iommu_ops *ops = dev->iommu->iommu_dev->ops;
>
> - if (ops && ops->dev_disable_feat)
> - return ops->dev_disable_feat(dev, feat);
> + if (ops->dev_disable_feat)
> + return ops->dev_disable_feat(dev, feat);
> + }
>
> return -EBUSY;
> }
> @@ -2905,10 +2909,12 @@ EXPORT_SYMBOL_GPL(iommu_dev_disable_feature);
>
> bool iommu_dev_feature_enabled(struct device *dev, enum iommu_dev_features feat)
> {
> - const struct iommu_ops *ops = dev->bus->iommu_ops;
> + if (dev->iommu && dev->iommu->iommu_dev) {
> + const struct iommu_ops *ops = dev->iommu->iommu_dev->ops;
>
> - if (ops && ops->dev_feat_enabled)
> - return ops->dev_feat_enabled(dev, feat);
> + if (ops->dev_feat_enabled)
> + return ops->dev_feat_enabled(dev, feat);
> + }
>
> return false;
> }
>
next prev parent reply other threads:[~2021-03-09 12:51 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-03 17:36 [PATCH v3] iommu: Check dev->iommu in iommu_dev_xxx functions Shameer Kolothum
2021-03-09 12:50 ` Robin Murphy [this message]
2021-03-18 9:48 ` Joerg Roedel
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=ed0f8327-a23d-c9fd-672d-a431b3327593@arm.com \
--to=robin.murphy@arm.com \
--cc=iommu@lists.linux-foundation.org \
--cc=jean-philippe@linaro.org \
--cc=joro@8bytes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxarm@openeuler.org \
--cc=prime.zeng@hisilicon.com \
--cc=shameerali.kolothum.thodi@huawei.com \
--cc=will@kernel.org \
/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