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

block: move the add_random flag to queue_limits 



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

Note that this also removes code from dm to clear the flag based on
the underlying devices, which can't be reached as dm devices will
always start out without the flag set.

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


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

block/blk-mq-debugfs.c

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

	QUEUE_FLAG_NAME(IO_STAT),

	QUEUE_FLAG_NAME(NOXMERGES),

	QUEUE_FLAG_NAME(ADD_RANDOM),

	QUEUE_FLAG_NAME(SYNCHRONOUS),

	QUEUE_FLAG_NAME(SAME_FORCE),

	QUEUE_FLAG_NAME(INIT_DONE),

block/blk-sysfs.c

+3 −3
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ queue_##name##_store(struct request_queue *q, const char *page, size_t count) \ 
}



QUEUE_SYSFS_FEATURE(rotational, BLK_FEAT_ROTATIONAL)

QUEUE_SYSFS_BIT_FNS(random, ADD_RANDOM, 0);

QUEUE_SYSFS_FEATURE(add_random, BLK_FEAT_ADD_RANDOM)

QUEUE_SYSFS_BIT_FNS(iostats, IO_STAT, 0);

QUEUE_SYSFS_BIT_FNS(stable_writes, STABLE_WRITES, 0);

#undef QUEUE_SYSFS_BIT_FNS
@@ -561,7 +561,7 @@ static struct queue_sysfs_entry queue_hw_sector_size_entry = { 


QUEUE_RW_ENTRY(queue_rotational, "rotational");

QUEUE_RW_ENTRY(queue_iostats, "iostats");

QUEUE_RW_ENTRY(queue_random, "add_random");

QUEUE_RW_ENTRY(queue_add_random, "add_random");

QUEUE_RW_ENTRY(queue_stable_writes, "stable_writes");



#ifdef CONFIG_BLK_WBT
@@ -665,7 +665,7 @@ static struct attribute *queue_attrs[] = { 
	&queue_nomerges_entry.attr,

	&queue_iostats_entry.attr,

	&queue_stable_writes_entry.attr,

	&queue_random_entry.attr,

	&queue_add_random_entry.attr,

	&queue_poll_entry.attr,

	&queue_wc_entry.attr,

	&queue_fua_entry.attr,

drivers/block/mtip32xx/mtip32xx.c

+0 −1
Original line number Diff line number Diff line
@@ -3485,7 +3485,6 @@ static int mtip_block_initialize(struct driver_data *dd) 
		goto start_service_thread;



	/* Set device limits. */

	blk_queue_flag_clear(QUEUE_FLAG_ADD_RANDOM, dd->queue);

	dma_set_max_seg_size(&dd->pdev->dev, 0x400000);



	/* Set the capacity of the device in 512 byte sectors. */

drivers/md/dm-table.c

+0 −18
Original line number Diff line number Diff line
@@ -1716,14 +1716,6 @@ static int device_dax_write_cache_enabled(struct dm_target *ti, 
	return false;

}



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

			     sector_t start, sector_t len, void *data)

{

	struct request_queue *q = bdev_get_queue(dev->bdev);



	return !blk_queue_add_random(q);

}



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

					   sector_t start, sector_t len, void *data)

{
@@ -1876,16 +1868,6 @@ int dm_table_set_restrictions(struct dm_table *t, struct request_queue *q, 
	else

		blk_queue_flag_clear(QUEUE_FLAG_STABLE_WRITES, q);



	/*

	 * Determine whether or not this queue's I/O timings contribute

	 * to the entropy pool, Only request-based targets use this.

	 * Clear QUEUE_FLAG_ADD_RANDOM if any underlying device does not

	 * have it set.

	 */

	if (blk_queue_add_random(q) &&

	    dm_table_any_dev_attr(t, device_is_not_random, NULL))

		blk_queue_flag_clear(QUEUE_FLAG_ADD_RANDOM, q);



	/*

	 * For a zoned target, setup the zones related queue attributes

	 * and resources necessary for zone append emulation if necessary.

drivers/mmc/core/queue.c

+0 −2
Original line number Diff line number Diff line
@@ -387,8 +387,6 @@ static struct gendisk *mmc_alloc_disk(struct mmc_queue *mq, 
		blk_queue_flag_set(QUEUE_FLAG_STABLE_WRITES, mq->queue);

	blk_queue_rq_timeout(mq->queue, 60 * HZ);



	blk_queue_flag_clear(QUEUE_FLAG_ADD_RANDOM, mq->queue);



	dma_set_max_seg_size(mmc_dev(host), queue_max_segment_size(mq->queue));



	INIT_WORK(&mq->recovery_work, mmc_mq_recovery_handler);