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 06/18] bus: fsl-mc: Add driver dma ownership management
Date: Mon, 6 Dec 2021 09:58:51 +0800 [thread overview]
Message-ID: <20211206015903.88687-7-baolu.lu@linux.intel.com> (raw)
In-Reply-To: <20211206015903.88687-1-baolu.lu@linux.intel.com>
Multiple fsl-mc devices may be placed in the same IOMMU group because
they cannot be isolated from each other. These devices must either be
entirely under kernel control or userspace control, never a mixture. This
checks and sets DMA ownership during driver binding, and release the
ownership during driver unbinding.
Driver may set a new flag (suppress_auto_claim_dma_owner) to disable auto
claiming DMA_OWNER_DMA_API ownership in the binding process. For instance,
the userspace framework drivers (vfio etc.) which need to manually claim
DMA_OWNER_PRIVATE_DOMAIN_USER when assigning a device to userspace.
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
---
include/linux/fsl/mc.h | 5 +++++
drivers/bus/fsl-mc/fsl-mc-bus.c | 26 ++++++++++++++++++++++++--
2 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/include/linux/fsl/mc.h b/include/linux/fsl/mc.h
index e026f6c48b49..3a26421ee3dc 100644
--- a/include/linux/fsl/mc.h
+++ b/include/linux/fsl/mc.h
@@ -32,6 +32,10 @@ struct fsl_mc_io;
* @shutdown: Function called at shutdown time to quiesce the device
* @suspend: Function called when a device is stopped
* @resume: Function called when a device is resumed
+ * @suppress_auto_claim_dma_owner: Disable auto claiming of kernel DMA owner.
+ * Drivers which don't require DMA or want to manually claim the
+ * owner type (e.g. userspace driver frameworks) could set this
+ * flag.
*
* Generic DPAA device driver object for device drivers that are registered
* with a DPRC bus. This structure is to be embedded in each device-specific
@@ -45,6 +49,7 @@ struct fsl_mc_driver {
void (*shutdown)(struct fsl_mc_device *dev);
int (*suspend)(struct fsl_mc_device *dev, pm_message_t state);
int (*resume)(struct fsl_mc_device *dev);
+ bool suppress_auto_claim_dma_owner;
};
#define to_fsl_mc_driver(_drv) \
diff --git a/drivers/bus/fsl-mc/fsl-mc-bus.c b/drivers/bus/fsl-mc/fsl-mc-bus.c
index 8fd4a356a86e..048a837a7116 100644
--- a/drivers/bus/fsl-mc/fsl-mc-bus.c
+++ b/drivers/bus/fsl-mc/fsl-mc-bus.c
@@ -140,15 +140,36 @@ static int fsl_mc_dma_configure(struct device *dev)
{
struct device *dma_dev = dev;
struct fsl_mc_device *mc_dev = to_fsl_mc_device(dev);
+ struct fsl_mc_driver *mc_drv = to_fsl_mc_driver(dev->driver);
u32 input_id = mc_dev->icid;
+ int ret;
+
+ if (!mc_drv->suppress_auto_claim_dma_owner) {
+ ret = iommu_device_set_dma_owner(dev, DMA_OWNER_DMA_API, NULL);
+ if (ret)
+ return ret;
+ }
while (dev_is_fsl_mc(dma_dev))
dma_dev = dma_dev->parent;
if (dev_of_node(dma_dev))
- return of_dma_configure_id(dev, dma_dev->of_node, 0, &input_id);
+ ret = of_dma_configure_id(dev, dma_dev->of_node, 0, &input_id);
+ else
+ ret = acpi_dma_configure_id(dev, DEV_DMA_COHERENT, &input_id);
+
+ if (ret && !mc_drv->suppress_auto_claim_dma_owner)
+ iommu_device_release_dma_owner(dev, DMA_OWNER_DMA_API);
+
+ return ret;
+}
+
+static void fsl_mc_dma_cleanup(struct device *dev)
+{
+ struct fsl_mc_driver *mc_drv = to_fsl_mc_driver(dev->driver);
- return acpi_dma_configure_id(dev, DEV_DMA_COHERENT, &input_id);
+ if (!mc_drv->suppress_auto_claim_dma_owner)
+ iommu_device_release_dma_owner(dev, DMA_OWNER_DMA_API);
}
static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,
@@ -312,6 +333,7 @@ struct bus_type fsl_mc_bus_type = {
.match = fsl_mc_bus_match,
.uevent = fsl_mc_bus_uevent,
.dma_configure = fsl_mc_dma_configure,
+ .dma_cleanup = fsl_mc_dma_cleanup,
.dev_groups = fsl_mc_dev_groups,
.bus_groups = fsl_mc_bus_groups,
};
--
2.25.1
next prev parent reply other threads:[~2021-12-06 2:00 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 ` Lu Baolu [this message]
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 ` [PATCH v3 12/18] iommu: Add iommu_at[de]tach_device_shared() for multi-device groups Lu Baolu
2021-12-06 14:43 ` 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-7-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).