* [PATCH v3 1/2] block: Imporve checks on zone resource limits
2024-06-05 6:39 [PATCH v3 0/2] Fix DM zone resource limits stacking Damien Le Moal
@ 2024-06-05 6:39 ` Damien Le Moal
2024-06-05 6:45 ` Christoph Hellwig
2024-06-05 6:39 ` [PATCH v3 2/2] dm: Improve zone resource limits handling Damien Le Moal
1 sibling, 1 reply; 7+ messages in thread
From: Damien Le Moal @ 2024-06-05 6:39 UTC (permalink / raw)
To: Jens Axboe, linux-block, dm-devel, Mike Snitzer, Mikulas Patocka
Cc: Christoph Hellwig, Benjamin Marzinski
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@kernel.org>
---
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
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v3 2/2] dm: Improve zone resource limits handling
2024-06-05 6:39 [PATCH v3 0/2] Fix DM zone resource limits stacking Damien Le Moal
2024-06-05 6:39 ` [PATCH v3 1/2] block: Imporve checks on zone resource limits Damien Le Moal
@ 2024-06-05 6:39 ` Damien Le Moal
2024-06-05 6:49 ` Christoph Hellwig
1 sibling, 1 reply; 7+ messages in thread
From: Damien Le Moal @ 2024-06-05 6:39 UTC (permalink / raw)
To: Jens Axboe, linux-block, dm-devel, Mike Snitzer, Mikulas Patocka
Cc: Christoph Hellwig, Benjamin Marzinski
The generic stacking of limits implemented in the block layer cannot
correctly handle stacking of zone resource limits (max open zones and
max active zones) because these limits are for an entire device but the
stacking may be for a portion of that device (e.g. a dm-linear target
that does not cover an entire block device). As a result, when DM
devices are created on top of zoned block devices, the DM device never
has any zone resource limits advertized, which is only correct if all
underlying target devices also have no zone resource limits.
If at least one target device has resource limits, the user may see
either performance issues (if the max open zone limit of the device is
exceeded) or write I/O errors if the max active zone limit of one of
the underlying target devices is exceeded.
While it is very difficult to correctly and reliably stack zone resource
limits in general, cases where targets are not sharing zone resources of
the same device can be dealt with relatively easily. Such situation
happens when a target maps all sequential zones of a zoned block device:
for such mapping, other targets mapping other parts of the same zoned
block device can only contain conventional zones and thus will not
require any zone resource to correctly handle write operations.
For a mapped device constructed with such targets, which includes mapped
devices constructed with targets mapping entire zoned block devices, the
zone resource limits can be reliably determined using the non-zero
minimum of the zone resource limits of all targets.
For mapped devices that include targets partially mapping the set of
sequential write required zones of zoned block devices, instead of
advertizing no zone resource limits, it is also better to set the mapped
device limits to the non-zero minimum of the limits of all targets. In
this case the limits for a target depend on the number of sequential
zones being mapped: if this number of zone is larger than the limits,
then the limits of the device apply and can be used. If on the other
hand the target maps a number of zones smaller than the limits, then no
limits is needed and we can assume that the target has no limits (limits
set to 0).
This commit improves zone resource limits handling as described above
using the function dm_set_zone_resource_limits(). This function is
executed from dm_set_zones_restrictions() and iterates the targets of a
mapped device to evaluate the max open and max active zone limits. This
relies on an internal "stacking" of the limits of the target devices
combined with a direct counting of the number of sequential zones
mapped by the targets.
1) For a target mapping an entire zoned block device, the limits for the
target are set to the limits of the device.
2) For a target partially mapping a zoned block device, the number of
mapped sequential zones is used to determine the limits: if the
target maps more sequential write required zones than the device
limits, then the limits of the device are used as-is. If the number
of mapped sequential zones is lower than the limits, then we assume
that the target has no limits (limits set to 0).
As this evaluation is done for each target, the zone resource limits
for the mapped device are evaluated as the non-zero minimum of the
limits of all the targets.
For configurations resulting in unreliable limits, i.e. a table
containing a target partially mapping a zoned device, a warning message
is issued.
The counting of mapped sequential zones for the target is done using the
new function dm_device_count_zones() which performs a report zones on
the entire block device with the callback dm_device_count_zones_cb().
This count of mapped sequential zones is used to determine if the mapped
device contains only conventional zones. This allows simplifying
dm_set_zones_restrictions() to not do a report zones. For mapped devices
mapping only conventional zones, dm_set_zone_resource_limits() changes
the mapped device to a regular device.
To further cleanup dm_set_zones_restrictions(), the message about the
type of zone append (native or emulated) is moved inside
dm_revalidate_zones().
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
---
drivers/md/dm-zone.c | 220 +++++++++++++++++++++++++++++++++++--------
1 file changed, 183 insertions(+), 37 deletions(-)
diff --git a/drivers/md/dm-zone.c b/drivers/md/dm-zone.c
index 5d66d916730e..e81e3101107a 100644
--- a/drivers/md/dm-zone.c
+++ b/drivers/md/dm-zone.c
@@ -145,17 +145,180 @@ bool dm_is_zone_write(struct mapped_device *md, struct bio *bio)
}
}
+struct dm_device_zone_count {
+ sector_t start;
+ sector_t len;
+ unsigned int total_nr_seq_zones;
+ unsigned int target_nr_seq_zones;
+};
+
/*
- * Count conventional zones of a mapped zoned device. If the device
- * only has conventional zones, do not expose it as zoned.
+ * Count the total number of and the number of mapped sequential zones of a
+ * target zoned device.
*/
-static int dm_check_zoned_cb(struct blk_zone *zone, unsigned int idx,
- void *data)
+static int dm_device_count_zones_cb(struct blk_zone *zone,
+ unsigned int idx, void *data)
+{
+ struct dm_device_zone_count *zc = data;
+
+ if (zone->type != BLK_ZONE_TYPE_CONVENTIONAL) {
+ zc->total_nr_seq_zones++;
+ if (zone->start >= zc->start &&
+ zone->start < zc->start + zc->len)
+ zc->target_nr_seq_zones++;
+ }
+
+ return 0;
+}
+
+static int dm_device_count_zones(struct dm_dev *dev,
+ struct dm_device_zone_count *zc)
{
- unsigned int *nr_conv_zones = data;
+ int ret;
+
+ ret = blkdev_report_zones(dev->bdev, 0, UINT_MAX,
+ dm_device_count_zones_cb, zc);
+ if (ret < 0)
+ return ret;
+ if (!ret)
+ return -EIO;
+ return 0;
+}
+
+struct dm_zone_resource_limits {
+ unsigned int mapped_nr_seq_zones;
+ struct queue_limits *lim;
+ bool reliable_limits;
+};
+
+static int device_get_zone_resource_limits(struct dm_target *ti,
+ struct dm_dev *dev, sector_t start,
+ sector_t len, void *data)
+{
+ struct dm_zone_resource_limits *zlim = data;
+ struct gendisk *disk = dev->bdev->bd_disk;
+ unsigned int max_open_zones, max_active_zones;
+ int ret;
+ struct dm_device_zone_count zc = {
+ .start = start,
+ .len = len,
+ };
+
+ /*
+ * If the target is not the whole device, the device zone resources may
+ * be shared between different targets. Check this by counting the
+ * number of mapped sequential zones: if this number is smaller than the
+ * total number of sequential zones of the target device, then resource
+ * sharing may happen and the zone limits will not be reliable.
+ */
+ ret = dm_device_count_zones(dev, &zc);
+ if (ret) {
+ DMERR("Count device %s zones failed",
+ disk->disk_name);
+ return ret;
+ }
+
+ zlim->mapped_nr_seq_zones += zc.target_nr_seq_zones;
+
+ /*
+ * If the target does not map any sequential zones, then we do not need
+ * any zone resource limits.
+ */
+ if (!zc.target_nr_seq_zones)
+ return 0;
+
+ /*
+ * If the target does not map all sequential zones, the limits
+ * will not be reliable.
+ */
+ if (zc.target_nr_seq_zones < zc.total_nr_seq_zones)
+ zlim->reliable_limits = false;
+
+ /*
+ * If the target maps less sequential zones than the limit values, then
+ * we do not have limits for this target.
+ */
+ max_active_zones = disk->queue->limits.max_active_zones;
+ if (max_active_zones >= zc.target_nr_seq_zones)
+ max_active_zones = 0;
+ zlim->lim->max_active_zones =
+ min_not_zero(max_active_zones, zlim->lim->max_active_zones);
+
+ max_open_zones = disk->queue->limits.max_open_zones;
+ if (max_open_zones >= zc.target_nr_seq_zones)
+ max_open_zones = 0;
+ zlim->lim->max_open_zones =
+ min_not_zero(max_open_zones, zlim->lim->max_open_zones);
+
+ return 0;
+}
+
+static int dm_set_zone_resource_limits(struct mapped_device *md,
+ struct dm_table *t, struct queue_limits *lim)
+{
+ struct gendisk *disk = md->disk;
+ struct dm_zone_resource_limits zlim = {
+ .reliable_limits = true,
+ .lim = lim,
+ };
+
+ lim->max_open_zones = UINT_MAX;
+ lim->max_active_zones = UINT_MAX;
- if (zone->type == BLK_ZONE_TYPE_CONVENTIONAL)
- (*nr_conv_zones)++;
+ /* Get the zone resource limits from the targets. */
+ for (unsigned int i = 0; i < t->num_targets; i++) {
+ struct dm_target *ti = dm_table_get_target(t, i);
+
+ if (!ti->type->iterate_devices ||
+ ti->type->iterate_devices(ti,
+ device_get_zone_resource_limits, &zlim)) {
+ DMERR("Could not determine %s zone resource limits",
+ md->disk->disk_name);
+ return -ENODEV;
+ }
+ }
+
+ /*
+ * If we only have conventional zones mapped, expose the mapped device
+ + as a regular device.
+ */
+ if (!zlim.mapped_nr_seq_zones) {
+ lim->max_open_zones = 0;
+ lim->max_active_zones = 0;
+ lim->max_zone_append_sectors = 0;
+ lim->zone_write_granularity = 0;
+ lim->zoned = false;
+ clear_bit(DMF_EMULATE_ZONE_APPEND, &md->flags);
+ md->nr_zones = 0;
+ disk->nr_zones = 0;
+ return 0;
+ }
+
+ /*
+ * Warn if the mapped device is partially using zone resources of the
+ * target devices as that leads to unreliable limits, i.e. if another
+ * mapped device uses the same underlying devices, we cannot enforce
+ * zone limits to guarantee that writing will not lead to errors.
+ * Note that we really should return an error for such case but there is
+ * no easy way to find out if another mapped device uses the same
+ * underlying zoned devices.
+ */
+ if (!zlim.reliable_limits)
+ DMWARN("%s zone resource limits may be unreliable",
+ disk->disk_name);
+
+ /*
+ * If the limits are larger than the number of mapped sequential zones,
+ * assume no limits. Note that blk_revalidate_disk_zones() also executes
+ * this adjustment, but only for mapped devices that use zone write
+ * plugging, that is, for mapped devices needing zone append emulation.
+ * So for DM devices using native zone append of the target devices, we
+ * need to adjust the zone resource limits here.
+ */
+ if (lim->max_active_zones > zlim.mapped_nr_seq_zones)
+ lim->max_active_zones = 0;
+ if (lim->max_open_zones > zlim.mapped_nr_seq_zones)
+ lim->max_open_zones = 0;
return 0;
}
@@ -172,8 +335,13 @@ static int dm_revalidate_zones(struct mapped_device *md, struct dm_table *t)
int ret;
/* Revalidate only if something changed. */
- if (!disk->nr_zones || disk->nr_zones != md->nr_zones)
+ if (!disk->nr_zones || disk->nr_zones != md->nr_zones) {
+ DMINFO("%s using %s zone append",
+ md->disk->disk_name,
+ queue_emulates_zone_append(disk->queue) ?
+ "emulated" : "native");
md->nr_zones = 0;
+ }
if (md->nr_zones)
return 0;
@@ -224,8 +392,6 @@ int dm_set_zones_restrictions(struct dm_table *t, struct request_queue *q,
struct queue_limits *lim)
{
struct mapped_device *md = t->md;
- struct gendisk *disk = md->disk;
- unsigned int nr_conv_zones = 0;
int ret;
/*
@@ -244,36 +410,16 @@ int dm_set_zones_restrictions(struct dm_table *t, struct request_queue *q,
return 0;
/*
- * Count conventional zones to check that the mapped device will indeed
- * have sequential write required zones.
+ * Determine the max open and max active zone limits for the mapped
+ * device. For a mapped device containing only conventional zones, the
+ * mapped device is changed to be a regular block device, so exit early
+ * for such case.
*/
- md->zone_revalidate_map = t;
- ret = dm_blk_report_zones(disk, 0, UINT_MAX,
- dm_check_zoned_cb, &nr_conv_zones);
- md->zone_revalidate_map = NULL;
- if (ret < 0) {
- DMERR("Check zoned failed %d", ret);
+ ret = dm_set_zone_resource_limits(md, t, lim);
+ if (ret)
return ret;
- }
-
- /*
- * If we only have conventional zones, expose the mapped device as
- * a regular device.
- */
- if (nr_conv_zones >= ret) {
- lim->max_open_zones = 0;
- lim->max_active_zones = 0;
- lim->zoned = false;
- clear_bit(DMF_EMULATE_ZONE_APPEND, &md->flags);
- disk->nr_zones = 0;
+ if (!lim->zoned)
return 0;
- }
-
- if (!md->disk->nr_zones) {
- DMINFO("%s using %s zone append",
- md->disk->disk_name,
- queue_emulates_zone_append(q) ? "emulated" : "native");
- }
ret = dm_revalidate_zones(md, t);
if (ret < 0)
--
2.45.1
^ permalink raw reply related [flat|nested] 7+ messages in thread