public inbox for linux-s390@vger.kernel.org
 help / color / mirror / Atom feed
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
Subject: [PATCH v5 03/19] vfio: Accept vfio device file in the KVM facing kAPI
Date: Mon, 27 Feb 2023 03:11:19 -0800	[thread overview]
Message-ID: <20230227111135.61728-4-yi.l.liu@intel.com> (raw)
In-Reply-To: <20230227111135.61728-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.

For the kvm set with vfio device file, kvm pointer is stored in struct
vfio_device_file, and use kvm_ref_lock to protect kvm set and kvm
pointer usage within VFIO. This kvm pointer will be set to vfio_device
after device file is bound to iommufd in the cdev path.

Signed-off-by: Yi Liu <yi.l.liu@intel.com>
Reviewed-by: Kevin Tian <kevin.tian@intel.com>
---
 drivers/vfio/vfio.h      |  2 ++
 drivers/vfio/vfio_main.c | 42 +++++++++++++++++++++++++++++++++++++---
 2 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/drivers/vfio/vfio.h b/drivers/vfio/vfio.h
index 4612cadb6c56..59ca8b3d7563 100644
--- a/drivers/vfio/vfio.h
+++ b/drivers/vfio/vfio.h
@@ -18,6 +18,8 @@ struct vfio_container;
 
 struct vfio_device_file {
 	struct vfio_device *device;
+	spinlock_t kvm_ref_lock; /* protect kvm field */
+	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 42ed3955814f..9941db787891 100644
--- a/drivers/vfio/vfio_main.c
+++ b/drivers/vfio/vfio_main.c
@@ -406,6 +406,7 @@ vfio_allocate_device_file(struct vfio_device *device)
 		return ERR_PTR(-ENOMEM);
 
 	df->device = device;
+	spin_lock_init(&df->kvm_ref_lock);
 
 	return df;
 }
@@ -1167,13 +1168,23 @@ 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 valid vfio file
  * @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);
 
@@ -1188,15 +1199,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 device_iommu_capable(device->dev,
+					    IOMMU_CAP_ENFORCE_CACHE_COHERENCY);
+
 	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;
+
+	/*
+	 * The kvm is first recorded in the vfio_device_file, and will
+	 * be propagated to vfio_device::kvm when the file is bound to
+	 * iommufd successfully in the vfio device cdev path.
+	 */
+	spin_lock(&df->kvm_ref_lock);
+	df->kvm = kvm;
+	spin_unlock(&df->kvm_ref_lock);
+}
+
 /**
  * vfio_file_set_kvm - Link a kvm with VFIO drivers
  * @file: VFIO group file or VFIO device file
@@ -1205,10 +1237,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);
 
-- 
2.34.1


  parent reply	other threads:[~2023-02-27 11:11 UTC|newest]

Thread overview: 128+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-27 11:11 [PATCH v5 00/19] Add vfio_device cdev for iommufd support Yi Liu
2023-02-27 11:11 ` [PATCH v5 01/19] vfio: Allocate per device file structure Yi Liu
2023-02-27 18:46   ` Jason Gunthorpe
2023-02-27 11:11 ` [PATCH v5 02/19] vfio: Refine vfio file kAPIs for KVM Yi Liu
2023-02-27 18:46   ` Jason Gunthorpe
2023-02-27 11:11 ` Yi Liu [this message]
2023-02-27 18:46   ` [PATCH v5 03/19] vfio: Accept vfio device file in the KVM facing kAPI Jason Gunthorpe
2023-02-27 11:11 ` [PATCH v5 04/19] kvm/vfio: Rename kvm_vfio_group to prepare for accepting vfio device fd Yi Liu
2023-02-27 18:47   ` Jason Gunthorpe
2023-02-27 11:11 ` [PATCH v5 05/19] kvm/vfio: Accept vfio device file from userspace Yi Liu
2023-02-27 18:47   ` Jason Gunthorpe
2023-02-27 11:11 ` [PATCH v5 06/19] vfio: Pass struct vfio_device_file * to vfio_device_open/close() Yi Liu
2023-02-27 18:47   ` Jason Gunthorpe
2023-02-27 11:11 ` [PATCH v5 07/19] vfio: Block device access via device fd until device is opened Yi Liu
2023-02-27 18:48   ` Jason Gunthorpe
2023-03-01  9:22   ` Liu, Yi L
2023-02-27 11:11 ` [PATCH v5 08/19] vfio/pci: Update comment around group_fd get in vfio_pci_ioctl_pci_hot_reset() Yi Liu
2023-02-27 18:48   ` Jason Gunthorpe
2023-02-27 11:11 ` [PATCH v5 09/19] vfio/pci: Allow passing zero-length fd array in VFIO_DEVICE_PCI_HOT_RESET Yi Liu
2023-02-27 18:22   ` Jason Gunthorpe
2023-02-28  2:31     ` Liu, Yi L
2023-03-02  6:07   ` Liu, Yi L
2023-03-02  9:55     ` Tian, Kevin
2023-03-02 12:35       ` Jason Gunthorpe
2023-03-02 14:20         ` Liu, Yi L
2023-03-03  6:36           ` Tian, Kevin
2023-03-03 16:55             ` Alex Williamson
2023-03-05 14:48               ` Liu, Yi L
2023-03-06  8:16                 ` Tian, Kevin
2023-03-06  8:23                   ` Tian, Kevin
2023-03-06  8:33                     ` Liu, Yi L
2023-03-06  9:59                 ` Liu, Yi L
2023-03-06 13:16               ` Jason Gunthorpe
2023-03-07  2:31                 ` Tian, Kevin
2023-03-07  2:35                   ` Liu, Yi L
2023-03-07 12:36                   ` Jason Gunthorpe
2023-03-07 13:28                     ` Liu, Yi L
2023-03-08  7:26                       ` Tian, Kevin
2023-03-08  7:47                         ` Liu, Yi L
2023-03-08  7:55                           ` Tian, Kevin
2023-03-08  8:00                             ` Liu, Yi L
2023-03-08  8:14                               ` Tian, Kevin
2023-03-08  8:15                                 ` Liu, Yi L
2023-03-08 15:08                         ` Jason Gunthorpe
2023-03-02 21:04     ` Alex Williamson
2023-02-27 11:11 ` [PATCH v5 10/19] vfio: Add infrastructure for bind_iommufd from userspace Yi Liu
2023-02-27 18:29   ` Jason Gunthorpe
2023-02-28  2:35     ` Liu, Yi L
2023-02-28  6:58       ` Liu, Yi L
2023-02-28 12:31         ` Jason Gunthorpe
2023-02-28 12:45           ` Liu, Yi L
2023-02-28 12:52             ` Jason Gunthorpe
2023-02-28 12:56               ` Liu, Yi L
2023-02-28 12:58                 ` Jason Gunthorpe
2023-02-28 12:29       ` Jason Gunthorpe
2023-02-28 12:48         ` Liu, Yi L
2023-02-28 12:52           ` Jason Gunthorpe
2023-02-28 13:24             ` Liu, Yi L
2023-02-27 11:11 ` [PATCH v5 11/19] vfio-iommufd: Add detach_ioas support for physical VFIO devices Yi Liu
2023-02-27 18:44   ` Jason Gunthorpe
2023-02-28  2:57     ` Liu, Yi L
2023-02-28 12:33       ` Jason Gunthorpe
2023-02-28 12:43         ` Liu, Yi L
2023-02-27 11:11 ` [PATCH v5 12/19] vfio-iommufd: Add detach_ioas for emulated " Yi Liu
2023-02-27 18:45   ` Jason Gunthorpe
2023-02-27 11:11 ` [PATCH v5 13/19] vfio: Add cdev_device_open_cnt to vfio_group Yi Liu
2023-02-27 19:20   ` Jason Gunthorpe
2023-02-27 11:11 ` [PATCH v5 14/19] vfio: Make vfio_device_open() single open for device cdev path Yi Liu
2023-02-27 18:52   ` Jason Gunthorpe
2023-02-28  3:11     ` Liu, Yi L
2023-02-28 12:33       ` Jason Gunthorpe
2023-03-01 13:58         ` Liu, Yi L
2023-02-27 11:11 ` [PATCH v5 15/19] vfio: Add cdev for vfio_device Yi Liu
2023-02-27 18:55   ` Jason Gunthorpe
2023-02-28  3:47     ` Liu, Yi L
2023-02-27 19:06   ` Jason Gunthorpe
2023-02-28  3:59     ` Liu, Yi L
2023-02-27 11:11 ` [PATCH v5 16/19] vfio: Add VFIO_DEVICE_BIND_IOMMUFD Yi Liu
2023-02-27 19:19   ` Jason Gunthorpe
2023-02-28  4:08     ` Liu, Yi L
2023-03-01  9:19   ` Liu, Yi L
2023-03-01 17:46     ` Jason Gunthorpe
2023-03-02  4:09       ` Liu, Yi L
2023-03-03  6:57       ` Liu, Yi L
2023-03-03  7:23         ` Liu, Yi L
2023-03-07  6:38         ` Tian, Kevin
2023-03-07 12:37           ` Jason Gunthorpe
2023-03-07 13:03             ` Liu, Yi L
2023-03-08  7:17               ` Tian, Kevin
2023-03-10  2:39   ` Alexey Kardashevskiy
2023-03-10  5:49     ` Liu, Yi L
2023-02-27 11:11 ` [PATCH v5 17/19] vfio: Add VFIO_DEVICE_AT[DE]TACH_IOMMUFD_PT Yi Liu
2023-02-27 18:39   ` Jason Gunthorpe
2023-02-28  2:51     ` Liu, Yi L
2023-02-28 12:32       ` Jason Gunthorpe
2023-02-28 12:42         ` Liu, Yi L
2023-02-28 12:53           ` Jason Gunthorpe
2023-02-28 13:22             ` Liu, Yi L
2023-02-28 13:25               ` Jason Gunthorpe
2023-02-28 13:36                 ` Liu, Yi L
2023-02-28 13:43                   ` Jason Gunthorpe
2023-02-28 14:01                     ` Liu, Yi L
2023-02-28 14:38                       ` Jason Gunthorpe
2023-03-01 14:04                         ` Liu, Yi L
2023-03-01 17:49                           ` Jason Gunthorpe
2023-03-02  3:24                             ` Liu, Yi L
2023-02-27 11:11 ` [PATCH v5 18/19] vfio: Compile group optionally Yi Liu
2023-02-27 19:20   ` Jason Gunthorpe
2023-02-28  3:14     ` Liu, Yi L
2023-02-28  6:00   ` Liu, Yi L
2023-02-28 12:36     ` Jason Gunthorpe
2023-03-01 13:59       ` Liu, Yi L
2023-02-27 11:11 ` [PATCH v5 19/19] docs: vfio: Add vfio device cdev description Yi Liu
2023-02-27 19:21 ` [PATCH v5 00/19] Add vfio_device cdev for iommufd support Jason Gunthorpe
2023-02-28  3:03   ` Liu, Yi L
2023-02-28 16:58     ` Xu, Terrence
2023-03-01  2:29       ` Nicolin Chen
2023-03-01  3:44         ` Liu, Yi L
2023-03-02  9:43         ` Shameerali Kolothum Thodi
2023-03-02 23:51           ` Nicolin Chen
2023-03-03 15:01             ` Shameerali Kolothum Thodi
2023-03-04  7:00               ` Nicolin Chen
2023-03-04  8:22                 ` Liu, Yi L
2023-03-08 15:54                 ` Shameerali Kolothum Thodi
2023-03-14 11:38                 ` Shameerali Kolothum Thodi
2023-03-15 23:22                   ` Nicolin Chen
2023-03-16  7:39                     ` Liu, Yi L
2023-03-03 21:29         ` Matthew Rosato

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=20230227111135.61728-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=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=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