sched/cpuacct: Remove redundant RCU read lock

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

diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index 9a109c6ac0e0f782bc8d71fe0b23ecf687181d96..1e356c222756d0bb496b54c40ea30f5deb7ce7ee 100644 (file)
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -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 */

diff --git a/kernel/sched/cpuacct.c b/kernel/sched/cpuacct.c
index f79f88456d720ef98434dc5741a4c7962de1ce46..d269ede84e85fb2a0875f6d77782b68d5bc0b9d7 100644 (file)
--- a/kernel/sched/cpuacct.c
+++ b/kernel/sched/cpuacct.c
@@ -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 = {