[PATCH 07/14] block: drop all zone write plugs on capacity changes
Damien Le Moal <[email protected]> Wed, 5 Aug 2026 11:27:12 +0900
| Newsgroups | org.kernel.vger.linux-block |
|---|---|
| Message-ID | <[email protected]> |
If during revalidation, we detect a capacity change for a zoned block device, e.g. due to a storage element removal on an HDD, we can assume that the device was reformatted, which implies that all sequential zones are empty. For such case, we can remove and free all zone write plugs in the gendisk hash table by marking them as dead, thus avoiding also to leave zone write plugs for zones that are beyond the new device capacity in the disk hash table. Introduce the function disk_revalidate_capacity() to do this and call this new function at the beginning of blk_revalidate_disk_zones(), so that the zone revalidation process can re-create, if needed, any zone write plug for sequential zones that are not empty. The checks on the capacity and zone size that were in blk_revalidate_disk_zones() are moved to disk_revalidate_capacity() and if true, also trigger dropping all zone write plugs. Signed-off-by: Damien Le Moal <[email protected]> --- block/blk-zoned.c | 71 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 55 insertions(+), 16 deletions(-) diff --git a/block/blk-zoned.c b/block/blk-zoned.c index 3bca7b0437d5..f065febbae97 100644 --- a/block/blk-zoned.c +++ b/block/blk-zoned.c @@ -2216,6 +2216,56 @@ static int disk_revalidate_zone_resources(struct gendisk *disk, return ret; } +static void disk_drop_zone_wplug(struct blk_zone_wplug *zwplug, void *data) +{ + unsigned long flags; + + spin_lock_irqsave(&zwplug->lock, flags); + disk_zone_wplug_abort(zwplug); + disk_mark_zone_wplug_dead(zwplug); + spin_unlock_irqrestore(&zwplug->lock, flags); +} + +static int disk_revalidate_capacity(struct gendisk *disk) +{ + struct queue_limits *lim = &disk->queue->limits; + sector_t zone_sectors = lim->chunk_sectors; + unsigned int nr_zones = disk_get_nr_zones(disk); + int ret = -ENODEV; + + if (!get_capacity(disk)) + goto drop_all_zwplugs; + + /* + * Checks that the device driver indicated a valid zone size and that + * the max zone append limit is set. + */ + if (!zone_sectors || !is_power_of_2(zone_sectors)) { + pr_warn("%s: Invalid non power of two zone size (%llu)\n", + disk->disk_name, zone_sectors); + goto drop_all_zwplugs; + } + + /* + * Check if the capacity has changed. If it did, assume that the device + * was reformatted and that all sequential zones are now empty. So drop + * all zone write plug. + */ + if (disk->nr_zones && disk->nr_zones != nr_zones) { + pr_warn("%s: Number of zones changed (%u -> %u)\n", + disk->disk_name, disk->nr_zones, nr_zones); + ret = 0; + goto drop_all_zwplugs; + } + + return 0; + +drop_all_zwplugs: + disk_for_all_zone_wplugs(disk, disk_drop_zone_wplug, NULL); + + return ret; +} + static int blk_revalidate_zone_cond(struct blk_zone *zone, unsigned int idx, struct blk_revalidate_zone_args *args) { @@ -2405,31 +2455,20 @@ static int blk_revalidate_zone_cb(struct blk_zone *zone, unsigned int idx, */ int blk_revalidate_disk_zones(struct gendisk *disk) { - struct request_queue *q = disk->queue; - sector_t zone_sectors = q->limits.chunk_sectors; struct blk_revalidate_zone_args args = { }; struct blk_report_zones_args rep_args = { .cb = blk_revalidate_zone_cb, .data = &args, }; unsigned int noio_flag; - int ret = -ENOMEM; + int ret; - if (WARN_ON_ONCE(!blk_queue_is_zoned(q))) + if (WARN_ON_ONCE(!blk_queue_is_zoned(disk->queue))) return -EIO; - if (!get_capacity(disk)) - return -ENODEV; - - /* - * Checks that the device driver indicated a valid zone size and that - * the max zone append limit is set. - */ - if (!zone_sectors || !is_power_of_2(zone_sectors)) { - pr_warn("%s: Invalid non power of two zone size (%llu)\n", - disk->disk_name, zone_sectors); - return -ENODEV; - } + ret = disk_revalidate_capacity(disk); + if (ret) + return ret; /* * Allocate zone resources if they are needed and we have not done -- 2.55.0