diff options
author | Tejun Heo <tj@kernel.org> | 2011-12-12 21:12:21 -0500 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2011-12-12 21:12:21 -0500 |
commit | 77e4ef99d1c596a31747668e5fd837f77b6349b6 (patch) | |
tree | b9dcc8d73f9febf6a18edc0b2efa3ecddc2a7a35 /kernel/signal.c | |
parent | 257058ae2b971646b96ab3a15605ac69186e562a (diff) |
threadgroup: extend threadgroup_lock() to cover exit and exec
threadgroup_lock() protected only protected against new addition to
the threadgroup, which was inherently somewhat incomplete and
problematic for its only user cgroup. On-going migration could race
against exec and exit leading to interesting problems - the symmetry
between various attach methods, task exiting during method execution,
->exit() racing against attach methods, migrating task switching basic
properties during exec and so on.
This patch extends threadgroup_lock() such that it protects against
all three threadgroup altering operations - fork, exit and exec. For
exit, threadgroup_change_begin/end() calls are added to exit_signals
around assertion of PF_EXITING. For exec, threadgroup_[un]lock() are
updated to also grab and release cred_guard_mutex.
With this change, threadgroup_lock() guarantees that the target
threadgroup will remain stable - no new task will be added, no new
PF_EXITING will be set and exec won't happen.
The next patch will update cgroup so that it can take full advantage
of this change.
-v2: beefed up comment as suggested by Frederic.
-v3: narrowed scope of protection in exit path as suggested by
Frederic.
Signed-off-by: Tejun Heo <tj@kernel.org>
Reviewed-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: Li Zefan <lizf@cn.fujitsu.com>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Paul Menage <paul@paulmenage.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/signal.c')
-rw-r--r-- | kernel/signal.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/kernel/signal.c b/kernel/signal.c index b3f78d09a105..399c184bf0ae 100644 --- a/kernel/signal.c +++ b/kernel/signal.c | |||
@@ -2359,8 +2359,15 @@ void exit_signals(struct task_struct *tsk) | |||
2359 | int group_stop = 0; | 2359 | int group_stop = 0; |
2360 | sigset_t unblocked; | 2360 | sigset_t unblocked; |
2361 | 2361 | ||
2362 | /* | ||
2363 | * @tsk is about to have PF_EXITING set - lock out users which | ||
2364 | * expect stable threadgroup. | ||
2365 | */ | ||
2366 | threadgroup_change_begin(tsk); | ||
2367 | |||
2362 | if (thread_group_empty(tsk) || signal_group_exit(tsk->signal)) { | 2368 | if (thread_group_empty(tsk) || signal_group_exit(tsk->signal)) { |
2363 | tsk->flags |= PF_EXITING; | 2369 | tsk->flags |= PF_EXITING; |
2370 | threadgroup_change_end(tsk); | ||
2364 | return; | 2371 | return; |
2365 | } | 2372 | } |
2366 | 2373 | ||
@@ -2370,6 +2377,9 @@ void exit_signals(struct task_struct *tsk) | |||
2370 | * see wants_signal(), do_signal_stop(). | 2377 | * see wants_signal(), do_signal_stop(). |
2371 | */ | 2378 | */ |
2372 | tsk->flags |= PF_EXITING; | 2379 | tsk->flags |= PF_EXITING; |
2380 | |||
2381 | threadgroup_change_end(tsk); | ||
2382 | |||
2373 | if (!signal_pending(tsk)) | 2383 | if (!signal_pending(tsk)) |
2374 | goto out; | 2384 | goto out; |
2375 | 2385 | ||