Commit 3cddb79a authored by Niklas Schnelle's avatar Niklas Schnelle Committed by Heiko Carstens
Browse files

s390/pci: fix zpci_bus_link_virtfn() 



We were missing the pci_dev_put() for candidate PFs.  Furhtermore in
discussion with upstream it turns out that somewhat counterintuitively
some common code, in particular the vfio-pci driver, assumes that
pdev->is_virtfn always implies that pdev->physfn is set, i.e. that VFs
are always linked.
While POWER does seem to set pdev->is_virtfn even for unlinked functions
(see comments in arch/powerpc/kernel/eeh.c:eeh_debugfs_break_device())
for now just be safe and only set pdev->is_virtfn on linking.
Also make sure that we only search for parent PFs if the zbus is
multifunction and we thus know the devfn values supplied by firmware
come from the RID.

Fixes: e5794cf1 ("s390/pci: create links between PFs and VFs")
Cc: <stable@vger.kernel.org> # 5.8
Reviewed-by: default avatarPierre Morel <pmorel@linux.ibm.com>
Signed-off-by: default avatarNiklas Schnelle <schnelle@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent fd78c594

arch/s390/pci/pci_bus.c

+15 −10
Original line number Diff line number Diff line
@@ -132,13 +132,14 @@ static int zpci_bus_link_virtfn(struct pci_dev *pdev, 
{

	int rc;



	virtfn->physfn = pci_dev_get(pdev);

	rc = pci_iov_sysfs_link(pdev, virtfn, vfid);

	if (rc) {

		pci_dev_put(pdev);

		virtfn->physfn = NULL;

	if (rc)

		return rc;

	}



	virtfn->is_virtfn = 1;

	virtfn->multifunction = 0;

	virtfn->physfn = pci_dev_get(pdev);



	return 0;

}
@@ -151,9 +152,9 @@ static int zpci_bus_setup_virtfn(struct zpci_bus *zbus, 
	int vfid = vfn - 1; /* Linux' vfid's start at 0 vfn at 1*/

	int rc = 0;



	virtfn->is_virtfn = 1;

	virtfn->multifunction = 0;

	WARN_ON(vfid < 0);

	if (!zbus->multifunction)

		return 0;



	/* If the parent PF for the given VF is also configured in the

	 * instance, it must be on the same zbus.

	 * We can then identify the parent PF by checking what
@@ -165,11 +166,17 @@ static int zpci_bus_setup_virtfn(struct zpci_bus *zbus, 
		zdev = zbus->function[i];

		if (zdev && zdev->is_physfn) {

			pdev = pci_get_slot(zbus->bus, zdev->devfn);

			if (!pdev)

				continue;

			cand_devfn = pci_iov_virtfn_devfn(pdev, vfid);

			if (cand_devfn == virtfn->devfn) {

				rc = zpci_bus_link_virtfn(pdev, virtfn, vfid);

				/* balance pci_get_slot() */

				pci_dev_put(pdev);

				break;

			}

			/* balance pci_get_slot() */

			pci_dev_put(pdev);

		}

	}

	return rc;
@@ -178,8 +185,6 @@ static int zpci_bus_setup_virtfn(struct zpci_bus *zbus, 
static inline int zpci_bus_setup_virtfn(struct zpci_bus *zbus,

		struct pci_dev *virtfn, int vfn)

{

	virtfn->is_virtfn = 1;

	virtfn->multifunction = 0;

	return 0;

}

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE