OpenVZ Forum: Devel » [RFC][PATCH 0/15] Pid namespaces

Home » Mailing lists » Devel » [RFC][PATCH 0/15] Pid namespaces

Show: Today's Messages :: Show Polls :: Message Navigator
E-mail to friend

Re: [PATCH 12/15] Miscelaneous stuff for pid namespaces [message #15337 is a reply to message #15306]

Fri, 27 July 2007 06:22

Sukadev Bhattiprolu is currently offline

Sukadev Bhattiprolu
Messages: 413
Registered: August 2006

Senior Member

Pavel Emelianov [xemul@openvz.org] wrote:
| This includes
| * the headers dependency fix
| * task_child_reaper() correct declaration
| * fixes for is_global_init() and is_container_init()
|
| Maybe this should come before all the other stuff...
|
| Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
|
| ---
|
| include/linux/pid_namespace.h | 4 ++--
| include/linux/sched.h | 4 ++--
| kernel/pid.c | 16 +++++++++++++---
| 3 files changed, 17 insertions(+), 7 deletions(-)
|
| diff -upr linux-2.6.23-rc1-mm1.orig/include/linux/pid_namespace.h
| linux-2.6.23-rc1-mm1-7/include/linux/pid_namespace.h
| --- linux-2.6.23-rc1-mm1.orig/include/linux/pid_namespace.h 2007-07-26
| 16:34:45.000000000 +0400
| +++ linux-2.6.23-rc1-mm1-7/include/linux/pid_namespace.h 2007-07-26
| 16:36:36.000000000 +0400
| @@ -4,7 +4,6 @@
| #include <linux/sched.h>
| #include <linux/mm.h>
| #include <linux/threads.h>
| -#include <linux/pid.h>
| #include <linux/nsproxy.h>
| #include <linux/kref.h>
|
| @@ -46,7 +53,8 @@ static inline struct pid_namespace *task
|
| static inline struct task_struct *task_child_reaper(struct task_struct *tsk)
| {
| - return init_pid_ns.child_reaper;
| + BUG_ON(tsk != current);
| + return tsk->nsproxy->pid_ns->child_reaper;
| }
|
| #endif /* _LINUX_PID_NS_H */
| diff -upr linux-2.6.23-rc1-mm1.orig/include/linux/sched.h
| linux-2.6.23-rc1-mm1-7/include/linux/sched.h
| --- linux-2.6.23-rc1-mm1.orig/include/linux/sched.h 2007-07-26
| 16:34:45.000000000 +0400
| +++ linux-2.6.23-rc1-mm1-7/include/linux/sched.h 2007-07-26
| 16:36:37.000000000 +0400
| @@ -1277,13 +1366,13 @@ static inline int pid_alive(struct task_
| *
| * TODO: We should inline this function after some cleanups in
| pid_namespace.h
| */

We can now remove this TODO.

| -extern int is_global_init(struct task_struct *tsk);
| +extern int is_container_init(struct task_struct *tsk);
|
| /*
| * is_container_init:
| * check whether in the task is init in its own pid namespace.
| */

The function header describes is_container_init() but the function
is actually is_global_init(). The opp is true for the function
heaer of is_container_init() above.

| -static inline int is_container_init(struct task_struct *tsk)
| +static inline int is_global_init(struct task_struct *tsk)
| {
| return tsk->pid == 1;
| }
| diff -upr linux-2.6.23-rc1-mm1.orig/kernel/pid.c
| linux-2.6.23-rc1-mm1-7/kernel/pid.c
| --- linux-2.6.23-rc1-mm1.orig/kernel/pid.c 2007-07-26
| 16:34:45.000000000 +0400
| +++ linux-2.6.23-rc1-mm1-7/kernel/pid.c 2007-07-26
| 16:36:37.000000000 +0400
| @@ -60,11 +62,21 @@ static inline int mk_pid(struct pid_name
| };
| EXPORT_SYMBOL(init_pid_ns);
|
| -int is_global_init(struct task_struct *tsk)
| +int is_container_init(struct task_struct *tsk)
| {
| - return tsk == init_pid_ns.child_reaper;
| + int ret;

Initialize ret = 0 here would save a line of code below :-)

| + struct pid *pid;
| +
| + ret = 0;
| + rcu_read_lock();
| + pid = task_pid(tsk);
| + if (pid != NULL && pid->numbers[pid->level].nr == 1)
| + ret = 1;
| + rcu_read_unlock();
| +
| + return ret;
| }
| -EXPORT_SYMBOL(is_global_init);
| +EXPORT_SYMBOL(is_container_init);
|
| /*
| * Note: disable interrupts while the pidmap_lock is held as an

Report message to a moderator

[Message index]

		[RFC][PATCH 0/15] Pid namespaces By: Pavel Emelianov on Thu, 26 July 2007 14:45
		[PATCH 1/15] Move exit_task_namespaces() By: Pavel Emelianov on Thu, 26 July 2007 14:46
		Re: [PATCH 1/15] Move exit_task_namespaces() By: Oleg Nesterov on Thu, 26 July 2007 16:47
		Re: [PATCH 1/15] Move exit_task_namespaces() By: Oleg Nesterov on Fri, 27 July 2007 08:07
		Re: [PATCH 1/15] Move exit_task_namespaces() By: Pavel Emelianov on Fri, 27 July 2007 08:24
		Re: [PATCH 1/15] Move exit_task_namespaces() By: Oleg Nesterov on Fri, 27 July 2007 08:35
		Re: [PATCH 1/15] Move exit_task_namespaces() By: Pavel Emelianov on Fri, 27 July 2007 08:37
		Re: [PATCH 1/15] Move exit_task_namespaces() By: dev on Thu, 26 July 2007 16:59
		Re: [PATCH 1/15] Move exit_task_namespaces() By: Dave Hansen on Thu, 26 July 2007 16:10
		Re: [PATCH 1/15] Move exit_task_namespaces() By: xemul on Fri, 27 July 2007 06:38
		Re: [PATCH 1/15] Move exit_task_namespaces() By: Oleg Nesterov on Thu, 02 August 2007 16:18
		Re: [PATCH 1/15] Move exit_task_namespaces() By: Pavel Emelianov on Mon, 06 August 2007 08:00
		Re: [PATCH 1/15] Move exit_task_namespaces() By: Oleg Nesterov on Mon, 06 August 2007 09:54
		Re: [PATCH 1/15] Move exit_task_namespaces() By: Pavel Emelianov on Mon, 06 August 2007 09:58
		Re: [PATCH 1/15] Move exit_task_namespaces() By: Oleg Nesterov on Mon, 06 August 2007 10:38
		Re: [PATCH 1/15] Move exit_task_namespaces() By: Pavel Emelianov on Mon, 06 August 2007 11:21
		Re: [PATCH 1/15] Move exit_task_namespaces() By: Oleg Nesterov on Mon, 06 August 2007 12:52
		Re: [PATCH 1/15] Move exit_task_namespaces() By: Pavel Emelianov on Mon, 06 August 2007 13:38
		Re: [PATCH 1/15] Move exit_task_namespaces() By: Pavel Emelianov on Mon, 06 August 2007 11:29
		Re: [PATCH 1/15] Move exit_task_namespaces() By: Oleg Nesterov on Mon, 06 August 2007 12:48
		Re: [PATCH 1/15] Move exit_task_namespaces() By: Pavel Emelianov on Mon, 06 August 2007 13:36
		Re: [PATCH 1/15] Move exit_task_namespaces() By: Oleg Nesterov on Mon, 06 August 2007 13:55
		[PATCH 2/15] Introduce MS_KERNMOUNT flag By: Pavel Emelianov on Thu, 26 July 2007 14:47
		[PATCH 3/15] kern_siginfo helper By: Pavel Emelianov on Thu, 26 July 2007 14:48
		Re: [PATCH 3/15] kern_siginfo helper By: Oleg Nesterov on Sun, 29 July 2007 11:40
		Re: [PATCH 3/15] kern_siginfo helper By: Pavel Emelianov on Mon, 30 July 2007 06:07
		Re: [PATCH 3/15] kern_siginfo helper By: Sukadev Bhattiprolu on Tue, 31 July 2007 00:21
		[PATCH 4/15] Make proc_flust_task() flush entries from multiple proc trees By: Pavel Emelianov on Thu, 26 July 2007 14:48
		[PATCH 5/15] Introduce struct upid By: Pavel Emelianov on Thu, 26 July 2007 14:49
		Re: [PATCH 5/15] Introduce struct upid By: Oleg Nesterov on Sun, 29 July 2007 09:50
		Re: [PATCH 5/15] Introduce struct upid By: Pavel Emelianov on Mon, 30 July 2007 05:58
		[PATCH 6/15] Make alloc_pid(), free_pid() and put_pid() work with struct upid By: Pavel Emelianov on Thu, 26 July 2007 14:50
		Re: [PATCH 6/15] Make alloc_pid(), free_pid() and put_pid() work with struct upid By: Oleg Nesterov on Sun, 29 July 2007 10:14
		Re: [PATCH 6/15] Make alloc_pid(), free_pid() and put_pid() work with struct upid By: Pavel Emelianov on Mon, 30 July 2007 06:03
		[PATCH 7/15] Helpers to obtain pid numbers By: Pavel Emelianov on Thu, 26 July 2007 14:51
		Re: [PATCH 7/15] Helpers to obtain pid numbers By: Dave Hansen on Thu, 26 July 2007 19:03
		Re: [PATCH 7/15] Helpers to obtain pid numbers By: Pavel Emelianov on Fri, 27 July 2007 06:40
		Re: [PATCH 7/15] Helpers to obtain pid numbers By: Oleg Nesterov on Sun, 29 July 2007 12:08
		Re: [PATCH 7/15] Helpers to obtain pid numbers By: Pavel Emelianov on Mon, 30 July 2007 06:11
		[PATCH 8/15] Helpers to find the task by its numerical ids By: Pavel Emelianov on Thu, 26 July 2007 14:51
		Re: [PATCH 8/15] Helpers to find the task by its numerical ids By: Dave Hansen on Thu, 26 July 2007 19:05
		Re: [PATCH 8/15] Helpers to find the task by its numerical ids By: Pavel Emelianov on Fri, 27 July 2007 06:43
		Re: [PATCH 8/15] Helpers to find the task by its numerical ids By: Oleg Nesterov on Sun, 29 July 2007 12:39
		Re: [PATCH 8/15] Helpers to find the task by its numerical ids By: Pavel Emelianov on Mon, 30 July 2007 06:15
		[PATCH 9/15] Move alloc_pid() after the namespace is cloned By: Pavel Emelianov on Thu, 26 July 2007 14:52
		Re: [PATCH 9/15] Move alloc_pid() after the namespace is cloned By: Oleg Nesterov on Fri, 27 July 2007 15:10
		Re: [PATCH 9/15] Move alloc_pid() after the namespace is cloned By: Pavel Emelianov on Mon, 30 July 2007 06:17
		Re: [PATCH 9/15] Move alloc_pid() after the namespace is cloned By: Sukadev Bhattiprolu on Mon, 30 July 2007 23:43
		Re: [PATCH 9/15] Move alloc_pid() after the namespace is cloned By: Sukadev Bhattiprolu on Tue, 31 July 2007 05:49
		[PATCH 10/15] Make each namespace has its own proc tree By: Pavel Emelianov on Thu, 26 July 2007 14:54
		Re: [PATCH 10/15] Make each namespace has its own proc tree By: Oleg Nesterov on Sun, 29 July 2007 15:56
		Re: [PATCH 10/15] Make each namespace has its own proc tree By: Oleg Nesterov on Sun, 29 July 2007 17:02
		Re: [PATCH 10/15] Make each namespace has its own proc tree By: Pavel Emelianov on Mon, 30 July 2007 06:45
		Re: [PATCH 10/15] Make each namespace has its own proc tree By: Pavel Emelianov on Mon, 30 July 2007 06:43
		[PATCH 11/15] Signal semantics By: Pavel Emelianov on Thu, 26 July 2007 14:55
		Re: [PATCH 11/15] Signal semantics By: Oleg Nesterov on Fri, 27 July 2007 12:30
		Re: [PATCH 11/15] Signal semantics By: Pavel Emelianov on Fri, 27 July 2007 13:38
		Re: [PATCH 11/15] Signal semantics By: serue on Fri, 27 July 2007 19:59
		Re: [PATCH 11/15] Signal semantics By: Sukadev Bhattiprolu on Fri, 27 July 2007 20:23
		Re: [PATCH 11/15] Signal semantics By: Pavel Emelianov on Mon, 30 July 2007 09:34
		Re: [PATCH 11/15] Signal semantics By: Pavel Emelianov on Mon, 30 July 2007 09:31
		Re: [PATCH 11/15] Signal semantics By: serue on Wed, 01 August 2007 16:13
		Re: [PATCH 11/15] Signal semantics By: dev on Thu, 02 August 2007 08:35
		Re: [PATCH 11/15] Signal semantics By: serue on Thu, 02 August 2007 20:09
		Re: [PATCH 11/15] Signal semantics By: Oleg Nesterov on Sun, 29 July 2007 11:23
		[PATCH 12/15] Miscelaneous stuff for pid namespaces By: Pavel Emelianov on Thu, 26 July 2007 14:56
		Re: [PATCH 12/15] Miscelaneous stuff for pid namespaces By: Pavel Emelianov on Fri, 27 July 2007 06:53
		Re: [PATCH 12/15] Miscelaneous stuff for pid namespaces By: Sukadev Bhattiprolu on Fri, 27 July 2007 06:22
		[PATCH 13/15] Clone the pid namespace By: Pavel Emelianov on Thu, 26 July 2007 14:56
		[PATCH 14/15] Destroy pid namespace on init's death By: Pavel Emelianov on Thu, 26 July 2007 14:57
		Re: [PATCH 14/15] Destroy pid namespace on init's death By: Oleg Nesterov on Sun, 29 July 2007 10:39
		Re: [PATCH 14/15] Destroy pid namespace on init's death By: Pavel Emelianov on Mon, 30 July 2007 11:56
		Re: [PATCH 14/15] Destroy pid namespace on init's death By: Oleg Nesterov on Mon, 30 July 2007 15:44
		Re: [PATCH 14/15] Destroy pid namespace on init's death By: Oleg Nesterov on Tue, 31 July 2007 09:07
		Re: [PATCH 14/15] Destroy pid namespace on init's death By: Sukadev Bhattiprolu on Wed, 01 August 2007 06:16
		Re: [PATCH 14/15] Destroy pid namespace on init's death By: Dave Hansen on Wed, 01 August 2007 16:00
		Re: [PATCH 14/15] Destroy pid namespace on init's death By: Oleg Nesterov on Wed, 01 August 2007 19:51
		Re: [PATCH 14/15] Destroy pid namespace on init's death By: dev on Thu, 02 August 2007 08:37
		Re: [PATCH 14/15] Destroy pid namespace on init's death By: Oleg Nesterov on Thu, 02 August 2007 16:08
		Re: [PATCH 14/15] Destroy pid namespace on init's death By: Oleg Nesterov on Thu, 02 August 2007 17:08
		Re: [PATCH 14/15] Destroy pid namespace on init's death By: Sukadev Bhattiprolu on Fri, 03 August 2007 06:22
		Re: [PATCH 14/15] Destroy pid namespace on init's death By: Oleg Nesterov on Fri, 03 August 2007 10:55
		Re: [PATCH 14/15] Destroy pid namespace on init's death By: Sukadev Bhattiprolu on Thu, 02 August 2007 07:37
		Re: [PATCH 14/15] Destroy pid namespace on init's death By: Oleg Nesterov on Wed, 01 August 2007 19:48
		Re: [PATCH 14/15] Destroy pid namespace on init's death By: Sukadev Bhattiprolu on Thu, 02 August 2007 07:29
		Re: [PATCH 14/15] Destroy pid namespace on init's death By: Oleg Nesterov on Thu, 02 August 2007 15:39
		Re: [PATCH 14/15] Destroy pid namespace on init's death By: Sukadev Bhattiprolu on Thu, 02 August 2007 17:20
		Re: [PATCH 14/15] Destroy pid namespace on init's death By: Oleg Nesterov on Thu, 02 August 2007 17:29
		Re: [PATCH 14/15] Destroy pid namespace on init's death By: Sukadev Bhattiprolu on Thu, 02 August 2007 18:36
		Re: [PATCH 14/15] Destroy pid namespace on init's death By: Oleg Nesterov on Thu, 02 August 2007 18:49
		Re: [PATCH 14/15] Destroy pid namespace on init's death By: serue on Thu, 02 August 2007 19:13
		Re: [PATCH 14/15] Destroy pid namespace on init's death By: Sukadev Bhattiprolu on Fri, 03 August 2007 21:36
		[PATCH 15/15] Hooks over the code to show correct values to user By: Pavel Emelianov on Thu, 26 July 2007 14:58
		Re: [PATCH 15/15] Hooks over the code to show correct values to user By: Sukadev Bhattiprolu on Fri, 27 July 2007 05:57
		Re: [PATCH 15/15] Hooks over the code to show correct values to user By: Pavel Emelianov on Fri, 27 July 2007 06:44
		Re: [PATCH 15/15] Hooks over the code to show correct values to user By: Oleg Nesterov on Sun, 29 July 2007 14:29
		Re: [PATCH 15/15] Hooks over the code to show correct values to user By: Pavel Emelianov on Mon, 30 July 2007 06:49
		Re: [PATCH 15/15] Hooks over the code to show correct values to user By: Oleg Nesterov on Tue, 31 July 2007 10:04
		Re: [RFC][PATCH 0/15] Pid namespaces By: Sukadev Bhattiprolu on Fri, 27 July 2007 04:22
		Re: [RFC][PATCH 0/15] Pid namespaces By: Sukadev Bhattiprolu on Fri, 27 July 2007 06:08
		Re: [RFC][PATCH 0/15] Pid namespaces By: Pavel Emelianov on Fri, 27 July 2007 06:47

Previous Topic:	Re: [RFC, PATCH] handle the multi-threaded init's exit() properly
Next Topic:	[PATCH 0/14] sysfs cleanups

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

] [

]

Current Time: Sat Sep 06 16:03:00 GMT 2025

Total time taken to generate the page: 0.17483 seconds