From: Lu Baolu <baolu.lu@linux.intel.com>
To: Joerg Roedel <joro@8bytes.org>,
Alex Williamson <alex.williamson@redhat.com>
Cc: Robin Murphy <robin.murphy@arm.com>,
Jean-Philippe Brucker <jean-philippe@linaro.org>,
Cornelia Huck <cohuck@redhat.com>,
Kevin Tian <kevin.tian@intel.com>,
Ashok Raj <ashok.raj@intel.com>,
Dave Jiang <dave.jiang@intel.com>, Liu Yi L <yi.l.liu@intel.com>,
iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org,
kvm@vger.kernel.org, Lu Baolu <baolu.lu@linux.intel.com>
Subject: [PATCH v3 1/4] iommu: Check IOMMU_DEV_FEAT_AUX feature in aux api's
Date: Tue, 14 Jul 2020 13:57:00 +0800 [thread overview]
Message-ID: <20200714055703.5510-2-baolu.lu@linux.intel.com> (raw)
In-Reply-To: <20200714055703.5510-1-baolu.lu@linux.intel.com>
The iommu aux-domain api's work only when IOMMU_DEV_FEAT_AUX is enabled
for the device. Add this check to avoid misuse.
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
---
drivers/iommu/iommu.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 1ed1e14a1f0c..e1fdd3531d65 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -2725,11 +2725,13 @@ EXPORT_SYMBOL_GPL(iommu_dev_feature_enabled);
*/
int iommu_aux_attach_device(struct iommu_domain *domain, struct device *dev)
{
- int ret = -ENODEV;
+ int ret;
- if (domain->ops->aux_attach_dev)
- ret = domain->ops->aux_attach_dev(domain, dev);
+ if (!iommu_dev_feature_enabled(dev, IOMMU_DEV_FEAT_AUX) ||
+ !domain->ops->aux_attach_dev)
+ return -ENODEV;
+ ret = domain->ops->aux_attach_dev(domain, dev);
if (!ret)
trace_attach_device_to_domain(dev);
@@ -2748,12 +2750,12 @@ EXPORT_SYMBOL_GPL(iommu_aux_detach_device);
int iommu_aux_get_pasid(struct iommu_domain *domain, struct device *dev)
{
- int ret = -ENODEV;
+ if (!iommu_dev_feature_enabled(dev, IOMMU_DEV_FEAT_AUX) ||
+ !domain->ops->aux_get_pasid)
+ return -ENODEV;
- if (domain->ops->aux_get_pasid)
- ret = domain->ops->aux_get_pasid(domain, dev);
+ return domain->ops->aux_get_pasid(domain, dev);
- return ret;
}
EXPORT_SYMBOL_GPL(iommu_aux_get_pasid);
--
2.17.1
next prev parent reply other threads:[~2020-07-14 6:01 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-14 5:56 [PATCH v3 0/4] iommu aux-domain APIs extensions Lu Baolu
2020-07-14 5:57 ` Lu Baolu [this message]
2020-07-29 20:03 ` [PATCH v3 1/4] iommu: Check IOMMU_DEV_FEAT_AUX feature in aux api's Alex Williamson
2020-07-30 1:46 ` Lu Baolu
2020-07-14 5:57 ` [PATCH v3 2/4] iommu: Add iommu_aux_at(de)tach_group() Lu Baolu
2020-07-14 16:39 ` Jacob Pan
2020-07-15 0:47 ` Lu Baolu
2020-07-15 16:01 ` Jacob Pan
2020-07-16 1:07 ` Lu Baolu
2020-07-29 20:03 ` Alex Williamson
2020-07-29 23:34 ` Tian, Kevin
2020-07-30 19:46 ` Alex Williamson
2020-07-31 5:47 ` Lu Baolu
2020-07-31 18:05 ` Alex Williamson
2020-08-03 1:57 ` Lu Baolu
2020-07-14 5:57 ` [PATCH v3 3/4] iommu: Add iommu_aux_get_domain_for_dev() Lu Baolu
2020-07-29 20:25 ` Alex Williamson
2020-07-29 23:49 ` Tian, Kevin
2020-07-30 20:17 ` Alex Williamson
2020-07-31 0:26 ` Tian, Kevin
2020-07-31 2:17 ` Tian, Kevin
2020-07-31 6:30 ` Lu Baolu
2020-07-31 18:14 ` Alex Williamson
2020-08-03 2:15 ` Lu Baolu
2020-07-14 5:57 ` [PATCH v3 4/4] vfio/type1: Use iommu_aux_at(de)tach_group() APIs Lu Baolu
2020-07-14 8:25 ` Christoph Hellwig
2020-07-14 16:29 ` Jacob Pan
2020-07-15 1:00 ` Lu Baolu
2020-07-15 1:23 ` Tian, Kevin
2020-07-29 20:32 ` Alex Williamson
2020-07-30 2:41 ` Lu Baolu
2020-07-30 21:17 ` Alex Williamson
2020-07-31 1:37 ` Lu Baolu
2020-07-30 9:36 ` Liu, Yi L
2020-07-31 1:39 ` Lu Baolu
2020-07-23 13:55 ` [PATCH v3 0/4] iommu aux-domain APIs extensions Lu Baolu
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=20200714055703.5510-2-baolu.lu@linux.intel.com \
--to=baolu.lu@linux.intel.com \
--cc=alex.williamson@redhat.com \
--cc=ashok.raj@intel.com \
--cc=cohuck@redhat.com \
--cc=dave.jiang@intel.com \
--cc=iommu@lists.linux-foundation.org \
--cc=jean-philippe@linaro.org \
--cc=joro@8bytes.org \
--cc=kevin.tian@intel.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robin.murphy@arm.com \
--cc=yi.l.liu@intel.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).