mkfs: fix zone capacity check for sequential zones
PATCH v2 1/1 mkfs: fix zone capacity check for sequential zones
From: Carlos Maiolino <[email protected]>
Sequential zones can have a different, smaller capacity than conventional zones.
Currently mkfs assumes both sequential and conventional zones will have the same capacity and and set the zone_info to the capacity of the first found zone and use that value to validate all the remaining zones's capacity.
Because conventional zones can't have a different capacity than its size, the first zone always have the largest possible capacity, so, mkfs will fail to validate any consecutive sequential zone if its capacity is smaller than the conventional zones.
What we should do instead, is set the zone info capacity accordingly to the settings of first zone found of the respective type and validate the capacity based on that instead of assuming all zones will have the same capacity.
---
Changelog:
v2:
- remove unnecessary braces
- add hch's RwB
mkfs/xfs_mkfs.c | 50 +++++++++++++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 18 deletions(-)
mkfs/xfs_mkfs.c +32 -18
@@ -2545,6 +2545,28 @@ struct zone_topology {/* random size that allows efficient processing */ #define ZONES_PER_IOCTL 16384 +static void +zone_validate_capacity ( +struct zone_info *zi, +__u64 capacity, +bool conventional) +{ +if (conventional && zi->zone_capacity != zi->zone_size) { +fprintf (stderr,_ ("Zone capacity equal to Zone size required for conventional zones.\n" )); +exit (1 ); + } + +if (zi->zone_capacity > zi->zone_size) { +fprintf (stderr,_ ("Zone capacity larger than zone size!\n" )); +exit (1 ); + } + +if (zi->zone_capacity != capacity) { +fprintf (stderr,_ ("Inconsistent zone capacity!\n" )); +exit (1 ); + } +} + static void report_zones( const char *name,
@@ -2621,6 +2643,11 @@ _("Inconsistent zone size!\n"));switch (zones[i].type) {case BLK_ZONE_TYPE_CONVENTIONAL : +if (!zi->zone_capacity) + zi->zone_capacity = zones[i].capacity; +zone_validate_capacity (zi, zones[i].capacity, + true); +/* * We can only use the conventional space at the * start of the device for metadata, so don't
@@ -2632,6 +2659,11 @@ _("Inconsistent zone size!\n")); zi->nr_conv_zones++;break ;case BLK_ZONE_TYPE_SEQWRITE_REQ : +if (!found_seq) + zi->zone_capacity = zones[i].capacity; +zone_validate_capacity (zi, zones[i].capacity, + false); + found_seq = true;break ;case BLK_ZONE_TYPE_SEQWRITE_PREF :
@@ -2644,19 +2676,6 @@ _("Unknown zone type (0x%x) found.\n"), zones[i].type);exit (1 ); } -if (!n) { - zi->zone_capacity = zones[i].capacity; -if (zi->zone_capacity > zi->zone_size) { -fprintf (stderr, -_ ("Zone capacity larger than zone size!\n" )); -exit (1 ); - } - }else if (zones[i].capacity != zi->zone_capacity) { -fprintf (stderr, -_ ("Inconsistent zone capacity!\n" )); -exit (1 ); - } - n++; } sector = zones[rep->nr_zones - 1].start +
@@ -2683,11 +2702,6 @@ validate_zoned( _("Data devices requires conventional zones.\n"));usage (); } -if (zt->data.zone_capacity != zt->data.zone_size) { -fprintf (stderr, -_ ("Zone capacity equal to Zone size required for conventional zones.\n" )); -usage (); - } cli->sb_feat.zoned = true; cfg->rtstart =
Signature · 1 line
2.51.0
Quoted 111 lines · On 13/11/2025 15:12, [email protected] wrote:
From: Carlos Maiolino <[email protected]>
Sequential zones can have a different, smaller capacity than conventional zones.
Currently mkfs assumes both sequential and conventional zones will have the same capacity and and set the
zone_infoto the capacity of the first found zone and use that value to validate all the remaining zones's capacity.Because conventional zones can't have a different capacity than its size, the first zone always have the largest possible capacity, so, mkfs will fail to validate any consecutive sequential zone if its capacity is smaller than the conventional zones.
What we should do instead, is set the zone info capacity accordingly to the settings of first zone found of the respective type and validate the capacity based on that instead of assuming all zones will have the same capacity.
Reviewed-by Christoph Hellwig <[email protected]>Signed-off-by Carlos Maiolino <[email protected]>---
Changelog:
v2:
- remove unnecessary braces
- add hch's RwBmkfs/xfs_mkfs.c | 50 +++++++++++++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 18 deletions(-)mkfs/xfs_mkfs.c +32
-13@@ -2545,6 +2545,28 @@ struct zone_topology {/* random size that allows efficient processing */ #define ZONES_PER_IOCTL 16384 +static void +zone_validate_capacity ( +struct zone_info *zi, +__u64 capacity, +bool conventional) +{ +if (conventional && zi->zone_capacity != zi->zone_size) { +fprintf (stderr,_ ("Zone capacity equal to Zone size required for conventional zones.\n" )); +exit (1 ); + } + +if (zi->zone_capacity > zi->zone_size) { +fprintf (stderr,_ ("Zone capacity larger than zone size!\n" )); +exit (1 ); + } + +if (zi->zone_capacity != capacity) { +fprintf (stderr,_ ("Inconsistent zone capacity!\n" )); +exit (1 ); + } +} + static void report_zones( const char *name,@@ -2621,6 +2643,11 @@ _("Inconsistent zone size!\n"));switch (zones[i].type) {case BLK_ZONE_TYPE_CONVENTIONAL : +if (!zi->zone_capacity) + zi->zone_capacity = zones[i].capacity; +zone_validate_capacity (zi, zones[i].capacity, + true); +/* * We can only use the conventional space at the * start of the device for metadata, so don't @@ -2632,6 +2659,11 @@ _("Inconsistent zone size!\n")); zi->nr_conv_zones++;break ;case BLK_ZONE_TYPE_SEQWRITE_REQ : +if (!found_seq) + zi->zone_capacity = zones[i].capacity; +zone_validate_capacity (zi, zones[i].capacity, + false); + found_seq = true;break ;case BLK_ZONE_TYPE_SEQWRITE_PREF :@@ -2644,19 +2676,6 @@ _("Unknown zone type (0x%x) found.\n"), zones[i].type);exit (1 ); } -if (!n) { - zi->zone_capacity = zones[i].capacity; -if (zi->zone_capacity > zi->zone_size) { -fprintf (stderr, -_ ("Zone capacity larger than zone size!\n" )); -exit (1 ); - } - }else if (zones[i].capacity != zi->zone_capacity) { -fprintf (stderr, -_ ("Inconsistent zone capacity!\n" )); -exit (1 ); - } - n++; } sector = zones[rep->nr_zones - 1].start +@@ -2683,11 +2702,6 @@ validate_zoned( _("Data devices requires conventional zones.\n"));
mkfs/xfs_mkfs.c validate_zoned( · line 2707
Quoted 10 lines
mkfs/xfs_mkfs.c +0
-5usage (); } -if (zt->data.zone_capacity != zt->data.zone_size) { -fprintf (stderr, -_ ("Zone capacity equal to Zone size required for conventional zones.\n" )); -usage (); - } cli->sb_feat.zoned = true; cfg->rtstart =
Looks good,