The patch titled
namespaces: add nsproxy
has been added to the -mm tree. Its filename is
namespaces-add-nsproxy.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: namespaces: add nsproxy
From: "Serge E. Hallyn" <serue@xxxxxxxxxx>
This patch adds a nsproxy structure to the task struct. Later patches will
move the fs namespace pointer into this structure, and introduce a new utsname
namespace into the nsproxy.
The vserver and openvz functionality, then, would be implemented in large part
by virtualizing/isolating more and more resources into namespaces, each
contained in the nsproxy.
Signed-off-by: Serge Hallyn <serue@xxxxxxxxxx>
Cc: Kirill Korotaev <dev@xxxxxxxxxx>
Cc: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx>
Cc: Herbert Poetzl <herbert@xxxxxxxxxxxx>
Cc: Andrey Savochkin <saw@xxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/alpha/kernel/init_task.c | 2
arch/arm/kernel/init_task.c | 2
arch/arm26/kernel/init_task.c | 2
arch/frv/kernel/init_task.c | 2
arch/h8300/kernel/init_task.c | 2
arch/i386/kernel/init_task.c | 2
arch/ia64/kernel/init_task.c | 2
arch/m32r/kernel/init_task.c | 2
arch/m68knommu/kernel/init_task.c | 2
arch/mips/kernel/init_task.c | 2
arch/parisc/kernel/init_task.c | 2
arch/powerpc/kernel/init_task.c | 2
arch/s390/kernel/init_task.c | 2
arch/sh/kernel/init_task.c | 2
arch/sh64/kernel/init_task.c | 2
arch/sparc/kernel/init_task.c | 2
arch/sparc64/kernel/init_task.c | 2
arch/um/kernel/init_task.c | 2
arch/v850/kernel/init_task.c | 2
arch/x86_64/kernel/init_task.c | 2
include/linux/init_task.h | 7 ++
include/linux/nsproxy.h | 45 ++++++++++++++++
include/linux/sched.h | 2
kernel/Makefile | 2
kernel/exit.c | 7 ++
kernel/fork.c | 18 ++++++
kernel/nsproxy.c | 78 ++++++++++++++++++++++++++++
27 files changed, 197 insertions(+), 2 deletions(-)
diff -puN arch/alpha/kernel/init_task.c~namespaces-add-nsproxy arch/alpha/kernel/init_task.c
--- 25/arch/alpha/kernel/init_task.c~namespaces-add-nsproxy Fri May 19 11:39:59 2006
+++ 25-akpm/arch/alpha/kernel/init_task.c Fri May 19 11:39:59 2006
@@ -5,6 +5,7 @@
#include <linux/init_task.h>
#include <linux/fs.h>
#include <linux/mqueue.h>
+#include <linux/nsproxy.h>
#include <asm/uaccess.h>
@@ -13,6 +14,7 @@ static struct files_struct init_files =
static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
struct mm_struct init_mm = INIT_MM(init_mm);
+struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
struct task_struct init_task = INIT_TASK(init_task);
EXPORT_SYMBOL(init_mm);
diff -puN arch/arm26/kernel/init_task.c~namespaces-add-nsproxy arch/arm26/kernel/init_task.c
--- 25/arch/arm26/kernel/init_task.c~namespaces-add-nsproxy Fri May 19 11:39:59 2006
+++ 25-akpm/arch/arm26/kernel/init_task.c Fri May 19 11:39:59 2006
@@ -11,6 +11,7 @@
#include <linux/init.h>
#include <linux/init_task.h>
#include <linux/mqueue.h>
+#include <linux/nsproxy.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
@@ -20,6 +21,7 @@ static struct files_struct init_files =
static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
struct mm_struct init_mm = INIT_MM(init_mm);
+struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
EXPORT_SYMBOL(init_mm);
diff -puN arch/arm/kernel/init_task.c~namespaces-add-nsproxy arch/arm/kernel/init_task.c
--- 25/arch/arm/kernel/init_task.c~namespaces-add-nsproxy Fri May 19 11:39:59 2006
+++ 25-akpm/arch/arm/kernel/init_task.c Fri May 19 11:39:59 2006
@@ -8,6 +8,7 @@
#include <linux/init.h>
#include <linux/init_task.h>
#include <linux/mqueue.h>
+#include <linux/nsproxy.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
@@ -17,6 +18,7 @@ static struct files_struct init_files =
static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
struct mm_struct init_mm = INIT_MM(init_mm);
+struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
EXPORT_SYMBOL(init_mm);
diff -puN arch/frv/kernel/init_task.c~namespaces-add-nsproxy arch/frv/kernel/init_task.c
--- 25/arch/frv/kernel/init_task.c~namespaces-add-nsproxy Fri May 19 11:39:59 2006
+++ 25-akpm/arch/frv/kernel/init_task.c Fri May 19 11:39:59 2006
@@ -5,6 +5,7 @@
#include <linux/init_task.h>
#include <linux/fs.h>
#include <linux/mqueue.h>
+#include <linux/nsproxy.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
@@ -15,6 +16,7 @@ static struct files_struct init_files =
static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
struct mm_struct init_mm = INIT_MM(init_mm);
+struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
EXPORT_SYMBOL(init_mm);
diff -puN arch/h8300/kernel/init_task.c~namespaces-add-nsproxy arch/h8300/kernel/init_task.c
--- 25/arch/h8300/kernel/init_task.c~namespaces-add-nsproxy Fri May 19 11:39:59 2006
+++ 25-akpm/arch/h8300/kernel/init_task.c Fri May 19 11:39:59 2006
@@ -8,6 +8,7 @@
#include <linux/init_task.h>
#include <linux/fs.h>
#include <linux/mqueue.h>
+#include <linux/nsproxy.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
@@ -17,6 +18,7 @@ static struct files_struct init_files =
static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
struct mm_struct init_mm = INIT_MM(init_mm);
+struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
EXPORT_SYMBOL(init_mm);
diff -puN arch/i386/kernel/init_task.c~namespaces-add-nsproxy arch/i386/kernel/init_task.c
--- 25/arch/i386/kernel/init_task.c~namespaces-add-nsproxy Fri May 19 11:39:59 2006
+++ 25-akpm/arch/i386/kernel/init_task.c Fri May 19 11:39:59 2006
@@ -5,6 +5,7 @@
#include <linux/init_task.h>
#include <linux/fs.h>
#include <linux/mqueue.h>
+#include <linux/nsproxy.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
@@ -15,6 +16,7 @@ static struct files_struct init_files =
static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
struct mm_struct init_mm = INIT_MM(init_mm);
+struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
EXPORT_SYMBOL(init_mm);
diff -puN arch/ia64/kernel/init_task.c~namespaces-add-nsproxy arch/ia64/kernel/init_task.c
--- 25/arch/ia64/kernel/init_task.c~namespaces-add-nsproxy Fri May 19 11:39:59 2006
+++ 25-akpm/arch/ia64/kernel/init_task.c Fri May 19 11:39:59 2006
@@ -12,6 +12,7 @@
#include <linux/sched.h>
#include <linux/init_task.h>
#include <linux/mqueue.h>
+#include <linux/nsproxy.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
@@ -21,6 +22,7 @@ static struct files_struct init_files =
static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
struct mm_struct init_mm = INIT_MM(init_mm);
+struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
EXPORT_SYMBOL(init_mm);
diff -puN arch/m32r/kernel/init_task.c~namespaces-add-nsproxy arch/m32r/kernel/init_task.c
--- 25/arch/m32r/kernel/init_task.c~namespaces-add-nsproxy Fri May 19 11:39:59 2006
+++ 25-akpm/arch/m32r/kernel/init_task.c Fri May 19 11:39:59 2006
@@ -7,6 +7,7 @@
#include <linux/init_task.h>
#include <linux/fs.h>
#include <linux/mqueue.h>
+#include <linux/nsproxy.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
@@ -16,6 +17,7 @@ static struct files_struct init_files =
static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
struct mm_struct init_mm = INIT_MM(init_mm);
+struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
EXPORT_SYMBOL(init_mm);
diff -puN arch/m68knommu/kernel/init_task.c~namespaces-add-nsproxy arch/m68knommu/kernel/init_task.c
--- 25/arch/m68knommu/kernel/init_task.c~namespaces-add-nsproxy Fri May 19 11:39:59 2006
+++ 25-akpm/arch/m68knommu/kernel/init_task.c Fri May 19 11:39:59 2006
@@ -8,6 +8,7 @@
#include <linux/init_task.h>
#include <linux/fs.h>
#include <linux/mqueue.h>
+#include <linux/nsproxy.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
@@ -17,6 +18,7 @@ static struct files_struct init_files =
static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
struct mm_struct init_mm = INIT_MM(init_mm);
+struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
EXPORT_SYMBOL(init_mm);
diff -puN arch/mips/kernel/init_task.c~namespaces-add-nsproxy arch/mips/kernel/init_task.c
--- 25/arch/mips/kernel/init_task.c~namespaces-add-nsproxy Fri May 19 11:39:59 2006
+++ 25-akpm/arch/mips/kernel/init_task.c Fri May 19 11:39:59 2006
@@ -4,6 +4,7 @@
#include <linux/init_task.h>
#include <linux/fs.h>
#include <linux/mqueue.h>
+#include <linux/nsproxy.h>
#include <asm/thread_info.h>
#include <asm/uaccess.h>
@@ -14,6 +15,7 @@ static struct files_struct init_files =
static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
struct mm_struct init_mm = INIT_MM(init_mm);
+struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
EXPORT_SYMBOL(init_mm);
diff -puN arch/parisc/kernel/init_task.c~namespaces-add-nsproxy arch/parisc/kernel/init_task.c
--- 25/arch/parisc/kernel/init_task.c~namespaces-add-nsproxy Fri May 19 11:39:59 2006
+++ 25-akpm/arch/parisc/kernel/init_task.c Fri May 19 11:39:59 2006
@@ -28,6 +28,7 @@
#include <linux/init.h>
#include <linux/init_task.h>
#include <linux/mqueue.h>
+#include <linux/nsproxy.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
@@ -38,6 +39,7 @@ static struct files_struct init_files =
static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
struct mm_struct init_mm = INIT_MM(init_mm);
+struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
EXPORT_SYMBOL(init_mm);
diff -puN arch/powerpc/kernel/init_task.c~namespaces-add-nsproxy arch/powerpc/kernel/init_task.c
--- 25/arch/powerpc/kernel/init_task.c~namespaces-add-nsproxy Fri May 19 11:39:59 2006
+++ 25-akpm/arch/powerpc/kernel/init_task.c Fri May 19 11:39:59 2006
@@ -5,6 +5,7 @@
#include <linux/init_task.h>
#include <linux/fs.h>
#include <linux/mqueue.h>
+#include <linux/nsproxy.h>
#include <asm/uaccess.h>
static struct fs_struct init_fs = INIT_FS;
@@ -12,6 +13,7 @@ static struct files_struct init_files =
static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
struct mm_struct init_mm = INIT_MM(init_mm);
+struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
EXPORT_SYMBOL(init_mm);
diff -puN arch/s390/kernel/init_task.c~namespaces-add-nsproxy arch/s390/kernel/init_task.c
--- 25/arch/s390/kernel/init_task.c~namespaces-add-nsproxy Fri May 19 11:39:59 2006
+++ 25-akpm/arch/s390/kernel/init_task.c Fri May 19 11:39:59 2006
@@ -11,6 +11,7 @@
#include <linux/sched.h>
#include <linux/init_task.h>
#include <linux/mqueue.h>
+#include <linux/nsproxy.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
@@ -20,6 +21,7 @@ static struct files_struct init_files =
static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
struct mm_struct init_mm = INIT_MM(init_mm);
+struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
EXPORT_SYMBOL(init_mm);
diff -puN arch/sh64/kernel/init_task.c~namespaces-add-nsproxy arch/sh64/kernel/init_task.c
--- 25/arch/sh64/kernel/init_task.c~namespaces-add-nsproxy Fri May 19 11:39:59 2006
+++ 25-akpm/arch/sh64/kernel/init_task.c Fri May 19 11:39:59 2006
@@ -14,6 +14,7 @@
#include <linux/sched.h>
#include <linux/init_task.h>
#include <linux/mqueue.h>
+#include <linux/nsproxy.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
@@ -23,6 +24,7 @@ static struct files_struct init_files =
static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
struct mm_struct init_mm = INIT_MM(init_mm);
+struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
struct pt_regs fake_swapper_regs;
diff -puN arch/sh/kernel/init_task.c~namespaces-add-nsproxy arch/sh/kernel/init_task.c
--- 25/arch/sh/kernel/init_task.c~namespaces-add-nsproxy Fri May 19 11:39:59 2006
+++ 25-akpm/arch/sh/kernel/init_task.c Fri May 19 11:39:59 2006
@@ -3,6 +3,7 @@
#include <linux/sched.h>
#include <linux/init_task.h>
#include <linux/mqueue.h>
+#include <linux/nsproxy.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
@@ -12,6 +13,7 @@ static struct files_struct init_files =
static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
struct mm_struct init_mm = INIT_MM(init_mm);
+struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
EXPORT_SYMBOL(init_mm);
diff -puN arch/sparc64/kernel/init_task.c~namespaces-add-nsproxy arch/sparc64/kernel/init_task.c
--- 25/arch/sparc64/kernel/init_task.c~namespaces-add-nsproxy Fri May 19 11:39:59 2006
+++ 25-akpm/arch/sparc64/kernel/init_task.c Fri May 19 11:39:59 2006
@@ -3,6 +3,7 @@
#include <linux/sched.h>
#include <linux/init_task.h>
#include <linux/mqueue.h>
+#include <linux/nsproxy.h>
#include <asm/pgtable.h>
#include <asm/uaccess.h>
@@ -13,6 +14,7 @@ static struct files_struct init_files =
static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
struct mm_struct init_mm = INIT_MM(init_mm);
+struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
EXPORT_SYMBOL(init_mm);
diff -puN arch/sparc/kernel/init_task.c~namespaces-add-nsproxy arch/sparc/kernel/init_task.c
--- 25/arch/sparc/kernel/init_task.c~namespaces-add-nsproxy Fri May 19 11:39:59 2006
+++ 25-akpm/arch/sparc/kernel/init_task.c Fri May 19 11:39:59 2006
@@ -3,6 +3,7 @@
#include <linux/sched.h>
#include <linux/init_task.h>
#include <linux/mqueue.h>
+#include <linux/nsproxy.h>
#include <asm/pgtable.h>
#include <asm/uaccess.h>
@@ -12,6 +13,7 @@ static struct files_struct init_files =
static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
struct mm_struct init_mm = INIT_MM(init_mm);
+struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
struct task_struct init_task = INIT_TASK(init_task);
EXPORT_SYMBOL(init_mm);
diff -puN arch/um/kernel/init_task.c~namespaces-add-nsproxy arch/um/kernel/init_task.c
--- 25/arch/um/kernel/init_task.c~namespaces-add-nsproxy Fri May 19 11:39:59 2006
+++ 25-akpm/arch/um/kernel/init_task.c Fri May 19 11:39:59 2006
@@ -9,6 +9,7 @@
#include "linux/sched.h"
#include "linux/init_task.h"
#include "linux/mqueue.h"
+#include "linux/nsproxy.h"
#include "asm/uaccess.h"
#include "asm/pgtable.h"
#include "user_util.h"
@@ -17,6 +18,7 @@
static struct fs_struct init_fs = INIT_FS;
struct mm_struct init_mm = INIT_MM(init_mm);
+struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
static struct files_struct init_files = INIT_FILES;
static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
diff -puN arch/v850/kernel/init_task.c~namespaces-add-nsproxy arch/v850/kernel/init_task.c
--- 25/arch/v850/kernel/init_task.c~namespaces-add-nsproxy Fri May 19 11:39:59 2006
+++ 25-akpm/arch/v850/kernel/init_task.c Fri May 19 11:39:59 2006
@@ -16,6 +16,7 @@
#include <linux/init_task.h>
#include <linux/fs.h>
#include <linux/mqueue.h>
+#include <linux/nsproxy.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
@@ -25,6 +26,7 @@ static struct files_struct init_files =
static struct signal_struct init_signals = INIT_SIGNALS (init_signals);
static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
struct mm_struct init_mm = INIT_MM (init_mm);
+struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
EXPORT_SYMBOL(init_mm);
diff -puN arch/x86_64/kernel/init_task.c~namespaces-add-nsproxy arch/x86_64/kernel/init_task.c
--- 25/arch/x86_64/kernel/init_task.c~namespaces-add-nsproxy Fri May 19 11:39:59 2006
+++ 25-akpm/arch/x86_64/kernel/init_task.c Fri May 19 11:39:59 2006
@@ -5,6 +5,7 @@
#include <linux/init_task.h>
#include <linux/fs.h>
#include <linux/mqueue.h>
+#include <linux/nsproxy.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
@@ -15,6 +16,7 @@ static struct files_struct init_files =
static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
struct mm_struct init_mm = INIT_MM(init_mm);
+struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
EXPORT_SYMBOL(init_mm);
diff -puN include/linux/init_task.h~namespaces-add-nsproxy include/linux/init_task.h
--- 25/include/linux/init_task.h~namespaces-add-nsproxy Fri May 19 11:39:59 2006
+++ 25-akpm/include/linux/init_task.h Fri May 19 11:39:59 2006
@@ -66,6 +66,12 @@
.session = 1, \
}
+extern struct nsproxy init_nsproxy;
+#define INIT_NSPROXY(nsproxy) { \
+ .count = ATOMIC_INIT(1), \
+ .nslock = SPIN_LOCK_UNLOCKED, \
+}
+
#define INIT_SIGHAND(sighand) { \
.count = ATOMIC_INIT(1), \
.action = { { { .sa_handler = NULL, } }, }, \
@@ -115,6 +121,7 @@ extern struct group_info init_groups;
.files = &init_files, \
.signal = &init_signals, \
.sighand = &init_sighand, \
+ .nsproxy = &init_nsproxy, \
.pending = { \
.list = LIST_HEAD_INIT(tsk.pending.list), \
.signal = {{0}}}, \
diff -puN /dev/null include/linux/nsproxy.h
--- /dev/null Thu Apr 11 07:25:15 2002
+++ 25-akpm/include/linux/nsproxy.h Fri May 19 11:39:59 2006
@@ -0,0 +1,45 @@
+#ifndef _LINUX_NSPROXY_H
+#define _LINUX_NSPROXY_H
+
+#include <linux/spinlock.h>
+#include <linux/sched.h>
+
+/*
+ * A structure to contain pointers to all per-process
+ * namespaces - fs (mount), uts, network, sysvipc, etc.
+ *
+ * 'count' is the number of tasks holding a reference.
+ * The count for each namespace, then, will be the number
+ * of nsproxies pointing to it, not the number of tasks.
+ *
+ * The nsproxy is shared by tasks which share all namespaces.
+ * As soon as a single namespace is cloned or unshared, the
+ * nsproxy is copied.
+ */
+struct nsproxy {
+ atomic_t count;
+ spinlock_t nslock;
+};
+extern struct nsproxy init_nsproxy;
+
+struct nsproxy *dup_namespaces(struct nsproxy *orig);
+int copy_namespaces(int flags, struct task_struct *tsk);
+void get_task_namespaces(struct task_struct *tsk);
+void free_nsproxy(struct nsproxy *ns);
+
+static inline void put_nsproxy(struct nsproxy *ns)
+{
+ if (atomic_dec_and_test(&ns->count)) {
+ free_nsproxy(ns);
+ }
+}
+
+static inline void exit_task_namespaces(struct task_struct *p)
+{
+ struct nsproxy *ns = p->nsproxy;
+ if (ns) {
+ put_nsproxy(ns);
+ p->nsproxy = NULL;
+ }
+}
+#endif
diff -puN include/linux/sched.h~namespaces-add-nsproxy include/linux/sched.h
--- 25/include/linux/sched.h~namespaces-add-nsproxy Fri May 19 11:39:59 2006
+++ 25-akpm/include/linux/sched.h Fri May 19 11:39:59 2006
@@ -239,6 +239,7 @@ extern signed long schedule_timeout_unin
asmlinkage void schedule(void);
struct namespace;
+struct nsproxy;
/* Maximum number of active map areas.. This is a random (large) number */
#define DEFAULT_MAX_MAP_COUNT 65536
@@ -875,6 +876,7 @@ struct task_struct {
struct files_struct *files;
/* namespace */
struct namespace *namespace;
+ struct nsproxy *nsproxy;
/* signal handlers */
struct signal_struct *signal;
struct sighand_struct *sighand;
diff -puN kernel/exit.c~namespaces-add-nsproxy kernel/exit.c
--- 25/kernel/exit.c~namespaces-add-nsproxy Fri May 19 11:39:59 2006
+++ 25-akpm/kernel/exit.c Fri May 19 11:39:59 2006
@@ -21,6 +21,7 @@
#include <linux/acct.h>
#include <linux/file.h>
#include <linux/binfmts.h>
+#include <linux/nsproxy.h>
#include <linux/ptrace.h>
#include <linux/profile.h>
#include <linux/mount.h>
@@ -409,9 +410,14 @@ void daemonize(const char *name, ...)
fs = init_task.fs;
current->fs = fs;
atomic_inc(&fs->count);
+
exit_namespace(current);
+ exit_task_namespaces(current);
current->namespace = init_task.namespace;
+ current->nsproxy = init_task.nsproxy;
get_namespace(current->namespace);
+ get_task_namespaces(current);
+
exit_files(current);
current->files = init_task.files;
atomic_inc(¤t->files->count);
@@ -922,6 +928,7 @@ fastcall NORET_TYPE void do_exit(long co
__exit_files(tsk);
__exit_fs(tsk);
exit_namespace(tsk);
+ exit_task_namespaces(tsk);
exit_thread();
cpuset_exit(tsk);
exit_keys(tsk);
diff -puN kernel/fork.c~namespaces-add-nsproxy kernel/fork.c
--- 25/kernel/fork.c~namespaces-add-nsproxy Fri May 19 11:39:59 2006
+++ 25-akpm/kernel/fork.c Fri May 19 11:39:59 2006
@@ -28,6 +28,7 @@
#include <linux/binfmts.h>
#include <linux/mman.h>
#include <linux/fs.h>
+#include <linux/nsproxy.h>
#include <linux/capability.h>
#include <linux/cpu.h>
#include <linux/cpuset.h>
@@ -1078,8 +1079,10 @@ static task_t *copy_process(unsigned lon
goto bad_fork_cleanup_signal;
if ((retval = copy_keys(clone_flags, p)))
goto bad_fork_cleanup_mm;
- if ((retval = copy_namespace(clone_flags, p)))
+ if ((retval = copy_namespaces(clone_flags, p)))
goto bad_fork_cleanup_keys;
+ if ((retval = copy_namespace(clone_flags, p)))
+ goto bad_fork_cleanup_namespaces;
retval = copy_thread(0, clone_flags, stack_start, stack_size, p, regs);
if (retval)
goto bad_fork_cleanup_namespace;
@@ -1227,6 +1230,8 @@ static task_t *copy_process(unsigned lon
bad_fork_cleanup_namespace:
exit_namespace(p);
+bad_fork_cleanup_namespaces:
+ exit_task_namespaces(p);
bad_fork_cleanup_keys:
exit_keys(p);
bad_fork_cleanup_mm:
@@ -1568,6 +1573,7 @@ asmlinkage long sys_unshare(unsigned lon
struct mm_struct *mm, *new_mm = NULL, *active_mm = NULL;
struct files_struct *fd, *new_fd = NULL;
struct sem_undo_list *new_ulist = NULL;
+ struct nsproxy *new_nsproxy, *old_nsproxy;
check_unshare_flags(&unshare_flags);
@@ -1594,7 +1600,15 @@ asmlinkage long sys_unshare(unsigned lon
if (new_fs || new_ns || new_sigh || new_mm || new_fd || new_ulist) {
+ old_nsproxy = current->nsproxy;
+ new_nsproxy = dup_namespaces(old_nsproxy);
+ if (!new_nsproxy) {
+ err = -ENOMEM;
+ goto bad_unshare_cleanup_semundo;
+ }
+
task_lock(current);
+ current->nsproxy = new_nsproxy;
if (new_fs) {
fs = current->fs;
@@ -1630,8 +1644,10 @@ asmlinkage long sys_unshare(unsigned lon
}
task_unlock(current);
+ put_nsproxy(old_nsproxy);
}
+bad_unshare_cleanup_semundo:
bad_unshare_cleanup_fd:
if (new_fd)
put_files_struct(new_fd);
diff -puN kernel/Makefile~namespaces-add-nsproxy kernel/Makefile
--- 25/kernel/Makefile~namespaces-add-nsproxy Fri May 19 11:39:59 2006
+++ 25-akpm/kernel/Makefile Fri May 19 11:39:59 2006
@@ -8,7 +8,7 @@ obj-y = sched.o fork.o exec_domain.o
signal.o sys.o kmod.o workqueue.o pid.o \
rcupdate.o extable.o params.o posix-timers.o \
kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o mutex.o \
- hrtimer.o
+ hrtimer.o nsproxy.o
obj-y += time/
obj-$(CONFIG_DEBUG_MUTEXES) += mutex-debug.o
diff -puN /dev/null kernel/nsproxy.c
--- /dev/null Thu Apr 11 07:25:15 2002
+++ 25-akpm/kernel/nsproxy.c Fri May 19 11:39:59 2006
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2006 IBM Corporation
+ *
+ * Author: Serge Hallyn <serue@xxxxxxxxxx>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, version 2 of the
+ * License.
+ */
+
+#include <linux/compile.h>
+#include <linux/module.h>
+#include <linux/version.h>
+#include <linux/nsproxy.h>
+
+static inline void get_nsproxy(struct nsproxy *ns)
+{
+ atomic_inc(&ns->count);
+}
+
+void get_task_namespaces(struct task_struct *tsk)
+{
+ struct nsproxy *ns = tsk->nsproxy;
+ if (ns) {
+ get_nsproxy(ns);
+ }
+}
+
+/*
+ * creates a copy of "orig" with refcount 1.
+ * This does not grab references to the contained namespaces,
+ * so that needs to be done by dup_namespaces.
+ */
+static inline struct nsproxy *clone_namespaces(struct nsproxy *orig)
+{
+ struct nsproxy *ns;
+
+ ns = kmalloc(sizeof(struct nsproxy), GFP_KERNEL);
+ if (ns) {
+ memcpy(ns, orig, sizeof(struct nsproxy));
+ atomic_set(&ns->count, 1);
+ }
+ return ns;
+}
+
+/*
+ * copies the nsproxy, setting refcount to 1, and grabbing a
+ * reference to all contained namespaces. Called from
+ * sys_unshare()
+ */
+struct nsproxy *dup_namespaces(struct nsproxy *orig)
+{
+ struct nsproxy *ns = clone_namespaces(orig);
+
+ return ns;
+}
+
+/*
+ * called from clone. This now handles copy for nsproxy and all
+ * namespaces therein.
+ */
+int copy_namespaces(int flags, struct task_struct *tsk)
+{
+ struct nsproxy *old_ns = tsk->nsproxy;
+
+ if (!old_ns)
+ return 0;
+
+ get_nsproxy(old_ns);
+
+ return 0;
+}
+
+void free_nsproxy(struct nsproxy *ns)
+{
+ kfree(ns);
+}
_
Patches currently in -mm which might be from serue@xxxxxxxxxx are
origin.patch
namespaces-add-nsproxy.patch
namespaces-incorporate-fs-namespace-into-nsproxy.patch
namespaces-utsname-introduce-temporary-helpers.patch
namespaces-utsname-switch-to-using-uts-namespaces.patch
namespaces-utsname-use-init_utsname-when-appropriate.patch
namespaces-utsname-implement-utsname-namespaces.patch
namespaces-utsname-sysctl-hack.patch
namespaces-utsname-remove-system_utsname.patch
namespaces-utsname-implement-clone_newuts-flag.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
