From: Yi Liu <yi.l.liu@intel.com>
To: alex.williamson@redhat.com, jgg@nvidia.com, kevin.tian@intel.com
Cc: mjrosato@linux.ibm.com, jasowang@redhat.com,
xudong.hao@intel.com, zhenzhong.duan@intel.com,
peterx@redhat.com, terrence.xu@intel.com,
chao.p.peng@linux.intel.com, linux-s390@vger.kernel.org,
yi.l.liu@intel.com, kvm@vger.kernel.org, lulu@redhat.com,
yanting.jiang@intel.com, joro@8bytes.org, nicolinc@nvidia.com,
yan.y.zhao@intel.com, intel-gfx@lists.freedesktop.org,
eric.auger@redhat.com, intel-gvt-dev@lists.freedesktop.org,
yi.y.sun@linux.intel.com, cohuck@redhat.com,
shameerali.kolothum.thodi@huawei.com,
suravee.suthikulpanit@amd.com, robin.murphy@arm.com
Subject: [Intel-gfx] [PATCH v10 20/22] vfio: Add VFIO_DEVICE_[AT|DE]TACH_IOMMUFD_PT
Date: Wed, 26 Apr 2023 08:03:19 -0700 [thread overview]
Message-ID: <20230426150321.454465-21-yi.l.liu@intel.com> (raw)
In-Reply-To: <20230426150321.454465-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>
---
drivers/vfio/device_cdev.c | 66 ++++++++++++++++++++++++++++++++++++++
drivers/vfio/iommufd.c | 20 ++++++++++++
drivers/vfio/vfio.h | 18 +++++++++++
drivers/vfio/vfio_main.c | 8 +++++
include/uapi/linux/vfio.h | 52 ++++++++++++++++++++++++++++++
5 files changed, 164 insertions(+)
diff --git a/drivers/vfio/device_cdev.c b/drivers/vfio/device_cdev.c
index 004217e6f758..6d7f50ee535d 100644
--- a/drivers/vfio/device_cdev.c
+++ b/drivers/vfio/device_cdev.c
@@ -174,6 +174,72 @@ long vfio_device_ioctl_bind_iommufd(struct vfio_device_file *df,
return ret;
}
+int vfio_ioctl_device_attach(struct vfio_device_file *df,
+ struct vfio_device_attach_iommufd_pt __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, arg, minsz))
+ return -EFAULT;
+
+ if (attach.argsz < minsz || attach.flags)
+ return -EINVAL;
+
+ /* ATTACH only allowed for cdev fds */
+ if (df->group)
+ return -EINVAL;
+
+ mutex_lock(&device->dev_set->lock);
+ ret = vfio_iommufd_attach(device, &attach.pt_id);
+ if (ret)
+ goto out_unlock;
+
+ ret = copy_to_user(&arg->pt_id, &attach.pt_id,
+ sizeof(attach.pt_id)) ? -EFAULT : 0;
+ if (ret)
+ goto out_detach;
+ mutex_unlock(&device->dev_set->lock);
+
+ return 0;
+
+out_detach:
+ vfio_iommufd_detach(device);
+out_unlock:
+ mutex_unlock(&device->dev_set->lock);
+ return ret;
+}
+
+int vfio_ioctl_device_detach(struct vfio_device_file *df,
+ struct vfio_device_detach_iommufd_pt __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, arg, minsz))
+ return -EFAULT;
+
+ if (detach.argsz < minsz || detach.flags)
+ return -EINVAL;
+
+ /* DETACH only allowed for cdev fds */
+ if (df->group)
+ return -EINVAL;
+
+ mutex_lock(&device->dev_set->lock);
+ vfio_iommufd_detach(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/iommufd.c b/drivers/vfio/iommufd.c
index 49dc1182dea8..00c14821bfa5 100644
--- a/drivers/vfio/iommufd.c
+++ b/drivers/vfio/iommufd.c
@@ -76,6 +76,26 @@ void vfio_iommufd_unbind(struct vfio_device_file *df)
vdev->ops->unbind_iommufd(vdev);
}
+int vfio_iommufd_attach(struct vfio_device *vdev, u32 *pt_id)
+{
+ lockdep_assert_held(&vdev->dev_set->lock);
+
+ if (vdev->noiommu)
+ return vfio_iommufd_emulated_attach_ioas(vdev, pt_id);
+
+ return vdev->ops->attach_ioas(vdev, pt_id);
+}
+
+void vfio_iommufd_detach(struct vfio_device *vdev)
+{
+ lockdep_assert_held(&vdev->dev_set->lock);
+
+ if (vdev->noiommu)
+ vfio_iommufd_emulated_detach_ioas(vdev);
+ else
+ vdev->ops->detach_ioas(vdev);
+}
+
struct iommufd_ctx *vfio_iommufd_physical_ictx(struct vfio_device *vdev)
{
if (vdev->iommufd_device)
diff --git a/drivers/vfio/vfio.h b/drivers/vfio/vfio.h
index c38ee0e0cd54..c8579d63b2b9 100644
--- a/drivers/vfio/vfio.h
+++ b/drivers/vfio/vfio.h
@@ -242,6 +242,8 @@ int vfio_iommufd_bind(struct vfio_device_file *df);
void vfio_iommufd_unbind(struct vfio_device_file *df);
int vfio_iommufd_compat_attach_ioas(struct vfio_device *device,
struct iommufd_ctx *ictx);
+int vfio_iommufd_attach(struct vfio_device *vdev, u32 *pt_id);
+void vfio_iommufd_detach(struct vfio_device *vdev);
#else
static inline int
vfio_iommufd_compat_probe_noiommu(struct vfio_device *device,
@@ -283,6 +285,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,
struct vfio_device_bind_iommufd __user *arg);
+int vfio_ioctl_device_attach(struct vfio_device_file *df,
+ struct vfio_device_attach_iommufd_pt __user *arg);
+int vfio_ioctl_device_detach(struct vfio_device_file *df,
+ struct vfio_device_detach_iommufd_pt __user *arg);
int vfio_cdev_init(struct class *device_class);
void vfio_cdev_cleanup(void);
#else
@@ -316,6 +322,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,
+ struct vfio_device_attach_iommufd_pt __user *arg)
+{
+ return -EOPNOTSUPP;
+}
+
+static inline int vfio_ioctl_device_detach(struct vfio_device_file *df,
+ struct vfio_device_detach_iommufd_pt __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 e9ee5ab7257b..1004863efc14 100644
--- a/drivers/vfio/vfio_main.c
+++ b/drivers/vfio/vfio_main.c
@@ -1154,6 +1154,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 43b1b9f8cd24..62bd41c214fd 100644
--- a/include/uapi/linux/vfio.h
+++ b/include/uapi/linux/vfio.h
@@ -222,6 +222,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 input ioas id or 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-04-26 15:04 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-26 15:02 [Intel-gfx] [PATCH v10 00/22] Add vfio_device cdev for iommufd support Yi Liu
2023-04-26 15:03 ` [Intel-gfx] [PATCH v10 01/22] vfio: Allocate per device file structure Yi Liu
2023-04-26 15:03 ` [Intel-gfx] [PATCH v10 02/22] vfio: Refine vfio file kAPIs for KVM Yi Liu
2023-04-26 15:03 ` [Intel-gfx] [PATCH v10 03/22] vfio: Accept vfio device file in the KVM facing kAPI Yi Liu
2023-04-26 15:03 ` [Intel-gfx] [PATCH v10 04/22] kvm/vfio: Rename kvm_vfio_group to prepare for accepting vfio device fd Yi Liu
2023-04-26 15:03 ` [Intel-gfx] [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 ` [Intel-gfx] [PATCH v10 06/22] vfio: Pass struct vfio_device_file * to vfio_device_open/close() Yi Liu
2023-04-26 15:03 ` [Intel-gfx] [PATCH v10 07/22] vfio: Block device access via device fd until device is opened Yi Liu
2023-04-26 15:03 ` [Intel-gfx] [PATCH v10 08/22] vfio: Add cdev_device_open_cnt to vfio_group Yi Liu
2023-04-26 15:03 ` [Intel-gfx] [PATCH v10 09/22] vfio: Make vfio_device_open() single open for device cdev path Yi Liu
2023-04-26 15:03 ` [Intel-gfx] [PATCH v10 10/22] vfio-iommufd: Move noiommu compat probe out of vfio_iommufd_bind() Yi Liu
2023-04-26 15:03 ` [Intel-gfx] [PATCH v10 11/22] vfio-iommufd: Split bind/attach into two steps Yi Liu
2023-04-26 15:03 ` [Intel-gfx] [PATCH v10 12/22] vfio: Record devid in vfio_device_file Yi Liu
2023-04-26 15:03 ` [Intel-gfx] [PATCH v10 13/22] vfio-iommufd: Add detach_ioas support for physical VFIO devices Yi Liu
2023-04-26 15:03 ` [Intel-gfx] [PATCH v10 14/22] iommufd/device: Add iommufd_access_detach() API Yi Liu
2023-04-26 15:03 ` [Intel-gfx] [PATCH v10 15/22] vfio-iommufd: Add detach_ioas support for emulated VFIO devices Yi Liu
2023-04-26 15:03 ` [Intel-gfx] [PATCH v10 16/22] vfio: Name noiommu vfio_device with "noiommu-" prefix Yi Liu
2023-04-26 15:03 ` [Intel-gfx] [PATCH v10 17/22] vfio: Move vfio_device_group_unregister() to be the first operation in unregister Yi Liu
2023-04-26 15:03 ` [Intel-gfx] [PATCH v10 18/22] vfio: Add cdev for vfio_device Yi Liu
2023-04-26 15:03 ` [Intel-gfx] [PATCH v10 19/22] vfio: Add VFIO_DEVICE_BIND_IOMMUFD Yi Liu
2023-04-26 15:03 ` Yi Liu [this message]
2023-04-26 15:03 ` [Intel-gfx] [PATCH v10 21/22] vfio: Compile group optionally Yi Liu
2023-04-26 15:03 ` [Intel-gfx] [PATCH v10 22/22] docs: vfio: Add vfio device cdev description Yi Liu
2023-04-26 15:19 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for Add vfio_device cdev for iommufd support (rev12) Patchwork
2023-04-28 9:29 ` [Intel-gfx] [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-21-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