Commit 8c8f5c85 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: move the skip_tagset_quiesce flag to queue_limits 



Move the skip_tagset_quiesce flag into the queue_limits feature field so
that it can be set atomically with the queue frozen.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Link: https://lore.kernel.org/r/20240617060532.127975-26-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 9c1e42e3

block/blk-mq-debugfs.c

+0 −1
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ static const char *const blk_queue_flag_name[] = { 
	QUEUE_FLAG_NAME(RQ_ALLOC_TIME),

	QUEUE_FLAG_NAME(HCTX_ACTIVE),

	QUEUE_FLAG_NAME(SQ_SCHED),

	QUEUE_FLAG_NAME(SKIP_TAGSET_QUIESCE),

};

#undef QUEUE_FLAG_NAME

drivers/nvme/host/core.c

+5 −3
Original line number Diff line number Diff line
@@ -4489,13 +4489,15 @@ int nvme_alloc_io_tag_set(struct nvme_ctrl *ctrl, struct blk_mq_tag_set *set, 
		return ret;



	if (ctrl->ops->flags & NVME_F_FABRICS) {

		ctrl->connect_q = blk_mq_alloc_queue(set, NULL, NULL);

		struct queue_limits lim = {

			.features	= BLK_FEAT_SKIP_TAGSET_QUIESCE,

		};



		ctrl->connect_q = blk_mq_alloc_queue(set, &lim, NULL);

        	if (IS_ERR(ctrl->connect_q)) {

			ret = PTR_ERR(ctrl->connect_q);

			goto out_free_tag_set;

		}

		blk_queue_flag_set(QUEUE_FLAG_SKIP_TAGSET_QUIESCE,

				   ctrl->connect_q);

	}



	ctrl->tagset = set;

include/linux/blkdev.h

+4 −2
Original line number Diff line number Diff line
@@ -322,6 +322,9 @@ enum { 


	/* supports PCI(e) p2p requests */

	BLK_FEAT_PCI_P2PDMA			= (1u << 12),



	/* skip this queue in blk_mq_(un)quiesce_tagset */

	BLK_FEAT_SKIP_TAGSET_QUIESCE		= (1u << 13),

};



/*
@@ -594,7 +597,6 @@ struct request_queue { 
#define QUEUE_FLAG_RQ_ALLOC_TIME 27	/* record rq->alloc_time_ns */

#define QUEUE_FLAG_HCTX_ACTIVE	28	/* at least one blk-mq hctx is active */

#define QUEUE_FLAG_SQ_SCHED     30	/* single queue style io dispatch */

#define QUEUE_FLAG_SKIP_TAGSET_QUIESCE	31 /* quiesce_tagset skip the queue*/



#define QUEUE_FLAG_MQ_DEFAULT	(1UL << QUEUE_FLAG_SAME_COMP)
@@ -629,7 +631,7 @@ bool blk_queue_flag_test_and_set(unsigned int flag, struct request_queue *q); 
#define blk_queue_registered(q)	test_bit(QUEUE_FLAG_REGISTERED, &(q)->queue_flags)

#define blk_queue_sq_sched(q)	test_bit(QUEUE_FLAG_SQ_SCHED, &(q)->queue_flags)

#define blk_queue_skip_tagset_quiesce(q) \

	test_bit(QUEUE_FLAG_SKIP_TAGSET_QUIESCE, &(q)->queue_flags)

	((q)->limits.features & BLK_FEAT_SKIP_TAGSET_QUIESCE)



extern void blk_set_pm_only(struct request_queue *q);

extern void blk_clear_pm_only(struct request_queue *q);