vfio-pci support pasid attach/detach
Subsystems (3)
cover vfio-pci support pasid attach/detach
This adds the pasid attach/detach uAPIs for userspace to attach/detach a PASID of a device to/from a given ioas/hwpt. Only vfio-pci driver is enabled in this series. After this series, PASID-capable devices bound with vfio-pci can report PASID capability to userspace and VM to enable PASID usages like Shared Virtual Addressing (SVA).
This series first adds the helpers for pasid attach in vfio core and then add the device cdev ioctls for pasid attach/detach, finally exposes the device PASID capability to user. It depends on iommufd pasid attach/detach series [1].
Complete code can be found at [2]
[1] https://lore.kernel.org/linux-iommu/[email protected]/
[2] https://github.com/yiliu1765/iommufd/tree/iommufd_pasid
Regards,
Yi Liu
Kevin Tian (1):
vfio-iommufd: Support pasid [at|de]tach for physical VFIO devices
Yi Liu (2):
vfio: Add VFIO_DEVICE_PASID_[AT|DE]TACH_IOMMUFD_PT vfio/pci: Expose PCIe PASID capability to userspace
drivers/vfio/device_cdev.c | 45 ++++++++++++++++++++++++ drivers/vfio/iommufd.c | 48 ++++++++++++++++++++++++++ drivers/vfio/pci/vfio_pci.c | 2 ++ drivers/vfio/pci/vfio_pci_config.c | 2 +- drivers/vfio/vfio.h | 4 +++ drivers/vfio/vfio_main.c | 8 +++++ include/linux/vfio.h | 11 ++++++ include/uapi/linux/vfio.h | 55 ++++++++++++++++++++++++++++++ 8 files changed, 174 insertions(+), 1 deletion(-)
Signature · 1 line
2.34.1
RFC 1/3 vfio-iommufd: Support pasid [at|de]tach for physical VFIO devices
From: Kevin Tian <[email protected]>
This adds pasid_at|de]tach_ioas ops for attaching hwpt to pasid of a device and the helpers for it. For now, only vfio-pci supports pasid attach/detach.
--- drivers/vfio/iommufd.c | 48 +++++++++++++++++++++++++++++++++++++ drivers/vfio/pci/vfio_pci.c | 2 ++ include/linux/vfio.h | 11 +++++++++ 3 files changed, 61 insertions(+)
drivers/vfio/iommufd.c +48 -0
@@ -119,6 +119,7 @@ int vfio_iommufd_physical_bind(struct vfio_device *vdev,if (IS_ERR (idev))return PTR_ERR (idev); vdev->iommufd_device = idev; +xa_init (&vdev->pasid_pts);return 0 ; }EXPORT_SYMBOL_GPL (vfio_iommufd_physical_bind);
@@ -127,6 +128,17 @@ void vfio_iommufd_physical_unbind(struct vfio_device *vdev) {lockdep_assert_held (&vdev->dev_set->lock); +if (!xa_empty (&vdev->pasid_pts)) { +void *entry; +unsigned long index; + +xa_for_each (&vdev->pasid_pts, index, entry) { +xa_erase (&vdev->pasid_pts, index); +iommufd_device_pasid_detach (vdev->iommufd_device, index); + } +xa_destroy (&vdev->pasid_pts); + } +if (vdev->iommufd_attached) {iommufd_device_detach (vdev->iommufd_device); vdev->iommufd_attached = false;
@@ -168,6 +180,42 @@ void vfio_iommufd_physical_detach_ioas(struct vfio_device *vdev) }EXPORT_SYMBOL_GPL (vfio_iommufd_physical_detach_ioas); +int vfio_iommufd_physical_pasid_attach_ioas (struct vfio_device *vdev, +u32 pasid,u32 *pt_id) +{ +void *entry; +int rc; + +lockdep_assert_held (&vdev->dev_set->lock); + +if (WARN_ON (!vdev->iommufd_device)) +return -EINVAL ; + + entry =xa_load (&vdev->pasid_pts, pasid); +if (xa_is_value (entry)) + rc =iommufd_device_pasid_replace (vdev->iommufd_device, pasid, pt_id); +else + rc =iommufd_device_pasid_attach (vdev->iommufd_device, pasid, pt_id); +if (rc) +return rc; +xa_store (&vdev->pasid_pts, pasid,xa_mk_value (*pt_id),GFP_KERNEL ); +return 0 ; +} +EXPORT_SYMBOL_GPL (vfio_iommufd_physical_pasid_attach_ioas); + +void vfio_iommufd_physical_pasid_detach_ioas (struct vfio_device *vdev,u32 pasid) +{ +lockdep_assert_held (&vdev->dev_set->lock); + +if (WARN_ON (!vdev->iommufd_device) || + !xa_is_value (xa_load (&vdev->pasid_pts, pasid))) +return ; + +iommufd_device_pasid_detach (vdev->iommufd_device, pasid); +xa_erase (&vdev->pasid_pts, pasid); +} +EXPORT_SYMBOL_GPL (vfio_iommufd_physical_pasid_detach_ioas); +/* * The emulated standard ops mean that vfio_device is going to use the * "mdev path" and will call vfio_pin_pages()/vfio_dma_rw(). Drivers using this
drivers/vfio/pci/vfio_pci.c +2 -0
@@ -142,6 +142,8 @@ static const struct vfio_device_ops vfio_pci_ops = { .unbind_iommufd = vfio_iommufd_physical_unbind, .attach_ioas = vfio_iommufd_physical_attach_ioas, .detach_ioas = vfio_iommufd_physical_detach_ioas, + .pasid_attach_ioas = vfio_iommufd_physical_pasid_attach_ioas, + .pasid_detach_ioas = vfio_iommufd_physical_pasid_detach_ioas, };static int vfio_pci_probe (struct pci_dev *pdev,const struct pci_device_id *id)
include/linux/vfio.h +11 -0
@@ -66,6 +66,7 @@ struct vfio_device {void (*put_kvm)(struct kvm *kvm);#if IS_ENABLED (CONFIG_IOMMUFD )struct iommufd_device *iommufd_device; +struct xarray pasid_pts; u8 iommufd_attached:1;#endif u8 cdev_opened:1;
@@ -83,6 +84,8 @@ struct vfio_device {* bound iommufd. Undo in unbind_iommufd if @detach_ioas is not * called. * @detach_ioas: Opposite of attach_ioas +* @pasid_attach_ioas: The pasid variation of attach_ioas +* @pasid_detach_ioas: Opposite of pasid_attach_ioas * @open_device: Called when the first file descriptor is opened for this device * @close_device: Opposite of open_device * @read: Perform read(2) on device file descriptor
@@ -107,6 +110,8 @@ struct vfio_device_ops {void (*unbind_iommufd)(struct vfio_device *vdev);int (*attach_ioas)(struct vfio_device *vdev,u32 *pt_id);void (*detach_ioas)(struct vfio_device *vdev); +int (*pasid_attach_ioas)(struct vfio_device *vdev,u32 pasid,u32 *pt_id); +void (*pasid_detach_ioas)(struct vfio_device *vdev,u32 pasid);int (*open_device)(struct vfio_device *vdev);void (*close_device)(struct vfio_device *vdev); ssize_t (*read)(struct vfio_device *vdev, char __user *buf,
@@ -131,6 +136,8 @@ int vfio_iommufd_physical_bind(struct vfio_device *vdev,void vfio_iommufd_physical_unbind (struct vfio_device *vdev);int vfio_iommufd_physical_attach_ioas (struct vfio_device *vdev,u32 *pt_id);void vfio_iommufd_physical_detach_ioas (struct vfio_device *vdev); +int vfio_iommufd_physical_pasid_attach_ioas (struct vfio_device *vdev,u32 pasid,u32 *pt_id); +void vfio_iommufd_physical_pasid_detach_ioas (struct vfio_device *vdev,u32 pasid);int vfio_iommufd_emulated_bind (struct vfio_device *vdev,struct iommufd_ctx *ictx,u32 *out_device_id);void vfio_iommufd_emulated_unbind (struct vfio_device *vdev);
@@ -158,6 +165,10 @@ vfio_iommufd_get_dev_id(struct vfio_device *vdev, struct iommufd_ctx *ictx) ((int (*)(struct vfio_device *vdev, u32 *pt_id)) NULL)#define vfio_iommufd_physical_detach_ioas \ ((void (*)(struct vfio_device *vdev)) NULL) +#define vfio_iommufd_physical_pasid_attach_ioas \ + ((int (*)(struct vfio_device *vdev, u32 pasid, u32 *pt_id)) NULL) +#define vfio_iommufd_physical_pasid_detach_ioas \ + ((void (*)(struct vfio_device *vdev, u32 pasid)) NULL)#define vfio_iommufd_emulated_bind \ ((int (*)(struct vfio_device *vdev, struct iommufd_ctx *ictx, \ u32 *out_device_id)) NULL)
Signature · 1 line
2.34.1
RFC 2/3 vfio: Add VFIO_DEVICE_PASID_[AT|DE]TACH_IOMMUFD_PT
In reply to Yi LiuThis adds ioctls for the userspace to attach a given pasid of a vfio device to/from an IOAS/HWPT.
--- drivers/vfio/device_cdev.c | 45 +++++++++++++++++++++++++++++++ drivers/vfio/vfio.h | 4 +++ drivers/vfio/vfio_main.c | 8 ++++++ include/uapi/linux/vfio.h | 55 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 112 insertions(+)
drivers/vfio/device_cdev.c +45 -0
@@ -210,6 +210,51 @@ int vfio_df_ioctl_detach_pt(struct vfio_device_file *df,return 0 ; } +int vfio_df_ioctl_pasid_attach_pt (struct vfio_device_file *df, +struct vfio_device_pasid_attach_iommufd_pt __user *arg) +{ +struct vfio_device *device = df->device; +struct vfio_device_pasid_attach_iommufd_pt attach; +unsigned long minsz; +int ret; + + minsz = offsetofend(struct vfio_device_pasid_attach_iommufd_pt, pt_id); + +if (copy_from_user (&attach, arg, minsz)) +return -EFAULT ; + +if (attach.argsz < minsz || attach.flags) +return -EINVAL ; + +mutex_lock (&device->dev_set->lock); + ret = device->ops->pasid_attach_ioas (device, attach.pasid, &attach.pt_id); +mutex_unlock (&device->dev_set->lock); + +return ret; +} + +int vfio_df_ioctl_pasid_detach_pt (struct vfio_device_file *df, +struct vfio_device_pasid_detach_iommufd_pt __user *arg) +{ +struct vfio_device *device = df->device; +struct vfio_device_pasid_detach_iommufd_pt detach; +unsigned long minsz; + + minsz = offsetofend(struct vfio_device_pasid_detach_iommufd_pt, flags); + +if (copy_from_user (&detach, arg, minsz)) +return -EFAULT ; + +if (detach.argsz < minsz || detach.flags) +return -EINVAL ; + +mutex_lock (&device->dev_set->lock); + device->ops->pasid_detach_ioas (device, detach.pasid); +mutex_unlock (&device->dev_set->lock); + +return 0 ; +} +static char *vfio_device_devnode (const struct device *dev,umode_t *mode) {return kasprintf (GFP_KERNEL ,"vfio/devices/%s" ,dev_name (dev));
drivers/vfio/vfio.h +4 -0
@@ -353,6 +353,10 @@ int vfio_df_ioctl_attach_pt(struct vfio_device_file *df, struct vfio_device_attach_iommufd_pt __user *arg);int vfio_df_ioctl_detach_pt (struct vfio_device_file *df,struct vfio_device_detach_iommufd_pt __user *arg); +int vfio_df_ioctl_pasid_attach_pt (struct vfio_device_file *df, +struct vfio_device_pasid_attach_iommufd_pt __user *arg); +int vfio_df_ioctl_pasid_detach_pt (struct vfio_device_file *df, +struct vfio_device_pasid_detach_iommufd_pt __user *arg);#if IS_ENABLED (CONFIG_VFIO_DEVICE_CDEV )void vfio_init_device_cdev (struct vfio_device *device);
drivers/vfio/vfio_main.c +8 -0
@@ -1230,6 +1230,14 @@ static long vfio_device_fops_unl_ioctl(struct file *filep,case VFIO_DEVICE_DETACH_IOMMUFD_PT : ret =vfio_df_ioctl_detach_pt (df, uptr); goto out; + +case VFIO_DEVICE_PASID_ATTACH_IOMMUFD_PT : + ret =vfio_df_ioctl_pasid_attach_pt (df, uptr); + goto out; + +case VFIO_DEVICE_PASID_DETACH_IOMMUFD_PT : + ret =vfio_df_ioctl_pasid_detach_pt (df, uptr); + goto out; } }
include/uapi/linux/vfio.h +55 -0
61 lines not on this page · raw message
Signature · 1 line
2.34.1
RFC 3/3 vfio/pci: Expose PCIe PASID capability to userspace
In reply to Yi LiuThis exposes PCIe PASID capability to userspace and where to emulate this capability if wants to further expose it to VM.
And this only exposes PASID capability for devices which has PCIe PASID extended struture in its configuration space. While for VFs, userspace is still unable to see this capability as SR-IOV spec forbides VF to implement PASID capability extended structure. It is a TODO in future. Related discussion can be found in below links:
https://lore.kernel.org/kvm/[email protected]/
https://lore.kernel.org/kvm/BL1PR11MB5271A60035EF591A5BE8AC878C01A@BL1PR11MB5271.namprd11.prod.outlook.com/
--- drivers/vfio/pci/vfio_pci_config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/vfio/pci/vfio_pci_config.c +1 -1
@@ -95,7 +95,7 @@ static const u16 pci_ext_cap_length[PCI_EXT_CAP_ID_MAX + 1] = { [PCI_EXT_CAP_ID_LTR] = PCI_EXT_CAP_LTR_SIZEOF, [PCI_EXT_CAP_ID_SECPCI] = 0, /* not yet */ [PCI_EXT_CAP_ID_PMUX] = 0, /* not yet */ - [PCI_EXT_CAP_ID_PASID] = 0, /* not yet */ + [PCI_EXT_CAP_ID_PASID] = PCI_EXT_CAP_PASID_SIZEOF, [PCI_EXT_CAP_ID_DVSEC] = 0xFF, };
Signature · 1 line
2.34.1
RE: [RFC 3/3] vfio/pci: Expose PCIe PASID capability to userspace
Quoted 12 lines
From: Liu, Yi L <[email protected]>
Sent: Tuesday, September 26, 2023 5:31 PMThis exposes PCIe PASID capability to userspace and where to emulate this capability if wants to further expose it to VM.
And this only exposes PASID capability for devices which has PCIe PASID extended struture in its configuration space. While for VFs, userspace is still unable to see this capability as SR-IOV spec forbides VF to implement PASID capability extended structure. It is a TODO in future. Related discussion can be found in below links:
Quoted 4 lines
https://lore.kernel.org/kvm/[email protected]/
https://lore.kernel.org/kvm/BL1PR11MB5271A60035EF591A5BE8AC878C01A
@BL1PR11MB5271.namprd11.prod.outlook.com/
Yes, we need a decision for VF case.
If the consensus is to continue exposing the PASID capability in vfio-pci config space by developing a kernel quirk mechanism to find offset for VF, then this patch for PF is orthogonal to that VF work and can go as it is.
But if the decision is to have a device feature for the user to enumerate the vPASID capability and let the VMM take care of finding the vPASID cap offset, then better we start doing that for PF too since it's not good to have two enumeration interfaces for PF/VF respectively.
My preference is via device feature given Qemu already includes lots of quirks for vfio-pci devices. Another reason is that when supporting vPASID with SIOV there are some arch constraints which the driver needs to report to the user to follow (e.g. don't assign ENQCMD-capable sibling vdev's to a same guest, etc.). A device feature interface can better encapsulate everything related to vPASID in one place.
Thanks
Kevin
Re: [RFC 3/3] vfio/pci: Expose PCIe PASID capability to userspace
Quoted 19 lines · Kevin
Quoted 12 lines
From: Liu, Yi L <[email protected]>
Sent: Tuesday, September 26, 2023 5:31 PMThis exposes PCIe PASID capability to userspace and where to emulate this capability if wants to further expose it to VM.
And this only exposes PASID capability for devices which has PCIe PASID extended struture in its configuration space. While for VFs, userspace is still unable to see this capability as SR-IOV spec forbides VF to implement PASID capability extended structure. It is a TODO in future. Related discussion can be found in below links:
Quoted 4 lines
https://lore.kernel.org/kvm/[email protected]/
https://lore.kernel.org/kvm/BL1PR11MB5271A60035EF591A5BE8AC878C01A
@BL1PR11MB5271.namprd11.prod.outlook.com/Yes, we need a decision for VF case.
Quoted 8 lines
If the consensus is to continue exposing the PASID capability in vfio-pci config space by developing a kernel quirk mechanism to find offset for VF, then this patch for PF is orthogonal to that VF work and can go as it is.
But if the decision is to have a device feature for the user to enumerate the vPASID capability and let the VMM take care of finding the vPASID cap offset, then better we start doing that for PF too since it's not good to have two enumeration interfaces for PF/VF respectively.
Note also that QEMU implements a lazy algorithm for exposing capabilities, the default is to expose them, so we need to consider existing VMs seeing a new read-only PASID capability on an assigned PF.
That might support an alternate means to expose the capability.
Quoted 5 lines
My preference is via device feature given Qemu already includes lots of quirks for vfio-pci devices. Another reason is that when supporting vPASID with SIOV there are some arch constraints which the driver needs to report to the user to follow (e.g. don't assign ENQCMD-capable sibling vdev's to a same guest, etc.).
?!
Quoted 2 lines
A device feature interface can better encapsulate everything related to vPASID in one place.
Sorry if I don't remember, have you posted a proposal for the device feature interface? Thanks,
Alex
RE: [RFC 3/3] vfio/pci: Expose PCIe PASID capability to userspace
Quoted 36 lines
From: Alex Williamson <[email protected]>
Sent: Thursday, September 28, 2023 2:53 AMQuoted 4 lines · Kevin
Quoted 4 lines
From: Liu, Yi L <[email protected]>
Sent: Tuesday, September 26, 2023 5:31 PMThis exposes PCIe PASID capability to userspace and where to emulate
this
Quoted 10 lines
Quoted 10 lines
capability if wants to further expose it to VM.
And this only exposes PASID capability for devices which has PCIe PASID extended struture in its configuration space. While for VFs, userspace is still unable to see this capability as SR-IOV spec forbides VF to implement PASID capability extended structure. It is a TODO in future. Related discussion can be found in below links:
https://lore.kernel.org/kvm/BL1PR11MB5271A60035EF591A5BE8AC878C01A
Quoted 5 lines
Quoted 2 lines
@BL1PR11MB5271.namprd11.prod.outlook.com/
Yes, we need a decision for VF case.
Quoted 8 lines
If the consensus is to continue exposing the PASID capability in vfio-pci config space by developing a kernel quirk mechanism to find offset for VF, then this patch for PF is orthogonal to that VF work and can go as it is.
But if the decision is to have a device feature for the user to enumerate the vPASID capability and let the VMM take care of finding the vPASID cap offset, then better we start doing that for PF too since it's not good to have two enumeration interfaces for PF/VF respectively.
Quoted 5 lines
Note also that QEMU implements a lazy algorithm for exposing capabilities, the default is to expose them, so we need to consider existing VMs seeing a new read-only PASID capability on an assigned PF.
That might support an alternate means to expose the capability.
Yep. that's also a valid point.
Quoted 8 lines
Quoted 6 lines
My preference is via device feature given Qemu already includes lots of quirks for vfio-pci devices. Another reason is that when supporting vPASID with SIOV there are some arch constraints which the driver needs to report to the user to follow (e.g. don't assign ENQCMD-capable sibling vdev's to a same guest, etc.).
?!
Sorry that I didn't plan to elaborate that tricky constraint before we show the overall SIOV/vPASID implementation. Explaining it requires lots of context and here just want to mention the potential requirement in case we need more proofs to go this direction. 😊
Quoted 7 lines
Quoted 3 lines
A device feature interface can better encapsulate everything related to vPASID in one place.
Sorry if I don't remember, have you posted a proposal for the device feature interface? Thanks,
Not yet. Will do in next version.