lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

blk-wbt: fix performance regression in wbt scale_up/scale_down

Browse Source 
scale_up wakes up waiters after scaling up. But after scaling max, it
should not wake up more waiters as waiters will not have anything to
do. This patch fixes this by making scale_up (and also scale_down)
return when threshold is reached.

This bug causes increased fdatasync latency when fdatasync and dd
conv=sync are performed in parallel on 4.19 compared to 4.14. This
bug was introduced during refactoring of blk-wbt code.

Fixes: a79050434b ("blk-rq-qos: refactor out common elements of blk-wbt")
Cc: stable@vger.kernel.org
Cc: Josef Bacik <jbacik@fb.com>
Signed-off-by: Harshad Shirwadkar <harshadshirwadkar@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Harshad Shirwadkar 2019-10-05 11:59:27 -07:00 committed by Jens Axboe
parent 0e48f51cbb
commit b84477d3eb
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
block/blk-rq-qos.c
View File

@ -160,24 +160,27 @@ bool rq_depth_calc_max_depth(struct rq_depth *rqd)
return ret; return ret;
} }
void rq_depth_scale_up(struct rq_depth *rqd) /* Returns true on success and false if scaling up wasn't possible */
bool rq_depth_scale_up(struct rq_depth *rqd)
{ {
/* /*
* Hit max in previous round, stop here * Hit max in previous round, stop here
*/ */
if (rqd->scaled_max) if (rqd->scaled_max)
return; return false;
rqd->scale_step--; rqd->scale_step--;
rqd->scaled_max = rq_depth_calc_max_depth(rqd); rqd->scaled_max = rq_depth_calc_max_depth(rqd);
return true;
} }
/* /*
* Scale rwb down. If 'hard_throttle' is set, do it quicker, since we * Scale rwb down. If 'hard_throttle' is set, do it quicker, since we
* had a latency violation. * had a latency violation. Returns true on success and returns false if
* scaling down wasn't possible.
*/ */
void rq_depth_scale_down(struct rq_depth *rqd, bool hard_throttle) bool rq_depth_scale_down(struct rq_depth *rqd, bool hard_throttle)
{ {
/* /*
* Stop scaling down when we've hit the limit. This also prevents * Stop scaling down when we've hit the limit. This also prevents
@ -185,7 +188,7 @@ void rq_depth_scale_down(struct rq_depth *rqd, bool hard_throttle)
* keep up. * keep up.
*/ */
if (rqd->max_depth == 1) if (rqd->max_depth == 1)
return; return false;
if (rqd->scale_step < 0 && hard_throttle) if (rqd->scale_step < 0 && hard_throttle)
rqd->scale_step = 0; rqd->scale_step = 0;
@ -194,6 +197,7 @@ void rq_depth_scale_down(struct rq_depth *rqd, bool hard_throttle)
rqd->scaled_max = false; rqd->scaled_max = false;
rq_depth_calc_max_depth(rqd); rq_depth_calc_max_depth(rqd);
return true;
} }
struct rq_qos_wait_data { struct rq_qos_wait_data {

4
block/blk-rq-qos.h
View File

@ -130,8 +130,8 @@ void rq_qos_wait(struct rq_wait *rqw, void *private_data,
acquire_inflight_cb_t *acquire_inflight_cb, acquire_inflight_cb_t *acquire_inflight_cb,
cleanup_cb_t *cleanup_cb); cleanup_cb_t *cleanup_cb);
bool rq_wait_inc_below(struct rq_wait *rq_wait, unsigned int limit); bool rq_wait_inc_below(struct rq_wait *rq_wait, unsigned int limit);
void rq_depth_scale_up(struct rq_depth *rqd); bool rq_depth_scale_up(struct rq_depth *rqd);
void rq_depth_scale_down(struct rq_depth *rqd, bool hard_throttle); bool rq_depth_scale_down(struct rq_depth *rqd, bool hard_throttle);
bool rq_depth_calc_max_depth(struct rq_depth *rqd); bool rq_depth_calc_max_depth(struct rq_depth *rqd);
void __rq_qos_cleanup(struct rq_qos *rqos, struct bio *bio); void __rq_qos_cleanup(struct rq_qos *rqos, struct bio *bio);

6
block/blk-wbt.c
View File

@ -308,7 +308,8 @@ static void calc_wb_limits(struct rq_wb *rwb)
static void scale_up(struct rq_wb *rwb) static void scale_up(struct rq_wb *rwb)
{ {
rq_depth_scale_up(&rwb->rq_depth); if (!rq_depth_scale_up(&rwb->rq_depth))
return;
calc_wb_limits(rwb); calc_wb_limits(rwb);
rwb->unknown_cnt = 0; rwb->unknown_cnt = 0;
rwb_wake_all(rwb); rwb_wake_all(rwb);
@ -317,7 +318,8 @@ static void scale_up(struct rq_wb *rwb)
static void scale_down(struct rq_wb *rwb, bool hard_throttle) static void scale_down(struct rq_wb *rwb, bool hard_throttle)
{ {
rq_depth_scale_down(&rwb->rq_depth, hard_throttle); if (!rq_depth_scale_down(&rwb->rq_depth, hard_throttle))
return;
calc_wb_limits(rwb); calc_wb_limits(rwb);
rwb->unknown_cnt = 0; rwb->unknown_cnt = 0;
rwb_trace_step(rwb, "scale down"); rwb_trace_step(rwb, "scale down");