On Thu, May 13, 2021 at 08:00:57PM +0800, John Garry wrote:
> The tag allocation code to alloc the sbitmap pairs is common for regular
> bitmaps tags and shared sbitmap, so refactor into a common function.
>
> Also remove superfluous "flags" argument from blk_mq_init_shared_sbitmap().
>
> Signed-off-by: John Garry <john.garry@xxxxxxxxxx>
> ---
> block/blk-mq-tag.c | 54 ++++++++++++++++++++++++++++------------------
> block/blk-mq-tag.h | 9 +++++---
> block/blk-mq.c | 2 +-
> 3 files changed, 40 insertions(+), 25 deletions(-)
>
> diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c
> index 2a37731e8244..45479c0f88a2 100644
> --- a/block/blk-mq-tag.c
> +++ b/block/blk-mq-tag.c
> @@ -445,39 +445,54 @@ static int bt_alloc(struct sbitmap_queue *bt, unsigned int depth,
> node);
> }
>
> -static int blk_mq_init_bitmap_tags(struct blk_mq_tags *tags,
> - int node, int alloc_policy)
> +int blk_mq_init_bitmaps(struct sbitmap_queue *bitmap_tags,
> + struct sbitmap_queue *breserved_tags,
> + unsigned int queue_depth, unsigned int reserved,
> + int node, int alloc_policy)
> {
> - unsigned int depth = tags->nr_tags - tags->nr_reserved_tags;
> + unsigned int depth = queue_depth - reserved;
> bool round_robin = alloc_policy == BLK_TAG_ALLOC_RR;
>
> - if (bt_alloc(&tags->__bitmap_tags, depth, round_robin, node))
> + if (bt_alloc(bitmap_tags, depth, round_robin, node))
> return -ENOMEM;
> - if (bt_alloc(&tags->__breserved_tags, tags->nr_reserved_tags,
> - round_robin, node))
> + if (bt_alloc(breserved_tags, reserved, round_robin, node))
> goto free_bitmap_tags;
>
> + return 0;
> +
> +free_bitmap_tags:
> + sbitmap_queue_free(bitmap_tags);
> + return -ENOMEM;
> +}
> +
> +static int blk_mq_init_bitmap_tags(struct blk_mq_tags *tags,
> + int node, int alloc_policy)
> +{
> + int ret;
> +
> + ret = blk_mq_init_bitmaps(&tags->__bitmap_tags,
> + &tags->__breserved_tags,
> + tags->nr_tags, tags->nr_reserved_tags,
> + node, alloc_policy);
> + if (ret)
> + return ret;
> +
> tags->bitmap_tags = &tags->__bitmap_tags;
> tags->breserved_tags = &tags->__breserved_tags;
>
> return 0;
> -free_bitmap_tags:
> - sbitmap_queue_free(&tags->__bitmap_tags);
> - return -ENOMEM;
> }
>
> -int blk_mq_init_shared_sbitmap(struct blk_mq_tag_set *set, unsigned int flags)
> +int blk_mq_init_shared_sbitmap(struct blk_mq_tag_set *set)
> {
> - unsigned int depth = set->queue_depth - set->reserved_tags;
> int alloc_policy = BLK_MQ_FLAG_TO_ALLOC_POLICY(set->flags);
> - bool round_robin = alloc_policy == BLK_TAG_ALLOC_RR;
> - int i, node = set->numa_node;
> + int i, ret;
>
> - if (bt_alloc(&set->__bitmap_tags, depth, round_robin, node))
> - return -ENOMEM;
> - if (bt_alloc(&set->__breserved_tags, set->reserved_tags,
> - round_robin, node))
> - goto free_bitmap_tags;
> + ret = blk_mq_init_bitmaps(&set->__bitmap_tags, &set->__breserved_tags,
> + set->queue_depth, set->reserved_tags,
> + set->numa_node, alloc_policy);
> + if (ret)
> + return ret;
>
> for (i = 0; i < set->nr_hw_queues; i++) {
> struct blk_mq_tags *tags = set->tags[i];
> @@ -487,9 +502,6 @@ int blk_mq_init_shared_sbitmap(struct blk_mq_tag_set *set, unsigned int flags)
> }
>
> return 0;
> -free_bitmap_tags:
> - sbitmap_queue_free(&set->__bitmap_tags);
> - return -ENOMEM;
> }
>
> void blk_mq_exit_shared_sbitmap(struct blk_mq_tag_set *set)
> diff --git a/block/blk-mq-tag.h b/block/blk-mq-tag.h
> index 7d3e6b333a4a..2a718c8d080f 100644
> --- a/block/blk-mq-tag.h
> +++ b/block/blk-mq-tag.h
> @@ -26,11 +26,14 @@ extern struct blk_mq_tags *blk_mq_init_tags(unsigned int nr_tags,
> unsigned int reserved_tags,
> int node, unsigned int flags);
> extern void blk_mq_free_tags(struct blk_mq_tags *tags, unsigned int flags);
> +extern int blk_mq_init_bitmaps(struct sbitmap_queue *bitmap_tags,
> + struct sbitmap_queue *breserved_tags,
> + unsigned int queue_depth,
> + unsigned int reserved,
> + int node, int alloc_policy);
>
> -extern int blk_mq_init_shared_sbitmap(struct blk_mq_tag_set *set,
> - unsigned int flags);
> +extern int blk_mq_init_shared_sbitmap(struct blk_mq_tag_set *set);
> extern void blk_mq_exit_shared_sbitmap(struct blk_mq_tag_set *set);
> -
> extern unsigned int blk_mq_get_tag(struct blk_mq_alloc_data *data);
> extern void blk_mq_put_tag(struct blk_mq_tags *tags, struct blk_mq_ctx *ctx,
> unsigned int tag);
> diff --git a/block/blk-mq.c b/block/blk-mq.c
> index 466676bc2f0b..499ad5462f7e 100644
> --- a/block/blk-mq.c
> +++ b/block/blk-mq.c
> @@ -3488,7 +3488,7 @@ int blk_mq_alloc_tag_set(struct blk_mq_tag_set *set)
> if (blk_mq_is_sbitmap_shared(set->flags)) {
> atomic_set(&set->active_queues_shared_sbitmap, 0);
>
> - if (blk_mq_init_shared_sbitmap(set, set->flags)) {
> + if (blk_mq_init_shared_sbitmap(set)) {
> ret = -ENOMEM;
> goto out_free_mq_rq_maps;
> }
> --
> 2.26.2
>
Reviewed-by: Ming Lei <ming.lei@xxxxxxxxxx>
--
Ming
