Commit f0bf3eac authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'vfio-v7.1-rc1' of https://github.com/awilliam/linux-vfio 

Pull VFIO updates from Alex Williamson:

 - Update QAT vfio-pci variant driver for Gen 5, 420xx devices (Vijay
   Sundar Selvamani, Suman Kumar Chakraborty, Giovanni Cabiddu)

 - Fix vfio selftest MMIO DMA mapping selftest (Alex Mastro)

 - Conversions to const struct class in support of class_create()
   deprecation (Jori Koolstra)

 - Improve selftest compiler compatibility by avoiding initializer on
   variable-length array (Manish Honap)

 - Define new uAPI for drivers supporting migration to advise user-
   space of new initial data for reducing target startup latency.
   Implemented for mlx5 vfio-pci variant driver (Yishai Hadas)

 - Enable vfio selftests on aarch64, not just cross-compiles reporting
   arm64 (Ted Logan)

 - Update vfio selftest driver support to include additional DSA devices
   (Yi Lai)

 - Unconditionally include debugfs root pointer in vfio device struct,
   avoiding a build failure seen in hisi_acc variant driver without
   debugfs otherwise (Arnd Bergmann)

 - Add support for the s390 ISM (Internal Shared Memory) device via a
   new variant driver. The device is unique in the size of its BAR space
   (256TiB) and lack of mmap support (Julian Ruess)

 - Enforce that vfio-pci drivers implement a name in their ops structure
   for use in sequestering SR-IOV VFs (Alex Williamson)

 - Prune leftover group notifier code (Paolo Bonzini)

 - Fix Xe vfio-pci variant driver to avoid migration support as a
   dependency in the reset path and missing release call (Michał
   Winiarski)

* tag 'vfio-v7.1-rc1' of https://github.com/awilliam/linux-vfio: (23 commits)
  vfio/xe: Add a missing vfio_pci_core_release_dev()
  vfio/xe: Reorganize the init to decouple migration from reset
  vfio: remove dead notifier code
  vfio/pci: Require vfio_device_ops.name
  MAINTAINERS: add VFIO ISM PCI DRIVER section
  vfio/ism: Implement vfio_pci driver for ISM devices
  vfio/pci: Rename vfio_config_do_rw() to vfio_pci_config_rw_single() and export it
  vfio: unhide vdev->debug_root
  vfio/qat: add support for Intel QAT 420xx VFs
  vfio: selftests: Support DMR and GNR-D DSA devices
  vfio: selftests: Build tests on aarch64
  vfio/mlx5: Add REINIT support to VFIO_MIG_GET_PRECOPY_INFO
  vfio/mlx5: consider inflight SAVE during PRE_COPY
  net/mlx5: Add IFC bits for migration state
  vfio: Adapt drivers to use the core helper vfio_check_precopy_ioctl
  vfio: Add support for VFIO_DEVICE_FEATURE_MIG_PRECOPY_INFOv2
  vfio: Define uAPI for re-init initial bytes during the PRE_COPY phase
  vfio: selftests: Fix VLA initialisation in vfio_pci_irq_set()
  vfio: uapi: fix comment typo
  vfio: mdev: replace mtty_dev->vd_class with a const struct class
  ...
parents 1d51b370 493c7eff

Documentation/arch/s390/vfio-ap.rst

+8 −12
Original line number Diff line number Diff line
@@ -431,17 +431,14 @@ matrix device. 
* callback interfaces



  open_device:

    The vfio_ap driver uses this callback to register a

    VFIO_GROUP_NOTIFY_SET_KVM notifier callback function for the matrix mdev

    devices. The open_device callback is invoked by userspace to connect the

    VFIO iommu group for the matrix mdev device to the MDEV bus. Access to the

    KVM structure used to configure the KVM guest is provided via this callback.

    The KVM structure, is used to configure the guest's access to the AP matrix

    defined via the vfio_ap mediated device's sysfs attribute files.

    the open_device callback is invoked by userspace to connect the

    VFIO iommu group for the matrix mdev device to the MDEV bus.  The

    callback retrieves the KVM structure used to configure the KVM guest

    and configures the guest's access to the AP matrix defined via the

    vfio_ap mediated device's sysfs attribute files.



  close_device:

    unregisters the VFIO_GROUP_NOTIFY_SET_KVM notifier callback function for the

    matrix mdev device and deconfigures the guest's AP matrix.

    this callback deconfigures the guest's AP matrix.



  ioctl:

    this callback handles the VFIO_DEVICE_GET_INFO and VFIO_DEVICE_RESET ioctls
@@ -449,9 +446,8 @@ matrix device. 


Configure the guest's AP resources

----------------------------------

Configuring the AP resources for a KVM guest will be performed when the

VFIO_GROUP_NOTIFY_SET_KVM notifier callback is invoked. The notifier

function is called when userspace connects to KVM. The guest's AP resources are

Configuring the AP resources for a KVM guest will be performed at the

time of ``open_device`` and ``close_device``. The guest's AP resources are

configured via its APCB by:



* Setting the bits in the APM corresponding to the APIDs assigned to the

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -27902,6 +27902,12 @@ L: kvm@vger.kernel.org 
S:	Maintained

F:	drivers/vfio/pci/hisilicon/









VFIO ISM PCI DRIVER









M:	Julian Ruess <julianr@linux.ibm.com>









L:	kvm@vger.kernel.org









S:	Maintained









F:	drivers/vfio/pci/ism/

















VFIO MEDIATED DEVICE DRIVERS









M:	Kirti Wankhede <kwankhede@nvidia.com>









L:	kvm@vger.kernel.org

























drivers/vfio/group.c



+11
−15






























Original line number
Diff line number
Diff line







@@ -15,8 +15,13 @@







#include <linux/anon_inodes.h>









#include "vfio.h"



















static char *vfio_devnode(const struct device *, umode_t *);









static const struct class vfio_class = {









	.name	= "vfio",









	.devnode = vfio_devnode









};



















static struct vfio {









	struct class			*class;









	struct list_head		group_list;









	struct mutex			group_lock; /* locks group_list */









	struct ida			group_ida;








@@ -456,7 +461,6 @@ static int vfio_group_fops_release(struct inode *inode, struct file *filep)







	 * Device FDs hold a group file reference, therefore the group release









	 * is only called when there are no open devices.









	 */









	WARN_ON(group->notifier.head);









	if (group->container)









		vfio_group_detach_container(group);









	if (group->iommufd) {








@@ -527,7 +531,7 @@ static struct vfio_group *vfio_group_alloc(struct iommu_group *iommu_group,

















	device_initialize(&group->dev);









	group->dev.devt = MKDEV(MAJOR(vfio.group_devt), minor);









	group->dev.class = vfio.class;









	group->dev.class = &vfio_class;









	group->dev.release = vfio_group_release;









	cdev_init(&group->cdev, &vfio_group_fops);









	group->cdev.owner = THIS_MODULE;








@@ -541,7 +545,6 @@ static struct vfio_group *vfio_group_alloc(struct iommu_group *iommu_group,







	/* put in vfio_group_release() */









	iommu_group_ref_get(iommu_group);









	group->type = type;









	BLOCKING_INIT_NOTIFIER_HEAD(&group->notifier);



















	return group;









}








@@ -720,7 +723,6 @@ void vfio_device_remove_group(struct vfio_device *device)







	 * properly hold the group reference.









	 */









	WARN_ON(!list_empty(&group->device_list));









	WARN_ON(group->notifier.head);



















	/*









	 * Revoke all users of group->iommu_group. At this point we know there








@@ -901,13 +903,9 @@ int __init vfio_group_init(void)







		return ret;



















	/* /dev/vfio/$GROUP */









	vfio.class = class_create("vfio");









	if (IS_ERR(vfio.class)) {









		ret = PTR_ERR(vfio.class);









	ret = class_register(&vfio_class);









	if (ret)









		goto err_group_class;









	}



















	vfio.class->devnode = vfio_devnode;



















	ret = alloc_chrdev_region(&vfio.group_devt, 0, MINORMASK + 1, "vfio");









	if (ret)








@@ -915,8 +913,7 @@ int __init vfio_group_init(void)







	return 0;



















err_alloc_chrdev:









	class_destroy(vfio.class);









	vfio.class = NULL;









	class_unregister(&vfio_class);









err_group_class:









	vfio_container_cleanup();









	return ret;








@@ -927,7 +924,6 @@ void vfio_group_cleanup(void)







	WARN_ON(!list_empty(&vfio.group_list));









	ida_destroy(&vfio.group_ida);









	unregister_chrdev_region(vfio.group_devt, MINORMASK + 1);









	class_destroy(vfio.class);









	vfio.class = NULL;









	class_unregister(&vfio_class);









	vfio_container_cleanup();









}
























drivers/vfio/pci/Kconfig



+2
−0






























Original line number
Diff line number
Diff line







@@ -60,6 +60,8 @@ config VFIO_PCI_DMABUF

















source "drivers/vfio/pci/mlx5/Kconfig"



















source "drivers/vfio/pci/ism/Kconfig"



















source "drivers/vfio/pci/hisilicon/Kconfig"



















source "drivers/vfio/pci/pds/Kconfig"
































drivers/vfio/pci/Makefile



+2
−0






























Original line number
Diff line number
Diff line







@@ -11,6 +11,8 @@ obj-$(CONFIG_VFIO_PCI) += vfio-pci.o

















obj-$(CONFIG_MLX5_VFIO_PCI)           += mlx5/



















obj-$(CONFIG_ISM_VFIO_PCI)           += ism/



















obj-$(CONFIG_HISI_ACC_VFIO_PCI) += hisilicon/



















obj-$(CONFIG_PDS_VFIO_PCI) += pds/