[PATCH v14 03/19] block: Preserve the order of requeued zoned writes

Bart Van Assche
2023-10-23T21:56:56Z

blk_mq_requeue_work() inserts requeued requests in front of other
requests. This is fine for all request types except for sequential zoned
writes. Hence this patch.

Note: moving this functionality into the mq-deadline I/O scheduler is
not an option because we want to be able to use zoned storage without
I/O scheduler.

Cc: Christoph Hellwig <hch@lst.de>
Cc: Damien Le Moal <dlemoal@kernel.org>
Cc: Ming Lei <ming.lei@redhat.com>
Cc: Hannes Reinecke <hare@suse.de>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
block/blk-mq.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/block/blk-mq.c b/block/blk-mq.c
index e2d11183f62e..e678edca3fa8 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1484,8 +1484,12 @@ static void blk_mq_requeue_work(struct work_struct *work)
list_del_init(&rq->queuelist);
blk_mq_request_bypass_insert(rq, 0);
} else {
+ blk_insert_t insert_flags = BLK_MQ_INSERT_AT_HEAD;
+
list_del_init(&rq->queuelist);
- blk_mq_insert_request(rq, BLK_MQ_INSERT_AT_HEAD);
+ if (blk_rq_is_seq_zoned_write(rq))
+ insert_flags = 0;
+ blk_mq_insert_request(rq, insert_flags);
}
}