Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

blk-cgroup: Reinit blkg_iostat_set after clearing in blkcg_reset_stats()

When blkg_alloc() is called to allocate a blkcg_gq structure
with the associated blkg_iostat_set's, there are 2 fields within
blkg_iostat_set that requires proper initialization - blkg & sync.
The former field was introduced by commit 3b8cc6298724 ("blk-cgroup:
Optimize blkcg_rstat_flush()") while the later one was introduced by
commit f73316482977 ("blk-cgroup: reimplement basic IO stats using
cgroup rstat").

Unfortunately those fields in the blkg_iostat_set's are not properly
re-initialized when they are cleared in v1's blkcg_reset_stats(). This
can lead to a kernel panic due to NULL pointer access of the blkg
pointer. The missing initialization of sync is less problematic and
can be a problem in a debug kernel due to missing lockdep initialization.

Fix these problems by re-initializing them after memory clearing.

Fixes: 3b8cc6298724 ("blk-cgroup: Optimize blkcg_rstat_flush()")
Fixes: f73316482977 ("blk-cgroup: reimplement basic IO stats using cgroup rstat")
Signed-off-by: Waiman Long <longman@redhat.com>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Acked-by: Tejun Heo <tj@kernel.org>
Link: https://lore.kernel.org/r/20230606180724.2455066-1-longman@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

authored by

Waiman Long and committed by
Jens Axboe
3d2af77e a7cfa0af

+5
+5
block/blk-cgroup.c
··· 610 610 struct blkg_iostat_set *bis = 611 611 per_cpu_ptr(blkg->iostat_cpu, cpu); 612 612 memset(bis, 0, sizeof(*bis)); 613 + 614 + /* Re-initialize the cleared blkg_iostat_set */ 615 + u64_stats_init(&bis->sync); 616 + bis->blkg = blkg; 613 617 } 614 618 memset(&blkg->iostat, 0, sizeof(blkg->iostat)); 619 + u64_stats_init(&blkg->iostat.sync); 615 620 616 621 for (i = 0; i < BLKCG_MAX_POLS; i++) { 617 622 struct blkcg_policy *pol = blkcg_policy[i];