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 v5 09/28] block: Allow zero value of max_zone_append_sectors queue limit
Date: Wed, 3 Apr 2024 17:42:28 +0900 [thread overview]
Message-ID: <20240403084247.856481-10-dlemoal@kernel.org> (raw)
In-Reply-To: <20240403084247.856481-1-dlemoal@kernel.org>
In preparation for adding a generic zone append emulation using zone
write plugging, allow device drivers supporting zoned block device to
set a the max_zone_append_sectors queue limit of a device to 0 to
indicate the lack of native support for zone append operations and that
the block layer should emulate these operations using regular write
operations.
blk_queue_max_zone_append_sectors() is modified to allow passing 0 as
the max_zone_append_sectors argument. The function
queue_max_zone_append_sectors() is also modified to ensure that the
minimum of the max_hw_sectors and chunk_sectors limit is used whenever
the max_zone_append_sectors limit is 0. This minimum is consistent with
the value set for the max_zone_append_sectors limit by the function
blk_validate_zoned_limits() when limits for a queue are validated.
The helper functions queue_emulates_zone_append() and
bdev_emulates_zone_append() are added to test if a queue (or block
device) emulates zone append operations.
In order for blk_revalidate_disk_zones() to accept zoned block devices
relying on zone append emulation, the direct check to the
max_zone_append_sectors queue limit of the disk is replaced by a check
using the value returned by queue_max_zone_append_sectors(). Similarly,
queue_zone_append_max_show() is modified to use the same accessor so
that the sysfs attribute advertizes the non-zero limit that will be
used, regardless if it is for native or emulated commands.
For stacking drivers, a top device should not need to care if the
underlying devices have native or emulated zone append operations.
blk_stack_limits() is thus modified to set the top device
max_zone_append_sectors limit using the new accessor
queue_limits_max_zone_append_sectors(). queue_max_zone_append_sectors()
is modified to use this function as well. Stacking drivers that require
zone append emulation, e.g. dm-crypt, can still request this feature by
calling blk_queue_max_zone_append_sectors() with a 0 limit.
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
---
block/blk-core.c | 2 +-
block/blk-settings.c | 30 +++++++++++++++++++-----------
block/blk-sysfs.c | 2 +-
block/blk-zoned.c | 2 +-
include/linux/blkdev.h | 23 ++++++++++++++++++++---
5 files changed, 42 insertions(+), 17 deletions(-)
diff --git a/block/blk-core.c b/block/blk-core.c
index a16b5abdbbf5..3bf28149e104 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -602,7 +602,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 > q->limits.max_zone_append_sectors)
+ if (nr_sectors > queue_max_zone_append_sectors(q))
return BLK_STS_IOERR;
bio->bi_opf |= REQ_NOMERGE;
diff --git a/block/blk-settings.c b/block/blk-settings.c
index cdbaef159c4b..c0197e1e7485 100644
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -412,24 +412,32 @@ EXPORT_SYMBOL(blk_queue_max_write_zeroes_sectors);
* blk_queue_max_zone_append_sectors - set max sectors for a single zone append
* @q: the request queue for the device
* @max_zone_append_sectors: maximum number of sectors to write per command
+ *
+ * Sets the maximum number of sectors allowed for zone append commands. If
+ * Specifying 0 for @max_zone_append_sectors indicates that the queue does
+ * not natively support zone append operations and that the block layer must
+ * emulate these operations using regular writes.
**/
void blk_queue_max_zone_append_sectors(struct request_queue *q,
unsigned int max_zone_append_sectors)
{
- unsigned int max_sectors;
+ unsigned int max_sectors = 0;
if (WARN_ON(!blk_queue_is_zoned(q)))
return;
- max_sectors = min(q->limits.max_hw_sectors, max_zone_append_sectors);
- max_sectors = min(q->limits.chunk_sectors, max_sectors);
+ if (max_zone_append_sectors) {
+ max_sectors = min(q->limits.max_hw_sectors,
+ max_zone_append_sectors);
+ max_sectors = min(q->limits.chunk_sectors, max_sectors);
- /*
- * Signal eventual driver bugs resulting in the max_zone_append sectors limit
- * being 0 due to a 0 argument, the chunk_sectors limit (zone size) not set,
- * or the max_hw_sectors limit not set.
- */
- WARN_ON(!max_sectors);
+ /*
+ * Signal eventual driver bugs resulting in the max_zone_append
+ * sectors limit being 0 due to the chunk_sectors limit (zone
+ * size) not set or the max_hw_sectors limit not set.
+ */
+ WARN_ON_ONCE(!max_sectors);
+ }
q->limits.max_zone_append_sectors = max_sectors;
}
@@ -756,8 +764,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(t->max_zone_append_sectors,
- b->max_zone_append_sectors);
+ t->max_zone_append_sectors = min(queue_limits_max_zone_append_sectors(t),
+ queue_limits_max_zone_append_sectors(b));
t->bounce = max(t->bounce, b->bounce);
t->seg_boundary_mask = min_not_zero(t->seg_boundary_mask,
diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index 8c8f69d8ba48..e3ed5a921aff 100644
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -224,7 +224,7 @@ static ssize_t queue_zone_write_granularity_show(struct request_queue *q,
static ssize_t queue_zone_append_max_show(struct request_queue *q, char *page)
{
- unsigned long long max_sectors = q->limits.max_zone_append_sectors;
+ unsigned long long max_sectors = queue_max_zone_append_sectors(q);
return sprintf(page, "%llu\n", max_sectors << SECTOR_SHIFT);
}
diff --git a/block/blk-zoned.c b/block/blk-zoned.c
index 3dceeaaeb973..ec917081cc0f 100644
--- a/block/blk-zoned.c
+++ b/block/blk-zoned.c
@@ -1691,7 +1691,7 @@ int blk_revalidate_disk_zones(struct gendisk *disk,
return -ENODEV;
}
- if (!q->limits.max_zone_append_sectors) {
+ if (!queue_max_zone_append_sectors(q)) {
pr_warn("%s: Invalid 0 maximum zone append limit\n",
disk->disk_name);
return -ENODEV;
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index a95b883512ea..7a621f23393f 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1174,12 +1174,29 @@ static inline unsigned int queue_max_segment_size(const struct request_queue *q)
return q->limits.max_segment_size;
}
-static inline unsigned int queue_max_zone_append_sectors(const struct request_queue *q)
+static inline unsigned int queue_limits_max_zone_append_sectors(struct queue_limits *l)
{
+ unsigned int max_sectors = min(l->chunk_sectors, l->max_hw_sectors);
- const struct queue_limits *l = &q->limits;
+ 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 min(l->max_zone_append_sectors, l->max_sectors);
+ 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;
+}
+
+static inline bool bdev_emulates_zone_append(struct block_device *bdev)
+{
+ return queue_emulates_zone_append(bdev_get_queue(bdev));
}
static inline unsigned int
--
2.44.0
next prev parent reply other threads:[~2024-04-03 8:43 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-03 8:42 [PATCH v5 00/28] Zone write plugging Damien Le Moal
2024-04-03 8:42 ` [PATCH v5 01/28] block: Restore sector of flush requests Damien Le Moal
2024-04-03 8:42 ` [PATCH v5 02/28] block: Remove req_bio_endio() Damien Le Moal
2024-04-03 8:42 ` [PATCH v5 03/28] block: Introduce blk_zone_update_request_bio() Damien Le Moal
2024-04-03 8:42 ` [PATCH v5 04/28] block: Introduce bio_straddles_zones() and bio_offset_from_zone_start() Damien Le Moal
2024-04-03 8:42 ` [PATCH v5 05/28] block: Allow using bio_attempt_back_merge() internally Damien Le Moal
2024-04-03 8:42 ` [PATCH v5 06/28] block: Remember zone capacity when revalidating zones Damien Le Moal
2024-04-04 17:35 ` Bart Van Assche
2024-04-03 8:42 ` [PATCH v5 07/28] block: Introduce zone write plugging Damien Le Moal
2024-04-03 9:44 ` Christoph Hellwig
2024-04-03 15:28 ` Hannes Reinecke
2024-04-04 18:31 ` Bart Van Assche
2024-04-04 23:07 ` Damien Le Moal
2024-04-04 23:18 ` Damien Le Moal
2024-04-04 23:42 ` Bart Van Assche
2024-04-05 0:02 ` Damien Le Moal
2024-04-03 8:42 ` [PATCH v5 08/28] block: Fake max open zones limit when there is no limit Damien Le Moal
2024-04-03 9:43 ` Christoph Hellwig
2024-04-03 15:28 ` Hannes Reinecke
2024-04-04 19:04 ` Bart Van Assche
2024-04-03 8:42 ` Damien Le Moal [this message]
2024-04-03 8:42 ` [PATCH v5 10/28] block: Implement zone append emulation Damien Le Moal
2024-04-03 8:42 ` [PATCH v5 11/28] block: Allow BIO-based drivers to use blk_revalidate_disk_zones() Damien Le Moal
2024-04-04 19:10 ` Bart Van Assche
2024-04-03 8:42 ` [PATCH v5 12/28] dm: Use the block layer zone append emulation Damien Le Moal
2024-04-03 8:42 ` [PATCH v5 13/28] scsi: sd: " Damien Le Moal
2024-04-03 8:42 ` [PATCH v5 14/28] ublk_drv: Do not request ELEVATOR_F_ZBD_SEQ_WRITE elevator feature Damien Le Moal
2024-04-03 8:42 ` [PATCH v5 15/28] null_blk: " Damien Le Moal
2024-04-03 8:42 ` [PATCH v5 16/28] null_blk: Introduce zone_append_max_sectors attribute Damien Le Moal
2024-04-04 19:19 ` Bart Van Assche
2024-04-03 8:42 ` [PATCH v5 17/28] null_blk: Introduce fua attribute Damien Le Moal
2024-04-03 8:42 ` [PATCH v5 18/28] nvmet: zns: Do not reference the gendisk conv_zones_bitmap Damien Le Moal
2024-04-03 8:42 ` [PATCH v5 19/28] block: Remove BLK_STS_ZONE_RESOURCE Damien Le Moal
2024-04-03 8:42 ` [PATCH v5 20/28] block: Simplify blk_revalidate_disk_zones() interface Damien Le Moal
2024-04-03 8:42 ` [PATCH v5 21/28] block: mq-deadline: Remove support for zone write locking Damien Le Moal
2024-04-03 8:42 ` [PATCH v5 22/28] block: Remove elevator required features Damien Le Moal
2024-04-03 8:42 ` [PATCH v5 23/28] block: Do not check zone type in blk_check_zone_append() Damien Le Moal
2024-04-03 8:42 ` [PATCH v5 24/28] block: Move zone related debugfs attribute to blk-zoned.c Damien Le Moal
2024-04-03 8:42 ` [PATCH v5 25/28] block: Replace zone_wlock debugfs entry with zone_wplugs entry Damien Le Moal
2024-04-03 8:42 ` [PATCH v5 26/28] block: Remove zone write locking Damien Le Moal
2024-04-03 8:42 ` [PATCH v5 27/28] block: Do not force select mq-deadline with CONFIG_BLK_DEV_ZONED Damien Le Moal
2024-04-03 8:42 ` [PATCH v5 28/28] block: Do not special-case plugging of zone write operations Damien Le Moal
2024-04-04 13:40 ` [PATCH v5 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=20240403084247.856481-10-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).