diff options
author | Serge E. Hallyn <serue@us.ibm.com> | 2007-10-19 02:39:52 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 14:53:37 -0400 |
commit | b460cbc581a53cc088ceba80608021dd49c63c43 (patch) | |
tree | 83c28d0adbc15f4157c77b40fa60c40a71cb8673 /include | |
parent | 3743ca05ff464b8a9e345c08a6c9ce30485f9805 (diff) |
pid namespaces: define is_global_init() and is_container_init()
is_init() is an ambiguous name for the pid==1 check. Split it into
is_global_init() and is_container_init().
A cgroup init has it's tsk->pid == 1.
A global init also has it's tsk->pid == 1 and it's active pid namespace
is the init_pid_ns. But rather than check the active pid namespace,
compare the task structure with 'init_pid_ns.child_reaper', which is
initialized during boot to the /sbin/init process and never changes.
Changelog:
2.6.22-rc4-mm2-pidns1:
- Use 'init_pid_ns.child_reaper' to determine if a given task is the
global init (/sbin/init) process. This would improve performance
and remove dependence on the task_pid().
2.6.21-mm2-pidns2:
- [Sukadev Bhattiprolu] Changed is_container_init() calls in {powerpc,
ppc,avr32}/traps.c for the _exception() call to is_global_init().
This way, we kill only the cgroup if the cgroup's init has a
bug rather than force a kernel panic.
[akpm@linux-foundation.org: fix comment]
[sukadev@us.ibm.com: Use is_global_init() in arch/m32r/mm/fault.c]
[bunk@stusta.de: kernel/pid.c: remove unused exports]
[sukadev@us.ibm.com: Fix capability.c to work with threaded init]
Signed-off-by: Serge E. Hallyn <serue@us.ibm.com>
Signed-off-by: Sukadev Bhattiprolu <sukadev@us.ibm.com>
Acked-by: Pavel Emelianov <xemul@openvz.org>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Cedric Le Goater <clg@fr.ibm.com>
Cc: Dave Hansen <haveblue@us.ibm.com>
Cc: Herbert Poetzel <herbert@13thfloor.at>
Cc: Kirill Korotaev <dev@sw.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/sched.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index df6049e5e8bf..47cf81d62047 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -1237,12 +1237,20 @@ static inline int pid_alive(struct task_struct *p) | |||
1237 | } | 1237 | } |
1238 | 1238 | ||
1239 | /** | 1239 | /** |
1240 | * is_init - check if a task structure is init | 1240 | * is_global_init - check if a task structure is init |
1241 | * @tsk: Task structure to be checked. | 1241 | * @tsk: Task structure to be checked. |
1242 | * | 1242 | * |
1243 | * Check if a task structure is the first user space task the kernel created. | 1243 | * Check if a task structure is the first user space task the kernel created. |
1244 | * | ||
1245 | * TODO: We should inline this function after some cleanups in pid_namespace.h | ||
1246 | */ | ||
1247 | extern int is_global_init(struct task_struct *tsk); | ||
1248 | |||
1249 | /* | ||
1250 | * is_container_init: | ||
1251 | * check whether in the task is init in its own pid namespace. | ||
1244 | */ | 1252 | */ |
1245 | static inline int is_init(struct task_struct *tsk) | 1253 | static inline int is_container_init(struct task_struct *tsk) |
1246 | { | 1254 | { |
1247 | return tsk->pid == 1; | 1255 | return tsk->pid == 1; |
1248 | } | 1256 | } |