Skip to content

Commit

Permalink
blk-mq: fix potential stall during CPU unplug with IO pending
Browse files Browse the repository at this point in the history
When a CPU is unplugged, we move the blk_mq_ctx request entries
to the current queue. The current code forgets to remap the
blk_mq_hw_ctx before marking the software context pending,
which breaks if old-cpu and new-cpu don't map to the same
hardware queue.

Additionally, if we mark entries as pending in the new
hardware queue, then make sure we schedule it for running.
Otherwise request could be sitting there until someone else
queues IO for that hardware queue.

Signed-off-by: Jens Axboe <axboe@fb.com>
  • Loading branch information
Jens Axboe committed Apr 7, 2014
1 parent 60b0ea1 commit bccb5f7
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions block/blk-mq.c
Original file line number Diff line number Diff line change
Expand Up @@ -956,6 +956,7 @@ static void blk_mq_hctx_notify(void *data, unsigned long action,
unsigned int cpu)
{
struct blk_mq_hw_ctx *hctx = data;
struct request_queue *q = hctx->queue;
struct blk_mq_ctx *ctx;
LIST_HEAD(tmp);

Expand All @@ -965,7 +966,7 @@ static void blk_mq_hctx_notify(void *data, unsigned long action,
/*
* Move ctx entries to new CPU, if this one is going away.
*/
ctx = __blk_mq_get_ctx(hctx->queue, cpu);
ctx = __blk_mq_get_ctx(q, cpu);

spin_lock(&ctx->lock);
if (!list_empty(&ctx->rq_list)) {
Expand All @@ -977,7 +978,7 @@ static void blk_mq_hctx_notify(void *data, unsigned long action,
if (list_empty(&tmp))
return;

ctx = blk_mq_get_ctx(hctx->queue);
ctx = blk_mq_get_ctx(q);
spin_lock(&ctx->lock);

while (!list_empty(&tmp)) {
Expand All @@ -988,10 +989,13 @@ static void blk_mq_hctx_notify(void *data, unsigned long action,
list_move_tail(&rq->queuelist, &ctx->rq_list);
}

hctx = q->mq_ops->map_queue(q, ctx->cpu);
blk_mq_hctx_mark_pending(hctx, ctx);

spin_unlock(&ctx->lock);
blk_mq_put_ctx(ctx);

blk_mq_run_hw_queue(hctx, true);
}

static int blk_mq_init_hw_commands(struct blk_mq_hw_ctx *hctx,
Expand Down

0 comments on commit bccb5f7

Please sign in to comment.