Commit 55a42f78 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull VFIO updates from Alex Williamson:

 - Use fdinfo to expose the sysfs path of a device represented by a vfio
   device file (Alex Mastro)

 - Mark vfio-fsl-mc, vfio-amba, and the reset functions for
   vfio-platform for removal as these are either orphaned or believed to
   be unused (Alex Williamson)

 - Add reviewers for vfio-platform to save it from also being marked for
   removal (Mostafa Saleh, Pranjal Shrivastava)

 - VFIO selftests, including basic sanity testing and minimal userspace
   drivers for testing against real hardware. This is also expected to
   provide integration with KVM selftests for KVM-VFIO interfaces (David
   Matlack, Josh Hilke)

 - Fix drivers/cdx and vfio/cdx to build without CONFIG_GENERIC_MSI_IRQ
   (Nipun Gupta)

 - Fix reference leak in hisi_acc (Miaoqian Lin)

 - Use consistent return for unsupported device feature (Alex Mastro)

 - Unwind using the correct memory free callback in vfio/pds (Zilin
   Guan)

 - Use IRQ_DISABLE_LAZY flag to improve handling of pre-PCI2.3 INTx and
   resolve stalled interrupt on ppc64 (Timothy Pearson)

 - Enable GB300 in nvgrace-gpu vfio-pci variant driver (Tushar Dave)

 - Misc:
    - Drop unnecessary ternary conversion in vfio/pci (Xichao Zhao)
    - Grammatical fix in nvgrace-gpu (Morduan Zang)
    - Update Shameer's email address (Shameer Kolothum)
    - Fix document build warning (Alex Williamson)

* tag 'vfio-v6.18-rc1' of https://github.com/awilliam/linux-vfio: (48 commits)
  vfio/nvgrace-gpu: Add GB300 SKU to the devid table
  vfio/pci: Fix INTx handling on legacy non-PCI 2.3 devices
  vfio/pds: replace bitmap_free with vfree
  vfio: return -ENOTTY for unsupported device feature
  hisi_acc_vfio_pci: Fix reference leak in hisi_acc_vfio_debug_init
  vfio/platform: Mark reset drivers for removal
  vfio/amba: Mark for removal
  MAINTAINERS: Add myself as VFIO-platform reviewer
  MAINTAINERS: Add myself as VFIO-platform reviewer
  docs: proc.rst: Fix VFIO Device title formatting
  vfio: selftests: Fix .gitignore for already tracked files
  vfio/cdx: update driver to build without CONFIG_GENERIC_MSI_IRQ
  cdx: don't select CONFIG_GENERIC_MSI_IRQ
  MAINTAINERS: Update Shameer Kolothum's email address
  vfio: selftests: Add a script to help with running VFIO selftests
  vfio: selftests: Make iommufd the default iommu_mode
  vfio: selftests: Add iommufd mode
  vfio: selftests: Add iommufd_compat_type1{,v2} modes
  vfio: selftests: Add vfio_type1v2_mode
  vfio: selftests: Replicate tests across all iommu_modes
  ...
parents cbf33b8e 407aa630

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -711,6 +711,7 @@ Sergey Senozhatsky <senozhatsky@chromium.org> <sergey.senozhatsky@mail.by> 
Sergey Senozhatsky <senozhatsky@chromium.org> <senozhatsky@google.com>

Seth Forshee <sforshee@kernel.org> <seth.forshee@canonical.com>

Shakeel Butt <shakeel.butt@linux.dev> <shakeelb@google.com>

Shameer Kolothum <skolothumtho@nvidia.com> <shameerali.kolothum.thodi@huawei.com>

Shannon Nelson <sln@onemain.com> <shannon.nelson@amd.com>

Shannon Nelson <sln@onemain.com> <snelson@pensando.io>

Shannon Nelson <sln@onemain.com> <shannon.nelson@intel.com>

Documentation/filesystems/proc.rst

+14 −0
Original line number Diff line number Diff line
@@ -2159,6 +2159,20 @@ DMA Buffer files 
where 'size' is the size of the DMA buffer in bytes. 'count' is the file count of

the DMA buffer file. 'exp_name' is the name of the DMA buffer exporter.



VFIO Device files

~~~~~~~~~~~~~~~~~



::



	pos:    0

	flags:  02000002

	mnt_id: 17

	ino:    5122

	vfio-device-syspath: /sys/devices/pci0000:e0/0000:e0:01.1/0000:e1:00.0/0000:e2:05.0/0000:e8:00.0



where 'vfio-device-syspath' is the sysfs path corresponding to the VFIO device

file.



3.9	/proc/<pid>/map_files - Information about memory mapped files

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

This directory contains symbolic links which represent memory mapped files

MAINTAINERS

+11 −3
Original line number Diff line number Diff line
@@ -26793,15 +26793,15 @@ F: drivers/vfio/ 
F:	include/linux/vfio.h

F:	include/linux/vfio_pci_core.h

F:	include/uapi/linux/vfio.h

F:	tools/testing/selftests/vfio/









VFIO FSL-MC DRIVER









L:	kvm@vger.kernel.org









S:	Orphan









S:	Obsolete









F:	drivers/vfio/fsl-mc/

















VFIO HISILICON PCI DRIVER









M:	Longfang Liu <liulongfang@huawei.com>









M:	Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>









L:	kvm@vger.kernel.org









S:	Maintained









F:	drivers/vfio/pci/hisilicon/








@@ -26830,7 +26830,7 @@ F:	drivers/vfio/pci/nvgrace-gpu/







VFIO PCI DEVICE SPECIFIC DRIVERS









R:	Jason Gunthorpe <jgg@nvidia.com>









R:	Yishai Hadas <yishaih@nvidia.com>









R:	Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>









R:	Shameer Kolothum <skolothumtho@nvidia.com>









R:	Kevin Tian <kevin.tian@intel.com>









L:	kvm@vger.kernel.org









S:	Maintained








@@ -26846,6 +26846,8 @@ F:	drivers/vfio/pci/pds/















VFIO PLATFORM DRIVER









M:	Eric Auger <eric.auger@redhat.com>









R:	Mostafa Saleh <smostafa@google.com>









R:	Pranjal Shrivastava <praan@google.com>









L:	kvm@vger.kernel.org









S:	Maintained









F:	drivers/vfio/platform/








@@ -26857,6 +26859,12 @@ L:	qat-linux@intel.com







S:	Supported









F:	drivers/vfio/pci/qat/

















VFIO SELFTESTS









M:	David Matlack <dmatlack@google.com>









L:	kvm@vger.kernel.org









S:	Maintained









F:	tools/testing/selftests/vfio/

















VFIO VIRTIO PCI DRIVER









M:	Yishai Hadas <yishaih@nvidia.com>









L:	kvm@vger.kernel.org

























drivers/cdx/Kconfig



+0
−1






























Original line number
Diff line number
Diff line







@@ -8,7 +8,6 @@







config CDX_BUS









	bool "CDX Bus driver"









	depends on OF && ARM64 || COMPILE_TEST









	select GENERIC_MSI_IRQ









	help









	  Driver to enable Composable DMA Transfer(CDX) Bus. CDX bus









	  exposes Fabric devices which uses composable DMA IP to the
































drivers/cdx/cdx.c



+2
−2






























Original line number
Diff line number
Diff line







@@ -310,7 +310,7 @@ static int cdx_probe(struct device *dev)







	 * Setup MSI device data so that generic MSI alloc/free can









	 * be used by the device driver.









	 */









	if (cdx->msi_domain) {









	if (IS_ENABLED(CONFIG_GENERIC_MSI_IRQ) && cdx->msi_domain) {









		error = msi_setup_device_data(&cdx_dev->dev);









		if (error)









			return error;








@@ -833,7 +833,7 @@ int cdx_device_add(struct cdx_dev_params *dev_params)







		     ((cdx->id << CDX_CONTROLLER_ID_SHIFT) | (cdx_dev->bus_num & CDX_BUS_NUM_MASK)),









		     cdx_dev->dev_num);



















	if (cdx->msi_domain) {









	if (IS_ENABLED(CONFIG_GENERIC_MSI_IRQ) && cdx->msi_domain) {









		cdx_dev->num_msi = dev_params->num_msi;









		dev_set_msi_domain(&cdx_dev->dev, cdx->msi_domain);









	}