[PATCH v6 11/12] block: allow read-only and offline conventional zones
COLD33d
REVIEWED: 9 (9M)
From: Damien Le Moal <dlemoal@kernel.org>
Date: 2026-08-31 03:41:43
Subsystem:
block layer, the rest, zoned block device (block layer) · Maintainers:
Jens Axboe, Linus Torvalds, Damien Le Moal
Revision v6 of 7 in this series; 3 review trailers.
Revisions (7)
With SCSI and ATA SMR HDDs, the storage element depopulation feature can change the condition of conventional zones to read-only (if a write head is depopulated) or to offline (if a read head is depopulated). However, the function blk_revalidate_zone_cond() currently does not allow these conditions for conventional zones, causing a zone revalidation failure. Remove blk_revalidate_zone_cond() and move the zone condition checks for conventional zones to blk_revalidate_conv_zone(), allowing the regular BLK_ZONE_COND_NOT_WP condition as well as the BLK_ZONE_COND_OFFLINE and BLK_ZONE_COND_READONLY conditions to match the conditions that can be seen from a zoned device with depopulated storage elements. The zone condition checks for sequential write required zones are moved to blk_revalidate_seq_zone() without any change to the conditions allowed. Signed-off-by: Damien Le Moal <dlemoal@kernel.org> Reviewed-by: Bart Van Assche <bvanassche@acm.org> Reviewed-by: Hannes Reinecke <hare@kernel.org> Reviewed-by: Christoph Hellwig <hch@lst.de> --- block/blk-zoned.c | 66 +++++++++++++++++++---------------------------- 1 file changed, 27 insertions(+), 39 deletions(-)
diff --git a/block/blk-zoned.c b/block/blk-zoned.c
index 57006c595ca8..c3b56dc947af 100644
--- a/block/blk-zoned.c
+++ b/block/blk-zoned.c@@ -2342,57 +2342,32 @@ static int disk_revalidate_capacity(struct gendisk *disk) return ret; } -static int blk_revalidate_zone_cond(struct blk_zone *zone, unsigned int idx, +static int blk_revalidate_conv_zone(struct blk_zone *zone, unsigned int idx, struct blk_revalidate_zone_args *args) { - enum blk_zone_cond cond = zone->cond; - u8 flags = 0; + struct gendisk *disk = args->disk; - /* Check that the zone condition is consistent with the zone type. */ - switch (cond) { + /* Check the zone condition. */ + switch (zone->cond) { case BLK_ZONE_COND_NOT_WP: - if (zone->type != BLK_ZONE_TYPE_CONVENTIONAL) - goto invalid_condition; - flags = BLK_ZFLAG_CONV; - break; - case BLK_ZONE_COND_IMP_OPEN: - case BLK_ZONE_COND_EXP_OPEN: - case BLK_ZONE_COND_CLOSED: - case BLK_ZONE_COND_EMPTY: - case BLK_ZONE_COND_FULL: case BLK_ZONE_COND_OFFLINE: case BLK_ZONE_COND_READONLY: - if (zone->type != BLK_ZONE_TYPE_SEQWRITE_REQ) - goto invalid_condition; break; default: - pr_warn("%s: Invalid zone condition 0x%X\n", - args->disk->disk_name, cond); + pr_warn("%s: Invalid conv. zone condition 0x%X at sector %llu\n", + disk->disk_name, zone->cond, zone->start); return -ENODEV; } - blk_zstate_set(args->zones_state, args->nr_zones, idx, cond, flags); - - return 0; - -invalid_condition: - pr_warn("%s: Invalid zone condition 0x%x for type 0x%x\n", - args->disk->disk_name, cond, zone->type); - - return -ENODEV; -} - -static int blk_revalidate_conv_zone(struct blk_zone *zone, unsigned int idx, - struct blk_revalidate_zone_args *args) -{ - struct gendisk *disk = args->disk; - if (zone->capacity != zone->len) { pr_warn("%s: Invalid conventional zone capacity\n", disk->disk_name); return -ENODEV; } + blk_zstate_set(args->zones_state, args->nr_zones, idx, + zone->cond, BLK_ZFLAG_CONV); + if (disk_zone_is_last(disk, zone)) args->last_zone_capacity = zone->capacity;
@@ -2408,6 +2383,24 @@ static int blk_revalidate_seq_zone(struct blk_zone *zone, unsigned int idx, struct blk_zone_wplug *zwplug; unsigned int wp_offset; + /* Check the zone condition. */ + switch (zone->cond) { + case BLK_ZONE_COND_IMP_OPEN: + case BLK_ZONE_COND_EXP_OPEN: + case BLK_ZONE_COND_CLOSED: + case BLK_ZONE_COND_EMPTY: + case BLK_ZONE_COND_FULL: + case BLK_ZONE_COND_OFFLINE: + case BLK_ZONE_COND_READONLY: + break; + default: + pr_warn("%s: Invalid seq. zone condition 0x%X at sector %llu\n", + disk->disk_name, zone->cond, zone->start); + return -ENODEV; + } + + blk_zstate_set(args->zones_state, args->nr_zones, idx, zone->cond, 0); + /* * Remember the capacity of the first sequential zone and check * if it is constant for all zones, ignoring the last zone as it can be
@@ -2490,11 +2483,6 @@ static int blk_revalidate_zone_cb(struct blk_zone *zone, unsigned int idx, return -ENODEV; } - /* Check zone condition */ - ret = blk_revalidate_zone_cond(zone, idx, args); - if (ret) - return ret; - /* Check zone type */ switch (zone->type) { case BLK_ZONE_TYPE_CONVENTIONAL:
--
2.55.0