From: Christoph Hellwig <hch@lst.de>
To: Alex Williamson <alex.williamson@redhat.com>
Cc: Diana Craciun <diana.craciun@oss.nxp.com>,
Cornelia Huck <cohuck@redhat.com>,
Kirti Wankhede <kwankhede@nvidia.com>,
Eric Auger <eric.auger@redhat.com>,
Jason Gunthorpe <jgg@ziepe.ca>,
Terrence Xu <terrence.xu@intel.com>,
kvm@vger.kernel.org, Jason Gunthorpe <jgg@nvidia.com>,
Kevin Tian <kevin.tian@intel.com>
Subject: [PATCH 04/15] vfio: factor out a vfio_group_find_or_alloc helper
Date: Fri, 24 Sep 2021 17:56:54 +0200 [thread overview]
Message-ID: <20210924155705.4258-5-hch@lst.de> (raw)
In-Reply-To: <20210924155705.4258-1-hch@lst.de>
Factor out a helper to find or allocate the vfio_group to reduce the
spagetthi code in vfio_register_group_dev a little.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Reviewed-by: Kevin Tian <kevin.tian@intel.com>
---
drivers/vfio/vfio.c | 60 ++++++++++++++++++++++++++-------------------
1 file changed, 35 insertions(+), 25 deletions(-)
diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
index 8bd4b0b96b94a3..2b2679c7126fdf 100644
--- a/drivers/vfio/vfio.c
+++ b/drivers/vfio/vfio.c
@@ -823,10 +823,39 @@ void vfio_uninit_group_dev(struct vfio_device *device)
}
EXPORT_SYMBOL_GPL(vfio_uninit_group_dev);
+struct vfio_group *vfio_group_find_or_alloc(struct device *dev)
+{
+ struct iommu_group *iommu_group;
+ struct vfio_group *group;
+
+ iommu_group = vfio_iommu_group_get(dev);
+ if (!iommu_group)
+ return ERR_PTR(-EINVAL);
+
+ /* a found vfio_group already holds a reference to the iommu_group */
+ group = vfio_group_get_from_iommu(iommu_group);
+ if (group)
+ goto out_put;
+
+ /* a newly created vfio_group keeps the reference. */
+ group = vfio_create_group(iommu_group);
+ if (IS_ERR(group))
+ goto out_remove;
+ return group;
+
+out_remove:
+#ifdef CONFIG_VFIO_NOIOMMU
+ if (iommu_group_get_iommudata(iommu_group) == &noiommu)
+ iommu_group_remove_device(dev);
+#endif
+out_put:
+ iommu_group_put(iommu_group);
+ return group;
+}
+
int vfio_register_group_dev(struct vfio_device *device)
{
struct vfio_device *existing_device;
- struct iommu_group *iommu_group;
struct vfio_group *group;
/*
@@ -836,36 +865,17 @@ int vfio_register_group_dev(struct vfio_device *device)
if (!device->dev_set)
vfio_assign_device_set(device, device);
- iommu_group = vfio_iommu_group_get(device->dev);
- if (!iommu_group)
- return -EINVAL;
-
- group = vfio_group_get_from_iommu(iommu_group);
- if (!group) {
- group = vfio_create_group(iommu_group);
- if (IS_ERR(group)) {
-#ifdef CONFIG_VFIO_NOIOMMU
- if (iommu_group_get_iommudata(iommu_group) == &noiommu)
- iommu_group_remove_device(device->dev);
-#endif
- iommu_group_put(iommu_group);
- return PTR_ERR(group);
- }
- } else {
- /*
- * A found vfio_group already holds a reference to the
- * iommu_group. A created vfio_group keeps the reference.
- */
- iommu_group_put(iommu_group);
- }
+ group = vfio_group_find_or_alloc(device->dev);
+ if (IS_ERR(group))
+ return PTR_ERR(group);
existing_device = vfio_group_get_device(group, device->dev);
if (existing_device) {
dev_WARN(device->dev, "Device already exists on group %d\n",
- iommu_group_id(iommu_group));
+ iommu_group_id(group->iommu_group));
vfio_device_put(existing_device);
#ifdef CONFIG_VFIO_NOIOMMU
- if (iommu_group_get_iommudata(iommu_group) == &noiommu)
+ if (iommu_group_get_iommudata(group->iommu_group) == &noiommu)
iommu_group_remove_device(device->dev);
#endif
vfio_group_put(group);
--
2.30.2
next prev parent reply other threads:[~2021-09-24 16:03 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-24 15:56 cleanup vfio iommu_group creation v6 Christoph Hellwig
2021-09-24 15:56 ` [PATCH 01/15] vfio: Move vfio_iommu_group_get() to vfio_register_group_dev() Christoph Hellwig
2021-09-24 15:56 ` [PATCH 02/15] vfio: factor out a vfio_iommu_driver_allowed helper Christoph Hellwig
2021-09-24 15:56 ` [PATCH 03/15] vfio: remove the iommudata check in vfio_noiommu_attach_group Christoph Hellwig
2021-09-24 15:56 ` Christoph Hellwig [this message]
2021-09-24 15:56 ` [PATCH 05/15] vfio: refactor noiommu group creation Christoph Hellwig
2021-09-24 15:56 ` [PATCH 06/15] vfio: remove the iommudata hack for noiommu groups Christoph Hellwig
2021-09-24 15:56 ` [PATCH 07/15] vfio: simplify iommu group allocation for mediated devices Christoph Hellwig
2021-09-24 15:56 ` [PATCH 08/15] vfio: remove unused method from vfio_iommu_driver_ops Christoph Hellwig
2021-09-24 15:56 ` [PATCH 09/15] vfio: move the vfio_iommu_driver_ops interface out of <linux/vfio.h> Christoph Hellwig
2021-09-24 15:57 ` [PATCH 10/15] vfio: remove the unused mdev iommu hook Christoph Hellwig
2021-09-24 15:57 ` [PATCH 11/15] vfio: clean up the check for mediated device in vfio_iommu_type1 Christoph Hellwig
2021-09-24 15:57 ` [PATCH 12/15] vfio/spapr_tce: reject mediated devices Christoph Hellwig
2021-09-24 15:57 ` [PATCH 13/15] vfio/iommu_type1: initialize pgsize_bitmap in ->open Christoph Hellwig
2021-09-24 17:48 ` Jason Gunthorpe
2021-09-24 18:37 ` Alex Williamson
2021-09-27 11:49 ` Christoph Hellwig
2021-09-27 12:56 ` Alex Williamson
2021-09-27 13:53 ` Christoph Hellwig
2021-09-24 15:57 ` [PATCH 14/15] vfio/iommu_type1: remove the "external" domain Christoph Hellwig
2021-09-24 15:57 ` [PATCH 15/15] vfio/iommu_type1: remove IS_IOMMU_CAP_DOMAIN_IN_CONTAINER Christoph Hellwig
2021-09-30 20:16 ` cleanup vfio iommu_group creation v6 Alex Williamson
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=20210924155705.4258-5-hch@lst.de \
--to=hch@lst.de \
--cc=alex.williamson@redhat.com \
--cc=cohuck@redhat.com \
--cc=diana.craciun@oss.nxp.com \
--cc=eric.auger@redhat.com \
--cc=jgg@nvidia.com \
--cc=jgg@ziepe.ca \
--cc=kevin.tian@intel.com \
--cc=kvm@vger.kernel.org \
--cc=kwankhede@nvidia.com \
--cc=terrence.xu@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).