From 790cf9c84837b232eb413b8b6b5d57817176cb23 Mon Sep 17 00:00:00 2001
From: Jan Kara <jack@suse.cz>
Date: Thu, 25 Nov 2021 14:36:34 +0100
Subject: [PATCH] block: Provide blk_mq_sched_get_icq()
Git-commit: 790cf9c84837b232eb413b8b6b5d57817176cb23
Patch-mainline: v5.17-rc1
References: bsc#1184318
Currently we lookup ICQ only after the request is allocated. However BFQ
will want to decide how many scheduler tags it allows a given bfq queue
(effectively a process) to consume based on cgroup weight. So provide a
function blk_mq_sched_get_icq() so that BFQ can lookup ICQ earlier.
Acked-by: Paolo Valente <paolo.valente@linaro.org>
Signed-off-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20211125133645.27483-1-jack@suse.cz
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Acked-by: Jan Kara <jack@suse.cz>
---
block/blk-mq-sched.c | 26 +++++++++++++++-----------
block/blk-mq-sched.h | 1 +
2 files changed, 16 insertions(+), 11 deletions(-)
--- a/block/blk-mq-sched.c
+++ b/block/blk-mq-sched.c
@@ -18,28 +18,32 @@
#include "blk-mq-tag.h"
#include "blk-wbt.h"
-void blk_mq_sched_assign_ioc(struct request *rq)
+struct io_cq *blk_mq_sched_get_icq(struct request_queue *q)
{
- struct request_queue *q = rq->q;
struct io_context *ioc;
struct io_cq *icq;
- /*
- * May not have an IO context if it's a passthrough request
- */
+ /* May not have an IO context if context creation failed */
ioc = current->io_context;
if (!ioc)
- return;
+ return NULL;
spin_lock_irq(&q->queue_lock);
icq = ioc_lookup_icq(ioc, q);
spin_unlock_irq(&q->queue_lock);
+ if (icq)
+ return icq;
+ return ioc_create_icq(ioc, q, GFP_ATOMIC);
+}
+EXPORT_SYMBOL(blk_mq_sched_get_icq);
+
+void blk_mq_sched_assign_ioc(struct request *rq)
+{
+ struct io_cq *icq;
- if (!icq) {
- icq = ioc_create_icq(ioc, q, GFP_ATOMIC);
- if (!icq)
- return;
- }
+ icq = blk_mq_sched_get_icq(rq->q);
+ if (!icq)
+ return;
get_io_context(icq->ioc);
rq->elv.icq = icq;
}
--- a/block/blk-mq-sched.h
+++ b/block/blk-mq-sched.h
@@ -7,6 +7,7 @@
#define MAX_SCHED_RQ (16 * BLKDEV_MAX_RQ)
+struct io_cq *blk_mq_sched_get_icq(struct request_queue *q);
void blk_mq_sched_assign_ioc(struct request *rq);
bool blk_mq_sched_try_merge(struct request_queue *q, struct bio *bio,