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, clegoate@redhat.com
Subject: [PATCH v14 01/26] vfio: Allocate per device file structure
Date: Mon, 10 Jul 2023 19:59:03 -0700 [thread overview]
Message-ID: <20230711025928.6438-2-yi.l.liu@intel.com> (raw)
In-Reply-To: <20230711025928.6438-1-yi.l.liu@intel.com>
This is preparation for adding vfio device cdev support. vfio device
cdev requires:
1) A per device file memory to store the kvm pointer set by KVM. It will
be propagated to vfio_device:kvm after the device cdev file is bound
to an iommufd.
2) A mechanism to block device access through device cdev fd before it
is bound to an iommufd.
To address the above requirements, this adds a per device file structure
named vfio_device_file. For now, it's only a wrapper of struct vfio_device
pointer. Other fields will be added to this per file structure in future
commits.
Reviewed-by: Kevin Tian <kevin.tian@intel.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.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>
Tested-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
Signed-off-by: Yi Liu <yi.l.liu@intel.com>
---
drivers/vfio/group.c | 13 +++++++++++--
drivers/vfio/vfio.h | 6 ++++++
drivers/vfio/vfio_main.c | 31 ++++++++++++++++++++++++++-----
3 files changed, 43 insertions(+), 7 deletions(-)
diff --git a/drivers/vfio/group.c b/drivers/vfio/group.c
index fc75c1000d74..fbba9fc15e57 100644
--- a/drivers/vfio/group.c
+++ b/drivers/vfio/group.c
@@ -218,19 +218,26 @@ void vfio_device_group_close(struct vfio_device *device)
static struct file *vfio_device_open_file(struct vfio_device *device)
{
+ struct vfio_device_file *df;
struct file *filep;
int ret;
+ df = vfio_allocate_device_file(device);
+ if (IS_ERR(df)) {
+ ret = PTR_ERR(df);
+ goto err_out;
+ }
+
ret = vfio_device_group_open(device);
if (ret)
- goto err_out;
+ goto err_free;
/*
* We can't use anon_inode_getfd() because we need to modify
* the f_mode flags directly to allow more than just ioctls
*/
filep = anon_inode_getfile("[vfio-device]", &vfio_device_fops,
- device, O_RDWR);
+ df, O_RDWR);
if (IS_ERR(filep)) {
ret = PTR_ERR(filep);
goto err_close_device;
@@ -254,6 +261,8 @@ static struct file *vfio_device_open_file(struct vfio_device *device)
err_close_device:
vfio_device_group_close(device);
+err_free:
+ kfree(df);
err_out:
return ERR_PTR(ret);
}
diff --git a/drivers/vfio/vfio.h b/drivers/vfio/vfio.h
index 7b19c621e0e6..87d3dd6b9ef9 100644
--- a/drivers/vfio/vfio.h
+++ b/drivers/vfio/vfio.h
@@ -16,11 +16,17 @@ struct iommufd_ctx;
struct iommu_group;
struct vfio_container;
+struct vfio_device_file {
+ struct vfio_device *device;
+};
+
void vfio_device_put_registration(struct vfio_device *device);
bool vfio_device_try_get_registration(struct vfio_device *device);
int vfio_device_open(struct vfio_device *device, struct iommufd_ctx *iommufd);
void vfio_device_close(struct vfio_device *device,
struct iommufd_ctx *iommufd);
+struct vfio_device_file *
+vfio_allocate_device_file(struct vfio_device *device);
extern const struct file_operations vfio_device_fops;
diff --git a/drivers/vfio/vfio_main.c b/drivers/vfio/vfio_main.c
index ab4f3a794f78..39c1158ffef0 100644
--- a/drivers/vfio/vfio_main.c
+++ b/drivers/vfio/vfio_main.c
@@ -419,6 +419,20 @@ static bool vfio_assert_device_open(struct vfio_device *device)
return !WARN_ON_ONCE(!READ_ONCE(device->open_count));
}
+struct vfio_device_file *
+vfio_allocate_device_file(struct vfio_device *device)
+{
+ struct vfio_device_file *df;
+
+ df = kzalloc(sizeof(*df), GFP_KERNEL_ACCOUNT);
+ if (!df)
+ return ERR_PTR(-ENOMEM);
+
+ df->device = device;
+
+ return df;
+}
+
static int vfio_device_first_open(struct vfio_device *device,
struct iommufd_ctx *iommufd)
{
@@ -532,12 +546,15 @@ static inline void vfio_device_pm_runtime_put(struct vfio_device *device)
*/
static int vfio_device_fops_release(struct inode *inode, struct file *filep)
{
- struct vfio_device *device = filep->private_data;
+ struct vfio_device_file *df = filep->private_data;
+ struct vfio_device *device = df->device;
vfio_device_group_close(device);
vfio_device_put_registration(device);
+ kfree(df);
+
return 0;
}
@@ -1102,7 +1119,8 @@ static int vfio_ioctl_device_feature(struct vfio_device *device,
static long vfio_device_fops_unl_ioctl(struct file *filep,
unsigned int cmd, unsigned long arg)
{
- struct vfio_device *device = filep->private_data;
+ struct vfio_device_file *df = filep->private_data;
+ struct vfio_device *device = df->device;
int ret;
ret = vfio_device_pm_runtime_get(device);
@@ -1129,7 +1147,8 @@ static long vfio_device_fops_unl_ioctl(struct file *filep,
static ssize_t vfio_device_fops_read(struct file *filep, char __user *buf,
size_t count, loff_t *ppos)
{
- struct vfio_device *device = filep->private_data;
+ struct vfio_device_file *df = filep->private_data;
+ struct vfio_device *device = df->device;
if (unlikely(!device->ops->read))
return -EINVAL;
@@ -1141,7 +1160,8 @@ static ssize_t vfio_device_fops_write(struct file *filep,
const char __user *buf,
size_t count, loff_t *ppos)
{
- struct vfio_device *device = filep->private_data;
+ struct vfio_device_file *df = filep->private_data;
+ struct vfio_device *device = df->device;
if (unlikely(!device->ops->write))
return -EINVAL;
@@ -1151,7 +1171,8 @@ static ssize_t vfio_device_fops_write(struct file *filep,
static int vfio_device_fops_mmap(struct file *filep, struct vm_area_struct *vma)
{
- struct vfio_device *device = filep->private_data;
+ struct vfio_device_file *df = filep->private_data;
+ struct vfio_device *device = df->device;
if (unlikely(!device->ops->mmap))
return -EINVAL;
--
2.34.1
next prev parent reply other threads:[~2023-07-11 2:59 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-11 2:59 [PATCH v14 00/26] Add vfio_device cdev for iommufd support Yi Liu
2023-07-11 2:59 ` Yi Liu [this message]
2023-07-11 2:59 ` [PATCH v14 02/26] vfio: Refine vfio file kAPIs for KVM Yi Liu
2023-07-11 2:59 ` [PATCH v14 03/26] vfio: Accept vfio device file in the KVM facing kAPI Yi Liu
2023-07-11 2:59 ` [PATCH v14 04/26] kvm/vfio: Prepare for accepting vfio device fd Yi Liu
2023-07-11 2:59 ` [PATCH v14 05/26] kvm/vfio: Accept vfio device file from userspace Yi Liu
2023-07-11 2:59 ` [PATCH v14 06/26] vfio: Pass struct vfio_device_file * to vfio_device_open/close() Yi Liu
2023-07-11 2:59 ` [PATCH v14 07/26] vfio: Block device access via device fd until device is opened Yi Liu
2023-07-11 2:59 ` [PATCH v14 08/26] vfio: Add cdev_device_open_cnt to vfio_group Yi Liu
2023-07-11 2:59 ` [PATCH v14 09/26] vfio: Make vfio_df_open() single open for device cdev path Yi Liu
2023-07-11 2:59 ` [PATCH v14 10/26] vfio-iommufd: Move noiommu compat validation out of vfio_iommufd_bind() Yi Liu
2023-07-11 2:59 ` [PATCH v14 11/26] vfio-iommufd: Split bind/attach into two steps Yi Liu
2023-07-11 2:59 ` [PATCH v14 12/26] vfio: Record devid in vfio_device_file Yi Liu
2023-07-11 2:59 ` [PATCH v14 13/26] vfio-iommufd: Add detach_ioas support for physical VFIO devices Yi Liu
2023-07-11 2:59 ` [PATCH v14 14/26] iommufd/device: Add iommufd_access_detach() API Yi Liu
2023-07-14 13:54 ` Jason Gunthorpe
2023-07-11 2:59 ` [PATCH v14 15/26] vfio-iommufd: Add detach_ioas support for emulated VFIO devices Yi Liu
2023-07-11 2:59 ` [PATCH v14 16/26] vfio: Move vfio_device_group_unregister() to be the first operation in unregister Yi Liu
2023-07-11 2:59 ` [PATCH v14 17/26] vfio: Move device_del() before waiting for the last vfio_device registration refcount Yi Liu
2023-07-14 13:56 ` Jason Gunthorpe
2023-07-11 2:59 ` [PATCH v14 18/26] vfio: Add cdev for vfio_device Yi Liu
2023-07-11 2:59 ` [PATCH v14 19/26] vfio: Test kvm pointer in _vfio_device_get_kvm_safe() Yi Liu
2023-07-14 14:11 ` Jason Gunthorpe
2023-07-11 2:59 ` [PATCH v14 20/26] iommufd: Add iommufd_ctx_from_fd() Yi Liu
2023-07-14 14:20 ` Jason Gunthorpe
2023-07-15 4:10 ` Liu, Yi L
2023-07-11 2:59 ` [PATCH v14 21/26] vfio: Avoid repeated user pointer cast in vfio_device_fops_unl_ioctl() Yi Liu
2023-07-14 14:27 ` Jason Gunthorpe
2023-07-11 2:59 ` [PATCH v14 22/26] vfio: Add VFIO_DEVICE_BIND_IOMMUFD Yi Liu
2023-07-14 14:42 ` Jason Gunthorpe
2023-07-15 4:16 ` Liu, Yi L
2023-07-15 13:04 ` Jason Gunthorpe
2023-07-15 14:19 ` Liu, Yi L
2023-07-11 2:59 ` [PATCH v14 23/26] vfio: Add VFIO_DEVICE_[AT|DE]TACH_IOMMUFD_PT Yi Liu
2023-07-14 14:50 ` Jason Gunthorpe
2023-07-11 2:59 ` [PATCH v14 24/26] vfio: Move the IOMMU_CAP_CACHE_COHERENCY check in __vfio_register_dev() Yi Liu
2023-07-14 15:14 ` Jason Gunthorpe
2023-07-11 2:59 ` [PATCH v14 25/26] vfio: Compile vfio_group infrastructure optionally Yi Liu
2023-07-11 2:59 ` [PATCH v14 26/26] docs: vfio: Add vfio device cdev description Yi Liu
2023-07-14 15:19 ` Jason Gunthorpe
2023-07-25 5:37 ` [PATCH v14 00/26] Add vfio_device cdev for iommufd support Jiang, Yanting
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=20230711025928.6438-2-yi.l.liu@intel.com \
--to=yi.l.liu@intel.com \
--cc=alex.williamson@redhat.com \
--cc=chao.p.peng@linux.intel.com \
--cc=clegoate@redhat.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;
as well as URLs for NNTP newsgroup(s).