Commit bdc6a287 authored by Baolin Wang's avatar Baolin Wang Committed by Jens Axboe
Browse files

block: Move blk_mq_bio_list_merge() into blk-merge.c 



Move the blk_mq_bio_list_merge() into blk-merge.c and
rename it as a generic name.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarBaolin Wang <baolin.wang@linux.alibaba.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 8e756373

block/blk-merge.c

+44 −0
Original line number Diff line number Diff line
@@ -1052,3 +1052,47 @@ bool blk_attempt_plug_merge(struct request_queue *q, struct bio *bio, 


	return false;

}



/*

 * Iterate list of requests and see if we can merge this bio with any

 * of them.

 */

bool blk_bio_list_merge(struct request_queue *q, struct list_head *list,

			struct bio *bio, unsigned int nr_segs)

{

	struct request *rq;

	int checked = 8;



	list_for_each_entry_reverse(rq, list, queuelist) {

		bool merged = false;



		if (!checked--)

			break;



		if (!blk_rq_merge_ok(rq, bio))

			continue;



		switch (blk_try_merge(rq, bio)) {

		case ELEVATOR_BACK_MERGE:

			if (blk_mq_sched_allow_merge(q, rq, bio))

				merged = bio_attempt_back_merge(rq, bio,

						nr_segs);

			break;

		case ELEVATOR_FRONT_MERGE:

			if (blk_mq_sched_allow_merge(q, rq, bio))

				merged = bio_attempt_front_merge(rq, bio,

						nr_segs);

			break;

		case ELEVATOR_DISCARD_MERGE:

			merged = bio_attempt_discard_merge(q, rq, bio);

			break;

		default:

			continue;

		}



		return merged;

	}



	return false;

}

EXPORT_SYMBOL_GPL(blk_bio_list_merge);

block/blk-mq-sched.c

+1 −45
Original line number Diff line number Diff line
@@ -391,50 +391,6 @@ bool blk_mq_sched_try_merge(struct request_queue *q, struct bio *bio, 
}

EXPORT_SYMBOL_GPL(blk_mq_sched_try_merge);



/*

 * Iterate list of requests and see if we can merge this bio with any

 * of them.

 */

bool blk_mq_bio_list_merge(struct request_queue *q, struct list_head *list,

			   struct bio *bio, unsigned int nr_segs)

{

	struct request *rq;

	int checked = 8;



	list_for_each_entry_reverse(rq, list, queuelist) {

		bool merged = false;



		if (!checked--)

			break;



		if (!blk_rq_merge_ok(rq, bio))

			continue;



		switch (blk_try_merge(rq, bio)) {

		case ELEVATOR_BACK_MERGE:

			if (blk_mq_sched_allow_merge(q, rq, bio))

				merged = bio_attempt_back_merge(rq, bio,

						nr_segs);

			break;

		case ELEVATOR_FRONT_MERGE:

			if (blk_mq_sched_allow_merge(q, rq, bio))

				merged = bio_attempt_front_merge(rq, bio,

						nr_segs);

			break;

		case ELEVATOR_DISCARD_MERGE:

			merged = bio_attempt_discard_merge(q, rq, bio);

			break;

		default:

			continue;

		}



		return merged;

	}



	return false;

}

EXPORT_SYMBOL_GPL(blk_mq_bio_list_merge);



/*

 * Reverse check our software queue for entries that we could potentially

 * merge with. Currently includes a hand-wavy stop count of 8, to not spend
@@ -449,7 +405,7 @@ static bool blk_mq_attempt_merge(struct request_queue *q, 


	lockdep_assert_held(&ctx->lock);



	if (blk_mq_bio_list_merge(q, &ctx->rq_lists[type], bio, nr_segs)) {

	if (blk_bio_list_merge(q, &ctx->rq_lists[type], bio, nr_segs)) {

		ctx->rq_merged++;

		return true;

	}

block/blk.h

+2 −0
Original line number Diff line number Diff line
@@ -177,6 +177,8 @@ bool bio_attempt_discard_merge(struct request_queue *q, struct request *req, 
		struct bio *bio);

bool blk_attempt_plug_merge(struct request_queue *q, struct bio *bio,

		unsigned int nr_segs, struct request **same_queue_rq);

bool blk_bio_list_merge(struct request_queue *q, struct list_head *list,

			struct bio *bio, unsigned int nr_segs);



void blk_account_io_start(struct request *req);

void blk_account_io_done(struct request *req, u64 now);

block/kyber-iosched.c

+1 −1
Original line number Diff line number Diff line
@@ -573,7 +573,7 @@ static bool kyber_bio_merge(struct blk_mq_hw_ctx *hctx, struct bio *bio, 
	bool merged;



	spin_lock(&kcq->lock);

	merged = blk_mq_bio_list_merge(hctx->queue, rq_list, bio, nr_segs);

	merged = blk_bio_list_merge(hctx->queue, rq_list, bio, nr_segs);

	spin_unlock(&kcq->lock);



	return merged;

include/linux/blk-mq.h

+0 −2
Original line number Diff line number Diff line
@@ -489,8 +489,6 @@ void blk_mq_kick_requeue_list(struct request_queue *q); 
void blk_mq_delay_kick_requeue_list(struct request_queue *q, unsigned long msecs);

void blk_mq_complete_request(struct request *rq);

bool blk_mq_complete_request_remote(struct request *rq);

bool blk_mq_bio_list_merge(struct request_queue *q, struct list_head *list,

			   struct bio *bio, unsigned int nr_segs);

bool blk_mq_queue_stopped(struct request_queue *q);

void blk_mq_stop_hw_queue(struct blk_mq_hw_ctx *hctx);

void blk_mq_start_hw_queue(struct blk_mq_hw_ctx *hctx);

CRA Git | Maintained and supported by SUSTech CRA and CCSE