block: pre-calculate max_zone_append_sectors

max_zone_append_sectors differs from all other queue limits in that the
final value used is not stored in the queue_limits but needs to be
obtained using queue_limits_max_zone_append_sectors helper.  This not
only adds (tiny) extra overhead to the I/O path, but also can be easily
forgotten in file system code.

Add a new max_hw_zone_append_sectors value to queue_limits which is
set by the driver, and calculate max_zone_append_sectors from that and
the other inputs in blk_validate_zoned_limits, similar to how
max_sectors is calculated to fix this.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20241104073955.112324-3-hch@lst.de
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Link: https://lore.kernel.org/r/20241108154657.845768-2-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-core.c b/block/blk-core.c
index 4f791a3114a12c4a965b754bb91209ff50c48db8..0387172e825941635f76f30087e060989ddd52c5 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -607,7 +607,7 @@ static inline blk_status_t blk_check_zone_append(struct request_queue *q,
                return BLK_STS_IOERR;
 
        /* Make sure the BIO is small enough and will not get split */
-       if (nr_sectors > queue_max_zone_append_sectors(q))
+       if (nr_sectors > q->limits.max_zone_append_sectors)
                return BLK_STS_IOERR;
 
        bio->bi_opf |= REQ_NOMERGE;

diff --git a/block/blk-merge.c b/block/blk-merge.c
index 859875a5ee902a14c187d5a570cdf0722470a7bd..7b0af8317c1c39dfe01179fce81f6de04663a5ac 100644 (file)
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -392,11 +392,10 @@ struct bio *bio_split_rw(struct bio *bio, const struct queue_limits *lim,
 struct bio *bio_split_zone_append(struct bio *bio,
                const struct queue_limits *lim, unsigned *nr_segs)
 {
-       unsigned int max_sectors = queue_limits_max_zone_append_sectors(lim);
        int split_sectors;
 
        split_sectors = bio_split_rw_at(bio, lim, nr_segs,
-                       max_sectors << SECTOR_SHIFT);
+                       lim->max_zone_append_sectors << SECTOR_SHIFT);
        if (WARN_ON_ONCE(split_sectors > 0))
                split_sectors = -EINVAL;
        return bio_submit_split(bio, split_sectors);

diff --git a/block/blk-settings.c b/block/blk-settings.c
index 5ee3d6d1448dfbdd8a78bdca607cb63c7c96743e..7d6b296997c2cbc1ab574296ce8b24fc4bafaa28 100644 (file)
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -50,7 +50,7 @@ void blk_set_stacking_limits(struct queue_limits *lim)
        lim->max_sectors = UINT_MAX;
        lim->max_dev_sectors = UINT_MAX;
        lim->max_write_zeroes_sectors = UINT_MAX;
-       lim->max_zone_append_sectors = UINT_MAX;
+       lim->max_hw_zone_append_sectors = UINT_MAX;
        lim->max_user_discard_sectors = UINT_MAX;
 }
 EXPORT_SYMBOL(blk_set_stacking_limits);
@@ -91,17 +91,16 @@ static int blk_validate_zoned_limits(struct queue_limits *lim)
        if (lim->zone_write_granularity < lim->logical_block_size)
                lim->zone_write_granularity = lim->logical_block_size;
 
-       if (lim->max_zone_append_sectors) {
-               /*
-                * The Zone Append size is limited by the maximum I/O size
-                * and the zone size given that it can't span zones.
-                */
-               lim->max_zone_append_sectors =
-                       min3(lim->max_hw_sectors,
-                            lim->max_zone_append_sectors,
-                            lim->chunk_sectors);
-       }
-
+       /*
+        * The Zone Append size is limited by the maximum I/O size and the zone
+        * size given that it can't span zones.
+        *
+        * If no max_hw_zone_append_sectors limit is provided, the block layer
+        * will emulated it, else we're also bound by the hardware limit.
+        */
+       lim->max_zone_append_sectors =
+               min_not_zero(lim->max_hw_zone_append_sectors,
+                       min(lim->chunk_sectors, lim->max_hw_sectors));
        return 0;
 }
 
@@ -527,8 +526,8 @@ int blk_stack_limits(struct queue_limits *t, struct queue_limits *b,
        t->max_dev_sectors = min_not_zero(t->max_dev_sectors, b->max_dev_sectors);
        t->max_write_zeroes_sectors = min(t->max_write_zeroes_sectors,
                                        b->max_write_zeroes_sectors);
-       t->max_zone_append_sectors = min(queue_limits_max_zone_append_sectors(t),
-                                        queue_limits_max_zone_append_sectors(b));
+       t->max_hw_zone_append_sectors = min(t->max_hw_zone_append_sectors,
+                                       b->max_hw_zone_append_sectors);
 
        t->seg_boundary_mask = min_not_zero(t->seg_boundary_mask,
                                            b->seg_boundary_mask);

diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index 0ef4e13e247d956d3732b37b90ec90c3bdac5d58..d80a202cd170635eeb27abad08129f483e507b8f 100644 (file)
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -131,6 +131,7 @@ QUEUE_SYSFS_LIMIT_SHOW_SECTORS_TO_BYTES(max_hw_discard_sectors)
 QUEUE_SYSFS_LIMIT_SHOW_SECTORS_TO_BYTES(max_write_zeroes_sectors)
 QUEUE_SYSFS_LIMIT_SHOW_SECTORS_TO_BYTES(atomic_write_max_sectors)
 QUEUE_SYSFS_LIMIT_SHOW_SECTORS_TO_BYTES(atomic_write_boundary_sectors)
+QUEUE_SYSFS_LIMIT_SHOW_SECTORS_TO_BYTES(max_zone_append_sectors)
 
 #define QUEUE_SYSFS_LIMIT_SHOW_SECTORS_TO_KB(_field)                   \
 static ssize_t queue_##_field##_show(struct gendisk *disk, char *page) \
@@ -178,18 +179,6 @@ static ssize_t queue_max_discard_sectors_store(struct gendisk *disk,
        return ret;
 }
 
-/*
- * For zone append queue_max_zone_append_sectors does not just return the
- * underlying queue limits, but actually contains a calculation.  Because of
- * that we can't simply use QUEUE_SYSFS_LIMIT_SHOW_SECTORS_TO_BYTES here.
- */
-static ssize_t queue_zone_append_max_show(struct gendisk *disk, char *page)
-{
-       return sprintf(page, "%llu\n",
-               (u64)queue_max_zone_append_sectors(disk->queue) <<
-                       SECTOR_SHIFT);
-}
-
 static ssize_t
 queue_max_sectors_store(struct gendisk *disk, const char *page, size_t count)
 {
@@ -479,7 +468,7 @@ QUEUE_RO_ENTRY(queue_atomic_write_unit_min, "atomic_write_unit_min_bytes");
 
 QUEUE_RO_ENTRY(queue_write_same_max, "write_same_max_bytes");
 QUEUE_RO_ENTRY(queue_max_write_zeroes_sectors, "write_zeroes_max_bytes");
-QUEUE_RO_ENTRY(queue_zone_append_max, "zone_append_max_bytes");
+QUEUE_RO_ENTRY(queue_max_zone_append_sectors, "zone_append_max_bytes");
 QUEUE_RO_ENTRY(queue_zone_write_granularity, "zone_write_granularity");
 
 QUEUE_RO_ENTRY(queue_zoned, "zoned");
@@ -607,7 +596,7 @@ static struct attribute *queue_attrs[] = {
        &queue_atomic_write_unit_max_entry.attr,
        &queue_write_same_max_entry.attr,
        &queue_max_write_zeroes_sectors_entry.attr,
-       &queue_zone_append_max_entry.attr,
+       &queue_max_zone_append_sectors_entry.attr,
        &queue_zone_write_granularity_entry.attr,
        &queue_rotational_entry.attr,
        &queue_zoned_entry.attr,

diff --git a/drivers/block/null_blk/zoned.c b/drivers/block/null_blk/zoned.c
index 9bc768b2ca56b7bad7c4dc1393ad09ebaba3b65a..0d5f9bf952292ec90bfa5bd89f267cab38431355 100644 (file)
--- a/drivers/block/null_blk/zoned.c
+++ b/drivers/block/null_blk/zoned.c
@@ -166,7 +166,7 @@ int null_init_zoned_dev(struct nullb_device *dev,
 
        lim->features |= BLK_FEAT_ZONED;
        lim->chunk_sectors = dev->zone_size_sects;
-       lim->max_zone_append_sectors = dev->zone_append_max_sectors;
+       lim->max_hw_zone_append_sectors = dev->zone_append_max_sectors;
        lim->max_open_zones = dev->zone_max_open;
        lim->max_active_zones = dev->zone_max_active;
        return 0;

diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c
index 4ae4fdb8bb7fe0dcca0cfe035d06219ca7a58c51..c6d18cd8af44edbe2677690b8632a49c9d35e8e9 100644 (file)
--- a/drivers/block/ublk_drv.c
+++ b/drivers/block/ublk_drv.c
@@ -2279,7 +2279,7 @@ static int ublk_ctrl_start_dev(struct ublk_device *ub, struct io_uring_cmd *cmd)
                lim.features |= BLK_FEAT_ZONED;
                lim.max_active_zones = p->max_active_zones;
                lim.max_open_zones =  p->max_open_zones;
-               lim.max_zone_append_sectors = p->max_zone_append_sectors;
+               lim.max_hw_zone_append_sectors = p->max_zone_append_sectors;
        }
 
        if (ub->params.basic.attrs & UBLK_ATTR_VOLATILE_CACHE) {

diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 194417abc1053c0c73a8efdfe45b13c24534eec0..0e99a4714928478c1ba81777b8e98448eb5b992a 100644 (file)
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -784,7 +784,7 @@ static int virtblk_read_zoned_limits(struct virtio_blk *vblk,
                        wg, v);
                return -ENODEV;
        }
-       lim->max_zone_append_sectors = v;
+       lim->max_hw_zone_append_sectors = v;
        dev_dbg(&vdev->dev, "max append sectors = %u\n", v);
 
        return 0;

diff --git a/drivers/md/dm-zone.c b/drivers/md/dm-zone.c
index c0d41c36e06ebf8a0a32968185227ac073c80ad4..20edd3fabbabfe622783030b6106de2a9b890fcf 100644 (file)
--- a/drivers/md/dm-zone.c
+++ b/drivers/md/dm-zone.c
@@ -344,7 +344,7 @@ int dm_set_zones_restrictions(struct dm_table *t, struct request_queue *q,
                clear_bit(DMF_EMULATE_ZONE_APPEND, &md->flags);
        } else {
                set_bit(DMF_EMULATE_ZONE_APPEND, &md->flags);
-               lim->max_zone_append_sectors = 0;
+               lim->max_hw_zone_append_sectors = 0;
        }
 
        /*
@@ -379,7 +379,7 @@ int dm_set_zones_restrictions(struct dm_table *t, struct request_queue *q,
        if (!zlim.mapped_nr_seq_zones) {
                lim->max_open_zones = 0;
                lim->max_active_zones = 0;
-               lim->max_zone_append_sectors = 0;
+               lim->max_hw_zone_append_sectors = 0;
                lim->zone_write_granularity = 0;
                lim->chunk_sectors = 0;
                lim->features &= ~BLK_FEAT_ZONED;

diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
index 6a15873055b9513f827709ad780bc7e18f75e439..c26cb7d3a2e55bfe08f4da317298411e2033ca68 100644 (file)
--- a/drivers/nvme/host/multipath.c
+++ b/drivers/nvme/host/multipath.c
@@ -636,7 +636,7 @@ int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl, struct nvme_ns_head *head)
        if (head->ids.csi == NVME_CSI_ZNS)
                lim.features |= BLK_FEAT_ZONED;
        else
-               lim.max_zone_append_sectors = 0;
+               lim.max_hw_zone_append_sectors = 0;
 
        head->disk = blk_alloc_disk(&lim, ctrl->numa_node);
        if (IS_ERR(head->disk))

diff --git a/drivers/nvme/host/zns.c b/drivers/nvme/host/zns.c
index 9a06f9d98cd68c5691716760f63ada3fbf3d4275..382949e18c6ae7635b511258b04a7740ea4909c8 100644 (file)
--- a/drivers/nvme/host/zns.c
+++ b/drivers/nvme/host/zns.c
@@ -111,7 +111,7 @@ void nvme_update_zone_info(struct nvme_ns *ns, struct queue_limits *lim,
        lim->features |= BLK_FEAT_ZONED;
        lim->max_open_zones = zi->max_open_zones;
        lim->max_active_zones = zi->max_active_zones;
-       lim->max_zone_append_sectors = ns->ctrl->max_zone_append;
+       lim->max_hw_zone_append_sectors = ns->ctrl->max_zone_append;
        lim->chunk_sectors = ns->head->zsze =
                nvme_lba_to_sect(ns->head, zi->zone_size);
 }

diff --git a/drivers/scsi/sd_zbc.c b/drivers/scsi/sd_zbc.c
index ee2b742387581bc13ecbe4ef8a826d53b031a8d8..de5c54c057ecd7540fd2b825457cd0037a468e2a 100644 (file)
--- a/drivers/scsi/sd_zbc.c
+++ b/drivers/scsi/sd_zbc.c
@@ -634,8 +634,6 @@ int sd_zbc_read_zones(struct scsi_disk *sdkp, struct queue_limits *lim,
                lim->max_open_zones = sdkp->zones_max_open;
        lim->max_active_zones = 0;
        lim->chunk_sectors = logical_to_sectors(sdkp->device, zone_blocks);
-       /* Enable block layer zone append emulation */
-       lim->max_zone_append_sectors = 0;
 
        return 0;
 

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 1b51a7c92e9beb70d1cb082008e1e6a53fa149f2..65f37ae7071260b978ab13365c2711a6dfa0e2ec 100644 (file)
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -375,6 +375,7 @@ struct queue_limits {
        unsigned int            max_user_discard_sectors;
        unsigned int            max_secure_erase_sectors;
        unsigned int            max_write_zeroes_sectors;
+       unsigned int            max_hw_zone_append_sectors;
        unsigned int            max_zone_append_sectors;
        unsigned int            discard_granularity;
        unsigned int            discard_alignment;
@@ -1208,25 +1209,9 @@ static inline unsigned int queue_max_segment_size(const struct request_queue *q)
        return q->limits.max_segment_size;
 }
 
-static inline unsigned int
-queue_limits_max_zone_append_sectors(const struct queue_limits *l)
-{
-       unsigned int max_sectors = min(l->chunk_sectors, l->max_hw_sectors);
-
-       return min_not_zero(l->max_zone_append_sectors, max_sectors);
-}
-
-static inline unsigned int queue_max_zone_append_sectors(struct request_queue *q)
-{
-       if (!blk_queue_is_zoned(q))
-               return 0;
-
-       return queue_limits_max_zone_append_sectors(&q->limits);
-}
-
 static inline bool queue_emulates_zone_append(struct request_queue *q)
 {
-       return blk_queue_is_zoned(q) && !q->limits.max_zone_append_sectors;
+       return blk_queue_is_zoned(q) && !q->limits.max_hw_zone_append_sectors;
 }
 
 static inline bool bdev_emulates_zone_append(struct block_device *bdev)
@@ -1237,7 +1222,7 @@ static inline bool bdev_emulates_zone_append(struct block_device *bdev)
 static inline unsigned int
 bdev_max_zone_append_sectors(struct block_device *bdev)
 {
-       return queue_max_zone_append_sectors(bdev_get_queue(bdev));
+       return bdev_limits(bdev)->max_zone_append_sectors;
 }
 
 static inline unsigned int bdev_max_segments(struct block_device *bdev)