From: Yi Liu <yi.l.liu@intel.com>
To: alex.williamson@redhat.com, jgg@nvidia.com
Cc: kevin.tian@intel.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
Subject: [RFC 06/12] vfio: Pass struct vfio_device_file * to vfio_device_open/close()
Date: Mon, 19 Dec 2022 00:47:12 -0800 [thread overview]
Message-ID: <20221219084718.9342-7-yi.l.liu@intel.com> (raw)
In-Reply-To: <20221219084718.9342-1-yi.l.liu@intel.com>
This avoids passing struct kvm * and struct iommufd_ctx * in multiple
functions. vfio_device_open() becomes to be a locked helper, while
vfio_device_open() still holds device->dev_set->lock itself.
Signed-off-by: Yi Liu <yi.l.liu@intel.com>
---
drivers/vfio/group.c | 34 +++++++++++++++++++++++++---------
drivers/vfio/vfio.h | 10 +++++-----
drivers/vfio/vfio_main.c | 40 ++++++++++++++++++++++++----------------
3 files changed, 54 insertions(+), 30 deletions(-)
diff --git a/drivers/vfio/group.c b/drivers/vfio/group.c
index fe73db270984..1030a0ad3cf1 100644
--- a/drivers/vfio/group.c
+++ b/drivers/vfio/group.c
@@ -154,33 +154,49 @@ static int vfio_group_ioctl_set_container(struct vfio_group *group,
return ret;
}
-static int vfio_device_group_open(struct vfio_device *device)
+static int vfio_device_group_open(struct vfio_device_file *df)
{
+ struct vfio_device *device = df->device;
int ret;
mutex_lock(&device->group->group_lock);
if (!vfio_group_has_iommu(device->group)) {
ret = -EINVAL;
- goto out_unlock;
+ goto err_unlock_group;
}
+ mutex_lock(&device->dev_set->lock);
/*
* Here we pass the KVM pointer with the group under the lock. If the
* device driver will use it, it must obtain a reference and release it
* during close_device.
*/
- ret = vfio_device_open(device, device->group->iommufd,
- device->group->kvm);
+ df->kvm = device->group->kvm;
+ df->iommufd = device->group->iommufd;
+
+ ret = vfio_device_open(df);
+ if (ret)
+ goto err_unlock_device;
+ mutex_unlock(&device->dev_set->lock);
-out_unlock:
+ mutex_unlock(&device->group->group_lock);
+ return 0;
+
+err_unlock_device:
+ df->kvm = NULL;
+ df->iommufd = NULL;
+ mutex_unlock(&device->dev_set->lock);
+err_unlock_group:
mutex_unlock(&device->group->group_lock);
return ret;
}
-void vfio_device_group_close(struct vfio_device *device)
+void vfio_device_group_close(struct vfio_device_file *df)
{
+ struct vfio_device *device = df->device;
+
mutex_lock(&device->group->group_lock);
- vfio_device_close(device, device->group->iommufd);
+ vfio_device_close(df);
mutex_unlock(&device->group->group_lock);
}
@@ -196,7 +212,7 @@ static struct file *vfio_device_open_file(struct vfio_device *device)
goto err_out;
}
- ret = vfio_device_group_open(device);
+ ret = vfio_device_group_open(df);
if (ret)
goto err_free;
@@ -228,7 +244,7 @@ static struct file *vfio_device_open_file(struct vfio_device *device)
return filep;
err_close_device:
- vfio_device_group_close(device);
+ vfio_device_group_close(df);
err_free:
kfree(df);
err_out:
diff --git a/drivers/vfio/vfio.h b/drivers/vfio/vfio.h
index f0e411995997..24ccf9f0ab16 100644
--- a/drivers/vfio/vfio.h
+++ b/drivers/vfio/vfio.h
@@ -19,14 +19,14 @@ struct vfio_container;
struct vfio_device_file {
struct vfio_device *device;
struct kvm *kvm;
+ struct iommufd_ctx *iommufd;
};
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, struct kvm *kvm);
-void vfio_device_close(struct vfio_device *device,
- struct iommufd_ctx *iommufd);
+int vfio_device_open(struct vfio_device_file *df);
+void vfio_device_close(struct vfio_device_file *device);
+
struct vfio_device_file *
vfio_allocate_device_file(struct vfio_device *device);
@@ -90,7 +90,7 @@ void vfio_device_group_register(struct vfio_device *device);
void vfio_device_group_unregister(struct vfio_device *device);
int vfio_device_group_use_iommu(struct vfio_device *device);
void vfio_device_group_unuse_iommu(struct vfio_device *device);
-void vfio_device_group_close(struct vfio_device *device);
+void vfio_device_group_close(struct vfio_device_file *df);
struct vfio_group *vfio_group_from_file(struct file *file);
bool vfio_group_enforced_coherent(struct vfio_group *group);
void vfio_group_set_kvm(struct vfio_group *group, struct kvm *kvm);
diff --git a/drivers/vfio/vfio_main.c b/drivers/vfio/vfio_main.c
index 481502a6964a..2aa3597abb40 100644
--- a/drivers/vfio/vfio_main.c
+++ b/drivers/vfio/vfio_main.c
@@ -372,9 +372,11 @@ vfio_allocate_device_file(struct vfio_device *device)
return df;
}
-static int vfio_device_first_open(struct vfio_device *device,
- struct iommufd_ctx *iommufd, struct kvm *kvm)
+static int vfio_device_first_open(struct vfio_device_file *df)
{
+ struct vfio_device *device = df->device;
+ struct iommufd_ctx *iommufd = df->iommufd;
+ struct kvm *kvm = df->kvm;
int ret;
lockdep_assert_held(&device->dev_set->lock);
@@ -408,9 +410,11 @@ static int vfio_device_first_open(struct vfio_device *device,
return ret;
}
-static void vfio_device_last_close(struct vfio_device *device,
- struct iommufd_ctx *iommufd)
+static void vfio_device_last_close(struct vfio_device_file *df)
{
+ struct vfio_device *device = df->device;
+ struct iommufd_ctx *iommufd = df->iommufd;
+
lockdep_assert_held(&device->dev_set->lock);
if (device->ops->close_device)
@@ -423,30 +427,34 @@ static void vfio_device_last_close(struct vfio_device *device,
module_put(device->dev->driver->owner);
}
-int vfio_device_open(struct vfio_device *device,
- struct iommufd_ctx *iommufd, struct kvm *kvm)
+int vfio_device_open(struct vfio_device_file *df)
{
- int ret = 0;
+ struct vfio_device *device = df->device;
+
+ lockdep_assert_held(&device->dev_set->lock);
- mutex_lock(&device->dev_set->lock);
device->open_count++;
if (device->open_count == 1) {
- ret = vfio_device_first_open(device, iommufd, kvm);
- if (ret)
+ int ret;
+
+ ret = vfio_device_first_open(df);
+ if (ret) {
device->open_count--;
+ return ret;
+ }
}
- mutex_unlock(&device->dev_set->lock);
- return ret;
+ return 0;
}
-void vfio_device_close(struct vfio_device *device,
- struct iommufd_ctx *iommufd)
+void vfio_device_close(struct vfio_device_file *df)
{
+ struct vfio_device *device = df->device;
+
mutex_lock(&device->dev_set->lock);
vfio_assert_device_open(device);
if (device->open_count == 1)
- vfio_device_last_close(device, iommufd);
+ vfio_device_last_close(df);
device->open_count--;
mutex_unlock(&device->dev_set->lock);
}
@@ -492,7 +500,7 @@ static int vfio_device_fops_release(struct inode *inode, struct file *filep)
struct vfio_device_file *df = filep->private_data;
struct vfio_device *device = df->device;
- vfio_device_group_close(device);
+ vfio_device_group_close(df);
kfree(df);
vfio_device_put_registration(device);
--
2.34.1
next prev parent reply other threads:[~2022-12-19 8:48 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-19 8:47 [RFC 00/12] Add vfio_device cdev for iommufd support Yi Liu
2022-12-19 8:47 ` [RFC 01/12] vfio: Allocate per device file structure Yi Liu
2022-12-21 3:57 ` Tian, Kevin
2022-12-21 6:46 ` Yi Liu
2022-12-19 8:47 ` [RFC 02/12] vfio: Refine vfio file kAPIs Yi Liu
2022-12-19 8:47 ` [RFC 03/12] vfio: Accept vfio device file in the driver facing kAPI Yi Liu
2022-12-21 4:07 ` Tian, Kevin
2022-12-21 7:02 ` Yi Liu
2023-01-04 18:25 ` Jason Gunthorpe
2023-01-09 4:13 ` Tian, Kevin
2022-12-19 8:47 ` [RFC 04/12] kvm/vfio: Rename kvm_vfio_group to prepare for accepting vfio device fd Yi Liu
2022-12-19 8:47 ` [RFC 05/12] kvm/vfio: Accept vfio device file from userspace Yi Liu
2023-01-06 14:32 ` Jason Gunthorpe
2023-01-06 14:46 ` Yi Liu
2023-01-06 14:55 ` Jason Gunthorpe
2023-01-06 15:04 ` Yi Liu
2023-01-06 16:08 ` Jason Gunthorpe
2023-01-09 4:17 ` Tian, Kevin
2023-01-09 4:26 ` Yi Liu
2022-12-19 8:47 ` Yi Liu [this message]
2022-12-21 4:10 ` [RFC 06/12] vfio: Pass struct vfio_device_file * to vfio_device_open/close() Tian, Kevin
2022-12-21 7:04 ` Yi Liu
2022-12-19 8:47 ` [RFC 07/12] vfio: Block device access via device fd until device is opened Yi Liu
2022-12-21 4:18 ` Tian, Kevin
2023-01-04 20:47 ` Jason Gunthorpe
2022-12-19 8:47 ` [RFC 08/12] vfio: Add infrastructure for bind_iommufd and attach Yi Liu
2023-01-09 5:46 ` Tian, Kevin
2023-01-09 13:21 ` Jason Gunthorpe
2023-01-10 2:53 ` Tian, Kevin
2022-12-19 8:47 ` [RFC 09/12] vfio: Make vfio_device_open() exclusive between group path and device cdev path Yi Liu
2023-01-09 6:03 ` Tian, Kevin
2022-12-19 8:47 ` [RFC 10/12] vfio: Add cdev for vfio_device Yi Liu
2023-01-09 6:54 ` Tian, Kevin
2022-12-19 8:47 ` [RFC 11/12] vfio: Add ioctls for device cdev iommufd Yi Liu
2023-01-09 7:47 ` Tian, Kevin
2023-01-09 14:14 ` Jason Gunthorpe
2023-01-09 15:07 ` Yi Liu
2023-01-09 15:12 ` Jason Gunthorpe
2023-01-09 15:20 ` Yi Liu
2023-01-09 14:55 ` Yi Liu
2023-01-10 2:57 ` Tian, Kevin
2022-12-19 8:47 ` [RFC 12/12] vfio: Compile group optionally Yi Liu
2022-12-19 8:51 ` [RFC 00/12] Add vfio_device cdev for iommufd support Yi Liu
2023-01-04 15:23 ` Yi Liu
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=20221219084718.9342-7-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=jasowang@redhat.com \
--cc=jgg@nvidia.com \
--cc=kevin.tian@intel.com \
--cc=kvm@vger.kernel.org \
--cc=mjrosato@linux.ibm.com \
--cc=nicolinc@nvidia.com \
--cc=peterx@redhat.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