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 v6 03/28] block: Introduce blk_zone_update_request_bio()
Date: Fri, 5 Apr 2024 13:41:42 +0900 [thread overview]
Message-ID: <20240405044207.1123462-4-dlemoal@kernel.org> (raw)
In-Reply-To: <20240405044207.1123462-1-dlemoal@kernel.org>
On completion of a zone append request, the request sector indicates the
location of the written data. This value must be returned to the user
through the BIO iter sector. This is done in 2 places: in
blk_complete_request() and in blk_update_request(). Introduce the inline
helper function blk_zone_update_request_bio() to avoid duplicating
this BIO update for zone append requests, and to compile out this
helper call when CONFIG_BLK_DEV_ZONED is not enabled.
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>
Tested-by: Hans Holmberg <hans.holmberg@wdc.com>
---
block/blk-mq.c | 11 +++++------
block/blk.h | 19 ++++++++++++++++++-
2 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/block/blk-mq.c b/block/blk-mq.c
index fcbf0953a179..88b541e8873f 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -821,8 +821,7 @@ static void blk_complete_request(struct request *req)
/* Completion has already been traced */
bio_clear_flag(bio, BIO_TRACE_COMPLETION);
- if (req_op(req) == REQ_OP_ZONE_APPEND)
- bio->bi_iter.bi_sector = req->__sector;
+ blk_zone_update_request_bio(req, bio);
if (!is_flush)
bio_endio(bio);
@@ -923,10 +922,10 @@ bool blk_update_request(struct request *req, blk_status_t error,
bio_advance(bio, bio_bytes);
/* Don't actually finish bio if it's part of flush sequence */
- if (!bio->bi_iter.bi_size && !is_flush) {
- if (req_op(req) == REQ_OP_ZONE_APPEND)
- bio->bi_iter.bi_sector = req->__sector;
- bio_endio(bio);
+ if (!bio->bi_iter.bi_size) {
+ blk_zone_update_request_bio(req, bio);
+ if (!is_flush)
+ bio_endio(bio);
}
total_bytes += bio_bytes;
diff --git a/block/blk.h b/block/blk.h
index d9f584984bc4..17786052f32d 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -408,12 +408,29 @@ static inline struct bio *blk_queue_bounce(struct bio *bio,
#ifdef CONFIG_BLK_DEV_ZONED
void disk_free_zone_bitmaps(struct gendisk *disk);
+static inline void blk_zone_update_request_bio(struct request *rq,
+ struct bio *bio)
+{
+ /*
+ * For zone append requests, the request sector indicates the location
+ * at which the BIO data was written. Return this value to the BIO
+ * issuer through the BIO iter sector.
+ */
+ if (req_op(rq) == REQ_OP_ZONE_APPEND)
+ bio->bi_iter.bi_sector = rq->__sector;
+}
int blkdev_report_zones_ioctl(struct block_device *bdev, unsigned int cmd,
unsigned long arg);
int blkdev_zone_mgmt_ioctl(struct block_device *bdev, blk_mode_t mode,
unsigned int cmd, unsigned long arg);
#else /* CONFIG_BLK_DEV_ZONED */
-static inline void disk_free_zone_bitmaps(struct gendisk *disk) {}
+static inline void disk_free_zone_bitmaps(struct gendisk *disk)
+{
+}
+static inline void blk_zone_update_request_bio(struct request *rq,
+ struct bio *bio)
+{
+}
static inline int blkdev_report_zones_ioctl(struct block_device *bdev,
unsigned int cmd, unsigned long arg)
{
--
2.44.0
next prev parent reply other threads:[~2024-04-05 4:42 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-05 4:41 [PATCH v6 00/28] Zone write plugging Damien Le Moal
2024-04-05 4:41 ` [PATCH v6 01/28] block: Restore sector of flush requests Damien Le Moal
2024-04-05 4:41 ` [PATCH v6 02/28] block: Remove req_bio_endio() Damien Le Moal
2024-04-05 4:41 ` Damien Le Moal [this message]
2024-04-05 4:41 ` [PATCH v6 04/28] block: Introduce bio_straddles_zones() and bio_offset_from_zone_start() Damien Le Moal
2024-04-05 4:41 ` [PATCH v6 05/28] block: Allow using bio_attempt_back_merge() internally Damien Le Moal
2024-04-05 4:41 ` [PATCH v6 06/28] block: Remember zone capacity when revalidating zones Damien Le Moal
2024-04-05 4:41 ` [PATCH v6 07/28] block: Introduce zone write plugging Damien Le Moal
2024-04-05 20:09 ` Bart Van Assche
2024-04-05 4:41 ` [PATCH v6 08/28] block: Fake max open zones limit when there is no limit Damien Le Moal
2024-04-05 4:41 ` [PATCH v6 09/28] block: Allow zero value of max_zone_append_sectors queue limit Damien Le Moal
2024-04-05 4:41 ` [PATCH v6 10/28] block: Implement zone append emulation Damien Le Moal
2024-04-05 4:41 ` [PATCH v6 11/28] block: Allow BIO-based drivers to use blk_revalidate_disk_zones() Damien Le Moal
2024-04-05 4:41 ` [PATCH v6 12/28] dm: Use the block layer zone append emulation Damien Le Moal
2024-04-05 15:46 ` Mike Snitzer
2024-04-08 1:26 ` Damien Le Moal
2024-04-05 4:41 ` [PATCH v6 13/28] scsi: sd: " Damien Le Moal
2024-04-05 4:41 ` [PATCH v6 14/28] ublk_drv: Do not request ELEVATOR_F_ZBD_SEQ_WRITE elevator feature Damien Le Moal
2024-04-05 4:41 ` [PATCH v6 15/28] null_blk: " Damien Le Moal
2024-04-05 4:41 ` [PATCH v6 16/28] null_blk: Introduce zone_append_max_sectors attribute Damien Le Moal
2024-04-05 4:41 ` [PATCH v6 17/28] null_blk: Introduce fua attribute Damien Le Moal
2024-04-05 4:41 ` [PATCH v6 18/28] nvmet: zns: Do not reference the gendisk conv_zones_bitmap Damien Le Moal
2024-04-05 4:41 ` [PATCH v6 19/28] block: Remove BLK_STS_ZONE_RESOURCE Damien Le Moal
2024-04-05 4:41 ` [PATCH v6 20/28] block: Simplify blk_revalidate_disk_zones() interface Damien Le Moal
2024-04-05 4:42 ` [PATCH v6 21/28] block: mq-deadline: Remove support for zone write locking Damien Le Moal
2024-04-05 4:42 ` [PATCH v6 22/28] block: Remove elevator required features Damien Le Moal
2024-04-05 4:42 ` [PATCH v6 23/28] block: Do not check zone type in blk_check_zone_append() Damien Le Moal
2024-04-05 4:42 ` [PATCH v6 24/28] block: Move zone related debugfs attribute to blk-zoned.c Damien Le Moal
2024-04-05 4:42 ` [PATCH v6 25/28] block: Replace zone_wlock debugfs entry with zone_wplugs entry Damien Le Moal
2024-04-05 4:42 ` [PATCH v6 26/28] block: Remove zone write locking Damien Le Moal
2024-04-05 4:42 ` [PATCH v6 27/28] block: Do not force select mq-deadline with CONFIG_BLK_DEV_ZONED Damien Le Moal
2024-04-05 4:42 ` [PATCH v6 28/28] block: Do not special-case plugging of zone write operations Damien Le Moal
2024-04-05 10:40 ` [PATCH v6 00/28] Zone write plugging Dennis Maisenbacher
2024-04-05 20:39 ` Martin K. Petersen
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=20240405044207.1123462-4-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).