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

Commit bd6737f1 authored by Jens Axboe's avatar Jens Axboe
Browse files

blk-mq-sched: add flush insertion into blk_mq_sched_insert_request() 



Instead of letting the caller check this and handle the details
of inserting a flush request, put the logic in the scheduler
insertion function. This fixes direct flush insertion outside
of the usual make_request_fn calls, like from dm via
blk_insert_cloned_request().

Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent f73f44eb

block/blk-core.c

+1 −1
Original line number Diff line number Diff line
@@ -2129,7 +2129,7 @@ int blk_insert_cloned_request(struct request_queue *q, struct request *rq) 
	if (q->mq_ops) {

		if (blk_queue_io_stat(q))

			blk_account_io_start(rq, true);

		blk_mq_sched_insert_request(rq, false, true, false);

		blk_mq_sched_insert_request(rq, false, true, false, false);

		return 0;

	}

block/blk-exec.c

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk, 
	 * be reused after dying flag is set

	 */

	if (q->mq_ops) {

		blk_mq_sched_insert_request(rq, at_head, true, false);

		blk_mq_sched_insert_request(rq, at_head, true, false, false);

		return;

	}

block/blk-flush.c

+1 −1
Original line number Diff line number Diff line
@@ -456,7 +456,7 @@ void blk_insert_flush(struct request *rq) 
	if ((policy & REQ_FSEQ_DATA) &&

	    !(policy & (REQ_FSEQ_PREFLUSH | REQ_FSEQ_POSTFLUSH))) {

		if (q->mq_ops)

			blk_mq_sched_insert_request(rq, false, true, false);

			blk_mq_sched_insert_request(rq, false, true, false, false);

		else

			list_add_tail(&rq->queuelist, &q->queue_head);

		return;

block/blk-mq-sched.c

+58 −0
Original line number Diff line number Diff line
@@ -335,6 +335,64 @@ void blk_mq_sched_restart_queues(struct blk_mq_hw_ctx *hctx) 
	}

}



/*

 * Add flush/fua to the queue. If we fail getting a driver tag, then

 * punt to the requeue list. Requeue will re-invoke us from a context

 * that's safe to block from.

 */

static void blk_mq_sched_insert_flush(struct blk_mq_hw_ctx *hctx,

				      struct request *rq, bool can_block)

{

	if (blk_mq_get_driver_tag(rq, &hctx, can_block)) {

		blk_insert_flush(rq);

		blk_mq_run_hw_queue(hctx, true);

	} else

		blk_mq_add_to_requeue_list(rq, true, true);

}



void blk_mq_sched_insert_request(struct request *rq, bool at_head,

				 bool run_queue, bool async, bool can_block)

{

	struct request_queue *q = rq->q;

	struct elevator_queue *e = q->elevator;

	struct blk_mq_ctx *ctx = rq->mq_ctx;

	struct blk_mq_hw_ctx *hctx = blk_mq_map_queue(q, ctx->cpu);



	if (rq->tag == -1 && (rq->cmd_flags & (REQ_PREFLUSH | REQ_FUA))) {

		blk_mq_sched_insert_flush(hctx, rq, can_block);

		return;

	}



	if (e && e->type->ops.mq.insert_requests) {

		LIST_HEAD(list);



		list_add(&rq->queuelist, &list);

		e->type->ops.mq.insert_requests(hctx, &list, at_head);

	} else {

		spin_lock(&ctx->lock);

		__blk_mq_insert_request(hctx, rq, at_head);

		spin_unlock(&ctx->lock);

	}



	if (run_queue)

		blk_mq_run_hw_queue(hctx, async);

}



void blk_mq_sched_insert_requests(struct request_queue *q,

				  struct blk_mq_ctx *ctx,

				  struct list_head *list, bool run_queue_async)

{

	struct blk_mq_hw_ctx *hctx = blk_mq_map_queue(q, ctx->cpu);

	struct elevator_queue *e = hctx->queue->elevator;



	if (e && e->type->ops.mq.insert_requests)

		e->type->ops.mq.insert_requests(hctx, list, false);

	else

		blk_mq_insert_requests(hctx, ctx, list);



	blk_mq_run_hw_queue(hctx, run_queue_async);

}



static void blk_mq_sched_free_tags(struct blk_mq_tag_set *set,

				   struct blk_mq_hw_ctx *hctx,

				   unsigned int hctx_idx)

block/blk-mq-sched.h

+6 −39
Original line number Diff line number Diff line
@@ -21,6 +21,12 @@ bool __blk_mq_sched_bio_merge(struct request_queue *q, struct bio *bio); 
bool blk_mq_sched_try_insert_merge(struct request_queue *q, struct request *rq);

void blk_mq_sched_restart_queues(struct blk_mq_hw_ctx *hctx);



void blk_mq_sched_insert_request(struct request *rq, bool at_head,

				 bool run_queue, bool async, bool can_block);

void blk_mq_sched_insert_requests(struct request_queue *q,

				  struct blk_mq_ctx *ctx,

				  struct list_head *list, bool run_queue_async);



void blk_mq_sched_dispatch_requests(struct blk_mq_hw_ctx *hctx);

void blk_mq_sched_move_to_dispatch(struct blk_mq_hw_ctx *hctx,

			struct list_head *rq_list,
@@ -62,45 +68,6 @@ static inline void blk_mq_sched_put_rq_priv(struct request_queue *q, 
		e->type->ops.mq.put_rq_priv(q, rq);

}



static inline void

blk_mq_sched_insert_request(struct request *rq, bool at_head, bool run_queue,

			    bool async)

{

	struct request_queue *q = rq->q;

	struct elevator_queue *e = q->elevator;

	struct blk_mq_ctx *ctx = rq->mq_ctx;

	struct blk_mq_hw_ctx *hctx = blk_mq_map_queue(q, ctx->cpu);



	if (e && e->type->ops.mq.insert_requests) {

		LIST_HEAD(list);



		list_add(&rq->queuelist, &list);

		e->type->ops.mq.insert_requests(hctx, &list, at_head);

	} else {

		spin_lock(&ctx->lock);

		__blk_mq_insert_request(hctx, rq, at_head);

		spin_unlock(&ctx->lock);

	}



	if (run_queue)

		blk_mq_run_hw_queue(hctx, async);

}



static inline void

blk_mq_sched_insert_requests(struct request_queue *q, struct blk_mq_ctx *ctx,

			     struct list_head *list, bool run_queue_async)

{

	struct blk_mq_hw_ctx *hctx = blk_mq_map_queue(q, ctx->cpu);

	struct elevator_queue *e = hctx->queue->elevator;



	if (e && e->type->ops.mq.insert_requests)

		e->type->ops.mq.insert_requests(hctx, list, false);

	else

		blk_mq_insert_requests(hctx, ctx, list);



	blk_mq_run_hw_queue(hctx, run_queue_async);

}



static inline bool

blk_mq_sched_allow_merge(struct request_queue *q, struct request *rq,

			 struct bio *bio)