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, yanting.jiang@intel.com,
zhenzhong.duan@intel.com
Subject: [PATCH v10 07/22] vfio: Block device access via device fd until device is opened
Date: Wed, 26 Apr 2023 08:03:06 -0700 [thread overview]
Message-ID: <20230426150321.454465-8-yi.l.liu@intel.com> (raw)
In-Reply-To: <20230426150321.454465-1-yi.l.liu@intel.com>
Allow the vfio_device file to be in a state where the device FD is
opened but the device cannot be used by userspace (i.e. its .open_device()
hasn't been called). This inbetween state is not used when the device
FD is spawned from the group FD, however when we create the device FD
directly by opening a cdev it will be opened in the blocked state.
The reason for the inbetween state is that userspace only gets a FD but
doesn't gain access permission until binding the FD to an iommufd. So in
the blocked state, only the bind operation is allowed. Completing bind
will allow user to further access the device.
This is implemented by adding a flag in struct vfio_device_file to mark
the blocked state and using a simple smp_load_acquire() to obtain the
flag value and serialize all the device setup with the thread accessing
this device.
Following this lockless scheme, it can safely handle the device FD
unbound->bound but it cannot handle bound->unbound. To allow this we'd
need to add a lock on all the vfio ioctls which seems costly. So once
device FD is bound, it remains bound until the FD is closed.
Suggested-by: Jason Gunthorpe <jgg@nvidia.com>
Reviewed-by: Kevin Tian <kevin.tian@intel.com>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Tested-by: Terrence Xu <terrence.xu@intel.com>
Tested-by: Nicolin Chen <nicolinc@nvidia.com>
Tested-by: Matthew Rosato <mjrosato@linux.ibm.com>
Tested-by: Yanting Jiang <yanting.jiang@intel.com>
Signed-off-by: Yi Liu <yi.l.liu@intel.com>
---
drivers/vfio/group.c | 11 ++++++++++-
drivers/vfio/vfio.h | 1 +
drivers/vfio/vfio_main.c | 16 ++++++++++++++++
3 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/drivers/vfio/group.c b/drivers/vfio/group.c
index 3cd373ffd308..95a2d67153f5 100644
--- a/drivers/vfio/group.c
+++ b/drivers/vfio/group.c
@@ -194,9 +194,18 @@ static int vfio_device_group_open(struct vfio_device_file *df)
df->iommufd = device->group->iommufd;
ret = vfio_device_open(df);
- if (ret)
+ if (ret) {
df->iommufd = NULL;
+ goto out_put_kvm;
+ }
+
+ /*
+ * Paired with smp_load_acquire() in vfio_device_fops::ioctl/
+ * read/write/mmap and vfio_file_has_device_access()
+ */
+ smp_store_release(&df->access_granted, true);
+out_put_kvm:
if (device->open_count == 0)
vfio_device_put_kvm(device);
diff --git a/drivers/vfio/vfio.h b/drivers/vfio/vfio.h
index f1da4378269d..aad94bf60ee2 100644
--- a/drivers/vfio/vfio.h
+++ b/drivers/vfio/vfio.h
@@ -18,6 +18,7 @@ struct vfio_container;
struct vfio_device_file {
struct vfio_device *device;
+ bool access_granted;
spinlock_t kvm_ref_lock; /* protect kvm field */
struct kvm *kvm;
struct iommufd_ctx *iommufd; /* protected by struct vfio_device_set::lock */
diff --git a/drivers/vfio/vfio_main.c b/drivers/vfio/vfio_main.c
index 1a6d163f0e02..e097237264e0 100644
--- a/drivers/vfio/vfio_main.c
+++ b/drivers/vfio/vfio_main.c
@@ -1118,6 +1118,10 @@ static long vfio_device_fops_unl_ioctl(struct file *filep,
struct vfio_device *device = df->device;
int ret;
+ /* Paired with smp_store_release() following vfio_device_open() */
+ if (!smp_load_acquire(&df->access_granted))
+ return -EINVAL;
+
ret = vfio_device_pm_runtime_get(device);
if (ret)
return ret;
@@ -1145,6 +1149,10 @@ static ssize_t vfio_device_fops_read(struct file *filep, char __user *buf,
struct vfio_device_file *df = filep->private_data;
struct vfio_device *device = df->device;
+ /* Paired with smp_store_release() following vfio_device_open() */
+ if (!smp_load_acquire(&df->access_granted))
+ return -EINVAL;
+
if (unlikely(!device->ops->read))
return -EINVAL;
@@ -1158,6 +1166,10 @@ static ssize_t vfio_device_fops_write(struct file *filep,
struct vfio_device_file *df = filep->private_data;
struct vfio_device *device = df->device;
+ /* Paired with smp_store_release() following vfio_device_open() */
+ if (!smp_load_acquire(&df->access_granted))
+ return -EINVAL;
+
if (unlikely(!device->ops->write))
return -EINVAL;
@@ -1169,6 +1181,10 @@ static int vfio_device_fops_mmap(struct file *filep, struct vm_area_struct *vma)
struct vfio_device_file *df = filep->private_data;
struct vfio_device *device = df->device;
+ /* Paired with smp_store_release() following vfio_device_open() */
+ if (!smp_load_acquire(&df->access_granted))
+ return -EINVAL;
+
if (unlikely(!device->ops->mmap))
return -EINVAL;
--
2.34.1
next prev parent reply other threads:[~2023-04-26 15:03 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-26 15:02 [PATCH v10 00/22] Add vfio_device cdev for iommufd support Yi Liu
2023-04-26 15:03 ` [PATCH v10 01/22] vfio: Allocate per device file structure Yi Liu
2023-04-26 15:03 ` [PATCH v10 02/22] vfio: Refine vfio file kAPIs for KVM Yi Liu
2023-04-26 15:03 ` [PATCH v10 03/22] vfio: Accept vfio device file in the KVM facing kAPI Yi Liu
2023-04-26 15:03 ` [PATCH v10 04/22] kvm/vfio: Rename kvm_vfio_group to prepare for accepting vfio device fd Yi Liu
2023-04-26 15:03 ` [PATCH v10 05/22] kvm/vfio: Accept vfio device file from userspace Yi Liu
2023-05-11 7:11 ` Cédric Le Goater
2023-05-12 7:57 ` Liu, Yi L
2023-04-26 15:03 ` [PATCH v10 06/22] vfio: Pass struct vfio_device_file * to vfio_device_open/close() Yi Liu
2023-04-26 15:03 ` Yi Liu [this message]
2023-04-26 15:03 ` [PATCH v10 08/22] vfio: Add cdev_device_open_cnt to vfio_group Yi Liu
2023-04-26 15:03 ` [PATCH v10 09/22] vfio: Make vfio_device_open() single open for device cdev path Yi Liu
2023-04-26 15:03 ` [PATCH v10 10/22] vfio-iommufd: Move noiommu compat probe out of vfio_iommufd_bind() Yi Liu
2023-04-26 15:03 ` [PATCH v10 11/22] vfio-iommufd: Split bind/attach into two steps Yi Liu
2023-04-26 15:03 ` [PATCH v10 12/22] vfio: Record devid in vfio_device_file Yi Liu
2023-04-26 15:03 ` [PATCH v10 13/22] vfio-iommufd: Add detach_ioas support for physical VFIO devices Yi Liu
2023-04-26 15:03 ` [PATCH v10 14/22] iommufd/device: Add iommufd_access_detach() API Yi Liu
2023-04-26 15:03 ` [PATCH v10 15/22] vfio-iommufd: Add detach_ioas support for emulated VFIO devices Yi Liu
2023-04-26 15:03 ` [PATCH v10 16/22] vfio: Name noiommu vfio_device with "noiommu-" prefix Yi Liu
2023-04-26 15:03 ` [PATCH v10 17/22] vfio: Move vfio_device_group_unregister() to be the first operation in unregister Yi Liu
2023-04-26 15:03 ` [PATCH v10 18/22] vfio: Add cdev for vfio_device Yi Liu
2023-04-26 15:03 ` [PATCH v10 19/22] vfio: Add VFIO_DEVICE_BIND_IOMMUFD Yi Liu
2023-04-26 15:03 ` [PATCH v10 20/22] vfio: Add VFIO_DEVICE_[AT|DE]TACH_IOMMUFD_PT Yi Liu
2023-04-26 15:03 ` [PATCH v10 21/22] vfio: Compile group optionally Yi Liu
2023-04-26 15:03 ` [PATCH v10 22/22] docs: vfio: Add vfio device cdev description Yi Liu
2023-04-28 9:29 ` [PATCH v10 00/22] Add vfio_device cdev for iommufd support Jiang, Yanting
2023-04-28 15:11 ` Shameerali Kolothum Thodi
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=20230426150321.454465-8-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=yanting.jiang@intel.com \
--cc=yi.y.sun@linux.intel.com \
--cc=zhenzhong.duan@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