Skip to contentSkip to conversation

VFIO updates for v7.1-rc1 (part 2)

GIT PULL Merged Alex Williamson 2 participants 2 messages Apr 22 – Apr 23 KVM

lore
Share & tools
lore
#0 lore raw

Hi Linus,

Predominantly fixes here on top of the previously merged feature pull, but hoping this can land in rc1 as well. Thanks,

Alex

The following changes since commit 4ee64205ffaa587e8114d84a67ac721399ccb369:

Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux (2026-04-21 08:33:26 -0700)

are available in the Git repository at:

https://github.com/awilliam/linux-vfio.git tags/vfio-v7.1-rc1-pt2

for you to fetch changes up to 30471982cd667972ba93ce894765d4b8544958e6:

vfio/cdx: Consolidate MSI configured state onto cdx_irqs (2026-04-21 12:01:22 -0600)

----------------------------------------------------------------
VFIO updates for v7.1-rc1 (part 2)

- Fix ordering of dma-buf cleanup versus device disabling in vfio-pci. (Matt Evans)

- Resolve an inconsistent and incorrect use of spinlock-irq in the virtio vfio-pci variant by conversion to mutex and proceed to modernize and simplify driver with use of guards. (Alex Williamson)

- Resurrect the removal of the remaining class_create() call in vfio, replacing with const struct class and class_register(). (Jori Koolstra, Alex Williamson)

- Fix NULL pointer dereference, properly serialize interrupt setup, and cleanup interrupt state tracking in the cdx vfio bus driver. (Prasanna Kumar T S M, Alex Williamson)

----------------------------------------------------------------
Alex Williamson (7):
vfio/virtio: Convert list_lock from spinlock to mutex vfio/virtio: Use guard() for list_lock where applicable vfio/virtio: Use guard() for migf->lock where applicable vfio/virtio: Use guard() for bar_mutex in legacy I/O
vfio: replace vfio->device_class with a const struct class vfio/cdx: Serialize VFIO_DEVICE_SET_IRQS with a per-device mutex vfio/cdx: Consolidate MSI configured state onto cdx_irqs

Matt Evans (1):
vfio/pci: Clean up DMABUFs before disabling function

Prasanna Kumar T S M (1):
vfio/cdx: Fix NULL pointer dereference in interrupt trigger path

 drivers/vfio/cdx/intr.c             | 38 ++++++++--------
 drivers/vfio/cdx/main.c             | 19 ++++++++
 drivers/vfio/cdx/private.h          |  4 +-
 drivers/vfio/device_cdev.c          |  8 +---
 drivers/vfio/pci/vfio_pci_core.c    |  4 +-
 drivers/vfio/pci/virtio/common.h    |  2 +-
 drivers/vfio/pci/virtio/legacy_io.c | 17 ++++---
 drivers/vfio/pci/virtio/migrate.c   | 90 +++++++++++++++----------------------
 drivers/vfio/vfio.h                 |  4 +-
 drivers/vfio/vfio_main.c            | 27 ++++++-----
 10 files changed, 107 insertions(+), 106 deletions(-)