summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorDouglas Anderson <dianders@chromium.org>2019-06-26 12:59:19 -0700
committerJens Axboe <axboe@kernel.dk>2019-06-26 16:25:35 -0600
commit2b50f230f76f8ef954f12ac34a648e1978f6adf0 (patch)
treee7be66be7387ba0f2278b5a2ea68d581ef8ad146 /block
parent2ad7a0cc8f8ec37b2f65f6990faae7dec0058d55 (diff)
downloadlinux-stable-2b50f230f76f8ef954f12ac34a648e1978f6adf0.tar.gz
linux-stable-2b50f230f76f8ef954f12ac34a648e1978f6adf0.tar.bz2
linux-stable-2b50f230f76f8ef954f12ac34a648e1978f6adf0.zip
block, bfq: Init saved_wr_start_at_switch_to_srt in unlikely case
Some debug code suggested by Paolo was tripping when I did reboot stress tests. Specifically in bfq_bfqq_resume_state() "bic->saved_wr_start_at_switch_to_srt" was later than the current value of "jiffies". A bit of debugging showed that "bic->saved_wr_start_at_switch_to_srt" was actually 0 and a bit more debugging showed that was because we had run through the "unlikely" case in the bfq_bfqq_save_state() function. Let's init "saved_wr_start_at_switch_to_srt" in the unlikely case to something sane. NOTE: this fixes no known real-world errors. Reviewed-by: Paolo Valente <paolo.valente@linaro.org> Reviewed-by: Guenter Roeck <groeck@chromium.org> Signed-off-by: Douglas Anderson <dianders@chromium.org> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
-rw-r--r--block/bfq-iosched.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
index 72840ebf953e..008c93d6b8d7 100644
--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
@@ -2678,6 +2678,7 @@ static void bfq_bfqq_save_state(struct bfq_queue *bfqq)
* to enjoy weight raising if split soon.
*/
bic->saved_wr_coeff = bfqq->bfqd->bfq_wr_coeff;
+ bic->saved_wr_start_at_switch_to_srt = bfq_smallest_from_now();
bic->saved_wr_cur_max_time = bfq_wr_duration(bfqq->bfqd);
bic->saved_last_wr_start_finish = jiffies;
} else {