Make sure that the zone resource limits of a zoned block device are
correct by checking that:
(a) If the device has a max active zones limit, make sure that the max
open zones limit is lower than the max active zones limit.
(b) If the device has zone resource limits, check that the limits
values are lower than the number of sequential zones of the device.
If it is not, assume that the zoned device has no limits by setting
the limits to 0.
For (a), a check is added to blk_validate_zoned_limits() and an error
returned if the max open zones limit exceeds the value of the max active
zone limit (if there is one).
For (b), given that we need to number of sequential zones of the device,
this check is added to disk_update_zone_resources(). This is safe to do
as that function is executed with the disk queue frozen and the check
executed after queue_limits_start_update() with the queue limits lock
held.
Signed-off-by: Damien Le Moal <dlemoal@xxxxxxxxxx>
---
block/blk-settings.c | 8 ++++++++
block/blk-zoned.c | 17 ++++++++++++++---
2 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/block/blk-settings.c b/block/blk-settings.c
index effeb9a639bb..474c709ea85b 100644
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -80,6 +80,14 @@ static int blk_validate_zoned_limits(struct queue_limits *lim)
if (WARN_ON_ONCE(!IS_ENABLED(CONFIG_BLK_DEV_ZONED)))
return -EINVAL;
+ /*
+ * Given that active zones include open zones, the maximum number of
+ * open zones cannot be larger than the maximum numbber of active zones.
+ */
+ if (lim->max_active_zones &&
+ lim->max_open_zones > lim->max_active_zones)
+ return -EINVAL;
+
if (lim->zone_write_granularity < lim->logical_block_size)
lim->zone_write_granularity = lim->logical_block_size;
diff --git a/block/blk-zoned.c b/block/blk-zoned.c
index 52abebf56027..7a2dfbc8f614 100644
--- a/block/blk-zoned.c
+++ b/block/blk-zoned.c
@@ -1650,6 +1650,20 @@ static int disk_update_zone_resources(struct gendisk *disk,
if (!disk->zone_wplugs_pool)
return 0;
+ lim = queue_limits_start_update(q);
+
+ /*
+ * Some devices can advertize max open and max active zone limits that
+ * are larger than the number of sequential zones of the zoned block
+ * device, e.g. a small ZNS namespace. For such case, assume that the
+ * zoned device has no limits.
+ */
+ nr_seq_zones = disk->nr_zones - nr_conv_zones;
+ if (lim.max_active_zones > nr_seq_zones)
+ lim.max_active_zones = 0;
+ if (lim.max_open_zones > nr_seq_zones)
+ lim.max_open_zones = 0;
+
/*
* If the device has no limit on the maximum number of open and active
* zones, set its max open zone limit to the mempool size to indicate
@@ -1657,9 +1671,6 @@ static int disk_update_zone_resources(struct gendisk *disk,
* dynamic zone write plug allocation when simultaneously writing to
* more zones than the size of the mempool.
*/
- lim = queue_limits_start_update(q);
-
- nr_seq_zones = disk->nr_zones - nr_conv_zones;
pool_size = max(lim.max_open_zones, lim.max_active_zones);
if (!pool_size)
pool_size = min(BLK_ZONE_WPLUG_DEFAULT_POOL_SIZE, nr_seq_zones);
--
2.45.1
