diff options
| author | Jan Kara <jack@suse.cz> | 2022-04-01 12:27:42 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-06-09 10:30:41 +0200 |
| commit | bc03bffac7420b85eb9eb2cefcbcb9f00bd34100 (patch) | |
| tree | 165f95096e168e765439b2c1354bbb63e25d585f /block | |
| parent | 1f7264f0510f519b4e4f575a8f0579ea65e7592e (diff) | |
bfq: Avoid false marking of bic as stably merged
commit 70456e5210f40ffdb8f6d905acfdcec5bd5fad9e upstream.
bfq_setup_cooperator() can mark bic as stably merged even though it
decides to not merge its bfqqs (when bfq_setup_merge() returns NULL).
Make sure to mark bic as stably merged only if we are really going to
merge bfqqs.
CC: stable@vger.kernel.org
Tested-by: "yukuai (C)" <yukuai3@huawei.com>
Fixes: 430a67f9d616 ("block, bfq: merge bursts of newly-created queues")
Signed-off-by: Jan Kara <jack@suse.cz>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20220401102752.8599-1-jack@suse.cz
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'block')
| -rw-r--r-- | block/bfq-iosched.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 269ff82091cc..c5e0683fe5d4 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -2899,9 +2899,12 @@ bfq_setup_cooperator(struct bfq_data *bfqd, struct bfq_queue *bfqq, struct bfq_queue *new_bfqq = bfq_setup_merge(bfqq, stable_merge_bfqq); - bic->stably_merged = true; - if (new_bfqq && new_bfqq->bic) - new_bfqq->bic->stably_merged = true; + if (new_bfqq) { + bic->stably_merged = true; + if (new_bfqq->bic) + new_bfqq->bic->stably_merged = + true; + } return new_bfqq; } else return NULL; |