From: Jens Axboe <axboe@kernel.dk>
To: Jianchao Wang <jianchao.w.wang@oracle.com>
Cc: ming.lei@redhat.com, linux-block@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] blk-mq: ensure hctx to be ran on mapped cpu when issue directly
Date: Thu, 25 Oct 2018 10:25:57 -0600 [thread overview]
Message-ID: <a25dbb6a-2ffe-a843-abc4-1a6608c17a49@kernel.dk> (raw)
In-Reply-To: <1540394407-20769-1-git-send-email-jianchao.w.wang@oracle.com>
On 10/24/18 9:20 AM, Jianchao Wang wrote:
> When issue request directly and the task is migrated out of the
> original cpu where it allocates request, hctx could be ran on
> the cpu where it is not mapped. To fix this, insert the request
> if BLK_MQ_F_BLOCKING is set, check whether the current is mapped
> to the hctx and invoke __blk_mq_issue_directly under preemption
> disabled.
>
> Signed-off-by: Jianchao Wang <jianchao.w.wang@oracle.com>
> ---
> block/blk-mq.c | 17 ++++++++++++++++-
> 1 file changed, 16 insertions(+), 1 deletion(-)
>
> diff --git a/block/blk-mq.c b/block/blk-mq.c
> index e3c39ea..0cdc306 100644
> --- a/block/blk-mq.c
> +++ b/block/blk-mq.c
> @@ -1717,6 +1717,12 @@ static blk_status_t __blk_mq_try_issue_directly(struct blk_mq_hw_ctx *hctx,
> {
> struct request_queue *q = rq->q;
> bool run_queue = true;
> + blk_status_t ret;
> +
> + if (hctx->flags & BLK_MQ_F_BLOCKING) {
> + bypass_insert = false;
> + goto insert;
> + }
I'd do a prep patch that moves the insert logic out of this function,
and just have the caller do it by return BLK_STS_RESOURCE, for instance.
It's silly that we have that in both the caller and inside this function.
> @@ -1734,6 +1740,11 @@ static blk_status_t __blk_mq_try_issue_directly(struct blk_mq_hw_ctx *hctx,
> if (q->elevator && !bypass_insert)
> goto insert;
>
> + if (!cpumask_test_cpu(get_cpu(), hctx->cpumask)) {
> + bypass_insert = false;
> + goto insert;
> + }
Should be fine to just do smp_processor_id() here, as we're inside
hctx_lock() here.
--
Jens Axboe
next prev parent reply other threads:[~2018-10-25 16:26 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-24 15:20 [PATCH] blk-mq: ensure hctx to be ran on mapped cpu when issue directly Jianchao Wang
2018-10-25 16:25 ` Jens Axboe [this message]
2018-10-26 1:38 ` jianchao.wang
2018-10-26 1:39 ` Jens Axboe
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=a25dbb6a-2ffe-a843-abc4-1a6608c17a49@kernel.dk \
--to=axboe@kernel.dk \
--cc=jianchao.w.wang@oracle.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).