A few cleanup patches for blk-iolatency.c
Subsystems (3)
v2 cover A few cleanup patches for blk-iolatency.c
This series contains three cleanup patches to remove redundant check, correct comment and simplify struct iolatency_grp in blk-iolatency.c.
---
v2:
Thanks Josef for review and comment!
Add Reviewed-by tag from Josef
Improve the corrected comment in patch 2/3
---
Kemeng Shi (3):
block: Remove redundant parent blkcg_gp check in check_scale_change
block: Correct comment for scale_cookie_change
block: Replace struct rq_depth with unsigned int in struct
iolatency_grp
block/blk-iolatency.c | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-)
Signature · 1 line
2.30.0
PATCH v2 1/3 block: Remove redundant parent blkcg_gp check in check_scale_change
Function blkcg_iolatency_throttle will make sure blkg->parent is not NULL before calls check_scale_change. And function check_scale_change is only called in blkcg_iolatency_throttle.
--- block/blk-iolatency.c | 3 --- 1 file changed, 3 deletions(-)
block/blk-iolatency.c +0 -3
@@ -403,9 +403,6 @@ static void check_scale_change(struct iolatency_grp *iolat)u64 scale_lat;int direction =0 ; -if (lat_to_blkg (iolat)->parent ==NULL ) -return ; - parent =blkg_to_lat (lat_to_blkg (iolat)->parent);if (!parent)return ;
Signature · 1 line
2.30.0
PATCH v2 2/3 block: Correct comment for scale_cookie_change
In reply to Kemeng ShiDefault queue depth of iolatency_grp is unlimited, so we scale down quickly(once by half) in scale_cookie_change. Remove the "subtract 1/16th" part which is not the truth and add the actual way we scale down.
--- block/blk-iolatency.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
block/blk-iolatency.c +4 -2
@@ -364,9 +364,11 @@ static void scale_cookie_change(struct blk_iolatency *blkiolat, }/* -* Change the queue depth of the iolatency_grp. We add/subtract 1/16th of the +* Change the queue depth of the iolatency_grp. We add 1/16th of the * queue depth at a time so we don't get wild swings and hopefully dial in to -* fairer distribution of the overall queue depth. +* fairer distribution of the overall queue depth. We halve the queue depth +* at a time so we can scale down queue depth quickly from default unlimited +* to target. */ static void scale_change (struct iolatency_grp *iolat,bool up) {
Signature · 1 line
2.30.0
Re: [PATCH v2 2/3] block: Correct comment for scale_cookie_change
Friendly ping.
Quoted 29 lines · Kemeng Shi
Default queue depth of
iolatency_grpis unlimited, so we scale down quickly(once by half) inscale_cookie_change. Remove the "subtract 1/16th" part which is not the truth and add the actual way we scale down.Signed-off-by Kemeng Shi <[email protected]>--- block/blk-iolatency.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)block/blk-iolatency.c +4
-2@@ -364,9 +364,11 @@ static void scale_cookie_change(struct blk_iolatency *blkiolat, }/* -* Change the queue depth of the iolatency_grp. We add/subtract 1/16th of the +* Change the queue depth of the iolatency_grp. We add 1/16th of the * queue depth at a time so we don't get wild swings and hopefully dial in to -* fairer distribution of the overall queue depth. +* fairer distribution of the overall queue depth. We halve the queue depth +* at a time so we can scale down queue depth quickly from default unlimited +* to target. */ static void scale_change (struct iolatency_grp *iolat,bool up) {
Signature · 2 lines
Best wishes Kemeng Shi
Re: [PATCH v2 2/3] block: Correct comment for scale_cookie_change
In reply to Kemeng ShiQuoted 6 lines · Kemeng Shi
Default queue depth of
iolatency_grpis unlimited, so we scale down quickly(once by half) inscale_cookie_change. Remove the "subtract 1/16th" part which is not the truth and add the actual way we scale down.Signed-off-by Kemeng Shi <[email protected]>
This is perfect, thanks Kemeng
Thanks,
Josef
PATCH v2 3/3 block: Replace struct rq_depth with unsigned int in struct iolatency_grp
In reply to Kemeng ShiWe only need a max queue depth for every iolatency to limit the inflight io number. Replace struct rq_depth with unsigned int to simplfy "struct iolatency_grp" and save memory.
--- block/blk-iolatency.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-)
block/blk-iolatency.c +13 -15
@@ -141,7 +141,7 @@ struct iolatency_grp {struct latency_stat __percpu *stats;struct latency_stat cur_stat;struct blk_iolatency *blkiolat; -struct rq_depth rq_depth; +unsigned int max_depth;struct rq_wait rq_wait;atomic64_t window_start;atomic_t scale_cookie;
@@ -280,7 +280,7 @@ static void iolat_cleanup_cb(struct rq_wait *rqw, void *private_data)static bool iolat_acquire_inflight (struct rq_wait *rqw,void *private_data) {struct iolatency_grp *iolat = private_data; -return rq_wait_inc_below (rqw, iolat->rq_depth.max_depth); +return rq_wait_inc_below (rqw, iolat->max_depth); } static void __blkcg_iolatency_throttle(struct rq_qos *rqos,
@@ -374,7 +374,7 @@ static void scale_change(struct iolatency_grp *iolat, bool up) {unsigned long qd = iolat->blkiolat->rqos.q->nr_requests;unsigned long scale =scale_amount (qd, up); -unsigned long old = iolat->rq_depth.max_depth; +unsigned long old = iolat->max_depth;if (old > qd) old = qd;
@@ -386,12 +386,12 @@ static void scale_change(struct iolatency_grp *iolat, bool up)if (old < qd) { old += scale; old =min (old, qd); - iolat->rq_depth.max_depth = old; + iolat->max_depth = old;wake_up_all (&iolat->rq_wait.wait); } }else { old >>=1 ; - iolat->rq_depth.max_depth =max (old,1UL ); + iolat->max_depth =max (old,1UL ); } }
@@ -444,7 +444,7 @@ static void check_scale_change(struct iolatency_grp *iolat) }/* We're as low as we can go. */ -if (iolat->rq_depth.max_depth ==1 && direction <0 ) { +if (iolat->max_depth ==1 && direction <0 ) {blkcg_use_delay (lat_to_blkg (iolat));return ; }
@@ -452,7 +452,7 @@ static void check_scale_change(struct iolatency_grp *iolat)/* We're back to the default cookie, unthrottle all the things. */ if (cur_cookie ==DEFAULT_SCALE_COOKIE ) {blkcg_clear_delay (lat_to_blkg (iolat)); - iolat->rq_depth.max_depth =UINT_MAX ; + iolat->max_depth =UINT_MAX ;wake_up_all (&iolat->rq_wait.wait);return ; }
@@ -507,7 +507,7 @@ static void iolatency_record_time(struct iolatency_grp *iolat,* We don't want to count issue_as_root bio's in the cgroups latency * statistics as it could skew the numbers downwards. */ -if (unlikely (issue_as_root && iolat->rq_depth.max_depth !=UINT_MAX )) { +if (unlikely (issue_as_root && iolat->max_depth !=UINT_MAX )) {u64 sub = iolat->min_lat_nsec;if (req_time < sub)blkcg_add_delay (lat_to_blkg (iolat), now, sub - req_time);
@@ -919,7 +919,7 @@ static void iolatency_ssd_stat(struct iolatency_grp *iolat, struct seq_file *s) }preempt_enable (); -if (iolat->rq_depth.max_depth ==UINT_MAX ) +if (iolat->max_depth ==UINT_MAX )seq_printf (s," missed=%llu total=%llu depth=max" , (unsigned long long )stat.ps.missed, (unsigned long long )stat.ps.total);
@@ -927,7 +927,7 @@ static void iolatency_ssd_stat(struct iolatency_grp *iolat, struct seq_file *s)seq_printf (s," missed=%llu total=%llu depth=%u" , (unsigned long long )stat.ps.missed, (unsigned long long )stat.ps.total, - iolat->rq_depth.max_depth); + iolat->max_depth); }static void iolatency_pd_stat (struct blkg_policy_data *pd,struct seq_file *s)
@@ -944,12 +944,12 @@ static void iolatency_pd_stat(struct blkg_policy_data *pd, struct seq_file *s) avg_lat =div64_u64 (iolat->lat_avg,NSEC_PER_USEC ); cur_win =div64_u64 (iolat->cur_win_nsec,NSEC_PER_MSEC ); -if (iolat->rq_depth.max_depth ==UINT_MAX ) +if (iolat->max_depth ==UINT_MAX )seq_printf (s," depth=max avg_lat=%llu win=%llu" , avg_lat, cur_win);else seq_printf (s," depth=%u avg_lat=%llu win=%llu" , - iolat->rq_depth.max_depth, avg_lat, cur_win); + iolat->max_depth, avg_lat, cur_win); } static struct blkg_policy_data *iolatency_pd_alloc(gfp_t gfp,
@@ -993,9 +993,7 @@ static void iolatency_pd_init(struct blkg_policy_data *pd)latency_stat_init (iolat, &iolat->cur_stat);rq_wait_init (&iolat->rq_wait);spin_lock_init (&iolat->child_lat.lock); - iolat->rq_depth.queue_depth = blkg->q->nr_requests; - iolat->rq_depth.max_depth =UINT_MAX ; - iolat->rq_depth.default_depth = iolat->rq_depth.queue_depth; + iolat->max_depth =UINT_MAX ; iolat->blkiolat = blkiolat; iolat->cur_win_nsec =100 *NSEC_PER_MSEC ;atomic64_set (&iolat->window_start, now);
Signature · 1 line
2.30.0
Quoted 3 lines · Kemeng Shi
This series contains three cleanup patches to remove redundant check, correct comment and simplify struct
iolatency_grpinblk-iolatency.c.
Applied, thanks!
[1/3] block: Remove redundant parent blkcg_gp check in check_scale_change
commit: b6e03072a91ecc815c9f62037871d621b09df2b3
[2/3] block: Correct comment for scale_cookie_change
commit: 77445572e643538019d9919669ddf36efb6a353a
[3/3] block: Replace struct rq_depth with unsigned int in struct iolatency_grp
commit: 718ac0e343f8fd81ab042aa4936d25fe10f6b318Best regards,
Signature · 1 line
Jens Axboe