Commit 9c1e42e3 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: move the pci_p2pdma flag to queue_limits 



Move the pci_p2pdma 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-25-hch@lst.de


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

block/blk-mq-debugfs.c

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

	QUEUE_FLAG_NAME(REGISTERED),

	QUEUE_FLAG_NAME(QUIESCED),

	QUEUE_FLAG_NAME(PCI_P2PDMA),

	QUEUE_FLAG_NAME(RQ_ALLOC_TIME),

	QUEUE_FLAG_NAME(HCTX_ACTIVE),

	QUEUE_FLAG_NAME(SQ_SCHED),

drivers/nvme/host/core.c

+3 −5
Original line number Diff line number Diff line
@@ -3735,6 +3735,9 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, struct nvme_ns_info *info) 


	if (ctrl->opts && ctrl->opts->data_digest)

		lim.features |= BLK_FEAT_STABLE_WRITES;

	if (ctrl->ops->supports_pci_p2pdma &&

	    ctrl->ops->supports_pci_p2pdma(ctrl))

		lim.features |= BLK_FEAT_PCI_P2PDMA;



	disk = blk_mq_alloc_disk(ctrl->tagset, &lim, ns);

	if (IS_ERR(disk))
@@ -3744,11 +3747,6 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, struct nvme_ns_info *info) 


	ns->disk = disk;

	ns->queue = disk->queue;



	if (ctrl->ops->supports_pci_p2pdma &&

	    ctrl->ops->supports_pci_p2pdma(ctrl))

		blk_queue_flag_set(QUEUE_FLAG_PCI_P2PDMA, ns->queue);



	ns->ctrl = ctrl;

	kref_init(&ns->kref);

include/linux/blkdev.h

+4 −3
Original line number Diff line number Diff line
@@ -319,6 +319,9 @@ enum { 


	/* supports Zone Reset All */

	BLK_FEAT_ZONE_RESETALL			= (1u << 11),



	/* supports PCI(e) p2p requests */

	BLK_FEAT_PCI_P2PDMA			= (1u << 12),

};



/*
@@ -588,7 +591,6 @@ struct request_queue { 
#define QUEUE_FLAG_STATS	20	/* track IO start and completion times */

#define QUEUE_FLAG_REGISTERED	22	/* queue has been registered to a disk */

#define QUEUE_FLAG_QUIESCED	24	/* queue has been quiesced */

#define QUEUE_FLAG_PCI_P2PDMA	25	/* device supports PCI p2p requests */

#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 */
@@ -611,8 +613,7 @@ bool blk_queue_flag_test_and_set(unsigned int flag, struct request_queue *q); 
#define blk_queue_zone_resetall(q)	\

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

#define blk_queue_dax(q)	((q)->limits.features & BLK_FEAT_DAX)

#define blk_queue_pci_p2pdma(q)	\

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

#define blk_queue_pci_p2pdma(q)	((q)->limits.features & BLK_FEAT_PCI_P2PDMA)

#ifdef CONFIG_BLK_RQ_ALLOC_TIME

#define blk_queue_rq_alloc_time(q)	\

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