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 03/12] vfio: Accept vfio device file in the driver facing kAPI
Date: Mon, 19 Dec 2022 00:47:09 -0800 [thread overview]
Message-ID: <20221219084718.9342-4-yi.l.liu@intel.com> (raw)
In-Reply-To: <20221219084718.9342-1-yi.l.liu@intel.com>
This makes the vfio file kAPIs to accepte vfio device files, also a
preparation for vfio device cdev support.
Signed-off-by: Yi Liu <yi.l.liu@intel.com>
---
drivers/vfio/vfio.h | 1 +
drivers/vfio/vfio_main.c | 64 +++++++++++++++++++++++++++++++++++++---
2 files changed, 61 insertions(+), 4 deletions(-)
diff --git a/drivers/vfio/vfio.h b/drivers/vfio/vfio.h
index 69d0fd7e351e..f0e411995997 100644
--- a/drivers/vfio/vfio.h
+++ b/drivers/vfio/vfio.h
@@ -18,6 +18,7 @@ struct vfio_container;
struct vfio_device_file {
struct vfio_device *device;
+ struct kvm *kvm;
};
void vfio_device_put_registration(struct vfio_device *device);
diff --git a/drivers/vfio/vfio_main.c b/drivers/vfio/vfio_main.c
index 7d13c5f0bfab..481502a6964a 100644
--- a/drivers/vfio/vfio_main.c
+++ b/drivers/vfio/vfio_main.c
@@ -1029,16 +1029,40 @@ const struct file_operations vfio_device_fops = {
.mmap = vfio_device_fops_mmap,
};
+static struct vfio_device *vfio_device_from_file(struct file *file)
+{
+ struct vfio_device_file *df = file->private_data;
+
+ if (file->f_op != &vfio_device_fops)
+ return NULL;
+ return df->device;
+}
+
/**
* vfio_file_is_valid - True if the file is usable with VFIO aPIS
* @file: VFIO group file or VFIO device file
*/
bool vfio_file_is_valid(struct file *file)
{
- return vfio_group_from_file(file);
+ return vfio_group_from_file(file) ||
+ vfio_device_from_file(file);
}
EXPORT_SYMBOL_GPL(vfio_file_is_valid);
+static bool vfio_device_enforced_coherent(struct vfio_device *device)
+{
+ bool ret;
+
+ if (!vfio_device_try_get_registration(device))
+ return true;
+
+ ret = device_iommu_capable(device->dev,
+ IOMMU_CAP_ENFORCE_CACHE_COHERENCY);
+
+ vfio_device_put_registration(device);
+ return ret;
+}
+
/**
* vfio_file_enforced_coherent - True if the DMA associated with the VFIO file
* is always CPU cache coherent
@@ -1050,15 +1074,36 @@ EXPORT_SYMBOL_GPL(vfio_file_is_valid);
*/
bool vfio_file_enforced_coherent(struct file *file)
{
- struct vfio_group *group = vfio_group_from_file(file);
+ struct vfio_group *group;
+ struct vfio_device *device;
+ group = vfio_group_from_file(file);
if (group)
return vfio_group_enforced_coherent(group);
+ device = vfio_device_from_file(file);
+ if (device)
+ return vfio_device_enforced_coherent(device);
+
return true;
}
EXPORT_SYMBOL_GPL(vfio_file_enforced_coherent);
+static void vfio_device_file_set_kvm(struct file *file, struct kvm *kvm)
+{
+ struct vfio_device_file *df = file->private_data;
+ struct vfio_device *device = df->device;
+
+ /*
+ * The kvm is first recorded in the df, and will be propagated
+ * to vfio_device::kvm when the file binds iommufd successfully in
+ * the vfio device cdev path.
+ */
+ mutex_lock(&device->dev_set->lock);
+ df->kvm = kvm;
+ mutex_unlock(&device->dev_set->lock);
+}
+
/**
* vfio_file_set_kvm - Link a kvm with VFIO drivers
* @file: VFIO group file or device file
@@ -1067,10 +1112,14 @@ EXPORT_SYMBOL_GPL(vfio_file_enforced_coherent);
*/
void vfio_file_set_kvm(struct file *file, struct kvm *kvm)
{
- struct vfio_group *group = vfio_group_from_file(file);
+ struct vfio_group *group;
+ group = vfio_group_from_file(file);
if (group)
vfio_group_set_kvm(group, kvm);
+
+ if (vfio_device_from_file(file))
+ vfio_device_file_set_kvm(file, kvm);
}
EXPORT_SYMBOL_GPL(vfio_file_set_kvm);
@@ -1083,10 +1132,17 @@ EXPORT_SYMBOL_GPL(vfio_file_set_kvm);
*/
bool vfio_file_has_dev(struct file *file, struct vfio_device *device)
{
- struct vfio_group *group = vfio_group_from_file(file);
+ struct vfio_group *group;
+ struct vfio_device *vdev;
+ group = vfio_group_from_file(file);
if (group)
return vfio_group_has_dev(group, device);
+
+ vdev = vfio_device_from_file(file);
+ if (device)
+ return vdev == device;
+
return false;
}
EXPORT_SYMBOL_GPL(vfio_file_has_dev);
--
2.34.1
next prev parent reply other threads:[~2022-12-19 8:47 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 ` Yi Liu [this message]
2022-12-21 4:07 ` [RFC 03/12] vfio: Accept vfio device file in the driver facing kAPI 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 ` [RFC 06/12] vfio: Pass struct vfio_device_file * to vfio_device_open/close() Yi Liu
2022-12-21 4:10 ` 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-4-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