| Message ID | 20250401170912.2161953-1-shakeel.butt@linux.dev (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | cgroup: rstat: call cgroup_rstat_updated_list with cgroup_rstat_lock | expand |
On Tue, Apr 01, 2025 at 10:09:12AM -0700, Shakeel Butt wrote: > The commit 093c8812de2d ("cgroup: rstat: Cleanup flushing functions and > locking") during cleanup accidentally changed the code to call > cgroup_rstat_updated_list() without cgroup_rstat_lock which is required. > Fix it. > > Fixes: 093c8812de2d ("cgroup: rstat: Cleanup flushing functions and locking") > Reported-by: Jakub Kicinski <kuba@kernel.org> > Reported-by: Breno Leitao <leitao@debian.org> > Reported-by: Venkat Rao Bagalkote <venkat88@linux.ibm.com> > Closes: https://lore.kernel.org/all/6564c3d6-9372-4352-9847-1eb3aea07ca4@linux.ibm.com/ > Signed-off-by: Shakeel Butt <shakeel.butt@linux.dev> Applied to cgroup/for-6.15-fixes. Thanks.
April 1, 2025 at 7:09 PM, "Shakeel Butt" <shakeel.butt@linux.dev> wrote: > > The commit 093c8812de2d ("cgroup: rstat: Cleanup flushing functions and > locking") during cleanup accidentally changed the code to call > cgroup_rstat_updated_list() without cgroup_rstat_lock which is required. > Fix it. > > Fixes: 093c8812de2d ("cgroup: rstat: Cleanup flushing functions and locking") > Reported-by: Jakub Kicinski <kuba@kernel.org> > Reported-by: Breno Leitao <leitao@debian.org> > Reported-by: Venkat Rao Bagalkote <venkat88@linux.ibm.com> > Closes: https://lore.kernel.org/all/6564c3d6-9372-4352-9847-1eb3aea07ca4@linux.ibm.com/ > Signed-off-by: Shakeel Butt <shakeel.butt@linux.dev> Thanks for fixing this. Reviewed-by: Yosry Ahmed <yosry.ahmed@linux.dev>
On Tue, Apr 01, 2025 at 10:09:12AM -0700, Shakeel Butt wrote: > The commit 093c8812de2d ("cgroup: rstat: Cleanup flushing functions and > locking") during cleanup accidentally changed the code to call > cgroup_rstat_updated_list() without cgroup_rstat_lock which is required. > Fix it. > > Fixes: 093c8812de2d ("cgroup: rstat: Cleanup flushing functions and locking") > Reported-by: Jakub Kicinski <kuba@kernel.org> > Reported-by: Breno Leitao <leitao@debian.org> > Reported-by: Venkat Rao Bagalkote <venkat88@linux.ibm.com> > Closes: https://lore.kernel.org/all/6564c3d6-9372-4352-9847-1eb3aea07ca4@linux.ibm.com/ > Signed-off-by: Shakeel Butt <shakeel.butt@linux.dev> Tested-by: Breno Leitao <leitao@debian.org>
diff --git a/kernel/cgroup/rstat.c b/kernel/cgroup/rstat.c index 4bb587d5d34f..b2239156b7de 100644 --- a/kernel/cgroup/rstat.c +++ b/kernel/cgroup/rstat.c @@ -318,10 +318,11 @@ __bpf_kfunc void cgroup_rstat_flush(struct cgroup *cgrp) might_sleep(); for_each_possible_cpu(cpu) { - struct cgroup *pos = cgroup_rstat_updated_list(cgrp, cpu); + struct cgroup *pos; /* Reacquire for each CPU to avoid disabling IRQs too long */ __cgroup_rstat_lock(cgrp, cpu); + pos = cgroup_rstat_updated_list(cgrp, cpu); for (; pos; pos = pos->rstat_flush_next) { struct cgroup_subsys_state *css;
The commit 093c8812de2d ("cgroup: rstat: Cleanup flushing functions and locking") during cleanup accidentally changed the code to call cgroup_rstat_updated_list() without cgroup_rstat_lock which is required. Fix it. Fixes: 093c8812de2d ("cgroup: rstat: Cleanup flushing functions and locking") Reported-by: Jakub Kicinski <kuba@kernel.org> Reported-by: Breno Leitao <leitao@debian.org> Reported-by: Venkat Rao Bagalkote <venkat88@linux.ibm.com> Closes: https://lore.kernel.org/all/6564c3d6-9372-4352-9847-1eb3aea07ca4@linux.ibm.com/ Signed-off-by: Shakeel Butt <shakeel.butt@linux.dev> --- kernel/cgroup/rstat.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)