Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-09 14:43:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

blk-mq: Add blk_mq_tag_update_sched_shared_sbitmap()

Browse Source 
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: John Garry <john.garry@huawei.com>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Link: https://lore.kernel.org/r/1633429419-228500-10-git-send-email-john.garry@huawei.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
John Garry 2021-10-05 18:23:34 +08:00 committed by Jens Axboe
parent 4f245d5bf0
commit a7e7388dce
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
block/blk-mq-sched.c
View File

@ -575,8 +575,7 @@ static int blk_mq_init_sched_shared_sbitmap(struct request_queue *queue)
&queue->sched_breserved_tags; &queue->sched_breserved_tags;
} }
sbitmap_queue_resize(&queue->sched_bitmap_tags, blk_mq_tag_update_sched_shared_sbitmap(queue);
queue->nr_requests - set->reserved_tags);
return 0; return 0;
} }

6
block/blk-mq-tag.c
View File

@ -634,6 +634,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); 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 * blk_mq_unique_tag() - return a tag that is unique queue-wide
* @rq: request for which to compute a unique tag * @rq: request for which to compute a unique tag

1
block/blk-mq-tag.h
View File

@ -50,6 +50,7 @@ extern int blk_mq_tag_update_depth(struct blk_mq_hw_ctx *hctx,
unsigned int depth, bool can_grow); unsigned int depth, bool can_grow);
extern void blk_mq_tag_resize_shared_sbitmap(struct blk_mq_tag_set *set, extern void blk_mq_tag_resize_shared_sbitmap(struct blk_mq_tag_set *set,
unsigned int size); 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); 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, void blk_mq_queue_tag_busy_iter(struct request_queue *q, busy_iter_fn *fn,

3
block/blk-mq.c
View File

@ -3650,8 +3650,7 @@ int blk_mq_update_nr_requests(struct request_queue *q, unsigned int nr)
q->nr_requests = nr; q->nr_requests = nr;
if (blk_mq_is_sbitmap_shared(set->flags)) { if (blk_mq_is_sbitmap_shared(set->flags)) {
if (q->elevator) if (q->elevator)
sbitmap_queue_resize(&q->sched_bitmap_tags, blk_mq_tag_update_sched_shared_sbitmap(q);
nr - set->reserved_tags);
else else
blk_mq_tag_resize_shared_sbitmap(set, nr); blk_mq_tag_resize_shared_sbitmap(set, nr);
} }