Skip to contentSkip to conversation

mq-deadline: Improve support for zoned block devices

PATCH Applied Bart Van Assche 3 participants 20 messages May 17, 2023 – May 19, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

v6 cover mq-deadline: Improve support for zoned block devices

Hi Jens,

This patch series improves support for zoned block devices in the mq-deadline scheduler by preserving the order of requeued writes (REQ_OP_WRITE and REQ_OP_WRITE_ZEROES).

Please consider this patch series for the next merge window.

Thanks,

Bart.

Changes compared to v5:
- Added a patch with a grammar fix for a source code comment.
- Renamed op_is_zoned_write() into op_needs_zoned_write_locking().
- Dropped patch "block: mq-deadline: Improve deadline_skip_seq_writes()".

Changes compared to v4:
- Changed blk_rq_is_seq_zoned_write() into an inline function.
- Reworked patch "Reduce lock contention" such that all merged requests are freed at once.

Changes compared to v3:
- Addressed Christoph's review feedback.
- Dropped patch "block: Micro-optimize blk_req_needs_zone_write_lock()".
- Added three new patches:
* block: Fix the type of the second bdev_op_is_zoned_write() argument
* block: Introduce op_is_zoned_write()
* block: mq-deadline: Reduce lock contention

Changes compared to v2:
- In the patch that micro-optimizes blk_req_needs_zone_write_lock(), inline bdev_op_is_zoned_write() instead of modifying it.
- In patch "block: Introduce blk_rq_is_seq_zoned_write()", converted "case REQ_OP_ZONE_APPEND" into a source code comment.
- Reworked deadline_skip_seq_writes() as suggested by Christoph.
- Dropped the patch that disabled head insertion for zoned writes.
- Dropped patch "mq-deadline: Fix a race condition related to zoned writes".
- Reworked handling of requeued requests: the 'next_rq' pointer has been removed and instead the position of the most recently dispatched request is tracked.
- Dropped the patches for tracking zone capacity and for restricting the number of active zones.

Changes compared to v1:
- Left out the patches related to request insertion and requeuing since Christoph is busy with reworking these patches.
- Added a patch for enforcing the active zone limit.

Bart Van Assche (11):
block: mq-deadline: Add a word in a source code comment
block: Simplify blk_req_needs_zone_write_lock()
block: Fix the type of the second bdev_op_is_zoned_write() argument
block: Introduce op_needs_zoned_write_locking()
block: Introduce blk_rq_is_seq_zoned_write()
block: mq-deadline: Clean up deadline_check_fifo()
block: mq-deadline: Simplify deadline_skip_seq_writes()
block: mq-deadline: Reduce lock contention
block: mq-deadline: Track the dispatch position
block: mq-deadline: Handle requeued requests correctly
block: mq-deadline: Fix handling of at-head zoned writes

 block/blk-zoned.c      |   8 +--
 block/mq-deadline.c    | 125 +++++++++++++++++++++++++++--------------
 include/linux/blk-mq.h |  17 ++++++
 include/linux/blkdev.h |  13 +++--
 4 files changed, 110 insertions(+), 53 deletions(-)
#1 lore raw

PATCH v6 1/11 block: mq-deadline: Add a word in a source code comment

Add the missing word "and".

Cc Damien Le Moal <[email protected]>
Fixes 945ffb60c11d ("mq-deadline: add blk-mq adaptation of the deadline IO scheduler")
---
 block/mq-deadline.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
block/mq-deadline.c +1 -1
index 5839a027e0f0..cea1b084c69e 100644
@@ -443,7 +443,7 @@ static struct request *__dd_dispatch_request(struct deadline_data *dd,
 	 */
 	rq = deadline_next_request(dd, per_prio, dd->last_dir);
 	if (rq && dd->batching < dd->fifo_batch)
-		/* we have a next request are still entitled to batch */
+		/* we have a next request and are still entitled to batch */
 		goto dispatch_request;
 
 	/*
maintainer Tested-by on v6 1/11
#2 lore raw

Re: [PATCH v6 01/11] block: mq-deadline: Add a word in a source code comment

Quoted 6 lines · Bart Van Assche

Add the missing word "and".

Cc Damien Le Moal <[email protected]>
Fixes 945ffb60c11d ("mq-deadline: add blk-mq adaptation of the deadline IO scheduler")

Replying to this patch as there is no cover letter.

I gave this series a spin yesterday using a 26TB SMR drive. No issues detected and no performance regression that I can see. Tested on top of 6.4-rc2.

So feel free to add:

#3 lore raw

Re: [PATCH v6 01/11] block: mq-deadline: Add a word in a source code comment

Quoted 8 lines · Damien Le Moal
Quoted 6 lines · Bart Van Assche

Add the missing word "and".

Cc Damien Le Moal <[email protected]>
Fixes 945ffb60c11d ("mq-deadline: add blk-mq adaptation of the deadline IO scheduler")
Quoted 8 lines

Replying to this patch as there is no cover letter.

I gave this series a spin yesterday using a 26TB SMR drive. No issues detected and no performance regression that I can see. Tested on top of 6.4-rc2.

So feel free to add:

Thanks Damien!

BTW, it seems like Lore received the cover letter. See also https://lore.kernel.org/linux-block/[email protected]/T/#t.

Bart.

maintainer
#4 lore raw

Re: [PATCH v6 01/11] block: mq-deadline: Add a word in a source code comment

Quoted 14 lines · Bart Van Assche
Quoted 13 lines · Damien Le Moal
Quoted 6 lines · Bart Van Assche

Add the missing word "and".

Cc Damien Le Moal <[email protected]>
Fixes 945ffb60c11d ("mq-deadline: add blk-mq adaptation of the deadline IO scheduler")

Replying to this patch as there is no cover letter.

I gave this series a spin yesterday using a 26TB SMR drive. No issues detected and no performance regression that I can see. Tested on top of 6.4-rc2.

Quoted 8 lines
Quoted 3 lines

So feel free to add:

Thanks Damien!

BTW, it seems like Lore received the cover letter. See also
https://lore.kernel.org/linux-block/[email protected]/T/#t.

Weird... I do not have it in my inbox..

Quoted 3 lines

Bart.

Signature · 2 lines
Damien Le Moal
Western Digital Research
#5 lore raw

PATCH v6 2/11 block: Simplify blk_req_needs_zone_write_lock()

In reply to Bart Van Assche

Remove the blk_rq_is_passthrough() check because it is redundant:
blk_req_needs_zone_write_lock() also calls bdev_op_is_zoned_write() and the latter function returns false for pass-through requests.

---
 block/blk-zoned.c | 3 ---
 1 file changed, 3 deletions(-)
block/blk-zoned.c +0 -3
index fce9082384d6..835d9e937d4d 100644
@@ -57,9 +57,6 @@ EXPORT_SYMBOL_GPL(blk_zone_cond_str);
  */
 bool blk_req_needs_zone_write_lock(struct request *rq)
 {
-	if (blk_rq_is_passthrough(rq))
-		return false;
-
 	if (!rq->q->disk->seq_zones_wlock)
 		return false;
 
#6 lore raw

PATCH v6 3/11 block: Fix the type of the second bdev_op_is_zoned_write() argument

In reply to Bart Van Assche

Change the type of the second argument of bdev_op_is_zoned_write() from blk_opf_t into enum req_op because this function expects an operation without flags as second argument.

Cc Ming Lei <[email protected]>
Fixes 8cafdb5ab94c ("block: adapt blk_mq_plug() to not plug for writes that require a zone lock")
---
 include/linux/blkdev.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/blkdev.h +1 -1
index b441e633f4dd..db24cf98ccfb 100644
@@ -1282,7 +1282,7 @@ static inline unsigned int bdev_zone_no(struct block_device *bdev, sector_t sec)
 }
 
 static inline bool bdev_op_is_zoned_write(struct block_device *bdev,
-					  blk_opf_t op)
+					  enum req_op op)
 {
 	if (!bdev_is_zoned(bdev))
 		return false;
#7 lore raw

PATCH v6 4/11 block: Introduce op_needs_zoned_write_locking()

In reply to Bart Van Assche

Introduce a helper function for checking whether write serialization is required if the operation will be sent to a zoned device. A second caller for op_needs_zoned_write_locking() will be introduced in the next patch in this series.

---
 include/linux/blkdev.h | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
include/linux/blkdev.h +7 -4
index db24cf98ccfb..3952c52d6cd1 100644
@@ -1281,13 +1281,16 @@ static inline unsigned int bdev_zone_no(struct block_device *bdev, sector_t sec)
 	return disk_zone_no(bdev->bd_disk, sec);
 }
 
+/* Whether write serialization is required for @op on zoned devices. */
+static inline bool op_needs_zoned_write_locking(enum req_op op)
+{
+	return op == REQ_OP_WRITE || op == REQ_OP_WRITE_ZEROES;
+}
+
 static inline bool bdev_op_is_zoned_write(struct block_device *bdev,
 					  enum req_op op)
 {
-	if (!bdev_is_zoned(bdev))
-		return false;
-
-	return op == REQ_OP_WRITE || op == REQ_OP_WRITE_ZEROES;
+	return bdev_is_zoned(bdev) && op_needs_zoned_write_locking(op);
 }
 
 static inline sector_t bdev_zone_sectors(struct block_device *bdev)
maintainer Reviewed-by on v6 4/11
#8 lore raw

Re: [PATCH v6 04/11] block: Introduce op_needs_zoned_write_locking()

Quoted 10 lines · Bart Van Assche

Introduce a helper function for checking whether write serialization is required if the operation will be sent to a zoned device. A second caller for op_needs_zoned_write_locking() will be introduced in the next patch in this series.

Signature · 2 lines
Damien Le Moal
Western Digital Research
#9 lore raw

PATCH v6 5/11 block: Introduce blk_rq_is_seq_zoned_write()

In reply to Bart Van Assche

Introduce the function blk_rq_is_seq_zoned_write(). This function will be used in later patches to preserve the order of zoned writes that require write serialization.

This patch includes an optimization: instead of using rq->q->disk->part0->bd_queue to check whether or not the queue is associated with a zoned block device, use rq->q->disk->queue.

Cc Christoph Hellwig <[email protected]>
Cc Damien Le Moal <[email protected]>
Cc Ming Lei <[email protected]>
---
 block/blk-zoned.c      |  5 +----
 include/linux/blk-mq.h | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 4 deletions(-)
block/blk-zoned.c +1 -4
index 835d9e937d4d..096b6b47561f 100644
@@ -60,10 +60,7 @@ bool blk_req_needs_zone_write_lock(struct request *rq)
 	if (!rq->q->disk->seq_zones_wlock)
 		return false;
 
-	if (bdev_op_is_zoned_write(rq->q->disk->part0, req_op(rq)))
-		return blk_rq_zone_is_seq(rq);
-
-	return false;
+	return blk_rq_is_seq_zoned_write(rq);
 }
 EXPORT_SYMBOL_GPL(blk_req_needs_zone_write_lock);
 
include/linux/blk-mq.h +17 -0
index 06caacd77ed6..937493249aae 100644
@@ -1164,6 +1164,18 @@ static inline unsigned int blk_rq_zone_is_seq(struct request *rq)
 	return disk_zone_is_seq(rq->q->disk, blk_rq_pos(rq));
 }
 
+/**
+ * blk_rq_is_seq_zoned_write() - Check if @rq requires write serialization.
+ * @rq: Request to examine.
+ *
+ * Note: REQ_OP_ZONE_APPEND requests do not require serialization.
+ */
+static inline bool blk_rq_is_seq_zoned_write(struct request *rq)
+{
+	return op_needs_zoned_write_locking(req_op(rq)) &&
+		blk_rq_zone_is_seq(rq);
+}
+
 bool blk_req_needs_zone_write_lock(struct request *rq);
 bool blk_req_zone_write_trylock(struct request *rq);
 void __blk_req_zone_write_lock(struct request *rq);
@@ -1194,6 +1206,11 @@ static inline bool blk_req_can_dispatch_to_zone(struct request *rq)
 	return !blk_req_zone_is_write_locked(rq);
 }
 #else /* CONFIG_BLK_DEV_ZONED */
+static inline bool blk_rq_is_seq_zoned_write(struct request *rq)
+{
+	return false;
+}
+
 static inline bool blk_req_needs_zone_write_lock(struct request *rq)
 {
 	return false;
maintainer Reviewed-by on v6 5/11
#10 lore raw

Re: [PATCH v6 05/11] block: Introduce blk_rq_is_seq_zoned_write()

Quoted 4 lines · Bart Van Assche

Introduce the function blk_rq_is_seq_zoned_write(). This function will be used in later patches to preserve the order of zoned writes that require write serialization.

Quoted 8 lines

This patch includes an optimization: instead of using rq->q->disk->part0->bd_queue to check whether or not the queue is associated with a zoned block device, use rq->q->disk->queue.

Cc Christoph Hellwig <[email protected]>
Cc Damien Le Moal <[email protected]>
Cc Ming Lei <[email protected]>
Signature · 2 lines
Damien Le Moal
Western Digital Research
#11 lore raw

PATCH v6 6/11 block: mq-deadline: Clean up deadline_check_fifo()

In reply to Bart Van Assche

Change the return type of deadline_check_fifo() from 'int' into 'bool'. Use time_is_before_eq_jiffies() instead of time_after_eq(). No functionality has been changed.

---
 block/mq-deadline.c | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)
block/mq-deadline.c +5 -11
index cea1b084c69e..cea91ba4a6ea 100644
@@ -272,21 +272,15 @@ static u32 dd_queued(struct deadline_data *dd, enum dd_prio prio)
 }
 
 /*
- * deadline_check_fifo returns 0 if there are no expired requests on the fifo,
- * 1 otherwise. Requires !list_empty(&dd->fifo_list[data_dir])
+ * deadline_check_fifo returns true if and only if there are expired requests
+ * in the FIFO list. Requires !list_empty(&dd->fifo_list[data_dir]).
  */
-static inline int deadline_check_fifo(struct dd_per_prio *per_prio,
-				      enum dd_data_dir data_dir)
+static inline bool deadline_check_fifo(struct dd_per_prio *per_prio,
+				       enum dd_data_dir data_dir)
 {
 	struct request *rq = rq_entry_fifo(per_prio->fifo_list[data_dir].next);
 
-	/*
-	 * rq is expired!
-	 */
-	if (time_after_eq(jiffies, (unsigned long)rq->fifo_time))
-		return 1;
-
-	return 0;
+	return time_is_before_eq_jiffies((unsigned long)rq->fifo_time);
 }
 
 /*
maintainer Reviewed-by on v6 6/11
#12 lore raw

Re: [PATCH v6 06/11] block: mq-deadline: Clean up deadline_check_fifo()

Quoted 9 lines · Bart Van Assche

Change the return type of deadline_check_fifo() from 'int' into 'bool'. Use time_is_before_eq_jiffies() instead of time_after_eq(). No functionality has been changed.

I still think that time_is_before_eq_jiffies() should really be named time_after_eq_jiffies() though, but that is a different patch :)

Signature · 2 lines
Damien Le Moal
Western Digital Research
#13 lore raw

PATCH v6 7/11 block: mq-deadline: Simplify deadline_skip_seq_writes()

In reply to Bart Van Assche

Make the deadline_skip_seq_writes() code shorter without changing its functionality.

---
 block/mq-deadline.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
block/mq-deadline.c +3 -6
index cea91ba4a6ea..56782ee93522 100644
@@ -304,14 +304,11 @@ static struct request *deadline_skip_seq_writes(struct deadline_data *dd,
 						struct request *rq)
 {
 	sector_t pos = blk_rq_pos(rq);
-	sector_t skipped_sectors = 0;
 
-	while (rq) {
-		if (blk_rq_pos(rq) != pos + skipped_sectors)
-			break;
-		skipped_sectors += blk_rq_sectors(rq);
+	do {
+		pos += blk_rq_sectors(rq);
 		rq = deadline_latter_request(rq);
-	}
+	} while (rq && blk_rq_pos(rq) == pos);
 
 	return rq;
 }
#14 lore raw

PATCH v6 8/11 block: mq-deadline: Reduce lock contention

In reply to Bart Van Assche

blk_mq_free_requests() calls dd_finish_request() indirectly. Prevent nested locking of dd->lock and dd->zone_lock by moving the code for freeing requests.

---
 block/mq-deadline.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
block/mq-deadline.c +6 -6
index 56782ee93522..44222d18f6d4 100644
@@ -757,7 +757,7 @@ static bool dd_bio_merge(struct request_queue *q, struct bio *bio,
  * add rq to rbtree and fifo
  */
 static void dd_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq,
-			      blk_insert_t flags)
+			      blk_insert_t flags, struct list_head *free)
 {
 	struct request_queue *q = hctx->queue;
 	struct deadline_data *dd = q->elevator->elevator_data;
@@ -766,7 +766,6 @@ static void dd_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq,
 	u8 ioprio_class = IOPRIO_PRIO_CLASS(ioprio);
 	struct dd_per_prio *per_prio;
 	enum dd_prio prio;
-	LIST_HEAD(free);
 
 	lockdep_assert_held(&dd->lock);
 
@@ -783,10 +782,8 @@ static void dd_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq,
 		rq->elv.priv[0] = (void *)(uintptr_t)1;
 	}
 
-	if (blk_mq_sched_try_insert_merge(q, rq, &free)) {
-		blk_mq_free_requests(&free);
+	if (blk_mq_sched_try_insert_merge(q, rq, free))
 		return;
-	}
 
 	trace_block_rq_insert(rq);
 
@@ -819,6 +816,7 @@ static void dd_insert_requests(struct blk_mq_hw_ctx *hctx,
 {
 	struct request_queue *q = hctx->queue;
 	struct deadline_data *dd = q->elevator->elevator_data;
+	LIST_HEAD(free);
 
 	spin_lock(&dd->lock);
 	while (!list_empty(list)) {
@@ -826,9 +824,11 @@ static void dd_insert_requests(struct blk_mq_hw_ctx *hctx,
 
 		rq = list_first_entry(list, struct request, queuelist);
 		list_del_init(&rq->queuelist);
-		dd_insert_request(hctx, rq, flags);
+		dd_insert_request(hctx, rq, flags, &free);
 	}
 	spin_unlock(&dd->lock);
+
+	blk_mq_free_requests(&free);
 }
 
 /* Callback from inside blk_mq_rq_ctx_init(). */
#15 lore raw

PATCH v6 9/11 block: mq-deadline: Track the dispatch position

In reply to Bart Van Assche

Track the position (sector_t) of the most recently dispatched request instead of tracking a pointer to the next request to dispatch. This patch is the basis for patch "Handle requeued requests correctly". Without this patch it would be significantly more complicated to make sure that zoned writes are dispatched in LBA order per zone.

---
 block/mq-deadline.c | 45 +++++++++++++++++++++++++++++++--------------
 1 file changed, 31 insertions(+), 14 deletions(-)
block/mq-deadline.c +31 -14
index 44222d18f6d4..91b689261d30 100644
@@ -74,8 +74,8 @@ struct dd_per_prio {
 	struct list_head dispatch;
 	struct rb_root sort_list[DD_DIR_COUNT];
 	struct list_head fifo_list[DD_DIR_COUNT];
-	/* Next request in FIFO order. Read, write or both are NULL. */
-	struct request *next_rq[DD_DIR_COUNT];
+	/* Position of the most recently dispatched request. */
+	sector_t latest_pos[DD_DIR_COUNT];
 	struct io_stats_per_prio stats;
 };
 
@@ -156,6 +156,25 @@ deadline_latter_request(struct request *rq)
 	return NULL;
 }
 
+/* Return the first request for which blk_rq_pos() >= pos. */
+static inline struct request *deadline_from_pos(struct dd_per_prio *per_prio,
+				enum dd_data_dir data_dir, sector_t pos)
+{
+	struct rb_node *node = per_prio->sort_list[data_dir].rb_node;
+	struct request *rq, *res = NULL;
+
+	while (node) {
+		rq = rb_entry_rq(node);
+		if (blk_rq_pos(rq) >= pos) {
+			res = rq;
+			node = node->rb_left;
+		} else {
+			node = node->rb_right;
+		}
+	}
+	return res;
+}
+
 static void
 deadline_add_rq_rb(struct dd_per_prio *per_prio, struct request *rq)
 {
@@ -167,11 +186,6 @@ deadline_add_rq_rb(struct dd_per_prio *per_prio, struct request *rq)
 static inline void
 deadline_del_rq_rb(struct dd_per_prio *per_prio, struct request *rq)
 {
-	const enum dd_data_dir data_dir = rq_data_dir(rq);
-
-	if (per_prio->next_rq[data_dir] == rq)
-		per_prio->next_rq[data_dir] = deadline_latter_request(rq);
-
 	elv_rb_del(deadline_rb_root(per_prio, rq), rq);
 }
 
@@ -251,10 +265,6 @@ static void
 deadline_move_request(struct deadline_data *dd, struct dd_per_prio *per_prio,
 		      struct request *rq)
 {
-	const enum dd_data_dir data_dir = rq_data_dir(rq);
-
-	per_prio->next_rq[data_dir] = deadline_latter_request(rq);
-
 	/*
 	 * take it off the sort and fifo list
 	 */
@@ -363,7 +373,8 @@ deadline_next_request(struct deadline_data *dd, struct dd_per_prio *per_prio,
 	struct request *rq;
 	unsigned long flags;
 
-	rq = per_prio->next_rq[data_dir];
+	rq = deadline_from_pos(per_prio, data_dir,
+			       per_prio->latest_pos[data_dir]);
 	if (!rq)
 		return NULL;
 
@@ -426,6 +437,7 @@ static struct request *__dd_dispatch_request(struct deadline_data *dd,
 		if (started_after(dd, rq, latest_start))
 			return NULL;
 		list_del_init(&rq->queuelist);
+		data_dir = rq_data_dir(rq);
 		goto done;
 	}
 
@@ -433,9 +445,11 @@ static struct request *__dd_dispatch_request(struct deadline_data *dd,
 	 * batches are currently reads XOR writes
 	 */
 	rq = deadline_next_request(dd, per_prio, dd->last_dir);
-	if (rq && dd->batching < dd->fifo_batch)
+	if (rq && dd->batching < dd->fifo_batch) {
 		/* we have a next request and are still entitled to batch */
+		data_dir = rq_data_dir(rq);
 		goto dispatch_request;
+	}
 
 	/*
 	 * at this point we are not running a batch. select the appropriate
@@ -513,6 +527,7 @@ static struct request *__dd_dispatch_request(struct deadline_data *dd,
 done:
 	ioprio_class = dd_rq_ioclass(rq);
 	prio = ioprio_class_to_prio[ioprio_class];
+	dd->per_prio[prio].latest_pos[data_dir] = blk_rq_pos(rq);
 	dd->per_prio[prio].stats.dispatched++;
 	/*
 	 * If the request needs its target zone locked, do it.
@@ -1026,8 +1041,10 @@ static int deadline_##name##_next_rq_show(void *data,			\
 	struct request_queue *q = data;					\
 	struct deadline_data *dd = q->elevator->elevator_data;		\
 	struct dd_per_prio *per_prio = &dd->per_prio[prio];		\
-	struct request *rq = per_prio->next_rq[data_dir];		\
+	struct request *rq;						\
 									\
+	rq = deadline_from_pos(per_prio, data_dir,			\
+			       per_prio->latest_pos[data_dir]);		\
 	if (rq)								\
 		__blk_mq_debugfs_rq_show(m, rq);			\
 	return 0;							\
#16 lore raw

PATCH v6 10/11 block: mq-deadline: Handle requeued requests correctly

In reply to Bart Van Assche

Start dispatching from the start of a zone instead of from the starting position of the most recently dispatched request.

If a zoned write is requeued with an LBA that is lower than already inserted zoned writes, make sure that it is submitted first.

---
 block/mq-deadline.c | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)
block/mq-deadline.c +32 -2
index 91b689261d30..e90879869c90 100644
@@ -156,13 +156,28 @@ deadline_latter_request(struct request *rq)
 	return NULL;
 }
 
-/* Return the first request for which blk_rq_pos() >= pos. */
+/*
+ * Return the first request for which blk_rq_pos() >= @pos. For zoned devices,
+ * return the first request after the start of the zone containing @pos.
+ */
 static inline struct request *deadline_from_pos(struct dd_per_prio *per_prio,
 				enum dd_data_dir data_dir, sector_t pos)
 {
 	struct rb_node *node = per_prio->sort_list[data_dir].rb_node;
 	struct request *rq, *res = NULL;
 
+	if (!node)
+		return NULL;
+
+	rq = rb_entry_rq(node);
+	/*
+	 * A zoned write may have been requeued with a starting position that
+	 * is below that of the most recently dispatched request. Hence, for
+	 * zoned writes, start searching from the start of a zone.
+	 */
+	if (blk_rq_is_seq_zoned_write(rq))
+		pos -= round_down(pos, rq->q->limits.chunk_sectors);
+
 	while (node) {
 		rq = rb_entry_rq(node);
 		if (blk_rq_pos(rq) >= pos) {
@@ -806,6 +821,8 @@ static void dd_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq,
 		list_add(&rq->queuelist, &per_prio->dispatch);
 		rq->fifo_time = jiffies;
 	} else {
+		struct list_head *insert_before;
+
 		deadline_add_rq_rb(per_prio, rq);
 
 		if (rq_mergeable(rq)) {
@@ -818,7 +835,20 @@ static void dd_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq,
 		 * set expire time and add to fifo list
 		 */
 		rq->fifo_time = jiffies + dd->fifo_expire[data_dir];
-		list_add_tail(&rq->queuelist, &per_prio->fifo_list[data_dir]);
+		insert_before = &per_prio->fifo_list[data_dir];
+#ifdef CONFIG_BLK_DEV_ZONED
+		/*
+		 * Insert zoned writes such that requests are sorted by
+		 * position per zone.
+		 */
+		if (blk_rq_is_seq_zoned_write(rq)) {
+			struct request *rq2 = deadline_latter_request(rq);
+
+			if (rq2 && blk_rq_zone_no(rq2) == blk_rq_zone_no(rq))
+				insert_before = &rq2->queuelist;
+		}
+#endif
+		list_add_tail(&rq->queuelist, insert_before);
 	}
 }
 
maintainer Reviewed-by on v6 10/11
#17 lore raw

Re: [PATCH v6 10/11] block: mq-deadline: Handle requeued requests correctly

Quoted 11 lines · Bart Van Assche

Start dispatching from the start of a zone instead of from the starting position of the most recently dispatched request.

If a zoned write is requeued with an LBA that is lower than already inserted zoned writes, make sure that it is submitted first.

Signature · 2 lines
Damien Le Moal
Western Digital Research
#18 lore raw

PATCH v6 11/11 block: mq-deadline: Fix handling of at-head zoned writes

In reply to Bart Van Assche

Before dispatching a zoned write from the FIFO list, check whether there are any zoned writes in the RB-tree with a lower LBA for the same zone. This patch ensures that zoned writes happen in order even if at_head is set for some writes for a zone and not for others.

---
 block/mq-deadline.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
block/mq-deadline.c +7 -2
index e90879869c90..6aa5daf7ae32 100644
@@ -346,7 +346,7 @@ static struct request *
 deadline_fifo_request(struct deadline_data *dd, struct dd_per_prio *per_prio,
 		      enum dd_data_dir data_dir)
 {
-	struct request *rq;
+	struct request *rq, *rb_rq, *next;
 	unsigned long flags;
 
 	if (list_empty(&per_prio->fifo_list[data_dir]))
@@ -364,7 +364,12 @@ deadline_fifo_request(struct deadline_data *dd, struct dd_per_prio *per_prio,
 	 * zones and these zones are unlocked.
 	 */
 	spin_lock_irqsave(&dd->zone_lock, flags);
-	list_for_each_entry(rq, &per_prio->fifo_list[DD_WRITE], queuelist) {
+	list_for_each_entry_safe(rq, next, &per_prio->fifo_list[DD_WRITE],
+				 queuelist) {
+		/* Check whether a prior request exists for the same zone. */
+		rb_rq = deadline_from_pos(per_prio, data_dir, blk_rq_pos(rq));
+		if (rb_rq && blk_rq_pos(rb_rq) < blk_rq_pos(rq))
+			rq = rb_rq;
 		if (blk_req_can_dispatch_to_zone(rq) &&
 		    (blk_queue_nonrot(rq->q) ||
 		     !deadline_is_seq_write(dd, rq)))
maintainer Applied
#19 lore raw
In reply to Bart Van Assche
Quoted 9 lines · Bart Van Assche

This patch series improves support for zoned block devices in the mq-deadline scheduler by preserving the order of requeued writes (REQ_OP_WRITE and REQ_OP_WRITE_ZEROES).

Please consider this patch series for the next merge window.

Thanks,

[...]

Applied, thanks!

[01/11] block: mq-deadline: Add a word in a source code comment

        commit: 45b46b6f157169b452772430566772506e25687a
[02/11] block: Simplify blk_req_needs_zone_write_lock()
        commit: 4f51644ccff1e4bf159e86da3d9695a1a33ca231
[03/11] block: Fix the type of the second bdev_op_is_zoned_write() argument
        commit: 3ddbe2a7e0d4a155a805f69c906c9beed30d4cc4
[04/11] block: Introduce op_needs_zoned_write_locking()
        commit: a370798201b537f78288e4ef5e0f7fc70889e7ee
[05/11] block: Introduce blk_rq_is_seq_zoned_write()
        commit: 19821fee3ed42e5b294e95814892d0ad6a9890c9
[06/11] block: mq-deadline: Clean up deadline_check_fifo()
        commit: e0d85cde95bba7d40caa3bf9bc41ee810f0e96df
[07/11] block: mq-deadline: Simplify deadline_skip_seq_writes()
        commit: 3b463cbea908a9c8d4b9eda09765070506864cbe
[08/11] block: mq-deadline: Reduce lock contention
        commit: b2097bd24b438d49d82a5c317be4dc74b626236a
[09/11] block: mq-deadline: Track the dispatch position
        commit: 83c46ed675579fe84354bd07b0d81b525a2b1ebb
[10/11] block: mq-deadline: Handle requeued requests correctly
        commit: 0effb390c4bac1a484f0ca6ad3f1d183fcde882b
[11/11] block: mq-deadline: Fix handling of at-head zoned writes
        commit: a036e698c231ba884daa37196be3ac6c6dce1d75

Best regards,

Signature · 1 line
Jens Axboe