From: Damien Le Moal <dlemoal@kernel.org>
To: linux-block@vger.kernel.org, Jens Axboe <axboe@kernel.dk>,
linux-scsi@vger.kernel.org,
"Martin K . Petersen" <martin.petersen@oracle.com>,
dm-devel@lists.linux.dev, Mike Snitzer <snitzer@redhat.com>,
linux-nvme@lists.infradead.org, Keith Busch <kbusch@kernel.org>,
Christoph Hellwig <hch@lst.de>
Subject: [PATCH v4 06/28] block: Remember zone capacity when revalidating zones
Date: Tue, 2 Apr 2024 21:38:45 +0900 [thread overview]
Message-ID: <20240402123907.512027-7-dlemoal@kernel.org> (raw)
In-Reply-To: <20240402123907.512027-1-dlemoal@kernel.org>
In preparation for adding zone write plugging, modify
blk_revalidate_disk_zones() to get the capacity of zones of a zoned
block device. This capacity value as a number of 512B sectors is stored
in the gendisk zone_capacity field.
Given that host-managed SMR disks (including zoned UFS drives) and all
known NVMe ZNS devices have the same zone capacity for all zones
blk_revalidate_disk_zones() returns an error if different capacities are
detected for different zones.
This also adds check to verify that the values reported by the device
for zone capacities are correct, that is, that the zone capacity is
never 0, does not exceed the zone size and is equal to the zone size for
conventional zones.
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---
block/blk-zoned.c | 26 ++++++++++++++++++++++++++
include/linux/blkdev.h | 1 +
2 files changed, 27 insertions(+)
diff --git a/block/blk-zoned.c b/block/blk-zoned.c
index da0f4b2a8fa0..23d9bb21c459 100644
--- a/block/blk-zoned.c
+++ b/block/blk-zoned.c
@@ -438,6 +438,7 @@ struct blk_revalidate_zone_args {
unsigned long *conv_zones_bitmap;
unsigned long *seq_zones_wlock;
unsigned int nr_zones;
+ unsigned int zone_capacity;
sector_t sector;
};
@@ -482,9 +483,20 @@ static int blk_revalidate_zone_cb(struct blk_zone *zone, unsigned int idx,
return -ENODEV;
}
+ if (!zone->capacity || zone->capacity > zone->len) {
+ pr_warn("%s: Invalid zone capacity\n",
+ disk->disk_name);
+ return -ENODEV;
+ }
+
/* Check zone type */
switch (zone->type) {
case BLK_ZONE_TYPE_CONVENTIONAL:
+ if (zone->capacity != zone->len) {
+ pr_warn("%s: Invalid conventional zone capacity\n",
+ disk->disk_name);
+ return -ENODEV;
+ }
if (!args->conv_zones_bitmap) {
args->conv_zones_bitmap =
blk_alloc_zone_bitmap(q->node, args->nr_zones);
@@ -500,6 +512,18 @@ static int blk_revalidate_zone_cb(struct blk_zone *zone, unsigned int idx,
if (!args->seq_zones_wlock)
return -ENOMEM;
}
+
+ /*
+ * Remember the capacity of the first sequential zone and check
+ * if it is constant for all zones.
+ */
+ if (!args->zone_capacity)
+ args->zone_capacity = zone->capacity;
+ if (zone->capacity != args->zone_capacity) {
+ pr_warn("%s: Invalid variable zone capacity\n",
+ disk->disk_name);
+ return -ENODEV;
+ }
break;
case BLK_ZONE_TYPE_SEQWRITE_PREF:
default:
@@ -595,6 +619,7 @@ int blk_revalidate_disk_zones(struct gendisk *disk,
blk_mq_freeze_queue(q);
if (ret > 0) {
disk->nr_zones = args.nr_zones;
+ disk->zone_capacity = args.zone_capacity;
swap(disk->seq_zones_wlock, args.seq_zones_wlock);
swap(disk->conv_zones_bitmap, args.conv_zones_bitmap);
if (update_driver_data)
@@ -608,6 +633,7 @@ int blk_revalidate_disk_zones(struct gendisk *disk,
kfree(args.seq_zones_wlock);
kfree(args.conv_zones_bitmap);
+
return ret;
}
EXPORT_SYMBOL_GPL(blk_revalidate_disk_zones);
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index ec7bd7091467..4e81f714cca7 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -191,6 +191,7 @@ struct gendisk {
* blk_mq_unfreeze_queue().
*/
unsigned int nr_zones;
+ unsigned int zone_capacity;
unsigned long *conv_zones_bitmap;
unsigned long *seq_zones_wlock;
#endif /* CONFIG_BLK_DEV_ZONED */
--
2.44.0
next prev parent reply other threads:[~2024-04-02 12:39 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-02 12:38 [PATCH v4 00/28] Zone write plugging Damien Le Moal
2024-04-02 12:38 ` [PATCH v4 01/28] block: Restore sector of flush requests Damien Le Moal
2024-04-02 12:38 ` [PATCH v4 02/28] block: Remove req_bio_endio() Damien Le Moal
2024-04-02 18:02 ` Hannes Reinecke
2024-04-02 12:38 ` [PATCH v4 03/28] block: Introduce blk_zone_update_request_bio() Damien Le Moal
2024-04-02 12:38 ` [PATCH v4 04/28] block: Introduce bio_straddles_zones() and bio_offset_from_zone_start() Damien Le Moal
2024-04-02 12:38 ` [PATCH v4 05/28] block: Allow using bio_attempt_back_merge() internally Damien Le Moal
2024-04-02 12:38 ` Damien Le Moal [this message]
2024-04-02 18:04 ` [PATCH v4 06/28] block: Remember zone capacity when revalidating zones Hannes Reinecke
2024-04-02 12:38 ` [PATCH v4 07/28] block: Introduce zone write plugging Damien Le Moal
2024-04-02 16:12 ` Christoph Hellwig
2024-04-02 23:38 ` Damien Le Moal
2024-04-03 1:01 ` Jens Axboe
2024-04-03 1:02 ` Damien Le Moal
2024-04-02 18:26 ` Hannes Reinecke
2024-04-03 0:33 ` Damien Le Moal
2024-04-03 4:23 ` kernel test robot
2024-04-02 12:38 ` [PATCH v4 08/28] block: Fake max open zones limit when there is no limit Damien Le Moal
2024-04-02 12:38 ` [PATCH v4 09/28] block: Allow zero value of max_zone_append_sectors queue limit Damien Le Moal
2024-04-02 12:38 ` [PATCH v4 10/28] block: Implement zone append emulation Damien Le Moal
2024-04-02 12:38 ` [PATCH v4 11/28] block: Allow BIO-based drivers to use blk_revalidate_disk_zones() Damien Le Moal
2024-04-03 6:41 ` Hannes Reinecke
2024-04-02 12:38 ` [PATCH v4 12/28] dm: Use the block layer zone append emulation Damien Le Moal
2024-04-02 12:38 ` [PATCH v4 13/28] scsi: sd: " Damien Le Moal
2024-04-02 12:38 ` [PATCH v4 14/28] ublk_drv: Do not request ELEVATOR_F_ZBD_SEQ_WRITE elevator feature Damien Le Moal
2024-04-02 12:38 ` [PATCH v4 15/28] null_blk: " Damien Le Moal
2024-04-02 12:38 ` [PATCH v4 16/28] null_blk: Introduce zone_append_max_sectors attribute Damien Le Moal
2024-04-02 12:38 ` [PATCH v4 17/28] null_blk: Introduce fua attribute Damien Le Moal
2024-04-03 3:56 ` Chaitanya Kulkarni
2024-04-03 3:58 ` Damien Le Moal
2024-04-03 4:43 ` Christoph Hellwig
2024-04-02 12:38 ` [PATCH v4 18/28] nvmet: zns: Do not reference the gendisk conv_zones_bitmap Damien Le Moal
2024-04-02 12:38 ` [PATCH v4 19/28] block: Remove BLK_STS_ZONE_RESOURCE Damien Le Moal
2024-04-02 12:38 ` [PATCH v4 20/28] block: Simplify blk_revalidate_disk_zones() interface Damien Le Moal
2024-04-02 12:39 ` [PATCH v4 21/28] block: mq-deadline: Remove support for zone write locking Damien Le Moal
2024-04-02 12:39 ` [PATCH v4 22/28] block: Remove elevator required features Damien Le Moal
2024-04-02 12:39 ` [PATCH v4 23/28] block: Do not check zone type in blk_check_zone_append() Damien Le Moal
2024-04-02 12:39 ` [PATCH v4 24/28] block: Move zone related debugfs attribute to blk-zoned.c Damien Le Moal
2024-04-02 12:39 ` [PATCH v4 25/28] block: Replace zone_wlock debugfs entry with zone_wplugs entry Damien Le Moal
2024-04-03 6:43 ` Hannes Reinecke
2024-04-02 12:39 ` [PATCH v4 26/28] block: Remove zone write locking Damien Le Moal
2024-04-02 16:03 ` Christoph Hellwig
2024-04-03 6:43 ` Hannes Reinecke
2024-04-02 12:39 ` [PATCH v4 27/28] block: Do not force select mq-deadline with CONFIG_BLK_DEV_ZONED Damien Le Moal
2024-04-02 12:39 ` [PATCH v4 28/28] block: Do not special-case plugging of zone write operations Damien Le Moal
2024-04-03 8:15 ` [PATCH v4 00/28] Zone write plugging Hans Holmberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240402123907.512027-7-dlemoal@kernel.org \
--to=dlemoal@kernel.org \
--cc=axboe@kernel.dk \
--cc=dm-devel@lists.linux.dev \
--cc=hch@lst.de \
--cc=kbusch@kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=snitzer@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).