Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030630Ab1EWVGO (ORCPT ); Mon, 23 May 2011 17:06:14 -0400 Received: from out01.mta.xmission.com ([166.70.13.231]:53325 "EHLO out01.mta.xmission.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030593Ab1EWVGF (ORCPT ); Mon, 23 May 2011 17:06:05 -0400 From: ebiederm@xmission.com (Eric W. Biederman) To: Linus Torvalds Cc: , Linux Containers , , James Bottomley , Geert Uytterhoeven Subject: [GIT PULL] Namespace file descriptors for 2.6.40 Date: Mon, 23 May 2011 14:05:57 -0700 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-XM-SPF: eid=;;;mid=;;;hst=in02.mta.xmission.com;;;ip=98.207.153.68;;;frm=ebiederm@xmission.com;;;spf=neutral X-XM-AID: U2FsdGVkX19fYn0l7rfG6S90povZwEEk2MSAT6Sx7F4= X-SA-Exim-Connect-IP: 98.207.153.68 X-SA-Exim-Mail-From: ebiederm@xmission.com X-SA-Exim-Scanned: No (on in02.mta.xmission.com); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5521 Lines: 125 Please pull the namespace file descriptor git tree from: git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/linux-2.6-nsfd.git Because other syscall work has happened in other trees there are conflicts on alpha and m68k. For alpha all that is needed is a simple incrementing of the syscall number in my tree and adding of my syscall to the end of the list. For m68k please just delete all of the syscall entries the conflict will add to arch/m68k/kernel/entry_mm.S. The m68k tree has consolidated everything in arch/m68k/kernel/syscalltable.S This tree adds the files /proc//ns/net, /proc//ns/ipc, /proc//ns/uts that can be opened to refer to the namespaces of a process at the time those files are opened, and can be bind mounted to keep the specified namespace alive without a process. This tree adds the setns system call that can be used to change the specified namespace of a process to the namespace specified by a system call. This tree adds a new rtnetlink attribute that allows for moving a network device into a network namespace specified by a file descriptor. Support for the other namespaces is planned but is not ready for 2.6.40. These changes dramatically simplify what a userspace process has to do to keep a namespace alive, and to execute system calls in it. The shortlog: Stephen Rothwell (1): net: fix get_net_ns_by_fd for !CONFIG_NET_NS Eric W. Biederman (11): ns: proc files for namespace naming policy. ns: Introduce the setns syscall ns proc: Add support for the network namespace. ns proc: Add support for the uts namespace ns proc: Add support for the ipc namespace net: Allow setting the network namespace by fd Merge commit '2e7bad5f34b5beed47542490c760ed26574e38ba' into HEAD Merge commit '7143b7d41218d4fc2ea33e6056c73609527ae687' into HEAD ns: Wire up the setns system call ns: Declare sys_setns in syscalls.h ns proc: Return -ENOENT for a nonexistent /proc/self/ns/ entry. The diffstat: arch/alpha/include/asm/unistd.h | 3 +- arch/alpha/kernel/systbls.S | 1 + arch/arm/include/asm/unistd.h | 1 + arch/arm/kernel/calls.S | 1 + arch/avr32/include/asm/unistd.h | 3 +- arch/avr32/kernel/syscall_table.S | 1 + arch/blackfin/include/asm/unistd.h | 3 +- arch/blackfin/mach-common/entry.S | 1 + arch/cris/arch-v10/kernel/entry.S | 1 + arch/cris/arch-v32/kernel/entry.S | 1 + arch/cris/include/asm/unistd.h | 3 +- arch/frv/include/asm/unistd.h | 3 +- arch/frv/kernel/entry.S | 1 + arch/h8300/include/asm/unistd.h | 3 +- arch/h8300/kernel/syscalls.S | 1 + arch/ia64/include/asm/unistd.h | 3 +- arch/ia64/kernel/entry.S | 1 + arch/m32r/include/asm/unistd.h | 3 +- arch/m32r/kernel/syscall_table.S | 1 + arch/m68k/include/asm/unistd.h | 3 +- arch/m68k/kernel/syscalltable.S | 1 + arch/microblaze/include/asm/unistd.h | 3 +- arch/microblaze/kernel/syscall_table.S | 1 + arch/mips/include/asm/unistd.h | 15 ++- arch/mips/kernel/scall32-o32.S | 1 + arch/mips/kernel/scall64-64.S | 1 + arch/mips/kernel/scall64-n32.S | 1 + arch/mips/kernel/scall64-o32.S | 1 + arch/mn10300/include/asm/unistd.h | 3 +- arch/mn10300/kernel/entry.S | 1 + arch/parisc/include/asm/unistd.h | 4 +- arch/parisc/kernel/syscall_table.S | 1 + arch/powerpc/include/asm/systbl.h | 1 + arch/powerpc/include/asm/unistd.h | 3 +- arch/s390/include/asm/unistd.h | 3 +- arch/s390/kernel/syscalls.S | 1 + arch/sh/include/asm/unistd_32.h | 3 +- arch/sh/include/asm/unistd_64.h | 3 +- arch/sh/kernel/syscalls_32.S | 1 + arch/sh/kernel/syscalls_64.S | 1 + arch/sparc/include/asm/unistd.h | 3 +- arch/sparc/kernel/systbls_32.S | 2 +- arch/sparc/kernel/systbls_64.S | 4 +- arch/x86/ia32/ia32entry.S | 1 + arch/x86/include/asm/unistd_32.h | 3 +- arch/x86/include/asm/unistd_64.h | 2 + arch/x86/kernel/syscall_table_32.S | 1 + arch/xtensa/include/asm/unistd.h | 4 +- fs/proc/Makefile | 1 + fs/proc/base.c | 20 ++-- fs/proc/inode.c | 7 + fs/proc/internal.h | 18 +++ fs/proc/namespaces.c | 198 ++++++++++++++++++++++++++++++++ include/asm-generic/unistd.h | 4 +- include/linux/if_link.h | 1 + include/linux/proc_fs.h | 21 ++++ include/linux/syscalls.h | 1 + include/net/net_namespace.h | 1 + ipc/namespace.c | 37 ++++++ kernel/nsproxy.c | 42 +++++++ kernel/utsname.c | 39 ++++++ net/core/net_namespace.c | 65 +++++++++++ net/core/rtnetlink.c | 5 +- 63 files changed, 525 insertions(+), 42 deletions(-) Thanks, Eric -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/