Commit dcaefd5d authored by John Garry's avatar John Garry Committed by Zheng Zengkai
Browse files

blk-mq: Pass driver tags to blk_mq_clear_rq_mapping() 

mainline inclusion
from mainline-v5.16-rc1
commit f32e4eaf
category: performance
bugzilla: 186917, https://gitee.com/openeuler/kernel/issues/I5N1S5
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=f32e4eafaf29aa493bdea3123dac09ad135b599b



--------------------------------

Function blk_mq_clear_rq_mapping() will be used for shared sbitmap tags
in future, so pass a driver tags pointer instead of the tagset container
and HW queue index.

Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarMing Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/1633429419-228500-8-git-send-email-john.garry@huawei.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarJason Yan <yanaijie@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 456e4454

block/blk-mq.c

+7 −5
Original line number Diff line number Diff line
@@ -2432,10 +2432,9 @@ static size_t order_to_size(unsigned int order) 
}



/* called before freeing request pool in @tags */

static void blk_mq_clear_rq_mapping(struct blk_mq_tag_set *set,

		struct blk_mq_tags *tags, unsigned int hctx_idx)

static void blk_mq_clear_rq_mapping(struct blk_mq_tags *drv_tags,

				    struct blk_mq_tags *tags)

{

	struct blk_mq_tags *drv_tags = set->tags[hctx_idx];

	struct page *page;

	unsigned long flags;
@@ -2444,7 +2443,7 @@ static void blk_mq_clear_rq_mapping(struct blk_mq_tag_set *set, 
		unsigned long end = start + order_to_size(page->private);

		int i;



		for (i = 0; i < set->queue_depth; i++) {

		for (i = 0; i < drv_tags->nr_tags; i++) {

			struct request *rq = drv_tags->rqs[i];

			unsigned long rq_addr = (unsigned long)rq;
@@ -2468,8 +2467,11 @@ static void blk_mq_clear_rq_mapping(struct blk_mq_tag_set *set, 
void blk_mq_free_rqs(struct blk_mq_tag_set *set, struct blk_mq_tags *tags,

		     unsigned int hctx_idx)

{

	struct blk_mq_tags *drv_tags;

	struct page *page;



	drv_tags = set->tags[hctx_idx];



	if (tags->static_rqs && set->ops->exit_request) {

		int i;
@@ -2483,7 +2485,7 @@ void blk_mq_free_rqs(struct blk_mq_tag_set *set, struct blk_mq_tags *tags, 
		}

	}



	blk_mq_clear_rq_mapping(set, tags, hctx_idx);

	blk_mq_clear_rq_mapping(drv_tags, tags);



	while (!list_empty(&tags->page_list)) {

		page = list_first_entry(&tags->page_list, struct page, lru);