X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=kernel-vserver-2.3.patch;h=1f7aa6f129fec3d0bc6477a0db49aa85d2d5c4bc;hb=b37cbe2e641128f655ec1394394f1acdc5f23a36;hp=2788377f7112e600ed0f2ce45e6e17376683f916;hpb=848c1eedec6da8a772f74f33cee616be22b7382c;p=packages%2Fkernel.git diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch index 2788377f..1f7aa6f1 100644 --- a/kernel-vserver-2.3.patch +++ b/kernel-vserver-2.3.patch @@ -1,6 +1,6 @@ -diff -NurpP --minimal linux-3.7/Documentation/vserver/debug.txt linux-3.7-vs2.3.5.1/Documentation/vserver/debug.txt ---- linux-3.7/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/Documentation/vserver/debug.txt 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/Documentation/vserver/debug.txt linux-3.18.5-vs2.3.7.3/Documentation/vserver/debug.txt +--- linux-3.18.5/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/Documentation/vserver/debug.txt 2015-01-19 10:57:45.000000000 +0000 @@ -0,0 +1,154 @@ + +debug_cvirt: @@ -156,10 +156,10 @@ diff -NurpP --minimal linux-3.7/Documentation/vserver/debug.txt linux-3.7-vs2.3. + m 2^m "vx_acc_page[%5d,%s,%2d]: %5d%s" + "vx_acc_pages[%5d,%s,%2d]: %5d += %5d" + "vx_pages_avail[%5d,%s,%2d]: %5ld > %5d + %5d" -diff -NurpP --minimal linux-3.7/arch/alpha/Kconfig linux-3.7-vs2.3.5.1/arch/alpha/Kconfig ---- linux-3.7/arch/alpha/Kconfig 2012-12-11 15:45:43.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/alpha/Kconfig 2012-12-11 15:56:32.000000000 +0000 -@@ -668,6 +668,8 @@ config DUMMY_CONSOLE +diff -NurpP --minimal linux-3.18.5/arch/alpha/Kconfig linux-3.18.5-vs2.3.7.3/arch/alpha/Kconfig +--- linux-3.18.5/arch/alpha/Kconfig 2014-06-12 13:00:27.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/arch/alpha/Kconfig 2015-01-19 10:57:45.000000000 +0000 +@@ -740,6 +740,8 @@ config DUMMY_CONSOLE depends on VGA_HOSE default y @@ -168,9 +168,9 @@ diff -NurpP --minimal linux-3.7/arch/alpha/Kconfig linux-3.7-vs2.3.5.1/arch/alph source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.7/arch/alpha/kernel/systbls.S linux-3.7-vs2.3.5.1/arch/alpha/kernel/systbls.S ---- linux-3.7/arch/alpha/kernel/systbls.S 2012-10-04 13:26:43.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/alpha/kernel/systbls.S 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/arch/alpha/kernel/systbls.S linux-3.18.5-vs2.3.7.3/arch/alpha/kernel/systbls.S +--- linux-3.18.5/arch/alpha/kernel/systbls.S 2015-01-16 22:18:10.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/arch/alpha/kernel/systbls.S 2015-01-19 10:57:45.000000000 +0000 @@ -446,7 +446,7 @@ sys_call_table: .quad sys_stat64 /* 425 */ .quad sys_lstat64 @@ -180,23 +180,23 @@ diff -NurpP --minimal linux-3.7/arch/alpha/kernel/systbls.S linux-3.7-vs2.3.5.1/ .quad sys_ni_syscall /* sys_mbind */ .quad sys_ni_syscall /* sys_get_mempolicy */ .quad sys_ni_syscall /* sys_set_mempolicy */ -diff -NurpP --minimal linux-3.7/arch/alpha/kernel/traps.c linux-3.7-vs2.3.5.1/arch/alpha/kernel/traps.c ---- linux-3.7/arch/alpha/kernel/traps.c 2012-12-11 15:45:44.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/alpha/kernel/traps.c 2012-12-11 15:56:32.000000000 +0000 -@@ -184,7 +184,8 @@ die_if_kernel(char * str, struct pt_regs +diff -NurpP --minimal linux-3.18.5/arch/alpha/kernel/traps.c linux-3.18.5-vs2.3.7.3/arch/alpha/kernel/traps.c +--- linux-3.18.5/arch/alpha/kernel/traps.c 2014-01-22 20:38:10.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/arch/alpha/kernel/traps.c 2015-01-19 10:57:45.000000000 +0000 +@@ -175,7 +175,8 @@ die_if_kernel(char * str, struct pt_regs #ifdef CONFIG_SMP printk("CPU %d ", hard_smp_processor_id()); #endif - printk("%s(%d): %s %ld\n", current->comm, task_pid_nr(current), str, err); -+ printk("%s(%d[#%u]): %s %ld\n", current->comm, ++ printk("%s(%d:#%u): %s %ld\n", current->comm, + task_pid_nr(current), current->xid, str, err); dik_show_regs(regs, r9_15); - add_taint(TAINT_DIE); + add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE); dik_show_trace((unsigned long *)(regs+1)); -diff -NurpP --minimal linux-3.7/arch/arm/Kconfig linux-3.7-vs2.3.5.1/arch/arm/Kconfig ---- linux-3.7/arch/arm/Kconfig 2012-12-11 15:45:44.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/arm/Kconfig 2012-12-11 15:56:32.000000000 +0000 -@@ -2307,6 +2307,8 @@ source "fs/Kconfig" +diff -NurpP --minimal linux-3.18.5/arch/arm/Kconfig linux-3.18.5-vs2.3.7.3/arch/arm/Kconfig +--- linux-3.18.5/arch/arm/Kconfig 2015-01-17 02:39:30.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/arch/arm/Kconfig 2015-01-19 10:57:45.000000000 +0000 +@@ -2170,6 +2170,8 @@ source "fs/Kconfig" source "arch/arm/Kconfig.debug" @@ -205,9 +205,9 @@ diff -NurpP --minimal linux-3.7/arch/arm/Kconfig linux-3.7-vs2.3.5.1/arch/arm/Kc source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.7/arch/arm/kernel/calls.S linux-3.7-vs2.3.5.1/arch/arm/kernel/calls.S ---- linux-3.7/arch/arm/kernel/calls.S 2012-12-11 15:45:45.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/arm/kernel/calls.S 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/arch/arm/kernel/calls.S linux-3.18.5-vs2.3.7.3/arch/arm/kernel/calls.S +--- linux-3.18.5/arch/arm/kernel/calls.S 2015-01-17 02:39:31.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/arch/arm/kernel/calls.S 2015-01-19 10:57:45.000000000 +0000 @@ -322,7 +322,7 @@ /* 310 */ CALL(sys_request_key) CALL(sys_keyctl) @@ -217,23 +217,10 @@ diff -NurpP --minimal linux-3.7/arch/arm/kernel/calls.S linux-3.7-vs2.3.5.1/arch CALL(sys_ioprio_set) /* 315 */ CALL(sys_ioprio_get) CALL(sys_inotify_init) -diff -NurpP --minimal linux-3.7/arch/arm/kernel/process.c linux-3.7-vs2.3.5.1/arch/arm/kernel/process.c ---- linux-3.7/arch/arm/kernel/process.c 2012-12-11 15:45:45.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/arm/kernel/process.c 2012-12-11 15:56:32.000000000 +0000 -@@ -337,7 +337,8 @@ void __show_regs(struct pt_regs *regs) - void show_regs(struct pt_regs * regs) - { - printk("\n"); -- printk("Pid: %d, comm: %20s\n", task_pid_nr(current), current->comm); -+ printk("Pid: %d[#%u], comm: %20s\n", -+ task_pid_nr(current), current->xid, current->comm); - __show_regs(regs); - dump_stack(); - } -diff -NurpP --minimal linux-3.7/arch/arm/kernel/traps.c linux-3.7-vs2.3.5.1/arch/arm/kernel/traps.c ---- linux-3.7/arch/arm/kernel/traps.c 2012-10-04 13:26:44.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/arm/kernel/traps.c 2012-12-11 15:56:32.000000000 +0000 -@@ -249,8 +249,8 @@ static int __die(const char *str, int er +diff -NurpP --minimal linux-3.18.5/arch/arm/kernel/traps.c linux-3.18.5-vs2.3.7.3/arch/arm/kernel/traps.c +--- linux-3.18.5/arch/arm/kernel/traps.c 2015-01-17 02:39:31.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/arch/arm/kernel/traps.c 2015-01-19 10:57:45.000000000 +0000 +@@ -250,8 +250,8 @@ static int __die(const char *str, int er print_modules(); __show_regs(regs); @@ -244,10 +231,10 @@ diff -NurpP --minimal linux-3.7/arch/arm/kernel/traps.c linux-3.7-vs2.3.5.1/arch if (!user_mode(regs) || in_interrupt()) { dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp, -diff -NurpP --minimal linux-3.7/arch/cris/Kconfig linux-3.7-vs2.3.5.1/arch/cris/Kconfig ---- linux-3.7/arch/cris/Kconfig 2012-12-11 15:46:01.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/cris/Kconfig 2012-12-11 15:56:32.000000000 +0000 -@@ -670,6 +670,8 @@ source "drivers/staging/Kconfig" +diff -NurpP --minimal linux-3.18.5/arch/cris/Kconfig linux-3.18.5-vs2.3.7.3/arch/cris/Kconfig +--- linux-3.18.5/arch/cris/Kconfig 2014-06-12 13:00:42.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/arch/cris/Kconfig 2015-01-19 10:57:45.000000000 +0000 +@@ -556,6 +556,8 @@ source "fs/Kconfig" source "arch/cris/Kconfig.debug" @@ -256,22 +243,10 @@ diff -NurpP --minimal linux-3.7/arch/cris/Kconfig linux-3.7-vs2.3.5.1/arch/cris/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.7/arch/h8300/Kconfig linux-3.7-vs2.3.5.1/arch/h8300/Kconfig ---- linux-3.7/arch/h8300/Kconfig 2012-12-11 15:46:02.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/h8300/Kconfig 2012-12-11 15:56:32.000000000 +0000 -@@ -217,6 +217,8 @@ source "fs/Kconfig" - - source "arch/h8300/Kconfig.debug" - -+source "kernel/vserver/Kconfig" -+ - source "security/Kconfig" - - source "crypto/Kconfig" -diff -NurpP --minimal linux-3.7/arch/ia64/Kconfig linux-3.7-vs2.3.5.1/arch/ia64/Kconfig ---- linux-3.7/arch/ia64/Kconfig 2012-12-11 15:46:03.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/ia64/Kconfig 2012-12-11 15:56:32.000000000 +0000 -@@ -644,6 +644,8 @@ source "fs/Kconfig" +diff -NurpP --minimal linux-3.18.5/arch/ia64/Kconfig linux-3.18.5-vs2.3.7.3/arch/ia64/Kconfig +--- linux-3.18.5/arch/ia64/Kconfig 2015-01-16 22:18:19.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/arch/ia64/Kconfig 2015-01-19 10:57:45.000000000 +0000 +@@ -636,6 +636,8 @@ source "fs/Kconfig" source "arch/ia64/Kconfig.debug" @@ -280,10 +255,10 @@ diff -NurpP --minimal linux-3.7/arch/ia64/Kconfig linux-3.7-vs2.3.5.1/arch/ia64/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.7/arch/ia64/kernel/entry.S linux-3.7-vs2.3.5.1/arch/ia64/kernel/entry.S ---- linux-3.7/arch/ia64/kernel/entry.S 2012-03-19 18:46:40.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/ia64/kernel/entry.S 2012-12-11 15:56:32.000000000 +0000 -@@ -1714,7 +1714,7 @@ sys_call_table: +diff -NurpP --minimal linux-3.18.5/arch/ia64/kernel/entry.S linux-3.18.5-vs2.3.7.3/arch/ia64/kernel/entry.S +--- linux-3.18.5/arch/ia64/kernel/entry.S 2015-01-17 02:39:35.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/arch/ia64/kernel/entry.S 2015-01-19 10:57:45.000000000 +0000 +@@ -1706,7 +1706,7 @@ sys_call_table: data8 sys_mq_notify data8 sys_mq_getsetattr data8 sys_kexec_load @@ -292,23 +267,9 @@ diff -NurpP --minimal linux-3.7/arch/ia64/kernel/entry.S linux-3.7-vs2.3.5.1/arc data8 sys_waitid // 1270 data8 sys_add_key data8 sys_request_key -diff -NurpP --minimal linux-3.7/arch/ia64/kernel/process.c linux-3.7-vs2.3.5.1/arch/ia64/kernel/process.c ---- linux-3.7/arch/ia64/kernel/process.c 2012-12-11 15:46:03.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/ia64/kernel/process.c 2012-12-11 15:56:32.000000000 +0000 -@@ -111,8 +111,8 @@ show_regs (struct pt_regs *regs) - unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri; - - print_modules(); -- printk("\nPid: %d, CPU %d, comm: %20s\n", task_pid_nr(current), -- smp_processor_id(), current->comm); -+ printk("\nPid: %d[#%u], CPU %d, comm: %20s\n", task_pid_nr(current), -+ current->xid, smp_processor_id(), current->comm); - printk("psr : %016lx ifs : %016lx ip : [<%016lx>] %s (%s)\n", - regs->cr_ipsr, regs->cr_ifs, ip, print_tainted(), - init_utsname()->release); -diff -NurpP --minimal linux-3.7/arch/ia64/kernel/ptrace.c linux-3.7-vs2.3.5.1/arch/ia64/kernel/ptrace.c ---- linux-3.7/arch/ia64/kernel/ptrace.c 2012-05-21 16:06:26.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/ia64/kernel/ptrace.c 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/arch/ia64/kernel/ptrace.c linux-3.18.5-vs2.3.7.3/arch/ia64/kernel/ptrace.c +--- linux-3.18.5/arch/ia64/kernel/ptrace.c 2015-01-17 02:39:35.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/arch/ia64/kernel/ptrace.c 2015-01-19 10:57:45.000000000 +0000 @@ -21,6 +21,7 @@ #include #include @@ -317,16 +278,16 @@ diff -NurpP --minimal linux-3.7/arch/ia64/kernel/ptrace.c linux-3.7-vs2.3.5.1/ar #include #include -diff -NurpP --minimal linux-3.7/arch/ia64/kernel/traps.c linux-3.7-vs2.3.5.1/arch/ia64/kernel/traps.c ---- linux-3.7/arch/ia64/kernel/traps.c 2012-05-21 16:06:26.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/ia64/kernel/traps.c 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/arch/ia64/kernel/traps.c linux-3.18.5-vs2.3.7.3/arch/ia64/kernel/traps.c +--- linux-3.18.5/arch/ia64/kernel/traps.c 2015-01-17 02:39:35.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/arch/ia64/kernel/traps.c 2015-01-19 10:57:45.000000000 +0000 @@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re put_cpu(); if (++die.lock_owner_depth < 3) { - printk("%s[%d]: %s %ld [%d]\n", - current->comm, task_pid_nr(current), str, err, ++die_counter); -+ printk("%s[%d[#%u]]: %s %ld [%d]\n", ++ printk("%s[%d:#%u]: %s %ld [%d]\n", + current->comm, task_pid_nr(current), current->xid, + str, err, ++die_counter); if (notify_die(DIE_OOPS, str, regs, err, 255, SIGSEGV) @@ -338,31 +299,31 @@ diff -NurpP --minimal linux-3.7/arch/ia64/kernel/traps.c linux-3.7-vs2.3.5.1/arc printk(KERN_WARNING - "%s(%d): floating-point assist fault at ip %016lx, isr %016lx\n", - current->comm, task_pid_nr(current), regs->cr_iip + ia64_psr(regs)->ri, isr); -+ "%s(%d[#%u]): floating-point assist fault at ip %016lx, isr %016lx\n", ++ "%s(%d:#%u): floating-point assist fault at ip %016lx, isr %016lx\n", + current->comm, task_pid_nr(current), current->xid, + regs->cr_iip + ia64_psr(regs)->ri, isr); } } } -diff -NurpP --minimal linux-3.7/arch/m32r/kernel/traps.c linux-3.7-vs2.3.5.1/arch/m32r/kernel/traps.c ---- linux-3.7/arch/m32r/kernel/traps.c 2012-05-21 16:06:26.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/m32r/kernel/traps.c 2012-12-11 15:56:32.000000000 +0000 -@@ -195,8 +195,9 @@ static void show_registers(struct pt_reg +diff -NurpP --minimal linux-3.18.5/arch/m32r/kernel/traps.c linux-3.18.5-vs2.3.7.3/arch/m32r/kernel/traps.c +--- linux-3.18.5/arch/m32r/kernel/traps.c 2013-07-14 17:00:26.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/arch/m32r/kernel/traps.c 2015-01-19 10:57:45.000000000 +0000 +@@ -184,8 +184,9 @@ static void show_registers(struct pt_reg } else { printk("SPI: %08lx\n", sp); } - printk("Process %s (pid: %d, process nr: %d, stackpage=%08lx)", - current->comm, task_pid_nr(current), 0xffff & i, 4096+(unsigned long)current); -+ printk("Process %s (pid: %d[#%u], process nr: %d, stackpage=%08lx)", ++ printk("Process %s (pid: %d:#%u, process nr: %d, stackpage=%08lx)", + current->comm, task_pid_nr(current), current->xid, + 0xffff & i, 4096+(unsigned long)current); /* * When in-kernel, we also print out the stack and code at the -diff -NurpP --minimal linux-3.7/arch/m68k/Kconfig linux-3.7-vs2.3.5.1/arch/m68k/Kconfig ---- linux-3.7/arch/m68k/Kconfig 2012-12-11 15:46:03.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/m68k/Kconfig 2012-12-11 15:56:32.000000000 +0000 -@@ -135,6 +135,8 @@ source "fs/Kconfig" +diff -NurpP --minimal linux-3.18.5/arch/m68k/Kconfig linux-3.18.5-vs2.3.7.3/arch/m68k/Kconfig +--- linux-3.18.5/arch/m68k/Kconfig 2014-06-12 13:00:43.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/arch/m68k/Kconfig 2015-01-19 10:57:45.000000000 +0000 +@@ -159,6 +159,8 @@ source "fs/Kconfig" source "arch/m68k/Kconfig.debug" @@ -371,10 +332,10 @@ diff -NurpP --minimal linux-3.7/arch/m68k/Kconfig linux-3.7-vs2.3.5.1/arch/m68k/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.7/arch/mips/Kconfig linux-3.7-vs2.3.5.1/arch/mips/Kconfig ---- linux-3.7/arch/mips/Kconfig 2012-12-11 15:46:05.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/mips/Kconfig 2012-12-11 15:56:32.000000000 +0000 -@@ -2574,6 +2574,8 @@ source "fs/Kconfig" +diff -NurpP --minimal linux-3.18.5/arch/mips/Kconfig linux-3.18.5-vs2.3.7.3/arch/mips/Kconfig +--- linux-3.18.5/arch/mips/Kconfig 2015-01-17 02:39:35.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/arch/mips/Kconfig 2015-01-19 10:57:45.000000000 +0000 +@@ -2712,6 +2712,8 @@ source "fs/Kconfig" source "arch/mips/Kconfig.debug" @@ -383,18 +344,18 @@ diff -NurpP --minimal linux-3.7/arch/mips/Kconfig linux-3.7-vs2.3.5.1/arch/mips/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.7/arch/mips/kernel/ptrace.c linux-3.7-vs2.3.5.1/arch/mips/kernel/ptrace.c ---- linux-3.7/arch/mips/kernel/ptrace.c 2012-07-22 21:38:52.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/mips/kernel/ptrace.c 2012-12-11 15:56:32.000000000 +0000 -@@ -25,6 +25,7 @@ - #include +diff -NurpP --minimal linux-3.18.5/arch/mips/kernel/ptrace.c linux-3.18.5-vs2.3.7.3/arch/mips/kernel/ptrace.c +--- linux-3.18.5/arch/mips/kernel/ptrace.c 2015-01-17 02:39:36.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/arch/mips/kernel/ptrace.c 2015-01-19 10:57:45.000000000 +0000 +@@ -29,6 +29,7 @@ #include #include + #include +#include #include #include -@@ -262,6 +263,9 @@ long arch_ptrace(struct task_struct *chi +@@ -544,6 +545,9 @@ long arch_ptrace(struct task_struct *chi void __user *datavp = (void __user *) data; unsigned long __user *datalp = (void __user *) data; @@ -404,22 +365,22 @@ diff -NurpP --minimal linux-3.7/arch/mips/kernel/ptrace.c linux-3.7-vs2.3.5.1/ar switch (request) { /* when I and D space are separate, these will need to be fixed. */ case PTRACE_PEEKTEXT: /* read word at location addr. */ -diff -NurpP --minimal linux-3.7/arch/mips/kernel/scall32-o32.S linux-3.7-vs2.3.5.1/arch/mips/kernel/scall32-o32.S ---- linux-3.7/arch/mips/kernel/scall32-o32.S 2012-12-11 15:46:07.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/mips/kernel/scall32-o32.S 2012-12-11 15:56:32.000000000 +0000 -@@ -512,7 +512,7 @@ einval: li v0, -ENOSYS - sys sys_mq_timedreceive 5 - sys sys_mq_notify 2 /* 4275 */ - sys sys_mq_getsetattr 3 -- sys sys_ni_syscall 0 /* sys_vserver */ -+ sys sys_vserver 3 - sys sys_waitid 5 - sys sys_ni_syscall 0 /* available, was setaltroot */ - sys sys_add_key 5 /* 4280 */ -diff -NurpP --minimal linux-3.7/arch/mips/kernel/scall64-64.S linux-3.7-vs2.3.5.1/arch/mips/kernel/scall64-64.S ---- linux-3.7/arch/mips/kernel/scall64-64.S 2012-12-11 15:46:07.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/mips/kernel/scall64-64.S 2012-12-11 15:56:32.000000000 +0000 -@@ -351,7 +351,7 @@ sys_call_table: +diff -NurpP --minimal linux-3.18.5/arch/mips/kernel/scall32-o32.S linux-3.18.5-vs2.3.7.3/arch/mips/kernel/scall32-o32.S +--- linux-3.18.5/arch/mips/kernel/scall32-o32.S 2015-01-17 02:39:36.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/arch/mips/kernel/scall32-o32.S 2015-01-19 10:57:45.000000000 +0000 +@@ -501,7 +501,7 @@ EXPORT(sys_call_table) + PTR sys_mq_timedreceive + PTR sys_mq_notify /* 4275 */ + PTR sys_mq_getsetattr +- PTR sys_ni_syscall /* sys_vserver */ ++ PTR sys_vserver + PTR sys_waitid + PTR sys_ni_syscall /* available, was setaltroot */ + PTR sys_add_key /* 4280 */ +diff -NurpP --minimal linux-3.18.5/arch/mips/kernel/scall64-64.S linux-3.18.5-vs2.3.7.3/arch/mips/kernel/scall64-64.S +--- linux-3.18.5/arch/mips/kernel/scall64-64.S 2015-01-17 02:39:36.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/arch/mips/kernel/scall64-64.S 2015-01-19 10:57:45.000000000 +0000 +@@ -355,7 +355,7 @@ EXPORT(sys_call_table) PTR sys_mq_timedreceive PTR sys_mq_notify PTR sys_mq_getsetattr /* 5235 */ @@ -428,10 +389,10 @@ diff -NurpP --minimal linux-3.7/arch/mips/kernel/scall64-64.S linux-3.7-vs2.3.5. PTR sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key -diff -NurpP --minimal linux-3.7/arch/mips/kernel/scall64-n32.S linux-3.7-vs2.3.5.1/arch/mips/kernel/scall64-n32.S ---- linux-3.7/arch/mips/kernel/scall64-n32.S 2012-12-11 15:46:07.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/mips/kernel/scall64-n32.S 2012-12-11 15:56:32.000000000 +0000 -@@ -350,7 +350,7 @@ EXPORT(sysn32_call_table) +diff -NurpP --minimal linux-3.18.5/arch/mips/kernel/scall64-n32.S linux-3.18.5-vs2.3.7.3/arch/mips/kernel/scall64-n32.S +--- linux-3.18.5/arch/mips/kernel/scall64-n32.S 2015-01-17 02:39:36.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/arch/mips/kernel/scall64-n32.S 2015-01-19 10:57:45.000000000 +0000 +@@ -348,7 +348,7 @@ EXPORT(sysn32_call_table) PTR compat_sys_mq_timedreceive PTR compat_sys_mq_notify PTR compat_sys_mq_getsetattr @@ -440,22 +401,22 @@ diff -NurpP --minimal linux-3.7/arch/mips/kernel/scall64-n32.S linux-3.7-vs2.3.5 PTR compat_sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key -diff -NurpP --minimal linux-3.7/arch/mips/kernel/scall64-o32.S linux-3.7-vs2.3.5.1/arch/mips/kernel/scall64-o32.S ---- linux-3.7/arch/mips/kernel/scall64-o32.S 2012-12-11 15:46:07.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/mips/kernel/scall64-o32.S 2012-12-11 15:56:32.000000000 +0000 -@@ -469,7 +469,7 @@ sys_call_table: +diff -NurpP --minimal linux-3.18.5/arch/mips/kernel/scall64-o32.S linux-3.18.5-vs2.3.7.3/arch/mips/kernel/scall64-o32.S +--- linux-3.18.5/arch/mips/kernel/scall64-o32.S 2015-01-17 02:39:36.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/arch/mips/kernel/scall64-o32.S 2015-01-19 10:57:45.000000000 +0000 +@@ -486,7 +486,7 @@ EXPORT(sys32_call_table) PTR compat_sys_mq_timedreceive PTR compat_sys_mq_notify /* 4275 */ PTR compat_sys_mq_getsetattr - PTR sys_ni_syscall /* sys_vserver */ + PTR sys32_vserver - PTR sys_32_waitid + PTR compat_sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key /* 4280 */ -diff -NurpP --minimal linux-3.7/arch/mips/kernel/traps.c linux-3.7-vs2.3.5.1/arch/mips/kernel/traps.c ---- linux-3.7/arch/mips/kernel/traps.c 2012-10-04 13:26:53.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/mips/kernel/traps.c 2012-12-11 15:56:32.000000000 +0000 -@@ -347,9 +347,10 @@ void show_registers(struct pt_regs *regs +diff -NurpP --minimal linux-3.18.5/arch/mips/kernel/traps.c linux-3.18.5-vs2.3.7.3/arch/mips/kernel/traps.c +--- linux-3.18.5/arch/mips/kernel/traps.c 2015-01-16 22:18:20.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/arch/mips/kernel/traps.c 2015-01-19 10:57:45.000000000 +0000 +@@ -341,9 +341,10 @@ void show_registers(struct pt_regs *regs __show_regs(regs); print_modules(); @@ -469,22 +430,22 @@ diff -NurpP --minimal linux-3.7/arch/mips/kernel/traps.c linux-3.7-vs2.3.5.1/arc if (cpu_has_userlocal) { unsigned long tls; -diff -NurpP --minimal linux-3.7/arch/parisc/Kconfig linux-3.7-vs2.3.5.1/arch/parisc/Kconfig ---- linux-3.7/arch/parisc/Kconfig 2012-12-11 15:46:08.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/parisc/Kconfig 2012-12-11 15:56:32.000000000 +0000 -@@ -284,6 +284,8 @@ source "fs/Kconfig" +diff -NurpP --minimal linux-3.18.5/arch/parisc/Kconfig linux-3.18.5-vs2.3.7.3/arch/parisc/Kconfig +--- linux-3.18.5/arch/parisc/Kconfig 2015-01-16 22:18:21.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/arch/parisc/Kconfig 2015-01-19 10:57:45.000000000 +0000 +@@ -337,6 +337,8 @@ config SECCOMP - source "arch/parisc/Kconfig.debug" + If unsure, say Y. Only embedded should say N here. +source "kernel/vserver/Kconfig" + source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.7/arch/parisc/kernel/syscall_table.S linux-3.7-vs2.3.5.1/arch/parisc/kernel/syscall_table.S ---- linux-3.7/arch/parisc/kernel/syscall_table.S 2012-12-11 15:46:09.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/parisc/kernel/syscall_table.S 2012-12-11 15:56:32.000000000 +0000 -@@ -361,7 +361,7 @@ +diff -NurpP --minimal linux-3.18.5/arch/parisc/kernel/syscall_table.S linux-3.18.5-vs2.3.7.3/arch/parisc/kernel/syscall_table.S +--- linux-3.18.5/arch/parisc/kernel/syscall_table.S 2015-01-17 02:39:36.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/arch/parisc/kernel/syscall_table.S 2015-01-19 10:57:45.000000000 +0000 +@@ -358,7 +358,7 @@ ENTRY_COMP(mbind) /* 260 */ ENTRY_COMP(get_mempolicy) ENTRY_COMP(set_mempolicy) @@ -493,22 +454,22 @@ diff -NurpP --minimal linux-3.7/arch/parisc/kernel/syscall_table.S linux-3.7-vs2 ENTRY_SAME(add_key) ENTRY_SAME(request_key) /* 265 */ ENTRY_SAME(keyctl) -diff -NurpP --minimal linux-3.7/arch/parisc/kernel/traps.c linux-3.7-vs2.3.5.1/arch/parisc/kernel/traps.c ---- linux-3.7/arch/parisc/kernel/traps.c 2012-05-21 16:06:28.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/parisc/kernel/traps.c 2012-12-11 15:56:32.000000000 +0000 -@@ -235,8 +235,9 @@ void die_if_kernel(char *str, struct pt_ - if (err == 0) +diff -NurpP --minimal linux-3.18.5/arch/parisc/kernel/traps.c linux-3.18.5-vs2.3.7.3/arch/parisc/kernel/traps.c +--- linux-3.18.5/arch/parisc/kernel/traps.c 2014-06-12 13:01:26.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/arch/parisc/kernel/traps.c 2015-01-19 10:57:45.000000000 +0000 +@@ -239,8 +239,9 @@ void die_if_kernel(char *str, struct pt_ return; /* STFU */ -- printk(KERN_CRIT "%s (pid %d): %s (code %ld) at " RFMT "\n", + parisc_printk_ratelimited(1, regs, +- KERN_CRIT "%s (pid %d): %s (code %ld) at " RFMT "\n", - current->comm, task_pid_nr(current), str, err, regs->iaoq[0]); -+ printk(KERN_CRIT "%s (pid %d:#%u): %s (code %ld) at " RFMT "\n", ++ KERN_CRIT "%s (pid %d:#%u): %s (code %ld) at " RFMT "\n", + current->comm, task_pid_nr(current), current->xid, + str, err, regs->iaoq[0]); - #ifdef PRINT_USER_FAULTS - /* XXX for debugging only */ - show_regs(regs); -@@ -269,8 +270,8 @@ void die_if_kernel(char *str, struct pt_ + + return; + } +@@ -270,8 +271,8 @@ void die_if_kernel(char *str, struct pt_ pdc_console_restart(); if (err) @@ -519,25 +480,10 @@ diff -NurpP --minimal linux-3.7/arch/parisc/kernel/traps.c linux-3.7-vs2.3.5.1/a /* Wot's wrong wif bein' racy? */ if (current->thread.flags & PARISC_KERNEL_DEATH) { -diff -NurpP --minimal linux-3.7/arch/parisc/mm/fault.c linux-3.7-vs2.3.5.1/arch/parisc/mm/fault.c ---- linux-3.7/arch/parisc/mm/fault.c 2010-08-02 14:52:06.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/parisc/mm/fault.c 2012-12-11 15:56:32.000000000 +0000 -@@ -237,8 +237,9 @@ bad_area: - - #ifdef PRINT_USER_FAULTS - printk(KERN_DEBUG "\n"); -- printk(KERN_DEBUG "do_page_fault() pid=%d command='%s' type=%lu address=0x%08lx\n", -- task_pid_nr(tsk), tsk->comm, code, address); -+ printk(KERN_DEBUG "do_page_fault() pid=%d:#%u " -+ "command='%s' type=%lu address=0x%08lx\n", -+ task_pid_nr(tsk), tsk->xid, tsk->comm, code, address); - if (vma) { - printk(KERN_DEBUG "vm_start = 0x%08lx, vm_end = 0x%08lx\n", - vma->vm_start, vma->vm_end); -diff -NurpP --minimal linux-3.7/arch/powerpc/Kconfig linux-3.7-vs2.3.5.1/arch/powerpc/Kconfig ---- linux-3.7/arch/powerpc/Kconfig 2012-12-11 15:46:09.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/powerpc/Kconfig 2012-12-11 15:56:32.000000000 +0000 -@@ -1014,6 +1014,8 @@ source "lib/Kconfig" +diff -NurpP --minimal linux-3.18.5/arch/powerpc/Kconfig linux-3.18.5-vs2.3.7.3/arch/powerpc/Kconfig +--- linux-3.18.5/arch/powerpc/Kconfig 2015-01-17 02:39:36.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/arch/powerpc/Kconfig 2015-01-19 10:57:46.000000000 +0000 +@@ -1068,6 +1068,8 @@ source "lib/Kconfig" source "arch/powerpc/Kconfig.debug" @@ -546,9 +492,9 @@ diff -NurpP --minimal linux-3.7/arch/powerpc/Kconfig linux-3.7-vs2.3.5.1/arch/po source "security/Kconfig" config KEYS_COMPAT -diff -NurpP --minimal linux-3.7/arch/powerpc/include/uapi/asm/unistd.h linux-3.7-vs2.3.5.1/arch/powerpc/include/uapi/asm/unistd.h ---- linux-3.7/arch/powerpc/include/uapi/asm/unistd.h 2012-12-11 15:46:10.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/powerpc/include/uapi/asm/unistd.h 2012-12-11 16:48:48.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/arch/powerpc/include/uapi/asm/unistd.h linux-3.18.5-vs2.3.7.3/arch/powerpc/include/uapi/asm/unistd.h +--- linux-3.18.5/arch/powerpc/include/uapi/asm/unistd.h 2015-01-17 02:39:36.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/arch/powerpc/include/uapi/asm/unistd.h 2015-01-19 10:57:46.000000000 +0000 @@ -275,7 +275,7 @@ #endif #define __NR_rtas 255 @@ -558,40 +504,25 @@ diff -NurpP --minimal linux-3.7/arch/powerpc/include/uapi/asm/unistd.h linux-3.7 #define __NR_migrate_pages 258 #define __NR_mbind 259 #define __NR_get_mempolicy 260 -diff -NurpP --minimal linux-3.7/arch/powerpc/kernel/process.c linux-3.7-vs2.3.5.1/arch/powerpc/kernel/process.c ---- linux-3.7/arch/powerpc/kernel/process.c 2012-12-11 15:46:10.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/powerpc/kernel/process.c 2012-12-11 15:56:32.000000000 +0000 -@@ -660,8 +660,9 @@ void show_regs(struct pt_regs * regs) - #else - printk("DAR: "REG", DSISR: %08lx\n", regs->dar, regs->dsisr); - #endif -- printk("TASK = %p[%d] '%s' THREAD: %p", -- current, task_pid_nr(current), current->comm, task_thread_info(current)); -+ printk("TASK = %p[%d,#%u] '%s' THREAD: %p", -+ current, task_pid_nr(current), current->xid, -+ current->comm, task_thread_info(current)); - - #ifdef CONFIG_SMP - printk(" CPU: %d", raw_smp_processor_id()); -diff -NurpP --minimal linux-3.7/arch/powerpc/kernel/traps.c linux-3.7-vs2.3.5.1/arch/powerpc/kernel/traps.c ---- linux-3.7/arch/powerpc/kernel/traps.c 2012-12-11 15:46:10.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/powerpc/kernel/traps.c 2012-12-11 15:56:32.000000000 +0000 -@@ -1120,8 +1120,9 @@ void nonrecoverable_exception(struct pt_ +diff -NurpP --minimal linux-3.18.5/arch/powerpc/kernel/traps.c linux-3.18.5-vs2.3.7.3/arch/powerpc/kernel/traps.c +--- linux-3.18.5/arch/powerpc/kernel/traps.c 2015-01-16 22:18:21.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/arch/powerpc/kernel/traps.c 2015-01-19 10:57:46.000000000 +0000 +@@ -1313,8 +1313,9 @@ void nonrecoverable_exception(struct pt_ void trace_syscall(struct pt_regs *regs) { - printk("Task: %p(%d), PC: %08lX/%08lX, Syscall: %3ld, Result: %s%ld %s\n", - current, task_pid_nr(current), regs->nip, regs->link, regs->gpr[0], -+ printk("Task: %p(%d[#%u]), PC: %08lX/%08lX, Syscall: %3ld, Result: %s%ld %s\n", ++ printk("Task: %p(%d:#%u), PC: %08lX/%08lX, Syscall: %3ld, Result: %s%ld %s\n", + current, task_pid_nr(current), current->xid, + regs->nip, regs->link, regs->gpr[0], regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted()); } -diff -NurpP --minimal linux-3.7/arch/s390/Kconfig linux-3.7-vs2.3.5.1/arch/s390/Kconfig ---- linux-3.7/arch/s390/Kconfig 2012-12-11 15:46:14.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/s390/Kconfig 2012-12-11 15:56:32.000000000 +0000 -@@ -530,6 +530,8 @@ source "fs/Kconfig" +diff -NurpP --minimal linux-3.18.5/arch/s390/Kconfig linux-3.18.5-vs2.3.7.3/arch/s390/Kconfig +--- linux-3.18.5/arch/s390/Kconfig 2015-01-17 02:39:40.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/arch/s390/Kconfig 2015-01-19 10:57:46.000000000 +0000 +@@ -652,6 +652,8 @@ source "fs/Kconfig" source "arch/s390/Kconfig.debug" @@ -600,9 +531,9 @@ diff -NurpP --minimal linux-3.7/arch/s390/Kconfig linux-3.7-vs2.3.5.1/arch/s390/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.7/arch/s390/include/asm/tlb.h linux-3.7-vs2.3.5.1/arch/s390/include/asm/tlb.h ---- linux-3.7/arch/s390/include/asm/tlb.h 2012-12-11 15:46:14.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/s390/include/asm/tlb.h 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/arch/s390/include/asm/tlb.h linux-3.18.5-vs2.3.7.3/arch/s390/include/asm/tlb.h +--- linux-3.18.5/arch/s390/include/asm/tlb.h 2015-01-17 02:39:41.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/arch/s390/include/asm/tlb.h 2015-01-19 10:57:46.000000000 +0000 @@ -24,6 +24,7 @@ #include #include @@ -611,9 +542,9 @@ diff -NurpP --minimal linux-3.7/arch/s390/include/asm/tlb.h linux-3.7-vs2.3.5.1/ #include #include #include -diff -NurpP --minimal linux-3.7/arch/s390/include/uapi/asm/unistd.h linux-3.7-vs2.3.5.1/arch/s390/include/uapi/asm/unistd.h ---- linux-3.7/arch/s390/include/uapi/asm/unistd.h 2012-12-11 15:46:14.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/s390/include/uapi/asm/unistd.h 2012-12-11 16:47:45.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/arch/s390/include/uapi/asm/unistd.h linux-3.18.5-vs2.3.7.3/arch/s390/include/uapi/asm/unistd.h +--- linux-3.18.5/arch/s390/include/uapi/asm/unistd.h 2015-01-17 02:39:41.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/arch/s390/include/uapi/asm/unistd.h 2015-01-19 10:57:46.000000000 +0000 @@ -200,7 +200,7 @@ #define __NR_clock_gettime (__NR_timer_create+6) #define __NR_clock_getres (__NR_timer_create+7) @@ -623,9 +554,9 @@ diff -NurpP --minimal linux-3.7/arch/s390/include/uapi/asm/unistd.h linux-3.7-vs #define __NR_statfs64 265 #define __NR_fstatfs64 266 #define __NR_remap_file_pages 267 -diff -NurpP --minimal linux-3.7/arch/s390/kernel/ptrace.c linux-3.7-vs2.3.5.1/arch/s390/kernel/ptrace.c ---- linux-3.7/arch/s390/kernel/ptrace.c 2012-12-11 15:46:15.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/s390/kernel/ptrace.c 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/arch/s390/kernel/ptrace.c linux-3.18.5-vs2.3.7.3/arch/s390/kernel/ptrace.c +--- linux-3.18.5/arch/s390/kernel/ptrace.c 2015-01-17 02:39:41.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/arch/s390/kernel/ptrace.c 2015-01-19 10:57:46.000000000 +0000 @@ -21,6 +21,7 @@ #include #include @@ -634,22 +565,22 @@ diff -NurpP --minimal linux-3.7/arch/s390/kernel/ptrace.c linux-3.7-vs2.3.5.1/ar #include #include #include -diff -NurpP --minimal linux-3.7/arch/s390/kernel/syscalls.S linux-3.7-vs2.3.5.1/arch/s390/kernel/syscalls.S ---- linux-3.7/arch/s390/kernel/syscalls.S 2012-12-11 15:46:15.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/s390/kernel/syscalls.S 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/arch/s390/kernel/syscalls.S linux-3.18.5-vs2.3.7.3/arch/s390/kernel/syscalls.S +--- linux-3.18.5/arch/s390/kernel/syscalls.S 2015-01-17 02:39:41.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/arch/s390/kernel/syscalls.S 2015-01-19 11:00:51.000000000 +0000 @@ -271,7 +271,7 @@ SYSCALL(sys_clock_settime,sys_clock_sett - SYSCALL(sys_clock_gettime,sys_clock_gettime,sys32_clock_gettime_wrapper) /* 260 */ - SYSCALL(sys_clock_getres,sys_clock_getres,sys32_clock_getres_wrapper) - SYSCALL(sys_clock_nanosleep,sys_clock_nanosleep,sys32_clock_nanosleep_wrapper) + SYSCALL(sys_clock_gettime,sys_clock_gettime,compat_sys_clock_gettime) /* 260 */ + SYSCALL(sys_clock_getres,sys_clock_getres,compat_sys_clock_getres) + SYSCALL(sys_clock_nanosleep,sys_clock_nanosleep,compat_sys_clock_nanosleep) -NI_SYSCALL /* reserved for vserver */ +SYSCALL(sys_vserver,sys_vserver,sys32_vserver) - SYSCALL(sys_s390_fadvise64_64,sys_ni_syscall,sys32_fadvise64_64_wrapper) - SYSCALL(sys_statfs64,sys_statfs64,compat_sys_statfs64_wrapper) - SYSCALL(sys_fstatfs64,sys_fstatfs64,compat_sys_fstatfs64_wrapper) -diff -NurpP --minimal linux-3.7/arch/sh/Kconfig linux-3.7-vs2.3.5.1/arch/sh/Kconfig ---- linux-3.7/arch/sh/Kconfig 2012-12-11 15:46:15.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/sh/Kconfig 2012-12-11 15:56:32.000000000 +0000 -@@ -945,6 +945,8 @@ source "fs/Kconfig" + SYSCALL(sys_s390_fadvise64_64,sys_ni_syscall,compat_sys_s390_fadvise64_64) + SYSCALL(sys_statfs64,sys_statfs64,compat_sys_statfs64) + SYSCALL(sys_fstatfs64,sys_fstatfs64,compat_sys_fstatfs64) +diff -NurpP --minimal linux-3.18.5/arch/sh/Kconfig linux-3.18.5-vs2.3.7.3/arch/sh/Kconfig +--- linux-3.18.5/arch/sh/Kconfig 2015-01-16 22:18:23.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/arch/sh/Kconfig 2015-01-19 10:57:46.000000000 +0000 +@@ -878,6 +878,8 @@ source "fs/Kconfig" source "arch/sh/Kconfig.debug" @@ -658,9 +589,9 @@ diff -NurpP --minimal linux-3.7/arch/sh/Kconfig linux-3.7-vs2.3.5.1/arch/sh/Kcon source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.7/arch/sh/kernel/irq.c linux-3.7-vs2.3.5.1/arch/sh/kernel/irq.c ---- linux-3.7/arch/sh/kernel/irq.c 2012-10-04 13:26:56.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/sh/kernel/irq.c 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/arch/sh/kernel/irq.c linux-3.18.5-vs2.3.7.3/arch/sh/kernel/irq.c +--- linux-3.18.5/arch/sh/kernel/irq.c 2014-06-12 13:01:29.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/arch/sh/kernel/irq.c 2015-01-19 10:57:46.000000000 +0000 @@ -14,6 +14,7 @@ #include #include @@ -669,10 +600,10 @@ diff -NurpP --minimal linux-3.7/arch/sh/kernel/irq.c linux-3.7-vs2.3.5.1/arch/sh #include #include #include -diff -NurpP --minimal linux-3.7/arch/sparc/Kconfig linux-3.7-vs2.3.5.1/arch/sparc/Kconfig ---- linux-3.7/arch/sparc/Kconfig 2012-12-11 15:46:15.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/sparc/Kconfig 2012-12-11 15:56:32.000000000 +0000 -@@ -564,6 +564,8 @@ source "fs/Kconfig" +diff -NurpP --minimal linux-3.18.5/arch/sparc/Kconfig linux-3.18.5-vs2.3.7.3/arch/sparc/Kconfig +--- linux-3.18.5/arch/sparc/Kconfig 2015-01-17 02:39:41.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/arch/sparc/Kconfig 2015-01-19 10:57:46.000000000 +0000 +@@ -557,6 +557,8 @@ source "fs/Kconfig" source "arch/sparc/Kconfig.debug" @@ -681,9 +612,9 @@ diff -NurpP --minimal linux-3.7/arch/sparc/Kconfig linux-3.7-vs2.3.5.1/arch/spar source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.7/arch/sparc/include/uapi/asm/unistd.h linux-3.7-vs2.3.5.1/arch/sparc/include/uapi/asm/unistd.h ---- linux-3.7/arch/sparc/include/uapi/asm/unistd.h 2012-12-11 15:46:16.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/sparc/include/uapi/asm/unistd.h 2012-12-11 16:43:01.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/arch/sparc/include/uapi/asm/unistd.h linux-3.18.5-vs2.3.7.3/arch/sparc/include/uapi/asm/unistd.h +--- linux-3.18.5/arch/sparc/include/uapi/asm/unistd.h 2015-01-17 02:39:41.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/arch/sparc/include/uapi/asm/unistd.h 2015-01-19 10:57:46.000000000 +0000 @@ -332,7 +332,7 @@ #define __NR_timer_getoverrun 264 #define __NR_timer_delete 265 @@ -693,9 +624,9 @@ diff -NurpP --minimal linux-3.7/arch/sparc/include/uapi/asm/unistd.h linux-3.7-v #define __NR_io_setup 268 #define __NR_io_destroy 269 #define __NR_io_submit 270 -diff -NurpP --minimal linux-3.7/arch/sparc/kernel/systbls_32.S linux-3.7-vs2.3.5.1/arch/sparc/kernel/systbls_32.S ---- linux-3.7/arch/sparc/kernel/systbls_32.S 2012-12-11 15:46:17.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/sparc/kernel/systbls_32.S 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/arch/sparc/kernel/systbls_32.S linux-3.18.5-vs2.3.7.3/arch/sparc/kernel/systbls_32.S +--- linux-3.18.5/arch/sparc/kernel/systbls_32.S 2015-01-17 02:39:41.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/arch/sparc/kernel/systbls_32.S 2015-01-19 10:57:46.000000000 +0000 @@ -70,7 +70,7 @@ sys_call_table: /*250*/ .long sys_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_ni_syscall /*255*/ .long sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep @@ -705,19 +636,19 @@ diff -NurpP --minimal linux-3.7/arch/sparc/kernel/systbls_32.S linux-3.7-vs2.3.5 /*270*/ .long sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink /*275*/ .long sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid /*280*/ .long sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat -diff -NurpP --minimal linux-3.7/arch/sparc/kernel/systbls_64.S linux-3.7-vs2.3.5.1/arch/sparc/kernel/systbls_64.S ---- linux-3.7/arch/sparc/kernel/systbls_64.S 2012-12-11 15:46:17.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/sparc/kernel/systbls_64.S 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/arch/sparc/kernel/systbls_64.S linux-3.18.5-vs2.3.7.3/arch/sparc/kernel/systbls_64.S +--- linux-3.18.5/arch/sparc/kernel/systbls_64.S 2015-01-17 02:39:41.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/arch/sparc/kernel/systbls_64.S 2015-01-19 10:57:46.000000000 +0000 @@ -71,7 +71,7 @@ sys_call_table32: - /*250*/ .word sys_mremap, compat_sys_sysctl, sys32_getsid, sys_fdatasync, sys_nis_syscall + /*250*/ .word sys_mremap, compat_sys_sysctl, sys_getsid, sys_fdatasync, sys_nis_syscall .word sys32_sync_file_range, compat_sys_clock_settime, compat_sys_clock_gettime, compat_sys_clock_getres, sys32_clock_nanosleep /*260*/ .word compat_sys_sched_getaffinity, compat_sys_sched_setaffinity, sys32_timer_settime, compat_sys_timer_gettime, sys_timer_getoverrun - .word sys_timer_delete, compat_sys_timer_create, sys_ni_syscall, compat_sys_io_setup, sys_io_destroy + .word sys_timer_delete, compat_sys_timer_create, sys32_vserver, compat_sys_io_setup, sys_io_destroy /*270*/ .word sys32_io_submit, sys_io_cancel, compat_sys_io_getevents, sys32_mq_open, sys_mq_unlink .word compat_sys_mq_timedsend, compat_sys_mq_timedreceive, compat_sys_mq_notify, compat_sys_mq_getsetattr, compat_sys_waitid - /*280*/ .word sys32_tee, sys_add_key, sys_request_key, compat_sys_keyctl, compat_sys_openat -@@ -149,7 +149,7 @@ sys_call_table: + /*280*/ .word sys_tee, sys_add_key, sys_request_key, compat_sys_keyctl, compat_sys_openat +@@ -150,7 +150,7 @@ sys_call_table: /*250*/ .word sys_64_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nis_syscall .word sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep /*260*/ .word sys_sched_getaffinity, sys_sched_setaffinity, sys_timer_settime, sys_timer_gettime, sys_timer_getoverrun @@ -726,9 +657,9 @@ diff -NurpP --minimal linux-3.7/arch/sparc/kernel/systbls_64.S linux-3.7-vs2.3.5 /*270*/ .word sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink .word sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid /*280*/ .word sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat -diff -NurpP --minimal linux-3.7/arch/um/Kconfig.rest linux-3.7-vs2.3.5.1/arch/um/Kconfig.rest ---- linux-3.7/arch/um/Kconfig.rest 2012-01-09 15:14:09.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/um/Kconfig.rest 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/arch/um/Kconfig.rest linux-3.18.5-vs2.3.7.3/arch/um/Kconfig.rest +--- linux-3.18.5/arch/um/Kconfig.rest 2012-12-11 03:30:57.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/arch/um/Kconfig.rest 2015-01-19 10:57:46.000000000 +0000 @@ -12,6 +12,8 @@ source "arch/um/Kconfig.net" source "fs/Kconfig" @@ -738,59 +669,10 @@ diff -NurpP --minimal linux-3.7/arch/um/Kconfig.rest linux-3.7-vs2.3.5.1/arch/um source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.7/arch/um/include/shared/kern_constants.h linux-3.7-vs2.3.5.1/arch/um/include/shared/kern_constants.h ---- linux-3.7/arch/um/include/shared/kern_constants.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/um/include/shared/kern_constants.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1 @@ -+#include "../../../../include/generated/asm-offsets.h" -diff -NurpP --minimal linux-3.7/arch/um/include/shared/user_constants.h linux-3.7-vs2.3.5.1/arch/um/include/shared/user_constants.h ---- linux-3.7/arch/um/include/shared/user_constants.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/um/include/shared/user_constants.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,40 @@ -+/* -+ * DO NOT MODIFY. -+ * -+ * This file was generated by arch/um/Makefile -+ * -+ */ -+ -+#define HOST_SC_CR2 176 /* offsetof(struct sigcontext, cr2) # */ -+#define HOST_SC_ERR 152 /* offsetof(struct sigcontext, err) # */ -+#define HOST_SC_TRAPNO 160 /* offsetof(struct sigcontext, trapno) # */ -+#define HOST_FP_SIZE 64 /* sizeof(struct _fpstate) / sizeof(unsigned long) # */ -+#define HOST_RBX 5 /* RBX # */ -+#define HOST_RCX 11 /* RCX # */ -+#define HOST_RDI 14 /* RDI # */ -+#define HOST_RSI 13 /* RSI # */ -+#define HOST_RDX 12 /* RDX # */ -+#define HOST_RBP 4 /* RBP # */ -+#define HOST_RAX 10 /* RAX # */ -+#define HOST_R8 9 /* R8 # */ -+#define HOST_R9 8 /* R9 # */ -+#define HOST_R10 7 /* R10 # */ -+#define HOST_R11 6 /* R11 # */ -+#define HOST_R12 3 /* R12 # */ -+#define HOST_R13 2 /* R13 # */ -+#define HOST_R14 1 /* R14 # */ -+#define HOST_R15 0 /* R15 # */ -+#define HOST_ORIG_RAX 15 /* ORIG_RAX # */ -+#define HOST_CS 17 /* CS # */ -+#define HOST_SS 20 /* SS # */ -+#define HOST_EFLAGS 18 /* EFLAGS # */ -+#define HOST_IP 16 /* RIP # */ -+#define HOST_SP 19 /* RSP # */ -+#define UM_FRAME_SIZE 216 /* sizeof(struct user_regs_struct) # */ -+#define UM_POLLIN 1 /* POLLIN # */ -+#define UM_POLLPRI 2 /* POLLPRI # */ -+#define UM_POLLOUT 4 /* POLLOUT # */ -+#define UM_PROT_READ 1 /* PROT_READ # */ -+#define UM_PROT_WRITE 2 /* PROT_WRITE # */ -+#define UM_PROT_EXEC 4 /* PROT_EXEC # */ -+ -diff -NurpP --minimal linux-3.7/arch/x86/Kconfig linux-3.7-vs2.3.5.1/arch/x86/Kconfig ---- linux-3.7/arch/x86/Kconfig 2012-12-11 15:46:18.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/x86/Kconfig 2012-12-11 15:56:32.000000000 +0000 -@@ -2248,6 +2248,8 @@ source "fs/Kconfig" +diff -NurpP --minimal linux-3.18.5/arch/x86/Kconfig linux-3.18.5-vs2.3.7.3/arch/x86/Kconfig +--- linux-3.18.5/arch/x86/Kconfig 2015-02-05 18:02:39.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/arch/x86/Kconfig 2015-02-05 18:08:00.000000000 +0000 +@@ -2506,6 +2506,8 @@ source "fs/Kconfig" source "arch/x86/Kconfig.debug" @@ -799,9 +681,9 @@ diff -NurpP --minimal linux-3.7/arch/x86/Kconfig linux-3.7-vs2.3.5.1/arch/x86/Kc source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.7/arch/x86/syscalls/syscall_32.tbl linux-3.7-vs2.3.5.1/arch/x86/syscalls/syscall_32.tbl ---- linux-3.7/arch/x86/syscalls/syscall_32.tbl 2012-12-11 15:46:21.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/x86/syscalls/syscall_32.tbl 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/arch/x86/syscalls/syscall_32.tbl linux-3.18.5-vs2.3.7.3/arch/x86/syscalls/syscall_32.tbl +--- linux-3.18.5/arch/x86/syscalls/syscall_32.tbl 2015-01-17 02:39:43.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/arch/x86/syscalls/syscall_32.tbl 2015-01-19 10:57:46.000000000 +0000 @@ -279,7 +279,7 @@ 270 i386 tgkill sys_tgkill 271 i386 utimes sys_utimes compat_sys_utimes @@ -811,9 +693,9 @@ diff -NurpP --minimal linux-3.7/arch/x86/syscalls/syscall_32.tbl linux-3.7-vs2.3 274 i386 mbind sys_mbind 275 i386 get_mempolicy sys_get_mempolicy compat_sys_get_mempolicy 276 i386 set_mempolicy sys_set_mempolicy -diff -NurpP --minimal linux-3.7/arch/x86/syscalls/syscall_64.tbl linux-3.7-vs2.3.5.1/arch/x86/syscalls/syscall_64.tbl ---- linux-3.7/arch/x86/syscalls/syscall_64.tbl 2012-10-04 13:27:01.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/x86/syscalls/syscall_64.tbl 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/arch/x86/syscalls/syscall_64.tbl linux-3.18.5-vs2.3.7.3/arch/x86/syscalls/syscall_64.tbl +--- linux-3.18.5/arch/x86/syscalls/syscall_64.tbl 2015-01-17 02:39:43.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/arch/x86/syscalls/syscall_64.tbl 2015-01-19 10:57:46.000000000 +0000 @@ -242,7 +242,7 @@ 233 common epoll_ctl sys_epoll_ctl 234 common tgkill sys_tgkill @@ -823,10 +705,39 @@ diff -NurpP --minimal linux-3.7/arch/x86/syscalls/syscall_64.tbl linux-3.7-vs2.3 237 common mbind sys_mbind 238 common set_mempolicy sys_set_mempolicy 239 common get_mempolicy sys_get_mempolicy -diff -NurpP --minimal linux-3.7/drivers/block/Kconfig linux-3.7-vs2.3.5.1/drivers/block/Kconfig ---- linux-3.7/drivers/block/Kconfig 2012-12-11 15:46:23.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/drivers/block/Kconfig 2012-12-11 15:56:32.000000000 +0000 -@@ -291,6 +291,13 @@ config BLK_DEV_CRYPTOLOOP +diff -NurpP --minimal linux-3.18.5/block/ioprio.c linux-3.18.5-vs2.3.7.3/block/ioprio.c +--- linux-3.18.5/block/ioprio.c 2015-01-17 02:39:43.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/block/ioprio.c 2015-01-19 13:00:07.000000000 +0000 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + int set_task_ioprio(struct task_struct *task, int ioprio) + { +@@ -105,6 +106,8 @@ SYSCALL_DEFINE3(ioprio_set, int, which, + else + pgrp = find_vpid(who); + do_each_pid_thread(pgrp, PIDTYPE_PGID, p) { ++ if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT)) ++ continue; + ret = set_task_ioprio(p, ioprio); + if (ret) + break; +@@ -200,6 +203,8 @@ SYSCALL_DEFINE2(ioprio_get, int, which, + else + pgrp = find_vpid(who); + do_each_pid_thread(pgrp, PIDTYPE_PGID, p) { ++ if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT)) ++ continue; + tmpio = get_task_ioprio(p); + if (tmpio < 0) + continue; +diff -NurpP --minimal linux-3.18.5/drivers/block/Kconfig linux-3.18.5-vs2.3.7.3/drivers/block/Kconfig +--- linux-3.18.5/drivers/block/Kconfig 2014-06-12 11:33:19.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/drivers/block/Kconfig 2015-01-19 10:57:46.000000000 +0000 +@@ -283,6 +283,13 @@ config BLK_DEV_CRYPTOLOOP source "drivers/block/drbd/Kconfig" @@ -840,29 +751,29 @@ diff -NurpP --minimal linux-3.7/drivers/block/Kconfig linux-3.7-vs2.3.5.1/driver config BLK_DEV_NBD tristate "Network block device support" depends on NET -diff -NurpP --minimal linux-3.7/drivers/block/Makefile linux-3.7-vs2.3.5.1/drivers/block/Makefile ---- linux-3.7/drivers/block/Makefile 2012-12-11 15:46:23.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/drivers/block/Makefile 2012-12-11 15:56:32.000000000 +0000 -@@ -34,6 +34,7 @@ obj-$(CONFIG_VIRTIO_BLK) += virtio_blk.o - obj-$(CONFIG_VIODASD) += viodasd.o +diff -NurpP --minimal linux-3.18.5/drivers/block/Makefile linux-3.18.5-vs2.3.7.3/drivers/block/Makefile +--- linux-3.18.5/drivers/block/Makefile 2014-06-12 11:33:19.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/drivers/block/Makefile 2015-01-19 10:57:46.000000000 +0000 +@@ -33,6 +33,7 @@ obj-$(CONFIG_VIRTIO_BLK) += virtio_blk.o + obj-$(CONFIG_BLK_DEV_SX8) += sx8.o obj-$(CONFIG_BLK_DEV_HD) += hd.o +obj-$(CONFIG_BLK_DEV_VROOT) += vroot.o obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/ -diff -NurpP --minimal linux-3.7/drivers/block/loop.c linux-3.7-vs2.3.5.1/drivers/block/loop.c ---- linux-3.7/drivers/block/loop.c 2012-12-11 15:46:24.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/drivers/block/loop.c 2012-12-11 16:49:59.000000000 +0000 -@@ -76,6 +76,7 @@ +diff -NurpP --minimal linux-3.18.5/drivers/block/loop.c linux-3.18.5-vs2.3.7.3/drivers/block/loop.c +--- linux-3.18.5/drivers/block/loop.c 2014-09-03 13:18:40.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/drivers/block/loop.c 2015-01-19 10:57:46.000000000 +0000 +@@ -75,6 +75,7 @@ #include #include #include +#include + #include "loop.h" #include - -@@ -869,6 +870,7 @@ static int loop_set_fd(struct loop_devic +@@ -885,6 +886,7 @@ static int loop_set_fd(struct loop_devic lo->lo_blocksize = lo_blocksize; lo->lo_device = bdev; lo->lo_flags = lo_flags; @@ -870,7 +781,7 @@ diff -NurpP --minimal linux-3.7/drivers/block/loop.c linux-3.7-vs2.3.5.1/drivers lo->lo_backing_file = file; lo->transfer = transfer_none; lo->ioctl = NULL; -@@ -1014,6 +1016,7 @@ static int loop_clr_fd(struct loop_devic +@@ -1029,6 +1031,7 @@ static int loop_clr_fd(struct loop_devic lo->lo_sizelimit = 0; lo->lo_encrypt_key_size = 0; lo->lo_thread = NULL; @@ -878,7 +789,7 @@ diff -NurpP --minimal linux-3.7/drivers/block/loop.c linux-3.7-vs2.3.5.1/drivers memset(lo->lo_encrypt_key, 0, LO_KEY_SIZE); memset(lo->lo_crypt_name, 0, LO_NAME_SIZE); memset(lo->lo_file_name, 0, LO_NAME_SIZE); -@@ -1055,7 +1058,7 @@ loop_set_status(struct loop_device *lo, +@@ -1072,7 +1075,7 @@ loop_set_status(struct loop_device *lo, if (lo->lo_encrypt_key_size && !uid_eq(lo->lo_key_owner, uid) && @@ -887,7 +798,7 @@ diff -NurpP --minimal linux-3.7/drivers/block/loop.c linux-3.7-vs2.3.5.1/drivers return -EPERM; if (lo->lo_state != Lo_bound) return -ENXIO; -@@ -1145,7 +1148,8 @@ loop_get_status(struct loop_device *lo, +@@ -1162,7 +1165,8 @@ loop_get_status(struct loop_device *lo, memcpy(info->lo_crypt_name, lo->lo_crypt_name, LO_NAME_SIZE); info->lo_encrypt_type = lo->lo_encryption ? lo->lo_encryption->number : 0; @@ -897,7 +808,7 @@ diff -NurpP --minimal linux-3.7/drivers/block/loop.c linux-3.7-vs2.3.5.1/drivers info->lo_encrypt_key_size = lo->lo_encrypt_key_size; memcpy(info->lo_encrypt_key, lo->lo_encrypt_key, lo->lo_encrypt_key_size); -@@ -1505,6 +1509,11 @@ static int lo_open(struct block_device * +@@ -1504,6 +1508,11 @@ static int lo_open(struct block_device * goto out; } @@ -909,10 +820,21 @@ diff -NurpP --minimal linux-3.7/drivers/block/loop.c linux-3.7-vs2.3.5.1/drivers mutex_lock(&lo->lo_ctl_mutex); lo->lo_refcnt++; mutex_unlock(&lo->lo_ctl_mutex); -diff -NurpP --minimal linux-3.7/drivers/block/vroot.c linux-3.7-vs2.3.5.1/drivers/block/vroot.c ---- linux-3.7/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/drivers/block/vroot.c 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,291 @@ +diff -NurpP --minimal linux-3.18.5/drivers/block/loop.h linux-3.18.5-vs2.3.7.3/drivers/block/loop.h +--- linux-3.18.5/drivers/block/loop.h 2013-11-25 15:44:28.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/drivers/block/loop.h 2015-01-19 10:57:46.000000000 +0000 +@@ -41,6 +41,7 @@ struct loop_device { + struct loop_func_table *lo_encryption; + __u32 lo_init[2]; + kuid_t lo_key_owner; /* Who set the key */ ++ vxid_t lo_xid; + int (*ioctl)(struct loop_device *, int cmd, + unsigned long arg); + +diff -NurpP --minimal linux-3.18.5/drivers/block/vroot.c linux-3.18.5-vs2.3.7.3/drivers/block/vroot.c +--- linux-3.18.5/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/drivers/block/vroot.c 2015-01-19 10:57:46.000000000 +0000 +@@ -0,0 +1,290 @@ +/* + * linux/drivers/block/vroot.c + * @@ -1043,14 +965,13 @@ diff -NurpP --minimal linux-3.7/drivers/block/vroot.c linux-3.7-vs2.3.5.1/driver + return 0; +} + -+static int vr_release(struct gendisk *disk, fmode_t mode) ++static void vr_release(struct gendisk *disk, fmode_t mode) +{ + struct vroot_device *vr = disk->private_data; + + down(&vr->vr_ctl_mutex); + --vr->vr_refcnt; + up(&vr->vr_ctl_mutex); -+ return 0; +} + +static struct block_device_operations vr_fops = { @@ -1204,22 +1125,10 @@ diff -NurpP --minimal linux-3.7/drivers/block/vroot.c linux-3.7-vs2.3.5.1/driver + +#endif + -diff -NurpP --minimal linux-3.7/drivers/infiniband/Kconfig linux-3.7-vs2.3.5.1/drivers/infiniband/Kconfig ---- linux-3.7/drivers/infiniband/Kconfig 2012-07-22 21:39:06.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/drivers/infiniband/Kconfig 2012-12-11 15:56:32.000000000 +0000 -@@ -39,7 +39,7 @@ config INFINIBAND_USER_MEM - config INFINIBAND_ADDR_TRANS - bool - depends on INET -- depends on !(INFINIBAND = y && IPV6 = m) -+ depends on !(INFINIBAND = y && IPV6 = y) - default y - - source "drivers/infiniband/hw/mthca/Kconfig" -diff -NurpP --minimal linux-3.7/drivers/infiniband/core/addr.c linux-3.7-vs2.3.5.1/drivers/infiniband/core/addr.c ---- linux-3.7/drivers/infiniband/core/addr.c 2012-12-11 15:46:34.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/drivers/infiniband/core/addr.c 2012-12-11 15:56:32.000000000 +0000 -@@ -261,7 +261,7 @@ static int addr6_resolve(struct sockaddr +diff -NurpP --minimal linux-3.18.5/drivers/infiniband/core/addr.c linux-3.18.5-vs2.3.7.3/drivers/infiniband/core/addr.c +--- linux-3.18.5/drivers/infiniband/core/addr.c 2014-06-12 11:33:41.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/drivers/infiniband/core/addr.c 2015-01-19 10:57:46.000000000 +0000 +@@ -284,7 +284,7 @@ static int addr6_resolve(struct sockaddr if (ipv6_addr_any(&fl6.saddr)) { ret = ipv6_dev_get_saddr(&init_net, ip6_dst_idev(dst)->dev, @@ -1228,9 +1137,9 @@ diff -NurpP --minimal linux-3.7/drivers/infiniband/core/addr.c linux-3.7-vs2.3.5 if (ret) goto put; -diff -NurpP --minimal linux-3.7/drivers/md/dm-ioctl.c linux-3.7-vs2.3.5.1/drivers/md/dm-ioctl.c ---- linux-3.7/drivers/md/dm-ioctl.c 2012-10-04 13:27:11.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/drivers/md/dm-ioctl.c 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/drivers/md/dm-ioctl.c linux-3.18.5-vs2.3.7.3/drivers/md/dm-ioctl.c +--- linux-3.18.5/drivers/md/dm-ioctl.c 2015-01-17 02:39:51.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/drivers/md/dm-ioctl.c 2015-01-19 10:57:46.000000000 +0000 @@ -16,6 +16,7 @@ #include #include @@ -1239,7 +1148,7 @@ diff -NurpP --minimal linux-3.7/drivers/md/dm-ioctl.c linux-3.7-vs2.3.5.1/driver #include -@@ -106,7 +107,8 @@ static struct hash_cell *__get_name_cell +@@ -114,7 +115,8 @@ static struct hash_cell *__get_name_cell unsigned int h = hash_str(str); list_for_each_entry (hc, _name_buckets + h, name_list) @@ -1249,7 +1158,7 @@ diff -NurpP --minimal linux-3.7/drivers/md/dm-ioctl.c linux-3.7-vs2.3.5.1/driver dm_get(hc->md); return hc; } -@@ -120,7 +122,8 @@ static struct hash_cell *__get_uuid_cell +@@ -128,7 +130,8 @@ static struct hash_cell *__get_uuid_cell unsigned int h = hash_str(str); list_for_each_entry (hc, _uuid_buckets + h, uuid_list) @@ -1259,7 +1168,7 @@ diff -NurpP --minimal linux-3.7/drivers/md/dm-ioctl.c linux-3.7-vs2.3.5.1/driver dm_get(hc->md); return hc; } -@@ -131,13 +134,15 @@ static struct hash_cell *__get_uuid_cell +@@ -139,13 +142,15 @@ static struct hash_cell *__get_uuid_cell static struct hash_cell *__get_dev_cell(uint64_t dev) { struct mapped_device *md; @@ -1277,17 +1186,17 @@ diff -NurpP --minimal linux-3.7/drivers/md/dm-ioctl.c linux-3.7-vs2.3.5.1/driver if (!hc) { dm_put(md); return NULL; -@@ -445,6 +450,9 @@ typedef int (*ioctl_fn)(struct dm_ioctl +@@ -467,6 +472,9 @@ typedef int (*ioctl_fn)(struct dm_ioctl static int remove_all(struct dm_ioctl *param, size_t param_size) { + if (!vx_check(0, VS_ADMIN)) + return -EPERM; + - dm_hash_remove_all(1); + dm_hash_remove_all(true, !!(param->flags & DM_DEFERRED_REMOVE), false); param->data_size = 0; return 0; -@@ -492,6 +500,8 @@ static int list_devices(struct dm_ioctl +@@ -514,6 +522,8 @@ static int list_devices(struct dm_ioctl */ for (i = 0; i < NUM_BUCKETS; i++) { list_for_each_entry (hc, _name_buckets + i, name_list) { @@ -1296,7 +1205,7 @@ diff -NurpP --minimal linux-3.7/drivers/md/dm-ioctl.c linux-3.7-vs2.3.5.1/driver needed += sizeof(struct dm_name_list); needed += strlen(hc->name) + 1; needed += ALIGN_MASK; -@@ -515,6 +525,8 @@ static int list_devices(struct dm_ioctl +@@ -537,6 +547,8 @@ static int list_devices(struct dm_ioctl */ for (i = 0; i < NUM_BUCKETS; i++) { list_for_each_entry (hc, _name_buckets + i, name_list) { @@ -1305,9 +1214,9 @@ diff -NurpP --minimal linux-3.7/drivers/md/dm-ioctl.c linux-3.7-vs2.3.5.1/driver if (old_nl) old_nl->next = (uint32_t) ((void *) nl - (void *) old_nl); -@@ -1619,8 +1631,8 @@ static int ctl_ioctl(uint command, struc - ioctl_fn fn = NULL; +@@ -1797,8 +1809,8 @@ static int ctl_ioctl(uint command, struc size_t input_param_size; + struct dm_ioctl param_kernel; - /* only root can play with this */ - if (!capable(CAP_SYS_ADMIN)) @@ -1316,9 +1225,9 @@ diff -NurpP --minimal linux-3.7/drivers/md/dm-ioctl.c linux-3.7-vs2.3.5.1/driver return -EACCES; if (_IOC_TYPE(command) != DM_IOCTL) -diff -NurpP --minimal linux-3.7/drivers/md/dm.c linux-3.7-vs2.3.5.1/drivers/md/dm.c ---- linux-3.7/drivers/md/dm.c 2012-12-11 15:46:38.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/drivers/md/dm.c 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/drivers/md/dm.c linux-3.18.5-vs2.3.7.3/drivers/md/dm.c +--- linux-3.18.5/drivers/md/dm.c 2015-02-05 18:02:42.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/drivers/md/dm.c 2015-01-28 11:48:02.000000000 +0000 @@ -19,6 +19,7 @@ #include #include @@ -1327,15 +1236,15 @@ diff -NurpP --minimal linux-3.7/drivers/md/dm.c linux-3.7-vs2.3.5.1/drivers/md/d #include -@@ -137,6 +138,7 @@ struct mapped_device { - rwlock_t map_lock; +@@ -134,6 +135,7 @@ struct mapped_device { + struct mutex suspend_lock; atomic_t holders; atomic_t open_count; -+ xid_t xid; - - unsigned long flags; ++ vxid_t xid; -@@ -345,6 +347,7 @@ int dm_deleting_md(struct mapped_device + /* + * The current mapping. +@@ -397,6 +399,7 @@ int dm_deleting_md(struct mapped_device static int dm_blk_open(struct block_device *bdev, fmode_t mode) { struct mapped_device *md; @@ -1343,7 +1252,7 @@ diff -NurpP --minimal linux-3.7/drivers/md/dm.c linux-3.7-vs2.3.5.1/drivers/md/d spin_lock(&_minor_lock); -@@ -353,18 +356,19 @@ static int dm_blk_open(struct block_devi +@@ -405,18 +408,19 @@ static int dm_blk_open(struct block_devi goto out; if (test_bit(DMF_FREEING, &md->flags) || @@ -1368,15 +1277,15 @@ diff -NurpP --minimal linux-3.7/drivers/md/dm.c linux-3.7-vs2.3.5.1/drivers/md/d + return ret; } - static int dm_blk_close(struct gendisk *disk, fmode_t mode) -@@ -575,6 +579,14 @@ int dm_set_geometry(struct mapped_device + static void dm_blk_close(struct gendisk *disk, fmode_t mode) +@@ -819,6 +823,14 @@ int dm_set_geometry(struct mapped_device return 0; } +/* + * Get the xid associated with a dm device + */ -+xid_t dm_get_xid(struct mapped_device *md) ++vxid_t dm_get_xid(struct mapped_device *md) +{ + return md->xid; +} @@ -1384,46 +1293,54 @@ diff -NurpP --minimal linux-3.7/drivers/md/dm.c linux-3.7-vs2.3.5.1/drivers/md/d /*----------------------------------------------------------------- * CRUD START: * A more elegant soln is in the works that uses the queue -@@ -1852,6 +1864,7 @@ static struct mapped_device *alloc_dev(i - INIT_LIST_HEAD(&md->uevent_list); +@@ -2077,6 +2089,7 @@ static struct mapped_device *alloc_dev(i + INIT_LIST_HEAD(&md->table_devices); spin_lock_init(&md->uevent_lock); + md->xid = vx_current_xid(); md->queue = blk_alloc_queue(GFP_KERNEL); if (!md->queue) goto bad_queue; -diff -NurpP --minimal linux-3.7/drivers/md/dm.h linux-3.7-vs2.3.5.1/drivers/md/dm.h ---- linux-3.7/drivers/md/dm.h 2012-10-04 13:27:11.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/drivers/md/dm.h 2012-12-11 15:56:32.000000000 +0000 -@@ -46,6 +46,8 @@ struct dm_dev_internal { +diff -NurpP --minimal linux-3.18.5/drivers/md/dm.h linux-3.18.5-vs2.3.7.3/drivers/md/dm.h +--- linux-3.18.5/drivers/md/dm.h 2015-01-17 02:39:51.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/drivers/md/dm.h 2015-01-19 10:57:46.000000000 +0000 +@@ -50,6 +50,8 @@ struct dm_dev_internal { struct dm_table; struct dm_md_mempools; -+xid_t dm_get_xid(struct mapped_device *md); ++vxid_t dm_get_xid(struct mapped_device *md); + /*----------------------------------------------------------------- * Internal table functions. *---------------------------------------------------------------*/ -diff -NurpP --minimal linux-3.7/drivers/net/tun.c linux-3.7-vs2.3.5.1/drivers/net/tun.c ---- linux-3.7/drivers/net/tun.c 2012-12-11 15:47:01.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/drivers/net/tun.c 2012-12-12 00:07:34.000000000 +0000 -@@ -64,6 +64,7 @@ +diff -NurpP --minimal linux-3.18.5/drivers/net/tun.c linux-3.18.5-vs2.3.7.3/drivers/net/tun.c +--- linux-3.18.5/drivers/net/tun.c 2015-01-17 02:40:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/drivers/net/tun.c 2015-01-19 10:57:46.000000000 +0000 +@@ -65,6 +65,7 @@ #include #include #include +#include + #include #include #include - #include -@@ -123,6 +124,7 @@ struct tun_struct { +@@ -171,6 +172,7 @@ struct tun_struct { unsigned int flags; kuid_t owner; kgid_t group; -+ nid_t nid; ++ vnid_t nid; struct net_device *dev; netdev_features_t set_features; -@@ -1034,6 +1036,7 @@ static void tun_setup(struct net_device +@@ -404,6 +406,7 @@ static inline bool tun_not_capable(struc + return ((uid_valid(tun->owner) && !uid_eq(cred->euid, tun->owner)) || + (gid_valid(tun->group) && !in_egroup_p(tun->group))) && + !ns_capable(net->user_ns, CAP_NET_ADMIN); ++ /* !cap_raised(current_cap(), CAP_NET_ADMIN) */ + } + + static void tun_set_real_num_queues(struct tun_struct *tun) +@@ -1413,6 +1416,7 @@ static void tun_setup(struct net_device tun->owner = INVALID_UID; tun->group = INVALID_GID; @@ -1431,35 +1348,16 @@ diff -NurpP --minimal linux-3.7/drivers/net/tun.c linux-3.7-vs2.3.5.1/drivers/ne dev->ethtool_ops = &tun_ethtool_ops; dev->destructor = tun_free_netdev; -@@ -1198,7 +1201,7 @@ static int tun_set_iff(struct net *net, +@@ -1629,7 +1633,7 @@ static int tun_set_iff(struct net *net, + int queues = ifr->ifr_flags & IFF_MULTI_QUEUE ? + MAX_TAP_QUEUES : 1; - if (((uid_valid(tun->owner) && !uid_eq(cred->euid, tun->owner)) || - (gid_valid(tun->group) && !in_egroup_p(tun->group))) && -- !capable(CAP_NET_ADMIN)) -+ !cap_raised(current_cap(), CAP_NET_ADMIN)) - return -EPERM; - err = security_tun_dev_attach(tun->socket.sk); - if (err < 0) -@@ -1212,7 +1215,7 @@ static int tun_set_iff(struct net *net, - char *name; - unsigned long flags = 0; - -- if (!capable(CAP_NET_ADMIN)) -+ if (!nx_capable(CAP_NET_ADMIN, NXC_TUN_CREATE)) +- if (!ns_capable(net->user_ns, CAP_NET_ADMIN)) ++ if (!nx_ns_capable(net->user_ns, CAP_NET_ADMIN, NXC_TUN_CREATE)) return -EPERM; err = security_tun_dev_create(); if (err < 0) -@@ -1283,6 +1286,9 @@ static int tun_set_iff(struct net *net, - - sk->sk_destruct = tun_sock_destruct; - -+ if (!nx_check(tun->nid, VS_IDENT | VS_HOSTID | VS_ADMIN_P)) -+ return -EPERM; -+ - err = tun_attach(tun, file); - if (err < 0) - goto failed; -@@ -1478,6 +1484,16 @@ static long __tun_chr_ioctl(struct file +@@ -1996,6 +2000,16 @@ static long __tun_chr_ioctl(struct file from_kgid(&init_user_ns, tun->group)); break; @@ -1468,7 +1366,7 @@ diff -NurpP --minimal linux-3.7/drivers/net/tun.c linux-3.7-vs2.3.5.1/drivers/ne + return -EPERM; + + /* Set nid owner of the device */ -+ tun->nid = (nid_t) arg; ++ tun->nid = (vnid_t) arg; + + tun_debug(KERN_INFO, tun, "nid owner set to %u\n", tun->nid); + break; @@ -1476,57 +1374,31 @@ diff -NurpP --minimal linux-3.7/drivers/net/tun.c linux-3.7-vs2.3.5.1/drivers/ne case TUNSETLINK: /* Only allow setting the type when the interface is down */ if (tun->dev->flags & IFF_UP) { -diff -NurpP --minimal linux-3.7/drivers/staging/csr/csr_wifi_hip_xbv.c linux-3.7-vs2.3.5.1/drivers/staging/csr/csr_wifi_hip_xbv.c ---- linux-3.7/drivers/staging/csr/csr_wifi_hip_xbv.c 2012-10-04 13:27:30.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/drivers/staging/csr/csr_wifi_hip_xbv.c 2012-12-11 15:56:32.000000000 +0000 -@@ -55,7 +55,7 @@ typedef struct - { - char t_name[4]; - u32 t_len; --} tag_t; -+} ctag_t; - - - #define TAG_EQ(i, v) (((i)[0] == (v)[0]) && \ -@@ -90,7 +90,7 @@ typedef struct - u32 ptr; - } xbv_stack_t; - --static s32 read_tag(card_t *card, ct_t *ct, tag_t *tag); -+static s32 read_tag(card_t *card, ct_t *ct, ctag_t *tag); - static s32 read_bytes(card_t *card, ct_t *ct, void *buf, u32 len); - static s32 read_uint(card_t *card, ct_t *ct, u32 *u, u32 len); - static s32 xbv_check(xbv1_t *fwinfo, const xbv_stack_t *stack, -@@ -160,7 +160,7 @@ static u32 write_fwdl_to_ptdl(void *buf, - CsrResult xbv1_parse(card_t *card, fwreadfn_t readfn, void *dlpriv, xbv1_t *fwinfo) - { - ct_t ct; -- tag_t tag; -+ ctag_t tag; - xbv_stack_t stack; - - ct.dlpriv = dlpriv; -@@ -505,7 +505,7 @@ static u32 xbv2uint(u8 *ptr, s32 len) - } - - --static s32 read_tag(card_t *card, ct_t *ct, tag_t *tag) -+static s32 read_tag(card_t *card, ct_t *ct, ctag_t *tag) - { - u8 buf[8]; - s32 n; -diff -NurpP --minimal linux-3.7/drivers/tty/sysrq.c linux-3.7-vs2.3.5.1/drivers/tty/sysrq.c ---- linux-3.7/drivers/tty/sysrq.c 2012-12-11 15:47:24.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/drivers/tty/sysrq.c 2012-12-11 16:52:41.000000000 +0000 -@@ -41,6 +41,7 @@ - #include - #include - #include +diff -NurpP --minimal linux-3.18.5/drivers/scsi/cxgbi/libcxgbi.c linux-3.18.5-vs2.3.7.3/drivers/scsi/cxgbi/libcxgbi.c +--- linux-3.18.5/drivers/scsi/cxgbi/libcxgbi.c 2015-01-17 02:40:05.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/drivers/scsi/cxgbi/libcxgbi.c 2015-02-06 01:59:47.000000000 +0000 +@@ -764,7 +764,8 @@ static struct cxgbi_sock *cxgbi_check_ro + struct inet6_dev *idev = ip6_dst_idev((struct dst_entry *)rt); + + err = ipv6_dev_get_saddr(&init_net, idev ? idev->dev : NULL, +- &daddr6->sin6_addr, 0, &pref_saddr); ++ &daddr6->sin6_addr, 0, &pref_saddr, ++ NULL); + if (err) { + pr_info("failed to get source address to reach %pI6\n", + &daddr6->sin6_addr); +diff -NurpP --minimal linux-3.18.5/drivers/tty/sysrq.c linux-3.18.5-vs2.3.7.3/drivers/tty/sysrq.c +--- linux-3.18.5/drivers/tty/sysrq.c 2015-01-16 22:19:12.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/drivers/tty/sysrq.c 2015-01-19 11:01:25.000000000 +0000 +@@ -47,6 +47,7 @@ + #include + #include + #include +#include #include #include -@@ -398,6 +399,21 @@ static struct sysrq_key_op sysrq_unrt_op +@@ -408,6 +409,21 @@ static struct sysrq_key_op sysrq_unrt_op .enable_mask = SYSRQ_ENABLE_RTNICE, }; @@ -1548,20 +1420,19 @@ diff -NurpP --minimal linux-3.7/drivers/tty/sysrq.c linux-3.7-vs2.3.5.1/drivers/ /* Key Operations table and lock */ static DEFINE_SPINLOCK(sysrq_key_table_lock); -@@ -453,7 +469,11 @@ static struct sysrq_key_op *sysrq_key_ta +@@ -463,7 +479,11 @@ static struct sysrq_key_op *sysrq_key_ta &sysrq_showstate_blocked_op, /* w */ /* x: May be registered on ppc/powerpc for xmon */ /* x: May be registered on sparc64 for global PMU dump */ -- NULL, /* x */ +#ifdef CONFIG_VSERVER_DEBUG + &sysrq_showvxinfo_op, /* x */ +#else -+ NULL, /* x */ + NULL, /* x */ +#endif /* y: May be registered on sparc64 for global register dump */ NULL, /* y */ &sysrq_ftrace_dump_op, /* z */ -@@ -468,6 +488,8 @@ static int sysrq_key_table_key2index(int +@@ -478,6 +498,8 @@ static int sysrq_key_table_key2index(int retval = key - '0'; else if ((key >= 'a') && (key <= 'z')) retval = key + 10 - 'a'; @@ -1570,9 +1441,9 @@ diff -NurpP --minimal linux-3.7/drivers/tty/sysrq.c linux-3.7-vs2.3.5.1/drivers/ else retval = -1; return retval; -diff -NurpP --minimal linux-3.7/drivers/tty/tty_io.c linux-3.7-vs2.3.5.1/drivers/tty/tty_io.c ---- linux-3.7/drivers/tty/tty_io.c 2012-12-11 15:47:24.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/drivers/tty/tty_io.c 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/drivers/tty/tty_io.c linux-3.18.5-vs2.3.7.3/drivers/tty/tty_io.c +--- linux-3.18.5/drivers/tty/tty_io.c 2015-01-17 02:40:14.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/drivers/tty/tty_io.c 2015-01-19 10:57:46.000000000 +0000 @@ -104,6 +104,7 @@ #include @@ -1581,7 +1452,7 @@ diff -NurpP --minimal linux-3.7/drivers/tty/tty_io.c linux-3.7-vs2.3.5.1/drivers #undef TTY_DEBUG_HANGUP -@@ -2139,7 +2140,8 @@ static int tiocsti(struct tty_struct *tt +@@ -2237,7 +2238,8 @@ static int tiocsti(struct tty_struct *tt char ch, mbz = 0; struct tty_ldisc *ld; @@ -1591,7 +1462,7 @@ diff -NurpP --minimal linux-3.7/drivers/tty/tty_io.c linux-3.7-vs2.3.5.1/drivers return -EPERM; if (get_user(ch, p)) return -EFAULT; -@@ -2426,6 +2428,7 @@ static int tiocspgrp(struct tty_struct * +@@ -2525,6 +2527,7 @@ static int tiocspgrp(struct tty_struct * return -ENOTTY; if (get_user(pgrp_nr, p)) return -EFAULT; @@ -1599,9 +1470,9 @@ diff -NurpP --minimal linux-3.7/drivers/tty/tty_io.c linux-3.7-vs2.3.5.1/drivers if (pgrp_nr < 0) return -EINVAL; rcu_read_lock(); -diff -NurpP --minimal linux-3.7/fs/attr.c linux-3.7-vs2.3.5.1/fs/attr.c ---- linux-3.7/fs/attr.c 2012-12-11 15:47:31.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/attr.c 2012-12-11 19:10:54.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/fs/attr.c linux-3.18.5-vs2.3.7.3/fs/attr.c +--- linux-3.18.5/fs/attr.c 2014-09-03 13:19:35.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/attr.c 2015-01-19 10:57:46.000000000 +0000 @@ -15,6 +15,9 @@ #include #include @@ -1612,7 +1483,7 @@ diff -NurpP --minimal linux-3.7/fs/attr.c linux-3.7-vs2.3.5.1/fs/attr.c /** * inode_change_ok - check if attribute changes to an inode are allowed -@@ -75,6 +78,10 @@ int inode_change_ok(const struct inode * +@@ -77,6 +80,10 @@ int inode_change_ok(const struct inode * return -EPERM; } @@ -1623,7 +1494,7 @@ diff -NurpP --minimal linux-3.7/fs/attr.c linux-3.7-vs2.3.5.1/fs/attr.c return 0; } EXPORT_SYMBOL(inode_change_ok); -@@ -145,6 +152,8 @@ void setattr_copy(struct inode *inode, c +@@ -147,6 +154,8 @@ void setattr_copy(struct inode *inode, c inode->i_uid = attr->ia_uid; if (ia_valid & ATTR_GID) inode->i_gid = attr->ia_gid; @@ -1632,7 +1503,7 @@ diff -NurpP --minimal linux-3.7/fs/attr.c linux-3.7-vs2.3.5.1/fs/attr.c if (ia_valid & ATTR_ATIME) inode->i_atime = timespec_trunc(attr->ia_atime, inode->i_sb->s_time_gran); -@@ -174,7 +183,8 @@ int notify_change(struct dentry * dentry +@@ -197,7 +206,8 @@ int notify_change(struct dentry * dentry WARN_ON_ONCE(!mutex_is_locked(&inode->i_mutex)); @@ -1642,18 +1513,18 @@ diff -NurpP --minimal linux-3.7/fs/attr.c linux-3.7-vs2.3.5.1/fs/attr.c if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) return -EPERM; } -diff -NurpP --minimal linux-3.7/fs/block_dev.c linux-3.7-vs2.3.5.1/fs/block_dev.c ---- linux-3.7/fs/block_dev.c 2012-12-11 15:47:31.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/block_dev.c 2012-12-11 15:56:32.000000000 +0000 -@@ -27,6 +27,7 @@ - #include +diff -NurpP --minimal linux-3.18.5/fs/block_dev.c linux-3.18.5-vs2.3.7.3/fs/block_dev.c +--- linux-3.18.5/fs/block_dev.c 2015-01-17 02:40:16.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/block_dev.c 2015-01-19 10:57:46.000000000 +0000 +@@ -28,6 +28,7 @@ #include #include + #include +#include #include #include "internal.h" -@@ -528,6 +529,7 @@ struct block_device *bdget(dev_t dev) +@@ -575,6 +576,7 @@ struct block_device *bdget(dev_t dev) bdev->bd_invalidated = 0; inode->i_mode = S_IFBLK; inode->i_rdev = dev; @@ -1661,7 +1532,7 @@ diff -NurpP --minimal linux-3.7/fs/block_dev.c linux-3.7-vs2.3.5.1/fs/block_dev. inode->i_bdev = bdev; inode->i_data.a_ops = &def_blk_aops; mapping_set_gfp_mask(&inode->i_data, GFP_USER); -@@ -574,6 +576,11 @@ EXPORT_SYMBOL(bdput); +@@ -622,6 +624,11 @@ EXPORT_SYMBOL(bdput); static struct block_device *bd_acquire(struct inode *inode) { struct block_device *bdev; @@ -1673,7 +1544,7 @@ diff -NurpP --minimal linux-3.7/fs/block_dev.c linux-3.7-vs2.3.5.1/fs/block_dev. spin_lock(&bdev_lock); bdev = inode->i_bdev; -@@ -584,7 +591,7 @@ static struct block_device *bd_acquire(s +@@ -632,7 +639,7 @@ static struct block_device *bd_acquire(s } spin_unlock(&bdev_lock); @@ -1682,10 +1553,10 @@ diff -NurpP --minimal linux-3.7/fs/block_dev.c linux-3.7-vs2.3.5.1/fs/block_dev. if (bdev) { spin_lock(&bdev_lock); if (!inode->i_bdev) { -diff -NurpP --minimal linux-3.7/fs/btrfs/ctree.h linux-3.7-vs2.3.5.1/fs/btrfs/ctree.h ---- linux-3.7/fs/btrfs/ctree.h 2012-12-11 15:47:31.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/btrfs/ctree.h 2012-12-11 15:56:32.000000000 +0000 -@@ -692,11 +692,14 @@ struct btrfs_inode_item { +diff -NurpP --minimal linux-3.18.5/fs/btrfs/ctree.h linux-3.18.5-vs2.3.7.3/fs/btrfs/ctree.h +--- linux-3.18.5/fs/btrfs/ctree.h 2015-01-17 02:40:16.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/btrfs/ctree.h 2015-01-19 10:57:46.000000000 +0000 +@@ -728,11 +728,14 @@ struct btrfs_inode_item { /* modification sequence number for NFS */ __le64 sequence; @@ -1701,16 +1572,16 @@ diff -NurpP --minimal linux-3.7/fs/btrfs/ctree.h linux-3.7-vs2.3.5.1/fs/btrfs/ct struct btrfs_timespec atime; struct btrfs_timespec ctime; struct btrfs_timespec mtime; -@@ -1757,6 +1760,8 @@ struct btrfs_ioctl_defrag_range_args { - #define BTRFS_MOUNT_CHECK_INTEGRITY_INCLUDING_EXTENT_DATA (1 << 21) - #define BTRFS_MOUNT_PANIC_ON_FATAL_ERROR (1 << 22) +@@ -2098,6 +2101,8 @@ struct btrfs_ioctl_defrag_range_args { + #define BTRFS_DEFAULT_COMMIT_INTERVAL (30) + #define BTRFS_DEFAULT_MAX_INLINE (8192) +#define BTRFS_MOUNT_TAGGED (1 << 24) + #define btrfs_clear_opt(o, opt) ((o) &= ~BTRFS_MOUNT_##opt) #define btrfs_set_opt(o, opt) ((o) |= BTRFS_MOUNT_##opt) - #define btrfs_test_opt(root, opt) ((root)->fs_info->mount_opt & \ -@@ -2025,6 +2030,7 @@ BTRFS_SETGET_FUNCS(inode_block_group, st + #define btrfs_raw_test_opt(o, opt) ((o) & BTRFS_MOUNT_##opt) +@@ -2381,6 +2386,7 @@ BTRFS_SETGET_FUNCS(inode_block_group, st BTRFS_SETGET_FUNCS(inode_nlink, struct btrfs_inode_item, nlink, 32); BTRFS_SETGET_FUNCS(inode_uid, struct btrfs_inode_item, uid, 32); BTRFS_SETGET_FUNCS(inode_gid, struct btrfs_inode_item, gid, 32); @@ -1718,7 +1589,7 @@ diff -NurpP --minimal linux-3.7/fs/btrfs/ctree.h linux-3.7-vs2.3.5.1/fs/btrfs/ct BTRFS_SETGET_FUNCS(inode_mode, struct btrfs_inode_item, mode, 32); BTRFS_SETGET_FUNCS(inode_rdev, struct btrfs_inode_item, rdev, 64); BTRFS_SETGET_FUNCS(inode_flags, struct btrfs_inode_item, flags, 64); -@@ -2078,6 +2084,10 @@ BTRFS_SETGET_FUNCS(extent_flags, struct +@@ -2453,6 +2459,10 @@ BTRFS_SETGET_FUNCS(extent_flags, struct BTRFS_SETGET_FUNCS(extent_refs_v0, struct btrfs_extent_item_v0, refs, 32); @@ -1729,18 +1600,18 @@ diff -NurpP --minimal linux-3.7/fs/btrfs/ctree.h linux-3.7-vs2.3.5.1/fs/btrfs/ct BTRFS_SETGET_FUNCS(tree_block_level, struct btrfs_tree_block_info, level, 8); -@@ -3363,6 +3373,7 @@ extern const struct dentry_operations bt - long btrfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg); +@@ -3864,6 +3874,7 @@ long btrfs_ioctl(struct file *file, unsi void btrfs_update_iflags(struct inode *inode); void btrfs_inherit_iflags(struct inode *inode, struct inode *dir); + int btrfs_is_empty_uuid(u8 *uuid); +int btrfs_sync_flags(struct inode *inode, int, int); int btrfs_defrag_file(struct inode *inode, struct file *file, struct btrfs_ioctl_defrag_range_args *range, u64 newer_than, unsigned long max_pages); -diff -NurpP --minimal linux-3.7/fs/btrfs/disk-io.c linux-3.7-vs2.3.5.1/fs/btrfs/disk-io.c ---- linux-3.7/fs/btrfs/disk-io.c 2012-12-11 15:47:31.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/btrfs/disk-io.c 2012-12-11 15:56:32.000000000 +0000 -@@ -2197,6 +2197,9 @@ int open_ctree(struct super_block *sb, +diff -NurpP --minimal linux-3.18.5/fs/btrfs/disk-io.c linux-3.18.5-vs2.3.7.3/fs/btrfs/disk-io.c +--- linux-3.18.5/fs/btrfs/disk-io.c 2015-02-05 18:02:44.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/btrfs/disk-io.c 2015-01-19 10:57:46.000000000 +0000 +@@ -2460,6 +2460,9 @@ int open_ctree(struct super_block *sb, goto fail_alloc; } @@ -1750,79 +1621,93 @@ diff -NurpP --minimal linux-3.7/fs/btrfs/disk-io.c linux-3.7-vs2.3.5.1/fs/btrfs/ features = btrfs_super_incompat_flags(disk_super) & ~BTRFS_FEATURE_INCOMPAT_SUPP; if (features) { -diff -NurpP --minimal linux-3.7/fs/btrfs/inode.c linux-3.7-vs2.3.5.1/fs/btrfs/inode.c ---- linux-3.7/fs/btrfs/inode.c 2012-12-11 15:47:31.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/btrfs/inode.c 2012-12-11 21:52:49.000000000 +0000 -@@ -39,6 +39,7 @@ - #include - #include - #include +diff -NurpP --minimal linux-3.18.5/fs/btrfs/inode.c linux-3.18.5-vs2.3.7.3/fs/btrfs/inode.c +--- linux-3.18.5/fs/btrfs/inode.c 2015-01-17 02:40:16.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/btrfs/inode.c 2015-01-19 12:26:30.000000000 +0000 +@@ -43,6 +43,7 @@ + #include + #include + #include +#include - #include "compat.h" #include "ctree.h" #include "disk-io.h" -@@ -2530,6 +2531,8 @@ static void btrfs_read_locked_inode(stru - struct btrfs_key location; + #include "transaction.h" +@@ -3477,6 +3478,9 @@ static void btrfs_read_locked_inode(stru + unsigned long ptr; int maybe_acls; u32 rdev; -+ uid_t uid; -+ gid_t gid; ++ kuid_t kuid; ++ kgid_t kgid; ++ ktag_t ktag; int ret; bool filled = false; - -@@ -2557,8 +2560,13 @@ static void btrfs_read_locked_inode(stru + int first_xattr_slot; +@@ -3504,8 +3508,14 @@ static void btrfs_read_locked_inode(stru struct btrfs_inode_item); inode->i_mode = btrfs_inode_mode(leaf, inode_item); set_nlink(inode, btrfs_inode_nlink(leaf, inode_item)); - i_uid_write(inode, btrfs_inode_uid(leaf, inode_item)); - i_gid_write(inode, btrfs_inode_gid(leaf, inode_item)); + -+ uid = btrfs_inode_uid(leaf, inode_item); -+ gid = btrfs_inode_gid(leaf, inode_item); -+ i_uid_write(inode, INOTAG_UID(DX_TAG(inode), uid, gid)); -+ i_gid_write(inode, INOTAG_GID(DX_TAG(inode), uid, gid)); -+ i_tag_write(inode, INOTAG_TAG(DX_TAG(inode), uid, gid, -+ btrfs_inode_tag(leaf, inode_item))); ++ kuid = make_kuid(&init_user_ns, btrfs_inode_uid(leaf, inode_item)); ++ kgid = make_kgid(&init_user_ns, btrfs_inode_gid(leaf, inode_item)); ++ ktag = make_ktag(&init_user_ns, btrfs_inode_tag(leaf, inode_item)); ++ ++ inode->i_uid = INOTAG_KUID(DX_TAG(inode), kuid, kgid); ++ inode->i_gid = INOTAG_KGID(DX_TAG(inode), kuid, kgid); ++ inode->i_tag = INOTAG_KTAG(DX_TAG(inode), kuid, kgid, ktag); btrfs_i_size_write(inode, btrfs_inode_size(leaf, inode_item)); tspec = btrfs_inode_atime(inode_item); -@@ -2648,8 +2656,16 @@ static void fill_inode_item(struct btrfs - struct btrfs_inode_item *item, +@@ -3629,11 +3639,18 @@ static void fill_inode_item(struct btrfs struct inode *inode) { -- btrfs_set_inode_uid(leaf, item, i_uid_read(inode)); -- btrfs_set_inode_gid(leaf, item, i_gid_read(inode)); -+ uid_t uid = TAGINO_UID(DX_TAG(inode), -+ i_uid_read(inode), i_tag_read(inode)); -+ gid_t gid = TAGINO_GID(DX_TAG(inode), -+ i_gid_read(inode), i_tag_read(inode)); -+ -+ btrfs_set_inode_uid(leaf, item, uid); -+ btrfs_set_inode_gid(leaf, item, gid); + struct btrfs_map_token token; ++ uid_t uid = from_kuid(&init_user_ns, ++ TAGINO_KUID(DX_TAG(inode), inode->i_uid, inode->i_tag)); ++ gid_t gid = from_kgid(&init_user_ns, ++ TAGINO_KGID(DX_TAG(inode), inode->i_gid, inode->i_tag)); + + btrfs_init_map_token(&token); + +- btrfs_set_token_inode_uid(leaf, item, i_uid_read(inode), &token); +- btrfs_set_token_inode_gid(leaf, item, i_gid_read(inode), &token); ++ btrfs_set_token_inode_uid(leaf, item, uid, &token); ++ btrfs_set_token_inode_gid(leaf, item, gid, &token); +#ifdef CONFIG_TAGGING_INTERN -+ btrfs_set_inode_tag(leaf, item, i_tag_read(inode)); ++ btrfs_set_token_inode_tag(leaf, item, i_tag_read(inode), &token); +#endif - btrfs_set_inode_size(leaf, item, BTRFS_I(inode)->disk_i_size); - btrfs_set_inode_mode(leaf, item, inode->i_mode); - btrfs_set_inode_nlink(leaf, item, inode->i_nlink); -@@ -7786,11 +7802,13 @@ static const struct inode_operations btr + btrfs_set_token_inode_size(leaf, item, BTRFS_I(inode)->disk_i_size, + &token); + btrfs_set_token_inode_mode(leaf, item, inode->i_mode, &token); +@@ -9459,6 +9476,7 @@ static const struct inode_operations btr .listxattr = btrfs_listxattr, .removexattr = btrfs_removexattr, .permission = btrfs_permission, + .sync_flags = btrfs_sync_flags, .get_acl = btrfs_get_acl, - }; + .set_acl = btrfs_set_acl, + .update_time = btrfs_update_time, +@@ -9467,6 +9485,7 @@ static const struct inode_operations btr static const struct inode_operations btrfs_dir_ro_inode_operations = { .lookup = btrfs_lookup, .permission = btrfs_permission, + .sync_flags = btrfs_sync_flags, .get_acl = btrfs_get_acl, - }; - -diff -NurpP --minimal linux-3.7/fs/btrfs/ioctl.c linux-3.7-vs2.3.5.1/fs/btrfs/ioctl.c ---- linux-3.7/fs/btrfs/ioctl.c 2012-12-11 15:47:31.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/btrfs/ioctl.c 2012-12-11 15:56:32.000000000 +0000 -@@ -74,10 +74,13 @@ static unsigned int btrfs_flags_to_ioctl + .set_acl = btrfs_set_acl, + .update_time = btrfs_update_time, +@@ -9537,6 +9556,7 @@ static const struct inode_operations btr + .removexattr = btrfs_removexattr, + .permission = btrfs_permission, + .fiemap = btrfs_fiemap, ++ .sync_flags = btrfs_sync_flags, + .get_acl = btrfs_get_acl, + .set_acl = btrfs_set_acl, + .update_time = btrfs_update_time, +diff -NurpP --minimal linux-3.18.5/fs/btrfs/ioctl.c linux-3.18.5-vs2.3.7.3/fs/btrfs/ioctl.c +--- linux-3.18.5/fs/btrfs/ioctl.c 2015-01-17 02:40:16.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/btrfs/ioctl.c 2015-01-21 09:54:51.000000000 +0000 +@@ -107,10 +107,13 @@ static unsigned int btrfs_flags_to_ioctl { unsigned int iflags = 0; @@ -1838,7 +1723,7 @@ diff -NurpP --minimal linux-3.7/fs/btrfs/ioctl.c linux-3.7-vs2.3.5.1/fs/btrfs/io if (flags & BTRFS_INODE_APPEND) iflags |= FS_APPEND_FL; if (flags & BTRFS_INODE_NODUMP) -@@ -94,28 +97,78 @@ static unsigned int btrfs_flags_to_ioctl +@@ -127,34 +130,84 @@ static unsigned int btrfs_flags_to_ioctl else if (flags & BTRFS_INODE_NOCOMPRESS) iflags |= FS_NOCOMP_FL; @@ -1856,36 +1741,40 @@ diff -NurpP --minimal linux-3.7/fs/btrfs/ioctl.c linux-3.7-vs2.3.5.1/fs/btrfs/io void btrfs_update_iflags(struct inode *inode) { struct btrfs_inode *ip = BTRFS_I(inode); - -- inode->i_flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC); -+ inode->i_flags &= ~(S_IMMUTABLE | S_IXUNLINK | -+ S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC); + unsigned int new_fl = 0; - if (ip->flags & BTRFS_INODE_SYNC) -- inode->i_flags |= S_SYNC; +- new_fl |= S_SYNC; if (ip->flags & BTRFS_INODE_IMMUTABLE) - inode->i_flags |= S_IMMUTABLE; + new_fl |= S_IMMUTABLE; + if (ip->flags & BTRFS_INODE_IXUNLINK) -+ inode->i_flags |= S_IXUNLINK; ++ new_fl |= S_IXUNLINK; + + if (ip->flags & BTRFS_INODE_SYNC) -+ inode->i_flags |= S_SYNC; ++ new_fl |= S_SYNC; if (ip->flags & BTRFS_INODE_APPEND) - inode->i_flags |= S_APPEND; + new_fl |= S_APPEND; if (ip->flags & BTRFS_INODE_NOATIME) - inode->i_flags |= S_NOATIME; + new_fl |= S_NOATIME; if (ip->flags & BTRFS_INODE_DIRSYNC) - inode->i_flags |= S_DIRSYNC; -+ -+ inode->i_vflags &= ~(V_BARRIER | V_COW); + new_fl |= S_DIRSYNC; +- + set_mask_bits(&inode->i_flags, +- S_SYNC | S_APPEND | S_IMMUTABLE | S_NOATIME | S_DIRSYNC, ++ S_SYNC | S_APPEND | S_IMMUTABLE | S_IXUNLINK | S_NOATIME | S_DIRSYNC, + new_fl); + ++ new_fl = 0; + if (ip->flags & BTRFS_INODE_BARRIER) -+ inode->i_vflags |= V_BARRIER; ++ new_fl |= V_BARRIER; + if (ip->flags & BTRFS_INODE_COW) -+ inode->i_vflags |= V_COW; -+} ++ new_fl |= V_COW; + -+/* ++ set_mask_bits(&inode->i_vflags, ++ V_BARRIER | V_COW, new_fl); + } + + /* + * Update btrfs internal flags from inode->i_(v)flags. + */ +void btrfs_update_flags(struct inode *inode) @@ -1918,10 +1807,13 @@ diff -NurpP --minimal linux-3.7/fs/btrfs/ioctl.c linux-3.7-vs2.3.5.1/fs/btrfs/io + ip->flags |= BTRFS_INODE_BARRIER; + if (vflags & V_COW) + ip->flags |= BTRFS_INODE_COW; - } - - /* -@@ -131,6 +184,7 @@ void btrfs_inherit_iflags(struct inode * ++ } ++ ++/* + * Inherit flags from the parent inode. + * + * Currently only the compression flags and the cow flags are inherited. +@@ -167,6 +220,7 @@ void btrfs_inherit_iflags(struct inode * return; flags = BTRFS_I(dir)->flags; @@ -1929,7 +1821,7 @@ diff -NurpP --minimal linux-3.7/fs/btrfs/ioctl.c linux-3.7-vs2.3.5.1/fs/btrfs/io if (flags & BTRFS_INODE_NOCOMPRESS) { BTRFS_I(inode)->flags &= ~BTRFS_INODE_COMPRESS; -@@ -146,6 +200,30 @@ void btrfs_inherit_iflags(struct inode * +@@ -185,6 +239,30 @@ void btrfs_inherit_iflags(struct inode * btrfs_update_iflags(inode); } @@ -1959,8 +1851,8 @@ diff -NurpP --minimal linux-3.7/fs/btrfs/ioctl.c linux-3.7-vs2.3.5.1/fs/btrfs/io + static int btrfs_ioctl_getflags(struct file *file, void __user *arg) { - struct btrfs_inode *ip = BTRFS_I(file->f_path.dentry->d_inode); -@@ -208,21 +286,27 @@ static int btrfs_ioctl_setflags(struct f + struct btrfs_inode *ip = BTRFS_I(file_inode(file)); +@@ -247,21 +325,27 @@ static int btrfs_ioctl_setflags(struct f flags = btrfs_mask_flags(inode->i_mode, flags); oldflags = btrfs_flags_to_ioctl(ip->flags); @@ -1993,30 +1885,30 @@ diff -NurpP --minimal linux-3.7/fs/btrfs/ioctl.c linux-3.7-vs2.3.5.1/fs/btrfs/io if (flags & FS_APPEND_FL) ip->flags |= BTRFS_INODE_APPEND; else -diff -NurpP --minimal linux-3.7/fs/btrfs/super.c linux-3.7-vs2.3.5.1/fs/btrfs/super.c ---- linux-3.7/fs/btrfs/super.c 2012-12-11 15:47:31.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/btrfs/super.c 2012-12-11 15:56:32.000000000 +0000 -@@ -312,7 +312,7 @@ enum { - Opt_no_space_cache, Opt_recovery, Opt_skip_balance, - Opt_check_integrity, Opt_check_integrity_including_extent_data, - Opt_check_integrity_print_mask, Opt_fatal_errors, +diff -NurpP --minimal linux-3.18.5/fs/btrfs/super.c linux-3.18.5-vs2.3.7.3/fs/btrfs/super.c +--- linux-3.18.5/fs/btrfs/super.c 2015-02-05 18:02:44.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/btrfs/super.c 2015-01-19 10:57:46.000000000 +0000 +@@ -325,7 +325,7 @@ enum { + Opt_commit_interval, Opt_barrier, Opt_nodefrag, Opt_nodiscard, + Opt_noenospc_debug, Opt_noflushoncommit, Opt_acl, Opt_datacow, + Opt_datasum, Opt_treelog, Opt_noinode_cache, - Opt_err, + Opt_tag, Opt_notag, Opt_tagid, Opt_err, }; static match_table_t tokens = { -@@ -352,6 +352,9 @@ static match_table_t tokens = { - {Opt_check_integrity_including_extent_data, "check_int_data"}, - {Opt_check_integrity_print_mask, "check_int_print_mask=%d"}, +@@ -377,6 +377,9 @@ static match_table_t tokens = { + {Opt_rescan_uuid_tree, "rescan_uuid_tree"}, {Opt_fatal_errors, "fatal_errors=%s"}, + {Opt_commit_interval, "commit=%d"}, + {Opt_tag, "tag"}, + {Opt_notag, "notag"}, + {Opt_tagid, "tagid=%u"}, {Opt_err, NULL}, }; -@@ -614,6 +617,22 @@ int btrfs_parse_options(struct btrfs_roo - goto out; +@@ -743,6 +746,22 @@ int btrfs_parse_options(struct btrfs_roo + info->commit_interval = BTRFS_DEFAULT_COMMIT_INTERVAL; } break; +#ifndef CONFIG_TAGGING_NONE @@ -2036,9 +1928,9 @@ diff -NurpP --minimal linux-3.7/fs/btrfs/super.c linux-3.7-vs2.3.5.1/fs/btrfs/su + break; +#endif case Opt_err: - printk(KERN_INFO "btrfs: unrecognized mount option " - "'%s'\n", p); -@@ -1211,6 +1230,12 @@ static int btrfs_remount(struct super_bl + btrfs_info(root->fs_info, "unrecognized mount option '%s'", p); + ret = -EINVAL; +@@ -1495,6 +1514,12 @@ static int btrfs_remount(struct super_bl btrfs_resize_thread_pool(fs_info, fs_info->thread_pool_size, old_thread_pool_size); @@ -2049,11 +1941,11 @@ diff -NurpP --minimal linux-3.7/fs/btrfs/super.c linux-3.7-vs2.3.5.1/fs/btrfs/su + } + if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY)) - return 0; + goto out; -diff -NurpP --minimal linux-3.7/fs/char_dev.c linux-3.7-vs2.3.5.1/fs/char_dev.c ---- linux-3.7/fs/char_dev.c 2012-12-11 15:47:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/char_dev.c 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/fs/char_dev.c linux-3.18.5-vs2.3.7.3/fs/char_dev.c +--- linux-3.18.5/fs/char_dev.c 2014-01-22 20:39:05.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/char_dev.c 2015-01-19 10:57:46.000000000 +0000 @@ -21,6 +21,8 @@ #include #include @@ -2063,7 +1955,7 @@ diff -NurpP --minimal linux-3.7/fs/char_dev.c linux-3.7-vs2.3.5.1/fs/char_dev.c #include "internal.h" -@@ -371,14 +373,21 @@ static int chrdev_open(struct inode *ino +@@ -372,14 +374,21 @@ static int chrdev_open(struct inode *ino struct cdev *p; struct cdev *new = NULL; int ret = 0; @@ -2086,35 +1978,35 @@ diff -NurpP --minimal linux-3.7/fs/char_dev.c linux-3.7-vs2.3.5.1/fs/char_dev.c if (!kobj) return -ENXIO; new = container_of(kobj, struct cdev, kobj); -diff -NurpP --minimal linux-3.7/fs/dcache.c linux-3.7-vs2.3.5.1/fs/dcache.c ---- linux-3.7/fs/dcache.c 2012-12-11 15:47:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/dcache.c 2012-12-11 15:56:32.000000000 +0000 -@@ -37,6 +37,7 @@ - #include +diff -NurpP --minimal linux-3.18.5/fs/dcache.c linux-3.18.5-vs2.3.7.3/fs/dcache.c +--- linux-3.18.5/fs/dcache.c 2015-02-05 18:02:45.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/dcache.c 2015-01-19 12:06:59.000000000 +0000 +@@ -38,6 +38,7 @@ #include #include + #include +#include #include "internal.h" #include "mount.h" -@@ -617,6 +618,8 @@ int d_invalidate(struct dentry * dentry) - spin_lock(&dentry->d_lock); - } - -+ vx_dentry_dec(dentry); -+ - /* - * Somebody else still using it? - * -@@ -646,6 +649,7 @@ EXPORT_SYMBOL(d_invalidate); +@@ -654,6 +655,7 @@ EXPORT_SYMBOL(dput); static inline void __dget_dlock(struct dentry *dentry) { - dentry->d_count++; + dentry->d_lockref.count++; + vx_dentry_inc(dentry); } static inline void __dget(struct dentry *dentry) -@@ -1276,6 +1280,9 @@ struct dentry *__d_alloc(struct super_bl +@@ -666,6 +668,8 @@ struct dentry *dget_parent(struct dentry + int gotref; + struct dentry *ret; + ++ vx_dentry_dec(dentry); ++ + /* + * Do optimistic parent lookup without any + * locking. +@@ -1410,6 +1414,9 @@ struct dentry *__d_alloc(struct super_bl struct dentry *dentry; char *dname; @@ -2124,26 +2016,26 @@ diff -NurpP --minimal linux-3.7/fs/dcache.c linux-3.7-vs2.3.5.1/fs/dcache.c dentry = kmem_cache_alloc(dentry_cache, GFP_KERNEL); if (!dentry) return NULL; -@@ -1308,6 +1315,7 @@ struct dentry *__d_alloc(struct super_bl +@@ -1445,6 +1452,7 @@ struct dentry *__d_alloc(struct super_bl - dentry->d_count = 1; + dentry->d_lockref.count = 1; dentry->d_flags = 0; + vx_dentry_inc(dentry); spin_lock_init(&dentry->d_lock); seqcount_init(&dentry->d_seq); dentry->d_inode = NULL; -@@ -2012,6 +2020,7 @@ struct dentry *__d_lookup(struct dentry +@@ -2184,6 +2192,7 @@ struct dentry *__d_lookup(const struct d } - dentry->d_count++; + dentry->d_lockref.count++; + vx_dentry_inc(dentry); found = dentry; spin_unlock(&dentry->d_lock); break; -diff -NurpP --minimal linux-3.7/fs/devpts/inode.c linux-3.7-vs2.3.5.1/fs/devpts/inode.c ---- linux-3.7/fs/devpts/inode.c 2012-10-04 13:27:39.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/devpts/inode.c 2012-12-11 19:18:53.000000000 +0000 -@@ -25,6 +25,7 @@ +diff -NurpP --minimal linux-3.18.5/fs/devpts/inode.c linux-3.18.5-vs2.3.7.3/fs/devpts/inode.c +--- linux-3.18.5/fs/devpts/inode.c 2014-09-03 13:19:39.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/devpts/inode.c 2015-01-19 10:57:47.000000000 +0000 +@@ -27,6 +27,7 @@ #include #include #include @@ -2151,7 +2043,7 @@ diff -NurpP --minimal linux-3.7/fs/devpts/inode.c linux-3.7-vs2.3.5.1/fs/devpts/ #define DEVPTS_DEFAULT_MODE 0600 /* -@@ -36,6 +37,21 @@ +@@ -38,6 +39,21 @@ #define DEVPTS_DEFAULT_PTMX_MODE 0000 #define PTMX_MINOR 2 @@ -2160,7 +2052,7 @@ diff -NurpP --minimal linux-3.7/fs/devpts/inode.c linux-3.7-vs2.3.5.1/fs/devpts/ + int ret = -EACCES; + + /* devpts is xid tagged */ -+ if (vx_check((xid_t)i_tag_read(inode), VS_WATCH_P | VS_IDENT)) ++ if (vx_check((vxid_t)i_tag_read(inode), VS_WATCH_P | VS_IDENT)) + ret = generic_permission(inode, mask); + return ret; +} @@ -2173,17 +2065,17 @@ diff -NurpP --minimal linux-3.7/fs/devpts/inode.c linux-3.7-vs2.3.5.1/fs/devpts/ /* * sysctl support for setting limits on the number of Unix98 ptys allocated. * Otherwise one can eat up all kernel memory by opening /dev/ptmx repeatedly. -@@ -336,6 +352,34 @@ static int devpts_show_options(struct se +@@ -350,6 +366,34 @@ static int devpts_show_options(struct se return 0; } +static int devpts_filter(struct dentry *de) +{ -+ xid_t xid = 0; ++ vxid_t xid = 0; + + /* devpts is xid tagged */ + if (de && de->d_inode) -+ xid = (xid_t)i_tag_read(de->d_inode); ++ xid = (vxid_t)i_tag_read(de->d_inode); +#ifdef CONFIG_VSERVER_WARN_DEVPTS + else + vxwprintk_task(1, "devpts " VS_Q("%.*s") " without inode.", @@ -2192,9 +2084,9 @@ diff -NurpP --minimal linux-3.7/fs/devpts/inode.c linux-3.7-vs2.3.5.1/fs/devpts/ + return vx_check(xid, VS_WATCH_P | VS_IDENT); +} + -+static int devpts_readdir(struct file * filp, void * dirent, filldir_t filldir) ++static int devpts_readdir(struct file * filp, struct dir_context *ctx) +{ -+ return dcache_readdir_filter(filp, dirent, filldir, devpts_filter); ++ return dcache_readdir_filter(filp, ctx, devpts_filter); +} + +static struct file_operations devpts_dir_operations = { @@ -2202,13 +2094,13 @@ diff -NurpP --minimal linux-3.7/fs/devpts/inode.c linux-3.7-vs2.3.5.1/fs/devpts/ + .release = dcache_dir_close, + .llseek = dcache_dir_lseek, + .read = generic_read_dir, -+ .readdir = devpts_readdir, ++ .iterate = devpts_readdir, +}; + static const struct super_operations devpts_sops = { .statfs = simple_statfs, .remount_fs = devpts_remount, -@@ -379,8 +423,10 @@ devpts_fill_super(struct super_block *s, +@@ -393,8 +437,10 @@ devpts_fill_super(struct super_block *s, inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME; inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO | S_IWUSR; inode->i_op = &simple_dir_inode_operations; @@ -2216,24 +2108,24 @@ diff -NurpP --minimal linux-3.7/fs/devpts/inode.c linux-3.7-vs2.3.5.1/fs/devpts/ + inode->i_fop = &devpts_dir_operations; set_nlink(inode, 2); + /* devpts is xid tagged */ -+ i_tag_write(inode, (tag_t)vx_current_xid()); ++ i_tag_write(inode, (vtag_t)vx_current_xid()); s->s_root = d_make_root(inode); if (s->s_root) -@@ -572,6 +618,9 @@ int devpts_pty_new(struct inode *ptmx_in +@@ -598,6 +644,9 @@ struct inode *devpts_pty_new(struct inod inode->i_gid = opts->setgid ? opts->gid : current_fsgid(); inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME; init_special_inode(inode, S_IFCHR|opts->mode, device); + /* devpts is xid tagged */ -+ i_tag_write(inode, (tag_t)vx_current_xid()); ++ i_tag_write(inode, (vtag_t)vx_current_xid()); + inode->i_op = &devpts_file_inode_operations; - inode->i_private = tty; - tty->driver_data = inode; + inode->i_private = priv; -diff -NurpP --minimal linux-3.7/fs/ext2/balloc.c linux-3.7-vs2.3.5.1/fs/ext2/balloc.c ---- linux-3.7/fs/ext2/balloc.c 2012-12-11 15:47:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ext2/balloc.c 2012-12-11 15:56:32.000000000 +0000 -@@ -699,7 +699,6 @@ ext2_try_to_allocate(struct super_block + sprintf(s, "%d", index); +diff -NurpP --minimal linux-3.18.5/fs/ext2/balloc.c linux-3.18.5-vs2.3.7.3/fs/ext2/balloc.c +--- linux-3.18.5/fs/ext2/balloc.c 2013-05-31 13:45:23.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/ext2/balloc.c 2015-01-19 10:57:47.000000000 +0000 +@@ -693,7 +693,6 @@ ext2_try_to_allocate(struct super_block start = 0; end = EXT2_BLOCKS_PER_GROUP(sb); } @@ -2241,9 +2133,9 @@ diff -NurpP --minimal linux-3.7/fs/ext2/balloc.c linux-3.7-vs2.3.5.1/fs/ext2/bal BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb)); repeat: -diff -NurpP --minimal linux-3.7/fs/ext2/ext2.h linux-3.7-vs2.3.5.1/fs/ext2/ext2.h ---- linux-3.7/fs/ext2/ext2.h 2012-07-22 21:39:39.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ext2/ext2.h 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/fs/ext2/ext2.h linux-3.18.5-vs2.3.7.3/fs/ext2/ext2.h +--- linux-3.18.5/fs/ext2/ext2.h 2012-12-11 03:30:57.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/ext2/ext2.h 2015-01-19 10:57:47.000000000 +0000 @@ -244,8 +244,12 @@ struct ext2_group_desc #define EXT2_NOTAIL_FL FS_NOTAIL_FL /* file tail should not be merged */ #define EXT2_DIRSYNC_FL FS_DIRSYNC_FL /* dirsync behaviour (directories only) */ @@ -2291,18 +2183,18 @@ diff -NurpP --minimal linux-3.7/fs/ext2/ext2.h linux-3.7-vs2.3.5.1/fs/ext2/ext2. /* ioctl.c */ extern long ext2_ioctl(struct file *, unsigned int, unsigned long); -diff -NurpP --minimal linux-3.7/fs/ext2/file.c linux-3.7-vs2.3.5.1/fs/ext2/file.c ---- linux-3.7/fs/ext2/file.c 2011-10-24 16:45:27.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ext2/file.c 2012-12-11 15:56:32.000000000 +0000 -@@ -104,4 +104,5 @@ const struct inode_operations ext2_file_ - .setattr = ext2_setattr, +diff -NurpP --minimal linux-3.18.5/fs/ext2/file.c linux-3.18.5-vs2.3.7.3/fs/ext2/file.c +--- linux-3.18.5/fs/ext2/file.c 2014-09-03 13:19:39.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/ext2/file.c 2015-01-19 10:57:47.000000000 +0000 +@@ -105,4 +105,5 @@ const struct inode_operations ext2_file_ .get_acl = ext2_get_acl, + .set_acl = ext2_set_acl, .fiemap = ext2_fiemap, + .sync_flags = ext2_sync_flags, }; -diff -NurpP --minimal linux-3.7/fs/ext2/ialloc.c linux-3.7-vs2.3.5.1/fs/ext2/ialloc.c ---- linux-3.7/fs/ext2/ialloc.c 2012-10-04 13:27:39.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ext2/ialloc.c 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/fs/ext2/ialloc.c linux-3.18.5-vs2.3.7.3/fs/ext2/ialloc.c +--- linux-3.18.5/fs/ext2/ialloc.c 2014-06-12 13:02:41.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/ext2/ialloc.c 2015-01-19 10:57:47.000000000 +0000 @@ -17,6 +17,7 @@ #include #include @@ -2311,26 +2203,26 @@ diff -NurpP --minimal linux-3.7/fs/ext2/ialloc.c linux-3.7-vs2.3.5.1/fs/ext2/ial #include "ext2.h" #include "xattr.h" #include "acl.h" -@@ -547,6 +548,7 @@ got: +@@ -546,6 +547,7 @@ got: inode->i_mode = mode; inode->i_uid = current_fsuid(); inode->i_gid = dir->i_gid; -+ inode->i_tag = dx_current_fstag(sb); ++ i_tag_write(inode, dx_current_fstag(sb)); } else inode_init_owner(inode, dir, mode); -diff -NurpP --minimal linux-3.7/fs/ext2/inode.c linux-3.7-vs2.3.5.1/fs/ext2/inode.c ---- linux-3.7/fs/ext2/inode.c 2012-10-04 13:27:39.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ext2/inode.c 2012-12-11 19:22:08.000000000 +0000 -@@ -31,6 +31,7 @@ - #include +diff -NurpP --minimal linux-3.18.5/fs/ext2/inode.c linux-3.18.5-vs2.3.7.3/fs/ext2/inode.c +--- linux-3.18.5/fs/ext2/inode.c 2014-09-03 13:19:39.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/ext2/inode.c 2015-01-19 10:57:47.000000000 +0000 +@@ -32,6 +32,7 @@ #include #include + #include +#include #include "ext2.h" #include "acl.h" #include "xip.h" -@@ -1165,7 +1166,7 @@ static void ext2_truncate_blocks(struct +@@ -1182,7 +1183,7 @@ static void ext2_truncate_blocks(struct return; if (ext2_inode_is_fast_symlink(inode)) return; @@ -2339,7 +2231,7 @@ diff -NurpP --minimal linux-3.7/fs/ext2/inode.c linux-3.7-vs2.3.5.1/fs/ext2/inod return; __ext2_truncate_blocks(inode, offset); } -@@ -1256,36 +1257,61 @@ void ext2_set_inode_flags(struct inode * +@@ -1273,36 +1274,61 @@ void ext2_set_inode_flags(struct inode * { unsigned int flags = EXT2_I(inode)->i_flags; @@ -2408,7 +2300,7 @@ diff -NurpP --minimal linux-3.7/fs/ext2/inode.c linux-3.7-vs2.3.5.1/fs/ext2/inod } struct inode *ext2_iget (struct super_block *sb, unsigned long ino) -@@ -1321,8 +1347,10 @@ struct inode *ext2_iget (struct super_bl +@@ -1338,8 +1364,10 @@ struct inode *ext2_iget (struct super_bl i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16; i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16; } @@ -2421,20 +2313,20 @@ diff -NurpP --minimal linux-3.7/fs/ext2/inode.c linux-3.7-vs2.3.5.1/fs/ext2/inod set_nlink(inode, le16_to_cpu(raw_inode->i_links_count)); inode->i_size = le32_to_cpu(raw_inode->i_size); inode->i_atime.tv_sec = (signed)le32_to_cpu(raw_inode->i_atime); -@@ -1420,8 +1448,10 @@ static int __ext2_write_inode(struct ino +@@ -1437,8 +1465,10 @@ static int __ext2_write_inode(struct ino struct ext2_inode_info *ei = EXT2_I(inode); struct super_block *sb = inode->i_sb; ino_t ino = inode->i_ino; - uid_t uid = i_uid_read(inode); - gid_t gid = i_gid_read(inode); -+ uid_t uid = TAGINO_UID(DX_TAG(inode), -+ i_uid_read(inode), i_tag_read(inode)); -+ gid_t gid = TAGINO_GID(DX_TAG(inode), -+ i_gid_read(inode), i_tag_read(inode)); ++ uid_t uid = from_kuid(&init_user_ns, ++ TAGINO_KUID(DX_TAG(inode), inode->i_uid, inode->i_tag)); ++ gid_t gid = from_kgid(&init_user_ns, ++ TAGINO_KGID(DX_TAG(inode), inode->i_gid, inode->i_tag)); struct buffer_head * bh; struct ext2_inode * raw_inode = ext2_get_inode(sb, ino, &bh); int n; -@@ -1457,6 +1487,9 @@ static int __ext2_write_inode(struct ino +@@ -1474,6 +1504,9 @@ static int __ext2_write_inode(struct ino raw_inode->i_uid_high = 0; raw_inode->i_gid_high = 0; } @@ -2444,7 +2336,7 @@ diff -NurpP --minimal linux-3.7/fs/ext2/inode.c linux-3.7-vs2.3.5.1/fs/ext2/inod raw_inode->i_links_count = cpu_to_le16(inode->i_nlink); raw_inode->i_size = cpu_to_le32(inode->i_size); raw_inode->i_atime = cpu_to_le32(inode->i_atime.tv_sec); -@@ -1537,7 +1570,8 @@ int ext2_setattr(struct dentry *dentry, +@@ -1554,7 +1587,8 @@ int ext2_setattr(struct dentry *dentry, if (is_quota_modification(inode, iattr)) dquot_initialize(inode); if ((iattr->ia_valid & ATTR_UID && !uid_eq(iattr->ia_uid, inode->i_uid)) || @@ -2454,9 +2346,9 @@ diff -NurpP --minimal linux-3.7/fs/ext2/inode.c linux-3.7-vs2.3.5.1/fs/ext2/inod error = dquot_transfer(inode, iattr); if (error) return error; -diff -NurpP --minimal linux-3.7/fs/ext2/ioctl.c linux-3.7-vs2.3.5.1/fs/ext2/ioctl.c ---- linux-3.7/fs/ext2/ioctl.c 2012-03-19 18:47:25.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ext2/ioctl.c 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/fs/ext2/ioctl.c linux-3.18.5-vs2.3.7.3/fs/ext2/ioctl.c +--- linux-3.18.5/fs/ext2/ioctl.c 2013-05-31 13:45:23.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/ext2/ioctl.c 2015-01-19 10:57:47.000000000 +0000 @@ -17,6 +17,16 @@ #include @@ -2473,7 +2365,7 @@ diff -NurpP --minimal linux-3.7/fs/ext2/ioctl.c linux-3.7-vs2.3.5.1/fs/ext2/ioct + long ext2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { - struct inode *inode = filp->f_dentry->d_inode; + struct inode *inode = file_inode(filp); @@ -51,6 +61,11 @@ long ext2_ioctl(struct file *filp, unsig flags = ext2_mask_flags(inode->i_mode, flags); @@ -2506,9 +2398,9 @@ diff -NurpP --minimal linux-3.7/fs/ext2/ioctl.c linux-3.7-vs2.3.5.1/fs/ext2/ioct flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE; ei->i_flags = flags; -diff -NurpP --minimal linux-3.7/fs/ext2/namei.c linux-3.7-vs2.3.5.1/fs/ext2/namei.c ---- linux-3.7/fs/ext2/namei.c 2012-10-04 13:27:39.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ext2/namei.c 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/fs/ext2/namei.c linux-3.18.5-vs2.3.7.3/fs/ext2/namei.c +--- linux-3.18.5/fs/ext2/namei.c 2014-06-12 11:34:57.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/ext2/namei.c 2015-01-19 10:57:47.000000000 +0000 @@ -32,6 +32,7 @@ #include @@ -2525,17 +2417,17 @@ diff -NurpP --minimal linux-3.7/fs/ext2/namei.c linux-3.7-vs2.3.5.1/fs/ext2/name } return d_splice_alias(inode, dentry); } -@@ -397,6 +399,7 @@ const struct inode_operations ext2_dir_i +@@ -433,6 +435,7 @@ const struct inode_operations ext2_speci .removexattr = generic_removexattr, #endif .setattr = ext2_setattr, + .sync_flags = ext2_sync_flags, .get_acl = ext2_get_acl, + .set_acl = ext2_set_acl, }; - -diff -NurpP --minimal linux-3.7/fs/ext2/super.c linux-3.7-vs2.3.5.1/fs/ext2/super.c ---- linux-3.7/fs/ext2/super.c 2012-12-11 15:47:33.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ext2/super.c 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/fs/ext2/super.c linux-3.18.5-vs2.3.7.3/fs/ext2/super.c +--- linux-3.18.5/fs/ext2/super.c 2015-01-17 02:40:17.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/ext2/super.c 2015-01-19 10:57:47.000000000 +0000 @@ -395,7 +395,8 @@ enum { Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug, Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr, @@ -2586,7 +2478,7 @@ diff -NurpP --minimal linux-3.7/fs/ext2/super.c linux-3.7-vs2.3.5.1/fs/ext2/supe sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | ((EXT2_SB(sb)->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0); -@@ -1269,6 +1289,14 @@ static int ext2_remount (struct super_bl +@@ -1270,6 +1290,14 @@ static int ext2_remount (struct super_bl err = -EINVAL; goto restore_opts; } @@ -2601,9 +2493,9 @@ diff -NurpP --minimal linux-3.7/fs/ext2/super.c linux-3.7-vs2.3.5.1/fs/ext2/supe sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | ((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0); -diff -NurpP --minimal linux-3.7/fs/ext3/ext3.h linux-3.7-vs2.3.5.1/fs/ext3/ext3.h ---- linux-3.7/fs/ext3/ext3.h 2012-07-22 21:39:39.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ext3/ext3.h 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/fs/ext3/ext3.h linux-3.18.5-vs2.3.7.3/fs/ext3/ext3.h +--- linux-3.18.5/fs/ext3/ext3.h 2015-01-17 02:40:17.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/ext3/ext3.h 2015-01-19 10:57:47.000000000 +0000 @@ -151,10 +151,14 @@ struct ext3_group_desc #define EXT3_NOTAIL_FL 0x00008000 /* file tail should not be merged */ #define EXT3_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */ @@ -2621,7 +2513,7 @@ diff -NurpP --minimal linux-3.7/fs/ext3/ext3.h linux-3.7-vs2.3.5.1/fs/ext3/ext3. /* Flags that should be inherited by new inodes from their parent. */ #define EXT3_FL_INHERITED (EXT3_SECRM_FL | EXT3_UNRM_FL | EXT3_COMPR_FL |\ -@@ -290,7 +294,8 @@ struct ext3_inode { +@@ -292,7 +296,8 @@ struct ext3_inode { __u16 i_pad1; __le16 l_i_uid_high; /* these 2 fields */ __le16 l_i_gid_high; /* were reserved2[0] */ @@ -2631,7 +2523,7 @@ diff -NurpP --minimal linux-3.7/fs/ext3/ext3.h linux-3.7-vs2.3.5.1/fs/ext3/ext3. } linux2; struct { __u8 h_i_frag; /* Fragment number */ -@@ -320,6 +325,7 @@ struct ext3_inode { +@@ -322,6 +327,7 @@ struct ext3_inode { #define i_gid_low i_gid #define i_uid_high osd2.linux2.l_i_uid_high #define i_gid_high osd2.linux2.l_i_gid_high @@ -2639,7 +2531,7 @@ diff -NurpP --minimal linux-3.7/fs/ext3/ext3.h linux-3.7-vs2.3.5.1/fs/ext3/ext3. #define i_reserved2 osd2.linux2.l_i_reserved2 /* -@@ -364,6 +370,7 @@ struct ext3_inode { +@@ -366,6 +372,7 @@ struct ext3_inode { #define EXT3_MOUNT_GRPQUOTA 0x200000 /* "old" group quota */ #define EXT3_MOUNT_DATA_ERR_ABORT 0x400000 /* Abort on file data write * error in ordered mode */ @@ -2647,7 +2539,7 @@ diff -NurpP --minimal linux-3.7/fs/ext3/ext3.h linux-3.7-vs2.3.5.1/fs/ext3/ext3. /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */ #ifndef _LINUX_EXT2_FS_H -@@ -1061,6 +1068,7 @@ extern void ext3_get_inode_flags(struct +@@ -1063,6 +1070,7 @@ extern void ext3_get_inode_flags(struct extern void ext3_set_aops(struct inode *inode); extern int ext3_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, u64 start, u64 len); @@ -2655,19 +2547,19 @@ diff -NurpP --minimal linux-3.7/fs/ext3/ext3.h linux-3.7-vs2.3.5.1/fs/ext3/ext3. /* ioctl.c */ extern long ext3_ioctl(struct file *, unsigned int, unsigned long); -diff -NurpP --minimal linux-3.7/fs/ext3/file.c linux-3.7-vs2.3.5.1/fs/ext3/file.c ---- linux-3.7/fs/ext3/file.c 2012-05-21 16:07:20.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ext3/file.c 2012-12-11 15:56:32.000000000 +0000 -@@ -76,5 +76,6 @@ const struct inode_operations ext3_file_ - #endif +diff -NurpP --minimal linux-3.18.5/fs/ext3/file.c linux-3.18.5-vs2.3.7.3/fs/ext3/file.c +--- linux-3.18.5/fs/ext3/file.c 2014-09-03 13:19:39.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/ext3/file.c 2015-01-19 10:57:47.000000000 +0000 +@@ -77,5 +77,6 @@ const struct inode_operations ext3_file_ .get_acl = ext3_get_acl, + .set_acl = ext3_set_acl, .fiemap = ext3_fiemap, + .sync_flags = ext3_sync_flags, }; -diff -NurpP --minimal linux-3.7/fs/ext3/ialloc.c linux-3.7-vs2.3.5.1/fs/ext3/ialloc.c ---- linux-3.7/fs/ext3/ialloc.c 2012-07-22 21:39:39.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ext3/ialloc.c 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/fs/ext3/ialloc.c linux-3.18.5-vs2.3.7.3/fs/ext3/ialloc.c +--- linux-3.18.5/fs/ext3/ialloc.c 2014-06-12 13:02:41.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/ext3/ialloc.c 2015-01-19 10:57:47.000000000 +0000 @@ -14,6 +14,7 @@ #include @@ -2680,23 +2572,23 @@ diff -NurpP --minimal linux-3.7/fs/ext3/ialloc.c linux-3.7-vs2.3.5.1/fs/ext3/ial inode->i_mode = mode; inode->i_uid = current_fsuid(); inode->i_gid = dir->i_gid; -+ inode->i_tag = dx_current_fstag(sb); ++ i_tag_write(inode, dx_current_fstag(sb)); } else inode_init_owner(inode, dir, mode); -diff -NurpP --minimal linux-3.7/fs/ext3/inode.c linux-3.7-vs2.3.5.1/fs/ext3/inode.c ---- linux-3.7/fs/ext3/inode.c 2012-12-11 15:47:33.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ext3/inode.c 2012-12-11 19:24:12.000000000 +0000 -@@ -27,6 +27,8 @@ - #include +diff -NurpP --minimal linux-3.18.5/fs/ext3/inode.c linux-3.18.5-vs2.3.7.3/fs/ext3/inode.c +--- linux-3.18.5/fs/ext3/inode.c 2014-09-03 13:19:39.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/ext3/inode.c 2015-01-19 10:57:47.000000000 +0000 +@@ -28,6 +28,8 @@ #include #include + #include +#include + #include "ext3.h" #include "xattr.h" #include "acl.h" -@@ -2848,36 +2850,60 @@ void ext3_set_inode_flags(struct inode * +@@ -2813,36 +2815,60 @@ void ext3_set_inode_flags(struct inode * { unsigned int flags = EXT3_I(inode)->i_flags; @@ -2764,7 +2656,7 @@ diff -NurpP --minimal linux-3.7/fs/ext3/inode.c linux-3.7-vs2.3.5.1/fs/ext3/inod } struct inode *ext3_iget(struct super_block *sb, unsigned long ino) -@@ -2915,8 +2941,10 @@ struct inode *ext3_iget(struct super_blo +@@ -2880,8 +2906,10 @@ struct inode *ext3_iget(struct super_blo i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16; i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16; } @@ -2777,20 +2669,20 @@ diff -NurpP --minimal linux-3.7/fs/ext3/inode.c linux-3.7-vs2.3.5.1/fs/ext3/inod set_nlink(inode, le16_to_cpu(raw_inode->i_links_count)); inode->i_size = le32_to_cpu(raw_inode->i_size); inode->i_atime.tv_sec = (signed)le32_to_cpu(raw_inode->i_atime); -@@ -3088,8 +3116,10 @@ again: +@@ -3053,8 +3081,10 @@ again: ext3_get_inode_flags(ei); raw_inode->i_mode = cpu_to_le16(inode->i_mode); - i_uid = i_uid_read(inode); - i_gid = i_gid_read(inode); -+ i_uid = TAGINO_UID(DX_TAG(inode), -+ i_uid_read(inode), i_tag_read(inode)); -+ i_gid = TAGINO_GID(DX_TAG(inode), -+ i_gid_read(inode), i_tag_read(inode)); ++ i_uid = from_kuid(&init_user_ns, ++ TAGINO_KUID(DX_TAG(inode), inode->i_uid, inode->i_tag)); ++ i_gid = from_kgid(&init_user_ns, ++ TAGINO_KGID(DX_TAG(inode), inode->i_gid, inode->i_tag)); if(!(test_opt(inode->i_sb, NO_UID32))) { raw_inode->i_uid_low = cpu_to_le16(low_16_bits(i_uid)); raw_inode->i_gid_low = cpu_to_le16(low_16_bits(i_gid)); -@@ -3114,6 +3144,9 @@ again: +@@ -3079,6 +3109,9 @@ again: raw_inode->i_uid_high = 0; raw_inode->i_gid_high = 0; } @@ -2800,7 +2692,7 @@ diff -NurpP --minimal linux-3.7/fs/ext3/inode.c linux-3.7-vs2.3.5.1/fs/ext3/inod raw_inode->i_links_count = cpu_to_le16(inode->i_nlink); disksize = cpu_to_le32(ei->i_disksize); if (disksize != raw_inode->i_size) { -@@ -3282,7 +3315,8 @@ int ext3_setattr(struct dentry *dentry, +@@ -3251,7 +3284,8 @@ int ext3_setattr(struct dentry *dentry, if (is_quota_modification(inode, attr)) dquot_initialize(inode); if ((ia_valid & ATTR_UID && !uid_eq(attr->ia_uid, inode->i_uid)) || @@ -2810,7 +2702,7 @@ diff -NurpP --minimal linux-3.7/fs/ext3/inode.c linux-3.7-vs2.3.5.1/fs/ext3/inod handle_t *handle; /* (user+group)*(old+new) structure, inode write (sb, -@@ -3304,6 +3338,8 @@ int ext3_setattr(struct dentry *dentry, +@@ -3273,6 +3307,8 @@ int ext3_setattr(struct dentry *dentry, inode->i_uid = attr->ia_uid; if (attr->ia_valid & ATTR_GID) inode->i_gid = attr->ia_gid; @@ -2819,9 +2711,9 @@ diff -NurpP --minimal linux-3.7/fs/ext3/inode.c linux-3.7-vs2.3.5.1/fs/ext3/inod error = ext3_mark_inode_dirty(handle, inode); ext3_journal_stop(handle); } -diff -NurpP --minimal linux-3.7/fs/ext3/ioctl.c linux-3.7-vs2.3.5.1/fs/ext3/ioctl.c ---- linux-3.7/fs/ext3/ioctl.c 2012-05-21 16:07:20.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ext3/ioctl.c 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/fs/ext3/ioctl.c linux-3.18.5-vs2.3.7.3/fs/ext3/ioctl.c +--- linux-3.18.5/fs/ext3/ioctl.c 2013-05-31 13:45:23.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/ext3/ioctl.c 2015-01-19 10:57:47.000000000 +0000 @@ -12,6 +12,34 @@ #include #include "ext3.h" @@ -2856,7 +2748,7 @@ diff -NurpP --minimal linux-3.7/fs/ext3/ioctl.c linux-3.7-vs2.3.5.1/fs/ext3/ioct + long ext3_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { - struct inode *inode = filp->f_dentry->d_inode; + struct inode *inode = file_inode(filp); @@ -45,6 +73,11 @@ long ext3_ioctl(struct file *filp, unsig flags = ext3_mask_flags(inode->i_mode, flags); @@ -2889,9 +2781,9 @@ diff -NurpP --minimal linux-3.7/fs/ext3/ioctl.c linux-3.7-vs2.3.5.1/fs/ext3/ioct flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE; ei->i_flags = flags; -diff -NurpP --minimal linux-3.7/fs/ext3/namei.c linux-3.7-vs2.3.5.1/fs/ext3/namei.c ---- linux-3.7/fs/ext3/namei.c 2012-12-11 15:47:33.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ext3/namei.c 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/fs/ext3/namei.c linux-3.18.5-vs2.3.7.3/fs/ext3/namei.c +--- linux-3.18.5/fs/ext3/namei.c 2014-06-12 11:34:57.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/ext3/namei.c 2015-01-19 10:57:47.000000000 +0000 @@ -25,6 +25,8 @@ */ @@ -2901,7 +2793,7 @@ diff -NurpP --minimal linux-3.7/fs/ext3/namei.c linux-3.7-vs2.3.5.1/fs/ext3/name #include "ext3.h" #include "namei.h" #include "xattr.h" -@@ -919,6 +921,7 @@ restart: +@@ -915,6 +917,7 @@ restart: submit_bh(READ | REQ_META | REQ_PRIO, bh); } @@ -2909,18 +2801,18 @@ diff -NurpP --minimal linux-3.7/fs/ext3/namei.c linux-3.7-vs2.3.5.1/fs/ext3/name } } if ((bh = bh_use[ra_ptr++]) == NULL) -@@ -2528,6 +2531,7 @@ const struct inode_operations ext3_dir_i +@@ -2568,6 +2571,7 @@ const struct inode_operations ext3_dir_i .listxattr = ext3_listxattr, .removexattr = generic_removexattr, #endif + .sync_flags = ext3_sync_flags, .get_acl = ext3_get_acl, + .set_acl = ext3_set_acl, }; - -diff -NurpP --minimal linux-3.7/fs/ext3/super.c linux-3.7-vs2.3.5.1/fs/ext3/super.c ---- linux-3.7/fs/ext3/super.c 2012-12-11 15:47:33.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ext3/super.c 2012-12-11 15:56:32.000000000 +0000 -@@ -816,7 +816,8 @@ enum { +diff -NurpP --minimal linux-3.18.5/fs/ext3/super.c linux-3.18.5-vs2.3.7.3/fs/ext3/super.c +--- linux-3.18.5/fs/ext3/super.c 2015-01-17 02:40:17.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/ext3/super.c 2015-01-19 10:57:47.000000000 +0000 +@@ -826,7 +826,8 @@ enum { Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota, Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota, Opt_noquota, Opt_ignore, Opt_barrier, Opt_nobarrier, Opt_err, @@ -2930,7 +2822,7 @@ diff -NurpP --minimal linux-3.7/fs/ext3/super.c linux-3.7-vs2.3.5.1/fs/ext3/supe }; static const match_table_t tokens = { -@@ -873,6 +874,9 @@ static const match_table_t tokens = { +@@ -884,6 +885,9 @@ static const match_table_t tokens = { {Opt_barrier, "barrier"}, {Opt_nobarrier, "nobarrier"}, {Opt_resize, "resize"}, @@ -2940,7 +2832,7 @@ diff -NurpP --minimal linux-3.7/fs/ext3/super.c linux-3.7-vs2.3.5.1/fs/ext3/supe {Opt_err, NULL}, }; -@@ -1038,6 +1042,20 @@ static int parse_options (char *options, +@@ -1056,6 +1060,20 @@ static int parse_options (char *options, case Opt_nouid32: set_opt (sbi->s_mount_opt, NO_UID32); break; @@ -2961,7 +2853,7 @@ diff -NurpP --minimal linux-3.7/fs/ext3/super.c linux-3.7-vs2.3.5.1/fs/ext3/supe case Opt_nocheck: clear_opt (sbi->s_mount_opt, CHECK); break; -@@ -1738,6 +1756,9 @@ static int ext3_fill_super (struct super +@@ -1781,6 +1799,9 @@ static int ext3_fill_super (struct super NULL, 0)) goto failed_mount; @@ -2971,7 +2863,7 @@ diff -NurpP --minimal linux-3.7/fs/ext3/super.c linux-3.7-vs2.3.5.1/fs/ext3/supe sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); -@@ -2622,6 +2643,14 @@ static int ext3_remount (struct super_bl +@@ -2678,6 +2699,14 @@ static int ext3_remount (struct super_bl if (test_opt(sb, ABORT)) ext3_abort(sb, __func__, "Abort forced by user"); @@ -2986,23 +2878,21 @@ diff -NurpP --minimal linux-3.7/fs/ext3/super.c linux-3.7-vs2.3.5.1/fs/ext3/supe sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); -diff -NurpP --minimal linux-3.7/fs/ext4/ext4.h linux-3.7-vs2.3.5.1/fs/ext4/ext4.h ---- linux-3.7/fs/ext4/ext4.h 2012-12-11 15:47:33.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ext4/ext4.h 2012-12-11 15:56:32.000000000 +0000 -@@ -392,8 +392,12 @@ struct flex_groups { +diff -NurpP --minimal linux-3.18.5/fs/ext4/ext4.h linux-3.18.5-vs2.3.7.3/fs/ext4/ext4.h +--- linux-3.18.5/fs/ext4/ext4.h 2015-01-17 02:40:17.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/ext4/ext4.h 2015-01-19 10:57:47.000000000 +0000 +@@ -385,7 +385,10 @@ struct flex_groups { #define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */ #define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */ #define EXT4_EOFBLOCKS_FL 0x00400000 /* Blocks allocated beyond EOF */ ++#define EXT4_BARRIER_FL 0x04000000 /* Barrier for chroot() */ +#define EXT4_IXUNLINK_FL 0x08000000 /* Immutable invert on unlink */ + #define EXT4_INLINE_DATA_FL 0x10000000 /* Inode has inline data. */ ++#define EXT4_COW_FL 0x20000000 /* Copy on Write marker */ #define EXT4_RESERVED_FL 0x80000000 /* reserved for ext4 lib */ -+#define EXT4_BARRIER_FL 0x04000000 /* Barrier for chroot() */ -+#define EXT4_COW_FL 0x20000000 /* Copy on Write marker */ -+ #define EXT4_FL_USER_VISIBLE 0x004BDFFF /* User visible flags */ - #define EXT4_FL_USER_MODIFIABLE 0x004B80FF /* User modifiable flags */ - -@@ -665,7 +669,7 @@ struct ext4_inode { +@@ -671,7 +674,7 @@ struct ext4_inode { __le16 l_i_uid_high; /* these 2 fields */ __le16 l_i_gid_high; /* were reserved2[0] */ __le16 l_i_checksum_lo;/* crc32c(uuid+inum+inode) LE */ @@ -3011,7 +2901,7 @@ diff -NurpP --minimal linux-3.7/fs/ext4/ext4.h linux-3.7-vs2.3.5.1/fs/ext4/ext4. } linux2; struct { __le16 h_i_reserved1; /* Obsoleted fragment number/size which are removed in ext4 */ -@@ -783,6 +787,7 @@ do { \ +@@ -791,6 +794,7 @@ do { \ #define i_gid_low i_gid #define i_uid_high osd2.linux2.l_i_uid_high #define i_gid_high osd2.linux2.l_i_gid_high @@ -3019,7 +2909,7 @@ diff -NurpP --minimal linux-3.7/fs/ext4/ext4.h linux-3.7-vs2.3.5.1/fs/ext4/ext4. #define i_checksum_lo osd2.linux2.l_i_checksum_lo #elif defined(__GNU__) -@@ -961,6 +966,7 @@ struct ext4_inode_info { +@@ -980,6 +984,7 @@ struct ext4_inode_info { #define EXT4_MOUNT_POSIX_ACL 0x08000 /* POSIX Access Control Lists */ #define EXT4_MOUNT_NO_AUTO_DA_ALLOC 0x10000 /* No auto delalloc mapping */ #define EXT4_MOUNT_BARRIER 0x20000 /* Use block barriers */ @@ -3027,27 +2917,27 @@ diff -NurpP --minimal linux-3.7/fs/ext4/ext4.h linux-3.7-vs2.3.5.1/fs/ext4/ext4. #define EXT4_MOUNT_QUOTA 0x80000 /* Some quota option set */ #define EXT4_MOUNT_USRQUOTA 0x100000 /* "old" user quota */ #define EXT4_MOUNT_GRPQUOTA 0x200000 /* "old" group quota */ -@@ -2412,6 +2418,7 @@ extern int ext4_map_blocks(handle_t *han - struct ext4_map_blocks *map, int flags); - extern int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, - __u64 start, __u64 len); +@@ -2644,6 +2649,7 @@ extern struct buffer_head *ext4_get_firs + extern int ext4_inline_data_fiemap(struct inode *inode, + struct fiemap_extent_info *fieinfo, + int *has_inline); +extern int ext4_sync_flags(struct inode *, int, int); - /* move_extent.c */ - extern int ext4_move_extents(struct file *o_filp, struct file *d_filp, - __u64 start_orig, __u64 start_donor, -diff -NurpP --minimal linux-3.7/fs/ext4/file.c linux-3.7-vs2.3.5.1/fs/ext4/file.c ---- linux-3.7/fs/ext4/file.c 2012-12-11 15:47:33.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ext4/file.c 2012-12-11 15:56:32.000000000 +0000 -@@ -334,5 +334,6 @@ const struct inode_operations ext4_file_ - #endif + extern int ext4_try_to_evict_inline_data(handle_t *handle, + struct inode *inode, + int needed); +diff -NurpP --minimal linux-3.18.5/fs/ext4/file.c linux-3.18.5-vs2.3.7.3/fs/ext4/file.c +--- linux-3.18.5/fs/ext4/file.c 2015-01-17 02:40:17.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/ext4/file.c 2015-01-19 10:57:47.000000000 +0000 +@@ -610,5 +610,6 @@ const struct inode_operations ext4_file_ .get_acl = ext4_get_acl, + .set_acl = ext4_set_acl, .fiemap = ext4_fiemap, + .sync_flags = ext4_sync_flags, }; -diff -NurpP --minimal linux-3.7/fs/ext4/ialloc.c linux-3.7-vs2.3.5.1/fs/ext4/ialloc.c ---- linux-3.7/fs/ext4/ialloc.c 2012-12-11 15:47:33.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ext4/ialloc.c 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/fs/ext4/ialloc.c linux-3.18.5-vs2.3.7.3/fs/ext4/ialloc.c +--- linux-3.18.5/fs/ext4/ialloc.c 2015-01-17 02:40:17.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/ext4/ialloc.c 2015-01-19 10:57:47.000000000 +0000 @@ -22,6 +22,7 @@ #include #include @@ -3056,55 +2946,57 @@ diff -NurpP --minimal linux-3.7/fs/ext4/ialloc.c linux-3.7-vs2.3.5.1/fs/ext4/ial #include #include "ext4.h" -@@ -848,6 +849,7 @@ got: +@@ -754,6 +755,7 @@ struct inode *__ext4_new_inode(handle_t inode->i_mode = mode; inode->i_uid = current_fsuid(); inode->i_gid = dir->i_gid; -+ inode->i_tag = dx_current_fstag(sb); ++ i_tag_write(inode, dx_current_fstag(sb)); } else inode_init_owner(inode, dir, mode); - -diff -NurpP --minimal linux-3.7/fs/ext4/inode.c linux-3.7-vs2.3.5.1/fs/ext4/inode.c ---- linux-3.7/fs/ext4/inode.c 2012-12-11 15:47:33.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ext4/inode.c 2012-12-11 19:25:58.000000000 +0000 -@@ -37,6 +37,7 @@ - #include - #include + dquot_initialize(inode); +diff -NurpP --minimal linux-3.18.5/fs/ext4/inode.c linux-3.18.5-vs2.3.7.3/fs/ext4/inode.c +--- linux-3.18.5/fs/ext4/inode.c 2015-01-17 02:40:17.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/ext4/inode.c 2015-01-19 12:50:18.000000000 +0000 +@@ -39,6 +39,7 @@ #include + #include + #include +#include #include "ext4_jbd2.h" #include "xattr.h" -@@ -3695,41 +3696,64 @@ void ext4_set_inode_flags(struct inode * - { +@@ -3811,42 +3812,66 @@ void ext4_set_inode_flags(struct inode * unsigned int flags = EXT4_I(inode)->i_flags; + unsigned int new_fl = 0; -- inode->i_flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC); -+ inode->i_flags &= ~(S_IMMUTABLE | S_IXUNLINK | -+ S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC); -+ + if (flags & EXT4_IMMUTABLE_FL) -+ inode->i_flags |= S_IMMUTABLE; ++ new_fl |= S_IMMUTABLE; + if (flags & EXT4_IXUNLINK_FL) -+ inode->i_flags |= S_IXUNLINK; ++ new_fl |= S_IXUNLINK; + if (flags & EXT4_SYNC_FL) - inode->i_flags |= S_SYNC; + new_fl |= S_SYNC; if (flags & EXT4_APPEND_FL) - inode->i_flags |= S_APPEND; + new_fl |= S_APPEND; - if (flags & EXT4_IMMUTABLE_FL) -- inode->i_flags |= S_IMMUTABLE; +- new_fl |= S_IMMUTABLE; if (flags & EXT4_NOATIME_FL) - inode->i_flags |= S_NOATIME; + new_fl |= S_NOATIME; if (flags & EXT4_DIRSYNC_FL) - inode->i_flags |= S_DIRSYNC; -+ -+ inode->i_vflags &= ~(V_BARRIER | V_COW); + new_fl |= S_DIRSYNC; + inode_set_flags(inode, new_fl, +- S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC); ++ S_IXUNLINK | S_IMMUTABLE | ++ S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC); + ++ new_fl = 0; + if (flags & EXT4_BARRIER_FL) -+ inode->i_vflags |= V_BARRIER; ++ new_fl |= V_BARRIER; + if (flags & EXT4_COW_FL) -+ inode->i_vflags |= V_COW; ++ new_fl |= V_COW; ++ ++ set_mask_bits(&inode->i_vflags, ++ V_BARRIER | V_COW, new_fl); } /* Propagate flags from i_flags to EXT4_I(inode)->i_flags */ @@ -3147,7 +3039,7 @@ diff -NurpP --minimal linux-3.7/fs/ext4/inode.c linux-3.7-vs2.3.5.1/fs/ext4/inod } while (cmpxchg(&ei->i_flags, old_fl, new_fl) != old_fl); } -@@ -3821,8 +3845,10 @@ struct inode *ext4_iget(struct super_blo +@@ -3950,8 +3975,10 @@ struct inode *ext4_iget(struct super_blo i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16; i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16; } @@ -3160,20 +3052,20 @@ diff -NurpP --minimal linux-3.7/fs/ext4/inode.c linux-3.7-vs2.3.5.1/fs/ext4/inod set_nlink(inode, le16_to_cpu(raw_inode->i_links_count)); ext4_clear_state_flags(ei); /* Only relevant on 32-bit archs */ -@@ -4046,8 +4072,10 @@ static int ext4_do_update_inode(handle_t +@@ -4191,8 +4218,10 @@ static int ext4_do_update_inode(handle_t ext4_get_inode_flags(ei); raw_inode->i_mode = cpu_to_le16(inode->i_mode); - i_uid = i_uid_read(inode); - i_gid = i_gid_read(inode); -+ i_uid = TAGINO_UID(DX_TAG(inode), -+ i_uid_read(inode), i_tag_read(inode)); -+ i_gid = TAGINO_GID(DX_TAG(inode), -+ i_gid_read(inode), i_tag_read(inode)); ++ i_uid = from_kuid(&init_user_ns, ++ TAGINO_KUID(DX_TAG(inode), inode->i_uid, inode->i_tag)); ++ i_gid = from_kgid(&init_user_ns, ++ TAGINO_KGID(DX_TAG(inode), inode->i_gid, inode->i_tag)); if (!(test_opt(inode->i_sb, NO_UID32))) { raw_inode->i_uid_low = cpu_to_le16(low_16_bits(i_uid)); raw_inode->i_gid_low = cpu_to_le16(low_16_bits(i_gid)); -@@ -4070,6 +4098,9 @@ static int ext4_do_update_inode(handle_t +@@ -4215,6 +4244,9 @@ static int ext4_do_update_inode(handle_t raw_inode->i_uid_high = 0; raw_inode->i_gid_high = 0; } @@ -3183,7 +3075,7 @@ diff -NurpP --minimal linux-3.7/fs/ext4/inode.c linux-3.7-vs2.3.5.1/fs/ext4/inod raw_inode->i_links_count = cpu_to_le16(inode->i_nlink); EXT4_INODE_SET_XTIME(i_ctime, inode, raw_inode); -@@ -4258,7 +4289,8 @@ int ext4_setattr(struct dentry *dentry, +@@ -4458,7 +4490,8 @@ int ext4_setattr(struct dentry *dentry, if (is_quota_modification(inode, attr)) dquot_initialize(inode); if ((ia_valid & ATTR_UID && !uid_eq(attr->ia_uid, inode->i_uid)) || @@ -3193,7 +3085,7 @@ diff -NurpP --minimal linux-3.7/fs/ext4/inode.c linux-3.7-vs2.3.5.1/fs/ext4/inod handle_t *handle; /* (user+group)*(old+new) structure, inode write (sb, -@@ -4280,6 +4312,8 @@ int ext4_setattr(struct dentry *dentry, +@@ -4481,6 +4514,8 @@ int ext4_setattr(struct dentry *dentry, inode->i_uid = attr->ia_uid; if (attr->ia_valid & ATTR_GID) inode->i_gid = attr->ia_gid; @@ -3202,10 +3094,10 @@ diff -NurpP --minimal linux-3.7/fs/ext4/inode.c linux-3.7-vs2.3.5.1/fs/ext4/inod error = ext4_mark_inode_dirty(handle, inode); ext4_journal_stop(handle); } -diff -NurpP --minimal linux-3.7/fs/ext4/ioctl.c linux-3.7-vs2.3.5.1/fs/ext4/ioctl.c ---- linux-3.7/fs/ext4/ioctl.c 2012-12-11 15:47:33.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ext4/ioctl.c 2012-12-11 15:56:32.000000000 +0000 -@@ -14,12 +14,40 @@ +diff -NurpP --minimal linux-3.18.5/fs/ext4/ioctl.c linux-3.18.5-vs2.3.7.3/fs/ext4/ioctl.c +--- linux-3.18.5/fs/ext4/ioctl.c 2015-01-17 02:40:17.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/ext4/ioctl.c 2015-01-19 10:57:47.000000000 +0000 +@@ -14,6 +14,7 @@ #include #include #include @@ -3213,8 +3105,9 @@ diff -NurpP --minimal linux-3.7/fs/ext4/ioctl.c linux-3.7-vs2.3.5.1/fs/ext4/ioct #include #include "ext4_jbd2.h" #include "ext4.h" - - #define MAX_32_NUM ((((unsigned long long) 1) << 32) - 1) +@@ -198,6 +199,33 @@ journal_err_out: + return err; + } +int ext4_sync_flags(struct inode *inode, int flags, int vflags) +{ @@ -3222,7 +3115,7 @@ diff -NurpP --minimal linux-3.7/fs/ext4/ioctl.c linux-3.7-vs2.3.5.1/fs/ext4/ioct + struct ext4_iloc iloc; + int err; + -+ handle = ext4_journal_start(inode, 1); ++ handle = ext4_journal_start(inode, EXT4_HT_INODE, 1); + if (IS_ERR(handle)) + return PTR_ERR(handle); + @@ -3245,8 +3138,8 @@ diff -NurpP --minimal linux-3.7/fs/ext4/ioctl.c linux-3.7-vs2.3.5.1/fs/ext4/ioct + long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { - struct inode *inode = filp->f_dentry->d_inode; -@@ -53,6 +81,11 @@ long ext4_ioctl(struct file *filp, unsig + struct inode *inode = file_inode(filp); +@@ -231,6 +259,11 @@ long ext4_ioctl(struct file *filp, unsig flags = ext4_mask_flags(inode->i_mode, flags); @@ -3258,7 +3151,7 @@ diff -NurpP --minimal linux-3.7/fs/ext4/ioctl.c linux-3.7-vs2.3.5.1/fs/ext4/ioct err = -EPERM; mutex_lock(&inode->i_mutex); /* Is it quota file? Do not allow user to mess with it */ -@@ -70,7 +103,9 @@ long ext4_ioctl(struct file *filp, unsig +@@ -248,7 +281,9 @@ long ext4_ioctl(struct file *filp, unsig * * This test looks nicer. Thanks to Pauline Middelink */ @@ -3269,9 +3162,9 @@ diff -NurpP --minimal linux-3.7/fs/ext4/ioctl.c linux-3.7-vs2.3.5.1/fs/ext4/ioct if (!capable(CAP_LINUX_IMMUTABLE)) goto flags_out; } -diff -NurpP --minimal linux-3.7/fs/ext4/namei.c linux-3.7-vs2.3.5.1/fs/ext4/namei.c ---- linux-3.7/fs/ext4/namei.c 2012-12-11 15:47:33.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ext4/namei.c 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/fs/ext4/namei.c linux-3.18.5-vs2.3.7.3/fs/ext4/namei.c +--- linux-3.18.5/fs/ext4/namei.c 2015-01-17 02:40:17.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/ext4/namei.c 2015-01-19 10:57:47.000000000 +0000 @@ -34,6 +34,7 @@ #include #include @@ -3280,7 +3173,7 @@ diff -NurpP --minimal linux-3.7/fs/ext4/namei.c linux-3.7-vs2.3.5.1/fs/ext4/name #include "ext4.h" #include "ext4_jbd2.h" -@@ -1232,6 +1233,7 @@ restart: +@@ -1279,6 +1280,7 @@ restart: ll_rw_block(READ | REQ_META | REQ_PRIO, 1, &bh); } @@ -3288,18 +3181,18 @@ diff -NurpP --minimal linux-3.7/fs/ext4/namei.c linux-3.7-vs2.3.5.1/fs/ext4/name } if ((bh = bh_use[ra_ptr++]) == NULL) goto next; -@@ -3051,6 +3053,7 @@ const struct inode_operations ext4_dir_i - #endif +@@ -3539,6 +3541,7 @@ const struct inode_operations ext4_dir_i .get_acl = ext4_get_acl, + .set_acl = ext4_set_acl, .fiemap = ext4_fiemap, + .sync_flags = ext4_sync_flags, }; const struct inode_operations ext4_special_inode_operations = { -diff -NurpP --minimal linux-3.7/fs/ext4/super.c linux-3.7-vs2.3.5.1/fs/ext4/super.c ---- linux-3.7/fs/ext4/super.c 2012-12-11 15:47:33.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ext4/super.c 2012-12-11 19:16:16.000000000 +0000 -@@ -1222,7 +1222,7 @@ enum { +diff -NurpP --minimal linux-3.18.5/fs/ext4/super.c linux-3.18.5-vs2.3.7.3/fs/ext4/super.c +--- linux-3.18.5/fs/ext4/super.c 2015-01-17 02:40:17.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/ext4/super.c 2015-01-19 10:57:47.000000000 +0000 +@@ -1146,7 +1146,7 @@ enum { Opt_inode_readahead_blks, Opt_journal_ioprio, Opt_dioread_nolock, Opt_dioread_lock, Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable, @@ -3308,7 +3201,7 @@ diff -NurpP --minimal linux-3.7/fs/ext4/super.c linux-3.7-vs2.3.5.1/fs/ext4/supe }; static const match_table_t tokens = { -@@ -1302,6 +1302,9 @@ static const match_table_t tokens = { +@@ -1227,6 +1227,9 @@ static const match_table_t tokens = { {Opt_removed, "reservation"}, /* mount option from ext2/3 */ {Opt_removed, "noreservation"}, /* mount option from ext2/3 */ {Opt_removed, "journal=%u"}, /* mount option from ext2/3 */ @@ -3318,9 +3211,9 @@ diff -NurpP --minimal linux-3.7/fs/ext4/super.c linux-3.7-vs2.3.5.1/fs/ext4/supe {Opt_err, NULL}, }; -@@ -1549,6 +1552,20 @@ static int handle_mount_opt(struct super - return -1; - *journal_ioprio = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, arg); +@@ -1459,6 +1462,20 @@ static int handle_mount_opt(struct super + case Opt_i_version: + sb->s_flags |= MS_I_VERSION; return 1; +#ifndef CONFIG_TAGGING_NONE + case Opt_tag: @@ -3338,9 +3231,9 @@ diff -NurpP --minimal linux-3.7/fs/ext4/super.c linux-3.7-vs2.3.5.1/fs/ext4/supe +#endif } - for (m = ext4_mount_opts; m->token != Opt_err; m++) { -@@ -3455,6 +3472,9 @@ static int ext4_fill_super(struct super_ - } + for (m = ext4_mount_opts; m->token != Opt_err; m++) +@@ -3600,6 +3617,9 @@ static int ext4_fill_super(struct super_ + clear_opt(sb, DELALLOC); } + if (EXT4_SB(sb)->s_mount_opt & EXT4_MOUNT_TAGGED) @@ -3349,7 +3242,7 @@ diff -NurpP --minimal linux-3.7/fs/ext4/super.c linux-3.7-vs2.3.5.1/fs/ext4/supe sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); -@@ -4618,6 +4638,14 @@ static int ext4_remount(struct super_blo +@@ -4872,6 +4892,14 @@ static int ext4_remount(struct super_blo if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED) ext4_abort(sb, "Abort forced by user"); @@ -3364,18 +3257,18 @@ diff -NurpP --minimal linux-3.7/fs/ext4/super.c linux-3.7-vs2.3.5.1/fs/ext4/supe sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); -diff -NurpP --minimal linux-3.7/fs/fcntl.c linux-3.7-vs2.3.5.1/fs/fcntl.c ---- linux-3.7/fs/fcntl.c 2012-12-11 15:47:33.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/fcntl.c 2012-12-11 15:56:32.000000000 +0000 -@@ -21,6 +21,7 @@ - #include +diff -NurpP --minimal linux-3.18.5/fs/fcntl.c linux-3.18.5-vs2.3.7.3/fs/fcntl.c +--- linux-3.18.5/fs/fcntl.c 2015-01-17 02:40:17.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/fcntl.c 2015-01-19 11:48:08.000000000 +0000 +@@ -22,6 +22,7 @@ #include #include + #include +#include #include #include -@@ -378,6 +379,8 @@ SYSCALL_DEFINE3(fcntl64, unsigned int, f +@@ -385,6 +386,8 @@ SYSCALL_DEFINE3(fcntl64, unsigned int, f if (!f.file) goto out; @@ -3384,18 +3277,18 @@ diff -NurpP --minimal linux-3.7/fs/fcntl.c linux-3.7-vs2.3.5.1/fs/fcntl.c if (unlikely(f.file->f_mode & FMODE_PATH)) { if (!check_fcntl_cmd(cmd)) -diff -NurpP --minimal linux-3.7/fs/file.c linux-3.7-vs2.3.5.1/fs/file.c ---- linux-3.7/fs/file.c 2012-12-11 15:47:33.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/file.c 2012-12-11 21:51:51.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/fs/file.c linux-3.18.5-vs2.3.7.3/fs/file.c +--- linux-3.18.5/fs/file.c 2015-01-17 02:40:17.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/file.c 2015-01-19 10:57:47.000000000 +0000 @@ -22,6 +22,7 @@ #include #include #include +#include - struct fdtable_defer { - spinlock_t lock; -@@ -364,6 +365,8 @@ struct files_struct *dup_fd(struct files + int sysctl_nr_open __read_mostly = 1024*1024; + int sysctl_nr_open_min = BITS_PER_LONG; +@@ -309,6 +310,8 @@ struct files_struct *dup_fd(struct files struct file *f = *old_fds++; if (f) { get_file(f); @@ -3404,9 +3297,9 @@ diff -NurpP --minimal linux-3.7/fs/file.c linux-3.7-vs2.3.5.1/fs/file.c } else { /* * The fd may be claimed in the fd bitmap but not yet -@@ -429,9 +432,11 @@ static void close_files(struct files_str +@@ -369,9 +372,11 @@ static struct fdtable *close_files(struc filp_close(file, files); - cond_resched(); + cond_resched_rcu_qs(); } + vx_openfd_dec(i); } @@ -3415,16 +3308,16 @@ diff -NurpP --minimal linux-3.7/fs/file.c linux-3.7-vs2.3.5.1/fs/file.c + cond_resched(); } } - } -@@ -573,6 +578,7 @@ repeat: + +@@ -487,6 +492,7 @@ repeat: else __clear_close_on_exec(fd, fdt); error = fd; + vx_openfd_inc(fd); #if 1 /* Sanity check */ - if (rcu_dereference_raw(fdt->fd[fd]) != NULL) { -@@ -603,6 +609,7 @@ static void __put_unused_fd(struct files + if (rcu_access_pointer(fdt->fd[fd]) != NULL) { +@@ -517,6 +523,7 @@ static void __put_unused_fd(struct files __clear_open_fd(fd, fdt); if (fd < files->next_fd) files->next_fd = fd; @@ -3432,7 +3325,7 @@ diff -NurpP --minimal linux-3.7/fs/file.c linux-3.7-vs2.3.5.1/fs/file.c } void put_unused_fd(unsigned int fd) -@@ -882,6 +889,8 @@ static int do_dup2(struct files_struct * +@@ -784,6 +791,8 @@ __releases(&files->file_lock) if (tofree) filp_close(tofree, files); @@ -3441,9 +3334,9 @@ diff -NurpP --minimal linux-3.7/fs/file.c linux-3.7-vs2.3.5.1/fs/file.c return fd; -diff -NurpP --minimal linux-3.7/fs/file_table.c linux-3.7-vs2.3.5.1/fs/file_table.c ---- linux-3.7/fs/file_table.c 2012-12-11 15:47:33.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/file_table.c 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/fs/file_table.c linux-3.18.5-vs2.3.7.3/fs/file_table.c +--- linux-3.18.5/fs/file_table.c 2015-01-17 02:40:17.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/file_table.c 2015-01-19 12:36:42.000000000 +0000 @@ -26,6 +26,8 @@ #include #include @@ -3453,8 +3346,8 @@ diff -NurpP --minimal linux-3.7/fs/file_table.c linux-3.7-vs2.3.5.1/fs/file_tabl #include -@@ -136,6 +138,8 @@ struct file *get_empty_filp(void) - spin_lock_init(&f->f_lock); +@@ -137,6 +139,8 @@ struct file *get_empty_filp(void) + mutex_init(&f->f_pos_lock); eventpoll_init_file(f); /* f->f_version: 0 */ + f->f_xid = vx_current_xid(); @@ -3462,27 +3355,27 @@ diff -NurpP --minimal linux-3.7/fs/file_table.c linux-3.7-vs2.3.5.1/fs/file_tabl return f; over: -@@ -257,6 +261,8 @@ static void __fput(struct file *file) - i_readcount_dec(inode); - if (file->f_mode & FMODE_WRITE) - drop_file_write_access(file); +@@ -219,6 +223,8 @@ static void __fput(struct file *file) + put_write_access(inode); + __mnt_drop_write(mnt); + } + vx_files_dec(file); + file->f_xid = 0; file->f_path.dentry = NULL; file->f_path.mnt = NULL; - file_free(file); -@@ -343,6 +349,8 @@ void put_filp(struct file *file) + file->f_inode = NULL; +@@ -305,6 +311,8 @@ void put_filp(struct file *file) { if (atomic_long_dec_and_test(&file->f_count)) { security_file_free(file); + vx_files_dec(file); + file->f_xid = 0; - file_sb_list_del(file); file_free(file); } -diff -NurpP --minimal linux-3.7/fs/fs_struct.c linux-3.7-vs2.3.5.1/fs/fs_struct.c ---- linux-3.7/fs/fs_struct.c 2012-10-04 13:27:39.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/fs_struct.c 2012-12-11 15:56:32.000000000 +0000 + } +diff -NurpP --minimal linux-3.18.5/fs/fs_struct.c linux-3.18.5-vs2.3.7.3/fs/fs_struct.c +--- linux-3.18.5/fs/fs_struct.c 2014-01-22 20:39:06.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/fs_struct.c 2015-01-19 10:57:47.000000000 +0000 @@ -4,6 +4,7 @@ #include #include @@ -3507,10 +3400,10 @@ diff -NurpP --minimal linux-3.7/fs/fs_struct.c linux-3.7-vs2.3.5.1/fs/fs_struct. } return fs; } -diff -NurpP --minimal linux-3.7/fs/gfs2/file.c linux-3.7-vs2.3.5.1/fs/gfs2/file.c ---- linux-3.7/fs/gfs2/file.c 2012-12-11 15:47:34.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/gfs2/file.c 2012-12-11 15:56:32.000000000 +0000 -@@ -143,6 +143,9 @@ static const u32 fsflags_to_gfs2[32] = { +diff -NurpP --minimal linux-3.18.5/fs/gfs2/file.c linux-3.18.5-vs2.3.7.3/fs/gfs2/file.c +--- linux-3.18.5/fs/gfs2/file.c 2015-01-17 02:40:17.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/gfs2/file.c 2015-01-19 10:57:47.000000000 +0000 +@@ -138,6 +138,9 @@ static const u32 fsflags_to_gfs2[32] = { [12] = GFS2_DIF_EXHASH, [14] = GFS2_DIF_INHERIT_JDATA, [17] = GFS2_DIF_TOPDIR, @@ -3520,7 +3413,7 @@ diff -NurpP --minimal linux-3.7/fs/gfs2/file.c linux-3.7-vs2.3.5.1/fs/gfs2/file. }; static const u32 gfs2_to_fsflags[32] = { -@@ -153,6 +156,9 @@ static const u32 gfs2_to_fsflags[32] = { +@@ -148,6 +151,9 @@ static const u32 gfs2_to_fsflags[32] = { [gfs2fl_ExHash] = FS_INDEX_FL, [gfs2fl_TopLevel] = FS_TOPDIR_FL, [gfs2fl_InheritJdata] = FS_JOURNAL_DATA_FL, @@ -3530,7 +3423,7 @@ diff -NurpP --minimal linux-3.7/fs/gfs2/file.c linux-3.7-vs2.3.5.1/fs/gfs2/file. }; static int gfs2_get_flags(struct file *filp, u32 __user *ptr) -@@ -183,12 +189,18 @@ void gfs2_set_inode_flags(struct inode * +@@ -178,12 +184,18 @@ void gfs2_set_inode_flags(struct inode * { struct gfs2_inode *ip = GFS2_I(inode); unsigned int flags = inode->i_flags; @@ -3550,7 +3443,7 @@ diff -NurpP --minimal linux-3.7/fs/gfs2/file.c linux-3.7-vs2.3.5.1/fs/gfs2/file. if (ip->i_diskflags & GFS2_DIF_APPENDONLY) flags |= S_APPEND; if (ip->i_diskflags & GFS2_DIF_NOATIME) -@@ -196,6 +208,43 @@ void gfs2_set_inode_flags(struct inode * +@@ -191,6 +203,43 @@ void gfs2_set_inode_flags(struct inode * if (ip->i_diskflags & GFS2_DIF_SYNC) flags |= S_SYNC; inode->i_flags = flags; @@ -3594,7 +3487,7 @@ diff -NurpP --minimal linux-3.7/fs/gfs2/file.c linux-3.7-vs2.3.5.1/fs/gfs2/file. } /* Flags that can be set by user space */ -@@ -309,6 +358,37 @@ static int gfs2_set_flags(struct file *f +@@ -304,6 +353,37 @@ static int gfs2_set_flags(struct file *f return do_gfs2_set_flags(filp, gfsflags, ~GFS2_DIF_JDATA); } @@ -3615,7 +3508,7 @@ diff -NurpP --minimal linux-3.7/fs/gfs2/file.c linux-3.7-vs2.3.5.1/fs/gfs2/file. + error = gfs2_meta_inode_buffer(ip, &bh); + if (error) + goto out_trans_end; -+ gfs2_trans_add_bh(ip->i_gl, bh, 1); ++ gfs2_trans_add_meta(ip->i_gl, bh); + inode->i_flags = flags; + inode->i_vflags = vflags; + gfs2_get_inode_flags(inode); @@ -3632,10 +3525,10 @@ diff -NurpP --minimal linux-3.7/fs/gfs2/file.c linux-3.7-vs2.3.5.1/fs/gfs2/file. static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { switch(cmd) { -diff -NurpP --minimal linux-3.7/fs/gfs2/inode.h linux-3.7-vs2.3.5.1/fs/gfs2/inode.h ---- linux-3.7/fs/gfs2/inode.h 2012-07-22 21:39:40.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/gfs2/inode.h 2012-12-11 15:56:32.000000000 +0000 -@@ -117,6 +117,7 @@ extern const struct file_operations gfs2 +diff -NurpP --minimal linux-3.18.5/fs/gfs2/inode.h linux-3.18.5-vs2.3.7.3/fs/gfs2/inode.h +--- linux-3.18.5/fs/gfs2/inode.h 2013-11-25 15:45:01.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/gfs2/inode.h 2015-01-19 10:57:47.000000000 +0000 +@@ -118,6 +118,7 @@ extern const struct file_operations gfs2 extern const struct file_operations gfs2_dir_fops_nolock; extern void gfs2_set_inode_flags(struct inode *inode); @@ -3643,29 +3536,29 @@ diff -NurpP --minimal linux-3.7/fs/gfs2/inode.h linux-3.7-vs2.3.5.1/fs/gfs2/inod #ifdef CONFIG_GFS2_FS_LOCKING_DLM extern const struct file_operations gfs2_file_fops; -diff -NurpP --minimal linux-3.7/fs/hostfs/hostfs.h linux-3.7-vs2.3.5.1/fs/hostfs/hostfs.h ---- linux-3.7/fs/hostfs/hostfs.h 2012-12-11 15:47:34.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/hostfs/hostfs.h 2012-12-11 16:35:58.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/fs/hostfs/hostfs.h linux-3.18.5-vs2.3.7.3/fs/hostfs/hostfs.h +--- linux-3.18.5/fs/hostfs/hostfs.h 2015-01-16 22:19:18.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/hostfs/hostfs.h 2015-01-19 10:57:47.000000000 +0000 @@ -42,6 +42,7 @@ struct hostfs_iattr { unsigned short ia_mode; uid_t ia_uid; gid_t ia_gid; -+ tag_t ia_tag; ++ vtag_t ia_tag; loff_t ia_size; struct timespec ia_atime; struct timespec ia_mtime; -diff -NurpP --minimal linux-3.7/fs/inode.c linux-3.7-vs2.3.5.1/fs/inode.c ---- linux-3.7/fs/inode.c 2012-12-11 15:47:34.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/inode.c 2012-12-11 19:26:31.000000000 +0000 -@@ -17,6 +17,7 @@ - #include +diff -NurpP --minimal linux-3.18.5/fs/inode.c linux-3.18.5-vs2.3.7.3/fs/inode.c +--- linux-3.18.5/fs/inode.c 2015-01-16 22:19:18.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/inode.c 2015-01-19 10:57:47.000000000 +0000 +@@ -18,6 +18,7 @@ #include /* for inode_has_buffers */ #include + #include +#include #include "internal.h" /* -@@ -128,6 +129,8 @@ int inode_init_always(struct super_block +@@ -129,6 +130,8 @@ int inode_init_always(struct super_block struct address_space *const mapping = &inode->i_data; inode->i_sb = sb; @@ -3674,7 +3567,7 @@ diff -NurpP --minimal linux-3.7/fs/inode.c linux-3.7-vs2.3.5.1/fs/inode.c inode->i_blkbits = sb->s_blocksize_bits; inode->i_flags = 0; atomic_set(&inode->i_count, 1); -@@ -137,6 +140,7 @@ int inode_init_always(struct super_block +@@ -138,6 +141,7 @@ int inode_init_always(struct super_block inode->i_opflags = 0; i_uid_write(inode, 0); i_gid_write(inode, 0); @@ -3682,7 +3575,7 @@ diff -NurpP --minimal linux-3.7/fs/inode.c linux-3.7-vs2.3.5.1/fs/inode.c atomic_set(&inode->i_writecount, 0); inode->i_size = 0; inode->i_blocks = 0; -@@ -149,6 +153,7 @@ int inode_init_always(struct super_block +@@ -150,6 +154,7 @@ int inode_init_always(struct super_block inode->i_bdev = NULL; inode->i_cdev = NULL; inode->i_rdev = 0; @@ -3690,7 +3583,7 @@ diff -NurpP --minimal linux-3.7/fs/inode.c linux-3.7-vs2.3.5.1/fs/inode.c inode->dirtied_when = 0; if (security_inode_alloc(inode)) -@@ -483,6 +488,8 @@ void __insert_inode_hash(struct inode *i +@@ -478,6 +483,8 @@ void __insert_inode_hash(struct inode *i } EXPORT_SYMBOL(__insert_inode_hash); @@ -3699,7 +3592,7 @@ diff -NurpP --minimal linux-3.7/fs/inode.c linux-3.7-vs2.3.5.1/fs/inode.c /** * __remove_inode_hash - remove an inode from the hash * @inode: inode to unhash -@@ -1804,9 +1811,11 @@ void init_special_inode(struct inode *in +@@ -1795,9 +1802,11 @@ void init_special_inode(struct inode *in if (S_ISCHR(mode)) { inode->i_fop = &def_chr_fops; inode->i_rdev = rdev; @@ -3709,19 +3602,19 @@ diff -NurpP --minimal linux-3.7/fs/inode.c linux-3.7-vs2.3.5.1/fs/inode.c inode->i_rdev = rdev; + inode->i_mdev = rdev; } else if (S_ISFIFO(mode)) - inode->i_fop = &def_fifo_fops; + inode->i_fop = &pipefifo_fops; else if (S_ISSOCK(mode)) -@@ -1835,6 +1844,7 @@ void inode_init_owner(struct inode *inod +@@ -1826,6 +1835,7 @@ void inode_init_owner(struct inode *inod } else inode->i_gid = current_fsgid(); inode->i_mode = mode; -+ inode->i_tag = dx_current_fstag(inode->i_sb); ++ i_tag_write(inode, dx_current_fstag(inode->i_sb)); } EXPORT_SYMBOL(inode_init_owner); -diff -NurpP --minimal linux-3.7/fs/ioctl.c linux-3.7-vs2.3.5.1/fs/ioctl.c ---- linux-3.7/fs/ioctl.c 2012-12-11 15:47:34.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ioctl.c 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/fs/ioctl.c linux-3.18.5-vs2.3.7.3/fs/ioctl.c +--- linux-3.18.5/fs/ioctl.c 2014-01-22 20:39:06.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/ioctl.c 2015-01-19 10:57:47.000000000 +0000 @@ -15,6 +15,9 @@ #include #include @@ -3732,39 +3625,10 @@ diff -NurpP --minimal linux-3.7/fs/ioctl.c linux-3.7-vs2.3.5.1/fs/ioctl.c #include -diff -NurpP --minimal linux-3.7/fs/ioprio.c linux-3.7-vs2.3.5.1/fs/ioprio.c ---- linux-3.7/fs/ioprio.c 2012-07-22 21:39:40.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ioprio.c 2012-12-11 15:56:32.000000000 +0000 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - int set_task_ioprio(struct task_struct *task, int ioprio) - { -@@ -105,6 +106,8 @@ SYSCALL_DEFINE3(ioprio_set, int, which, - else - pgrp = find_vpid(who); - do_each_pid_thread(pgrp, PIDTYPE_PGID, p) { -+ if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT)) -+ continue; - ret = set_task_ioprio(p, ioprio); - if (ret) - break; -@@ -198,6 +201,8 @@ SYSCALL_DEFINE2(ioprio_get, int, which, - else - pgrp = find_vpid(who); - do_each_pid_thread(pgrp, PIDTYPE_PGID, p) { -+ if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT)) -+ continue; - tmpio = get_task_ioprio(p); - if (tmpio < 0) - continue; -diff -NurpP --minimal linux-3.7/fs/jfs/file.c linux-3.7-vs2.3.5.1/fs/jfs/file.c ---- linux-3.7/fs/jfs/file.c 2012-12-11 15:47:34.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/jfs/file.c 2012-12-11 17:20:13.000000000 +0000 -@@ -109,7 +109,8 @@ int jfs_setattr(struct dentry *dentry, s +diff -NurpP --minimal linux-3.18.5/fs/jfs/file.c linux-3.18.5-vs2.3.7.3/fs/jfs/file.c +--- linux-3.18.5/fs/jfs/file.c 2014-09-03 13:19:40.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/jfs/file.c 2015-01-19 10:58:03.000000000 +0000 +@@ -110,7 +110,8 @@ int jfs_setattr(struct dentry *dentry, s if (is_quota_modification(inode, iattr)) dquot_initialize(inode); if ((iattr->ia_valid & ATTR_UID && !uid_eq(iattr->ia_uid, inode->i_uid)) || @@ -3774,17 +3638,17 @@ diff -NurpP --minimal linux-3.7/fs/jfs/file.c linux-3.7-vs2.3.5.1/fs/jfs/file.c rc = dquot_transfer(inode, iattr); if (rc) return rc; -@@ -142,6 +143,7 @@ const struct inode_operations jfs_file_i - #ifdef CONFIG_JFS_POSIX_ACL +@@ -146,6 +147,7 @@ const struct inode_operations jfs_file_i .get_acl = jfs_get_acl, + .set_acl = jfs_set_acl, #endif + .sync_flags = jfs_sync_flags, }; const struct file_operations jfs_file_operations = { -diff -NurpP --minimal linux-3.7/fs/jfs/ioctl.c linux-3.7-vs2.3.5.1/fs/jfs/ioctl.c ---- linux-3.7/fs/jfs/ioctl.c 2012-12-11 15:47:34.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/jfs/ioctl.c 2012-12-11 17:34:44.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/fs/jfs/ioctl.c linux-3.18.5-vs2.3.7.3/fs/jfs/ioctl.c +--- linux-3.18.5/fs/jfs/ioctl.c 2013-05-31 13:45:24.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/jfs/ioctl.c 2015-01-19 10:58:03.000000000 +0000 @@ -12,6 +12,7 @@ #include #include @@ -3809,7 +3673,7 @@ diff -NurpP --minimal linux-3.7/fs/jfs/ioctl.c linux-3.7-vs2.3.5.1/fs/jfs/ioctl. + long jfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { - struct inode *inode = filp->f_dentry->d_inode; + struct inode *inode = file_inode(filp); @@ -89,6 +100,11 @@ long jfs_ioctl(struct file *filp, unsign if (!S_ISDIR(inode->i_mode)) flags &= ~JFS_DIRSYNC_FL; @@ -3842,9 +3706,9 @@ diff -NurpP --minimal linux-3.7/fs/jfs/ioctl.c linux-3.7-vs2.3.5.1/fs/jfs/ioctl. flags |= oldflags & ~JFS_FL_USER_MODIFIABLE; jfs_inode->mode2 = flags; -diff -NurpP --minimal linux-3.7/fs/jfs/jfs_dinode.h linux-3.7-vs2.3.5.1/fs/jfs/jfs_dinode.h ---- linux-3.7/fs/jfs/jfs_dinode.h 2008-12-24 23:26:37.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/jfs/jfs_dinode.h 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/fs/jfs/jfs_dinode.h linux-3.18.5-vs2.3.7.3/fs/jfs/jfs_dinode.h +--- linux-3.18.5/fs/jfs/jfs_dinode.h 2012-12-11 03:30:57.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/jfs/jfs_dinode.h 2015-01-19 10:58:03.000000000 +0000 @@ -161,9 +161,13 @@ struct dinode { #define JFS_APPEND_FL 0x01000000 /* writes to file may only append */ @@ -3861,9 +3725,9 @@ diff -NurpP --minimal linux-3.7/fs/jfs/jfs_dinode.h linux-3.7-vs2.3.5.1/fs/jfs/j #define JFS_FL_INHERIT 0x03C80000 /* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */ -diff -NurpP --minimal linux-3.7/fs/jfs/jfs_filsys.h linux-3.7-vs2.3.5.1/fs/jfs/jfs_filsys.h ---- linux-3.7/fs/jfs/jfs_filsys.h 2012-12-11 15:47:34.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/jfs/jfs_filsys.h 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/fs/jfs/jfs_filsys.h linux-3.18.5-vs2.3.7.3/fs/jfs/jfs_filsys.h +--- linux-3.18.5/fs/jfs/jfs_filsys.h 2012-12-11 03:30:57.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/jfs/jfs_filsys.h 2015-01-19 10:58:03.000000000 +0000 @@ -266,6 +266,7 @@ #define JFS_NAME_MAX 255 #define JFS_PATH_MAX BPSIZE @@ -3872,9 +3736,9 @@ diff -NurpP --minimal linux-3.7/fs/jfs/jfs_filsys.h linux-3.7-vs2.3.5.1/fs/jfs/j /* * file system state (superblock state) -diff -NurpP --minimal linux-3.7/fs/jfs/jfs_imap.c linux-3.7-vs2.3.5.1/fs/jfs/jfs_imap.c ---- linux-3.7/fs/jfs/jfs_imap.c 2012-12-11 15:47:34.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/jfs/jfs_imap.c 2012-12-11 22:02:05.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/fs/jfs/jfs_imap.c linux-3.18.5-vs2.3.7.3/fs/jfs/jfs_imap.c +--- linux-3.18.5/fs/jfs/jfs_imap.c 2013-11-25 15:45:01.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/jfs/jfs_imap.c 2015-01-19 10:58:03.000000000 +0000 @@ -46,6 +46,7 @@ #include #include @@ -3883,26 +3747,25 @@ diff -NurpP --minimal linux-3.7/fs/jfs/jfs_imap.c linux-3.7-vs2.3.5.1/fs/jfs/jfs #include "jfs_incore.h" #include "jfs_inode.h" -@@ -3058,6 +3059,8 @@ static int copy_from_dinode(struct dinod +@@ -3047,6 +3048,8 @@ static int copy_from_dinode(struct dinod { struct jfs_inode_info *jfs_ip = JFS_IP(ip); struct jfs_sb_info *sbi = JFS_SBI(ip->i_sb); -+ kuid_t uid; -+ kgid_t gid; ++ kuid_t kuid; ++ kgid_t kgid; jfs_ip->fileset = le32_to_cpu(dip->di_fileset); jfs_ip->mode2 = le32_to_cpu(dip->di_mode); -@@ -3078,14 +3081,19 @@ static int copy_from_dinode(struct dinod +@@ -3067,14 +3070,18 @@ static int copy_from_dinode(struct dinod } set_nlink(ip, le32_to_cpu(dip->di_nlink)); - jfs_ip->saved_uid = make_kuid(&init_user_ns, le32_to_cpu(dip->di_uid)); -+ uid = make_kuid(&init_user_ns, le32_to_cpu(dip->di_uid)); -+ gid = make_kgid(&init_user_ns, le32_to_cpu(dip->di_gid)); -+ ip->i_tag = make_ktag(&init_user_ns, -+ INOTAG_TAG(DX_TAG(ip), uid, gid, 0)); ++ kuid = make_kuid(&init_user_ns, le32_to_cpu(dip->di_uid)); ++ kgid = make_kgid(&init_user_ns, le32_to_cpu(dip->di_gid)); ++ ip->i_tag = INOTAG_KTAG(DX_TAG(ip), kuid, kgid, GLOBAL_ROOT_TAG); + -+ jfs_ip->saved_uid = INOTAG_UID(DX_TAG(ip), uid, gid); ++ jfs_ip->saved_uid = INOTAG_KUID(DX_TAG(ip), kuid, kgid); if (!uid_valid(sbi->uid)) ip->i_uid = jfs_ip->saved_uid; else { @@ -3910,11 +3773,11 @@ diff -NurpP --minimal linux-3.7/fs/jfs/jfs_imap.c linux-3.7-vs2.3.5.1/fs/jfs/jfs } - jfs_ip->saved_gid = make_kgid(&init_user_ns, le32_to_cpu(dip->di_gid)); -+ jfs_ip->saved_gid = INOTAG_GID(DX_TAG(ip), uid, gid); ++ jfs_ip->saved_gid = INOTAG_KGID(DX_TAG(ip), kuid, kgid); if (!gid_valid(sbi->gid)) ip->i_gid = jfs_ip->saved_gid; else { -@@ -3150,16 +3158,14 @@ static void copy_to_dinode(struct dinode +@@ -3139,16 +3146,14 @@ static void copy_to_dinode(struct dinode dip->di_size = cpu_to_le64(ip->i_size); dip->di_nblocks = cpu_to_le64(PBLK2LBLK(ip->i_sb, ip->i_blocks)); dip->di_nlink = cpu_to_le32(ip->i_nlink); @@ -3929,19 +3792,19 @@ diff -NurpP --minimal linux-3.7/fs/jfs/jfs_imap.c linux-3.7-vs2.3.5.1/fs/jfs/jfs - dip->di_gid = cpu_to_le32(from_kgid(&init_user_ns, - jfs_ip->saved_gid)); + dip->di_uid = cpu_to_le32(from_kuid(&init_user_ns, -+ TAGINO_UID(DX_TAG(ip), ++ TAGINO_KUID(DX_TAG(ip), + !uid_valid(sbi->uid) ? ip->i_uid : jfs_ip->saved_uid, + ip->i_tag))); -+ dip->di_gid = cpu_to_le32(from_kuid(&init_user_ns, -+ TAGINO_GID(DX_TAG(ip), ++ dip->di_gid = cpu_to_le32(from_kgid(&init_user_ns, ++ TAGINO_KGID(DX_TAG(ip), + !gid_valid(sbi->gid) ? ip->i_gid : jfs_ip->saved_gid, + ip->i_tag))); jfs_get_inode_flags(jfs_ip); /* * mode2 is only needed for storing the higher order bits. -diff -NurpP --minimal linux-3.7/fs/jfs/jfs_inode.c linux-3.7-vs2.3.5.1/fs/jfs/jfs_inode.c ---- linux-3.7/fs/jfs/jfs_inode.c 2012-01-09 15:14:54.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/jfs/jfs_inode.c 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/fs/jfs/jfs_inode.c linux-3.18.5-vs2.3.7.3/fs/jfs/jfs_inode.c +--- linux-3.18.5/fs/jfs/jfs_inode.c 2014-09-03 13:19:40.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/jfs/jfs_inode.c 2015-01-21 09:53:08.000000000 +0000 @@ -18,6 +18,7 @@ #include @@ -3950,37 +3813,35 @@ diff -NurpP --minimal linux-3.7/fs/jfs/jfs_inode.c linux-3.7-vs2.3.5.1/fs/jfs/jf #include "jfs_incore.h" #include "jfs_inode.h" #include "jfs_filsys.h" -@@ -30,29 +31,46 @@ void jfs_set_inode_flags(struct inode *i - { - unsigned int flags = JFS_IP(inode)->mode2; - -- inode->i_flags &= ~(S_IMMUTABLE | S_APPEND | -- S_NOATIME | S_DIRSYNC | S_SYNC); -+ inode->i_flags &= ~(S_IMMUTABLE | S_IXUNLINK | -+ S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC); +@@ -33,26 +34,45 @@ void jfs_set_inode_flags(struct inode *i if (flags & JFS_IMMUTABLE_FL) - inode->i_flags |= S_IMMUTABLE; + new_fl |= S_IMMUTABLE; + if (flags & JFS_IXUNLINK_FL) + inode->i_flags |= S_IXUNLINK; + + if (flags & JFS_SYNC_FL) + inode->i_flags |= S_SYNC; if (flags & JFS_APPEND_FL) - inode->i_flags |= S_APPEND; + new_fl |= S_APPEND; if (flags & JFS_NOATIME_FL) - inode->i_flags |= S_NOATIME; + new_fl |= S_NOATIME; if (flags & JFS_DIRSYNC_FL) - inode->i_flags |= S_DIRSYNC; + new_fl |= S_DIRSYNC; - if (flags & JFS_SYNC_FL) -- inode->i_flags |= S_SYNC; -+ -+ inode->i_vflags &= ~(V_BARRIER | V_COW); +- new_fl |= S_SYNC; +- inode_set_flags(inode, new_fl, S_IMMUTABLE | S_APPEND | S_NOATIME | ++ inode_set_flags(inode, new_fl, S_IMMUTABLE | S_IXUNLINK | S_APPEND | S_NOATIME | + S_DIRSYNC | S_SYNC); + ++ new_fl = 0; + if (flags & JFS_BARRIER_FL) -+ inode->i_vflags |= V_BARRIER; ++ new_fl |= V_BARRIER; + if (flags & JFS_COW_FL) -+ inode->i_vflags |= V_COW; ++ new_fl |= V_COW; ++ ++ set_mask_bits(&inode->i_vflags, ++ V_BARRIER | V_COW, new_fl); } void jfs_get_inode_flags(struct jfs_inode_info *jfs_ip) @@ -4003,7 +3864,7 @@ diff -NurpP --minimal linux-3.7/fs/jfs/jfs_inode.c linux-3.7-vs2.3.5.1/fs/jfs/jf if (flags & S_APPEND) jfs_ip->mode2 |= JFS_APPEND_FL; if (flags & S_NOATIME) -@@ -61,6 +79,11 @@ void jfs_get_inode_flags(struct jfs_inod +@@ -61,6 +81,11 @@ void jfs_get_inode_flags(struct jfs_inod jfs_ip->mode2 |= JFS_DIRSYNC_FL; if (flags & S_SYNC) jfs_ip->mode2 |= JFS_SYNC_FL; @@ -4015,9 +3876,9 @@ diff -NurpP --minimal linux-3.7/fs/jfs/jfs_inode.c linux-3.7-vs2.3.5.1/fs/jfs/jf } /* -diff -NurpP --minimal linux-3.7/fs/jfs/jfs_inode.h linux-3.7-vs2.3.5.1/fs/jfs/jfs_inode.h ---- linux-3.7/fs/jfs/jfs_inode.h 2011-10-24 16:45:27.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/jfs/jfs_inode.h 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/fs/jfs/jfs_inode.h linux-3.18.5-vs2.3.7.3/fs/jfs/jfs_inode.h +--- linux-3.18.5/fs/jfs/jfs_inode.h 2012-12-11 03:30:57.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/jfs/jfs_inode.h 2015-01-19 10:58:03.000000000 +0000 @@ -39,6 +39,7 @@ extern struct dentry *jfs_fh_to_dentry(s extern struct dentry *jfs_fh_to_parent(struct super_block *sb, struct fid *fid, int fh_len, int fh_type); @@ -4026,9 +3887,9 @@ diff -NurpP --minimal linux-3.7/fs/jfs/jfs_inode.h linux-3.7-vs2.3.5.1/fs/jfs/jf extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int); extern int jfs_setattr(struct dentry *, struct iattr *); -diff -NurpP --minimal linux-3.7/fs/jfs/namei.c linux-3.7-vs2.3.5.1/fs/jfs/namei.c ---- linux-3.7/fs/jfs/namei.c 2012-10-04 13:27:40.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/jfs/namei.c 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/fs/jfs/namei.c linux-3.18.5-vs2.3.7.3/fs/jfs/namei.c +--- linux-3.18.5/fs/jfs/namei.c 2014-06-12 11:34:58.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/jfs/namei.c 2015-01-19 10:58:03.000000000 +0000 @@ -22,6 +22,7 @@ #include #include @@ -4045,18 +3906,18 @@ diff -NurpP --minimal linux-3.7/fs/jfs/namei.c linux-3.7-vs2.3.5.1/fs/jfs/namei. return d_splice_alias(ip, dentry); } -@@ -1525,6 +1527,7 @@ const struct inode_operations jfs_dir_in - #ifdef CONFIG_JFS_POSIX_ACL +@@ -1526,6 +1528,7 @@ const struct inode_operations jfs_dir_in .get_acl = jfs_get_acl, + .set_acl = jfs_set_acl, #endif + .sync_flags = jfs_sync_flags, }; const struct file_operations jfs_dir_operations = { -diff -NurpP --minimal linux-3.7/fs/jfs/super.c linux-3.7-vs2.3.5.1/fs/jfs/super.c ---- linux-3.7/fs/jfs/super.c 2012-12-11 15:47:34.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/jfs/super.c 2012-12-11 17:36:00.000000000 +0000 -@@ -199,7 +199,8 @@ enum { +diff -NurpP --minimal linux-3.18.5/fs/jfs/super.c linux-3.18.5-vs2.3.7.3/fs/jfs/super.c +--- linux-3.18.5/fs/jfs/super.c 2015-01-17 02:40:19.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/jfs/super.c 2015-01-19 10:58:03.000000000 +0000 +@@ -203,7 +203,8 @@ enum { Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize, Opt_resize_nosize, Opt_errors, Opt_ignore, Opt_err, Opt_quota, Opt_usrquota, Opt_grpquota, Opt_uid, Opt_gid, Opt_umask, @@ -4066,7 +3927,7 @@ diff -NurpP --minimal linux-3.7/fs/jfs/super.c linux-3.7-vs2.3.5.1/fs/jfs/super. }; static const match_table_t tokens = { -@@ -209,6 +210,10 @@ static const match_table_t tokens = { +@@ -213,6 +214,10 @@ static const match_table_t tokens = { {Opt_resize, "resize=%u"}, {Opt_resize_nosize, "resize"}, {Opt_errors, "errors=%s"}, @@ -4077,8 +3938,8 @@ diff -NurpP --minimal linux-3.7/fs/jfs/super.c linux-3.7-vs2.3.5.1/fs/jfs/super. {Opt_ignore, "noquota"}, {Opt_ignore, "quota"}, {Opt_usrquota, "usrquota"}, -@@ -385,7 +390,20 @@ static int parse_options(char *options, - } +@@ -402,7 +407,20 @@ static int parse_options(char *options, + pr_err("JFS: discard option not supported on device\n"); break; } - @@ -4097,11 +3958,11 @@ diff -NurpP --minimal linux-3.7/fs/jfs/super.c linux-3.7-vs2.3.5.1/fs/jfs/super. + break; +#endif default: - printk("jfs: Unrecognized mount option \"%s\" " - " or missing value\n", p); -@@ -417,6 +435,12 @@ static int jfs_remount(struct super_bloc + printk("jfs: Unrecognized mount option \"%s\" or missing value\n", + p); +@@ -434,6 +452,12 @@ static int jfs_remount(struct super_bloc + if (!parse_options(data, sb, &newLVSize, &flag)) return -EINVAL; - } + if ((flag & JFS_TAGGED) && !(sb->s_flags & MS_TAGGED)) { + printk(KERN_ERR "JFS: %s: tagging not permitted on remount.\n", @@ -4111,8 +3972,8 @@ diff -NurpP --minimal linux-3.7/fs/jfs/super.c linux-3.7-vs2.3.5.1/fs/jfs/super. + if (newLVSize) { if (sb->s_flags & MS_RDONLY) { - pr_err("JFS: resize requires volume" \ -@@ -502,6 +526,9 @@ static int jfs_fill_super(struct super_b + pr_err("JFS: resize requires volume to be mounted read-write\n"); +@@ -517,6 +541,9 @@ static int jfs_fill_super(struct super_b #ifdef CONFIG_JFS_POSIX_ACL sb->s_flags |= MS_POSIXACL; #endif @@ -4122,67 +3983,73 @@ diff -NurpP --minimal linux-3.7/fs/jfs/super.c linux-3.7-vs2.3.5.1/fs/jfs/super. if (newLVSize) { pr_err("resize option for remount only\n"); -diff -NurpP --minimal linux-3.7/fs/libfs.c linux-3.7-vs2.3.5.1/fs/libfs.c ---- linux-3.7/fs/libfs.c 2012-12-11 15:47:34.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/libfs.c 2012-12-11 15:56:32.000000000 +0000 -@@ -135,7 +135,8 @@ static inline unsigned char dt_type(stru +diff -NurpP --minimal linux-3.18.5/fs/libfs.c linux-3.18.5-vs2.3.7.3/fs/libfs.c +--- linux-3.18.5/fs/libfs.c 2015-02-05 18:02:45.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/libfs.c 2015-01-22 07:27:38.000000000 +0000 +@@ -146,13 +146,14 @@ static inline unsigned char dt_type(stru * both impossible due to the lock on directory. */ --int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir) +-int dcache_readdir(struct file *file, struct dir_context *ctx) +static inline int do_dcache_readdir_filter(struct file *filp, -+ void *dirent, filldir_t filldir, int (*filter)(struct dentry *dentry)) ++ struct dir_context *ctx, int (*filter)(struct dentry *dentry)) { - struct dentry *dentry = filp->f_path.dentry; - struct dentry *cursor = filp->private_data; -@@ -166,6 +167,8 @@ int dcache_readdir(struct file * filp, v - for (p=q->next; p != &dentry->d_subdirs; p=p->next) { - struct dentry *next; - next = list_entry(p, struct dentry, d_u.d_child); -+ if (filter && !filter(next)) -+ continue; - spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED); - if (!simple_positive(next)) { - spin_unlock(&next->d_lock); -@@ -192,6 +195,17 @@ int dcache_readdir(struct file * filp, v +- struct dentry *dentry = file->f_path.dentry; +- struct dentry *cursor = file->private_data; ++ struct dentry *dentry = filp->f_path.dentry; ++ struct dentry *cursor = filp->private_data; + struct list_head *p, *q = &cursor->d_child; + +- if (!dir_emit_dots(file, ctx)) ++ if (!dir_emit_dots(filp, ctx)) + return 0; + spin_lock(&dentry->d_lock); + if (ctx->pos == 2) +@@ -160,6 +161,8 @@ int dcache_readdir(struct file *file, st + + for (p = q->next; p != &dentry->d_subdirs; p = p->next) { + struct dentry *next = list_entry(p, struct dentry, d_child); ++ if (filter && !filter(next)) ++ continue; + spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED); + if (!simple_positive(next)) { + spin_unlock(&next->d_lock); +@@ -182,8 +185,22 @@ int dcache_readdir(struct file *file, st + spin_unlock(&dentry->d_lock); return 0; } ++ + EXPORT_SYMBOL(dcache_readdir); -+int dcache_readdir(struct file *filp, void *dirent, filldir_t filldir) ++int dcache_readdir(struct file *filp, struct dir_context *ctx) +{ -+ return do_dcache_readdir_filter(filp, dirent, filldir, NULL); ++ return do_dcache_readdir_filter(filp, ctx, NULL); +} + -+int dcache_readdir_filter(struct file *filp, void *dirent, filldir_t filldir, ++EXPORT_SYMBOL(dcache_readdir_filter); ++ ++int dcache_readdir_filter(struct file *filp, struct dir_context *ctx, + int (*filter)(struct dentry *)) +{ -+ return do_dcache_readdir_filter(filp, dirent, filldir, filter); ++ return do_dcache_readdir_filter(filp, ctx, filter); +} + ssize_t generic_read_dir(struct file *filp, char __user *buf, size_t siz, loff_t *ppos) { return -EISDIR; -@@ -983,6 +997,7 @@ EXPORT_SYMBOL(dcache_dir_close); - EXPORT_SYMBOL(dcache_dir_lseek); - EXPORT_SYMBOL(dcache_dir_open); - EXPORT_SYMBOL(dcache_readdir); -+EXPORT_SYMBOL(dcache_readdir_filter); - EXPORT_SYMBOL(generic_read_dir); - EXPORT_SYMBOL(mount_pseudo); - EXPORT_SYMBOL(simple_write_begin); -diff -NurpP --minimal linux-3.7/fs/locks.c linux-3.7-vs2.3.5.1/fs/locks.c ---- linux-3.7/fs/locks.c 2012-12-11 15:47:34.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/locks.c 2012-12-11 15:56:32.000000000 +0000 -@@ -126,6 +126,8 @@ - #include - #include - #include +diff -NurpP --minimal linux-3.18.5/fs/locks.c linux-3.18.5-vs2.3.7.3/fs/locks.c +--- linux-3.18.5/fs/locks.c 2015-02-05 18:02:45.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/locks.c 2015-01-28 11:48:02.000000000 +0000 +@@ -129,6 +129,8 @@ + #include + #include + #include +#include +#include - #include - -@@ -184,11 +186,17 @@ static void locks_init_lock_heads(struct + #define CREATE_TRACE_POINTS + #include +@@ -214,11 +216,17 @@ static void locks_init_lock_heads(struct /* Allocate an empty lock structure. */ struct file_lock *locks_alloc_lock(void) { @@ -4203,15 +4070,15 @@ diff -NurpP --minimal linux-3.7/fs/locks.c linux-3.7-vs2.3.5.1/fs/locks.c return fl; } EXPORT_SYMBOL_GPL(locks_alloc_lock); -@@ -212,6 +220,7 @@ void locks_free_lock(struct file_lock *f +@@ -246,6 +254,7 @@ void locks_free_lock(struct file_lock *f BUG_ON(!list_empty(&fl->fl_block)); - BUG_ON(!list_empty(&fl->fl_link)); + BUG_ON(!hlist_unhashed(&fl->fl_link)); + vx_locks_dec(fl); locks_release_private(fl); kmem_cache_free(filelock_cache, fl); } -@@ -221,6 +230,7 @@ void locks_init_lock(struct file_lock *f +@@ -267,6 +276,7 @@ void locks_init_lock(struct file_lock *f { memset(fl, 0, sizeof(struct file_lock)); locks_init_lock_heads(fl); @@ -4219,15 +4086,15 @@ diff -NurpP --minimal linux-3.7/fs/locks.c linux-3.7-vs2.3.5.1/fs/locks.c } EXPORT_SYMBOL(locks_init_lock); -@@ -261,6 +271,7 @@ void locks_copy_lock(struct file_lock *n - new->fl_file = fl->fl_file; - new->fl_ops = fl->fl_ops; +@@ -284,6 +294,7 @@ void locks_copy_conflock(struct file_loc + new->fl_start = fl->fl_start; + new->fl_end = fl->fl_end; new->fl_lmops = fl->fl_lmops; + new->fl_xid = fl->fl_xid; + new->fl_ops = NULL; - locks_copy_private(new, fl); - } -@@ -299,6 +310,11 @@ static int flock_make_lock(struct file * + if (fl->fl_lmops) { +@@ -345,6 +356,11 @@ flock_make_lock(struct file *filp, unsig fl->fl_flags = FL_FLOCK; fl->fl_type = type; fl->fl_end = OFFSET_MAX; @@ -4237,17 +4104,17 @@ diff -NurpP --minimal linux-3.7/fs/locks.c linux-3.7-vs2.3.5.1/fs/locks.c + fl->fl_xid = filp->f_xid; + vx_locks_inc(fl); - *lock = fl; - return 0; -@@ -438,6 +454,7 @@ static int lease_init(struct file *filp, + return fl; + } +@@ -467,6 +483,7 @@ static int lease_init(struct file *filp, - fl->fl_owner = current->files; + fl->fl_owner = filp; fl->fl_pid = current->tgid; + fl->fl_xid = vx_current_xid(); fl->fl_file = filp; fl->fl_flags = FL_LEASE; -@@ -457,6 +474,11 @@ static struct file_lock *lease_alloc(str +@@ -486,6 +503,11 @@ static struct file_lock *lease_alloc(str if (fl == NULL) return ERR_PTR(error); @@ -4259,15 +4126,15 @@ diff -NurpP --minimal linux-3.7/fs/locks.c linux-3.7-vs2.3.5.1/fs/locks.c error = lease_init(filp, type, fl); if (error) { locks_free_lock(fl); -@@ -753,6 +775,7 @@ static int flock_lock_file(struct file * - lock_flocks(); +@@ -892,6 +914,7 @@ static int flock_lock_file(struct file * + spin_lock(&inode->i_lock); } + new_fl->fl_xid = -1; find_conflict: for_each_lock(inode, before) { struct file_lock *fl = *before; -@@ -773,6 +796,7 @@ find_conflict: +@@ -912,6 +935,7 @@ find_conflict: goto out; locks_copy_lock(new_fl, request); locks_insert_lock(before, new_fl); @@ -4275,26 +4142,26 @@ diff -NurpP --minimal linux-3.7/fs/locks.c linux-3.7-vs2.3.5.1/fs/locks.c new_fl = NULL; error = 0; -@@ -783,7 +807,8 @@ out: +@@ -923,7 +947,8 @@ out: return error; } -static int __posix_lock_file(struct inode *inode, struct file_lock *request, struct file_lock *conflock) +static int __posix_lock_file(struct inode *inode, struct file_lock *request, -+ struct file_lock *conflock, xid_t xid) ++ struct file_lock *conflock, vxid_t xid) { struct file_lock *fl; struct file_lock *new_fl = NULL; -@@ -793,6 +818,8 @@ static int __posix_lock_file(struct inod - struct file_lock **before; - int error, added = 0; +@@ -935,6 +960,8 @@ static int __posix_lock_file(struct inod + bool added = false; + LIST_HEAD(dispose); + vxd_assert(xid == vx_current_xid(), + "xid(%d) == current(%d)", xid, vx_current_xid()); /* * We may need two file_lock structures for this operation, * so we get them in advance to avoid races. -@@ -803,7 +830,11 @@ static int __posix_lock_file(struct inod +@@ -945,7 +972,11 @@ static int __posix_lock_file(struct inod (request->fl_type != F_UNLCK || request->fl_start != 0 || request->fl_end != OFFSET_MAX)) { new_fl = locks_alloc_lock(); @@ -4305,35 +4172,44 @@ diff -NurpP --minimal linux-3.7/fs/locks.c linux-3.7-vs2.3.5.1/fs/locks.c + vx_locks_inc(new_fl2); } - lock_flocks(); -@@ -1002,7 +1033,8 @@ static int __posix_lock_file(struct inod + spin_lock(&inode->i_lock); +@@ -1158,7 +1189,8 @@ static int __posix_lock_file(struct inod int posix_lock_file(struct file *filp, struct file_lock *fl, struct file_lock *conflock) { -- return __posix_lock_file(filp->f_path.dentry->d_inode, fl, conflock); -+ return __posix_lock_file(filp->f_path.dentry->d_inode, +- return __posix_lock_file(file_inode(filp), fl, conflock); ++ return __posix_lock_file(file_inode(filp), + fl, conflock, filp->f_xid); } EXPORT_SYMBOL(posix_lock_file); -@@ -1092,7 +1124,7 @@ int locks_mandatory_area(int read_write, - fl.fl_end = offset + count - 1; - - for (;;) { +@@ -1252,7 +1284,7 @@ int locks_mandatory_area(int read_write, + if (filp) { + fl.fl_owner = filp; + fl.fl_flags &= ~FL_SLEEP; +- error = __posix_lock_file(inode, &fl, NULL); ++ error = __posix_lock_file(inode, &fl, NULL, filp->f_xid); + if (!error) + break; + } +@@ -1260,7 +1292,7 @@ int locks_mandatory_area(int read_write, + if (sleep) + fl.fl_flags |= FL_SLEEP; + fl.fl_owner = current->files; - error = __posix_lock_file(inode, &fl, NULL); + error = __posix_lock_file(inode, &fl, NULL, filp->f_xid); if (error != FILE_LOCK_DEFERRED) break; error = wait_event_interruptible(fl.fl_wait, !fl.fl_next); -@@ -1397,6 +1429,7 @@ int generic_add_lease(struct file *filp, +@@ -1655,6 +1687,7 @@ generic_add_lease(struct file *filp, lon goto out; locks_insert_lock(before, lease); + vx_locks_inc(lease); - return 0; - - out: -@@ -1836,6 +1869,11 @@ int fcntl_setlk(unsigned int fd, struct + /* + * The check in break_lease() is lockless. It's possible for another + * open to race in after we did the earlier check for a conflicting +@@ -2110,6 +2143,11 @@ int fcntl_setlk(unsigned int fd, struct if (file_lock == NULL) return -ENOLCK; @@ -4345,7 +4221,7 @@ diff -NurpP --minimal linux-3.7/fs/locks.c linux-3.7-vs2.3.5.1/fs/locks.c /* * This might block, so we do it before checking the inode. */ -@@ -1954,6 +1992,11 @@ int fcntl_setlk64(unsigned int fd, struc +@@ -2250,6 +2288,11 @@ int fcntl_setlk64(unsigned int fd, struc if (file_lock == NULL) return -ENOLCK; @@ -4357,38 +4233,39 @@ diff -NurpP --minimal linux-3.7/fs/locks.c linux-3.7-vs2.3.5.1/fs/locks.c /* * This might block, so we do it before checking the inode. */ -@@ -2219,8 +2262,11 @@ static int locks_show(struct seq_file *f +@@ -2557,8 +2600,11 @@ static int locks_show(struct seq_file *f - lock_get_status(f, fl, *((loff_t *)f->private), ""); + lock_get_status(f, fl, iter->li_pos, ""); - list_for_each_entry(bfl, &fl->fl_block, fl_block) + list_for_each_entry(bfl, &fl->fl_block, fl_block) { + if (!vx_check(fl->fl_xid, VS_WATCH_P | VS_IDENT)) + continue; - lock_get_status(f, bfl, *((loff_t *)f->private), " ->"); + lock_get_status(f, bfl, iter->li_pos, " ->"); + } return 0; } -diff -NurpP --minimal linux-3.7/fs/mount.h linux-3.7-vs2.3.5.1/fs/mount.h ---- linux-3.7/fs/mount.h 2012-10-04 13:27:40.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/mount.h 2012-12-11 15:56:32.000000000 +0000 -@@ -46,6 +46,7 @@ struct mount { +diff -NurpP --minimal linux-3.18.5/fs/mount.h linux-3.18.5-vs2.3.7.3/fs/mount.h +--- linux-3.18.5/fs/mount.h 2015-01-17 02:40:19.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/mount.h 2015-01-19 10:58:03.000000000 +0000 +@@ -62,6 +62,7 @@ struct mount { int mnt_expiry_mark; /* true if marked for expiry */ - int mnt_pinned; - int mnt_ghosts; -+ tag_t mnt_tag; /* tagging used for vfsmount */ + struct hlist_head mnt_pins; + struct path mnt_ex_mountpoint; ++ vtag_t mnt_tag; /* tagging used for vfsmount */ }; #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */ -diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c ---- linux-3.7/fs/namei.c 2012-12-11 15:47:35.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/namei.c 2012-12-11 21:44:51.000000000 +0000 -@@ -34,6 +34,14 @@ +diff -NurpP --minimal linux-3.18.5/fs/namei.c linux-3.18.5-vs2.3.7.3/fs/namei.c +--- linux-3.18.5/fs/namei.c 2015-01-17 02:40:19.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/namei.c 2015-01-22 08:31:30.000000000 +0000 +@@ -34,10 +34,20 @@ #include #include #include +#include ++#include +#include +#include +#include @@ -4396,10 +4273,15 @@ diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c +#include +#include +#include + #include #include #include "internal.h" -@@ -266,6 +274,89 @@ static int check_acl(struct inode *inode ++#include "proc/internal.h" + #include "mount.h" + + /* [Feb-1997 T. Schoebel-Theuer] +@@ -278,6 +288,93 @@ static int check_acl(struct inode *inode return -EAGAIN; } @@ -4420,7 +4302,7 @@ diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c + if (inode->i_sb->s_magic == DEVPTS_SUPER_MAGIC) { + /* devpts is xid tagged */ + if (S_ISDIR(inode->i_mode) || -+ vx_check((xid_t)i_tag_read(inode), VS_IDENT | VS_WATCH_P)) ++ vx_check((vxid_t)i_tag_read(inode), VS_IDENT | VS_WATCH_P)) + return 0; + + /* just pretend we didn't find anything */ @@ -4429,8 +4311,12 @@ diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c + else if (inode->i_sb->s_magic == PROC_SUPER_MAGIC) { + struct proc_dir_entry *de = PDE(inode); + -+ if (de && !vx_hide_check(0, de->vx_flags)) ++ if (de && !vx_hide_check(0, de->vx_flags)) { ++ vxdprintk(VXD_CBIT(misc, 9), ++ VS_Q("%*s") " hidden by _dx_permission", ++ de->namelen, de->name); + goto out; ++ } + + if ((mask & (MAY_WRITE | MAY_APPEND))) { + struct pid *pid; @@ -4462,7 +4348,7 @@ diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c + } + else { + if (dx_notagcheck(inode->i_sb) || -+ dx_check((xid_t)i_tag_read(inode), ++ dx_check((vxid_t)i_tag_read(inode), + DX_HOSTID | DX_ADMIN | DX_WATCH | DX_IDENT)) + return 0; + } @@ -4480,8 +4366,8 @@ diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c +#endif + vxwprintk_task(1, + "denied [0x%x] access to inode %s:%p[#%d,%lu]", -+ mask, inode->i_sb->s_id, inode, inode->i_tag, -+ inode->i_ino); ++ mask, inode->i_sb->s_id, inode, ++ i_tag_read(inode), inode->i_ino); + } + return ret; +} @@ -4489,7 +4375,7 @@ diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c /* * This does the basic permission checking */ -@@ -388,10 +479,14 @@ int __inode_permission(struct inode *ino +@@ -402,10 +499,14 @@ int __inode_permission(struct inode *ino /* * Nobody gets write access to an immutable file. */ @@ -4505,17 +4391,7 @@ diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c retval = do_inode_permission(inode, mask); if (retval) return retval; -@@ -1244,7 +1339,8 @@ static void follow_dotdot(struct nameida - - if (nd->path.dentry == nd->root.dentry && - nd->path.mnt == nd->root.mnt) { -- break; -+ /* for sane '/' avoid follow_mount() */ -+ return; - } - if (nd->path.dentry != nd->path.mnt->mnt_root) { - /* rare case of legitimate dget_parent()... */ -@@ -1393,6 +1489,9 @@ static int lookup_fast(struct nameidata +@@ -1416,6 +1517,9 @@ static int lookup_fast(struct nameidata goto unlazy; } } @@ -4524,9 +4400,9 @@ diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c + path->mnt = mnt; path->dentry = dentry; - if (unlikely(!__follow_mount_rcu(nd, path, inode))) -@@ -1428,6 +1527,8 @@ unlazy: - } + if (likely(__follow_mount_rcu(nd, path, inode))) +@@ -1442,6 +1546,8 @@ unlazy: + goto need_lookup; } + /* FIXME: check dx permission */ @@ -4534,16 +4410,16 @@ diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c path->mnt = mnt; path->dentry = dentry; err = follow_managed(path, nd->flags); -@@ -2258,7 +2359,7 @@ static int may_delete(struct inode *dir, - if (IS_APPEND(dir)) +@@ -2434,7 +2540,7 @@ static int may_delete(struct inode *dir, return -EPERM; - if (check_sticky(dir, victim->d_inode)||IS_APPEND(victim->d_inode)|| -- IS_IMMUTABLE(victim->d_inode) || IS_SWAPFILE(victim->d_inode)) -+ IS_IXORUNLINK(victim->d_inode) || IS_SWAPFILE(victim->d_inode)) + + if (check_sticky(dir, inode) || IS_APPEND(inode) || +- IS_IMMUTABLE(inode) || IS_SWAPFILE(inode)) ++ IS_IXORUNLINK(inode) || IS_SWAPFILE(inode)) return -EPERM; if (isdir) { - if (!S_ISDIR(victim->d_inode->i_mode)) -@@ -2337,19 +2438,25 @@ int vfs_create(struct inode *dir, struct + if (!d_is_dir(victim)) +@@ -2516,19 +2622,25 @@ int vfs_create(struct inode *dir, struct bool want_excl) { int error = may_create(dir, dentry); @@ -4570,8 +4446,8 @@ diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c + vxdprintk(VXD_CBIT(misc, 3), "i_op->create failed with %d", error); return error; } - -@@ -2384,6 +2491,15 @@ static int may_open(struct path *path, i + EXPORT_SYMBOL(vfs_create); +@@ -2564,6 +2676,15 @@ static int may_open(struct path *path, i break; } @@ -4587,7 +4463,7 @@ diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c error = inode_permission(inode, acc_mode); if (error) return error; -@@ -2886,6 +3002,16 @@ finish_open: +@@ -3058,6 +3179,16 @@ finish_open: } finish_open_created: error = may_open(&nd->path, acc_mode, open_flag); @@ -4603,16 +4479,16 @@ diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c +#endif if (error) goto out; - file->f_path.mnt = nd->path.mnt; -@@ -2950,6 +3076,7 @@ static struct file *path_openat(int dfd, + +@@ -3187,6 +3318,7 @@ static struct file *path_openat(int dfd, int opened = 0; int error; +restart: file = get_empty_filp(); - if (!file) - return ERR_PTR(-ENFILE); -@@ -2986,6 +3113,16 @@ static struct file *path_openat(int dfd, + if (IS_ERR(file)) + return file; +@@ -3228,6 +3360,16 @@ static struct file *path_openat(int dfd, error = do_last(nd, &path, file, op, &opened, pathname); put_link(nd, &link, cookie); } @@ -4629,7 +4505,7 @@ diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c out: if (nd->root.mnt && !(nd->flags & LOOKUP_ROOT)) path_put(&nd->root); -@@ -3090,6 +3227,11 @@ struct dentry *kern_path_create(int dfd, +@@ -3343,6 +3485,11 @@ struct dentry *kern_path_create(int dfd, goto fail; } *path = nd.path; @@ -4641,7 +4517,7 @@ diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c return dentry; fail: dput(dentry); -@@ -3556,7 +3698,7 @@ int vfs_link(struct dentry *old_dentry, +@@ -3899,7 +4046,7 @@ int vfs_link(struct dentry *old_dentry, /* * A link to an append-only or immutable file cannot be created. */ @@ -4650,9 +4526,9 @@ diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c return -EPERM; if (!dir->i_op->link) return -EPERM; -@@ -3945,6 +4087,275 @@ int vfs_follow_link(struct nameidata *nd - return __vfs_follow_link(nd, link); +@@ -4404,6 +4551,289 @@ int generic_readlink(struct dentry *dent } + EXPORT_SYMBOL(generic_readlink); + +#ifdef CONFIG_VSERVER_COWBL @@ -4661,13 +4537,14 @@ diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c +long do_cow_splice(struct file *in, struct file *out, size_t len) +{ + loff_t ppos = 0; ++ loff_t opos = 0; + -+ return do_splice_direct(in, &ppos, out, len, 0); ++ return do_splice_direct(in, &ppos, out, &opos, len, 0); +} + +struct dentry *cow_break_link(const char *pathname) +{ -+ int ret, mode, pathlen, redo = 0; ++ int ret, mode, pathlen, redo = 0, drop = 1; + struct nameidata old_nd, dir_nd; + struct path dir_path, *old_path, *new_path; + struct dentry *dir, *old_dentry, *new_dentry = NULL; @@ -4724,7 +4601,7 @@ diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c + + /* this puppy downs the dir inode mutex if successful. + dir_path will hold refs to dentry and mnt and -+ we'll have get write access to the mnt */ ++ we'll have write access to the mnt */ + new_dentry = kern_path_create(AT_FDCWD, to, &dir_path, 0); + if (!new_dentry || IS_ERR(new_dentry)) { + path_put(&dir_nd.path); @@ -4758,8 +4635,8 @@ diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c + vxdprintk(VXD_CBIT(misc, 2), + "vfs_create(new): %d", ret); + if (ret == -EEXIST) { -+ mutex_unlock(&dir->d_inode->i_mutex); + path_put(&dir_nd.path); ++ mutex_unlock(&dir->d_inode->i_mutex); + mnt_drop_write(new_path->mnt); + path_put(new_path); + new_dentry = NULL; @@ -4791,6 +4668,14 @@ diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c + goto out_fput_old; + } + ++ /* unlock the inode mutex from kern_path_create() */ ++ mutex_unlock(&dir->d_inode->i_mutex); ++ ++ /* drop write access to mnt */ ++ mnt_drop_write(new_path->mnt); ++ ++ drop = 0; ++ + size = i_size_read(old_file->f_dentry->d_inode); + ret = do_cow_splice(old_file, new_file, size); + vxdprintk(VXD_CBIT(misc, 2), "do_splice_direct: %d", ret); @@ -4827,7 +4712,7 @@ diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c + old_dentry->d_name.len, old_dentry->d_name.name, + old_dentry->d_name.len); + ret = vfs_rename(dir_nd.path.dentry->d_inode, new_dentry, -+ old_dentry->d_parent->d_inode, old_dentry); ++ old_dentry->d_parent->d_inode, old_dentry, NULL, 0); + vxdprintk(VXD_CBIT(misc, 2), "vfs_rename: %d", ret); + +out_unlock: @@ -4849,16 +4734,19 @@ diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c + /* drop references from dir_nd.path */ + path_put(&dir_nd.path); + -+ /* drop write access to mnt */ -+ mnt_drop_write(new_path->mnt); ++ if (drop) { ++ /* unlock the inode mutex from kern_path_create() */ ++ mutex_unlock(&dir->d_inode->i_mutex); ++ ++ /* drop write access to mnt */ ++ mnt_drop_write(new_path->mnt); ++ } + -+ /* unlock the inode mutex from kern_path_create() */ -+ mutex_unlock(&dir->d_inode->i_mutex); + if (!ret) + goto out_redo; + + /* error path cleanup */ -+ vfs_unlink(dir->d_inode, new_dentry); ++ vfs_unlink(dir->d_inode, new_dentry, NULL); + +out_redo: + if (!redo) @@ -4922,22 +4810,19 @@ diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c + kfree(pstr); + return length; +} ++ ++EXPORT_SYMBOL(vx_info_mnt_namespace); + /* get the link contents into pagecache */ static char *page_getlink(struct dentry * dentry, struct page **ppage) { -@@ -4068,3 +4479,4 @@ EXPORT_SYMBOL(vfs_symlink); - EXPORT_SYMBOL(vfs_unlink); - EXPORT_SYMBOL(dentry_unhash); - EXPORT_SYMBOL(generic_readlink); -+EXPORT_SYMBOL(vx_info_mnt_namespace); -diff -NurpP --minimal linux-3.7/fs/namespace.c linux-3.7-vs2.3.5.1/fs/namespace.c ---- linux-3.7/fs/namespace.c 2012-12-11 15:47:35.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/namespace.c 2012-12-11 17:17:30.000000000 +0000 -@@ -20,6 +20,11 @@ - #include /* get_fs_root et.al. */ - #include /* fsnotify_vfsmount_delete */ - #include +diff -NurpP --minimal linux-3.18.5/fs/namespace.c linux-3.18.5-vs2.3.7.3/fs/namespace.c +--- linux-3.18.5/fs/namespace.c 2015-02-05 18:02:45.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/namespace.c 2015-01-19 12:08:57.000000000 +0000 +@@ -24,6 +24,11 @@ + #include + #include + #include +#include +#include +#include @@ -4946,7 +4831,7 @@ diff -NurpP --minimal linux-3.7/fs/namespace.c linux-3.7-vs2.3.5.1/fs/namespace. #include "pnode.h" #include "internal.h" -@@ -749,6 +754,10 @@ vfs_kern_mount(struct file_system_type * +@@ -897,6 +902,10 @@ vfs_kern_mount(struct file_system_type * if (!type) return ERR_PTR(-ENODEV); @@ -4957,108 +4842,66 @@ diff -NurpP --minimal linux-3.7/fs/namespace.c linux-3.7-vs2.3.5.1/fs/namespace. mnt = alloc_vfsmnt(name); if (!mnt) return ERR_PTR(-ENOMEM); -@@ -801,6 +810,7 @@ static struct mount *clone_mnt(struct mo +@@ -971,6 +980,7 @@ static struct mount *clone_mnt(struct mo mnt->mnt.mnt_root = dget(root); mnt->mnt_mountpoint = mnt->mnt.mnt_root; mnt->mnt_parent = mnt; -+ mnt->mnt_tag = old->mnt_tag; - br_write_lock(&vfsmount_lock); ++ mnt->mnt_tag = old->mnt_tag; + lock_mount_hash(); list_add_tail(&mnt->mnt_instance, &sb->s_mounts); - br_write_unlock(&vfsmount_lock); -@@ -1266,7 +1276,7 @@ SYSCALL_DEFINE2(umount, char __user *, n - goto dput_and_out; - - retval = -EPERM; -- if (!capable(CAP_SYS_ADMIN)) -+ if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT)) - goto dput_and_out; - - retval = do_umount(mnt, flags); -@@ -1292,7 +1302,7 @@ SYSCALL_DEFINE1(oldumount, char __user * - - static int mount_is_safe(struct path *path) + unlock_mount_hash(); +@@ -1508,7 +1518,8 @@ out_unlock: + */ + static inline bool may_mount(void) { -- if (capable(CAP_SYS_ADMIN)) -+ if (vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT)) - return 0; - return -EPERM; - #ifdef notyet -@@ -1610,7 +1620,7 @@ static int do_change_type(struct path *p - int type; - int err = 0; - -- if (!capable(CAP_SYS_ADMIN)) -+ if (!vx_capable(CAP_SYS_ADMIN, VXC_NAMESPACE)) - return -EPERM; +- return ns_capable(current->nsproxy->mnt_ns->user_ns, CAP_SYS_ADMIN); ++ return vx_ns_capable(current->nsproxy->mnt_ns->user_ns, ++ CAP_SYS_ADMIN, VXC_SECURE_MOUNT); + } - if (path->dentry != path->mnt->mnt_root) -@@ -1626,6 +1636,7 @@ static int do_change_type(struct path *p + /* +@@ -1969,6 +1980,7 @@ static int do_change_type(struct path *p if (err) goto out_unlock; } + // mnt->mnt_flags = mnt_flags; - br_write_lock(&vfsmount_lock); + lock_mount_hash(); for (m = mnt; m; m = (recurse ? next_mnt(m, mnt) : NULL)) -@@ -1641,12 +1652,14 @@ static int do_change_type(struct path *p +@@ -1997,12 +2009,14 @@ static bool has_locked_children(struct m * do loopback mount. */ static int do_loopback(struct path *path, const char *old_name, - int recurse) -+ tag_t tag, unsigned long flags, int mnt_flags) ++ vtag_t tag, unsigned long flags, int mnt_flags) { - LIST_HEAD(umount_list); struct path old_path; - struct mount *mnt = NULL, *old; - int err = mount_is_safe(path); + struct mount *mnt = NULL, *old, *parent; + struct mountpoint *mp; + int recurse = flags & MS_REC; + int err; + - if (err) - return err; if (!old_name || !*old_name) -@@ -1715,13 +1728,13 @@ static int change_mount_flags(struct vfs + return -EINVAL; + err = kern_path(old_name, LOOKUP_FOLLOW|LOOKUP_AUTOMOUNT, &old_path); +@@ -2079,7 +2093,7 @@ static int change_mount_flags(struct vfs * on it - tough luck. */ static int do_remount(struct path *path, int flags, int mnt_flags, - void *data) -+ void *data, xid_t xid) ++ void *data, vxid_t xid) { int err; struct super_block *sb = path->mnt->mnt_sb; - struct mount *mnt = real_mount(path->mnt); - -- if (!capable(CAP_SYS_ADMIN)) -+ if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_REMOUNT)) - return -EPERM; - - if (!check_mnt(mnt)) -@@ -1770,7 +1783,7 @@ static int do_move_mount(struct path *pa - struct mount *p; - struct mount *old; - int err = 0; -- if (!capable(CAP_SYS_ADMIN)) -+ if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT)) - return -EPERM; - if (!old_name || !*old_name) - return -EINVAL; -@@ -1927,7 +1940,7 @@ static int do_new_mount(struct path *pat - return -EINVAL; - - /* we need capabilities... */ -- if (!capable(CAP_SYS_ADMIN)) -+ if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT)) - return -EPERM; - - mnt = do_kern_mount(type, flags, name, data); -@@ -2197,6 +2210,7 @@ long do_mount(const char *dev_name, cons +@@ -2579,6 +2593,7 @@ long do_mount(const char *dev_name, cons struct path path; int retval = 0; int mnt_flags = 0; -+ tag_t tag = 0; ++ vtag_t tag = 0; /* Discard magic */ if ((flags & MS_MGC_MSK) == MS_MGC_VAL) -@@ -2224,6 +2238,12 @@ long do_mount(const char *dev_name, cons +@@ -2604,6 +2619,12 @@ long do_mount(const char *dev_name, cons if (!(flags & MS_NOATIME)) mnt_flags |= MNT_RELATIME; @@ -5071,11 +4914,11 @@ diff -NurpP --minimal linux-3.7/fs/namespace.c linux-3.7-vs2.3.5.1/fs/namespace. /* Separate the per-mountpoint flags */ if (flags & MS_NOSUID) mnt_flags |= MNT_NOSUID; -@@ -2240,15 +2260,17 @@ long do_mount(const char *dev_name, cons - if (flags & MS_RDONLY) - mnt_flags |= MNT_READONLY; +@@ -2628,15 +2649,17 @@ long do_mount(const char *dev_name, cons + mnt_flags |= path.mnt->mnt_flags & MNT_ATIME_MASK; + } -+ if (!capable(CAP_SYS_ADMIN)) ++ if (!vx_capable(CAP_SYS_ADMIN, VXC_DEV_MOUNT)) + mnt_flags |= MNT_NODEV; flags &= ~(MS_NOSUID | MS_NOEXEC | MS_NODEV | MS_ACTIVE | MS_BORN | MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT | @@ -5091,20 +4934,20 @@ diff -NurpP --minimal linux-3.7/fs/namespace.c linux-3.7-vs2.3.5.1/fs/namespace. else if (flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE)) retval = do_change_type(&path, flags); else if (flags & MS_MOVE) -@@ -2329,6 +2351,7 @@ static struct mnt_namespace *dup_mnt_ns( - q = next_mnt(q, new); +@@ -2752,6 +2775,7 @@ struct mnt_namespace *copy_mnt_ns(unsign + p = next_mnt(p, old); } - up_write(&namespace_sem); + namespace_unlock(); + atomic_inc(&vs_global_mnt_ns); if (rootmnt) mntput(rootmnt); -@@ -2524,9 +2547,10 @@ SYSCALL_DEFINE2(pivot_root, const char _ - error = -EINVAL; +@@ -2926,9 +2950,10 @@ SYSCALL_DEFINE2(pivot_root, const char _ new_mnt = real_mount(new.mnt); root_mnt = real_mount(root.mnt); -- if (IS_MNT_SHARED(real_mount(old.mnt)) || -+ if ((IS_MNT_SHARED(real_mount(old.mnt)) || + old_mnt = real_mount(old.mnt); +- if (IS_MNT_SHARED(old_mnt) || ++ if ((IS_MNT_SHARED(old_mnt) || IS_MNT_SHARED(new_mnt->mnt_parent) || - IS_MNT_SHARED(root_mnt->mnt_parent)) + IS_MNT_SHARED(root_mnt->mnt_parent)) && @@ -5112,18 +4955,18 @@ diff -NurpP --minimal linux-3.7/fs/namespace.c linux-3.7-vs2.3.5.1/fs/namespace. goto out4; if (!check_mnt(root_mnt) || !check_mnt(new_mnt)) goto out4; -@@ -2647,6 +2671,7 @@ void put_mnt_ns(struct mnt_namespace *ns - br_write_unlock(&vfsmount_lock); - up_write(&namespace_sem); - release_mounts(&umount_list); +@@ -3063,6 +3088,7 @@ void put_mnt_ns(struct mnt_namespace *ns + if (!atomic_dec_and_test(&ns->count)) + return; + drop_collected_mounts(&ns->root->mnt); + atomic_dec(&vs_global_mnt_ns); - kfree(ns); + free_mnt_ns(ns); } -diff -NurpP --minimal linux-3.7/fs/nfs/client.c linux-3.7-vs2.3.5.1/fs/nfs/client.c ---- linux-3.7/fs/nfs/client.c 2012-12-11 15:47:35.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/nfs/client.c 2012-12-11 15:56:32.000000000 +0000 -@@ -684,6 +684,9 @@ int nfs_init_server_rpcclient(struct nfs +diff -NurpP --minimal linux-3.18.5/fs/nfs/client.c linux-3.18.5-vs2.3.7.3/fs/nfs/client.c +--- linux-3.18.5/fs/nfs/client.c 2015-01-17 02:40:19.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/nfs/client.c 2015-01-19 10:58:03.000000000 +0000 +@@ -693,6 +693,9 @@ int nfs_init_server_rpcclient(struct nfs if (server->flags & NFS_MOUNT_SOFT) server->client->cl_softrtry = 1; @@ -5133,7 +4976,7 @@ diff -NurpP --minimal linux-3.7/fs/nfs/client.c linux-3.7-vs2.3.5.1/fs/nfs/clien return 0; } EXPORT_SYMBOL_GPL(nfs_init_server_rpcclient); -@@ -863,6 +866,10 @@ static void nfs_server_set_fsinfo(struct +@@ -871,6 +874,10 @@ static void nfs_server_set_fsinfo(struct server->acdirmin = server->acdirmax = 0; } @@ -5144,10 +4987,10 @@ diff -NurpP --minimal linux-3.7/fs/nfs/client.c linux-3.7-vs2.3.5.1/fs/nfs/clien server->maxfilesize = fsinfo->maxfilesize; server->time_delta = fsinfo->time_delta; -diff -NurpP --minimal linux-3.7/fs/nfs/dir.c linux-3.7-vs2.3.5.1/fs/nfs/dir.c ---- linux-3.7/fs/nfs/dir.c 2012-12-11 15:47:35.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/nfs/dir.c 2012-12-11 15:56:32.000000000 +0000 -@@ -36,6 +36,7 @@ +diff -NurpP --minimal linux-3.18.5/fs/nfs/dir.c linux-3.18.5-vs2.3.7.3/fs/nfs/dir.c +--- linux-3.18.5/fs/nfs/dir.c 2015-01-17 02:40:19.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/nfs/dir.c 2015-01-19 10:58:03.000000000 +0000 +@@ -37,6 +37,7 @@ #include #include #include @@ -5155,7 +4998,7 @@ diff -NurpP --minimal linux-3.7/fs/nfs/dir.c linux-3.7-vs2.3.5.1/fs/nfs/dir.c #include "delegation.h" #include "iostat.h" -@@ -1252,6 +1253,7 @@ struct dentry *nfs_lookup(struct inode * +@@ -1392,6 +1393,7 @@ struct dentry *nfs_lookup(struct inode * /* Success: notify readdir to use READDIRPLUS */ nfs_advise_use_readdirplus(dir); @@ -5163,161 +5006,137 @@ diff -NurpP --minimal linux-3.7/fs/nfs/dir.c linux-3.7-vs2.3.5.1/fs/nfs/dir.c no_entry: res = d_materialise_unique(dentry, inode); if (res != NULL) { -diff -NurpP --minimal linux-3.7/fs/nfs/inode.c linux-3.7-vs2.3.5.1/fs/nfs/inode.c ---- linux-3.7/fs/nfs/inode.c 2012-12-11 15:47:35.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/nfs/inode.c 2012-12-11 15:56:32.000000000 +0000 -@@ -39,6 +39,7 @@ +diff -NurpP --minimal linux-3.18.5/fs/nfs/inode.c linux-3.18.5-vs2.3.7.3/fs/nfs/inode.c +--- linux-3.18.5/fs/nfs/inode.c 2015-01-17 02:40:19.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/nfs/inode.c 2015-01-19 11:44:24.000000000 +0000 +@@ -38,6 +38,7 @@ + #include #include #include - #include +#include #include -@@ -279,6 +280,8 @@ nfs_fhget(struct super_block *sb, struct +@@ -368,6 +369,8 @@ nfs_fhget(struct super_block *sb, struct if (inode->i_state & I_NEW) { struct nfs_inode *nfsi = NFS_I(inode); unsigned long now = jiffies; -+ uid_t uid; -+ gid_t gid; ++ kuid_t kuid; ++ kgid_t kgid; /* We set i_ino for the few things that still rely on it, * such as stat(2) */ -@@ -323,8 +326,8 @@ nfs_fhget(struct super_block *sb, struct +@@ -412,8 +415,8 @@ nfs_fhget(struct super_block *sb, struct inode->i_version = 0; inode->i_size = 0; clear_nlink(inode); -- inode->i_uid = -2; -- inode->i_gid = -2; -+ uid = -2; -+ gid = -2; +- inode->i_uid = make_kuid(&init_user_ns, -2); +- inode->i_gid = make_kgid(&init_user_ns, -2); ++ kuid = make_kuid(&init_user_ns, -2); ++ kgid = make_kgid(&init_user_ns, -2); inode->i_blocks = 0; memset(nfsi->cookieverf, 0, sizeof(nfsi->cookieverf)); nfsi->write_io = 0; -@@ -358,11 +361,11 @@ nfs_fhget(struct super_block *sb, struct +@@ -447,11 +450,11 @@ nfs_fhget(struct super_block *sb, struct else if (nfs_server_capable(inode, NFS_CAP_NLINK)) - nfsi->cache_validity |= NFS_INO_INVALID_ATTR; + nfs_set_cache_invalid(inode, NFS_INO_INVALID_ATTR); if (fattr->valid & NFS_ATTR_FATTR_OWNER) - inode->i_uid = fattr->uid; -+ uid = fattr->uid; ++ kuid = fattr->uid; else if (nfs_server_capable(inode, NFS_CAP_OWNER)) - nfsi->cache_validity |= NFS_INO_INVALID_ATTR; + nfs_set_cache_invalid(inode, NFS_INO_INVALID_ATTR); if (fattr->valid & NFS_ATTR_FATTR_GROUP) - inode->i_gid = fattr->gid; -+ gid = fattr->gid; ++ kgid = fattr->gid; else if (nfs_server_capable(inode, NFS_CAP_OWNER_GROUP)) - nfsi->cache_validity |= NFS_INO_INVALID_ATTR; + nfs_set_cache_invalid(inode, NFS_INO_INVALID_ATTR); if (fattr->valid & NFS_ATTR_FATTR_BLOCKS_USED) -@@ -373,6 +376,11 @@ nfs_fhget(struct super_block *sb, struct +@@ -462,6 +465,10 @@ nfs_fhget(struct super_block *sb, struct */ inode->i_blocks = nfs_calc_block_size(fattr->du.nfs3.used); } -+ inode->i_uid = INOTAG_UID(DX_TAG(inode), uid, gid); -+ inode->i_gid = INOTAG_GID(DX_TAG(inode), uid, gid); -+ inode->i_tag = INOTAG_TAG(DX_TAG(inode), uid, gid, 0); ++ inode->i_uid = INOTAG_KUID(DX_TAG(inode), kuid, kgid); ++ inode->i_gid = INOTAG_KGID(DX_TAG(inode), kuid, kgid); ++ inode->i_tag = INOTAG_KTAG(DX_TAG(inode), kuid, kgid, GLOBAL_ROOT_TAG); + /* maybe fattr->xid someday */ -+ - nfsi->attrtimeo = NFS_MINATTRTIMEO(inode); - nfsi->attrtimeo_timestamp = now; - nfsi->access_cache = RB_ROOT; -@@ -494,6 +502,8 @@ void nfs_setattr_update_inode(struct ino + + nfs_setsecurity(inode, fattr, label); + +@@ -592,6 +599,8 @@ void nfs_setattr_update_inode(struct ino inode->i_uid = attr->ia_uid; if ((attr->ia_valid & ATTR_GID) != 0) inode->i_gid = attr->ia_gid; + if ((attr->ia_valid & ATTR_TAG) && IS_TAGGED(inode)) + inode->i_tag = attr->ia_tag; - NFS_I(inode)->cache_validity |= NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL; + nfs_set_cache_invalid(inode, NFS_INO_INVALID_ACCESS + | NFS_INO_INVALID_ACL); spin_unlock(&inode->i_lock); - } -@@ -968,6 +978,9 @@ static int nfs_check_inode_attributes(st +@@ -1171,7 +1180,9 @@ static int nfs_check_inode_attributes(st struct nfs_inode *nfsi = NFS_I(inode); loff_t cur_size, new_isize; unsigned long invalid = 0; -+ uid_t uid; -+ gid_t gid; -+ tag_t tag; - +- ++ kuid_t kuid; ++ kgid_t kgid; ++ ktag_t ktag; if (nfs_have_delegated_attributes(inode)) -@@ -993,13 +1006,18 @@ static int nfs_check_inode_attributes(st + return 0; +@@ -1196,13 +1207,18 @@ static int nfs_check_inode_attributes(st invalid |= NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE; } -+ uid = INOTAG_UID(DX_TAG(inode), fattr->uid, fattr->gid); -+ gid = INOTAG_GID(DX_TAG(inode), fattr->uid, fattr->gid); -+ tag = INOTAG_TAG(DX_TAG(inode), fattr->uid, fattr->gid, 0); ++ kuid = INOTAG_KUID(DX_TAG(inode), fattr->uid, fattr->gid); ++ kgid = INOTAG_KGID(DX_TAG(inode), fattr->uid, fattr->gid); ++ ktag = INOTAG_KTAG(DX_TAG(inode), fattr->uid, fattr->gid, GLOBAL_ROOT_TAG); + /* Have any file permissions changed? */ if ((fattr->valid & NFS_ATTR_FATTR_MODE) && (inode->i_mode & S_IALLUGO) != (fattr->mode & S_IALLUGO)) invalid |= NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ACCESS | NFS_INO_INVALID_ACL; -- if ((fattr->valid & NFS_ATTR_FATTR_OWNER) && inode->i_uid != fattr->uid) -+ if ((fattr->valid & NFS_ATTR_FATTR_OWNER) && uid != fattr->uid) +- if ((fattr->valid & NFS_ATTR_FATTR_OWNER) && !uid_eq(inode->i_uid, fattr->uid)) ++ if ((fattr->valid & NFS_ATTR_FATTR_OWNER) && !uid_eq(inode->i_uid, kuid)) invalid |= NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ACCESS | NFS_INO_INVALID_ACL; -- if ((fattr->valid & NFS_ATTR_FATTR_GROUP) && inode->i_gid != fattr->gid) -+ if ((fattr->valid & NFS_ATTR_FATTR_GROUP) && gid != fattr->gid) +- if ((fattr->valid & NFS_ATTR_FATTR_GROUP) && !gid_eq(inode->i_gid, fattr->gid)) ++ if ((fattr->valid & NFS_ATTR_FATTR_GROUP) && !gid_eq(inode->i_gid, kgid)) invalid |= NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ACCESS | NFS_INO_INVALID_ACL; + /* maybe check for tag too? */ /* Has the link count changed? */ if ((fattr->valid & NFS_ATTR_FATTR_NLINK) && inode->i_nlink != fattr->nlink) -@@ -1303,6 +1321,9 @@ static int nfs_update_inode(struct inode +@@ -1533,6 +1549,9 @@ static int nfs_update_inode(struct inode unsigned long invalid = 0; unsigned long now = jiffies; unsigned long save_cache_validity; -+ uid_t uid; -+ gid_t gid; -+ tag_t tag; ++ kuid_t kuid; ++ kgid_t kgid; ++ ktag_t ktag; - dfprintk(VFS, "NFS: %s(%s/%ld fh_crc=0x%08x ct=%d info=0x%x)\n", + dfprintk(VFS, "NFS: %s(%s/%lu fh_crc=0x%08x ct=%d info=0x%x)\n", __func__, inode->i_sb->s_id, inode->i_ino, -@@ -1404,6 +1425,9 @@ static int nfs_update_inode(struct inode +@@ -1637,6 +1656,9 @@ static int nfs_update_inode(struct inode | NFS_INO_REVAL_PAGECACHE | NFS_INO_REVAL_FORCED); -+ uid = TAGINO_UID(DX_TAG(inode), inode->i_uid, inode->i_tag); -+ gid = TAGINO_GID(DX_TAG(inode), inode->i_gid, inode->i_tag); -+ tag = inode->i_tag; ++ kuid = TAGINO_KUID(DX_TAG(inode), inode->i_uid, inode->i_tag); ++ kgid = TAGINO_KGID(DX_TAG(inode), inode->i_gid, inode->i_tag); ++ ktag = TAGINO_KTAG(DX_TAG(inode), inode->i_tag); if (fattr->valid & NFS_ATTR_FATTR_ATIME) memcpy(&inode->i_atime, &fattr->atime, sizeof(inode->i_atime)); -@@ -1425,9 +1449,9 @@ static int nfs_update_inode(struct inode - | NFS_INO_REVAL_FORCED); - - if (fattr->valid & NFS_ATTR_FATTR_OWNER) { -- if (inode->i_uid != fattr->uid) { -+ if (uid != fattr->uid) { - invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL; -- inode->i_uid = fattr->uid; -+ uid = fattr->uid; - } - } else if (server->caps & NFS_CAP_OWNER) - invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR -@@ -1436,9 +1460,9 @@ static int nfs_update_inode(struct inode - | NFS_INO_REVAL_FORCED); - - if (fattr->valid & NFS_ATTR_FATTR_GROUP) { -- if (inode->i_gid != fattr->gid) { -+ if (gid != fattr->gid) { - invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL; -- inode->i_gid = fattr->gid; -+ gid = fattr->gid; - } - } else if (server->caps & NFS_CAP_OWNER_GROUP) - invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR -@@ -1446,6 +1470,10 @@ static int nfs_update_inode(struct inode +@@ -1683,6 +1705,10 @@ static int nfs_update_inode(struct inode | NFS_INO_INVALID_ACL | NFS_INO_REVAL_FORCED); -+ inode->i_uid = INOTAG_UID(DX_TAG(inode), uid, gid); -+ inode->i_gid = INOTAG_GID(DX_TAG(inode), uid, gid); -+ inode->i_tag = INOTAG_TAG(DX_TAG(inode), uid, gid, tag); ++ inode->i_uid = INOTAG_KUID(DX_TAG(inode), kuid, kgid); ++ inode->i_gid = INOTAG_KGID(DX_TAG(inode), kuid, kgid); ++ inode->i_tag = INOTAG_KTAG(DX_TAG(inode), kuid, kgid, ktag); + if (fattr->valid & NFS_ATTR_FATTR_NLINK) { if (inode->i_nlink != fattr->nlink) { invalid |= NFS_INO_INVALID_ATTR; -diff -NurpP --minimal linux-3.7/fs/nfs/nfs3xdr.c linux-3.7-vs2.3.5.1/fs/nfs/nfs3xdr.c ---- linux-3.7/fs/nfs/nfs3xdr.c 2012-10-04 13:27:40.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/nfs/nfs3xdr.c 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/fs/nfs/nfs3xdr.c linux-3.18.5-vs2.3.7.3/fs/nfs/nfs3xdr.c +--- linux-3.18.5/fs/nfs/nfs3xdr.c 2014-09-03 13:19:40.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/nfs/nfs3xdr.c 2015-01-19 10:58:03.000000000 +0000 @@ -20,6 +20,7 @@ #include #include @@ -5326,7 +5145,7 @@ diff -NurpP --minimal linux-3.7/fs/nfs/nfs3xdr.c linux-3.7-vs2.3.5.1/fs/nfs/nfs3 #include "internal.h" #define NFSDBG_FACILITY NFSDBG_XDR -@@ -560,7 +561,8 @@ static __be32 *xdr_decode_nfstime3(__be3 +@@ -558,7 +559,8 @@ static __be32 *xdr_decode_nfstime3(__be3 * set_mtime mtime; * }; */ @@ -5336,7 +5155,7 @@ diff -NurpP --minimal linux-3.7/fs/nfs/nfs3xdr.c linux-3.7-vs2.3.5.1/fs/nfs/nfs3 { u32 nbytes; __be32 *p; -@@ -592,15 +594,19 @@ static void encode_sattr3(struct xdr_str +@@ -590,15 +592,19 @@ static void encode_sattr3(struct xdr_str } else *p++ = xdr_zero; @@ -5344,9 +5163,9 @@ diff -NurpP --minimal linux-3.7/fs/nfs/nfs3xdr.c linux-3.7-vs2.3.5.1/fs/nfs/nfs3 + if (attr->ia_valid & ATTR_UID || + (tag && (attr->ia_valid & ATTR_TAG))) { *p++ = xdr_one; -- *p++ = cpu_to_be32(attr->ia_uid); -+ *p++ = cpu_to_be32(TAGINO_UID(tag, -+ attr->ia_uid, attr->ia_tag)); +- *p++ = cpu_to_be32(from_kuid(&init_user_ns, attr->ia_uid)); ++ *p++ = cpu_to_be32(from_kuid(&init_user_ns, ++ TAGINO_KUID(tag, attr->ia_uid, attr->ia_tag))); } else *p++ = xdr_zero; @@ -5354,13 +5173,13 @@ diff -NurpP --minimal linux-3.7/fs/nfs/nfs3xdr.c linux-3.7-vs2.3.5.1/fs/nfs/nfs3 + if (attr->ia_valid & ATTR_GID || + (tag && (attr->ia_valid & ATTR_TAG))) { *p++ = xdr_one; -- *p++ = cpu_to_be32(attr->ia_gid); -+ *p++ = cpu_to_be32(TAGINO_GID(tag, -+ attr->ia_gid, attr->ia_tag)); +- *p++ = cpu_to_be32(from_kgid(&init_user_ns, attr->ia_gid)); ++ *p++ = cpu_to_be32(from_kgid(&init_user_ns, ++ TAGINO_KGID(tag, attr->ia_gid, attr->ia_tag))); } else *p++ = xdr_zero; -@@ -879,7 +885,7 @@ static void nfs3_xdr_enc_setattr3args(st +@@ -887,7 +893,7 @@ static void nfs3_xdr_enc_setattr3args(st const struct nfs3_sattrargs *args) { encode_nfs_fh3(xdr, args->fh); @@ -5369,7 +5188,7 @@ diff -NurpP --minimal linux-3.7/fs/nfs/nfs3xdr.c linux-3.7-vs2.3.5.1/fs/nfs/nfs3 encode_sattrguard3(xdr, args); } -@@ -1029,13 +1035,13 @@ static void nfs3_xdr_enc_write3args(stru +@@ -1037,13 +1043,13 @@ static void nfs3_xdr_enc_write3args(stru * }; */ static void encode_createhow3(struct xdr_stream *xdr, @@ -5385,7 +5204,7 @@ diff -NurpP --minimal linux-3.7/fs/nfs/nfs3xdr.c linux-3.7-vs2.3.5.1/fs/nfs/nfs3 break; case NFS3_CREATE_EXCLUSIVE: encode_createverf3(xdr, args->verifier); -@@ -1050,7 +1056,7 @@ static void nfs3_xdr_enc_create3args(str +@@ -1058,7 +1064,7 @@ static void nfs3_xdr_enc_create3args(str const struct nfs3_createargs *args) { encode_diropargs3(xdr, args->fh, args->name, args->len); @@ -5394,7 +5213,7 @@ diff -NurpP --minimal linux-3.7/fs/nfs/nfs3xdr.c linux-3.7-vs2.3.5.1/fs/nfs/nfs3 } /* -@@ -1066,7 +1072,7 @@ static void nfs3_xdr_enc_mkdir3args(stru +@@ -1074,7 +1080,7 @@ static void nfs3_xdr_enc_mkdir3args(stru const struct nfs3_mkdirargs *args) { encode_diropargs3(xdr, args->fh, args->name, args->len); @@ -5403,7 +5222,7 @@ diff -NurpP --minimal linux-3.7/fs/nfs/nfs3xdr.c linux-3.7-vs2.3.5.1/fs/nfs/nfs3 } /* -@@ -1083,9 +1089,9 @@ static void nfs3_xdr_enc_mkdir3args(stru +@@ -1091,9 +1097,9 @@ static void nfs3_xdr_enc_mkdir3args(stru * }; */ static void encode_symlinkdata3(struct xdr_stream *xdr, @@ -5415,7 +5234,7 @@ diff -NurpP --minimal linux-3.7/fs/nfs/nfs3xdr.c linux-3.7-vs2.3.5.1/fs/nfs/nfs3 encode_nfspath3(xdr, args->pages, args->pathlen); } -@@ -1094,7 +1100,7 @@ static void nfs3_xdr_enc_symlink3args(st +@@ -1102,7 +1108,7 @@ static void nfs3_xdr_enc_symlink3args(st const struct nfs3_symlinkargs *args) { encode_diropargs3(xdr, args->fromfh, args->fromname, args->fromlen); @@ -5424,7 +5243,7 @@ diff -NurpP --minimal linux-3.7/fs/nfs/nfs3xdr.c linux-3.7-vs2.3.5.1/fs/nfs/nfs3 } /* -@@ -1122,24 +1128,24 @@ static void nfs3_xdr_enc_symlink3args(st +@@ -1130,24 +1136,24 @@ static void nfs3_xdr_enc_symlink3args(st * }; */ static void encode_devicedata3(struct xdr_stream *xdr, @@ -5454,7 +5273,7 @@ diff -NurpP --minimal linux-3.7/fs/nfs/nfs3xdr.c linux-3.7-vs2.3.5.1/fs/nfs/nfs3 break; case NF3REG: case NF3DIR: -@@ -1154,7 +1160,7 @@ static void nfs3_xdr_enc_mknod3args(stru +@@ -1162,7 +1168,7 @@ static void nfs3_xdr_enc_mknod3args(stru const struct nfs3_mknodargs *args) { encode_diropargs3(xdr, args->fh, args->name, args->len); @@ -5463,18 +5282,18 @@ diff -NurpP --minimal linux-3.7/fs/nfs/nfs3xdr.c linux-3.7-vs2.3.5.1/fs/nfs/nfs3 } /* -diff -NurpP --minimal linux-3.7/fs/nfs/super.c linux-3.7-vs2.3.5.1/fs/nfs/super.c ---- linux-3.7/fs/nfs/super.c 2012-12-11 15:47:35.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/nfs/super.c 2012-12-11 17:09:13.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/fs/nfs/super.c linux-3.18.5-vs2.3.7.3/fs/nfs/super.c +--- linux-3.18.5/fs/nfs/super.c 2015-01-17 02:40:19.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/nfs/super.c 2015-01-19 10:58:03.000000000 +0000 @@ -55,6 +55,7 @@ + #include #include #include - #include +#include #include -@@ -102,6 +103,7 @@ enum { +@@ -103,6 +104,7 @@ enum { Opt_mountport, Opt_mountvers, Opt_minorversion, @@ -5482,7 +5301,7 @@ diff -NurpP --minimal linux-3.7/fs/nfs/super.c linux-3.7-vs2.3.5.1/fs/nfs/super. /* Mount options that take string arguments */ Opt_nfsvers, -@@ -114,6 +116,9 @@ enum { +@@ -115,6 +117,9 @@ enum { /* Special mount options */ Opt_userspace, Opt_deprecated, Opt_sloppy, @@ -5492,7 +5311,7 @@ diff -NurpP --minimal linux-3.7/fs/nfs/super.c linux-3.7-vs2.3.5.1/fs/nfs/super. Opt_err }; -@@ -183,6 +188,10 @@ static const match_table_t nfs_mount_opt +@@ -184,6 +189,10 @@ static const match_table_t nfs_mount_opt { Opt_fscache_uniq, "fsc=%s" }, { Opt_local_lock, "local_lock=%s" }, @@ -5503,7 +5322,7 @@ diff -NurpP --minimal linux-3.7/fs/nfs/super.c linux-3.7-vs2.3.5.1/fs/nfs/super. /* The following needs to be listed after all other options */ { Opt_nfsvers, "v%s" }, -@@ -678,6 +687,7 @@ static void nfs_show_mount_options(struc +@@ -638,6 +647,7 @@ static void nfs_show_mount_options(struc { NFS_MOUNT_NORDIRPLUS, ",nordirplus", "" }, { NFS_MOUNT_UNSHARED, ",nosharecache", "" }, { NFS_MOUNT_NORESVPORT, ",noresvport", "" }, @@ -5511,7 +5330,7 @@ diff -NurpP --minimal linux-3.7/fs/nfs/super.c linux-3.7-vs2.3.5.1/fs/nfs/super. { 0, NULL, NULL } }; const struct proc_nfs_info *nfs_infop; -@@ -1304,6 +1314,14 @@ static int nfs_parse_mount_options(char +@@ -1320,6 +1330,14 @@ static int nfs_parse_mount_options(char case Opt_nomigration: mnt->options &= NFS_OPTION_MIGRATION; break; @@ -5526,7 +5345,7 @@ diff -NurpP --minimal linux-3.7/fs/nfs/super.c linux-3.7-vs2.3.5.1/fs/nfs/super. /* * options that take numeric values -@@ -1390,6 +1408,12 @@ static int nfs_parse_mount_options(char +@@ -1406,6 +1424,12 @@ static int nfs_parse_mount_options(char goto out_invalid_value; mnt->minorversion = option; break; @@ -5539,84 +5358,87 @@ diff -NurpP --minimal linux-3.7/fs/nfs/super.c linux-3.7-vs2.3.5.1/fs/nfs/super. /* * options that take text values -diff -NurpP --minimal linux-3.7/fs/nfsd/auth.c linux-3.7-vs2.3.5.1/fs/nfsd/auth.c ---- linux-3.7/fs/nfsd/auth.c 2012-07-22 21:39:41.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/nfsd/auth.c 2012-12-11 15:56:32.000000000 +0000 -@@ -2,6 +2,7 @@ +diff -NurpP --minimal linux-3.18.5/fs/nfsd/auth.c linux-3.18.5-vs2.3.7.3/fs/nfsd/auth.c +--- linux-3.18.5/fs/nfsd/auth.c 2015-01-16 22:19:19.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/nfsd/auth.c 2015-01-19 12:46:19.000000000 +0000 +@@ -1,6 +1,7 @@ + /* Copyright (C) 1995, 1996 Olaf Kirch */ #include - #include +#include #include "nfsd.h" #include "auth.h" -@@ -37,6 +38,9 @@ int nfsd_setuser(struct svc_rqst *rqstp, +@@ -35,6 +36,9 @@ int nfsd_setuser(struct svc_rqst *rqstp, new->fsuid = rqstp->rq_cred.cr_uid; new->fsgid = rqstp->rq_cred.cr_gid; + /* FIXME: this desperately needs a tag :) -+ new->xid = (xid_t)INOTAG_TAG(DX_TAG_NFSD, cred.cr_uid, cred.cr_gid, 0); ++ new->xid = (vxid_t)INOTAG_TAG(DX_TAG_NFSD, cred.cr_uid, cred.cr_gid, 0); + */ rqgi = rqstp->rq_cred.cr_group_info; -diff -NurpP --minimal linux-3.7/fs/nfsd/nfs3xdr.c linux-3.7-vs2.3.5.1/fs/nfsd/nfs3xdr.c ---- linux-3.7/fs/nfsd/nfs3xdr.c 2012-05-21 16:07:26.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/nfsd/nfs3xdr.c 2012-12-11 15:56:32.000000000 +0000 -@@ -7,6 +7,7 @@ - */ +diff -NurpP --minimal linux-3.18.5/fs/nfsd/nfs3xdr.c linux-3.18.5-vs2.3.7.3/fs/nfsd/nfs3xdr.c +--- linux-3.18.5/fs/nfsd/nfs3xdr.c 2015-01-16 22:19:19.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/nfsd/nfs3xdr.c 2015-01-19 10:58:03.000000000 +0000 +@@ -8,6 +8,7 @@ #include + #include +#include #include "xdr3.h" #include "auth.h" - -@@ -95,6 +96,8 @@ static __be32 * + #include "netns.h" +@@ -98,6 +99,8 @@ static __be32 * decode_sattr3(__be32 *p, struct iattr *iap) { u32 tmp; -+ uid_t uid = 0; -+ gid_t gid = 0; ++ kuid_t kuid = GLOBAL_ROOT_UID; ++ kgid_t kgid = GLOBAL_ROOT_GID; iap->ia_valid = 0; -@@ -104,12 +107,15 @@ decode_sattr3(__be32 *p, struct iattr *i +@@ -106,15 +109,18 @@ decode_sattr3(__be32 *p, struct iattr *i + iap->ia_mode = ntohl(*p++); } if (*p++) { - iap->ia_valid |= ATTR_UID; -- iap->ia_uid = ntohl(*p++); -+ uid = ntohl(*p++); +- iap->ia_uid = make_kuid(&init_user_ns, ntohl(*p++)); ++ kuid = make_kuid(&init_user_ns, ntohl(*p++)); + if (uid_valid(iap->ia_uid)) + iap->ia_valid |= ATTR_UID; } if (*p++) { - iap->ia_valid |= ATTR_GID; -- iap->ia_gid = ntohl(*p++); -+ gid = ntohl(*p++); +- iap->ia_gid = make_kgid(&init_user_ns, ntohl(*p++)); ++ kgid = make_kgid(&init_user_ns, ntohl(*p++)); + if (gid_valid(iap->ia_gid)) + iap->ia_valid |= ATTR_GID; } -+ iap->ia_uid = INOTAG_UID(DX_TAG_NFSD, uid, gid); -+ iap->ia_gid = INOTAG_GID(DX_TAG_NFSD, uid, gid); -+ iap->ia_tag = INOTAG_TAG(DX_TAG_NFSD, uid, gid, 0); ++ iap->ia_uid = INOTAG_KUID(DX_TAG_NFSD, kuid, kgid); ++ iap->ia_gid = INOTAG_KGID(DX_TAG_NFSD, kuid, kgid); ++ iap->ia_tag = INOTAG_KTAG(DX_TAG_NFSD, kuid, kgid, GLOBAL_ROOT_TAG); if (*p++) { u64 newsize; -@@ -165,8 +171,12 @@ encode_fattr3(struct svc_rqst *rqstp, __ +@@ -167,8 +173,12 @@ encode_fattr3(struct svc_rqst *rqstp, __ *p++ = htonl(nfs3_ftypes[(stat->mode & S_IFMT) >> 12]); - *p++ = htonl((u32) stat->mode); + *p++ = htonl((u32) (stat->mode & S_IALLUGO)); *p++ = htonl((u32) stat->nlink); -- *p++ = htonl((u32) nfsd_ruid(rqstp, stat->uid)); -- *p++ = htonl((u32) nfsd_rgid(rqstp, stat->gid)); -+ *p++ = htonl((u32) nfsd_ruid(rqstp, -+ TAGINO_UID(0 /* FIXME: DX_TAG(dentry->d_inode) */, +- *p++ = htonl((u32) from_kuid(&init_user_ns, stat->uid)); +- *p++ = htonl((u32) from_kgid(&init_user_ns, stat->gid)); ++ *p++ = htonl((u32) from_kuid(&init_user_ns, ++ TAGINO_KUID(0 /* FIXME: DX_TAG(dentry->d_inode) */, + stat->uid, stat->tag))); -+ *p++ = htonl((u32) nfsd_rgid(rqstp, -+ TAGINO_GID(0 /* FIXME: DX_TAG(dentry->d_inode) */, ++ *p++ = htonl((u32) from_kgid(&init_user_ns, ++ TAGINO_KGID(0 /* FIXME: DX_TAG(dentry->d_inode) */, + stat->gid, stat->tag))); if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) { p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN); } else { -diff -NurpP --minimal linux-3.7/fs/nfsd/nfs4xdr.c linux-3.7-vs2.3.5.1/fs/nfsd/nfs4xdr.c ---- linux-3.7/fs/nfsd/nfs4xdr.c 2012-12-11 15:47:35.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/nfsd/nfs4xdr.c 2012-12-11 15:56:32.000000000 +0000 -@@ -46,6 +46,7 @@ +diff -NurpP --minimal linux-3.18.5/fs/nfsd/nfs4xdr.c linux-3.18.5-vs2.3.7.3/fs/nfsd/nfs4xdr.c +--- linux-3.18.5/fs/nfsd/nfs4xdr.c 2015-02-05 18:02:45.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/nfsd/nfs4xdr.c 2015-01-19 12:45:51.000000000 +0000 +@@ -39,6 +39,7 @@ #include #include #include @@ -5624,100 +5446,101 @@ diff -NurpP --minimal linux-3.7/fs/nfsd/nfs4xdr.c linux-3.7-vs2.3.5.1/fs/nfsd/nf #include "idmap.h" #include "acl.h" -@@ -2351,14 +2352,18 @@ out_acl: - WRITE32(stat.nlink); +@@ -2436,12 +2437,16 @@ out_acl: + *p++ = cpu_to_be32(stat.nlink); } if (bmval1 & FATTR4_WORD1_OWNER) { -- status = nfsd4_encode_user(rqstp, stat.uid, &p, &buflen); -+ status = nfsd4_encode_user(rqstp, -+ TAGINO_UID(DX_TAG(dentry->d_inode), -+ stat.uid, stat.tag), &p, &buflen); - if (status == nfserr_resource) - goto out_resource; +- status = nfsd4_encode_user(xdr, rqstp, stat.uid); ++ status = nfsd4_encode_user(xdr, rqstp, ++ TAGINO_KUID(DX_TAG(dentry->d_inode), ++ stat.uid, stat.tag)); if (status) goto out; } if (bmval1 & FATTR4_WORD1_OWNER_GROUP) { -- status = nfsd4_encode_group(rqstp, stat.gid, &p, &buflen); -+ status = nfsd4_encode_group(rqstp, -+ TAGINO_GID(DX_TAG(dentry->d_inode), -+ stat.gid, stat.tag), &p, &buflen); - if (status == nfserr_resource) - goto out_resource; +- status = nfsd4_encode_group(xdr, rqstp, stat.gid); ++ status = nfsd4_encode_group(xdr, rqstp, ++ TAGINO_KGID(DX_TAG(dentry->d_inode), ++ stat.gid, stat.tag)); if (status) -diff -NurpP --minimal linux-3.7/fs/nfsd/nfsxdr.c linux-3.7-vs2.3.5.1/fs/nfsd/nfsxdr.c ---- linux-3.7/fs/nfsd/nfsxdr.c 2011-05-22 14:17:53.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/nfsd/nfsxdr.c 2012-12-11 15:56:32.000000000 +0000 -@@ -6,6 +6,7 @@ - + goto out; + } +diff -NurpP --minimal linux-3.18.5/fs/nfsd/nfsxdr.c linux-3.18.5-vs2.3.7.3/fs/nfsd/nfsxdr.c +--- linux-3.18.5/fs/nfsd/nfsxdr.c 2015-01-16 22:19:19.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/nfsd/nfsxdr.c 2015-01-19 10:58:03.000000000 +0000 +@@ -7,6 +7,7 @@ + #include "vfs.h" #include "xdr.h" #include "auth.h" +#include #define NFSDDBG_FACILITY NFSDDBG_XDR -@@ -88,6 +89,8 @@ static __be32 * +@@ -89,6 +90,8 @@ static __be32 * decode_sattr(__be32 *p, struct iattr *iap) { u32 tmp, tmp1; -+ uid_t uid = 0; -+ gid_t gid = 0; ++ kuid_t kuid = GLOBAL_ROOT_UID; ++ kgid_t kgid = GLOBAL_ROOT_GID; iap->ia_valid = 0; -@@ -101,12 +104,15 @@ decode_sattr(__be32 *p, struct iattr *ia +@@ -101,15 +104,18 @@ decode_sattr(__be32 *p, struct iattr *ia + iap->ia_mode = tmp; } if ((tmp = ntohl(*p++)) != (u32)-1) { - iap->ia_valid |= ATTR_UID; -- iap->ia_uid = tmp; -+ uid = tmp; +- iap->ia_uid = make_kuid(&init_user_ns, tmp); ++ kuid = make_kuid(&init_user_ns, tmp); + if (uid_valid(iap->ia_uid)) + iap->ia_valid |= ATTR_UID; } if ((tmp = ntohl(*p++)) != (u32)-1) { - iap->ia_valid |= ATTR_GID; -- iap->ia_gid = tmp; -+ gid = tmp; +- iap->ia_gid = make_kgid(&init_user_ns, tmp); ++ kgid = make_kgid(&init_user_ns, tmp); + if (gid_valid(iap->ia_gid)) + iap->ia_valid |= ATTR_GID; } -+ iap->ia_uid = INOTAG_UID(DX_TAG_NFSD, uid, gid); -+ iap->ia_gid = INOTAG_GID(DX_TAG_NFSD, uid, gid); -+ iap->ia_tag = INOTAG_TAG(DX_TAG_NFSD, uid, gid, 0); ++ iap->ia_uid = INOTAG_KUID(DX_TAG_NFSD, kuid, kgid); ++ iap->ia_gid = INOTAG_KGID(DX_TAG_NFSD, kuid, kgid); ++ iap->ia_tag = INOTAG_KTAG(DX_TAG_NFSD, kuid, kgid, GLOBAL_ROOT_TAG); if ((tmp = ntohl(*p++)) != (u32)-1) { iap->ia_valid |= ATTR_SIZE; iap->ia_size = tmp; -@@ -151,8 +157,10 @@ encode_fattr(struct svc_rqst *rqstp, __b +@@ -154,8 +160,10 @@ encode_fattr(struct svc_rqst *rqstp, __b *p++ = htonl(nfs_ftypes[type >> 12]); *p++ = htonl((u32) stat->mode); *p++ = htonl((u32) stat->nlink); -- *p++ = htonl((u32) nfsd_ruid(rqstp, stat->uid)); -- *p++ = htonl((u32) nfsd_rgid(rqstp, stat->gid)); -+ *p++ = htonl((u32) nfsd_ruid(rqstp, -+ TAGINO_UID(DX_TAG(dentry->d_inode), stat->uid, stat->tag))); -+ *p++ = htonl((u32) nfsd_rgid(rqstp, -+ TAGINO_GID(DX_TAG(dentry->d_inode), stat->gid, stat->tag))); +- *p++ = htonl((u32) from_kuid(&init_user_ns, stat->uid)); +- *p++ = htonl((u32) from_kgid(&init_user_ns, stat->gid)); ++ *p++ = htonl((u32) from_kuid(&init_user_ns, ++ TAGINO_KUID(DX_TAG(dentry->d_inode), stat->uid, stat->tag))); ++ *p++ = htonl((u32) from_kgid(&init_user_ns, ++ TAGINO_KGID(DX_TAG(dentry->d_inode), stat->gid, stat->tag))); if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) { *p++ = htonl(NFS_MAXPATHLEN); -diff -NurpP --minimal linux-3.7/fs/ocfs2/dlmglue.c linux-3.7-vs2.3.5.1/fs/ocfs2/dlmglue.c ---- linux-3.7/fs/ocfs2/dlmglue.c 2012-07-22 21:39:41.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ocfs2/dlmglue.c 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/fs/ocfs2/dlmglue.c linux-3.18.5-vs2.3.7.3/fs/ocfs2/dlmglue.c +--- linux-3.18.5/fs/ocfs2/dlmglue.c 2015-01-17 02:40:20.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/ocfs2/dlmglue.c 2015-01-19 10:58:03.000000000 +0000 @@ -2047,6 +2047,7 @@ static void __ocfs2_stuff_meta_lvb(struc lvb->lvb_iclusters = cpu_to_be32(oi->ip_clusters); - lvb->lvb_iuid = cpu_to_be32(inode->i_uid); - lvb->lvb_igid = cpu_to_be32(inode->i_gid); -+ lvb->lvb_itag = cpu_to_be16(inode->i_tag); + lvb->lvb_iuid = cpu_to_be32(i_uid_read(inode)); + lvb->lvb_igid = cpu_to_be32(i_gid_read(inode)); ++ lvb->lvb_itag = cpu_to_be16(i_tag_read(inode)); lvb->lvb_imode = cpu_to_be16(inode->i_mode); lvb->lvb_inlink = cpu_to_be16(inode->i_nlink); lvb->lvb_iatime_packed = @@ -2097,6 +2098,7 @@ static void ocfs2_refresh_inode_from_lvb - inode->i_uid = be32_to_cpu(lvb->lvb_iuid); - inode->i_gid = be32_to_cpu(lvb->lvb_igid); -+ inode->i_tag = be16_to_cpu(lvb->lvb_itag); + i_uid_write(inode, be32_to_cpu(lvb->lvb_iuid)); + i_gid_write(inode, be32_to_cpu(lvb->lvb_igid)); ++ i_tag_write(inode, be16_to_cpu(lvb->lvb_itag)); inode->i_mode = be16_to_cpu(lvb->lvb_imode); set_nlink(inode, be16_to_cpu(lvb->lvb_inlink)); ocfs2_unpack_timespec(&inode->i_atime, -diff -NurpP --minimal linux-3.7/fs/ocfs2/dlmglue.h linux-3.7-vs2.3.5.1/fs/ocfs2/dlmglue.h ---- linux-3.7/fs/ocfs2/dlmglue.h 2010-10-21 11:07:50.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ocfs2/dlmglue.h 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/fs/ocfs2/dlmglue.h linux-3.18.5-vs2.3.7.3/fs/ocfs2/dlmglue.h +--- linux-3.18.5/fs/ocfs2/dlmglue.h 2014-06-12 13:02:45.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/ocfs2/dlmglue.h 2015-01-19 10:58:03.000000000 +0000 @@ -46,7 +46,8 @@ struct ocfs2_meta_lvb { __be16 lvb_inlink; __be32 lvb_iattr; @@ -5728,10 +5551,10 @@ diff -NurpP --minimal linux-3.7/fs/ocfs2/dlmglue.h linux-3.7-vs2.3.5.1/fs/ocfs2/ }; #define OCFS2_QINFO_LVB_VERSION 1 -diff -NurpP --minimal linux-3.7/fs/ocfs2/file.c linux-3.7-vs2.3.5.1/fs/ocfs2/file.c ---- linux-3.7/fs/ocfs2/file.c 2012-12-11 15:47:35.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ocfs2/file.c 2012-12-11 15:56:32.000000000 +0000 -@@ -1123,7 +1123,7 @@ int ocfs2_setattr(struct dentry *dentry, +diff -NurpP --minimal linux-3.18.5/fs/ocfs2/file.c linux-3.18.5-vs2.3.7.3/fs/ocfs2/file.c +--- linux-3.18.5/fs/ocfs2/file.c 2015-01-17 02:40:20.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/ocfs2/file.c 2015-01-19 10:58:03.000000000 +0000 +@@ -1139,7 +1139,7 @@ int ocfs2_setattr(struct dentry *dentry, attr->ia_valid &= ~ATTR_SIZE; #define OCFS2_VALID_ATTRS (ATTR_ATIME | ATTR_MTIME | ATTR_CTIME | ATTR_SIZE \ @@ -5740,9 +5563,9 @@ diff -NurpP --minimal linux-3.7/fs/ocfs2/file.c linux-3.7-vs2.3.5.1/fs/ocfs2/fil if (!(attr->ia_valid & OCFS2_VALID_ATTRS)) return 0; -diff -NurpP --minimal linux-3.7/fs/ocfs2/inode.c linux-3.7-vs2.3.5.1/fs/ocfs2/inode.c ---- linux-3.7/fs/ocfs2/inode.c 2012-07-22 21:39:41.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ocfs2/inode.c 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/fs/ocfs2/inode.c linux-3.18.5-vs2.3.7.3/fs/ocfs2/inode.c +--- linux-3.18.5/fs/ocfs2/inode.c 2014-06-12 13:02:45.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/ocfs2/inode.c 2015-01-19 10:58:03.000000000 +0000 @@ -28,6 +28,7 @@ #include #include @@ -5815,7 +5638,7 @@ diff -NurpP --minimal linux-3.7/fs/ocfs2/inode.c linux-3.7-vs2.3.5.1/fs/ocfs2/in } struct inode *ocfs2_ilookup(struct super_block *sb, u64 blkno) -@@ -241,6 +263,8 @@ void ocfs2_populate_inode(struct inode * +@@ -268,6 +290,8 @@ void ocfs2_populate_inode(struct inode * struct super_block *sb; struct ocfs2_super *osb; int use_plocks = 1; @@ -5824,25 +5647,25 @@ diff -NurpP --minimal linux-3.7/fs/ocfs2/inode.c linux-3.7-vs2.3.5.1/fs/ocfs2/in sb = inode->i_sb; osb = OCFS2_SB(sb); -@@ -269,8 +293,12 @@ void ocfs2_populate_inode(struct inode * +@@ -296,8 +320,12 @@ void ocfs2_populate_inode(struct inode * inode->i_generation = le32_to_cpu(fe->i_generation); inode->i_rdev = huge_decode_dev(le64_to_cpu(fe->id1.dev1.i_rdev)); inode->i_mode = le16_to_cpu(fe->i_mode); -- inode->i_uid = le32_to_cpu(fe->i_uid); -- inode->i_gid = le32_to_cpu(fe->i_gid); +- i_uid_write(inode, le32_to_cpu(fe->i_uid)); +- i_gid_write(inode, le32_to_cpu(fe->i_gid)); + uid = le32_to_cpu(fe->i_uid); + gid = le32_to_cpu(fe->i_gid); -+ inode->i_uid = INOTAG_UID(DX_TAG(inode), uid, gid); -+ inode->i_gid = INOTAG_GID(DX_TAG(inode), uid, gid); -+ inode->i_tag = INOTAG_TAG(DX_TAG(inode), uid, gid, -+ /* le16_to_cpu(raw_inode->i_raw_tag)i */ 0); ++ i_uid_write(inode, INOTAG_UID(DX_TAG(inode), uid, gid)); ++ i_gid_write(inode, INOTAG_GID(DX_TAG(inode), uid, gid)); ++ i_tag_write(inode, INOTAG_TAG(DX_TAG(inode), uid, gid, ++ /* le16_to_cpu(raw_inode->i_raw_tag) */ 0)); /* Fast symlinks will have i_size but no allocated clusters. */ if (S_ISLNK(inode->i_mode) && !fe->i_clusters) { -diff -NurpP --minimal linux-3.7/fs/ocfs2/inode.h linux-3.7-vs2.3.5.1/fs/ocfs2/inode.h ---- linux-3.7/fs/ocfs2/inode.h 2012-01-09 15:14:55.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ocfs2/inode.h 2012-12-11 15:56:32.000000000 +0000 -@@ -154,6 +154,7 @@ struct buffer_head *ocfs2_bread(struct i +diff -NurpP --minimal linux-3.18.5/fs/ocfs2/inode.h linux-3.18.5-vs2.3.7.3/fs/ocfs2/inode.h +--- linux-3.18.5/fs/ocfs2/inode.h 2015-01-17 02:40:20.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/ocfs2/inode.h 2015-01-19 10:58:03.000000000 +0000 +@@ -157,6 +157,7 @@ struct buffer_head *ocfs2_bread(struct i void ocfs2_set_inode_flags(struct inode *inode); void ocfs2_get_inode_flags(struct ocfs2_inode_info *oi); @@ -5850,9 +5673,9 @@ diff -NurpP --minimal linux-3.7/fs/ocfs2/inode.h linux-3.7-vs2.3.5.1/fs/ocfs2/in static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode) { -diff -NurpP --minimal linux-3.7/fs/ocfs2/ioctl.c linux-3.7-vs2.3.5.1/fs/ocfs2/ioctl.c ---- linux-3.7/fs/ocfs2/ioctl.c 2012-10-04 13:27:41.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ocfs2/ioctl.c 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/fs/ocfs2/ioctl.c linux-3.18.5-vs2.3.7.3/fs/ocfs2/ioctl.c +--- linux-3.18.5/fs/ocfs2/ioctl.c 2015-01-16 22:19:19.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/ocfs2/ioctl.c 2015-01-19 10:58:03.000000000 +0000 @@ -76,7 +76,41 @@ static int ocfs2_get_inode_attr(struct i return status; } @@ -5896,9 +5719,9 @@ diff -NurpP --minimal linux-3.7/fs/ocfs2/ioctl.c linux-3.7-vs2.3.5.1/fs/ocfs2/io unsigned mask) { struct ocfs2_inode_info *ocfs2_inode = OCFS2_I(inode); -@@ -101,6 +135,11 @@ static int ocfs2_set_inode_attr(struct i - if (!S_ISDIR(inode->i_mode)) - flags &= ~OCFS2_DIRSYNC_FL; +@@ -116,6 +150,11 @@ static int ocfs2_set_inode_attr(struct i + goto bail_unlock; + } + if (IS_BARRIER(inode)) { + vxwprintk_task(1, "messing with the barrier."); @@ -5908,17 +5731,17 @@ diff -NurpP --minimal linux-3.7/fs/ocfs2/ioctl.c linux-3.7-vs2.3.5.1/fs/ocfs2/io handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS); if (IS_ERR(handle)) { status = PTR_ERR(handle); -@@ -879,6 +918,7 @@ bail: +@@ -841,6 +880,7 @@ bail: return status; } + long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { - struct inode *inode = filp->f_path.dentry->d_inode; -diff -NurpP --minimal linux-3.7/fs/ocfs2/namei.c linux-3.7-vs2.3.5.1/fs/ocfs2/namei.c ---- linux-3.7/fs/ocfs2/namei.c 2012-10-04 13:27:41.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ocfs2/namei.c 2012-12-11 15:56:32.000000000 +0000 + struct inode *inode = file_inode(filp); +diff -NurpP --minimal linux-3.18.5/fs/ocfs2/namei.c linux-3.18.5-vs2.3.7.3/fs/ocfs2/namei.c +--- linux-3.18.5/fs/ocfs2/namei.c 2015-02-05 18:02:45.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/ocfs2/namei.c 2015-01-19 12:15:49.000000000 +0000 @@ -41,6 +41,7 @@ #include #include @@ -5927,42 +5750,44 @@ diff -NurpP --minimal linux-3.7/fs/ocfs2/namei.c linux-3.7-vs2.3.5.1/fs/ocfs2/na #include -@@ -475,6 +476,7 @@ static int __ocfs2_mknod_locked(struct i - struct ocfs2_dinode *fe = NULL; +@@ -524,6 +525,7 @@ static int __ocfs2_mknod_locked(struct i struct ocfs2_extent_list *fel; u16 feat; -+ tag_t tag; + struct ocfs2_inode_info *oi = OCFS2_I(inode); ++ ktag_t ktag; *new_fe_bh = NULL; -@@ -512,8 +514,11 @@ static int __ocfs2_mknod_locked(struct i +@@ -561,8 +563,13 @@ static int __ocfs2_mknod_locked(struct i fe->i_suballoc_loc = cpu_to_le64(suballoc_loc); fe->i_suballoc_bit = cpu_to_le16(suballoc_bit); fe->i_suballoc_slot = cpu_to_le16(inode_ac->ac_alloc_slot); -- fe->i_uid = cpu_to_le32(inode->i_uid); -- fe->i_gid = cpu_to_le32(inode->i_gid); -+ -+ tag = dx_current_fstag(osb->sb); -+ fe->i_uid = cpu_to_le32(TAGINO_UID(DX_TAG(inode), inode->i_uid, tag)); -+ fe->i_gid = cpu_to_le32(TAGINO_GID(DX_TAG(inode), inode->i_gid, tag)); -+ inode->i_tag = tag; +- fe->i_uid = cpu_to_le32(i_uid_read(inode)); +- fe->i_gid = cpu_to_le32(i_gid_read(inode)); ++ ++ ktag = make_ktag(&init_user_ns, dx_current_fstag(osb->sb)); ++ fe->i_uid = cpu_to_le32(from_kuid(&init_user_ns, ++ TAGINO_KUID(DX_TAG(inode), inode->i_uid, ktag))); ++ fe->i_gid = cpu_to_le32(from_kgid(&init_user_ns, ++ TAGINO_KGID(DX_TAG(inode), inode->i_gid, ktag))); ++ inode->i_tag = ktag; /* is this correct? */ fe->i_mode = cpu_to_le16(inode->i_mode); if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode)) fe->id1.dev1.i_rdev = cpu_to_le64(huge_encode_dev(dev)); -diff -NurpP --minimal linux-3.7/fs/ocfs2/ocfs2.h linux-3.7-vs2.3.5.1/fs/ocfs2/ocfs2.h ---- linux-3.7/fs/ocfs2/ocfs2.h 2012-01-09 15:14:55.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ocfs2/ocfs2.h 2012-12-11 15:56:32.000000000 +0000 -@@ -272,6 +272,7 @@ enum ocfs2_mount_options +diff -NurpP --minimal linux-3.18.5/fs/ocfs2/ocfs2.h linux-3.18.5-vs2.3.7.3/fs/ocfs2/ocfs2.h +--- linux-3.18.5/fs/ocfs2/ocfs2.h 2014-09-03 13:19:40.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/ocfs2/ocfs2.h 2015-01-19 10:58:03.000000000 +0000 +@@ -273,6 +273,7 @@ enum ocfs2_mount_options writes */ OCFS2_MOUNT_HB_NONE = 1 << 13, /* No heartbeat */ OCFS2_MOUNT_HB_GLOBAL = 1 << 14, /* Global heartbeat */ + OCFS2_MOUNT_TAGGED = 1 << 15, /* use tagging */ }; - #define OCFS2_OSB_SOFT_RO 0x0001 -diff -NurpP --minimal linux-3.7/fs/ocfs2/ocfs2_fs.h linux-3.7-vs2.3.5.1/fs/ocfs2/ocfs2_fs.h ---- linux-3.7/fs/ocfs2/ocfs2_fs.h 2011-05-22 14:17:53.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ocfs2/ocfs2_fs.h 2012-12-11 15:56:32.000000000 +0000 + #define OCFS2_OSB_SOFT_RO 0x0001 +diff -NurpP --minimal linux-3.18.5/fs/ocfs2/ocfs2_fs.h linux-3.18.5-vs2.3.7.3/fs/ocfs2/ocfs2_fs.h +--- linux-3.18.5/fs/ocfs2/ocfs2_fs.h 2012-12-11 03:30:57.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/ocfs2/ocfs2_fs.h 2015-01-19 10:58:03.000000000 +0000 @@ -266,6 +266,11 @@ #define OCFS2_TOPDIR_FL FS_TOPDIR_FL /* Top of directory hierarchies*/ #define OCFS2_RESERVED_FL FS_RESERVED_FL /* reserved for ext2 lib */ @@ -5975,9 +5800,9 @@ diff -NurpP --minimal linux-3.7/fs/ocfs2/ocfs2_fs.h linux-3.7-vs2.3.5.1/fs/ocfs2 #define OCFS2_FL_VISIBLE FS_FL_USER_VISIBLE /* User visible flags */ #define OCFS2_FL_MODIFIABLE FS_FL_USER_MODIFIABLE /* User modifiable flags */ -diff -NurpP --minimal linux-3.7/fs/ocfs2/super.c linux-3.7-vs2.3.5.1/fs/ocfs2/super.c ---- linux-3.7/fs/ocfs2/super.c 2012-12-11 15:47:36.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ocfs2/super.c 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/fs/ocfs2/super.c linux-3.18.5-vs2.3.7.3/fs/ocfs2/super.c +--- linux-3.18.5/fs/ocfs2/super.c 2015-01-17 02:40:20.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/ocfs2/super.c 2015-01-19 10:58:03.000000000 +0000 @@ -185,6 +185,7 @@ enum { Opt_coherency_full, Opt_resv_level, @@ -5996,7 +5821,7 @@ diff -NurpP --minimal linux-3.7/fs/ocfs2/super.c linux-3.7-vs2.3.5.1/fs/ocfs2/su {Opt_err, NULL} }; -@@ -662,6 +666,13 @@ static int ocfs2_remount(struct super_bl +@@ -666,6 +670,13 @@ static int ocfs2_remount(struct super_bl goto out; } @@ -6010,7 +5835,7 @@ diff -NurpP --minimal linux-3.7/fs/ocfs2/super.c linux-3.7-vs2.3.5.1/fs/ocfs2/su /* We're going to/from readonly mode. */ if ((*flags & MS_RDONLY) != (sb->s_flags & MS_RDONLY)) { /* Disable quota accounting before remounting RO */ -@@ -1177,6 +1188,9 @@ static int ocfs2_fill_super(struct super +@@ -1185,6 +1196,9 @@ static int ocfs2_fill_super(struct super ocfs2_complete_mount_recovery(osb); @@ -6020,7 +5845,7 @@ diff -NurpP --minimal linux-3.7/fs/ocfs2/super.c linux-3.7-vs2.3.5.1/fs/ocfs2/su if (ocfs2_mount_local(osb)) snprintf(nodestr, sizeof(nodestr), "local"); else -@@ -1503,6 +1517,20 @@ static int ocfs2_parse_options(struct su +@@ -1493,6 +1507,20 @@ static int ocfs2_parse_options(struct su option < OCFS2_MAX_RESV_LEVEL) mopt->dir_resv_level = option; break; @@ -6041,13 +5866,13 @@ diff -NurpP --minimal linux-3.7/fs/ocfs2/super.c linux-3.7-vs2.3.5.1/fs/ocfs2/su default: mlog(ML_ERROR, "Unrecognized mount option \"%s\" " -diff -NurpP --minimal linux-3.7/fs/open.c linux-3.7-vs2.3.5.1/fs/open.c ---- linux-3.7/fs/open.c 2012-12-11 15:47:36.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/open.c 2012-12-11 15:56:32.000000000 +0000 -@@ -30,6 +30,11 @@ - #include +diff -NurpP --minimal linux-3.18.5/fs/open.c linux-3.18.5-vs2.3.7.3/fs/open.c +--- linux-3.18.5/fs/open.c 2015-01-17 02:40:20.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/open.c 2015-01-19 10:58:03.000000000 +0000 +@@ -31,6 +31,11 @@ #include #include + #include +#include +#include +#include @@ -6056,47 +5881,51 @@ diff -NurpP --minimal linux-3.7/fs/open.c linux-3.7-vs2.3.5.1/fs/open.c #include "internal.h" -@@ -74,6 +79,12 @@ static long do_sys_truncate(const char _ - error = user_path(pathname, &path); - if (error) - goto out; -+ +@@ -68,6 +73,11 @@ long vfs_truncate(struct path *path, lof + struct inode *inode; + long error; + +#ifdef CONFIG_VSERVER_COWBL -+ error = cow_check_and_break(&path); ++ error = cow_check_and_break(path); + if (error) -+ goto dput_and_out; ++ goto out; +#endif - inode = path.dentry->d_inode; + inode = path->dentry->d_inode; /* For directories it's -EISDIR, for other non-regulars - -EINVAL */ -@@ -492,6 +503,10 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons - - error = user_path_at(dfd, filename, LOOKUP_FOLLOW, &path); - if (!error) { +@@ -530,6 +540,13 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons + unsigned int lookup_flags = LOOKUP_FOLLOW; + retry: + error = user_path_at(dfd, filename, lookup_flags, &path); +#ifdef CONFIG_VSERVER_COWBL ++ if (!error) { + error = cow_check_and_break(&path); -+ if (!error) ++ if (error) ++ path_put(&path); ++ } +#endif + if (!error) { error = chmod_common(&path, mode); path_put(&path); - } -@@ -519,13 +534,13 @@ static int chown_common(struct path *pat +@@ -563,13 +580,15 @@ static int chown_common(struct path *pat if (!uid_valid(uid)) return -EINVAL; newattrs.ia_valid |= ATTR_UID; - newattrs.ia_uid = uid; -+ newattrs.ia_uid = dx_map_uid(user); ++ newattrs.ia_uid = make_kuid(&init_user_ns, ++ dx_map_uid(user)); } if (group != (gid_t) -1) { if (!gid_valid(gid)) return -EINVAL; newattrs.ia_valid |= ATTR_GID; - newattrs.ia_gid = gid; -+ newattrs.ia_gid = dx_map_gid(group); ++ newattrs.ia_gid = make_kgid(&init_user_ns, ++ dx_map_gid(group)); } if (!S_ISDIR(inode->i_mode)) newattrs.ia_valid |= -@@ -558,6 +573,18 @@ SYSCALL_DEFINE5(fchownat, int, dfd, cons +@@ -608,6 +627,18 @@ retry: error = mnt_want_write(path.mnt); if (error) goto out_release; @@ -6115,9 +5944,9 @@ diff -NurpP --minimal linux-3.7/fs/open.c linux-3.7-vs2.3.5.1/fs/open.c error = chown_common(&path, user, group); mnt_drop_write(path.mnt); out_release: -diff -NurpP --minimal linux-3.7/fs/proc/array.c linux-3.7-vs2.3.5.1/fs/proc/array.c ---- linux-3.7/fs/proc/array.c 2012-07-22 21:39:42.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/proc/array.c 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/fs/proc/array.c linux-3.18.5-vs2.3.7.3/fs/proc/array.c +--- linux-3.18.5/fs/proc/array.c 2015-01-16 22:19:20.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/proc/array.c 2015-01-21 06:37:56.000000000 +0000 @@ -82,6 +82,8 @@ #include #include @@ -6127,7 +5956,7 @@ diff -NurpP --minimal linux-3.7/fs/proc/array.c linux-3.7-vs2.3.5.1/fs/proc/arra #include #include -@@ -172,6 +174,9 @@ static inline void task_state(struct seq +@@ -164,6 +166,9 @@ static inline void task_state(struct seq rcu_read_lock(); ppid = pid_alive(p) ? task_tgid_nr_ns(rcu_dereference(p->real_parent), ns) : 0; @@ -6137,16 +5966,18 @@ diff -NurpP --minimal linux-3.7/fs/proc/array.c linux-3.7-vs2.3.5.1/fs/proc/arra tpid = 0; if (pid_alive(p)) { struct task_struct *tracer = ptrace_parent(p); -@@ -296,7 +301,7 @@ static inline void task_sig(struct seq_f +@@ -289,8 +294,8 @@ static inline void task_sig(struct seq_f + render_sigset_t(m, "SigCgt:\t", &caught); } - static void render_cap_t(struct seq_file *m, const char *header, +-static void render_cap_t(struct seq_file *m, const char *header, - kernel_cap_t *a) ++void render_cap_t(struct seq_file *m, const char *header, + struct vx_info *vxi, kernel_cap_t *a) { unsigned __capi; -@@ -321,10 +326,11 @@ static inline void task_cap(struct seq_f +@@ -315,10 +320,11 @@ static inline void task_cap(struct seq_f cap_bset = cred->cap_bset; rcu_read_unlock(); @@ -6161,8 +5992,8 @@ diff -NurpP --minimal linux-3.7/fs/proc/array.c linux-3.7-vs2.3.5.1/fs/proc/arra + render_cap_t(m, "CapBnd:\t", p->vx_info, &cap_bset); } - static inline void task_context_switch_counts(struct seq_file *m, -@@ -346,6 +352,42 @@ static void task_cpus_allowed(struct seq + static inline void task_seccomp(struct seq_file *m, struct task_struct *p) +@@ -347,6 +353,43 @@ static void task_cpus_allowed(struct seq seq_putc(m, '\n'); } @@ -6185,8 +6016,9 @@ diff -NurpP --minimal linux-3.7/fs/proc/array.c linux-3.7-vs2.3.5.1/fs/proc/arra + (task->nsproxy->ipc_ns == init_task.nsproxy->ipc_ns ? 'I' : '-'), + task->nsproxy->mnt_ns, + (task->nsproxy->mnt_ns == init_task.nsproxy->mnt_ns ? 'I' : '-'), -+ task->nsproxy->pid_ns, -+ (task->nsproxy->pid_ns == init_task.nsproxy->pid_ns ? 'I' : '-'), ++ task->nsproxy->pid_ns_for_children, ++ (task->nsproxy->pid_ns_for_children == ++ init_task.nsproxy->pid_ns_for_children ? 'I' : '-'), + task->nsproxy->net_ns, + (task->nsproxy->net_ns == init_task.nsproxy->net_ns ? 'I' : '-')); + return 0; @@ -6197,25 +6029,25 @@ diff -NurpP --minimal linux-3.7/fs/proc/array.c linux-3.7-vs2.3.5.1/fs/proc/arra + if (task_vx_flags(task, VXF_HIDE_VINFO, 0)) + return; + -+ seq_printf(m, "VxID: %d\n", vx_task_xid(task)); -+ seq_printf(m, "NxID: %d\n", nx_task_nid(task)); ++ seq_printf(m, "VxID:\t%d\n", vx_task_xid(task)); ++ seq_printf(m, "NxID:\t%d\n", nx_task_nid(task)); +} + + int proc_pid_status(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task) { -@@ -362,6 +404,7 @@ int proc_pid_status(struct seq_file *m, - task_cap(m, task); +@@ -364,6 +407,7 @@ int proc_pid_status(struct seq_file *m, + task_seccomp(m, task); task_cpus_allowed(m, task); cpuset_task_status_allowed(m, task); + task_vs_id(m, task); task_context_switch_counts(m, task); return 0; } -@@ -471,6 +514,17 @@ static int do_task_stat(struct seq_file +@@ -467,6 +511,17 @@ static int do_task_stat(struct seq_file /* convert nsec -> ticks */ - start_time = nsec_to_clock_t(start_time); + start_time = nsec_to_clock_t(task->real_start_time); + /* fixup start time for virt uptime */ + if (vx_flags(VXF_VIRT_UPTIME, 0)) { @@ -6231,19 +6063,19 @@ diff -NurpP --minimal linux-3.7/fs/proc/array.c linux-3.7-vs2.3.5.1/fs/proc/arra seq_printf(m, "%d (%s) %c", pid_nr_ns(pid, ns), tcomm, state); seq_put_decimal_ll(m, ' ', ppid); seq_put_decimal_ll(m, ' ', pgid); -diff -NurpP --minimal linux-3.7/fs/proc/base.c linux-3.7-vs2.3.5.1/fs/proc/base.c ---- linux-3.7/fs/proc/base.c 2012-12-11 15:47:36.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/proc/base.c 2012-12-11 19:34:49.000000000 +0000 -@@ -85,6 +85,8 @@ - #include +diff -NurpP --minimal linux-3.18.5/fs/proc/base.c linux-3.18.5-vs2.3.7.3/fs/proc/base.c +--- linux-3.18.5/fs/proc/base.c 2015-02-05 18:02:45.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/proc/base.c 2015-01-22 09:04:57.000000000 +0000 +@@ -87,6 +87,8 @@ #include #include + #include +#include +#include #ifdef CONFIG_HARDWALL #include #endif -@@ -950,11 +952,15 @@ static ssize_t oom_adj_write(struct file +@@ -884,11 +886,15 @@ static ssize_t oom_adj_write(struct file oom_adj = (oom_adj * OOM_SCORE_ADJ_MAX) / -OOM_DISABLE; if (oom_adj < task->signal->oom_score_adj && @@ -6260,46 +6092,45 @@ diff -NurpP --minimal linux-3.7/fs/proc/base.c linux-3.7-vs2.3.5.1/fs/proc/base. /* * /proc/pid/oom_adj is provided for legacy purposes, ask users to use * /proc/pid/oom_score_adj instead. -@@ -1534,6 +1540,8 @@ struct inode *proc_pid_make_inode(struct +@@ -1476,6 +1482,8 @@ struct inode *proc_pid_make_inode(struct inode->i_gid = cred->egid; rcu_read_unlock(); } + /* procfs is xid tagged */ -+ i_tag_write(inode, (tag_t)vx_task_xid(task)); ++ i_tag_write(inode, (vtag_t)vx_task_xid(task)); security_task_to_inode(task, inode); out: -@@ -1579,6 +1587,8 @@ int pid_getattr(struct vfsmount *mnt, st +@@ -1521,6 +1529,8 @@ int pid_getattr(struct vfsmount *mnt, st /* dentry stuff */ -+static unsigned name_to_int(struct dentry *dentry); ++// static unsigned name_to_int(struct dentry *dentry); + /* * Exceptional case: normally we are not allowed to unhash a busy * directory. In this case, however, we can do it - no aliasing problems -@@ -1607,6 +1617,12 @@ int pid_revalidate(struct dentry *dentry +@@ -1549,6 +1559,19 @@ int pid_revalidate(struct dentry *dentry task = get_proc_task(inode); if (task) { -+ unsigned pid = name_to_int(dentry); -+ -+ if (pid != ~0U && pid != vx_map_pid(task->pid)) { ++ unsigned pid = name_to_int(&dentry->d_name); ++ ++ if (pid != ~0U && pid != vx_map_pid(task->pid) && ++ pid != __task_pid_nr_ns(task, PIDTYPE_PID, ++ task_active_pid_ns(task))) { ++ vxdprintk(VXD_CBIT(misc, 10), ++ VS_Q("%*s") " dropped by pid_revalidate(%d!=%d)", ++ dentry->d_name.len, dentry->d_name.name, ++ pid, vx_map_pid(task->pid)); + put_task_struct(task); -+ goto drop; ++ d_drop(dentry); ++ return 0; + } if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) || task_dumpable(task)) { rcu_read_lock(); -@@ -1623,6 +1639,7 @@ int pid_revalidate(struct dentry *dentry - put_task_struct(task); - return 1; - } -+drop: - d_drop(dentry); - return 0; - } -@@ -2065,6 +2082,13 @@ static struct dentry *proc_pident_lookup +@@ -2085,6 +2108,13 @@ static struct dentry *proc_pident_lookup if (!task) goto out_no_task; @@ -6313,43 +6144,28 @@ diff -NurpP --minimal linux-3.7/fs/proc/base.c linux-3.7-vs2.3.5.1/fs/proc/base. /* * Yes, it does not scale. And it should not. Don't add * new entries into /proc// without very good reasons. -@@ -2451,7 +2475,7 @@ out_iput: - static struct dentry *proc_base_lookup(struct inode *dir, struct dentry *dentry) - { - struct dentry *error; -- struct task_struct *task = get_proc_task(dir); -+ struct task_struct *task = get_proc_task_real(dir); - const struct pid_entry *p, *last; - - error = ERR_PTR(-ENOENT); -@@ -2639,6 +2663,9 @@ static int proc_pid_personality(struct s +@@ -2534,6 +2564,11 @@ static int proc_pid_personality(struct s static const struct file_operations proc_task_operations; static const struct inode_operations proc_task_inode_operations; -+extern int proc_pid_vx_info(struct task_struct *, char *); -+extern int proc_pid_nx_info(struct task_struct *, char *); ++extern int proc_pid_vx_info(struct seq_file *, ++ struct pid_namespace *, struct pid *, struct task_struct *); ++extern int proc_pid_nx_info(struct seq_file *, ++ struct pid_namespace *, struct pid *, struct task_struct *); + static const struct pid_entry tgid_base_stuff[] = { DIR("task", S_IRUGO|S_IXUGO, proc_task_inode_operations, proc_task_operations), DIR("fd", S_IRUSR|S_IXUSR, proc_fd_inode_operations, proc_fd_operations), -@@ -2705,6 +2732,8 @@ static const struct pid_entry tgid_base_ +@@ -2600,6 +2635,8 @@ static const struct pid_entry tgid_base_ #ifdef CONFIG_CGROUPS - REG("cgroup", S_IRUGO, proc_cgroup_operations), + ONE("cgroup", S_IRUGO, proc_cgroup_show), #endif -+ INF("vinfo", S_IRUGO, proc_pid_vx_info), -+ INF("ninfo", S_IRUGO, proc_pid_nx_info), - INF("oom_score", S_IRUGO, proc_oom_score), ++ ONE("vinfo", S_IRUGO, proc_pid_vx_info), ++ ONE("ninfo", S_IRUGO, proc_pid_nx_info), + ONE("oom_score", S_IRUGO, proc_oom_score), REG("oom_adj", S_IRUGO|S_IWUSR, proc_oom_adj_operations), REG("oom_score_adj", S_IRUGO|S_IWUSR, proc_oom_score_adj_operations), -@@ -2729,6 +2758,7 @@ static const struct pid_entry tgid_base_ - REG("gid_map", S_IRUGO|S_IWUSR, proc_gid_map_operations), - REG("projid_map", S_IRUGO|S_IWUSR, proc_projid_map_operations), - #endif -+ ONE("nsproxy", S_IRUGO, proc_pid_nsproxy), - }; - - static int proc_tgid_base_readdir(struct file * filp, -@@ -2923,7 +2953,7 @@ retry: +@@ -2811,7 +2848,7 @@ retry: iter.task = NULL; pid = find_ge_pid(iter.tgid, ns); if (pid) { @@ -6358,35 +6174,28 @@ diff -NurpP --minimal linux-3.7/fs/proc/base.c linux-3.7-vs2.3.5.1/fs/proc/base. iter.task = pid_task(pid, PIDTYPE_PID); /* What we to know is if the pid we have find is the * pid of a thread_group_leader. Testing for task -@@ -2953,7 +2983,7 @@ static int proc_pid_fill_cache(struct fi - struct tgid_iter iter) - { - char name[PROC_NUMBUF]; -- int len = snprintf(name, sizeof(name), "%d", iter.tgid); -+ int len = snprintf(name, sizeof(name), "%d", vx_map_tgid(iter.tgid)); - return proc_fill_cache(filp, dirent, filldir, name, len, - proc_pid_instantiate, iter.task, NULL); - } -@@ -2977,7 +3007,7 @@ int proc_pid_readdir(struct file * filp, - goto out_no_task; - nr = filp->f_pos - FIRST_PROCESS_ENTRY; - -- reaper = get_proc_task(filp->f_path.dentry->d_inode); -+ reaper = get_proc_task_real(filp->f_path.dentry->d_inode); - if (!reaper) - goto out_no_task; - -@@ -2999,6 +3029,8 @@ int proc_pid_readdir(struct file * filp, - __filldir = fake_filldir; +@@ -2869,8 +2906,10 @@ int proc_pid_readdir(struct file *file, + if (!has_pid_permissions(ns, iter.task, 2)) + continue; - filp->f_pos = iter.tgid + TGID_OFFSET; +- len = snprintf(name, sizeof(name), "%d", iter.tgid); ++ len = snprintf(name, sizeof(name), "%d", vx_map_tgid(iter.tgid)); + ctx->pos = iter.tgid + TGID_OFFSET; + if (!vx_proc_task_visible(iter.task)) + continue; - if (proc_pid_fill_cache(filp, dirent, __filldir, iter) < 0) { + if (!proc_fill_cache(file, ctx, name, len, + proc_pid_instantiate, iter.task, NULL)) { put_task_struct(iter.task); - goto out; -@@ -3161,6 +3193,8 @@ static struct dentry *proc_task_lookup(s - tid = name_to_int(dentry); +@@ -2967,6 +3006,7 @@ static const struct pid_entry tid_base_s + REG("projid_map", S_IRUGO|S_IWUSR, proc_projid_map_operations), + REG("setgroups", S_IRUGO|S_IWUSR, proc_setgroups_operations), + #endif ++ ONE("nsproxy", S_IRUGO, proc_pid_nsproxy), + }; + + static int proc_tid_base_readdir(struct file *file, struct dir_context *ctx) +@@ -3033,6 +3073,8 @@ static struct dentry *proc_task_lookup(s + tid = name_to_int(&dentry->d_name); if (tid == ~0U) goto out; + if (vx_current_initpid(tid)) @@ -6394,10 +6203,10 @@ diff -NurpP --minimal linux-3.7/fs/proc/base.c linux-3.7-vs2.3.5.1/fs/proc/base. ns = dentry->d_sb->s_fs_info; rcu_read_lock(); -diff -NurpP --minimal linux-3.7/fs/proc/generic.c linux-3.7-vs2.3.5.1/fs/proc/generic.c ---- linux-3.7/fs/proc/generic.c 2012-12-11 15:47:36.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/proc/generic.c 2012-12-11 19:15:21.000000000 +0000 -@@ -22,6 +22,7 @@ +diff -NurpP --minimal linux-3.18.5/fs/proc/generic.c linux-3.18.5-vs2.3.7.3/fs/proc/generic.c +--- linux-3.18.5/fs/proc/generic.c 2015-01-16 22:19:20.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/proc/generic.c 2015-01-22 08:31:12.000000000 +0000 +@@ -23,6 +23,7 @@ #include #include #include @@ -6405,48 +6214,59 @@ diff -NurpP --minimal linux-3.7/fs/proc/generic.c linux-3.7-vs2.3.5.1/fs/proc/ge #include #include "internal.h" -@@ -424,11 +425,15 @@ struct dentry *proc_lookup_de(struct pro +@@ -186,6 +187,12 @@ struct dentry *proc_lookup_de(struct pro for (de = de->subdir; de ; de = de->next) { if (de->namelen != dentry->d_name.len) continue; -+ if (!vx_hide_check(0, de->vx_flags)) ++ if (!vx_hide_check(0, de->vx_flags)) { ++ vxdprintk(VXD_CBIT(misc, 9), ++ VS_Q("%*s") " hidden in proc_lookup_de()", ++ de->namelen, de->name); + continue; ++ } if (!memcmp(dentry->d_name.name, de->name, de->namelen)) { pde_get(de); spin_unlock(&proc_subdir_lock); - error = -ENOMEM; - inode = proc_get_inode(dir->i_sb, de); +@@ -194,6 +201,8 @@ struct dentry *proc_lookup_de(struct pro + return ERR_PTR(-ENOMEM); + d_set_d_op(dentry, &simple_dentry_operations); + d_add(dentry, inode); + /* generic proc entries belong to the host */ + i_tag_write(inode, 0); - goto out_unlock; + return NULL; } } -@@ -506,6 +511,8 @@ int proc_readdir_de(struct proc_dir_entr - - /* filldir passes info to user space */ - pde_get(de); -+ if (!vx_hide_check(0, de->vx_flags)) -+ goto skip; - spin_unlock(&proc_subdir_lock); - if (filldir(dirent, de->name, de->namelen, filp->f_pos, - de->low_ino, de->mode >> 12) < 0) { -@@ -513,6 +520,7 @@ int proc_readdir_de(struct proc_dir_entr - goto out; - } - spin_lock(&proc_subdir_lock); -+ skip: - filp->f_pos++; - next = de->next; - pde_put(de); -@@ -625,6 +633,7 @@ static struct proc_dir_entry *__proc_cre - ent->namelen = len; +@@ -241,6 +250,13 @@ int proc_readdir_de(struct proc_dir_entr + do { + struct proc_dir_entry *next; + pde_get(de); ++ ++ if (!vx_hide_check(0, de->vx_flags)) { ++ vxdprintk(VXD_CBIT(misc, 9), ++ VS_Q("%*s") " hidden in proc_readdir_de()", ++ de->namelen, de->name); ++ goto skip; ++ } + spin_unlock(&proc_subdir_lock); + if (!dir_emit(ctx, de->name, de->namelen, + de->low_ino, de->mode >> 12)) { +@@ -248,6 +264,7 @@ int proc_readdir_de(struct proc_dir_entr + return 0; + } + spin_lock(&proc_subdir_lock); ++ skip: + ctx->pos++; + next = de->next; + pde_put(de); +@@ -354,6 +371,7 @@ static struct proc_dir_entry *__proc_cre + ent->namelen = qstr.len; ent->mode = mode; ent->nlink = nlink; + ent->vx_flags = IATTR_PROC_DEFAULT; atomic_set(&ent->count, 1); spin_lock_init(&ent->pde_unload_lock); INIT_LIST_HEAD(&ent->pde_openers); -@@ -648,7 +657,8 @@ struct proc_dir_entry *proc_symlink(cons +@@ -377,7 +395,8 @@ struct proc_dir_entry *proc_symlink(cons kfree(ent->data); kfree(ent); ent = NULL; @@ -6456,10 +6276,10 @@ diff -NurpP --minimal linux-3.7/fs/proc/generic.c linux-3.7-vs2.3.5.1/fs/proc/ge } else { kfree(ent); ent = NULL; -diff -NurpP --minimal linux-3.7/fs/proc/inode.c linux-3.7-vs2.3.5.1/fs/proc/inode.c ---- linux-3.7/fs/proc/inode.c 2012-12-11 15:47:36.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/proc/inode.c 2012-12-11 15:56:32.000000000 +0000 -@@ -457,6 +457,8 @@ struct inode *proc_get_inode(struct supe +diff -NurpP --minimal linux-3.18.5/fs/proc/inode.c linux-3.18.5-vs2.3.7.3/fs/proc/inode.c +--- linux-3.18.5/fs/proc/inode.c 2015-01-16 22:19:20.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/proc/inode.c 2015-01-19 10:58:03.000000000 +0000 +@@ -415,6 +415,8 @@ struct inode *proc_get_inode(struct supe inode->i_uid = de->uid; inode->i_gid = de->gid; } @@ -6468,29 +6288,49 @@ diff -NurpP --minimal linux-3.7/fs/proc/inode.c linux-3.7-vs2.3.5.1/fs/proc/inod if (de->size) inode->i_size = de->size; if (de->nlink) -diff -NurpP --minimal linux-3.7/fs/proc/internal.h linux-3.7-vs2.3.5.1/fs/proc/internal.h ---- linux-3.7/fs/proc/internal.h 2012-12-11 15:47:36.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/proc/internal.h 2012-12-11 15:56:32.000000000 +0000 -@@ -11,6 +11,8 @@ - - #include - #include +diff -NurpP --minimal linux-3.18.5/fs/proc/internal.h linux-3.18.5-vs2.3.7.3/fs/proc/internal.h +--- linux-3.18.5/fs/proc/internal.h 2015-01-17 02:40:20.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/proc/internal.h 2015-01-19 12:40:33.000000000 +0000 +@@ -14,6 +14,7 @@ + #include + #include + #include +#include -+ - struct ctl_table_header; - struct mempolicy; -@@ -54,6 +56,9 @@ extern int proc_pid_status(struct seq_fi - struct pid *pid, struct task_struct *task); - extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns, - struct pid *pid, struct task_struct *task); -+extern int proc_pid_nsproxy(struct seq_file *m, struct pid_namespace *ns, -+ struct pid *pid, struct task_struct *task); + struct ctl_table_header; + struct mempolicy; +@@ -35,6 +36,7 @@ struct proc_dir_entry { + nlink_t nlink; + kuid_t uid; + kgid_t gid; ++ int vx_flags; + loff_t size; + const struct inode_operations *proc_iops; + const struct file_operations *proc_fops; +@@ -50,15 +52,22 @@ struct proc_dir_entry { + char name[]; + }; + ++struct vx_info; ++struct nx_info; + - extern loff_t mem_lseek(struct file *file, loff_t offset, int orig); + union proc_op { + int (*proc_get_link)(struct dentry *, struct path *); + int (*proc_show)(struct seq_file *m, + struct pid_namespace *ns, struct pid *pid, + struct task_struct *task); ++ int (*proc_vs_read)(char *page); ++ int (*proc_vxi_read)(struct vx_info *vxi, char *page); ++ int (*proc_nxi_read)(struct nx_info *nxi, char *page); + }; - extern const struct file_operations proc_tid_children_operations; -@@ -87,11 +92,16 @@ static inline struct pid *proc_pid(struc + struct proc_inode { + struct pid *pid; ++ int vx_flags; + int fd; + union proc_op op; + struct proc_dir_entry *pde; +@@ -91,11 +100,16 @@ static inline struct pid *proc_pid(struc return PROC_I(inode)->pid; } @@ -6505,12 +6345,21 @@ diff -NurpP --minimal linux-3.7/fs/proc/internal.h linux-3.7-vs2.3.5.1/fs/proc/i + return vx_get_proc_task(inode, proc_pid(inode)); +} + - static inline int proc_fd(struct inode *inode) + static inline int task_dumpable(struct task_struct *task) { - return PROC_I(inode)->fd; -diff -NurpP --minimal linux-3.7/fs/proc/loadavg.c linux-3.7-vs2.3.5.1/fs/proc/loadavg.c ---- linux-3.7/fs/proc/loadavg.c 2009-09-10 13:26:23.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/proc/loadavg.c 2012-12-11 15:56:32.000000000 +0000 + int dumpable = 0; +@@ -154,6 +168,8 @@ extern int proc_pid_status(struct seq_fi + struct pid *, struct task_struct *); + extern int proc_pid_statm(struct seq_file *, struct pid_namespace *, + struct pid *, struct task_struct *); ++extern int proc_pid_nsproxy(struct seq_file *m, struct pid_namespace *ns, ++ struct pid *pid, struct task_struct *task); + + /* + * base.c +diff -NurpP --minimal linux-3.18.5/fs/proc/loadavg.c linux-3.18.5-vs2.3.7.3/fs/proc/loadavg.c +--- linux-3.18.5/fs/proc/loadavg.c 2014-06-12 11:34:59.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/proc/loadavg.c 2015-01-19 10:58:03.000000000 +0000 @@ -12,15 +12,27 @@ static int loadavg_proc_show(struct seq_file *m, void *v) @@ -6540,23 +6389,23 @@ diff -NurpP --minimal linux-3.7/fs/proc/loadavg.c linux-3.7-vs2.3.5.1/fs/proc/lo task_active_pid_ns(current)->last_pid); return 0; } -diff -NurpP --minimal linux-3.7/fs/proc/meminfo.c linux-3.7-vs2.3.5.1/fs/proc/meminfo.c ---- linux-3.7/fs/proc/meminfo.c 2012-01-09 15:14:55.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/proc/meminfo.c 2012-12-11 15:56:32.000000000 +0000 -@@ -39,7 +39,8 @@ static int meminfo_proc_show(struct seq_ - allowed = ((totalram_pages - hugetlb_total_pages()) - * sysctl_overcommit_ratio / 100) + total_swap_pages; +diff -NurpP --minimal linux-3.18.5/fs/proc/meminfo.c linux-3.18.5-vs2.3.7.3/fs/proc/meminfo.c +--- linux-3.18.5/fs/proc/meminfo.c 2015-01-16 22:19:20.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/proc/meminfo.c 2015-01-19 10:58:03.000000000 +0000 +@@ -41,7 +41,8 @@ static int meminfo_proc_show(struct seq_ + si_swapinfo(&i); + committed = percpu_counter_read_positive(&vm_committed_as); - cached = global_page_state(NR_FILE_PAGES) - + cached = vx_flags(VXF_VIRT_MEM, 0) ? + vx_vsi_cached(&i) : global_page_state(NR_FILE_PAGES) - - total_swapcache_pages - i.bufferram; + total_swapcache_pages() - i.bufferram; if (cached < 0) cached = 0; -diff -NurpP --minimal linux-3.7/fs/proc/root.c linux-3.7-vs2.3.5.1/fs/proc/root.c ---- linux-3.7/fs/proc/root.c 2012-12-11 15:47:36.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/proc/root.c 2012-12-11 15:56:32.000000000 +0000 -@@ -19,9 +19,14 @@ +diff -NurpP --minimal linux-3.18.5/fs/proc/root.c linux-3.18.5-vs2.3.7.3/fs/proc/root.c +--- linux-3.18.5/fs/proc/root.c 2015-01-16 22:19:20.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/proc/root.c 2015-01-19 10:58:04.000000000 +0000 +@@ -20,9 +20,14 @@ #include #include #include @@ -6571,15 +6420,25 @@ diff -NurpP --minimal linux-3.7/fs/proc/root.c linux-3.7-vs2.3.5.1/fs/proc/root. static int proc_test_super(struct super_block *sb, void *data) { return sb->s_fs_info == data; -@@ -189,6 +194,7 @@ void __init proc_root_init(void) - #endif +@@ -116,7 +121,8 @@ static struct dentry *proc_mount(struct + return ERR_PTR(-EPERM); + + /* Does the mounter have privilege over the pid namespace? */ +- if (!ns_capable(ns->user_ns, CAP_SYS_ADMIN)) ++ if (!vx_ns_capable(ns->user_ns, ++ CAP_SYS_ADMIN, VXC_SECURE_MOUNT)) + return ERR_PTR(-EPERM); + } + +@@ -190,6 +196,7 @@ void __init proc_root_init(void) + proc_tty_init(); proc_mkdir("bus", NULL); proc_sys_init(); + proc_vx_init(); } static int proc_root_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat -@@ -255,6 +261,7 @@ struct proc_dir_entry proc_root = { +@@ -251,6 +258,7 @@ struct proc_dir_entry proc_root = { .proc_iops = &proc_root_inode_operations, .proc_fops = &proc_root_operations, .parent = &proc_root, @@ -6587,15 +6446,35 @@ diff -NurpP --minimal linux-3.7/fs/proc/root.c linux-3.7-vs2.3.5.1/fs/proc/root. .name = "/proc", }; -diff -NurpP --minimal linux-3.7/fs/proc/stat.c linux-3.7-vs2.3.5.1/fs/proc/stat.c ---- linux-3.7/fs/proc/stat.c 2012-12-11 15:47:36.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/proc/stat.c 2012-12-12 13:54:26.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/fs/proc/self.c linux-3.18.5-vs2.3.7.3/fs/proc/self.c +--- linux-3.18.5/fs/proc/self.c 2014-06-12 13:02:46.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/proc/self.c 2015-01-19 10:58:04.000000000 +0000 +@@ -2,6 +2,7 @@ + #include + #include + #include ++#include + #include "internal.h" + + /* +@@ -54,6 +55,8 @@ int proc_setup_self(struct super_block * + self = d_alloc_name(s->s_root, "self"); + if (self) { + struct inode *inode = new_inode_pseudo(s); ++ ++ // self->vx_flags = IATTR_PROC_SYMLINK; + if (inode) { + inode->i_ino = self_inum; + inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME; +diff -NurpP --minimal linux-3.18.5/fs/proc/stat.c linux-3.18.5-vs2.3.7.3/fs/proc/stat.c +--- linux-3.18.5/fs/proc/stat.c 2015-02-05 18:02:45.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/proc/stat.c 2015-01-28 11:48:02.000000000 +0000 @@ -9,8 +9,10 @@ #include #include #include +#include - #include + #include #include +#include @@ -6638,18 +6517,18 @@ diff -NurpP --minimal linux-3.7/fs/proc/stat.c linux-3.7-vs2.3.5.1/fs/proc/stat. /* Copy values here to work around gcc-2.95.3, gcc-2.96 */ user = kcpustat_cpu(i).cpustat[CPUTIME_USER]; nice = kcpustat_cpu(i).cpustat[CPUTIME_NICE]; -diff -NurpP --minimal linux-3.7/fs/proc/uptime.c linux-3.7-vs2.3.5.1/fs/proc/uptime.c ---- linux-3.7/fs/proc/uptime.c 2012-03-19 18:47:26.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/proc/uptime.c 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/fs/proc/uptime.c linux-3.18.5-vs2.3.7.3/fs/proc/uptime.c +--- linux-3.18.5/fs/proc/uptime.c 2014-06-12 13:02:46.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/proc/uptime.c 2015-01-19 12:41:00.000000000 +0000 @@ -5,6 +5,7 @@ #include #include #include +#include - #include + #include static int uptime_proc_show(struct seq_file *m, void *v) -@@ -25,6 +26,10 @@ static int uptime_proc_show(struct seq_f +@@ -24,6 +25,10 @@ static int uptime_proc_show(struct seq_f nsec = cputime64_to_jiffies64(idletime) * TICK_NSEC; idle.tv_sec = div_u64_rem(nsec, NSEC_PER_SEC, &rem); idle.tv_nsec = rem; @@ -6660,9 +6539,9 @@ diff -NurpP --minimal linux-3.7/fs/proc/uptime.c linux-3.7-vs2.3.5.1/fs/proc/upt seq_printf(m, "%lu.%02lu %lu.%02lu\n", (unsigned long) uptime.tv_sec, (uptime.tv_nsec / (NSEC_PER_SEC / 100)), -diff -NurpP --minimal linux-3.7/fs/proc_namespace.c linux-3.7-vs2.3.5.1/fs/proc_namespace.c ---- linux-3.7/fs/proc_namespace.c 2012-10-04 13:27:41.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/proc_namespace.c 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/fs/proc_namespace.c linux-3.18.5-vs2.3.7.3/fs/proc_namespace.c +--- linux-3.18.5/fs/proc_namespace.c 2015-01-16 22:19:20.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/proc_namespace.c 2015-01-19 10:58:04.000000000 +0000 @@ -44,6 +44,8 @@ static int show_sb_opts(struct seq_file { MS_SYNCHRONOUS, ",sync" }, { MS_DIRSYNC, ",dirsync" }, @@ -6672,7 +6551,7 @@ diff -NurpP --minimal linux-3.7/fs/proc_namespace.c linux-3.7-vs2.3.5.1/fs/proc_ { 0, NULL } }; const struct proc_fs_info *fs_infop; -@@ -80,6 +82,40 @@ static inline void mangle(struct seq_fil +@@ -80,6 +82,38 @@ static inline void mangle(struct seq_fil seq_escape(m, s, " \t\n\\"); } @@ -6689,7 +6568,7 @@ diff -NurpP --minimal linux-3.7/fs/proc_namespace.c linux-3.7-vs2.3.5.1/fs/proc_ + if (mnt == mnt->mnt_ns->root) + return 1; + -+ br_read_lock(&vfsmount_lock); ++ rcu_read_lock(); + root = current->fs->root; + root_mnt = real_mount(root.mnt); + point = root.dentry; @@ -6698,11 +6577,9 @@ diff -NurpP --minimal linux-3.7/fs/proc_namespace.c linux-3.7-vs2.3.5.1/fs/proc_ + point = mnt->mnt_mountpoint; + mnt = mnt->mnt_parent; + } ++ rcu_read_unlock(); + + ret = (mnt == root_mnt) && is_subdir(point, root.dentry); -+ -+ br_read_unlock(&vfsmount_lock); -+ + return ret; +} + @@ -6713,7 +6590,7 @@ diff -NurpP --minimal linux-3.7/fs/proc_namespace.c linux-3.7-vs2.3.5.1/fs/proc_ static void show_type(struct seq_file *m, struct super_block *sb) { mangle(m, sb->s_type->name); -@@ -96,6 +132,17 @@ static int show_vfsmnt(struct seq_file * +@@ -96,6 +130,17 @@ static int show_vfsmnt(struct seq_file * struct path mnt_path = { .dentry = mnt->mnt_root, .mnt = mnt }; struct super_block *sb = mnt_path.dentry->d_sb; @@ -6731,7 +6608,7 @@ diff -NurpP --minimal linux-3.7/fs/proc_namespace.c linux-3.7-vs2.3.5.1/fs/proc_ if (sb->s_op->show_devname) { err = sb->s_op->show_devname(m, mnt_path.dentry); if (err) -@@ -106,6 +153,7 @@ static int show_vfsmnt(struct seq_file * +@@ -106,6 +151,7 @@ static int show_vfsmnt(struct seq_file * seq_putc(m, ' '); seq_path(m, &mnt_path, " \t\n\\"); seq_putc(m, ' '); @@ -6739,7 +6616,7 @@ diff -NurpP --minimal linux-3.7/fs/proc_namespace.c linux-3.7-vs2.3.5.1/fs/proc_ show_type(m, sb); seq_puts(m, __mnt_is_readonly(mnt) ? " ro" : " rw"); err = show_sb_opts(m, sb); -@@ -128,6 +176,11 @@ static int show_mountinfo(struct seq_fil +@@ -128,6 +174,11 @@ static int show_mountinfo(struct seq_fil struct path root = p->root; int err = 0; @@ -6751,7 +6628,7 @@ diff -NurpP --minimal linux-3.7/fs/proc_namespace.c linux-3.7-vs2.3.5.1/fs/proc_ seq_printf(m, "%i %i %u:%u ", r->mnt_id, r->mnt_parent->mnt_id, MAJOR(sb->s_dev), MINOR(sb->s_dev)); if (sb->s_op->show_path) -@@ -187,6 +240,17 @@ static int show_vfsstat(struct seq_file +@@ -187,6 +238,17 @@ static int show_vfsstat(struct seq_file struct super_block *sb = mnt_path.dentry->d_sb; int err = 0; @@ -6769,7 +6646,7 @@ diff -NurpP --minimal linux-3.7/fs/proc_namespace.c linux-3.7-vs2.3.5.1/fs/proc_ /* device */ if (sb->s_op->show_devname) { seq_puts(m, "device "); -@@ -203,7 +267,7 @@ static int show_vfsstat(struct seq_file +@@ -203,7 +265,7 @@ static int show_vfsstat(struct seq_file seq_puts(m, " mounted on "); seq_path(m, &mnt_path, " \t\n\\"); seq_putc(m, ' '); @@ -6778,51 +6655,54 @@ diff -NurpP --minimal linux-3.7/fs/proc_namespace.c linux-3.7-vs2.3.5.1/fs/proc_ /* file system type */ seq_puts(m, "with fstype "); show_type(m, sb); -diff -NurpP --minimal linux-3.7/fs/quota/dquot.c linux-3.7-vs2.3.5.1/fs/quota/dquot.c ---- linux-3.7/fs/quota/dquot.c 2012-12-11 15:47:36.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/quota/dquot.c 2012-12-11 15:56:32.000000000 +0000 -@@ -1582,6 +1582,9 @@ int __dquot_alloc_space(struct inode *in +diff -NurpP --minimal linux-3.18.5/fs/quota/dquot.c linux-3.18.5-vs2.3.7.3/fs/quota/dquot.c +--- linux-3.18.5/fs/quota/dquot.c 2015-01-17 02:40:20.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/quota/dquot.c 2015-01-19 23:44:31.000000000 +0000 +@@ -1598,6 +1598,12 @@ int __dquot_alloc_space(struct inode *in struct dquot **dquots = inode->i_dquot; int reserve = flags & DQUOT_SPACE_RESERVE; ++ if ((ret = dl_alloc_inode(inode))) ++ return ret; ++ + if ((ret = dl_alloc_space(inode, number))) + return ret; + - /* - * First test before acquiring mutex - solves deadlocks when we - * re-enter the quota code and are already holding the mutex -@@ -1637,6 +1640,9 @@ int dquot_alloc_inode(const struct inode + if (!dquot_active(inode)) { + inode_incr_space(inode, number, reserve); + goto out; +@@ -1649,6 +1655,9 @@ int dquot_alloc_inode(const struct inode struct dquot_warn warn[MAXQUOTAS]; struct dquot * const *dquots = inode->i_dquot; + if ((ret = dl_alloc_inode(inode))) + return ret; + - /* First test before acquiring mutex - solves deadlocks when we - * re-enter the quota code and are already holding the mutex */ if (!dquot_active(inode)) -@@ -1708,6 +1714,8 @@ void __dquot_free_space(struct inode *in + return 0; + for (cnt = 0; cnt < MAXQUOTAS; cnt++) +@@ -1748,6 +1757,8 @@ void __dquot_free_space(struct inode *in struct dquot **dquots = inode->i_dquot; - int reserve = flags & DQUOT_SPACE_RESERVE; + int reserve = flags & DQUOT_SPACE_RESERVE, index; + dl_free_space(inode, number); + - /* First test before acquiring mutex - solves deadlocks when we - * re-enter the quota code and are already holding the mutex */ if (!dquot_active(inode)) { -@@ -1752,6 +1760,8 @@ void dquot_free_inode(const struct inode - struct dquot_warn warn[MAXQUOTAS]; + inode_decr_space(inode, number, reserve); + return; +@@ -1791,6 +1802,8 @@ void dquot_free_inode(const struct inode struct dquot * const *dquots = inode->i_dquot; + int index; + dl_free_inode(inode); + - /* First test before acquiring mutex - solves deadlocks when we - * re-enter the quota code and are already holding the mutex */ if (!dquot_active(inode)) -diff -NurpP --minimal linux-3.7/fs/quota/quota.c linux-3.7-vs2.3.5.1/fs/quota/quota.c ---- linux-3.7/fs/quota/quota.c 2012-12-11 15:47:36.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/quota/quota.c 2012-12-11 22:07:44.000000000 +0000 -@@ -8,6 +8,7 @@ + return; + +diff -NurpP --minimal linux-3.18.5/fs/quota/quota.c linux-3.18.5-vs2.3.7.3/fs/quota/quota.c +--- linux-3.18.5/fs/quota/quota.c 2015-01-16 22:19:20.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/quota/quota.c 2015-01-19 10:58:04.000000000 +0000 +@@ -8,6 +8,7 @@ #include #include #include @@ -6830,7 +6710,7 @@ diff -NurpP --minimal linux-3.7/fs/quota/quota.c linux-3.7-vs2.3.5.1/fs/quota/qu #include #include #include -@@ -37,7 +38,7 @@ static int check_quotactl_permission(str +@@ -38,7 +39,7 @@ static int check_quotactl_permission(str break; /*FALLTHROUGH*/ default: @@ -6839,9 +6719,9 @@ diff -NurpP --minimal linux-3.7/fs/quota/quota.c linux-3.7-vs2.3.5.1/fs/quota/qu return -EPERM; } -@@ -307,6 +308,46 @@ static int do_quotactl(struct super_bloc - } - } +@@ -350,6 +351,46 @@ static int do_quotactl(struct super_bloc + + #ifdef CONFIG_BLOCK +#if defined(CONFIG_BLK_DEV_VROOT) || defined(CONFIG_BLK_DEV_VROOT_MODULE) + @@ -6886,7 +6766,7 @@ diff -NurpP --minimal linux-3.7/fs/quota/quota.c linux-3.7-vs2.3.5.1/fs/quota/qu /* Return 1 if 'cmd' will block on frozen filesystem */ static int quotactl_cmd_write(int cmd) { -@@ -339,6 +380,22 @@ static struct super_block *quotactl_bloc +@@ -385,6 +426,22 @@ static struct super_block *quotactl_bloc putname(tmp); if (IS_ERR(bdev)) return ERR_CAST(bdev); @@ -6909,9 +6789,9 @@ diff -NurpP --minimal linux-3.7/fs/quota/quota.c linux-3.7-vs2.3.5.1/fs/quota/qu if (quotactl_cmd_write(cmd)) sb = get_super_thawed(bdev); else -diff -NurpP --minimal linux-3.7/fs/stat.c linux-3.7-vs2.3.5.1/fs/stat.c ---- linux-3.7/fs/stat.c 2012-12-11 15:47:36.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/stat.c 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/fs/stat.c linux-3.18.5-vs2.3.7.3/fs/stat.c +--- linux-3.18.5/fs/stat.c 2014-01-22 20:39:07.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/stat.c 2015-01-19 10:58:04.000000000 +0000 @@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod stat->nlink = inode->i_nlink; stat->uid = inode->i_uid; @@ -6920,9 +6800,9 @@ diff -NurpP --minimal linux-3.7/fs/stat.c linux-3.7-vs2.3.5.1/fs/stat.c stat->rdev = inode->i_rdev; stat->size = i_size_read(inode); stat->atime = inode->i_atime; -diff -NurpP --minimal linux-3.7/fs/statfs.c linux-3.7-vs2.3.5.1/fs/statfs.c ---- linux-3.7/fs/statfs.c 2012-12-11 15:47:36.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/statfs.c 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/fs/statfs.c linux-3.18.5-vs2.3.7.3/fs/statfs.c +--- linux-3.18.5/fs/statfs.c 2013-11-25 15:47:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/statfs.c 2015-01-19 10:58:04.000000000 +0000 @@ -7,6 +7,8 @@ #include #include @@ -6941,10 +6821,10 @@ diff -NurpP --minimal linux-3.7/fs/statfs.c linux-3.7-vs2.3.5.1/fs/statfs.c return retval; } -diff -NurpP --minimal linux-3.7/fs/super.c linux-3.7-vs2.3.5.1/fs/super.c ---- linux-3.7/fs/super.c 2012-12-11 15:47:36.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/super.c 2012-12-11 15:56:32.000000000 +0000 -@@ -34,6 +34,8 @@ +diff -NurpP --minimal linux-3.18.5/fs/super.c linux-3.18.5-vs2.3.7.3/fs/super.c +--- linux-3.18.5/fs/super.c 2015-01-17 02:40:20.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/super.c 2015-01-19 10:58:04.000000000 +0000 +@@ -33,6 +33,8 @@ #include #include #include @@ -6953,7 +6833,7 @@ diff -NurpP --minimal linux-3.7/fs/super.c linux-3.7-vs2.3.5.1/fs/super.c #include "internal.h" -@@ -1119,6 +1121,13 @@ mount_fs(struct file_system_type *type, +@@ -1114,6 +1116,13 @@ mount_fs(struct file_system_type *type, WARN_ON(sb->s_bdi == &default_backing_dev_info); sb->s_flags |= MS_BORN; @@ -6967,21 +6847,9 @@ diff -NurpP --minimal linux-3.7/fs/super.c linux-3.7-vs2.3.5.1/fs/super.c error = security_sb_kern_mount(sb, flags, secdata); if (error) goto out_sb; -diff -NurpP --minimal linux-3.7/fs/sysfs/mount.c linux-3.7-vs2.3.5.1/fs/sysfs/mount.c ---- linux-3.7/fs/sysfs/mount.c 2012-10-04 13:27:41.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/sysfs/mount.c 2012-12-11 15:56:32.000000000 +0000 -@@ -47,7 +47,7 @@ static int sysfs_fill_super(struct super - - sb->s_blocksize = PAGE_CACHE_SIZE; - sb->s_blocksize_bits = PAGE_CACHE_SHIFT; -- sb->s_magic = SYSFS_MAGIC; -+ sb->s_magic = SYSFS_SUPER_MAGIC; - sb->s_op = &sysfs_ops; - sb->s_time_gran = 1; - -diff -NurpP --minimal linux-3.7/fs/utimes.c linux-3.7-vs2.3.5.1/fs/utimes.c ---- linux-3.7/fs/utimes.c 2012-12-11 15:47:37.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/utimes.c 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/fs/utimes.c linux-3.18.5-vs2.3.7.3/fs/utimes.c +--- linux-3.18.5/fs/utimes.c 2014-01-22 20:39:07.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/utimes.c 2015-01-19 10:58:04.000000000 +0000 @@ -8,6 +8,8 @@ #include #include @@ -6991,29 +6859,30 @@ diff -NurpP --minimal linux-3.7/fs/utimes.c linux-3.7-vs2.3.5.1/fs/utimes.c #include #include -@@ -52,12 +54,18 @@ static int utimes_common(struct path *pa +@@ -52,13 +54,19 @@ static int utimes_common(struct path *pa { int error; struct iattr newattrs; - struct inode *inode = path->dentry->d_inode; + struct inode *delegated_inode = NULL; + struct inode *inode; ++ ++ error = cow_check_and_break(path); ++ if (error) ++ goto out; error = mnt_want_write(path->mnt); if (error) goto out; -+ error = cow_check_and_break(path); -+ if (error) -+ goto mnt_drop_write_and_out; -+ + inode = path->dentry->d_inode; + if (times && times[0].tv_nsec == UTIME_NOW && times[1].tv_nsec == UTIME_NOW) times = NULL; -diff -NurpP --minimal linux-3.7/fs/xattr.c linux-3.7-vs2.3.5.1/fs/xattr.c ---- linux-3.7/fs/xattr.c 2012-12-11 15:47:37.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/xattr.c 2012-12-11 17:16:31.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/fs/xattr.c linux-3.18.5-vs2.3.7.3/fs/xattr.c +--- linux-3.18.5/fs/xattr.c 2015-01-17 02:40:20.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/fs/xattr.c 2015-01-19 10:58:04.000000000 +0000 @@ -21,6 +21,7 @@ #include #include @@ -7031,666 +6900,23 @@ diff -NurpP --minimal linux-3.7/fs/xattr.c linux-3.7-vs2.3.5.1/fs/xattr.c return (mask & MAY_WRITE) ? -EPERM : -ENODATA; return 0; } -diff -NurpP --minimal linux-3.7/fs/xfs/xfs_dinode.h linux-3.7-vs2.3.5.1/fs/xfs/xfs_dinode.h ---- linux-3.7/fs/xfs/xfs_dinode.h 2012-10-04 13:27:44.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/xfs/xfs_dinode.h 2012-12-11 15:56:32.000000000 +0000 -@@ -51,7 +51,9 @@ typedef struct xfs_dinode { - __be32 di_nlink; /* number of links to file */ - __be16 di_projid_lo; /* lower part of owner's project id */ - __be16 di_projid_hi; /* higher part owner's project id */ -- __u8 di_pad[6]; /* unused, zeroed space */ -+ __u8 di_pad[2]; /* unused, zeroed space */ -+ __be16 di_tag; /* context tagging */ -+ __be16 di_vflags; /* vserver specific flags */ - __be16 di_flushiter; /* incremented on flush */ - xfs_timestamp_t di_atime; /* time last accessed */ - xfs_timestamp_t di_mtime; /* time last modified */ -@@ -184,6 +186,8 @@ static inline void xfs_dinode_put_rdev(s - #define XFS_DIFLAG_EXTSZINHERIT_BIT 12 /* inherit inode extent size */ - #define XFS_DIFLAG_NODEFRAG_BIT 13 /* do not reorganize/defragment */ - #define XFS_DIFLAG_FILESTREAM_BIT 14 /* use filestream allocator */ -+#define XFS_DIFLAG_IXUNLINK_BIT 15 /* Immutable inver on unlink */ -+ - #define XFS_DIFLAG_REALTIME (1 << XFS_DIFLAG_REALTIME_BIT) - #define XFS_DIFLAG_PREALLOC (1 << XFS_DIFLAG_PREALLOC_BIT) - #define XFS_DIFLAG_NEWRTBM (1 << XFS_DIFLAG_NEWRTBM_BIT) -@@ -199,6 +203,7 @@ static inline void xfs_dinode_put_rdev(s - #define XFS_DIFLAG_EXTSZINHERIT (1 << XFS_DIFLAG_EXTSZINHERIT_BIT) - #define XFS_DIFLAG_NODEFRAG (1 << XFS_DIFLAG_NODEFRAG_BIT) - #define XFS_DIFLAG_FILESTREAM (1 << XFS_DIFLAG_FILESTREAM_BIT) -+#define XFS_DIFLAG_IXUNLINK (1 << XFS_DIFLAG_IXUNLINK_BIT) - - #ifdef CONFIG_XFS_RT - #define XFS_IS_REALTIME_INODE(ip) ((ip)->i_d.di_flags & XFS_DIFLAG_REALTIME) -@@ -211,6 +216,10 @@ static inline void xfs_dinode_put_rdev(s - XFS_DIFLAG_IMMUTABLE | XFS_DIFLAG_APPEND | XFS_DIFLAG_SYNC | \ - XFS_DIFLAG_NOATIME | XFS_DIFLAG_NODUMP | XFS_DIFLAG_RTINHERIT | \ - XFS_DIFLAG_PROJINHERIT | XFS_DIFLAG_NOSYMLINKS | XFS_DIFLAG_EXTSIZE | \ -- XFS_DIFLAG_EXTSZINHERIT | XFS_DIFLAG_NODEFRAG | XFS_DIFLAG_FILESTREAM) -+ XFS_DIFLAG_EXTSZINHERIT | XFS_DIFLAG_NODEFRAG | XFS_DIFLAG_FILESTREAM | \ -+ XFS_DIFLAG_IXUNLINK) -+ -+#define XFS_DIVFLAG_BARRIER 0x01 -+#define XFS_DIVFLAG_COW 0x02 - - #endif /* __XFS_DINODE_H__ */ -diff -NurpP --minimal linux-3.7/fs/xfs/xfs_fs.h linux-3.7-vs2.3.5.1/fs/xfs/xfs_fs.h ---- linux-3.7/fs/xfs/xfs_fs.h 2011-10-24 16:45:31.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/xfs/xfs_fs.h 2012-12-11 15:56:32.000000000 +0000 -@@ -67,6 +67,9 @@ struct fsxattr { - #define XFS_XFLAG_EXTSZINHERIT 0x00001000 /* inherit inode extent size */ - #define XFS_XFLAG_NODEFRAG 0x00002000 /* do not defragment */ - #define XFS_XFLAG_FILESTREAM 0x00004000 /* use filestream allocator */ -+#define XFS_XFLAG_IXUNLINK 0x00008000 /* immutable invert on unlink */ -+#define XFS_XFLAG_BARRIER 0x10000000 /* chroot() barrier */ -+#define XFS_XFLAG_COW 0x20000000 /* copy on write mark */ - #define XFS_XFLAG_HASATTR 0x80000000 /* no DIFLAG for this */ - - /* -@@ -302,7 +305,8 @@ typedef struct xfs_bstat { - #define bs_projid bs_projid_lo /* (previously just bs_projid) */ - __u16 bs_forkoff; /* inode fork offset in bytes */ - __u16 bs_projid_hi; /* higher part of project id */ -- unsigned char bs_pad[10]; /* pad space, unused */ -+ unsigned char bs_pad[8]; /* pad space, unused */ -+ __u16 bs_tag; /* context tagging */ - __u32 bs_dmevmask; /* DMIG event mask */ - __u16 bs_dmstate; /* DMIG state info */ - __u16 bs_aextents; /* attribute number of extents */ -diff -NurpP --minimal linux-3.7/fs/xfs/xfs_ialloc.c linux-3.7-vs2.3.5.1/fs/xfs/xfs_ialloc.c ---- linux-3.7/fs/xfs/xfs_ialloc.c 2012-12-11 15:47:37.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/xfs/xfs_ialloc.c 2012-12-11 15:56:32.000000000 +0000 -@@ -37,7 +37,6 @@ - #include "xfs_error.h" - #include "xfs_bmap.h" - -- - /* - * Allocation group level functions. - */ -diff -NurpP --minimal linux-3.7/fs/xfs/xfs_inode.c linux-3.7-vs2.3.5.1/fs/xfs/xfs_inode.c ---- linux-3.7/fs/xfs/xfs_inode.c 2012-12-11 15:47:37.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/xfs/xfs_inode.c 2012-12-11 22:20:23.000000000 +0000 -@@ -16,6 +16,7 @@ - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - #include -+#include - - #include "xfs.h" - #include "xfs_fs.h" -@@ -563,15 +564,25 @@ xfs_iformat_btree( - STATIC void - xfs_dinode_from_disk( - xfs_icdinode_t *to, -- xfs_dinode_t *from) -+ xfs_dinode_t *from, -+ int tagged) - { -+ uint32_t uid, gid, tag; -+ - to->di_magic = be16_to_cpu(from->di_magic); - to->di_mode = be16_to_cpu(from->di_mode); - to->di_version = from ->di_version; - to->di_format = from->di_format; - to->di_onlink = be16_to_cpu(from->di_onlink); -- to->di_uid = be32_to_cpu(from->di_uid); -- to->di_gid = be32_to_cpu(from->di_gid); -+ -+ uid = be32_to_cpu(from->di_uid); -+ gid = be32_to_cpu(from->di_gid); -+ tag = be16_to_cpu(from->di_tag); -+ -+ to->di_uid = INOTAG_UID(tagged, uid, gid); -+ to->di_gid = INOTAG_GID(tagged, uid, gid); -+ to->di_tag = INOTAG_TAG(tagged, uid, gid, tag); -+ - to->di_nlink = be32_to_cpu(from->di_nlink); - to->di_projid_lo = be16_to_cpu(from->di_projid_lo); - to->di_projid_hi = be16_to_cpu(from->di_projid_hi); -@@ -593,21 +604,26 @@ xfs_dinode_from_disk( - to->di_dmevmask = be32_to_cpu(from->di_dmevmask); - to->di_dmstate = be16_to_cpu(from->di_dmstate); - to->di_flags = be16_to_cpu(from->di_flags); -+ to->di_vflags = be16_to_cpu(from->di_vflags); - to->di_gen = be32_to_cpu(from->di_gen); - } - - void - xfs_dinode_to_disk( - xfs_dinode_t *to, -- xfs_icdinode_t *from) -+ xfs_icdinode_t *from, -+ int tagged) - { - to->di_magic = cpu_to_be16(from->di_magic); - to->di_mode = cpu_to_be16(from->di_mode); - to->di_version = from ->di_version; - to->di_format = from->di_format; - to->di_onlink = cpu_to_be16(from->di_onlink); -- to->di_uid = cpu_to_be32(from->di_uid); -- to->di_gid = cpu_to_be32(from->di_gid); -+ -+ to->di_uid = cpu_to_be32(TAGINO_UID(tagged, from->di_uid, from->di_tag)); -+ to->di_gid = cpu_to_be32(TAGINO_GID(tagged, from->di_gid, from->di_tag)); -+ to->di_tag = cpu_to_be16(TAGINO_TAG(tagged, from->di_tag)); -+ - to->di_nlink = cpu_to_be32(from->di_nlink); - to->di_projid_lo = cpu_to_be16(from->di_projid_lo); - to->di_projid_hi = cpu_to_be16(from->di_projid_hi); -@@ -629,12 +645,14 @@ xfs_dinode_to_disk( - to->di_dmevmask = cpu_to_be32(from->di_dmevmask); - to->di_dmstate = cpu_to_be16(from->di_dmstate); - to->di_flags = cpu_to_be16(from->di_flags); -+ to->di_vflags = cpu_to_be16(from->di_vflags); - to->di_gen = cpu_to_be32(from->di_gen); - } - - STATIC uint - _xfs_dic2xflags( -- __uint16_t di_flags) -+ __uint16_t di_flags, -+ __uint16_t di_vflags) - { - uint flags = 0; - -@@ -645,6 +663,8 @@ _xfs_dic2xflags( - flags |= XFS_XFLAG_PREALLOC; - if (di_flags & XFS_DIFLAG_IMMUTABLE) - flags |= XFS_XFLAG_IMMUTABLE; -+ if (di_flags & XFS_DIFLAG_IXUNLINK) -+ flags |= XFS_XFLAG_IXUNLINK; - if (di_flags & XFS_DIFLAG_APPEND) - flags |= XFS_XFLAG_APPEND; - if (di_flags & XFS_DIFLAG_SYNC) -@@ -669,6 +689,10 @@ _xfs_dic2xflags( - flags |= XFS_XFLAG_FILESTREAM; - } - -+ if (di_vflags & XFS_DIVFLAG_BARRIER) -+ flags |= FS_BARRIER_FL; -+ if (di_vflags & XFS_DIVFLAG_COW) -+ flags |= FS_COW_FL; - return flags; - } - -@@ -678,7 +702,7 @@ xfs_ip2xflags( - { - xfs_icdinode_t *dic = &ip->i_d; - -- return _xfs_dic2xflags(dic->di_flags) | -+ return _xfs_dic2xflags(dic->di_flags, dic->di_vflags) | - (XFS_IFORK_Q(ip) ? XFS_XFLAG_HASATTR : 0); - } - -@@ -686,7 +710,8 @@ uint - xfs_dic2xflags( - xfs_dinode_t *dip) - { -- return _xfs_dic2xflags(be16_to_cpu(dip->di_flags)) | -+ return _xfs_dic2xflags(be16_to_cpu(dip->di_flags), -+ be16_to_cpu(dip->di_vflags)) | - (XFS_DFORK_Q(dip) ? XFS_XFLAG_HASATTR : 0); - } - -@@ -740,7 +765,8 @@ xfs_iread( - * Otherwise, just get the truly permanent information. - */ - if (dip->di_mode) { -- xfs_dinode_from_disk(&ip->i_d, dip); -+ xfs_dinode_from_disk(&ip->i_d, dip, -+ mp->m_flags & XFS_MOUNT_TAGGED); - error = xfs_iformat(ip, dip); - if (error) { - #ifdef DEBUG -@@ -927,6 +953,7 @@ xfs_ialloc( - ASSERT(ip->i_d.di_nlink == nlink); - ip->i_d.di_uid = current_fsuid(); - ip->i_d.di_gid = current_fsgid(); -+ ip->i_d.di_tag = current_fstag(&ip->i_vnode); - xfs_set_projid(ip, prid); - memset(&(ip->i_d.di_pad[0]), 0, sizeof(ip->i_d.di_pad)); - -@@ -986,6 +1013,7 @@ xfs_ialloc( - ip->i_d.di_dmevmask = 0; - ip->i_d.di_dmstate = 0; - ip->i_d.di_flags = 0; -+ ip->i_d.di_vflags = 0; - flags = XFS_ILOG_CORE; - switch (mode & S_IFMT) { - case S_IFIFO: -@@ -1668,6 +1696,7 @@ xfs_ifree( - } - ip->i_d.di_mode = 0; /* mark incore inode as free */ - ip->i_d.di_flags = 0; -+ ip->i_d.di_vflags = 0; - ip->i_d.di_dmevmask = 0; - ip->i_d.di_forkoff = 0; /* mark the attr fork not in use */ - ip->i_d.di_format = XFS_DINODE_FMT_EXTENTS; -@@ -1834,7 +1863,6 @@ xfs_iroot_realloc( - return; - } - -- - /* - * This is called when the amount of space needed for if_data - * is increased or decreased. The change in size is indicated by -@@ -2522,7 +2550,8 @@ xfs_iflush_int( - * because if the inode is dirty at all the core must - * be. - */ -- xfs_dinode_to_disk(dip, &ip->i_d); -+ xfs_dinode_to_disk(dip, &ip->i_d, -+ mp->m_flags & XFS_MOUNT_TAGGED); - - /* Wrap, we never let the log put out DI_MAX_FLUSH */ - if (ip->i_d.di_flushiter == DI_MAX_FLUSH) -diff -NurpP --minimal linux-3.7/fs/xfs/xfs_inode.h linux-3.7-vs2.3.5.1/fs/xfs/xfs_inode.h ---- linux-3.7/fs/xfs/xfs_inode.h 2012-10-04 13:27:44.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/xfs/xfs_inode.h 2012-12-11 15:56:32.000000000 +0000 -@@ -134,7 +134,9 @@ typedef struct xfs_icdinode { - __uint32_t di_nlink; /* number of links to file */ - __uint16_t di_projid_lo; /* lower part of owner's project id */ - __uint16_t di_projid_hi; /* higher part of owner's project id */ -- __uint8_t di_pad[6]; /* unused, zeroed space */ -+ __uint8_t di_pad[2]; /* unused, zeroed space */ -+ __uint16_t di_tag; /* context tagging */ -+ __uint16_t di_vflags; /* vserver specific flags */ - __uint16_t di_flushiter; /* incremented on flush */ - xfs_ictimestamp_t di_atime; /* time last accessed */ - xfs_ictimestamp_t di_mtime; /* time last modified */ -@@ -561,7 +563,7 @@ int xfs_imap_to_bp(struct xfs_mount *, - int xfs_iread(struct xfs_mount *, struct xfs_trans *, - struct xfs_inode *, uint); - void xfs_dinode_to_disk(struct xfs_dinode *, -- struct xfs_icdinode *); -+ struct xfs_icdinode *, int); - void xfs_idestroy_fork(struct xfs_inode *, int); - void xfs_idata_realloc(struct xfs_inode *, int, int); - void xfs_iroot_realloc(struct xfs_inode *, int, int); -diff -NurpP --minimal linux-3.7/fs/xfs/xfs_ioctl.c linux-3.7-vs2.3.5.1/fs/xfs/xfs_ioctl.c ---- linux-3.7/fs/xfs/xfs_ioctl.c 2012-12-11 15:47:37.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/xfs/xfs_ioctl.c 2012-12-11 15:56:32.000000000 +0000 -@@ -26,7 +26,7 @@ - #include "xfs_bmap_btree.h" - #include "xfs_dinode.h" - #include "xfs_inode.h" --#include "xfs_ioctl.h" -+// #include "xfs_ioctl.h" - #include "xfs_rtalloc.h" - #include "xfs_itable.h" - #include "xfs_error.h" -@@ -762,6 +762,10 @@ xfs_merge_ioc_xflags( - xflags |= XFS_XFLAG_IMMUTABLE; - else - xflags &= ~XFS_XFLAG_IMMUTABLE; -+ if (flags & FS_IXUNLINK_FL) -+ xflags |= XFS_XFLAG_IXUNLINK; -+ else -+ xflags &= ~XFS_XFLAG_IXUNLINK; - if (flags & FS_APPEND_FL) - xflags |= XFS_XFLAG_APPEND; - else -@@ -790,6 +794,8 @@ xfs_di2lxflags( - - if (di_flags & XFS_DIFLAG_IMMUTABLE) - flags |= FS_IMMUTABLE_FL; -+ if (di_flags & XFS_DIFLAG_IXUNLINK) -+ flags |= FS_IXUNLINK_FL; - if (di_flags & XFS_DIFLAG_APPEND) - flags |= FS_APPEND_FL; - if (di_flags & XFS_DIFLAG_SYNC) -@@ -850,6 +856,8 @@ xfs_set_diflags( - di_flags = (ip->i_d.di_flags & XFS_DIFLAG_PREALLOC); - if (xflags & XFS_XFLAG_IMMUTABLE) - di_flags |= XFS_DIFLAG_IMMUTABLE; -+ if (xflags & XFS_XFLAG_IXUNLINK) -+ di_flags |= XFS_DIFLAG_IXUNLINK; - if (xflags & XFS_XFLAG_APPEND) - di_flags |= XFS_DIFLAG_APPEND; - if (xflags & XFS_XFLAG_SYNC) -@@ -892,6 +900,10 @@ xfs_diflags_to_linux( - inode->i_flags |= S_IMMUTABLE; - else - inode->i_flags &= ~S_IMMUTABLE; -+ if (xflags & XFS_XFLAG_IXUNLINK) -+ inode->i_flags |= S_IXUNLINK; -+ else -+ inode->i_flags &= ~S_IXUNLINK; - if (xflags & XFS_XFLAG_APPEND) - inode->i_flags |= S_APPEND; - else -@@ -1396,10 +1408,18 @@ xfs_file_ioctl( - case XFS_IOC_FSGETXATTRA: - return xfs_ioc_fsgetxattr(ip, 1, arg); - case XFS_IOC_FSSETXATTR: -+ if (IS_BARRIER(inode)) { -+ vxwprintk_task(1, "messing with the barrier."); -+ return -XFS_ERROR(EACCES); -+ } - return xfs_ioc_fssetxattr(ip, filp, arg); - case XFS_IOC_GETXFLAGS: - return xfs_ioc_getxflags(ip, arg); - case XFS_IOC_SETXFLAGS: -+ if (IS_BARRIER(inode)) { -+ vxwprintk_task(1, "messing with the barrier."); -+ return -XFS_ERROR(EACCES); -+ } - return xfs_ioc_setxflags(ip, filp, arg); - - case XFS_IOC_FSSETDM: { -diff -NurpP --minimal linux-3.7/fs/xfs/xfs_ioctl.h linux-3.7-vs2.3.5.1/fs/xfs/xfs_ioctl.h ---- linux-3.7/fs/xfs/xfs_ioctl.h 2011-10-24 16:45:31.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/xfs/xfs_ioctl.h 2012-12-11 15:56:32.000000000 +0000 -@@ -70,6 +70,12 @@ xfs_handle_to_dentry( - void __user *uhandle, - u32 hlen); - -+extern int -+xfs_sync_flags( -+ struct inode *inode, -+ int flags, -+ int vflags); -+ - extern long - xfs_file_ioctl( - struct file *filp, -diff -NurpP --minimal linux-3.7/fs/xfs/xfs_iops.c linux-3.7-vs2.3.5.1/fs/xfs/xfs_iops.c ---- linux-3.7/fs/xfs/xfs_iops.c 2012-10-04 13:27:44.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/xfs/xfs_iops.c 2012-12-11 15:56:32.000000000 +0000 -@@ -28,6 +28,7 @@ - #include "xfs_bmap_btree.h" - #include "xfs_dinode.h" - #include "xfs_inode.h" -+#include "xfs_ioctl.h" - #include "xfs_bmap.h" - #include "xfs_rtalloc.h" - #include "xfs_error.h" -@@ -46,6 +47,7 @@ - #include - #include - #include -+#include - - static int - xfs_initxattrs( -@@ -421,6 +423,7 @@ xfs_vn_getattr( - stat->nlink = ip->i_d.di_nlink; - stat->uid = ip->i_d.di_uid; - stat->gid = ip->i_d.di_gid; -+ stat->tag = ip->i_d.di_tag; - stat->ino = ip->i_ino; - stat->atime = inode->i_atime; - stat->mtime = inode->i_mtime; -@@ -1033,6 +1036,7 @@ static const struct inode_operations xfs - .listxattr = xfs_vn_listxattr, - .fiemap = xfs_vn_fiemap, - .update_time = xfs_vn_update_time, -+ .sync_flags = xfs_sync_flags, - }; - - static const struct inode_operations xfs_dir_inode_operations = { -@@ -1059,6 +1063,7 @@ static const struct inode_operations xfs - .removexattr = generic_removexattr, - .listxattr = xfs_vn_listxattr, - .update_time = xfs_vn_update_time, -+ .sync_flags = xfs_sync_flags, - }; - - static const struct inode_operations xfs_dir_ci_inode_operations = { -@@ -1110,6 +1115,10 @@ xfs_diflags_to_iflags( - inode->i_flags |= S_IMMUTABLE; - else - inode->i_flags &= ~S_IMMUTABLE; -+ if (ip->i_d.di_flags & XFS_DIFLAG_IXUNLINK) -+ inode->i_flags |= S_IXUNLINK; -+ else -+ inode->i_flags &= ~S_IXUNLINK; - if (ip->i_d.di_flags & XFS_DIFLAG_APPEND) - inode->i_flags |= S_APPEND; - else -@@ -1122,6 +1131,15 @@ xfs_diflags_to_iflags( - inode->i_flags |= S_NOATIME; - else - inode->i_flags &= ~S_NOATIME; -+ -+ if (ip->i_d.di_vflags & XFS_DIVFLAG_BARRIER) -+ inode->i_vflags |= V_BARRIER; -+ else -+ inode->i_vflags &= ~V_BARRIER; -+ if (ip->i_d.di_vflags & XFS_DIVFLAG_COW) -+ inode->i_vflags |= V_COW; -+ else -+ inode->i_vflags &= ~V_COW; - } - - /* -@@ -1153,6 +1171,7 @@ xfs_setup_inode( - set_nlink(inode, ip->i_d.di_nlink); - inode->i_uid = ip->i_d.di_uid; - inode->i_gid = ip->i_d.di_gid; -+ inode->i_tag = ip->i_d.di_tag; - - switch (inode->i_mode & S_IFMT) { - case S_IFBLK: -diff -NurpP --minimal linux-3.7/fs/xfs/xfs_itable.c linux-3.7-vs2.3.5.1/fs/xfs/xfs_itable.c ---- linux-3.7/fs/xfs/xfs_itable.c 2012-10-04 13:27:44.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/xfs/xfs_itable.c 2012-12-11 15:56:32.000000000 +0000 -@@ -96,6 +96,7 @@ xfs_bulkstat_one_int( - buf->bs_mode = dic->di_mode; - buf->bs_uid = dic->di_uid; - buf->bs_gid = dic->di_gid; -+ buf->bs_tag = dic->di_tag; - buf->bs_size = dic->di_size; - buf->bs_atime.tv_sec = dic->di_atime.t_sec; - buf->bs_atime.tv_nsec = dic->di_atime.t_nsec; -diff -NurpP --minimal linux-3.7/fs/xfs/xfs_linux.h linux-3.7-vs2.3.5.1/fs/xfs/xfs_linux.h ---- linux-3.7/fs/xfs/xfs_linux.h 2011-10-24 16:45:31.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/xfs/xfs_linux.h 2012-12-11 15:56:32.000000000 +0000 -@@ -121,6 +121,7 @@ - - #define current_cpu() (raw_smp_processor_id()) - #define current_pid() (current->pid) -+#define current_fstag(vp) (dx_current_fstag((vp)->i_sb)) - #define current_test_flags(f) (current->flags & (f)) - #define current_set_flags_nested(sp, f) \ - (*(sp) = current->flags, current->flags |= (f)) -diff -NurpP --minimal linux-3.7/fs/xfs/xfs_log_recover.c linux-3.7-vs2.3.5.1/fs/xfs/xfs_log_recover.c ---- linux-3.7/fs/xfs/xfs_log_recover.c 2012-12-11 15:47:37.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/xfs/xfs_log_recover.c 2012-12-11 15:56:32.000000000 +0000 -@@ -2359,7 +2359,8 @@ xlog_recover_inode_pass2( - } - - /* The core is in in-core format */ -- xfs_dinode_to_disk(dip, item->ri_buf[1].i_addr); -+ xfs_dinode_to_disk(dip, item->ri_buf[1].i_addr, -+ mp->m_flags & XFS_MOUNT_TAGGED); - - /* the rest is in on-disk format */ - if (item->ri_buf[1].i_len > sizeof(struct xfs_icdinode)) { -diff -NurpP --minimal linux-3.7/fs/xfs/xfs_mount.h linux-3.7-vs2.3.5.1/fs/xfs/xfs_mount.h ---- linux-3.7/fs/xfs/xfs_mount.h 2012-12-11 15:47:37.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/xfs/xfs_mount.h 2012-12-11 15:56:32.000000000 +0000 -@@ -246,6 +246,7 @@ typedef struct xfs_mount { - allocator */ - #define XFS_MOUNT_NOATTR2 (1ULL << 25) /* disable use of attr2 format */ - -+#define XFS_MOUNT_TAGGED (1ULL << 31) /* context tagging */ - - /* - * Default minimum read and write sizes. -diff -NurpP --minimal linux-3.7/fs/xfs/xfs_super.c linux-3.7-vs2.3.5.1/fs/xfs/xfs_super.c ---- linux-3.7/fs/xfs/xfs_super.c 2012-12-11 15:47:37.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/xfs/xfs_super.c 2012-12-11 17:36:47.000000000 +0000 -@@ -114,6 +114,9 @@ mempool_t *xfs_ioend_pool; - #define MNTOPT_NODELAYLOG "nodelaylog" /* Delayed logging disabled */ - #define MNTOPT_DISCARD "discard" /* Discard unused blocks */ - #define MNTOPT_NODISCARD "nodiscard" /* Do not discard unused blocks */ -+#define MNTOPT_TAGXID "tagxid" /* context tagging for inodes */ -+#define MNTOPT_TAGGED "tag" /* context tagging for inodes */ -+#define MNTOPT_NOTAGTAG "notag" /* do not use context tagging */ - - /* - * Table driven mount option parser. -@@ -126,6 +129,8 @@ enum { - Opt_nobarrier, - Opt_inode64, - Opt_inode32, -+ Opt_tag, -+ Opt_notag, - Opt_err - }; - -@@ -134,6 +139,9 @@ static const match_table_t tokens = { - {Opt_nobarrier, "nobarrier"}, - {Opt_inode64, "inode64"}, - {Opt_inode32, "inode32"}, -+ {Opt_tag, "tagxid"}, -+ {Opt_tag, "tag"}, -+ {Opt_notag, "notag"}, - {Opt_err, NULL} - }; - -@@ -383,6 +391,19 @@ xfs_parseargs( - } else if (!strcmp(this_char, "irixsgid")) { - xfs_warn(mp, - "irixsgid is now a sysctl(2) variable, option is deprecated."); -+#ifndef CONFIG_TAGGING_NONE -+ } else if (!strcmp(this_char, MNTOPT_TAGGED)) { -+ mp->m_flags |= XFS_MOUNT_TAGGED; -+ } else if (!strcmp(this_char, MNTOPT_NOTAGTAG)) { -+ mp->m_flags &= ~XFS_MOUNT_TAGGED; -+ } else if (!strcmp(this_char, MNTOPT_TAGXID)) { -+ mp->m_flags |= XFS_MOUNT_TAGGED; -+#endif -+#ifdef CONFIG_PROPAGATE -+ } else if (!strcmp(this_char, MNTOPT_TAGGED)) { -+ /* use value */ -+ mp->m_flags |= XFS_MOUNT_TAGGED; -+#endif - } else { - xfs_warn(mp, "unknown mount option [%s].", this_char); - return EINVAL; -@@ -1149,6 +1170,16 @@ xfs_fs_remount( - case Opt_inode32: - mp->m_maxagi = xfs_set_inode32(mp); - break; -+ case Opt_tag: -+ if (!(sb->s_flags & MS_TAGGED)) { -+ printk(KERN_INFO -+ "XFS: %s: tagging not permitted on remount.\n", -+ sb->s_id); -+ return -EINVAL; -+ } -+ break; -+ case Opt_notag: -+ break; - default: - /* - * Logically we would return an error here to prevent -@@ -1368,6 +1399,9 @@ xfs_fs_fill_super( - if (error) - goto out_free_sb; - -+ if (mp->m_flags & XFS_MOUNT_TAGGED) -+ sb->s_flags |= MS_TAGGED; -+ - /* - * we must configure the block size in the superblock before we run the - * full mount process as the mount process can lookup and cache inodes. -diff -NurpP --minimal linux-3.7/fs/xfs/xfs_vnodeops.c linux-3.7-vs2.3.5.1/fs/xfs/xfs_vnodeops.c ---- linux-3.7/fs/xfs/xfs_vnodeops.c 2012-10-04 13:27:44.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/xfs/xfs_vnodeops.c 2012-12-11 15:56:32.000000000 +0000 -@@ -103,6 +103,77 @@ xfs_readlink_bmap( - return error; - } - -+ -+STATIC void -+xfs_get_inode_flags( -+ xfs_inode_t *ip) -+{ -+ struct inode *inode = VFS_I(ip); -+ unsigned int flags = inode->i_flags; -+ unsigned int vflags = inode->i_vflags; -+ -+ if (flags & S_IMMUTABLE) -+ ip->i_d.di_flags |= XFS_DIFLAG_IMMUTABLE; -+ else -+ ip->i_d.di_flags &= ~XFS_DIFLAG_IMMUTABLE; -+ if (flags & S_IXUNLINK) -+ ip->i_d.di_flags |= XFS_DIFLAG_IXUNLINK; -+ else -+ ip->i_d.di_flags &= ~XFS_DIFLAG_IXUNLINK; -+ -+ if (vflags & V_BARRIER) -+ ip->i_d.di_vflags |= XFS_DIVFLAG_BARRIER; -+ else -+ ip->i_d.di_vflags &= ~XFS_DIVFLAG_BARRIER; -+ if (vflags & V_COW) -+ ip->i_d.di_vflags |= XFS_DIVFLAG_COW; -+ else -+ ip->i_d.di_vflags &= ~XFS_DIVFLAG_COW; -+} -+ -+int -+xfs_sync_flags( -+ struct inode *inode, -+ int flags, -+ int vflags) -+{ -+ struct xfs_inode *ip = XFS_I(inode); -+ struct xfs_mount *mp = ip->i_mount; -+ struct xfs_trans *tp; -+ unsigned int lock_flags = 0; -+ int code; -+ -+ tp = xfs_trans_alloc(mp, XFS_TRANS_SETATTR_NOT_SIZE); -+ code = xfs_trans_reserve(tp, 0, XFS_ICHANGE_LOG_RES(mp), 0, 0, 0); -+ if (code) -+ goto error_out; -+ -+ xfs_ilock(ip, XFS_ILOCK_EXCL); -+ xfs_trans_ijoin(tp, ip, 0); -+ -+ inode->i_flags = flags; -+ inode->i_vflags = vflags; -+ xfs_get_inode_flags(ip); -+ -+ xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); -+ xfs_trans_ichgtime(tp, ip, XFS_ICHGTIME_CHG); -+ -+ XFS_STATS_INC(xs_ig_attrchg); -+ -+ if (mp->m_flags & XFS_MOUNT_WSYNC) -+ xfs_trans_set_sync(tp); -+ code = xfs_trans_commit(tp, 0); -+ xfs_iunlock(ip, XFS_ILOCK_EXCL); -+ return code; -+ -+error_out: -+ xfs_trans_cancel(tp, 0); -+ if (lock_flags) -+ xfs_iunlock(ip, XFS_ILOCK_EXCL); -+ return code; -+} -+ -+ - int - xfs_readlink( - xfs_inode_t *ip, -diff -NurpP --minimal linux-3.7/include/linux/Kbuild linux-3.7-vs2.3.5.1/include/linux/Kbuild ---- linux-3.7/include/linux/Kbuild 2012-12-11 15:47:38.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/Kbuild 2012-12-11 16:09:38.000000000 +0000 -@@ -3,3 +3,4 @@ header-y += hdlc/ - header-y += hsi/ - header-y += raid/ - header-y += usb/ -+header-y += vserver/ -diff -NurpP --minimal linux-3.7/include/linux/cred.h linux-3.7-vs2.3.5.1/include/linux/cred.h ---- linux-3.7/include/linux/cred.h 2012-07-22 21:39:43.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/cred.h 2012-12-11 15:56:32.000000000 +0000 -@@ -157,6 +157,7 @@ extern void exit_creds(struct task_struc +diff -NurpP --minimal linux-3.18.5/include/linux/capability.h linux-3.18.5-vs2.3.7.3/include/linux/capability.h +--- linux-3.18.5/include/linux/capability.h 2015-01-16 22:19:21.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/capability.h 2015-01-19 10:58:04.000000000 +0000 +@@ -79,7 +79,8 @@ extern const kernel_cap_t __cap_init_eff + #else /* HAND-CODED capability initializers */ + + #define CAP_LAST_U32 ((_KERNEL_CAPABILITY_U32S) - 1) +-#define CAP_LAST_U32_VALID_MASK (CAP_TO_MASK(CAP_LAST_CAP + 1) -1) ++#define CAP_LAST_U32_VALID_MASK ((CAP_TO_MASK(CAP_LAST_CAP + 1) -1) \ ++ | CAP_TO_MASK(CAP_CONTEXT)) + + # define CAP_EMPTY_SET ((kernel_cap_t){{ 0, 0 }}) + # define CAP_FULL_SET ((kernel_cap_t){{ ~0, CAP_LAST_U32_VALID_MASK }}) +diff -NurpP --minimal linux-3.18.5/include/linux/cred.h linux-3.18.5-vs2.3.7.3/include/linux/cred.h +--- linux-3.18.5/include/linux/cred.h 2015-02-05 18:02:45.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/cred.h 2015-01-19 10:58:04.000000000 +0000 +@@ -144,6 +144,7 @@ extern void exit_creds(struct task_struc extern int copy_creds(struct task_struct *, unsigned long); extern const struct cred *get_task_cred(struct task_struct *); extern struct cred *cred_alloc_blank(void); @@ -7698,7 +6924,7 @@ diff -NurpP --minimal linux-3.7/include/linux/cred.h linux-3.7-vs2.3.5.1/include extern struct cred *prepare_creds(void); extern struct cred *prepare_exec_creds(void); extern int commit_creds(struct cred *); -@@ -210,6 +211,31 @@ static inline void validate_process_cred +@@ -197,6 +198,31 @@ static inline void validate_process_cred } #endif @@ -7730,27 +6956,27 @@ diff -NurpP --minimal linux-3.7/include/linux/cred.h linux-3.7-vs2.3.5.1/include /** * get_new_cred - Get a reference on a new set of credentials * @cred: The new credentials to reference -diff -NurpP --minimal linux-3.7/include/linux/devpts_fs.h linux-3.7-vs2.3.5.1/include/linux/devpts_fs.h ---- linux-3.7/include/linux/devpts_fs.h 2008-12-24 23:26:37.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/devpts_fs.h 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/include/linux/devpts_fs.h linux-3.18.5-vs2.3.7.3/include/linux/devpts_fs.h +--- linux-3.18.5/include/linux/devpts_fs.h 2013-02-19 13:58:50.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/devpts_fs.h 2015-01-19 10:58:04.000000000 +0000 @@ -45,5 +45,4 @@ static inline void devpts_pty_kill(struc #endif - #endif /* _LINUX_DEVPTS_FS_H */ -diff -NurpP --minimal linux-3.7/include/linux/fs.h linux-3.7-vs2.3.5.1/include/linux/fs.h ---- linux-3.7/include/linux/fs.h 2012-12-11 15:47:41.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/fs.h 2012-12-11 21:23:03.000000000 +0000 -@@ -210,6 +210,7 @@ typedef void (dio_iodone_t)(struct kiocb +diff -NurpP --minimal linux-3.18.5/include/linux/fs.h linux-3.18.5-vs2.3.7.3/include/linux/fs.h +--- linux-3.18.5/include/linux/fs.h 2015-01-17 02:40:21.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/fs.h 2015-01-19 10:58:04.000000000 +0000 +@@ -221,6 +221,7 @@ typedef void (dio_iodone_t)(struct kiocb #define ATTR_KILL_PRIV (1 << 14) #define ATTR_OPEN (1 << 15) /* Truncating from open(O_TRUNC) */ #define ATTR_TIMES_SET (1 << 16) +#define ATTR_TAG (1 << 17) /* - * This is the Inode Attributes structure, used for notify_change(). It -@@ -225,6 +226,7 @@ struct iattr { + * Whiteout is represented by a char device. The following constants define the +@@ -243,6 +244,7 @@ struct iattr { umode_t ia_mode; kuid_t ia_uid; kgid_t ia_gid; @@ -7758,7 +6984,7 @@ diff -NurpP --minimal linux-3.7/include/linux/fs.h linux-3.7-vs2.3.5.1/include/l loff_t ia_size; struct timespec ia_atime; struct timespec ia_mtime; -@@ -522,7 +524,9 @@ struct inode { +@@ -540,7 +542,9 @@ struct inode { unsigned short i_opflags; kuid_t i_uid; kgid_t i_gid; @@ -7769,7 +6995,7 @@ diff -NurpP --minimal linux-3.7/include/linux/fs.h linux-3.7-vs2.3.5.1/include/l #ifdef CONFIG_FS_POSIX_ACL struct posix_acl *i_acl; -@@ -551,6 +555,7 @@ struct inode { +@@ -569,6 +573,7 @@ struct inode { unsigned int __i_nlink; }; dev_t i_rdev; @@ -7777,11 +7003,11 @@ diff -NurpP --minimal linux-3.7/include/linux/fs.h linux-3.7-vs2.3.5.1/include/l loff_t i_size; struct timespec i_atime; struct timespec i_mtime; -@@ -701,6 +706,11 @@ static inline gid_t i_gid_read(const str +@@ -730,6 +735,11 @@ static inline gid_t i_gid_read(const str return from_kgid(&init_user_ns, inode->i_gid); } -+static inline tag_t i_tag_read(const struct inode *inode) ++static inline vtag_t i_tag_read(const struct inode *inode) +{ + return from_ktag(&init_user_ns, inode->i_tag); +} @@ -7789,11 +7015,11 @@ diff -NurpP --minimal linux-3.7/include/linux/fs.h linux-3.7-vs2.3.5.1/include/l static inline void i_uid_write(struct inode *inode, uid_t uid) { inode->i_uid = make_kuid(&init_user_ns, uid); -@@ -711,14 +721,19 @@ static inline void i_gid_write(struct in +@@ -740,14 +750,19 @@ static inline void i_gid_write(struct in inode->i_gid = make_kgid(&init_user_ns, gid); } -+static inline void i_tag_write(struct inode *inode, tag_t tag) ++static inline void i_tag_write(struct inode *inode, vtag_t tag) +{ + inode->i_tag = make_ktag(&init_user_ns, tag); +} @@ -7811,23 +7037,23 @@ diff -NurpP --minimal linux-3.7/include/linux/fs.h linux-3.7-vs2.3.5.1/include/l } extern struct block_device *I_BDEV(struct inode *inode); -@@ -785,6 +800,7 @@ struct file { +@@ -805,6 +820,7 @@ struct file { loff_t f_pos; struct fown_struct f_owner; const struct cred *f_cred; -+ xid_t f_xid; ++ vxid_t f_xid; struct file_ra_state f_ra; u64 f_version; -@@ -936,6 +952,7 @@ struct file_lock { +@@ -929,6 +945,7 @@ struct file_lock { struct file *fl_file; loff_t fl_start; loff_t fl_end; -+ xid_t fl_xid; ++ vxid_t fl_xid; struct fasync_struct * fl_fasync; /* for lease break notifications */ /* for lease breaks: */ -@@ -1570,6 +1587,7 @@ struct inode_operations { +@@ -1542,6 +1559,7 @@ struct inode_operations { ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t); ssize_t (*listxattr) (struct dentry *, char *, size_t); int (*removexattr) (struct dentry *, const char *); @@ -7835,7 +7061,7 @@ diff -NurpP --minimal linux-3.7/include/linux/fs.h linux-3.7-vs2.3.5.1/include/l int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start, u64 len); int (*update_time)(struct inode *, struct timespec *, int); -@@ -1584,6 +1602,7 @@ ssize_t rw_copy_check_uvector(int type, +@@ -1559,6 +1577,7 @@ ssize_t rw_copy_check_uvector(int type, unsigned long nr_segs, unsigned long fast_segs, struct iovec *fast_pointer, struct iovec **ret_pointer); @@ -7843,7 +7069,7 @@ diff -NurpP --minimal linux-3.7/include/linux/fs.h linux-3.7-vs2.3.5.1/include/l extern ssize_t vfs_read(struct file *, char __user *, size_t, loff_t *); extern ssize_t vfs_write(struct file *, const char __user *, size_t, loff_t *); -@@ -1637,6 +1656,14 @@ struct super_operations { +@@ -1612,6 +1631,14 @@ struct super_operations { #define S_IMA 1024 /* Inode has an associated IMA struct */ #define S_AUTOMOUNT 2048 /* Automount/referral quasi-directory */ #define S_NOSEC 4096 /* no suid or xattr security attributes */ @@ -7858,7 +7084,7 @@ diff -NurpP --minimal linux-3.7/include/linux/fs.h linux-3.7-vs2.3.5.1/include/l /* * Note that nosuid etc flags are inode-specific: setting some file-system -@@ -1661,10 +1688,13 @@ struct super_operations { +@@ -1636,10 +1663,13 @@ struct super_operations { #define IS_MANDLOCK(inode) __IS_FLG(inode, MS_MANDLOCK) #define IS_NOATIME(inode) __IS_FLG(inode, MS_RDONLY|MS_NOATIME) #define IS_I_VERSION(inode) __IS_FLG(inode, MS_I_VERSION) @@ -7872,9 +7098,9 @@ diff -NurpP --minimal linux-3.7/include/linux/fs.h linux-3.7-vs2.3.5.1/include/l #define IS_POSIXACL(inode) __IS_FLG(inode, MS_POSIXACL) #define IS_DEADDIR(inode) ((inode)->i_flags & S_DEAD) -@@ -1675,6 +1705,16 @@ struct super_operations { - #define IS_AUTOMOUNT(inode) ((inode)->i_flags & S_AUTOMOUNT) - #define IS_NOSEC(inode) ((inode)->i_flags & S_NOSEC) +@@ -1653,6 +1683,16 @@ struct super_operations { + #define IS_WHITEOUT(inode) (S_ISCHR(inode->i_mode) && \ + (inode)->i_rdev == WHITEOUT_DEV) +#define IS_BARRIER(inode) (S_ISDIR((inode)->i_mode) && ((inode)->i_vflags & V_BARRIER)) + @@ -7889,8 +7115,8 @@ diff -NurpP --minimal linux-3.7/include/linux/fs.h linux-3.7-vs2.3.5.1/include/l /* * Inode state bits. Protected by inode->i_lock * -@@ -1900,6 +1940,9 @@ extern int rw_verify_area(int, struct fi - extern int locks_mandatory_locked(struct inode *); +@@ -1902,6 +1942,9 @@ extern struct kobject *fs_kobj; + extern int locks_mandatory_locked(struct file *); extern int locks_mandatory_area(int, struct inode *, struct file *, loff_t, size_t); +#define ATTR_FLAG_BARRIER 512 /* Barrier for chroot() */ @@ -7899,21 +7125,21 @@ diff -NurpP --minimal linux-3.7/include/linux/fs.h linux-3.7-vs2.3.5.1/include/l /* * Candidates for mandatory locking have the setgid bit set * but no group execute bit - an otherwise meaningless combination. -@@ -2504,6 +2547,7 @@ extern int dcache_dir_open(struct inode +@@ -2610,6 +2653,7 @@ extern int dcache_dir_open(struct inode extern int dcache_dir_close(struct inode *, struct file *); extern loff_t dcache_dir_lseek(struct file *, loff_t, int); - extern int dcache_readdir(struct file *, void *, filldir_t); -+extern int dcache_readdir_filter(struct file *, void *, filldir_t, int (*)(struct dentry *)); + extern int dcache_readdir(struct file *, struct dir_context *); ++extern int dcache_readdir_filter(struct file *, struct dir_context *, int (*)(struct dentry *)); extern int simple_setattr(struct dentry *, struct iattr *); extern int simple_getattr(struct vfsmount *, struct dentry *, struct kstat *); extern int simple_statfs(struct dentry *, struct kstatfs *); -diff -NurpP --minimal linux-3.7/include/linux/init_task.h linux-3.7-vs2.3.5.1/include/linux/init_task.h ---- linux-3.7/include/linux/init_task.h 2012-12-11 15:47:42.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/init_task.h 2012-12-11 15:56:32.000000000 +0000 -@@ -210,6 +210,10 @@ extern struct task_group root_task_group - INIT_TRACE_RECURSION \ - INIT_TASK_RCU_PREEMPT(tsk) \ - INIT_CPUSET_SEQ \ +diff -NurpP --minimal linux-3.18.5/include/linux/init_task.h linux-3.18.5-vs2.3.7.3/include/linux/init_task.h +--- linux-3.18.5/include/linux/init_task.h 2015-01-17 02:40:21.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/init_task.h 2015-01-19 10:58:04.000000000 +0000 +@@ -237,6 +237,10 @@ extern struct task_group root_task_group + INIT_CPUSET_SEQ(tsk) \ + INIT_RT_MUTEXES(tsk) \ + INIT_VTIME(tsk) \ + .xid = 0, \ + .vx_info = NULL, \ + .nid = 0, \ @@ -7921,63 +7147,23 @@ diff -NurpP --minimal linux-3.7/include/linux/init_task.h linux-3.7-vs2.3.5.1/in } -diff -NurpP --minimal linux-3.7/include/linux/ipc.h linux-3.7-vs2.3.5.1/include/linux/ipc.h ---- linux-3.7/include/linux/ipc.h 2012-12-11 15:47:42.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/ipc.h 2012-12-11 22:24:37.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/include/linux/ipc.h linux-3.18.5-vs2.3.7.3/include/linux/ipc.h +--- linux-3.18.5/include/linux/ipc.h 2014-06-12 11:35:01.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/ipc.h 2015-01-19 10:58:04.000000000 +0000 @@ -16,6 +16,7 @@ struct kern_ipc_perm key_t key; kuid_t uid; kgid_t gid; -+ xid_t xid; ++ vxid_t xid; kuid_t cuid; kgid_t cgid; umode_t mode; -diff -NurpP --minimal linux-3.7/include/linux/ipc_namespace.h linux-3.7-vs2.3.5.1/include/linux/ipc_namespace.h ---- linux-3.7/include/linux/ipc_namespace.h 2012-07-22 21:39:43.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/ipc_namespace.h 2012-12-11 15:56:32.000000000 +0000 -@@ -133,7 +133,8 @@ static inline int mq_init_ns(struct ipc_ - - #if defined(CONFIG_IPC_NS) - extern struct ipc_namespace *copy_ipcs(unsigned long flags, -- struct task_struct *tsk); -+ struct ipc_namespace *old_ns, -+ struct user_namespace *user_ns); - static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns) - { - if (ns) -@@ -144,12 +145,13 @@ static inline struct ipc_namespace *get_ - extern void put_ipc_ns(struct ipc_namespace *ns); - #else - static inline struct ipc_namespace *copy_ipcs(unsigned long flags, -- struct task_struct *tsk) -+ struct ipc_namespace *old_ns, -+ struct user_namespace *user_ns) - { - if (flags & CLONE_NEWIPC) - return ERR_PTR(-EINVAL); - -- return tsk->nsproxy->ipc_ns; -+ return old_ns; - } - - static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns) -diff -NurpP --minimal linux-3.7/include/linux/loop.h linux-3.7-vs2.3.5.1/include/linux/loop.h ---- linux-3.7/include/linux/loop.h 2012-12-11 15:47:42.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/loop.h 2012-12-11 22:34:03.000000000 +0000 -@@ -41,6 +41,7 @@ struct loop_device { - struct loop_func_table *lo_encryption; - __u32 lo_init[2]; - kuid_t lo_key_owner; /* Who set the key */ -+ xid_t lo_xid; - int (*ioctl)(struct loop_device *, int cmd, - unsigned long arg); - -diff -NurpP --minimal linux-3.7/include/linux/memcontrol.h linux-3.7-vs2.3.5.1/include/linux/memcontrol.h ---- linux-3.7/include/linux/memcontrol.h 2012-12-11 15:47:42.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/memcontrol.h 2012-12-11 15:56:32.000000000 +0000 -@@ -83,6 +83,13 @@ extern struct mem_cgroup *try_get_mem_cg +diff -NurpP --minimal linux-3.18.5/include/linux/memcontrol.h linux-3.18.5-vs2.3.7.3/include/linux/memcontrol.h +--- linux-3.18.5/include/linux/memcontrol.h 2015-01-17 02:40:21.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/memcontrol.h 2015-01-19 10:58:04.000000000 +0000 +@@ -79,6 +79,13 @@ extern struct mem_cgroup *mem_cgroup_fro extern struct mem_cgroup *parent_mem_cgroup(struct mem_cgroup *memcg); - extern struct mem_cgroup *mem_cgroup_from_cont(struct cgroup *cont); + extern struct mem_cgroup *mem_cgroup_from_css(struct cgroup_subsys_state *css); +extern u64 mem_cgroup_res_read_u64(struct mem_cgroup *mem, int member); +extern u64 mem_cgroup_memsw_read_u64(struct mem_cgroup *mem, int member); @@ -7989,40 +7175,12 @@ diff -NurpP --minimal linux-3.7/include/linux/memcontrol.h linux-3.7-vs2.3.5.1/i static inline bool mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *memcg) { -diff -NurpP --minimal linux-3.7/include/linux/mm_types.h linux-3.7-vs2.3.5.1/include/linux/mm_types.h ---- linux-3.7/include/linux/mm_types.h 2012-12-11 15:47:43.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/mm_types.h 2012-12-11 15:56:32.000000000 +0000 -@@ -365,6 +365,7 @@ struct mm_struct { - - /* Architecture-specific MM context */ - mm_context_t context; -+ struct vx_info *mm_vx_info; - - unsigned long flags; /* Must use atomic bitops to access the bits */ - -diff -NurpP --minimal linux-3.7/include/linux/mmzone.h linux-3.7-vs2.3.5.1/include/linux/mmzone.h ---- linux-3.7/include/linux/mmzone.h 2012-12-11 15:47:43.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/mmzone.h 2012-12-11 15:56:32.000000000 +0000 -@@ -735,6 +735,13 @@ typedef struct pglist_data { - __pgdat->node_start_pfn + __pgdat->node_spanned_pages;\ - }) - -+#define node_start_pfn(nid) (NODE_DATA(nid)->node_start_pfn) -+ -+#define node_end_pfn(nid) ({\ -+ pg_data_t *__pgdat = NODE_DATA(nid);\ -+ __pgdat->node_start_pfn + __pgdat->node_spanned_pages;\ -+}) -+ - #include - - extern struct mutex zonelists_mutex; -diff -NurpP --minimal linux-3.7/include/linux/mount.h linux-3.7-vs2.3.5.1/include/linux/mount.h ---- linux-3.7/include/linux/mount.h 2012-03-19 18:47:28.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/mount.h 2012-12-11 15:56:32.000000000 +0000 -@@ -47,6 +47,9 @@ struct mnt_namespace; - - #define MNT_INTERNAL 0x4000 +diff -NurpP --minimal linux-3.18.5/include/linux/mount.h linux-3.18.5-vs2.3.7.3/include/linux/mount.h +--- linux-3.18.5/include/linux/mount.h 2015-01-17 02:40:21.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/mount.h 2015-01-19 10:58:04.000000000 +0000 +@@ -62,6 +62,9 @@ struct mnt_namespace; + #define MNT_SYNC_UMOUNT 0x2000000 + #define MNT_MARKED 0x4000000 +#define MNT_TAGID 0x10000 +#define MNT_NOTAG 0x20000 @@ -8030,10 +7188,10 @@ diff -NurpP --minimal linux-3.7/include/linux/mount.h linux-3.7-vs2.3.5.1/includ struct vfsmount { struct dentry *mnt_root; /* root of the mounted tree */ struct super_block *mnt_sb; /* pointer to superblock */ -diff -NurpP --minimal linux-3.7/include/linux/net.h linux-3.7-vs2.3.5.1/include/linux/net.h ---- linux-3.7/include/linux/net.h 2012-12-11 15:47:43.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/net.h 2012-12-11 15:56:32.000000000 +0000 -@@ -38,6 +38,7 @@ struct net; +diff -NurpP --minimal linux-3.18.5/include/linux/net.h linux-3.18.5-vs2.3.7.3/include/linux/net.h +--- linux-3.18.5/include/linux/net.h 2014-06-12 13:02:49.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/net.h 2015-01-19 10:58:04.000000000 +0000 +@@ -39,6 +39,7 @@ struct net; #define SOCK_PASSCRED 3 #define SOCK_PASSSEC 4 #define SOCK_EXTERNALLY_ALLOCATED 5 @@ -8041,20 +7199,20 @@ diff -NurpP --minimal linux-3.7/include/linux/net.h linux-3.7-vs2.3.5.1/include/ #ifndef ARCH_HAS_SOCKET_TYPES /** -diff -NurpP --minimal linux-3.7/include/linux/netdevice.h linux-3.7-vs2.3.5.1/include/linux/netdevice.h ---- linux-3.7/include/linux/netdevice.h 2012-12-11 15:47:43.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/netdevice.h 2012-12-11 15:56:32.000000000 +0000 -@@ -1637,6 +1637,7 @@ extern void netdev_resync_ops(struct ne - - extern struct net_device *dev_get_by_index(struct net *net, int ifindex); - extern struct net_device *__dev_get_by_index(struct net *net, int ifindex); -+extern struct net_device *dev_get_by_index_real_rcu(struct net *net, int ifindex); - extern struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex); - extern int dev_restart(struct net_device *dev); - #ifdef CONFIG_NETPOLL_TRAP -diff -NurpP --minimal linux-3.7/include/linux/nsproxy.h linux-3.7-vs2.3.5.1/include/linux/nsproxy.h ---- linux-3.7/include/linux/nsproxy.h 2011-10-24 16:45:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/nsproxy.h 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/include/linux/netdevice.h linux-3.18.5-vs2.3.7.3/include/linux/netdevice.h +--- linux-3.18.5/include/linux/netdevice.h 2015-02-05 18:02:45.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/netdevice.h 2015-01-28 11:48:02.000000000 +0000 +@@ -2124,6 +2124,7 @@ int init_dummy_netdev(struct net_device + + struct net_device *dev_get_by_index(struct net *net, int ifindex); + struct net_device *__dev_get_by_index(struct net *net, int ifindex); ++struct net_device *dev_get_by_index_real_rcu(struct net *net, int ifindex); + struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex); + int netdev_get_name(struct net *net, char *name, int ifindex); + int dev_restart(struct net_device *dev); +diff -NurpP --minimal linux-3.18.5/include/linux/nsproxy.h linux-3.18.5-vs2.3.7.3/include/linux/nsproxy.h +--- linux-3.18.5/include/linux/nsproxy.h 2015-01-16 22:19:23.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/nsproxy.h 2015-01-19 10:58:04.000000000 +0000 @@ -3,6 +3,7 @@ #include @@ -8063,8 +7221,8 @@ diff -NurpP --minimal linux-3.7/include/linux/nsproxy.h linux-3.7-vs2.3.5.1/incl struct mnt_namespace; struct uts_namespace; -@@ -63,6 +64,7 @@ static inline struct nsproxy *task_nspro - } +@@ -63,6 +64,7 @@ extern struct nsproxy init_nsproxy; + */ int copy_namespaces(unsigned long flags, struct task_struct *tsk); +struct nsproxy *copy_nsproxy(struct nsproxy *orig); @@ -8072,7 +7230,7 @@ diff -NurpP --minimal linux-3.7/include/linux/nsproxy.h linux-3.7-vs2.3.5.1/incl void switch_task_namespaces(struct task_struct *tsk, struct nsproxy *new); void free_nsproxy(struct nsproxy *ns); @@ -70,16 +72,26 @@ int unshare_nsproxy_namespaces(unsigned - struct fs_struct *); + struct cred *, struct fs_struct *); int __init nsproxy_cache_init(void); -static inline void put_nsproxy(struct nsproxy *ns) @@ -8104,9 +7262,9 @@ diff -NurpP --minimal linux-3.7/include/linux/nsproxy.h linux-3.7-vs2.3.5.1/incl } #endif -diff -NurpP --minimal linux-3.7/include/linux/pid.h linux-3.7-vs2.3.5.1/include/linux/pid.h ---- linux-3.7/include/linux/pid.h 2011-07-22 09:18:11.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/pid.h 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/include/linux/pid.h linux-3.18.5-vs2.3.7.3/include/linux/pid.h +--- linux-3.18.5/include/linux/pid.h 2013-11-25 15:45:06.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/pid.h 2015-01-19 10:58:04.000000000 +0000 @@ -8,7 +8,8 @@ enum pid_type PIDTYPE_PID, PIDTYPE_PGID, @@ -8117,7 +7275,7 @@ diff -NurpP --minimal linux-3.7/include/linux/pid.h linux-3.7-vs2.3.5.1/include/ }; /* -@@ -171,6 +172,7 @@ static inline pid_t pid_nr(struct pid *p +@@ -170,6 +171,7 @@ static inline pid_t pid_nr(struct pid *p } pid_t pid_nr_ns(struct pid *pid, struct pid_namespace *ns); @@ -8125,47 +7283,9 @@ diff -NurpP --minimal linux-3.7/include/linux/pid.h linux-3.7-vs2.3.5.1/include/ pid_t pid_vnr(struct pid *pid); #define do_each_pid_task(pid, type, task) \ -diff -NurpP --minimal linux-3.7/include/linux/proc_fs.h linux-3.7-vs2.3.5.1/include/linux/proc_fs.h ---- linux-3.7/include/linux/proc_fs.h 2012-07-22 21:39:44.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/proc_fs.h 2012-12-11 15:56:32.000000000 +0000 -@@ -54,6 +54,7 @@ struct proc_dir_entry { - nlink_t nlink; - kuid_t uid; - kgid_t gid; -+ int vx_flags; - loff_t size; - const struct inode_operations *proc_iops; - /* -@@ -252,12 +253,18 @@ extern const struct proc_ns_operations n - extern const struct proc_ns_operations utsns_operations; - extern const struct proc_ns_operations ipcns_operations; - -+struct vx_info; -+struct nx_info; -+ - union proc_op { - int (*proc_get_link)(struct dentry *, struct path *); - int (*proc_read)(struct task_struct *task, char *page); - int (*proc_show)(struct seq_file *m, - struct pid_namespace *ns, struct pid *pid, - struct task_struct *task); -+ int (*proc_vs_read)(char *page); -+ int (*proc_vxi_read)(struct vx_info *vxi, char *page); -+ int (*proc_nxi_read)(struct nx_info *nxi, char *page); - }; - - struct ctl_table_header; -@@ -265,6 +272,7 @@ struct ctl_table; - - struct proc_inode { - struct pid *pid; -+ int vx_flags; - int fd; - union proc_op op; - struct proc_dir_entry *pde; -diff -NurpP --minimal linux-3.7/include/linux/quotaops.h linux-3.7-vs2.3.5.1/include/linux/quotaops.h ---- linux-3.7/include/linux/quotaops.h 2012-12-11 15:47:44.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/quotaops.h 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/include/linux/quotaops.h linux-3.18.5-vs2.3.7.3/include/linux/quotaops.h +--- linux-3.18.5/include/linux/quotaops.h 2014-06-12 13:02:49.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/quotaops.h 2015-01-19 10:58:04.000000000 +0000 @@ -8,6 +8,7 @@ #define _LINUX_QUOTAOPS_ @@ -8174,7 +7294,7 @@ diff -NurpP --minimal linux-3.7/include/linux/quotaops.h linux-3.7-vs2.3.5.1/inc #define DQUOT_SPACE_WARN 0x1 #define DQUOT_SPACE_RESERVE 0x2 -@@ -205,11 +206,12 @@ static inline void dquot_drop(struct ino +@@ -215,11 +216,12 @@ static inline void dquot_drop(struct ino static inline int dquot_alloc_inode(const struct inode *inode) { @@ -8188,7 +7308,7 @@ diff -NurpP --minimal linux-3.7/include/linux/quotaops.h linux-3.7-vs2.3.5.1/inc } static inline int dquot_transfer(struct inode *inode, struct iattr *iattr) -@@ -220,6 +222,10 @@ static inline int dquot_transfer(struct +@@ -230,6 +232,10 @@ static inline int dquot_transfer(struct static inline int __dquot_alloc_space(struct inode *inode, qsize_t number, int flags) { @@ -8199,7 +7319,7 @@ diff -NurpP --minimal linux-3.7/include/linux/quotaops.h linux-3.7-vs2.3.5.1/inc if (!(flags & DQUOT_SPACE_RESERVE)) inode_add_bytes(inode, number); return 0; -@@ -230,6 +236,7 @@ static inline void __dquot_free_space(st +@@ -240,6 +246,7 @@ static inline void __dquot_free_space(st { if (!(flags & DQUOT_SPACE_RESERVE)) inode_sub_bytes(inode, number); @@ -8207,10 +7327,10 @@ diff -NurpP --minimal linux-3.7/include/linux/quotaops.h linux-3.7-vs2.3.5.1/inc } static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number) -diff -NurpP --minimal linux-3.7/include/linux/sched.h linux-3.7-vs2.3.5.1/include/linux/sched.h ---- linux-3.7/include/linux/sched.h 2012-12-11 15:47:44.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/sched.h 2012-12-11 15:56:32.000000000 +0000 -@@ -1378,6 +1378,14 @@ struct task_struct { +diff -NurpP --minimal linux-3.18.5/include/linux/sched.h linux-3.18.5-vs2.3.7.3/include/linux/sched.h +--- linux-3.18.5/include/linux/sched.h 2015-01-17 02:40:22.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/sched.h 2015-01-19 10:58:04.000000000 +0000 +@@ -1438,6 +1438,14 @@ struct task_struct { #endif struct seccomp seccomp; @@ -8218,14 +7338,14 @@ diff -NurpP --minimal linux-3.7/include/linux/sched.h linux-3.7-vs2.3.5.1/includ + struct vx_info *vx_info; + struct nx_info *nx_info; + -+ xid_t xid; -+ nid_t nid; -+ tag_t tag; ++ vxid_t xid; ++ vnid_t nid; ++ vtag_t tag; + /* Thread group tracking */ u32 parent_exec_id; u32 self_exec_id; -@@ -1627,6 +1635,11 @@ struct pid_namespace; +@@ -1743,6 +1751,11 @@ struct pid_namespace; pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type, struct pid_namespace *ns); @@ -8237,7 +7357,7 @@ diff -NurpP --minimal linux-3.7/include/linux/sched.h linux-3.7-vs2.3.5.1/includ static inline pid_t task_pid_nr(struct task_struct *tsk) { return tsk->pid; -@@ -1640,7 +1653,8 @@ static inline pid_t task_pid_nr_ns(struc +@@ -1756,7 +1769,8 @@ static inline pid_t task_pid_nr_ns(struc static inline pid_t task_pid_vnr(struct task_struct *tsk) { @@ -8247,7 +7367,7 @@ diff -NurpP --minimal linux-3.7/include/linux/sched.h linux-3.7-vs2.3.5.1/includ } -@@ -1653,7 +1667,7 @@ pid_t task_tgid_nr_ns(struct task_struct +@@ -1769,7 +1783,7 @@ pid_t task_tgid_nr_ns(struct task_struct static inline pid_t task_tgid_vnr(struct task_struct *tsk) { @@ -8256,10 +7376,10 @@ diff -NurpP --minimal linux-3.7/include/linux/sched.h linux-3.7-vs2.3.5.1/includ } -diff -NurpP --minimal linux-3.7/include/linux/shmem_fs.h linux-3.7-vs2.3.5.1/include/linux/shmem_fs.h ---- linux-3.7/include/linux/shmem_fs.h 2012-12-11 15:47:44.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/shmem_fs.h 2012-12-11 15:56:32.000000000 +0000 -@@ -9,6 +9,9 @@ +diff -NurpP --minimal linux-3.18.5/include/linux/shmem_fs.h linux-3.18.5-vs2.3.7.3/include/linux/shmem_fs.h +--- linux-3.18.5/include/linux/shmem_fs.h 2015-01-16 22:19:23.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/shmem_fs.h 2015-01-19 10:58:04.000000000 +0000 +@@ -10,6 +10,9 @@ /* inode in-kernel data */ @@ -8268,35 +7388,35 @@ diff -NurpP --minimal linux-3.7/include/linux/shmem_fs.h linux-3.7-vs2.3.5.1/inc + struct shmem_inode_info { spinlock_t lock; - unsigned long flags; -diff -NurpP --minimal linux-3.7/include/linux/stat.h linux-3.7-vs2.3.5.1/include/linux/stat.h ---- linux-3.7/include/linux/stat.h 2012-12-11 15:47:45.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/stat.h 2012-12-11 15:56:32.000000000 +0000 + unsigned int seals; /* shmem seals */ +diff -NurpP --minimal linux-3.18.5/include/linux/stat.h linux-3.18.5-vs2.3.7.3/include/linux/stat.h +--- linux-3.18.5/include/linux/stat.h 2012-12-11 03:30:57.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/stat.h 2015-01-19 10:58:04.000000000 +0000 @@ -25,6 +25,7 @@ struct kstat { unsigned int nlink; kuid_t uid; kgid_t gid; -+ tag_t tag; ++ ktag_t tag; dev_t rdev; loff_t size; struct timespec atime; -diff -NurpP --minimal linux-3.7/include/linux/sunrpc/auth.h linux-3.7-vs2.3.5.1/include/linux/sunrpc/auth.h ---- linux-3.7/include/linux/sunrpc/auth.h 2012-10-04 13:27:46.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/sunrpc/auth.h 2012-12-11 15:56:32.000000000 +0000 -@@ -25,6 +25,7 @@ +diff -NurpP --minimal linux-3.18.5/include/linux/sunrpc/auth.h linux-3.18.5-vs2.3.7.3/include/linux/sunrpc/auth.h +--- linux-3.18.5/include/linux/sunrpc/auth.h 2015-01-16 22:19:23.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/sunrpc/auth.h 2015-01-19 10:58:04.000000000 +0000 +@@ -36,6 +36,7 @@ enum { struct auth_cred { - uid_t uid; - gid_t gid; -+ tag_t tag; + kuid_t uid; + kgid_t gid; ++ ktag_t tag; struct group_info *group_info; const char *principal; - unsigned char machine_cred : 1; -diff -NurpP --minimal linux-3.7/include/linux/sunrpc/clnt.h linux-3.7-vs2.3.5.1/include/linux/sunrpc/clnt.h ---- linux-3.7/include/linux/sunrpc/clnt.h 2012-12-11 15:47:45.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/sunrpc/clnt.h 2012-12-11 15:56:32.000000000 +0000 -@@ -49,7 +49,8 @@ struct rpc_clnt { - unsigned int cl_softrtry : 1,/* soft timeouts */ + unsigned long ac_flags; +diff -NurpP --minimal linux-3.18.5/include/linux/sunrpc/clnt.h linux-3.18.5-vs2.3.7.3/include/linux/sunrpc/clnt.h +--- linux-3.18.5/include/linux/sunrpc/clnt.h 2014-06-12 13:02:50.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/sunrpc/clnt.h 2015-01-19 10:58:04.000000000 +0000 +@@ -51,7 +51,8 @@ struct rpc_clnt { cl_discrtry : 1,/* disconnect before retry */ + cl_noretranstimeo: 1,/* No retransmit timeouts */ cl_autobind : 1,/* use getport() */ - cl_chatty : 1;/* be verbose */ + cl_chatty : 1,/* be verbose */ @@ -8304,35 +7424,23 @@ diff -NurpP --minimal linux-3.7/include/linux/sunrpc/clnt.h linux-3.7-vs2.3.5.1/ struct rpc_rtt * cl_rtt; /* RTO estimator data */ const struct rpc_timeout *cl_timeout; /* Timeout strategy */ -diff -NurpP --minimal linux-3.7/include/linux/sysfs.h linux-3.7-vs2.3.5.1/include/linux/sysfs.h ---- linux-3.7/include/linux/sysfs.h 2012-07-22 21:39:44.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/sysfs.h 2012-12-11 15:56:32.000000000 +0000 -@@ -19,6 +19,8 @@ - #include - #include - -+#define SYSFS_SUPER_MAGIC 0x62656572 -+ - struct kobject; - struct module; - enum kobj_ns_type; -diff -NurpP --minimal linux-3.7/include/linux/types.h linux-3.7-vs2.3.5.1/include/linux/types.h ---- linux-3.7/include/linux/types.h 2012-12-11 15:47:45.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/types.h 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/include/linux/types.h linux-3.18.5-vs2.3.7.3/include/linux/types.h +--- linux-3.18.5/include/linux/types.h 2014-09-03 13:19:43.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/types.h 2015-01-19 10:58:04.000000000 +0000 @@ -32,6 +32,9 @@ typedef __kernel_uid32_t uid_t; typedef __kernel_gid32_t gid_t; typedef __kernel_uid16_t uid16_t; typedef __kernel_gid16_t gid16_t; -+typedef unsigned int xid_t; -+typedef unsigned int nid_t; -+typedef unsigned int tag_t; ++typedef unsigned int vxid_t; ++typedef unsigned int vnid_t; ++typedef unsigned int vtag_t; typedef unsigned long uintptr_t; -diff -NurpP --minimal linux-3.7/include/linux/uidgid.h linux-3.7-vs2.3.5.1/include/linux/uidgid.h ---- linux-3.7/include/linux/uidgid.h 2012-07-22 21:39:45.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/uidgid.h 2012-12-11 19:45:37.000000000 +0000 -@@ -23,13 +23,17 @@ typedef struct { +diff -NurpP --minimal linux-3.18.5/include/linux/uidgid.h linux-3.18.5-vs2.3.7.3/include/linux/uidgid.h +--- linux-3.18.5/include/linux/uidgid.h 2014-06-12 11:35:03.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/uidgid.h 2015-01-25 18:11:57.000000000 +0000 +@@ -21,13 +21,17 @@ typedef struct { uid_t val; } kuid_t; @@ -8342,7 +7450,7 @@ diff -NurpP --minimal linux-3.7/include/linux/uidgid.h linux-3.7-vs2.3.5.1/inclu } kgid_t; +typedef struct { -+ tag_t val; ++ vtag_t val; +} ktag_t; + #define KUIDT_INIT(value) (kuid_t){ value } @@ -8351,38 +7459,15 @@ diff -NurpP --minimal linux-3.7/include/linux/uidgid.h linux-3.7-vs2.3.5.1/inclu static inline uid_t __kuid_val(kuid_t uid) { -@@ -41,10 +45,16 @@ static inline gid_t __kgid_val(kgid_t gi +@@ -39,11 +43,18 @@ static inline gid_t __kgid_val(kgid_t gi return gid.val; } -+static inline tag_t __ktag_val(ktag_t tag) ++static inline vtag_t __ktag_val(ktag_t tag) +{ + return tag.val; +} + - #else - - typedef uid_t kuid_t; - typedef gid_t kgid_t; -+typedef tag_t ktag_t; - - static inline uid_t __kuid_val(kuid_t uid) - { -@@ -56,16 +66,24 @@ static inline gid_t __kgid_val(kgid_t gi - return gid; - } - -+static inline tag_t __ktag_val(ktag_t tag) -+{ -+ return tag; -+} -+ - #define KUIDT_INIT(value) ((kuid_t) value ) - #define KGIDT_INIT(value) ((kgid_t) value ) -+#define KTAGT_INIT(value) ((ktag_t) value ) - - #endif - #define GLOBAL_ROOT_UID KUIDT_INIT(0) #define GLOBAL_ROOT_GID KGIDT_INIT(0) +#define GLOBAL_ROOT_TAG KTAGT_INIT(0) @@ -8393,7 +7478,7 @@ diff -NurpP --minimal linux-3.7/include/linux/uidgid.h linux-3.7-vs2.3.5.1/inclu static inline bool uid_eq(kuid_t left, kuid_t right) { -@@ -77,6 +95,11 @@ static inline bool gid_eq(kgid_t left, k +@@ -55,6 +66,11 @@ static inline bool gid_eq(kgid_t left, k return __kgid_val(left) == __kgid_val(right); } @@ -8405,7 +7490,7 @@ diff -NurpP --minimal linux-3.7/include/linux/uidgid.h linux-3.7-vs2.3.5.1/inclu static inline bool uid_gt(kuid_t left, kuid_t right) { return __kuid_val(left) > __kuid_val(right); -@@ -127,13 +150,21 @@ static inline bool gid_valid(kgid_t gid) +@@ -105,13 +121,21 @@ static inline bool gid_valid(kgid_t gid) return !gid_eq(gid, INVALID_GID); } @@ -8418,20 +7503,20 @@ diff -NurpP --minimal linux-3.7/include/linux/uidgid.h linux-3.7-vs2.3.5.1/inclu extern kuid_t make_kuid(struct user_namespace *from, uid_t uid); extern kgid_t make_kgid(struct user_namespace *from, gid_t gid); -+extern krag_t make_ktag(struct user_namespace *from, gid_t gid); ++extern ktag_t make_ktag(struct user_namespace *from, gid_t gid); extern uid_t from_kuid(struct user_namespace *to, kuid_t uid); extern gid_t from_kgid(struct user_namespace *to, kgid_t gid); -+extern tag_t from_ktag(struct user_namespace *to, ktag_t tag); ++extern vtag_t from_ktag(struct user_namespace *to, ktag_t tag); + extern uid_t from_kuid_munged(struct user_namespace *to, kuid_t uid); extern gid_t from_kgid_munged(struct user_namespace *to, kgid_t gid); -@@ -159,6 +190,11 @@ static inline kgid_t make_kgid(struct us +@@ -137,6 +161,11 @@ static inline kgid_t make_kgid(struct us return KGIDT_INIT(gid); } -+static inline ktag_t make_ktag(struct user_namespace *from, tag_t tag) ++static inline ktag_t make_ktag(struct user_namespace *from, vtag_t tag) +{ + return KTAGT_INIT(tag); +} @@ -8439,11 +7524,11 @@ diff -NurpP --minimal linux-3.7/include/linux/uidgid.h linux-3.7-vs2.3.5.1/inclu static inline uid_t from_kuid(struct user_namespace *to, kuid_t kuid) { return __kuid_val(kuid); -@@ -169,6 +205,11 @@ static inline gid_t from_kgid(struct use +@@ -147,6 +176,11 @@ static inline gid_t from_kgid(struct use return __kgid_val(kgid); } -+static inline tag_t from_ktag(struct user_namespace *to, ktag_t ktag) ++static inline vtag_t from_ktag(struct user_namespace *to, ktag_t ktag) +{ + return __ktag_val(ktag); +} @@ -8451,38 +7536,9 @@ diff -NurpP --minimal linux-3.7/include/linux/uidgid.h linux-3.7-vs2.3.5.1/inclu static inline uid_t from_kuid_munged(struct user_namespace *to, kuid_t kuid) { uid_t uid = from_kuid(to, kuid); -diff -NurpP --minimal linux-3.7/include/linux/utsname.h linux-3.7-vs2.3.5.1/include/linux/utsname.h ---- linux-3.7/include/linux/utsname.h 2012-12-11 15:47:45.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/utsname.h 2012-12-11 15:56:32.000000000 +0000 -@@ -33,7 +33,8 @@ static inline void get_uts_ns(struct uts - } - - extern struct uts_namespace *copy_utsname(unsigned long flags, -- struct task_struct *tsk); -+ struct uts_namespace *old_ns, -+ struct user_namespace *user_ns); - extern void free_uts_ns(struct kref *kref); - - static inline void put_uts_ns(struct uts_namespace *ns) -@@ -50,12 +51,13 @@ static inline void put_uts_ns(struct uts - } - - static inline struct uts_namespace *copy_utsname(unsigned long flags, -- struct task_struct *tsk) -+ struct uts_namespace *old_ns, -+ struct user_namespace *user_ns) - { - if (flags & CLONE_NEWUTS) - return ERR_PTR(-EINVAL); - -- return tsk->nsproxy->uts_ns; -+ return old_ns; - } - #endif - -diff -NurpP --minimal linux-3.7/include/linux/vroot.h linux-3.7-vs2.3.5.1/include/linux/vroot.h ---- linux-3.7/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vroot.h 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/include/linux/vroot.h linux-3.18.5-vs2.3.7.3/include/linux/vroot.h +--- linux-3.18.5/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vroot.h 2015-01-19 10:58:04.000000000 +0000 @@ -0,0 +1,51 @@ + +/* @@ -8535,9 +7591,9 @@ diff -NurpP --minimal linux-3.7/include/linux/vroot.h linux-3.7-vs2.3.5.1/includ +#define VROOT_CLR_DEV 0x5601 + +#endif /* _LINUX_VROOT_H */ -diff -NurpP --minimal linux-3.7/include/linux/vs_base.h linux-3.7-vs2.3.5.1/include/linux/vs_base.h ---- linux-3.7/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vs_base.h 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/include/linux/vs_base.h linux-3.18.5-vs2.3.7.3/include/linux/vs_base.h +--- linux-3.18.5/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vs_base.h 2015-01-19 10:58:04.000000000 +0000 @@ -0,0 +1,10 @@ +#ifndef _VS_BASE_H +#define _VS_BASE_H @@ -8549,9 +7605,9 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_base.h linux-3.7-vs2.3.5.1/incl +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7/include/linux/vs_context.h linux-3.7-vs2.3.5.1/include/linux/vs_context.h ---- linux-3.7/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vs_context.h 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/include/linux/vs_context.h linux-3.18.5-vs2.3.7.3/include/linux/vs_context.h +--- linux-3.18.5/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vs_context.h 2015-01-19 10:58:04.000000000 +0000 @@ -0,0 +1,242 @@ +#ifndef _VS_CONTEXT_H +#define _VS_CONTEXT_H @@ -8764,7 +7820,7 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_context.h linux-3.7-vs2.3.5.1/i +static inline void __enter_vx_admin(struct vx_info_save *vxis) +{ + vxis->vxi = xchg(¤t->vx_info, NULL); -+ vxis->xid = xchg(¤t->xid, (xid_t)0); ++ vxis->xid = xchg(¤t->xid, (vxid_t)0); +} + +static inline void __leave_vx_admin(struct vx_info_save *vxis) @@ -8795,9 +7851,9 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_context.h linux-3.7-vs2.3.5.1/i +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7/include/linux/vs_cowbl.h linux-3.7-vs2.3.5.1/include/linux/vs_cowbl.h ---- linux-3.7/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vs_cowbl.h 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/include/linux/vs_cowbl.h linux-3.18.5-vs2.3.7.3/include/linux/vs_cowbl.h +--- linux-3.18.5/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vs_cowbl.h 2015-01-19 10:58:04.000000000 +0000 @@ -0,0 +1,48 @@ +#ifndef _VS_COWBL_H +#define _VS_COWBL_H @@ -8847,9 +7903,9 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_cowbl.h linux-3.7-vs2.3.5.1/inc +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7/include/linux/vs_cvirt.h linux-3.7-vs2.3.5.1/include/linux/vs_cvirt.h ---- linux-3.7/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vs_cvirt.h 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/include/linux/vs_cvirt.h linux-3.18.5-vs2.3.7.3/include/linux/vs_cvirt.h +--- linux-3.18.5/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vs_cvirt.h 2015-01-19 10:58:04.000000000 +0000 @@ -0,0 +1,50 @@ +#ifndef _VS_CVIRT_H +#define _VS_CVIRT_H @@ -8901,9 +7957,9 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_cvirt.h linux-3.7-vs2.3.5.1/inc +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7/include/linux/vs_device.h linux-3.7-vs2.3.5.1/include/linux/vs_device.h ---- linux-3.7/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vs_device.h 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/include/linux/vs_device.h linux-3.18.5-vs2.3.7.3/include/linux/vs_device.h +--- linux-3.18.5/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vs_device.h 2015-01-19 10:58:04.000000000 +0000 @@ -0,0 +1,45 @@ +#ifndef _VS_DEVICE_H +#define _VS_DEVICE_H @@ -8950,9 +8006,9 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_device.h linux-3.7-vs2.3.5.1/in +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7/include/linux/vs_dlimit.h linux-3.7-vs2.3.5.1/include/linux/vs_dlimit.h ---- linux-3.7/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vs_dlimit.h 2012-12-11 19:37:05.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/include/linux/vs_dlimit.h linux-3.18.5-vs2.3.7.3/include/linux/vs_dlimit.h +--- linux-3.18.5/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vs_dlimit.h 2015-01-19 10:58:04.000000000 +0000 @@ -0,0 +1,215 @@ +#ifndef _VS_DLIMIT_H +#define _VS_DLIMIT_H @@ -9002,7 +8058,7 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_dlimit.h linux-3.7-vs2.3.5.1/in +#define __dlimit_char(d) ((d) ? '*' : ' ') + +static inline int __dl_alloc_space(struct super_block *sb, -+ tag_t tag, dlsize_t nr, const char *file, int line) ++ vtag_t tag, dlsize_t nr, const char *file, int line) +{ + struct dl_info *dli = NULL; + int ret = 0; @@ -9028,7 +8084,7 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_dlimit.h linux-3.7-vs2.3.5.1/in +} + +static inline void __dl_free_space(struct super_block *sb, -+ tag_t tag, dlsize_t nr, const char *_file, int _line) ++ vtag_t tag, dlsize_t nr, const char *_file, int _line) +{ + struct dl_info *dli = NULL; + @@ -9053,7 +8109,7 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_dlimit.h linux-3.7-vs2.3.5.1/in +} + +static inline int __dl_alloc_inode(struct super_block *sb, -+ tag_t tag, const char *_file, int _line) ++ vtag_t tag, const char *_file, int _line) +{ + struct dl_info *dli; + int ret = 0; @@ -9075,7 +8131,7 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_dlimit.h linux-3.7-vs2.3.5.1/in +} + +static inline void __dl_free_inode(struct super_block *sb, -+ tag_t tag, const char *_file, int _line) ++ vtag_t tag, const char *_file, int _line) +{ + struct dl_info *dli; + @@ -9096,7 +8152,7 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_dlimit.h linux-3.7-vs2.3.5.1/in + sb, tag, __dlimit_char(dli), _file, _line); +} + -+static inline void __dl_adjust_block(struct super_block *sb, tag_t tag, ++static inline void __dl_adjust_block(struct super_block *sb, vtag_t tag, + unsigned long long *free_blocks, unsigned long long *root_blocks, + const char *_file, int _line) +{ @@ -9169,10 +8225,10 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_dlimit.h linux-3.7-vs2.3.5.1/in +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7/include/linux/vs_inet.h linux-3.7-vs2.3.5.1/include/linux/vs_inet.h ---- linux-3.7/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vs_inet.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,353 @@ +diff -NurpP --minimal linux-3.18.5/include/linux/vs_inet.h linux-3.18.5-vs2.3.7.3/include/linux/vs_inet.h +--- linux-3.18.5/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vs_inet.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,364 @@ +#ifndef _VS_INET_H +#define _VS_INET_H + @@ -9234,6 +8290,7 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_inet.h linux-3.7-vs2.3.5.1/incl +int v4_addr_in_nx_info(struct nx_info *nxi, __be32 addr, uint16_t tmask) +{ + struct nx_addr_v4 *nxa; ++ unsigned long irqflags; + int ret = 1; + + if (!nxi) @@ -9256,11 +8313,15 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_inet.h linux-3.7-vs2.3.5.1/incl + (nxi->v4_bcast.s_addr == addr)) + goto out; + ret = 5; ++ + /* check for v4 addresses */ ++ spin_lock_irqsave(&nxi->addr_lock, irqflags); + for (nxa = &nxi->v4; nxa; nxa = nxa->next) + if (v4_addr_match(nxa, addr, tmask)) -+ goto out; ++ goto out_unlock; + ret = 0; ++out_unlock: ++ spin_unlock_irqrestore(&nxi->addr_lock, irqflags); +out: + vxdprintk(VXD_CBIT(net, 0), + "v4_addr_in_nx_info(%p[#%u]," NIPQUAD_FMT ",%04x) = %d", @@ -9279,11 +8340,17 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_inet.h linux-3.7-vs2.3.5.1/incl +int v4_nx_addr_in_nx_info(struct nx_info *nxi, struct nx_addr_v4 *nxa, uint16_t mask) +{ + struct nx_addr_v4 *ptr; ++ unsigned long irqflags; ++ int ret = 1; + ++ spin_lock_irqsave(&nxi->addr_lock, irqflags); + for (ptr = &nxi->v4; ptr; ptr = ptr->next) + if (v4_nx_addr_match(ptr, nxa, mask)) -+ return 1; -+ return 0; ++ goto out_unlock; ++ ret = 0; ++out_unlock: ++ spin_unlock_irqrestore(&nxi->addr_lock, irqflags); ++ return ret; +} + +#include @@ -9342,7 +8409,7 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_inet.h linux-3.7-vs2.3.5.1/incl +int __v4_addr_match_socket(const struct sock *sk, struct nx_addr_v4 *nxa) +{ + struct nx_info *nxi = sk->sk_nx_info; -+ __be32 saddr = sk_rcv_saddr(sk); ++ __be32 saddr = sk->sk_rcv_saddr; + + vxdprintk(VXD_CBIT(net, 5), + "__v4_addr_in_socket(%p," NXAV4_FMT ") %p:" NIPQUAD_FMT " %p;%lx", @@ -9526,10 +8593,10 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_inet.h linux-3.7-vs2.3.5.1/incl +#else +// #warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7/include/linux/vs_inet6.h linux-3.7-vs2.3.5.1/include/linux/vs_inet6.h ---- linux-3.7/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vs_inet6.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,246 @@ +diff -NurpP --minimal linux-3.18.5/include/linux/vs_inet6.h linux-3.18.5-vs2.3.7.3/include/linux/vs_inet6.h +--- linux-3.18.5/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vs_inet6.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,257 @@ +#ifndef _VS_INET6_H +#define _VS_INET6_H + @@ -9573,14 +8640,19 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_inet6.h linux-3.7-vs2.3.5.1/inc + const struct in6_addr *addr, uint16_t mask) +{ + struct nx_addr_v6 *nxa; ++ unsigned long irqflags; + int ret = 1; + + if (!nxi) + goto out; ++ ++ spin_lock_irqsave(&nxi->addr_lock, irqflags); + for (nxa = &nxi->v6; nxa; nxa = nxa->next) + if (v6_addr_match(nxa, addr, mask)) -+ goto out; ++ goto out_unlock; + ret = 0; ++out_unlock: ++ spin_unlock_irqrestore(&nxi->addr_lock, irqflags); +out: + vxdprintk(VXD_CBIT(net, 0), + "v6_addr_in_nx_info(%p[#%u],%pI6,%04x) = %d", @@ -9599,11 +8671,17 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_inet6.h linux-3.7-vs2.3.5.1/inc +int v6_nx_addr_in_nx_info(struct nx_info *nxi, struct nx_addr_v6 *nxa, uint16_t mask) +{ + struct nx_addr_v6 *ptr; ++ unsigned long irqflags; ++ int ret = 1; + ++ spin_lock_irqsave(&nxi->addr_lock, irqflags); + for (ptr = &nxi->v6; ptr; ptr = ptr->next) + if (v6_nx_addr_match(ptr, nxa, mask)) -+ return 1; -+ return 0; ++ goto out_unlock; ++ ret = 0; ++out_unlock: ++ spin_unlock_irqrestore(&nxi->addr_lock, irqflags); ++ return ret; +} + + @@ -9620,7 +8698,7 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_inet6.h linux-3.7-vs2.3.5.1/inc + struct in6_addr *addr) +{ + struct sock *sk = &inet->sk; -+ struct in6_addr *saddr = inet6_rcv_saddr(sk); ++ const struct in6_addr *saddr = inet6_rcv_saddr(sk); + + if (!ipv6_addr_any(addr) && + ipv6_addr_equal(saddr, addr)) @@ -9641,7 +8719,7 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_inet6.h linux-3.7-vs2.3.5.1/inc +int __v6_addr_match_socket(const struct sock *sk, struct nx_addr_v6 *nxa) +{ + struct nx_info *nxi = sk->sk_nx_info; -+ struct in6_addr *saddr = inet6_rcv_saddr(sk); ++ const struct in6_addr *saddr = inet6_rcv_saddr(sk); + + vxdprintk(VXD_CBIT(net, 5), + "__v6_addr_in_socket(%p," NXAV6_FMT ") %p:%pI6 %p;%lx", @@ -9776,9 +8854,9 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_inet6.h linux-3.7-vs2.3.5.1/inc +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7/include/linux/vs_limit.h linux-3.7-vs2.3.5.1/include/linux/vs_limit.h ---- linux-3.7/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vs_limit.h 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/include/linux/vs_limit.h linux-3.18.5-vs2.3.7.3/include/linux/vs_limit.h +--- linux-3.18.5/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vs_limit.h 2015-01-19 10:58:04.000000000 +0000 @@ -0,0 +1,140 @@ +#ifndef _VS_LIMIT_H +#define _VS_LIMIT_H @@ -9856,12 +8934,12 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_limit.h linux-3.7-vs2.3.5.1/inc +/* dentry limits */ + +#define vx_dentry_inc(d) do { \ -+ if ((d)->d_count == 1) \ ++ if (d_count(d) == 1) \ + vx_acc_cres(current_vx_info(), 1, d, VLIMIT_DENTRY); \ + } while (0) + +#define vx_dentry_dec(d) do { \ -+ if ((d)->d_count == 0) \ ++ if (d_count(d) == 0) \ + vx_acc_cres(current_vx_info(),-1, d, VLIMIT_DENTRY); \ + } while (0) + @@ -9920,9 +8998,9 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_limit.h linux-3.7-vs2.3.5.1/inc +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7/include/linux/vs_network.h linux-3.7-vs2.3.5.1/include/linux/vs_network.h ---- linux-3.7/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vs_network.h 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/include/linux/vs_network.h linux-3.18.5-vs2.3.7.3/include/linux/vs_network.h +--- linux-3.18.5/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vs_network.h 2015-01-19 10:58:04.000000000 +0000 @@ -0,0 +1,169 @@ +#ifndef _NX_VS_NETWORK_H +#define _NX_VS_NETWORK_H @@ -10093,9 +9171,9 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_network.h linux-3.7-vs2.3.5.1/i +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7/include/linux/vs_pid.h linux-3.7-vs2.3.5.1/include/linux/vs_pid.h ---- linux-3.7/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vs_pid.h 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/include/linux/vs_pid.h linux-3.18.5-vs2.3.7.3/include/linux/vs_pid.h +--- linux-3.18.5/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vs_pid.h 2015-01-19 10:58:04.000000000 +0000 @@ -0,0 +1,50 @@ +#ifndef _VS_PID_H +#define _VS_PID_H @@ -10147,9 +9225,9 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_pid.h linux-3.7-vs2.3.5.1/inclu +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7/include/linux/vs_sched.h linux-3.7-vs2.3.5.1/include/linux/vs_sched.h ---- linux-3.7/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vs_sched.h 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/include/linux/vs_sched.h linux-3.18.5-vs2.3.7.3/include/linux/vs_sched.h +--- linux-3.18.5/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vs_sched.h 2015-01-19 10:58:04.000000000 +0000 @@ -0,0 +1,40 @@ +#ifndef _VS_SCHED_H +#define _VS_SCHED_H @@ -10191,9 +9269,9 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_sched.h linux-3.7-vs2.3.5.1/inc +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7/include/linux/vs_socket.h linux-3.7-vs2.3.5.1/include/linux/vs_socket.h ---- linux-3.7/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vs_socket.h 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/include/linux/vs_socket.h linux-3.18.5-vs2.3.7.3/include/linux/vs_socket.h +--- linux-3.18.5/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vs_socket.h 2015-01-19 10:58:04.000000000 +0000 @@ -0,0 +1,67 @@ +#ifndef _VS_SOCKET_H +#define _VS_SOCKET_H @@ -10262,9 +9340,9 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_socket.h linux-3.7-vs2.3.5.1/in +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7/include/linux/vs_tag.h linux-3.7-vs2.3.5.1/include/linux/vs_tag.h ---- linux-3.7/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vs_tag.h 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/include/linux/vs_tag.h linux-3.18.5-vs2.3.7.3/include/linux/vs_tag.h +--- linux-3.18.5/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vs_tag.h 2015-01-19 10:58:04.000000000 +0000 @@ -0,0 +1,47 @@ +#ifndef _VS_TAG_H +#define _VS_TAG_H @@ -10295,7 +9373,7 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_tag.h linux-3.7-vs2.3.5.1/inclu + * check current context for ADMIN/WATCH and + * optionally against supplied argument + */ -+static inline int __dx_check(tag_t cid, tag_t id, unsigned int mode) ++static inline int __dx_check(vtag_t cid, vtag_t id, unsigned int mode) +{ + if (mode & DX_ARG_MASK) { + if ((mode & DX_IDENT) && (id == cid)) @@ -10313,9 +9391,9 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_tag.h linux-3.7-vs2.3.5.1/inclu +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7/include/linux/vs_time.h linux-3.7-vs2.3.5.1/include/linux/vs_time.h ---- linux-3.7/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vs_time.h 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/include/linux/vs_time.h linux-3.18.5-vs2.3.7.3/include/linux/vs_time.h +--- linux-3.18.5/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vs_time.h 2015-01-19 10:58:04.000000000 +0000 @@ -0,0 +1,19 @@ +#ifndef _VS_TIME_H +#define _VS_TIME_H @@ -10336,24 +9414,12 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_time.h linux-3.7-vs2.3.5.1/incl +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7/include/linux/vserver/Kbuild linux-3.7-vs2.3.5.1/include/linux/vserver/Kbuild ---- linux-3.7/include/linux/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/Kbuild 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,8 @@ -+ -+header-y += context_cmd.h network_cmd.h space_cmd.h \ -+ cacct_cmd.h cvirt_cmd.h limit_cmd.h dlimit_cmd.h \ -+ inode_cmd.h tag_cmd.h sched_cmd.h signal_cmd.h \ -+ debug_cmd.h device_cmd.h -+ -+header-y += switch.h network.h monitor.h inode.h device.h -+ -diff -NurpP --minimal linux-3.7/include/linux/vserver/base.h linux-3.7-vs2.3.5.1/include/linux/vserver/base.h ---- linux-3.7/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/base.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,178 @@ -+#ifndef _VX_BASE_H -+#define _VX_BASE_H +diff -NurpP --minimal linux-3.18.5/include/linux/vserver/base.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/base.h +--- linux-3.18.5/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/base.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,184 @@ ++#ifndef _VSERVER_BASE_H ++#define _VSERVER_BASE_H + + +/* context state changes */ @@ -10497,6 +9563,9 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/base.h linux-3.7-vs2.3.5.1 +#define nx_capable(b, c) (capable(b) || \ + (cap_raised(current_cap(), b) && nx_ncaps(c))) + ++#define nx_ns_capable(n, b, c) (ns_capable(n, b) || \ ++ (cap_raised(current_cap(), b) && nx_ncaps(c))) ++ +#define vx_task_initpid(t, n) \ + ((t)->vx_info && \ + ((t)->vx_info->vx_initpid == (n))) @@ -10514,6 +9583,9 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/base.h linux-3.7-vs2.3.5.1 + (cap_raised(current_cap(), b) && \ + !((f) & ~vx_current_umask()))) + ++#define vx_ns_can_unshare(n, b, f) (ns_capable(n, b) || \ ++ (cap_raised(current_cap(), b) && \ ++ !((f) & ~vx_current_umask()))) + +#define __vx_wmask(v) ((v)->vx_wmask) + @@ -10530,12 +9602,12 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/base.h linux-3.7-vs2.3.5.1 +#define nx_info_state(n, m) (__nx_state(n) & (m)) + +#endif -diff -NurpP --minimal linux-3.7/include/linux/vserver/cacct.h linux-3.7-vs2.3.5.1/include/linux/vserver/cacct.h ---- linux-3.7/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/cacct.h 2012-12-11 15:56:32.000000000 +0000 +diff -NurpP --minimal linux-3.18.5/include/linux/vserver/cacct.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/cacct.h +--- linux-3.18.5/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/cacct.h 2015-01-19 10:58:04.000000000 +0000 @@ -0,0 +1,15 @@ -+#ifndef _VX_CACCT_H -+#define _VX_CACCT_H ++#ifndef _VSERVER_CACCT_H ++#define _VSERVER_CACCT_H + + +enum sock_acc_field { @@ -10548,40 +9620,27 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/cacct.h linux-3.7-vs2.3.5. + VXA_SOCK_SIZE /* array size */ +}; + -+#endif /* _VX_CACCT_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/cacct_cmd.h linux-3.7-vs2.3.5.1/include/linux/vserver/cacct_cmd.h ---- linux-3.7/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/cacct_cmd.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,23 @@ -+#ifndef _VX_CACCT_CMD_H -+#define _VX_CACCT_CMD_H -+ -+ -+/* virtual host info name commands */ -+ -+#define VCMD_sock_stat VC_CMD(VSTAT, 5, 0) -+ -+struct vcmd_sock_stat_v0 { -+ uint32_t field; -+ uint32_t count[3]; -+ uint64_t total[3]; -+}; -+ ++#endif /* _VSERVER_CACCT_H */ +diff -NurpP --minimal linux-3.18.5/include/linux/vserver/cacct_cmd.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/cacct_cmd.h +--- linux-3.18.5/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/cacct_cmd.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,10 @@ ++#ifndef _VSERVER_CACCT_CMD_H ++#define _VSERVER_CACCT_CMD_H + -+#ifdef __KERNEL__ + +#include ++#include + +extern int vc_sock_stat(struct vx_info *, void __user *); + -+#endif /* __KERNEL__ */ -+#endif /* _VX_CACCT_CMD_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/cacct_def.h linux-3.7-vs2.3.5.1/include/linux/vserver/cacct_def.h ---- linux-3.7/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/cacct_def.h 2012-12-11 15:56:32.000000000 +0000 ++#endif /* _VSERVER_CACCT_CMD_H */ +diff -NurpP --minimal linux-3.18.5/include/linux/vserver/cacct_def.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/cacct_def.h +--- linux-3.18.5/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/cacct_def.h 2015-01-19 10:58:04.000000000 +0000 @@ -0,0 +1,43 @@ -+#ifndef _VX_CACCT_DEF_H -+#define _VX_CACCT_DEF_H ++#ifndef _VSERVER_CACCT_DEF_H ++#define _VSERVER_CACCT_DEF_H + +#include +#include @@ -10622,16 +9681,13 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/cacct_def.h linux-3.7-vs2. + +#endif + -+#endif /* _VX_CACCT_DEF_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/cacct_int.h linux-3.7-vs2.3.5.1/include/linux/vserver/cacct_int.h ---- linux-3.7/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/cacct_int.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,21 @@ -+#ifndef _VX_CACCT_INT_H -+#define _VX_CACCT_INT_H -+ -+ -+#ifdef __KERNEL__ ++#endif /* _VSERVER_CACCT_DEF_H */ +diff -NurpP --minimal linux-3.18.5/include/linux/vserver/cacct_int.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/cacct_int.h +--- linux-3.18.5/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/cacct_int.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,17 @@ ++#ifndef _VSERVER_CACCT_INT_H ++#define _VSERVER_CACCT_INT_H + +static inline +unsigned long vx_sock_count(struct _vx_cacct *cacct, int type, int pos) @@ -10646,14 +9702,13 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/cacct_int.h linux-3.7-vs2. + return atomic_long_read(&cacct->sock[type][pos].total); +} + -+#endif /* __KERNEL__ */ -+#endif /* _VX_CACCT_INT_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/check.h linux-3.7-vs2.3.5.1/include/linux/vserver/check.h ---- linux-3.7/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/check.h 2012-12-11 15:56:32.000000000 +0000 ++#endif /* _VSERVER_CACCT_INT_H */ +diff -NurpP --minimal linux-3.18.5/include/linux/vserver/check.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/check.h +--- linux-3.18.5/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/check.h 2015-01-19 10:58:04.000000000 +0000 @@ -0,0 +1,89 @@ -+#ifndef _VS_CHECK_H -+#define _VS_CHECK_H ++#ifndef _VSERVER_CHECK_H ++#define _VSERVER_CHECK_H + + +#define MAX_S_CONTEXT 65535 /* Arbitrary limit */ @@ -10741,95 +9796,18 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/check.h linux-3.7-vs2.3.5. +#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1) + +#endif -diff -NurpP --minimal linux-3.7/include/linux/vserver/context.h linux-3.7-vs2.3.5.1/include/linux/vserver/context.h ---- linux-3.7/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/context.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,188 @@ -+#ifndef _VX_CONTEXT_H -+#define _VX_CONTEXT_H -+ -+#include -+#include -+ -+ -+/* context flags */ -+ -+#define VXF_INFO_SCHED 0x00000002 -+#define VXF_INFO_NPROC 0x00000004 -+#define VXF_INFO_PRIVATE 0x00000008 -+ -+#define VXF_INFO_INIT 0x00000010 -+#define VXF_INFO_HIDE 0x00000020 -+#define VXF_INFO_ULIMIT 0x00000040 -+#define VXF_INFO_NSPACE 0x00000080 -+ -+#define VXF_SCHED_HARD 0x00000100 -+#define VXF_SCHED_PRIO 0x00000200 -+#define VXF_SCHED_PAUSE 0x00000400 -+ -+#define VXF_VIRT_MEM 0x00010000 -+#define VXF_VIRT_UPTIME 0x00020000 -+#define VXF_VIRT_CPU 0x00040000 -+#define VXF_VIRT_LOAD 0x00080000 -+#define VXF_VIRT_TIME 0x00100000 -+ -+#define VXF_HIDE_MOUNT 0x01000000 -+/* was VXF_HIDE_NETIF 0x02000000 */ -+#define VXF_HIDE_VINFO 0x04000000 -+ -+#define VXF_STATE_SETUP (1ULL << 32) -+#define VXF_STATE_INIT (1ULL << 33) -+#define VXF_STATE_ADMIN (1ULL << 34) -+ -+#define VXF_SC_HELPER (1ULL << 36) -+#define VXF_REBOOT_KILL (1ULL << 37) -+#define VXF_PERSISTENT (1ULL << 38) -+ -+#define VXF_FORK_RSS (1ULL << 48) -+#define VXF_PROLIFIC (1ULL << 49) -+ -+#define VXF_IGNEG_NICE (1ULL << 52) -+ -+#define VXF_ONE_TIME (0x0007ULL << 32) -+ -+#define VXF_INIT_SET (VXF_STATE_SETUP | VXF_STATE_INIT | VXF_STATE_ADMIN) -+ -+ -+/* context migration */ -+ -+#define VXM_SET_INIT 0x00000001 -+#define VXM_SET_REAPER 0x00000002 -+ -+/* context caps */ -+ -+#define VXC_SET_UTSNAME 0x00000001 -+#define VXC_SET_RLIMIT 0x00000002 -+#define VXC_FS_SECURITY 0x00000004 -+#define VXC_FS_TRUSTED 0x00000008 -+#define VXC_TIOCSTI 0x00000010 -+ -+/* was VXC_RAW_ICMP 0x00000100 */ -+#define VXC_SYSLOG 0x00001000 -+#define VXC_OOM_ADJUST 0x00002000 -+#define VXC_AUDIT_CONTROL 0x00004000 -+ -+#define VXC_SECURE_MOUNT 0x00010000 -+#define VXC_SECURE_REMOUNT 0x00020000 -+#define VXC_BINARY_MOUNT 0x00040000 -+ -+#define VXC_QUOTA_CTL 0x00100000 -+#define VXC_ADMIN_MAPPER 0x00200000 -+#define VXC_ADMIN_CLOOP 0x00400000 -+ -+#define VXC_KTHREAD 0x01000000 -+#define VXC_NAMESPACE 0x02000000 -+ +diff -NurpP --minimal linux-3.18.5/include/linux/vserver/context.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/context.h +--- linux-3.18.5/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/context.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,110 @@ ++#ifndef _VSERVER_CONTEXT_H ++#define _VSERVER_CONTEXT_H + -+#ifdef __KERNEL__ + +#include +#include +#include ++#include + +#include "limit_def.h" +#include "sched_def.h" @@ -10853,7 +9831,7 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/context.h linux-3.7-vs2.3. + +struct vx_info { + struct hlist_node vx_hlist; /* linked list of contexts */ -+ xid_t vx_id; /* context id */ ++ vxid_t vx_id; /* context id */ + atomic_t vx_usecnt; /* usage count */ + atomic_t vx_tasks; /* tasks count */ + struct vx_info *vx_parent; /* parent context */ @@ -10904,7 +9882,7 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/context.h linux-3.7-vs2.3. + +struct vx_info_save { + struct vx_info *vxi; -+ xid_t xid; ++ vxid_t xid; +}; + + @@ -10924,276 +9902,102 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/context.h linux-3.7-vs2.3. +extern struct vx_info *lookup_or_create_vx_info(int); + +extern int get_xid_list(int, unsigned int *, int); -+extern int xid_is_hashed(xid_t); ++extern int xid_is_hashed(vxid_t); + +extern int vx_migrate_task(struct task_struct *, struct vx_info *, int); + +extern long vs_state_change(struct vx_info *, unsigned int); + + -+#endif /* __KERNEL__ */ -+#endif /* _VX_CONTEXT_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/context_cmd.h linux-3.7-vs2.3.5.1/include/linux/vserver/context_cmd.h ---- linux-3.7/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/context_cmd.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,162 @@ -+#ifndef _VX_CONTEXT_CMD_H -+#define _VX_CONTEXT_CMD_H -+ -+ -+/* vinfo commands */ ++#endif /* _VSERVER_CONTEXT_H */ +diff -NurpP --minimal linux-3.18.5/include/linux/vserver/context_cmd.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/context_cmd.h +--- linux-3.18.5/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/context_cmd.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,33 @@ ++#ifndef _VSERVER_CONTEXT_CMD_H ++#define _VSERVER_CONTEXT_CMD_H + -+#define VCMD_task_xid VC_CMD(VINFO, 1, 0) ++#include + -+#ifdef __KERNEL__ +extern int vc_task_xid(uint32_t); + -+#endif /* __KERNEL__ */ -+ -+#define VCMD_vx_info VC_CMD(VINFO, 5, 0) -+ -+struct vcmd_vx_info_v0 { -+ uint32_t xid; -+ uint32_t initpid; -+ /* more to come */ -+}; -+ -+#ifdef __KERNEL__ +extern int vc_vx_info(struct vx_info *, void __user *); + -+#endif /* __KERNEL__ */ -+ -+#define VCMD_ctx_stat VC_CMD(VSTAT, 0, 0) -+ -+struct vcmd_ctx_stat_v0 { -+ uint32_t usecnt; -+ uint32_t tasks; -+ /* more to come */ -+}; -+ -+#ifdef __KERNEL__ +extern int vc_ctx_stat(struct vx_info *, void __user *); + -+#endif /* __KERNEL__ */ ++extern int vc_ctx_create(uint32_t, void __user *); ++extern int vc_ctx_migrate(struct vx_info *, void __user *); + -+/* context commands */ ++extern int vc_get_cflags(struct vx_info *, void __user *); ++extern int vc_set_cflags(struct vx_info *, void __user *); + -+#define VCMD_ctx_create_v0 VC_CMD(VPROC, 1, 0) -+#define VCMD_ctx_create VC_CMD(VPROC, 1, 1) ++extern int vc_get_ccaps(struct vx_info *, void __user *); ++extern int vc_set_ccaps(struct vx_info *, void __user *); + -+struct vcmd_ctx_create { -+ uint64_t flagword; -+}; ++extern int vc_get_bcaps(struct vx_info *, void __user *); ++extern int vc_set_bcaps(struct vx_info *, void __user *); + -+#define VCMD_ctx_migrate_v0 VC_CMD(PROCMIG, 1, 0) -+#define VCMD_ctx_migrate VC_CMD(PROCMIG, 1, 1) ++extern int vc_get_umask(struct vx_info *, void __user *); ++extern int vc_set_umask(struct vx_info *, void __user *); + -+struct vcmd_ctx_migrate { -+ uint64_t flagword; -+}; ++extern int vc_get_wmask(struct vx_info *, void __user *); ++extern int vc_set_wmask(struct vx_info *, void __user *); + -+#ifdef __KERNEL__ -+extern int vc_ctx_create(uint32_t, void __user *); -+extern int vc_ctx_migrate(struct vx_info *, void __user *); ++extern int vc_get_badness(struct vx_info *, void __user *); ++extern int vc_set_badness(struct vx_info *, void __user *); + -+#endif /* __KERNEL__ */ ++#endif /* _VSERVER_CONTEXT_CMD_H */ +diff -NurpP --minimal linux-3.18.5/include/linux/vserver/cvirt.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/cvirt.h +--- linux-3.18.5/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/cvirt.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,18 @@ ++#ifndef _VSERVER_CVIRT_H ++#define _VSERVER_CVIRT_H + ++struct timespec; + -+/* flag commands */ ++void vx_vsi_boottime(struct timespec *); + -+#define VCMD_get_cflags VC_CMD(FLAGS, 1, 0) -+#define VCMD_set_cflags VC_CMD(FLAGS, 2, 0) ++void vx_vsi_uptime(struct timespec *, struct timespec *); + -+struct vcmd_ctx_flags_v0 { -+ uint64_t flagword; -+ uint64_t mask; -+}; + -+#ifdef __KERNEL__ -+extern int vc_get_cflags(struct vx_info *, void __user *); -+extern int vc_set_cflags(struct vx_info *, void __user *); ++struct vx_info; + -+#endif /* __KERNEL__ */ ++void vx_update_load(struct vx_info *); + + -+/* context caps commands */ ++int vx_do_syslog(int, char __user *, int); + -+#define VCMD_get_ccaps VC_CMD(FLAGS, 3, 1) -+#define VCMD_set_ccaps VC_CMD(FLAGS, 4, 1) ++#endif /* _VSERVER_CVIRT_H */ +diff -NurpP --minimal linux-3.18.5/include/linux/vserver/cvirt_cmd.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/cvirt_cmd.h +--- linux-3.18.5/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/cvirt_cmd.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,13 @@ ++#ifndef _VSERVER_CVIRT_CMD_H ++#define _VSERVER_CVIRT_CMD_H + -+struct vcmd_ctx_caps_v1 { -+ uint64_t ccaps; -+ uint64_t cmask; -+}; + -+#ifdef __KERNEL__ -+extern int vc_get_ccaps(struct vx_info *, void __user *); -+extern int vc_set_ccaps(struct vx_info *, void __user *); ++#include ++#include + -+#endif /* __KERNEL__ */ ++extern int vc_set_vhi_name(struct vx_info *, void __user *); ++extern int vc_get_vhi_name(struct vx_info *, void __user *); + ++extern int vc_virt_stat(struct vx_info *, void __user *); + -+/* bcaps commands */ ++#endif /* _VSERVER_CVIRT_CMD_H */ +diff -NurpP --minimal linux-3.18.5/include/linux/vserver/cvirt_def.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/cvirt_def.h +--- linux-3.18.5/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/cvirt_def.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,80 @@ ++#ifndef _VSERVER_CVIRT_DEF_H ++#define _VSERVER_CVIRT_DEF_H + -+#define VCMD_get_bcaps VC_CMD(FLAGS, 9, 0) -+#define VCMD_set_bcaps VC_CMD(FLAGS, 10, 0) -+ -+struct vcmd_bcaps { -+ uint64_t bcaps; -+ uint64_t bmask; -+}; -+ -+#ifdef __KERNEL__ -+extern int vc_get_bcaps(struct vx_info *, void __user *); -+extern int vc_set_bcaps(struct vx_info *, void __user *); -+ -+#endif /* __KERNEL__ */ -+ -+ -+/* umask commands */ -+ -+#define VCMD_get_umask VC_CMD(FLAGS, 13, 0) -+#define VCMD_set_umask VC_CMD(FLAGS, 14, 0) -+ -+struct vcmd_umask { -+ uint64_t umask; -+ uint64_t mask; -+}; -+ -+#ifdef __KERNEL__ -+extern int vc_get_umask(struct vx_info *, void __user *); -+extern int vc_set_umask(struct vx_info *, void __user *); -+ -+#endif /* __KERNEL__ */ -+ -+ -+/* wmask commands */ -+ -+#define VCMD_get_wmask VC_CMD(FLAGS, 15, 0) -+#define VCMD_set_wmask VC_CMD(FLAGS, 16, 0) -+ -+struct vcmd_wmask { -+ uint64_t wmask; -+ uint64_t mask; -+}; -+ -+#ifdef __KERNEL__ -+extern int vc_get_wmask(struct vx_info *, void __user *); -+extern int vc_set_wmask(struct vx_info *, void __user *); -+ -+#endif /* __KERNEL__ */ -+ -+ -+/* OOM badness */ -+ -+#define VCMD_get_badness VC_CMD(MEMCTRL, 5, 0) -+#define VCMD_set_badness VC_CMD(MEMCTRL, 6, 0) -+ -+struct vcmd_badness_v0 { -+ int64_t bias; -+}; -+ -+#ifdef __KERNEL__ -+extern int vc_get_badness(struct vx_info *, void __user *); -+extern int vc_set_badness(struct vx_info *, void __user *); -+ -+#endif /* __KERNEL__ */ -+#endif /* _VX_CONTEXT_CMD_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/cvirt.h linux-3.7-vs2.3.5.1/include/linux/vserver/cvirt.h ---- linux-3.7/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/cvirt.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,22 @@ -+#ifndef _VX_CVIRT_H -+#define _VX_CVIRT_H -+ -+ -+#ifdef __KERNEL__ -+ -+struct timespec; -+ -+void vx_vsi_boottime(struct timespec *); -+ -+void vx_vsi_uptime(struct timespec *, struct timespec *); -+ -+ -+struct vx_info; -+ -+void vx_update_load(struct vx_info *); -+ -+ -+int vx_do_syslog(int, char __user *, int); -+ -+#endif /* __KERNEL__ */ -+#endif /* _VX_CVIRT_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/cvirt_cmd.h linux-3.7-vs2.3.5.1/include/linux/vserver/cvirt_cmd.h ---- linux-3.7/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/cvirt_cmd.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,53 @@ -+#ifndef _VX_CVIRT_CMD_H -+#define _VX_CVIRT_CMD_H -+ -+ -+/* virtual host info name commands */ -+ -+#define VCMD_set_vhi_name VC_CMD(VHOST, 1, 0) -+#define VCMD_get_vhi_name VC_CMD(VHOST, 2, 0) -+ -+struct vcmd_vhi_name_v0 { -+ uint32_t field; -+ char name[65]; -+}; -+ -+ -+enum vhi_name_field { -+ VHIN_CONTEXT = 0, -+ VHIN_SYSNAME, -+ VHIN_NODENAME, -+ VHIN_RELEASE, -+ VHIN_VERSION, -+ VHIN_MACHINE, -+ VHIN_DOMAINNAME, -+}; -+ -+ -+#ifdef __KERNEL__ -+ -+#include -+ -+extern int vc_set_vhi_name(struct vx_info *, void __user *); -+extern int vc_get_vhi_name(struct vx_info *, void __user *); -+ -+#endif /* __KERNEL__ */ -+ -+#define VCMD_virt_stat VC_CMD(VSTAT, 3, 0) -+ -+struct vcmd_virt_stat_v0 { -+ uint64_t offset; -+ uint64_t uptime; -+ uint32_t nr_threads; -+ uint32_t nr_running; -+ uint32_t nr_uninterruptible; -+ uint32_t nr_onhold; -+ uint32_t nr_forks; -+ uint32_t load[3]; -+}; -+ -+#ifdef __KERNEL__ -+extern int vc_virt_stat(struct vx_info *, void __user *); -+ -+#endif /* __KERNEL__ */ -+#endif /* _VX_CVIRT_CMD_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/cvirt_def.h linux-3.7-vs2.3.5.1/include/linux/vserver/cvirt_def.h ---- linux-3.7/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/cvirt_def.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,80 @@ -+#ifndef _VX_CVIRT_DEF_H -+#define _VX_CVIRT_DEF_H -+ -+#include -+#include -+#include -+#include -+#include ++#include ++#include ++#include ++#include ++#include + + +struct _vx_usage_stat { @@ -11265,13 +10069,13 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/cvirt_def.h linux-3.7-vs2. + +#endif + -+#endif /* _VX_CVIRT_DEF_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/debug.h linux-3.7-vs2.3.5.1/include/linux/vserver/debug.h ---- linux-3.7/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/debug.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,145 @@ -+#ifndef _VX_DEBUG_H -+#define _VX_DEBUG_H ++#endif /* _VSERVER_CVIRT_DEF_H */ +diff -NurpP --minimal linux-3.18.5/include/linux/vserver/debug.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/debug.h +--- linux-3.18.5/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/debug.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,146 @@ ++#ifndef _VSERVER_DEBUG_H ++#define _VSERVER_DEBUG_H + + +#define VXD_CBIT(n, m) (vs_debug_ ## n & (1 << (m))) @@ -11396,7 +10200,8 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/debug.h linux-3.7-vs2.3.5. +#define vxwprintk_task(c, f, x...) \ + vxwprintk(c, VX_WARN_TASK f, \ + current->comm, current->pid, \ -+ current->xid, current->nid, current->tag, ##x) ++ current->xid, current->nid, \ ++ current->tag, ##x) +#define vxwprintk_xid(c, f, x...) \ + vxwprintk(c, VX_WARN_XID f, current->xid, x) +#define vxwprintk_nid(c, f, x...) \ @@ -11414,36 +10219,16 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/debug.h linux-3.7-vs2.3.5. +#endif + + -+#endif /* _VX_DEBUG_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/debug_cmd.h linux-3.7-vs2.3.5.1/include/linux/vserver/debug_cmd.h ---- linux-3.7/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/debug_cmd.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,58 @@ -+#ifndef _VX_DEBUG_CMD_H -+#define _VX_DEBUG_CMD_H -+ -+ -+/* debug commands */ -+ -+#define VCMD_dump_history VC_CMD(DEBUG, 1, 0) -+ -+#define VCMD_read_history VC_CMD(DEBUG, 5, 0) -+#define VCMD_read_monitor VC_CMD(DEBUG, 6, 0) -+ -+struct vcmd_read_history_v0 { -+ uint32_t index; -+ uint32_t count; -+ char __user *data; -+}; -+ -+struct vcmd_read_monitor_v0 { -+ uint32_t index; -+ uint32_t count; -+ char __user *data; -+}; ++#endif /* _VSERVER_DEBUG_H */ +diff -NurpP --minimal linux-3.18.5/include/linux/vserver/debug_cmd.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/debug_cmd.h +--- linux-3.18.5/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/debug_cmd.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,37 @@ ++#ifndef _VSERVER_DEBUG_CMD_H ++#define _VSERVER_DEBUG_CMD_H + ++#include + -+#ifdef __KERNEL__ + +#ifdef CONFIG_COMPAT + @@ -11475,48 +10260,29 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/debug_cmd.h linux-3.7-vs2. + +#endif /* CONFIG_COMPAT */ + -+#endif /* __KERNEL__ */ -+#endif /* _VX_DEBUG_CMD_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/device.h linux-3.7-vs2.3.5.1/include/linux/vserver/device.h ---- linux-3.7/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/device.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,15 @@ -+#ifndef _VX_DEVICE_H -+#define _VX_DEVICE_H -+ -+ -+#define DATTR_CREATE 0x00000001 -+#define DATTR_OPEN 0x00000002 -+ -+#define DATTR_REMAP 0x00000010 ++#endif /* _VSERVER_DEBUG_CMD_H */ +diff -NurpP --minimal linux-3.18.5/include/linux/vserver/device.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/device.h +--- linux-3.18.5/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/device.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,9 @@ ++#ifndef _VSERVER_DEVICE_H ++#define _VSERVER_DEVICE_H + -+#define DATTR_MASK 0x00000013 + ++#include + -+#else /* _VX_DEVICE_H */ ++#else /* _VSERVER_DEVICE_H */ +#warning duplicate inclusion -+#endif /* _VX_DEVICE_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/device_cmd.h linux-3.7-vs2.3.5.1/include/linux/vserver/device_cmd.h ---- linux-3.7/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/device_cmd.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,44 @@ -+#ifndef _VX_DEVICE_CMD_H -+#define _VX_DEVICE_CMD_H -+ -+ -+/* device vserver commands */ -+ -+#define VCMD_set_mapping VC_CMD(DEVICE, 1, 0) -+#define VCMD_unset_mapping VC_CMD(DEVICE, 2, 0) -+ -+struct vcmd_set_mapping_v0 { -+ const char __user *device; -+ const char __user *target; -+ uint32_t flags; -+}; ++#endif /* _VSERVER_DEVICE_H */ +diff -NurpP --minimal linux-3.18.5/include/linux/vserver/device_cmd.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/device_cmd.h +--- linux-3.18.5/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/device_cmd.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,31 @@ ++#ifndef _VSERVER_DEVICE_CMD_H ++#define _VSERVER_DEVICE_CMD_H + ++#include + -+#ifdef __KERNEL__ + +#ifdef CONFIG_COMPAT + @@ -11542,14 +10308,13 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/device_cmd.h linux-3.7-vs2 + +#endif /* CONFIG_COMPAT */ + -+#endif /* __KERNEL__ */ -+#endif /* _VX_DEVICE_CMD_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/device_def.h linux-3.7-vs2.3.5.1/include/linux/vserver/device_def.h ---- linux-3.7/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/device_def.h 2012-12-11 15:56:32.000000000 +0000 ++#endif /* _VSERVER_DEVICE_CMD_H */ +diff -NurpP --minimal linux-3.18.5/include/linux/vserver/device_def.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/device_def.h +--- linux-3.18.5/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/device_def.h 2015-01-19 10:58:04.000000000 +0000 @@ -0,0 +1,17 @@ -+#ifndef _VX_DEVICE_DEF_H -+#define _VX_DEVICE_DEF_H ++#ifndef _VSERVER_DEVICE_DEF_H ++#define _VSERVER_DEVICE_DEF_H + +#include + @@ -11564,13 +10329,13 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/device_def.h linux-3.7-vs2 +#endif +}; + -+#endif /* _VX_DEVICE_DEF_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/dlimit.h linux-3.7-vs2.3.5.1/include/linux/vserver/dlimit.h ---- linux-3.7/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/dlimit.h 2012-12-11 15:56:32.000000000 +0000 ++#endif /* _VSERVER_DEVICE_DEF_H */ +diff -NurpP --minimal linux-3.18.5/include/linux/vserver/dlimit.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/dlimit.h +--- linux-3.18.5/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/dlimit.h 2015-01-19 10:58:04.000000000 +0000 @@ -0,0 +1,54 @@ -+#ifndef _VX_DLIMIT_H -+#define _VX_DLIMIT_H ++#ifndef _VSERVER_DLIMIT_H ++#define _VSERVER_DLIMIT_H + +#include "switch.h" + @@ -11589,7 +10354,7 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/dlimit.h linux-3.7-vs2.3.5 +struct dl_info { + struct hlist_node dl_hlist; /* linked list of contexts */ + struct rcu_head dl_rcu; /* the rcu head */ -+ tag_t dl_tag; /* context tag */ ++ vtag_t dl_tag; /* context tag */ + atomic_t dl_usecnt; /* usage count */ + atomic_t dl_refcnt; /* reference count */ + @@ -11610,7 +10375,7 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/dlimit.h linux-3.7-vs2.3.5 +extern void rcu_free_dl_info(struct rcu_head *); +extern void unhash_dl_info(struct dl_info *); + -+extern struct dl_info *locate_dl_info(struct super_block *, tag_t); ++extern struct dl_info *locate_dl_info(struct super_block *, vtag_t); + + +struct kstatfs; @@ -11620,32 +10385,30 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/dlimit.h linux-3.7-vs2.3.5 +typedef uint64_t dlsize_t; + +#endif /* __KERNEL__ */ -+#else /* _VX_DLIMIT_H */ ++#else /* _VSERVER_DLIMIT_H */ +#warning duplicate inclusion -+#endif /* _VX_DLIMIT_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/dlimit_cmd.h linux-3.7-vs2.3.5.1/include/linux/vserver/dlimit_cmd.h ---- linux-3.7/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/dlimit_cmd.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,109 @@ -+#ifndef _VX_DLIMIT_CMD_H -+#define _VX_DLIMIT_CMD_H ++#endif /* _VSERVER_DLIMIT_H */ +diff -NurpP --minimal linux-3.18.5/include/linux/vserver/dlimit_cmd.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/dlimit_cmd.h +--- linux-3.18.5/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/dlimit_cmd.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,46 @@ ++#ifndef _VSERVER_DLIMIT_CMD_H ++#define _VSERVER_DLIMIT_CMD_H + ++#include + -+/* dlimit vserver commands */ + -+#define VCMD_add_dlimit VC_CMD(DLIMIT, 1, 0) -+#define VCMD_rem_dlimit VC_CMD(DLIMIT, 2, 0) ++#ifdef CONFIG_COMPAT + -+#define VCMD_set_dlimit VC_CMD(DLIMIT, 5, 0) -+#define VCMD_get_dlimit VC_CMD(DLIMIT, 6, 0) ++#include + -+struct vcmd_ctx_dlimit_base_v0 { -+ const char __user *name; ++struct vcmd_ctx_dlimit_base_v0_x32 { ++ compat_uptr_t name_ptr; + uint32_t flags; +}; + -+struct vcmd_ctx_dlimit_v0 { -+ const char __user *name; ++struct vcmd_ctx_dlimit_v0_x32 { ++ compat_uptr_t name_ptr; + uint32_t space_used; /* used space in kbytes */ + uint32_t space_total; /* maximum space in kbytes */ + uint32_t inodes_used; /* used inodes */ @@ -11654,94 +10417,33 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/dlimit_cmd.h linux-3.7-vs2 + uint32_t flags; +}; + -+#define CDLIM_UNSET ((uint32_t)0UL) -+#define CDLIM_INFINITY ((uint32_t)~0UL) -+#define CDLIM_KEEP ((uint32_t)~1UL) ++#endif /* CONFIG_COMPAT */ + -+#define DLIME_UNIT 0 -+#define DLIME_KILO 1 -+#define DLIME_MEGA 2 -+#define DLIME_GIGA 3 ++#include + -+#define DLIMF_SHIFT 0x10 ++extern int vc_add_dlimit(uint32_t, void __user *); ++extern int vc_rem_dlimit(uint32_t, void __user *); + -+#define DLIMS_USED 0 -+#define DLIMS_TOTAL 2 ++extern int vc_set_dlimit(uint32_t, void __user *); ++extern int vc_get_dlimit(uint32_t, void __user *); + -+static inline -+uint64_t dlimit_space_32to64(uint32_t val, uint32_t flags, int shift) -+{ -+ int exp = (flags & DLIMF_SHIFT) ? -+ (flags >> shift) & DLIME_GIGA : DLIME_KILO; -+ return ((uint64_t)val) << (10 * exp); -+} ++#ifdef CONFIG_COMPAT + -+static inline -+uint32_t dlimit_space_64to32(uint64_t val, uint32_t *flags, int shift) -+{ -+ int exp = 0; -+ -+ if (*flags & DLIMF_SHIFT) { -+ while (val > (1LL << 32) && (exp < 3)) { -+ val >>= 10; -+ exp++; -+ } -+ *flags &= ~(DLIME_GIGA << shift); -+ *flags |= exp << shift; -+ } else -+ val >>= 10; -+ return val; -+} -+ -+#ifdef __KERNEL__ -+ -+#ifdef CONFIG_COMPAT -+ -+#include -+ -+struct vcmd_ctx_dlimit_base_v0_x32 { -+ compat_uptr_t name_ptr; -+ uint32_t flags; -+}; -+ -+struct vcmd_ctx_dlimit_v0_x32 { -+ compat_uptr_t name_ptr; -+ uint32_t space_used; /* used space in kbytes */ -+ uint32_t space_total; /* maximum space in kbytes */ -+ uint32_t inodes_used; /* used inodes */ -+ uint32_t inodes_total; /* maximum inodes */ -+ uint32_t reserved; /* reserved for root in % */ -+ uint32_t flags; -+}; -+ -+#endif /* CONFIG_COMPAT */ -+ -+#include -+ -+extern int vc_add_dlimit(uint32_t, void __user *); -+extern int vc_rem_dlimit(uint32_t, void __user *); -+ -+extern int vc_set_dlimit(uint32_t, void __user *); -+extern int vc_get_dlimit(uint32_t, void __user *); -+ -+#ifdef CONFIG_COMPAT -+ -+extern int vc_add_dlimit_x32(uint32_t, void __user *); -+extern int vc_rem_dlimit_x32(uint32_t, void __user *); ++extern int vc_add_dlimit_x32(uint32_t, void __user *); ++extern int vc_rem_dlimit_x32(uint32_t, void __user *); + +extern int vc_set_dlimit_x32(uint32_t, void __user *); +extern int vc_get_dlimit_x32(uint32_t, void __user *); + +#endif /* CONFIG_COMPAT */ + -+#endif /* __KERNEL__ */ -+#endif /* _VX_DLIMIT_CMD_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/global.h linux-3.7-vs2.3.5.1/include/linux/vserver/global.h ---- linux-3.7/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/global.h 2012-12-11 15:56:32.000000000 +0000 ++#endif /* _VSERVER_DLIMIT_CMD_H */ +diff -NurpP --minimal linux-3.18.5/include/linux/vserver/global.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/global.h +--- linux-3.18.5/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/global.h 2015-01-19 10:58:04.000000000 +0000 @@ -0,0 +1,19 @@ -+#ifndef _VX_GLOBAL_H -+#define _VX_GLOBAL_H ++#ifndef _VSERVER_GLOBAL_H ++#define _VSERVER_GLOBAL_H + + +extern atomic_t vx_global_ctotal; @@ -11758,13 +10460,13 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/global.h linux-3.7-vs2.3.5 +extern atomic_t vs_global_pid_ns; + + -+#endif /* _VX_GLOBAL_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/history.h linux-3.7-vs2.3.5.1/include/linux/vserver/history.h ---- linux-3.7/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/history.h 2012-12-11 15:56:32.000000000 +0000 ++#endif /* _VSERVER_GLOBAL_H */ +diff -NurpP --minimal linux-3.18.5/include/linux/vserver/history.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/history.h +--- linux-3.18.5/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/history.h 2015-01-19 10:58:04.000000000 +0000 @@ -0,0 +1,197 @@ -+#ifndef _VX_HISTORY_H -+#define _VX_HISTORY_H ++#ifndef _VSERVER_HISTORY_H ++#define _VSERVER_HISTORY_H + + +enum { @@ -11959,28 +10661,15 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/history.h linux-3.7-vs2.3. + +#endif /* CONFIG_VSERVER_HISTORY */ + -+#endif /* _VX_HISTORY_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/inode.h linux-3.7-vs2.3.5.1/include/linux/vserver/inode.h ---- linux-3.7/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/inode.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,39 @@ -+#ifndef _VX_INODE_H -+#define _VX_INODE_H -+ -+ -+#define IATTR_TAG 0x01000000 -+ -+#define IATTR_ADMIN 0x00000001 -+#define IATTR_WATCH 0x00000002 -+#define IATTR_HIDE 0x00000004 -+#define IATTR_FLAGS 0x00000007 -+ -+#define IATTR_BARRIER 0x00010000 -+#define IATTR_IXUNLINK 0x00020000 -+#define IATTR_IMMUTABLE 0x00040000 -+#define IATTR_COW 0x00080000 ++#endif /* _VSERVER_HISTORY_H */ +diff -NurpP --minimal linux-3.18.5/include/linux/vserver/inode.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/inode.h +--- linux-3.18.5/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/inode.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,19 @@ ++#ifndef _VSERVER_INODE_H ++#define _VSERVER_INODE_H + -+#ifdef __KERNEL__ ++#include + + +#ifdef CONFIG_VSERVER_PROC_SECURE @@ -11993,47 +10682,18 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/inode.h linux-3.7-vs2.3.5. + +#define vx_hide_check(c, m) (((m) & IATTR_HIDE) ? vx_check(c, m) : 1) + -+#endif /* __KERNEL__ */ -+ -+/* inode ioctls */ -+ -+#define FIOC_GETXFLG _IOR('x', 5, long) -+#define FIOC_SETXFLG _IOW('x', 6, long) -+ -+#else /* _VX_INODE_H */ ++#else /* _VSERVER_INODE_H */ +#warning duplicate inclusion -+#endif /* _VX_INODE_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/inode_cmd.h linux-3.7-vs2.3.5.1/include/linux/vserver/inode_cmd.h ---- linux-3.7/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/inode_cmd.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,59 @@ -+#ifndef _VX_INODE_CMD_H -+#define _VX_INODE_CMD_H -+ -+ -+/* inode vserver commands */ -+ -+#define VCMD_get_iattr VC_CMD(INODE, 1, 1) -+#define VCMD_set_iattr VC_CMD(INODE, 2, 1) -+ -+#define VCMD_fget_iattr VC_CMD(INODE, 3, 0) -+#define VCMD_fset_iattr VC_CMD(INODE, 4, 0) -+ -+struct vcmd_ctx_iattr_v1 { -+ const char __user *name; -+ uint32_t tag; -+ uint32_t flags; -+ uint32_t mask; -+}; -+ -+struct vcmd_ctx_fiattr_v0 { -+ uint32_t tag; -+ uint32_t flags; -+ uint32_t mask; -+}; ++#endif /* _VSERVER_INODE_H */ +diff -NurpP --minimal linux-3.18.5/include/linux/vserver/inode_cmd.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/inode_cmd.h +--- linux-3.18.5/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/inode_cmd.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,36 @@ ++#ifndef _VSERVER_INODE_CMD_H ++#define _VSERVER_INODE_CMD_H + ++#include + -+#ifdef __KERNEL__ + + +#ifdef CONFIG_COMPAT @@ -12064,26 +10724,16 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/inode_cmd.h linux-3.7-vs2. + +#endif /* CONFIG_COMPAT */ + -+#endif /* __KERNEL__ */ -+#endif /* _VX_INODE_CMD_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/limit.h linux-3.7-vs2.3.5.1/include/linux/vserver/limit.h ---- linux-3.7/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/limit.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,71 @@ -+#ifndef _VX_LIMIT_H -+#define _VX_LIMIT_H -+ -+#define VLIMIT_NSOCK 16 -+#define VLIMIT_OPENFD 17 -+#define VLIMIT_ANON 18 -+#define VLIMIT_SHMEM 19 -+#define VLIMIT_SEMARY 20 -+#define VLIMIT_NSEMS 21 -+#define VLIMIT_DENTRY 22 -+#define VLIMIT_MAPPED 23 ++#endif /* _VSERVER_INODE_CMD_H */ +diff -NurpP --minimal linux-3.18.5/include/linux/vserver/limit.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/limit.h +--- linux-3.18.5/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/limit.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,61 @@ ++#ifndef _VSERVER_LIMIT_H ++#define _VSERVER_LIMIT_H + ++#include + -+#ifdef __KERNEL__ + +#define VLIM_NOCHECK ((1L << VLIMIT_DENTRY) | (1L << RLIMIT_RSS)) + @@ -12139,52 +10789,16 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/limit.h linux-3.7-vs2.3.5. + +#define NUM_LIMITS 24 + -+#endif /* __KERNEL__ */ -+#endif /* _VX_LIMIT_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/limit_cmd.h linux-3.7-vs2.3.5.1/include/linux/vserver/limit_cmd.h ---- linux-3.7/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/limit_cmd.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,71 @@ -+#ifndef _VX_LIMIT_CMD_H -+#define _VX_LIMIT_CMD_H -+ -+ -+/* rlimit vserver commands */ -+ -+#define VCMD_get_rlimit VC_CMD(RLIMIT, 1, 0) -+#define VCMD_set_rlimit VC_CMD(RLIMIT, 2, 0) -+#define VCMD_get_rlimit_mask VC_CMD(RLIMIT, 3, 0) -+#define VCMD_reset_hits VC_CMD(RLIMIT, 7, 0) -+#define VCMD_reset_minmax VC_CMD(RLIMIT, 9, 0) -+ -+struct vcmd_ctx_rlimit_v0 { -+ uint32_t id; -+ uint64_t minimum; -+ uint64_t softlimit; -+ uint64_t maximum; -+}; -+ -+struct vcmd_ctx_rlimit_mask_v0 { -+ uint32_t minimum; -+ uint32_t softlimit; -+ uint32_t maximum; -+}; -+ -+#define VCMD_rlimit_stat VC_CMD(VSTAT, 1, 0) -+ -+struct vcmd_rlimit_stat_v0 { -+ uint32_t id; -+ uint32_t hits; -+ uint64_t value; -+ uint64_t minimum; -+ uint64_t maximum; -+}; ++#endif /* _VSERVER_LIMIT_H */ +diff -NurpP --minimal linux-3.18.5/include/linux/vserver/limit_cmd.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/limit_cmd.h +--- linux-3.18.5/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/limit_cmd.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,35 @@ ++#ifndef _VSERVER_LIMIT_CMD_H ++#define _VSERVER_LIMIT_CMD_H + -+#define CRLIM_UNSET (0ULL) -+#define CRLIM_INFINITY (~0ULL) -+#define CRLIM_KEEP (~1ULL) ++#include + -+#ifdef __KERNEL__ + +#ifdef CONFIG_IA32_EMULATION + @@ -12214,14 +10828,13 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/limit_cmd.h linux-3.7-vs2. + +#endif /* CONFIG_IA32_EMULATION */ + -+#endif /* __KERNEL__ */ -+#endif /* _VX_LIMIT_CMD_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/limit_def.h linux-3.7-vs2.3.5.1/include/linux/vserver/limit_def.h ---- linux-3.7/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/limit_def.h 2012-12-11 15:56:32.000000000 +0000 ++#endif /* _VSERVER_LIMIT_CMD_H */ +diff -NurpP --minimal linux-3.18.5/include/linux/vserver/limit_def.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/limit_def.h +--- linux-3.18.5/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/limit_def.h 2015-01-19 10:58:04.000000000 +0000 @@ -0,0 +1,47 @@ -+#ifndef _VX_LIMIT_DEF_H -+#define _VX_LIMIT_DEF_H ++#ifndef _VSERVER_LIMIT_DEF_H ++#define _VSERVER_LIMIT_DEF_H + +#include +#include @@ -12266,17 +10879,13 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/limit_def.h linux-3.7-vs2. + +#endif + -+#endif /* _VX_LIMIT_DEF_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/limit_int.h linux-3.7-vs2.3.5.1/include/linux/vserver/limit_int.h ---- linux-3.7/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/limit_int.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,198 @@ -+#ifndef _VX_LIMIT_INT_H -+#define _VX_LIMIT_INT_H -+ -+#include "context.h" -+ -+#ifdef __KERNEL__ ++#endif /* _VSERVER_LIMIT_DEF_H */ +diff -NurpP --minimal linux-3.18.5/include/linux/vserver/limit_int.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/limit_int.h +--- linux-3.18.5/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/limit_int.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,193 @@ ++#ifndef _VSERVER_LIMIT_INT_H ++#define _VSERVER_LIMIT_INT_H + +#define VXD_RCRES_COND(r) VXD_CBIT(cres, r) +#define VXD_RLIMIT_COND(r) VXD_CBIT(limit, r) @@ -12467,16181 +11076,13996 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/limit_int.h linux-3.7-vs2. +} + + -+#endif /* __KERNEL__ */ -+#endif /* _VX_LIMIT_INT_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/monitor.h linux-3.7-vs2.3.5.1/include/linux/vserver/monitor.h ---- linux-3.7/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/monitor.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,96 @@ -+#ifndef _VX_MONITOR_H -+#define _VX_MONITOR_H ++#endif /* _VSERVER_LIMIT_INT_H */ +diff -NurpP --minimal linux-3.18.5/include/linux/vserver/monitor.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/monitor.h +--- linux-3.18.5/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/monitor.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,6 @@ ++#ifndef _VSERVER_MONITOR_H ++#define _VSERVER_MONITOR_H + -+#include ++#include + -+enum { -+ VXM_UNUSED = 0, ++#endif /* _VSERVER_MONITOR_H */ +diff -NurpP --minimal linux-3.18.5/include/linux/vserver/network.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/network.h +--- linux-3.18.5/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/network.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,76 @@ ++#ifndef _VSERVER_NETWORK_H ++#define _VSERVER_NETWORK_H + -+ VXM_SYNC = 0x10, + -+ VXM_UPDATE = 0x20, -+ VXM_UPDATE_1, -+ VXM_UPDATE_2, ++#include ++#include ++#include ++#include ++#include ++#include ++#include + -+ VXM_RQINFO_1 = 0x24, -+ VXM_RQINFO_2, ++struct nx_addr_v4 { ++ struct nx_addr_v4 *next; ++ struct in_addr ip[2]; ++ struct in_addr mask; ++ uint16_t type; ++ uint16_t flags; ++}; + -+ VXM_ACTIVATE = 0x40, -+ VXM_DEACTIVATE, -+ VXM_IDLE, ++struct nx_addr_v6 { ++ struct nx_addr_v6 *next; ++ struct in6_addr ip; ++ struct in6_addr mask; ++ uint32_t prefix; ++ uint16_t type; ++ uint16_t flags; ++}; + -+ VXM_HOLD = 0x44, -+ VXM_UNHOLD, ++struct nx_info { ++ struct hlist_node nx_hlist; /* linked list of nxinfos */ ++ vnid_t nx_id; /* vnet id */ ++ atomic_t nx_usecnt; /* usage count */ ++ atomic_t nx_tasks; /* tasks count */ ++ int nx_state; /* context state */ + -+ VXM_MIGRATE = 0x48, -+ VXM_RESCHED, ++ uint64_t nx_flags; /* network flag word */ ++ uint64_t nx_ncaps; /* network capabilities */ + -+ /* all other bits are flags */ -+ VXM_SCHED = 0x80, ++ spinlock_t addr_lock; /* protect address changes */ ++ struct in_addr v4_lback; /* Loopback address */ ++ struct in_addr v4_bcast; /* Broadcast address */ ++ struct nx_addr_v4 v4; /* First/Single ipv4 address */ ++#ifdef CONFIG_IPV6 ++ struct nx_addr_v6 v6; /* First/Single ipv6 address */ ++#endif ++ char nx_name[65]; /* network context name */ +}; + -+struct _vxm_update_1 { -+ uint32_t tokens_max; -+ uint32_t fill_rate; -+ uint32_t interval; -+}; + -+struct _vxm_update_2 { -+ uint32_t tokens_min; -+ uint32_t fill_rate; -+ uint32_t interval; -+}; ++/* status flags */ + -+struct _vxm_rqinfo_1 { -+ uint16_t running; -+ uint16_t onhold; -+ uint16_t iowait; -+ uint16_t uintr; -+ uint32_t idle_tokens; -+}; ++#define NXS_HASHED 0x0001 ++#define NXS_SHUTDOWN 0x0100 ++#define NXS_RELEASED 0x8000 + -+struct _vxm_rqinfo_2 { -+ uint32_t norm_time; -+ uint32_t idle_time; -+ uint32_t idle_skip; -+}; -+ -+struct _vxm_sched { -+ uint32_t tokens; -+ uint32_t norm_time; -+ uint32_t idle_time; -+}; ++extern struct nx_info *lookup_nx_info(int); + -+struct _vxm_task { -+ uint16_t pid; -+ uint16_t state; -+}; ++extern int get_nid_list(int, unsigned int *, int); ++extern int nid_is_hashed(vnid_t); + -+struct _vxm_event { -+ uint32_t jif; -+ union { -+ uint32_t seq; -+ uint32_t sec; -+ }; -+ union { -+ uint32_t tokens; -+ uint32_t nsec; -+ struct _vxm_task tsk; -+ }; -+}; ++extern int nx_migrate_task(struct task_struct *, struct nx_info *); + -+struct _vx_mon_entry { -+ uint16_t type; -+ uint16_t xid; -+ union { -+ struct _vxm_event ev; -+ struct _vxm_sched sd; -+ struct _vxm_update_1 u1; -+ struct _vxm_update_2 u2; -+ struct _vxm_rqinfo_1 q1; -+ struct _vxm_rqinfo_2 q2; -+ }; -+}; ++extern long vs_net_change(struct nx_info *, unsigned int); + ++struct sock; + -+#endif /* _VX_MONITOR_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/network.h linux-3.7-vs2.3.5.1/include/linux/vserver/network.h ---- linux-3.7/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/network.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,148 @@ -+#ifndef _VX_NETWORK_H -+#define _VX_NETWORK_H + -+#include ++#define NX_IPV4(n) ((n)->v4.type != NXA_TYPE_NONE) ++#ifdef CONFIG_IPV6 ++#define NX_IPV6(n) ((n)->v6.type != NXA_TYPE_NONE) ++#else ++#define NX_IPV6(n) (0) ++#endif + ++#endif /* _VSERVER_NETWORK_H */ +diff -NurpP --minimal linux-3.18.5/include/linux/vserver/network_cmd.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/network_cmd.h +--- linux-3.18.5/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/network_cmd.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,37 @@ ++#ifndef _VSERVER_NETWORK_CMD_H ++#define _VSERVER_NETWORK_CMD_H + -+#define MAX_N_CONTEXT 65535 /* Arbitrary limit */ ++#include + ++extern int vc_task_nid(uint32_t); + -+/* network flags */ ++extern int vc_nx_info(struct nx_info *, void __user *); + -+#define NXF_INFO_PRIVATE 0x00000008 ++extern int vc_net_create(uint32_t, void __user *); ++extern int vc_net_migrate(struct nx_info *, void __user *); + -+#define NXF_SINGLE_IP 0x00000100 -+#define NXF_LBACK_REMAP 0x00000200 -+#define NXF_LBACK_ALLOW 0x00000400 ++extern int vc_net_add(struct nx_info *, void __user *); ++extern int vc_net_remove(struct nx_info *, void __user *); + -+#define NXF_HIDE_NETIF 0x02000000 -+#define NXF_HIDE_LBACK 0x04000000 ++extern int vc_net_add_ipv4_v1(struct nx_info *, void __user *); ++extern int vc_net_add_ipv4(struct nx_info *, void __user *); + -+#define NXF_STATE_SETUP (1ULL << 32) -+#define NXF_STATE_ADMIN (1ULL << 34) ++extern int vc_net_rem_ipv4_v1(struct nx_info *, void __user *); ++extern int vc_net_rem_ipv4(struct nx_info *, void __user *); + -+#define NXF_SC_HELPER (1ULL << 36) -+#define NXF_PERSISTENT (1ULL << 38) ++extern int vc_net_add_ipv6(struct nx_info *, void __user *); ++extern int vc_net_remove_ipv6(struct nx_info *, void __user *); + -+#define NXF_ONE_TIME (0x0005ULL << 32) ++extern int vc_add_match_ipv4(struct nx_info *, void __user *); ++extern int vc_get_match_ipv4(struct nx_info *, void __user *); + ++extern int vc_add_match_ipv6(struct nx_info *, void __user *); ++extern int vc_get_match_ipv6(struct nx_info *, void __user *); + -+#define NXF_INIT_SET (__nxf_init_set()) ++extern int vc_get_nflags(struct nx_info *, void __user *); ++extern int vc_set_nflags(struct nx_info *, void __user *); + -+static inline uint64_t __nxf_init_set(void) { -+ return NXF_STATE_ADMIN -+#ifdef CONFIG_VSERVER_AUTO_LBACK -+ | NXF_LBACK_REMAP -+ | NXF_HIDE_LBACK -+#endif -+#ifdef CONFIG_VSERVER_AUTO_SINGLE -+ | NXF_SINGLE_IP -+#endif -+ | NXF_HIDE_NETIF; -+} ++extern int vc_get_ncaps(struct nx_info *, void __user *); ++extern int vc_set_ncaps(struct nx_info *, void __user *); + ++#endif /* _VSERVER_CONTEXT_CMD_H */ +diff -NurpP --minimal linux-3.18.5/include/linux/vserver/percpu.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/percpu.h +--- linux-3.18.5/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/percpu.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,14 @@ ++#ifndef _VSERVER_PERCPU_H ++#define _VSERVER_PERCPU_H + -+/* network caps */ ++#include "cvirt_def.h" ++#include "sched_def.h" + -+#define NXC_TUN_CREATE 0x00000001 ++struct _vx_percpu { ++ struct _vx_cvirt_pc cvirt; ++ struct _vx_sched_pc sched; ++}; + -+#define NXC_RAW_ICMP 0x00000100 ++#define PERCPU_PERCTX (sizeof(struct _vx_percpu)) + -+#define NXC_MULTICAST 0x00001000 ++#endif /* _VSERVER_PERCPU_H */ +diff -NurpP --minimal linux-3.18.5/include/linux/vserver/pid.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/pid.h +--- linux-3.18.5/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/pid.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,51 @@ ++#ifndef _VSERVER_PID_H ++#define _VSERVER_PID_H + ++/* pid faking stuff */ + -+/* address types */ ++#define vx_info_map_pid(v, p) \ ++ __vx_info_map_pid((v), (p), __func__, __FILE__, __LINE__) ++#define vx_info_map_tgid(v,p) vx_info_map_pid(v,p) ++#define vx_map_pid(p) vx_info_map_pid(current_vx_info(), p) ++#define vx_map_tgid(p) vx_map_pid(p) + -+#define NXA_TYPE_IPV4 0x0001 -+#define NXA_TYPE_IPV6 0x0002 ++static inline int __vx_info_map_pid(struct vx_info *vxi, int pid, ++ const char *func, const char *file, int line) ++{ ++ if (vx_info_flags(vxi, VXF_INFO_INIT, 0)) { ++ vxfprintk(VXD_CBIT(cvirt, 2), ++ "vx_map_tgid: %p/%llx: %d -> %d", ++ vxi, (long long)vxi->vx_flags, pid, ++ (pid && pid == vxi->vx_initpid) ? 1 : pid, ++ func, file, line); ++ if (pid == 0) ++ return 0; ++ if (pid == vxi->vx_initpid) ++ return 1; ++ } ++ return pid; ++} + -+#define NXA_TYPE_NONE 0x0000 -+#define NXA_TYPE_ANY 0x00FF ++#define vx_info_rmap_pid(v, p) \ ++ __vx_info_rmap_pid((v), (p), __func__, __FILE__, __LINE__) ++#define vx_rmap_pid(p) vx_info_rmap_pid(current_vx_info(), p) ++#define vx_rmap_tgid(p) vx_rmap_pid(p) + -+#define NXA_TYPE_ADDR 0x0010 -+#define NXA_TYPE_MASK 0x0020 -+#define NXA_TYPE_RANGE 0x0040 ++static inline int __vx_info_rmap_pid(struct vx_info *vxi, int pid, ++ const char *func, const char *file, int line) ++{ ++ if (vx_info_flags(vxi, VXF_INFO_INIT, 0)) { ++ vxfprintk(VXD_CBIT(cvirt, 2), ++ "vx_rmap_tgid: %p/%llx: %d -> %d", ++ vxi, (long long)vxi->vx_flags, pid, ++ (pid == 1) ? vxi->vx_initpid : pid, ++ func, file, line); ++ if ((pid == 1) && vxi->vx_initpid) ++ return vxi->vx_initpid; ++ if (pid == vxi->vx_initpid) ++ return ~0U; ++ } ++ return pid; ++} + -+#define NXA_MASK_ALL (NXA_TYPE_ADDR | NXA_TYPE_MASK | NXA_TYPE_RANGE) ++#endif +diff -NurpP --minimal linux-3.18.5/include/linux/vserver/sched.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/sched.h +--- linux-3.18.5/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/sched.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,23 @@ ++#ifndef _VSERVER_SCHED_H ++#define _VSERVER_SCHED_H + -+#define NXA_MOD_BCAST 0x0100 -+#define NXA_MOD_LBACK 0x0200 + -+#define NXA_LOOPBACK 0x1000 ++#ifdef __KERNEL__ + -+#define NXA_MASK_BIND (NXA_MASK_ALL | NXA_MOD_BCAST | NXA_MOD_LBACK) -+#define NXA_MASK_SHOW (NXA_MASK_ALL | NXA_LOOPBACK) ++struct timespec; + -+#ifdef __KERNEL__ ++void vx_vsi_uptime(struct timespec *, struct timespec *); + -+#include -+#include -+#include -+#include -+#include -+#include + -+struct nx_addr_v4 { -+ struct nx_addr_v4 *next; -+ struct in_addr ip[2]; -+ struct in_addr mask; -+ uint16_t type; -+ uint16_t flags; -+}; ++struct vx_info; + -+struct nx_addr_v6 { -+ struct nx_addr_v6 *next; -+ struct in6_addr ip; -+ struct in6_addr mask; -+ uint32_t prefix; -+ uint16_t type; -+ uint16_t flags; -+}; ++void vx_update_load(struct vx_info *); + -+struct nx_info { -+ struct hlist_node nx_hlist; /* linked list of nxinfos */ -+ nid_t nx_id; /* vnet id */ -+ atomic_t nx_usecnt; /* usage count */ -+ atomic_t nx_tasks; /* tasks count */ -+ int nx_state; /* context state */ + -+ uint64_t nx_flags; /* network flag word */ -+ uint64_t nx_ncaps; /* network capabilities */ ++void vx_update_sched_param(struct _vx_sched *sched, ++ struct _vx_sched_pc *sched_pc); + -+ struct in_addr v4_lback; /* Loopback address */ -+ struct in_addr v4_bcast; /* Broadcast address */ -+ struct nx_addr_v4 v4; /* First/Single ipv4 address */ -+#ifdef CONFIG_IPV6 -+ struct nx_addr_v6 v6; /* First/Single ipv6 address */ -+#endif -+ char nx_name[65]; /* network context name */ -+}; ++#endif /* __KERNEL__ */ ++#else /* _VSERVER_SCHED_H */ ++#warning duplicate inclusion ++#endif /* _VSERVER_SCHED_H */ +diff -NurpP --minimal linux-3.18.5/include/linux/vserver/sched_cmd.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/sched_cmd.h +--- linux-3.18.5/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/sched_cmd.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,11 @@ ++#ifndef _VSERVER_SCHED_CMD_H ++#define _VSERVER_SCHED_CMD_H + + -+/* status flags */ ++#include ++#include + -+#define NXS_HASHED 0x0001 -+#define NXS_SHUTDOWN 0x0100 -+#define NXS_RELEASED 0x8000 ++extern int vc_set_prio_bias(struct vx_info *, void __user *); ++extern int vc_get_prio_bias(struct vx_info *, void __user *); + -+extern struct nx_info *lookup_nx_info(int); ++#endif /* _VSERVER_SCHED_CMD_H */ +diff -NurpP --minimal linux-3.18.5/include/linux/vserver/sched_def.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/sched_def.h +--- linux-3.18.5/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/sched_def.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,38 @@ ++#ifndef _VSERVER_SCHED_DEF_H ++#define _VSERVER_SCHED_DEF_H + -+extern int get_nid_list(int, unsigned int *, int); -+extern int nid_is_hashed(nid_t); ++#include ++#include ++#include ++#include ++#include + -+extern int nx_migrate_task(struct task_struct *, struct nx_info *); + -+extern long vs_net_change(struct nx_info *, unsigned int); ++/* context sub struct */ + -+struct sock; ++struct _vx_sched { ++ int prio_bias; /* bias offset for priority */ + ++ cpumask_t update; /* CPUs which should update */ ++}; + -+#define NX_IPV4(n) ((n)->v4.type != NXA_TYPE_NONE) -+#ifdef CONFIG_IPV6 -+#define NX_IPV6(n) ((n)->v6.type != NXA_TYPE_NONE) -+#else -+#define NX_IPV6(n) (0) -+#endif -+ -+#endif /* __KERNEL__ */ -+#endif /* _VX_NETWORK_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/network_cmd.h linux-3.7-vs2.3.5.1/include/linux/vserver/network_cmd.h ---- linux-3.7/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/network_cmd.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,164 @@ -+#ifndef _VX_NETWORK_CMD_H -+#define _VX_NETWORK_CMD_H ++struct _vx_sched_pc { ++ int prio_bias; /* bias offset for priority */ + ++ uint64_t user_ticks; /* token tick events */ ++ uint64_t sys_ticks; /* token tick events */ ++ uint64_t hold_ticks; /* token ticks paused */ ++}; + -+/* vinfo commands */ + -+#define VCMD_task_nid VC_CMD(VINFO, 2, 0) ++#ifdef CONFIG_VSERVER_DEBUG + -+#ifdef __KERNEL__ -+extern int vc_task_nid(uint32_t); ++static inline void __dump_vx_sched(struct _vx_sched *sched) ++{ ++ printk("\t_vx_sched:\n"); ++ printk("\t priority = %4d\n", sched->prio_bias); ++} + -+#endif /* __KERNEL__ */ ++#endif + -+#define VCMD_nx_info VC_CMD(VINFO, 6, 0) ++#endif /* _VSERVER_SCHED_DEF_H */ +diff -NurpP --minimal linux-3.18.5/include/linux/vserver/signal.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/signal.h +--- linux-3.18.5/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/signal.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,14 @@ ++#ifndef _VSERVER_SIGNAL_H ++#define _VSERVER_SIGNAL_H + -+struct vcmd_nx_info_v0 { -+ uint32_t nid; -+ /* more to come */ -+}; + +#ifdef __KERNEL__ -+extern int vc_nx_info(struct nx_info *, void __user *); + -+#endif /* __KERNEL__ */ ++struct vx_info; + -+#include -+#include ++int vx_info_kill(struct vx_info *, int, int); + -+#define VCMD_net_create_v0 VC_CMD(VNET, 1, 0) -+#define VCMD_net_create VC_CMD(VNET, 1, 1) ++#endif /* __KERNEL__ */ ++#else /* _VSERVER_SIGNAL_H */ ++#warning duplicate inclusion ++#endif /* _VSERVER_SIGNAL_H */ +diff -NurpP --minimal linux-3.18.5/include/linux/vserver/signal_cmd.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/signal_cmd.h +--- linux-3.18.5/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/signal_cmd.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,14 @@ ++#ifndef _VSERVER_SIGNAL_CMD_H ++#define _VSERVER_SIGNAL_CMD_H + -+struct vcmd_net_create { -+ uint64_t flagword; -+}; ++#include + -+#define VCMD_net_migrate VC_CMD(NETMIG, 1, 0) + -+#define VCMD_net_add VC_CMD(NETALT, 1, 0) -+#define VCMD_net_remove VC_CMD(NETALT, 2, 0) ++extern int vc_ctx_kill(struct vx_info *, void __user *); ++extern int vc_wait_exit(struct vx_info *, void __user *); + -+struct vcmd_net_addr_v0 { -+ uint16_t type; -+ uint16_t count; -+ struct in_addr ip[4]; -+ struct in_addr mask[4]; -+}; + -+#define VCMD_net_add_ipv4_v1 VC_CMD(NETALT, 1, 1) -+#define VCMD_net_rem_ipv4_v1 VC_CMD(NETALT, 2, 1) ++extern int vc_get_pflags(uint32_t pid, void __user *); ++extern int vc_set_pflags(uint32_t pid, void __user *); + -+struct vcmd_net_addr_ipv4_v1 { -+ uint16_t type; -+ uint16_t flags; -+ struct in_addr ip; -+ struct in_addr mask; -+}; ++#endif /* _VSERVER_SIGNAL_CMD_H */ +diff -NurpP --minimal linux-3.18.5/include/linux/vserver/space.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/space.h +--- linux-3.18.5/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/space.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,12 @@ ++#ifndef _VSERVER_SPACE_H ++#define _VSERVER_SPACE_H + -+#define VCMD_net_add_ipv4 VC_CMD(NETALT, 1, 2) -+#define VCMD_net_rem_ipv4 VC_CMD(NETALT, 2, 2) ++#include + -+struct vcmd_net_addr_ipv4_v2 { -+ uint16_t type; -+ uint16_t flags; -+ struct in_addr ip; -+ struct in_addr ip2; -+ struct in_addr mask; -+}; ++struct vx_info; + -+#define VCMD_net_add_ipv6 VC_CMD(NETALT, 3, 1) -+#define VCMD_net_remove_ipv6 VC_CMD(NETALT, 4, 1) ++int vx_set_space(struct vx_info *vxi, unsigned long mask, unsigned index); + -+struct vcmd_net_addr_ipv6_v1 { -+ uint16_t type; -+ uint16_t flags; -+ uint32_t prefix; -+ struct in6_addr ip; -+ struct in6_addr mask; -+}; ++#else /* _VSERVER_SPACE_H */ ++#warning duplicate inclusion ++#endif /* _VSERVER_SPACE_H */ +diff -NurpP --minimal linux-3.18.5/include/linux/vserver/space_cmd.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/space_cmd.h +--- linux-3.18.5/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/space_cmd.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,13 @@ ++#ifndef _VSERVER_SPACE_CMD_H ++#define _VSERVER_SPACE_CMD_H + -+#define VCMD_add_match_ipv4 VC_CMD(NETALT, 5, 0) -+#define VCMD_get_match_ipv4 VC_CMD(NETALT, 6, 0) ++#include + -+struct vcmd_match_ipv4_v0 { -+ uint16_t type; -+ uint16_t flags; -+ uint16_t parent; -+ uint16_t prefix; -+ struct in_addr ip; -+ struct in_addr ip2; -+ struct in_addr mask; -+}; + -+#define VCMD_add_match_ipv6 VC_CMD(NETALT, 7, 0) -+#define VCMD_get_match_ipv6 VC_CMD(NETALT, 8, 0) ++extern int vc_enter_space_v1(struct vx_info *, void __user *); ++extern int vc_set_space_v1(struct vx_info *, void __user *); ++extern int vc_enter_space(struct vx_info *, void __user *); ++extern int vc_set_space(struct vx_info *, void __user *); ++extern int vc_get_space_mask(void __user *, int); + -+struct vcmd_match_ipv6_v0 { -+ uint16_t type; -+ uint16_t flags; -+ uint16_t parent; -+ uint16_t prefix; -+ struct in6_addr ip; -+ struct in6_addr ip2; -+ struct in6_addr mask; -+}; ++#endif /* _VSERVER_SPACE_CMD_H */ +diff -NurpP --minimal linux-3.18.5/include/linux/vserver/switch.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/switch.h +--- linux-3.18.5/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/switch.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,8 @@ ++#ifndef _VSERVER_SWITCH_H ++#define _VSERVER_SWITCH_H + + -+#ifdef __KERNEL__ -+extern int vc_net_create(uint32_t, void __user *); -+extern int vc_net_migrate(struct nx_info *, void __user *); ++#include ++#include + -+extern int vc_net_add(struct nx_info *, void __user *); -+extern int vc_net_remove(struct nx_info *, void __user *); ++#endif /* _VSERVER_SWITCH_H */ +diff -NurpP --minimal linux-3.18.5/include/linux/vserver/tag.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/tag.h +--- linux-3.18.5/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/tag.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,160 @@ ++#ifndef _DX_TAG_H ++#define _DX_TAG_H + -+extern int vc_net_add_ipv4_v1(struct nx_info *, void __user *); -+extern int vc_net_add_ipv4(struct nx_info *, void __user *); ++#include ++#include + -+extern int vc_net_rem_ipv4_v1(struct nx_info *, void __user *); -+extern int vc_net_rem_ipv4(struct nx_info *, void __user *); + -+extern int vc_net_add_ipv6(struct nx_info *, void __user *); -+extern int vc_net_remove_ipv6(struct nx_info *, void __user *); ++#define DX_TAG(in) (IS_TAGGED(in)) + -+extern int vc_add_match_ipv4(struct nx_info *, void __user *); -+extern int vc_get_match_ipv4(struct nx_info *, void __user *); + -+extern int vc_add_match_ipv6(struct nx_info *, void __user *); -+extern int vc_get_match_ipv6(struct nx_info *, void __user *); ++#ifdef CONFIG_TAG_NFSD ++#define DX_TAG_NFSD 1 ++#else ++#define DX_TAG_NFSD 0 ++#endif + -+#endif /* __KERNEL__ */ + ++#ifdef CONFIG_TAGGING_NONE + -+/* flag commands */ ++#define MAX_UID 0xFFFFFFFF ++#define MAX_GID 0xFFFFFFFF + -+#define VCMD_get_nflags VC_CMD(FLAGS, 5, 0) -+#define VCMD_set_nflags VC_CMD(FLAGS, 6, 0) ++#define INOTAG_TAG(cond, uid, gid, tag) (0) + -+struct vcmd_net_flags_v0 { -+ uint64_t flagword; -+ uint64_t mask; -+}; ++#define TAGINO_UID(cond, uid, tag) (uid) ++#define TAGINO_GID(cond, gid, tag) (gid) + -+#ifdef __KERNEL__ -+extern int vc_get_nflags(struct nx_info *, void __user *); -+extern int vc_set_nflags(struct nx_info *, void __user *); ++#endif + -+#endif /* __KERNEL__ */ + ++#ifdef CONFIG_TAGGING_GID16 + -+/* network caps commands */ ++#define MAX_UID 0xFFFFFFFF ++#define MAX_GID 0x0000FFFF + -+#define VCMD_get_ncaps VC_CMD(FLAGS, 7, 0) -+#define VCMD_set_ncaps VC_CMD(FLAGS, 8, 0) ++#define INOTAG_TAG(cond, uid, gid, tag) \ ++ ((cond) ? (((gid) >> 16) & 0xFFFF) : 0) + -+struct vcmd_net_caps_v0 { -+ uint64_t ncaps; -+ uint64_t cmask; -+}; ++#define TAGINO_UID(cond, uid, tag) (uid) ++#define TAGINO_GID(cond, gid, tag) \ ++ ((cond) ? (((gid) & 0xFFFF) | ((tag) << 16)) : (gid)) + -+#ifdef __KERNEL__ -+extern int vc_get_ncaps(struct nx_info *, void __user *); -+extern int vc_set_ncaps(struct nx_info *, void __user *); ++#endif + -+#endif /* __KERNEL__ */ -+#endif /* _VX_CONTEXT_CMD_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/percpu.h linux-3.7-vs2.3.5.1/include/linux/vserver/percpu.h ---- linux-3.7/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/percpu.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,14 @@ -+#ifndef _VX_PERCPU_H -+#define _VX_PERCPU_H + -+#include "cvirt_def.h" -+#include "sched_def.h" ++#ifdef CONFIG_TAGGING_ID24 + -+struct _vx_percpu { -+ struct _vx_cvirt_pc cvirt; -+ struct _vx_sched_pc sched; -+}; ++#define MAX_UID 0x00FFFFFF ++#define MAX_GID 0x00FFFFFF + -+#define PERCPU_PERCTX (sizeof(struct _vx_percpu)) ++#define INOTAG_TAG(cond, uid, gid, tag) \ ++ ((cond) ? ((((uid) >> 16) & 0xFF00) | (((gid) >> 24) & 0xFF)) : 0) + -+#endif /* _VX_PERCPU_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/pid.h linux-3.7-vs2.3.5.1/include/linux/vserver/pid.h ---- linux-3.7/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/pid.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,51 @@ -+#ifndef _VSERVER_PID_H -+#define _VSERVER_PID_H ++#define TAGINO_UID(cond, uid, tag) \ ++ ((cond) ? (((uid) & 0xFFFFFF) | (((tag) & 0xFF00) << 16)) : (uid)) ++#define TAGINO_GID(cond, gid, tag) \ ++ ((cond) ? (((gid) & 0xFFFFFF) | (((tag) & 0x00FF) << 24)) : (gid)) + -+/* pid faking stuff */ ++#endif + -+#define vx_info_map_pid(v, p) \ -+ __vx_info_map_pid((v), (p), __func__, __FILE__, __LINE__) -+#define vx_info_map_tgid(v,p) vx_info_map_pid(v,p) -+#define vx_map_pid(p) vx_info_map_pid(current_vx_info(), p) -+#define vx_map_tgid(p) vx_map_pid(p) + -+static inline int __vx_info_map_pid(struct vx_info *vxi, int pid, -+ const char *func, const char *file, int line) -+{ -+ if (vx_info_flags(vxi, VXF_INFO_INIT, 0)) { -+ vxfprintk(VXD_CBIT(cvirt, 2), -+ "vx_map_tgid: %p/%llx: %d -> %d", -+ vxi, (long long)vxi->vx_flags, pid, -+ (pid && pid == vxi->vx_initpid) ? 1 : pid, -+ func, file, line); -+ if (pid == 0) -+ return 0; -+ if (pid == vxi->vx_initpid) -+ return 1; -+ } -+ return pid; -+} ++#ifdef CONFIG_TAGGING_UID16 + -+#define vx_info_rmap_pid(v, p) \ -+ __vx_info_rmap_pid((v), (p), __func__, __FILE__, __LINE__) -+#define vx_rmap_pid(p) vx_info_rmap_pid(current_vx_info(), p) -+#define vx_rmap_tgid(p) vx_rmap_pid(p) ++#define MAX_UID 0x0000FFFF ++#define MAX_GID 0xFFFFFFFF + -+static inline int __vx_info_rmap_pid(struct vx_info *vxi, int pid, -+ const char *func, const char *file, int line) -+{ -+ if (vx_info_flags(vxi, VXF_INFO_INIT, 0)) { -+ vxfprintk(VXD_CBIT(cvirt, 2), -+ "vx_rmap_tgid: %p/%llx: %d -> %d", -+ vxi, (long long)vxi->vx_flags, pid, -+ (pid == 1) ? vxi->vx_initpid : pid, -+ func, file, line); -+ if ((pid == 1) && vxi->vx_initpid) -+ return vxi->vx_initpid; -+ if (pid == vxi->vx_initpid) -+ return ~0U; -+ } -+ return pid; -+} -+ -+#endif -diff -NurpP --minimal linux-3.7/include/linux/vserver/sched.h linux-3.7-vs2.3.5.1/include/linux/vserver/sched.h ---- linux-3.7/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/sched.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,23 @@ -+#ifndef _VX_SCHED_H -+#define _VX_SCHED_H -+ -+ -+#ifdef __KERNEL__ -+ -+struct timespec; -+ -+void vx_vsi_uptime(struct timespec *, struct timespec *); -+ -+ -+struct vx_info; -+ -+void vx_update_load(struct vx_info *); -+ -+ -+void vx_update_sched_param(struct _vx_sched *sched, -+ struct _vx_sched_pc *sched_pc); -+ -+#endif /* __KERNEL__ */ -+#else /* _VX_SCHED_H */ -+#warning duplicate inclusion -+#endif /* _VX_SCHED_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/sched_cmd.h linux-3.7-vs2.3.5.1/include/linux/vserver/sched_cmd.h ---- linux-3.7/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/sched_cmd.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,21 @@ -+#ifndef _VX_SCHED_CMD_H -+#define _VX_SCHED_CMD_H ++#define INOTAG_TAG(cond, uid, gid, tag) \ ++ ((cond) ? (((uid) >> 16) & 0xFFFF) : 0) + ++#define TAGINO_UID(cond, uid, tag) \ ++ ((cond) ? (((uid) & 0xFFFF) | ((tag) << 16)) : (uid)) ++#define TAGINO_GID(cond, gid, tag) (gid) + -+struct vcmd_prio_bias { -+ int32_t cpu_id; -+ int32_t prio_bias; -+}; ++#endif + -+#define VCMD_set_prio_bias VC_CMD(SCHED, 4, 0) -+#define VCMD_get_prio_bias VC_CMD(SCHED, 5, 0) + -+#ifdef __KERNEL__ ++#ifdef CONFIG_TAGGING_INTERN + -+#include ++#define MAX_UID 0xFFFFFFFF ++#define MAX_GID 0xFFFFFFFF + -+extern int vc_set_prio_bias(struct vx_info *, void __user *); -+extern int vc_get_prio_bias(struct vx_info *, void __user *); ++#define INOTAG_TAG(cond, uid, gid, tag) \ ++ ((cond) ? (tag) : 0) + -+#endif /* __KERNEL__ */ -+#endif /* _VX_SCHED_CMD_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/sched_def.h linux-3.7-vs2.3.5.1/include/linux/vserver/sched_def.h ---- linux-3.7/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/sched_def.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,38 @@ -+#ifndef _VX_SCHED_DEF_H -+#define _VX_SCHED_DEF_H ++#define TAGINO_UID(cond, uid, tag) (uid) ++#define TAGINO_GID(cond, gid, tag) (gid) + -+#include -+#include -+#include -+#include -+#include ++#endif + + -+/* context sub struct */ ++#ifndef CONFIG_TAGGING_NONE ++#define dx_current_fstag(sb) \ ++ ((sb)->s_flags & MS_TAGGED ? dx_current_tag() : 0) ++#else ++#define dx_current_fstag(sb) (0) ++#endif + -+struct _vx_sched { -+ int prio_bias; /* bias offset for priority */ ++#ifndef CONFIG_TAGGING_INTERN ++#define TAGINO_TAG(cond, tag) (0) ++#else ++#define TAGINO_TAG(cond, tag) ((cond) ? (tag) : 0) ++#endif + -+ cpumask_t update; /* CPUs which should update */ -+}; ++#define TAGINO_KUID(cond, kuid, ktag) \ ++ KUIDT_INIT(TAGINO_UID(cond, __kuid_val(kuid), __ktag_val(ktag))) ++#define TAGINO_KGID(cond, kgid, ktag) \ ++ KGIDT_INIT(TAGINO_GID(cond, __kgid_val(kgid), __ktag_val(ktag))) ++#define TAGINO_KTAG(cond, ktag) \ ++ KTAGT_INIT(TAGINO_TAG(cond, __ktag_val(ktag))) + -+struct _vx_sched_pc { -+ int prio_bias; /* bias offset for priority */ + -+ uint64_t user_ticks; /* token tick events */ -+ uint64_t sys_ticks; /* token tick events */ -+ uint64_t hold_ticks; /* token ticks paused */ -+}; ++#define INOTAG_UID(cond, uid, gid) \ ++ ((cond) ? ((uid) & MAX_UID) : (uid)) ++#define INOTAG_GID(cond, uid, gid) \ ++ ((cond) ? ((gid) & MAX_GID) : (gid)) + ++#define INOTAG_KUID(cond, kuid, kgid) \ ++ KUIDT_INIT(INOTAG_UID(cond, __kuid_val(kuid), __kgid_val(kgid))) ++#define INOTAG_KGID(cond, kuid, kgid) \ ++ KGIDT_INIT(INOTAG_GID(cond, __kuid_val(kuid), __kgid_val(kgid))) ++#define INOTAG_KTAG(cond, kuid, kgid, ktag) \ ++ KTAGT_INIT(INOTAG_TAG(cond, \ ++ __kuid_val(kuid), __kgid_val(kgid), __ktag_val(ktag))) + -+#ifdef CONFIG_VSERVER_DEBUG + -+static inline void __dump_vx_sched(struct _vx_sched *sched) ++static inline uid_t dx_map_uid(uid_t uid) +{ -+ printk("\t_vx_sched:\n"); -+ printk("\t priority = %4d\n", sched->prio_bias); ++ if ((uid > MAX_UID) && (uid != -1)) ++ uid = -2; ++ return (uid & MAX_UID); +} + -+#endif -+ -+#endif /* _VX_SCHED_DEF_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/signal.h linux-3.7-vs2.3.5.1/include/linux/vserver/signal.h ---- linux-3.7/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/signal.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,14 @@ -+#ifndef _VX_SIGNAL_H -+#define _VX_SIGNAL_H -+ -+ -+#ifdef __KERNEL__ -+ -+struct vx_info; -+ -+int vx_info_kill(struct vx_info *, int, int); ++static inline gid_t dx_map_gid(gid_t gid) ++{ ++ if ((gid > MAX_GID) && (gid != -1)) ++ gid = -2; ++ return (gid & MAX_GID); ++} + -+#endif /* __KERNEL__ */ -+#else /* _VX_SIGNAL_H */ -+#warning duplicate inclusion -+#endif /* _VX_SIGNAL_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/signal_cmd.h linux-3.7-vs2.3.5.1/include/linux/vserver/signal_cmd.h ---- linux-3.7/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/signal_cmd.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,43 @@ -+#ifndef _VX_SIGNAL_CMD_H -+#define _VX_SIGNAL_CMD_H ++struct peer_tag { ++ int32_t xid; ++ int32_t nid; ++}; + ++#define dx_notagcheck(sb) ((sb) && ((sb)->s_flags & MS_NOTAGCHECK)) + -+/* signalling vserver commands */ ++int dx_parse_tag(char *string, vtag_t *tag, int remove, int *mnt_flags, ++ unsigned long *flags); + -+#define VCMD_ctx_kill VC_CMD(PROCTRL, 1, 0) -+#define VCMD_wait_exit VC_CMD(EVENT, 99, 0) ++#ifdef CONFIG_PROPAGATE + -+struct vcmd_ctx_kill_v0 { -+ int32_t pid; -+ int32_t sig; -+}; ++void __dx_propagate_tag(struct nameidata *nd, struct inode *inode); + -+struct vcmd_wait_exit_v0 { -+ int32_t reboot_cmd; -+ int32_t exit_code; -+}; ++#define dx_propagate_tag(n, i) __dx_propagate_tag(n, i) + -+#ifdef __KERNEL__ ++#else ++#define dx_propagate_tag(n, i) do { } while (0) ++#endif + -+extern int vc_ctx_kill(struct vx_info *, void __user *); -+extern int vc_wait_exit(struct vx_info *, void __user *); ++#endif /* _DX_TAG_H */ +diff -NurpP --minimal linux-3.18.5/include/linux/vserver/tag_cmd.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/tag_cmd.h +--- linux-3.18.5/include/linux/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/tag_cmd.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,10 @@ ++#ifndef _VSERVER_TAG_CMD_H ++#define _VSERVER_TAG_CMD_H + -+#endif /* __KERNEL__ */ ++#include + -+/* process alteration commands */ ++extern int vc_task_tag(uint32_t); + -+#define VCMD_get_pflags VC_CMD(PROCALT, 5, 0) -+#define VCMD_set_pflags VC_CMD(PROCALT, 6, 0) ++extern int vc_tag_migrate(uint32_t); + -+struct vcmd_pflags_v0 { -+ uint32_t flagword; -+ uint32_t mask; -+}; ++#endif /* _VSERVER_TAG_CMD_H */ +diff -NurpP --minimal linux-3.18.5/include/net/addrconf.h linux-3.18.5-vs2.3.7.3/include/net/addrconf.h +--- linux-3.18.5/include/net/addrconf.h 2015-01-17 02:40:22.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/net/addrconf.h 2015-01-19 10:58:04.000000000 +0000 +@@ -79,7 +79,7 @@ struct inet6_ifaddr *ipv6_get_ifaddr(str + + int ipv6_dev_get_saddr(struct net *net, const struct net_device *dev, + const struct in6_addr *daddr, unsigned int srcprefs, +- struct in6_addr *saddr); ++ struct in6_addr *saddr, struct nx_info *nxi); + int __ipv6_get_lladdr(struct inet6_dev *idev, struct in6_addr *addr, + u32 banned_flags); + int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr, +diff -NurpP --minimal linux-3.18.5/include/net/af_unix.h linux-3.18.5-vs2.3.7.3/include/net/af_unix.h +--- linux-3.18.5/include/net/af_unix.h 2013-11-25 15:47:02.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/net/af_unix.h 2015-01-19 10:58:04.000000000 +0000 +@@ -4,6 +4,7 @@ + #include + #include + #include ++#include + #include + + void unix_inflight(struct file *fp); +diff -NurpP --minimal linux-3.18.5/include/net/inet_timewait_sock.h linux-3.18.5-vs2.3.7.3/include/net/inet_timewait_sock.h +--- linux-3.18.5/include/net/inet_timewait_sock.h 2015-01-16 22:19:24.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/net/inet_timewait_sock.h 2015-01-19 10:58:04.000000000 +0000 +@@ -122,6 +122,10 @@ struct inet_timewait_sock { + #define tw_v6_rcv_saddr __tw_common.skc_v6_rcv_saddr + #define tw_dport __tw_common.skc_dport + #define tw_num __tw_common.skc_num ++#define tw_xid __tw_common.skc_xid ++#define tw_vx_info __tw_common.skc_vx_info ++#define tw_nid __tw_common.skc_nid ++#define tw_nx_info __tw_common.skc_nx_info + + int tw_timeout; + volatile unsigned char tw_substate; +diff -NurpP --minimal linux-3.18.5/include/net/ip6_route.h linux-3.18.5-vs2.3.7.3/include/net/ip6_route.h +--- linux-3.18.5/include/net/ip6_route.h 2014-09-03 13:19:43.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/net/ip6_route.h 2015-01-19 10:58:04.000000000 +0000 +@@ -80,7 +80,7 @@ int ip6_del_rt(struct rt6_info *); + + int ip6_route_get_saddr(struct net *net, struct rt6_info *rt, + const struct in6_addr *daddr, unsigned int prefs, +- struct in6_addr *saddr); ++ struct in6_addr *saddr, struct nx_info *nxi); + + struct rt6_info *rt6_lookup(struct net *net, const struct in6_addr *daddr, + const struct in6_addr *saddr, int oif, int flags); +diff -NurpP --minimal linux-3.18.5/include/net/route.h linux-3.18.5-vs2.3.7.3/include/net/route.h +--- linux-3.18.5/include/net/route.h 2014-06-12 13:02:51.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/net/route.h 2015-01-19 10:58:04.000000000 +0000 +@@ -205,6 +205,9 @@ static inline void ip_rt_put(struct rtab + dst_release(&rt->dst); + } + ++#include ++#include + -+#ifdef __KERNEL__ + #define IPTOS_RT_MASK (IPTOS_TOS_MASK & ~3) + + extern const __u8 ip_tos2prio[16]; +@@ -252,6 +255,9 @@ static inline void ip_route_connect_init + protocol, flow_flags, dst, src, dport, sport); + } + ++extern struct rtable *ip_v4_find_src(struct net *net, struct nx_info *, ++ struct flowi4 *); + -+extern int vc_get_pflags(uint32_t pid, void __user *); -+extern int vc_set_pflags(uint32_t pid, void __user *); + static inline struct rtable *ip_route_connect(struct flowi4 *fl4, + __be32 dst, __be32 src, u32 tos, + int oif, u8 protocol, +@@ -260,11 +266,25 @@ static inline struct rtable *ip_route_co + { + struct net *net = sock_net(sk); + struct rtable *rt; ++ struct nx_info *nx_info = current_nx_info(); + + ip_route_connect_init(fl4, dst, src, tos, oif, protocol, + sport, dport, sk); + +- if (!dst || !src) { ++ if (sk) ++ nx_info = sk->sk_nx_info; + -+#endif /* __KERNEL__ */ -+#endif /* _VX_SIGNAL_CMD_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/space.h linux-3.7-vs2.3.5.1/include/linux/vserver/space.h ---- linux-3.7/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/space.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,12 @@ -+#ifndef _VX_SPACE_H -+#define _VX_SPACE_H ++ vxdprintk(VXD_CBIT(net, 4), ++ "ip_route_connect(%p) %p,%p;%lx", ++ sk, nx_info, sk->sk_socket, ++ (sk->sk_socket?sk->sk_socket->flags:0)); + -+#include ++ rt = ip_v4_find_src(net, nx_info, fl4); ++ if (IS_ERR(rt)) ++ return rt; ++ ip_rt_put(rt); + -+struct vx_info; ++ if (!fl4->daddr || !fl4->saddr) { + rt = __ip_route_output_key(net, fl4); + if (IS_ERR(rt)) + return rt; +diff -NurpP --minimal linux-3.18.5/include/net/sock.h linux-3.18.5-vs2.3.7.3/include/net/sock.h +--- linux-3.18.5/include/net/sock.h 2015-01-17 02:40:22.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/net/sock.h 2015-01-19 10:58:04.000000000 +0000 +@@ -193,6 +193,10 @@ struct sock_common { + #ifdef CONFIG_NET_NS + struct net *skc_net; + #endif ++ vxid_t skc_xid; ++ struct vx_info *skc_vx_info; ++ vnid_t skc_nid; ++ struct nx_info *skc_nx_info; + + #if IS_ENABLED(CONFIG_IPV6) + struct in6_addr skc_v6_daddr; +@@ -327,7 +331,11 @@ struct sock { + #define sk_prot __sk_common.skc_prot + #define sk_net __sk_common.skc_net + #define sk_v6_daddr __sk_common.skc_v6_daddr +-#define sk_v6_rcv_saddr __sk_common.skc_v6_rcv_saddr ++#define sk_v6_rcv_saddr __sk_common.skc_v6_rcv_saddr ++#define sk_xid __sk_common.skc_xid ++#define sk_vx_info __sk_common.skc_vx_info ++#define sk_nid __sk_common.skc_nid ++#define sk_nx_info __sk_common.skc_nx_info + + socket_lock_t sk_lock; + struct sk_buff_head sk_receive_queue; +diff -NurpP --minimal linux-3.18.5/include/uapi/Kbuild linux-3.18.5-vs2.3.7.3/include/uapi/Kbuild +--- linux-3.18.5/include/uapi/Kbuild 2015-01-17 02:40:22.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/uapi/Kbuild 2015-01-19 10:59:16.000000000 +0000 +@@ -13,3 +13,4 @@ header-y += drm/ + header-y += xen/ + header-y += scsi/ + header-y += misc/ ++header-y += vserver/ +diff -NurpP --minimal linux-3.18.5/include/uapi/linux/capability.h linux-3.18.5-vs2.3.7.3/include/uapi/linux/capability.h +--- linux-3.18.5/include/uapi/linux/capability.h 2014-09-03 13:19:44.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/uapi/linux/capability.h 2015-01-19 10:58:04.000000000 +0000 +@@ -259,6 +259,7 @@ struct vfs_cap_data { + arbitrary SCSI commands */ + /* Allow setting encryption key on loopback filesystem */ + /* Allow setting zone reclaim policy */ ++/* Allow the selection of a security context */ + + #define CAP_SYS_ADMIN 21 + +@@ -354,7 +355,12 @@ struct vfs_cap_data { + + #define CAP_LAST_CAP CAP_AUDIT_READ + +-#define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP) ++/* Allow context manipulations */ ++/* Allow changing context info on files */ + -+int vx_set_space(struct vx_info *vxi, unsigned long mask, unsigned index); ++#define CAP_CONTEXT 63 + -+#else /* _VX_SPACE_H */ -+#warning duplicate inclusion -+#endif /* _VX_SPACE_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/space_cmd.h linux-3.7-vs2.3.5.1/include/linux/vserver/space_cmd.h ---- linux-3.7/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/space_cmd.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,38 @@ -+#ifndef _VX_SPACE_CMD_H -+#define _VX_SPACE_CMD_H ++#define cap_valid(x) ((x) >= 0 && ((x) <= CAP_LAST_CAP || (x) == CAP_CONTEXT)) + + /* + * Bit location of each capability (used by user-space library and kernel) +diff -NurpP --minimal linux-3.18.5/include/uapi/linux/fs.h linux-3.18.5-vs2.3.7.3/include/uapi/linux/fs.h +--- linux-3.18.5/include/uapi/linux/fs.h 2015-01-17 02:40:23.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/uapi/linux/fs.h 2015-01-19 10:58:04.000000000 +0000 +@@ -90,6 +90,9 @@ struct inodes_stat_t { + #define MS_KERNMOUNT (1<<22) /* this is a kern_mount call */ + #define MS_I_VERSION (1<<23) /* Update inode I_version field */ + #define MS_STRICTATIME (1<<24) /* Always perform atime updates */ ++#define MS_TAGGED (1<<8) /* use generic inode tagging */ ++#define MS_NOTAGCHECK (1<<9) /* don't check tags */ ++#define MS_TAGID (1<<25) /* use specific tag for this mount */ + + /* These sb flags are internal to the kernel */ + #define MS_NOSEC (1<<28) +@@ -195,11 +198,14 @@ struct inodes_stat_t { + #define FS_EXTENT_FL 0x00080000 /* Extents */ + #define FS_DIRECTIO_FL 0x00100000 /* Use direct i/o */ + #define FS_NOCOW_FL 0x00800000 /* Do not cow file */ ++#define FS_IXUNLINK_FL 0x08000000 /* Immutable invert on unlink */ + #define FS_RESERVED_FL 0x80000000 /* reserved for ext2 lib */ + +-#define FS_FL_USER_VISIBLE 0x0003DFFF /* User visible flags */ +-#define FS_FL_USER_MODIFIABLE 0x000380FF /* User modifiable flags */ ++#define FS_BARRIER_FL 0x04000000 /* Barrier for chroot() */ ++#define FS_COW_FL 0x20000000 /* Copy on Write marker */ + ++#define FS_FL_USER_VISIBLE 0x0103DFFF /* User visible flags */ ++#define FS_FL_USER_MODIFIABLE 0x010380FF /* User modifiable flags */ + + #define SYNC_FILE_RANGE_WAIT_BEFORE 1 + #define SYNC_FILE_RANGE_WRITE 2 +diff -NurpP --minimal linux-3.18.5/include/uapi/linux/gfs2_ondisk.h linux-3.18.5-vs2.3.7.3/include/uapi/linux/gfs2_ondisk.h +--- linux-3.18.5/include/uapi/linux/gfs2_ondisk.h 2014-09-03 13:19:44.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/uapi/linux/gfs2_ondisk.h 2015-01-19 10:58:04.000000000 +0000 +@@ -225,6 +225,9 @@ enum { + gfs2fl_Sync = 8, + gfs2fl_System = 9, + gfs2fl_TopLevel = 10, ++ gfs2fl_IXUnlink = 16, ++ gfs2fl_Barrier = 17, ++ gfs2fl_Cow = 18, + gfs2fl_TruncInProg = 29, + gfs2fl_InheritDirectio = 30, + gfs2fl_InheritJdata = 31, +@@ -242,6 +245,9 @@ enum { + #define GFS2_DIF_SYNC 0x00000100 + #define GFS2_DIF_SYSTEM 0x00000200 /* New in gfs2 */ + #define GFS2_DIF_TOPDIR 0x00000400 /* New in gfs2 */ ++#define GFS2_DIF_IXUNLINK 0x00010000 ++#define GFS2_DIF_BARRIER 0x00020000 ++#define GFS2_DIF_COW 0x00040000 + #define GFS2_DIF_TRUNC_IN_PROG 0x20000000 /* New in gfs2 */ + #define GFS2_DIF_INHERIT_DIRECTIO 0x40000000 /* only in gfs1 */ + #define GFS2_DIF_INHERIT_JDATA 0x80000000 +diff -NurpP --minimal linux-3.18.5/include/uapi/linux/if_tun.h linux-3.18.5-vs2.3.7.3/include/uapi/linux/if_tun.h +--- linux-3.18.5/include/uapi/linux/if_tun.h 2013-11-25 15:47:02.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/uapi/linux/if_tun.h 2015-01-19 10:58:04.000000000 +0000 +@@ -58,6 +58,7 @@ + #define TUNSETQUEUE _IOW('T', 217, int) + #define TUNSETIFINDEX _IOW('T', 218, unsigned int) + #define TUNGETFILTER _IOR('T', 219, struct sock_fprog) ++#define TUNSETNID _IOW('T', 220, int) + + /* TUNSETIFF ifr flags */ + #define IFF_TUN 0x0001 +diff -NurpP --minimal linux-3.18.5/include/uapi/linux/major.h linux-3.18.5-vs2.3.7.3/include/uapi/linux/major.h +--- linux-3.18.5/include/uapi/linux/major.h 2014-01-22 20:39:12.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/uapi/linux/major.h 2015-01-19 10:58:04.000000000 +0000 +@@ -15,6 +15,7 @@ + #define HD_MAJOR IDE0_MAJOR + #define PTY_SLAVE_MAJOR 3 + #define TTY_MAJOR 4 ++#define VROOT_MAJOR 4 + #define TTYAUX_MAJOR 5 + #define LP_MAJOR 6 + #define VCS_MAJOR 7 +diff -NurpP --minimal linux-3.18.5/include/uapi/linux/nfs_mount.h linux-3.18.5-vs2.3.7.3/include/uapi/linux/nfs_mount.h +--- linux-3.18.5/include/uapi/linux/nfs_mount.h 2014-01-22 20:39:12.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/uapi/linux/nfs_mount.h 2015-01-19 10:58:04.000000000 +0000 +@@ -63,7 +63,8 @@ struct nfs_mount_data { + #define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 non-text parsed mount data only */ + #define NFS_MOUNT_NORDIRPLUS 0x4000 /* 5 */ + #define NFS_MOUNT_UNSHARED 0x8000 /* 5 */ +-#define NFS_MOUNT_FLAGMASK 0xFFFF ++#define NFS_MOUNT_TAGGED 0x10000 /* context tagging */ ++#define NFS_MOUNT_FLAGMASK 0x1FFFF + + /* The following are for internal use only */ + #define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000 +diff -NurpP --minimal linux-3.18.5/include/uapi/linux/reboot.h linux-3.18.5-vs2.3.7.3/include/uapi/linux/reboot.h +--- linux-3.18.5/include/uapi/linux/reboot.h 2012-12-11 03:30:57.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/uapi/linux/reboot.h 2015-01-19 10:58:04.000000000 +0000 +@@ -33,7 +33,7 @@ + #define LINUX_REBOOT_CMD_RESTART2 0xA1B2C3D4 + #define LINUX_REBOOT_CMD_SW_SUSPEND 0xD000FCE2 + #define LINUX_REBOOT_CMD_KEXEC 0x45584543 +- ++#define LINUX_REBOOT_CMD_OOM 0xDEADBEEF + + + #endif /* _UAPI_LINUX_REBOOT_H */ +diff -NurpP --minimal linux-3.18.5/include/uapi/linux/sysctl.h linux-3.18.5-vs2.3.7.3/include/uapi/linux/sysctl.h +--- linux-3.18.5/include/uapi/linux/sysctl.h 2015-01-16 22:19:26.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/uapi/linux/sysctl.h 2015-01-19 10:58:04.000000000 +0000 +@@ -60,6 +60,7 @@ enum + CTL_ABI=9, /* Binary emulation */ + CTL_CPU=10, /* CPU stuff (speed scaling, etc) */ + CTL_ARLAN=254, /* arlan wireless driver */ ++ CTL_VSERVER=4242, /* Linux-VServer debug */ + CTL_S390DBF=5677, /* s390 debug */ + CTL_SUNRPC=7249, /* sunrpc debug */ + CTL_PM=9899, /* frv power management */ +@@ -94,6 +95,7 @@ enum + + KERN_PANIC=15, /* int: panic timeout */ + KERN_REALROOTDEV=16, /* real root device to mount after initrd */ ++ KERN_VSHELPER=17, /* string: path to vshelper policy agent */ + + KERN_SPARC_REBOOT=21, /* reboot command on Sparc */ + KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */ +diff -NurpP --minimal linux-3.18.5/include/uapi/vserver/Kbuild linux-3.18.5-vs2.3.7.3/include/uapi/vserver/Kbuild +--- linux-3.18.5/include/uapi/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/uapi/vserver/Kbuild 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,9 @@ + ++header-y += context_cmd.h network_cmd.h space_cmd.h \ ++ cacct_cmd.h cvirt_cmd.h limit_cmd.h dlimit_cmd.h \ ++ inode_cmd.h tag_cmd.h sched_cmd.h signal_cmd.h \ ++ debug_cmd.h device_cmd.h + -+#define VCMD_enter_space_v0 VC_CMD(PROCALT, 1, 0) -+#define VCMD_enter_space_v1 VC_CMD(PROCALT, 1, 1) -+#define VCMD_enter_space VC_CMD(PROCALT, 1, 2) ++header-y += switch.h context.h network.h monitor.h \ ++ limit.h inode.h device.h + -+#define VCMD_set_space_v0 VC_CMD(PROCALT, 3, 0) -+#define VCMD_set_space_v1 VC_CMD(PROCALT, 3, 1) -+#define VCMD_set_space VC_CMD(PROCALT, 3, 2) +diff -NurpP --minimal linux-3.18.5/include/uapi/vserver/cacct_cmd.h linux-3.18.5-vs2.3.7.3/include/uapi/vserver/cacct_cmd.h +--- linux-3.18.5/include/uapi/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/uapi/vserver/cacct_cmd.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,15 @@ ++#ifndef _UAPI_VS_CACCT_CMD_H ++#define _UAPI_VS_CACCT_CMD_H + -+#define VCMD_get_space_mask_v0 VC_CMD(PROCALT, 4, 0) + -+#define VCMD_get_space_mask VC_CMD(VSPACE, 0, 1) -+#define VCMD_get_space_default VC_CMD(VSPACE, 1, 0) ++/* virtual host info name commands */ + ++#define VCMD_sock_stat VC_CMD(VSTAT, 5, 0) + -+struct vcmd_space_mask_v1 { -+ uint64_t mask; ++struct vcmd_sock_stat_v0 { ++ uint32_t field; ++ uint32_t count[3]; ++ uint64_t total[3]; +}; + -+struct vcmd_space_mask_v2 { -+ uint64_t mask; -+ uint32_t index; -+}; ++#endif /* _UAPI_VS_CACCT_CMD_H */ +diff -NurpP --minimal linux-3.18.5/include/uapi/vserver/context.h linux-3.18.5-vs2.3.7.3/include/uapi/vserver/context.h +--- linux-3.18.5/include/uapi/vserver/context.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/uapi/vserver/context.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,81 @@ ++#ifndef _UAPI_VS_CONTEXT_H ++#define _UAPI_VS_CONTEXT_H + ++#include ++#include + -+#ifdef __KERNEL__ + -+extern int vc_enter_space_v1(struct vx_info *, void __user *); -+extern int vc_set_space_v1(struct vx_info *, void __user *); -+extern int vc_enter_space(struct vx_info *, void __user *); -+extern int vc_set_space(struct vx_info *, void __user *); -+extern int vc_get_space_mask(void __user *, int); ++/* context flags */ + -+#endif /* __KERNEL__ */ -+#endif /* _VX_SPACE_CMD_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/switch.h linux-3.7-vs2.3.5.1/include/linux/vserver/switch.h ---- linux-3.7/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/switch.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,98 @@ -+#ifndef _VX_SWITCH_H -+#define _VX_SWITCH_H ++#define VXF_INFO_SCHED 0x00000002 ++#define VXF_INFO_NPROC 0x00000004 ++#define VXF_INFO_PRIVATE 0x00000008 + -+#include ++#define VXF_INFO_INIT 0x00000010 ++#define VXF_INFO_HIDE 0x00000020 ++#define VXF_INFO_ULIMIT 0x00000040 ++#define VXF_INFO_NSPACE 0x00000080 + ++#define VXF_SCHED_HARD 0x00000100 ++#define VXF_SCHED_PRIO 0x00000200 ++#define VXF_SCHED_PAUSE 0x00000400 + -+#define VC_CATEGORY(c) (((c) >> 24) & 0x3F) -+#define VC_COMMAND(c) (((c) >> 16) & 0xFF) -+#define VC_VERSION(c) ((c) & 0xFFF) ++#define VXF_VIRT_MEM 0x00010000 ++#define VXF_VIRT_UPTIME 0x00020000 ++#define VXF_VIRT_CPU 0x00040000 ++#define VXF_VIRT_LOAD 0x00080000 ++#define VXF_VIRT_TIME 0x00100000 + -+#define VC_CMD(c, i, v) ((((VC_CAT_ ## c) & 0x3F) << 24) \ -+ | (((i) & 0xFF) << 16) | ((v) & 0xFFF)) ++#define VXF_HIDE_MOUNT 0x01000000 ++/* was VXF_HIDE_NETIF 0x02000000 */ ++#define VXF_HIDE_VINFO 0x04000000 + -+/* ++#define VXF_STATE_SETUP (1ULL << 32) ++#define VXF_STATE_INIT (1ULL << 33) ++#define VXF_STATE_ADMIN (1ULL << 34) + -+ Syscall Matrix V2.8 ++#define VXF_SC_HELPER (1ULL << 36) ++#define VXF_REBOOT_KILL (1ULL << 37) ++#define VXF_PERSISTENT (1ULL << 38) + -+ |VERSION|CREATE |MODIFY |MIGRATE|CONTROL|EXPERIM| |SPECIAL|SPECIAL| -+ |STATS |DESTROY|ALTER |CHANGE |LIMIT |TEST | | | | -+ |INFO |SETUP | |MOVE | | | | | | -+ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ -+ SYSTEM |VERSION|VSETUP |VHOST | | | | |DEVICE | | -+ HOST | 00| 01| 02| 03| 04| 05| | 06| 07| -+ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ -+ CPU | |VPROC |PROCALT|PROCMIG|PROCTRL| | |SCHED. | | -+ PROCESS| 08| 09| 10| 11| 12| 13| | 14| 15| -+ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ -+ MEMORY | | | | |MEMCTRL| | |SWAP | | -+ | 16| 17| 18| 19| 20| 21| | 22| 23| -+ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ -+ NETWORK| |VNET |NETALT |NETMIG |NETCTL | | |SERIAL | | -+ | 24| 25| 26| 27| 28| 29| | 30| 31| -+ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ -+ DISK | | | |TAGMIG |DLIMIT | | |INODE | | -+ VFS | 32| 33| 34| 35| 36| 37| | 38| 39| -+ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ -+ OTHER |VSTAT | | | | | | |VINFO | | -+ | 40| 41| 42| 43| 44| 45| | 46| 47| -+ =======+=======+=======+=======+=======+=======+=======+ +=======+=======+ -+ SPECIAL|EVENT | | | |FLAGS | | |VSPACE | | -+ | 48| 49| 50| 51| 52| 53| | 54| 55| -+ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ -+ SPECIAL|DEBUG | | | |RLIMIT |SYSCALL| | |COMPAT | -+ | 56| 57| 58| 59| 60|TEST 61| | 62| 63| -+ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ ++#define VXF_FORK_RSS (1ULL << 48) ++#define VXF_PROLIFIC (1ULL << 49) + -+*/ ++#define VXF_IGNEG_NICE (1ULL << 52) + -+#define VC_CAT_VERSION 0 ++#define VXF_ONE_TIME (0x0007ULL << 32) + -+#define VC_CAT_VSETUP 1 -+#define VC_CAT_VHOST 2 ++#define VXF_INIT_SET (VXF_STATE_SETUP | VXF_STATE_INIT | VXF_STATE_ADMIN) + -+#define VC_CAT_DEVICE 6 + -+#define VC_CAT_VPROC 9 -+#define VC_CAT_PROCALT 10 -+#define VC_CAT_PROCMIG 11 -+#define VC_CAT_PROCTRL 12 ++/* context migration */ + -+#define VC_CAT_SCHED 14 -+#define VC_CAT_MEMCTRL 20 ++#define VXM_SET_INIT 0x00000001 ++#define VXM_SET_REAPER 0x00000002 + -+#define VC_CAT_VNET 25 -+#define VC_CAT_NETALT 26 -+#define VC_CAT_NETMIG 27 -+#define VC_CAT_NETCTRL 28 ++/* context caps */ + -+#define VC_CAT_TAGMIG 35 -+#define VC_CAT_DLIMIT 36 -+#define VC_CAT_INODE 38 ++#define VXC_SET_UTSNAME 0x00000001 ++#define VXC_SET_RLIMIT 0x00000002 ++#define VXC_FS_SECURITY 0x00000004 ++#define VXC_FS_TRUSTED 0x00000008 ++#define VXC_TIOCSTI 0x00000010 + -+#define VC_CAT_VSTAT 40 -+#define VC_CAT_VINFO 46 -+#define VC_CAT_EVENT 48 ++/* was VXC_RAW_ICMP 0x00000100 */ ++#define VXC_SYSLOG 0x00001000 ++#define VXC_OOM_ADJUST 0x00002000 ++#define VXC_AUDIT_CONTROL 0x00004000 + -+#define VC_CAT_FLAGS 52 -+#define VC_CAT_VSPACE 54 -+#define VC_CAT_DEBUG 56 -+#define VC_CAT_RLIMIT 60 ++#define VXC_SECURE_MOUNT 0x00010000 ++/* #define VXC_SECURE_REMOUNT 0x00020000 */ ++#define VXC_BINARY_MOUNT 0x00040000 ++#define VXC_DEV_MOUNT 0x00080000 + -+#define VC_CAT_SYSTEST 61 -+#define VC_CAT_COMPAT 63 ++#define VXC_QUOTA_CTL 0x00100000 ++#define VXC_ADMIN_MAPPER 0x00200000 ++#define VXC_ADMIN_CLOOP 0x00400000 + -+/* query version */ ++#define VXC_KTHREAD 0x01000000 ++#define VXC_NAMESPACE 0x02000000 + -+#define VCMD_get_version VC_CMD(VERSION, 0, 0) -+#define VCMD_get_vci VC_CMD(VERSION, 1, 0) ++#endif /* _UAPI_VS_CONTEXT_H */ +diff -NurpP --minimal linux-3.18.5/include/uapi/vserver/context_cmd.h linux-3.18.5-vs2.3.7.3/include/uapi/vserver/context_cmd.h +--- linux-3.18.5/include/uapi/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/uapi/vserver/context_cmd.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,115 @@ ++#ifndef _UAPI_VS_CONTEXT_CMD_H ++#define _UAPI_VS_CONTEXT_CMD_H + + -+#ifdef __KERNEL__ ++/* vinfo commands */ + -+#include ++#define VCMD_task_xid VC_CMD(VINFO, 1, 0) + -+#endif /* __KERNEL__ */ + -+#endif /* _VX_SWITCH_H */ ++#define VCMD_vx_info VC_CMD(VINFO, 5, 0) + -diff -NurpP --minimal linux-3.7/include/linux/vserver/tag.h linux-3.7-vs2.3.5.1/include/linux/vserver/tag.h ---- linux-3.7/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/tag.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,143 @@ -+#ifndef _DX_TAG_H -+#define _DX_TAG_H ++struct vcmd_vx_info_v0 { ++ uint32_t xid; ++ uint32_t initpid; ++ /* more to come */ ++}; + -+#include + ++#define VCMD_ctx_stat VC_CMD(VSTAT, 0, 0) + -+#define DX_TAG(in) (IS_TAGGED(in)) ++struct vcmd_ctx_stat_v0 { ++ uint32_t usecnt; ++ uint32_t tasks; ++ /* more to come */ ++}; + + -+#ifdef CONFIG_TAG_NFSD -+#define DX_TAG_NFSD 1 -+#else -+#define DX_TAG_NFSD 0 -+#endif ++/* context commands */ + ++#define VCMD_ctx_create_v0 VC_CMD(VPROC, 1, 0) ++#define VCMD_ctx_create VC_CMD(VPROC, 1, 1) + -+#ifdef CONFIG_TAGGING_NONE ++struct vcmd_ctx_create { ++ uint64_t flagword; ++}; + -+#define MAX_UID 0xFFFFFFFF -+#define MAX_GID 0xFFFFFFFF ++#define VCMD_ctx_migrate_v0 VC_CMD(PROCMIG, 1, 0) ++#define VCMD_ctx_migrate VC_CMD(PROCMIG, 1, 1) + -+#define INOTAG_TAG(cond, uid, gid, tag) (0) ++struct vcmd_ctx_migrate { ++ uint64_t flagword; ++}; + -+#define TAGINO_UID(cond, uid, tag) (uid) -+#define TAGINO_GID(cond, gid, tag) (gid) + -+#endif + ++/* flag commands */ + -+#ifdef CONFIG_TAGGING_GID16 ++#define VCMD_get_cflags VC_CMD(FLAGS, 1, 0) ++#define VCMD_set_cflags VC_CMD(FLAGS, 2, 0) + -+#define MAX_UID 0xFFFFFFFF -+#define MAX_GID 0x0000FFFF ++struct vcmd_ctx_flags_v0 { ++ uint64_t flagword; ++ uint64_t mask; ++}; + -+#define INOTAG_TAG(cond, uid, gid, tag) \ -+ ((cond) ? (((gid) >> 16) & 0xFFFF) : 0) + -+#define TAGINO_UID(cond, uid, tag) (uid) -+#define TAGINO_GID(cond, gid, tag) \ -+ ((cond) ? (((gid) & 0xFFFF) | ((tag) << 16)) : (gid)) + -+#endif ++/* context caps commands */ + ++#define VCMD_get_ccaps VC_CMD(FLAGS, 3, 1) ++#define VCMD_set_ccaps VC_CMD(FLAGS, 4, 1) + -+#ifdef CONFIG_TAGGING_ID24 ++struct vcmd_ctx_caps_v1 { ++ uint64_t ccaps; ++ uint64_t cmask; ++}; + -+#define MAX_UID 0x00FFFFFF -+#define MAX_GID 0x00FFFFFF + -+#define INOTAG_TAG(cond, uid, gid, tag) \ -+ ((cond) ? ((((uid) >> 16) & 0xFF00) | (((gid) >> 24) & 0xFF)) : 0) + -+#define TAGINO_UID(cond, uid, tag) \ -+ ((cond) ? (((uid) & 0xFFFFFF) | (((tag) & 0xFF00) << 16)) : (uid)) -+#define TAGINO_GID(cond, gid, tag) \ -+ ((cond) ? (((gid) & 0xFFFFFF) | (((tag) & 0x00FF) << 24)) : (gid)) ++/* bcaps commands */ + -+#endif ++#define VCMD_get_bcaps VC_CMD(FLAGS, 9, 0) ++#define VCMD_set_bcaps VC_CMD(FLAGS, 10, 0) + ++struct vcmd_bcaps { ++ uint64_t bcaps; ++ uint64_t bmask; ++}; + -+#ifdef CONFIG_TAGGING_UID16 + -+#define MAX_UID 0x0000FFFF -+#define MAX_GID 0xFFFFFFFF + -+#define INOTAG_TAG(cond, uid, gid, tag) \ -+ ((cond) ? (((uid) >> 16) & 0xFFFF) : 0) ++/* umask commands */ + -+#define TAGINO_UID(cond, uid, tag) \ -+ ((cond) ? (((uid) & 0xFFFF) | ((tag) << 16)) : (uid)) -+#define TAGINO_GID(cond, gid, tag) (gid) ++#define VCMD_get_umask VC_CMD(FLAGS, 13, 0) ++#define VCMD_set_umask VC_CMD(FLAGS, 14, 0) + -+#endif ++struct vcmd_umask { ++ uint64_t umask; ++ uint64_t mask; ++}; + + -+#ifdef CONFIG_TAGGING_INTERN + -+#define MAX_UID 0xFFFFFFFF -+#define MAX_GID 0xFFFFFFFF ++/* wmask commands */ + -+#define INOTAG_TAG(cond, uid, gid, tag) \ -+ ((cond) ? (tag) : 0) ++#define VCMD_get_wmask VC_CMD(FLAGS, 15, 0) ++#define VCMD_set_wmask VC_CMD(FLAGS, 16, 0) + -+#define TAGINO_UID(cond, uid, tag) (uid) -+#define TAGINO_GID(cond, gid, tag) (gid) ++struct vcmd_wmask { ++ uint64_t wmask; ++ uint64_t mask; ++}; + -+#endif + + -+#ifndef CONFIG_TAGGING_NONE -+#define dx_current_fstag(sb) \ -+ ((sb)->s_flags & MS_TAGGED ? dx_current_tag() : 0) -+#else -+#define dx_current_fstag(sb) (0) -+#endif ++/* OOM badness */ + -+#ifndef CONFIG_TAGGING_INTERN -+#define TAGINO_TAG(cond, tag) (0) -+#else -+#define TAGINO_TAG(cond, tag) ((cond) ? (tag) : 0) -+#endif ++#define VCMD_get_badness VC_CMD(MEMCTRL, 5, 0) ++#define VCMD_set_badness VC_CMD(MEMCTRL, 6, 0) + -+#define INOTAG_UID(cond, uid, gid) \ -+ ((cond) ? ((uid) & MAX_UID) : (uid)) -+#define INOTAG_GID(cond, uid, gid) \ -+ ((cond) ? ((gid) & MAX_GID) : (gid)) ++struct vcmd_badness_v0 { ++ int64_t bias; ++}; + ++#endif /* _UAPI_VS_CONTEXT_CMD_H */ +diff -NurpP --minimal linux-3.18.5/include/uapi/vserver/cvirt_cmd.h linux-3.18.5-vs2.3.7.3/include/uapi/vserver/cvirt_cmd.h +--- linux-3.18.5/include/uapi/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/uapi/vserver/cvirt_cmd.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,41 @@ ++#ifndef _UAPI_VS_CVIRT_CMD_H ++#define _UAPI_VS_CVIRT_CMD_H + -+static inline uid_t dx_map_uid(uid_t uid) -+{ -+ if ((uid > MAX_UID) && (uid != -1)) -+ uid = -2; -+ return (uid & MAX_UID); -+} + -+static inline gid_t dx_map_gid(gid_t gid) -+{ -+ if ((gid > MAX_GID) && (gid != -1)) -+ gid = -2; -+ return (gid & MAX_GID); -+} ++/* virtual host info name commands */ + -+struct peer_tag { -+ int32_t xid; -+ int32_t nid; ++#define VCMD_set_vhi_name VC_CMD(VHOST, 1, 0) ++#define VCMD_get_vhi_name VC_CMD(VHOST, 2, 0) ++ ++struct vcmd_vhi_name_v0 { ++ uint32_t field; ++ char name[65]; +}; + -+#define dx_notagcheck(sb) ((sb) && ((sb)->s_flags & MS_NOTAGCHECK)) + -+int dx_parse_tag(char *string, tag_t *tag, int remove, int *mnt_flags, -+ unsigned long *flags); ++enum vhi_name_field { ++ VHIN_CONTEXT = 0, ++ VHIN_SYSNAME, ++ VHIN_NODENAME, ++ VHIN_RELEASE, ++ VHIN_VERSION, ++ VHIN_MACHINE, ++ VHIN_DOMAINNAME, ++}; + -+#ifdef CONFIG_PROPAGATE + -+void __dx_propagate_tag(struct nameidata *nd, struct inode *inode); + -+#define dx_propagate_tag(n, i) __dx_propagate_tag(n, i) ++#define VCMD_virt_stat VC_CMD(VSTAT, 3, 0) + -+#else -+#define dx_propagate_tag(n, i) do { } while (0) -+#endif ++struct vcmd_virt_stat_v0 { ++ uint64_t offset; ++ uint64_t uptime; ++ uint32_t nr_threads; ++ uint32_t nr_running; ++ uint32_t nr_uninterruptible; ++ uint32_t nr_onhold; ++ uint32_t nr_forks; ++ uint32_t load[3]; ++}; + -+#endif /* _DX_TAG_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/tag_cmd.h linux-3.7-vs2.3.5.1/include/linux/vserver/tag_cmd.h ---- linux-3.7/include/linux/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/tag_cmd.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,22 @@ -+#ifndef _VX_TAG_CMD_H -+#define _VX_TAG_CMD_H ++#endif /* _UAPI_VS_CVIRT_CMD_H */ +diff -NurpP --minimal linux-3.18.5/include/uapi/vserver/debug_cmd.h linux-3.18.5-vs2.3.7.3/include/uapi/vserver/debug_cmd.h +--- linux-3.18.5/include/uapi/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/uapi/vserver/debug_cmd.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,24 @@ ++#ifndef _UAPI_VS_DEBUG_CMD_H ++#define _UAPI_VS_DEBUG_CMD_H + + -+/* vinfo commands */ ++/* debug commands */ + -+#define VCMD_task_tag VC_CMD(VINFO, 3, 0) ++#define VCMD_dump_history VC_CMD(DEBUG, 1, 0) + -+#ifdef __KERNEL__ -+extern int vc_task_tag(uint32_t); ++#define VCMD_read_history VC_CMD(DEBUG, 5, 0) ++#define VCMD_read_monitor VC_CMD(DEBUG, 6, 0) + -+#endif /* __KERNEL__ */ ++struct vcmd_read_history_v0 { ++ uint32_t index; ++ uint32_t count; ++ char __user *data; ++}; + -+/* context commands */ ++struct vcmd_read_monitor_v0 { ++ uint32_t index; ++ uint32_t count; ++ char __user *data; ++}; + -+#define VCMD_tag_migrate VC_CMD(TAGMIG, 1, 0) ++#endif /* _UAPI_VS_DEBUG_CMD_H */ +diff -NurpP --minimal linux-3.18.5/include/uapi/vserver/device.h linux-3.18.5-vs2.3.7.3/include/uapi/vserver/device.h +--- linux-3.18.5/include/uapi/vserver/device.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/uapi/vserver/device.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,12 @@ ++#ifndef _UAPI_VS_DEVICE_H ++#define _UAPI_VS_DEVICE_H + -+#ifdef __KERNEL__ -+extern int vc_tag_migrate(uint32_t); + -+#endif /* __KERNEL__ */ -+#endif /* _VX_TAG_CMD_H */ -diff -NurpP --minimal linux-3.7/include/net/addrconf.h linux-3.7-vs2.3.5.1/include/net/addrconf.h ---- linux-3.7/include/net/addrconf.h 2012-12-11 15:47:46.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/net/addrconf.h 2012-12-11 15:56:32.000000000 +0000 -@@ -81,7 +81,8 @@ extern int ipv6_dev_get_saddr(struct n - const struct net_device *dev, - const struct in6_addr *daddr, - unsigned int srcprefs, -- struct in6_addr *saddr); -+ struct in6_addr *saddr, -+ struct nx_info *nxi); - extern int ipv6_get_lladdr(struct net_device *dev, - struct in6_addr *addr, - unsigned char banned_flags); -diff -NurpP --minimal linux-3.7/include/net/af_unix.h linux-3.7-vs2.3.5.1/include/net/af_unix.h ---- linux-3.7/include/net/af_unix.h 2012-10-04 13:27:47.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/net/af_unix.h 2012-12-11 15:56:32.000000000 +0000 -@@ -4,6 +4,7 @@ - #include - #include - #include -+#include - #include - - extern void unix_inflight(struct file *fp); -diff -NurpP --minimal linux-3.7/include/net/inet_timewait_sock.h linux-3.7-vs2.3.5.1/include/net/inet_timewait_sock.h ---- linux-3.7/include/net/inet_timewait_sock.h 2012-03-19 18:47:29.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/net/inet_timewait_sock.h 2012-12-11 15:56:32.000000000 +0000 -@@ -112,6 +112,10 @@ struct inet_timewait_sock { - #define tw_net __tw_common.skc_net - #define tw_daddr __tw_common.skc_daddr - #define tw_rcv_saddr __tw_common.skc_rcv_saddr -+#define tw_xid __tw_common.skc_xid -+#define tw_vx_info __tw_common.skc_vx_info -+#define tw_nid __tw_common.skc_nid -+#define tw_nx_info __tw_common.skc_nx_info - int tw_timeout; - volatile unsigned char tw_substate; - unsigned char tw_rcv_wscale; -diff -NurpP --minimal linux-3.7/include/net/ip6_route.h linux-3.7-vs2.3.5.1/include/net/ip6_route.h ---- linux-3.7/include/net/ip6_route.h 2012-10-04 13:27:47.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/net/ip6_route.h 2012-12-11 15:56:32.000000000 +0000 -@@ -97,7 +97,8 @@ extern int ip6_route_get_saddr(struct - struct rt6_info *rt, - const struct in6_addr *daddr, - unsigned int prefs, -- struct in6_addr *saddr); -+ struct in6_addr *saddr, -+ struct nx_info *nxi); - - extern struct rt6_info *rt6_lookup(struct net *net, - const struct in6_addr *daddr, -diff -NurpP --minimal linux-3.7/include/net/route.h linux-3.7-vs2.3.5.1/include/net/route.h ---- linux-3.7/include/net/route.h 2012-12-11 15:47:46.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/net/route.h 2012-12-11 15:56:32.000000000 +0000 -@@ -204,6 +204,9 @@ static inline void ip_rt_put(struct rtab - dst_release(&rt->dst); - } - -+#include -+#include ++#define DATTR_CREATE 0x00000001 ++#define DATTR_OPEN 0x00000002 + - #define IPTOS_RT_MASK (IPTOS_TOS_MASK & ~3) - - extern const __u8 ip_tos2prio[16]; -@@ -253,6 +256,9 @@ static inline void ip_route_connect_init - protocol, flow_flags, dst, src, dport, sport); - } - -+extern struct rtable *ip_v4_find_src(struct net *net, struct nx_info *, -+ struct flowi4 *); ++#define DATTR_REMAP 0x00000010 + - static inline struct rtable *ip_route_connect(struct flowi4 *fl4, - __be32 dst, __be32 src, u32 tos, - int oif, u8 protocol, -@@ -261,11 +267,25 @@ static inline struct rtable *ip_route_co - { - struct net *net = sock_net(sk); - struct rtable *rt; -+ struct nx_info *nx_info = current_nx_info(); - - ip_route_connect_init(fl4, dst, src, tos, oif, protocol, - sport, dport, sk, can_sleep); - -- if (!dst || !src) { -+ if (sk) -+ nx_info = sk->sk_nx_info; ++#define DATTR_MASK 0x00000013 + -+ vxdprintk(VXD_CBIT(net, 4), -+ "ip_route_connect(%p) %p,%p;%lx", -+ sk, nx_info, sk->sk_socket, -+ (sk->sk_socket?sk->sk_socket->flags:0)); ++#endif /* _UAPI_VS_DEVICE_H */ +diff -NurpP --minimal linux-3.18.5/include/uapi/vserver/device_cmd.h linux-3.18.5-vs2.3.7.3/include/uapi/vserver/device_cmd.h +--- linux-3.18.5/include/uapi/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/uapi/vserver/device_cmd.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,16 @@ ++#ifndef _UAPI_VS_DEVICE_CMD_H ++#define _UAPI_VS_DEVICE_CMD_H + -+ rt = ip_v4_find_src(net, nx_info, fl4); -+ if (IS_ERR(rt)) -+ return rt; -+ ip_rt_put(rt); + -+ if (!fl4->daddr || !fl4->saddr) { - rt = __ip_route_output_key(net, fl4); - if (IS_ERR(rt)) - return rt; -diff -NurpP --minimal linux-3.7/include/net/sock.h linux-3.7-vs2.3.5.1/include/net/sock.h ---- linux-3.7/include/net/sock.h 2012-12-11 15:47:46.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/net/sock.h 2012-12-11 15:56:32.000000000 +0000 -@@ -171,6 +171,10 @@ struct sock_common { - #ifdef CONFIG_NET_NS - struct net *skc_net; - #endif -+ xid_t skc_xid; -+ struct vx_info *skc_vx_info; -+ nid_t skc_nid; -+ struct nx_info *skc_nx_info; - /* - * fields between dontcopy_begin/dontcopy_end - * are not copied in sock_copy() -@@ -283,6 +287,10 @@ struct sock { - #define sk_bind_node __sk_common.skc_bind_node - #define sk_prot __sk_common.skc_prot - #define sk_net __sk_common.skc_net -+#define sk_xid __sk_common.skc_xid -+#define sk_vx_info __sk_common.skc_vx_info -+#define sk_nid __sk_common.skc_nid -+#define sk_nx_info __sk_common.skc_nx_info - socket_lock_t sk_lock; - struct sk_buff_head sk_receive_queue; - /* -diff -NurpP --minimal linux-3.7/include/uapi/linux/capability.h linux-3.7-vs2.3.5.1/include/uapi/linux/capability.h ---- linux-3.7/include/uapi/linux/capability.h 2012-12-11 15:47:47.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/uapi/linux/capability.h 2012-12-11 16:08:57.000000000 +0000 -@@ -259,6 +259,7 @@ struct vfs_cap_data { - arbitrary SCSI commands */ - /* Allow setting encryption key on loopback filesystem */ - /* Allow setting zone reclaim policy */ -+/* Allow the selection of a security context */ - - #define CAP_SYS_ADMIN 21 - -@@ -345,7 +346,12 @@ struct vfs_cap_data { - - #define CAP_LAST_CAP CAP_BLOCK_SUSPEND - --#define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP) -+/* Allow context manipulations */ -+/* Allow changing context info on files */ ++/* device vserver commands */ + -+#define CAP_CONTEXT 63 ++#define VCMD_set_mapping VC_CMD(DEVICE, 1, 0) ++#define VCMD_unset_mapping VC_CMD(DEVICE, 2, 0) + -+#define cap_valid(x) ((x) >= 0 && ((x) <= CAP_LAST_CAP || (x) == CAP_CONTEXT)) - - /* - * Bit location of each capability (used by user-space library and kernel) -diff -NurpP --minimal linux-3.7/include/uapi/linux/fs.h linux-3.7-vs2.3.5.1/include/uapi/linux/fs.h ---- linux-3.7/include/uapi/linux/fs.h 2012-12-11 15:47:47.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/uapi/linux/fs.h 2012-12-11 16:35:06.000000000 +0000 -@@ -86,6 +86,9 @@ struct inodes_stat_t { - #define MS_KERNMOUNT (1<<22) /* this is a kern_mount call */ - #define MS_I_VERSION (1<<23) /* Update inode I_version field */ - #define MS_STRICTATIME (1<<24) /* Always perform atime updates */ -+#define MS_TAGGED (1<<25) /* use generic inode tagging */ -+#define MS_TAGID (1<<26) /* use specific tag for this mount */ -+#define MS_NOTAGCHECK (1<<27) /* don't check tags */ - #define MS_NOSEC (1<<28) - #define MS_BORN (1<<29) - #define MS_ACTIVE (1<<30) -@@ -189,11 +192,14 @@ struct inodes_stat_t { - #define FS_EXTENT_FL 0x00080000 /* Extents */ - #define FS_DIRECTIO_FL 0x00100000 /* Use direct i/o */ - #define FS_NOCOW_FL 0x00800000 /* Do not cow file */ -+#define FS_IXUNLINK_FL 0x08000000 /* Immutable invert on unlink */ - #define FS_RESERVED_FL 0x80000000 /* reserved for ext2 lib */ - --#define FS_FL_USER_VISIBLE 0x0003DFFF /* User visible flags */ --#define FS_FL_USER_MODIFIABLE 0x000380FF /* User modifiable flags */ -- -+#define FS_BARRIER_FL 0x04000000 /* Barrier for chroot() */ -+#define FS_COW_FL 0x20000000 /* Copy on Write marker */ ++struct vcmd_set_mapping_v0 { ++ const char __user *device; ++ const char __user *target; ++ uint32_t flags; ++}; + -+#define FS_FL_USER_VISIBLE 0x0103DFFF /* User visible flags */ -+#define FS_FL_USER_MODIFIABLE 0x010380FF /* User modifiable flags */ - - #define SYNC_FILE_RANGE_WAIT_BEFORE 1 - #define SYNC_FILE_RANGE_WRITE 2 -diff -NurpP --minimal linux-3.7/include/uapi/linux/gfs2_ondisk.h linux-3.7-vs2.3.5.1/include/uapi/linux/gfs2_ondisk.h ---- linux-3.7/include/uapi/linux/gfs2_ondisk.h 2012-12-11 15:47:47.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/uapi/linux/gfs2_ondisk.h 2012-12-11 21:58:36.000000000 +0000 -@@ -225,6 +225,9 @@ enum { - gfs2fl_Sync = 8, - gfs2fl_System = 9, - gfs2fl_TopLevel = 10, -+ gfs2fl_IXUnlink = 16, -+ gfs2fl_Barrier = 17, -+ gfs2fl_Cow = 18, - gfs2fl_TruncInProg = 29, - gfs2fl_InheritDirectio = 30, - gfs2fl_InheritJdata = 31, -@@ -242,6 +245,9 @@ enum { - #define GFS2_DIF_SYNC 0x00000100 - #define GFS2_DIF_SYSTEM 0x00000200 /* New in gfs2 */ - #define GFS2_DIF_TOPDIR 0x00000400 /* New in gfs2 */ -+#define GFS2_DIF_IXUNLINK 0x00010000 -+#define GFS2_DIF_BARRIER 0x00020000 -+#define GFS2_DIF_COW 0x00040000 - #define GFS2_DIF_TRUNC_IN_PROG 0x20000000 /* New in gfs2 */ - #define GFS2_DIF_INHERIT_DIRECTIO 0x40000000 /* only in gfs1 */ - #define GFS2_DIF_INHERIT_JDATA 0x80000000 -diff -NurpP --minimal linux-3.7/include/uapi/linux/if_tun.h linux-3.7-vs2.3.5.1/include/uapi/linux/if_tun.h ---- linux-3.7/include/uapi/linux/if_tun.h 2012-12-11 15:47:47.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/uapi/linux/if_tun.h 2012-12-11 16:11:03.000000000 +0000 -@@ -53,6 +53,7 @@ - #define TUNDETACHFILTER _IOW('T', 214, struct sock_fprog) - #define TUNGETVNETHDRSZ _IOR('T', 215, int) - #define TUNSETVNETHDRSZ _IOW('T', 216, int) -+#define TUNSETNID _IOW('T', 217, int) - - /* TUNSETIFF ifr flags */ - #define IFF_TUN 0x0001 -diff -NurpP --minimal linux-3.7/include/uapi/linux/major.h linux-3.7-vs2.3.5.1/include/uapi/linux/major.h ---- linux-3.7/include/uapi/linux/major.h 2012-12-11 15:47:47.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/uapi/linux/major.h 2012-12-11 22:10:37.000000000 +0000 -@@ -15,6 +15,7 @@ - #define HD_MAJOR IDE0_MAJOR - #define PTY_SLAVE_MAJOR 3 - #define TTY_MAJOR 4 -+#define VROOT_MAJOR 4 - #define TTYAUX_MAJOR 5 - #define LP_MAJOR 6 - #define VCS_MAJOR 7 -diff -NurpP --minimal linux-3.7/include/uapi/linux/nfs_mount.h linux-3.7-vs2.3.5.1/include/uapi/linux/nfs_mount.h ---- linux-3.7/include/uapi/linux/nfs_mount.h 2012-12-11 15:47:47.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/uapi/linux/nfs_mount.h 2012-12-11 22:05:39.000000000 +0000 -@@ -63,7 +63,8 @@ struct nfs_mount_data { - #define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 */ - #define NFS_MOUNT_NORDIRPLUS 0x4000 /* 5 */ - #define NFS_MOUNT_UNSHARED 0x8000 /* 5 */ --#define NFS_MOUNT_FLAGMASK 0xFFFF -+#define NFS_MOUNT_TAGGED 0x10000 /* context tagging */ -+#define NFS_MOUNT_FLAGMASK 0x1FFFF - - /* The following are for internal use only */ - #define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000 -diff -NurpP --minimal linux-3.7/include/uapi/linux/reboot.h linux-3.7-vs2.3.5.1/include/uapi/linux/reboot.h ---- linux-3.7/include/uapi/linux/reboot.h 2012-12-11 15:47:47.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/uapi/linux/reboot.h 2012-12-11 16:29:23.000000000 +0000 -@@ -33,7 +33,7 @@ - #define LINUX_REBOOT_CMD_RESTART2 0xA1B2C3D4 - #define LINUX_REBOOT_CMD_SW_SUSPEND 0xD000FCE2 - #define LINUX_REBOOT_CMD_KEXEC 0x45584543 -- -+#define LINUX_REBOOT_CMD_OOM 0xDEADBEEF - - - #endif /* _UAPI_LINUX_REBOOT_H */ -diff -NurpP --minimal linux-3.7/include/uapi/linux/sysctl.h linux-3.7-vs2.3.5.1/include/uapi/linux/sysctl.h ---- linux-3.7/include/uapi/linux/sysctl.h 2012-12-11 15:47:47.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/uapi/linux/sysctl.h 2012-12-11 16:42:05.000000000 +0000 -@@ -60,6 +60,7 @@ enum - CTL_ABI=9, /* Binary emulation */ - CTL_CPU=10, /* CPU stuff (speed scaling, etc) */ - CTL_ARLAN=254, /* arlan wireless driver */ -+ CTL_VSERVER=4242, /* Linux-VServer debug */ - CTL_S390DBF=5677, /* s390 debug */ - CTL_SUNRPC=7249, /* sunrpc debug */ - CTL_PM=9899, /* frv power management */ -@@ -94,6 +95,7 @@ enum - - KERN_PANIC=15, /* int: panic timeout */ - KERN_REALROOTDEV=16, /* real root device to mount after initrd */ -+ KERN_VSHELPER=17, /* string: path to vshelper policy agent */ - - KERN_SPARC_REBOOT=21, /* reboot command on Sparc */ - KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */ -diff -NurpP --minimal linux-3.7/init/Kconfig linux-3.7-vs2.3.5.1/init/Kconfig ---- linux-3.7/init/Kconfig 2012-12-11 15:47:47.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/init/Kconfig 2012-12-11 23:14:38.000000000 +0000 -@@ -699,6 +699,7 @@ config HAVE_UNSTABLE_SCHED_CLOCK - menuconfig CGROUPS - boolean "Control Group support" - depends on EVENTFD -+ default y - help - This option adds support for grouping sets of processes together, for - use with process control subsystems such as Cpusets, CFS, memory -@@ -964,6 +965,7 @@ config USER_NS - bool "User namespace (EXPERIMENTAL)" - depends on EXPERIMENTAL - depends on UIDGID_CONVERTED -+ depends on VSERVER_DISABLED - select UIDGID_STRICT_TYPE_CHECKS - - default n -diff -NurpP --minimal linux-3.7/init/main.c linux-3.7-vs2.3.5.1/init/main.c ---- linux-3.7/init/main.c 2012-12-11 15:47:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/init/main.c 2012-12-11 16:56:16.000000000 +0000 -@@ -70,6 +70,7 @@ - #include - #include - #include -+#include - - #include - #include -diff -NurpP --minimal linux-3.7/ipc/mqueue.c linux-3.7-vs2.3.5.1/ipc/mqueue.c ---- linux-3.7/ipc/mqueue.c 2012-12-11 15:47:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/ipc/mqueue.c 2012-12-11 15:56:32.000000000 +0000 -@@ -35,6 +35,8 @@ - #include - #include - #include -+#include -+#include - - #include - #include "util.h" -@@ -76,6 +78,7 @@ struct mqueue_inode_info { - struct pid* notify_owner; - struct user_namespace *notify_user_ns; - struct user_struct *user; /* user who created, for accounting */ -+ struct vx_info *vxi; - struct sock *notify_sock; - struct sk_buff *notify_cookie; - -@@ -234,6 +237,7 @@ static struct inode *mqueue_get_inode(st - if (S_ISREG(mode)) { - struct mqueue_inode_info *info; - unsigned long mq_bytes, mq_treesize; -+ struct vx_info *vxi = current_vx_info(); - - inode->i_fop = &mqueue_file_operations; - inode->i_size = FILENT_SIZE; -@@ -247,6 +251,7 @@ static struct inode *mqueue_get_inode(st - info->notify_user_ns = NULL; - info->qsize = 0; - info->user = NULL; /* set when all is ok */ -+ info->vxi = NULL; - info->msg_tree = RB_ROOT; - info->node_cache = NULL; - memset(&info->attr, 0, sizeof(info->attr)); -@@ -280,17 +285,20 @@ static struct inode *mqueue_get_inode(st - - spin_lock(&mq_lock); - if (u->mq_bytes + mq_bytes < u->mq_bytes || -- u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE)) { -+ u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE) || -+ !vx_ipcmsg_avail(vxi, mq_bytes)) { - spin_unlock(&mq_lock); - /* mqueue_evict_inode() releases info->messages */ - ret = -EMFILE; - goto out_inode; - } - u->mq_bytes += mq_bytes; -+ vx_ipcmsg_add(vxi, u, mq_bytes); - spin_unlock(&mq_lock); - - /* all is ok */ - info->user = get_uid(u); -+ info->vxi = get_vx_info(vxi); - } else if (S_ISDIR(mode)) { - inc_nlink(inode); - /* Some things misbehave if size == 0 on a directory */ -@@ -394,8 +402,11 @@ static void mqueue_evict_inode(struct in - - user = info->user; - if (user) { -+ struct vx_info *vxi = info->vxi; ++#endif /* _UAPI_VS_DEVICE_CMD_H */ +diff -NurpP --minimal linux-3.18.5/include/uapi/vserver/dlimit_cmd.h linux-3.18.5-vs2.3.7.3/include/uapi/vserver/dlimit_cmd.h +--- linux-3.18.5/include/uapi/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/uapi/vserver/dlimit_cmd.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,67 @@ ++#ifndef _UAPI_VS_DLIMIT_CMD_H ++#define _UAPI_VS_DLIMIT_CMD_H + - spin_lock(&mq_lock); - user->mq_bytes -= mq_bytes; -+ vx_ipcmsg_sub(vxi, user, mq_bytes); - /* - * get_ns_from_inode() ensures that the - * (ipc_ns = sb->s_fs_info) is either a valid ipc_ns -@@ -405,6 +416,7 @@ static void mqueue_evict_inode(struct in - if (ipc_ns) - ipc_ns->mq_queues_count--; - spin_unlock(&mq_lock); -+ put_vx_info(vxi); - free_uid(user); - } - if (ipc_ns) -diff -NurpP --minimal linux-3.7/ipc/msg.c linux-3.7-vs2.3.5.1/ipc/msg.c ---- linux-3.7/ipc/msg.c 2012-12-11 15:47:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/ipc/msg.c 2012-12-11 15:56:32.000000000 +0000 -@@ -37,6 +37,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -190,6 +191,7 @@ static int newque(struct ipc_namespace * - - msq->q_perm.mode = msgflg & S_IRWXUGO; - msq->q_perm.key = key; -+ msq->q_perm.xid = vx_current_xid(); - - msq->q_perm.security = NULL; - retval = security_msg_queue_alloc(msq); -diff -NurpP --minimal linux-3.7/ipc/namespace.c linux-3.7-vs2.3.5.1/ipc/namespace.c ---- linux-3.7/ipc/namespace.c 2012-07-22 21:39:46.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/ipc/namespace.c 2012-12-11 15:56:32.000000000 +0000 -@@ -13,11 +13,12 @@ - #include - #include - #include -+#include -+#include - - #include "util.h" - --static struct ipc_namespace *create_ipc_ns(struct task_struct *tsk, -- struct ipc_namespace *old_ns) -+static struct ipc_namespace *create_ipc_ns(struct user_namespace *user_ns) - { - struct ipc_namespace *ns; - int err; -@@ -46,19 +47,19 @@ static struct ipc_namespace *create_ipc_ - ipcns_notify(IPCNS_CREATED); - register_ipcns_notifier(ns); - -- ns->user_ns = get_user_ns(task_cred_xxx(tsk, user_ns)); -+ // ns->user_ns = get_user_ns(task_cred_xxx(tsk, user_ns)); -+ ns->user_ns = get_user_ns(user_ns); - - return ns; - } - - struct ipc_namespace *copy_ipcs(unsigned long flags, -- struct task_struct *tsk) -+ struct ipc_namespace *old_ns, -+ struct user_namespace *user_ns) - { -- struct ipc_namespace *ns = tsk->nsproxy->ipc_ns; -- - if (!(flags & CLONE_NEWIPC)) -- return get_ipc_ns(ns); -- return create_ipc_ns(tsk, ns); -+ return get_ipc_ns(old_ns); -+ return create_ipc_ns(user_ns); - } - - /* -diff -NurpP --minimal linux-3.7/ipc/sem.c linux-3.7-vs2.3.5.1/ipc/sem.c ---- linux-3.7/ipc/sem.c 2012-12-11 15:47:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/ipc/sem.c 2012-12-11 15:56:32.000000000 +0000 -@@ -86,6 +86,8 @@ - #include - #include - #include -+#include -+#include - - #include - #include "util.h" -@@ -306,6 +308,7 @@ static int newary(struct ipc_namespace * - - sma->sem_perm.mode = (semflg & S_IRWXUGO); - sma->sem_perm.key = key; -+ sma->sem_perm.xid = vx_current_xid(); - - sma->sem_perm.security = NULL; - retval = security_sem_alloc(sma); -@@ -321,6 +324,9 @@ static int newary(struct ipc_namespace * - return id; - } - ns->used_sems += nsems; -+ /* FIXME: obsoleted? */ -+ vx_semary_inc(sma); -+ vx_nsems_add(sma, nsems); - - sma->sem_base = (struct sem *) &sma[1]; - -@@ -770,6 +776,9 @@ static void freeary(struct ipc_namespace - - wake_up_sem_queue_do(&tasks); - ns->used_sems -= sma->sem_nsems; -+ /* FIXME: obsoleted? */ -+ vx_nsems_sub(sma, sma->sem_nsems); -+ vx_semary_dec(sma); - security_sem_free(sma); - ipc_rcu_putref(sma); - } -diff -NurpP --minimal linux-3.7/ipc/shm.c linux-3.7-vs2.3.5.1/ipc/shm.c ---- linux-3.7/ipc/shm.c 2012-12-11 15:47:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/ipc/shm.c 2012-12-11 15:56:32.000000000 +0000 -@@ -39,6 +39,8 @@ - #include - #include - #include -+#include -+#include - - #include - -@@ -187,7 +189,12 @@ static void shm_open(struct vm_area_stru - */ - static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp) - { -- ns->shm_tot -= (shp->shm_segsz + PAGE_SIZE - 1) >> PAGE_SHIFT; -+ struct vx_info *vxi = lookup_vx_info(shp->shm_perm.xid); -+ int numpages = (shp->shm_segsz + PAGE_SIZE - 1) >> PAGE_SHIFT; + -+ vx_ipcshm_sub(vxi, shp, numpages); -+ ns->shm_tot -= numpages; ++/* dlimit vserver commands */ + - shm_rmid(ns, shp); - shm_unlock(shp); - if (!is_file_hugepages(shp->shm_file)) -@@ -197,6 +204,7 @@ static void shm_destroy(struct ipc_names - shp->mlock_user); - fput (shp->shm_file); - security_shm_free(shp); -+ put_vx_info(vxi); - ipc_rcu_putref(shp); - } - -@@ -474,11 +482,15 @@ static int newseg(struct ipc_namespace * - if (ns->shm_tot + numpages > ns->shm_ctlall) - return -ENOSPC; - -+ if (!vx_ipcshm_avail(current_vx_info(), numpages)) -+ return -ENOSPC; ++#define VCMD_add_dlimit VC_CMD(DLIMIT, 1, 0) ++#define VCMD_rem_dlimit VC_CMD(DLIMIT, 2, 0) + - shp = ipc_rcu_alloc(sizeof(*shp)); - if (!shp) - return -ENOMEM; - - shp->shm_perm.key = key; -+ shp->shm_perm.xid = vx_current_xid(); - shp->shm_perm.mode = (shmflg & S_IRWXUGO); - shp->mlock_user = NULL; - -@@ -533,6 +545,7 @@ static int newseg(struct ipc_namespace * - ns->shm_tot += numpages; - error = shp->shm_perm.id; - shm_unlock(shp); -+ vx_ipcshm_add(current_vx_info(), key, numpages); - return error; - - no_id: -diff -NurpP --minimal linux-3.7/kernel/Makefile linux-3.7-vs2.3.5.1/kernel/Makefile ---- linux-3.7/kernel/Makefile 2012-12-11 15:47:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/Makefile 2012-12-11 15:56:32.000000000 +0000 -@@ -24,6 +24,7 @@ endif - - obj-y += sched/ - obj-y += power/ -+obj-y += vserver/ - - ifeq ($(CONFIG_CHECKPOINT_RESTORE),y) - obj-$(CONFIG_X86) += kcmp.o -diff -NurpP --minimal linux-3.7/kernel/auditsc.c linux-3.7-vs2.3.5.1/kernel/auditsc.c ---- linux-3.7/kernel/auditsc.c 2012-12-11 15:47:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/auditsc.c 2012-12-11 15:56:32.000000000 +0000 -@@ -2372,7 +2372,7 @@ int audit_set_loginuid(kuid_t loginuid) - if (uid_valid(task->loginuid)) - return -EPERM; - #else /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */ -- if (!capable(CAP_AUDIT_CONTROL)) -+ if (!vx_capable(CAP_AUDIT_CONTROL, VXC_AUDIT_CONTROL)) - return -EPERM; - #endif /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */ - -diff -NurpP --minimal linux-3.7/kernel/capability.c linux-3.7-vs2.3.5.1/kernel/capability.c ---- linux-3.7/kernel/capability.c 2012-07-22 21:39:46.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/capability.c 2012-12-11 15:56:32.000000000 +0000 -@@ -15,6 +15,7 @@ - #include - #include - #include -+#include - #include - - /* -@@ -116,6 +117,7 @@ static int cap_validate_magic(cap_user_h - return 0; - } - ++#define VCMD_set_dlimit VC_CMD(DLIMIT, 5, 0) ++#define VCMD_get_dlimit VC_CMD(DLIMIT, 6, 0) + - /* - * The only thing that can change the capabilities of the current - * process is the current process. As such, we can't be in this code -@@ -349,6 +351,8 @@ bool has_ns_capability_noaudit(struct ta - return (ret == 0); - } - -+#include ++struct vcmd_ctx_dlimit_base_v0 { ++ const char __user *name; ++ uint32_t flags; ++}; + - /** - * has_capability_noaudit - Does a task have a capability (unaudited) in the - * initial user ns -diff -NurpP --minimal linux-3.7/kernel/compat.c linux-3.7-vs2.3.5.1/kernel/compat.c ---- linux-3.7/kernel/compat.c 2012-07-22 21:39:46.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/compat.c 2012-12-11 21:24:51.000000000 +0000 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - - #include - -@@ -1054,7 +1055,7 @@ asmlinkage long compat_sys_stime(compat_ - if (err) - return err; - -- do_settimeofday(&tv); -+ vx_settimeofday(&tv); - return 0; - } - -diff -NurpP --minimal linux-3.7/kernel/cred.c linux-3.7-vs2.3.5.1/kernel/cred.c ---- linux-3.7/kernel/cred.c 2012-12-11 15:47:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/cred.c 2012-12-11 15:56:32.000000000 +0000 -@@ -70,31 +70,6 @@ struct cred init_cred = { - #endif - }; - --static inline void set_cred_subscribers(struct cred *cred, int n) --{ --#ifdef CONFIG_DEBUG_CREDENTIALS -- atomic_set(&cred->subscribers, n); --#endif --} -- --static inline int read_cred_subscribers(const struct cred *cred) --{ --#ifdef CONFIG_DEBUG_CREDENTIALS -- return atomic_read(&cred->subscribers); --#else -- return 0; --#endif --} -- --static inline void alter_cred_subscribers(const struct cred *_cred, int n) --{ --#ifdef CONFIG_DEBUG_CREDENTIALS -- struct cred *cred = (struct cred *) _cred; -- -- atomic_add(n, &cred->subscribers); --#endif --} -- - /* - * Dispose of the shared task group credentials - */ -@@ -284,21 +259,16 @@ error: - * - * Call commit_creds() or abort_creds() to clean up. - */ --struct cred *prepare_creds(void) -+struct cred *__prepare_creds(const struct cred *old) - { -- struct task_struct *task = current; -- const struct cred *old; - struct cred *new; - -- validate_process_creds(); -- - new = kmem_cache_alloc(cred_jar, GFP_KERNEL); - if (!new) - return NULL; - - kdebug("prepare_creds() alloc %p", new); - -- old = task->cred; - memcpy(new, old, sizeof(struct cred)); - - atomic_set(&new->usage, 1); -@@ -326,6 +296,13 @@ error: - abort_creds(new); - return NULL; - } ++struct vcmd_ctx_dlimit_v0 { ++ const char __user *name; ++ uint32_t space_used; /* used space in kbytes */ ++ uint32_t space_total; /* maximum space in kbytes */ ++ uint32_t inodes_used; /* used inodes */ ++ uint32_t inodes_total; /* maximum inodes */ ++ uint32_t reserved; /* reserved for root in % */ ++ uint32_t flags; ++}; + -+struct cred *prepare_creds(void) -+{ -+ validate_process_creds(); ++#define CDLIM_UNSET ((uint32_t)0UL) ++#define CDLIM_INFINITY ((uint32_t)~0UL) ++#define CDLIM_KEEP ((uint32_t)~1UL) + -+ return __prepare_creds(current->cred); ++#define DLIME_UNIT 0 ++#define DLIME_KILO 1 ++#define DLIME_MEGA 2 ++#define DLIME_GIGA 3 ++ ++#define DLIMF_SHIFT 0x10 ++ ++#define DLIMS_USED 0 ++#define DLIMS_TOTAL 2 ++ ++static inline ++uint64_t dlimit_space_32to64(uint32_t val, uint32_t flags, int shift) ++{ ++ int exp = (flags & DLIMF_SHIFT) ? ++ (flags >> shift) & DLIME_GIGA : DLIME_KILO; ++ return ((uint64_t)val) << (10 * exp); +} - EXPORT_SYMBOL(prepare_creds); - - /* -diff -NurpP --minimal linux-3.7/kernel/exit.c linux-3.7-vs2.3.5.1/kernel/exit.c ---- linux-3.7/kernel/exit.c 2012-12-11 15:47:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/exit.c 2012-12-11 15:56:32.000000000 +0000 -@@ -48,6 +48,10 @@ - #include - #include - #include -+#include -+#include -+#include -+#include - #include - #include - #include -@@ -616,15 +620,25 @@ static struct task_struct *find_new_reap - __acquires(&tasklist_lock) - { - struct pid_namespace *pid_ns = task_active_pid_ns(father); -- struct task_struct *thread; -+ struct vx_info *vxi = task_get_vx_info(father); -+ struct task_struct *thread = father; -+ struct task_struct *reaper; - -- thread = father; - while_each_thread(father, thread) { - if (thread->flags & PF_EXITING) - continue; - if (unlikely(pid_ns->child_reaper == father)) - pid_ns->child_reaper = thread; -- return thread; -+ reaper = thread; -+ goto out_put; -+ } + -+ reaper = pid_ns->child_reaper; -+ if (vxi) { -+ BUG_ON(!vxi->vx_reaper); -+ if (vxi->vx_reaper != init_pid_ns.child_reaper && -+ vxi->vx_reaper != father) -+ reaper = vxi->vx_reaper; - } - - if (unlikely(pid_ns->child_reaper == father)) { -@@ -662,7 +676,9 @@ static struct task_struct *find_new_reap - } - } - -- return pid_ns->child_reaper; -+out_put: -+ put_vx_info(vxi); -+ return reaper; - } - - /* -@@ -713,10 +729,15 @@ static void forget_original_parent(struc - list_for_each_entry_safe(p, n, &father->children, sibling) { - struct task_struct *t = p; - do { -- t->real_parent = reaper; -+ struct task_struct *new_parent = reaper; ++static inline ++uint32_t dlimit_space_64to32(uint64_t val, uint32_t *flags, int shift) ++{ ++ int exp = 0; + -+ if (unlikely(p == reaper)) -+ new_parent = task_active_pid_ns(p)->child_reaper; ++ if (*flags & DLIMF_SHIFT) { ++ while (val > (1LL << 32) && (exp < 3)) { ++ val >>= 10; ++ exp++; ++ } ++ *flags &= ~(DLIME_GIGA << shift); ++ *flags |= exp << shift; ++ } else ++ val >>= 10; ++ return val; ++} + -+ t->real_parent = new_parent; - if (t->parent == father) { - BUG_ON(t->ptrace); -- t->parent = t->real_parent; -+ t->parent = new_parent; - } - if (t->pdeath_signal) - group_send_sig_info(t->pdeath_signal, -@@ -923,6 +944,9 @@ void do_exit(long code) - */ - ptrace_put_breakpoints(tsk); - -+ /* needs to stay before exit_notify() */ -+ exit_vx_info_early(tsk, code); ++#endif /* _UAPI_VS_DLIMIT_CMD_H */ +diff -NurpP --minimal linux-3.18.5/include/uapi/vserver/inode.h linux-3.18.5-vs2.3.7.3/include/uapi/vserver/inode.h +--- linux-3.18.5/include/uapi/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/uapi/vserver/inode.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,23 @@ ++#ifndef _UAPI_VS_INODE_H ++#define _UAPI_VS_INODE_H + - exit_notify(tsk, group_dead); - #ifdef CONFIG_NUMA - task_lock(tsk); -@@ -976,10 +1000,15 @@ void do_exit(long code) - smp_mb(); - raw_spin_unlock_wait(&tsk->pi_lock); - -+ /* needs to stay after exit_notify() */ -+ exit_vx_info(tsk, code); -+ exit_nx_info(tsk); + - /* causes final put_task_struct in finish_task_switch(). */ - tsk->state = TASK_DEAD; - tsk->flags |= PF_NOFREEZE; /* tell freezer to ignore us */ - schedule(); -+ printk("bad task: %p [%lx]\n", current, current->state); - BUG(); - /* Avoid "noreturn function does return". */ - for (;;) -diff -NurpP --minimal linux-3.7/kernel/fork.c linux-3.7-vs2.3.5.1/kernel/fork.c ---- linux-3.7/kernel/fork.c 2012-12-11 15:47:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/fork.c 2012-12-11 15:56:32.000000000 +0000 -@@ -70,6 +70,9 @@ - #include - #include - #include -+#include -+#include -+#include - - #include - #include -@@ -210,6 +213,8 @@ void free_task(struct task_struct *tsk) - arch_release_thread_info(tsk->stack); - free_thread_info(tsk->stack); - rt_mutex_debug_task_free(tsk); -+ clr_vx_info(&tsk->vx_info); -+ clr_nx_info(&tsk->nx_info); - ftrace_graph_exit_task(tsk); - put_seccomp_filter(tsk); - arch_release_task_struct(tsk); -@@ -545,6 +550,7 @@ static struct mm_struct *mm_init(struct - if (likely(!mm_alloc_pgd(mm))) { - mm->def_flags = 0; - mmu_notifier_mm_init(mm); -+ set_vx_info(&mm->mm_vx_info, p->vx_info); - return mm; - } - -@@ -597,6 +603,7 @@ void __mmdrop(struct mm_struct *mm) - destroy_context(mm); - mmu_notifier_mm_destroy(mm); - check_mm(mm); -+ clr_vx_info(&mm->mm_vx_info); - free_mm(mm); - } - EXPORT_SYMBOL_GPL(__mmdrop); -@@ -816,6 +823,7 @@ struct mm_struct *dup_mm(struct task_str - goto fail_nomem; - - memcpy(mm, oldmm, sizeof(*mm)); -+ mm->mm_vx_info = NULL; - mm_init_cpumask(mm); - - #ifdef CONFIG_TRANSPARENT_HUGEPAGE -@@ -854,6 +862,7 @@ fail_nocontext: - * If init_new_context() failed, we cannot use mmput() to free the mm - * because it calls destroy_context() - */ -+ clr_vx_info(&mm->mm_vx_info); - mm_free_pgd(mm); - free_mm(mm); - return NULL; -@@ -1136,6 +1145,8 @@ static struct task_struct *copy_process( - int retval; - struct task_struct *p; - int cgroup_callbacks_done = 0; -+ struct vx_info *vxi; -+ struct nx_info *nxi; - - if ((clone_flags & (CLONE_NEWNS|CLONE_FS)) == (CLONE_NEWNS|CLONE_FS)) - return ERR_PTR(-EINVAL); -@@ -1183,7 +1194,12 @@ static struct task_struct *copy_process( - DEBUG_LOCKS_WARN_ON(!p->hardirqs_enabled); - DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled); - #endif -+ init_vx_info(&p->vx_info, current_vx_info()); -+ init_nx_info(&p->nx_info, current_nx_info()); ++#define IATTR_TAG 0x01000000 + - retval = -EAGAIN; -+ if (!vx_nproc_avail(1)) -+ goto bad_fork_free; - if (atomic_read(&p->real_cred->user->processes) >= - task_rlimit(p, RLIMIT_NPROC)) { - if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) && -@@ -1458,6 +1474,18 @@ static struct task_struct *copy_process( - - total_forks++; - spin_unlock(¤t->sighand->siglock); ++#define IATTR_ADMIN 0x00000001 ++#define IATTR_WATCH 0x00000002 ++#define IATTR_HIDE 0x00000004 ++#define IATTR_FLAGS 0x00000007 + -+ /* p is copy of current */ -+ vxi = p->vx_info; -+ if (vxi) { -+ claim_vx_info(vxi, p); -+ atomic_inc(&vxi->cvirt.nr_threads); -+ atomic_inc(&vxi->cvirt.total_forks); -+ vx_nproc_inc(p); -+ } -+ nxi = p->nx_info; -+ if (nxi) -+ claim_nx_info(nxi, p); - write_unlock_irq(&tasklist_lock); - proc_fork_connector(p); - cgroup_post_fork(p); -diff -NurpP --minimal linux-3.7/kernel/kthread.c linux-3.7-vs2.3.5.1/kernel/kthread.c ---- linux-3.7/kernel/kthread.c 2012-12-11 15:47:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/kthread.c 2012-12-11 17:04:03.000000000 +0000 -@@ -17,6 +17,7 @@ - #include - #include - #include -+#include - #include - - static DEFINE_SPINLOCK(kthread_create_lock); -diff -NurpP --minimal linux-3.7/kernel/nsproxy.c linux-3.7-vs2.3.5.1/kernel/nsproxy.c ---- linux-3.7/kernel/nsproxy.c 2012-01-09 15:15:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/nsproxy.c 2012-12-11 15:56:32.000000000 +0000 -@@ -20,11 +20,14 @@ - #include - #include - #include -+#include -+#include - #include - #include - #include - #include - #include -+#include "../fs/mount.h" - - static struct kmem_cache *nsproxy_cachep; - -@@ -46,8 +49,11 @@ static inline struct nsproxy *create_nsp - struct nsproxy *nsproxy; - - nsproxy = kmem_cache_alloc(nsproxy_cachep, GFP_KERNEL); -- if (nsproxy) -+ if (nsproxy) { - atomic_set(&nsproxy->count, 1); -+ atomic_inc(&vs_global_nsproxy); -+ } -+ vxdprintk(VXD_CBIT(space, 2), "create_nsproxy = %p[1]", nsproxy); - return nsproxy; - } - -@@ -56,8 +62,11 @@ static inline struct nsproxy *create_nsp - * Return the newly created nsproxy. Do not attach this to the task, - * leave it to the caller to do proper locking and attach it to task. - */ --static struct nsproxy *create_new_namespaces(unsigned long flags, -- struct task_struct *tsk, struct fs_struct *new_fs) -+static struct nsproxy *unshare_namespaces(unsigned long flags, -+ struct nsproxy *orig, -+ struct fs_struct *new_fs, -+ struct user_namespace *new_user, -+ struct pid_namespace *new_pid) - { - struct nsproxy *new_nsp; - int err; -@@ -66,31 +75,31 @@ static struct nsproxy *create_new_namesp - if (!new_nsp) - return ERR_PTR(-ENOMEM); - -- new_nsp->mnt_ns = copy_mnt_ns(flags, tsk->nsproxy->mnt_ns, new_fs); -+ new_nsp->mnt_ns = copy_mnt_ns(flags, orig->mnt_ns, new_fs); - if (IS_ERR(new_nsp->mnt_ns)) { - err = PTR_ERR(new_nsp->mnt_ns); - goto out_ns; - } - -- new_nsp->uts_ns = copy_utsname(flags, tsk); -+ new_nsp->uts_ns = copy_utsname(flags, orig->uts_ns, new_user); - if (IS_ERR(new_nsp->uts_ns)) { - err = PTR_ERR(new_nsp->uts_ns); - goto out_uts; - } - -- new_nsp->ipc_ns = copy_ipcs(flags, tsk); -+ new_nsp->ipc_ns = copy_ipcs(flags, orig->ipc_ns, new_user); - if (IS_ERR(new_nsp->ipc_ns)) { - err = PTR_ERR(new_nsp->ipc_ns); - goto out_ipc; - } - -- new_nsp->pid_ns = copy_pid_ns(flags, task_active_pid_ns(tsk)); -+ new_nsp->pid_ns = copy_pid_ns(flags, new_pid); - if (IS_ERR(new_nsp->pid_ns)) { - err = PTR_ERR(new_nsp->pid_ns); - goto out_pid; - } - -- new_nsp->net_ns = copy_net_ns(flags, tsk->nsproxy->net_ns); -+ new_nsp->net_ns = copy_net_ns(flags, orig->net_ns); - if (IS_ERR(new_nsp->net_ns)) { - err = PTR_ERR(new_nsp->net_ns); - goto out_net; -@@ -115,6 +124,40 @@ out_ns: - return ERR_PTR(err); - } - -+static struct nsproxy *create_new_namespaces(unsigned long flags, -+ struct task_struct *tsk, struct fs_struct *new_fs) -+{ -+ return unshare_namespaces(flags, tsk->nsproxy, -+ new_fs, task_cred_xxx(tsk, user_ns), -+ task_active_pid_ns(tsk)); -+} ++#define IATTR_BARRIER 0x00010000 ++#define IATTR_IXUNLINK 0x00020000 ++#define IATTR_IMMUTABLE 0x00040000 ++#define IATTR_COW 0x00080000 + -+/* -+ * copies the nsproxy, setting refcount to 1, and grabbing a -+ * reference to all contained namespaces. -+ */ -+struct nsproxy *copy_nsproxy(struct nsproxy *orig) -+{ -+ struct nsproxy *ns = create_nsproxy(); + -+ if (ns) { -+ memcpy(ns, orig, sizeof(struct nsproxy)); -+ atomic_set(&ns->count, 1); ++/* inode ioctls */ + -+ if (ns->mnt_ns) -+ get_mnt_ns(ns->mnt_ns); -+ if (ns->uts_ns) -+ get_uts_ns(ns->uts_ns); -+ if (ns->ipc_ns) -+ get_ipc_ns(ns->ipc_ns); -+ if (ns->pid_ns) -+ get_pid_ns(ns->pid_ns); -+ if (ns->net_ns) -+ get_net(ns->net_ns); -+ } -+ return ns; -+} ++#define FIOC_GETXFLG _IOR('x', 5, long) ++#define FIOC_SETXFLG _IOW('x', 6, long) + - /* - * called from clone. This now handles copy for nsproxy and all - * namespaces therein. -@@ -122,9 +165,12 @@ out_ns: - int copy_namespaces(unsigned long flags, struct task_struct *tsk) - { - struct nsproxy *old_ns = tsk->nsproxy; -- struct nsproxy *new_ns; -+ struct nsproxy *new_ns = NULL; - int err = 0; - -+ vxdprintk(VXD_CBIT(space, 7), "copy_namespaces(0x%08lx,%p[%p])", -+ flags, tsk, old_ns); ++#endif /* _UAPI_VS_INODE_H */ +diff -NurpP --minimal linux-3.18.5/include/uapi/vserver/inode_cmd.h linux-3.18.5-vs2.3.7.3/include/uapi/vserver/inode_cmd.h +--- linux-3.18.5/include/uapi/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/uapi/vserver/inode_cmd.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,26 @@ ++#ifndef _UAPI_VS_INODE_CMD_H ++#define _UAPI_VS_INODE_CMD_H + - if (!old_ns) - return 0; - -@@ -134,7 +180,7 @@ int copy_namespaces(unsigned long flags, - CLONE_NEWPID | CLONE_NEWNET))) - return 0; - -- if (!capable(CAP_SYS_ADMIN)) { -+ if (!vx_can_unshare(CAP_SYS_ADMIN, flags)) { - err = -EPERM; - goto out; - } -@@ -161,6 +207,9 @@ int copy_namespaces(unsigned long flags, - - out: - put_nsproxy(old_ns); -+ vxdprintk(VXD_CBIT(space, 3), -+ "copy_namespaces(0x%08lx,%p[%p]) = %d [%p]", -+ flags, tsk, old_ns, err, new_ns); - return err; - } - -@@ -174,7 +223,9 @@ void free_nsproxy(struct nsproxy *ns) - put_ipc_ns(ns->ipc_ns); - if (ns->pid_ns) - put_pid_ns(ns->pid_ns); -- put_net(ns->net_ns); -+ if (ns->net_ns) -+ put_net(ns->net_ns); -+ atomic_dec(&vs_global_nsproxy); - kmem_cache_free(nsproxy_cachep, ns); - } - -@@ -187,11 +238,15 @@ int unshare_nsproxy_namespaces(unsigned - { - int err = 0; - -+ vxdprintk(VXD_CBIT(space, 4), -+ "unshare_nsproxy_namespaces(0x%08lx,[%p])", -+ unshare_flags, current->nsproxy); + - if (!(unshare_flags & (CLONE_NEWNS | CLONE_NEWUTS | CLONE_NEWIPC | - CLONE_NEWNET))) - return 0; - -- if (!capable(CAP_SYS_ADMIN)) -+ if (!vx_can_unshare(CAP_SYS_ADMIN, unshare_flags)) - return -EPERM; - - *new_nsp = create_new_namespaces(unshare_flags, current, -diff -NurpP --minimal linux-3.7/kernel/pid.c linux-3.7-vs2.3.5.1/kernel/pid.c ---- linux-3.7/kernel/pid.c 2012-12-11 15:47:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/pid.c 2012-12-11 15:56:32.000000000 +0000 -@@ -36,6 +36,7 @@ - #include - #include - #include -+#include - - #define pid_hashfn(nr, ns) \ - hash_long((unsigned long)nr + (unsigned long)ns, pidhash_shift) -@@ -344,7 +345,7 @@ EXPORT_SYMBOL_GPL(find_pid_ns); - - struct pid *find_vpid(int nr) - { -- return find_pid_ns(nr, current->nsproxy->pid_ns); -+ return find_pid_ns(vx_rmap_pid(nr), current->nsproxy->pid_ns); - } - EXPORT_SYMBOL_GPL(find_vpid); - -@@ -404,6 +405,9 @@ void transfer_pid(struct task_struct *ol - struct task_struct *pid_task(struct pid *pid, enum pid_type type) - { - struct task_struct *result = NULL; ++/* inode vserver commands */ + -+ if (type == PIDTYPE_REALPID) -+ type = PIDTYPE_PID; - if (pid) { - struct hlist_node *first; - first = rcu_dereference_check(hlist_first_rcu(&pid->tasks[type]), -@@ -423,7 +427,7 @@ struct task_struct *find_task_by_pid_ns( - rcu_lockdep_assert(rcu_read_lock_held(), - "find_task_by_pid_ns() needs rcu_read_lock()" - " protection"); -- return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID); -+ return pid_task(find_pid_ns(vx_rmap_pid(nr), ns), PIDTYPE_PID); - } - - struct task_struct *find_task_by_vpid(pid_t vnr) -@@ -467,7 +471,7 @@ struct pid *find_get_pid(pid_t nr) - } - EXPORT_SYMBOL_GPL(find_get_pid); - --pid_t pid_nr_ns(struct pid *pid, struct pid_namespace *ns) -+pid_t pid_unmapped_nr_ns(struct pid *pid, struct pid_namespace *ns) - { - struct upid *upid; - pid_t nr = 0; -@@ -481,6 +485,11 @@ pid_t pid_nr_ns(struct pid *pid, struct - } - EXPORT_SYMBOL_GPL(pid_nr_ns); - -+pid_t pid_nr_ns(struct pid *pid, struct pid_namespace *ns) -+{ -+ return vx_map_pid(pid_unmapped_nr_ns(pid, ns)); -+} ++#define VCMD_get_iattr VC_CMD(INODE, 1, 1) ++#define VCMD_set_iattr VC_CMD(INODE, 2, 1) + - pid_t pid_vnr(struct pid *pid) - { - return pid_nr_ns(pid, current->nsproxy->pid_ns); -diff -NurpP --minimal linux-3.7/kernel/pid_namespace.c linux-3.7-vs2.3.5.1/kernel/pid_namespace.c ---- linux-3.7/kernel/pid_namespace.c 2012-12-11 15:47:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/pid_namespace.c 2012-12-11 17:04:24.000000000 +0000 -@@ -17,6 +17,7 @@ - #include - #include - #include -+#include - - #define BITS_PER_PAGE (PAGE_SIZE*8) - -@@ -100,6 +101,7 @@ static struct pid_namespace *create_pid_ - goto out_free_map; - - kref_init(&ns->kref); -+ atomic_inc(&vs_global_pid_ns); - ns->level = level; - ns->parent = get_pid_ns(parent_pid_ns); - -@@ -131,6 +133,7 @@ static void destroy_pid_namespace(struct - - for (i = 0; i < PIDMAP_ENTRIES; i++) - kfree(ns->pidmap[i].page); -+ atomic_dec(&vs_global_pid_ns); - kmem_cache_free(pid_ns_cachep, ns); - } - -diff -NurpP --minimal linux-3.7/kernel/posix-timers.c linux-3.7-vs2.3.5.1/kernel/posix-timers.c ---- linux-3.7/kernel/posix-timers.c 2012-01-09 15:15:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/posix-timers.c 2012-12-11 15:56:32.000000000 +0000 -@@ -47,6 +47,7 @@ - #include - #include - #include -+#include - - /* - * Management arrays for POSIX timers. Timers are kept in slab memory -@@ -340,6 +341,7 @@ int posix_timer_event(struct k_itimer *t - { - struct task_struct *task; - int shared, ret = -1; ++#define VCMD_fget_iattr VC_CMD(INODE, 3, 0) ++#define VCMD_fset_iattr VC_CMD(INODE, 4, 0) + - /* - * FIXME: if ->sigq is queued we can race with - * dequeue_signal()->do_schedule_next_timer(). -@@ -356,10 +358,18 @@ int posix_timer_event(struct k_itimer *t - rcu_read_lock(); - task = pid_task(timr->it_pid, PIDTYPE_PID); - if (task) { -+ struct vx_info_save vxis; -+ struct vx_info *vxi; ++struct vcmd_ctx_iattr_v1 { ++ const char __user *name; ++ uint32_t tag; ++ uint32_t flags; ++ uint32_t mask; ++}; + -+ vxi = get_vx_info(task->vx_info); -+ enter_vx_info(vxi, &vxis); - shared = !(timr->it_sigev_notify & SIGEV_THREAD_ID); - ret = send_sigqueue(timr->sigq, task, shared); -+ leave_vx_info(&vxis); -+ put_vx_info(vxi); - } - rcu_read_unlock(); ++struct vcmd_ctx_fiattr_v0 { ++ uint32_t tag; ++ uint32_t flags; ++ uint32_t mask; ++}; + - /* If we failed to send the signal the timer stops. */ - return ret > 0; - } -diff -NurpP --minimal linux-3.7/kernel/printk.c linux-3.7-vs2.3.5.1/kernel/printk.c ---- linux-3.7/kernel/printk.c 2012-12-11 15:47:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/printk.c 2012-12-11 15:56:32.000000000 +0000 -@@ -42,6 +42,7 @@ - #include - #include - #include -+#include - - #include - -@@ -818,7 +819,7 @@ static int check_syslog_permissions(int - return 0; - - if (syslog_action_restricted(type)) { -- if (capable(CAP_SYSLOG)) -+ if (vx_capable(CAP_SYSLOG, VXC_SYSLOG)) - return 0; - /* For historical reasons, accept CAP_SYS_ADMIN too, with a warning */ - if (capable(CAP_SYS_ADMIN)) { -@@ -1111,12 +1112,9 @@ int do_syslog(int type, char __user *buf - if (error) - return error; - -- switch (type) { -- case SYSLOG_ACTION_CLOSE: /* Close log */ -- break; -- case SYSLOG_ACTION_OPEN: /* Open log */ -- break; -- case SYSLOG_ACTION_READ: /* Read from log */ -+ if ((type == SYSLOG_ACTION_READ) || -+ (type == SYSLOG_ACTION_READ_ALL) || -+ (type == SYSLOG_ACTION_READ_CLEAR)) { - error = -EINVAL; - if (!buf || len < 0) - goto out; -@@ -1127,6 +1125,16 @@ int do_syslog(int type, char __user *buf - error = -EFAULT; - goto out; - } -+ } -+ if (!vx_check(0, VS_ADMIN|VS_WATCH)) -+ return vx_do_syslog(type, buf, len); ++#endif /* _UAPI_VS_INODE_CMD_H */ +diff -NurpP --minimal linux-3.18.5/include/uapi/vserver/limit.h linux-3.18.5-vs2.3.7.3/include/uapi/vserver/limit.h +--- linux-3.18.5/include/uapi/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/uapi/vserver/limit.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,14 @@ ++#ifndef _UAPI_VS_LIMIT_H ++#define _UAPI_VS_LIMIT_H + -+ switch (type) { -+ case SYSLOG_ACTION_CLOSE: /* Close log */ -+ break; -+ case SYSLOG_ACTION_OPEN: /* Open log */ -+ break; -+ case SYSLOG_ACTION_READ: /* Read from log */ - error = wait_event_interruptible(log_wait, - syslog_seq != log_next_seq); - if (error) -@@ -1139,16 +1147,6 @@ int do_syslog(int type, char __user *buf - /* FALL THRU */ - /* Read last kernel messages */ - case SYSLOG_ACTION_READ_ALL: -- error = -EINVAL; -- if (!buf || len < 0) -- goto out; -- error = 0; -- if (!len) -- goto out; -- if (!access_ok(VERIFY_WRITE, buf, len)) { -- error = -EFAULT; -- goto out; -- } - error = syslog_print_all(buf, len, clear); - break; - /* Clear ring buffer */ -diff -NurpP --minimal linux-3.7/kernel/ptrace.c linux-3.7-vs2.3.5.1/kernel/ptrace.c ---- linux-3.7/kernel/ptrace.c 2012-12-11 15:47:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/ptrace.c 2012-12-11 15:56:32.000000000 +0000 -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - #include - #include - -@@ -217,6 +218,11 @@ ok: - dumpable = get_dumpable(task->mm); - if (!dumpable && !ptrace_has_cap(task_user_ns(task), mode)) - return -EPERM; -+ if (!vx_check(task->xid, VS_ADMIN_P|VS_WATCH_P|VS_IDENT)) -+ return -EPERM; -+ if (!vx_check(task->xid, VS_IDENT) && -+ !task_vx_flags(task, VXF_STATE_ADMIN, 0)) -+ return -EACCES; - - return security_ptrace_access_check(task, mode); - } -diff -NurpP --minimal linux-3.7/kernel/sched/core.c linux-3.7-vs2.3.5.1/kernel/sched/core.c ---- linux-3.7/kernel/sched/core.c 2012-12-11 15:47:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/sched/core.c 2012-12-11 15:56:32.000000000 +0000 -@@ -72,6 +72,8 @@ - #include - #include - #include -+#include -+#include - - #include - #include -@@ -2030,9 +2032,17 @@ EXPORT_SYMBOL(avenrun); /* should be rem - */ - void get_avenrun(unsigned long *loads, unsigned long offset, int shift) - { -- loads[0] = (avenrun[0] + offset) << shift; -- loads[1] = (avenrun[1] + offset) << shift; -- loads[2] = (avenrun[2] + offset) << shift; -+ if (vx_flags(VXF_VIRT_LOAD, 0)) { -+ struct vx_info *vxi = current_vx_info(); + -+ loads[0] = (vxi->cvirt.load[0] + offset) << shift; -+ loads[1] = (vxi->cvirt.load[1] + offset) << shift; -+ loads[2] = (vxi->cvirt.load[2] + offset) << shift; -+ } else { -+ loads[0] = (avenrun[0] + offset) << shift; -+ loads[1] = (avenrun[1] + offset) << shift; -+ loads[2] = (avenrun[2] + offset) << shift; -+ } - } - - static long calc_load_fold_active(struct rq *this_rq) -@@ -3596,7 +3606,7 @@ SYSCALL_DEFINE1(nice, int, increment) - nice = 19; - - if (increment < 0 && !can_nice(current, nice)) -- return -EPERM; -+ return vx_flags(VXF_IGNEG_NICE, 0) ? 0 : -EPERM; - - retval = security_task_setnice(current, nice); - if (retval) -diff -NurpP --minimal linux-3.7/kernel/sched/cputime.c linux-3.7-vs2.3.5.1/kernel/sched/cputime.c ---- linux-3.7/kernel/sched/cputime.c 2012-12-11 15:47:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/sched/cputime.c 2012-12-11 21:13:27.000000000 +0000 -@@ -3,6 +3,7 @@ - #include - #include - #include -+#include - #include "sched.h" - - -@@ -150,14 +151,17 @@ static inline void task_group_account_fi - void account_user_time(struct task_struct *p, cputime_t cputime, - cputime_t cputime_scaled) - { -+ struct vx_info *vxi = p->vx_info; /* p is _always_ current */ -+ int nice = (TASK_NICE(p) > 0); - int index; - - /* Add user time to process. */ - p->utime += cputime; - p->utimescaled += cputime_scaled; -+ vx_account_user(vxi, cputime, nice); - account_group_user_time(p, cputime); - -- index = (TASK_NICE(p) > 0) ? CPUTIME_NICE : CPUTIME_USER; -+ index = (nice) ? CPUTIME_NICE : CPUTIME_USER; - - /* Add user time to cpustat. */ - task_group_account_field(p, index, (__force u64) cputime); -@@ -204,9 +208,12 @@ static inline - void __account_system_time(struct task_struct *p, cputime_t cputime, - cputime_t cputime_scaled, int index) - { -+ struct vx_info *vxi = p->vx_info; /* p is _always_ current */ ++#define VLIMIT_NSOCK 16 ++#define VLIMIT_OPENFD 17 ++#define VLIMIT_ANON 18 ++#define VLIMIT_SHMEM 19 ++#define VLIMIT_SEMARY 20 ++#define VLIMIT_NSEMS 21 ++#define VLIMIT_DENTRY 22 ++#define VLIMIT_MAPPED 23 + - /* Add system time to process. */ - p->stime += cputime; - p->stimescaled += cputime_scaled; -+ vx_account_system(vxi, cputime, 0 /* do we have idle time? */); - account_group_system_time(p, cputime); - - /* Add system time to cpustat. */ -diff -NurpP --minimal linux-3.7/kernel/sched/fair.c linux-3.7-vs2.3.5.1/kernel/sched/fair.c ---- linux-3.7/kernel/sched/fair.c 2012-12-11 15:47:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/sched/fair.c 2012-12-11 15:56:33.000000000 +0000 -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - - #include - -@@ -1111,6 +1112,8 @@ enqueue_entity(struct cfs_rq *cfs_rq, st - __enqueue_entity(cfs_rq, se); - se->on_rq = 1; - -+ if (entity_is_task(se)) -+ vx_activate_task(task_of(se)); - if (cfs_rq->nr_running == 1) { - list_add_leaf_cfs_rq(cfs_rq); - check_enqueue_throttle(cfs_rq); -@@ -1191,6 +1194,8 @@ dequeue_entity(struct cfs_rq *cfs_rq, st - if (se != cfs_rq->curr) - __dequeue_entity(cfs_rq, se); - se->on_rq = 0; -+ if (entity_is_task(se)) -+ vx_deactivate_task(task_of(se)); - update_cfs_load(cfs_rq, 0); - account_entity_dequeue(cfs_rq, se); - -diff -NurpP --minimal linux-3.7/kernel/signal.c linux-3.7-vs2.3.5.1/kernel/signal.c ---- linux-3.7/kernel/signal.c 2012-12-11 15:47:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/signal.c 2012-12-11 15:56:33.000000000 +0000 -@@ -31,6 +31,8 @@ - #include - #include - #include -+#include -+#include - #define CREATE_TRACE_POINTS - #include - -@@ -791,9 +793,18 @@ static int check_kill_permission(int sig - struct pid *sid; - int error; - -+ vxdprintk(VXD_CBIT(misc, 7), -+ "check_kill_permission(%d,%p,%p[#%u,%u])", -+ sig, info, t, vx_task_xid(t), t->pid); ++#endif /* _UAPI_VS_LIMIT_H */ +diff -NurpP --minimal linux-3.18.5/include/uapi/vserver/limit_cmd.h linux-3.18.5-vs2.3.7.3/include/uapi/vserver/limit_cmd.h +--- linux-3.18.5/include/uapi/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/uapi/vserver/limit_cmd.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,40 @@ ++#ifndef _UAPI_VS_LIMIT_CMD_H ++#define _UAPI_VS_LIMIT_CMD_H + - if (!valid_signal(sig)) - return -EINVAL; - -+/* FIXME: needed? if so, why? -+ if ((info != SEND_SIG_NOINFO) && -+ (is_si_special(info) || !si_fromuser(info))) -+ goto skip; */ + - if (!si_fromuser(info)) - return 0; - -@@ -817,6 +828,20 @@ static int check_kill_permission(int sig - } - } - -+ error = -EPERM; -+ if (t->pid == 1 && current->xid) -+ return error; ++/* rlimit vserver commands */ + -+ error = -ESRCH; -+ /* FIXME: we shouldn't return ESRCH ever, to avoid -+ loops, maybe ENOENT or EACCES? */ -+ if (!vx_check(vx_task_xid(t), VS_WATCH_P | VS_IDENT)) { -+ vxdprintk(current->xid || VXD_CBIT(misc, 7), -+ "signal %d[%p] xid mismatch %p[#%u,%u] xid=#%u", -+ sig, info, t, vx_task_xid(t), t->pid, current->xid); -+ return error; -+ } -+/* skip: */ - return security_task_kill(t, info, sig, 0); - } - -@@ -1352,7 +1377,7 @@ int kill_pid_info(int sig, struct siginf - rcu_read_lock(); - retry: - p = pid_task(pid, PIDTYPE_PID); -- if (p) { -+ if (p && vx_check(vx_task_xid(p), VS_IDENT)) { - error = group_send_sig_info(sig, info, p); - if (unlikely(error == -ESRCH)) - /* -@@ -1400,7 +1425,7 @@ int kill_pid_info_as_cred(int sig, struc - - rcu_read_lock(); - p = pid_task(pid, PIDTYPE_PID); -- if (!p) { -+ if (!p || !vx_check(vx_task_xid(p), VS_IDENT)) { - ret = -ESRCH; - goto out_unlock; - } -@@ -1452,8 +1477,10 @@ static int kill_something_info(int sig, - struct task_struct * p; - - for_each_process(p) { -- if (task_pid_vnr(p) > 1 && -- !same_thread_group(p, current)) { -+ if (vx_check(vx_task_xid(p), VS_ADMIN|VS_IDENT) && -+ task_pid_vnr(p) > 1 && -+ !same_thread_group(p, current) && -+ !vx_current_initpid(p->pid)) { - int err = group_send_sig_info(sig, info, p); - ++count; - if (err != -EPERM) -@@ -2308,6 +2335,11 @@ relock: - !sig_kernel_only(signr)) - continue; - -+ /* virtual init is protected against user signals */ -+ if ((info->si_code == SI_USER) && -+ vx_current_initpid(current->pid)) -+ continue; ++#define VCMD_get_rlimit VC_CMD(RLIMIT, 1, 0) ++#define VCMD_set_rlimit VC_CMD(RLIMIT, 2, 0) ++#define VCMD_get_rlimit_mask VC_CMD(RLIMIT, 3, 0) ++#define VCMD_reset_hits VC_CMD(RLIMIT, 7, 0) ++#define VCMD_reset_minmax VC_CMD(RLIMIT, 9, 0) + - if (sig_kernel_stop(signr)) { - /* - * The default action is to stop all threads in -diff -NurpP --minimal linux-3.7/kernel/softirq.c linux-3.7-vs2.3.5.1/kernel/softirq.c ---- linux-3.7/kernel/softirq.c 2012-12-11 15:47:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/softirq.c 2012-12-11 15:56:33.000000000 +0000 -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - #define CREATE_TRACE_POINTS - #include -diff -NurpP --minimal linux-3.7/kernel/sys.c linux-3.7-vs2.3.5.1/kernel/sys.c ---- linux-3.7/kernel/sys.c 2012-12-11 15:47:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/sys.c 2012-12-11 15:56:33.000000000 +0000 -@@ -47,6 +47,7 @@ - #include - #include - #include -+#include - - #include - /* Move somewhere else to avoid recompiling? */ -@@ -154,7 +155,10 @@ static int set_one_prio(struct task_stru - goto out; - } - if (niceval < task_nice(p) && !can_nice(p, niceval)) { -- error = -EACCES; -+ if (vx_flags(VXF_IGNEG_NICE, 0)) -+ error = 0; -+ else -+ error = -EACCES; - goto out; - } - no_nice = security_task_setnice(p, niceval); -@@ -205,6 +209,8 @@ SYSCALL_DEFINE3(setpriority, int, which, - else - pgrp = task_pgrp(current); - do_each_pid_thread(pgrp, PIDTYPE_PGID, p) { -+ if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT)) -+ continue; - error = set_one_prio(p, niceval, error); - } while_each_pid_thread(pgrp, PIDTYPE_PGID, p); - break; -@@ -270,6 +276,8 @@ SYSCALL_DEFINE2(getpriority, int, which, - else - pgrp = task_pgrp(current); - do_each_pid_thread(pgrp, PIDTYPE_PGID, p) { -+ if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT)) -+ continue; - niceval = 20 - task_nice(p); - if (niceval > retval) - retval = niceval; -@@ -422,6 +430,8 @@ EXPORT_SYMBOL_GPL(kernel_power_off); - - static DEFINE_MUTEX(reboot_mutex); - -+long vs_reboot(unsigned int, void __user *); ++struct vcmd_ctx_rlimit_v0 { ++ uint32_t id; ++ uint64_t minimum; ++ uint64_t softlimit; ++ uint64_t maximum; ++}; + - /* - * Reboot system call: for obvious reasons only root may call it, - * and even root needs to set up some magic numbers in the registers -@@ -463,6 +473,9 @@ SYSCALL_DEFINE4(reboot, int, magic1, int - if ((cmd == LINUX_REBOOT_CMD_POWER_OFF) && !pm_power_off) - cmd = LINUX_REBOOT_CMD_HALT; - -+ if (!vx_check(0, VS_ADMIN|VS_WATCH)) -+ return vs_reboot(cmd, arg); ++struct vcmd_ctx_rlimit_mask_v0 { ++ uint32_t minimum; ++ uint32_t softlimit; ++ uint32_t maximum; ++}; + - mutex_lock(&reboot_mutex); - switch (cmd) { - case LINUX_REBOOT_CMD_RESTART: -@@ -1370,7 +1383,8 @@ SYSCALL_DEFINE2(sethostname, char __user - int errno; - char tmp[__NEW_UTS_LEN]; - -- if (!ns_capable(current->nsproxy->uts_ns->user_ns, CAP_SYS_ADMIN)) -+ if (!vx_ns_capable(current->nsproxy->uts_ns->user_ns, -+ CAP_SYS_ADMIN, VXC_SET_UTSNAME)) - return -EPERM; - - if (len < 0 || len > __NEW_UTS_LEN) -@@ -1421,7 +1435,8 @@ SYSCALL_DEFINE2(setdomainname, char __us - int errno; - char tmp[__NEW_UTS_LEN]; - -- if (!ns_capable(current->nsproxy->uts_ns->user_ns, CAP_SYS_ADMIN)) -+ if (!vx_ns_capable(current->nsproxy->uts_ns->user_ns, -+ CAP_SYS_ADMIN, VXC_SET_UTSNAME)) - return -EPERM; - if (len < 0 || len > __NEW_UTS_LEN) - return -EINVAL; -@@ -1540,7 +1555,7 @@ int do_prlimit(struct task_struct *tsk, - /* Keep the capable check against init_user_ns until - cgroups can contain all limits */ - if (new_rlim->rlim_max > rlim->rlim_max && -- !capable(CAP_SYS_RESOURCE)) -+ !vx_capable(CAP_SYS_RESOURCE, VXC_SET_RLIMIT)) - retval = -EPERM; - if (!retval) - retval = security_task_setrlimit(tsk->group_leader, -@@ -1593,7 +1608,8 @@ static int check_prlimit_permission(stru - gid_eq(cred->gid, tcred->sgid) && - gid_eq(cred->gid, tcred->gid)) - return 0; -- if (ns_capable(tcred->user_ns, CAP_SYS_RESOURCE)) -+ if (vx_ns_capable(tcred->user_ns, -+ CAP_SYS_RESOURCE, VXC_SET_RLIMIT)) - return 0; - - return -EPERM; -diff -NurpP --minimal linux-3.7/kernel/sysctl.c linux-3.7-vs2.3.5.1/kernel/sysctl.c ---- linux-3.7/kernel/sysctl.c 2012-12-11 15:47:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/sysctl.c 2012-12-11 15:56:33.000000000 +0000 -@@ -82,6 +82,7 @@ - #if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT) - #include - #endif -+extern char vshelper_path[]; - #ifdef CONFIG_CHR_DEV_SG - #include - #endif -@@ -574,6 +575,13 @@ static struct ctl_table kern_table[] = { - .proc_handler = proc_dostring, - }, - #endif -+ { -+ .procname = "vshelper", -+ .data = &vshelper_path, -+ .maxlen = 256, -+ .mode = 0644, -+ .proc_handler = &proc_dostring, -+ }, - #ifdef CONFIG_CHR_DEV_SG - { - .procname = "sg-big-buff", -diff -NurpP --minimal linux-3.7/kernel/sysctl_binary.c linux-3.7-vs2.3.5.1/kernel/sysctl_binary.c ---- linux-3.7/kernel/sysctl_binary.c 2012-10-04 13:27:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/sysctl_binary.c 2012-12-11 15:56:33.000000000 +0000 -@@ -73,6 +73,7 @@ static const struct bin_table bin_kern_t - - { CTL_INT, KERN_PANIC, "panic" }, - { CTL_INT, KERN_REALROOTDEV, "real-root-dev" }, -+ { CTL_STR, KERN_VSHELPER, "vshelper" }, - - { CTL_STR, KERN_SPARC_REBOOT, "reboot-cmd" }, - { CTL_INT, KERN_CTLALTDEL, "ctrl-alt-del" }, -diff -NurpP --minimal linux-3.7/kernel/time/timekeeping.c linux-3.7-vs2.3.5.1/kernel/time/timekeeping.c ---- linux-3.7/kernel/time/timekeeping.c 2012-12-11 15:47:49.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/time/timekeeping.c 2012-12-11 21:13:56.000000000 +0000 -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - - - static struct timekeeper timekeeper; -@@ -243,6 +244,7 @@ void getnstimeofday(struct timespec *ts) - - ts->tv_nsec = 0; - timespec_add_ns(ts, nsecs); -+ vx_adjust_timespec(ts); - } - EXPORT_SYMBOL(getnstimeofday); - -diff -NurpP --minimal linux-3.7/kernel/time.c linux-3.7-vs2.3.5.1/kernel/time.c ---- linux-3.7/kernel/time.c 2012-12-11 15:47:49.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/time.c 2012-12-11 21:12:29.000000000 +0000 -@@ -37,6 +37,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -92,7 +93,7 @@ SYSCALL_DEFINE1(stime, time_t __user *, - if (err) - return err; - -- do_settimeofday(&tv); -+ vx_settimeofday(&tv); - return 0; - } - -@@ -172,7 +173,7 @@ int do_sys_settimeofday(const struct tim - } - } - if (tv) -- return do_settimeofday(tv); -+ return vx_settimeofday(tv); - return 0; - } - -diff -NurpP --minimal linux-3.7/kernel/timer.c linux-3.7-vs2.3.5.1/kernel/timer.c ---- linux-3.7/kernel/timer.c 2012-12-11 15:47:49.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/timer.c 2012-12-11 15:56:33.000000000 +0000 -@@ -40,6 +40,10 @@ - #include - #include - #include -+#include -+#include -+#include -+#include - - #include - #include -diff -NurpP --minimal linux-3.7/kernel/user_namespace.c linux-3.7-vs2.3.5.1/kernel/user_namespace.c ---- linux-3.7/kernel/user_namespace.c 2012-12-11 15:47:49.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/user_namespace.c 2012-12-11 16:58:02.000000000 +0000 -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - - static struct kmem_cache *user_ns_cachep __read_mostly; - -@@ -53,6 +54,7 @@ int create_user_ns(struct cred *new) - return -ENOMEM; - - kref_init(&ns->kref); -+ atomic_inc(&vs_global_user_ns); - ns->parent = parent_ns; - ns->owner = owner; - ns->group = group; -@@ -85,6 +87,9 @@ void free_user_ns(struct kref *kref) - - parent = ns->parent; - kmem_cache_free(user_ns_cachep, ns); ++#define VCMD_rlimit_stat VC_CMD(VSTAT, 1, 0) + -+ /* FIXME: maybe move into destroyer? */ -+ atomic_dec(&vs_global_user_ns); - put_user_ns(parent); - } - EXPORT_SYMBOL(free_user_ns); -diff -NurpP --minimal linux-3.7/kernel/utsname.c linux-3.7-vs2.3.5.1/kernel/utsname.c ---- linux-3.7/kernel/utsname.c 2012-07-22 21:39:47.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/utsname.c 2012-12-11 15:56:33.000000000 +0000 -@@ -16,14 +16,17 @@ - #include - #include - #include -+#include - - static struct uts_namespace *create_uts_ns(void) - { - struct uts_namespace *uts_ns; - - uts_ns = kmalloc(sizeof(struct uts_namespace), GFP_KERNEL); -- if (uts_ns) -+ if (uts_ns) { - kref_init(&uts_ns->kref); -+ atomic_inc(&vs_global_uts_ns); -+ } - return uts_ns; - } - -@@ -32,8 +35,8 @@ static struct uts_namespace *create_uts_ - * @old_ns: namespace to clone - * Return NULL on error (failure to kmalloc), new ns otherwise - */ --static struct uts_namespace *clone_uts_ns(struct task_struct *tsk, -- struct uts_namespace *old_ns) -+static struct uts_namespace *clone_uts_ns(struct uts_namespace *old_ns, -+ struct user_namespace *old_user) - { - struct uts_namespace *ns; - -@@ -43,7 +46,7 @@ static struct uts_namespace *clone_uts_n - - down_read(&uts_sem); - memcpy(&ns->name, &old_ns->name, sizeof(ns->name)); -- ns->user_ns = get_user_ns(task_cred_xxx(tsk, user_ns)); -+ ns->user_ns = get_user_ns(old_user); - up_read(&uts_sem); - return ns; - } -@@ -55,9 +58,9 @@ static struct uts_namespace *clone_uts_n - * versa. - */ - struct uts_namespace *copy_utsname(unsigned long flags, -- struct task_struct *tsk) -+ struct uts_namespace *old_ns, -+ struct user_namespace *user_ns) - { -- struct uts_namespace *old_ns = tsk->nsproxy->uts_ns; - struct uts_namespace *new_ns; - - BUG_ON(!old_ns); -@@ -66,7 +69,7 @@ struct uts_namespace *copy_utsname(unsig - if (!(flags & CLONE_NEWUTS)) - return old_ns; - -- new_ns = clone_uts_ns(tsk, old_ns); -+ new_ns = clone_uts_ns(old_ns, user_ns); - - put_uts_ns(old_ns); - return new_ns; -@@ -78,6 +81,7 @@ void free_uts_ns(struct kref *kref) - - ns = container_of(kref, struct uts_namespace, kref); - put_user_ns(ns->user_ns); -+ atomic_dec(&vs_global_uts_ns); - kfree(ns); - } - -diff -NurpP --minimal linux-3.7/kernel/vserver/Kconfig linux-3.7-vs2.3.5.1/kernel/vserver/Kconfig ---- linux-3.7/kernel/vserver/Kconfig 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/Kconfig 2012-12-11 15:56:33.000000000 +0000 -@@ -0,0 +1,233 @@ -+# -+# Linux VServer configuration -+# ++struct vcmd_rlimit_stat_v0 { ++ uint32_t id; ++ uint32_t hits; ++ uint64_t value; ++ uint64_t minimum; ++ uint64_t maximum; ++}; + -+menu "Linux VServer" ++#define CRLIM_UNSET (0ULL) ++#define CRLIM_INFINITY (~0ULL) ++#define CRLIM_KEEP (~1ULL) + -+config VSERVER_AUTO_LBACK -+ bool "Automatically Assign Loopback IP" -+ default y -+ help -+ Automatically assign a guest specific loopback -+ IP and add it to the kernel network stack on -+ startup. ++#endif /* _UAPI_VS_LIMIT_CMD_H */ +diff -NurpP --minimal linux-3.18.5/include/uapi/vserver/monitor.h linux-3.18.5-vs2.3.7.3/include/uapi/vserver/monitor.h +--- linux-3.18.5/include/uapi/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/uapi/vserver/monitor.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,96 @@ ++#ifndef _UAPI_VS_MONITOR_H ++#define _UAPI_VS_MONITOR_H + -+config VSERVER_AUTO_SINGLE -+ bool "Automatic Single IP Special Casing" -+ depends on EXPERIMENTAL -+ default y -+ help -+ This allows network contexts with a single IP to -+ automatically remap 0.0.0.0 bindings to that IP, -+ avoiding further network checks and improving -+ performance. ++#include + -+ (note: such guests do not allow to change the ip -+ on the fly and do not show loopback addresses) + -+config VSERVER_COWBL -+ bool "Enable COW Immutable Link Breaking" -+ default y -+ help -+ This enables the COW (Copy-On-Write) link break code. -+ It allows you to treat unified files like normal files -+ when writing to them (which will implicitely break the -+ link and create a copy of the unified file) ++enum { ++ VXM_UNUSED = 0, + -+config VSERVER_VTIME -+ bool "Enable Virtualized Guest Time" -+ depends on EXPERIMENTAL -+ default n -+ help -+ This enables per guest time offsets to allow for -+ adjusting the system clock individually per guest. -+ this adds some overhead to the time functions and -+ therefore should not be enabled without good reason. ++ VXM_SYNC = 0x10, + -+config VSERVER_DEVICE -+ bool "Enable Guest Device Mapping" -+ depends on EXPERIMENTAL -+ default n -+ help -+ This enables generic device remapping. ++ VXM_UPDATE = 0x20, ++ VXM_UPDATE_1, ++ VXM_UPDATE_2, + -+config VSERVER_PROC_SECURE -+ bool "Enable Proc Security" -+ depends on PROC_FS -+ default y -+ help -+ This configures ProcFS security to initially hide -+ non-process entries for all contexts except the main and -+ spectator context (i.e. for all guests), which is a secure -+ default. ++ VXM_RQINFO_1 = 0x24, ++ VXM_RQINFO_2, + -+ (note: on 1.2x the entries were visible by default) ++ VXM_ACTIVATE = 0x40, ++ VXM_DEACTIVATE, ++ VXM_IDLE, + -+choice -+ prompt "Persistent Inode Tagging" -+ default TAGGING_ID24 -+ help -+ This adds persistent context information to filesystems -+ mounted with the tagxid option. Tagging is a requirement -+ for per-context disk limits and per-context quota. ++ VXM_HOLD = 0x44, ++ VXM_UNHOLD, + ++ VXM_MIGRATE = 0x48, ++ VXM_RESCHED, + -+config TAGGING_NONE -+ bool "Disabled" -+ help -+ do not store per-context information in inodes. ++ /* all other bits are flags */ ++ VXM_SCHED = 0x80, ++}; + -+config TAGGING_UID16 -+ bool "UID16/GID32" -+ help -+ reduces UID to 16 bit, but leaves GID at 32 bit. ++struct _vxm_update_1 { ++ uint32_t tokens_max; ++ uint32_t fill_rate; ++ uint32_t interval; ++}; + -+config TAGGING_GID16 -+ bool "UID32/GID16" -+ help -+ reduces GID to 16 bit, but leaves UID at 32 bit. ++struct _vxm_update_2 { ++ uint32_t tokens_min; ++ uint32_t fill_rate; ++ uint32_t interval; ++}; + -+config TAGGING_ID24 -+ bool "UID24/GID24" -+ help -+ uses the upper 8bit from UID and GID for XID tagging -+ which leaves 24bit for UID/GID each, which should be -+ more than sufficient for normal use. ++struct _vxm_rqinfo_1 { ++ uint16_t running; ++ uint16_t onhold; ++ uint16_t iowait; ++ uint16_t uintr; ++ uint32_t idle_tokens; ++}; + -+config TAGGING_INTERN -+ bool "UID32/GID32" -+ help -+ this uses otherwise reserved inode fields in the on -+ disk representation, which limits the use to a few -+ filesystems (currently ext2 and ext3) ++struct _vxm_rqinfo_2 { ++ uint32_t norm_time; ++ uint32_t idle_time; ++ uint32_t idle_skip; ++}; + -+endchoice ++struct _vxm_sched { ++ uint32_t tokens; ++ uint32_t norm_time; ++ uint32_t idle_time; ++}; + -+config TAG_NFSD -+ bool "Tag NFSD User Auth and Files" -+ default n -+ help -+ Enable this if you do want the in-kernel NFS -+ Server to use the tagging specified above. -+ (will require patched clients too) ++struct _vxm_task { ++ uint16_t pid; ++ uint16_t state; ++}; + -+config VSERVER_PRIVACY -+ bool "Honor Privacy Aspects of Guests" -+ default n -+ help -+ When enabled, most context checks will disallow -+ access to structures assigned to a specific context, -+ like ptys or loop devices. -+ -+config VSERVER_CONTEXTS -+ int "Maximum number of Contexts (1-65533)" if EMBEDDED -+ range 1 65533 -+ default "768" if 64BIT -+ default "256" -+ help -+ This setting will optimize certain data structures -+ and memory allocations according to the expected -+ maximum. ++struct _vxm_event { ++ uint32_t jif; ++ union { ++ uint32_t seq; ++ uint32_t sec; ++ }; ++ union { ++ uint32_t tokens; ++ uint32_t nsec; ++ struct _vxm_task tsk; ++ }; ++}; + -+ note: this is not a strict upper limit. ++struct _vx_mon_entry { ++ uint16_t type; ++ uint16_t xid; ++ union { ++ struct _vxm_event ev; ++ struct _vxm_sched sd; ++ struct _vxm_update_1 u1; ++ struct _vxm_update_2 u2; ++ struct _vxm_rqinfo_1 q1; ++ struct _vxm_rqinfo_2 q2; ++ }; ++}; + -+config VSERVER_WARN -+ bool "VServer Warnings" -+ default y -+ help -+ This enables various runtime warnings, which will -+ notify about potential manipulation attempts or -+ resource shortage. It is generally considered to -+ be a good idea to have that enabled. ++#endif /* _UAPI_VS_MONITOR_H */ +diff -NurpP --minimal linux-3.18.5/include/uapi/vserver/network.h linux-3.18.5-vs2.3.7.3/include/uapi/vserver/network.h +--- linux-3.18.5/include/uapi/vserver/network.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/uapi/vserver/network.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,76 @@ ++#ifndef _UAPI_VS_NETWORK_H ++#define _UAPI_VS_NETWORK_H + -+config VSERVER_WARN_DEVPTS -+ bool "VServer DevPTS Warnings" -+ depends on VSERVER_WARN -+ default y -+ help -+ This enables DevPTS related warnings, issued when a -+ process inside a context tries to lookup or access -+ a dynamic pts from the host or a different context. ++#include + -+config VSERVER_DEBUG -+ bool "VServer Debugging Code" -+ default n -+ help -+ Set this to yes if you want to be able to activate -+ debugging output at runtime. It adds a very small -+ overhead to all vserver related functions and -+ increases the kernel size by about 20k. + -+config VSERVER_HISTORY -+ bool "VServer History Tracing" -+ depends on VSERVER_DEBUG -+ default n -+ help -+ Set this to yes if you want to record the history of -+ linux-vserver activities, so they can be replayed in -+ the event of a kernel panic or oops. ++#define MAX_N_CONTEXT 65535 /* Arbitrary limit */ + -+config VSERVER_HISTORY_SIZE -+ int "Per-CPU History Size (32-65536)" -+ depends on VSERVER_HISTORY -+ range 32 65536 -+ default 64 -+ help -+ This allows you to specify the number of entries in -+ the per-CPU history buffer. + -+config VSERVER_EXTRA_MNT_CHECK -+ bool "Extra Checks for Reachability" -+ default n -+ help -+ Set this to yes if you want to do extra checks for -+ vfsmount reachability in the proc filesystem code. -+ This shouldn't be required on any setup utilizing -+ mnt namespaces. ++/* network flags */ + -+choice -+ prompt "Quotes used in debug and warn messages" -+ default QUOTES_ISO8859 ++#define NXF_INFO_PRIVATE 0x00000008 + -+config QUOTES_ISO8859 -+ bool "Extended ASCII (ISO 8859) angle quotes" -+ help -+ This uses the extended ASCII characters \xbb -+ and \xab for quoting file and process names. ++#define NXF_SINGLE_IP 0x00000100 ++#define NXF_LBACK_REMAP 0x00000200 ++#define NXF_LBACK_ALLOW 0x00000400 + -+config QUOTES_UTF8 -+ bool "UTF-8 angle quotes" -+ help -+ This uses the the UTF-8 sequences for angle -+ quotes to quote file and process names. ++#define NXF_HIDE_NETIF 0x02000000 ++#define NXF_HIDE_LBACK 0x04000000 + -+config QUOTES_ASCII -+ bool "ASCII single quotes" -+ help -+ This uses the ASCII single quote character -+ (\x27) to quote file and process names. ++#define NXF_STATE_SETUP (1ULL << 32) ++#define NXF_STATE_ADMIN (1ULL << 34) + -+endchoice ++#define NXF_SC_HELPER (1ULL << 36) ++#define NXF_PERSISTENT (1ULL << 38) + -+endmenu ++#define NXF_ONE_TIME (0x0005ULL << 32) + + -+config VSERVER -+ bool -+ default y -+ select NAMESPACES -+ select UTS_NS -+ select IPC_NS -+# select USER_NS -+ select SYSVIPC ++#define NXF_INIT_SET (__nxf_init_set()) + -+config VSERVER_SECURITY -+ bool -+ depends on SECURITY -+ default y -+ select SECURITY_CAPABILITIES ++static inline uint64_t __nxf_init_set(void) { ++ return NXF_STATE_ADMIN ++#ifdef CONFIG_VSERVER_AUTO_LBACK ++ | NXF_LBACK_REMAP ++ | NXF_HIDE_LBACK ++#endif ++#ifdef CONFIG_VSERVER_AUTO_SINGLE ++ | NXF_SINGLE_IP ++#endif ++ | NXF_HIDE_NETIF; ++} + -+config VSERVER_DISABLED -+ bool -+ default n + -diff -NurpP --minimal linux-3.7/kernel/vserver/Makefile linux-3.7-vs2.3.5.1/kernel/vserver/Makefile ---- linux-3.7/kernel/vserver/Makefile 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/Makefile 2012-12-11 15:56:33.000000000 +0000 -@@ -0,0 +1,18 @@ -+# -+# Makefile for the Linux vserver routines. -+# ++/* network caps */ + ++#define NXC_TUN_CREATE 0x00000001 + -+obj-y += vserver.o ++#define NXC_RAW_ICMP 0x00000100 + -+vserver-y := switch.o context.o space.o sched.o network.o inode.o \ -+ limit.o cvirt.o cacct.o signal.o helper.o init.o \ -+ dlimit.o tag.o ++#define NXC_MULTICAST 0x00001000 + -+vserver-$(CONFIG_INET) += inet.o -+vserver-$(CONFIG_PROC_FS) += proc.o -+vserver-$(CONFIG_VSERVER_DEBUG) += sysctl.o debug.o -+vserver-$(CONFIG_VSERVER_HISTORY) += history.o -+vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o -+vserver-$(CONFIG_VSERVER_DEVICE) += device.o + -diff -NurpP --minimal linux-3.7/kernel/vserver/cacct.c linux-3.7-vs2.3.5.1/kernel/vserver/cacct.c ---- linux-3.7/kernel/vserver/cacct.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/cacct.c 2012-12-11 15:56:33.000000000 +0000 -@@ -0,0 +1,42 @@ -+/* -+ * linux/kernel/vserver/cacct.c -+ * -+ * Virtual Server: Context Accounting -+ * -+ * Copyright (C) 2006-2007 Herbert Pötzl -+ * -+ * V0.01 added accounting stats -+ * -+ */ ++/* address types */ + -+#include -+#include -+#include -+#include ++#define NXA_TYPE_IPV4 0x0001 ++#define NXA_TYPE_IPV6 0x0002 + -+#include -+#include ++#define NXA_TYPE_NONE 0x0000 ++#define NXA_TYPE_ANY 0x00FF + ++#define NXA_TYPE_ADDR 0x0010 ++#define NXA_TYPE_MASK 0x0020 ++#define NXA_TYPE_RANGE 0x0040 + -+int vc_sock_stat(struct vx_info *vxi, void __user *data) -+{ -+ struct vcmd_sock_stat_v0 vc_data; -+ int j, field; ++#define NXA_MASK_ALL (NXA_TYPE_ADDR | NXA_TYPE_MASK | NXA_TYPE_RANGE) + -+ if (copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; ++#define NXA_MOD_BCAST 0x0100 ++#define NXA_MOD_LBACK 0x0200 + -+ field = vc_data.field; -+ if ((field < 0) || (field >= VXA_SOCK_SIZE)) -+ return -EINVAL; ++#define NXA_LOOPBACK 0x1000 + -+ for (j = 0; j < 3; j++) { -+ vc_data.count[j] = vx_sock_count(&vxi->cacct, field, j); -+ vc_data.total[j] = vx_sock_total(&vxi->cacct, field, j); -+ } ++#define NXA_MASK_BIND (NXA_MASK_ALL | NXA_MOD_BCAST | NXA_MOD_LBACK) ++#define NXA_MASK_SHOW (NXA_MASK_ALL | NXA_LOOPBACK) + -+ if (copy_to_user(data, &vc_data, sizeof(vc_data))) -+ return -EFAULT; -+ return 0; -+} ++#endif /* _UAPI_VS_NETWORK_H */ +diff -NurpP --minimal linux-3.18.5/include/uapi/vserver/network_cmd.h linux-3.18.5-vs2.3.7.3/include/uapi/vserver/network_cmd.h +--- linux-3.18.5/include/uapi/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/uapi/vserver/network_cmd.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,123 @@ ++#ifndef _UAPI_VS_NETWORK_CMD_H ++#define _UAPI_VS_NETWORK_CMD_H + -diff -NurpP --minimal linux-3.7/kernel/vserver/cacct_init.h linux-3.7-vs2.3.5.1/kernel/vserver/cacct_init.h ---- linux-3.7/kernel/vserver/cacct_init.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/cacct_init.h 2012-12-11 15:56:33.000000000 +0000 -@@ -0,0 +1,25 @@ + ++/* vinfo commands */ + -+static inline void vx_info_init_cacct(struct _vx_cacct *cacct) -+{ -+ int i, j; ++#define VCMD_task_nid VC_CMD(VINFO, 2, 0) + + -+ for (i = 0; i < VXA_SOCK_SIZE; i++) { -+ for (j = 0; j < 3; j++) { -+ atomic_long_set(&cacct->sock[i][j].count, 0); -+ atomic_long_set(&cacct->sock[i][j].total, 0); -+ } -+ } -+ for (i = 0; i < 8; i++) -+ atomic_set(&cacct->slab[i], 0); -+ for (i = 0; i < 5; i++) -+ for (j = 0; j < 4; j++) -+ atomic_set(&cacct->page[i][j], 0); -+} ++#define VCMD_nx_info VC_CMD(VINFO, 6, 0) + -+static inline void vx_info_exit_cacct(struct _vx_cacct *cacct) -+{ -+ return; -+} ++struct vcmd_nx_info_v0 { ++ uint32_t nid; ++ /* more to come */ ++}; + -diff -NurpP --minimal linux-3.7/kernel/vserver/cacct_proc.h linux-3.7-vs2.3.5.1/kernel/vserver/cacct_proc.h ---- linux-3.7/kernel/vserver/cacct_proc.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/cacct_proc.h 2012-12-11 15:56:33.000000000 +0000 -@@ -0,0 +1,53 @@ -+#ifndef _VX_CACCT_PROC_H -+#define _VX_CACCT_PROC_H + -+#include ++#include ++#include + ++#define VCMD_net_create_v0 VC_CMD(VNET, 1, 0) ++#define VCMD_net_create VC_CMD(VNET, 1, 1) + -+#define VX_SOCKA_TOP \ -+ "Type\t recv #/bytes\t\t send #/bytes\t\t fail #/bytes\n" ++struct vcmd_net_create { ++ uint64_t flagword; ++}; + -+static inline int vx_info_proc_cacct(struct _vx_cacct *cacct, char *buffer) -+{ -+ int i, j, length = 0; -+ static char *type[VXA_SOCK_SIZE] = { -+ "UNSPEC", "UNIX", "INET", "INET6", "PACKET", "OTHER" -+ }; ++#define VCMD_net_migrate VC_CMD(NETMIG, 1, 0) + -+ length += sprintf(buffer + length, VX_SOCKA_TOP); -+ for (i = 0; i < VXA_SOCK_SIZE; i++) { -+ length += sprintf(buffer + length, "%s:", type[i]); -+ for (j = 0; j < 3; j++) { -+ length += sprintf(buffer + length, -+ "\t%10lu/%-10lu", -+ vx_sock_count(cacct, i, j), -+ vx_sock_total(cacct, i, j)); -+ } -+ buffer[length++] = '\n'; -+ } ++#define VCMD_net_add VC_CMD(NETALT, 1, 0) ++#define VCMD_net_remove VC_CMD(NETALT, 2, 0) + -+ length += sprintf(buffer + length, "\n"); -+ length += sprintf(buffer + length, -+ "slab:\t %8u %8u %8u %8u\n", -+ atomic_read(&cacct->slab[1]), -+ atomic_read(&cacct->slab[4]), -+ atomic_read(&cacct->slab[0]), -+ atomic_read(&cacct->slab[2])); ++struct vcmd_net_addr_v0 { ++ uint16_t type; ++ uint16_t count; ++ struct in_addr ip[4]; ++ struct in_addr mask[4]; ++}; + -+ length += sprintf(buffer + length, "\n"); -+ for (i = 0; i < 5; i++) { -+ length += sprintf(buffer + length, -+ "page[%d]: %8u %8u %8u %8u\t %8u %8u %8u %8u\n", i, -+ atomic_read(&cacct->page[i][0]), -+ atomic_read(&cacct->page[i][1]), -+ atomic_read(&cacct->page[i][2]), -+ atomic_read(&cacct->page[i][3]), -+ atomic_read(&cacct->page[i][4]), -+ atomic_read(&cacct->page[i][5]), -+ atomic_read(&cacct->page[i][6]), -+ atomic_read(&cacct->page[i][7])); -+ } -+ return length; -+} ++#define VCMD_net_add_ipv4_v1 VC_CMD(NETALT, 1, 1) ++#define VCMD_net_rem_ipv4_v1 VC_CMD(NETALT, 2, 1) + -+#endif /* _VX_CACCT_PROC_H */ -diff -NurpP --minimal linux-3.7/kernel/vserver/context.c linux-3.7-vs2.3.5.1/kernel/vserver/context.c ---- linux-3.7/kernel/vserver/context.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/context.c 2012-12-11 15:56:33.000000000 +0000 -@@ -0,0 +1,1119 @@ -+/* -+ * linux/kernel/vserver/context.c -+ * -+ * Virtual Server: Context Support -+ * -+ * Copyright (C) 2003-2011 Herbert Pötzl -+ * -+ * V0.01 context helper -+ * V0.02 vx_ctx_kill syscall command -+ * V0.03 replaced context_info calls -+ * V0.04 redesign of struct (de)alloc -+ * V0.05 rlimit basic implementation -+ * V0.06 task_xid and info commands -+ * V0.07 context flags and caps -+ * V0.08 switch to RCU based hash -+ * V0.09 revert to non RCU for now -+ * V0.10 and back to working RCU hash -+ * V0.11 and back to locking again -+ * V0.12 referenced context store -+ * V0.13 separate per cpu data -+ * V0.14 changed vcmds to vxi arg -+ * V0.15 added context stat -+ * V0.16 have __create claim() the vxi -+ * V0.17 removed older and legacy stuff -+ * V0.18 added user credentials -+ * V0.19 added warn mask -+ * -+ */ ++struct vcmd_net_addr_ipv4_v1 { ++ uint16_t type; ++ uint16_t flags; ++ struct in_addr ip; ++ struct in_addr mask; ++}; + -+#include -+#include -+#include -+#include -+#include ++#define VCMD_net_add_ipv4 VC_CMD(NETALT, 1, 2) ++#define VCMD_net_rem_ipv4 VC_CMD(NETALT, 2, 2) + -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include ++struct vcmd_net_addr_ipv4_v2 { ++ uint16_t type; ++ uint16_t flags; ++ struct in_addr ip; ++ struct in_addr ip2; ++ struct in_addr mask; ++}; + -+#include -+#include -+#include -+#include ++#define VCMD_net_add_ipv6 VC_CMD(NETALT, 3, 1) ++#define VCMD_net_remove_ipv6 VC_CMD(NETALT, 4, 1) + -+#include "cvirt_init.h" -+#include "cacct_init.h" -+#include "limit_init.h" -+#include "sched_init.h" ++struct vcmd_net_addr_ipv6_v1 { ++ uint16_t type; ++ uint16_t flags; ++ uint32_t prefix; ++ struct in6_addr ip; ++ struct in6_addr mask; ++}; + ++#define VCMD_add_match_ipv4 VC_CMD(NETALT, 5, 0) ++#define VCMD_get_match_ipv4 VC_CMD(NETALT, 6, 0) + -+atomic_t vx_global_ctotal = ATOMIC_INIT(0); -+atomic_t vx_global_cactive = ATOMIC_INIT(0); ++struct vcmd_match_ipv4_v0 { ++ uint16_t type; ++ uint16_t flags; ++ uint16_t parent; ++ uint16_t prefix; ++ struct in_addr ip; ++ struct in_addr ip2; ++ struct in_addr mask; ++}; + ++#define VCMD_add_match_ipv6 VC_CMD(NETALT, 7, 0) ++#define VCMD_get_match_ipv6 VC_CMD(NETALT, 8, 0) + -+/* now inactive context structures */ ++struct vcmd_match_ipv6_v0 { ++ uint16_t type; ++ uint16_t flags; ++ uint16_t parent; ++ uint16_t prefix; ++ struct in6_addr ip; ++ struct in6_addr ip2; ++ struct in6_addr mask; ++}; + -+static struct hlist_head vx_info_inactive = HLIST_HEAD_INIT; + -+static DEFINE_SPINLOCK(vx_info_inactive_lock); + + -+/* __alloc_vx_info() ++/* flag commands */ + -+ * allocate an initialized vx_info struct -+ * doesn't make it visible (hash) */ ++#define VCMD_get_nflags VC_CMD(FLAGS, 5, 0) ++#define VCMD_set_nflags VC_CMD(FLAGS, 6, 0) + -+static struct vx_info *__alloc_vx_info(xid_t xid) -+{ -+ struct vx_info *new = NULL; -+ int cpu, index; ++struct vcmd_net_flags_v0 { ++ uint64_t flagword; ++ uint64_t mask; ++}; + -+ vxdprintk(VXD_CBIT(xid, 0), "alloc_vx_info(%d)*", xid); + -+ /* would this benefit from a slab cache? */ -+ new = kmalloc(sizeof(struct vx_info), GFP_KERNEL); -+ if (!new) -+ return 0; + -+ memset(new, 0, sizeof(struct vx_info)); -+#ifdef CONFIG_SMP -+ new->ptr_pc = alloc_percpu(struct _vx_info_pc); -+ if (!new->ptr_pc) -+ goto error; -+#endif -+ new->vx_id = xid; -+ INIT_HLIST_NODE(&new->vx_hlist); -+ atomic_set(&new->vx_usecnt, 0); -+ atomic_set(&new->vx_tasks, 0); -+ new->vx_parent = NULL; -+ new->vx_state = 0; -+ init_waitqueue_head(&new->vx_wait); ++/* network caps commands */ + -+ /* prepare reaper */ -+ get_task_struct(init_pid_ns.child_reaper); -+ new->vx_reaper = init_pid_ns.child_reaper; -+ new->vx_badness_bias = 0; ++#define VCMD_get_ncaps VC_CMD(FLAGS, 7, 0) ++#define VCMD_set_ncaps VC_CMD(FLAGS, 8, 0) + -+ /* rest of init goes here */ -+ vx_info_init_limit(&new->limit); -+ vx_info_init_sched(&new->sched); -+ vx_info_init_cvirt(&new->cvirt); -+ vx_info_init_cacct(&new->cacct); ++struct vcmd_net_caps_v0 { ++ uint64_t ncaps; ++ uint64_t cmask; ++}; + -+ /* per cpu data structures */ -+ for_each_possible_cpu(cpu) { -+ vx_info_init_sched_pc( -+ &vx_per_cpu(new, sched_pc, cpu), cpu); -+ vx_info_init_cvirt_pc( -+ &vx_per_cpu(new, cvirt_pc, cpu), cpu); -+ } ++#endif /* _UAPI_VS_NETWORK_CMD_H */ +diff -NurpP --minimal linux-3.18.5/include/uapi/vserver/sched_cmd.h linux-3.18.5-vs2.3.7.3/include/uapi/vserver/sched_cmd.h +--- linux-3.18.5/include/uapi/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/uapi/vserver/sched_cmd.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,13 @@ ++#ifndef _UAPI_VS_SCHED_CMD_H ++#define _UAPI_VS_SCHED_CMD_H + -+ new->vx_flags = VXF_INIT_SET; -+ new->vx_bcaps = CAP_FULL_SET; // maybe ~CAP_SETPCAP -+ new->vx_ccaps = 0; -+ new->vx_umask = 0; -+ new->vx_wmask = 0; + -+ new->reboot_cmd = 0; -+ new->exit_code = 0; ++struct vcmd_prio_bias { ++ int32_t cpu_id; ++ int32_t prio_bias; ++}; + -+ // preconfig spaces -+ for (index = 0; index < VX_SPACES; index++) { -+ struct _vx_space *space = &new->space[index]; ++#define VCMD_set_prio_bias VC_CMD(SCHED, 4, 0) ++#define VCMD_get_prio_bias VC_CMD(SCHED, 5, 0) + -+ // filesystem -+ spin_lock(&init_fs.lock); -+ init_fs.users++; -+ spin_unlock(&init_fs.lock); -+ space->vx_fs = &init_fs; ++#endif /* _UAPI_VS_SCHED_CMD_H */ +diff -NurpP --minimal linux-3.18.5/include/uapi/vserver/signal_cmd.h linux-3.18.5-vs2.3.7.3/include/uapi/vserver/signal_cmd.h +--- linux-3.18.5/include/uapi/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/uapi/vserver/signal_cmd.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,31 @@ ++#ifndef _UAPI_VS_SIGNAL_CMD_H ++#define _UAPI_VS_SIGNAL_CMD_H + -+ /* FIXME: do we want defaults? */ -+ // space->vx_real_cred = 0; -+ // space->vx_cred = 0; -+ } + ++/* signalling vserver commands */ + -+ vxdprintk(VXD_CBIT(xid, 0), -+ "alloc_vx_info(%d) = %p", xid, new); -+ vxh_alloc_vx_info(new); -+ atomic_inc(&vx_global_ctotal); -+ return new; -+#ifdef CONFIG_SMP -+error: -+ kfree(new); -+ return 0; -+#endif -+} -+ -+/* __dealloc_vx_info() -+ -+ * final disposal of vx_info */ -+ -+static void __dealloc_vx_info(struct vx_info *vxi) -+{ -+#ifdef CONFIG_VSERVER_WARN -+ struct vx_info_save vxis; -+ int cpu; -+#endif -+ vxdprintk(VXD_CBIT(xid, 0), -+ "dealloc_vx_info(%p)", vxi); -+ vxh_dealloc_vx_info(vxi); ++#define VCMD_ctx_kill VC_CMD(PROCTRL, 1, 0) ++#define VCMD_wait_exit VC_CMD(EVENT, 99, 0) + -+#ifdef CONFIG_VSERVER_WARN -+ enter_vx_info(vxi, &vxis); -+ vx_info_exit_limit(&vxi->limit); -+ vx_info_exit_sched(&vxi->sched); -+ vx_info_exit_cvirt(&vxi->cvirt); -+ vx_info_exit_cacct(&vxi->cacct); ++struct vcmd_ctx_kill_v0 { ++ int32_t pid; ++ int32_t sig; ++}; + -+ for_each_possible_cpu(cpu) { -+ vx_info_exit_sched_pc( -+ &vx_per_cpu(vxi, sched_pc, cpu), cpu); -+ vx_info_exit_cvirt_pc( -+ &vx_per_cpu(vxi, cvirt_pc, cpu), cpu); -+ } -+ leave_vx_info(&vxis); -+#endif ++struct vcmd_wait_exit_v0 { ++ int32_t reboot_cmd; ++ int32_t exit_code; ++}; + -+ vxi->vx_id = -1; -+ vxi->vx_state |= VXS_RELEASED; + -+#ifdef CONFIG_SMP -+ free_percpu(vxi->ptr_pc); -+#endif -+ kfree(vxi); -+ atomic_dec(&vx_global_ctotal); -+} ++/* process alteration commands */ + -+static void __shutdown_vx_info(struct vx_info *vxi) -+{ -+ struct nsproxy *nsproxy; -+ struct fs_struct *fs; -+ struct cred *cred; -+ int index, kill; ++#define VCMD_get_pflags VC_CMD(PROCALT, 5, 0) ++#define VCMD_set_pflags VC_CMD(PROCALT, 6, 0) + -+ might_sleep(); ++struct vcmd_pflags_v0 { ++ uint32_t flagword; ++ uint32_t mask; ++}; + -+ vxi->vx_state |= VXS_SHUTDOWN; -+ vs_state_change(vxi, VSC_SHUTDOWN); ++#endif /* _UAPI_VS_SIGNAL_CMD_H */ +diff -NurpP --minimal linux-3.18.5/include/uapi/vserver/space_cmd.h linux-3.18.5-vs2.3.7.3/include/uapi/vserver/space_cmd.h +--- linux-3.18.5/include/uapi/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/uapi/vserver/space_cmd.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,28 @@ ++#ifndef _UAPI_VS_SPACE_CMD_H ++#define _UAPI_VS_SPACE_CMD_H + -+ for (index = 0; index < VX_SPACES; index++) { -+ struct _vx_space *space = &vxi->space[index]; + -+ nsproxy = xchg(&space->vx_nsproxy, NULL); -+ if (nsproxy) -+ put_nsproxy(nsproxy); ++#define VCMD_enter_space_v0 VC_CMD(PROCALT, 1, 0) ++#define VCMD_enter_space_v1 VC_CMD(PROCALT, 1, 1) ++#define VCMD_enter_space VC_CMD(PROCALT, 1, 2) + -+ fs = xchg(&space->vx_fs, NULL); -+ spin_lock(&fs->lock); -+ kill = !--fs->users; -+ spin_unlock(&fs->lock); -+ if (kill) -+ free_fs_struct(fs); ++#define VCMD_set_space_v0 VC_CMD(PROCALT, 3, 0) ++#define VCMD_set_space_v1 VC_CMD(PROCALT, 3, 1) ++#define VCMD_set_space VC_CMD(PROCALT, 3, 2) + -+ cred = (struct cred *)xchg(&space->vx_cred, NULL); -+ if (cred) -+ abort_creds(cred); -+ } -+} ++#define VCMD_get_space_mask_v0 VC_CMD(PROCALT, 4, 0) + -+/* exported stuff */ ++#define VCMD_get_space_mask VC_CMD(VSPACE, 0, 1) ++#define VCMD_get_space_default VC_CMD(VSPACE, 1, 0) + -+void free_vx_info(struct vx_info *vxi) -+{ -+ unsigned long flags; -+ unsigned index; + -+ /* check for reference counts first */ -+ BUG_ON(atomic_read(&vxi->vx_usecnt)); -+ BUG_ON(atomic_read(&vxi->vx_tasks)); ++struct vcmd_space_mask_v1 { ++ uint64_t mask; ++}; + -+ /* context must not be hashed */ -+ BUG_ON(vx_info_state(vxi, VXS_HASHED)); ++struct vcmd_space_mask_v2 { ++ uint64_t mask; ++ uint32_t index; ++}; + -+ /* context shutdown is mandatory */ -+ BUG_ON(!vx_info_state(vxi, VXS_SHUTDOWN)); ++#endif /* _UAPI_VS_SPACE_CMD_H */ +diff -NurpP --minimal linux-3.18.5/include/uapi/vserver/switch.h linux-3.18.5-vs2.3.7.3/include/uapi/vserver/switch.h +--- linux-3.18.5/include/uapi/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/uapi/vserver/switch.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,90 @@ ++#ifndef _UAPI_VS_SWITCH_H ++#define _UAPI_VS_SWITCH_H + -+ /* spaces check */ -+ for (index = 0; index < VX_SPACES; index++) { -+ struct _vx_space *space = &vxi->space[index]; ++#include + -+ BUG_ON(space->vx_nsproxy); -+ BUG_ON(space->vx_fs); -+ // BUG_ON(space->vx_real_cred); -+ // BUG_ON(space->vx_cred); -+ } + -+ spin_lock_irqsave(&vx_info_inactive_lock, flags); -+ hlist_del(&vxi->vx_hlist); -+ spin_unlock_irqrestore(&vx_info_inactive_lock, flags); ++#define VC_CATEGORY(c) (((c) >> 24) & 0x3F) ++#define VC_COMMAND(c) (((c) >> 16) & 0xFF) ++#define VC_VERSION(c) ((c) & 0xFFF) + -+ __dealloc_vx_info(vxi); -+} ++#define VC_CMD(c, i, v) ((((VC_CAT_ ## c) & 0x3F) << 24) \ ++ | (((i) & 0xFF) << 16) | ((v) & 0xFFF)) + ++/* + -+/* hash table for vx_info hash */ ++ Syscall Matrix V2.8 + -+#define VX_HASH_SIZE 13 ++ |VERSION|CREATE |MODIFY |MIGRATE|CONTROL|EXPERIM| |SPECIAL|SPECIAL| ++ |STATS |DESTROY|ALTER |CHANGE |LIMIT |TEST | | | | ++ |INFO |SETUP | |MOVE | | | | | | ++ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ ++ SYSTEM |VERSION|VSETUP |VHOST | | | | |DEVICE | | ++ HOST | 00| 01| 02| 03| 04| 05| | 06| 07| ++ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ ++ CPU | |VPROC |PROCALT|PROCMIG|PROCTRL| | |SCHED. | | ++ PROCESS| 08| 09| 10| 11| 12| 13| | 14| 15| ++ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ ++ MEMORY | | | | |MEMCTRL| | |SWAP | | ++ | 16| 17| 18| 19| 20| 21| | 22| 23| ++ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ ++ NETWORK| |VNET |NETALT |NETMIG |NETCTL | | |SERIAL | | ++ | 24| 25| 26| 27| 28| 29| | 30| 31| ++ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ ++ DISK | | | |TAGMIG |DLIMIT | | |INODE | | ++ VFS | 32| 33| 34| 35| 36| 37| | 38| 39| ++ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ ++ OTHER |VSTAT | | | | | | |VINFO | | ++ | 40| 41| 42| 43| 44| 45| | 46| 47| ++ =======+=======+=======+=======+=======+=======+=======+ +=======+=======+ ++ SPECIAL|EVENT | | | |FLAGS | | |VSPACE | | ++ | 48| 49| 50| 51| 52| 53| | 54| 55| ++ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ ++ SPECIAL|DEBUG | | | |RLIMIT |SYSCALL| | |COMPAT | ++ | 56| 57| 58| 59| 60|TEST 61| | 62| 63| ++ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ + -+static struct hlist_head vx_info_hash[VX_HASH_SIZE] = -+ { [0 ... VX_HASH_SIZE-1] = HLIST_HEAD_INIT }; ++*/ + -+static DEFINE_SPINLOCK(vx_info_hash_lock); ++#define VC_CAT_VERSION 0 + ++#define VC_CAT_VSETUP 1 ++#define VC_CAT_VHOST 2 + -+static inline unsigned int __hashval(xid_t xid) -+{ -+ return (xid % VX_HASH_SIZE); -+} ++#define VC_CAT_DEVICE 6 + ++#define VC_CAT_VPROC 9 ++#define VC_CAT_PROCALT 10 ++#define VC_CAT_PROCMIG 11 ++#define VC_CAT_PROCTRL 12 + ++#define VC_CAT_SCHED 14 ++#define VC_CAT_MEMCTRL 20 + -+/* __hash_vx_info() ++#define VC_CAT_VNET 25 ++#define VC_CAT_NETALT 26 ++#define VC_CAT_NETMIG 27 ++#define VC_CAT_NETCTRL 28 + -+ * add the vxi to the global hash table -+ * requires the hash_lock to be held */ ++#define VC_CAT_TAGMIG 35 ++#define VC_CAT_DLIMIT 36 ++#define VC_CAT_INODE 38 + -+static inline void __hash_vx_info(struct vx_info *vxi) -+{ -+ struct hlist_head *head; ++#define VC_CAT_VSTAT 40 ++#define VC_CAT_VINFO 46 ++#define VC_CAT_EVENT 48 + -+ vxd_assert_lock(&vx_info_hash_lock); -+ vxdprintk(VXD_CBIT(xid, 4), -+ "__hash_vx_info: %p[#%d]", vxi, vxi->vx_id); -+ vxh_hash_vx_info(vxi); ++#define VC_CAT_FLAGS 52 ++#define VC_CAT_VSPACE 54 ++#define VC_CAT_DEBUG 56 ++#define VC_CAT_RLIMIT 60 + -+ /* context must not be hashed */ -+ BUG_ON(vx_info_state(vxi, VXS_HASHED)); ++#define VC_CAT_SYSTEST 61 ++#define VC_CAT_COMPAT 63 + -+ vxi->vx_state |= VXS_HASHED; -+ head = &vx_info_hash[__hashval(vxi->vx_id)]; -+ hlist_add_head(&vxi->vx_hlist, head); -+ atomic_inc(&vx_global_cactive); -+} ++/* query version */ + -+/* __unhash_vx_info() ++#define VCMD_get_version VC_CMD(VERSION, 0, 0) ++#define VCMD_get_vci VC_CMD(VERSION, 1, 0) + -+ * remove the vxi from the global hash table -+ * requires the hash_lock to be held */ ++#endif /* _UAPI_VS_SWITCH_H */ +diff -NurpP --minimal linux-3.18.5/include/uapi/vserver/tag_cmd.h linux-3.18.5-vs2.3.7.3/include/uapi/vserver/tag_cmd.h +--- linux-3.18.5/include/uapi/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/include/uapi/vserver/tag_cmd.h 2015-01-19 10:58:04.000000000 +0000 +@@ -0,0 +1,14 @@ ++#ifndef _UAPI_VS_TAG_CMD_H ++#define _UAPI_VS_TAG_CMD_H + -+static inline void __unhash_vx_info(struct vx_info *vxi) -+{ -+ unsigned long flags; + -+ vxd_assert_lock(&vx_info_hash_lock); -+ vxdprintk(VXD_CBIT(xid, 4), -+ "__unhash_vx_info: %p[#%d.%d.%d]", vxi, vxi->vx_id, -+ atomic_read(&vxi->vx_usecnt), atomic_read(&vxi->vx_tasks)); -+ vxh_unhash_vx_info(vxi); ++/* vinfo commands */ + -+ /* context must be hashed */ -+ BUG_ON(!vx_info_state(vxi, VXS_HASHED)); -+ /* but without tasks */ -+ BUG_ON(atomic_read(&vxi->vx_tasks)); ++#define VCMD_task_tag VC_CMD(VINFO, 3, 0) + -+ vxi->vx_state &= ~VXS_HASHED; -+ hlist_del_init(&vxi->vx_hlist); -+ spin_lock_irqsave(&vx_info_inactive_lock, flags); -+ hlist_add_head(&vxi->vx_hlist, &vx_info_inactive); -+ spin_unlock_irqrestore(&vx_info_inactive_lock, flags); -+ atomic_dec(&vx_global_cactive); -+} + ++/* context commands */ + -+/* __lookup_vx_info() ++#define VCMD_tag_migrate VC_CMD(TAGMIG, 1, 0) + -+ * requires the hash_lock to be held -+ * doesn't increment the vx_refcnt */ -+ -+static inline struct vx_info *__lookup_vx_info(xid_t xid) -+{ -+ struct hlist_head *head = &vx_info_hash[__hashval(xid)]; -+ struct hlist_node *pos; ++#endif /* _UAPI_VS_TAG_CMD_H */ +diff -NurpP --minimal linux-3.18.5/init/Kconfig linux-3.18.5-vs2.3.7.3/init/Kconfig +--- linux-3.18.5/init/Kconfig 2015-01-17 02:40:23.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/init/Kconfig 2015-01-19 13:07:13.000000000 +0000 +@@ -923,6 +923,7 @@ config NUMA_BALANCING + menuconfig CGROUPS + boolean "Control Group support" + select KERNFS ++ default y + help + This option adds support for grouping sets of processes together, for + use with process control subsystems such as Cpusets, CFS, memory +diff -NurpP --minimal linux-3.18.5/init/main.c linux-3.18.5-vs2.3.7.3/init/main.c +--- linux-3.18.5/init/main.c 2015-01-17 02:40:23.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/init/main.c 2015-01-19 11:05:25.000000000 +0000 +@@ -78,6 +78,7 @@ + #include + #include + #include ++#include + + #include + #include +diff -NurpP --minimal linux-3.18.5/ipc/mqueue.c linux-3.18.5-vs2.3.7.3/ipc/mqueue.c +--- linux-3.18.5/ipc/mqueue.c 2014-06-12 13:02:52.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/ipc/mqueue.c 2015-01-19 10:58:05.000000000 +0000 +@@ -35,6 +35,8 @@ + #include + #include + #include ++#include ++#include + + #include + #include "util.h" +@@ -76,6 +78,7 @@ struct mqueue_inode_info { + struct pid *notify_owner; + struct user_namespace *notify_user_ns; + struct user_struct *user; /* user who created, for accounting */ + struct vx_info *vxi; + struct sock *notify_sock; + struct sk_buff *notify_cookie; + +@@ -234,6 +237,7 @@ static struct inode *mqueue_get_inode(st + if (S_ISREG(mode)) { + struct mqueue_inode_info *info; + unsigned long mq_bytes, mq_treesize; ++ struct vx_info *vxi = current_vx_info(); + + inode->i_fop = &mqueue_file_operations; + inode->i_size = FILENT_SIZE; +@@ -247,6 +251,7 @@ static struct inode *mqueue_get_inode(st + info->notify_user_ns = NULL; + info->qsize = 0; + info->user = NULL; /* set when all is ok */ ++ info->vxi = NULL; + info->msg_tree = RB_ROOT; + info->node_cache = NULL; + memset(&info->attr, 0, sizeof(info->attr)); +@@ -280,17 +285,20 @@ static struct inode *mqueue_get_inode(st + + spin_lock(&mq_lock); + if (u->mq_bytes + mq_bytes < u->mq_bytes || +- u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE)) { ++ u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE) || ++ !vx_ipcmsg_avail(vxi, mq_bytes)) { + spin_unlock(&mq_lock); + /* mqueue_evict_inode() releases info->messages */ + ret = -EMFILE; + goto out_inode; + } + u->mq_bytes += mq_bytes; ++ vx_ipcmsg_add(vxi, u, mq_bytes); + spin_unlock(&mq_lock); + + /* all is ok */ + info->user = get_uid(u); ++ info->vxi = get_vx_info(vxi); + } else if (S_ISDIR(mode)) { + inc_nlink(inode); + /* Some things misbehave if size == 0 on a directory */ +@@ -402,8 +410,11 @@ static void mqueue_evict_inode(struct in + + user = info->user; + if (user) { ++ struct vx_info *vxi = info->vxi; + -+ vxd_assert_lock(&vx_info_hash_lock); -+ hlist_for_each(pos, head) { -+ vxi = hlist_entry(pos, struct vx_info, vx_hlist); -+ -+ if (vxi->vx_id == xid) -+ goto found; -+ } -+ vxi = NULL; -+found: -+ vxdprintk(VXD_CBIT(xid, 0), -+ "__lookup_vx_info(#%u): %p[#%u]", -+ xid, vxi, vxi ? vxi->vx_id : 0); -+ vxh_lookup_vx_info(vxi, xid); -+ return vxi; -+} -+ -+ -+/* __create_vx_info() -+ -+ * create the requested context -+ * get(), claim() and hash it */ -+ -+static struct vx_info *__create_vx_info(int id) -+{ -+ struct vx_info *new, *vxi = NULL; -+ -+ vxdprintk(VXD_CBIT(xid, 1), "create_vx_info(%d)*", id); -+ -+ if (!(new = __alloc_vx_info(id))) -+ return ERR_PTR(-ENOMEM); -+ -+ /* required to make dynamic xids unique */ -+ spin_lock(&vx_info_hash_lock); + spin_lock(&mq_lock); + user->mq_bytes -= mq_bytes; ++ vx_ipcmsg_sub(vxi, user, mq_bytes); + /* + * get_ns_from_inode() ensures that the + * (ipc_ns = sb->s_fs_info) is either a valid ipc_ns +@@ -413,6 +424,7 @@ static void mqueue_evict_inode(struct in + if (ipc_ns) + ipc_ns->mq_queues_count--; + spin_unlock(&mq_lock); ++ put_vx_info(vxi); + free_uid(user); + } + if (ipc_ns) +diff -NurpP --minimal linux-3.18.5/ipc/msg.c linux-3.18.5-vs2.3.7.3/ipc/msg.c +--- linux-3.18.5/ipc/msg.c 2014-09-03 13:19:44.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/ipc/msg.c 2015-01-19 10:58:05.000000000 +0000 +@@ -37,6 +37,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -129,6 +130,7 @@ static int newque(struct ipc_namespace * + + msq->q_perm.mode = msgflg & S_IRWXUGO; + msq->q_perm.key = key; ++ msq->q_perm.xid = vx_current_xid(); + + msq->q_perm.security = NULL; + retval = security_msg_queue_alloc(msq); +diff -NurpP --minimal linux-3.18.5/ipc/sem.c linux-3.18.5-vs2.3.7.3/ipc/sem.c +--- linux-3.18.5/ipc/sem.c 2015-01-17 02:40:23.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/ipc/sem.c 2015-01-19 10:58:05.000000000 +0000 +@@ -85,6 +85,8 @@ + #include + #include + #include ++#include ++#include + + #include + #include "util.h" +@@ -499,6 +501,7 @@ static int newary(struct ipc_namespace * + + sma->sem_perm.mode = (semflg & S_IRWXUGO); + sma->sem_perm.key = key; ++ sma->sem_perm.xid = vx_current_xid(); + + sma->sem_perm.security = NULL; + retval = security_sem_alloc(sma); +@@ -528,6 +531,9 @@ static int newary(struct ipc_namespace * + return id; + } + ns->used_sems += nsems; ++ /* FIXME: obsoleted? */ ++ vx_semary_inc(sma); ++ vx_nsems_add(sma, nsems); + + sem_unlock(sma, -1); + rcu_read_unlock(); +@@ -1116,6 +1122,9 @@ static void freeary(struct ipc_namespace + + wake_up_sem_queue_do(&tasks); + ns->used_sems -= sma->sem_nsems; ++ /* FIXME: obsoleted? */ ++ vx_nsems_sub(sma, sma->sem_nsems); ++ vx_semary_dec(sma); + ipc_rcu_putref(sma, sem_rcu_free); + } + +diff -NurpP --minimal linux-3.18.5/ipc/shm.c linux-3.18.5-vs2.3.7.3/ipc/shm.c +--- linux-3.18.5/ipc/shm.c 2015-01-17 02:40:23.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/ipc/shm.c 2015-01-19 10:58:05.000000000 +0000 +@@ -42,6 +42,8 @@ + #include + #include + #include ++#include ++#include + + #include + +@@ -210,10 +212,14 @@ static void shm_open(struct vm_area_stru + static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp) + { + struct file *shm_file; ++ struct vx_info *vxi = lookup_vx_info(shp->shm_perm.xid); ++ int numpages = (shp->shm_segsz + PAGE_SIZE - 1) >> PAGE_SHIFT; + + shm_file = shp->shm_file; + shp->shm_file = NULL; +- ns->shm_tot -= (shp->shm_segsz + PAGE_SIZE - 1) >> PAGE_SHIFT; ++ vx_ipcshm_sub(vxi, shp, numpages); ++ ns->shm_tot -= numpages; + -+ /* static context requested */ -+ if ((vxi = __lookup_vx_info(id))) { -+ vxdprintk(VXD_CBIT(xid, 0), -+ "create_vx_info(%d) = %p (already there)", id, vxi); -+ if (vx_info_flags(vxi, VXF_STATE_SETUP, 0)) -+ vxi = ERR_PTR(-EBUSY); -+ else -+ vxi = ERR_PTR(-EEXIST); -+ goto out_unlock; -+ } -+ /* new context */ -+ vxdprintk(VXD_CBIT(xid, 0), -+ "create_vx_info(%d) = %p (new)", id, new); -+ claim_vx_info(new, NULL); -+ __hash_vx_info(get_vx_info(new)); -+ vxi = new, new = NULL; + shm_rmid(ns, shp); + shm_unlock(shp); + if (!is_file_hugepages(shm_file)) +@@ -221,6 +227,7 @@ static void shm_destroy(struct ipc_names + else if (shp->mlock_user) + user_shm_unlock(file_inode(shm_file)->i_size, shp->mlock_user); + fput(shm_file); ++ put_vx_info(vxi); + ipc_rcu_putref(shp, shm_rcu_free); + } + +@@ -502,11 +509,15 @@ static int newseg(struct ipc_namespace * + ns->shm_tot + numpages > ns->shm_ctlall) + return -ENOSPC; + ++ if (!vx_ipcshm_avail(current_vx_info(), numpages)) ++ return -ENOSPC; + -+out_unlock: -+ spin_unlock(&vx_info_hash_lock); -+ vxh_create_vx_info(IS_ERR(vxi) ? NULL : vxi, id); -+ if (new) -+ __dealloc_vx_info(new); -+ return vxi; -+} + shp = ipc_rcu_alloc(sizeof(*shp)); + if (!shp) + return -ENOMEM; + + shp->shm_perm.key = key; ++ shp->shm_perm.xid = vx_current_xid(); + shp->shm_perm.mode = (shmflg & S_IRWXUGO); + shp->mlock_user = NULL; + +@@ -576,6 +587,7 @@ static int newseg(struct ipc_namespace * + + ipc_unlock_object(&shp->shm_perm); + rcu_read_unlock(); ++ vx_ipcshm_add(current_vx_info(), key, numpages); + return error; + + no_id: +diff -NurpP --minimal linux-3.18.5/kernel/Makefile linux-3.18.5-vs2.3.7.3/kernel/Makefile +--- linux-3.18.5/kernel/Makefile 2015-01-17 02:40:23.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/Makefile 2015-01-19 10:58:05.000000000 +0000 +@@ -26,6 +26,7 @@ obj-y += power/ + obj-y += printk/ + obj-y += irq/ + obj-y += rcu/ ++obj-y += vserver/ + + obj-$(CONFIG_CHECKPOINT_RESTORE) += kcmp.o + obj-$(CONFIG_FREEZER) += freezer.o +diff -NurpP --minimal linux-3.18.5/kernel/auditsc.c linux-3.18.5-vs2.3.7.3/kernel/auditsc.c +--- linux-3.18.5/kernel/auditsc.c 2015-01-17 02:40:23.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/auditsc.c 2015-01-19 10:58:05.000000000 +0000 +@@ -2025,7 +2025,7 @@ static int audit_set_loginuid_perm(kuid_ + if (is_audit_feature_set(AUDIT_FEATURE_LOGINUID_IMMUTABLE)) + return -EPERM; + /* it is set, you need permission */ +- if (!capable(CAP_AUDIT_CONTROL)) ++ if (!vx_capable(CAP_AUDIT_CONTROL, VXC_AUDIT_CONTROL)) + return -EPERM; + /* reject if this is not an unset and we don't allow that */ + if (is_audit_feature_set(AUDIT_FEATURE_ONLY_UNSET_LOGINUID) && uid_valid(loginuid)) +diff -NurpP --minimal linux-3.18.5/kernel/capability.c linux-3.18.5-vs2.3.7.3/kernel/capability.c +--- linux-3.18.5/kernel/capability.c 2015-01-16 22:19:27.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/capability.c 2015-01-19 10:58:05.000000000 +0000 +@@ -17,6 +17,7 @@ + #include + #include + #include ++#include + #include + + /* +@@ -106,6 +107,7 @@ static int cap_validate_magic(cap_user_h + return 0; + } + + + /* + * The only thing that can change the capabilities of the current + * process is the current process. As such, we can't be in this code +@@ -343,6 +345,8 @@ bool has_ns_capability_noaudit(struct ta + return (ret == 0); + } + ++#include + -+/* exported stuff */ -+ -+ -+void unhash_vx_info(struct vx_info *vxi) -+{ -+ spin_lock(&vx_info_hash_lock); -+ __unhash_vx_info(vxi); -+ spin_unlock(&vx_info_hash_lock); -+ __shutdown_vx_info(vxi); -+ __wakeup_vx_info(vxi); -+} -+ -+ -+/* lookup_vx_info() -+ -+ * search for a vx_info and get() it -+ * negative id means current */ + /** + * has_capability_noaudit - Does a task have a capability (unaudited) in the + * initial user ns +diff -NurpP --minimal linux-3.18.5/kernel/compat.c linux-3.18.5-vs2.3.7.3/kernel/compat.c +--- linux-3.18.5/kernel/compat.c 2015-01-16 22:19:27.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/compat.c 2015-01-19 10:58:05.000000000 +0000 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + #include + +@@ -1058,7 +1059,7 @@ COMPAT_SYSCALL_DEFINE1(stime, compat_tim + if (err) + return err; + +- do_settimeofday(&tv); ++ vx_settimeofday(&tv); + return 0; + } + +diff -NurpP --minimal linux-3.18.5/kernel/cred.c linux-3.18.5-vs2.3.7.3/kernel/cred.c +--- linux-3.18.5/kernel/cred.c 2013-02-19 13:58:56.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/cred.c 2015-01-19 10:58:05.000000000 +0000 +@@ -56,31 +56,6 @@ struct cred init_cred = { + .group_info = &init_groups, + }; + +-static inline void set_cred_subscribers(struct cred *cred, int n) +-{ +-#ifdef CONFIG_DEBUG_CREDENTIALS +- atomic_set(&cred->subscribers, n); +-#endif +-} +- +-static inline int read_cred_subscribers(const struct cred *cred) +-{ +-#ifdef CONFIG_DEBUG_CREDENTIALS +- return atomic_read(&cred->subscribers); +-#else +- return 0; +-#endif +-} +- +-static inline void alter_cred_subscribers(const struct cred *_cred, int n) +-{ +-#ifdef CONFIG_DEBUG_CREDENTIALS +- struct cred *cred = (struct cred *) _cred; +- +- atomic_add(n, &cred->subscribers); +-#endif +-} +- + /* + * The RCU callback to actually dispose of a set of credentials + */ +@@ -232,21 +207,16 @@ error: + * + * Call commit_creds() or abort_creds() to clean up. + */ +-struct cred *prepare_creds(void) ++struct cred *__prepare_creds(const struct cred *old) + { +- struct task_struct *task = current; +- const struct cred *old; + struct cred *new; + +- validate_process_creds(); +- + new = kmem_cache_alloc(cred_jar, GFP_KERNEL); + if (!new) + return NULL; + + kdebug("prepare_creds() alloc %p", new); + +- old = task->cred; + memcpy(new, old, sizeof(struct cred)); + + atomic_set(&new->usage, 1); +@@ -275,6 +245,13 @@ error: + abort_creds(new); + return NULL; + } + -+struct vx_info *lookup_vx_info(int id) ++struct cred *prepare_creds(void) +{ -+ struct vx_info *vxi = NULL; ++ validate_process_creds(); + -+ if (id < 0) { -+ vxi = get_vx_info(current_vx_info()); -+ } else if (id > 1) { -+ spin_lock(&vx_info_hash_lock); -+ vxi = get_vx_info(__lookup_vx_info(id)); -+ spin_unlock(&vx_info_hash_lock); -+ } -+ return vxi; ++ return __prepare_creds(current->cred); +} + EXPORT_SYMBOL(prepare_creds); + + /* +diff -NurpP --minimal linux-3.18.5/kernel/exit.c linux-3.18.5-vs2.3.7.3/kernel/exit.c +--- linux-3.18.5/kernel/exit.c 2015-02-05 18:02:45.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/exit.c 2015-01-19 11:06:12.000000000 +0000 +@@ -48,6 +48,10 @@ + #include + #include + #include ++#include ++#include ++#include ++#include + #include + #include + #include +@@ -474,15 +478,25 @@ static struct task_struct *find_new_reap + __acquires(&tasklist_lock) + { + struct pid_namespace *pid_ns = task_active_pid_ns(father); +- struct task_struct *thread; ++ struct vx_info *vxi = task_get_vx_info(father); ++ struct task_struct *thread = father; ++ struct task_struct *reaper; + +- thread = father; + while_each_thread(father, thread) { + if (thread->flags & PF_EXITING) + continue; + if (unlikely(pid_ns->child_reaper == father)) + pid_ns->child_reaper = thread; +- return thread; ++ reaper = thread; ++ goto out_put; ++ } + -+/* xid_is_hashed() -+ -+ * verify that xid is still hashed */ -+ -+int xid_is_hashed(xid_t xid) -+{ -+ int hashed; ++ reaper = pid_ns->child_reaper; ++ if (vxi) { ++ BUG_ON(!vxi->vx_reaper); ++ if (vxi->vx_reaper != init_pid_ns.child_reaper && ++ vxi->vx_reaper != father) ++ reaper = vxi->vx_reaper; + } + + if (unlikely(pid_ns->child_reaper == father)) { +@@ -520,7 +534,9 @@ static struct task_struct *find_new_reap + } + } + +- return pid_ns->child_reaper; ++out_put: ++ put_vx_info(vxi); ++ return reaper; + } + + /* +@@ -572,10 +588,15 @@ static void forget_original_parent(struc + struct task_struct *t = p; + + do { +- t->real_parent = reaper; ++ struct task_struct *new_parent = reaper; + -+ spin_lock(&vx_info_hash_lock); -+ hashed = (__lookup_vx_info(xid) != NULL); -+ spin_unlock(&vx_info_hash_lock); -+ return hashed; -+} ++ if (unlikely(p == reaper)) ++ new_parent = task_active_pid_ns(p)->child_reaper; + -+#ifdef CONFIG_PROC_FS ++ t->real_parent = new_parent; + if (t->parent == father) { + BUG_ON(t->ptrace); +- t->parent = t->real_parent; ++ t->parent = new_parent; + } + if (t->pdeath_signal) + group_send_sig_info(t->pdeath_signal, +@@ -777,6 +798,9 @@ void do_exit(long code) + */ + flush_ptrace_hw_breakpoint(tsk); + ++ /* needs to stay before exit_notify() */ ++ exit_vx_info_early(tsk, code); + -+/* get_xid_list() + TASKS_RCU(tasks_rcu_i = __srcu_read_lock(&tasks_rcu_exit_srcu)); + exit_notify(tsk, group_dead); + proc_exit_connector(tsk); +@@ -834,10 +858,15 @@ void do_exit(long code) + smp_mb(); + raw_spin_unlock_wait(&tsk->pi_lock); + ++ /* needs to stay after exit_notify() */ ++ exit_vx_info(tsk, code); ++ exit_nx_info(tsk); + -+ * get a subset of hashed xids for proc -+ * assumes size is at least one */ + /* causes final put_task_struct in finish_task_switch(). */ + tsk->state = TASK_DEAD; + tsk->flags |= PF_NOFREEZE; /* tell freezer to ignore us */ + schedule(); ++ printk("bad task: %p [%lx]\n", current, current->state); + BUG(); + /* Avoid "noreturn function does return". */ + for (;;) +diff -NurpP --minimal linux-3.18.5/kernel/fork.c linux-3.18.5-vs2.3.7.3/kernel/fork.c +--- linux-3.18.5/kernel/fork.c 2015-01-17 02:40:23.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/fork.c 2015-01-21 09:21:45.000000000 +0000 +@@ -74,6 +74,9 @@ + #include + #include + #include ++#include ++#include ++#include + + #include + #include +@@ -214,6 +217,8 @@ void free_task(struct task_struct *tsk) + arch_release_thread_info(tsk->stack); + free_thread_info(tsk->stack); + rt_mutex_debug_task_free(tsk); ++ clr_vx_info(&tsk->vx_info); ++ clr_nx_info(&tsk->nx_info); + ftrace_graph_exit_task(tsk); + put_seccomp_filter(tsk); + arch_release_task_struct(tsk); +@@ -1188,6 +1193,8 @@ static struct task_struct *copy_process( + { + int retval; + struct task_struct *p; ++ struct vx_info *vxi; ++ struct nx_info *nxi; + + if ((clone_flags & (CLONE_NEWNS|CLONE_FS)) == (CLONE_NEWNS|CLONE_FS)) + return ERR_PTR(-EINVAL); +@@ -1249,7 +1256,12 @@ static struct task_struct *copy_process( + DEBUG_LOCKS_WARN_ON(!p->hardirqs_enabled); + DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled); + #endif ++ init_vx_info(&p->vx_info, current_vx_info()); ++ init_nx_info(&p->nx_info, current_nx_info()); + -+int get_xid_list(int index, unsigned int *xids, int size) -+{ -+ int hindex, nr_xids = 0; + retval = -EAGAIN; ++ if (!vx_nproc_avail(1)) ++ goto bad_fork_free; + if (atomic_read(&p->real_cred->user->processes) >= + task_rlimit(p, RLIMIT_NPROC)) { + if (p->real_cred->user != INIT_USER && +@@ -1535,6 +1547,18 @@ static struct task_struct *copy_process( + total_forks++; + spin_unlock(¤t->sighand->siglock); + syscall_tracepoint_update(p); + -+ /* only show current and children */ -+ if (!vx_check(0, VS_ADMIN | VS_WATCH)) { -+ if (index > 0) -+ return 0; -+ xids[nr_xids] = vx_current_xid(); -+ return 1; ++ /* p is copy of current */ ++ vxi = p->vx_info; ++ if (vxi) { ++ claim_vx_info(vxi, p); ++ atomic_inc(&vxi->cvirt.nr_threads); ++ atomic_inc(&vxi->cvirt.total_forks); ++ vx_nproc_inc(p); + } -+ -+ for (hindex = 0; hindex < VX_HASH_SIZE; hindex++) { -+ struct hlist_head *head = &vx_info_hash[hindex]; -+ struct hlist_node *pos; -+ -+ spin_lock(&vx_info_hash_lock); -+ hlist_for_each(pos, head) { -+ struct vx_info *vxi; -+ -+ if (--index > 0) -+ continue; -+ -+ vxi = hlist_entry(pos, struct vx_info, vx_hlist); -+ xids[nr_xids] = vxi->vx_id; -+ if (++nr_xids >= size) { -+ spin_unlock(&vx_info_hash_lock); -+ goto out; -+ } -+ } -+ /* keep the lock time short */ -+ spin_unlock(&vx_info_hash_lock); ++ nxi = p->nx_info; ++ if (nxi) ++ claim_nx_info(nxi, p); + write_unlock_irq(&tasklist_lock); + + proc_fork_connector(p); +diff -NurpP --minimal linux-3.18.5/kernel/kthread.c linux-3.18.5-vs2.3.7.3/kernel/kthread.c +--- linux-3.18.5/kernel/kthread.c 2015-01-17 02:40:23.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/kthread.c 2015-01-19 10:58:05.000000000 +0000 +@@ -18,6 +18,7 @@ + #include + #include + #include ++#include + #include + + static DEFINE_SPINLOCK(kthread_create_lock); +diff -NurpP --minimal linux-3.18.5/kernel/nsproxy.c linux-3.18.5-vs2.3.7.3/kernel/nsproxy.c +--- linux-3.18.5/kernel/nsproxy.c 2015-01-16 22:19:27.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/nsproxy.c 2015-01-19 10:58:05.000000000 +0000 +@@ -20,11 +20,14 @@ + #include + #include + #include ++#include ++#include + #include + #include + #include + #include + #include ++#include "../fs/mount.h" + + static struct kmem_cache *nsproxy_cachep; + +@@ -46,8 +49,11 @@ static inline struct nsproxy *create_nsp + struct nsproxy *nsproxy; + + nsproxy = kmem_cache_alloc(nsproxy_cachep, GFP_KERNEL); +- if (nsproxy) ++ if (nsproxy) { + atomic_set(&nsproxy->count, 1); ++ atomic_inc(&vs_global_nsproxy); + } -+out: -+ return nr_xids; -+} -+#endif -+ -+#ifdef CONFIG_VSERVER_DEBUG ++ vxdprintk(VXD_CBIT(space, 2), "create_nsproxy = %p[1]", nsproxy); + return nsproxy; + } + +@@ -56,9 +62,12 @@ static inline struct nsproxy *create_nsp + * Return the newly created nsproxy. Do not attach this to the task, + * leave it to the caller to do proper locking and attach it to task. + */ +-static struct nsproxy *create_new_namespaces(unsigned long flags, +- struct task_struct *tsk, struct user_namespace *user_ns, +- struct fs_struct *new_fs) ++static struct nsproxy *unshare_namespaces( ++ unsigned long flags, ++ struct nsproxy *orig, ++ struct fs_struct *new_fs, ++ struct user_namespace *new_user, ++ struct pid_namespace *new_pid) + { + struct nsproxy *new_nsp; + int err; +@@ -67,32 +76,31 @@ static struct nsproxy *create_new_namesp + if (!new_nsp) + return ERR_PTR(-ENOMEM); + +- new_nsp->mnt_ns = copy_mnt_ns(flags, tsk->nsproxy->mnt_ns, user_ns, new_fs); ++ new_nsp->mnt_ns = copy_mnt_ns(flags, orig->mnt_ns, new_user, new_fs); + if (IS_ERR(new_nsp->mnt_ns)) { + err = PTR_ERR(new_nsp->mnt_ns); + goto out_ns; + } + +- new_nsp->uts_ns = copy_utsname(flags, user_ns, tsk->nsproxy->uts_ns); ++ new_nsp->uts_ns = copy_utsname(flags, new_user, orig->uts_ns); + if (IS_ERR(new_nsp->uts_ns)) { + err = PTR_ERR(new_nsp->uts_ns); + goto out_uts; + } + +- new_nsp->ipc_ns = copy_ipcs(flags, user_ns, tsk->nsproxy->ipc_ns); ++ new_nsp->ipc_ns = copy_ipcs(flags, new_user, orig->ipc_ns); + if (IS_ERR(new_nsp->ipc_ns)) { + err = PTR_ERR(new_nsp->ipc_ns); + goto out_ipc; + } + +- new_nsp->pid_ns_for_children = +- copy_pid_ns(flags, user_ns, tsk->nsproxy->pid_ns_for_children); ++ new_nsp->pid_ns_for_children = copy_pid_ns(flags, new_user, new_pid); + if (IS_ERR(new_nsp->pid_ns_for_children)) { + err = PTR_ERR(new_nsp->pid_ns_for_children); + goto out_pid; + } + +- new_nsp->net_ns = copy_net_ns(flags, user_ns, tsk->nsproxy->net_ns); ++ new_nsp->net_ns = copy_net_ns(flags, new_user, orig->net_ns); + if (IS_ERR(new_nsp->net_ns)) { + err = PTR_ERR(new_nsp->net_ns); + goto out_net; +@@ -117,6 +125,41 @@ out_ns: + return ERR_PTR(err); + } + ++static struct nsproxy *create_new_namespaces(unsigned long flags, ++ struct task_struct *tsk, struct user_namespace *user_ns, ++ struct fs_struct *new_fs) + -+void dump_vx_info_inactive(int level) +{ -+ struct hlist_node *entry, *next; -+ -+ hlist_for_each_safe(entry, next, &vx_info_inactive) { -+ struct vx_info *vxi = -+ list_entry(entry, struct vx_info, vx_hlist); -+ -+ dump_vx_info(vxi, level); -+ } ++ return unshare_namespaces(flags, tsk->nsproxy, ++ new_fs, user_ns, task_active_pid_ns(tsk)); +} + -+#endif -+ -+#if 0 -+int vx_migrate_user(struct task_struct *p, struct vx_info *vxi) ++/* ++ * copies the nsproxy, setting refcount to 1, and grabbing a ++ * reference to all contained namespaces. ++ */ ++struct nsproxy *copy_nsproxy(struct nsproxy *orig) +{ -+ struct user_struct *new_user, *old_user; -+ -+ if (!p || !vxi) -+ BUG(); -+ -+ if (vx_info_flags(vxi, VXF_INFO_PRIVATE, 0)) -+ return -EACCES; ++ struct nsproxy *ns = create_nsproxy(); + -+ new_user = alloc_uid(vxi->vx_id, p->uid); -+ if (!new_user) -+ return -ENOMEM; ++ if (ns) { ++ memcpy(ns, orig, sizeof(struct nsproxy)); ++ atomic_set(&ns->count, 1); + -+ old_user = p->user; -+ if (new_user != old_user) { -+ atomic_inc(&new_user->processes); -+ atomic_dec(&old_user->processes); -+ p->user = new_user; ++ if (ns->mnt_ns) ++ get_mnt_ns(ns->mnt_ns); ++ if (ns->uts_ns) ++ get_uts_ns(ns->uts_ns); ++ if (ns->ipc_ns) ++ get_ipc_ns(ns->ipc_ns); ++ if (ns->pid_ns_for_children) ++ get_pid_ns(ns->pid_ns_for_children); ++ if (ns->net_ns) ++ get_net(ns->net_ns); + } -+ free_uid(old_user); -+ return 0; ++ return ns; +} -+#endif + -+#if 0 -+void vx_mask_cap_bset(struct vx_info *vxi, struct task_struct *p) -+{ -+ // p->cap_effective &= vxi->vx_cap_bset; -+ p->cap_effective = -+ cap_intersect(p->cap_effective, vxi->cap_bset); -+ // p->cap_inheritable &= vxi->vx_cap_bset; -+ p->cap_inheritable = -+ cap_intersect(p->cap_inheritable, vxi->cap_bset); -+ // p->cap_permitted &= vxi->vx_cap_bset; -+ p->cap_permitted = -+ cap_intersect(p->cap_permitted, vxi->cap_bset); -+} -+#endif + /* + * called from clone. This now handles copy for nsproxy and all + * namespaces therein. +@@ -125,7 +168,10 @@ int copy_namespaces(unsigned long flags, + { + struct nsproxy *old_ns = tsk->nsproxy; + struct user_namespace *user_ns = task_cred_xxx(tsk, user_ns); +- struct nsproxy *new_ns; ++ struct nsproxy *new_ns = NULL; + ++ vxdprintk(VXD_CBIT(space, 7), "copy_namespaces(0x%08lx,%p[%p])", ++ flags, tsk, old_ns); + + if (likely(!(flags & (CLONE_NEWNS | CLONE_NEWUTS | CLONE_NEWIPC | + CLONE_NEWPID | CLONE_NEWNET)))) { +@@ -133,7 +179,7 @@ int copy_namespaces(unsigned long flags, + return 0; + } + +- if (!ns_capable(user_ns, CAP_SYS_ADMIN)) ++ if (!vx_ns_can_unshare(user_ns, CAP_SYS_ADMIN, flags)) + return -EPERM; + + /* +@@ -152,6 +198,9 @@ int copy_namespaces(unsigned long flags, + return PTR_ERR(new_ns); + + tsk->nsproxy = new_ns; ++ vxdprintk(VXD_CBIT(space, 3), ++ "copy_namespaces(0x%08lx,%p[%p]) = [%p]", ++ flags, tsk, old_ns, new_ns); + return 0; + } + +@@ -165,7 +214,9 @@ void free_nsproxy(struct nsproxy *ns) + put_ipc_ns(ns->ipc_ns); + if (ns->pid_ns_for_children) + put_pid_ns(ns->pid_ns_for_children); +- put_net(ns->net_ns); ++ if (ns->net_ns) ++ put_net(ns->net_ns); ++ atomic_dec(&vs_global_nsproxy); + kmem_cache_free(nsproxy_cachep, ns); + } + +@@ -179,12 +230,16 @@ int unshare_nsproxy_namespaces(unsigned + struct user_namespace *user_ns; + int err = 0; + ++ vxdprintk(VXD_CBIT(space, 4), ++ "unshare_nsproxy_namespaces(0x%08lx,[%p])", ++ unshare_flags, current->nsproxy); + -+#include -+#include + if (!(unshare_flags & (CLONE_NEWNS | CLONE_NEWUTS | CLONE_NEWIPC | + CLONE_NEWNET | CLONE_NEWPID))) + return 0; + + user_ns = new_cred ? new_cred->user_ns : current_user_ns(); +- if (!ns_capable(user_ns, CAP_SYS_ADMIN)) ++ if (!vx_ns_can_unshare(user_ns, CAP_SYS_ADMIN, unshare_flags)) + return -EPERM; + + *new_nsp = create_new_namespaces(unshare_flags, current, user_ns, +diff -NurpP --minimal linux-3.18.5/kernel/pid.c linux-3.18.5-vs2.3.7.3/kernel/pid.c +--- linux-3.18.5/kernel/pid.c 2015-02-05 18:02:45.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/pid.c 2015-01-19 10:58:05.000000000 +0000 +@@ -38,6 +38,7 @@ + #include + #include + #include ++#include + + #define pid_hashfn(nr, ns) \ + hash_long((unsigned long)nr + (unsigned long)ns, pidhash_shift) +@@ -375,7 +376,7 @@ EXPORT_SYMBOL_GPL(find_pid_ns); + + struct pid *find_vpid(int nr) + { +- return find_pid_ns(nr, task_active_pid_ns(current)); ++ return find_pid_ns(vx_rmap_pid(nr), task_active_pid_ns(current)); + } + EXPORT_SYMBOL_GPL(find_vpid); + +@@ -431,6 +432,9 @@ void transfer_pid(struct task_struct *ol + struct task_struct *pid_task(struct pid *pid, enum pid_type type) + { + struct task_struct *result = NULL; + -+static int vx_openfd_task(struct task_struct *tsk) ++ if (type == PIDTYPE_REALPID) ++ type = PIDTYPE_PID; + if (pid) { + struct hlist_node *first; + first = rcu_dereference_check(hlist_first_rcu(&pid->tasks[type]), +@@ -450,7 +454,7 @@ struct task_struct *find_task_by_pid_ns( + rcu_lockdep_assert(rcu_read_lock_held(), + "find_task_by_pid_ns() needs rcu_read_lock()" + " protection"); +- return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID); ++ return pid_task(find_pid_ns(vx_rmap_pid(nr), ns), PIDTYPE_PID); + } + + struct task_struct *find_task_by_vpid(pid_t vnr) +@@ -494,7 +498,7 @@ struct pid *find_get_pid(pid_t nr) + } + EXPORT_SYMBOL_GPL(find_get_pid); + +-pid_t pid_nr_ns(struct pid *pid, struct pid_namespace *ns) ++pid_t pid_unmapped_nr_ns(struct pid *pid, struct pid_namespace *ns) + { + struct upid *upid; + pid_t nr = 0; +@@ -508,6 +512,11 @@ pid_t pid_nr_ns(struct pid *pid, struct + } + EXPORT_SYMBOL_GPL(pid_nr_ns); + ++pid_t pid_nr_ns(struct pid *pid, struct pid_namespace *ns) +{ -+ struct files_struct *files = tsk->files; -+ struct fdtable *fdt; -+ const unsigned long *bptr; -+ int count, total; ++ return vx_map_pid(pid_unmapped_nr_ns(pid, ns)); ++} + -+ /* no rcu_read_lock() because of spin_lock() */ -+ spin_lock(&files->file_lock); -+ fdt = files_fdtable(files); -+ bptr = fdt->open_fds; -+ count = fdt->max_fds / (sizeof(unsigned long) * 8); -+ for (total = 0; count > 0; count--) { -+ if (*bptr) -+ total += hweight_long(*bptr); -+ bptr++; + pid_t pid_vnr(struct pid *pid) + { + return pid_nr_ns(pid, task_active_pid_ns(current)); +diff -NurpP --minimal linux-3.18.5/kernel/pid_namespace.c linux-3.18.5-vs2.3.7.3/kernel/pid_namespace.c +--- linux-3.18.5/kernel/pid_namespace.c 2014-06-12 13:02:52.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/pid_namespace.c 2015-01-19 10:58:05.000000000 +0000 +@@ -18,6 +18,7 @@ + #include + #include + #include ++#include + + struct pid_cache { + int nr_ids; +@@ -110,6 +111,7 @@ static struct pid_namespace *create_pid_ + goto out_free_map; + + kref_init(&ns->kref); ++ atomic_inc(&vs_global_pid_ns); + ns->level = level; + ns->parent = get_pid_ns(parent_pid_ns); + ns->user_ns = get_user_ns(user_ns); +@@ -127,6 +129,7 @@ static struct pid_namespace *create_pid_ + out_free_map: + kfree(ns->pidmap[0].page); + out_free: ++ atomic_dec(&vs_global_pid_ns); + kmem_cache_free(pid_ns_cachep, ns); + out: + return ERR_PTR(err); +diff -NurpP --minimal linux-3.18.5/kernel/printk/printk.c linux-3.18.5-vs2.3.7.3/kernel/printk/printk.c +--- linux-3.18.5/kernel/printk/printk.c 2015-01-17 02:40:23.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/printk/printk.c 2015-01-19 11:13:25.000000000 +0000 +@@ -46,6 +46,7 @@ + #include + #include + #include ++#include + + #include + +@@ -490,7 +491,7 @@ static int check_syslog_permissions(int + return 0; + + if (syslog_action_restricted(type)) { +- if (capable(CAP_SYSLOG)) ++ if (vx_capable(CAP_SYSLOG, VXC_SYSLOG)) + return 0; + /* + * For historical reasons, accept CAP_SYS_ADMIN too, with +@@ -1270,12 +1271,9 @@ int do_syslog(int type, char __user *buf + if (error) + return error; + +- switch (type) { +- case SYSLOG_ACTION_CLOSE: /* Close log */ +- break; +- case SYSLOG_ACTION_OPEN: /* Open log */ +- break; +- case SYSLOG_ACTION_READ: /* Read from log */ ++ if ((type == SYSLOG_ACTION_READ) || ++ (type == SYSLOG_ACTION_READ_ALL) || ++ (type == SYSLOG_ACTION_READ_CLEAR)) { + error = -EINVAL; + if (!buf || len < 0) + goto out; +@@ -1286,6 +1284,16 @@ int do_syslog(int type, char __user *buf + error = -EFAULT; + goto out; + } + } -+ spin_unlock(&files->file_lock); -+ return total; -+} -+ -+ -+/* for *space compatibility */ ++ if (!vx_check(0, VS_ADMIN|VS_WATCH)) ++ return vx_do_syslog(type, buf, len); + -+asmlinkage long sys_unshare(unsigned long); ++ switch (type) { ++ case SYSLOG_ACTION_CLOSE: /* Close log */ ++ break; ++ case SYSLOG_ACTION_OPEN: /* Open log */ ++ break; ++ case SYSLOG_ACTION_READ: /* Read from log */ + error = wait_event_interruptible(log_wait, + syslog_seq != log_next_seq); + if (error) +@@ -1298,16 +1306,6 @@ int do_syslog(int type, char __user *buf + /* FALL THRU */ + /* Read last kernel messages */ + case SYSLOG_ACTION_READ_ALL: +- error = -EINVAL; +- if (!buf || len < 0) +- goto out; +- error = 0; +- if (!len) +- goto out; +- if (!access_ok(VERIFY_WRITE, buf, len)) { +- error = -EFAULT; +- goto out; +- } + error = syslog_print_all(buf, len, clear); + break; + /* Clear ring buffer */ +diff -NurpP --minimal linux-3.18.5/kernel/ptrace.c linux-3.18.5-vs2.3.7.3/kernel/ptrace.c +--- linux-3.18.5/kernel/ptrace.c 2015-01-16 22:19:27.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/ptrace.c 2015-01-19 10:58:13.000000000 +0000 +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -258,6 +259,11 @@ ok: + } + rcu_read_unlock(); + ++ if (!vx_check(task->xid, VS_ADMIN_P|VS_WATCH_P|VS_IDENT)) ++ return -EPERM; ++ if (!vx_check(task->xid, VS_IDENT) && ++ !task_vx_flags(task, VXF_STATE_ADMIN, 0)) ++ return -EACCES; + return security_ptrace_access_check(task, mode); + } + +diff -NurpP --minimal linux-3.18.5/kernel/reboot.c linux-3.18.5-vs2.3.7.3/kernel/reboot.c +--- linux-3.18.5/kernel/reboot.c 2015-01-17 02:40:23.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/reboot.c 2015-01-19 10:58:13.000000000 +0000 +@@ -16,6 +16,7 @@ + #include + #include + #include ++#include + + /* + * this indicates whether you can reboot with ctrl-alt-del: the default is yes +@@ -269,6 +270,8 @@ EXPORT_SYMBOL_GPL(kernel_power_off); + + static DEFINE_MUTEX(reboot_mutex); + ++long vs_reboot(unsigned int, void __user *); + -+/* -+ * migrate task to new context -+ * gets vxi, puts old_vxi on change -+ * optionally unshares namespaces (hack) -+ */ + /* + * Reboot system call: for obvious reasons only root may call it, + * and even root needs to set up some magic numbers in the registers +@@ -311,6 +314,9 @@ SYSCALL_DEFINE4(reboot, int, magic1, int + if ((cmd == LINUX_REBOOT_CMD_POWER_OFF) && !pm_power_off) + cmd = LINUX_REBOOT_CMD_HALT; + ++ if (!vx_check(0, VS_ADMIN|VS_WATCH)) ++ return vs_reboot(cmd, arg); + -+int vx_migrate_task(struct task_struct *p, struct vx_info *vxi, int unshare) -+{ -+ struct vx_info *old_vxi; -+ int ret = 0; + mutex_lock(&reboot_mutex); + switch (cmd) { + case LINUX_REBOOT_CMD_RESTART: +diff -NurpP --minimal linux-3.18.5/kernel/sched/core.c linux-3.18.5-vs2.3.7.3/kernel/sched/core.c +--- linux-3.18.5/kernel/sched/core.c 2015-02-05 18:02:45.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/sched/core.c 2015-01-19 11:06:53.000000000 +0000 +@@ -74,6 +74,8 @@ + #include + #include + #include ++#include ++#include + + #include + #include +@@ -3192,7 +3194,7 @@ SYSCALL_DEFINE1(nice, int, increment) + + nice = clamp_val(nice, MIN_NICE, MAX_NICE); + if (increment < 0 && !can_nice(current, nice)) +- return -EPERM; ++ return vx_flags(VXF_IGNEG_NICE, 0) ? 0 : -EPERM; + + retval = security_task_setnice(current, nice); + if (retval) +diff -NurpP --minimal linux-3.18.5/kernel/sched/cputime.c linux-3.18.5-vs2.3.7.3/kernel/sched/cputime.c +--- linux-3.18.5/kernel/sched/cputime.c 2015-01-17 02:40:23.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/sched/cputime.c 2015-01-19 11:08:36.000000000 +0000 +@@ -4,6 +4,7 @@ + #include + #include + #include ++#include + #include "sched.h" + + +@@ -135,14 +136,17 @@ static inline void task_group_account_fi + void account_user_time(struct task_struct *p, cputime_t cputime, + cputime_t cputime_scaled) + { ++ struct vx_info *vxi = p->vx_info; /* p is _always_ current */ ++ int nice = (task_nice(p) > 0); + int index; + + /* Add user time to process. */ + p->utime += cputime; + p->utimescaled += cputime_scaled; ++ vx_account_user(vxi, cputime, nice); + account_group_user_time(p, cputime); + +- index = (task_nice(p) > 0) ? CPUTIME_NICE : CPUTIME_USER; ++ index = (nice) ? CPUTIME_NICE : CPUTIME_USER; + + /* Add user time to cpustat. */ + task_group_account_field(p, index, (__force u64) cputime); +@@ -189,9 +193,12 @@ static inline + void __account_system_time(struct task_struct *p, cputime_t cputime, + cputime_t cputime_scaled, int index) + { ++ struct vx_info *vxi = p->vx_info; /* p is _always_ current */ + -+ if (!p || !vxi) -+ BUG(); + /* Add system time to process. */ + p->stime += cputime; + p->stimescaled += cputime_scaled; ++ vx_account_system(vxi, cputime, 0 /* do we have idle time? */); + account_group_system_time(p, cputime); + + /* Add system time to cpustat. */ +diff -NurpP --minimal linux-3.18.5/kernel/sched/fair.c linux-3.18.5-vs2.3.7.3/kernel/sched/fair.c +--- linux-3.18.5/kernel/sched/fair.c 2015-01-17 02:40:23.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/sched/fair.c 2015-01-19 10:58:14.000000000 +0000 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + #include + +@@ -2840,6 +2841,8 @@ enqueue_entity(struct cfs_rq *cfs_rq, st + __enqueue_entity(cfs_rq, se); + se->on_rq = 1; + ++ if (entity_is_task(se)) ++ vx_activate_task(task_of(se)); + if (cfs_rq->nr_running == 1) { + list_add_leaf_cfs_rq(cfs_rq); + check_enqueue_throttle(cfs_rq); +@@ -2921,6 +2924,8 @@ dequeue_entity(struct cfs_rq *cfs_rq, st + if (se != cfs_rq->curr) + __dequeue_entity(cfs_rq, se); + se->on_rq = 0; ++ if (entity_is_task(se)) ++ vx_deactivate_task(task_of(se)); + account_entity_dequeue(cfs_rq, se); + + /* +diff -NurpP --minimal linux-3.18.5/kernel/sched/proc.c linux-3.18.5-vs2.3.7.3/kernel/sched/proc.c +--- linux-3.18.5/kernel/sched/proc.c 2015-01-16 22:19:27.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/sched/proc.c 2015-01-19 10:58:14.000000000 +0000 +@@ -71,9 +71,17 @@ EXPORT_SYMBOL(avenrun); /* should be rem + */ + void get_avenrun(unsigned long *loads, unsigned long offset, int shift) + { +- loads[0] = (avenrun[0] + offset) << shift; +- loads[1] = (avenrun[1] + offset) << shift; +- loads[2] = (avenrun[2] + offset) << shift; ++ if (vx_flags(VXF_VIRT_LOAD, 0)) { ++ struct vx_info *vxi = current_vx_info(); + -+ vxdprintk(VXD_CBIT(xid, 5), -+ "vx_migrate_task(%p,%p[#%d.%d])", p, vxi, -+ vxi->vx_id, atomic_read(&vxi->vx_usecnt)); ++ loads[0] = (vxi->cvirt.load[0] + offset) << shift; ++ loads[1] = (vxi->cvirt.load[1] + offset) << shift; ++ loads[2] = (vxi->cvirt.load[2] + offset) << shift; ++ } else { ++ loads[0] = (avenrun[0] + offset) << shift; ++ loads[1] = (avenrun[1] + offset) << shift; ++ loads[2] = (avenrun[2] + offset) << shift; ++ } + } + + long calc_load_fold_active(struct rq *this_rq) +diff -NurpP --minimal linux-3.18.5/kernel/signal.c linux-3.18.5-vs2.3.7.3/kernel/signal.c +--- linux-3.18.5/kernel/signal.c 2015-01-16 22:19:27.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/signal.c 2015-01-19 13:14:52.000000000 +0000 +@@ -34,6 +34,8 @@ + #include + #include + #include ++#include ++#include + + #define CREATE_TRACE_POINTS + #include +@@ -767,9 +769,18 @@ static int check_kill_permission(int sig + struct pid *sid; + int error; + ++ vxdprintk(VXD_CBIT(misc, 7), ++ "check_kill_permission(%d,%p,%p[#%u,%u])", ++ sig, info, t, vx_task_xid(t), t->pid); + -+ if (vx_info_flags(vxi, VXF_INFO_PRIVATE, 0) && -+ !vx_info_flags(vxi, VXF_STATE_SETUP, 0)) -+ return -EACCES; + if (!valid_signal(sig)) + return -EINVAL; + ++/* FIXME: needed? if so, why? ++ if ((info != SEND_SIG_NOINFO) && ++ (is_si_special(info) || !si_fromuser(info))) ++ goto skip; */ + -+ if (vx_info_state(vxi, VXS_SHUTDOWN)) -+ return -EFAULT; -+ -+ old_vxi = task_get_vx_info(p); -+ if (old_vxi == vxi) -+ goto out; -+ -+// if (!(ret = vx_migrate_user(p, vxi))) { -+ { -+ int openfd; -+ -+ task_lock(p); -+ openfd = vx_openfd_task(p); -+ -+ if (old_vxi) { -+ atomic_dec(&old_vxi->cvirt.nr_threads); -+ atomic_dec(&old_vxi->cvirt.nr_running); -+ __rlim_dec(&old_vxi->limit, RLIMIT_NPROC); -+ /* FIXME: what about the struct files here? */ -+ __rlim_sub(&old_vxi->limit, VLIMIT_OPENFD, openfd); -+ /* account for the executable */ -+ __rlim_dec(&old_vxi->limit, VLIMIT_DENTRY); -+ } -+ atomic_inc(&vxi->cvirt.nr_threads); -+ atomic_inc(&vxi->cvirt.nr_running); -+ __rlim_inc(&vxi->limit, RLIMIT_NPROC); -+ /* FIXME: what about the struct files here? */ -+ __rlim_add(&vxi->limit, VLIMIT_OPENFD, openfd); -+ /* account for the executable */ -+ __rlim_inc(&vxi->limit, VLIMIT_DENTRY); -+ -+ if (old_vxi) { -+ release_vx_info(old_vxi, p); -+ clr_vx_info(&p->vx_info); -+ } -+ claim_vx_info(vxi, p); -+ set_vx_info(&p->vx_info, vxi); -+ p->xid = vxi->vx_id; -+ -+ vxdprintk(VXD_CBIT(xid, 5), -+ "moved task %p into vxi:%p[#%d]", -+ p, vxi, vxi->vx_id); -+ -+ // vx_mask_cap_bset(vxi, p); -+ task_unlock(p); -+ -+ /* hack for *spaces to provide compatibility */ -+ if (unshare) { -+ struct nsproxy *old_nsp, *new_nsp; -+ -+ ret = unshare_nsproxy_namespaces( -+ CLONE_NEWUTS | CLONE_NEWIPC | CLONE_NEWUSER, -+ &new_nsp, NULL); -+ if (ret) -+ goto out; + if (!si_fromuser(info)) + return 0; + +@@ -793,6 +804,20 @@ static int check_kill_permission(int sig + } + } + ++ error = -EPERM; ++ if (t->pid == 1 && current->xid) ++ return error; + -+ old_nsp = xchg(&p->nsproxy, new_nsp); -+ vx_set_space(vxi, -+ CLONE_NEWUTS | CLONE_NEWIPC | CLONE_NEWUSER, 0); -+ put_nsproxy(old_nsp); -+ } ++ error = -ESRCH; ++ /* FIXME: we shouldn't return ESRCH ever, to avoid ++ loops, maybe ENOENT or EACCES? */ ++ if (!vx_check(vx_task_xid(t), VS_WATCH_P | VS_IDENT)) { ++ vxdprintk(current->xid || VXD_CBIT(misc, 7), ++ "signal %d[%p] xid mismatch %p[#%u,%u] xid=#%u", ++ sig, info, t, vx_task_xid(t), t->pid, current->xid); ++ return error; + } -+out: -+ put_vx_info(old_vxi); -+ return ret; -+} -+ -+int vx_set_reaper(struct vx_info *vxi, struct task_struct *p) -+{ -+ struct task_struct *old_reaper; -+ struct vx_info *reaper_vxi; ++/* skip: */ + return security_task_kill(t, info, sig, 0); + } + +@@ -1334,7 +1359,7 @@ int kill_pid_info(int sig, struct siginf + rcu_read_lock(); + retry: + p = pid_task(pid, PIDTYPE_PID); +- if (p) { ++ if (p && vx_check(vx_task_xid(p), VS_IDENT)) { + error = group_send_sig_info(sig, info, p); + if (unlikely(error == -ESRCH)) + /* +@@ -1382,7 +1407,7 @@ int kill_pid_info_as_cred(int sig, struc + + rcu_read_lock(); + p = pid_task(pid, PIDTYPE_PID); +- if (!p) { ++ if (!p || !vx_check(vx_task_xid(p), VS_IDENT)) { + ret = -ESRCH; + goto out_unlock; + } +@@ -1434,8 +1459,10 @@ static int kill_something_info(int sig, + struct task_struct * p; + + for_each_process(p) { +- if (task_pid_vnr(p) > 1 && +- !same_thread_group(p, current)) { ++ if (vx_check(vx_task_xid(p), VS_ADMIN|VS_IDENT) && ++ task_pid_vnr(p) > 1 && ++ !same_thread_group(p, current) && ++ !vx_current_initpid(p->pid)) { + int err = group_send_sig_info(sig, info, p); + ++count; + if (err != -EPERM) +@@ -2288,6 +2315,11 @@ relock: + !sig_kernel_only(signr)) + continue; + ++ /* virtual init is protected against user signals */ ++ if ((ksig->info.si_code == SI_USER) && ++ vx_current_initpid(current->pid)) ++ continue; + -+ if (!vxi) -+ return -EINVAL; + if (sig_kernel_stop(signr)) { + /* + * The default action is to stop all threads in +diff -NurpP --minimal linux-3.18.5/kernel/softirq.c linux-3.18.5-vs2.3.7.3/kernel/softirq.c +--- linux-3.18.5/kernel/softirq.c 2015-01-17 02:40:23.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/softirq.c 2015-01-19 11:09:03.000000000 +0000 +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + + #define CREATE_TRACE_POINTS + #include +diff -NurpP --minimal linux-3.18.5/kernel/sys.c linux-3.18.5-vs2.3.7.3/kernel/sys.c +--- linux-3.18.5/kernel/sys.c 2015-01-17 02:40:23.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/sys.c 2015-01-19 11:17:00.000000000 +0000 +@@ -54,6 +54,7 @@ + #include + + #include ++#include + /* Move somewhere else to avoid recompiling? */ + #include + +@@ -145,7 +146,10 @@ static int set_one_prio(struct task_stru + goto out; + } + if (niceval < task_nice(p) && !can_nice(p, niceval)) { +- error = -EACCES; ++ if (vx_flags(VXF_IGNEG_NICE, 0)) ++ error = 0; ++ else ++ error = -EACCES; + goto out; + } + no_nice = security_task_setnice(p, niceval); +@@ -196,6 +200,8 @@ SYSCALL_DEFINE3(setpriority, int, which, + else + pgrp = task_pgrp(current); + do_each_pid_thread(pgrp, PIDTYPE_PGID, p) { ++ if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT)) ++ continue; + error = set_one_prio(p, niceval, error); + } while_each_pid_thread(pgrp, PIDTYPE_PGID, p); + break; +@@ -262,6 +268,8 @@ SYSCALL_DEFINE2(getpriority, int, which, + else + pgrp = task_pgrp(current); + do_each_pid_thread(pgrp, PIDTYPE_PGID, p) { ++ if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT)) ++ continue; + niceval = nice_to_rlimit(task_nice(p)); + if (niceval > retval) + retval = niceval; +@@ -278,6 +286,8 @@ SYSCALL_DEFINE2(getpriority, int, which, + goto out_unlock; /* No processes for this user */ + } + do_each_thread(g, p) { ++ if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT)) ++ continue; + if (uid_eq(task_uid(p), uid)) { + niceval = nice_to_rlimit(task_nice(p)); + if (niceval > retval) +@@ -1202,7 +1212,8 @@ SYSCALL_DEFINE2(sethostname, char __user + int errno; + char tmp[__NEW_UTS_LEN]; + +- if (!ns_capable(current->nsproxy->uts_ns->user_ns, CAP_SYS_ADMIN)) ++ if (!vx_ns_capable(current->nsproxy->uts_ns->user_ns, ++ CAP_SYS_ADMIN, VXC_SET_UTSNAME)) + return -EPERM; + + if (len < 0 || len > __NEW_UTS_LEN) +@@ -1253,7 +1264,8 @@ SYSCALL_DEFINE2(setdomainname, char __us + int errno; + char tmp[__NEW_UTS_LEN]; + +- if (!ns_capable(current->nsproxy->uts_ns->user_ns, CAP_SYS_ADMIN)) ++ if (!vx_ns_capable(current->nsproxy->uts_ns->user_ns, ++ CAP_SYS_ADMIN, VXC_SET_UTSNAME)) + return -EPERM; + if (len < 0 || len > __NEW_UTS_LEN) + return -EINVAL; +@@ -1371,7 +1383,7 @@ int do_prlimit(struct task_struct *tsk, + /* Keep the capable check against init_user_ns until + cgroups can contain all limits */ + if (new_rlim->rlim_max > rlim->rlim_max && +- !capable(CAP_SYS_RESOURCE)) ++ !vx_capable(CAP_SYS_RESOURCE, VXC_SET_RLIMIT)) + retval = -EPERM; + if (!retval) + retval = security_task_setrlimit(tsk->group_leader, +@@ -1424,7 +1436,8 @@ static int check_prlimit_permission(stru + gid_eq(cred->gid, tcred->sgid) && + gid_eq(cred->gid, tcred->gid)) + return 0; +- if (ns_capable(tcred->user_ns, CAP_SYS_RESOURCE)) ++ if (vx_ns_capable(tcred->user_ns, ++ CAP_SYS_RESOURCE, VXC_SET_RLIMIT)) + return 0; + + return -EPERM; +diff -NurpP --minimal linux-3.18.5/kernel/sysctl.c linux-3.18.5-vs2.3.7.3/kernel/sysctl.c +--- linux-3.18.5/kernel/sysctl.c 2015-01-17 02:40:23.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/sysctl.c 2015-02-02 01:19:02.000000000 +0000 +@@ -84,6 +84,7 @@ + #if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT) + #include + #endif ++extern char vshelper_path[]; + #ifdef CONFIG_CHR_DEV_SG + #include + #endif +@@ -278,6 +279,13 @@ static int max_extfrag_threshold = 1000; + + static struct ctl_table kern_table[] = { + { ++ .procname = "vshelper", ++ .data = &vshelper_path, ++ .maxlen = 256, ++ .mode = 0644, ++ .proc_handler = proc_dostring, ++ }, ++ { + .procname = "sched_child_runs_first", + .data = &sysctl_sched_child_runs_first, + .maxlen = sizeof(unsigned int), +@@ -1300,7 +1308,6 @@ static struct ctl_table vm_table[] = { + .extra1 = &min_extfrag_threshold, + .extra2 = &max_extfrag_threshold, + }, +- + #endif /* CONFIG_COMPACTION */ + { + .procname = "min_free_kbytes", +diff -NurpP --minimal linux-3.18.5/kernel/sysctl_binary.c linux-3.18.5-vs2.3.7.3/kernel/sysctl_binary.c +--- linux-3.18.5/kernel/sysctl_binary.c 2015-01-17 02:40:23.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/sysctl_binary.c 2015-01-19 10:58:14.000000000 +0000 +@@ -73,6 +73,7 @@ static const struct bin_table bin_kern_t + + { CTL_INT, KERN_PANIC, "panic" }, + { CTL_INT, KERN_REALROOTDEV, "real-root-dev" }, ++ { CTL_STR, KERN_VSHELPER, "vshelper" }, + + { CTL_STR, KERN_SPARC_REBOOT, "reboot-cmd" }, + { CTL_INT, KERN_CTLALTDEL, "ctrl-alt-del" }, +diff -NurpP --minimal linux-3.18.5/kernel/time/posix-timers.c linux-3.18.5-vs2.3.7.3/kernel/time/posix-timers.c +--- linux-3.18.5/kernel/time/posix-timers.c 2015-01-17 02:40:23.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/time/posix-timers.c 2015-01-19 13:01:37.000000000 +0000 +@@ -48,6 +48,7 @@ + #include + #include + #include ++#include + + #include "timekeeping.h" + +@@ -400,6 +401,7 @@ int posix_timer_event(struct k_itimer *t + { + struct task_struct *task; + int shared, ret = -1; + -+ vxdprintk(VXD_CBIT(xid, 6), -+ "vx_set_reaper(%p[#%d],%p[#%d,%d])", -+ vxi, vxi->vx_id, p, p->xid, p->pid); + /* + * FIXME: if ->sigq is queued we can race with + * dequeue_signal()->do_schedule_next_timer(). +@@ -416,10 +418,18 @@ int posix_timer_event(struct k_itimer *t + rcu_read_lock(); + task = pid_task(timr->it_pid, PIDTYPE_PID); + if (task) { ++ struct vx_info_save vxis; ++ struct vx_info *vxi; + -+ old_reaper = vxi->vx_reaper; -+ if (old_reaper == p) -+ return 0; ++ vxi = get_vx_info(task->vx_info); ++ enter_vx_info(vxi, &vxis); + shared = !(timr->it_sigev_notify & SIGEV_THREAD_ID); + ret = send_sigqueue(timr->sigq, task, shared); ++ leave_vx_info(&vxis); ++ put_vx_info(vxi); + } + rcu_read_unlock(); + -+ reaper_vxi = task_get_vx_info(p); -+ if (reaper_vxi && reaper_vxi != vxi) { -+ vxwprintk(1, -+ "Unsuitable reaper [" VS_Q("%s") ",%u:#%u] " -+ "for [xid #%u]", -+ p->comm, p->pid, p->xid, vx_current_xid()); -+ goto out; -+ } -+ -+ /* set new child reaper */ -+ get_task_struct(p); -+ vxi->vx_reaper = p; -+ put_task_struct(old_reaper); -+out: -+ put_vx_info(reaper_vxi); -+ return 0; -+} -+ -+int vx_set_init(struct vx_info *vxi, struct task_struct *p) + /* If we failed to send the signal the timer stops. */ + return ret > 0; + } +diff -NurpP --minimal linux-3.18.5/kernel/time/time.c linux-3.18.5-vs2.3.7.3/kernel/time/time.c +--- linux-3.18.5/kernel/time/time.c 2015-02-05 18:02:46.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/time/time.c 2015-02-05 18:08:00.000000000 +0000 +@@ -37,6 +37,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -93,7 +94,7 @@ SYSCALL_DEFINE1(stime, time_t __user *, + if (err) + return err; + +- do_settimeofday(&tv); ++ vx_settimeofday(&tv); + return 0; + } + +@@ -182,7 +183,7 @@ int do_sys_settimeofday(const struct tim + } + } + if (tv) +- return do_settimeofday(tv); ++ return vx_settimeofday(tv); + return 0; + } + +diff -NurpP --minimal linux-3.18.5/kernel/time/timekeeping.c linux-3.18.5-vs2.3.7.3/kernel/time/timekeeping.c +--- linux-3.18.5/kernel/time/timekeeping.c 2015-01-16 22:19:28.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/time/timekeeping.c 2015-01-19 11:18:21.000000000 +0000 +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + #include "tick-internal.h" + #include "ntp_internal.h" +@@ -680,7 +681,9 @@ void getnstime_raw_and_real(struct times + } while (read_seqcount_retry(&tk_core.seq, seq)); + + timespec_add_ns(ts_raw, nsecs_raw); ++ vx_adjust_timespec(ts_raw); + timespec_add_ns(ts_real, nsecs_real); ++ vx_adjust_timespec(ts_real); + } + EXPORT_SYMBOL(getnstime_raw_and_real); + +diff -NurpP --minimal linux-3.18.5/kernel/time/timer.c linux-3.18.5-vs2.3.7.3/kernel/time/timer.c +--- linux-3.18.5/kernel/time/timer.c 2015-01-17 02:40:23.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/time/timer.c 2015-01-19 13:02:42.000000000 +0000 +@@ -42,6 +42,10 @@ + #include + #include + #include ++#include ++#include ++#include ++#include + + #include + #include +diff -NurpP --minimal linux-3.18.5/kernel/user_namespace.c linux-3.18.5-vs2.3.7.3/kernel/user_namespace.c +--- linux-3.18.5/kernel/user_namespace.c 2015-02-05 18:02:46.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/user_namespace.c 2015-01-25 18:29:17.000000000 +0000 +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + + static struct kmem_cache *user_ns_cachep __read_mostly; + static DEFINE_MUTEX(userns_state_mutex); +@@ -95,6 +96,7 @@ int create_user_ns(struct cred *new) + + atomic_set(&ns->count, 1); + /* Leave the new->user_ns reference with the new user namespace. */ ++ atomic_inc(&vs_global_user_ns); + ns->parent = parent_ns; + ns->level = parent_ns->level + 1; + ns->owner = owner; +@@ -356,6 +358,18 @@ gid_t from_kgid_munged(struct user_names + } + EXPORT_SYMBOL(from_kgid_munged); + ++ktag_t make_ktag(struct user_namespace *from, vtag_t tag) +{ -+ if (!vxi) -+ return -EINVAL; -+ -+ vxdprintk(VXD_CBIT(xid, 6), -+ "vx_set_init(%p[#%d],%p[#%d,%d,%d])", -+ vxi, vxi->vx_id, p, p->xid, p->pid, p->tgid); -+ -+ vxi->vx_flags &= ~VXF_STATE_INIT; -+ // vxi->vx_initpid = p->tgid; -+ vxi->vx_initpid = p->pid; -+ return 0; ++ return KTAGT_INIT(tag); +} ++EXPORT_SYMBOL(make_ktag); + -+void vx_exit_init(struct vx_info *vxi, struct task_struct *p, int code) ++vtag_t from_ktag(struct user_namespace *to, ktag_t tag) +{ -+ vxdprintk(VXD_CBIT(xid, 6), -+ "vx_exit_init(%p[#%d],%p[#%d,%d,%d])", -+ vxi, vxi->vx_id, p, p->xid, p->pid, p->tgid); -+ -+ vxi->exit_code = code; -+ vxi->vx_initpid = 0; ++ return __ktag_val(tag); +} ++EXPORT_SYMBOL(from_ktag); + + /** + * make_kprojid - Map a user-namespace projid pair into a kprojid. + * @ns: User namespace that the projid is in +@@ -956,6 +970,8 @@ static void *userns_get(struct task_stru + + static void userns_put(void *ns) + { ++ /* FIXME: maybe move into destroyer? */ ++ atomic_dec(&vs_global_user_ns); + put_user_ns(ns); + } + +diff -NurpP --minimal linux-3.18.5/kernel/utsname.c linux-3.18.5-vs2.3.7.3/kernel/utsname.c +--- linux-3.18.5/kernel/utsname.c 2015-01-16 22:19:28.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/utsname.c 2015-01-19 10:58:31.000000000 +0000 +@@ -16,14 +16,17 @@ + #include + #include + #include ++#include + + static struct uts_namespace *create_uts_ns(void) + { + struct uts_namespace *uts_ns; + + uts_ns = kmalloc(sizeof(struct uts_namespace), GFP_KERNEL); +- if (uts_ns) ++ if (uts_ns) { + kref_init(&uts_ns->kref); ++ atomic_inc(&vs_global_uts_ns); ++ } + return uts_ns; + } + +@@ -85,6 +88,7 @@ void free_uts_ns(struct kref *kref) + ns = container_of(kref, struct uts_namespace, kref); + put_user_ns(ns->user_ns); + proc_free_inum(ns->proc_inum); ++ atomic_dec(&vs_global_uts_ns); + kfree(ns); + } + +diff -NurpP --minimal linux-3.18.5/kernel/vserver/Kconfig linux-3.18.5-vs2.3.7.3/kernel/vserver/Kconfig +--- linux-3.18.5/kernel/vserver/Kconfig 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/vserver/Kconfig 2015-01-19 10:58:31.000000000 +0000 +@@ -0,0 +1,230 @@ ++# ++# Linux VServer configuration ++# + -+void vx_set_persistent(struct vx_info *vxi) -+{ -+ vxdprintk(VXD_CBIT(xid, 6), -+ "vx_set_persistent(%p[#%d])", vxi, vxi->vx_id); ++menu "Linux VServer" + -+ get_vx_info(vxi); -+ claim_vx_info(vxi, NULL); -+} ++config VSERVER_AUTO_LBACK ++ bool "Automatically Assign Loopback IP" ++ default y ++ help ++ Automatically assign a guest specific loopback ++ IP and add it to the kernel network stack on ++ startup. + -+void vx_clear_persistent(struct vx_info *vxi) -+{ -+ vxdprintk(VXD_CBIT(xid, 6), -+ "vx_clear_persistent(%p[#%d])", vxi, vxi->vx_id); ++config VSERVER_AUTO_SINGLE ++ bool "Automatic Single IP Special Casing" ++ default n ++ help ++ This allows network contexts with a single IP to ++ automatically remap 0.0.0.0 bindings to that IP, ++ avoiding further network checks and improving ++ performance. + -+ release_vx_info(vxi, NULL); -+ put_vx_info(vxi); -+} ++ (note: such guests do not allow to change the ip ++ on the fly and do not show loopback addresses) + -+void vx_update_persistent(struct vx_info *vxi) -+{ -+ if (vx_info_flags(vxi, VXF_PERSISTENT, 0)) -+ vx_set_persistent(vxi); -+ else -+ vx_clear_persistent(vxi); -+} ++config VSERVER_COWBL ++ bool "Enable COW Immutable Link Breaking" ++ default y ++ help ++ This enables the COW (Copy-On-Write) link break code. ++ It allows you to treat unified files like normal files ++ when writing to them (which will implicitely break the ++ link and create a copy of the unified file) + ++config VSERVER_VTIME ++ bool "Enable Virtualized Guest Time (EXPERIMENTAL)" ++ default n ++ help ++ This enables per guest time offsets to allow for ++ adjusting the system clock individually per guest. ++ this adds some overhead to the time functions and ++ therefore should not be enabled without good reason. + -+/* task must be current or locked */ ++config VSERVER_DEVICE ++ bool "Enable Guest Device Mapping (EXPERIMENTAL)" ++ default n ++ help ++ This enables generic device remapping. + -+void exit_vx_info(struct task_struct *p, int code) -+{ -+ struct vx_info *vxi = p->vx_info; ++config VSERVER_PROC_SECURE ++ bool "Enable Proc Security" ++ depends on PROC_FS ++ default y ++ help ++ This configures ProcFS security to initially hide ++ non-process entries for all contexts except the main and ++ spectator context (i.e. for all guests), which is a secure ++ default. + -+ if (vxi) { -+ atomic_dec(&vxi->cvirt.nr_threads); -+ vx_nproc_dec(p); ++ (note: on 1.2x the entries were visible by default) + -+ vxi->exit_code = code; -+ release_vx_info(vxi, p); -+ } -+} ++choice ++ prompt "Persistent Inode Tagging" ++ default TAGGING_ID24 ++ help ++ This adds persistent context information to filesystems ++ mounted with the tagxid option. Tagging is a requirement ++ for per-context disk limits and per-context quota. + -+void exit_vx_info_early(struct task_struct *p, int code) -+{ -+ struct vx_info *vxi = p->vx_info; + -+ if (vxi) { -+ if (vxi->vx_initpid == p->pid) -+ vx_exit_init(vxi, p, code); -+ if (vxi->vx_reaper == p) -+ vx_set_reaper(vxi, init_pid_ns.child_reaper); -+ } -+} ++config TAGGING_NONE ++ bool "Disabled" ++ help ++ do not store per-context information in inodes. + ++config TAGGING_UID16 ++ bool "UID16/GID32" ++ help ++ reduces UID to 16 bit, but leaves GID at 32 bit. + -+/* vserver syscall commands below here */ ++config TAGGING_GID16 ++ bool "UID32/GID16" ++ help ++ reduces GID to 16 bit, but leaves UID at 32 bit. + -+/* taks xid and vx_info functions */ ++config TAGGING_ID24 ++ bool "UID24/GID24" ++ help ++ uses the upper 8bit from UID and GID for XID tagging ++ which leaves 24bit for UID/GID each, which should be ++ more than sufficient for normal use. + -+#include ++config TAGGING_INTERN ++ bool "UID32/GID32" ++ help ++ this uses otherwise reserved inode fields in the on ++ disk representation, which limits the use to a few ++ filesystems (currently ext2 and ext3) + ++endchoice + -+int vc_task_xid(uint32_t id) -+{ -+ xid_t xid; ++config TAG_NFSD ++ bool "Tag NFSD User Auth and Files" ++ default n ++ help ++ Enable this if you do want the in-kernel NFS ++ Server to use the tagging specified above. ++ (will require patched clients too) + -+ if (id) { -+ struct task_struct *tsk; ++config VSERVER_PRIVACY ++ bool "Honor Privacy Aspects of Guests" ++ default n ++ help ++ When enabled, most context checks will disallow ++ access to structures assigned to a specific context, ++ like ptys or loop devices. + -+ rcu_read_lock(); -+ tsk = find_task_by_real_pid(id); -+ xid = (tsk) ? tsk->xid : -ESRCH; -+ rcu_read_unlock(); -+ } else -+ xid = vx_current_xid(); -+ return xid; -+} ++config VSERVER_CONTEXTS ++ int "Maximum number of Contexts (1-65533)" if EMBEDDED ++ range 1 65533 ++ default "768" if 64BIT ++ default "256" ++ help ++ This setting will optimize certain data structures ++ and memory allocations according to the expected ++ maximum. + ++ note: this is not a strict upper limit. + -+int vc_vx_info(struct vx_info *vxi, void __user *data) -+{ -+ struct vcmd_vx_info_v0 vc_data; ++config VSERVER_WARN ++ bool "VServer Warnings" ++ default y ++ help ++ This enables various runtime warnings, which will ++ notify about potential manipulation attempts or ++ resource shortage. It is generally considered to ++ be a good idea to have that enabled. + -+ vc_data.xid = vxi->vx_id; -+ vc_data.initpid = vxi->vx_initpid; ++config VSERVER_WARN_DEVPTS ++ bool "VServer DevPTS Warnings" ++ depends on VSERVER_WARN ++ default y ++ help ++ This enables DevPTS related warnings, issued when a ++ process inside a context tries to lookup or access ++ a dynamic pts from the host or a different context. + -+ if (copy_to_user(data, &vc_data, sizeof(vc_data))) -+ return -EFAULT; -+ return 0; -+} ++config VSERVER_DEBUG ++ bool "VServer Debugging Code" ++ default n ++ help ++ Set this to yes if you want to be able to activate ++ debugging output at runtime. It adds a very small ++ overhead to all vserver related functions and ++ increases the kernel size by about 20k. + ++config VSERVER_HISTORY ++ bool "VServer History Tracing" ++ depends on VSERVER_DEBUG ++ default n ++ help ++ Set this to yes if you want to record the history of ++ linux-vserver activities, so they can be replayed in ++ the event of a kernel panic or oops. + -+int vc_ctx_stat(struct vx_info *vxi, void __user *data) -+{ -+ struct vcmd_ctx_stat_v0 vc_data; ++config VSERVER_HISTORY_SIZE ++ int "Per-CPU History Size (32-65536)" ++ depends on VSERVER_HISTORY ++ range 32 65536 ++ default 64 ++ help ++ This allows you to specify the number of entries in ++ the per-CPU history buffer. + -+ vc_data.usecnt = atomic_read(&vxi->vx_usecnt); -+ vc_data.tasks = atomic_read(&vxi->vx_tasks); ++config VSERVER_EXTRA_MNT_CHECK ++ bool "Extra Checks for Reachability" ++ default n ++ help ++ Set this to yes if you want to do extra checks for ++ vfsmount reachability in the proc filesystem code. ++ This shouldn't be required on any setup utilizing ++ mnt namespaces. + -+ if (copy_to_user(data, &vc_data, sizeof(vc_data))) -+ return -EFAULT; -+ return 0; -+} ++choice ++ prompt "Quotes used in debug and warn messages" ++ default QUOTES_ISO8859 + ++config QUOTES_ISO8859 ++ bool "Extended ASCII (ISO 8859) angle quotes" ++ help ++ This uses the extended ASCII characters \xbb ++ and \xab for quoting file and process names. + -+/* context functions */ ++config QUOTES_UTF8 ++ bool "UTF-8 angle quotes" ++ help ++ This uses the the UTF-8 sequences for angle ++ quotes to quote file and process names. + -+int vc_ctx_create(uint32_t xid, void __user *data) -+{ -+ struct vcmd_ctx_create vc_data = { .flagword = VXF_INIT_SET }; -+ struct vx_info *new_vxi; -+ int ret; ++config QUOTES_ASCII ++ bool "ASCII single quotes" ++ help ++ This uses the ASCII single quote character ++ (\x27) to quote file and process names. + -+ if (data && copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; ++endchoice + -+ if ((xid > MAX_S_CONTEXT) || (xid < 2)) -+ return -EINVAL; ++endmenu + -+ new_vxi = __create_vx_info(xid); -+ if (IS_ERR(new_vxi)) -+ return PTR_ERR(new_vxi); + -+ /* initial flags */ -+ new_vxi->vx_flags = vc_data.flagword; ++config VSERVER ++ bool ++ default y ++ select NAMESPACES ++ select UTS_NS ++ select IPC_NS ++# select USER_NS ++ select SYSVIPC + -+ ret = -ENOEXEC; -+ if (vs_state_change(new_vxi, VSC_STARTUP)) -+ goto out; ++config VSERVER_SECURITY ++ bool ++ depends on SECURITY ++ default y ++ select SECURITY_CAPABILITIES + -+ ret = vx_migrate_task(current, new_vxi, (!data)); -+ if (ret) -+ goto out; ++config VSERVER_DISABLED ++ bool ++ default n + -+ /* return context id on success */ -+ ret = new_vxi->vx_id; +diff -NurpP --minimal linux-3.18.5/kernel/vserver/Makefile linux-3.18.5-vs2.3.7.3/kernel/vserver/Makefile +--- linux-3.18.5/kernel/vserver/Makefile 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/vserver/Makefile 2015-01-19 10:58:31.000000000 +0000 +@@ -0,0 +1,18 @@ ++# ++# Makefile for the Linux vserver routines. ++# + -+ /* get a reference for persistent contexts */ -+ if ((vc_data.flagword & VXF_PERSISTENT)) -+ vx_set_persistent(new_vxi); -+out: -+ release_vx_info(new_vxi, NULL); -+ put_vx_info(new_vxi); -+ return ret; -+} + ++obj-y += vserver.o + -+int vc_ctx_migrate(struct vx_info *vxi, void __user *data) -+{ -+ struct vcmd_ctx_migrate vc_data = { .flagword = 0 }; -+ int ret; ++vserver-y := switch.o context.o space.o sched.o network.o inode.o \ ++ limit.o cvirt.o cacct.o signal.o helper.o init.o \ ++ dlimit.o tag.o + -+ if (data && copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; ++vserver-$(CONFIG_INET) += inet.o ++vserver-$(CONFIG_PROC_FS) += proc.o ++vserver-$(CONFIG_VSERVER_DEBUG) += sysctl.o debug.o ++vserver-$(CONFIG_VSERVER_HISTORY) += history.o ++vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o ++vserver-$(CONFIG_VSERVER_DEVICE) += device.o + -+ ret = vx_migrate_task(current, vxi, 0); -+ if (ret) -+ return ret; -+ if (vc_data.flagword & VXM_SET_INIT) -+ ret = vx_set_init(vxi, current); -+ if (ret) -+ return ret; -+ if (vc_data.flagword & VXM_SET_REAPER) -+ ret = vx_set_reaper(vxi, current); -+ return ret; -+} +diff -NurpP --minimal linux-3.18.5/kernel/vserver/cacct.c linux-3.18.5-vs2.3.7.3/kernel/vserver/cacct.c +--- linux-3.18.5/kernel/vserver/cacct.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/vserver/cacct.c 2015-01-19 10:58:31.000000000 +0000 +@@ -0,0 +1,42 @@ ++/* ++ * linux/kernel/vserver/cacct.c ++ * ++ * Virtual Server: Context Accounting ++ * ++ * Copyright (C) 2006-2007 Herbert Pötzl ++ * ++ * V0.01 added accounting stats ++ * ++ */ + ++#include ++#include ++#include ++#include + -+int vc_get_cflags(struct vx_info *vxi, void __user *data) ++#include ++#include ++ ++ ++int vc_sock_stat(struct vx_info *vxi, void __user *data) +{ -+ struct vcmd_ctx_flags_v0 vc_data; ++ struct vcmd_sock_stat_v0 vc_data; ++ int j, field; + -+ vc_data.flagword = vxi->vx_flags; ++ if (copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; + -+ /* special STATE flag handling */ -+ vc_data.mask = vs_mask_flags(~0ULL, vxi->vx_flags, VXF_ONE_TIME); ++ field = vc_data.field; ++ if ((field < 0) || (field >= VXA_SOCK_SIZE)) ++ return -EINVAL; ++ ++ for (j = 0; j < 3; j++) { ++ vc_data.count[j] = vx_sock_count(&vxi->cacct, field, j); ++ vc_data.total[j] = vx_sock_total(&vxi->cacct, field, j); ++ } + + if (copy_to_user(data, &vc_data, sizeof(vc_data))) + return -EFAULT; + return 0; +} + -+int vc_set_cflags(struct vx_info *vxi, void __user *data) -+{ -+ struct vcmd_ctx_flags_v0 vc_data; -+ uint64_t mask, trigger; +diff -NurpP --minimal linux-3.18.5/kernel/vserver/cacct_init.h linux-3.18.5-vs2.3.7.3/kernel/vserver/cacct_init.h +--- linux-3.18.5/kernel/vserver/cacct_init.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/vserver/cacct_init.h 2015-01-19 10:58:31.000000000 +0000 +@@ -0,0 +1,25 @@ + -+ if (copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; + -+ /* special STATE flag handling */ -+ mask = vs_mask_mask(vc_data.mask, vxi->vx_flags, VXF_ONE_TIME); -+ trigger = (mask & vxi->vx_flags) ^ (mask & vc_data.flagword); ++static inline void vx_info_init_cacct(struct _vx_cacct *cacct) ++{ ++ int i, j; + -+ if (vxi == current_vx_info()) { -+ /* if (trigger & VXF_STATE_SETUP) -+ vx_mask_cap_bset(vxi, current); */ -+ if (trigger & VXF_STATE_INIT) { -+ int ret; + -+ ret = vx_set_init(vxi, current); -+ if (ret) -+ return ret; -+ ret = vx_set_reaper(vxi, current); -+ if (ret) -+ return ret; ++ for (i = 0; i < VXA_SOCK_SIZE; i++) { ++ for (j = 0; j < 3; j++) { ++ atomic_long_set(&cacct->sock[i][j].count, 0); ++ atomic_long_set(&cacct->sock[i][j].total, 0); + } + } -+ -+ vxi->vx_flags = vs_mask_flags(vxi->vx_flags, -+ vc_data.flagword, mask); -+ if (trigger & VXF_PERSISTENT) -+ vx_update_persistent(vxi); -+ -+ return 0; ++ for (i = 0; i < 8; i++) ++ atomic_set(&cacct->slab[i], 0); ++ for (i = 0; i < 5; i++) ++ for (j = 0; j < 4; j++) ++ atomic_set(&cacct->page[i][j], 0); +} + -+ -+static inline uint64_t caps_from_cap_t(kernel_cap_t c) ++static inline void vx_info_exit_cacct(struct _vx_cacct *cacct) +{ -+ uint64_t v = c.cap[0] | ((uint64_t)c.cap[1] << 32); -+ -+ // printk("caps_from_cap_t(%08x:%08x) = %016llx\n", c.cap[1], c.cap[0], v); -+ return v; ++ return; +} + -+static inline kernel_cap_t cap_t_from_caps(uint64_t v) -+{ -+ kernel_cap_t c = __cap_empty_set; +diff -NurpP --minimal linux-3.18.5/kernel/vserver/cacct_proc.h linux-3.18.5-vs2.3.7.3/kernel/vserver/cacct_proc.h +--- linux-3.18.5/kernel/vserver/cacct_proc.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/vserver/cacct_proc.h 2015-01-19 10:58:31.000000000 +0000 +@@ -0,0 +1,53 @@ ++#ifndef _VX_CACCT_PROC_H ++#define _VX_CACCT_PROC_H + -+ c.cap[0] = v & 0xFFFFFFFF; -+ c.cap[1] = (v >> 32) & 0xFFFFFFFF; ++#include + -+ // printk("cap_t_from_caps(%016llx) = %08x:%08x\n", v, c.cap[1], c.cap[0]); -+ return c; -+} + ++#define VX_SOCKA_TOP \ ++ "Type\t recv #/bytes\t\t send #/bytes\t\t fail #/bytes\n" + -+static int do_get_caps(struct vx_info *vxi, uint64_t *bcaps, uint64_t *ccaps) ++static inline int vx_info_proc_cacct(struct _vx_cacct *cacct, char *buffer) +{ -+ if (bcaps) -+ *bcaps = caps_from_cap_t(vxi->vx_bcaps); -+ if (ccaps) -+ *ccaps = vxi->vx_ccaps; -+ -+ return 0; -+} ++ int i, j, length = 0; ++ static char *type[VXA_SOCK_SIZE] = { ++ "UNSPEC", "UNIX", "INET", "INET6", "PACKET", "OTHER" ++ }; + -+int vc_get_ccaps(struct vx_info *vxi, void __user *data) -+{ -+ struct vcmd_ctx_caps_v1 vc_data; -+ int ret; ++ length += sprintf(buffer + length, VX_SOCKA_TOP); ++ for (i = 0; i < VXA_SOCK_SIZE; i++) { ++ length += sprintf(buffer + length, "%s:", type[i]); ++ for (j = 0; j < 3; j++) { ++ length += sprintf(buffer + length, ++ "\t%10lu/%-10lu", ++ vx_sock_count(cacct, i, j), ++ vx_sock_total(cacct, i, j)); ++ } ++ buffer[length++] = '\n'; ++ } + -+ ret = do_get_caps(vxi, NULL, &vc_data.ccaps); -+ if (ret) -+ return ret; -+ vc_data.cmask = ~0ULL; ++ length += sprintf(buffer + length, "\n"); ++ length += sprintf(buffer + length, ++ "slab:\t %8u %8u %8u %8u\n", ++ atomic_read(&cacct->slab[1]), ++ atomic_read(&cacct->slab[4]), ++ atomic_read(&cacct->slab[0]), ++ atomic_read(&cacct->slab[2])); + -+ if (copy_to_user(data, &vc_data, sizeof(vc_data))) -+ return -EFAULT; -+ return 0; ++ length += sprintf(buffer + length, "\n"); ++ for (i = 0; i < 5; i++) { ++ length += sprintf(buffer + length, ++ "page[%d]: %8u %8u %8u %8u\t %8u %8u %8u %8u\n", i, ++ atomic_read(&cacct->page[i][0]), ++ atomic_read(&cacct->page[i][1]), ++ atomic_read(&cacct->page[i][2]), ++ atomic_read(&cacct->page[i][3]), ++ atomic_read(&cacct->page[i][4]), ++ atomic_read(&cacct->page[i][5]), ++ atomic_read(&cacct->page[i][6]), ++ atomic_read(&cacct->page[i][7])); ++ } ++ return length; +} + -+static int do_set_caps(struct vx_info *vxi, -+ uint64_t bcaps, uint64_t bmask, uint64_t ccaps, uint64_t cmask) -+{ -+ uint64_t bcold = caps_from_cap_t(vxi->vx_bcaps); ++#endif /* _VX_CACCT_PROC_H */ +diff -NurpP --minimal linux-3.18.5/kernel/vserver/context.c linux-3.18.5-vs2.3.7.3/kernel/vserver/context.c +--- linux-3.18.5/kernel/vserver/context.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/vserver/context.c 2015-01-19 10:58:31.000000000 +0000 +@@ -0,0 +1,1119 @@ ++/* ++ * linux/kernel/vserver/context.c ++ * ++ * Virtual Server: Context Support ++ * ++ * Copyright (C) 2003-2011 Herbert Pötzl ++ * ++ * V0.01 context helper ++ * V0.02 vx_ctx_kill syscall command ++ * V0.03 replaced context_info calls ++ * V0.04 redesign of struct (de)alloc ++ * V0.05 rlimit basic implementation ++ * V0.06 task_xid and info commands ++ * V0.07 context flags and caps ++ * V0.08 switch to RCU based hash ++ * V0.09 revert to non RCU for now ++ * V0.10 and back to working RCU hash ++ * V0.11 and back to locking again ++ * V0.12 referenced context store ++ * V0.13 separate per cpu data ++ * V0.14 changed vcmds to vxi arg ++ * V0.15 added context stat ++ * V0.16 have __create claim() the vxi ++ * V0.17 removed older and legacy stuff ++ * V0.18 added user credentials ++ * V0.19 added warn mask ++ * ++ */ + -+#if 0 -+ printk("do_set_caps(%16llx, %16llx, %16llx, %16llx)\n", -+ bcaps, bmask, ccaps, cmask); -+#endif -+ vxi->vx_bcaps = cap_t_from_caps( -+ vs_mask_flags(bcold, bcaps, bmask)); -+ vxi->vx_ccaps = vs_mask_flags(vxi->vx_ccaps, ccaps, cmask); ++#include ++#include ++#include ++#include ++#include + -+ return 0; -+} ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + -+int vc_set_ccaps(struct vx_info *vxi, void __user *data) -+{ -+ struct vcmd_ctx_caps_v1 vc_data; ++#include ++#include ++#include ++#include + -+ if (copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; ++#include "cvirt_init.h" ++#include "cacct_init.h" ++#include "limit_init.h" ++#include "sched_init.h" + -+ return do_set_caps(vxi, 0, 0, vc_data.ccaps, vc_data.cmask); -+} + -+int vc_get_bcaps(struct vx_info *vxi, void __user *data) -+{ -+ struct vcmd_bcaps vc_data; -+ int ret; ++atomic_t vx_global_ctotal = ATOMIC_INIT(0); ++atomic_t vx_global_cactive = ATOMIC_INIT(0); + -+ ret = do_get_caps(vxi, &vc_data.bcaps, NULL); -+ if (ret) -+ return ret; -+ vc_data.bmask = ~0ULL; + -+ if (copy_to_user(data, &vc_data, sizeof(vc_data))) -+ return -EFAULT; -+ return 0; -+} ++/* now inactive context structures */ + -+int vc_set_bcaps(struct vx_info *vxi, void __user *data) -+{ -+ struct vcmd_bcaps vc_data; ++static struct hlist_head vx_info_inactive = HLIST_HEAD_INIT; + -+ if (copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; ++static DEFINE_SPINLOCK(vx_info_inactive_lock); + -+ return do_set_caps(vxi, vc_data.bcaps, vc_data.bmask, 0, 0); -+} + ++/* __alloc_vx_info() + -+int vc_get_umask(struct vx_info *vxi, void __user *data) ++ * allocate an initialized vx_info struct ++ * doesn't make it visible (hash) */ ++ ++static struct vx_info *__alloc_vx_info(vxid_t xid) +{ -+ struct vcmd_umask vc_data; ++ struct vx_info *new = NULL; ++ int cpu, index; + -+ vc_data.umask = vxi->vx_umask; -+ vc_data.mask = ~0ULL; ++ vxdprintk(VXD_CBIT(xid, 0), "alloc_vx_info(%d)*", xid); + -+ if (copy_to_user(data, &vc_data, sizeof(vc_data))) -+ return -EFAULT; -+ return 0; -+} ++ /* would this benefit from a slab cache? */ ++ new = kmalloc(sizeof(struct vx_info), GFP_KERNEL); ++ if (!new) ++ return 0; + -+int vc_set_umask(struct vx_info *vxi, void __user *data) -+{ -+ struct vcmd_umask vc_data; ++ memset(new, 0, sizeof(struct vx_info)); ++#ifdef CONFIG_SMP ++ new->ptr_pc = alloc_percpu(struct _vx_info_pc); ++ if (!new->ptr_pc) ++ goto error; ++#endif ++ new->vx_id = xid; ++ INIT_HLIST_NODE(&new->vx_hlist); ++ atomic_set(&new->vx_usecnt, 0); ++ atomic_set(&new->vx_tasks, 0); ++ new->vx_parent = NULL; ++ new->vx_state = 0; ++ init_waitqueue_head(&new->vx_wait); + -+ if (copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; ++ /* prepare reaper */ ++ get_task_struct(init_pid_ns.child_reaper); ++ new->vx_reaper = init_pid_ns.child_reaper; ++ new->vx_badness_bias = 0; + -+ vxi->vx_umask = vs_mask_flags(vxi->vx_umask, -+ vc_data.umask, vc_data.mask); -+ return 0; -+} ++ /* rest of init goes here */ ++ vx_info_init_limit(&new->limit); ++ vx_info_init_sched(&new->sched); ++ vx_info_init_cvirt(&new->cvirt); ++ vx_info_init_cacct(&new->cacct); + ++ /* per cpu data structures */ ++ for_each_possible_cpu(cpu) { ++ vx_info_init_sched_pc( ++ &vx_per_cpu(new, sched_pc, cpu), cpu); ++ vx_info_init_cvirt_pc( ++ &vx_per_cpu(new, cvirt_pc, cpu), cpu); ++ } + -+int vc_get_wmask(struct vx_info *vxi, void __user *data) -+{ -+ struct vcmd_wmask vc_data; ++ new->vx_flags = VXF_INIT_SET; ++ new->vx_bcaps = CAP_FULL_SET; // maybe ~CAP_SETPCAP ++ new->vx_ccaps = 0; ++ new->vx_umask = 0; ++ new->vx_wmask = 0; + -+ vc_data.wmask = vxi->vx_wmask; -+ vc_data.mask = ~0ULL; ++ new->reboot_cmd = 0; ++ new->exit_code = 0; + -+ if (copy_to_user(data, &vc_data, sizeof(vc_data))) -+ return -EFAULT; -+ return 0; -+} ++ // preconfig spaces ++ for (index = 0; index < VX_SPACES; index++) { ++ struct _vx_space *space = &new->space[index]; + -+int vc_set_wmask(struct vx_info *vxi, void __user *data) -+{ -+ struct vcmd_wmask vc_data; ++ // filesystem ++ spin_lock(&init_fs.lock); ++ init_fs.users++; ++ spin_unlock(&init_fs.lock); ++ space->vx_fs = &init_fs; + -+ if (copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; ++ /* FIXME: do we want defaults? */ ++ // space->vx_real_cred = 0; ++ // space->vx_cred = 0; ++ } + -+ vxi->vx_wmask = vs_mask_flags(vxi->vx_wmask, -+ vc_data.wmask, vc_data.mask); ++ ++ vxdprintk(VXD_CBIT(xid, 0), ++ "alloc_vx_info(%d) = %p", xid, new); ++ vxh_alloc_vx_info(new); ++ atomic_inc(&vx_global_ctotal); ++ return new; ++#ifdef CONFIG_SMP ++error: ++ kfree(new); + return 0; ++#endif +} + ++/* __dealloc_vx_info() ++ ++ * final disposal of vx_info */ + -+int vc_get_badness(struct vx_info *vxi, void __user *data) ++static void __dealloc_vx_info(struct vx_info *vxi) +{ -+ struct vcmd_badness_v0 vc_data; ++#ifdef CONFIG_VSERVER_WARN ++ struct vx_info_save vxis; ++ int cpu; ++#endif ++ vxdprintk(VXD_CBIT(xid, 0), ++ "dealloc_vx_info(%p)", vxi); ++ vxh_dealloc_vx_info(vxi); + -+ vc_data.bias = vxi->vx_badness_bias; ++#ifdef CONFIG_VSERVER_WARN ++ enter_vx_info(vxi, &vxis); ++ vx_info_exit_limit(&vxi->limit); ++ vx_info_exit_sched(&vxi->sched); ++ vx_info_exit_cvirt(&vxi->cvirt); ++ vx_info_exit_cacct(&vxi->cacct); + -+ if (copy_to_user(data, &vc_data, sizeof(vc_data))) -+ return -EFAULT; -+ return 0; ++ for_each_possible_cpu(cpu) { ++ vx_info_exit_sched_pc( ++ &vx_per_cpu(vxi, sched_pc, cpu), cpu); ++ vx_info_exit_cvirt_pc( ++ &vx_per_cpu(vxi, cvirt_pc, cpu), cpu); ++ } ++ leave_vx_info(&vxis); ++#endif ++ ++ vxi->vx_id = -1; ++ vxi->vx_state |= VXS_RELEASED; ++ ++#ifdef CONFIG_SMP ++ free_percpu(vxi->ptr_pc); ++#endif ++ kfree(vxi); ++ atomic_dec(&vx_global_ctotal); +} + -+int vc_set_badness(struct vx_info *vxi, void __user *data) ++static void __shutdown_vx_info(struct vx_info *vxi) +{ -+ struct vcmd_badness_v0 vc_data; ++ struct nsproxy *nsproxy; ++ struct fs_struct *fs; ++ struct cred *cred; ++ int index, kill; + -+ if (copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; ++ might_sleep(); + -+ vxi->vx_badness_bias = vc_data.bias; -+ return 0; ++ vxi->vx_state |= VXS_SHUTDOWN; ++ vs_state_change(vxi, VSC_SHUTDOWN); ++ ++ for (index = 0; index < VX_SPACES; index++) { ++ struct _vx_space *space = &vxi->space[index]; ++ ++ nsproxy = xchg(&space->vx_nsproxy, NULL); ++ if (nsproxy) ++ put_nsproxy(nsproxy); ++ ++ fs = xchg(&space->vx_fs, NULL); ++ spin_lock(&fs->lock); ++ kill = !--fs->users; ++ spin_unlock(&fs->lock); ++ if (kill) ++ free_fs_struct(fs); ++ ++ cred = (struct cred *)xchg(&space->vx_cred, NULL); ++ if (cred) ++ abort_creds(cred); ++ } +} + -+#include ++/* exported stuff */ + -+EXPORT_SYMBOL_GPL(free_vx_info); ++void free_vx_info(struct vx_info *vxi) ++{ ++ unsigned long flags; ++ unsigned index; + -diff -NurpP --minimal linux-3.7/kernel/vserver/cvirt.c linux-3.7-vs2.3.5.1/kernel/vserver/cvirt.c ---- linux-3.7/kernel/vserver/cvirt.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/cvirt.c 2012-12-11 15:56:33.000000000 +0000 -@@ -0,0 +1,313 @@ -+/* -+ * linux/kernel/vserver/cvirt.c -+ * -+ * Virtual Server: Context Virtualization -+ * -+ * Copyright (C) 2004-2007 Herbert Pötzl -+ * -+ * V0.01 broken out from limit.c -+ * V0.02 added utsname stuff -+ * V0.03 changed vcmds to vxi arg -+ * -+ */ ++ /* check for reference counts first */ ++ BUG_ON(atomic_read(&vxi->vx_usecnt)); ++ BUG_ON(atomic_read(&vxi->vx_tasks)); + -+#include -+#include -+#include -+#include -+#include ++ /* context must not be hashed */ ++ BUG_ON(vx_info_state(vxi, VXS_HASHED)); + -+#include ++ /* context shutdown is mandatory */ ++ BUG_ON(!vx_info_state(vxi, VXS_SHUTDOWN)); + ++ /* spaces check */ ++ for (index = 0; index < VX_SPACES; index++) { ++ struct _vx_space *space = &vxi->space[index]; + -+void vx_vsi_boottime(struct timespec *boottime) -+{ -+ struct vx_info *vxi = current_vx_info(); ++ BUG_ON(space->vx_nsproxy); ++ BUG_ON(space->vx_fs); ++ // BUG_ON(space->vx_real_cred); ++ // BUG_ON(space->vx_cred); ++ } + -+ set_normalized_timespec(boottime, -+ boottime->tv_sec + vxi->cvirt.bias_uptime.tv_sec, -+ boottime->tv_nsec + vxi->cvirt.bias_uptime.tv_nsec); -+ return; ++ spin_lock_irqsave(&vx_info_inactive_lock, flags); ++ hlist_del(&vxi->vx_hlist); ++ spin_unlock_irqrestore(&vx_info_inactive_lock, flags); ++ ++ __dealloc_vx_info(vxi); +} + -+void vx_vsi_uptime(struct timespec *uptime, struct timespec *idle) -+{ -+ struct vx_info *vxi = current_vx_info(); + -+ set_normalized_timespec(uptime, -+ uptime->tv_sec - vxi->cvirt.bias_uptime.tv_sec, -+ uptime->tv_nsec - vxi->cvirt.bias_uptime.tv_nsec); -+ if (!idle) -+ return; -+ set_normalized_timespec(idle, -+ idle->tv_sec - vxi->cvirt.bias_idle.tv_sec, -+ idle->tv_nsec - vxi->cvirt.bias_idle.tv_nsec); -+ return; -+} ++/* hash table for vx_info hash */ + -+uint64_t vx_idle_jiffies(void) ++#define VX_HASH_SIZE 13 ++ ++static struct hlist_head vx_info_hash[VX_HASH_SIZE] = ++ { [0 ... VX_HASH_SIZE-1] = HLIST_HEAD_INIT }; ++ ++static DEFINE_SPINLOCK(vx_info_hash_lock); ++ ++ ++static inline unsigned int __hashval(vxid_t xid) +{ -+ return init_task.utime + init_task.stime; ++ return (xid % VX_HASH_SIZE); +} + + + -+static inline uint32_t __update_loadavg(uint32_t load, -+ int wsize, int delta, int n) ++/* __hash_vx_info() ++ ++ * add the vxi to the global hash table ++ * requires the hash_lock to be held */ ++ ++static inline void __hash_vx_info(struct vx_info *vxi) +{ -+ unsigned long long calc, prev; ++ struct hlist_head *head; + -+ /* just set it to n */ -+ if (unlikely(delta >= wsize)) -+ return (n << FSHIFT); ++ vxd_assert_lock(&vx_info_hash_lock); ++ vxdprintk(VXD_CBIT(xid, 4), ++ "__hash_vx_info: %p[#%d]", vxi, vxi->vx_id); ++ vxh_hash_vx_info(vxi); + -+ calc = delta * n; -+ calc <<= FSHIFT; -+ prev = (wsize - delta); -+ prev *= load; -+ calc += prev; -+ do_div(calc, wsize); -+ return calc; ++ /* context must not be hashed */ ++ BUG_ON(vx_info_state(vxi, VXS_HASHED)); ++ ++ vxi->vx_state |= VXS_HASHED; ++ head = &vx_info_hash[__hashval(vxi->vx_id)]; ++ hlist_add_head(&vxi->vx_hlist, head); ++ atomic_inc(&vx_global_cactive); +} + ++/* __unhash_vx_info() + -+void vx_update_load(struct vx_info *vxi) ++ * remove the vxi from the global hash table ++ * requires the hash_lock to be held */ ++ ++static inline void __unhash_vx_info(struct vx_info *vxi) +{ -+ uint32_t now, last, delta; -+ unsigned int nr_running, nr_uninterruptible; -+ unsigned int total; + unsigned long flags; + -+ spin_lock_irqsave(&vxi->cvirt.load_lock, flags); ++ vxd_assert_lock(&vx_info_hash_lock); ++ vxdprintk(VXD_CBIT(xid, 4), ++ "__unhash_vx_info: %p[#%d.%d.%d]", vxi, vxi->vx_id, ++ atomic_read(&vxi->vx_usecnt), atomic_read(&vxi->vx_tasks)); ++ vxh_unhash_vx_info(vxi); + -+ now = jiffies; -+ last = vxi->cvirt.load_last; -+ delta = now - last; ++ /* context must be hashed */ ++ BUG_ON(!vx_info_state(vxi, VXS_HASHED)); ++ /* but without tasks */ ++ BUG_ON(atomic_read(&vxi->vx_tasks)); + -+ if (delta < 5*HZ) -+ goto out; ++ vxi->vx_state &= ~VXS_HASHED; ++ hlist_del_init(&vxi->vx_hlist); ++ spin_lock_irqsave(&vx_info_inactive_lock, flags); ++ hlist_add_head(&vxi->vx_hlist, &vx_info_inactive); ++ spin_unlock_irqrestore(&vx_info_inactive_lock, flags); ++ atomic_dec(&vx_global_cactive); ++} + -+ nr_running = atomic_read(&vxi->cvirt.nr_running); -+ nr_uninterruptible = atomic_read(&vxi->cvirt.nr_uninterruptible); -+ total = nr_running + nr_uninterruptible; + -+ vxi->cvirt.load[0] = __update_loadavg(vxi->cvirt.load[0], -+ 60*HZ, delta, total); -+ vxi->cvirt.load[1] = __update_loadavg(vxi->cvirt.load[1], -+ 5*60*HZ, delta, total); -+ vxi->cvirt.load[2] = __update_loadavg(vxi->cvirt.load[2], -+ 15*60*HZ, delta, total); -+ -+ vxi->cvirt.load_last = now; -+out: -+ atomic_inc(&vxi->cvirt.load_updates); -+ spin_unlock_irqrestore(&vxi->cvirt.load_lock, flags); -+} ++/* __lookup_vx_info() + ++ * requires the hash_lock to be held ++ * doesn't increment the vx_refcnt */ + -+/* -+ * Commands to do_syslog: -+ * -+ * 0 -- Close the log. Currently a NOP. -+ * 1 -- Open the log. Currently a NOP. -+ * 2 -- Read from the log. -+ * 3 -- Read all messages remaining in the ring buffer. -+ * 4 -- Read and clear all messages remaining in the ring buffer -+ * 5 -- Clear ring buffer. -+ * 6 -- Disable printk's to console -+ * 7 -- Enable printk's to console -+ * 8 -- Set level of messages printed to console -+ * 9 -- Return number of unread characters in the log buffer -+ * 10 -- Return size of the log buffer -+ */ -+int vx_do_syslog(int type, char __user *buf, int len) ++static inline struct vx_info *__lookup_vx_info(vxid_t xid) +{ -+ int error = 0; -+ int do_clear = 0; -+ struct vx_info *vxi = current_vx_info(); -+ struct _vx_syslog *log; -+ -+ if (!vxi) -+ return -EINVAL; -+ log = &vxi->cvirt.syslog; -+ -+ switch (type) { -+ case 0: /* Close log */ -+ case 1: /* Open log */ -+ break; -+ case 2: /* Read from log */ -+ error = wait_event_interruptible(log->log_wait, -+ (log->log_start - log->log_end)); -+ if (error) -+ break; -+ spin_lock_irq(&log->logbuf_lock); -+ spin_unlock_irq(&log->logbuf_lock); -+ break; -+ case 4: /* Read/clear last kernel messages */ -+ do_clear = 1; -+ /* fall through */ -+ case 3: /* Read last kernel messages */ -+ return 0; -+ -+ case 5: /* Clear ring buffer */ -+ return 0; ++ struct hlist_head *head = &vx_info_hash[__hashval(xid)]; ++ struct hlist_node *pos; ++ struct vx_info *vxi; + -+ case 6: /* Disable logging to console */ -+ case 7: /* Enable logging to console */ -+ case 8: /* Set level of messages printed to console */ -+ break; ++ vxd_assert_lock(&vx_info_hash_lock); ++ hlist_for_each(pos, head) { ++ vxi = hlist_entry(pos, struct vx_info, vx_hlist); + -+ case 9: /* Number of chars in the log buffer */ -+ return 0; -+ case 10: /* Size of the log buffer */ -+ return 0; -+ default: -+ error = -EINVAL; -+ break; ++ if (vxi->vx_id == xid) ++ goto found; + } -+ return error; ++ vxi = NULL; ++found: ++ vxdprintk(VXD_CBIT(xid, 0), ++ "__lookup_vx_info(#%u): %p[#%u]", ++ xid, vxi, vxi ? vxi->vx_id : 0); ++ vxh_lookup_vx_info(vxi, xid); ++ return vxi; +} + + -+/* virtual host info names */ ++/* __create_vx_info() + -+static char *vx_vhi_name(struct vx_info *vxi, int id) ++ * create the requested context ++ * get(), claim() and hash it */ ++ ++static struct vx_info *__create_vx_info(int id) +{ -+ struct nsproxy *nsproxy; -+ struct uts_namespace *uts; ++ struct vx_info *new, *vxi = NULL; + -+ if (id == VHIN_CONTEXT) -+ return vxi->vx_name; ++ vxdprintk(VXD_CBIT(xid, 1), "create_vx_info(%d)*", id); + -+ nsproxy = vxi->space[0].vx_nsproxy; -+ if (!nsproxy) -+ return NULL; ++ if (!(new = __alloc_vx_info(id))) ++ return ERR_PTR(-ENOMEM); + -+ uts = nsproxy->uts_ns; -+ if (!uts) -+ return NULL; ++ /* required to make dynamic xids unique */ ++ spin_lock(&vx_info_hash_lock); + -+ switch (id) { -+ case VHIN_SYSNAME: -+ return uts->name.sysname; -+ case VHIN_NODENAME: -+ return uts->name.nodename; -+ case VHIN_RELEASE: -+ return uts->name.release; -+ case VHIN_VERSION: -+ return uts->name.version; -+ case VHIN_MACHINE: -+ return uts->name.machine; -+ case VHIN_DOMAINNAME: -+ return uts->name.domainname; -+ default: -+ return NULL; ++ /* static context requested */ ++ if ((vxi = __lookup_vx_info(id))) { ++ vxdprintk(VXD_CBIT(xid, 0), ++ "create_vx_info(%d) = %p (already there)", id, vxi); ++ if (vx_info_flags(vxi, VXF_STATE_SETUP, 0)) ++ vxi = ERR_PTR(-EBUSY); ++ else ++ vxi = ERR_PTR(-EEXIST); ++ goto out_unlock; + } -+ return NULL; -+} -+ -+int vc_set_vhi_name(struct vx_info *vxi, void __user *data) -+{ -+ struct vcmd_vhi_name_v0 vc_data; -+ char *name; -+ -+ if (copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; -+ -+ name = vx_vhi_name(vxi, vc_data.field); -+ if (!name) -+ return -EINVAL; ++ /* new context */ ++ vxdprintk(VXD_CBIT(xid, 0), ++ "create_vx_info(%d) = %p (new)", id, new); ++ claim_vx_info(new, NULL); ++ __hash_vx_info(get_vx_info(new)); ++ vxi = new, new = NULL; + -+ memcpy(name, vc_data.name, 65); -+ return 0; ++out_unlock: ++ spin_unlock(&vx_info_hash_lock); ++ vxh_create_vx_info(IS_ERR(vxi) ? NULL : vxi, id); ++ if (new) ++ __dealloc_vx_info(new); ++ return vxi; +} + -+int vc_get_vhi_name(struct vx_info *vxi, void __user *data) -+{ -+ struct vcmd_vhi_name_v0 vc_data; -+ char *name; -+ -+ if (copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; -+ -+ name = vx_vhi_name(vxi, vc_data.field); -+ if (!name) -+ return -EINVAL; + -+ memcpy(vc_data.name, name, 65); -+ if (copy_to_user(data, &vc_data, sizeof(vc_data))) -+ return -EFAULT; -+ return 0; -+} ++/* exported stuff */ + + -+int vc_virt_stat(struct vx_info *vxi, void __user *data) ++void unhash_vx_info(struct vx_info *vxi) +{ -+ struct vcmd_virt_stat_v0 vc_data; -+ struct _vx_cvirt *cvirt = &vxi->cvirt; -+ struct timespec uptime; -+ -+ do_posix_clock_monotonic_gettime(&uptime); -+ set_normalized_timespec(&uptime, -+ uptime.tv_sec - cvirt->bias_uptime.tv_sec, -+ uptime.tv_nsec - cvirt->bias_uptime.tv_nsec); -+ -+ vc_data.offset = timespec_to_ns(&cvirt->bias_ts); -+ vc_data.uptime = timespec_to_ns(&uptime); -+ vc_data.nr_threads = atomic_read(&cvirt->nr_threads); -+ vc_data.nr_running = atomic_read(&cvirt->nr_running); -+ vc_data.nr_uninterruptible = atomic_read(&cvirt->nr_uninterruptible); -+ vc_data.nr_onhold = atomic_read(&cvirt->nr_onhold); -+ vc_data.nr_forks = atomic_read(&cvirt->total_forks); -+ vc_data.load[0] = cvirt->load[0]; -+ vc_data.load[1] = cvirt->load[1]; -+ vc_data.load[2] = cvirt->load[2]; -+ -+ if (copy_to_user(data, &vc_data, sizeof(vc_data))) -+ return -EFAULT; -+ return 0; ++ spin_lock(&vx_info_hash_lock); ++ __unhash_vx_info(vxi); ++ spin_unlock(&vx_info_hash_lock); ++ __shutdown_vx_info(vxi); ++ __wakeup_vx_info(vxi); +} + + -+#ifdef CONFIG_VSERVER_VTIME ++/* lookup_vx_info() + -+/* virtualized time base */ ++ * search for a vx_info and get() it ++ * negative id means current */ + -+void vx_adjust_timespec(struct timespec *ts) ++struct vx_info *lookup_vx_info(int id) +{ -+ struct vx_info *vxi; -+ -+ if (!vx_flags(VXF_VIRT_TIME, 0)) -+ return; -+ -+ vxi = current_vx_info(); -+ ts->tv_sec += vxi->cvirt.bias_ts.tv_sec; -+ ts->tv_nsec += vxi->cvirt.bias_ts.tv_nsec; ++ struct vx_info *vxi = NULL; + -+ if (ts->tv_nsec >= NSEC_PER_SEC) { -+ ts->tv_sec++; -+ ts->tv_nsec -= NSEC_PER_SEC; -+ } else if (ts->tv_nsec < 0) { -+ ts->tv_sec--; -+ ts->tv_nsec += NSEC_PER_SEC; ++ if (id < 0) { ++ vxi = get_vx_info(current_vx_info()); ++ } else if (id > 1) { ++ spin_lock(&vx_info_hash_lock); ++ vxi = get_vx_info(__lookup_vx_info(id)); ++ spin_unlock(&vx_info_hash_lock); + } ++ return vxi; +} + -+int vx_settimeofday(const struct timespec *ts) -+{ -+ struct timespec ats, delta; -+ struct vx_info *vxi; ++/* xid_is_hashed() + -+ if (!vx_flags(VXF_VIRT_TIME, 0)) -+ return do_settimeofday(ts); ++ * verify that xid is still hashed */ + -+ getnstimeofday(&ats); -+ delta = timespec_sub(*ts, ats); ++int xid_is_hashed(vxid_t xid) ++{ ++ int hashed; + -+ vxi = current_vx_info(); -+ vxi->cvirt.bias_ts = timespec_add(vxi->cvirt.bias_ts, delta); -+ return 0; ++ spin_lock(&vx_info_hash_lock); ++ hashed = (__lookup_vx_info(xid) != NULL); ++ spin_unlock(&vx_info_hash_lock); ++ return hashed; +} + -+#endif -+ -diff -NurpP --minimal linux-3.7/kernel/vserver/cvirt_init.h linux-3.7-vs2.3.5.1/kernel/vserver/cvirt_init.h ---- linux-3.7/kernel/vserver/cvirt_init.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/cvirt_init.h 2012-12-11 15:56:33.000000000 +0000 -@@ -0,0 +1,70 @@ ++#ifdef CONFIG_PROC_FS + ++/* get_xid_list() + -+extern uint64_t vx_idle_jiffies(void); ++ * get a subset of hashed xids for proc ++ * assumes size is at least one */ + -+static inline void vx_info_init_cvirt(struct _vx_cvirt *cvirt) ++int get_xid_list(int index, unsigned int *xids, int size) +{ -+ uint64_t idle_jiffies = vx_idle_jiffies(); -+ uint64_t nsuptime; ++ int hindex, nr_xids = 0; + -+ do_posix_clock_monotonic_gettime(&cvirt->bias_uptime); -+ nsuptime = (unsigned long long)cvirt->bias_uptime.tv_sec -+ * NSEC_PER_SEC + cvirt->bias_uptime.tv_nsec; -+ cvirt->bias_clock = nsec_to_clock_t(nsuptime); -+ cvirt->bias_ts.tv_sec = 0; -+ cvirt->bias_ts.tv_nsec = 0; ++ /* only show current and children */ ++ if (!vx_check(0, VS_ADMIN | VS_WATCH)) { ++ if (index > 0) ++ return 0; ++ xids[nr_xids] = vx_current_xid(); ++ return 1; ++ } + -+ jiffies_to_timespec(idle_jiffies, &cvirt->bias_idle); -+ atomic_set(&cvirt->nr_threads, 0); -+ atomic_set(&cvirt->nr_running, 0); -+ atomic_set(&cvirt->nr_uninterruptible, 0); -+ atomic_set(&cvirt->nr_onhold, 0); ++ for (hindex = 0; hindex < VX_HASH_SIZE; hindex++) { ++ struct hlist_head *head = &vx_info_hash[hindex]; ++ struct hlist_node *pos; + -+ spin_lock_init(&cvirt->load_lock); -+ cvirt->load_last = jiffies; -+ atomic_set(&cvirt->load_updates, 0); -+ cvirt->load[0] = 0; -+ cvirt->load[1] = 0; -+ cvirt->load[2] = 0; -+ atomic_set(&cvirt->total_forks, 0); ++ spin_lock(&vx_info_hash_lock); ++ hlist_for_each(pos, head) { ++ struct vx_info *vxi; + -+ spin_lock_init(&cvirt->syslog.logbuf_lock); -+ init_waitqueue_head(&cvirt->syslog.log_wait); -+ cvirt->syslog.log_start = 0; -+ cvirt->syslog.log_end = 0; -+ cvirt->syslog.con_start = 0; -+ cvirt->syslog.logged_chars = 0; ++ if (--index > 0) ++ continue; ++ ++ vxi = hlist_entry(pos, struct vx_info, vx_hlist); ++ xids[nr_xids] = vxi->vx_id; ++ if (++nr_xids >= size) { ++ spin_unlock(&vx_info_hash_lock); ++ goto out; ++ } ++ } ++ /* keep the lock time short */ ++ spin_unlock(&vx_info_hash_lock); ++ } ++out: ++ return nr_xids; +} ++#endif + -+static inline -+void vx_info_init_cvirt_pc(struct _vx_cvirt_pc *cvirt_pc, int cpu) ++#ifdef CONFIG_VSERVER_DEBUG ++ ++void dump_vx_info_inactive(int level) +{ -+ // cvirt_pc->cpustat = { 0 }; ++ struct hlist_node *entry, *next; ++ ++ hlist_for_each_safe(entry, next, &vx_info_inactive) { ++ struct vx_info *vxi = ++ list_entry(entry, struct vx_info, vx_hlist); ++ ++ dump_vx_info(vxi, level); ++ } +} + -+static inline void vx_info_exit_cvirt(struct _vx_cvirt *cvirt) -+{ -+#ifdef CONFIG_VSERVER_WARN -+ int value; +#endif -+ vxwprintk_xid((value = atomic_read(&cvirt->nr_threads)), -+ "!!! cvirt: %p[nr_threads] = %d on exit.", -+ cvirt, value); -+ vxwprintk_xid((value = atomic_read(&cvirt->nr_running)), -+ "!!! cvirt: %p[nr_running] = %d on exit.", -+ cvirt, value); -+ vxwprintk_xid((value = atomic_read(&cvirt->nr_uninterruptible)), -+ "!!! cvirt: %p[nr_uninterruptible] = %d on exit.", -+ cvirt, value); -+ vxwprintk_xid((value = atomic_read(&cvirt->nr_onhold)), -+ "!!! cvirt: %p[nr_onhold] = %d on exit.", -+ cvirt, value); -+ return; -+} + -+static inline -+void vx_info_exit_cvirt_pc(struct _vx_cvirt_pc *cvirt_pc, int cpu) ++#if 0 ++int vx_migrate_user(struct task_struct *p, struct vx_info *vxi) +{ -+ return; -+} ++ struct user_struct *new_user, *old_user; + -diff -NurpP --minimal linux-3.7/kernel/vserver/cvirt_proc.h linux-3.7-vs2.3.5.1/kernel/vserver/cvirt_proc.h ---- linux-3.7/kernel/vserver/cvirt_proc.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/cvirt_proc.h 2012-12-11 15:56:33.000000000 +0000 -@@ -0,0 +1,123 @@ -+#ifndef _VX_CVIRT_PROC_H -+#define _VX_CVIRT_PROC_H ++ if (!p || !vxi) ++ BUG(); + -+#include -+#include -+#include -+#include -+#include ++ if (vx_info_flags(vxi, VXF_INFO_PRIVATE, 0)) ++ return -EACCES; + -+extern int vx_info_mnt_namespace(struct mnt_namespace *, char *); ++ new_user = alloc_uid(vxi->vx_id, p->uid); ++ if (!new_user) ++ return -ENOMEM; + -+static inline -+int vx_info_proc_nsproxy(struct nsproxy *nsproxy, char *buffer) ++ old_user = p->user; ++ if (new_user != old_user) { ++ atomic_inc(&new_user->processes); ++ atomic_dec(&old_user->processes); ++ p->user = new_user; ++ } ++ free_uid(old_user); ++ return 0; ++} ++#endif ++ ++#if 0 ++void vx_mask_cap_bset(struct vx_info *vxi, struct task_struct *p) +{ -+ struct mnt_namespace *ns; -+ struct uts_namespace *uts; -+ struct ipc_namespace *ipc; -+ int length = 0; ++ // p->cap_effective &= vxi->vx_cap_bset; ++ p->cap_effective = ++ cap_intersect(p->cap_effective, vxi->cap_bset); ++ // p->cap_inheritable &= vxi->vx_cap_bset; ++ p->cap_inheritable = ++ cap_intersect(p->cap_inheritable, vxi->cap_bset); ++ // p->cap_permitted &= vxi->vx_cap_bset; ++ p->cap_permitted = ++ cap_intersect(p->cap_permitted, vxi->cap_bset); ++} ++#endif + -+ if (!nsproxy) -+ goto out; + -+ length += sprintf(buffer + length, -+ "NSProxy:\t%p [%p,%p,%p]\n", -+ nsproxy, nsproxy->mnt_ns, -+ nsproxy->uts_ns, nsproxy->ipc_ns); ++#include ++#include + -+ ns = nsproxy->mnt_ns; -+ if (!ns) -+ goto skip_ns; ++static int vx_openfd_task(struct task_struct *tsk) ++{ ++ struct files_struct *files = tsk->files; ++ struct fdtable *fdt; ++ const unsigned long *bptr; ++ int count, total; + -+ length += vx_info_mnt_namespace(ns, buffer + length); ++ /* no rcu_read_lock() because of spin_lock() */ ++ spin_lock(&files->file_lock); ++ fdt = files_fdtable(files); ++ bptr = fdt->open_fds; ++ count = fdt->max_fds / (sizeof(unsigned long) * 8); ++ for (total = 0; count > 0; count--) { ++ if (*bptr) ++ total += hweight_long(*bptr); ++ bptr++; ++ } ++ spin_unlock(&files->file_lock); ++ return total; ++} + -+skip_ns: + -+ uts = nsproxy->uts_ns; -+ if (!uts) -+ goto skip_uts; ++/* for *space compatibility */ + -+ length += sprintf(buffer + length, -+ "SysName:\t%.*s\n" -+ "NodeName:\t%.*s\n" -+ "Release:\t%.*s\n" -+ "Version:\t%.*s\n" -+ "Machine:\t%.*s\n" -+ "DomainName:\t%.*s\n", -+ __NEW_UTS_LEN, uts->name.sysname, -+ __NEW_UTS_LEN, uts->name.nodename, -+ __NEW_UTS_LEN, uts->name.release, -+ __NEW_UTS_LEN, uts->name.version, -+ __NEW_UTS_LEN, uts->name.machine, -+ __NEW_UTS_LEN, uts->name.domainname); -+skip_uts: ++asmlinkage long sys_unshare(unsigned long); + -+ ipc = nsproxy->ipc_ns; -+ if (!ipc) -+ goto skip_ipc; ++/* ++ * migrate task to new context ++ * gets vxi, puts old_vxi on change ++ * optionally unshares namespaces (hack) ++ */ + -+ length += sprintf(buffer + length, -+ "SEMS:\t\t%d %d %d %d %d\n" -+ "MSG:\t\t%d %d %d\n" -+ "SHM:\t\t%lu %lu %d %d\n", -+ ipc->sem_ctls[0], ipc->sem_ctls[1], -+ ipc->sem_ctls[2], ipc->sem_ctls[3], -+ ipc->used_sems, -+ ipc->msg_ctlmax, ipc->msg_ctlmnb, ipc->msg_ctlmni, -+ (unsigned long)ipc->shm_ctlmax, -+ (unsigned long)ipc->shm_ctlall, -+ ipc->shm_ctlmni, ipc->shm_tot); -+skip_ipc: -+out: -+ return length; -+} ++int vx_migrate_task(struct task_struct *p, struct vx_info *vxi, int unshare) ++{ ++ struct vx_info *old_vxi; ++ int ret = 0; + ++ if (!p || !vxi) ++ BUG(); + -+#include ++ vxdprintk(VXD_CBIT(xid, 5), ++ "vx_migrate_task(%p,%p[#%d.%d])", p, vxi, ++ vxi->vx_id, atomic_read(&vxi->vx_usecnt)); + -+#define LOAD_INT(x) ((x) >> FSHIFT) -+#define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1 - 1)) * 100) ++ if (vx_info_flags(vxi, VXF_INFO_PRIVATE, 0) && ++ !vx_info_flags(vxi, VXF_STATE_SETUP, 0)) ++ return -EACCES; + -+static inline -+int vx_info_proc_cvirt(struct _vx_cvirt *cvirt, char *buffer) -+{ -+ int length = 0; -+ int a, b, c; ++ if (vx_info_state(vxi, VXS_SHUTDOWN)) ++ return -EFAULT; + -+ length += sprintf(buffer + length, -+ "BiasUptime:\t%lu.%02lu\n", -+ (unsigned long)cvirt->bias_uptime.tv_sec, -+ (cvirt->bias_uptime.tv_nsec / (NSEC_PER_SEC / 100))); ++ old_vxi = task_get_vx_info(p); ++ if (old_vxi == vxi) ++ goto out; + -+ a = cvirt->load[0] + (FIXED_1 / 200); -+ b = cvirt->load[1] + (FIXED_1 / 200); -+ c = cvirt->load[2] + (FIXED_1 / 200); -+ length += sprintf(buffer + length, -+ "nr_threads:\t%d\n" -+ "nr_running:\t%d\n" -+ "nr_unintr:\t%d\n" -+ "nr_onhold:\t%d\n" -+ "load_updates:\t%d\n" -+ "loadavg:\t%d.%02d %d.%02d %d.%02d\n" -+ "total_forks:\t%d\n", -+ atomic_read(&cvirt->nr_threads), -+ atomic_read(&cvirt->nr_running), -+ atomic_read(&cvirt->nr_uninterruptible), -+ atomic_read(&cvirt->nr_onhold), -+ atomic_read(&cvirt->load_updates), -+ LOAD_INT(a), LOAD_FRAC(a), -+ LOAD_INT(b), LOAD_FRAC(b), -+ LOAD_INT(c), LOAD_FRAC(c), -+ atomic_read(&cvirt->total_forks)); -+ return length; -+} -+ -+static inline -+int vx_info_proc_cvirt_pc(struct _vx_cvirt_pc *cvirt_pc, -+ char *buffer, int cpu) -+{ -+ int length = 0; -+ return length; -+} ++// if (!(ret = vx_migrate_user(p, vxi))) { ++ { ++ int openfd; + -+#endif /* _VX_CVIRT_PROC_H */ -diff -NurpP --minimal linux-3.7/kernel/vserver/debug.c linux-3.7-vs2.3.5.1/kernel/vserver/debug.c ---- linux-3.7/kernel/vserver/debug.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/debug.c 2012-12-11 15:56:33.000000000 +0000 -@@ -0,0 +1,32 @@ -+/* -+ * kernel/vserver/debug.c -+ * -+ * Copyright (C) 2005-2007 Herbert Pötzl -+ * -+ * V0.01 vx_info dump support -+ * -+ */ ++ task_lock(p); ++ openfd = vx_openfd_task(p); + -+#include ++ if (old_vxi) { ++ atomic_dec(&old_vxi->cvirt.nr_threads); ++ atomic_dec(&old_vxi->cvirt.nr_running); ++ __rlim_dec(&old_vxi->limit, RLIMIT_NPROC); ++ /* FIXME: what about the struct files here? */ ++ __rlim_sub(&old_vxi->limit, VLIMIT_OPENFD, openfd); ++ /* account for the executable */ ++ __rlim_dec(&old_vxi->limit, VLIMIT_DENTRY); ++ } ++ atomic_inc(&vxi->cvirt.nr_threads); ++ atomic_inc(&vxi->cvirt.nr_running); ++ __rlim_inc(&vxi->limit, RLIMIT_NPROC); ++ /* FIXME: what about the struct files here? */ ++ __rlim_add(&vxi->limit, VLIMIT_OPENFD, openfd); ++ /* account for the executable */ ++ __rlim_inc(&vxi->limit, VLIMIT_DENTRY); + -+#include ++ if (old_vxi) { ++ release_vx_info(old_vxi, p); ++ clr_vx_info(&p->vx_info); ++ } ++ claim_vx_info(vxi, p); ++ set_vx_info(&p->vx_info, vxi); ++ p->xid = vxi->vx_id; + ++ vxdprintk(VXD_CBIT(xid, 5), ++ "moved task %p into vxi:%p[#%d]", ++ p, vxi, vxi->vx_id); + -+void dump_vx_info(struct vx_info *vxi, int level) -+{ -+ printk("vx_info %p[#%d, %d.%d, %4x]\n", vxi, vxi->vx_id, -+ atomic_read(&vxi->vx_usecnt), -+ atomic_read(&vxi->vx_tasks), -+ vxi->vx_state); -+ if (level > 0) { -+ __dump_vx_limit(&vxi->limit); -+ __dump_vx_sched(&vxi->sched); -+ __dump_vx_cvirt(&vxi->cvirt); -+ __dump_vx_cacct(&vxi->cacct); -+ } -+ printk("---\n"); -+} ++ // vx_mask_cap_bset(vxi, p); ++ task_unlock(p); + ++ /* hack for *spaces to provide compatibility */ ++ if (unshare) { ++ struct nsproxy *old_nsp, *new_nsp; + -+EXPORT_SYMBOL_GPL(dump_vx_info); ++ ret = unshare_nsproxy_namespaces( ++ CLONE_NEWUTS | CLONE_NEWIPC | CLONE_NEWUSER, ++ &new_nsp, NULL, NULL); ++ if (ret) ++ goto out; + -diff -NurpP --minimal linux-3.7/kernel/vserver/device.c linux-3.7-vs2.3.5.1/kernel/vserver/device.c ---- linux-3.7/kernel/vserver/device.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/device.c 2012-12-11 15:56:33.000000000 +0000 -@@ -0,0 +1,443 @@ -+/* -+ * linux/kernel/vserver/device.c -+ * -+ * Linux-VServer: Device Support -+ * -+ * Copyright (C) 2006 Herbert Pötzl -+ * Copyright (C) 2007 Daniel Hokka Zakrisson -+ * -+ * V0.01 device mapping basics -+ * V0.02 added defaults -+ * -+ */ ++ old_nsp = xchg(&p->nsproxy, new_nsp); ++ vx_set_space(vxi, ++ CLONE_NEWUTS | CLONE_NEWIPC | CLONE_NEWUSER, 0); ++ put_nsproxy(old_nsp); ++ } ++ } ++out: ++ put_vx_info(old_vxi); ++ return ret; ++} + -+#include -+#include -+#include -+#include -+#include ++int vx_set_reaper(struct vx_info *vxi, struct task_struct *p) ++{ ++ struct task_struct *old_reaper; ++ struct vx_info *reaper_vxi; + -+#include -+#include -+#include -+#include -+#include -+#include -+#include ++ if (!vxi) ++ return -EINVAL; + ++ vxdprintk(VXD_CBIT(xid, 6), ++ "vx_set_reaper(%p[#%d],%p[#%d,%d])", ++ vxi, vxi->vx_id, p, p->xid, p->pid); + -+#define DMAP_HASH_BITS 4 ++ old_reaper = vxi->vx_reaper; ++ if (old_reaper == p) ++ return 0; + ++ reaper_vxi = task_get_vx_info(p); ++ if (reaper_vxi && reaper_vxi != vxi) { ++ vxwprintk(1, ++ "Unsuitable reaper [" VS_Q("%s") ",%u:#%u] " ++ "for [xid #%u]", ++ p->comm, p->pid, p->xid, vx_current_xid()); ++ goto out; ++ } + -+struct vs_mapping { -+ union { -+ struct hlist_node hlist; -+ struct list_head list; -+ } u; -+#define dm_hlist u.hlist -+#define dm_list u.list -+ xid_t xid; -+ dev_t device; -+ struct vx_dmap_target target; -+}; ++ /* set new child reaper */ ++ get_task_struct(p); ++ vxi->vx_reaper = p; ++ put_task_struct(old_reaper); ++out: ++ put_vx_info(reaper_vxi); ++ return 0; ++} + ++int vx_set_init(struct vx_info *vxi, struct task_struct *p) ++{ ++ if (!vxi) ++ return -EINVAL; + -+static struct hlist_head dmap_main_hash[1 << DMAP_HASH_BITS]; ++ vxdprintk(VXD_CBIT(xid, 6), ++ "vx_set_init(%p[#%d],%p[#%d,%d,%d])", ++ vxi, vxi->vx_id, p, p->xid, p->pid, p->tgid); + -+static DEFINE_SPINLOCK(dmap_main_hash_lock); ++ vxi->vx_flags &= ~VXF_STATE_INIT; ++ // vxi->vx_initpid = p->tgid; ++ vxi->vx_initpid = p->pid; ++ return 0; ++} + -+static struct vx_dmap_target dmap_defaults[2] = { -+ { .flags = DATTR_OPEN }, -+ { .flags = DATTR_OPEN }, -+}; ++void vx_exit_init(struct vx_info *vxi, struct task_struct *p, int code) ++{ ++ vxdprintk(VXD_CBIT(xid, 6), ++ "vx_exit_init(%p[#%d],%p[#%d,%d,%d])", ++ vxi, vxi->vx_id, p, p->xid, p->pid, p->tgid); + ++ vxi->exit_code = code; ++ vxi->vx_initpid = 0; ++} + -+struct kmem_cache *dmap_cachep __read_mostly; + -+int __init dmap_cache_init(void) ++void vx_set_persistent(struct vx_info *vxi) +{ -+ dmap_cachep = kmem_cache_create("dmap_cache", -+ sizeof(struct vs_mapping), 0, -+ SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL); -+ return 0; ++ vxdprintk(VXD_CBIT(xid, 6), ++ "vx_set_persistent(%p[#%d])", vxi, vxi->vx_id); ++ ++ get_vx_info(vxi); ++ claim_vx_info(vxi, NULL); +} + -+__initcall(dmap_cache_init); ++void vx_clear_persistent(struct vx_info *vxi) ++{ ++ vxdprintk(VXD_CBIT(xid, 6), ++ "vx_clear_persistent(%p[#%d])", vxi, vxi->vx_id); + ++ release_vx_info(vxi, NULL); ++ put_vx_info(vxi); ++} + -+static inline unsigned int __hashval(dev_t dev, int bits) ++void vx_update_persistent(struct vx_info *vxi) +{ -+ return hash_long((unsigned long)dev, bits); ++ if (vx_info_flags(vxi, VXF_PERSISTENT, 0)) ++ vx_set_persistent(vxi); ++ else ++ vx_clear_persistent(vxi); +} + + -+/* __hash_mapping() -+ * add the mapping to the hash table -+ */ -+static inline void __hash_mapping(struct vx_info *vxi, struct vs_mapping *vdm) ++/* task must be current or locked */ ++ ++void exit_vx_info(struct task_struct *p, int code) +{ -+ spinlock_t *hash_lock = &dmap_main_hash_lock; -+ struct hlist_head *head, *hash = dmap_main_hash; -+ int device = vdm->device; ++ struct vx_info *vxi = p->vx_info; + -+ spin_lock(hash_lock); -+ vxdprintk(VXD_CBIT(misc, 8), "__hash_mapping: %p[#%d] %08x:%08x", -+ vxi, vxi ? vxi->vx_id : 0, device, vdm->target.target); ++ if (vxi) { ++ atomic_dec(&vxi->cvirt.nr_threads); ++ vx_nproc_dec(p); + -+ head = &hash[__hashval(device, DMAP_HASH_BITS)]; -+ hlist_add_head(&vdm->dm_hlist, head); -+ spin_unlock(hash_lock); ++ vxi->exit_code = code; ++ release_vx_info(vxi, p); ++ } +} + -+ -+static inline int __mode_to_default(umode_t mode) ++void exit_vx_info_early(struct task_struct *p, int code) +{ -+ switch (mode) { -+ case S_IFBLK: -+ return 0; -+ case S_IFCHR: -+ return 1; -+ default: -+ BUG(); ++ struct vx_info *vxi = p->vx_info; ++ ++ if (vxi) { ++ if (vxi->vx_initpid == p->pid) ++ vx_exit_init(vxi, p, code); ++ if (vxi->vx_reaper == p) ++ vx_set_reaper(vxi, init_pid_ns.child_reaper); + } +} + + -+/* __set_default() -+ * set a default -+ */ -+static inline void __set_default(struct vx_info *vxi, umode_t mode, -+ struct vx_dmap_target *vdmt) -+{ -+ spinlock_t *hash_lock = &dmap_main_hash_lock; -+ spin_lock(hash_lock); ++/* vserver syscall commands below here */ + -+ if (vxi) -+ vxi->dmap.targets[__mode_to_default(mode)] = *vdmt; -+ else -+ dmap_defaults[__mode_to_default(mode)] = *vdmt; ++/* taks xid and vx_info functions */ + ++#include + -+ spin_unlock(hash_lock); + -+ vxdprintk(VXD_CBIT(misc, 8), "__set_default: %p[#%u] %08x %04x", -+ vxi, vxi ? vxi->vx_id : 0, vdmt->target, vdmt->flags); ++int vc_task_xid(uint32_t id) ++{ ++ vxid_t xid; ++ ++ if (id) { ++ struct task_struct *tsk; ++ ++ rcu_read_lock(); ++ tsk = find_task_by_real_pid(id); ++ xid = (tsk) ? tsk->xid : -ESRCH; ++ rcu_read_unlock(); ++ } else ++ xid = vx_current_xid(); ++ return xid; +} + + -+/* __remove_default() -+ * remove a default -+ */ -+static inline int __remove_default(struct vx_info *vxi, umode_t mode) ++int vc_vx_info(struct vx_info *vxi, void __user *data) +{ -+ spinlock_t *hash_lock = &dmap_main_hash_lock; -+ spin_lock(hash_lock); ++ struct vcmd_vx_info_v0 vc_data; + -+ if (vxi) -+ vxi->dmap.targets[__mode_to_default(mode)].flags = 0; -+ else /* remove == reset */ -+ dmap_defaults[__mode_to_default(mode)].flags = DATTR_OPEN | mode; ++ vc_data.xid = vxi->vx_id; ++ vc_data.initpid = vxi->vx_initpid; + -+ spin_unlock(hash_lock); ++ if (copy_to_user(data, &vc_data, sizeof(vc_data))) ++ return -EFAULT; + return 0; +} + + -+/* __find_mapping() -+ * find a mapping in the hash table -+ * -+ * caller must hold hash_lock -+ */ -+static inline int __find_mapping(xid_t xid, dev_t device, umode_t mode, -+ struct vs_mapping **local, struct vs_mapping **global) ++int vc_ctx_stat(struct vx_info *vxi, void __user *data) +{ -+ struct hlist_head *hash = dmap_main_hash; -+ struct hlist_head *head = &hash[__hashval(device, DMAP_HASH_BITS)]; -+ struct hlist_node *pos; -+ struct vs_mapping *vdm; -+ -+ *local = NULL; -+ if (global) -+ *global = NULL; -+ -+ hlist_for_each(pos, head) { -+ vdm = hlist_entry(pos, struct vs_mapping, dm_hlist); ++ struct vcmd_ctx_stat_v0 vc_data; + -+ if ((vdm->device == device) && -+ !((vdm->target.flags ^ mode) & S_IFMT)) { -+ if (vdm->xid == xid) { -+ *local = vdm; -+ return 1; -+ } else if (global && vdm->xid == 0) -+ *global = vdm; -+ } -+ } ++ vc_data.usecnt = atomic_read(&vxi->vx_usecnt); ++ vc_data.tasks = atomic_read(&vxi->vx_tasks); + -+ if (global && *global) -+ return 0; -+ else -+ return -ENOENT; ++ if (copy_to_user(data, &vc_data, sizeof(vc_data))) ++ return -EFAULT; ++ return 0; +} + + -+/* __lookup_mapping() -+ * find a mapping and store the result in target and flags -+ */ -+static inline int __lookup_mapping(struct vx_info *vxi, -+ dev_t device, dev_t *target, int *flags, umode_t mode) ++/* context functions */ ++ ++int vc_ctx_create(uint32_t xid, void __user *data) +{ -+ spinlock_t *hash_lock = &dmap_main_hash_lock; -+ struct vs_mapping *vdm, *global; -+ struct vx_dmap_target *vdmt; -+ int ret = 0; -+ xid_t xid = vxi->vx_id; -+ int index; ++ struct vcmd_ctx_create vc_data = { .flagword = VXF_INIT_SET }; ++ struct vx_info *new_vxi; ++ int ret; + -+ spin_lock(hash_lock); -+ if (__find_mapping(xid, device, mode, &vdm, &global) > 0) { -+ ret = 1; -+ vdmt = &vdm->target; -+ goto found; -+ } ++ if (data && copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; + -+ index = __mode_to_default(mode); -+ if (vxi && vxi->dmap.targets[index].flags) { -+ ret = 2; -+ vdmt = &vxi->dmap.targets[index]; -+ } else if (global) { -+ ret = 3; -+ vdmt = &global->target; -+ goto found; -+ } else { -+ ret = 4; -+ vdmt = &dmap_defaults[index]; -+ } ++ if ((xid > MAX_S_CONTEXT) || (xid < 2)) ++ return -EINVAL; + -+found: -+ if (target && (vdmt->flags & DATTR_REMAP)) -+ *target = vdmt->target; -+ else if (target) -+ *target = device; -+ if (flags) -+ *flags = vdmt->flags; ++ new_vxi = __create_vx_info(xid); ++ if (IS_ERR(new_vxi)) ++ return PTR_ERR(new_vxi); + -+ spin_unlock(hash_lock); ++ /* initial flags */ ++ new_vxi->vx_flags = vc_data.flagword; ++ ++ ret = -ENOEXEC; ++ if (vs_state_change(new_vxi, VSC_STARTUP)) ++ goto out; ++ ++ ret = vx_migrate_task(current, new_vxi, (!data)); ++ if (ret) ++ goto out; ++ ++ /* return context id on success */ ++ ret = new_vxi->vx_id; + ++ /* get a reference for persistent contexts */ ++ if ((vc_data.flagword & VXF_PERSISTENT)) ++ vx_set_persistent(new_vxi); ++out: ++ release_vx_info(new_vxi, NULL); ++ put_vx_info(new_vxi); + return ret; +} + + -+/* __remove_mapping() -+ * remove a mapping from the hash table -+ */ -+static inline int __remove_mapping(struct vx_info *vxi, dev_t device, -+ umode_t mode) ++int vc_ctx_migrate(struct vx_info *vxi, void __user *data) +{ -+ spinlock_t *hash_lock = &dmap_main_hash_lock; -+ struct vs_mapping *vdm = NULL; -+ int ret = 0; -+ -+ spin_lock(hash_lock); ++ struct vcmd_ctx_migrate vc_data = { .flagword = 0 }; ++ int ret; + -+ ret = __find_mapping((vxi ? vxi->vx_id : 0), device, mode, &vdm, -+ NULL); -+ vxdprintk(VXD_CBIT(misc, 8), "__remove_mapping: %p[#%d] %08x %04x", -+ vxi, vxi ? vxi->vx_id : 0, device, mode); -+ if (ret < 0) -+ goto out; -+ hlist_del(&vdm->dm_hlist); ++ if (data && copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; + -+out: -+ spin_unlock(hash_lock); -+ if (vdm) -+ kmem_cache_free(dmap_cachep, vdm); ++ ret = vx_migrate_task(current, vxi, 0); ++ if (ret) ++ return ret; ++ if (vc_data.flagword & VXM_SET_INIT) ++ ret = vx_set_init(vxi, current); ++ if (ret) ++ return ret; ++ if (vc_data.flagword & VXM_SET_REAPER) ++ ret = vx_set_reaper(vxi, current); + return ret; +} + + -+ -+int vs_map_device(struct vx_info *vxi, -+ dev_t device, dev_t *target, umode_t mode) ++int vc_get_cflags(struct vx_info *vxi, void __user *data) +{ -+ int ret, flags = DATTR_MASK; ++ struct vcmd_ctx_flags_v0 vc_data; + -+ if (!vxi) { -+ if (target) -+ *target = device; -+ goto out; -+ } -+ ret = __lookup_mapping(vxi, device, target, &flags, mode); -+ vxdprintk(VXD_CBIT(misc, 8), "vs_map_device: %08x target: %08x flags: %04x mode: %04x mapped=%d", -+ device, target ? *target : 0, flags, mode, ret); -+out: -+ return (flags & DATTR_MASK); -+} ++ vc_data.flagword = vxi->vx_flags; + ++ /* special STATE flag handling */ ++ vc_data.mask = vs_mask_flags(~0ULL, vxi->vx_flags, VXF_ONE_TIME); + ++ if (copy_to_user(data, &vc_data, sizeof(vc_data))) ++ return -EFAULT; ++ return 0; ++} + -+static int do_set_mapping(struct vx_info *vxi, -+ dev_t device, dev_t target, int flags, umode_t mode) ++int vc_set_cflags(struct vx_info *vxi, void __user *data) +{ -+ if (device) { -+ struct vs_mapping *new; ++ struct vcmd_ctx_flags_v0 vc_data; ++ uint64_t mask, trigger; + -+ new = kmem_cache_alloc(dmap_cachep, GFP_KERNEL); -+ if (!new) -+ return -ENOMEM; ++ if (copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; + -+ INIT_HLIST_NODE(&new->dm_hlist); -+ new->device = device; -+ new->target.target = target; -+ new->target.flags = flags | mode; -+ new->xid = (vxi ? vxi->vx_id : 0); ++ /* special STATE flag handling */ ++ mask = vs_mask_mask(vc_data.mask, vxi->vx_flags, VXF_ONE_TIME); ++ trigger = (mask & vxi->vx_flags) ^ (mask & vc_data.flagword); + -+ vxdprintk(VXD_CBIT(misc, 8), "do_set_mapping: %08x target: %08x flags: %04x", device, target, flags); -+ __hash_mapping(vxi, new); -+ } else { -+ struct vx_dmap_target new = { -+ .target = target, -+ .flags = flags | mode, -+ }; -+ __set_default(vxi, mode, &new); ++ if (vxi == current_vx_info()) { ++ /* if (trigger & VXF_STATE_SETUP) ++ vx_mask_cap_bset(vxi, current); */ ++ if (trigger & VXF_STATE_INIT) { ++ int ret; ++ ++ ret = vx_set_init(vxi, current); ++ if (ret) ++ return ret; ++ ret = vx_set_reaper(vxi, current); ++ if (ret) ++ return ret; ++ } + } ++ ++ vxi->vx_flags = vs_mask_flags(vxi->vx_flags, ++ vc_data.flagword, mask); ++ if (trigger & VXF_PERSISTENT) ++ vx_update_persistent(vxi); ++ + return 0; +} + + -+static int do_unset_mapping(struct vx_info *vxi, -+ dev_t device, dev_t target, int flags, umode_t mode) ++static inline uint64_t caps_from_cap_t(kernel_cap_t c) +{ -+ int ret = -EINVAL; ++ uint64_t v = c.cap[0] | ((uint64_t)c.cap[1] << 32); + -+ if (device) { -+ ret = __remove_mapping(vxi, device, mode); -+ if (ret < 0) -+ goto out; -+ } else { -+ ret = __remove_default(vxi, mode); -+ if (ret < 0) -+ goto out; -+ } ++ // printk("caps_from_cap_t(%08x:%08x) = %016llx\n", c.cap[1], c.cap[0], v); ++ return v; ++} + -+out: -+ return ret; ++static inline kernel_cap_t cap_t_from_caps(uint64_t v) ++{ ++ kernel_cap_t c = __cap_empty_set; ++ ++ c.cap[0] = v & 0xFFFFFFFF; ++ c.cap[1] = (v >> 32) & 0xFFFFFFFF; ++ ++ // printk("cap_t_from_caps(%016llx) = %08x:%08x\n", v, c.cap[1], c.cap[0]); ++ return c; +} + + -+static inline int __user_device(const char __user *name, dev_t *dev, -+ umode_t *mode) ++static int do_get_caps(struct vx_info *vxi, uint64_t *bcaps, uint64_t *ccaps) +{ -+ struct nameidata nd; ++ if (bcaps) ++ *bcaps = caps_from_cap_t(vxi->vx_bcaps); ++ if (ccaps) ++ *ccaps = vxi->vx_ccaps; ++ ++ return 0; ++} ++ ++int vc_get_ccaps(struct vx_info *vxi, void __user *data) ++{ ++ struct vcmd_ctx_caps_v1 vc_data; + int ret; + -+ if (!name) { -+ *dev = 0; -+ return 0; -+ } -+ ret = user_lpath(name, &nd.path); ++ ret = do_get_caps(vxi, NULL, &vc_data.ccaps); + if (ret) + return ret; -+ if (nd.path.dentry->d_inode) { -+ *dev = nd.path.dentry->d_inode->i_rdev; -+ *mode = nd.path.dentry->d_inode->i_mode; -+ } -+ path_put(&nd.path); ++ vc_data.cmask = ~0ULL; ++ ++ if (copy_to_user(data, &vc_data, sizeof(vc_data))) ++ return -EFAULT; + return 0; +} + -+static inline int __mapping_mode(dev_t device, dev_t target, -+ umode_t device_mode, umode_t target_mode, umode_t *mode) ++static int do_set_caps(struct vx_info *vxi, ++ uint64_t bcaps, uint64_t bmask, uint64_t ccaps, uint64_t cmask) +{ -+ if (device) -+ *mode = device_mode & S_IFMT; -+ else if (target) -+ *mode = target_mode & S_IFMT; -+ else -+ return -EINVAL; ++ uint64_t bcold = caps_from_cap_t(vxi->vx_bcaps); ++ ++#if 0 ++ printk("do_set_caps(%16llx, %16llx, %16llx, %16llx)\n", ++ bcaps, bmask, ccaps, cmask); ++#endif ++ vxi->vx_bcaps = cap_t_from_caps( ++ vs_mask_flags(bcold, bcaps, bmask)); ++ vxi->vx_ccaps = vs_mask_flags(vxi->vx_ccaps, ccaps, cmask); + -+ /* if both given, device and target mode have to match */ -+ if (device && target && -+ ((device_mode ^ target_mode) & S_IFMT)) -+ return -EINVAL; + return 0; +} + ++int vc_set_ccaps(struct vx_info *vxi, void __user *data) ++{ ++ struct vcmd_ctx_caps_v1 vc_data; + -+static inline int do_mapping(struct vx_info *vxi, const char __user *device_path, -+ const char __user *target_path, int flags, int set) ++ if (copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; ++ ++ return do_set_caps(vxi, 0, 0, vc_data.ccaps, vc_data.cmask); ++} ++ ++int vc_get_bcaps(struct vx_info *vxi, void __user *data) +{ -+ dev_t device = ~0, target = ~0; -+ umode_t device_mode = 0, target_mode = 0, mode; ++ struct vcmd_bcaps vc_data; + int ret; + -+ ret = __user_device(device_path, &device, &device_mode); -+ if (ret) -+ return ret; -+ ret = __user_device(target_path, &target, &target_mode); -+ if (ret) -+ return ret; -+ -+ ret = __mapping_mode(device, target, -+ device_mode, target_mode, &mode); ++ ret = do_get_caps(vxi, &vc_data.bcaps, NULL); + if (ret) + return ret; ++ vc_data.bmask = ~0ULL; + -+ if (set) -+ return do_set_mapping(vxi, device, target, -+ flags, mode); -+ else -+ return do_unset_mapping(vxi, device, target, -+ flags, mode); ++ if (copy_to_user(data, &vc_data, sizeof(vc_data))) ++ return -EFAULT; ++ return 0; +} + -+ -+int vc_set_mapping(struct vx_info *vxi, void __user *data) ++int vc_set_bcaps(struct vx_info *vxi, void __user *data) +{ -+ struct vcmd_set_mapping_v0 vc_data; ++ struct vcmd_bcaps vc_data; + + if (copy_from_user(&vc_data, data, sizeof(vc_data))) + return -EFAULT; + -+ return do_mapping(vxi, vc_data.device, vc_data.target, -+ vc_data.flags, 1); ++ return do_set_caps(vxi, vc_data.bcaps, vc_data.bmask, 0, 0); +} + -+int vc_unset_mapping(struct vx_info *vxi, void __user *data) ++ ++int vc_get_umask(struct vx_info *vxi, void __user *data) +{ -+ struct vcmd_set_mapping_v0 vc_data; ++ struct vcmd_umask vc_data; ++ ++ vc_data.umask = vxi->vx_umask; ++ vc_data.mask = ~0ULL; ++ ++ if (copy_to_user(data, &vc_data, sizeof(vc_data))) ++ return -EFAULT; ++ return 0; ++} ++ ++int vc_set_umask(struct vx_info *vxi, void __user *data) ++{ ++ struct vcmd_umask vc_data; + + if (copy_from_user(&vc_data, data, sizeof(vc_data))) + return -EFAULT; + -+ return do_mapping(vxi, vc_data.device, vc_data.target, -+ vc_data.flags, 0); ++ vxi->vx_umask = vs_mask_flags(vxi->vx_umask, ++ vc_data.umask, vc_data.mask); ++ return 0; +} + + -+#ifdef CONFIG_COMPAT ++int vc_get_wmask(struct vx_info *vxi, void __user *data) ++{ ++ struct vcmd_wmask vc_data; + -+int vc_set_mapping_x32(struct vx_info *vxi, void __user *data) ++ vc_data.wmask = vxi->vx_wmask; ++ vc_data.mask = ~0ULL; ++ ++ if (copy_to_user(data, &vc_data, sizeof(vc_data))) ++ return -EFAULT; ++ return 0; ++} ++ ++int vc_set_wmask(struct vx_info *vxi, void __user *data) +{ -+ struct vcmd_set_mapping_v0_x32 vc_data; ++ struct vcmd_wmask vc_data; + + if (copy_from_user(&vc_data, data, sizeof(vc_data))) + return -EFAULT; + -+ return do_mapping(vxi, compat_ptr(vc_data.device_ptr), -+ compat_ptr(vc_data.target_ptr), vc_data.flags, 1); ++ vxi->vx_wmask = vs_mask_flags(vxi->vx_wmask, ++ vc_data.wmask, vc_data.mask); ++ return 0; +} + -+int vc_unset_mapping_x32(struct vx_info *vxi, void __user *data) ++ ++int vc_get_badness(struct vx_info *vxi, void __user *data) +{ -+ struct vcmd_set_mapping_v0_x32 vc_data; ++ struct vcmd_badness_v0 vc_data; ++ ++ vc_data.bias = vxi->vx_badness_bias; ++ ++ if (copy_to_user(data, &vc_data, sizeof(vc_data))) ++ return -EFAULT; ++ return 0; ++} ++ ++int vc_set_badness(struct vx_info *vxi, void __user *data) ++{ ++ struct vcmd_badness_v0 vc_data; + + if (copy_from_user(&vc_data, data, sizeof(vc_data))) + return -EFAULT; + -+ return do_mapping(vxi, compat_ptr(vc_data.device_ptr), -+ compat_ptr(vc_data.target_ptr), vc_data.flags, 0); ++ vxi->vx_badness_bias = vc_data.bias; ++ return 0; +} + -+#endif /* CONFIG_COMPAT */ ++#include + ++EXPORT_SYMBOL_GPL(free_vx_info); + -diff -NurpP --minimal linux-3.7/kernel/vserver/dlimit.c linux-3.7-vs2.3.5.1/kernel/vserver/dlimit.c ---- linux-3.7/kernel/vserver/dlimit.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/dlimit.c 2012-12-11 15:56:33.000000000 +0000 -@@ -0,0 +1,531 @@ +diff -NurpP --minimal linux-3.18.5/kernel/vserver/cvirt.c linux-3.18.5-vs2.3.7.3/kernel/vserver/cvirt.c +--- linux-3.18.5/kernel/vserver/cvirt.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/vserver/cvirt.c 2015-01-19 10:58:31.000000000 +0000 +@@ -0,0 +1,313 @@ +/* -+ * linux/kernel/vserver/dlimit.c ++ * linux/kernel/vserver/cvirt.c + * -+ * Virtual Server: Context Disk Limits ++ * Virtual Server: Context Virtualization + * -+ * Copyright (C) 2004-2009 Herbert Pötzl ++ * Copyright (C) 2004-2007 Herbert Pötzl + * -+ * V0.01 initial version -+ * V0.02 compat32 splitup -+ * V0.03 extended interface ++ * V0.01 broken out from limit.c ++ * V0.02 added utsname stuff ++ * V0.03 changed vcmds to vxi arg + * + */ + -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+// #include ++#include ++#include ++#include ++#include ++#include + +#include + -+/* __alloc_dl_info() -+ -+ * allocate an initialized dl_info struct -+ * doesn't make it visible (hash) */ + -+static struct dl_info *__alloc_dl_info(struct super_block *sb, tag_t tag) ++void vx_vsi_boottime(struct timespec *boottime) +{ -+ struct dl_info *new = NULL; -+ -+ vxdprintk(VXD_CBIT(dlim, 5), -+ "alloc_dl_info(%p,%d)*", sb, tag); -+ -+ /* would this benefit from a slab cache? */ -+ new = kmalloc(sizeof(struct dl_info), GFP_KERNEL); -+ if (!new) -+ return 0; -+ -+ memset(new, 0, sizeof(struct dl_info)); -+ new->dl_tag = tag; -+ new->dl_sb = sb; -+ // INIT_RCU_HEAD(&new->dl_rcu); -+ INIT_HLIST_NODE(&new->dl_hlist); -+ spin_lock_init(&new->dl_lock); -+ atomic_set(&new->dl_refcnt, 0); -+ atomic_set(&new->dl_usecnt, 0); -+ -+ /* rest of init goes here */ ++ struct vx_info *vxi = current_vx_info(); + -+ vxdprintk(VXD_CBIT(dlim, 4), -+ "alloc_dl_info(%p,%d) = %p", sb, tag, new); -+ return new; ++ set_normalized_timespec(boottime, ++ boottime->tv_sec + vxi->cvirt.bias_uptime.tv_sec, ++ boottime->tv_nsec + vxi->cvirt.bias_uptime.tv_nsec); ++ return; +} + -+/* __dealloc_dl_info() -+ -+ * final disposal of dl_info */ -+ -+static void __dealloc_dl_info(struct dl_info *dli) ++void vx_vsi_uptime(struct timespec *uptime, struct timespec *idle) +{ -+ vxdprintk(VXD_CBIT(dlim, 4), -+ "dealloc_dl_info(%p)", dli); -+ -+ dli->dl_hlist.next = LIST_POISON1; -+ dli->dl_tag = -1; -+ dli->dl_sb = 0; ++ struct vx_info *vxi = current_vx_info(); + -+ BUG_ON(atomic_read(&dli->dl_usecnt)); -+ BUG_ON(atomic_read(&dli->dl_refcnt)); ++ set_normalized_timespec(uptime, ++ uptime->tv_sec - vxi->cvirt.bias_uptime.tv_sec, ++ uptime->tv_nsec - vxi->cvirt.bias_uptime.tv_nsec); ++ if (!idle) ++ return; ++ set_normalized_timespec(idle, ++ idle->tv_sec - vxi->cvirt.bias_idle.tv_sec, ++ idle->tv_nsec - vxi->cvirt.bias_idle.tv_nsec); ++ return; ++} + -+ kfree(dli); ++uint64_t vx_idle_jiffies(void) ++{ ++ return init_task.utime + init_task.stime; +} + + -+/* hash table for dl_info hash */ + -+#define DL_HASH_SIZE 13 ++static inline uint32_t __update_loadavg(uint32_t load, ++ int wsize, int delta, int n) ++{ ++ unsigned long long calc, prev; + -+struct hlist_head dl_info_hash[DL_HASH_SIZE]; ++ /* just set it to n */ ++ if (unlikely(delta >= wsize)) ++ return (n << FSHIFT); + -+static DEFINE_SPINLOCK(dl_info_hash_lock); ++ calc = delta * n; ++ calc <<= FSHIFT; ++ prev = (wsize - delta); ++ prev *= load; ++ calc += prev; ++ do_div(calc, wsize); ++ return calc; ++} + + -+static inline unsigned int __hashval(struct super_block *sb, tag_t tag) ++void vx_update_load(struct vx_info *vxi) +{ -+ return ((tag ^ (unsigned long)sb) % DL_HASH_SIZE); -+} ++ uint32_t now, last, delta; ++ unsigned int nr_running, nr_uninterruptible; ++ unsigned int total; ++ unsigned long flags; + ++ spin_lock_irqsave(&vxi->cvirt.load_lock, flags); + ++ now = jiffies; ++ last = vxi->cvirt.load_last; ++ delta = now - last; + -+/* __hash_dl_info() ++ if (delta < 5*HZ) ++ goto out; + -+ * add the dli to the global hash table -+ * requires the hash_lock to be held */ ++ nr_running = atomic_read(&vxi->cvirt.nr_running); ++ nr_uninterruptible = atomic_read(&vxi->cvirt.nr_uninterruptible); ++ total = nr_running + nr_uninterruptible; + -+static inline void __hash_dl_info(struct dl_info *dli) -+{ -+ struct hlist_head *head; ++ vxi->cvirt.load[0] = __update_loadavg(vxi->cvirt.load[0], ++ 60*HZ, delta, total); ++ vxi->cvirt.load[1] = __update_loadavg(vxi->cvirt.load[1], ++ 5*60*HZ, delta, total); ++ vxi->cvirt.load[2] = __update_loadavg(vxi->cvirt.load[2], ++ 15*60*HZ, delta, total); + -+ vxdprintk(VXD_CBIT(dlim, 6), -+ "__hash_dl_info: %p[#%d]", dli, dli->dl_tag); -+ get_dl_info(dli); -+ head = &dl_info_hash[__hashval(dli->dl_sb, dli->dl_tag)]; -+ hlist_add_head_rcu(&dli->dl_hlist, head); ++ vxi->cvirt.load_last = now; ++out: ++ atomic_inc(&vxi->cvirt.load_updates); ++ spin_unlock_irqrestore(&vxi->cvirt.load_lock, flags); +} + -+/* __unhash_dl_info() -+ -+ * remove the dli from the global hash table -+ * requires the hash_lock to be held */ + -+static inline void __unhash_dl_info(struct dl_info *dli) ++/* ++ * Commands to do_syslog: ++ * ++ * 0 -- Close the log. Currently a NOP. ++ * 1 -- Open the log. Currently a NOP. ++ * 2 -- Read from the log. ++ * 3 -- Read all messages remaining in the ring buffer. ++ * 4 -- Read and clear all messages remaining in the ring buffer ++ * 5 -- Clear ring buffer. ++ * 6 -- Disable printk's to console ++ * 7 -- Enable printk's to console ++ * 8 -- Set level of messages printed to console ++ * 9 -- Return number of unread characters in the log buffer ++ * 10 -- Return size of the log buffer ++ */ ++int vx_do_syslog(int type, char __user *buf, int len) +{ -+ vxdprintk(VXD_CBIT(dlim, 6), -+ "__unhash_dl_info: %p[#%d]", dli, dli->dl_tag); -+ hlist_del_rcu(&dli->dl_hlist); -+ put_dl_info(dli); -+} -+ ++ int error = 0; ++ int do_clear = 0; ++ struct vx_info *vxi = current_vx_info(); ++ struct _vx_syslog *log; + -+/* __lookup_dl_info() ++ if (!vxi) ++ return -EINVAL; ++ log = &vxi->cvirt.syslog; + -+ * requires the rcu_read_lock() -+ * doesn't increment the dl_refcnt */ ++ switch (type) { ++ case 0: /* Close log */ ++ case 1: /* Open log */ ++ break; ++ case 2: /* Read from log */ ++ error = wait_event_interruptible(log->log_wait, ++ (log->log_start - log->log_end)); ++ if (error) ++ break; ++ spin_lock_irq(&log->logbuf_lock); ++ spin_unlock_irq(&log->logbuf_lock); ++ break; ++ case 4: /* Read/clear last kernel messages */ ++ do_clear = 1; ++ /* fall through */ ++ case 3: /* Read last kernel messages */ ++ return 0; + -+static inline struct dl_info *__lookup_dl_info(struct super_block *sb, tag_t tag) -+{ -+ struct hlist_head *head = &dl_info_hash[__hashval(sb, tag)]; -+ struct hlist_node *pos; -+ struct dl_info *dli; ++ case 5: /* Clear ring buffer */ ++ return 0; + -+ hlist_for_each_entry_rcu(dli, pos, head, dl_hlist) { ++ case 6: /* Disable logging to console */ ++ case 7: /* Enable logging to console */ ++ case 8: /* Set level of messages printed to console */ ++ break; + -+ if (dli->dl_tag == tag && dli->dl_sb == sb) { -+ return dli; -+ } ++ case 9: /* Number of chars in the log buffer */ ++ return 0; ++ case 10: /* Size of the log buffer */ ++ return 0; ++ default: ++ error = -EINVAL; ++ break; + } -+ return NULL; ++ return error; +} + + -+struct dl_info *locate_dl_info(struct super_block *sb, tag_t tag) -+{ -+ struct dl_info *dli; -+ -+ rcu_read_lock(); -+ dli = get_dl_info(__lookup_dl_info(sb, tag)); -+ vxdprintk(VXD_CBIT(dlim, 7), -+ "locate_dl_info(%p,#%d) = %p", sb, tag, dli); -+ rcu_read_unlock(); -+ return dli; -+} ++/* virtual host info names */ + -+void rcu_free_dl_info(struct rcu_head *head) ++static char *vx_vhi_name(struct vx_info *vxi, int id) +{ -+ struct dl_info *dli = container_of(head, struct dl_info, dl_rcu); -+ int usecnt, refcnt; ++ struct nsproxy *nsproxy; ++ struct uts_namespace *uts; + -+ BUG_ON(!dli || !head); ++ if (id == VHIN_CONTEXT) ++ return vxi->vx_name; + -+ usecnt = atomic_read(&dli->dl_usecnt); -+ BUG_ON(usecnt < 0); ++ nsproxy = vxi->space[0].vx_nsproxy; ++ if (!nsproxy) ++ return NULL; + -+ refcnt = atomic_read(&dli->dl_refcnt); -+ BUG_ON(refcnt < 0); ++ uts = nsproxy->uts_ns; ++ if (!uts) ++ return NULL; + -+ vxdprintk(VXD_CBIT(dlim, 3), -+ "rcu_free_dl_info(%p)", dli); -+ if (!usecnt) -+ __dealloc_dl_info(dli); -+ else -+ printk("!!! rcu didn't free\n"); ++ switch (id) { ++ case VHIN_SYSNAME: ++ return uts->name.sysname; ++ case VHIN_NODENAME: ++ return uts->name.nodename; ++ case VHIN_RELEASE: ++ return uts->name.release; ++ case VHIN_VERSION: ++ return uts->name.version; ++ case VHIN_MACHINE: ++ return uts->name.machine; ++ case VHIN_DOMAINNAME: ++ return uts->name.domainname; ++ default: ++ return NULL; ++ } ++ return NULL; +} + ++int vc_set_vhi_name(struct vx_info *vxi, void __user *data) ++{ ++ struct vcmd_vhi_name_v0 vc_data; ++ char *name; ++ ++ if (copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; + ++ name = vx_vhi_name(vxi, vc_data.field); ++ if (!name) ++ return -EINVAL; + ++ memcpy(name, vc_data.name, 65); ++ return 0; ++} + -+static int do_addrem_dlimit(uint32_t id, const char __user *name, -+ uint32_t flags, int add) ++int vc_get_vhi_name(struct vx_info *vxi, void __user *data) +{ -+ struct path path; -+ int ret; ++ struct vcmd_vhi_name_v0 vc_data; ++ char *name; + -+ ret = user_lpath(name, &path); -+ if (!ret) { -+ struct super_block *sb; -+ struct dl_info *dli; ++ if (copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; + -+ ret = -EINVAL; -+ if (!path.dentry->d_inode) -+ goto out_release; -+ if (!(sb = path.dentry->d_inode->i_sb)) -+ goto out_release; ++ name = vx_vhi_name(vxi, vc_data.field); ++ if (!name) ++ return -EINVAL; + -+ if (add) { -+ dli = __alloc_dl_info(sb, id); -+ spin_lock(&dl_info_hash_lock); ++ memcpy(vc_data.name, name, 65); ++ if (copy_to_user(data, &vc_data, sizeof(vc_data))) ++ return -EFAULT; ++ return 0; ++} + -+ ret = -EEXIST; -+ if (__lookup_dl_info(sb, id)) -+ goto out_unlock; -+ __hash_dl_info(dli); -+ dli = NULL; -+ } else { -+ spin_lock(&dl_info_hash_lock); -+ dli = __lookup_dl_info(sb, id); + -+ ret = -ESRCH; -+ if (!dli) -+ goto out_unlock; -+ __unhash_dl_info(dli); -+ } -+ ret = 0; -+ out_unlock: -+ spin_unlock(&dl_info_hash_lock); -+ if (add && dli) -+ __dealloc_dl_info(dli); -+ out_release: -+ path_put(&path); -+ } -+ return ret; -+} -+ -+int vc_add_dlimit(uint32_t id, void __user *data) ++int vc_virt_stat(struct vx_info *vxi, void __user *data) +{ -+ struct vcmd_ctx_dlimit_base_v0 vc_data; -+ -+ if (copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; ++ struct vcmd_virt_stat_v0 vc_data; ++ struct _vx_cvirt *cvirt = &vxi->cvirt; ++ struct timespec uptime; + -+ return do_addrem_dlimit(id, vc_data.name, vc_data.flags, 1); -+} ++ do_posix_clock_monotonic_gettime(&uptime); ++ set_normalized_timespec(&uptime, ++ uptime.tv_sec - cvirt->bias_uptime.tv_sec, ++ uptime.tv_nsec - cvirt->bias_uptime.tv_nsec); + -+int vc_rem_dlimit(uint32_t id, void __user *data) -+{ -+ struct vcmd_ctx_dlimit_base_v0 vc_data; ++ vc_data.offset = timespec_to_ns(&cvirt->bias_ts); ++ vc_data.uptime = timespec_to_ns(&uptime); ++ vc_data.nr_threads = atomic_read(&cvirt->nr_threads); ++ vc_data.nr_running = atomic_read(&cvirt->nr_running); ++ vc_data.nr_uninterruptible = atomic_read(&cvirt->nr_uninterruptible); ++ vc_data.nr_onhold = atomic_read(&cvirt->nr_onhold); ++ vc_data.nr_forks = atomic_read(&cvirt->total_forks); ++ vc_data.load[0] = cvirt->load[0]; ++ vc_data.load[1] = cvirt->load[1]; ++ vc_data.load[2] = cvirt->load[2]; + -+ if (copy_from_user(&vc_data, data, sizeof(vc_data))) ++ if (copy_to_user(data, &vc_data, sizeof(vc_data))) + return -EFAULT; -+ -+ return do_addrem_dlimit(id, vc_data.name, vc_data.flags, 0); ++ return 0; +} + -+#ifdef CONFIG_COMPAT -+ -+int vc_add_dlimit_x32(uint32_t id, void __user *data) -+{ -+ struct vcmd_ctx_dlimit_base_v0_x32 vc_data; + -+ if (copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; ++#ifdef CONFIG_VSERVER_VTIME + -+ return do_addrem_dlimit(id, -+ compat_ptr(vc_data.name_ptr), vc_data.flags, 1); -+} ++/* virtualized time base */ + -+int vc_rem_dlimit_x32(uint32_t id, void __user *data) ++void vx_adjust_timespec(struct timespec *ts) +{ -+ struct vcmd_ctx_dlimit_base_v0_x32 vc_data; -+ -+ if (copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; ++ struct vx_info *vxi; + -+ return do_addrem_dlimit(id, -+ compat_ptr(vc_data.name_ptr), vc_data.flags, 0); -+} ++ if (!vx_flags(VXF_VIRT_TIME, 0)) ++ return; + -+#endif /* CONFIG_COMPAT */ ++ vxi = current_vx_info(); ++ ts->tv_sec += vxi->cvirt.bias_ts.tv_sec; ++ ts->tv_nsec += vxi->cvirt.bias_ts.tv_nsec; + ++ if (ts->tv_nsec >= NSEC_PER_SEC) { ++ ts->tv_sec++; ++ ts->tv_nsec -= NSEC_PER_SEC; ++ } else if (ts->tv_nsec < 0) { ++ ts->tv_sec--; ++ ts->tv_nsec += NSEC_PER_SEC; ++ } ++} + -+static inline -+int do_set_dlimit(uint32_t id, const char __user *name, -+ uint32_t space_used, uint32_t space_total, -+ uint32_t inodes_used, uint32_t inodes_total, -+ uint32_t reserved, uint32_t flags) ++int vx_settimeofday(const struct timespec *ts) +{ -+ struct path path; -+ int ret; ++ struct timespec ats, delta; ++ struct vx_info *vxi; + -+ ret = user_lpath(name, &path); -+ if (!ret) { -+ struct super_block *sb; -+ struct dl_info *dli; ++ if (!vx_flags(VXF_VIRT_TIME, 0)) ++ return do_settimeofday(ts); + -+ ret = -EINVAL; -+ if (!path.dentry->d_inode) -+ goto out_release; -+ if (!(sb = path.dentry->d_inode->i_sb)) -+ goto out_release; ++ getnstimeofday(&ats); ++ delta = timespec_sub(*ts, ats); + -+ /* sanity checks */ -+ if ((reserved != CDLIM_KEEP && -+ reserved > 100) || -+ (inodes_used != CDLIM_KEEP && -+ inodes_used > inodes_total) || -+ (space_used != CDLIM_KEEP && -+ space_used > space_total)) -+ goto out_release; ++ vxi = current_vx_info(); ++ vxi->cvirt.bias_ts = timespec_add(vxi->cvirt.bias_ts, delta); ++ return 0; ++} + -+ ret = -ESRCH; -+ dli = locate_dl_info(sb, id); -+ if (!dli) -+ goto out_release; ++#endif + -+ spin_lock(&dli->dl_lock); +diff -NurpP --minimal linux-3.18.5/kernel/vserver/cvirt_init.h linux-3.18.5-vs2.3.7.3/kernel/vserver/cvirt_init.h +--- linux-3.18.5/kernel/vserver/cvirt_init.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/vserver/cvirt_init.h 2015-01-19 10:58:31.000000000 +0000 +@@ -0,0 +1,70 @@ + -+ if (inodes_used != CDLIM_KEEP) -+ dli->dl_inodes_used = inodes_used; -+ if (inodes_total != CDLIM_KEEP) -+ dli->dl_inodes_total = inodes_total; -+ if (space_used != CDLIM_KEEP) -+ dli->dl_space_used = dlimit_space_32to64( -+ space_used, flags, DLIMS_USED); + -+ if (space_total == CDLIM_INFINITY) -+ dli->dl_space_total = DLIM_INFINITY; -+ else if (space_total != CDLIM_KEEP) -+ dli->dl_space_total = dlimit_space_32to64( -+ space_total, flags, DLIMS_TOTAL); ++extern uint64_t vx_idle_jiffies(void); + -+ if (reserved != CDLIM_KEEP) -+ dli->dl_nrlmult = (1 << 10) * (100 - reserved) / 100; ++static inline void vx_info_init_cvirt(struct _vx_cvirt *cvirt) ++{ ++ uint64_t idle_jiffies = vx_idle_jiffies(); ++ uint64_t nsuptime; + -+ spin_unlock(&dli->dl_lock); ++ do_posix_clock_monotonic_gettime(&cvirt->bias_uptime); ++ nsuptime = (unsigned long long)cvirt->bias_uptime.tv_sec ++ * NSEC_PER_SEC + cvirt->bias_uptime.tv_nsec; ++ cvirt->bias_clock = nsec_to_clock_t(nsuptime); ++ cvirt->bias_ts.tv_sec = 0; ++ cvirt->bias_ts.tv_nsec = 0; + -+ put_dl_info(dli); -+ ret = 0; ++ jiffies_to_timespec(idle_jiffies, &cvirt->bias_idle); ++ atomic_set(&cvirt->nr_threads, 0); ++ atomic_set(&cvirt->nr_running, 0); ++ atomic_set(&cvirt->nr_uninterruptible, 0); ++ atomic_set(&cvirt->nr_onhold, 0); + -+ out_release: -+ path_put(&path); -+ } -+ return ret; ++ spin_lock_init(&cvirt->load_lock); ++ cvirt->load_last = jiffies; ++ atomic_set(&cvirt->load_updates, 0); ++ cvirt->load[0] = 0; ++ cvirt->load[1] = 0; ++ cvirt->load[2] = 0; ++ atomic_set(&cvirt->total_forks, 0); ++ ++ spin_lock_init(&cvirt->syslog.logbuf_lock); ++ init_waitqueue_head(&cvirt->syslog.log_wait); ++ cvirt->syslog.log_start = 0; ++ cvirt->syslog.log_end = 0; ++ cvirt->syslog.con_start = 0; ++ cvirt->syslog.logged_chars = 0; +} + -+int vc_set_dlimit(uint32_t id, void __user *data) ++static inline ++void vx_info_init_cvirt_pc(struct _vx_cvirt_pc *cvirt_pc, int cpu) +{ -+ struct vcmd_ctx_dlimit_v0 vc_data; -+ -+ if (copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; -+ -+ return do_set_dlimit(id, vc_data.name, -+ vc_data.space_used, vc_data.space_total, -+ vc_data.inodes_used, vc_data.inodes_total, -+ vc_data.reserved, vc_data.flags); ++ // cvirt_pc->cpustat = { 0 }; +} + -+#ifdef CONFIG_COMPAT -+ -+int vc_set_dlimit_x32(uint32_t id, void __user *data) ++static inline void vx_info_exit_cvirt(struct _vx_cvirt *cvirt) +{ -+ struct vcmd_ctx_dlimit_v0_x32 vc_data; -+ -+ if (copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; ++#ifdef CONFIG_VSERVER_WARN ++ int value; ++#endif ++ vxwprintk_xid((value = atomic_read(&cvirt->nr_threads)), ++ "!!! cvirt: %p[nr_threads] = %d on exit.", ++ cvirt, value); ++ vxwprintk_xid((value = atomic_read(&cvirt->nr_running)), ++ "!!! cvirt: %p[nr_running] = %d on exit.", ++ cvirt, value); ++ vxwprintk_xid((value = atomic_read(&cvirt->nr_uninterruptible)), ++ "!!! cvirt: %p[nr_uninterruptible] = %d on exit.", ++ cvirt, value); ++ vxwprintk_xid((value = atomic_read(&cvirt->nr_onhold)), ++ "!!! cvirt: %p[nr_onhold] = %d on exit.", ++ cvirt, value); ++ return; ++} + -+ return do_set_dlimit(id, compat_ptr(vc_data.name_ptr), -+ vc_data.space_used, vc_data.space_total, -+ vc_data.inodes_used, vc_data.inodes_total, -+ vc_data.reserved, vc_data.flags); ++static inline ++void vx_info_exit_cvirt_pc(struct _vx_cvirt_pc *cvirt_pc, int cpu) ++{ ++ return; +} + -+#endif /* CONFIG_COMPAT */ +diff -NurpP --minimal linux-3.18.5/kernel/vserver/cvirt_proc.h linux-3.18.5-vs2.3.7.3/kernel/vserver/cvirt_proc.h +--- linux-3.18.5/kernel/vserver/cvirt_proc.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/vserver/cvirt_proc.h 2015-01-19 10:58:31.000000000 +0000 +@@ -0,0 +1,123 @@ ++#ifndef _VX_CVIRT_PROC_H ++#define _VX_CVIRT_PROC_H ++ ++#include ++#include ++#include ++#include ++#include + ++extern int vx_info_mnt_namespace(struct mnt_namespace *, char *); + +static inline -+int do_get_dlimit(uint32_t id, const char __user *name, -+ uint32_t *space_used, uint32_t *space_total, -+ uint32_t *inodes_used, uint32_t *inodes_total, -+ uint32_t *reserved, uint32_t *flags) ++int vx_info_proc_nsproxy(struct nsproxy *nsproxy, char *buffer) +{ -+ struct path path; -+ int ret; ++ struct mnt_namespace *ns; ++ struct uts_namespace *uts; ++ struct ipc_namespace *ipc; ++ int length = 0; + -+ ret = user_lpath(name, &path); -+ if (!ret) { -+ struct super_block *sb; -+ struct dl_info *dli; ++ if (!nsproxy) ++ goto out; + -+ ret = -EINVAL; -+ if (!path.dentry->d_inode) -+ goto out_release; -+ if (!(sb = path.dentry->d_inode->i_sb)) -+ goto out_release; ++ length += sprintf(buffer + length, ++ "NSProxy:\t%p [%p,%p,%p]\n", ++ nsproxy, nsproxy->mnt_ns, ++ nsproxy->uts_ns, nsproxy->ipc_ns); + -+ ret = -ESRCH; -+ dli = locate_dl_info(sb, id); -+ if (!dli) -+ goto out_release; ++ ns = nsproxy->mnt_ns; ++ if (!ns) ++ goto skip_ns; + -+ spin_lock(&dli->dl_lock); -+ *inodes_used = dli->dl_inodes_used; -+ *inodes_total = dli->dl_inodes_total; ++ length += vx_info_mnt_namespace(ns, buffer + length); + -+ *space_used = dlimit_space_64to32( -+ dli->dl_space_used, flags, DLIMS_USED); ++skip_ns: + -+ if (dli->dl_space_total == DLIM_INFINITY) -+ *space_total = CDLIM_INFINITY; -+ else -+ *space_total = dlimit_space_64to32( -+ dli->dl_space_total, flags, DLIMS_TOTAL); ++ uts = nsproxy->uts_ns; ++ if (!uts) ++ goto skip_uts; + -+ *reserved = 100 - ((dli->dl_nrlmult * 100 + 512) >> 10); -+ spin_unlock(&dli->dl_lock); ++ length += sprintf(buffer + length, ++ "SysName:\t%.*s\n" ++ "NodeName:\t%.*s\n" ++ "Release:\t%.*s\n" ++ "Version:\t%.*s\n" ++ "Machine:\t%.*s\n" ++ "DomainName:\t%.*s\n", ++ __NEW_UTS_LEN, uts->name.sysname, ++ __NEW_UTS_LEN, uts->name.nodename, ++ __NEW_UTS_LEN, uts->name.release, ++ __NEW_UTS_LEN, uts->name.version, ++ __NEW_UTS_LEN, uts->name.machine, ++ __NEW_UTS_LEN, uts->name.domainname); ++skip_uts: + -+ put_dl_info(dli); -+ ret = -EFAULT; ++ ipc = nsproxy->ipc_ns; ++ if (!ipc) ++ goto skip_ipc; + -+ ret = 0; -+ out_release: -+ path_put(&path); -+ } -+ return ret; ++ length += sprintf(buffer + length, ++ "SEMS:\t\t%d %d %d %d %d\n" ++ "MSG:\t\t%d %d %d\n" ++ "SHM:\t\t%lu %lu %d %ld\n", ++ ipc->sem_ctls[0], ipc->sem_ctls[1], ++ ipc->sem_ctls[2], ipc->sem_ctls[3], ++ ipc->used_sems, ++ ipc->msg_ctlmax, ipc->msg_ctlmnb, ipc->msg_ctlmni, ++ (unsigned long)ipc->shm_ctlmax, ++ (unsigned long)ipc->shm_ctlall, ++ ipc->shm_ctlmni, ipc->shm_tot); ++skip_ipc: ++out: ++ return length; +} + + -+int vc_get_dlimit(uint32_t id, void __user *data) -+{ -+ struct vcmd_ctx_dlimit_v0 vc_data; -+ int ret; -+ -+ if (copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; -+ -+ ret = do_get_dlimit(id, vc_data.name, -+ &vc_data.space_used, &vc_data.space_total, -+ &vc_data.inodes_used, &vc_data.inodes_total, -+ &vc_data.reserved, &vc_data.flags); -+ if (ret) -+ return ret; -+ -+ if (copy_to_user(data, &vc_data, sizeof(vc_data))) -+ return -EFAULT; -+ return 0; -+} ++#include + -+#ifdef CONFIG_COMPAT ++#define LOAD_INT(x) ((x) >> FSHIFT) ++#define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1 - 1)) * 100) + -+int vc_get_dlimit_x32(uint32_t id, void __user *data) ++static inline ++int vx_info_proc_cvirt(struct _vx_cvirt *cvirt, char *buffer) +{ -+ struct vcmd_ctx_dlimit_v0_x32 vc_data; -+ int ret; -+ -+ if (copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; ++ int length = 0; ++ int a, b, c; + -+ ret = do_get_dlimit(id, compat_ptr(vc_data.name_ptr), -+ &vc_data.space_used, &vc_data.space_total, -+ &vc_data.inodes_used, &vc_data.inodes_total, -+ &vc_data.reserved, &vc_data.flags); -+ if (ret) -+ return ret; ++ length += sprintf(buffer + length, ++ "BiasUptime:\t%lu.%02lu\n", ++ (unsigned long)cvirt->bias_uptime.tv_sec, ++ (cvirt->bias_uptime.tv_nsec / (NSEC_PER_SEC / 100))); + -+ if (copy_to_user(data, &vc_data, sizeof(vc_data))) -+ return -EFAULT; -+ return 0; ++ a = cvirt->load[0] + (FIXED_1 / 200); ++ b = cvirt->load[1] + (FIXED_1 / 200); ++ c = cvirt->load[2] + (FIXED_1 / 200); ++ length += sprintf(buffer + length, ++ "nr_threads:\t%d\n" ++ "nr_running:\t%d\n" ++ "nr_unintr:\t%d\n" ++ "nr_onhold:\t%d\n" ++ "load_updates:\t%d\n" ++ "loadavg:\t%d.%02d %d.%02d %d.%02d\n" ++ "total_forks:\t%d\n", ++ atomic_read(&cvirt->nr_threads), ++ atomic_read(&cvirt->nr_running), ++ atomic_read(&cvirt->nr_uninterruptible), ++ atomic_read(&cvirt->nr_onhold), ++ atomic_read(&cvirt->load_updates), ++ LOAD_INT(a), LOAD_FRAC(a), ++ LOAD_INT(b), LOAD_FRAC(b), ++ LOAD_INT(c), LOAD_FRAC(c), ++ atomic_read(&cvirt->total_forks)); ++ return length; +} + -+#endif /* CONFIG_COMPAT */ -+ -+ -+void vx_vsi_statfs(struct super_block *sb, struct kstatfs *buf) ++static inline ++int vx_info_proc_cvirt_pc(struct _vx_cvirt_pc *cvirt_pc, ++ char *buffer, int cpu) +{ -+ struct dl_info *dli; -+ __u64 blimit, bfree, bavail; -+ __u32 ifree; -+ -+ dli = locate_dl_info(sb, dx_current_tag()); -+ if (!dli) -+ return; -+ -+ spin_lock(&dli->dl_lock); -+ if (dli->dl_inodes_total == (unsigned long)DLIM_INFINITY) -+ goto no_ilim; -+ -+ /* reduce max inodes available to limit */ -+ if (buf->f_files > dli->dl_inodes_total) -+ buf->f_files = dli->dl_inodes_total; -+ -+ ifree = dli->dl_inodes_total - dli->dl_inodes_used; -+ /* reduce free inodes to min */ -+ if (ifree < buf->f_ffree) -+ buf->f_ffree = ifree; -+ -+no_ilim: -+ if (dli->dl_space_total == DLIM_INFINITY) -+ goto no_blim; -+ -+ blimit = dli->dl_space_total >> sb->s_blocksize_bits; -+ -+ if (dli->dl_space_total < dli->dl_space_used) -+ bfree = 0; -+ else -+ bfree = (dli->dl_space_total - dli->dl_space_used) -+ >> sb->s_blocksize_bits; -+ -+ bavail = ((dli->dl_space_total >> 10) * dli->dl_nrlmult); -+ if (bavail < dli->dl_space_used) -+ bavail = 0; -+ else -+ bavail = (bavail - dli->dl_space_used) -+ >> sb->s_blocksize_bits; ++ int length = 0; ++ return length; ++} + -+ /* reduce max space available to limit */ -+ if (buf->f_blocks > blimit) -+ buf->f_blocks = blimit; ++#endif /* _VX_CVIRT_PROC_H */ +diff -NurpP --minimal linux-3.18.5/kernel/vserver/debug.c linux-3.18.5-vs2.3.7.3/kernel/vserver/debug.c +--- linux-3.18.5/kernel/vserver/debug.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/vserver/debug.c 2015-01-19 10:58:31.000000000 +0000 +@@ -0,0 +1,32 @@ ++/* ++ * kernel/vserver/debug.c ++ * ++ * Copyright (C) 2005-2007 Herbert Pötzl ++ * ++ * V0.01 vx_info dump support ++ * ++ */ + -+ /* reduce free space to min */ -+ if (bfree < buf->f_bfree) -+ buf->f_bfree = bfree; ++#include + -+ /* reduce avail space to min */ -+ if (bavail < buf->f_bavail) -+ buf->f_bavail = bavail; ++#include + -+no_blim: -+ spin_unlock(&dli->dl_lock); -+ put_dl_info(dli); + -+ return; ++void dump_vx_info(struct vx_info *vxi, int level) ++{ ++ printk("vx_info %p[#%d, %d.%d, %4x]\n", vxi, vxi->vx_id, ++ atomic_read(&vxi->vx_usecnt), ++ atomic_read(&vxi->vx_tasks), ++ vxi->vx_state); ++ if (level > 0) { ++ __dump_vx_limit(&vxi->limit); ++ __dump_vx_sched(&vxi->sched); ++ __dump_vx_cvirt(&vxi->cvirt); ++ __dump_vx_cacct(&vxi->cacct); ++ } ++ printk("---\n"); +} + -+#include + -+EXPORT_SYMBOL_GPL(locate_dl_info); -+EXPORT_SYMBOL_GPL(rcu_free_dl_info); ++EXPORT_SYMBOL_GPL(dump_vx_info); + -diff -NurpP --minimal linux-3.7/kernel/vserver/helper.c linux-3.7-vs2.3.5.1/kernel/vserver/helper.c ---- linux-3.7/kernel/vserver/helper.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/helper.c 2012-12-11 15:56:33.000000000 +0000 -@@ -0,0 +1,229 @@ +diff -NurpP --minimal linux-3.18.5/kernel/vserver/device.c linux-3.18.5-vs2.3.7.3/kernel/vserver/device.c +--- linux-3.18.5/kernel/vserver/device.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/vserver/device.c 2015-01-19 10:58:31.000000000 +0000 +@@ -0,0 +1,443 @@ +/* -+ * linux/kernel/vserver/helper.c ++ * linux/kernel/vserver/device.c + * -+ * Virtual Context Support ++ * Linux-VServer: Device Support + * -+ * Copyright (C) 2004-2007 Herbert Pötzl ++ * Copyright (C) 2006 Herbert Pötzl ++ * Copyright (C) 2007 Daniel Hokka Zakrisson + * -+ * V0.01 basic helper ++ * V0.01 device mapping basics ++ * V0.02 added defaults + * + */ + -+#include -+#include -+#include -+#include -+#include ++#include ++#include ++#include ++#include ++#include + ++#include ++#include ++#include ++#include ++#include ++#include ++#include + -+char vshelper_path[255] = "/sbin/vshelper"; + -+static int vshelper_init(struct subprocess_info *info, struct cred *new_cred) -+{ -+ current->flags &= ~PF_THREAD_BOUND; -+ return 0; -+} ++#define DMAP_HASH_BITS 4 + -+static int do_vshelper(char *name, char *argv[], char *envp[], int sync) -+{ -+ int ret; + -+ if ((ret = call_usermodehelper_fns(name, argv, envp, -+ sync ? UMH_WAIT_PROC : UMH_WAIT_EXEC, -+ vshelper_init, NULL, NULL))) { -+ printk(KERN_WARNING "%s: (%s %s) returned %s with %d\n", -+ name, argv[1], argv[2], -+ sync ? "sync" : "async", ret); -+ } -+ vxdprintk(VXD_CBIT(switch, 4), -+ "%s: (%s %s) returned %s with %d", -+ name, argv[1], argv[2], sync ? "sync" : "async", ret); -+ return ret; -+} ++struct vs_mapping { ++ union { ++ struct hlist_node hlist; ++ struct list_head list; ++ } u; ++#define dm_hlist u.hlist ++#define dm_list u.list ++ vxid_t xid; ++ dev_t device; ++ struct vx_dmap_target target; ++}; + -+/* -+ * vshelper path is set via /proc/sys -+ * invoked by vserver sys_reboot(), with -+ * the following arguments -+ * -+ * argv [0] = vshelper_path; -+ * argv [1] = action: "restart", "halt", "poweroff", ... -+ * argv [2] = context identifier -+ * -+ * envp [*] = type-specific parameters -+ */ + -+long vs_reboot_helper(struct vx_info *vxi, int cmd, void __user *arg) -+{ -+ char id_buf[8], cmd_buf[16]; -+ char uid_buf[16], pid_buf[16]; -+ int ret; ++static struct hlist_head dmap_main_hash[1 << DMAP_HASH_BITS]; + -+ char *argv[] = {vshelper_path, NULL, id_buf, 0}; -+ char *envp[] = {"HOME=/", "TERM=linux", -+ "PATH=/sbin:/usr/sbin:/bin:/usr/bin", -+ uid_buf, pid_buf, cmd_buf, 0}; ++static DEFINE_SPINLOCK(dmap_main_hash_lock); + -+ if (vx_info_state(vxi, VXS_HELPER)) -+ return -EAGAIN; -+ vxi->vx_state |= VXS_HELPER; ++static struct vx_dmap_target dmap_defaults[2] = { ++ { .flags = DATTR_OPEN }, ++ { .flags = DATTR_OPEN }, ++}; + -+ snprintf(id_buf, sizeof(id_buf), "%d", vxi->vx_id); + -+ snprintf(cmd_buf, sizeof(cmd_buf), "VS_CMD=%08x", cmd); -+ snprintf(uid_buf, sizeof(uid_buf), "VS_UID=%d", current_uid()); -+ snprintf(pid_buf, sizeof(pid_buf), "VS_PID=%d", current->pid); ++struct kmem_cache *dmap_cachep __read_mostly; + -+ switch (cmd) { -+ case LINUX_REBOOT_CMD_RESTART: -+ argv[1] = "restart"; -+ break; ++int __init dmap_cache_init(void) ++{ ++ dmap_cachep = kmem_cache_create("dmap_cache", ++ sizeof(struct vs_mapping), 0, ++ SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL); ++ return 0; ++} + -+ case LINUX_REBOOT_CMD_HALT: -+ argv[1] = "halt"; -+ break; ++__initcall(dmap_cache_init); + -+ case LINUX_REBOOT_CMD_POWER_OFF: -+ argv[1] = "poweroff"; -+ break; + -+ case LINUX_REBOOT_CMD_SW_SUSPEND: -+ argv[1] = "swsusp"; -+ break; ++static inline unsigned int __hashval(dev_t dev, int bits) ++{ ++ return hash_long((unsigned long)dev, bits); ++} + -+ case LINUX_REBOOT_CMD_OOM: -+ argv[1] = "oom"; -+ break; + -+ default: -+ vxi->vx_state &= ~VXS_HELPER; ++/* __hash_mapping() ++ * add the mapping to the hash table ++ */ ++static inline void __hash_mapping(struct vx_info *vxi, struct vs_mapping *vdm) ++{ ++ spinlock_t *hash_lock = &dmap_main_hash_lock; ++ struct hlist_head *head, *hash = dmap_main_hash; ++ int device = vdm->device; ++ ++ spin_lock(hash_lock); ++ vxdprintk(VXD_CBIT(misc, 8), "__hash_mapping: %p[#%d] %08x:%08x", ++ vxi, vxi ? vxi->vx_id : 0, device, vdm->target.target); ++ ++ head = &hash[__hashval(device, DMAP_HASH_BITS)]; ++ hlist_add_head(&vdm->dm_hlist, head); ++ spin_unlock(hash_lock); ++} ++ ++ ++static inline int __mode_to_default(umode_t mode) ++{ ++ switch (mode) { ++ case S_IFBLK: + return 0; ++ case S_IFCHR: ++ return 1; ++ default: ++ BUG(); + } -+ -+ ret = do_vshelper(vshelper_path, argv, envp, 0); -+ vxi->vx_state &= ~VXS_HELPER; -+ __wakeup_vx_info(vxi); -+ return (ret) ? -EPERM : 0; +} + + -+long vs_reboot(unsigned int cmd, void __user *arg) ++/* __set_default() ++ * set a default ++ */ ++static inline void __set_default(struct vx_info *vxi, umode_t mode, ++ struct vx_dmap_target *vdmt) +{ -+ struct vx_info *vxi = current_vx_info(); -+ long ret = 0; ++ spinlock_t *hash_lock = &dmap_main_hash_lock; ++ spin_lock(hash_lock); + -+ vxdprintk(VXD_CBIT(misc, 5), -+ "vs_reboot(%p[#%d],%u)", -+ vxi, vxi ? vxi->vx_id : 0, cmd); ++ if (vxi) ++ vxi->dmap.targets[__mode_to_default(mode)] = *vdmt; ++ else ++ dmap_defaults[__mode_to_default(mode)] = *vdmt; + -+ ret = vs_reboot_helper(vxi, cmd, arg); -+ if (ret) -+ return ret; + -+ vxi->reboot_cmd = cmd; -+ if (vx_info_flags(vxi, VXF_REBOOT_KILL, 0)) { -+ switch (cmd) { -+ case LINUX_REBOOT_CMD_RESTART: -+ case LINUX_REBOOT_CMD_HALT: -+ case LINUX_REBOOT_CMD_POWER_OFF: -+ vx_info_kill(vxi, 0, SIGKILL); -+ vx_info_kill(vxi, 1, SIGKILL); -+ default: -+ break; -+ } -+ } -+ return 0; ++ spin_unlock(hash_lock); ++ ++ vxdprintk(VXD_CBIT(misc, 8), "__set_default: %p[#%u] %08x %04x", ++ vxi, vxi ? vxi->vx_id : 0, vdmt->target, vdmt->flags); +} + -+long vs_oom_action(unsigned int cmd) -+{ -+ struct vx_info *vxi = current_vx_info(); -+ long ret = 0; + -+ vxdprintk(VXD_CBIT(misc, 5), -+ "vs_oom_action(%p[#%d],%u)", -+ vxi, vxi ? vxi->vx_id : 0, cmd); ++/* __remove_default() ++ * remove a default ++ */ ++static inline int __remove_default(struct vx_info *vxi, umode_t mode) ++{ ++ spinlock_t *hash_lock = &dmap_main_hash_lock; ++ spin_lock(hash_lock); + -+ ret = vs_reboot_helper(vxi, cmd, NULL); -+ if (ret) -+ return ret; ++ if (vxi) ++ vxi->dmap.targets[__mode_to_default(mode)].flags = 0; ++ else /* remove == reset */ ++ dmap_defaults[__mode_to_default(mode)].flags = DATTR_OPEN | mode; + -+ vxi->reboot_cmd = cmd; -+ if (vx_info_flags(vxi, VXF_REBOOT_KILL, 0)) { -+ vx_info_kill(vxi, 0, SIGKILL); -+ vx_info_kill(vxi, 1, SIGKILL); -+ } ++ spin_unlock(hash_lock); + return 0; +} + -+/* -+ * argv [0] = vshelper_path; -+ * argv [1] = action: "startup", "shutdown" -+ * argv [2] = context identifier ++ ++/* __find_mapping() ++ * find a mapping in the hash table + * -+ * envp [*] = type-specific parameters ++ * caller must hold hash_lock + */ -+ -+long vs_state_change(struct vx_info *vxi, unsigned int cmd) ++static inline int __find_mapping(vxid_t xid, dev_t device, umode_t mode, ++ struct vs_mapping **local, struct vs_mapping **global) +{ -+ char id_buf[8], cmd_buf[16]; -+ char *argv[] = {vshelper_path, NULL, id_buf, 0}; -+ char *envp[] = {"HOME=/", "TERM=linux", -+ "PATH=/sbin:/usr/sbin:/bin:/usr/bin", cmd_buf, 0}; ++ struct hlist_head *hash = dmap_main_hash; ++ struct hlist_head *head = &hash[__hashval(device, DMAP_HASH_BITS)]; ++ struct hlist_node *pos; ++ struct vs_mapping *vdm; + -+ if (!vx_info_flags(vxi, VXF_SC_HELPER, 0)) -+ return 0; ++ *local = NULL; ++ if (global) ++ *global = NULL; + -+ snprintf(id_buf, sizeof(id_buf), "%d", vxi->vx_id); -+ snprintf(cmd_buf, sizeof(cmd_buf), "VS_CMD=%08x", cmd); ++ hlist_for_each(pos, head) { ++ vdm = hlist_entry(pos, struct vs_mapping, dm_hlist); + -+ switch (cmd) { -+ case VSC_STARTUP: -+ argv[1] = "startup"; -+ break; -+ case VSC_SHUTDOWN: -+ argv[1] = "shutdown"; -+ break; -+ default: -+ return 0; ++ if ((vdm->device == device) && ++ !((vdm->target.flags ^ mode) & S_IFMT)) { ++ if (vdm->xid == xid) { ++ *local = vdm; ++ return 1; ++ } else if (global && vdm->xid == 0) ++ *global = vdm; ++ } + } + -+ return do_vshelper(vshelper_path, argv, envp, 1); ++ if (global && *global) ++ return 0; ++ else ++ return -ENOENT; +} + + -+/* -+ * argv [0] = vshelper_path; -+ * argv [1] = action: "netup", "netdown" -+ * argv [2] = context identifier -+ * -+ * envp [*] = type-specific parameters ++/* __lookup_mapping() ++ * find a mapping and store the result in target and flags + */ -+ -+long vs_net_change(struct nx_info *nxi, unsigned int cmd) ++static inline int __lookup_mapping(struct vx_info *vxi, ++ dev_t device, dev_t *target, int *flags, umode_t mode) +{ -+ char id_buf[8], cmd_buf[16]; -+ char *argv[] = {vshelper_path, NULL, id_buf, 0}; -+ char *envp[] = {"HOME=/", "TERM=linux", -+ "PATH=/sbin:/usr/sbin:/bin:/usr/bin", cmd_buf, 0}; ++ spinlock_t *hash_lock = &dmap_main_hash_lock; ++ struct vs_mapping *vdm, *global; ++ struct vx_dmap_target *vdmt; ++ int ret = 0; ++ vxid_t xid = vxi->vx_id; ++ int index; + -+ if (!nx_info_flags(nxi, NXF_SC_HELPER, 0)) -+ return 0; -+ -+ snprintf(id_buf, sizeof(id_buf), "%d", nxi->nx_id); -+ snprintf(cmd_buf, sizeof(cmd_buf), "VS_CMD=%08x", cmd); ++ spin_lock(hash_lock); ++ if (__find_mapping(xid, device, mode, &vdm, &global) > 0) { ++ ret = 1; ++ vdmt = &vdm->target; ++ goto found; ++ } + -+ switch (cmd) { -+ case VSC_NETUP: -+ argv[1] = "netup"; -+ break; -+ case VSC_NETDOWN: -+ argv[1] = "netdown"; -+ break; -+ default: -+ return 0; ++ index = __mode_to_default(mode); ++ if (vxi && vxi->dmap.targets[index].flags) { ++ ret = 2; ++ vdmt = &vxi->dmap.targets[index]; ++ } else if (global) { ++ ret = 3; ++ vdmt = &global->target; ++ goto found; ++ } else { ++ ret = 4; ++ vdmt = &dmap_defaults[index]; + } + -+ return do_vshelper(vshelper_path, argv, envp, 1); ++found: ++ if (target && (vdmt->flags & DATTR_REMAP)) ++ *target = vdmt->target; ++ else if (target) ++ *target = device; ++ if (flags) ++ *flags = vdmt->flags; ++ ++ spin_unlock(hash_lock); ++ ++ return ret; +} + -diff -NurpP --minimal linux-3.7/kernel/vserver/history.c linux-3.7-vs2.3.5.1/kernel/vserver/history.c ---- linux-3.7/kernel/vserver/history.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/history.c 2012-12-11 15:56:33.000000000 +0000 -@@ -0,0 +1,258 @@ -+/* -+ * kernel/vserver/history.c -+ * -+ * Virtual Context History Backtrace -+ * -+ * Copyright (C) 2004-2007 Herbert Pötzl -+ * -+ * V0.01 basic structure -+ * V0.02 hash/unhash and trace -+ * V0.03 preemption fixes -+ * ++ ++/* __remove_mapping() ++ * remove a mapping from the hash table + */ ++static inline int __remove_mapping(struct vx_info *vxi, dev_t device, ++ umode_t mode) ++{ ++ spinlock_t *hash_lock = &dmap_main_hash_lock; ++ struct vs_mapping *vdm = NULL; ++ int ret = 0; + -+#include -+#include ++ spin_lock(hash_lock); + -+#include -+#include -+#include -+#include ++ ret = __find_mapping((vxi ? vxi->vx_id : 0), device, mode, &vdm, ++ NULL); ++ vxdprintk(VXD_CBIT(misc, 8), "__remove_mapping: %p[#%d] %08x %04x", ++ vxi, vxi ? vxi->vx_id : 0, device, mode); ++ if (ret < 0) ++ goto out; ++ hlist_del(&vdm->dm_hlist); + ++out: ++ spin_unlock(hash_lock); ++ if (vdm) ++ kmem_cache_free(dmap_cachep, vdm); ++ return ret; ++} + -+#ifdef CONFIG_VSERVER_HISTORY -+#define VXH_SIZE CONFIG_VSERVER_HISTORY_SIZE -+#else -+#define VXH_SIZE 64 -+#endif + -+struct _vx_history { -+ unsigned int counter; + -+ struct _vx_hist_entry entry[VXH_SIZE + 1]; -+}; ++int vs_map_device(struct vx_info *vxi, ++ dev_t device, dev_t *target, umode_t mode) ++{ ++ int ret, flags = DATTR_MASK; + ++ if (!vxi) { ++ if (target) ++ *target = device; ++ goto out; ++ } ++ ret = __lookup_mapping(vxi, device, target, &flags, mode); ++ vxdprintk(VXD_CBIT(misc, 8), "vs_map_device: %08x target: %08x flags: %04x mode: %04x mapped=%d", ++ device, target ? *target : 0, flags, mode, ret); ++out: ++ return (flags & DATTR_MASK); ++} + -+DEFINE_PER_CPU(struct _vx_history, vx_history_buffer); + -+unsigned volatile int vxh_active = 1; + -+static atomic_t sequence = ATOMIC_INIT(0); ++static int do_set_mapping(struct vx_info *vxi, ++ dev_t device, dev_t target, int flags, umode_t mode) ++{ ++ if (device) { ++ struct vs_mapping *new; + ++ new = kmem_cache_alloc(dmap_cachep, GFP_KERNEL); ++ if (!new) ++ return -ENOMEM; + -+/* vxh_advance() ++ INIT_HLIST_NODE(&new->dm_hlist); ++ new->device = device; ++ new->target.target = target; ++ new->target.flags = flags | mode; ++ new->xid = (vxi ? vxi->vx_id : 0); + -+ * requires disabled preemption */ ++ vxdprintk(VXD_CBIT(misc, 8), "do_set_mapping: %08x target: %08x flags: %04x", device, target, flags); ++ __hash_mapping(vxi, new); ++ } else { ++ struct vx_dmap_target new = { ++ .target = target, ++ .flags = flags | mode, ++ }; ++ __set_default(vxi, mode, &new); ++ } ++ return 0; ++} + -+struct _vx_hist_entry *vxh_advance(void *loc) ++ ++static int do_unset_mapping(struct vx_info *vxi, ++ dev_t device, dev_t target, int flags, umode_t mode) +{ -+ unsigned int cpu = smp_processor_id(); -+ struct _vx_history *hist = &per_cpu(vx_history_buffer, cpu); -+ struct _vx_hist_entry *entry; -+ unsigned int index; ++ int ret = -EINVAL; + -+ index = vxh_active ? (hist->counter++ % VXH_SIZE) : VXH_SIZE; -+ entry = &hist->entry[index]; ++ if (device) { ++ ret = __remove_mapping(vxi, device, mode); ++ if (ret < 0) ++ goto out; ++ } else { ++ ret = __remove_default(vxi, mode); ++ if (ret < 0) ++ goto out; ++ } + -+ entry->seq = atomic_inc_return(&sequence); -+ entry->loc = loc; -+ return entry; ++out: ++ return ret; +} + -+EXPORT_SYMBOL_GPL(vxh_advance); -+ + -+#define VXH_LOC_FMTS "(#%04x,*%d):%p" ++static inline int __user_device(const char __user *name, dev_t *dev, ++ umode_t *mode) ++{ ++ struct nameidata nd; ++ int ret; + -+#define VXH_LOC_ARGS(e) (e)->seq, cpu, (e)->loc ++ if (!name) { ++ *dev = 0; ++ return 0; ++ } ++ ret = user_lpath(name, &nd.path); ++ if (ret) ++ return ret; ++ if (nd.path.dentry->d_inode) { ++ *dev = nd.path.dentry->d_inode->i_rdev; ++ *mode = nd.path.dentry->d_inode->i_mode; ++ } ++ path_put(&nd.path); ++ return 0; ++} + ++static inline int __mapping_mode(dev_t device, dev_t target, ++ umode_t device_mode, umode_t target_mode, umode_t *mode) ++{ ++ if (device) ++ *mode = device_mode & S_IFMT; ++ else if (target) ++ *mode = target_mode & S_IFMT; ++ else ++ return -EINVAL; + -+#define VXH_VXI_FMTS "%p[#%d,%d.%d]" ++ /* if both given, device and target mode have to match */ ++ if (device && target && ++ ((device_mode ^ target_mode) & S_IFMT)) ++ return -EINVAL; ++ return 0; ++} + -+#define VXH_VXI_ARGS(e) (e)->vxi.ptr, \ -+ (e)->vxi.ptr ? (e)->vxi.xid : 0, \ -+ (e)->vxi.ptr ? (e)->vxi.usecnt : 0, \ -+ (e)->vxi.ptr ? (e)->vxi.tasks : 0 + -+void vxh_dump_entry(struct _vx_hist_entry *e, unsigned cpu) ++static inline int do_mapping(struct vx_info *vxi, const char __user *device_path, ++ const char __user *target_path, int flags, int set) +{ -+ switch (e->type) { -+ case VXH_THROW_OOPS: -+ printk( VXH_LOC_FMTS " oops \n", VXH_LOC_ARGS(e)); -+ break; ++ dev_t device = ~0, target = ~0; ++ umode_t device_mode = 0, target_mode = 0, mode; ++ int ret; + -+ case VXH_GET_VX_INFO: -+ case VXH_PUT_VX_INFO: -+ printk( VXH_LOC_FMTS " %s_vx_info " VXH_VXI_FMTS "\n", -+ VXH_LOC_ARGS(e), -+ (e->type == VXH_GET_VX_INFO) ? "get" : "put", -+ VXH_VXI_ARGS(e)); -+ break; ++ ret = __user_device(device_path, &device, &device_mode); ++ if (ret) ++ return ret; ++ ret = __user_device(target_path, &target, &target_mode); ++ if (ret) ++ return ret; + -+ case VXH_INIT_VX_INFO: -+ case VXH_SET_VX_INFO: -+ case VXH_CLR_VX_INFO: -+ printk( VXH_LOC_FMTS " %s_vx_info " VXH_VXI_FMTS " @%p\n", -+ VXH_LOC_ARGS(e), -+ (e->type == VXH_INIT_VX_INFO) ? "init" : -+ ((e->type == VXH_SET_VX_INFO) ? "set" : "clr"), -+ VXH_VXI_ARGS(e), e->sc.data); -+ break; ++ ret = __mapping_mode(device, target, ++ device_mode, target_mode, &mode); ++ if (ret) ++ return ret; + -+ case VXH_CLAIM_VX_INFO: -+ case VXH_RELEASE_VX_INFO: -+ printk( VXH_LOC_FMTS " %s_vx_info " VXH_VXI_FMTS " @%p\n", -+ VXH_LOC_ARGS(e), -+ (e->type == VXH_CLAIM_VX_INFO) ? "claim" : "release", -+ VXH_VXI_ARGS(e), e->sc.data); -+ break; ++ if (set) ++ return do_set_mapping(vxi, device, target, ++ flags, mode); ++ else ++ return do_unset_mapping(vxi, device, target, ++ flags, mode); ++} + -+ case VXH_ALLOC_VX_INFO: -+ case VXH_DEALLOC_VX_INFO: -+ printk( VXH_LOC_FMTS " %s_vx_info " VXH_VXI_FMTS "\n", -+ VXH_LOC_ARGS(e), -+ (e->type == VXH_ALLOC_VX_INFO) ? "alloc" : "dealloc", -+ VXH_VXI_ARGS(e)); -+ break; + -+ case VXH_HASH_VX_INFO: -+ case VXH_UNHASH_VX_INFO: -+ printk( VXH_LOC_FMTS " __%s_vx_info " VXH_VXI_FMTS "\n", -+ VXH_LOC_ARGS(e), -+ (e->type == VXH_HASH_VX_INFO) ? "hash" : "unhash", -+ VXH_VXI_ARGS(e)); -+ break; ++int vc_set_mapping(struct vx_info *vxi, void __user *data) ++{ ++ struct vcmd_set_mapping_v0 vc_data; + -+ case VXH_LOC_VX_INFO: -+ case VXH_LOOKUP_VX_INFO: -+ case VXH_CREATE_VX_INFO: -+ printk( VXH_LOC_FMTS " __%s_vx_info [#%d] -> " VXH_VXI_FMTS "\n", -+ VXH_LOC_ARGS(e), -+ (e->type == VXH_CREATE_VX_INFO) ? "create" : -+ ((e->type == VXH_LOC_VX_INFO) ? "loc" : "lookup"), -+ e->ll.arg, VXH_VXI_ARGS(e)); -+ break; -+ } ++ if (copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; ++ ++ return do_mapping(vxi, vc_data.device, vc_data.target, ++ vc_data.flags, 1); +} + -+static void __vxh_dump_history(void) ++int vc_unset_mapping(struct vx_info *vxi, void __user *data) +{ -+ unsigned int i, cpu; ++ struct vcmd_set_mapping_v0 vc_data; + -+ printk("History:\tSEQ: %8x\tNR_CPUS: %d\n", -+ atomic_read(&sequence), NR_CPUS); ++ if (copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; + -+ for (i = 0; i < VXH_SIZE; i++) { -+ for_each_online_cpu(cpu) { -+ struct _vx_history *hist = -+ &per_cpu(vx_history_buffer, cpu); -+ unsigned int index = (hist->counter - i) % VXH_SIZE; -+ struct _vx_hist_entry *entry = &hist->entry[index]; ++ return do_mapping(vxi, vc_data.device, vc_data.target, ++ vc_data.flags, 0); ++} + -+ vxh_dump_entry(entry, cpu); -+ } -+ } ++ ++#ifdef CONFIG_COMPAT ++ ++int vc_set_mapping_x32(struct vx_info *vxi, void __user *data) ++{ ++ struct vcmd_set_mapping_v0_x32 vc_data; ++ ++ if (copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; ++ ++ return do_mapping(vxi, compat_ptr(vc_data.device_ptr), ++ compat_ptr(vc_data.target_ptr), vc_data.flags, 1); +} + -+void vxh_dump_history(void) ++int vc_unset_mapping_x32(struct vx_info *vxi, void __user *data) +{ -+ vxh_active = 0; -+#ifdef CONFIG_SMP -+ local_irq_enable(); -+ smp_send_stop(); -+ local_irq_disable(); -+#endif -+ __vxh_dump_history(); ++ struct vcmd_set_mapping_v0_x32 vc_data; ++ ++ if (copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; ++ ++ return do_mapping(vxi, compat_ptr(vc_data.device_ptr), ++ compat_ptr(vc_data.target_ptr), vc_data.flags, 0); +} + ++#endif /* CONFIG_COMPAT */ + -+/* vserver syscall commands below here */ + +diff -NurpP --minimal linux-3.18.5/kernel/vserver/dlimit.c linux-3.18.5-vs2.3.7.3/kernel/vserver/dlimit.c +--- linux-3.18.5/kernel/vserver/dlimit.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/vserver/dlimit.c 2015-01-19 10:58:31.000000000 +0000 +@@ -0,0 +1,528 @@ ++/* ++ * linux/kernel/vserver/dlimit.c ++ * ++ * Virtual Server: Context Disk Limits ++ * ++ * Copyright (C) 2004-2009 Herbert Pötzl ++ * ++ * V0.01 initial version ++ * V0.02 compat32 splitup ++ * V0.03 extended interface ++ * ++ */ + -+int vc_dump_history(uint32_t id) -+{ -+ vxh_active = 0; -+ __vxh_dump_history(); -+ vxh_active = 1; ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++// #include + -+ return 0; -+} ++#include + ++/* __alloc_dl_info() + -+int do_read_history(struct __user _vx_hist_entry *data, -+ int cpu, uint32_t *index, uint32_t *count) ++ * allocate an initialized dl_info struct ++ * doesn't make it visible (hash) */ ++ ++static struct dl_info *__alloc_dl_info(struct super_block *sb, vtag_t tag) +{ -+ int pos, ret = 0; -+ struct _vx_history *hist = &per_cpu(vx_history_buffer, cpu); -+ int end = hist->counter; -+ int start = end - VXH_SIZE + 2; -+ int idx = *index; ++ struct dl_info *new = NULL; + -+ /* special case: get current pos */ -+ if (!*count) { -+ *index = end; ++ vxdprintk(VXD_CBIT(dlim, 5), ++ "alloc_dl_info(%p,%d)*", sb, tag); ++ ++ /* would this benefit from a slab cache? */ ++ new = kmalloc(sizeof(struct dl_info), GFP_KERNEL); ++ if (!new) + return 0; -+ } + -+ /* have we lost some data? */ -+ if (idx < start) -+ idx = start; ++ memset(new, 0, sizeof(struct dl_info)); ++ new->dl_tag = tag; ++ new->dl_sb = sb; ++ // INIT_RCU_HEAD(&new->dl_rcu); ++ INIT_HLIST_NODE(&new->dl_hlist); ++ spin_lock_init(&new->dl_lock); ++ atomic_set(&new->dl_refcnt, 0); ++ atomic_set(&new->dl_usecnt, 0); + -+ for (pos = 0; (pos < *count) && (idx < end); pos++, idx++) { -+ struct _vx_hist_entry *entry = -+ &hist->entry[idx % VXH_SIZE]; ++ /* rest of init goes here */ + -+ /* send entry to userspace */ -+ ret = copy_to_user(&data[pos], entry, sizeof(*entry)); -+ if (ret) -+ break; -+ } -+ /* save new index and count */ -+ *index = idx; -+ *count = pos; -+ return ret ? ret : (*index < end); ++ vxdprintk(VXD_CBIT(dlim, 4), ++ "alloc_dl_info(%p,%d) = %p", sb, tag, new); ++ return new; +} + -+int vc_read_history(uint32_t id, void __user *data) -+{ -+ struct vcmd_read_history_v0 vc_data; -+ int ret; ++/* __dealloc_dl_info() + -+ if (id >= NR_CPUS) -+ return -EINVAL; ++ * final disposal of dl_info */ + -+ if (copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; ++static void __dealloc_dl_info(struct dl_info *dli) ++{ ++ vxdprintk(VXD_CBIT(dlim, 4), ++ "dealloc_dl_info(%p)", dli); + -+ ret = do_read_history((struct __user _vx_hist_entry *)vc_data.data, -+ id, &vc_data.index, &vc_data.count); ++ dli->dl_hlist.next = LIST_POISON1; ++ dli->dl_tag = -1; ++ dli->dl_sb = 0; + -+ if (copy_to_user(data, &vc_data, sizeof(vc_data))) -+ return -EFAULT; -+ return ret; ++ BUG_ON(atomic_read(&dli->dl_usecnt)); ++ BUG_ON(atomic_read(&dli->dl_refcnt)); ++ ++ kfree(dli); +} + -+#ifdef CONFIG_COMPAT + -+int vc_read_history_x32(uint32_t id, void __user *data) -+{ -+ struct vcmd_read_history_v0_x32 vc_data; -+ int ret; ++/* hash table for dl_info hash */ + -+ if (id >= NR_CPUS) -+ return -EINVAL; ++#define DL_HASH_SIZE 13 + -+ if (copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; ++struct hlist_head dl_info_hash[DL_HASH_SIZE]; + -+ ret = do_read_history((struct __user _vx_hist_entry *) -+ compat_ptr(vc_data.data_ptr), -+ id, &vc_data.index, &vc_data.count); ++static DEFINE_SPINLOCK(dl_info_hash_lock); + -+ if (copy_to_user(data, &vc_data, sizeof(vc_data))) -+ return -EFAULT; -+ return ret; ++ ++static inline unsigned int __hashval(struct super_block *sb, vtag_t tag) ++{ ++ return ((tag ^ (unsigned long)sb) % DL_HASH_SIZE); +} + -+#endif /* CONFIG_COMPAT */ + -diff -NurpP --minimal linux-3.7/kernel/vserver/inet.c linux-3.7-vs2.3.5.1/kernel/vserver/inet.c ---- linux-3.7/kernel/vserver/inet.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/inet.c 2012-12-11 15:56:33.000000000 +0000 -@@ -0,0 +1,226 @@ + -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include ++/* __hash_dl_info() + ++ * add the dli to the global hash table ++ * requires the hash_lock to be held */ + -+int nx_v4_addr_conflict(struct nx_info *nxi1, struct nx_info *nxi2) ++static inline void __hash_dl_info(struct dl_info *dli) +{ -+ int ret = 0; ++ struct hlist_head *head; + -+ if (!nxi1 || !nxi2 || nxi1 == nxi2) -+ ret = 1; -+ else { -+ struct nx_addr_v4 *ptr; ++ vxdprintk(VXD_CBIT(dlim, 6), ++ "__hash_dl_info: %p[#%d]", dli, dli->dl_tag); ++ get_dl_info(dli); ++ head = &dl_info_hash[__hashval(dli->dl_sb, dli->dl_tag)]; ++ hlist_add_head_rcu(&dli->dl_hlist, head); ++} + -+ for (ptr = &nxi1->v4; ptr; ptr = ptr->next) { -+ if (v4_nx_addr_in_nx_info(nxi2, ptr, -1)) { -+ ret = 1; -+ break; -+ } -+ } -+ } ++/* __unhash_dl_info() + -+ vxdprintk(VXD_CBIT(net, 2), -+ "nx_v4_addr_conflict(%p,%p): %d", -+ nxi1, nxi2, ret); ++ * remove the dli from the global hash table ++ * requires the hash_lock to be held */ + -+ return ret; ++static inline void __unhash_dl_info(struct dl_info *dli) ++{ ++ vxdprintk(VXD_CBIT(dlim, 6), ++ "__unhash_dl_info: %p[#%d]", dli, dli->dl_tag); ++ hlist_del_rcu(&dli->dl_hlist); ++ put_dl_info(dli); +} + + -+#ifdef CONFIG_IPV6 ++/* __lookup_dl_info() + -+int nx_v6_addr_conflict(struct nx_info *nxi1, struct nx_info *nxi2) -+{ -+ int ret = 0; ++ * requires the rcu_read_lock() ++ * doesn't increment the dl_refcnt */ + -+ if (!nxi1 || !nxi2 || nxi1 == nxi2) -+ ret = 1; -+ else { -+ struct nx_addr_v6 *ptr; ++static inline struct dl_info *__lookup_dl_info(struct super_block *sb, vtag_t tag) ++{ ++ struct hlist_head *head = &dl_info_hash[__hashval(sb, tag)]; ++ struct dl_info *dli; + -+ for (ptr = &nxi1->v6; ptr; ptr = ptr->next) { -+ if (v6_nx_addr_in_nx_info(nxi2, ptr, -1)) { -+ ret = 1; -+ break; -+ } -+ } ++ hlist_for_each_entry_rcu(dli, head, dl_hlist) { ++ if (dli->dl_tag == tag && dli->dl_sb == sb) ++ return dli; + } ++ return NULL; ++} + -+ vxdprintk(VXD_CBIT(net, 2), -+ "nx_v6_addr_conflict(%p,%p): %d", -+ nxi1, nxi2, ret); + -+ return ret; -+} ++struct dl_info *locate_dl_info(struct super_block *sb, vtag_t tag) ++{ ++ struct dl_info *dli; + -+#endif ++ rcu_read_lock(); ++ dli = get_dl_info(__lookup_dl_info(sb, tag)); ++ vxdprintk(VXD_CBIT(dlim, 7), ++ "locate_dl_info(%p,#%d) = %p", sb, tag, dli); ++ rcu_read_unlock(); ++ return dli; ++} + -+int v4_dev_in_nx_info(struct net_device *dev, struct nx_info *nxi) ++void rcu_free_dl_info(struct rcu_head *head) +{ -+ struct in_device *in_dev; -+ struct in_ifaddr **ifap; -+ struct in_ifaddr *ifa; -+ int ret = 0; ++ struct dl_info *dli = container_of(head, struct dl_info, dl_rcu); ++ int usecnt, refcnt; + -+ if (!dev) -+ goto out; -+ in_dev = in_dev_get(dev); -+ if (!in_dev) -+ goto out; ++ BUG_ON(!dli || !head); + -+ for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL; -+ ifap = &ifa->ifa_next) { -+ if (v4_addr_in_nx_info(nxi, ifa->ifa_local, NXA_MASK_SHOW)) { -+ ret = 1; -+ break; -+ } -+ } -+ in_dev_put(in_dev); -+out: -+ return ret; ++ usecnt = atomic_read(&dli->dl_usecnt); ++ BUG_ON(usecnt < 0); ++ ++ refcnt = atomic_read(&dli->dl_refcnt); ++ BUG_ON(refcnt < 0); ++ ++ vxdprintk(VXD_CBIT(dlim, 3), ++ "rcu_free_dl_info(%p)", dli); ++ if (!usecnt) ++ __dealloc_dl_info(dli); ++ else ++ printk("!!! rcu didn't free\n"); +} + + -+#ifdef CONFIG_IPV6 + -+int v6_dev_in_nx_info(struct net_device *dev, struct nx_info *nxi) ++ ++static int do_addrem_dlimit(uint32_t id, const char __user *name, ++ uint32_t flags, int add) +{ -+ struct inet6_dev *in_dev; -+ struct inet6_ifaddr *ifa; -+ int ret = 0; ++ struct path path; ++ int ret; + -+ if (!dev) -+ goto out; -+ in_dev = in6_dev_get(dev); -+ if (!in_dev) -+ goto out; ++ ret = user_lpath(name, &path); ++ if (!ret) { ++ struct super_block *sb; ++ struct dl_info *dli; + -+ // for (ifap = &in_dev->addr_list; (ifa = *ifap) != NULL; -+ list_for_each_entry(ifa, &in_dev->addr_list, if_list) { -+ if (v6_addr_in_nx_info(nxi, &ifa->addr, -1)) { -+ ret = 1; -+ break; ++ ret = -EINVAL; ++ if (!path.dentry->d_inode) ++ goto out_release; ++ if (!(sb = path.dentry->d_inode->i_sb)) ++ goto out_release; ++ ++ if (add) { ++ dli = __alloc_dl_info(sb, id); ++ spin_lock(&dl_info_hash_lock); ++ ++ ret = -EEXIST; ++ if (__lookup_dl_info(sb, id)) ++ goto out_unlock; ++ __hash_dl_info(dli); ++ dli = NULL; ++ } else { ++ spin_lock(&dl_info_hash_lock); ++ dli = __lookup_dl_info(sb, id); ++ ++ ret = -ESRCH; ++ if (!dli) ++ goto out_unlock; ++ __unhash_dl_info(dli); + } ++ ret = 0; ++ out_unlock: ++ spin_unlock(&dl_info_hash_lock); ++ if (add && dli) ++ __dealloc_dl_info(dli); ++ out_release: ++ path_put(&path); + } -+ in6_dev_put(in_dev); -+out: + return ret; +} + -+#endif -+ -+int dev_in_nx_info(struct net_device *dev, struct nx_info *nxi) ++int vc_add_dlimit(uint32_t id, void __user *data) +{ -+ int ret = 1; ++ struct vcmd_ctx_dlimit_base_v0 vc_data; + -+ if (!nxi) -+ goto out; -+ if (nxi->v4.type && v4_dev_in_nx_info(dev, nxi)) -+ goto out; -+#ifdef CONFIG_IPV6 -+ ret = 2; -+ if (nxi->v6.type && v6_dev_in_nx_info(dev, nxi)) -+ goto out; -+#endif -+ ret = 0; -+out: -+ vxdprintk(VXD_CBIT(net, 3), -+ "dev_in_nx_info(%p,%p[#%d]) = %d", -+ dev, nxi, nxi ? nxi->nx_id : 0, ret); -+ return ret; ++ if (copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; ++ ++ return do_addrem_dlimit(id, vc_data.name, vc_data.flags, 1); +} + -+struct rtable *ip_v4_find_src(struct net *net, struct nx_info *nxi, -+ struct flowi4 *fl4) ++int vc_rem_dlimit(uint32_t id, void __user *data) +{ -+ struct rtable *rt; -+ -+ if (!nxi) -+ return NULL; ++ struct vcmd_ctx_dlimit_base_v0 vc_data; + -+ /* FIXME: handle lback only case */ -+ if (!NX_IPV4(nxi)) -+ return ERR_PTR(-EPERM); ++ if (copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; + -+ vxdprintk(VXD_CBIT(net, 4), -+ "ip_v4_find_src(%p[#%u]) " NIPQUAD_FMT " -> " NIPQUAD_FMT, -+ nxi, nxi ? nxi->nx_id : 0, -+ NIPQUAD(fl4->saddr), NIPQUAD(fl4->daddr)); ++ return do_addrem_dlimit(id, vc_data.name, vc_data.flags, 0); ++} + -+ /* single IP is unconditional */ -+ if (nx_info_flags(nxi, NXF_SINGLE_IP, 0) && -+ (fl4->saddr == INADDR_ANY)) -+ fl4->saddr = nxi->v4.ip[0].s_addr; ++#ifdef CONFIG_COMPAT + -+ if (fl4->saddr == INADDR_ANY) { -+ struct nx_addr_v4 *ptr; -+ __be32 found = 0; ++int vc_add_dlimit_x32(uint32_t id, void __user *data) ++{ ++ struct vcmd_ctx_dlimit_base_v0_x32 vc_data; + -+ rt = __ip_route_output_key(net, fl4); -+ if (!IS_ERR(rt)) { -+ found = fl4->saddr; -+ ip_rt_put(rt); -+ vxdprintk(VXD_CBIT(net, 4), -+ "ip_v4_find_src(%p[#%u]) rok[%u]: " NIPQUAD_FMT, -+ nxi, nxi ? nxi->nx_id : 0, fl4->flowi4_oif, NIPQUAD(found)); -+ if (v4_addr_in_nx_info(nxi, found, NXA_MASK_BIND)) -+ goto found; -+ } ++ if (copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; + -+ for (ptr = &nxi->v4; ptr; ptr = ptr->next) { -+ __be32 primary = ptr->ip[0].s_addr; -+ __be32 mask = ptr->mask.s_addr; -+ __be32 neta = primary & mask; ++ return do_addrem_dlimit(id, ++ compat_ptr(vc_data.name_ptr), vc_data.flags, 1); ++} + -+ vxdprintk(VXD_CBIT(net, 4), "ip_v4_find_src(%p[#%u]) chk: " -+ NIPQUAD_FMT "/" NIPQUAD_FMT "/" NIPQUAD_FMT, -+ nxi, nxi ? nxi->nx_id : 0, NIPQUAD(primary), -+ NIPQUAD(mask), NIPQUAD(neta)); -+ if ((found & mask) != neta) -+ continue; ++int vc_rem_dlimit_x32(uint32_t id, void __user *data) ++{ ++ struct vcmd_ctx_dlimit_base_v0_x32 vc_data; + -+ fl4->saddr = primary; -+ rt = __ip_route_output_key(net, fl4); -+ vxdprintk(VXD_CBIT(net, 4), -+ "ip_v4_find_src(%p[#%u]) rok[%u]: " NIPQUAD_FMT, -+ nxi, nxi ? nxi->nx_id : 0, fl4->flowi4_oif, NIPQUAD(primary)); -+ if (!IS_ERR(rt)) { -+ found = fl4->saddr; -+ ip_rt_put(rt); -+ if (found == primary) -+ goto found; -+ } -+ } -+ /* still no source ip? */ -+ found = ipv4_is_loopback(fl4->daddr) -+ ? IPI_LOOPBACK : nxi->v4.ip[0].s_addr; -+ found: -+ /* assign src ip to flow */ -+ fl4->saddr = found; ++ if (copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; + -+ } else { -+ if (!v4_addr_in_nx_info(nxi, fl4->saddr, NXA_MASK_BIND)) -+ return ERR_PTR(-EPERM); -+ } ++ return do_addrem_dlimit(id, ++ compat_ptr(vc_data.name_ptr), vc_data.flags, 0); ++} + -+ if (nx_info_flags(nxi, NXF_LBACK_REMAP, 0)) { -+ if (ipv4_is_loopback(fl4->daddr)) -+ fl4->daddr = nxi->v4_lback.s_addr; -+ if (ipv4_is_loopback(fl4->saddr)) -+ fl4->saddr = nxi->v4_lback.s_addr; -+ } else if (ipv4_is_loopback(fl4->daddr) && -+ !nx_info_flags(nxi, NXF_LBACK_ALLOW, 0)) -+ return ERR_PTR(-EPERM); ++#endif /* CONFIG_COMPAT */ + -+ return NULL; -+} + -+EXPORT_SYMBOL_GPL(ip_v4_find_src); ++static inline ++int do_set_dlimit(uint32_t id, const char __user *name, ++ uint32_t space_used, uint32_t space_total, ++ uint32_t inodes_used, uint32_t inodes_total, ++ uint32_t reserved, uint32_t flags) ++{ ++ struct path path; ++ int ret; + -diff -NurpP --minimal linux-3.7/kernel/vserver/init.c linux-3.7-vs2.3.5.1/kernel/vserver/init.c ---- linux-3.7/kernel/vserver/init.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/init.c 2012-12-11 15:56:33.000000000 +0000 -@@ -0,0 +1,45 @@ -+/* -+ * linux/kernel/init.c -+ * -+ * Virtual Server Init -+ * -+ * Copyright (C) 2004-2007 Herbert Pötzl -+ * -+ * V0.01 basic structure -+ * -+ */ ++ ret = user_lpath(name, &path); ++ if (!ret) { ++ struct super_block *sb; ++ struct dl_info *dli; + -+#include ++ ret = -EINVAL; ++ if (!path.dentry->d_inode) ++ goto out_release; ++ if (!(sb = path.dentry->d_inode->i_sb)) ++ goto out_release; + -+int vserver_register_sysctl(void); -+void vserver_unregister_sysctl(void); ++ /* sanity checks */ ++ if ((reserved != CDLIM_KEEP && ++ reserved > 100) || ++ (inodes_used != CDLIM_KEEP && ++ inodes_used > inodes_total) || ++ (space_used != CDLIM_KEEP && ++ space_used > space_total)) ++ goto out_release; ++ ++ ret = -ESRCH; ++ dli = locate_dl_info(sb, id); ++ if (!dli) ++ goto out_release; + ++ spin_lock(&dli->dl_lock); + -+static int __init init_vserver(void) -+{ -+ int ret = 0; ++ if (inodes_used != CDLIM_KEEP) ++ dli->dl_inodes_used = inodes_used; ++ if (inodes_total != CDLIM_KEEP) ++ dli->dl_inodes_total = inodes_total; ++ if (space_used != CDLIM_KEEP) ++ dli->dl_space_used = dlimit_space_32to64( ++ space_used, flags, DLIMS_USED); + -+#ifdef CONFIG_VSERVER_DEBUG -+ vserver_register_sysctl(); -+#endif ++ if (space_total == CDLIM_INFINITY) ++ dli->dl_space_total = DLIM_INFINITY; ++ else if (space_total != CDLIM_KEEP) ++ dli->dl_space_total = dlimit_space_32to64( ++ space_total, flags, DLIMS_TOTAL); ++ ++ if (reserved != CDLIM_KEEP) ++ dli->dl_nrlmult = (1 << 10) * (100 - reserved) / 100; ++ ++ spin_unlock(&dli->dl_lock); ++ ++ put_dl_info(dli); ++ ret = 0; ++ ++ out_release: ++ path_put(&path); ++ } + return ret; +} + -+ -+static void __exit exit_vserver(void) ++int vc_set_dlimit(uint32_t id, void __user *data) +{ ++ struct vcmd_ctx_dlimit_v0 vc_data; + -+#ifdef CONFIG_VSERVER_DEBUG -+ vserver_unregister_sysctl(); -+#endif -+ return; -+} ++ if (copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; + -+/* FIXME: GFP_ZONETYPES gone -+long vx_slab[GFP_ZONETYPES]; */ -+long vx_area; ++ return do_set_dlimit(id, vc_data.name, ++ vc_data.space_used, vc_data.space_total, ++ vc_data.inodes_used, vc_data.inodes_total, ++ vc_data.reserved, vc_data.flags); ++} + ++#ifdef CONFIG_COMPAT + -+module_init(init_vserver); -+module_exit(exit_vserver); ++int vc_set_dlimit_x32(uint32_t id, void __user *data) ++{ ++ struct vcmd_ctx_dlimit_v0_x32 vc_data; + -diff -NurpP --minimal linux-3.7/kernel/vserver/inode.c linux-3.7-vs2.3.5.1/kernel/vserver/inode.c ---- linux-3.7/kernel/vserver/inode.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/inode.c 2012-12-11 19:38:12.000000000 +0000 -@@ -0,0 +1,437 @@ -+/* -+ * linux/kernel/vserver/inode.c -+ * -+ * Virtual Server: File System Support -+ * -+ * Copyright (C) 2004-2007 Herbert Pötzl -+ * -+ * V0.01 separated from vcontext V0.05 -+ * V0.02 moved to tag (instead of xid) -+ * -+ */ ++ if (copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; + -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include ++ return do_set_dlimit(id, compat_ptr(vc_data.name_ptr), ++ vc_data.space_used, vc_data.space_total, ++ vc_data.inodes_used, vc_data.inodes_total, ++ vc_data.reserved, vc_data.flags); ++} + -+#include ++#endif /* CONFIG_COMPAT */ + + -+static int __vc_get_iattr(struct inode *in, uint32_t *tag, uint32_t *flags, uint32_t *mask) ++static inline ++int do_get_dlimit(uint32_t id, const char __user *name, ++ uint32_t *space_used, uint32_t *space_total, ++ uint32_t *inodes_used, uint32_t *inodes_total, ++ uint32_t *reserved, uint32_t *flags) +{ -+ struct proc_dir_entry *entry; ++ struct path path; ++ int ret; + -+ if (!in || !in->i_sb) -+ return -ESRCH; ++ ret = user_lpath(name, &path); ++ if (!ret) { ++ struct super_block *sb; ++ struct dl_info *dli; + -+ *flags = IATTR_TAG -+ | (IS_IMMUTABLE(in) ? IATTR_IMMUTABLE : 0) -+ | (IS_IXUNLINK(in) ? IATTR_IXUNLINK : 0) -+ | (IS_BARRIER(in) ? IATTR_BARRIER : 0) -+ | (IS_COW(in) ? IATTR_COW : 0); -+ *mask = IATTR_IXUNLINK | IATTR_IMMUTABLE | IATTR_COW; ++ ret = -EINVAL; ++ if (!path.dentry->d_inode) ++ goto out_release; ++ if (!(sb = path.dentry->d_inode->i_sb)) ++ goto out_release; + -+ if (S_ISDIR(in->i_mode)) -+ *mask |= IATTR_BARRIER; ++ ret = -ESRCH; ++ dli = locate_dl_info(sb, id); ++ if (!dli) ++ goto out_release; + -+ if (IS_TAGGED(in)) { -+ *tag = i_tag_read(in); -+ *mask |= IATTR_TAG; -+ } ++ spin_lock(&dli->dl_lock); ++ *inodes_used = dli->dl_inodes_used; ++ *inodes_total = dli->dl_inodes_total; + -+ switch (in->i_sb->s_magic) { -+ case PROC_SUPER_MAGIC: -+ entry = PROC_I(in)->pde; ++ *space_used = dlimit_space_64to32( ++ dli->dl_space_used, flags, DLIMS_USED); + -+ /* check for specific inodes? */ -+ if (entry) -+ *mask |= IATTR_FLAGS; -+ if (entry) -+ *flags |= (entry->vx_flags & IATTR_FLAGS); ++ if (dli->dl_space_total == DLIM_INFINITY) ++ *space_total = CDLIM_INFINITY; + else -+ *flags |= (PROC_I(in)->vx_flags & IATTR_FLAGS); -+ break; ++ *space_total = dlimit_space_64to32( ++ dli->dl_space_total, flags, DLIMS_TOTAL); + -+ case DEVPTS_SUPER_MAGIC: -+ *tag = i_tag_read(in); -+ *mask |= IATTR_TAG; -+ break; ++ *reserved = 100 - ((dli->dl_nrlmult * 100 + 512) >> 10); ++ spin_unlock(&dli->dl_lock); + -+ default: -+ break; ++ put_dl_info(dli); ++ ret = -EFAULT; ++ ++ ret = 0; ++ out_release: ++ path_put(&path); + } -+ return 0; ++ return ret; +} + -+int vc_get_iattr(void __user *data) ++ ++int vc_get_dlimit(uint32_t id, void __user *data) +{ -+ struct path path; -+ struct vcmd_ctx_iattr_v1 vc_data = { .tag = -1 }; ++ struct vcmd_ctx_dlimit_v0 vc_data; + int ret; + + if (copy_from_user(&vc_data, data, sizeof(vc_data))) + return -EFAULT; + -+ ret = user_lpath(vc_data.name, &path); -+ if (!ret) { -+ ret = __vc_get_iattr(path.dentry->d_inode, -+ &vc_data.tag, &vc_data.flags, &vc_data.mask); -+ path_put(&path); -+ } ++ ret = do_get_dlimit(id, vc_data.name, ++ &vc_data.space_used, &vc_data.space_total, ++ &vc_data.inodes_used, &vc_data.inodes_total, ++ &vc_data.reserved, &vc_data.flags); + if (ret) + return ret; + + if (copy_to_user(data, &vc_data, sizeof(vc_data))) -+ ret = -EFAULT; -+ return ret; ++ return -EFAULT; ++ return 0; +} + +#ifdef CONFIG_COMPAT + -+int vc_get_iattr_x32(void __user *data) ++int vc_get_dlimit_x32(uint32_t id, void __user *data) +{ -+ struct path path; -+ struct vcmd_ctx_iattr_v1_x32 vc_data = { .tag = -1 }; ++ struct vcmd_ctx_dlimit_v0_x32 vc_data; + int ret; + + if (copy_from_user(&vc_data, data, sizeof(vc_data))) + return -EFAULT; + -+ ret = user_lpath(compat_ptr(vc_data.name_ptr), &path); -+ if (!ret) { -+ ret = __vc_get_iattr(path.dentry->d_inode, -+ &vc_data.tag, &vc_data.flags, &vc_data.mask); -+ path_put(&path); -+ } ++ ret = do_get_dlimit(id, compat_ptr(vc_data.name_ptr), ++ &vc_data.space_used, &vc_data.space_total, ++ &vc_data.inodes_used, &vc_data.inodes_total, ++ &vc_data.reserved, &vc_data.flags); + if (ret) + return ret; + + if (copy_to_user(data, &vc_data, sizeof(vc_data))) -+ ret = -EFAULT; -+ return ret; ++ return -EFAULT; ++ return 0; +} + +#endif /* CONFIG_COMPAT */ + + -+int vc_fget_iattr(uint32_t fd, void __user *data) ++void vx_vsi_statfs(struct super_block *sb, struct kstatfs *buf) +{ -+ struct file *filp; -+ struct vcmd_ctx_fiattr_v0 vc_data = { .tag = -1 }; -+ int ret; ++ struct dl_info *dli; ++ __u64 blimit, bfree, bavail; ++ __u32 ifree; + -+ if (copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; ++ dli = locate_dl_info(sb, dx_current_tag()); ++ if (!dli) ++ return; + -+ filp = fget(fd); -+ if (!filp || !filp->f_dentry || !filp->f_dentry->d_inode) -+ return -EBADF; ++ spin_lock(&dli->dl_lock); ++ if (dli->dl_inodes_total == (unsigned long)DLIM_INFINITY) ++ goto no_ilim; + -+ ret = __vc_get_iattr(filp->f_dentry->d_inode, -+ &vc_data.tag, &vc_data.flags, &vc_data.mask); ++ /* reduce max inodes available to limit */ ++ if (buf->f_files > dli->dl_inodes_total) ++ buf->f_files = dli->dl_inodes_total; + -+ fput(filp); ++ ifree = dli->dl_inodes_total - dli->dl_inodes_used; ++ /* reduce free inodes to min */ ++ if (ifree < buf->f_ffree) ++ buf->f_ffree = ifree; + -+ if (copy_to_user(data, &vc_data, sizeof(vc_data))) -+ ret = -EFAULT; -+ return ret; -+} ++no_ilim: ++ if (dli->dl_space_total == DLIM_INFINITY) ++ goto no_blim; + ++ blimit = dli->dl_space_total >> sb->s_blocksize_bits; + -+static int __vc_set_iattr(struct dentry *de, uint32_t *tag, uint32_t *flags, uint32_t *mask) -+{ -+ struct inode *in = de->d_inode; -+ int error = 0, is_proc = 0, has_tag = 0; -+ struct iattr attr = { 0 }; ++ if (dli->dl_space_total < dli->dl_space_used) ++ bfree = 0; ++ else ++ bfree = (dli->dl_space_total - dli->dl_space_used) ++ >> sb->s_blocksize_bits; + -+ if (!in || !in->i_sb) -+ return -ESRCH; ++ bavail = ((dli->dl_space_total >> 10) * dli->dl_nrlmult); ++ if (bavail < dli->dl_space_used) ++ bavail = 0; ++ else ++ bavail = (bavail - dli->dl_space_used) ++ >> sb->s_blocksize_bits; + -+ is_proc = (in->i_sb->s_magic == PROC_SUPER_MAGIC); -+ if ((*mask & IATTR_FLAGS) && !is_proc) -+ return -EINVAL; ++ /* reduce max space available to limit */ ++ if (buf->f_blocks > blimit) ++ buf->f_blocks = blimit; + -+ has_tag = IS_TAGGED(in) || -+ (in->i_sb->s_magic == DEVPTS_SUPER_MAGIC); -+ if ((*mask & IATTR_TAG) && !has_tag) -+ return -EINVAL; ++ /* reduce free space to min */ ++ if (bfree < buf->f_bfree) ++ buf->f_bfree = bfree; + -+ mutex_lock(&in->i_mutex); -+ if (*mask & IATTR_TAG) { -+ attr.ia_tag = *tag; -+ attr.ia_valid |= ATTR_TAG; -+ } ++ /* reduce avail space to min */ ++ if (bavail < buf->f_bavail) ++ buf->f_bavail = bavail; + -+ if (*mask & IATTR_FLAGS) { -+ struct proc_dir_entry *entry = PROC_I(in)->pde; -+ unsigned int iflags = PROC_I(in)->vx_flags; ++no_blim: ++ spin_unlock(&dli->dl_lock); ++ put_dl_info(dli); + -+ iflags = (iflags & ~(*mask & IATTR_FLAGS)) -+ | (*flags & IATTR_FLAGS); -+ PROC_I(in)->vx_flags = iflags; -+ if (entry) -+ entry->vx_flags = iflags; -+ } ++ return; ++} + -+ if (*mask & (IATTR_IMMUTABLE | IATTR_IXUNLINK | -+ IATTR_BARRIER | IATTR_COW)) { -+ int iflags = in->i_flags; -+ int vflags = in->i_vflags; ++#include + -+ if (*mask & IATTR_IMMUTABLE) { -+ if (*flags & IATTR_IMMUTABLE) -+ iflags |= S_IMMUTABLE; -+ else -+ iflags &= ~S_IMMUTABLE; -+ } -+ if (*mask & IATTR_IXUNLINK) { -+ if (*flags & IATTR_IXUNLINK) -+ iflags |= S_IXUNLINK; -+ else -+ iflags &= ~S_IXUNLINK; -+ } -+ if (S_ISDIR(in->i_mode) && (*mask & IATTR_BARRIER)) { -+ if (*flags & IATTR_BARRIER) -+ vflags |= V_BARRIER; -+ else -+ vflags &= ~V_BARRIER; -+ } -+ if (S_ISREG(in->i_mode) && (*mask & IATTR_COW)) { -+ if (*flags & IATTR_COW) -+ vflags |= V_COW; -+ else -+ vflags &= ~V_COW; -+ } -+ if (in->i_op && in->i_op->sync_flags) { -+ error = in->i_op->sync_flags(in, iflags, vflags); -+ if (error) -+ goto out; -+ } -+ } ++EXPORT_SYMBOL_GPL(locate_dl_info); ++EXPORT_SYMBOL_GPL(rcu_free_dl_info); + -+ if (attr.ia_valid) { -+ if (in->i_op && in->i_op->setattr) -+ error = in->i_op->setattr(de, &attr); -+ else { -+ error = inode_change_ok(in, &attr); -+ if (!error) { -+ setattr_copy(in, &attr); -+ mark_inode_dirty(in); -+ } -+ } -+ } +diff -NurpP --minimal linux-3.18.5/kernel/vserver/helper.c linux-3.18.5-vs2.3.7.3/kernel/vserver/helper.c +--- linux-3.18.5/kernel/vserver/helper.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/vserver/helper.c 2015-01-19 10:58:31.000000000 +0000 +@@ -0,0 +1,242 @@ ++/* ++ * linux/kernel/vserver/helper.c ++ * ++ * Virtual Context Support ++ * ++ * Copyright (C) 2004-2007 Herbert Pötzl ++ * ++ * V0.01 basic helper ++ * ++ */ + -+out: -+ mutex_unlock(&in->i_mutex); -+ return error; -+} ++#include ++#include ++#include ++#include ++#include + -+int vc_set_iattr(void __user *data) ++ ++char vshelper_path[255] = "/sbin/vshelper"; ++ ++static int vshelper_init(struct subprocess_info *info, struct cred *new_cred) +{ -+ struct path path; -+ struct vcmd_ctx_iattr_v1 vc_data; -+ int ret; ++ current->flags &= ~PF_NO_SETAFFINITY; ++ return 0; ++} + -+ if (!capable(CAP_LINUX_IMMUTABLE)) -+ return -EPERM; -+ if (copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; ++static int vs_call_usermodehelper(char *path, char **argv, char **envp, int wait) ++{ ++ struct subprocess_info *info; ++ gfp_t gfp_mask = (wait == UMH_NO_WAIT) ? GFP_ATOMIC : GFP_KERNEL; + -+ ret = user_lpath(vc_data.name, &path); -+ if (!ret) { -+ ret = __vc_set_iattr(path.dentry, -+ &vc_data.tag, &vc_data.flags, &vc_data.mask); -+ path_put(&path); -+ } ++ info = call_usermodehelper_setup(path, argv, envp, gfp_mask, ++ vshelper_init, NULL, NULL); ++ if (info == NULL) ++ return -ENOMEM; + -+ if (copy_to_user(data, &vc_data, sizeof(vc_data))) -+ ret = -EFAULT; -+ return ret; ++ return call_usermodehelper_exec(info, wait); +} + -+#ifdef CONFIG_COMPAT -+ -+int vc_set_iattr_x32(void __user *data) ++static int do_vshelper(char *name, char *argv[], char *envp[], int sync) +{ -+ struct path path; -+ struct vcmd_ctx_iattr_v1_x32 vc_data; + int ret; + -+ if (!capable(CAP_LINUX_IMMUTABLE)) -+ return -EPERM; -+ if (copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; -+ -+ ret = user_lpath(compat_ptr(vc_data.name_ptr), &path); -+ if (!ret) { -+ ret = __vc_set_iattr(path.dentry, -+ &vc_data.tag, &vc_data.flags, &vc_data.mask); -+ path_put(&path); ++ if ((ret = vs_call_usermodehelper(name, argv, envp, ++ sync ? UMH_WAIT_PROC : UMH_WAIT_EXEC))) { ++ printk(KERN_WARNING "%s: (%s %s) returned %s with %d\n", ++ name, argv[1], argv[2], ++ sync ? "sync" : "async", ret); + } -+ -+ if (copy_to_user(data, &vc_data, sizeof(vc_data))) -+ ret = -EFAULT; ++ vxdprintk(VXD_CBIT(switch, 4), ++ "%s: (%s %s) returned %s with %d", ++ name, argv[1], argv[2], sync ? "sync" : "async", ret); + return ret; +} + -+#endif /* CONFIG_COMPAT */ ++/* ++ * vshelper path is set via /proc/sys ++ * invoked by vserver sys_reboot(), with ++ * the following arguments ++ * ++ * argv [0] = vshelper_path; ++ * argv [1] = action: "restart", "halt", "poweroff", ... ++ * argv [2] = context identifier ++ * ++ * envp [*] = type-specific parameters ++ */ + -+int vc_fset_iattr(uint32_t fd, void __user *data) ++long vs_reboot_helper(struct vx_info *vxi, int cmd, void __user *arg) +{ -+ struct file *filp; -+ struct vcmd_ctx_fiattr_v0 vc_data; ++ char id_buf[8], cmd_buf[16]; ++ char uid_buf[16], pid_buf[16]; + int ret; + -+ if (!capable(CAP_LINUX_IMMUTABLE)) -+ return -EPERM; -+ if (copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; -+ -+ filp = fget(fd); -+ if (!filp || !filp->f_dentry || !filp->f_dentry->d_inode) -+ return -EBADF; ++ char *argv[] = {vshelper_path, NULL, id_buf, 0}; ++ char *envp[] = {"HOME=/", "TERM=linux", ++ "PATH=/sbin:/usr/sbin:/bin:/usr/bin", ++ uid_buf, pid_buf, cmd_buf, 0}; + -+ ret = __vc_set_iattr(filp->f_dentry, &vc_data.tag, -+ &vc_data.flags, &vc_data.mask); ++ if (vx_info_state(vxi, VXS_HELPER)) ++ return -EAGAIN; ++ vxi->vx_state |= VXS_HELPER; + -+ fput(filp); ++ snprintf(id_buf, sizeof(id_buf), "%d", vxi->vx_id); + -+ if (copy_to_user(data, &vc_data, sizeof(vc_data))) -+ return -EFAULT; -+ return ret; -+} ++ snprintf(cmd_buf, sizeof(cmd_buf), "VS_CMD=%08x", cmd); ++ snprintf(uid_buf, sizeof(uid_buf), "VS_UID=%d", ++ from_kuid(&init_user_ns, current_uid())); ++ snprintf(pid_buf, sizeof(pid_buf), "VS_PID=%d", current->pid); + ++ switch (cmd) { ++ case LINUX_REBOOT_CMD_RESTART: ++ argv[1] = "restart"; ++ break; + -+enum { Opt_notagcheck, Opt_tag, Opt_notag, Opt_tagid, Opt_err }; ++ case LINUX_REBOOT_CMD_HALT: ++ argv[1] = "halt"; ++ break; + -+static match_table_t tokens = { -+ {Opt_notagcheck, "notagcheck"}, -+#ifdef CONFIG_PROPAGATE -+ {Opt_notag, "notag"}, -+ {Opt_tag, "tag"}, -+ {Opt_tagid, "tagid=%u"}, -+#endif -+ {Opt_err, NULL} -+}; ++ case LINUX_REBOOT_CMD_POWER_OFF: ++ argv[1] = "poweroff"; ++ break; + ++ case LINUX_REBOOT_CMD_SW_SUSPEND: ++ argv[1] = "swsusp"; ++ break; + -+static void __dx_parse_remove(char *string, char *opt) -+{ -+ char *p = strstr(string, opt); -+ char *q = p; ++ case LINUX_REBOOT_CMD_OOM: ++ argv[1] = "oom"; ++ break; + -+ if (p) { -+ while (*q != '\0' && *q != ',') -+ q++; -+ while (*q) -+ *p++ = *q++; -+ while (*p) -+ *p++ = '\0'; ++ default: ++ vxi->vx_state &= ~VXS_HELPER; ++ return 0; + } ++ ++ ret = do_vshelper(vshelper_path, argv, envp, 0); ++ vxi->vx_state &= ~VXS_HELPER; ++ __wakeup_vx_info(vxi); ++ return (ret) ? -EPERM : 0; +} + -+int dx_parse_tag(char *string, tag_t *tag, int remove, int *mnt_flags, -+ unsigned long *flags) ++ ++long vs_reboot(unsigned int cmd, void __user *arg) +{ -+ int set = 0; -+ substring_t args[MAX_OPT_ARGS]; -+ int token; -+ char *s, *p, *opts; -+#if defined(CONFIG_PROPAGATE) || defined(CONFIG_VSERVER_DEBUG) -+ int option = 0; -+#endif ++ struct vx_info *vxi = current_vx_info(); ++ long ret = 0; + -+ if (!string) -+ return 0; -+ s = kstrdup(string, GFP_KERNEL | GFP_ATOMIC); -+ if (!s) -+ return 0; ++ vxdprintk(VXD_CBIT(misc, 5), ++ "vs_reboot(%p[#%d],%u)", ++ vxi, vxi ? vxi->vx_id : 0, cmd); + -+ opts = s; -+ while ((p = strsep(&opts, ",")) != NULL) { -+ token = match_token(p, tokens, args); ++ ret = vs_reboot_helper(vxi, cmd, arg); ++ if (ret) ++ return ret; + -+ switch (token) { -+#ifdef CONFIG_PROPAGATE -+ case Opt_tag: -+ if (tag) -+ *tag = 0; -+ if (remove) -+ __dx_parse_remove(s, "tag"); -+ *mnt_flags |= MNT_TAGID; -+ set |= MNT_TAGID; -+ break; -+ case Opt_notag: -+ if (remove) -+ __dx_parse_remove(s, "notag"); -+ *mnt_flags |= MNT_NOTAG; -+ set |= MNT_NOTAG; -+ break; -+ case Opt_tagid: -+ if (tag && !match_int(args, &option)) -+ *tag = option; -+ if (remove) -+ __dx_parse_remove(s, "tagid"); -+ *mnt_flags |= MNT_TAGID; -+ set |= MNT_TAGID; -+ break; -+#endif /* CONFIG_PROPAGATE */ -+ case Opt_notagcheck: -+ if (remove) -+ __dx_parse_remove(s, "notagcheck"); -+ *flags |= MS_NOTAGCHECK; -+ set |= MS_NOTAGCHECK; ++ vxi->reboot_cmd = cmd; ++ if (vx_info_flags(vxi, VXF_REBOOT_KILL, 0)) { ++ switch (cmd) { ++ case LINUX_REBOOT_CMD_RESTART: ++ case LINUX_REBOOT_CMD_HALT: ++ case LINUX_REBOOT_CMD_POWER_OFF: ++ vx_info_kill(vxi, 0, SIGKILL); ++ vx_info_kill(vxi, 1, SIGKILL); ++ default: + break; + } -+ vxdprintk(VXD_CBIT(tag, 7), -+ "dx_parse_tag(" VS_Q("%s") "): %d:#%d", -+ p, token, option); + } -+ if (set) -+ strcpy(string, s); -+ kfree(s); -+ return set; ++ return 0; +} + -+#ifdef CONFIG_PROPAGATE ++long vs_oom_action(unsigned int cmd) ++{ ++ struct vx_info *vxi = current_vx_info(); ++ long ret = 0; + -+void __dx_propagate_tag(struct nameidata *nd, struct inode *inode) ++ vxdprintk(VXD_CBIT(misc, 5), ++ "vs_oom_action(%p[#%d],%u)", ++ vxi, vxi ? vxi->vx_id : 0, cmd); ++ ++ ret = vs_reboot_helper(vxi, cmd, NULL); ++ if (ret) ++ return ret; ++ ++ vxi->reboot_cmd = cmd; ++ if (vx_info_flags(vxi, VXF_REBOOT_KILL, 0)) { ++ vx_info_kill(vxi, 0, SIGKILL); ++ vx_info_kill(vxi, 1, SIGKILL); ++ } ++ return 0; ++} ++ ++/* ++ * argv [0] = vshelper_path; ++ * argv [1] = action: "startup", "shutdown" ++ * argv [2] = context identifier ++ * ++ * envp [*] = type-specific parameters ++ */ ++ ++long vs_state_change(struct vx_info *vxi, unsigned int cmd) +{ -+ tag_t new_tag = 0; -+ struct vfsmount *mnt; -+ int propagate; ++ char id_buf[8], cmd_buf[16]; ++ char *argv[] = {vshelper_path, NULL, id_buf, 0}; ++ char *envp[] = {"HOME=/", "TERM=linux", ++ "PATH=/sbin:/usr/sbin:/bin:/usr/bin", cmd_buf, 0}; + -+ if (!nd) -+ return; -+ mnt = nd->path.mnt; -+ if (!mnt) -+ return; ++ if (!vx_info_flags(vxi, VXF_SC_HELPER, 0)) ++ return 0; + -+ propagate = (mnt->mnt_flags & MNT_TAGID); -+ if (propagate) -+ new_tag = mnt->mnt_tag; ++ snprintf(id_buf, sizeof(id_buf), "%d", vxi->vx_id); ++ snprintf(cmd_buf, sizeof(cmd_buf), "VS_CMD=%08x", cmd); + -+ vxdprintk(VXD_CBIT(tag, 7), -+ "dx_propagate_tag(%p[#%lu.%d]): %d,%d", -+ inode, inode->i_ino, inode->i_tag, -+ new_tag, (propagate) ? 1 : 0); ++ switch (cmd) { ++ case VSC_STARTUP: ++ argv[1] = "startup"; ++ break; ++ case VSC_SHUTDOWN: ++ argv[1] = "shutdown"; ++ break; ++ default: ++ return 0; ++ } + -+ if (propagate) -+ i_tag_write(inode, new_tag); ++ return do_vshelper(vshelper_path, argv, envp, 1); +} + -+#include + -+EXPORT_SYMBOL_GPL(__dx_propagate_tag); ++/* ++ * argv [0] = vshelper_path; ++ * argv [1] = action: "netup", "netdown" ++ * argv [2] = context identifier ++ * ++ * envp [*] = type-specific parameters ++ */ + -+#endif /* CONFIG_PROPAGATE */ ++long vs_net_change(struct nx_info *nxi, unsigned int cmd) ++{ ++ char id_buf[8], cmd_buf[16]; ++ char *argv[] = {vshelper_path, NULL, id_buf, 0}; ++ char *envp[] = {"HOME=/", "TERM=linux", ++ "PATH=/sbin:/usr/sbin:/bin:/usr/bin", cmd_buf, 0}; + -diff -NurpP --minimal linux-3.7/kernel/vserver/limit.c linux-3.7-vs2.3.5.1/kernel/vserver/limit.c ---- linux-3.7/kernel/vserver/limit.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/limit.c 2012-12-12 13:08:45.000000000 +0000 -@@ -0,0 +1,345 @@ ++ if (!nx_info_flags(nxi, NXF_SC_HELPER, 0)) ++ return 0; ++ ++ snprintf(id_buf, sizeof(id_buf), "%d", nxi->nx_id); ++ snprintf(cmd_buf, sizeof(cmd_buf), "VS_CMD=%08x", cmd); ++ ++ switch (cmd) { ++ case VSC_NETUP: ++ argv[1] = "netup"; ++ break; ++ case VSC_NETDOWN: ++ argv[1] = "netdown"; ++ break; ++ default: ++ return 0; ++ } ++ ++ return do_vshelper(vshelper_path, argv, envp, 1); ++} ++ +diff -NurpP --minimal linux-3.18.5/kernel/vserver/history.c linux-3.18.5-vs2.3.7.3/kernel/vserver/history.c +--- linux-3.18.5/kernel/vserver/history.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/vserver/history.c 2015-01-19 10:58:31.000000000 +0000 +@@ -0,0 +1,258 @@ +/* -+ * linux/kernel/vserver/limit.c ++ * kernel/vserver/history.c + * -+ * Virtual Server: Context Limits ++ * Virtual Context History Backtrace + * -+ * Copyright (C) 2004-2010 Herbert Pötzl ++ * Copyright (C) 2004-2007 Herbert Pötzl + * -+ * V0.01 broken out from vcontext V0.05 -+ * V0.02 changed vcmds to vxi arg -+ * V0.03 added memory cgroup support ++ * V0.01 basic structure ++ * V0.02 hash/unhash and trace ++ * V0.03 preemption fixes + * + */ + -+#include +#include -+#include -+#include -+#include -+#include -+#include -+ +#include + ++#include ++#include ++#include ++#include + -+const char *vlimit_name[NUM_LIMITS] = { -+ [RLIMIT_CPU] = "CPU", -+ [RLIMIT_NPROC] = "NPROC", -+ [RLIMIT_NOFILE] = "NOFILE", -+ [RLIMIT_LOCKS] = "LOCKS", -+ [RLIMIT_SIGPENDING] = "SIGP", -+ [RLIMIT_MSGQUEUE] = "MSGQ", + -+ [VLIMIT_NSOCK] = "NSOCK", -+ [VLIMIT_OPENFD] = "OPENFD", -+ [VLIMIT_SHMEM] = "SHMEM", -+ [VLIMIT_DENTRY] = "DENTRY", ++#ifdef CONFIG_VSERVER_HISTORY ++#define VXH_SIZE CONFIG_VSERVER_HISTORY_SIZE ++#else ++#define VXH_SIZE 64 ++#endif ++ ++struct _vx_history { ++ unsigned int counter; ++ ++ struct _vx_hist_entry entry[VXH_SIZE + 1]; +}; + -+EXPORT_SYMBOL_GPL(vlimit_name); + -+#define MASK_ENTRY(x) (1 << (x)) ++DEFINE_PER_CPU(struct _vx_history, vx_history_buffer); + -+const struct vcmd_ctx_rlimit_mask_v0 vlimit_mask = { -+ /* minimum */ -+ 0 -+ , /* softlimit */ -+ 0 -+ , /* maximum */ -+ MASK_ENTRY( RLIMIT_NPROC ) | -+ MASK_ENTRY( RLIMIT_NOFILE ) | -+ MASK_ENTRY( RLIMIT_LOCKS ) | -+ MASK_ENTRY( RLIMIT_MSGQUEUE ) | ++unsigned volatile int vxh_active = 1; + -+ MASK_ENTRY( VLIMIT_NSOCK ) | -+ MASK_ENTRY( VLIMIT_OPENFD ) | -+ MASK_ENTRY( VLIMIT_SHMEM ) | -+ MASK_ENTRY( VLIMIT_DENTRY ) | -+ 0 -+}; -+ /* accounting only */ -+uint32_t account_mask = -+ MASK_ENTRY( VLIMIT_SEMARY ) | -+ MASK_ENTRY( VLIMIT_NSEMS ) | -+ MASK_ENTRY( VLIMIT_MAPPED ) | -+ 0; ++static atomic_t sequence = ATOMIC_INIT(0); + + -+static int is_valid_vlimit(int id) -+{ -+ uint32_t mask = vlimit_mask.minimum | -+ vlimit_mask.softlimit | vlimit_mask.maximum; -+ return mask & (1 << id); -+} ++/* vxh_advance() + -+static int is_accounted_vlimit(int id) ++ * requires disabled preemption */ ++ ++struct _vx_hist_entry *vxh_advance(void *loc) +{ -+ if (is_valid_vlimit(id)) -+ return 1; -+ return account_mask & (1 << id); -+} ++ unsigned int cpu = smp_processor_id(); ++ struct _vx_history *hist = &per_cpu(vx_history_buffer, cpu); ++ struct _vx_hist_entry *entry; ++ unsigned int index; + ++ index = vxh_active ? (hist->counter++ % VXH_SIZE) : VXH_SIZE; ++ entry = &hist->entry[index]; + -+static inline uint64_t vc_get_soft(struct vx_info *vxi, int id) -+{ -+ rlim_t limit = __rlim_soft(&vxi->limit, id); -+ return VX_VLIM(limit); ++ entry->seq = atomic_inc_return(&sequence); ++ entry->loc = loc; ++ return entry; +} + -+static inline uint64_t vc_get_hard(struct vx_info *vxi, int id) -+{ -+ rlim_t limit = __rlim_hard(&vxi->limit, id); -+ return VX_VLIM(limit); -+} ++EXPORT_SYMBOL_GPL(vxh_advance); + -+static int do_get_rlimit(struct vx_info *vxi, uint32_t id, -+ uint64_t *minimum, uint64_t *softlimit, uint64_t *maximum) -+{ -+ if (!is_valid_vlimit(id)) -+ return -EINVAL; + -+ if (minimum) -+ *minimum = CRLIM_UNSET; -+ if (softlimit) -+ *softlimit = vc_get_soft(vxi, id); -+ if (maximum) -+ *maximum = vc_get_hard(vxi, id); -+ return 0; -+} ++#define VXH_LOC_FMTS "(#%04x,*%d):%p" + -+int vc_get_rlimit(struct vx_info *vxi, void __user *data) -+{ -+ struct vcmd_ctx_rlimit_v0 vc_data; -+ int ret; ++#define VXH_LOC_ARGS(e) (e)->seq, cpu, (e)->loc + -+ if (copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; + -+ ret = do_get_rlimit(vxi, vc_data.id, -+ &vc_data.minimum, &vc_data.softlimit, &vc_data.maximum); -+ if (ret) -+ return ret; ++#define VXH_VXI_FMTS "%p[#%d,%d.%d]" + -+ if (copy_to_user(data, &vc_data, sizeof(vc_data))) -+ return -EFAULT; -+ return 0; -+} ++#define VXH_VXI_ARGS(e) (e)->vxi.ptr, \ ++ (e)->vxi.ptr ? (e)->vxi.xid : 0, \ ++ (e)->vxi.ptr ? (e)->vxi.usecnt : 0, \ ++ (e)->vxi.ptr ? (e)->vxi.tasks : 0 + -+static int do_set_rlimit(struct vx_info *vxi, uint32_t id, -+ uint64_t minimum, uint64_t softlimit, uint64_t maximum) ++void vxh_dump_entry(struct _vx_hist_entry *e, unsigned cpu) +{ -+ if (!is_valid_vlimit(id)) -+ return -EINVAL; ++ switch (e->type) { ++ case VXH_THROW_OOPS: ++ printk( VXH_LOC_FMTS " oops \n", VXH_LOC_ARGS(e)); ++ break; + -+ if (maximum != CRLIM_KEEP) -+ __rlim_hard(&vxi->limit, id) = VX_RLIM(maximum); -+ if (softlimit != CRLIM_KEEP) -+ __rlim_soft(&vxi->limit, id) = VX_RLIM(softlimit); ++ case VXH_GET_VX_INFO: ++ case VXH_PUT_VX_INFO: ++ printk( VXH_LOC_FMTS " %s_vx_info " VXH_VXI_FMTS "\n", ++ VXH_LOC_ARGS(e), ++ (e->type == VXH_GET_VX_INFO) ? "get" : "put", ++ VXH_VXI_ARGS(e)); ++ break; + -+ /* clamp soft limit */ -+ if (__rlim_soft(&vxi->limit, id) > __rlim_hard(&vxi->limit, id)) -+ __rlim_soft(&vxi->limit, id) = __rlim_hard(&vxi->limit, id); ++ case VXH_INIT_VX_INFO: ++ case VXH_SET_VX_INFO: ++ case VXH_CLR_VX_INFO: ++ printk( VXH_LOC_FMTS " %s_vx_info " VXH_VXI_FMTS " @%p\n", ++ VXH_LOC_ARGS(e), ++ (e->type == VXH_INIT_VX_INFO) ? "init" : ++ ((e->type == VXH_SET_VX_INFO) ? "set" : "clr"), ++ VXH_VXI_ARGS(e), e->sc.data); ++ break; + -+ return 0; -+} ++ case VXH_CLAIM_VX_INFO: ++ case VXH_RELEASE_VX_INFO: ++ printk( VXH_LOC_FMTS " %s_vx_info " VXH_VXI_FMTS " @%p\n", ++ VXH_LOC_ARGS(e), ++ (e->type == VXH_CLAIM_VX_INFO) ? "claim" : "release", ++ VXH_VXI_ARGS(e), e->sc.data); ++ break; + -+int vc_set_rlimit(struct vx_info *vxi, void __user *data) -+{ -+ struct vcmd_ctx_rlimit_v0 vc_data; ++ case VXH_ALLOC_VX_INFO: ++ case VXH_DEALLOC_VX_INFO: ++ printk( VXH_LOC_FMTS " %s_vx_info " VXH_VXI_FMTS "\n", ++ VXH_LOC_ARGS(e), ++ (e->type == VXH_ALLOC_VX_INFO) ? "alloc" : "dealloc", ++ VXH_VXI_ARGS(e)); ++ break; + -+ if (copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; ++ case VXH_HASH_VX_INFO: ++ case VXH_UNHASH_VX_INFO: ++ printk( VXH_LOC_FMTS " __%s_vx_info " VXH_VXI_FMTS "\n", ++ VXH_LOC_ARGS(e), ++ (e->type == VXH_HASH_VX_INFO) ? "hash" : "unhash", ++ VXH_VXI_ARGS(e)); ++ break; + -+ return do_set_rlimit(vxi, vc_data.id, -+ vc_data.minimum, vc_data.softlimit, vc_data.maximum); ++ case VXH_LOC_VX_INFO: ++ case VXH_LOOKUP_VX_INFO: ++ case VXH_CREATE_VX_INFO: ++ printk( VXH_LOC_FMTS " __%s_vx_info [#%d] -> " VXH_VXI_FMTS "\n", ++ VXH_LOC_ARGS(e), ++ (e->type == VXH_CREATE_VX_INFO) ? "create" : ++ ((e->type == VXH_LOC_VX_INFO) ? "loc" : "lookup"), ++ e->ll.arg, VXH_VXI_ARGS(e)); ++ break; ++ } +} + -+#ifdef CONFIG_IA32_EMULATION -+ -+int vc_set_rlimit_x32(struct vx_info *vxi, void __user *data) ++static void __vxh_dump_history(void) +{ -+ struct vcmd_ctx_rlimit_v0_x32 vc_data; ++ unsigned int i, cpu; + -+ if (copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; ++ printk("History:\tSEQ: %8x\tNR_CPUS: %d\n", ++ atomic_read(&sequence), NR_CPUS); + -+ return do_set_rlimit(vxi, vc_data.id, -+ vc_data.minimum, vc_data.softlimit, vc_data.maximum); ++ for (i = 0; i < VXH_SIZE; i++) { ++ for_each_online_cpu(cpu) { ++ struct _vx_history *hist = ++ &per_cpu(vx_history_buffer, cpu); ++ unsigned int index = (hist->counter - i) % VXH_SIZE; ++ struct _vx_hist_entry *entry = &hist->entry[index]; ++ ++ vxh_dump_entry(entry, cpu); ++ } ++ } +} + -+int vc_get_rlimit_x32(struct vx_info *vxi, void __user *data) ++void vxh_dump_history(void) +{ -+ struct vcmd_ctx_rlimit_v0_x32 vc_data; -+ int ret; -+ -+ if (copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; -+ -+ ret = do_get_rlimit(vxi, vc_data.id, -+ &vc_data.minimum, &vc_data.softlimit, &vc_data.maximum); -+ if (ret) -+ return ret; -+ -+ if (copy_to_user(data, &vc_data, sizeof(vc_data))) -+ return -EFAULT; -+ return 0; ++ vxh_active = 0; ++#ifdef CONFIG_SMP ++ local_irq_enable(); ++ smp_send_stop(); ++ local_irq_disable(); ++#endif ++ __vxh_dump_history(); +} + -+#endif /* CONFIG_IA32_EMULATION */ ++ ++/* vserver syscall commands below here */ + + -+int vc_get_rlimit_mask(uint32_t id, void __user *data) ++int vc_dump_history(uint32_t id) +{ -+ if (copy_to_user(data, &vlimit_mask, sizeof(vlimit_mask))) -+ return -EFAULT; ++ vxh_active = 0; ++ __vxh_dump_history(); ++ vxh_active = 1; ++ + return 0; +} + + -+static inline void vx_reset_hits(struct _vx_limit *limit) ++int do_read_history(struct __user _vx_hist_entry *data, ++ int cpu, uint32_t *index, uint32_t *count) +{ -+ int lim; ++ int pos, ret = 0; ++ struct _vx_history *hist = &per_cpu(vx_history_buffer, cpu); ++ int end = hist->counter; ++ int start = end - VXH_SIZE + 2; ++ int idx = *index; + -+ for (lim = 0; lim < NUM_LIMITS; lim++) { -+ atomic_set(&__rlim_lhit(limit, lim), 0); ++ /* special case: get current pos */ ++ if (!*count) { ++ *index = end; ++ return 0; + } -+} + -+int vc_reset_hits(struct vx_info *vxi, void __user *data) -+{ -+ vx_reset_hits(&vxi->limit); -+ return 0; -+} ++ /* have we lost some data? */ ++ if (idx < start) ++ idx = start; + -+static inline void vx_reset_minmax(struct _vx_limit *limit) -+{ -+ rlim_t value; -+ int lim; ++ for (pos = 0; (pos < *count) && (idx < end); pos++, idx++) { ++ struct _vx_hist_entry *entry = ++ &hist->entry[idx % VXH_SIZE]; + -+ for (lim = 0; lim < NUM_LIMITS; lim++) { -+ value = __rlim_get(limit, lim); -+ __rlim_rmax(limit, lim) = value; -+ __rlim_rmin(limit, lim) = value; ++ /* send entry to userspace */ ++ ret = copy_to_user(&data[pos], entry, sizeof(*entry)); ++ if (ret) ++ break; + } ++ /* save new index and count */ ++ *index = idx; ++ *count = pos; ++ return ret ? ret : (*index < end); +} + -+int vc_reset_minmax(struct vx_info *vxi, void __user *data) ++int vc_read_history(uint32_t id, void __user *data) +{ -+ vx_reset_minmax(&vxi->limit); -+ return 0; -+} ++ struct vcmd_read_history_v0 vc_data; ++ int ret; + -+ -+int vc_rlimit_stat(struct vx_info *vxi, void __user *data) -+{ -+ struct vcmd_rlimit_stat_v0 vc_data; -+ struct _vx_limit *limit = &vxi->limit; -+ int id; ++ if (id >= NR_CPUS) ++ return -EINVAL; + + if (copy_from_user(&vc_data, data, sizeof(vc_data))) + return -EFAULT; + -+ id = vc_data.id; -+ if (!is_accounted_vlimit(id)) ++ ret = do_read_history((struct __user _vx_hist_entry *)vc_data.data, ++ id, &vc_data.index, &vc_data.count); ++ ++ if (copy_to_user(data, &vc_data, sizeof(vc_data))) ++ return -EFAULT; ++ return ret; ++} ++ ++#ifdef CONFIG_COMPAT ++ ++int vc_read_history_x32(uint32_t id, void __user *data) ++{ ++ struct vcmd_read_history_v0_x32 vc_data; ++ int ret; ++ ++ if (id >= NR_CPUS) + return -EINVAL; + -+ vx_limit_fixup(limit, id); -+ vc_data.hits = atomic_read(&__rlim_lhit(limit, id)); -+ vc_data.value = __rlim_get(limit, id); -+ vc_data.minimum = __rlim_rmin(limit, id); -+ vc_data.maximum = __rlim_rmax(limit, id); ++ if (copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; ++ ++ ret = do_read_history((struct __user _vx_hist_entry *) ++ compat_ptr(vc_data.data_ptr), ++ id, &vc_data.index, &vc_data.count); + + if (copy_to_user(data, &vc_data, sizeof(vc_data))) + return -EFAULT; -+ return 0; ++ return ret; +} + ++#endif /* CONFIG_COMPAT */ + -+void vx_vsi_meminfo(struct sysinfo *val) +diff -NurpP --minimal linux-3.18.5/kernel/vserver/inet.c linux-3.18.5-vs2.3.7.3/kernel/vserver/inet.c +--- linux-3.18.5/kernel/vserver/inet.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/vserver/inet.c 2015-01-19 10:58:31.000000000 +0000 +@@ -0,0 +1,236 @@ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++ ++int nx_v4_addr_conflict(struct nx_info *nxi1, struct nx_info *nxi2) +{ -+#ifdef CONFIG_MEMCG -+ struct mem_cgroup *mcg; -+ u64 res_limit, res_usage; ++ int ret = 0; + -+ rcu_read_lock(); -+ mcg = mem_cgroup_from_task(current); -+ rcu_read_unlock(); -+ if (!mcg) -+ goto out; ++ if (!nxi1 || !nxi2 || nxi1 == nxi2) ++ ret = 1; ++ else { ++ struct nx_addr_v4 *ptr; ++ unsigned long irqflags; + -+ res_limit = mem_cgroup_res_read_u64(mcg, RES_LIMIT); -+ res_usage = mem_cgroup_res_read_u64(mcg, RES_USAGE); ++ spin_lock_irqsave(&nxi1->addr_lock, irqflags); ++ for (ptr = &nxi1->v4; ptr; ptr = ptr->next) { ++ if (v4_nx_addr_in_nx_info(nxi2, ptr, -1)) { ++ ret = 1; ++ break; ++ } ++ } ++ spin_unlock_irqrestore(&nxi1->addr_lock, irqflags); ++ } + -+ if (res_limit != RESOURCE_MAX) -+ val->totalram = (res_limit >> PAGE_SHIFT); -+ val->freeram = val->totalram - (res_usage >> PAGE_SHIFT); -+ val->bufferram = 0; -+ val->totalhigh = 0; -+ val->freehigh = 0; -+out: -+#endif /* CONFIG_MEMCG */ -+ return; ++ vxdprintk(VXD_CBIT(net, 2), ++ "nx_v4_addr_conflict(%p,%p): %d", ++ nxi1, nxi2, ret); ++ ++ return ret; +} + -+void vx_vsi_swapinfo(struct sysinfo *val) -+{ -+#ifdef CONFIG_MEMCG -+#ifdef CONFIG_MEMCG_SWAP -+ struct mem_cgroup *mcg; -+ u64 res_limit, res_usage, memsw_limit, memsw_usage; -+ s64 swap_limit, swap_usage; + -+ rcu_read_lock(); -+ mcg = mem_cgroup_from_task(current); -+ rcu_read_unlock(); -+ if (!mcg) -+ goto out; ++#ifdef CONFIG_IPV6 + -+ res_limit = mem_cgroup_res_read_u64(mcg, RES_LIMIT); -+ res_usage = mem_cgroup_res_read_u64(mcg, RES_USAGE); -+ memsw_limit = mem_cgroup_memsw_read_u64(mcg, RES_LIMIT); -+ memsw_usage = mem_cgroup_memsw_read_u64(mcg, RES_USAGE); ++int nx_v6_addr_conflict(struct nx_info *nxi1, struct nx_info *nxi2) ++{ ++ int ret = 0; + -+ /* memory unlimited */ -+ if (res_limit == RESOURCE_MAX) -+ goto out; ++ if (!nxi1 || !nxi2 || nxi1 == nxi2) ++ ret = 1; ++ else { ++ struct nx_addr_v6 *ptr; ++ unsigned long irqflags; + -+ swap_limit = memsw_limit - res_limit; -+ /* we have a swap limit? */ -+ if (memsw_limit != RESOURCE_MAX) -+ val->totalswap = swap_limit >> PAGE_SHIFT; ++ spin_lock_irqsave(&nxi1->addr_lock, irqflags); ++ for (ptr = &nxi1->v6; ptr; ptr = ptr->next) { ++ if (v6_nx_addr_in_nx_info(nxi2, ptr, -1)) { ++ ret = 1; ++ break; ++ } ++ } ++ spin_unlock_irqrestore(&nxi1->addr_lock, irqflags); ++ } + -+ /* calculate swap part */ -+ swap_usage = (memsw_usage > res_usage) ? -+ memsw_usage - res_usage : 0; ++ vxdprintk(VXD_CBIT(net, 2), ++ "nx_v6_addr_conflict(%p,%p): %d", ++ nxi1, nxi2, ret); + -+ /* total shown minus usage gives free swap */ -+ val->freeswap = (swap_usage < swap_limit) ? -+ val->totalswap - (swap_usage >> PAGE_SHIFT) : 0; -+out: -+#else /* !CONFIG_MEMCG_SWAP */ -+ val->totalswap = 0; -+ val->freeswap = 0; -+#endif /* !CONFIG_MEMCG_SWAP */ -+#endif /* CONFIG_MEMCG */ -+ return; ++ return ret; +} + -+long vx_vsi_cached(struct sysinfo *val) ++#endif ++ ++int v4_dev_in_nx_info(struct net_device *dev, struct nx_info *nxi) +{ -+ long cache = 0; -+#ifdef CONFIG_MEMCG -+ struct mem_cgroup *mcg; ++ struct in_device *in_dev; ++ struct in_ifaddr **ifap; ++ struct in_ifaddr *ifa; ++ int ret = 0; + -+ rcu_read_lock(); -+ mcg = mem_cgroup_from_task(current); -+ rcu_read_unlock(); -+ if (!mcg) ++ if (!dev) ++ goto out; ++ in_dev = in_dev_get(dev); ++ if (!in_dev) + goto out; + -+ cache = mem_cgroup_stat_read_cache(mcg); ++ for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL; ++ ifap = &ifa->ifa_next) { ++ if (v4_addr_in_nx_info(nxi, ifa->ifa_local, NXA_MASK_SHOW)) { ++ ret = 1; ++ break; ++ } ++ } ++ in_dev_put(in_dev); +out: -+#endif -+ return cache; ++ return ret; +} + -diff -NurpP --minimal linux-3.7/kernel/vserver/limit_init.h linux-3.7-vs2.3.5.1/kernel/vserver/limit_init.h ---- linux-3.7/kernel/vserver/limit_init.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/limit_init.h 2012-12-11 15:56:33.000000000 +0000 -@@ -0,0 +1,31 @@ + ++#ifdef CONFIG_IPV6 + -+static inline void vx_info_init_limit(struct _vx_limit *limit) ++int v6_dev_in_nx_info(struct net_device *dev, struct nx_info *nxi) +{ -+ int lim; ++ struct inet6_dev *in_dev; ++ struct inet6_ifaddr *ifa; ++ int ret = 0; + -+ for (lim = 0; lim < NUM_LIMITS; lim++) { -+ __rlim_soft(limit, lim) = RLIM_INFINITY; -+ __rlim_hard(limit, lim) = RLIM_INFINITY; -+ __rlim_set(limit, lim, 0); -+ atomic_set(&__rlim_lhit(limit, lim), 0); -+ __rlim_rmin(limit, lim) = 0; -+ __rlim_rmax(limit, lim) = 0; ++ if (!dev) ++ goto out; ++ in_dev = in6_dev_get(dev); ++ if (!in_dev) ++ goto out; ++ ++ // for (ifap = &in_dev->addr_list; (ifa = *ifap) != NULL; ++ list_for_each_entry(ifa, &in_dev->addr_list, if_list) { ++ if (v6_addr_in_nx_info(nxi, &ifa->addr, -1)) { ++ ret = 1; ++ break; ++ } + } ++ in6_dev_put(in_dev); ++out: ++ return ret; +} + -+static inline void vx_info_exit_limit(struct _vx_limit *limit) ++#endif ++ ++int dev_in_nx_info(struct net_device *dev, struct nx_info *nxi) +{ -+ rlim_t value; -+ int lim; ++ int ret = 1; + -+ for (lim = 0; lim < NUM_LIMITS; lim++) { -+ if ((1 << lim) & VLIM_NOCHECK) -+ continue; -+ value = __rlim_get(limit, lim); -+ vxwprintk_xid(value, -+ "!!! limit: %p[%s,%d] = %ld on exit.", -+ limit, vlimit_name[lim], lim, (long)value); -+ } ++ if (!nxi) ++ goto out; ++ if (nxi->v4.type && v4_dev_in_nx_info(dev, nxi)) ++ goto out; ++#ifdef CONFIG_IPV6 ++ ret = 2; ++ if (nxi->v6.type && v6_dev_in_nx_info(dev, nxi)) ++ goto out; ++#endif ++ ret = 0; ++out: ++ vxdprintk(VXD_CBIT(net, 3), ++ "dev_in_nx_info(%p,%p[#%d]) = %d", ++ dev, nxi, nxi ? nxi->nx_id : 0, ret); ++ return ret; +} + -diff -NurpP --minimal linux-3.7/kernel/vserver/limit_proc.h linux-3.7-vs2.3.5.1/kernel/vserver/limit_proc.h ---- linux-3.7/kernel/vserver/limit_proc.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/limit_proc.h 2012-12-11 15:56:33.000000000 +0000 -@@ -0,0 +1,57 @@ -+#ifndef _VX_LIMIT_PROC_H -+#define _VX_LIMIT_PROC_H ++struct rtable *ip_v4_find_src(struct net *net, struct nx_info *nxi, ++ struct flowi4 *fl4) ++{ ++ struct rtable *rt; + -+#include ++ if (!nxi) ++ return NULL; + ++ /* FIXME: handle lback only case */ ++ if (!NX_IPV4(nxi)) ++ return ERR_PTR(-EPERM); + -+#define VX_LIMIT_FMT ":\t%8ld\t%8ld/%8ld\t%8lld/%8lld\t%6d\n" -+#define VX_LIMIT_TOP \ -+ "Limit\t current\t min/max\t\t soft/hard\t\thits\n" ++ vxdprintk(VXD_CBIT(net, 4), ++ "ip_v4_find_src(%p[#%u]) " NIPQUAD_FMT " -> " NIPQUAD_FMT, ++ nxi, nxi ? nxi->nx_id : 0, ++ NIPQUAD(fl4->saddr), NIPQUAD(fl4->daddr)); + -+#define VX_LIMIT_ARG(r) \ -+ (unsigned long)__rlim_get(limit, r), \ -+ (unsigned long)__rlim_rmin(limit, r), \ -+ (unsigned long)__rlim_rmax(limit, r), \ -+ VX_VLIM(__rlim_soft(limit, r)), \ -+ VX_VLIM(__rlim_hard(limit, r)), \ -+ atomic_read(&__rlim_lhit(limit, r)) ++ /* single IP is unconditional */ ++ if (nx_info_flags(nxi, NXF_SINGLE_IP, 0) && ++ (fl4->saddr == INADDR_ANY)) ++ fl4->saddr = nxi->v4.ip[0].s_addr; + -+static inline int vx_info_proc_limit(struct _vx_limit *limit, char *buffer) -+{ -+ vx_limit_fixup(limit, -1); -+ return sprintf(buffer, VX_LIMIT_TOP -+ "PROC" VX_LIMIT_FMT -+ "VM" VX_LIMIT_FMT -+ "VML" VX_LIMIT_FMT -+ "RSS" VX_LIMIT_FMT -+ "ANON" VX_LIMIT_FMT -+ "RMAP" VX_LIMIT_FMT -+ "FILES" VX_LIMIT_FMT -+ "OFD" VX_LIMIT_FMT -+ "LOCKS" VX_LIMIT_FMT -+ "SOCK" VX_LIMIT_FMT -+ "MSGQ" VX_LIMIT_FMT -+ "SHM" VX_LIMIT_FMT -+ "SEMA" VX_LIMIT_FMT -+ "SEMS" VX_LIMIT_FMT -+ "DENT" VX_LIMIT_FMT, -+ VX_LIMIT_ARG(RLIMIT_NPROC), -+ VX_LIMIT_ARG(RLIMIT_AS), -+ VX_LIMIT_ARG(RLIMIT_MEMLOCK), -+ VX_LIMIT_ARG(RLIMIT_RSS), -+ VX_LIMIT_ARG(VLIMIT_ANON), -+ VX_LIMIT_ARG(VLIMIT_MAPPED), -+ VX_LIMIT_ARG(RLIMIT_NOFILE), -+ VX_LIMIT_ARG(VLIMIT_OPENFD), -+ VX_LIMIT_ARG(RLIMIT_LOCKS), -+ VX_LIMIT_ARG(VLIMIT_NSOCK), -+ VX_LIMIT_ARG(RLIMIT_MSGQUEUE), -+ VX_LIMIT_ARG(VLIMIT_SHMEM), -+ VX_LIMIT_ARG(VLIMIT_SEMARY), -+ VX_LIMIT_ARG(VLIMIT_NSEMS), -+ VX_LIMIT_ARG(VLIMIT_DENTRY)); -+} ++ if (fl4->saddr == INADDR_ANY) { ++ struct nx_addr_v4 *ptr; ++ __be32 found = 0; + -+#endif /* _VX_LIMIT_PROC_H */ ++ rt = __ip_route_output_key(net, fl4); ++ if (!IS_ERR(rt)) { ++ found = fl4->saddr; ++ ip_rt_put(rt); ++ vxdprintk(VXD_CBIT(net, 4), ++ "ip_v4_find_src(%p[#%u]) rok[%u]: " NIPQUAD_FMT, ++ nxi, nxi ? nxi->nx_id : 0, fl4->flowi4_oif, NIPQUAD(found)); ++ if (v4_addr_in_nx_info(nxi, found, NXA_MASK_BIND)) ++ goto found; ++ } ++ ++ WARN_ON_ONCE(in_irq()); ++ spin_lock_bh(&nxi->addr_lock); ++ for (ptr = &nxi->v4; ptr; ptr = ptr->next) { ++ __be32 primary = ptr->ip[0].s_addr; ++ __be32 mask = ptr->mask.s_addr; ++ __be32 neta = primary & mask; ++ ++ vxdprintk(VXD_CBIT(net, 4), "ip_v4_find_src(%p[#%u]) chk: " ++ NIPQUAD_FMT "/" NIPQUAD_FMT "/" NIPQUAD_FMT, ++ nxi, nxi ? nxi->nx_id : 0, NIPQUAD(primary), ++ NIPQUAD(mask), NIPQUAD(neta)); ++ if ((found & mask) != neta) ++ continue; ++ ++ fl4->saddr = primary; ++ rt = __ip_route_output_key(net, fl4); ++ vxdprintk(VXD_CBIT(net, 4), ++ "ip_v4_find_src(%p[#%u]) rok[%u]: " NIPQUAD_FMT, ++ nxi, nxi ? nxi->nx_id : 0, fl4->flowi4_oif, NIPQUAD(primary)); ++ if (!IS_ERR(rt)) { ++ found = fl4->saddr; ++ ip_rt_put(rt); ++ if (found == primary) ++ goto found_unlock; ++ } ++ } ++ /* still no source ip? */ ++ found = ipv4_is_loopback(fl4->daddr) ++ ? IPI_LOOPBACK : nxi->v4.ip[0].s_addr; ++ found_unlock: ++ spin_unlock_bh(&nxi->addr_lock); ++ found: ++ /* assign src ip to flow */ ++ fl4->saddr = found; ++ ++ } else { ++ if (!v4_addr_in_nx_info(nxi, fl4->saddr, NXA_MASK_BIND)) ++ return ERR_PTR(-EPERM); ++ } ++ ++ if (nx_info_flags(nxi, NXF_LBACK_REMAP, 0)) { ++ if (ipv4_is_loopback(fl4->daddr)) ++ fl4->daddr = nxi->v4_lback.s_addr; ++ if (ipv4_is_loopback(fl4->saddr)) ++ fl4->saddr = nxi->v4_lback.s_addr; ++ } else if (ipv4_is_loopback(fl4->daddr) && ++ !nx_info_flags(nxi, NXF_LBACK_ALLOW, 0)) ++ return ERR_PTR(-EPERM); ++ ++ return NULL; ++} + ++EXPORT_SYMBOL_GPL(ip_v4_find_src); + -diff -NurpP --minimal linux-3.7/kernel/vserver/network.c linux-3.7-vs2.3.5.1/kernel/vserver/network.c ---- linux-3.7/kernel/vserver/network.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/network.c 2012-12-11 15:56:33.000000000 +0000 -@@ -0,0 +1,912 @@ +diff -NurpP --minimal linux-3.18.5/kernel/vserver/init.c linux-3.18.5-vs2.3.7.3/kernel/vserver/init.c +--- linux-3.18.5/kernel/vserver/init.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/vserver/init.c 2015-01-19 10:58:31.000000000 +0000 +@@ -0,0 +1,45 @@ +/* -+ * linux/kernel/vserver/network.c ++ * linux/kernel/init.c + * -+ * Virtual Server: Network Support ++ * Virtual Server Init + * -+ * Copyright (C) 2003-2007 Herbert Pötzl ++ * Copyright (C) 2004-2007 Herbert Pötzl + * -+ * V0.01 broken out from vcontext V0.05 -+ * V0.02 cleaned up implementation -+ * V0.03 added equiv nx commands -+ * V0.04 switch to RCU based hash -+ * V0.05 and back to locking again -+ * V0.06 changed vcmds to nxi arg -+ * V0.07 have __create claim() the nxi ++ * V0.01 basic structure + * + */ + -+#include -+#include -+#include ++#include + -+#include -+#include -+#include ++int vserver_register_sysctl(void); ++void vserver_unregister_sysctl(void); + + -+atomic_t nx_global_ctotal = ATOMIC_INIT(0); -+atomic_t nx_global_cactive = ATOMIC_INIT(0); ++static int __init init_vserver(void) ++{ ++ int ret = 0; + -+static struct kmem_cache *nx_addr_v4_cachep = NULL; -+static struct kmem_cache *nx_addr_v6_cachep = NULL; ++#ifdef CONFIG_VSERVER_DEBUG ++ vserver_register_sysctl(); ++#endif ++ return ret; ++} + + -+static int __init init_network(void) ++static void __exit exit_vserver(void) +{ -+ nx_addr_v4_cachep = kmem_cache_create("nx_v4_addr_cache", -+ sizeof(struct nx_addr_v4), 0, -+ SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL); -+ nx_addr_v6_cachep = kmem_cache_create("nx_v6_addr_cache", -+ sizeof(struct nx_addr_v6), 0, -+ SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL); -+ return 0; ++ ++#ifdef CONFIG_VSERVER_DEBUG ++ vserver_unregister_sysctl(); ++#endif ++ return; +} + ++/* FIXME: GFP_ZONETYPES gone ++long vx_slab[GFP_ZONETYPES]; */ ++long vx_area; + -+/* __alloc_nx_addr_v4() */ + -+static inline struct nx_addr_v4 *__alloc_nx_addr_v4(void) -+{ -+ struct nx_addr_v4 *nxa = kmem_cache_alloc( -+ nx_addr_v4_cachep, GFP_KERNEL); ++module_init(init_vserver); ++module_exit(exit_vserver); + -+ if (!IS_ERR(nxa)) -+ memset(nxa, 0, sizeof(*nxa)); -+ return nxa; -+} +diff -NurpP --minimal linux-3.18.5/kernel/vserver/inode.c linux-3.18.5-vs2.3.7.3/kernel/vserver/inode.c +--- linux-3.18.5/kernel/vserver/inode.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/vserver/inode.c 2015-01-19 10:58:31.000000000 +0000 +@@ -0,0 +1,440 @@ ++/* ++ * linux/kernel/vserver/inode.c ++ * ++ * Virtual Server: File System Support ++ * ++ * Copyright (C) 2004-2007 Herbert Pötzl ++ * ++ * V0.01 separated from vcontext V0.05 ++ * V0.02 moved to tag (instead of xid) ++ * ++ */ + -+/* __dealloc_nx_addr_v4() */ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + -+static inline void __dealloc_nx_addr_v4(struct nx_addr_v4 *nxa) -+{ -+ kmem_cache_free(nx_addr_v4_cachep, nxa); -+} ++#include ++#include <../../fs/proc/internal.h> + -+/* __dealloc_nx_addr_v4_all() */ + -+static inline void __dealloc_nx_addr_v4_all(struct nx_addr_v4 *nxa) ++static int __vc_get_iattr(struct inode *in, uint32_t *tag, uint32_t *flags, uint32_t *mask) +{ -+ while (nxa) { -+ struct nx_addr_v4 *next = nxa->next; ++ struct proc_dir_entry *entry; + -+ __dealloc_nx_addr_v4(nxa); -+ nxa = next; -+ } -+} ++ if (!in || !in->i_sb) ++ return -ESRCH; + ++ *flags = IATTR_TAG ++ | (IS_IMMUTABLE(in) ? IATTR_IMMUTABLE : 0) ++ | (IS_IXUNLINK(in) ? IATTR_IXUNLINK : 0) ++ | (IS_BARRIER(in) ? IATTR_BARRIER : 0) ++ | (IS_COW(in) ? IATTR_COW : 0); ++ *mask = IATTR_IXUNLINK | IATTR_IMMUTABLE | IATTR_COW; + -+#ifdef CONFIG_IPV6 ++ if (S_ISDIR(in->i_mode)) ++ *mask |= IATTR_BARRIER; + -+/* __alloc_nx_addr_v6() */ ++ if (IS_TAGGED(in)) { ++ *tag = i_tag_read(in); ++ *mask |= IATTR_TAG; ++ } + -+static inline struct nx_addr_v6 *__alloc_nx_addr_v6(void) -+{ -+ struct nx_addr_v6 *nxa = kmem_cache_alloc( -+ nx_addr_v6_cachep, GFP_KERNEL); ++ switch (in->i_sb->s_magic) { ++ case PROC_SUPER_MAGIC: ++ entry = PROC_I(in)->pde; + -+ if (!IS_ERR(nxa)) -+ memset(nxa, 0, sizeof(*nxa)); -+ return nxa; -+} ++ /* check for specific inodes? */ ++ if (entry) ++ *mask |= IATTR_FLAGS; ++ if (entry) ++ *flags |= (entry->vx_flags & IATTR_FLAGS); ++ else ++ *flags |= (PROC_I(in)->vx_flags & IATTR_FLAGS); ++ break; + -+/* __dealloc_nx_addr_v6() */ ++ case DEVPTS_SUPER_MAGIC: ++ *tag = i_tag_read(in); ++ *mask |= IATTR_TAG; ++ break; + -+static inline void __dealloc_nx_addr_v6(struct nx_addr_v6 *nxa) -+{ -+ kmem_cache_free(nx_addr_v6_cachep, nxa); ++ default: ++ break; ++ } ++ return 0; +} + -+/* __dealloc_nx_addr_v6_all() */ -+ -+static inline void __dealloc_nx_addr_v6_all(struct nx_addr_v6 *nxa) ++int vc_get_iattr(void __user *data) +{ -+ while (nxa) { -+ struct nx_addr_v6 *next = nxa->next; ++ struct path path; ++ struct vcmd_ctx_iattr_v1 vc_data = { .tag = -1 }; ++ int ret; + -+ __dealloc_nx_addr_v6(nxa); -+ nxa = next; -+ } -+} ++ if (copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; + -+#endif /* CONFIG_IPV6 */ ++ ret = user_lpath(vc_data.name, &path); ++ if (!ret) { ++ ret = __vc_get_iattr(path.dentry->d_inode, ++ &vc_data.tag, &vc_data.flags, &vc_data.mask); ++ path_put(&path); ++ } ++ if (ret) ++ return ret; + -+/* __alloc_nx_info() ++ if (copy_to_user(data, &vc_data, sizeof(vc_data))) ++ ret = -EFAULT; ++ return ret; ++} + -+ * allocate an initialized nx_info struct -+ * doesn't make it visible (hash) */ ++#ifdef CONFIG_COMPAT + -+static struct nx_info *__alloc_nx_info(nid_t nid) ++int vc_get_iattr_x32(void __user *data) +{ -+ struct nx_info *new = NULL; -+ -+ vxdprintk(VXD_CBIT(nid, 1), "alloc_nx_info(%d)*", nid); -+ -+ /* would this benefit from a slab cache? */ -+ new = kmalloc(sizeof(struct nx_info), GFP_KERNEL); -+ if (!new) -+ return 0; -+ -+ memset(new, 0, sizeof(struct nx_info)); -+ new->nx_id = nid; -+ INIT_HLIST_NODE(&new->nx_hlist); -+ atomic_set(&new->nx_usecnt, 0); -+ atomic_set(&new->nx_tasks, 0); -+ new->nx_state = 0; -+ -+ new->nx_flags = NXF_INIT_SET; ++ struct path path; ++ struct vcmd_ctx_iattr_v1_x32 vc_data = { .tag = -1 }; ++ int ret; + -+ /* rest of init goes here */ ++ if (copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; + -+ new->v4_lback.s_addr = htonl(INADDR_LOOPBACK); -+ new->v4_bcast.s_addr = htonl(INADDR_BROADCAST); ++ ret = user_lpath(compat_ptr(vc_data.name_ptr), &path); ++ if (!ret) { ++ ret = __vc_get_iattr(path.dentry->d_inode, ++ &vc_data.tag, &vc_data.flags, &vc_data.mask); ++ path_put(&path); ++ } ++ if (ret) ++ return ret; + -+ vxdprintk(VXD_CBIT(nid, 0), -+ "alloc_nx_info(%d) = %p", nid, new); -+ atomic_inc(&nx_global_ctotal); -+ return new; ++ if (copy_to_user(data, &vc_data, sizeof(vc_data))) ++ ret = -EFAULT; ++ return ret; +} + -+/* __dealloc_nx_info() ++#endif /* CONFIG_COMPAT */ + -+ * final disposal of nx_info */ + -+static void __dealloc_nx_info(struct nx_info *nxi) ++int vc_fget_iattr(uint32_t fd, void __user *data) +{ -+ vxdprintk(VXD_CBIT(nid, 0), -+ "dealloc_nx_info(%p)", nxi); ++ struct file *filp; ++ struct vcmd_ctx_fiattr_v0 vc_data = { .tag = -1 }; ++ int ret; + -+ nxi->nx_hlist.next = LIST_POISON1; -+ nxi->nx_id = -1; ++ if (copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; + -+ BUG_ON(atomic_read(&nxi->nx_usecnt)); -+ BUG_ON(atomic_read(&nxi->nx_tasks)); ++ filp = fget(fd); ++ if (!filp || !filp->f_dentry || !filp->f_dentry->d_inode) ++ return -EBADF; + -+ __dealloc_nx_addr_v4_all(nxi->v4.next); ++ ret = __vc_get_iattr(filp->f_dentry->d_inode, ++ &vc_data.tag, &vc_data.flags, &vc_data.mask); + -+ nxi->nx_state |= NXS_RELEASED; -+ kfree(nxi); -+ atomic_dec(&nx_global_ctotal); -+} ++ fput(filp); + -+static void __shutdown_nx_info(struct nx_info *nxi) -+{ -+ nxi->nx_state |= NXS_SHUTDOWN; -+ vs_net_change(nxi, VSC_NETDOWN); ++ if (copy_to_user(data, &vc_data, sizeof(vc_data))) ++ ret = -EFAULT; ++ return ret; +} + -+/* exported stuff */ + -+void free_nx_info(struct nx_info *nxi) ++static int __vc_set_iattr(struct dentry *de, uint32_t *tag, uint32_t *flags, uint32_t *mask) +{ -+ /* context shutdown is mandatory */ -+ BUG_ON(nxi->nx_state != NXS_SHUTDOWN); -+ -+ /* context must not be hashed */ -+ BUG_ON(nxi->nx_state & NXS_HASHED); -+ -+ BUG_ON(atomic_read(&nxi->nx_usecnt)); -+ BUG_ON(atomic_read(&nxi->nx_tasks)); -+ -+ __dealloc_nx_info(nxi); -+} ++ struct inode *in = de->d_inode; ++ int error = 0, is_proc = 0, has_tag = 0; ++ struct iattr attr = { 0 }; + ++ if (!in || !in->i_sb) ++ return -ESRCH; + -+void __nx_set_lback(struct nx_info *nxi) -+{ -+ int nid = nxi->nx_id; -+ __be32 lback = htonl(INADDR_LOOPBACK ^ ((nid & 0xFFFF) << 8)); ++ is_proc = (in->i_sb->s_magic == PROC_SUPER_MAGIC); ++ if ((*mask & IATTR_FLAGS) && !is_proc) ++ return -EINVAL; + -+ nxi->v4_lback.s_addr = lback; -+} ++ has_tag = IS_TAGGED(in) || ++ (in->i_sb->s_magic == DEVPTS_SUPER_MAGIC); ++ if ((*mask & IATTR_TAG) && !has_tag) ++ return -EINVAL; + -+extern int __nx_inet_add_lback(__be32 addr); -+extern int __nx_inet_del_lback(__be32 addr); ++ mutex_lock(&in->i_mutex); ++ if (*mask & IATTR_TAG) { ++ attr.ia_tag = make_ktag(&init_user_ns, *tag); ++ attr.ia_valid |= ATTR_TAG; ++ } + ++ if (*mask & IATTR_FLAGS) { ++ struct proc_dir_entry *entry = PROC_I(in)->pde; ++ unsigned int iflags = PROC_I(in)->vx_flags; + -+/* hash table for nx_info hash */ ++ iflags = (iflags & ~(*mask & IATTR_FLAGS)) ++ | (*flags & IATTR_FLAGS); ++ PROC_I(in)->vx_flags = iflags; ++ if (entry) ++ entry->vx_flags = iflags; ++ } + -+#define NX_HASH_SIZE 13 ++ if (*mask & (IATTR_IMMUTABLE | IATTR_IXUNLINK | ++ IATTR_BARRIER | IATTR_COW)) { ++ int iflags = in->i_flags; ++ int vflags = in->i_vflags; + -+struct hlist_head nx_info_hash[NX_HASH_SIZE]; ++ if (*mask & IATTR_IMMUTABLE) { ++ if (*flags & IATTR_IMMUTABLE) ++ iflags |= S_IMMUTABLE; ++ else ++ iflags &= ~S_IMMUTABLE; ++ } ++ if (*mask & IATTR_IXUNLINK) { ++ if (*flags & IATTR_IXUNLINK) ++ iflags |= S_IXUNLINK; ++ else ++ iflags &= ~S_IXUNLINK; ++ } ++ if (S_ISDIR(in->i_mode) && (*mask & IATTR_BARRIER)) { ++ if (*flags & IATTR_BARRIER) ++ vflags |= V_BARRIER; ++ else ++ vflags &= ~V_BARRIER; ++ } ++ if (S_ISREG(in->i_mode) && (*mask & IATTR_COW)) { ++ if (*flags & IATTR_COW) ++ vflags |= V_COW; ++ else ++ vflags &= ~V_COW; ++ } ++ if (in->i_op && in->i_op->sync_flags) { ++ error = in->i_op->sync_flags(in, iflags, vflags); ++ if (error) ++ goto out; ++ } ++ } + -+static DEFINE_SPINLOCK(nx_info_hash_lock); ++ if (attr.ia_valid) { ++ if (in->i_op && in->i_op->setattr) ++ error = in->i_op->setattr(de, &attr); ++ else { ++ error = inode_change_ok(in, &attr); ++ if (!error) { ++ setattr_copy(in, &attr); ++ mark_inode_dirty(in); ++ } ++ } ++ } + ++out: ++ mutex_unlock(&in->i_mutex); ++ return error; ++} + -+static inline unsigned int __hashval(nid_t nid) ++int vc_set_iattr(void __user *data) +{ -+ return (nid % NX_HASH_SIZE); -+} ++ struct path path; ++ struct vcmd_ctx_iattr_v1 vc_data; ++ int ret; + ++ if (!capable(CAP_LINUX_IMMUTABLE)) ++ return -EPERM; ++ if (copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; + ++ ret = user_lpath(vc_data.name, &path); ++ if (!ret) { ++ ret = __vc_set_iattr(path.dentry, ++ &vc_data.tag, &vc_data.flags, &vc_data.mask); ++ path_put(&path); ++ } + -+/* __hash_nx_info() ++ if (copy_to_user(data, &vc_data, sizeof(vc_data))) ++ ret = -EFAULT; ++ return ret; ++} + -+ * add the nxi to the global hash table -+ * requires the hash_lock to be held */ ++#ifdef CONFIG_COMPAT + -+static inline void __hash_nx_info(struct nx_info *nxi) ++int vc_set_iattr_x32(void __user *data) +{ -+ struct hlist_head *head; ++ struct path path; ++ struct vcmd_ctx_iattr_v1_x32 vc_data; ++ int ret; + -+ vxd_assert_lock(&nx_info_hash_lock); -+ vxdprintk(VXD_CBIT(nid, 4), -+ "__hash_nx_info: %p[#%d]", nxi, nxi->nx_id); ++ if (!capable(CAP_LINUX_IMMUTABLE)) ++ return -EPERM; ++ if (copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; + -+ /* context must not be hashed */ -+ BUG_ON(nx_info_state(nxi, NXS_HASHED)); ++ ret = user_lpath(compat_ptr(vc_data.name_ptr), &path); ++ if (!ret) { ++ ret = __vc_set_iattr(path.dentry, ++ &vc_data.tag, &vc_data.flags, &vc_data.mask); ++ path_put(&path); ++ } + -+ nxi->nx_state |= NXS_HASHED; -+ head = &nx_info_hash[__hashval(nxi->nx_id)]; -+ hlist_add_head(&nxi->nx_hlist, head); -+ atomic_inc(&nx_global_cactive); ++ if (copy_to_user(data, &vc_data, sizeof(vc_data))) ++ ret = -EFAULT; ++ return ret; +} + -+/* __unhash_nx_info() -+ -+ * remove the nxi from the global hash table -+ * requires the hash_lock to be held */ ++#endif /* CONFIG_COMPAT */ + -+static inline void __unhash_nx_info(struct nx_info *nxi) ++int vc_fset_iattr(uint32_t fd, void __user *data) +{ -+ vxd_assert_lock(&nx_info_hash_lock); -+ vxdprintk(VXD_CBIT(nid, 4), -+ "__unhash_nx_info: %p[#%d.%d.%d]", nxi, nxi->nx_id, -+ atomic_read(&nxi->nx_usecnt), atomic_read(&nxi->nx_tasks)); ++ struct file *filp; ++ struct vcmd_ctx_fiattr_v0 vc_data; ++ int ret; + -+ /* context must be hashed */ -+ BUG_ON(!nx_info_state(nxi, NXS_HASHED)); -+ /* but without tasks */ -+ BUG_ON(atomic_read(&nxi->nx_tasks)); ++ if (!capable(CAP_LINUX_IMMUTABLE)) ++ return -EPERM; ++ if (copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; + -+ nxi->nx_state &= ~NXS_HASHED; -+ hlist_del(&nxi->nx_hlist); -+ atomic_dec(&nx_global_cactive); -+} ++ filp = fget(fd); ++ if (!filp || !filp->f_dentry || !filp->f_dentry->d_inode) ++ return -EBADF; + ++ ret = __vc_set_iattr(filp->f_dentry, &vc_data.tag, ++ &vc_data.flags, &vc_data.mask); + -+/* __lookup_nx_info() ++ fput(filp); + -+ * requires the hash_lock to be held -+ * doesn't increment the nx_refcnt */ ++ if (copy_to_user(data, &vc_data, sizeof(vc_data))) ++ return -EFAULT; ++ return ret; ++} + -+static inline struct nx_info *__lookup_nx_info(nid_t nid) -+{ -+ struct hlist_head *head = &nx_info_hash[__hashval(nid)]; -+ struct hlist_node *pos; -+ struct nx_info *nxi; + -+ vxd_assert_lock(&nx_info_hash_lock); -+ hlist_for_each(pos, head) { -+ nxi = hlist_entry(pos, struct nx_info, nx_hlist); ++enum { Opt_notagcheck, Opt_tag, Opt_notag, Opt_tagid, Opt_err }; + -+ if (nxi->nx_id == nid) -+ goto found; -+ } -+ nxi = NULL; -+found: -+ vxdprintk(VXD_CBIT(nid, 0), -+ "__lookup_nx_info(#%u): %p[#%u]", -+ nid, nxi, nxi ? nxi->nx_id : 0); -+ return nxi; -+} ++static match_table_t tokens = { ++ {Opt_notagcheck, "notagcheck"}, ++#ifdef CONFIG_PROPAGATE ++ {Opt_notag, "notag"}, ++ {Opt_tag, "tag"}, ++ {Opt_tagid, "tagid=%u"}, ++#endif ++ {Opt_err, NULL} ++}; + + -+/* __create_nx_info() ++static void __dx_parse_remove(char *string, char *opt) ++{ ++ char *p = strstr(string, opt); ++ char *q = p; + -+ * create the requested context -+ * get(), claim() and hash it */ ++ if (p) { ++ while (*q != '\0' && *q != ',') ++ q++; ++ while (*q) ++ *p++ = *q++; ++ while (*p) ++ *p++ = '\0'; ++ } ++} + -+static struct nx_info *__create_nx_info(int id) ++int dx_parse_tag(char *string, vtag_t *tag, int remove, int *mnt_flags, ++ unsigned long *flags) +{ -+ struct nx_info *new, *nxi = NULL; -+ -+ vxdprintk(VXD_CBIT(nid, 1), "create_nx_info(%d)*", id); ++ int set = 0; ++ substring_t args[MAX_OPT_ARGS]; ++ int token; ++ char *s, *p, *opts; ++#if defined(CONFIG_PROPAGATE) || defined(CONFIG_VSERVER_DEBUG) ++ int option = 0; ++#endif + -+ if (!(new = __alloc_nx_info(id))) -+ return ERR_PTR(-ENOMEM); ++ if (!string) ++ return 0; ++ s = kstrdup(string, GFP_KERNEL | GFP_ATOMIC); ++ if (!s) ++ return 0; + -+ /* required to make dynamic xids unique */ -+ spin_lock(&nx_info_hash_lock); ++ opts = s; ++ while ((p = strsep(&opts, ",")) != NULL) { ++ token = match_token(p, tokens, args); + -+ /* static context requested */ -+ if ((nxi = __lookup_nx_info(id))) { -+ vxdprintk(VXD_CBIT(nid, 0), -+ "create_nx_info(%d) = %p (already there)", id, nxi); -+ if (nx_info_flags(nxi, NXF_STATE_SETUP, 0)) -+ nxi = ERR_PTR(-EBUSY); -+ else -+ nxi = ERR_PTR(-EEXIST); -+ goto out_unlock; ++ switch (token) { ++#ifdef CONFIG_PROPAGATE ++ case Opt_tag: ++ if (tag) ++ *tag = 0; ++ if (remove) ++ __dx_parse_remove(s, "tag"); ++ *mnt_flags |= MNT_TAGID; ++ set |= MNT_TAGID; ++ break; ++ case Opt_notag: ++ if (remove) ++ __dx_parse_remove(s, "notag"); ++ *mnt_flags |= MNT_NOTAG; ++ set |= MNT_NOTAG; ++ break; ++ case Opt_tagid: ++ if (tag && !match_int(args, &option)) ++ *tag = option; ++ if (remove) ++ __dx_parse_remove(s, "tagid"); ++ *mnt_flags |= MNT_TAGID; ++ set |= MNT_TAGID; ++ break; ++#endif /* CONFIG_PROPAGATE */ ++ case Opt_notagcheck: ++ if (remove) ++ __dx_parse_remove(s, "notagcheck"); ++ *flags |= MS_NOTAGCHECK; ++ set |= MS_NOTAGCHECK; ++ break; ++ } ++ vxdprintk(VXD_CBIT(tag, 7), ++ "dx_parse_tag(" VS_Q("%s") "): %d:#%d", ++ p, token, option); + } -+ /* new context */ -+ vxdprintk(VXD_CBIT(nid, 0), -+ "create_nx_info(%d) = %p (new)", id, new); -+ claim_nx_info(new, NULL); -+ __nx_set_lback(new); -+ __hash_nx_info(get_nx_info(new)); -+ nxi = new, new = NULL; -+ -+out_unlock: -+ spin_unlock(&nx_info_hash_lock); -+ if (new) -+ __dealloc_nx_info(new); -+ return nxi; ++ if (set) ++ strcpy(string, s); ++ kfree(s); ++ return set; +} + ++#ifdef CONFIG_PROPAGATE + -+ -+/* exported stuff */ -+ -+ -+void unhash_nx_info(struct nx_info *nxi) ++void __dx_propagate_tag(struct nameidata *nd, struct inode *inode) +{ -+ __shutdown_nx_info(nxi); -+ spin_lock(&nx_info_hash_lock); -+ __unhash_nx_info(nxi); -+ spin_unlock(&nx_info_hash_lock); -+} ++ vtag_t new_tag = 0; ++ struct vfsmount *mnt; ++ int propagate; + -+/* lookup_nx_info() ++ if (!nd) ++ return; ++ mnt = nd->path.mnt; ++ if (!mnt) ++ return; + -+ * search for a nx_info and get() it -+ * negative id means current */ ++ propagate = (mnt->mnt_flags & MNT_TAGID); ++ if (propagate) ++ new_tag = mnt->mnt_tag; + -+struct nx_info *lookup_nx_info(int id) -+{ -+ struct nx_info *nxi = NULL; ++ vxdprintk(VXD_CBIT(tag, 7), ++ "dx_propagate_tag(%p[#%lu.%d]): %d,%d", ++ inode, inode->i_ino, inode->i_tag, ++ new_tag, (propagate) ? 1 : 0); + -+ if (id < 0) { -+ nxi = get_nx_info(current_nx_info()); -+ } else if (id > 1) { -+ spin_lock(&nx_info_hash_lock); -+ nxi = get_nx_info(__lookup_nx_info(id)); -+ spin_unlock(&nx_info_hash_lock); -+ } -+ return nxi; ++ if (propagate) ++ i_tag_write(inode, new_tag); +} + -+/* nid_is_hashed() ++#include + -+ * verify that nid is still hashed */ ++EXPORT_SYMBOL_GPL(__dx_propagate_tag); + -+int nid_is_hashed(nid_t nid) -+{ -+ int hashed; ++#endif /* CONFIG_PROPAGATE */ + -+ spin_lock(&nx_info_hash_lock); -+ hashed = (__lookup_nx_info(nid) != NULL); -+ spin_unlock(&nx_info_hash_lock); -+ return hashed; -+} +diff -NurpP --minimal linux-3.18.5/kernel/vserver/limit.c linux-3.18.5-vs2.3.7.3/kernel/vserver/limit.c +--- linux-3.18.5/kernel/vserver/limit.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/vserver/limit.c 2015-01-19 10:58:31.000000000 +0000 +@@ -0,0 +1,345 @@ ++/* ++ * linux/kernel/vserver/limit.c ++ * ++ * Virtual Server: Context Limits ++ * ++ * Copyright (C) 2004-2010 Herbert Pötzl ++ * ++ * V0.01 broken out from vcontext V0.05 ++ * V0.02 changed vcmds to vxi arg ++ * V0.03 added memory cgroup support ++ * ++ */ + ++#include ++#include ++#include ++#include ++#include ++#include ++#include + -+#ifdef CONFIG_PROC_FS ++#include + -+/* get_nid_list() + -+ * get a subset of hashed nids for proc -+ * assumes size is at least one */ ++const char *vlimit_name[NUM_LIMITS] = { ++ [RLIMIT_CPU] = "CPU", ++ [RLIMIT_NPROC] = "NPROC", ++ [RLIMIT_NOFILE] = "NOFILE", ++ [RLIMIT_LOCKS] = "LOCKS", ++ [RLIMIT_SIGPENDING] = "SIGP", ++ [RLIMIT_MSGQUEUE] = "MSGQ", + -+int get_nid_list(int index, unsigned int *nids, int size) -+{ -+ int hindex, nr_nids = 0; ++ [VLIMIT_NSOCK] = "NSOCK", ++ [VLIMIT_OPENFD] = "OPENFD", ++ [VLIMIT_SHMEM] = "SHMEM", ++ [VLIMIT_DENTRY] = "DENTRY", ++}; + -+ /* only show current and children */ -+ if (!nx_check(0, VS_ADMIN | VS_WATCH)) { -+ if (index > 0) -+ return 0; -+ nids[nr_nids] = nx_current_nid(); -+ return 1; -+ } ++EXPORT_SYMBOL_GPL(vlimit_name); + -+ for (hindex = 0; hindex < NX_HASH_SIZE; hindex++) { -+ struct hlist_head *head = &nx_info_hash[hindex]; -+ struct hlist_node *pos; ++#define MASK_ENTRY(x) (1 << (x)) + -+ spin_lock(&nx_info_hash_lock); -+ hlist_for_each(pos, head) { -+ struct nx_info *nxi; ++const struct vcmd_ctx_rlimit_mask_v0 vlimit_mask = { ++ /* minimum */ ++ 0 ++ , /* softlimit */ ++ 0 ++ , /* maximum */ ++ MASK_ENTRY( RLIMIT_NPROC ) | ++ MASK_ENTRY( RLIMIT_NOFILE ) | ++ MASK_ENTRY( RLIMIT_LOCKS ) | ++ MASK_ENTRY( RLIMIT_MSGQUEUE ) | + -+ if (--index > 0) -+ continue; ++ MASK_ENTRY( VLIMIT_NSOCK ) | ++ MASK_ENTRY( VLIMIT_OPENFD ) | ++ MASK_ENTRY( VLIMIT_SHMEM ) | ++ MASK_ENTRY( VLIMIT_DENTRY ) | ++ 0 ++}; ++ /* accounting only */ ++uint32_t account_mask = ++ MASK_ENTRY( VLIMIT_SEMARY ) | ++ MASK_ENTRY( VLIMIT_NSEMS ) | ++ MASK_ENTRY( VLIMIT_MAPPED ) | ++ 0; + -+ nxi = hlist_entry(pos, struct nx_info, nx_hlist); -+ nids[nr_nids] = nxi->nx_id; -+ if (++nr_nids >= size) { -+ spin_unlock(&nx_info_hash_lock); -+ goto out; -+ } -+ } -+ /* keep the lock time short */ -+ spin_unlock(&nx_info_hash_lock); -+ } -+out: -+ return nr_nids; ++ ++static int is_valid_vlimit(int id) ++{ ++ uint32_t mask = vlimit_mask.minimum | ++ vlimit_mask.softlimit | vlimit_mask.maximum; ++ return mask & (1 << id); ++} ++ ++static int is_accounted_vlimit(int id) ++{ ++ if (is_valid_vlimit(id)) ++ return 1; ++ return account_mask & (1 << id); +} -+#endif + + -+/* -+ * migrate task to new network -+ * gets nxi, puts old_nxi on change -+ */ ++static inline uint64_t vc_get_soft(struct vx_info *vxi, int id) ++{ ++ rlim_t limit = __rlim_soft(&vxi->limit, id); ++ return VX_VLIM(limit); ++} + -+int nx_migrate_task(struct task_struct *p, struct nx_info *nxi) ++static inline uint64_t vc_get_hard(struct vx_info *vxi, int id) +{ -+ struct nx_info *old_nxi; -+ int ret = 0; ++ rlim_t limit = __rlim_hard(&vxi->limit, id); ++ return VX_VLIM(limit); ++} + -+ if (!p || !nxi) -+ BUG(); ++static int do_get_rlimit(struct vx_info *vxi, uint32_t id, ++ uint64_t *minimum, uint64_t *softlimit, uint64_t *maximum) ++{ ++ if (!is_valid_vlimit(id)) ++ return -EINVAL; + -+ vxdprintk(VXD_CBIT(nid, 5), -+ "nx_migrate_task(%p,%p[#%d.%d.%d])", -+ p, nxi, nxi->nx_id, -+ atomic_read(&nxi->nx_usecnt), -+ atomic_read(&nxi->nx_tasks)); ++ if (minimum) ++ *minimum = CRLIM_UNSET; ++ if (softlimit) ++ *softlimit = vc_get_soft(vxi, id); ++ if (maximum) ++ *maximum = vc_get_hard(vxi, id); ++ return 0; ++} + -+ if (nx_info_flags(nxi, NXF_INFO_PRIVATE, 0) && -+ !nx_info_flags(nxi, NXF_STATE_SETUP, 0)) -+ return -EACCES; ++int vc_get_rlimit(struct vx_info *vxi, void __user *data) ++{ ++ struct vcmd_ctx_rlimit_v0 vc_data; ++ int ret; + -+ if (nx_info_state(nxi, NXS_SHUTDOWN)) ++ if (copy_from_user(&vc_data, data, sizeof(vc_data))) + return -EFAULT; + -+ /* maybe disallow this completely? */ -+ old_nxi = task_get_nx_info(p); -+ if (old_nxi == nxi) -+ goto out; -+ -+ task_lock(p); -+ if (old_nxi) -+ clr_nx_info(&p->nx_info); -+ claim_nx_info(nxi, p); -+ set_nx_info(&p->nx_info, nxi); -+ p->nid = nxi->nx_id; -+ task_unlock(p); -+ -+ vxdprintk(VXD_CBIT(nid, 5), -+ "moved task %p into nxi:%p[#%d]", -+ p, nxi, nxi->nx_id); ++ ret = do_get_rlimit(vxi, vc_data.id, ++ &vc_data.minimum, &vc_data.softlimit, &vc_data.maximum); ++ if (ret) ++ return ret; + -+ if (old_nxi) -+ release_nx_info(old_nxi, p); -+ ret = 0; -+out: -+ put_nx_info(old_nxi); -+ return ret; ++ if (copy_to_user(data, &vc_data, sizeof(vc_data))) ++ return -EFAULT; ++ return 0; +} + -+ -+void nx_set_persistent(struct nx_info *nxi) ++static int do_set_rlimit(struct vx_info *vxi, uint32_t id, ++ uint64_t minimum, uint64_t softlimit, uint64_t maximum) +{ -+ vxdprintk(VXD_CBIT(nid, 6), -+ "nx_set_persistent(%p[#%d])", nxi, nxi->nx_id); ++ if (!is_valid_vlimit(id)) ++ return -EINVAL; + -+ get_nx_info(nxi); -+ claim_nx_info(nxi, NULL); -+} ++ if (maximum != CRLIM_KEEP) ++ __rlim_hard(&vxi->limit, id) = VX_RLIM(maximum); ++ if (softlimit != CRLIM_KEEP) ++ __rlim_soft(&vxi->limit, id) = VX_RLIM(softlimit); + -+void nx_clear_persistent(struct nx_info *nxi) -+{ -+ vxdprintk(VXD_CBIT(nid, 6), -+ "nx_clear_persistent(%p[#%d])", nxi, nxi->nx_id); ++ /* clamp soft limit */ ++ if (__rlim_soft(&vxi->limit, id) > __rlim_hard(&vxi->limit, id)) ++ __rlim_soft(&vxi->limit, id) = __rlim_hard(&vxi->limit, id); + -+ release_nx_info(nxi, NULL); -+ put_nx_info(nxi); ++ return 0; +} + -+void nx_update_persistent(struct nx_info *nxi) ++int vc_set_rlimit(struct vx_info *vxi, void __user *data) +{ -+ if (nx_info_flags(nxi, NXF_PERSISTENT, 0)) -+ nx_set_persistent(nxi); -+ else -+ nx_clear_persistent(nxi); -+} -+ -+/* vserver syscall commands below here */ ++ struct vcmd_ctx_rlimit_v0 vc_data; + -+/* taks nid and nx_info functions */ ++ if (copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; + -+#include ++ return do_set_rlimit(vxi, vc_data.id, ++ vc_data.minimum, vc_data.softlimit, vc_data.maximum); ++} + ++#ifdef CONFIG_IA32_EMULATION + -+int vc_task_nid(uint32_t id) ++int vc_set_rlimit_x32(struct vx_info *vxi, void __user *data) +{ -+ nid_t nid; ++ struct vcmd_ctx_rlimit_v0_x32 vc_data; + -+ if (id) { -+ struct task_struct *tsk; ++ if (copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; + -+ rcu_read_lock(); -+ tsk = find_task_by_real_pid(id); -+ nid = (tsk) ? tsk->nid : -ESRCH; -+ rcu_read_unlock(); -+ } else -+ nid = nx_current_nid(); -+ return nid; ++ return do_set_rlimit(vxi, vc_data.id, ++ vc_data.minimum, vc_data.softlimit, vc_data.maximum); +} + -+ -+int vc_nx_info(struct nx_info *nxi, void __user *data) ++int vc_get_rlimit_x32(struct vx_info *vxi, void __user *data) +{ -+ struct vcmd_nx_info_v0 vc_data; ++ struct vcmd_ctx_rlimit_v0_x32 vc_data; ++ int ret; + -+ vc_data.nid = nxi->nx_id; ++ if (copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; ++ ++ ret = do_get_rlimit(vxi, vc_data.id, ++ &vc_data.minimum, &vc_data.softlimit, &vc_data.maximum); ++ if (ret) ++ return ret; + + if (copy_to_user(data, &vc_data, sizeof(vc_data))) + return -EFAULT; + return 0; +} + ++#endif /* CONFIG_IA32_EMULATION */ + -+/* network functions */ + -+int vc_net_create(uint32_t nid, void __user *data) ++int vc_get_rlimit_mask(uint32_t id, void __user *data) +{ -+ struct vcmd_net_create vc_data = { .flagword = NXF_INIT_SET }; -+ struct nx_info *new_nxi; -+ int ret; -+ -+ if (data && copy_from_user(&vc_data, data, sizeof(vc_data))) ++ if (copy_to_user(data, &vlimit_mask, sizeof(vlimit_mask))) + return -EFAULT; ++ return 0; ++} + -+ if ((nid > MAX_S_CONTEXT) || (nid < 2)) -+ return -EINVAL; -+ -+ new_nxi = __create_nx_info(nid); -+ if (IS_ERR(new_nxi)) -+ return PTR_ERR(new_nxi); + -+ /* initial flags */ -+ new_nxi->nx_flags = vc_data.flagword; ++static inline void vx_reset_hits(struct _vx_limit *limit) ++{ ++ int lim; + -+ ret = -ENOEXEC; -+ if (vs_net_change(new_nxi, VSC_NETUP)) -+ goto out; ++ for (lim = 0; lim < NUM_LIMITS; lim++) { ++ atomic_set(&__rlim_lhit(limit, lim), 0); ++ } ++} + -+ ret = nx_migrate_task(current, new_nxi); -+ if (ret) -+ goto out; ++int vc_reset_hits(struct vx_info *vxi, void __user *data) ++{ ++ vx_reset_hits(&vxi->limit); ++ return 0; ++} + -+ /* return context id on success */ -+ ret = new_nxi->nx_id; ++static inline void vx_reset_minmax(struct _vx_limit *limit) ++{ ++ rlim_t value; ++ int lim; + -+ /* get a reference for persistent contexts */ -+ if ((vc_data.flagword & NXF_PERSISTENT)) -+ nx_set_persistent(new_nxi); -+out: -+ release_nx_info(new_nxi, NULL); -+ put_nx_info(new_nxi); -+ return ret; ++ for (lim = 0; lim < NUM_LIMITS; lim++) { ++ value = __rlim_get(limit, lim); ++ __rlim_rmax(limit, lim) = value; ++ __rlim_rmin(limit, lim) = value; ++ } +} + -+ -+int vc_net_migrate(struct nx_info *nxi, void __user *data) ++int vc_reset_minmax(struct vx_info *vxi, void __user *data) +{ -+ return nx_migrate_task(current, nxi); ++ vx_reset_minmax(&vxi->limit); ++ return 0; +} + + -+ -+int do_add_v4_addr(struct nx_info *nxi, __be32 ip, __be32 ip2, __be32 mask, -+ uint16_t type, uint16_t flags) ++int vc_rlimit_stat(struct vx_info *vxi, void __user *data) +{ -+ struct nx_addr_v4 *nxa = &nxi->v4; ++ struct vcmd_rlimit_stat_v0 vc_data; ++ struct _vx_limit *limit = &vxi->limit; ++ int id; + -+ if (NX_IPV4(nxi)) { -+ /* locate last entry */ -+ for (; nxa->next; nxa = nxa->next); -+ nxa->next = __alloc_nx_addr_v4(); -+ nxa = nxa->next; ++ if (copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; + -+ if (IS_ERR(nxa)) -+ return PTR_ERR(nxa); -+ } ++ id = vc_data.id; ++ if (!is_accounted_vlimit(id)) ++ return -EINVAL; + -+ if (nxi->v4.next) -+ /* remove single ip for ip list */ -+ nxi->nx_flags &= ~NXF_SINGLE_IP; ++ vx_limit_fixup(limit, id); ++ vc_data.hits = atomic_read(&__rlim_lhit(limit, id)); ++ vc_data.value = __rlim_get(limit, id); ++ vc_data.minimum = __rlim_rmin(limit, id); ++ vc_data.maximum = __rlim_rmax(limit, id); + -+ nxa->ip[0].s_addr = ip; -+ nxa->ip[1].s_addr = ip2; -+ nxa->mask.s_addr = mask; -+ nxa->type = type; -+ nxa->flags = flags; ++ if (copy_to_user(data, &vc_data, sizeof(vc_data))) ++ return -EFAULT; + return 0; +} + -+int do_remove_v4_addr(struct nx_info *nxi, __be32 ip, __be32 ip2, __be32 mask, -+ uint16_t type, uint16_t flags) ++ ++void vx_vsi_meminfo(struct sysinfo *val) +{ -+ struct nx_addr_v4 *nxa = &nxi->v4; ++#ifdef CONFIG_MEMCG ++ struct mem_cgroup *mcg; ++ u64 res_limit, res_usage; + -+ switch (type) { -+/* case NXA_TYPE_ADDR: -+ break; */ ++ rcu_read_lock(); ++ mcg = mem_cgroup_from_task(current); ++ rcu_read_unlock(); ++ if (!mcg) ++ goto out; + -+ case NXA_TYPE_ANY: -+ __dealloc_nx_addr_v4_all(xchg(&nxa->next, NULL)); -+ memset(nxa, 0, sizeof(*nxa)); -+ break; ++ res_limit = mem_cgroup_res_read_u64(mcg, RES_LIMIT); ++ res_usage = mem_cgroup_res_read_u64(mcg, RES_USAGE); + -+ default: -+ return -EINVAL; -+ } -+ return 0; ++ if (res_limit != RES_COUNTER_MAX) ++ val->totalram = (res_limit >> PAGE_SHIFT); ++ val->freeram = val->totalram - (res_usage >> PAGE_SHIFT); ++ val->bufferram = 0; ++ val->totalhigh = 0; ++ val->freehigh = 0; ++out: ++#endif /* CONFIG_MEMCG */ ++ return; +} + -+ -+int vc_net_add(struct nx_info *nxi, void __user *data) ++void vx_vsi_swapinfo(struct sysinfo *val) +{ -+ struct vcmd_net_addr_v0 vc_data; -+ int index, ret = 0; ++#ifdef CONFIG_MEMCG ++#ifdef CONFIG_MEMCG_SWAP ++ struct mem_cgroup *mcg; ++ u64 res_limit, res_usage, memsw_limit, memsw_usage; ++ s64 swap_limit, swap_usage; + -+ if (data && copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; ++ rcu_read_lock(); ++ mcg = mem_cgroup_from_task(current); ++ rcu_read_unlock(); ++ if (!mcg) ++ goto out; + -+ switch (vc_data.type) { -+ case NXA_TYPE_IPV4: -+ if ((vc_data.count < 1) || (vc_data.count > 4)) -+ return -EINVAL; ++ res_limit = mem_cgroup_res_read_u64(mcg, RES_LIMIT); ++ res_usage = mem_cgroup_res_read_u64(mcg, RES_USAGE); ++ memsw_limit = mem_cgroup_memsw_read_u64(mcg, RES_LIMIT); ++ memsw_usage = mem_cgroup_memsw_read_u64(mcg, RES_USAGE); + -+ index = 0; -+ while (index < vc_data.count) { -+ ret = do_add_v4_addr(nxi, vc_data.ip[index].s_addr, 0, -+ vc_data.mask[index].s_addr, NXA_TYPE_ADDR, 0); -+ if (ret) -+ return ret; -+ index++; -+ } -+ ret = index; -+ break; ++ /* memory unlimited */ ++ if (res_limit == RES_COUNTER_MAX) ++ goto out; + -+ case NXA_TYPE_IPV4|NXA_MOD_BCAST: -+ nxi->v4_bcast = vc_data.ip[0]; -+ ret = 1; -+ break; ++ swap_limit = memsw_limit - res_limit; ++ /* we have a swap limit? */ ++ if (memsw_limit != RES_COUNTER_MAX) ++ val->totalswap = swap_limit >> PAGE_SHIFT; + -+ case NXA_TYPE_IPV4|NXA_MOD_LBACK: -+ nxi->v4_lback = vc_data.ip[0]; -+ ret = 1; -+ break; ++ /* calculate swap part */ ++ swap_usage = (memsw_usage > res_usage) ? ++ memsw_usage - res_usage : 0; + -+ default: -+ ret = -EINVAL; -+ break; -+ } -+ return ret; ++ /* total shown minus usage gives free swap */ ++ val->freeswap = (swap_usage < swap_limit) ? ++ val->totalswap - (swap_usage >> PAGE_SHIFT) : 0; ++out: ++#else /* !CONFIG_MEMCG_SWAP */ ++ val->totalswap = 0; ++ val->freeswap = 0; ++#endif /* !CONFIG_MEMCG_SWAP */ ++#endif /* CONFIG_MEMCG */ ++ return; +} + -+int vc_net_remove(struct nx_info *nxi, void __user *data) ++long vx_vsi_cached(struct sysinfo *val) +{ -+ struct vcmd_net_addr_v0 vc_data; -+ -+ if (data && copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; ++ long cache = 0; ++#ifdef CONFIG_MEMCG ++ struct mem_cgroup *mcg; + -+ switch (vc_data.type) { -+ case NXA_TYPE_ANY: -+ __dealloc_nx_addr_v4_all(xchg(&nxi->v4.next, NULL)); -+ memset(&nxi->v4, 0, sizeof(nxi->v4)); -+ break; ++ rcu_read_lock(); ++ mcg = mem_cgroup_from_task(current); ++ rcu_read_unlock(); ++ if (!mcg) ++ goto out; + -+ default: -+ return -EINVAL; -+ } -+ return 0; ++ cache = mem_cgroup_stat_read_cache(mcg); ++out: ++#endif ++ return cache; +} + +diff -NurpP --minimal linux-3.18.5/kernel/vserver/limit_init.h linux-3.18.5-vs2.3.7.3/kernel/vserver/limit_init.h +--- linux-3.18.5/kernel/vserver/limit_init.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/vserver/limit_init.h 2015-01-19 10:58:31.000000000 +0000 +@@ -0,0 +1,31 @@ + -+int vc_net_add_ipv4_v1(struct nx_info *nxi, void __user *data) -+{ -+ struct vcmd_net_addr_ipv4_v1 vc_data; -+ -+ if (data && copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; -+ -+ switch (vc_data.type) { -+ case NXA_TYPE_ADDR: -+ case NXA_TYPE_MASK: -+ return do_add_v4_addr(nxi, vc_data.ip.s_addr, 0, -+ vc_data.mask.s_addr, vc_data.type, vc_data.flags); -+ -+ case NXA_TYPE_ADDR | NXA_MOD_BCAST: -+ nxi->v4_bcast = vc_data.ip; -+ break; + -+ case NXA_TYPE_ADDR | NXA_MOD_LBACK: -+ nxi->v4_lback = vc_data.ip; -+ break; ++static inline void vx_info_init_limit(struct _vx_limit *limit) ++{ ++ int lim; + -+ default: -+ return -EINVAL; ++ for (lim = 0; lim < NUM_LIMITS; lim++) { ++ __rlim_soft(limit, lim) = RLIM_INFINITY; ++ __rlim_hard(limit, lim) = RLIM_INFINITY; ++ __rlim_set(limit, lim, 0); ++ atomic_set(&__rlim_lhit(limit, lim), 0); ++ __rlim_rmin(limit, lim) = 0; ++ __rlim_rmax(limit, lim) = 0; + } -+ return 0; +} + -+int vc_net_add_ipv4(struct nx_info *nxi, void __user *data) ++static inline void vx_info_exit_limit(struct _vx_limit *limit) +{ -+ struct vcmd_net_addr_ipv4_v2 vc_data; -+ -+ if (data && copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; -+ -+ switch (vc_data.type) { -+ case NXA_TYPE_ADDR: -+ case NXA_TYPE_MASK: -+ case NXA_TYPE_RANGE: -+ return do_add_v4_addr(nxi, vc_data.ip.s_addr, vc_data.ip2.s_addr, -+ vc_data.mask.s_addr, vc_data.type, vc_data.flags); -+ -+ case NXA_TYPE_ADDR | NXA_MOD_BCAST: -+ nxi->v4_bcast = vc_data.ip; -+ break; -+ -+ case NXA_TYPE_ADDR | NXA_MOD_LBACK: -+ nxi->v4_lback = vc_data.ip; -+ break; ++ rlim_t value; ++ int lim; + -+ default: -+ return -EINVAL; ++ for (lim = 0; lim < NUM_LIMITS; lim++) { ++ if ((1 << lim) & VLIM_NOCHECK) ++ continue; ++ value = __rlim_get(limit, lim); ++ vxwprintk_xid(value, ++ "!!! limit: %p[%s,%d] = %ld on exit.", ++ limit, vlimit_name[lim], lim, (long)value); + } -+ return 0; +} + -+int vc_net_rem_ipv4_v1(struct nx_info *nxi, void __user *data) -+{ -+ struct vcmd_net_addr_ipv4_v1 vc_data; -+ -+ if (data && copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; +diff -NurpP --minimal linux-3.18.5/kernel/vserver/limit_proc.h linux-3.18.5-vs2.3.7.3/kernel/vserver/limit_proc.h +--- linux-3.18.5/kernel/vserver/limit_proc.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/vserver/limit_proc.h 2015-01-19 10:58:31.000000000 +0000 +@@ -0,0 +1,57 @@ ++#ifndef _VX_LIMIT_PROC_H ++#define _VX_LIMIT_PROC_H + -+ return do_remove_v4_addr(nxi, vc_data.ip.s_addr, 0, -+ vc_data.mask.s_addr, vc_data.type, vc_data.flags); -+} ++#include + -+int vc_net_rem_ipv4(struct nx_info *nxi, void __user *data) -+{ -+ struct vcmd_net_addr_ipv4_v2 vc_data; + -+ if (data && copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; ++#define VX_LIMIT_FMT ":\t%8ld\t%8ld/%8ld\t%8lld/%8lld\t%6d\n" ++#define VX_LIMIT_TOP \ ++ "Limit\t current\t min/max\t\t soft/hard\t\thits\n" + -+ return do_remove_v4_addr(nxi, vc_data.ip.s_addr, vc_data.ip2.s_addr, -+ vc_data.mask.s_addr, vc_data.type, vc_data.flags); ++#define VX_LIMIT_ARG(r) \ ++ (unsigned long)__rlim_get(limit, r), \ ++ (unsigned long)__rlim_rmin(limit, r), \ ++ (unsigned long)__rlim_rmax(limit, r), \ ++ VX_VLIM(__rlim_soft(limit, r)), \ ++ VX_VLIM(__rlim_hard(limit, r)), \ ++ atomic_read(&__rlim_lhit(limit, r)) ++ ++static inline int vx_info_proc_limit(struct _vx_limit *limit, char *buffer) ++{ ++ vx_limit_fixup(limit, -1); ++ return sprintf(buffer, VX_LIMIT_TOP ++ "PROC" VX_LIMIT_FMT ++ "VM" VX_LIMIT_FMT ++ "VML" VX_LIMIT_FMT ++ "RSS" VX_LIMIT_FMT ++ "ANON" VX_LIMIT_FMT ++ "RMAP" VX_LIMIT_FMT ++ "FILES" VX_LIMIT_FMT ++ "OFD" VX_LIMIT_FMT ++ "LOCKS" VX_LIMIT_FMT ++ "SOCK" VX_LIMIT_FMT ++ "MSGQ" VX_LIMIT_FMT ++ "SHM" VX_LIMIT_FMT ++ "SEMA" VX_LIMIT_FMT ++ "SEMS" VX_LIMIT_FMT ++ "DENT" VX_LIMIT_FMT, ++ VX_LIMIT_ARG(RLIMIT_NPROC), ++ VX_LIMIT_ARG(RLIMIT_AS), ++ VX_LIMIT_ARG(RLIMIT_MEMLOCK), ++ VX_LIMIT_ARG(RLIMIT_RSS), ++ VX_LIMIT_ARG(VLIMIT_ANON), ++ VX_LIMIT_ARG(VLIMIT_MAPPED), ++ VX_LIMIT_ARG(RLIMIT_NOFILE), ++ VX_LIMIT_ARG(VLIMIT_OPENFD), ++ VX_LIMIT_ARG(RLIMIT_LOCKS), ++ VX_LIMIT_ARG(VLIMIT_NSOCK), ++ VX_LIMIT_ARG(RLIMIT_MSGQUEUE), ++ VX_LIMIT_ARG(VLIMIT_SHMEM), ++ VX_LIMIT_ARG(VLIMIT_SEMARY), ++ VX_LIMIT_ARG(VLIMIT_NSEMS), ++ VX_LIMIT_ARG(VLIMIT_DENTRY)); +} + -+#ifdef CONFIG_IPV6 ++#endif /* _VX_LIMIT_PROC_H */ + -+int do_add_v6_addr(struct nx_info *nxi, -+ struct in6_addr *ip, struct in6_addr *mask, -+ uint32_t prefix, uint16_t type, uint16_t flags) -+{ -+ struct nx_addr_v6 *nxa = &nxi->v6; + -+ if (NX_IPV6(nxi)) { -+ /* locate last entry */ -+ for (; nxa->next; nxa = nxa->next); -+ nxa->next = __alloc_nx_addr_v6(); -+ nxa = nxa->next; +diff -NurpP --minimal linux-3.18.5/kernel/vserver/network.c linux-3.18.5-vs2.3.7.3/kernel/vserver/network.c +--- linux-3.18.5/kernel/vserver/network.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/vserver/network.c 2015-01-19 10:58:31.000000000 +0000 +@@ -0,0 +1,1053 @@ ++/* ++ * linux/kernel/vserver/network.c ++ * ++ * Virtual Server: Network Support ++ * ++ * Copyright (C) 2003-2007 Herbert Pötzl ++ * ++ * V0.01 broken out from vcontext V0.05 ++ * V0.02 cleaned up implementation ++ * V0.03 added equiv nx commands ++ * V0.04 switch to RCU based hash ++ * V0.05 and back to locking again ++ * V0.06 changed vcmds to nxi arg ++ * V0.07 have __create claim() the nxi ++ * ++ */ + -+ if (IS_ERR(nxa)) -+ return PTR_ERR(nxa); -+ } ++#include ++#include ++#include ++#include + -+ nxa->ip = *ip; -+ nxa->mask = *mask; -+ nxa->prefix = prefix; -+ nxa->type = type; -+ nxa->flags = flags; ++#include ++#include ++#include ++ ++ ++atomic_t nx_global_ctotal = ATOMIC_INIT(0); ++atomic_t nx_global_cactive = ATOMIC_INIT(0); ++ ++static struct kmem_cache *nx_addr_v4_cachep = NULL; ++static struct kmem_cache *nx_addr_v6_cachep = NULL; ++ ++ ++static int __init init_network(void) ++{ ++ nx_addr_v4_cachep = kmem_cache_create("nx_v4_addr_cache", ++ sizeof(struct nx_addr_v4), 0, ++ SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL); ++ nx_addr_v6_cachep = kmem_cache_create("nx_v6_addr_cache", ++ sizeof(struct nx_addr_v6), 0, ++ SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL); + return 0; +} + + -+int vc_net_add_ipv6(struct nx_info *nxi, void __user *data) -+{ -+ struct vcmd_net_addr_ipv6_v1 vc_data; ++/* __alloc_nx_addr_v4() */ + -+ if (data && copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; ++static inline struct nx_addr_v4 *__alloc_nx_addr_v4(void) ++{ ++ struct nx_addr_v4 *nxa = kmem_cache_alloc( ++ nx_addr_v4_cachep, GFP_KERNEL); + -+ switch (vc_data.type) { -+ case NXA_TYPE_ADDR: -+ memset(&vc_data.mask, ~0, sizeof(vc_data.mask)); -+ /* fallthrough */ -+ case NXA_TYPE_MASK: -+ return do_add_v6_addr(nxi, &vc_data.ip, &vc_data.mask, -+ vc_data.prefix, vc_data.type, vc_data.flags); -+ default: -+ return -EINVAL; -+ } -+ return 0; ++ if (!IS_ERR(nxa)) ++ memset(nxa, 0, sizeof(*nxa)); ++ return nxa; +} + -+int vc_net_remove_ipv6(struct nx_info *nxi, void __user *data) ++/* __dealloc_nx_addr_v4() */ ++ ++static inline void __dealloc_nx_addr_v4(struct nx_addr_v4 *nxa) +{ -+ struct vcmd_net_addr_ipv6_v1 vc_data; ++ kmem_cache_free(nx_addr_v4_cachep, nxa); ++} + -+ if (data && copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; ++/* __dealloc_nx_addr_v4_all() */ + -+ switch (vc_data.type) { -+ case NXA_TYPE_ANY: -+ __dealloc_nx_addr_v6_all(xchg(&nxi->v6.next, NULL)); -+ memset(&nxi->v6, 0, sizeof(nxi->v6)); -+ break; ++static inline void __dealloc_nx_addr_v4_all(struct nx_addr_v4 *nxa) ++{ ++ while (nxa) { ++ struct nx_addr_v4 *next = nxa->next; + -+ default: -+ return -EINVAL; ++ __dealloc_nx_addr_v4(nxa); ++ nxa = next; + } -+ return 0; +} + -+#endif /* CONFIG_IPV6 */ + ++#ifdef CONFIG_IPV6 + -+int vc_get_nflags(struct nx_info *nxi, void __user *data) ++/* __alloc_nx_addr_v6() */ ++ ++static inline struct nx_addr_v6 *__alloc_nx_addr_v6(void) +{ -+ struct vcmd_net_flags_v0 vc_data; ++ struct nx_addr_v6 *nxa = kmem_cache_alloc( ++ nx_addr_v6_cachep, GFP_KERNEL); + -+ vc_data.flagword = nxi->nx_flags; ++ if (!IS_ERR(nxa)) ++ memset(nxa, 0, sizeof(*nxa)); ++ return nxa; ++} + -+ /* special STATE flag handling */ -+ vc_data.mask = vs_mask_flags(~0ULL, nxi->nx_flags, NXF_ONE_TIME); ++/* __dealloc_nx_addr_v6() */ + -+ if (copy_to_user(data, &vc_data, sizeof(vc_data))) -+ return -EFAULT; -+ return 0; ++static inline void __dealloc_nx_addr_v6(struct nx_addr_v6 *nxa) ++{ ++ kmem_cache_free(nx_addr_v6_cachep, nxa); +} + -+int vc_set_nflags(struct nx_info *nxi, void __user *data) ++/* __dealloc_nx_addr_v6_all() */ ++ ++static inline void __dealloc_nx_addr_v6_all(struct nx_addr_v6 *nxa) +{ -+ struct vcmd_net_flags_v0 vc_data; -+ uint64_t mask, trigger; ++ while (nxa) { ++ struct nx_addr_v6 *next = nxa->next; + -+ if (copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; ++ __dealloc_nx_addr_v6(nxa); ++ nxa = next; ++ } ++} + -+ /* special STATE flag handling */ -+ mask = vs_mask_mask(vc_data.mask, nxi->nx_flags, NXF_ONE_TIME); -+ trigger = (mask & nxi->nx_flags) ^ (mask & vc_data.flagword); ++#endif /* CONFIG_IPV6 */ + -+ nxi->nx_flags = vs_mask_flags(nxi->nx_flags, -+ vc_data.flagword, mask); -+ if (trigger & NXF_PERSISTENT) -+ nx_update_persistent(nxi); ++/* __alloc_nx_info() + -+ return 0; -+} ++ * allocate an initialized nx_info struct ++ * doesn't make it visible (hash) */ + -+int vc_get_ncaps(struct nx_info *nxi, void __user *data) ++static struct nx_info *__alloc_nx_info(vnid_t nid) +{ -+ struct vcmd_net_caps_v0 vc_data; ++ struct nx_info *new = NULL; + -+ vc_data.ncaps = nxi->nx_ncaps; -+ vc_data.cmask = ~0ULL; ++ vxdprintk(VXD_CBIT(nid, 1), "alloc_nx_info(%d)*", nid); + -+ if (copy_to_user(data, &vc_data, sizeof(vc_data))) -+ return -EFAULT; -+ return 0; -+} ++ /* would this benefit from a slab cache? */ ++ new = kmalloc(sizeof(struct nx_info), GFP_KERNEL); ++ if (!new) ++ return 0; + -+int vc_set_ncaps(struct nx_info *nxi, void __user *data) -+{ -+ struct vcmd_net_caps_v0 vc_data; ++ memset(new, 0, sizeof(struct nx_info)); ++ new->nx_id = nid; ++ INIT_HLIST_NODE(&new->nx_hlist); ++ atomic_set(&new->nx_usecnt, 0); ++ atomic_set(&new->nx_tasks, 0); ++ spin_lock_init(&new->addr_lock); ++ new->nx_state = 0; + -+ if (copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; ++ new->nx_flags = NXF_INIT_SET; + -+ nxi->nx_ncaps = vs_mask_flags(nxi->nx_ncaps, -+ vc_data.ncaps, vc_data.cmask); -+ return 0; ++ /* rest of init goes here */ ++ ++ new->v4_lback.s_addr = htonl(INADDR_LOOPBACK); ++ new->v4_bcast.s_addr = htonl(INADDR_BROADCAST); ++ ++ vxdprintk(VXD_CBIT(nid, 0), ++ "alloc_nx_info(%d) = %p", nid, new); ++ atomic_inc(&nx_global_ctotal); ++ return new; +} + ++/* __dealloc_nx_info() + -+#include ++ * final disposal of nx_info */ + -+module_init(init_network); ++static void __dealloc_nx_info(struct nx_info *nxi) ++{ ++ vxdprintk(VXD_CBIT(nid, 0), ++ "dealloc_nx_info(%p)", nxi); + -+EXPORT_SYMBOL_GPL(free_nx_info); -+EXPORT_SYMBOL_GPL(unhash_nx_info); ++ nxi->nx_hlist.next = LIST_POISON1; ++ nxi->nx_id = -1; + -diff -NurpP --minimal linux-3.7/kernel/vserver/proc.c linux-3.7-vs2.3.5.1/kernel/vserver/proc.c ---- linux-3.7/kernel/vserver/proc.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/proc.c 2012-12-11 15:56:33.000000000 +0000 -@@ -0,0 +1,1110 @@ -+/* -+ * linux/kernel/vserver/proc.c -+ * -+ * Virtual Context Support -+ * -+ * Copyright (C) 2003-2011 Herbert Pötzl -+ * -+ * V0.01 basic structure -+ * V0.02 adaptation vs1.3.0 -+ * V0.03 proc permissions -+ * V0.04 locking/generic -+ * V0.05 next generation procfs -+ * V0.06 inode validation -+ * V0.07 generic rewrite vid -+ * V0.08 remove inode type -+ * V0.09 added u/wmask info -+ * -+ */ ++ BUG_ON(atomic_read(&nxi->nx_usecnt)); ++ BUG_ON(atomic_read(&nxi->nx_tasks)); + -+#include -+#include -+#include -+#include -+#include ++ __dealloc_nx_addr_v4_all(nxi->v4.next); ++#ifdef CONFIG_IPV6 ++ __dealloc_nx_addr_v6_all(nxi->v6.next); ++#endif + -+#include -+#include -+#include ++ nxi->nx_state |= NXS_RELEASED; ++ kfree(nxi); ++ atomic_dec(&nx_global_ctotal); ++} + -+#include -+#include -+#include -+#include ++static void __shutdown_nx_info(struct nx_info *nxi) ++{ ++ nxi->nx_state |= NXS_SHUTDOWN; ++ vs_net_change(nxi, VSC_NETDOWN); ++} + -+#include ++/* exported stuff */ + -+#include "cvirt_proc.h" -+#include "cacct_proc.h" -+#include "limit_proc.h" -+#include "sched_proc.h" -+#include "vci_config.h" ++void free_nx_info(struct nx_info *nxi) ++{ ++ /* context shutdown is mandatory */ ++ BUG_ON(nxi->nx_state != NXS_SHUTDOWN); + ++ /* context must not be hashed */ ++ BUG_ON(nxi->nx_state & NXS_HASHED); + -+static inline char *print_cap_t(char *buffer, kernel_cap_t *c) ++ BUG_ON(atomic_read(&nxi->nx_usecnt)); ++ BUG_ON(atomic_read(&nxi->nx_tasks)); ++ ++ __dealloc_nx_info(nxi); ++} ++ ++ ++void __nx_set_lback(struct nx_info *nxi) +{ -+ unsigned __capi; ++ int nid = nxi->nx_id; ++ __be32 lback = htonl(INADDR_LOOPBACK ^ ((nid & 0xFFFF) << 8)); + -+ CAP_FOR_EACH_U32(__capi) { -+ buffer += sprintf(buffer, "%08x", -+ c->cap[(_KERNEL_CAPABILITY_U32S-1) - __capi]); -+ } -+ return buffer; ++ nxi->v4_lback.s_addr = lback; +} + ++extern int __nx_inet_add_lback(__be32 addr); ++extern int __nx_inet_del_lback(__be32 addr); + -+static struct proc_dir_entry *proc_virtual; + -+static struct proc_dir_entry *proc_virtnet; ++/* hash table for nx_info hash */ + ++#define NX_HASH_SIZE 13 + -+/* first the actual feeds */ ++struct hlist_head nx_info_hash[NX_HASH_SIZE]; + ++static DEFINE_SPINLOCK(nx_info_hash_lock); + -+static int proc_vci(char *buffer) -+{ -+ return sprintf(buffer, -+ "VCIVersion:\t%04x:%04x\n" -+ "VCISyscall:\t%d\n" -+ "VCIKernel:\t%08x\n", -+ VCI_VERSION >> 16, -+ VCI_VERSION & 0xFFFF, -+ __NR_vserver, -+ vci_kernel_config()); -+} + -+static int proc_virtual_info(char *buffer) ++static inline unsigned int __hashval(vnid_t nid) +{ -+ return proc_vci(buffer); ++ return (nid % NX_HASH_SIZE); +} + -+static int proc_virtual_status(char *buffer) -+{ -+ return sprintf(buffer, -+ "#CTotal:\t%d\n" -+ "#CActive:\t%d\n" -+ "#NSProxy:\t%d\t%d %d %d %d %d %d\n" -+ "#InitTask:\t%d\t%d %d\n", -+ atomic_read(&vx_global_ctotal), -+ atomic_read(&vx_global_cactive), -+ atomic_read(&vs_global_nsproxy), -+ atomic_read(&vs_global_fs), -+ atomic_read(&vs_global_mnt_ns), -+ atomic_read(&vs_global_uts_ns), -+ atomic_read(&nr_ipc_ns), -+ atomic_read(&vs_global_user_ns), -+ atomic_read(&vs_global_pid_ns), -+ atomic_read(&init_task.usage), -+ atomic_read(&init_task.nsproxy->count), -+ init_task.fs->users); -+} + + -+int proc_vxi_info(struct vx_info *vxi, char *buffer) -+{ -+ int length; ++/* __hash_nx_info() + -+ length = sprintf(buffer, -+ "ID:\t%d\n" -+ "Info:\t%p\n" -+ "Init:\t%d\n" -+ "OOM:\t%lld\n", -+ vxi->vx_id, -+ vxi, -+ vxi->vx_initpid, -+ vxi->vx_badness_bias); -+ return length; -+} ++ * add the nxi to the global hash table ++ * requires the hash_lock to be held */ + -+int proc_vxi_status(struct vx_info *vxi, char *buffer) ++static inline void __hash_nx_info(struct nx_info *nxi) +{ -+ char *orig = buffer; ++ struct hlist_head *head; + -+ buffer += sprintf(buffer, -+ "UseCnt:\t%d\n" -+ "Tasks:\t%d\n" -+ "Flags:\t%016llx\n", -+ atomic_read(&vxi->vx_usecnt), -+ atomic_read(&vxi->vx_tasks), -+ (unsigned long long)vxi->vx_flags); ++ vxd_assert_lock(&nx_info_hash_lock); ++ vxdprintk(VXD_CBIT(nid, 4), ++ "__hash_nx_info: %p[#%d]", nxi, nxi->nx_id); + -+ buffer += sprintf(buffer, "BCaps:\t"); -+ buffer = print_cap_t(buffer, &vxi->vx_bcaps); -+ buffer += sprintf(buffer, "\n"); ++ /* context must not be hashed */ ++ BUG_ON(nx_info_state(nxi, NXS_HASHED)); + -+ buffer += sprintf(buffer, -+ "CCaps:\t%016llx\n" -+ "Umask:\t%16llx\n" -+ "Wmask:\t%16llx\n" -+ "Spaces:\t%08lx %08lx\n", -+ (unsigned long long)vxi->vx_ccaps, -+ (unsigned long long)vxi->vx_umask, -+ (unsigned long long)vxi->vx_wmask, -+ vxi->space[0].vx_nsmask, vxi->space[1].vx_nsmask); -+ return buffer - orig; ++ nxi->nx_state |= NXS_HASHED; ++ head = &nx_info_hash[__hashval(nxi->nx_id)]; ++ hlist_add_head(&nxi->nx_hlist, head); ++ atomic_inc(&nx_global_cactive); +} + -+int proc_vxi_limit(struct vx_info *vxi, char *buffer) -+{ -+ return vx_info_proc_limit(&vxi->limit, buffer); -+} ++/* __unhash_nx_info() + -+int proc_vxi_sched(struct vx_info *vxi, char *buffer) ++ * remove the nxi from the global hash table ++ * requires the hash_lock to be held */ ++ ++static inline void __unhash_nx_info(struct nx_info *nxi) +{ -+ int cpu, length; ++ vxd_assert_lock(&nx_info_hash_lock); ++ vxdprintk(VXD_CBIT(nid, 4), ++ "__unhash_nx_info: %p[#%d.%d.%d]", nxi, nxi->nx_id, ++ atomic_read(&nxi->nx_usecnt), atomic_read(&nxi->nx_tasks)); + -+ length = vx_info_proc_sched(&vxi->sched, buffer); -+ for_each_online_cpu(cpu) { -+ length += vx_info_proc_sched_pc( -+ &vx_per_cpu(vxi, sched_pc, cpu), -+ buffer + length, cpu); -+ } -+ return length; -+} ++ /* context must be hashed */ ++ BUG_ON(!nx_info_state(nxi, NXS_HASHED)); ++ /* but without tasks */ ++ BUG_ON(atomic_read(&nxi->nx_tasks)); + -+int proc_vxi_nsproxy0(struct vx_info *vxi, char *buffer) -+{ -+ return vx_info_proc_nsproxy(vxi->space[0].vx_nsproxy, buffer); ++ nxi->nx_state &= ~NXS_HASHED; ++ hlist_del(&nxi->nx_hlist); ++ atomic_dec(&nx_global_cactive); +} + -+int proc_vxi_nsproxy1(struct vx_info *vxi, char *buffer) -+{ -+ return vx_info_proc_nsproxy(vxi->space[1].vx_nsproxy, buffer); -+} + -+int proc_vxi_cvirt(struct vx_info *vxi, char *buffer) ++/* __lookup_nx_info() ++ ++ * requires the hash_lock to be held ++ * doesn't increment the nx_refcnt */ ++ ++static inline struct nx_info *__lookup_nx_info(vnid_t nid) +{ -+ int cpu, length; ++ struct hlist_head *head = &nx_info_hash[__hashval(nid)]; ++ struct hlist_node *pos; ++ struct nx_info *nxi; + -+ vx_update_load(vxi); -+ length = vx_info_proc_cvirt(&vxi->cvirt, buffer); -+ for_each_online_cpu(cpu) { -+ length += vx_info_proc_cvirt_pc( -+ &vx_per_cpu(vxi, cvirt_pc, cpu), -+ buffer + length, cpu); ++ vxd_assert_lock(&nx_info_hash_lock); ++ hlist_for_each(pos, head) { ++ nxi = hlist_entry(pos, struct nx_info, nx_hlist); ++ ++ if (nxi->nx_id == nid) ++ goto found; + } -+ return length; ++ nxi = NULL; ++found: ++ vxdprintk(VXD_CBIT(nid, 0), ++ "__lookup_nx_info(#%u): %p[#%u]", ++ nid, nxi, nxi ? nxi->nx_id : 0); ++ return nxi; +} + -+int proc_vxi_cacct(struct vx_info *vxi, char *buffer) -+{ -+ return vx_info_proc_cacct(&vxi->cacct, buffer); -+} + ++/* __create_nx_info() + -+static int proc_virtnet_info(char *buffer) -+{ -+ return proc_vci(buffer); -+} ++ * create the requested context ++ * get(), claim() and hash it */ + -+static int proc_virtnet_status(char *buffer) ++static struct nx_info *__create_nx_info(int id) +{ -+ return sprintf(buffer, -+ "#CTotal:\t%d\n" -+ "#CActive:\t%d\n", -+ atomic_read(&nx_global_ctotal), -+ atomic_read(&nx_global_cactive)); -+} ++ struct nx_info *new, *nxi = NULL; + -+int proc_nxi_info(struct nx_info *nxi, char *buffer) -+{ -+ struct nx_addr_v4 *v4a; -+#ifdef CONFIG_IPV6 -+ struct nx_addr_v6 *v6a; -+#endif -+ int length, i; ++ vxdprintk(VXD_CBIT(nid, 1), "create_nx_info(%d)*", id); + -+ length = sprintf(buffer, -+ "ID:\t%d\n" -+ "Info:\t%p\n" -+ "Bcast:\t" NIPQUAD_FMT "\n" -+ "Lback:\t" NIPQUAD_FMT "\n", -+ nxi->nx_id, -+ nxi, -+ NIPQUAD(nxi->v4_bcast.s_addr), -+ NIPQUAD(nxi->v4_lback.s_addr)); ++ if (!(new = __alloc_nx_info(id))) ++ return ERR_PTR(-ENOMEM); + -+ if (!NX_IPV4(nxi)) -+ goto skip_v4; -+ for (i = 0, v4a = &nxi->v4; v4a; i++, v4a = v4a->next) -+ length += sprintf(buffer + length, "%d:\t" NXAV4_FMT "\n", -+ i, NXAV4(v4a)); -+skip_v4: -+#ifdef CONFIG_IPV6 -+ if (!NX_IPV6(nxi)) -+ goto skip_v6; -+ for (i = 0, v6a = &nxi->v6; v6a; i++, v6a = v6a->next) -+ length += sprintf(buffer + length, "%d:\t" NXAV6_FMT "\n", -+ i, NXAV6(v6a)); -+skip_v6: -+#endif -+ return length; -+} ++ /* required to make dynamic xids unique */ ++ spin_lock(&nx_info_hash_lock); + -+int proc_nxi_status(struct nx_info *nxi, char *buffer) -+{ -+ int length; ++ /* static context requested */ ++ if ((nxi = __lookup_nx_info(id))) { ++ vxdprintk(VXD_CBIT(nid, 0), ++ "create_nx_info(%d) = %p (already there)", id, nxi); ++ if (nx_info_flags(nxi, NXF_STATE_SETUP, 0)) ++ nxi = ERR_PTR(-EBUSY); ++ else ++ nxi = ERR_PTR(-EEXIST); ++ goto out_unlock; ++ } ++ /* new context */ ++ vxdprintk(VXD_CBIT(nid, 0), ++ "create_nx_info(%d) = %p (new)", id, new); ++ claim_nx_info(new, NULL); ++ __nx_set_lback(new); ++ __hash_nx_info(get_nx_info(new)); ++ nxi = new, new = NULL; + -+ length = sprintf(buffer, -+ "UseCnt:\t%d\n" -+ "Tasks:\t%d\n" -+ "Flags:\t%016llx\n" -+ "NCaps:\t%016llx\n", -+ atomic_read(&nxi->nx_usecnt), -+ atomic_read(&nxi->nx_tasks), -+ (unsigned long long)nxi->nx_flags, -+ (unsigned long long)nxi->nx_ncaps); -+ return length; ++out_unlock: ++ spin_unlock(&nx_info_hash_lock); ++ if (new) ++ __dealloc_nx_info(new); ++ return nxi; +} + + + -+/* here the inode helpers */ ++/* exported stuff */ + -+struct vs_entry { -+ int len; -+ char *name; -+ mode_t mode; -+ struct inode_operations *iop; -+ struct file_operations *fop; -+ union proc_op op; -+}; + -+static struct inode *vs_proc_make_inode(struct super_block *sb, struct vs_entry *p) ++void unhash_nx_info(struct nx_info *nxi) +{ -+ struct inode *inode = new_inode(sb); -+ -+ if (!inode) -+ goto out; -+ -+ inode->i_mode = p->mode; -+ if (p->iop) -+ inode->i_op = p->iop; -+ if (p->fop) -+ inode->i_fop = p->fop; -+ -+ set_nlink(inode, (p->mode & S_IFDIR) ? 2 : 1); -+ inode->i_flags |= S_IMMUTABLE; ++ __shutdown_nx_info(nxi); ++ spin_lock(&nx_info_hash_lock); ++ __unhash_nx_info(nxi); ++ spin_unlock(&nx_info_hash_lock); ++} + -+ inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME; ++/* lookup_nx_info() + -+ inode->i_uid = 0; -+ inode->i_gid = 0; -+ inode->i_tag = 0; -+out: -+ return inode; -+} ++ * search for a nx_info and get() it ++ * negative id means current */ + -+static struct dentry *vs_proc_instantiate(struct inode *dir, -+ struct dentry *dentry, int id, void *ptr) ++struct nx_info *lookup_nx_info(int id) +{ -+ struct vs_entry *p = ptr; -+ struct inode *inode = vs_proc_make_inode(dir->i_sb, p); -+ struct dentry *error = ERR_PTR(-EINVAL); -+ -+ if (!inode) -+ goto out; ++ struct nx_info *nxi = NULL; + -+ PROC_I(inode)->op = p->op; -+ PROC_I(inode)->fd = id; -+ d_add(dentry, inode); -+ error = NULL; -+out: -+ return error; ++ if (id < 0) { ++ nxi = get_nx_info(current_nx_info()); ++ } else if (id > 1) { ++ spin_lock(&nx_info_hash_lock); ++ nxi = get_nx_info(__lookup_nx_info(id)); ++ spin_unlock(&nx_info_hash_lock); ++ } ++ return nxi; +} + -+/* Lookups */ ++/* nid_is_hashed() + -+typedef struct dentry *instantiate_t(struct inode *, struct dentry *, int, void *); ++ * verify that nid is still hashed */ + -+/* -+ * Fill a directory entry. -+ * -+ * If possible create the dcache entry and derive our inode number and -+ * file type from dcache entry. -+ * -+ * Since all of the proc inode numbers are dynamically generated, the inode -+ * numbers do not exist until the inode is cache. This means creating the -+ * the dcache entry in readdir is necessary to keep the inode numbers -+ * reported by readdir in sync with the inode numbers reported -+ * by stat. -+ */ -+static int proc_fill_cache(struct file *filp, void *dirent, filldir_t filldir, -+ char *name, int len, instantiate_t instantiate, int id, void *ptr) ++int nid_is_hashed(vnid_t nid) +{ -+ struct dentry *child, *dir = filp->f_dentry; -+ struct inode *inode; -+ struct qstr qname; -+ ino_t ino = 0; -+ unsigned type = DT_UNKNOWN; -+ -+ qname.name = name; -+ qname.len = len; -+ qname.hash = full_name_hash(name, len); ++ int hashed; + -+ child = d_lookup(dir, &qname); -+ if (!child) { -+ struct dentry *new; -+ new = d_alloc(dir, &qname); -+ if (new) { -+ child = instantiate(dir->d_inode, new, id, ptr); -+ if (child) -+ dput(new); -+ else -+ child = new; -+ } -+ } -+ if (!child || IS_ERR(child) || !child->d_inode) -+ goto end_instantiate; -+ inode = child->d_inode; -+ if (inode) { -+ ino = inode->i_ino; -+ type = inode->i_mode >> 12; -+ } -+ dput(child); -+end_instantiate: -+ if (!ino) -+ ino = find_inode_number(dir, &qname); -+ if (!ino) -+ ino = 1; -+ return filldir(dirent, name, len, filp->f_pos, ino, type); ++ spin_lock(&nx_info_hash_lock); ++ hashed = (__lookup_nx_info(nid) != NULL); ++ spin_unlock(&nx_info_hash_lock); ++ return hashed; +} + + ++#ifdef CONFIG_PROC_FS + -+/* get and revalidate vx_info/xid */ ++/* get_nid_list() + -+static inline -+struct vx_info *get_proc_vx_info(struct inode *inode) -+{ -+ return lookup_vx_info(PROC_I(inode)->fd); -+} ++ * get a subset of hashed nids for proc ++ * assumes size is at least one */ + -+static int proc_xid_revalidate(struct dentry *dentry, unsigned int flags) ++int get_nid_list(int index, unsigned int *nids, int size) +{ -+ struct inode *inode = dentry->d_inode; -+ xid_t xid = PROC_I(inode)->fd; -+ -+ if (flags & LOOKUP_RCU) /* FIXME: can be dropped? */ -+ return -ECHILD; ++ int hindex, nr_nids = 0; + -+ if (!xid || xid_is_hashed(xid)) ++ /* only show current and children */ ++ if (!nx_check(0, VS_ADMIN | VS_WATCH)) { ++ if (index > 0) ++ return 0; ++ nids[nr_nids] = nx_current_nid(); + return 1; -+ d_drop(dentry); -+ return 0; -+} -+ ++ } + -+/* get and revalidate nx_info/nid */ ++ for (hindex = 0; hindex < NX_HASH_SIZE; hindex++) { ++ struct hlist_head *head = &nx_info_hash[hindex]; ++ struct hlist_node *pos; + -+static int proc_nid_revalidate(struct dentry *dentry, unsigned int flags) -+{ -+ struct inode *inode = dentry->d_inode; -+ nid_t nid = PROC_I(inode)->fd; ++ spin_lock(&nx_info_hash_lock); ++ hlist_for_each(pos, head) { ++ struct nx_info *nxi; + -+ if (flags & LOOKUP_RCU) /* FIXME: can be dropped? */ -+ return -ECHILD; ++ if (--index > 0) ++ continue; + -+ if (!nid || nid_is_hashed(nid)) -+ return 1; -+ d_drop(dentry); -+ return 0; ++ nxi = hlist_entry(pos, struct nx_info, nx_hlist); ++ nids[nr_nids] = nxi->nx_id; ++ if (++nr_nids >= size) { ++ spin_unlock(&nx_info_hash_lock); ++ goto out; ++ } ++ } ++ /* keep the lock time short */ ++ spin_unlock(&nx_info_hash_lock); ++ } ++out: ++ return nr_nids; +} ++#endif + + ++/* ++ * migrate task to new network ++ * gets nxi, puts old_nxi on change ++ */ + -+#define PROC_BLOCK_SIZE (PAGE_SIZE - 1024) -+ -+static ssize_t proc_vs_info_read(struct file *file, char __user *buf, -+ size_t count, loff_t *ppos) ++int nx_migrate_task(struct task_struct *p, struct nx_info *nxi) +{ -+ struct inode *inode = file->f_dentry->d_inode; -+ unsigned long page; -+ ssize_t length = 0; -+ -+ if (count > PROC_BLOCK_SIZE) -+ count = PROC_BLOCK_SIZE; ++ struct nx_info *old_nxi; ++ int ret = 0; + -+ /* fade that out as soon as stable */ -+ WARN_ON(PROC_I(inode)->fd); ++ if (!p || !nxi) ++ BUG(); + -+ if (!(page = __get_free_page(GFP_KERNEL))) -+ return -ENOMEM; ++ vxdprintk(VXD_CBIT(nid, 5), ++ "nx_migrate_task(%p,%p[#%d.%d.%d])", ++ p, nxi, nxi->nx_id, ++ atomic_read(&nxi->nx_usecnt), ++ atomic_read(&nxi->nx_tasks)); + -+ BUG_ON(!PROC_I(inode)->op.proc_vs_read); -+ length = PROC_I(inode)->op.proc_vs_read((char *)page); ++ if (nx_info_flags(nxi, NXF_INFO_PRIVATE, 0) && ++ !nx_info_flags(nxi, NXF_STATE_SETUP, 0)) ++ return -EACCES; + -+ if (length >= 0) -+ length = simple_read_from_buffer(buf, count, ppos, -+ (char *)page, length); ++ if (nx_info_state(nxi, NXS_SHUTDOWN)) ++ return -EFAULT; + -+ free_page(page); -+ return length; -+} ++ /* maybe disallow this completely? */ ++ old_nxi = task_get_nx_info(p); ++ if (old_nxi == nxi) ++ goto out; + -+static ssize_t proc_vx_info_read(struct file *file, char __user *buf, -+ size_t count, loff_t *ppos) -+{ -+ struct inode *inode = file->f_dentry->d_inode; -+ struct vx_info *vxi = NULL; -+ xid_t xid = PROC_I(inode)->fd; -+ unsigned long page; -+ ssize_t length = 0; ++ task_lock(p); ++ if (old_nxi) ++ clr_nx_info(&p->nx_info); ++ claim_nx_info(nxi, p); ++ set_nx_info(&p->nx_info, nxi); ++ p->nid = nxi->nx_id; ++ task_unlock(p); + -+ if (count > PROC_BLOCK_SIZE) -+ count = PROC_BLOCK_SIZE; ++ vxdprintk(VXD_CBIT(nid, 5), ++ "moved task %p into nxi:%p[#%d]", ++ p, nxi, nxi->nx_id); + -+ /* fade that out as soon as stable */ -+ WARN_ON(!xid); -+ vxi = lookup_vx_info(xid); -+ if (!vxi) -+ goto out; ++ if (old_nxi) ++ release_nx_info(old_nxi, p); ++ ret = 0; ++out: ++ put_nx_info(old_nxi); ++ return ret; ++} + -+ length = -ENOMEM; -+ if (!(page = __get_free_page(GFP_KERNEL))) -+ goto out_put; + -+ BUG_ON(!PROC_I(inode)->op.proc_vxi_read); -+ length = PROC_I(inode)->op.proc_vxi_read(vxi, (char *)page); ++void nx_set_persistent(struct nx_info *nxi) ++{ ++ vxdprintk(VXD_CBIT(nid, 6), ++ "nx_set_persistent(%p[#%d])", nxi, nxi->nx_id); + -+ if (length >= 0) -+ length = simple_read_from_buffer(buf, count, ppos, -+ (char *)page, length); ++ get_nx_info(nxi); ++ claim_nx_info(nxi, NULL); ++} + -+ free_page(page); -+out_put: -+ put_vx_info(vxi); -+out: -+ return length; ++void nx_clear_persistent(struct nx_info *nxi) ++{ ++ vxdprintk(VXD_CBIT(nid, 6), ++ "nx_clear_persistent(%p[#%d])", nxi, nxi->nx_id); ++ ++ release_nx_info(nxi, NULL); ++ put_nx_info(nxi); +} + -+static ssize_t proc_nx_info_read(struct file *file, char __user *buf, -+ size_t count, loff_t *ppos) ++void nx_update_persistent(struct nx_info *nxi) +{ -+ struct inode *inode = file->f_dentry->d_inode; -+ struct nx_info *nxi = NULL; -+ nid_t nid = PROC_I(inode)->fd; -+ unsigned long page; -+ ssize_t length = 0; ++ if (nx_info_flags(nxi, NXF_PERSISTENT, 0)) ++ nx_set_persistent(nxi); ++ else ++ nx_clear_persistent(nxi); ++} + -+ if (count > PROC_BLOCK_SIZE) -+ count = PROC_BLOCK_SIZE; ++/* vserver syscall commands below here */ + -+ /* fade that out as soon as stable */ -+ WARN_ON(!nid); -+ nxi = lookup_nx_info(nid); -+ if (!nxi) -+ goto out; ++/* taks nid and nx_info functions */ + -+ length = -ENOMEM; -+ if (!(page = __get_free_page(GFP_KERNEL))) -+ goto out_put; ++#include + -+ BUG_ON(!PROC_I(inode)->op.proc_nxi_read); -+ length = PROC_I(inode)->op.proc_nxi_read(nxi, (char *)page); + -+ if (length >= 0) -+ length = simple_read_from_buffer(buf, count, ppos, -+ (char *)page, length); ++int vc_task_nid(uint32_t id) ++{ ++ vnid_t nid; + -+ free_page(page); -+out_put: -+ put_nx_info(nxi); -+out: -+ return length; -+} ++ if (id) { ++ struct task_struct *tsk; + ++ rcu_read_lock(); ++ tsk = find_task_by_real_pid(id); ++ nid = (tsk) ? tsk->nid : -ESRCH; ++ rcu_read_unlock(); ++ } else ++ nid = nx_current_nid(); ++ return nid; ++} + + -+/* here comes the lower level */ ++int vc_nx_info(struct nx_info *nxi, void __user *data) ++{ ++ struct vcmd_nx_info_v0 vc_data; + ++ vc_data.nid = nxi->nx_id; + -+#define NOD(NAME, MODE, IOP, FOP, OP) { \ -+ .len = sizeof(NAME) - 1, \ -+ .name = (NAME), \ -+ .mode = MODE, \ -+ .iop = IOP, \ -+ .fop = FOP, \ -+ .op = OP, \ ++ if (copy_to_user(data, &vc_data, sizeof(vc_data))) ++ return -EFAULT; ++ return 0; +} + + -+#define DIR(NAME, MODE, OTYPE) \ -+ NOD(NAME, (S_IFDIR | (MODE)), \ -+ &proc_ ## OTYPE ## _inode_operations, \ -+ &proc_ ## OTYPE ## _file_operations, { } ) -+ -+#define INF(NAME, MODE, OTYPE) \ -+ NOD(NAME, (S_IFREG | (MODE)), NULL, \ -+ &proc_vs_info_file_operations, \ -+ { .proc_vs_read = &proc_##OTYPE } ) ++/* network functions */ + -+#define VINF(NAME, MODE, OTYPE) \ -+ NOD(NAME, (S_IFREG | (MODE)), NULL, \ -+ &proc_vx_info_file_operations, \ -+ { .proc_vxi_read = &proc_##OTYPE } ) ++int vc_net_create(uint32_t nid, void __user *data) ++{ ++ struct vcmd_net_create vc_data = { .flagword = NXF_INIT_SET }; ++ struct nx_info *new_nxi; ++ int ret; + -+#define NINF(NAME, MODE, OTYPE) \ -+ NOD(NAME, (S_IFREG | (MODE)), NULL, \ -+ &proc_nx_info_file_operations, \ -+ { .proc_nxi_read = &proc_##OTYPE } ) ++ if (data && copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; + ++ if ((nid > MAX_S_CONTEXT) || (nid < 2)) ++ return -EINVAL; + -+static struct file_operations proc_vs_info_file_operations = { -+ .read = proc_vs_info_read, -+}; ++ new_nxi = __create_nx_info(nid); ++ if (IS_ERR(new_nxi)) ++ return PTR_ERR(new_nxi); + -+static struct file_operations proc_vx_info_file_operations = { -+ .read = proc_vx_info_read, -+}; ++ /* initial flags */ ++ new_nxi->nx_flags = vc_data.flagword; + -+static struct dentry_operations proc_xid_dentry_operations = { -+ .d_revalidate = proc_xid_revalidate, -+}; ++ ret = -ENOEXEC; ++ if (vs_net_change(new_nxi, VSC_NETUP)) ++ goto out; + -+static struct vs_entry vx_base_stuff[] = { -+ VINF("info", S_IRUGO, vxi_info), -+ VINF("status", S_IRUGO, vxi_status), -+ VINF("limit", S_IRUGO, vxi_limit), -+ VINF("sched", S_IRUGO, vxi_sched), -+ VINF("nsproxy", S_IRUGO, vxi_nsproxy0), -+ VINF("nsproxy1",S_IRUGO, vxi_nsproxy1), -+ VINF("cvirt", S_IRUGO, vxi_cvirt), -+ VINF("cacct", S_IRUGO, vxi_cacct), -+ {} -+}; ++ ret = nx_migrate_task(current, new_nxi); ++ if (ret) ++ goto out; + ++ /* return context id on success */ ++ ret = new_nxi->nx_id; + ++ /* get a reference for persistent contexts */ ++ if ((vc_data.flagword & NXF_PERSISTENT)) ++ nx_set_persistent(new_nxi); ++out: ++ release_nx_info(new_nxi, NULL); ++ put_nx_info(new_nxi); ++ return ret; ++} + + -+static struct dentry *proc_xid_instantiate(struct inode *dir, -+ struct dentry *dentry, int id, void *ptr) ++int vc_net_migrate(struct nx_info *nxi, void __user *data) +{ -+ dentry->d_op = &proc_xid_dentry_operations; -+ return vs_proc_instantiate(dir, dentry, id, ptr); ++ return nx_migrate_task(current, nxi); +} + -+static struct dentry *proc_xid_lookup(struct inode *dir, -+ struct dentry *dentry, unsigned int flags) ++ ++static inline ++struct nx_addr_v4 *__find_v4_addr(struct nx_info *nxi, ++ __be32 ip, __be32 ip2, __be32 mask, uint16_t type, uint16_t flags, ++ struct nx_addr_v4 **prev) +{ -+ struct vs_entry *p = vx_base_stuff; -+ struct dentry *error = ERR_PTR(-ENOENT); ++ struct nx_addr_v4 *nxa = &nxi->v4; + -+ for (; p->name; p++) { -+ if (p->len != dentry->d_name.len) -+ continue; -+ if (!memcmp(dentry->d_name.name, p->name, p->len)) -+ break; ++ for (; nxa; nxa = nxa->next) { ++ if ((nxa->ip[0].s_addr == ip) && ++ (nxa->ip[1].s_addr == ip2) && ++ (nxa->mask.s_addr == mask) && ++ (nxa->type == type) && ++ (nxa->flags == flags)) ++ return nxa; ++ ++ /* save previous entry */ ++ if (prev) ++ *prev = nxa; + } -+ if (!p->name) -+ goto out; -+ -+ error = proc_xid_instantiate(dir, dentry, PROC_I(dir)->fd, p); -+out: -+ return error; ++ return NULL; +} + -+static int proc_xid_readdir(struct file *filp, -+ void *dirent, filldir_t filldir) ++int do_add_v4_addr(struct nx_info *nxi, __be32 ip, __be32 ip2, __be32 mask, ++ uint16_t type, uint16_t flags) +{ -+ struct dentry *dentry = filp->f_dentry; -+ struct inode *inode = dentry->d_inode; -+ struct vs_entry *p = vx_base_stuff; -+ int size = sizeof(vx_base_stuff) / sizeof(struct vs_entry); -+ int pos, index; -+ u64 ino; ++ struct nx_addr_v4 *nxa = NULL; ++ struct nx_addr_v4 *new = __alloc_nx_addr_v4(); ++ unsigned long irqflags; ++ int ret = -EEXIST; + -+ pos = filp->f_pos; -+ switch (pos) { -+ case 0: -+ ino = inode->i_ino; -+ if (filldir(dirent, ".", 1, pos, ino, DT_DIR) < 0) -+ goto out; -+ pos++; -+ /* fall through */ -+ case 1: -+ ino = parent_ino(dentry); -+ if (filldir(dirent, "..", 2, pos, ino, DT_DIR) < 0) -+ goto out; -+ pos++; -+ /* fall through */ -+ default: -+ index = pos - 2; -+ if (index >= size) -+ goto out; -+ for (p += index; p->name; p++) { -+ if (proc_fill_cache(filp, dirent, filldir, p->name, p->len, -+ vs_proc_instantiate, PROC_I(inode)->fd, p)) -+ goto out; -+ pos++; -+ } -+ } -+out: -+ filp->f_pos = pos; -+ return 1; -+} ++ if (IS_ERR(new)) ++ return PTR_ERR(new); + ++ spin_lock_irqsave(&nxi->addr_lock, irqflags); ++ if (__find_v4_addr(nxi, ip, ip2, mask, type, flags, &nxa)) ++ goto out_unlock; + ++ if (NX_IPV4(nxi)) { ++ nxa->next = new; ++ nxa = new; ++ new = NULL; + -+static struct file_operations proc_nx_info_file_operations = { -+ .read = proc_nx_info_read, -+}; ++ /* remove single ip for ip list */ ++ nxi->nx_flags &= ~NXF_SINGLE_IP; ++ } + -+static struct dentry_operations proc_nid_dentry_operations = { -+ .d_revalidate = proc_nid_revalidate, -+}; ++ nxa->ip[0].s_addr = ip; ++ nxa->ip[1].s_addr = ip2; ++ nxa->mask.s_addr = mask; ++ nxa->type = type; ++ nxa->flags = flags; ++ ret = 0; ++out_unlock: ++ spin_unlock_irqrestore(&nxi->addr_lock, irqflags); ++ if (new) ++ __dealloc_nx_addr_v4(new); ++ return ret; ++} + -+static struct vs_entry nx_base_stuff[] = { -+ NINF("info", S_IRUGO, nxi_info), -+ NINF("status", S_IRUGO, nxi_status), -+ {} -+}; ++int do_remove_v4_addr(struct nx_info *nxi, __be32 ip, __be32 ip2, __be32 mask, ++ uint16_t type, uint16_t flags) ++{ ++ struct nx_addr_v4 *nxa = NULL; ++ struct nx_addr_v4 *old = NULL; ++ unsigned long irqflags; ++ int ret = 0; + ++ spin_lock_irqsave(&nxi->addr_lock, irqflags); ++ switch (type) { ++ case NXA_TYPE_ADDR: ++ old = __find_v4_addr(nxi, ip, ip2, mask, type, flags, &nxa); ++ if (old) { ++ if (nxa) { ++ nxa->next = old->next; ++ old->next = NULL; ++ } else { ++ if (old->next) { ++ nxa = old; ++ old = old->next; ++ *nxa = *old; ++ old->next = NULL; ++ } else { ++ memset(old, 0, sizeof(*old)); ++ old = NULL; ++ } ++ } ++ } else ++ ret = -ESRCH; ++ break; + -+static struct dentry *proc_nid_instantiate(struct inode *dir, -+ struct dentry *dentry, int id, void *ptr) -+{ -+ dentry->d_op = &proc_nid_dentry_operations; -+ return vs_proc_instantiate(dir, dentry, id, ptr); ++ case NXA_TYPE_ANY: ++ nxa = &nxi->v4; ++ old = nxa->next; ++ memset(nxa, 0, sizeof(*nxa)); ++ break; ++ ++ default: ++ ret = -EINVAL; ++ } ++ spin_unlock_irqrestore(&nxi->addr_lock, irqflags); ++ __dealloc_nx_addr_v4_all(old); ++ return ret; +} + -+static struct dentry *proc_nid_lookup(struct inode *dir, -+ struct dentry *dentry, unsigned int flags) ++ ++int vc_net_add(struct nx_info *nxi, void __user *data) +{ -+ struct vs_entry *p = nx_base_stuff; -+ struct dentry *error = ERR_PTR(-ENOENT); ++ struct vcmd_net_addr_v0 vc_data; ++ int index, ret = 0; + -+ for (; p->name; p++) { -+ if (p->len != dentry->d_name.len) -+ continue; -+ if (!memcmp(dentry->d_name.name, p->name, p->len)) -+ break; -+ } -+ if (!p->name) -+ goto out; ++ if (data && copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; + -+ error = proc_nid_instantiate(dir, dentry, PROC_I(dir)->fd, p); -+out: -+ return error; -+} ++ switch (vc_data.type) { ++ case NXA_TYPE_IPV4: ++ if ((vc_data.count < 1) || (vc_data.count > 4)) ++ return -EINVAL; + -+static int proc_nid_readdir(struct file *filp, -+ void *dirent, filldir_t filldir) -+{ -+ struct dentry *dentry = filp->f_dentry; -+ struct inode *inode = dentry->d_inode; -+ struct vs_entry *p = nx_base_stuff; -+ int size = sizeof(nx_base_stuff) / sizeof(struct vs_entry); -+ int pos, index; -+ u64 ino; ++ index = 0; ++ while (index < vc_data.count) { ++ ret = do_add_v4_addr(nxi, vc_data.ip[index].s_addr, 0, ++ vc_data.mask[index].s_addr, NXA_TYPE_ADDR, 0); ++ if (ret) ++ return ret; ++ index++; ++ } ++ ret = index; ++ break; ++ ++ case NXA_TYPE_IPV4|NXA_MOD_BCAST: ++ nxi->v4_bcast = vc_data.ip[0]; ++ ret = 1; ++ break; ++ ++ case NXA_TYPE_IPV4|NXA_MOD_LBACK: ++ nxi->v4_lback = vc_data.ip[0]; ++ ret = 1; ++ break; + -+ pos = filp->f_pos; -+ switch (pos) { -+ case 0: -+ ino = inode->i_ino; -+ if (filldir(dirent, ".", 1, pos, ino, DT_DIR) < 0) -+ goto out; -+ pos++; -+ /* fall through */ -+ case 1: -+ ino = parent_ino(dentry); -+ if (filldir(dirent, "..", 2, pos, ino, DT_DIR) < 0) -+ goto out; -+ pos++; -+ /* fall through */ + default: -+ index = pos - 2; -+ if (index >= size) -+ goto out; -+ for (p += index; p->name; p++) { -+ if (proc_fill_cache(filp, dirent, filldir, p->name, p->len, -+ vs_proc_instantiate, PROC_I(inode)->fd, p)) -+ goto out; -+ pos++; -+ } ++ ret = -EINVAL; ++ break; + } -+out: -+ filp->f_pos = pos; -+ return 1; ++ return ret; +} + -+ -+#define MAX_MULBY10 ((~0U - 9) / 10) -+ -+static inline int atovid(const char *str, int len) ++int vc_net_remove(struct nx_info *nxi, void __user *data) +{ -+ int vid, c; ++ struct vcmd_net_addr_v0 vc_data; + -+ vid = 0; -+ while (len-- > 0) { -+ c = *str - '0'; -+ str++; -+ if (c > 9) -+ return -1; -+ if (vid >= MAX_MULBY10) -+ return -1; -+ vid *= 10; -+ vid += c; -+ if (!vid) -+ return -1; ++ if (data && copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; ++ ++ switch (vc_data.type) { ++ case NXA_TYPE_ANY: ++ return do_remove_v4_addr(nxi, 0, 0, 0, vc_data.type, 0); ++ default: ++ return -EINVAL; + } -+ return vid; ++ return 0; +} + -+/* now the upper level (virtual) */ -+ + -+static struct file_operations proc_xid_file_operations = { -+ .read = generic_read_dir, -+ .readdir = proc_xid_readdir, -+}; ++int vc_net_add_ipv4_v1(struct nx_info *nxi, void __user *data) ++{ ++ struct vcmd_net_addr_ipv4_v1 vc_data; + -+static struct inode_operations proc_xid_inode_operations = { -+ .lookup = proc_xid_lookup, -+}; ++ if (data && copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; + -+static struct vs_entry vx_virtual_stuff[] = { -+ INF("info", S_IRUGO, virtual_info), -+ INF("status", S_IRUGO, virtual_status), -+ DIR(NULL, S_IRUGO | S_IXUGO, xid), -+}; ++ switch (vc_data.type) { ++ case NXA_TYPE_ADDR: ++ case NXA_TYPE_MASK: ++ return do_add_v4_addr(nxi, vc_data.ip.s_addr, 0, ++ vc_data.mask.s_addr, vc_data.type, vc_data.flags); + ++ case NXA_TYPE_ADDR | NXA_MOD_BCAST: ++ nxi->v4_bcast = vc_data.ip; ++ break; + -+static struct dentry *proc_virtual_lookup(struct inode *dir, -+ struct dentry *dentry, unsigned int flags) -+{ -+ struct vs_entry *p = vx_virtual_stuff; -+ struct dentry *error = ERR_PTR(-ENOENT); -+ int id = 0; ++ case NXA_TYPE_ADDR | NXA_MOD_LBACK: ++ nxi->v4_lback = vc_data.ip; ++ break; + -+ for (; p->name; p++) { -+ if (p->len != dentry->d_name.len) -+ continue; -+ if (!memcmp(dentry->d_name.name, p->name, p->len)) -+ break; ++ default: ++ return -EINVAL; + } -+ if (p->name) -+ goto instantiate; -+ -+ id = atovid(dentry->d_name.name, dentry->d_name.len); -+ if ((id < 0) || !xid_is_hashed(id)) -+ goto out; -+ -+instantiate: -+ error = proc_xid_instantiate(dir, dentry, id, p); -+out: -+ return error; ++ return 0; +} + -+static struct file_operations proc_nid_file_operations = { -+ .read = generic_read_dir, -+ .readdir = proc_nid_readdir, -+}; ++int vc_net_add_ipv4(struct nx_info *nxi, void __user *data) ++{ ++ struct vcmd_net_addr_ipv4_v2 vc_data; + -+static struct inode_operations proc_nid_inode_operations = { -+ .lookup = proc_nid_lookup, -+}; ++ if (data && copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; + -+static struct vs_entry nx_virtnet_stuff[] = { -+ INF("info", S_IRUGO, virtnet_info), -+ INF("status", S_IRUGO, virtnet_status), -+ DIR(NULL, S_IRUGO | S_IXUGO, nid), -+}; ++ switch (vc_data.type) { ++ case NXA_TYPE_ADDR: ++ case NXA_TYPE_MASK: ++ case NXA_TYPE_RANGE: ++ return do_add_v4_addr(nxi, vc_data.ip.s_addr, vc_data.ip2.s_addr, ++ vc_data.mask.s_addr, vc_data.type, vc_data.flags); + ++ case NXA_TYPE_ADDR | NXA_MOD_BCAST: ++ nxi->v4_bcast = vc_data.ip; ++ break; + -+static struct dentry *proc_virtnet_lookup(struct inode *dir, -+ struct dentry *dentry, unsigned int flags) -+{ -+ struct vs_entry *p = nx_virtnet_stuff; -+ struct dentry *error = ERR_PTR(-ENOENT); -+ int id = 0; ++ case NXA_TYPE_ADDR | NXA_MOD_LBACK: ++ nxi->v4_lback = vc_data.ip; ++ break; + -+ for (; p->name; p++) { -+ if (p->len != dentry->d_name.len) -+ continue; -+ if (!memcmp(dentry->d_name.name, p->name, p->len)) -+ break; ++ default: ++ return -EINVAL; + } -+ if (p->name) -+ goto instantiate; ++ return 0; ++} + -+ id = atovid(dentry->d_name.name, dentry->d_name.len); -+ if ((id < 0) || !nid_is_hashed(id)) -+ goto out; -+ -+instantiate: -+ error = proc_nid_instantiate(dir, dentry, id, p); -+out: -+ return error; -+} ++int vc_net_rem_ipv4_v1(struct nx_info *nxi, void __user *data) ++{ ++ struct vcmd_net_addr_ipv4_v1 vc_data; + ++ if (data && copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; + -+#define PROC_MAXVIDS 32 ++ return do_remove_v4_addr(nxi, vc_data.ip.s_addr, 0, ++ vc_data.mask.s_addr, vc_data.type, vc_data.flags); ++} + -+int proc_virtual_readdir(struct file *filp, -+ void *dirent, filldir_t filldir) ++int vc_net_rem_ipv4(struct nx_info *nxi, void __user *data) +{ -+ struct dentry *dentry = filp->f_dentry; -+ struct inode *inode = dentry->d_inode; -+ struct vs_entry *p = vx_virtual_stuff; -+ int size = sizeof(vx_virtual_stuff) / sizeof(struct vs_entry); -+ int pos, index; -+ unsigned int xid_array[PROC_MAXVIDS]; -+ char buf[PROC_NUMBUF]; -+ unsigned int nr_xids, i; -+ u64 ino; -+ -+ pos = filp->f_pos; -+ switch (pos) { -+ case 0: -+ ino = inode->i_ino; -+ if (filldir(dirent, ".", 1, pos, ino, DT_DIR) < 0) -+ goto out; -+ pos++; -+ /* fall through */ -+ case 1: -+ ino = parent_ino(dentry); -+ if (filldir(dirent, "..", 2, pos, ino, DT_DIR) < 0) -+ goto out; -+ pos++; -+ /* fall through */ -+ default: -+ index = pos - 2; -+ if (index >= size) -+ goto entries; -+ for (p += index; p->name; p++) { -+ if (proc_fill_cache(filp, dirent, filldir, p->name, p->len, -+ vs_proc_instantiate, 0, p)) -+ goto out; -+ pos++; -+ } -+ entries: -+ index = pos - size; -+ p = &vx_virtual_stuff[size - 1]; -+ nr_xids = get_xid_list(index, xid_array, PROC_MAXVIDS); -+ for (i = 0; i < nr_xids; i++) { -+ int n, xid = xid_array[i]; -+ unsigned int j = PROC_NUMBUF; ++ struct vcmd_net_addr_ipv4_v2 vc_data; + -+ n = xid; -+ do -+ buf[--j] = '0' + (n % 10); -+ while (n /= 10); ++ if (data && copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; + -+ if (proc_fill_cache(filp, dirent, filldir, -+ buf + j, PROC_NUMBUF - j, -+ vs_proc_instantiate, xid, p)) -+ goto out; -+ pos++; -+ } -+ } -+out: -+ filp->f_pos = pos; -+ return 0; ++ return do_remove_v4_addr(nxi, vc_data.ip.s_addr, vc_data.ip2.s_addr, ++ vc_data.mask.s_addr, vc_data.type, vc_data.flags); +} + -+static int proc_virtual_getattr(struct vfsmount *mnt, -+ struct dentry *dentry, struct kstat *stat) ++#ifdef CONFIG_IPV6 ++ ++static inline ++struct nx_addr_v6 *__find_v6_addr(struct nx_info *nxi, ++ struct in6_addr *ip, struct in6_addr *mask, ++ uint32_t prefix, uint16_t type, uint16_t flags, ++ struct nx_addr_v6 **prev) +{ -+ struct inode *inode = dentry->d_inode; ++ struct nx_addr_v6 *nxa = &nxi->v6; + -+ generic_fillattr(inode, stat); -+ stat->nlink = 2 + atomic_read(&vx_global_cactive); -+ return 0; ++ for (; nxa; nxa = nxa->next) { ++ if (ipv6_addr_equal(&nxa->ip, ip) && ++ ipv6_addr_equal(&nxa->mask, mask) && ++ (nxa->prefix == prefix) && ++ (nxa->type == type) && ++ (nxa->flags == flags)) ++ return nxa; ++ ++ /* save previous entry */ ++ if (prev) ++ *prev = nxa; ++ } ++ return NULL; +} + -+static struct file_operations proc_virtual_dir_operations = { -+ .read = generic_read_dir, -+ .readdir = proc_virtual_readdir, -+}; + -+static struct inode_operations proc_virtual_dir_inode_operations = { -+ .getattr = proc_virtual_getattr, -+ .lookup = proc_virtual_lookup, -+}; ++int do_add_v6_addr(struct nx_info *nxi, ++ struct in6_addr *ip, struct in6_addr *mask, ++ uint32_t prefix, uint16_t type, uint16_t flags) ++{ ++ struct nx_addr_v6 *nxa = NULL; ++ struct nx_addr_v6 *new = __alloc_nx_addr_v6(); ++ unsigned long irqflags; ++ int ret = -EEXIST; + ++ if (IS_ERR(new)) ++ return PTR_ERR(new); + ++ spin_lock_irqsave(&nxi->addr_lock, irqflags); ++ if (__find_v6_addr(nxi, ip, mask, prefix, type, flags, &nxa)) ++ goto out_unlock; + ++ if (NX_IPV6(nxi)) { ++ nxa->next = new; ++ nxa = new; ++ new = NULL; ++ } + ++ nxa->ip = *ip; ++ nxa->mask = *mask; ++ nxa->prefix = prefix; ++ nxa->type = type; ++ nxa->flags = flags; ++ ret = 0; ++out_unlock: ++ spin_unlock_irqrestore(&nxi->addr_lock, irqflags); ++ if (new) ++ __dealloc_nx_addr_v6(new); ++ return ret; ++} + -+int proc_virtnet_readdir(struct file *filp, -+ void *dirent, filldir_t filldir) ++int do_remove_v6_addr(struct nx_info *nxi, ++ struct in6_addr *ip, struct in6_addr *mask, ++ uint32_t prefix, uint16_t type, uint16_t flags) +{ -+ struct dentry *dentry = filp->f_dentry; -+ struct inode *inode = dentry->d_inode; -+ struct vs_entry *p = nx_virtnet_stuff; -+ int size = sizeof(nx_virtnet_stuff) / sizeof(struct vs_entry); -+ int pos, index; -+ unsigned int nid_array[PROC_MAXVIDS]; -+ char buf[PROC_NUMBUF]; -+ unsigned int nr_nids, i; -+ u64 ino; ++ struct nx_addr_v6 *nxa = NULL; ++ struct nx_addr_v6 *old = NULL; ++ unsigned long irqflags; ++ int ret = 0; + -+ pos = filp->f_pos; -+ switch (pos) { -+ case 0: -+ ino = inode->i_ino; -+ if (filldir(dirent, ".", 1, pos, ino, DT_DIR) < 0) -+ goto out; -+ pos++; -+ /* fall through */ -+ case 1: -+ ino = parent_ino(dentry); -+ if (filldir(dirent, "..", 2, pos, ino, DT_DIR) < 0) -+ goto out; -+ pos++; -+ /* fall through */ -+ default: -+ index = pos - 2; -+ if (index >= size) -+ goto entries; -+ for (p += index; p->name; p++) { -+ if (proc_fill_cache(filp, dirent, filldir, p->name, p->len, -+ vs_proc_instantiate, 0, p)) -+ goto out; -+ pos++; -+ } -+ entries: -+ index = pos - size; -+ p = &nx_virtnet_stuff[size - 1]; -+ nr_nids = get_nid_list(index, nid_array, PROC_MAXVIDS); -+ for (i = 0; i < nr_nids; i++) { -+ int n, nid = nid_array[i]; -+ unsigned int j = PROC_NUMBUF; ++ spin_lock_irqsave(&nxi->addr_lock, irqflags); ++ switch (type) { ++ case NXA_TYPE_ADDR: ++ old = __find_v6_addr(nxi, ip, mask, prefix, type, flags, &nxa); ++ if (old) { ++ if (nxa) { ++ nxa->next = old->next; ++ old->next = NULL; ++ } else { ++ if (old->next) { ++ nxa = old; ++ old = old->next; ++ *nxa = *old; ++ old->next = NULL; ++ } else { ++ memset(old, 0, sizeof(*old)); ++ old = NULL; ++ } ++ } ++ } else ++ ret = -ESRCH; ++ break; + -+ n = nid; -+ do -+ buf[--j] = '0' + (n % 10); -+ while (n /= 10); ++ case NXA_TYPE_ANY: ++ nxa = &nxi->v6; ++ old = nxa->next; ++ memset(nxa, 0, sizeof(*nxa)); ++ break; + -+ if (proc_fill_cache(filp, dirent, filldir, -+ buf + j, PROC_NUMBUF - j, -+ vs_proc_instantiate, nid, p)) -+ goto out; -+ pos++; -+ } ++ default: ++ ret = -EINVAL; + } -+out: -+ filp->f_pos = pos; -+ return 0; ++ spin_unlock_irqrestore(&nxi->addr_lock, irqflags); ++ __dealloc_nx_addr_v6_all(old); ++ return ret; +} + -+static int proc_virtnet_getattr(struct vfsmount *mnt, -+ struct dentry *dentry, struct kstat *stat) ++int vc_net_add_ipv6(struct nx_info *nxi, void __user *data) +{ -+ struct inode *inode = dentry->d_inode; ++ struct vcmd_net_addr_ipv6_v1 vc_data; + -+ generic_fillattr(inode, stat); -+ stat->nlink = 2 + atomic_read(&nx_global_cactive); ++ if (data && copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; ++ ++ switch (vc_data.type) { ++ case NXA_TYPE_ADDR: ++ memset(&vc_data.mask, ~0, sizeof(vc_data.mask)); ++ /* fallthrough */ ++ case NXA_TYPE_MASK: ++ return do_add_v6_addr(nxi, &vc_data.ip, &vc_data.mask, ++ vc_data.prefix, vc_data.type, vc_data.flags); ++ default: ++ return -EINVAL; ++ } + return 0; +} + -+static struct file_operations proc_virtnet_dir_operations = { -+ .read = generic_read_dir, -+ .readdir = proc_virtnet_readdir, -+}; -+ -+static struct inode_operations proc_virtnet_dir_inode_operations = { -+ .getattr = proc_virtnet_getattr, -+ .lookup = proc_virtnet_lookup, -+}; -+ -+ -+ -+void proc_vx_init(void) ++int vc_net_remove_ipv6(struct nx_info *nxi, void __user *data) +{ -+ struct proc_dir_entry *ent; ++ struct vcmd_net_addr_ipv6_v1 vc_data; + -+ ent = proc_mkdir("virtual", 0); -+ if (ent) { -+ ent->proc_fops = &proc_virtual_dir_operations; -+ ent->proc_iops = &proc_virtual_dir_inode_operations; -+ } -+ proc_virtual = ent; ++ if (data && copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; + -+ ent = proc_mkdir("virtnet", 0); -+ if (ent) { -+ ent->proc_fops = &proc_virtnet_dir_operations; -+ ent->proc_iops = &proc_virtnet_dir_inode_operations; ++ switch (vc_data.type) { ++ case NXA_TYPE_ADDR: ++ memset(&vc_data.mask, ~0, sizeof(vc_data.mask)); ++ /* fallthrough */ ++ case NXA_TYPE_MASK: ++ return do_remove_v6_addr(nxi, &vc_data.ip, &vc_data.mask, ++ vc_data.prefix, vc_data.type, vc_data.flags); ++ case NXA_TYPE_ANY: ++ return do_remove_v6_addr(nxi, NULL, NULL, 0, vc_data.type, 0); ++ default: ++ return -EINVAL; + } -+ proc_virtnet = ent; ++ return 0; +} + ++#endif /* CONFIG_IPV6 */ + + ++int vc_get_nflags(struct nx_info *nxi, void __user *data) ++{ ++ struct vcmd_net_flags_v0 vc_data; + -+/* per pid info */ ++ vc_data.flagword = nxi->nx_flags; ++ ++ /* special STATE flag handling */ ++ vc_data.mask = vs_mask_flags(~0ULL, nxi->nx_flags, NXF_ONE_TIME); + ++ if (copy_to_user(data, &vc_data, sizeof(vc_data))) ++ return -EFAULT; ++ return 0; ++} + -+int proc_pid_vx_info(struct task_struct *p, char *buffer) ++int vc_set_nflags(struct nx_info *nxi, void __user *data) +{ -+ struct vx_info *vxi; -+ char *orig = buffer; ++ struct vcmd_net_flags_v0 vc_data; ++ uint64_t mask, trigger; + -+ buffer += sprintf(buffer, "XID:\t%d\n", vx_task_xid(p)); ++ if (copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; + -+ vxi = task_get_vx_info(p); -+ if (!vxi) -+ goto out; ++ /* special STATE flag handling */ ++ mask = vs_mask_mask(vc_data.mask, nxi->nx_flags, NXF_ONE_TIME); ++ trigger = (mask & nxi->nx_flags) ^ (mask & vc_data.flagword); + -+ buffer += sprintf(buffer, "BCaps:\t"); -+ buffer = print_cap_t(buffer, &vxi->vx_bcaps); -+ buffer += sprintf(buffer, "\n"); -+ buffer += sprintf(buffer, "CCaps:\t%016llx\n", -+ (unsigned long long)vxi->vx_ccaps); -+ buffer += sprintf(buffer, "CFlags:\t%016llx\n", -+ (unsigned long long)vxi->vx_flags); -+ buffer += sprintf(buffer, "CIPid:\t%d\n", vxi->vx_initpid); ++ nxi->nx_flags = vs_mask_flags(nxi->nx_flags, ++ vc_data.flagword, mask); ++ if (trigger & NXF_PERSISTENT) ++ nx_update_persistent(nxi); + -+ put_vx_info(vxi); -+out: -+ return buffer - orig; ++ return 0; +} + -+ -+int proc_pid_nx_info(struct task_struct *p, char *buffer) ++int vc_get_ncaps(struct nx_info *nxi, void __user *data) +{ -+ struct nx_info *nxi; -+ struct nx_addr_v4 *v4a; -+#ifdef CONFIG_IPV6 -+ struct nx_addr_v6 *v6a; -+#endif -+ char *orig = buffer; -+ int i; ++ struct vcmd_net_caps_v0 vc_data; + -+ buffer += sprintf(buffer, "NID:\t%d\n", nx_task_nid(p)); ++ vc_data.ncaps = nxi->nx_ncaps; ++ vc_data.cmask = ~0ULL; + -+ nxi = task_get_nx_info(p); -+ if (!nxi) -+ goto out; ++ if (copy_to_user(data, &vc_data, sizeof(vc_data))) ++ return -EFAULT; ++ return 0; ++} + -+ buffer += sprintf(buffer, "NCaps:\t%016llx\n", -+ (unsigned long long)nxi->nx_ncaps); -+ buffer += sprintf(buffer, "NFlags:\t%016llx\n", -+ (unsigned long long)nxi->nx_flags); ++int vc_set_ncaps(struct nx_info *nxi, void __user *data) ++{ ++ struct vcmd_net_caps_v0 vc_data; + -+ buffer += sprintf(buffer, -+ "V4Root[bcast]:\t" NIPQUAD_FMT "\n", -+ NIPQUAD(nxi->v4_bcast.s_addr)); -+ buffer += sprintf (buffer, -+ "V4Root[lback]:\t" NIPQUAD_FMT "\n", -+ NIPQUAD(nxi->v4_lback.s_addr)); -+ if (!NX_IPV4(nxi)) -+ goto skip_v4; -+ for (i = 0, v4a = &nxi->v4; v4a; i++, v4a = v4a->next) -+ buffer += sprintf(buffer, "V4Root[%d]:\t" NXAV4_FMT "\n", -+ i, NXAV4(v4a)); -+skip_v4: -+#ifdef CONFIG_IPV6 -+ if (!NX_IPV6(nxi)) -+ goto skip_v6; -+ for (i = 0, v6a = &nxi->v6; v6a; i++, v6a = v6a->next) -+ buffer += sprintf(buffer, "V6Root[%d]:\t" NXAV6_FMT "\n", -+ i, NXAV6(v6a)); -+skip_v6: -+#endif -+ put_nx_info(nxi); -+out: -+ return buffer - orig; ++ if (copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; ++ ++ nxi->nx_ncaps = vs_mask_flags(nxi->nx_ncaps, ++ vc_data.ncaps, vc_data.cmask); ++ return 0; +} + -diff -NurpP --minimal linux-3.7/kernel/vserver/sched.c linux-3.7-vs2.3.5.1/kernel/vserver/sched.c ---- linux-3.7/kernel/vserver/sched.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/sched.c 2012-12-11 15:56:33.000000000 +0000 -@@ -0,0 +1,83 @@ ++ ++#include ++ ++module_init(init_network); ++ ++EXPORT_SYMBOL_GPL(free_nx_info); ++EXPORT_SYMBOL_GPL(unhash_nx_info); ++ +diff -NurpP --minimal linux-3.18.5/kernel/vserver/proc.c linux-3.18.5-vs2.3.7.3/kernel/vserver/proc.c +--- linux-3.18.5/kernel/vserver/proc.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/vserver/proc.c 2015-01-21 08:57:26.000000000 +0000 +@@ -0,0 +1,1100 @@ +/* -+ * linux/kernel/vserver/sched.c ++ * linux/kernel/vserver/proc.c + * -+ * Virtual Server: Scheduler Support ++ * Virtual Context Support + * -+ * Copyright (C) 2004-2010 Herbert Pötzl ++ * Copyright (C) 2003-2011 Herbert Pötzl + * -+ * V0.01 adapted Sam Vilains version to 2.6.3 -+ * V0.02 removed legacy interface -+ * V0.03 changed vcmds to vxi arg -+ * V0.04 removed older and legacy interfaces -+ * V0.05 removed scheduler code/commands ++ * V0.01 basic structure ++ * V0.02 adaptation vs1.3.0 ++ * V0.03 proc permissions ++ * V0.04 locking/generic ++ * V0.05 next generation procfs ++ * V0.06 inode validation ++ * V0.07 generic rewrite vid ++ * V0.08 remove inode type ++ * V0.09 added u/wmask info + * + */ + ++#include ++#include ++#include ++#include ++#include ++ +#include -+#include -+#include -+#include ++#include ++#include + -+#include ++#include ++#include ++#include ++#include ++ ++#include + ++#include "cvirt_proc.h" ++#include "cacct_proc.h" ++#include "limit_proc.h" ++#include "sched_proc.h" ++#include "vci_config.h" + -+void vx_update_sched_param(struct _vx_sched *sched, -+ struct _vx_sched_pc *sched_pc) ++#include <../../fs/proc/internal.h> ++ ++ ++static inline char *print_cap_t(char *buffer, kernel_cap_t *c) +{ -+ sched_pc->prio_bias = sched->prio_bias; ++ unsigned __capi; ++ ++ CAP_FOR_EACH_U32(__capi) { ++ buffer += sprintf(buffer, "%08x", ++ c->cap[(_KERNEL_CAPABILITY_U32S-1) - __capi]); ++ } ++ return buffer; +} + -+static int do_set_prio_bias(struct vx_info *vxi, struct vcmd_prio_bias *data) -+{ -+ int cpu; + -+ if (data->prio_bias > MAX_PRIO_BIAS) -+ data->prio_bias = MAX_PRIO_BIAS; -+ if (data->prio_bias < MIN_PRIO_BIAS) -+ data->prio_bias = MIN_PRIO_BIAS; ++static struct proc_dir_entry *proc_virtual; + -+ if (data->cpu_id != ~0) { -+ vxi->sched.update = cpumask_of_cpu(data->cpu_id); -+ cpumask_and(&vxi->sched.update, &vxi->sched.update, -+ cpu_online_mask); -+ } else -+ cpumask_copy(&vxi->sched.update, cpu_online_mask); ++static struct proc_dir_entry *proc_virtnet; + -+ for_each_cpu_mask(cpu, vxi->sched.update) -+ vx_update_sched_param(&vxi->sched, -+ &vx_per_cpu(vxi, sched_pc, cpu)); -+ return 0; -+} + -+int vc_set_prio_bias(struct vx_info *vxi, void __user *data) ++/* first the actual feeds */ ++ ++ ++static int proc_vci(char *buffer) +{ -+ struct vcmd_prio_bias vc_data; ++ return sprintf(buffer, ++ "VCIVersion:\t%04x:%04x\n" ++ "VCISyscall:\t%d\n" ++ "VCIKernel:\t%08x\n", ++ VCI_VERSION >> 16, ++ VCI_VERSION & 0xFFFF, ++ __NR_vserver, ++ vci_kernel_config()); ++} + -+ if (copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; ++static int proc_virtual_info(char *buffer) ++{ ++ return proc_vci(buffer); ++} + -+ return do_set_prio_bias(vxi, &vc_data); ++static int proc_virtual_status(char *buffer) ++{ ++ return sprintf(buffer, ++ "#CTotal:\t%d\n" ++ "#CActive:\t%d\n" ++ "#NSProxy:\t%d\t%d %d %d %d %d %d\n" ++ "#InitTask:\t%d\t%d %d\n", ++ atomic_read(&vx_global_ctotal), ++ atomic_read(&vx_global_cactive), ++ atomic_read(&vs_global_nsproxy), ++ atomic_read(&vs_global_fs), ++ atomic_read(&vs_global_mnt_ns), ++ atomic_read(&vs_global_uts_ns), ++ atomic_read(&nr_ipc_ns), ++ atomic_read(&vs_global_user_ns), ++ atomic_read(&vs_global_pid_ns), ++ atomic_read(&init_task.usage), ++ atomic_read(&init_task.nsproxy->count), ++ init_task.fs->users); +} + -+int vc_get_prio_bias(struct vx_info *vxi, void __user *data) ++ ++int proc_vxi_info(struct vx_info *vxi, char *buffer) +{ -+ struct vcmd_prio_bias vc_data; -+ struct _vx_sched_pc *pcd; -+ int cpu; ++ int length; + -+ if (copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; ++ length = sprintf(buffer, ++ "ID:\t%d\n" ++ "Info:\t%p\n" ++ "Init:\t%d\n" ++ "OOM:\t%lld\n", ++ vxi->vx_id, ++ vxi, ++ vxi->vx_initpid, ++ vxi->vx_badness_bias); ++ return length; ++} + -+ cpu = vc_data.cpu_id; ++int proc_vxi_status(struct vx_info *vxi, char *buffer) ++{ ++ char *orig = buffer; + -+ if (!cpu_possible(cpu)) -+ return -EINVAL; ++ buffer += sprintf(buffer, ++ "UseCnt:\t%d\n" ++ "Tasks:\t%d\n" ++ "Flags:\t%016llx\n", ++ atomic_read(&vxi->vx_usecnt), ++ atomic_read(&vxi->vx_tasks), ++ (unsigned long long)vxi->vx_flags); + -+ pcd = &vx_per_cpu(vxi, sched_pc, cpu); -+ vc_data.prio_bias = pcd->prio_bias; ++ buffer += sprintf(buffer, "BCaps:\t"); ++ buffer = print_cap_t(buffer, &vxi->vx_bcaps); ++ buffer += sprintf(buffer, "\n"); + -+ if (copy_to_user(data, &vc_data, sizeof(vc_data))) -+ return -EFAULT; -+ return 0; ++ buffer += sprintf(buffer, ++ "CCaps:\t%016llx\n" ++ "Umask:\t%16llx\n" ++ "Wmask:\t%16llx\n" ++ "Spaces:\t%08lx %08lx\n", ++ (unsigned long long)vxi->vx_ccaps, ++ (unsigned long long)vxi->vx_umask, ++ (unsigned long long)vxi->vx_wmask, ++ vxi->space[0].vx_nsmask, vxi->space[1].vx_nsmask); ++ return buffer - orig; +} + -diff -NurpP --minimal linux-3.7/kernel/vserver/sched_init.h linux-3.7-vs2.3.5.1/kernel/vserver/sched_init.h ---- linux-3.7/kernel/vserver/sched_init.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/sched_init.h 2012-12-11 15:56:33.000000000 +0000 -@@ -0,0 +1,27 @@ -+ -+static inline void vx_info_init_sched(struct _vx_sched *sched) ++int proc_vxi_limit(struct vx_info *vxi, char *buffer) +{ -+ /* scheduling; hard code starting values as constants */ -+ sched->prio_bias = 0; ++ return vx_info_proc_limit(&vxi->limit, buffer); +} + -+static inline -+void vx_info_init_sched_pc(struct _vx_sched_pc *sched_pc, int cpu) ++int proc_vxi_sched(struct vx_info *vxi, char *buffer) +{ -+ sched_pc->prio_bias = 0; ++ int cpu, length; + -+ sched_pc->user_ticks = 0; -+ sched_pc->sys_ticks = 0; -+ sched_pc->hold_ticks = 0; ++ length = vx_info_proc_sched(&vxi->sched, buffer); ++ for_each_online_cpu(cpu) { ++ length += vx_info_proc_sched_pc( ++ &vx_per_cpu(vxi, sched_pc, cpu), ++ buffer + length, cpu); ++ } ++ return length; +} + -+static inline void vx_info_exit_sched(struct _vx_sched *sched) ++int proc_vxi_nsproxy0(struct vx_info *vxi, char *buffer) +{ -+ return; ++ return vx_info_proc_nsproxy(vxi->space[0].vx_nsproxy, buffer); +} + -+static inline -+void vx_info_exit_sched_pc(struct _vx_sched_pc *sched_pc, int cpu) ++int proc_vxi_nsproxy1(struct vx_info *vxi, char *buffer) +{ -+ return; ++ return vx_info_proc_nsproxy(vxi->space[1].vx_nsproxy, buffer); +} -diff -NurpP --minimal linux-3.7/kernel/vserver/sched_proc.h linux-3.7-vs2.3.5.1/kernel/vserver/sched_proc.h ---- linux-3.7/kernel/vserver/sched_proc.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/sched_proc.h 2012-12-11 15:56:33.000000000 +0000 -@@ -0,0 +1,32 @@ -+#ifndef _VX_SCHED_PROC_H -+#define _VX_SCHED_PROC_H + ++int proc_vxi_cvirt(struct vx_info *vxi, char *buffer) ++{ ++ int cpu, length; + -+static inline -+int vx_info_proc_sched(struct _vx_sched *sched, char *buffer) -+{ -+ int length = 0; -+ -+ length += sprintf(buffer, -+ "PrioBias:\t%8d\n", -+ sched->prio_bias); ++ vx_update_load(vxi); ++ length = vx_info_proc_cvirt(&vxi->cvirt, buffer); ++ for_each_online_cpu(cpu) { ++ length += vx_info_proc_cvirt_pc( ++ &vx_per_cpu(vxi, cvirt_pc, cpu), ++ buffer + length, cpu); ++ } + return length; +} + -+static inline -+int vx_info_proc_sched_pc(struct _vx_sched_pc *sched_pc, -+ char *buffer, int cpu) ++int proc_vxi_cacct(struct vx_info *vxi, char *buffer) +{ -+ int length = 0; ++ return vx_info_proc_cacct(&vxi->cacct, buffer); ++} + -+ length += sprintf(buffer + length, -+ "cpu %d: %lld %lld %lld", cpu, -+ (unsigned long long)sched_pc->user_ticks, -+ (unsigned long long)sched_pc->sys_ticks, -+ (unsigned long long)sched_pc->hold_ticks); -+ length += sprintf(buffer + length, -+ " %d\n", sched_pc->prio_bias); -+ return length; ++ ++static int proc_virtnet_info(char *buffer) ++{ ++ return proc_vci(buffer); +} + -+#endif /* _VX_SCHED_PROC_H */ -diff -NurpP --minimal linux-3.7/kernel/vserver/signal.c linux-3.7-vs2.3.5.1/kernel/vserver/signal.c ---- linux-3.7/kernel/vserver/signal.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/signal.c 2012-12-11 15:56:33.000000000 +0000 -@@ -0,0 +1,134 @@ -+/* -+ * linux/kernel/vserver/signal.c -+ * -+ * Virtual Server: Signal Support -+ * -+ * Copyright (C) 2003-2007 Herbert Pötzl -+ * -+ * V0.01 broken out from vcontext V0.05 -+ * V0.02 changed vcmds to vxi arg -+ * V0.03 adjusted siginfo for kill -+ * -+ */ ++static int proc_virtnet_status(char *buffer) ++{ ++ return sprintf(buffer, ++ "#CTotal:\t%d\n" ++ "#CActive:\t%d\n", ++ atomic_read(&nx_global_ctotal), ++ atomic_read(&nx_global_cactive)); ++} + -+#include ++int proc_nxi_info(struct nx_info *nxi, char *buffer) ++{ ++ struct nx_addr_v4 *v4a; ++#ifdef CONFIG_IPV6 ++ struct nx_addr_v6 *v6a; ++#endif ++ int length, i; + -+#include -+#include -+#include ++ length = sprintf(buffer, ++ "ID:\t%d\n" ++ "Info:\t%p\n" ++ "Bcast:\t" NIPQUAD_FMT "\n" ++ "Lback:\t" NIPQUAD_FMT "\n", ++ nxi->nx_id, ++ nxi, ++ NIPQUAD(nxi->v4_bcast.s_addr), ++ NIPQUAD(nxi->v4_lback.s_addr)); + ++ if (!NX_IPV4(nxi)) ++ goto skip_v4; ++ for (i = 0, v4a = &nxi->v4; v4a; i++, v4a = v4a->next) ++ length += sprintf(buffer + length, "%d:\t" NXAV4_FMT "\n", ++ i, NXAV4(v4a)); ++skip_v4: ++#ifdef CONFIG_IPV6 ++ if (!NX_IPV6(nxi)) ++ goto skip_v6; ++ for (i = 0, v6a = &nxi->v6; v6a; i++, v6a = v6a->next) ++ length += sprintf(buffer + length, "%d:\t" NXAV6_FMT "\n", ++ i, NXAV6(v6a)); ++skip_v6: ++#endif ++ return length; ++} + -+int vx_info_kill(struct vx_info *vxi, int pid, int sig) ++int proc_nxi_status(struct nx_info *nxi, char *buffer) +{ -+ int retval, count = 0; -+ struct task_struct *p; -+ struct siginfo *sip = SEND_SIG_PRIV; ++ int length; + -+ retval = -ESRCH; -+ vxdprintk(VXD_CBIT(misc, 4), -+ "vx_info_kill(%p[#%d],%d,%d)*", -+ vxi, vxi->vx_id, pid, sig); -+ read_lock(&tasklist_lock); -+ switch (pid) { -+ case 0: -+ case -1: -+ for_each_process(p) { -+ int err = 0; ++ length = sprintf(buffer, ++ "UseCnt:\t%d\n" ++ "Tasks:\t%d\n" ++ "Flags:\t%016llx\n" ++ "NCaps:\t%016llx\n", ++ atomic_read(&nxi->nx_usecnt), ++ atomic_read(&nxi->nx_tasks), ++ (unsigned long long)nxi->nx_flags, ++ (unsigned long long)nxi->nx_ncaps); ++ return length; ++} + -+ if (vx_task_xid(p) != vxi->vx_id || p->pid <= 1 || -+ (pid && vxi->vx_initpid == p->pid)) -+ continue; + -+ err = group_send_sig_info(sig, sip, p); -+ ++count; -+ if (err != -EPERM) -+ retval = err; -+ } -+ break; + -+ case 1: -+ if (vxi->vx_initpid) { -+ pid = vxi->vx_initpid; -+ /* for now, only SIGINT to private init ... */ -+ if (!vx_info_flags(vxi, VXF_STATE_ADMIN, 0) && -+ /* ... as long as there are tasks left */ -+ (atomic_read(&vxi->vx_tasks) > 1)) -+ sig = SIGINT; -+ } -+ /* fallthrough */ -+ default: -+ rcu_read_lock(); -+ p = find_task_by_real_pid(pid); -+ rcu_read_unlock(); -+ if (p) { -+ if (vx_task_xid(p) == vxi->vx_id) -+ retval = group_send_sig_info(sig, sip, p); -+ } -+ break; -+ } -+ read_unlock(&tasklist_lock); -+ vxdprintk(VXD_CBIT(misc, 4), -+ "vx_info_kill(%p[#%d],%d,%d,%ld) = %d", -+ vxi, vxi->vx_id, pid, sig, (long)sip, retval); -+ return retval; -+} ++/* here the inode helpers */ + -+int vc_ctx_kill(struct vx_info *vxi, void __user *data) ++struct vs_entry { ++ int len; ++ char *name; ++ mode_t mode; ++ struct inode_operations *iop; ++ struct file_operations *fop; ++ union proc_op op; ++}; ++ ++static struct inode *vs_proc_make_inode(struct super_block *sb, struct vs_entry *p) +{ -+ struct vcmd_ctx_kill_v0 vc_data; ++ struct inode *inode = new_inode(sb); + -+ if (copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; ++ if (!inode) ++ goto out; + -+ /* special check to allow guest shutdown */ -+ if (!vx_info_flags(vxi, VXF_STATE_ADMIN, 0) && -+ /* forbid killall pid=0 when init is present */ -+ (((vc_data.pid < 1) && vxi->vx_initpid) || -+ (vc_data.pid > 1))) -+ return -EACCES; ++ inode->i_mode = p->mode; ++ if (p->iop) ++ inode->i_op = p->iop; ++ if (p->fop) ++ inode->i_fop = p->fop; + -+ return vx_info_kill(vxi, vc_data.pid, vc_data.sig); -+} ++ set_nlink(inode, (p->mode & S_IFDIR) ? 2 : 1); ++ inode->i_flags |= S_IMMUTABLE; + ++ inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME; + -+static int __wait_exit(struct vx_info *vxi) -+{ -+ DECLARE_WAITQUEUE(wait, current); -+ int ret = 0; ++ i_uid_write(inode, 0); ++ i_gid_write(inode, 0); ++ i_tag_write(inode, 0); ++out: ++ return inode; ++} + -+ add_wait_queue(&vxi->vx_wait, &wait); -+ set_current_state(TASK_INTERRUPTIBLE); ++static struct dentry *vs_proc_instantiate(struct inode *dir, ++ struct dentry *dentry, int id, void *ptr) ++{ ++ struct vs_entry *p = ptr; ++ struct inode *inode = vs_proc_make_inode(dir->i_sb, p); ++ struct dentry *error = ERR_PTR(-EINVAL); + -+wait: -+ if (vx_info_state(vxi, -+ VXS_SHUTDOWN | VXS_HASHED | VXS_HELPER) == VXS_SHUTDOWN) -+ goto out; -+ if (signal_pending(current)) { -+ ret = -ERESTARTSYS; ++ if (!inode) + goto out; -+ } -+ schedule(); -+ goto wait; + ++ PROC_I(inode)->op = p->op; ++ PROC_I(inode)->fd = id; ++ d_add(dentry, inode); ++ error = NULL; +out: -+ set_current_state(TASK_RUNNING); -+ remove_wait_queue(&vxi->vx_wait, &wait); -+ return ret; ++ return error; +} + ++/* Lookups */ + ++typedef struct dentry *vx_instantiate_t(struct inode *, struct dentry *, int, void *); + -+int vc_wait_exit(struct vx_info *vxi, void __user *data) -+{ -+ struct vcmd_wait_exit_v0 vc_data; -+ int ret; -+ -+ ret = __wait_exit(vxi); -+ vc_data.reboot_cmd = vxi->reboot_cmd; -+ vc_data.exit_code = vxi->exit_code; -+ -+ if (copy_to_user(data, &vc_data, sizeof(vc_data))) -+ ret = -EFAULT; -+ return ret; -+} + -diff -NurpP --minimal linux-3.7/kernel/vserver/space.c linux-3.7-vs2.3.5.1/kernel/vserver/space.c ---- linux-3.7/kernel/vserver/space.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/space.c 2012-12-11 21:15:48.000000000 +0000 -@@ -0,0 +1,436 @@ +/* -+ * linux/kernel/vserver/space.c -+ * -+ * Virtual Server: Context Space Support -+ * -+ * Copyright (C) 2003-2010 Herbert Pötzl ++ * Fill a directory entry. + * -+ * V0.01 broken out from context.c 0.07 -+ * V0.02 added task locking for namespace -+ * V0.03 broken out vx_enter_namespace -+ * V0.04 added *space support and commands -+ * V0.05 added credential support ++ * If possible create the dcache entry and derive our inode number and ++ * file type from dcache entry. + * ++ * Since all of the proc inode numbers are dynamically generated, the inode ++ * numbers do not exist until the inode is cache. This means creating the ++ * the dcache entry in iterate is necessary to keep the inode numbers ++ * reported by iterate in sync with the inode numbers reported ++ * by stat. + */ ++static int vx_proc_fill_cache(struct file *filp, struct dir_context *ctx, ++ char *name, int len, vx_instantiate_t instantiate, int id, void *ptr) ++{ ++ struct dentry *child, *dir = filp->f_dentry; ++ struct inode *inode; ++ struct qstr qname; ++ ino_t ino = 0; ++ unsigned type = DT_UNKNOWN; + -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+ -+atomic_t vs_global_nsproxy = ATOMIC_INIT(0); -+atomic_t vs_global_fs = ATOMIC_INIT(0); -+atomic_t vs_global_mnt_ns = ATOMIC_INIT(0); -+atomic_t vs_global_uts_ns = ATOMIC_INIT(0); -+atomic_t vs_global_user_ns = ATOMIC_INIT(0); -+atomic_t vs_global_pid_ns = ATOMIC_INIT(0); -+ -+ -+/* namespace functions */ -+ -+#include -+#include -+#include -+#include -+#include -+#include "../fs/mount.h" -+ ++ qname.name = name; ++ qname.len = len; ++ qname.hash = full_name_hash(name, len); + -+static const struct vcmd_space_mask_v1 space_mask_v0 = { -+ .mask = CLONE_FS | -+ CLONE_NEWNS | -+#ifdef CONFIG_UTS_NS -+ CLONE_NEWUTS | -+#endif -+#ifdef CONFIG_IPC_NS -+ CLONE_NEWIPC | -+#endif -+#ifdef CONFIG_USER_NS -+ CLONE_NEWUSER | -+#endif -+ 0 -+}; ++ child = d_lookup(dir, &qname); ++ if (!child) { ++ struct dentry *new; ++ new = d_alloc(dir, &qname); ++ if (new) { ++ child = instantiate(dir->d_inode, new, id, ptr); ++ if (child) ++ dput(new); ++ else ++ child = new; ++ } ++ } ++ if (!child || IS_ERR(child) || !child->d_inode) ++ goto end_instantiate; ++ inode = child->d_inode; ++ if (inode) { ++ ino = inode->i_ino; ++ type = inode->i_mode >> 12; ++ } ++ dput(child); ++end_instantiate: ++ if (!ino) ++ ino = 1; ++ return !dir_emit(ctx, name, len, ino, type); ++} + -+static const struct vcmd_space_mask_v1 space_mask = { -+ .mask = CLONE_FS | -+ CLONE_NEWNS | -+#ifdef CONFIG_UTS_NS -+ CLONE_NEWUTS | -+#endif -+#ifdef CONFIG_IPC_NS -+ CLONE_NEWIPC | -+#endif -+#ifdef CONFIG_USER_NS -+ CLONE_NEWUSER | -+#endif -+#ifdef CONFIG_PID_NS -+ CLONE_NEWPID | -+#endif -+#ifdef CONFIG_NET_NS -+ CLONE_NEWNET | -+#endif -+ 0 -+}; + -+static const struct vcmd_space_mask_v1 default_space_mask = { -+ .mask = CLONE_FS | -+ CLONE_NEWNS | -+#ifdef CONFIG_UTS_NS -+ CLONE_NEWUTS | -+#endif -+#ifdef CONFIG_IPC_NS -+ CLONE_NEWIPC | -+#endif -+#ifdef CONFIG_USER_NS -+ CLONE_NEWUSER | -+#endif -+#ifdef CONFIG_PID_NS -+// CLONE_NEWPID | -+#endif -+ 0 -+}; + -+/* -+ * build a new nsproxy mix -+ * assumes that both proxies are 'const' -+ * does not touch nsproxy refcounts -+ * will hold a reference on the result. -+ */ ++/* get and revalidate vx_info/xid */ + -+struct nsproxy *vs_mix_nsproxy(struct nsproxy *old_nsproxy, -+ struct nsproxy *new_nsproxy, unsigned long mask) ++static inline ++struct vx_info *get_proc_vx_info(struct inode *inode) +{ -+ struct mnt_namespace *old_ns; -+ struct uts_namespace *old_uts; -+ struct ipc_namespace *old_ipc; -+#ifdef CONFIG_PID_NS -+ struct pid_namespace *old_pid; -+#endif -+#ifdef CONFIG_NET_NS -+ struct net *old_net; -+#endif -+ struct nsproxy *nsproxy; -+ -+ nsproxy = copy_nsproxy(old_nsproxy); -+ if (!nsproxy) -+ goto out; -+ -+ if (mask & CLONE_NEWNS) { -+ old_ns = nsproxy->mnt_ns; -+ nsproxy->mnt_ns = new_nsproxy->mnt_ns; -+ if (nsproxy->mnt_ns) -+ get_mnt_ns(nsproxy->mnt_ns); -+ } else -+ old_ns = NULL; ++ return lookup_vx_info(PROC_I(inode)->fd); ++} + -+ if (mask & CLONE_NEWUTS) { -+ old_uts = nsproxy->uts_ns; -+ nsproxy->uts_ns = new_nsproxy->uts_ns; -+ if (nsproxy->uts_ns) -+ get_uts_ns(nsproxy->uts_ns); -+ } else -+ old_uts = NULL; ++static int proc_xid_revalidate(struct dentry *dentry, unsigned int flags) ++{ ++ struct inode *inode = dentry->d_inode; ++ vxid_t xid = PROC_I(inode)->fd; + -+ if (mask & CLONE_NEWIPC) { -+ old_ipc = nsproxy->ipc_ns; -+ nsproxy->ipc_ns = new_nsproxy->ipc_ns; -+ if (nsproxy->ipc_ns) -+ get_ipc_ns(nsproxy->ipc_ns); -+ } else -+ old_ipc = NULL; ++ if (flags & LOOKUP_RCU) /* FIXME: can be dropped? */ ++ return -ECHILD; + -+#ifdef CONFIG_PID_NS -+ if (mask & CLONE_NEWPID) { -+ old_pid = nsproxy->pid_ns; -+ nsproxy->pid_ns = new_nsproxy->pid_ns; -+ if (nsproxy->pid_ns) -+ get_pid_ns(nsproxy->pid_ns); -+ } else -+ old_pid = NULL; -+#endif -+#ifdef CONFIG_NET_NS -+ if (mask & CLONE_NEWNET) { -+ old_net = nsproxy->net_ns; -+ nsproxy->net_ns = new_nsproxy->net_ns; -+ if (nsproxy->net_ns) -+ get_net(nsproxy->net_ns); -+ } else -+ old_net = NULL; -+#endif -+ if (old_ns) -+ put_mnt_ns(old_ns); -+ if (old_uts) -+ put_uts_ns(old_uts); -+ if (old_ipc) -+ put_ipc_ns(old_ipc); -+#ifdef CONFIG_PID_NS -+ if (old_pid) -+ put_pid_ns(old_pid); -+#endif -+#ifdef CONFIG_NET_NS -+ if (old_net) -+ put_net(old_net); -+#endif -+out: -+ return nsproxy; ++ if (!xid || xid_is_hashed(xid)) ++ return 1; ++ d_drop(dentry); ++ return 0; +} + + -+/* -+ * merge two nsproxy structs into a new one. -+ * will hold a reference on the result. -+ */ ++/* get and revalidate nx_info/nid */ + -+static inline -+struct nsproxy *__vs_merge_nsproxy(struct nsproxy *old, -+ struct nsproxy *proxy, unsigned long mask) ++static int proc_nid_revalidate(struct dentry *dentry, unsigned int flags) +{ -+ struct nsproxy null_proxy = { .mnt_ns = NULL }; ++ struct inode *inode = dentry->d_inode; ++ vnid_t nid = PROC_I(inode)->fd; + -+ if (!proxy) -+ return NULL; ++ if (flags & LOOKUP_RCU) /* FIXME: can be dropped? */ ++ return -ECHILD; + -+ if (mask) { -+ /* vs_mix_nsproxy returns with reference */ -+ return vs_mix_nsproxy(old ? old : &null_proxy, -+ proxy, mask); -+ } -+ get_nsproxy(proxy); -+ return proxy; ++ if (!nid || nid_is_hashed(nid)) ++ return 1; ++ d_drop(dentry); ++ return 0; +} + + -+int vx_enter_space(struct vx_info *vxi, unsigned long mask, unsigned index) -+{ -+ struct nsproxy *proxy, *proxy_cur, *proxy_new; -+ struct fs_struct *fs_cur, *fs = NULL; -+ struct _vx_space *space; -+ int ret, kill = 0; + -+ vxdprintk(VXD_CBIT(space, 8), "vx_enter_space(%p[#%u],0x%08lx,%d)", -+ vxi, vxi->vx_id, mask, index); ++#define PROC_BLOCK_SIZE (PAGE_SIZE - 1024) + -+ if (vx_info_flags(vxi, VXF_INFO_PRIVATE, 0)) -+ return -EACCES; ++static ssize_t proc_vs_info_read(struct file *file, char __user *buf, ++ size_t count, loff_t *ppos) ++{ ++ struct inode *inode = file->f_dentry->d_inode; ++ unsigned long page; ++ ssize_t length = 0; + -+ if (index >= VX_SPACES) -+ return -EINVAL; ++ if (count > PROC_BLOCK_SIZE) ++ count = PROC_BLOCK_SIZE; + -+ space = &vxi->space[index]; ++ /* fade that out as soon as stable */ ++ WARN_ON(PROC_I(inode)->fd); + -+ if (!mask) -+ mask = space->vx_nsmask; ++ if (!(page = __get_free_page(GFP_KERNEL))) ++ return -ENOMEM; + -+ if ((mask & space->vx_nsmask) != mask) -+ return -EINVAL; ++ BUG_ON(!PROC_I(inode)->op.proc_vs_read); ++ length = PROC_I(inode)->op.proc_vs_read((char *)page); + -+ if (mask & CLONE_FS) { -+ fs = copy_fs_struct(space->vx_fs); -+ if (!fs) -+ return -ENOMEM; -+ } -+ proxy = space->vx_nsproxy; -+ -+ vxdprintk(VXD_CBIT(space, 9), -+ "vx_enter_space(%p[#%u],0x%08lx,%d) -> (%p,%p)", -+ vxi, vxi->vx_id, mask, index, proxy, fs); ++ if (length >= 0) ++ length = simple_read_from_buffer(buf, count, ppos, ++ (char *)page, length); + -+ task_lock(current); -+ fs_cur = current->fs; ++ free_page(page); ++ return length; ++} + -+ if (mask & CLONE_FS) { -+ spin_lock(&fs_cur->lock); -+ current->fs = fs; -+ kill = !--fs_cur->users; -+ spin_unlock(&fs_cur->lock); -+ } ++static ssize_t proc_vx_info_read(struct file *file, char __user *buf, ++ size_t count, loff_t *ppos) ++{ ++ struct inode *inode = file->f_dentry->d_inode; ++ struct vx_info *vxi = NULL; ++ vxid_t xid = PROC_I(inode)->fd; ++ unsigned long page; ++ ssize_t length = 0; + -+ proxy_cur = current->nsproxy; -+ get_nsproxy(proxy_cur); -+ task_unlock(current); ++ if (count > PROC_BLOCK_SIZE) ++ count = PROC_BLOCK_SIZE; + -+ if (kill) -+ free_fs_struct(fs_cur); ++ /* fade that out as soon as stable */ ++ WARN_ON(!xid); ++ vxi = lookup_vx_info(xid); ++ if (!vxi) ++ goto out; + -+ proxy_new = __vs_merge_nsproxy(proxy_cur, proxy, mask); -+ if (IS_ERR(proxy_new)) { -+ ret = PTR_ERR(proxy_new); ++ length = -ENOMEM; ++ if (!(page = __get_free_page(GFP_KERNEL))) + goto out_put; -+ } + -+ proxy_new = xchg(¤t->nsproxy, proxy_new); -+ -+ if (mask & CLONE_NEWUSER) { -+ struct cred *cred; -+ -+ vxdprintk(VXD_CBIT(space, 10), -+ "vx_enter_space(%p[#%u],%p) cred (%p,%p)", -+ vxi, vxi->vx_id, space->vx_cred, -+ current->real_cred, current->cred); -+ -+ if (space->vx_cred) { -+ cred = __prepare_creds(space->vx_cred); -+ if (cred) -+ commit_creds(cred); -+ } -+ } ++ BUG_ON(!PROC_I(inode)->op.proc_vxi_read); ++ length = PROC_I(inode)->op.proc_vxi_read(vxi, (char *)page); + -+ ret = 0; ++ if (length >= 0) ++ length = simple_read_from_buffer(buf, count, ppos, ++ (char *)page, length); + -+ if (proxy_new) -+ put_nsproxy(proxy_new); ++ free_page(page); +out_put: -+ if (proxy_cur) -+ put_nsproxy(proxy_cur); -+ return ret; ++ put_vx_info(vxi); ++out: ++ return length; +} + -+ -+int vx_set_space(struct vx_info *vxi, unsigned long mask, unsigned index) ++static ssize_t proc_nx_info_read(struct file *file, char __user *buf, ++ size_t count, loff_t *ppos) +{ -+ struct nsproxy *proxy_vxi, *proxy_cur, *proxy_new; -+ struct fs_struct *fs_vxi, *fs = NULL; -+ struct _vx_space *space; -+ int ret, kill = 0; ++ struct inode *inode = file->f_dentry->d_inode; ++ struct nx_info *nxi = NULL; ++ vnid_t nid = PROC_I(inode)->fd; ++ unsigned long page; ++ ssize_t length = 0; + -+ vxdprintk(VXD_CBIT(space, 8), "vx_set_space(%p[#%u],0x%08lx,%d)", -+ vxi, vxi->vx_id, mask, index); ++ if (count > PROC_BLOCK_SIZE) ++ count = PROC_BLOCK_SIZE; + -+ if ((mask & space_mask.mask) != mask) -+ return -EINVAL; ++ /* fade that out as soon as stable */ ++ WARN_ON(!nid); ++ nxi = lookup_nx_info(nid); ++ if (!nxi) ++ goto out; + -+ if (index >= VX_SPACES) -+ return -EINVAL; ++ length = -ENOMEM; ++ if (!(page = __get_free_page(GFP_KERNEL))) ++ goto out_put; + -+ space = &vxi->space[index]; ++ BUG_ON(!PROC_I(inode)->op.proc_nxi_read); ++ length = PROC_I(inode)->op.proc_nxi_read(nxi, (char *)page); + -+ proxy_vxi = space->vx_nsproxy; -+ fs_vxi = space->vx_fs; ++ if (length >= 0) ++ length = simple_read_from_buffer(buf, count, ppos, ++ (char *)page, length); + -+ if (mask & CLONE_FS) { -+ fs = copy_fs_struct(current->fs); -+ if (!fs) -+ return -ENOMEM; -+ } ++ free_page(page); ++out_put: ++ put_nx_info(nxi); ++out: ++ return length; ++} + -+ task_lock(current); + -+ if (mask & CLONE_FS) { -+ spin_lock(&fs_vxi->lock); -+ space->vx_fs = fs; -+ kill = !--fs_vxi->users; -+ spin_unlock(&fs_vxi->lock); -+ } + -+ proxy_cur = current->nsproxy; -+ get_nsproxy(proxy_cur); -+ task_unlock(current); ++/* here comes the lower level */ + -+ if (kill) -+ free_fs_struct(fs_vxi); + -+ proxy_new = __vs_merge_nsproxy(proxy_vxi, proxy_cur, mask); -+ if (IS_ERR(proxy_new)) { -+ ret = PTR_ERR(proxy_new); -+ goto out_put; -+ } ++#define NOD(NAME, MODE, IOP, FOP, OP) { \ ++ .len = sizeof(NAME) - 1, \ ++ .name = (NAME), \ ++ .mode = MODE, \ ++ .iop = IOP, \ ++ .fop = FOP, \ ++ .op = OP, \ ++} + -+ proxy_new = xchg(&space->vx_nsproxy, proxy_new); -+ space->vx_nsmask |= mask; + -+ if (mask & CLONE_NEWUSER) { -+ struct cred *cred; ++#define DIR(NAME, MODE, OTYPE) \ ++ NOD(NAME, (S_IFDIR | (MODE)), \ ++ &proc_ ## OTYPE ## _inode_operations, \ ++ &proc_ ## OTYPE ## _file_operations, { } ) + -+ vxdprintk(VXD_CBIT(space, 10), -+ "vx_set_space(%p[#%u],%p) cred (%p,%p)", -+ vxi, vxi->vx_id, space->vx_cred, -+ current->real_cred, current->cred); ++#define INF(NAME, MODE, OTYPE) \ ++ NOD(NAME, (S_IFREG | (MODE)), NULL, \ ++ &proc_vs_info_file_operations, \ ++ { .proc_vs_read = &proc_##OTYPE } ) + -+ cred = prepare_creds(); -+ cred = (struct cred *)xchg(&space->vx_cred, cred); -+ if (cred) -+ abort_creds(cred); -+ } ++#define VINF(NAME, MODE, OTYPE) \ ++ NOD(NAME, (S_IFREG | (MODE)), NULL, \ ++ &proc_vx_info_file_operations, \ ++ { .proc_vxi_read = &proc_##OTYPE } ) + -+ ret = 0; ++#define NINF(NAME, MODE, OTYPE) \ ++ NOD(NAME, (S_IFREG | (MODE)), NULL, \ ++ &proc_nx_info_file_operations, \ ++ { .proc_nxi_read = &proc_##OTYPE } ) + -+ if (proxy_new) -+ put_nsproxy(proxy_new); -+out_put: -+ if (proxy_cur) -+ put_nsproxy(proxy_cur); -+ return ret; -+} + ++static struct file_operations proc_vs_info_file_operations = { ++ .read = proc_vs_info_read, ++}; + -+int vc_enter_space_v1(struct vx_info *vxi, void __user *data) -+{ -+ struct vcmd_space_mask_v1 vc_data = { .mask = 0 }; ++static struct file_operations proc_vx_info_file_operations = { ++ .read = proc_vx_info_read, ++}; + -+ if (data && copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; ++static struct dentry_operations proc_xid_dentry_operations = { ++ .d_revalidate = proc_xid_revalidate, ++}; + -+ return vx_enter_space(vxi, vc_data.mask, 0); -+} ++static struct vs_entry vx_base_stuff[] = { ++ VINF("info", S_IRUGO, vxi_info), ++ VINF("status", S_IRUGO, vxi_status), ++ VINF("limit", S_IRUGO, vxi_limit), ++ VINF("sched", S_IRUGO, vxi_sched), ++ VINF("nsproxy", S_IRUGO, vxi_nsproxy0), ++ VINF("nsproxy1",S_IRUGO, vxi_nsproxy1), ++ VINF("cvirt", S_IRUGO, vxi_cvirt), ++ VINF("cacct", S_IRUGO, vxi_cacct), ++ {} ++}; + -+int vc_enter_space(struct vx_info *vxi, void __user *data) -+{ -+ struct vcmd_space_mask_v2 vc_data = { .mask = 0 }; + -+ if (data && copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; + -+ if (vc_data.index >= VX_SPACES) -+ return -EINVAL; + -+ return vx_enter_space(vxi, vc_data.mask, vc_data.index); ++static struct dentry *proc_xid_instantiate(struct inode *dir, ++ struct dentry *dentry, int id, void *ptr) ++{ ++ dentry->d_op = &proc_xid_dentry_operations; ++ return vs_proc_instantiate(dir, dentry, id, ptr); +} + -+int vc_set_space_v1(struct vx_info *vxi, void __user *data) ++static struct dentry *proc_xid_lookup(struct inode *dir, ++ struct dentry *dentry, unsigned int flags) +{ -+ struct vcmd_space_mask_v1 vc_data = { .mask = 0 }; ++ struct vs_entry *p = vx_base_stuff; ++ struct dentry *error = ERR_PTR(-ENOENT); + -+ if (data && copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; ++ for (; p->name; p++) { ++ if (p->len != dentry->d_name.len) ++ continue; ++ if (!memcmp(dentry->d_name.name, p->name, p->len)) ++ break; ++ } ++ if (!p->name) ++ goto out; + -+ return vx_set_space(vxi, vc_data.mask, 0); ++ error = proc_xid_instantiate(dir, dentry, PROC_I(dir)->fd, p); ++out: ++ return error; +} + -+int vc_set_space(struct vx_info *vxi, void __user *data) ++static int proc_xid_iterate(struct file *filp, struct dir_context *ctx) +{ -+ struct vcmd_space_mask_v2 vc_data = { .mask = 0 }; -+ -+ if (data && copy_from_user(&vc_data, data, sizeof(vc_data))) -+ return -EFAULT; -+ -+ if (vc_data.index >= VX_SPACES) -+ return -EINVAL; ++ struct dentry *dentry = filp->f_dentry; ++ struct inode *inode = dentry->d_inode; ++ struct vs_entry *p = vx_base_stuff; ++ int size = sizeof(vx_base_stuff) / sizeof(struct vs_entry); ++ int index; ++ u64 ino; + -+ return vx_set_space(vxi, vc_data.mask, vc_data.index); ++ switch (ctx->pos) { ++ case 0: ++ ino = inode->i_ino; ++ if (!dir_emit(ctx, ".", 1, ino, DT_DIR) < 0) ++ goto out; ++ ctx->pos++; ++ /* fall through */ ++ case 1: ++ ino = parent_ino(dentry); ++ if (!dir_emit(ctx, "..", 2, ino, DT_DIR) < 0) ++ goto out; ++ ctx->pos++; ++ /* fall through */ ++ default: ++ index = ctx->pos - 2; ++ if (index >= size) ++ goto out; ++ for (p += index; p->name; p++) { ++ if (vx_proc_fill_cache(filp, ctx, p->name, p->len, ++ vs_proc_instantiate, PROC_I(inode)->fd, p)) ++ goto out; ++ ctx->pos++; ++ } ++ } ++out: ++ return 1; +} + -+int vc_get_space_mask(void __user *data, int type) -+{ -+ const struct vcmd_space_mask_v1 *mask; -+ -+ if (type == 0) -+ mask = &space_mask_v0; -+ else if (type == 1) -+ mask = &space_mask; -+ else -+ mask = &default_space_mask; + -+ vxdprintk(VXD_CBIT(space, 10), -+ "vc_get_space_mask(%d) = %08llx", type, mask->mask); + -+ if (copy_to_user(data, mask, sizeof(*mask))) -+ return -EFAULT; -+ return 0; -+} ++static struct file_operations proc_nx_info_file_operations = { ++ .read = proc_nx_info_read, ++}; + -diff -NurpP --minimal linux-3.7/kernel/vserver/switch.c linux-3.7-vs2.3.5.1/kernel/vserver/switch.c ---- linux-3.7/kernel/vserver/switch.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/switch.c 2012-12-11 15:56:33.000000000 +0000 -@@ -0,0 +1,556 @@ -+/* -+ * linux/kernel/vserver/switch.c -+ * -+ * Virtual Server: Syscall Switch -+ * -+ * Copyright (C) 2003-2011 Herbert Pötzl -+ * -+ * V0.01 syscall switch -+ * V0.02 added signal to context -+ * V0.03 added rlimit functions -+ * V0.04 added iattr, task/xid functions -+ * V0.05 added debug/history stuff -+ * V0.06 added compat32 layer -+ * V0.07 vcmd args and perms -+ * V0.08 added status commands -+ * V0.09 added tag commands -+ * V0.10 added oom bias -+ * V0.11 added device commands -+ * V0.12 added warn mask -+ * -+ */ ++static struct dentry_operations proc_nid_dentry_operations = { ++ .d_revalidate = proc_nid_revalidate, ++}; + -+#include -+#include -+#include ++static struct vs_entry nx_base_stuff[] = { ++ NINF("info", S_IRUGO, nxi_info), ++ NINF("status", S_IRUGO, nxi_status), ++ {} ++}; + -+#include "vci_config.h" + ++static struct dentry *proc_nid_instantiate(struct inode *dir, ++ struct dentry *dentry, int id, void *ptr) ++{ ++ dentry->d_op = &proc_nid_dentry_operations; ++ return vs_proc_instantiate(dir, dentry, id, ptr); ++} + -+static inline -+int vc_get_version(uint32_t id) ++static struct dentry *proc_nid_lookup(struct inode *dir, ++ struct dentry *dentry, unsigned int flags) +{ -+ return VCI_VERSION; ++ struct vs_entry *p = nx_base_stuff; ++ struct dentry *error = ERR_PTR(-ENOENT); ++ ++ for (; p->name; p++) { ++ if (p->len != dentry->d_name.len) ++ continue; ++ if (!memcmp(dentry->d_name.name, p->name, p->len)) ++ break; ++ } ++ if (!p->name) ++ goto out; ++ ++ error = proc_nid_instantiate(dir, dentry, PROC_I(dir)->fd, p); ++out: ++ return error; +} + -+static inline -+int vc_get_vci(uint32_t id) ++static int proc_nid_iterate(struct file *filp, struct dir_context *ctx) +{ -+ return vci_kernel_config(); ++ struct dentry *dentry = filp->f_dentry; ++ struct inode *inode = dentry->d_inode; ++ struct vs_entry *p = nx_base_stuff; ++ int size = sizeof(nx_base_stuff) / sizeof(struct vs_entry); ++ int index; ++ u64 ino; ++ ++ switch (ctx->pos) { ++ case 0: ++ ino = inode->i_ino; ++ if (!dir_emit(ctx, ".", 1, ino, DT_DIR) < 0) ++ goto out; ++ ctx->pos++; ++ /* fall through */ ++ case 1: ++ ino = parent_ino(dentry); ++ if (!dir_emit(ctx, "..", 2, ino, DT_DIR) < 0) ++ goto out; ++ ctx->pos++; ++ /* fall through */ ++ default: ++ index = ctx->pos - 2; ++ if (index >= size) ++ goto out; ++ for (p += index; p->name; p++) { ++ if (vx_proc_fill_cache(filp, ctx, p->name, p->len, ++ vs_proc_instantiate, PROC_I(inode)->fd, p)) ++ goto out; ++ ctx->pos++; ++ } ++ } ++out: ++ return 1; +} + -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include + -+#include -+#include ++#define MAX_MULBY10 ((~0U - 9) / 10) + ++static inline int atovid(const char *str, int len) ++{ ++ int vid, c; + -+#ifdef CONFIG_COMPAT -+#define __COMPAT(name, id, data, compat) \ -+ (compat) ? name ## _x32(id, data) : name(id, data) -+#define __COMPAT_NO_ID(name, data, compat) \ -+ (compat) ? name ## _x32(data) : name(data) -+#else -+#define __COMPAT(name, id, data, compat) \ -+ name(id, data) -+#define __COMPAT_NO_ID(name, data, compat) \ -+ name(data) -+#endif ++ vid = 0; ++ while (len-- > 0) { ++ c = *str - '0'; ++ str++; ++ if (c > 9) ++ return -1; ++ if (vid >= MAX_MULBY10) ++ return -1; ++ vid *= 10; ++ vid += c; ++ if (!vid) ++ return -1; ++ } ++ return vid; ++} + ++/* now the upper level (virtual) */ + -+static inline -+long do_vcmd(uint32_t cmd, uint32_t id, -+ struct vx_info *vxi, struct nx_info *nxi, -+ void __user *data, int compat) -+{ -+ switch (cmd) { + -+ case VCMD_get_version: -+ return vc_get_version(id); -+ case VCMD_get_vci: -+ return vc_get_vci(id); ++static struct file_operations proc_xid_file_operations = { ++ .read = generic_read_dir, ++ .iterate = proc_xid_iterate, ++}; + -+ case VCMD_task_xid: -+ return vc_task_xid(id); -+ case VCMD_vx_info: -+ return vc_vx_info(vxi, data); ++static struct inode_operations proc_xid_inode_operations = { ++ .lookup = proc_xid_lookup, ++}; + -+ case VCMD_task_nid: -+ return vc_task_nid(id); -+ case VCMD_nx_info: -+ return vc_nx_info(nxi, data); ++static struct vs_entry vx_virtual_stuff[] = { ++ INF("info", S_IRUGO, virtual_info), ++ INF("status", S_IRUGO, virtual_status), ++ DIR(NULL, S_IRUGO | S_IXUGO, xid), ++}; + -+ case VCMD_task_tag: -+ return vc_task_tag(id); + -+ case VCMD_set_space_v1: -+ return vc_set_space_v1(vxi, data); -+ /* this is version 2 */ -+ case VCMD_set_space: -+ return vc_set_space(vxi, data); ++static struct dentry *proc_virtual_lookup(struct inode *dir, ++ struct dentry *dentry, unsigned int flags) ++{ ++ struct vs_entry *p = vx_virtual_stuff; ++ struct dentry *error = ERR_PTR(-ENOENT); ++ int id = 0; + -+ case VCMD_get_space_mask_v0: -+ return vc_get_space_mask(data, 0); -+ /* this is version 1 */ -+ case VCMD_get_space_mask: -+ return vc_get_space_mask(data, 1); ++ for (; p->name; p++) { ++ if (p->len != dentry->d_name.len) ++ continue; ++ if (!memcmp(dentry->d_name.name, p->name, p->len)) ++ break; ++ } ++ if (p->name) ++ goto instantiate; + -+ case VCMD_get_space_default: -+ return vc_get_space_mask(data, -1); ++ id = atovid(dentry->d_name.name, dentry->d_name.len); ++ if ((id < 0) || !xid_is_hashed(id)) ++ goto out; + -+ case VCMD_set_umask: -+ return vc_set_umask(vxi, data); ++instantiate: ++ error = proc_xid_instantiate(dir, dentry, id, p); ++out: ++ return error; ++} + -+ case VCMD_get_umask: -+ return vc_get_umask(vxi, data); ++static struct file_operations proc_nid_file_operations = { ++ .read = generic_read_dir, ++ .iterate = proc_nid_iterate, ++}; + -+ case VCMD_set_wmask: -+ return vc_set_wmask(vxi, data); ++static struct inode_operations proc_nid_inode_operations = { ++ .lookup = proc_nid_lookup, ++}; + -+ case VCMD_get_wmask: -+ return vc_get_wmask(vxi, data); -+#ifdef CONFIG_IA32_EMULATION -+ case VCMD_get_rlimit: -+ return __COMPAT(vc_get_rlimit, vxi, data, compat); -+ case VCMD_set_rlimit: -+ return __COMPAT(vc_set_rlimit, vxi, data, compat); -+#else -+ case VCMD_get_rlimit: -+ return vc_get_rlimit(vxi, data); -+ case VCMD_set_rlimit: -+ return vc_set_rlimit(vxi, data); -+#endif -+ case VCMD_get_rlimit_mask: -+ return vc_get_rlimit_mask(id, data); -+ case VCMD_reset_hits: -+ return vc_reset_hits(vxi, data); -+ case VCMD_reset_minmax: -+ return vc_reset_minmax(vxi, data); -+ -+ case VCMD_get_vhi_name: -+ return vc_get_vhi_name(vxi, data); -+ case VCMD_set_vhi_name: -+ return vc_set_vhi_name(vxi, data); -+ -+ case VCMD_ctx_stat: -+ return vc_ctx_stat(vxi, data); -+ case VCMD_virt_stat: -+ return vc_virt_stat(vxi, data); -+ case VCMD_sock_stat: -+ return vc_sock_stat(vxi, data); -+ case VCMD_rlimit_stat: -+ return vc_rlimit_stat(vxi, data); -+ -+ case VCMD_set_cflags: -+ return vc_set_cflags(vxi, data); -+ case VCMD_get_cflags: -+ return vc_get_cflags(vxi, data); -+ -+ /* this is version 1 */ -+ case VCMD_set_ccaps: -+ return vc_set_ccaps(vxi, data); -+ /* this is version 1 */ -+ case VCMD_get_ccaps: -+ return vc_get_ccaps(vxi, data); -+ case VCMD_set_bcaps: -+ return vc_set_bcaps(vxi, data); -+ case VCMD_get_bcaps: -+ return vc_get_bcaps(vxi, data); -+ -+ case VCMD_set_badness: -+ return vc_set_badness(vxi, data); -+ case VCMD_get_badness: -+ return vc_get_badness(vxi, data); -+ -+ case VCMD_set_nflags: -+ return vc_set_nflags(nxi, data); -+ case VCMD_get_nflags: -+ return vc_get_nflags(nxi, data); -+ -+ case VCMD_set_ncaps: -+ return vc_set_ncaps(nxi, data); -+ case VCMD_get_ncaps: -+ return vc_get_ncaps(nxi, data); -+ -+ case VCMD_set_prio_bias: -+ return vc_set_prio_bias(vxi, data); -+ case VCMD_get_prio_bias: -+ return vc_get_prio_bias(vxi, data); -+ case VCMD_add_dlimit: -+ return __COMPAT(vc_add_dlimit, id, data, compat); -+ case VCMD_rem_dlimit: -+ return __COMPAT(vc_rem_dlimit, id, data, compat); -+ case VCMD_set_dlimit: -+ return __COMPAT(vc_set_dlimit, id, data, compat); -+ case VCMD_get_dlimit: -+ return __COMPAT(vc_get_dlimit, id, data, compat); -+ -+ case VCMD_ctx_kill: -+ return vc_ctx_kill(vxi, data); ++static struct vs_entry nx_virtnet_stuff[] = { ++ INF("info", S_IRUGO, virtnet_info), ++ INF("status", S_IRUGO, virtnet_status), ++ DIR(NULL, S_IRUGO | S_IXUGO, nid), ++}; + -+ case VCMD_wait_exit: -+ return vc_wait_exit(vxi, data); + -+ case VCMD_get_iattr: -+ return __COMPAT_NO_ID(vc_get_iattr, data, compat); -+ case VCMD_set_iattr: -+ return __COMPAT_NO_ID(vc_set_iattr, data, compat); ++static struct dentry *proc_virtnet_lookup(struct inode *dir, ++ struct dentry *dentry, unsigned int flags) ++{ ++ struct vs_entry *p = nx_virtnet_stuff; ++ struct dentry *error = ERR_PTR(-ENOENT); ++ int id = 0; + -+ case VCMD_fget_iattr: -+ return vc_fget_iattr(id, data); -+ case VCMD_fset_iattr: -+ return vc_fset_iattr(id, data); ++ for (; p->name; p++) { ++ if (p->len != dentry->d_name.len) ++ continue; ++ if (!memcmp(dentry->d_name.name, p->name, p->len)) ++ break; ++ } ++ if (p->name) ++ goto instantiate; + -+ case VCMD_enter_space_v0: -+ return vc_enter_space_v1(vxi, NULL); -+ case VCMD_enter_space_v1: -+ return vc_enter_space_v1(vxi, data); -+ /* this is version 2 */ -+ case VCMD_enter_space: -+ return vc_enter_space(vxi, data); ++ id = atovid(dentry->d_name.name, dentry->d_name.len); ++ if ((id < 0) || !nid_is_hashed(id)) ++ goto out; + -+ case VCMD_ctx_create_v0: -+ return vc_ctx_create(id, NULL); -+ case VCMD_ctx_create: -+ return vc_ctx_create(id, data); -+ case VCMD_ctx_migrate_v0: -+ return vc_ctx_migrate(vxi, NULL); -+ case VCMD_ctx_migrate: -+ return vc_ctx_migrate(vxi, data); ++instantiate: ++ error = proc_nid_instantiate(dir, dentry, id, p); ++out: ++ return error; ++} + -+ case VCMD_net_create_v0: -+ return vc_net_create(id, NULL); -+ case VCMD_net_create: -+ return vc_net_create(id, data); -+ case VCMD_net_migrate: -+ return vc_net_migrate(nxi, data); + -+ case VCMD_tag_migrate: -+ return vc_tag_migrate(id); ++#define PROC_MAXVIDS 32 + -+ case VCMD_net_add: -+ return vc_net_add(nxi, data); -+ case VCMD_net_remove: -+ return vc_net_remove(nxi, data); ++int proc_virtual_iterate(struct file *filp, struct dir_context *ctx) ++{ ++ struct dentry *dentry = filp->f_dentry; ++ struct inode *inode = dentry->d_inode; ++ struct vs_entry *p = vx_virtual_stuff; ++ int size = sizeof(vx_virtual_stuff) / sizeof(struct vs_entry); ++ int index; ++ unsigned int xid_array[PROC_MAXVIDS]; ++ char buf[PROC_NUMBUF]; ++ unsigned int nr_xids, i; ++ u64 ino; + -+ case VCMD_net_add_ipv4_v1: -+ return vc_net_add_ipv4_v1(nxi, data); -+ /* this is version 2 */ -+ case VCMD_net_add_ipv4: -+ return vc_net_add_ipv4(nxi, data); ++ switch (ctx->pos) { ++ case 0: ++ ino = inode->i_ino; ++ if (!dir_emit(ctx, ".", 1, ino, DT_DIR) < 0) ++ goto out; ++ ctx->pos++; ++ /* fall through */ ++ case 1: ++ ino = parent_ino(dentry); ++ if (!dir_emit(ctx, "..", 2, ino, DT_DIR) < 0) ++ goto out; ++ ctx->pos++; ++ /* fall through */ ++ default: ++ index = ctx->pos - 2; ++ if (index >= size) ++ goto entries; ++ for (p += index; p->name; p++) { ++ if (vx_proc_fill_cache(filp, ctx, p->name, p->len, ++ vs_proc_instantiate, 0, p)) ++ goto out; ++ ctx->pos++; ++ } ++ entries: ++ index = ctx->pos - size; ++ p = &vx_virtual_stuff[size - 1]; ++ nr_xids = get_xid_list(index, xid_array, PROC_MAXVIDS); ++ for (i = 0; i < nr_xids; i++) { ++ int n, xid = xid_array[i]; ++ unsigned int j = PROC_NUMBUF; + -+ case VCMD_net_rem_ipv4_v1: -+ return vc_net_rem_ipv4_v1(nxi, data); -+ /* this is version 2 */ -+ case VCMD_net_rem_ipv4: -+ return vc_net_rem_ipv4(nxi, data); -+#ifdef CONFIG_IPV6 -+ case VCMD_net_add_ipv6: -+ return vc_net_add_ipv6(nxi, data); -+ case VCMD_net_remove_ipv6: -+ return vc_net_remove_ipv6(nxi, data); -+#endif -+/* case VCMD_add_match_ipv4: -+ return vc_add_match_ipv4(nxi, data); -+ case VCMD_get_match_ipv4: -+ return vc_get_match_ipv4(nxi, data); -+#ifdef CONFIG_IPV6 -+ case VCMD_add_match_ipv6: -+ return vc_add_match_ipv6(nxi, data); -+ case VCMD_get_match_ipv6: -+ return vc_get_match_ipv6(nxi, data); -+#endif */ ++ n = xid; ++ do ++ buf[--j] = '0' + (n % 10); ++ while (n /= 10); + -+#ifdef CONFIG_VSERVER_DEVICE -+ case VCMD_set_mapping: -+ return __COMPAT(vc_set_mapping, vxi, data, compat); -+ case VCMD_unset_mapping: -+ return __COMPAT(vc_unset_mapping, vxi, data, compat); -+#endif -+#ifdef CONFIG_VSERVER_HISTORY -+ case VCMD_dump_history: -+ return vc_dump_history(id); -+ case VCMD_read_history: -+ return __COMPAT(vc_read_history, id, data, compat); -+#endif -+ default: -+ vxwprintk_task(1, "unimplemented VCMD_%02d_%d[%d]", -+ VC_CATEGORY(cmd), VC_COMMAND(cmd), VC_VERSION(cmd)); ++ if (vx_proc_fill_cache(filp, ctx, ++ buf + j, PROC_NUMBUF - j, ++ vs_proc_instantiate, xid, p)) ++ goto out; ++ ctx->pos++; ++ } + } -+ return -ENOSYS; ++out: ++ return 0; +} + ++static int proc_virtual_getattr(struct vfsmount *mnt, ++ struct dentry *dentry, struct kstat *stat) ++{ ++ struct inode *inode = dentry->d_inode; + -+#define __VCMD(vcmd, _perm, _args, _flags) \ -+ case VCMD_ ## vcmd: perm = _perm; \ -+ args = _args; flags = _flags; break -+ ++ generic_fillattr(inode, stat); ++ stat->nlink = 2 + atomic_read(&vx_global_cactive); ++ return 0; ++} + -+#define VCA_NONE 0x00 -+#define VCA_VXI 0x01 -+#define VCA_NXI 0x02 ++static struct file_operations proc_virtual_dir_operations = { ++ .read = generic_read_dir, ++ .iterate = proc_virtual_iterate, ++}; + -+#define VCF_NONE 0x00 -+#define VCF_INFO 0x01 -+#define VCF_ADMIN 0x02 -+#define VCF_ARES 0x06 /* includes admin */ -+#define VCF_SETUP 0x08 ++static struct inode_operations proc_virtual_dir_inode_operations = { ++ .getattr = proc_virtual_getattr, ++ .lookup = proc_virtual_lookup, ++}; + -+#define VCF_ZIDOK 0x10 /* zero id okay */ + + -+static inline -+long do_vserver(uint32_t cmd, uint32_t id, void __user *data, int compat) ++int proc_virtnet_iterate(struct file *filp, struct dir_context *ctx) +{ -+ long ret; -+ int permit = -1, state = 0; -+ int perm = -1, args = 0, flags = 0; -+ struct vx_info *vxi = NULL; -+ struct nx_info *nxi = NULL; ++ struct dentry *dentry = filp->f_dentry; ++ struct inode *inode = dentry->d_inode; ++ struct vs_entry *p = nx_virtnet_stuff; ++ int size = sizeof(nx_virtnet_stuff) / sizeof(struct vs_entry); ++ int index; ++ unsigned int nid_array[PROC_MAXVIDS]; ++ char buf[PROC_NUMBUF]; ++ unsigned int nr_nids, i; ++ u64 ino; + -+ switch (cmd) { -+ /* unpriviledged commands */ -+ __VCMD(get_version, 0, VCA_NONE, 0); -+ __VCMD(get_vci, 0, VCA_NONE, 0); -+ __VCMD(get_rlimit_mask, 0, VCA_NONE, 0); -+ __VCMD(get_space_mask_v0,0, VCA_NONE, 0); -+ __VCMD(get_space_mask, 0, VCA_NONE, 0); -+ __VCMD(get_space_default,0, VCA_NONE, 0); ++ switch (ctx->pos) { ++ case 0: ++ ino = inode->i_ino; ++ if (!dir_emit(ctx, ".", 1, ino, DT_DIR) < 0) ++ goto out; ++ ctx->pos++; ++ /* fall through */ ++ case 1: ++ ino = parent_ino(dentry); ++ if (!dir_emit(ctx, "..", 2, ino, DT_DIR) < 0) ++ goto out; ++ ctx->pos++; ++ /* fall through */ ++ default: ++ index = ctx->pos - 2; ++ if (index >= size) ++ goto entries; ++ for (p += index; p->name; p++) { ++ if (vx_proc_fill_cache(filp, ctx, p->name, p->len, ++ vs_proc_instantiate, 0, p)) ++ goto out; ++ ctx->pos++; ++ } ++ entries: ++ index = ctx->pos - size; ++ p = &nx_virtnet_stuff[size - 1]; ++ nr_nids = get_nid_list(index, nid_array, PROC_MAXVIDS); ++ for (i = 0; i < nr_nids; i++) { ++ int n, nid = nid_array[i]; ++ unsigned int j = PROC_NUMBUF; + -+ /* info commands */ -+ __VCMD(task_xid, 2, VCA_NONE, 0); -+ __VCMD(reset_hits, 2, VCA_VXI, 0); -+ __VCMD(reset_minmax, 2, VCA_VXI, 0); -+ __VCMD(vx_info, 3, VCA_VXI, VCF_INFO); -+ __VCMD(get_bcaps, 3, VCA_VXI, VCF_INFO); -+ __VCMD(get_ccaps, 3, VCA_VXI, VCF_INFO); -+ __VCMD(get_cflags, 3, VCA_VXI, VCF_INFO); -+ __VCMD(get_umask, 3, VCA_VXI, VCF_INFO); -+ __VCMD(get_wmask, 3, VCA_VXI, VCF_INFO); -+ __VCMD(get_badness, 3, VCA_VXI, VCF_INFO); -+ __VCMD(get_vhi_name, 3, VCA_VXI, VCF_INFO); -+ __VCMD(get_rlimit, 3, VCA_VXI, VCF_INFO); ++ n = nid; ++ do ++ buf[--j] = '0' + (n % 10); ++ while (n /= 10); + -+ __VCMD(ctx_stat, 3, VCA_VXI, VCF_INFO); -+ __VCMD(virt_stat, 3, VCA_VXI, VCF_INFO); -+ __VCMD(sock_stat, 3, VCA_VXI, VCF_INFO); -+ __VCMD(rlimit_stat, 3, VCA_VXI, VCF_INFO); ++ if (vx_proc_fill_cache(filp, ctx, ++ buf + j, PROC_NUMBUF - j, ++ vs_proc_instantiate, nid, p)) ++ goto out; ++ ctx->pos++; ++ } ++ } ++out: ++ return 0; ++} + -+ __VCMD(task_nid, 2, VCA_NONE, 0); -+ __VCMD(nx_info, 3, VCA_NXI, VCF_INFO); -+ __VCMD(get_ncaps, 3, VCA_NXI, VCF_INFO); -+ __VCMD(get_nflags, 3, VCA_NXI, VCF_INFO); ++static int proc_virtnet_getattr(struct vfsmount *mnt, ++ struct dentry *dentry, struct kstat *stat) ++{ ++ struct inode *inode = dentry->d_inode; + -+ __VCMD(task_tag, 2, VCA_NONE, 0); ++ generic_fillattr(inode, stat); ++ stat->nlink = 2 + atomic_read(&nx_global_cactive); ++ return 0; ++} + -+ __VCMD(get_iattr, 2, VCA_NONE, 0); -+ __VCMD(fget_iattr, 2, VCA_NONE, 0); -+ __VCMD(get_dlimit, 3, VCA_NONE, VCF_INFO); -+ __VCMD(get_prio_bias, 3, VCA_VXI, VCF_INFO); ++static struct file_operations proc_virtnet_dir_operations = { ++ .read = generic_read_dir, ++ .iterate = proc_virtnet_iterate, ++}; + -+ /* lower admin commands */ -+ __VCMD(wait_exit, 4, VCA_VXI, VCF_INFO); -+ __VCMD(ctx_create_v0, 5, VCA_NONE, 0); -+ __VCMD(ctx_create, 5, VCA_NONE, 0); -+ __VCMD(ctx_migrate_v0, 5, VCA_VXI, VCF_ADMIN); -+ __VCMD(ctx_migrate, 5, VCA_VXI, VCF_ADMIN); -+ __VCMD(enter_space_v0, 5, VCA_VXI, VCF_ADMIN); -+ __VCMD(enter_space_v1, 5, VCA_VXI, VCF_ADMIN); -+ __VCMD(enter_space, 5, VCA_VXI, VCF_ADMIN); ++static struct inode_operations proc_virtnet_dir_inode_operations = { ++ .getattr = proc_virtnet_getattr, ++ .lookup = proc_virtnet_lookup, ++}; + -+ __VCMD(net_create_v0, 5, VCA_NONE, 0); -+ __VCMD(net_create, 5, VCA_NONE, 0); -+ __VCMD(net_migrate, 5, VCA_NXI, VCF_ADMIN); + -+ __VCMD(tag_migrate, 5, VCA_NONE, VCF_ADMIN); + -+ /* higher admin commands */ -+ __VCMD(ctx_kill, 6, VCA_VXI, VCF_ARES); -+ __VCMD(set_space_v1, 7, VCA_VXI, VCF_ARES | VCF_SETUP); -+ __VCMD(set_space, 7, VCA_VXI, VCF_ARES | VCF_SETUP); ++void proc_vx_init(void) ++{ ++ struct proc_dir_entry *ent; + -+ __VCMD(set_ccaps, 7, VCA_VXI, VCF_ARES | VCF_SETUP); -+ __VCMD(set_bcaps, 7, VCA_VXI, VCF_ARES | VCF_SETUP); -+ __VCMD(set_cflags, 7, VCA_VXI, VCF_ARES | VCF_SETUP); -+ __VCMD(set_umask, 7, VCA_VXI, VCF_ARES | VCF_SETUP); -+ __VCMD(set_wmask, 7, VCA_VXI, VCF_ARES | VCF_SETUP); -+ __VCMD(set_badness, 7, VCA_VXI, VCF_ARES | VCF_SETUP); ++ ent = proc_mkdir("virtual", 0); ++ if (ent) { ++ ent->proc_fops = &proc_virtual_dir_operations; ++ ent->proc_iops = &proc_virtual_dir_inode_operations; ++ } ++ proc_virtual = ent; + -+ __VCMD(set_vhi_name, 7, VCA_VXI, VCF_ARES | VCF_SETUP); -+ __VCMD(set_rlimit, 7, VCA_VXI, VCF_ARES | VCF_SETUP); -+ __VCMD(set_prio_bias, 7, VCA_VXI, VCF_ARES | VCF_SETUP); ++ ent = proc_mkdir("virtnet", 0); ++ if (ent) { ++ ent->proc_fops = &proc_virtnet_dir_operations; ++ ent->proc_iops = &proc_virtnet_dir_inode_operations; ++ } ++ proc_virtnet = ent; ++} + -+ __VCMD(set_ncaps, 7, VCA_NXI, VCF_ARES | VCF_SETUP); -+ __VCMD(set_nflags, 7, VCA_NXI, VCF_ARES | VCF_SETUP); -+ __VCMD(net_add, 8, VCA_NXI, VCF_ARES | VCF_SETUP); -+ __VCMD(net_remove, 8, VCA_NXI, VCF_ARES | VCF_SETUP); -+ __VCMD(net_add_ipv4_v1, 8, VCA_NXI, VCF_ARES | VCF_SETUP); -+ __VCMD(net_rem_ipv4_v1, 8, VCA_NXI, VCF_ARES | VCF_SETUP); -+ __VCMD(net_add_ipv4, 8, VCA_NXI, VCF_ARES | VCF_SETUP); -+ __VCMD(net_rem_ipv4, 8, VCA_NXI, VCF_ARES | VCF_SETUP); -+#ifdef CONFIG_IPV6 -+ __VCMD(net_add_ipv6, 8, VCA_NXI, VCF_ARES | VCF_SETUP); -+ __VCMD(net_remove_ipv6, 8, VCA_NXI, VCF_ARES | VCF_SETUP); -+#endif -+ __VCMD(set_iattr, 7, VCA_NONE, 0); -+ __VCMD(fset_iattr, 7, VCA_NONE, 0); -+ __VCMD(set_dlimit, 7, VCA_NONE, VCF_ARES); -+ __VCMD(add_dlimit, 8, VCA_NONE, VCF_ARES); -+ __VCMD(rem_dlimit, 8, VCA_NONE, VCF_ARES); + -+#ifdef CONFIG_VSERVER_DEVICE -+ __VCMD(set_mapping, 8, VCA_VXI, VCF_ARES|VCF_ZIDOK); -+ __VCMD(unset_mapping, 8, VCA_VXI, VCF_ARES|VCF_ZIDOK); -+#endif -+ /* debug level admin commands */ -+#ifdef CONFIG_VSERVER_HISTORY -+ __VCMD(dump_history, 9, VCA_NONE, 0); -+ __VCMD(read_history, 9, VCA_NONE, 0); -+#endif + -+ default: -+ perm = -1; -+ } + -+ vxdprintk(VXD_CBIT(switch, 0), -+ "vc: VCMD_%02d_%d[%d], %d,%p [%d,%d,%x,%x]", -+ VC_CATEGORY(cmd), VC_COMMAND(cmd), -+ VC_VERSION(cmd), id, data, compat, -+ perm, args, flags); ++/* per pid info */ + -+ ret = -ENOSYS; -+ if (perm < 0) -+ goto out; ++void render_cap_t(struct seq_file *, const char *, ++ struct vx_info *, kernel_cap_t *); + -+ state = 1; -+ if (!capable(CAP_CONTEXT)) -+ goto out; + -+ state = 2; -+ /* moved here from the individual commands */ -+ ret = -EPERM; -+ if ((perm > 1) && !capable(CAP_SYS_ADMIN)) -+ goto out; ++int proc_pid_vx_info( ++ struct seq_file *m, ++ struct pid_namespace *ns, ++ struct pid *pid, ++ struct task_struct *p) ++{ ++ struct vx_info *vxi; + -+ state = 3; -+ /* vcmd involves resource management */ -+ ret = -EPERM; -+ if ((flags & VCF_ARES) && !capable(CAP_SYS_RESOURCE)) -+ goto out; ++ seq_printf(m, "XID:\t%d\n", vx_task_xid(p)); + -+ state = 4; -+ /* various legacy exceptions */ -+ switch (cmd) { -+ /* will go away when spectator is a cap */ -+ case VCMD_ctx_migrate_v0: -+ case VCMD_ctx_migrate: -+ if (id == 1) { -+ current->xid = 1; -+ ret = 1; -+ goto out; -+ } -+ break; ++ vxi = task_get_vx_info(p); ++ if (!vxi) ++ return 0; + -+ /* will go away when spectator is a cap */ -+ case VCMD_net_migrate: -+ if (id == 1) { -+ current->nid = 1; -+ ret = 1; -+ goto out; -+ } -+ break; -+ } ++ render_cap_t(m, "BCaps:\t", vxi, &vxi->vx_bcaps); ++ seq_printf(m, "CCaps:\t%016llx\n", ++ (unsigned long long)vxi->vx_ccaps); ++ seq_printf(m, "CFlags:\t%016llx\n", ++ (unsigned long long)vxi->vx_flags); ++ seq_printf(m, "CIPid:\t%d\n", vxi->vx_initpid); + -+ /* vcmds are fine by default */ -+ permit = 1; ++ put_vx_info(vxi); ++ return 0; ++} + -+ /* admin type vcmds require admin ... */ -+ if (flags & VCF_ADMIN) -+ permit = vx_check(0, VS_ADMIN) ? 1 : 0; + -+ /* ... but setup type vcmds override that */ -+ if (!permit && (flags & VCF_SETUP)) -+ permit = vx_flags(VXF_STATE_SETUP, 0) ? 2 : 0; ++int proc_pid_nx_info( ++ struct seq_file *m, ++ struct pid_namespace *ns, ++ struct pid *pid, ++ struct task_struct *p) ++{ ++ struct nx_info *nxi; ++ struct nx_addr_v4 *v4a; ++#ifdef CONFIG_IPV6 ++ struct nx_addr_v6 *v6a; ++#endif ++ int i; + -+ state = 5; -+ ret = -EPERM; -+ if (!permit) -+ goto out; ++ seq_printf(m, "NID:\t%d\n", nx_task_nid(p)); + -+ state = 6; -+ if (!id && (flags & VCF_ZIDOK)) -+ goto skip_id; ++ nxi = task_get_nx_info(p); ++ if (!nxi) ++ return 0; + -+ ret = -ESRCH; -+ if (args & VCA_VXI) { -+ vxi = lookup_vx_info(id); -+ if (!vxi) -+ goto out; ++ seq_printf(m, "NCaps:\t%016llx\n", ++ (unsigned long long)nxi->nx_ncaps); ++ seq_printf(m, "NFlags:\t%016llx\n", ++ (unsigned long long)nxi->nx_flags); + -+ if ((flags & VCF_ADMIN) && -+ /* special case kill for shutdown */ -+ (cmd != VCMD_ctx_kill) && -+ /* can context be administrated? */ -+ !vx_info_flags(vxi, VXF_STATE_ADMIN, 0)) { -+ ret = -EACCES; -+ goto out_vxi; -+ } -+ } -+ state = 7; -+ if (args & VCA_NXI) { -+ nxi = lookup_nx_info(id); -+ if (!nxi) -+ goto out_vxi; -+ -+ if ((flags & VCF_ADMIN) && -+ /* can context be administrated? */ -+ !nx_info_flags(nxi, NXF_STATE_ADMIN, 0)) { -+ ret = -EACCES; -+ goto out_nxi; -+ } -+ } -+skip_id: -+ state = 8; -+ ret = do_vcmd(cmd, id, vxi, nxi, data, compat); -+ -+out_nxi: -+ if ((args & VCA_NXI) && nxi) -+ put_nx_info(nxi); -+out_vxi: -+ if ((args & VCA_VXI) && vxi) -+ put_vx_info(vxi); -+out: -+ vxdprintk(VXD_CBIT(switch, 1), -+ "vc: VCMD_%02d_%d[%d] = %08lx(%ld) [%d,%d]", -+ VC_CATEGORY(cmd), VC_COMMAND(cmd), -+ VC_VERSION(cmd), ret, ret, state, permit); -+ return ret; -+} -+ -+asmlinkage long -+sys_vserver(uint32_t cmd, uint32_t id, void __user *data) -+{ -+ return do_vserver(cmd, id, data, 0); -+} -+ -+#ifdef CONFIG_COMPAT -+ -+asmlinkage long -+sys32_vserver(uint32_t cmd, uint32_t id, void __user *data) -+{ -+ return do_vserver(cmd, id, data, 1); ++ seq_printf(m, "V4Root[bcast]:\t" NIPQUAD_FMT "\n", ++ NIPQUAD(nxi->v4_bcast.s_addr)); ++ seq_printf(m, "V4Root[lback]:\t" NIPQUAD_FMT "\n", ++ NIPQUAD(nxi->v4_lback.s_addr)); ++ if (!NX_IPV4(nxi)) ++ goto skip_v4; ++ for (i = 0, v4a = &nxi->v4; v4a; i++, v4a = v4a->next) ++ seq_printf(m, "V4Root[%d]:\t" NXAV4_FMT "\n", ++ i, NXAV4(v4a)); ++skip_v4: ++#ifdef CONFIG_IPV6 ++ if (!NX_IPV6(nxi)) ++ goto skip_v6; ++ for (i = 0, v6a = &nxi->v6; v6a; i++, v6a = v6a->next) ++ seq_printf(m, "V6Root[%d]:\t" NXAV6_FMT "\n", ++ i, NXAV6(v6a)); ++skip_v6: ++#endif ++ put_nx_info(nxi); ++ return 0; +} + -+#endif /* CONFIG_COMPAT */ -diff -NurpP --minimal linux-3.7/kernel/vserver/sysctl.c linux-3.7-vs2.3.5.1/kernel/vserver/sysctl.c ---- linux-3.7/kernel/vserver/sysctl.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/sysctl.c 2012-12-11 15:56:33.000000000 +0000 -@@ -0,0 +1,247 @@ +diff -NurpP --minimal linux-3.18.5/kernel/vserver/sched.c linux-3.18.5-vs2.3.7.3/kernel/vserver/sched.c +--- linux-3.18.5/kernel/vserver/sched.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/vserver/sched.c 2015-01-19 10:58:31.000000000 +0000 +@@ -0,0 +1,83 @@ +/* -+ * kernel/vserver/sysctl.c ++ * linux/kernel/vserver/sched.c + * -+ * Virtual Context Support ++ * Virtual Server: Scheduler Support + * -+ * Copyright (C) 2004-2007 Herbert Pötzl ++ * Copyright (C) 2004-2010 Herbert Pötzl + * -+ * V0.01 basic structure ++ * V0.01 adapted Sam Vilains version to 2.6.3 ++ * V0.02 removed legacy interface ++ * V0.03 changed vcmds to vxi arg ++ * V0.04 removed older and legacy interfaces ++ * V0.05 removed scheduler code/commands + * + */ + -+#include -+#include -+#include -+#include ++#include ++#include ++#include ++#include ++ +#include + -+enum { -+ CTL_DEBUG_ERROR = 0, -+ CTL_DEBUG_SWITCH = 1, -+ CTL_DEBUG_XID, -+ CTL_DEBUG_NID, -+ CTL_DEBUG_TAG, -+ CTL_DEBUG_NET, -+ CTL_DEBUG_LIMIT, -+ CTL_DEBUG_CRES, -+ CTL_DEBUG_DLIM, -+ CTL_DEBUG_QUOTA, -+ CTL_DEBUG_CVIRT, -+ CTL_DEBUG_SPACE, -+ CTL_DEBUG_PERM, -+ CTL_DEBUG_MISC, -+}; + ++void vx_update_sched_param(struct _vx_sched *sched, ++ struct _vx_sched_pc *sched_pc) ++{ ++ sched_pc->prio_bias = sched->prio_bias; ++} + -+unsigned int vs_debug_switch = 0; -+unsigned int vs_debug_xid = 0; -+unsigned int vs_debug_nid = 0; -+unsigned int vs_debug_tag = 0; -+unsigned int vs_debug_net = 0; -+unsigned int vs_debug_limit = 0; -+unsigned int vs_debug_cres = 0; -+unsigned int vs_debug_dlim = 0; -+unsigned int vs_debug_quota = 0; -+unsigned int vs_debug_cvirt = 0; -+unsigned int vs_debug_space = 0; -+unsigned int vs_debug_perm = 0; -+unsigned int vs_debug_misc = 0; ++static int do_set_prio_bias(struct vx_info *vxi, struct vcmd_prio_bias *data) ++{ ++ int cpu; + ++ if (data->prio_bias > MAX_PRIO_BIAS) ++ data->prio_bias = MAX_PRIO_BIAS; ++ if (data->prio_bias < MIN_PRIO_BIAS) ++ data->prio_bias = MIN_PRIO_BIAS; + -+static struct ctl_table_header *vserver_table_header; -+static ctl_table vserver_root_table[]; ++ if (data->cpu_id != ~0) { ++ vxi->sched.update = cpumask_of_cpu(data->cpu_id); ++ cpumask_and(&vxi->sched.update, &vxi->sched.update, ++ cpu_online_mask); ++ } else ++ cpumask_copy(&vxi->sched.update, cpu_online_mask); + ++ for_each_cpu_mask(cpu, vxi->sched.update) ++ vx_update_sched_param(&vxi->sched, ++ &vx_per_cpu(vxi, sched_pc, cpu)); ++ return 0; ++} + -+void vserver_register_sysctl(void) ++int vc_set_prio_bias(struct vx_info *vxi, void __user *data) +{ -+ if (!vserver_table_header) { -+ vserver_table_header = register_sysctl_table(vserver_root_table); -+ } ++ struct vcmd_prio_bias vc_data; + -+} ++ if (copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; + -+void vserver_unregister_sysctl(void) -+{ -+ if (vserver_table_header) { -+ unregister_sysctl_table(vserver_table_header); -+ vserver_table_header = NULL; -+ } ++ return do_set_prio_bias(vxi, &vc_data); +} + -+ -+static int proc_dodebug(ctl_table *table, int write, -+ void __user *buffer, size_t *lenp, loff_t *ppos) ++int vc_get_prio_bias(struct vx_info *vxi, void __user *data) +{ -+ char tmpbuf[20], *p, c; -+ unsigned int value; -+ size_t left, len; -+ -+ if ((*ppos && !write) || !*lenp) { -+ *lenp = 0; -+ return 0; -+ } ++ struct vcmd_prio_bias vc_data; ++ struct _vx_sched_pc *pcd; ++ int cpu; + -+ left = *lenp; ++ if (copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; + -+ if (write) { -+ if (!access_ok(VERIFY_READ, buffer, left)) -+ return -EFAULT; -+ p = (char *)buffer; -+ while (left && __get_user(c, p) >= 0 && isspace(c)) -+ left--, p++; -+ if (!left) -+ goto done; ++ cpu = vc_data.cpu_id; + -+ if (left > sizeof(tmpbuf) - 1) -+ return -EINVAL; -+ if (copy_from_user(tmpbuf, p, left)) -+ return -EFAULT; -+ tmpbuf[left] = '\0'; ++ if (!cpu_possible(cpu)) ++ return -EINVAL; + -+ for (p = tmpbuf, value = 0; '0' <= *p && *p <= '9'; p++, left--) -+ value = 10 * value + (*p - '0'); -+ if (*p && !isspace(*p)) -+ return -EINVAL; -+ while (left && isspace(*p)) -+ left--, p++; -+ *(unsigned int *)table->data = value; -+ } else { -+ if (!access_ok(VERIFY_WRITE, buffer, left)) -+ return -EFAULT; -+ len = sprintf(tmpbuf, "%d", *(unsigned int *)table->data); -+ if (len > left) -+ len = left; -+ if (__copy_to_user(buffer, tmpbuf, len)) -+ return -EFAULT; -+ if ((left -= len) > 0) { -+ if (put_user('\n', (char *)buffer + len)) -+ return -EFAULT; -+ left--; -+ } -+ } ++ pcd = &vx_per_cpu(vxi, sched_pc, cpu); ++ vc_data.prio_bias = pcd->prio_bias; + -+done: -+ *lenp -= left; -+ *ppos += *lenp; ++ if (copy_to_user(data, &vc_data, sizeof(vc_data))) ++ return -EFAULT; + return 0; +} + -+static int zero; +diff -NurpP --minimal linux-3.18.5/kernel/vserver/sched_init.h linux-3.18.5-vs2.3.7.3/kernel/vserver/sched_init.h +--- linux-3.18.5/kernel/vserver/sched_init.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/vserver/sched_init.h 2015-01-19 10:58:31.000000000 +0000 +@@ -0,0 +1,27 @@ + -+#define CTL_ENTRY(ctl, name) \ -+ { \ -+ .procname = #name, \ -+ .data = &vs_ ## name, \ -+ .maxlen = sizeof(int), \ -+ .mode = 0644, \ -+ .proc_handler = &proc_dodebug, \ -+ .extra1 = &zero, \ -+ .extra2 = &zero, \ -+ } ++static inline void vx_info_init_sched(struct _vx_sched *sched) ++{ ++ /* scheduling; hard code starting values as constants */ ++ sched->prio_bias = 0; ++} + -+static ctl_table vserver_debug_table[] = { -+ CTL_ENTRY(CTL_DEBUG_SWITCH, debug_switch), -+ CTL_ENTRY(CTL_DEBUG_XID, debug_xid), -+ CTL_ENTRY(CTL_DEBUG_NID, debug_nid), -+ CTL_ENTRY(CTL_DEBUG_TAG, debug_tag), -+ CTL_ENTRY(CTL_DEBUG_NET, debug_net), -+ CTL_ENTRY(CTL_DEBUG_LIMIT, debug_limit), -+ CTL_ENTRY(CTL_DEBUG_CRES, debug_cres), -+ CTL_ENTRY(CTL_DEBUG_DLIM, debug_dlim), -+ CTL_ENTRY(CTL_DEBUG_QUOTA, debug_quota), -+ CTL_ENTRY(CTL_DEBUG_CVIRT, debug_cvirt), -+ CTL_ENTRY(CTL_DEBUG_SPACE, debug_space), -+ CTL_ENTRY(CTL_DEBUG_PERM, debug_perm), -+ CTL_ENTRY(CTL_DEBUG_MISC, debug_misc), -+ { 0 } -+}; -+ -+static ctl_table vserver_root_table[] = { -+ { -+ .procname = "vserver", -+ .mode = 0555, -+ .child = vserver_debug_table -+ }, -+ { 0 } -+}; -+ -+ -+static match_table_t tokens = { -+ { CTL_DEBUG_SWITCH, "switch=%x" }, -+ { CTL_DEBUG_XID, "xid=%x" }, -+ { CTL_DEBUG_NID, "nid=%x" }, -+ { CTL_DEBUG_TAG, "tag=%x" }, -+ { CTL_DEBUG_NET, "net=%x" }, -+ { CTL_DEBUG_LIMIT, "limit=%x" }, -+ { CTL_DEBUG_CRES, "cres=%x" }, -+ { CTL_DEBUG_DLIM, "dlim=%x" }, -+ { CTL_DEBUG_QUOTA, "quota=%x" }, -+ { CTL_DEBUG_CVIRT, "cvirt=%x" }, -+ { CTL_DEBUG_SPACE, "space=%x" }, -+ { CTL_DEBUG_PERM, "perm=%x" }, -+ { CTL_DEBUG_MISC, "misc=%x" }, -+ { CTL_DEBUG_ERROR, NULL } -+}; -+ -+#define HANDLE_CASE(id, name, val) \ -+ case CTL_DEBUG_ ## id: \ -+ vs_debug_ ## name = val; \ -+ printk("vs_debug_" #name "=0x%x\n", val); \ -+ break ++static inline ++void vx_info_init_sched_pc(struct _vx_sched_pc *sched_pc, int cpu) ++{ ++ sched_pc->prio_bias = 0; + ++ sched_pc->user_ticks = 0; ++ sched_pc->sys_ticks = 0; ++ sched_pc->hold_ticks = 0; ++} + -+static int __init vs_debug_setup(char *str) ++static inline void vx_info_exit_sched(struct _vx_sched *sched) +{ -+ char *p; -+ int token; ++ return; ++} + -+ printk("vs_debug_setup(%s)\n", str); -+ while ((p = strsep(&str, ",")) != NULL) { -+ substring_t args[MAX_OPT_ARGS]; -+ unsigned int value; ++static inline ++void vx_info_exit_sched_pc(struct _vx_sched_pc *sched_pc, int cpu) ++{ ++ return; ++} +diff -NurpP --minimal linux-3.18.5/kernel/vserver/sched_proc.h linux-3.18.5-vs2.3.7.3/kernel/vserver/sched_proc.h +--- linux-3.18.5/kernel/vserver/sched_proc.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/vserver/sched_proc.h 2015-01-19 10:58:31.000000000 +0000 +@@ -0,0 +1,32 @@ ++#ifndef _VX_SCHED_PROC_H ++#define _VX_SCHED_PROC_H + -+ if (!*p) -+ continue; + -+ token = match_token(p, tokens, args); -+ value = (token > 0) ? simple_strtoul(args[0].from, NULL, 0) : 0; ++static inline ++int vx_info_proc_sched(struct _vx_sched *sched, char *buffer) ++{ ++ int length = 0; + -+ switch (token) { -+ HANDLE_CASE(SWITCH, switch, value); -+ HANDLE_CASE(XID, xid, value); -+ HANDLE_CASE(NID, nid, value); -+ HANDLE_CASE(TAG, tag, value); -+ HANDLE_CASE(NET, net, value); -+ HANDLE_CASE(LIMIT, limit, value); -+ HANDLE_CASE(CRES, cres, value); -+ HANDLE_CASE(DLIM, dlim, value); -+ HANDLE_CASE(QUOTA, quota, value); -+ HANDLE_CASE(CVIRT, cvirt, value); -+ HANDLE_CASE(SPACE, space, value); -+ HANDLE_CASE(PERM, perm, value); -+ HANDLE_CASE(MISC, misc, value); -+ default: -+ return -EINVAL; -+ break; -+ } -+ } -+ return 1; ++ length += sprintf(buffer, ++ "PrioBias:\t%8d\n", ++ sched->prio_bias); ++ return length; +} + -+__setup("vsdebug=", vs_debug_setup); -+ -+ ++static inline ++int vx_info_proc_sched_pc(struct _vx_sched_pc *sched_pc, ++ char *buffer, int cpu) ++{ ++ int length = 0; + -+EXPORT_SYMBOL_GPL(vs_debug_switch); -+EXPORT_SYMBOL_GPL(vs_debug_xid); -+EXPORT_SYMBOL_GPL(vs_debug_nid); -+EXPORT_SYMBOL_GPL(vs_debug_net); -+EXPORT_SYMBOL_GPL(vs_debug_limit); -+EXPORT_SYMBOL_GPL(vs_debug_cres); -+EXPORT_SYMBOL_GPL(vs_debug_dlim); -+EXPORT_SYMBOL_GPL(vs_debug_quota); -+EXPORT_SYMBOL_GPL(vs_debug_cvirt); -+EXPORT_SYMBOL_GPL(vs_debug_space); -+EXPORT_SYMBOL_GPL(vs_debug_perm); -+EXPORT_SYMBOL_GPL(vs_debug_misc); ++ length += sprintf(buffer + length, ++ "cpu %d: %lld %lld %lld", cpu, ++ (unsigned long long)sched_pc->user_ticks, ++ (unsigned long long)sched_pc->sys_ticks, ++ (unsigned long long)sched_pc->hold_ticks); ++ length += sprintf(buffer + length, ++ " %d\n", sched_pc->prio_bias); ++ return length; ++} + -diff -NurpP --minimal linux-3.7/kernel/vserver/tag.c linux-3.7-vs2.3.5.1/kernel/vserver/tag.c ---- linux-3.7/kernel/vserver/tag.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/tag.c 2012-12-11 15:56:33.000000000 +0000 -@@ -0,0 +1,63 @@ ++#endif /* _VX_SCHED_PROC_H */ +diff -NurpP --minimal linux-3.18.5/kernel/vserver/signal.c linux-3.18.5-vs2.3.7.3/kernel/vserver/signal.c +--- linux-3.18.5/kernel/vserver/signal.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/vserver/signal.c 2015-01-19 10:58:31.000000000 +0000 +@@ -0,0 +1,134 @@ +/* -+ * linux/kernel/vserver/tag.c ++ * linux/kernel/vserver/signal.c + * -+ * Virtual Server: Shallow Tag Space ++ * Virtual Server: Signal Support + * -+ * Copyright (C) 2007 Herbert Pötzl ++ * Copyright (C) 2003-2007 Herbert Pötzl + * -+ * V0.01 basic implementation ++ * V0.01 broken out from vcontext V0.05 ++ * V0.02 changed vcmds to vxi arg ++ * V0.03 adjusted siginfo for kill + * + */ + -+#include -+#include -+#include -+#include ++#include + -+#include ++#include ++#include ++#include + + -+int dx_migrate_task(struct task_struct *p, tag_t tag) ++int vx_info_kill(struct vx_info *vxi, int pid, int sig) +{ -+ if (!p) -+ BUG(); ++ int retval, count = 0; ++ struct task_struct *p; ++ struct siginfo *sip = SEND_SIG_PRIV; + -+ vxdprintk(VXD_CBIT(tag, 5), -+ "dx_migrate_task(%p[#%d],#%d)", p, p->tag, tag); ++ retval = -ESRCH; ++ vxdprintk(VXD_CBIT(misc, 4), ++ "vx_info_kill(%p[#%d],%d,%d)*", ++ vxi, vxi->vx_id, pid, sig); ++ read_lock(&tasklist_lock); ++ switch (pid) { ++ case 0: ++ case -1: ++ for_each_process(p) { ++ int err = 0; + -+ task_lock(p); -+ p->tag = tag; -+ task_unlock(p); ++ if (vx_task_xid(p) != vxi->vx_id || p->pid <= 1 || ++ (pid && vxi->vx_initpid == p->pid)) ++ continue; + -+ vxdprintk(VXD_CBIT(tag, 5), -+ "moved task %p into [#%d]", p, tag); -+ return 0; -+} ++ err = group_send_sig_info(sig, sip, p); ++ ++count; ++ if (err != -EPERM) ++ retval = err; ++ } ++ break; + -+/* vserver syscall commands below here */ ++ case 1: ++ if (vxi->vx_initpid) { ++ pid = vxi->vx_initpid; ++ /* for now, only SIGINT to private init ... */ ++ if (!vx_info_flags(vxi, VXF_STATE_ADMIN, 0) && ++ /* ... as long as there are tasks left */ ++ (atomic_read(&vxi->vx_tasks) > 1)) ++ sig = SIGINT; ++ } ++ /* fallthrough */ ++ default: ++ rcu_read_lock(); ++ p = find_task_by_real_pid(pid); ++ rcu_read_unlock(); ++ if (p) { ++ if (vx_task_xid(p) == vxi->vx_id) ++ retval = group_send_sig_info(sig, sip, p); ++ } ++ break; ++ } ++ read_unlock(&tasklist_lock); ++ vxdprintk(VXD_CBIT(misc, 4), ++ "vx_info_kill(%p[#%d],%d,%d,%ld) = %d", ++ vxi, vxi->vx_id, pid, sig, (long)sip, retval); ++ return retval; ++} + -+/* taks xid and vx_info functions */ ++int vc_ctx_kill(struct vx_info *vxi, void __user *data) ++{ ++ struct vcmd_ctx_kill_v0 vc_data; + ++ if (copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; + -+int vc_task_tag(uint32_t id) -+{ -+ tag_t tag; ++ /* special check to allow guest shutdown */ ++ if (!vx_info_flags(vxi, VXF_STATE_ADMIN, 0) && ++ /* forbid killall pid=0 when init is present */ ++ (((vc_data.pid < 1) && vxi->vx_initpid) || ++ (vc_data.pid > 1))) ++ return -EACCES; + -+ if (id) { -+ struct task_struct *tsk; -+ rcu_read_lock(); -+ tsk = find_task_by_real_pid(id); -+ tag = (tsk) ? tsk->tag : -ESRCH; -+ rcu_read_unlock(); -+ } else -+ tag = dx_current_tag(); -+ return tag; ++ return vx_info_kill(vxi, vc_data.pid, vc_data.sig); +} + + -+int vc_tag_migrate(uint32_t tag) ++static int __wait_exit(struct vx_info *vxi) +{ -+ return dx_migrate_task(current, tag & 0xFFFF); -+} ++ DECLARE_WAITQUEUE(wait, current); ++ int ret = 0; + ++ add_wait_queue(&vxi->vx_wait, &wait); ++ set_current_state(TASK_INTERRUPTIBLE); + -diff -NurpP --minimal linux-3.7/kernel/vserver/vci_config.h linux-3.7-vs2.3.5.1/kernel/vserver/vci_config.h ---- linux-3.7/kernel/vserver/vci_config.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/vci_config.h 2012-12-12 13:08:45.000000000 +0000 -@@ -0,0 +1,80 @@ ++wait: ++ if (vx_info_state(vxi, ++ VXS_SHUTDOWN | VXS_HASHED | VXS_HELPER) == VXS_SHUTDOWN) ++ goto out; ++ if (signal_pending(current)) { ++ ret = -ERESTARTSYS; ++ goto out; ++ } ++ schedule(); ++ goto wait; + -+/* interface version */ ++out: ++ set_current_state(TASK_RUNNING); ++ remove_wait_queue(&vxi->vx_wait, &wait); ++ return ret; ++} + -+#define VCI_VERSION 0x00020308 + + -+enum { -+ VCI_KCBIT_NO_DYNAMIC = 0, ++int vc_wait_exit(struct vx_info *vxi, void __user *data) ++{ ++ struct vcmd_wait_exit_v0 vc_data; ++ int ret; + -+ VCI_KCBIT_PROC_SECURE = 4, -+ /* VCI_KCBIT_HARDCPU = 5, */ -+ /* VCI_KCBIT_IDLELIMIT = 6, */ -+ /* VCI_KCBIT_IDLETIME = 7, */ ++ ret = __wait_exit(vxi); ++ vc_data.reboot_cmd = vxi->reboot_cmd; ++ vc_data.exit_code = vxi->exit_code; + -+ VCI_KCBIT_COWBL = 8, -+ VCI_KCBIT_FULLCOWBL = 9, -+ VCI_KCBIT_SPACES = 10, -+ VCI_KCBIT_NETV2 = 11, -+ VCI_KCBIT_MEMCG = 12, -+ VCI_KCBIT_MEMCG_SWAP = 13, ++ if (copy_to_user(data, &vc_data, sizeof(vc_data))) ++ ret = -EFAULT; ++ return ret; ++} + -+ VCI_KCBIT_DEBUG = 16, -+ VCI_KCBIT_HISTORY = 20, -+ VCI_KCBIT_TAGGED = 24, -+ VCI_KCBIT_PPTAG = 28, +diff -NurpP --minimal linux-3.18.5/kernel/vserver/space.c linux-3.18.5-vs2.3.7.3/kernel/vserver/space.c +--- linux-3.18.5/kernel/vserver/space.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/vserver/space.c 2015-01-25 18:27:56.000000000 +0000 +@@ -0,0 +1,436 @@ ++/* ++ * linux/kernel/vserver/space.c ++ * ++ * Virtual Server: Context Space Support ++ * ++ * Copyright (C) 2003-2010 Herbert Pötzl ++ * ++ * V0.01 broken out from context.c 0.07 ++ * V0.02 added task locking for namespace ++ * V0.03 broken out vx_enter_namespace ++ * V0.04 added *space support and commands ++ * V0.05 added credential support ++ * ++ */ + -+ VCI_KCBIT_MORE = 31, -+}; ++#include ++#include ++#include ++#include ++#include ++#include + ++#include ++#include ++#include + -+static inline uint32_t vci_kernel_config(void) -+{ -+ return -+ (1 << VCI_KCBIT_NO_DYNAMIC) | ++atomic_t vs_global_nsproxy = ATOMIC_INIT(0); ++atomic_t vs_global_fs = ATOMIC_INIT(0); ++atomic_t vs_global_mnt_ns = ATOMIC_INIT(0); ++atomic_t vs_global_uts_ns = ATOMIC_INIT(0); ++atomic_t vs_global_user_ns = ATOMIC_INIT(0); ++atomic_t vs_global_pid_ns = ATOMIC_INIT(0); + -+ /* configured features */ -+#ifdef CONFIG_VSERVER_PROC_SECURE -+ (1 << VCI_KCBIT_PROC_SECURE) | -+#endif -+#ifdef CONFIG_VSERVER_COWBL -+ (1 << VCI_KCBIT_COWBL) | -+ (1 << VCI_KCBIT_FULLCOWBL) | ++ ++/* namespace functions */ ++ ++#include ++#include ++#include ++#include ++#include ++#include "../fs/mount.h" ++ ++ ++static const struct vcmd_space_mask_v1 space_mask_v0 = { ++ .mask = CLONE_FS | ++ CLONE_NEWNS | ++#ifdef CONFIG_UTS_NS ++ CLONE_NEWUTS | +#endif -+ (1 << VCI_KCBIT_SPACES) | -+ (1 << VCI_KCBIT_NETV2) | -+#ifdef CONFIG_MEMCG -+ (1 << VCI_KCBIT_MEMCG) | ++#ifdef CONFIG_IPC_NS ++ CLONE_NEWIPC | +#endif -+#ifdef CONFIG_MEMCG_SWAP -+ (1 << VCI_KCBIT_MEMCG_SWAP) | ++#ifdef CONFIG_USER_NS ++ CLONE_NEWUSER | +#endif ++ 0 ++}; + -+ /* debug options */ -+#ifdef CONFIG_VSERVER_DEBUG -+ (1 << VCI_KCBIT_DEBUG) | ++static const struct vcmd_space_mask_v1 space_mask = { ++ .mask = CLONE_FS | ++ CLONE_NEWNS | ++#ifdef CONFIG_UTS_NS ++ CLONE_NEWUTS | +#endif -+#ifdef CONFIG_VSERVER_HISTORY -+ (1 << VCI_KCBIT_HISTORY) | ++#ifdef CONFIG_IPC_NS ++ CLONE_NEWIPC | ++#endif ++#ifdef CONFIG_USER_NS ++ CLONE_NEWUSER | ++#endif ++#ifdef CONFIG_PID_NS ++ CLONE_NEWPID | +#endif ++#ifdef CONFIG_NET_NS ++ CLONE_NEWNET | ++#endif ++ 0 ++}; + -+ /* inode context tagging */ -+#if defined(CONFIG_TAGGING_NONE) -+ (0 << VCI_KCBIT_TAGGED) | -+#elif defined(CONFIG_TAGGING_UID16) -+ (1 << VCI_KCBIT_TAGGED) | -+#elif defined(CONFIG_TAGGING_GID16) -+ (2 << VCI_KCBIT_TAGGED) | -+#elif defined(CONFIG_TAGGING_ID24) -+ (3 << VCI_KCBIT_TAGGED) | -+#elif defined(CONFIG_TAGGING_INTERN) -+ (4 << VCI_KCBIT_TAGGED) | -+#elif defined(CONFIG_TAGGING_RUNTIME) -+ (5 << VCI_KCBIT_TAGGED) | -+#else -+ (7 << VCI_KCBIT_TAGGED) | ++static const struct vcmd_space_mask_v1 default_space_mask = { ++ .mask = CLONE_FS | ++ CLONE_NEWNS | ++#ifdef CONFIG_UTS_NS ++ CLONE_NEWUTS | +#endif -+ (1 << VCI_KCBIT_PPTAG) | -+ 0; -+} ++#ifdef CONFIG_IPC_NS ++ CLONE_NEWIPC | ++#endif ++#ifdef CONFIG_USER_NS ++// CLONE_NEWUSER | ++#endif ++#ifdef CONFIG_PID_NS ++// CLONE_NEWPID | ++#endif ++ 0 ++}; + -diff -NurpP --minimal linux-3.7/mm/memcontrol.c linux-3.7-vs2.3.5.1/mm/memcontrol.c ---- linux-3.7/mm/memcontrol.c 2012-12-11 15:47:52.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/mm/memcontrol.c 2012-12-11 15:56:33.000000000 +0000 -@@ -884,6 +884,31 @@ struct mem_cgroup *mem_cgroup_from_task( - return mem_cgroup_from_css(task_subsys_state(p, mem_cgroup_subsys_id)); - } - -+u64 mem_cgroup_res_read_u64(struct mem_cgroup *mem, int member) -+{ -+ return res_counter_read_u64(&mem->res, member); -+} ++/* ++ * build a new nsproxy mix ++ * assumes that both proxies are 'const' ++ * does not touch nsproxy refcounts ++ * will hold a reference on the result. ++ */ + -+u64 mem_cgroup_memsw_read_u64(struct mem_cgroup *mem, int member) ++struct nsproxy *vs_mix_nsproxy(struct nsproxy *old_nsproxy, ++ struct nsproxy *new_nsproxy, unsigned long mask) +{ -+ return res_counter_read_u64(&mem->memsw, member); -+} ++ struct mnt_namespace *old_ns; ++ struct uts_namespace *old_uts; ++ struct ipc_namespace *old_ipc; ++#ifdef CONFIG_PID_NS ++ struct pid_namespace *old_pid; ++#endif ++#ifdef CONFIG_NET_NS ++ struct net *old_net; ++#endif ++ struct nsproxy *nsproxy; + -+s64 mem_cgroup_stat_read_cache(struct mem_cgroup *mem) -+{ -+ return mem_cgroup_read_stat(mem, MEM_CGROUP_STAT_CACHE); -+} ++ nsproxy = copy_nsproxy(old_nsproxy); ++ if (!nsproxy) ++ goto out; + -+s64 mem_cgroup_stat_read_anon(struct mem_cgroup *mem) -+{ -+ return mem_cgroup_read_stat(mem, MEM_CGROUP_STAT_RSS); -+} ++ if (mask & CLONE_NEWNS) { ++ old_ns = nsproxy->mnt_ns; ++ nsproxy->mnt_ns = new_nsproxy->mnt_ns; ++ if (nsproxy->mnt_ns) ++ get_mnt_ns(nsproxy->mnt_ns); ++ } else ++ old_ns = NULL; + -+s64 mem_cgroup_stat_read_mapped(struct mem_cgroup *mem) -+{ -+ return mem_cgroup_read_stat(mem, MEM_CGROUP_STAT_FILE_MAPPED); ++ if (mask & CLONE_NEWUTS) { ++ old_uts = nsproxy->uts_ns; ++ nsproxy->uts_ns = new_nsproxy->uts_ns; ++ if (nsproxy->uts_ns) ++ get_uts_ns(nsproxy->uts_ns); ++ } else ++ old_uts = NULL; ++ ++ if (mask & CLONE_NEWIPC) { ++ old_ipc = nsproxy->ipc_ns; ++ nsproxy->ipc_ns = new_nsproxy->ipc_ns; ++ if (nsproxy->ipc_ns) ++ get_ipc_ns(nsproxy->ipc_ns); ++ } else ++ old_ipc = NULL; ++ ++#ifdef CONFIG_PID_NS ++ if (mask & CLONE_NEWPID) { ++ old_pid = nsproxy->pid_ns_for_children; ++ nsproxy->pid_ns_for_children = new_nsproxy->pid_ns_for_children; ++ if (nsproxy->pid_ns_for_children) ++ get_pid_ns(nsproxy->pid_ns_for_children); ++ } else ++ old_pid = NULL; ++#endif ++#ifdef CONFIG_NET_NS ++ if (mask & CLONE_NEWNET) { ++ old_net = nsproxy->net_ns; ++ nsproxy->net_ns = new_nsproxy->net_ns; ++ if (nsproxy->net_ns) ++ get_net(nsproxy->net_ns); ++ } else ++ old_net = NULL; ++#endif ++ if (old_ns) ++ put_mnt_ns(old_ns); ++ if (old_uts) ++ put_uts_ns(old_uts); ++ if (old_ipc) ++ put_ipc_ns(old_ipc); ++#ifdef CONFIG_PID_NS ++ if (old_pid) ++ put_pid_ns(old_pid); ++#endif ++#ifdef CONFIG_NET_NS ++ if (old_net) ++ put_net(old_net); ++#endif ++out: ++ return nsproxy; +} + - struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm) - { - struct mem_cgroup *memcg = NULL; -diff -NurpP --minimal linux-3.7/mm/oom_kill.c linux-3.7-vs2.3.5.1/mm/oom_kill.c ---- linux-3.7/mm/oom_kill.c 2012-12-11 15:47:52.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/mm/oom_kill.c 2012-12-12 00:10:01.000000000 +0000 -@@ -35,6 +35,8 @@ - #include - #include - #include -+#include -+#include - - #define CREATE_TRACE_POINTS - #include -@@ -155,11 +157,18 @@ struct task_struct *find_lock_task_mm(st - static bool oom_unkillable_task(struct task_struct *p, - const struct mem_cgroup *memcg, const nodemask_t *nodemask) - { -- if (is_global_init(p)) -+ unsigned xid = vx_current_xid(); + -+ /* skip the init task, global and per guest */ -+ if (task_is_init(p)) - return true; - if (p->flags & PF_KTHREAD) - return true; - -+ /* skip other guest and host processes if oom in guest */ -+ if (xid && vx_task_xid(p) != xid) -+ return true; ++/* ++ * merge two nsproxy structs into a new one. ++ * will hold a reference on the result. ++ */ + - /* When mem_cgroup_out_of_memory() and p is not member of the group */ - if (memcg && !task_in_mem_cgroup(p, memcg)) - return true; -@@ -472,8 +481,8 @@ void oom_kill_process(struct task_struct - dump_header(p, gfp_mask, order, memcg, nodemask); - - task_lock(p); -- pr_err("%s: Kill process %d (%s) score %d or sacrifice child\n", -- message, task_pid_nr(p), p->comm, points); -+ pr_err("%s: Kill process %d:#%u (%s) score %d or sacrifice child\n", -+ message, task_pid_nr(p), p->xid, p->comm, points); - task_unlock(p); - - /* -@@ -518,8 +527,8 @@ void oom_kill_process(struct task_struct - - /* mm cannot safely be dereferenced after task_unlock(victim) */ - mm = victim->mm; -- pr_err("Killed process %d (%s) total-vm:%lukB, anon-rss:%lukB, file-rss:%lukB\n", -- task_pid_nr(victim), victim->comm, K(victim->mm->total_vm), -+ pr_err("Killed process %d:#%u (%s) total-vm:%lukB, anon-rss:%lukB, file-rss:%lukB\n", -+ task_pid_nr(victim), victim->xid, victim->comm, K(victim->mm->total_vm), - K(get_mm_counter(victim->mm, MM_ANONPAGES)), - K(get_mm_counter(victim->mm, MM_FILEPAGES))); - task_unlock(victim); -@@ -589,6 +598,8 @@ int unregister_oom_notifier(struct notif - } - EXPORT_SYMBOL_GPL(unregister_oom_notifier); - -+long vs_oom_action(unsigned int); ++static inline ++struct nsproxy *__vs_merge_nsproxy(struct nsproxy *old, ++ struct nsproxy *proxy, unsigned long mask) ++{ ++ struct nsproxy null_proxy = { .mnt_ns = NULL }; + - /* - * Try to acquire the OOM killer lock for the zones in zonelist. Returns zero - * if a parallel OOM killing is already taking place that includes a zone in -@@ -738,7 +749,12 @@ void out_of_memory(struct zonelist *zone - /* Found nothing?!?! Either we hang forever, or we panic. */ - if (!p) { - dump_header(NULL, gfp_mask, order, NULL, mpol_mask); -- panic("Out of memory and no killable processes...\n"); ++ if (!proxy) ++ return NULL; + -+ /* avoid panic for guest OOM */ -+ if (vx_current_xid()) -+ vs_oom_action(LINUX_REBOOT_CMD_OOM); -+ else -+ panic("Out of memory and no killable processes...\n"); - } - if (PTR_ERR(p) != -1UL) { - oom_kill_process(p, gfp_mask, order, points, totalpages, NULL, -diff -NurpP --minimal linux-3.7/mm/page_alloc.c linux-3.7-vs2.3.5.1/mm/page_alloc.c ---- linux-3.7/mm/page_alloc.c 2012-12-11 15:47:52.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/mm/page_alloc.c 2012-12-11 15:56:33.000000000 +0000 -@@ -58,6 +58,8 @@ - #include - #include - #include -+#include -+#include - - #include - #include -@@ -2832,6 +2834,9 @@ void si_meminfo(struct sysinfo *val) - val->totalhigh = totalhigh_pages; - val->freehigh = nr_free_highpages(); - val->mem_unit = PAGE_SIZE; ++ if (mask) { ++ /* vs_mix_nsproxy returns with reference */ ++ return vs_mix_nsproxy(old ? old : &null_proxy, ++ proxy, mask); ++ } ++ get_nsproxy(proxy); ++ return proxy; ++} + -+ if (vx_flags(VXF_VIRT_MEM, 0)) -+ vx_vsi_meminfo(val); - } - - EXPORT_SYMBOL(si_meminfo); -@@ -2852,6 +2857,9 @@ void si_meminfo_node(struct sysinfo *val - val->freehigh = 0; - #endif - val->mem_unit = PAGE_SIZE; + -+ if (vx_flags(VXF_VIRT_MEM, 0)) -+ vx_vsi_meminfo(val); - } - #endif - -diff -NurpP --minimal linux-3.7/mm/pgtable-generic.c linux-3.7-vs2.3.5.1/mm/pgtable-generic.c ---- linux-3.7/mm/pgtable-generic.c 2012-12-11 15:47:52.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/mm/pgtable-generic.c 2012-12-11 15:56:33.000000000 +0000 -@@ -6,6 +6,8 @@ - * Copyright (C) 2010 Linus Torvalds - */ - -+#include ++int vx_enter_space(struct vx_info *vxi, unsigned long mask, unsigned index) ++{ ++ struct nsproxy *proxy, *proxy_cur, *proxy_new; ++ struct fs_struct *fs_cur, *fs = NULL; ++ struct _vx_space *space; ++ int ret, kill = 0; + - #include - #include - #include -diff -NurpP --minimal linux-3.7/mm/shmem.c linux-3.7-vs2.3.5.1/mm/shmem.c ---- linux-3.7/mm/shmem.c 2012-12-11 15:47:52.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/mm/shmem.c 2012-12-11 15:56:33.000000000 +0000 -@@ -1820,7 +1820,7 @@ static int shmem_statfs(struct dentry *d - { - struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb); - -- buf->f_type = TMPFS_MAGIC; -+ buf->f_type = TMPFS_SUPER_MAGIC; - buf->f_bsize = PAGE_CACHE_SIZE; - buf->f_namelen = NAME_MAX; - if (sbinfo->max_blocks) { -@@ -2504,7 +2504,7 @@ int shmem_fill_super(struct super_block - sb->s_maxbytes = MAX_LFS_FILESIZE; - sb->s_blocksize = PAGE_CACHE_SIZE; - sb->s_blocksize_bits = PAGE_CACHE_SHIFT; -- sb->s_magic = TMPFS_MAGIC; -+ sb->s_magic = TMPFS_SUPER_MAGIC; - sb->s_op = &shmem_ops; - sb->s_time_gran = 1; - #ifdef CONFIG_TMPFS_XATTR -diff -NurpP --minimal linux-3.7/mm/slab.c linux-3.7-vs2.3.5.1/mm/slab.c ---- linux-3.7/mm/slab.c 2012-12-11 15:47:52.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/mm/slab.c 2012-12-11 15:56:33.000000000 +0000 -@@ -445,6 +445,8 @@ static void kmem_list3_init(struct kmem_ - #define STATS_INC_FREEMISS(x) do { } while (0) - #endif - -+#include "slab_vs.h" ++ vxdprintk(VXD_CBIT(space, 8), "vx_enter_space(%p[#%u],0x%08lx,%d)", ++ vxi, vxi->vx_id, mask, index); + - #if DEBUG - - /* -@@ -3479,6 +3481,7 @@ retry: - - obj = slab_get_obj(cachep, slabp, nodeid); - check_slabp(cachep, slabp); -+ vx_slab_alloc(cachep, flags); - l3->free_objects--; - /* move slabp to correct slabp list: */ - list_del(&slabp->list); -@@ -3556,6 +3559,7 @@ slab_alloc_node(struct kmem_cache *cache - /* ___cache_alloc_node can fall back to other nodes */ - ptr = ____cache_alloc_node(cachep, flags, nodeid); - out: -+ vx_slab_alloc(cachep, flags); - local_irq_restore(save_flags); - ptr = cache_alloc_debugcheck_after(cachep, flags, ptr, caller); - kmemleak_alloc_recursive(ptr, cachep->object_size, 1, cachep->flags, -@@ -3746,6 +3750,7 @@ static inline void __cache_free(struct k - check_irq_off(); - kmemleak_free_recursive(objp, cachep->flags); - objp = cache_free_debugcheck(cachep, objp, caller); -+ vx_slab_free(cachep); - - kmemcheck_slab_free(cachep, objp, cachep->object_size); - -diff -NurpP --minimal linux-3.7/mm/slab_vs.h linux-3.7-vs2.3.5.1/mm/slab_vs.h ---- linux-3.7/mm/slab_vs.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/mm/slab_vs.h 2012-12-11 15:56:33.000000000 +0000 -@@ -0,0 +1,29 @@ ++ if (vx_info_flags(vxi, VXF_INFO_PRIVATE, 0)) ++ return -EACCES; + -+#include ++ if (index >= VX_SPACES) ++ return -EINVAL; + -+#include ++ space = &vxi->space[index]; + -+static inline -+void vx_slab_alloc(struct kmem_cache *cachep, gfp_t flags) -+{ -+ int what = gfp_zone(cachep->allocflags); -+ struct vx_info *vxi = current_vx_info(); ++ if (!mask) ++ mask = space->vx_nsmask; + -+ if (!vxi) -+ return; ++ if ((mask & space->vx_nsmask) != mask) ++ return -EINVAL; + -+ atomic_add(cachep->size, &vxi->cacct.slab[what]); -+} ++ if (mask & CLONE_FS) { ++ fs = copy_fs_struct(space->vx_fs); ++ if (!fs) ++ return -ENOMEM; ++ } ++ proxy = space->vx_nsproxy; + -+static inline -+void vx_slab_free(struct kmem_cache *cachep) -+{ -+ int what = gfp_zone(cachep->allocflags); -+ struct vx_info *vxi = current_vx_info(); ++ vxdprintk(VXD_CBIT(space, 9), ++ "vx_enter_space(%p[#%u],0x%08lx,%d) -> (%p,%p)", ++ vxi, vxi->vx_id, mask, index, proxy, fs); + -+ if (!vxi) -+ return; ++ task_lock(current); ++ fs_cur = current->fs; + -+ atomic_sub(cachep->size, &vxi->cacct.slab[what]); -+} ++ if (mask & CLONE_FS) { ++ spin_lock(&fs_cur->lock); ++ current->fs = fs; ++ kill = !--fs_cur->users; ++ spin_unlock(&fs_cur->lock); ++ } + -diff -NurpP --minimal linux-3.7/mm/swapfile.c linux-3.7-vs2.3.5.1/mm/swapfile.c ---- linux-3.7/mm/swapfile.c 2012-12-11 15:47:52.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/mm/swapfile.c 2012-12-11 15:56:33.000000000 +0000 -@@ -39,6 +39,7 @@ - #include - #include - #include -+#include - - static bool swap_count_continued(struct swap_info_struct *, pgoff_t, - unsigned char); -@@ -1685,6 +1686,16 @@ static int swap_show(struct seq_file *sw - - if (si == SEQ_START_TOKEN) { - seq_puts(swap,"Filename\t\t\t\tType\t\tSize\tUsed\tPriority\n"); -+ if (vx_flags(VXF_VIRT_MEM, 0)) { -+ struct sysinfo si; ++ proxy_cur = current->nsproxy; ++ get_nsproxy(proxy_cur); ++ task_unlock(current); + -+ vx_vsi_swapinfo(&si); -+ if (si.totalswap < (1 << 10)) -+ return 0; -+ seq_printf(swap, "%s\t\t\t\t\t%s\t%lu\t%lu\t%d\n", -+ "hdv0", "partition", si.totalswap >> 10, -+ (si.totalswap - si.freeswap) >> 10, -1); ++ if (kill) ++ free_fs_struct(fs_cur); ++ ++ proxy_new = __vs_merge_nsproxy(proxy_cur, proxy, mask); ++ if (IS_ERR(proxy_new)) { ++ ret = PTR_ERR(proxy_new); ++ goto out_put; ++ } ++ ++ proxy_new = xchg(¤t->nsproxy, proxy_new); ++ ++ if (mask & CLONE_NEWUSER) { ++ struct cred *cred; ++ ++ vxdprintk(VXD_CBIT(space, 10), ++ "vx_enter_space(%p[#%u],%p) cred (%p,%p)", ++ vxi, vxi->vx_id, space->vx_cred, ++ current->real_cred, current->cred); ++ ++ if (space->vx_cred) { ++ cred = __prepare_creds(space->vx_cred); ++ if (cred) ++ commit_creds(cred); + } - return 0; - } - -@@ -2112,6 +2123,8 @@ void si_swapinfo(struct sysinfo *val) - val->freeswap = nr_swap_pages + nr_to_be_unused; - val->totalswap = total_swap_pages + nr_to_be_unused; - spin_unlock(&swap_lock); -+ if (vx_flags(VXF_VIRT_MEM, 0)) -+ vx_vsi_swapinfo(val); - } - - /* -diff -NurpP --minimal linux-3.7/net/bridge/br_multicast.c linux-3.7-vs2.3.5.1/net/bridge/br_multicast.c ---- linux-3.7/net/bridge/br_multicast.c 2012-10-04 13:27:49.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/bridge/br_multicast.c 2012-12-11 15:56:33.000000000 +0000 -@@ -447,7 +447,7 @@ static struct sk_buff *br_ip6_multicast_ - ip6h->hop_limit = 1; - ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1)); - if (ipv6_dev_get_saddr(dev_net(br->dev), br->dev, &ip6h->daddr, 0, -- &ip6h->saddr)) { -+ &ip6h->saddr, NULL)) { - kfree_skb(skb); - return NULL; - } -diff -NurpP --minimal linux-3.7/net/core/dev.c linux-3.7-vs2.3.5.1/net/core/dev.c ---- linux-3.7/net/core/dev.c 2012-12-11 15:47:53.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/core/dev.c 2012-12-11 15:56:33.000000000 +0000 -@@ -126,6 +126,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -620,7 +621,8 @@ struct net_device *__dev_get_by_name(str - struct hlist_head *head = dev_name_hash(net, name); - - hlist_for_each_entry(dev, p, head, name_hlist) -- if (!strncmp(dev->name, name, IFNAMSIZ)) -+ if (!strncmp(dev->name, name, IFNAMSIZ) && -+ nx_dev_visible(current_nx_info(), dev)) - return dev; - - return NULL; -@@ -646,7 +648,8 @@ struct net_device *dev_get_by_name_rcu(s - struct hlist_head *head = dev_name_hash(net, name); - - hlist_for_each_entry_rcu(dev, p, head, name_hlist) -- if (!strncmp(dev->name, name, IFNAMSIZ)) -+ if (!strncmp(dev->name, name, IFNAMSIZ) && -+ nx_dev_visible(current_nx_info(), dev)) - return dev; - - return NULL; -@@ -697,7 +700,8 @@ struct net_device *__dev_get_by_index(st - struct hlist_head *head = dev_index_hash(net, ifindex); - - hlist_for_each_entry(dev, p, head, index_hlist) -- if (dev->ifindex == ifindex) -+ if ((dev->ifindex == ifindex) && -+ nx_dev_visible(current_nx_info(), dev)) - return dev; - - return NULL; -@@ -715,7 +719,7 @@ EXPORT_SYMBOL(__dev_get_by_index); - * about locking. The caller must hold RCU lock. - */ - --struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex) -+struct net_device *dev_get_by_index_real_rcu(struct net *net, int ifindex) - { - struct hlist_node *p; - struct net_device *dev; -@@ -727,6 +731,16 @@ struct net_device *dev_get_by_index_rcu( - - return NULL; - } -+EXPORT_SYMBOL(dev_get_by_index_real_rcu); ++ } + -+struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex) -+{ -+ struct net_device *dev = dev_get_by_index_real_rcu(net, ifindex); ++ ret = 0; + -+ if (nx_dev_visible(current_nx_info(), dev)) -+ return dev; -+ return NULL; ++ if (proxy_new) ++ put_nsproxy(proxy_new); ++out_put: ++ if (proxy_cur) ++ put_nsproxy(proxy_cur); ++ return ret; +} - EXPORT_SYMBOL(dev_get_by_index_rcu); - - -@@ -775,7 +789,8 @@ struct net_device *dev_getbyhwaddr_rcu(s - - for_each_netdev_rcu(net, dev) - if (dev->type == type && -- !memcmp(dev->dev_addr, ha, dev->addr_len)) -+ !memcmp(dev->dev_addr, ha, dev->addr_len) && -+ nx_dev_visible(current_nx_info(), dev)) - return dev; - - return NULL; -@@ -787,9 +802,11 @@ struct net_device *__dev_getfirstbyhwtyp - struct net_device *dev; - - ASSERT_RTNL(); -- for_each_netdev(net, dev) -- if (dev->type == type) -+ for_each_netdev(net, dev) { -+ if ((dev->type == type) && -+ nx_dev_visible(current_nx_info(), dev)) - return dev; ++ ++ ++int vx_set_space(struct vx_info *vxi, unsigned long mask, unsigned index) ++{ ++ struct nsproxy *proxy_vxi, *proxy_cur, *proxy_new; ++ struct fs_struct *fs_vxi, *fs = NULL; ++ struct _vx_space *space; ++ int ret, kill = 0; ++ ++ vxdprintk(VXD_CBIT(space, 8), "vx_set_space(%p[#%u],0x%08lx,%d)", ++ vxi, vxi->vx_id, mask, index); ++ ++ if ((mask & space_mask.mask) != mask) ++ return -EINVAL; ++ ++ if (index >= VX_SPACES) ++ return -EINVAL; ++ ++ space = &vxi->space[index]; ++ ++ proxy_vxi = space->vx_nsproxy; ++ fs_vxi = space->vx_fs; ++ ++ if (mask & CLONE_FS) { ++ fs = copy_fs_struct(current->fs); ++ if (!fs) ++ return -ENOMEM; + } - - return NULL; - } -@@ -907,6 +924,8 @@ static int __dev_alloc_name(struct net * - continue; - if (i < 0 || i >= max_netdevices) - continue; -+ if (!nx_dev_visible(current_nx_info(), d)) -+ continue; - - /* avoid cases where sscanf is not exact inverse of printf */ - snprintf(buf, IFNAMSIZ, name, i); -@@ -4129,6 +4148,8 @@ static int dev_ifconf(struct net *net, c - - total = 0; - for_each_netdev(net, dev) { -+ if (!nx_dev_visible(current_nx_info(), dev)) -+ continue; - for (i = 0; i < NPROTO; i++) { - if (gifconf_list[i]) { - int done; -@@ -4231,6 +4252,10 @@ static void dev_seq_printf_stats(struct - struct rtnl_link_stats64 temp; - const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp); - -+ /* device visible inside network context? */ -+ if (!nx_dev_visible(current_nx_info(), dev)) -+ return; + - seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu " - "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n", - dev->name, stats->rx_bytes, stats->rx_packets, -diff -NurpP --minimal linux-3.7/net/core/rtnetlink.c linux-3.7-vs2.3.5.1/net/core/rtnetlink.c ---- linux-3.7/net/core/rtnetlink.c 2012-12-11 15:47:53.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/core/rtnetlink.c 2012-12-11 15:56:33.000000000 +0000 -@@ -1080,6 +1080,8 @@ static int rtnl_dump_ifinfo(struct sk_bu - hlist_for_each_entry_rcu(dev, node, head, index_hlist) { - if (idx < s_idx) - goto cont; -+ if (!nx_dev_visible(skb->sk->sk_nx_info, dev)) -+ continue; - if (rtnl_fill_ifinfo(skb, dev, RTM_NEWLINK, - NETLINK_CB(cb->skb).portid, - cb->nlh->nlmsg_seq, 0, -@@ -1971,6 +1973,9 @@ void rtmsg_ifinfo(int type, struct net_d - int err = -ENOBUFS; - size_t if_info_size; - -+ if (!nx_dev_visible(current_nx_info(), dev)) -+ return; ++ task_lock(current); + - skb = nlmsg_new((if_info_size = if_nlmsg_size(dev, 0)), GFP_KERNEL); - if (skb == NULL) - goto errout; -diff -NurpP --minimal linux-3.7/net/core/sock.c linux-3.7-vs2.3.5.1/net/core/sock.c ---- linux-3.7/net/core/sock.c 2012-12-11 15:47:53.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/core/sock.c 2012-12-11 15:56:33.000000000 +0000 -@@ -132,6 +132,10 @@ - #include - - #include -+#include -+#include -+#include -+#include - - #include - -@@ -1183,6 +1187,8 @@ static struct sock *sk_prot_alloc(struct - goto out_free_sec; - sk_tx_queue_clear(sk); - } -+ sock_vx_init(sk); -+ sock_nx_init(sk); - - return sk; - -@@ -1295,6 +1301,11 @@ static void __sk_free(struct sock *sk) - put_cred(sk->sk_peer_cred); - put_pid(sk->sk_peer_pid); - put_net(sock_net(sk)); -+ vx_sock_dec(sk); -+ clr_vx_info(&sk->sk_vx_info); -+ sk->sk_xid = -1; -+ clr_nx_info(&sk->sk_nx_info); -+ sk->sk_nid = -1; - sk_prot_free(sk->sk_prot_creator, sk); - } - -@@ -1355,6 +1366,8 @@ struct sock *sk_clone_lock(const struct - - /* SANITY */ - get_net(sock_net(newsk)); -+ sock_vx_init(newsk); -+ sock_nx_init(newsk); - sk_node_init(&newsk->sk_node); - sock_lock_init(newsk); - bh_lock_sock(newsk); -@@ -1411,6 +1424,12 @@ struct sock *sk_clone_lock(const struct - smp_wmb(); - atomic_set(&newsk->sk_refcnt, 2); - -+ set_vx_info(&newsk->sk_vx_info, sk->sk_vx_info); -+ newsk->sk_xid = sk->sk_xid; -+ vx_sock_inc(newsk); -+ set_nx_info(&newsk->sk_nx_info, sk->sk_nx_info); -+ newsk->sk_nid = sk->sk_nid; ++ if (mask & CLONE_FS) { ++ spin_lock(&fs_vxi->lock); ++ space->vx_fs = fs; ++ kill = !--fs_vxi->users; ++ spin_unlock(&fs_vxi->lock); ++ } + - /* - * Increment the counter in the same struct proto as the master - * sock (sk_refcnt_debug_inc uses newsk->sk_prot->socks, that -@@ -2206,6 +2225,12 @@ void sock_init_data(struct socket *sock, - - sk->sk_stamp = ktime_set(-1L, 0); - -+ set_vx_info(&sk->sk_vx_info, current_vx_info()); -+ sk->sk_xid = vx_current_xid(); -+ vx_sock_inc(sk); -+ set_nx_info(&sk->sk_nx_info, current_nx_info()); -+ sk->sk_nid = nx_current_nid(); ++ proxy_cur = current->nsproxy; ++ get_nsproxy(proxy_cur); ++ task_unlock(current); + - /* - * Before updating sk_refcnt, we must commit prior changes to memory - * (Documentation/RCU/rculist_nulls.txt for details) -diff -NurpP --minimal linux-3.7/net/ipv4/af_inet.c linux-3.7-vs2.3.5.1/net/ipv4/af_inet.c ---- linux-3.7/net/ipv4/af_inet.c 2012-12-11 15:47:54.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv4/af_inet.c 2012-12-11 15:56:33.000000000 +0000 -@@ -118,6 +118,7 @@ - #ifdef CONFIG_IP_MROUTE - #include - #endif -+#include - - - /* The inetsw table contains everything that inet_create needs to -@@ -346,9 +347,13 @@ lookup_protocol: - } - - err = -EPERM; -+ if ((protocol == IPPROTO_ICMP) && -+ nx_capable(CAP_NET_RAW, NXC_RAW_ICMP)) -+ goto override; ++ if (kill) ++ free_fs_struct(fs_vxi); + - if (sock->type == SOCK_RAW && !kern && !capable(CAP_NET_RAW)) - goto out_rcu_unlock; -- -+override: - err = -EAFNOSUPPORT; - if (!inet_netns_ok(net, protocol)) - goto out_rcu_unlock; -@@ -473,6 +478,7 @@ int inet_bind(struct socket *sock, struc - struct sockaddr_in *addr = (struct sockaddr_in *)uaddr; - struct sock *sk = sock->sk; - struct inet_sock *inet = inet_sk(sk); -+ struct nx_v4_sock_addr nsa; - unsigned short snum; - int chk_addr_ret; - int err; -@@ -496,7 +502,11 @@ int inet_bind(struct socket *sock, struc - goto out; - } - -- chk_addr_ret = inet_addr_type(sock_net(sk), addr->sin_addr.s_addr); -+ err = v4_map_sock_addr(inet, addr, &nsa); -+ if (err) -+ goto out; ++ proxy_new = __vs_merge_nsproxy(proxy_vxi, proxy_cur, mask); ++ if (IS_ERR(proxy_new)) { ++ ret = PTR_ERR(proxy_new); ++ goto out_put; ++ } + -+ chk_addr_ret = inet_addr_type(sock_net(sk), nsa.saddr); - - /* Not specified by any standard per-se, however it breaks too - * many applications when removed. It is unfortunate since -@@ -508,7 +518,7 @@ int inet_bind(struct socket *sock, struc - err = -EADDRNOTAVAIL; - if (!sysctl_ip_nonlocal_bind && - !(inet->freebind || inet->transparent) && -- addr->sin_addr.s_addr != htonl(INADDR_ANY) && -+ nsa.saddr != htonl(INADDR_ANY) && - chk_addr_ret != RTN_LOCAL && - chk_addr_ret != RTN_MULTICAST && - chk_addr_ret != RTN_BROADCAST) -@@ -533,7 +543,7 @@ int inet_bind(struct socket *sock, struc - if (sk->sk_state != TCP_CLOSE || inet->inet_num) - goto out_release_sock; - -- inet->inet_rcv_saddr = inet->inet_saddr = addr->sin_addr.s_addr; -+ v4_set_sock_addr(inet, &nsa); - if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST) - inet->inet_saddr = 0; /* Use device */ - -@@ -752,11 +762,13 @@ int inet_getname(struct socket *sock, st - peer == 1)) - return -ENOTCONN; - sin->sin_port = inet->inet_dport; -- sin->sin_addr.s_addr = inet->inet_daddr; -+ sin->sin_addr.s_addr = -+ nx_map_sock_lback(sk->sk_nx_info, inet->inet_daddr); - } else { - __be32 addr = inet->inet_rcv_saddr; - if (!addr) - addr = inet->inet_saddr; -+ addr = nx_map_sock_lback(sk->sk_nx_info, addr); - sin->sin_port = inet->inet_sport; - sin->sin_addr.s_addr = addr; - } -diff -NurpP --minimal linux-3.7/net/ipv4/arp.c linux-3.7-vs2.3.5.1/net/ipv4/arp.c ---- linux-3.7/net/ipv4/arp.c 2012-10-04 13:27:49.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv4/arp.c 2012-12-11 15:56:33.000000000 +0000 -@@ -1318,6 +1318,7 @@ static void arp_format_neigh_entry(struc - struct net_device *dev = n->dev; - int hatype = dev->type; - -+ /* FIXME: check for network context */ - read_lock(&n->lock); - /* Convert hardware address to XX:XX:XX:XX ... form. */ - #if IS_ENABLED(CONFIG_AX25) -@@ -1349,6 +1350,7 @@ static void arp_format_pneigh_entry(stru - int hatype = dev ? dev->type : 0; - char tbuf[16]; - -+ /* FIXME: check for network context */ - sprintf(tbuf, "%pI4", n->key); - seq_printf(seq, "%-16s 0x%-10x0x%-10x%s * %s\n", - tbuf, hatype, ATF_PUBL | ATF_PERM, "00:00:00:00:00:00", -diff -NurpP --minimal linux-3.7/net/ipv4/devinet.c linux-3.7-vs2.3.5.1/net/ipv4/devinet.c ---- linux-3.7/net/ipv4/devinet.c 2012-12-11 15:47:54.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv4/devinet.c 2012-12-11 15:56:33.000000000 +0000 -@@ -513,6 +513,7 @@ struct in_device *inetdev_by_index(struc - } - EXPORT_SYMBOL(inetdev_by_index); - ++ proxy_new = xchg(&space->vx_nsproxy, proxy_new); ++ space->vx_nsmask |= mask; + - /* Called only from RTNL semaphored context. No locks. */ - - struct in_ifaddr *inet_ifa_byprefix(struct in_device *in_dev, __be32 prefix, -@@ -754,6 +755,8 @@ int devinet_ioctl(struct net *net, unsig - - in_dev = __in_dev_get_rtnl(dev); - if (in_dev) { -+ struct nx_info *nxi = current_nx_info(); ++ if (mask & CLONE_NEWUSER) { ++ struct cred *cred; + - if (tryaddrmatch) { - /* Matthias Andree */ - /* compare label and address (4.4BSD style) */ -@@ -762,6 +765,8 @@ int devinet_ioctl(struct net *net, unsig - This is checked above. */ - for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL; - ifap = &ifa->ifa_next) { -+ if (!nx_v4_ifa_visible(nxi, ifa)) -+ continue; - if (!strcmp(ifr.ifr_name, ifa->ifa_label) && - sin_orig.sin_addr.s_addr == - ifa->ifa_local) { -@@ -774,9 +779,12 @@ int devinet_ioctl(struct net *net, unsig - comparing just the label */ - if (!ifa) { - for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL; -- ifap = &ifa->ifa_next) -+ ifap = &ifa->ifa_next) { -+ if (!nx_v4_ifa_visible(nxi, ifa)) -+ continue; - if (!strcmp(ifr.ifr_name, ifa->ifa_label)) - break; -+ } - } - } - -@@ -929,6 +937,8 @@ static int inet_gifconf(struct net_devic - goto out; - - for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) { -+ if (!nx_v4_ifa_visible(current_nx_info(), ifa)) -+ continue; - if (!buf) { - done += sizeof(ifr); - continue; -@@ -1288,6 +1298,7 @@ static int inet_dump_ifaddr(struct sk_bu - struct net_device *dev; - struct in_device *in_dev; - struct in_ifaddr *ifa; -+ struct sock *sk = skb->sk; - struct hlist_head *head; - struct hlist_node *node; - -@@ -1310,6 +1321,8 @@ static int inet_dump_ifaddr(struct sk_bu - - for (ifa = in_dev->ifa_list, ip_idx = 0; ifa; - ifa = ifa->ifa_next, ip_idx++) { -+ if (sk && !nx_v4_ifa_visible(sk->sk_nx_info, ifa)) -+ continue; - if (ip_idx < s_ip_idx) - continue; - if (inet_fill_ifaddr(skb, ifa, -diff -NurpP --minimal linux-3.7/net/ipv4/fib_trie.c linux-3.7-vs2.3.5.1/net/ipv4/fib_trie.c ---- linux-3.7/net/ipv4/fib_trie.c 2012-12-11 15:47:54.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv4/fib_trie.c 2012-12-11 15:56:33.000000000 +0000 -@@ -2557,6 +2557,7 @@ static int fib_route_seq_show(struct seq - || fa->fa_type == RTN_MULTICAST) - continue; - -+ /* FIXME: check for network context? */ - if (fi) - seq_printf(seq, - "%s\t%08X\t%08X\t%04X\t%d\t%u\t" -diff -NurpP --minimal linux-3.7/net/ipv4/inet_connection_sock.c linux-3.7-vs2.3.5.1/net/ipv4/inet_connection_sock.c ---- linux-3.7/net/ipv4/inet_connection_sock.c 2012-12-11 15:47:54.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv4/inet_connection_sock.c 2012-12-11 15:56:33.000000000 +0000 -@@ -53,6 +53,37 @@ void inet_get_local_port_range(int *low, - } - EXPORT_SYMBOL(inet_get_local_port_range); - -+int ipv4_rcv_saddr_equal(const struct sock *sk1, const struct sock *sk2) ++ vxdprintk(VXD_CBIT(space, 10), ++ "vx_set_space(%p[#%u],%p) cred (%p,%p)", ++ vxi, vxi->vx_id, space->vx_cred, ++ current->real_cred, current->cred); ++ ++ cred = prepare_creds(); ++ cred = (struct cred *)xchg(&space->vx_cred, cred); ++ if (cred) ++ abort_creds(cred); ++ } ++ ++ ret = 0; ++ ++ if (proxy_new) ++ put_nsproxy(proxy_new); ++out_put: ++ if (proxy_cur) ++ put_nsproxy(proxy_cur); ++ return ret; ++} ++ ++ ++int vc_enter_space_v1(struct vx_info *vxi, void __user *data) ++{ ++ struct vcmd_space_mask_v1 vc_data = { .mask = 0 }; ++ ++ if (data && copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; ++ ++ return vx_enter_space(vxi, vc_data.mask, 0); ++} ++ ++int vc_enter_space(struct vx_info *vxi, void __user *data) +{ -+ __be32 sk1_rcv_saddr = sk_rcv_saddr(sk1), -+ sk2_rcv_saddr = sk_rcv_saddr(sk2); ++ struct vcmd_space_mask_v2 vc_data = { .mask = 0 }; + -+ if (inet_v6_ipv6only(sk2)) -+ return 0; ++ if (data && copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; + -+ if (sk1_rcv_saddr && -+ sk2_rcv_saddr && -+ sk1_rcv_saddr == sk2_rcv_saddr) -+ return 1; ++ if (vc_data.index >= VX_SPACES) ++ return -EINVAL; + -+ if (sk1_rcv_saddr && -+ !sk2_rcv_saddr && -+ v4_addr_in_nx_info(sk2->sk_nx_info, sk1_rcv_saddr, NXA_MASK_BIND)) -+ return 1; ++ return vx_enter_space(vxi, vc_data.mask, vc_data.index); ++} + -+ if (sk2_rcv_saddr && -+ !sk1_rcv_saddr && -+ v4_addr_in_nx_info(sk1->sk_nx_info, sk2_rcv_saddr, NXA_MASK_BIND)) -+ return 1; ++int vc_set_space_v1(struct vx_info *vxi, void __user *data) ++{ ++ struct vcmd_space_mask_v1 vc_data = { .mask = 0 }; + -+ if (!sk1_rcv_saddr && -+ !sk2_rcv_saddr && -+ nx_v4_addr_conflict(sk1->sk_nx_info, sk2->sk_nx_info)) -+ return 1; ++ if (data && copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; ++ ++ return vx_set_space(vxi, vc_data.mask, 0); ++} ++ ++int vc_set_space(struct vx_info *vxi, void __user *data) ++{ ++ struct vcmd_space_mask_v2 vc_data = { .mask = 0 }; ++ ++ if (data && copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; ++ ++ if (vc_data.index >= VX_SPACES) ++ return -EINVAL; ++ ++ return vx_set_space(vxi, vc_data.mask, vc_data.index); ++} ++ ++int vc_get_space_mask(void __user *data, int type) ++{ ++ const struct vcmd_space_mask_v1 *mask; ++ ++ if (type == 0) ++ mask = &space_mask_v0; ++ else if (type == 1) ++ mask = &space_mask; ++ else ++ mask = &default_space_mask; ++ ++ vxdprintk(VXD_CBIT(space, 10), ++ "vc_get_space_mask(%d) = %08llx", type, mask->mask); + ++ if (copy_to_user(data, mask, sizeof(*mask))) ++ return -EFAULT; + return 0; +} + - int inet_csk_bind_conflict(const struct sock *sk, - const struct inet_bind_bucket *tb, bool relax) - { -@@ -75,9 +106,7 @@ int inet_csk_bind_conflict(const struct - sk->sk_bound_dev_if == sk2->sk_bound_dev_if)) { - if (!reuse || !sk2->sk_reuse || - sk2->sk_state == TCP_LISTEN) { -- const __be32 sk2_rcv_saddr = sk_rcv_saddr(sk2); -- if (!sk2_rcv_saddr || !sk_rcv_saddr(sk) || -- sk2_rcv_saddr == sk_rcv_saddr(sk)) -+ if (ipv4_rcv_saddr_equal(sk, sk2)) - break; - } - if (!relax && reuse && sk2->sk_reuse && -diff -NurpP --minimal linux-3.7/net/ipv4/inet_diag.c linux-3.7-vs2.3.5.1/net/ipv4/inet_diag.c ---- linux-3.7/net/ipv4/inet_diag.c 2012-12-11 15:47:54.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv4/inet_diag.c 2012-12-11 17:05:58.000000000 +0000 -@@ -31,6 +31,8 @@ - - #include - #include +diff -NurpP --minimal linux-3.18.5/kernel/vserver/switch.c linux-3.18.5-vs2.3.7.3/kernel/vserver/switch.c +--- linux-3.18.5/kernel/vserver/switch.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/vserver/switch.c 2015-01-19 10:58:31.000000000 +0000 +@@ -0,0 +1,556 @@ ++/* ++ * linux/kernel/vserver/switch.c ++ * ++ * Virtual Server: Syscall Switch ++ * ++ * Copyright (C) 2003-2011 Herbert Pötzl ++ * ++ * V0.01 syscall switch ++ * V0.02 added signal to context ++ * V0.03 added rlimit functions ++ * V0.04 added iattr, task/xid functions ++ * V0.05 added debug/history stuff ++ * V0.06 added compat32 layer ++ * V0.07 vcmd args and perms ++ * V0.08 added status commands ++ * V0.09 added tag commands ++ * V0.10 added oom bias ++ * V0.11 added device commands ++ * V0.12 added warn mask ++ * ++ */ ++ ++#include +#include -+#include - - #include - #include -@@ -106,8 +108,10 @@ int inet_sk_diag_fill(struct sock *sk, s - - r->id.idiag_sport = inet->inet_sport; - r->id.idiag_dport = inet->inet_dport; -- r->id.idiag_src[0] = inet->inet_rcv_saddr; -- r->id.idiag_dst[0] = inet->inet_daddr; -+ r->id.idiag_src[0] = nx_map_sock_lback(sk->sk_nx_info, -+ inet->inet_rcv_saddr); -+ r->id.idiag_dst[0] = nx_map_sock_lback(sk->sk_nx_info, -+ inet->inet_daddr); - - /* IPv6 dual-stack sockets use inet->tos for IPv4 connections, - * hence this needs to be included regardless of socket family. -@@ -239,8 +243,8 @@ static int inet_twsk_diag_fill(struct in - sock_diag_save_cookie(tw, r->id.idiag_cookie); - r->id.idiag_sport = tw->tw_sport; - r->id.idiag_dport = tw->tw_dport; -- r->id.idiag_src[0] = tw->tw_rcv_saddr; -- r->id.idiag_dst[0] = tw->tw_daddr; -+ r->id.idiag_src[0] = nx_map_sock_lback(tw->tw_nx_info, tw->tw_rcv_saddr); -+ r->id.idiag_dst[0] = nx_map_sock_lback(tw->tw_nx_info, tw->tw_daddr); - r->idiag_state = tw->tw_substate; - r->idiag_timer = 3; - r->idiag_expires = DIV_ROUND_UP(tmo * 1000, HZ); -@@ -284,12 +288,14 @@ int inet_diag_dump_one_icsk(struct inet_ - - err = -EINVAL; - if (req->sdiag_family == AF_INET) { -+ /* TODO: lback */ - sk = inet_lookup(net, hashinfo, req->id.idiag_dst[0], - req->id.idiag_dport, req->id.idiag_src[0], - req->id.idiag_sport, req->id.idiag_if); - } - #if IS_ENABLED(CONFIG_IPV6) - else if (req->sdiag_family == AF_INET6) { -+ /* TODO: lback */ - sk = inet6_lookup(net, hashinfo, - (struct in6_addr *)req->id.idiag_dst, - req->id.idiag_dport, -@@ -491,6 +497,7 @@ int inet_diag_bc_sk(const struct nlattr - } else - #endif - { -+ /* TODO: lback */ - entry.saddr = &inet->inet_rcv_saddr; - entry.daddr = &inet->inet_daddr; - } -@@ -649,6 +656,7 @@ static int inet_twsk_diag_dump(struct in - } else - #endif - { -+ /* TODO: lback */ - entry.saddr = &tw->tw_rcv_saddr; - entry.daddr = &tw->tw_daddr; - } -@@ -727,8 +735,8 @@ static int inet_diag_fill_req(struct sk_ - - r->id.idiag_sport = inet->inet_sport; - r->id.idiag_dport = ireq->rmt_port; -- r->id.idiag_src[0] = ireq->loc_addr; -- r->id.idiag_dst[0] = ireq->rmt_addr; -+ r->id.idiag_src[0] = nx_map_sock_lback(sk->sk_nx_info, ireq->loc_addr); -+ r->id.idiag_dst[0] = nx_map_sock_lback(sk->sk_nx_info, ireq->rmt_addr); - r->idiag_expires = jiffies_to_msecs(tmo); - r->idiag_rqueue = 0; - r->idiag_wqueue = 0; -@@ -791,6 +799,7 @@ static int inet_diag_dump_reqs(struct sk - r->id.idiag_dport) - continue; - -+ /* TODO: lback */ - if (bc) { - inet_diag_req_addrs(sk, req, &entry); - entry.dport = ntohs(ireq->rmt_port); -@@ -847,6 +856,8 @@ void inet_diag_dump_icsk(struct inet_has - if (!net_eq(sock_net(sk), net)) - continue; - -+ if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)) -+ continue; - if (num < s_num) { - num++; - continue; -@@ -919,6 +930,8 @@ skip_listen_ht: - - if (!net_eq(sock_net(sk), net)) - continue; -+ if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)) -+ continue; - if (num < s_num) - goto next_normal; - if (!(r->idiag_states & (1 << sk->sk_state))) -@@ -947,7 +960,8 @@ next_normal: - &head->twchain) { - if (!net_eq(twsk_net(tw), net)) - continue; -- -+ if (!nx_check(tw->tw_nid, VS_WATCH_P | VS_IDENT)) -+ continue; - if (num < s_num) - goto next_dying; - if (r->sdiag_family != AF_UNSPEC && -diff -NurpP --minimal linux-3.7/net/ipv4/inet_hashtables.c linux-3.7-vs2.3.5.1/net/ipv4/inet_hashtables.c ---- linux-3.7/net/ipv4/inet_hashtables.c 2012-07-22 21:39:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv4/inet_hashtables.c 2012-12-11 15:56:33.000000000 +0000 -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - #include - - /* -@@ -156,6 +157,11 @@ static inline int compute_score(struct s - if (rcv_saddr != daddr) - return -1; - score += 2; -+ } else { -+ /* block non nx_info ips */ -+ if (!v4_addr_in_nx_info(sk->sk_nx_info, -+ daddr, NXA_MASK_BIND)) -+ return -1; - } - if (sk->sk_bound_dev_if) { - if (sk->sk_bound_dev_if != dif) -@@ -173,7 +179,6 @@ static inline int compute_score(struct s - * wildcarded during the search since they can never be otherwise. - */ - -- - struct sock *__inet_lookup_listener(struct net *net, - struct inet_hashinfo *hashinfo, - const __be32 daddr, const unsigned short hnum, -@@ -196,6 +201,7 @@ begin: - hiscore = score; - } - } ++#include + - /* - * if the nulls value we got at the end of this lookup is - * not the expected one, we must restart lookup. -diff -NurpP --minimal linux-3.7/net/ipv4/netfilter.c linux-3.7-vs2.3.5.1/net/ipv4/netfilter.c ---- linux-3.7/net/ipv4/netfilter.c 2012-12-11 15:47:54.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv4/netfilter.c 2012-12-11 15:56:33.000000000 +0000 -@@ -6,7 +6,7 @@ - #include - #include - #include --#include -+// #include - #include - #include - #include -diff -NurpP --minimal linux-3.7/net/ipv4/raw.c linux-3.7-vs2.3.5.1/net/ipv4/raw.c ---- linux-3.7/net/ipv4/raw.c 2012-12-11 15:47:54.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv4/raw.c 2012-12-11 15:56:33.000000000 +0000 -@@ -118,7 +118,7 @@ static struct sock *__raw_v4_lookup(stru - - if (net_eq(sock_net(sk), net) && inet->inet_num == num && - !(inet->inet_daddr && inet->inet_daddr != raddr) && -- !(inet->inet_rcv_saddr && inet->inet_rcv_saddr != laddr) && -+ v4_sock_addr_match(sk->sk_nx_info, inet, laddr) && - !(sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif)) - goto found; /* gotcha */ - } -@@ -397,6 +397,12 @@ static int raw_send_hdrinc(struct sock * - icmp_out_count(net, ((struct icmphdr *) - skb_transport_header(skb))->type); - -+ err = -EPERM; -+ if (!nx_check(0, VS_ADMIN) && !capable(CAP_NET_RAW) && -+ sk->sk_nx_info && -+ !v4_addr_in_nx_info(sk->sk_nx_info, iph->saddr, NXA_MASK_BIND)) -+ goto error_free; ++#include "vci_config.h" + - err = NF_HOOK(NFPROTO_IPV4, NF_INET_LOCAL_OUT, skb, NULL, - rt->dst.dev, dst_output); - if (err > 0) -@@ -582,6 +588,16 @@ static int raw_sendmsg(struct kiocb *ioc - goto done; - } - -+ if (sk->sk_nx_info) { -+ rt = ip_v4_find_src(sock_net(sk), sk->sk_nx_info, &fl4); -+ if (IS_ERR(rt)) { -+ err = PTR_ERR(rt); -+ rt = NULL; -+ goto done; -+ } -+ ip_rt_put(rt); -+ } + - security_sk_classify_flow(sk, flowi4_to_flowi(&fl4)); - rt = ip_route_output_flow(sock_net(sk), &fl4, sk); - if (IS_ERR(rt)) { -@@ -658,17 +674,19 @@ static int raw_bind(struct sock *sk, str - { - struct inet_sock *inet = inet_sk(sk); - struct sockaddr_in *addr = (struct sockaddr_in *) uaddr; -+ struct nx_v4_sock_addr nsa = { 0 }; - int ret = -EINVAL; - int chk_addr_ret; - - if (sk->sk_state != TCP_CLOSE || addr_len < sizeof(struct sockaddr_in)) - goto out; -- chk_addr_ret = inet_addr_type(sock_net(sk), addr->sin_addr.s_addr); -+ v4_map_sock_addr(inet, addr, &nsa); -+ chk_addr_ret = inet_addr_type(sock_net(sk), nsa.saddr); - ret = -EADDRNOTAVAIL; -- if (addr->sin_addr.s_addr && chk_addr_ret != RTN_LOCAL && -+ if (nsa.saddr && chk_addr_ret != RTN_LOCAL && - chk_addr_ret != RTN_MULTICAST && chk_addr_ret != RTN_BROADCAST) - goto out; -- inet->inet_rcv_saddr = inet->inet_saddr = addr->sin_addr.s_addr; -+ v4_set_sock_addr(inet, &nsa); - if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST) - inet->inet_saddr = 0; /* Use device */ - sk_dst_reset(sk); -@@ -720,7 +738,8 @@ static int raw_recvmsg(struct kiocb *ioc - /* Copy the address. */ - if (sin) { - sin->sin_family = AF_INET; -- sin->sin_addr.s_addr = ip_hdr(skb)->saddr; -+ sin->sin_addr.s_addr = -+ nx_map_sock_lback(sk->sk_nx_info, ip_hdr(skb)->saddr); - sin->sin_port = 0; - memset(&sin->sin_zero, 0, sizeof(sin->sin_zero)); - } -@@ -916,7 +935,8 @@ static struct sock *raw_get_first(struct - struct hlist_node *node; - - sk_for_each(sk, node, &state->h->ht[state->bucket]) -- if (sock_net(sk) == seq_file_net(seq)) -+ if ((sock_net(sk) == seq_file_net(seq)) && -+ nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)) - goto found; - } - sk = NULL; -@@ -932,7 +952,8 @@ static struct sock *raw_get_next(struct - sk = sk_next(sk); - try_again: - ; -- } while (sk && sock_net(sk) != seq_file_net(seq)); -+ } while (sk && ((sock_net(sk) != seq_file_net(seq)) || -+ !nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))); - - if (!sk && ++state->bucket < RAW_HTABLE_SIZE) { - sk = sk_head(&state->h->ht[state->bucket]); -diff -NurpP --minimal linux-3.7/net/ipv4/route.c linux-3.7-vs2.3.5.1/net/ipv4/route.c ---- linux-3.7/net/ipv4/route.c 2012-12-11 15:47:54.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv4/route.c 2012-12-11 15:56:33.000000000 +0000 -@@ -1952,7 +1952,7 @@ struct rtable *__ip_route_output_key(str - - - if (fl4->flowi4_oif) { -- dev_out = dev_get_by_index_rcu(net, fl4->flowi4_oif); -+ dev_out = dev_get_by_index_real_rcu(net, fl4->flowi4_oif); - rth = ERR_PTR(-ENODEV); - if (dev_out == NULL) - goto out; -diff -NurpP --minimal linux-3.7/net/ipv4/tcp.c linux-3.7-vs2.3.5.1/net/ipv4/tcp.c ---- linux-3.7/net/ipv4/tcp.c 2012-12-11 15:47:54.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv4/tcp.c 2012-12-11 15:56:33.000000000 +0000 -@@ -268,6 +268,7 @@ - #include - #include - #include -+#include - - #include - #include -diff -NurpP --minimal linux-3.7/net/ipv4/tcp_ipv4.c linux-3.7-vs2.3.5.1/net/ipv4/tcp_ipv4.c ---- linux-3.7/net/ipv4/tcp_ipv4.c 2012-12-11 15:47:54.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv4/tcp_ipv4.c 2012-12-11 17:07:07.000000000 +0000 -@@ -2264,6 +2264,12 @@ static void *listening_get_next(struct s - req = req->dl_next; - while (1) { - while (req) { -+ vxdprintk(VXD_CBIT(net, 6), -+ "sk,req: %p [#%d] (from %d)", req->sk, -+ (req->sk)?req->sk->sk_nid:0, nx_current_nid()); -+ if (req->sk && -+ !nx_check(req->sk->sk_nid, VS_WATCH_P | VS_IDENT)) -+ continue; - if (req->rsk_ops->family == st->family) { - cur = req; - goto out; -@@ -2288,6 +2294,10 @@ get_req: - } - get_sk: - sk_nulls_for_each_from(sk, node) { -+ vxdprintk(VXD_CBIT(net, 6), "sk: %p [#%d] (from %d)", -+ sk, sk->sk_nid, nx_current_nid()); -+ if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)) -+ continue; - if (!net_eq(sock_net(sk), net)) - continue; - if (sk->sk_family == st->family) { -@@ -2364,6 +2374,11 @@ static void *established_get_first(struc - - spin_lock_bh(lock); - sk_nulls_for_each(sk, node, &tcp_hashinfo.ehash[st->bucket].chain) { -+ vxdprintk(VXD_CBIT(net, 6), -+ "sk,egf: %p [#%d] (from %d)", -+ sk, sk->sk_nid, nx_current_nid()); -+ if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)) -+ continue; - if (sk->sk_family != st->family || - !net_eq(sock_net(sk), net)) { - continue; -@@ -2374,6 +2389,11 @@ static void *established_get_first(struc - st->state = TCP_SEQ_STATE_TIME_WAIT; - inet_twsk_for_each(tw, node, - &tcp_hashinfo.ehash[st->bucket].twchain) { -+ vxdprintk(VXD_CBIT(net, 6), -+ "tw: %p [#%d] (from %d)", -+ tw, tw->tw_nid, nx_current_nid()); -+ if (!nx_check(tw->tw_nid, VS_WATCH_P | VS_IDENT)) -+ continue; - if (tw->tw_family != st->family || - !net_eq(twsk_net(tw), net)) { - continue; -@@ -2403,7 +2423,9 @@ static void *established_get_next(struct - tw = cur; - tw = tw_next(tw); - get_tw: -- while (tw && (tw->tw_family != st->family || !net_eq(twsk_net(tw), net))) { -+ while (tw && (tw->tw_family != st->family || -+ !net_eq(twsk_net(tw), net) || -+ !nx_check(tw->tw_nid, VS_WATCH_P | VS_IDENT))) { - tw = tw_next(tw); - } - if (tw) { -@@ -2427,6 +2449,11 @@ get_tw: - sk = sk_nulls_next(sk); - - sk_nulls_for_each_from(sk, node) { -+ vxdprintk(VXD_CBIT(net, 6), -+ "sk,egn: %p [#%d] (from %d)", -+ sk, sk->sk_nid, nx_current_nid()); -+ if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)) -+ continue; - if (sk->sk_family == st->family && net_eq(sock_net(sk), net)) - goto found; - } -@@ -2632,9 +2659,9 @@ static void get_openreq4(const struct so - seq_printf(f, "%4d: %08X:%04X %08X:%04X" - " %02X %08X:%08X %02X:%08lX %08X %5d %8d %u %d %pK%n", - i, -- ireq->loc_addr, -+ nx_map_sock_lback(current_nx_info(), ireq->loc_addr), - ntohs(inet_sk(sk)->inet_sport), -- ireq->rmt_addr, -+ nx_map_sock_lback(current_nx_info(), ireq->rmt_addr), - ntohs(ireq->rmt_port), - TCP_SYN_RECV, - 0, 0, /* could print option size, but that is af dependent. */ -@@ -2657,8 +2684,8 @@ static void get_tcp4_sock(struct sock *s - const struct inet_connection_sock *icsk = inet_csk(sk); - const struct inet_sock *inet = inet_sk(sk); - struct fastopen_queue *fastopenq = icsk->icsk_accept_queue.fastopenq; -- __be32 dest = inet->inet_daddr; -- __be32 src = inet->inet_rcv_saddr; -+ __be32 dest = nx_map_sock_lback(current_nx_info(), inet->inet_daddr); -+ __be32 src = nx_map_sock_lback(current_nx_info(), inet->inet_rcv_saddr); - __u16 destp = ntohs(inet->inet_dport); - __u16 srcp = ntohs(inet->inet_sport); - int rx_queue; -@@ -2714,8 +2741,8 @@ static void get_timewait4_sock(const str - __u16 destp, srcp; - long delta = tw->tw_ttd - jiffies; - -- dest = tw->tw_daddr; -- src = tw->tw_rcv_saddr; -+ dest = nx_map_sock_lback(current_nx_info(), tw->tw_daddr); -+ src = nx_map_sock_lback(current_nx_info(), tw->tw_rcv_saddr); - destp = ntohs(tw->tw_dport); - srcp = ntohs(tw->tw_sport); - -diff -NurpP --minimal linux-3.7/net/ipv4/tcp_minisocks.c linux-3.7-vs2.3.5.1/net/ipv4/tcp_minisocks.c ---- linux-3.7/net/ipv4/tcp_minisocks.c 2012-12-11 15:47:54.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv4/tcp_minisocks.c 2012-12-11 15:56:33.000000000 +0000 -@@ -23,6 +23,9 @@ - #include - #include - #include -+#include -+#include -+#include - #include - #include - #include -@@ -289,6 +292,11 @@ void tcp_time_wait(struct sock *sk, int - tcptw->tw_ts_recent = tp->rx_opt.ts_recent; - tcptw->tw_ts_recent_stamp = tp->rx_opt.ts_recent_stamp; - -+ tw->tw_xid = sk->sk_xid; -+ tw->tw_vx_info = NULL; -+ tw->tw_nid = sk->sk_nid; -+ tw->tw_nx_info = NULL; ++static inline ++int vc_get_version(uint32_t id) ++{ ++ return VCI_VERSION; ++} + - #if IS_ENABLED(CONFIG_IPV6) - if (tw->tw_family == PF_INET6) { - struct ipv6_pinfo *np = inet6_sk(sk); -diff -NurpP --minimal linux-3.7/net/ipv4/udp.c linux-3.7-vs2.3.5.1/net/ipv4/udp.c ---- linux-3.7/net/ipv4/udp.c 2012-12-11 15:47:54.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv4/udp.c 2012-12-11 15:56:33.000000000 +0000 -@@ -300,14 +300,7 @@ fail: - } - EXPORT_SYMBOL(udp_lib_get_port); - --static int ipv4_rcv_saddr_equal(const struct sock *sk1, const struct sock *sk2) --{ -- struct inet_sock *inet1 = inet_sk(sk1), *inet2 = inet_sk(sk2); -- -- return (!ipv6_only_sock(sk2) && -- (!inet1->inet_rcv_saddr || !inet2->inet_rcv_saddr || -- inet1->inet_rcv_saddr == inet2->inet_rcv_saddr)); --} -+extern int ipv4_rcv_saddr_equal(const struct sock *, const struct sock *); - - static unsigned int udp4_portaddr_hash(struct net *net, __be32 saddr, - unsigned int port) -@@ -342,6 +335,11 @@ static inline int compute_score(struct s - if (inet->inet_rcv_saddr != daddr) - return -1; - score += 2; -+ } else { -+ /* block non nx_info ips */ -+ if (!v4_addr_in_nx_info(sk->sk_nx_info, -+ daddr, NXA_MASK_BIND)) -+ return -1; - } - if (inet->inet_daddr) { - if (inet->inet_daddr != saddr) -@@ -445,6 +443,7 @@ exact_match: - return result; - } - ++static inline ++int vc_get_vci(uint32_t id) ++{ ++ return vci_kernel_config(); ++} + - /* UDP is nearly always wildcards out the wazoo, it makes no sense to try - * harder than this. -DaveM - */ -@@ -490,6 +489,11 @@ begin: - sk_nulls_for_each_rcu(sk, node, &hslot->head) { - score = compute_score(sk, net, saddr, hnum, sport, - daddr, dport, dif); -+ /* FIXME: disabled? -+ if (score == 9) { -+ result = sk; -+ break; -+ } else */ - if (score > badness) { - result = sk; - badness = score; -@@ -503,6 +507,7 @@ begin: - if (get_nulls_value(node) != slot) - goto begin; - ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + - if (result) { - if (unlikely(!atomic_inc_not_zero_hint(&result->sk_refcnt, 2))) - result = NULL; -@@ -512,6 +517,7 @@ begin: - goto begin; - } - } ++#include ++#include + - rcu_read_unlock(); - return result; - } -@@ -555,8 +561,7 @@ static inline struct sock *udp_v4_mcast_ - udp_sk(s)->udp_port_hash != hnum || - (inet->inet_daddr && inet->inet_daddr != rmt_addr) || - (inet->inet_dport != rmt_port && inet->inet_dport) || -- (inet->inet_rcv_saddr && -- inet->inet_rcv_saddr != loc_addr) || -+ !v4_sock_addr_match(sk->sk_nx_info, inet, loc_addr) || - ipv6_only_sock(s) || - (s->sk_bound_dev_if && s->sk_bound_dev_if != dif)) - continue; -@@ -939,6 +944,16 @@ int udp_sendmsg(struct kiocb *iocb, stru - inet_sk_flowi_flags(sk)|FLOWI_FLAG_CAN_SLEEP, - faddr, saddr, dport, inet->inet_sport); - -+ if (sk->sk_nx_info) { -+ rt = ip_v4_find_src(net, sk->sk_nx_info, fl4); -+ if (IS_ERR(rt)) { -+ err = PTR_ERR(rt); -+ rt = NULL; -+ goto out; -+ } -+ ip_rt_put(rt); -+ } + - security_sk_classify_flow(sk, flowi4_to_flowi(fl4)); - rt = ip_route_output_flow(net, fl4, sk); - if (IS_ERR(rt)) { -@@ -1244,7 +1259,8 @@ try_again: - if (sin) { - sin->sin_family = AF_INET; - sin->sin_port = udp_hdr(skb)->source; -- sin->sin_addr.s_addr = ip_hdr(skb)->saddr; -+ sin->sin_addr.s_addr = nx_map_sock_lback( -+ skb->sk->sk_nx_info, ip_hdr(skb)->saddr); - memset(sin->sin_zero, 0, sizeof(sin->sin_zero)); - } - if (inet->cmsg_flags) -@@ -1992,6 +2008,8 @@ static struct sock *udp_get_first(struct - sk_nulls_for_each(sk, node, &hslot->head) { - if (!net_eq(sock_net(sk), net)) - continue; -+ if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)) -+ continue; - if (sk->sk_family == state->family) - goto found; - } -@@ -2009,7 +2027,9 @@ static struct sock *udp_get_next(struct - - do { - sk = sk_nulls_next(sk); -- } while (sk && (!net_eq(sock_net(sk), net) || sk->sk_family != state->family)); -+ } while (sk && (!net_eq(sock_net(sk), net) || -+ sk->sk_family != state->family || -+ !nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))); - - if (!sk) { - if (state->bucket <= state->udp_table->mask) -@@ -2105,8 +2125,8 @@ static void udp4_format_sock(struct sock - int bucket, int *len) - { - struct inet_sock *inet = inet_sk(sp); -- __be32 dest = inet->inet_daddr; -- __be32 src = inet->inet_rcv_saddr; -+ __be32 dest = nx_map_sock_lback(current_nx_info(), inet->inet_daddr); -+ __be32 src = nx_map_sock_lback(current_nx_info(), inet->inet_rcv_saddr); - __u16 destp = ntohs(inet->inet_dport); - __u16 srcp = ntohs(inet->inet_sport); - -diff -NurpP --minimal linux-3.7/net/ipv6/Kconfig linux-3.7-vs2.3.5.1/net/ipv6/Kconfig ---- linux-3.7/net/ipv6/Kconfig 2012-12-11 15:47:54.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv6/Kconfig 2012-12-11 15:56:33.000000000 +0000 -@@ -4,8 +4,8 @@ - - # IPv6 as module will cause a CRASH if you try to unload it - menuconfig IPV6 -- tristate "The IPv6 protocol" -- default m -+ bool "The IPv6 protocol" -+ default n - ---help--- - This is complemental support for the IP version 6. - You will still be able to do traditional IPv4 networking as well. -diff -NurpP --minimal linux-3.7/net/ipv6/addrconf.c linux-3.7-vs2.3.5.1/net/ipv6/addrconf.c ---- linux-3.7/net/ipv6/addrconf.c 2012-12-11 15:47:54.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv6/addrconf.c 2012-12-11 15:56:33.000000000 +0000 -@@ -92,6 +92,8 @@ - #include - #include - #include -+#include -+#include - - /* Set to 3 to get tracing... */ - #define ACONF_DEBUG 2 -@@ -1094,7 +1096,7 @@ out: - - int ipv6_dev_get_saddr(struct net *net, const struct net_device *dst_dev, - const struct in6_addr *daddr, unsigned int prefs, -- struct in6_addr *saddr) -+ struct in6_addr *saddr, struct nx_info *nxi) - { - struct ipv6_saddr_score scores[2], - *score = &scores[0], *hiscore = &scores[1]; -@@ -1166,6 +1168,8 @@ int ipv6_dev_get_saddr(struct net *net, - dev->name); - continue; - } -+ if (!v6_addr_in_nx_info(nxi, &score->ifa->addr, -1)) -+ continue; - - score->rule = -1; - bitmap_zero(score->scorebits, IPV6_SADDR_RULE_MAX); -@@ -3135,7 +3139,10 @@ static void if6_seq_stop(struct seq_file - static int if6_seq_show(struct seq_file *seq, void *v) - { - struct inet6_ifaddr *ifp = (struct inet6_ifaddr *)v; -- seq_printf(seq, "%pi6 %02x %02x %02x %02x %8s\n", ++#ifdef CONFIG_COMPAT ++#define __COMPAT(name, id, data, compat) \ ++ (compat) ? name ## _x32(id, data) : name(id, data) ++#define __COMPAT_NO_ID(name, data, compat) \ ++ (compat) ? name ## _x32(data) : name(data) ++#else ++#define __COMPAT(name, id, data, compat) \ ++ name(id, data) ++#define __COMPAT_NO_ID(name, data, compat) \ ++ name(data) ++#endif + -+ if (nx_check(0, VS_ADMIN|VS_WATCH) || -+ v6_addr_in_nx_info(current_nx_info(), &ifp->addr, -1)) -+ seq_printf(seq, "%pi6 %02x %02x %02x %02x %8s\n", - &ifp->addr, - ifp->idev->dev->ifindex, - ifp->prefix_len, -@@ -3641,6 +3648,11 @@ static int in6_dump_addrs(struct inet6_d - struct ifacaddr6 *ifaca; - int err = 1; - int ip_idx = *p_ip_idx; -+ struct nx_info *nxi = skb->sk ? skb->sk->sk_nx_info : NULL; + -+ /* disable ipv6 on non v6 guests */ -+ if (nxi && !nx_info_has_v6(nxi)) -+ return skb->len; - - read_lock_bh(&idev->lock); - switch (type) { -@@ -3651,6 +3663,8 @@ static int in6_dump_addrs(struct inet6_d - list_for_each_entry(ifa, &idev->addr_list, if_list) { - if (++ip_idx < s_ip_idx) - continue; -+ if (!v6_addr_in_nx_info(nxi, &ifa->addr, -1)) -+ continue; - err = inet6_fill_ifaddr(skb, ifa, - NETLINK_CB(cb->skb).portid, - cb->nlh->nlmsg_seq, -@@ -3667,6 +3681,8 @@ static int in6_dump_addrs(struct inet6_d - ifmca = ifmca->next, ip_idx++) { - if (ip_idx < s_ip_idx) - continue; -+ if (!v6_addr_in_nx_info(nxi, &ifmca->mca_addr, -1)) -+ continue; - err = inet6_fill_ifmcaddr(skb, ifmca, - NETLINK_CB(cb->skb).portid, - cb->nlh->nlmsg_seq, -@@ -3682,6 +3698,8 @@ static int in6_dump_addrs(struct inet6_d - ifaca = ifaca->aca_next, ip_idx++) { - if (ip_idx < s_ip_idx) - continue; -+ if (!v6_addr_in_nx_info(nxi, &ifaca->aca_addr, -1)) -+ continue; - err = inet6_fill_ifacaddr(skb, ifaca, - NETLINK_CB(cb->skb).portid, - cb->nlh->nlmsg_seq, -@@ -4065,6 +4083,11 @@ static int inet6_dump_ifinfo(struct sk_b - struct inet6_dev *idev; - struct hlist_head *head; - struct hlist_node *node; -+ struct nx_info *nxi = skb->sk ? skb->sk->sk_nx_info : NULL; ++static inline ++long do_vcmd(uint32_t cmd, uint32_t id, ++ struct vx_info *vxi, struct nx_info *nxi, ++ void __user *data, int compat) ++{ ++ switch (cmd) { + -+ /* FIXME: maybe disable ipv6 on non v6 guests? -+ if (skb->sk && skb->sk->sk_vx_info) -+ return skb->len; */ - - s_h = cb->args[0]; - s_idx = cb->args[1]; -@@ -4076,6 +4099,8 @@ static int inet6_dump_ifinfo(struct sk_b - hlist_for_each_entry_rcu(dev, node, head, index_hlist) { - if (idx < s_idx) - goto cont; -+ if (!v6_dev_in_nx_info(dev, nxi)) -+ goto cont; - idev = __in6_dev_get(dev); - if (!idev) - goto cont; -diff -NurpP --minimal linux-3.7/net/ipv6/af_inet6.c linux-3.7-vs2.3.5.1/net/ipv6/af_inet6.c ---- linux-3.7/net/ipv6/af_inet6.c 2012-12-11 15:47:54.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv6/af_inet6.c 2012-12-11 15:56:33.000000000 +0000 -@@ -43,6 +43,8 @@ - #include - #include - #include -+#include -+#include - - #include - #include -@@ -160,9 +162,12 @@ lookup_protocol: - } - - err = -EPERM; -+ if ((protocol == IPPROTO_ICMPV6) && -+ nx_capable(CAP_NET_RAW, NXC_RAW_ICMP)) -+ goto override; - if (sock->type == SOCK_RAW && !kern && !capable(CAP_NET_RAW)) - goto out_rcu_unlock; -- -+override: - sock->ops = answer->ops; - answer_prot = answer->prot; - answer_no_check = answer->no_check; -@@ -262,6 +267,7 @@ int inet6_bind(struct socket *sock, stru - struct inet_sock *inet = inet_sk(sk); - struct ipv6_pinfo *np = inet6_sk(sk); - struct net *net = sock_net(sk); -+ struct nx_v6_sock_addr nsa; - __be32 v4addr = 0; - unsigned short snum; - int addr_type = 0; -@@ -277,6 +283,10 @@ int inet6_bind(struct socket *sock, stru - if (addr->sin6_family != AF_INET6) - return -EAFNOSUPPORT; - -+ err = v6_map_sock_addr(inet, addr, &nsa); -+ if (err) -+ return err; -+ - addr_type = ipv6_addr_type(&addr->sin6_addr); - if ((addr_type & IPV6_ADDR_MULTICAST) && sock->type == SOCK_STREAM) - return -EINVAL; -@@ -308,6 +318,7 @@ int inet6_bind(struct socket *sock, stru - /* Reproduce AF_INET checks to make the bindings consistent */ - v4addr = addr->sin6_addr.s6_addr32[3]; - chk_addr_ret = inet_addr_type(net, v4addr); -+ - if (!sysctl_ip_nonlocal_bind && - !(inet->freebind || inet->transparent) && - v4addr != htonl(INADDR_ANY) && -@@ -317,6 +328,10 @@ int inet6_bind(struct socket *sock, stru - err = -EADDRNOTAVAIL; - goto out; - } -+ if (!v4_addr_in_nx_info(sk->sk_nx_info, v4addr, NXA_MASK_BIND)) { -+ err = -EADDRNOTAVAIL; -+ goto out; -+ } - } else { - if (addr_type != IPV6_ADDR_ANY) { - struct net_device *dev = NULL; -@@ -343,6 +358,11 @@ int inet6_bind(struct socket *sock, stru - } - } - -+ if (!v6_addr_in_nx_info(sk->sk_nx_info, &addr->sin6_addr, -1)) { -+ err = -EADDRNOTAVAIL; -+ goto out_unlock; -+ } ++ case VCMD_get_version: ++ return vc_get_version(id); ++ case VCMD_get_vci: ++ return vc_get_vci(id); + - /* ipv4 addr of the socket is invalid. Only the - * unspecified and mapped address have a v4 equivalent. - */ -@@ -359,6 +379,9 @@ int inet6_bind(struct socket *sock, stru - } - } - -+ /* what's that for? */ -+ v6_set_sock_addr(inet, &nsa); ++ case VCMD_task_xid: ++ return vc_task_xid(id); ++ case VCMD_vx_info: ++ return vc_vx_info(vxi, data); + - inet->inet_rcv_saddr = v4addr; - inet->inet_saddr = v4addr; - -@@ -460,9 +483,11 @@ int inet6_getname(struct socket *sock, s - return -ENOTCONN; - sin->sin6_port = inet->inet_dport; - sin->sin6_addr = np->daddr; -+ /* FIXME: remap lback? */ - if (np->sndflow) - sin->sin6_flowinfo = np->flow_label; - } else { -+ /* FIXME: remap lback? */ - if (ipv6_addr_any(&np->rcv_saddr)) - sin->sin6_addr = np->saddr; - else -diff -NurpP --minimal linux-3.7/net/ipv6/datagram.c linux-3.7-vs2.3.5.1/net/ipv6/datagram.c ---- linux-3.7/net/ipv6/datagram.c 2012-07-22 21:39:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv6/datagram.c 2012-12-11 15:56:33.000000000 +0000 -@@ -645,7 +645,7 @@ int datagram_send_ctl(struct net *net, s - - rcu_read_lock(); - if (fl6->flowi6_oif) { -- dev = dev_get_by_index_rcu(net, fl6->flowi6_oif); -+ dev = dev_get_by_index_real_rcu(net, fl6->flowi6_oif); - if (!dev) { - rcu_read_unlock(); - return -ENODEV; -diff -NurpP --minimal linux-3.7/net/ipv6/fib6_rules.c linux-3.7-vs2.3.5.1/net/ipv6/fib6_rules.c ---- linux-3.7/net/ipv6/fib6_rules.c 2012-12-11 15:47:54.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv6/fib6_rules.c 2012-12-11 15:56:33.000000000 +0000 -@@ -90,7 +90,7 @@ static int fib6_rule_action(struct fib_r - ip6_dst_idev(&rt->dst)->dev, - &flp6->daddr, - rt6_flags2srcprefs(flags), -- &saddr)) -+ &saddr, NULL)) - goto again; - if (!ipv6_prefix_equal(&saddr, &r->src.addr, - r->src.plen)) -diff -NurpP --minimal linux-3.7/net/ipv6/inet6_hashtables.c linux-3.7-vs2.3.5.1/net/ipv6/inet6_hashtables.c ---- linux-3.7/net/ipv6/inet6_hashtables.c 2011-10-24 16:45:34.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv6/inet6_hashtables.c 2012-12-11 15:56:33.000000000 +0000 -@@ -16,6 +16,7 @@ - - #include - #include -+#include - - #include - #include -@@ -83,7 +84,6 @@ struct sock *__inet6_lookup_established( - unsigned int slot = hash & hashinfo->ehash_mask; - struct inet_ehash_bucket *head = &hashinfo->ehash[slot]; - -- - rcu_read_lock(); - begin: - sk_nulls_for_each_rcu(sk, node, &head->chain) { -@@ -95,7 +95,7 @@ begin: - sock_put(sk); - goto begin; - } -- goto out; -+ goto out; - } - } - if (get_nulls_value(node) != slot) -@@ -141,6 +141,9 @@ static inline int compute_score(struct s - if (!ipv6_addr_equal(&np->rcv_saddr, daddr)) - return -1; - score++; -+ } else { -+ if (!v6_addr_in_nx_info(sk->sk_nx_info, daddr, -1)) -+ return -1; - } - if (sk->sk_bound_dev_if) { - if (sk->sk_bound_dev_if != dif) -diff -NurpP --minimal linux-3.7/net/ipv6/ip6_output.c linux-3.7-vs2.3.5.1/net/ipv6/ip6_output.c ---- linux-3.7/net/ipv6/ip6_output.c 2012-12-11 15:47:54.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv6/ip6_output.c 2012-12-11 15:56:33.000000000 +0000 -@@ -964,7 +964,8 @@ static int ip6_dst_lookup_tail(struct so - struct rt6_info *rt = (struct rt6_info *) *dst; - err = ip6_route_get_saddr(net, rt, &fl6->daddr, - sk ? inet6_sk(sk)->srcprefs : 0, -- &fl6->saddr); -+ &fl6->saddr, -+ sk ? sk->sk_nx_info : NULL); - if (err) - goto out_err_release; - } -diff -NurpP --minimal linux-3.7/net/ipv6/ndisc.c linux-3.7-vs2.3.5.1/net/ipv6/ndisc.c ---- linux-3.7/net/ipv6/ndisc.c 2012-12-11 15:47:54.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv6/ndisc.c 2012-12-11 15:56:33.000000000 +0000 -@@ -517,7 +517,7 @@ static void ndisc_send_na(struct net_dev - } else { - if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr, - inet6_sk(dev_net(dev)->ipv6.ndisc_sk)->srcprefs, -- &tmpaddr)) -+ &tmpaddr, NULL)) - return; - src_addr = &tmpaddr; - } -diff -NurpP --minimal linux-3.7/net/ipv6/raw.c linux-3.7-vs2.3.5.1/net/ipv6/raw.c ---- linux-3.7/net/ipv6/raw.c 2012-12-11 15:47:54.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv6/raw.c 2012-12-11 15:56:33.000000000 +0000 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -284,6 +285,13 @@ static int rawv6_bind(struct sock *sk, s - goto out_unlock; - } - -+ if (!v6_addr_in_nx_info(sk->sk_nx_info, &addr->sin6_addr, -1)) { -+ err = -EADDRNOTAVAIL; -+ if (dev) -+ dev_put(dev); -+ goto out; -+ } ++ case VCMD_task_nid: ++ return vc_task_nid(id); ++ case VCMD_nx_info: ++ return vc_nx_info(nxi, data); + - /* ipv4 addr of the socket is invalid. Only the - * unspecified and mapped address have a v4 equivalent. - */ -diff -NurpP --minimal linux-3.7/net/ipv6/route.c linux-3.7-vs2.3.5.1/net/ipv6/route.c ---- linux-3.7/net/ipv6/route.c 2012-12-11 15:47:55.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv6/route.c 2012-12-11 15:56:33.000000000 +0000 -@@ -57,6 +57,7 @@ - #include - #include - #include -+#include - - #include - -@@ -2116,15 +2117,17 @@ int ip6_route_get_saddr(struct net *net, - struct rt6_info *rt, - const struct in6_addr *daddr, - unsigned int prefs, -- struct in6_addr *saddr) -+ struct in6_addr *saddr, -+ struct nx_info *nxi) - { - struct inet6_dev *idev = ip6_dst_idev((struct dst_entry*)rt); - int err = 0; -- if (rt->rt6i_prefsrc.plen) -+ if (rt->rt6i_prefsrc.plen && (!nxi || -+ v6_addr_in_nx_info(nxi, &rt->rt6i_prefsrc.addr, NXA_TYPE_ADDR))) - *saddr = rt->rt6i_prefsrc.addr; - else - err = ipv6_dev_get_saddr(net, idev ? idev->dev : NULL, -- daddr, prefs, saddr); -+ daddr, prefs, saddr, nxi); - return err; - } - -@@ -2478,7 +2481,8 @@ static int rt6_fill_node(struct net *net - goto nla_put_failure; - } else if (dst) { - struct in6_addr saddr_buf; -- if (ip6_route_get_saddr(net, rt, dst, 0, &saddr_buf) == 0 && -+ if (ip6_route_get_saddr(net, rt, dst, 0, &saddr_buf, -+ (skb->sk ? skb->sk->sk_nx_info : NULL)) == 0 && - nla_put(skb, RTA_PREFSRC, 16, &saddr_buf)) - goto nla_put_failure; - } -@@ -2692,6 +2696,7 @@ static int rt6_info_route(struct rt6_inf - struct seq_file *m = p_arg; - struct neighbour *n; - -+ /* FIXME: check for network context? */ - seq_printf(m, "%pi6 %02x ", &rt->rt6i_dst.addr, rt->rt6i_dst.plen); - - #ifdef CONFIG_IPV6_SUBTREES -diff -NurpP --minimal linux-3.7/net/ipv6/tcp_ipv6.c linux-3.7-vs2.3.5.1/net/ipv6/tcp_ipv6.c ---- linux-3.7/net/ipv6/tcp_ipv6.c 2012-12-11 15:47:55.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv6/tcp_ipv6.c 2012-12-11 15:56:33.000000000 +0000 -@@ -71,6 +71,7 @@ - - #include - #include -+#include - - static void tcp_v6_send_reset(struct sock *sk, struct sk_buff *skb); - static void tcp_v6_reqsk_send_ack(struct sock *sk, struct sk_buff *skb, -@@ -175,8 +176,15 @@ static int tcp_v6_connect(struct sock *s - * connect() to INADDR_ANY means loopback (BSD'ism). - */ - -- if(ipv6_addr_any(&usin->sin6_addr)) -- usin->sin6_addr.s6_addr[15] = 0x1; -+ if(ipv6_addr_any(&usin->sin6_addr)) { -+ struct nx_info *nxi = sk->sk_nx_info; ++ case VCMD_task_tag: ++ return vc_task_tag(id); + -+ if (nxi && nx_info_has_v6(nxi)) -+ /* FIXME: remap lback? */ -+ usin->sin6_addr = nxi->v6.ip; -+ else -+ usin->sin6_addr.s6_addr[15] = 0x1; -+ } - - addr_type = ipv6_addr_type(&usin->sin6_addr); - -diff -NurpP --minimal linux-3.7/net/ipv6/udp.c linux-3.7-vs2.3.5.1/net/ipv6/udp.c ---- linux-3.7/net/ipv6/udp.c 2012-12-11 15:47:55.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv6/udp.c 2012-12-11 15:56:33.000000000 +0000 -@@ -45,42 +45,68 @@ - #include - #include - #include -+#include - - #include - #include - #include - #include "udp_impl.h" - --int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2) -+int ipv6_rcv_saddr_equal(const struct sock *sk1, const struct sock *sk2) - { -- const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr; -+ const struct in6_addr *sk1_rcv_saddr6 = &inet6_sk(sk1)->rcv_saddr; - const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2); -- __be32 sk1_rcv_saddr = sk_rcv_saddr(sk); -+ __be32 sk1_rcv_saddr = sk_rcv_saddr(sk1); - __be32 sk2_rcv_saddr = sk_rcv_saddr(sk2); -- int sk_ipv6only = ipv6_only_sock(sk); -+ int sk1_ipv6only = ipv6_only_sock(sk1); - int sk2_ipv6only = inet_v6_ipv6only(sk2); -- int addr_type = ipv6_addr_type(sk_rcv_saddr6); -+ int addr_type = ipv6_addr_type(sk1_rcv_saddr6); - int addr_type2 = sk2_rcv_saddr6 ? ipv6_addr_type(sk2_rcv_saddr6) : IPV6_ADDR_MAPPED; - - /* if both are mapped, treat as IPv4 */ -- if (addr_type == IPV6_ADDR_MAPPED && addr_type2 == IPV6_ADDR_MAPPED) -- return (!sk2_ipv6only && -+ if (addr_type == IPV6_ADDR_MAPPED && addr_type2 == IPV6_ADDR_MAPPED) { -+ if (!sk2_ipv6only && - (!sk1_rcv_saddr || !sk2_rcv_saddr || -- sk1_rcv_saddr == sk2_rcv_saddr)); -+ sk1_rcv_saddr == sk2_rcv_saddr)) -+ goto vs_v4; -+ else -+ return 0; -+ } - - if (addr_type2 == IPV6_ADDR_ANY && - !(sk2_ipv6only && addr_type == IPV6_ADDR_MAPPED)) -- return 1; -+ goto vs; - - if (addr_type == IPV6_ADDR_ANY && -- !(sk_ipv6only && addr_type2 == IPV6_ADDR_MAPPED)) -- return 1; -+ !(sk1_ipv6only && addr_type2 == IPV6_ADDR_MAPPED)) -+ goto vs; - - if (sk2_rcv_saddr6 && -- ipv6_addr_equal(sk_rcv_saddr6, sk2_rcv_saddr6)) -- return 1; -+ ipv6_addr_equal(sk1_rcv_saddr6, sk2_rcv_saddr6)) -+ goto vs; - - return 0; ++ case VCMD_set_space_v1: ++ return vc_set_space_v1(vxi, data); ++ /* this is version 2 */ ++ case VCMD_set_space: ++ return vc_set_space(vxi, data); + -+vs_v4: -+ if (!sk1_rcv_saddr && !sk2_rcv_saddr) -+ return nx_v4_addr_conflict(sk1->sk_nx_info, sk2->sk_nx_info); -+ if (!sk2_rcv_saddr) -+ return v4_addr_in_nx_info(sk1->sk_nx_info, sk2_rcv_saddr, -1); -+ if (!sk1_rcv_saddr) -+ return v4_addr_in_nx_info(sk2->sk_nx_info, sk1_rcv_saddr, -1); -+ return 1; -+vs: -+ if (addr_type2 == IPV6_ADDR_ANY && addr_type == IPV6_ADDR_ANY) -+ return nx_v6_addr_conflict(sk1->sk_nx_info, sk2->sk_nx_info); -+ else if (addr_type2 == IPV6_ADDR_ANY) -+ return v6_addr_in_nx_info(sk2->sk_nx_info, sk1_rcv_saddr6, -1); -+ else if (addr_type == IPV6_ADDR_ANY) { -+ if (addr_type2 == IPV6_ADDR_MAPPED) -+ return nx_v4_addr_conflict(sk1->sk_nx_info, sk2->sk_nx_info); -+ else -+ return v6_addr_in_nx_info(sk1->sk_nx_info, sk2_rcv_saddr6, -1); -+ } -+ return 1; - } - - static unsigned int udp6_portaddr_hash(struct net *net, -@@ -144,6 +170,10 @@ static inline int compute_score(struct s - if (!ipv6_addr_equal(&np->rcv_saddr, daddr)) - return -1; - score++; -+ } else { -+ /* block non nx_info ips */ -+ if (!v6_addr_in_nx_info(sk->sk_nx_info, daddr, -1)) -+ return -1; - } - if (!ipv6_addr_any(&np->daddr)) { - if (!ipv6_addr_equal(&np->daddr, saddr)) -diff -NurpP --minimal linux-3.7/net/ipv6/xfrm6_policy.c linux-3.7-vs2.3.5.1/net/ipv6/xfrm6_policy.c ---- linux-3.7/net/ipv6/xfrm6_policy.c 2012-10-04 13:27:50.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv6/xfrm6_policy.c 2012-12-11 15:56:33.000000000 +0000 -@@ -63,7 +63,7 @@ static int xfrm6_get_saddr(struct net *n - dev = ip6_dst_idev(dst)->dev; - ipv6_dev_get_saddr(dev_net(dev), dev, - (struct in6_addr *)&daddr->a6, 0, -- (struct in6_addr *)&saddr->a6); -+ (struct in6_addr *)&saddr->a6, NULL); - dst_release(dst); - return 0; - } -diff -NurpP --minimal linux-3.7/net/netfilter/ipvs/ip_vs_xmit.c linux-3.7-vs2.3.5.1/net/netfilter/ipvs/ip_vs_xmit.c ---- linux-3.7/net/netfilter/ipvs/ip_vs_xmit.c 2012-12-11 15:47:55.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/netfilter/ipvs/ip_vs_xmit.c 2012-12-11 15:56:33.000000000 +0000 -@@ -273,7 +273,7 @@ __ip_vs_route_output_v6(struct net *net, - return dst; - if (ipv6_addr_any(&fl6.saddr) && - ipv6_dev_get_saddr(net, ip6_dst_idev(dst)->dev, -- &fl6.daddr, 0, &fl6.saddr) < 0) -+ &fl6.daddr, 0, &fl6.saddr, NULL) < 0) - goto out_err; - if (do_xfrm) { - dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), NULL, 0); -diff -NurpP --minimal linux-3.7/net/netlink/af_netlink.c linux-3.7-vs2.3.5.1/net/netlink/af_netlink.c ---- linux-3.7/net/netlink/af_netlink.c 2012-12-11 15:47:56.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/netlink/af_netlink.c 2012-12-11 15:56:33.000000000 +0000 -@@ -55,6 +55,9 @@ - #include - #include - #include -+#include -+#include -+#include - - #include - #include -@@ -1981,6 +1984,8 @@ static struct sock *netlink_seq_socket_i - sk_for_each(s, node, &hash->table[j]) { - if (sock_net(s) != seq_file_net(seq)) - continue; -+ if (!nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT)) -+ continue; - if (off == pos) { - iter->link = i; - iter->hash_idx = j; -@@ -2015,7 +2020,8 @@ static void *netlink_seq_next(struct seq - s = v; - do { - s = sk_next(s); -- } while (s && sock_net(s) != seq_file_net(seq)); -+ } while (s && (sock_net(s) != seq_file_net(seq) || -+ !nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT))); - if (s) - return s; - -@@ -2027,7 +2033,8 @@ static void *netlink_seq_next(struct seq - - for (; j <= hash->mask; j++) { - s = sk_head(&hash->table[j]); -- while (s && sock_net(s) != seq_file_net(seq)) -+ while (s && (sock_net(s) != seq_file_net(seq) || -+ !nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT))) - s = sk_next(s); - if (s) { - iter->link = i; -diff -NurpP --minimal linux-3.7/net/socket.c linux-3.7-vs2.3.5.1/net/socket.c ---- linux-3.7/net/socket.c 2012-12-11 15:47:57.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/socket.c 2012-12-11 15:56:33.000000000 +0000 -@@ -99,6 +99,10 @@ - - #include - #include -+#include -+#include -+#include -+#include - - #include - #include -@@ -619,6 +623,7 @@ static inline int __sock_sendmsg_nosec(s - struct msghdr *msg, size_t size) - { - struct sock_iocb *si = kiocb_to_siocb(iocb); -+ size_t len; - - sock_update_classid(sock->sk); - -@@ -627,7 +632,22 @@ static inline int __sock_sendmsg_nosec(s - si->msg = msg; - si->size = size; - -- return sock->ops->sendmsg(iocb, sock, msg, size); -+ len = sock->ops->sendmsg(iocb, sock, msg, size); -+ if (sock->sk) { -+ if (len == size) -+ vx_sock_send(sock->sk, size); -+ else -+ vx_sock_fail(sock->sk, size); -+ } -+ vxdprintk(VXD_CBIT(net, 7), -+ "__sock_sendmsg: %p[%p,%p,%p;%d/%d]:%d/%zu", -+ sock, sock->sk, -+ (sock->sk)?sock->sk->sk_nx_info:0, -+ (sock->sk)?sock->sk->sk_vx_info:0, -+ (sock->sk)?sock->sk->sk_xid:0, -+ (sock->sk)?sock->sk->sk_nid:0, -+ (unsigned int)size, len); -+ return len; - } - - static inline int __sock_sendmsg(struct kiocb *iocb, struct socket *sock, -@@ -783,6 +803,7 @@ static inline int __sock_recvmsg_nosec(s - struct msghdr *msg, size_t size, int flags) - { - struct sock_iocb *si = kiocb_to_siocb(iocb); -+ int len; - - sock_update_classid(sock->sk); - -@@ -792,7 +813,18 @@ static inline int __sock_recvmsg_nosec(s - si->size = size; - si->flags = flags; - -- return sock->ops->recvmsg(iocb, sock, msg, size, flags); -+ len = sock->ops->recvmsg(iocb, sock, msg, size, flags); -+ if ((len >= 0) && sock->sk) -+ vx_sock_recv(sock->sk, len); -+ vxdprintk(VXD_CBIT(net, 7), -+ "__sock_recvmsg: %p[%p,%p,%p;%d/%d]:%d/%d", -+ sock, sock->sk, -+ (sock->sk)?sock->sk->sk_nx_info:0, -+ (sock->sk)?sock->sk->sk_vx_info:0, -+ (sock->sk)?sock->sk->sk_xid:0, -+ (sock->sk)?sock->sk->sk_nid:0, -+ (unsigned int)size, len); -+ return len; - } - - static inline int __sock_recvmsg(struct kiocb *iocb, struct socket *sock, -@@ -1277,6 +1309,13 @@ int __sock_create(struct net *net, int f - if (type < 0 || type >= SOCK_MAX) - return -EINVAL; - -+ if (!nx_check(0, VS_ADMIN)) { -+ if (family == PF_INET && !current_nx_info_has_v4()) -+ return -EAFNOSUPPORT; -+ if (family == PF_INET6 && !current_nx_info_has_v6()) -+ return -EAFNOSUPPORT; -+ } -+ - /* Compatibility. - - This uglymoron is moved from INET layer to here to avoid -@@ -1411,6 +1450,7 @@ SYSCALL_DEFINE3(socket, int, family, int - if (retval < 0) - goto out; - -+ set_bit(SOCK_USER_SOCKET, &sock->flags); - retval = sock_map_fd(sock, flags & (O_CLOEXEC | O_NONBLOCK)); - if (retval < 0) - goto out_release; -@@ -1452,10 +1492,12 @@ SYSCALL_DEFINE4(socketpair, int, family, - err = sock_create(family, type, protocol, &sock1); - if (err < 0) - goto out; -+ set_bit(SOCK_USER_SOCKET, &sock1->flags); - - err = sock_create(family, type, protocol, &sock2); - if (err < 0) - goto out_release_1; -+ set_bit(SOCK_USER_SOCKET, &sock2->flags); - - err = sock1->ops->socketpair(sock1, sock2); - if (err < 0) -diff -NurpP --minimal linux-3.7/net/sunrpc/auth.c linux-3.7-vs2.3.5.1/net/sunrpc/auth.c ---- linux-3.7/net/sunrpc/auth.c 2012-10-04 13:27:51.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/sunrpc/auth.c 2012-12-11 15:56:33.000000000 +0000 -@@ -15,6 +15,7 @@ - #include - #include - #include -+#include - - #ifdef RPC_DEBUG - # define RPCDBG_FACILITY RPCDBG_AUTH -@@ -481,6 +482,7 @@ rpcauth_lookupcred(struct rpc_auth *auth - memset(&acred, 0, sizeof(acred)); - acred.uid = cred->fsuid; - acred.gid = cred->fsgid; -+ acred.tag = dx_current_tag(); - acred.group_info = get_group_info(((struct cred *)cred)->group_info); - - ret = auth->au_ops->lookup_cred(auth, &acred, flags); -@@ -521,6 +523,7 @@ rpcauth_bind_root_cred(struct rpc_task * - struct auth_cred acred = { - .uid = 0, - .gid = 0, -+ .tag = dx_current_tag(), - }; - - dprintk("RPC: %5u looking up %s cred\n", -diff -NurpP --minimal linux-3.7/net/sunrpc/auth_unix.c linux-3.7-vs2.3.5.1/net/sunrpc/auth_unix.c ---- linux-3.7/net/sunrpc/auth_unix.c 2012-07-22 21:39:49.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/sunrpc/auth_unix.c 2012-12-11 15:56:33.000000000 +0000 -@@ -13,11 +13,13 @@ - #include - #include - #include -+#include - - #define NFS_NGROUPS 16 - - struct unx_cred { - struct rpc_cred uc_base; -+ tag_t uc_tag; - gid_t uc_gid; - gid_t uc_gids[NFS_NGROUPS]; - }; -@@ -79,6 +81,7 @@ unx_create_cred(struct rpc_auth *auth, s - groups = NFS_NGROUPS; - - cred->uc_gid = acred->gid; -+ cred->uc_tag = acred->tag; - for (i = 0; i < groups; i++) { - gid_t gid; - gid = from_kgid(&init_user_ns, GROUP_AT(acred->group_info, i)); -@@ -123,7 +126,9 @@ unx_match(struct auth_cred *acred, struc - unsigned int i; - - -- if (cred->uc_uid != acred->uid || cred->uc_gid != acred->gid) -+ if (cred->uc_uid != acred->uid || -+ cred->uc_gid != acred->gid || -+ cred->uc_tag != acred->tag) - return 0; - - if (acred->group_info != NULL) -@@ -152,7 +157,7 @@ unx_marshal(struct rpc_task *task, __be3 - struct rpc_clnt *clnt = task->tk_client; - struct unx_cred *cred = container_of(task->tk_rqstp->rq_cred, struct unx_cred, uc_base); - __be32 *base, *hold; -- int i; -+ int i, tag; - - *p++ = htonl(RPC_AUTH_UNIX); - base = p++; -@@ -162,9 +167,12 @@ unx_marshal(struct rpc_task *task, __be3 - * Copy the UTS nodename captured when the client was created. - */ - p = xdr_encode_array(p, clnt->cl_nodename, clnt->cl_nodelen); -+ tag = task->tk_client->cl_tag; - -- *p++ = htonl((u32) cred->uc_uid); -- *p++ = htonl((u32) cred->uc_gid); -+ *p++ = htonl((u32) TAGINO_UID(tag, -+ cred->uc_uid, cred->uc_tag)); -+ *p++ = htonl((u32) TAGINO_GID(tag, -+ cred->uc_gid, cred->uc_tag)); - hold = p++; - for (i = 0; i < 16 && cred->uc_gids[i] != (gid_t) NOGROUP; i++) - *p++ = htonl((u32) cred->uc_gids[i]); -diff -NurpP --minimal linux-3.7/net/sunrpc/clnt.c linux-3.7-vs2.3.5.1/net/sunrpc/clnt.c ---- linux-3.7/net/sunrpc/clnt.c 2012-12-11 15:47:57.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/sunrpc/clnt.c 2012-12-11 15:56:33.000000000 +0000 -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -481,6 +482,9 @@ struct rpc_clnt *rpc_create(struct rpc_c - if (!(args->flags & RPC_CLNT_CREATE_QUIET)) - clnt->cl_chatty = 1; - -+ /* TODO: handle RPC_CLNT_CREATE_TAGGED -+ if (args->flags & RPC_CLNT_CREATE_TAGGED) -+ clnt->cl_tag = 1; */ - return clnt; - } - EXPORT_SYMBOL_GPL(rpc_create); -diff -NurpP --minimal linux-3.7/net/unix/af_unix.c linux-3.7-vs2.3.5.1/net/unix/af_unix.c ---- linux-3.7/net/unix/af_unix.c 2012-12-11 15:47:57.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/unix/af_unix.c 2012-12-11 15:56:33.000000000 +0000 -@@ -114,6 +114,8 @@ - #include - #include - #include -+#include -+#include - - struct hlist_head unix_socket_table[2 * UNIX_HASH_SIZE]; - EXPORT_SYMBOL_GPL(unix_socket_table); -@@ -271,6 +273,8 @@ static struct sock *__unix_find_socket_b - if (!net_eq(sock_net(s), net)) - continue; - -+ if (!nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT)) -+ continue; - if (u->addr->len == len && - !memcmp(u->addr->name, sunname, len)) - goto found; -@@ -2259,6 +2263,8 @@ static struct sock *unix_from_bucket(str - for (sk = sk_head(&unix_socket_table[bucket]); sk; sk = sk_next(sk)) { - if (sock_net(sk) != seq_file_net(seq)) - continue; -+ if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)) -+ continue; - if (++count == offset) - break; - } -@@ -2276,6 +2282,8 @@ static struct sock *unix_next_socket(str - sk = sk_next(sk); - if (!sk) - goto next_bucket; -+ if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)) -+ continue; - if (sock_net(sk) == seq_file_net(seq)) - return sk; - } -diff -NurpP --minimal linux-3.7/scripts/checksyscalls.sh linux-3.7-vs2.3.5.1/scripts/checksyscalls.sh ---- linux-3.7/scripts/checksyscalls.sh 2012-10-04 13:27:51.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/scripts/checksyscalls.sh 2012-12-11 15:56:33.000000000 +0000 -@@ -193,7 +193,6 @@ cat << EOF - #define __IGNORE_afs_syscall - #define __IGNORE_getpmsg - #define __IGNORE_putpmsg --#define __IGNORE_vserver - EOF - } - -diff -NurpP --minimal linux-3.7/security/commoncap.c linux-3.7-vs2.3.5.1/security/commoncap.c ---- linux-3.7/security/commoncap.c 2012-07-22 21:39:51.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/security/commoncap.c 2012-12-11 15:56:33.000000000 +0000 -@@ -76,14 +76,20 @@ int cap_netlink_send(struct sock *sk, st - int cap_capable(const struct cred *cred, struct user_namespace *targ_ns, - int cap, int audit) - { -+ struct vx_info *vxi = current_vx_info(); /* FIXME: get vxi from cred? */ -+ - for (;;) { - /* The owner of the user namespace has all caps. */ - if (targ_ns != &init_user_ns && uid_eq(targ_ns->owner, cred->euid)) - return 0; - - /* Do we have the necessary capabilities? */ -- if (targ_ns == cred->user_ns) -- return cap_raised(cred->cap_effective, cap) ? 0 : -EPERM; -+ if (targ_ns == cred->user_ns) { -+ if (vx_info_flags(vxi, VXF_STATE_SETUP, 0) && -+ cap_raised(cred->cap_effective, cap)) -+ return 0; -+ return vx_cap_raised(vxi, cred->cap_effective, cap) ? 0 : -EPERM; -+ } - - /* Have we tried all of the parent namespaces? */ - if (targ_ns == &init_user_ns) -@@ -619,7 +625,7 @@ int cap_inode_setxattr(struct dentry *de - - if (!strncmp(name, XATTR_SECURITY_PREFIX, - sizeof(XATTR_SECURITY_PREFIX) - 1) && -- !capable(CAP_SYS_ADMIN)) -+ !vx_capable(CAP_SYS_ADMIN, VXC_FS_SECURITY)) - return -EPERM; - return 0; - } -@@ -645,7 +651,7 @@ int cap_inode_removexattr(struct dentry - - if (!strncmp(name, XATTR_SECURITY_PREFIX, - sizeof(XATTR_SECURITY_PREFIX) - 1) && -- !capable(CAP_SYS_ADMIN)) -+ !vx_capable(CAP_SYS_ADMIN, VXC_FS_SECURITY)) - return -EPERM; - return 0; - } -diff -NurpP --minimal linux-3.7/security/selinux/hooks.c linux-3.7-vs2.3.5.1/security/selinux/hooks.c ---- linux-3.7/security/selinux/hooks.c 2012-12-11 15:48:01.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/security/selinux/hooks.c 2012-12-11 15:56:33.000000000 +0000 -@@ -66,7 +66,6 @@ - #include - #include - #include /* for Unix socket types */ --#include /* for Unix socket types */ - #include - #include - #include -diff -NurpP linux-3.7-vs2.3.5.1/kernel/vserver/network.c linux-3.7-vs2.3.5.1.1/kernel/vserver/network.c ---- linux-3.7-vs2.3.5.1/kernel/vserver/network.c 2012-12-11 15:56:33.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.1/kernel/vserver/network.c 2012-12-13 13:48:35.000000000 +0000 -@@ -162,6 +163,9 @@ static void __dealloc_nx_info(struct nx_ - BUG_ON(atomic_read(&nxi->nx_tasks)); - - __dealloc_nx_addr_v4_all(nxi->v4.next); -+#ifdef CONFIG_IPV6 -+ __dealloc_nx_addr_v6_all(nxi->v6.next); -+#endif - - nxi->nx_state |= NXS_RELEASED; - kfree(nxi); -diff -NurpP --minimal linux-3.7-vs2.3.5.1.2/net/ipv6/netfilter/ip6t_MASQUERADE.c linux-3.7-vs2.3.5.1.3/net/ipv6/netfilter/ip6t_MASQUERADE.c ---- linux-3.7-vs2.3.5.1.2/net/ipv6/netfilter/ip6t_MASQUERADE.c 2012-12-11 15:47:54.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3/net/ipv6/netfilter/ip6t_MASQUERADE.c 2012-12-13 20:26:20.000000000 +0000 -@@ -34,7 +34,7 @@ masquerade_tg6(struct sk_buff *skb, cons - ctinfo == IP_CT_RELATED_REPLY)); - - if (ipv6_dev_get_saddr(dev_net(par->out), par->out, -- &ipv6_hdr(skb)->daddr, 0, &src) < 0) -+ &ipv6_hdr(skb)->daddr, 0, &src, NULL) < 0) - return NF_DROP; - - nfct_nat(ct)->masq_index = par->out->ifindex; -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/linux/Kbuild linux-3.7-vs2.3.5.1.3-uapi/include/linux/Kbuild ---- linux-3.7-vs2.3.5.1.3/include/linux/Kbuild 2012-12-11 16:09:38.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/linux/Kbuild 2012-12-13 22:09:10.000000000 +0000 -@@ -3,4 +3,3 @@ header-y += hdlc/ - header-y += hsi/ - header-y += raid/ - header-y += usb/ --header-y += vserver/ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/linux/vserver/Kbuild linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/Kbuild ---- linux-3.7-vs2.3.5.1.3/include/linux/vserver/Kbuild 2012-12-11 15:56:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000 -@@ -1,8 +0,0 @@ -- --header-y += context_cmd.h network_cmd.h space_cmd.h \ -- cacct_cmd.h cvirt_cmd.h limit_cmd.h dlimit_cmd.h \ -- inode_cmd.h tag_cmd.h sched_cmd.h signal_cmd.h \ -- debug_cmd.h device_cmd.h -- --header-y += switch.h network.h monitor.h inode.h device.h -- -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/linux/vserver/base.h linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/base.h ---- linux-3.7-vs2.3.5.1.3/include/linux/vserver/base.h 2012-12-11 15:56:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/base.h 2012-12-13 22:29:23.000000000 +0000 -@@ -1,5 +1,5 @@ --#ifndef _VX_BASE_H --#define _VX_BASE_H -+#ifndef _VSERVER_BASE_H -+#define _VSERVER_BASE_H - - - /* context state changes */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/linux/vserver/cacct.h linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/cacct.h ---- linux-3.7-vs2.3.5.1.3/include/linux/vserver/cacct.h 2012-12-11 15:56:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/cacct.h 2012-12-13 22:29:23.000000000 +0000 -@@ -1,5 +1,5 @@ --#ifndef _VX_CACCT_H --#define _VX_CACCT_H -+#ifndef _VSERVER_CACCT_H -+#define _VSERVER_CACCT_H - - - enum sock_acc_field { -@@ -12,4 +12,4 @@ enum sock_acc_field { - VXA_SOCK_SIZE /* array size */ - }; - --#endif /* _VX_CACCT_H */ -+#endif /* _VSERVER_CACCT_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/linux/vserver/cacct_cmd.h linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/cacct_cmd.h ---- linux-3.7-vs2.3.5.1.3/include/linux/vserver/cacct_cmd.h 2012-12-11 15:56:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/cacct_cmd.h 2012-12-13 22:29:23.000000000 +0000 -@@ -1,23 +1,10 @@ --#ifndef _VX_CACCT_CMD_H --#define _VX_CACCT_CMD_H -- -- --/* virtual host info name commands */ -- --#define VCMD_sock_stat VC_CMD(VSTAT, 5, 0) -- --struct vcmd_sock_stat_v0 { -- uint32_t field; -- uint32_t count[3]; -- uint64_t total[3]; --}; -- -+#ifndef _VSERVER_CACCT_CMD_H -+#define _VSERVER_CACCT_CMD_H - --#ifdef __KERNEL__ - - #include -+#include - - extern int vc_sock_stat(struct vx_info *, void __user *); - --#endif /* __KERNEL__ */ --#endif /* _VX_CACCT_CMD_H */ -+#endif /* _VSERVER_CACCT_CMD_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/linux/vserver/cacct_def.h linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/cacct_def.h ---- linux-3.7-vs2.3.5.1.3/include/linux/vserver/cacct_def.h 2012-12-11 15:56:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/cacct_def.h 2012-12-13 22:29:23.000000000 +0000 -@@ -1,5 +1,5 @@ --#ifndef _VX_CACCT_DEF_H --#define _VX_CACCT_DEF_H -+#ifndef _VSERVER_CACCT_DEF_H -+#define _VSERVER_CACCT_DEF_H - - #include - #include -@@ -40,4 +40,4 @@ static inline void __dump_vx_cacct(struc - - #endif - --#endif /* _VX_CACCT_DEF_H */ -+#endif /* _VSERVER_CACCT_DEF_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/linux/vserver/cacct_int.h linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/cacct_int.h ---- linux-3.7-vs2.3.5.1.3/include/linux/vserver/cacct_int.h 2012-12-11 15:56:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/cacct_int.h 2012-12-13 22:29:23.000000000 +0000 -@@ -1,8 +1,5 @@ --#ifndef _VX_CACCT_INT_H --#define _VX_CACCT_INT_H -- -- --#ifdef __KERNEL__ -+#ifndef _VSERVER_CACCT_INT_H -+#define _VSERVER_CACCT_INT_H - - static inline - unsigned long vx_sock_count(struct _vx_cacct *cacct, int type, int pos) -@@ -17,5 +14,4 @@ unsigned long vx_sock_total(struct _vx_c - return atomic_long_read(&cacct->sock[type][pos].total); - } - --#endif /* __KERNEL__ */ --#endif /* _VX_CACCT_INT_H */ -+#endif /* _VSERVER_CACCT_INT_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/linux/vserver/check.h linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/check.h ---- linux-3.7-vs2.3.5.1.3/include/linux/vserver/check.h 2012-12-11 15:56:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/check.h 2012-12-13 22:29:23.000000000 +0000 -@@ -1,5 +1,5 @@ --#ifndef _VS_CHECK_H --#define _VS_CHECK_H -+#ifndef _VSERVER_CHECK_H -+#define _VSERVER_CHECK_H - - - #define MAX_S_CONTEXT 65535 /* Arbitrary limit */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/linux/vserver/context.h linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/context.h ---- linux-3.7-vs2.3.5.1.3/include/linux/vserver/context.h 2012-12-11 15:56:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/context.h 2012-12-13 22:29:23.000000000 +0000 -@@ -1,88 +1,11 @@ --#ifndef _VX_CONTEXT_H --#define _VX_CONTEXT_H -- --#include --#include -- -- --/* context flags */ -- --#define VXF_INFO_SCHED 0x00000002 --#define VXF_INFO_NPROC 0x00000004 --#define VXF_INFO_PRIVATE 0x00000008 -- --#define VXF_INFO_INIT 0x00000010 --#define VXF_INFO_HIDE 0x00000020 --#define VXF_INFO_ULIMIT 0x00000040 --#define VXF_INFO_NSPACE 0x00000080 -- --#define VXF_SCHED_HARD 0x00000100 --#define VXF_SCHED_PRIO 0x00000200 --#define VXF_SCHED_PAUSE 0x00000400 -- --#define VXF_VIRT_MEM 0x00010000 --#define VXF_VIRT_UPTIME 0x00020000 --#define VXF_VIRT_CPU 0x00040000 --#define VXF_VIRT_LOAD 0x00080000 --#define VXF_VIRT_TIME 0x00100000 -- --#define VXF_HIDE_MOUNT 0x01000000 --/* was VXF_HIDE_NETIF 0x02000000 */ --#define VXF_HIDE_VINFO 0x04000000 -- --#define VXF_STATE_SETUP (1ULL << 32) --#define VXF_STATE_INIT (1ULL << 33) --#define VXF_STATE_ADMIN (1ULL << 34) -- --#define VXF_SC_HELPER (1ULL << 36) --#define VXF_REBOOT_KILL (1ULL << 37) --#define VXF_PERSISTENT (1ULL << 38) -- --#define VXF_FORK_RSS (1ULL << 48) --#define VXF_PROLIFIC (1ULL << 49) -- --#define VXF_IGNEG_NICE (1ULL << 52) -- --#define VXF_ONE_TIME (0x0007ULL << 32) -- --#define VXF_INIT_SET (VXF_STATE_SETUP | VXF_STATE_INIT | VXF_STATE_ADMIN) -- -- --/* context migration */ -- --#define VXM_SET_INIT 0x00000001 --#define VXM_SET_REAPER 0x00000002 -- --/* context caps */ -- --#define VXC_SET_UTSNAME 0x00000001 --#define VXC_SET_RLIMIT 0x00000002 --#define VXC_FS_SECURITY 0x00000004 --#define VXC_FS_TRUSTED 0x00000008 --#define VXC_TIOCSTI 0x00000010 -- --/* was VXC_RAW_ICMP 0x00000100 */ --#define VXC_SYSLOG 0x00001000 --#define VXC_OOM_ADJUST 0x00002000 --#define VXC_AUDIT_CONTROL 0x00004000 -- --#define VXC_SECURE_MOUNT 0x00010000 --#define VXC_SECURE_REMOUNT 0x00020000 --#define VXC_BINARY_MOUNT 0x00040000 -- --#define VXC_QUOTA_CTL 0x00100000 --#define VXC_ADMIN_MAPPER 0x00200000 --#define VXC_ADMIN_CLOOP 0x00400000 -- --#define VXC_KTHREAD 0x01000000 --#define VXC_NAMESPACE 0x02000000 -- -+#ifndef _VSERVER_CONTEXT_H -+#define _VSERVER_CONTEXT_H - --#ifdef __KERNEL__ - - #include - #include - #include -+#include - - #include "limit_def.h" - #include "sched_def.h" -@@ -184,5 +107,4 @@ extern int vx_migrate_task(struct task_s - extern long vs_state_change(struct vx_info *, unsigned int); - - --#endif /* __KERNEL__ */ --#endif /* _VX_CONTEXT_H */ -+#endif /* _VSERVER_CONTEXT_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/linux/vserver/context_cmd.h linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/context_cmd.h ---- linux-3.7-vs2.3.5.1.3/include/linux/vserver/context_cmd.h 2012-12-11 15:56:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/context_cmd.h 2012-12-13 22:29:23.000000000 +0000 -@@ -1,162 +1,33 @@ --#ifndef _VX_CONTEXT_CMD_H --#define _VX_CONTEXT_CMD_H -- -- --/* vinfo commands */ -+#ifndef _VSERVER_CONTEXT_CMD_H -+#define _VSERVER_CONTEXT_CMD_H - --#define VCMD_task_xid VC_CMD(VINFO, 1, 0) -+#include - --#ifdef __KERNEL__ - extern int vc_task_xid(uint32_t); - --#endif /* __KERNEL__ */ -- --#define VCMD_vx_info VC_CMD(VINFO, 5, 0) -- --struct vcmd_vx_info_v0 { -- uint32_t xid; -- uint32_t initpid; -- /* more to come */ --}; -- --#ifdef __KERNEL__ - extern int vc_vx_info(struct vx_info *, void __user *); - --#endif /* __KERNEL__ */ -- --#define VCMD_ctx_stat VC_CMD(VSTAT, 0, 0) -- --struct vcmd_ctx_stat_v0 { -- uint32_t usecnt; -- uint32_t tasks; -- /* more to come */ --}; -- --#ifdef __KERNEL__ - extern int vc_ctx_stat(struct vx_info *, void __user *); - --#endif /* __KERNEL__ */ -- --/* context commands */ -- --#define VCMD_ctx_create_v0 VC_CMD(VPROC, 1, 0) --#define VCMD_ctx_create VC_CMD(VPROC, 1, 1) -- --struct vcmd_ctx_create { -- uint64_t flagword; --}; -- --#define VCMD_ctx_migrate_v0 VC_CMD(PROCMIG, 1, 0) --#define VCMD_ctx_migrate VC_CMD(PROCMIG, 1, 1) -- --struct vcmd_ctx_migrate { -- uint64_t flagword; --}; -- --#ifdef __KERNEL__ - extern int vc_ctx_create(uint32_t, void __user *); - extern int vc_ctx_migrate(struct vx_info *, void __user *); - --#endif /* __KERNEL__ */ -- -- --/* flag commands */ -- --#define VCMD_get_cflags VC_CMD(FLAGS, 1, 0) --#define VCMD_set_cflags VC_CMD(FLAGS, 2, 0) -- --struct vcmd_ctx_flags_v0 { -- uint64_t flagword; -- uint64_t mask; --}; -- --#ifdef __KERNEL__ - extern int vc_get_cflags(struct vx_info *, void __user *); - extern int vc_set_cflags(struct vx_info *, void __user *); - --#endif /* __KERNEL__ */ -- -- --/* context caps commands */ -- --#define VCMD_get_ccaps VC_CMD(FLAGS, 3, 1) --#define VCMD_set_ccaps VC_CMD(FLAGS, 4, 1) -- --struct vcmd_ctx_caps_v1 { -- uint64_t ccaps; -- uint64_t cmask; --}; -- --#ifdef __KERNEL__ - extern int vc_get_ccaps(struct vx_info *, void __user *); - extern int vc_set_ccaps(struct vx_info *, void __user *); - --#endif /* __KERNEL__ */ -- -- --/* bcaps commands */ -- --#define VCMD_get_bcaps VC_CMD(FLAGS, 9, 0) --#define VCMD_set_bcaps VC_CMD(FLAGS, 10, 0) -- --struct vcmd_bcaps { -- uint64_t bcaps; -- uint64_t bmask; --}; -- --#ifdef __KERNEL__ - extern int vc_get_bcaps(struct vx_info *, void __user *); - extern int vc_set_bcaps(struct vx_info *, void __user *); - --#endif /* __KERNEL__ */ -- -- --/* umask commands */ -- --#define VCMD_get_umask VC_CMD(FLAGS, 13, 0) --#define VCMD_set_umask VC_CMD(FLAGS, 14, 0) -- --struct vcmd_umask { -- uint64_t umask; -- uint64_t mask; --}; -- --#ifdef __KERNEL__ - extern int vc_get_umask(struct vx_info *, void __user *); - extern int vc_set_umask(struct vx_info *, void __user *); - --#endif /* __KERNEL__ */ -- -- --/* wmask commands */ -- --#define VCMD_get_wmask VC_CMD(FLAGS, 15, 0) --#define VCMD_set_wmask VC_CMD(FLAGS, 16, 0) -- --struct vcmd_wmask { -- uint64_t wmask; -- uint64_t mask; --}; -- --#ifdef __KERNEL__ - extern int vc_get_wmask(struct vx_info *, void __user *); - extern int vc_set_wmask(struct vx_info *, void __user *); - --#endif /* __KERNEL__ */ -- -- --/* OOM badness */ -- --#define VCMD_get_badness VC_CMD(MEMCTRL, 5, 0) --#define VCMD_set_badness VC_CMD(MEMCTRL, 6, 0) -- --struct vcmd_badness_v0 { -- int64_t bias; --}; -- --#ifdef __KERNEL__ - extern int vc_get_badness(struct vx_info *, void __user *); - extern int vc_set_badness(struct vx_info *, void __user *); - --#endif /* __KERNEL__ */ --#endif /* _VX_CONTEXT_CMD_H */ -+#endif /* _VSERVER_CONTEXT_CMD_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/linux/vserver/cvirt.h linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/cvirt.h ---- linux-3.7-vs2.3.5.1.3/include/linux/vserver/cvirt.h 2012-12-11 15:56:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/cvirt.h 2012-12-13 22:29:23.000000000 +0000 -@@ -1,8 +1,5 @@ --#ifndef _VX_CVIRT_H --#define _VX_CVIRT_H -- -- --#ifdef __KERNEL__ -+#ifndef _VSERVER_CVIRT_H -+#define _VSERVER_CVIRT_H - - struct timespec; - -@@ -18,5 +15,4 @@ void vx_update_load(struct vx_info *); - - int vx_do_syslog(int, char __user *, int); - --#endif /* __KERNEL__ */ --#endif /* _VX_CVIRT_H */ -+#endif /* _VSERVER_CVIRT_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/linux/vserver/cvirt_cmd.h linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/cvirt_cmd.h ---- linux-3.7-vs2.3.5.1.3/include/linux/vserver/cvirt_cmd.h 2012-12-11 15:56:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/cvirt_cmd.h 2012-12-13 22:29:23.000000000 +0000 -@@ -1,53 +1,13 @@ --#ifndef _VX_CVIRT_CMD_H --#define _VX_CVIRT_CMD_H -- -- --/* virtual host info name commands */ -- --#define VCMD_set_vhi_name VC_CMD(VHOST, 1, 0) --#define VCMD_get_vhi_name VC_CMD(VHOST, 2, 0) -- --struct vcmd_vhi_name_v0 { -- uint32_t field; -- char name[65]; --}; -- -- --enum vhi_name_field { -- VHIN_CONTEXT = 0, -- VHIN_SYSNAME, -- VHIN_NODENAME, -- VHIN_RELEASE, -- VHIN_VERSION, -- VHIN_MACHINE, -- VHIN_DOMAINNAME, --}; -- -+#ifndef _VSERVER_CVIRT_CMD_H -+#define _VSERVER_CVIRT_CMD_H - --#ifdef __KERNEL__ - - #include -+#include - - extern int vc_set_vhi_name(struct vx_info *, void __user *); - extern int vc_get_vhi_name(struct vx_info *, void __user *); - --#endif /* __KERNEL__ */ -- --#define VCMD_virt_stat VC_CMD(VSTAT, 3, 0) -- --struct vcmd_virt_stat_v0 { -- uint64_t offset; -- uint64_t uptime; -- uint32_t nr_threads; -- uint32_t nr_running; -- uint32_t nr_uninterruptible; -- uint32_t nr_onhold; -- uint32_t nr_forks; -- uint32_t load[3]; --}; -- --#ifdef __KERNEL__ - extern int vc_virt_stat(struct vx_info *, void __user *); - --#endif /* __KERNEL__ */ --#endif /* _VX_CVIRT_CMD_H */ -+#endif /* _VSERVER_CVIRT_CMD_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/linux/vserver/cvirt_def.h linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/cvirt_def.h ---- linux-3.7-vs2.3.5.1.3/include/linux/vserver/cvirt_def.h 2012-12-11 15:56:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/cvirt_def.h 2012-12-13 22:29:23.000000000 +0000 -@@ -1,5 +1,5 @@ --#ifndef _VX_CVIRT_DEF_H --#define _VX_CVIRT_DEF_H -+#ifndef _VSERVER_CVIRT_DEF_H -+#define _VSERVER_CVIRT_DEF_H - - #include - #include -@@ -77,4 +77,4 @@ static inline void __dump_vx_cvirt(struc - - #endif - --#endif /* _VX_CVIRT_DEF_H */ -+#endif /* _VSERVER_CVIRT_DEF_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/linux/vserver/debug.h linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/debug.h ---- linux-3.7-vs2.3.5.1.3/include/linux/vserver/debug.h 2012-12-11 15:56:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/debug.h 2012-12-13 22:29:23.000000000 +0000 -@@ -1,5 +1,5 @@ --#ifndef _VX_DEBUG_H --#define _VX_DEBUG_H -+#ifndef _VSERVER_DEBUG_H -+#define _VSERVER_DEBUG_H - - - #define VXD_CBIT(n, m) (vs_debug_ ## n & (1 << (m))) -@@ -142,4 +142,4 @@ void dump_vx_info_inactive(int); - #endif - - --#endif /* _VX_DEBUG_H */ -+#endif /* _VSERVER_DEBUG_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/linux/vserver/debug_cmd.h linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/debug_cmd.h ---- linux-3.7-vs2.3.5.1.3/include/linux/vserver/debug_cmd.h 2012-12-11 15:56:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/debug_cmd.h 2012-12-13 22:29:23.000000000 +0000 -@@ -1,28 +1,8 @@ --#ifndef _VX_DEBUG_CMD_H --#define _VX_DEBUG_CMD_H -- -- --/* debug commands */ -- --#define VCMD_dump_history VC_CMD(DEBUG, 1, 0) -- --#define VCMD_read_history VC_CMD(DEBUG, 5, 0) --#define VCMD_read_monitor VC_CMD(DEBUG, 6, 0) -- --struct vcmd_read_history_v0 { -- uint32_t index; -- uint32_t count; -- char __user *data; --}; -- --struct vcmd_read_monitor_v0 { -- uint32_t index; -- uint32_t count; -- char __user *data; --}; -+#ifndef _VSERVER_DEBUG_CMD_H -+#define _VSERVER_DEBUG_CMD_H - -+#include - --#ifdef __KERNEL__ - - #ifdef CONFIG_COMPAT - -@@ -54,5 +34,4 @@ extern int vc_read_monitor_x32(uint32_t, - - #endif /* CONFIG_COMPAT */ - --#endif /* __KERNEL__ */ --#endif /* _VX_DEBUG_CMD_H */ -+#endif /* _VSERVER_DEBUG_CMD_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/linux/vserver/device.h linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/device.h ---- linux-3.7-vs2.3.5.1.3/include/linux/vserver/device.h 2012-12-11 15:56:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/device.h 2012-12-13 22:29:23.000000000 +0000 -@@ -1,15 +1,9 @@ --#ifndef _VX_DEVICE_H --#define _VX_DEVICE_H -- -- --#define DATTR_CREATE 0x00000001 --#define DATTR_OPEN 0x00000002 -- --#define DATTR_REMAP 0x00000010 -+#ifndef _VSERVER_DEVICE_H -+#define _VSERVER_DEVICE_H - --#define DATTR_MASK 0x00000013 - -+#include - --#else /* _VX_DEVICE_H */ -+#else /* _VSERVER_DEVICE_H */ - #warning duplicate inclusion --#endif /* _VX_DEVICE_H */ -+#endif /* _VSERVER_DEVICE_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/linux/vserver/device_cmd.h linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/device_cmd.h ---- linux-3.7-vs2.3.5.1.3/include/linux/vserver/device_cmd.h 2012-12-11 15:56:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/device_cmd.h 2012-12-13 22:29:23.000000000 +0000 -@@ -1,20 +1,8 @@ --#ifndef _VX_DEVICE_CMD_H --#define _VX_DEVICE_CMD_H -- -- --/* device vserver commands */ -- --#define VCMD_set_mapping VC_CMD(DEVICE, 1, 0) --#define VCMD_unset_mapping VC_CMD(DEVICE, 2, 0) -- --struct vcmd_set_mapping_v0 { -- const char __user *device; -- const char __user *target; -- uint32_t flags; --}; -+#ifndef _VSERVER_DEVICE_CMD_H -+#define _VSERVER_DEVICE_CMD_H - -+#include - --#ifdef __KERNEL__ - - #ifdef CONFIG_COMPAT - -@@ -40,5 +28,4 @@ extern int vc_unset_mapping_x32(struct v - - #endif /* CONFIG_COMPAT */ - --#endif /* __KERNEL__ */ --#endif /* _VX_DEVICE_CMD_H */ -+#endif /* _VSERVER_DEVICE_CMD_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/linux/vserver/device_def.h linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/device_def.h ---- linux-3.7-vs2.3.5.1.3/include/linux/vserver/device_def.h 2012-12-11 15:56:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/device_def.h 2012-12-13 22:29:23.000000000 +0000 -@@ -1,5 +1,5 @@ --#ifndef _VX_DEVICE_DEF_H --#define _VX_DEVICE_DEF_H -+#ifndef _VSERVER_DEVICE_DEF_H -+#define _VSERVER_DEVICE_DEF_H - - #include - -@@ -14,4 +14,4 @@ struct _vx_device { - #endif - }; - --#endif /* _VX_DEVICE_DEF_H */ -+#endif /* _VSERVER_DEVICE_DEF_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/linux/vserver/dlimit.h linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/dlimit.h ---- linux-3.7-vs2.3.5.1.3/include/linux/vserver/dlimit.h 2012-12-11 15:56:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/dlimit.h 2012-12-13 22:29:23.000000000 +0000 -@@ -1,5 +1,5 @@ --#ifndef _VX_DLIMIT_H --#define _VX_DLIMIT_H -+#ifndef _VSERVER_DLIMIT_H -+#define _VSERVER_DLIMIT_H - - #include "switch.h" - -@@ -49,6 +49,6 @@ extern void vx_vsi_statfs(struct super_b - typedef uint64_t dlsize_t; - - #endif /* __KERNEL__ */ --#else /* _VX_DLIMIT_H */ -+#else /* _VSERVER_DLIMIT_H */ - #warning duplicate inclusion --#endif /* _VX_DLIMIT_H */ -+#endif /* _VSERVER_DLIMIT_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/linux/vserver/dlimit_cmd.h linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/dlimit_cmd.h ---- linux-3.7-vs2.3.5.1.3/include/linux/vserver/dlimit_cmd.h 2012-12-11 15:56:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/dlimit_cmd.h 2012-12-13 22:29:23.000000000 +0000 -@@ -1,70 +1,8 @@ --#ifndef _VX_DLIMIT_CMD_H --#define _VX_DLIMIT_CMD_H -- -- --/* dlimit vserver commands */ -- --#define VCMD_add_dlimit VC_CMD(DLIMIT, 1, 0) --#define VCMD_rem_dlimit VC_CMD(DLIMIT, 2, 0) -- --#define VCMD_set_dlimit VC_CMD(DLIMIT, 5, 0) --#define VCMD_get_dlimit VC_CMD(DLIMIT, 6, 0) -- --struct vcmd_ctx_dlimit_base_v0 { -- const char __user *name; -- uint32_t flags; --}; -- --struct vcmd_ctx_dlimit_v0 { -- const char __user *name; -- uint32_t space_used; /* used space in kbytes */ -- uint32_t space_total; /* maximum space in kbytes */ -- uint32_t inodes_used; /* used inodes */ -- uint32_t inodes_total; /* maximum inodes */ -- uint32_t reserved; /* reserved for root in % */ -- uint32_t flags; --}; -- --#define CDLIM_UNSET ((uint32_t)0UL) --#define CDLIM_INFINITY ((uint32_t)~0UL) --#define CDLIM_KEEP ((uint32_t)~1UL) -- --#define DLIME_UNIT 0 --#define DLIME_KILO 1 --#define DLIME_MEGA 2 --#define DLIME_GIGA 3 -- --#define DLIMF_SHIFT 0x10 -- --#define DLIMS_USED 0 --#define DLIMS_TOTAL 2 -- --static inline --uint64_t dlimit_space_32to64(uint32_t val, uint32_t flags, int shift) --{ -- int exp = (flags & DLIMF_SHIFT) ? -- (flags >> shift) & DLIME_GIGA : DLIME_KILO; -- return ((uint64_t)val) << (10 * exp); --} -- --static inline --uint32_t dlimit_space_64to32(uint64_t val, uint32_t *flags, int shift) --{ -- int exp = 0; -+#ifndef _VSERVER_DLIMIT_CMD_H -+#define _VSERVER_DLIMIT_CMD_H - -- if (*flags & DLIMF_SHIFT) { -- while (val > (1LL << 32) && (exp < 3)) { -- val >>= 10; -- exp++; -- } -- *flags &= ~(DLIME_GIGA << shift); -- *flags |= exp << shift; -- } else -- val >>= 10; -- return val; --} -+#include - --#ifdef __KERNEL__ - - #ifdef CONFIG_COMPAT - -@@ -105,5 +43,4 @@ extern int vc_get_dlimit_x32(uint32_t, v - - #endif /* CONFIG_COMPAT */ - --#endif /* __KERNEL__ */ --#endif /* _VX_DLIMIT_CMD_H */ -+#endif /* _VSERVER_DLIMIT_CMD_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/linux/vserver/global.h linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/global.h ---- linux-3.7-vs2.3.5.1.3/include/linux/vserver/global.h 2012-12-11 15:56:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/global.h 2012-12-13 22:29:23.000000000 +0000 -@@ -1,5 +1,5 @@ --#ifndef _VX_GLOBAL_H --#define _VX_GLOBAL_H -+#ifndef _VSERVER_GLOBAL_H -+#define _VSERVER_GLOBAL_H - - - extern atomic_t vx_global_ctotal; -@@ -16,4 +16,4 @@ extern atomic_t vs_global_user_ns; - extern atomic_t vs_global_pid_ns; - - --#endif /* _VX_GLOBAL_H */ -+#endif /* _VSERVER_GLOBAL_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/linux/vserver/history.h linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/history.h ---- linux-3.7-vs2.3.5.1.3/include/linux/vserver/history.h 2012-12-11 15:56:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/history.h 2012-12-13 22:29:23.000000000 +0000 -@@ -1,5 +1,5 @@ --#ifndef _VX_HISTORY_H --#define _VX_HISTORY_H -+#ifndef _VSERVER_HISTORY_H -+#define _VSERVER_HISTORY_H - - - enum { -@@ -194,4 +194,4 @@ extern void vxh_dump_history(void); - - #endif /* CONFIG_VSERVER_HISTORY */ - --#endif /* _VX_HISTORY_H */ -+#endif /* _VSERVER_HISTORY_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/linux/vserver/inode.h linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/inode.h ---- linux-3.7-vs2.3.5.1.3/include/linux/vserver/inode.h 2012-12-11 15:56:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/inode.h 2012-12-13 22:29:23.000000000 +0000 -@@ -1,20 +1,7 @@ --#ifndef _VX_INODE_H --#define _VX_INODE_H -- -- --#define IATTR_TAG 0x01000000 -- --#define IATTR_ADMIN 0x00000001 --#define IATTR_WATCH 0x00000002 --#define IATTR_HIDE 0x00000004 --#define IATTR_FLAGS 0x00000007 -- --#define IATTR_BARRIER 0x00010000 --#define IATTR_IXUNLINK 0x00020000 --#define IATTR_IMMUTABLE 0x00040000 --#define IATTR_COW 0x00080000 -+#ifndef _VSERVER_INODE_H -+#define _VSERVER_INODE_H - --#ifdef __KERNEL__ -+#include - - - #ifdef CONFIG_VSERVER_PROC_SECURE -@@ -27,13 +14,6 @@ - - #define vx_hide_check(c, m) (((m) & IATTR_HIDE) ? vx_check(c, m) : 1) - --#endif /* __KERNEL__ */ -- --/* inode ioctls */ -- --#define FIOC_GETXFLG _IOR('x', 5, long) --#define FIOC_SETXFLG _IOW('x', 6, long) -- --#else /* _VX_INODE_H */ -+#else /* _VSERVER_INODE_H */ - #warning duplicate inclusion --#endif /* _VX_INODE_H */ -+#endif /* _VSERVER_INODE_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/linux/vserver/inode_cmd.h linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/inode_cmd.h ---- linux-3.7-vs2.3.5.1.3/include/linux/vserver/inode_cmd.h 2012-12-11 15:56:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/inode_cmd.h 2012-12-13 22:29:23.000000000 +0000 -@@ -1,30 +1,8 @@ --#ifndef _VX_INODE_CMD_H --#define _VX_INODE_CMD_H -- -- --/* inode vserver commands */ -- --#define VCMD_get_iattr VC_CMD(INODE, 1, 1) --#define VCMD_set_iattr VC_CMD(INODE, 2, 1) -- --#define VCMD_fget_iattr VC_CMD(INODE, 3, 0) --#define VCMD_fset_iattr VC_CMD(INODE, 4, 0) -- --struct vcmd_ctx_iattr_v1 { -- const char __user *name; -- uint32_t tag; -- uint32_t flags; -- uint32_t mask; --}; -- --struct vcmd_ctx_fiattr_v0 { -- uint32_t tag; -- uint32_t flags; -- uint32_t mask; --}; -+#ifndef _VSERVER_INODE_CMD_H -+#define _VSERVER_INODE_CMD_H - -+#include - --#ifdef __KERNEL__ - - - #ifdef CONFIG_COMPAT -@@ -55,5 +33,4 @@ extern int vc_set_iattr_x32(void __user - - #endif /* CONFIG_COMPAT */ - --#endif /* __KERNEL__ */ --#endif /* _VX_INODE_CMD_H */ -+#endif /* _VSERVER_INODE_CMD_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/linux/vserver/limit.h linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/limit.h ---- linux-3.7-vs2.3.5.1.3/include/linux/vserver/limit.h 2012-12-11 15:56:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/limit.h 2012-12-13 22:29:23.000000000 +0000 -@@ -1,17 +1,8 @@ --#ifndef _VX_LIMIT_H --#define _VX_LIMIT_H -- --#define VLIMIT_NSOCK 16 --#define VLIMIT_OPENFD 17 --#define VLIMIT_ANON 18 --#define VLIMIT_SHMEM 19 --#define VLIMIT_SEMARY 20 --#define VLIMIT_NSEMS 21 --#define VLIMIT_DENTRY 22 --#define VLIMIT_MAPPED 23 -+#ifndef _VSERVER_LIMIT_H -+#define _VSERVER_LIMIT_H - -+#include - --#ifdef __KERNEL__ - - #define VLIM_NOCHECK ((1L << VLIMIT_DENTRY) | (1L << RLIMIT_RSS)) - -@@ -67,5 +58,4 @@ long vx_vsi_cached(struct sysinfo *); - - #define NUM_LIMITS 24 - --#endif /* __KERNEL__ */ --#endif /* _VX_LIMIT_H */ -+#endif /* _VSERVER_LIMIT_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/linux/vserver/limit_cmd.h linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/limit_cmd.h ---- linux-3.7-vs2.3.5.1.3/include/linux/vserver/limit_cmd.h 2012-12-11 15:56:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/limit_cmd.h 2012-12-13 22:29:23.000000000 +0000 -@@ -1,43 +1,8 @@ --#ifndef _VX_LIMIT_CMD_H --#define _VX_LIMIT_CMD_H -- -- --/* rlimit vserver commands */ -- --#define VCMD_get_rlimit VC_CMD(RLIMIT, 1, 0) --#define VCMD_set_rlimit VC_CMD(RLIMIT, 2, 0) --#define VCMD_get_rlimit_mask VC_CMD(RLIMIT, 3, 0) --#define VCMD_reset_hits VC_CMD(RLIMIT, 7, 0) --#define VCMD_reset_minmax VC_CMD(RLIMIT, 9, 0) -- --struct vcmd_ctx_rlimit_v0 { -- uint32_t id; -- uint64_t minimum; -- uint64_t softlimit; -- uint64_t maximum; --}; -- --struct vcmd_ctx_rlimit_mask_v0 { -- uint32_t minimum; -- uint32_t softlimit; -- uint32_t maximum; --}; -- --#define VCMD_rlimit_stat VC_CMD(VSTAT, 1, 0) -- --struct vcmd_rlimit_stat_v0 { -- uint32_t id; -- uint32_t hits; -- uint64_t value; -- uint64_t minimum; -- uint64_t maximum; --}; -+#ifndef _VSERVER_LIMIT_CMD_H -+#define _VSERVER_LIMIT_CMD_H - --#define CRLIM_UNSET (0ULL) --#define CRLIM_INFINITY (~0ULL) --#define CRLIM_KEEP (~1ULL) -+#include - --#ifdef __KERNEL__ - - #ifdef CONFIG_IA32_EMULATION - -@@ -67,5 +32,4 @@ extern int vc_set_rlimit_x32(struct vx_i - - #endif /* CONFIG_IA32_EMULATION */ - --#endif /* __KERNEL__ */ --#endif /* _VX_LIMIT_CMD_H */ -+#endif /* _VSERVER_LIMIT_CMD_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/linux/vserver/limit_def.h linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/limit_def.h ---- linux-3.7-vs2.3.5.1.3/include/linux/vserver/limit_def.h 2012-12-11 15:56:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/limit_def.h 2012-12-13 22:29:23.000000000 +0000 -@@ -1,5 +1,5 @@ --#ifndef _VX_LIMIT_DEF_H --#define _VX_LIMIT_DEF_H -+#ifndef _VSERVER_LIMIT_DEF_H -+#define _VSERVER_LIMIT_DEF_H - - #include - #include -@@ -44,4 +44,4 @@ static inline void __dump_vx_limit(struc - - #endif - --#endif /* _VX_LIMIT_DEF_H */ -+#endif /* _VSERVER_LIMIT_DEF_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/linux/vserver/limit_int.h linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/limit_int.h ---- linux-3.7-vs2.3.5.1.3/include/linux/vserver/limit_int.h 2012-12-11 15:56:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/limit_int.h 2012-12-13 22:29:23.000000000 +0000 -@@ -1,9 +1,5 @@ --#ifndef _VX_LIMIT_INT_H --#define _VX_LIMIT_INT_H -- --#include "context.h" -- --#ifdef __KERNEL__ -+#ifndef _VSERVER_LIMIT_INT_H -+#define _VSERVER_LIMIT_INT_H - - #define VXD_RCRES_COND(r) VXD_CBIT(cres, r) - #define VXD_RLIMIT_COND(r) VXD_CBIT(limit, r) -@@ -194,5 +190,4 @@ static inline void vx_limit_fixup(struct - } - - --#endif /* __KERNEL__ */ --#endif /* _VX_LIMIT_INT_H */ -+#endif /* _VSERVER_LIMIT_INT_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/linux/vserver/monitor.h linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/monitor.h ---- linux-3.7-vs2.3.5.1.3/include/linux/vserver/monitor.h 2012-12-11 15:56:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/monitor.h 2012-12-13 22:45:02.000000000 +0000 -@@ -1,96 +1,6 @@ --#ifndef _VX_MONITOR_H --#define _VX_MONITOR_H -- --#include -- --enum { -- VXM_UNUSED = 0, -- -- VXM_SYNC = 0x10, -- -- VXM_UPDATE = 0x20, -- VXM_UPDATE_1, -- VXM_UPDATE_2, -- -- VXM_RQINFO_1 = 0x24, -- VXM_RQINFO_2, -- -- VXM_ACTIVATE = 0x40, -- VXM_DEACTIVATE, -- VXM_IDLE, -- -- VXM_HOLD = 0x44, -- VXM_UNHOLD, -- -- VXM_MIGRATE = 0x48, -- VXM_RESCHED, -- -- /* all other bits are flags */ -- VXM_SCHED = 0x80, --}; -- --struct _vxm_update_1 { -- uint32_t tokens_max; -- uint32_t fill_rate; -- uint32_t interval; --}; -- --struct _vxm_update_2 { -- uint32_t tokens_min; -- uint32_t fill_rate; -- uint32_t interval; --}; -- --struct _vxm_rqinfo_1 { -- uint16_t running; -- uint16_t onhold; -- uint16_t iowait; -- uint16_t uintr; -- uint32_t idle_tokens; --}; -- --struct _vxm_rqinfo_2 { -- uint32_t norm_time; -- uint32_t idle_time; -- uint32_t idle_skip; --}; -- --struct _vxm_sched { -- uint32_t tokens; -- uint32_t norm_time; -- uint32_t idle_time; --}; -- --struct _vxm_task { -- uint16_t pid; -- uint16_t state; --}; -- --struct _vxm_event { -- uint32_t jif; -- union { -- uint32_t seq; -- uint32_t sec; -- }; -- union { -- uint32_t tokens; -- uint32_t nsec; -- struct _vxm_task tsk; -- }; --}; -- --struct _vx_mon_entry { -- uint16_t type; -- uint16_t xid; -- union { -- struct _vxm_event ev; -- struct _vxm_sched sd; -- struct _vxm_update_1 u1; -- struct _vxm_update_2 u2; -- struct _vxm_rqinfo_1 q1; -- struct _vxm_rqinfo_2 q2; -- }; --}; -+#ifndef _VSERVER_MONITOR_H -+#define _VSERVER_MONITOR_H - -+#include - --#endif /* _VX_MONITOR_H */ -+#endif /* _VSERVER_MONITOR_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/linux/vserver/network.h linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/network.h ---- linux-3.7-vs2.3.5.1.3/include/linux/vserver/network.h 2012-12-13 13:40:52.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/network.h 2012-12-13 22:29:23.000000000 +0000 -@@ -1,79 +1,6 @@ --#ifndef _VX_NETWORK_H --#define _VX_NETWORK_H -- --#include -- -- --#define MAX_N_CONTEXT 65535 /* Arbitrary limit */ -- -- --/* network flags */ -- --#define NXF_INFO_PRIVATE 0x00000008 -- --#define NXF_SINGLE_IP 0x00000100 --#define NXF_LBACK_REMAP 0x00000200 --#define NXF_LBACK_ALLOW 0x00000400 -- --#define NXF_HIDE_NETIF 0x02000000 --#define NXF_HIDE_LBACK 0x04000000 -- --#define NXF_STATE_SETUP (1ULL << 32) --#define NXF_STATE_ADMIN (1ULL << 34) -- --#define NXF_SC_HELPER (1ULL << 36) --#define NXF_PERSISTENT (1ULL << 38) -- --#define NXF_ONE_TIME (0x0005ULL << 32) -- -- --#define NXF_INIT_SET (__nxf_init_set()) -- --static inline uint64_t __nxf_init_set(void) { -- return NXF_STATE_ADMIN --#ifdef CONFIG_VSERVER_AUTO_LBACK -- | NXF_LBACK_REMAP -- | NXF_HIDE_LBACK --#endif --#ifdef CONFIG_VSERVER_AUTO_SINGLE -- | NXF_SINGLE_IP --#endif -- | NXF_HIDE_NETIF; --} -- -- --/* network caps */ -- --#define NXC_TUN_CREATE 0x00000001 -- --#define NXC_RAW_ICMP 0x00000100 -- --#define NXC_MULTICAST 0x00001000 -- -- --/* address types */ -- --#define NXA_TYPE_IPV4 0x0001 --#define NXA_TYPE_IPV6 0x0002 -- --#define NXA_TYPE_NONE 0x0000 --#define NXA_TYPE_ANY 0x00FF -- --#define NXA_TYPE_ADDR 0x0010 --#define NXA_TYPE_MASK 0x0020 --#define NXA_TYPE_RANGE 0x0040 -- --#define NXA_MASK_ALL (NXA_TYPE_ADDR | NXA_TYPE_MASK | NXA_TYPE_RANGE) -- --#define NXA_MOD_BCAST 0x0100 --#define NXA_MOD_LBACK 0x0200 -- --#define NXA_LOOPBACK 0x1000 -- --#define NXA_MASK_BIND (NXA_MASK_ALL | NXA_MOD_BCAST | NXA_MOD_LBACK) --#define NXA_MASK_SHOW (NXA_MASK_ALL | NXA_LOOPBACK) -+#ifndef _VSERVER_NETWORK_H -+#define _VSERVER_NETWORK_H - --#ifdef __KERNEL__ - - #include - #include -@@ -81,6 +8,7 @@ static inline uint64_t __nxf_init_set(vo - #include - #include - #include -+#include - - struct nx_addr_v4 { - struct nx_addr_v4 *next; -@@ -145,5 +73,4 @@ struct sock; - #define NX_IPV6(n) (0) - #endif - --#endif /* __KERNEL__ */ --#endif /* _VX_NETWORK_H */ -+#endif /* _VSERVER_NETWORK_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/linux/vserver/network_cmd.h linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/network_cmd.h ---- linux-3.7-vs2.3.5.1.3/include/linux/vserver/network_cmd.h 2012-12-11 15:56:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/network_cmd.h 2012-12-13 22:29:23.000000000 +0000 -@@ -1,110 +1,12 @@ --#ifndef _VX_NETWORK_CMD_H --#define _VX_NETWORK_CMD_H -- -- --/* vinfo commands */ -+#ifndef _VSERVER_NETWORK_CMD_H -+#define _VSERVER_NETWORK_CMD_H - --#define VCMD_task_nid VC_CMD(VINFO, 2, 0) -+#include - --#ifdef __KERNEL__ - extern int vc_task_nid(uint32_t); - --#endif /* __KERNEL__ */ -- --#define VCMD_nx_info VC_CMD(VINFO, 6, 0) -- --struct vcmd_nx_info_v0 { -- uint32_t nid; -- /* more to come */ --}; -- --#ifdef __KERNEL__ - extern int vc_nx_info(struct nx_info *, void __user *); - --#endif /* __KERNEL__ */ -- --#include --#include -- --#define VCMD_net_create_v0 VC_CMD(VNET, 1, 0) --#define VCMD_net_create VC_CMD(VNET, 1, 1) -- --struct vcmd_net_create { -- uint64_t flagword; --}; -- --#define VCMD_net_migrate VC_CMD(NETMIG, 1, 0) -- --#define VCMD_net_add VC_CMD(NETALT, 1, 0) --#define VCMD_net_remove VC_CMD(NETALT, 2, 0) -- --struct vcmd_net_addr_v0 { -- uint16_t type; -- uint16_t count; -- struct in_addr ip[4]; -- struct in_addr mask[4]; --}; -- --#define VCMD_net_add_ipv4_v1 VC_CMD(NETALT, 1, 1) --#define VCMD_net_rem_ipv4_v1 VC_CMD(NETALT, 2, 1) -- --struct vcmd_net_addr_ipv4_v1 { -- uint16_t type; -- uint16_t flags; -- struct in_addr ip; -- struct in_addr mask; --}; -- --#define VCMD_net_add_ipv4 VC_CMD(NETALT, 1, 2) --#define VCMD_net_rem_ipv4 VC_CMD(NETALT, 2, 2) -- --struct vcmd_net_addr_ipv4_v2 { -- uint16_t type; -- uint16_t flags; -- struct in_addr ip; -- struct in_addr ip2; -- struct in_addr mask; --}; -- --#define VCMD_net_add_ipv6 VC_CMD(NETALT, 3, 1) --#define VCMD_net_remove_ipv6 VC_CMD(NETALT, 4, 1) -- --struct vcmd_net_addr_ipv6_v1 { -- uint16_t type; -- uint16_t flags; -- uint32_t prefix; -- struct in6_addr ip; -- struct in6_addr mask; --}; -- --#define VCMD_add_match_ipv4 VC_CMD(NETALT, 5, 0) --#define VCMD_get_match_ipv4 VC_CMD(NETALT, 6, 0) -- --struct vcmd_match_ipv4_v0 { -- uint16_t type; -- uint16_t flags; -- uint16_t parent; -- uint16_t prefix; -- struct in_addr ip; -- struct in_addr ip2; -- struct in_addr mask; --}; -- --#define VCMD_add_match_ipv6 VC_CMD(NETALT, 7, 0) --#define VCMD_get_match_ipv6 VC_CMD(NETALT, 8, 0) -- --struct vcmd_match_ipv6_v0 { -- uint16_t type; -- uint16_t flags; -- uint16_t parent; -- uint16_t prefix; -- struct in6_addr ip; -- struct in6_addr ip2; -- struct in6_addr mask; --}; -- -- --#ifdef __KERNEL__ - extern int vc_net_create(uint32_t, void __user *); - extern int vc_net_migrate(struct nx_info *, void __user *); - -@@ -126,39 +28,10 @@ extern int vc_get_match_ipv4(struct nx_i - extern int vc_add_match_ipv6(struct nx_info *, void __user *); - extern int vc_get_match_ipv6(struct nx_info *, void __user *); - --#endif /* __KERNEL__ */ -- -- --/* flag commands */ -- --#define VCMD_get_nflags VC_CMD(FLAGS, 5, 0) --#define VCMD_set_nflags VC_CMD(FLAGS, 6, 0) -- --struct vcmd_net_flags_v0 { -- uint64_t flagword; -- uint64_t mask; --}; -- --#ifdef __KERNEL__ - extern int vc_get_nflags(struct nx_info *, void __user *); - extern int vc_set_nflags(struct nx_info *, void __user *); - --#endif /* __KERNEL__ */ -- -- --/* network caps commands */ -- --#define VCMD_get_ncaps VC_CMD(FLAGS, 7, 0) --#define VCMD_set_ncaps VC_CMD(FLAGS, 8, 0) -- --struct vcmd_net_caps_v0 { -- uint64_t ncaps; -- uint64_t cmask; --}; -- --#ifdef __KERNEL__ - extern int vc_get_ncaps(struct nx_info *, void __user *); - extern int vc_set_ncaps(struct nx_info *, void __user *); - --#endif /* __KERNEL__ */ --#endif /* _VX_CONTEXT_CMD_H */ -+#endif /* _VSERVER_CONTEXT_CMD_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/linux/vserver/percpu.h linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/percpu.h ---- linux-3.7-vs2.3.5.1.3/include/linux/vserver/percpu.h 2012-12-11 15:56:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/percpu.h 2012-12-13 22:29:23.000000000 +0000 -@@ -1,5 +1,5 @@ --#ifndef _VX_PERCPU_H --#define _VX_PERCPU_H -+#ifndef _VSERVER_PERCPU_H -+#define _VSERVER_PERCPU_H - - #include "cvirt_def.h" - #include "sched_def.h" -@@ -11,4 +11,4 @@ struct _vx_percpu { - - #define PERCPU_PERCTX (sizeof(struct _vx_percpu)) - --#endif /* _VX_PERCPU_H */ -+#endif /* _VSERVER_PERCPU_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/linux/vserver/sched.h linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/sched.h ---- linux-3.7-vs2.3.5.1.3/include/linux/vserver/sched.h 2012-12-11 15:56:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/sched.h 2012-12-13 22:29:23.000000000 +0000 -@@ -1,5 +1,5 @@ --#ifndef _VX_SCHED_H --#define _VX_SCHED_H -+#ifndef _VSERVER_SCHED_H -+#define _VSERVER_SCHED_H - - - #ifdef __KERNEL__ -@@ -18,6 +18,6 @@ void vx_update_sched_param(struct _vx_sc - struct _vx_sched_pc *sched_pc); - - #endif /* __KERNEL__ */ --#else /* _VX_SCHED_H */ -+#else /* _VSERVER_SCHED_H */ - #warning duplicate inclusion --#endif /* _VX_SCHED_H */ -+#endif /* _VSERVER_SCHED_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/linux/vserver/sched_cmd.h linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/sched_cmd.h ---- linux-3.7-vs2.3.5.1.3/include/linux/vserver/sched_cmd.h 2012-12-11 15:56:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/sched_cmd.h 2012-12-13 22:29:23.000000000 +0000 -@@ -1,21 +1,11 @@ --#ifndef _VX_SCHED_CMD_H --#define _VX_SCHED_CMD_H -- -- --struct vcmd_prio_bias { -- int32_t cpu_id; -- int32_t prio_bias; --}; -- --#define VCMD_set_prio_bias VC_CMD(SCHED, 4, 0) --#define VCMD_get_prio_bias VC_CMD(SCHED, 5, 0) -+#ifndef _VSERVER_SCHED_CMD_H -+#define _VSERVER_SCHED_CMD_H - --#ifdef __KERNEL__ - - #include -+#include - - extern int vc_set_prio_bias(struct vx_info *, void __user *); - extern int vc_get_prio_bias(struct vx_info *, void __user *); - --#endif /* __KERNEL__ */ --#endif /* _VX_SCHED_CMD_H */ -+#endif /* _VSERVER_SCHED_CMD_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/linux/vserver/sched_def.h linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/sched_def.h ---- linux-3.7-vs2.3.5.1.3/include/linux/vserver/sched_def.h 2012-12-11 15:56:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/sched_def.h 2012-12-13 22:29:23.000000000 +0000 -@@ -1,5 +1,5 @@ --#ifndef _VX_SCHED_DEF_H --#define _VX_SCHED_DEF_H -+#ifndef _VSERVER_SCHED_DEF_H -+#define _VSERVER_SCHED_DEF_H - - #include - #include -@@ -35,4 +35,4 @@ static inline void __dump_vx_sched(struc - - #endif - --#endif /* _VX_SCHED_DEF_H */ -+#endif /* _VSERVER_SCHED_DEF_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/linux/vserver/signal.h linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/signal.h ---- linux-3.7-vs2.3.5.1.3/include/linux/vserver/signal.h 2012-12-11 15:56:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/signal.h 2012-12-13 22:29:23.000000000 +0000 -@@ -1,5 +1,5 @@ --#ifndef _VX_SIGNAL_H --#define _VX_SIGNAL_H -+#ifndef _VSERVER_SIGNAL_H -+#define _VSERVER_SIGNAL_H - - - #ifdef __KERNEL__ -@@ -9,6 +9,6 @@ struct vx_info; - int vx_info_kill(struct vx_info *, int, int); - - #endif /* __KERNEL__ */ --#else /* _VX_SIGNAL_H */ -+#else /* _VSERVER_SIGNAL_H */ - #warning duplicate inclusion --#endif /* _VX_SIGNAL_H */ -+#endif /* _VSERVER_SIGNAL_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/linux/vserver/signal_cmd.h linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/signal_cmd.h ---- linux-3.7-vs2.3.5.1.3/include/linux/vserver/signal_cmd.h 2012-12-11 15:56:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/signal_cmd.h 2012-12-13 22:29:23.000000000 +0000 -@@ -1,43 +1,14 @@ --#ifndef _VX_SIGNAL_CMD_H --#define _VX_SIGNAL_CMD_H -- -- --/* signalling vserver commands */ -- --#define VCMD_ctx_kill VC_CMD(PROCTRL, 1, 0) --#define VCMD_wait_exit VC_CMD(EVENT, 99, 0) -- --struct vcmd_ctx_kill_v0 { -- int32_t pid; -- int32_t sig; --}; -+#ifndef _VSERVER_SIGNAL_CMD_H -+#define _VSERVER_SIGNAL_CMD_H - --struct vcmd_wait_exit_v0 { -- int32_t reboot_cmd; -- int32_t exit_code; --}; -+#include - --#ifdef __KERNEL__ - - extern int vc_ctx_kill(struct vx_info *, void __user *); - extern int vc_wait_exit(struct vx_info *, void __user *); - --#endif /* __KERNEL__ */ -- --/* process alteration commands */ -- --#define VCMD_get_pflags VC_CMD(PROCALT, 5, 0) --#define VCMD_set_pflags VC_CMD(PROCALT, 6, 0) -- --struct vcmd_pflags_v0 { -- uint32_t flagword; -- uint32_t mask; --}; -- --#ifdef __KERNEL__ - - extern int vc_get_pflags(uint32_t pid, void __user *); - extern int vc_set_pflags(uint32_t pid, void __user *); - --#endif /* __KERNEL__ */ --#endif /* _VX_SIGNAL_CMD_H */ -+#endif /* _VSERVER_SIGNAL_CMD_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/linux/vserver/space.h linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/space.h ---- linux-3.7-vs2.3.5.1.3/include/linux/vserver/space.h 2012-12-11 15:56:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/space.h 2012-12-13 22:29:23.000000000 +0000 -@@ -1,5 +1,5 @@ --#ifndef _VX_SPACE_H --#define _VX_SPACE_H -+#ifndef _VSERVER_SPACE_H -+#define _VSERVER_SPACE_H - - #include - -@@ -7,6 +7,6 @@ struct vx_info; - - int vx_set_space(struct vx_info *vxi, unsigned long mask, unsigned index); - --#else /* _VX_SPACE_H */ -+#else /* _VSERVER_SPACE_H */ - #warning duplicate inclusion --#endif /* _VX_SPACE_H */ -+#endif /* _VSERVER_SPACE_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/linux/vserver/space_cmd.h linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/space_cmd.h ---- linux-3.7-vs2.3.5.1.3/include/linux/vserver/space_cmd.h 2012-12-11 15:56:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/space_cmd.h 2012-12-13 22:29:23.000000000 +0000 -@@ -1,32 +1,8 @@ --#ifndef _VX_SPACE_CMD_H --#define _VX_SPACE_CMD_H -- -- --#define VCMD_enter_space_v0 VC_CMD(PROCALT, 1, 0) --#define VCMD_enter_space_v1 VC_CMD(PROCALT, 1, 1) --#define VCMD_enter_space VC_CMD(PROCALT, 1, 2) -- --#define VCMD_set_space_v0 VC_CMD(PROCALT, 3, 0) --#define VCMD_set_space_v1 VC_CMD(PROCALT, 3, 1) --#define VCMD_set_space VC_CMD(PROCALT, 3, 2) -- --#define VCMD_get_space_mask_v0 VC_CMD(PROCALT, 4, 0) -- --#define VCMD_get_space_mask VC_CMD(VSPACE, 0, 1) --#define VCMD_get_space_default VC_CMD(VSPACE, 1, 0) -- -- --struct vcmd_space_mask_v1 { -- uint64_t mask; --}; -- --struct vcmd_space_mask_v2 { -- uint64_t mask; -- uint32_t index; --}; -+#ifndef _VSERVER_SPACE_CMD_H -+#define _VSERVER_SPACE_CMD_H - -+#include - --#ifdef __KERNEL__ - - extern int vc_enter_space_v1(struct vx_info *, void __user *); - extern int vc_set_space_v1(struct vx_info *, void __user *); -@@ -34,5 +10,4 @@ extern int vc_enter_space(struct vx_info - extern int vc_set_space(struct vx_info *, void __user *); - extern int vc_get_space_mask(void __user *, int); - --#endif /* __KERNEL__ */ --#endif /* _VX_SPACE_CMD_H */ -+#endif /* _VSERVER_SPACE_CMD_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/linux/vserver/switch.h linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/switch.h ---- linux-3.7-vs2.3.5.1.3/include/linux/vserver/switch.h 2012-12-11 15:56:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/switch.h 2012-12-13 22:29:23.000000000 +0000 -@@ -1,98 +1,8 @@ --#ifndef _VX_SWITCH_H --#define _VX_SWITCH_H -- --#include -- -- --#define VC_CATEGORY(c) (((c) >> 24) & 0x3F) --#define VC_COMMAND(c) (((c) >> 16) & 0xFF) --#define VC_VERSION(c) ((c) & 0xFFF) -- --#define VC_CMD(c, i, v) ((((VC_CAT_ ## c) & 0x3F) << 24) \ -- | (((i) & 0xFF) << 16) | ((v) & 0xFFF)) -- --/* -- -- Syscall Matrix V2.8 -- -- |VERSION|CREATE |MODIFY |MIGRATE|CONTROL|EXPERIM| |SPECIAL|SPECIAL| -- |STATS |DESTROY|ALTER |CHANGE |LIMIT |TEST | | | | -- |INFO |SETUP | |MOVE | | | | | | -- -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ -- SYSTEM |VERSION|VSETUP |VHOST | | | | |DEVICE | | -- HOST | 00| 01| 02| 03| 04| 05| | 06| 07| -- -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ -- CPU | |VPROC |PROCALT|PROCMIG|PROCTRL| | |SCHED. | | -- PROCESS| 08| 09| 10| 11| 12| 13| | 14| 15| -- -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ -- MEMORY | | | | |MEMCTRL| | |SWAP | | -- | 16| 17| 18| 19| 20| 21| | 22| 23| -- -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ -- NETWORK| |VNET |NETALT |NETMIG |NETCTL | | |SERIAL | | -- | 24| 25| 26| 27| 28| 29| | 30| 31| -- -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ -- DISK | | | |TAGMIG |DLIMIT | | |INODE | | -- VFS | 32| 33| 34| 35| 36| 37| | 38| 39| -- -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ -- OTHER |VSTAT | | | | | | |VINFO | | -- | 40| 41| 42| 43| 44| 45| | 46| 47| -- =======+=======+=======+=======+=======+=======+=======+ +=======+=======+ -- SPECIAL|EVENT | | | |FLAGS | | |VSPACE | | -- | 48| 49| 50| 51| 52| 53| | 54| 55| -- -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ -- SPECIAL|DEBUG | | | |RLIMIT |SYSCALL| | |COMPAT | -- | 56| 57| 58| 59| 60|TEST 61| | 62| 63| -- -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ -- --*/ -- --#define VC_CAT_VERSION 0 -- --#define VC_CAT_VSETUP 1 --#define VC_CAT_VHOST 2 -- --#define VC_CAT_DEVICE 6 -- --#define VC_CAT_VPROC 9 --#define VC_CAT_PROCALT 10 --#define VC_CAT_PROCMIG 11 --#define VC_CAT_PROCTRL 12 -- --#define VC_CAT_SCHED 14 --#define VC_CAT_MEMCTRL 20 -- --#define VC_CAT_VNET 25 --#define VC_CAT_NETALT 26 --#define VC_CAT_NETMIG 27 --#define VC_CAT_NETCTRL 28 -- --#define VC_CAT_TAGMIG 35 --#define VC_CAT_DLIMIT 36 --#define VC_CAT_INODE 38 -- --#define VC_CAT_VSTAT 40 --#define VC_CAT_VINFO 46 --#define VC_CAT_EVENT 48 -- --#define VC_CAT_FLAGS 52 --#define VC_CAT_VSPACE 54 --#define VC_CAT_DEBUG 56 --#define VC_CAT_RLIMIT 60 -- --#define VC_CAT_SYSTEST 61 --#define VC_CAT_COMPAT 63 -- --/* query version */ -- --#define VCMD_get_version VC_CMD(VERSION, 0, 0) --#define VCMD_get_vci VC_CMD(VERSION, 1, 0) -- -+#ifndef _VSERVER_SWITCH_H -+#define _VSERVER_SWITCH_H - --#ifdef __KERNEL__ - - #include -+#include - --#endif /* __KERNEL__ */ -- --#endif /* _VX_SWITCH_H */ -- -+#endif /* _VSERVER_SWITCH_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/linux/vserver/tag_cmd.h linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/tag_cmd.h ---- linux-3.7-vs2.3.5.1.3/include/linux/vserver/tag_cmd.h 2012-12-11 15:56:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/linux/vserver/tag_cmd.h 2012-12-13 22:29:23.000000000 +0000 -@@ -1,22 +1,10 @@ --#ifndef _VX_TAG_CMD_H --#define _VX_TAG_CMD_H -- -- --/* vinfo commands */ -+#ifndef _VSERVER_TAG_CMD_H -+#define _VSERVER_TAG_CMD_H - --#define VCMD_task_tag VC_CMD(VINFO, 3, 0) -+#include - --#ifdef __KERNEL__ - extern int vc_task_tag(uint32_t); - --#endif /* __KERNEL__ */ -- --/* context commands */ -- --#define VCMD_tag_migrate VC_CMD(TAGMIG, 1, 0) -- --#ifdef __KERNEL__ - extern int vc_tag_migrate(uint32_t); - --#endif /* __KERNEL__ */ --#endif /* _VX_TAG_CMD_H */ -+#endif /* _VSERVER_TAG_CMD_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/uapi/Kbuild linux-3.7-vs2.3.5.1.3-uapi/include/uapi/Kbuild ---- linux-3.7-vs2.3.5.1.3/include/uapi/Kbuild 2012-12-11 15:47:47.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/uapi/Kbuild 2012-12-13 21:33:11.000000000 +0000 -@@ -12,3 +12,4 @@ header-y += video/ - header-y += drm/ - header-y += xen/ - header-y += scsi/ -+header-y += vserver/ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/uapi/vserver/Kbuild linux-3.7-vs2.3.5.1.3-uapi/include/uapi/vserver/Kbuild ---- linux-3.7-vs2.3.5.1.3/include/uapi/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/uapi/vserver/Kbuild 2012-12-13 21:48:50.000000000 +0000 -@@ -0,0 +1,9 @@ -+ -+header-y += context_cmd.h network_cmd.h space_cmd.h \ -+ cacct_cmd.h cvirt_cmd.h limit_cmd.h dlimit_cmd.h \ -+ inode_cmd.h tag_cmd.h sched_cmd.h signal_cmd.h \ -+ debug_cmd.h device_cmd.h -+ -+header-y += switch.h context.h network.h monitor.h \ -+ limit.h inode.h device.h -+ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/uapi/vserver/cacct_cmd.h linux-3.7-vs2.3.5.1.3-uapi/include/uapi/vserver/cacct_cmd.h ---- linux-3.7-vs2.3.5.1.3/include/uapi/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/uapi/vserver/cacct_cmd.h 2012-12-13 22:22:21.000000000 +0000 -@@ -0,0 +1,15 @@ -+#ifndef _UAPI_VS_CACCT_CMD_H -+#define _UAPI_VS_CACCT_CMD_H -+ -+ -+/* virtual host info name commands */ -+ -+#define VCMD_sock_stat VC_CMD(VSTAT, 5, 0) -+ -+struct vcmd_sock_stat_v0 { -+ uint32_t field; -+ uint32_t count[3]; -+ uint64_t total[3]; -+}; -+ -+#endif /* _UAPI_VS_CACCT_CMD_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/uapi/vserver/context.h linux-3.7-vs2.3.5.1.3-uapi/include/uapi/vserver/context.h ---- linux-3.7-vs2.3.5.1.3/include/uapi/vserver/context.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/uapi/vserver/context.h 2012-12-13 22:22:21.000000000 +0000 -@@ -0,0 +1,80 @@ -+#ifndef _UAPI_VS_CONTEXT_H -+#define _UAPI_VS_CONTEXT_H -+ -+#include -+#include -+ -+ -+/* context flags */ -+ -+#define VXF_INFO_SCHED 0x00000002 -+#define VXF_INFO_NPROC 0x00000004 -+#define VXF_INFO_PRIVATE 0x00000008 -+ -+#define VXF_INFO_INIT 0x00000010 -+#define VXF_INFO_HIDE 0x00000020 -+#define VXF_INFO_ULIMIT 0x00000040 -+#define VXF_INFO_NSPACE 0x00000080 -+ -+#define VXF_SCHED_HARD 0x00000100 -+#define VXF_SCHED_PRIO 0x00000200 -+#define VXF_SCHED_PAUSE 0x00000400 -+ -+#define VXF_VIRT_MEM 0x00010000 -+#define VXF_VIRT_UPTIME 0x00020000 -+#define VXF_VIRT_CPU 0x00040000 -+#define VXF_VIRT_LOAD 0x00080000 -+#define VXF_VIRT_TIME 0x00100000 -+ -+#define VXF_HIDE_MOUNT 0x01000000 -+/* was VXF_HIDE_NETIF 0x02000000 */ -+#define VXF_HIDE_VINFO 0x04000000 -+ -+#define VXF_STATE_SETUP (1ULL << 32) -+#define VXF_STATE_INIT (1ULL << 33) -+#define VXF_STATE_ADMIN (1ULL << 34) -+ -+#define VXF_SC_HELPER (1ULL << 36) -+#define VXF_REBOOT_KILL (1ULL << 37) -+#define VXF_PERSISTENT (1ULL << 38) -+ -+#define VXF_FORK_RSS (1ULL << 48) -+#define VXF_PROLIFIC (1ULL << 49) -+ -+#define VXF_IGNEG_NICE (1ULL << 52) -+ -+#define VXF_ONE_TIME (0x0007ULL << 32) -+ -+#define VXF_INIT_SET (VXF_STATE_SETUP | VXF_STATE_INIT | VXF_STATE_ADMIN) -+ -+ -+/* context migration */ -+ -+#define VXM_SET_INIT 0x00000001 -+#define VXM_SET_REAPER 0x00000002 -+ -+/* context caps */ -+ -+#define VXC_SET_UTSNAME 0x00000001 -+#define VXC_SET_RLIMIT 0x00000002 -+#define VXC_FS_SECURITY 0x00000004 -+#define VXC_FS_TRUSTED 0x00000008 -+#define VXC_TIOCSTI 0x00000010 -+ -+/* was VXC_RAW_ICMP 0x00000100 */ -+#define VXC_SYSLOG 0x00001000 -+#define VXC_OOM_ADJUST 0x00002000 -+#define VXC_AUDIT_CONTROL 0x00004000 -+ -+#define VXC_SECURE_MOUNT 0x00010000 -+#define VXC_SECURE_REMOUNT 0x00020000 -+#define VXC_BINARY_MOUNT 0x00040000 -+ -+#define VXC_QUOTA_CTL 0x00100000 -+#define VXC_ADMIN_MAPPER 0x00200000 -+#define VXC_ADMIN_CLOOP 0x00400000 -+ -+#define VXC_KTHREAD 0x01000000 -+#define VXC_NAMESPACE 0x02000000 -+ -+#endif /* _UAPI_VS_CONTEXT_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/uapi/vserver/context_cmd.h linux-3.7-vs2.3.5.1.3-uapi/include/uapi/vserver/context_cmd.h ---- linux-3.7-vs2.3.5.1.3/include/uapi/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/uapi/vserver/context_cmd.h 2012-12-13 22:22:21.000000000 +0000 -@@ -0,0 +1,115 @@ -+#ifndef _UAPI_VS_CONTEXT_CMD_H -+#define _UAPI_VS_CONTEXT_CMD_H -+ -+ -+/* vinfo commands */ -+ -+#define VCMD_task_xid VC_CMD(VINFO, 1, 0) -+ -+ -+#define VCMD_vx_info VC_CMD(VINFO, 5, 0) -+ -+struct vcmd_vx_info_v0 { -+ uint32_t xid; -+ uint32_t initpid; -+ /* more to come */ -+}; -+ -+ -+#define VCMD_ctx_stat VC_CMD(VSTAT, 0, 0) -+ -+struct vcmd_ctx_stat_v0 { -+ uint32_t usecnt; -+ uint32_t tasks; -+ /* more to come */ -+}; -+ -+ -+/* context commands */ -+ -+#define VCMD_ctx_create_v0 VC_CMD(VPROC, 1, 0) -+#define VCMD_ctx_create VC_CMD(VPROC, 1, 1) -+ -+struct vcmd_ctx_create { -+ uint64_t flagword; -+}; -+ -+#define VCMD_ctx_migrate_v0 VC_CMD(PROCMIG, 1, 0) -+#define VCMD_ctx_migrate VC_CMD(PROCMIG, 1, 1) -+ -+struct vcmd_ctx_migrate { -+ uint64_t flagword; -+}; -+ -+ -+ -+/* flag commands */ -+ -+#define VCMD_get_cflags VC_CMD(FLAGS, 1, 0) -+#define VCMD_set_cflags VC_CMD(FLAGS, 2, 0) -+ -+struct vcmd_ctx_flags_v0 { -+ uint64_t flagword; -+ uint64_t mask; -+}; -+ -+ -+ -+/* context caps commands */ -+ -+#define VCMD_get_ccaps VC_CMD(FLAGS, 3, 1) -+#define VCMD_set_ccaps VC_CMD(FLAGS, 4, 1) -+ -+struct vcmd_ctx_caps_v1 { -+ uint64_t ccaps; -+ uint64_t cmask; -+}; -+ -+ -+ -+/* bcaps commands */ -+ -+#define VCMD_get_bcaps VC_CMD(FLAGS, 9, 0) -+#define VCMD_set_bcaps VC_CMD(FLAGS, 10, 0) -+ -+struct vcmd_bcaps { -+ uint64_t bcaps; -+ uint64_t bmask; -+}; -+ -+ -+ -+/* umask commands */ -+ -+#define VCMD_get_umask VC_CMD(FLAGS, 13, 0) -+#define VCMD_set_umask VC_CMD(FLAGS, 14, 0) -+ -+struct vcmd_umask { -+ uint64_t umask; -+ uint64_t mask; -+}; -+ -+ -+ -+/* wmask commands */ -+ -+#define VCMD_get_wmask VC_CMD(FLAGS, 15, 0) -+#define VCMD_set_wmask VC_CMD(FLAGS, 16, 0) -+ -+struct vcmd_wmask { -+ uint64_t wmask; -+ uint64_t mask; -+}; -+ -+ -+ -+/* OOM badness */ -+ -+#define VCMD_get_badness VC_CMD(MEMCTRL, 5, 0) -+#define VCMD_set_badness VC_CMD(MEMCTRL, 6, 0) -+ -+struct vcmd_badness_v0 { -+ int64_t bias; -+}; -+ -+#endif /* _UAPI_VS_CONTEXT_CMD_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/uapi/vserver/cvirt_cmd.h linux-3.7-vs2.3.5.1.3-uapi/include/uapi/vserver/cvirt_cmd.h ---- linux-3.7-vs2.3.5.1.3/include/uapi/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/uapi/vserver/cvirt_cmd.h 2012-12-13 22:22:21.000000000 +0000 -@@ -0,0 +1,41 @@ -+#ifndef _UAPI_VS_CVIRT_CMD_H -+#define _UAPI_VS_CVIRT_CMD_H -+ -+ -+/* virtual host info name commands */ -+ -+#define VCMD_set_vhi_name VC_CMD(VHOST, 1, 0) -+#define VCMD_get_vhi_name VC_CMD(VHOST, 2, 0) -+ -+struct vcmd_vhi_name_v0 { -+ uint32_t field; -+ char name[65]; -+}; -+ -+ -+enum vhi_name_field { -+ VHIN_CONTEXT = 0, -+ VHIN_SYSNAME, -+ VHIN_NODENAME, -+ VHIN_RELEASE, -+ VHIN_VERSION, -+ VHIN_MACHINE, -+ VHIN_DOMAINNAME, -+}; -+ -+ -+ -+#define VCMD_virt_stat VC_CMD(VSTAT, 3, 0) -+ -+struct vcmd_virt_stat_v0 { -+ uint64_t offset; -+ uint64_t uptime; -+ uint32_t nr_threads; -+ uint32_t nr_running; -+ uint32_t nr_uninterruptible; -+ uint32_t nr_onhold; -+ uint32_t nr_forks; -+ uint32_t load[3]; -+}; -+ -+#endif /* _UAPI_VS_CVIRT_CMD_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/uapi/vserver/debug_cmd.h linux-3.7-vs2.3.5.1.3-uapi/include/uapi/vserver/debug_cmd.h ---- linux-3.7-vs2.3.5.1.3/include/uapi/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/uapi/vserver/debug_cmd.h 2012-12-13 22:22:21.000000000 +0000 -@@ -0,0 +1,24 @@ -+#ifndef _UAPI_VS_DEBUG_CMD_H -+#define _UAPI_VS_DEBUG_CMD_H -+ -+ -+/* debug commands */ -+ -+#define VCMD_dump_history VC_CMD(DEBUG, 1, 0) -+ -+#define VCMD_read_history VC_CMD(DEBUG, 5, 0) -+#define VCMD_read_monitor VC_CMD(DEBUG, 6, 0) -+ -+struct vcmd_read_history_v0 { -+ uint32_t index; -+ uint32_t count; -+ char __user *data; -+}; ++ case VCMD_get_space_mask_v0: ++ return vc_get_space_mask(data, 0); ++ /* this is version 1 */ ++ case VCMD_get_space_mask: ++ return vc_get_space_mask(data, 1); + -+struct vcmd_read_monitor_v0 { -+ uint32_t index; -+ uint32_t count; -+ char __user *data; -+}; ++ case VCMD_get_space_default: ++ return vc_get_space_mask(data, -1); + -+#endif /* _UAPI_VS_DEBUG_CMD_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/uapi/vserver/device.h linux-3.7-vs2.3.5.1.3-uapi/include/uapi/vserver/device.h ---- linux-3.7-vs2.3.5.1.3/include/uapi/vserver/device.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/uapi/vserver/device.h 2012-12-13 22:22:21.000000000 +0000 -@@ -0,0 +1,12 @@ -+#ifndef _UAPI_VS_DEVICE_H -+#define _UAPI_VS_DEVICE_H ++ case VCMD_set_umask: ++ return vc_set_umask(vxi, data); + ++ case VCMD_get_umask: ++ return vc_get_umask(vxi, data); + -+#define DATTR_CREATE 0x00000001 -+#define DATTR_OPEN 0x00000002 ++ case VCMD_set_wmask: ++ return vc_set_wmask(vxi, data); + -+#define DATTR_REMAP 0x00000010 ++ case VCMD_get_wmask: ++ return vc_get_wmask(vxi, data); ++#ifdef CONFIG_IA32_EMULATION ++ case VCMD_get_rlimit: ++ return __COMPAT(vc_get_rlimit, vxi, data, compat); ++ case VCMD_set_rlimit: ++ return __COMPAT(vc_set_rlimit, vxi, data, compat); ++#else ++ case VCMD_get_rlimit: ++ return vc_get_rlimit(vxi, data); ++ case VCMD_set_rlimit: ++ return vc_set_rlimit(vxi, data); ++#endif ++ case VCMD_get_rlimit_mask: ++ return vc_get_rlimit_mask(id, data); ++ case VCMD_reset_hits: ++ return vc_reset_hits(vxi, data); ++ case VCMD_reset_minmax: ++ return vc_reset_minmax(vxi, data); + -+#define DATTR_MASK 0x00000013 ++ case VCMD_get_vhi_name: ++ return vc_get_vhi_name(vxi, data); ++ case VCMD_set_vhi_name: ++ return vc_set_vhi_name(vxi, data); + -+#endif /* _UAPI_VS_DEVICE_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/uapi/vserver/device_cmd.h linux-3.7-vs2.3.5.1.3-uapi/include/uapi/vserver/device_cmd.h ---- linux-3.7-vs2.3.5.1.3/include/uapi/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/uapi/vserver/device_cmd.h 2012-12-13 22:22:21.000000000 +0000 -@@ -0,0 +1,16 @@ -+#ifndef _UAPI_VS_DEVICE_CMD_H -+#define _UAPI_VS_DEVICE_CMD_H ++ case VCMD_ctx_stat: ++ return vc_ctx_stat(vxi, data); ++ case VCMD_virt_stat: ++ return vc_virt_stat(vxi, data); ++ case VCMD_sock_stat: ++ return vc_sock_stat(vxi, data); ++ case VCMD_rlimit_stat: ++ return vc_rlimit_stat(vxi, data); + ++ case VCMD_set_cflags: ++ return vc_set_cflags(vxi, data); ++ case VCMD_get_cflags: ++ return vc_get_cflags(vxi, data); + -+/* device vserver commands */ ++ /* this is version 1 */ ++ case VCMD_set_ccaps: ++ return vc_set_ccaps(vxi, data); ++ /* this is version 1 */ ++ case VCMD_get_ccaps: ++ return vc_get_ccaps(vxi, data); ++ case VCMD_set_bcaps: ++ return vc_set_bcaps(vxi, data); ++ case VCMD_get_bcaps: ++ return vc_get_bcaps(vxi, data); + -+#define VCMD_set_mapping VC_CMD(DEVICE, 1, 0) -+#define VCMD_unset_mapping VC_CMD(DEVICE, 2, 0) ++ case VCMD_set_badness: ++ return vc_set_badness(vxi, data); ++ case VCMD_get_badness: ++ return vc_get_badness(vxi, data); + -+struct vcmd_set_mapping_v0 { -+ const char __user *device; -+ const char __user *target; -+ uint32_t flags; -+}; ++ case VCMD_set_nflags: ++ return vc_set_nflags(nxi, data); ++ case VCMD_get_nflags: ++ return vc_get_nflags(nxi, data); + -+#endif /* _UAPI_VS_DEVICE_CMD_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/uapi/vserver/dlimit_cmd.h linux-3.7-vs2.3.5.1.3-uapi/include/uapi/vserver/dlimit_cmd.h ---- linux-3.7-vs2.3.5.1.3/include/uapi/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/uapi/vserver/dlimit_cmd.h 2012-12-13 22:22:21.000000000 +0000 -@@ -0,0 +1,67 @@ -+#ifndef _UAPI_VS_DLIMIT_CMD_H -+#define _UAPI_VS_DLIMIT_CMD_H ++ case VCMD_set_ncaps: ++ return vc_set_ncaps(nxi, data); ++ case VCMD_get_ncaps: ++ return vc_get_ncaps(nxi, data); + ++ case VCMD_set_prio_bias: ++ return vc_set_prio_bias(vxi, data); ++ case VCMD_get_prio_bias: ++ return vc_get_prio_bias(vxi, data); ++ case VCMD_add_dlimit: ++ return __COMPAT(vc_add_dlimit, id, data, compat); ++ case VCMD_rem_dlimit: ++ return __COMPAT(vc_rem_dlimit, id, data, compat); ++ case VCMD_set_dlimit: ++ return __COMPAT(vc_set_dlimit, id, data, compat); ++ case VCMD_get_dlimit: ++ return __COMPAT(vc_get_dlimit, id, data, compat); + -+/* dlimit vserver commands */ ++ case VCMD_ctx_kill: ++ return vc_ctx_kill(vxi, data); + -+#define VCMD_add_dlimit VC_CMD(DLIMIT, 1, 0) -+#define VCMD_rem_dlimit VC_CMD(DLIMIT, 2, 0) ++ case VCMD_wait_exit: ++ return vc_wait_exit(vxi, data); + -+#define VCMD_set_dlimit VC_CMD(DLIMIT, 5, 0) -+#define VCMD_get_dlimit VC_CMD(DLIMIT, 6, 0) ++ case VCMD_get_iattr: ++ return __COMPAT_NO_ID(vc_get_iattr, data, compat); ++ case VCMD_set_iattr: ++ return __COMPAT_NO_ID(vc_set_iattr, data, compat); + -+struct vcmd_ctx_dlimit_base_v0 { -+ const char __user *name; -+ uint32_t flags; -+}; ++ case VCMD_fget_iattr: ++ return vc_fget_iattr(id, data); ++ case VCMD_fset_iattr: ++ return vc_fset_iattr(id, data); + -+struct vcmd_ctx_dlimit_v0 { -+ const char __user *name; -+ uint32_t space_used; /* used space in kbytes */ -+ uint32_t space_total; /* maximum space in kbytes */ -+ uint32_t inodes_used; /* used inodes */ -+ uint32_t inodes_total; /* maximum inodes */ -+ uint32_t reserved; /* reserved for root in % */ -+ uint32_t flags; -+}; ++ case VCMD_enter_space_v0: ++ return vc_enter_space_v1(vxi, NULL); ++ case VCMD_enter_space_v1: ++ return vc_enter_space_v1(vxi, data); ++ /* this is version 2 */ ++ case VCMD_enter_space: ++ return vc_enter_space(vxi, data); + -+#define CDLIM_UNSET ((uint32_t)0UL) -+#define CDLIM_INFINITY ((uint32_t)~0UL) -+#define CDLIM_KEEP ((uint32_t)~1UL) ++ case VCMD_ctx_create_v0: ++ return vc_ctx_create(id, NULL); ++ case VCMD_ctx_create: ++ return vc_ctx_create(id, data); ++ case VCMD_ctx_migrate_v0: ++ return vc_ctx_migrate(vxi, NULL); ++ case VCMD_ctx_migrate: ++ return vc_ctx_migrate(vxi, data); + -+#define DLIME_UNIT 0 -+#define DLIME_KILO 1 -+#define DLIME_MEGA 2 -+#define DLIME_GIGA 3 ++ case VCMD_net_create_v0: ++ return vc_net_create(id, NULL); ++ case VCMD_net_create: ++ return vc_net_create(id, data); ++ case VCMD_net_migrate: ++ return vc_net_migrate(nxi, data); + -+#define DLIMF_SHIFT 0x10 ++ case VCMD_tag_migrate: ++ return vc_tag_migrate(id); + -+#define DLIMS_USED 0 -+#define DLIMS_TOTAL 2 ++ case VCMD_net_add: ++ return vc_net_add(nxi, data); ++ case VCMD_net_remove: ++ return vc_net_remove(nxi, data); + -+static inline -+uint64_t dlimit_space_32to64(uint32_t val, uint32_t flags, int shift) -+{ -+ int exp = (flags & DLIMF_SHIFT) ? -+ (flags >> shift) & DLIME_GIGA : DLIME_KILO; -+ return ((uint64_t)val) << (10 * exp); -+} ++ case VCMD_net_add_ipv4_v1: ++ return vc_net_add_ipv4_v1(nxi, data); ++ /* this is version 2 */ ++ case VCMD_net_add_ipv4: ++ return vc_net_add_ipv4(nxi, data); + -+static inline -+uint32_t dlimit_space_64to32(uint64_t val, uint32_t *flags, int shift) -+{ -+ int exp = 0; ++ case VCMD_net_rem_ipv4_v1: ++ return vc_net_rem_ipv4_v1(nxi, data); ++ /* this is version 2 */ ++ case VCMD_net_rem_ipv4: ++ return vc_net_rem_ipv4(nxi, data); ++#ifdef CONFIG_IPV6 ++ case VCMD_net_add_ipv6: ++ return vc_net_add_ipv6(nxi, data); ++ case VCMD_net_remove_ipv6: ++ return vc_net_remove_ipv6(nxi, data); ++#endif ++/* case VCMD_add_match_ipv4: ++ return vc_add_match_ipv4(nxi, data); ++ case VCMD_get_match_ipv4: ++ return vc_get_match_ipv4(nxi, data); ++#ifdef CONFIG_IPV6 ++ case VCMD_add_match_ipv6: ++ return vc_add_match_ipv6(nxi, data); ++ case VCMD_get_match_ipv6: ++ return vc_get_match_ipv6(nxi, data); ++#endif */ + -+ if (*flags & DLIMF_SHIFT) { -+ while (val > (1LL << 32) && (exp < 3)) { -+ val >>= 10; -+ exp++; -+ } -+ *flags &= ~(DLIME_GIGA << shift); -+ *flags |= exp << shift; -+ } else -+ val >>= 10; -+ return val; ++#ifdef CONFIG_VSERVER_DEVICE ++ case VCMD_set_mapping: ++ return __COMPAT(vc_set_mapping, vxi, data, compat); ++ case VCMD_unset_mapping: ++ return __COMPAT(vc_unset_mapping, vxi, data, compat); ++#endif ++#ifdef CONFIG_VSERVER_HISTORY ++ case VCMD_dump_history: ++ return vc_dump_history(id); ++ case VCMD_read_history: ++ return __COMPAT(vc_read_history, id, data, compat); ++#endif ++ default: ++ vxwprintk_task(1, "unimplemented VCMD_%02d_%d[%d]", ++ VC_CATEGORY(cmd), VC_COMMAND(cmd), VC_VERSION(cmd)); ++ } ++ return -ENOSYS; +} + -+#endif /* _UAPI_VS_DLIMIT_CMD_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/uapi/vserver/inode.h linux-3.7-vs2.3.5.1.3-uapi/include/uapi/vserver/inode.h ---- linux-3.7-vs2.3.5.1.3/include/uapi/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/uapi/vserver/inode.h 2012-12-13 22:22:21.000000000 +0000 -@@ -0,0 +1,23 @@ -+#ifndef _UAPI_VS_INODE_H -+#define _UAPI_VS_INODE_H + ++#define __VCMD(vcmd, _perm, _args, _flags) \ ++ case VCMD_ ## vcmd: perm = _perm; \ ++ args = _args; flags = _flags; break + -+#define IATTR_TAG 0x01000000 -+ -+#define IATTR_ADMIN 0x00000001 -+#define IATTR_WATCH 0x00000002 -+#define IATTR_HIDE 0x00000004 -+#define IATTR_FLAGS 0x00000007 + -+#define IATTR_BARRIER 0x00010000 -+#define IATTR_IXUNLINK 0x00020000 -+#define IATTR_IMMUTABLE 0x00040000 -+#define IATTR_COW 0x00080000 ++#define VCA_NONE 0x00 ++#define VCA_VXI 0x01 ++#define VCA_NXI 0x02 + ++#define VCF_NONE 0x00 ++#define VCF_INFO 0x01 ++#define VCF_ADMIN 0x02 ++#define VCF_ARES 0x06 /* includes admin */ ++#define VCF_SETUP 0x08 + -+/* inode ioctls */ ++#define VCF_ZIDOK 0x10 /* zero id okay */ + -+#define FIOC_GETXFLG _IOR('x', 5, long) -+#define FIOC_SETXFLG _IOW('x', 6, long) + -+#endif /* _UAPI_VS_INODE_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/uapi/vserver/inode_cmd.h linux-3.7-vs2.3.5.1.3-uapi/include/uapi/vserver/inode_cmd.h ---- linux-3.7-vs2.3.5.1.3/include/uapi/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/uapi/vserver/inode_cmd.h 2012-12-13 22:22:21.000000000 +0000 -@@ -0,0 +1,26 @@ -+#ifndef _UAPI_VS_INODE_CMD_H -+#define _UAPI_VS_INODE_CMD_H ++static inline ++long do_vserver(uint32_t cmd, uint32_t id, void __user *data, int compat) ++{ ++ long ret; ++ int permit = -1, state = 0; ++ int perm = -1, args = 0, flags = 0; ++ struct vx_info *vxi = NULL; ++ struct nx_info *nxi = NULL; + ++ switch (cmd) { ++ /* unpriviledged commands */ ++ __VCMD(get_version, 0, VCA_NONE, 0); ++ __VCMD(get_vci, 0, VCA_NONE, 0); ++ __VCMD(get_rlimit_mask, 0, VCA_NONE, 0); ++ __VCMD(get_space_mask_v0,0, VCA_NONE, 0); ++ __VCMD(get_space_mask, 0, VCA_NONE, 0); ++ __VCMD(get_space_default,0, VCA_NONE, 0); + -+/* inode vserver commands */ ++ /* info commands */ ++ __VCMD(task_xid, 2, VCA_NONE, 0); ++ __VCMD(reset_hits, 2, VCA_VXI, 0); ++ __VCMD(reset_minmax, 2, VCA_VXI, 0); ++ __VCMD(vx_info, 3, VCA_VXI, VCF_INFO); ++ __VCMD(get_bcaps, 3, VCA_VXI, VCF_INFO); ++ __VCMD(get_ccaps, 3, VCA_VXI, VCF_INFO); ++ __VCMD(get_cflags, 3, VCA_VXI, VCF_INFO); ++ __VCMD(get_umask, 3, VCA_VXI, VCF_INFO); ++ __VCMD(get_wmask, 3, VCA_VXI, VCF_INFO); ++ __VCMD(get_badness, 3, VCA_VXI, VCF_INFO); ++ __VCMD(get_vhi_name, 3, VCA_VXI, VCF_INFO); ++ __VCMD(get_rlimit, 3, VCA_VXI, VCF_INFO); + -+#define VCMD_get_iattr VC_CMD(INODE, 1, 1) -+#define VCMD_set_iattr VC_CMD(INODE, 2, 1) ++ __VCMD(ctx_stat, 3, VCA_VXI, VCF_INFO); ++ __VCMD(virt_stat, 3, VCA_VXI, VCF_INFO); ++ __VCMD(sock_stat, 3, VCA_VXI, VCF_INFO); ++ __VCMD(rlimit_stat, 3, VCA_VXI, VCF_INFO); + -+#define VCMD_fget_iattr VC_CMD(INODE, 3, 0) -+#define VCMD_fset_iattr VC_CMD(INODE, 4, 0) ++ __VCMD(task_nid, 2, VCA_NONE, 0); ++ __VCMD(nx_info, 3, VCA_NXI, VCF_INFO); ++ __VCMD(get_ncaps, 3, VCA_NXI, VCF_INFO); ++ __VCMD(get_nflags, 3, VCA_NXI, VCF_INFO); + -+struct vcmd_ctx_iattr_v1 { -+ const char __user *name; -+ uint32_t tag; -+ uint32_t flags; -+ uint32_t mask; -+}; ++ __VCMD(task_tag, 2, VCA_NONE, 0); + -+struct vcmd_ctx_fiattr_v0 { -+ uint32_t tag; -+ uint32_t flags; -+ uint32_t mask; -+}; ++ __VCMD(get_iattr, 2, VCA_NONE, 0); ++ __VCMD(fget_iattr, 2, VCA_NONE, 0); ++ __VCMD(get_dlimit, 3, VCA_NONE, VCF_INFO); ++ __VCMD(get_prio_bias, 3, VCA_VXI, VCF_INFO); + -+#endif /* _UAPI_VS_INODE_CMD_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/uapi/vserver/limit.h linux-3.7-vs2.3.5.1.3-uapi/include/uapi/vserver/limit.h ---- linux-3.7-vs2.3.5.1.3/include/uapi/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/uapi/vserver/limit.h 2012-12-13 22:22:21.000000000 +0000 -@@ -0,0 +1,14 @@ -+#ifndef _UAPI_VS_LIMIT_H -+#define _UAPI_VS_LIMIT_H ++ /* lower admin commands */ ++ __VCMD(wait_exit, 4, VCA_VXI, VCF_INFO); ++ __VCMD(ctx_create_v0, 5, VCA_NONE, 0); ++ __VCMD(ctx_create, 5, VCA_NONE, 0); ++ __VCMD(ctx_migrate_v0, 5, VCA_VXI, VCF_ADMIN); ++ __VCMD(ctx_migrate, 5, VCA_VXI, VCF_ADMIN); ++ __VCMD(enter_space_v0, 5, VCA_VXI, VCF_ADMIN); ++ __VCMD(enter_space_v1, 5, VCA_VXI, VCF_ADMIN); ++ __VCMD(enter_space, 5, VCA_VXI, VCF_ADMIN); + ++ __VCMD(net_create_v0, 5, VCA_NONE, 0); ++ __VCMD(net_create, 5, VCA_NONE, 0); ++ __VCMD(net_migrate, 5, VCA_NXI, VCF_ADMIN); + -+#define VLIMIT_NSOCK 16 -+#define VLIMIT_OPENFD 17 -+#define VLIMIT_ANON 18 -+#define VLIMIT_SHMEM 19 -+#define VLIMIT_SEMARY 20 -+#define VLIMIT_NSEMS 21 -+#define VLIMIT_DENTRY 22 -+#define VLIMIT_MAPPED 23 ++ __VCMD(tag_migrate, 5, VCA_NONE, VCF_ADMIN); + -+#endif /* _UAPI_VS_LIMIT_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/uapi/vserver/limit_cmd.h linux-3.7-vs2.3.5.1.3-uapi/include/uapi/vserver/limit_cmd.h ---- linux-3.7-vs2.3.5.1.3/include/uapi/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/uapi/vserver/limit_cmd.h 2012-12-13 22:22:21.000000000 +0000 -@@ -0,0 +1,40 @@ -+#ifndef _UAPI_VS_LIMIT_CMD_H -+#define _UAPI_VS_LIMIT_CMD_H ++ /* higher admin commands */ ++ __VCMD(ctx_kill, 6, VCA_VXI, VCF_ARES); ++ __VCMD(set_space_v1, 7, VCA_VXI, VCF_ARES | VCF_SETUP); ++ __VCMD(set_space, 7, VCA_VXI, VCF_ARES | VCF_SETUP); + ++ __VCMD(set_ccaps, 7, VCA_VXI, VCF_ARES | VCF_SETUP); ++ __VCMD(set_bcaps, 7, VCA_VXI, VCF_ARES | VCF_SETUP); ++ __VCMD(set_cflags, 7, VCA_VXI, VCF_ARES | VCF_SETUP); ++ __VCMD(set_umask, 7, VCA_VXI, VCF_ARES | VCF_SETUP); ++ __VCMD(set_wmask, 7, VCA_VXI, VCF_ARES | VCF_SETUP); ++ __VCMD(set_badness, 7, VCA_VXI, VCF_ARES | VCF_SETUP); + -+/* rlimit vserver commands */ ++ __VCMD(set_vhi_name, 7, VCA_VXI, VCF_ARES | VCF_SETUP); ++ __VCMD(set_rlimit, 7, VCA_VXI, VCF_ARES | VCF_SETUP); ++ __VCMD(set_prio_bias, 7, VCA_VXI, VCF_ARES | VCF_SETUP); + -+#define VCMD_get_rlimit VC_CMD(RLIMIT, 1, 0) -+#define VCMD_set_rlimit VC_CMD(RLIMIT, 2, 0) -+#define VCMD_get_rlimit_mask VC_CMD(RLIMIT, 3, 0) -+#define VCMD_reset_hits VC_CMD(RLIMIT, 7, 0) -+#define VCMD_reset_minmax VC_CMD(RLIMIT, 9, 0) ++ __VCMD(set_ncaps, 7, VCA_NXI, VCF_ARES | VCF_SETUP); ++ __VCMD(set_nflags, 7, VCA_NXI, VCF_ARES | VCF_SETUP); ++ __VCMD(net_add, 8, VCA_NXI, VCF_ARES | VCF_SETUP); ++ __VCMD(net_remove, 8, VCA_NXI, VCF_ARES | VCF_SETUP); ++ __VCMD(net_add_ipv4_v1, 8, VCA_NXI, VCF_ARES | VCF_SETUP); ++ __VCMD(net_rem_ipv4_v1, 8, VCA_NXI, VCF_ARES | VCF_SETUP); ++ __VCMD(net_add_ipv4, 8, VCA_NXI, VCF_ARES | VCF_SETUP); ++ __VCMD(net_rem_ipv4, 8, VCA_NXI, VCF_ARES | VCF_SETUP); ++#ifdef CONFIG_IPV6 ++ __VCMD(net_add_ipv6, 8, VCA_NXI, VCF_ARES | VCF_SETUP); ++ __VCMD(net_remove_ipv6, 8, VCA_NXI, VCF_ARES | VCF_SETUP); ++#endif ++ __VCMD(set_iattr, 7, VCA_NONE, 0); ++ __VCMD(fset_iattr, 7, VCA_NONE, 0); ++ __VCMD(set_dlimit, 7, VCA_NONE, VCF_ARES); ++ __VCMD(add_dlimit, 8, VCA_NONE, VCF_ARES); ++ __VCMD(rem_dlimit, 8, VCA_NONE, VCF_ARES); + -+struct vcmd_ctx_rlimit_v0 { -+ uint32_t id; -+ uint64_t minimum; -+ uint64_t softlimit; -+ uint64_t maximum; -+}; ++#ifdef CONFIG_VSERVER_DEVICE ++ __VCMD(set_mapping, 8, VCA_VXI, VCF_ARES|VCF_ZIDOK); ++ __VCMD(unset_mapping, 8, VCA_VXI, VCF_ARES|VCF_ZIDOK); ++#endif ++ /* debug level admin commands */ ++#ifdef CONFIG_VSERVER_HISTORY ++ __VCMD(dump_history, 9, VCA_NONE, 0); ++ __VCMD(read_history, 9, VCA_NONE, 0); ++#endif + -+struct vcmd_ctx_rlimit_mask_v0 { -+ uint32_t minimum; -+ uint32_t softlimit; -+ uint32_t maximum; -+}; ++ default: ++ perm = -1; ++ } + -+#define VCMD_rlimit_stat VC_CMD(VSTAT, 1, 0) ++ vxdprintk(VXD_CBIT(switch, 0), ++ "vc: VCMD_%02d_%d[%d], %d,%p [%d,%d,%x,%x]", ++ VC_CATEGORY(cmd), VC_COMMAND(cmd), ++ VC_VERSION(cmd), id, data, compat, ++ perm, args, flags); + -+struct vcmd_rlimit_stat_v0 { -+ uint32_t id; -+ uint32_t hits; -+ uint64_t value; -+ uint64_t minimum; -+ uint64_t maximum; -+}; ++ ret = -ENOSYS; ++ if (perm < 0) ++ goto out; + -+#define CRLIM_UNSET (0ULL) -+#define CRLIM_INFINITY (~0ULL) -+#define CRLIM_KEEP (~1ULL) ++ state = 1; ++ if (!capable(CAP_CONTEXT)) ++ goto out; + -+#endif /* _UAPI_VS_LIMIT_CMD_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/uapi/vserver/monitor.h linux-3.7-vs2.3.5.1.3-uapi/include/uapi/vserver/monitor.h ---- linux-3.7-vs2.3.5.1.3/include/uapi/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/uapi/vserver/monitor.h 2012-12-13 22:45:56.000000000 +0000 -@@ -0,0 +1,96 @@ -+#ifndef _UAPI_VS_MONITOR_H -+#define _UAPI_VS_MONITOR_H ++ state = 2; ++ /* moved here from the individual commands */ ++ ret = -EPERM; ++ if ((perm > 1) && !capable(CAP_SYS_ADMIN)) ++ goto out; + -+#include ++ state = 3; ++ /* vcmd involves resource management */ ++ ret = -EPERM; ++ if ((flags & VCF_ARES) && !capable(CAP_SYS_RESOURCE)) ++ goto out; + ++ state = 4; ++ /* various legacy exceptions */ ++ switch (cmd) { ++ /* will go away when spectator is a cap */ ++ case VCMD_ctx_migrate_v0: ++ case VCMD_ctx_migrate: ++ if (id == 1) { ++ current->xid = 1; ++ ret = 1; ++ goto out; ++ } ++ break; + -+enum { -+ VXM_UNUSED = 0, ++ /* will go away when spectator is a cap */ ++ case VCMD_net_migrate: ++ if (id == 1) { ++ current->nid = 1; ++ ret = 1; ++ goto out; ++ } ++ break; ++ } + -+ VXM_SYNC = 0x10, ++ /* vcmds are fine by default */ ++ permit = 1; + -+ VXM_UPDATE = 0x20, -+ VXM_UPDATE_1, -+ VXM_UPDATE_2, ++ /* admin type vcmds require admin ... */ ++ if (flags & VCF_ADMIN) ++ permit = vx_check(0, VS_ADMIN) ? 1 : 0; + -+ VXM_RQINFO_1 = 0x24, -+ VXM_RQINFO_2, ++ /* ... but setup type vcmds override that */ ++ if (!permit && (flags & VCF_SETUP)) ++ permit = vx_flags(VXF_STATE_SETUP, 0) ? 2 : 0; + -+ VXM_ACTIVATE = 0x40, -+ VXM_DEACTIVATE, -+ VXM_IDLE, ++ state = 5; ++ ret = -EPERM; ++ if (!permit) ++ goto out; + -+ VXM_HOLD = 0x44, -+ VXM_UNHOLD, ++ state = 6; ++ if (!id && (flags & VCF_ZIDOK)) ++ goto skip_id; + -+ VXM_MIGRATE = 0x48, -+ VXM_RESCHED, ++ ret = -ESRCH; ++ if (args & VCA_VXI) { ++ vxi = lookup_vx_info(id); ++ if (!vxi) ++ goto out; + -+ /* all other bits are flags */ -+ VXM_SCHED = 0x80, -+}; ++ if ((flags & VCF_ADMIN) && ++ /* special case kill for shutdown */ ++ (cmd != VCMD_ctx_kill) && ++ /* can context be administrated? */ ++ !vx_info_flags(vxi, VXF_STATE_ADMIN, 0)) { ++ ret = -EACCES; ++ goto out_vxi; ++ } ++ } ++ state = 7; ++ if (args & VCA_NXI) { ++ nxi = lookup_nx_info(id); ++ if (!nxi) ++ goto out_vxi; + -+struct _vxm_update_1 { -+ uint32_t tokens_max; -+ uint32_t fill_rate; -+ uint32_t interval; -+}; ++ if ((flags & VCF_ADMIN) && ++ /* can context be administrated? */ ++ !nx_info_flags(nxi, NXF_STATE_ADMIN, 0)) { ++ ret = -EACCES; ++ goto out_nxi; ++ } ++ } ++skip_id: ++ state = 8; ++ ret = do_vcmd(cmd, id, vxi, nxi, data, compat); + -+struct _vxm_update_2 { -+ uint32_t tokens_min; -+ uint32_t fill_rate; -+ uint32_t interval; -+}; ++out_nxi: ++ if ((args & VCA_NXI) && nxi) ++ put_nx_info(nxi); ++out_vxi: ++ if ((args & VCA_VXI) && vxi) ++ put_vx_info(vxi); ++out: ++ vxdprintk(VXD_CBIT(switch, 1), ++ "vc: VCMD_%02d_%d[%d] = %08lx(%ld) [%d,%d]", ++ VC_CATEGORY(cmd), VC_COMMAND(cmd), ++ VC_VERSION(cmd), ret, ret, state, permit); ++ return ret; ++} + -+struct _vxm_rqinfo_1 { -+ uint16_t running; -+ uint16_t onhold; -+ uint16_t iowait; -+ uint16_t uintr; -+ uint32_t idle_tokens; -+}; ++asmlinkage long ++sys_vserver(uint32_t cmd, uint32_t id, void __user *data) ++{ ++ return do_vserver(cmd, id, data, 0); ++} + -+struct _vxm_rqinfo_2 { -+ uint32_t norm_time; -+ uint32_t idle_time; -+ uint32_t idle_skip; -+}; ++#ifdef CONFIG_COMPAT + -+struct _vxm_sched { -+ uint32_t tokens; -+ uint32_t norm_time; -+ uint32_t idle_time; -+}; ++asmlinkage long ++sys32_vserver(uint32_t cmd, uint32_t id, void __user *data) ++{ ++ return do_vserver(cmd, id, data, 1); ++} + -+struct _vxm_task { -+ uint16_t pid; -+ uint16_t state; -+}; ++#endif /* CONFIG_COMPAT */ +diff -NurpP --minimal linux-3.18.5/kernel/vserver/sysctl.c linux-3.18.5-vs2.3.7.3/kernel/vserver/sysctl.c +--- linux-3.18.5/kernel/vserver/sysctl.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/vserver/sysctl.c 2015-01-19 18:06:52.000000000 +0000 +@@ -0,0 +1,247 @@ ++/* ++ * kernel/vserver/sysctl.c ++ * ++ * Virtual Context Support ++ * ++ * Copyright (C) 2004-2007 Herbert Pötzl ++ * ++ * V0.01 basic structure ++ * ++ */ + -+struct _vxm_event { -+ uint32_t jif; -+ union { -+ uint32_t seq; -+ uint32_t sec; -+ }; -+ union { -+ uint32_t tokens; -+ uint32_t nsec; -+ struct _vxm_task tsk; -+ }; -+}; ++#include ++#include ++#include ++#include ++#include + -+struct _vx_mon_entry { -+ uint16_t type; -+ uint16_t xid; -+ union { -+ struct _vxm_event ev; -+ struct _vxm_sched sd; -+ struct _vxm_update_1 u1; -+ struct _vxm_update_2 u2; -+ struct _vxm_rqinfo_1 q1; -+ struct _vxm_rqinfo_2 q2; -+ }; ++enum { ++ CTL_DEBUG_ERROR = 0, ++ CTL_DEBUG_SWITCH = 1, ++ CTL_DEBUG_XID, ++ CTL_DEBUG_NID, ++ CTL_DEBUG_TAG, ++ CTL_DEBUG_NET, ++ CTL_DEBUG_LIMIT, ++ CTL_DEBUG_CRES, ++ CTL_DEBUG_DLIM, ++ CTL_DEBUG_QUOTA, ++ CTL_DEBUG_CVIRT, ++ CTL_DEBUG_SPACE, ++ CTL_DEBUG_PERM, ++ CTL_DEBUG_MISC, +}; + -+#endif /* _UAPI_VS_MONITOR_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/uapi/vserver/network.h linux-3.7-vs2.3.5.1.3-uapi/include/uapi/vserver/network.h ---- linux-3.7-vs2.3.5.1.3/include/uapi/vserver/network.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/uapi/vserver/network.h 2012-12-13 22:22:21.000000000 +0000 -@@ -0,0 +1,76 @@ -+#ifndef _UAPI_VS_NETWORK_H -+#define _UAPI_VS_NETWORK_H -+ -+#include -+ + -+#define MAX_N_CONTEXT 65535 /* Arbitrary limit */ ++unsigned int vs_debug_switch = 0; ++unsigned int vs_debug_xid = 0; ++unsigned int vs_debug_nid = 0; ++unsigned int vs_debug_tag = 0; ++unsigned int vs_debug_net = 0; ++unsigned int vs_debug_limit = 0; ++unsigned int vs_debug_cres = 0; ++unsigned int vs_debug_dlim = 0; ++unsigned int vs_debug_quota = 0; ++unsigned int vs_debug_cvirt = 0; ++unsigned int vs_debug_space = 0; ++unsigned int vs_debug_perm = 0; ++unsigned int vs_debug_misc = 0; + + -+/* network flags */ ++static struct ctl_table_header *vserver_table_header; ++static struct ctl_table vserver_root_table[]; + -+#define NXF_INFO_PRIVATE 0x00000008 + -+#define NXF_SINGLE_IP 0x00000100 -+#define NXF_LBACK_REMAP 0x00000200 -+#define NXF_LBACK_ALLOW 0x00000400 ++void vserver_register_sysctl(void) ++{ ++ if (!vserver_table_header) { ++ vserver_table_header = register_sysctl_table(vserver_root_table); ++ } + -+#define NXF_HIDE_NETIF 0x02000000 -+#define NXF_HIDE_LBACK 0x04000000 ++} + -+#define NXF_STATE_SETUP (1ULL << 32) -+#define NXF_STATE_ADMIN (1ULL << 34) ++void vserver_unregister_sysctl(void) ++{ ++ if (vserver_table_header) { ++ unregister_sysctl_table(vserver_table_header); ++ vserver_table_header = NULL; ++ } ++} + -+#define NXF_SC_HELPER (1ULL << 36) -+#define NXF_PERSISTENT (1ULL << 38) + -+#define NXF_ONE_TIME (0x0005ULL << 32) ++static int proc_dodebug(struct ctl_table *table, int write, ++ void __user *buffer, size_t *lenp, loff_t *ppos) ++{ ++ char tmpbuf[20], *p, c; ++ unsigned int value; ++ size_t left, len; + ++ if ((*ppos && !write) || !*lenp) { ++ *lenp = 0; ++ return 0; ++ } + -+#define NXF_INIT_SET (__nxf_init_set()) ++ left = *lenp; + -+static inline uint64_t __nxf_init_set(void) { -+ return NXF_STATE_ADMIN -+#ifdef CONFIG_VSERVER_AUTO_LBACK -+ | NXF_LBACK_REMAP -+ | NXF_HIDE_LBACK -+#endif -+#ifdef CONFIG_VSERVER_AUTO_SINGLE -+ | NXF_SINGLE_IP -+#endif -+ | NXF_HIDE_NETIF; -+} ++ if (write) { ++ if (!access_ok(VERIFY_READ, buffer, left)) ++ return -EFAULT; ++ p = (char *)buffer; ++ while (left && __get_user(c, p) >= 0 && isspace(c)) ++ left--, p++; ++ if (!left) ++ goto done; + ++ if (left > sizeof(tmpbuf) - 1) ++ return -EINVAL; ++ if (copy_from_user(tmpbuf, p, left)) ++ return -EFAULT; ++ tmpbuf[left] = '\0'; + -+/* network caps */ ++ for (p = tmpbuf, value = 0; '0' <= *p && *p <= '9'; p++, left--) ++ value = 10 * value + (*p - '0'); ++ if (*p && !isspace(*p)) ++ return -EINVAL; ++ while (left && isspace(*p)) ++ left--, p++; ++ *(unsigned int *)table->data = value; ++ } else { ++ if (!access_ok(VERIFY_WRITE, buffer, left)) ++ return -EFAULT; ++ len = sprintf(tmpbuf, "%d", *(unsigned int *)table->data); ++ if (len > left) ++ len = left; ++ if (__copy_to_user(buffer, tmpbuf, len)) ++ return -EFAULT; ++ if ((left -= len) > 0) { ++ if (put_user('\n', (char *)buffer + len)) ++ return -EFAULT; ++ left--; ++ } ++ } + -+#define NXC_TUN_CREATE 0x00000001 ++done: ++ *lenp -= left; ++ *ppos += *lenp; ++ return 0; ++} + -+#define NXC_RAW_ICMP 0x00000100 ++static int zero; + -+#define NXC_MULTICAST 0x00001000 ++#define CTL_ENTRY(ctl, name) \ ++ { \ ++ .procname = #name, \ ++ .data = &vs_ ## name, \ ++ .maxlen = sizeof(int), \ ++ .mode = 0644, \ ++ .proc_handler = &proc_dodebug, \ ++ .extra1 = &zero, \ ++ .extra2 = &zero, \ ++ } + ++static struct ctl_table vserver_debug_table[] = { ++ CTL_ENTRY(CTL_DEBUG_SWITCH, debug_switch), ++ CTL_ENTRY(CTL_DEBUG_XID, debug_xid), ++ CTL_ENTRY(CTL_DEBUG_NID, debug_nid), ++ CTL_ENTRY(CTL_DEBUG_TAG, debug_tag), ++ CTL_ENTRY(CTL_DEBUG_NET, debug_net), ++ CTL_ENTRY(CTL_DEBUG_LIMIT, debug_limit), ++ CTL_ENTRY(CTL_DEBUG_CRES, debug_cres), ++ CTL_ENTRY(CTL_DEBUG_DLIM, debug_dlim), ++ CTL_ENTRY(CTL_DEBUG_QUOTA, debug_quota), ++ CTL_ENTRY(CTL_DEBUG_CVIRT, debug_cvirt), ++ CTL_ENTRY(CTL_DEBUG_SPACE, debug_space), ++ CTL_ENTRY(CTL_DEBUG_PERM, debug_perm), ++ CTL_ENTRY(CTL_DEBUG_MISC, debug_misc), ++ { 0 } ++}; + -+/* address types */ ++static struct ctl_table vserver_root_table[] = { ++ { ++ .procname = "vserver", ++ .mode = 0555, ++ .child = vserver_debug_table ++ }, ++ { 0 } ++}; + -+#define NXA_TYPE_IPV4 0x0001 -+#define NXA_TYPE_IPV6 0x0002 + -+#define NXA_TYPE_NONE 0x0000 -+#define NXA_TYPE_ANY 0x00FF ++static match_table_t tokens = { ++ { CTL_DEBUG_SWITCH, "switch=%x" }, ++ { CTL_DEBUG_XID, "xid=%x" }, ++ { CTL_DEBUG_NID, "nid=%x" }, ++ { CTL_DEBUG_TAG, "tag=%x" }, ++ { CTL_DEBUG_NET, "net=%x" }, ++ { CTL_DEBUG_LIMIT, "limit=%x" }, ++ { CTL_DEBUG_CRES, "cres=%x" }, ++ { CTL_DEBUG_DLIM, "dlim=%x" }, ++ { CTL_DEBUG_QUOTA, "quota=%x" }, ++ { CTL_DEBUG_CVIRT, "cvirt=%x" }, ++ { CTL_DEBUG_SPACE, "space=%x" }, ++ { CTL_DEBUG_PERM, "perm=%x" }, ++ { CTL_DEBUG_MISC, "misc=%x" }, ++ { CTL_DEBUG_ERROR, NULL } ++}; + -+#define NXA_TYPE_ADDR 0x0010 -+#define NXA_TYPE_MASK 0x0020 -+#define NXA_TYPE_RANGE 0x0040 ++#define HANDLE_CASE(id, name, val) \ ++ case CTL_DEBUG_ ## id: \ ++ vs_debug_ ## name = val; \ ++ printk("vs_debug_" #name "=0x%x\n", val); \ ++ break + -+#define NXA_MASK_ALL (NXA_TYPE_ADDR | NXA_TYPE_MASK | NXA_TYPE_RANGE) + -+#define NXA_MOD_BCAST 0x0100 -+#define NXA_MOD_LBACK 0x0200 ++static int __init vs_debug_setup(char *str) ++{ ++ char *p; ++ int token; + -+#define NXA_LOOPBACK 0x1000 ++ printk("vs_debug_setup(%s)\n", str); ++ while ((p = strsep(&str, ",")) != NULL) { ++ substring_t args[MAX_OPT_ARGS]; ++ unsigned int value; + -+#define NXA_MASK_BIND (NXA_MASK_ALL | NXA_MOD_BCAST | NXA_MOD_LBACK) -+#define NXA_MASK_SHOW (NXA_MASK_ALL | NXA_LOOPBACK) ++ if (!*p) ++ continue; + -+#endif /* _UAPI_VS_NETWORK_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/uapi/vserver/network_cmd.h linux-3.7-vs2.3.5.1.3-uapi/include/uapi/vserver/network_cmd.h ---- linux-3.7-vs2.3.5.1.3/include/uapi/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/uapi/vserver/network_cmd.h 2012-12-13 22:22:21.000000000 +0000 -@@ -0,0 +1,123 @@ -+#ifndef _UAPI_VS_NETWORK_CMD_H -+#define _UAPI_VS_NETWORK_CMD_H ++ token = match_token(p, tokens, args); ++ value = (token > 0) ? simple_strtoul(args[0].from, NULL, 0) : 0; + ++ switch (token) { ++ HANDLE_CASE(SWITCH, switch, value); ++ HANDLE_CASE(XID, xid, value); ++ HANDLE_CASE(NID, nid, value); ++ HANDLE_CASE(TAG, tag, value); ++ HANDLE_CASE(NET, net, value); ++ HANDLE_CASE(LIMIT, limit, value); ++ HANDLE_CASE(CRES, cres, value); ++ HANDLE_CASE(DLIM, dlim, value); ++ HANDLE_CASE(QUOTA, quota, value); ++ HANDLE_CASE(CVIRT, cvirt, value); ++ HANDLE_CASE(SPACE, space, value); ++ HANDLE_CASE(PERM, perm, value); ++ HANDLE_CASE(MISC, misc, value); ++ default: ++ return -EINVAL; ++ break; ++ } ++ } ++ return 1; ++} + -+/* vinfo commands */ ++__setup("vsdebug=", vs_debug_setup); + -+#define VCMD_task_nid VC_CMD(VINFO, 2, 0) + + -+#define VCMD_nx_info VC_CMD(VINFO, 6, 0) ++EXPORT_SYMBOL_GPL(vs_debug_switch); ++EXPORT_SYMBOL_GPL(vs_debug_xid); ++EXPORT_SYMBOL_GPL(vs_debug_nid); ++EXPORT_SYMBOL_GPL(vs_debug_net); ++EXPORT_SYMBOL_GPL(vs_debug_limit); ++EXPORT_SYMBOL_GPL(vs_debug_cres); ++EXPORT_SYMBOL_GPL(vs_debug_dlim); ++EXPORT_SYMBOL_GPL(vs_debug_quota); ++EXPORT_SYMBOL_GPL(vs_debug_cvirt); ++EXPORT_SYMBOL_GPL(vs_debug_space); ++EXPORT_SYMBOL_GPL(vs_debug_perm); ++EXPORT_SYMBOL_GPL(vs_debug_misc); + -+struct vcmd_nx_info_v0 { -+ uint32_t nid; -+ /* more to come */ -+}; +diff -NurpP --minimal linux-3.18.5/kernel/vserver/tag.c linux-3.18.5-vs2.3.7.3/kernel/vserver/tag.c +--- linux-3.18.5/kernel/vserver/tag.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/vserver/tag.c 2015-01-19 10:58:31.000000000 +0000 +@@ -0,0 +1,63 @@ ++/* ++ * linux/kernel/vserver/tag.c ++ * ++ * Virtual Server: Shallow Tag Space ++ * ++ * Copyright (C) 2007 Herbert Pötzl ++ * ++ * V0.01 basic implementation ++ * ++ */ + ++#include ++#include ++#include ++#include + -+#include -+#include ++#include + -+#define VCMD_net_create_v0 VC_CMD(VNET, 1, 0) -+#define VCMD_net_create VC_CMD(VNET, 1, 1) + -+struct vcmd_net_create { -+ uint64_t flagword; -+}; ++int dx_migrate_task(struct task_struct *p, vtag_t tag) ++{ ++ if (!p) ++ BUG(); + -+#define VCMD_net_migrate VC_CMD(NETMIG, 1, 0) ++ vxdprintk(VXD_CBIT(tag, 5), ++ "dx_migrate_task(%p[#%d],#%d)", p, p->tag, tag); + -+#define VCMD_net_add VC_CMD(NETALT, 1, 0) -+#define VCMD_net_remove VC_CMD(NETALT, 2, 0) ++ task_lock(p); ++ p->tag = tag; ++ task_unlock(p); + -+struct vcmd_net_addr_v0 { -+ uint16_t type; -+ uint16_t count; -+ struct in_addr ip[4]; -+ struct in_addr mask[4]; -+}; ++ vxdprintk(VXD_CBIT(tag, 5), ++ "moved task %p into [#%d]", p, tag); ++ return 0; ++} + -+#define VCMD_net_add_ipv4_v1 VC_CMD(NETALT, 1, 1) -+#define VCMD_net_rem_ipv4_v1 VC_CMD(NETALT, 2, 1) ++/* vserver syscall commands below here */ + -+struct vcmd_net_addr_ipv4_v1 { -+ uint16_t type; -+ uint16_t flags; -+ struct in_addr ip; -+ struct in_addr mask; -+}; ++/* taks xid and vx_info functions */ + -+#define VCMD_net_add_ipv4 VC_CMD(NETALT, 1, 2) -+#define VCMD_net_rem_ipv4 VC_CMD(NETALT, 2, 2) + -+struct vcmd_net_addr_ipv4_v2 { -+ uint16_t type; -+ uint16_t flags; -+ struct in_addr ip; -+ struct in_addr ip2; -+ struct in_addr mask; -+}; ++int vc_task_tag(uint32_t id) ++{ ++ vtag_t tag; + -+#define VCMD_net_add_ipv6 VC_CMD(NETALT, 3, 1) -+#define VCMD_net_remove_ipv6 VC_CMD(NETALT, 4, 1) ++ if (id) { ++ struct task_struct *tsk; ++ rcu_read_lock(); ++ tsk = find_task_by_real_pid(id); ++ tag = (tsk) ? tsk->tag : -ESRCH; ++ rcu_read_unlock(); ++ } else ++ tag = dx_current_tag(); ++ return tag; ++} + -+struct vcmd_net_addr_ipv6_v1 { -+ uint16_t type; -+ uint16_t flags; -+ uint32_t prefix; -+ struct in6_addr ip; -+ struct in6_addr mask; -+}; + -+#define VCMD_add_match_ipv4 VC_CMD(NETALT, 5, 0) -+#define VCMD_get_match_ipv4 VC_CMD(NETALT, 6, 0) ++int vc_tag_migrate(uint32_t tag) ++{ ++ return dx_migrate_task(current, tag & 0xFFFF); ++} + -+struct vcmd_match_ipv4_v0 { -+ uint16_t type; -+ uint16_t flags; -+ uint16_t parent; -+ uint16_t prefix; -+ struct in_addr ip; -+ struct in_addr ip2; -+ struct in_addr mask; -+}; + -+#define VCMD_add_match_ipv6 VC_CMD(NETALT, 7, 0) -+#define VCMD_get_match_ipv6 VC_CMD(NETALT, 8, 0) +diff -NurpP --minimal linux-3.18.5/kernel/vserver/vci_config.h linux-3.18.5-vs2.3.7.3/kernel/vserver/vci_config.h +--- linux-3.18.5/kernel/vserver/vci_config.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/kernel/vserver/vci_config.h 2015-01-19 10:58:31.000000000 +0000 +@@ -0,0 +1,80 @@ + -+struct vcmd_match_ipv6_v0 { -+ uint16_t type; -+ uint16_t flags; -+ uint16_t parent; -+ uint16_t prefix; -+ struct in6_addr ip; -+ struct in6_addr ip2; -+ struct in6_addr mask; -+}; ++/* interface version */ + ++#define VCI_VERSION 0x00020308 + + ++enum { ++ VCI_KCBIT_NO_DYNAMIC = 0, + -+/* flag commands */ ++ VCI_KCBIT_PROC_SECURE = 4, ++ /* VCI_KCBIT_HARDCPU = 5, */ ++ /* VCI_KCBIT_IDLELIMIT = 6, */ ++ /* VCI_KCBIT_IDLETIME = 7, */ + -+#define VCMD_get_nflags VC_CMD(FLAGS, 5, 0) -+#define VCMD_set_nflags VC_CMD(FLAGS, 6, 0) ++ VCI_KCBIT_COWBL = 8, ++ VCI_KCBIT_FULLCOWBL = 9, ++ VCI_KCBIT_SPACES = 10, ++ VCI_KCBIT_NETV2 = 11, ++ VCI_KCBIT_MEMCG = 12, ++ VCI_KCBIT_MEMCG_SWAP = 13, + -+struct vcmd_net_flags_v0 { -+ uint64_t flagword; -+ uint64_t mask; ++ VCI_KCBIT_DEBUG = 16, ++ VCI_KCBIT_HISTORY = 20, ++ VCI_KCBIT_TAGGED = 24, ++ VCI_KCBIT_PPTAG = 28, ++ ++ VCI_KCBIT_MORE = 31, +}; + + ++static inline uint32_t vci_kernel_config(void) ++{ ++ return ++ (1 << VCI_KCBIT_NO_DYNAMIC) | + -+/* network caps commands */ ++ /* configured features */ ++#ifdef CONFIG_VSERVER_PROC_SECURE ++ (1 << VCI_KCBIT_PROC_SECURE) | ++#endif ++#ifdef CONFIG_VSERVER_COWBL ++ (1 << VCI_KCBIT_COWBL) | ++ (1 << VCI_KCBIT_FULLCOWBL) | ++#endif ++ (1 << VCI_KCBIT_SPACES) | ++ (1 << VCI_KCBIT_NETV2) | ++#ifdef CONFIG_MEMCG ++ (1 << VCI_KCBIT_MEMCG) | ++#endif ++#ifdef CONFIG_MEMCG_SWAP ++ (1 << VCI_KCBIT_MEMCG_SWAP) | ++#endif + -+#define VCMD_get_ncaps VC_CMD(FLAGS, 7, 0) -+#define VCMD_set_ncaps VC_CMD(FLAGS, 8, 0) ++ /* debug options */ ++#ifdef CONFIG_VSERVER_DEBUG ++ (1 << VCI_KCBIT_DEBUG) | ++#endif ++#ifdef CONFIG_VSERVER_HISTORY ++ (1 << VCI_KCBIT_HISTORY) | ++#endif + -+struct vcmd_net_caps_v0 { -+ uint64_t ncaps; -+ uint64_t cmask; -+}; ++ /* inode context tagging */ ++#if defined(CONFIG_TAGGING_NONE) ++ (0 << VCI_KCBIT_TAGGED) | ++#elif defined(CONFIG_TAGGING_UID16) ++ (1 << VCI_KCBIT_TAGGED) | ++#elif defined(CONFIG_TAGGING_GID16) ++ (2 << VCI_KCBIT_TAGGED) | ++#elif defined(CONFIG_TAGGING_ID24) ++ (3 << VCI_KCBIT_TAGGED) | ++#elif defined(CONFIG_TAGGING_INTERN) ++ (4 << VCI_KCBIT_TAGGED) | ++#elif defined(CONFIG_TAGGING_RUNTIME) ++ (5 << VCI_KCBIT_TAGGED) | ++#else ++ (7 << VCI_KCBIT_TAGGED) | ++#endif ++ (1 << VCI_KCBIT_PPTAG) | ++ 0; ++} + -+#endif /* _UAPI_VS_NETWORK_CMD_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/uapi/vserver/sched_cmd.h linux-3.7-vs2.3.5.1.3-uapi/include/uapi/vserver/sched_cmd.h ---- linux-3.7-vs2.3.5.1.3/include/uapi/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/uapi/vserver/sched_cmd.h 2012-12-13 22:22:21.000000000 +0000 -@@ -0,0 +1,13 @@ -+#ifndef _UAPI_VS_SCHED_CMD_H -+#define _UAPI_VS_SCHED_CMD_H +diff -NurpP --minimal linux-3.18.5/mm/memcontrol.c linux-3.18.5-vs2.3.7.3/mm/memcontrol.c +--- linux-3.18.5/mm/memcontrol.c 2015-01-17 02:40:24.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/mm/memcontrol.c 2015-01-19 11:03:45.000000000 +0000 +@@ -2653,6 +2653,31 @@ static struct mem_cgroup *mem_cgroup_loo + return mem_cgroup_from_id(id); + } + ++u64 mem_cgroup_res_read_u64(struct mem_cgroup *mem, int member) ++{ ++ return res_counter_read_u64(&mem->res, member); ++} + ++u64 mem_cgroup_memsw_read_u64(struct mem_cgroup *mem, int member) ++{ ++ return res_counter_read_u64(&mem->memsw, member); ++} + -+struct vcmd_prio_bias { -+ int32_t cpu_id; -+ int32_t prio_bias; -+}; ++s64 mem_cgroup_stat_read_cache(struct mem_cgroup *mem) ++{ ++ return mem_cgroup_read_stat(mem, MEM_CGROUP_STAT_CACHE); ++} + -+#define VCMD_set_prio_bias VC_CMD(SCHED, 4, 0) -+#define VCMD_get_prio_bias VC_CMD(SCHED, 5, 0) ++s64 mem_cgroup_stat_read_anon(struct mem_cgroup *mem) ++{ ++ return mem_cgroup_read_stat(mem, MEM_CGROUP_STAT_RSS); ++} + -+#endif /* _UAPI_VS_SCHED_CMD_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/uapi/vserver/signal_cmd.h linux-3.7-vs2.3.5.1.3-uapi/include/uapi/vserver/signal_cmd.h ---- linux-3.7-vs2.3.5.1.3/include/uapi/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/uapi/vserver/signal_cmd.h 2012-12-13 22:22:21.000000000 +0000 -@@ -0,0 +1,31 @@ -+#ifndef _UAPI_VS_SIGNAL_CMD_H -+#define _UAPI_VS_SIGNAL_CMD_H ++s64 mem_cgroup_stat_read_mapped(struct mem_cgroup *mem) ++{ ++ return mem_cgroup_read_stat(mem, MEM_CGROUP_STAT_FILE_MAPPED); ++} + + /* + * try_get_mem_cgroup_from_page - look up page's memcg association + * @page: the page +diff -NurpP --minimal linux-3.18.5/mm/oom_kill.c linux-3.18.5-vs2.3.7.3/mm/oom_kill.c +--- linux-3.18.5/mm/oom_kill.c 2015-01-17 02:40:24.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/mm/oom_kill.c 2015-01-19 10:58:31.000000000 +0000 +@@ -35,6 +35,8 @@ + #include + #include + #include ++#include ++#include + + #define CREATE_TRACE_POINTS + #include +@@ -121,11 +123,18 @@ found: + static bool oom_unkillable_task(struct task_struct *p, + const struct mem_cgroup *memcg, const nodemask_t *nodemask) + { +- if (is_global_init(p)) ++ unsigned xid = vx_current_xid(); + -+/* signalling vserver commands */ ++ /* skip the init task, global and per guest */ ++ if (task_is_init(p)) + return true; + if (p->flags & PF_KTHREAD) + return true; + ++ /* skip other guest and host processes if oom in guest */ ++ if (xid && vx_task_xid(p) != xid) ++ return true; + -+#define VCMD_ctx_kill VC_CMD(PROCTRL, 1, 0) -+#define VCMD_wait_exit VC_CMD(EVENT, 99, 0) + /* When mem_cgroup_out_of_memory() and p is not member of the group */ + if (memcg && !task_in_mem_cgroup(p, memcg)) + return true; +@@ -453,8 +462,8 @@ void oom_kill_process(struct task_struct + dump_header(p, gfp_mask, order, memcg, nodemask); + + task_lock(p); +- pr_err("%s: Kill process %d (%s) score %d or sacrifice child\n", +- message, task_pid_nr(p), p->comm, points); ++ pr_err("%s: Kill process %d:#%u (%s) score %d or sacrifice child\n", ++ message, task_pid_nr(p), p->xid, p->comm, points); + task_unlock(p); + + /* +@@ -497,8 +506,8 @@ void oom_kill_process(struct task_struct + + /* mm cannot safely be dereferenced after task_unlock(victim) */ + mm = victim->mm; +- pr_err("Killed process %d (%s) total-vm:%lukB, anon-rss:%lukB, file-rss:%lukB\n", +- task_pid_nr(victim), victim->comm, K(victim->mm->total_vm), ++ pr_err("Killed process %d:#%u (%s) total-vm:%lukB, anon-rss:%lukB, file-rss:%lukB\n", ++ task_pid_nr(victim), victim->xid, victim->comm, K(victim->mm->total_vm), + K(get_mm_counter(victim->mm, MM_ANONPAGES)), + K(get_mm_counter(victim->mm, MM_FILEPAGES))); + task_unlock(victim); +@@ -569,6 +578,8 @@ int unregister_oom_notifier(struct notif + } + EXPORT_SYMBOL_GPL(unregister_oom_notifier); + ++long vs_oom_action(unsigned int); ++ + /* + * Try to acquire the OOM killer lock for the zones in zonelist. Returns zero + * if a parallel OOM killing is already taking place that includes a zone in +@@ -677,7 +688,12 @@ void out_of_memory(struct zonelist *zone + /* Found nothing?!?! Either we hang forever, or we panic. */ + if (!p) { + dump_header(NULL, gfp_mask, order, NULL, mpol_mask); +- panic("Out of memory and no killable processes...\n"); ++ ++ /* avoid panic for guest OOM */ ++ if (vx_current_xid()) ++ vs_oom_action(LINUX_REBOOT_CMD_OOM); ++ else ++ panic("Out of memory and no killable processes...\n"); + } + if (p != (void *)-1UL) { + oom_kill_process(p, gfp_mask, order, points, totalpages, NULL, +diff -NurpP --minimal linux-3.18.5/mm/page_alloc.c linux-3.18.5-vs2.3.7.3/mm/page_alloc.c +--- linux-3.18.5/mm/page_alloc.c 2015-01-17 02:40:24.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/mm/page_alloc.c 2015-01-19 10:58:31.000000000 +0000 +@@ -59,6 +59,8 @@ + #include + #include + #include ++#include ++#include + + #include + #include +@@ -3096,6 +3098,9 @@ void si_meminfo(struct sysinfo *val) + val->totalhigh = totalhigh_pages; + val->freehigh = nr_free_highpages(); + val->mem_unit = PAGE_SIZE; ++ ++ if (vx_flags(VXF_VIRT_MEM, 0)) ++ vx_vsi_meminfo(val); + } + + EXPORT_SYMBOL(si_meminfo); +@@ -3121,6 +3126,9 @@ void si_meminfo_node(struct sysinfo *val + val->freehigh = 0; + #endif + val->mem_unit = PAGE_SIZE; ++ ++ if (vx_flags(VXF_VIRT_MEM, 0)) ++ vx_vsi_meminfo(val); + } + #endif + +diff -NurpP --minimal linux-3.18.5/mm/pgtable-generic.c linux-3.18.5-vs2.3.7.3/mm/pgtable-generic.c +--- linux-3.18.5/mm/pgtable-generic.c 2015-01-16 22:19:29.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/mm/pgtable-generic.c 2015-01-19 10:58:31.000000000 +0000 +@@ -6,6 +6,8 @@ + * Copyright (C) 2010 Linus Torvalds + */ + ++#include ++ + #include + #include + #include +diff -NurpP --minimal linux-3.18.5/mm/shmem.c linux-3.18.5-vs2.3.7.3/mm/shmem.c +--- linux-3.18.5/mm/shmem.c 2015-01-17 02:40:24.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/mm/shmem.c 2015-01-19 10:58:31.000000000 +0000 +@@ -2183,7 +2183,7 @@ static int shmem_statfs(struct dentry *d + { + struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb); + +- buf->f_type = TMPFS_MAGIC; ++ buf->f_type = TMPFS_SUPER_MAGIC; + buf->f_bsize = PAGE_CACHE_SIZE; + buf->f_namelen = NAME_MAX; + if (sbinfo->max_blocks) { +@@ -3036,7 +3036,7 @@ int shmem_fill_super(struct super_block + sb->s_maxbytes = MAX_LFS_FILESIZE; + sb->s_blocksize = PAGE_CACHE_SIZE; + sb->s_blocksize_bits = PAGE_CACHE_SHIFT; +- sb->s_magic = TMPFS_MAGIC; ++ sb->s_magic = TMPFS_SUPER_MAGIC; + sb->s_op = &shmem_ops; + sb->s_time_gran = 1; + #ifdef CONFIG_TMPFS_XATTR +diff -NurpP --minimal linux-3.18.5/mm/slab.c linux-3.18.5-vs2.3.7.3/mm/slab.c +--- linux-3.18.5/mm/slab.c 2015-01-17 02:40:24.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/mm/slab.c 2015-01-19 10:58:31.000000000 +0000 +@@ -336,6 +336,8 @@ static void kmem_cache_node_init(struct + #define STATS_INC_FREEMISS(x) do { } while (0) + #endif + ++#include "slab_vs.h" + -+struct vcmd_ctx_kill_v0 { -+ int32_t pid; -+ int32_t sig; -+}; + #if DEBUG + + /* +@@ -3168,6 +3170,7 @@ slab_alloc_node(struct kmem_cache *cache + /* ___cache_alloc_node can fall back to other nodes */ + ptr = ____cache_alloc_node(cachep, flags, nodeid); + out: ++ vx_slab_alloc(cachep, flags); + local_irq_restore(save_flags); + ptr = cache_alloc_debugcheck_after(cachep, flags, ptr, caller); + kmemleak_alloc_recursive(ptr, cachep->object_size, 1, cachep->flags, +@@ -3354,6 +3357,7 @@ static inline void __cache_free(struct k + check_irq_off(); + kmemleak_free_recursive(objp, cachep->flags); + objp = cache_free_debugcheck(cachep, objp, caller); ++ vx_slab_free(cachep); + + kmemcheck_slab_free(cachep, objp, cachep->object_size); + +diff -NurpP --minimal linux-3.18.5/mm/slab_vs.h linux-3.18.5-vs2.3.7.3/mm/slab_vs.h +--- linux-3.18.5/mm/slab_vs.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/mm/slab_vs.h 2015-01-19 10:58:31.000000000 +0000 +@@ -0,0 +1,29 @@ + -+struct vcmd_wait_exit_v0 { -+ int32_t reboot_cmd; -+ int32_t exit_code; -+}; ++#include + ++#include + -+/* process alteration commands */ ++static inline ++void vx_slab_alloc(struct kmem_cache *cachep, gfp_t flags) ++{ ++ int what = gfp_zone(cachep->allocflags); ++ struct vx_info *vxi = current_vx_info(); + -+#define VCMD_get_pflags VC_CMD(PROCALT, 5, 0) -+#define VCMD_set_pflags VC_CMD(PROCALT, 6, 0) ++ if (!vxi) ++ return; + -+struct vcmd_pflags_v0 { -+ uint32_t flagword; -+ uint32_t mask; -+}; ++ atomic_add(cachep->size, &vxi->cacct.slab[what]); ++} + -+#endif /* _UAPI_VS_SIGNAL_CMD_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/uapi/vserver/space_cmd.h linux-3.7-vs2.3.5.1.3-uapi/include/uapi/vserver/space_cmd.h ---- linux-3.7-vs2.3.5.1.3/include/uapi/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/uapi/vserver/space_cmd.h 2012-12-13 22:22:21.000000000 +0000 -@@ -0,0 +1,28 @@ -+#ifndef _UAPI_VS_SPACE_CMD_H -+#define _UAPI_VS_SPACE_CMD_H ++static inline ++void vx_slab_free(struct kmem_cache *cachep) ++{ ++ int what = gfp_zone(cachep->allocflags); ++ struct vx_info *vxi = current_vx_info(); + ++ if (!vxi) ++ return; + -+#define VCMD_enter_space_v0 VC_CMD(PROCALT, 1, 0) -+#define VCMD_enter_space_v1 VC_CMD(PROCALT, 1, 1) -+#define VCMD_enter_space VC_CMD(PROCALT, 1, 2) ++ atomic_sub(cachep->size, &vxi->cacct.slab[what]); ++} + -+#define VCMD_set_space_v0 VC_CMD(PROCALT, 3, 0) -+#define VCMD_set_space_v1 VC_CMD(PROCALT, 3, 1) -+#define VCMD_set_space VC_CMD(PROCALT, 3, 2) +diff -NurpP --minimal linux-3.18.5/mm/swapfile.c linux-3.18.5-vs2.3.7.3/mm/swapfile.c +--- linux-3.18.5/mm/swapfile.c 2015-01-16 22:19:29.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/mm/swapfile.c 2015-01-19 10:58:31.000000000 +0000 +@@ -39,6 +39,7 @@ + #include + #include + #include ++#include + + static bool swap_count_continued(struct swap_info_struct *, pgoff_t, + unsigned char); +@@ -2028,6 +2029,16 @@ static int swap_show(struct seq_file *sw + + if (si == SEQ_START_TOKEN) { + seq_puts(swap,"Filename\t\t\t\tType\t\tSize\tUsed\tPriority\n"); ++ if (vx_flags(VXF_VIRT_MEM, 0)) { ++ struct sysinfo si; + -+#define VCMD_get_space_mask_v0 VC_CMD(PROCALT, 4, 0) ++ vx_vsi_swapinfo(&si); ++ if (si.totalswap < (1 << 10)) ++ return 0; ++ seq_printf(swap, "%s\t\t\t\t\t%s\t%lu\t%lu\t%d\n", ++ "hdv0", "partition", si.totalswap >> 10, ++ (si.totalswap - si.freeswap) >> 10, -1); ++ } + return 0; + } + +@@ -2576,6 +2587,8 @@ void si_swapinfo(struct sysinfo *val) + val->freeswap = atomic_long_read(&nr_swap_pages) + nr_to_be_unused; + val->totalswap = total_swap_pages + nr_to_be_unused; + spin_unlock(&swap_lock); ++ if (vx_flags(VXF_VIRT_MEM, 0)) ++ vx_vsi_swapinfo(val); + } + + /* +diff -NurpP --minimal linux-3.18.5/net/bridge/br_multicast.c linux-3.18.5-vs2.3.7.3/net/bridge/br_multicast.c +--- linux-3.18.5/net/bridge/br_multicast.c 2015-01-17 02:40:24.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/net/bridge/br_multicast.c 2015-01-19 10:58:31.000000000 +0000 +@@ -448,7 +448,7 @@ static struct sk_buff *br_ip6_multicast_ + ip6h->hop_limit = 1; + ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1)); + if (ipv6_dev_get_saddr(dev_net(br->dev), br->dev, &ip6h->daddr, 0, +- &ip6h->saddr)) { ++ &ip6h->saddr, NULL)) { + kfree_skb(skb); + return NULL; + } +diff -NurpP --minimal linux-3.18.5/net/core/dev.c linux-3.18.5-vs2.3.7.3/net/core/dev.c +--- linux-3.18.5/net/core/dev.c 2015-02-05 18:02:46.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/net/core/dev.c 2015-01-28 11:48:02.000000000 +0000 +@@ -122,6 +122,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -674,7 +675,8 @@ struct net_device *__dev_get_by_name(str + struct hlist_head *head = dev_name_hash(net, name); + + hlist_for_each_entry(dev, head, name_hlist) +- if (!strncmp(dev->name, name, IFNAMSIZ)) ++ if (!strncmp(dev->name, name, IFNAMSIZ) && ++ nx_dev_visible(current_nx_info(), dev)) + return dev; + + return NULL; +@@ -699,7 +701,8 @@ struct net_device *dev_get_by_name_rcu(s + struct hlist_head *head = dev_name_hash(net, name); + + hlist_for_each_entry_rcu(dev, head, name_hlist) +- if (!strncmp(dev->name, name, IFNAMSIZ)) ++ if (!strncmp(dev->name, name, IFNAMSIZ) && ++ nx_dev_visible(current_nx_info(), dev)) + return dev; + + return NULL; +@@ -749,7 +752,8 @@ struct net_device *__dev_get_by_index(st + struct hlist_head *head = dev_index_hash(net, ifindex); + + hlist_for_each_entry(dev, head, index_hlist) +- if (dev->ifindex == ifindex) ++ if ((dev->ifindex == ifindex) && ++ nx_dev_visible(current_nx_info(), dev)) + return dev; + + return NULL; +@@ -767,7 +771,7 @@ EXPORT_SYMBOL(__dev_get_by_index); + * about locking. The caller must hold RCU lock. + */ + +-struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex) ++struct net_device *dev_get_by_index_real_rcu(struct net *net, int ifindex) + { + struct net_device *dev; + struct hlist_head *head = dev_index_hash(net, ifindex); +@@ -778,6 +782,16 @@ struct net_device *dev_get_by_index_rcu( + + return NULL; + } ++EXPORT_SYMBOL(dev_get_by_index_real_rcu); + -+#define VCMD_get_space_mask VC_CMD(VSPACE, 0, 1) -+#define VCMD_get_space_default VC_CMD(VSPACE, 1, 0) ++struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex) ++{ ++ struct net_device *dev = dev_get_by_index_real_rcu(net, ifindex); + ++ if (nx_dev_visible(current_nx_info(), dev)) ++ return dev; ++ return NULL; ++} + EXPORT_SYMBOL(dev_get_by_index_rcu); + + +@@ -860,7 +874,8 @@ struct net_device *dev_getbyhwaddr_rcu(s + + for_each_netdev_rcu(net, dev) + if (dev->type == type && +- !memcmp(dev->dev_addr, ha, dev->addr_len)) ++ !memcmp(dev->dev_addr, ha, dev->addr_len) && ++ nx_dev_visible(current_nx_info(), dev)) + return dev; + + return NULL; +@@ -872,9 +887,11 @@ struct net_device *__dev_getfirstbyhwtyp + struct net_device *dev; + + ASSERT_RTNL(); +- for_each_netdev(net, dev) +- if (dev->type == type) ++ for_each_netdev(net, dev) { ++ if ((dev->type == type) && ++ nx_dev_visible(current_nx_info(), dev)) + return dev; ++ } + + return NULL; + } +@@ -886,7 +903,8 @@ struct net_device *dev_getfirstbyhwtype( + + rcu_read_lock(); + for_each_netdev_rcu(net, dev) +- if (dev->type == type) { ++ if ((dev->type == type) && ++ nx_dev_visible(current_nx_info(), dev)) { + dev_hold(dev); + ret = dev; + break; +@@ -916,7 +934,8 @@ struct net_device *__dev_get_by_flags(st + + ret = NULL; + for_each_netdev(net, dev) { +- if (((dev->flags ^ if_flags) & mask) == 0) { ++ if ((((dev->flags ^ if_flags) & mask) == 0) && ++ nx_dev_visible(current_nx_info(), dev)) { + ret = dev; + break; + } +@@ -994,6 +1013,8 @@ static int __dev_alloc_name(struct net * + continue; + if (i < 0 || i >= max_netdevices) + continue; ++ if (!nx_dev_visible(current_nx_info(), d)) ++ continue; + + /* avoid cases where sscanf is not exact inverse of printf */ + snprintf(buf, IFNAMSIZ, name, i); +diff -NurpP --minimal linux-3.18.5/net/core/net-procfs.c linux-3.18.5-vs2.3.7.3/net/core/net-procfs.c +--- linux-3.18.5/net/core/net-procfs.c 2013-11-25 15:45:09.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/net/core/net-procfs.c 2015-01-19 10:58:31.000000000 +0000 +@@ -1,6 +1,7 @@ + #include + #include + #include ++#include + #include + + #define BUCKET_SPACE (32 - NETDEV_HASHBITS - 1) +@@ -77,8 +78,13 @@ static void dev_seq_stop(struct seq_file + static void dev_seq_printf_stats(struct seq_file *seq, struct net_device *dev) + { + struct rtnl_link_stats64 temp; +- const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp); ++ const struct rtnl_link_stats64 *stats; + -+struct vcmd_space_mask_v1 { -+ uint64_t mask; -+}; ++ /* device visible inside network context? */ ++ if (!nx_dev_visible(current_nx_info(), dev)) ++ return; + ++ stats = dev_get_stats(dev, &temp); + seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu " + "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n", + dev->name, stats->rx_bytes, stats->rx_packets, +diff -NurpP --minimal linux-3.18.5/net/core/rtnetlink.c linux-3.18.5-vs2.3.7.3/net/core/rtnetlink.c +--- linux-3.18.5/net/core/rtnetlink.c 2015-01-17 02:40:24.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/net/core/rtnetlink.c 2015-01-19 10:58:31.000000000 +0000 +@@ -1280,6 +1280,8 @@ static int rtnl_dump_ifinfo(struct sk_bu + hlist_for_each_entry_rcu(dev, head, index_hlist) { + if (idx < s_idx) + goto cont; ++ if (!nx_dev_visible(skb->sk->sk_nx_info, dev)) ++ continue; + err = rtnl_fill_ifinfo(skb, dev, RTM_NEWLINK, + NETLINK_CB(cb->skb).portid, + cb->nlh->nlmsg_seq, 0, +@@ -2229,6 +2231,9 @@ void rtmsg_ifinfo(int type, struct net_d + int err = -ENOBUFS; + size_t if_info_size; + ++ if (!nx_dev_visible(current_nx_info(), dev)) ++ return; + -+struct vcmd_space_mask_v2 { -+ uint64_t mask; -+ uint32_t index; -+}; + skb = nlmsg_new((if_info_size = if_nlmsg_size(dev, 0)), flags); + if (skb == NULL) + goto errout; +diff -NurpP --minimal linux-3.18.5/net/core/sock.c linux-3.18.5-vs2.3.7.3/net/core/sock.c +--- linux-3.18.5/net/core/sock.c 2015-01-17 02:40:24.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/net/core/sock.c 2015-01-19 10:58:31.000000000 +0000 +@@ -133,6 +133,10 @@ + #include + + #include ++#include ++#include ++#include ++#include + + #include + +@@ -1310,6 +1314,8 @@ static struct sock *sk_prot_alloc(struct + goto out_free_sec; + sk_tx_queue_clear(sk); + } ++ sock_vx_init(sk); ++ sock_nx_init(sk); + + return sk; + +@@ -1406,6 +1412,11 @@ static void __sk_free(struct sock *sk) + put_cred(sk->sk_peer_cred); + put_pid(sk->sk_peer_pid); + put_net(sock_net(sk)); ++ vx_sock_dec(sk); ++ clr_vx_info(&sk->sk_vx_info); ++ sk->sk_xid = -1; ++ clr_nx_info(&sk->sk_nx_info); ++ sk->sk_nid = -1; + sk_prot_free(sk->sk_prot_creator, sk); + } + +@@ -1467,6 +1478,8 @@ struct sock *sk_clone_lock(const struct + + /* SANITY */ + get_net(sock_net(newsk)); ++ sock_vx_init(newsk); ++ sock_nx_init(newsk); + sk_node_init(&newsk->sk_node); + sock_lock_init(newsk); + bh_lock_sock(newsk); +@@ -1524,6 +1537,12 @@ struct sock *sk_clone_lock(const struct + smp_wmb(); + atomic_set(&newsk->sk_refcnt, 2); + ++ set_vx_info(&newsk->sk_vx_info, sk->sk_vx_info); ++ newsk->sk_xid = sk->sk_xid; ++ vx_sock_inc(newsk); ++ set_nx_info(&newsk->sk_nx_info, sk->sk_nx_info); ++ newsk->sk_nid = sk->sk_nid; + -+#endif /* _UAPI_VS_SPACE_CMD_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/uapi/vserver/switch.h linux-3.7-vs2.3.5.1.3-uapi/include/uapi/vserver/switch.h ---- linux-3.7-vs2.3.5.1.3/include/uapi/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/uapi/vserver/switch.h 2012-12-13 22:22:21.000000000 +0000 -@@ -0,0 +1,90 @@ -+#ifndef _UAPI_VS_SWITCH_H -+#define _UAPI_VS_SWITCH_H + /* + * Increment the counter in the same struct proto as the master + * sock (sk_refcnt_debug_inc uses newsk->sk_prot->socks, that +@@ -2302,6 +2321,12 @@ void sock_init_data(struct socket *sock, + + sk->sk_stamp = ktime_set(-1L, 0); + ++ set_vx_info(&sk->sk_vx_info, current_vx_info()); ++ sk->sk_xid = vx_current_xid(); ++ vx_sock_inc(sk); ++ set_nx_info(&sk->sk_nx_info, current_nx_info()); ++ sk->sk_nid = nx_current_nid(); + -+#include + #ifdef CONFIG_NET_RX_BUSY_POLL + sk->sk_napi_id = 0; + sk->sk_ll_usec = sysctl_net_busy_read; +diff -NurpP --minimal linux-3.18.5/net/ipv4/af_inet.c linux-3.18.5-vs2.3.7.3/net/ipv4/af_inet.c +--- linux-3.18.5/net/ipv4/af_inet.c 2015-01-17 02:40:24.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/net/ipv4/af_inet.c 2015-01-19 10:58:31.000000000 +0000 +@@ -118,6 +118,7 @@ + #ifdef CONFIG_IP_MROUTE + #include + #endif ++#include + + + /* The inetsw table contains everything that inet_create needs to +@@ -305,10 +306,13 @@ lookup_protocol: + } + + err = -EPERM; ++ if ((protocol == IPPROTO_ICMP) && ++ nx_capable(CAP_NET_RAW, NXC_RAW_ICMP)) ++ goto override; + if (sock->type == SOCK_RAW && !kern && + !ns_capable(net->user_ns, CAP_NET_RAW)) + goto out_rcu_unlock; +- ++override: + sock->ops = answer->ops; + answer_prot = answer->prot; + answer_flags = answer->flags; +@@ -423,6 +427,7 @@ int inet_bind(struct socket *sock, struc + struct sockaddr_in *addr = (struct sockaddr_in *)uaddr; + struct sock *sk = sock->sk; + struct inet_sock *inet = inet_sk(sk); ++ struct nx_v4_sock_addr nsa; + struct net *net = sock_net(sk); + unsigned short snum; + int chk_addr_ret; +@@ -447,7 +452,11 @@ int inet_bind(struct socket *sock, struc + goto out; + } + +- chk_addr_ret = inet_addr_type(net, addr->sin_addr.s_addr); ++ err = v4_map_sock_addr(inet, addr, &nsa); ++ if (err) ++ goto out; + ++ chk_addr_ret = inet_addr_type(net, nsa.saddr); + + /* Not specified by any standard per-se, however it breaks too + * many applications when removed. It is unfortunate since +@@ -459,7 +468,7 @@ int inet_bind(struct socket *sock, struc + err = -EADDRNOTAVAIL; + if (!net->ipv4.sysctl_ip_nonlocal_bind && + !(inet->freebind || inet->transparent) && +- addr->sin_addr.s_addr != htonl(INADDR_ANY) && ++ nsa.saddr != htonl(INADDR_ANY) && + chk_addr_ret != RTN_LOCAL && + chk_addr_ret != RTN_MULTICAST && + chk_addr_ret != RTN_BROADCAST) +@@ -485,7 +494,7 @@ int inet_bind(struct socket *sock, struc + if (sk->sk_state != TCP_CLOSE || inet->inet_num) + goto out_release_sock; + +- inet->inet_rcv_saddr = inet->inet_saddr = addr->sin_addr.s_addr; ++ v4_set_sock_addr(inet, &nsa); + if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST) + inet->inet_saddr = 0; /* Use device */ + +@@ -704,11 +713,13 @@ int inet_getname(struct socket *sock, st + peer == 1)) + return -ENOTCONN; + sin->sin_port = inet->inet_dport; +- sin->sin_addr.s_addr = inet->inet_daddr; ++ sin->sin_addr.s_addr = ++ nx_map_sock_lback(sk->sk_nx_info, inet->inet_daddr); + } else { + __be32 addr = inet->inet_rcv_saddr; + if (!addr) + addr = inet->inet_saddr; ++ addr = nx_map_sock_lback(sk->sk_nx_info, addr); + sin->sin_port = inet->inet_sport; + sin->sin_addr.s_addr = addr; + } +diff -NurpP --minimal linux-3.18.5/net/ipv4/arp.c linux-3.18.5-vs2.3.7.3/net/ipv4/arp.c +--- linux-3.18.5/net/ipv4/arp.c 2015-01-17 02:40:24.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/net/ipv4/arp.c 2015-01-19 10:58:31.000000000 +0000 +@@ -1349,6 +1349,7 @@ static void arp_format_neigh_entry(struc + struct net_device *dev = n->dev; + int hatype = dev->type; + ++ /* FIXME: check for network context */ + read_lock(&n->lock); + /* Convert hardware address to XX:XX:XX:XX ... form. */ + #if IS_ENABLED(CONFIG_AX25) +@@ -1380,6 +1381,7 @@ static void arp_format_pneigh_entry(stru + int hatype = dev ? dev->type : 0; + char tbuf[16]; + ++ /* FIXME: check for network context */ + sprintf(tbuf, "%pI4", n->key); + seq_printf(seq, "%-16s 0x%-10x0x%-10x%s * %s\n", + tbuf, hatype, ATF_PUBL | ATF_PERM, "00:00:00:00:00:00", +diff -NurpP --minimal linux-3.18.5/net/ipv4/devinet.c linux-3.18.5-vs2.3.7.3/net/ipv4/devinet.c +--- linux-3.18.5/net/ipv4/devinet.c 2015-01-16 22:19:30.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/net/ipv4/devinet.c 2015-01-19 10:58:31.000000000 +0000 +@@ -534,6 +534,7 @@ struct in_device *inetdev_by_index(struc + } + EXPORT_SYMBOL(inetdev_by_index); + + -+#define VC_CATEGORY(c) (((c) >> 24) & 0x3F) -+#define VC_COMMAND(c) (((c) >> 16) & 0xFF) -+#define VC_VERSION(c) ((c) & 0xFFF) + /* Called only from RTNL semaphored context. No locks. */ + + struct in_ifaddr *inet_ifa_byprefix(struct in_device *in_dev, __be32 prefix, +@@ -958,6 +959,8 @@ int devinet_ioctl(struct net *net, unsig + + in_dev = __in_dev_get_rtnl(dev); + if (in_dev) { ++ struct nx_info *nxi = current_nx_info(); + -+#define VC_CMD(c, i, v) ((((VC_CAT_ ## c) & 0x3F) << 24) \ -+ | (((i) & 0xFF) << 16) | ((v) & 0xFFF)) + if (tryaddrmatch) { + /* Matthias Andree */ + /* compare label and address (4.4BSD style) */ +@@ -966,6 +969,8 @@ int devinet_ioctl(struct net *net, unsig + This is checked above. */ + for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL; + ifap = &ifa->ifa_next) { ++ if (!nx_v4_ifa_visible(nxi, ifa)) ++ continue; + if (!strcmp(ifr.ifr_name, ifa->ifa_label) && + sin_orig.sin_addr.s_addr == + ifa->ifa_local) { +@@ -978,9 +983,12 @@ int devinet_ioctl(struct net *net, unsig + comparing just the label */ + if (!ifa) { + for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL; +- ifap = &ifa->ifa_next) ++ ifap = &ifa->ifa_next) { ++ if (!nx_v4_ifa_visible(nxi, ifa)) ++ continue; + if (!strcmp(ifr.ifr_name, ifa->ifa_label)) + break; ++ } + } + } + +@@ -1134,6 +1142,8 @@ static int inet_gifconf(struct net_devic + goto out; + + for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) { ++ if (!nx_v4_ifa_visible(current_nx_info(), ifa)) ++ continue; + if (!buf) { + done += sizeof(ifr); + continue; +@@ -1538,6 +1548,7 @@ static int inet_dump_ifaddr(struct sk_bu + struct net_device *dev; + struct in_device *in_dev; + struct in_ifaddr *ifa; ++ struct sock *sk = skb->sk; + struct hlist_head *head; + + s_h = cb->args[0]; +@@ -1561,6 +1572,8 @@ static int inet_dump_ifaddr(struct sk_bu + + for (ifa = in_dev->ifa_list, ip_idx = 0; ifa; + ifa = ifa->ifa_next, ip_idx++) { ++ if (sk && !nx_v4_ifa_visible(sk->sk_nx_info, ifa)) ++ continue; + if (ip_idx < s_ip_idx) + continue; + if (inet_fill_ifaddr(skb, ifa, +diff -NurpP --minimal linux-3.18.5/net/ipv4/fib_trie.c linux-3.18.5-vs2.3.7.3/net/ipv4/fib_trie.c +--- linux-3.18.5/net/ipv4/fib_trie.c 2015-01-16 22:19:30.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/net/ipv4/fib_trie.c 2015-01-19 10:58:31.000000000 +0000 +@@ -2530,6 +2530,7 @@ static int fib_route_seq_show(struct seq + + seq_setwidth(seq, 127); + ++ /* FIXME: check for network context? */ + if (fi) + seq_printf(seq, + "%s\t%08X\t%08X\t%04X\t%d\t%u\t" +diff -NurpP --minimal linux-3.18.5/net/ipv4/inet_connection_sock.c linux-3.18.5-vs2.3.7.3/net/ipv4/inet_connection_sock.c +--- linux-3.18.5/net/ipv4/inet_connection_sock.c 2014-09-03 13:19:48.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/net/ipv4/inet_connection_sock.c 2015-01-19 10:58:31.000000000 +0000 +@@ -42,6 +42,37 @@ void inet_get_local_port_range(struct ne + } + EXPORT_SYMBOL(inet_get_local_port_range); + ++int ipv4_rcv_saddr_equal(const struct sock *sk1, const struct sock *sk2) ++{ ++ __be32 sk1_rcv_saddr = sk1->sk_rcv_saddr, ++ sk2_rcv_saddr = sk2->sk_rcv_saddr; + -+/* ++ if (inet_v6_ipv6only(sk2)) ++ return 0; + -+ Syscall Matrix V2.8 ++ if (sk1_rcv_saddr && ++ sk2_rcv_saddr && ++ sk1_rcv_saddr == sk2_rcv_saddr) ++ return 1; + -+ |VERSION|CREATE |MODIFY |MIGRATE|CONTROL|EXPERIM| |SPECIAL|SPECIAL| -+ |STATS |DESTROY|ALTER |CHANGE |LIMIT |TEST | | | | -+ |INFO |SETUP | |MOVE | | | | | | -+ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ -+ SYSTEM |VERSION|VSETUP |VHOST | | | | |DEVICE | | -+ HOST | 00| 01| 02| 03| 04| 05| | 06| 07| -+ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ -+ CPU | |VPROC |PROCALT|PROCMIG|PROCTRL| | |SCHED. | | -+ PROCESS| 08| 09| 10| 11| 12| 13| | 14| 15| -+ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ -+ MEMORY | | | | |MEMCTRL| | |SWAP | | -+ | 16| 17| 18| 19| 20| 21| | 22| 23| -+ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ -+ NETWORK| |VNET |NETALT |NETMIG |NETCTL | | |SERIAL | | -+ | 24| 25| 26| 27| 28| 29| | 30| 31| -+ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ -+ DISK | | | |TAGMIG |DLIMIT | | |INODE | | -+ VFS | 32| 33| 34| 35| 36| 37| | 38| 39| -+ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ -+ OTHER |VSTAT | | | | | | |VINFO | | -+ | 40| 41| 42| 43| 44| 45| | 46| 47| -+ =======+=======+=======+=======+=======+=======+=======+ +=======+=======+ -+ SPECIAL|EVENT | | | |FLAGS | | |VSPACE | | -+ | 48| 49| 50| 51| 52| 53| | 54| 55| -+ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ -+ SPECIAL|DEBUG | | | |RLIMIT |SYSCALL| | |COMPAT | -+ | 56| 57| 58| 59| 60|TEST 61| | 62| 63| -+ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ ++ if (sk1_rcv_saddr && ++ !sk2_rcv_saddr && ++ v4_addr_in_nx_info(sk2->sk_nx_info, sk1_rcv_saddr, NXA_MASK_BIND)) ++ return 1; + -+*/ ++ if (sk2_rcv_saddr && ++ !sk1_rcv_saddr && ++ v4_addr_in_nx_info(sk1->sk_nx_info, sk2_rcv_saddr, NXA_MASK_BIND)) ++ return 1; + -+#define VC_CAT_VERSION 0 ++ if (!sk1_rcv_saddr && ++ !sk2_rcv_saddr && ++ nx_v4_addr_conflict(sk1->sk_nx_info, sk2->sk_nx_info)) ++ return 1; + -+#define VC_CAT_VSETUP 1 -+#define VC_CAT_VHOST 2 ++ return 0; ++} + -+#define VC_CAT_DEVICE 6 + int inet_csk_bind_conflict(const struct sock *sk, + const struct inet_bind_bucket *tb, bool relax) + { +@@ -69,15 +100,13 @@ int inet_csk_bind_conflict(const struct + (sk2->sk_state != TCP_TIME_WAIT && + !uid_eq(uid, sock_i_uid(sk2))))) { + +- if (!sk2->sk_rcv_saddr || !sk->sk_rcv_saddr || +- sk2->sk_rcv_saddr == sk->sk_rcv_saddr) ++ if (ipv4_rcv_saddr_equal(sk, sk2)) + break; + } + if (!relax && reuse && sk2->sk_reuse && + sk2->sk_state != TCP_LISTEN) { + +- if (!sk2->sk_rcv_saddr || !sk->sk_rcv_saddr || +- sk2->sk_rcv_saddr == sk->sk_rcv_saddr) ++ if (ipv4_rcv_saddr_equal(sk, sk2)) + break; + } + } +diff -NurpP --minimal linux-3.18.5/net/ipv4/inet_diag.c linux-3.18.5-vs2.3.7.3/net/ipv4/inet_diag.c +--- linux-3.18.5/net/ipv4/inet_diag.c 2014-02-01 02:17:51.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/net/ipv4/inet_diag.c 2015-01-19 10:58:31.000000000 +0000 +@@ -31,6 +31,8 @@ + + #include + #include ++#include ++#include + + #include + #include +@@ -110,8 +112,10 @@ int inet_sk_diag_fill(struct sock *sk, s + memset(&r->id.idiag_src, 0, sizeof(r->id.idiag_src)); + memset(&r->id.idiag_dst, 0, sizeof(r->id.idiag_dst)); + +- r->id.idiag_src[0] = inet->inet_rcv_saddr; +- r->id.idiag_dst[0] = inet->inet_daddr; ++ r->id.idiag_src[0] = nx_map_sock_lback(sk->sk_nx_info, ++ inet->inet_rcv_saddr); ++ r->id.idiag_dst[0] = nx_map_sock_lback(sk->sk_nx_info, ++ inet->inet_daddr); + + if (nla_put_u8(skb, INET_DIAG_SHUTDOWN, sk->sk_shutdown)) + goto errout; +@@ -254,8 +258,8 @@ static int inet_twsk_diag_fill(struct in + memset(&r->id.idiag_src, 0, sizeof(r->id.idiag_src)); + memset(&r->id.idiag_dst, 0, sizeof(r->id.idiag_dst)); + +- r->id.idiag_src[0] = tw->tw_rcv_saddr; +- r->id.idiag_dst[0] = tw->tw_daddr; ++ r->id.idiag_src[0] = nx_map_sock_lback(tw->tw_nx_info, tw->tw_rcv_saddr); ++ r->id.idiag_dst[0] = nx_map_sock_lback(tw->tw_nx_info, tw->tw_daddr); + + r->idiag_state = tw->tw_substate; + r->idiag_timer = 3; +@@ -298,12 +302,14 @@ int inet_diag_dump_one_icsk(struct inet_ + + err = -EINVAL; + if (req->sdiag_family == AF_INET) { ++ /* TODO: lback */ + sk = inet_lookup(net, hashinfo, req->id.idiag_dst[0], + req->id.idiag_dport, req->id.idiag_src[0], + req->id.idiag_sport, req->id.idiag_if); + } + #if IS_ENABLED(CONFIG_IPV6) + else if (req->sdiag_family == AF_INET6) { ++ /* TODO: lback */ + sk = inet6_lookup(net, hashinfo, + (struct in6_addr *)req->id.idiag_dst, + req->id.idiag_dport, +@@ -501,6 +507,7 @@ int inet_diag_bc_sk(const struct nlattr + } else + #endif + { ++ /* TODO: lback */ + entry.saddr = &inet->inet_rcv_saddr; + entry.daddr = &inet->inet_daddr; + } +@@ -659,6 +666,7 @@ static int inet_twsk_diag_dump(struct so + } else + #endif + { ++ /* TODO: lback */ + entry.saddr = &tw->tw_rcv_saddr; + entry.daddr = &tw->tw_daddr; + } +@@ -741,8 +749,8 @@ static int inet_diag_fill_req(struct sk_ + memset(&r->id.idiag_src, 0, sizeof(r->id.idiag_src)); + memset(&r->id.idiag_dst, 0, sizeof(r->id.idiag_dst)); + +- r->id.idiag_src[0] = ireq->ir_loc_addr; +- r->id.idiag_dst[0] = ireq->ir_rmt_addr; ++ r->id.idiag_src[0] = nx_map_sock_lback(sk->sk_nx_info, ireq->ir_loc_addr); ++ r->id.idiag_dst[0] = nx_map_sock_lback(sk->sk_nx_info, ireq->ir_rmt_addr); + + r->idiag_expires = jiffies_to_msecs(tmo); + r->idiag_rqueue = 0; +@@ -806,6 +814,7 @@ static int inet_diag_dump_reqs(struct sk + r->id.idiag_dport) + continue; + ++ /* TODO: lback */ + if (bc) { + inet_diag_req_addrs(sk, req, &entry); + entry.dport = ntohs(ireq->ir_rmt_port); +@@ -862,6 +871,8 @@ void inet_diag_dump_icsk(struct inet_has + if (!net_eq(sock_net(sk), net)) + continue; + ++ if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)) ++ continue; + if (num < s_num) { + num++; + continue; +@@ -934,6 +945,8 @@ skip_listen_ht: + + if (!net_eq(sock_net(sk), net)) + continue; ++ if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)) ++ continue; + if (num < s_num) + goto next_normal; + state = (sk->sk_state == TCP_TIME_WAIT) ? +diff -NurpP --minimal linux-3.18.5/net/ipv4/inet_hashtables.c linux-3.18.5-vs2.3.7.3/net/ipv4/inet_hashtables.c +--- linux-3.18.5/net/ipv4/inet_hashtables.c 2015-01-17 02:40:24.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/net/ipv4/inet_hashtables.c 2015-01-19 10:58:31.000000000 +0000 +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + #include + + static unsigned int inet_ehashfn(struct net *net, const __be32 laddr, +@@ -181,6 +182,11 @@ static inline int compute_score(struct s + if (rcv_saddr != daddr) + return -1; + score += 4; ++ } else { ++ /* block non nx_info ips */ ++ if (!v4_addr_in_nx_info(sk->sk_nx_info, ++ daddr, NXA_MASK_BIND)) ++ return -1; + } + if (sk->sk_bound_dev_if) { + if (sk->sk_bound_dev_if != dif) +@@ -198,7 +204,6 @@ static inline int compute_score(struct s + * wildcarded during the search since they can never be otherwise. + */ + +- + struct sock *__inet_lookup_listener(struct net *net, + struct inet_hashinfo *hashinfo, + const __be32 saddr, __be16 sport, +@@ -234,6 +239,7 @@ begin: + phash = next_pseudo_random32(phash); + } + } + -+#define VC_CAT_VPROC 9 -+#define VC_CAT_PROCALT 10 -+#define VC_CAT_PROCMIG 11 -+#define VC_CAT_PROCTRL 12 + /* + * if the nulls value we got at the end of this lookup is + * not the expected one, we must restart lookup. +diff -NurpP --minimal linux-3.18.5/net/ipv4/netfilter.c linux-3.18.5-vs2.3.7.3/net/ipv4/netfilter.c +--- linux-3.18.5/net/ipv4/netfilter.c 2014-06-12 13:02:57.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/net/ipv4/netfilter.c 2015-01-19 10:58:31.000000000 +0000 +@@ -11,7 +11,7 @@ + #include + #include + #include +-#include ++// #include + #include + #include + #include +diff -NurpP --minimal linux-3.18.5/net/ipv4/raw.c linux-3.18.5-vs2.3.7.3/net/ipv4/raw.c +--- linux-3.18.5/net/ipv4/raw.c 2015-01-16 22:19:30.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/net/ipv4/raw.c 2015-01-19 10:58:31.000000000 +0000 +@@ -117,7 +117,7 @@ static struct sock *__raw_v4_lookup(stru + + if (net_eq(sock_net(sk), net) && inet->inet_num == num && + !(inet->inet_daddr && inet->inet_daddr != raddr) && +- !(inet->inet_rcv_saddr && inet->inet_rcv_saddr != laddr) && ++ v4_sock_addr_match(sk->sk_nx_info, inet, laddr) && + !(sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif)) + goto found; /* gotcha */ + } +@@ -402,6 +402,12 @@ static int raw_send_hdrinc(struct sock * + icmp_out_count(net, ((struct icmphdr *) + skb_transport_header(skb))->type); + ++ err = -EPERM; ++ if (!nx_check(0, VS_ADMIN) && !capable(CAP_NET_RAW) && ++ sk->sk_nx_info && ++ !v4_addr_in_nx_info(sk->sk_nx_info, iph->saddr, NXA_MASK_BIND)) ++ goto error_free; + -+#define VC_CAT_SCHED 14 -+#define VC_CAT_MEMCTRL 20 + err = NF_HOOK(NFPROTO_IPV4, NF_INET_LOCAL_OUT, skb, NULL, + rt->dst.dev, dst_output); + if (err > 0) +@@ -590,6 +596,16 @@ static int raw_sendmsg(struct kiocb *ioc + goto done; + } + ++ if (sk->sk_nx_info) { ++ rt = ip_v4_find_src(sock_net(sk), sk->sk_nx_info, &fl4); ++ if (IS_ERR(rt)) { ++ err = PTR_ERR(rt); ++ rt = NULL; ++ goto done; ++ } ++ ip_rt_put(rt); ++ } + -+#define VC_CAT_VNET 25 -+#define VC_CAT_NETALT 26 -+#define VC_CAT_NETMIG 27 -+#define VC_CAT_NETCTRL 28 + security_sk_classify_flow(sk, flowi4_to_flowi(&fl4)); + rt = ip_route_output_flow(sock_net(sk), &fl4, sk); + if (IS_ERR(rt)) { +@@ -668,17 +684,19 @@ static int raw_bind(struct sock *sk, str + { + struct inet_sock *inet = inet_sk(sk); + struct sockaddr_in *addr = (struct sockaddr_in *) uaddr; ++ struct nx_v4_sock_addr nsa = { 0 }; + int ret = -EINVAL; + int chk_addr_ret; + + if (sk->sk_state != TCP_CLOSE || addr_len < sizeof(struct sockaddr_in)) + goto out; +- chk_addr_ret = inet_addr_type(sock_net(sk), addr->sin_addr.s_addr); ++ v4_map_sock_addr(inet, addr, &nsa); ++ chk_addr_ret = inet_addr_type(sock_net(sk), nsa.saddr); + ret = -EADDRNOTAVAIL; +- if (addr->sin_addr.s_addr && chk_addr_ret != RTN_LOCAL && ++ if (nsa.saddr && chk_addr_ret != RTN_LOCAL && + chk_addr_ret != RTN_MULTICAST && chk_addr_ret != RTN_BROADCAST) + goto out; +- inet->inet_rcv_saddr = inet->inet_saddr = addr->sin_addr.s_addr; ++ v4_set_sock_addr(inet, &nsa); + if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST) + inet->inet_saddr = 0; /* Use device */ + sk_dst_reset(sk); +@@ -727,7 +745,8 @@ static int raw_recvmsg(struct kiocb *ioc + /* Copy the address. */ + if (sin) { + sin->sin_family = AF_INET; +- sin->sin_addr.s_addr = ip_hdr(skb)->saddr; ++ sin->sin_addr.s_addr = ++ nx_map_sock_lback(sk->sk_nx_info, ip_hdr(skb)->saddr); + sin->sin_port = 0; + memset(&sin->sin_zero, 0, sizeof(sin->sin_zero)); + *addr_len = sizeof(*sin); +@@ -923,7 +942,8 @@ static struct sock *raw_get_first(struct + for (state->bucket = 0; state->bucket < RAW_HTABLE_SIZE; + ++state->bucket) { + sk_for_each(sk, &state->h->ht[state->bucket]) +- if (sock_net(sk) == seq_file_net(seq)) ++ if ((sock_net(sk) == seq_file_net(seq)) && ++ nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)) + goto found; + } + sk = NULL; +@@ -939,7 +959,8 @@ static struct sock *raw_get_next(struct + sk = sk_next(sk); + try_again: + ; +- } while (sk && sock_net(sk) != seq_file_net(seq)); ++ } while (sk && ((sock_net(sk) != seq_file_net(seq)) || ++ !nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))); + + if (!sk && ++state->bucket < RAW_HTABLE_SIZE) { + sk = sk_head(&state->h->ht[state->bucket]); +diff -NurpP --minimal linux-3.18.5/net/ipv4/route.c linux-3.18.5-vs2.3.7.3/net/ipv4/route.c +--- linux-3.18.5/net/ipv4/route.c 2015-01-17 02:40:25.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/net/ipv4/route.c 2015-01-19 10:58:31.000000000 +0000 +@@ -2071,7 +2071,7 @@ struct rtable *__ip_route_output_key(str + + + if (fl4->flowi4_oif) { +- dev_out = dev_get_by_index_rcu(net, fl4->flowi4_oif); ++ dev_out = dev_get_by_index_real_rcu(net, fl4->flowi4_oif); + rth = ERR_PTR(-ENODEV); + if (dev_out == NULL) + goto out; +diff -NurpP --minimal linux-3.18.5/net/ipv4/tcp.c linux-3.18.5-vs2.3.7.3/net/ipv4/tcp.c +--- linux-3.18.5/net/ipv4/tcp.c 2015-01-17 02:40:25.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/net/ipv4/tcp.c 2015-01-19 10:58:31.000000000 +0000 +@@ -268,6 +268,7 @@ + #include + #include + #include ++#include + + #include + #include +diff -NurpP --minimal linux-3.18.5/net/ipv4/tcp_ipv4.c linux-3.18.5-vs2.3.7.3/net/ipv4/tcp_ipv4.c +--- linux-3.18.5/net/ipv4/tcp_ipv4.c 2015-02-05 18:02:46.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/net/ipv4/tcp_ipv4.c 2015-01-19 10:58:31.000000000 +0000 +@@ -1885,6 +1885,12 @@ static void *listening_get_next(struct s + req = req->dl_next; + while (1) { + while (req) { ++ vxdprintk(VXD_CBIT(net, 6), ++ "sk,req: %p [#%d] (from %d)", req->sk, ++ (req->sk)?req->sk->sk_nid:0, nx_current_nid()); ++ if (req->sk && ++ !nx_check(req->sk->sk_nid, VS_WATCH_P | VS_IDENT)) ++ continue; + if (req->rsk_ops->family == st->family) { + cur = req; + goto out; +@@ -1909,6 +1915,10 @@ get_req: + } + get_sk: + sk_nulls_for_each_from(sk, node) { ++ vxdprintk(VXD_CBIT(net, 6), "sk: %p [#%d] (from %d)", ++ sk, sk->sk_nid, nx_current_nid()); ++ if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)) ++ continue; + if (!net_eq(sock_net(sk), net)) + continue; + if (sk->sk_family == st->family) { +@@ -1983,6 +1993,11 @@ static void *established_get_first(struc + + spin_lock_bh(lock); + sk_nulls_for_each(sk, node, &tcp_hashinfo.ehash[st->bucket].chain) { ++ vxdprintk(VXD_CBIT(net, 6), ++ "sk,egf: %p [#%d] (from %d)", ++ sk, sk->sk_nid, nx_current_nid()); ++ if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)) ++ continue; + if (sk->sk_family != st->family || + !net_eq(sock_net(sk), net)) { + continue; +@@ -2009,6 +2024,11 @@ static void *established_get_next(struct + sk = sk_nulls_next(sk); + + sk_nulls_for_each_from(sk, node) { ++ vxdprintk(VXD_CBIT(net, 6), ++ "sk,egn: %p [#%d] (from %d)", ++ sk, sk->sk_nid, nx_current_nid()); ++ if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)) ++ continue; + if (sk->sk_family == st->family && net_eq(sock_net(sk), net)) + return sk; + } +@@ -2207,9 +2227,9 @@ static void get_openreq4(const struct so + seq_printf(f, "%4d: %08X:%04X %08X:%04X" + " %02X %08X:%08X %02X:%08lX %08X %5u %8d %u %d %pK", + i, +- ireq->ir_loc_addr, ++ nx_map_sock_lback(current_nx_info(), ireq->ir_loc_addr), + ntohs(inet_sk(sk)->inet_sport), +- ireq->ir_rmt_addr, ++ nx_map_sock_lback(current_nx_info(), ireq->ir_rmt_addr), + ntohs(ireq->ir_rmt_port), + TCP_SYN_RECV, + 0, 0, /* could print option size, but that is af dependent. */ +@@ -2231,8 +2251,8 @@ static void get_tcp4_sock(struct sock *s + const struct inet_connection_sock *icsk = inet_csk(sk); + const struct inet_sock *inet = inet_sk(sk); + struct fastopen_queue *fastopenq = icsk->icsk_accept_queue.fastopenq; +- __be32 dest = inet->inet_daddr; +- __be32 src = inet->inet_rcv_saddr; ++ __be32 dest = nx_map_sock_lback(current_nx_info(), inet->inet_daddr); ++ __be32 src = nx_map_sock_lback(current_nx_info(), inet->inet_rcv_saddr); + __u16 destp = ntohs(inet->inet_dport); + __u16 srcp = ntohs(inet->inet_sport); + int rx_queue; +@@ -2289,8 +2309,8 @@ static void get_timewait4_sock(const str + __u16 destp, srcp; + s32 delta = tw->tw_ttd - inet_tw_time_stamp(); + +- dest = tw->tw_daddr; +- src = tw->tw_rcv_saddr; ++ dest = nx_map_sock_lback(current_nx_info(), tw->tw_daddr); ++ src = nx_map_sock_lback(current_nx_info(), tw->tw_rcv_saddr); + destp = ntohs(tw->tw_dport); + srcp = ntohs(tw->tw_sport); + +diff -NurpP --minimal linux-3.18.5/net/ipv4/tcp_minisocks.c linux-3.18.5-vs2.3.7.3/net/ipv4/tcp_minisocks.c +--- linux-3.18.5/net/ipv4/tcp_minisocks.c 2015-01-17 02:40:25.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/net/ipv4/tcp_minisocks.c 2015-01-19 10:58:31.000000000 +0000 +@@ -23,6 +23,9 @@ + #include + #include + #include ++#include ++#include ++#include + #include + #include + #include +@@ -290,6 +293,11 @@ void tcp_time_wait(struct sock *sk, int + tcptw->tw_ts_recent_stamp = tp->rx_opt.ts_recent_stamp; + tcptw->tw_ts_offset = tp->tsoffset; + ++ tw->tw_xid = sk->sk_xid; ++ tw->tw_vx_info = NULL; ++ tw->tw_nid = sk->sk_nid; ++ tw->tw_nx_info = NULL; + -+#define VC_CAT_TAGMIG 35 -+#define VC_CAT_DLIMIT 36 -+#define VC_CAT_INODE 38 + #if IS_ENABLED(CONFIG_IPV6) + if (tw->tw_family == PF_INET6) { + struct ipv6_pinfo *np = inet6_sk(sk); +diff -NurpP --minimal linux-3.18.5/net/ipv4/udp.c linux-3.18.5-vs2.3.7.3/net/ipv4/udp.c +--- linux-3.18.5/net/ipv4/udp.c 2015-01-17 02:40:25.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/net/ipv4/udp.c 2015-01-19 10:58:31.000000000 +0000 +@@ -309,14 +309,7 @@ fail: + } + EXPORT_SYMBOL(udp_lib_get_port); + +-static int ipv4_rcv_saddr_equal(const struct sock *sk1, const struct sock *sk2) +-{ +- struct inet_sock *inet1 = inet_sk(sk1), *inet2 = inet_sk(sk2); +- +- return (!ipv6_only_sock(sk2) && +- (!inet1->inet_rcv_saddr || !inet2->inet_rcv_saddr || +- inet1->inet_rcv_saddr == inet2->inet_rcv_saddr)); +-} ++extern int ipv4_rcv_saddr_equal(const struct sock *, const struct sock *); + + static unsigned int udp4_portaddr_hash(struct net *net, __be32 saddr, + unsigned int port) +@@ -351,6 +344,11 @@ static inline int compute_score(struct s + if (inet->inet_rcv_saddr != daddr) + return -1; + score += 4; ++ } else { ++ /* block non nx_info ips */ ++ if (!v4_addr_in_nx_info(sk->sk_nx_info, ++ daddr, NXA_MASK_BIND)) ++ return -1; + } + if (inet->inet_daddr) { + if (inet->inet_daddr != saddr) +@@ -473,6 +471,7 @@ begin: + return result; + } + + -+#define VC_CAT_VSTAT 40 -+#define VC_CAT_VINFO 46 -+#define VC_CAT_EVENT 48 + /* UDP is nearly always wildcards out the wazoo, it makes no sense to try + * harder than this. -DaveM + */ +@@ -519,6 +518,11 @@ begin: + sk_nulls_for_each_rcu(sk, node, &hslot->head) { + score = compute_score(sk, net, saddr, hnum, sport, + daddr, dport, dif); ++ /* FIXME: disabled? ++ if (score == 9) { ++ result = sk; ++ break; ++ } else */ + if (score > badness) { + result = sk; + badness = score; +@@ -543,6 +547,7 @@ begin: + if (get_nulls_value(node) != slot) + goto begin; + + -+#define VC_CAT_FLAGS 52 -+#define VC_CAT_VSPACE 54 -+#define VC_CAT_DEBUG 56 -+#define VC_CAT_RLIMIT 60 + if (result) { + if (unlikely(!atomic_inc_not_zero_hint(&result->sk_refcnt, 2))) + result = NULL; +@@ -552,6 +557,7 @@ begin: + goto begin; + } + } + -+#define VC_CAT_SYSTEST 61 -+#define VC_CAT_COMPAT 63 + rcu_read_unlock(); + return result; + } +@@ -586,7 +592,7 @@ static inline bool __udp_is_mcast_sock(s + udp_sk(sk)->udp_port_hash != hnum || + (inet->inet_daddr && inet->inet_daddr != rmt_addr) || + (inet->inet_dport != rmt_port && inet->inet_dport) || +- (inet->inet_rcv_saddr && inet->inet_rcv_saddr != loc_addr) || ++ !v4_sock_addr_match(sk->sk_nx_info, inet, loc_addr) || + ipv6_only_sock(sk) || + (sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif)) + return false; +@@ -1008,6 +1014,16 @@ int udp_sendmsg(struct kiocb *iocb, stru + inet_sk_flowi_flags(sk), + faddr, saddr, dport, inet->inet_sport); + ++ if (sk->sk_nx_info) { ++ rt = ip_v4_find_src(net, sk->sk_nx_info, fl4); ++ if (IS_ERR(rt)) { ++ err = PTR_ERR(rt); ++ rt = NULL; ++ goto out; ++ } ++ ip_rt_put(rt); ++ } + -+/* query version */ + security_sk_classify_flow(sk, flowi4_to_flowi(fl4)); + rt = ip_route_output_flow(net, fl4, sk); + if (IS_ERR(rt)) { +@@ -1312,7 +1328,8 @@ try_again: + if (sin) { + sin->sin_family = AF_INET; + sin->sin_port = udp_hdr(skb)->source; +- sin->sin_addr.s_addr = ip_hdr(skb)->saddr; ++ sin->sin_addr.s_addr = nx_map_sock_lback( ++ skb->sk->sk_nx_info, ip_hdr(skb)->saddr); + memset(sin->sin_zero, 0, sizeof(sin->sin_zero)); + *addr_len = sizeof(*sin); + } +@@ -2271,6 +2288,8 @@ static struct sock *udp_get_first(struct + sk_nulls_for_each(sk, node, &hslot->head) { + if (!net_eq(sock_net(sk), net)) + continue; ++ if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)) ++ continue; + if (sk->sk_family == state->family) + goto found; + } +@@ -2288,7 +2307,9 @@ static struct sock *udp_get_next(struct + + do { + sk = sk_nulls_next(sk); +- } while (sk && (!net_eq(sock_net(sk), net) || sk->sk_family != state->family)); ++ } while (sk && (!net_eq(sock_net(sk), net) || ++ sk->sk_family != state->family || ++ !nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))); + + if (!sk) { + if (state->bucket <= state->udp_table->mask) +@@ -2384,8 +2405,8 @@ static void udp4_format_sock(struct sock + int bucket) + { + struct inet_sock *inet = inet_sk(sp); +- __be32 dest = inet->inet_daddr; +- __be32 src = inet->inet_rcv_saddr; ++ __be32 dest = nx_map_sock_lback(current_nx_info(), inet->inet_daddr); ++ __be32 src = nx_map_sock_lback(current_nx_info(), inet->inet_rcv_saddr); + __u16 destp = ntohs(inet->inet_dport); + __u16 srcp = ntohs(inet->inet_sport); + +diff -NurpP --minimal linux-3.18.5/net/ipv6/Kconfig linux-3.18.5-vs2.3.7.3/net/ipv6/Kconfig +--- linux-3.18.5/net/ipv6/Kconfig 2014-06-12 11:35:11.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/net/ipv6/Kconfig 2015-01-19 10:58:31.000000000 +0000 +@@ -4,8 +4,8 @@ + + # IPv6 as module will cause a CRASH if you try to unload it + menuconfig IPV6 +- tristate "The IPv6 protocol" +- default m ++ bool "The IPv6 protocol" ++ default n + ---help--- + This is complemental support for the IP version 6. + You will still be able to do traditional IPv4 networking as well. +diff -NurpP --minimal linux-3.18.5/net/ipv6/addrconf.c linux-3.18.5-vs2.3.7.3/net/ipv6/addrconf.c +--- linux-3.18.5/net/ipv6/addrconf.c 2015-01-17 02:40:25.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/net/ipv6/addrconf.c 2015-01-19 10:58:31.000000000 +0000 +@@ -90,6 +90,8 @@ + #include + #include + #include ++#include ++#include + + /* Set to 3 to get tracing... */ + #define ACONF_DEBUG 2 +@@ -1319,7 +1321,7 @@ out: + + int ipv6_dev_get_saddr(struct net *net, const struct net_device *dst_dev, + const struct in6_addr *daddr, unsigned int prefs, +- struct in6_addr *saddr) ++ struct in6_addr *saddr, struct nx_info *nxi) + { + struct ipv6_saddr_score scores[2], + *score = &scores[0], *hiscore = &scores[1]; +@@ -1391,6 +1393,8 @@ int ipv6_dev_get_saddr(struct net *net, + dev->name); + continue; + } ++ if (!v6_addr_in_nx_info(nxi, &score->ifa->addr, -1)) ++ continue; + + score->rule = -1; + bitmap_zero(score->scorebits, IPV6_SADDR_RULE_MAX); +@@ -3503,7 +3507,10 @@ static void if6_seq_stop(struct seq_file + static int if6_seq_show(struct seq_file *seq, void *v) + { + struct inet6_ifaddr *ifp = (struct inet6_ifaddr *)v; +- seq_printf(seq, "%pi6 %02x %02x %02x %02x %8s\n", + -+#define VCMD_get_version VC_CMD(VERSION, 0, 0) -+#define VCMD_get_vci VC_CMD(VERSION, 1, 0) ++ if (nx_check(0, VS_ADMIN|VS_WATCH) || ++ v6_addr_in_nx_info(current_nx_info(), &ifp->addr, -1)) ++ seq_printf(seq, "%pi6 %02x %02x %02x %02x %8s\n", + &ifp->addr, + ifp->idev->dev->ifindex, + ifp->prefix_len, +@@ -4084,6 +4091,11 @@ static int in6_dump_addrs(struct inet6_d + struct ifacaddr6 *ifaca; + int err = 1; + int ip_idx = *p_ip_idx; ++ struct nx_info *nxi = skb->sk ? skb->sk->sk_nx_info : NULL; + -+#endif /* _UAPI_VS_SWITCH_H */ -diff -NurpP --minimal linux-3.7-vs2.3.5.1.3/include/uapi/vserver/tag_cmd.h linux-3.7-vs2.3.5.1.3-uapi/include/uapi/vserver/tag_cmd.h ---- linux-3.7-vs2.3.5.1.3/include/uapi/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.3-uapi/include/uapi/vserver/tag_cmd.h 2012-12-13 22:22:21.000000000 +0000 -@@ -0,0 +1,14 @@ -+#ifndef _UAPI_VS_TAG_CMD_H -+#define _UAPI_VS_TAG_CMD_H ++ /* disable ipv6 on non v6 guests */ ++ if (nxi && !nx_info_has_v6(nxi)) ++ return skb->len; + + read_lock_bh(&idev->lock); + switch (type) { +@@ -4094,6 +4106,8 @@ static int in6_dump_addrs(struct inet6_d + list_for_each_entry(ifa, &idev->addr_list, if_list) { + if (++ip_idx < s_ip_idx) + continue; ++ if (!v6_addr_in_nx_info(nxi, &ifa->addr, -1)) ++ continue; + err = inet6_fill_ifaddr(skb, ifa, + NETLINK_CB(cb->skb).portid, + cb->nlh->nlmsg_seq, +@@ -4111,6 +4125,8 @@ static int in6_dump_addrs(struct inet6_d + ifmca = ifmca->next, ip_idx++) { + if (ip_idx < s_ip_idx) + continue; ++ if (!v6_addr_in_nx_info(nxi, &ifmca->mca_addr, -1)) ++ continue; + err = inet6_fill_ifmcaddr(skb, ifmca, + NETLINK_CB(cb->skb).portid, + cb->nlh->nlmsg_seq, +@@ -4126,6 +4142,8 @@ static int in6_dump_addrs(struct inet6_d + ifaca = ifaca->aca_next, ip_idx++) { + if (ip_idx < s_ip_idx) + continue; ++ if (!v6_addr_in_nx_info(nxi, &ifaca->aca_addr, -1)) ++ continue; + err = inet6_fill_ifacaddr(skb, ifaca, + NETLINK_CB(cb->skb).portid, + cb->nlh->nlmsg_seq, +@@ -4154,6 +4172,10 @@ static int inet6_dump_addr(struct sk_buf + struct inet6_dev *idev; + struct hlist_head *head; + ++ /* FIXME: maybe disable ipv6 on non v6 guests? ++ if (skb->sk && skb->sk->sk_vx_info) ++ return skb->len; */ + + s_h = cb->args[0]; + s_idx = idx = cb->args[1]; + s_ip_idx = ip_idx = cb->args[2]; +@@ -4617,6 +4639,7 @@ static int inet6_dump_ifinfo(struct sk_b + struct net_device *dev; + struct inet6_dev *idev; + struct hlist_head *head; ++ struct nx_info *nxi = skb->sk ? skb->sk->sk_nx_info : NULL; + + s_h = cb->args[0]; + s_idx = cb->args[1]; +@@ -4628,6 +4651,8 @@ static int inet6_dump_ifinfo(struct sk_b + hlist_for_each_entry_rcu(dev, head, index_hlist) { + if (idx < s_idx) + goto cont; ++ if (!v6_dev_in_nx_info(dev, nxi)) ++ goto cont; + idev = __in6_dev_get(dev); + if (!idev) + goto cont; +diff -NurpP --minimal linux-3.18.5/net/ipv6/af_inet6.c linux-3.18.5-vs2.3.7.3/net/ipv6/af_inet6.c +--- linux-3.18.5/net/ipv6/af_inet6.c 2015-01-17 02:40:25.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/net/ipv6/af_inet6.c 2015-01-19 10:58:31.000000000 +0000 +@@ -43,6 +43,8 @@ + #include + #include + #include ++#include ++#include + + #include + #include +@@ -155,10 +157,13 @@ lookup_protocol: + } + + err = -EPERM; ++ if ((protocol == IPPROTO_ICMPV6) && ++ nx_capable(CAP_NET_RAW, NXC_RAW_ICMP)) ++ goto override; + if (sock->type == SOCK_RAW && !kern && + !ns_capable(net->user_ns, CAP_NET_RAW)) + goto out_rcu_unlock; +- ++override: + sock->ops = answer->ops; + answer_prot = answer->prot; + answer_flags = answer->flags; +@@ -256,6 +261,7 @@ int inet6_bind(struct socket *sock, stru + struct inet_sock *inet = inet_sk(sk); + struct ipv6_pinfo *np = inet6_sk(sk); + struct net *net = sock_net(sk); ++ struct nx_v6_sock_addr nsa; + __be32 v4addr = 0; + unsigned short snum; + int addr_type = 0; +@@ -271,6 +277,10 @@ int inet6_bind(struct socket *sock, stru + if (addr->sin6_family != AF_INET6) + return -EAFNOSUPPORT; + ++ err = v6_map_sock_addr(inet, addr, &nsa); ++ if (err) ++ return err; + -+/* vinfo commands */ + addr_type = ipv6_addr_type(&addr->sin6_addr); + if ((addr_type & IPV6_ADDR_MULTICAST) && sock->type == SOCK_STREAM) + return -EINVAL; +@@ -311,6 +321,10 @@ int inet6_bind(struct socket *sock, stru + err = -EADDRNOTAVAIL; + goto out; + } ++ if (!v4_addr_in_nx_info(sk->sk_nx_info, v4addr, NXA_MASK_BIND)) { ++ err = -EADDRNOTAVAIL; ++ goto out; ++ } + } else { + if (addr_type != IPV6_ADDR_ANY) { + struct net_device *dev = NULL; +@@ -337,6 +351,11 @@ int inet6_bind(struct socket *sock, stru + } + } + ++ if (!v6_addr_in_nx_info(sk->sk_nx_info, &addr->sin6_addr, -1)) { ++ err = -EADDRNOTAVAIL; ++ goto out_unlock; ++ } + -+#define VCMD_task_tag VC_CMD(VINFO, 3, 0) + /* ipv4 addr of the socket is invalid. Only the + * unspecified and mapped address have a v4 equivalent. + */ +@@ -353,6 +372,9 @@ int inet6_bind(struct socket *sock, stru + } + } + ++ /* what's that for? */ ++ v6_set_sock_addr(inet, &nsa); + + inet->inet_rcv_saddr = v4addr; + inet->inet_saddr = v4addr; + +@@ -454,9 +476,11 @@ int inet6_getname(struct socket *sock, s + return -ENOTCONN; + sin->sin6_port = inet->inet_dport; + sin->sin6_addr = sk->sk_v6_daddr; ++ /* FIXME: remap lback? */ + if (np->sndflow) + sin->sin6_flowinfo = np->flow_label; + } else { ++ /* FIXME: remap lback? */ + if (ipv6_addr_any(&sk->sk_v6_rcv_saddr)) + sin->sin6_addr = np->saddr; + else +diff -NurpP --minimal linux-3.18.5/net/ipv6/datagram.c linux-3.18.5-vs2.3.7.3/net/ipv6/datagram.c +--- linux-3.18.5/net/ipv6/datagram.c 2015-01-17 02:40:25.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/net/ipv6/datagram.c 2015-01-19 10:58:31.000000000 +0000 +@@ -675,7 +675,7 @@ int ip6_datagram_send_ctl(struct net *ne + + rcu_read_lock(); + if (fl6->flowi6_oif) { +- dev = dev_get_by_index_rcu(net, fl6->flowi6_oif); ++ dev = dev_get_by_index_real_rcu(net, fl6->flowi6_oif); + if (!dev) { + rcu_read_unlock(); + return -ENODEV; +diff -NurpP --minimal linux-3.18.5/net/ipv6/fib6_rules.c linux-3.18.5-vs2.3.7.3/net/ipv6/fib6_rules.c +--- linux-3.18.5/net/ipv6/fib6_rules.c 2014-06-12 11:35:11.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/net/ipv6/fib6_rules.c 2015-01-19 10:58:31.000000000 +0000 +@@ -97,7 +97,7 @@ static int fib6_rule_action(struct fib_r + ip6_dst_idev(&rt->dst)->dev, + &flp6->daddr, + rt6_flags2srcprefs(flags), +- &saddr)) ++ &saddr, NULL)) + goto again; + if (!ipv6_prefix_equal(&saddr, &r->src.addr, + r->src.plen)) +diff -NurpP --minimal linux-3.18.5/net/ipv6/inet6_hashtables.c linux-3.18.5-vs2.3.7.3/net/ipv6/inet6_hashtables.c +--- linux-3.18.5/net/ipv6/inet6_hashtables.c 2015-01-17 02:40:25.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/net/ipv6/inet6_hashtables.c 2015-01-19 10:58:31.000000000 +0000 +@@ -16,6 +16,7 @@ + + #include + #include ++#include + + #include + #include +@@ -116,7 +117,6 @@ struct sock *__inet6_lookup_established( + unsigned int slot = hash & hashinfo->ehash_mask; + struct inet_ehash_bucket *head = &hashinfo->ehash[slot]; + +- + rcu_read_lock(); + begin: + sk_nulls_for_each_rcu(sk, node, &head->chain) { +@@ -158,6 +158,9 @@ static inline int compute_score(struct s + if (!ipv6_addr_equal(&sk->sk_v6_rcv_saddr, daddr)) + return -1; + score++; ++ } else { ++ if (!v6_addr_in_nx_info(sk->sk_nx_info, daddr, -1)) ++ return -1; + } + if (sk->sk_bound_dev_if) { + if (sk->sk_bound_dev_if != dif) +diff -NurpP --minimal linux-3.18.5/net/ipv6/ip6_fib.c linux-3.18.5-vs2.3.7.3/net/ipv6/ip6_fib.c +--- linux-3.18.5/net/ipv6/ip6_fib.c 2015-01-17 02:40:25.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/net/ipv6/ip6_fib.c 2015-01-19 10:58:31.000000000 +0000 +@@ -1845,6 +1845,7 @@ static int ipv6_route_seq_show(struct se + struct rt6_info *rt = v; + struct ipv6_route_iter *iter = seq->private; + ++ /* FIXME: check for network context? */ + seq_printf(seq, "%pi6 %02x ", &rt->rt6i_dst.addr, rt->rt6i_dst.plen); + + #ifdef CONFIG_IPV6_SUBTREES +diff -NurpP --minimal linux-3.18.5/net/ipv6/ip6_output.c linux-3.18.5-vs2.3.7.3/net/ipv6/ip6_output.c +--- linux-3.18.5/net/ipv6/ip6_output.c 2015-01-17 02:40:25.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/net/ipv6/ip6_output.c 2015-01-19 10:58:31.000000000 +0000 +@@ -907,7 +907,8 @@ static int ip6_dst_lookup_tail(struct so + struct rt6_info *rt = (struct rt6_info *) *dst; + err = ip6_route_get_saddr(net, rt, &fl6->daddr, + sk ? inet6_sk(sk)->srcprefs : 0, +- &fl6->saddr); ++ &fl6->saddr, ++ sk ? sk->sk_nx_info : NULL); + if (err) + goto out_err_release; + } +diff -NurpP --minimal linux-3.18.5/net/ipv6/ndisc.c linux-3.18.5-vs2.3.7.3/net/ipv6/ndisc.c +--- linux-3.18.5/net/ipv6/ndisc.c 2015-01-17 02:40:25.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/net/ipv6/ndisc.c 2015-01-19 10:58:31.000000000 +0000 +@@ -487,7 +487,7 @@ void ndisc_send_na(struct net_device *de + } else { + if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr, + inet6_sk(dev_net(dev)->ipv6.ndisc_sk)->srcprefs, +- &tmpaddr)) ++ &tmpaddr, NULL)) + return; + src_addr = &tmpaddr; + } +diff -NurpP --minimal linux-3.18.5/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c linux-3.18.5-vs2.3.7.3/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c +--- linux-3.18.5/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c 2015-01-17 02:40:25.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c 2015-01-19 23:51:41.000000000 +0000 +@@ -35,7 +35,7 @@ nf_nat_masquerade_ipv6(struct sk_buff *s + ctinfo == IP_CT_RELATED_REPLY)); + + if (ipv6_dev_get_saddr(dev_net(out), out, +- &ipv6_hdr(skb)->daddr, 0, &src) < 0) ++ &ipv6_hdr(skb)->daddr, 0, &src, NULL) < 0) + return NF_DROP; + + nfct_nat(ct)->masq_index = out->ifindex; +diff -NurpP --minimal linux-3.18.5/net/ipv6/raw.c linux-3.18.5-vs2.3.7.3/net/ipv6/raw.c +--- linux-3.18.5/net/ipv6/raw.c 2015-01-17 02:40:25.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/net/ipv6/raw.c 2015-01-19 10:58:31.000000000 +0000 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -291,6 +292,13 @@ static int rawv6_bind(struct sock *sk, s + goto out_unlock; + } + ++ if (!v6_addr_in_nx_info(sk->sk_nx_info, &addr->sin6_addr, -1)) { ++ err = -EADDRNOTAVAIL; ++ if (dev) ++ dev_put(dev); ++ goto out; ++ } + -+/* context commands */ + /* ipv4 addr of the socket is invalid. Only the + * unspecified and mapped address have a v4 equivalent. + */ +diff -NurpP --minimal linux-3.18.5/net/ipv6/route.c linux-3.18.5-vs2.3.7.3/net/ipv6/route.c +--- linux-3.18.5/net/ipv6/route.c 2015-01-17 02:40:25.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/net/ipv6/route.c 2015-01-19 11:21:40.000000000 +0000 +@@ -58,6 +58,7 @@ + #include + #include + #include ++#include + + #include + +@@ -2183,15 +2184,17 @@ int ip6_route_get_saddr(struct net *net, + struct rt6_info *rt, + const struct in6_addr *daddr, + unsigned int prefs, +- struct in6_addr *saddr) ++ struct in6_addr *saddr, ++ struct nx_info *nxi) + { + struct inet6_dev *idev = ip6_dst_idev((struct dst_entry *)rt); + int err = 0; +- if (rt->rt6i_prefsrc.plen) ++ if (rt->rt6i_prefsrc.plen && (!nxi || ++ v6_addr_in_nx_info(nxi, &rt->rt6i_prefsrc.addr, NXA_TYPE_ADDR))) + *saddr = rt->rt6i_prefsrc.addr; + else + err = ipv6_dev_get_saddr(net, idev ? idev->dev : NULL, +- daddr, prefs, saddr); ++ daddr, prefs, saddr, nxi); + return err; + } + +@@ -2632,7 +2635,8 @@ static int rt6_fill_node(struct net *net + goto nla_put_failure; + } else if (dst) { + struct in6_addr saddr_buf; +- if (ip6_route_get_saddr(net, rt, dst, 0, &saddr_buf) == 0 && ++ if (ip6_route_get_saddr(net, rt, dst, 0, &saddr_buf, ++ (skb->sk ? skb->sk->sk_nx_info : NULL)) == 0 && + nla_put(skb, RTA_PREFSRC, 16, &saddr_buf)) + goto nla_put_failure; + } +diff -NurpP --minimal linux-3.18.5/net/ipv6/tcp_ipv6.c linux-3.18.5-vs2.3.7.3/net/ipv6/tcp_ipv6.c +--- linux-3.18.5/net/ipv6/tcp_ipv6.c 2015-02-05 18:02:46.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/net/ipv6/tcp_ipv6.c 2015-01-28 11:48:02.000000000 +0000 +@@ -69,6 +69,7 @@ + + #include + #include ++#include + + static void tcp_v6_send_reset(struct sock *sk, struct sk_buff *skb); + static void tcp_v6_reqsk_send_ack(struct sock *sk, struct sk_buff *skb, +@@ -164,8 +165,15 @@ static int tcp_v6_connect(struct sock *s + * connect() to INADDR_ANY means loopback (BSD'ism). + */ + +- if (ipv6_addr_any(&usin->sin6_addr)) +- usin->sin6_addr.s6_addr[15] = 0x1; ++ if(ipv6_addr_any(&usin->sin6_addr)) { ++ struct nx_info *nxi = sk->sk_nx_info; + -+#define VCMD_tag_migrate VC_CMD(TAGMIG, 1, 0) ++ if (nxi && nx_info_has_v6(nxi)) ++ /* FIXME: remap lback? */ ++ usin->sin6_addr = nxi->v6.ip; ++ else ++ usin->sin6_addr.s6_addr[15] = 0x1; ++ } + + addr_type = ipv6_addr_type(&usin->sin6_addr); + +diff -NurpP --minimal linux-3.18.5/net/ipv6/udp.c linux-3.18.5-vs2.3.7.3/net/ipv6/udp.c +--- linux-3.18.5/net/ipv6/udp.c 2015-01-17 02:40:25.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/net/ipv6/udp.c 2015-01-19 10:58:32.000000000 +0000 +@@ -47,6 +47,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -159,6 +160,10 @@ static inline int compute_score(struct s + if (inet->inet_dport != sport) + return -1; + score++; ++ } else { ++ /* block non nx_info ips */ ++ if (!v6_addr_in_nx_info(sk->sk_nx_info, daddr, -1)) ++ return -1; + } + if (!ipv6_addr_any(&sk->sk_v6_rcv_saddr)) { + if (!ipv6_addr_equal(&sk->sk_v6_rcv_saddr, daddr)) +diff -NurpP --minimal linux-3.18.5/net/ipv6/xfrm6_policy.c linux-3.18.5-vs2.3.7.3/net/ipv6/xfrm6_policy.c +--- linux-3.18.5/net/ipv6/xfrm6_policy.c 2015-01-17 02:40:25.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/net/ipv6/xfrm6_policy.c 2015-01-19 10:58:32.000000000 +0000 +@@ -63,7 +63,7 @@ static int xfrm6_get_saddr(struct net *n + dev = ip6_dst_idev(dst)->dev; + ipv6_dev_get_saddr(dev_net(dev), dev, + (struct in6_addr *)&daddr->a6, 0, +- (struct in6_addr *)&saddr->a6); ++ (struct in6_addr *)&saddr->a6, NULL); + dst_release(dst); + return 0; + } +diff -NurpP --minimal linux-3.18.5/net/netfilter/ipvs/ip_vs_xmit.c linux-3.18.5-vs2.3.7.3/net/netfilter/ipvs/ip_vs_xmit.c +--- linux-3.18.5/net/netfilter/ipvs/ip_vs_xmit.c 2015-01-17 02:40:25.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/net/netfilter/ipvs/ip_vs_xmit.c 2015-01-19 10:58:32.000000000 +0000 +@@ -379,7 +379,7 @@ __ip_vs_route_output_v6(struct net *net, + return dst; + if (ipv6_addr_any(&fl6.saddr) && + ipv6_dev_get_saddr(net, ip6_dst_idev(dst)->dev, +- &fl6.daddr, 0, &fl6.saddr) < 0) ++ &fl6.daddr, 0, &fl6.saddr, NULL) < 0) + goto out_err; + if (do_xfrm) { + dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), NULL, 0); +diff -NurpP --minimal linux-3.18.5/net/netlink/af_netlink.c linux-3.18.5-vs2.3.7.3/net/netlink/af_netlink.c +--- linux-3.18.5/net/netlink/af_netlink.c 2015-02-05 18:02:46.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/net/netlink/af_netlink.c 2015-01-28 11:48:02.000000000 +0000 +@@ -61,6 +61,9 @@ + #include + #include + #include ++#include ++#include ++#include + + #include + #include +@@ -2899,6 +2902,8 @@ static struct sock *netlink_seq_socket_i + + if (sock_net(s) != seq_file_net(seq)) + continue; ++ if (!nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT)) ++ continue; + if (off == pos) { + iter->link = i; + iter->hash_idx = j; +diff -NurpP --minimal linux-3.18.5/net/socket.c linux-3.18.5-vs2.3.7.3/net/socket.c +--- linux-3.18.5/net/socket.c 2015-01-17 02:40:30.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/net/socket.c 2015-01-19 10:58:32.000000000 +0000 +@@ -99,6 +99,9 @@ + + #include + #include ++#include ++#include ++#include + + #include + #include +@@ -634,13 +637,29 @@ static inline int __sock_sendmsg_nosec(s + struct msghdr *msg, size_t size) + { + struct sock_iocb *si = kiocb_to_siocb(iocb); ++ size_t len; + + si->sock = sock; + si->scm = NULL; + si->msg = msg; + si->size = size; + +- return sock->ops->sendmsg(iocb, sock, msg, size); ++ len = sock->ops->sendmsg(iocb, sock, msg, size); ++ if (sock->sk) { ++ if (len == size) ++ vx_sock_send(sock->sk, size); ++ else ++ vx_sock_fail(sock->sk, size); ++ } ++ vxdprintk(VXD_CBIT(net, 7), ++ "__sock_sendmsg: %p[%p,%p,%p;%d/%d]:%d/%zu", ++ sock, sock->sk, ++ (sock->sk)?sock->sk->sk_nx_info:0, ++ (sock->sk)?sock->sk->sk_vx_info:0, ++ (sock->sk)?sock->sk->sk_xid:0, ++ (sock->sk)?sock->sk->sk_nid:0, ++ (unsigned int)size, len); ++ return len; + } + + static inline int __sock_sendmsg(struct kiocb *iocb, struct socket *sock, +@@ -780,6 +799,7 @@ static inline int __sock_recvmsg_nosec(s + struct msghdr *msg, size_t size, int flags) + { + struct sock_iocb *si = kiocb_to_siocb(iocb); ++ int len; + + si->sock = sock; + si->scm = NULL; +@@ -787,7 +807,18 @@ static inline int __sock_recvmsg_nosec(s + si->size = size; + si->flags = flags; + +- return sock->ops->recvmsg(iocb, sock, msg, size, flags); ++ len = sock->ops->recvmsg(iocb, sock, msg, size, flags); ++ if ((len >= 0) && sock->sk) ++ vx_sock_recv(sock->sk, len); ++ vxdprintk(VXD_CBIT(net, 7), ++ "__sock_recvmsg: %p[%p,%p,%p;%d/%d]:%d/%d", ++ sock, sock->sk, ++ (sock->sk)?sock->sk->sk_nx_info:0, ++ (sock->sk)?sock->sk->sk_vx_info:0, ++ (sock->sk)?sock->sk->sk_xid:0, ++ (sock->sk)?sock->sk->sk_nid:0, ++ (unsigned int)size, len); ++ return len; + } + + static inline int __sock_recvmsg(struct kiocb *iocb, struct socket *sock, +@@ -1264,6 +1295,13 @@ int __sock_create(struct net *net, int f + if (type < 0 || type >= SOCK_MAX) + return -EINVAL; + ++ if (!nx_check(0, VS_ADMIN)) { ++ if (family == PF_INET && !current_nx_info_has_v4()) ++ return -EAFNOSUPPORT; ++ if (family == PF_INET6 && !current_nx_info_has_v6()) ++ return -EAFNOSUPPORT; ++ } + -+#endif /* _UAPI_VS_TAG_CMD_H */ + /* Compatibility. + + This uglymoron is moved from INET layer to here to avoid +@@ -1398,6 +1436,7 @@ SYSCALL_DEFINE3(socket, int, family, int + if (retval < 0) + goto out; + ++ set_bit(SOCK_USER_SOCKET, &sock->flags); + retval = sock_map_fd(sock, flags & (O_CLOEXEC | O_NONBLOCK)); + if (retval < 0) + goto out_release; +@@ -1439,10 +1478,12 @@ SYSCALL_DEFINE4(socketpair, int, family, + err = sock_create(family, type, protocol, &sock1); + if (err < 0) + goto out; ++ set_bit(SOCK_USER_SOCKET, &sock1->flags); + + err = sock_create(family, type, protocol, &sock2); + if (err < 0) + goto out_release_1; ++ set_bit(SOCK_USER_SOCKET, &sock2->flags); + + err = sock1->ops->socketpair(sock1, sock2); + if (err < 0) +diff -NurpP --minimal linux-3.18.5/net/sunrpc/auth.c linux-3.18.5-vs2.3.7.3/net/sunrpc/auth.c +--- linux-3.18.5/net/sunrpc/auth.c 2015-01-16 22:19:32.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/net/sunrpc/auth.c 2015-01-19 11:18:55.000000000 +0000 +@@ -15,6 +15,7 @@ + #include + #include + #include ++#include + + #ifdef RPC_DEBUG + # define RPCDBG_FACILITY RPCDBG_AUTH +@@ -630,6 +631,7 @@ rpcauth_lookupcred(struct rpc_auth *auth + memset(&acred, 0, sizeof(acred)); + acred.uid = cred->fsuid; + acred.gid = cred->fsgid; ++ acred.tag = make_ktag(&init_user_ns, dx_current_tag()); + acred.group_info = cred->group_info; + ret = auth->au_ops->lookup_cred(auth, &acred, flags); + return ret; +@@ -669,6 +671,7 @@ rpcauth_bind_root_cred(struct rpc_task * + struct auth_cred acred = { + .uid = GLOBAL_ROOT_UID, + .gid = GLOBAL_ROOT_GID, ++ .tag = KTAGT_INIT(dx_current_tag()), + }; + + dprintk("RPC: %5u looking up %s cred\n", +diff -NurpP --minimal linux-3.18.5/net/sunrpc/auth_unix.c linux-3.18.5-vs2.3.7.3/net/sunrpc/auth_unix.c +--- linux-3.18.5/net/sunrpc/auth_unix.c 2013-11-25 15:47:08.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/net/sunrpc/auth_unix.c 2015-01-19 10:58:32.000000000 +0000 +@@ -13,11 +13,13 @@ + #include + #include + #include ++#include + + #define NFS_NGROUPS 16 + + struct unx_cred { + struct rpc_cred uc_base; ++ ktag_t uc_tag; + kgid_t uc_gid; + kgid_t uc_gids[NFS_NGROUPS]; + }; +@@ -80,6 +82,7 @@ unx_create_cred(struct rpc_auth *auth, s + groups = NFS_NGROUPS; + + cred->uc_gid = acred->gid; ++ cred->uc_tag = acred->tag; + for (i = 0; i < groups; i++) + cred->uc_gids[i] = GROUP_AT(acred->group_info, i); + if (i < NFS_NGROUPS) +@@ -121,7 +124,9 @@ unx_match(struct auth_cred *acred, struc + unsigned int i; + + +- if (!uid_eq(cred->uc_uid, acred->uid) || !gid_eq(cred->uc_gid, acred->gid)) ++ if (!uid_eq(cred->uc_uid, acred->uid) || ++ !gid_eq(cred->uc_gid, acred->gid) || ++ !tag_eq(cred->uc_tag, acred->tag)) + return 0; + + if (acred->group_info != NULL) +@@ -146,7 +151,7 @@ unx_marshal(struct rpc_task *task, __be3 + struct rpc_clnt *clnt = task->tk_client; + struct unx_cred *cred = container_of(task->tk_rqstp->rq_cred, struct unx_cred, uc_base); + __be32 *base, *hold; +- int i; ++ int i, tag; + + *p++ = htonl(RPC_AUTH_UNIX); + base = p++; +@@ -157,8 +162,11 @@ unx_marshal(struct rpc_task *task, __be3 + */ + p = xdr_encode_array(p, clnt->cl_nodename, clnt->cl_nodelen); + +- *p++ = htonl((u32) from_kuid(&init_user_ns, cred->uc_uid)); +- *p++ = htonl((u32) from_kgid(&init_user_ns, cred->uc_gid)); ++ tag = task->tk_client->cl_tag; ++ *p++ = htonl((u32) from_kuid(&init_user_ns, ++ TAGINO_KUID(tag, cred->uc_uid, cred->uc_tag))); ++ *p++ = htonl((u32) from_kgid(&init_user_ns, ++ TAGINO_KGID(tag, cred->uc_gid, cred->uc_tag))); + hold = p++; + for (i = 0; i < 16 && gid_valid(cred->uc_gids[i]); i++) + *p++ = htonl((u32) from_kgid(&init_user_ns, cred->uc_gids[i])); +diff -NurpP --minimal linux-3.18.5/net/sunrpc/clnt.c linux-3.18.5-vs2.3.7.3/net/sunrpc/clnt.c +--- linux-3.18.5/net/sunrpc/clnt.c 2015-01-17 02:40:30.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/net/sunrpc/clnt.c 2015-01-19 10:58:32.000000000 +0000 +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -468,6 +469,9 @@ struct rpc_clnt *rpc_create_xprt(struct + if (!(args->flags & RPC_CLNT_CREATE_QUIET)) + clnt->cl_chatty = 1; + ++ /* TODO: handle RPC_CLNT_CREATE_TAGGED ++ if (args->flags & RPC_CLNT_CREATE_TAGGED) ++ clnt->cl_tag = 1; */ + return clnt; + } + EXPORT_SYMBOL_GPL(rpc_create_xprt); +diff -NurpP --minimal linux-3.18.5/net/unix/af_unix.c linux-3.18.5-vs2.3.7.3/net/unix/af_unix.c +--- linux-3.18.5/net/unix/af_unix.c 2014-09-03 13:19:49.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/net/unix/af_unix.c 2015-01-19 10:58:32.000000000 +0000 +@@ -117,6 +117,8 @@ + #include + #include + #include ++#include ++#include + + struct hlist_head unix_socket_table[2 * UNIX_HASH_SIZE]; + EXPORT_SYMBOL_GPL(unix_socket_table); +@@ -272,6 +274,8 @@ static struct sock *__unix_find_socket_b + if (!net_eq(sock_net(s), net)) + continue; + ++ if (!nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT)) ++ continue; + if (u->addr->len == len && + !memcmp(u->addr->name, sunname, len)) + goto found; +@@ -2283,6 +2287,8 @@ static struct sock *unix_from_bucket(str + for (sk = sk_head(&unix_socket_table[bucket]); sk; sk = sk_next(sk)) { + if (sock_net(sk) != seq_file_net(seq)) + continue; ++ if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)) ++ continue; + if (++count == offset) + break; + } +@@ -2300,6 +2306,8 @@ static struct sock *unix_next_socket(str + sk = sk_next(sk); + if (!sk) + goto next_bucket; ++ if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)) ++ continue; + if (sock_net(sk) == seq_file_net(seq)) + return sk; + } +diff -NurpP --minimal linux-3.18.5/scripts/checksyscalls.sh linux-3.18.5-vs2.3.7.3/scripts/checksyscalls.sh +--- linux-3.18.5/scripts/checksyscalls.sh 2014-06-12 13:03:01.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/scripts/checksyscalls.sh 2015-01-19 10:58:32.000000000 +0000 +@@ -196,7 +196,6 @@ cat << EOF + #define __IGNORE_afs_syscall + #define __IGNORE_getpmsg + #define __IGNORE_putpmsg +-#define __IGNORE_vserver + EOF + } + +diff -NurpP --minimal linux-3.18.5/security/commoncap.c linux-3.18.5-vs2.3.7.3/security/commoncap.c +--- linux-3.18.5/security/commoncap.c 2015-01-16 22:19:32.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/security/commoncap.c 2015-01-19 10:58:32.000000000 +0000 +@@ -76,6 +76,7 @@ int cap_netlink_send(struct sock *sk, st + int cap_capable(const struct cred *cred, struct user_namespace *targ_ns, + int cap, int audit) + { ++ struct vx_info *vxi = current_vx_info(); /* FIXME: get vxi from cred? */ + struct user_namespace *ns = targ_ns; + + /* See if cred has the capability in the target user namespace +@@ -84,8 +85,12 @@ int cap_capable(const struct cred *cred, + */ + for (;;) { + /* Do we have the necessary capabilities? */ +- if (ns == cred->user_ns) +- return cap_raised(cred->cap_effective, cap) ? 0 : -EPERM; ++ if (ns == cred->user_ns) { ++ if (vx_info_flags(vxi, VXF_STATE_SETUP, 0) && ++ cap_raised(cred->cap_effective, cap)) ++ return 0; ++ return vx_cap_raised(vxi, cred->cap_effective, cap) ? 0 : -EPERM; ++ } + + /* Have we tried all of the parent namespaces? */ + if (ns == &init_user_ns) +@@ -631,7 +636,7 @@ int cap_inode_setxattr(struct dentry *de + + if (!strncmp(name, XATTR_SECURITY_PREFIX, + sizeof(XATTR_SECURITY_PREFIX) - 1) && +- !capable(CAP_SYS_ADMIN)) ++ !vx_capable(CAP_SYS_ADMIN, VXC_FS_SECURITY)) + return -EPERM; + return 0; + } +@@ -657,7 +662,7 @@ int cap_inode_removexattr(struct dentry + + if (!strncmp(name, XATTR_SECURITY_PREFIX, + sizeof(XATTR_SECURITY_PREFIX) - 1) && +- !capable(CAP_SYS_ADMIN)) ++ !vx_capable(CAP_SYS_ADMIN, VXC_FS_SECURITY)) + return -EPERM; + return 0; + } +diff -NurpP --minimal linux-3.18.5/security/selinux/hooks.c linux-3.18.5-vs2.3.7.3/security/selinux/hooks.c +--- linux-3.18.5/security/selinux/hooks.c 2015-01-17 02:40:31.000000000 +0000 ++++ linux-3.18.5-vs2.3.7.3/security/selinux/hooks.c 2015-01-19 10:58:32.000000000 +0000 +@@ -68,7 +68,6 @@ + #include + #include + #include /* for Unix socket types */ +-#include /* for Unix socket types */ + #include + #include + #include