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 02/28] block: Remove req_bio_endio()
Date: Fri, 5 Apr 2024 13:41:41 +0900 [thread overview]
Message-ID: <20240405044207.1123462-3-dlemoal@kernel.org> (raw)
In-Reply-To: <20240405044207.1123462-1-dlemoal@kernel.org>
Moving req_bio_endio() code into its only caller, blk_update_request(),
allows reducing accesses to and tests of bio and request fields. Also,
given that partial completions of zone append operations is not
possible and that zone append operations cannot be merged, the update
of the BIO sector using the request sector for these operations can be
moved directly before the call to bio_endio().
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Tested-by: Hans Holmberg <hans.holmberg@wdc.com>
---
block/blk-mq.c | 58 ++++++++++++++++++++++++--------------------------
1 file changed, 28 insertions(+), 30 deletions(-)
diff --git a/block/blk-mq.c b/block/blk-mq.c
index b8dbfed8b28b..fcbf0953a179 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -762,31 +762,6 @@ void blk_dump_rq_flags(struct request *rq, char *msg)
}
EXPORT_SYMBOL(blk_dump_rq_flags);
-static void req_bio_endio(struct request *rq, struct bio *bio,
- unsigned int nbytes, blk_status_t error)
-{
- if (unlikely(error)) {
- bio->bi_status = error;
- } else if (req_op(rq) == REQ_OP_ZONE_APPEND) {
- /*
- * Partial zone append completions cannot be supported as the
- * BIO fragments may end up not being written sequentially.
- */
- if (bio->bi_iter.bi_size != nbytes)
- bio->bi_status = BLK_STS_IOERR;
- else
- bio->bi_iter.bi_sector = rq->__sector;
- }
-
- bio_advance(bio, nbytes);
-
- if (unlikely(rq->rq_flags & RQF_QUIET))
- bio_set_flag(bio, BIO_QUIET);
- /* don't actually finish bio if it's part of flush sequence */
- if (bio->bi_iter.bi_size == 0 && !(rq->rq_flags & RQF_FLUSH_SEQ))
- bio_endio(bio);
-}
-
static void blk_account_io_completion(struct request *req, unsigned int bytes)
{
if (req->part && blk_do_io_stat(req)) {
@@ -890,6 +865,8 @@ static void blk_complete_request(struct request *req)
bool blk_update_request(struct request *req, blk_status_t error,
unsigned int nr_bytes)
{
+ bool is_flush = req->rq_flags & RQF_FLUSH_SEQ;
+ bool quiet = req->rq_flags & RQF_QUIET;
int total_bytes;
trace_block_rq_complete(req, error, nr_bytes);
@@ -910,9 +887,8 @@ bool blk_update_request(struct request *req, blk_status_t error,
if (blk_crypto_rq_has_keyslot(req) && nr_bytes >= blk_rq_bytes(req))
__blk_crypto_rq_put_keyslot(req);
- if (unlikely(error && !blk_rq_is_passthrough(req) &&
- !(req->rq_flags & RQF_QUIET)) &&
- !test_bit(GD_DEAD, &req->q->disk->state)) {
+ if (unlikely(error && !blk_rq_is_passthrough(req) && !quiet) &&
+ !test_bit(GD_DEAD, &req->q->disk->state)) {
blk_print_req_error(req, error);
trace_block_rq_error(req, error, nr_bytes);
}
@@ -924,12 +900,34 @@ bool blk_update_request(struct request *req, blk_status_t error,
struct bio *bio = req->bio;
unsigned bio_bytes = min(bio->bi_iter.bi_size, nr_bytes);
- if (bio_bytes == bio->bi_iter.bi_size)
+ if (unlikely(error))
+ bio->bi_status = error;
+
+ if (bio_bytes == bio->bi_iter.bi_size) {
req->bio = bio->bi_next;
+ } else if (req_op(req) == REQ_OP_ZONE_APPEND &&
+ error == BLK_STS_OK) {
+ /*
+ * Partial zone append completions cannot be supported
+ * as the BIO fragments may end up not being written
+ * sequentially.
+ */
+ bio->bi_status = BLK_STS_IOERR;
+ }
/* Completion has already been traced */
bio_clear_flag(bio, BIO_TRACE_COMPLETION);
- req_bio_endio(req, bio, bio_bytes, error);
+ if (unlikely(quiet))
+ bio_set_flag(bio, BIO_QUIET);
+
+ 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);
+ }
total_bytes += bio_bytes;
nr_bytes -= bio_bytes;
--
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 ` Damien Le Moal [this message]
2024-04-05 4:41 ` [PATCH v6 03/28] block: Introduce blk_zone_update_request_bio() Damien Le Moal
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-3-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).