From: Niklas Schnelle <schnelle@linux.ibm.com>
To: Gerd Bayer <gbayer@linux.ibm.com>,
Matthew Rosato <mjrosato@linux.ibm.com>,
Farhan Ali <alifm@linux.ibm.com>,
Benjamin Block <bblock@linux.ibm.com>,
Julian Ruess <julianr@linux.ibm.com>
Cc: Heiko Carstens <hca@linux.ibm.com>,
Vasily Gorbik <gor@linux.ibm.com>,
Alexander Gordeev <agordeev@linux.ibm.com>,
Sven Schnelle <svens@linux.ibm.com>,
Ramesh Errabolu <ramesh@linux.ibm.com>,
Tobias Schumacher <ts@linux.ibm.com>,
Halil Pasic <pasic@linux.ibm.com>,
Peter Oberparleiter <oberpar@linux.ibm.com>,
Gerald Schaefer <gerald.schaefer@linux.ibm.com>,
Christian Borntraeger <borntraeger@linux.ibm.com>,
Niklas Schnelle <schnelle@linux.ibm.com>,
linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v3 4/4] s390/pci: Don't report recovery success on skipped recovery
Date: Wed, 16 Sep 2026 17:14:13 +0200 [thread overview]
Message-ID: <20260916-fix_zpci_report_status_pdev_leak-v3-4-61a2f980e71d@linux.ibm.com> (raw)
In-Reply-To: <20260916-fix_zpci_report_status_pdev_leak-v3-0-61a2f980e71d@linux.ibm.com>
When a PCI device is already in the permanent failure state, recovery is
skipped, but the SCLP recovery report still shows success. Fix this by
changing the status string to explicitly state that recovery was skipped
due to permanent failure.
Cc: stable@vger.kernel.org
Fixes: 4ec6054e7321 ("s390/pci: Report PCI error recovery results via SCLP")
Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com>
---
arch/s390/pci/pci_event.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/s390/pci/pci_event.c b/arch/s390/pci/pci_event.c
index 7b538c6ae11b..d6af4015223e 100644
--- a/arch/s390/pci/pci_event.c
+++ b/arch/s390/pci/pci_event.c
@@ -226,6 +226,7 @@ static pci_ers_result_t zpci_event_attempt_error_recovery(struct pci_dev *pdev,
device_lock(&pdev->dev);
if (pdev->error_state == pci_channel_io_perm_failure) {
ers_res = PCI_ERS_RESULT_DISCONNECT;
+ status_str = "skipped (permanent failure)";
goto out_unlock;
}
pdev->error_state = pci_channel_io_frozen;
--
2.53.0
next prev parent reply other threads:[~2026-09-16 15:14 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-16 15:14 [PATCH v3 0/4] s390/pci: Fix some zpci_report_status() issues Niklas Schnelle
2026-09-16 15:14 ` [PATCH v3 1/4] s390/pci: Fix leak of struct pci_dev reference in zpci_report_status() Niklas Schnelle
2026-09-17 17:51 ` Farhan Ali
2026-09-18 8:17 ` Benjamin Block
2026-09-18 8:19 ` Niklas Schnelle
2026-09-18 8:20 ` Benjamin Block
2026-09-18 8:37 ` Benjamin Block
2026-09-16 15:14 ` [PATCH v3 2/4] s390/pci: Fix missing device lock " Niklas Schnelle
2026-09-17 17:52 ` Farhan Ali
2026-09-18 8:26 ` Benjamin Block
2026-09-16 15:14 ` [PATCH v3 3/4] s390/pci: Report SCLP status on error events when no pdev is associated Niklas Schnelle
2026-09-17 18:06 ` Farhan Ali
2026-09-18 8:32 ` Benjamin Block
2026-09-16 15:14 ` Niklas Schnelle [this message]
2026-09-17 18:08 ` [PATCH v3 4/4] s390/pci: Don't report recovery success on skipped recovery Farhan Ali
2026-09-18 8:34 ` Benjamin Block
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260916-fix_zpci_report_status_pdev_leak-v3-4-61a2f980e71d@linux.ibm.com \
--to=schnelle@linux.ibm.com \
--cc=agordeev@linux.ibm.com \
--cc=alifm@linux.ibm.com \
--cc=bblock@linux.ibm.com \
--cc=borntraeger@linux.ibm.com \
--cc=gbayer@linux.ibm.com \
--cc=gerald.schaefer@linux.ibm.com \
--cc=gor@linux.ibm.com \
--cc=hca@linux.ibm.com \
--cc=julianr@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=mjrosato@linux.ibm.com \
--cc=oberpar@linux.ibm.com \
--cc=pasic@linux.ibm.com \
--cc=ramesh@linux.ibm.com \
--cc=svens@linux.ibm.com \
--cc=ts@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®