aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/fork.c
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2007-10-19 02:39:54 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-19 14:53:37 -0400
commitcf7b708c8d1d7a27736771bcf4c457b332b0f818 (patch)
tree10f80257b052313b283f18ddfe35145882e0b47f /kernel/fork.c
parenta6f5e06378970a2687332c2d54046245fcff1e7e (diff)
Make access to task's nsproxy lighter
When someone wants to deal with some other taks's namespaces it has to lock the task and then to get the desired namespace if the one exists. This is slow on read-only paths and may be impossible in some cases. E.g. Oleg recently noticed a race between unshare() and the (sent for review in cgroups) pid namespaces - when the task notifies the parent it has to know the parent's namespace, but taking the task_lock() is impossible there - the code is under write locked tasklist lock. On the other hand switching the namespace on task (daemonize) and releasing the namespace (after the last task exit) is rather rare operation and we can sacrifice its speed to solve the issues above. The access to other task namespaces is proposed to be performed like this: rcu_read_lock(); nsproxy = task_nsproxy(tsk); if (nsproxy != NULL) { / * * work with the namespaces here * e.g. get the reference on one of them * / } / * * NULL task_nsproxy() means that this task is * almost dead (zombie) * / rcu_read_unlock(); This patch has passed the review by Eric and Oleg :) and, of course, tested. [clg@fr.ibm.com: fix unshare()] [ebiederm@xmission.com: Update get_net_ns_by_pid] Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Cc: Oleg Nesterov <oleg@tv-sign.ru> Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Cc: Serge Hallyn <serue@us.ibm.com> Signed-off-by: Cedric Le Goater <clg@fr.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/fork.c')
-rw-r--r--kernel/fork.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/kernel/fork.c b/kernel/fork.c
index 2deaf481efab..d2f4a420a5b9 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1632,7 +1632,7 @@ asmlinkage long sys_unshare(unsigned long unshare_flags)
1632 struct mm_struct *mm, *new_mm = NULL, *active_mm = NULL; 1632 struct mm_struct *mm, *new_mm = NULL, *active_mm = NULL;
1633 struct files_struct *fd, *new_fd = NULL; 1633 struct files_struct *fd, *new_fd = NULL;
1634 struct sem_undo_list *new_ulist = NULL; 1634 struct sem_undo_list *new_ulist = NULL;
1635 struct nsproxy *new_nsproxy = NULL, *old_nsproxy = NULL; 1635 struct nsproxy *new_nsproxy = NULL;
1636 1636
1637 check_unshare_flags(&unshare_flags); 1637 check_unshare_flags(&unshare_flags);
1638 1638
@@ -1662,14 +1662,13 @@ asmlinkage long sys_unshare(unsigned long unshare_flags)
1662 1662
1663 if (new_fs || new_mm || new_fd || new_ulist || new_nsproxy) { 1663 if (new_fs || new_mm || new_fd || new_ulist || new_nsproxy) {
1664 1664
1665 task_lock(current);
1666
1667 if (new_nsproxy) { 1665 if (new_nsproxy) {
1668 old_nsproxy = current->nsproxy; 1666 switch_task_namespaces(current, new_nsproxy);
1669 current->nsproxy = new_nsproxy; 1667 new_nsproxy = NULL;
1670 new_nsproxy = old_nsproxy;
1671 } 1668 }
1672 1669
1670 task_lock(current);
1671
1673 if (new_fs) { 1672 if (new_fs) {
1674 fs = current->fs; 1673 fs = current->fs;
1675 current->fs = new_fs; 1674 current->fs = new_fs;