blk-cgroup: don't update io stat for root cgroup
Subsystems (2)
PATCH 1/1 blk-cgroup: don't update io stat for root cgroup
We source root cgroup stats from the system-wide stats, see blkcg_print_stat and blkcg_rstat_flush, so don't update io state for root cgroup.
Fixes blkg leak issue introduced in commit 3b8cc6298724 ("blk-cgroup: Optimize blkcg_rstat_flush()") which starts to grab blkg's reference when adding iostat_cpu into percpu
blkcg list, but this state won't be consumed by blkcg_rstat_flush() where
the blkg reference is dropped.
--- block/blk-cgroup.c | 4 ++++ 1 file changed, 4 insertions(+)
block/blk-cgroup.c +4 -0
@@ -2034,6 +2034,10 @@ void blk_cgroup_bio_start(struct bio *bio)struct blkg_iostat_set *bis;unsigned long flags; +/* Root-level stats are sourced from system-wide IO stats */ +if (!cgroup_parent (blkcg->css.cgroup)) +return ; + cpu =get_cpu (); bis =per_cpu_ptr (bio->bi_blkg->iostat_cpu, cpu); flags =u64_stats_update_begin_irqsave (&bis->sync);
Signature · 1 line
2.31.1
Quoted 9 lines · Ming Lei
We source root cgroup stats from the system-wide stats, see
blkcg_print_statandblkcg_rstat_flush, so don't update io state for root cgroup.Fixes blkg leak issue introduced in commit
3b8cc6298724("blk-cgroup: Optimizeblkcg_rstat_flush()") which starts to grab blkg's reference when addingiostat_cpuinto percpu
blkcg list, but this state won't be consumed byblkcg_rstat_flush()where
the blkg reference is dropped.[...]
Applied, thanks!
[1/1] blk-cgroup: don't update io stat for root cgroup
commit: 0416f3be58c6b1ea066cd52e354b857693feb01e
Best regards,
Signature · 1 line
Jens Axboe
Quoted 23 lines · Ming Lei
We source root cgroup stats from the system-wide stats, see
blkcg_print_statandblkcg_rstat_flush, so don't update io state for root cgroup.Fixes blkg leak issue introduced in commit
3b8cc6298724("blk-cgroup: Optimizeblkcg_rstat_flush()") which starts to grab blkg's reference when addingiostat_cpuinto percpu
blkcg list, but this state won't be consumed byblkcg_rstat_flush()where
the blkg reference is dropped.Tested-by Bart van Assche <[email protected]>Reported-by Bart van Assche <[email protected]>Fixes 3b8cc6298724 ("blk-cgroup: Optimize blkcg_rstat_flush()")Cc Tejun Heo <[email protected]>Cc Waiman Long <[email protected]>Signed-off-by Ming Lei <[email protected]>--- block/blk-cgroup.c | 4 ++++ 1 file changed, 4 insertions(+)block/blk-cgroup.c +0
-0
block/blk-cgroup.c void blk_cgroup_bio_start(struct bio *bio) · line 2043
Quoted 10 lines
block/blk-cgroup.c +4
-0@@ -2034,6 +2034,10 @@ void blk_cgroup_bio_start(struct bio *bio)struct blkg_iostat_set *bis;unsigned long flags; +/* Root-level stats are sourced from system-wide IO stats */ +if (!cgroup_parent (blkcg->css.cgroup)) +return ; + cpu =get_cpu (); bis =per_cpu_ptr (bio->bi_blkg->iostat_cpu, cpu); flags =u64_stats_update_begin_irqsave (&bis->sync);
Thanks for fixing this issue.
Cheers,
Longman