From: Guenter Roeck <linux@roeck-us.net>
To: Paolo Valente <paolo.valente@linaro.org>, Jens Axboe <axboe@kernel.dk>
Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
ulf.hansson@linaro.org, linus.walleij@linaro.org,
bfq-iosched@googlegroups.com, oleksandr@natalenko.name,
Hsin-Yi Wang <hsinyi@google.com>,
Nicolas Boichat <drinkcat@chromium.org>,
Doug Anderson <dianders@chromium.org>
Subject: Re: [BUGFIX 1/1] block, bfq: handle NULL return value by bfq_init_rq()
Date: Wed, 7 Aug 2019 10:47:19 -0700 [thread overview]
Message-ID: <c2833bf7-16a2-7eec-4497-69ba02779669@roeck-us.net> (raw)
In-Reply-To: <20190807172111.4718-2-paolo.valente@linaro.org>
On 8/7/19 10:21 AM, Paolo Valente wrote:
> As reported in [1], the call bfq_init_rq(rq) may return NULL in case
> of OOM (in particular, if rq->elv.icq is NULL because memory
> allocation failed in failed in ioc_create_icq()).
>
> This commit handles this circumstance.
>
> [1] https://lkml.org/lkml/2019/7/22/824
>
> Reported-by: Guenter Roeck <linux@roeck-us.net>
> Reported-by: Hsin-Yi Wang <hsinyi@google.com>
> Cc: Hsin-Yi Wang <hsinyi@google.com>
> Cc: Nicolas Boichat <drinkcat@chromium.org>
> Cc: Doug Anderson <dianders@chromium.org>
> Signed-off-by: Paolo Valente <paolo.valente@linaro.org>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
> block/bfq-iosched.c | 14 +++++++++++---
> 1 file changed, 11 insertions(+), 3 deletions(-)
>
> diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
> index 586fcfe227ea..32686300d89b 100644
> --- a/block/bfq-iosched.c
> +++ b/block/bfq-iosched.c
> @@ -2250,9 +2250,14 @@ static void bfq_request_merged(struct request_queue *q, struct request *req,
> blk_rq_pos(container_of(rb_prev(&req->rb_node),
> struct request, rb_node))) {
> struct bfq_queue *bfqq = bfq_init_rq(req);
> - struct bfq_data *bfqd = bfqq->bfqd;
> + struct bfq_data *bfqd;
> struct request *prev, *next_rq;
>
> + if (!bfqq)
> + return;
> +
> + bfqd = bfqq->bfqd;
> +
> /* Reposition request in its sort_list */
> elv_rb_del(&bfqq->sort_list, req);
> elv_rb_add(&bfqq->sort_list, req);
> @@ -2299,6 +2304,9 @@ static void bfq_requests_merged(struct request_queue *q, struct request *rq,
> struct bfq_queue *bfqq = bfq_init_rq(rq),
> *next_bfqq = bfq_init_rq(next);
>
> + if (!bfqq)
> + return;
> +
> /*
> * If next and rq belong to the same bfq_queue and next is older
> * than rq, then reposition rq in the fifo (by substituting next
> @@ -5436,12 +5444,12 @@ static void bfq_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq,
>
> spin_lock_irq(&bfqd->lock);
> bfqq = bfq_init_rq(rq);
> - if (at_head || blk_rq_is_passthrough(rq)) {
> + if (!bfqq || at_head || blk_rq_is_passthrough(rq)) {
> if (at_head)
> list_add(&rq->queuelist, &bfqd->dispatch);
> else
> list_add_tail(&rq->queuelist, &bfqd->dispatch);
> - } else { /* bfqq is assumed to be non null here */
> + } else {
> idle_timer_disabled = __bfq_insert_request(bfqd, rq);
> /*
> * Update bfqq, because, if a queue merge has occurred
>
next prev parent reply other threads:[~2019-08-07 17:47 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-07 17:21 [BUGFIX 0/1] " Paolo Valente
2019-08-07 17:21 ` [BUGFIX 1/1] block, bfq: " Paolo Valente
2019-08-07 17:47 ` Guenter Roeck [this message]
2019-08-08 13:32 ` [BUGFIX 0/1] " 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=c2833bf7-16a2-7eec-4497-69ba02779669@roeck-us.net \
--to=linux@roeck-us.net \
--cc=axboe@kernel.dk \
--cc=bfq-iosched@googlegroups.com \
--cc=dianders@chromium.org \
--cc=drinkcat@chromium.org \
--cc=hsinyi@google.com \
--cc=linus.walleij@linaro.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=oleksandr@natalenko.name \
--cc=paolo.valente@linaro.org \
--cc=ulf.hansson@linaro.org \
/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
all inboxes | Powered by JetHome®