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 v6 15/24] vfio: Make vfio_device_open() single open for device cdev path
Date: Wed,  8 Mar 2023 05:28:54 -0800	[thread overview]
Message-ID: <20230308132903.465159-16-yi.l.liu@intel.com> (raw)
In-Reply-To: <20230308132903.465159-1-yi.l.liu@intel.com>

VFIO group has historically allowed multi-open of the device FD. This
was made secure because the "open" was executed via an ioctl to the
group FD which is itself only single open.

However, no known use of multiple device FDs today. It is kind of a
strange thing to do because new device FDs can naturally be created
via dup().

When we implement the new device uAPI (only used in cdev path) there is
no natural way to allow the device itself from being multi-opened in a
secure manner. Without the group FD we cannot prove the security context
of the opener.

Thus, when moving to the new uAPI we block the ability to multi-open
the device. Old group path still allows it.

vfio_device_open() needs to sustain both the legacy behavior i.e. multi-open
in the group path and the new behavior i.e. single-open in the cdev path.
This mixture leads to storing a vfio_group pointer in struct vfio_device_file.
Only the group path would set it, cdev path never sets it.

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

diff --git a/drivers/vfio/group.c b/drivers/vfio/group.c
index 63aafd59278d..f067a6a7bbd2 100644
--- a/drivers/vfio/group.c
+++ b/drivers/vfio/group.c
@@ -254,6 +254,8 @@ static struct file *vfio_device_open_file(struct vfio_device *device)
 		goto err_out;
 	}
 
+	df->group = device->group;
+
 	ret = vfio_device_group_open(df);
 	if (ret)
 		goto err_free;
diff --git a/drivers/vfio/vfio.h b/drivers/vfio/vfio.h
index e1b8763e443e..11397cc95e0b 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;
+	struct vfio_group *group;
+
 	bool access_granted;
 	spinlock_t kvm_ref_lock; /* protect kvm field */
 	struct kvm *kvm;
diff --git a/drivers/vfio/vfio_main.c b/drivers/vfio/vfio_main.c
index cf9994a65df3..aa31aae33407 100644
--- a/drivers/vfio/vfio_main.c
+++ b/drivers/vfio/vfio_main.c
@@ -477,6 +477,13 @@ int vfio_device_open(struct vfio_device_file *df)
 
 	lockdep_assert_held(&device->dev_set->lock);
 
+	/*
+	 * Only group path supports multiple device open. cdev path
+	 * doesn't have a secure way for it.
+	 */
+	if (device->open_count != 0 && !df->group)
+		return -EINVAL;
+
 	device->open_count++;
 	if (device->open_count == 1) {
 		ret = vfio_device_first_open(df);
-- 
2.34.1


  parent reply	other threads:[~2023-03-08 13:32 UTC|newest]

Thread overview: 101+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-08 13:28 [PATCH v6 00/24] cover-letter: Add vfio_device cdev for iommufd support Yi Liu
2023-03-08 13:28 ` [PATCH v6 01/24] vfio: Allocate per device file structure Yi Liu
2023-03-08 13:28 ` [PATCH v6 02/24] vfio: Refine vfio file kAPIs for KVM Yi Liu
2023-03-08 13:28 ` [PATCH v6 03/24] vfio: Accept vfio device file in the KVM facing kAPI Yi Liu
2023-03-08 13:28 ` [PATCH v6 04/24] kvm/vfio: Rename kvm_vfio_group to prepare for accepting vfio device fd Yi Liu
2023-03-08 13:28 ` [PATCH v6 05/24] kvm/vfio: Accept vfio device file from userspace Yi Liu
2023-03-22 14:10   ` Xu Yilun
2023-03-28  3:48     ` Liu, Yi L
2023-03-08 13:28 ` [PATCH v6 06/24] vfio: Pass struct vfio_device_file * to vfio_device_open/close() Yi Liu
2023-03-08 13:28 ` [PATCH v6 07/24] vfio: Block device access via device fd until device is opened Yi Liu
2023-03-10  4:50   ` Tian, Kevin
2023-03-08 13:28 ` [PATCH v6 08/24] vfio/pci: Update comment around group_fd get in vfio_pci_ioctl_pci_hot_reset() Yi Liu
2023-03-08 13:28 ` [PATCH v6 09/24] vfio/pci: Only need to check opened devices in the dev_set for hot reset Yi Liu
2023-03-10  5:00   ` Tian, Kevin
2023-03-08 13:28 ` [PATCH v6 10/24] vfio/pci: Rename the helpers and data in hot reset path to accept device fd Yi Liu
2023-03-10  5:01   ` Tian, Kevin
2023-03-08 13:28 ` [PATCH v6 11/24] vfio/pci: Accept device fd in VFIO_DEVICE_PCI_HOT_RESET ioctl Yi Liu
2023-03-10  5:08   ` Tian, Kevin
2023-03-10  5:38     ` Liu, Yi L
2023-03-08 13:28 ` [PATCH v6 12/24] vfio/pci: Allow passing zero-length fd array in VFIO_DEVICE_PCI_HOT_RESET Yi Liu
2023-03-10  5:31   ` Tian, Kevin
2023-03-10  6:04     ` Liu, Yi L
2023-03-10  9:08       ` Tian, Kevin
2023-03-10 17:42       ` Jason Gunthorpe
2023-03-15 22:53   ` Alex Williamson
2023-03-15 23:31     ` Tian, Kevin
2023-03-16  3:54       ` [offlist] " Liu, Yi L
2023-03-16  6:09         ` Tian, Kevin
2023-03-16  6:28           ` Liu, Yi L
2023-03-16  6:49             ` Nicolin Chen
2023-03-16 13:22               ` Liu, Yi L
2023-03-16 21:27                 ` Nicolin Chen
2023-03-16 18:45       ` Alex Williamson
2023-03-16 23:29         ` Tian, Kevin
2023-03-17  0:22           ` Alex Williamson
2023-03-17  0:57             ` Tian, Kevin
2023-03-17 15:15               ` Alex Williamson
2023-03-20 17:14                 ` Jason Gunthorpe
2023-03-20 22:52                   ` Alex Williamson
2023-03-20 23:39                     ` Jason Gunthorpe
2023-03-21 20:31                       ` Alex Williamson
2023-03-21 20:50                         ` Jason Gunthorpe
2023-03-21 21:01                           ` Alex Williamson
2023-03-21 22:20                             ` Jason Gunthorpe
2023-03-21 22:47                               ` Alex Williamson
2023-03-22  4:42                                 ` Liu, Yi L
2023-03-22 12:23                                   ` Alex Williamson
2023-03-22 12:27                                 ` Jason Gunthorpe
2023-03-22 12:36                                   ` Alex Williamson
2023-03-22 12:47                                     ` Jason Gunthorpe
2023-03-24  9:09                             ` Tian, Kevin
2023-03-24 13:14                               ` Jason Gunthorpe
2023-03-22  8:17                           ` Liu, Yi L
2023-03-22 12:17                             ` Jason Gunthorpe
2023-03-22 13:33                               ` Liu, Yi L
2023-03-22 13:43                                 ` Jason Gunthorpe
2023-03-23  3:15                                   ` Liu, Yi L
2023-03-23 12:02                                     ` Jason Gunthorpe
2023-03-24  9:25                                       ` Liu, Yi L
2023-03-27 11:57                                         ` Liu, Yi L
2023-03-08 13:28 ` [PATCH v6 13/24] vfio/iommufd: Split the compat_ioas attach out from vfio_iommufd_bind() Yi Liu
2023-03-10  8:08   ` Tian, Kevin
2023-03-10  8:22     ` Liu, Yi L
2023-03-10  9:10       ` Tian, Kevin
2023-03-11 10:24       ` Liu, Yi L
2023-03-13  2:06         ` Tian, Kevin
2023-03-08 13:28 ` [PATCH v6 14/24] vfio: Add cdev_device_open_cnt to vfio_group Yi Liu
2023-03-08 13:28 ` Yi Liu [this message]
2023-03-08 13:28 ` [PATCH v6 16/24] vfio: Make vfio_device_first_open() to cover the noiommu mode in cdev path Yi Liu
2023-03-10  8:30   ` Tian, Kevin
2023-03-08 13:28 ` [PATCH v6 17/24] vfio-iommufd: Make vfio_iommufd_bind() selectively return devid Yi Liu
2023-03-10  8:31   ` Tian, Kevin
2023-03-08 13:28 ` [PATCH v6 18/24] vfio-iommufd: Add detach_ioas support for physical VFIO devices Yi Liu
2023-03-08 13:28 ` [PATCH v6 19/24] vfio-iommufd: Add detach_ioas support for emulated " Yi Liu
2023-03-10 23:42   ` Nicolin Chen
2023-03-15  6:15     ` Liu, Yi L
2023-03-15  6:25       ` Nicolin Chen
2023-03-08 13:28 ` [PATCH v6 20/24] vfio: Add cdev for vfio_device Yi Liu
2023-03-10  8:48   ` Tian, Kevin
2023-03-10  9:59     ` Liu, Yi L
2023-03-08 13:29 ` [PATCH v6 21/24] vfio: Add VFIO_DEVICE_BIND_IOMMUFD Yi Liu
2023-03-10  9:01   ` Tian, Kevin
2023-03-10  9:58     ` Liu, Yi L
2023-03-10 10:06       ` Tian, Kevin
2023-03-15  4:40         ` Liu, Yi L
2023-03-15  6:57           ` Tian, Kevin
2023-03-20 14:09           ` Jason Gunthorpe
2023-03-20 14:31             ` Yi Liu
2023-03-20 17:16               ` Jason Gunthorpe
2023-03-21  1:30                 ` Tian, Kevin
2023-03-21 12:00                   ` Jason Gunthorpe
2023-03-21 14:37                     ` Liu, Yi L
2023-03-21 14:41                       ` Jason Gunthorpe
2023-03-21 14:51                         ` Liu, Yi L
2023-03-21 14:58                           ` Jason Gunthorpe
2023-03-21 15:10                             ` Liu, Yi L
2023-03-21 16:54                               ` Jason Gunthorpe
2023-03-08 13:29 ` [PATCH v6 22/24] vfio: Add VFIO_DEVICE_AT[DE]TACH_IOMMUFD_PT Yi Liu
2023-03-08 13:29 ` [PATCH v6 23/24] vfio: Compile group optionally Yi Liu
2023-03-10  9:03   ` Tian, Kevin
2023-03-08 13:29 ` [PATCH v6 24/24] docs: vfio: Add vfio device cdev description 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=20230308132903.465159-16-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