From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 27 Nov 2024 20:57:03 +0000 (-0800)
Subject: Merge tag 'vfio-v6.13-rc1' of https://github.com/awilliam/linux-vfio
X-Git-Tag: v6.13-rc1~55
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4aca98a8a150f3531fea782c3040ada0ad1ce3b6;p=thirdparty%2Flinux.git

Merge tag 'vfio-v6.13-rc1' of https://github.com/awilliam/linux-vfio

Pull VFIO updates from Alex Williamson:

 - Constify an unmodified structure used in linking vfio and kvm
   (Christophe JAILLET)

 - Add ID for an additional hardware SKU supported by the nvgrace-gpu
   vfio-pci variant driver (Ankit Agrawal)

 - Fix incorrect signed cast in QAT vfio-pci variant driver, negating
   test in check_add_overflow(), though still caught by later tests
   (Giovanni Cabiddu)

 - Additional debugfs attributes exposed in hisi_acc vfio-pci variant
   driver for migration debugging (Longfang Liu)

 - Migration support is added to the virtio vfio-pci variant driver,
   becoming the primary feature of the driver while retaining emulation
   of virtio legacy support as a secondary option (Yishai Hadas)

 - Fixes to a few unwind flows in the mlx5 vfio-pci driver discovered
   through reviews of the virtio variant driver (Yishai Hadas)

 - Fix an unlikely issue where a PCI device exposed to userspace with an
   unknown capability at the base of the extended capability chain can
   overflow an array index (Avihai Horon)

* tag 'vfio-v6.13-rc1' of https://github.com/awilliam/linux-vfio:
  vfio/pci: Properly hide first-in-list PCIe extended capability
  vfio/mlx5: Fix unwind flows in mlx5vf_pci_save/resume_device_data()
  vfio/mlx5: Fix an unwind issue in mlx5vf_add_migration_pages()
  vfio/virtio: Enable live migration once VIRTIO_PCI was configured
  vfio/virtio: Add PRE_COPY support for live migration
  vfio/virtio: Add support for the basic live migration functionality
  virtio-pci: Introduce APIs to execute device parts admin commands
  virtio: Manage device and driver capabilities via the admin commands
  virtio: Extend the admin command to include the result size
  virtio_pci: Introduce device parts access commands
  Documentation: add debugfs description for hisi migration
  hisi_acc_vfio_pci: register debugfs for hisilicon migration driver
  hisi_acc_vfio_pci: create subfunction for data reading
  hisi_acc_vfio_pci: extract public functions for container_of
  vfio/qat: fix overflow check in qat_vf_resume_write()
  vfio/nvgrace-gpu: Add a new GH200 SKU to the devid table
  kvm/vfio: Constify struct kvm_device_ops
---

4aca98a8a150f3531fea782c3040ada0ad1ce3b6
diff --cc drivers/virtio/virtio_pci_common.h
index 8beecf23ec85e,0d00740cca070..8cd01de27bafe
--- a/drivers/virtio/virtio_pci_common.h
+++ b/drivers/virtio/virtio_pci_common.h
@@@ -173,12 -187,12 +187,13 @@@ struct virtio_device *virtio_pci_vf_get
   * or less by chance. For now, only support legacy IO on X86.
   */
  #ifdef CONFIG_VIRTIO_PCI_ADMIN_LEGACY
- #define VIRTIO_ADMIN_CMD_BITMAP VIRTIO_LEGACY_ADMIN_CMD_BITMAP
+ #define VIRTIO_ADMIN_CMD_BITMAP (VIRTIO_LEGACY_ADMIN_CMD_BITMAP | \
+ 				 VIRTIO_DEV_PARTS_ADMIN_CMD_BITMAP)
  #else
- #define VIRTIO_ADMIN_CMD_BITMAP 0
+ #define VIRTIO_ADMIN_CMD_BITMAP VIRTIO_DEV_PARTS_ADMIN_CMD_BITMAP
  #endif
  
 +bool vp_is_avq(struct virtio_device *vdev, unsigned int index);
  void vp_modern_avq_done(struct virtqueue *vq);
  int vp_modern_admin_cmd_exec(struct virtio_device *vdev,
  			     struct virtio_admin_cmd *cmd);