Commit b6cd1705 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'vfio-v6.6-rc4' of https://github.com/awilliam/linux-vfio 

Pull VFIO fixes from Alex Williamson:

 - The new PDS vfio-pci variant driver only supports SR-IOV VF devices
   and incorrectly made a direct reference to the physfn field of the
   pci_dev.  Fix this both by making the Kconfig depend on IOV support
   as well as using the correct wrapper for this access (Shixiong Ou)

 - Resolve an error path issue where on unwind of the mdev registration
   the created kset is not unregistered and the wrong error code is
   returned (Jinjie Ruan)

* tag 'vfio-v6.6-rc4' of https://github.com/awilliam/linux-vfio:
  vfio/mdev: Fix a null-ptr-deref bug for mdev_unregister_parent()
  vfio/pds: Use proper PF device access helper
  vfio/pds: Add missing PCI_IOV depends
parents 0e945134 c777b11d

drivers/vfio/mdev/mdev_sysfs.c

+2 −1
Original line number Diff line number Diff line
@@ -233,7 +233,8 @@ int parent_create_sysfs_files(struct mdev_parent *parent) 
out_err:

	while (--i >= 0)

		mdev_type_remove(parent->types[i]);

	return 0;

	kset_unregister(parent->mdev_types_kset);

	return ret;

}



static ssize_t remove_store(struct device *dev, struct device_attribute *attr,

drivers/vfio/pci/pds/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 


config PDS_VFIO_PCI

	tristate "VFIO support for PDS PCI devices"

	depends on PDS_CORE

	depends on PDS_CORE && PCI_IOV

	select VFIO_PCI_CORE

	help

	  This provides generic PCI support for PDS devices using the VFIO

drivers/vfio/pci/pds/vfio_dev.c

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ static int pds_vfio_init_device(struct vfio_device *vdev) 
	pci_id = PCI_DEVID(pdev->bus->number, pdev->devfn);

	dev_dbg(&pdev->dev,

		"%s: PF %#04x VF %#04x vf_id %d domain %d pds_vfio %p\n",

		__func__, pci_dev_id(pdev->physfn), pci_id, vf_id,

		__func__, pci_dev_id(pci_physfn(pdev)), pci_id, vf_id,

		pci_domain_nr(pdev->bus), pds_vfio);



	return 0;