aboutsummaryrefslogtreecommitdiffstats
path: root/block/blk-wbt.c
diff options
context:
space:
mode:
authorJosef Bacik <josef@toxicpanda.com>2018-10-11 15:29:30 -0400
committerJens Axboe <axboe@kernel.dk>2018-10-11 15:31:28 -0400
commit5e65a20341e02df637d1c16cd487858d2c6a876a (patch)
tree764df94ac438da2b84ee0482c57879ea50dde81c /block/blk-wbt.c
parent133424a207774d3d32a38d560c6469ed31c0472f (diff)
blk-wbt: wake up all when we scale up, not down
Tetsuo brought to my attention that I screwed up the scale_up/scale_down helpers when I factored out the rq-qos code. We need to wake up all the waiters when we add slots for requests to make, not when we shrink the slots. Otherwise we'll end up things waiting forever. This was a mistake and simply puts everything back the way it was. cc: stable@vger.kernel.org Fixes: a79050434b45 ("blk-rq-qos: refactor out common elements of blk-wbt") eported-by: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp> Signed-off-by: Josef Bacik <josef@toxicpanda.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-wbt.c')
-rw-r--r--block/blk-wbt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-wbt.c b/block/blk-wbt.c
index 8e20a0677dcf..8ac93fcbaa2e 100644
--- a/block/blk-wbt.c
+++ b/block/blk-wbt.c
@@ -310,6 +310,7 @@ static void scale_up(struct rq_wb *rwb)
310 rq_depth_scale_up(&rwb->rq_depth); 310 rq_depth_scale_up(&rwb->rq_depth);
311 calc_wb_limits(rwb); 311 calc_wb_limits(rwb);
312 rwb->unknown_cnt = 0; 312 rwb->unknown_cnt = 0;
313 rwb_wake_all(rwb);
313 rwb_trace_step(rwb, "scale up"); 314 rwb_trace_step(rwb, "scale up");
314} 315}
315 316
@@ -318,7 +319,6 @@ static void scale_down(struct rq_wb *rwb, bool hard_throttle)
318 rq_depth_scale_down(&rwb->rq_depth, hard_throttle); 319 rq_depth_scale_down(&rwb->rq_depth, hard_throttle);
319 calc_wb_limits(rwb); 320 calc_wb_limits(rwb);
320 rwb->unknown_cnt = 0; 321 rwb->unknown_cnt = 0;
321 rwb_wake_all(rwb);
322 rwb_trace_step(rwb, "scale down"); 322 rwb_trace_step(rwb, "scale down");
323} 323}
324 324