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 v6 07/11] vfio: Set DMA ownership for VFIO devices
Date: Fri, 18 Feb 2022 08:55:17 +0800 [thread overview]
Message-ID: <20220218005521.172832-8-baolu.lu@linux.intel.com> (raw)
In-Reply-To: <20220218005521.172832-1-baolu.lu@linux.intel.com>
Claim group dma ownership when an IOMMU group is set to a container,
and release the dma ownership once the iommu group is unset from the
container.
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
---
drivers/vfio/fsl-mc/vfio_fsl_mc.c | 1 +
drivers/vfio/pci/vfio_pci.c | 1 +
drivers/vfio/platform/vfio_amba.c | 1 +
drivers/vfio/platform/vfio_platform.c | 1 +
drivers/vfio/vfio.c | 10 +++++++++-
5 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/drivers/vfio/fsl-mc/vfio_fsl_mc.c b/drivers/vfio/fsl-mc/vfio_fsl_mc.c
index 6e2e62c6f47a..3feff729f3ce 100644
--- a/drivers/vfio/fsl-mc/vfio_fsl_mc.c
+++ b/drivers/vfio/fsl-mc/vfio_fsl_mc.c
@@ -588,6 +588,7 @@ static struct fsl_mc_driver vfio_fsl_mc_driver = {
.name = "vfio-fsl-mc",
.owner = THIS_MODULE,
},
+ .driver_managed_dma = true,
};
static int __init vfio_fsl_mc_driver_init(void)
diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c
index a5ce92beb655..941909d3918b 100644
--- a/drivers/vfio/pci/vfio_pci.c
+++ b/drivers/vfio/pci/vfio_pci.c
@@ -193,6 +193,7 @@ static struct pci_driver vfio_pci_driver = {
.remove = vfio_pci_remove,
.sriov_configure = vfio_pci_sriov_configure,
.err_handler = &vfio_pci_core_err_handlers,
+ .driver_managed_dma = true,
};
static void __init vfio_pci_fill_ids(void)
diff --git a/drivers/vfio/platform/vfio_amba.c b/drivers/vfio/platform/vfio_amba.c
index badfffea14fb..1aaa4f721bd2 100644
--- a/drivers/vfio/platform/vfio_amba.c
+++ b/drivers/vfio/platform/vfio_amba.c
@@ -95,6 +95,7 @@ static struct amba_driver vfio_amba_driver = {
.name = "vfio-amba",
.owner = THIS_MODULE,
},
+ .driver_managed_dma = true,
};
module_amba_driver(vfio_amba_driver);
diff --git a/drivers/vfio/platform/vfio_platform.c b/drivers/vfio/platform/vfio_platform.c
index 68a1c87066d7..04f40c5acfd6 100644
--- a/drivers/vfio/platform/vfio_platform.c
+++ b/drivers/vfio/platform/vfio_platform.c
@@ -76,6 +76,7 @@ static struct platform_driver vfio_platform_driver = {
.driver = {
.name = "vfio-platform",
},
+ .driver_managed_dma = true,
};
module_platform_driver(vfio_platform_driver);
diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
index 735d1d344af9..df9d4b60e5ae 100644
--- a/drivers/vfio/vfio.c
+++ b/drivers/vfio/vfio.c
@@ -1198,6 +1198,8 @@ static void __vfio_group_unset_container(struct vfio_group *group)
driver->ops->detach_group(container->iommu_data,
group->iommu_group);
+ iommu_group_release_dma_owner(group->iommu_group);
+
group->container = NULL;
wake_up(&group->container_q);
list_del(&group->container_next);
@@ -1282,13 +1284,19 @@ static int vfio_group_set_container(struct vfio_group *group, int container_fd)
goto unlock_out;
}
+ ret = iommu_group_claim_dma_owner(group->iommu_group, f.file);
+ if (ret)
+ goto unlock_out;
+
driver = container->iommu_driver;
if (driver) {
ret = driver->ops->attach_group(container->iommu_data,
group->iommu_group,
group->type);
- if (ret)
+ if (ret) {
+ iommu_group_release_dma_owner(group->iommu_group);
goto unlock_out;
+ }
}
group->container = container;
--
2.25.1
next prev parent reply other threads:[~2022-02-18 0:58 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-18 0:55 [PATCH v6 00/11] Fix BUG_ON in vfio_iommu_group_notifier() Lu Baolu
2022-02-18 0:55 ` [PATCH v6 01/11] iommu: Add dma ownership management interfaces Lu Baolu
2022-02-19 7:31 ` Christoph Hellwig
2022-02-21 4:02 ` Lu Baolu
2022-02-23 18:00 ` Robin Murphy
2022-02-23 18:02 ` Jason Gunthorpe
2022-02-23 18:20 ` Robin Murphy
2022-02-23 18:32 ` Jason Gunthorpe
2022-02-24 5:16 ` Lu Baolu
2022-02-24 5:29 ` Lu Baolu
2022-02-24 8:58 ` Robin Murphy
2022-02-24 5:21 ` Lu Baolu
2022-02-18 0:55 ` [PATCH v6 02/11] driver core: Add dma_cleanup callback in bus_type Lu Baolu
2022-02-19 7:32 ` Christoph Hellwig
2022-02-21 20:43 ` Robin Murphy
2022-02-21 23:48 ` Jason Gunthorpe
2022-02-22 4:48 ` Lu Baolu
2022-02-22 10:58 ` Robin Murphy
2022-02-22 15:16 ` Jason Gunthorpe
2022-02-22 21:18 ` Robin Murphy
2022-02-22 23:53 ` Jason Gunthorpe
2022-02-23 5:01 ` Lu Baolu
2022-02-23 13:04 ` Robin Murphy
2022-02-23 13:46 ` Jason Gunthorpe
2022-02-23 14:06 ` Greg Kroah-Hartman
2022-02-23 14:09 ` Jason Gunthorpe
2022-02-23 14:30 ` Jason Gunthorpe
2022-02-23 16:03 ` Greg Kroah-Hartman
2022-02-23 17:05 ` Robin Murphy
2022-02-23 17:47 ` Greg Kroah-Hartman
2022-02-18 0:55 ` [PATCH v6 03/11] amba: Stop sharing platform_dma_configure() Lu Baolu
2022-02-18 0:55 ` [PATCH v6 04/11] bus: platform,amba,fsl-mc,PCI: Add device DMA ownership management Lu Baolu
2022-02-18 7:55 ` Greg Kroah-Hartman
2022-02-18 0:55 ` [PATCH v6 05/11] PCI: pci_stub: Set driver_managed_dma Lu Baolu
2022-02-18 0:55 ` [PATCH v6 06/11] PCI: portdrv: " Lu Baolu
2022-02-18 0:55 ` Lu Baolu [this message]
2022-02-18 0:55 ` [PATCH v6 08/11] vfio: Remove use of vfio_group_viable() Lu Baolu
2022-02-18 0:55 ` [PATCH v6 09/11] vfio: Delete the unbound_list Lu Baolu
2022-02-18 0:55 ` [PATCH v6 10/11] vfio: Remove iommu group notifier Lu Baolu
2022-02-23 21:53 ` Alex Williamson
2022-02-24 2:49 ` Lu Baolu
2022-02-18 0:55 ` [PATCH v6 11/11] iommu: Remove iommu group changes notifier Lu Baolu
2022-02-18 15:51 ` [PATCH v6 00/11] Fix BUG_ON in vfio_iommu_group_notifier() Jason Gunthorpe
2022-02-21 3:38 ` Lu Baolu
2022-02-28 0:58 ` 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=20220218005521.172832-8-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).