All of lore.kernel.org
 help / color / mirror / Atom feed
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 v5 05/14] amba: Add driver dma ownership management
Date: Tue,  4 Jan 2022 09:56:35 +0800	[thread overview]
Message-ID: <20220104015644.2294354-6-baolu.lu@linux.intel.com> (raw)
In-Reply-To: <20220104015644.2294354-1-baolu.lu@linux.intel.com>

Multiple amba 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.

The device driver may set a new flag (no_kernel_api_dma) to skip calling
iommu_device_use_dma_api() during the binding process. For instance, the
userspace framework drivers (vfio etc.) which need to manually claim
their own dma ownership when assigning the device to userspace.

Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
---
 include/linux/amba/bus.h |  1 +
 drivers/amba/bus.c       | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/include/linux/amba/bus.h b/include/linux/amba/bus.h
index edfcf7a14dcd..a4f374e2fd35 100644
--- a/include/linux/amba/bus.h
+++ b/include/linux/amba/bus.h
@@ -79,6 +79,7 @@ struct amba_driver {
 	void			(*remove)(struct amba_device *);
 	void			(*shutdown)(struct amba_device *);
 	const struct amba_id	*id_table;
+	bool no_kernel_api_dma;
 };
 
 /*
diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
index 850a0a8973c6..42b20ecfa50c 100644
--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
@@ -22,6 +22,7 @@
 #include <linux/of_irq.h>
 #include <linux/of_device.h>
 #include <linux/acpi.h>
+#include <linux/iommu.h>
 
 #include <asm/irq.h>
 
@@ -255,9 +256,16 @@ static void amba_shutdown(struct device *dev)
 
 static int amba_dma_configure(struct device *dev)
 {
+	struct amba_driver *drv = to_amba_driver(dev->driver);
 	enum dev_dma_attr attr;
 	int ret = 0;
 
+	if (!drv->no_kernel_api_dma) {
+		ret = iommu_device_use_dma_api(dev);
+		if (ret)
+			return ret;
+	}
+
 	if (dev->of_node) {
 		ret = of_dma_configure(dev, dev->of_node, true);
 	} else if (has_acpi_companion(dev)) {
@@ -265,9 +273,20 @@ static int amba_dma_configure(struct device *dev)
 		ret = acpi_dma_configure(dev, attr);
 	}
 
+	if (ret && !drv->no_kernel_api_dma)
+		iommu_device_unuse_dma_api(dev);
+
 	return ret;
 }
 
+static void amba_dma_cleanup(struct device *dev)
+{
+	struct amba_driver *drv = to_amba_driver(dev->driver);
+
+	if (!drv->no_kernel_api_dma)
+		iommu_device_unuse_dma_api(dev);
+}
+
 #ifdef CONFIG_PM
 /*
  * Hooks to provide runtime PM of the pclk (bus clock).  It is safe to
@@ -337,6 +356,7 @@ struct bus_type amba_bustype = {
 	.remove		= amba_remove,
 	.shutdown	= amba_shutdown,
 	.dma_configure	= amba_dma_configure,
+	.dma_cleanup	= amba_dma_cleanup,
 	.pm		= &amba_pm,
 };
 EXPORT_SYMBOL_GPL(amba_bustype);
-- 
2.25.1


WARNING: multiple messages have this Message-ID (diff)
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: kvm@vger.kernel.org, rafael@kernel.org,
	David Airlie <airlied@linux.ie>,
	linux-pci@vger.kernel.org,
	Thierry Reding <thierry.reding@gmail.com>,
	Diana Craciun <diana.craciun@oss.nxp.com>,
	Dmitry Osipenko <digetx@gmail.com>, Will Deacon <will@kernel.org>,
	Stuart Yoder <stuyoder@gmail.com>,
	Jonathan Hunter <jonathanh@nvidia.com>,
	Chaitanya Kulkarni <kch@nvidia.com>,
	Dan Williams <dan.j.williams@intel.com>,
	Cornelia Huck <cohuck@redhat.com>,
	linux-kernel@vger.kernel.org, Li Yang <leoyang.li@nxp.com>,
	iommu@lists.linux-foundation.org,
	Jacob jun Pan <jacob.jun.pan@intel.com>,
	Daniel Vetter <daniel@ffwll.ch>,
	Robin Murphy <robin.murphy@arm.com>
Subject: [PATCH v5 05/14] amba: Add driver dma ownership management
Date: Tue,  4 Jan 2022 09:56:35 +0800	[thread overview]
Message-ID: <20220104015644.2294354-6-baolu.lu@linux.intel.com> (raw)
In-Reply-To: <20220104015644.2294354-1-baolu.lu@linux.intel.com>

Multiple amba 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.

The device driver may set a new flag (no_kernel_api_dma) to skip calling
iommu_device_use_dma_api() during the binding process. For instance, the
userspace framework drivers (vfio etc.) which need to manually claim
their own dma ownership when assigning the device to userspace.

Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
---
 include/linux/amba/bus.h |  1 +
 drivers/amba/bus.c       | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/include/linux/amba/bus.h b/include/linux/amba/bus.h
index edfcf7a14dcd..a4f374e2fd35 100644
--- a/include/linux/amba/bus.h
+++ b/include/linux/amba/bus.h
@@ -79,6 +79,7 @@ struct amba_driver {
 	void			(*remove)(struct amba_device *);
 	void			(*shutdown)(struct amba_device *);
 	const struct amba_id	*id_table;
+	bool no_kernel_api_dma;
 };
 
 /*
diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
index 850a0a8973c6..42b20ecfa50c 100644
--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
@@ -22,6 +22,7 @@
 #include <linux/of_irq.h>
 #include <linux/of_device.h>
 #include <linux/acpi.h>
+#include <linux/iommu.h>
 
 #include <asm/irq.h>
 
@@ -255,9 +256,16 @@ static void amba_shutdown(struct device *dev)
 
 static int amba_dma_configure(struct device *dev)
 {
+	struct amba_driver *drv = to_amba_driver(dev->driver);
 	enum dev_dma_attr attr;
 	int ret = 0;
 
+	if (!drv->no_kernel_api_dma) {
+		ret = iommu_device_use_dma_api(dev);
+		if (ret)
+			return ret;
+	}
+
 	if (dev->of_node) {
 		ret = of_dma_configure(dev, dev->of_node, true);
 	} else if (has_acpi_companion(dev)) {
@@ -265,9 +273,20 @@ static int amba_dma_configure(struct device *dev)
 		ret = acpi_dma_configure(dev, attr);
 	}
 
+	if (ret && !drv->no_kernel_api_dma)
+		iommu_device_unuse_dma_api(dev);
+
 	return ret;
 }
 
+static void amba_dma_cleanup(struct device *dev)
+{
+	struct amba_driver *drv = to_amba_driver(dev->driver);
+
+	if (!drv->no_kernel_api_dma)
+		iommu_device_unuse_dma_api(dev);
+}
+
 #ifdef CONFIG_PM
 /*
  * Hooks to provide runtime PM of the pclk (bus clock).  It is safe to
@@ -337,6 +356,7 @@ struct bus_type amba_bustype = {
 	.remove		= amba_remove,
 	.shutdown	= amba_shutdown,
 	.dma_configure	= amba_dma_configure,
+	.dma_cleanup	= amba_dma_cleanup,
 	.pm		= &amba_pm,
 };
 EXPORT_SYMBOL_GPL(amba_bustype);
-- 
2.25.1

_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

  parent reply	other threads:[~2022-01-04  1:58 UTC|newest]

Thread overview: 112+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-04  1:56 [PATCH v5 00/14] Fix BUG_ON in vfio_iommu_group_notifier() Lu Baolu
2022-01-04  1:56 ` Lu Baolu
2022-01-04  1:56 ` [PATCH v5 01/14] iommu: Add dma ownership management interfaces Lu Baolu
2022-01-04  1:56   ` Lu Baolu
2022-01-04 10:08   ` Christoph Hellwig
2022-01-04 10:08     ` Christoph Hellwig
2022-01-04 16:41     ` Bjorn Helgaas
2022-01-04 16:41       ` Bjorn Helgaas
2022-01-04 19:23       ` Jason Gunthorpe
2022-01-04 19:23         ` Jason Gunthorpe via iommu
2022-01-06  3:18         ` Lu Baolu
2022-01-06  3:18           ` Lu Baolu
2022-01-06  3:54         ` Lu Baolu
2022-01-06  3:54           ` Lu Baolu
2022-01-06 15:46           ` Jason Gunthorpe
2022-01-06 15:46             ` Jason Gunthorpe via iommu
2022-01-07  1:50             ` Lu Baolu
2022-01-07  1:50               ` Lu Baolu
2022-01-06  3:43       ` Lu Baolu
2022-01-06  3:43         ` Lu Baolu
2022-01-06  3:47       ` Lu Baolu
2022-01-06  3:47         ` Lu Baolu
2022-01-06  3:51       ` Lu Baolu
2022-01-06  3:51         ` Lu Baolu
2022-01-05  6:57     ` Lu Baolu
2022-01-05  6:57       ` Lu Baolu
2022-01-04  1:56 ` [PATCH v5 02/14] driver core: Add dma_cleanup callback in bus_type Lu Baolu
2022-01-04  1:56   ` Lu Baolu
2022-01-04 10:08   ` Christoph Hellwig
2022-01-04 10:08     ` Christoph Hellwig
2022-01-04 12:39     ` Jason Gunthorpe
2022-01-04 12:39       ` Jason Gunthorpe via iommu
2022-01-04 13:04       ` Greg Kroah-Hartman
2022-01-04 13:04         ` Greg Kroah-Hartman
2022-02-08  5:55         ` Lu Baolu
2022-02-08  5:55           ` Lu Baolu
2022-02-08 11:35           ` Greg Kroah-Hartman
2022-02-08 11:35             ` Greg Kroah-Hartman
2022-02-14 10:01     ` Greg Kroah-Hartman
2022-02-14 10:01       ` Greg Kroah-Hartman
2022-02-14 10:02   ` Greg Kroah-Hartman
2022-02-14 10:02     ` Greg Kroah-Hartman
2022-01-04  1:56 ` [PATCH v5 03/14] amba: Stop sharing platform_dma_configure() Lu Baolu
2022-01-04  1:56   ` Lu Baolu
2022-01-04  1:56 ` [PATCH v5 04/14] driver core: platform: Add driver dma ownership management Lu Baolu
2022-01-04  1:56   ` Lu Baolu
2022-02-14  9:59   ` Greg Kroah-Hartman
2022-02-14  9:59     ` Greg Kroah-Hartman
2022-02-14 13:18     ` Jason Gunthorpe
2022-02-14 13:18       ` Jason Gunthorpe via iommu
2022-02-14 13:37       ` Greg Kroah-Hartman
2022-02-14 13:37         ` Greg Kroah-Hartman
2022-02-14 13:43         ` Jason Gunthorpe
2022-02-14 13:43           ` Jason Gunthorpe via iommu
2022-01-04  1:56 ` Lu Baolu [this message]
2022-01-04  1:56   ` [PATCH v5 05/14] amba: " Lu Baolu
2022-01-04  1:56 ` [PATCH v5 06/14] bus: fsl-mc: " Lu Baolu
2022-01-04  1:56   ` Lu Baolu
2022-01-04  1:56 ` [PATCH v5 07/14] PCI: " Lu Baolu
2022-01-04  1:56   ` Lu Baolu
2022-02-14 10:03   ` Greg Kroah-Hartman
2022-02-14 10:03     ` Greg Kroah-Hartman
2022-02-14 12:38     ` Jason Gunthorpe
2022-02-14 12:38       ` Jason Gunthorpe via iommu
2022-02-14 12:51       ` Greg Kroah-Hartman
2022-02-14 12:51         ` Greg Kroah-Hartman
2022-02-14 13:11         ` Jason Gunthorpe
2022-02-14 13:11           ` Jason Gunthorpe via iommu
2022-02-14 13:39           ` Greg Kroah-Hartman
2022-02-14 13:39             ` Greg Kroah-Hartman
2022-02-14 13:43             ` Jason Gunthorpe
2022-02-14 13:43               ` Jason Gunthorpe via iommu
2022-02-15  3:06               ` Lu Baolu
2022-02-15  3:06                 ` Lu Baolu
2022-02-23 18:00   ` Bjorn Helgaas
2022-02-23 18:00     ` Bjorn Helgaas
2022-02-23 18:07     ` Jason Gunthorpe
2022-02-23 18:07       ` Jason Gunthorpe via iommu
2022-01-04  1:56 ` [PATCH v5 08/14] PCI: pci_stub: Suppress kernel DMA ownership auto-claiming Lu Baolu
2022-01-04  1:56   ` Lu Baolu
2022-01-04  1:56 ` [PATCH v5 09/14] PCI: portdrv: " Lu Baolu
2022-01-04  1:56   ` Lu Baolu
2022-01-04 17:06   ` Bjorn Helgaas
2022-01-04 17:06     ` Bjorn Helgaas
2022-01-04 19:26     ` Jason Gunthorpe
2022-01-04 19:26       ` Jason Gunthorpe via iommu
2022-01-04 19:51       ` Bjorn Helgaas
2022-01-04 19:51         ` Bjorn Helgaas
2022-01-05  0:35         ` Jason Gunthorpe
2022-01-05  0:35           ` Jason Gunthorpe via iommu
2022-01-06  4:12     ` Lu Baolu
2022-01-06  4:12       ` Lu Baolu
2022-01-06 18:32       ` Bjorn Helgaas
2022-01-06 18:32         ` Bjorn Helgaas
2022-01-07  1:53         ` Lu Baolu
2022-01-07  1:53           ` Lu Baolu
2022-01-04  1:56 ` [PATCH v5 10/14] vfio: Set DMA ownership for VFIO devices Lu Baolu
2022-01-04  1:56   ` Lu Baolu
2022-01-04  1:56 ` [PATCH v5 11/14] vfio: Remove use of vfio_group_viable() Lu Baolu
2022-01-04  1:56   ` Lu Baolu
2022-01-04  1:56 ` [PATCH v5 12/14] vfio: Delete the unbound_list Lu Baolu
2022-01-04  1:56   ` Lu Baolu
2022-01-04  1:56 ` [PATCH v5 13/14] vfio: Remove iommu group notifier Lu Baolu
2022-01-04  1:56   ` Lu Baolu
2022-01-04  1:56 ` [PATCH v5 14/14] iommu: Remove iommu group changes notifier Lu Baolu
2022-01-04  1:56   ` Lu Baolu
2022-01-04 12:48 ` [PATCH v5 00/14] Fix BUG_ON in vfio_iommu_group_notifier() Jason Gunthorpe
2022-01-04 12:48   ` Jason Gunthorpe via iommu
2022-01-05  6:52   ` Lu Baolu
2022-01-05  6:52     ` Lu Baolu
2022-02-18  1:07 ` Lu Baolu
2022-02-18  1:07   ` 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=20220104015644.2294354-6-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.