Skip to contentSkip to conversation

blk-mq: allow to unfreeze queue when io isn't drained

PATCH In review Ming Lei 1 participant 5 messages Sep 18, 2018

Subsystems (4)
lore
Share & tools
lore

Ming Lei

author
#0 lore raw

cover blk-mq: allow to unfreeze queue when io isn't drained

Hi,

The 1st patch introduces percpu_ref_resurge() for implementing blk_mq_unfreeze_queue_no_drain_io().

The 2nd patch introdces blk_mq_unfreeze_queue_no_drain_io() for cases in which queue can be unfreeze without draininig IO.

The 3rd patch applies blk_mq_unfreeze_queue_no_drain_io() to NVMe PCI timeout, so that IO hang may be avoided inside nvme_reset_work() when new IO timeout is triggered.

Part of idea is from Jianchao's early work:

https://marc.info/?l=linux-kernel&m=153612052611020&w=2

Ming Lei (3):
lib/percpu-refcount: introduce percpu_ref_resurge()
blk-mq: introduce blk_mq_unfreeze_queue_no_drain_io
nvme: don't drain IO in nvme_reset_work()

 block/blk-mq.c                  | 25 ++++++++++++++--
 drivers/nvme/host/core.c        | 12 +++++---
 drivers/nvme/host/nvme.h        |  2 +-
 drivers/nvme/host/pci.c         |  3 +-
 include/linux/blk-mq.h          |  1 +
 include/linux/percpu-refcount.h |  1 +
 lib/percpu-refcount.c           | 63 ++++++++++++++++++++++++++++++++++-------
 7 files changed, 87 insertions(+), 20 deletions(-)
Cc Tejun Heo <tj at kernel.org>
Cc Jianchao Wang <jianchao.w.wang at oracle.com>
Cc Kent Overstreet <kent.overstreet at gmail.com>
Cc linux-block at vger.kernel.org
Cc Christoph Hellwig <hch at lst.de>
Cc linux-nvme at lists.infradead.org
Cc Keith Busch <keith.busch at intel.com>
Signature · 1 line
2.9.5
author
#1 lore raw

PATCH 1/3 lib/percpu-refcount: introduce percpu_ref_resurge()

Now percpu_ref_reinit() can only be done on one percpu refcounter when it drops zero. And the limit shouldn't be so strict, and it is quite straightforward that we can do it when the refcount doesn't drop zero because it is at atomic mode.

This patch introduces percpu_ref_resurge() in which the above limit is relaxed, so we may avoid extra change[1] for NVMe timeout's requirement.

[1] https://marc.info/?l=linux-kernel&m=153612052611020&w=2

Cc Tejun Heo <[email protected]>
Cc Jianchao Wang <[email protected]>
Cc Kent Overstreet <[email protected]>
---
 include/linux/percpu-refcount.h |  1 +
 lib/percpu-refcount.c           | 63 ++++++++++++++++++++++++++++++++++-------
 2 files changed, 53 insertions(+), 11 deletions(-)
include/linux/percpu-refcount.h +1 -0
index 009cdf3d65b6..641841e26256 100644
@@ -109,6 +109,7 @@ void percpu_ref_switch_to_percpu(struct percpu_ref *ref);
 void percpu_ref_kill_and_confirm(struct percpu_ref *ref,
 				 percpu_ref_func_t *confirm_kill);
 void percpu_ref_reinit(struct percpu_ref *ref);
+void percpu_ref_resurge(struct percpu_ref *ref);
 
 /**
  * percpu_ref_kill - drop the initial ref
lib/percpu-refcount.c +52 -11

74 lines not on this page · raw message

Signature · 1 line
2.9.5
author
#2 lore raw

PATCH 2/3 blk-mq: introduce blk_mq_unfreeze_queue_no_drain_io

In reply to Ming Lei

This patch introduces blk_mq_unfreeze_queue_no_drain_io() so that it can be used when no necessary to check if IO is drained, such as nvme pci resetting(nvme_reset_work).

Cc Tejun Heo <tj at kernel.org>
Cc Jianchao Wang <jianchao.w.wang at oracle.com>
Cc Kent Overstreet <kent.overstreet at gmail.com>
Cc linux-block at vger.kernel.org
Cc Christoph Hellwig <hch at lst.de>
Cc linux-nvme at lists.infradead.org
Cc Keith Busch <keith.busch at intel.com>
Signed-off-by Ming Lei <ming.lei at redhat.com>
---
 block/blk-mq.c         | 25 +++++++++++++++++++++++--
 include/linux/blk-mq.h |  1 +
 2 files changed, 24 insertions(+), 2 deletions(-)
block/blk-mq.c +23 -2
index 85a1c1a59c72..a22f82061b93 100644
@@ -191,20 +191,41 @@ void blk_mq_freeze_queue(struct request_queue *q)
 }
 EXPORT_SYMBOL_GPL(blk_mq_freeze_queue);
 
-void blk_mq_unfreeze_queue(struct request_queue *q)
+static void __blk_mq_unfreeze_queue(struct request_queue *q,
+		bool need_drop_zero)
 {
 	int freeze_depth;
 
 	freeze_depth = atomic_dec_return(&q->mq_freeze_depth);
 	WARN_ON_ONCE(freeze_depth < 0);
 	if (!freeze_depth) {
-		percpu_ref_reinit(&q->q_usage_counter);
+		if (need_drop_zero)
+			percpu_ref_reinit(&q->q_usage_counter);
+		else
+			percpu_ref_resurge(&q->q_usage_counter);
 		wake_up_all(&q->mq_freeze_wq);
 	}
 }
+
+void blk_mq_unfreeze_queue(struct request_queue *q)
+{
+	__blk_mq_unfreeze_queue(q, true);
+}
 EXPORT_SYMBOL_GPL(blk_mq_unfreeze_queue);
 
 /*
+ * Compared with blk_mq_unfreeze_queue(), the verion of _no_drain_io
+ * doesn't require the queue is really frozen, and it is useful in
+ * case of timeout handling in which IO can't be drained and has to
+ * be retried after controler is recovered.
+ */
+void blk_mq_unfreeze_queue_no_drain_io(struct request_queue *q)
+{
+	__blk_mq_unfreeze_queue(q, false);
+}
+EXPORT_SYMBOL_GPL(blk_mq_unfreeze_queue_no_drain_io);
+
+/*
  * FIXME: replace the scsi_internal_device_*block_nowait() calls in the
  * mpt3sas driver such that this function can be removed.
  */
include/linux/blk-mq.h +1 -0
index 1da59c16f637..5e0740ec407f 100644
@@ -279,6 +279,7 @@ void blk_mq_tagset_busy_iter(struct blk_mq_tag_set *tagset,
 		busy_tag_iter_fn *fn, void *priv);
 void blk_mq_freeze_queue(struct request_queue *q);
 void blk_mq_unfreeze_queue(struct request_queue *q);
+void blk_mq_unfreeze_queue_no_drain_io(struct request_queue *q);
 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,
Signature · 1 line
2.9.5
author
#3 lore raw

PATCH 3/3 nvme: don't drain IO in nvme_reset_work()

In reply to Ming Lei

After the controller is recovered, it isn't necessary to wait for completion of all in-flight IO. More importantly, it is easy to trigger deadlock if there is new IO timeout triggered.

Cc Tejun Heo <tj at kernel.org>
Cc Jianchao Wang <jianchao.w.wang at oracle.com>
Cc Kent Overstreet <kent.overstreet at gmail.com>
Cc linux-block at vger.kernel.org
Cc Christoph Hellwig <hch at lst.de>
Cc linux-nvme at lists.infradead.org
Cc Keith Busch <keith.busch at intel.com>
Signed-off-by Ming Lei <ming.lei at redhat.com>
---
 drivers/nvme/host/core.c | 12 ++++++++----
 drivers/nvme/host/nvme.h |  2 +-
 drivers/nvme/host/pci.c  |  3 +--
 3 files changed, 10 insertions(+), 7 deletions(-)
drivers/nvme/host/core.c +8 -4
index dd8ec1dd9219..cf6a2267d44e 100644
@@ -1203,7 +1203,7 @@ static void nvme_passthru_end(struct nvme_ctrl *ctrl, u32 effects)
 	if (effects & NVME_CMD_EFFECTS_LBCC)
 		nvme_update_formats(ctrl);
 	if (effects & (NVME_CMD_EFFECTS_LBCC | NVME_CMD_EFFECTS_CSE_MASK))
-		nvme_unfreeze(ctrl);
+		nvme_unfreeze(ctrl, true);
 	if (effects & NVME_CMD_EFFECTS_CCC)
 		nvme_init_identify(ctrl);
 	if (effects & (NVME_CMD_EFFECTS_NIC | NVME_CMD_EFFECTS_NCC))
@@ -3602,13 +3602,17 @@ void nvme_kill_queues(struct nvme_ctrl *ctrl)
 }
 EXPORT_SYMBOL_GPL(nvme_kill_queues);
 
-void nvme_unfreeze(struct nvme_ctrl *ctrl)
+void nvme_unfreeze(struct nvme_ctrl *ctrl, bool check_io_drained)
 {
 	struct nvme_ns *ns;
 
 	down_read(&ctrl->namespaces_rwsem);
-	list_for_each_entry(ns, &ctrl->namespaces, list)
-		blk_mq_unfreeze_queue(ns->queue);
+	list_for_each_entry(ns, &ctrl->namespaces, list) {
+		if  (check_io_drained)
+			blk_mq_unfreeze_queue(ns->queue);
+		else
+			blk_mq_unfreeze_queue_no_drain_io(ns->queue);
+	}
 	up_read(&ctrl->namespaces_rwsem);
 }
 EXPORT_SYMBOL_GPL(nvme_unfreeze);
drivers/nvme/host/nvme.h +1 -1
index bb4a2003c097..fd56270637d1 100644
@@ -432,7 +432,7 @@ void nvme_complete_async_event(struct nvme_ctrl *ctrl, __le16 status,
 void nvme_stop_queues(struct nvme_ctrl *ctrl);
 void nvme_start_queues(struct nvme_ctrl *ctrl);
 void nvme_kill_queues(struct nvme_ctrl *ctrl);
-void nvme_unfreeze(struct nvme_ctrl *ctrl);
+void nvme_unfreeze(struct nvme_ctrl *ctrl, bool check_io_drained);
 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);
drivers/nvme/host/pci.c +1 -2
index d668682f91df..1c26a2e92063 100644
@@ -2328,11 +2328,10 @@ static void nvme_reset_work(struct work_struct *work)
 		new_state = NVME_CTRL_ADMIN_ONLY;
 	} else {
 		nvme_start_queues(&dev->ctrl);
-		nvme_wait_freeze(&dev->ctrl);
 		/* hit this only when allocate tagset fails */
 		if (nvme_dev_add(dev))
 			new_state = NVME_CTRL_ADMIN_ONLY;
-		nvme_unfreeze(&dev->ctrl);
+		nvme_unfreeze(&dev->ctrl, false);
 	}
 
 	/*
Signature · 1 line
2.9.5
author
#4 lore raw
In reply to Ming Lei
Quoted 30 lines · Ming Lei

Hi,

The 1st patch introduces percpu_ref_resurge() for implementing blk_mq_unfreeze_queue_no_drain_io().

The 2nd patch introdces blk_mq_unfreeze_queue_no_drain_io() for cases in which queue can be unfreeze without draininig IO.

The 3rd patch applies blk_mq_unfreeze_queue_no_drain_io() to NVMe PCI timeout, so that IO hang may be avoided inside nvme_reset_work() when new IO timeout is triggered.

Part of idea is from Jianchao's early work:

https://marc.info/?l=linux-kernel&m=153612052611020&w=2

Ming Lei (3):
lib/percpu-refcount: introduce percpu_ref_resurge()
blk-mq: introduce blk_mq_unfreeze_queue_no_drain_io
nvme: don't drain IO in nvme_reset_work()

 block/blk-mq.c                  | 25 ++++++++++++++--
 drivers/nvme/host/core.c        | 12 +++++---
 drivers/nvme/host/nvme.h        |  2 +-
 drivers/nvme/host/pci.c         |  3 +-
 include/linux/blk-mq.h          |  1 +
 include/linux/percpu-refcount.h |  1 +
 lib/percpu-refcount.c           | 63 ++++++++++++++++++++++++++++++++++-------
 7 files changed, 87 insertions(+), 20 deletions(-)
Quoted 8 lines
Cc Tejun Heo <tj at kernel.org>
Cc Jianchao Wang <jianchao.w.wang at oracle.com>
Cc Kent Overstreet <kent.overstreet at gmail.com>
Cc linux-block at vger.kernel.org
Cc Christoph Hellwig <hch at lst.de>
Cc linux-nvme at lists.infradead.org
Cc Keith Busch <keith.busch at intel.com>

Ooops, there is one extra patch missed.

Please ignore this series.

Thanks,
Ming