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
Subject: [PATCH v9 22/25] vfio: Add VFIO_DEVICE_BIND_IOMMUFD
Date: Sat, 1 Apr 2023 08:18:30 -0700 [thread overview]
Message-ID: <20230401151833.124749-23-yi.l.liu@intel.com> (raw)
In-Reply-To: <20230401151833.124749-1-yi.l.liu@intel.com>
This adds ioctl for userspace to bind device cdev fd to iommufd.
VFIO_DEVICE_BIND_IOMMUFD: bind device to an iommufd, hence gain DMA
control provided by the iommufd. open_device
op is called after bind_iommufd op.
VFIO no iommu mode is indicated by passing
VFIO_NOIOMMU_FD (-1) as iommufd value.
Reviewed-by: Kevin Tian <kevin.tian@intel.com>
Tested-by: Terrence Xu <terrence.xu@intel.com>
Tested-by: Nicolin Chen <nicolinc@nvidia.com>
Tested-by: Yanting Jiang <yanting.jiang@intel.com>
Signed-off-by: Yi Liu <yi.l.liu@intel.com>
---
drivers/vfio/device_cdev.c | 152 +++++++++++++++++++++++++++++++++++++
drivers/vfio/vfio.h | 13 ++++
drivers/vfio/vfio_main.c | 5 ++
include/uapi/linux/vfio.h | 31 ++++++++
4 files changed, 201 insertions(+)
diff --git a/drivers/vfio/device_cdev.c b/drivers/vfio/device_cdev.c
index 1c640016a824..e3c51d2f5732 100644
--- a/drivers/vfio/device_cdev.c
+++ b/drivers/vfio/device_cdev.c
@@ -3,6 +3,7 @@
* Copyright (c) 2023 Intel Corporation.
*/
#include <linux/vfio.h>
+#include <linux/iommufd.h>
#include "vfio.h"
@@ -44,6 +45,157 @@ int vfio_device_fops_cdev_open(struct inode *inode, struct file *filep)
return ret;
}
+static void vfio_device_get_kvm_safe(struct vfio_device_file *df)
+{
+ spin_lock(&df->kvm_ref_lock);
+ if (df->kvm)
+ _vfio_device_get_kvm_safe(df->device, df->kvm);
+ spin_unlock(&df->kvm_ref_lock);
+}
+
+void vfio_device_cdev_close(struct vfio_device_file *df)
+{
+ struct vfio_device *device = df->device;
+
+ /*
+ * In the time of close, there is no contention with another one
+ * changing this flag. So read df->access_granted without lock
+ * and no smp_load_acquire() is ok.
+ */
+ if (!df->access_granted)
+ return;
+
+ mutex_lock(&device->dev_set->lock);
+ vfio_device_close(df);
+ vfio_device_put_kvm(device);
+ if (df->iommufd)
+ iommufd_ctx_put(df->iommufd);
+ device->cdev_opened = false;
+ mutex_unlock(&device->dev_set->lock);
+ vfio_device_unblock_group(device);
+}
+
+static int vfio_device_cdev_probe_noiommu(struct vfio_device *device)
+{
+ if (!capable(CAP_SYS_RAWIO))
+ return -EPERM;
+
+ if (!device->noiommu)
+ return -EINVAL;
+
+ return 0;
+}
+
+static struct iommufd_ctx *vfio_get_iommufd_from_fd(int fd)
+{
+ struct iommufd_ctx *iommufd;
+ struct fd f;
+
+ f = fdget(fd);
+ if (!f.file)
+ return ERR_PTR(-EBADF);
+
+ iommufd = iommufd_ctx_from_file(f.file);
+
+ fdput(f);
+ return iommufd;
+}
+
+long vfio_device_ioctl_bind_iommufd(struct vfio_device_file *df,
+ struct vfio_device_bind_iommufd __user *arg)
+{
+ struct vfio_device *device = df->device;
+ struct vfio_device_bind_iommufd bind;
+ unsigned long minsz;
+ bool is_noiommu;
+ int ret;
+
+ static_assert(__same_type(arg->out_devid, df->devid));
+
+ minsz = offsetofend(struct vfio_device_bind_iommufd, out_devid);
+
+ if (copy_from_user(&bind, arg, minsz))
+ return -EFAULT;
+
+ if (bind.argsz < minsz || bind.flags)
+ return -EINVAL;
+
+ /* BIND_IOMMUFD only allowed for cdev fds */
+ if (df->group)
+ return -EINVAL;
+
+ ret = vfio_device_block_group(device);
+ if (ret)
+ return ret;
+
+ is_noiommu = bind.iommufd == VFIO_NOIOMMU_FD;
+
+ mutex_lock(&device->dev_set->lock);
+ /* one device cannot be bound twice */
+ if (df->access_granted) {
+ ret = -EINVAL;
+ goto out_unlock;
+ }
+
+ if (is_noiommu) {
+ ret = vfio_device_cdev_probe_noiommu(device);
+ if (ret)
+ goto out_unlock;
+ } else {
+ df->iommufd = vfio_get_iommufd_from_fd(bind.iommufd);
+ if (IS_ERR(df->iommufd)) {
+ ret = PTR_ERR(df->iommufd);
+ df->iommufd = NULL;
+ goto out_unlock;
+ }
+ }
+
+ /*
+ * Before the device open, get the KVM pointer currently
+ * associated with the device file (if there is) and obtain
+ * a reference. This reference is held until device closed.
+ * Save the pointer in the device for use by drivers.
+ */
+ vfio_device_get_kvm_safe(df);
+
+ ret = vfio_device_open(df);
+ if (ret)
+ goto out_put_kvm;
+
+ if (is_noiommu) {
+ dev_warn(device->dev, "device is bound to vfio-noiommu by user "
+ "(%s:%d)\n", current->comm, task_pid_nr(current));
+ } else {
+ ret = copy_to_user(&arg->out_devid, &df->devid,
+ sizeof(df->devid)) ? -EFAULT : 0;
+ if (ret)
+ goto out_close_device;
+ }
+
+ /*
+ * Paired with smp_load_acquire() in vfio_device_fops::ioctl/
+ * read/write/mmap
+ */
+ smp_store_release(&df->access_granted, true);
+ device->cdev_opened = true;
+ mutex_unlock(&device->dev_set->lock);
+
+ return 0;
+
+out_close_device:
+ vfio_device_close(df);
+out_put_kvm:
+ vfio_device_put_kvm(device);
+ if (!is_noiommu) {
+ iommufd_ctx_put(df->iommufd);
+ df->iommufd = NULL;
+ }
+out_unlock:
+ mutex_unlock(&device->dev_set->lock);
+ vfio_device_unblock_group(device);
+ return ret;
+}
+
static char *vfio_device_devnode(const struct device *dev, umode_t *mode)
{
return kasprintf(GFP_KERNEL, "vfio/devices/%s", dev_name(dev));
diff --git a/drivers/vfio/vfio.h b/drivers/vfio/vfio.h
index 3a8fd0e32f59..ace3d52b0928 100644
--- a/drivers/vfio/vfio.h
+++ b/drivers/vfio/vfio.h
@@ -281,6 +281,9 @@ static inline void vfio_device_del(struct vfio_device *device)
void vfio_init_device_cdev(struct vfio_device *device);
int vfio_device_fops_cdev_open(struct inode *inode, struct file *filep);
+void vfio_device_cdev_close(struct vfio_device_file *df);
+long vfio_device_ioctl_bind_iommufd(struct vfio_device_file *df,
+ struct vfio_device_bind_iommufd __user *arg);
int vfio_cdev_init(struct class *device_class);
void vfio_cdev_cleanup(void);
#else
@@ -304,6 +307,16 @@ static inline int vfio_device_fops_cdev_open(struct inode *inode,
return 0;
}
+static inline void vfio_device_cdev_close(struct vfio_device_file *df)
+{
+}
+
+static inline long vfio_device_ioctl_bind_iommufd(struct vfio_device_file *df,
+ struct vfio_device_bind_iommufd __user *arg)
+{
+ return -EOPNOTSUPP;
+}
+
static inline int vfio_cdev_init(struct class *device_class)
{
return 0;
diff --git a/drivers/vfio/vfio_main.c b/drivers/vfio/vfio_main.c
index 61f56d9b5e5f..0611e29e41a9 100644
--- a/drivers/vfio/vfio_main.c
+++ b/drivers/vfio/vfio_main.c
@@ -565,6 +565,8 @@ static int vfio_device_fops_release(struct inode *inode, struct file *filep)
if (df->group)
vfio_device_group_close(df);
+ else
+ vfio_device_cdev_close(df);
vfio_device_put_registration(device);
@@ -1138,6 +1140,9 @@ static long vfio_device_fops_unl_ioctl(struct file *filep,
struct vfio_device *device = df->device;
int ret;
+ if (cmd == VFIO_DEVICE_BIND_IOMMUFD)
+ return vfio_device_ioctl_bind_iommufd(df, (void __user *)arg);
+
/* Paired with smp_store_release() following vfio_device_open() */
if (!smp_load_acquire(&df->access_granted))
return -EINVAL;
diff --git a/include/uapi/linux/vfio.h b/include/uapi/linux/vfio.h
index 5a34364e3b94..84d76630dd60 100644
--- a/include/uapi/linux/vfio.h
+++ b/include/uapi/linux/vfio.h
@@ -194,6 +194,37 @@ struct vfio_group_status {
/* --------------- IOCTLs for DEVICE file descriptors --------------- */
+/*
+ * VFIO_DEVICE_BIND_IOMMUFD - _IOR(VFIO_TYPE, VFIO_BASE + 19,
+ * struct vfio_device_bind_iommufd)
+ *
+ * Bind a vfio_device to the specified iommufd.
+ *
+ * User is restricted from accessing the device before the binding operation
+ * is completed.
+ *
+ * Unbind is automatically conducted when device fd is closed.
+ *
+ * @argsz: user filled size of this data.
+ * @flags: reserved for future extension.
+ * @iommufd: iommufd to bind. VFIO_NOIOMMU_FD means noiommu.
+ * @out_devid: the device id generated by this bind. This field is valid
+ * as long as the input @iommufd is valid. Otherwise, it is
+ * meaningless. devid is a handle for this device and can be
+ * used in IOMMUFD commands.
+ *
+ * Return: 0 on success, -errno on failure.
+ */
+struct vfio_device_bind_iommufd {
+ __u32 argsz;
+ __u32 flags;
+ __s32 iommufd;
+#define VFIO_NOIOMMU_FD (-1)
+ __u32 out_devid;
+};
+
+#define VFIO_DEVICE_BIND_IOMMUFD _IO(VFIO_TYPE, VFIO_BASE + 19)
+
/**
* VFIO_DEVICE_GET_INFO - _IOR(VFIO_TYPE, VFIO_BASE + 7,
* struct vfio_device_info)
--
2.34.1
next prev parent reply other threads:[~2023-04-01 15:19 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-01 15:18 [PATCH v9 00/25] Add vfio_device cdev for iommufd support Yi Liu
2023-04-01 15:18 ` [PATCH v9 01/25] vfio: Allocate per device file structure Yi Liu
2023-04-01 15:18 ` [PATCH v9 02/25] vfio: Refine vfio file kAPIs for KVM Yi Liu
2023-04-01 15:18 ` [PATCH v9 03/25] vfio: Remove vfio_file_is_group() Yi Liu
2023-04-05 12:20 ` Eric Auger
2023-04-01 15:18 ` [PATCH v9 04/25] vfio: Accept vfio device file in the KVM facing kAPI Yi Liu
2023-04-05 17:58 ` Eric Auger
2023-04-01 15:18 ` [PATCH v9 05/25] kvm/vfio: Rename kvm_vfio_group to prepare for accepting vfio device fd Yi Liu
2023-04-01 15:18 ` [PATCH v9 06/25] kvm/vfio: Accept vfio device file from userspace Yi Liu
2023-04-06 9:46 ` Eric Auger
2023-04-06 10:49 ` Liu, Yi L
2023-04-06 18:57 ` Alex Williamson
2023-04-07 3:42 ` Liu, Yi L
2023-04-07 8:56 ` Eric Auger
2023-04-07 10:23 ` Liu, Yi L
2023-04-01 15:18 ` [PATCH v9 07/25] vfio: Pass struct vfio_device_file * to vfio_device_open/close() Yi Liu
2023-04-06 12:43 ` Eric Auger
2023-04-01 15:18 ` [PATCH v9 08/25] vfio: Block device access via device fd until device is opened Yi Liu
2023-04-06 14:08 ` Eric Auger
2023-04-01 15:18 ` [PATCH v9 09/25] vfio: Add cdev_device_open_cnt to vfio_group Yi Liu
2023-04-06 14:13 ` Eric Auger
2023-04-01 15:18 ` [PATCH v9 10/25] vfio: Make vfio_device_open() single open for device cdev path Yi Liu
2023-04-06 16:44 ` Eric Auger
2023-04-07 9:48 ` Eric Auger
2023-04-07 10:18 ` Liu, Yi L
2023-04-01 15:18 ` [PATCH v9 11/25] vfio: Make vfio_device_first_open() to accept NULL iommufd for noiommu Yi Liu
2023-04-01 15:18 ` [PATCH v9 12/25] vfio-iommufd: Move noiommu support out of vfio_iommufd_bind() Yi Liu
2023-04-01 15:18 ` [PATCH v9 13/25] vfio-iommufd: Split bind/attach into two steps Yi Liu
2023-04-01 15:18 ` [PATCH v9 14/25] vfio: Record devid in vfio_device_file Yi Liu
2023-04-01 15:18 ` [PATCH v9 15/25] vfio-iommufd: Add detach_ioas support for physical VFIO devices Yi Liu
2023-04-01 15:18 ` [PATCH v9 16/25] iommufd/device: Add iommufd_access_detach() API Yi Liu
2023-04-04 22:45 ` Alex Williamson
2023-04-05 11:56 ` Jason Gunthorpe
2023-04-05 14:10 ` Liu, Yi L
2023-04-05 14:28 ` Jason Gunthorpe
2023-04-05 14:46 ` Liu, Yi L
2023-04-01 15:18 ` [PATCH v9 17/25] vfio-iommufd: Add detach_ioas support for emulated VFIO devices Yi Liu
2023-04-01 15:18 ` [PATCH v9 18/25] vfio: Determine noiommu in vfio_device registration Yi Liu
2023-04-01 15:18 ` [PATCH v9 19/25] vfio: Name noiommu vfio_device with "noiommu-" prefix Yi Liu
2023-04-01 15:18 ` [PATCH v9 20/25] vfio: Move vfio_device_group_unregister() to be the first operation in unregister Yi Liu
2023-04-01 15:18 ` [PATCH v9 21/25] vfio: Add cdev for vfio_device Yi Liu
2023-04-01 15:18 ` Yi Liu [this message]
2023-04-01 15:18 ` [PATCH v9 23/25] vfio: Add VFIO_DEVICE_[AT|DE]TACH_IOMMUFD_PT Yi Liu
2023-04-01 15:18 ` [PATCH v9 24/25] vfio: Compile group optionally Yi Liu
2023-04-01 15:18 ` [PATCH v9 25/25] docs: vfio: Add vfio device cdev description Yi Liu
2023-04-05 13:45 ` Eric Auger
2023-04-05 14:00 ` Liu, Yi L
2023-04-05 16:58 ` Alex Williamson
2023-04-07 8:44 ` Liu, Yi L
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=20230401151833.124749-23-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 \
/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