From: Lu Baolu <baolu.lu@linux.intel.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Joerg Roedel <joro@8bytes.org>,
Alex Williamson <alex.williamson@redhat.com>,
Bjorn Helgaas <bhelgaas@google.com>,
Jason Gunthorpe <jgg@nvidia.com>,
Christoph Hellwig <hch@infradead.org>,
Kevin Tian <kevin.tian@intel.com>,
Ashok Raj <ashok.raj@intel.com>
Cc: Will Deacon <will@kernel.org>,
Robin Murphy <robin.murphy@arm.com>,
Dan Williams <dan.j.williams@intel.com>,
rafael@kernel.org, Diana Craciun <diana.craciun@oss.nxp.com>,
Cornelia Huck <cohuck@redhat.com>,
Eric Auger <eric.auger@redhat.com>, Liu Yi L <yi.l.liu@intel.com>,
Jacob jun Pan <jacob.jun.pan@intel.com>,
Chaitanya Kulkarni <kch@nvidia.com>,
Stuart Yoder <stuyoder@gmail.com>,
Laurentiu Tudor <laurentiu.tudor@nxp.com>,
Thierry Reding <thierry.reding@gmail.com>,
David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
Jonathan Hunter <jonathanh@nvidia.com>,
Li Yang <leoyang.li@nxp.com>, Dmitry Osipenko <digetx@gmail.com>,
iommu@lists.linux-foundation.org, linux-pci@vger.kernel.org,
kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
Lu Baolu <baolu.lu@linux.intel.com>
Subject: [PATCH v3 12/18] iommu: Add iommu_at[de]tach_device_shared() for multi-device groups
Date: Mon, 6 Dec 2021 09:58:57 +0800 [thread overview]
Message-ID: <20211206015903.88687-13-baolu.lu@linux.intel.com> (raw)
In-Reply-To: <20211206015903.88687-1-baolu.lu@linux.intel.com>
The iommu_attach/detach_device() interfaces were exposed for the device
drivers to attach/detach their own domains. The commit <426a273834eae>
("iommu: Limit iommu_attach/detach_device to device with their own group")
restricted them to singleton groups to avoid different device in a group
attaching different domain.
As we've introduced device DMA ownership into the iommu core. We can now
introduce interfaces for muliple-device groups, and "all devices are in the
same address space" is still guaranteed.
The iommu_attach/detach_device_shared() could be used when multiple drivers
sharing the group claim the DMA_OWNER_PRIVATE_DOMAIN ownership. The first
call of iommu_attach_device_shared() attaches the domain to the group.
Other drivers could join it later. The domain will be detached from the
group after all drivers unjoin it.
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Tested-by: Dmitry Osipenko <digetx@gmail.com>
---
include/linux/iommu.h | 13 +++++++++
drivers/iommu/iommu.c | 61 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 74 insertions(+)
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index afcc07bc8d41..8c81ba11ae8c 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -705,6 +705,8 @@ int iommu_group_set_dma_owner(struct iommu_group *group, enum iommu_dma_owner ow
void *owner_cookie);
void iommu_group_release_dma_owner(struct iommu_group *group, enum iommu_dma_owner owner);
bool iommu_group_dma_owner_unclaimed(struct iommu_group *group);
+int iommu_attach_device_shared(struct iommu_domain *domain, struct device *dev);
+void iommu_detach_device_shared(struct iommu_domain *domain, struct device *dev);
#else /* CONFIG_IOMMU_API */
@@ -745,11 +747,22 @@ static inline int iommu_attach_device(struct iommu_domain *domain,
return -ENODEV;
}
+static inline int iommu_attach_device_shared(struct iommu_domain *domain,
+ struct device *dev)
+{
+ return -ENODEV;
+}
+
static inline void iommu_detach_device(struct iommu_domain *domain,
struct device *dev)
{
}
+static inline void iommu_detach_device_shared(struct iommu_domain *domain,
+ struct device *dev)
+{
+}
+
static inline struct iommu_domain *iommu_get_domain_for_dev(struct device *dev)
{
return NULL;
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 423197db99a9..6dc6e6ad6069 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -50,6 +50,7 @@ struct iommu_group {
struct list_head entry;
enum iommu_dma_owner dma_owner;
refcount_t owner_cnt;
+ refcount_t attach_cnt;
void *owner_cookie;
};
@@ -2026,6 +2027,41 @@ int iommu_attach_device(struct iommu_domain *domain, struct device *dev)
}
EXPORT_SYMBOL_GPL(iommu_attach_device);
+int iommu_attach_device_shared(struct iommu_domain *domain, struct device *dev)
+{
+ struct iommu_group *group;
+ int ret = 0;
+
+ group = iommu_group_get(dev);
+ if (!group)
+ return -ENODEV;
+
+ mutex_lock(&group->mutex);
+ if (refcount_inc_not_zero(&group->attach_cnt)) {
+ if (group->domain != domain ||
+ (group->dma_owner != DMA_OWNER_PRIVATE_DOMAIN &&
+ group->dma_owner != DMA_OWNER_PRIVATE_DOMAIN_USER)) {
+ refcount_dec(&group->attach_cnt);
+ ret = -EBUSY;
+ }
+
+ goto unlock_out;
+ }
+
+ ret = __iommu_attach_group(domain, group);
+ if (ret)
+ goto unlock_out;
+
+ refcount_set(&group->attach_cnt, 1);
+
+unlock_out:
+ mutex_unlock(&group->mutex);
+ iommu_group_put(group);
+
+ return ret;
+}
+EXPORT_SYMBOL_GPL(iommu_attach_device_shared);
+
int iommu_deferred_attach(struct device *dev, struct iommu_domain *domain)
{
const struct iommu_ops *ops = domain->ops;
@@ -2281,6 +2317,31 @@ void iommu_detach_device(struct iommu_domain *domain, struct device *dev)
}
EXPORT_SYMBOL_GPL(iommu_detach_device);
+void iommu_detach_device_shared(struct iommu_domain *domain, struct device *dev)
+{
+ struct iommu_group *group;
+
+ group = iommu_group_get(dev);
+ if (!group)
+ return;
+
+ mutex_lock(&group->mutex);
+ if (WARN_ON(group->domain != domain ||
+ (group->dma_owner != DMA_OWNER_PRIVATE_DOMAIN &&
+ group->dma_owner != DMA_OWNER_PRIVATE_DOMAIN_USER)))
+ goto unlock_out;
+
+ if (refcount_dec_and_test(&group->attach_cnt)) {
+ __iommu_detach_group(domain, group);
+ group->dma_owner = DMA_OWNER_NONE;
+ }
+
+unlock_out:
+ mutex_unlock(&group->mutex);
+ iommu_group_put(group);
+}
+EXPORT_SYMBOL_GPL(iommu_detach_device_shared);
+
struct iommu_domain *iommu_get_domain_for_dev(struct device *dev)
{
struct iommu_domain *domain;
--
2.25.1
next prev parent reply other threads:[~2021-12-06 2:01 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-06 1:58 [PATCH v3 00/18] Fix BUG_ON in vfio_iommu_group_notifier() Lu Baolu
2021-12-06 1:58 ` [PATCH v3 01/18] iommu: Add device dma ownership set/release interfaces Lu Baolu
2021-12-06 13:35 ` Joerg Roedel
2021-12-06 14:29 ` Christoph Hellwig
2021-12-06 15:01 ` Jason Gunthorpe
2021-12-07 1:52 ` Lu Baolu
2021-12-06 14:42 ` Christoph Hellwig
2021-12-07 2:07 ` Lu Baolu
2021-12-06 1:58 ` [PATCH v3 02/18] driver core: Add dma_cleanup callback in bus_type Lu Baolu
2021-12-06 1:58 ` [PATCH v3 03/18] driver core: platform: Rename platform_dma_configure() Lu Baolu
2021-12-06 7:53 ` Greg Kroah-Hartman
2021-12-06 14:13 ` Christoph Hellwig
2021-12-06 14:43 ` Greg Kroah-Hartman
2021-12-06 14:45 ` Jason Gunthorpe
2021-12-06 14:47 ` Christoph Hellwig
2021-12-06 15:04 ` Jason Gunthorpe
2021-12-07 1:21 ` Lu Baolu
2021-12-07 23:09 ` Dan Williams
2021-12-06 1:58 ` [PATCH v3 04/18] driver core: platform: Add driver dma ownership management Lu Baolu
2021-12-06 7:54 ` Greg Kroah-Hartman
2021-12-06 14:36 ` Christoph Hellwig
2021-12-06 15:06 ` Jason Gunthorpe
2021-12-07 2:57 ` Lu Baolu
2021-12-07 13:16 ` Jason Gunthorpe
2021-12-07 13:25 ` Christoph Hellwig
2021-12-07 13:30 ` Jason Gunthorpe
2021-12-09 1:20 ` Lu Baolu
2021-12-10 1:23 ` Lu Baolu
2021-12-13 0:50 ` Lu Baolu
2021-12-13 13:24 ` Jason Gunthorpe
2021-12-15 12:24 ` Lu Baolu
2021-12-14 16:35 ` Christoph Hellwig
2021-12-06 1:58 ` [PATCH v3 05/18] amba: " Lu Baolu
2021-12-06 1:58 ` [PATCH v3 06/18] bus: fsl-mc: " Lu Baolu
2021-12-06 1:58 ` [PATCH v3 07/18] PCI: " Lu Baolu
2021-12-06 1:58 ` [PATCH v3 08/18] PCI: pci_stub: Suppress kernel DMA ownership auto-claiming Lu Baolu
2021-12-06 1:58 ` [PATCH v3 09/18] PCI: portdrv: " Lu Baolu
2021-12-06 1:58 ` [PATCH v3 10/18] iommu: Add security context management for assigned devices Lu Baolu
2021-12-06 1:58 ` [PATCH v3 11/18] iommu: Expose group variants of dma ownership interfaces Lu Baolu
2021-12-06 1:58 ` Lu Baolu [this message]
2021-12-06 14:43 ` [PATCH v3 12/18] iommu: Add iommu_at[de]tach_device_shared() for multi-device groups Christoph Hellwig
2021-12-07 2:33 ` Lu Baolu
2021-12-06 1:58 ` [PATCH v3 13/18] vfio: Set DMA USER ownership for VFIO devices Lu Baolu
2021-12-06 1:58 ` [PATCH v3 14/18] vfio: Remove use of vfio_group_viable() Lu Baolu
2021-12-06 1:59 ` [PATCH v3 15/18] vfio: Delete the unbound_list Lu Baolu
2021-12-06 1:59 ` [PATCH v3 16/18] vfio: Remove iommu group notifier Lu Baolu
2021-12-06 1:59 ` [PATCH v3 17/18] iommu: Remove iommu group changes notifier Lu Baolu
2021-12-06 1:59 ` [PATCH v3 18/18] drm/tegra: Use the iommu dma_owner mechanism Lu Baolu
2021-12-06 12:40 ` Jason Gunthorpe
2021-12-07 2:34 ` Lu Baolu
2021-12-17 6:41 ` [PATCH v3 00/18] Fix BUG_ON in vfio_iommu_group_notifier() 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=20211206015903.88687-13-baolu.lu@linux.intel.com \
--to=baolu.lu@linux.intel.com \
--cc=airlied@linux.ie \
--cc=alex.williamson@redhat.com \
--cc=ashok.raj@intel.com \
--cc=bhelgaas@google.com \
--cc=cohuck@redhat.com \
--cc=dan.j.williams@intel.com \
--cc=daniel@ffwll.ch \
--cc=diana.craciun@oss.nxp.com \
--cc=digetx@gmail.com \
--cc=eric.auger@redhat.com \
--cc=gregkh@linuxfoundation.org \
--cc=hch@infradead.org \
--cc=iommu@lists.linux-foundation.org \
--cc=jacob.jun.pan@intel.com \
--cc=jgg@nvidia.com \
--cc=jonathanh@nvidia.com \
--cc=joro@8bytes.org \
--cc=kch@nvidia.com \
--cc=kevin.tian@intel.com \
--cc=kvm@vger.kernel.org \
--cc=laurentiu.tudor@nxp.com \
--cc=leoyang.li@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=rafael@kernel.org \
--cc=robin.murphy@arm.com \
--cc=stuyoder@gmail.com \
--cc=thierry.reding@gmail.com \
--cc=will@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).