From: John Garry <john.garry@huawei.com>
To: <axboe@kernel.dk>
Cc: <linux-block@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<ming.lei@redhat.com>, <kashyap.desai@broadcom.com>,
<hare@suse.de>, "John Garry" <john.garry@huawei.com>
Subject: [PATCH RFT 1/3] blk-mq: Drop busy_iter_fn blk_mq_hw_ctx argument
Date: Tue, 2 Nov 2021 19:27:33 +0800 [thread overview]
Message-ID: <1635852455-39935-2-git-send-email-john.garry@huawei.com> (raw)
In-Reply-To: <1635852455-39935-1-git-send-email-john.garry@huawei.com>
The only user of blk_mq_hw_ctx blk_mq_hw_ctx argument is
blk_mq_rq_inflight().
Function blk_mq_rq_inflight() uses the hctx to find the associated request
queue to match against the request. However this same check is already
done in caller bt_iter(), so drop this check.
With that change there are no more users of busy_iter_fn blk_mq_hw_ctx
argument, so drop the argument.
Signed-off-by: John Garry <john.garry@huawei.com>
---
block/blk-mq-tag.c | 2 +-
block/blk-mq.c | 17 ++++++++---------
include/linux/blk-mq.h | 3 +--
3 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c
index 995336abee33..0d773c44a7ec 100644
--- a/block/blk-mq-tag.c
+++ b/block/blk-mq-tag.c
@@ -254,7 +254,7 @@ static bool bt_iter(struct sbitmap *bitmap, unsigned int bitnr, void *data)
return true;
if (rq->q == hctx->queue && rq->mq_hctx == hctx)
- ret = iter_data->fn(hctx, rq, iter_data->data, reserved);
+ ret = iter_data->fn(rq, iter_data->data, reserved);
blk_mq_put_rq_ref(rq);
return ret;
}
diff --git a/block/blk-mq.c b/block/blk-mq.c
index 07eb1412760b..c26e6c9301dd 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -126,8 +126,7 @@ struct mq_inflight {
unsigned int inflight[2];
};
-static bool blk_mq_check_inflight(struct blk_mq_hw_ctx *hctx,
- struct request *rq, void *priv,
+static bool blk_mq_check_inflight(struct request *rq, void *priv,
bool reserved)
{
struct mq_inflight *mi = priv;
@@ -1136,14 +1135,15 @@ void blk_mq_delay_kick_requeue_list(struct request_queue *q,
}
EXPORT_SYMBOL(blk_mq_delay_kick_requeue_list);
-static bool blk_mq_rq_inflight(struct blk_mq_hw_ctx *hctx, struct request *rq,
- void *priv, bool reserved)
+static bool blk_mq_rq_inflight(struct request *rq, void *priv,
+ bool reserved)
{
/*
- * If we find a request that isn't idle and the queue matches,
- * we know the queue is busy. Return false to stop the iteration.
+ * If we find a request that isn't idle we know the queue is busy
+ * as it's checked in the iter.
+ * Return false to stop the iteration.
*/
- if (blk_mq_request_started(rq) && rq->q == hctx->queue) {
+ if (blk_mq_request_started(rq)) {
bool *busy = priv;
*busy = true;
@@ -1205,8 +1205,7 @@ void blk_mq_put_rq_ref(struct request *rq)
__blk_mq_free_request(rq);
}
-static bool blk_mq_check_expired(struct blk_mq_hw_ctx *hctx,
- struct request *rq, void *priv, bool reserved)
+static bool blk_mq_check_expired(struct request *rq, void *priv, bool reserved)
{
unsigned long *next = priv;
diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
index 8682663e7368..da8de0d6f99b 100644
--- a/include/linux/blk-mq.h
+++ b/include/linux/blk-mq.h
@@ -479,8 +479,7 @@ struct blk_mq_queue_data {
bool last;
};
-typedef bool (busy_iter_fn)(struct blk_mq_hw_ctx *, struct request *, void *,
- bool);
+typedef bool (busy_iter_fn)(struct request *, void *, bool);
typedef bool (busy_tag_iter_fn)(struct request *, void *, bool);
/**
--
2.17.1
next prev parent reply other threads:[~2021-11-02 11:32 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-02 11:27 [PATCH RFT 0/3] blk-mq: Optimise blk_mq_queue_tag_busy_iter() for shared tags John Garry
2021-11-02 11:27 ` John Garry [this message]
2021-11-09 3:02 ` [PATCH RFT 1/3] blk-mq: Drop busy_iter_fn blk_mq_hw_ctx argument Ming Lei
2021-11-28 10:39 ` Hannes Reinecke
2021-11-02 11:27 ` [PATCH RFT 2/3] blk-mq: Delete busy_iter_fn John Garry
2021-11-09 3:05 ` Ming Lei
2021-11-28 10:40 ` Hannes Reinecke
2021-11-02 11:27 ` [PATCH RFT 3/3] blk-mq: Optimise blk_mq_queue_tag_busy_iter() for shared tags John Garry
2021-11-28 10:43 ` Hannes Reinecke
2021-11-29 2:19 ` Ming Lei
2021-11-15 15:56 ` [PATCH RFT 0/3] " John Garry
2021-11-15 16:31 ` Kashyap Desai
2021-11-25 13:46 ` Kashyap Desai
2021-11-25 14:09 ` John Garry
2021-11-26 11:25 ` Kashyap Desai
2021-11-26 11:51 ` John Garry
2021-12-06 9:57 ` John Garry
2021-12-06 10:03 ` Kashyap Desai
2021-12-08 13:04 ` John Garry
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1635852455-39935-2-git-send-email-john.garry@huawei.com \
--to=john.garry@huawei.com \
--cc=axboe@kernel.dk \
--cc=hare@suse.de \
--cc=kashyap.desai@broadcom.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ming.lei@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).