Re: [PATCH RESEND v3 12/13] blk-mq: Use shared tags for shared sbitmap support

[John Garry <john.garry@xxxxxxxxxx>]

...

> >    static int blk_mq_init_sched_shared_sbitmap(struct request_queue *queue)
> >    {
> >    	struct blk_mq_tag_set *set = queue->tag_set;
> > -	int alloc_policy = BLK_MQ_FLAG_TO_ALLOC_POLICY(set->flags);
> > -	struct blk_mq_hw_ctx *hctx;
> > -	int ret, i;
> >    
> >    	/*
> >    	 * Set initial depth at max so that we don't need to reallocate for
> >    	 * updating nr_requests.
> >    	 */
> > -	ret = blk_mq_init_bitmaps(&queue->sched_bitmap_tags,
> > -				  &queue->sched_breserved_tags,
> > -				  MAX_SCHED_RQ, set->reserved_tags,
> > -				  set->numa_node, alloc_policy);
> > -	if (ret)
> > -		return ret;
> > -
> > -	queue_for_each_hw_ctx(queue, hctx, i) {
> > -		hctx->sched_tags->bitmap_tags =
> > -					&queue->sched_bitmap_tags;
> > -		hctx->sched_tags->breserved_tags =
> > -					&queue->sched_breserved_tags;
> > -	}
> > +	queue->shared_sbitmap_tags = blk_mq_alloc_map_and_rqs(set,
> > +						BLK_MQ_NO_HCTX_IDX,
> > +						MAX_SCHED_RQ);
> > +	if (!queue->shared_sbitmap_tags)
> > +		return -ENOMEM;
> >    
>
> Any particular reason why the 'shared_sbitmap_tags' pointer is added to
> the request queue and not the tagset?
> Everything else is located there, so I would have found it more logical
> to add the 'shared_sbitmap_tags' pointer to the tagset, not the queue ...

We already have it for both. Since commit d97e594c5166 ("blk-mq: Use 
request queue-wide tags for tagset-wide sbitmap"), we have a "shared 
sbitmap" per tagset and per request queue. If you check d97e594c5166 
then it should explain the reason.

> >    	blk_mq_tag_update_sched_shared_sbitmap(queue);
> >    
> >    	return 0;
> >    }
> >    
> > -static void blk_mq_exit_sched_shared_sbitmap(struct request_queue *queue)
> > -{
> > -	sbitmap_queue_free(&queue->sched_bitmap_tags);
> > -	sbitmap_queue_free(&queue->sched_breserved_tags);
> > -}
> > -
> >    int blk_mq_init_sched(struct request_queue *q, struct elevator_type *e)
> >    {
> > +	unsigned int i, flags = q->tag_set->flags;
> >    	struct blk_mq_hw_ctx *hctx;
> >    	struct elevator_queue *eq;
> > -	unsigned int i;
> >    	int ret;
> >    
> >    	if (!e) {
> > @@ -598,21 +596,21 @@ int blk_mq_init_sched(struct request_queue *q, struct elevator_type *e)
> >    	q->nr_requests = 2 * min_t(unsigned int, q->tag_set->queue_depth,
> >    				   BLKDEV_DEFAULT_RQ);
> >    
> > -	queue_for_each_hw_ctx(q, hctx, i) {
> > -		ret = blk_mq_sched_alloc_map_and_rqs(q, hctx, i);
> > +	if (blk_mq_is_sbitmap_shared(flags)) {
> > +		ret = blk_mq_init_sched_shared_sbitmap(q); >   		if (ret)
> > -			goto err_free_map_and_rqs;
> > +			return ret;
> >    	}
> >    
> > -	if (blk_mq_is_sbitmap_shared(q->tag_set->flags)) {
> > -		ret = blk_mq_init_sched_shared_sbitmap(q);
> > +	queue_for_each_hw_ctx(q, hctx, i) {
> > +		ret = blk_mq_sched_alloc_map_and_rqs(q, hctx, i);
> >    		if (ret)
> >    			goto err_free_map_and_rqs;
> >    	}
> >    
> >    	ret = e->ops.init_sched(q, e);
> >    	if (ret)
> > -		goto err_free_sbitmap;
> > +		goto err_free_map_and_rqs;
> >    
> >    	blk_mq_debugfs_register_sched(q);
> >    
> > @@ -632,12 +630,10 @@ int blk_mq_init_sched(struct request_queue *q, struct elevator_type *e)
> >    
> >    	return 0;
> >    
> > -err_free_sbitmap:
> > -	if (blk_mq_is_sbitmap_shared(q->tag_set->flags))
> > -		blk_mq_exit_sched_shared_sbitmap(q);
> > -	blk_mq_sched_free_rqs(q);
> >    err_free_map_and_rqs:
> > -	blk_mq_sched_tags_teardown(q);
> > +	blk_mq_sched_free_rqs(q);
> > +	blk_mq_sched_tags_teardown(q, flags);
> > +
> >    	q->elevator = NULL;
> >    	return ret;
> >    }
> > @@ -651,9 +647,15 @@ void blk_mq_sched_free_rqs(struct request_queue *q)
> >    	struct blk_mq_hw_ctx *hctx;
> >    	int i;
> >    
> > -	queue_for_each_hw_ctx(q, hctx, i) {
> > -		if (hctx->sched_tags)
> > -			blk_mq_free_rqs(q->tag_set, hctx->sched_tags, i);
> > +	if (blk_mq_is_sbitmap_shared(q->tag_set->flags)) {
> > +		blk_mq_free_rqs(q->tag_set, q->shared_sbitmap_tags,
> > +				BLK_MQ_NO_HCTX_IDX);
>
> 'if (q->shared_sbitmap_tags)'
>
> would be more obvious here ...

I suppose so. I am just doing it this way for consistency.

> > +	} else {
> > +		queue_for_each_hw_ctx(q, hctx, i) {
> > +			if (hctx->sched_tags)
> > +				blk_mq_free_rqs(q->tag_set,
> > +						hctx->sched_tags, i);
> > +		}
> >    	}
> >    }
> >    

...

> >    };
> > @@ -432,6 +429,8 @@ enum {
> >    	((policy & ((1 << BLK_MQ_F_ALLOC_POLICY_BITS) - 1)) \
> >    		<< BLK_MQ_F_ALLOC_POLICY_START_BIT)
> >    
> > +#define BLK_MQ_NO_HCTX_IDX	(-1U)
> > +
> >    struct gendisk *__blk_mq_alloc_disk(struct blk_mq_tag_set *set, void *queuedata,
> >    		struct lock_class_key *lkclass);
> >    #define blk_mq_alloc_disk(set, queuedata)				\
> > diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
> > index 4baf9435232d..17e50e5ef47b 100644
> > --- a/include/linux/blkdev.h
> > +++ b/include/linux/blkdev.h
> > @@ -459,8 +459,7 @@ struct request_queue {
> >    
> >    	atomic_t		nr_active_requests_shared_sbitmap;
> >    
> > -	struct sbitmap_queue	sched_bitmap_tags;
> > -	struct sbitmap_queue	sched_breserved_tags;
> > +	struct blk_mq_tags	*shared_sbitmap_tags;
> >    
> >    	struct list_head	icq_list;
> >    #ifdef CONFIG_BLK_CGROUP
> Why the double shared_sbitmap_tags pointer in struct request_queue and
> struct tag_set? To my knowledge there's a 1:1 relationship between
> request_queue and tag_set, so where's the point?

As above, we also added a shared sbitmap per request queue.

The reason being that for "shared sbitmap" support, the request queue 
total depth should not grow for an increase in the number of HW queues.

Thanks,
John