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

Commit eeabc850 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

blk-mq: merge blk_mq_insert_request and blk_mq_run_request 



It's almost identical to blk_mq_insert_request, so fold the two into one
slightly more generic function by making the flush special case a bit
smarted.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 081241e5

block/blk-exec.c

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

	 */

	if (q->mq_ops) {

		blk_mq_insert_request(q, rq, at_head, true);

		blk_mq_insert_request(rq, at_head, true, false);

		return;

	}

block/blk-flush.c

+2 −2
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static void mq_flush_run(struct work_struct *work) 
	rq = container_of(work, struct request, mq_flush_work);



	memset(&rq->csd, 0, sizeof(rq->csd));

	blk_mq_run_request(rq, true, false);

	blk_mq_insert_request(rq, false, true, false);

}



static bool blk_flush_queue_rq(struct request *rq)
@@ -411,7 +411,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_run_request(rq, false, true);

			blk_mq_insert_request(rq, false, false, true);

		} else

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

		return;

block/blk-mq.c

+10 −43
Original line number Diff line number Diff line
@@ -724,61 +724,28 @@ static void __blk_mq_insert_request(struct blk_mq_hw_ctx *hctx, 
	blk_mq_add_timer(rq);

}



void blk_mq_insert_request(struct request_queue *q, struct request *rq,

			   bool at_head, bool run_queue)

void blk_mq_insert_request(struct request *rq, bool at_head, bool run_queue,

		bool async)

{

	struct request_queue *q = rq->q;

	struct blk_mq_hw_ctx *hctx;

	struct blk_mq_ctx *ctx, *current_ctx;

	struct blk_mq_ctx *ctx = rq->mq_ctx, *current_ctx;



	current_ctx = blk_mq_get_ctx(q);

	if (!cpu_online(ctx->cpu))

		rq->mq_ctx = ctx = current_ctx;



	ctx = rq->mq_ctx;

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



	if (rq->cmd_flags & (REQ_FLUSH | REQ_FUA)) {

	if (rq->cmd_flags & (REQ_FLUSH | REQ_FUA) &&

	    !(rq->cmd_flags & (REQ_FLUSH_SEQ))) {

		blk_insert_flush(rq);

	} else {

		current_ctx = blk_mq_get_ctx(q);



		if (!cpu_online(ctx->cpu)) {

			ctx = current_ctx;

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

			rq->mq_ctx = ctx;

		}

		spin_lock(&ctx->lock);

		__blk_mq_insert_request(hctx, rq, at_head);

		spin_unlock(&ctx->lock);



		blk_mq_put_ctx(current_ctx);

	}



	if (run_queue)

		__blk_mq_run_hw_queue(hctx);

}

EXPORT_SYMBOL(blk_mq_insert_request);



/*

 * This is a special version of blk_mq_insert_request to bypass FLUSH request

 * check. Should only be used internally.

 */

void blk_mq_run_request(struct request *rq, bool run_queue, bool async)

{

	struct request_queue *q = rq->q;

	struct blk_mq_hw_ctx *hctx;

	struct blk_mq_ctx *ctx, *current_ctx;



	current_ctx = blk_mq_get_ctx(q);



	ctx = rq->mq_ctx;

	if (!cpu_online(ctx->cpu)) {

		ctx = current_ctx;

		rq->mq_ctx = ctx;

	}

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



	/* ctx->cpu might be offline */

	spin_lock(&ctx->lock);

	__blk_mq_insert_request(hctx, rq, false);

	spin_unlock(&ctx->lock);



	blk_mq_put_ctx(current_ctx);



	if (run_queue)

block/blk-mq.h

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ struct blk_mq_ctx { 
};



void __blk_mq_complete_request(struct request *rq);

void blk_mq_run_request(struct request *rq, bool run_queue, bool async);

void blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async);

void blk_mq_init_flush(struct request_queue *q);

void blk_mq_drain_queue(struct request_queue *q);

include/linux/blk-mq.h

+1 −2
Original line number Diff line number Diff line
@@ -122,8 +122,7 @@ void blk_mq_free_commands(struct request_queue *, void (*free)(void *data, struc 


void blk_mq_flush_plug_list(struct blk_plug *plug, bool from_schedule);



void blk_mq_insert_request(struct request_queue *, struct request *,

		bool, bool);

void blk_mq_insert_request(struct request *, bool, bool, bool);

void blk_mq_run_queues(struct request_queue *q, bool async);

void blk_mq_free_request(struct request *rq);

bool blk_mq_can_queue(struct blk_mq_hw_ctx *);