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>
Cc: Christoph Hellwig <hch@lst.de>
Subject: [PATCH v2 03/28] block: Introduce blk_zone_update_request_bio()
Date: Mon, 25 Mar 2024 13:44:27 +0900 [thread overview]
Message-ID: <20240325044452.3125418-4-dlemoal@kernel.org> (raw)
In-Reply-To: <20240325044452.3125418-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>
---
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 8aeb8e96f1a7..9e6e2a9a147c 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -820,11 +820,11 @@ 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;
-
- if (!is_flush)
+ if (!is_flush) {
+ blk_zone_update_request_bio(req, bio);
bio_endio(bio);
+ }
+
bio = next;
} while (bio);
@@ -926,8 +926,7 @@ bool blk_update_request(struct request *req, blk_status_t error,
/* 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;
+ blk_zone_update_request_bio(req, bio);
bio_endio(bio);
}
diff --git a/block/blk.h b/block/blk.h
index 5cac4e29ae17..a12cde1d45de 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -409,12 +409,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-03-25 4:44 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-25 4:44 [PATCH v2 00/28] Zone write plugging Damien Le Moal
2024-03-25 4:44 ` [PATCH v2 01/28] block: Restore sector of flush requests Damien Le Moal
2024-03-25 19:30 ` Bart Van Assche
2024-03-26 6:05 ` Christoph Hellwig
2024-03-25 4:44 ` [PATCH v2 02/28] block: Remove req_bio_endio() Damien Le Moal
2024-03-25 19:39 ` Bart Van Assche
2024-03-26 1:54 ` Damien Le Moal
2024-03-25 4:44 ` Damien Le Moal [this message]
2024-03-25 19:52 ` [PATCH v2 03/28] block: Introduce blk_zone_update_request_bio() Bart Van Assche
2024-03-25 23:23 ` Damien Le Moal
2024-03-26 6:37 ` Christoph Hellwig
2024-03-26 7:47 ` Damien Le Moal
2024-03-27 7:01 ` Hannes Reinecke
2024-03-25 4:44 ` [PATCH v2 04/28] block: Introduce bio_straddle_zones() and bio_offset_from_zone_start() Damien Le Moal
2024-03-25 19:55 ` Bart Van Assche
2024-03-26 6:39 ` Christoph Hellwig
2024-03-25 4:44 ` [PATCH v2 05/28] block: Allow using bio_attempt_back_merge() internally Damien Le Moal
2024-03-25 20:00 ` Bart Van Assche
2024-03-26 6:39 ` Christoph Hellwig
2024-03-25 4:44 ` [PATCH v2 06/28] block: Remember zone capacity when revalidating zones Damien Le Moal
2024-03-25 21:53 ` Bart Van Assche
2024-03-25 23:20 ` Damien Le Moal
2024-03-26 6:40 ` Christoph Hellwig
2024-03-27 7:05 ` Hannes Reinecke
2024-03-25 4:44 ` [PATCH v2 07/28] block: Introduce zone write plugging Damien Le Moal
2024-03-25 21:53 ` Bart Van Assche
2024-03-26 3:12 ` Damien Le Moal
2024-03-26 6:51 ` Christoph Hellwig
2024-03-26 17:23 ` Bart Van Assche
2024-03-27 7:18 ` Hannes Reinecke
2024-03-25 4:44 ` [PATCH v2 08/28] block: Use a mempool to allocate zone write plugs Damien Le Moal
2024-03-27 7:19 ` Hannes Reinecke
2024-03-27 7:22 ` Damien Le Moal
2024-03-25 4:44 ` [PATCH v2 09/28] block: Fake max open zones limit when there is no limit Damien Le Moal
2024-03-26 6:57 ` Christoph Hellwig
2024-03-27 7:21 ` Hannes Reinecke
2024-03-25 4:44 ` [PATCH v2 10/28] block: Allow zero value of max_zone_append_sectors queue limit Damien Le Moal
2024-03-25 4:44 ` [PATCH v2 11/28] block: Implement zone append emulation Damien Le Moal
2024-03-27 7:28 ` Hannes Reinecke
2024-03-25 4:44 ` [PATCH v2 12/28] block: Allow BIO-based drivers to use blk_revalidate_disk_zones() Damien Le Moal
2024-03-26 7:08 ` Christoph Hellwig
2024-03-26 8:12 ` Damien Le Moal
2024-03-27 7:29 ` Hannes Reinecke
2024-03-25 4:44 ` [PATCH v2 13/28] dm: Use the block layer zone append emulation Damien Le Moal
2024-03-25 4:44 ` [PATCH v2 14/28] scsi: sd: " Damien Le Moal
2024-03-25 4:44 ` [PATCH v2 15/28] ublk_drv: Do not request ELEVATOR_F_ZBD_SEQ_WRITE elevator feature Damien Le Moal
2024-03-25 4:44 ` [PATCH v2 16/28] null_blk: " Damien Le Moal
2024-03-25 4:44 ` [PATCH v2 17/28] null_blk: Introduce zone_append_max_sectors attribute Damien Le Moal
2024-03-27 7:31 ` Hannes Reinecke
2024-03-25 4:44 ` [PATCH v2 18/28] null_blk: Introduce fua attribute Damien Le Moal
2024-03-25 4:44 ` [PATCH v2 19/28] nvmet: zns: Do not reference the gendisk conv_zones_bitmap Damien Le Moal
2024-03-26 6:45 ` Christoph Hellwig
2024-03-25 4:44 ` [PATCH v2 20/28] block: Remove BLK_STS_ZONE_RESOURCE Damien Le Moal
2024-03-26 6:45 ` Christoph Hellwig
2024-03-25 4:44 ` [PATCH v2 21/28] block: Simplify blk_revalidate_disk_zones() interface Damien Le Moal
2024-03-26 6:45 ` Christoph Hellwig
2024-03-25 4:44 ` [PATCH v2 22/28] block: mq-deadline: Remove support for zone write locking Damien Le Moal
2024-03-25 22:13 ` Bart Van Assche
2024-03-25 4:44 ` [PATCH v2 23/28] block: Remove elevator required features Damien Le Moal
2024-03-26 6:45 ` Christoph Hellwig
2024-03-25 4:44 ` [PATCH v2 24/28] block: Do not check zone type in blk_check_zone_append() Damien Le Moal
2024-03-26 6:46 ` Christoph Hellwig
2024-03-25 4:44 ` [PATCH v2 25/28] block: Move zone related debugfs attribute to blk-zoned.c Damien Le Moal
2024-03-25 22:20 ` Bart Van Assche
2024-03-25 23:17 ` Damien Le Moal
2024-03-25 4:44 ` [PATCH v2 26/28] block: Remove zone write locking Damien Le Moal
2024-03-25 22:27 ` Bart Van Assche
2024-03-27 7:32 ` Hannes Reinecke
2024-03-25 4:44 ` [PATCH v2 27/28] block: Do not force select mq-deadline with CONFIG_BLK_DEV_ZONED Damien Le Moal
2024-03-25 22:29 ` Bart Van Assche
2024-03-27 7:33 ` Hannes Reinecke
2024-03-25 4:44 ` [PATCH v2 28/28] block: Do not special-case plugging of zone write operations Damien Le Moal
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=20240325044452.3125418-4-dlemoal@kernel.org \
--to=dlemoal@kernel.org \
--cc=axboe@kernel.dk \
--cc=dm-devel@lists.linux.dev \
--cc=hch@lst.de \
--cc=linux-block@vger.kernel.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).