Skip to content

Commit

Permalink
sched/cpuacct: Remove redundant RCU read lock
Browse files Browse the repository at this point in the history
The cpuacct_account_field() and it's cgroup v2 wrapper
cgroup_account_cputime_field() is only called from cputime
in task_group_account_field(), which is already in RCU read-side
critical section. So remove these redundant RCU read lock.

Suggested-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Chengming Zhou <zhouchengming@bytedance.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20220220051426.5274-3-zhouchengming@bytedance.com
  • Loading branch information
Chengming Zhou authored and Peter Zijlstra committed Mar 1, 2022
1 parent dc6e081 commit 3eba050
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 4 deletions.
2 changes: 0 additions & 2 deletions include/linux/cgroup.h
Original file line number Diff line number Diff line change
Expand Up @@ -804,11 +804,9 @@ static inline void cgroup_account_cputime_field(struct task_struct *task,

cpuacct_account_field(task, index, delta_exec);

rcu_read_lock();
cgrp = task_dfl_cgroup(task);
if (cgroup_parent(cgrp))
__cgroup_account_cputime_field(cgrp, index, delta_exec);
rcu_read_unlock();
}

#else /* CONFIG_CGROUPS */
Expand Down
2 changes: 0 additions & 2 deletions kernel/sched/cpuacct.c
Original file line number Diff line number Diff line change
Expand Up @@ -352,10 +352,8 @@ void cpuacct_account_field(struct task_struct *tsk, int index, u64 val)
{
struct cpuacct *ca;

rcu_read_lock();
for (ca = task_ca(tsk); ca != &root_cpuacct; ca = parent_ca(ca))
__this_cpu_add(ca->cpustat->cpustat[index], val);
rcu_read_unlock();
}

struct cgroup_subsys cpuacct_cgrp_subsys = {
Expand Down

0 comments on commit 3eba050

Please sign in to comment.