a fix and two cleanups around blk_stack_limits
Subsystems (4)
Christoph Hellwig
maintainerHi Jens,
this series ensures that the zoned device limitations are properly inherited in blk_stack_limits, and then cleanups up two rather pointless wrappers around it.
Christoph Hellwig
maintainerPATCH 1/3 block: inherit the zoned characteristics in blk_stack_limits
Lift the code from device mapper into blk_stack_limits to inherity the stacking limitations. This ensures we do the right thing for all stacked zoned block devices.
--- block/blk-settings.c | 1 + drivers/md/dm-table.c | 19 ------------------- include/linux/blkdev.h | 9 ++++++--- 3 files changed, 7 insertions(+), 22 deletions(-)
block/blk-settings.c +1 -0
@@ -609,6 +609,7 @@ int blk_stack_limits(struct queue_limits *t, struct queue_limits *b, t->chunk_sectors =min_not_zero (t->chunk_sectors, b->chunk_sectors); + t->zoned =max (t->zoned, b->zoned);return ret; }EXPORT_SYMBOL (blk_stack_limits);
drivers/md/dm-table.c +0 -19
@@ -467,9 +467,6 @@ static int dm_set_device_limits(struct dm_target *ti, struct dm_dev *dev, q->limits.logical_block_size, q->limits.alignment_offset, (unsigned long long) start << SECTOR_SHIFT); - - limits->zoned =blk_queue_zoned_model (q); -return 0 ; }
@@ -1528,22 +1525,6 @@ int dm_calculate_queue_limits(struct dm_table *table,dm_device_name (table->md), (unsigned long long ) ti->begin, (unsigned long long) ti->len); - -/* -* FIXME: this should likely be moved to blk_stack_limits(), would -* also eliminate limits->zoned stacking hack in dm_set_device_limits() -*/ -if (limits->zoned ==BLK_ZONED_NONE && ti_limits.zoned !=BLK_ZONED_NONE ) { -/* -* By default, the stacked limits zoned model is set to -* BLK_ZONED_NONE in blk_set_stacking_limits(). Update -* this model using the first target model reported -* that is not BLK_ZONED_NONE. This will be either the -* first target device zoned model or the model reported -* by the target .io_hints. -*/ - limits->zoned = ti_limits.zoned; - } }/*
include/linux/blkdev.h +6 -3
@@ -306,11 +306,14 @@ enum blk_queue_state {/* * Zoned block device models (zoned limit). +* +* Note: This needs to be ordered from the least to the most severe +* restrictions for the inheritance in blk_stack_limits() to work. */ enum blk_zoned_model { -BLK_ZONED_NONE ,/* Regular block device */ -BLK_ZONED_HA ,/* Host-aware zoned block device */ -BLK_ZONED_HM ,/* Host-managed zoned block device */ +BLK_ZONED_NONE =0 ,/* Regular block device */ +BLK_ZONED_HA ,/* Host-aware zoned block device */ +BLK_ZONED_HM ,/* Host-managed zoned block device */ };struct queue_limits {
Signature · 1 line
2.27.0
Re: [PATCH 1/3] block: inherit the zoned characteristics in blk_stack_limits
include/linux/blkdev.h enum blk_queue_state { · line 314
Quoted 11 lines · Christoph Hellwig
/*
* Zoned block device models (zoned limit).
+ *
+ * Note: This needs to be ordered from the least to the most severe
+ * restrictions for the inheritance inblk_stack_limits()to work. */
enumblk_zoned_model{include/linux/blkdev.h +1
-3-BLK_ZONED_NONE ,/* Regular block device */ -BLK_ZONED_HA ,/* Host-aware zoned block device */ - BLK_ZONED_HM, /* Host-managed zoned block device */ + BLK_ZONED_NONE = 0, /* Regular block device */
The initialization to 0 for the first value is not needed.
Apart from that,
Re: [PATCH 1/3] block: inherit the zoned characteristics in blk_stack_limits
In reply to Christoph HellwigQuoted 73 lines · Christoph Hellwig
Lift the code from device mapper into
blk_stack_limitsto inherity the stacking limitations. This ensures we do the right thing for all stacked zoned block devices.Signed-off-by Christoph Hellwig <[email protected]>--- block/blk-settings.c | 1 + drivers/md/dm-table.c | 19 ------------------- include/linux/blkdev.h | 9 ++++++--- 3 files changed, 7 insertions(+), 22 deletions(-)block/blk-settings.c +1
-0@@ -609,6 +609,7 @@ int blk_stack_limits(struct queue_limits *t, struct queue_limits *b, t->chunk_sectors =min_not_zero (t->chunk_sectors, b->chunk_sectors); + t->zoned =max (t->zoned, b->zoned);return ret; }EXPORT_SYMBOL (blk_stack_limits);drivers/md/dm-table.c +0
-19@@ -467,9 +467,6 @@ static int dm_set_device_limits(struct dm_target *ti, struct dm_dev *dev, q->limits.logical_block_size, q->limits.alignment_offset, (unsigned long long) start << SECTOR_SHIFT); - - limits->zoned =blk_queue_zoned_model (q); -return 0 ; }@@ -1528,22 +1525,6 @@ int dm_calculate_queue_limits(struct dm_table *table,dm_device_name (table->md), (unsigned long long ) ti->begin, (unsigned long long) ti->len); - -/* -* FIXME: this should likely be moved to blk_stack_limits(), would -* also eliminate limits->zoned stacking hack in dm_set_device_limits() -*/ -if (limits->zoned ==BLK_ZONED_NONE && ti_limits.zoned !=BLK_ZONED_NONE ) { -/* -* By default, the stacked limits zoned model is set to -* BLK_ZONED_NONE in blk_set_stacking_limits(). Update -* this model using the first target model reported -* that is not BLK_ZONED_NONE. This will be either the -* first target device zoned model or the model reported -* by the target .io_hints. -*/ - limits->zoned = ti_limits.zoned; - } }/* include/linux/blkdev.h +3
-0@@ -306,11 +306,14 @@ enum blk_queue_state {/* * Zoned block device models (zoned limit). +* +* Note: This needs to be ordered from the least to the most severe +* restrictions for the inheritance in blk_stack_limits() to work. */
include/linux/blkdev.h enum blk_queue_state { · line 319
Quoted 10 lines
include/linux/blkdev.h +3
-3enum blk_zoned_model { -BLK_ZONED_NONE ,/* Regular block device */ -BLK_ZONED_HA ,/* Host-aware zoned block device */ -BLK_ZONED_HM ,/* Host-managed zoned block device */ +BLK_ZONED_NONE =0 ,/* Regular block device */ +BLK_ZONED_HA ,/* Host-aware zoned block device */ +BLK_ZONED_HM ,/* Host-managed zoned block device */ };struct queue_limits {
Looks good.
Signature · 2 lines
Damien Le Moal Western Digital Research
Re: [PATCH 1/3] block: inherit the zoned characteristics in blk_stack_limits
In reply to Christoph HellwigQuoted 5 lines · Christoph Hellwig
Lift the code from device mapper into
blk_stack_limitsto inherity the stacking limitations. This ensures we do the right thing for all stacked zoned block devices.Signed-off-by Christoph Hellwig <[email protected]>
Christoph Hellwig
maintainerPATCH 2/3 block: remove bdev_stack_limits
In reply to Christoph HellwigThis function is just a tiny wrapper around blk_stack_limit and has two callers. Simplify the stack a bit by open coding it in the two callers.
--- block/blk-settings.c | 25 ++----------------------- drivers/md/dm-table.c | 3 ++- include/linux/blkdev.h | 2 -- 3 files changed, 4 insertions(+), 26 deletions(-)
block/blk-settings.c +2 -23
@@ -614,28 +614,6 @@ int blk_stack_limits(struct queue_limits *t, struct queue_limits *b, }EXPORT_SYMBOL (blk_stack_limits); -/** -* bdev_stack_limits - adjust queue limits for stacked drivers -* @t: the stacking driver limits (top device) -* @bdev: the component block_device (bottom) -* @start: first data sector within component device -* -* Description: -* Merges queue limits for a top device and a block_device. Returns -* 0 if alignment didn't change. Returns -1 if adding the bottom -* device caused misalignment. -*/ -int bdev_stack_limits (struct queue_limits *t,struct block_device *bdev, -sector_t start) -{ -struct request_queue *bq =bdev_get_queue (bdev); - - start +=get_start_sect (bdev); - -return blk_stack_limits (t, &bq->limits, start); -} -EXPORT_SYMBOL (bdev_stack_limits); -/** * disk_stack_limits - adjust queue limits for stacked drivers * @disk: MD/DM gendisk (top)
@@ -651,7 +629,8 @@ void disk_stack_limits(struct gendisk *disk, struct block_device *bdev, {struct request_queue *t = disk->queue; -if (bdev_stack_limits (&t->limits, bdev, offset >>9 ) <0 ) { +if (blk_stack_limits (&t->limits, &bdev_get_queue (bdev)->limits, +get_start_sect (bdev) + (offset >>9 )) <0 ) {char top[BDEVNAME_SIZE ], bottom[BDEVNAME_SIZE ];disk_name (disk,0 , top);
drivers/md/dm-table.c +2 -1
@@ -458,7 +458,8 @@ static int dm_set_device_limits(struct dm_target *ti, struct dm_dev *dev,return 0 ; } -if (bdev_stack_limits (limits, bdev, start) <0 ) +if (blk_stack_limits (limits, &q->limits, +get_start_sect (bdev) + start) <0 ) DMWARN("%s: adding target device %s caused an alignment inconsistency: " "physical_block_size=%u, logical_block_size=%u, " "alignment_offset=%u, start=%llu",
include/linux/blkdev.h +0 -2
@@ -1106,8 +1106,6 @@ extern void blk_set_default_limits(struct queue_limits *lim);extern void blk_set_stacking_limits (struct queue_limits *lim);extern int blk_stack_limits (struct queue_limits *t,struct queue_limits *b,sector_t offset); -extern int bdev_stack_limits (struct queue_limits *t,struct block_device *bdev, -sector_t offset);extern void disk_stack_limits (struct gendisk *disk,struct block_device *bdev,sector_t offset);extern void blk_queue_stack_limits (struct request_queue *t,struct request_queue *b);
Signature · 1 line
2.27.0
Re: [PATCH 2/3] block: remove bdev_stack_limits
Quoted 74 lines · Christoph Hellwig
This function is just a tiny wrapper around
blk_stack_limitand has two callers. Simplify the stack a bit by open coding it in the two callers.Signed-off-by Christoph Hellwig <[email protected]>--- block/blk-settings.c | 25 ++----------------------- drivers/md/dm-table.c | 3 ++- include/linux/blkdev.h | 2 -- 3 files changed, 4 insertions(+), 26 deletions(-)block/blk-settings.c +2
-23@@ -614,28 +614,6 @@ int blk_stack_limits(struct queue_limits *t, struct queue_limits *b, }EXPORT_SYMBOL (blk_stack_limits); -/** -* bdev_stack_limits - adjust queue limits for stacked drivers -* @t: the stacking driver limits (top device) -* @bdev: the component block_device (bottom) -* @start: first data sector within component device -* -* Description: -* Merges queue limits for a top device and a block_device. Returns -* 0 if alignment didn't change. Returns -1 if adding the bottom -* device caused misalignment. -*/ -int bdev_stack_limits (struct queue_limits *t,struct block_device *bdev, -sector_t start) -{ -struct request_queue *bq =bdev_get_queue (bdev); - - start +=get_start_sect (bdev); - -return blk_stack_limits (t, &bq->limits, start); -} -EXPORT_SYMBOL (bdev_stack_limits); -/** * disk_stack_limits - adjust queue limits for stacked drivers * @disk: MD/DM gendisk (top) @@ -651,7 +629,8 @@ void disk_stack_limits(struct gendisk *disk, struct block_device *bdev, {struct request_queue *t = disk->queue; -if (bdev_stack_limits (&t->limits, bdev, offset >>9 ) <0 ) { +if (blk_stack_limits (&t->limits, &bdev_get_queue (bdev)->limits, +get_start_sect (bdev) + (offset >>9 )) <0 ) {char top[BDEVNAME_SIZE ], bottom[BDEVNAME_SIZE ];disk_name (disk,0 , top);drivers/md/dm-table.c +2
-1@@ -458,7 +458,8 @@ static int dm_set_device_limits(struct dm_target *ti, struct dm_dev *dev,return 0 ; } -if (bdev_stack_limits (limits, bdev, start) <0 ) +if (blk_stack_limits (limits, &q->limits, +get_start_sect (bdev) + start) <0 ) DMWARN("%s: adding target device %s caused an alignment inconsistency: " "physical_block_size=%u, logical_block_size=%u, " "alignment_offset=%u, start=%llu",include/linux/blkdev.h +0
-0
include/linux/blkdev.h extern void blk_set_default_limits(struct queue_limits *lim); · line 1111
Quoted 8 lines
include/linux/blkdev.h +0
-2@@ -1106,8 +1106,6 @@ extern void blk_set_default_limits(struct queue_limits *lim);extern void blk_set_stacking_limits (struct queue_limits *lim);extern int blk_stack_limits (struct queue_limits *t,struct queue_limits *b,sector_t offset); -extern int bdev_stack_limits (struct queue_limits *t,struct block_device *bdev, -sector_t offset);extern void disk_stack_limits (struct gendisk *disk,struct block_device *bdev,sector_t offset);extern void blk_queue_stack_limits (struct request_queue *t,struct request_queue *b);
Looks good.
Signature · 2 lines
Damien Le Moal Western Digital Research
Re: [PATCH 2/3] block: remove bdev_stack_limits
In reply to Christoph HellwigLooks good,
Christoph Hellwig
maintainerPATCH 3/3 block: remove blk_queue_stack_limits
In reply to Christoph HellwigThis function is just a tiny wrapper around blk_stack_limits. Open code it int the two callers.
--- block/blk-settings.c | 11 ----------- drivers/block/drbd/drbd_nl.c | 4 ++-- drivers/nvme/host/core.c | 3 ++- include/linux/blkdev.h | 1 - 4 files changed, 4 insertions(+), 15 deletions(-)
block/blk-settings.c +0 -11
@@ -455,17 +455,6 @@ void blk_queue_io_opt(struct request_queue *q, unsigned int opt) }EXPORT_SYMBOL (blk_queue_io_opt); -/** -* blk_queue_stack_limits - inherit underlying queue limits for stacked drivers -* @t: the stacking driver (top) -* @b: the underlying device (bottom) -**/ -void blk_queue_stack_limits (struct request_queue *t,struct request_queue *b) -{ -blk_stack_limits (&t->limits, &b->limits,0 ); -} -EXPORT_SYMBOL (blk_queue_stack_limits); -/** * blk_stack_limits - adjust queue_limits for stacked devices * @t: the stacking driver limits (top device)
drivers/block/drbd/drbd_nl.c +2 -2
@@ -1250,7 +1250,7 @@ static void fixup_discard_if_not_supported(struct request_queue *q)static void fixup_write_zeroes (struct drbd_device *device,struct request_queue *q) { -/* Fixup max_write_zeroes_sectors after blk_queue_stack_limits(): +/* Fixup max_write_zeroes_sectors after blk_stack_limits(): * if we can handle "zeroes" efficiently on the protocol, * we want to do that, even if our backend does not announce * max_write_zeroes_sectors itself. */
@@ -1361,7 +1361,7 @@ static void drbd_setup_queue_param(struct drbd_device *device, struct drbd_backidecide_on_write_same_support (device, q, b, o, disable_write_same);if (b) { -blk_queue_stack_limits (q, b); +blk_stack_limits (&q->limits, &b->limits,0 );if (q->backing_dev_info->ra_pages != b->backing_dev_info->ra_pages) {
drivers/nvme/host/core.c +2 -1
@@ -1973,7 +1973,8 @@ static int __nvme_revalidate_disk(struct gendisk *disk, struct nvme_id_ns *id)#ifdef CONFIG_NVME_MULTIPATH if (ns->head->disk) {nvme_update_disk_info (ns->head->disk, ns, id); -blk_queue_stack_limits (ns->head->disk->queue, ns->queue); +blk_stack_limits (&ns->head->disk->queue->limits, + &ns->queue->limits,0 );revalidate_disk (ns->head->disk); }#endif
include/linux/blkdev.h +0 -1
@@ -1108,7 +1108,6 @@ extern int blk_stack_limits(struct queue_limits *t, struct queue_limits *b, sector_t offset);extern void disk_stack_limits (struct gendisk *disk,struct block_device *bdev,sector_t offset); -extern void blk_queue_stack_limits (struct request_queue *t,struct request_queue *b);extern void blk_queue_update_dma_pad (struct request_queue *,unsigned int );extern void blk_queue_segment_boundary (struct request_queue *,unsigned long );extern void blk_queue_virt_boundary (struct request_queue *,unsigned long );
Signature · 1 line
2.27.0
Re: [PATCH 3/3] block: remove blk_queue_stack_limits
Quoted 75 lines · Christoph Hellwig
This function is just a tiny wrapper around
blk_stack_limits. Open code it int the two callers.Signed-off-by Christoph Hellwig <[email protected]>--- block/blk-settings.c | 11 ----------- drivers/block/drbd/drbd_nl.c | 4 ++-- drivers/nvme/host/core.c | 3 ++- include/linux/blkdev.h | 1 - 4 files changed, 4 insertions(+), 15 deletions(-)block/blk-settings.c +0
-11@@ -455,17 +455,6 @@ void blk_queue_io_opt(struct request_queue *q, unsigned int opt) }EXPORT_SYMBOL (blk_queue_io_opt); -/** -* blk_queue_stack_limits - inherit underlying queue limits for stacked drivers -* @t: the stacking driver (top) -* @b: the underlying device (bottom) -**/ -void blk_queue_stack_limits (struct request_queue *t,struct request_queue *b) -{ -blk_stack_limits (&t->limits, &b->limits,0 ); -} -EXPORT_SYMBOL (blk_queue_stack_limits); -/** * blk_stack_limits - adjust queue_limits for stacked devices * @t: the stacking driver limits (top device) drivers/block/drbd/drbd_nl.c +2
-2@@ -1250,7 +1250,7 @@ static void fixup_discard_if_not_supported(struct request_queue *q)static void fixup_write_zeroes (struct drbd_device *device,struct request_queue *q) { -/* Fixup max_write_zeroes_sectors after blk_queue_stack_limits(): +/* Fixup max_write_zeroes_sectors after blk_stack_limits(): * if we can handle "zeroes" efficiently on the protocol, * we want to do that, even if our backend does not announce * max_write_zeroes_sectors itself. */ @@ -1361,7 +1361,7 @@ static void drbd_setup_queue_param(struct drbd_device *device, struct drbd_backidecide_on_write_same_support (device, q, b, o, disable_write_same);if (b) { -blk_queue_stack_limits (q, b); +blk_stack_limits (&q->limits, &b->limits,0 );if (q->backing_dev_info->ra_pages != b->backing_dev_info->ra_pages) {drivers/nvme/host/core.c +2
-1@@ -1973,7 +1973,8 @@ static int __nvme_revalidate_disk(struct gendisk *disk, struct nvme_id_ns *id)#ifdef CONFIG_NVME_MULTIPATH if (ns->head->disk) {nvme_update_disk_info (ns->head->disk, ns, id); -blk_queue_stack_limits (ns->head->disk->queue, ns->queue); +blk_stack_limits (&ns->head->disk->queue->limits, + &ns->queue->limits,0 );revalidate_disk (ns->head->disk); }#endif include/linux/blkdev.h +0
-0
include/linux/blkdev.h extern int blk_stack_limits(struct queue_limits *t, struct queue_limits *b, · line 1113
Quoted 7 lines
include/linux/blkdev.h +0
-1@@ -1108,7 +1108,6 @@ extern int blk_stack_limits(struct queue_limits *t, struct queue_limits *b, sector_t offset);extern void disk_stack_limits (struct gendisk *disk,struct block_device *bdev,sector_t offset); -extern void blk_queue_stack_limits (struct request_queue *t,struct request_queue *b);extern void blk_queue_update_dma_pad (struct request_queue *,unsigned int );extern void blk_queue_segment_boundary (struct request_queue *,unsigned long );extern void blk_queue_virt_boundary (struct request_queue *,unsigned long );
Looks good.
Signature · 2 lines
Damien Le Moal Western Digital Research
Re: [PATCH 3/3] block: remove blk_queue_stack_limits
In reply to Christoph HellwigLooks good,
Damien Le Moal
Tested-byQuoted 6 lines · Christoph Hellwig
Hi Jens,
this series ensures that the zoned device limitations are properly inherited in
blk_stack_limits, and then cleanups up two rather pointless wrappers around it.
Tested with dm-linear, dm-crypt and dm-zoned multi device setup (from dm-5.9 tree). No problems detected.
Signature · 2 lines
Damien Le Moal Western Digital Research
Jens Axboe
maintainerQuoted 5 lines · Christoph Hellwig
Hi Jens,
this series ensures that the zoned device limitations are properly inherited in
blk_stack_limits, and then cleanups up two rather pointless wrappers around it.
We should probably make this against for-5.9/drivers instead, to avoid an unnecessary conflict when merging.
Signature · 1 line
Jens Axboe
Christoph Hellwig
maintainerQuoted 9 lines · Jens Axboe
Quoted 5 lines · Christoph Hellwig
Hi Jens,
this series ensures that the zoned device limitations are properly inherited in
blk_stack_limits, and then cleanups up two rather pointless wrappers around it.We should probably make this against for-5.9/drivers instead, to avoid an unnecessary conflict when merging.
Then we'd also need a merge as my next series depends on this, and it clearly is core material. Not sure which one is more important.
Jens Axboe
maintainerQuoted 8 lines · Christoph Hellwig
Quoted 7 lines · Jens Axboe
Quoted 5 lines · Christoph Hellwig
Hi Jens,
this series ensures that the zoned device limitations are properly inherited in
blk_stack_limits, and then cleanups up two rather pointless wrappers around it.
Quoted 5 lines
Quoted 2 lines
We should probably make this against for-5.9/drivers instead, to avoid an unnecessary conflict when merging.
Then we'd also need a merge as my next series depends on this, and it clearly is core material. Not sure which one is more important.
Hmm, might make more sense to kick off a branch topic for this and just merge it after the other ones.
Signature · 1 line
Jens Axboe
Jens Axboe
maintainerQuoted 9 lines · Jens Axboe
Quoted 8 lines · Christoph Hellwig
Quoted 7 lines · Jens Axboe
Quoted 5 lines · Christoph Hellwig
Hi Jens,
this series ensures that the zoned device limitations are properly inherited in
blk_stack_limits, and then cleanups up two rather pointless wrappers around it.
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
We should probably make this against for-5.9/drivers instead, to avoid an unnecessary conflict when merging.
Then we'd also need a merge as my next series depends on this, and it clearly is core material. Not sure which one is more important.
Hmm, might make more sense to kick off a branch topic for this and just merge it after the other ones.
Created a for-5.9/block-merge which is based on 5.8-rc6, with the 5.9 block and drivers branches merged in. Applied the series on top.
Signature · 1 line
Jens Axboe