From: Lu Baolu <baolu.lu@linux.intel.com>
To: Joerg Roedel <joro@8bytes.org>,
Alex Williamson <alex.williamson@redhat.com>
Cc: 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 2/2] vfio/type1: Update group->domain after aux attach and detach
Date: Sat, 27 Jun 2020 11:15:32 +0800 [thread overview]
Message-ID: <20200627031532.28046-2-baolu.lu@linux.intel.com> (raw)
In-Reply-To: <20200627031532.28046-1-baolu.lu@linux.intel.com>
Update group->domain whenever an aux-domain is attached to or detached
from a mediated device. Without this change, iommu_get_domain_for_dev()
will be broken for mdev devices.
Fixes: 7bd50f0cd2fd5 ("vfio/type1: Add domain at(de)taching group helpers")
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
---
drivers/vfio/vfio_iommu_type1.c | 37 ++++++++++++++++++++++++++++-----
1 file changed, 32 insertions(+), 5 deletions(-)
diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c
index 5e556ac9102a..e0d8802ce0c9 100644
--- a/drivers/vfio/vfio_iommu_type1.c
+++ b/drivers/vfio/vfio_iommu_type1.c
@@ -1634,10 +1634,28 @@ static int vfio_mdev_attach_domain(struct device *dev, void *data)
iommu_device = vfio_mdev_get_iommu_device(dev);
if (iommu_device) {
- if (iommu_dev_feature_enabled(iommu_device, IOMMU_DEV_FEAT_AUX))
- return iommu_aux_attach_device(domain, iommu_device);
- else
+ if (iommu_dev_feature_enabled(iommu_device,
+ IOMMU_DEV_FEAT_AUX)) {
+ struct iommu_group *group = iommu_group_get(dev);
+ int ret;
+
+ if (!group)
+ return -EINVAL;
+
+ if (iommu_group_get_domain(group)) {
+ iommu_group_put(group);
+ return -EBUSY;
+ }
+
+ ret = iommu_aux_attach_device(domain, iommu_device);
+ if (!ret)
+ iommu_group_set_domain(group, domain);
+
+ iommu_group_put(group);
+ return ret;
+ } else {
return iommu_attach_device(domain, iommu_device);
+ }
}
return -EINVAL;
@@ -1650,10 +1668,19 @@ static int vfio_mdev_detach_domain(struct device *dev, void *data)
iommu_device = vfio_mdev_get_iommu_device(dev);
if (iommu_device) {
- if (iommu_dev_feature_enabled(iommu_device, IOMMU_DEV_FEAT_AUX))
+ if (iommu_dev_feature_enabled(iommu_device,
+ IOMMU_DEV_FEAT_AUX)) {
+ struct iommu_group *group;
+
iommu_aux_detach_device(domain, iommu_device);
- else
+ group = iommu_group_get(dev);
+ if (group) {
+ iommu_group_set_domain(group, NULL);
+ iommu_group_put(group);
+ }
+ } else {
iommu_detach_device(domain, iommu_device);
+ }
}
return 0;
--
2.17.1
next prev parent reply other threads:[~2020-06-27 3:19 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-27 3:15 [PATCH 1/2] iommu: Add iommu_group_get/set_domain() Lu Baolu
2020-06-27 3:15 ` Lu Baolu [this message]
2020-06-29 11:56 ` Robin Murphy
2020-06-30 1:03 ` Lu Baolu
2020-06-30 16:51 ` Robin Murphy
2020-07-01 7:32 ` Lu Baolu
2020-07-01 12:18 ` Robin Murphy
2020-07-02 1:32 ` Lu Baolu
2020-07-02 2:36 ` Lu Baolu
2020-07-07 1:26 ` 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=20200627031532.28046-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=joro@8bytes.org \
--cc=kevin.tian@intel.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--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).