cpuacct: Make cpuacct hierarchy walk in cpuacct_charge() safe when rcupreempt is used -v2
PATCH 1/1 cpuacct: Make cpuacct hierarchy walk in cpuacct_charge() safe when rcupreempt is used -v2
Hi Ingo,
Here is the v2 of the fix to cpuacct hierarchy walk with the appropriate tags in the patch. This applies against the latest -tip tree.
Changes for v2:
- Update patch descrition (as per Li Zefan's review comments).
- Remove comments in cpuacct_charge() which explained why rcu_read_lock() was needed (as per Peter Zijlstra's review comments).
cpuacct: Make cpuacct hierarchy walk in cpuacct_charge() safe when
rcupreempt is used.
cpuacct_charge() obtains task's ca and does a hierarchy walk upwards. This can race with the task's movement between cgroups. This race can cause an access to freed ca pointer in cpuacct_charge() or access to invalid cgroups pointer of the task. This will not happen with rcu or tree rcu as cpuacct_charge() is called with preemption disabled. However if rcupreempt is used, the race is seen. Thanks to Li Zefan for explaining this.
Fix this race by explicitly protecting ca and the hierarchy walk with rcu_read_lock().
--- kernel/sched.c | 3 +++ 1 file changed, 3 insertions(+)
kernel/sched.c +3 -0
@@ -9888,6 +9888,8 @@ static void cpuacct_charge(struct task_sreturn ; cpu =task_cpu (tsk); + +rcu_read_lock (); ca =task_ca (tsk); do {
@@ -9895,6 +9897,7 @@ static void cpuacct_charge(struct task_s *cpuusage += cputime; ca = ca->parent; }while (ca); +rcu_read_unlock (); }struct cgroup_subsys cpuacct_subsys = {
[tip:core/percpu] cpuacct: make cpuacct hierarchy walk in cpuacct_charge() safe when rcupreempt is used -v2
Commit-ID: 0d8ba94c48dc07d1c47f18b24826cbafcc4d7282 Gitweb: http://git.kernel.org/tip/0d8ba94c48dc07d1c47f18b24826cbafcc4d7282 Author: Bharata B Rao <[email protected]> AuthorDate: Mon, 23 Mar 2009 10:02:53 +0530 Committer: Ingo Molnar <[email protected]> CommitDate: Mon, 23 Mar 2009 16:55:26 +0100
cpuacct: make cpuacct hierarchy walk in cpuacct_charge() safe when rcupreempt is used -v2
Impact: fix cgroups race under rcu-preempt
cpuacct_charge() obtains task's ca and does a hierarchy walk upwards. This can race with the task's movement between cgroups. This race can cause an access to freed ca pointer in cpuacct_charge() or access to invalid cgroups pointer of the task. This will not happen with rcu or tree rcu as cpuacct_charge() is called with preemption disabled. However if rcupreempt is used, the race is seen. Thanks to Li Zefan for explaining this.
Fix this race by explicitly protecting ca and the hierarchy walk with rcu_read_lock().
Changes for v2:
- Update patch descrition (as per Li Zefan's review comments).
- Remove comments in cpuacct_charge() which explained why rcu_read_lock() was needed (as per Peter Zijlstra's review comments).
LKML-Reference: <[email protected]>
--- kernel/sched.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
kernel/sched.c +3 -0
@@ -9597,6 +9597,8 @@ static void cpuacct_charge(struct task_struct *tsk, u64 cputime)return ; cpu =task_cpu (tsk); + +rcu_read_lock (); ca =task_ca (tsk); do {
@@ -9604,6 +9606,7 @@ static void cpuacct_charge(struct task_struct *tsk, u64 cputime) *cpuusage += cputime; ca = ca->parent; }while (ca); +rcu_read_unlock (); }struct cgroup_subsys cpuacct_subsys = {