Skip to content

Commit 9fa44c7

Browse files
committed
s390/pci: Fix zpci_bus_is_isolated_vf() for non-VFs
jira LE-3064 Rebuild_History Non-Buildable kernel-4.18.0-553.53.1.el8_10 commit-author Niklas Schnelle <schnelle@linux.ibm.com> commit 8691abd For non-VFs, zpci_bus_is_isolated_vf() should return false because they aren't VFs. While zpci_iov_find_parent_pf() specifically checks if a function is a VF, it then simply returns that there is no parent. The simplistic check for a parent then leads to these functions being confused with isolated VFs and isolating them on their own domain even if sibling PFs should share the domain. Fix this by explicitly checking if a function is not a VF. Note also that at this point the case where RIDs are ignored is already handled and in this case all PCI functions get isolated by being detected in zpci_bus_is_multifunction_root(). Cc: stable@vger.kernel.org Fixes: 2844ddb ("s390/pci: Fix handling of isolated VFs") Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com> Reviewed-by: Halil Pasic <pasic@linux.ibm.com> Signed-off-by: Vasily Gorbik <gor@linux.ibm.com> (cherry picked from commit 8691abd) Signed-off-by: Jonathan Maple <jmaple@ciq.com>
1 parent 1027f1f commit 9fa44c7

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

arch/s390/pci/pci_bus.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,9 @@ static bool zpci_bus_is_isolated_vf(struct zpci_bus *zbus, struct zpci_dev *zdev
340340
{
341341
struct pci_dev *pdev;
342342

343+
if (!zdev->vfn)
344+
return false;
345+
343346
pdev = zpci_iov_find_parent_pf(zbus, zdev);
344347
if (!pdev)
345348
return true;

0 commit comments

Comments
 (0)