Commit e9ea1596 authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

blk-mq: inline hot part of __blk_mq_sched_restart 



Extract a fast check out of __block_mq_sched_restart() and inline it for
performance reasons.

Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/894abaa0998e5999f2fe18f271e5efdfc2c32bd2.1633781740.git.asml.silence@gmail.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent be6bfe36

block/blk-mq-sched.c

+1 −3
Original line number Diff line number Diff line
@@ -57,10 +57,8 @@ void blk_mq_sched_mark_restart_hctx(struct blk_mq_hw_ctx *hctx) 
}

EXPORT_SYMBOL_GPL(blk_mq_sched_mark_restart_hctx);



void blk_mq_sched_restart(struct blk_mq_hw_ctx *hctx)

void __blk_mq_sched_restart(struct blk_mq_hw_ctx *hctx)

{

	if (!test_bit(BLK_MQ_S_SCHED_RESTART, &hctx->state))

		return;

	clear_bit(BLK_MQ_S_SCHED_RESTART, &hctx->state);



	/*

block/blk-mq-sched.h

+7 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 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,

				   struct list_head *free);

void blk_mq_sched_mark_restart_hctx(struct blk_mq_hw_ctx *hctx);

void blk_mq_sched_restart(struct blk_mq_hw_ctx *hctx);

void __blk_mq_sched_restart(struct blk_mq_hw_ctx *hctx);



void blk_mq_sched_insert_request(struct request *rq, bool at_head,

				 bool run_queue, bool async);
@@ -31,6 +31,12 @@ int blk_mq_init_sched(struct request_queue *q, struct elevator_type *e); 
void blk_mq_exit_sched(struct request_queue *q, struct elevator_queue *e);

void blk_mq_sched_free_rqs(struct request_queue *q);



static inline void blk_mq_sched_restart(struct blk_mq_hw_ctx *hctx)

{

	if (test_bit(BLK_MQ_S_SCHED_RESTART, &hctx->state))

		__blk_mq_sched_restart(hctx);

}



static inline bool

blk_mq_sched_bio_merge(struct request_queue *q, struct bio *bio,

		unsigned int nr_segs)