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

block: move the nowait flag to queue_limits 



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

Stacking drivers are simplified in that they now can simply set the
flag, and blk_stack_limits will clear it when the features is not
supported by any of the underlying devices.

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-20-hch@lst.de


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

block/blk-mq-debugfs.c

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

	QUEUE_FLAG_NAME(RQ_ALLOC_TIME),

	QUEUE_FLAG_NAME(HCTX_ACTIVE),

	QUEUE_FLAG_NAME(NOWAIT),

	QUEUE_FLAG_NAME(SQ_SCHED),

	QUEUE_FLAG_NAME(SKIP_TAGSET_QUIESCE),

};

block/blk-mq.c

+1 −1
Original line number Diff line number Diff line
@@ -4118,7 +4118,7 @@ struct request_queue *blk_mq_alloc_queue(struct blk_mq_tag_set *set, 


	if (!lim)

		lim = &default_lim;

	lim->features |= BLK_FEAT_IO_STAT;

	lim->features |= BLK_FEAT_IO_STAT | BLK_FEAT_NOWAIT;



	q = blk_alloc_queue(lim, set->numa_node);

	if (IS_ERR(q))

block/blk-settings.c

+9 −0
Original line number Diff line number Diff line
@@ -459,6 +459,15 @@ int blk_stack_limits(struct queue_limits *t, struct queue_limits *b, 


	t->features |= (b->features & BLK_FEAT_INHERIT_MASK);



	/*

	 * BLK_FEAT_NOWAIT needs to be supported both by the stacking driver

	 * and all underlying devices.  The stacking driver sets the flag

	 * before stacking the limits, and this will clear the flag if any

	 * of the underlying devices does not support it.

	 */

	if (!(b->features & BLK_FEAT_NOWAIT))

		t->features &= ~BLK_FEAT_NOWAIT;



	t->max_sectors = min_not_zero(t->max_sectors, b->max_sectors);

	t->max_user_sectors = min_not_zero(t->max_user_sectors,

			b->max_user_sectors);

drivers/block/brd.c

+2 −2
Original line number Diff line number Diff line
@@ -335,7 +335,8 @@ static int brd_alloc(int i) 
		.max_hw_discard_sectors	= UINT_MAX,

		.max_discard_segments	= 1,

		.discard_granularity	= PAGE_SIZE,

		.features		= BLK_FEAT_SYNCHRONOUS,

		.features		= BLK_FEAT_SYNCHRONOUS |

					  BLK_FEAT_NOWAIT,

	};



	list_for_each_entry(brd, &brd_devices, brd_list)
@@ -367,7 +368,6 @@ static int brd_alloc(int i) 
	strscpy(disk->disk_name, buf, DISK_NAME_LEN);

	set_capacity(disk, rd_size * 2);

	

	blk_queue_flag_set(QUEUE_FLAG_NOWAIT, disk->queue);

	err = add_disk(disk);

	if (err)

		goto out_cleanup_disk;

drivers/md/dm-table.c

+3 −15
Original line number Diff line number Diff line
@@ -582,7 +582,7 @@ int dm_split_args(int *argc, char ***argvp, char *input) 
static void dm_set_stacking_limits(struct queue_limits *limits)

{

	blk_set_stacking_limits(limits);

	limits->features |= BLK_FEAT_IO_STAT;

	limits->features |= BLK_FEAT_IO_STAT | BLK_FEAT_NOWAIT;

}



/*
@@ -1746,12 +1746,6 @@ static bool dm_table_supports_write_zeroes(struct dm_table *t) 
	return true;

}



static int device_not_nowait_capable(struct dm_target *ti, struct dm_dev *dev,

				     sector_t start, sector_t len, void *data)

{

	return !bdev_nowait(dev->bdev);

}



static bool dm_table_supports_nowait(struct dm_table *t)

{

	for (unsigned int i = 0; i < t->num_targets; i++) {
@@ -1759,10 +1753,6 @@ static bool dm_table_supports_nowait(struct dm_table *t) 


		if (!dm_target_supports_nowait(ti->type))

			return false;



		if (!ti->type->iterate_devices ||

		    ti->type->iterate_devices(ti, device_not_nowait_capable, NULL))

			return false;

	}



	return true;
@@ -1824,10 +1814,8 @@ int dm_table_set_restrictions(struct dm_table *t, struct request_queue *q, 
{

	int r;



	if (dm_table_supports_nowait(t))

		blk_queue_flag_set(QUEUE_FLAG_NOWAIT, q);

	else

		blk_queue_flag_clear(QUEUE_FLAG_NOWAIT, q);

	if (!dm_table_supports_nowait(t))

		limits->features &= ~BLK_FEAT_NOWAIT;



	if (!dm_table_supports_discards(t)) {

		limits->max_hw_discard_sectors = 0;