Thread (26 messages) 26 messages, 3 authors, 2021-05-17
STALE1899d REVIEWED: 6 (6M)
Revisions (6)
  1. rfc [diff vs current]
  2. v2 [diff vs current]
  3. v3 [diff vs current]
  4. v4 [diff vs current]
  5. v5 [diff vs current]
  6. v6 current

[PATCH V6 05/12] block: extract one helper function polling hw queue

From: Ming Lei <hidden>
Date: 2021-04-22 12:22:20
Also in: dm-devel
Subsystem: block layer, the rest · Maintainers: Jens Axboe, Linus Torvalds

From: Jeffle Xu <jefflexu@linux.alibaba.com>

Extract the logic of polling a hw queue and related statistics
handling out as the helper function.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Jeffle Xu <jefflexu@linux.alibaba.com>
Signed-off-by: Ming Lei <redacted>
---
 block/blk-poll.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/block/blk-poll.c b/block/blk-poll.c
index daa307f84792..0a38c25bcee5 100644
--- a/block/blk-poll.c
+++ b/block/blk-poll.c
@@ -129,6 +129,19 @@ static bool blk_mq_poll_hybrid(struct request_queue *q,
 	return blk_mq_poll_hybrid_sleep(q, rq);
 }
 
+static inline int blk_mq_poll_hctx(struct request_queue *q,
+				   struct blk_mq_hw_ctx *hctx)
+{
+	int ret;
+
+	hctx->poll_invoked++;
+	ret = q->mq_ops->poll(hctx);
+	if (ret > 0)
+		hctx->poll_success++;
+
+	return ret;
+}
+
 /**
  * blk_poll - poll for IO completions
  * @q:  the queue
@@ -171,11 +184,8 @@ int blk_poll(struct request_queue *q, blk_qc_t cookie, bool spin)
 	do {
 		int ret;
 
-		hctx->poll_invoked++;
-
-		ret = q->mq_ops->poll(hctx);
+		ret = blk_mq_poll_hctx(q, hctx);
 		if (ret > 0) {
-			hctx->poll_success++;
 			__set_current_state(TASK_RUNNING);
 			return ret;
 		}
-- 
2.29.2
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help