From: Paolo Valente <paolo.valente@linaro.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
bfq-iosched@googlegroups.com, oleksandr@natalenko.name,
patdung100@gmail.com, cevich@redhat.com,
Paolo Valente <paolo.valente@linaro.org>
Subject: [PATCH BUGFIX 2/6] block, bfq: do not insert oom queue into position tree
Date: Fri, 31 Jan 2020 10:24:05 +0100 [thread overview]
Message-ID: <20200131092409.10867-3-paolo.valente@linaro.org> (raw)
In-Reply-To: <20200131092409.10867-1-paolo.valente@linaro.org>
BFQ maintains an ordered list, implemented with an RB tree, of
head-request positions of non-empty bfq_queues. This position tree,
inherited from CFQ, is used to find bfq_queues that contain I/O close
to each other. BFQ merges these bfq_queues into a single shared queue,
if this boosts throughput on the device at hand.
There is however a special-purpose bfq_queue that does not participate
in queue merging, the oom bfq_queue. Yet, also this bfq_queue could be
wrongly added to the position tree. So bfqq_find_close() could return
the oom bfq_queue, which is a source of further troubles in an
out-of-memory situation. This commit prevents the oom bfq_queue from
being inserted into the position tree.
Tested-by: Patrick Dung <patdung100@gmail.com>
Signed-off-by: Paolo Valente <paolo.valente@linaro.org>
---
block/bfq-iosched.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
index 55d4328e7c12..15dfb0844644 100644
--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
@@ -613,6 +613,10 @@ bfq_pos_tree_add_move(struct bfq_data *bfqd, struct bfq_queue *bfqq)
bfqq->pos_root = NULL;
}
+ /* oom_bfqq does not participate in queue merging */
+ if (bfqq == &bfqd->oom_bfqq)
+ return;
+
/*
* bfqq cannot be merged any longer (see comments in
* bfq_setup_cooperator): no point in adding bfqq into the
--
2.20.1
next prev parent reply other threads:[~2020-01-31 9:25 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-31 9:24 [PATCH BUGFIX 0/6] block, bfq: series of fixes, and not only, for some recently reported issues Paolo Valente
2020-01-31 9:24 ` [PATCH BUGFIX 1/6] block, bfq: do not plug I/O for bfq_queues with no proc refs Paolo Valente
2020-01-31 9:24 ` Paolo Valente [this message]
2020-01-31 9:24 ` [PATCH BUGFIX 3/6] block, bfq: get extra ref to prevent a queue from being freed during a group move Paolo Valente
2020-01-31 10:20 ` Oleksandr Natalenko
2020-01-31 10:41 ` Paolo Valente
2020-01-31 9:24 ` [PATCH BUGFIX 4/6] block, bfq: extend incomplete name of field on_st Paolo Valente
2020-01-31 9:24 ` [PATCH BUGFIX 5/6] block, bfq: get a ref to a group when adding it to a service tree Paolo Valente
2020-02-01 4:44 ` Jens Axboe
2020-01-31 9:24 ` [PATCH BUGFIX 6/6] block, bfq: clarify the goal of bfq_split_bfqq() Paolo Valente
2020-02-01 4:48 ` [PATCH BUGFIX 0/6] block, bfq: series of fixes, and not only, for some recently reported issues Jens Axboe
2020-02-03 8:50 ` Paolo Valente
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=20200131092409.10867-3-paolo.valente@linaro.org \
--to=paolo.valente@linaro.org \
--cc=axboe@kernel.dk \
--cc=bfq-iosched@googlegroups.com \
--cc=cevich@redhat.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=oleksandr@natalenko.name \
--cc=patdung100@gmail.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).