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

blk-mq: Add blk_mq_tag_update_sched_shared_sbitmap() 

mainline inclusion
from mainline-v5.16-rc1
commit a7e7388d
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=a7e7388dced47a10ca13ae95ca975ea2830f196b



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

Put the functionality to update the sched shared sbitmap size in a common
function.

Since the same formula is always used to resize, and it can be got from
the request queue argument, so just pass the request queue pointer.

Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Reviewed-by: default avatarMing Lei <ming.lei@redhat.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Link: https://lore.kernel.org/r/1633429419-228500-10-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 55419a90

block/blk-mq-sched.c

+1 −2
Original line number Diff line number Diff line
@@ -574,8 +574,7 @@ static int blk_mq_init_sched_shared_sbitmap(struct request_queue *queue) 
					&queue->sched_breserved_tags;

	}



	sbitmap_queue_resize(&queue->sched_bitmap_tags,

			     queue->nr_requests - set->reserved_tags);

	blk_mq_tag_update_sched_shared_sbitmap(queue);



	return 0;

}

block/blk-mq-tag.c

+6 −0
Original line number Diff line number Diff line
@@ -701,6 +701,12 @@ void blk_mq_tag_resize_shared_sbitmap(struct blk_mq_tag_set *set, unsigned int s 
	sbitmap_queue_resize(&set->__bitmap_tags, size - set->reserved_tags);

}



void blk_mq_tag_update_sched_shared_sbitmap(struct request_queue *q)

{

	sbitmap_queue_resize(&q->sched_bitmap_tags,

			     q->nr_requests - q->tag_set->reserved_tags);

}



/**

 * blk_mq_unique_tag() - return a tag that is unique queue-wide

 * @rq: request for which to compute a unique tag

block/blk-mq-tag.h

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ extern int blk_mq_tag_update_depth(struct blk_mq_hw_ctx *hctx, 
					unsigned int depth, bool can_grow);

extern void blk_mq_tag_resize_shared_sbitmap(struct blk_mq_tag_set *set,

					     unsigned int size);

extern void blk_mq_tag_update_sched_shared_sbitmap(struct request_queue *q);



extern void blk_mq_tag_wakeup_all(struct blk_mq_tags *tags, bool);

void blk_mq_queue_tag_busy_iter(struct request_queue *q, busy_iter_fn *fn,

block/blk-mq.c

+1 −2
Original line number Diff line number Diff line
@@ -3792,8 +3792,7 @@ int blk_mq_update_nr_requests(struct request_queue *q, unsigned int nr) 
		q->nr_requests = nr;

		if (blk_mq_is_sbitmap_shared(set->flags)) {

			if (q->elevator)

				sbitmap_queue_resize(&q->sched_bitmap_tags,

						     nr - set->reserved_tags);

				blk_mq_tag_update_sched_shared_sbitmap(q);

			else

				blk_mq_tag_resize_shared_sbitmap(set, nr);

		}