From: keith.busch@intel.com (Keith Busch)
Subject: [PATCH 1/3] nvme-pci: reset timeout when processing is paused
Date: Fri, 24 May 2019 14:20:34 -0600 [thread overview]
Message-ID: <20190524202036.17265-2-keith.busch@intel.com> (raw)
In-Reply-To: <20190524202036.17265-1-keith.busch@intel.com>
From: Keith Busch <kbusch@kernel.org>
Do not escalate request timeout handling if the controller has
temporary paused command processing. We do not expect requests to
complete during this transient state, so just reset the timer.
Signed-off-by: Keith Busch <kbusch at kernel.org>
---
drivers/nvme/host/pci.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index f562154551ce..101e20522374 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -1263,7 +1263,7 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved)
* the recovery mechanism will surely fail.
*/
mb();
- if (pci_channel_offline(to_pci_dev(dev->dev)))
+ if (pci_channel_offline(to_pci_dev(dev->dev)) || (csts & NVME_CSTS_PP))
return BLK_EH_RESET_TIMER;
/*
--
2.14.4
next prev parent reply other threads:[~2019-05-24 20:20 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-24 20:20 [PATCH 0/3] nvme: Improve processing paused support Keith Busch
2019-05-24 20:20 ` Keith Busch [this message]
2019-05-25 13:22 ` [PATCH 1/3] nvme-pci: reset timeout when processing is paused Minwoo Im
2019-06-01 9:07 ` Christoph Hellwig
2019-05-24 20:20 ` [PATCH 2/3] nvme: rearm fw notification in admin only state Keith Busch
2019-06-01 9:08 ` Christoph Hellwig
2019-05-24 20:20 ` [PATCH 3/3] nvme: quiesce admin queue for fw activation Keith Busch
2019-05-25 13:17 ` Minwoo Im
2019-05-25 14:07 ` Keith Busch
2019-05-25 15:05 ` Minwoo Im
2019-05-31 23:32 ` [PATCH 0/3] nvme: Improve processing paused support Sagi Grimberg
2019-06-01 2:45 ` Minwoo Im
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=20190524202036.17265-2-keith.busch@intel.com \
--to=keith.busch@intel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.