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, yanting.jiang@intel.com,
	zhenzhong.duan@intel.com, clegoate@redhat.com
Subject: [PATCH v12 03/24] vfio: Accept vfio device file in the KVM facing kAPI
Date: Fri,  2 Jun 2023 05:16:32 -0700	[thread overview]
Message-ID: <20230602121653.80017-4-yi.l.liu@intel.com> (raw)
In-Reply-To: <20230602121653.80017-1-yi.l.liu@intel.com>

This makes the vfio file kAPIs to accept 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.

Reviewed-by: Kevin Tian <kevin.tian@intel.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/vfio.h      |  2 ++
 drivers/vfio/vfio_main.c | 36 +++++++++++++++++++++++++++++++++++-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/drivers/vfio/vfio.h b/drivers/vfio/vfio.h
index b1e327a85a32..69e1a0692b06 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 4665791aa2eb..8ef9210ad2aa 100644
--- a/drivers/vfio/vfio_main.c
+++ b/drivers/vfio/vfio_main.c
@@ -429,6 +429,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;
 }
@@ -1190,13 +1191,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);
 
@@ -1211,16 +1222,36 @@ EXPORT_SYMBOL_GPL(vfio_file_is_valid);
  */
 bool vfio_file_enforced_coherent(struct file *file)
 {
+	struct vfio_device *device;
 	struct vfio_group *group;
 
 	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
@@ -1236,6 +1267,9 @@ void vfio_file_set_kvm(struct file *file, struct kvm *kvm)
 	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-06-02 12:17 UTC|newest]

Thread overview: 88+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-02 12:16 [PATCH v12 00/24] Add vfio_device cdev for iommufd support Yi Liu
2023-06-02 12:16 ` [PATCH v12 01/24] vfio: Allocate per device file structure Yi Liu
2023-06-02 12:16 ` [PATCH v12 02/24] vfio: Refine vfio file kAPIs for KVM Yi Liu
2023-06-02 12:16 ` Yi Liu [this message]
2023-06-02 12:16 ` [PATCH v12 04/24] kvm/vfio: Prepare for accepting vfio device fd Yi Liu
2023-06-02 12:16 ` [PATCH v12 05/24] kvm/vfio: Accept vfio device file from userspace Yi Liu
2023-06-02 12:16 ` [PATCH v12 06/24] vfio: Pass struct vfio_device_file * to vfio_device_open/close() Yi Liu
2023-06-12 21:52   ` Alex Williamson
2023-06-13  5:24     ` Liu, Yi L
2023-06-02 12:16 ` [PATCH v12 07/24] vfio: Block device access via device fd until device is opened Yi Liu
2023-06-12 21:52   ` Alex Williamson
2023-06-13  5:46     ` Liu, Yi L
2023-06-13 14:16       ` Alex Williamson
2023-06-13 14:36         ` Liu, Yi L
2023-06-13 14:42           ` Alex Williamson
2023-06-13 14:44             ` Liu, Yi L
2023-06-13 17:19         ` Jason Gunthorpe
2023-06-13 17:31           ` Alex Williamson
2023-06-02 12:16 ` [PATCH v12 08/24] vfio: Add cdev_device_open_cnt to vfio_group Yi Liu
2023-06-02 12:16 ` [PATCH v12 09/24] vfio: Make vfio_df_open() single open for device cdev path Yi Liu
2023-06-02 12:16 ` [PATCH v12 10/24] vfio-iommufd: Move noiommu compat validation out of vfio_iommufd_bind() Yi Liu
2023-06-22 17:59   ` Jason Gunthorpe
2023-06-02 12:16 ` [PATCH v12 11/24] vfio-iommufd: Split bind/attach into two steps Yi Liu
2023-06-22 17:59   ` Jason Gunthorpe
2023-06-02 12:16 ` [PATCH v12 12/24] vfio: Record devid in vfio_device_file Yi Liu
2023-06-22 18:00   ` Jason Gunthorpe
2023-06-02 12:16 ` [PATCH v12 13/24] vfio-iommufd: Add detach_ioas support for physical VFIO devices Yi Liu
2023-06-23 14:04   ` Jason Gunthorpe
2023-06-02 12:16 ` [PATCH v12 14/24] iommufd/device: Add iommufd_access_detach() API Yi Liu
2023-06-23 14:15   ` Jason Gunthorpe
2023-06-25 18:26     ` Nicolin Chen
2023-06-02 12:16 ` [PATCH v12 15/24] vfio-iommufd: Add detach_ioas support for emulated VFIO devices Yi Liu
2023-06-23 14:16   ` Jason Gunthorpe
2023-06-02 12:16 ` [PATCH v12 16/24] vfio: Move vfio_device_group_unregister() to be the first operation in unregister Yi Liu
2023-06-23 14:22   ` Jason Gunthorpe
2023-06-02 12:16 ` [PATCH v12 17/24] vfio: Add cdev for vfio_device Yi Liu
2023-06-23 15:58   ` Jason Gunthorpe
2023-06-02 12:16 ` [PATCH v12 18/24] vfio: Add VFIO_DEVICE_BIND_IOMMUFD Yi Liu
2023-06-12 22:27   ` Alex Williamson
2023-06-13  5:48     ` Liu, Yi L
2023-06-13 14:18       ` Alex Williamson
2023-06-13 14:28         ` Liu, Yi L
2023-06-13 14:39           ` Alex Williamson
2023-06-13 14:42             ` Liu, Yi L
2023-06-13 14:59               ` Alex Williamson
2023-06-23 16:15   ` Jason Gunthorpe
2023-06-26  8:34     ` Liu, Yi L
2023-06-26 12:56       ` Jason Gunthorpe
2023-06-26 13:35         ` Liu, Yi L
2023-06-26 14:51           ` Liu, Yi L
2023-06-28 14:34             ` Jason Gunthorpe
2023-06-28 14:41               ` Liu, Yi L
2023-06-02 12:16 ` [PATCH v12 19/24] vfio: Add VFIO_DEVICE_[AT|DE]TACH_IOMMUFD_PT Yi Liu
2023-06-23 16:21   ` Jason Gunthorpe
2023-06-02 12:16 ` [PATCH v12 20/24] vfio: Only check group->type for noiommu test Yi Liu
2023-06-12 22:37   ` Alex Williamson
2023-06-13  9:20     ` Liu, Yi L
2023-06-02 12:16 ` [PATCH v12 21/24] vfio: Determine noiommu device in __vfio_register_dev() Yi Liu
2023-06-12 22:42   ` Alex Williamson
2023-06-13  5:53     ` Liu, Yi L
2023-06-13 14:19       ` Alex Williamson
2023-06-13 14:33         ` Liu, Yi L
2023-06-13 14:48           ` Alex Williamson
2023-06-13 15:01             ` Liu, Yi L
     [not found]               ` <20230613091301.56986440.alex.williamson@redhat.com>
     [not found]                 ` <20230613111511.425bdeae.alex.williamson@redhat.com>
2023-06-13 17:35                   ` Jason Gunthorpe
2023-06-13 20:10                     ` Alex Williamson
2023-06-14  3:24                       ` Liu, Yi L
2023-06-14  5:42                         ` Tian, Kevin
2023-06-14  6:14                           ` Liu, Yi L
2023-06-14  6:20                             ` Tian, Kevin
2023-06-14 12:23                               ` Jason Gunthorpe
2023-06-14 13:12                                 ` Liu, Yi L
2023-06-14 17:30                                   ` Jason Gunthorpe
2023-06-02 12:16 ` [PATCH v12 22/24] vfio: Remove vfio_device_is_noiommu() Yi Liu
2023-06-12 22:46   ` Alex Williamson
2023-06-02 12:16 ` [PATCH v12 23/24] vfio: Compile vfio_group infrastructure optionally Yi Liu
2023-06-23 16:35   ` Jason Gunthorpe
2023-06-02 12:16 ` [PATCH v12 24/24] docs: vfio: Add vfio device cdev description Yi Liu
2023-06-12 23:06   ` Alex Williamson
2023-06-13 12:01     ` Liu, Yi L
2023-06-13 14:24       ` Alex Williamson
2023-06-13 14:48         ` Liu, Yi L
2023-06-13 15:04           ` Alex Williamson
2023-06-13 15:11             ` Liu, Yi L
2023-06-13 17:30               ` Alex Williamson
2023-06-07  8:27 ` [PATCH v12 00/24] Add vfio_device cdev for iommufd support Nicolin Chen
2023-06-08  6:58 ` Jiang, Yanting
2023-06-09 16:47 ` 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=20230602121653.80017-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=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