diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-08-25 10:52:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-08-25 10:52:16 -0700 |
| commit | 3f5c20055a640b3758ece75dcaa6ac974fcae26d (patch) | |
| tree | 6bf5f420fd433e3e9dd200e1890d4dfd3c40a753 | |
| parent | a86766c49e808bbb74b97d15cea4707a13d2ab52 (diff) | |
| parent | 43626dade36fa74d3329046f4ae2d7fdefe401c6 (diff) | |
| download | linux-3f5c20055a640b3758ece75dcaa6ac974fcae26d.tar.gz linux-3f5c20055a640b3758ece75dcaa6ac974fcae26d.tar.bz2 linux-3f5c20055a640b3758ece75dcaa6ac974fcae26d.zip | |
Merge tag 'cgroup-for-6.0-rc2-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull another cgroup fix from Tejun Heo:
"Commit 4f7e7236435c ("cgroup: Fix threadgroup_rwsem <->
cpus_read_lock() deadlock") required the cgroup
core to grab cpus_read_lock() before invoking ->attach().
Unfortunately, it missed adding cpus_read_lock() in
cgroup_attach_task_all(). Fix it"
* tag 'cgroup-for-6.0-rc2-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
cgroup: Add missing cpus_read_lock() to cgroup_attach_task_all()
| -rw-r--r-- | kernel/cgroup/cgroup-v1.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/cgroup/cgroup-v1.c b/kernel/cgroup/cgroup-v1.c index 2ade21b54dc4..ff6a8099eb2a 100644 --- a/kernel/cgroup/cgroup-v1.c +++ b/kernel/cgroup/cgroup-v1.c @@ -59,6 +59,7 @@ int cgroup_attach_task_all(struct task_struct *from, struct task_struct *tsk) int retval = 0; mutex_lock(&cgroup_mutex); + cpus_read_lock(); percpu_down_write(&cgroup_threadgroup_rwsem); for_each_root(root) { struct cgroup *from_cgrp; @@ -72,6 +73,7 @@ int cgroup_attach_task_all(struct task_struct *from, struct task_struct *tsk) break; } percpu_up_write(&cgroup_threadgroup_rwsem); + cpus_read_unlock(); mutex_unlock(&cgroup_mutex); return retval; |