| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20210919063848.1476776-16-yi.l.liu@intel.com>
Date: Sun, 19 Sep 2021 14:38:43 +0800
From: Liu Yi L <yi.l.liu@...el.com>
To: alex.williamson@...hat.com, jgg@...dia.com, hch@....de,
jasowang@...hat.com, joro@...tes.org
Cc: jean-philippe@...aro.org, kevin.tian@...el.com, parav@...lanox.com,
lkml@...ux.net, pbonzini@...hat.com, lushenming@...wei.com,
eric.auger@...hat.com, corbet@....net, ashok.raj@...el.com,
yi.l.liu@...el.com, yi.l.liu@...ux.intel.com, jun.j.tian@...el.com,
hao.wu@...el.com, dave.jiang@...el.com,
jacob.jun.pan@...ux.intel.com, kwankhede@...dia.com,
robin.murphy@....com, kvm@...r.kernel.org,
iommu@...ts.linux-foundation.org, dwmw2@...radead.org,
linux-kernel@...r.kernel.org, baolu.lu@...ux.intel.com,
david@...son.dropbear.id.au, nicolinc@...dia.com
Subject: [RFC 15/20] vfio/pci: Add VFIO_DEVICE_[DE]ATTACH_IOASID
This patch adds interface for userspace to attach device to specified
IOASID.
Note:
One device can only be attached to one IOASID in this version. This is
on par with what vfio provides today. In the future this restriction can
be relaxed when multiple I/O address spaces are supported per device
Signed-off-by: Liu Yi L <yi.l.liu@...el.com>
---
drivers/vfio/pci/vfio_pci.c | 82 +++++++++++++++++++++++++++++
drivers/vfio/pci/vfio_pci_private.h | 1 +
include/linux/iommufd.h | 1 +
include/uapi/linux/vfio.h | 26 +++++++++
4 files changed, 110 insertions(+)
diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c
index 20006bb66430..5b1fda333122 100644
--- a/drivers/vfio/pci/vfio_pci.c
+++ b/drivers/vfio/pci/vfio_pci.c
@@ -557,6 +557,11 @@ static void vfio_pci_release(struct vfio_device *core_vdev)
if (vdev->videv) {
struct vfio_iommufd_device *videv = vdev->videv;
+ if (videv->ioasid != IOMMUFD_INVALID_IOASID) {
+ iommufd_device_detach_ioasid(videv->idev,
+ videv->ioasid);
+ videv->ioasid = IOMMUFD_INVALID_IOASID;
+ }
vdev->videv = NULL;
iommufd_unbind_device(videv->idev);
kfree(videv);
@@ -839,6 +844,7 @@ static long vfio_pci_ioctl(struct vfio_device *core_vdev,
}
videv->idev = idev;
videv->iommu_fd = bind_data.iommu_fd;
+ videv->ioasid = IOMMUFD_INVALID_IOASID;
/*
* A security context has been established. Unblock
* user access.
@@ -848,6 +854,82 @@ static long vfio_pci_ioctl(struct vfio_device *core_vdev,
vdev->videv = videv;
mutex_unlock(&vdev->videv_lock);
+ return 0;
+ } else if (cmd == VFIO_DEVICE_ATTACH_IOASID) {
+ struct vfio_device_attach_ioasid attach;
+ unsigned long minsz;
+ struct vfio_iommufd_device *videv;
+ int ret = 0;
+
+ /* not allowed if the device is opened in legacy interface */
+ if (vfio_device_in_container(core_vdev))
+ return -ENOTTY;
+
+ minsz = offsetofend(struct vfio_device_attach_ioasid, ioasid);
+ if (copy_from_user(&attach, (void __user *)arg, minsz))
+ return -EFAULT;
+
+ if (attach.argsz < minsz || attach.flags ||
+ attach.iommu_fd < 0 || attach.ioasid < 0)
+ return -EINVAL;
+
+ mutex_lock(&vdev->videv_lock);
+
+ videv = vdev->videv;
+ if (!videv || videv->iommu_fd != attach.iommu_fd) {
+ mutex_unlock(&vdev->videv_lock);
+ return -EINVAL;
+ }
+
+ /* Currently only allows one IOASID attach */
+ if (videv->ioasid != IOMMUFD_INVALID_IOASID) {
+ mutex_unlock(&vdev->videv_lock);
+ return -EBUSY;
+ }
+
+ ret = __pci_iommufd_device_attach_ioasid(vdev->pdev,
+ videv->idev,
+ attach.ioasid);
+ if (!ret)
+ videv->ioasid = attach.ioasid;
+ mutex_unlock(&vdev->videv_lock);
+
+ return ret;
+ } else if (cmd == VFIO_DEVICE_DETACH_IOASID) {
+ struct vfio_device_attach_ioasid attach;
+ unsigned long minsz;
+ struct vfio_iommufd_device *videv;
+
+ /* not allowed if the device is opened in legacy interface */
+ if (vfio_device_in_container(core_vdev))
+ return -ENOTTY;
+
+ minsz = offsetofend(struct vfio_device_attach_ioasid, ioasid);
+ if (copy_from_user(&attach, (void __user *)arg, minsz))
+ return -EFAULT;
+
+ if (attach.argsz < minsz || attach.flags ||
+ attach.iommu_fd < 0 || attach.ioasid < 0)
+ return -EINVAL;
+
+ mutex_lock(&vdev->videv_lock);
+
+ videv = vdev->videv;
+ if (!videv || videv->iommu_fd != attach.iommu_fd) {
+ mutex_unlock(&vdev->videv_lock);
+ return -EINVAL;
+ }
+
+ if (videv->ioasid == IOMMUFD_INVALID_IOASID ||
+ videv->ioasid != attach.ioasid) {
+ mutex_unlock(&vdev->videv_lock);
+ return -EINVAL;
+ }
+
+ videv->ioasid = IOMMUFD_INVALID_IOASID;
+ iommufd_device_detach_ioasid(videv->idev, attach.ioasid);
+ mutex_unlock(&vdev->videv_lock);
+
return 0;
} else if (cmd == VFIO_DEVICE_GET_INFO) {
struct vfio_device_info info;
diff --git a/drivers/vfio/pci/vfio_pci_private.h b/drivers/vfio/pci/vfio_pci_private.h
index bd784accac35..daa0f08ac835 100644
--- a/drivers/vfio/pci/vfio_pci_private.h
+++ b/drivers/vfio/pci/vfio_pci_private.h
@@ -103,6 +103,7 @@ struct vfio_pci_mmap_vma {
struct vfio_iommufd_device {
struct iommufd_device *idev;
int iommu_fd;
+ int ioasid;
};
struct vfio_pci_device {
diff --git a/include/linux/iommufd.h b/include/linux/iommufd.h
index 01a4fe934143..36d8d2fd22bb 100644
--- a/include/linux/iommufd.h
+++ b/include/linux/iommufd.h
@@ -17,6 +17,7 @@
#define IOMMUFD_IOASID_MAX ((unsigned int)(0x7FFFFFFF))
#define IOMMUFD_IOASID_MIN 0
+#define IOMMUFD_INVALID_IOASID -1
#define IOMMUFD_DEVID_MAX ((unsigned int)(0x7FFFFFFF))
#define IOMMUFD_DEVID_MIN 0
diff --git a/include/uapi/linux/vfio.h b/include/uapi/linux/vfio.h
index c902abd60339..61493ab03038 100644
--- a/include/uapi/linux/vfio.h
+++ b/include/uapi/linux/vfio.h
@@ -220,6 +220,32 @@ struct vfio_device_iommu_bind_data {
#define VFIO_DEVICE_BIND_IOMMUFD _IO(VFIO_TYPE, VFIO_BASE + 19)
+/*
+ * VFIO_DEVICE_ATTACH_IOASID - _IOW(VFIO_TYPE, VFIO_BASE + 21,
+ * struct vfio_device_attach_ioasid)
+ *
+ * Attach a vfio device to the specified IOASID
+ *
+ * Multiple vfio devices can be attached to the same IOASID. One device can
+ * be attached to only one ioasid at this point.
+ *
+ * @argsz: user filled size of this data.
+ * @flags: reserved for future extension.
+ * @iommu_fd: iommufd where the ioasid comes from.
+ * @ioasid: target I/O address space.
+ *
+ * Return: 0 on success, -errno on failure.
+ */
+struct vfio_device_attach_ioasid {
+ __u32 argsz;
+ __u32 flags;
+ __s32 iommu_fd;
+ __s32 ioasid;
+};
+
+#define VFIO_DEVICE_ATTACH_IOASID _IO(VFIO_TYPE, VFIO_BASE + 20)
+#define VFIO_DEVICE_DETACH_IOASID _IO(VFIO_TYPE, VFIO_BASE + 21)
+
/**
* VFIO_DEVICE_GET_INFO - _IOR(VFIO_TYPE, VFIO_BASE + 7,
* struct vfio_device_info)
--
2.25.1
Powered by blists - more mailing lists