Merge: s390/pci: Fix zpci_bus_is_isolated_vf() for non-VFs

jcfaracco · jcfaracco · commit 3afb4e1cf757 · 2025-05-07T12:36:41.000-03:00
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/829 JIRA: https://issues.redhat.com/browse/RHEL-88818 commit 8691abd Signed-off-by: Mete Durlu <mdurlu@redhat.com> Approved-by: Steve Best <sbest@redhat.com> Approved-by: Tony Camuso <tcamuso@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Julio Faracco <jfaracco@redhat.com>
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -335,6 +335,9 @@ static bool zpci_bus_is_isolated_vf(struct zpci_bus zbus, struct zpci_dev zdev`
`335`	`335`	`{`
`336`	`336`	`struct pci_dev *pdev;`
`337`	`337`
	`338`	`+ if (!zdev->vfn)`
	`339`	`+ return false;`
	`340`	`+`
`338`	`341`	`pdev = zpci_iov_find_parent_pf(zbus, zdev);`
`339`	`342`	`if (!pdev)`
`340`	`343`	`return true;`