From c7ec6999e3646c5797f49f00afcb36281fd521e3 Mon Sep 17 00:00:00 2001 From: Niklas Schnelle Date: Mon, 26 May 2025 22:45:04 +0800 Subject: [PATCH] s390/pci: Fix zpci_bus_is_isolated_vf() for non-VFs BugLink: https://bugs.launchpad.net/bugs/2111599 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: 2844ddbd540f ("s390/pci: Fix handling of isolated VFs") Signed-off-by: Niklas Schnelle Reviewed-by: Halil Pasic Signed-off-by: Vasily Gorbik (cherry picked from commit 8691abd3afaadd816a298503ec1a759df1305d2e) Signed-off-by: Zixing Liu Acked-by: Massimiliano Pellizzer Acked-by: Stefan Bader Signed-off-by: Mehmet Basaran --- arch/s390/pci/pci_bus.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/s390/pci/pci_bus.c b/arch/s390/pci/pci_bus.c index c38546829345..23c27c632013 100644 --- a/arch/s390/pci/pci_bus.c +++ b/arch/s390/pci/pci_bus.c @@ -335,6 +335,9 @@ static bool zpci_bus_is_isolated_vf(struct zpci_bus *zbus, struct zpci_dev *zdev { struct pci_dev *pdev; + if (!zdev->vfn) + return false; + pdev = zpci_iov_find_parent_pf(zbus, zdev); if (!pdev) return true;