* [PATCH V2 1/3] blk-mq: add API of blk_mq_queue_frozen
2020-05-30 13:52 [PATCH V2 0/3] blk-mq/nvme: improve nvme-pci reset handler Ming Lei
@ 2020-05-30 13:52 ` Ming Lei
2020-05-30 13:52 ` [PATCH V2 2/3] nvme: add nvme_frozen Ming Lei
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Ming Lei @ 2020-05-30 13:52 UTC (permalink / raw)
To: Jens Axboe, linux-block, linux-nvme, Christoph Hellwig
Cc: Sagi Grimberg, Dongli Zhang, Ming Lei, Alan Adamson, Keith Busch,
Max Gurtovoy
blk_mq_freeze_queue_wait() isn't very flexible for some case, such as
error recovery: when blk_mq_freeze_queue_wait is called in error
recovery handler, new problem may be triggered on this controller, so
in-flight IO may not complete when blk_mq_freeze_queue_wait() is called.
And error recovery is often run in single context, so dead lock may be
triggered, because error recover handler can't move on.
Add one new API of blk_mq_queue_frozen(), error recovery handler may
use this helper to query if the queue has been frozen completely.
Meantime, the error recovery handler can check if there is hardware
failure happened. If yes, error recovery handler can break from current
handling, and run a fresh new recovery, so deadlock can be avoided.
This API will be used to improve error handling of nvme-pci's timeout
handler.
Cc: Christoph Hellwig <hch@lst.de>
Cc: Sagi Grimberg <sagi@grimberg.me>
Cc: Keith Busch <kbusch@kernel.org>
Cc: Max Gurtovoy <maxg@mellanox.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
---
block/blk-mq.c | 6 ++++++
include/linux/blk-mq.h | 1 +
2 files changed, 7 insertions(+)
diff --git a/block/blk-mq.c b/block/blk-mq.c
index a5ff8140e52c..dc4e73d7ad02 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -148,6 +148,12 @@ void blk_mq_freeze_queue_wait(struct request_queue *q)
}
EXPORT_SYMBOL_GPL(blk_mq_freeze_queue_wait);
+bool blk_mq_queue_frozen(struct request_queue *q)
+{
+ return percpu_ref_is_zero(&q->q_usage_counter);
+}
+EXPORT_SYMBOL_GPL(blk_mq_queue_frozen);
+
int blk_mq_freeze_queue_wait_timeout(struct request_queue *q,
unsigned long timeout)
{
diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
index 43e38d21ca4a..1f867ad02c5c 100644
--- a/include/linux/blk-mq.h
+++ b/include/linux/blk-mq.h
@@ -518,6 +518,7 @@ void blk_freeze_queue_start(struct request_queue *q);
void blk_mq_freeze_queue_wait(struct request_queue *q);
int blk_mq_freeze_queue_wait_timeout(struct request_queue *q,
unsigned long timeout);
+bool blk_mq_queue_frozen(struct request_queue *q);
int blk_mq_map_queues(struct blk_mq_queue_map *qmap);
void blk_mq_update_nr_hw_queues(struct blk_mq_tag_set *set, int nr_hw_queues);
--
2.25.2
_______________________________________________
linux-nvme mailing list
linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH V2 2/3] nvme: add nvme_frozen
2020-05-30 13:52 [PATCH V2 0/3] blk-mq/nvme: improve nvme-pci reset handler Ming Lei
2020-05-30 13:52 ` [PATCH V2 1/3] blk-mq: add API of blk_mq_queue_frozen Ming Lei
@ 2020-05-30 13:52 ` Ming Lei
2020-05-30 13:52 ` [PATCH V2 3/3] nvme-pci: make nvme reset more reliable Ming Lei
2020-06-11 7:27 ` [PATCH V2 0/3] blk-mq/nvme: improve nvme-pci reset handler Ming Lei
3 siblings, 0 replies; 5+ messages in thread
From: Ming Lei @ 2020-05-30 13:52 UTC (permalink / raw)
To: Jens Axboe, linux-block, linux-nvme, Christoph Hellwig
Cc: Sagi Grimberg, Dongli Zhang, Ming Lei, Alan Adamson, Keith Busch,
Max Gurtovoy
Add one new API of nvme_frozen(), reset handler may use this helper to
query if all ns queues have been frozen completely. Meantime, the reset
handler can check if there is new hardware failure happened. If yes, reset
handler can break from current handling, and schedule a fresh new recovery,
so deadlock or deleting controller & fail all IOs can be avoided.
Cc: Christoph Hellwig <hch@lst.de>
Cc: Sagi Grimberg <sagi@grimberg.me>
Cc: Keith Busch <kbusch@kernel.org>
Cc: Max Gurtovoy <maxg@mellanox.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
---
drivers/nvme/host/core.c | 14 ++++++++++++++
drivers/nvme/host/nvme.h | 1 +
2 files changed, 15 insertions(+)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index f3c037f5a9ba..469010607383 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -4243,6 +4243,20 @@ void nvme_wait_freeze(struct nvme_ctrl *ctrl)
}
EXPORT_SYMBOL_GPL(nvme_wait_freeze);
+bool nvme_frozen(struct nvme_ctrl *ctrl)
+{
+ struct nvme_ns *ns;
+ int ret = 0;
+
+ down_read(&ctrl->namespaces_rwsem);
+ list_for_each_entry(ns, &ctrl->namespaces, list)
+ ret += !blk_mq_queue_frozen(ns->queue);
+ up_read(&ctrl->namespaces_rwsem);
+
+ return ret == 0;
+}
+EXPORT_SYMBOL_GPL(nvme_frozen);
+
void nvme_start_freeze(struct nvme_ctrl *ctrl)
{
struct nvme_ns *ns;
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
index 2e04a36296d9..459e5952ff5f 100644
--- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@ -508,6 +508,7 @@ void nvme_unfreeze(struct nvme_ctrl *ctrl);
void nvme_wait_freeze(struct nvme_ctrl *ctrl);
void nvme_wait_freeze_timeout(struct nvme_ctrl *ctrl, long timeout);
void nvme_start_freeze(struct nvme_ctrl *ctrl);
+bool nvme_frozen(struct nvme_ctrl *ctrl);
#define NVME_QID_ANY -1
struct request *nvme_alloc_request(struct request_queue *q,
--
2.25.2
_______________________________________________
linux-nvme mailing list
linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH V2 3/3] nvme-pci: make nvme reset more reliable
2020-05-30 13:52 [PATCH V2 0/3] blk-mq/nvme: improve nvme-pci reset handler Ming Lei
2020-05-30 13:52 ` [PATCH V2 1/3] blk-mq: add API of blk_mq_queue_frozen Ming Lei
2020-05-30 13:52 ` [PATCH V2 2/3] nvme: add nvme_frozen Ming Lei
@ 2020-05-30 13:52 ` Ming Lei
2020-06-11 7:27 ` [PATCH V2 0/3] blk-mq/nvme: improve nvme-pci reset handler Ming Lei
3 siblings, 0 replies; 5+ messages in thread
From: Ming Lei @ 2020-05-30 13:52 UTC (permalink / raw)
To: Jens Axboe, linux-block, linux-nvme, Christoph Hellwig
Cc: Sagi Grimberg, Dongli Zhang, Ming Lei, Alan Adamson, Keith Busch,
Max Gurtovoy
During waiting for in-flight IO completion in reset handler, timeout
or controller failure still may happen, then the controller is deleted
and all inflight IOs are failed. This way is too violent: 1) the timeout
may be triggered exactly during nvme_wait_freeze() after controller is
recovered by one occasional event; 2) the claimed retry times isn't
respected.
Improve the reset handling by replacing nvme_wait_freeze with query
& check controller. If all ns queues are frozen, the controller is reset
successfully, otherwise check and see if the controller has been disabled.
If yes, break from the current recovery and schedule a fresh new reset.
This way avoids to failing IO & removing controller unnecessarily.
Cc: Christoph Hellwig <hch@lst.de>
Cc: Sagi Grimberg <sagi@grimberg.me>
Cc: Keith Busch <kbusch@kernel.org>
Cc: Max Gurtovoy <maxg@mellanox.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
---
drivers/nvme/host/core.c | 3 ++-
drivers/nvme/host/nvme.h | 2 ++
drivers/nvme/host/pci.c | 50 +++++++++++++++++++++++++++++++++-------
3 files changed, 46 insertions(+), 9 deletions(-)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 469010607383..f4a00a85a47e 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -45,9 +45,10 @@ static unsigned char shutdown_timeout = 5;
module_param(shutdown_timeout, byte, 0644);
MODULE_PARM_DESC(shutdown_timeout, "timeout in seconds for controller shutdown");
-static u8 nvme_max_retries = 5;
+u8 nvme_max_retries = 5;
module_param_named(max_retries, nvme_max_retries, byte, 0644);
MODULE_PARM_DESC(max_retries, "max number of retries a command may have");
+EXPORT_SYMBOL_GPL(nvme_max_retries);
static unsigned long default_ps_max_latency_us = 100000;
module_param(default_ps_max_latency_us, ulong, 0644);
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
index 459e5952ff5f..ba4c84f16a0b 100644
--- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@ -25,6 +25,8 @@ extern unsigned int nvme_io_timeout;
extern unsigned int admin_timeout;
#define ADMIN_TIMEOUT (admin_timeout * HZ)
+extern u8 nvme_max_retries;
+
#define NVME_DEFAULT_KATO 5
#define NVME_KATO_GRACE 10
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index e13c370de830..9b75f1d855f9 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -24,6 +24,7 @@
#include <linux/io-64-nonatomic-lo-hi.h>
#include <linux/sed-opal.h>
#include <linux/pci-p2pdma.h>
+#include <linux/delay.h>
#include "trace.h"
#include "nvme.h"
@@ -106,6 +107,7 @@ struct nvme_dev {
unsigned long bar_mapped_size;
struct work_struct remove_work;
struct mutex shutdown_lock;
+ int successive_shutdown;
bool subsystem;
u64 cmb_size;
bool cmb_use_sqes;
@@ -1243,9 +1245,6 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved)
* shutdown, so we return BLK_EH_DONE.
*/
switch (dev->ctrl.state) {
- case NVME_CTRL_CONNECTING:
- nvme_change_ctrl_state(&dev->ctrl, NVME_CTRL_DELETING);
- /* fall through */
case NVME_CTRL_DELETING:
dev_warn_ratelimited(dev->ctrl.device,
"I/O %d QID %d timeout, disable controller\n",
@@ -2383,11 +2382,13 @@ static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown)
struct pci_dev *pdev = to_pci_dev(dev->dev);
mutex_lock(&dev->shutdown_lock);
+ dev->successive_shutdown++;
if (pci_is_enabled(pdev)) {
u32 csts = readl(dev->bar + NVME_REG_CSTS);
if (dev->ctrl.state == NVME_CTRL_LIVE ||
- dev->ctrl.state == NVME_CTRL_RESETTING) {
+ dev->ctrl.state == NVME_CTRL_RESETTING ||
+ dev->ctrl.state == NVME_CTRL_CONNECTING) {
freeze = true;
nvme_start_freeze(&dev->ctrl);
}
@@ -2498,12 +2499,34 @@ static void nvme_remove_dead_ctrl(struct nvme_dev *dev)
nvme_put_ctrl(&dev->ctrl);
}
+static bool nvme_wait_freeze_and_check(struct nvme_dev *dev)
+{
+ bool frozen;
+
+ while (true) {
+ frozen = nvme_frozen(&dev->ctrl);
+ if (frozen)
+ break;
+
+ /*
+ * controller may has been shutdown because of new timeout, so
+ * break from the loop and report the event to reset handler.
+ */
+ if (!dev->online_queues)
+ break;
+ msleep(3);
+ }
+
+ return frozen;
+}
+
static void nvme_reset_work(struct work_struct *work)
{
struct nvme_dev *dev =
container_of(work, struct nvme_dev, ctrl.reset_work);
bool was_suspend = !!(dev->ctrl.ctrl_config & NVME_CC_SHN_NORMAL);
int result;
+ bool reset_done = true;
if (WARN_ON(dev->ctrl.state != NVME_CTRL_RESETTING)) {
result = -ENODEV;
@@ -2600,23 +2623,34 @@ static void nvme_reset_work(struct work_struct *work)
nvme_free_tagset(dev);
} else {
nvme_start_queues(&dev->ctrl);
- nvme_wait_freeze(&dev->ctrl);
- nvme_dev_add(dev);
+ reset_done = nvme_wait_freeze_and_check(dev);
+ if (reset_done)
+ nvme_dev_add(dev);
nvme_unfreeze(&dev->ctrl);
}
/*
* If only admin queue live, keep it to do further investigation or
* recovery.
+ *
+ * Or we can't move on after retrying enough times.
*/
- if (!nvme_change_ctrl_state(&dev->ctrl, NVME_CTRL_LIVE)) {
+ if (!nvme_change_ctrl_state(&dev->ctrl, NVME_CTRL_LIVE) ||
+ (!reset_done && dev->successive_shutdown >= nvme_max_retries)) {
dev_warn(dev->ctrl.device,
"failed to mark controller live state\n");
result = -ENODEV;
goto out;
}
- nvme_start_ctrl(&dev->ctrl);
+ /* New error happens during reset, so schedule a new reset */
+ if (!reset_done) {
+ dev_warn(dev->ctrl.device, "new error during reset\n");
+ nvme_reset_ctrl(&dev->ctrl);
+ } else {
+ dev->successive_shutdown = 0;
+ nvme_start_ctrl(&dev->ctrl);
+ }
return;
out_unlock:
--
2.25.2
_______________________________________________
linux-nvme mailing list
linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH V2 0/3] blk-mq/nvme: improve nvme-pci reset handler
2020-05-30 13:52 [PATCH V2 0/3] blk-mq/nvme: improve nvme-pci reset handler Ming Lei
` (2 preceding siblings ...)
2020-05-30 13:52 ` [PATCH V2 3/3] nvme-pci: make nvme reset more reliable Ming Lei
@ 2020-06-11 7:27 ` Ming Lei
3 siblings, 0 replies; 5+ messages in thread
From: Ming Lei @ 2020-06-11 7:27 UTC (permalink / raw)
To: Jens Axboe, linux-block, linux-nvme, Christoph Hellwig
Cc: Keith Busch, Dongli Zhang, Max Gurtovoy, Sagi Grimberg,
Alan Adamson
On Sat, May 30, 2020 at 09:52:18PM +0800, Ming Lei wrote:
> Hi,
>
> For nvme-pci, after controller is recovered, in-flight IOs are waited
> before updating nr hw queues. If new controller error happens during
> this period, nvme-pci driver deletes the controller and fails in-flight
> IO. This way is too violent, and not friendly from user viewpoint.
>
> Add APIs for checking if queue is frozen, and replace nvme_wait_freeze
> in nvme-pci reset handler with checking if all ns queues are frozen &
> controller disabled. Then a fresh new reset can be scheduled for
> handling new controller error during waiting for in-flight IO completion.
>
> So deleting controller & failing IOs can be avoided in this situation.
>
> Without this patches, when fail io timeout injection is run, the
> controller can be removed very quickly. With this patch, no controller
> removing can be observed, and controller can recover to normal state
> after stopping to inject io timeout failure.
>
> V2:
> - give up after retrying enough times
> - add comment on breaking because of shutdown
>
> Ming Lei (3):
> blk-mq: add API of blk_mq_queue_frozen
> nvme: add nvme_frozen
> nvme-pci: make nvme reset more reliable
>
> block/blk-mq.c | 6 +++++
> drivers/nvme/host/core.c | 17 +++++++++++++-
> drivers/nvme/host/nvme.h | 3 +++
> drivers/nvme/host/pci.c | 50 +++++++++++++++++++++++++++++++++-------
> include/linux/blk-mq.h | 1 +
> 5 files changed, 68 insertions(+), 9 deletions(-)
>
> Cc: Christoph Hellwig <hch@lst.de>
> Cc: Sagi Grimberg <sagi@grimberg.me>
> Cc: Keith Busch <kbusch@kernel.org>
> Cc: Max Gurtovoy <maxg@mellanox.com>
Hello Guys,
Ping...
Thanks,
Ming
_______________________________________________
linux-nvme mailing list
linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
^ permalink raw reply [flat|nested] 5+ messages in thread