kvm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Yi Liu <yi.l.liu@intel.com>
To: alex.williamson@redhat.com, jgg@nvidia.com, kevin.tian@intel.com
Cc: joro@8bytes.org, robin.murphy@arm.com, cohuck@redhat.com,
	eric.auger@redhat.com, nicolinc@nvidia.com, kvm@vger.kernel.org,
	mjrosato@linux.ibm.com, chao.p.peng@linux.intel.com,
	yi.l.liu@intel.com, yi.y.sun@linux.intel.com, peterx@redhat.com,
	jasowang@redhat.com, shameerali.kolothum.thodi@huawei.com,
	lulu@redhat.com, suravee.suthikulpanit@amd.com,
	intel-gvt-dev@lists.freedesktop.org,
	intel-gfx@lists.freedesktop.org, linux-s390@vger.kernel.org,
	xudong.hao@intel.com, yan.y.zhao@intel.com,
	terrence.xu@intel.com
Subject: [PATCH v6 16/24] vfio: Make vfio_device_first_open() to cover the noiommu mode in cdev path
Date: Wed,  8 Mar 2023 05:28:55 -0800	[thread overview]
Message-ID: <20230308132903.465159-17-yi.l.liu@intel.com> (raw)
In-Reply-To: <20230308132903.465159-1-yi.l.liu@intel.com>

vfio_device_first_open() now covers the below two cases:

1) user uses iommufd (e.g. the group path in iommufd compat mode);
2) user uses container (e.g. the group path in legacy mode);

The above two paths have their own noiommu mode support accordingly.

The cdev path also uses iommufd, so for the case user provides a valid
iommufd, this helper is able to support it. But for noiommu mode, the
cdev path just provides a NULL iommufd. So this needs to be able to cover
it. As there is no special things to do for the cdev path in noiommu
mode, it can be covered by simply differentiate it from the container
case. If user is not using iommufd nor container, it is the noiommu
mode.

Signed-off-by: Yi Liu <yi.l.liu@intel.com>
---
 drivers/vfio/group.c     | 15 +++++++++++++++
 drivers/vfio/vfio.h      |  1 +
 drivers/vfio/vfio_main.c | 21 +++++++++++++++++----
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/drivers/vfio/group.c b/drivers/vfio/group.c
index f067a6a7bbd2..51c027134814 100644
--- a/drivers/vfio/group.c
+++ b/drivers/vfio/group.c
@@ -780,6 +780,21 @@ void vfio_device_group_unregister(struct vfio_device *device)
 	mutex_unlock(&device->group->device_lock);
 }
 
+/*
+ * This shall be used without group lock as group and group->container
+ * should be fixed before group is set to df->group.
+ */
+bool vfio_device_group_uses_container(struct vfio_device_file *df)
+{
+	/*
+	 * Use the df->group instead of the df->device->group as no
+	 * lock is acquired here.
+	 */
+	if (WARN_ON(!df->group))
+		return false;
+	return READ_ONCE(df->group->container);
+}
+
 int vfio_device_group_use_iommu(struct vfio_device *device)
 {
 	struct vfio_group *group = device->group;
diff --git a/drivers/vfio/vfio.h b/drivers/vfio/vfio.h
index 11397cc95e0b..615ffd58562b 100644
--- a/drivers/vfio/vfio.h
+++ b/drivers/vfio/vfio.h
@@ -95,6 +95,7 @@ int vfio_device_set_group(struct vfio_device *device,
 void vfio_device_remove_group(struct vfio_device *device);
 void vfio_device_group_register(struct vfio_device *device);
 void vfio_device_group_unregister(struct vfio_device *device);
+bool vfio_device_group_uses_container(struct vfio_device_file *df);
 int vfio_device_group_use_iommu(struct vfio_device *device);
 void vfio_device_group_unuse_iommu(struct vfio_device *device);
 void vfio_device_group_close(struct vfio_device_file *df);
diff --git a/drivers/vfio/vfio_main.c b/drivers/vfio/vfio_main.c
index aa31aae33407..8c73df1a400e 100644
--- a/drivers/vfio/vfio_main.c
+++ b/drivers/vfio/vfio_main.c
@@ -423,16 +423,29 @@ static int vfio_device_first_open(struct vfio_device_file *df)
 {
 	struct vfio_device *device = df->device;
 	struct iommufd_ctx *iommufd = df->iommufd;
-	int ret;
+	int ret = 0;
 
 	lockdep_assert_held(&device->dev_set->lock);
 
 	if (!try_module_get(device->dev->driver->owner))
 		return -ENODEV;
 
+	/*
+	 * The handling here depends on what the user is using.
+	 *
+	 * If user uses iommufd in the group compat mode or the
+	 * cdev path, call vfio_iommufd_bind().
+	 *
+	 * If user uses container in the group legacy mode, call
+	 * vfio_device_group_use_iommu().
+	 *
+	 * If user doesn't use iommufd nor container, this is
+	 * the noiommufd mode in the cdev path, nothing needs
+	 * to be done here just go ahead to open device.
+	 */
 	if (iommufd)
 		ret = vfio_iommufd_bind(device, iommufd);
-	else
+	else if (vfio_device_group_uses_container(df))
 		ret = vfio_device_group_use_iommu(device);
 	if (ret)
 		goto err_module_put;
@@ -447,7 +460,7 @@ static int vfio_device_first_open(struct vfio_device_file *df)
 err_unuse_iommu:
 	if (iommufd)
 		vfio_iommufd_unbind(device);
-	else
+	else if (vfio_device_group_uses_container(df))
 		vfio_device_group_unuse_iommu(device);
 err_module_put:
 	module_put(device->dev->driver->owner);
@@ -465,7 +478,7 @@ static void vfio_device_last_close(struct vfio_device_file *df)
 		device->ops->close_device(device);
 	if (iommufd)
 		vfio_iommufd_unbind(device);
-	else
+	else if (vfio_device_group_uses_container(df))
 		vfio_device_group_unuse_iommu(device);
 	module_put(device->dev->driver->owner);
 }
-- 
2.34.1


  parent reply	other threads:[~2023-03-08 13:33 UTC|newest]

Thread overview: 101+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-08 13:28 [PATCH v6 00/24] cover-letter: Add vfio_device cdev for iommufd support Yi Liu
2023-03-08 13:28 ` [PATCH v6 01/24] vfio: Allocate per device file structure Yi Liu
2023-03-08 13:28 ` [PATCH v6 02/24] vfio: Refine vfio file kAPIs for KVM Yi Liu
2023-03-08 13:28 ` [PATCH v6 03/24] vfio: Accept vfio device file in the KVM facing kAPI Yi Liu
2023-03-08 13:28 ` [PATCH v6 04/24] kvm/vfio: Rename kvm_vfio_group to prepare for accepting vfio device fd Yi Liu
2023-03-08 13:28 ` [PATCH v6 05/24] kvm/vfio: Accept vfio device file from userspace Yi Liu
2023-03-22 14:10   ` Xu Yilun
2023-03-28  3:48     ` Liu, Yi L
2023-03-08 13:28 ` [PATCH v6 06/24] vfio: Pass struct vfio_device_file * to vfio_device_open/close() Yi Liu
2023-03-08 13:28 ` [PATCH v6 07/24] vfio: Block device access via device fd until device is opened Yi Liu
2023-03-10  4:50   ` Tian, Kevin
2023-03-08 13:28 ` [PATCH v6 08/24] vfio/pci: Update comment around group_fd get in vfio_pci_ioctl_pci_hot_reset() Yi Liu
2023-03-08 13:28 ` [PATCH v6 09/24] vfio/pci: Only need to check opened devices in the dev_set for hot reset Yi Liu
2023-03-10  5:00   ` Tian, Kevin
2023-03-08 13:28 ` [PATCH v6 10/24] vfio/pci: Rename the helpers and data in hot reset path to accept device fd Yi Liu
2023-03-10  5:01   ` Tian, Kevin
2023-03-08 13:28 ` [PATCH v6 11/24] vfio/pci: Accept device fd in VFIO_DEVICE_PCI_HOT_RESET ioctl Yi Liu
2023-03-10  5:08   ` Tian, Kevin
2023-03-10  5:38     ` Liu, Yi L
2023-03-08 13:28 ` [PATCH v6 12/24] vfio/pci: Allow passing zero-length fd array in VFIO_DEVICE_PCI_HOT_RESET Yi Liu
2023-03-10  5:31   ` Tian, Kevin
2023-03-10  6:04     ` Liu, Yi L
2023-03-10  9:08       ` Tian, Kevin
2023-03-10 17:42       ` Jason Gunthorpe
2023-03-15 22:53   ` Alex Williamson
2023-03-15 23:31     ` Tian, Kevin
2023-03-16  3:54       ` [offlist] " Liu, Yi L
2023-03-16  6:09         ` Tian, Kevin
2023-03-16  6:28           ` Liu, Yi L
2023-03-16  6:49             ` Nicolin Chen
2023-03-16 13:22               ` Liu, Yi L
2023-03-16 21:27                 ` Nicolin Chen
2023-03-16 18:45       ` Alex Williamson
2023-03-16 23:29         ` Tian, Kevin
2023-03-17  0:22           ` Alex Williamson
2023-03-17  0:57             ` Tian, Kevin
2023-03-17 15:15               ` Alex Williamson
2023-03-20 17:14                 ` Jason Gunthorpe
2023-03-20 22:52                   ` Alex Williamson
2023-03-20 23:39                     ` Jason Gunthorpe
2023-03-21 20:31                       ` Alex Williamson
2023-03-21 20:50                         ` Jason Gunthorpe
2023-03-21 21:01                           ` Alex Williamson
2023-03-21 22:20                             ` Jason Gunthorpe
2023-03-21 22:47                               ` Alex Williamson
2023-03-22  4:42                                 ` Liu, Yi L
2023-03-22 12:23                                   ` Alex Williamson
2023-03-22 12:27                                 ` Jason Gunthorpe
2023-03-22 12:36                                   ` Alex Williamson
2023-03-22 12:47                                     ` Jason Gunthorpe
2023-03-24  9:09                             ` Tian, Kevin
2023-03-24 13:14                               ` Jason Gunthorpe
2023-03-22  8:17                           ` Liu, Yi L
2023-03-22 12:17                             ` Jason Gunthorpe
2023-03-22 13:33                               ` Liu, Yi L
2023-03-22 13:43                                 ` Jason Gunthorpe
2023-03-23  3:15                                   ` Liu, Yi L
2023-03-23 12:02                                     ` Jason Gunthorpe
2023-03-24  9:25                                       ` Liu, Yi L
2023-03-27 11:57                                         ` Liu, Yi L
2023-03-08 13:28 ` [PATCH v6 13/24] vfio/iommufd: Split the compat_ioas attach out from vfio_iommufd_bind() Yi Liu
2023-03-10  8:08   ` Tian, Kevin
2023-03-10  8:22     ` Liu, Yi L
2023-03-10  9:10       ` Tian, Kevin
2023-03-11 10:24       ` Liu, Yi L
2023-03-13  2:06         ` Tian, Kevin
2023-03-08 13:28 ` [PATCH v6 14/24] vfio: Add cdev_device_open_cnt to vfio_group Yi Liu
2023-03-08 13:28 ` [PATCH v6 15/24] vfio: Make vfio_device_open() single open for device cdev path Yi Liu
2023-03-08 13:28 ` Yi Liu [this message]
2023-03-10  8:30   ` [PATCH v6 16/24] vfio: Make vfio_device_first_open() to cover the noiommu mode in " Tian, Kevin
2023-03-08 13:28 ` [PATCH v6 17/24] vfio-iommufd: Make vfio_iommufd_bind() selectively return devid Yi Liu
2023-03-10  8:31   ` Tian, Kevin
2023-03-08 13:28 ` [PATCH v6 18/24] vfio-iommufd: Add detach_ioas support for physical VFIO devices Yi Liu
2023-03-08 13:28 ` [PATCH v6 19/24] vfio-iommufd: Add detach_ioas support for emulated " Yi Liu
2023-03-10 23:42   ` Nicolin Chen
2023-03-15  6:15     ` Liu, Yi L
2023-03-15  6:25       ` Nicolin Chen
2023-03-08 13:28 ` [PATCH v6 20/24] vfio: Add cdev for vfio_device Yi Liu
2023-03-10  8:48   ` Tian, Kevin
2023-03-10  9:59     ` Liu, Yi L
2023-03-08 13:29 ` [PATCH v6 21/24] vfio: Add VFIO_DEVICE_BIND_IOMMUFD Yi Liu
2023-03-10  9:01   ` Tian, Kevin
2023-03-10  9:58     ` Liu, Yi L
2023-03-10 10:06       ` Tian, Kevin
2023-03-15  4:40         ` Liu, Yi L
2023-03-15  6:57           ` Tian, Kevin
2023-03-20 14:09           ` Jason Gunthorpe
2023-03-20 14:31             ` Yi Liu
2023-03-20 17:16               ` Jason Gunthorpe
2023-03-21  1:30                 ` Tian, Kevin
2023-03-21 12:00                   ` Jason Gunthorpe
2023-03-21 14:37                     ` Liu, Yi L
2023-03-21 14:41                       ` Jason Gunthorpe
2023-03-21 14:51                         ` Liu, Yi L
2023-03-21 14:58                           ` Jason Gunthorpe
2023-03-21 15:10                             ` Liu, Yi L
2023-03-21 16:54                               ` Jason Gunthorpe
2023-03-08 13:29 ` [PATCH v6 22/24] vfio: Add VFIO_DEVICE_AT[DE]TACH_IOMMUFD_PT Yi Liu
2023-03-08 13:29 ` [PATCH v6 23/24] vfio: Compile group optionally Yi Liu
2023-03-10  9:03   ` Tian, Kevin
2023-03-08 13:29 ` [PATCH v6 24/24] docs: vfio: Add vfio device cdev description Yi Liu

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=20230308132903.465159-17-yi.l.liu@intel.com \
    --to=yi.l.liu@intel.com \
    --cc=alex.williamson@redhat.com \
    --cc=chao.p.peng@linux.intel.com \
    --cc=cohuck@redhat.com \
    --cc=eric.auger@redhat.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=intel-gvt-dev@lists.freedesktop.org \
    --cc=jasowang@redhat.com \
    --cc=jgg@nvidia.com \
    --cc=joro@8bytes.org \
    --cc=kevin.tian@intel.com \
    --cc=kvm@vger.kernel.org \
    --cc=linux-s390@vger.kernel.org \
    --cc=lulu@redhat.com \
    --cc=mjrosato@linux.ibm.com \
    --cc=nicolinc@nvidia.com \
    --cc=peterx@redhat.com \
    --cc=robin.murphy@arm.com \
    --cc=shameerali.kolothum.thodi@huawei.com \
    --cc=suravee.suthikulpanit@amd.com \
    --cc=terrence.xu@intel.com \
    --cc=xudong.hao@intel.com \
    --cc=yan.y.zhao@intel.com \
    --cc=yi.y.sun@linux.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).