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

block: move the io_stat flag setting to queue_limits 



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

Simplify md and dm to set the flag unconditionally instead of avoiding
setting a simple flag for cases where it already is set by other means,
which is a bit pointless.

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


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

block/blk-mq-debugfs.c

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

	QUEUE_FLAG_NAME(SAME_COMP),

	QUEUE_FLAG_NAME(FAIL_IO),

	QUEUE_FLAG_NAME(IO_STAT),

	QUEUE_FLAG_NAME(NOXMERGES),

	QUEUE_FLAG_NAME(SYNCHRONOUS),

	QUEUE_FLAG_NAME(SAME_FORCE),

block/blk-mq.c

+5 −1
Original line number Diff line number Diff line
@@ -4116,7 +4116,11 @@ struct request_queue *blk_mq_alloc_queue(struct blk_mq_tag_set *set, 
	struct request_queue *q;

	int ret;



	q = blk_alloc_queue(lim ? lim : &default_lim, set->numa_node);

	if (!lim)

		lim = &default_lim;

	lim->features |= BLK_FEAT_IO_STAT;



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

	if (IS_ERR(q))

		return q;

	q->queuedata = queuedata;

block/blk-sysfs.c

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


QUEUE_SYSFS_FEATURE(rotational, BLK_FEAT_ROTATIONAL)

QUEUE_SYSFS_FEATURE(add_random, BLK_FEAT_ADD_RANDOM)

QUEUE_SYSFS_BIT_FNS(iostats, IO_STAT, 0);

QUEUE_SYSFS_FEATURE(iostats, BLK_FEAT_IO_STAT)

QUEUE_SYSFS_BIT_FNS(stable_writes, STABLE_WRITES, 0);

#undef QUEUE_SYSFS_BIT_FNS

drivers/md/dm-table.c

+9 −3
Original line number Diff line number Diff line
@@ -579,6 +579,12 @@ int dm_split_args(int *argc, char ***argvp, char *input) 
	return 0;

}



static void dm_set_stacking_limits(struct queue_limits *limits)

{

	blk_set_stacking_limits(limits);

	limits->features |= BLK_FEAT_IO_STAT;

}



/*

 * Impose necessary and sufficient conditions on a devices's table such

 * that any incoming bio which respects its logical_block_size can be
@@ -617,7 +623,7 @@ static int validate_hardware_logical_block_alignment(struct dm_table *t, 
	for (i = 0; i < t->num_targets; i++) {

		ti = dm_table_get_target(t, i);



		blk_set_stacking_limits(&ti_limits);

		dm_set_stacking_limits(&ti_limits);



		/* combine all target devices' limits */

		if (ti->type->iterate_devices)
@@ -1591,7 +1597,7 @@ int dm_calculate_queue_limits(struct dm_table *t, 
	unsigned int zone_sectors = 0;

	bool zoned = false;



	blk_set_stacking_limits(limits);

	dm_set_stacking_limits(limits);



	t->integrity_supported = true;

	for (unsigned int i = 0; i < t->num_targets; i++) {
@@ -1604,7 +1610,7 @@ int dm_calculate_queue_limits(struct dm_table *t, 
	for (unsigned int i = 0; i < t->num_targets; i++) {

		struct dm_target *ti = dm_table_get_target(t, i);



		blk_set_stacking_limits(&ti_limits);

		dm_set_stacking_limits(&ti_limits);



		if (!ti->type->iterate_devices) {

			/* Set I/O hints portion of queue limits */

drivers/md/dm.c

+3 −10
Original line number Diff line number Diff line
@@ -2386,22 +2386,15 @@ int dm_setup_md_queue(struct mapped_device *md, struct dm_table *t) 
	struct table_device *td;

	int r;



	switch (type) {

	case DM_TYPE_REQUEST_BASED:

	WARN_ON_ONCE(type == DM_TYPE_NONE);



	if (type == DM_TYPE_REQUEST_BASED) {

		md->disk->fops = &dm_rq_blk_dops;

		r = dm_mq_init_request_queue(md, t);

		if (r) {

			DMERR("Cannot initialize queue for request-based dm mapped device");

			return r;

		}

		break;

	case DM_TYPE_BIO_BASED:

	case DM_TYPE_DAX_BIO_BASED:

		blk_queue_flag_set(QUEUE_FLAG_IO_STAT, md->queue);

		break;

	case DM_TYPE_NONE:

		WARN_ON_ONCE(true);

		break;

	}



	r = dm_calculate_queue_limits(t, &limits);