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,
suravee.suthikulpanit@amd.com
Subject: [PATCH 07/13] vfio: Pass struct vfio_device_file * to vfio_device_open/close()
Date: Tue, 17 Jan 2023 05:49:36 -0800 [thread overview]
Message-ID: <20230117134942.101112-8-yi.l.liu@intel.com> (raw)
In-Reply-To: <20230117134942.101112-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.
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 d83cf069d290..7200304663e5 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 53af6e3ea214..3d8ba165146c 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 dc08d5dd62cc..3df71bd9cd1e 100644
--- a/drivers/vfio/vfio_main.c
+++ b/drivers/vfio/vfio_main.c
@@ -358,9 +358,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);
@@ -394,9 +396,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)
@@ -409,30 +413,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);
}
@@ -478,7 +486,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);
vfio_device_put_registration(device);
--
2.34.1
next prev parent reply other threads:[~2023-01-17 13:50 UTC|newest]
Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-17 13:49 [PATCH 00/13] Add vfio_device cdev for iommufd support Yi Liu
2023-01-17 13:49 ` [PATCH 01/13] vfio: Allocate per device file structure Yi Liu
2023-01-18 8:37 ` Tian, Kevin
2023-01-18 13:28 ` Eric Auger
2023-01-17 13:49 ` [PATCH 02/13] vfio: Refine vfio file kAPIs Yi Liu
2023-01-18 8:42 ` Tian, Kevin
2023-01-18 14:37 ` Eric Auger
2023-01-29 13:32 ` Liu, Yi L
2023-01-17 13:49 ` [PATCH 03/13] vfio: Accept vfio device file in the driver facing kAPI Yi Liu
2023-01-18 8:45 ` Tian, Kevin
2023-01-18 16:11 ` Eric Auger
2023-01-30 9:47 ` Liu, Yi L
2023-01-30 18:02 ` Jason Gunthorpe
2023-01-17 13:49 ` [PATCH 04/13] kvm/vfio: Rename kvm_vfio_group to prepare for accepting vfio device fd Yi Liu
2023-01-18 8:47 ` Tian, Kevin
2023-01-18 16:33 ` Eric Auger
2023-01-17 13:49 ` [PATCH 05/13] kvm/vfio: Provide struct kvm_device_ops::release() insted of ::destroy() Yi Liu
2023-01-18 8:56 ` Tian, Kevin
2023-01-19 9:12 ` Eric Auger
2023-01-19 9:30 ` Tian, Kevin
2023-01-20 3:52 ` Liu, Yi L
2023-01-19 19:07 ` Jason Gunthorpe
2023-01-19 20:04 ` Alex Williamson
2023-01-20 13:03 ` Liu, Yi L
2023-01-20 14:00 ` Liu, Yi L
2023-01-20 14:33 ` Jason Gunthorpe
2023-01-20 15:09 ` Liu, Yi L
2023-01-20 15:11 ` Liu, Yi L
2023-01-17 13:49 ` [PATCH 06/13] kvm/vfio: Accept vfio device file from userspace Yi Liu
2023-01-18 9:18 ` Tian, Kevin
2023-01-19 9:35 ` Eric Auger
2023-01-30 7:36 ` Liu, Yi L
2023-01-17 13:49 ` Yi Liu [this message]
2023-01-18 9:27 ` [PATCH 07/13] vfio: Pass struct vfio_device_file * to vfio_device_open/close() Tian, Kevin
2023-01-19 11:01 ` Eric Auger
2023-01-19 20:35 ` Alex Williamson
2023-01-30 9:38 ` Liu, Yi L
2023-01-30 9:38 ` Liu, Yi L
2023-01-17 13:49 ` [PATCH 08/13] vfio: Block device access via device fd until device is opened Yi Liu
2023-01-18 9:35 ` Tian, Kevin
2023-01-18 13:52 ` Jason Gunthorpe
2023-01-19 3:42 ` Tian, Kevin
2023-01-19 3:43 ` Liu, Yi L
2023-01-19 14:00 ` Eric Auger
2023-01-30 10:41 ` Liu, Yi L
2023-01-19 20:47 ` Alex Williamson
2023-01-30 10:48 ` Liu, Yi L
2023-01-17 13:49 ` [PATCH 09/13] vfio: Add infrastructure for bind_iommufd and attach Yi Liu
2023-01-19 9:45 ` Tian, Kevin
2023-01-30 13:52 ` Liu, Yi L
2023-01-19 23:05 ` Alex Williamson
2023-01-30 13:55 ` Liu, Yi L
2023-01-17 13:49 ` [PATCH 10/13] vfio: Make vfio_device_open() exclusive between group path and device cdev path Yi Liu
2023-01-19 9:55 ` Tian, Kevin
2023-01-30 11:59 ` Liu, Yi L
2023-01-19 23:51 ` Alex Williamson
2023-01-30 12:14 ` Liu, Yi L
2023-02-02 5:34 ` Liu, Yi L
2023-02-03 17:41 ` Jason Gunthorpe
2023-02-06 4:30 ` Liu, Yi L
2023-02-06 10:09 ` Tian, Kevin
2023-02-06 15:10 ` Jason Gunthorpe
2023-02-06 15:51 ` Liu, Yi L
2023-02-07 0:35 ` Tian, Kevin
2023-02-07 13:12 ` Jason Gunthorpe
2023-02-07 13:19 ` Liu, Yi L
2023-02-07 13:20 ` Jason Gunthorpe
2023-02-07 13:23 ` Liu, Yi L
2023-02-07 13:27 ` Jason Gunthorpe
2023-02-07 13:55 ` Liu, Yi L
2023-02-08 4:23 ` Tian, Kevin
2023-02-08 12:41 ` Jason Gunthorpe
2023-01-17 13:49 ` [PATCH 11/13] vfio: Add cdev for vfio_device Yi Liu
2023-01-20 7:26 ` Tian, Kevin
2023-01-31 6:17 ` Liu, Yi L
2023-01-24 20:44 ` Jason Gunthorpe
2023-01-17 13:49 ` [PATCH 12/13] vfio: Add ioctls for device cdev iommufd Yi Liu
2023-01-20 8:03 ` Tian, Kevin
2023-02-06 9:07 ` Liu, Yi L
2023-01-17 13:49 ` [PATCH 13/13] vfio: Compile group optionally 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=20230117134942.101112-8-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=suravee.suthikulpanit@amd.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.