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 v5 17/19] vfio: Add VFIO_DEVICE_AT[DE]TACH_IOMMUFD_PT
Date: Mon, 27 Feb 2023 03:11:33 -0800 [thread overview]
Message-ID: <20230227111135.61728-18-yi.l.liu@intel.com> (raw)
In-Reply-To: <20230227111135.61728-1-yi.l.liu@intel.com>
This adds ioctl for userspace to attach device cdev fd to and detach
from IOAS/hw_pagetable managed by iommufd.
VFIO_DEVICE_ATTACH_IOMMUFD_PT: attach vfio device to IOAS, hw_pagetable
managed by iommufd. Attach can be
undo by VFIO_DEVICE_DETACH_IOMMUFD_PT
or device fd close.
VFIO_DEVICE_DETACH_IOMMUFD_PT: detach vfio device from the current attached
IOAS or hw_pagetable managed by iommufd.
Signed-off-by: Yi Liu <yi.l.liu@intel.com>
Reviewed-by: Kevin Tian <kevin.tian@intel.com>
---
drivers/vfio/device_cdev.c | 76 ++++++++++++++++++++++++++++++++++++++
drivers/vfio/vfio.h | 16 ++++++++
drivers/vfio/vfio_main.c | 8 ++++
include/uapi/linux/vfio.h | 52 ++++++++++++++++++++++++++
4 files changed, 152 insertions(+)
diff --git a/drivers/vfio/device_cdev.c b/drivers/vfio/device_cdev.c
index 37f80e368551..5b5a249a6612 100644
--- a/drivers/vfio/device_cdev.c
+++ b/drivers/vfio/device_cdev.c
@@ -191,6 +191,82 @@ long vfio_device_ioctl_bind_iommufd(struct vfio_device_file *df,
return ret;
}
+int vfio_ioctl_device_attach(struct vfio_device_file *df,
+ void __user *arg)
+{
+ struct vfio_device *device = df->device;
+ struct vfio_device_attach_iommufd_pt attach;
+ unsigned long minsz;
+ int ret;
+
+ minsz = offsetofend(struct vfio_device_attach_iommufd_pt, pt_id);
+
+ if (copy_from_user(&attach, (void __user *)arg, minsz))
+ return -EFAULT;
+
+ if (attach.argsz < minsz || attach.flags ||
+ attach.pt_id == IOMMUFD_INVALID_ID)
+ return -EINVAL;
+
+ if (!device->ops->bind_iommufd)
+ return -ENODEV;
+
+ mutex_lock(&device->dev_set->lock);
+ if (df->noiommu) {
+ ret = -EINVAL;
+ goto out_unlock;
+ }
+
+ ret = device->ops->attach_ioas(device, &attach.pt_id);
+ if (ret)
+ goto out_unlock;
+
+ ret = copy_to_user((void __user *)arg +
+ offsetofend(struct vfio_device_attach_iommufd_pt, flags),
+ &attach.pt_id,
+ sizeof(attach.pt_id)) ? -EFAULT : 0;
+ if (ret)
+ goto out_detach;
+ mutex_unlock(&device->dev_set->lock);
+
+ return 0;
+
+out_detach:
+ device->ops->detach_ioas(device);
+out_unlock:
+ mutex_unlock(&device->dev_set->lock);
+ return ret;
+}
+
+int vfio_ioctl_device_detach(struct vfio_device_file *df,
+ void __user *arg)
+{
+ struct vfio_device *device = df->device;
+ struct vfio_device_detach_iommufd_pt detach;
+ unsigned long minsz;
+
+ minsz = offsetofend(struct vfio_device_detach_iommufd_pt, flags);
+
+ if (copy_from_user(&detach, (void __user *)arg, minsz))
+ return -EFAULT;
+
+ if (detach.argsz < minsz || detach.flags)
+ return -EINVAL;
+
+ if (!device->ops->bind_iommufd)
+ return -ENODEV;
+
+ mutex_lock(&device->dev_set->lock);
+ if (df->noiommu) {
+ mutex_unlock(&device->dev_set->lock);
+ return -EINVAL;
+ }
+ device->ops->detach_ioas(device);
+ mutex_unlock(&device->dev_set->lock);
+
+ return 0;
+}
+
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 4716a904e63b..5a1ceb014779 100644
--- a/drivers/vfio/vfio.h
+++ b/drivers/vfio/vfio.h
@@ -274,6 +274,10 @@ 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,
unsigned long arg);
+int vfio_ioctl_device_attach(struct vfio_device_file *df,
+ void __user *arg);
+int vfio_ioctl_device_detach(struct vfio_device_file *df,
+ void __user *arg);
int vfio_cdev_init(struct class *device_class);
void vfio_cdev_cleanup(void);
#else
@@ -307,6 +311,18 @@ static inline long vfio_device_ioctl_bind_iommufd(struct vfio_device_file *df,
return -EOPNOTSUPP;
}
+static inline int vfio_ioctl_device_attach(struct vfio_device_file *df,
+ void __user *arg)
+{
+ return -EOPNOTSUPP;
+}
+
+static inline int vfio_ioctl_device_detach(struct vfio_device_file *df,
+ void __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 69d0add930bb..f68550fe206f 100644
--- a/drivers/vfio/vfio_main.c
+++ b/drivers/vfio/vfio_main.c
@@ -1161,6 +1161,14 @@ static long vfio_device_fops_unl_ioctl(struct file *filep,
ret = vfio_ioctl_device_feature(device, (void __user *)arg);
break;
+ case VFIO_DEVICE_ATTACH_IOMMUFD_PT:
+ ret = vfio_ioctl_device_attach(df, (void __user *)arg);
+ break;
+
+ case VFIO_DEVICE_DETACH_IOMMUFD_PT:
+ ret = vfio_ioctl_device_detach(df, (void __user *)arg);
+ break;
+
default:
if (unlikely(!device->ops->ioctl))
ret = -EINVAL;
diff --git a/include/uapi/linux/vfio.h b/include/uapi/linux/vfio.h
index 92aa8dbc970a..ff8753d0abb0 100644
--- a/include/uapi/linux/vfio.h
+++ b/include/uapi/linux/vfio.h
@@ -228,6 +228,58 @@ struct vfio_device_bind_iommufd {
#define VFIO_DEVICE_BIND_IOMMUFD _IO(VFIO_TYPE, VFIO_BASE + 19)
+/*
+ * VFIO_DEVICE_ATTACH_IOMMUFD_PT - _IOW(VFIO_TYPE, VFIO_BASE + 20,
+ * struct vfio_device_attach_iommufd_pt)
+ *
+ * Attach a vfio device to an iommufd address space specified by IOAS
+ * id or hw_pagetable (hwpt) id.
+ *
+ * Available only after a device has been bound to iommufd via
+ * VFIO_DEVICE_BIND_IOMMUFD
+ *
+ * Undo by VFIO_DEVICE_DETACH_IOMMUFD_PT or device fd close.
+ *
+ * @argsz: user filled size of this data.
+ * @flags: must be 0.
+ * @pt_id: Input the target id which can represent an ioas or a hwpt
+ * allocated via iommufd subsystem.
+ * Output the attached hwpt id which could be the specified
+ * hwpt itself or a hwpt automatically created for the
+ * specified ioas by kernel during the attachment.
+ *
+ * Return: 0 on success, -errno on failure.
+ */
+struct vfio_device_attach_iommufd_pt {
+ __u32 argsz;
+ __u32 flags;
+ __u32 pt_id;
+};
+
+#define VFIO_DEVICE_ATTACH_IOMMUFD_PT _IO(VFIO_TYPE, VFIO_BASE + 20)
+
+/*
+ * VFIO_DEVICE_DETACH_IOMMUFD_PT - _IOW(VFIO_TYPE, VFIO_BASE + 21,
+ * struct vfio_device_detach_iommufd_pt)
+ *
+ * Detach a vfio device from the iommufd address space it has been
+ * attached to. After it, device should be in a blocking DMA state.
+ *
+ * Available only after a device has been bound to iommufd via
+ * VFIO_DEVICE_BIND_IOMMUFD
+ *
+ * @argsz: user filled size of this data.
+ * @flags: must be 0.
+ *
+ * Return: 0 on success, -errno on failure.
+ */
+struct vfio_device_detach_iommufd_pt {
+ __u32 argsz;
+ __u32 flags;
+};
+
+#define VFIO_DEVICE_DETACH_IOMMUFD_PT _IO(VFIO_TYPE, VFIO_BASE + 21)
+
/**
* VFIO_DEVICE_GET_INFO - _IOR(VFIO_TYPE, VFIO_BASE + 7,
* struct vfio_device_info)
--
2.34.1
next prev parent reply other threads:[~2023-02-27 11:12 UTC|newest]
Thread overview: 128+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-27 11:11 [PATCH v5 00/19] Add vfio_device cdev for iommufd support Yi Liu
2023-02-27 11:11 ` [PATCH v5 01/19] vfio: Allocate per device file structure Yi Liu
2023-02-27 18:46 ` Jason Gunthorpe
2023-02-27 11:11 ` [PATCH v5 02/19] vfio: Refine vfio file kAPIs for KVM Yi Liu
2023-02-27 18:46 ` Jason Gunthorpe
2023-02-27 11:11 ` [PATCH v5 03/19] vfio: Accept vfio device file in the KVM facing kAPI Yi Liu
2023-02-27 18:46 ` Jason Gunthorpe
2023-02-27 11:11 ` [PATCH v5 04/19] kvm/vfio: Rename kvm_vfio_group to prepare for accepting vfio device fd Yi Liu
2023-02-27 18:47 ` Jason Gunthorpe
2023-02-27 11:11 ` [PATCH v5 05/19] kvm/vfio: Accept vfio device file from userspace Yi Liu
2023-02-27 18:47 ` Jason Gunthorpe
2023-02-27 11:11 ` [PATCH v5 06/19] vfio: Pass struct vfio_device_file * to vfio_device_open/close() Yi Liu
2023-02-27 18:47 ` Jason Gunthorpe
2023-02-27 11:11 ` [PATCH v5 07/19] vfio: Block device access via device fd until device is opened Yi Liu
2023-02-27 18:48 ` Jason Gunthorpe
2023-03-01 9:22 ` Liu, Yi L
2023-02-27 11:11 ` [PATCH v5 08/19] vfio/pci: Update comment around group_fd get in vfio_pci_ioctl_pci_hot_reset() Yi Liu
2023-02-27 18:48 ` Jason Gunthorpe
2023-02-27 11:11 ` [PATCH v5 09/19] vfio/pci: Allow passing zero-length fd array in VFIO_DEVICE_PCI_HOT_RESET Yi Liu
2023-02-27 18:22 ` Jason Gunthorpe
2023-02-28 2:31 ` Liu, Yi L
2023-03-02 6:07 ` Liu, Yi L
2023-03-02 9:55 ` Tian, Kevin
2023-03-02 12:35 ` Jason Gunthorpe
2023-03-02 14:20 ` Liu, Yi L
2023-03-03 6:36 ` Tian, Kevin
2023-03-03 16:55 ` Alex Williamson
2023-03-05 14:48 ` Liu, Yi L
2023-03-06 8:16 ` Tian, Kevin
2023-03-06 8:23 ` Tian, Kevin
2023-03-06 8:33 ` Liu, Yi L
2023-03-06 9:59 ` Liu, Yi L
2023-03-06 13:16 ` Jason Gunthorpe
2023-03-07 2:31 ` Tian, Kevin
2023-03-07 2:35 ` Liu, Yi L
2023-03-07 12:36 ` Jason Gunthorpe
2023-03-07 13:28 ` Liu, Yi L
2023-03-08 7:26 ` Tian, Kevin
2023-03-08 7:47 ` Liu, Yi L
2023-03-08 7:55 ` Tian, Kevin
2023-03-08 8:00 ` Liu, Yi L
2023-03-08 8:14 ` Tian, Kevin
2023-03-08 8:15 ` Liu, Yi L
2023-03-08 15:08 ` Jason Gunthorpe
2023-03-02 21:04 ` Alex Williamson
2023-02-27 11:11 ` [PATCH v5 10/19] vfio: Add infrastructure for bind_iommufd from userspace Yi Liu
2023-02-27 18:29 ` Jason Gunthorpe
2023-02-28 2:35 ` Liu, Yi L
2023-02-28 6:58 ` Liu, Yi L
2023-02-28 12:31 ` Jason Gunthorpe
2023-02-28 12:45 ` Liu, Yi L
2023-02-28 12:52 ` Jason Gunthorpe
2023-02-28 12:56 ` Liu, Yi L
2023-02-28 12:58 ` Jason Gunthorpe
2023-02-28 12:29 ` Jason Gunthorpe
2023-02-28 12:48 ` Liu, Yi L
2023-02-28 12:52 ` Jason Gunthorpe
2023-02-28 13:24 ` Liu, Yi L
2023-02-27 11:11 ` [PATCH v5 11/19] vfio-iommufd: Add detach_ioas support for physical VFIO devices Yi Liu
2023-02-27 18:44 ` Jason Gunthorpe
2023-02-28 2:57 ` Liu, Yi L
2023-02-28 12:33 ` Jason Gunthorpe
2023-02-28 12:43 ` Liu, Yi L
2023-02-27 11:11 ` [PATCH v5 12/19] vfio-iommufd: Add detach_ioas for emulated " Yi Liu
2023-02-27 18:45 ` Jason Gunthorpe
2023-02-27 11:11 ` [PATCH v5 13/19] vfio: Add cdev_device_open_cnt to vfio_group Yi Liu
2023-02-27 19:20 ` Jason Gunthorpe
2023-02-27 11:11 ` [PATCH v5 14/19] vfio: Make vfio_device_open() single open for device cdev path Yi Liu
2023-02-27 18:52 ` Jason Gunthorpe
2023-02-28 3:11 ` Liu, Yi L
2023-02-28 12:33 ` Jason Gunthorpe
2023-03-01 13:58 ` Liu, Yi L
2023-02-27 11:11 ` [PATCH v5 15/19] vfio: Add cdev for vfio_device Yi Liu
2023-02-27 18:55 ` Jason Gunthorpe
2023-02-28 3:47 ` Liu, Yi L
2023-02-27 19:06 ` Jason Gunthorpe
2023-02-28 3:59 ` Liu, Yi L
2023-02-27 11:11 ` [PATCH v5 16/19] vfio: Add VFIO_DEVICE_BIND_IOMMUFD Yi Liu
2023-02-27 19:19 ` Jason Gunthorpe
2023-02-28 4:08 ` Liu, Yi L
2023-03-01 9:19 ` Liu, Yi L
2023-03-01 17:46 ` Jason Gunthorpe
2023-03-02 4:09 ` Liu, Yi L
2023-03-03 6:57 ` Liu, Yi L
2023-03-03 7:23 ` Liu, Yi L
2023-03-07 6:38 ` Tian, Kevin
2023-03-07 12:37 ` Jason Gunthorpe
2023-03-07 13:03 ` Liu, Yi L
2023-03-08 7:17 ` Tian, Kevin
2023-03-10 2:39 ` Alexey Kardashevskiy
2023-03-10 5:49 ` Liu, Yi L
2023-02-27 11:11 ` Yi Liu [this message]
2023-02-27 18:39 ` [PATCH v5 17/19] vfio: Add VFIO_DEVICE_AT[DE]TACH_IOMMUFD_PT Jason Gunthorpe
2023-02-28 2:51 ` Liu, Yi L
2023-02-28 12:32 ` Jason Gunthorpe
2023-02-28 12:42 ` Liu, Yi L
2023-02-28 12:53 ` Jason Gunthorpe
2023-02-28 13:22 ` Liu, Yi L
2023-02-28 13:25 ` Jason Gunthorpe
2023-02-28 13:36 ` Liu, Yi L
2023-02-28 13:43 ` Jason Gunthorpe
2023-02-28 14:01 ` Liu, Yi L
2023-02-28 14:38 ` Jason Gunthorpe
2023-03-01 14:04 ` Liu, Yi L
2023-03-01 17:49 ` Jason Gunthorpe
2023-03-02 3:24 ` Liu, Yi L
2023-02-27 11:11 ` [PATCH v5 18/19] vfio: Compile group optionally Yi Liu
2023-02-27 19:20 ` Jason Gunthorpe
2023-02-28 3:14 ` Liu, Yi L
2023-02-28 6:00 ` Liu, Yi L
2023-02-28 12:36 ` Jason Gunthorpe
2023-03-01 13:59 ` Liu, Yi L
2023-02-27 11:11 ` [PATCH v5 19/19] docs: vfio: Add vfio device cdev description Yi Liu
2023-02-27 19:21 ` [PATCH v5 00/19] Add vfio_device cdev for iommufd support Jason Gunthorpe
2023-02-28 3:03 ` Liu, Yi L
2023-02-28 16:58 ` Xu, Terrence
2023-03-01 2:29 ` Nicolin Chen
2023-03-01 3:44 ` Liu, Yi L
2023-03-02 9:43 ` Shameerali Kolothum Thodi
2023-03-02 23:51 ` Nicolin Chen
2023-03-03 15:01 ` Shameerali Kolothum Thodi
2023-03-04 7:00 ` Nicolin Chen
2023-03-04 8:22 ` Liu, Yi L
2023-03-08 15:54 ` Shameerali Kolothum Thodi
2023-03-14 11:38 ` Shameerali Kolothum Thodi
2023-03-15 23:22 ` Nicolin Chen
2023-03-16 7:39 ` Liu, Yi L
2023-03-03 21:29 ` Matthew Rosato
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=20230227111135.61728-18-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).