* [PATCH v2 0/1] PCI/ERR: fix regression introduced by 6d2c89441571 ("PCI/ERR: Update error status after reset_link()")
@ 2020-10-10 0:09 Hedi Berriche
2020-10-10 0:09 ` [PATCH v2 1/1] PCI/ERR: don't clobber status after reset_link() Hedi Berriche
0 siblings, 1 reply; 2+ messages in thread
From: Hedi Berriche @ 2020-10-10 0:09 UTC (permalink / raw)
To: Kuppuswamy Sathyanarayanan
Cc: linux-pci, linux-kernel, Hedi Berriche, Russ Anderson,
Bjorn Helgaas, Ashok Raj, Joerg Roedel, stable
- Changes since v1:
* changed the commit message to clarify what broke post commit 6d2c89441571
* dropped the misnomer post_reset_status variable in favour of a more natural
approach that relies on a boolean to keep track of the outcome of reset_link()
After commit 6d2c89441571 ("PCI/ERR: Update error status after reset_link()")
pcie_do_recovery() no longer calls ->slot_reset() in the case of a successful
reset which breaks error recovery by breaking driver (re)initialisation.
Cc: Russ Anderson <rja@hpe.com>
Cc: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Ashok Raj <ashok.raj@intel.com>
Cc: Joerg Roedel <jroedel@suse.com>
Cc: stable@kernel.org # v5.7+
---
Hedi Berriche (1):
PCI/ERR: don't clobber status after reset_link()
drivers/pci/pcie/err.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
--
2.28.0
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH v2 1/1] PCI/ERR: don't clobber status after reset_link()
2020-10-10 0:09 [PATCH v2 0/1] PCI/ERR: fix regression introduced by 6d2c89441571 ("PCI/ERR: Update error status after reset_link()") Hedi Berriche
@ 2020-10-10 0:09 ` Hedi Berriche
0 siblings, 0 replies; 2+ messages in thread
From: Hedi Berriche @ 2020-10-10 0:09 UTC (permalink / raw)
To: Kuppuswamy Sathyanarayanan
Cc: linux-pci, linux-kernel, Hedi Berriche, Russ Anderson,
Bjorn Helgaas, Ashok Raj, Joerg Roedel, stable
Commit 6d2c89441571 ("PCI/ERR: Update error status after reset_link()")
broke pcie_do_recovery(): updating status after reset_link() has the ill
side effect of causing recovery to fail if the error status is
PCI_ERS_RESULT_CAN_RECOVER or PCI_ERS_RESULT_NEED_RESET as the following
code will *never* run in the case of a successful reset_link()
177 if (status == PCI_ERS_RESULT_CAN_RECOVER) {
...
181 }
183 if (status == PCI_ERS_RESULT_NEED_RESET) {
...
192 }
For instance in the case of PCI_ERS_RESULT_NEED_RESET we end up not
calling ->slot_reset() (because we skip report_slot_reset()) thus
breaking driver (re)initialisation.
Don't clobber status after reset_link(), use a boolean instead to track
the outcome of reset_link().
Fixes: 6d2c89441571 ("PCI/ERR: Update error status after reset_link()")
Signed-off-by: Hedi Berriche <hedi.berriche@hpe.com>
Cc: Russ Anderson <rja@hpe.com>
Cc: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Ashok Raj <ashok.raj@intel.com>
Cc: Joerg Roedel <jroedel@suse.com>
Cc: stable@kernel.org # v5.7+
---
drivers/pci/pcie/err.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/pci/pcie/err.c b/drivers/pci/pcie/err.c
index c543f419d8f9..b4bfa87fc49d 100644
--- a/drivers/pci/pcie/err.c
+++ b/drivers/pci/pcie/err.c
@@ -152,6 +152,7 @@ pci_ers_result_t pcie_do_recovery(struct pci_dev *dev,
{
pci_ers_result_t status = PCI_ERS_RESULT_CAN_RECOVER;
struct pci_bus *bus;
+ bool reset_failed = false;
/*
* Error recovery runs on all subordinates of the first downstream port.
@@ -165,8 +166,8 @@ pci_ers_result_t pcie_do_recovery(struct pci_dev *dev,
pci_dbg(dev, "broadcast error_detected message\n");
if (state == pci_channel_io_frozen) {
pci_walk_bus(bus, report_frozen_detected, &status);
- status = reset_link(dev);
- if (status != PCI_ERS_RESULT_RECOVERED) {
+ reset_failed = (reset_link(dev) != PCI_ERS_RESULT_RECOVERED);
+ if (reset_failed) {
pci_warn(dev, "link reset failed\n");
goto failed;
}
@@ -174,6 +175,12 @@ pci_ers_result_t pcie_do_recovery(struct pci_dev *dev,
pci_walk_bus(bus, report_normal_detected, &status);
}
+ if ((status == PCI_ERS_RESULT_DISCONNECT ||
+ status == PCI_ERS_RESULT_NO_AER_DRIVER) &&
+ !reset_failed) {
+ status = PCI_ERS_RESULT_RECOVERED;
+ }
+
if (status == PCI_ERS_RESULT_CAN_RECOVER) {
status = PCI_ERS_RESULT_RECOVERED;
pci_dbg(dev, "broadcast mmio_enabled message\n");
--
2.28.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-10-10 0:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-10 0:09 [PATCH v2 0/1] PCI/ERR: fix regression introduced by 6d2c89441571 ("PCI/ERR: Update error status after reset_link()") Hedi Berriche
2020-10-10 0:09 ` [PATCH v2 1/1] PCI/ERR: don't clobber status after reset_link() Hedi Berriche
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).