From: Ethan Zhao <haifeng.zhao@intel.com>
To: bhelgaas@google.com, oohall@gmail.com, ruscur@russell.cc,
lukas@wunner.de, andriy.shevchenko@linux.intel.com,
stuart.w.hayes@gmail.com, mr.nuke.me@gmail.com,
mika.westerberg@linux.intel.com
Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
ashok.raj@linux.intel.com, sathyanarayanan.kuppuswamy@intel.com,
xerces.zhao@gmail.com, Ethan Zhao <haifeng.zhao@intel.com>
Subject: [PATCH v8 5/6] PCI/ERR: only return true when dev io state is really changed
Date: Wed, 7 Oct 2020 07:31:57 -0400 [thread overview]
Message-ID: <20201007113158.48933-6-haifeng.zhao@intel.com> (raw)
In-Reply-To: <20201007113158.48933-1-haifeng.zhao@intel.com>
When uncorrectable error happens, AER driver and DPC driver interrupt
handlers likely call
pcie_do_recovery()
->pci_walk_bus()
->report_frozen_detected()
with pci_channel_io_frozen the same time.
If pci_dev_set_io_state() return true even if the original state is
pci_channel_io_frozen, that will cause AER or DPC handler re-enter
the error detecting and recovery procedure one after another.
The result is the recovery flow mixed between AER and DPC.
So change the pci_dev_set_io_state() function to only return true
when dev->error_state is really changed.
Signed-off-by: Ethan Zhao <haifeng.zhao@intel.com>
---
Changnes:
v2: revise description and code according to suggestion from Andy.
v3: change code to simpler.
v4: no change.
v5: no change.
v6: no change.
v7: changed based on Bjorn's code and truth table.
v8: according to Bjorn's suggestion, rebase on another simplification
patch.
drivers/pci/pci.h | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index bceb3f108744..a11e0f9d9bdf 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -371,17 +371,14 @@ static inline bool pci_dev_set_io_state(struct pci_dev *dev,
* perm_failure | perm_failure* perm_failure* perm_failure
*/
- /* Can always put a device in perm_failure state */
- if (new == pci_channel_io_perm_failure) {
- dev->error_state = pci_channel_io_perm_failure;
- return true;
- }
-
- /* If already in perm_failure, can't set to normal or frozen */
+ /* If already in perm_failure, can't change it's state */
if (dev->error_state == pci_channel_io_perm_failure)
return false;
+ /* not change at all */
+ else if (dev->error_state == new)
+ return false;
- /* Can always change normal to frozen or vice versa */
+ /* Can always change from normal/frozen to other different state */
dev->error_state = new;
return true;
}
--
2.18.4
next prev parent reply other threads:[~2020-10-07 11:33 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-07 11:31 [PATCH v8 0/6] Fix DPC hotplug race and enhance error handling Ethan Zhao
2020-10-07 11:31 ` [PATCH v8 1/6] PCI/ERR: get device before call device driver to avoid NULL pointer dereference Ethan Zhao
2020-10-07 17:24 ` Kuppuswamy, Sathyanarayanan
2020-10-08 5:38 ` Ethan Zhao
2020-10-07 11:31 ` [PATCH v8 2/6] PCI/DPC: define a function to check and wait till port finish DPC handling Ethan Zhao
2020-10-07 17:28 ` Kuppuswamy, Sathyanarayanan
2020-10-08 5:49 ` Ethan Zhao
2020-10-09 3:16 ` Ethan Zhao
2020-10-07 11:31 ` [PATCH v8 3/6] PCI: pciehp: check and wait port status out of DPC before handling DLLSC and PDC Ethan Zhao
2020-10-07 11:31 ` [PATCH v8 4/6] PCI/ERR: simplify function pci_dev_set_io_state() with if Ethan Zhao
2020-10-07 11:31 ` Ethan Zhao [this message]
2020-10-07 11:31 ` [PATCH v8 6/6] PCI/ERR: don't mix io state not changed and no driver together Ethan Zhao
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=20201007113158.48933-6-haifeng.zhao@intel.com \
--to=haifeng.zhao@intel.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=ashok.raj@linux.intel.com \
--cc=bhelgaas@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lukas@wunner.de \
--cc=mika.westerberg@linux.intel.com \
--cc=mr.nuke.me@gmail.com \
--cc=oohall@gmail.com \
--cc=ruscur@russell.cc \
--cc=sathyanarayanan.kuppuswamy@intel.com \
--cc=stuart.w.hayes@gmail.com \
--cc=xerces.zhao@gmail.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;
as well as URLs for NNTP newsgroup(s).