When all CPUs in one hctx are offline, we shouldn't run this hw queue
for completing request any more.
So steal bios from the request, and resubmit them, and finally free
the request in blk_mq_hctx_notify_dead().
Cc: John Garry <john.ga...@huawei.com>
Cc: Bart Van Assche <bvanass...@acm.org>
Cc: Hannes Reinecke <h...@suse.com>
Cc: Christoph Hellwig <h...@lst.de>
Cc: Thomas Gleixner <t...@linutronix.de>
Cc: Keith Busch <keith.bu...@intel.com>
Signed-off-by: Ming Lei <ming....@redhat.com>
---
block/blk-mq.c | 54 ++++++++++++++++++++++++++++++++++++++++++++------
1 file changed, 48 insertions(+), 6 deletions(-)
diff --git a/block/blk-mq.c b/block/blk-mq.c
index 3384242202eb..17f0a9ef32a8 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -2268,10 +2268,34 @@ static int blk_mq_hctx_notify_online(unsigned int cpu,
struct hlist_node *node)
return 0;
}
+static void blk_mq_resubmit_io(struct request *rq)
+{
+ struct bio_list list;
+ struct bio *bio;
+
+ bio_list_init(&list);
+ blk_steal_bios(&list, rq);
+
+ /*
+ * Free the old empty request before submitting bio for avoiding
+ * potential deadlock
+ */
+ blk_mq_cleanup_rq(rq);
+ blk_mq_end_request(rq, 0);
+
+ while (true) {
+ bio = bio_list_pop(&list);
+ if (!bio)
+ break;
+
+ generic_make_request(bio);
+ }
+}
+
/*
- * 'cpu' is going away. splice any existing rq_list entries from this
- * software queue to the hw queue dispatch list, and ensure that it
- * gets run.
+ * 'cpu' has gone away. If this hctx is dead, we can't dispatch request
+ * to the hctx any more, so steal bios from requests of this hctx, and
+ * re-submit them to the request queue, and free these requests finally.
*/
static int blk_mq_hctx_notify_dead(unsigned int cpu, struct hlist_node *node)
{
@@ -2279,6 +2303,8 @@ static int blk_mq_hctx_notify_dead(unsigned int cpu,
struct hlist_node *node)
struct blk_mq_ctx *ctx;
LIST_HEAD(tmp);
enum hctx_type type;
+ bool hctx_dead;
+ struct request *rq;
hctx = hlist_entry_safe(node, struct blk_mq_hw_ctx, cpuhp_dead);
ctx = __blk_mq_get_ctx(hctx->queue, cpu);
@@ -2286,6 +2312,9 @@ static int blk_mq_hctx_notify_dead(unsigned int cpu,
struct hlist_node *node)
clear_bit(BLK_MQ_S_INTERNAL_STOPPED, &hctx->state);
+ hctx_dead = cpumask_first_and(hctx->cpumask, cpu_online_mask) >=
+ nr_cpu_ids;
+
spin_lock(&ctx->lock);
if (!list_empty(&ctx->rq_lists[type])) {
list_splice_init(&ctx->rq_lists[type], &tmp);
@@ -2293,14 +2322,27 @@ static int blk_mq_hctx_notify_dead(unsigned int cpu,
struct hlist_node *node)
}
spin_unlock(&ctx->lock);
- if (list_empty(&tmp))
+ if (!hctx_dead) {
+ if (list_empty(&tmp))
+ return 0;
+ spin_lock(&hctx->lock);
+ list_splice_tail_init(&tmp, &hctx->dispatch);
+ spin_unlock(&hctx->lock);
+ blk_mq_run_hw_queue(hctx, true);
return 0;
+ }
+ /* requests in dispatch list has to be re-submitted too */
spin_lock(&hctx->lock);
- list_splice_tail_init(&tmp, &hctx->dispatch);
+ list_splice_tail_init(&hctx->dispatch, &tmp);
spin_unlock(&hctx->lock);
- blk_mq_run_hw_queue(hctx, true);
+ while (!list_empty(&tmp)) {
+ rq = list_entry(tmp.next, struct request, queuelist);
+ list_del_init(&rq->queuelist);
+ blk_mq_resubmit_io(rq);
+ }
+
return 0;
}
--
2.20.1
