From: Jens Axboe <axboe@kernel.dk>
To: Sam Bradshaw <sbradshaw@micron.com>
Cc: linux-kernel@vger.kernel.org
Subject: Re: [PATCH] blkmq: Fix NULL pointer deref when all reserved tags in use
Date: Wed, 18 Mar 2015 14:40:08 -0600 [thread overview]
Message-ID: <5509E2A8.5040905@kernel.dk> (raw)
In-Reply-To: <5509E1D0.2080908@micron.com>
On 03/18/2015 02:36 PM, Sam Bradshaw wrote:
> When allocating from the reserved tags pool, bt_get() is called with
> a NULL hctx. If all tags are in use, the hw queue is kicked to push
> out any pending IO, potentially freeing tags, and tag allocation is
> retried. The problem is that blk_mq_run_hw_queue() doesn't check for
> a NULL hctx. This patch fixes that bug.
>
> An alternative implementation might skip kicking the queue for reserved
> tags and go right to io_schedule() but we chose to keep it simple.
>
> Tested by hammering mtip32xx with concurrent smartctl/hdparm.
>
> Signed-off-by: Sam Bradshaw <sbradshaw@micron.com>
> Signed-off-by: Selvan Mani <smani@micron.com>
> ---
> block/blk-mq.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/block/blk-mq.c b/block/blk-mq.c
> index 59fa239..0471af6 100644
> --- a/block/blk-mq.c
> +++ b/block/blk-mq.c
> @@ -887,7 +887,7 @@ static int blk_mq_hctx_next_cpu(struct blk_mq_hw_ctx *hctx)
>
> void blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async)
> {
> - if (unlikely(test_bit(BLK_MQ_S_STOPPED, &hctx->state) ||
> + if (unlikely(!hctx || test_bit(BLK_MQ_S_STOPPED, &hctx->state) ||
> !blk_mq_hw_queue_mapped(hctx)))
> return;
Good catch! But why not put the hctx == NULL check in as a conditional
in bt_get() before running the queue? I can't imagine other cases where
calling blk_mq_run_hw_queue() with hctx == NULL would be a valid scenario.
The bug was introduced with commit b32232073e80, so that should probably
be indicated too.
--
Jens Axboe
next prev parent reply other threads:[~2015-03-18 20:40 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-18 20:36 [PATCH] blkmq: Fix NULL pointer deref when all reserved tags in use Sam Bradshaw
2015-03-18 20:40 ` Jens Axboe [this message]
2015-03-18 21:06 ` Sam Bradshaw
2015-03-18 21:51 ` 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=5509E2A8.5040905@kernel.dk \
--to=axboe@kernel.dk \
--cc=linux-kernel@vger.kernel.org \
--cc=sbradshaw@micron.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.