Skip to content

Commit f2aa197

Browse files
Chengming ZhouPeter Zijlstra
authored andcommitted
cgroup: Fix suspicious rcu_dereference_check() usage warning
task_css_set_check() will use rcu_dereference_check() to check for rcu_read_lock_held() on the read-side, which is not true after commit dc6e081 ("sched/cpuacct: Optimize away RCU read lock"). This commit drop explicit rcu_read_lock(), change to RCU-sched read-side critical section. So fix the RCU warning by adding check for rcu_read_lock_sched_held(). Fixes: dc6e081 ("sched/cpuacct: Optimize away RCU read lock") Reported-by: Linux Kernel Functional Testing <lkft@linaro.org> Reported-by: syzbot+16e3f2c77e7c5a0113f9@syzkaller.appspotmail.com Signed-off-by: Chengming Zhou <zhouchengming@bytedance.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Acked-by: Tejun Heo <tj@kernel.org> Tested-by: Zhouyi Zhou <zhouzhouyi@gmail.com> Tested-by: Marek Szyprowski <m.szyprowski@samsung.com> Link: https://lore.kernel.org/r/20220305034103.57123-1-zhouchengming@bytedance.com
1 parent a0a7e45 commit f2aa197

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

include/linux/cgroup.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -450,6 +450,7 @@ extern struct mutex cgroup_mutex;
450450
extern spinlock_t css_set_lock;
451451
#define task_css_set_check(task, __c) \
452452
rcu_dereference_check((task)->cgroups, \
453+
rcu_read_lock_sched_held() || \
453454
lockdep_is_held(&cgroup_mutex) || \
454455
lockdep_is_held(&css_set_lock) || \
455456
((task)->flags & PF_EXITING) || (__c))

0 commit comments

Comments
 (0)