Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93252632 authored by Omar Sandoval's avatar Omar Sandoval Committed by Jens Axboe
Browse files

blk-mq-sched: set up scheduler tags when bringing up new queues 



If a new hardware queue is added at runtime, we don't allocate scheduler
tags for it, leading to a crash. This hooks up the scheduler framework
to blk_mq_{init,exit}_hctx() to make sure everything gets properly
initialized/freed.

Signed-off-by: default avatarOmar Sandoval <osandov@fb.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 6917ff0b

block/blk-mq-sched.c

+22 −0
Original line number Diff line number Diff line
@@ -461,6 +461,28 @@ void blk_mq_sched_teardown(struct request_queue *q) 
		blk_mq_sched_free_tags(set, hctx, i);

}



int blk_mq_sched_init_hctx(struct request_queue *q, struct blk_mq_hw_ctx *hctx,

			   unsigned int hctx_idx)

{

	struct elevator_queue *e = q->elevator;



	if (!e)

		return 0;



	return blk_mq_sched_alloc_tags(q, hctx, hctx_idx);

}



void blk_mq_sched_exit_hctx(struct request_queue *q, struct blk_mq_hw_ctx *hctx,

			    unsigned int hctx_idx)

{

	struct elevator_queue *e = q->elevator;



	if (!e)

		return;



	blk_mq_sched_free_tags(q->tag_set, hctx, hctx_idx);

}



int blk_mq_init_sched(struct request_queue *q, struct elevator_type *e)

{

	struct blk_mq_hw_ctx *hctx;

block/blk-mq-sched.h

+5 −0
Original line number Diff line number Diff line
@@ -35,6 +35,11 @@ void blk_mq_sched_move_to_dispatch(struct blk_mq_hw_ctx *hctx, 
int blk_mq_init_sched(struct request_queue *q, struct elevator_type *e);

void blk_mq_sched_teardown(struct request_queue *q);



int blk_mq_sched_init_hctx(struct request_queue *q, struct blk_mq_hw_ctx *hctx,

			   unsigned int hctx_idx);

void blk_mq_sched_exit_hctx(struct request_queue *q, struct blk_mq_hw_ctx *hctx,

			    unsigned int hctx_idx);



int blk_mq_sched_init(struct request_queue *q);



static inline bool

block/blk-mq.c

+8 −1
Original line number Diff line number Diff line
@@ -1924,6 +1924,8 @@ static void blk_mq_exit_hctx(struct request_queue *q, 
				       hctx->fq->flush_rq, hctx_idx,

				       flush_start_tag + hctx_idx);



	blk_mq_sched_exit_hctx(q, hctx, hctx_idx);



	if (set->ops->exit_hctx)

		set->ops->exit_hctx(hctx, hctx_idx);
@@ -1990,9 +1992,12 @@ static int blk_mq_init_hctx(struct request_queue *q, 
	    set->ops->init_hctx(hctx, set->driver_data, hctx_idx))

		goto free_bitmap;



	if (blk_mq_sched_init_hctx(q, hctx, hctx_idx))

		goto exit_hctx;



	hctx->fq = blk_alloc_flush_queue(q, hctx->numa_node, set->cmd_size);

	if (!hctx->fq)

		goto exit_hctx;

		goto sched_exit_hctx;



	if (set->ops->init_request &&

	    set->ops->init_request(set->driver_data,
@@ -2007,6 +2012,8 @@ static int blk_mq_init_hctx(struct request_queue *q, 


 free_fq:

	kfree(hctx->fq);

 sched_exit_hctx:

	blk_mq_sched_exit_hctx(q, hctx, hctx_idx);

 exit_hctx:

	if (set->ops->exit_hctx)

		set->ops->exit_hctx(hctx, hctx_idx);