Commit f122d103 authored by Chengming Zhou's avatar Chengming Zhou Committed by Jens Axboe
Browse files

blk-cgroup: set blkg iostat after percpu stat aggregation 



Don't need to do blkg_iostat_set for top blkg iostat on each CPU,
so move it after percpu stat aggregation.

Fixes: ef45fe47 ("blk-cgroup: show global disk stats in root cgroup io.stat")
Signed-off-by: default avatarChengming Zhou <zhouchengming@bytedance.com>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Link: https://lore.kernel.org/r/20220213085902.88884-1-zhouchengming@bytedance.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent ec9fd2a1

block/blk-cgroup.c

+5 −5
Original line number Diff line number Diff line
@@ -856,11 +856,11 @@ static void blkcg_fill_root_iostats(void) 
			blk_queue_root_blkg(bdev_get_queue(bdev));

		struct blkg_iostat tmp;

		int cpu;

		unsigned long flags;



		memset(&tmp, 0, sizeof(tmp));

		for_each_possible_cpu(cpu) {

			struct disk_stats *cpu_dkstats;

			unsigned long flags;



			cpu_dkstats = per_cpu_ptr(bdev->bd_stats, cpu);

			tmp.ios[BLKG_IOSTAT_READ] +=
@@ -876,13 +876,13 @@ static void blkcg_fill_root_iostats(void) 
				cpu_dkstats->sectors[STAT_WRITE] << 9;

			tmp.bytes[BLKG_IOSTAT_DISCARD] +=

				cpu_dkstats->sectors[STAT_DISCARD] << 9;

		}



		flags = u64_stats_update_begin_irqsave(&blkg->iostat.sync);

		blkg_iostat_set(&blkg->iostat.cur, &tmp);

		u64_stats_update_end_irqrestore(&blkg->iostat.sync, flags);

	}

}

}



static void blkcg_print_one_stat(struct blkcg_gq *blkg, struct seq_file *s)

{