Hi, This is a third round of patches introducing support for Xe SR-IOV VF migration. Thanks for all the review feedback. On VFIO side, the biggest changes are related to addition of state_mutex, pci_iov_get_pf_drvdata usage and PCI driver match (where we're now using specific device ids). There's also interface change - PF struct xe_device is now used across the entire API between xe-vfio-pci and xe (excluding the wrapper around pci_iov_get_pf_drvdata). On Xe side, the biggest changes are related to PF control state machine, where SAVE and RESTORE states are now symmetric and individual resource handling is now tracked outside of control state machine.
Full changelog can be found below. Cover letter from the previous revision: Xe is a DRM driver supporting Intel GPUs and for SR-IOV capable devices, it enables the creation of SR-IOV VFs. This series adds xe-vfio-pci driver variant that interacts with Xe driver to control VF device state and read/write migration data, allowing it to extend regular vfio-pci functionality with VFIO migration capability. The driver doesn't expose PRE_COPY support, as currently supported hardware lacks the capability to track dirty pages. While Xe driver already had the capability to manage VF device state, management of migration data was something that needed to be implemented and constitutes the majority of the series. The migration data is processed asynchronously by the Xe driver, and is organized into multiple migration data packet types representing the hardware interfaces of the device (GGTT / MMIO / GuC FW / VRAM). Since the VRAM can potentially be larger than available system memory, it is copied in multiple chunks. The metadata needed for migration compatibility decisions is added as part of descriptor packet (currently limited to PCI device ID / revision). Xe driver abstracts away the internals of packet processing and takes care of tracking the position within individual packets. The API exported to VFIO is similar to API exported by VFIO to userspace, a simple .read()/.write(). Note that some of the VF resources are not virtualized (e.g. GGTT - the GFX device global virtual address space). This means that the VF driver needs to be aware that migration has occurred in order to properly relocate (patching or reemiting data that contains references to GGTT addresses) before resuming operation. The code to handle that is already present in upstream Linux and in production VF drivers for other OSes. Links to previous revisions for reference. v1: https://lore.kernel.org/lkml/[email protected]/ v2: https://lore.kernel.org/lkml/[email protected]/ v2 -> v3: * Bind xe-vfio-pci to specific devices instead of using vendor and class (Christoph Hellwig / Jason Gunthorpe) * Don't refer to the driver as "vendor specific" (Christoph) * Use pci_iov_get_pf_drvdata and change the interface to take xe_device (Jason) * Update the RUNNING_P2P comment (Jason / Kevin Tian) * Add state_mutex to protect device state transitions (Kevin) * Implement .error_detected (Kevin) * Drop redundant comments (Kevin) * Explain 1-based indexing and wait_flr_done (Kevin) * Add a missing get_file() (Kevin) * Drop redundant state transitions when p2p is supported (Kevin) * Update run/stop naming to match other drivers (Kevin) * Fix error state handling (Kevin) * Fix SAVE state diagram rendering (Michał Wajdeczko) * Control state machine flipping PROCESS / WAIT logic (Michał Wajdeczko) * Drop GUC / GGTT / MMIO / VRAM from SAVE control state machine * Use devm instead of drmm for migration-related allocations (Michał) * Use GGTT node for size calculations (Michał) * Use mutex guards consistently (Michał) * Fix build break on 32-bit (lkp) * Kernel-doc updates (Michał) * And other, more minor changes v1 -> v2: * Do not require debug flag to support migration on PTL/BMG * Fix PCI class match on VFIO side * Reorganized PF Control state machine (Michał Wajdeczko) * Kerneldoc tidying (Michał Wajdeczko) * Return NULL instead of -ENODATA for produce/consume (Michał Wajdeczko) * guc_buf s/sync/sync_read (Matt Brost) * Squash patch 03 (Matt Brost) * Assert on PM ref instead of taking it (Matt Brost) * Remove CCS completely (Matt Brost) * Return ptr on guc_buf_sync_read (Michał Wajdeczko) * Define default guc_buf size (Michał Wajdeczko) * Drop CONFIG_PCI_IOV=n stubs where not needed (Michał Wajdeczko) * And other, more minor changes Lukasz Laguna (2): drm/xe/pf: Add helper to retrieve VF's LMEM object drm/xe/migrate: Add function to copy of VRAM data in chunks Michał Winiarski (26): drm/xe/pf: Remove GuC version check for migration support drm/xe: Move migration support to device-level struct drm/xe/pf: Convert control state to bitmap drm/xe/pf: Add save/restore control state stubs and connect to debugfs drm/xe/pf: Add data structures and handlers for migration rings drm/xe/pf: Add helpers for migration data allocation / free drm/xe/pf: Add support for encap/decap of bitstream to/from packet drm/xe/pf: Add minimalistic migration descriptor drm/xe/pf: Expose VF migration data size over debugfs drm/xe: Add sa/guc_buf_cache sync interface drm/xe: Allow the caller to pass guc_buf_cache size drm/xe/pf: Increase PF GuC Buffer Cache size and use it for VF migration drm/xe/pf: Remove GuC migration data save/restore from GT debugfs drm/xe/pf: Don't save GuC VF migration data on pause drm/xe/pf: Switch VF migration GuC save/restore to struct migration data drm/xe/pf: Handle GuC migration data as part of PF control drm/xe/pf: Add helpers for VF GGTT migration data handling drm/xe/pf: Handle GGTT migration data as part of PF control drm/xe/pf: Handle MMIO migration data as part of PF control drm/xe/pf: Handle VRAM migration data as part of PF control drm/xe/pf: Add wait helper for VF FLR drm/xe/pf: Enable SR-IOV VF migration drm/xe/pci: Introduce a helper to allow VF access to PF xe_device drm/xe/pf: Export helpers for VFIO drm/intel/pciids: Add match with VFIO override vfio/xe: Add device specific vfio_pci driver variant for Intel graphics MAINTAINERS | 7 + drivers/gpu/drm/xe/Makefile | 4 + drivers/gpu/drm/xe/xe_ggtt.c | 104 ++ drivers/gpu/drm/xe/xe_ggtt.h | 4 + drivers/gpu/drm/xe/xe_ggtt_types.h | 2 + drivers/gpu/drm/xe/xe_gt_sriov_pf.h | 2 + drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c | 78 ++ drivers/gpu/drm/xe/xe_gt_sriov_pf_config.h | 6 + drivers/gpu/drm/xe/xe_gt_sriov_pf_control.c | 599 ++++++++++- drivers/gpu/drm/xe/xe_gt_sriov_pf_control.h | 8 + .../gpu/drm/xe/xe_gt_sriov_pf_control_types.h | 33 +- drivers/gpu/drm/xe/xe_gt_sriov_pf_debugfs.c | 47 - drivers/gpu/drm/xe/xe_gt_sriov_pf_migration.c | 985 ++++++++++++++---- drivers/gpu/drm/xe/xe_gt_sriov_pf_migration.h | 50 +- .../drm/xe/xe_gt_sriov_pf_migration_types.h | 34 +- drivers/gpu/drm/xe/xe_gt_sriov_pf_types.h | 5 +- drivers/gpu/drm/xe/xe_guc.c | 12 +- drivers/gpu/drm/xe/xe_guc_buf.c | 57 +- drivers/gpu/drm/xe/xe_guc_buf.h | 2 + drivers/gpu/drm/xe/xe_migrate.c | 128 ++- drivers/gpu/drm/xe/xe_migrate.h | 8 + drivers/gpu/drm/xe/xe_pci.c | 17 + drivers/gpu/drm/xe/xe_pci.h | 3 + drivers/gpu/drm/xe/xe_sa.c | 21 + drivers/gpu/drm/xe/xe_sa.h | 1 + drivers/gpu/drm/xe/xe_sriov_migration_data.c | 550 ++++++++++ drivers/gpu/drm/xe/xe_sriov_migration_data.h | 37 + drivers/gpu/drm/xe/xe_sriov_pf.c | 5 + drivers/gpu/drm/xe/xe_sriov_pf_control.c | 128 +++ drivers/gpu/drm/xe/xe_sriov_pf_control.h | 5 + drivers/gpu/drm/xe/xe_sriov_pf_debugfs.c | 102 ++ drivers/gpu/drm/xe/xe_sriov_pf_migration.c | 275 +++++ drivers/gpu/drm/xe/xe_sriov_pf_migration.h | 24 + .../gpu/drm/xe/xe_sriov_pf_migration_types.h | 67 ++ drivers/gpu/drm/xe/xe_sriov_pf_types.h | 9 + drivers/gpu/drm/xe/xe_sriov_vfio.c | 248 +++++ drivers/vfio/pci/Kconfig | 2 + drivers/vfio/pci/Makefile | 2 + drivers/vfio/pci/xe/Kconfig | 12 + drivers/vfio/pci/xe/Makefile | 3 + drivers/vfio/pci/xe/main.c | 552 ++++++++++ include/drm/intel/pciids.h | 7 + include/drm/intel/xe_sriov_vfio.h | 30 + 43 files changed, 3948 insertions(+), 327 deletions(-) create mode 100644 drivers/gpu/drm/xe/xe_sriov_migration_data.c create mode 100644 drivers/gpu/drm/xe/xe_sriov_migration_data.h create mode 100644 drivers/gpu/drm/xe/xe_sriov_pf_migration.c create mode 100644 drivers/gpu/drm/xe/xe_sriov_pf_migration.h create mode 100644 drivers/gpu/drm/xe/xe_sriov_pf_migration_types.h create mode 100644 drivers/gpu/drm/xe/xe_sriov_vfio.c create mode 100644 drivers/vfio/pci/xe/Kconfig create mode 100644 drivers/vfio/pci/xe/Makefile create mode 100644 drivers/vfio/pci/xe/main.c create mode 100644 include/drm/intel/xe_sriov_vfio.h -- 2.50.1
