Software that submits zoned writes, e.g. a filesystem, may submit zoned
writes from multiple CPUs as long as the zoned writes are serialized per
zone. Submitting bios from different CPUs may cause bio reordering if
e.g. different bios reach the storage device through different queues.
Prepare for preserving the order of pipelined zoned writes per zone by
adding the 'rq_cpu` argument to blk_zone_plug_bio(). This argument tells
blk_zone_plug_bio() from which CPU a cached request has been allocated.
The cached request will only be used if it matches the CPU from which
zoned writes are being submitted for the zone associated with the bio.
Cc: Christoph Hellwig <hch@xxxxxx>
Cc: Damien Le Moal <dlemoal@xxxxxxxxxx>
Signed-off-by: Bart Van Assche <bvanassche@xxxxxxx>
---
block/blk-mq.c | 10 ++++++----
block/blk-zoned.c | 5 ++++-
drivers/md/dm.c | 5 ++---
include/linux/blkdev.h | 5 +++--
4 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/block/blk-mq.c b/block/blk-mq.c
index aa81526ad531..c02cf4140717 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -3133,11 +3133,14 @@ void blk_mq_submit_bio(struct bio *bio)
unsigned int nr_segs;
struct request *rq;
blk_status_t ret;
+ int rq_cpu = -1;
/*
* If the plug has a cached request for this queue, try to use it.
*/
rq = blk_mq_peek_cached_request(plug, q, bio->bi_opf);
+ if (rq)
+ rq_cpu = rq->mq_ctx->cpu;
/*
* A BIO that was released from a zone write plug has already been
@@ -3187,10 +3190,9 @@ void blk_mq_submit_bio(struct bio *bio)
if (blk_mq_attempt_bio_merge(q, bio, nr_segs))
goto queue_exit;
- if (bio_needs_zone_write_plugging(bio)) {
- if (blk_zone_plug_bio(bio, nr_segs))
- goto queue_exit;
- }
+ if (bio_needs_zone_write_plugging(bio) &&
+ blk_zone_plug_bio(bio, nr_segs, rq_cpu))
+ goto queue_exit;
new_request:
if (rq) {
diff --git a/block/blk-zoned.c b/block/blk-zoned.c
index efe71b1a1da1..3f285e372460 100644
--- a/block/blk-zoned.c
+++ b/block/blk-zoned.c
@@ -1104,6 +1104,9 @@ static void blk_zone_wplug_handle_native_zone_append(struct bio *bio)
* blk_zone_plug_bio - Handle a zone write BIO with zone write plugging
* @bio: The BIO being submitted
* @nr_segs: The number of physical segments of @bio
+ * @rq_cpu: software queue onto which a request will be queued. -1 if the caller
+ * has not yet decided onto which software queue to queue the request or if
+ * the bio won't be converted into a request.
*
* Handle write, write zeroes and zone append operations requiring emulation
* using zone write plugging.
@@ -1112,7 +1115,7 @@ static void blk_zone_wplug_handle_native_zone_append(struct bio *bio)
* write plug. Otherwise, return false to let the submission path process
* @bio normally.
*/
-bool blk_zone_plug_bio(struct bio *bio, unsigned int nr_segs)
+bool blk_zone_plug_bio(struct bio *bio, unsigned int nr_segs, int rq_cpu)
{
struct block_device *bdev = bio->bi_bdev;
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index ca889328fdfe..5033af6d687c 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -1814,9 +1814,8 @@ static inline bool dm_zone_bio_needs_split(struct mapped_device *md,
static inline bool dm_zone_plug_bio(struct mapped_device *md, struct bio *bio)
{
- if (!bio_needs_zone_write_plugging(bio))
- return false;
- return blk_zone_plug_bio(bio, 0);
+ return bio_needs_zone_write_plugging(bio) &&
+ blk_zone_plug_bio(bio, 0, -1);
}
static blk_status_t __send_zone_reset_all_emulated(struct clone_info *ci,
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 4dec1d91b7f2..3cdb4f7c602d 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -896,7 +896,7 @@ static inline bool bio_needs_zone_write_plugging(struct bio *bio)
}
}
-bool blk_zone_plug_bio(struct bio *bio, unsigned int nr_segs);
+bool blk_zone_plug_bio(struct bio *bio, unsigned int nr_segs, int rq_cpu);
/**
* disk_zone_capacity - returns the zone capacity of zone containing @sector
@@ -931,7 +931,8 @@ static inline bool bio_needs_zone_write_plugging(struct bio *bio)
return false;
}
-static inline bool blk_zone_plug_bio(struct bio *bio, unsigned int nr_segs)
+static inline bool blk_zone_plug_bio(struct bio *bio, unsigned int nr_segs,
+ int rq_cpu)
{
return false;
}
