Changes in Kconfig

ec496f77b4c11036cc835d6f045fb5e5ef1e6530 - Merge branch 'for-6.20/sony' into for-linus

Mon, 09 Feb 2026 17:33:26 +0100

Merge branch 'for-6.20/sony' into for-linus- Support for Rock band 4 PS4 and PS5 guitars (Rosalie Wanders) List of files: /linux/drivers/vfio/pci/Kconfig

cc4adab164b772a34b3340d644b7c4728498581e - Merge tag 'v6.19-rc1' into msm-next

Tue, 20 Jan 2026 23:06:55 +0100

Merge tag 'v6.19-rc1' into msm-nextMerge Linux 6.19-rc1 in order to catch up with other changes (e.g. UBWCconfig database defining UBWC_6).Signed-off-by: Dmitry Baryshkov List of files: /linux/drivers/vfio/pci/Kconfig

5add3c3c280a35f7e258e9cef7607db5a2e56fdc - Merge drm/drm-next into drm-xe-next

Fri, 19 Dec 2025 11:51:22 +0100

Merge drm/drm-next into drm-xe-nextBackmerging to bring in 6.19-rc1. An important upstream bugfix andto help unblock PTL CI.Signed-off-by: Thomas Hellström List of files: /linux/drivers/vfio/pci/Kconfig

ec439c38013550420aecc15988ae6acb670838c1 - Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf after 6.19-rc1

Wed, 17 Dec 2025 06:29:38 +0100

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf after 6.19-rc1Cross-merge BPF and other fixes after downstream PR.Signed-off-by: Alexei Starovoitov List of files: /linux/drivers/vfio/pci/Kconfig

b8304863a3990d0f18c38e5b94191830a63ee1af - Merge drm/drm-next into drm-intel-next

Mon, 15 Dec 2025 14:24:02 +0100

Merge drm/drm-next into drm-intel-nextSync-up some display code needed for Async flips refactor.Signed-off-by: Rodrigo Vivi List of files: /linux/drivers/vfio/pci/Kconfig

7f790dd21a931c61167f7bdc327aecf2cebad327 - Merge drm/drm-next into drm-misc-next

Mon, 15 Dec 2025 09:27:39 +0100

Merge drm/drm-next into drm-misc-nextLet's kickstart the v6.20 (7.0?) release cycle.Signed-off-by: Maxime Ripard List of files: /linux/drivers/vfio/pci/Kconfig

6d87d7c69b5a1136d7c354911f1fe7792b6a40fd - Merge drm/drm-next into drm-intel-next

Fri, 05 Dec 2025 09:29:22 +0100

Merge drm/drm-next into drm-intel-nextBackmerge to get the topic/drm-intel-plane-color-pipeline branchcontents.Signed-off-by: Jani Nikula List of files: /linux/drivers/vfio/pci/Kconfig

2e38c50ae4929f0b954fee69d428db7121452867 - vfio/xe: Add device specific vfio_pci driver variant for Intel graphics

Thu, 27 Nov 2025 10:39:34 +0100

vfio/xe: Add device specific vfio_pci driver variant for Intel graphicsIn addition to generic VFIO PCI functionality, the driver implementsVFIO migration uAPI, allowing userspace to enable migration for IntelGraphics SR-IOV Virtual Functions.The driver binds to VF device and uses API exposed by Xe driver totransfer the VF migration data under the control of PF device.Acked-by: Rodrigo Vivi Reviewed-by: Kevin Tian Reviewed-by: Alex Williamson Link: https://patch.msgid.link/20251127093934.1462188-5-michal.winiarski@intel.comSigned-off-by: Michał Winiarski List of files: /linux/drivers/vfio/pci/Kconfig

24f171c7e145f43b9f187578e89b0982ce87e54c - Merge tag 'asoc-fix-v6.19-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

Sun, 21 Dec 2025 11:11:11 +0100

Merge tag 'asoc-fix-v6.19-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linusASoC: Fixes for v6.19We've been quite busy with fixes since the merge window, though not inany particularly exciting ways - the standout thing is the fix for _SXcontrols which were broken by a change to how we do clamping, otherwiseit's all fairly run of the mill fixes and quirks. List of files: /linux/drivers/vfio/pci/Kconfig

84318277d6334c6981ab326d4acc87c6a6ddc9b8 - Merge remote-tracking branch 'drm/drm-fixes' into drm-misc-fixes

Mon, 15 Dec 2025 12:53:27 +0100

Merge remote-tracking branch 'drm/drm-fixes' into drm-misc-fixesPull in rc1 to include all changes since the merge window closed,and grab all fixes and changes from drm/drm-next.Signed-off-by: Maarten Lankhorst List of files: /linux/drivers/vfio/pci/Kconfig

deb879faa9d2f327ac5c079d9d1a1747b79260e3 - Merge tag 'drm-next-2025-12-05' of https://gitlab.freedesktop.org/drm/kernel

Fri, 05 Dec 2025 04:42:53 +0100

Merge tag 'drm-next-2025-12-05' of https://gitlab.freedesktop.org/drm/kernelPull more drm updates from Dave Airlie: "There was some additional intel code for color operations we wanted to land. However I discovered I missed a pull for the xe vfio driver which I had sorted into 6.20 in my brain, until Thomas mentioned it. This contains the xe vfio code, a bunch of xe fixes that were waiting and the i915 color management support. I'd like to include it as part of keeping the two main vendors on the same page and giving a good cross-driver experience for userspace when it starts using it. vfio: - add a vfio_pci variant driver for Intel xe/i915 display: - add plane color management support xe: - Add scope-based cleanup helper for runtime PM - vfio xe driver prerequisites and exports - fix vfio link error - Fix a memory leak - Fix a 64-bit division - vf migration fix - LRC pause fix"* tag 'drm-next-2025-12-05' of https://gitlab.freedesktop.org/drm/kernel: (25 commits) drm/i915/color: Enable Plane Color Pipelines drm/i915/color: Add 3D LUT to color pipeline drm/i915/color: Add registers for 3D LUT drm/i915/color: Program Plane Post CSC Registers drm/i915/color: Program Pre-CSC registers drm/i915/color: Add framework to program PRE/POST CSC LUT drm/i915: Add register definitions for Plane Post CSC drm/i915: Add register definitions for Plane Degamma drm/i915/color: Add plane CTM callback for D12 and beyond drm/i915/color: Preserve sign bit when int_bits is Zero drm/i915/color: Add framework to program CSC drm/i915/color: Create a transfer function color pipeline drm/i915/color: Add helper to create intel colorop drm/i915: Add intel_color_op drm/i915/display: Add identifiers for driver specific blocks drm/xe/pf: fix VFIO link error drm/xe: Protect against unset LRC when pausing submissions drm/xe/vf: Start re-emission from first unsignaled job during VF migration drm/xe/pf: Use div_u64 when calculating GGTT profile drm/xe: Fix memory leak when handling pagefault vma ... List of files: /linux/drivers/vfio/pci/Kconfig

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

Fri, 05 Dec 2025 03:42:48 +0100

Merge tag 'vfio-v6.19-rc1' of https://github.com/awilliam/linux-vfioPull VFIO updates from Alex Williamson: - Move libvfio selftest artifacts in preparation of more tightly coupled integration with KVM selftests (David Matlack) - Fix comment typo in mtty driver (Chu Guangqing) - Support for new hardware revision in the hisi_acc vfio-pci variant driver where the migration registers can now be accessed via the PF. When enabled for this support, the full BAR can be exposed to the user (Longfang Liu) - Fix vfio cdev support for VF token passing, using the correct size for the kernel structure, thereby actually allowing userspace to provide a non-zero UUID token. Also set the match token callback for the hisi_acc, fixing VF token support for this this vfio-pci variant driver (Raghavendra Rao Ananta) - Introduce internal callbacks on vfio devices to simplify and consolidate duplicate code for generating VFIO_DEVICE_GET_REGION_INFO data, removing various ioctl intercepts with a more structured solution (Jason Gunthorpe) - Introduce dma-buf support for vfio-pci devices, allowing MMIO regions to be exposed through dma-buf objects with lifecycle managed through move operations. This enables low-level interactions such as a vfio-pci based SPDK drivers interacting directly with dma-buf capable RDMA devices to enable peer-to-peer operations. IOMMUFD is also now able to build upon this support to fill a long standing feature gap versus the legacy vfio type1 IOMMU backend with an implementation of P2P support for VM use cases that better manages the lifecycle of the P2P mapping (Leon Romanovsky, Jason Gunthorpe, Vivek Kasireddy) - Convert eventfd triggering for error and request signals to use RCU mechanisms in order to avoid a 3-way lockdep reported deadlock issue (Alex Williamson) - Fix a 32-bit overflow introduced via dma-buf support manifesting with large DMA buffers (Alex Mastro) - Convert nvgrace-gpu vfio-pci variant driver to insert mappings on fault rather than at mmap time. This conversion serves both to make use of huge PFNMAPs but also to both avoid corrected RAS events during reset by now being subject to vfio-pci-core's use of unmap_mapping_range(), and to enable a device readiness test after reset (Ankit Agrawal) - Refactoring of vfio selftests to support multi-device tests and split code to provide better separation between IOMMU and device objects. This work also enables a new test suite addition to measure parallel device initialization latency (David Matlack)* tag 'vfio-v6.19-rc1' of https://github.com/awilliam/linux-vfio: (65 commits) vfio: selftests: Add vfio_pci_device_init_perf_test vfio: selftests: Eliminate INVALID_IOVA vfio: selftests: Split libvfio.h into separate header files vfio: selftests: Move vfio_selftests_*() helpers into libvfio.c vfio: selftests: Rename vfio_util.h to libvfio.h vfio: selftests: Stop passing device for IOMMU operations vfio: selftests: Move IOVA allocator into iova_allocator.c vfio: selftests: Move IOMMU library code into iommu.c vfio: selftests: Rename struct vfio_dma_region to dma_region vfio: selftests: Upgrade driver logging to dev_err() vfio: selftests: Prefix logs with device BDF where relevant vfio: selftests: Eliminate overly chatty logging vfio: selftests: Support multiple devices in the same container/iommufd vfio: selftests: Introduce struct iommu vfio: selftests: Rename struct vfio_iommu_mode to iommu_mode vfio: selftests: Allow passing multiple BDFs on the command line vfio: selftests: Split run.sh into separate scripts vfio: selftests: Move run.sh into scripts directory vfio/nvgrace-gpu: wait for the GPU mem to be ready vfio/nvgrace-gpu: Inform devmem unmapped after reset ... List of files: /linux/drivers/vfio/pci/Kconfig

55a271a0f7e073032e9c8b1c1e30916d90be5a8a - Merge tag 'topic/xe-vfio-2025-12-01' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next

Fri, 05 Dec 2025 01:16:14 +0100

Merge tag 'topic/xe-vfio-2025-12-01' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-nextCross-subsystem Changes:- Add device specific vfio_pci driver variant for intel graphics (Michal Winiarski)Driver Changes:- Add scope-based cleanup helper for runtime PM (Matt Roper)- Additional xe driver prerequisites and exports (Michal Winiarski)Signed-off-by: Dave Airlie From: Thomas Hellstrom Link: https://patch.msgid.link/aS1bNpqeem6PIHrA@fedora List of files: /linux/drivers/vfio/pci/Kconfig

1f5556ec8b9efbb784aeb3536e147182dee73d0f - vfio/xe: Add device specific vfio_pci driver variant for Intel graphics

Thu, 27 Nov 2025 10:39:34 +0100

vfio/xe: Add device specific vfio_pci driver variant for Intel graphicsIn addition to generic VFIO PCI functionality, the driver implementsVFIO migration uAPI, allowing userspace to enable migration for IntelGraphics SR-IOV Virtual Functions.The driver binds to VF device and uses API exposed by Xe driver totransfer the VF migration data under the control of PF device.Acked-by: Rodrigo Vivi Reviewed-by: Kevin Tian Reviewed-by: Alex Williamson Link: https://patch.msgid.link/20251127093934.1462188-5-michal.winiarski@intel.comLink: https://lore.kernel.org/all/20251128125322.34edbeaf.alex@shazbot.org/Signed-off-by: Michał Winiarski (cherry picked from commit 2e38c50ae4929f0b954fee69d428db7121452867)Signed-off-by: Thomas Hellström List of files: /linux/drivers/vfio/pci/Kconfig

5185c4d8a56b34f33cec574793047fcd2dba2055 - Merge branch 'iommufd_dmabuf' into k.o-iommufd/for-next

Tue, 25 Nov 2025 17:46:52 +0100

Merge branch 'iommufd_dmabuf' into k.o-iommufd/for-nextJason Gunthorpe says:====================This series is the start of adding full DMABUF support toiommufd. Currently it is limited to only work with VFIO's DMABUF exporter.It sits on top of Leon's series to add a DMABUF exporter to VFIO: https://lore.kernel.org/all/20251120-dmabuf-vfio-v9-0-d7f71607f371@nvidia.com/The existing IOMMU_IOAS_MAP_FILE is enhanced to detect DMABUF fd's, butotherwise works the same as it does today for a memfd. The user can selecta slice of the FD to map into the ioas and if the underliyng alignmentrequirements are met it will be placed in the iommu_domain.Though limited, it is enough to allow a VMM like QEMU to connect MMIO BARmemory from VFIO to an iommu_domain controlled by iommufd. This is usedfor PCI Peer to Peer support in VMs, and is the last feature that the VFIOtype 1 container has that iommufd couldn't do.The VFIO type1 version extracts raw PFNs from VMAs, which has no lifetimecontrol and is a use-after-free security problem.Instead iommufd relies on revokable DMABUFs. Whenever VFIO thinks thereshould be no access to the MMIO it can shoot down the mapping in iommufdwhich will unmap it from the iommu_domain. There is no automatic remap,this is a safety protocol so the kernel doesn't get stuck. Userspace isexpected to know it is doing something that will revoke the dmabuf andmap/unmap it around the activity. Eg when QEMU goes to issue FLR it shoulddo the map/unmap to iommufd.Since DMABUF is missing some key general features for this use case itrelies on a "private interconnect" between VFIO and iommufd via thevfio_pci_dma_buf_iommufd_map() call.The call confirms the DMABUF has revoke semantics and delivers a phys_addrfor the memory suitable for use with iommu_map().Medium term there is a desire to expand the supported DMABUFs to includeGPU drivers to support DPDK/SPDK type use cases so future series will workto add a general concept of revoke and a general negotiation ofinterconnect to remove vfio_pci_dma_buf_iommufd_map().I also plan another series to modify iommufd's vfio_compat totransparently pull a dmabuf out of a VFIO VMA to emulate more of the uAPIof type1.The latest series for interconnect negotation to exchange a phys_addr is: https://lore.kernel.org/r/20251027044712.1676175-1-vivek.kasireddy@intel.comAnd the discussion for design of revoke is here: https://lore.kernel.org/dri-devel/20250114173103.GE5556@nvidia.com/====================Based on a shared branch with vfio.* iommufd_dmabuf: iommufd/selftest: Add some tests for the dmabuf flow iommufd: Accept a DMABUF through IOMMU_IOAS_MAP_FILE iommufd: Have iopt_map_file_pages convert the fd to a file iommufd: Have pfn_reader process DMABUF iopt_pages iommufd: Allow MMIO pages in a batch iommufd: Allow a DMABUF to be revoked iommufd: Do not map/unmap revoked DMABUFs iommufd: Add DMABUF to iopt_pages vfio/pci: Add vfio_pci_dma_buf_iommufd_map() vfio/nvgrace: Support get_dmabuf_phys vfio/pci: Add dma-buf export support for MMIO regions vfio/pci: Enable peer-to-peer DMA transactions by default vfio/pci: Share the core device pointer while invoking feature functions vfio: Export vfio device get and put registration helpers dma-buf: provide phys_vec to scatter-gather mapping routine PCI/P2PDMA: Document DMABUF model PCI/P2PDMA: Provide an access to pci_p2pdma_map_type() function PCI/P2PDMA: Refactor to separate core P2P functionality from memory allocation PCI/P2PDMA: Simplify bus address mapping API PCI/P2PDMA: Separate the mmap() support from the core logicSigned-off-by: Jason Gunthorpe List of files: /linux/drivers/vfio/pci/Kconfig

fa804aa4ac1b091ef2ec2981f08a1c28aaeba8e7 - Merge tag 'vfio-v6.19-dma-buf-v9+' into v6.19/vfio/next

Fri, 21 Nov 2025 05:20:00 +0100

Merge tag 'vfio-v6.19-dma-buf-v9+' into v6.19/vfio/next[v9] vfio/pci: Allow MMIO regions to be exported through dma-bufhttps://lore.kernel.org/all/20251120-dmabuf-vfio-v9-0-d7f71607f371@nvidia.comSigned-off-by: Alex Williamson List of files: /linux/drivers/vfio/pci/Kconfig

5d74781ebc86c5fa9e9d6934024c505412de9b52 - vfio/pci: Add dma-buf export support for MMIO regions

Thu, 20 Nov 2025 10:28:29 +0100

vfio/pci: Add dma-buf export support for MMIO regionsAdd support for exporting PCI device MMIO regions through dma-buf,enabling safe sharing of non-struct page memory with controlledlifetime management. This allows RDMA and other subsystems to importdma-buf FDs and build them into memory regions for PCI P2P operations.The implementation provides a revocable attachment mechanism usingdma-buf move operations. MMIO regions are normally pinned as BARsdon't change physical addresses, but access is revoked when the VFIOdevice is closed or a PCI reset is issued. This ensures kernelself-defense against potentially hostile userspace.Currently VFIO can take MMIO regions from the device's BAR and mapthem into a PFNMAP VMA with special PTEs. This mapping type ensuresthe memory cannot be used with things like pin_user_pages(), hmm, andso on. In practice only the user process CPU and KVM can safely makeuse of these VMA. When VFIO shuts down these VMAs are cleaned byunmap_mapping_range() to prevent any UAF of the MMIO beyond driverunbind.However, VFIO type 1 has an insecure behavior where it usesfollow_pfnmap_*() to fish a MMIO PFN out of a VMA and program it backinto the IOMMU. This has a long history of enabling P2P DMA insideVMs, but has serious lifetime problems by allowing a UAF of the MMIOafter the VFIO driver has been unbound.Introduce DMABUF as a new safe way to export a FD based handle for theMMIO regions. This can be consumed by existing DMABUF importers likeRDMA or DRM without opening an UAF. A following series will add animporter to iommufd to obsolete the type 1 code and allow safeUAF-free MMIO P2P in VM cases.DMABUF has a built in synchronous invalidation mechanism calledmove_notify. VFIO keeps track of all drivers importing its MMIO andcan invoke a synchronous invalidation callback to tell the importingdrivers to DMA unmap and forget about the MMIO pfns. This process isbeing called revoke. This synchronous invalidation fully prevents anylifecycle problems. VFIO will do this before unbinding its driverensuring there is no UAF of the MMIO beyond the driver lifecycle.Further, VFIO has additional behavior to block access to the MMIOduring things like Function Level Reset. This is because some poorplatforms may experience a MCE type crash when touching MMIO of a PCIdevice that is undergoing a reset. Today this is done by usingunmap_mapping_range() on the VMAs. Extend that into the DMABUF worldand temporarily revoke the MMIO from the DMABUF importers during FLRas well. This will more robustly prevent an errant P2P from possiblyupsetting the platform.A DMABUF FD is a preferred handle for MMIO compared to using somethinglike a pgmap because: - VFIO is supported, including its P2P feature, on archs that don't support pgmap - PCI devices have all sorts of BAR sizes, including ones smaller than a section so a pgmap cannot always be created - It is undesirable to waste a lot of memory for struct pages, especially for a case like a GPU with ~100GB of BAR size - We want a synchronous revoke semantic to support FLR with light hardware requirementsUse the P2P subsystem to help generate the DMA mapping. This is asignificant upgrade over the abuse of dma_map_resource() that hashistorically been used by DMABUF exporters. Experience with an OOTversion of this patch shows that real systems do need this. Thisapproach deals with all the P2P scenarios: - Non-zero PCI bus_offset - ACS flags routing traffic to the IOMMU - ACS flags that bypass the IOMMU - though vfio noiommu is required to hit this.There will be further work to formalize the revoke semantic inDMABUF. For now this acts like a move_notify dynamic exporter whereimporter fault handling will get a failure when they attempt to map.This means that only fully restartable fault capable importers canimport the VFIO DMABUFs. A future revoke semantic should open this upto more HW as the HW only needs to invalidate, not handle restartablefaults.Signed-off-by: Jason Gunthorpe Signed-off-by: Vivek Kasireddy Reviewed-by: Kevin Tian Signed-off-by: Leon Romanovsky Acked-by: Ankit Agrawal Link: https://lore.kernel.org/r/20251120-dmabuf-vfio-v9-10-d7f71607f371@nvidia.comSigned-off-by: Alex Williamson List of files: /linux/drivers/vfio/pci/Kconfig

f088104d837a991c65e51fa30bb4196169b3244d - Merge drm/drm-next into drm-intel-gt-next

Tue, 16 Sep 2025 12:53:20 +0200

Merge drm/drm-next into drm-intel-gt-nextBackmerge in order to get the commit: 048832a3f400 ("drm/i915: Refactor shmem_pwrite() to use kiocb and write_iter")To drm-intel-gt-next as there are followup fixes to be applied.Signed-off-by: Joonas Lahtinen List of files: /linux/drivers/vfio/pci/Kconfig

ab93e0dd72c37d378dd936f031ffb83ff2bd87ce - Merge branch 'next' into for-linus

Wed, 06 Aug 2025 19:08:54 +0200

Merge branch 'next' into for-linusPrepare input updates for 6.17 merge window. List of files: /linux/drivers/vfio/pci/Kconfig

a7bee4e7f78089c101be2ad51f4b5ec64782053e - Merge tag 'ib-mfd-gpio-input-pwm-v6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into next

Mon, 04 Aug 2025 08:28:48 +0200

Merge tag 'ib-mfd-gpio-input-pwm-v6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into nextMerge an immutable branch between MFD, GPIO, Input and PWM to resolveconflicts for the merge window pull request. List of files: /linux/drivers/vfio/pci/Kconfig