X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kernel-vserver-2.3.patch;h=1f7aa6f129fec3d0bc6477a0db49aa85d2d5c4bc;hb=6d1765514cb22667c025eb69327c29f5a698444f;hp=26078e5ee5efa71e44b4b28db7dd10721b917a7b;hpb=3bac966d7180441cd29b387564e8fccb3fda018c;p=packages%2Fkernel.git diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch index 26078e5e..1f7aa6f1 100644 --- a/kernel-vserver-2.3.patch +++ b/kernel-vserver-2.3.patch @@ -1,7 +1,165 @@ -diff -NurpP --minimal linux-2.6.36.2/arch/alpha/Kconfig linux-2.6.36.2-vs2.3.0.36.38.2/arch/alpha/Kconfig ---- linux-2.6.36.2/arch/alpha/Kconfig 2010-10-21 13:06:45.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/alpha/Kconfig 2010-10-21 13:09:36.000000000 +0200 -@@ -677,6 +677,8 @@ config DUMMY_CONSOLE +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: ++ ++ 2 4 "vx_map_tgid: %p/%llx: %d -> %d" ++ "vx_rmap_tgid: %p/%llx: %d -> %d" ++ ++debug_dlim: ++ ++ 0 1 "ALLOC (%p,#%d)%c inode (%d)" ++ "FREE (%p,#%d)%c inode" ++ 1 2 "ALLOC (%p,#%d)%c %lld bytes (%d)" ++ "FREE (%p,#%d)%c %lld bytes" ++ 2 4 "ADJUST: %lld,%lld on %ld,%ld [mult=%d]" ++ 3 8 "ext3_has_free_blocks(%p): %lu<%lu+1, %c, %u!=%u r=%d" ++ "ext3_has_free_blocks(%p): free=%lu, root=%lu" ++ "rcu_free_dl_info(%p)" ++ 4 10 "alloc_dl_info(%p,%d) = %p" ++ "dealloc_dl_info(%p)" ++ "get_dl_info(%p[#%d.%d])" ++ "put_dl_info(%p[#%d.%d])" ++ 5 20 "alloc_dl_info(%p,%d)*" ++ 6 40 "__hash_dl_info: %p[#%d]" ++ "__unhash_dl_info: %p[#%d]" ++ 7 80 "locate_dl_info(%p,#%d) = %p" ++ ++debug_misc: ++ ++ 0 1 "destroy_dqhash: %p [#0x%08x] c=%d" ++ "new_dqhash: %p [#0x%08x]" ++ "vroot[%d]_clr_dev: dev=%p[%lu,%d:%d]" ++ "vroot[%d]_get_real_bdev: dev=%p[%lu,%d:%d]" ++ "vroot[%d]_set_dev: dev=%p[%lu,%d:%d]" ++ "vroot_get_real_bdev not set" ++ 1 2 "cow_break_link(»%s«)" ++ "temp copy »%s«" ++ 2 4 "dentry_open(new): %p" ++ "dentry_open(old): %p" ++ "lookup_create(new): %p" ++ "old path »%s«" ++ "path_lookup(old): %d" ++ "vfs_create(new): %d" ++ "vfs_rename: %d" ++ "vfs_sendfile: %d" ++ 3 8 "fput(new_file=%p[#%d])" ++ "fput(old_file=%p[#%d])" ++ 4 10 "vx_info_kill(%p[#%d],%d,%d) = %d" ++ "vx_info_kill(%p[#%d],%d,%d)*" ++ 5 20 "vs_reboot(%p[#%d],%d)" ++ 6 40 "dropping task %p[#%u,%u] for %p[#%u,%u]" ++ ++debug_net: ++ ++ 2 4 "nx_addr_conflict(%p,%p) %d.%d,%d.%d" ++ 3 8 "inet_bind(%p) %d.%d.%d.%d, %d.%d.%d.%d, %d.%d.%d.%d" ++ "inet_bind(%p)* %p,%p;%lx %d.%d.%d.%d" ++ 4 10 "ip_route_connect(%p) %p,%p;%lx" ++ 5 20 "__addr_in_socket(%p,%d.%d.%d.%d) %p:%d.%d.%d.%d %p;%lx" ++ 6 40 "sk,egf: %p [#%d] (from %d)" ++ "sk,egn: %p [#%d] (from %d)" ++ "sk,req: %p [#%d] (from %d)" ++ "sk: %p [#%d] (from %d)" ++ "tw: %p [#%d] (from %d)" ++ 7 80 "__sock_recvmsg: %p[%p,%p,%p;%d]:%d/%d" ++ "__sock_sendmsg: %p[%p,%p,%p;%d]:%d/%d" ++ ++debug_nid: ++ ++ 0 1 "__lookup_nx_info(#%u): %p[#%u]" ++ "alloc_nx_info(%d) = %p" ++ "create_nx_info(%d) (dynamic rejected)" ++ "create_nx_info(%d) = %p (already there)" ++ "create_nx_info(%d) = %p (new)" ++ "dealloc_nx_info(%p)" ++ 1 2 "alloc_nx_info(%d)*" ++ "create_nx_info(%d)*" ++ 2 4 "get_nx_info(%p[#%d.%d])" ++ "put_nx_info(%p[#%d.%d])" ++ 3 8 "claim_nx_info(%p[#%d.%d.%d]) %p" ++ "clr_nx_info(%p[#%d.%d])" ++ "init_nx_info(%p[#%d.%d])" ++ "release_nx_info(%p[#%d.%d.%d]) %p" ++ "set_nx_info(%p[#%d.%d])" ++ 4 10 "__hash_nx_info: %p[#%d]" ++ "__nx_dynamic_id: [#%d]" ++ "__unhash_nx_info: %p[#%d.%d.%d]" ++ 5 20 "moved task %p into nxi:%p[#%d]" ++ "nx_migrate_task(%p,%p[#%d.%d.%d])" ++ "task_get_nx_info(%p)" ++ 6 40 "nx_clear_persistent(%p[#%d])" ++ ++debug_quota: ++ ++ 0 1 "quota_sync_dqh(%p,%d) discard inode %p" ++ 1 2 "quota_sync_dqh(%p,%d)" ++ "sync_dquots(%p,%d)" ++ "sync_dquots_dqh(%p,%d)" ++ 3 8 "do_quotactl(%p,%d,cmd=%d,id=%d,%p)" ++ ++debug_switch: ++ ++ 0 1 "vc: VCMD_%02d_%d[%d], %d,%p [%d,%d,%x,%x]" ++ 1 2 "vc: VCMD_%02d_%d[%d] = %08lx(%ld) [%d,%d]" ++ 4 10 "%s: (%s %s) returned %s with %d" ++ ++debug_tag: ++ ++ 7 80 "dx_parse_tag(»%s«): %d:#%d" ++ "dx_propagate_tag(%p[#%lu.%d]): %d,%d" ++ ++debug_xid: ++ ++ 0 1 "__lookup_vx_info(#%u): %p[#%u]" ++ "alloc_vx_info(%d) = %p" ++ "alloc_vx_info(%d)*" ++ "create_vx_info(%d) (dynamic rejected)" ++ "create_vx_info(%d) = %p (already there)" ++ "create_vx_info(%d) = %p (new)" ++ "dealloc_vx_info(%p)" ++ "loc_vx_info(%d) = %p (found)" ++ "loc_vx_info(%d) = %p (new)" ++ "loc_vx_info(%d) = %p (not available)" ++ 1 2 "create_vx_info(%d)*" ++ "loc_vx_info(%d)*" ++ 2 4 "get_vx_info(%p[#%d.%d])" ++ "put_vx_info(%p[#%d.%d])" ++ 3 8 "claim_vx_info(%p[#%d.%d.%d]) %p" ++ "clr_vx_info(%p[#%d.%d])" ++ "init_vx_info(%p[#%d.%d])" ++ "release_vx_info(%p[#%d.%d.%d]) %p" ++ "set_vx_info(%p[#%d.%d])" ++ 4 10 "__hash_vx_info: %p[#%d]" ++ "__unhash_vx_info: %p[#%d.%d.%d]" ++ "__vx_dynamic_id: [#%d]" ++ 5 20 "enter_vx_info(%p[#%d],%p) %p[#%d,%p]" ++ "leave_vx_info(%p[#%d,%p]) %p[#%d,%p]" ++ "moved task %p into vxi:%p[#%d]" ++ "task_get_vx_info(%p)" ++ "vx_migrate_task(%p,%p[#%d.%d])" ++ 6 40 "vx_clear_persistent(%p[#%d])" ++ "vx_exit_init(%p[#%d],%p[#%d,%d,%d])" ++ "vx_set_init(%p[#%d],%p[#%d,%d,%d])" ++ "vx_set_persistent(%p[#%d])" ++ "vx_set_reaper(%p[#%d],%p[#%d,%d])" ++ 7 80 "vx_child_reaper(%p[#%u,%u]) = %p[#%u,%u]" ++ ++ ++debug_limit: ++ ++ n 2^n "vx_acc_cres[%5d,%s,%2d]: %5d%s" ++ "vx_cres_avail[%5d,%s,%2d]: %5ld > %5d + %5d" ++ ++ 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.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 @@ -10,55 +168,9 @@ diff -NurpP --minimal linux-2.6.36.2/arch/alpha/Kconfig linux-2.6.36.2-vs2.3.0.3 source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.36.2/arch/alpha/kernel/entry.S linux-2.6.36.2-vs2.3.0.36.38.2/arch/alpha/kernel/entry.S ---- linux-2.6.36.2/arch/alpha/kernel/entry.S 2010-10-21 13:06:45.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/alpha/kernel/entry.S 2010-10-21 13:09:36.000000000 +0200 -@@ -860,24 +860,15 @@ sys_getxgid: - .globl sys_getxpid - .ent sys_getxpid - sys_getxpid: -+ lda $sp, -16($sp) -+ stq $26, 0($sp) - .prologue 0 -- ldq $2, TI_TASK($8) - -- /* See linux/kernel/timer.c sys_getppid for discussion -- about this loop. */ -- ldq $3, TASK_GROUP_LEADER($2) -- ldq $4, TASK_REAL_PARENT($3) -- ldl $0, TASK_TGID($2) --1: ldl $1, TASK_TGID($4) --#ifdef CONFIG_SMP -- mov $4, $5 -- mb -- ldq $3, TASK_GROUP_LEADER($2) -- ldq $4, TASK_REAL_PARENT($3) -- cmpeq $4, $5, $5 -- beq $5, 1b --#endif -- stq $1, 80($sp) -+ lda $16, 96($sp) -+ jsr $26, do_getxpid -+ ldq $26, 0($sp) -+ -+ lda $sp, 16($sp) - ret - .end sys_getxpid - -diff -NurpP --minimal linux-2.6.36.2/arch/alpha/kernel/ptrace.c linux-2.6.36.2-vs2.3.0.36.38.2/arch/alpha/kernel/ptrace.c ---- linux-2.6.36.2/arch/alpha/kernel/ptrace.c 2010-07-07 18:30:51.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/alpha/kernel/ptrace.c 2010-10-21 13:09:36.000000000 +0200 -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - - #include - #include -diff -NurpP --minimal linux-2.6.36.2/arch/alpha/kernel/systbls.S linux-2.6.36.2-vs2.3.0.36.38.2/arch/alpha/kernel/systbls.S ---- linux-2.6.36.2/arch/alpha/kernel/systbls.S 2010-10-21 13:06:46.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/alpha/kernel/systbls.S 2010-10-21 13:09:36.000000000 +0200 +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 @@ -68,34 +180,23 @@ diff -NurpP --minimal linux-2.6.36.2/arch/alpha/kernel/systbls.S linux-2.6.36.2- .quad sys_ni_syscall /* sys_mbind */ .quad sys_ni_syscall /* sys_get_mempolicy */ .quad sys_ni_syscall /* sys_set_mempolicy */ -diff -NurpP --minimal linux-2.6.36.2/arch/alpha/kernel/traps.c linux-2.6.36.2-vs2.3.0.36.38.2/arch/alpha/kernel/traps.c ---- linux-2.6.36.2/arch/alpha/kernel/traps.c 2010-10-21 13:06:46.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/alpha/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200 -@@ -183,7 +183,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-2.6.36.2/arch/arm/include/asm/tlb.h linux-2.6.36.2-vs2.3.0.36.38.2/arch/arm/include/asm/tlb.h ---- linux-2.6.36.2/arch/arm/include/asm/tlb.h 2009-09-10 15:25:15.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/arm/include/asm/tlb.h 2010-10-21 13:09:36.000000000 +0200 -@@ -27,6 +27,7 @@ - - #else /* !CONFIG_MMU */ - -+#include - #include - - /* -diff -NurpP --minimal linux-2.6.36.2/arch/arm/Kconfig linux-2.6.36.2-vs2.3.0.36.38.2/arch/arm/Kconfig ---- linux-2.6.36.2/arch/arm/Kconfig 2010-10-21 13:06:46.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/arm/Kconfig 2010-10-21 13:09:36.000000000 +0200 -@@ -1803,6 +1803,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" @@ -104,9 +205,9 @@ diff -NurpP --minimal linux-2.6.36.2/arch/arm/Kconfig linux-2.6.36.2-vs2.3.0.36. source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.36.2/arch/arm/kernel/calls.S linux-2.6.36.2-vs2.3.0.36.38.2/arch/arm/kernel/calls.S ---- linux-2.6.36.2/arch/arm/kernel/calls.S 2010-10-21 13:06:46.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/arm/kernel/calls.S 2010-10-21 13:09:36.000000000 +0200 +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) @@ -116,37 +217,24 @@ diff -NurpP --minimal linux-2.6.36.2/arch/arm/kernel/calls.S linux-2.6.36.2-vs2. CALL(sys_ioprio_set) /* 315 */ CALL(sys_ioprio_get) CALL(sys_inotify_init) -diff -NurpP --minimal linux-2.6.36.2/arch/arm/kernel/process.c linux-2.6.36.2-vs2.3.0.36.38.2/arch/arm/kernel/process.c ---- linux-2.6.36.2/arch/arm/kernel/process.c 2010-10-21 13:06:46.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/arm/kernel/process.c 2010-10-21 13:09:36.000000000 +0200 -@@ -295,7 +295,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); - __backtrace(); - } -diff -NurpP --minimal linux-2.6.36.2/arch/arm/kernel/traps.c linux-2.6.36.2-vs2.3.0.36.38.2/arch/arm/kernel/traps.c ---- linux-2.6.36.2/arch/arm/kernel/traps.c 2010-10-21 13:06:46.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/arm/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200 -@@ -244,8 +244,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); - printk(KERN_EMERG "Process %.*s (pid: %d, stack limit = 0x%p)\n", -- TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), thread + 1); +- TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), end_of_stack(tsk)); + printk(KERN_EMERG "Process %.*s (pid: %d:#%u, stack limit = 0x%p)\n", -+ TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), tsk->xid, thread + 1); ++ TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), tsk->xid, end_of_stack(tsk)); if (!user_mode(regs) || in_interrupt()) { dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp, -diff -NurpP --minimal linux-2.6.36.2/arch/cris/Kconfig linux-2.6.36.2-vs2.3.0.36.38.2/arch/cris/Kconfig ---- linux-2.6.36.2/arch/cris/Kconfig 2010-10-21 13:06:51.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/cris/Kconfig 2010-10-21 13:09:36.000000000 +0200 -@@ -694,6 +694,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" @@ -155,45 +243,10 @@ diff -NurpP --minimal linux-2.6.36.2/arch/cris/Kconfig linux-2.6.36.2-vs2.3.0.36 source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.36.2/arch/frv/kernel/kernel_thread.S linux-2.6.36.2-vs2.3.0.36.38.2/arch/frv/kernel/kernel_thread.S ---- linux-2.6.36.2/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/frv/kernel/kernel_thread.S 2010-10-21 13:09:36.000000000 +0200 -@@ -37,7 +37,7 @@ kernel_thread: - - # start by forking the current process, but with shared VM - setlos.p #__NR_clone,gr7 ; syscall number -- ori gr10,#CLONE_VM,gr8 ; first syscall arg [clone_flags] -+ ori gr10,#CLONE_KT,gr8 ; first syscall arg [clone_flags] - sethi.p #0xe4e4,gr9 ; second syscall arg [newsp] - setlo #0xe4e4,gr9 - setlos.p #0,gr10 ; third syscall arg [parent_tidptr] -diff -NurpP --minimal linux-2.6.36.2/arch/h8300/Kconfig linux-2.6.36.2-vs2.3.0.36.38.2/arch/h8300/Kconfig ---- linux-2.6.36.2/arch/h8300/Kconfig 2010-10-21 13:06:51.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/h8300/Kconfig 2010-10-21 13:09:36.000000000 +0200 -@@ -226,6 +226,8 @@ source "fs/Kconfig" - - source "arch/h8300/Kconfig.debug" - -+source "kernel/vserver/Kconfig" -+ - source "security/Kconfig" - - source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.36.2/arch/ia64/include/asm/tlb.h linux-2.6.36.2-vs2.3.0.36.38.2/arch/ia64/include/asm/tlb.h ---- linux-2.6.36.2/arch/ia64/include/asm/tlb.h 2010-02-25 11:51:26.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/ia64/include/asm/tlb.h 2010-10-21 13:09:36.000000000 +0200 -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - - #include - #include -diff -NurpP --minimal linux-2.6.36.2/arch/ia64/Kconfig linux-2.6.36.2-vs2.3.0.36.38.2/arch/ia64/Kconfig ---- linux-2.6.36.2/arch/ia64/Kconfig 2010-10-21 13:06:52.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/ia64/Kconfig 2010-10-21 13:09:36.000000000 +0200 -@@ -671,6 +671,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" @@ -202,10 +255,10 @@ diff -NurpP --minimal linux-2.6.36.2/arch/ia64/Kconfig linux-2.6.36.2-vs2.3.0.36 source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.36.2/arch/ia64/kernel/entry.S linux-2.6.36.2-vs2.3.0.36.38.2/arch/ia64/kernel/entry.S ---- linux-2.6.36.2/arch/ia64/kernel/entry.S 2010-10-21 13:06:52.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/ia64/kernel/entry.S 2010-10-21 13:09:36.000000000 +0200 -@@ -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 @@ -214,34 +267,9 @@ diff -NurpP --minimal linux-2.6.36.2/arch/ia64/kernel/entry.S linux-2.6.36.2-vs2 data8 sys_waitid // 1270 data8 sys_add_key data8 sys_request_key -diff -NurpP --minimal linux-2.6.36.2/arch/ia64/kernel/perfmon.c linux-2.6.36.2-vs2.3.0.36.38.2/arch/ia64/kernel/perfmon.c ---- linux-2.6.36.2/arch/ia64/kernel/perfmon.c 2010-10-21 13:06:52.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/ia64/kernel/perfmon.c 2010-10-21 13:09:36.000000000 +0200 -@@ -42,6 +42,7 @@ - #include - #include - #include -+#include - - #include - #include -diff -NurpP --minimal linux-2.6.36.2/arch/ia64/kernel/process.c linux-2.6.36.2-vs2.3.0.36.38.2/arch/ia64/kernel/process.c ---- linux-2.6.36.2/arch/ia64/kernel/process.c 2010-10-21 13:06:52.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/ia64/kernel/process.c 2010-10-21 13:09:36.000000000 +0200 -@@ -113,8 +113,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-2.6.36.2/arch/ia64/kernel/ptrace.c linux-2.6.36.2-vs2.3.0.36.38.2/arch/ia64/kernel/ptrace.c ---- linux-2.6.36.2/arch/ia64/kernel/ptrace.c 2010-08-02 16:52:04.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/ia64/kernel/ptrace.c 2010-10-21 13:09:36.000000000 +0200 +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 @@ -250,63 +278,52 @@ diff -NurpP --minimal linux-2.6.36.2/arch/ia64/kernel/ptrace.c linux-2.6.36.2-vs #include #include -diff -NurpP --minimal linux-2.6.36.2/arch/ia64/kernel/traps.c linux-2.6.36.2-vs2.3.0.36.38.2/arch/ia64/kernel/traps.c ---- linux-2.6.36.2/arch/ia64/kernel/traps.c 2010-07-07 18:31:01.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/ia64/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200 -@@ -59,8 +59,9 @@ die (const char *str, struct pt_regs *re +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) != NOTIFY_STOP) show_regs(regs); -@@ -323,8 +324,9 @@ handle_fpu_swa (int fp_fault, struct pt_ +@@ -324,8 +325,9 @@ handle_fpu_swa (int fp_fault, struct pt_ if ((last.count & 15) < 5 && (ia64_fetchadd(1, &last.count, acq) & 15) < 5) { last.time = current_jiffies + 5 * HZ; 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-2.6.36.2/arch/ia64/mm/fault.c linux-2.6.36.2-vs2.3.0.36.38.2/arch/ia64/mm/fault.c ---- linux-2.6.36.2/arch/ia64/mm/fault.c 2010-08-02 16:52:04.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/ia64/mm/fault.c 2010-10-21 13:09:36.000000000 +0200 -@@ -10,6 +10,7 @@ - #include - #include - #include -+#include - - #include - #include -diff -NurpP --minimal linux-2.6.36.2/arch/m32r/kernel/traps.c linux-2.6.36.2-vs2.3.0.36.38.2/arch/m32r/kernel/traps.c ---- linux-2.6.36.2/arch/m32r/kernel/traps.c 2009-12-03 20:01:57.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/m32r/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200 -@@ -196,8 +196,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-2.6.36.2/arch/m68k/Kconfig linux-2.6.36.2-vs2.3.0.36.38.2/arch/m68k/Kconfig ---- linux-2.6.36.2/arch/m68k/Kconfig 2010-10-21 13:06:52.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/m68k/Kconfig 2010-10-21 13:09:36.000000000 +0200 -@@ -616,6 +616,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" @@ -315,71 +332,10 @@ diff -NurpP --minimal linux-2.6.36.2/arch/m68k/Kconfig linux-2.6.36.2-vs2.3.0.36 source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.36.2/arch/m68k/kernel/ptrace.c linux-2.6.36.2-vs2.3.0.36.38.2/arch/m68k/kernel/ptrace.c ---- linux-2.6.36.2/arch/m68k/kernel/ptrace.c 2010-07-07 18:31:02.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/m68k/kernel/ptrace.c 2010-10-21 13:09:36.000000000 +0200 -@@ -18,6 +18,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -254,6 +255,8 @@ long arch_ptrace(struct task_struct *chi - ret = ptrace_request(child, request, addr, data); - break; - } -+ if (!vx_check(vx_task_xid(child), VS_WATCH_P | VS_IDENT)) -+ goto out_tsk; - - return ret; - out_eio: -diff -NurpP --minimal linux-2.6.36.2/arch/m68k/kernel/traps.c linux-2.6.36.2-vs2.3.0.36.38.2/arch/m68k/kernel/traps.c ---- linux-2.6.36.2/arch/m68k/kernel/traps.c 2010-08-02 16:52:04.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/m68k/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200 -@@ -906,8 +906,8 @@ void show_registers(struct pt_regs *regs - printk("d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n", - regs->d4, regs->d5, regs->a0, regs->a1); - -- printk("Process %s (pid: %d, task=%p)\n", -- current->comm, task_pid_nr(current), current); -+ printk("Process %s (pid: %d[#%u], task=%p)\n", -+ current->comm, task_pid_nr(current), current->xid, current); - addr = (unsigned long)&fp->un; - printk("Frame format=%X ", regs->format); - switch (regs->format) { -diff -NurpP --minimal linux-2.6.36.2/arch/m68knommu/Kconfig linux-2.6.36.2-vs2.3.0.36.38.2/arch/m68knommu/Kconfig ---- linux-2.6.36.2/arch/m68knommu/Kconfig 2010-10-21 13:06:53.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/m68knommu/Kconfig 2010-10-21 13:09:36.000000000 +0200 -@@ -730,6 +730,8 @@ source "fs/Kconfig" - - source "arch/m68knommu/Kconfig.debug" - -+source "kernel/vserver/Kconfig" -+ - source "security/Kconfig" - - source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.36.2/arch/m68knommu/kernel/traps.c linux-2.6.36.2-vs2.3.0.36.38.2/arch/m68knommu/kernel/traps.c ---- linux-2.6.36.2/arch/m68knommu/kernel/traps.c 2009-09-10 15:25:23.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/m68knommu/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200 -@@ -78,8 +78,9 @@ void die_if_kernel(char *str, struct pt_ - printk(KERN_EMERG "d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n", - fp->d4, fp->d5, fp->a0, fp->a1); - -- printk(KERN_EMERG "Process %s (pid: %d, stackpage=%08lx)\n", -- current->comm, current->pid, PAGE_SIZE+(unsigned long)current); -+ printk(KERN_EMERG "Process %s (pid: %d[#%u], stackpage=%08lx)\n", -+ current->comm, task_pid_nr(current), current->xid, -+ PAGE_SIZE+(unsigned long)current); - show_stack(NULL, (unsigned long *)(fp + 1)); - add_taint(TAINT_DIE); - do_exit(SIGSEGV); -diff -NurpP --minimal linux-2.6.36.2/arch/mips/Kconfig linux-2.6.36.2-vs2.3.0.36.38.2/arch/mips/Kconfig ---- linux-2.6.36.2/arch/mips/Kconfig 2010-10-21 13:06:53.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/mips/Kconfig 2010-10-21 13:09:36.000000000 +0200 -@@ -2298,6 +2298,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" @@ -388,20 +344,20 @@ diff -NurpP --minimal linux-2.6.36.2/arch/mips/Kconfig linux-2.6.36.2-vs2.3.0.36 source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.36.2/arch/mips/kernel/ptrace.c linux-2.6.36.2-vs2.3.0.36.38.2/arch/mips/kernel/ptrace.c ---- linux-2.6.36.2/arch/mips/kernel/ptrace.c 2010-10-21 13:06:54.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/mips/kernel/ptrace.c 2010-10-21 13:09:36.000000000 +0200 -@@ -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 -@@ -259,6 +260,9 @@ long arch_ptrace(struct task_struct *chi - { - int ret; +@@ -544,6 +545,9 @@ long arch_ptrace(struct task_struct *chi + void __user *datavp = (void __user *) data; + unsigned long __user *datalp = (void __user *) data; + if (!vx_check(vx_task_xid(child), VS_WATCH_P | VS_IDENT)) + goto out; @@ -409,22 +365,22 @@ diff -NurpP --minimal linux-2.6.36.2/arch/mips/kernel/ptrace.c linux-2.6.36.2-vs 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-2.6.36.2/arch/mips/kernel/scall32-o32.S linux-2.6.36.2-vs2.3.0.36.38.2/arch/mips/kernel/scall32-o32.S ---- linux-2.6.36.2/arch/mips/kernel/scall32-o32.S 2010-10-21 13:06:54.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/mips/kernel/scall32-o32.S 2010-10-21 13:09:36.000000000 +0200 -@@ -524,7 +524,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-2.6.36.2/arch/mips/kernel/scall64-64.S linux-2.6.36.2-vs2.3.0.36.38.2/arch/mips/kernel/scall64-64.S ---- linux-2.6.36.2/arch/mips/kernel/scall64-64.S 2010-10-21 13:06:54.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/mips/kernel/scall64-64.S 2010-10-21 13:09:36.000000000 +0200 -@@ -363,7 +363,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 */ @@ -433,10 +389,10 @@ diff -NurpP --minimal linux-2.6.36.2/arch/mips/kernel/scall64-64.S linux-2.6.36. PTR sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key -diff -NurpP --minimal linux-2.6.36.2/arch/mips/kernel/scall64-n32.S linux-2.6.36.2-vs2.3.0.36.38.2/arch/mips/kernel/scall64-n32.S ---- linux-2.6.36.2/arch/mips/kernel/scall64-n32.S 2010-10-21 13:06:54.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/mips/kernel/scall64-n32.S 2010-10-21 13:09:36.000000000 +0200 -@@ -362,7 +362,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 @@ -445,21 +401,21 @@ diff -NurpP --minimal linux-2.6.36.2/arch/mips/kernel/scall64-n32.S linux-2.6.36 PTR compat_sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key -diff -NurpP --minimal linux-2.6.36.2/arch/mips/kernel/scall64-o32.S linux-2.6.36.2-vs2.3.0.36.38.2/arch/mips/kernel/scall64-o32.S ---- linux-2.6.36.2/arch/mips/kernel/scall64-o32.S 2010-10-21 13:06:54.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/mips/kernel/scall64-o32.S 2010-10-21 13:09:36.000000000 +0200 -@@ -481,7 +481,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-2.6.36.2/arch/mips/kernel/traps.c linux-2.6.36.2-vs2.3.0.36.38.2/arch/mips/kernel/traps.c ---- linux-2.6.36.2/arch/mips/kernel/traps.c 2010-10-21 13:06:54.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/mips/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200 +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); @@ -474,22 +430,22 @@ diff -NurpP --minimal linux-2.6.36.2/arch/mips/kernel/traps.c linux-2.6.36.2-vs2 if (cpu_has_userlocal) { unsigned long tls; -diff -NurpP --minimal linux-2.6.36.2/arch/parisc/Kconfig linux-2.6.36.2-vs2.3.0.36.38.2/arch/parisc/Kconfig ---- linux-2.6.36.2/arch/parisc/Kconfig 2010-10-21 13:06:55.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/parisc/Kconfig 2010-10-21 13:09:36.000000000 +0200 -@@ -295,6 +295,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-2.6.36.2/arch/parisc/kernel/syscall_table.S linux-2.6.36.2-vs2.3.0.36.38.2/arch/parisc/kernel/syscall_table.S ---- linux-2.6.36.2/arch/parisc/kernel/syscall_table.S 2010-07-07 18:31:04.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/parisc/kernel/syscall_table.S 2010-10-21 13:09:36.000000000 +0200 -@@ -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) @@ -498,21 +454,21 @@ diff -NurpP --minimal linux-2.6.36.2/arch/parisc/kernel/syscall_table.S linux-2. ENTRY_SAME(add_key) ENTRY_SAME(request_key) /* 265 */ ENTRY_SAME(keyctl) -diff -NurpP --minimal linux-2.6.36.2/arch/parisc/kernel/traps.c linux-2.6.36.2-vs2.3.0.36.38.2/arch/parisc/kernel/traps.c ---- linux-2.6.36.2/arch/parisc/kernel/traps.c 2009-09-10 15:25:40.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/parisc/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200 -@@ -236,8 +236,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); + + return; + } @@ -270,8 +271,8 @@ void die_if_kernel(char *str, struct pt_ pdc_console_restart(); @@ -524,37 +480,10 @@ diff -NurpP --minimal linux-2.6.36.2/arch/parisc/kernel/traps.c linux-2.6.36.2-v /* Wot's wrong wif bein' racy? */ if (current->thread.flags & PARISC_KERNEL_DEATH) { -diff -NurpP --minimal linux-2.6.36.2/arch/parisc/mm/fault.c linux-2.6.36.2-vs2.3.0.36.38.2/arch/parisc/mm/fault.c ---- linux-2.6.36.2/arch/parisc/mm/fault.c 2010-08-02 16:52:06.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/parisc/mm/fault.c 2010-10-21 13:09:36.000000000 +0200 -@@ -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-2.6.36.2/arch/powerpc/include/asm/unistd.h linux-2.6.36.2-vs2.3.0.36.38.2/arch/powerpc/include/asm/unistd.h ---- linux-2.6.36.2/arch/powerpc/include/asm/unistd.h 2010-10-21 13:06:56.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/powerpc/include/asm/unistd.h 2010-10-21 13:09:36.000000000 +0200 -@@ -275,7 +275,7 @@ - #endif - #define __NR_rtas 255 - #define __NR_sys_debug_setcontext 256 --/* Number 257 is reserved for vserver */ -+#define __NR_vserver 257 - #define __NR_migrate_pages 258 - #define __NR_mbind 259 - #define __NR_get_mempolicy 260 -diff -NurpP --minimal linux-2.6.36.2/arch/powerpc/Kconfig linux-2.6.36.2-vs2.3.0.36.38.2/arch/powerpc/Kconfig ---- linux-2.6.36.2/arch/powerpc/Kconfig 2010-10-21 13:06:55.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/powerpc/Kconfig 2010-10-21 13:09:36.000000000 +0200 -@@ -974,6 +974,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" @@ -563,63 +492,60 @@ diff -NurpP --minimal linux-2.6.36.2/arch/powerpc/Kconfig linux-2.6.36.2-vs2.3.0 source "security/Kconfig" config KEYS_COMPAT -diff -NurpP --minimal linux-2.6.36.2/arch/powerpc/kernel/process.c linux-2.6.36.2-vs2.3.0.36.38.2/arch/powerpc/kernel/process.c ---- linux-2.6.36.2/arch/powerpc/kernel/process.c 2010-10-21 13:06:56.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/powerpc/kernel/process.c 2010-10-21 13:09:36.000000000 +0200 -@@ -634,8 +634,9 @@ void show_regs(struct pt_regs * regs) - #else - printk("DAR: "REG", DSISR: "REG"\n", regs->dar, regs->dsisr); +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 -- 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-2.6.36.2/arch/powerpc/kernel/traps.c linux-2.6.36.2-vs2.3.0.36.38.2/arch/powerpc/kernel/traps.c ---- linux-2.6.36.2/arch/powerpc/kernel/traps.c 2010-10-21 13:06:57.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/powerpc/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200 -@@ -1048,8 +1048,9 @@ void nonrecoverable_exception(struct pt_ + #define __NR_rtas 255 + #define __NR_sys_debug_setcontext 256 +-/* Number 257 is reserved for vserver */ ++#define __NR_vserver 257 + #define __NR_migrate_pages 258 + #define __NR_mbind 259 + #define __NR_get_mempolicy 260 +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-2.6.36.2/arch/powerpc/kernel/vdso.c linux-2.6.36.2-vs2.3.0.36.38.2/arch/powerpc/kernel/vdso.c ---- linux-2.6.36.2/arch/powerpc/kernel/vdso.c 2010-08-02 16:52:07.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/powerpc/kernel/vdso.c 2010-10-21 13:09:36.000000000 +0200 -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include +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" - #include - #include -diff -NurpP --minimal linux-2.6.36.2/arch/s390/include/asm/tlb.h linux-2.6.36.2-vs2.3.0.36.38.2/arch/s390/include/asm/tlb.h ---- linux-2.6.36.2/arch/s390/include/asm/tlb.h 2010-10-21 13:06:58.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/s390/include/asm/tlb.h 2010-10-21 13:09:36.000000000 +0200 -@@ -23,6 +23,8 @@ + source "arch/s390/Kconfig.debug" ++source "kernel/vserver/Kconfig" ++ + source "security/Kconfig" + + source "crypto/Kconfig" +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 #include -+#include + #include #include - #include -diff -NurpP --minimal linux-2.6.36.2/arch/s390/include/asm/unistd.h linux-2.6.36.2-vs2.3.0.36.38.2/arch/s390/include/asm/unistd.h ---- linux-2.6.36.2/arch/s390/include/asm/unistd.h 2010-10-21 13:06:58.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/s390/include/asm/unistd.h 2010-10-21 13:09:36.000000000 +0200 -@@ -202,7 +202,7 @@ + #include +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) #define __NR_clock_nanosleep (__NR_timer_create+8) @@ -628,44 +554,32 @@ diff -NurpP --minimal linux-2.6.36.2/arch/s390/include/asm/unistd.h linux-2.6.36 #define __NR_statfs64 265 #define __NR_fstatfs64 266 #define __NR_remap_file_pages 267 -diff -NurpP --minimal linux-2.6.36.2/arch/s390/Kconfig linux-2.6.36.2-vs2.3.0.36.38.2/arch/s390/Kconfig ---- linux-2.6.36.2/arch/s390/Kconfig 2010-10-21 13:06:57.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/s390/Kconfig 2010-10-21 13:09:36.000000000 +0200 -@@ -620,6 +620,8 @@ source "fs/Kconfig" - - source "arch/s390/Kconfig.debug" - -+source "kernel/vserver/Kconfig" -+ - source "security/Kconfig" - - source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.36.2/arch/s390/kernel/ptrace.c linux-2.6.36.2-vs2.3.0.36.38.2/arch/s390/kernel/ptrace.c ---- linux-2.6.36.2/arch/s390/kernel/ptrace.c 2010-08-02 16:52:09.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/s390/kernel/ptrace.c 2010-10-21 13:09:36.000000000 +0200 -@@ -36,6 +36,7 @@ - #include +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 + #include +#include #include - #include #include -diff -NurpP --minimal linux-2.6.36.2/arch/s390/kernel/syscalls.S linux-2.6.36.2-vs2.3.0.36.38.2/arch/s390/kernel/syscalls.S ---- linux-2.6.36.2/arch/s390/kernel/syscalls.S 2010-10-21 13:06:58.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/s390/kernel/syscalls.S 2010-10-21 13:09:36.000000000 +0200 + #include +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-2.6.36.2/arch/sh/Kconfig linux-2.6.36.2-vs2.3.0.36.38.2/arch/sh/Kconfig ---- linux-2.6.36.2/arch/sh/Kconfig 2010-10-21 13:06:58.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/sh/Kconfig 2010-10-21 13:09:36.000000000 +0200 + 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" @@ -675,43 +589,33 @@ diff -NurpP --minimal linux-2.6.36.2/arch/sh/Kconfig linux-2.6.36.2-vs2.3.0.36.3 source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.36.2/arch/sh/kernel/irq.c linux-2.6.36.2-vs2.3.0.36.38.2/arch/sh/kernel/irq.c ---- linux-2.6.36.2/arch/sh/kernel/irq.c 2010-08-02 16:52:10.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/sh/kernel/irq.c 2010-10-21 13:09:36.000000000 +0200 -@@ -13,6 +13,7 @@ - #include +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 + #include +// #include #include #include #include -diff -NurpP --minimal linux-2.6.36.2/arch/sh/kernel/vsyscall/vsyscall.c linux-2.6.36.2-vs2.3.0.36.38.2/arch/sh/kernel/vsyscall/vsyscall.c ---- linux-2.6.36.2/arch/sh/kernel/vsyscall/vsyscall.c 2010-07-07 18:31:10.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/sh/kernel/vsyscall/vsyscall.c 2010-10-21 13:09:36.000000000 +0200 -@@ -18,6 +18,7 @@ - #include - #include - #include -+#include +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" - /* - * Should the kernel map a VDSO page into processes and pass its -diff -NurpP --minimal linux-2.6.36.2/arch/sparc/include/asm/tlb_64.h linux-2.6.36.2-vs2.3.0.36.38.2/arch/sparc/include/asm/tlb_64.h ---- linux-2.6.36.2/arch/sparc/include/asm/tlb_64.h 2009-09-10 15:25:45.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/sparc/include/asm/tlb_64.h 2010-10-21 13:09:36.000000000 +0200 -@@ -3,6 +3,7 @@ + source "arch/sparc/Kconfig.debug" - #include - #include -+#include - #include - #include - #include -diff -NurpP --minimal linux-2.6.36.2/arch/sparc/include/asm/unistd.h linux-2.6.36.2-vs2.3.0.36.38.2/arch/sparc/include/asm/unistd.h ---- linux-2.6.36.2/arch/sparc/include/asm/unistd.h 2010-10-21 13:06:58.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/sparc/include/asm/unistd.h 2010-10-21 13:09:36.000000000 +0200 -@@ -335,7 +335,7 @@ ++source "kernel/vserver/Kconfig" ++ + source "security/Kconfig" + + source "crypto/Kconfig" +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 #define __NR_timer_create 266 @@ -720,23 +624,11 @@ diff -NurpP --minimal linux-2.6.36.2/arch/sparc/include/asm/unistd.h linux-2.6.3 #define __NR_io_setup 268 #define __NR_io_destroy 269 #define __NR_io_submit 270 -diff -NurpP --minimal linux-2.6.36.2/arch/sparc/Kconfig linux-2.6.36.2-vs2.3.0.36.38.2/arch/sparc/Kconfig ---- linux-2.6.36.2/arch/sparc/Kconfig 2010-10-21 13:06:58.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/sparc/Kconfig 2010-10-21 13:09:36.000000000 +0200 -@@ -565,6 +565,8 @@ source "fs/Kconfig" - - source "arch/sparc/Kconfig.debug" - -+source "kernel/vserver/Kconfig" -+ - source "security/Kconfig" - - source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.36.2/arch/sparc/kernel/systbls_32.S linux-2.6.36.2-vs2.3.0.36.38.2/arch/sparc/kernel/systbls_32.S ---- linux-2.6.36.2/arch/sparc/kernel/systbls_32.S 2010-10-21 13:06:59.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/sparc/kernel/systbls_32.S 2010-10-21 13:09:36.000000000 +0200 +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_nfsservctl + /*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 /*260*/ .long sys_sched_getaffinity, sys_sched_setaffinity, sys_timer_settime, sys_timer_gettime, sys_timer_getoverrun -/*265*/ .long sys_timer_delete, sys_timer_create, sys_nis_syscall, sys_io_setup, sys_io_destroy @@ -744,20 +636,20 @@ diff -NurpP --minimal linux-2.6.36.2/arch/sparc/kernel/systbls_32.S linux-2.6.36 /*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-2.6.36.2/arch/sparc/kernel/systbls_64.S linux-2.6.36.2-vs2.3.0.36.38.2/arch/sparc/kernel/systbls_64.S ---- linux-2.6.36.2/arch/sparc/kernel/systbls_64.S 2010-10-21 13:06:59.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/sparc/kernel/systbls_64.S 2010-10-21 13:09:36.000000000 +0200 +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, sys32_nfsservctl + /*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, sys_keyctl, compat_sys_openat -@@ -147,7 +147,7 @@ sys_call_table: - /*250*/ .word sys_64_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl + /*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 - .word sys_timer_delete, sys_timer_create, sys_ni_syscall, sys_io_setup, sys_io_destroy @@ -765,70 +657,10 @@ diff -NurpP --minimal linux-2.6.36.2/arch/sparc/kernel/systbls_64.S linux-2.6.36 /*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-2.6.36.2/arch/um/include/asm/tlb.h linux-2.6.36.2-vs2.3.0.36.38.2/arch/um/include/asm/tlb.h ---- linux-2.6.36.2/arch/um/include/asm/tlb.h 2009-09-10 15:25:46.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/um/include/asm/tlb.h 2010-10-21 13:09:36.000000000 +0200 -@@ -3,6 +3,7 @@ - - #include - #include -+#include - #include - #include - #include -diff -NurpP --minimal linux-2.6.36.2/arch/um/include/shared/kern_constants.h linux-2.6.36.2-vs2.3.0.36.38.2/arch/um/include/shared/kern_constants.h ---- linux-2.6.36.2/arch/um/include/shared/kern_constants.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/um/include/shared/kern_constants.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1 @@ -+#include "../../../../include/generated/asm-offsets.h" -diff -NurpP --minimal linux-2.6.36.2/arch/um/include/shared/user_constants.h linux-2.6.36.2-vs2.3.0.36.38.2/arch/um/include/shared/user_constants.h ---- linux-2.6.36.2/arch/um/include/shared/user_constants.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/um/include/shared/user_constants.h 2010-10-21 13:09:36.000000000 +0200 -@@ -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-2.6.36.2/arch/um/Kconfig.rest linux-2.6.36.2-vs2.3.0.36.38.2/arch/um/Kconfig.rest ---- linux-2.6.36.2/arch/um/Kconfig.rest 2009-06-11 17:12:19.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/um/Kconfig.rest 2010-10-21 13:09:36.000000000 +0200 -@@ -18,6 +18,8 @@ source "drivers/connector/Kconfig" +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" @@ -837,34 +669,10 @@ diff -NurpP --minimal linux-2.6.36.2/arch/um/Kconfig.rest linux-2.6.36.2-vs2.3.0 source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.36.2/arch/x86/ia32/ia32entry.S linux-2.6.36.2-vs2.3.0.36.38.2/arch/x86/ia32/ia32entry.S ---- linux-2.6.36.2/arch/x86/ia32/ia32entry.S 2010-10-21 13:06:59.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/x86/ia32/ia32entry.S 2010-10-21 13:09:36.000000000 +0200 -@@ -783,7 +783,7 @@ ia32_sys_call_table: - .quad sys_tgkill /* 270 */ - .quad compat_sys_utimes - .quad sys32_fadvise64_64 -- .quad quiet_ni_syscall /* sys_vserver */ -+ .quad sys32_vserver - .quad sys_mbind - .quad compat_sys_get_mempolicy /* 275 */ - .quad sys_set_mempolicy -diff -NurpP --minimal linux-2.6.36.2/arch/x86/include/asm/unistd_64.h linux-2.6.36.2-vs2.3.0.36.38.2/arch/x86/include/asm/unistd_64.h ---- linux-2.6.36.2/arch/x86/include/asm/unistd_64.h 2010-10-21 13:06:59.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/x86/include/asm/unistd_64.h 2010-10-21 13:09:36.000000000 +0200 -@@ -535,7 +535,7 @@ __SYSCALL(__NR_tgkill, sys_tgkill) - #define __NR_utimes 235 - __SYSCALL(__NR_utimes, sys_utimes) - #define __NR_vserver 236 --__SYSCALL(__NR_vserver, sys_ni_syscall) -+__SYSCALL(__NR_vserver, sys_vserver) - #define __NR_mbind 237 - __SYSCALL(__NR_mbind, sys_mbind) - #define __NR_set_mempolicy 238 -diff -NurpP --minimal linux-2.6.36.2/arch/x86/Kconfig linux-2.6.36.2-vs2.3.0.36.38.2/arch/x86/Kconfig ---- linux-2.6.36.2/arch/x86/Kconfig 2010-10-21 13:06:59.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/x86/Kconfig 2010-10-21 13:09:36.000000000 +0200 -@@ -2135,6 +2135,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" @@ -873,180 +681,63 @@ diff -NurpP --minimal linux-2.6.36.2/arch/x86/Kconfig linux-2.6.36.2-vs2.3.0.36. source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.36.2/arch/x86/kernel/syscall_table_32.S linux-2.6.36.2-vs2.3.0.36.38.2/arch/x86/kernel/syscall_table_32.S ---- linux-2.6.36.2/arch/x86/kernel/syscall_table_32.S 2010-10-21 13:07:00.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/arch/x86/kernel/syscall_table_32.S 2010-10-21 13:09:36.000000000 +0200 -@@ -272,7 +272,7 @@ ENTRY(sys_call_table) - .long sys_tgkill /* 270 */ - .long sys_utimes - .long sys_fadvise64_64 -- .long sys_ni_syscall /* sys_vserver */ -+ .long sys_vserver - .long sys_mbind - .long sys_get_mempolicy - .long sys_set_mempolicy -diff -NurpP --minimal linux-2.6.36.2/Documentation/vserver/debug.txt linux-2.6.36.2-vs2.3.0.36.38.2/Documentation/vserver/debug.txt ---- linux-2.6.36.2/Documentation/vserver/debug.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/Documentation/vserver/debug.txt 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,154 @@ -+ -+debug_cvirt: -+ -+ 2 4 "vx_map_tgid: %p/%llx: %d -> %d" -+ "vx_rmap_tgid: %p/%llx: %d -> %d" -+ -+debug_dlim: -+ -+ 0 1 "ALLOC (%p,#%d)%c inode (%d)" -+ "FREE (%p,#%d)%c inode" -+ 1 2 "ALLOC (%p,#%d)%c %lld bytes (%d)" -+ "FREE (%p,#%d)%c %lld bytes" -+ 2 4 "ADJUST: %lld,%lld on %ld,%ld [mult=%d]" -+ 3 8 "ext3_has_free_blocks(%p): %lu<%lu+1, %c, %u!=%u r=%d" -+ "ext3_has_free_blocks(%p): free=%lu, root=%lu" -+ "rcu_free_dl_info(%p)" -+ 4 10 "alloc_dl_info(%p,%d) = %p" -+ "dealloc_dl_info(%p)" -+ "get_dl_info(%p[#%d.%d])" -+ "put_dl_info(%p[#%d.%d])" -+ 5 20 "alloc_dl_info(%p,%d)*" -+ 6 40 "__hash_dl_info: %p[#%d]" -+ "__unhash_dl_info: %p[#%d]" -+ 7 80 "locate_dl_info(%p,#%d) = %p" -+ -+debug_misc: -+ -+ 0 1 "destroy_dqhash: %p [#0x%08x] c=%d" -+ "new_dqhash: %p [#0x%08x]" -+ "vroot[%d]_clr_dev: dev=%p[%lu,%d:%d]" -+ "vroot[%d]_get_real_bdev: dev=%p[%lu,%d:%d]" -+ "vroot[%d]_set_dev: dev=%p[%lu,%d:%d]" -+ "vroot_get_real_bdev not set" -+ 1 2 "cow_break_link(»%s«)" -+ "temp copy »%s«" -+ 2 4 "dentry_open(new): %p" -+ "dentry_open(old): %p" -+ "lookup_create(new): %p" -+ "old path »%s«" -+ "path_lookup(old): %d" -+ "vfs_create(new): %d" -+ "vfs_rename: %d" -+ "vfs_sendfile: %d" -+ 3 8 "fput(new_file=%p[#%d])" -+ "fput(old_file=%p[#%d])" -+ 4 10 "vx_info_kill(%p[#%d],%d,%d) = %d" -+ "vx_info_kill(%p[#%d],%d,%d)*" -+ 5 20 "vs_reboot(%p[#%d],%d)" -+ 6 40 "dropping task %p[#%u,%u] for %p[#%u,%u]" -+ -+debug_net: -+ -+ 2 4 "nx_addr_conflict(%p,%p) %d.%d,%d.%d" -+ 3 8 "inet_bind(%p) %d.%d.%d.%d, %d.%d.%d.%d, %d.%d.%d.%d" -+ "inet_bind(%p)* %p,%p;%lx %d.%d.%d.%d" -+ 4 10 "ip_route_connect(%p) %p,%p;%lx" -+ 5 20 "__addr_in_socket(%p,%d.%d.%d.%d) %p:%d.%d.%d.%d %p;%lx" -+ 6 40 "sk,egf: %p [#%d] (from %d)" -+ "sk,egn: %p [#%d] (from %d)" -+ "sk,req: %p [#%d] (from %d)" -+ "sk: %p [#%d] (from %d)" -+ "tw: %p [#%d] (from %d)" -+ 7 80 "__sock_recvmsg: %p[%p,%p,%p;%d]:%d/%d" -+ "__sock_sendmsg: %p[%p,%p,%p;%d]:%d/%d" -+ -+debug_nid: -+ -+ 0 1 "__lookup_nx_info(#%u): %p[#%u]" -+ "alloc_nx_info(%d) = %p" -+ "create_nx_info(%d) (dynamic rejected)" -+ "create_nx_info(%d) = %p (already there)" -+ "create_nx_info(%d) = %p (new)" -+ "dealloc_nx_info(%p)" -+ 1 2 "alloc_nx_info(%d)*" -+ "create_nx_info(%d)*" -+ 2 4 "get_nx_info(%p[#%d.%d])" -+ "put_nx_info(%p[#%d.%d])" -+ 3 8 "claim_nx_info(%p[#%d.%d.%d]) %p" -+ "clr_nx_info(%p[#%d.%d])" -+ "init_nx_info(%p[#%d.%d])" -+ "release_nx_info(%p[#%d.%d.%d]) %p" -+ "set_nx_info(%p[#%d.%d])" -+ 4 10 "__hash_nx_info: %p[#%d]" -+ "__nx_dynamic_id: [#%d]" -+ "__unhash_nx_info: %p[#%d.%d.%d]" -+ 5 20 "moved task %p into nxi:%p[#%d]" -+ "nx_migrate_task(%p,%p[#%d.%d.%d])" -+ "task_get_nx_info(%p)" -+ 6 40 "nx_clear_persistent(%p[#%d])" -+ -+debug_quota: -+ -+ 0 1 "quota_sync_dqh(%p,%d) discard inode %p" -+ 1 2 "quota_sync_dqh(%p,%d)" -+ "sync_dquots(%p,%d)" -+ "sync_dquots_dqh(%p,%d)" -+ 3 8 "do_quotactl(%p,%d,cmd=%d,id=%d,%p)" -+ -+debug_switch: -+ -+ 0 1 "vc: VCMD_%02d_%d[%d], %d,%p [%d,%d,%x,%x]" -+ 1 2 "vc: VCMD_%02d_%d[%d] = %08lx(%ld) [%d,%d]" -+ 4 10 "%s: (%s %s) returned %s with %d" -+ -+debug_tag: -+ -+ 7 80 "dx_parse_tag(»%s«): %d:#%d" -+ "dx_propagate_tag(%p[#%lu.%d]): %d,%d" -+ -+debug_xid: -+ -+ 0 1 "__lookup_vx_info(#%u): %p[#%u]" -+ "alloc_vx_info(%d) = %p" -+ "alloc_vx_info(%d)*" -+ "create_vx_info(%d) (dynamic rejected)" -+ "create_vx_info(%d) = %p (already there)" -+ "create_vx_info(%d) = %p (new)" -+ "dealloc_vx_info(%p)" -+ "loc_vx_info(%d) = %p (found)" -+ "loc_vx_info(%d) = %p (new)" -+ "loc_vx_info(%d) = %p (not available)" -+ 1 2 "create_vx_info(%d)*" -+ "loc_vx_info(%d)*" -+ 2 4 "get_vx_info(%p[#%d.%d])" -+ "put_vx_info(%p[#%d.%d])" -+ 3 8 "claim_vx_info(%p[#%d.%d.%d]) %p" -+ "clr_vx_info(%p[#%d.%d])" -+ "init_vx_info(%p[#%d.%d])" -+ "release_vx_info(%p[#%d.%d.%d]) %p" -+ "set_vx_info(%p[#%d.%d])" -+ 4 10 "__hash_vx_info: %p[#%d]" -+ "__unhash_vx_info: %p[#%d.%d.%d]" -+ "__vx_dynamic_id: [#%d]" -+ 5 20 "enter_vx_info(%p[#%d],%p) %p[#%d,%p]" -+ "leave_vx_info(%p[#%d,%p]) %p[#%d,%p]" -+ "moved task %p into vxi:%p[#%d]" -+ "task_get_vx_info(%p)" -+ "vx_migrate_task(%p,%p[#%d.%d])" -+ 6 40 "vx_clear_persistent(%p[#%d])" -+ "vx_exit_init(%p[#%d],%p[#%d,%d,%d])" -+ "vx_set_init(%p[#%d],%p[#%d,%d,%d])" -+ "vx_set_persistent(%p[#%d])" -+ "vx_set_reaper(%p[#%d],%p[#%d,%d])" -+ 7 80 "vx_child_reaper(%p[#%u,%u]) = %p[#%u,%u]" -+ -+ -+debug_limit: -+ -+ n 2^n "vx_acc_cres[%5d,%s,%2d]: %5d%s" -+ "vx_cres_avail[%5d,%s,%2d]: %5ld > %5d + %5d" -+ -+ 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-2.6.36.2/drivers/block/Kconfig linux-2.6.36.2-vs2.3.0.36.38.2/drivers/block/Kconfig ---- linux-2.6.36.2/drivers/block/Kconfig 2010-08-02 16:52:14.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/drivers/block/Kconfig 2010-10-21 13:09:36.000000000 +0200 -@@ -273,6 +273,13 @@ config BLK_DEV_CRYPTOLOOP +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 + 272 i386 fadvise64_64 sys_fadvise64_64 sys32_fadvise64_64 +-273 i386 vserver ++273 i386 vserver sys_vserver sys32_vserver + 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.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 + 235 common utimes sys_utimes +-236 64 vserver ++236 64 vserver sys_vserver + 237 common mbind sys_mbind + 238 common set_mempolicy sys_set_mempolicy + 239 common get_mempolicy sys_get_mempolicy +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" @@ -1060,18 +751,29 @@ diff -NurpP --minimal linux-2.6.36.2/drivers/block/Kconfig linux-2.6.36.2-vs2.3. config BLK_DEV_NBD tristate "Network block device support" depends on NET -diff -NurpP --minimal linux-2.6.36.2/drivers/block/loop.c linux-2.6.36.2-vs2.3.0.36.38.2/drivers/block/loop.c ---- linux-2.6.36.2/drivers/block/loop.c 2010-10-21 13:07:02.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/drivers/block/loop.c 2010-10-21 13:11:25.000000000 +0200 -@@ -74,6 +74,7 @@ - #include - #include - #include +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.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 - -@@ -814,6 +815,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; @@ -1079,24 +781,24 @@ diff -NurpP --minimal linux-2.6.36.2/drivers/block/loop.c linux-2.6.36.2-vs2.3.0 lo->lo_backing_file = file; lo->transfer = transfer_none; lo->ioctl = NULL; -@@ -942,6 +944,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_flags = 0; lo->lo_thread = NULL; + lo->lo_xid = 0; 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); -@@ -979,7 +982,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 && - lo->lo_key_owner != uid && + !uid_eq(lo->lo_key_owner, uid) && - !capable(CAP_SYS_ADMIN)) + !vx_capable(CAP_SYS_ADMIN, VXC_ADMIN_CLOOP)) return -EPERM; if (lo->lo_state != Lo_bound) return -ENXIO; -@@ -1063,7 +1066,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; @@ -1106,31 +808,33 @@ diff -NurpP --minimal linux-2.6.36.2/drivers/block/loop.c linux-2.6.36.2-vs2.3.0 info->lo_encrypt_key_size = lo->lo_encrypt_key_size; memcpy(info->lo_encrypt_key, lo->lo_encrypt_key, lo->lo_encrypt_key_size); -@@ -1409,6 +1413,9 @@ static int lo_open(struct block_device * - { - struct loop_device *lo = bdev->bd_disk->private_data; +@@ -1504,6 +1508,11 @@ static int lo_open(struct block_device * + goto out; + } -+ if (!vx_check(lo->lo_xid, VS_IDENT|VS_HOSTID|VS_ADMIN_P)) -+ return -EACCES; ++ if (!vx_check(lo->lo_xid, VS_IDENT|VS_HOSTID|VS_ADMIN_P)) { ++ err = -EACCES; ++ goto out; ++ } + - lock_kernel(); mutex_lock(&lo->lo_ctl_mutex); lo->lo_refcnt++; -diff -NurpP --minimal linux-2.6.36.2/drivers/block/Makefile linux-2.6.36.2-vs2.3.0.36.38.2/drivers/block/Makefile ---- linux-2.6.36.2/drivers/block/Makefile 2010-02-25 11:51:36.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/drivers/block/Makefile 2010-10-21 13:09:36.000000000 +0200 -@@ -34,6 +34,7 @@ obj-$(CONFIG_VIODASD) += viodasd.o - obj-$(CONFIG_BLK_DEV_SX8) += sx8.o - obj-$(CONFIG_BLK_DEV_UB) += ub.o - obj-$(CONFIG_BLK_DEV_HD) += hd.o -+obj-$(CONFIG_BLK_DEV_VROOT) += vroot.o + mutex_unlock(&lo->lo_ctl_mutex); +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); - obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o - obj-$(CONFIG_BLK_DEV_DRBD) += drbd/ -diff -NurpP --minimal linux-2.6.36.2/drivers/block/vroot.c linux-2.6.36.2-vs2.3.0.36.38.2/drivers/block/vroot.c ---- linux-2.6.36.2/drivers/block/vroot.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/drivers/block/vroot.c 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,282 @@ +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 + * @@ -1261,14 +965,13 @@ diff -NurpP --minimal linux-2.6.36.2/drivers/block/vroot.c linux-2.6.36.2-vs2.3. + 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 = { @@ -1278,6 +981,12 @@ diff -NurpP --minimal linux-2.6.36.2/drivers/block/vroot.c linux-2.6.36.2-vs2.3. + .ioctl = vr_ioctl, +}; + ++static void vroot_make_request(struct request_queue *q, struct bio *bio) ++{ ++ printk("vroot_make_request %p, %p\n", q, bio); ++ bio_io_error(bio); ++} ++ +struct block_device *__vroot_get_real_bdev(struct block_device *bdev) +{ + struct inode *inode = bdev->bd_inode; @@ -1299,7 +1008,9 @@ diff -NurpP --minimal linux-2.6.36.2/drivers/block/vroot.c linux-2.6.36.2-vs2.3. + return real_bdev; +} + -+/* ++ ++ ++/* + * And now the modules code and kernel interface. + */ + @@ -1344,6 +1055,7 @@ diff -NurpP --minimal linux-2.6.36.2/drivers/block/vroot.c linux-2.6.36.2-vs2.3. + disks[i]->queue = blk_alloc_queue(GFP_KERNEL); + if (!disks[i]->queue) + goto out_mem3; ++ blk_queue_make_request(disks[i]->queue, vroot_make_request); + } + + for (i = 0; i < max_vroot; i++) { @@ -1351,7 +1063,7 @@ diff -NurpP --minimal linux-2.6.36.2/drivers/block/vroot.c linux-2.6.36.2-vs2.3. + struct gendisk *disk = disks[i]; + + memset(vr, 0, sizeof(*vr)); -+ init_MUTEX(&vr->vr_ctl_mutex); ++ sema_init(&vr->vr_ctl_mutex, 1); + vr->vr_number = i; + disk->major = VROOT_MAJOR; + disk->first_minor = i; @@ -1413,426 +1125,110 @@ diff -NurpP --minimal linux-2.6.36.2/drivers/block/vroot.c linux-2.6.36.2-vs2.3. + +#endif + -diff -NurpP --minimal linux-2.6.36.2/drivers/char/sysrq.c linux-2.6.36.2-vs2.3.0.36.38.2/drivers/char/sysrq.c ---- linux-2.6.36.2/drivers/char/sysrq.c 2010-10-21 13:07:02.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/drivers/char/sysrq.c 2010-10-28 18:08:06.000000000 +0200 -@@ -41,6 +41,7 @@ - #include - #include - #include -+#include +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 - #include - #include -@@ -395,6 +396,21 @@ static struct sysrq_key_op sysrq_unrt_op - .enable_mask = SYSRQ_ENABLE_RTNICE, - }; + if (ipv6_addr_any(&fl6.saddr)) { + ret = ipv6_dev_get_saddr(&init_net, ip6_dst_idev(dst)->dev, +- &fl6.daddr, 0, &fl6.saddr); ++ &fl6.daddr, 0, &fl6.saddr, NULL); + if (ret) + goto put; -+ -+#ifdef CONFIG_VSERVER_DEBUG -+static void sysrq_handle_vxinfo(int key) -+{ -+ dump_vx_info_inactive((key == 'x') ? 0 : 1); -+} -+ -+static struct sysrq_key_op sysrq_showvxinfo_op = { -+ .handler = sysrq_handle_vxinfo, -+ .help_msg = "conteXt", -+ .action_msg = "Show Context Info", -+ .enable_mask = SYSRQ_ENABLE_DUMP, -+}; -+#endif -+ - /* Key Operations table and lock */ - static DEFINE_SPINLOCK(sysrq_key_table_lock); +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 + #include ++#include -@@ -449,7 +465,11 @@ static struct sysrq_key_op *sysrq_key_ta - NULL, /* v */ - &sysrq_showstate_blocked_op, /* w */ - /* x: May be registered on ppc/powerpc for xmon */ -+#ifdef CONFIG_VSERVER_DEBUG -+ &sysrq_showvxinfo_op, /* x */ -+#else - NULL, /* x */ -+#endif - /* y: May be registered on sparc64 for global register dump */ - NULL, /* y */ - &sysrq_ftrace_dump_op, /* z */ -@@ -464,6 +484,8 @@ static int sysrq_key_table_key2index(int - retval = key - '0'; - else if ((key >= 'a') && (key <= 'z')) - retval = key + 10 - 'a'; -+ else if ((key >= 'A') && (key <= 'Z')) -+ retval = key + 10 - 'A'; - else - retval = -1; - return retval; -diff -NurpP --minimal linux-2.6.36.2/drivers/char/tty_io.c linux-2.6.36.2-vs2.3.0.36.38.2/drivers/char/tty_io.c ---- linux-2.6.36.2/drivers/char/tty_io.c 2010-12-13 22:08:57.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/drivers/char/tty_io.c 2010-12-13 22:09:27.000000000 +0100 -@@ -106,6 +106,7 @@ + #include - #include - #include -+#include +@@ -114,7 +115,8 @@ static struct hash_cell *__get_name_cell + unsigned int h = hash_str(str); - #undef TTY_DEBUG_HANGUP + list_for_each_entry (hc, _name_buckets + h, name_list) +- if (!strcmp(hc->name, str)) { ++ if (vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT) && ++ !strcmp(hc->name, str)) { + dm_get(hc->md); + return hc; + } +@@ -128,7 +130,8 @@ static struct hash_cell *__get_uuid_cell + unsigned int h = hash_str(str); -@@ -2047,7 +2048,8 @@ static int tiocsti(struct tty_struct *tt - char ch, mbz = 0; - struct tty_ldisc *ld; + list_for_each_entry (hc, _uuid_buckets + h, uuid_list) +- if (!strcmp(hc->uuid, str)) { ++ if (vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT) && ++ !strcmp(hc->uuid, str)) { + dm_get(hc->md); + return hc; + } +@@ -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; +- struct hash_cell *hc; ++ struct hash_cell *hc = NULL; -- if ((current->signal->tty != tty) && !capable(CAP_SYS_ADMIN)) -+ if (((current->signal->tty != tty) && -+ !vx_capable(CAP_SYS_ADMIN, VXC_TIOCSTI))) - return -EPERM; - if (get_user(ch, p)) - return -EFAULT; -@@ -2335,6 +2337,7 @@ static int tiocspgrp(struct tty_struct * - return -ENOTTY; - if (get_user(pgrp_nr, p)) - return -EFAULT; -+ pgrp_nr = vx_rmap_pid(pgrp_nr); - if (pgrp_nr < 0) - return -EINVAL; - rcu_read_lock(); -diff -NurpP --minimal linux-2.6.36.2/drivers/gpu/drm/radeon/r100_reg_safe.h linux-2.6.36.2-vs2.3.0.36.38.2/drivers/gpu/drm/radeon/r100_reg_safe.h ---- linux-2.6.36.2/drivers/gpu/drm/radeon/r100_reg_safe.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/drivers/gpu/drm/radeon/r100_reg_safe.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,28 @@ -+static const unsigned r100_reg_safe_bm[102] = { -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0x17FF1FFF, 0xFFFFFFFC, 0xFFFFFFFF, 0xFF30FFBF, -+ 0xFFFFFFF8, 0xC3E6FFFF, 0xFFFFF6DF, 0xFFFFFFFF, -+ 0xFFFFFFCF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFF9F, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0x38E7FE1F, 0xFFC3FF8E, 0x7FF8FFFF, 0xFFFF803C, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFEFFFF, 0xFFFFFFFF, -+ 0x00000000, 0xFFFFFFFD, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFCFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFEF, -+}; -diff -NurpP --minimal linux-2.6.36.2/drivers/gpu/drm/radeon/r200_reg_safe.h linux-2.6.36.2-vs2.3.0.36.38.2/drivers/gpu/drm/radeon/r200_reg_safe.h ---- linux-2.6.36.2/drivers/gpu/drm/radeon/r200_reg_safe.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/drivers/gpu/drm/radeon/r200_reg_safe.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,28 @@ -+static const unsigned r200_reg_safe_bm[102] = { -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0x17FF1FFF, 0xFFFFFFFC, 0xFFFFFFFF, 0xFF30FFBF, -+ 0xFFFFFFF8, 0xC3E6FFFF, 0xFFFFF6DF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFE7FE1F, 0xF003FFFF, 0x7EFFFFFF, 0xFFFF803C, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFEFCE, 0xFFFEFFFF, 0xFFFFFFFE, -+ 0x020E0FF0, 0xFFCC83FD, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFBFFFF, 0xEFFCFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xDFDFDFDF, 0x3FFDDFDF, 0xFFFFFFFF, 0xFFFFFF7F, -+ 0xFFFFFFFF, 0x00FFFFFF, 0x00000000, 0x00000000, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFE3F, 0xFFFFFFEF, -+}; -diff -NurpP --minimal linux-2.6.36.2/drivers/gpu/drm/radeon/r300_reg_safe.h linux-2.6.36.2-vs2.3.0.36.38.2/drivers/gpu/drm/radeon/r300_reg_safe.h ---- linux-2.6.36.2/drivers/gpu/drm/radeon/r300_reg_safe.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/drivers/gpu/drm/radeon/r300_reg_safe.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,42 @@ -+static const unsigned r300_reg_safe_bm[159] = { -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0x17FF1FFF, 0xFFFFFFFC, 0xFFFFFFFF, 0xFF30FFBF, -+ 0xFFFFFFF8, 0xC3E6FFFF, 0xFFFFF6DF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFF03F, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFEFCE, 0xF00EBFFF, 0x007C0000, -+ 0xF0000078, 0xFF000009, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFF7FF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFC78, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFF, -+ 0x38FF8F50, 0xFFF88082, 0xF000000C, 0xFAE009FF, -+ 0x0000FFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, -+ 0x00000000, 0x0000C100, 0x00000000, 0x00000000, -+ 0x00000000, 0x00000000, 0x00000000, 0x00000000, -+ 0x00000000, 0xFFFF0000, 0xFFFFFFFF, 0xFF80FFFF, -+ 0x00000000, 0x00000000, 0x00000000, 0x00000000, -+ 0x0003FC01, 0xFFFFFCF8, 0xFF800B19, -+}; -diff -NurpP --minimal linux-2.6.36.2/drivers/gpu/drm/radeon/r420_reg_safe.h linux-2.6.36.2-vs2.3.0.36.38.2/drivers/gpu/drm/radeon/r420_reg_safe.h ---- linux-2.6.36.2/drivers/gpu/drm/radeon/r420_reg_safe.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/drivers/gpu/drm/radeon/r420_reg_safe.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,42 @@ -+static const unsigned r420_reg_safe_bm[159] = { -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0x17FF1FFF, 0xFFFFFFFC, 0xFFFFFFFF, 0xFF30FFBF, -+ 0xFFFFFFF8, 0xC3E6FFFF, 0xFFFFF6DF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFF03F, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFEFCE, 0xF00EBFFF, 0x007C0000, -+ 0xF0000078, 0xFF000009, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFF7FF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFC78, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFF, -+ 0x38FF8F50, 0xFFF88082, 0xF000000C, 0xFAE009FF, -+ 0x0000FFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, -+ 0x00000000, 0x00000100, 0x00000000, 0x00000000, -+ 0x00000000, 0x00000000, 0x00000000, 0x00000000, -+ 0x00000000, 0x00000000, 0x00000000, 0xFF800000, -+ 0x00000000, 0x00000000, 0x00000000, 0x00000000, -+ 0x0003FC01, 0xFFFFFCF8, 0xFF800B19, -+}; -diff -NurpP --minimal linux-2.6.36.2/drivers/gpu/drm/radeon/rn50_reg_safe.h linux-2.6.36.2-vs2.3.0.36.38.2/drivers/gpu/drm/radeon/rn50_reg_safe.h ---- linux-2.6.36.2/drivers/gpu/drm/radeon/rn50_reg_safe.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/drivers/gpu/drm/radeon/rn50_reg_safe.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,28 @@ -+static const unsigned rn50_reg_safe_bm[102] = { -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0x17FF1FFF, 0xFFFFFFFC, 0xFFFFFFFF, 0xFF30FFBF, -+ 0xFFFFFFF8, 0xC3E6FFFF, 0xFFFFF6DF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, -+}; -diff -NurpP --minimal linux-2.6.36.2/drivers/gpu/drm/radeon/rs600_reg_safe.h linux-2.6.36.2-vs2.3.0.36.38.2/drivers/gpu/drm/radeon/rs600_reg_safe.h ---- linux-2.6.36.2/drivers/gpu/drm/radeon/rs600_reg_safe.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/drivers/gpu/drm/radeon/rs600_reg_safe.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,57 @@ -+static const unsigned rs600_reg_safe_bm[219] = { -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0x17FF1FFF, 0xFFFFFFFC, 0xFFFFFFFF, 0xFF30FFBF, -+ 0xFFFFFFF8, 0xC3E6FFFF, 0xFFFFF6DF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFF03F, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFEFCE, 0xF00EBFFF, 0x007C0000, -+ 0xF0000078, 0xFF000009, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFF7FF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFC78, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFF, -+ 0x38FF8F50, 0xFFF88082, 0xF000000C, 0xFAE009FF, -+ 0x0000FFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, -+ 0x00000000, 0x00000100, 0x00000000, 0x00000000, -+ 0x00000000, 0x00000000, 0x00000000, 0x00000000, -+ 0x00000000, 0x00000000, 0x00000000, 0xFF800000, -+ 0x00000000, 0x00000000, 0x00000000, 0x00000000, -+ 0x0003FC01, 0xFFFFFCF8, 0xFF800B19, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+}; -diff -NurpP --minimal linux-2.6.36.2/drivers/gpu/drm/radeon/rv515_reg_safe.h linux-2.6.36.2-vs2.3.0.36.38.2/drivers/gpu/drm/radeon/rv515_reg_safe.h ---- linux-2.6.36.2/drivers/gpu/drm/radeon/rv515_reg_safe.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/drivers/gpu/drm/radeon/rv515_reg_safe.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,57 @@ -+static const unsigned rv515_reg_safe_bm[219] = { -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0x17FF1FFF, 0xFFFFFFFC, 0xFFFFFFFF, 0xFF30FFBF, -+ 0xFFFFFFF8, 0xC3E6FFFF, 0xFFFFF6DF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFF03F, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFEFCE, 0xF00EBFFF, 0x007C0000, -+ 0xF0000038, 0xFF000009, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFF7FF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0x1FFFF878, 0xFFFFE000, 0xFFFFFE1E, 0xFFFFFFFF, -+ 0x388F8F50, 0xFFF88082, 0xFF0000FC, 0xFAE009FF, -+ 0x0000FFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, -+ 0xFFFF8CFC, 0xFFFFC1FF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFF80FFFF, -+ 0x00000000, 0x00000000, 0x00000000, 0x00000000, -+ 0x0003FC01, 0x3FFFFCF8, 0xFF800B19, 0xFFDFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -+}; -diff -NurpP --minimal linux-2.6.36.2/drivers/infiniband/core/addr.c linux-2.6.36.2-vs2.3.0.36.38.2/drivers/infiniband/core/addr.c ---- linux-2.6.36.2/drivers/infiniband/core/addr.c 2010-10-21 13:07:05.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/drivers/infiniband/core/addr.c 2010-10-21 13:09:36.000000000 +0200 -@@ -252,7 +252,7 @@ static int addr6_resolve(struct sockaddr + md = dm_get_md(huge_decode_dev(dev)); + if (!md) + return NULL; - if (ipv6_addr_any(&fl.fl6_src)) { - ret = ipv6_dev_get_saddr(&init_net, ip6_dst_idev(dst)->dev, -- &fl.fl6_dst, 0, &fl.fl6_src); -+ &fl.fl6_dst, 0, &fl.fl6_src, NULL); - if (ret) - goto put; +- hc = dm_get_mdptr(md); ++ if (vx_check(dm_get_xid(md), VS_WATCH_P | VS_IDENT)) ++ hc = dm_get_mdptr(md); ++ + if (!hc) { + dm_put(md); + return NULL; +@@ -467,6 +472,9 @@ typedef int (*ioctl_fn)(struct dm_ioctl -diff -NurpP --minimal linux-2.6.36.2/drivers/infiniband/hw/ipath/ipath_user_pages.c linux-2.6.36.2-vs2.3.0.36.38.2/drivers/infiniband/hw/ipath/ipath_user_pages.c ---- linux-2.6.36.2/drivers/infiniband/hw/ipath/ipath_user_pages.c 2010-07-07 18:31:19.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/drivers/infiniband/hw/ipath/ipath_user_pages.c 2010-10-21 13:09:36.000000000 +0200 -@@ -35,6 +35,7 @@ - #include - #include - #include -+#include + static int remove_all(struct dm_ioctl *param, size_t param_size) + { ++ if (!vx_check(0, VS_ADMIN)) ++ return -EPERM; ++ + dm_hash_remove_all(true, !!(param->flags & DM_DEFERRED_REMOVE), false); + param->data_size = 0; + return 0; +@@ -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) { ++ if (!vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT)) ++ continue; + needed += sizeof(struct dm_name_list); + needed += strlen(hc->name) + 1; + needed += ALIGN_MASK; +@@ -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) { ++ if (!vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT)) ++ continue; + if (old_nl) + old_nl->next = (uint32_t) ((void *) nl - + (void *) old_nl); +@@ -1797,8 +1809,8 @@ static int ctl_ioctl(uint command, struc + size_t input_param_size; + struct dm_ioctl param_kernel; - #include "ipath_kernel.h" +- /* only root can play with this */ +- if (!capable(CAP_SYS_ADMIN)) ++ /* only root and certain contexts can play with this */ ++ if (!vx_capable(CAP_SYS_ADMIN, VXC_ADMIN_MAPPER)) + return -EACCES; -diff -NurpP --minimal linux-2.6.36.2/drivers/md/dm.c linux-2.6.36.2-vs2.3.0.36.38.2/drivers/md/dm.c ---- linux-2.6.36.2/drivers/md/dm.c 2010-10-21 13:07:07.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/drivers/md/dm.c 2010-10-21 15:19:30.000000000 +0200 -@@ -21,6 +21,7 @@ + if (_IOC_TYPE(command) != DM_IOCTL) +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 #include @@ -1840,23 +1236,23 @@ diff -NurpP --minimal linux-2.6.36.2/drivers/md/dm.c linux-2.6.36.2-vs2.3.0.36.3 #include -@@ -121,6 +122,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; ++ vxid_t xid; - unsigned long flags; - -@@ -343,6 +345,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; + int ret = -ENXIO; - lock_kernel(); spin_lock(&_minor_lock); -@@ -352,19 +355,20 @@ 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) || @@ -1876,21 +1272,20 @@ diff -NurpP --minimal linux-2.6.36.2/drivers/md/dm.c linux-2.6.36.2-vs2.3.0.36.3 + ret = 0; out: spin_unlock(&_minor_lock); - unlock_kernel(); - - return md ? 0 : -ENXIO; + return ret; } - static int dm_blk_close(struct gendisk *disk, fmode_t mode) -@@ -586,6 +590,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; +} @@ -1898,167 +1293,72 @@ diff -NurpP --minimal linux-2.6.36.2/drivers/md/dm.c linux-2.6.36.2-vs2.3.0.36.3 /*----------------------------------------------------------------- * CRUD START: * A more elegant soln is in the works that uses the queue -@@ -1981,6 +1993,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-2.6.36.2/drivers/md/dm.h linux-2.6.36.2-vs2.3.0.36.38.2/drivers/md/dm.h ---- linux-2.6.36.2/drivers/md/dm.h 2010-10-21 13:07:07.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/drivers/md/dm.h 2010-10-21 13:09:36.000000000 +0200 -@@ -41,6 +41,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-2.6.36.2/drivers/md/dm-ioctl.c linux-2.6.36.2-vs2.3.0.36.38.2/drivers/md/dm-ioctl.c ---- linux-2.6.36.2/drivers/md/dm-ioctl.c 2010-10-21 13:07:07.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/drivers/md/dm-ioctl.c 2010-10-21 13:09:36.000000000 +0200 -@@ -16,6 +16,7 @@ - #include - #include - #include -+#include - - #include - -@@ -106,7 +107,8 @@ static struct hash_cell *__get_name_cell - unsigned int h = hash_str(str); - - list_for_each_entry (hc, _name_buckets + h, name_list) -- if (!strcmp(hc->name, str)) { -+ if (vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT) && -+ !strcmp(hc->name, str)) { - dm_get(hc->md); - return hc; - } -@@ -120,7 +122,8 @@ static struct hash_cell *__get_uuid_cell - unsigned int h = hash_str(str); - - list_for_each_entry (hc, _uuid_buckets + h, uuid_list) -- if (!strcmp(hc->uuid, str)) { -+ if (vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT) && -+ !strcmp(hc->uuid, str)) { - dm_get(hc->md); - return hc; - } -@@ -377,6 +380,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); - param->data_size = 0; - return 0; -@@ -424,6 +430,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) { -+ if (!vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT)) -+ continue; - needed += sizeof(struct dm_name_list); - needed += strlen(hc->name) + 1; - needed += ALIGN_MASK; -@@ -447,6 +455,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) { -+ if (!vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT)) -+ continue; - if (old_nl) - old_nl->next = (uint32_t) ((void *) nl - - (void *) old_nl); -@@ -681,10 +691,11 @@ static struct hash_cell *__find_device_h - if (!md) - goto out; - -- mdptr = dm_get_mdptr(md); -+ if (vx_check(dm_get_xid(md), VS_WATCH_P | VS_IDENT)) -+ mdptr = dm_get_mdptr(md); -+ - if (!mdptr) - dm_put(md); -- - out: - return mdptr; - } -@@ -1513,8 +1524,8 @@ static int ctl_ioctl(uint command, struc - ioctl_fn fn = NULL; - size_t param_size; - -- /* only root can play with this */ -- if (!capable(CAP_SYS_ADMIN)) -+ /* only root and certain contexts can play with this */ -+ if (!vx_capable(CAP_SYS_ADMIN, VXC_ADMIN_MAPPER)) - return -EACCES; - - if (_IOC_TYPE(command) != DM_IOCTL) -diff -NurpP --minimal linux-2.6.36.2/drivers/net/tun.c linux-2.6.36.2-vs2.3.0.36.38.2/drivers/net/tun.c ---- linux-2.6.36.2/drivers/net/tun.c 2010-10-21 13:07:15.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/drivers/net/tun.c 2010-10-21 13:09:36.000000000 +0200 -@@ -62,6 +62,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 -@@ -103,6 +104,7 @@ struct tun_struct { +@@ -171,6 +172,7 @@ struct tun_struct { unsigned int flags; - uid_t owner; - gid_t group; -+ nid_t nid; + kuid_t owner; + kgid_t group; ++ vnid_t nid; struct net_device *dev; - struct fasync_struct *fasync; -@@ -853,6 +855,7 @@ static void tun_setup(struct net_device + netdev_features_t set_features; +@@ -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) */ + } - tun->owner = -1; - tun->group = -1; -+ tun->nid = current->nid; + 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; ++ tun->nid = nx_current_nid(); dev->ethtool_ops = &tun_ethtool_ops; dev->destructor = tun_free_netdev; -@@ -1003,7 +1006,7 @@ static int tun_set_iff(struct net *net, - - if (((tun->owner != -1 && cred->euid != tun->owner) || - (tun->group != -1 && !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) -@@ -1017,7 +1020,7 @@ static int tun_set_iff(struct net *net, - char *name; - unsigned long flags = 0; +@@ -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 (!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) -@@ -1087,6 +1090,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; -@@ -1278,6 +1284,16 @@ static long __tun_chr_ioctl(struct file - DBG(KERN_INFO "%s: group set to %d\n", tun->dev->name, tun->group); +@@ -1996,6 +2000,16 @@ static long __tun_chr_ioctl(struct file + from_kgid(&init_user_ns, tun->group)); break; + case TUNSETNID: @@ -2066,50 +1366,146 @@ diff -NurpP --minimal linux-2.6.36.2/drivers/net/tun.c linux-2.6.36.2-vs2.3.0.36 + return -EPERM; + + /* Set nid owner of the device */ -+ tun->nid = (nid_t) arg; ++ tun->nid = (vnid_t) arg; + -+ DBG(KERN_INFO "%s: nid owner set to %u\n", tun->dev->name, tun->nid); ++ tun_debug(KERN_INFO, tun, "nid owner set to %u\n", tun->nid); + break; + case TUNSETLINK: /* Only allow setting the type when the interface is down */ if (tun->dev->flags & IFF_UP) { -diff -NurpP --minimal linux-2.6.36.2/fs/attr.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/attr.c ---- linux-2.6.36.2/fs/attr.c 2010-10-21 13:07:47.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/attr.c 2010-10-21 14:04:40.000000000 +0200 -@@ -13,6 +13,9 @@ - #include - #include - #include -+#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 - /** - * inode_change_ok - check if attribute changes to an inode are allowed -@@ -73,6 +76,10 @@ int inode_change_ok(const struct inode * - return -EPERM; - } + #include + #include +@@ -408,6 +409,21 @@ static struct sysrq_key_op sysrq_unrt_op + .enable_mask = SYSRQ_ENABLE_RTNICE, + }; -+ /* check for inode tag permission */ -+ if (dx_permission(inode, MAY_WRITE)) -+ return -EACCES; + - return 0; - } - EXPORT_SYMBOL(inode_change_ok); -@@ -143,6 +150,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; ++#ifdef CONFIG_VSERVER_DEBUG ++static void sysrq_handle_vxinfo(int key) ++{ ++ dump_vx_info_inactive((key == 'x') ? 0 : 1); ++} ++ ++static struct sysrq_key_op sysrq_showvxinfo_op = { ++ .handler = sysrq_handle_vxinfo, ++ .help_msg = "conteXt", ++ .action_msg = "Show Context Info", ++ .enable_mask = SYSRQ_ENABLE_DUMP, ++}; ++#endif ++ + /* Key Operations table and lock */ + static DEFINE_SPINLOCK(sysrq_key_table_lock); + +@@ -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 */ ++#ifdef CONFIG_VSERVER_DEBUG ++ &sysrq_showvxinfo_op, /* x */ ++#else + NULL, /* x */ ++#endif + /* y: May be registered on sparc64 for global register dump */ + NULL, /* y */ + &sysrq_ftrace_dump_op, /* z */ +@@ -478,6 +498,8 @@ static int sysrq_key_table_key2index(int + retval = key - '0'; + else if ((key >= 'a') && (key <= 'z')) + retval = key + 10 - 'a'; ++ else if ((key >= 'A') && (key <= 'Z')) ++ retval = key + 10 - 'A'; + else + retval = -1; + return retval; +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 + #include ++#include + + #undef TTY_DEBUG_HANGUP + +@@ -2237,7 +2238,8 @@ static int tiocsti(struct tty_struct *tt + char ch, mbz = 0; + struct tty_ldisc *ld; + +- if ((current->signal->tty != tty) && !capable(CAP_SYS_ADMIN)) ++ if (((current->signal->tty != tty) && ++ !vx_capable(CAP_SYS_ADMIN, VXC_TIOCSTI))) + return -EPERM; + if (get_user(ch, p)) + return -EFAULT; +@@ -2525,6 +2527,7 @@ static int tiocspgrp(struct tty_struct * + return -ENOTTY; + if (get_user(pgrp_nr, p)) + return -EFAULT; ++ pgrp_nr = vx_rmap_pid(pgrp_nr); + if (pgrp_nr < 0) + return -EINVAL; + rcu_read_lock(); +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 + #include ++#include ++#include ++#include + + /** + * inode_change_ok - check if attribute changes to an inode are allowed +@@ -77,6 +80,10 @@ int inode_change_ok(const struct inode * + return -EPERM; + } + ++ /* check for inode tag permission */ ++ if (dx_permission(inode, MAY_WRITE)) ++ return -EACCES; ++ + return 0; + } + EXPORT_SYMBOL(inode_change_ok); +@@ -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; + if ((ia_valid & ATTR_TAG) && IS_TAGGED(inode)) + inode->i_tag = attr->ia_tag; if (ia_valid & ATTR_ATIME) inode->i_atime = timespec_trunc(attr->ia_atime, inode->i_sb->s_time_gran); -@@ -170,7 +179,8 @@ int notify_change(struct dentry * dentry - struct timespec now; - unsigned int ia_valid = attr->ia_valid; +@@ -197,7 +206,8 @@ int notify_change(struct dentry * dentry + + WARN_ON_ONCE(!mutex_is_locked(&inode->i_mutex)); - if (ia_valid & (ATTR_MODE | ATTR_UID | ATTR_GID | ATTR_TIMES_SET)) { + if (ia_valid & (ATTR_MODE | ATTR_UID | ATTR_GID | @@ -2117,62 +1513,18 @@ diff -NurpP --minimal linux-2.6.36.2/fs/attr.c linux-2.6.36.2-vs2.3.0.36.38.2/fs if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) return -EPERM; } -diff -NurpP --minimal linux-2.6.36.2/fs/binfmt_aout.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/binfmt_aout.c ---- linux-2.6.36.2/fs/binfmt_aout.c 2010-10-21 13:07:47.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/binfmt_aout.c 2010-10-21 13:09:36.000000000 +0200 -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - #include - #include -diff -NurpP --minimal linux-2.6.36.2/fs/binfmt_elf.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/binfmt_elf.c ---- linux-2.6.36.2/fs/binfmt_elf.c 2010-07-07 18:31:50.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/binfmt_elf.c 2010-10-21 13:09:36.000000000 +0200 -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff -NurpP --minimal linux-2.6.36.2/fs/binfmt_flat.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/binfmt_flat.c ---- linux-2.6.36.2/fs/binfmt_flat.c 2010-08-02 16:52:47.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/binfmt_flat.c 2010-10-21 13:09:36.000000000 +0200 -@@ -35,6 +35,7 @@ - #include - #include - #include -+#include - - #include - #include -diff -NurpP --minimal linux-2.6.36.2/fs/binfmt_som.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/binfmt_som.c ---- linux-2.6.36.2/fs/binfmt_som.c 2010-02-25 11:52:04.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/binfmt_som.c 2010-10-21 13:09:36.000000000 +0200 +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 -diff -NurpP --minimal linux-2.6.36.2/fs/block_dev.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/block_dev.c ---- linux-2.6.36.2/fs/block_dev.c 2010-10-21 13:07:47.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/block_dev.c 2010-10-21 13:09:36.000000000 +0200 -@@ -26,6 +26,7 @@ - #include #include - #include + #include + #include +#include #include #include "internal.h" -@@ -530,6 +531,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; @@ -2180,7 +1532,7 @@ diff -NurpP --minimal linux-2.6.36.2/fs/block_dev.c linux-2.6.36.2-vs2.3.0.36.38 inode->i_bdev = bdev; inode->i_data.a_ops = &def_blk_aops; mapping_set_gfp_mask(&inode->i_data, GFP_USER); -@@ -576,6 +578,11 @@ EXPORT_SYMBOL(bdput); +@@ -622,6 +624,11 @@ EXPORT_SYMBOL(bdput); static struct block_device *bd_acquire(struct inode *inode) { struct block_device *bdev; @@ -2192,7 +1544,7 @@ diff -NurpP --minimal linux-2.6.36.2/fs/block_dev.c linux-2.6.36.2-vs2.3.0.36.38 spin_lock(&bdev_lock); bdev = inode->i_bdev; -@@ -586,7 +593,7 @@ static struct block_device *bd_acquire(s +@@ -632,7 +639,7 @@ static struct block_device *bd_acquire(s } spin_unlock(&bdev_lock); @@ -2201,10 +1553,10 @@ diff -NurpP --minimal linux-2.6.36.2/fs/block_dev.c linux-2.6.36.2-vs2.3.0.36.38 if (bdev) { spin_lock(&bdev_lock); if (!inode->i_bdev) { -diff -NurpP --minimal linux-2.6.36.2/fs/btrfs/ctree.h linux-2.6.36.2-vs2.3.0.36.38.2/fs/btrfs/ctree.h ---- linux-2.6.36.2/fs/btrfs/ctree.h 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/btrfs/ctree.h 2010-10-21 13:09:36.000000000 +0200 -@@ -551,11 +551,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; @@ -2220,16 +1572,16 @@ diff -NurpP --minimal linux-2.6.36.2/fs/btrfs/ctree.h linux-2.6.36.2-vs2.3.0.36. struct btrfs_timespec atime; struct btrfs_timespec ctime; struct btrfs_timespec mtime; -@@ -1193,6 +1196,8 @@ struct btrfs_root { - #define BTRFS_MOUNT_DISCARD (1 << 10) - #define BTRFS_MOUNT_FORCE_COMPRESS (1 << 11) +@@ -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 & \ -@@ -1413,6 +1418,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); @@ -2237,7 +1589,7 @@ diff -NurpP --minimal linux-2.6.36.2/fs/btrfs/ctree.h linux-2.6.36.2-vs2.3.0.36. 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); -@@ -1474,6 +1480,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); @@ -2248,19 +1600,19 @@ diff -NurpP --minimal linux-2.6.36.2/fs/btrfs/ctree.h linux-2.6.36.2-vs2.3.0.36. BTRFS_SETGET_FUNCS(tree_block_level, struct btrfs_tree_block_info, level, 8); -@@ -2432,6 +2442,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); - - /* file.c */ - int btrfs_sync_file(struct file *file, int datasync); -diff -NurpP --minimal linux-2.6.36.2/fs/btrfs/disk-io.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/btrfs/disk-io.c ---- linux-2.6.36.2/fs/btrfs/disk-io.c 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/btrfs/disk-io.c 2010-10-21 13:09:36.000000000 +0200 -@@ -1707,6 +1707,9 @@ struct btrfs_root *open_ctree(struct sup - goto fail_iput; + 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.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; } + if (btrfs_test_opt(tree_root, TAGGED)) @@ -2269,81 +1621,93 @@ diff -NurpP --minimal linux-2.6.36.2/fs/btrfs/disk-io.c linux-2.6.36.2-vs2.3.0.3 features = btrfs_super_incompat_flags(disk_super) & ~BTRFS_FEATURE_INCOMPAT_SUPP; if (features) { -diff -NurpP --minimal linux-2.6.36.2/fs/btrfs/inode.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/btrfs/inode.c ---- linux-2.6.36.2/fs/btrfs/inode.c 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/btrfs/inode.c 2010-10-21 13:09:36.000000000 +0200 -@@ -37,6 +37,8 @@ - #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" -@@ -2415,6 +2417,8 @@ static void btrfs_read_locked_inode(stru + #include "transaction.h" +@@ -3477,6 +3478,9 @@ static void btrfs_read_locked_inode(stru + unsigned long ptr; int maybe_acls; - u64 alloc_group_block; u32 rdev; -+ uid_t uid; -+ gid_t gid; ++ kuid_t kuid; ++ kgid_t kgid; ++ ktag_t ktag; int ret; - - path = btrfs_alloc_path(); -@@ -2431,8 +2435,13 @@ static void btrfs_read_locked_inode(stru - + bool filled = false; + 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); - inode->i_nlink = btrfs_inode_nlink(leaf, inode_item); -- inode->i_uid = btrfs_inode_uid(leaf, inode_item); -- inode->i_gid = btrfs_inode_gid(leaf, inode_item); -+ -+ uid = btrfs_inode_uid(leaf, inode_item); -+ gid = btrfs_inode_gid(leaf, inode_item); -+ 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, -+ btrfs_inode_tag(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)); ++ ++ 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); -@@ -2514,8 +2523,15 @@ 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, inode->i_uid); -- btrfs_set_inode_gid(leaf, item, inode->i_gid); -+ uid_t uid = TAGINO_UID(DX_TAG(inode), inode->i_uid, inode->i_tag); -+ gid_t gid = TAGINO_GID(DX_TAG(inode), inode->i_gid, inode->i_tag); -+ -+ 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, inode->i_tag); ++ 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); -@@ -6946,6 +6962,7 @@ 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, -@@ -7021,6 +7038,7 @@ static const struct inode_operations btr .permission = btrfs_permission, - .fallocate = btrfs_fallocate, ++ .sync_flags = btrfs_sync_flags, + .get_acl = btrfs_get_acl, + .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, - }; - static const struct inode_operations btrfs_special_inode_operations = { - .getattr = btrfs_getattr, -diff -NurpP --minimal linux-2.6.36.2/fs/btrfs/ioctl.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/btrfs/ioctl.c ---- linux-2.6.36.2/fs/btrfs/ioctl.c 2010-08-02 16:52:47.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/btrfs/ioctl.c 2010-10-21 13:09:36.000000000 +0200 -@@ -68,10 +68,13 @@ static unsigned int btrfs_flags_to_ioctl + .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; @@ -2359,9 +1723,9 @@ diff -NurpP --minimal linux-2.6.36.2/fs/btrfs/ioctl.c linux-2.6.36.2-vs2.3.0.36. if (flags & BTRFS_INODE_APPEND) iflags |= FS_APPEND_FL; if (flags & BTRFS_INODE_NODUMP) -@@ -81,28 +84,78 @@ static unsigned int btrfs_flags_to_ioctl - if (flags & BTRFS_INODE_DIRSYNC) - iflags |= FS_DIRSYNC_FL; +@@ -127,34 +130,84 @@ static unsigned int btrfs_flags_to_ioctl + else if (flags & BTRFS_INODE_NOCOMPRESS) + iflags |= FS_NOCOMP_FL; + if (flags & BTRFS_INODE_BARRIER) + iflags |= FS_BARRIER_FL; @@ -2377,36 +1741,40 @@ diff -NurpP --minimal linux-2.6.36.2/fs/btrfs/ioctl.c linux-2.6.36.2-vs2.3.0.36. 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) @@ -2439,19 +1807,21 @@ diff -NurpP --minimal linux-2.6.36.2/fs/btrfs/ioctl.c linux-2.6.36.2-vs2.3.0.36. + ip->flags |= BTRFS_INODE_BARRIER; + if (vflags & V_COW) + ip->flags |= BTRFS_INODE_COW; - } ++ } ++ ++/* + * 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; - /* -@@ -120,7 +173,7 @@ void btrfs_inherit_iflags(struct inode * flags = BTRFS_I(dir)->flags; ++ flags &= ~BTRFS_INODE_BARRIER; - if (S_ISREG(inode->i_mode)) -- flags &= ~BTRFS_INODE_DIRSYNC; -+ flags &= ~(BTRFS_INODE_DIRSYNC | BTRFS_INODE_BARRIER); - else if (!S_ISDIR(inode->i_mode)) - flags &= (BTRFS_INODE_NODUMP | BTRFS_INODE_NOATIME); - -@@ -128,6 +181,30 @@ void btrfs_inherit_iflags(struct inode * + if (flags & BTRFS_INODE_NOCOMPRESS) { + BTRFS_I(inode)->flags &= ~BTRFS_INODE_COMPRESS; +@@ -185,6 +239,30 @@ void btrfs_inherit_iflags(struct inode * btrfs_update_iflags(inode); } @@ -2462,7 +1832,7 @@ diff -NurpP --minimal linux-2.6.36.2/fs/btrfs/ioctl.c linux-2.6.36.2-vs2.3.0.36. + struct btrfs_trans_handle *trans; + int ret; + -+ trans = btrfs_join_transaction(root, 1); ++ trans = btrfs_join_transaction(root); + BUG_ON(!trans); + + inode->i_flags = flags; @@ -2481,16 +1851,8 @@ diff -NurpP --minimal linux-2.6.36.2/fs/btrfs/ioctl.c linux-2.6.36.2-vs2.3.0.36. + static int btrfs_ioctl_getflags(struct file *file, void __user *arg) { - struct btrfs_inode *ip = BTRFS_I(file->f_path.dentry->d_inode); -@@ -150,6 +227,7 @@ static int btrfs_ioctl_setflags(struct f - if (copy_from_user(&flags, arg, sizeof(flags))) - return -EFAULT; - -+ /* maybe add FS_IXUNLINK_FL ? */ - if (flags & ~(FS_IMMUTABLE_FL | FS_APPEND_FL | \ - FS_NOATIME_FL | FS_NODUMP_FL | \ - FS_SYNC_FL | FS_DIRSYNC_FL)) -@@ -162,7 +240,8 @@ 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); @@ -2500,9 +1862,8 @@ diff -NurpP --minimal linux-2.6.36.2/fs/btrfs/ioctl.c linux-2.6.36.2-vs2.3.0.36. if (!capable(CAP_LINUX_IMMUTABLE)) { ret = -EPERM; goto out_unlock; -@@ -173,14 +252,19 @@ static int btrfs_ioctl_setflags(struct f - if (ret) - goto out_unlock; + } + } - if (flags & FS_SYNC_FL) - ip->flags |= BTRFS_INODE_SYNC; @@ -2524,31 +1885,31 @@ diff -NurpP --minimal linux-2.6.36.2/fs/btrfs/ioctl.c linux-2.6.36.2-vs2.3.0.36. if (flags & FS_APPEND_FL) ip->flags |= BTRFS_INODE_APPEND; else -diff -NurpP --minimal linux-2.6.36.2/fs/btrfs/super.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/btrfs/super.c ---- linux-2.6.36.2/fs/btrfs/super.c 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/btrfs/super.c 2010-10-21 13:09:36.000000000 +0200 -@@ -68,7 +68,7 @@ enum { - Opt_nodatacow, Opt_max_inline, Opt_alloc_start, Opt_nobarrier, Opt_ssd, - Opt_nossd, Opt_ssd_spread, Opt_thread_pool, Opt_noacl, Opt_compress, - Opt_compress_force, Opt_notreelog, Opt_ratio, Opt_flushoncommit, -- Opt_discard, Opt_err, -+ Opt_tag, Opt_notag, Opt_tagid, Opt_discard, Opt_err, +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 = { -@@ -92,6 +92,9 @@ static match_table_t tokens = { - {Opt_flushoncommit, "flushoncommit"}, - {Opt_ratio, "metadata_ratio=%d"}, - {Opt_discard, "discard"}, +@@ -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}, }; -@@ -235,6 +238,22 @@ int btrfs_parse_options(struct btrfs_roo - case Opt_discard: - btrfs_set_opt(info->mount_opt, DISCARD); +@@ -743,6 +746,22 @@ int btrfs_parse_options(struct btrfs_roo + info->commit_interval = BTRFS_DEFAULT_COMMIT_INTERVAL; + } break; +#ifndef CONFIG_TAGGING_NONE + case Opt_tag: @@ -2567,11 +1928,11 @@ diff -NurpP --minimal linux-2.6.36.2/fs/btrfs/super.c linux-2.6.36.2-vs2.3.0.36. + break; +#endif case Opt_err: - printk(KERN_INFO "btrfs: unrecognized mount option " - "'%s'\n", p); -@@ -681,6 +700,12 @@ static int btrfs_remount(struct super_bl - if (ret) - return -EINVAL; + 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); + if (btrfs_test_opt(root, TAGGED) && !(sb->s_flags & MS_TAGGED)) { + printk("btrfs: %s: tagging not permitted on remount.\n", @@ -2580,11 +1941,11 @@ diff -NurpP --minimal linux-2.6.36.2/fs/btrfs/super.c linux-2.6.36.2-vs2.3.0.36. + } + if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY)) - return 0; + goto out; -diff -NurpP --minimal linux-2.6.36.2/fs/char_dev.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/char_dev.c ---- linux-2.6.36.2/fs/char_dev.c 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/char_dev.c 2010-10-21 13:09:36.000000000 +0200 +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 @@ -2594,7 +1955,7 @@ diff -NurpP --minimal linux-2.6.36.2/fs/char_dev.c linux-2.6.36.2-vs2.3.0.36.38. #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; @@ -2617,35 +1978,35 @@ diff -NurpP --minimal linux-2.6.36.2/fs/char_dev.c linux-2.6.36.2-vs2.3.0.36.38. if (!kobj) return -ENXIO; new = container_of(kobj, struct cdev, kobj); -diff -NurpP --minimal linux-2.6.36.2/fs/dcache.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/dcache.c ---- linux-2.6.36.2/fs/dcache.c 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/dcache.c 2010-10-21 13:09:36.000000000 +0200 -@@ -33,6 +33,7 @@ - #include - #include - #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" - int sysctl_vfs_cache_pressure __read_mostly = 100; -@@ -230,6 +231,8 @@ repeat: - return; - } - -+ vx_dentry_dec(dentry); -+ - /* - * AV: ->d_delete() is _NOT_ allowed to block now. - */ -@@ -323,6 +326,7 @@ static inline struct dentry * __dget_loc +@@ -654,6 +655,7 @@ EXPORT_SYMBOL(dput); + static inline void __dget_dlock(struct dentry *dentry) { - atomic_inc(&dentry->d_count); - dentry_lru_del_init(dentry); + dentry->d_lockref.count++; + vx_dentry_inc(dentry); - return dentry; } -@@ -928,6 +932,9 @@ struct dentry *d_alloc(struct dentry * p + static inline void __dget(struct dentry *dentry) +@@ -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; @@ -2655,26 +2016,26 @@ diff -NurpP --minimal linux-2.6.36.2/fs/dcache.c linux-2.6.36.2-vs2.3.0.36.38.2/ dentry = kmem_cache_alloc(dentry_cache, GFP_KERNEL); if (!dentry) return NULL; -@@ -973,6 +980,7 @@ struct dentry *d_alloc(struct dentry * p - if (parent) - list_add(&dentry->d_u.d_child, &parent->d_subdirs); - dentry_stat.nr_dentry++; -+ vx_dentry_inc(dentry); - spin_unlock(&dcache_lock); +@@ -1445,6 +1452,7 @@ struct dentry *__d_alloc(struct super_bl - return dentry; -@@ -1432,6 +1440,7 @@ struct dentry * __d_lookup(struct dentry + 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; +@@ -2184,6 +2192,7 @@ struct dentry *__d_lookup(const struct d } - atomic_inc(&dentry->d_count); + dentry->d_lockref.count++; + vx_dentry_inc(dentry); found = dentry; spin_unlock(&dentry->d_lock); break; -diff -NurpP --minimal linux-2.6.36.2/fs/devpts/inode.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/devpts/inode.c ---- linux-2.6.36.2/fs/devpts/inode.c 2010-08-02 16:52:48.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/devpts/inode.c 2010-10-21 22:25:15.000000000 +0200 -@@ -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 @@ -2682,7 +2043,7 @@ diff -NurpP --minimal linux-2.6.36.2/fs/devpts/inode.c linux-2.6.36.2-vs2.3.0.36 #define DEVPTS_DEFAULT_MODE 0600 /* -@@ -36,6 +37,20 @@ +@@ -38,6 +39,21 @@ #define DEVPTS_DEFAULT_PTMX_MODE 0000 #define PTMX_MINOR 2 @@ -2691,8 +2052,8 @@ diff -NurpP --minimal linux-2.6.36.2/fs/devpts/inode.c linux-2.6.36.2-vs2.3.0.36 + int ret = -EACCES; + + /* devpts is xid tagged */ -+ if (vx_check((xid_t)inode->i_tag, VS_WATCH_P | VS_IDENT)) -+ ret = generic_permission(inode, mask, NULL); ++ if (vx_check((vxid_t)i_tag_read(inode), VS_WATCH_P | VS_IDENT)) ++ ret = generic_permission(inode, mask); + return ret; +} + @@ -2700,22 +2061,32 @@ diff -NurpP --minimal linux-2.6.36.2/fs/devpts/inode.c linux-2.6.36.2-vs2.3.0.36 + .permission = devpts_permission, +}; + - extern int pty_limit; /* Config limit on Unix98 ptys */ - static DEFINE_MUTEX(allocated_ptys_lock); - -@@ -263,6 +278,25 @@ static int devpts_show_options(struct se ++ + /* + * 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. +@@ -350,6 +366,34 @@ static int devpts_show_options(struct se return 0; } +static int devpts_filter(struct dentry *de) +{ ++ vxid_t xid = 0; ++ + /* devpts is xid tagged */ -+ return vx_check((xid_t)de->d_inode->i_tag, VS_WATCH_P | VS_IDENT); ++ if (de && 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.", ++ de->d_name.len, de->d_name.name); ++#endif ++ 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 = { @@ -2723,43 +2094,38 @@ diff -NurpP --minimal linux-2.6.36.2/fs/devpts/inode.c linux-2.6.36.2-vs2.3.0.36 + .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, -@@ -302,12 +336,15 @@ devpts_fill_super(struct super_block *s, - inode = new_inode(s); - if (!inode) - goto free_fsi; -+ - inode->i_ino = 1; +@@ -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; - inode->i_fop = &simple_dir_operations; + inode->i_fop = &devpts_dir_operations; - inode->i_nlink = 2; + set_nlink(inode, 2); + /* devpts is xid tagged */ -+ inode->i_tag = (tag_t)vx_current_xid(); ++ i_tag_write(inode, (vtag_t)vx_current_xid()); - s->s_root = d_alloc_root(inode); + s->s_root = d_make_root(inode); if (s->s_root) -@@ -495,6 +532,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 */ -+ inode->i_tag = (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-2.6.36.2/fs/ext2/balloc.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/ext2/balloc.c ---- linux-2.6.36.2/fs/ext2/balloc.c 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/ext2/balloc.c 2010-10-21 13:09:36.000000000 +0200 -@@ -702,7 +702,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); } @@ -2767,10 +2133,49 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ext2/balloc.c linux-2.6.36.2-vs2.3.0.36. BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb)); repeat: -diff -NurpP --minimal linux-2.6.36.2/fs/ext2/ext2.h linux-2.6.36.2-vs2.3.0.36.38.2/fs/ext2/ext2.h ---- linux-2.6.36.2/fs/ext2/ext2.h 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/ext2/ext2.h 2010-10-21 14:10:55.000000000 +0200 -@@ -127,6 +127,7 @@ extern void ext2_set_inode_flags(struct +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) */ + #define EXT2_TOPDIR_FL FS_TOPDIR_FL /* Top of directory hierarchies*/ ++#define EXT2_IXUNLINK_FL FS_IXUNLINK_FL /* Immutable invert on unlink */ + #define EXT2_RESERVED_FL FS_RESERVED_FL /* reserved for ext2 lib */ + ++#define EXT2_BARRIER_FL FS_BARRIER_FL /* Barrier for chroot() */ ++#define EXT2_COW_FL FS_COW_FL /* Copy on Write marker */ ++ + #define EXT2_FL_USER_VISIBLE FS_FL_USER_VISIBLE /* User visible flags */ + #define EXT2_FL_USER_MODIFIABLE FS_FL_USER_MODIFIABLE /* User modifiable flags */ + +@@ -329,7 +333,8 @@ struct ext2_inode { + __u16 i_pad1; + __le16 l_i_uid_high; /* these 2 fields */ + __le16 l_i_gid_high; /* were reserved2[0] */ +- __u32 l_i_reserved2; ++ __le16 l_i_tag; /* Context Tag */ ++ __u16 l_i_reserved2; + } linux2; + struct { + __u8 h_i_frag; /* Fragment number */ +@@ -357,6 +362,7 @@ struct ext2_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 ++#define i_raw_tag osd2.linux2.l_i_tag + #define i_reserved2 osd2.linux2.l_i_reserved2 + + /* +@@ -384,6 +390,7 @@ struct ext2_inode { + #define EXT2_MOUNT_USRQUOTA 0x020000 /* user quota */ + #define EXT2_MOUNT_GRPQUOTA 0x040000 /* group quota */ + #define EXT2_MOUNT_RESERVATION 0x080000 /* Preallocation */ ++#define EXT2_MOUNT_TAGGED (1<<24) /* Enable Context Tags */ + + + #define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt +@@ -757,6 +764,7 @@ extern void ext2_set_inode_flags(struct extern void ext2_get_inode_flags(struct ext2_inode_info *); extern int ext2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, u64 start, u64 len); @@ -2778,18 +2183,18 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ext2/ext2.h linux-2.6.36.2-vs2.3.0.36.38 /* ioctl.c */ extern long ext2_ioctl(struct file *, unsigned int, unsigned long); -diff -NurpP --minimal linux-2.6.36.2/fs/ext2/file.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/ext2/file.c ---- linux-2.6.36.2/fs/ext2/file.c 2010-08-02 16:52:48.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/ext2/file.c 2010-10-21 13:09:36.000000000 +0200 -@@ -104,4 +104,5 @@ const struct inode_operations ext2_file_ - .setattr = ext2_setattr, - .check_acl = ext2_check_acl, +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-2.6.36.2/fs/ext2/ialloc.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/ext2/ialloc.c ---- linux-2.6.36.2/fs/ext2/ialloc.c 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/ext2/ialloc.c 2010-10-21 13:09:36.000000000 +0200 +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 @@ -2798,26 +2203,26 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ext2/ialloc.c linux-2.6.36.2-vs2.3.0.36. #include "ext2.h" #include "xattr.h" #include "acl.h" -@@ -548,6 +549,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-2.6.36.2/fs/ext2/inode.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/ext2/inode.c ---- linux-2.6.36.2/fs/ext2/inode.c 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/ext2/inode.c 2010-10-21 13:09:36.000000000 +0200 +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 #include "ext2.h" #include "acl.h" #include "xip.h" -@@ -1169,7 +1170,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; @@ -2826,7 +2231,7 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ext2/inode.c linux-2.6.36.2-vs2.3.0.36.3 return; __ext2_truncate_blocks(inode, offset); } -@@ -1258,36 +1259,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; @@ -2895,71 +2300,55 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ext2/inode.c linux-2.6.36.2-vs2.3.0.36.3 } struct inode *ext2_iget (struct super_block *sb, unsigned long ino) -@@ -1297,6 +1323,8 @@ struct inode *ext2_iget (struct super_bl - struct ext2_inode *raw_inode; - struct inode *inode; - long ret = -EIO; -+ uid_t uid; -+ gid_t gid; - int n; - - inode = iget_locked(sb, ino); -@@ -1315,12 +1343,17 @@ 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; } - - inode->i_mode = le16_to_cpu(raw_inode->i_mode); -- inode->i_uid = (uid_t)le16_to_cpu(raw_inode->i_uid_low); -- inode->i_gid = (gid_t)le16_to_cpu(raw_inode->i_gid_low); -+ uid = (uid_t)le16_to_cpu(raw_inode->i_uid_low); -+ gid = (gid_t)le16_to_cpu(raw_inode->i_gid_low); - if (!(test_opt (inode->i_sb, NO_UID32))) { -- inode->i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16; -- inode->i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16; -+ uid |= le16_to_cpu(raw_inode->i_uid_high) << 16; -+ gid |= le16_to_cpu(raw_inode->i_gid_high) << 16; - } -+ 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)); -+ - inode->i_nlink = le16_to_cpu(raw_inode->i_links_count); +- i_uid_write(inode, i_uid); +- i_gid_write(inode, i_gid); ++ i_uid_write(inode, INOTAG_UID(DX_TAG(inode), i_uid, i_gid)); ++ i_gid_write(inode, INOTAG_GID(DX_TAG(inode), i_uid, i_gid)); ++ i_tag_write(inode, INOTAG_TAG(DX_TAG(inode), i_uid, i_gid, ++ le16_to_cpu(raw_inode->i_raw_tag))); + 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); -@@ -1418,8 +1451,8 @@ 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 = inode->i_uid; -- gid_t gid = inode->i_gid; -+ uid_t uid = TAGINO_UID(DX_TAG(inode), inode->i_uid, inode->i_tag); -+ gid_t gid = TAGINO_GID(DX_TAG(inode), inode->i_gid, inode->i_tag); +- uid_t uid = i_uid_read(inode); +- gid_t gid = i_gid_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; -@@ -1455,6 +1488,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; } +#ifdef CONFIG_TAGGING_INTERN -+ raw_inode->i_raw_tag = cpu_to_le16(inode->i_tag); ++ raw_inode->i_raw_tag = cpu_to_le16(i_tag_read(inode)); +#endif 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); -@@ -1544,7 +1580,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 && iattr->ia_uid != inode->i_uid) || -- (iattr->ia_valid & ATTR_GID && iattr->ia_gid != inode->i_gid)) { -+ (iattr->ia_valid & ATTR_GID && iattr->ia_gid != inode->i_gid) || -+ (iattr->ia_valid & ATTR_TAG && iattr->ia_tag != inode->i_tag)) { + if ((iattr->ia_valid & ATTR_UID && !uid_eq(iattr->ia_uid, inode->i_uid)) || +- (iattr->ia_valid & ATTR_GID && !gid_eq(iattr->ia_gid, inode->i_gid))) { ++ (iattr->ia_valid & ATTR_GID && !gid_eq(iattr->ia_gid, inode->i_gid)) || ++ (iattr->ia_valid & ATTR_TAG && !tag_eq(iattr->ia_tag, inode->i_tag))) { error = dquot_transfer(inode, iattr); if (error) return error; -diff -NurpP --minimal linux-2.6.36.2/fs/ext2/ioctl.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/ext2/ioctl.c ---- linux-2.6.36.2/fs/ext2/ioctl.c 2009-09-10 15:26:21.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/ext2/ioctl.c 2010-10-21 13:09:36.000000000 +0200 +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 @@ -2976,7 +2365,7 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ext2/ioctl.c linux-2.6.36.2-vs2.3.0.36.3 + 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); @@ -3008,10 +2397,10 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ext2/ioctl.c linux-2.6.36.2-vs2.3.0.36.3 + flags &= EXT2_FL_USER_MODIFIABLE; flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE; ei->i_flags = flags; - mutex_unlock(&inode->i_mutex); -diff -NurpP --minimal linux-2.6.36.2/fs/ext2/namei.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/ext2/namei.c ---- linux-2.6.36.2/fs/ext2/namei.c 2010-07-07 18:31:51.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/ext2/namei.c 2010-10-21 13:09:36.000000000 +0200 + +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 @@ -3020,26 +2409,26 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ext2/namei.c linux-2.6.36.2-vs2.3.0.36.3 #include "ext2.h" #include "xattr.h" #include "acl.h" -@@ -75,6 +76,7 @@ static struct dentry *ext2_lookup(struct - return ERR_PTR(-EIO); - } else { - return ERR_CAST(inode); -+ dx_propagate_tag(nd, inode); - } +@@ -73,6 +74,7 @@ static struct dentry *ext2_lookup(struct + (unsigned long) ino); + return ERR_PTR(-EIO); } ++ dx_propagate_tag(nd, inode); } -@@ -418,6 +420,7 @@ const struct inode_operations ext2_dir_i + return d_splice_alias(inode, dentry); + } +@@ -433,6 +435,7 @@ const struct inode_operations ext2_speci + .removexattr = generic_removexattr, #endif .setattr = ext2_setattr, - .check_acl = ext2_check_acl, + .sync_flags = ext2_sync_flags, + .get_acl = ext2_get_acl, + .set_acl = ext2_set_acl, }; - - const struct inode_operations ext2_special_inode_operations = { -diff -NurpP --minimal linux-2.6.36.2/fs/ext2/super.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/ext2/super.c ---- linux-2.6.36.2/fs/ext2/super.c 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/ext2/super.c 2010-10-21 13:09:36.000000000 +0200 -@@ -378,7 +378,8 @@ enum { +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, Opt_acl, Opt_noacl, Opt_xip, Opt_ignore, Opt_err, Opt_quota, @@ -3049,7 +2438,7 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ext2/super.c linux-2.6.36.2-vs2.3.0.36.3 }; static const match_table_t tokens = { -@@ -406,6 +407,9 @@ static const match_table_t tokens = { +@@ -423,6 +424,9 @@ static const match_table_t tokens = { {Opt_acl, "acl"}, {Opt_noacl, "noacl"}, {Opt_xip, "xip"}, @@ -3059,7 +2448,7 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ext2/super.c linux-2.6.36.2-vs2.3.0.36.3 {Opt_grpquota, "grpquota"}, {Opt_ignore, "noquota"}, {Opt_quota, "quota"}, -@@ -476,6 +480,20 @@ static int parse_options(char *options, +@@ -506,6 +510,20 @@ static int parse_options(char *options, case Opt_nouid32: set_opt (sbi->s_mount_opt, NO_UID32); break; @@ -3080,7 +2469,7 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ext2/super.c linux-2.6.36.2-vs2.3.0.36.3 case Opt_nocheck: clear_opt (sbi->s_mount_opt, CHECK); break; -@@ -833,6 +851,8 @@ static int ext2_fill_super(struct super_ +@@ -864,6 +882,8 @@ static int ext2_fill_super(struct super_ if (!parse_options((char *) data, sb)) goto failed_mount; @@ -3089,10 +2478,11 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ext2/super.c linux-2.6.36.2-vs2.3.0.36.3 sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | ((EXT2_SB(sb)->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0); -@@ -1205,6 +1225,14 @@ static int ext2_remount (struct super_bl +@@ -1270,6 +1290,14 @@ static int ext2_remount (struct super_bl + err = -EINVAL; goto restore_opts; } - ++ + if ((sbi->s_mount_opt & EXT2_MOUNT_TAGGED) && + !(sb->s_flags & MS_TAGGED)) { + printk("EXT2-fs: %s: tagging not permitted on remount.\n", @@ -3100,60 +2490,105 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ext2/super.c linux-2.6.36.2-vs2.3.0.36.3 + err = -EINVAL; + goto restore_opts; + } -+ + sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | ((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0); +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) */ + #define EXT3_TOPDIR_FL 0x00020000 /* Top of directory hierarchies*/ ++#define EXT3_IXUNLINK_FL 0x08000000 /* Immutable invert on unlink */ + #define EXT3_RESERVED_FL 0x80000000 /* reserved for ext3 lib */ -diff -NurpP --minimal linux-2.6.36.2/fs/ext3/file.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/ext3/file.c ---- linux-2.6.36.2/fs/ext3/file.c 2010-07-07 18:31:51.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/ext3/file.c 2010-10-21 13:09:36.000000000 +0200 -@@ -81,5 +81,6 @@ const struct inode_operations ext3_file_ - #endif - .check_acl = ext3_check_acl, - .fiemap = ext3_fiemap, -+ .sync_flags = ext3_sync_flags, - }; +-#define EXT3_FL_USER_VISIBLE 0x0003DFFF /* User visible flags */ +-#define EXT3_FL_USER_MODIFIABLE 0x000380FF /* User modifiable flags */ ++#define EXT3_BARRIER_FL 0x04000000 /* Barrier for chroot() */ ++#define EXT3_COW_FL 0x20000000 /* Copy on Write marker */ ++ ++#define EXT3_FL_USER_VISIBLE 0x0103DFFF /* User visible flags */ ++#define EXT3_FL_USER_MODIFIABLE 0x010380FF /* User modifiable flags */ -diff -NurpP --minimal linux-2.6.36.2/fs/ext3/ialloc.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/ext3/ialloc.c ---- linux-2.6.36.2/fs/ext3/ialloc.c 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/ext3/ialloc.c 2010-10-21 13:09:36.000000000 +0200 -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include + /* Flags that should be inherited by new inodes from their parent. */ + #define EXT3_FL_INHERITED (EXT3_SECRM_FL | EXT3_UNRM_FL | EXT3_COMPR_FL |\ +@@ -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] */ +- __u32 l_i_reserved2; ++ __le16 l_i_tag; /* Context Tag */ ++ __u16 l_i_reserved2; + } linux2; + struct { + __u8 h_i_frag; /* Fragment number */ +@@ -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 ++#define i_raw_tag osd2.linux2.l_i_tag + #define i_reserved2 osd2.linux2.l_i_reserved2 - #include + /* +@@ -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 */ ++#define EXT3_MOUNT_TAGGED (1<<24) /* Enable Context Tags */ + + /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */ + #ifndef _LINUX_EXT2_FS_H +@@ -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); ++extern int ext3_sync_flags(struct inode *, int, int); + + /* ioctl.c */ + extern long ext3_ioctl(struct file *, unsigned int, unsigned long); +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.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 + #include ++#include -@@ -531,6 +532,7 @@ got: + #include "ext3.h" + #include "xattr.h" +@@ -469,6 +470,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-2.6.36.2/fs/ext3/inode.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/ext3/inode.c ---- linux-2.6.36.2/fs/ext3/inode.c 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/ext3/inode.c 2010-10-21 13:09:36.000000000 +0200 -@@ -38,6 +38,7 @@ - #include - #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" - -@@ -2387,7 +2388,7 @@ static void ext3_free_branches(handle_t - - int ext3_can_truncate(struct inode *inode) - { -- if (IS_APPEND(inode) || IS_IMMUTABLE(inode)) -+ if (IS_APPEND(inode) || IS_IXORUNLINK(inode)) - return 0; - if (S_ISREG(inode->i_mode)) - return 1; -@@ -2772,36 +2773,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; @@ -3221,96 +2656,53 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ext3/inode.c linux-2.6.36.2-vs2.3.0.36.3 } struct inode *ext3_iget(struct super_block *sb, unsigned long ino) -@@ -2815,6 +2840,8 @@ struct inode *ext3_iget(struct super_blo - transaction_t *transaction; - long ret; - int block; -+ uid_t uid; -+ gid_t gid; - - inode = iget_locked(sb, ino); - if (!inode) -@@ -2831,12 +2858,17 @@ struct inode *ext3_iget(struct super_blo - bh = iloc.bh; - raw_inode = ext3_raw_inode(&iloc); - inode->i_mode = le16_to_cpu(raw_inode->i_mode); -- inode->i_uid = (uid_t)le16_to_cpu(raw_inode->i_uid_low); -- inode->i_gid = (gid_t)le16_to_cpu(raw_inode->i_gid_low); -+ uid = (uid_t)le16_to_cpu(raw_inode->i_uid_low); -+ gid = (gid_t)le16_to_cpu(raw_inode->i_gid_low); - if(!(test_opt (inode->i_sb, NO_UID32))) { -- inode->i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16; -- inode->i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16; -+ uid |= le16_to_cpu(raw_inode->i_uid_high) << 16; -+ gid |= le16_to_cpu(raw_inode->i_gid_high) << 16; +@@ -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; } -+ 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)); -+ - inode->i_nlink = le16_to_cpu(raw_inode->i_links_count); +- i_uid_write(inode, i_uid); +- i_gid_write(inode, i_gid); ++ i_uid_write(inode, INOTAG_UID(DX_TAG(inode), i_uid, i_gid)); ++ i_gid_write(inode, INOTAG_GID(DX_TAG(inode), i_uid, i_gid)); ++ i_tag_write(inode, INOTAG_TAG(DX_TAG(inode), i_uid, i_gid, ++ le16_to_cpu(raw_inode->i_raw_tag))); + 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); -@@ -2991,6 +3023,8 @@ static int ext3_do_update_inode(handle_t - struct ext3_inode *raw_inode = ext3_raw_inode(iloc); - struct ext3_inode_info *ei = EXT3_I(inode); - struct buffer_head *bh = iloc->bh; -+ uid_t uid = TAGINO_UID(DX_TAG(inode), inode->i_uid, inode->i_tag); -+ gid_t gid = TAGINO_GID(DX_TAG(inode), inode->i_gid, inode->i_tag); - int err = 0, rc, block; - - again: -@@ -3005,29 +3039,32 @@ 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 = 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(inode->i_uid)); -- raw_inode->i_gid_low = cpu_to_le16(low_16_bits(inode->i_gid)); -+ raw_inode->i_uid_low = cpu_to_le16(low_16_bits(uid)); -+ raw_inode->i_gid_low = cpu_to_le16(low_16_bits(gid)); - /* - * Fix up interoperability with old kernels. Otherwise, old inodes get - * re-used with the upper 16 bits of the uid/gid intact - */ - if(!ei->i_dtime) { - raw_inode->i_uid_high = -- cpu_to_le16(high_16_bits(inode->i_uid)); -+ cpu_to_le16(high_16_bits(uid)); - raw_inode->i_gid_high = -- cpu_to_le16(high_16_bits(inode->i_gid)); -+ cpu_to_le16(high_16_bits(gid)); - } else { - raw_inode->i_uid_high = 0; - raw_inode->i_gid_high = 0; - } - } else { - raw_inode->i_uid_low = -- cpu_to_le16(fs_high2lowuid(inode->i_uid)); -+ cpu_to_le16(fs_high2lowuid(uid)); - raw_inode->i_gid_low = -- cpu_to_le16(fs_high2lowgid(inode->i_gid)); -+ cpu_to_le16(fs_high2lowgid(gid)); + 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)); +@@ -3079,6 +3109,9 @@ again: raw_inode->i_uid_high = 0; raw_inode->i_gid_high = 0; } +#ifdef CONFIG_TAGGING_INTERN -+ raw_inode->i_raw_tag = cpu_to_le16(inode->i_tag); ++ raw_inode->i_raw_tag = cpu_to_le16(i_tag_read(inode)); +#endif raw_inode->i_links_count = cpu_to_le16(inode->i_nlink); - raw_inode->i_size = cpu_to_le32(ei->i_disksize); - raw_inode->i_atime = cpu_to_le32(inode->i_atime.tv_sec); -@@ -3187,7 +3224,8 @@ int ext3_setattr(struct dentry *dentry, + disksize = cpu_to_le32(ei->i_disksize); + if (disksize != raw_inode->i_size) { +@@ -3251,7 +3284,8 @@ int ext3_setattr(struct dentry *dentry, if (is_quota_modification(inode, attr)) dquot_initialize(inode); - if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) || -- (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid)) { -+ (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid) || -+ (ia_valid & ATTR_TAG && attr->ia_tag != inode->i_tag)) { + if ((ia_valid & ATTR_UID && !uid_eq(attr->ia_uid, inode->i_uid)) || +- (ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, inode->i_gid))) { ++ (ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, inode->i_gid)) || ++ (ia_valid & ATTR_TAG && !tag_eq(attr->ia_tag, inode->i_tag))) { handle_t *handle; /* (user+group)*(old+new) structure, inode write (sb, -@@ -3209,6 +3247,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; @@ -3319,20 +2711,12 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ext3/inode.c linux-2.6.36.2-vs2.3.0.36.3 error = ext3_mark_inode_dirty(handle, inode); ext3_journal_stop(handle); } -diff -NurpP --minimal linux-2.6.36.2/fs/ext3/ioctl.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/ext3/ioctl.c ---- linux-2.6.36.2/fs/ext3/ioctl.c 2009-06-11 17:13:03.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/ext3/ioctl.c 2010-10-21 13:09:36.000000000 +0200 -@@ -8,6 +8,7 @@ - */ - - #include -+#include - #include - #include - #include -@@ -17,6 +18,34 @@ - #include +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" + +int ext3_sync_flags(struct inode *inode, int flags, int vflags) @@ -3364,8 +2748,8 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ext3/ioctl.c linux-2.6.36.2-vs2.3.0.36.3 + long ext3_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { - struct inode *inode = filp->f_dentry->d_inode; -@@ -50,6 +79,11 @@ long ext3_ioctl(struct file *filp, unsig + 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); @@ -3377,7 +2761,7 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ext3/ioctl.c linux-2.6.36.2-vs2.3.0.36.3 mutex_lock(&inode->i_mutex); /* Is it quota file? Do not allow user to mess with it */ -@@ -68,7 +102,9 @@ long ext3_ioctl(struct file *filp, unsig +@@ -63,7 +96,9 @@ long ext3_ioctl(struct file *filp, unsig * * This test looks nicer. Thanks to Pauline Middelink */ @@ -3388,7 +2772,7 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ext3/ioctl.c linux-2.6.36.2-vs2.3.0.36.3 if (!capable(CAP_LINUX_IMMUTABLE)) goto flags_out; } -@@ -93,7 +129,7 @@ long ext3_ioctl(struct file *filp, unsig +@@ -88,7 +123,7 @@ long ext3_ioctl(struct file *filp, unsig if (err) goto flags_err; @@ -3397,37 +2781,38 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ext3/ioctl.c linux-2.6.36.2-vs2.3.0.36.3 flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE; ei->i_flags = flags; -diff -NurpP --minimal linux-2.6.36.2/fs/ext3/namei.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/ext3/namei.c ---- linux-2.6.36.2/fs/ext3/namei.c 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/ext3/namei.c 2010-10-21 13:09:36.000000000 +0200 -@@ -36,6 +36,7 @@ +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 @@ + */ + #include - #include - #include +#include - ++ + #include "ext3.h" #include "namei.h" #include "xattr.h" -@@ -912,6 +913,7 @@ restart: - if (bh) - ll_rw_block(READ_META, 1, &bh); - } +@@ -915,6 +917,7 @@ restart: + submit_bh(READ | REQ_META | REQ_PRIO, + bh); + } + dx_propagate_tag(nd, inode); + } } if ((bh = bh_use[ra_ptr++]) == NULL) - goto next; -@@ -2465,6 +2467,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 - .check_acl = ext3_check_acl, + .sync_flags = ext3_sync_flags, + .get_acl = ext3_get_acl, + .set_acl = ext3_set_acl, }; - - const struct inode_operations ext3_special_inode_operations = { -diff -NurpP --minimal linux-2.6.36.2/fs/ext3/super.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/ext3/super.c ---- linux-2.6.36.2/fs/ext3/super.c 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/ext3/super.c 2010-10-21 13:09:36.000000000 +0200 -@@ -802,7 +802,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, @@ -3437,7 +2822,7 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ext3/super.c linux-2.6.36.2-vs2.3.0.36.3 }; static const match_table_t tokens = { -@@ -859,6 +860,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"}, @@ -3447,7 +2832,7 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ext3/super.c linux-2.6.36.2-vs2.3.0.36.3 {Opt_err, NULL}, }; -@@ -1011,6 +1015,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; @@ -3468,7 +2853,7 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ext3/super.c linux-2.6.36.2-vs2.3.0.36.3 case Opt_nocheck: clear_opt (sbi->s_mount_opt, CHECK); break; -@@ -1699,6 +1717,9 @@ static int ext3_fill_super (struct super +@@ -1781,6 +1799,9 @@ static int ext3_fill_super (struct super NULL, 0)) goto failed_mount; @@ -3478,7 +2863,7 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ext3/super.c linux-2.6.36.2-vs2.3.0.36.3 sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); -@@ -2564,6 +2585,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"); @@ -3493,69 +2878,66 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ext3/super.c linux-2.6.36.2-vs2.3.0.36.3 sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); -diff -NurpP --minimal linux-2.6.36.2/fs/ext4/ext4.h linux-2.6.36.2-vs2.3.0.36.38.2/fs/ext4/ext4.h ---- linux-2.6.36.2/fs/ext4/ext4.h 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/ext4/ext4.h 2010-10-21 13:09:36.000000000 +0200 -@@ -323,8 +323,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 */ - -@@ -593,7 +597,8 @@ struct ext4_inode { - __le16 l_i_file_acl_high; +@@ -671,7 +674,7 @@ struct ext4_inode { __le16 l_i_uid_high; /* these 2 fields */ __le16 l_i_gid_high; /* were reserved2[0] */ -- __u32 l_i_reserved2; + __le16 l_i_checksum_lo;/* crc32c(uuid+inum+inode) LE */ +- __le16 l_i_reserved; + __le16 l_i_tag; /* Context Tag */ -+ __u16 l_i_reserved2; } linux2; struct { __le16 h_i_reserved1; /* Obsoleted fragment number/size which are removed in ext4 */ -@@ -707,6 +712,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 +#define i_raw_tag osd2.linux2.l_i_tag - #define i_reserved2 osd2.linux2.l_i_reserved2 + #define i_checksum_lo osd2.linux2.l_i_checksum_lo #elif defined(__GNU__) -@@ -885,6 +891,7 @@ struct ext4_inode_info { - #define EXT4_MOUNT_JOURNAL_CHECKSUM 0x800000 /* Journal checksums */ - #define EXT4_MOUNT_JOURNAL_ASYNC_COMMIT 0x1000000 /* Journal Async Commit */ - #define EXT4_MOUNT_I_VERSION 0x2000000 /* i_version support */ -+#define EXT4_MOUNT_TAGGED 0x4000000 /* Enable Context Tags */ - #define EXT4_MOUNT_DELALLOC 0x8000000 /* Delalloc support */ - #define EXT4_MOUNT_DATA_ERR_ABORT 0x10000000 /* Abort on file data write */ - #define EXT4_MOUNT_BLOCK_VALIDITY 0x20000000 /* Block validity checking */ -@@ -1997,6 +2004,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); +@@ -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 */ ++#define EXT4_MOUNT_TAGGED 0x40000 /* Enable Context Tags */ + #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 */ +@@ -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-2.6.36.2/fs/ext4/file.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/ext4/file.c ---- linux-2.6.36.2/fs/ext4/file.c 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/ext4/file.c 2010-10-21 13:09:36.000000000 +0200 -@@ -161,5 +161,6 @@ const struct inode_operations ext4_file_ - .check_acl = ext4_check_acl, - .fallocate = ext4_fallocate, + 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-2.6.36.2/fs/ext4/ialloc.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/ext4/ialloc.c ---- linux-2.6.36.2/fs/ext4/ialloc.c 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/ext4/ialloc.c 2010-10-21 13:09:36.000000000 +0200 +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 @@ -3564,64 +2946,57 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ext4/ialloc.c linux-2.6.36.2-vs2.3.0.36. #include #include "ext4.h" -@@ -976,6 +977,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-2.6.36.2/fs/ext4/inode.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/ext4/inode.c ---- linux-2.6.36.2/fs/ext4/inode.c 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/ext4/inode.c 2010-10-21 13:09:36.000000000 +0200 -@@ -40,6 +40,7 @@ - #include - #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" -@@ -4596,7 +4597,7 @@ static void ext4_free_branches(handle_t - - int ext4_can_truncate(struct inode *inode) - { -- if (IS_APPEND(inode) || IS_IMMUTABLE(inode)) -+ if (IS_APPEND(inode) || IS_IXORUNLINK(inode)) - return 0; - if (S_ISREG(inode->i_mode)) - return 1; -@@ -4947,41 +4948,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 */ @@ -3664,95 +3039,53 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ext4/inode.c linux-2.6.36.2-vs2.3.0.36.3 } while (cmpxchg(&ei->i_flags, old_fl, new_fl) != old_fl); } -@@ -5017,6 +5041,8 @@ struct inode *ext4_iget(struct super_blo - journal_t *journal = EXT4_SB(sb)->s_journal; - long ret; - int block; -+ uid_t uid; -+ gid_t gid; - - inode = iget_locked(sb, ino); - if (!inode) -@@ -5032,12 +5058,16 @@ struct inode *ext4_iget(struct super_blo - goto bad_inode; - raw_inode = ext4_raw_inode(&iloc); - inode->i_mode = le16_to_cpu(raw_inode->i_mode); -- inode->i_uid = (uid_t)le16_to_cpu(raw_inode->i_uid_low); -- inode->i_gid = (gid_t)le16_to_cpu(raw_inode->i_gid_low); -+ uid = (uid_t)le16_to_cpu(raw_inode->i_uid_low); -+ gid = (gid_t)le16_to_cpu(raw_inode->i_gid_low); - if (!(test_opt(inode->i_sb, NO_UID32))) { -- inode->i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16; -- inode->i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16; -+ uid |= le16_to_cpu(raw_inode->i_uid_high) << 16; -+ gid |= le16_to_cpu(raw_inode->i_gid_high) << 16; +@@ -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; } -+ 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)); - inode->i_nlink = le16_to_cpu(raw_inode->i_links_count); - - ei->i_state_flags = 0; -@@ -5256,6 +5286,8 @@ static int ext4_do_update_inode(handle_t - struct ext4_inode *raw_inode = ext4_raw_inode(iloc); - struct ext4_inode_info *ei = EXT4_I(inode); - struct buffer_head *bh = iloc->bh; -+ uid_t uid = TAGINO_UID(DX_TAG(inode), inode->i_uid, inode->i_tag); -+ gid_t gid = TAGINO_GID(DX_TAG(inode), inode->i_gid, inode->i_tag); - int err = 0, rc, block; - - /* For fields not not tracking in the in-memory inode, -@@ -5266,29 +5298,32 @@ static int ext4_do_update_inode(handle_t +- i_uid_write(inode, i_uid); +- i_gid_write(inode, i_gid); ++ i_uid_write(inode, INOTAG_UID(DX_TAG(inode), i_uid, i_gid)); ++ i_gid_write(inode, INOTAG_GID(DX_TAG(inode), i_uid, i_gid)); ++ i_tag_write(inode, INOTAG_TAG(DX_TAG(inode), i_uid, i_gid, ++ le16_to_cpu(raw_inode->i_raw_tag))); + set_nlink(inode, le16_to_cpu(raw_inode->i_links_count)); + + ext4_clear_state_flags(ei); /* Only relevant on 32-bit archs */ +@@ -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 = 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(inode->i_uid)); -- raw_inode->i_gid_low = cpu_to_le16(low_16_bits(inode->i_gid)); -+ raw_inode->i_uid_low = cpu_to_le16(low_16_bits(uid)); -+ raw_inode->i_gid_low = cpu_to_le16(low_16_bits(gid)); - /* - * Fix up interoperability with old kernels. Otherwise, old inodes get - * re-used with the upper 16 bits of the uid/gid intact - */ - if (!ei->i_dtime) { - raw_inode->i_uid_high = -- cpu_to_le16(high_16_bits(inode->i_uid)); -+ cpu_to_le16(high_16_bits(uid)); - raw_inode->i_gid_high = -- cpu_to_le16(high_16_bits(inode->i_gid)); -+ cpu_to_le16(high_16_bits(gid)); - } else { - raw_inode->i_uid_high = 0; - raw_inode->i_gid_high = 0; - } - } else { - raw_inode->i_uid_low = -- cpu_to_le16(fs_high2lowuid(inode->i_uid)); -+ cpu_to_le16(fs_high2lowuid(uid)); - raw_inode->i_gid_low = -- cpu_to_le16(fs_high2lowgid(inode->i_gid)); -+ cpu_to_le16(fs_high2lowgid(gid)); + 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)); +@@ -4215,6 +4244,9 @@ static int ext4_do_update_inode(handle_t raw_inode->i_uid_high = 0; raw_inode->i_gid_high = 0; } +#ifdef CONFIG_TAGGING_INTERN -+ raw_inode->i_raw_tag = cpu_to_le16(inode->i_tag); ++ raw_inode->i_raw_tag = cpu_to_le16(i_tag_read(inode)); +#endif raw_inode->i_links_count = cpu_to_le16(inode->i_nlink); EXT4_INODE_SET_XTIME(i_ctime, inode, raw_inode); -@@ -5473,7 +5508,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 && attr->ia_uid != inode->i_uid) || -- (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid)) { -+ (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid) || -+ (ia_valid & ATTR_TAG && attr->ia_tag != inode->i_tag)) { + if ((ia_valid & ATTR_UID && !uid_eq(attr->ia_uid, inode->i_uid)) || +- (ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, inode->i_gid))) { ++ (ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, inode->i_gid)) || ++ (ia_valid & ATTR_TAG && !tag_eq(attr->ia_tag, inode->i_tag))) { handle_t *handle; /* (user+group)*(old+new) structure, inode write (sb, -@@ -5495,6 +5531,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; @@ -3761,10 +3094,10 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ext4/inode.c linux-2.6.36.2-vs2.3.0.36.3 error = ext4_mark_inode_dirty(handle, inode); ext4_journal_stop(handle); } -diff -NurpP --minimal linux-2.6.36.2/fs/ext4/ioctl.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/ext4/ioctl.c ---- linux-2.6.36.2/fs/ext4/ioctl.c 2010-08-02 16:52:48.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/ext4/ioctl.c 2010-10-21 13:09:36.000000000 +0200 -@@ -14,10 +14,39 @@ +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 @@ -3772,15 +3105,17 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ext4/ioctl.c linux-2.6.36.2-vs2.3.0.36.3 #include #include "ext4_jbd2.h" #include "ext4.h" +@@ -198,6 +199,33 @@ journal_err_out: + return err; + } -+ +int ext4_sync_flags(struct inode *inode, int flags, int vflags) +{ + handle_t *handle = NULL; + 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); + @@ -3803,8 +3138,8 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ext4/ioctl.c linux-2.6.36.2-vs2.3.0.36.3 + long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { - struct inode *inode = filp->f_dentry->d_inode; -@@ -50,6 +79,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); @@ -3816,7 +3151,7 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ext4/ioctl.c linux-2.6.36.2-vs2.3.0.36.3 err = -EPERM; mutex_lock(&inode->i_mutex); /* Is it quota file? Do not allow user to mess with it */ -@@ -67,7 +101,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 */ @@ -3827,9 +3162,9 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ext4/ioctl.c linux-2.6.36.2-vs2.3.0.36.3 if (!capable(CAP_LINUX_IMMUTABLE)) goto flags_out; } -diff -NurpP --minimal linux-2.6.36.2/fs/ext4/namei.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/ext4/namei.c ---- linux-2.6.36.2/fs/ext4/namei.c 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/ext4/namei.c 2010-10-21 13:09:36.000000000 +0200 +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 @@ -3838,67 +3173,68 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ext4/namei.c linux-2.6.36.2-vs2.3.0.36.3 #include "ext4.h" #include "ext4_jbd2.h" -@@ -912,6 +913,7 @@ restart: - if (bh) - ll_rw_block(READ_META, 1, &bh); +@@ -1279,6 +1280,7 @@ restart: + ll_rw_block(READ | REQ_META | REQ_PRIO, + 1, &bh); } + dx_propagate_tag(nd, inode); } if ((bh = bh_use[ra_ptr++]) == NULL) goto next; -@@ -2522,6 +2524,7 @@ const struct inode_operations ext4_dir_i - #endif - .check_acl = ext4_check_acl, +@@ -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-2.6.36.2/fs/ext4/super.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/ext4/super.c ---- linux-2.6.36.2/fs/ext4/super.c 2010-12-13 22:08:58.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/ext4/super.c 2010-12-13 22:09:27.000000000 +0100 -@@ -1220,6 +1220,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_tag, Opt_notag, Opt_tagid + Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable, +- Opt_max_dir_size_kb, ++ Opt_max_dir_size_kb, Opt_tag, Opt_notag, Opt_tagid }; static const match_table_t tokens = { -@@ -1290,6 +1291,9 @@ static const match_table_t tokens = { - {Opt_dioread_lock, "dioread_lock"}, - {Opt_discard, "discard"}, - {Opt_nodiscard, "nodiscard"}, +@@ -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 */ + {Opt_tag, "tag"}, + {Opt_notag, "notag"}, + {Opt_tagid, "tagid=%u"}, {Opt_err, NULL}, }; -@@ -1458,6 +1462,20 @@ static int parse_options(char *options, - case Opt_nouid32: - set_opt(sbi->s_mount_opt, NO_UID32); - break; +@@ -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: -+ set_opt (sbi->s_mount_opt, TAGGED); -+ break; -+ case Opt_notag: -+ clear_opt (sbi->s_mount_opt, TAGGED); -+ break; ++ case Opt_tag: ++ set_opt(sb, TAGGED); ++ return 1; ++ case Opt_notag: ++ clear_opt(sb, TAGGED); ++ return 1; +#endif +#ifdef CONFIG_PROPAGATE -+ case Opt_tagid: -+ /* use args[0] */ -+ set_opt (sbi->s_mount_opt, TAGGED); -+ break; ++ case Opt_tagid: ++ /* use args[0] */ ++ set_opt(sb, TAGGED); ++ return 1; +#endif - case Opt_debug: - set_opt(sbi->s_mount_opt, DEBUG); - break; -@@ -2692,6 +2710,9 @@ static int ext4_fill_super(struct super_ - &journal_ioprio, NULL, 0)) - goto failed_mount; + } + + 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) + sb->s_flags |= MS_TAGGED; @@ -3906,7 +3242,7 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ext4/super.c linux-2.6.36.2-vs2.3.0.36.3 sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); -@@ -3754,6 +3775,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"); @@ -3921,47 +3257,38 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ext4/super.c linux-2.6.36.2-vs2.3.0.36.3 sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); -diff -NurpP --minimal linux-2.6.36.2/fs/fcntl.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/fcntl.c ---- linux-2.6.36.2/fs/fcntl.c 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/fcntl.c 2010-10-21 13:09:36.000000000 +0200 -@@ -20,6 +20,7 @@ - #include - #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 -@@ -103,6 +104,8 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldf - - if (tofree) - filp_close(tofree, files); -+ else -+ vx_openfd_inc(newfd); /* fd was unused */ - - return newfd; +@@ -385,6 +386,8 @@ SYSCALL_DEFINE3(fcntl64, unsigned int, f -@@ -434,6 +437,8 @@ SYSCALL_DEFINE3(fcntl, unsigned int, fd, - filp = fget(fd); - if (!filp) + if (!f.file) goto out; + if (!vx_files_avail(1)) + goto out; - err = security_file_fcntl(filp, cmd, arg); - if (err) { -diff -NurpP --minimal linux-2.6.36.2/fs/file.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/file.c ---- linux-2.6.36.2/fs/file.c 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/file.c 2010-10-21 13:09:36.000000000 +0200 -@@ -20,6 +20,7 @@ + if (unlikely(f.file->f_mode & FMODE_PATH)) { + if (!check_fcntl_cmd(cmd)) +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; -@@ -355,6 +356,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); @@ -3970,28 +3297,57 @@ diff -NurpP --minimal linux-2.6.36.2/fs/file.c linux-2.6.36.2-vs2.3.0.36.38.2/fs } else { /* * The fd may be claimed in the fd bitmap but not yet -@@ -462,6 +465,7 @@ repeat: +@@ -369,9 +372,11 @@ static struct fdtable *close_files(struc + filp_close(file, files); + cond_resched_rcu_qs(); + } ++ vx_openfd_dec(i); + } + i++; + set >>= 1; ++ cond_resched(); + } + } + +@@ -487,6 +492,7 @@ repeat: else - FD_CLR(fd, fdt->close_on_exec); + __clear_close_on_exec(fd, fdt); error = fd; + vx_openfd_inc(fd); #if 1 /* Sanity check */ - if (rcu_dereference_raw(fdt->fd[fd]) != NULL) { -diff -NurpP --minimal linux-2.6.36.2/fs/file_table.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/file_table.c ---- linux-2.6.36.2/fs/file_table.c 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/file_table.c 2010-10-21 14:10:28.000000000 +0200 -@@ -24,6 +24,8 @@ - #include - #include + 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; ++ vx_openfd_dec(fd); + } + + void put_unused_fd(unsigned int fd) +@@ -784,6 +791,8 @@ __releases(&files->file_lock) + + if (tofree) + filp_close(tofree, files); ++ else ++ vx_openfd_inc(fd); /* fd was unused */ + + return fd; + +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 #include +#include +#include - #include + #include -@@ -135,6 +137,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(); @@ -3999,36 +3355,36 @@ diff -NurpP --minimal linux-2.6.36.2/fs/file_table.c linux-2.6.36.2-vs2.3.0.36.3 return f; over: -@@ -251,6 +255,8 @@ static void __fput(struct file *file) - cdev_put(inode->i_cdev); - fops_put(file->f_op); - put_pid(file->f_owner.pid); +@@ -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_sb_list_del(file); - if (file->f_mode & FMODE_WRITE) - drop_file_write_access(file); -@@ -334,6 +340,8 @@ void put_filp(struct file *file) + file->f_path.dentry = NULL; + file->f_path.mnt = NULL; + 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-2.6.36.2/fs/fs_struct.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/fs_struct.c ---- linux-2.6.36.2/fs/fs_struct.c 2010-10-21 13:07:48.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/fs_struct.c 2010-10-21 13:56:13.000000000 +0200 + } +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 #include +#include + #include "internal.h" /* - * Replace the fs->{rootmnt,root} with {mnt,dentry}. Put the old values. -@@ -77,6 +78,7 @@ void free_fs_struct(struct fs_struct *fs +@@ -87,6 +88,7 @@ void free_fs_struct(struct fs_struct *fs { path_put(&fs->root); path_put(&fs->pwd); @@ -4036,30 +3392,30 @@ diff -NurpP --minimal linux-2.6.36.2/fs/fs_struct.c linux-2.6.36.2-vs2.3.0.36.38 kmem_cache_free(fs_cachep, fs); } -@@ -107,6 +109,7 @@ struct fs_struct *copy_fs_struct(struct - spin_lock_init(&fs->lock); - fs->umask = old->umask; - get_fs_root_and_pwd(old, &fs->root, &fs->pwd); +@@ -124,6 +126,7 @@ struct fs_struct *copy_fs_struct(struct + fs->pwd = old->pwd; + path_get(&fs->pwd); + spin_unlock(&old->lock); + atomic_inc(&vs_global_fs); } return fs; } -diff -NurpP --minimal linux-2.6.36.2/fs/gfs2/file.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/gfs2/file.c ---- linux-2.6.36.2/fs/gfs2/file.c 2010-10-21 13:07:49.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/gfs2/file.c 2010-10-21 13:09:36.000000000 +0200 -@@ -132,6 +132,9 @@ static const u32 fsflags_to_gfs2[32] = { - [7] = GFS2_DIF_NOATIME, +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, + [27] = GFS2_DIF_IXUNLINK, + [26] = GFS2_DIF_BARRIER, + [29] = GFS2_DIF_COW, }; static const u32 gfs2_to_fsflags[32] = { -@@ -141,6 +144,9 @@ static const u32 gfs2_to_fsflags[32] = { - [gfs2fl_NoAtime] = FS_NOATIME_FL, +@@ -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, + [gfs2fl_IXUnlink] = FS_IXUNLINK_FL, + [gfs2fl_Barrier] = FS_BARRIER_FL, @@ -4067,16 +3423,18 @@ diff -NurpP --minimal linux-2.6.36.2/fs/gfs2/file.c linux-2.6.36.2-vs2.3.0.36.38 }; static int gfs2_get_flags(struct file *filp, u32 __user *ptr) -@@ -171,10 +177,16 @@ 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; + unsigned int vflags = inode->i_vflags; + + flags &= ~(S_IMMUTABLE | S_IXUNLINK | -+ S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC); ++ S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC | S_NOSEC); -- flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC); +- flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC|S_NOSEC); + if ((ip->i_eattr == 0) && !is_sxid(inode->i_mode)) + inode->i_flags |= S_NOSEC; if (ip->i_diskflags & GFS2_DIF_IMMUTABLE) flags |= S_IMMUTABLE; + if (ip->i_diskflags & GFS2_DIF_IXUNLINK) @@ -4085,7 +3443,7 @@ diff -NurpP --minimal linux-2.6.36.2/fs/gfs2/file.c linux-2.6.36.2-vs2.3.0.36.38 if (ip->i_diskflags & GFS2_DIF_APPENDONLY) flags |= S_APPEND; if (ip->i_diskflags & GFS2_DIF_NOATIME) -@@ -182,6 +194,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; @@ -4129,7 +3487,7 @@ diff -NurpP --minimal linux-2.6.36.2/fs/gfs2/file.c linux-2.6.36.2-vs2.3.0.36.38 } /* Flags that can be set by user space */ -@@ -293,6 +342,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); } @@ -4150,7 +3508,7 @@ diff -NurpP --minimal linux-2.6.36.2/fs/gfs2/file.c linux-2.6.36.2-vs2.3.0.36.38 + 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); @@ -4167,10 +3525,10 @@ diff -NurpP --minimal linux-2.6.36.2/fs/gfs2/file.c linux-2.6.36.2-vs2.3.0.36.38 static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { switch(cmd) { -diff -NurpP --minimal linux-2.6.36.2/fs/gfs2/inode.h linux-2.6.36.2-vs2.3.0.36.38.2/fs/gfs2/inode.h ---- linux-2.6.36.2/fs/gfs2/inode.h 2010-08-02 16:52:49.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/gfs2/inode.h 2010-10-21 13:09:36.000000000 +0200 -@@ -109,6 +109,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); @@ -4178,57 +3536,45 @@ diff -NurpP --minimal linux-2.6.36.2/fs/gfs2/inode.h linux-2.6.36.2-vs2.3.0.36.3 #ifdef CONFIG_GFS2_FS_LOCKING_DLM extern const struct file_operations gfs2_file_fops; -diff -NurpP --minimal linux-2.6.36.2/fs/gfs2/ops_inode.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/gfs2/ops_inode.c ---- linux-2.6.36.2/fs/gfs2/ops_inode.c 2010-10-21 13:07:49.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/gfs2/ops_inode.c 2010-10-21 13:09:36.000000000 +0200 -@@ -1352,6 +1352,7 @@ const struct inode_operations gfs2_file_ - .listxattr = gfs2_listxattr, - .removexattr = gfs2_removexattr, - .fiemap = gfs2_fiemap, -+ .sync_flags = gfs2_sync_flags, - }; - - const struct inode_operations gfs2_dir_iops = { -@@ -1372,6 +1373,7 @@ const struct inode_operations gfs2_dir_i - .listxattr = gfs2_listxattr, - .removexattr = gfs2_removexattr, - .fiemap = gfs2_fiemap, -+ .sync_flags = gfs2_sync_flags, - }; - - const struct inode_operations gfs2_symlink_iops = { -diff -NurpP --minimal linux-2.6.36.2/fs/hfsplus/ioctl.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/hfsplus/ioctl.c ---- linux-2.6.36.2/fs/hfsplus/ioctl.c 2010-08-02 16:52:49.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/hfsplus/ioctl.c 2010-10-21 13:09:36.000000000 +0200 +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; ++ vtag_t ia_tag; + loff_t ia_size; + struct timespec ia_atime; + struct timespec ia_mtime; +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 - #include - #include -+// #include - #include - #include "hfsplus_fs.h" - -diff -NurpP --minimal linux-2.6.36.2/fs/inode.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/inode.c ---- linux-2.6.36.2/fs/inode.c 2010-10-21 13:07:49.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/inode.c 2010-10-21 13:09:36.000000000 +0200 -@@ -24,6 +24,7 @@ - #include - #include - #include + #include /* for inode_has_buffers */ + #include + #include +#include + #include "internal.h" /* - * This is needed for the following functions: -@@ -130,6 +131,9 @@ 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; + + /* essential because of inode slab reuse */ -+ inode->i_tag = 0; inode->i_blkbits = sb->s_blocksize_bits; inode->i_flags = 0; atomic_set(&inode->i_count, 1); +@@ -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); ++ i_tag_write(inode, 0); + atomic_set(&inode->i_writecount, 0); + inode->i_size = 0; + inode->i_blocks = 0; @@ -150,6 +154,7 @@ int inode_init_always(struct super_block inode->i_bdev = NULL; inode->i_cdev = NULL; @@ -4237,16 +3583,16 @@ diff -NurpP --minimal linux-2.6.36.2/fs/inode.c linux-2.6.36.2-vs2.3.0.36.38.2/f inode->dirtied_when = 0; if (security_inode_alloc(inode)) -@@ -393,6 +398,8 @@ static int invalidate_list(struct list_h - return busy; +@@ -478,6 +483,8 @@ void __insert_inode_hash(struct inode *i } + EXPORT_SYMBOL(__insert_inode_hash); +EXPORT_SYMBOL_GPL(__iget); + /** - * invalidate_inodes - discard the inodes on a device - * @sb: superblock -@@ -1528,9 +1535,11 @@ void init_special_inode(struct inode *in + * __remove_inode_hash - remove an inode from the hash + * @inode: inode to unhash +@@ -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; @@ -4256,19 +3602,20 @@ diff -NurpP --minimal linux-2.6.36.2/fs/inode.c linux-2.6.36.2-vs2.3.0.36.38.2/f 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)) -@@ -1559,5 +1568,6 @@ 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-2.6.36.2/fs/ioctl.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/ioctl.c ---- linux-2.6.36.2/fs/ioctl.c 2010-10-21 13:07:49.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/ioctl.c 2010-10-21 13:09:36.000000000 +0200 -@@ -16,6 +16,9 @@ + +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 #include @@ -4278,68 +3625,39 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ioctl.c linux-2.6.36.2-vs2.3.0.36.38.2/f #include -diff -NurpP --minimal linux-2.6.36.2/fs/ioprio.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/ioprio.c ---- linux-2.6.36.2/fs/ioprio.c 2010-07-07 18:31:52.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/ioprio.c 2010-10-21 13:09:36.000000000 +0200 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - - int set_task_ioprio(struct task_struct *task, int ioprio) - { -@@ -124,6 +125,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; -@@ -213,6 +216,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-2.6.36.2/fs/jfs/file.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/jfs/file.c ---- linux-2.6.36.2/fs/jfs/file.c 2010-10-21 13:07:50.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/jfs/file.c 2010-10-21 13:09:36.000000000 +0200 -@@ -102,7 +102,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 && iattr->ia_uid != inode->i_uid) || -- (iattr->ia_valid & ATTR_GID && iattr->ia_gid != inode->i_gid)) { -+ (iattr->ia_valid & ATTR_GID && iattr->ia_gid != inode->i_gid) || -+ (iattr->ia_valid & ATTR_TAG && iattr->ia_tag != inode->i_tag)) { + if ((iattr->ia_valid & ATTR_UID && !uid_eq(iattr->ia_uid, inode->i_uid)) || +- (iattr->ia_valid & ATTR_GID && !gid_eq(iattr->ia_gid, inode->i_gid))) { ++ (iattr->ia_valid & ATTR_GID && !gid_eq(iattr->ia_gid, inode->i_gid)) || ++ (iattr->ia_valid & ATTR_TAG && !tag_eq(iattr->ia_tag, inode->i_tag))) { rc = dquot_transfer(inode, iattr); if (rc) return rc; -@@ -133,6 +134,7 @@ const struct inode_operations jfs_file_i - #ifdef CONFIG_JFS_POSIX_ACL - .check_acl = jfs_check_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-2.6.36.2/fs/jfs/ioctl.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/jfs/ioctl.c ---- linux-2.6.36.2/fs/jfs/ioctl.c 2008-12-25 00:26:37.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/jfs/ioctl.c 2010-10-21 13:09:36.000000000 +0200 -@@ -11,6 +11,7 @@ - #include +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 + #include +#include #include #include -@@ -52,6 +53,16 @@ static long jfs_map_ext2(unsigned long f +@@ -56,6 +57,16 @@ static long jfs_map_ext2(unsigned long f } @@ -4355,8 +3673,8 @@ diff -NurpP --minimal linux-2.6.36.2/fs/jfs/ioctl.c linux-2.6.36.2-vs2.3.0.36.38 + long jfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { - struct inode *inode = filp->f_dentry->d_inode; -@@ -85,6 +96,11 @@ long jfs_ioctl(struct file *filp, unsign + 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; @@ -4368,7 +3686,7 @@ diff -NurpP --minimal linux-2.6.36.2/fs/jfs/ioctl.c linux-2.6.36.2-vs2.3.0.36.38 /* Is it quota file? Do not allow user to mess with it */ if (IS_NOQUOTA(inode)) { err = -EPERM; -@@ -102,8 +118,8 @@ long jfs_ioctl(struct file *filp, unsign +@@ -106,8 +122,8 @@ long jfs_ioctl(struct file *filp, unsign * the relevant capability. */ if ((oldflags & JFS_IMMUTABLE_FL) || @@ -4379,7 +3697,7 @@ diff -NurpP --minimal linux-2.6.36.2/fs/jfs/ioctl.c linux-2.6.36.2-vs2.3.0.36.38 if (!capable(CAP_LINUX_IMMUTABLE)) { mutex_unlock(&inode->i_mutex); err = -EPERM; -@@ -111,7 +127,7 @@ long jfs_ioctl(struct file *filp, unsign +@@ -115,7 +131,7 @@ long jfs_ioctl(struct file *filp, unsign } } @@ -4388,9 +3706,9 @@ diff -NurpP --minimal linux-2.6.36.2/fs/jfs/ioctl.c linux-2.6.36.2-vs2.3.0.36.38 flags |= oldflags & ~JFS_FL_USER_MODIFIABLE; jfs_inode->mode2 = flags; -diff -NurpP --minimal linux-2.6.36.2/fs/jfs/jfs_dinode.h linux-2.6.36.2-vs2.3.0.36.38.2/fs/jfs/jfs_dinode.h ---- linux-2.6.36.2/fs/jfs/jfs_dinode.h 2008-12-25 00:26:37.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/jfs/jfs_dinode.h 2010-10-21 13:09:36.000000000 +0200 +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 */ @@ -4407,10 +3725,10 @@ diff -NurpP --minimal linux-2.6.36.2/fs/jfs/jfs_dinode.h linux-2.6.36.2-vs2.3.0. #define JFS_FL_INHERIT 0x03C80000 /* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */ -diff -NurpP --minimal linux-2.6.36.2/fs/jfs/jfs_filsys.h linux-2.6.36.2-vs2.3.0.36.38.2/fs/jfs/jfs_filsys.h ---- linux-2.6.36.2/fs/jfs/jfs_filsys.h 2008-12-25 00:26:37.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/jfs/jfs_filsys.h 2010-10-21 13:09:36.000000000 +0200 -@@ -263,6 +263,7 @@ +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 @@ -4418,9 +3736,9 @@ diff -NurpP --minimal linux-2.6.36.2/fs/jfs/jfs_filsys.h linux-2.6.36.2-vs2.3.0. /* * file system state (superblock state) -diff -NurpP --minimal linux-2.6.36.2/fs/jfs/jfs_imap.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/jfs/jfs_imap.c ---- linux-2.6.36.2/fs/jfs/jfs_imap.c 2010-07-07 18:31:52.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/jfs/jfs_imap.c 2010-10-21 13:09:36.000000000 +0200 +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 @@ -4429,60 +3747,64 @@ diff -NurpP --minimal linux-2.6.36.2/fs/jfs/jfs_imap.c linux-2.6.36.2-vs2.3.0.36 #include "jfs_incore.h" #include "jfs_inode.h" -@@ -3060,6 +3061,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); -+ uid_t uid; -+ gid_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); -@@ -3080,14 +3083,18 @@ static int copy_from_dinode(struct dinod +@@ -3067,14 +3070,18 @@ static int copy_from_dinode(struct dinod } - ip->i_nlink = le32_to_cpu(dip->di_nlink); + set_nlink(ip, le32_to_cpu(dip->di_nlink)); -- jfs_ip->saved_uid = le32_to_cpu(dip->di_uid); -+ uid = le32_to_cpu(dip->di_uid); -+ gid = le32_to_cpu(dip->di_gid); -+ ip->i_tag = INOTAG_TAG(DX_TAG(ip), uid, gid, 0); +- jfs_ip->saved_uid = make_kuid(&init_user_ns, le32_to_cpu(dip->di_uid)); ++ 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); - if (sbi->uid == -1) ++ jfs_ip->saved_uid = INOTAG_KUID(DX_TAG(ip), kuid, kgid); + if (!uid_valid(sbi->uid)) ip->i_uid = jfs_ip->saved_uid; else { ip->i_uid = sbi->uid; } -- jfs_ip->saved_gid = le32_to_cpu(dip->di_gid); -+ jfs_ip->saved_gid = INOTAG_GID(DX_TAG(ip), uid, gid); - if (sbi->gid == -1) +- jfs_ip->saved_gid = make_kgid(&init_user_ns, le32_to_cpu(dip->di_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 { -@@ -3152,14 +3159,12 @@ 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); -- if (sbi->uid == -1) -- dip->di_uid = cpu_to_le32(ip->i_uid); +- if (!uid_valid(sbi->uid)) +- dip->di_uid = cpu_to_le32(i_uid_read(ip)); - else -- dip->di_uid = cpu_to_le32(jfs_ip->saved_uid); -- if (sbi->gid == -1) -- dip->di_gid = cpu_to_le32(ip->i_gid); +- dip->di_uid =cpu_to_le32(from_kuid(&init_user_ns, +- jfs_ip->saved_uid)); +- if (!gid_valid(sbi->gid)) +- dip->di_gid = cpu_to_le32(i_gid_read(ip)); - else -- dip->di_gid = cpu_to_le32(jfs_ip->saved_gid); -+ -+ dip->di_uid = cpu_to_le32(TAGINO_UID(DX_TAG(ip), -+ (sbi->uid == -1) ? ip->i_uid : jfs_ip->saved_uid, ip->i_tag)); -+ dip->di_gid = cpu_to_le32(TAGINO_GID(DX_TAG(ip), -+ (sbi->gid == -1) ? ip->i_gid : jfs_ip->saved_gid, ip->i_tag)); -+ +- 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_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_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-2.6.36.2/fs/jfs/jfs_inode.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/jfs/jfs_inode.c ---- linux-2.6.36.2/fs/jfs/jfs_inode.c 2010-08-02 16:52:49.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/jfs/jfs_inode.c 2010-10-21 13:09:36.000000000 +0200 +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 @@ -4491,37 +3813,35 @@ diff -NurpP --minimal linux-2.6.36.2/fs/jfs/jfs_inode.c linux-2.6.36.2-vs2.3.0.3 #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) @@ -4544,7 +3864,7 @@ diff -NurpP --minimal linux-2.6.36.2/fs/jfs/jfs_inode.c linux-2.6.36.2-vs2.3.0.3 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; @@ -4556,9 +3876,9 @@ diff -NurpP --minimal linux-2.6.36.2/fs/jfs/jfs_inode.c linux-2.6.36.2-vs2.3.0.3 } /* -diff -NurpP --minimal linux-2.6.36.2/fs/jfs/jfs_inode.h linux-2.6.36.2-vs2.3.0.36.38.2/fs/jfs/jfs_inode.h ---- linux-2.6.36.2/fs/jfs/jfs_inode.h 2010-10-21 13:07:50.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/jfs/jfs_inode.h 2010-10-21 13:09:36.000000000 +0200 +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); @@ -4567,10 +3887,10 @@ diff -NurpP --minimal linux-2.6.36.2/fs/jfs/jfs_inode.h linux-2.6.36.2-vs2.3.0.3 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-2.6.36.2/fs/jfs/namei.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/jfs/namei.c ---- linux-2.6.36.2/fs/jfs/namei.c 2010-07-07 18:31:52.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/jfs/namei.c 2010-10-21 13:09:36.000000000 +0200 -@@ -21,6 +21,7 @@ +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 #include @@ -4578,36 +3898,36 @@ diff -NurpP --minimal linux-2.6.36.2/fs/jfs/namei.c linux-2.6.36.2-vs2.3.0.36.38 #include "jfs_incore.h" #include "jfs_superblock.h" #include "jfs_inode.h" -@@ -1491,6 +1492,7 @@ static struct dentry *jfs_lookup(struct - return ERR_CAST(ip); +@@ -1461,6 +1462,7 @@ static struct dentry *jfs_lookup(struct + jfs_err("jfs_lookup: iget failed on inum %d", (uint)inum); } + dx_propagate_tag(nd, ip); - dentry = d_splice_alias(ip, dentry); + return d_splice_alias(ip, dentry); + } - if (dentry && (JFS_SBI(dip->i_sb)->mntflag & JFS_OS2)) -@@ -1560,6 +1562,7 @@ const struct inode_operations jfs_dir_in - #ifdef CONFIG_JFS_POSIX_ACL - .check_acl = jfs_check_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-2.6.36.2/fs/jfs/super.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/jfs/super.c ---- linux-2.6.36.2/fs/jfs/super.c 2010-10-21 13:07:50.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/jfs/super.c 2010-10-21 13:09:36.000000000 +0200 -@@ -195,7 +195,8 @@ static void jfs_put_super(struct super_b - 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 -+ Opt_usrquota, Opt_grpquota, Opt_uid, Opt_gid, Opt_umask, + Opt_usrquota, Opt_grpquota, Opt_uid, Opt_gid, Opt_umask, +- Opt_discard, Opt_nodiscard, Opt_discard_minblk ++ Opt_discard, Opt_nodiscard, Opt_discard_minblk, + Opt_tag, Opt_notag, Opt_tagid }; static const match_table_t tokens = { -@@ -205,6 +206,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"}, @@ -4618,10 +3938,11 @@ diff -NurpP --minimal linux-2.6.36.2/fs/jfs/super.c linux-2.6.36.2-vs2.3.0.36.38 {Opt_ignore, "noquota"}, {Opt_ignore, "quota"}, {Opt_usrquota, "usrquota"}, -@@ -339,6 +344,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; } +- +#ifndef CONFIG_TAGGING_NONE + case Opt_tag: + *flag |= JFS_TAGGED; @@ -4637,22 +3958,22 @@ diff -NurpP --minimal linux-2.6.36.2/fs/jfs/super.c linux-2.6.36.2-vs2.3.0.36.38 + break; +#endif default: - printk("jfs: Unrecognized mount option \"%s\" " - " or missing value\n", p); -@@ -369,6 +388,12 @@ static int jfs_remount(struct super_bloc - if (!parse_options(data, sb, &newLVSize, &flag)) { + 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", + sb->s_id); + return -EINVAL; + } + - lock_kernel(); if (newLVSize) { if (sb->s_flags & MS_RDONLY) { -@@ -460,6 +485,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 @@ -4661,102 +3982,119 @@ diff -NurpP --minimal linux-2.6.36.2/fs/jfs/super.c linux-2.6.36.2-vs2.3.0.36.38 + sb->s_flags |= MS_TAGGED; if (newLVSize) { - printk(KERN_ERR "resize option for remount only\n"); -diff -NurpP --minimal linux-2.6.36.2/fs/libfs.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/libfs.c ---- linux-2.6.36.2/fs/libfs.c 2010-10-21 13:07:50.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/libfs.c 2010-10-21 13:09:36.000000000 +0200 -@@ -124,7 +124,8 @@ static inline unsigned char dt_type(stru + pr_err("resize option for remount only\n"); +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; -@@ -157,6 +158,8 @@ int dcache_readdir(struct file * filp, v - next = list_entry(p, struct dentry, d_u.d_child); - if (d_unhashed(next) || !next->d_inode) - continue; -+ if (filter && !filter(next)) -+ continue; +- 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 - spin_unlock(&dcache_lock); - if (filldir(dirent, next->d_name.name, -@@ -175,6 +178,18 @@ int dcache_readdir(struct file * filp, v + 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; -@@ -925,6 +940,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(get_sb_pseudo); - EXPORT_SYMBOL(simple_write_begin); -diff -NurpP --minimal linux-2.6.36.2/fs/locks.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/locks.c ---- linux-2.6.36.2/fs/locks.c 2010-07-07 18:31:52.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/locks.c 2010-10-21 13:09:36.000000000 +0200 -@@ -127,6 +127,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 - -@@ -148,6 +150,8 @@ static struct kmem_cache *filelock_cache + #define CREATE_TRACE_POINTS + #include +@@ -214,11 +216,17 @@ static void locks_init_lock_heads(struct /* Allocate an empty lock structure. */ - static struct file_lock *locks_alloc_lock(void) + struct file_lock *locks_alloc_lock(void) { +- struct file_lock *fl = kmem_cache_zalloc(filelock_cache, GFP_KERNEL); ++ struct file_lock *fl; + +- if (fl) +- locks_init_lock_heads(fl); + if (!vx_locks_avail(1)) + return NULL; - return kmem_cache_alloc(filelock_cache, GFP_KERNEL); - } -@@ -174,6 +178,7 @@ static void locks_free_lock(struct file_ ++ fl = kmem_cache_zalloc(filelock_cache, GFP_KERNEL); ++ ++ if (fl) { ++ locks_init_lock_heads(fl); ++ fl->fl_xid = -1; ++ } + return fl; + } + EXPORT_SYMBOL_GPL(locks_alloc_lock); +@@ -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); } -@@ -194,6 +199,7 @@ void locks_init_lock(struct file_lock *f - fl->fl_start = fl->fl_end = 0; - fl->fl_ops = NULL; - fl->fl_lmops = NULL; +@@ -267,6 +276,7 @@ void locks_init_lock(struct file_lock *f + { + memset(fl, 0, sizeof(struct file_lock)); + locks_init_lock_heads(fl); + fl->fl_xid = -1; } EXPORT_SYMBOL(locks_init_lock); -@@ -248,6 +254,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); - } -@@ -286,6 +293,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; @@ -4766,17 +4104,17 @@ diff -NurpP --minimal linux-2.6.36.2/fs/locks.c linux-2.6.36.2-vs2.3.0.36.38.2/f + fl->fl_xid = filp->f_xid; + vx_locks_inc(fl); - *lock = fl; - return 0; -@@ -451,6 +463,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; -@@ -470,6 +483,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); @@ -4788,15 +4126,15 @@ diff -NurpP --minimal linux-2.6.36.2/fs/locks.c linux-2.6.36.2-vs2.3.0.36.38.2/f error = lease_init(filp, type, fl); if (error) { locks_free_lock(fl); -@@ -770,6 +788,7 @@ static int flock_lock_file(struct file * - if (found) - cond_resched(); +@@ -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; -@@ -790,6 +809,7 @@ find_conflict: +@@ -912,6 +935,7 @@ find_conflict: goto out; locks_copy_lock(new_fl, request); locks_insert_lock(before, new_fl); @@ -4804,26 +4142,26 @@ diff -NurpP --minimal linux-2.6.36.2/fs/locks.c linux-2.6.36.2-vs2.3.0.36.38.2/f new_fl = NULL; error = 0; -@@ -800,7 +820,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; -@@ -810,6 +831,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. -@@ -820,7 +843,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(); @@ -4834,35 +4172,44 @@ diff -NurpP --minimal linux-2.6.36.2/fs/locks.c linux-2.6.36.2-vs2.3.0.36.38.2/f + vx_locks_inc(new_fl2); } - lock_kernel(); -@@ -1019,7 +1046,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); -@@ -1109,7 +1137,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); -@@ -1425,6 +1453,7 @@ int generic_setlease(struct file *filp, - - locks_copy_lock(new_fl, lease); - locks_insert_lock(before, new_fl); -+ vx_locks_inc(new_fl); +@@ -1655,6 +1687,7 @@ generic_add_lease(struct file *filp, lon + goto out; - *flp = new_fl; - return 0; -@@ -1780,6 +1809,11 @@ int fcntl_setlk(unsigned int fd, struct + locks_insert_lock(before, lease); ++ vx_locks_inc(lease); + /* + * 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; @@ -4874,7 +4221,7 @@ diff -NurpP --minimal linux-2.6.36.2/fs/locks.c linux-2.6.36.2-vs2.3.0.36.38.2/f /* * This might block, so we do it before checking the inode. */ -@@ -1898,6 +1932,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; @@ -4886,27 +4233,39 @@ diff -NurpP --minimal linux-2.6.36.2/fs/locks.c linux-2.6.36.2-vs2.3.0.36.38.2/f /* * This might block, so we do it before checking the inode. */ -@@ -2163,8 +2202,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, (long)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, (long)f->private, " ->"); + lock_get_status(f, bfl, iter->li_pos, " ->"); + } - f->private++; return 0; -diff -NurpP --minimal linux-2.6.36.2/fs/namei.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/namei.c ---- linux-2.6.36.2/fs/namei.c 2010-10-21 13:07:50.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/namei.c 2010-10-21 22:29:08.000000000 +0200 -@@ -32,6 +32,14 @@ - #include + } +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 */ + 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.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 @@ -4914,12 +4273,17 @@ diff -NurpP --minimal linux-2.6.36.2/fs/namei.c linux-2.6.36.2-vs2.3.0.36.38.2/f +#include +#include +#include + #include #include #include "internal.h" -@@ -166,6 +174,84 @@ void putname(const char *name) - EXPORT_SYMBOL(putname); - #endif ++#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; + } +static inline int dx_barrier(const struct inode *inode) +{ @@ -4938,7 +4302,7 @@ diff -NurpP --minimal linux-2.6.36.2/fs/namei.c linux-2.6.36.2-vs2.3.0.36.38.2/f + if (inode->i_sb->s_magic == DEVPTS_SUPER_MAGIC) { + /* devpts is xid tagged */ + if (S_ISDIR(inode->i_mode) || -+ vx_check((xid_t)inode->i_tag, 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 */ @@ -4947,8 +4311,12 @@ diff -NurpP --minimal linux-2.6.36.2/fs/namei.c linux-2.6.36.2-vs2.3.0.36.38.2/f + 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; @@ -4962,11 +4330,16 @@ diff -NurpP --minimal linux-2.6.36.2/fs/namei.c linux-2.6.36.2-vs2.3.0.36.38.2/f + if (!pid) + goto out; + ++ rcu_read_lock(); + tsk = pid_task(pid, PIDTYPE_PID); + vxdprintk(VXD_CBIT(tag, 0), "accessing %p[#%u]", + tsk, (tsk ? vx_task_xid(tsk) : 0)); -+ if (tsk && vx_check(vx_task_xid(tsk), VS_IDENT | VS_WATCH_P)) ++ if (tsk && ++ vx_check(vx_task_xid(tsk), VS_IDENT | VS_WATCH_P)) { ++ rcu_read_unlock(); + return 0; ++ } ++ rcu_read_unlock(); + } + else { + /* FIXME: Should we block some entries here? */ @@ -4975,8 +4348,8 @@ diff -NurpP --minimal linux-2.6.36.2/fs/namei.c linux-2.6.36.2-vs2.3.0.36.38.2/f + } + else { + if (dx_notagcheck(inode->i_sb) || -+ dx_check(inode->i_tag, DX_HOSTID | DX_ADMIN | DX_WATCH | -+ DX_IDENT)) ++ dx_check((vxid_t)i_tag_read(inode), ++ DX_HOSTID | DX_ADMIN | DX_WATCH | DX_IDENT)) + return 0; + } + @@ -4993,16 +4366,16 @@ diff -NurpP --minimal linux-2.6.36.2/fs/namei.c linux-2.6.36.2-vs2.3.0.36.38.2/f +#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; +} + /* - * This does basic POSIX ACL permission checking + * This does the basic permission checking */ -@@ -266,10 +352,14 @@ int inode_permission(struct inode *inode +@@ -402,10 +499,14 @@ int __inode_permission(struct inode *ino /* * Nobody gets write access to an immutable file. */ @@ -5015,85 +4388,72 @@ diff -NurpP --minimal linux-2.6.36.2/fs/namei.c linux-2.6.36.2-vs2.3.0.36.38.2/f + if (retval) + return retval; + - if (inode->i_op->permission) - retval = inode->i_op->permission(inode, mask); - else -@@ -463,6 +553,9 @@ static int exec_permission(struct inode - { - int ret; - -+ if (dx_barrier(inode)) -+ return -EACCES; + retval = do_inode_permission(inode, mask); + if (retval) + return retval; +@@ -1416,6 +1517,9 @@ static int lookup_fast(struct nameidata + goto unlazy; + } + } + - if (inode->i_op->permission) { - ret = inode->i_op->permission(inode, MAY_EXEC); - if (!ret) -@@ -672,7 +765,8 @@ static __always_inline void follow_dotdo ++ /* FIXME: check dx permission */ ++ + path->mnt = mnt; + path->dentry = dentry; + if (likely(__follow_mount_rcu(nd, path, inode))) +@@ -1442,6 +1546,8 @@ unlazy: + goto need_lookup; + } - 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()... */ -@@ -725,7 +819,7 @@ static int do_lookup(struct nameidata *n - { - struct vfsmount *mnt = nd->path.mnt; - struct dentry *dentry, *parent; -- struct inode *dir; -+ struct inode *dir, *inode; - /* - * See if the low-level filesystem might want - * to use its own hash.. -@@ -747,12 +841,31 @@ static int do_lookup(struct nameidata *n - found: - if (dentry->d_op && dentry->d_op->d_revalidate) - goto need_revalidate; -+ -+ inode = dentry->d_inode; -+ if (!inode) -+ goto done; ++ /* FIXME: check dx permission */ + -+ if (__dx_permission(inode, MAY_ACCESS)) -+ goto hidden; - done: path->mnt = mnt; path->dentry = dentry; - __follow_mount(path); - return 0; - -+hidden: -+#ifndef CONFIG_VSERVER_WARN_DEVPTS -+ if (inode->i_sb->s_magic != DEVPTS_SUPER_MAGIC) -+#endif -+ vxwprintk_task(1, -+ "did lookup hidden %s:%p[#%d,%lu] " VS_Q("%s/%.*s") ".", -+ inode->i_sb->s_id, inode, inode->i_tag, inode->i_ino, -+ vxd_path(&nd->path), name->len, name->name); -+ -+ dput(dentry); -+ return -ENOENT; -+ - need_lookup: - parent = nd->path.dentry; - dir = parent->d_inode; -@@ -1307,7 +1420,7 @@ static int may_delete(struct inode *dir, - if (IS_APPEND(dir)) + err = follow_managed(path, nd->flags); +@@ -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)) -@@ -1430,6 +1543,14 @@ int may_open(struct path *path, int acc_ + 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); +- if (error) ++ if (error) { ++ vxdprintk(VXD_CBIT(misc, 3), "may_create failed with %d", error); + return error; ++ } + + if (!dir->i_op->create) + return -EACCES; /* shouldn't it be ENOSYS? */ + mode &= S_IALLUGO; + mode |= S_IFREG; + error = security_inode_create(dir, dentry, mode); +- if (error) ++ if (error) { ++ vxdprintk(VXD_CBIT(misc, 3), "security_inode_create failed with %d", error); + return error; ++ } + error = dir->i_op->create(dir, dentry, mode, want_excl); + if (!error) + fsnotify_create(dir, dentry); ++ else ++ vxdprintk(VXD_CBIT(misc, 3), "i_op->create failed with %d", error); + return error; + } + EXPORT_SYMBOL(vfs_create); +@@ -2564,6 +2676,15 @@ static int may_open(struct path *path, i break; } +#ifdef CONFIG_VSERVER_COWBL -+ if (IS_COW(inode) && (flag & FMODE_WRITE)) { ++ if (IS_COW(inode) && ++ ((flag & O_ACCMODE) != O_RDONLY)) { + if (IS_COW_LINK(inode)) + return -EMLINK; + inode->i_flags &= ~(S_IXUNLINK|S_IMMUTABLE); @@ -5103,110 +4463,61 @@ diff -NurpP --minimal linux-2.6.36.2/fs/namei.c linux-2.6.36.2-vs2.3.0.36.38.2/f error = inode_permission(inode, acc_mode); if (error) return error; -@@ -1538,7 +1659,8 @@ static int open_will_truncate(int flag, - } - - static struct file *finish_open(struct nameidata *nd, -- int open_flag, int acc_mode) -+ int open_flag, int acc_mode, -+ const char *pathname) - { - struct file *filp; - int will_truncate; -@@ -1551,6 +1673,23 @@ static struct file *finish_open(struct n - goto exit; +@@ -3058,6 +3179,16 @@ finish_open: } + finish_open_created: error = may_open(&nd->path, acc_mode, open_flag); +#ifdef CONFIG_VSERVER_COWBL + if (error == -EMLINK) { + struct dentry *dentry; -+ dentry = cow_break_link(pathname); -+ if (IS_ERR(dentry)) { ++ dentry = cow_break_link(name->name); ++ if (IS_ERR(dentry)) + error = PTR_ERR(dentry); -+ goto exit_cow; -+ } -+ dput(dentry); -+ if (will_truncate) -+ mnt_drop_write(nd->path.mnt); -+ release_open_intent(nd); -+ path_put(&nd->path); -+ return ERR_PTR(-EMLINK); ++ else ++ dput(dentry); + } -+exit_cow: -+#endif - if (error) { - if (will_truncate) - mnt_drop_write(nd->path.mnt); -@@ -1719,7 +1858,7 @@ static struct file *do_last(struct namei - if (S_ISDIR(path->dentry->d_inode->i_mode)) - goto exit; - ok: -- filp = finish_open(nd, open_flag, acc_mode); -+ filp = finish_open(nd, open_flag, acc_mode, pathname); - return filp; - - exit_mutex_unlock: -@@ -1748,7 +1887,11 @@ struct file *do_filp_open(int dfd, const - int count = 0; - int flag = open_to_namei_flags(open_flag); - int force_reval = 0; -- -+#ifdef CONFIG_VSERVER_COWBL -+ int rflag = flag; -+ int rmode = mode; -+restart: +#endif - if (!(open_flag & O_CREAT)) - mode = 0; + if (error) + goto out; -@@ -1814,6 +1957,13 @@ reval: - if (!(open_flag & O_NOFOLLOW)) - nd.flags |= LOOKUP_FOLLOW; - filp = do_last(&nd, &path, open_flag, acc_mode, mode, pathname); +@@ -3187,6 +3318,7 @@ static struct file *path_openat(int dfd, + int opened = 0; + int error; + ++restart: + file = get_empty_filp(); + 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); + } ++ +#ifdef CONFIG_VSERVER_COWBL -+ if (unlikely(IS_ERR(filp) && PTR_ERR(filp) == -EMLINK)) { -+ flag = rflag; -+ mode = rmode; ++ if (error == -EMLINK) { ++ if (nd->root.mnt && !(nd->flags & LOOKUP_ROOT)) ++ path_put(&nd->root); ++ if (base) ++ fput(base); + goto restart; + } +#endif - while (unlikely(!filp)) { /* trailing symlink */ - struct path holder; - struct inode *inode = path.dentry->d_inode; -@@ -1852,6 +2002,13 @@ reval: - holder = path; - nd.flags &= ~LOOKUP_PARENT; - filp = do_last(&nd, &path, open_flag, acc_mode, mode, pathname); -+#ifdef CONFIG_VSERVER_COWBL -+ if (unlikely(IS_ERR(filp) && PTR_ERR(filp) == -EMLINK)) { -+ flag = rflag; -+ mode = rmode; -+ goto restart; -+ } -+#endif - if (inode->i_op->put_link) - inode->i_op->put_link(holder.dentry, &nd, cookie); - path_put(&holder); -@@ -1952,9 +2109,17 @@ int vfs_mknod(struct inode *dir, struct - if (error) - return error; - -- if ((S_ISCHR(mode) || S_ISBLK(mode)) && !capable(CAP_MKNOD)) -+ if (!(S_ISCHR(mode) || S_ISBLK(mode))) -+ goto okay; -+ -+ if (!capable(CAP_MKNOD)) - return -EPERM; - -+ if (S_ISCHR(mode) && !vs_chrdev_perm(dev, DATTR_CREATE)) -+ return -EPERM; -+ if (S_ISBLK(mode) && !vs_blkdev_perm(dev, DATTR_CREATE)) -+ return -EPERM; -+okay: - if (!dir->i_op->mknod) - return -EPERM; - -@@ -2419,7 +2584,7 @@ int vfs_link(struct dentry *old_dentry, + out: + if (nd->root.mnt && !(nd->flags & LOOKUP_ROOT)) + path_put(&nd->root); +@@ -3343,6 +3485,11 @@ struct dentry *kern_path_create(int dfd, + goto fail; + } + *path = nd.path; ++ vxdprintk(VXD_CBIT(misc, 3), "kern_path_create path.dentry = %p (%.*s), dentry = %p (%.*s), d_inode = %p", ++ path->dentry, path->dentry->d_name.len, ++ path->dentry->d_name.name, dentry, ++ dentry->d_name.len, dentry->d_name.name, ++ path->dentry->d_inode); + return dentry; + fail: + dput(dentry); +@@ -3899,7 +4046,7 @@ int vfs_link(struct dentry *old_dentry, /* * A link to an append-only or immutable file cannot be created. */ @@ -5215,29 +4526,28 @@ diff -NurpP --minimal linux-2.6.36.2/fs/namei.c linux-2.6.36.2-vs2.3.0.36.38.2/f return -EPERM; if (!dir->i_op->link) return -EPERM; -@@ -2791,6 +2956,222 @@ 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 + -+#include -+ +static inline +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 old_path, new_path; -+ struct dentry *dir, *res = NULL; ++ struct path dir_path, *old_path, *new_path; ++ struct dentry *dir, *old_dentry, *new_dentry = NULL; + struct file *old_file; + struct file *new_file; + char *to, *path, pad='\251'; @@ -5245,66 +4555,91 @@ diff -NurpP --minimal linux-2.6.36.2/fs/namei.c linux-2.6.36.2-vs2.3.0.36.38.2/f + + vxdprintk(VXD_CBIT(misc, 1), + "cow_break_link(" VS_Q("%s") ")", pathname); ++ + path = kmalloc(PATH_MAX, GFP_KERNEL); + ret = -ENOMEM; + if (!path) + goto out; + -+ /* old_nd will have refs to dentry and mnt */ -+ ret = path_lookup(pathname, LOOKUP_FOLLOW, &old_nd); -+ vxdprintk(VXD_CBIT(misc, 2), "path_lookup(old): %d", ret); ++ /* old_nd.path will have refs to dentry and mnt */ ++ ret = do_path_lookup(AT_FDCWD, pathname, LOOKUP_FOLLOW, &old_nd); ++ vxdprintk(VXD_CBIT(misc, 2), ++ "do_path_lookup(old): %d", ret); + if (ret < 0) + goto out_free_path; + -+ old_path = old_nd.path; -+ mode = old_path.dentry->d_inode->i_mode; ++ /* dentry/mnt refs handed over to old_path */ ++ old_path = &old_nd.path; ++ /* no explicit reference for old_dentry here */ ++ old_dentry = old_path->dentry; + -+ to = d_path(&old_path, path, PATH_MAX-2); ++ mode = old_dentry->d_inode->i_mode; ++ to = d_path(old_path, path, PATH_MAX-2); + pathlen = strlen(to); + vxdprintk(VXD_CBIT(misc, 2), -+ "old path " VS_Q("%s") " [" VS_Q("%.*s") ":%d]", to, -+ old_path.dentry->d_name.len, old_path.dentry->d_name.name, -+ old_path.dentry->d_name.len); ++ "old path " VS_Q("%s") " [%p:" VS_Q("%.*s") ":%d]", to, ++ old_dentry, ++ old_dentry->d_name.len, old_dentry->d_name.name, ++ old_dentry->d_name.len); + + to[pathlen + 1] = 0; +retry: ++ new_dentry = NULL; + to[pathlen] = pad--; -+ ret = -EMLINK; ++ ret = -ELOOP; + if (pad <= '\240') + goto out_rel_old; + + vxdprintk(VXD_CBIT(misc, 1), "temp copy " VS_Q("%s"), to); -+ /* dir_nd will have refs to dentry and mnt */ -+ ret = path_lookup(to, ++ ++ /* dir_nd.path will have refs to dentry and mnt */ ++ ret = do_path_lookup(AT_FDCWD, to, + LOOKUP_PARENT | LOOKUP_OPEN | LOOKUP_CREATE, &dir_nd); -+ vxdprintk(VXD_CBIT(misc, 2), -+ "path_lookup(new): %d", ret); ++ vxdprintk(VXD_CBIT(misc, 2), "do_path_lookup(new): %d", ret); + if (ret < 0) + goto retry; + -+ /* this puppy downs the inode mutex */ -+ new_path.dentry = lookup_create(&dir_nd, 0); -+ if (!new_path.dentry || IS_ERR(new_path.dentry)) { -+ vxdprintk(VXD_CBIT(misc, 2), -+ "lookup_create(new): %p", new_path.dentry); -+ mutex_unlock(&dir_nd.path.dentry->d_inode->i_mutex); ++ /* this puppy downs the dir inode mutex if successful. ++ dir_path will hold refs to dentry and mnt and ++ 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); ++ vxdprintk(VXD_CBIT(misc, 2), ++ "kern_path_create(new) failed with %ld", ++ PTR_ERR(new_dentry)); + goto retry; + } + vxdprintk(VXD_CBIT(misc, 2), -+ "lookup_create(new): %p [" VS_Q("%.*s") ":%d]", -+ new_path.dentry, -+ new_path.dentry->d_name.len, new_path.dentry->d_name.name, -+ new_path.dentry->d_name.len); ++ "kern_path_create(new): %p [" VS_Q("%.*s") ":%d]", ++ new_dentry, ++ new_dentry->d_name.len, new_dentry->d_name.name, ++ new_dentry->d_name.len); ++ ++ /* take a reference on new_dentry */ ++ dget(new_dentry); ++ ++ /* dentry/mnt refs handed over to new_path */ ++ new_path = &dir_path; ++ ++ /* dentry for old/new dir */ + dir = dir_nd.path.dentry; + -+ ret = vfs_create(dir_nd.path.dentry->d_inode, new_path.dentry, mode, &dir_nd); ++ /* give up reference on dir */ ++ dput(new_path->dentry); ++ ++ /* new_dentry already has a reference */ ++ new_path->dentry = new_dentry; ++ ++ ret = vfs_create(dir->d_inode, new_dentry, mode, 1); + vxdprintk(VXD_CBIT(misc, 2), + "vfs_create(new): %d", ret); + if (ret == -EEXIST) { -+ mutex_unlock(&dir->d_inode->i_mutex); -+ dput(new_path.dentry); + 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; + goto retry; + } + else if (ret < 0) @@ -5312,33 +4647,34 @@ diff -NurpP --minimal linux-2.6.36.2/fs/namei.c linux-2.6.36.2-vs2.3.0.36.38.2/f + + /* drop out early, ret passes ENOENT */ + ret = -ENOENT; -+ if ((redo = d_unhashed(old_path.dentry))) ++ if ((redo = d_unhashed(old_dentry))) + goto out_unlock_new; + -+ new_path.mnt = dir_nd.path.mnt; -+ dget(old_path.dentry); -+ mntget(old_path.mnt); -+ /* this one cleans up the dentry/mnt in case of failure */ -+ old_file = dentry_open(old_path.dentry, old_path.mnt, -+ O_RDONLY, current_cred()); ++ /* doesn't change refs for old_path */ ++ old_file = dentry_open(old_path, O_RDONLY, current_cred()); + vxdprintk(VXD_CBIT(misc, 2), + "dentry_open(old): %p", old_file); -+ if (!old_file || IS_ERR(old_file)) { -+ res = IS_ERR(old_file) ? (void *) old_file : res; ++ if (IS_ERR(old_file)) { ++ ret = PTR_ERR(old_file); + goto out_unlock_new; + } + -+ dget(new_path.dentry); -+ mntget(new_path.mnt); -+ /* this one cleans up the dentry/mnt in case of failure */ -+ new_file = dentry_open(new_path.dentry, new_path.mnt, -+ O_WRONLY, current_cred()); ++ /* doesn't change refs for new_path */ ++ new_file = dentry_open(new_path, O_WRONLY, current_cred()); + vxdprintk(VXD_CBIT(misc, 2), + "dentry_open(new): %p", new_file); -+ -+ ret = IS_ERR(new_file) ? PTR_ERR(new_file) : -ENOENT; -+ if (!new_file || IS_ERR(new_file)) ++ if (IS_ERR(new_file)) { ++ ret = PTR_ERR(new_file); + 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); @@ -5349,8 +4685,8 @@ diff -NurpP --minimal linux-2.6.36.2/fs/namei.c linux-2.6.36.2-vs2.3.0.36.38.2/f + ret = -ENOSPC; + goto out_fput_both; + } else { -+ struct inode *old_inode = old_path.dentry->d_inode; -+ struct inode *new_inode = new_path.dentry->d_inode; ++ struct inode *old_inode = old_dentry->d_inode; ++ struct inode *new_inode = new_dentry->d_inode; + struct iattr attr = { + .ia_uid = old_inode->i_uid, + .ia_gid = old_inode->i_gid, @@ -5361,26 +4697,26 @@ diff -NurpP --minimal linux-2.6.36.2/fs/namei.c linux-2.6.36.2-vs2.3.0.36.38.2/f + mark_inode_dirty(new_inode); + } + -+ mutex_lock(&old_path.dentry->d_inode->i_sb->s_vfs_rename_mutex); ++ /* lock rename mutex */ ++ mutex_lock(&old_dentry->d_inode->i_sb->s_vfs_rename_mutex); + + /* drop out late */ + ret = -ENOENT; -+ if ((redo = d_unhashed(old_path.dentry))) ++ if ((redo = d_unhashed(old_dentry))) + goto out_unlock; + + vxdprintk(VXD_CBIT(misc, 2), + "vfs_rename: [" VS_Q("%*s") ":%d] -> [" VS_Q("%*s") ":%d]", -+ new_path.dentry->d_name.len, new_path.dentry->d_name.name, -+ new_path.dentry->d_name.len, -+ old_path.dentry->d_name.len, old_path.dentry->d_name.name, -+ old_path.dentry->d_name.len); -+ ret = vfs_rename(dir_nd.path.dentry->d_inode, new_path.dentry, -+ old_nd.path.dentry->d_parent->d_inode, old_path.dentry); ++ new_dentry->d_name.len, new_dentry->d_name.name, ++ new_dentry->d_name.len, ++ 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, NULL, 0); + vxdprintk(VXD_CBIT(misc, 2), "vfs_rename: %d", ret); -+ res = new_path.dentry; + +out_unlock: -+ mutex_unlock(&old_path.dentry->d_inode->i_sb->s_vfs_rename_mutex); ++ mutex_unlock(&old_dentry->d_inode->i_sb->s_vfs_rename_mutex); + +out_fput_both: + vxdprintk(VXD_CBIT(misc, 3), @@ -5395,280 +4731,177 @@ diff -NurpP --minimal linux-2.6.36.2/fs/namei.c linux-2.6.36.2-vs2.3.0.36.38.2/f + fput(old_file); + +out_unlock_new: -+ mutex_unlock(&dir->d_inode->i_mutex); ++ /* drop references from dir_nd.path */ ++ path_put(&dir_nd.path); ++ ++ 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); ++ } ++ + if (!ret) + goto out_redo; + + /* error path cleanup */ -+ vfs_unlink(dir->d_inode, new_path.dentry); -+ dput(new_path.dentry); ++ vfs_unlink(dir->d_inode, new_dentry, NULL); + +out_redo: + if (!redo) + goto out_rel_both; -+ /* lookup dentry once again */ -+ path_put(&old_nd.path); -+ ret = path_lookup(pathname, LOOKUP_FOLLOW, &old_nd); ++ ++ /* lookup dentry once again ++ old_nd.path will be freed as old_path in out_rel_old */ ++ ret = do_path_lookup(AT_FDCWD, pathname, LOOKUP_FOLLOW, &old_nd); + if (ret) + goto out_rel_both; + -+ new_path.dentry = old_nd.path.dentry; ++ /* drop reference on new_dentry */ ++ dput(new_dentry); ++ new_dentry = old_path->dentry; ++ dget(new_dentry); + vxdprintk(VXD_CBIT(misc, 2), -+ "path_lookup(redo): %p [" VS_Q("%.*s") ":%d]", -+ new_path.dentry, -+ new_path.dentry->d_name.len, new_path.dentry->d_name.name, -+ new_path.dentry->d_name.len); -+ dget(new_path.dentry); -+ res = new_path.dentry; ++ "do_path_lookup(redo): %p [" VS_Q("%.*s") ":%d]", ++ new_dentry, ++ new_dentry->d_name.len, new_dentry->d_name.name, ++ new_dentry->d_name.len); + +out_rel_both: -+ path_put(&dir_nd.path); ++ if (new_path) ++ path_put(new_path); +out_rel_old: -+ path_put(&old_nd.path); ++ path_put(old_path); +out_free_path: + kfree(path); +out: -+ if (ret) -+ res = ERR_PTR(ret); -+ return res; ++ if (ret) { ++ dput(new_dentry); ++ new_dentry = ERR_PTR(ret); ++ } ++ vxdprintk(VXD_CBIT(misc, 3), ++ "cow_break_link returning with %p", new_dentry); ++ return new_dentry; +} + +#endif ++ ++int vx_info_mnt_namespace(struct mnt_namespace *ns, char *buffer) ++{ ++ struct path path; ++ struct vfsmount *vmnt; ++ char *pstr, *root; ++ int length = 0; ++ ++ pstr = kmalloc(PATH_MAX, GFP_KERNEL); ++ if (!pstr) ++ return 0; ++ ++ vmnt = &ns->root->mnt; ++ path.mnt = vmnt; ++ path.dentry = vmnt->mnt_root; ++ root = d_path(&path, pstr, PATH_MAX - 2); ++ length = sprintf(buffer + length, ++ "Namespace:\t%p [#%u]\n" ++ "RootPath:\t%s\n", ++ ns, atomic_read(&ns->count), ++ root); ++ 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) { -diff -NurpP --minimal linux-2.6.36.2/fs/namespace.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/namespace.c ---- linux-2.6.36.2/fs/namespace.c 2010-10-21 13:07:50.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/namespace.c 2010-10-21 15:11:02.000000000 +0200 -@@ -32,6 +32,11 @@ - #include - #include - #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 +#include +#include - #include - #include #include "pnode.h" -@@ -601,6 +606,7 @@ static struct vfsmount *clone_mnt(struct - mnt->mnt_root = dget(root); - mnt->mnt_mountpoint = mnt->mnt_root; - mnt->mnt_parent = mnt; -+ mnt->mnt_tag = old->mnt_tag; - - if (flag & CL_SLAVE) { - list_add(&mnt->mnt_slave, &old->mnt_slave_list); -@@ -699,6 +705,31 @@ static inline void mangle(struct seq_fil - seq_escape(m, s, " \t\n\\"); - } + #include "internal.h" -+static int mnt_is_reachable(struct vfsmount *mnt) -+{ -+ struct path root; -+ struct dentry *point; -+ int ret; -+ -+ if (mnt == mnt->mnt_ns->root) -+ return 1; -+ -+ br_read_lock(vfsmount_lock); -+ root = current->fs->root; -+ point = root.dentry; -+ -+ while ((mnt != mnt->mnt_parent) && (mnt != root.mnt)) { -+ point = mnt->mnt_mountpoint; -+ mnt = mnt->mnt_parent; -+ } -+ -+ ret = (mnt == root.mnt) && is_subdir(point, root.dentry); -+ -+ br_read_unlock(vfsmount_lock); -+ -+ return ret; -+} -+ - /* - * Simple .show_options callback for filesystems which don't want to - * implement more complex mount option showing. -@@ -801,6 +832,8 @@ static int show_sb_opts(struct seq_file - { MS_SYNCHRONOUS, ",sync" }, - { MS_DIRSYNC, ",dirsync" }, - { MS_MANDLOCK, ",mand" }, -+ { MS_TAGGED, ",tag" }, -+ { MS_NOTAGCHECK, ",notagcheck" }, - { 0, NULL } - }; - const struct proc_fs_info *fs_infop; -@@ -847,10 +880,20 @@ static int show_vfsmnt(struct seq_file * - int err = 0; - struct path mnt_path = { .dentry = mnt->mnt_root, .mnt = mnt }; +@@ -897,6 +902,10 @@ vfs_kern_mount(struct file_system_type * + if (!type) + return ERR_PTR(-ENODEV); -- mangle(m, mnt->mnt_devname ? mnt->mnt_devname : "none"); -- seq_putc(m, ' '); -- seq_path(m, &mnt_path, " \t\n\\"); -- seq_putc(m, ' '); -+ if (vx_flags(VXF_HIDE_MOUNT, 0)) -+ return SEQ_SKIP; -+ if (!mnt_is_reachable(mnt) && !vx_check(0, VS_WATCH_P)) -+ return SEQ_SKIP; ++ if ((type->fs_flags & FS_BINARY_MOUNTDATA) && ++ !vx_capable(CAP_SYS_ADMIN, VXC_BINARY_MOUNT)) ++ return ERR_PTR(-EPERM); + -+ if (!vx_check(0, VS_ADMIN|VS_WATCH) && -+ mnt == current->fs->root.mnt) { -+ seq_puts(m, "/dev/root / "); -+ } else { -+ mangle(m, mnt->mnt_devname ? mnt->mnt_devname : "none"); -+ seq_putc(m, ' '); -+ seq_path(m, &mnt_path, " \t\n\\"); -+ seq_putc(m, ' '); -+ } - show_type(m, mnt->mnt_sb); - seq_puts(m, __mnt_is_readonly(mnt) ? " ro" : " rw"); - err = show_sb_opts(m, mnt->mnt_sb); -@@ -880,6 +923,11 @@ static int show_mountinfo(struct seq_fil - struct path root = p->root; - int err = 0; + mnt = alloc_vfsmnt(name); + if (!mnt) + return ERR_PTR(-ENOMEM); +@@ -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; + lock_mount_hash(); + list_add_tail(&mnt->mnt_instance, &sb->s_mounts); + unlock_mount_hash(); +@@ -1508,7 +1518,8 @@ out_unlock: + */ + static inline bool may_mount(void) + { +- 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 (vx_flags(VXF_HIDE_MOUNT, 0)) -+ return SEQ_SKIP; -+ if (!mnt_is_reachable(mnt) && !vx_check(0, VS_WATCH_P)) -+ return SEQ_SKIP; -+ - seq_printf(m, "%i %i %u:%u ", mnt->mnt_id, mnt->mnt_parent->mnt_id, - MAJOR(sb->s_dev), MINOR(sb->s_dev)); - seq_dentry(m, mnt->mnt_root, " \t\n\\"); -@@ -938,17 +986,27 @@ static int show_vfsstat(struct seq_file - struct path mnt_path = { .dentry = mnt->mnt_root, .mnt = mnt }; - int err = 0; + /* +@@ -1969,6 +1980,7 @@ static int do_change_type(struct path *p + if (err) + goto out_unlock; + } ++ // mnt->mnt_flags = mnt_flags; -- /* device */ -- if (mnt->mnt_devname) { -- seq_puts(m, "device "); -- mangle(m, mnt->mnt_devname); -- } else -- seq_puts(m, "no device"); -+ if (vx_flags(VXF_HIDE_MOUNT, 0)) -+ return SEQ_SKIP; -+ if (!mnt_is_reachable(mnt) && !vx_check(0, VS_WATCH_P)) -+ return SEQ_SKIP; - -- /* mount point */ -- seq_puts(m, " mounted on "); -- seq_path(m, &mnt_path, " \t\n\\"); -- seq_putc(m, ' '); -+ if (!vx_check(0, VS_ADMIN|VS_WATCH) && -+ mnt == current->fs->root.mnt) { -+ seq_puts(m, "device /dev/root mounted on / "); -+ } else { -+ /* device */ -+ if (mnt->mnt_devname) { -+ seq_puts(m, "device "); -+ mangle(m, mnt->mnt_devname); -+ } else -+ seq_puts(m, "no device"); -+ -+ /* mount point */ -+ seq_puts(m, " mounted on "); -+ seq_path(m, &mnt_path, " \t\n\\"); -+ seq_putc(m, ' '); -+ } - - /* file system type */ - seq_puts(m, "with fstype "); -@@ -1194,7 +1252,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(path.mnt, flags); -@@ -1220,7 +1278,7 @@ SYSCALL_DEFINE1(oldumount, char __user * - - static int mount_is_safe(struct path *path) - { -- if (capable(CAP_SYS_ADMIN)) -+ if (vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT)) - return 0; - return -EPERM; - #ifdef notyet -@@ -1510,7 +1568,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; - - if (path->dentry != path->mnt->mnt_root) -@@ -1541,11 +1599,13 @@ static int do_change_type(struct path *p + lock_mount_hash(); + for (m = mnt; m; m = (recurse ? next_mnt(m, mnt) : NULL)) +@@ -1997,12 +2009,14 @@ static bool has_locked_children(struct m * do loopback mount. */ - static int do_loopback(struct path *path, char *old_name, + 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) { struct path old_path; - struct vfsmount *mnt = NULL; - 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) -@@ -1580,6 +1640,7 @@ static int do_loopback(struct path *path - br_write_unlock(vfsmount_lock); - release_mounts(&umount_list); - } -+ mnt->mnt_flags = mnt_flags; - - out: - up_write(&namespace_sem); -@@ -1610,12 +1671,12 @@ 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; - -- if (!capable(CAP_SYS_ADMIN)) -+ if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_REMOUNT)) - return -EPERM; - - if (!check_mnt(path->mnt)) -@@ -1659,7 +1720,7 @@ static int do_move_mount(struct path *pa - struct path old_path, parent_path; - struct vfsmount *p; - 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; -@@ -1741,7 +1802,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; - - lock_kernel(); -@@ -2009,6 +2070,7 @@ long do_mount(char *dev_name, char *dir_ +@@ -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) -@@ -2036,6 +2098,12 @@ long do_mount(char *dev_name, char *dir_ +@@ -2604,6 +2619,12 @@ long do_mount(const char *dev_name, cons if (!(flags & MS_NOATIME)) mnt_flags |= MNT_RELATIME; @@ -5681,11 +4914,11 @@ diff -NurpP --minimal linux-2.6.36.2/fs/namespace.c linux-2.6.36.2-vs2.3.0.36.38 /* Separate the per-mountpoint flags */ if (flags & MS_NOSUID) mnt_flags |= MNT_NOSUID; -@@ -2052,15 +2120,17 @@ long do_mount(char *dev_name, char *dir_ - 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 | @@ -5701,39 +4934,39 @@ diff -NurpP --minimal linux-2.6.36.2/fs/namespace.c linux-2.6.36.2-vs2.3.0.36.38 else if (flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE)) retval = do_change_type(&path, flags); else if (flags & MS_MOVE) -@@ -2139,6 +2209,7 @@ static struct mnt_namespace *dup_mnt_ns( - q = next_mnt(q, new_ns->root); +@@ -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); -@@ -2280,9 +2351,10 @@ SYSCALL_DEFINE2(pivot_root, const char _ - down_write(&namespace_sem); - mutex_lock(&old.dentry->d_inode->i_mutex); - error = -EINVAL; -- 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)) && +@@ -2926,9 +2950,10 @@ SYSCALL_DEFINE2(pivot_root, const char _ + new_mnt = real_mount(new.mnt); + root_mnt = real_mount(root.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)) && + !vx_flags(VXF_STATE_SETUP, 0)) - goto out2; - if (!check_mnt(root.mnt)) - goto out2; -@@ -2415,6 +2487,7 @@ void put_mnt_ns(struct mnt_namespace *ns - br_write_unlock(vfsmount_lock); - up_write(&namespace_sem); - release_mounts(&umount_list); + goto out4; + if (!check_mnt(root_mnt) || !check_mnt(new_mnt)) + goto out4; +@@ -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); } - EXPORT_SYMBOL(put_mnt_ns); -diff -NurpP --minimal linux-2.6.36.2/fs/nfs/client.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/nfs/client.c ---- linux-2.6.36.2/fs/nfs/client.c 2010-10-21 13:07:50.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/nfs/client.c 2010-10-21 13:09:36.000000000 +0200 -@@ -740,6 +740,9 @@ static int nfs_init_server_rpcclient(str + +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; @@ -5742,8 +4975,8 @@ diff -NurpP --minimal linux-2.6.36.2/fs/nfs/client.c linux-2.6.36.2-vs2.3.0.36.3 + server->client->cl_tag = 1; return 0; } - -@@ -911,6 +914,10 @@ static void nfs_server_set_fsinfo(struct + EXPORT_SYMBOL_GPL(nfs_init_server_rpcclient); +@@ -871,6 +874,10 @@ static void nfs_server_set_fsinfo(struct server->acdirmin = server->acdirmax = 0; } @@ -5753,183 +4986,157 @@ diff -NurpP --minimal linux-2.6.36.2/fs/nfs/client.c linux-2.6.36.2-vs2.3.0.36.3 + server->maxfilesize = fsinfo->maxfilesize; - /* We're airborne Set socket buffersize */ -diff -NurpP --minimal linux-2.6.36.2/fs/nfs/dir.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/nfs/dir.c ---- linux-2.6.36.2/fs/nfs/dir.c 2010-10-21 13:07:50.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/nfs/dir.c 2010-10-21 13:09:36.000000000 +0200 -@@ -33,6 +33,7 @@ - #include - #include + server->time_delta = fsinfo->time_delta; +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 +#include - #include "nfs4_fs.h" #include "delegation.h" -@@ -986,6 +987,7 @@ static struct dentry *nfs_lookup(struct - if (IS_ERR(res)) - goto out_unblock_sillyrename; + #include "iostat.h" +@@ -1392,6 +1393,7 @@ struct dentry *nfs_lookup(struct inode * + /* Success: notify readdir to use READDIRPLUS */ + nfs_advise_use_readdirplus(dir); + dx_propagate_tag(nd, inode); no_entry: res = d_materialise_unique(dentry, inode); if (res != NULL) { -diff -NurpP --minimal linux-2.6.36.2/fs/nfs/inode.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/nfs/inode.c ---- linux-2.6.36.2/fs/nfs/inode.c 2010-10-21 13:07:50.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/nfs/inode.c 2010-10-21 13:09:36.000000000 +0200 -@@ -37,6 +37,7 @@ - #include - #include +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 -@@ -267,6 +268,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) */ -@@ -315,8 +318,8 @@ nfs_fhget(struct super_block *sb, struct - nfsi->change_attr = 0; +@@ -412,8 +415,8 @@ nfs_fhget(struct super_block *sb, struct + inode->i_version = 0; inode->i_size = 0; - inode->i_nlink = 0; -- inode->i_uid = -2; -- inode->i_gid = -2; -+ uid = -2; -+ gid = -2; + clear_nlink(inode); +- 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)); - -@@ -353,13 +356,13 @@ nfs_fhget(struct super_block *sb, struct + nfsi->write_io = 0; +@@ -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_INO_INVALID_ACCESS - | NFS_INO_INVALID_ACL; + 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_INO_INVALID_ACCESS -@@ -372,6 +375,11 @@ nfs_fhget(struct super_block *sb, struct + nfs_set_cache_invalid(inode, NFS_INO_INVALID_ATTR); + if (fattr->valid & NFS_ATTR_FATTR_BLOCKS_USED) +@@ -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; -@@ -488,6 +496,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); - } -@@ -923,6 +933,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; - /* Has the inode gone and changed behind our back? */ -@@ -946,13 +959,18 @@ static int nfs_check_inode_attributes(st + if (nfs_have_delegated_attributes(inode)) + 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) -@@ -1187,6 +1205,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 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, -@@ -1289,6 +1310,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 = 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 = 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)); -@@ -1310,9 +1334,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 -@@ -1321,9 +1345,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 -@@ -1331,6 +1355,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 = uid; -+ inode->i_gid = gid; -+ inode->i_tag = 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-2.6.36.2/fs/nfs/nfs3xdr.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/nfs/nfs3xdr.c ---- linux-2.6.36.2/fs/nfs/nfs3xdr.c 2010-10-21 13:07:50.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/nfs/nfs3xdr.c 2010-10-21 13:09:36.000000000 +0200 +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 @@ -5938,148 +5145,184 @@ diff -NurpP --minimal linux-2.6.36.2/fs/nfs/nfs3xdr.c linux-2.6.36.2-vs2.3.0.36. #include "internal.h" #define NFSDBG_FACILITY NFSDBG_XDR -@@ -175,7 +176,7 @@ xdr_decode_fattr(__be32 *p, struct nfs_f - } - - static inline __be32 * --xdr_encode_sattr(__be32 *p, struct iattr *attr) -+xdr_encode_sattr(__be32 *p, struct iattr *attr, int tag) +@@ -558,7 +559,8 @@ static __be32 *xdr_decode_nfstime3(__be3 + * set_mtime mtime; + * }; + */ +-static void encode_sattr3(struct xdr_stream *xdr, const struct iattr *attr) ++static void encode_sattr3(struct xdr_stream *xdr, ++ const struct iattr *attr, int tag) { - if (attr->ia_valid & ATTR_MODE) { - *p++ = xdr_one; -@@ -183,15 +184,17 @@ xdr_encode_sattr(__be32 *p, struct iattr - } else { + u32 nbytes; + __be32 *p; +@@ -590,15 +592,19 @@ static void encode_sattr3(struct xdr_str + } else *p++ = xdr_zero; - } + - if (attr->ia_valid & ATTR_UID) { + if (attr->ia_valid & ATTR_UID || + (tag && (attr->ia_valid & ATTR_TAG))) { *p++ = xdr_one; -- *p++ = htonl(attr->ia_uid); -+ *p++ = htonl(TAGINO_UID(tag, attr->ia_uid, attr->ia_tag)); - } else { +- *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; - } + - if (attr->ia_valid & ATTR_GID) { + if (attr->ia_valid & ATTR_GID || + (tag && (attr->ia_valid & ATTR_TAG))) { *p++ = xdr_one; -- *p++ = htonl(attr->ia_gid); -+ *p++ = htonl(TAGINO_GID(tag, attr->ia_gid, attr->ia_tag)); - } else { +- *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; - } -@@ -278,7 +281,8 @@ static int - nfs3_xdr_sattrargs(struct rpc_rqst *req, __be32 *p, struct nfs3_sattrargs *args) + +@@ -887,7 +893,7 @@ static void nfs3_xdr_enc_setattr3args(st + const struct nfs3_sattrargs *args) { - p = xdr_encode_fhandle(p, args->fh); -- p = xdr_encode_sattr(p, args->sattr); -+ p = xdr_encode_sattr(p, args->sattr, -+ req->rq_task->tk_client->cl_tag); - *p++ = htonl(args->guard); - if (args->guard) - p = xdr_encode_time3(p, &args->guardtime); -@@ -383,7 +387,8 @@ nfs3_xdr_createargs(struct rpc_rqst *req - *p++ = args->verifier[0]; - *p++ = args->verifier[1]; - } else -- p = xdr_encode_sattr(p, args->sattr); -+ p = xdr_encode_sattr(p, args->sattr, -+ req->rq_task->tk_client->cl_tag); + encode_nfs_fh3(xdr, args->fh); +- encode_sattr3(xdr, args->sattr); ++ encode_sattr3(xdr, args->sattr, req->rq_task->tk_client->cl_tag); + encode_sattrguard3(xdr, args); + } - req->rq_slen = xdr_adjust_iovec(req->rq_svec, p); - return 0; -@@ -397,7 +402,8 @@ nfs3_xdr_mkdirargs(struct rpc_rqst *req, +@@ -1037,13 +1043,13 @@ static void nfs3_xdr_enc_write3args(stru + * }; + */ + static void encode_createhow3(struct xdr_stream *xdr, +- const struct nfs3_createargs *args) ++ const struct nfs3_createargs *args, int tag) { - p = xdr_encode_fhandle(p, args->fh); - p = xdr_encode_array(p, args->name, args->len); -- p = xdr_encode_sattr(p, args->sattr); -+ p = xdr_encode_sattr(p, args->sattr, -+ req->rq_task->tk_client->cl_tag); - req->rq_slen = xdr_adjust_iovec(req->rq_svec, p); - return 0; + encode_uint32(xdr, args->createmode); + switch (args->createmode) { + case NFS3_CREATE_UNCHECKED: + case NFS3_CREATE_GUARDED: +- encode_sattr3(xdr, args->sattr); ++ encode_sattr3(xdr, args->sattr, tag); + break; + case NFS3_CREATE_EXCLUSIVE: + encode_createverf3(xdr, args->verifier); +@@ -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); +- encode_createhow3(xdr, args); ++ encode_createhow3(xdr, args, req->rq_task->tk_client->cl_tag); } -@@ -410,7 +416,8 @@ nfs3_xdr_symlinkargs(struct rpc_rqst *re + + /* +@@ -1074,7 +1080,7 @@ static void nfs3_xdr_enc_mkdir3args(stru + const struct nfs3_mkdirargs *args) { - p = xdr_encode_fhandle(p, args->fromfh); - p = xdr_encode_array(p, args->fromname, args->fromlen); -- p = xdr_encode_sattr(p, args->sattr); -+ p = xdr_encode_sattr(p, args->sattr, -+ req->rq_task->tk_client->cl_tag); - *p++ = htonl(args->pathlen); - req->rq_slen = xdr_adjust_iovec(req->rq_svec, p); - -@@ -428,7 +435,8 @@ nfs3_xdr_mknodargs(struct rpc_rqst *req, - p = xdr_encode_fhandle(p, args->fh); - p = xdr_encode_array(p, args->name, args->len); - *p++ = htonl(args->type); -- p = xdr_encode_sattr(p, args->sattr); -+ p = xdr_encode_sattr(p, args->sattr, -+ req->rq_task->tk_client->cl_tag); - if (args->type == NF3CHR || args->type == NF3BLK) { - *p++ = htonl(MAJOR(args->rdev)); - *p++ = htonl(MINOR(args->rdev)); -diff -NurpP --minimal linux-2.6.36.2/fs/nfs/nfsroot.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/nfs/nfsroot.c ---- linux-2.6.36.2/fs/nfs/nfsroot.c 2010-08-02 16:52:50.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/nfs/nfsroot.c 2010-10-21 13:09:36.000000000 +0200 -@@ -122,12 +122,12 @@ static int mount_port __initdata = 0; / - enum { - /* Options that take integer arguments */ - Opt_port, Opt_rsize, Opt_wsize, Opt_timeo, Opt_retrans, Opt_acregmin, -- Opt_acregmax, Opt_acdirmin, Opt_acdirmax, -+ Opt_acregmax, Opt_acdirmin, Opt_acdirmax, Opt_tagid, - /* Options that take no arguments */ - Opt_soft, Opt_hard, Opt_intr, - Opt_nointr, Opt_posix, Opt_noposix, Opt_cto, Opt_nocto, Opt_ac, - Opt_noac, Opt_lock, Opt_nolock, Opt_v2, Opt_v3, Opt_udp, Opt_tcp, -- Opt_acl, Opt_noacl, -+ Opt_acl, Opt_noacl, Opt_tag, Opt_notag, - /* Error token */ - Opt_err - }; -@@ -164,6 +164,9 @@ static const match_table_t tokens __init - {Opt_tcp, "tcp"}, - {Opt_acl, "acl"}, - {Opt_noacl, "noacl"}, -+ {Opt_tag, "tag"}, -+ {Opt_notag, "notag"}, -+ {Opt_tagid, "tagid=%u"}, - {Opt_err, NULL} - - }; -@@ -275,6 +278,20 @@ static int __init root_nfs_parse(char *n - case Opt_noacl: - nfs_data.flags |= NFS_MOUNT_NOACL; - break; -+#ifndef CONFIG_TAGGING_NONE -+ case Opt_tag: -+ nfs_data.flags |= NFS_MOUNT_TAGGED; -+ break; -+ case Opt_notag: -+ nfs_data.flags &= ~NFS_MOUNT_TAGGED; -+ break; -+#endif -+#ifdef CONFIG_PROPAGATE -+ case Opt_tagid: -+ /* use args[0] */ -+ nfs_data.flags |= NFS_MOUNT_TAGGED; -+ break; -+#endif - default: - printk(KERN_WARNING "Root-NFS: unknown " - "option: %s\n", p); -diff -NurpP --minimal linux-2.6.36.2/fs/nfs/super.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/nfs/super.c ---- linux-2.6.36.2/fs/nfs/super.c 2010-10-21 13:07:50.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/nfs/super.c 2010-10-21 13:09:36.000000000 +0200 -@@ -54,6 +54,7 @@ - #include - #include + encode_diropargs3(xdr, args->fh, args->name, args->len); +- encode_sattr3(xdr, args->sattr); ++ encode_sattr3(xdr, args->sattr, req->rq_task->tk_client->cl_tag); + } + + /* +@@ -1091,9 +1097,9 @@ static void nfs3_xdr_enc_mkdir3args(stru + * }; + */ + static void encode_symlinkdata3(struct xdr_stream *xdr, +- const struct nfs3_symlinkargs *args) ++ const struct nfs3_symlinkargs *args, int tag) + { +- encode_sattr3(xdr, args->sattr); ++ encode_sattr3(xdr, args->sattr, tag); + encode_nfspath3(xdr, args->pages, args->pathlen); + } + +@@ -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); +- encode_symlinkdata3(xdr, args); ++ encode_symlinkdata3(xdr, args, req->rq_task->tk_client->cl_tag); + } + + /* +@@ -1130,24 +1136,24 @@ static void nfs3_xdr_enc_symlink3args(st + * }; + */ + static void encode_devicedata3(struct xdr_stream *xdr, +- const struct nfs3_mknodargs *args) ++ const struct nfs3_mknodargs *args, int tag) + { +- encode_sattr3(xdr, args->sattr); ++ encode_sattr3(xdr, args->sattr, tag); + encode_specdata3(xdr, args->rdev); + } + + static void encode_mknoddata3(struct xdr_stream *xdr, +- const struct nfs3_mknodargs *args) ++ const struct nfs3_mknodargs *args, int tag) + { + encode_ftype3(xdr, args->type); + switch (args->type) { + case NF3CHR: + case NF3BLK: +- encode_devicedata3(xdr, args); ++ encode_devicedata3(xdr, args, tag); + break; + case NF3SOCK: + case NF3FIFO: +- encode_sattr3(xdr, args->sattr); ++ encode_sattr3(xdr, args->sattr, tag); + break; + case NF3REG: + case NF3DIR: +@@ -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); +- encode_mknoddata3(xdr, args); ++ encode_mknoddata3(xdr, args, req->rq_task->tk_client->cl_tag); + } + + /* +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 -@@ -617,6 +618,7 @@ static void nfs_show_mount_options(struc + +@@ -103,6 +104,7 @@ enum { + Opt_mountport, + Opt_mountvers, + Opt_minorversion, ++ Opt_tagid, + + /* Mount options that take string arguments */ + Opt_nfsvers, +@@ -115,6 +117,9 @@ enum { + /* Special mount options */ + Opt_userspace, Opt_deprecated, Opt_sloppy, + ++ /* Linux-VServer tagging options */ ++ Opt_tag, Opt_notag, ++ + Opt_err + }; + +@@ -184,6 +189,10 @@ static const match_table_t nfs_mount_opt + { Opt_fscache_uniq, "fsc=%s" }, + { Opt_local_lock, "local_lock=%s" }, + ++ { Opt_tag, "tag" }, ++ { Opt_notag, "notag" }, ++ { Opt_tagid, "tagid=%u" }, ++ + /* The following needs to be listed after all other options */ + { Opt_nfsvers, "v%s" }, + +@@ -638,6 +647,7 @@ static void nfs_show_mount_options(struc { NFS_MOUNT_NORDIRPLUS, ",nordirplus", "" }, { NFS_MOUNT_UNSHARED, ",nosharecache", "" }, { NFS_MOUNT_NORESVPORT, ",noresvport", "" }, @@ -6087,9 +5330,37 @@ diff -NurpP --minimal linux-2.6.36.2/fs/nfs/super.c linux-2.6.36.2-vs2.3.0.36.38 { 0, NULL, NULL } }; const struct proc_nfs_info *nfs_infop; -diff -NurpP --minimal linux-2.6.36.2/fs/nfsd/auth.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/nfsd/auth.c ---- linux-2.6.36.2/fs/nfsd/auth.c 2010-02-25 11:52:05.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/nfsd/auth.c 2010-10-21 13:09:36.000000000 +0200 +@@ -1320,6 +1330,14 @@ static int nfs_parse_mount_options(char + case Opt_nomigration: + mnt->options &= NFS_OPTION_MIGRATION; + break; ++#ifndef CONFIG_TAGGING_NONE ++ case Opt_tag: ++ mnt->flags |= NFS_MOUNT_TAGGED; ++ break; ++ case Opt_notag: ++ mnt->flags &= ~NFS_MOUNT_TAGGED; ++ break; ++#endif + + /* + * options that take numeric values +@@ -1406,6 +1424,12 @@ static int nfs_parse_mount_options(char + goto out_invalid_value; + mnt->minorversion = option; + break; ++#ifdef CONFIG_PROPAGATE ++ case Opt_tagid: ++ /* use args[0] */ ++ nfs_data.flags |= NFS_MOUNT_TAGGED; ++ break; ++#endif + + /* + * options that take text values +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 */ @@ -6098,174 +5369,178 @@ diff -NurpP --minimal linux-2.6.36.2/fs/nfsd/auth.c linux-2.6.36.2-vs2.3.0.36.38 #include "nfsd.h" #include "auth.h" -@@ -36,6 +37,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-2.6.36.2/fs/nfsd/nfs3xdr.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/nfsd/nfs3xdr.c ---- linux-2.6.36.2/fs/nfsd/nfs3xdr.c 2010-02-25 11:52:05.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/nfsd/nfs3xdr.c 2010-10-21 13:09:36.000000000 +0200 -@@ -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-2.6.36.2/fs/nfsd/nfs4xdr.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/nfsd/nfs4xdr.c ---- linux-2.6.36.2/fs/nfsd/nfs4xdr.c 2010-10-21 13:07:50.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/nfsd/nfs4xdr.c 2010-10-21 13:09:36.000000000 +0200 -@@ -47,6 +47,7 @@ - #include - #include +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 +#include - #include "xdr4.h" - #include "vfs.h" -@@ -2057,14 +2058,18 @@ out_acl: - WRITE32(stat.nlink); + #include "idmap.h" + #include "acl.h" +@@ -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-2.6.36.2/fs/nfsd/nfsxdr.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/nfsd/nfsxdr.c ---- linux-2.6.36.2/fs/nfsd/nfsxdr.c 2010-02-25 11:52:05.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/nfsd/nfsxdr.c 2010-10-21 13:09:36.000000000 +0200 -@@ -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-2.6.36.2/fs/ocfs2/dlmglue.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/ocfs2/dlmglue.c ---- linux-2.6.36.2/fs/ocfs2/dlmglue.c 2010-10-21 13:07:50.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/ocfs2/dlmglue.c 2010-10-21 13:09:36.000000000 +0200 -@@ -2114,6 +2114,7 @@ static void __ocfs2_stuff_meta_lvb(struc +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 = -@@ -2168,6 +2169,7 @@ static void ocfs2_refresh_inode_from_lvb +@@ -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); - inode->i_nlink = be16_to_cpu(lvb->lvb_inlink); + set_nlink(inode, be16_to_cpu(lvb->lvb_inlink)); ocfs2_unpack_timespec(&inode->i_atime, -diff -NurpP --minimal linux-2.6.36.2/fs/ocfs2/dlmglue.h linux-2.6.36.2-vs2.3.0.36.38.2/fs/ocfs2/dlmglue.h ---- linux-2.6.36.2/fs/ocfs2/dlmglue.h 2010-10-21 13:07:50.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/ocfs2/dlmglue.h 2010-10-21 13:09:36.000000000 +0200 +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; @@ -6276,29 +5551,21 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ocfs2/dlmglue.h linux-2.6.36.2-vs2.3.0.3 }; #define OCFS2_QINFO_LVB_VERSION 1 -diff -NurpP --minimal linux-2.6.36.2/fs/ocfs2/file.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/ocfs2/file.c ---- linux-2.6.36.2/fs/ocfs2/file.c 2010-10-21 13:07:50.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/ocfs2/file.c 2010-10-21 13:09:36.000000000 +0200 -@@ -1138,13 +1138,15 @@ int ocfs2_setattr(struct dentry *dentry, - mlog(0, "uid change: %d\n", attr->ia_uid); - if (attr->ia_valid & ATTR_GID) - mlog(0, "gid change: %d\n", attr->ia_gid); -+ if (attr->ia_valid & ATTR_TAG) -+ mlog(0, "tag change: %d\n", attr->ia_tag); - if (attr->ia_valid & ATTR_SIZE) - mlog(0, "size change...\n"); - if (attr->ia_valid & (ATTR_ATIME | ATTR_MTIME | ATTR_CTIME)) - mlog(0, "time change...\n"); +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 \ - | ATTR_GID | ATTR_UID | ATTR_MODE) + | ATTR_GID | ATTR_UID | ATTR_TAG | ATTR_MODE) - if (!(attr->ia_valid & OCFS2_VALID_ATTRS)) { - mlog(0, "can't handle attrs: 0x%x\n", attr->ia_valid); + if (!(attr->ia_valid & OCFS2_VALID_ATTRS)) return 0; -diff -NurpP --minimal linux-2.6.36.2/fs/ocfs2/inode.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/ocfs2/inode.c ---- linux-2.6.36.2/fs/ocfs2/inode.c 2010-10-21 13:07:50.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/ocfs2/inode.c 2010-10-21 13:09:36.000000000 +0200 + +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 @@ -6307,7 +5574,7 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ocfs2/inode.c linux-2.6.36.2-vs2.3.0.36. #include -@@ -78,11 +79,13 @@ void ocfs2_set_inode_flags(struct inode +@@ -78,11 +79,13 @@ void ocfs2_set_inode_flags(struct inode { unsigned int flags = OCFS2_I(inode)->ip_attr; @@ -6322,7 +5589,7 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ocfs2/inode.c linux-2.6.36.2-vs2.3.0.36. if (flags & OCFS2_SYNC_FL) inode->i_flags |= S_SYNC; -@@ -92,25 +95,44 @@ void ocfs2_set_inode_flags(struct inode +@@ -92,25 +95,44 @@ void ocfs2_set_inode_flags(struct inode inode->i_flags |= S_NOATIME; if (flags & OCFS2_DIRSYNC_FL) inode->i_flags |= S_DIRSYNC; @@ -6371,34 +5638,34 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ocfs2/inode.c linux-2.6.36.2-vs2.3.0.36. } struct inode *ocfs2_ilookup(struct super_block *sb, u64 blkno) -@@ -245,6 +267,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; + uid_t uid; + gid_t gid; - mlog_entry("(0x%p, size:%llu)\n", inode, - (unsigned long long)le64_to_cpu(fe->i_size)); -@@ -276,8 +300,12 @@ void ocfs2_populate_inode(struct inode * + sb = inode->i_sb; + osb = OCFS2_SB(sb); +@@ -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-2.6.36.2/fs/ocfs2/inode.h linux-2.6.36.2-vs2.3.0.36.38.2/fs/ocfs2/inode.h ---- linux-2.6.36.2/fs/ocfs2/inode.h 2010-10-21 13:07:50.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/ocfs2/inode.h 2010-10-21 13:09:36.000000000 +0200 -@@ -153,6 +153,7 @@ struct buffer_head *ocfs2_bread(struct i + if (S_ISLNK(inode->i_mode) && !fe->i_clusters) { +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); @@ -6406,10 +5673,10 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ocfs2/inode.h linux-2.6.36.2-vs2.3.0.36. static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode) { -diff -NurpP --minimal linux-2.6.36.2/fs/ocfs2/ioctl.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/ocfs2/ioctl.c ---- linux-2.6.36.2/fs/ocfs2/ioctl.c 2010-02-25 11:52:06.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/ocfs2/ioctl.c 2010-10-21 13:09:36.000000000 +0200 -@@ -43,7 +43,41 @@ static int ocfs2_get_inode_attr(struct i +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; } @@ -6452,9 +5719,9 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ocfs2/ioctl.c linux-2.6.36.2-vs2.3.0.36. unsigned mask) { struct ocfs2_inode_info *ocfs2_inode = OCFS2_I(inode); -@@ -68,6 +102,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."); @@ -6464,51 +5731,64 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ocfs2/ioctl.c linux-2.6.36.2-vs2.3.0.36. handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS); if (IS_ERR(handle)) { status = PTR_ERR(handle); -@@ -109,6 +148,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-2.6.36.2/fs/ocfs2/namei.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/ocfs2/namei.c ---- linux-2.6.36.2/fs/ocfs2/namei.c 2010-10-21 13:07:50.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/ocfs2/namei.c 2010-10-21 13:09:36.000000000 +0200 + 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 #include +#include - #define MLOG_MASK_PREFIX ML_NAMEI #include -@@ -486,6 +487,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; -@@ -523,8 +525,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-2.6.36.2/fs/ocfs2/ocfs2_fs.h linux-2.6.36.2-vs2.3.0.36.38.2/fs/ocfs2/ocfs2_fs.h ---- linux-2.6.36.2/fs/ocfs2/ocfs2_fs.h 2010-10-21 13:07:51.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/ocfs2/ocfs2_fs.h 2010-10-21 14:00:41.000000000 +0200 -@@ -258,6 +258,11 @@ +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.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 */ @@ -6520,30 +5800,19 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ocfs2/ocfs2_fs.h linux-2.6.36.2-vs2.3.0. #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-2.6.36.2/fs/ocfs2/ocfs2.h linux-2.6.36.2-vs2.3.0.36.38.2/fs/ocfs2/ocfs2.h ---- linux-2.6.36.2/fs/ocfs2/ocfs2.h 2010-08-02 16:52:51.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/ocfs2/ocfs2.h 2010-10-21 13:09:36.000000000 +0200 -@@ -256,6 +256,7 @@ enum ocfs2_mount_options - control lists */ - OCFS2_MOUNT_USRQUOTA = 1 << 10, /* We support user quotas */ - OCFS2_MOUNT_GRPQUOTA = 1 << 11, /* We support group quotas */ -+ OCFS2_MOUNT_TAGGED = 1 << 12, /* use tagging */ - }; - - #define OCFS2_OSB_SOFT_RO 0x0001 -diff -NurpP --minimal linux-2.6.36.2/fs/ocfs2/super.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/ocfs2/super.c ---- linux-2.6.36.2/fs/ocfs2/super.c 2010-10-21 13:07:51.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/ocfs2/super.c 2010-10-21 13:09:36.000000000 +0200 -@@ -179,6 +179,7 @@ enum { - Opt_grpquota, +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, Opt_dir_resv_level, + Opt_tag, Opt_notag, Opt_tagid, Opt_err, }; -@@ -207,6 +208,9 @@ static const match_table_t tokens = { - {Opt_grpquota, "grpquota"}, +@@ -216,6 +217,9 @@ static const match_table_t tokens = { + {Opt_coherency_full, "coherency=full"}, {Opt_resv_level, "resv_level=%u"}, {Opt_dir_resv_level, "dir_resv_level=%u"}, + {Opt_tag, "tag"}, @@ -6552,7 +5821,7 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ocfs2/super.c linux-2.6.36.2-vs2.3.0.36. {Opt_err, NULL} }; -@@ -617,6 +621,13 @@ static int ocfs2_remount(struct super_bl +@@ -666,6 +670,13 @@ static int ocfs2_remount(struct super_bl goto out; } @@ -6563,10 +5832,10 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ocfs2/super.c linux-2.6.36.2-vs2.3.0.36. + goto out; + } + - if ((osb->s_mount_opt & OCFS2_MOUNT_HB_LOCAL) != - (parsed_options.mount_opt & OCFS2_MOUNT_HB_LOCAL)) { - ret = -EINVAL; -@@ -1153,6 +1164,9 @@ static int ocfs2_fill_super(struct super + /* We're going to/from readonly mode. */ + if ((*flags & MS_RDONLY) != (sb->s_flags & MS_RDONLY)) { + /* Disable quota accounting before remounting RO */ +@@ -1185,6 +1196,9 @@ static int ocfs2_fill_super(struct super ocfs2_complete_mount_recovery(osb); @@ -6576,7 +5845,7 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ocfs2/super.c linux-2.6.36.2-vs2.3.0.36. if (ocfs2_mount_local(osb)) snprintf(nodestr, sizeof(nodestr), "local"); else -@@ -1468,6 +1482,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; @@ -6597,13 +5866,13 @@ diff -NurpP --minimal linux-2.6.36.2/fs/ocfs2/super.c linux-2.6.36.2-vs2.3.0.36. default: mlog(ML_ERROR, "Unrecognized mount option \"%s\" " -diff -NurpP --minimal linux-2.6.36.2/fs/open.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/open.c ---- linux-2.6.36.2/fs/open.c 2010-10-21 13:07:51.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/open.c 2010-10-21 13:55:41.000000000 +0200 -@@ -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 @@ -6612,34 +5881,51 @@ diff -NurpP --minimal linux-2.6.36.2/fs/open.c linux-2.6.36.2-vs2.3.0.36.38.2/fs #include "internal.h" -@@ -481,6 +486,12 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons - error = user_path_at(dfd, filename, LOOKUP_FOLLOW, &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; - error = mnt_want_write(path.mnt); -@@ -518,11 +529,11 @@ static int chown_common(struct path *pat - newattrs.ia_valid = ATTR_CTIME; - if (user != (uid_t) -1) { + /* For directories it's -EISDIR, for other non-regulars - -EINVAL */ +@@ -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) ++ path_put(&path); ++ } ++#endif + if (!error) { + error = chmod_common(&path, mode); + path_put(&path); +@@ -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 = user; -+ newattrs.ia_uid = dx_map_uid(user); +- newattrs.ia_uid = uid; ++ 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 = group; -+ newattrs.ia_gid = dx_map_gid(group); +- newattrs.ia_gid = gid; ++ newattrs.ia_gid = make_kgid(&init_user_ns, ++ dx_map_gid(group)); } if (!S_ISDIR(inode->i_mode)) newattrs.ia_valid |= -@@ -547,6 +558,10 @@ SYSCALL_DEFINE3(chown, const char __user +@@ -608,6 +627,18 @@ retry: error = mnt_want_write(path.mnt); if (error) goto out_release; @@ -6647,24 +5933,10 @@ diff -NurpP --minimal linux-2.6.36.2/fs/open.c linux-2.6.36.2-vs2.3.0.36.38.2/fs + error = cow_check_and_break(&path); + if (!error) +#endif - error = chown_common(&path, user, group); - mnt_drop_write(path.mnt); - out_release: -@@ -572,6 +587,10 @@ SYSCALL_DEFINE5(fchownat, int, dfd, cons - error = mnt_want_write(path.mnt); - if (error) - goto out_release; +#ifdef CONFIG_VSERVER_COWBL + error = cow_check_and_break(&path); + if (!error) +#endif - error = chown_common(&path, user, group); - mnt_drop_write(path.mnt); - out_release: -@@ -591,6 +610,10 @@ SYSCALL_DEFINE3(lchown, const char __use - error = mnt_want_write(path.mnt); - if (error) - goto out_release; +#ifdef CONFIG_VSERVER_COWBL + error = cow_check_and_break(&path); + if (!error) @@ -6672,27 +5944,19 @@ diff -NurpP --minimal linux-2.6.36.2/fs/open.c linux-2.6.36.2-vs2.3.0.36.38.2/fs error = chown_common(&path, user, group); mnt_drop_write(path.mnt); out_release: -@@ -837,6 +860,7 @@ static void __put_unused_fd(struct files - __FD_CLR(fd, fdt->open_fds); - if (fd < files->next_fd) - files->next_fd = fd; -+ vx_openfd_dec(fd); - } - - void put_unused_fd(unsigned int fd) -diff -NurpP --minimal linux-2.6.36.2/fs/proc/array.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/proc/array.c ---- linux-2.6.36.2/fs/proc/array.c 2010-08-02 16:52:51.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/proc/array.c 2010-10-21 13:09:36.000000000 +0200 -@@ -81,6 +81,8 @@ - #include +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 + #include +#include +#include #include #include -@@ -170,6 +172,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; @@ -6701,17 +5965,19 @@ diff -NurpP --minimal linux-2.6.36.2/fs/proc/array.c linux-2.6.36.2-vs2.3.0.36.3 + tpid = 0; if (pid_alive(p)) { - struct task_struct *tracer = tracehook_tracer_task(p); -@@ -287,7 +292,7 @@ static inline void task_sig(struct seq_f + struct task_struct *tracer = ptrace_parent(p); +@@ -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; -@@ -312,10 +317,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(); @@ -6726,9 +5992,9 @@ diff -NurpP --minimal linux-2.6.36.2/fs/proc/array.c linux-2.6.36.2-vs2.3.0.36.3 + render_cap_t(m, "CapBnd:\t", p->vx_info, &cap_bset); } - static inline void task_context_switch_counts(struct seq_file *m, -@@ -337,6 +343,42 @@ static void task_cpus_allowed(struct seq - seq_printf(m, "\n"); + 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'); } +int proc_pid_nsproxy(struct seq_file *m, struct pid_namespace *ns, @@ -6750,8 +6016,9 @@ diff -NurpP --minimal linux-2.6.36.2/fs/proc/array.c linux-2.6.36.2-vs2.3.0.36.3 + (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; @@ -6762,25 +6029,25 @@ diff -NurpP --minimal linux-2.6.36.2/fs/proc/array.c linux-2.6.36.2-vs2.3.0.36.3 + 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) { -@@ -353,6 +395,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); - #if defined(CONFIG_S390) - task_show_regs(m, task); - #endif -@@ -465,6 +508,17 @@ static int do_task_stat(struct seq_file + task_context_switch_counts(m, task); + return 0; + } +@@ -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)) { @@ -6793,59 +6060,77 @@ diff -NurpP --minimal linux-2.6.36.2/fs/proc/array.c linux-2.6.36.2-vs2.3.0.36.3 + start_time = 0; + } + - seq_printf(m, "%d (%s) %c %d %d %d %d %d %u %lu \ - %lu %lu %lu %lu %lu %ld %ld %ld %ld %d 0 %llu %lu %ld %lu %lu %lu %lu %lu \ - %lu %lu %lu %lu %lu %lu %lu %lu %d %d %u %u %llu %lu %ld\n", -diff -NurpP --minimal linux-2.6.36.2/fs/proc/base.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/proc/base.c ---- linux-2.6.36.2/fs/proc/base.c 2010-12-13 22:08:58.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/proc/base.c 2010-12-13 22:09:27.000000000 +0100 -@@ -83,6 +83,8 @@ - #include - #include + 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.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 - #include "internal.h" - - /* NOTE: -@@ -1041,12 +1043,17 @@ static ssize_t oom_adjust_write(struct f - return -ESRCH; - } - -- if (oom_adjust < task->signal->oom_adj && !capable(CAP_SYS_RESOURCE)) { -+ if (oom_adjust < task->signal->oom_adj && -+ !vx_capable(CAP_SYS_RESOURCE, VXC_OOM_ADJUST)) { - unlock_task_sighand(task, &flags); - put_task_struct(task); - return -EACCES; + #ifdef CONFIG_HARDWALL + #include + #endif +@@ -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 && +- !capable(CAP_SYS_RESOURCE)) { ++ !vx_capable(CAP_SYS_RESOURCE, VXC_OOM_ADJUST)) { + err = -EACCES; + goto err_sighand; } + /* prevent guest processes from circumventing the oom killer */ -+ if (vx_current_xid() && (oom_adjust == OOM_DISABLE)) -+ oom_adjust = OOM_ADJUST_MIN; ++ if (vx_current_xid() && (oom_adj == OOM_DISABLE)) ++ oom_adj = OOM_ADJUST_MIN; + /* - * Warn that /proc/pid/oom_adj is deprecated, see - * Documentation/feature-removal-schedule.txt. -@@ -1179,7 +1186,7 @@ static ssize_t proc_loginuid_write(struc - ssize_t length; - uid_t loginuid; - -- if (!capable(CAP_AUDIT_CONTROL)) -+ if (!vx_capable(CAP_AUDIT_CONTROL, VXC_AUDIT_CONTROL)) - return -EPERM; - - rcu_read_lock(); -@@ -1617,6 +1624,8 @@ static struct inode *proc_pid_make_inode + * /proc/pid/oom_adj is provided for legacy purposes, ask users to use + * /proc/pid/oom_score_adj instead. +@@ -1476,6 +1482,8 @@ struct inode *proc_pid_make_inode(struct inode->i_gid = cred->egid; rcu_read_unlock(); } + /* procfs is xid tagged */ -+ inode->i_tag = (tag_t)vx_task_xid(task); ++ i_tag_write(inode, (vtag_t)vx_task_xid(task)); security_task_to_inode(task, inode); out: -@@ -2167,6 +2176,13 @@ static struct dentry *proc_pident_lookup +@@ -1521,6 +1529,8 @@ int pid_getattr(struct vfsmount *mnt, st + + /* dentry stuff */ + ++// 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 +@@ -1549,6 +1559,19 @@ int pid_revalidate(struct dentry *dentry + task = get_proc_task(inode); + + if (task) { ++ 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); ++ d_drop(dentry); ++ return 0; ++ } + if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) || + task_dumpable(task)) { + rcu_read_lock(); +@@ -2085,6 +2108,13 @@ static struct dentry *proc_pident_lookup if (!task) goto out_no_task; @@ -6859,43 +6144,28 @@ diff -NurpP --minimal linux-2.6.36.2/fs/proc/base.c linux-2.6.36.2-vs2.3.0.36.38 /* * Yes, it does not scale. And it should not. Don't add * new entries into /proc// without very good reasons. -@@ -2574,7 +2590,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); -@@ -2664,6 +2680,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), -@@ -2723,6 +2742,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), - REG("oom_adj", S_IRUGO|S_IWUSR, proc_oom_adjust_operations), ++ 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), -@@ -2739,6 +2760,7 @@ static const struct pid_entry tgid_base_ - #ifdef CONFIG_TASK_IO_ACCOUNTING - INF("io", S_IRUGO, proc_tgid_io_accounting), - #endif -+ ONE("nsproxy", S_IRUGO, proc_pid_nsproxy), - }; - - static int proc_tgid_base_readdir(struct file * filp, -@@ -2930,7 +2952,7 @@ retry: +@@ -2811,7 +2848,7 @@ retry: iter.task = NULL; pid = find_ge_pid(iter.tgid, ns); if (pid) { @@ -6904,35 +6174,28 @@ diff -NurpP --minimal linux-2.6.36.2/fs/proc/base.c linux-2.6.36.2-vs2.3.0.36.38 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 -@@ -2960,7 +2982,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); - } -@@ -2969,7 +2991,7 @@ static int proc_pid_fill_cache(struct fi - int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir) - { - unsigned int nr = filp->f_pos - FIRST_PROCESS_ENTRY; -- struct task_struct *reaper = get_proc_task(filp->f_path.dentry->d_inode); -+ struct task_struct *reaper = get_proc_task_real(filp->f_path.dentry->d_inode); - struct tgid_iter iter; - struct pid_namespace *ns; - -@@ -2989,6 +3011,8 @@ int proc_pid_readdir(struct file * filp, - iter.task; - iter.tgid += 1, iter = next_tgid(ns, iter)) { - filp->f_pos = iter.tgid + TGID_OFFSET; +@@ -2869,8 +2906,10 @@ int proc_pid_readdir(struct file *file, + if (!has_pid_permissions(ns, iter.task, 2)) + continue; + +- 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; -@@ -3137,6 +3161,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)) @@ -6940,10 +6203,10 @@ diff -NurpP --minimal linux-2.6.36.2/fs/proc/base.c linux-2.6.36.2-vs2.3.0.36.38 ns = dentry->d_sb->s_fs_info; rcu_read_lock(); -diff -NurpP --minimal linux-2.6.36.2/fs/proc/generic.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/proc/generic.c ---- linux-2.6.36.2/fs/proc/generic.c 2010-10-21 13:07:51.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/proc/generic.c 2010-10-21 21:43:28.000000000 +0200 -@@ -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 @@ -6951,50 +6214,59 @@ diff -NurpP --minimal linux-2.6.36.2/fs/proc/generic.c linux-2.6.36.2-vs2.3.0.36 #include #include "internal.h" -@@ -424,6 +425,8 @@ 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)) { - unsigned int ino; - -@@ -432,6 +435,8 @@ struct dentry *proc_lookup_de(struct pro + pde_get(de); spin_unlock(&proc_subdir_lock); - error = -EINVAL; - inode = proc_get_inode(dir->i_sb, ino, 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 */ -+ inode->i_tag = 0; - goto out_unlock; ++ i_tag_write(inode, 0); + return NULL; } } -@@ -509,6 +514,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) { -@@ -516,6 +523,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); -@@ -630,6 +638,7 @@ static struct proc_dir_entry *__proc_cre +@@ -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; - atomic_set(&ent->count, 1); - ent->pde_users = 0; + ent->vx_flags = IATTR_PROC_DEFAULT; + atomic_set(&ent->count, 1); spin_lock_init(&ent->pde_unload_lock); - ent->pde_unload_completion = NULL; INIT_LIST_HEAD(&ent->pde_openers); -@@ -653,7 +662,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; @@ -7004,10 +6276,10 @@ diff -NurpP --minimal linux-2.6.36.2/fs/proc/generic.c linux-2.6.36.2-vs2.3.0.36 } else { kfree(ent); ent = NULL; -diff -NurpP --minimal linux-2.6.36.2/fs/proc/inode.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/proc/inode.c ---- linux-2.6.36.2/fs/proc/inode.c 2010-10-21 13:07:51.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/proc/inode.c 2010-10-21 13:09:36.000000000 +0200 -@@ -428,6 +428,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; } @@ -7016,28 +6288,49 @@ diff -NurpP --minimal linux-2.6.36.2/fs/proc/inode.c linux-2.6.36.2-vs2.3.0.36.3 if (de->size) inode->i_size = de->size; if (de->nlink) -diff -NurpP --minimal linux-2.6.36.2/fs/proc/internal.h linux-2.6.36.2-vs2.3.0.36.38.2/fs/proc/internal.h ---- linux-2.6.36.2/fs/proc/internal.h 2010-02-25 11:52:06.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/proc/internal.h 2010-10-21 13:09:36.000000000 +0200 -@@ -10,6 +10,7 @@ - */ - - #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 - extern struct proc_dir_entry proc_root; - #ifdef CONFIG_PROC_SYSCTL -@@ -51,6 +52,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_maps_operations; -@@ -68,11 +72,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; } @@ -7052,12 +6345,21 @@ diff -NurpP --minimal linux-2.6.36.2/fs/proc/internal.h linux-2.6.36.2-vs2.3.0.3 + 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-2.6.36.2/fs/proc/loadavg.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/proc/loadavg.c ---- linux-2.6.36.2/fs/proc/loadavg.c 2009-09-10 15:26:23.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/proc/loadavg.c 2010-10-21 13:09:36.000000000 +0200 + 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) @@ -7087,26 +6389,26 @@ diff -NurpP --minimal linux-2.6.36.2/fs/proc/loadavg.c linux-2.6.36.2-vs2.3.0.36 task_active_pid_ns(current)->last_pid); return 0; } -diff -NurpP --minimal linux-2.6.36.2/fs/proc/meminfo.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/proc/meminfo.c ---- linux-2.6.36.2/fs/proc/meminfo.c 2009-12-03 20:02:53.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/proc/meminfo.c 2010-10-21 13:09:36.000000000 +0200 -@@ -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-2.6.36.2/fs/proc/root.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/proc/root.c ---- linux-2.6.36.2/fs/proc/root.c 2010-08-02 16:52:51.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/proc/root.c 2010-10-21 13:09:36.000000000 +0200 -@@ -18,9 +18,14 @@ - #include +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 +#include #include "internal.h" @@ -7118,47 +6420,118 @@ diff -NurpP --minimal linux-2.6.36.2/fs/proc/root.c linux-2.6.36.2-vs2.3.0.36.38 static int proc_test_super(struct super_block *sb, void *data) { return sb->s_fs_info == data; -@@ -135,6 +140,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 -@@ -202,6 +208,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, + .vx_flags = IATTR_ADMIN | IATTR_WATCH, + .name = "/proc", }; - int pid_ns_prepare_proc(struct pid_namespace *ns) -diff -NurpP --minimal linux-2.6.36.2/fs/proc/uptime.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/proc/uptime.c ---- linux-2.6.36.2/fs/proc/uptime.c 2009-12-03 20:02:53.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/proc/uptime.c 2010-10-21 13:09:36.000000000 +0200 -@@ -4,22 +4,22 @@ - #include +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 + + #ifndef arch_irq_stat_cpu + #define arch_irq_stat_cpu(cpu) 0 +@@ -87,14 +89,26 @@ static int show_stat(struct seq_file *p, + u64 sum_softirq = 0; + unsigned int per_softirq_sums[NR_SOFTIRQS] = {0}; + struct timespec boottime; ++ cpumask_var_t cpus_allowed; ++ bool virt_cpu = vx_flags(VXF_VIRT_CPU, 0); + + user = nice = system = idle = iowait = + irq = softirq = steal = 0; + guest = guest_nice = 0; + getboottime(&boottime); ++ ++ if (vx_flags(VXF_VIRT_UPTIME, 0)) ++ vx_vsi_boottime(&boottime); ++ ++ if (virt_cpu) ++ cpuset_cpus_allowed(current, cpus_allowed); ++ + jif = boottime.tv_sec; + + for_each_possible_cpu(i) { ++ if (virt_cpu && !cpumask_test_cpu(i, cpus_allowed)) ++ continue; ++ + user += kcpustat_cpu(i).cpustat[CPUTIME_USER]; + nice += kcpustat_cpu(i).cpustat[CPUTIME_NICE]; + system += kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM]; +@@ -131,6 +145,9 @@ static int show_stat(struct seq_file *p, + seq_putc(p, '\n'); + + for_each_online_cpu(i) { ++ if (virt_cpu && !cpumask_test_cpu(i, cpus_allowed)) ++ continue; ++ + /* 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.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 + #include static int uptime_proc_show(struct seq_file *m, void *v) - { - struct timespec uptime; - struct timespec idle; -- int i; -- cputime_t idletime = cputime_zero; -- -- for_each_possible_cpu(i) -- idletime = cputime64_add(idletime, kstat_cpu(i).cpustat.idle); -+ cputime_t idletime = cputime_add(init_task.utime, init_task.stime); - - do_posix_clock_monotonic_gettime(&uptime); - monotonic_to_bootbased(&uptime); - cputime_to_timespec(idletime, &idle); +@@ -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; + + if (vx_flags(VXF_VIRT_UPTIME, 0)) + vx_vsi_uptime(&uptime, &idle); @@ -7166,57 +6539,176 @@ diff -NurpP --minimal linux-2.6.36.2/fs/proc/uptime.c linux-2.6.36.2-vs2.3.0.36. seq_printf(m, "%lu.%02lu %lu.%02lu\n", (unsigned long) uptime.tv_sec, (uptime.tv_nsec / (NSEC_PER_SEC / 100)), -diff -NurpP --minimal linux-2.6.36.2/fs/quota/dquot.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/quota/dquot.c ---- linux-2.6.36.2/fs/quota/dquot.c 2010-10-21 13:07:51.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/quota/dquot.c 2010-10-21 13:09:36.000000000 +0200 -@@ -1538,6 +1538,9 @@ int __dquot_alloc_space(struct inode *in +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" }, + { MS_MANDLOCK, ",mand" }, ++ { MS_TAGGED, ",tag" }, ++ { MS_NOTAGCHECK, ",notagcheck" }, + { 0, NULL } + }; + const struct proc_fs_info *fs_infop; +@@ -80,6 +82,38 @@ static inline void mangle(struct seq_fil + seq_escape(m, s, " \t\n\\"); + } + ++#ifdef CONFIG_VSERVER_EXTRA_MNT_CHECK ++ ++static int mnt_is_reachable(struct vfsmount *vfsmnt) ++{ ++ struct path root; ++ struct dentry *point; ++ struct mount *mnt = real_mount(vfsmnt); ++ struct mount *root_mnt; ++ int ret; ++ ++ if (mnt == mnt->mnt_ns->root) ++ return 1; ++ ++ rcu_read_lock(); ++ root = current->fs->root; ++ root_mnt = real_mount(root.mnt); ++ point = root.dentry; ++ ++ while ((mnt != mnt->mnt_parent) && (mnt != root_mnt)) { ++ point = mnt->mnt_mountpoint; ++ mnt = mnt->mnt_parent; ++ } ++ rcu_read_unlock(); ++ ++ ret = (mnt == root_mnt) && is_subdir(point, root.dentry); ++ return ret; ++} ++ ++#else ++#define mnt_is_reachable(v) (1) ++#endif ++ + static void show_type(struct seq_file *m, struct super_block *sb) + { + mangle(m, sb->s_type->name); +@@ -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; + ++ if (vx_flags(VXF_HIDE_MOUNT, 0)) ++ return SEQ_SKIP; ++ if (!mnt_is_reachable(mnt) && !vx_check(0, VS_WATCH_P)) ++ return SEQ_SKIP; ++ ++ if (!vx_check(0, VS_ADMIN|VS_WATCH) && ++ mnt == current->fs->root.mnt) { ++ seq_puts(m, "/dev/root / "); ++ goto type; ++ } ++ + if (sb->s_op->show_devname) { + err = sb->s_op->show_devname(m, mnt_path.dentry); + if (err) +@@ -106,6 +151,7 @@ static int show_vfsmnt(struct seq_file * + seq_putc(m, ' '); + seq_path(m, &mnt_path, " \t\n\\"); + seq_putc(m, ' '); ++type: + show_type(m, sb); + seq_puts(m, __mnt_is_readonly(mnt) ? " ro" : " rw"); + err = show_sb_opts(m, sb); +@@ -128,6 +174,11 @@ static int show_mountinfo(struct seq_fil + struct path root = p->root; + int err = 0; + ++ if (vx_flags(VXF_HIDE_MOUNT, 0)) ++ return SEQ_SKIP; ++ if (!mnt_is_reachable(mnt) && !vx_check(0, VS_WATCH_P)) ++ return SEQ_SKIP; ++ + 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 +238,17 @@ static int show_vfsstat(struct seq_file + struct super_block *sb = mnt_path.dentry->d_sb; + int err = 0; + ++ if (vx_flags(VXF_HIDE_MOUNT, 0)) ++ return SEQ_SKIP; ++ if (!mnt_is_reachable(mnt) && !vx_check(0, VS_WATCH_P)) ++ return SEQ_SKIP; ++ ++ if (!vx_check(0, VS_ADMIN|VS_WATCH) && ++ mnt == current->fs->root.mnt) { ++ seq_puts(m, "device /dev/root mounted on / "); ++ goto type; ++ } ++ + /* device */ + if (sb->s_op->show_devname) { + seq_puts(m, "device "); +@@ -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, ' '); +- ++type: + /* file system type */ + seq_puts(m, "with fstype "); + show_type(m, sb); +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; - int nofail = flags & DQUOT_SPACE_NOFAIL; ++ 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 -@@ -1592,6 +1595,9 @@ int dquot_alloc_inode(const struct inode - int cnt, ret = 0; - char warntype[MAXQUOTAS]; + 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)) -@@ -1662,6 +1668,8 @@ void __dquot_free_space(struct inode *in - char warntype[MAXQUOTAS]; - int reserve = flags & DQUOT_SPACE_RESERVE; + 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, 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)) { -@@ -1700,6 +1708,8 @@ void dquot_free_inode(const struct inode - unsigned int cnt; - char warntype[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-2.6.36.2/fs/quota/quota.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/quota/quota.c ---- linux-2.6.36.2/fs/quota/quota.c 2010-08-02 16:52:51.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/quota/quota.c 2010-10-21 13:09:36.000000000 +0200 + 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 +#include #include - #include + #include #include @@ -38,7 +39,7 @@ static int check_quotactl_permission(str break; @@ -7227,9 +6719,9 @@ diff -NurpP --minimal linux-2.6.36.2/fs/quota/quota.c linux-2.6.36.2-vs2.3.0.36. return -EPERM; } -@@ -296,6 +297,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) + @@ -7241,7 +6733,7 @@ diff -NurpP --minimal linux-2.6.36.2/fs/quota/quota.c linux-2.6.36.2-vs2.3.0.36. + +static vroot_grb_func *vroot_get_real_bdev = NULL; + -+static spinlock_t vroot_grb_lock = SPIN_LOCK_UNLOCKED; ++static DEFINE_SPINLOCK(vroot_grb_lock); + +int register_vroot_grb(vroot_grb_func *func) { + int ret = -EBUSY; @@ -7271,16 +6763,16 @@ diff -NurpP --minimal linux-2.6.36.2/fs/quota/quota.c linux-2.6.36.2-vs2.3.0.36. + +#endif + - /* - * look up a superblock on which quota ops will be performed - * - use the name of a block device to find the superblock thereon -@@ -313,6 +354,22 @@ static struct super_block *quotactl_bloc + /* Return 1 if 'cmd' will block on frozen filesystem */ + static int quotactl_cmd_write(int cmd) + { +@@ -385,6 +426,22 @@ static struct super_block *quotactl_bloc putname(tmp); if (IS_ERR(bdev)) return ERR_CAST(bdev); +#if defined(CONFIG_BLK_DEV_VROOT) || defined(CONFIG_BLK_DEV_VROOT_MODULE) + if (bdev && bdev->bd_inode && -+ imajor(bdev->bd_inode) == VROOT_MAJOR) { ++ imajor(bdev->bd_inode) == VROOT_MAJOR) { + struct block_device *bdnew = (void *)-EINVAL; + + if (vroot_get_real_bdev) @@ -7294,440 +6786,70 @@ diff -NurpP --minimal linux-2.6.36.2/fs/quota/quota.c linux-2.6.36.2-vs2.3.0.36. + bdev = bdnew; + } +#endif - sb = get_super(bdev); - bdput(bdev); - if (!sb) -diff -NurpP --minimal linux-2.6.36.2/fs/reiserfs/file.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/reiserfs/file.c ---- linux-2.6.36.2/fs/reiserfs/file.c 2010-10-21 13:07:51.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/reiserfs/file.c 2010-10-21 13:09:36.000000000 +0200 -@@ -313,4 +313,5 @@ const struct inode_operations reiserfs_f - .listxattr = reiserfs_listxattr, - .removexattr = reiserfs_removexattr, - .permission = reiserfs_permission, -+ .sync_flags = reiserfs_sync_flags, - }; -diff -NurpP --minimal linux-2.6.36.2/fs/reiserfs/inode.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/reiserfs/inode.c ---- linux-2.6.36.2/fs/reiserfs/inode.c 2010-10-21 13:07:51.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/reiserfs/inode.c 2010-10-21 13:59:16.000000000 +0200 -@@ -19,6 +19,7 @@ - #include - #include - #include -+#include - - int reiserfs_commit_write(struct file *f, struct page *page, - unsigned from, unsigned to); -@@ -1133,6 +1134,8 @@ static void init_inode(struct inode *ino - struct buffer_head *bh; - struct item_head *ih; - __u32 rdev; -+ uid_t uid; -+ gid_t gid; - //int version = ITEM_VERSION_1; - - bh = PATH_PLAST_BUFFER(path); -@@ -1153,12 +1156,13 @@ static void init_inode(struct inode *ino - (struct stat_data_v1 *)B_I_PITEM(bh, ih); - unsigned long blocks; - -+ uid = sd_v1_uid(sd); -+ gid = sd_v1_gid(sd); -+ - set_inode_item_key_version(inode, KEY_FORMAT_3_5); - set_inode_sd_version(inode, STAT_DATA_V1); - inode->i_mode = sd_v1_mode(sd); - inode->i_nlink = sd_v1_nlink(sd); -- inode->i_uid = sd_v1_uid(sd); -- inode->i_gid = sd_v1_gid(sd); - inode->i_size = sd_v1_size(sd); - inode->i_atime.tv_sec = sd_v1_atime(sd); - inode->i_mtime.tv_sec = sd_v1_mtime(sd); -@@ -1200,11 +1204,12 @@ static void init_inode(struct inode *ino - // (directories and symlinks) - struct stat_data *sd = (struct stat_data *)B_I_PITEM(bh, ih); - -+ uid = sd_v2_uid(sd); -+ gid = sd_v2_gid(sd); -+ - inode->i_mode = sd_v2_mode(sd); - inode->i_nlink = sd_v2_nlink(sd); -- inode->i_uid = sd_v2_uid(sd); - inode->i_size = sd_v2_size(sd); -- inode->i_gid = sd_v2_gid(sd); - inode->i_mtime.tv_sec = sd_v2_mtime(sd); - inode->i_atime.tv_sec = sd_v2_atime(sd); - inode->i_ctime.tv_sec = sd_v2_ctime(sd); -@@ -1234,6 +1239,10 @@ static void init_inode(struct inode *ino - sd_attrs_to_i_attrs(sd_v2_attrs(sd), inode); - } + if (quotactl_cmd_write(cmd)) + sb = get_super_thawed(bdev); + else +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; + stat->gid = inode->i_gid; ++ stat->tag = inode->i_tag; + stat->rdev = inode->i_rdev; + stat->size = i_size_read(inode); + stat->atime = inode->i_atime; +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 + #include ++#include ++#include + #include "internal.h" -+ 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); -+ - pathrelse(path); - if (S_ISREG(inode->i_mode)) { - inode->i_op = &reiserfs_file_inode_operations; -@@ -1256,13 +1265,15 @@ static void init_inode(struct inode *ino - static void inode2sd(void *sd, struct inode *inode, loff_t size) - { - struct stat_data *sd_v2 = (struct stat_data *)sd; -+ uid_t uid = TAGINO_UID(DX_TAG(inode), inode->i_uid, inode->i_tag); -+ gid_t gid = TAGINO_GID(DX_TAG(inode), inode->i_gid, inode->i_tag); - __u16 flags; - -+ set_sd_v2_uid(sd_v2, uid); -+ set_sd_v2_gid(sd_v2, gid); - set_sd_v2_mode(sd_v2, inode->i_mode); - set_sd_v2_nlink(sd_v2, inode->i_nlink); -- set_sd_v2_uid(sd_v2, inode->i_uid); - set_sd_v2_size(sd_v2, size); -- set_sd_v2_gid(sd_v2, inode->i_gid); - set_sd_v2_mtime(sd_v2, inode->i_mtime.tv_sec); - set_sd_v2_atime(sd_v2, inode->i_atime.tv_sec); - set_sd_v2_ctime(sd_v2, inode->i_ctime.tv_sec); -@@ -2861,14 +2872,19 @@ int reiserfs_commit_write(struct file *f - void sd_attrs_to_i_attrs(__u16 sd_attrs, struct inode *inode) - { - if (reiserfs_attrs(inode->i_sb)) { -- if (sd_attrs & REISERFS_SYNC_FL) -- inode->i_flags |= S_SYNC; -- else -- inode->i_flags &= ~S_SYNC; - if (sd_attrs & REISERFS_IMMUTABLE_FL) - inode->i_flags |= S_IMMUTABLE; - else - inode->i_flags &= ~S_IMMUTABLE; -+ if (sd_attrs & REISERFS_IXUNLINK_FL) -+ inode->i_flags |= S_IXUNLINK; -+ else -+ inode->i_flags &= ~S_IXUNLINK; -+ -+ if (sd_attrs & REISERFS_SYNC_FL) -+ inode->i_flags |= S_SYNC; -+ else -+ inode->i_flags &= ~S_SYNC; - if (sd_attrs & REISERFS_APPEND_FL) - inode->i_flags |= S_APPEND; - else -@@ -2881,6 +2897,15 @@ void sd_attrs_to_i_attrs(__u16 sd_attrs, - REISERFS_I(inode)->i_flags |= i_nopack_mask; - else - REISERFS_I(inode)->i_flags &= ~i_nopack_mask; -+ -+ if (sd_attrs & REISERFS_BARRIER_FL) -+ inode->i_vflags |= V_BARRIER; -+ else -+ inode->i_vflags &= ~V_BARRIER; -+ if (sd_attrs & REISERFS_COW_FL) -+ inode->i_vflags |= V_COW; -+ else -+ inode->i_vflags &= ~V_COW; - } + static int flags_by_mnt(int mnt_flags) +@@ -60,6 +62,8 @@ static int statfs_by_dentry(struct dentr + retval = dentry->d_sb->s_op->statfs(dentry, buf); + if (retval == 0 && buf->f_frsize == 0) + buf->f_frsize = buf->f_bsize; ++ if (!vx_check(0, VS_ADMIN|VS_WATCH)) ++ vx_vsi_statfs(dentry->d_sb, buf); + return retval; } -@@ -2891,6 +2916,11 @@ void i_attrs_to_sd_attrs(struct inode *i - *sd_attrs |= REISERFS_IMMUTABLE_FL; - else - *sd_attrs &= ~REISERFS_IMMUTABLE_FL; -+ if (inode->i_flags & S_IXUNLINK) -+ *sd_attrs |= REISERFS_IXUNLINK_FL; -+ else -+ *sd_attrs &= ~REISERFS_IXUNLINK_FL; -+ - if (inode->i_flags & S_SYNC) - *sd_attrs |= REISERFS_SYNC_FL; - else -@@ -2903,6 +2933,15 @@ void i_attrs_to_sd_attrs(struct inode *i - *sd_attrs |= REISERFS_NOTAIL_FL; - else - *sd_attrs &= ~REISERFS_NOTAIL_FL; -+ -+ if (inode->i_vflags & V_BARRIER) -+ *sd_attrs |= REISERFS_BARRIER_FL; -+ else -+ *sd_attrs &= ~REISERFS_BARRIER_FL; -+ if (inode->i_vflags & V_COW) -+ *sd_attrs |= REISERFS_COW_FL; -+ else -+ *sd_attrs &= ~REISERFS_COW_FL; - } - } +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 ++#include ++#include + #include "internal.h" -@@ -3146,7 +3185,8 @@ int reiserfs_setattr(struct dentry *dent - } - if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) || -- (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid)) { -+ (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid) || -+ (ia_valid & ATTR_TAG && attr->ia_tag != inode->i_tag)) { - struct reiserfs_transaction_handle th; - int jbegin_count = - 2 * -@@ -3175,6 +3215,9 @@ int reiserfs_setattr(struct dentry *dent - inode->i_uid = attr->ia_uid; - if (attr->ia_valid & ATTR_GID) - inode->i_gid = attr->ia_gid; -+ if ((attr->ia_valid & ATTR_TAG) && -+ IS_TAGGED(inode)) -+ inode->i_tag = attr->ia_tag; - mark_inode_dirty(inode); - error = journal_end(&th, inode->i_sb, jbegin_count); - if (error) -diff -NurpP --minimal linux-2.6.36.2/fs/reiserfs/ioctl.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/reiserfs/ioctl.c ---- linux-2.6.36.2/fs/reiserfs/ioctl.c 2010-12-13 22:08:58.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/reiserfs/ioctl.c 2010-12-13 22:09:27.000000000 +0100 -@@ -7,11 +7,27 @@ - #include - #include - #include -+#include - #include - #include - #include - #include - -+ -+int reiserfs_sync_flags(struct inode *inode, int flags, int vflags) -+{ -+ __u16 sd_attrs = 0; -+ -+ inode->i_flags = flags; -+ inode->i_vflags = vflags; -+ -+ i_attrs_to_sd_attrs(inode, &sd_attrs); -+ REISERFS_I(inode)->i_attrs = sd_attrs; -+ inode->i_ctime = CURRENT_TIME_SEC; -+ mark_inode_dirty(inode); -+ return 0; -+} -+ - /* - * reiserfs_ioctl - handler for ioctl for inode - * supported commands: -@@ -23,7 +39,7 @@ - long reiserfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) - { - struct inode *inode = filp->f_path.dentry->d_inode; -- unsigned int flags; -+ unsigned int flags, oldflags; - int err = 0; - - reiserfs_write_lock(inode->i_sb); -@@ -48,6 +64,7 @@ long reiserfs_ioctl(struct file *filp, u - - flags = REISERFS_I(inode)->i_attrs; - i_attrs_to_sd_attrs(inode, (__u16 *) & flags); -+ flags &= REISERFS_FL_USER_VISIBLE; - err = put_user(flags, (int __user *)arg); - break; - case REISERFS_IOC_SETFLAGS:{ -@@ -68,6 +85,10 @@ long reiserfs_ioctl(struct file *filp, u - err = -EFAULT; - goto setflags_out; - } -+ if (IS_BARRIER(inode)) { -+ vxwprintk_task(1, "messing with the barrier."); -+ return -EACCES; -+ } - /* - * Is it quota file? Do not allow user to mess with it - */ -@@ -92,6 +113,10 @@ long reiserfs_ioctl(struct file *filp, u - goto setflags_out; - } - } -+ -+ oldflags = REISERFS_I(inode)->i_attrs; -+ flags &= REISERFS_FL_USER_MODIFIABLE; -+ flags |= oldflags & ~REISERFS_FL_USER_MODIFIABLE; - sd_attrs_to_i_attrs(flags, inode); - REISERFS_I(inode)->i_attrs = flags; - inode->i_ctime = CURRENT_TIME_SEC; -diff -NurpP --minimal linux-2.6.36.2/fs/reiserfs/namei.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/reiserfs/namei.c ---- linux-2.6.36.2/fs/reiserfs/namei.c 2010-08-02 16:52:52.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/reiserfs/namei.c 2010-10-21 13:09:36.000000000 +0200 -@@ -18,6 +18,7 @@ - #include - #include - #include -+#include - - #define INC_DIR_INODE_NLINK(i) if (i->i_nlink != 1) { inc_nlink(i); if (i->i_nlink >= REISERFS_LINK_MAX) i->i_nlink=1; } - #define DEC_DIR_INODE_NLINK(i) if (i->i_nlink != 1) drop_nlink(i); -@@ -362,6 +363,7 @@ static struct dentry *reiserfs_lookup(st - if (retval == IO_ERROR) { - return ERR_PTR(-EIO); - } -+ dx_propagate_tag(nd, inode); - - return d_splice_alias(inode, dentry); - } -@@ -1532,6 +1534,7 @@ const struct inode_operations reiserfs_d - .listxattr = reiserfs_listxattr, - .removexattr = reiserfs_removexattr, - .permission = reiserfs_permission, -+ .sync_flags = reiserfs_sync_flags, - }; - - /* -diff -NurpP --minimal linux-2.6.36.2/fs/reiserfs/super.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/reiserfs/super.c ---- linux-2.6.36.2/fs/reiserfs/super.c 2010-10-21 13:07:51.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/reiserfs/super.c 2010-10-21 13:09:36.000000000 +0200 -@@ -893,6 +893,14 @@ static int reiserfs_parse_options(struct - {"user_xattr",.setmask = 1 << REISERFS_UNSUPPORTED_OPT}, - {"nouser_xattr",.clrmask = 1 << REISERFS_UNSUPPORTED_OPT}, - #endif -+#ifndef CONFIG_TAGGING_NONE -+ {"tagxid",.setmask = 1 << REISERFS_TAGGED}, -+ {"tag",.setmask = 1 << REISERFS_TAGGED}, -+ {"notag",.clrmask = 1 << REISERFS_TAGGED}, -+#endif -+#ifdef CONFIG_PROPAGATE -+ {"tag",.arg_required = 'T',.values = NULL}, -+#endif - #ifdef CONFIG_REISERFS_FS_POSIX_ACL - {"acl",.setmask = 1 << REISERFS_POSIXACL}, - {"noacl",.clrmask = 1 << REISERFS_POSIXACL}, -@@ -1202,6 +1210,14 @@ static int reiserfs_remount(struct super - handle_quota_files(s, qf_names, &qfmt); - #endif - -+ if ((mount_options & (1 << REISERFS_TAGGED)) && -+ !(s->s_flags & MS_TAGGED)) { -+ reiserfs_warning(s, "super-vs01", -+ "reiserfs: tagging not permitted on remount."); -+ err = -EINVAL; -+ goto out_err; -+ } -+ - handle_attrs(s); - - /* Add options that are safe here */ -@@ -1684,6 +1700,10 @@ static int reiserfs_fill_super(struct su - goto error; - } - -+ /* map mount option tagxid */ -+ if (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_TAGGED)) -+ s->s_flags |= MS_TAGGED; -+ - rs = SB_DISK_SUPER_BLOCK(s); - /* Let's do basic sanity check to verify that underlying device is not - smaller than the filesystem. If the check fails then abort and scream, -diff -NurpP --minimal linux-2.6.36.2/fs/reiserfs/xattr.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/reiserfs/xattr.c ---- linux-2.6.36.2/fs/reiserfs/xattr.c 2010-08-02 16:52:52.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/reiserfs/xattr.c 2010-10-21 13:09:36.000000000 +0200 -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff -NurpP --minimal linux-2.6.36.2/fs/stat.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/stat.c ---- linux-2.6.36.2/fs/stat.c 2010-10-21 13:07:51.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/stat.c 2010-10-21 13:09:36.000000000 +0200 -@@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod - stat->nlink = inode->i_nlink; - stat->uid = inode->i_uid; - stat->gid = inode->i_gid; -+ stat->tag = inode->i_tag; - stat->rdev = inode->i_rdev; - stat->atime = inode->i_atime; - stat->mtime = inode->i_mtime; -diff -NurpP --minimal linux-2.6.36.2/fs/statfs.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/statfs.c ---- linux-2.6.36.2/fs/statfs.c 2010-10-21 13:07:51.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/statfs.c 2010-10-21 14:07:35.000000000 +0200 -@@ -7,6 +7,8 @@ - #include - #include - #include -+#include -+#include - - static int flags_by_mnt(int mnt_flags) - { -@@ -59,6 +61,8 @@ int statfs_by_dentry(struct dentry *dent - retval = dentry->d_sb->s_op->statfs(dentry, buf); - if (retval == 0 && buf->f_frsize == 0) - buf->f_frsize = buf->f_bsize; -+ if (!vx_check(0, VS_ADMIN|VS_WATCH)) -+ vx_vsi_statfs(dentry->d_sb, buf); - return retval; - } - -diff -NurpP --minimal linux-2.6.36.2/fs/super.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/super.c ---- linux-2.6.36.2/fs/super.c 2010-10-21 13:07:51.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/super.c 2010-10-21 13:09:36.000000000 +0200 -@@ -30,6 +30,9 @@ - #include - #include - #include -+#include -+#include -+#include - #include "internal.h" - - -@@ -918,12 +921,18 @@ struct vfsmount * - vfs_kern_mount(struct file_system_type *type, int flags, const char *name, void *data) - { - struct vfsmount *mnt; -+ struct super_block *sb; - char *secdata = NULL; - int error; - - if (!type) - return ERR_PTR(-ENODEV); +@@ -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; + error = -EPERM; -+ if ((type->fs_flags & FS_BINARY_MOUNTDATA) && -+ !vx_capable(CAP_SYS_ADMIN, VXC_BINARY_MOUNT)) -+ goto out; -+ - error = -ENOMEM; - mnt = alloc_vfsmnt(name); - if (!mnt) -@@ -945,11 +954,19 @@ vfs_kern_mount(struct file_system_type * - error = type->get_sb(type, flags, name, data, mnt); - if (error < 0) - goto out_free_secdata; -- BUG_ON(!mnt->mnt_sb); -- WARN_ON(!mnt->mnt_sb->s_bdi); -+ -+ sb = mnt->mnt_sb; -+ BUG_ON(!sb); -+ WARN_ON(!sb->s_bdi); - mnt->mnt_sb->s_flags |= MS_BORN; - -- error = security_sb_kern_mount(mnt->mnt_sb, flags, secdata); -+ error = -EPERM; -+ if (!vx_capable(CAP_SYS_ADMIN, VXC_BINARY_MOUNT) && !sb->s_bdev && ++ if (!vx_capable(CAP_SYS_ADMIN, VXC_BINARY_MOUNT) && ++ !sb->s_bdev && + (sb->s_magic != PROC_SUPER_MAGIC) && + (sb->s_magic != DEVPTS_SUPER_MAGIC)) + goto out_sb; + -+ error = security_sb_kern_mount(sb, flags, secdata); + error = security_sb_kern_mount(sb, flags, secdata); if (error) goto out_sb; - -diff -NurpP --minimal linux-2.6.36.2/fs/sysfs/mount.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/sysfs/mount.c ---- linux-2.6.36.2/fs/sysfs/mount.c 2010-10-21 13:07:51.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/sysfs/mount.c 2010-10-21 13:09:36.000000000 +0200 -@@ -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-2.6.36.2/fs/utimes.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/utimes.c ---- linux-2.6.36.2/fs/utimes.c 2010-10-21 13:07:51.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/utimes.c 2010-10-21 13:09:36.000000000 +0200 +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 @@ -7737,955 +6859,221 @@ diff -NurpP --minimal linux-2.6.36.2/fs/utimes.c linux-2.6.36.2-vs2.3.0.36.38.2/ #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-2.6.36.2/fs/xattr.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/xattr.c ---- linux-2.6.36.2/fs/xattr.c 2010-08-02 16:52:52.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/xattr.c 2010-10-21 13:09:36.000000000 +0200 -@@ -18,6 +18,7 @@ - #include - #include +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 + #include +#include - #include + #include -@@ -49,7 +50,7 @@ xattr_permission(struct inode *inode, co - * The trusted.* namespace can only be accessed by a privileged user. +@@ -52,7 +53,7 @@ xattr_permission(struct inode *inode, co + * The trusted.* namespace can only be accessed by privileged users. */ - if (!strncmp(name, XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN)) -- return (capable(CAP_SYS_ADMIN) ? 0 : -EPERM); -+ return (vx_capable(CAP_SYS_ADMIN, VXC_FS_TRUSTED) ? 0 : -EPERM); - - /* In user.* namespace, only regular files and directories can have - * extended attributes. For sticky directories, only the owner and -diff -NurpP --minimal linux-2.6.36.2/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/xfs/linux-2.6/xfs_ioctl.c ---- linux-2.6.36.2/fs/xfs/linux-2.6/xfs_ioctl.c 2010-10-21 13:07:51.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/xfs/linux-2.6/xfs_ioctl.c 2010-10-21 14:02:37.000000000 +0200 -@@ -28,7 +28,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" -@@ -738,6 +738,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 -@@ -766,6 +770,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) -@@ -826,6 +832,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) -@@ -868,6 +876,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 -@@ -1341,10 +1353,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-2.6.36.2/fs/xfs/linux-2.6/xfs_ioctl.h linux-2.6.36.2-vs2.3.0.36.38.2/fs/xfs/linux-2.6/xfs_ioctl.h ---- linux-2.6.36.2/fs/xfs/linux-2.6/xfs_ioctl.h 2010-07-07 18:31:54.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/xfs/linux-2.6/xfs_ioctl.h 2010-10-21 13:09:36.000000000 +0200 -@@ -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-2.6.36.2/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/xfs/linux-2.6/xfs_iops.c ---- linux-2.6.36.2/fs/xfs/linux-2.6/xfs_iops.c 2010-10-21 13:07:51.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/xfs/linux-2.6/xfs_iops.c 2010-10-21 13:09:36.000000000 +0200 -@@ -30,6 +30,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" -@@ -49,6 +50,7 @@ - #include - #include - #include -+#include - - /* - * Bring the timestamps in the XFS inode uptodate. -@@ -499,6 +501,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; -@@ -687,6 +690,7 @@ static const struct inode_operations xfs - .listxattr = xfs_vn_listxattr, - .fallocate = xfs_vn_fallocate, - .fiemap = xfs_vn_fiemap, -+ .sync_flags = xfs_sync_flags, - }; - - static const struct inode_operations xfs_dir_inode_operations = { -@@ -712,6 +716,7 @@ static const struct inode_operations xfs - .getxattr = generic_getxattr, - .removexattr = generic_removexattr, - .listxattr = xfs_vn_listxattr, -+ .sync_flags = xfs_sync_flags, - }; - - static const struct inode_operations xfs_dir_ci_inode_operations = { -@@ -761,6 +766,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 -@@ -773,6 +782,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; + if (!strncmp(name, XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN)) { +- if (!capable(CAP_SYS_ADMIN)) ++ if (!vx_capable(CAP_SYS_ADMIN, VXC_FS_TRUSTED)) + return (mask & MAY_WRITE) ? -EPERM : -ENODATA; + return 0; + } +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); ++extern struct cred *__prepare_creds(const struct cred *); + extern struct cred *prepare_creds(void); + extern struct cred *prepare_exec_creds(void); + extern int commit_creds(struct cred *); +@@ -197,6 +198,31 @@ static inline void validate_process_cred } + #endif - /* -@@ -801,6 +819,7 @@ xfs_setup_inode( - inode->i_nlink = 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-2.6.36.2/fs/xfs/linux-2.6/xfs_linux.h linux-2.6.36.2-vs2.3.0.36.38.2/fs/xfs/linux-2.6/xfs_linux.h ---- linux-2.6.36.2/fs/xfs/linux-2.6/xfs_linux.h 2010-10-21 13:07:51.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/xfs/linux-2.6/xfs_linux.h 2010-10-21 13:09:36.000000000 +0200 -@@ -116,6 +116,7 @@ - - #define current_cpu() (raw_smp_processor_id()) - #define current_pid() (current->pid) -+#define current_fstag(cred,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-2.6.36.2/fs/xfs/linux-2.6/xfs_super.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/xfs/linux-2.6/xfs_super.c ---- linux-2.6.36.2/fs/xfs/linux-2.6/xfs_super.c 2010-10-21 13:07:51.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/xfs/linux-2.6/xfs_super.c 2010-10-21 13:09:36.000000000 +0200 -@@ -113,6 +113,9 @@ mempool_t *xfs_ioend_pool; - #define MNTOPT_QUOTANOENF "qnoenforce" /* same as uqnoenforce */ - #define MNTOPT_DELAYLOG "delaylog" /* Delayed loging enabled */ - #define MNTOPT_NODELAYLOG "nodelaylog" /* Delayed loging disabled */ -+#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. -@@ -121,10 +124,14 @@ mempool_t *xfs_ioend_pool; - * in the future, too. - */ - enum { -+ Opt_tag, Opt_notag, - Opt_barrier, Opt_nobarrier, Opt_err - }; - - static const match_table_t tokens = { -+ {Opt_tag, "tagxid"}, -+ {Opt_tag, "tag"}, -+ {Opt_notag, "notag"}, - {Opt_barrier, "barrier"}, - {Opt_nobarrier, "nobarrier"}, - {Opt_err, NULL} -@@ -371,6 +378,19 @@ xfs_parseargs( - } else if (!strcmp(this_char, "irixsgid")) { - cmn_err(CE_WARN, - "XFS: 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; ++static inline void set_cred_subscribers(struct cred *cred, int n) ++{ ++#ifdef CONFIG_DEBUG_CREDENTIALS ++ atomic_set(&cred->subscribers, n); +#endif -+#ifdef CONFIG_PROPAGATE -+ } else if (!strcmp(this_char, MNTOPT_TAGGED)) { -+ /* use value */ -+ mp->m_flags |= XFS_MOUNT_TAGGED; ++} ++ ++static inline int read_cred_subscribers(const struct cred *cred) ++{ ++#ifdef CONFIG_DEBUG_CREDENTIALS ++ return atomic_read(&cred->subscribers); ++#else ++ return 0; +#endif - } else { - cmn_err(CE_WARN, - "XFS: unknown mount option [%s].", this_char); -@@ -1320,6 +1340,16 @@ xfs_fs_remount( - case Opt_nobarrier: - mp->m_flags &= ~XFS_MOUNT_BARRIER; - 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 -@@ -1547,6 +1577,9 @@ xfs_fs_fill_super( - if (error) - goto out_filestream_unmount; - -+ if (mp->m_flags & XFS_MOUNT_TAGGED) -+ sb->s_flags |= MS_TAGGED; ++} ++ ++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 ++} + - sb->s_magic = XFS_SB_MAGIC; - sb->s_blocksize = mp->m_sb.sb_blocksize; - sb->s_blocksize_bits = ffs(sb->s_blocksize) - 1; -diff -NurpP --minimal linux-2.6.36.2/fs/xfs/xfs_dinode.h linux-2.6.36.2-vs2.3.0.36.38.2/fs/xfs/xfs_dinode.h ---- linux-2.6.36.2/fs/xfs/xfs_dinode.h 2009-06-11 17:13:09.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/xfs/xfs_dinode.h 2010-10-21 13:09:36.000000000 +0200 -@@ -50,7 +50,9 @@ typedef struct xfs_dinode { - __be32 di_gid; /* owner's group id */ - __be32 di_nlink; /* number of links to file */ - __be16 di_projid; /* owner's project id */ -- __u8 di_pad[8]; /* unused, zeroed space */ -+ __be16 di_tag; /* context tagging */ -+ __be16 di_vflags; /* vserver specific flags */ -+ __u8 di_pad[4]; /* unused, zeroed space */ - __be16 di_flushiter; /* incremented on flush */ - xfs_timestamp_t di_atime; /* time last accessed */ - xfs_timestamp_t di_mtime; /* time last modified */ -@@ -183,6 +185,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) -@@ -198,6 +202,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) -@@ -210,6 +215,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-2.6.36.2/fs/xfs/xfs_fs.h linux-2.6.36.2-vs2.3.0.36.38.2/fs/xfs/xfs_fs.h ---- linux-2.6.36.2/fs/xfs/xfs_fs.h 2010-10-21 13:07:52.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/xfs/xfs_fs.h 2010-10-21 13:09:36.000000000 +0200 -@@ -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 */ + /** + * get_new_cred - Get a reference on a new set of credentials + * @cred: The new credentials to reference +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 - /* -@@ -295,7 +298,8 @@ typedef struct xfs_bstat { - __u32 bs_gen; /* generation count */ - __u16 bs_projid; /* project id */ - __u16 bs_forkoff; /* inode fork offset in bytes */ -- unsigned char bs_pad[12]; /* pad space, unused */ -+ __u16 bs_tag; /* context tagging */ -+ unsigned char bs_pad[10]; /* pad space, unused */ - __u32 bs_dmevmask; /* DMIG event mask */ - __u16 bs_dmstate; /* DMIG state info */ - __u16 bs_aextents; /* attribute number of extents */ -diff -NurpP --minimal linux-2.6.36.2/fs/xfs/xfs_ialloc.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/xfs/xfs_ialloc.c ---- linux-2.6.36.2/fs/xfs/xfs_ialloc.c 2010-10-21 13:07:52.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/xfs/xfs_ialloc.c 2010-10-21 13:09:36.000000000 +0200 -@@ -37,7 +37,6 @@ - #include "xfs_error.h" - #include "xfs_bmap.h" + #endif - - /* - * Allocation group level functions. - */ -diff -NurpP --minimal linux-2.6.36.2/fs/xfs/xfs_inode.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/xfs/xfs_inode.c ---- linux-2.6.36.2/fs/xfs/xfs_inode.c 2010-10-21 13:07:52.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/xfs/xfs_inode.c 2010-10-21 13:09:36.000000000 +0200 -@@ -245,6 +245,7 @@ xfs_inotobp( - return 0; - } - -+#include + #endif /* _LINUX_DEVPTS_FS_H */ +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 routine is called to map an inode to the buffer containing -@@ -650,15 +651,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 = be16_to_cpu(from->di_projid); - memcpy(to->di_pad, from->di_pad, sizeof(to->di_pad)); -@@ -679,21 +690,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 = cpu_to_be16(from->di_projid); - memcpy(to->di_pad, from->di_pad, sizeof(to->di_pad)); -@@ -714,12 +730,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); - } + * 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; ++ ktag_t ia_tag; + loff_t ia_size; + struct timespec ia_atime; + struct timespec ia_mtime; +@@ -540,7 +542,9 @@ struct inode { + unsigned short i_opflags; + kuid_t i_uid; + kgid_t i_gid; +- unsigned int i_flags; ++ ktag_t i_tag; ++ unsigned short i_flags; ++ unsigned short i_vflags; - STATIC uint - _xfs_dic2xflags( -- __uint16_t di_flags) -+ __uint16_t di_flags, -+ __uint16_t di_vflags) - { - uint flags = 0; - -@@ -730,6 +748,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) -@@ -754,6 +774,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; - } - -@@ -763,7 +787,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); - } - -@@ -771,7 +795,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); + #ifdef CONFIG_FS_POSIX_ACL + struct posix_acl *i_acl; +@@ -569,6 +573,7 @@ struct inode { + unsigned int __i_nlink; + }; + dev_t i_rdev; ++ dev_t i_mdev; + loff_t i_size; + struct timespec i_atime; + struct timespec i_mtime; +@@ -730,6 +735,11 @@ static inline gid_t i_gid_read(const str + return from_kgid(&init_user_ns, inode->i_gid); } -@@ -804,7 +829,6 @@ xfs_iread( - if (error) - return error; - dip = (xfs_dinode_t *)xfs_buf_offset(bp, ip->i_imap.im_boffset); -- - /* - * If we got something that isn't an inode it means someone - * (nfs or dmi) has a stale handle. -@@ -829,7 +853,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 -@@ -1027,6 +1052,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(cr, &ip->i_vnode); - ip->i_d.di_projid = prid; - memset(&(ip->i_d.di_pad[0]), 0, sizeof(ip->i_d.di_pad)); - -@@ -1087,6 +1113,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: -@@ -2105,6 +2132,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_df.if_ext_max = -@@ -2975,7 +3003,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-2.6.36.2/fs/xfs/xfs_inode.h linux-2.6.36.2-vs2.3.0.36.38.2/fs/xfs/xfs_inode.h ---- linux-2.6.36.2/fs/xfs/xfs_inode.h 2010-10-21 13:07:52.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/xfs/xfs_inode.h 2010-10-21 13:09:36.000000000 +0200 -@@ -135,7 +135,9 @@ typedef struct xfs_icdinode { - __uint32_t di_gid; /* owner's group id */ - __uint32_t di_nlink; /* number of links to file */ - __uint16_t di_projid; /* owner's project id */ -- __uint8_t di_pad[8]; /* unused, zeroed space */ -+ __uint16_t di_tag; /* context tagging */ -+ __uint16_t di_vflags; /* vserver specific flags */ -+ __uint8_t di_pad[4]; /* unused, zeroed space */ - __uint16_t di_flushiter; /* incremented on flush */ - xfs_ictimestamp_t di_atime; /* time last accessed */ - xfs_ictimestamp_t di_mtime; /* time last modified */ -@@ -509,7 +511,7 @@ int xfs_itobp(struct xfs_mount *, struc - 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-2.6.36.2/fs/xfs/xfs_itable.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/xfs/xfs_itable.c ---- linux-2.6.36.2/fs/xfs/xfs_itable.c 2010-10-21 13:07:52.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/xfs/xfs_itable.c 2010-10-21 13:09:36.000000000 +0200 -@@ -97,6 +97,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; - - /* -diff -NurpP --minimal linux-2.6.36.2/fs/xfs/xfs_log_recover.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/xfs/xfs_log_recover.c ---- linux-2.6.36.2/fs/xfs/xfs_log_recover.c 2010-10-21 13:07:52.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/xfs/xfs_log_recover.c 2010-10-21 14:02:02.000000000 +0200 -@@ -2450,7 +2450,8 @@ xlog_recover_do_inode_trans( - } - - /* 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-2.6.36.2/fs/xfs/xfs_mount.h linux-2.6.36.2-vs2.3.0.36.38.2/fs/xfs/xfs_mount.h ---- linux-2.6.36.2/fs/xfs/xfs_mount.h 2010-10-21 13:07:52.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/xfs/xfs_mount.h 2010-10-21 13:09:36.000000000 +0200 -@@ -238,6 +238,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-2.6.36.2/fs/xfs/xfs_vnodeops.c linux-2.6.36.2-vs2.3.0.36.38.2/fs/xfs/xfs_vnodeops.c ---- linux-2.6.36.2/fs/xfs/xfs_vnodeops.c 2010-10-21 13:07:52.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/xfs/xfs_vnodeops.c 2010-10-21 15:17:26.000000000 +0200 -@@ -50,6 +50,78 @@ - #include "xfs_vnodeops.h" - #include "xfs_trace.h" - -+ -+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) ++static inline vtag_t i_tag_read(const struct inode *inode) +{ -+ 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); -+ -+ inode->i_flags = flags; -+ inode->i_vflags = vflags; -+ xfs_get_inode_flags(ip); -+ -+ xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); -+ xfs_ichgtime(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; ++ return from_ktag(&init_user_ns, inode->i_tag); +} + -+ - int - xfs_setattr( - struct xfs_inode *ip, -@@ -65,6 +137,7 @@ xfs_setattr( - uint commit_flags=0; - uid_t uid=0, iuid=0; - gid_t gid=0, igid=0; -+ tag_t tag=0, itag=0; - struct xfs_dquot *udqp, *gdqp, *olddquot1, *olddquot2; - int need_iolock = 1; - -@@ -147,7 +220,7 @@ xfs_setattr( - /* - * Change file ownership. Must be the owner or privileged. - */ -- if (mask & (ATTR_UID|ATTR_GID)) { -+ if (mask & (ATTR_UID|ATTR_GID|ATTR_TAG)) { - /* - * These IDs could have changed since we last looked at them. - * But, we're assured that if the ownership did change -@@ -156,8 +229,10 @@ xfs_setattr( - */ - iuid = ip->i_d.di_uid; - igid = ip->i_d.di_gid; -+ itag = ip->i_d.di_tag; - gid = (mask & ATTR_GID) ? iattr->ia_gid : igid; - uid = (mask & ATTR_UID) ? iattr->ia_uid : iuid; -+ tag = (mask & ATTR_TAG) ? iattr->ia_tag : itag; - - /* - * Do a quota reservation only if uid/gid is actually -@@ -165,7 +240,8 @@ xfs_setattr( - */ - if (XFS_IS_QUOTA_RUNNING(mp) && - ((XFS_IS_UQUOTA_ON(mp) && iuid != uid) || -- (XFS_IS_GQUOTA_ON(mp) && igid != gid))) { -+ (XFS_IS_GQUOTA_ON(mp) && igid != gid) || -+ (XFS_IS_GQUOTA_ON(mp) && itag != tag))) { - ASSERT(tp); - code = xfs_qm_vop_chown_reserve(tp, ip, udqp, gdqp, - capable(CAP_FOWNER) ? -@@ -326,7 +402,7 @@ xfs_setattr( - /* - * Change file ownership. Must be the owner or privileged. - */ -- if (mask & (ATTR_UID|ATTR_GID)) { -+ if (mask & (ATTR_UID|ATTR_GID|ATTR_TAG)) { - /* - * CAP_FSETID overrides the following restrictions: - * -@@ -342,6 +418,10 @@ xfs_setattr( - * Change the ownerships and register quota modifications - * in the transaction. - */ -+ if (itag != tag) { -+ ip->i_d.di_tag = tag; -+ inode->i_tag = tag; -+ } - if (iuid != uid) { - if (XFS_IS_QUOTA_RUNNING(mp) && XFS_IS_UQUOTA_ON(mp)) { - ASSERT(mask & ATTR_UID); -diff -NurpP --minimal linux-2.6.36.2/fs/xfs/xfs_vnodeops.h linux-2.6.36.2-vs2.3.0.36.38.2/fs/xfs/xfs_vnodeops.h ---- linux-2.6.36.2/fs/xfs/xfs_vnodeops.h 2010-07-07 18:31:54.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/fs/xfs/xfs_vnodeops.h 2010-10-21 13:09:36.000000000 +0200 -@@ -14,6 +14,7 @@ struct xfs_inode; - struct xfs_iomap; - - -+int xfs_sync_xflags(struct xfs_inode *ip); - int xfs_setattr(struct xfs_inode *ip, struct iattr *vap, int flags); - #define XFS_ATTR_DMI 0x01 /* invocation from a DMI function */ - #define XFS_ATTR_NONBLOCK 0x02 /* return EAGAIN if operation would block */ -diff -NurpP --minimal linux-2.6.36.2/include/asm-generic/tlb.h linux-2.6.36.2-vs2.3.0.36.38.2/include/asm-generic/tlb.h ---- linux-2.6.36.2/include/asm-generic/tlb.h 2009-09-10 15:26:24.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/asm-generic/tlb.h 2010-10-21 13:09:36.000000000 +0200 -@@ -14,6 +14,7 @@ - #define _ASM_GENERIC__TLB_H - - #include -+#include - #include - #include - -diff -NurpP --minimal linux-2.6.36.2/include/linux/capability.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/capability.h ---- linux-2.6.36.2/include/linux/capability.h 2010-10-21 13:07:52.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/capability.h 2010-10-21 13:09:36.000000000 +0200 -@@ -280,6 +280,7 @@ struct cpu_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 - -@@ -352,7 +353,13 @@ struct cpu_vfs_cap_data { - - #define CAP_MAC_ADMIN 33 - --#define CAP_LAST_CAP CAP_MAC_ADMIN -+/* Allow context manipulations */ -+/* Allow changing context info on files */ -+ -+#define CAP_CONTEXT 34 -+ -+ -+#define CAP_LAST_CAP CAP_CONTEXT - - #define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP) - -diff -NurpP --minimal linux-2.6.36.2/include/linux/cred.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/cred.h ---- linux-2.6.36.2/include/linux/cred.h 2010-08-02 16:52:53.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/cred.h 2010-12-01 17:26:52.000000000 +0100 -@@ -208,6 +208,31 @@ static inline void validate_process_cred + static inline void i_uid_write(struct inode *inode, uid_t uid) + { + inode->i_uid = make_kuid(&init_user_ns, uid); +@@ -740,14 +750,19 @@ static inline void i_gid_write(struct in + inode->i_gid = make_kgid(&init_user_ns, gid); } - #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) ++static inline void i_tag_write(struct inode *inode, vtag_t tag) +{ -+#ifdef CONFIG_DEBUG_CREDENTIALS -+ struct cred *cred = (struct cred *) _cred; -+ -+ atomic_add(n, &cred->subscribers); -+#endif ++ inode->i_tag = make_ktag(&init_user_ns, tag); +} + - /** - * get_new_cred - Get a reference on a new set of credentials - * @cred: The new credentials to reference -diff -NurpP --minimal linux-2.6.36.2/include/linux/devpts_fs.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/devpts_fs.h ---- linux-2.6.36.2/include/linux/devpts_fs.h 2008-12-25 00:26:37.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/devpts_fs.h 2010-10-21 13:09:36.000000000 +0200 -@@ -45,5 +45,4 @@ static inline void devpts_pty_kill(struc - - #endif - -- - #endif /* _LINUX_DEVPTS_FS_H */ -diff -NurpP --minimal linux-2.6.36.2/include/linux/ext2_fs.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/ext2_fs.h ---- linux-2.6.36.2/include/linux/ext2_fs.h 2010-02-25 11:52:07.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/ext2_fs.h 2010-10-21 13:09:36.000000000 +0200 -@@ -189,8 +189,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) */ - #define EXT2_TOPDIR_FL FS_TOPDIR_FL /* Top of directory hierarchies*/ -+#define EXT2_IXUNLINK_FL FS_IXUNLINK_FL /* Immutable invert on unlink */ - #define EXT2_RESERVED_FL FS_RESERVED_FL /* reserved for ext2 lib */ - -+#define EXT2_BARRIER_FL FS_BARRIER_FL /* Barrier for chroot() */ -+#define EXT2_COW_FL FS_COW_FL /* Copy on Write marker */ -+ - #define EXT2_FL_USER_VISIBLE FS_FL_USER_VISIBLE /* User visible flags */ - #define EXT2_FL_USER_MODIFIABLE FS_FL_USER_MODIFIABLE /* User modifiable flags */ - -@@ -274,7 +278,8 @@ struct ext2_inode { - __u16 i_pad1; - __le16 l_i_uid_high; /* these 2 fields */ - __le16 l_i_gid_high; /* were reserved2[0] */ -- __u32 l_i_reserved2; -+ __le16 l_i_tag; /* Context Tag */ -+ __u16 l_i_reserved2; - } linux2; - struct { - __u8 h_i_frag; /* Fragment number */ -@@ -303,6 +308,7 @@ struct ext2_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 -+#define i_raw_tag osd2.linux2.l_i_tag - #define i_reserved2 osd2.linux2.l_i_reserved2 - #endif - -@@ -347,6 +353,7 @@ struct ext2_inode { - #define EXT2_MOUNT_USRQUOTA 0x020000 /* user quota */ - #define EXT2_MOUNT_GRPQUOTA 0x040000 /* group quota */ - #define EXT2_MOUNT_RESERVATION 0x080000 /* Preallocation */ -+#define EXT2_MOUNT_TAGGED (1<<24) /* Enable Context Tags */ - - - #define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt -diff -NurpP --minimal linux-2.6.36.2/include/linux/ext3_fs.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/ext3_fs.h ---- linux-2.6.36.2/include/linux/ext3_fs.h 2010-10-21 13:07:53.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/ext3_fs.h 2010-10-21 13:09:36.000000000 +0200 -@@ -173,10 +173,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) */ - #define EXT3_TOPDIR_FL 0x00020000 /* Top of directory hierarchies*/ -+#define EXT3_IXUNLINK_FL 0x08000000 /* Immutable invert on unlink */ - #define EXT3_RESERVED_FL 0x80000000 /* reserved for ext3 lib */ + static inline unsigned iminor(const struct inode *inode) + { +- return MINOR(inode->i_rdev); ++ return MINOR(inode->i_mdev); + } --#define EXT3_FL_USER_VISIBLE 0x0003DFFF /* User visible flags */ --#define EXT3_FL_USER_MODIFIABLE 0x000380FF /* User modifiable flags */ -+#define EXT3_BARRIER_FL 0x04000000 /* Barrier for chroot() */ -+#define EXT3_COW_FL 0x20000000 /* Copy on Write marker */ -+ -+#define EXT3_FL_USER_VISIBLE 0x0103DFFF /* User visible flags */ -+#define EXT3_FL_USER_MODIFIABLE 0x010380FF /* User modifiable flags */ + static inline unsigned imajor(const struct inode *inode) + { +- return MAJOR(inode->i_rdev); ++ return MAJOR(inode->i_mdev); + } - /* Flags that should be inherited by new inodes from their parent. */ - #define EXT3_FL_INHERITED (EXT3_SECRM_FL | EXT3_UNRM_FL | EXT3_COMPR_FL |\ -@@ -312,7 +316,8 @@ struct ext3_inode { - __u16 i_pad1; - __le16 l_i_uid_high; /* these 2 fields */ - __le16 l_i_gid_high; /* were reserved2[0] */ -- __u32 l_i_reserved2; -+ __le16 l_i_tag; /* Context Tag */ -+ __u16 l_i_reserved2; - } linux2; - struct { - __u8 h_i_frag; /* Fragment number */ -@@ -343,6 +348,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 -+#define i_raw_tag osd2.linux2.l_i_tag - #define i_reserved2 osd2.linux2.l_i_reserved2 + extern struct block_device *I_BDEV(struct inode *inode); +@@ -805,6 +820,7 @@ struct file { + loff_t f_pos; + struct fown_struct f_owner; + const struct cred *f_cred; ++ vxid_t f_xid; + struct file_ra_state f_ra; - #elif defined(__GNU__) -@@ -405,6 +411,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 */ -+#define EXT3_MOUNT_TAGGED (1<<24) /* Enable Context Tags */ + u64 f_version; +@@ -929,6 +945,7 @@ struct file_lock { + struct file *fl_file; + loff_t fl_start; + loff_t fl_end; ++ vxid_t fl_xid; - /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */ - #ifndef _LINUX_EXT2_FS_H -@@ -908,6 +915,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); -+extern int ext3_sync_flags(struct inode *, int, int); + struct fasync_struct * fl_fasync; /* for lease break notifications */ + /* for lease breaks: */ +@@ -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 *); ++ int (*sync_flags) (struct inode *, int, int); + int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start, + u64 len); + int (*update_time)(struct inode *, struct timespec *, int); +@@ -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); ++ssize_t vfs_sendfile(struct file *, struct file *, loff_t *, size_t, loff_t); - /* ioctl.c */ - extern long ext3_ioctl(struct file *, unsigned int, unsigned long); -diff -NurpP --minimal linux-2.6.36.2/include/linux/fs.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/fs.h ---- linux-2.6.36.2/include/linux/fs.h 2010-10-21 13:07:53.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/fs.h 2010-10-21 13:09:36.000000000 +0200 -@@ -208,6 +208,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_BORN (1<<29) - #define MS_ACTIVE (1<<30) - #define MS_NOUSER (1<<31) -@@ -235,6 +238,14 @@ struct inodes_stat_t { - #define S_NOCMTIME 128 /* Do not update file c/mtime */ - #define S_SWAPFILE 256 /* Do not truncate: swapon got its bmaps */ - #define S_PRIVATE 512 /* Inode is fs-internal */ -+#define S_IXUNLINK 1024 /* Immutable Invert on unlink */ + 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 *); +@@ -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 */ ++#define S_IXUNLINK 8192 /* Immutable Invert on unlink */ + +/* Linux-VServer related Inode flags */ + @@ -8696,14 +7084,10 @@ diff -NurpP --minimal linux-2.6.36.2/include/linux/fs.h linux-2.6.36.2-vs2.3.0.3 /* * Note that nosuid etc flags are inode-specific: setting some file-system -@@ -257,12 +268,15 @@ struct inodes_stat_t { - #define IS_DIRSYNC(inode) (__IS_FLG(inode, MS_SYNCHRONOUS|MS_DIRSYNC) || \ - ((inode)->i_flags & (S_SYNC|S_DIRSYNC))) +@@ -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) -+#define IS_NOATIME(inode) __IS_FLG(inode, MS_RDONLY|MS_NOATIME) -+#define IS_I_VERSION(inode) __IS_FLG(inode, MS_I_VERSION) + #define IS_NOATIME(inode) __IS_FLG(inode, MS_RDONLY|MS_NOATIME) + #define IS_I_VERSION(inode) __IS_FLG(inode, MS_I_VERSION) +#define IS_TAGGED(inode) __IS_FLG(inode, MS_TAGGED) #define IS_NOQUOTA(inode) ((inode)->i_flags & S_NOQUOTA) @@ -8714,9 +7098,9 @@ diff -NurpP --minimal linux-2.6.36.2/include/linux/fs.h linux-2.6.36.2-vs2.3.0.3 #define IS_POSIXACL(inode) __IS_FLG(inode, MS_POSIXACL) #define IS_DEADDIR(inode) ((inode)->i_flags & S_DEAD) -@@ -270,6 +284,16 @@ struct inodes_stat_t { - #define IS_SWAPFILE(inode) ((inode)->i_flags & S_SWAPFILE) - #define IS_PRIVATE(inode) ((inode)->i_flags & S_PRIVATE) +@@ -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)) + @@ -8728,168 +7112,34 @@ diff -NurpP --minimal linux-2.6.36.2/include/linux/fs.h linux-2.6.36.2-vs2.3.0.3 +# define IS_COW_LINK(inode) (0) +#endif + - /* the read-only stuff doesn't really belong here, but any other place is - probably as bad and I don't want to create yet another include file. */ - -@@ -353,11 +377,14 @@ struct inodes_stat_t { - #define FS_TOPDIR_FL 0x00020000 /* Top of directory hierarchies*/ - #define FS_EXTENT_FL 0x00080000 /* Extents */ - #define FS_DIRECTIO_FL 0x00100000 /* Use direct i/o */ -+#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 -@@ -437,6 +464,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 -@@ -452,6 +480,7 @@ struct iattr { - umode_t ia_mode; - uid_t ia_uid; - gid_t ia_gid; -+ tag_t ia_tag; - loff_t ia_size; - struct timespec ia_atime; - struct timespec ia_mtime; -@@ -465,6 +494,9 @@ struct iattr { - struct file *ia_file; - }; + * Inode state bits. Protected by inode->i_lock + * +@@ -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() */ +#define ATTR_FLAG_IXUNLINK 1024 /* Immutable invert on unlink */ + /* - * Includes for diskquotas. - */ -@@ -732,7 +764,9 @@ struct inode { - unsigned int i_nlink; - uid_t i_uid; - gid_t i_gid; -+ tag_t i_tag; - dev_t i_rdev; -+ dev_t i_mdev; - unsigned int i_blkbits; - u64 i_version; - loff_t i_size; -@@ -774,7 +808,8 @@ struct inode { - unsigned long i_state; - unsigned long dirtied_when; /* jiffies of first dirtying */ - -- unsigned int i_flags; -+ unsigned short i_flags; -+ unsigned short i_vflags; - - atomic_t i_writecount; - #ifdef CONFIG_SECURITY -@@ -862,12 +897,12 @@ static inline void i_size_write(struct i - - static inline unsigned iminor(const struct inode *inode) - { -- return MINOR(inode->i_rdev); -+ return MINOR(inode->i_mdev); - } - - static inline unsigned imajor(const struct inode *inode) - { -- return MAJOR(inode->i_rdev); -+ return MAJOR(inode->i_mdev); - } - - extern struct block_device *I_BDEV(struct inode *inode); -@@ -929,6 +964,7 @@ struct file { - loff_t f_pos; - struct fown_struct f_owner; - const struct cred *f_cred; -+ xid_t f_xid; - struct file_ra_state f_ra; - - u64 f_version; -@@ -1068,6 +1104,7 @@ struct file_lock { - struct file *fl_file; - loff_t fl_start; - loff_t fl_end; -+ xid_t fl_xid; - - struct fasync_struct * fl_fasync; /* for lease break notifications */ - unsigned long fl_break_time; /* for nonblocking lease breaks */ -@@ -1536,6 +1573,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 *); -+ int (*sync_flags) (struct inode *, int, int); - void (*truncate_range)(struct inode *, loff_t, loff_t); - long (*fallocate)(struct inode *inode, int mode, loff_t offset, - loff_t len); -@@ -1556,6 +1594,7 @@ extern ssize_t vfs_readv(struct file *, - unsigned long, loff_t *); - extern ssize_t vfs_writev(struct file *, const struct iovec __user *, - unsigned long, loff_t *); -+ssize_t vfs_sendfile(struct file *, struct file *, loff_t *, size_t, loff_t); - - struct super_operations { - struct inode *(*alloc_inode)(struct super_block *sb); -@@ -2344,6 +2383,7 @@ extern int dcache_dir_open(struct inode + * Candidates for mandatory locking have the setgid bit set + * but no group execute bit - an otherwise meaningless combination. +@@ -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-2.6.36.2/include/linux/gfs2_ondisk.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/gfs2_ondisk.h ---- linux-2.6.36.2/include/linux/gfs2_ondisk.h 2010-07-07 18:31:55.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/gfs2_ondisk.h 2010-10-21 13:09:36.000000000 +0200 -@@ -211,6 +211,9 @@ enum { - gfs2fl_NoAtime = 7, - gfs2fl_Sync = 8, - gfs2fl_System = 9, -+ gfs2fl_IXUnlink = 16, -+ gfs2fl_Barrier = 17, -+ gfs2fl_Cow = 18, - gfs2fl_TruncInProg = 29, - gfs2fl_InheritDirectio = 30, - gfs2fl_InheritJdata = 31, -@@ -227,6 +230,9 @@ enum { - #define GFS2_DIF_NOATIME 0x00000080 - #define GFS2_DIF_SYNC 0x00000100 - #define GFS2_DIF_SYSTEM 0x00000200 /* 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 - #define GFS2_DIF_INHERIT_JDATA 0x80000000 -diff -NurpP --minimal linux-2.6.36.2/include/linux/if_tun.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/if_tun.h ---- linux-2.6.36.2/include/linux/if_tun.h 2010-08-02 16:52:54.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/if_tun.h 2010-10-21 13:09:36.000000000 +0200 -@@ -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-2.6.36.2/include/linux/init_task.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/init_task.h ---- linux-2.6.36.2/include/linux/init_task.h 2010-08-02 16:52:54.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/init_task.h 2010-10-21 13:09:36.000000000 +0200 -@@ -172,6 +172,10 @@ extern struct cred init_cred; - INIT_FTRACE_GRAPH \ - INIT_TRACE_RECURSION \ - INIT_TASK_RCU_PREEMPT(tsk) \ +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, \ @@ -8897,76 +7147,23 @@ diff -NurpP --minimal linux-2.6.36.2/include/linux/init_task.h linux-2.6.36.2-vs } -diff -NurpP --minimal linux-2.6.36.2/include/linux/ipc.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/ipc.h ---- linux-2.6.36.2/include/linux/ipc.h 2009-12-03 20:02:55.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/ipc.h 2010-10-21 13:09:36.000000000 +0200 -@@ -91,6 +91,7 @@ struct kern_ipc_perm +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; - uid_t uid; - gid_t gid; -+ xid_t xid; - uid_t cuid; - gid_t cgid; - mode_t mode; -diff -NurpP --minimal linux-2.6.36.2/include/linux/Kbuild linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/Kbuild ---- linux-2.6.36.2/include/linux/Kbuild 2010-10-21 13:07:52.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/Kbuild 2010-10-21 14:12:01.000000000 +0200 -@@ -15,6 +15,7 @@ header-y += netfilter_bridge/ - header-y += netfilter_ipv4/ - header-y += netfilter_ipv6/ - header-y += usb/ -+header-y += vserver/ - header-y += wimax/ - - objhdr-y += version.h -diff -NurpP --minimal linux-2.6.36.2/include/linux/loop.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/loop.h ---- linux-2.6.36.2/include/linux/loop.h 2009-09-10 15:26:25.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/loop.h 2010-10-21 13:09:36.000000000 +0200 -@@ -45,6 +45,7 @@ struct loop_device { - struct loop_func_table *lo_encryption; - __u32 lo_init[2]; - uid_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-2.6.36.2/include/linux/magic.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/magic.h ---- linux-2.6.36.2/include/linux/magic.h 2010-07-07 18:31:55.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/magic.h 2010-10-21 13:09:36.000000000 +0200 -@@ -3,7 +3,7 @@ - - #define ADFS_SUPER_MAGIC 0xadf5 - #define AFFS_SUPER_MAGIC 0xadff --#define AFS_SUPER_MAGIC 0x5346414F -+#define AFS_SUPER_MAGIC 0x5346414F - #define AUTOFS_SUPER_MAGIC 0x0187 - #define CODA_SUPER_MAGIC 0x73757245 - #define CRAMFS_MAGIC 0x28cd3d45 /* some random number */ -@@ -38,6 +38,7 @@ - #define NFS_SUPER_MAGIC 0x6969 - #define OPENPROM_SUPER_MAGIC 0x9fa1 - #define PROC_SUPER_MAGIC 0x9fa0 -+#define DEVPTS_SUPER_MAGIC 0x1cd1 - #define QNX4_SUPER_MAGIC 0x002f /* qnx4 fs detection */ - - #define REISERFS_SUPER_MAGIC 0x52654973 /* used by gcc */ -diff -NurpP --minimal linux-2.6.36.2/include/linux/major.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/major.h ---- linux-2.6.36.2/include/linux/major.h 2009-09-10 15:26:25.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/major.h 2010-10-21 13:09:36.000000000 +0200 -@@ -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-2.6.36.2/include/linux/memcontrol.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/memcontrol.h ---- linux-2.6.36.2/include/linux/memcontrol.h 2010-10-21 13:07:53.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/memcontrol.h 2010-10-28 19:36:06.000000000 +0200 -@@ -77,6 +77,13 @@ int task_in_mem_cgroup(struct task_struc - extern struct mem_cgroup *try_get_mem_cgroup_from_page(struct page *page); - extern struct mem_cgroup *mem_cgroup_from_task(struct task_struct *p); + kuid_t uid; + kgid_t gid; ++ vxid_t xid; + kuid_t cuid; + kgid_t cgid; + umode_t mode; +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_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); @@ -8976,67 +7173,46 @@ diff -NurpP --minimal linux-2.6.36.2/include/linux/memcontrol.h linux-2.6.36.2-v +extern s64 mem_cgroup_stat_read_mapped(struct mem_cgroup *mem); + static inline - int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup) + bool mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *memcg) { -diff -NurpP --minimal linux-2.6.36.2/include/linux/mm_types.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/mm_types.h ---- linux-2.6.36.2/include/linux/mm_types.h 2010-10-21 13:07:53.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/mm_types.h 2010-10-21 13:09:36.000000000 +0200 -@@ -269,6 +269,7 @@ struct mm_struct { - - /* Architecture-specific MM context */ - mm_context_t context; -+ struct vx_info *mm_vx_info; - - /* Swap token stuff */ - /* -diff -NurpP --minimal linux-2.6.36.2/include/linux/mount.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/mount.h ---- linux-2.6.36.2/include/linux/mount.h 2010-10-21 13:07:53.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/mount.h 2010-10-21 13:09:36.000000000 +0200 -@@ -46,6 +46,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 + struct vfsmount { - struct list_head mnt_hash; - struct vfsmount *mnt_parent; /* fs we are mounted on */ -@@ -84,6 +87,7 @@ struct vfsmount { - #else - int mnt_writers; - #endif -+ tag_t mnt_tag; /* tagging used for vfsmount */ - }; - - static inline int *get_mnt_writers_ptr(struct vfsmount *mnt) -diff -NurpP --minimal linux-2.6.36.2/include/linux/net.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/net.h ---- linux-2.6.36.2/include/linux/net.h 2010-08-02 16:52:55.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/net.h 2010-10-21 13:09:36.000000000 +0200 -@@ -71,6 +71,7 @@ struct net; - #define SOCK_NOSPACE 2 + struct dentry *mnt_root; /* root of the mounted tree */ + struct super_block *mnt_sb; /* pointer to superblock */ +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_USER_SOCKET 5 + #define SOCK_EXTERNALLY_ALLOCATED 5 ++#define SOCK_USER_SOCKET 6 #ifndef ARCH_HAS_SOCKET_TYPES /** -diff -NurpP --minimal linux-2.6.36.2/include/linux/nfs_mount.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/nfs_mount.h ---- linux-2.6.36.2/include/linux/nfs_mount.h 2010-10-21 13:07:54.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/nfs_mount.h 2010-10-21 13:09:36.000000000 +0200 -@@ -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-2.6.36.2/include/linux/nsproxy.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/nsproxy.h ---- linux-2.6.36.2/include/linux/nsproxy.h 2009-06-11 17:13:17.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/nsproxy.h 2010-10-21 13:09:36.000000000 +0200 +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 @@ -9045,16 +7221,17 @@ diff -NurpP --minimal linux-2.6.36.2/include/linux/nsproxy.h linux-2.6.36.2-vs2. struct mnt_namespace; struct uts_namespace; -@@ -63,22 +64,33 @@ 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); void exit_task_namespaces(struct task_struct *tsk); void switch_task_namespaces(struct task_struct *tsk, struct nsproxy *new); void free_nsproxy(struct nsproxy *ns); - int unshare_nsproxy_namespaces(unsigned long, struct nsproxy **, - struct fs_struct *); +@@ -70,16 +72,26 @@ int unshare_nsproxy_namespaces(unsigned + struct cred *, struct fs_struct *); + int __init nsproxy_cache_init(void); -static inline void put_nsproxy(struct nsproxy *ns) +#define get_nsproxy(n) __get_nsproxy(n, __FILE__, __LINE__) @@ -9084,10 +7261,10 @@ diff -NurpP --minimal linux-2.6.36.2/include/linux/nsproxy.h linux-2.6.36.2-vs2. + } } - #ifdef CONFIG_CGROUP_NS -diff -NurpP --minimal linux-2.6.36.2/include/linux/pid.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/pid.h ---- linux-2.6.36.2/include/linux/pid.h 2009-03-24 14:22:43.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/pid.h 2010-10-21 13:09:36.000000000 +0200 + #endif +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, @@ -9098,7 +7275,7 @@ diff -NurpP --minimal linux-2.6.36.2/include/linux/pid.h linux-2.6.36.2-vs2.3.0. }; /* -@@ -160,6 +161,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); @@ -9106,47 +7283,9 @@ diff -NurpP --minimal linux-2.6.36.2/include/linux/pid.h linux-2.6.36.2-vs2.3.0. pid_t pid_vnr(struct pid *pid); #define do_each_pid_task(pid, type, task) \ -diff -NurpP --minimal linux-2.6.36.2/include/linux/proc_fs.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/proc_fs.h ---- linux-2.6.36.2/include/linux/proc_fs.h 2009-12-03 20:02:56.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/proc_fs.h 2010-10-21 13:09:36.000000000 +0200 -@@ -56,6 +56,7 @@ struct proc_dir_entry { - nlink_t nlink; - uid_t uid; - gid_t gid; -+ int vx_flags; - loff_t size; - const struct inode_operations *proc_iops; - /* -@@ -250,12 +251,18 @@ kclist_add(struct kcore_list *new, void - extern void kclist_add(struct kcore_list *, void *, size_t, int type); - #endif - -+struct vx_info; -+struct nx_info; -+ - union proc_op { - int (*proc_get_link)(struct inode *, 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; -@@ -263,6 +270,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-2.6.36.2/include/linux/quotaops.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/quotaops.h ---- linux-2.6.36.2/include/linux/quotaops.h 2010-10-21 13:07:54.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/quotaops.h 2010-10-21 13:09:36.000000000 +0200 +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_ @@ -9155,7 +7294,7 @@ diff -NurpP --minimal linux-2.6.36.2/include/linux/quotaops.h linux-2.6.36.2-vs2 #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) { @@ -9169,7 +7308,7 @@ diff -NurpP --minimal linux-2.6.36.2/include/linux/quotaops.h linux-2.6.36.2-vs2 } 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) { @@ -9180,7 +7319,7 @@ diff -NurpP --minimal linux-2.6.36.2/include/linux/quotaops.h linux-2.6.36.2-vs2 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); @@ -9188,80 +7327,25 @@ diff -NurpP --minimal linux-2.6.36.2/include/linux/quotaops.h linux-2.6.36.2-vs2 } static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number) -diff -NurpP --minimal linux-2.6.36.2/include/linux/reboot.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/reboot.h ---- linux-2.6.36.2/include/linux/reboot.h 2010-07-07 18:31:56.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/reboot.h 2010-10-21 13:09:36.000000000 +0200 -@@ -33,6 +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 - - - #ifdef __KERNEL__ -diff -NurpP --minimal linux-2.6.36.2/include/linux/reiserfs_fs.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/reiserfs_fs.h ---- linux-2.6.36.2/include/linux/reiserfs_fs.h 2010-10-21 13:07:54.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/reiserfs_fs.h 2010-10-21 13:09:36.000000000 +0200 -@@ -977,6 +977,11 @@ struct stat_data_v1 { - #define REISERFS_COMPR_FL FS_COMPR_FL - #define REISERFS_NOTAIL_FL FS_NOTAIL_FL - -+/* unfortunately reiserfs sdattr is only 16 bit */ -+#define REISERFS_IXUNLINK_FL (FS_IXUNLINK_FL >> 16) -+#define REISERFS_BARRIER_FL (FS_BARRIER_FL >> 16) -+#define REISERFS_COW_FL (FS_COW_FL >> 16) -+ - /* persistent flags that file inherits from the parent directory */ - #define REISERFS_INHERIT_MASK ( REISERFS_IMMUTABLE_FL | \ - REISERFS_SYNC_FL | \ -@@ -986,6 +991,9 @@ struct stat_data_v1 { - REISERFS_COMPR_FL | \ - REISERFS_NOTAIL_FL ) - -+#define REISERFS_FL_USER_VISIBLE 0x80FF -+#define REISERFS_FL_USER_MODIFIABLE 0x80FF -+ - /* Stat Data on disk (reiserfs version of UFS disk inode minus the - address blocks) */ - struct stat_data { -@@ -2071,6 +2079,7 @@ static inline void reiserfs_update_sd(st - void sd_attrs_to_i_attrs(__u16 sd_attrs, struct inode *inode); - void i_attrs_to_sd_attrs(struct inode *inode, __u16 * sd_attrs); - int reiserfs_setattr(struct dentry *dentry, struct iattr *attr); -+int reiserfs_sync_flags(struct inode *inode, int, int); - - /* namei.c */ - void set_de_name_and_namelen(struct reiserfs_dir_entry *de); -diff -NurpP --minimal linux-2.6.36.2/include/linux/reiserfs_fs_sb.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/reiserfs_fs_sb.h ---- linux-2.6.36.2/include/linux/reiserfs_fs_sb.h 2010-02-25 11:52:07.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/reiserfs_fs_sb.h 2010-10-21 13:09:36.000000000 +0200 -@@ -476,6 +476,7 @@ enum reiserfs_mount_options { - REISERFS_EXPOSE_PRIVROOT, - REISERFS_BARRIER_NONE, - REISERFS_BARRIER_FLUSH, -+ REISERFS_TAGGED, - - /* Actions on error */ - REISERFS_ERROR_PANIC, -diff -NurpP --minimal linux-2.6.36.2/include/linux/sched.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/sched.h ---- linux-2.6.36.2/include/linux/sched.h 2010-10-21 13:07:54.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/sched.h 2010-10-21 13:09:36.000000000 +0200 -@@ -1339,6 +1339,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 - seccomp_t seccomp; + struct seccomp seccomp; +/* vserver context data */ + 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; -@@ -1573,6 +1581,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); @@ -9273,7 +7357,7 @@ diff -NurpP --minimal linux-2.6.36.2/include/linux/sched.h linux-2.6.36.2-vs2.3. static inline pid_t task_pid_nr(struct task_struct *tsk) { return tsk->pid; -@@ -1586,7 +1599,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) { @@ -9283,7 +7367,7 @@ diff -NurpP --minimal linux-2.6.36.2/include/linux/sched.h linux-2.6.36.2-vs2.3. } -@@ -1599,7 +1613,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) { @@ -9292,47 +7376,47 @@ diff -NurpP --minimal linux-2.6.36.2/include/linux/sched.h linux-2.6.36.2-vs2.3. } -diff -NurpP --minimal linux-2.6.36.2/include/linux/shmem_fs.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/shmem_fs.h ---- linux-2.6.36.2/include/linux/shmem_fs.h 2010-10-21 13:07:55.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/shmem_fs.h 2010-10-21 13:09:36.000000000 +0200 -@@ -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 @@ - #define SHMEM_NR_DIRECT 16 + /* inode in-kernel data */ +#define TMPFS_SUPER_MAGIC 0x01021994 + + struct shmem_inode_info { spinlock_t lock; - unsigned long flags; -diff -NurpP --minimal linux-2.6.36.2/include/linux/stat.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/stat.h ---- linux-2.6.36.2/include/linux/stat.h 2008-12-25 00:26:37.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/stat.h 2010-10-21 13:09:36.000000000 +0200 -@@ -66,6 +66,7 @@ struct kstat { + 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; - uid_t uid; - gid_t gid; -+ tag_t tag; + kuid_t uid; + kgid_t gid; ++ ktag_t tag; dev_t rdev; loff_t size; struct timespec atime; -diff -NurpP --minimal linux-2.6.36.2/include/linux/sunrpc/auth.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/sunrpc/auth.h ---- linux-2.6.36.2/include/linux/sunrpc/auth.h 2010-10-21 13:07:55.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/sunrpc/auth.h 2010-10-21 13:09:36.000000000 +0200 -@@ -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; - unsigned char machine_cred : 1; - }; -diff -NurpP --minimal linux-2.6.36.2/include/linux/sunrpc/clnt.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/sunrpc/clnt.h ---- linux-2.6.36.2/include/linux/sunrpc/clnt.h 2010-10-21 13:07:55.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/sunrpc/clnt.h 2010-10-21 13:09:36.000000000 +0200 -@@ -49,7 +49,8 @@ struct rpc_clnt { - unsigned int cl_softrtry : 1,/* soft timeouts */ + const char *principal; + 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 */ @@ -9340,78 +7424,121 @@ diff -NurpP --minimal linux-2.6.36.2/include/linux/sunrpc/clnt.h linux-2.6.36.2- struct rpc_rtt * cl_rtt; /* RTO estimator data */ const struct rpc_timeout *cl_timeout; /* Timeout strategy */ -diff -NurpP --minimal linux-2.6.36.2/include/linux/syscalls.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/syscalls.h ---- linux-2.6.36.2/include/linux/syscalls.h 2010-10-21 13:07:55.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/syscalls.h 2010-10-21 13:09:36.000000000 +0200 -@@ -478,6 +478,8 @@ asmlinkage long sys_symlink(const char _ - asmlinkage long sys_unlink(const char __user *pathname); - asmlinkage long sys_rename(const char __user *oldname, - const char __user *newname); -+asmlinkage long sys_copyfile(const char __user *from, const char __user *to, -+ umode_t mode); - asmlinkage long sys_chmod(const char __user *filename, mode_t mode); - asmlinkage long sys_fchmod(unsigned int fd, mode_t mode); - -diff -NurpP --minimal linux-2.6.36.2/include/linux/sysctl.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/sysctl.h ---- linux-2.6.36.2/include/linux/sysctl.h 2010-08-02 16:52:56.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/sysctl.h 2010-10-21 13:09:36.000000000 +0200 -@@ -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 +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 vxid_t; ++typedef unsigned int vnid_t; ++typedef unsigned int vtag_t; - 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 */ + typedef unsigned long uintptr_t; - KERN_SPARC_REBOOT=21, /* reboot command on Sparc */ - KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */ -diff -NurpP --minimal linux-2.6.36.2/include/linux/sysfs.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/sysfs.h ---- linux-2.6.36.2/include/linux/sysfs.h 2010-10-21 13:07:55.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/sysfs.h 2010-10-21 13:09:36.000000000 +0200 -@@ -19,6 +19,8 @@ - #include - #include - -+#define SYSFS_SUPER_MAGIC 0x62656572 -+ - struct kobject; - struct module; - enum kobj_ns_type; -diff -NurpP --minimal linux-2.6.36.2/include/linux/time.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/time.h ---- linux-2.6.36.2/include/linux/time.h 2010-10-21 13:07:55.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/time.h 2010-10-21 13:09:36.000000000 +0200 -@@ -252,6 +252,9 @@ static __always_inline void timespec_add - a->tv_sec += __iter_div_u64_rem(a->tv_nsec + ns, NSEC_PER_SEC, &ns); - a->tv_nsec = ns; +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; + +- + typedef struct { + gid_t val; + } kgid_t; + ++typedef struct { ++ vtag_t val; ++} ktag_t; ++ + #define KUIDT_INIT(value) (kuid_t){ value } + #define KGIDT_INIT(value) (kgid_t){ value } ++#define KTAGT_INIT(value) (ktag_t){ value } + + static inline uid_t __kuid_val(kuid_t uid) + { +@@ -39,11 +43,18 @@ static inline gid_t __kgid_val(kgid_t gi + return gid.val; } + ++static inline vtag_t __ktag_val(ktag_t tag) ++{ ++ return tag.val; ++} + -+#include + #define GLOBAL_ROOT_UID KUIDT_INIT(0) + #define GLOBAL_ROOT_GID KGIDT_INIT(0) ++#define GLOBAL_ROOT_TAG KTAGT_INIT(0) + + #define INVALID_UID KUIDT_INIT(-1) + #define INVALID_GID KGIDT_INIT(-1) ++#define INVALID_TAG KTAGT_INIT(-1) + + static inline bool uid_eq(kuid_t left, kuid_t right) + { +@@ -55,6 +66,11 @@ static inline bool gid_eq(kgid_t left, k + return __kgid_val(left) == __kgid_val(right); + } + ++static inline bool tag_eq(ktag_t left, ktag_t right) ++{ ++ return __ktag_val(left) == __ktag_val(right); ++} + - #endif /* __KERNEL__ */ + static inline bool uid_gt(kuid_t left, kuid_t right) + { + return __kuid_val(left) > __kuid_val(right); +@@ -105,13 +121,21 @@ static inline bool gid_valid(kgid_t gid) + return !gid_eq(gid, INVALID_GID); + } - #define NFDBITS __NFDBITS -diff -NurpP --minimal linux-2.6.36.2/include/linux/types.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/types.h ---- linux-2.6.36.2/include/linux/types.h 2010-10-21 13:07:55.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/types.h 2010-10-21 13:09:36.000000000 +0200 -@@ -40,6 +40,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; ++static inline bool tag_valid(ktag_t tag) ++{ ++ return !tag_eq(tag, INVALID_TAG); ++} ++ + #ifdef CONFIG_USER_NS - typedef unsigned long uintptr_t; + 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 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 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); + +@@ -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, vtag_t tag) ++{ ++ return KTAGT_INIT(tag); ++} ++ + static inline uid_t from_kuid(struct user_namespace *to, kuid_t kuid) + { + return __kuid_val(kuid); +@@ -147,6 +176,11 @@ static inline gid_t from_kgid(struct use + return __kgid_val(kgid); + } -diff -NurpP --minimal linux-2.6.36.2/include/linux/vroot.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vroot.h ---- linux-2.6.36.2/include/linux/vroot.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vroot.h 2010-10-21 13:09:36.000000000 +0200 ++static inline vtag_t from_ktag(struct user_namespace *to, ktag_t ktag) ++{ ++ return __ktag_val(ktag); ++} ++ + 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.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 @@ + +/* @@ -9464,9 +7591,9 @@ diff -NurpP --minimal linux-2.6.36.2/include/linux/vroot.h linux-2.6.36.2-vs2.3. +#define VROOT_CLR_DEV 0x5601 + +#endif /* _LINUX_VROOT_H */ -diff -NurpP --minimal linux-2.6.36.2/include/linux/vs_base.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vs_base.h ---- linux-2.6.36.2/include/linux/vs_base.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vs_base.h 2010-10-21 13:09:36.000000000 +0200 +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 @@ -9478,9 +7605,9 @@ diff -NurpP --minimal linux-2.6.36.2/include/linux/vs_base.h linux-2.6.36.2-vs2. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-2.6.36.2/include/linux/vs_context.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vs_context.h ---- linux-2.6.36.2/include/linux/vs_context.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vs_context.h 2010-10-21 13:09:36.000000000 +0200 +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 @@ -9693,7 +7820,7 @@ diff -NurpP --minimal linux-2.6.36.2/include/linux/vs_context.h linux-2.6.36.2-v +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) @@ -9724,9 +7851,9 @@ diff -NurpP --minimal linux-2.6.36.2/include/linux/vs_context.h linux-2.6.36.2-v +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-2.6.36.2/include/linux/vs_cowbl.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vs_cowbl.h ---- linux-2.6.36.2/include/linux/vs_cowbl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vs_cowbl.h 2010-10-21 13:09:36.000000000 +0200 +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 @@ -9776,9 +7903,9 @@ diff -NurpP --minimal linux-2.6.36.2/include/linux/vs_cowbl.h linux-2.6.36.2-vs2 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-2.6.36.2/include/linux/vs_cvirt.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vs_cvirt.h ---- linux-2.6.36.2/include/linux/vs_cvirt.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vs_cvirt.h 2010-10-21 13:09:36.000000000 +0200 +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 @@ -9830,9 +7957,9 @@ diff -NurpP --minimal linux-2.6.36.2/include/linux/vs_cvirt.h linux-2.6.36.2-vs2 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-2.6.36.2/include/linux/vs_device.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vs_device.h ---- linux-2.6.36.2/include/linux/vs_device.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vs_device.h 2010-10-21 13:09:36.000000000 +0200 +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 @@ -9879,9 +8006,9 @@ diff -NurpP --minimal linux-2.6.36.2/include/linux/vs_device.h linux-2.6.36.2-vs +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-2.6.36.2/include/linux/vs_dlimit.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vs_dlimit.h ---- linux-2.6.36.2/include/linux/vs_dlimit.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vs_dlimit.h 2010-10-21 13:09:36.000000000 +0200 +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 @@ -9931,7 +8058,7 @@ diff -NurpP --minimal linux-2.6.36.2/include/linux/vs_dlimit.h linux-2.6.36.2-vs +#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; @@ -9957,7 +8084,7 @@ diff -NurpP --minimal linux-2.6.36.2/include/linux/vs_dlimit.h linux-2.6.36.2-vs +} + +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; + @@ -9982,7 +8109,7 @@ diff -NurpP --minimal linux-2.6.36.2/include/linux/vs_dlimit.h linux-2.6.36.2-vs +} + +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; @@ -10004,7 +8131,7 @@ diff -NurpP --minimal linux-2.6.36.2/include/linux/vs_dlimit.h linux-2.6.36.2-vs +} + +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; + @@ -10025,7 +8152,7 @@ diff -NurpP --minimal linux-2.6.36.2/include/linux/vs_dlimit.h linux-2.6.36.2-vs + 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) +{ @@ -10061,34 +8188,34 @@ diff -NurpP --minimal linux-2.6.36.2/include/linux/vs_dlimit.h linux-2.6.36.2-vs +} + +#define dl_prealloc_space(in, bytes) \ -+ __dl_alloc_space((in)->i_sb, (in)->i_tag, (dlsize_t)(bytes), \ ++ __dl_alloc_space((in)->i_sb, i_tag_read(in), (dlsize_t)(bytes), \ + __FILE__, __LINE__ ) + +#define dl_alloc_space(in, bytes) \ -+ __dl_alloc_space((in)->i_sb, (in)->i_tag, (dlsize_t)(bytes), \ ++ __dl_alloc_space((in)->i_sb, i_tag_read(in), (dlsize_t)(bytes), \ + __FILE__, __LINE__ ) + +#define dl_reserve_space(in, bytes) \ -+ __dl_alloc_space((in)->i_sb, (in)->i_tag, (dlsize_t)(bytes), \ ++ __dl_alloc_space((in)->i_sb, i_tag_read(in), (dlsize_t)(bytes), \ + __FILE__, __LINE__ ) + +#define dl_claim_space(in, bytes) (0) + +#define dl_release_space(in, bytes) \ -+ __dl_free_space((in)->i_sb, (in)->i_tag, (dlsize_t)(bytes), \ ++ __dl_free_space((in)->i_sb, i_tag_read(in), (dlsize_t)(bytes), \ + __FILE__, __LINE__ ) + +#define dl_free_space(in, bytes) \ -+ __dl_free_space((in)->i_sb, (in)->i_tag, (dlsize_t)(bytes), \ ++ __dl_free_space((in)->i_sb, i_tag_read(in), (dlsize_t)(bytes), \ + __FILE__, __LINE__ ) + + + +#define dl_alloc_inode(in) \ -+ __dl_alloc_inode((in)->i_sb, (in)->i_tag, __FILE__, __LINE__ ) ++ __dl_alloc_inode((in)->i_sb, i_tag_read(in), __FILE__, __LINE__ ) + +#define dl_free_inode(in) \ -+ __dl_free_inode((in)->i_sb, (in)->i_tag, __FILE__, __LINE__ ) ++ __dl_free_inode((in)->i_sb, i_tag_read(in), __FILE__, __LINE__ ) + + +#define dl_adjust_block(sb, tag, fb, rb) \ @@ -10098,2437 +8225,2875 @@ diff -NurpP --minimal linux-2.6.36.2/include/linux/vs_dlimit.h linux-2.6.36.2-vs +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/base.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/base.h ---- linux-2.6.36.2/include/linux/vserver/base.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/base.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,170 @@ -+#ifndef _VX_BASE_H -+#define _VX_BASE_H -+ -+ -+/* context state changes */ -+ -+enum { -+ VSC_STARTUP = 1, -+ VSC_SHUTDOWN, -+ -+ VSC_NETUP, -+ VSC_NETDOWN, -+}; -+ -+ +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 + -+#define vx_task_xid(t) ((t)->xid) ++#include "vserver/base.h" ++#include "vserver/network.h" ++#include "vserver/debug.h" + -+#define vx_current_xid() vx_task_xid(current) ++#define IPI_LOOPBACK htonl(INADDR_LOOPBACK) + -+#define current_vx_info() (current->vx_info) ++#define NXAV4(a) NIPQUAD((a)->ip[0]), NIPQUAD((a)->ip[1]), \ ++ NIPQUAD((a)->mask), (a)->type ++#define NXAV4_FMT "[" NIPQUAD_FMT "-" NIPQUAD_FMT "/" NIPQUAD_FMT ":%04x]" + ++#define NIPQUAD(addr) \ ++ ((unsigned char *)&addr)[0], \ ++ ((unsigned char *)&addr)[1], \ ++ ((unsigned char *)&addr)[2], \ ++ ((unsigned char *)&addr)[3] + -+#define nx_task_nid(t) ((t)->nid) ++#define NIPQUAD_FMT "%u.%u.%u.%u" + -+#define nx_current_nid() nx_task_nid(current) + -+#define current_nx_info() (current->nx_info) ++static inline ++int v4_addr_match(struct nx_addr_v4 *nxa, __be32 addr, uint16_t tmask) ++{ ++ __be32 ip = nxa->ip[0].s_addr; ++ __be32 mask = nxa->mask.s_addr; ++ __be32 bcast = ip | ~mask; ++ int ret = 0; + ++ switch (nxa->type & tmask) { ++ case NXA_TYPE_MASK: ++ ret = (ip == (addr & mask)); ++ break; ++ case NXA_TYPE_ADDR: ++ ret = 3; ++ if (addr == ip) ++ break; ++ /* fall through to broadcast */ ++ case NXA_MOD_BCAST: ++ ret = ((tmask & NXA_MOD_BCAST) && (addr == bcast)); ++ break; ++ case NXA_TYPE_RANGE: ++ ret = ((nxa->ip[0].s_addr <= addr) && ++ (nxa->ip[1].s_addr > addr)); ++ break; ++ case NXA_TYPE_ANY: ++ ret = 2; ++ break; ++ } + -+/* generic flag merging */ ++ vxdprintk(VXD_CBIT(net, 0), ++ "v4_addr_match(%p" NXAV4_FMT "," NIPQUAD_FMT ",%04x) = %d", ++ nxa, NXAV4(nxa), NIPQUAD(addr), tmask, ret); ++ return ret; ++} + -+#define vs_check_flags(v, m, f) (((v) & (m)) ^ (f)) ++static inline ++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; + -+#define vs_mask_flags(v, f, m) (((v) & ~(m)) | ((f) & (m))) ++ if (!nxi) ++ goto out; + -+#define vs_mask_mask(v, f, m) (((v) & ~(m)) | ((v) & (f) & (m))) -+ -+#define vs_check_bit(v, n) ((v) & (1LL << (n))) ++ ret = 2; ++ /* allow 127.0.0.1 when remapping lback */ ++ if ((tmask & NXA_LOOPBACK) && ++ (addr == IPI_LOOPBACK) && ++ nx_info_flags(nxi, NXF_LBACK_REMAP, 0)) ++ goto out; ++ ret = 3; ++ /* check for lback address */ ++ if ((tmask & NXA_MOD_LBACK) && ++ (nxi->v4_lback.s_addr == addr)) ++ goto out; ++ ret = 4; ++ /* check for broadcast address */ ++ if ((tmask & NXA_MOD_BCAST) && ++ (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_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", ++ nxi, nxi ? nxi->nx_id : 0, NIPQUAD(addr), tmask, ret); ++ return ret; ++} + -+/* context flags */ ++static inline ++int v4_nx_addr_match(struct nx_addr_v4 *nxa, struct nx_addr_v4 *addr, uint16_t mask) ++{ ++ /* FIXME: needs full range checks */ ++ return v4_addr_match(nxa, addr->ip[0].s_addr, mask); ++} + -+#define __vx_flags(v) ((v) ? (v)->vx_flags : 0) ++static inline ++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; + -+#define vx_current_flags() __vx_flags(current_vx_info()) ++ spin_lock_irqsave(&nxi->addr_lock, irqflags); ++ for (ptr = &nxi->v4; ptr; ptr = ptr->next) ++ if (v4_nx_addr_match(ptr, nxa, mask)) ++ goto out_unlock; ++ ret = 0; ++out_unlock: ++ spin_unlock_irqrestore(&nxi->addr_lock, irqflags); ++ return ret; ++} + -+#define vx_info_flags(v, m, f) \ -+ vs_check_flags(__vx_flags(v), m, f) ++#include + -+#define task_vx_flags(t, m, f) \ -+ ((t) && vx_info_flags((t)->vx_info, m, f)) ++/* ++ * Check if a given address matches for a socket ++ * ++ * nxi: the socket's nx_info if any ++ * addr: to be verified address ++ */ ++static inline ++int v4_sock_addr_match ( ++ struct nx_info *nxi, ++ struct inet_sock *inet, ++ __be32 addr) ++{ ++ __be32 saddr = inet->inet_rcv_saddr; ++ __be32 bcast = nxi ? nxi->v4_bcast.s_addr : INADDR_BROADCAST; + -+#define vx_flags(m, f) vx_info_flags(current_vx_info(), m, f) ++ if (addr && (saddr == addr || bcast == addr)) ++ return 1; ++ if (!saddr) ++ return v4_addr_in_nx_info(nxi, addr, NXA_MASK_BIND); ++ return 0; ++} + + -+/* context caps */ ++/* inet related checks and helpers */ + -+#define __vx_ccaps(v) ((v) ? (v)->vx_ccaps : 0) + -+#define vx_current_ccaps() __vx_ccaps(current_vx_info()) ++struct in_ifaddr; ++struct net_device; ++struct sock; + -+#define vx_info_ccaps(v, c) (__vx_ccaps(v) & (c)) ++#ifdef CONFIG_INET + -+#define vx_ccaps(c) vx_info_ccaps(current_vx_info(), (c)) ++#include ++#include ++#include ++#include + + ++int dev_in_nx_info(struct net_device *, struct nx_info *); ++int v4_dev_in_nx_info(struct net_device *, struct nx_info *); ++int nx_v4_addr_conflict(struct nx_info *, struct nx_info *); + -+/* network flags */ + -+#define __nx_flags(n) ((n) ? (n)->nx_flags : 0) ++/* ++ * check if address is covered by socket ++ * ++ * sk: the socket to check against ++ * addr: the address in question (must be != 0) ++ */ + -+#define nx_current_flags() __nx_flags(current_nx_info()) ++static inline ++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->sk_rcv_saddr; + -+#define nx_info_flags(n, m, f) \ -+ vs_check_flags(__nx_flags(n), m, f) ++ vxdprintk(VXD_CBIT(net, 5), ++ "__v4_addr_in_socket(%p," NXAV4_FMT ") %p:" NIPQUAD_FMT " %p;%lx", ++ sk, NXAV4(nxa), nxi, NIPQUAD(saddr), sk->sk_socket, ++ (sk->sk_socket?sk->sk_socket->flags:0)); + -+#define task_nx_flags(t, m, f) \ -+ ((t) && nx_info_flags((t)->nx_info, m, f)) ++ if (saddr) { /* direct address match */ ++ return v4_addr_match(nxa, saddr, -1); ++ } else if (nxi) { /* match against nx_info */ ++ return v4_nx_addr_in_nx_info(nxi, nxa, -1); ++ } else { /* unrestricted any socket */ ++ return 1; ++ } ++} + -+#define nx_flags(m, f) nx_info_flags(current_nx_info(), m, f) + + -+/* network caps */ ++static inline ++int nx_dev_visible(struct nx_info *nxi, struct net_device *dev) ++{ ++ vxdprintk(VXD_CBIT(net, 1), ++ "nx_dev_visible(%p[#%u],%p " VS_Q("%s") ") %d", ++ nxi, nxi ? nxi->nx_id : 0, dev, dev->name, ++ nxi ? dev_in_nx_info(dev, nxi) : 0); + -+#define __nx_ncaps(n) ((n) ? (n)->nx_ncaps : 0) ++ if (!nx_info_flags(nxi, NXF_HIDE_NETIF, 0)) ++ return 1; ++ if (dev_in_nx_info(dev, nxi)) ++ return 1; ++ return 0; ++} + -+#define nx_current_ncaps() __nx_ncaps(current_nx_info()) + -+#define nx_info_ncaps(n, c) (__nx_ncaps(n) & (c)) ++static inline ++int v4_ifa_in_nx_info(struct in_ifaddr *ifa, struct nx_info *nxi) ++{ ++ if (!nxi) ++ return 1; ++ if (!ifa) ++ return 0; ++ return v4_addr_in_nx_info(nxi, ifa->ifa_local, NXA_MASK_SHOW); ++} + -+#define nx_ncaps(c) nx_info_ncaps(current_nx_info(), c) ++static inline ++int nx_v4_ifa_visible(struct nx_info *nxi, struct in_ifaddr *ifa) ++{ ++ vxdprintk(VXD_CBIT(net, 1), "nx_v4_ifa_visible(%p[#%u],%p) %d", ++ nxi, nxi ? nxi->nx_id : 0, ifa, ++ nxi ? v4_ifa_in_nx_info(ifa, nxi) : 0); + ++ if (!nx_info_flags(nxi, NXF_HIDE_NETIF, 0)) ++ return 1; ++ if (v4_ifa_in_nx_info(ifa, nxi)) ++ return 1; ++ return 0; ++} + -+/* context mask capabilities */ + -+#define __vx_mcaps(v) ((v) ? (v)->vx_ccaps >> 32UL : ~0 ) ++struct nx_v4_sock_addr { ++ __be32 saddr; /* Address used for validation */ ++ __be32 baddr; /* Address used for socket bind */ ++}; + -+#define vx_info_mcaps(v, c) (__vx_mcaps(v) & (c)) ++static inline ++int v4_map_sock_addr(struct inet_sock *inet, struct sockaddr_in *addr, ++ struct nx_v4_sock_addr *nsa) ++{ ++ struct sock *sk = &inet->sk; ++ struct nx_info *nxi = sk->sk_nx_info; ++ __be32 saddr = addr->sin_addr.s_addr; ++ __be32 baddr = saddr; + -+#define vx_mcaps(c) vx_info_mcaps(current_vx_info(), c) ++ vxdprintk(VXD_CBIT(net, 3), ++ "inet_bind(%p)* %p,%p;%lx " NIPQUAD_FMT, ++ sk, sk->sk_nx_info, sk->sk_socket, ++ (sk->sk_socket ? sk->sk_socket->flags : 0), ++ NIPQUAD(saddr)); + ++ if (nxi) { ++ if (saddr == INADDR_ANY) { ++ if (nx_info_flags(nxi, NXF_SINGLE_IP, 0)) ++ baddr = nxi->v4.ip[0].s_addr; ++ } else if (saddr == IPI_LOOPBACK) { ++ if (nx_info_flags(nxi, NXF_LBACK_REMAP, 0)) ++ baddr = nxi->v4_lback.s_addr; ++ } else if (!ipv4_is_multicast(saddr) || ++ !nx_info_ncaps(nxi, NXC_MULTICAST)) { ++ /* normal address bind */ ++ if (!v4_addr_in_nx_info(nxi, saddr, NXA_MASK_BIND)) ++ return -EADDRNOTAVAIL; ++ } ++ } + -+/* context bcap mask */ ++ vxdprintk(VXD_CBIT(net, 3), ++ "inet_bind(%p) " NIPQUAD_FMT ", " NIPQUAD_FMT, ++ sk, NIPQUAD(saddr), NIPQUAD(baddr)); + -+#define __vx_bcaps(v) ((v)->vx_bcaps) ++ nsa->saddr = saddr; ++ nsa->baddr = baddr; ++ return 0; ++} + -+#define vx_current_bcaps() __vx_bcaps(current_vx_info()) ++static inline ++void v4_set_sock_addr(struct inet_sock *inet, struct nx_v4_sock_addr *nsa) ++{ ++ inet->inet_saddr = nsa->baddr; ++ inet->inet_rcv_saddr = nsa->baddr; ++} + + -+/* mask given bcaps */ ++/* ++ * helper to simplify inet_lookup_listener ++ * ++ * nxi: the socket's nx_info if any ++ * addr: to be verified address ++ * saddr: socket address ++ */ ++static inline int v4_inet_addr_match ( ++ struct nx_info *nxi, ++ __be32 addr, ++ __be32 saddr) ++{ ++ if (addr && (saddr == addr)) ++ return 1; ++ if (!saddr) ++ return nxi ? v4_addr_in_nx_info(nxi, addr, NXA_MASK_BIND) : 1; ++ return 0; ++} + -+#define vx_info_mbcaps(v, c) ((v) ? cap_intersect(__vx_bcaps(v), c) : c) ++static inline __be32 nx_map_sock_lback(struct nx_info *nxi, __be32 addr) ++{ ++ if (nx_info_flags(nxi, NXF_HIDE_LBACK, 0) && ++ (addr == nxi->v4_lback.s_addr)) ++ return IPI_LOOPBACK; ++ return addr; ++} + -+#define vx_mbcaps(c) vx_info_mbcaps(current_vx_info(), c) ++static inline ++int nx_info_has_v4(struct nx_info *nxi) ++{ ++ if (!nxi) ++ return 1; ++ if (NX_IPV4(nxi)) ++ return 1; ++ if (nx_info_flags(nxi, NXF_LBACK_REMAP, 0)) ++ return 1; ++ return 0; ++} + ++#else /* CONFIG_INET */ + -+/* masked cap_bset */ ++static inline ++int nx_dev_visible(struct nx_info *n, struct net_device *d) ++{ ++ return 1; ++} + -+#define vx_info_cap_bset(v) vx_info_mbcaps(v, current->cap_bset) -+ -+#define vx_current_cap_bset() vx_info_cap_bset(current_vx_info()) ++static inline ++int nx_v4_addr_conflict(struct nx_info *n, uint32_t a, const struct sock *s) ++{ ++ return 1; ++} + -+#if 0 -+#define vx_info_mbcap(v, b) \ -+ (!vx_info_flags(v, VXF_STATE_SETUP, 0) ? \ -+ vx_info_bcaps(v, b) : (b)) ++static inline ++int v4_ifa_in_nx_info(struct in_ifaddr *a, struct nx_info *n) ++{ ++ return 1; ++} + -+#define task_vx_mbcap(t, b) \ -+ vx_info_mbcap((t)->vx_info, (t)->b) ++static inline ++int nx_info_has_v4(struct nx_info *nxi) ++{ ++ return 0; ++} + -+#define vx_mbcap(b) task_vx_mbcap(current, b) -+#endif ++#endif /* CONFIG_INET */ + -+#define vx_cap_raised(v, c, f) cap_raised(vx_info_mbcaps(v, c), f) ++#define current_nx_info_has_v4() \ ++ nx_info_has_v4(current_nx_info()) + -+#define vx_capable(b, c) (capable(b) || \ -+ (cap_raised(current_cap(), b) && vx_ccaps(c))) ++#else ++// #warning duplicate inclusion ++#endif +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 + -+#define nx_capable(b, c) (capable(b) || \ -+ (cap_raised(current_cap(), b) && nx_ncaps(c))) ++#include "vserver/base.h" ++#include "vserver/network.h" ++#include "vserver/debug.h" + -+#define vx_task_initpid(t, n) \ -+ ((t)->vx_info && \ -+ ((t)->vx_info->vx_initpid == (n))) ++#include + -+#define vx_current_initpid(n) vx_task_initpid(current, n) ++#define NXAV6(a) &(a)->ip, &(a)->mask, (a)->prefix, (a)->type ++#define NXAV6_FMT "[%pI6/%pI6/%d:%04x]" + + -+/* context unshare mask */ ++#ifdef CONFIG_IPV6 + -+#define __vx_umask(v) ((v)->vx_umask) ++static inline ++int v6_addr_match(struct nx_addr_v6 *nxa, ++ const struct in6_addr *addr, uint16_t mask) ++{ ++ int ret = 0; + -+#define vx_current_umask() __vx_umask(current_vx_info()) ++ switch (nxa->type & mask) { ++ case NXA_TYPE_MASK: ++ ret = ipv6_masked_addr_cmp(&nxa->ip, &nxa->mask, addr); ++ break; ++ case NXA_TYPE_ADDR: ++ ret = ipv6_addr_equal(&nxa->ip, addr); ++ break; ++ case NXA_TYPE_ANY: ++ ret = 1; ++ break; ++ } ++ vxdprintk(VXD_CBIT(net, 0), ++ "v6_addr_match(%p" NXAV6_FMT ",%pI6,%04x) = %d", ++ nxa, NXAV6(nxa), addr, mask, ret); ++ return ret; ++} + -+#define vx_can_unshare(b, f) (capable(b) || \ -+ (cap_raised(current_cap(), b) && \ -+ !((f) & ~vx_current_umask()))) ++static inline ++int v6_addr_in_nx_info(struct nx_info *nxi, ++ const struct in6_addr *addr, uint16_t mask) ++{ ++ struct nx_addr_v6 *nxa; ++ unsigned long irqflags; ++ int ret = 1; + ++ if (!nxi) ++ goto out; + -+#define __vx_state(v) ((v) ? ((v)->vx_state) : 0) ++ spin_lock_irqsave(&nxi->addr_lock, irqflags); ++ for (nxa = &nxi->v6; nxa; nxa = nxa->next) ++ if (v6_addr_match(nxa, addr, mask)) ++ 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", ++ nxi, nxi ? nxi->nx_id : 0, addr, mask, ret); ++ return ret; ++} + -+#define vx_info_state(v, m) (__vx_state(v) & (m)) ++static inline ++int v6_nx_addr_match(struct nx_addr_v6 *nxa, struct nx_addr_v6 *addr, uint16_t mask) ++{ ++ /* FIXME: needs full range checks */ ++ return v6_addr_match(nxa, &addr->ip, mask); ++} + ++static inline ++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; + -+#define __nx_state(n) ((n) ? ((n)->nx_state) : 0) ++ spin_lock_irqsave(&nxi->addr_lock, irqflags); ++ for (ptr = &nxi->v6; ptr; ptr = ptr->next) ++ if (v6_nx_addr_match(ptr, nxa, mask)) ++ goto out_unlock; ++ ret = 0; ++out_unlock: ++ spin_unlock_irqrestore(&nxi->addr_lock, irqflags); ++ return ret; ++} + -+#define nx_info_state(n, m) (__nx_state(n) & (m)) + -+#endif -diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/cacct_cmd.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/cacct_cmd.h ---- linux-2.6.36.2/include/linux/vserver/cacct_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/cacct_cmd.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,23 @@ -+#ifndef _VX_CACCT_CMD_H -+#define _VX_CACCT_CMD_H ++/* ++ * Check if a given address matches for a socket ++ * ++ * nxi: the socket's nx_info if any ++ * addr: to be verified address ++ */ ++static inline ++int v6_sock_addr_match ( ++ struct nx_info *nxi, ++ struct inet_sock *inet, ++ struct in6_addr *addr) ++{ ++ struct sock *sk = &inet->sk; ++ const struct in6_addr *saddr = inet6_rcv_saddr(sk); + ++ if (!ipv6_addr_any(addr) && ++ ipv6_addr_equal(saddr, addr)) ++ return 1; ++ if (ipv6_addr_any(saddr)) ++ return v6_addr_in_nx_info(nxi, addr, -1); ++ return 0; ++} + -+/* virtual host info name commands */ ++/* ++ * check if address is covered by socket ++ * ++ * sk: the socket to check against ++ * addr: the address in question (must be != 0) ++ */ + -+#define VCMD_sock_stat VC_CMD(VSTAT, 5, 0) ++static inline ++int __v6_addr_match_socket(const struct sock *sk, struct nx_addr_v6 *nxa) ++{ ++ struct nx_info *nxi = sk->sk_nx_info; ++ const struct in6_addr *saddr = inet6_rcv_saddr(sk); + -+struct vcmd_sock_stat_v0 { -+ uint32_t field; -+ uint32_t count[3]; -+ uint64_t total[3]; -+}; ++ vxdprintk(VXD_CBIT(net, 5), ++ "__v6_addr_in_socket(%p," NXAV6_FMT ") %p:%pI6 %p;%lx", ++ sk, NXAV6(nxa), nxi, saddr, sk->sk_socket, ++ (sk->sk_socket?sk->sk_socket->flags:0)); + ++ if (!ipv6_addr_any(saddr)) { /* direct address match */ ++ return v6_addr_match(nxa, saddr, -1); ++ } else if (nxi) { /* match against nx_info */ ++ return v6_nx_addr_in_nx_info(nxi, nxa, -1); ++ } else { /* unrestricted any socket */ ++ return 1; ++ } ++} + -+#ifdef __KERNEL__ + -+#include ++/* inet related checks and helpers */ + -+extern int vc_sock_stat(struct vx_info *, void __user *); + -+#endif /* __KERNEL__ */ -+#endif /* _VX_CACCT_CMD_H */ -diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/cacct_def.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/cacct_def.h ---- linux-2.6.36.2/include/linux/vserver/cacct_def.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/cacct_def.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,43 @@ -+#ifndef _VX_CACCT_DEF_H -+#define _VX_CACCT_DEF_H ++struct in_ifaddr; ++struct net_device; ++struct sock; + -+#include -+#include + ++#include ++#include ++#include + -+struct _vx_sock_acc { -+ atomic_long_t count; -+ atomic_long_t total; -+}; + -+/* context sub struct */ ++int dev_in_nx_info(struct net_device *, struct nx_info *); ++int v6_dev_in_nx_info(struct net_device *, struct nx_info *); ++int nx_v6_addr_conflict(struct nx_info *, struct nx_info *); + -+struct _vx_cacct { -+ struct _vx_sock_acc sock[VXA_SOCK_SIZE][3]; -+ atomic_t slab[8]; -+ atomic_t page[6][8]; -+}; + -+#ifdef CONFIG_VSERVER_DEBUG + -+static inline void __dump_vx_cacct(struct _vx_cacct *cacct) ++static inline ++int v6_ifa_in_nx_info(struct inet6_ifaddr *ifa, struct nx_info *nxi) +{ -+ int i, j; -+ -+ printk("\t_vx_cacct:"); -+ for (i = 0; i < 6; i++) { -+ struct _vx_sock_acc *ptr = cacct->sock[i]; -+ -+ printk("\t [%d] =", i); -+ for (j = 0; j < 3; j++) { -+ printk(" [%d] = %8lu, %8lu", j, -+ atomic_long_read(&ptr[j].count), -+ atomic_long_read(&ptr[j].total)); -+ } -+ printk("\n"); -+ } ++ if (!nxi) ++ return 1; ++ if (!ifa) ++ return 0; ++ return v6_addr_in_nx_info(nxi, &ifa->addr, -1); +} + -+#endif ++static inline ++int nx_v6_ifa_visible(struct nx_info *nxi, struct inet6_ifaddr *ifa) ++{ ++ vxdprintk(VXD_CBIT(net, 1), "nx_v6_ifa_visible(%p[#%u],%p) %d", ++ nxi, nxi ? nxi->nx_id : 0, ifa, ++ nxi ? v6_ifa_in_nx_info(ifa, nxi) : 0); + -+#endif /* _VX_CACCT_DEF_H */ -diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/cacct.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/cacct.h ---- linux-2.6.36.2/include/linux/vserver/cacct.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/cacct.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,15 @@ -+#ifndef _VX_CACCT_H -+#define _VX_CACCT_H ++ if (!nx_info_flags(nxi, NXF_HIDE_NETIF, 0)) ++ return 1; ++ if (v6_ifa_in_nx_info(ifa, nxi)) ++ return 1; ++ return 0; ++} + + -+enum sock_acc_field { -+ VXA_SOCK_UNSPEC = 0, -+ VXA_SOCK_UNIX, -+ VXA_SOCK_INET, -+ VXA_SOCK_INET6, -+ VXA_SOCK_PACKET, -+ VXA_SOCK_OTHER, -+ VXA_SOCK_SIZE /* array size */ ++struct nx_v6_sock_addr { ++ struct in6_addr saddr; /* Address used for validation */ ++ struct in6_addr baddr; /* Address used for socket bind */ +}; + -+#endif /* _VX_CACCT_H */ -diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/cacct_int.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/cacct_int.h ---- linux-2.6.36.2/include/linux/vserver/cacct_int.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/cacct_int.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,21 @@ -+#ifndef _VX_CACCT_INT_H -+#define _VX_CACCT_INT_H -+ -+ -+#ifdef __KERNEL__ -+ +static inline -+unsigned long vx_sock_count(struct _vx_cacct *cacct, int type, int pos) ++int v6_map_sock_addr(struct inet_sock *inet, struct sockaddr_in6 *addr, ++ struct nx_v6_sock_addr *nsa) +{ -+ return atomic_long_read(&cacct->sock[type][pos].count); -+} -+ ++ // struct sock *sk = &inet->sk; ++ // struct nx_info *nxi = sk->sk_nx_info; ++ struct in6_addr saddr = addr->sin6_addr; ++ struct in6_addr baddr = saddr; ++ ++ nsa->saddr = saddr; ++ nsa->baddr = baddr; ++ return 0; ++} + +static inline -+unsigned long vx_sock_total(struct _vx_cacct *cacct, int type, int pos) ++void v6_set_sock_addr(struct inet_sock *inet, struct nx_v6_sock_addr *nsa) +{ -+ return atomic_long_read(&cacct->sock[type][pos].total); -+} ++ // struct sock *sk = &inet->sk; ++ // struct in6_addr *saddr = inet6_rcv_saddr(sk); + -+#endif /* __KERNEL__ */ -+#endif /* _VX_CACCT_INT_H */ -diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/check.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/check.h ---- linux-2.6.36.2/include/linux/vserver/check.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/check.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,89 @@ -+#ifndef _VS_CHECK_H -+#define _VS_CHECK_H ++ // *saddr = nsa->baddr; ++ // inet->inet_saddr = nsa->baddr; ++} + ++static inline ++int nx_info_has_v6(struct nx_info *nxi) ++{ ++ if (!nxi) ++ return 1; ++ if (NX_IPV6(nxi)) ++ return 1; ++ return 0; ++} + -+#define MAX_S_CONTEXT 65535 /* Arbitrary limit */ ++#else /* CONFIG_IPV6 */ + -+#ifdef CONFIG_VSERVER_DYNAMIC_IDS -+#define MIN_D_CONTEXT 49152 /* dynamic contexts start here */ -+#else -+#define MIN_D_CONTEXT 65536 -+#endif ++static inline ++int nx_v6_dev_visible(struct nx_info *n, struct net_device *d) ++{ ++ return 1; ++} + -+/* check conditions */ + -+#define VS_ADMIN 0x0001 -+#define VS_WATCH 0x0002 -+#define VS_HIDE 0x0004 -+#define VS_HOSTID 0x0008 ++static inline ++int nx_v6_addr_conflict(struct nx_info *n, uint32_t a, const struct sock *s) ++{ ++ return 1; ++} + -+#define VS_IDENT 0x0010 -+#define VS_EQUIV 0x0020 -+#define VS_PARENT 0x0040 -+#define VS_CHILD 0x0080 ++static inline ++int v6_ifa_in_nx_info(struct in_ifaddr *a, struct nx_info *n) ++{ ++ return 1; ++} + -+#define VS_ARG_MASK 0x00F0 ++static inline ++int nx_info_has_v6(struct nx_info *nxi) ++{ ++ return 0; ++} + -+#define VS_DYNAMIC 0x0100 -+#define VS_STATIC 0x0200 ++#endif /* CONFIG_IPV6 */ + -+#define VS_ATR_MASK 0x0F00 ++#define current_nx_info_has_v6() \ ++ nx_info_has_v6(current_nx_info()) + -+#ifdef CONFIG_VSERVER_PRIVACY -+#define VS_ADMIN_P (0) -+#define VS_WATCH_P (0) +#else -+#define VS_ADMIN_P VS_ADMIN -+#define VS_WATCH_P VS_WATCH ++#warning duplicate inclusion +#endif +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 + -+#define VS_HARDIRQ 0x1000 -+#define VS_SOFTIRQ 0x2000 -+#define VS_IRQ 0x4000 -+ -+#define VS_IRQ_MASK 0xF000 ++#include "vserver/limit.h" ++#include "vserver/base.h" ++#include "vserver/context.h" ++#include "vserver/debug.h" ++#include "vserver/context.h" ++#include "vserver/limit_int.h" + -+#include + -+/* -+ * check current context for ADMIN/WATCH and -+ * optionally against supplied argument -+ */ -+static inline int __vs_check(int cid, int id, unsigned int mode) -+{ -+ if (mode & VS_ARG_MASK) { -+ if ((mode & VS_IDENT) && (id == cid)) -+ return 1; -+ } -+ if (mode & VS_ATR_MASK) { -+ if ((mode & VS_DYNAMIC) && -+ (id >= MIN_D_CONTEXT) && -+ (id <= MAX_S_CONTEXT)) -+ return 1; -+ if ((mode & VS_STATIC) && -+ (id > 1) && (id < MIN_D_CONTEXT)) -+ return 1; -+ } -+ if (mode & VS_IRQ_MASK) { -+ if ((mode & VS_IRQ) && unlikely(in_interrupt())) -+ return 1; -+ if ((mode & VS_HARDIRQ) && unlikely(in_irq())) -+ return 1; -+ if ((mode & VS_SOFTIRQ) && unlikely(in_softirq())) -+ return 1; -+ } -+ return (((mode & VS_ADMIN) && (cid == 0)) || -+ ((mode & VS_WATCH) && (cid == 1)) || -+ ((mode & VS_HOSTID) && (id == 0))); -+} ++#define vx_acc_cres(v, d, p, r) \ ++ __vx_acc_cres(v, r, d, p, __FILE__, __LINE__) + -+#define vx_check(c, m) __vs_check(vx_current_xid(), c, (m) | VS_IRQ) ++#define vx_acc_cres_cond(x, d, p, r) \ ++ __vx_acc_cres(((x) == vx_current_xid()) ? current_vx_info() : 0, \ ++ r, d, p, __FILE__, __LINE__) + -+#define vx_weak_check(c, m) ((m) ? vx_check(c, m) : 1) + ++#define vx_add_cres(v, a, p, r) \ ++ __vx_add_cres(v, r, a, p, __FILE__, __LINE__) ++#define vx_sub_cres(v, a, p, r) vx_add_cres(v, -(a), p, r) + -+#define nx_check(c, m) __vs_check(nx_current_nid(), c, m) ++#define vx_add_cres_cond(x, a, p, r) \ ++ __vx_add_cres(((x) == vx_current_xid()) ? current_vx_info() : 0, \ ++ r, a, p, __FILE__, __LINE__) ++#define vx_sub_cres_cond(x, a, p, r) vx_add_cres_cond(x, -(a), p, r) + -+#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1) + -+#endif -diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/context_cmd.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/context_cmd.h ---- linux-2.6.36.2/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/context_cmd.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,145 @@ -+#ifndef _VX_CONTEXT_CMD_H -+#define _VX_CONTEXT_CMD_H ++/* process and file limits */ + ++#define vx_nproc_inc(p) \ ++ vx_acc_cres((p)->vx_info, 1, p, RLIMIT_NPROC) + -+/* vinfo commands */ ++#define vx_nproc_dec(p) \ ++ vx_acc_cres((p)->vx_info,-1, p, RLIMIT_NPROC) + -+#define VCMD_task_xid VC_CMD(VINFO, 1, 0) ++#define vx_files_inc(f) \ ++ vx_acc_cres_cond((f)->f_xid, 1, f, RLIMIT_NOFILE) + -+#ifdef __KERNEL__ -+extern int vc_task_xid(uint32_t); ++#define vx_files_dec(f) \ ++ vx_acc_cres_cond((f)->f_xid,-1, f, RLIMIT_NOFILE) + -+#endif /* __KERNEL__ */ ++#define vx_locks_inc(l) \ ++ vx_acc_cres_cond((l)->fl_xid, 1, l, RLIMIT_LOCKS) + -+#define VCMD_vx_info VC_CMD(VINFO, 5, 0) ++#define vx_locks_dec(l) \ ++ vx_acc_cres_cond((l)->fl_xid,-1, l, RLIMIT_LOCKS) + -+struct vcmd_vx_info_v0 { -+ uint32_t xid; -+ uint32_t initpid; -+ /* more to come */ -+}; ++#define vx_openfd_inc(f) \ ++ vx_acc_cres(current_vx_info(), 1, (void *)(long)(f), VLIMIT_OPENFD) + -+#ifdef __KERNEL__ -+extern int vc_vx_info(struct vx_info *, void __user *); ++#define vx_openfd_dec(f) \ ++ vx_acc_cres(current_vx_info(),-1, (void *)(long)(f), VLIMIT_OPENFD) + -+#endif /* __KERNEL__ */ + -+#define VCMD_ctx_stat VC_CMD(VSTAT, 0, 0) ++#define vx_cres_avail(v, n, r) \ ++ __vx_cres_avail(v, r, n, __FILE__, __LINE__) + -+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 *); ++#define vx_nproc_avail(n) \ ++ vx_cres_avail(current_vx_info(), n, RLIMIT_NPROC) + -+#endif /* __KERNEL__ */ ++#define vx_files_avail(n) \ ++ vx_cres_avail(current_vx_info(), n, RLIMIT_NOFILE) + -+/* context commands */ ++#define vx_locks_avail(n) \ ++ vx_cres_avail(current_vx_info(), n, RLIMIT_LOCKS) + -+#define VCMD_ctx_create_v0 VC_CMD(VPROC, 1, 0) -+#define VCMD_ctx_create VC_CMD(VPROC, 1, 1) ++#define vx_openfd_avail(n) \ ++ vx_cres_avail(current_vx_info(), n, VLIMIT_OPENFD) + -+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) ++/* dentry limits */ + -+struct vcmd_ctx_migrate { -+ uint64_t flagword; -+}; ++#define vx_dentry_inc(d) do { \ ++ if (d_count(d) == 1) \ ++ vx_acc_cres(current_vx_info(), 1, d, VLIMIT_DENTRY); \ ++ } while (0) + -+#ifdef __KERNEL__ -+extern int vc_ctx_create(uint32_t, void __user *); -+extern int vc_ctx_migrate(struct vx_info *, void __user *); ++#define vx_dentry_dec(d) do { \ ++ if (d_count(d) == 0) \ ++ vx_acc_cres(current_vx_info(),-1, d, VLIMIT_DENTRY); \ ++ } while (0) + -+#endif /* __KERNEL__ */ ++#define vx_dentry_avail(n) \ ++ vx_cres_avail(current_vx_info(), n, VLIMIT_DENTRY) + + -+/* flag commands */ ++/* socket limits */ + -+#define VCMD_get_cflags VC_CMD(FLAGS, 1, 0) -+#define VCMD_set_cflags VC_CMD(FLAGS, 2, 0) ++#define vx_sock_inc(s) \ ++ vx_acc_cres((s)->sk_vx_info, 1, s, VLIMIT_NSOCK) + -+struct vcmd_ctx_flags_v0 { -+ uint64_t flagword; -+ uint64_t mask; -+}; ++#define vx_sock_dec(s) \ ++ vx_acc_cres((s)->sk_vx_info,-1, s, VLIMIT_NSOCK) + -+#ifdef __KERNEL__ -+extern int vc_get_cflags(struct vx_info *, void __user *); -+extern int vc_set_cflags(struct vx_info *, void __user *); ++#define vx_sock_avail(n) \ ++ vx_cres_avail(current_vx_info(), n, VLIMIT_NSOCK) + -+#endif /* __KERNEL__ */ + ++/* ipc resource limits */ + -+/* context caps commands */ ++#define vx_ipcmsg_add(v, u, a) \ ++ vx_add_cres(v, a, u, RLIMIT_MSGQUEUE) + -+#define VCMD_get_ccaps VC_CMD(FLAGS, 3, 1) -+#define VCMD_set_ccaps VC_CMD(FLAGS, 4, 1) ++#define vx_ipcmsg_sub(v, u, a) \ ++ vx_sub_cres(v, a, u, RLIMIT_MSGQUEUE) + -+struct vcmd_ctx_caps_v1 { -+ uint64_t ccaps; -+ uint64_t cmask; -+}; ++#define vx_ipcmsg_avail(v, a) \ ++ vx_cres_avail(v, a, RLIMIT_MSGQUEUE) + -+#ifdef __KERNEL__ -+extern int vc_get_ccaps(struct vx_info *, void __user *); -+extern int vc_set_ccaps(struct vx_info *, void __user *); + -+#endif /* __KERNEL__ */ ++#define vx_ipcshm_add(v, k, a) \ ++ vx_add_cres(v, a, (void *)(long)(k), VLIMIT_SHMEM) + ++#define vx_ipcshm_sub(v, k, a) \ ++ vx_sub_cres(v, a, (void *)(long)(k), VLIMIT_SHMEM) + -+/* bcaps commands */ ++#define vx_ipcshm_avail(v, a) \ ++ vx_cres_avail(v, a, VLIMIT_SHMEM) + -+#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; -+}; ++#define vx_semary_inc(a) \ ++ vx_acc_cres(current_vx_info(), 1, a, VLIMIT_SEMARY) + -+#ifdef __KERNEL__ -+extern int vc_get_bcaps(struct vx_info *, void __user *); -+extern int vc_set_bcaps(struct vx_info *, void __user *); ++#define vx_semary_dec(a) \ ++ vx_acc_cres(current_vx_info(), -1, a, VLIMIT_SEMARY) + -+#endif /* __KERNEL__ */ + ++#define vx_nsems_add(a,n) \ ++ vx_add_cres(current_vx_info(), n, a, VLIMIT_NSEMS) + -+/* umask commands */ ++#define vx_nsems_sub(a,n) \ ++ vx_sub_cres(current_vx_info(), n, a, VLIMIT_NSEMS) + -+#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; -+}; ++#else ++#warning duplicate inclusion ++#endif +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 + -+#ifdef __KERNEL__ -+extern int vc_get_umask(struct vx_info *, void __user *); -+extern int vc_set_umask(struct vx_info *, void __user *); ++#include "vserver/context.h" ++#include "vserver/network.h" ++#include "vserver/base.h" ++#include "vserver/check.h" ++#include "vserver/debug.h" + -+#endif /* __KERNEL__ */ ++#include + + -+/* OOM badness */ ++#define get_nx_info(i) __get_nx_info(i, __FILE__, __LINE__) + -+#define VCMD_get_badness VC_CMD(MEMCTRL, 5, 0) -+#define VCMD_set_badness VC_CMD(MEMCTRL, 6, 0) ++static inline struct nx_info *__get_nx_info(struct nx_info *nxi, ++ const char *_file, int _line) ++{ ++ if (!nxi) ++ return NULL; + -+struct vcmd_badness_v0 { -+ int64_t bias; -+}; ++ vxlprintk(VXD_CBIT(nid, 2), "get_nx_info(%p[#%d.%d])", ++ nxi, nxi ? nxi->nx_id : 0, ++ nxi ? atomic_read(&nxi->nx_usecnt) : 0, ++ _file, _line); + -+#ifdef __KERNEL__ -+extern int vc_get_badness(struct vx_info *, void __user *); -+extern int vc_set_badness(struct vx_info *, void __user *); ++ atomic_inc(&nxi->nx_usecnt); ++ return nxi; ++} + -+#endif /* __KERNEL__ */ -+#endif /* _VX_CONTEXT_CMD_H */ -diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/context.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/context.h ---- linux-2.6.36.2/include/linux/vserver/context.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/context.h 2010-12-01 17:36:51.000000000 +0100 -@@ -0,0 +1,186 @@ -+#ifndef _VX_CONTEXT_H -+#define _VX_CONTEXT_H + -+#include -+#include ++extern void free_nx_info(struct nx_info *); + ++#define put_nx_info(i) __put_nx_info(i, __FILE__, __LINE__) + -+/* context flags */ ++static inline void __put_nx_info(struct nx_info *nxi, const char *_file, int _line) ++{ ++ if (!nxi) ++ return; + -+#define VXF_INFO_SCHED 0x00000002 -+#define VXF_INFO_NPROC 0x00000004 -+#define VXF_INFO_PRIVATE 0x00000008 ++ vxlprintk(VXD_CBIT(nid, 2), "put_nx_info(%p[#%d.%d])", ++ nxi, nxi ? nxi->nx_id : 0, ++ nxi ? atomic_read(&nxi->nx_usecnt) : 0, ++ _file, _line); + -+#define VXF_INFO_INIT 0x00000010 -+#define VXF_INFO_HIDE 0x00000020 -+#define VXF_INFO_ULIMIT 0x00000040 -+#define VXF_INFO_NSPACE 0x00000080 ++ if (atomic_dec_and_test(&nxi->nx_usecnt)) ++ free_nx_info(nxi); ++} + -+#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 init_nx_info(p, i) __init_nx_info(p, i, __FILE__, __LINE__) + -+#define VXF_HIDE_MOUNT 0x01000000 -+/* was VXF_HIDE_NETIF 0x02000000 */ -+#define VXF_HIDE_VINFO 0x04000000 ++static inline void __init_nx_info(struct nx_info **nxp, struct nx_info *nxi, ++ const char *_file, int _line) ++{ ++ if (nxi) { ++ vxlprintk(VXD_CBIT(nid, 3), ++ "init_nx_info(%p[#%d.%d])", ++ nxi, nxi ? nxi->nx_id : 0, ++ nxi ? atomic_read(&nxi->nx_usecnt) : 0, ++ _file, _line); + -+#define VXF_STATE_SETUP (1ULL << 32) -+#define VXF_STATE_INIT (1ULL << 33) -+#define VXF_STATE_ADMIN (1ULL << 34) ++ atomic_inc(&nxi->nx_usecnt); ++ } ++ *nxp = nxi; ++} + -+#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 set_nx_info(p, i) __set_nx_info(p, i, __FILE__, __LINE__) + -+#define VXF_IGNEG_NICE (1ULL << 52) ++static inline void __set_nx_info(struct nx_info **nxp, struct nx_info *nxi, ++ const char *_file, int _line) ++{ ++ struct nx_info *nxo; + -+#define VXF_ONE_TIME (0x0007ULL << 32) ++ if (!nxi) ++ return; + -+#define VXF_INIT_SET (VXF_STATE_SETUP | VXF_STATE_INIT | VXF_STATE_ADMIN) ++ vxlprintk(VXD_CBIT(nid, 3), "set_nx_info(%p[#%d.%d])", ++ nxi, nxi ? nxi->nx_id : 0, ++ nxi ? atomic_read(&nxi->nx_usecnt) : 0, ++ _file, _line); + ++ atomic_inc(&nxi->nx_usecnt); ++ nxo = xchg(nxp, nxi); ++ BUG_ON(nxo); ++} + -+/* context migration */ ++#define clr_nx_info(p) __clr_nx_info(p, __FILE__, __LINE__) + -+#define VXM_SET_INIT 0x00000001 -+#define VXM_SET_REAPER 0x00000002 ++static inline void __clr_nx_info(struct nx_info **nxp, ++ const char *_file, int _line) ++{ ++ struct nx_info *nxo; + -+/* context caps */ ++ nxo = xchg(nxp, NULL); ++ if (!nxo) ++ return; + -+#define VXC_CAP_MASK 0x00000000 ++ vxlprintk(VXD_CBIT(nid, 3), "clr_nx_info(%p[#%d.%d])", ++ nxo, nxo ? nxo->nx_id : 0, ++ nxo ? atomic_read(&nxo->nx_usecnt) : 0, ++ _file, _line); + -+#define VXC_SET_UTSNAME 0x00000001 -+#define VXC_SET_RLIMIT 0x00000002 -+#define VXC_FS_SECURITY 0x00000004 -+#define VXC_FS_TRUSTED 0x00000008 -+#define VXC_TIOCSTI 0x00000010 ++ if (atomic_dec_and_test(&nxo->nx_usecnt)) ++ free_nx_info(nxo); ++} + -+/* 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 claim_nx_info(v, p) __claim_nx_info(v, p, __FILE__, __LINE__) + -+#define VXC_QUOTA_CTL 0x00100000 -+#define VXC_ADMIN_MAPPER 0x00200000 -+#define VXC_ADMIN_CLOOP 0x00400000 ++static inline void __claim_nx_info(struct nx_info *nxi, ++ struct task_struct *task, const char *_file, int _line) ++{ ++ vxlprintk(VXD_CBIT(nid, 3), "claim_nx_info(%p[#%d.%d.%d]) %p", ++ nxi, nxi ? nxi->nx_id : 0, ++ nxi?atomic_read(&nxi->nx_usecnt):0, ++ nxi?atomic_read(&nxi->nx_tasks):0, ++ task, _file, _line); + -+#define VXC_KTHREAD 0x01000000 -+#define VXC_NAMESPACE 0x02000000 ++ atomic_inc(&nxi->nx_tasks); ++} + + -+#ifdef __KERNEL__ ++extern void unhash_nx_info(struct nx_info *); + -+#include -+#include -+#include ++#define release_nx_info(v, p) __release_nx_info(v, p, __FILE__, __LINE__) + -+#include "limit_def.h" -+#include "sched_def.h" -+#include "cvirt_def.h" -+#include "cacct_def.h" -+#include "device_def.h" ++static inline void __release_nx_info(struct nx_info *nxi, ++ struct task_struct *task, const char *_file, int _line) ++{ ++ vxlprintk(VXD_CBIT(nid, 3), "release_nx_info(%p[#%d.%d.%d]) %p", ++ nxi, nxi ? nxi->nx_id : 0, ++ nxi ? atomic_read(&nxi->nx_usecnt) : 0, ++ nxi ? atomic_read(&nxi->nx_tasks) : 0, ++ task, _file, _line); + -+#define VX_SPACES 2 ++ might_sleep(); + -+struct _vx_info_pc { -+ struct _vx_sched_pc sched_pc; -+ struct _vx_cvirt_pc cvirt_pc; -+}; ++ if (atomic_dec_and_test(&nxi->nx_tasks)) ++ unhash_nx_info(nxi); ++} + -+struct vx_info { -+ struct hlist_node vx_hlist; /* linked list of contexts */ -+ xid_t vx_id; /* context id */ -+ atomic_t vx_usecnt; /* usage count */ -+ atomic_t vx_tasks; /* tasks count */ -+ struct vx_info *vx_parent; /* parent context */ -+ int vx_state; /* context state */ + -+ unsigned long vx_nsmask[VX_SPACES]; /* assignment mask */ -+ struct nsproxy *vx_nsproxy[VX_SPACES]; /* private namespaces */ -+ struct fs_struct *vx_fs[VX_SPACES]; /* private namespace fs */ -+ const struct cred *vx_real_cred; /* real task credentials */ -+ const struct cred *vx_cred; /* task credentials */ ++#define task_get_nx_info(i) __task_get_nx_info(i, __FILE__, __LINE__) + -+ uint64_t vx_flags; /* context flags */ -+ uint64_t vx_ccaps; /* context caps (vserver) */ -+ kernel_cap_t vx_bcaps; /* bounding caps (system) */ -+ unsigned long vx_umask; /* unshare mask (guest) */ ++static __inline__ struct nx_info *__task_get_nx_info(struct task_struct *p, ++ const char *_file, int _line) ++{ ++ struct nx_info *nxi; + -+ struct task_struct *vx_reaper; /* guest reaper process */ -+ pid_t vx_initpid; /* PID of guest init */ -+ int64_t vx_badness_bias; /* OOM points bias */ ++ task_lock(p); ++ vxlprintk(VXD_CBIT(nid, 5), "task_get_nx_info(%p)", ++ p, _file, _line); ++ nxi = __get_nx_info(p->nx_info, _file, _line); ++ task_unlock(p); ++ return nxi; ++} + -+ struct _vx_limit limit; /* vserver limits */ -+ struct _vx_sched sched; /* vserver scheduler */ -+ struct _vx_cvirt cvirt; /* virtual/bias stuff */ -+ struct _vx_cacct cacct; /* context accounting */ + -+ struct _vx_device dmap; /* default device map targets */ ++static inline void exit_nx_info(struct task_struct *p) ++{ ++ if (p->nx_info) ++ release_nx_info(p->nx_info, p); ++} ++ + -+#ifndef CONFIG_SMP -+ struct _vx_info_pc info_pc; /* per cpu data */ +#else -+ struct _vx_info_pc *ptr_pc; /* per cpu array */ ++#warning duplicate inclusion +#endif +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 + -+ wait_queue_head_t vx_wait; /* context exit waitqueue */ -+ int reboot_cmd; /* last sys_reboot() cmd */ -+ int exit_code; /* last process exit code */ -+ -+ char vx_name[65]; /* vserver name */ -+}; ++#include "vserver/base.h" ++#include "vserver/check.h" ++#include "vserver/context.h" ++#include "vserver/debug.h" ++#include "vserver/pid.h" ++#include + -+#ifndef CONFIG_SMP -+#define vx_ptr_pc(vxi) (&(vxi)->info_pc) -+#define vx_per_cpu(vxi, v, id) vx_ptr_pc(vxi)->v -+#else -+#define vx_ptr_pc(vxi) ((vxi)->ptr_pc) -+#define vx_per_cpu(vxi, v, id) per_cpu_ptr(vx_ptr_pc(vxi), id)->v -+#endif + -+#define vx_cpu(vxi, v) vx_per_cpu(vxi, v, smp_processor_id()) ++#define VXF_FAKE_INIT (VXF_INFO_INIT | VXF_STATE_INIT) + ++static inline ++int vx_proc_task_visible(struct task_struct *task) ++{ ++ if ((task->pid == 1) && ++ !vx_flags(VXF_FAKE_INIT, VXF_FAKE_INIT)) ++ /* show a blend through init */ ++ goto visible; ++ if (vx_check(vx_task_xid(task), VS_WATCH | VS_IDENT)) ++ goto visible; ++ return 0; ++visible: ++ return 1; ++} + -+struct vx_info_save { -+ struct vx_info *vxi; -+ xid_t xid; -+}; ++#define find_task_by_real_pid(pid) find_task_by_pid_ns(pid, &init_pid_ns) + + -+/* status flags */ ++static inline ++struct task_struct *vx_get_proc_task(struct inode *inode, struct pid *pid) ++{ ++ struct task_struct *task = get_pid_task(pid, PIDTYPE_PID); + -+#define VXS_HASHED 0x0001 -+#define VXS_PAUSED 0x0010 -+#define VXS_SHUTDOWN 0x0100 -+#define VXS_HELPER 0x1000 -+#define VXS_RELEASED 0x8000 ++ if (task && !vx_proc_task_visible(task)) { ++ vxdprintk(VXD_CBIT(misc, 6), ++ "dropping task (get) %p[#%u,%u] for %p[#%u,%u]", ++ task, task->xid, task->pid, ++ current, current->xid, current->pid); ++ put_task_struct(task); ++ task = NULL; ++ } ++ return task; ++} + + -+extern void claim_vx_info(struct vx_info *, struct task_struct *); -+extern void release_vx_info(struct vx_info *, struct task_struct *); ++#else ++#warning duplicate inclusion ++#endif +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 + -+extern struct vx_info *lookup_vx_info(int); -+extern struct vx_info *lookup_or_create_vx_info(int); ++#include "vserver/base.h" ++#include "vserver/context.h" ++#include "vserver/sched.h" + -+extern int get_xid_list(int, unsigned int *, int); -+extern int xid_is_hashed(xid_t); + -+extern int vx_migrate_task(struct task_struct *, struct vx_info *, int); ++#define MAX_PRIO_BIAS 20 ++#define MIN_PRIO_BIAS -20 + -+extern long vs_state_change(struct vx_info *, unsigned int); ++static inline ++int vx_adjust_prio(struct task_struct *p, int prio, int max_user) ++{ ++ struct vx_info *vxi = p->vx_info; + ++ if (vxi) ++ prio += vx_cpu(vxi, sched_pc).prio_bias; ++ return prio; ++} + -+#endif /* __KERNEL__ */ -+#endif /* _VX_CONTEXT_H */ -diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/cvirt_cmd.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/cvirt_cmd.h ---- linux-2.6.36.2/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/cvirt_cmd.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,53 @@ -+#ifndef _VX_CVIRT_CMD_H -+#define _VX_CVIRT_CMD_H ++static inline void vx_account_user(struct vx_info *vxi, ++ cputime_t cputime, int nice) ++{ ++ if (!vxi) ++ return; ++ vx_cpu(vxi, sched_pc).user_ticks += cputime; ++} + ++static inline void vx_account_system(struct vx_info *vxi, ++ cputime_t cputime, int idle) ++{ ++ if (!vxi) ++ return; ++ vx_cpu(vxi, sched_pc).sys_ticks += cputime; ++} + -+/* virtual host info name commands */ ++#else ++#warning duplicate inclusion ++#endif +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 + -+#define VCMD_set_vhi_name VC_CMD(VHOST, 1, 0) -+#define VCMD_get_vhi_name VC_CMD(VHOST, 2, 0) ++#include "vserver/debug.h" ++#include "vserver/base.h" ++#include "vserver/cacct.h" ++#include "vserver/context.h" ++#include "vserver/tag.h" + -+struct vcmd_vhi_name_v0 { -+ uint32_t field; -+ char name[65]; -+}; + ++/* socket accounting */ + -+enum vhi_name_field { -+ VHIN_CONTEXT = 0, -+ VHIN_SYSNAME, -+ VHIN_NODENAME, -+ VHIN_RELEASE, -+ VHIN_VERSION, -+ VHIN_MACHINE, -+ VHIN_DOMAINNAME, -+}; ++#include + ++static inline int vx_sock_type(int family) ++{ ++ switch (family) { ++ case PF_UNSPEC: ++ return VXA_SOCK_UNSPEC; ++ case PF_UNIX: ++ return VXA_SOCK_UNIX; ++ case PF_INET: ++ return VXA_SOCK_INET; ++ case PF_INET6: ++ return VXA_SOCK_INET6; ++ case PF_PACKET: ++ return VXA_SOCK_PACKET; ++ default: ++ return VXA_SOCK_OTHER; ++ } ++} + -+#ifdef __KERNEL__ ++#define vx_acc_sock(v, f, p, s) \ ++ __vx_acc_sock(v, f, p, s, __FILE__, __LINE__) + -+#include ++static inline void __vx_acc_sock(struct vx_info *vxi, ++ int family, int pos, int size, char *file, int line) ++{ ++ if (vxi) { ++ int type = vx_sock_type(family); + -+extern int vc_set_vhi_name(struct vx_info *, void __user *); -+extern int vc_get_vhi_name(struct vx_info *, void __user *); ++ atomic_long_inc(&vxi->cacct.sock[type][pos].count); ++ atomic_long_add(size, &vxi->cacct.sock[type][pos].total); ++ } ++} + -+#endif /* __KERNEL__ */ ++#define vx_sock_recv(sk, s) \ ++ vx_acc_sock((sk)->sk_vx_info, (sk)->sk_family, 0, s) ++#define vx_sock_send(sk, s) \ ++ vx_acc_sock((sk)->sk_vx_info, (sk)->sk_family, 1, s) ++#define vx_sock_fail(sk, s) \ ++ vx_acc_sock((sk)->sk_vx_info, (sk)->sk_family, 2, s) + -+#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]; -+}; ++#define sock_vx_init(s) do { \ ++ (s)->sk_xid = 0; \ ++ (s)->sk_vx_info = NULL; \ ++ } while (0) + -+#ifdef __KERNEL__ -+extern int vc_virt_stat(struct vx_info *, void __user *); ++#define sock_nx_init(s) do { \ ++ (s)->sk_nid = 0; \ ++ (s)->sk_nx_info = NULL; \ ++ } while (0) + -+#endif /* __KERNEL__ */ -+#endif /* _VX_CVIRT_CMD_H */ -diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/cvirt_def.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/cvirt_def.h ---- linux-2.6.36.2/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/cvirt_def.h 2010-10-21 14:26:47.000000000 +0200 -@@ -0,0 +1,80 @@ -+#ifndef _VX_CVIRT_DEF_H -+#define _VX_CVIRT_DEF_H ++#else ++#warning duplicate inclusion ++#endif +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 + -+#include -+#include -+#include -+#include -+#include ++#include + ++/* check conditions */ + -+struct _vx_usage_stat { -+ uint64_t user; -+ uint64_t nice; -+ uint64_t system; -+ uint64_t softirq; -+ uint64_t irq; -+ uint64_t idle; -+ uint64_t iowait; -+}; ++#define DX_ADMIN 0x0001 ++#define DX_WATCH 0x0002 ++#define DX_HOSTID 0x0008 + -+struct _vx_syslog { -+ wait_queue_head_t log_wait; -+ spinlock_t logbuf_lock; /* lock for the log buffer */ ++#define DX_IDENT 0x0010 + -+ unsigned long log_start; /* next char to be read by syslog() */ -+ unsigned long con_start; /* next char to be sent to consoles */ -+ unsigned long log_end; /* most-recently-written-char + 1 */ -+ unsigned long logged_chars; /* #chars since last read+clear operation */ ++#define DX_ARG_MASK 0x0010 + -+ char log_buf[1024]; -+}; + ++#define dx_task_tag(t) ((t)->tag) + -+/* context sub struct */ ++#define dx_current_tag() dx_task_tag(current) + -+struct _vx_cvirt { -+ atomic_t nr_threads; /* number of current threads */ -+ atomic_t nr_running; /* number of running threads */ -+ atomic_t nr_uninterruptible; /* number of uninterruptible threads */ ++#define dx_check(c, m) __dx_check(dx_current_tag(), c, m) + -+ atomic_t nr_onhold; /* processes on hold */ -+ uint32_t onhold_last; /* jiffies when put on hold */ ++#define dx_weak_check(c, m) ((m) ? dx_check(c, m) : 1) + -+ struct timespec bias_ts; /* time offset to the host */ -+ struct timespec bias_idle; -+ struct timespec bias_uptime; /* context creation point */ -+ uint64_t bias_clock; /* offset in clock_t */ + -+ spinlock_t load_lock; /* lock for the load averages */ -+ atomic_t load_updates; /* nr of load updates done so far */ -+ uint32_t load_last; /* last time load was calculated */ -+ uint32_t load[3]; /* load averages 1,5,15 */ ++/* ++ * check current context for ADMIN/WATCH and ++ * optionally against supplied argument ++ */ ++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)) ++ return 1; ++ } ++ return (((mode & DX_ADMIN) && (cid == 0)) || ++ ((mode & DX_WATCH) && (cid == 1)) || ++ ((mode & DX_HOSTID) && (id == 0))); ++} + -+ atomic_t total_forks; /* number of forks so far */ ++struct inode; ++int dx_permission(const struct inode *inode, int mask); + -+ struct _vx_syslog syslog; -+}; + -+struct _vx_cvirt_pc { -+ struct _vx_usage_stat cpustat; -+}; ++#else ++#warning duplicate inclusion ++#endif +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 + + -+#ifdef CONFIG_VSERVER_DEBUG ++/* time faking stuff */ + -+static inline void __dump_vx_cvirt(struct _vx_cvirt *cvirt) -+{ -+ printk("\t_vx_cvirt:\n"); -+ printk("\t threads: %4d, %4d, %4d, %4d\n", -+ atomic_read(&cvirt->nr_threads), -+ atomic_read(&cvirt->nr_running), -+ atomic_read(&cvirt->nr_uninterruptible), -+ atomic_read(&cvirt->nr_onhold)); -+ /* add rest here */ -+ printk("\t total_forks = %d\n", atomic_read(&cvirt->total_forks)); -+} ++#ifdef CONFIG_VSERVER_VTIME ++ ++extern void vx_adjust_timespec(struct timespec *ts); ++extern int vx_settimeofday(const struct timespec *ts); + ++#else ++#define vx_adjust_timespec(t) do { } while (0) ++#define vx_settimeofday(t) do_settimeofday(t) +#endif + -+#endif /* _VX_CVIRT_DEF_H */ -diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/cvirt.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/cvirt.h ---- linux-2.6.36.2/include/linux/vserver/cvirt.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/cvirt.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,20 @@ -+#ifndef _VX_CVIRT_H -+#define _VX_CVIRT_H ++#else ++#warning duplicate inclusion ++#endif +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 + + -+#ifdef __KERNEL__ ++/* context state changes */ + -+struct timespec; ++enum { ++ VSC_STARTUP = 1, ++ VSC_SHUTDOWN, + -+void vx_vsi_uptime(struct timespec *, struct timespec *); ++ VSC_NETUP, ++ VSC_NETDOWN, ++}; + + -+struct vx_info; + -+void vx_update_load(struct vx_info *); ++#define vx_task_xid(t) ((t)->xid) + ++#define vx_current_xid() vx_task_xid(current) + -+int vx_do_syslog(int, char __user *, int); ++#define current_vx_info() (current->vx_info) + -+#endif /* __KERNEL__ */ -+#endif /* _VX_CVIRT_H */ -diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/debug_cmd.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/debug_cmd.h ---- linux-2.6.36.2/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/debug_cmd.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,58 @@ -+#ifndef _VX_DEBUG_CMD_H -+#define _VX_DEBUG_CMD_H + ++#define nx_task_nid(t) ((t)->nid) + -+/* debug commands */ ++#define nx_current_nid() nx_task_nid(current) + -+#define VCMD_dump_history VC_CMD(DEBUG, 1, 0) ++#define current_nx_info() (current->nx_info) + -+#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; -+}; ++/* generic flag merging */ + -+struct vcmd_read_monitor_v0 { -+ uint32_t index; -+ uint32_t count; -+ char __user *data; -+}; ++#define vs_check_flags(v, m, f) (((v) & (m)) ^ (f)) + ++#define vs_mask_flags(v, f, m) (((v) & ~(m)) | ((f) & (m))) + -+#ifdef __KERNEL__ ++#define vs_mask_mask(v, f, m) (((v) & ~(m)) | ((v) & (f) & (m))) + -+#ifdef CONFIG_COMPAT ++#define vs_check_bit(v, n) ((v) & (1LL << (n))) + -+#include + -+struct vcmd_read_history_v0_x32 { -+ uint32_t index; -+ uint32_t count; -+ compat_uptr_t data_ptr; -+}; ++/* context flags */ + -+struct vcmd_read_monitor_v0_x32 { -+ uint32_t index; -+ uint32_t count; -+ compat_uptr_t data_ptr; -+}; ++#define __vx_flags(v) ((v) ? (v)->vx_flags : 0) + -+#endif /* CONFIG_COMPAT */ ++#define vx_current_flags() __vx_flags(current_vx_info()) + -+extern int vc_dump_history(uint32_t); ++#define vx_info_flags(v, m, f) \ ++ vs_check_flags(__vx_flags(v), m, f) + -+extern int vc_read_history(uint32_t, void __user *); -+extern int vc_read_monitor(uint32_t, void __user *); ++#define task_vx_flags(t, m, f) \ ++ ((t) && vx_info_flags((t)->vx_info, m, f)) + -+#ifdef CONFIG_COMPAT ++#define vx_flags(m, f) vx_info_flags(current_vx_info(), m, f) + -+extern int vc_read_history_x32(uint32_t, void __user *); -+extern int vc_read_monitor_x32(uint32_t, void __user *); + -+#endif /* CONFIG_COMPAT */ ++/* context caps */ + -+#endif /* __KERNEL__ */ -+#endif /* _VX_DEBUG_CMD_H */ -diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/debug.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/debug.h ---- linux-2.6.36.2/include/linux/vserver/debug.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/debug.h 2010-10-21 18:35:25.000000000 +0200 -@@ -0,0 +1,140 @@ -+#ifndef _VX_DEBUG_H -+#define _VX_DEBUG_H ++#define __vx_ccaps(v) ((v) ? (v)->vx_ccaps : 0) + ++#define vx_current_ccaps() __vx_ccaps(current_vx_info()) + -+#define VXD_CBIT(n, m) (vx_debug_ ## n & (1 << (m))) -+#define VXD_CMIN(n, m) (vx_debug_ ## n > (m)) -+#define VXD_MASK(n, m) (vx_debug_ ## n & (m)) ++#define vx_info_ccaps(v, c) (__vx_ccaps(v) & (c)) + -+#define VXD_DEV(d) (d), (d)->bd_inode->i_ino, \ -+ imajor((d)->bd_inode), iminor((d)->bd_inode) -+#define VXF_DEV "%p[%lu,%d:%d]" ++#define vx_ccaps(c) vx_info_ccaps(current_vx_info(), (c)) + -+#if defined(CONFIG_QUOTES_UTF8) -+#define VS_Q_LQM "\xc2\xbb" -+#define VS_Q_RQM "\xc2\xab" -+#elif defined(CONFIG_QUOTES_ASCII) -+#define VS_Q_LQM "\x27" -+#define VS_Q_RQM "\x27" -+#else -+#define VS_Q_LQM "\xbb" -+#define VS_Q_RQM "\xab" -+#endif + -+#define VS_Q(f) VS_Q_LQM f VS_Q_RQM + ++/* network flags */ + -+#define vxd_path(p) \ -+ ({ static char _buffer[PATH_MAX]; \ -+ d_path(p, _buffer, sizeof(_buffer)); }) ++#define __nx_flags(n) ((n) ? (n)->nx_flags : 0) + -+#define vxd_cond_path(n) \ -+ ((n) ? vxd_path(&(n)->path) : "" ) ++#define nx_current_flags() __nx_flags(current_nx_info()) + ++#define nx_info_flags(n, m, f) \ ++ vs_check_flags(__nx_flags(n), m, f) + -+#ifdef CONFIG_VSERVER_DEBUG ++#define task_nx_flags(t, m, f) \ ++ ((t) && nx_info_flags((t)->nx_info, m, f)) + -+extern unsigned int vx_debug_switch; -+extern unsigned int vx_debug_xid; -+extern unsigned int vx_debug_nid; -+extern unsigned int vx_debug_tag; -+extern unsigned int vx_debug_net; -+extern unsigned int vx_debug_limit; -+extern unsigned int vx_debug_cres; -+extern unsigned int vx_debug_dlim; -+extern unsigned int vx_debug_quota; -+extern unsigned int vx_debug_cvirt; -+extern unsigned int vx_debug_space; -+extern unsigned int vx_debug_misc; ++#define nx_flags(m, f) nx_info_flags(current_nx_info(), m, f) + + -+#define VX_LOGLEVEL "vxD: " -+#define VX_PROC_FMT "%p: " -+#define VX_PROCESS current ++/* network caps */ + -+#define vxdprintk(c, f, x...) \ -+ do { \ -+ if (c) \ -+ printk(VX_LOGLEVEL VX_PROC_FMT f "\n", \ -+ VX_PROCESS , ##x); \ -+ } while (0) ++#define __nx_ncaps(n) ((n) ? (n)->nx_ncaps : 0) + -+#define vxlprintk(c, f, x...) \ -+ do { \ -+ if (c) \ -+ printk(VX_LOGLEVEL f " @%s:%d\n", x); \ -+ } while (0) ++#define nx_current_ncaps() __nx_ncaps(current_nx_info()) + -+#define vxfprintk(c, f, x...) \ -+ do { \ -+ if (c) \ -+ printk(VX_LOGLEVEL f " %s@%s:%d\n", x); \ -+ } while (0) ++#define nx_info_ncaps(n, c) (__nx_ncaps(n) & (c)) + ++#define nx_ncaps(c) nx_info_ncaps(current_nx_info(), c) + -+struct vx_info; + -+void dump_vx_info(struct vx_info *, int); -+void dump_vx_info_inactive(int); ++/* context mask capabilities */ + -+#else /* CONFIG_VSERVER_DEBUG */ ++#define __vx_mcaps(v) ((v) ? (v)->vx_ccaps >> 32UL : ~0 ) + -+#define vx_debug_switch 0 -+#define vx_debug_xid 0 -+#define vx_debug_nid 0 -+#define vx_debug_tag 0 -+#define vx_debug_net 0 -+#define vx_debug_limit 0 -+#define vx_debug_cres 0 -+#define vx_debug_dlim 0 -+#define vx_debug_cvirt 0 ++#define vx_info_mcaps(v, c) (__vx_mcaps(v) & (c)) + -+#define vxdprintk(x...) do { } while (0) -+#define vxlprintk(x...) do { } while (0) -+#define vxfprintk(x...) do { } while (0) ++#define vx_mcaps(c) vx_info_mcaps(current_vx_info(), c) + -+#endif /* CONFIG_VSERVER_DEBUG */ + ++/* context bcap mask */ + -+#ifdef CONFIG_VSERVER_WARN ++#define __vx_bcaps(v) ((v)->vx_bcaps) + -+#define VX_WARNLEVEL KERN_WARNING "vxW: " -+#define VX_WARN_TASK "[" VS_Q("%s") ",%u:#%u|%u|%u] " -+#define VX_WARN_XID "[xid #%u] " -+#define VX_WARN_NID "[nid #%u] " -+#define VX_WARN_TAG "[tag #%u] " ++#define vx_current_bcaps() __vx_bcaps(current_vx_info()) + -+#define vxwprintk(c, f, x...) \ -+ do { \ -+ if (c) \ -+ printk(VX_WARNLEVEL f "\n", ##x); \ -+ } while (0) + -+#else /* CONFIG_VSERVER_WARN */ ++/* mask given bcaps */ + -+#define vxwprintk(x...) do { } while (0) ++#define vx_info_mbcaps(v, c) ((v) ? cap_intersect(__vx_bcaps(v), c) : c) + -+#endif /* CONFIG_VSERVER_WARN */ ++#define vx_mbcaps(c) vx_info_mbcaps(current_vx_info(), c) + -+#define vxwprintk_task(c, f, x...) \ -+ vxwprintk(c, VX_WARN_TASK f, \ -+ current->comm, current->pid, \ -+ 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...) \ -+ vxwprintk(c, VX_WARN_NID f, current->nid, x) -+#define vxwprintk_tag(c, f, x...) \ -+ vxwprintk(c, VX_WARN_TAG f, current->tag, x) + -+#ifdef CONFIG_VSERVER_DEBUG -+#define vxd_assert_lock(l) assert_spin_locked(l) -+#define vxd_assert(c, f, x...) vxlprintk(!(c), \ -+ "assertion [" f "] failed.", ##x, __FILE__, __LINE__) -+#else -+#define vxd_assert_lock(l) do { } while (0) -+#define vxd_assert(c, f, x...) do { } while (0) -+#endif ++/* masked cap_bset */ + ++#define vx_info_cap_bset(v) vx_info_mbcaps(v, current->cap_bset) + -+#endif /* _VX_DEBUG_H */ -diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/device_cmd.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/device_cmd.h ---- linux-2.6.36.2/include/linux/vserver/device_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/device_cmd.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,44 @@ -+#ifndef _VX_DEVICE_CMD_H -+#define _VX_DEVICE_CMD_H ++#define vx_current_cap_bset() vx_info_cap_bset(current_vx_info()) + ++#if 0 ++#define vx_info_mbcap(v, b) \ ++ (!vx_info_flags(v, VXF_STATE_SETUP, 0) ? \ ++ vx_info_bcaps(v, b) : (b)) + -+/* device vserver commands */ ++#define task_vx_mbcap(t, b) \ ++ vx_info_mbcap((t)->vx_info, (t)->b) + -+#define VCMD_set_mapping VC_CMD(DEVICE, 1, 0) -+#define VCMD_unset_mapping VC_CMD(DEVICE, 2, 0) ++#define vx_mbcap(b) task_vx_mbcap(current, b) ++#endif + -+struct vcmd_set_mapping_v0 { -+ const char __user *device; -+ const char __user *target; -+ uint32_t flags; -+}; ++#define vx_cap_raised(v, c, f) cap_raised(vx_info_mbcaps(v, c), f) + ++#define vx_capable(b, c) (capable(b) || \ ++ (cap_raised(current_cap(), b) && vx_ccaps(c))) + -+#ifdef __KERNEL__ ++#define vx_ns_capable(n, b, c) (ns_capable(n, b) || \ ++ (cap_raised(current_cap(), b) && vx_ccaps(c))) + -+#ifdef CONFIG_COMPAT ++#define nx_capable(b, c) (capable(b) || \ ++ (cap_raised(current_cap(), b) && nx_ncaps(c))) + -+#include ++#define nx_ns_capable(n, b, c) (ns_capable(n, b) || \ ++ (cap_raised(current_cap(), b) && nx_ncaps(c))) + -+struct vcmd_set_mapping_v0_x32 { -+ compat_uptr_t device_ptr; -+ compat_uptr_t target_ptr; -+ uint32_t flags; -+}; ++#define vx_task_initpid(t, n) \ ++ ((t)->vx_info && \ ++ ((t)->vx_info->vx_initpid == (n))) + -+#endif /* CONFIG_COMPAT */ ++#define vx_current_initpid(n) vx_task_initpid(current, n) + -+#include + -+extern int vc_set_mapping(struct vx_info *, void __user *); -+extern int vc_unset_mapping(struct vx_info *, void __user *); ++/* context unshare mask */ + -+#ifdef CONFIG_COMPAT ++#define __vx_umask(v) ((v)->vx_umask) + -+extern int vc_set_mapping_x32(struct vx_info *, void __user *); -+extern int vc_unset_mapping_x32(struct vx_info *, void __user *); ++#define vx_current_umask() __vx_umask(current_vx_info()) + -+#endif /* CONFIG_COMPAT */ ++#define vx_can_unshare(b, f) (capable(b) || \ ++ (cap_raised(current_cap(), b) && \ ++ !((f) & ~vx_current_umask()))) + -+#endif /* __KERNEL__ */ -+#endif /* _VX_DEVICE_CMD_H */ -diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/device_def.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/device_def.h ---- linux-2.6.36.2/include/linux/vserver/device_def.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/device_def.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,17 @@ -+#ifndef _VX_DEVICE_DEF_H -+#define _VX_DEVICE_DEF_H ++#define vx_ns_can_unshare(n, b, f) (ns_capable(n, b) || \ ++ (cap_raised(current_cap(), b) && \ ++ !((f) & ~vx_current_umask()))) + -+#include ++#define __vx_wmask(v) ((v)->vx_wmask) + -+struct vx_dmap_target { -+ dev_t target; -+ uint32_t flags; -+}; ++#define vx_current_wmask() __vx_wmask(current_vx_info()) + -+struct _vx_device { -+#ifdef CONFIG_VSERVER_DEVICE -+ struct vx_dmap_target targets[2]; -+#endif -+}; + -+#endif /* _VX_DEVICE_DEF_H */ -diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/device.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/device.h ---- linux-2.6.36.2/include/linux/vserver/device.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/device.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,15 @@ -+#ifndef _VX_DEVICE_H -+#define _VX_DEVICE_H ++#define __vx_state(v) ((v) ? ((v)->vx_state) : 0) ++ ++#define vx_info_state(v, m) (__vx_state(v) & (m)) + + -+#define DATTR_CREATE 0x00000001 -+#define DATTR_OPEN 0x00000002 ++#define __nx_state(n) ((n) ? ((n)->nx_state) : 0) + -+#define DATTR_REMAP 0x00000010 ++#define nx_info_state(n, m) (__nx_state(n) & (m)) + -+#define DATTR_MASK 0x00000013 ++#endif +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 _VSERVER_CACCT_H ++#define _VSERVER_CACCT_H + + -+#else /* _VX_DEVICE_H */ -+#warning duplicate inclusion -+#endif /* _VX_DEVICE_H */ -diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/dlimit_cmd.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/dlimit_cmd.h ---- linux-2.6.36.2/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/dlimit_cmd.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,109 @@ -+#ifndef _VX_DLIMIT_CMD_H -+#define _VX_DLIMIT_CMD_H ++enum sock_acc_field { ++ VXA_SOCK_UNSPEC = 0, ++ VXA_SOCK_UNIX, ++ VXA_SOCK_INET, ++ VXA_SOCK_INET6, ++ VXA_SOCK_PACKET, ++ VXA_SOCK_OTHER, ++ VXA_SOCK_SIZE /* array size */ ++}; + ++#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 + -+/* dlimit vserver commands */ + -+#define VCMD_add_dlimit VC_CMD(DLIMIT, 1, 0) -+#define VCMD_rem_dlimit VC_CMD(DLIMIT, 2, 0) ++#include ++#include + -+#define VCMD_set_dlimit VC_CMD(DLIMIT, 5, 0) -+#define VCMD_get_dlimit VC_CMD(DLIMIT, 6, 0) ++extern int vc_sock_stat(struct vx_info *, void __user *); + -+struct vcmd_ctx_dlimit_base_v0 { -+ const char __user *name; -+ uint32_t flags; ++#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 _VSERVER_CACCT_DEF_H ++#define _VSERVER_CACCT_DEF_H ++ ++#include ++#include ++ ++ ++struct _vx_sock_acc { ++ atomic_long_t count; ++ atomic_long_t total; +}; + -+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; ++/* context sub struct */ ++ ++struct _vx_cacct { ++ struct _vx_sock_acc sock[VXA_SOCK_SIZE][3]; ++ atomic_t slab[8]; ++ atomic_t page[6][8]; +}; + -+#define CDLIM_UNSET ((uint32_t)0UL) -+#define CDLIM_INFINITY ((uint32_t)~0UL) -+#define CDLIM_KEEP ((uint32_t)~1UL) ++#ifdef CONFIG_VSERVER_DEBUG + -+#define DLIME_UNIT 0 -+#define DLIME_KILO 1 -+#define DLIME_MEGA 2 -+#define DLIME_GIGA 3 ++static inline void __dump_vx_cacct(struct _vx_cacct *cacct) ++{ ++ int i, j; + -+#define DLIMF_SHIFT 0x10 ++ printk("\t_vx_cacct:"); ++ for (i = 0; i < 6; i++) { ++ struct _vx_sock_acc *ptr = cacct->sock[i]; + -+#define DLIMS_USED 0 -+#define DLIMS_TOTAL 2 ++ printk("\t [%d] =", i); ++ for (j = 0; j < 3; j++) { ++ printk(" [%d] = %8lu, %8lu", j, ++ atomic_long_read(&ptr[j].count), ++ atomic_long_read(&ptr[j].total)); ++ } ++ printk("\n"); ++ } ++} ++ ++#endif ++ ++#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 -+uint64_t dlimit_space_32to64(uint32_t val, uint32_t flags, int shift) ++unsigned long vx_sock_count(struct _vx_cacct *cacct, int type, int pos) +{ -+ int exp = (flags & DLIMF_SHIFT) ? -+ (flags >> shift) & DLIME_GIGA : DLIME_KILO; -+ return ((uint64_t)val) << (10 * exp); ++ return atomic_long_read(&cacct->sock[type][pos].count); +} + ++ +static inline -+uint32_t dlimit_space_64to32(uint64_t val, uint32_t *flags, int shift) ++unsigned long vx_sock_total(struct _vx_cacct *cacct, int type, int pos) +{ -+ 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; ++ return atomic_long_read(&cacct->sock[type][pos].total); +} + -+#ifdef __KERNEL__ ++#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 _VSERVER_CHECK_H ++#define _VSERVER_CHECK_H + -+#ifdef CONFIG_COMPAT + -+#include ++#define MAX_S_CONTEXT 65535 /* Arbitrary limit */ + -+struct vcmd_ctx_dlimit_base_v0_x32 { -+ compat_uptr_t name_ptr; -+ uint32_t flags; -+}; ++#ifdef CONFIG_VSERVER_DYNAMIC_IDS ++#define MIN_D_CONTEXT 49152 /* dynamic contexts start here */ ++#else ++#define MIN_D_CONTEXT 65536 ++#endif + -+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; -+}; ++/* check conditions */ + -+#endif /* CONFIG_COMPAT */ ++#define VS_ADMIN 0x0001 ++#define VS_WATCH 0x0002 ++#define VS_HIDE 0x0004 ++#define VS_HOSTID 0x0008 + -+#include ++#define VS_IDENT 0x0010 ++#define VS_EQUIV 0x0020 ++#define VS_PARENT 0x0040 ++#define VS_CHILD 0x0080 + -+extern int vc_add_dlimit(uint32_t, void __user *); -+extern int vc_rem_dlimit(uint32_t, void __user *); ++#define VS_ARG_MASK 0x00F0 + -+extern int vc_set_dlimit(uint32_t, void __user *); -+extern int vc_get_dlimit(uint32_t, void __user *); ++#define VS_DYNAMIC 0x0100 ++#define VS_STATIC 0x0200 + -+#ifdef CONFIG_COMPAT ++#define VS_ATR_MASK 0x0F00 + -+extern int vc_add_dlimit_x32(uint32_t, void __user *); -+extern int vc_rem_dlimit_x32(uint32_t, void __user *); ++#ifdef CONFIG_VSERVER_PRIVACY ++#define VS_ADMIN_P (0) ++#define VS_WATCH_P (0) ++#else ++#define VS_ADMIN_P VS_ADMIN ++#define VS_WATCH_P VS_WATCH ++#endif + -+extern int vc_set_dlimit_x32(uint32_t, void __user *); -+extern int vc_get_dlimit_x32(uint32_t, void __user *); ++#define VS_HARDIRQ 0x1000 ++#define VS_SOFTIRQ 0x2000 ++#define VS_IRQ 0x4000 + -+#endif /* CONFIG_COMPAT */ ++#define VS_IRQ_MASK 0xF000 + -+#endif /* __KERNEL__ */ -+#endif /* _VX_DLIMIT_CMD_H */ -diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/dlimit.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/dlimit.h ---- linux-2.6.36.2/include/linux/vserver/dlimit.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/dlimit.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,54 @@ -+#ifndef _VX_DLIMIT_H -+#define _VX_DLIMIT_H ++#include + -+#include "switch.h" ++/* ++ * check current context for ADMIN/WATCH and ++ * optionally against supplied argument ++ */ ++static inline int __vs_check(int cid, int id, unsigned int mode) ++{ ++ if (mode & VS_ARG_MASK) { ++ if ((mode & VS_IDENT) && (id == cid)) ++ return 1; ++ } ++ if (mode & VS_ATR_MASK) { ++ if ((mode & VS_DYNAMIC) && ++ (id >= MIN_D_CONTEXT) && ++ (id <= MAX_S_CONTEXT)) ++ return 1; ++ if ((mode & VS_STATIC) && ++ (id > 1) && (id < MIN_D_CONTEXT)) ++ return 1; ++ } ++ if (mode & VS_IRQ_MASK) { ++ if ((mode & VS_IRQ) && unlikely(in_interrupt())) ++ return 1; ++ if ((mode & VS_HARDIRQ) && unlikely(in_irq())) ++ return 1; ++ if ((mode & VS_SOFTIRQ) && unlikely(in_softirq())) ++ return 1; ++ } ++ return (((mode & VS_ADMIN) && (cid == 0)) || ++ ((mode & VS_WATCH) && (cid == 1)) || ++ ((mode & VS_HOSTID) && (id == 0))); ++} ++ ++#define vx_check(c, m) __vs_check(vx_current_xid(), c, (m) | VS_IRQ) + ++#define vx_weak_check(c, m) ((m) ? vx_check(c, m) : 1) + -+#ifdef __KERNEL__ + -+/* keep in sync with CDLIM_INFINITY */ ++#define nx_check(c, m) __vs_check(nx_current_nid(), c, m) ++ ++#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1) ++ ++#endif +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 + -+#define DLIM_INFINITY (~0ULL) + ++#include +#include +#include ++#include + -+struct super_block; ++#include "limit_def.h" ++#include "sched_def.h" ++#include "cvirt_def.h" ++#include "cacct_def.h" ++#include "device_def.h" + -+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 */ -+ atomic_t dl_usecnt; /* usage count */ -+ atomic_t dl_refcnt; /* reference count */ ++#define VX_SPACES 2 + -+ struct super_block *dl_sb; /* associated superblock */ ++struct _vx_info_pc { ++ struct _vx_sched_pc sched_pc; ++ struct _vx_cvirt_pc cvirt_pc; ++}; + -+ spinlock_t dl_lock; /* protect the values */ ++struct _vx_space { ++ unsigned long vx_nsmask; /* assignment mask */ ++ struct nsproxy *vx_nsproxy; /* private namespaces */ ++ struct fs_struct *vx_fs; /* private namespace fs */ ++ const struct cred *vx_cred; /* task credentials */ ++}; + -+ unsigned long long dl_space_used; /* used space in bytes */ -+ unsigned long long dl_space_total; /* maximum space in bytes */ -+ unsigned long dl_inodes_used; /* used inodes */ -+ unsigned long dl_inodes_total; /* maximum inodes */ ++struct vx_info { ++ struct hlist_node vx_hlist; /* linked list of contexts */ ++ 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 */ ++ int vx_state; /* context state */ + -+ unsigned int dl_nrlmult; /* non root limit mult */ -+}; ++ struct _vx_space space[VX_SPACES]; /* namespace store */ + -+struct rcu_head; ++ uint64_t vx_flags; /* context flags */ ++ uint64_t vx_ccaps; /* context caps (vserver) */ ++ uint64_t vx_umask; /* unshare mask (guest) */ ++ uint64_t vx_wmask; /* warn mask (guest) */ ++ kernel_cap_t vx_bcaps; /* bounding caps (system) */ + -+extern void rcu_free_dl_info(struct rcu_head *); -+extern void unhash_dl_info(struct dl_info *); ++ struct task_struct *vx_reaper; /* guest reaper process */ ++ pid_t vx_initpid; /* PID of guest init */ ++ int64_t vx_badness_bias; /* OOM points bias */ + -+extern struct dl_info *locate_dl_info(struct super_block *, tag_t); ++ struct _vx_limit limit; /* vserver limits */ ++ struct _vx_sched sched; /* vserver scheduler */ ++ struct _vx_cvirt cvirt; /* virtual/bias stuff */ ++ struct _vx_cacct cacct; /* context accounting */ + ++ struct _vx_device dmap; /* default device map targets */ + -+struct kstatfs; ++#ifndef CONFIG_SMP ++ struct _vx_info_pc info_pc; /* per cpu data */ ++#else ++ struct _vx_info_pc *ptr_pc; /* per cpu array */ ++#endif + -+extern void vx_vsi_statfs(struct super_block *, struct kstatfs *); ++ wait_queue_head_t vx_wait; /* context exit waitqueue */ ++ int reboot_cmd; /* last sys_reboot() cmd */ ++ int exit_code; /* last process exit code */ + -+typedef uint64_t dlsize_t; ++ char vx_name[65]; /* vserver name */ ++}; + -+#endif /* __KERNEL__ */ -+#else /* _VX_DLIMIT_H */ -+#warning duplicate inclusion -+#endif /* _VX_DLIMIT_H */ -diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/global.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/global.h ---- linux-2.6.36.2/include/linux/vserver/global.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/global.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,19 @@ -+#ifndef _VX_GLOBAL_H -+#define _VX_GLOBAL_H ++#ifndef CONFIG_SMP ++#define vx_ptr_pc(vxi) (&(vxi)->info_pc) ++#define vx_per_cpu(vxi, v, id) vx_ptr_pc(vxi)->v ++#else ++#define vx_ptr_pc(vxi) ((vxi)->ptr_pc) ++#define vx_per_cpu(vxi, v, id) per_cpu_ptr(vx_ptr_pc(vxi), id)->v ++#endif + ++#define vx_cpu(vxi, v) vx_per_cpu(vxi, v, smp_processor_id()) + -+extern atomic_t vx_global_ctotal; -+extern atomic_t vx_global_cactive; + -+extern atomic_t nx_global_ctotal; -+extern atomic_t nx_global_cactive; ++struct vx_info_save { ++ struct vx_info *vxi; ++ vxid_t xid; ++}; + -+extern atomic_t vs_global_nsproxy; -+extern atomic_t vs_global_fs; -+extern atomic_t vs_global_mnt_ns; -+extern atomic_t vs_global_uts_ns; -+extern atomic_t vs_global_user_ns; -+extern atomic_t vs_global_pid_ns; + ++/* status flags */ + -+#endif /* _VX_GLOBAL_H */ -diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/history.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/history.h ---- linux-2.6.36.2/include/linux/vserver/history.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/history.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,197 @@ -+#ifndef _VX_HISTORY_H -+#define _VX_HISTORY_H ++#define VXS_HASHED 0x0001 ++#define VXS_PAUSED 0x0010 ++#define VXS_SHUTDOWN 0x0100 ++#define VXS_HELPER 0x1000 ++#define VXS_RELEASED 0x8000 + + -+enum { -+ VXH_UNUSED = 0, -+ VXH_THROW_OOPS = 1, ++extern void claim_vx_info(struct vx_info *, struct task_struct *); ++extern void release_vx_info(struct vx_info *, struct task_struct *); + -+ VXH_GET_VX_INFO, -+ VXH_PUT_VX_INFO, -+ VXH_INIT_VX_INFO, -+ VXH_SET_VX_INFO, -+ VXH_CLR_VX_INFO, -+ VXH_CLAIM_VX_INFO, -+ VXH_RELEASE_VX_INFO, -+ VXH_ALLOC_VX_INFO, -+ VXH_DEALLOC_VX_INFO, -+ VXH_HASH_VX_INFO, -+ VXH_UNHASH_VX_INFO, -+ VXH_LOC_VX_INFO, -+ VXH_LOOKUP_VX_INFO, -+ VXH_CREATE_VX_INFO, -+}; ++extern struct vx_info *lookup_vx_info(int); ++extern struct vx_info *lookup_or_create_vx_info(int); + -+struct _vxhe_vxi { -+ struct vx_info *ptr; -+ unsigned xid; -+ unsigned usecnt; -+ unsigned tasks; -+}; ++extern int get_xid_list(int, unsigned int *, int); ++extern int xid_is_hashed(vxid_t); + -+struct _vxhe_set_clr { -+ void *data; -+}; ++extern int vx_migrate_task(struct task_struct *, struct vx_info *, int); + -+struct _vxhe_loc_lookup { -+ unsigned arg; -+}; ++extern long vs_state_change(struct vx_info *, unsigned int); + -+struct _vx_hist_entry { -+ void *loc; -+ unsigned short seq; -+ unsigned short type; -+ struct _vxhe_vxi vxi; -+ union { -+ struct _vxhe_set_clr sc; -+ struct _vxhe_loc_lookup ll; -+ }; -+}; + -+#ifdef CONFIG_VSERVER_HISTORY ++#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 + -+extern unsigned volatile int vxh_active; ++#include + -+struct _vx_hist_entry *vxh_advance(void *loc); ++extern int vc_task_xid(uint32_t); + ++extern int vc_vx_info(struct vx_info *, void __user *); + -+static inline -+void __vxh_copy_vxi(struct _vx_hist_entry *entry, struct vx_info *vxi) -+{ -+ entry->vxi.ptr = vxi; -+ if (vxi) { -+ entry->vxi.usecnt = atomic_read(&vxi->vx_usecnt); -+ entry->vxi.tasks = atomic_read(&vxi->vx_tasks); -+ entry->vxi.xid = vxi->vx_id; -+ } -+} ++extern int vc_ctx_stat(struct vx_info *, void __user *); + ++extern int vc_ctx_create(uint32_t, void __user *); ++extern int vc_ctx_migrate(struct vx_info *, void __user *); + -+#define __HERE__ current_text_addr() ++extern int vc_get_cflags(struct vx_info *, void __user *); ++extern int vc_set_cflags(struct vx_info *, void __user *); + -+#define __VXH_BODY(__type, __data, __here) \ -+ struct _vx_hist_entry *entry; \ -+ \ -+ preempt_disable(); \ -+ entry = vxh_advance(__here); \ -+ __data; \ -+ entry->type = __type; \ -+ preempt_enable(); ++extern int vc_get_ccaps(struct vx_info *, void __user *); ++extern int vc_set_ccaps(struct vx_info *, void __user *); + ++extern int vc_get_bcaps(struct vx_info *, void __user *); ++extern int vc_set_bcaps(struct vx_info *, void __user *); + -+ /* pass vxi only */ ++extern int vc_get_umask(struct vx_info *, void __user *); ++extern int vc_set_umask(struct vx_info *, void __user *); + -+#define __VXH_SMPL \ -+ __vxh_copy_vxi(entry, vxi) ++extern int vc_get_wmask(struct vx_info *, void __user *); ++extern int vc_set_wmask(struct vx_info *, void __user *); + -+static inline -+void __vxh_smpl(struct vx_info *vxi, int __type, void *__here) -+{ -+ __VXH_BODY(__type, __VXH_SMPL, __here) -+} ++extern int vc_get_badness(struct vx_info *, void __user *); ++extern int vc_set_badness(struct vx_info *, void __user *); + -+ /* pass vxi and data (void *) */ ++#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 + -+#define __VXH_DATA \ -+ __vxh_copy_vxi(entry, vxi); \ -+ entry->sc.data = data ++struct timespec; + -+static inline -+void __vxh_data(struct vx_info *vxi, void *data, -+ int __type, void *__here) -+{ -+ __VXH_BODY(__type, __VXH_DATA, __here) -+} ++void vx_vsi_boottime(struct timespec *); + -+ /* pass vxi and arg (long) */ ++void vx_vsi_uptime(struct timespec *, struct timespec *); + -+#define __VXH_LONG \ -+ __vxh_copy_vxi(entry, vxi); \ -+ entry->ll.arg = arg + -+static inline -+void __vxh_long(struct vx_info *vxi, long arg, -+ int __type, void *__here) -+{ -+ __VXH_BODY(__type, __VXH_LONG, __here) -+} ++struct vx_info; + ++void vx_update_load(struct vx_info *); + -+static inline -+void __vxh_throw_oops(void *__here) -+{ -+ __VXH_BODY(VXH_THROW_OOPS, {}, __here); -+ /* prevent further acquisition */ -+ vxh_active = 0; -+} + ++int vx_do_syslog(int, char __user *, int); + -+#define vxh_throw_oops() __vxh_throw_oops(__HERE__); ++#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 + -+#define __vxh_get_vx_info(v, h) __vxh_smpl(v, VXH_GET_VX_INFO, h); -+#define __vxh_put_vx_info(v, h) __vxh_smpl(v, VXH_PUT_VX_INFO, h); + -+#define __vxh_init_vx_info(v, d, h) \ -+ __vxh_data(v, d, VXH_INIT_VX_INFO, h); -+#define __vxh_set_vx_info(v, d, h) \ -+ __vxh_data(v, d, VXH_SET_VX_INFO, h); -+#define __vxh_clr_vx_info(v, d, h) \ -+ __vxh_data(v, d, VXH_CLR_VX_INFO, h); ++#include ++#include + -+#define __vxh_claim_vx_info(v, d, h) \ -+ __vxh_data(v, d, VXH_CLAIM_VX_INFO, h); -+#define __vxh_release_vx_info(v, d, h) \ -+ __vxh_data(v, d, VXH_RELEASE_VX_INFO, h); ++extern int vc_set_vhi_name(struct vx_info *, void __user *); ++extern int vc_get_vhi_name(struct vx_info *, void __user *); + -+#define vxh_alloc_vx_info(v) \ -+ __vxh_smpl(v, VXH_ALLOC_VX_INFO, __HERE__); -+#define vxh_dealloc_vx_info(v) \ -+ __vxh_smpl(v, VXH_DEALLOC_VX_INFO, __HERE__); ++extern int vc_virt_stat(struct vx_info *, void __user *); + -+#define vxh_hash_vx_info(v) \ -+ __vxh_smpl(v, VXH_HASH_VX_INFO, __HERE__); -+#define vxh_unhash_vx_info(v) \ -+ __vxh_smpl(v, VXH_UNHASH_VX_INFO, __HERE__); ++#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 vxh_loc_vx_info(v, l) \ -+ __vxh_long(v, l, VXH_LOC_VX_INFO, __HERE__); -+#define vxh_lookup_vx_info(v, l) \ -+ __vxh_long(v, l, VXH_LOOKUP_VX_INFO, __HERE__); -+#define vxh_create_vx_info(v, l) \ -+ __vxh_long(v, l, VXH_CREATE_VX_INFO, __HERE__); ++#include ++#include ++#include ++#include ++#include + -+extern void vxh_dump_history(void); + ++struct _vx_usage_stat { ++ uint64_t user; ++ uint64_t nice; ++ uint64_t system; ++ uint64_t softirq; ++ uint64_t irq; ++ uint64_t idle; ++ uint64_t iowait; ++}; + -+#else /* CONFIG_VSERVER_HISTORY */ ++struct _vx_syslog { ++ wait_queue_head_t log_wait; ++ spinlock_t logbuf_lock; /* lock for the log buffer */ + -+#define __HERE__ 0 ++ unsigned long log_start; /* next char to be read by syslog() */ ++ unsigned long con_start; /* next char to be sent to consoles */ ++ unsigned long log_end; /* most-recently-written-char + 1 */ ++ unsigned long logged_chars; /* #chars since last read+clear operation */ + -+#define vxh_throw_oops() do { } while (0) ++ char log_buf[1024]; ++}; + -+#define __vxh_get_vx_info(v, h) do { } while (0) -+#define __vxh_put_vx_info(v, h) do { } while (0) + -+#define __vxh_init_vx_info(v, d, h) do { } while (0) -+#define __vxh_set_vx_info(v, d, h) do { } while (0) -+#define __vxh_clr_vx_info(v, d, h) do { } while (0) ++/* context sub struct */ + -+#define __vxh_claim_vx_info(v, d, h) do { } while (0) -+#define __vxh_release_vx_info(v, d, h) do { } while (0) ++struct _vx_cvirt { ++ atomic_t nr_threads; /* number of current threads */ ++ atomic_t nr_running; /* number of running threads */ ++ atomic_t nr_uninterruptible; /* number of uninterruptible threads */ + -+#define vxh_alloc_vx_info(v) do { } while (0) -+#define vxh_dealloc_vx_info(v) do { } while (0) ++ atomic_t nr_onhold; /* processes on hold */ ++ uint32_t onhold_last; /* jiffies when put on hold */ + -+#define vxh_hash_vx_info(v) do { } while (0) -+#define vxh_unhash_vx_info(v) do { } while (0) ++ struct timespec bias_ts; /* time offset to the host */ ++ struct timespec bias_idle; ++ struct timespec bias_uptime; /* context creation point */ ++ uint64_t bias_clock; /* offset in clock_t */ + -+#define vxh_loc_vx_info(v, l) do { } while (0) -+#define vxh_lookup_vx_info(v, l) do { } while (0) -+#define vxh_create_vx_info(v, l) do { } while (0) ++ spinlock_t load_lock; /* lock for the load averages */ ++ atomic_t load_updates; /* nr of load updates done so far */ ++ uint32_t load_last; /* last time load was calculated */ ++ uint32_t load[3]; /* load averages 1,5,15 */ + -+#define vxh_dump_history() do { } while (0) ++ atomic_t total_forks; /* number of forks so far */ + ++ struct _vx_syslog syslog; ++}; + -+#endif /* CONFIG_VSERVER_HISTORY */ ++struct _vx_cvirt_pc { ++ struct _vx_usage_stat cpustat; ++}; + -+#endif /* _VX_HISTORY_H */ -diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/inode_cmd.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/inode_cmd.h ---- linux-2.6.36.2/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/inode_cmd.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,59 @@ -+#ifndef _VX_INODE_CMD_H -+#define _VX_INODE_CMD_H + ++#ifdef CONFIG_VSERVER_DEBUG + -+/* inode vserver commands */ ++static inline void __dump_vx_cvirt(struct _vx_cvirt *cvirt) ++{ ++ printk("\t_vx_cvirt:\n"); ++ printk("\t threads: %4d, %4d, %4d, %4d\n", ++ atomic_read(&cvirt->nr_threads), ++ atomic_read(&cvirt->nr_running), ++ atomic_read(&cvirt->nr_uninterruptible), ++ atomic_read(&cvirt->nr_onhold)); ++ /* add rest here */ ++ printk("\t total_forks = %d\n", atomic_read(&cvirt->total_forks)); ++} + -+#define VCMD_get_iattr VC_CMD(INODE, 1, 1) -+#define VCMD_set_iattr VC_CMD(INODE, 2, 1) ++#endif + -+#define VCMD_fget_iattr VC_CMD(INODE, 3, 0) -+#define VCMD_fset_iattr VC_CMD(INODE, 4, 0) ++#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 + -+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; -+}; ++#define VXD_CBIT(n, m) (vs_debug_ ## n & (1 << (m))) ++#define VXD_CMIN(n, m) (vs_debug_ ## n > (m)) ++#define VXD_MASK(n, m) (vs_debug_ ## n & (m)) + ++#define VXD_DEV(d) (d), (d)->bd_inode->i_ino, \ ++ imajor((d)->bd_inode), iminor((d)->bd_inode) ++#define VXF_DEV "%p[%lu,%d:%d]" + -+#ifdef __KERNEL__ ++#if defined(CONFIG_QUOTES_UTF8) ++#define VS_Q_LQM "\xc2\xbb" ++#define VS_Q_RQM "\xc2\xab" ++#elif defined(CONFIG_QUOTES_ASCII) ++#define VS_Q_LQM "\x27" ++#define VS_Q_RQM "\x27" ++#else ++#define VS_Q_LQM "\xbb" ++#define VS_Q_RQM "\xab" ++#endif + ++#define VS_Q(f) VS_Q_LQM f VS_Q_RQM + -+#ifdef CONFIG_COMPAT + -+#include ++#define vxd_path(p) \ ++ ({ static char _buffer[PATH_MAX]; \ ++ d_path(p, _buffer, sizeof(_buffer)); }) + -+struct vcmd_ctx_iattr_v1_x32 { -+ compat_uptr_t name_ptr; -+ uint32_t tag; -+ uint32_t flags; -+ uint32_t mask; -+}; ++#define vxd_cond_path(n) \ ++ ((n) ? vxd_path(&(n)->path) : "" ) + -+#endif /* CONFIG_COMPAT */ + -+#include ++#ifdef CONFIG_VSERVER_DEBUG + -+extern int vc_get_iattr(void __user *); -+extern int vc_set_iattr(void __user *); ++extern unsigned int vs_debug_switch; ++extern unsigned int vs_debug_xid; ++extern unsigned int vs_debug_nid; ++extern unsigned int vs_debug_tag; ++extern unsigned int vs_debug_net; ++extern unsigned int vs_debug_limit; ++extern unsigned int vs_debug_cres; ++extern unsigned int vs_debug_dlim; ++extern unsigned int vs_debug_quota; ++extern unsigned int vs_debug_cvirt; ++extern unsigned int vs_debug_space; ++extern unsigned int vs_debug_perm; ++extern unsigned int vs_debug_misc; + -+extern int vc_fget_iattr(uint32_t, void __user *); -+extern int vc_fset_iattr(uint32_t, void __user *); + -+#ifdef CONFIG_COMPAT ++#define VX_LOGLEVEL "vxD: " ++#define VX_PROC_FMT "%p: " ++#define VX_PROCESS current + -+extern int vc_get_iattr_x32(void __user *); -+extern int vc_set_iattr_x32(void __user *); ++#define vxdprintk(c, f, x...) \ ++ do { \ ++ if (c) \ ++ printk(VX_LOGLEVEL VX_PROC_FMT f "\n", \ ++ VX_PROCESS , ##x); \ ++ } while (0) + -+#endif /* CONFIG_COMPAT */ ++#define vxlprintk(c, f, x...) \ ++ do { \ ++ if (c) \ ++ printk(VX_LOGLEVEL f " @%s:%d\n", x); \ ++ } while (0) + -+#endif /* __KERNEL__ */ -+#endif /* _VX_INODE_CMD_H */ -diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/inode.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/inode.h ---- linux-2.6.36.2/include/linux/vserver/inode.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/inode.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,39 @@ -+#ifndef _VX_INODE_H -+#define _VX_INODE_H ++#define vxfprintk(c, f, x...) \ ++ do { \ ++ if (c) \ ++ printk(VX_LOGLEVEL f " %s@%s:%d\n", x); \ ++ } while (0) + + -+#define IATTR_TAG 0x01000000 ++struct vx_info; + -+#define IATTR_ADMIN 0x00000001 -+#define IATTR_WATCH 0x00000002 -+#define IATTR_HIDE 0x00000004 -+#define IATTR_FLAGS 0x00000007 ++void dump_vx_info(struct vx_info *, int); ++void dump_vx_info_inactive(int); + -+#define IATTR_BARRIER 0x00010000 -+#define IATTR_IXUNLINK 0x00020000 -+#define IATTR_IMMUTABLE 0x00040000 -+#define IATTR_COW 0x00080000 ++#else /* CONFIG_VSERVER_DEBUG */ + -+#ifdef __KERNEL__ ++#define vs_debug_switch 0 ++#define vs_debug_xid 0 ++#define vs_debug_nid 0 ++#define vs_debug_tag 0 ++#define vs_debug_net 0 ++#define vs_debug_limit 0 ++#define vs_debug_cres 0 ++#define vs_debug_dlim 0 ++#define vs_debug_quota 0 ++#define vs_debug_cvirt 0 ++#define vs_debug_space 0 ++#define vs_debug_perm 0 ++#define vs_debug_misc 0 + ++#define vxdprintk(x...) do { } while (0) ++#define vxlprintk(x...) do { } while (0) ++#define vxfprintk(x...) do { } while (0) + -+#ifdef CONFIG_VSERVER_PROC_SECURE -+#define IATTR_PROC_DEFAULT ( IATTR_ADMIN | IATTR_HIDE ) -+#define IATTR_PROC_SYMLINK ( IATTR_ADMIN ) -+#else -+#define IATTR_PROC_DEFAULT ( IATTR_ADMIN ) -+#define IATTR_PROC_SYMLINK ( IATTR_ADMIN ) -+#endif ++#endif /* CONFIG_VSERVER_DEBUG */ + -+#define vx_hide_check(c, m) (((m) & IATTR_HIDE) ? vx_check(c, m) : 1) + -+#endif /* __KERNEL__ */ ++#ifdef CONFIG_VSERVER_WARN + -+/* inode ioctls */ ++#define VX_WARNLEVEL KERN_WARNING "vxW: " ++#define VX_WARN_TASK "[" VS_Q("%s") ",%u:#%u|%u|%u] " ++#define VX_WARN_XID "[xid #%u] " ++#define VX_WARN_NID "[nid #%u] " ++#define VX_WARN_TAG "[tag #%u] " + -+#define FIOC_GETXFLG _IOR('x', 5, long) -+#define FIOC_SETXFLG _IOW('x', 6, long) ++#define vxwprintk(c, f, x...) \ ++ do { \ ++ if (c) \ ++ printk(VX_WARNLEVEL f "\n", ##x); \ ++ } while (0) + -+#else /* _VX_INODE_H */ -+#warning duplicate inclusion -+#endif /* _VX_INODE_H */ -diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/Kbuild linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/Kbuild ---- linux-2.6.36.2/include/linux/vserver/Kbuild 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/Kbuild 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,8 @@ ++#else /* CONFIG_VSERVER_WARN */ + -+unifdef-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 vxwprintk(x...) do { } while (0) + -+unifdef-y += switch.h network.h monitor.h inode.h device.h ++#endif /* CONFIG_VSERVER_WARN */ + -diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/limit_cmd.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/limit_cmd.h ---- linux-2.6.36.2/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/limit_cmd.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,71 @@ -+#ifndef _VX_LIMIT_CMD_H -+#define _VX_LIMIT_CMD_H ++#define vxwprintk_task(c, f, x...) \ ++ vxwprintk(c, VX_WARN_TASK f, \ ++ current->comm, current->pid, \ ++ 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...) \ ++ vxwprintk(c, VX_WARN_NID f, current->nid, x) ++#define vxwprintk_tag(c, f, x...) \ ++ vxwprintk(c, VX_WARN_TAG f, current->tag, x) + ++#ifdef CONFIG_VSERVER_DEBUG ++#define vxd_assert_lock(l) assert_spin_locked(l) ++#define vxd_assert(c, f, x...) vxlprintk(!(c), \ ++ "assertion [" f "] failed.", ##x, __FILE__, __LINE__) ++#else ++#define vxd_assert_lock(l) do { } while (0) ++#define vxd_assert(c, f, x...) do { } while (0) ++#endif + -+/* 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) ++#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 + -+struct vcmd_ctx_rlimit_v0 { -+ uint32_t id; -+ uint64_t minimum; -+ uint64_t softlimit; -+ uint64_t maximum; -+}; ++#include + -+struct vcmd_ctx_rlimit_mask_v0 { -+ uint32_t minimum; -+ uint32_t softlimit; -+ uint32_t maximum; -+}; + -+#define VCMD_rlimit_stat VC_CMD(VSTAT, 1, 0) ++#ifdef CONFIG_COMPAT + -+struct vcmd_rlimit_stat_v0 { -+ uint32_t id; -+ uint32_t hits; -+ uint64_t value; -+ uint64_t minimum; -+ uint64_t maximum; -+}; ++#include + -+#define CRLIM_UNSET (0ULL) -+#define CRLIM_INFINITY (~0ULL) -+#define CRLIM_KEEP (~1ULL) ++struct vcmd_read_history_v0_x32 { ++ uint32_t index; ++ uint32_t count; ++ compat_uptr_t data_ptr; ++}; + -+#ifdef __KERNEL__ ++struct vcmd_read_monitor_v0_x32 { ++ uint32_t index; ++ uint32_t count; ++ compat_uptr_t data_ptr; ++}; + -+#ifdef CONFIG_IA32_EMULATION ++#endif /* CONFIG_COMPAT */ + -+struct vcmd_ctx_rlimit_v0_x32 { -+ uint32_t id; -+ uint64_t minimum; -+ uint64_t softlimit; -+ uint64_t maximum; -+} __attribute__ ((packed)); ++extern int vc_dump_history(uint32_t); + -+#endif /* CONFIG_IA32_EMULATION */ ++extern int vc_read_history(uint32_t, void __user *); ++extern int vc_read_monitor(uint32_t, void __user *); + -+#include ++#ifdef CONFIG_COMPAT + -+extern int vc_get_rlimit_mask(uint32_t, void __user *); -+extern int vc_get_rlimit(struct vx_info *, void __user *); -+extern int vc_set_rlimit(struct vx_info *, void __user *); -+extern int vc_reset_hits(struct vx_info *, void __user *); -+extern int vc_reset_minmax(struct vx_info *, void __user *); ++extern int vc_read_history_x32(uint32_t, void __user *); ++extern int vc_read_monitor_x32(uint32_t, void __user *); + -+extern int vc_rlimit_stat(struct vx_info *, void __user *); ++#endif /* CONFIG_COMPAT */ + -+#ifdef CONFIG_IA32_EMULATION ++#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 + -+extern int vc_get_rlimit_x32(struct vx_info *, void __user *); -+extern int vc_set_rlimit_x32(struct vx_info *, void __user *); + -+#endif /* CONFIG_IA32_EMULATION */ ++#include + -+#endif /* __KERNEL__ */ -+#endif /* _VX_LIMIT_CMD_H */ -diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/limit_def.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/limit_def.h ---- linux-2.6.36.2/include/linux/vserver/limit_def.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/limit_def.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,47 @@ -+#ifndef _VX_LIMIT_DEF_H -+#define _VX_LIMIT_DEF_H -+ -+#include -+#include ++#else /* _VSERVER_DEVICE_H */ ++#warning duplicate inclusion ++#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 "limit.h" ++#include + + -+struct _vx_res_limit { -+ rlim_t soft; /* Context soft limit */ -+ rlim_t hard; /* Context hard limit */ ++#ifdef CONFIG_COMPAT + -+ rlim_atomic_t rcur; /* Current value */ -+ rlim_t rmin; /* Context minimum */ -+ rlim_t rmax; /* Context maximum */ ++#include + -+ atomic_t lhit; /* Limit hits */ ++struct vcmd_set_mapping_v0_x32 { ++ compat_uptr_t device_ptr; ++ compat_uptr_t target_ptr; ++ uint32_t flags; +}; + -+/* context sub struct */ ++#endif /* CONFIG_COMPAT */ + -+struct _vx_limit { -+ struct _vx_res_limit res[NUM_LIMITS]; -+}; ++#include + -+#ifdef CONFIG_VSERVER_DEBUG ++extern int vc_set_mapping(struct vx_info *, void __user *); ++extern int vc_unset_mapping(struct vx_info *, void __user *); + -+static inline void __dump_vx_limit(struct _vx_limit *limit) -+{ -+ int i; ++#ifdef CONFIG_COMPAT + -+ printk("\t_vx_limit:"); -+ for (i = 0; i < NUM_LIMITS; i++) { -+ printk("\t [%2d] = %8lu %8lu/%8lu, %8ld/%8ld, %8d\n", -+ i, (unsigned long)__rlim_get(limit, i), -+ (unsigned long)__rlim_rmin(limit, i), -+ (unsigned long)__rlim_rmax(limit, i), -+ (long)__rlim_soft(limit, i), -+ (long)__rlim_hard(limit, i), -+ atomic_read(&__rlim_lhit(limit, i))); -+ } -+} ++extern int vc_set_mapping_x32(struct vx_info *, void __user *); ++extern int vc_unset_mapping_x32(struct vx_info *, void __user *); ++ ++#endif /* CONFIG_COMPAT */ ++ ++#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 _VSERVER_DEVICE_DEF_H ++#define _VSERVER_DEVICE_DEF_H ++ ++#include ++ ++struct vx_dmap_target { ++ dev_t target; ++ uint32_t flags; ++}; + ++struct _vx_device { ++#ifdef CONFIG_VSERVER_DEVICE ++ struct vx_dmap_target targets[2]; +#endif ++}; + -+#endif /* _VX_LIMIT_DEF_H */ -diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/limit.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/limit.h ---- linux-2.6.36.2/include/linux/vserver/limit.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/limit.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,71 @@ -+#ifndef _VX_LIMIT_H -+#define _VX_LIMIT_H ++#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 _VSERVER_DLIMIT_H ++#define _VSERVER_DLIMIT_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 ++#include "switch.h" + + +#ifdef __KERNEL__ + -+#define VLIM_NOCHECK ((1L << VLIMIT_DENTRY) | (1L << RLIMIT_RSS)) ++/* keep in sync with CDLIM_INFINITY */ + -+/* keep in sync with CRLIM_INFINITY */ ++#define DLIM_INFINITY (~0ULL) + -+#define VLIM_INFINITY (~0ULL) ++#include ++#include + -+#include -+#include ++struct super_block; + -+#ifndef RLIM_INFINITY -+#warning RLIM_INFINITY is undefined -+#endif ++struct dl_info { ++ struct hlist_node dl_hlist; /* linked list of contexts */ ++ struct rcu_head dl_rcu; /* the rcu head */ ++ vtag_t dl_tag; /* context tag */ ++ atomic_t dl_usecnt; /* usage count */ ++ atomic_t dl_refcnt; /* reference count */ + -+#define __rlim_val(l, r, v) ((l)->res[r].v) ++ struct super_block *dl_sb; /* associated superblock */ + -+#define __rlim_soft(l, r) __rlim_val(l, r, soft) -+#define __rlim_hard(l, r) __rlim_val(l, r, hard) ++ spinlock_t dl_lock; /* protect the values */ + -+#define __rlim_rcur(l, r) __rlim_val(l, r, rcur) -+#define __rlim_rmin(l, r) __rlim_val(l, r, rmin) -+#define __rlim_rmax(l, r) __rlim_val(l, r, rmax) ++ unsigned long long dl_space_used; /* used space in bytes */ ++ unsigned long long dl_space_total; /* maximum space in bytes */ ++ unsigned long dl_inodes_used; /* used inodes */ ++ unsigned long dl_inodes_total; /* maximum inodes */ + -+#define __rlim_lhit(l, r) __rlim_val(l, r, lhit) -+#define __rlim_hit(l, r) atomic_inc(&__rlim_lhit(l, r)) ++ unsigned int dl_nrlmult; /* non root limit mult */ ++}; + -+typedef atomic_long_t rlim_atomic_t; -+typedef unsigned long rlim_t; ++struct rcu_head; + -+#define __rlim_get(l, r) atomic_long_read(&__rlim_rcur(l, r)) -+#define __rlim_set(l, r, v) atomic_long_set(&__rlim_rcur(l, r), v) -+#define __rlim_inc(l, r) atomic_long_inc(&__rlim_rcur(l, r)) -+#define __rlim_dec(l, r) atomic_long_dec(&__rlim_rcur(l, r)) -+#define __rlim_add(l, r, v) atomic_long_add(v, &__rlim_rcur(l, r)) -+#define __rlim_sub(l, r, v) atomic_long_sub(v, &__rlim_rcur(l, r)) ++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 *, vtag_t); + -+#if (RLIM_INFINITY == VLIM_INFINITY) -+#define VX_VLIM(r) ((long long)(long)(r)) -+#define VX_RLIM(v) ((rlim_t)(v)) -+#else -+#define VX_VLIM(r) (((r) == RLIM_INFINITY) \ -+ ? VLIM_INFINITY : (long long)(r)) -+#define VX_RLIM(v) (((v) == VLIM_INFINITY) \ -+ ? RLIM_INFINITY : (rlim_t)(v)) -+#endif + -+struct sysinfo; ++struct kstatfs; + -+void vx_vsi_meminfo(struct sysinfo *); -+void vx_vsi_swapinfo(struct sysinfo *); -+long vx_vsi_cached(struct sysinfo *); ++extern void vx_vsi_statfs(struct super_block *, struct kstatfs *); + -+#define NUM_LIMITS 24 ++typedef uint64_t dlsize_t; + +#endif /* __KERNEL__ */ -+#endif /* _VX_LIMIT_H */ -diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/limit_int.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/limit_int.h ---- linux-2.6.36.2/include/linux/vserver/limit_int.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/limit_int.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,198 @@ -+#ifndef _VX_LIMIT_INT_H -+#define _VX_LIMIT_INT_H ++#else /* _VSERVER_DLIMIT_H */ ++#warning duplicate inclusion ++#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 "context.h" ++#include + -+#ifdef __KERNEL__ + -+#define VXD_RCRES_COND(r) VXD_CBIT(cres, r) -+#define VXD_RLIMIT_COND(r) VXD_CBIT(limit, r) ++#ifdef CONFIG_COMPAT + -+extern const char *vlimit_name[NUM_LIMITS]; ++#include + -+static inline void __vx_acc_cres(struct vx_info *vxi, -+ int res, int dir, void *_data, char *_file, int _line) -+{ -+ if (VXD_RCRES_COND(res)) -+ vxlprintk(1, "vx_acc_cres[%5d,%s,%2d]: %5ld%s (%p)", -+ (vxi ? vxi->vx_id : -1), vlimit_name[res], res, -+ (vxi ? (long)__rlim_get(&vxi->limit, res) : 0), -+ (dir > 0) ? "++" : "--", _data, _file, _line); -+ if (!vxi) -+ return; ++struct vcmd_ctx_dlimit_base_v0_x32 { ++ compat_uptr_t name_ptr; ++ uint32_t flags; ++}; + -+ if (dir > 0) -+ __rlim_inc(&vxi->limit, res); -+ else -+ __rlim_dec(&vxi->limit, res); -+} ++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; ++}; + -+static inline void __vx_add_cres(struct vx_info *vxi, -+ int res, int amount, void *_data, char *_file, int _line) -+{ -+ if (VXD_RCRES_COND(res)) -+ vxlprintk(1, "vx_add_cres[%5d,%s,%2d]: %5ld += %5d (%p)", -+ (vxi ? vxi->vx_id : -1), vlimit_name[res], res, -+ (vxi ? (long)__rlim_get(&vxi->limit, res) : 0), -+ amount, _data, _file, _line); -+ if (amount == 0) -+ return; -+ if (!vxi) -+ return; -+ __rlim_add(&vxi->limit, res, amount); -+} ++#endif /* CONFIG_COMPAT */ + -+static inline -+int __vx_cres_adjust_max(struct _vx_limit *limit, int res, rlim_t value) -+{ -+ int cond = (value > __rlim_rmax(limit, res)); ++#include + -+ if (cond) -+ __rlim_rmax(limit, res) = value; -+ return cond; -+} ++extern int vc_add_dlimit(uint32_t, void __user *); ++extern int vc_rem_dlimit(uint32_t, void __user *); + -+static inline -+int __vx_cres_adjust_min(struct _vx_limit *limit, int res, rlim_t value) -+{ -+ int cond = (value < __rlim_rmin(limit, res)); ++extern int vc_set_dlimit(uint32_t, void __user *); ++extern int vc_get_dlimit(uint32_t, void __user *); + -+ if (cond) -+ __rlim_rmin(limit, res) = value; -+ return cond; -+} ++#ifdef CONFIG_COMPAT + -+static inline -+void __vx_cres_fixup(struct _vx_limit *limit, int res, rlim_t value) -+{ -+ if (!__vx_cres_adjust_max(limit, res, value)) -+ __vx_cres_adjust_min(limit, res, value); -+} ++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 *); + -+/* return values: -+ +1 ... no limit hit -+ -1 ... over soft limit -+ 0 ... over hard limit */ ++#endif /* CONFIG_COMPAT */ + -+static inline int __vx_cres_avail(struct vx_info *vxi, -+ int res, int num, char *_file, int _line) -+{ -+ struct _vx_limit *limit; -+ rlim_t value; ++#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 _VSERVER_GLOBAL_H ++#define _VSERVER_GLOBAL_H + -+ if (VXD_RLIMIT_COND(res)) -+ vxlprintk(1, "vx_cres_avail[%5d,%s,%2d]: %5ld/%5ld > %5ld + %5d", -+ (vxi ? vxi->vx_id : -1), vlimit_name[res], res, -+ (vxi ? (long)__rlim_soft(&vxi->limit, res) : -1), -+ (vxi ? (long)__rlim_hard(&vxi->limit, res) : -1), -+ (vxi ? (long)__rlim_get(&vxi->limit, res) : 0), -+ num, _file, _line); -+ if (!vxi) -+ return 1; + -+ limit = &vxi->limit; -+ value = __rlim_get(limit, res); ++extern atomic_t vx_global_ctotal; ++extern atomic_t vx_global_cactive; + -+ if (!__vx_cres_adjust_max(limit, res, value)) -+ __vx_cres_adjust_min(limit, res, value); ++extern atomic_t nx_global_ctotal; ++extern atomic_t nx_global_cactive; + -+ if (num == 0) -+ return 1; ++extern atomic_t vs_global_nsproxy; ++extern atomic_t vs_global_fs; ++extern atomic_t vs_global_mnt_ns; ++extern atomic_t vs_global_uts_ns; ++extern atomic_t vs_global_user_ns; ++extern atomic_t vs_global_pid_ns; + -+ if (__rlim_soft(limit, res) == RLIM_INFINITY) -+ return -1; -+ if (value + num <= __rlim_soft(limit, res)) -+ return -1; + -+ if (__rlim_hard(limit, res) == RLIM_INFINITY) -+ return 1; -+ if (value + num <= __rlim_hard(limit, res)) -+ return 1; ++#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 _VSERVER_HISTORY_H ++#define _VSERVER_HISTORY_H + -+ __rlim_hit(limit, res); -+ return 0; -+} + ++enum { ++ VXH_UNUSED = 0, ++ VXH_THROW_OOPS = 1, ++ ++ VXH_GET_VX_INFO, ++ VXH_PUT_VX_INFO, ++ VXH_INIT_VX_INFO, ++ VXH_SET_VX_INFO, ++ VXH_CLR_VX_INFO, ++ VXH_CLAIM_VX_INFO, ++ VXH_RELEASE_VX_INFO, ++ VXH_ALLOC_VX_INFO, ++ VXH_DEALLOC_VX_INFO, ++ VXH_HASH_VX_INFO, ++ VXH_UNHASH_VX_INFO, ++ VXH_LOC_VX_INFO, ++ VXH_LOOKUP_VX_INFO, ++ VXH_CREATE_VX_INFO, ++}; ++ ++struct _vxhe_vxi { ++ struct vx_info *ptr; ++ unsigned xid; ++ unsigned usecnt; ++ unsigned tasks; ++}; ++ ++struct _vxhe_set_clr { ++ void *data; ++}; ++ ++struct _vxhe_loc_lookup { ++ unsigned arg; ++}; ++ ++struct _vx_hist_entry { ++ void *loc; ++ unsigned short seq; ++ unsigned short type; ++ struct _vxhe_vxi vxi; ++ union { ++ struct _vxhe_set_clr sc; ++ struct _vxhe_loc_lookup ll; ++ }; ++}; ++ ++#ifdef CONFIG_VSERVER_HISTORY ++ ++extern unsigned volatile int vxh_active; ++ ++struct _vx_hist_entry *vxh_advance(void *loc); + -+static const int VLA_RSS[] = { RLIMIT_RSS, VLIMIT_ANON, VLIMIT_MAPPED, 0 }; + +static inline -+rlim_t __vx_cres_array_sum(struct _vx_limit *limit, const int *array) ++void __vxh_copy_vxi(struct _vx_hist_entry *entry, struct vx_info *vxi) +{ -+ rlim_t value, sum = 0; -+ int res; -+ -+ while ((res = *array++)) { -+ value = __rlim_get(limit, res); -+ __vx_cres_fixup(limit, res, value); -+ sum += value; ++ entry->vxi.ptr = vxi; ++ if (vxi) { ++ entry->vxi.usecnt = atomic_read(&vxi->vx_usecnt); ++ entry->vxi.tasks = atomic_read(&vxi->vx_tasks); ++ entry->vxi.xid = vxi->vx_id; + } -+ return sum; +} + ++ ++#define __HERE__ current_text_addr() ++ ++#define __VXH_BODY(__type, __data, __here) \ ++ struct _vx_hist_entry *entry; \ ++ \ ++ preempt_disable(); \ ++ entry = vxh_advance(__here); \ ++ __data; \ ++ entry->type = __type; \ ++ preempt_enable(); ++ ++ ++ /* pass vxi only */ ++ ++#define __VXH_SMPL \ ++ __vxh_copy_vxi(entry, vxi) ++ +static inline -+rlim_t __vx_cres_array_fixup(struct _vx_limit *limit, const int *array) ++void __vxh_smpl(struct vx_info *vxi, int __type, void *__here) +{ -+ rlim_t value = __vx_cres_array_sum(limit, array + 1); -+ int res = *array; ++ __VXH_BODY(__type, __VXH_SMPL, __here) ++} + -+ if (value == __rlim_get(limit, res)) -+ return value; ++ /* pass vxi and data (void *) */ + -+ __rlim_set(limit, res, value); -+ /* now adjust min/max */ -+ if (!__vx_cres_adjust_max(limit, res, value)) -+ __vx_cres_adjust_min(limit, res, value); ++#define __VXH_DATA \ ++ __vxh_copy_vxi(entry, vxi); \ ++ entry->sc.data = data + -+ return value; ++static inline ++void __vxh_data(struct vx_info *vxi, void *data, ++ int __type, void *__here) ++{ ++ __VXH_BODY(__type, __VXH_DATA, __here) +} + -+static inline int __vx_cres_array_avail(struct vx_info *vxi, -+ const int *array, int num, char *_file, int _line) -+{ -+ struct _vx_limit *limit; -+ rlim_t value = 0; -+ int res; ++ /* pass vxi and arg (long) */ + -+ if (num == 0) -+ return 1; -+ if (!vxi) -+ return 1; ++#define __VXH_LONG \ ++ __vxh_copy_vxi(entry, vxi); \ ++ entry->ll.arg = arg + -+ limit = &vxi->limit; -+ res = *array; -+ value = __vx_cres_array_sum(limit, array + 1); ++static inline ++void __vxh_long(struct vx_info *vxi, long arg, ++ int __type, void *__here) ++{ ++ __VXH_BODY(__type, __VXH_LONG, __here) ++} + -+ __rlim_set(limit, res, value); -+ __vx_cres_fixup(limit, res, value); + -+ return __vx_cres_avail(vxi, res, num, _file, _line); ++static inline ++void __vxh_throw_oops(void *__here) ++{ ++ __VXH_BODY(VXH_THROW_OOPS, {}, __here); ++ /* prevent further acquisition */ ++ vxh_active = 0; +} + + -+static inline void vx_limit_fixup(struct _vx_limit *limit, int id) -+{ -+ rlim_t value; -+ int res; ++#define vxh_throw_oops() __vxh_throw_oops(__HERE__); + -+ /* complex resources first */ -+ if ((id < 0) || (id == RLIMIT_RSS)) -+ __vx_cres_array_fixup(limit, VLA_RSS); ++#define __vxh_get_vx_info(v, h) __vxh_smpl(v, VXH_GET_VX_INFO, h); ++#define __vxh_put_vx_info(v, h) __vxh_smpl(v, VXH_PUT_VX_INFO, h); + -+ for (res = 0; res < NUM_LIMITS; res++) { -+ if ((id > 0) && (res != id)) -+ continue; ++#define __vxh_init_vx_info(v, d, h) \ ++ __vxh_data(v, d, VXH_INIT_VX_INFO, h); ++#define __vxh_set_vx_info(v, d, h) \ ++ __vxh_data(v, d, VXH_SET_VX_INFO, h); ++#define __vxh_clr_vx_info(v, d, h) \ ++ __vxh_data(v, d, VXH_CLR_VX_INFO, h); + -+ value = __rlim_get(limit, res); -+ __vx_cres_fixup(limit, res, value); ++#define __vxh_claim_vx_info(v, d, h) \ ++ __vxh_data(v, d, VXH_CLAIM_VX_INFO, h); ++#define __vxh_release_vx_info(v, d, h) \ ++ __vxh_data(v, d, VXH_RELEASE_VX_INFO, h); + -+ /* not supposed to happen, maybe warn? */ -+ if (__rlim_rmax(limit, res) > __rlim_hard(limit, res)) -+ __rlim_rmax(limit, res) = __rlim_hard(limit, res); -+ } -+} ++#define vxh_alloc_vx_info(v) \ ++ __vxh_smpl(v, VXH_ALLOC_VX_INFO, __HERE__); ++#define vxh_dealloc_vx_info(v) \ ++ __vxh_smpl(v, VXH_DEALLOC_VX_INFO, __HERE__); + ++#define vxh_hash_vx_info(v) \ ++ __vxh_smpl(v, VXH_HASH_VX_INFO, __HERE__); ++#define vxh_unhash_vx_info(v) \ ++ __vxh_smpl(v, VXH_UNHASH_VX_INFO, __HERE__); + -+#endif /* __KERNEL__ */ -+#endif /* _VX_LIMIT_INT_H */ -diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/monitor.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/monitor.h ---- linux-2.6.36.2/include/linux/vserver/monitor.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/monitor.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,96 @@ -+#ifndef _VX_MONITOR_H -+#define _VX_MONITOR_H ++#define vxh_loc_vx_info(v, l) \ ++ __vxh_long(v, l, VXH_LOC_VX_INFO, __HERE__); ++#define vxh_lookup_vx_info(v, l) \ ++ __vxh_long(v, l, VXH_LOOKUP_VX_INFO, __HERE__); ++#define vxh_create_vx_info(v, l) \ ++ __vxh_long(v, l, VXH_CREATE_VX_INFO, __HERE__); + -+#include ++extern void vxh_dump_history(void); + -+enum { -+ VXM_UNUSED = 0, + -+ VXM_SYNC = 0x10, ++#else /* CONFIG_VSERVER_HISTORY */ + -+ VXM_UPDATE = 0x20, -+ VXM_UPDATE_1, -+ VXM_UPDATE_2, ++#define __HERE__ 0 + -+ VXM_RQINFO_1 = 0x24, -+ VXM_RQINFO_2, ++#define vxh_throw_oops() do { } while (0) + -+ VXM_ACTIVATE = 0x40, -+ VXM_DEACTIVATE, -+ VXM_IDLE, ++#define __vxh_get_vx_info(v, h) do { } while (0) ++#define __vxh_put_vx_info(v, h) do { } while (0) + -+ VXM_HOLD = 0x44, -+ VXM_UNHOLD, ++#define __vxh_init_vx_info(v, d, h) do { } while (0) ++#define __vxh_set_vx_info(v, d, h) do { } while (0) ++#define __vxh_clr_vx_info(v, d, h) do { } while (0) + -+ VXM_MIGRATE = 0x48, -+ VXM_RESCHED, ++#define __vxh_claim_vx_info(v, d, h) do { } while (0) ++#define __vxh_release_vx_info(v, d, h) do { } while (0) + -+ /* all other bits are flags */ -+ VXM_SCHED = 0x80, -+}; ++#define vxh_alloc_vx_info(v) do { } while (0) ++#define vxh_dealloc_vx_info(v) do { } while (0) + -+struct _vxm_update_1 { -+ uint32_t tokens_max; -+ uint32_t fill_rate; -+ uint32_t interval; -+}; ++#define vxh_hash_vx_info(v) do { } while (0) ++#define vxh_unhash_vx_info(v) do { } while (0) + -+struct _vxm_update_2 { -+ uint32_t tokens_min; -+ uint32_t fill_rate; -+ uint32_t interval; -+}; ++#define vxh_loc_vx_info(v, l) do { } while (0) ++#define vxh_lookup_vx_info(v, l) do { } while (0) ++#define vxh_create_vx_info(v, l) do { } while (0) + -+struct _vxm_rqinfo_1 { -+ uint16_t running; -+ uint16_t onhold; -+ uint16_t iowait; -+ uint16_t uintr; -+ uint32_t idle_tokens; -+}; ++#define vxh_dump_history() do { } while (0) + -+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; -+}; ++#endif /* CONFIG_VSERVER_HISTORY */ + -+struct _vxm_task { -+ uint16_t pid; -+ uint16_t state; -+}; ++#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 + -+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 + -+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; -+ }; -+}; + ++#ifdef CONFIG_VSERVER_PROC_SECURE ++#define IATTR_PROC_DEFAULT ( IATTR_ADMIN | IATTR_HIDE ) ++#define IATTR_PROC_SYMLINK ( IATTR_ADMIN ) ++#else ++#define IATTR_PROC_DEFAULT ( IATTR_ADMIN ) ++#define IATTR_PROC_SYMLINK ( IATTR_ADMIN ) ++#endif + -+#endif /* _VX_MONITOR_H */ -diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/network_cmd.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/network_cmd.h ---- linux-2.6.36.2/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/network_cmd.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,150 @@ -+#ifndef _VX_NETWORK_CMD_H -+#define _VX_NETWORK_CMD_H ++#define vx_hide_check(c, m) (((m) & IATTR_HIDE) ? vx_check(c, m) : 1) + ++#else /* _VSERVER_INODE_H */ ++#warning duplicate inclusion ++#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 + -+/* vinfo commands */ ++#include + -+#define VCMD_task_nid VC_CMD(VINFO, 2, 0) + -+#ifdef __KERNEL__ -+extern int vc_task_nid(uint32_t); + -+#endif /* __KERNEL__ */ ++#ifdef CONFIG_COMPAT + -+#define VCMD_nx_info VC_CMD(VINFO, 6, 0) ++#include + -+struct vcmd_nx_info_v0 { -+ uint32_t nid; -+ /* more to come */ ++struct vcmd_ctx_iattr_v1_x32 { ++ compat_uptr_t name_ptr; ++ uint32_t tag; ++ uint32_t flags; ++ uint32_t mask; +}; + -+#ifdef __KERNEL__ -+extern int vc_nx_info(struct nx_info *, void __user *); ++#endif /* CONFIG_COMPAT */ + -+#endif /* __KERNEL__ */ ++#include + -+#include -+#include ++extern int vc_get_iattr(void __user *); ++extern int vc_set_iattr(void __user *); + -+#define VCMD_net_create_v0 VC_CMD(VNET, 1, 0) -+#define VCMD_net_create VC_CMD(VNET, 1, 1) ++extern int vc_fget_iattr(uint32_t, void __user *); ++extern int vc_fset_iattr(uint32_t, void __user *); + -+struct vcmd_net_create { -+ uint64_t flagword; -+}; ++#ifdef CONFIG_COMPAT + -+#define VCMD_net_migrate VC_CMD(NETMIG, 1, 0) ++extern int vc_get_iattr_x32(void __user *); ++extern int vc_set_iattr_x32(void __user *); + -+#define VCMD_net_add VC_CMD(NETALT, 1, 0) -+#define VCMD_net_remove VC_CMD(NETALT, 2, 0) ++#endif /* CONFIG_COMPAT */ + -+struct vcmd_net_addr_v0 { -+ uint16_t type; -+ uint16_t count; -+ struct in_addr ip[4]; -+ struct in_addr mask[4]; -+}; ++#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 + -+#define VCMD_net_add_ipv4 VC_CMD(NETALT, 1, 1) -+#define VCMD_net_remove_ipv4 VC_CMD(NETALT, 2, 1) ++#include + -+struct vcmd_net_addr_ipv4_v1 { -+ uint16_t type; -+ uint16_t flags; -+ struct in_addr ip; -+ struct in_addr mask; -+}; + -+#define VCMD_net_add_ipv6 VC_CMD(NETALT, 3, 1) -+#define VCMD_net_remove_ipv6 VC_CMD(NETALT, 4, 1) ++#define VLIM_NOCHECK ((1L << VLIMIT_DENTRY) | (1L << RLIMIT_RSS)) + -+struct vcmd_net_addr_ipv6_v1 { -+ uint16_t type; -+ uint16_t flags; -+ uint32_t prefix; -+ struct in6_addr ip; -+ struct in6_addr mask; -+}; ++/* keep in sync with CRLIM_INFINITY */ + -+#define VCMD_add_match_ipv4 VC_CMD(NETALT, 5, 0) -+#define VCMD_get_match_ipv4 VC_CMD(NETALT, 6, 0) ++#define VLIM_INFINITY (~0ULL) + -+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; -+}; ++#include ++#include + -+#define VCMD_add_match_ipv6 VC_CMD(NETALT, 7, 0) -+#define VCMD_get_match_ipv6 VC_CMD(NETALT, 8, 0) ++#ifndef RLIM_INFINITY ++#warning RLIM_INFINITY is undefined ++#endif + -+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; -+}; ++#define __rlim_val(l, r, v) ((l)->res[r].v) + ++#define __rlim_soft(l, r) __rlim_val(l, r, soft) ++#define __rlim_hard(l, r) __rlim_val(l, r, hard) + -+#ifdef __KERNEL__ -+extern int vc_net_create(uint32_t, void __user *); -+extern int vc_net_migrate(struct nx_info *, void __user *); ++#define __rlim_rcur(l, r) __rlim_val(l, r, rcur) ++#define __rlim_rmin(l, r) __rlim_val(l, r, rmin) ++#define __rlim_rmax(l, r) __rlim_val(l, r, rmax) + -+extern int vc_net_add(struct nx_info *, void __user *); -+extern int vc_net_remove(struct nx_info *, void __user *); ++#define __rlim_lhit(l, r) __rlim_val(l, r, lhit) ++#define __rlim_hit(l, r) atomic_inc(&__rlim_lhit(l, r)) + -+extern int vc_net_add_ipv4(struct nx_info *, void __user *); -+extern int vc_net_remove_ipv4(struct nx_info *, void __user *); ++typedef atomic_long_t rlim_atomic_t; ++typedef unsigned long rlim_t; + -+extern int vc_net_add_ipv6(struct nx_info *, void __user *); -+extern int vc_net_remove_ipv6(struct nx_info *, void __user *); ++#define __rlim_get(l, r) atomic_long_read(&__rlim_rcur(l, r)) ++#define __rlim_set(l, r, v) atomic_long_set(&__rlim_rcur(l, r), v) ++#define __rlim_inc(l, r) atomic_long_inc(&__rlim_rcur(l, r)) ++#define __rlim_dec(l, r) atomic_long_dec(&__rlim_rcur(l, r)) ++#define __rlim_add(l, r, v) atomic_long_add(v, &__rlim_rcur(l, r)) ++#define __rlim_sub(l, r, v) atomic_long_sub(v, &__rlim_rcur(l, r)) + -+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 *); ++#if (RLIM_INFINITY == VLIM_INFINITY) ++#define VX_VLIM(r) ((long long)(long)(r)) ++#define VX_RLIM(v) ((rlim_t)(v)) ++#else ++#define VX_VLIM(r) (((r) == RLIM_INFINITY) \ ++ ? VLIM_INFINITY : (long long)(r)) ++#define VX_RLIM(v) (((v) == VLIM_INFINITY) \ ++ ? RLIM_INFINITY : (rlim_t)(v)) ++#endif + -+#endif /* __KERNEL__ */ ++struct sysinfo; + ++void vx_vsi_meminfo(struct sysinfo *); ++void vx_vsi_swapinfo(struct sysinfo *); ++long vx_vsi_cached(struct sysinfo *); + -+/* flag commands */ ++#define NUM_LIMITS 24 + -+#define VCMD_get_nflags VC_CMD(FLAGS, 5, 0) -+#define VCMD_set_nflags VC_CMD(FLAGS, 6, 0) ++#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 + -+struct vcmd_net_flags_v0 { -+ uint64_t flagword; -+ uint64_t mask; -+}; ++#include + -+#ifdef __KERNEL__ -+extern int vc_get_nflags(struct nx_info *, void __user *); -+extern int vc_set_nflags(struct nx_info *, void __user *); + -+#endif /* __KERNEL__ */ ++#ifdef CONFIG_IA32_EMULATION + ++struct vcmd_ctx_rlimit_v0_x32 { ++ uint32_t id; ++ uint64_t minimum; ++ uint64_t softlimit; ++ uint64_t maximum; ++} __attribute__ ((packed)); + -+/* network caps commands */ ++#endif /* CONFIG_IA32_EMULATION */ + -+#define VCMD_get_ncaps VC_CMD(FLAGS, 7, 0) -+#define VCMD_set_ncaps VC_CMD(FLAGS, 8, 0) ++#include + -+struct vcmd_net_caps_v0 { -+ uint64_t ncaps; -+ uint64_t cmask; -+}; ++extern int vc_get_rlimit_mask(uint32_t, void __user *); ++extern int vc_get_rlimit(struct vx_info *, void __user *); ++extern int vc_set_rlimit(struct vx_info *, void __user *); ++extern int vc_reset_hits(struct vx_info *, void __user *); ++extern int vc_reset_minmax(struct vx_info *, void __user *); + -+#ifdef __KERNEL__ -+extern int vc_get_ncaps(struct nx_info *, void __user *); -+extern int vc_set_ncaps(struct nx_info *, void __user *); ++extern int vc_rlimit_stat(struct vx_info *, void __user *); + -+#endif /* __KERNEL__ */ -+#endif /* _VX_CONTEXT_CMD_H */ -diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/network.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/network.h ---- linux-2.6.36.2/include/linux/vserver/network.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/network.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,146 @@ -+#ifndef _VX_NETWORK_H -+#define _VX_NETWORK_H ++#ifdef CONFIG_IA32_EMULATION + -+#include ++extern int vc_get_rlimit_x32(struct vx_info *, void __user *); ++extern int vc_set_rlimit_x32(struct vx_info *, void __user *); + ++#endif /* CONFIG_IA32_EMULATION */ + -+#define MAX_N_CONTEXT 65535 /* Arbitrary limit */ ++#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 _VSERVER_LIMIT_DEF_H ++#define _VSERVER_LIMIT_DEF_H + ++#include ++#include + -+/* network flags */ ++#include "limit.h" + -+#define NXF_INFO_PRIVATE 0x00000008 + -+#define NXF_SINGLE_IP 0x00000100 -+#define NXF_LBACK_REMAP 0x00000200 -+#define NXF_LBACK_ALLOW 0x00000400 ++struct _vx_res_limit { ++ rlim_t soft; /* Context soft limit */ ++ rlim_t hard; /* Context hard limit */ + -+#define NXF_HIDE_NETIF 0x02000000 -+#define NXF_HIDE_LBACK 0x04000000 ++ rlim_atomic_t rcur; /* Current value */ ++ rlim_t rmin; /* Context minimum */ ++ rlim_t rmax; /* Context maximum */ + -+#define NXF_STATE_SETUP (1ULL << 32) -+#define NXF_STATE_ADMIN (1ULL << 34) ++ atomic_t lhit; /* Limit hits */ ++}; + -+#define NXF_SC_HELPER (1ULL << 36) -+#define NXF_PERSISTENT (1ULL << 38) ++/* context sub struct */ + -+#define NXF_ONE_TIME (0x0005ULL << 32) ++struct _vx_limit { ++ struct _vx_res_limit res[NUM_LIMITS]; ++}; + ++#ifdef CONFIG_VSERVER_DEBUG + -+#define NXF_INIT_SET (__nxf_init_set()) ++static inline void __dump_vx_limit(struct _vx_limit *limit) ++{ ++ int i; ++ ++ printk("\t_vx_limit:"); ++ for (i = 0; i < NUM_LIMITS; i++) { ++ printk("\t [%2d] = %8lu %8lu/%8lu, %8ld/%8ld, %8d\n", ++ i, (unsigned long)__rlim_get(limit, i), ++ (unsigned long)__rlim_rmin(limit, i), ++ (unsigned long)__rlim_rmax(limit, i), ++ (long)__rlim_soft(limit, i), ++ (long)__rlim_hard(limit, i), ++ atomic_read(&__rlim_lhit(limit, i))); ++ } ++} + -+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; ++ ++#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) ++ ++extern const char *vlimit_name[NUM_LIMITS]; ++ ++static inline void __vx_acc_cres(struct vx_info *vxi, ++ int res, int dir, void *_data, char *_file, int _line) ++{ ++ if (VXD_RCRES_COND(res)) ++ vxlprintk(1, "vx_acc_cres[%5d,%s,%2d]: %5ld%s (%p)", ++ (vxi ? vxi->vx_id : -1), vlimit_name[res], res, ++ (vxi ? (long)__rlim_get(&vxi->limit, res) : 0), ++ (dir > 0) ? "++" : "--", _data, _file, _line); ++ if (!vxi) ++ return; ++ ++ if (dir > 0) ++ __rlim_inc(&vxi->limit, res); ++ else ++ __rlim_dec(&vxi->limit, res); +} + ++static inline void __vx_add_cres(struct vx_info *vxi, ++ int res, int amount, void *_data, char *_file, int _line) ++{ ++ if (VXD_RCRES_COND(res)) ++ vxlprintk(1, "vx_add_cres[%5d,%s,%2d]: %5ld += %5d (%p)", ++ (vxi ? vxi->vx_id : -1), vlimit_name[res], res, ++ (vxi ? (long)__rlim_get(&vxi->limit, res) : 0), ++ amount, _data, _file, _line); ++ if (amount == 0) ++ return; ++ if (!vxi) ++ return; ++ __rlim_add(&vxi->limit, res, amount); ++} + -+/* network caps */ ++static inline ++int __vx_cres_adjust_max(struct _vx_limit *limit, int res, rlim_t value) ++{ ++ int cond = (value > __rlim_rmax(limit, res)); + -+#define NXC_TUN_CREATE 0x00000001 ++ if (cond) ++ __rlim_rmax(limit, res) = value; ++ return cond; ++} + -+#define NXC_RAW_ICMP 0x00000100 ++static inline ++int __vx_cres_adjust_min(struct _vx_limit *limit, int res, rlim_t value) ++{ ++ int cond = (value < __rlim_rmin(limit, res)); + ++ if (cond) ++ __rlim_rmin(limit, res) = value; ++ return cond; ++} + -+/* address types */ ++static inline ++void __vx_cres_fixup(struct _vx_limit *limit, int res, rlim_t value) ++{ ++ if (!__vx_cres_adjust_max(limit, res, value)) ++ __vx_cres_adjust_min(limit, res, value); ++} + -+#define NXA_TYPE_IPV4 0x0001 -+#define NXA_TYPE_IPV6 0x0002 + -+#define NXA_TYPE_NONE 0x0000 -+#define NXA_TYPE_ANY 0x00FF ++/* return values: ++ +1 ... no limit hit ++ -1 ... over soft limit ++ 0 ... over hard limit */ + -+#define NXA_TYPE_ADDR 0x0010 -+#define NXA_TYPE_MASK 0x0020 -+#define NXA_TYPE_RANGE 0x0040 ++static inline int __vx_cres_avail(struct vx_info *vxi, ++ int res, int num, char *_file, int _line) ++{ ++ struct _vx_limit *limit; ++ rlim_t value; + -+#define NXA_MASK_ALL (NXA_TYPE_ADDR | NXA_TYPE_MASK | NXA_TYPE_RANGE) ++ if (VXD_RLIMIT_COND(res)) ++ vxlprintk(1, "vx_cres_avail[%5d,%s,%2d]: %5ld/%5ld > %5ld + %5d", ++ (vxi ? vxi->vx_id : -1), vlimit_name[res], res, ++ (vxi ? (long)__rlim_soft(&vxi->limit, res) : -1), ++ (vxi ? (long)__rlim_hard(&vxi->limit, res) : -1), ++ (vxi ? (long)__rlim_get(&vxi->limit, res) : 0), ++ num, _file, _line); ++ if (!vxi) ++ return 1; + -+#define NXA_MOD_BCAST 0x0100 -+#define NXA_MOD_LBACK 0x0200 ++ limit = &vxi->limit; ++ value = __rlim_get(limit, res); + -+#define NXA_LOOPBACK 0x1000 ++ if (!__vx_cres_adjust_max(limit, res, value)) ++ __vx_cres_adjust_min(limit, res, value); + -+#define NXA_MASK_BIND (NXA_MASK_ALL | NXA_MOD_BCAST | NXA_MOD_LBACK) -+#define NXA_MASK_SHOW (NXA_MASK_ALL | NXA_LOOPBACK) ++ if (num == 0) ++ return 1; ++ ++ if (__rlim_soft(limit, res) == RLIM_INFINITY) ++ return -1; ++ if (value + num <= __rlim_soft(limit, res)) ++ return -1; ++ ++ if (__rlim_hard(limit, res) == RLIM_INFINITY) ++ return 1; ++ if (value + num <= __rlim_hard(limit, res)) ++ return 1; ++ ++ __rlim_hit(limit, res); ++ return 0; ++} ++ ++ ++static const int VLA_RSS[] = { RLIMIT_RSS, VLIMIT_ANON, VLIMIT_MAPPED, 0 }; ++ ++static inline ++rlim_t __vx_cres_array_sum(struct _vx_limit *limit, const int *array) ++{ ++ rlim_t value, sum = 0; ++ int res; ++ ++ while ((res = *array++)) { ++ value = __rlim_get(limit, res); ++ __vx_cres_fixup(limit, res, value); ++ sum += value; ++ } ++ return sum; ++} ++ ++static inline ++rlim_t __vx_cres_array_fixup(struct _vx_limit *limit, const int *array) ++{ ++ rlim_t value = __vx_cres_array_sum(limit, array + 1); ++ int res = *array; ++ ++ if (value == __rlim_get(limit, res)) ++ return value; ++ ++ __rlim_set(limit, res, value); ++ /* now adjust min/max */ ++ if (!__vx_cres_adjust_max(limit, res, value)) ++ __vx_cres_adjust_min(limit, res, value); ++ ++ return value; ++} ++ ++static inline int __vx_cres_array_avail(struct vx_info *vxi, ++ const int *array, int num, char *_file, int _line) ++{ ++ struct _vx_limit *limit; ++ rlim_t value = 0; ++ int res; ++ ++ if (num == 0) ++ return 1; ++ if (!vxi) ++ return 1; ++ ++ limit = &vxi->limit; ++ res = *array; ++ value = __vx_cres_array_sum(limit, array + 1); ++ ++ __rlim_set(limit, res, value); ++ __vx_cres_fixup(limit, res, value); ++ ++ return __vx_cres_avail(vxi, res, num, _file, _line); ++} ++ ++ ++static inline void vx_limit_fixup(struct _vx_limit *limit, int id) ++{ ++ rlim_t value; ++ int res; ++ ++ /* complex resources first */ ++ if ((id < 0) || (id == RLIMIT_RSS)) ++ __vx_cres_array_fixup(limit, VLA_RSS); ++ ++ for (res = 0; res < NUM_LIMITS; res++) { ++ if ((id > 0) && (res != id)) ++ continue; ++ ++ value = __rlim_get(limit, res); ++ __vx_cres_fixup(limit, res, value); ++ ++ /* not supposed to happen, maybe warn? */ ++ if (__rlim_rmax(limit, res) > __rlim_hard(limit, res)) ++ __rlim_rmax(limit, res) = __rlim_hard(limit, res); ++ } ++} ++ ++ ++#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 ++ ++#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 + -+#ifdef __KERNEL__ + +#include +#include @@ -12536,6 +11101,7 @@ diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/network.h linux-2.6.3 +#include +#include +#include ++#include + +struct nx_addr_v4 { + struct nx_addr_v4 *next; @@ -12556,7 +11122,7 @@ diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/network.h linux-2.6.3 + +struct nx_info { + struct hlist_node nx_hlist; /* linked list of nxinfos */ -+ nid_t nx_id; /* vnet id */ ++ vnid_t nx_id; /* vnet id */ + atomic_t nx_usecnt; /* usage count */ + atomic_t nx_tasks; /* tasks count */ + int nx_state; /* context state */ @@ -12564,6 +11130,7 @@ diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/network.h linux-2.6.3 + uint64_t nx_flags; /* network flag word */ + uint64_t nx_ncaps; /* network capabilities */ + ++ 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 */ @@ -12583,7 +11150,7 @@ diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/network.h linux-2.6.3 +extern struct nx_info *lookup_nx_info(int); + +extern int get_nid_list(int, unsigned int *, int); -+extern int nid_is_hashed(nid_t); ++extern int nid_is_hashed(vnid_t); + +extern int nx_migrate_task(struct task_struct *, struct nx_info *); + @@ -12599,14 +11166,54 @@ diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/network.h linux-2.6.3 +#define NX_IPV6(n) (0) +#endif + -+#endif /* __KERNEL__ */ -+#endif /* _VX_NETWORK_H */ -diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/percpu.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/percpu.h ---- linux-2.6.36.2/include/linux/vserver/percpu.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/percpu.h 2010-10-21 13:09:36.000000000 +0200 ++#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 ++ ++#include ++ ++extern int vc_task_nid(uint32_t); ++ ++extern int vc_nx_info(struct nx_info *, void __user *); ++ ++extern int vc_net_create(uint32_t, void __user *); ++extern int vc_net_migrate(struct nx_info *, void __user *); ++ ++extern int vc_net_add(struct nx_info *, void __user *); ++extern int vc_net_remove(struct nx_info *, void __user *); ++ ++extern int vc_net_add_ipv4_v1(struct nx_info *, void __user *); ++extern int vc_net_add_ipv4(struct nx_info *, void __user *); ++ ++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 *); ++ ++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 *); ++ ++extern int vc_get_nflags(struct nx_info *, void __user *); ++extern int vc_set_nflags(struct nx_info *, void __user *); ++ ++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 _VX_PERCPU_H -+#define _VX_PERCPU_H ++#ifndef _VSERVER_PERCPU_H ++#define _VSERVER_PERCPU_H + +#include "cvirt_def.h" +#include "sched_def.h" @@ -12618,10 +11225,10 @@ diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/percpu.h linux-2.6.36 + +#define PERCPU_PERCTX (sizeof(struct _vx_percpu)) + -+#endif /* _VX_PERCPU_H */ -diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/pid.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/pid.h ---- linux-2.6.36.2/include/linux/vserver/pid.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/pid.h 2010-10-21 13:09:36.000000000 +0200 ++#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 @@ -12674,37 +11281,54 @@ diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/pid.h linux-2.6.36.2- +} + +#endif -diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/sched_cmd.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/sched_cmd.h ---- linux-2.6.36.2/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/sched_cmd.h 2010-10-28 19:02:11.000000000 +0200 -@@ -0,0 +1,21 @@ -+#ifndef _VX_SCHED_CMD_H -+#define _VX_SCHED_CMD_H +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 + + -+struct vcmd_prio_bias { -+ int32_t cpu_id; -+ int32_t prio_bias; -+}; ++#ifdef __KERNEL__ + -+#define VCMD_set_prio_bias VC_CMD(SCHED, 4, 0) -+#define VCMD_get_prio_bias VC_CMD(SCHED, 5, 0) ++struct timespec; + -+#ifdef __KERNEL__ ++void vx_vsi_uptime(struct timespec *, struct timespec *); + -+#include ++ ++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 /* _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 ++ ++ ++#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 */ -diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/sched_def.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/sched_def.h ---- linux-2.6.36.2/include/linux/vserver/sched_def.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/sched_def.h 2010-10-28 18:13:49.000000000 +0200 ++#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 _VX_SCHED_DEF_H -+#define _VX_SCHED_DEF_H ++#ifndef _VSERVER_SCHED_DEF_H ++#define _VSERVER_SCHED_DEF_H + +#include +#include @@ -12740,293 +11364,97 @@ diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/sched_def.h linux-2.6 + +#endif + -+#endif /* _VX_SCHED_DEF_H */ -diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/sched.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/sched.h ---- linux-2.6.36.2/include/linux/vserver/sched.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/sched.h 2010-10-28 18:16:35.000000000 +0200 -@@ -0,0 +1,23 @@ -+#ifndef _VX_SCHED_H -+#define _VX_SCHED_H ++#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 + + +#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); ++int vx_info_kill(struct vx_info *, int, int); + +#endif /* __KERNEL__ */ -+#else /* _VX_SCHED_H */ ++#else /* _VSERVER_SIGNAL_H */ +#warning duplicate inclusion -+#endif /* _VX_SCHED_H */ -diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/signal_cmd.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/signal_cmd.h ---- linux-2.6.36.2/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/signal_cmd.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,43 @@ -+#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; -+}; ++#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_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 */ -diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/signal.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/signal.h ---- linux-2.6.36.2/include/linux/vserver/signal.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/signal.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,14 @@ -+#ifndef _VX_SIGNAL_H -+#define _VX_SIGNAL_H -+ ++#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 + -+#ifdef __KERNEL__ ++#include + +struct vx_info; + -+int vx_info_kill(struct vx_info *, int, int); ++int vx_set_space(struct vx_info *vxi, unsigned long mask, unsigned index); + -+#endif /* __KERNEL__ */ -+#else /* _VX_SIGNAL_H */ ++#else /* _VSERVER_SPACE_H */ +#warning duplicate inclusion -+#endif /* _VX_SIGNAL_H */ -diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/space_cmd.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/space_cmd.h ---- linux-2.6.36.2/include/linux/vserver/space_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/space_cmd.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,38 @@ -+#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) ++#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_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; -+}; ++#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); + -+#endif /* __KERNEL__ */ -+#endif /* _VX_SPACE_CMD_H */ -diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/space.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/space.h ---- linux-2.6.36.2/include/linux/vserver/space.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/space.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,12 @@ -+#ifndef _VX_SPACE_H -+#define _VX_SPACE_H -+ -+#include -+ -+struct vx_info; -+ -+int vx_set_space(struct vx_info *vxi, unsigned long mask, unsigned index); -+ -+#else /* _VX_SPACE_H */ -+#warning duplicate inclusion -+#endif /* _VX_SPACE_H */ -diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/switch.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/switch.h ---- linux-2.6.36.2/include/linux/vserver/switch.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/switch.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,98 @@ -+#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) -+ ++#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__ + +#include ++#include + -+#endif /* __KERNEL__ */ -+ -+#endif /* _VX_SWITCH_H */ -+ -diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/tag_cmd.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/tag_cmd.h ---- linux-2.6.36.2/include/linux/vserver/tag_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/tag_cmd.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,22 @@ -+#ifndef _VX_TAG_CMD_H -+#define _VX_TAG_CMD_H -+ -+ -+/* vinfo commands */ -+ -+#define VCMD_task_tag VC_CMD(VINFO, 3, 0) -+ -+#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 */ -diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/tag.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/tag.h ---- linux-2.6.36.2/include/linux/vserver/tag.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vserver/tag.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,143 @@ ++#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 + +#include ++#include + + +#define DX_TAG(in) (IS_TAGGED(in)) @@ -13125,11 +11553,27 @@ diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/tag.h linux-2.6.36.2- +#define TAGINO_TAG(cond, tag) ((cond) ? (tag) : 0) +#endif + ++#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))) ++ ++ +#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))) ++ + +static inline uid_t dx_map_uid(uid_t uid) +{ @@ -13152,7 +11596,7 @@ diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/tag.h linux-2.6.36.2- + +#define dx_notagcheck(sb) ((sb) && ((sb)->s_flags & MS_NOTAGCHECK)) + -+int dx_parse_tag(char *string, tag_t *tag, int remove, int *mnt_flags, ++int dx_parse_tag(char *string, vtag_t *tag, int remove, int *mnt_flags, + unsigned long *flags); + +#ifdef CONFIG_PROPAGATE @@ -13166,1479 +11610,1418 @@ diff -NurpP --minimal linux-2.6.36.2/include/linux/vserver/tag.h linux-2.6.36.2- +#endif + +#endif /* _DX_TAG_H */ -diff -NurpP --minimal linux-2.6.36.2/include/linux/vs_inet6.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vs_inet6.h ---- linux-2.6.36.2/include/linux/vs_inet6.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vs_inet6.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,246 @@ -+#ifndef _VS_INET6_H -+#define _VS_INET6_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 + -+#include "vserver/base.h" -+#include "vserver/network.h" -+#include "vserver/debug.h" ++#include + -+#include ++extern int vc_task_tag(uint32_t); + -+#define NXAV6(a) &(a)->ip, &(a)->mask, (a)->prefix, (a)->type -+#define NXAV6_FMT "[%pI6/%pI6/%d:%04x]" ++extern int vc_tag_migrate(uint32_t); + ++#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 CONFIG_IPV6 + #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 *); + -+static inline -+int v6_addr_match(struct nx_addr_v6 *nxa, -+ const struct in6_addr *addr, uint16_t mask) -+{ -+ int ret = 0; + 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; + -+ switch (nxa->type & mask) { -+ case NXA_TYPE_MASK: -+ ret = ipv6_masked_addr_cmp(&nxa->ip, &nxa->mask, addr); -+ break; -+ case NXA_TYPE_ADDR: -+ ret = ipv6_addr_equal(&nxa->ip, addr); -+ break; -+ case NXA_TYPE_ANY: -+ ret = 1; -+ break; -+ } -+ vxdprintk(VXD_CBIT(net, 0), -+ "v6_addr_match(%p" NXAV6_FMT ",%pI6,%04x) = %d", -+ nxa, NXAV6(nxa), addr, mask, ret); -+ return ret; -+} ++ 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)); + -+static inline -+int v6_addr_in_nx_info(struct nx_info *nxi, -+ const struct in6_addr *addr, uint16_t mask) -+{ -+ struct nx_addr_v6 *nxa; -+ int ret = 1; ++ 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.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 */ + -+ if (!nxi) -+ goto out; -+ for (nxa = &nxi->v6; nxa; nxa = nxa->next) -+ if (v6_addr_match(nxa, addr, mask)) -+ goto out; -+ ret = 0; -+out: -+ vxdprintk(VXD_CBIT(net, 0), -+ "v6_addr_in_nx_info(%p[#%u],%pI6,%04x) = %d", -+ nxi, nxi ? nxi->nx_id : 0, addr, mask, ret); -+ return ret; -+} ++#define CAP_CONTEXT 63 + -+static inline -+int v6_nx_addr_match(struct nx_addr_v6 *nxa, struct nx_addr_v6 *addr, uint16_t mask) -+{ -+ /* FIXME: needs full range checks */ -+ return v6_addr_match(nxa, &addr->ip, mask); -+} ++#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 @@ + -+static inline -+int v6_nx_addr_in_nx_info(struct nx_info *nxi, struct nx_addr_v6 *nxa, uint16_t mask) -+{ -+ struct nx_addr_v6 *ptr; ++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 + -+ for (ptr = &nxi->v6; ptr; ptr = ptr->next) -+ if (v6_nx_addr_match(ptr, nxa, mask)) -+ return 1; -+ return 0; -+} ++header-y += switch.h context.h network.h monitor.h \ ++ limit.h inode.h device.h + +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 + -+/* -+ * Check if a given address matches for a socket -+ * -+ * nxi: the socket's nx_info if any -+ * addr: to be verified address -+ */ -+static inline -+int v6_sock_addr_match ( -+ struct nx_info *nxi, -+ struct inet_sock *inet, -+ struct in6_addr *addr) -+{ -+ struct sock *sk = &inet->sk; -+ struct in6_addr *saddr = inet6_rcv_saddr(sk); + -+ if (!ipv6_addr_any(addr) && -+ ipv6_addr_equal(saddr, addr)) -+ return 1; -+ if (ipv6_addr_any(saddr)) -+ return v6_addr_in_nx_info(nxi, addr, -1); -+ return 0; -+} ++/* virtual host info name commands */ + -+/* -+ * check if address is covered by socket -+ * -+ * sk: the socket to check against -+ * addr: the address in question (must be != 0) -+ */ ++#define VCMD_sock_stat VC_CMD(VSTAT, 5, 0) + -+static inline -+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); ++struct vcmd_sock_stat_v0 { ++ uint32_t field; ++ uint32_t count[3]; ++ uint64_t total[3]; ++}; + -+ vxdprintk(VXD_CBIT(net, 5), -+ "__v6_addr_in_socket(%p," NXAV6_FMT ") %p:%pI6 %p;%lx", -+ sk, NXAV6(nxa), nxi, saddr, sk->sk_socket, -+ (sk->sk_socket?sk->sk_socket->flags:0)); ++#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 + -+ if (!ipv6_addr_any(saddr)) { /* direct address match */ -+ return v6_addr_match(nxa, saddr, -1); -+ } else if (nxi) { /* match against nx_info */ -+ return v6_nx_addr_in_nx_info(nxi, nxa, -1); -+ } else { /* unrestricted any socket */ -+ return 1; -+ } -+} ++#include ++#include + + -+/* inet related checks and helpers */ ++/* context flags */ + ++#define VXF_INFO_SCHED 0x00000002 ++#define VXF_INFO_NPROC 0x00000004 ++#define VXF_INFO_PRIVATE 0x00000008 + -+struct in_ifaddr; -+struct net_device; -+struct sock; ++#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 + -+#include -+#include -+#include ++#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 + -+int dev_in_nx_info(struct net_device *, struct nx_info *); -+int v6_dev_in_nx_info(struct net_device *, struct nx_info *); -+int nx_v6_addr_conflict(struct nx_info *, struct nx_info *); ++#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) + -+static inline -+int v6_ifa_in_nx_info(struct inet6_ifaddr *ifa, struct nx_info *nxi) -+{ -+ if (!nxi) -+ return 1; -+ if (!ifa) -+ return 0; -+ return v6_addr_in_nx_info(nxi, &ifa->addr, -1); -+} -+ -+static inline -+int nx_v6_ifa_visible(struct nx_info *nxi, struct inet6_ifaddr *ifa) -+{ -+ vxdprintk(VXD_CBIT(net, 1), "nx_v6_ifa_visible(%p[#%u],%p) %d", -+ nxi, nxi ? nxi->nx_id : 0, ifa, -+ nxi ? v6_ifa_in_nx_info(ifa, nxi) : 0); ++#define VXF_IGNEG_NICE (1ULL << 52) + -+ if (!nx_info_flags(nxi, NXF_HIDE_NETIF, 0)) -+ return 1; -+ if (v6_ifa_in_nx_info(ifa, nxi)) -+ return 1; -+ return 0; -+} ++#define VXF_ONE_TIME (0x0007ULL << 32) + ++#define VXF_INIT_SET (VXF_STATE_SETUP | VXF_STATE_INIT | VXF_STATE_ADMIN) + -+struct nx_v6_sock_addr { -+ struct in6_addr saddr; /* Address used for validation */ -+ struct in6_addr baddr; /* Address used for socket bind */ -+}; + -+static inline -+int v6_map_sock_addr(struct inet_sock *inet, struct sockaddr_in6 *addr, -+ struct nx_v6_sock_addr *nsa) -+{ -+ // struct sock *sk = &inet->sk; -+ // struct nx_info *nxi = sk->sk_nx_info; -+ struct in6_addr saddr = addr->sin6_addr; -+ struct in6_addr baddr = saddr; ++/* context migration */ + -+ nsa->saddr = saddr; -+ nsa->baddr = baddr; -+ return 0; -+} ++#define VXM_SET_INIT 0x00000001 ++#define VXM_SET_REAPER 0x00000002 + -+static inline -+void v6_set_sock_addr(struct inet_sock *inet, struct nx_v6_sock_addr *nsa) -+{ -+ // struct sock *sk = &inet->sk; -+ // struct in6_addr *saddr = inet6_rcv_saddr(sk); ++/* context caps */ + -+ // *saddr = nsa->baddr; -+ // inet->inet_saddr = nsa->baddr; -+} ++#define VXC_SET_UTSNAME 0x00000001 ++#define VXC_SET_RLIMIT 0x00000002 ++#define VXC_FS_SECURITY 0x00000004 ++#define VXC_FS_TRUSTED 0x00000008 ++#define VXC_TIOCSTI 0x00000010 + -+static inline -+int nx_info_has_v6(struct nx_info *nxi) -+{ -+ if (!nxi) -+ return 1; -+ if (NX_IPV6(nxi)) -+ return 1; -+ return 0; -+} ++/* was VXC_RAW_ICMP 0x00000100 */ ++#define VXC_SYSLOG 0x00001000 ++#define VXC_OOM_ADJUST 0x00002000 ++#define VXC_AUDIT_CONTROL 0x00004000 + -+#else /* CONFIG_IPV6 */ ++#define VXC_SECURE_MOUNT 0x00010000 ++/* #define VXC_SECURE_REMOUNT 0x00020000 */ ++#define VXC_BINARY_MOUNT 0x00040000 ++#define VXC_DEV_MOUNT 0x00080000 + -+static inline -+int nx_v6_dev_visible(struct nx_info *n, struct net_device *d) -+{ -+ return 1; -+} ++#define VXC_QUOTA_CTL 0x00100000 ++#define VXC_ADMIN_MAPPER 0x00200000 ++#define VXC_ADMIN_CLOOP 0x00400000 + ++#define VXC_KTHREAD 0x01000000 ++#define VXC_NAMESPACE 0x02000000 + -+static inline -+int nx_v6_addr_conflict(struct nx_info *n, uint32_t a, const struct sock *s) -+{ -+ return 1; -+} ++#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 + -+static inline -+int v6_ifa_in_nx_info(struct in_ifaddr *a, struct nx_info *n) -+{ -+ return 1; -+} + -+static inline -+int nx_info_has_v6(struct nx_info *nxi) -+{ -+ return 0; -+} ++/* vinfo commands */ + -+#endif /* CONFIG_IPV6 */ ++#define VCMD_task_xid VC_CMD(VINFO, 1, 0) + -+#define current_nx_info_has_v6() \ -+ nx_info_has_v6(current_nx_info()) + -+#else -+#warning duplicate inclusion -+#endif -diff -NurpP --minimal linux-2.6.36.2/include/linux/vs_inet.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vs_inet.h ---- linux-2.6.36.2/include/linux/vs_inet.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vs_inet.h 2010-10-21 17:41:35.000000000 +0200 -@@ -0,0 +1,351 @@ -+#ifndef _VS_INET_H -+#define _VS_INET_H ++#define VCMD_vx_info VC_CMD(VINFO, 5, 0) + -+#include "vserver/base.h" -+#include "vserver/network.h" -+#include "vserver/debug.h" ++struct vcmd_vx_info_v0 { ++ uint32_t xid; ++ uint32_t initpid; ++ /* more to come */ ++}; + -+#define IPI_LOOPBACK htonl(INADDR_LOOPBACK) + -+#define NXAV4(a) NIPQUAD((a)->ip[0]), NIPQUAD((a)->ip[1]), \ -+ NIPQUAD((a)->mask), (a)->type -+#define NXAV4_FMT "[" NIPQUAD_FMT "-" NIPQUAD_FMT "/" NIPQUAD_FMT ":%04x]" ++#define VCMD_ctx_stat VC_CMD(VSTAT, 0, 0) + -+#define NIPQUAD(addr) \ -+ ((unsigned char *)&addr)[0], \ -+ ((unsigned char *)&addr)[1], \ -+ ((unsigned char *)&addr)[2], \ -+ ((unsigned char *)&addr)[3] ++struct vcmd_ctx_stat_v0 { ++ uint32_t usecnt; ++ uint32_t tasks; ++ /* more to come */ ++}; + -+#define NIPQUAD_FMT "%u.%u.%u.%u" + ++/* context commands */ + -+static inline -+int v4_addr_match(struct nx_addr_v4 *nxa, __be32 addr, uint16_t tmask) -+{ -+ __be32 ip = nxa->ip[0].s_addr; -+ __be32 mask = nxa->mask.s_addr; -+ __be32 bcast = ip | ~mask; -+ int ret = 0; ++#define VCMD_ctx_create_v0 VC_CMD(VPROC, 1, 0) ++#define VCMD_ctx_create VC_CMD(VPROC, 1, 1) + -+ switch (nxa->type & tmask) { -+ case NXA_TYPE_MASK: -+ ret = (ip == (addr & mask)); -+ break; -+ case NXA_TYPE_ADDR: -+ ret = 3; -+ if (addr == ip) -+ break; -+ /* fall through to broadcast */ -+ case NXA_MOD_BCAST: -+ ret = ((tmask & NXA_MOD_BCAST) && (addr == bcast)); -+ break; -+ case NXA_TYPE_RANGE: -+ ret = ((nxa->ip[0].s_addr <= addr) && -+ (nxa->ip[1].s_addr > addr)); -+ break; -+ case NXA_TYPE_ANY: -+ ret = 2; -+ break; -+ } ++struct vcmd_ctx_create { ++ uint64_t flagword; ++}; + -+ vxdprintk(VXD_CBIT(net, 0), -+ "v4_addr_match(%p" NXAV4_FMT "," NIPQUAD_FMT ",%04x) = %d", -+ nxa, NXAV4(nxa), NIPQUAD(addr), tmask, ret); -+ return ret; -+} ++#define VCMD_ctx_migrate_v0 VC_CMD(PROCMIG, 1, 0) ++#define VCMD_ctx_migrate VC_CMD(PROCMIG, 1, 1) + -+static inline -+int v4_addr_in_nx_info(struct nx_info *nxi, __be32 addr, uint16_t tmask) -+{ -+ struct nx_addr_v4 *nxa; -+ int ret = 1; ++struct vcmd_ctx_migrate { ++ uint64_t flagword; ++}; + -+ if (!nxi) -+ goto out; + -+ ret = 2; -+ /* allow 127.0.0.1 when remapping lback */ -+ if ((tmask & NXA_LOOPBACK) && -+ (addr == IPI_LOOPBACK) && -+ nx_info_flags(nxi, NXF_LBACK_REMAP, 0)) -+ goto out; -+ ret = 3; -+ /* check for lback address */ -+ if ((tmask & NXA_MOD_LBACK) && -+ (nxi->v4_lback.s_addr == addr)) -+ goto out; -+ ret = 4; -+ /* check for broadcast address */ -+ if ((tmask & NXA_MOD_BCAST) && -+ (nxi->v4_bcast.s_addr == addr)) -+ goto out; -+ ret = 5; -+ /* check for v4 addresses */ -+ for (nxa = &nxi->v4; nxa; nxa = nxa->next) -+ if (v4_addr_match(nxa, addr, tmask)) -+ goto out; -+ ret = 0; -+out: -+ vxdprintk(VXD_CBIT(net, 0), -+ "v4_addr_in_nx_info(%p[#%u]," NIPQUAD_FMT ",%04x) = %d", -+ nxi, nxi ? nxi->nx_id : 0, NIPQUAD(addr), tmask, ret); -+ return ret; -+} + -+static inline -+int v4_nx_addr_match(struct nx_addr_v4 *nxa, struct nx_addr_v4 *addr, uint16_t mask) -+{ -+ /* FIXME: needs full range checks */ -+ return v4_addr_match(nxa, addr->ip[0].s_addr, mask); -+} ++/* flag commands */ + -+static inline -+int v4_nx_addr_in_nx_info(struct nx_info *nxi, struct nx_addr_v4 *nxa, uint16_t mask) -+{ -+ struct nx_addr_v4 *ptr; ++#define VCMD_get_cflags VC_CMD(FLAGS, 1, 0) ++#define VCMD_set_cflags VC_CMD(FLAGS, 2, 0) + -+ for (ptr = &nxi->v4; ptr; ptr = ptr->next) -+ if (v4_nx_addr_match(ptr, nxa, mask)) -+ return 1; -+ return 0; -+} ++struct vcmd_ctx_flags_v0 { ++ uint64_t flagword; ++ uint64_t mask; ++}; + -+#include + -+/* -+ * Check if a given address matches for a socket -+ * -+ * nxi: the socket's nx_info if any -+ * addr: to be verified address -+ */ -+static inline -+int v4_sock_addr_match ( -+ struct nx_info *nxi, -+ struct inet_sock *inet, -+ __be32 addr) -+{ -+ __be32 saddr = inet->inet_rcv_saddr; -+ __be32 bcast = nxi ? nxi->v4_bcast.s_addr : INADDR_BROADCAST; + -+ if (addr && (saddr == addr || bcast == addr)) -+ return 1; -+ if (!saddr) -+ return v4_addr_in_nx_info(nxi, addr, NXA_MASK_BIND); -+ return 0; -+} ++/* context caps commands */ + ++#define VCMD_get_ccaps VC_CMD(FLAGS, 3, 1) ++#define VCMD_set_ccaps VC_CMD(FLAGS, 4, 1) + -+/* inet related checks and helpers */ -+ ++struct vcmd_ctx_caps_v1 { ++ uint64_t ccaps; ++ uint64_t cmask; ++}; + -+struct in_ifaddr; -+struct net_device; -+struct sock; + -+#ifdef CONFIG_INET + -+#include -+#include -+#include -+#include ++/* bcaps commands */ + ++#define VCMD_get_bcaps VC_CMD(FLAGS, 9, 0) ++#define VCMD_set_bcaps VC_CMD(FLAGS, 10, 0) + -+int dev_in_nx_info(struct net_device *, struct nx_info *); -+int v4_dev_in_nx_info(struct net_device *, struct nx_info *); -+int nx_v4_addr_conflict(struct nx_info *, struct nx_info *); ++struct vcmd_bcaps { ++ uint64_t bcaps; ++ uint64_t bmask; ++}; + + -+/* -+ * check if address is covered by socket -+ * -+ * sk: the socket to check against -+ * addr: the address in question (must be != 0) -+ */ + -+static inline -+int __v4_addr_match_socket(const struct sock *sk, struct nx_addr_v4 *nxa) -+{ -+ struct nx_info *nxi = sk->sk_nx_info; -+ __be32 saddr = inet_rcv_saddr(sk); ++/* umask commands */ + -+ vxdprintk(VXD_CBIT(net, 5), -+ "__v4_addr_in_socket(%p," NXAV4_FMT ") %p:" NIPQUAD_FMT " %p;%lx", -+ sk, NXAV4(nxa), nxi, NIPQUAD(saddr), sk->sk_socket, -+ (sk->sk_socket?sk->sk_socket->flags:0)); ++#define VCMD_get_umask VC_CMD(FLAGS, 13, 0) ++#define VCMD_set_umask VC_CMD(FLAGS, 14, 0) + -+ if (saddr) { /* direct address match */ -+ return v4_addr_match(nxa, saddr, -1); -+ } else if (nxi) { /* match against nx_info */ -+ return v4_nx_addr_in_nx_info(nxi, nxa, -1); -+ } else { /* unrestricted any socket */ -+ return 1; -+ } -+} ++struct vcmd_umask { ++ uint64_t umask; ++ uint64_t mask; ++}; + + + -+static inline -+int nx_dev_visible(struct nx_info *nxi, struct net_device *dev) -+{ -+ vxdprintk(VXD_CBIT(net, 1), -+ "nx_dev_visible(%p[#%u],%p " VS_Q("%s") ") %d", -+ nxi, nxi ? nxi->nx_id : 0, dev, dev->name, -+ nxi ? dev_in_nx_info(dev, nxi) : 0); ++/* wmask commands */ + -+ if (!nx_info_flags(nxi, NXF_HIDE_NETIF, 0)) -+ return 1; -+ if (dev_in_nx_info(dev, nxi)) -+ return 1; -+ return 0; -+} ++#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; ++}; + -+static inline -+int v4_ifa_in_nx_info(struct in_ifaddr *ifa, struct nx_info *nxi) -+{ -+ if (!nxi) -+ return 1; -+ if (!ifa) -+ return 0; -+ return v4_addr_in_nx_info(nxi, ifa->ifa_local, NXA_MASK_SHOW); -+} + -+static inline -+int nx_v4_ifa_visible(struct nx_info *nxi, struct in_ifaddr *ifa) -+{ -+ vxdprintk(VXD_CBIT(net, 1), "nx_v4_ifa_visible(%p[#%u],%p) %d", -+ nxi, nxi ? nxi->nx_id : 0, ifa, -+ nxi ? v4_ifa_in_nx_info(ifa, nxi) : 0); + -+ if (!nx_info_flags(nxi, NXF_HIDE_NETIF, 0)) -+ return 1; -+ if (v4_ifa_in_nx_info(ifa, nxi)) -+ return 1; -+ return 0; -+} ++/* OOM badness */ + ++#define VCMD_get_badness VC_CMD(MEMCTRL, 5, 0) ++#define VCMD_set_badness VC_CMD(MEMCTRL, 6, 0) + -+struct nx_v4_sock_addr { -+ __be32 saddr; /* Address used for validation */ -+ __be32 baddr; /* Address used for socket bind */ ++struct vcmd_badness_v0 { ++ int64_t bias; +}; + -+static inline -+int v4_map_sock_addr(struct inet_sock *inet, struct sockaddr_in *addr, -+ struct nx_v4_sock_addr *nsa) -+{ -+ struct sock *sk = &inet->sk; -+ struct nx_info *nxi = sk->sk_nx_info; -+ __be32 saddr = addr->sin_addr.s_addr; -+ __be32 baddr = saddr; ++#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 + -+ vxdprintk(VXD_CBIT(net, 3), -+ "inet_bind(%p)* %p,%p;%lx " NIPQUAD_FMT, -+ sk, sk->sk_nx_info, sk->sk_socket, -+ (sk->sk_socket ? sk->sk_socket->flags : 0), -+ NIPQUAD(saddr)); + -+ if (nxi) { -+ if (saddr == INADDR_ANY) { -+ if (nx_info_flags(nxi, NXF_SINGLE_IP, 0)) -+ baddr = nxi->v4.ip[0].s_addr; -+ } else if (saddr == IPI_LOOPBACK) { -+ if (nx_info_flags(nxi, NXF_LBACK_REMAP, 0)) -+ baddr = nxi->v4_lback.s_addr; -+ } else { /* normal address bind */ -+ if (!v4_addr_in_nx_info(nxi, saddr, NXA_MASK_BIND)) -+ return -EADDRNOTAVAIL; -+ } -+ } ++/* virtual host info name commands */ + -+ vxdprintk(VXD_CBIT(net, 3), -+ "inet_bind(%p) " NIPQUAD_FMT ", " NIPQUAD_FMT, -+ sk, NIPQUAD(saddr), NIPQUAD(baddr)); ++#define VCMD_set_vhi_name VC_CMD(VHOST, 1, 0) ++#define VCMD_get_vhi_name VC_CMD(VHOST, 2, 0) + -+ nsa->saddr = saddr; -+ nsa->baddr = baddr; -+ return 0; -+} ++struct vcmd_vhi_name_v0 { ++ uint32_t field; ++ char name[65]; ++}; + -+static inline -+void v4_set_sock_addr(struct inet_sock *inet, struct nx_v4_sock_addr *nsa) -+{ -+ inet->inet_saddr = nsa->baddr; -+ inet->inet_rcv_saddr = nsa->baddr; -+} + ++enum vhi_name_field { ++ VHIN_CONTEXT = 0, ++ VHIN_SYSNAME, ++ VHIN_NODENAME, ++ VHIN_RELEASE, ++ VHIN_VERSION, ++ VHIN_MACHINE, ++ VHIN_DOMAINNAME, ++}; + -+/* -+ * helper to simplify inet_lookup_listener -+ * -+ * nxi: the socket's nx_info if any -+ * addr: to be verified address -+ * saddr: socket address -+ */ -+static inline int v4_inet_addr_match ( -+ struct nx_info *nxi, -+ __be32 addr, -+ __be32 saddr) -+{ -+ if (addr && (saddr == addr)) -+ return 1; -+ if (!saddr) -+ return nxi ? v4_addr_in_nx_info(nxi, addr, NXA_MASK_BIND) : 1; -+ return 0; -+} + -+static inline __be32 nx_map_sock_lback(struct nx_info *nxi, __be32 addr) -+{ -+ if (nx_info_flags(nxi, NXF_HIDE_LBACK, 0) && -+ (addr == nxi->v4_lback.s_addr)) -+ return IPI_LOOPBACK; -+ return addr; -+} + -+static inline -+int nx_info_has_v4(struct nx_info *nxi) -+{ -+ if (!nxi) -+ return 1; -+ if (NX_IPV4(nxi)) -+ return 1; -+ if (nx_info_flags(nxi, NXF_LBACK_REMAP, 0)) -+ return 1; -+ return 0; -+} ++#define VCMD_virt_stat VC_CMD(VSTAT, 3, 0) + -+#else /* CONFIG_INET */ ++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]; ++}; + -+static inline -+int nx_dev_visible(struct nx_info *n, struct net_device *d) -+{ -+ return 1; -+} ++#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 + -+static inline -+int nx_v4_addr_conflict(struct nx_info *n, uint32_t a, const struct sock *s) -+{ -+ return 1; -+} + -+static inline -+int v4_ifa_in_nx_info(struct in_ifaddr *a, struct nx_info *n) -+{ -+ return 1; -+} ++/* debug commands */ + -+static inline -+int nx_info_has_v4(struct nx_info *nxi) -+{ -+ return 0; -+} ++#define VCMD_dump_history VC_CMD(DEBUG, 1, 0) + -+#endif /* CONFIG_INET */ ++#define VCMD_read_history VC_CMD(DEBUG, 5, 0) ++#define VCMD_read_monitor VC_CMD(DEBUG, 6, 0) + -+#define current_nx_info_has_v4() \ -+ nx_info_has_v4(current_nx_info()) ++struct vcmd_read_history_v0 { ++ uint32_t index; ++ uint32_t count; ++ char __user *data; ++}; + -+#else -+// #warning duplicate inclusion -+#endif -diff -NurpP --minimal linux-2.6.36.2/include/linux/vs_limit.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vs_limit.h ---- linux-2.6.36.2/include/linux/vs_limit.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vs_limit.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,140 @@ -+#ifndef _VS_LIMIT_H -+#define _VS_LIMIT_H ++struct vcmd_read_monitor_v0 { ++ uint32_t index; ++ uint32_t count; ++ char __user *data; ++}; + -+#include "vserver/limit.h" -+#include "vserver/base.h" -+#include "vserver/context.h" -+#include "vserver/debug.h" -+#include "vserver/context.h" -+#include "vserver/limit_int.h" ++#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 + + -+#define vx_acc_cres(v, d, p, r) \ -+ __vx_acc_cres(v, r, d, p, __FILE__, __LINE__) ++#define DATTR_CREATE 0x00000001 ++#define DATTR_OPEN 0x00000002 + -+#define vx_acc_cres_cond(x, d, p, r) \ -+ __vx_acc_cres(((x) == vx_current_xid()) ? current_vx_info() : 0, \ -+ r, d, p, __FILE__, __LINE__) ++#define DATTR_REMAP 0x00000010 + ++#define DATTR_MASK 0x00000013 + -+#define vx_add_cres(v, a, p, r) \ -+ __vx_add_cres(v, r, a, p, __FILE__, __LINE__) -+#define vx_sub_cres(v, a, p, r) vx_add_cres(v, -(a), p, r) -+ -+#define vx_add_cres_cond(x, a, p, r) \ -+ __vx_add_cres(((x) == vx_current_xid()) ? current_vx_info() : 0, \ -+ r, a, p, __FILE__, __LINE__) -+#define vx_sub_cres_cond(x, a, p, r) vx_add_cres_cond(x, -(a), p, r) ++#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 + + -+/* process and file limits */ -+ -+#define vx_nproc_inc(p) \ -+ vx_acc_cres((p)->vx_info, 1, p, RLIMIT_NPROC) -+ -+#define vx_nproc_dec(p) \ -+ vx_acc_cres((p)->vx_info,-1, p, RLIMIT_NPROC) ++/* device vserver commands */ + -+#define vx_files_inc(f) \ -+ vx_acc_cres_cond((f)->f_xid, 1, f, RLIMIT_NOFILE) ++#define VCMD_set_mapping VC_CMD(DEVICE, 1, 0) ++#define VCMD_unset_mapping VC_CMD(DEVICE, 2, 0) + -+#define vx_files_dec(f) \ -+ vx_acc_cres_cond((f)->f_xid,-1, f, RLIMIT_NOFILE) ++struct vcmd_set_mapping_v0 { ++ const char __user *device; ++ const char __user *target; ++ uint32_t flags; ++}; + -+#define vx_locks_inc(l) \ -+ vx_acc_cres_cond((l)->fl_xid, 1, l, RLIMIT_LOCKS) ++#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 + -+#define vx_locks_dec(l) \ -+ vx_acc_cres_cond((l)->fl_xid,-1, l, RLIMIT_LOCKS) + -+#define vx_openfd_inc(f) \ -+ vx_acc_cres(current_vx_info(), 1, (void *)(long)(f), VLIMIT_OPENFD) ++/* dlimit vserver commands */ + -+#define vx_openfd_dec(f) \ -+ vx_acc_cres(current_vx_info(),-1, (void *)(long)(f), VLIMIT_OPENFD) ++#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) + -+#define vx_cres_avail(v, n, r) \ -+ __vx_cres_avail(v, r, n, __FILE__, __LINE__) ++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 vx_nproc_avail(n) \ -+ vx_cres_avail(current_vx_info(), n, RLIMIT_NPROC) ++#define CDLIM_UNSET ((uint32_t)0UL) ++#define CDLIM_INFINITY ((uint32_t)~0UL) ++#define CDLIM_KEEP ((uint32_t)~1UL) + -+#define vx_files_avail(n) \ -+ vx_cres_avail(current_vx_info(), n, RLIMIT_NOFILE) ++#define DLIME_UNIT 0 ++#define DLIME_KILO 1 ++#define DLIME_MEGA 2 ++#define DLIME_GIGA 3 + -+#define vx_locks_avail(n) \ -+ vx_cres_avail(current_vx_info(), n, RLIMIT_LOCKS) ++#define DLIMF_SHIFT 0x10 + -+#define vx_openfd_avail(n) \ -+ vx_cres_avail(current_vx_info(), n, VLIMIT_OPENFD) ++#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); ++} + -+/* dentry limits */ ++static inline ++uint32_t dlimit_space_64to32(uint64_t val, uint32_t *flags, int shift) ++{ ++ int exp = 0; + -+#define vx_dentry_inc(d) do { \ -+ if (atomic_read(&d->d_count) == 1) \ -+ vx_acc_cres(current_vx_info(), 1, d, VLIMIT_DENTRY); \ -+ } while (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; ++} + -+#define vx_dentry_dec(d) do { \ -+ if (atomic_read(&d->d_count) == 0) \ -+ vx_acc_cres(current_vx_info(),-1, d, VLIMIT_DENTRY); \ -+ } while (0) ++#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 + -+#define vx_dentry_avail(n) \ -+ vx_cres_avail(current_vx_info(), n, VLIMIT_DENTRY) + ++#define IATTR_TAG 0x01000000 + -+/* socket limits */ ++#define IATTR_ADMIN 0x00000001 ++#define IATTR_WATCH 0x00000002 ++#define IATTR_HIDE 0x00000004 ++#define IATTR_FLAGS 0x00000007 + -+#define vx_sock_inc(s) \ -+ vx_acc_cres((s)->sk_vx_info, 1, s, VLIMIT_NSOCK) ++#define IATTR_BARRIER 0x00010000 ++#define IATTR_IXUNLINK 0x00020000 ++#define IATTR_IMMUTABLE 0x00040000 ++#define IATTR_COW 0x00080000 + -+#define vx_sock_dec(s) \ -+ vx_acc_cres((s)->sk_vx_info,-1, s, VLIMIT_NSOCK) + -+#define vx_sock_avail(n) \ -+ vx_cres_avail(current_vx_info(), n, VLIMIT_NSOCK) ++/* inode ioctls */ + ++#define FIOC_GETXFLG _IOR('x', 5, long) ++#define FIOC_SETXFLG _IOW('x', 6, long) + -+/* ipc resource limits */ ++#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 + -+#define vx_ipcmsg_add(v, u, a) \ -+ vx_add_cres(v, a, u, RLIMIT_MSGQUEUE) + -+#define vx_ipcmsg_sub(v, u, a) \ -+ vx_sub_cres(v, a, u, RLIMIT_MSGQUEUE) ++/* inode vserver commands */ + -+#define vx_ipcmsg_avail(v, a) \ -+ vx_cres_avail(v, a, RLIMIT_MSGQUEUE) ++#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) + -+#define vx_ipcshm_add(v, k, a) \ -+ vx_add_cres(v, a, (void *)(long)(k), VLIMIT_SHMEM) ++struct vcmd_ctx_iattr_v1 { ++ const char __user *name; ++ uint32_t tag; ++ uint32_t flags; ++ uint32_t mask; ++}; + -+#define vx_ipcshm_sub(v, k, a) \ -+ vx_sub_cres(v, a, (void *)(long)(k), VLIMIT_SHMEM) ++struct vcmd_ctx_fiattr_v0 { ++ uint32_t tag; ++ uint32_t flags; ++ uint32_t mask; ++}; + -+#define vx_ipcshm_avail(v, a) \ -+ vx_cres_avail(v, a, VLIMIT_SHMEM) ++#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 + + -+#define vx_semary_inc(a) \ -+ vx_acc_cres(current_vx_info(), 1, a, VLIMIT_SEMARY) ++#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 + -+#define vx_semary_dec(a) \ -+ vx_acc_cres(current_vx_info(), -1, a, VLIMIT_SEMARY) ++#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 + + -+#define vx_nsems_add(a,n) \ -+ vx_add_cres(current_vx_info(), n, a, VLIMIT_NSEMS) ++/* rlimit vserver commands */ + -+#define vx_nsems_sub(a,n) \ -+ vx_sub_cres(current_vx_info(), n, a, VLIMIT_NSEMS) ++#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; ++}; + -+#else -+#warning duplicate inclusion -+#endif -diff -NurpP --minimal linux-2.6.36.2/include/linux/vs_memory.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vs_memory.h ---- linux-2.6.36.2/include/linux/vs_memory.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vs_memory.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,58 @@ -+#ifndef _VS_MEMORY_H -+#define _VS_MEMORY_H ++struct vcmd_ctx_rlimit_mask_v0 { ++ uint32_t minimum; ++ uint32_t softlimit; ++ uint32_t maximum; ++}; + -+#include "vserver/limit.h" -+#include "vserver/base.h" -+#include "vserver/context.h" -+#include "vserver/debug.h" -+#include "vserver/context.h" -+#include "vserver/limit_int.h" ++#define VCMD_rlimit_stat VC_CMD(VSTAT, 1, 0) + -+enum { -+ VXPT_UNKNOWN = 0, -+ VXPT_ANON, -+ VXPT_NONE, -+ VXPT_FILE, -+ VXPT_SWAP, -+ VXPT_WRITE ++struct vcmd_rlimit_stat_v0 { ++ uint32_t id; ++ uint32_t hits; ++ uint64_t value; ++ uint64_t minimum; ++ uint64_t maximum; +}; + -+#if 0 -+#define vx_page_fault(mm, vma, type, ret) -+#else -+ -+static inline -+void __vx_page_fault(struct mm_struct *mm, -+ struct vm_area_struct *vma, int type, int ret) -+{ -+ struct vx_info *vxi = mm->mm_vx_info; -+ int what; -+/* -+ static char *page_type[6] = -+ { "UNKNOWN", "ANON", "NONE", "FILE", "SWAP", "WRITE" }; -+ static char *page_what[4] = -+ { "FAULT_OOM", "FAULT_SIGBUS", "FAULT_MINOR", "FAULT_MAJOR" }; -+*/ ++#define CRLIM_UNSET (0ULL) ++#define CRLIM_INFINITY (~0ULL) ++#define CRLIM_KEEP (~1ULL) + -+ if (!vxi) -+ return; ++#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 + -+ what = (ret & 0x3); ++#include + -+/* printk("[%d] page[%d][%d] %2x %s %s\n", vxi->vx_id, -+ type, what, ret, page_type[type], page_what[what]); -+*/ -+ if (ret & VM_FAULT_WRITE) -+ what |= 0x4; -+ atomic_inc(&vxi->cacct.page[type][what]); -+} + -+#define vx_page_fault(mm, vma, type, ret) __vx_page_fault(mm, vma, type, ret) -+#endif ++enum { ++ VXM_UNUSED = 0, + ++ VXM_SYNC = 0x10, + -+extern unsigned long vx_badness(struct task_struct *task, struct mm_struct *mm); ++ VXM_UPDATE = 0x20, ++ VXM_UPDATE_1, ++ VXM_UPDATE_2, + -+#else -+#warning duplicate inclusion -+#endif -diff -NurpP --minimal linux-2.6.36.2/include/linux/vs_network.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vs_network.h ---- linux-2.6.36.2/include/linux/vs_network.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vs_network.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,169 @@ -+#ifndef _NX_VS_NETWORK_H -+#define _NX_VS_NETWORK_H ++ VXM_RQINFO_1 = 0x24, ++ VXM_RQINFO_2, + -+#include "vserver/context.h" -+#include "vserver/network.h" -+#include "vserver/base.h" -+#include "vserver/check.h" -+#include "vserver/debug.h" ++ VXM_ACTIVATE = 0x40, ++ VXM_DEACTIVATE, ++ VXM_IDLE, + -+#include ++ VXM_HOLD = 0x44, ++ VXM_UNHOLD, + ++ VXM_MIGRATE = 0x48, ++ VXM_RESCHED, + -+#define get_nx_info(i) __get_nx_info(i, __FILE__, __LINE__) ++ /* all other bits are flags */ ++ VXM_SCHED = 0x80, ++}; + -+static inline struct nx_info *__get_nx_info(struct nx_info *nxi, -+ const char *_file, int _line) -+{ -+ if (!nxi) -+ return NULL; -+ -+ vxlprintk(VXD_CBIT(nid, 2), "get_nx_info(%p[#%d.%d])", -+ nxi, nxi ? nxi->nx_id : 0, -+ nxi ? atomic_read(&nxi->nx_usecnt) : 0, -+ _file, _line); ++struct _vxm_update_1 { ++ uint32_t tokens_max; ++ uint32_t fill_rate; ++ uint32_t interval; ++}; + -+ atomic_inc(&nxi->nx_usecnt); -+ return nxi; -+} ++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; ++}; + -+extern void free_nx_info(struct nx_info *); ++struct _vxm_rqinfo_2 { ++ uint32_t norm_time; ++ uint32_t idle_time; ++ uint32_t idle_skip; ++}; + -+#define put_nx_info(i) __put_nx_info(i, __FILE__, __LINE__) ++struct _vxm_sched { ++ uint32_t tokens; ++ uint32_t norm_time; ++ uint32_t idle_time; ++}; + -+static inline void __put_nx_info(struct nx_info *nxi, const char *_file, int _line) -+{ -+ if (!nxi) -+ return; ++struct _vxm_task { ++ uint16_t pid; ++ uint16_t state; ++}; + -+ vxlprintk(VXD_CBIT(nid, 2), "put_nx_info(%p[#%d.%d])", -+ nxi, nxi ? nxi->nx_id : 0, -+ nxi ? atomic_read(&nxi->nx_usecnt) : 0, -+ _file, _line); ++struct _vxm_event { ++ uint32_t jif; ++ union { ++ uint32_t seq; ++ uint32_t sec; ++ }; ++ union { ++ uint32_t tokens; ++ uint32_t nsec; ++ struct _vxm_task tsk; ++ }; ++}; + -+ if (atomic_dec_and_test(&nxi->nx_usecnt)) -+ free_nx_info(nxi); -+} ++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; ++ }; ++}; + ++#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 + -+#define init_nx_info(p, i) __init_nx_info(p, i, __FILE__, __LINE__) ++#include + -+static inline void __init_nx_info(struct nx_info **nxp, struct nx_info *nxi, -+ const char *_file, int _line) -+{ -+ if (nxi) { -+ vxlprintk(VXD_CBIT(nid, 3), -+ "init_nx_info(%p[#%d.%d])", -+ nxi, nxi ? nxi->nx_id : 0, -+ nxi ? atomic_read(&nxi->nx_usecnt) : 0, -+ _file, _line); + -+ atomic_inc(&nxi->nx_usecnt); -+ } -+ *nxp = nxi; -+} ++#define MAX_N_CONTEXT 65535 /* Arbitrary limit */ + + -+#define set_nx_info(p, i) __set_nx_info(p, i, __FILE__, __LINE__) ++/* network flags */ + -+static inline void __set_nx_info(struct nx_info **nxp, struct nx_info *nxi, -+ const char *_file, int _line) -+{ -+ struct nx_info *nxo; ++#define NXF_INFO_PRIVATE 0x00000008 + -+ if (!nxi) -+ return; ++#define NXF_SINGLE_IP 0x00000100 ++#define NXF_LBACK_REMAP 0x00000200 ++#define NXF_LBACK_ALLOW 0x00000400 + -+ vxlprintk(VXD_CBIT(nid, 3), "set_nx_info(%p[#%d.%d])", -+ nxi, nxi ? nxi->nx_id : 0, -+ nxi ? atomic_read(&nxi->nx_usecnt) : 0, -+ _file, _line); ++#define NXF_HIDE_NETIF 0x02000000 ++#define NXF_HIDE_LBACK 0x04000000 + -+ atomic_inc(&nxi->nx_usecnt); -+ nxo = xchg(nxp, nxi); -+ BUG_ON(nxo); -+} ++#define NXF_STATE_SETUP (1ULL << 32) ++#define NXF_STATE_ADMIN (1ULL << 34) + -+#define clr_nx_info(p) __clr_nx_info(p, __FILE__, __LINE__) ++#define NXF_SC_HELPER (1ULL << 36) ++#define NXF_PERSISTENT (1ULL << 38) + -+static inline void __clr_nx_info(struct nx_info **nxp, -+ const char *_file, int _line) -+{ -+ struct nx_info *nxo; ++#define NXF_ONE_TIME (0x0005ULL << 32) + -+ nxo = xchg(nxp, NULL); -+ if (!nxo) -+ return; + -+ vxlprintk(VXD_CBIT(nid, 3), "clr_nx_info(%p[#%d.%d])", -+ nxo, nxo ? nxo->nx_id : 0, -+ nxo ? atomic_read(&nxo->nx_usecnt) : 0, -+ _file, _line); ++#define NXF_INIT_SET (__nxf_init_set()) + -+ if (atomic_dec_and_test(&nxo->nx_usecnt)) -+ free_nx_info(nxo); ++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; +} + + -+#define claim_nx_info(v, p) __claim_nx_info(v, p, __FILE__, __LINE__) ++/* network caps */ + -+static inline void __claim_nx_info(struct nx_info *nxi, -+ struct task_struct *task, const char *_file, int _line) -+{ -+ vxlprintk(VXD_CBIT(nid, 3), "claim_nx_info(%p[#%d.%d.%d]) %p", -+ nxi, nxi ? nxi->nx_id : 0, -+ nxi?atomic_read(&nxi->nx_usecnt):0, -+ nxi?atomic_read(&nxi->nx_tasks):0, -+ task, _file, _line); ++#define NXC_TUN_CREATE 0x00000001 + -+ atomic_inc(&nxi->nx_tasks); -+} ++#define NXC_RAW_ICMP 0x00000100 + ++#define NXC_MULTICAST 0x00001000 + -+extern void unhash_nx_info(struct nx_info *); + -+#define release_nx_info(v, p) __release_nx_info(v, p, __FILE__, __LINE__) ++/* address types */ + -+static inline void __release_nx_info(struct nx_info *nxi, -+ struct task_struct *task, const char *_file, int _line) -+{ -+ vxlprintk(VXD_CBIT(nid, 3), "release_nx_info(%p[#%d.%d.%d]) %p", -+ nxi, nxi ? nxi->nx_id : 0, -+ nxi ? atomic_read(&nxi->nx_usecnt) : 0, -+ nxi ? atomic_read(&nxi->nx_tasks) : 0, -+ task, _file, _line); ++#define NXA_TYPE_IPV4 0x0001 ++#define NXA_TYPE_IPV6 0x0002 + -+ might_sleep(); ++#define NXA_TYPE_NONE 0x0000 ++#define NXA_TYPE_ANY 0x00FF + -+ if (atomic_dec_and_test(&nxi->nx_tasks)) -+ unhash_nx_info(nxi); -+} ++#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 task_get_nx_info(i) __task_get_nx_info(i, __FILE__, __LINE__) ++#define NXA_MOD_BCAST 0x0100 ++#define NXA_MOD_LBACK 0x0200 + -+static __inline__ struct nx_info *__task_get_nx_info(struct task_struct *p, -+ const char *_file, int _line) -+{ -+ struct nx_info *nxi; ++#define NXA_LOOPBACK 0x1000 + -+ task_lock(p); -+ vxlprintk(VXD_CBIT(nid, 5), "task_get_nx_info(%p)", -+ p, _file, _line); -+ nxi = __get_nx_info(p->nx_info, _file, _line); -+ task_unlock(p); -+ return nxi; -+} ++#define NXA_MASK_BIND (NXA_MASK_ALL | NXA_MOD_BCAST | NXA_MOD_LBACK) ++#define NXA_MASK_SHOW (NXA_MASK_ALL | NXA_LOOPBACK) + ++#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 + -+static inline void exit_nx_info(struct task_struct *p) -+{ -+ if (p->nx_info) -+ release_nx_info(p->nx_info, p); -+} + ++/* vinfo commands */ + -+#else -+#warning duplicate inclusion -+#endif -diff -NurpP --minimal linux-2.6.36.2/include/linux/vs_pid.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vs_pid.h ---- linux-2.6.36.2/include/linux/vs_pid.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vs_pid.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,95 @@ -+#ifndef _VS_PID_H -+#define _VS_PID_H ++#define VCMD_task_nid VC_CMD(VINFO, 2, 0) + -+#include "vserver/base.h" -+#include "vserver/check.h" -+#include "vserver/context.h" -+#include "vserver/debug.h" -+#include "vserver/pid.h" -+#include + ++#define VCMD_nx_info VC_CMD(VINFO, 6, 0) + -+#define VXF_FAKE_INIT (VXF_INFO_INIT | VXF_STATE_INIT) ++struct vcmd_nx_info_v0 { ++ uint32_t nid; ++ /* more to come */ ++}; + -+static inline -+int vx_proc_task_visible(struct task_struct *task) -+{ -+ if ((task->pid == 1) && -+ !vx_flags(VXF_FAKE_INIT, VXF_FAKE_INIT)) -+ /* show a blend through init */ -+ goto visible; -+ if (vx_check(vx_task_xid(task), VS_WATCH | VS_IDENT)) -+ goto visible; -+ return 0; -+visible: -+ return 1; -+} + -+#define find_task_by_real_pid(pid) find_task_by_pid_ns(pid, &init_pid_ns) ++#include ++#include + -+#if 0 ++#define VCMD_net_create_v0 VC_CMD(VNET, 1, 0) ++#define VCMD_net_create VC_CMD(VNET, 1, 1) + -+static inline -+struct task_struct *vx_find_proc_task_by_pid(int pid) -+{ -+ struct task_struct *task = find_task_by_real_pid(pid); ++struct vcmd_net_create { ++ uint64_t flagword; ++}; + -+ if (task && !vx_proc_task_visible(task)) { -+ vxdprintk(VXD_CBIT(misc, 6), -+ "dropping task (find) %p[#%u,%u] for %p[#%u,%u]", -+ task, task->xid, task->pid, -+ current, current->xid, current->pid); -+ task = NULL; -+ } -+ return task; -+} ++#define VCMD_net_migrate VC_CMD(NETMIG, 1, 0) + -+#endif ++#define VCMD_net_add VC_CMD(NETALT, 1, 0) ++#define VCMD_net_remove VC_CMD(NETALT, 2, 0) + -+static inline -+struct task_struct *vx_get_proc_task(struct inode *inode, struct pid *pid) -+{ -+ struct task_struct *task = get_pid_task(pid, PIDTYPE_PID); ++struct vcmd_net_addr_v0 { ++ uint16_t type; ++ uint16_t count; ++ struct in_addr ip[4]; ++ struct in_addr mask[4]; ++}; + -+ if (task && !vx_proc_task_visible(task)) { -+ vxdprintk(VXD_CBIT(misc, 6), -+ "dropping task (get) %p[#%u,%u] for %p[#%u,%u]", -+ task, task->xid, task->pid, -+ current, current->xid, current->pid); -+ put_task_struct(task); -+ task = NULL; -+ } -+ return task; -+} ++#define VCMD_net_add_ipv4_v1 VC_CMD(NETALT, 1, 1) ++#define VCMD_net_rem_ipv4_v1 VC_CMD(NETALT, 2, 1) + -+#if 0 ++struct vcmd_net_addr_ipv4_v1 { ++ uint16_t type; ++ uint16_t flags; ++ struct in_addr ip; ++ struct in_addr mask; ++}; + -+static inline -+struct task_struct *vx_child_reaper(struct task_struct *p) -+{ -+ struct vx_info *vxi = p->vx_info; -+ struct task_struct *reaper = child_reaper(p); ++#define VCMD_net_add_ipv4 VC_CMD(NETALT, 1, 2) ++#define VCMD_net_rem_ipv4 VC_CMD(NETALT, 2, 2) + -+ if (!vxi) -+ goto out; ++struct vcmd_net_addr_ipv4_v2 { ++ uint16_t type; ++ uint16_t flags; ++ struct in_addr ip; ++ struct in_addr ip2; ++ struct in_addr mask; ++}; + -+ BUG_ON(!p->vx_info->vx_reaper); ++#define VCMD_net_add_ipv6 VC_CMD(NETALT, 3, 1) ++#define VCMD_net_remove_ipv6 VC_CMD(NETALT, 4, 1) + -+ /* child reaper for the guest reaper */ -+ if (vxi->vx_reaper == p) -+ goto out; ++struct vcmd_net_addr_ipv6_v1 { ++ uint16_t type; ++ uint16_t flags; ++ uint32_t prefix; ++ struct in6_addr ip; ++ struct in6_addr mask; ++}; + -+ reaper = vxi->vx_reaper; -+out: -+ vxdprintk(VXD_CBIT(xid, 7), -+ "vx_child_reaper(%p[#%u,%u]) = %p[#%u,%u]", -+ p, p->xid, p->pid, reaper, reaper->xid, reaper->pid); -+ return reaper; -+} ++#define VCMD_add_match_ipv4 VC_CMD(NETALT, 5, 0) ++#define VCMD_get_match_ipv4 VC_CMD(NETALT, 6, 0) + -+#endif ++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) + -+#else -+#warning duplicate inclusion -+#endif -diff -NurpP --minimal linux-2.6.36.2/include/linux/vs_sched.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vs_sched.h ---- linux-2.6.36.2/include/linux/vs_sched.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vs_sched.h 2010-10-24 15:13:57.000000000 +0200 -@@ -0,0 +1,40 @@ -+#ifndef _VS_SCHED_H -+#define _VS_SCHED_H ++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; ++}; + -+#include "vserver/base.h" -+#include "vserver/context.h" -+#include "vserver/sched.h" + + -+#define MAX_PRIO_BIAS 20 -+#define MIN_PRIO_BIAS -20 + -+static inline -+int vx_adjust_prio(struct task_struct *p, int prio, int max_user) -+{ -+ struct vx_info *vxi = p->vx_info; ++/* flag commands */ + -+ if (vxi) -+ prio += vx_cpu(vxi, sched_pc).prio_bias; -+ return prio; -+} ++#define VCMD_get_nflags VC_CMD(FLAGS, 5, 0) ++#define VCMD_set_nflags VC_CMD(FLAGS, 6, 0) + -+static inline void vx_account_user(struct vx_info *vxi, -+ cputime_t cputime, int nice) -+{ -+ if (!vxi) -+ return; -+ vx_cpu(vxi, sched_pc).user_ticks += cputime; -+} ++struct vcmd_net_flags_v0 { ++ uint64_t flagword; ++ uint64_t mask; ++}; + -+static inline void vx_account_system(struct vx_info *vxi, -+ cputime_t cputime, int idle) -+{ -+ if (!vxi) -+ return; -+ vx_cpu(vxi, sched_pc).sys_ticks += cputime; -+} + -+#else -+#warning duplicate inclusion -+#endif -diff -NurpP --minimal linux-2.6.36.2/include/linux/vs_socket.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vs_socket.h ---- linux-2.6.36.2/include/linux/vs_socket.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vs_socket.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,67 @@ -+#ifndef _VS_SOCKET_H -+#define _VS_SOCKET_H + -+#include "vserver/debug.h" -+#include "vserver/base.h" -+#include "vserver/cacct.h" -+#include "vserver/context.h" -+#include "vserver/tag.h" ++/* network caps commands */ + ++#define VCMD_get_ncaps VC_CMD(FLAGS, 7, 0) ++#define VCMD_set_ncaps VC_CMD(FLAGS, 8, 0) + -+/* socket accounting */ ++struct vcmd_net_caps_v0 { ++ uint64_t ncaps; ++ uint64_t cmask; ++}; + -+#include ++#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 + -+static inline int vx_sock_type(int family) -+{ -+ switch (family) { -+ case PF_UNSPEC: -+ return VXA_SOCK_UNSPEC; -+ case PF_UNIX: -+ return VXA_SOCK_UNIX; -+ case PF_INET: -+ return VXA_SOCK_INET; -+ case PF_INET6: -+ return VXA_SOCK_INET6; -+ case PF_PACKET: -+ return VXA_SOCK_PACKET; -+ default: -+ return VXA_SOCK_OTHER; -+ } -+} + -+#define vx_acc_sock(v, f, p, s) \ -+ __vx_acc_sock(v, f, p, s, __FILE__, __LINE__) ++struct vcmd_prio_bias { ++ int32_t cpu_id; ++ int32_t prio_bias; ++}; + -+static inline void __vx_acc_sock(struct vx_info *vxi, -+ int family, int pos, int size, char *file, int line) -+{ -+ if (vxi) { -+ int type = vx_sock_type(family); ++#define VCMD_set_prio_bias VC_CMD(SCHED, 4, 0) ++#define VCMD_get_prio_bias VC_CMD(SCHED, 5, 0) + -+ atomic_long_inc(&vxi->cacct.sock[type][pos].count); -+ atomic_long_add(size, &vxi->cacct.sock[type][pos].total); -+ } -+} ++#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 + -+#define vx_sock_recv(sk, s) \ -+ vx_acc_sock((sk)->sk_vx_info, (sk)->sk_family, 0, s) -+#define vx_sock_send(sk, s) \ -+ vx_acc_sock((sk)->sk_vx_info, (sk)->sk_family, 1, s) -+#define vx_sock_fail(sk, s) \ -+ vx_acc_sock((sk)->sk_vx_info, (sk)->sk_family, 2, s) + ++/* signalling vserver commands */ + -+#define sock_vx_init(s) do { \ -+ (s)->sk_xid = 0; \ -+ (s)->sk_vx_info = NULL; \ -+ } while (0) ++#define VCMD_ctx_kill VC_CMD(PROCTRL, 1, 0) ++#define VCMD_wait_exit VC_CMD(EVENT, 99, 0) + -+#define sock_nx_init(s) do { \ -+ (s)->sk_nid = 0; \ -+ (s)->sk_nx_info = NULL; \ -+ } while (0) ++struct vcmd_ctx_kill_v0 { ++ int32_t pid; ++ int32_t sig; ++}; + -+#else -+#warning duplicate inclusion -+#endif -diff -NurpP --minimal linux-2.6.36.2/include/linux/vs_tag.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vs_tag.h ---- linux-2.6.36.2/include/linux/vs_tag.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vs_tag.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,47 @@ -+#ifndef _VS_TAG_H -+#define _VS_TAG_H ++struct vcmd_wait_exit_v0 { ++ int32_t reboot_cmd; ++ int32_t exit_code; ++}; + -+#include + -+/* check conditions */ ++/* process alteration commands */ + -+#define DX_ADMIN 0x0001 -+#define DX_WATCH 0x0002 -+#define DX_HOSTID 0x0008 ++#define VCMD_get_pflags VC_CMD(PROCALT, 5, 0) ++#define VCMD_set_pflags VC_CMD(PROCALT, 6, 0) + -+#define DX_IDENT 0x0010 ++struct vcmd_pflags_v0 { ++ uint32_t flagword; ++ uint32_t mask; ++}; + -+#define DX_ARG_MASK 0x0010 ++#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 + + -+#define dx_task_tag(t) ((t)->tag) ++#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 dx_current_tag() dx_task_tag(current) ++#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 dx_check(c, m) __dx_check(dx_current_tag(), c, m) ++#define VCMD_get_space_mask_v0 VC_CMD(PROCALT, 4, 0) + -+#define dx_weak_check(c, m) ((m) ? dx_check(c, m) : 1) ++#define VCMD_get_space_mask VC_CMD(VSPACE, 0, 1) ++#define VCMD_get_space_default VC_CMD(VSPACE, 1, 0) + + -+/* -+ * 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) -+{ -+ if (mode & DX_ARG_MASK) { -+ if ((mode & DX_IDENT) && (id == cid)) -+ return 1; -+ } -+ return (((mode & DX_ADMIN) && (cid == 0)) || -+ ((mode & DX_WATCH) && (cid == 1)) || -+ ((mode & DX_HOSTID) && (id == 0))); -+} ++struct vcmd_space_mask_v1 { ++ uint64_t mask; ++}; + -+struct inode; -+int dx_permission(const struct inode *inode, int mask); ++struct vcmd_space_mask_v2 { ++ uint64_t mask; ++ uint32_t index; ++}; + ++#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 + -+#else -+#warning duplicate inclusion -+#endif -diff -NurpP --minimal linux-2.6.36.2/include/linux/vs_time.h linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vs_time.h ---- linux-2.6.36.2/include/linux/vs_time.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/linux/vs_time.h 2010-10-21 14:25:37.000000000 +0200 -@@ -0,0 +1,19 @@ -+#ifndef _VS_TIME_H -+#define _VS_TIME_H ++#include + + -+/* time faking stuff */ ++#define VC_CATEGORY(c) (((c) >> 24) & 0x3F) ++#define VC_COMMAND(c) (((c) >> 16) & 0xFF) ++#define VC_VERSION(c) ((c) & 0xFFF) + -+#ifdef CONFIG_VSERVER_VTIME ++#define VC_CMD(c, i, v) ((((VC_CAT_ ## c) & 0x3F) << 24) \ ++ | (((i) & 0xFF) << 16) | ((v) & 0xFFF)) + -+extern void vx_adjust_timespec(struct timespec *ts); -+extern int vx_settimeofday(struct timespec *ts); ++/* + -+#else -+#define vx_adjust_timespec(t) do { } while (0) -+#define vx_settimeofday(t) do_settimeofday(t) -+#endif ++ Syscall Matrix V2.8 + -+#else -+#warning duplicate inclusion -+#endif -diff -NurpP --minimal linux-2.6.36.2/include/net/addrconf.h linux-2.6.36.2-vs2.3.0.36.38.2/include/net/addrconf.h ---- linux-2.6.36.2/include/net/addrconf.h 2010-10-21 13:07:56.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/net/addrconf.h 2010-10-21 13:09:36.000000000 +0200 -@@ -84,7 +84,8 @@ extern int ipv6_dev_get_saddr(struct n - 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-2.6.36.2/include/net/af_unix.h linux-2.6.36.2-vs2.3.0.36.38.2/include/net/af_unix.h ---- linux-2.6.36.2/include/net/af_unix.h 2010-10-21 13:07:56.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/net/af_unix.h 2010-10-21 13:09:36.000000000 +0200 -@@ -4,6 +4,7 @@ - #include - #include - #include -+#include - #include - - extern void unix_inflight(struct file *fp); -diff -NurpP --minimal linux-2.6.36.2/include/net/inet_timewait_sock.h linux-2.6.36.2-vs2.3.0.36.38.2/include/net/inet_timewait_sock.h ---- linux-2.6.36.2/include/net/inet_timewait_sock.h 2010-08-02 16:52:56.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/net/inet_timewait_sock.h 2010-10-21 13:09:36.000000000 +0200 -@@ -117,6 +117,10 @@ struct inet_timewait_sock { - #define tw_hash __tw_common.skc_hash - #define tw_prot __tw_common.skc_prot - #define tw_net __tw_common.skc_net -+#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; - /* 3 bits hole, try to pack */ -diff -NurpP --minimal linux-2.6.36.2/include/net/route.h linux-2.6.36.2-vs2.3.0.36.38.2/include/net/route.h ---- linux-2.6.36.2/include/net/route.h 2010-10-21 13:07:56.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/net/route.h 2010-10-21 13:09:36.000000000 +0200 -@@ -145,6 +145,9 @@ static inline void ip_rt_put(struct rtab - dst_release(&rt->dst); - } - -+#include -+#include ++ |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 IPTOS_RT_MASK (IPTOS_TOS_MASK & ~3) - - extern const __u8 ip_tos2prio[16]; -@@ -154,6 +157,9 @@ static inline char rt_tos2priority(u8 to - return ip_tos2prio[IPTOS_TOS(tos)>>1]; - } - -+extern int ip_v4_find_src(struct net *net, struct nx_info *, -+ struct rtable **, struct flowi *); ++*/ + - static inline int ip_route_connect(struct rtable **rp, __be32 dst, - __be32 src, u32 tos, int oif, u8 protocol, - __be16 sport, __be16 dport, struct sock *sk, -@@ -171,11 +177,24 @@ static inline int ip_route_connect(struc - - int err; - struct net *net = sock_net(sk); -+ struct nx_info *nx_info = current_nx_info(); - - if (inet_sk(sk)->transparent) - fl.flags |= FLOWI_FLAG_ANYSRC; - -- if (!dst || !src) { -+ if (sk) -+ nx_info = sk->sk_nx_info; ++#define VC_CAT_VERSION 0 + -+ 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)); ++#define VC_CAT_VSETUP 1 ++#define VC_CAT_VHOST 2 + -+ err = ip_v4_find_src(net, nx_info, rp, &fl); -+ if (err) -+ return err; ++#define VC_CAT_DEVICE 6 + -+ if (!fl.fl4_dst || !fl.fl4_src) { - err = __ip_route_output_key(net, rp, &fl); - if (err) - return err; -diff -NurpP --minimal linux-2.6.36.2/include/net/sock.h linux-2.6.36.2-vs2.3.0.36.38.2/include/net/sock.h ---- linux-2.6.36.2/include/net/sock.h 2010-10-21 13:07:56.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/include/net/sock.h 2010-10-21 13:09:36.000000000 +0200 -@@ -150,6 +150,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; - }; - - /** -@@ -241,6 +245,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 - kmemcheck_bitfield_begin(flags); - unsigned int sk_shutdown : 2, - sk_no_check : 2, -diff -NurpP --minimal linux-2.6.36.2/init/Kconfig linux-2.6.36.2-vs2.3.0.36.38.2/init/Kconfig ---- linux-2.6.36.2/init/Kconfig 2010-10-21 13:07:56.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/init/Kconfig 2010-10-21 13:09:36.000000000 +0200 -@@ -476,6 +476,7 @@ config HAVE_UNSTABLE_SCHED_CLOCK ++#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) ++ ++#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 ++ ++ ++/* vinfo commands */ ++ ++#define VCMD_task_tag VC_CMD(VINFO, 3, 0) ++ ++ ++/* context commands */ ++ ++#define VCMD_tag_migrate VC_CMD(TAGMIG, 1, 0) ++ ++#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" - depends on EVENTFD + 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 -@@ -503,6 +504,7 @@ config CGROUP_DEBUG - config CGROUP_NS - bool "Namespace cgroup subsystem" - depends on CGROUPS -+ default n - help - Provides a simple namespace cgroup subsystem to - provide hierarchical naming of sets of namespaces, -diff -NurpP --minimal linux-2.6.36.2/init/main.c linux-2.6.36.2-vs2.3.0.36.38.2/init/main.c ---- linux-2.6.36.2/init/main.c 2010-10-21 13:07:56.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/init/main.c 2010-10-21 13:10:12.000000000 +0200 -@@ -68,6 +68,7 @@ - #include - #include - #include +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-2.6.36.2/ipc/mqueue.c linux-2.6.36.2-vs2.3.0.36.38.2/ipc/mqueue.c ---- linux-2.6.36.2/ipc/mqueue.c 2010-10-21 13:07:56.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/ipc/mqueue.c 2010-10-21 13:28:42.000000000 +0200 -@@ -33,6 +33,8 @@ - #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" -@@ -66,6 +68,7 @@ struct mqueue_inode_info { - struct sigevent notify; - struct pid* notify_owner; +@@ -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; -@@ -125,6 +128,7 @@ static struct inode *mqueue_get_inode(st - if (S_ISREG(mode)) { - struct mqueue_inode_info *info; - struct task_struct *p = current; -+ struct vx_info *vxi = p->vx_info; - unsigned long mq_bytes, mq_msg_tblsz; - - inode->i_fop = &mqueue_file_operations; -@@ -138,6 +142,7 @@ static struct inode *mqueue_get_inode(st - info->notify_owner = NULL; - info->qsize = 0; - info->user = NULL; /* set when all is ok */ -+ info->vxi = NULL; - memset(&info->attr, 0, sizeof(info->attr)); - info->attr.mq_maxmsg = ipc_ns->mq_msg_max; - info->attr.mq_msgsize = ipc_ns->mq_msgsize_max; -@@ -156,16 +161,19 @@ 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 > -- task_rlimit(p, RLIMIT_MSGQUEUE)) { -+ task_rlimit(p, RLIMIT_MSGQUEUE) || -+ !vx_ipcmsg_avail(vxi, mq_bytes)) { - spin_unlock(&mq_lock); - /* mqueue_evict_inode() releases info->messages */ - goto out_inode; - } - u->mq_bytes += mq_bytes; -+ vx_ipcmsg_add(vxi, u, mq_bytes); +@@ -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 - /* 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 */ -@@ -267,8 +275,11 @@ static void mqueue_evict_inode(struct in - + info->attr.mq_msgsize); user = info->user; if (user) { + struct vx_info *vxi = info->vxi; @@ -14649,7 +13032,7 @@ diff -NurpP --minimal linux-2.6.36.2/ipc/mqueue.c linux-2.6.36.2-vs2.3.0.36.38.2 /* * get_ns_from_inode() ensures that the * (ipc_ns = sb->s_fs_info) is either a valid ipc_ns -@@ -278,6 +289,7 @@ static void mqueue_evict_inode(struct in +@@ -413,6 +424,7 @@ static void mqueue_evict_inode(struct in if (ipc_ns) ipc_ns->mq_queues_count--; spin_unlock(&mq_lock); @@ -14657,9 +13040,9 @@ diff -NurpP --minimal linux-2.6.36.2/ipc/mqueue.c linux-2.6.36.2-vs2.3.0.36.38.2 free_uid(user); } if (ipc_ns) -diff -NurpP --minimal linux-2.6.36.2/ipc/msg.c linux-2.6.36.2-vs2.3.0.36.38.2/ipc/msg.c ---- linux-2.6.36.2/ipc/msg.c 2010-08-02 16:52:57.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/ipc/msg.c 2010-10-21 13:09:36.000000000 +0200 +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 @@ -14667,8 +13050,8 @@ diff -NurpP --minimal linux-2.6.36.2/ipc/msg.c linux-2.6.36.2-vs2.3.0.36.38.2/ip +#include #include - #include -@@ -190,6 +191,7 @@ static int newque(struct ipc_namespace * + #include +@@ -129,6 +130,7 @@ static int newque(struct ipc_namespace * msq->q_perm.mode = msgflg & S_IRWXUGO; msq->q_perm.key = key; @@ -14676,31 +13059,19 @@ diff -NurpP --minimal linux-2.6.36.2/ipc/msg.c linux-2.6.36.2-vs2.3.0.36.38.2/ip msq->q_perm.security = NULL; retval = security_msg_queue_alloc(msq); -diff -NurpP --minimal linux-2.6.36.2/ipc/namespace.c linux-2.6.36.2-vs2.3.0.36.38.2/ipc/namespace.c ---- linux-2.6.36.2/ipc/namespace.c 2009-09-10 15:26:27.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/ipc/namespace.c 2010-10-21 13:09:36.000000000 +0200 -@@ -11,6 +11,8 @@ - #include - #include - #include -+#include -+#include - - #include "util.h" - -diff -NurpP --minimal linux-2.6.36.2/ipc/sem.c linux-2.6.36.2-vs2.3.0.36.38.2/ipc/sem.c ---- linux-2.6.36.2/ipc/sem.c 2010-10-21 13:07:56.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/ipc/sem.c 2010-10-21 13:09:36.000000000 +0200 -@@ -86,6 +86,8 @@ +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 #include "util.h" -@@ -260,6 +262,7 @@ static int newary(struct ipc_namespace * +@@ -499,6 +501,7 @@ static int newary(struct ipc_namespace * sma->sem_perm.mode = (semflg & S_IRWXUGO); sma->sem_perm.key = key; @@ -14708,7 +13079,7 @@ diff -NurpP --minimal linux-2.6.36.2/ipc/sem.c linux-2.6.36.2-vs2.3.0.36.38.2/ip sma->sem_perm.security = NULL; retval = security_sem_alloc(sma); -@@ -275,6 +278,9 @@ static int newary(struct ipc_namespace * +@@ -528,6 +531,9 @@ static int newary(struct ipc_namespace * return id; } ns->used_sems += nsems; @@ -14716,54 +13087,56 @@ diff -NurpP --minimal linux-2.6.36.2/ipc/sem.c linux-2.6.36.2-vs2.3.0.36.38.2/ip + vx_semary_inc(sma); + vx_nsems_add(sma, nsems); - sma->sem_base = (struct sem *) &sma[1]; - -@@ -730,6 +736,9 @@ static void freeary(struct ipc_namespace + 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); - security_sem_free(sma); - ipc_rcu_putref(sma); + ipc_rcu_putref(sma, sem_rcu_free); } -diff -NurpP --minimal linux-2.6.36.2/ipc/shm.c linux-2.6.36.2-vs2.3.0.36.38.2/ipc/shm.c ---- linux-2.6.36.2/ipc/shm.c 2010-12-13 22:08:59.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/ipc/shm.c 2010-12-13 22:09:27.000000000 +0100 -@@ -39,6 +39,8 @@ + +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 + #include -@@ -169,7 +171,12 @@ static void shm_open(struct vm_area_stru - */ +@@ -210,10 +212,14 @@ 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 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; + shm_rmid(ns, shp); shm_unlock(shp); - if (!is_file_hugepages(shp->shm_file)) -@@ -179,6 +186,7 @@ static void shm_destroy(struct ipc_names - shp->mlock_user); - fput (shp->shm_file); - security_shm_free(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); + ipc_rcu_putref(shp, shm_rcu_free); } -@@ -349,11 +357,15 @@ static int newseg(struct ipc_namespace * - if (ns->shm_tot + numpages > ns->shm_ctlall) +@@ -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)) @@ -14778,26 +13151,49 @@ diff -NurpP --minimal linux-2.6.36.2/ipc/shm.c linux-2.6.36.2-vs2.3.0.36.38.2/ip shp->shm_perm.mode = (shmflg & S_IRWXUGO); shp->mlock_user = NULL; -@@ -407,6 +419,7 @@ static int newseg(struct ipc_namespace * - ns->shm_tot += numpages; - error = shp->shm_perm.id; - shm_unlock(shp); +@@ -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-2.6.36.2/kernel/capability.c linux-2.6.36.2-vs2.3.0.36.38.2/kernel/capability.c ---- linux-2.6.36.2/kernel/capability.c 2010-08-02 16:52:57.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/capability.c 2010-10-21 13:09:36.000000000 +0200 -@@ -14,6 +14,7 @@ - #include +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 /* -@@ -119,6 +120,7 @@ static int cap_validate_magic(cap_user_h +@@ -106,6 +107,7 @@ static int cap_validate_magic(cap_user_h return 0; } @@ -14805,29 +13201,27 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/capability.c linux-2.6.36.2-vs2.3.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 -@@ -289,6 +291,8 @@ error: - return ret; +@@ -343,6 +345,8 @@ bool has_ns_capability_noaudit(struct ta + return (ret == 0); } +#include + /** - * capable - Determine if the current task has a superior capability in effect - * @cap: The capability to be tested for -@@ -301,6 +305,9 @@ error: - */ - int capable(int cap) - { -+ /* here for now so we don't require task locking */ -+ if (vs_check_bit(VXC_CAP_MASK, cap) && !vx_mcaps(1L << cap)) -+ return 0; - if (unlikely(!cap_valid(cap))) { - printk(KERN_CRIT "capable() called with invalid cap=%u\n", cap); - BUG(); -diff -NurpP --minimal linux-2.6.36.2/kernel/compat.c linux-2.6.36.2-vs2.3.0.36.38.2/kernel/compat.c ---- linux-2.6.36.2/kernel/compat.c 2010-10-21 13:07:56.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/compat.c 2010-10-21 14:22:43.000000000 +0200 -@@ -914,7 +914,7 @@ asmlinkage long compat_sys_stime(compat_ + * 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; @@ -14836,11 +13230,11 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/compat.c linux-2.6.36.2-vs2.3.0.36.3 return 0; } -diff -NurpP --minimal linux-2.6.36.2/kernel/cred.c linux-2.6.36.2-vs2.3.0.36.38.2/kernel/cred.c ---- linux-2.6.36.2/kernel/cred.c 2010-10-21 13:07:56.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/cred.c 2010-12-01 17:25:55.000000000 +0100 -@@ -60,31 +60,6 @@ struct cred init_cred = { - #endif +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) @@ -14869,11 +13263,48 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/cred.c linux-2.6.36.2-vs2.3.0.36.38. -} - /* - * Dispose of the shared task group credentials + * 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. */ -diff -NurpP --minimal linux-2.6.36.2/kernel/exit.c linux-2.6.36.2-vs2.3.0.36.38.2/kernel/exit.c ---- linux-2.6.36.2/kernel/exit.c 2010-12-13 22:08:59.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/exit.c 2010-12-13 22:09:27.000000000 +0100 +-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 cred *prepare_creds(void) ++{ ++ validate_process_creds(); ++ ++ 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 @@ -14884,101 +13315,123 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/exit.c linux-2.6.36.2-vs2.3.0.36.38. +#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; ++ } ++ ++ 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; + } -@@ -487,9 +491,11 @@ static void close_files(struct files_str - filp_close(file, files); - cond_resched(); - } -+ vx_openfd_dec(i); - } - i++; - set >>= 1; -+ cond_resched(); + 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; } -@@ -1032,11 +1038,16 @@ NORET_TYPE void do_exit(long code) - validate_creds_for_do_exit(tsk); + /* +@@ -572,10 +588,15 @@ static void forget_original_parent(struc + struct task_struct *t = p; -+ /* needs to stay after exit_notify() */ + do { +- t->real_parent = reaper; ++ struct task_struct *new_parent = reaper; ++ ++ if (unlikely(p == reaper)) ++ new_parent = task_active_pid_ns(p)->child_reaper; ++ ++ 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); ++ + 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); + - preempt_disable(); - exit_rcu(); /* 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-2.6.36.2/kernel/fork.c linux-2.6.36.2-vs2.3.0.36.38.2/kernel/fork.c ---- linux-2.6.36.2/kernel/fork.c 2010-10-21 13:07:56.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/fork.c 2010-10-21 13:09:36.000000000 +0200 -@@ -65,6 +65,10 @@ - #include - #include - #include +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 #include -@@ -160,6 +164,8 @@ void free_task(struct task_struct *tsk) - account_kernel_stack(tsk->stack, -1); +@@ -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); - free_task_struct(tsk); - } -@@ -492,6 +498,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; - } - -@@ -525,6 +532,7 @@ void __mmdrop(struct mm_struct *mm) - mm_free_pgd(mm); - destroy_context(mm); - mmu_notifier_mm_destroy(mm); -+ clr_vx_info(&mm->mm_vx_info); - free_mm(mm); - } - EXPORT_SYMBOL_GPL(__mmdrop); -@@ -660,6 +668,7 @@ struct mm_struct *dup_mm(struct task_str - goto fail_nomem; - - memcpy(mm, oldmm, sizeof(*mm)); -+ mm->mm_vx_info = NULL; - - /* Initializing for Swap token stuff */ - mm->token_priority = 0; -@@ -698,6 +707,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; -@@ -973,6 +983,8 @@ static struct task_struct *copy_process( + 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; - 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); -@@ -1019,7 +1031,12 @@ static struct task_struct *copy_process( +@@ -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 @@ -14990,11 +13443,11 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/fork.c linux-2.6.36.2-vs2.3.0.36.38. + 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) && -@@ -1284,6 +1301,18 @@ static struct task_struct *copy_process( - + 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); + + /* p is copy of current */ + vxi = p->vx_info; @@ -15008,34 +13461,23 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/fork.c linux-2.6.36.2-vs2.3.0.36.38. + if (nxi) + claim_nx_info(nxi, p); write_unlock_irq(&tasklist_lock); + proc_fork_connector(p); - cgroup_post_fork(p); -diff -NurpP --minimal linux-2.6.36.2/kernel/kthread.c linux-2.6.36.2-vs2.3.0.36.38.2/kernel/kthread.c ---- linux-2.6.36.2/kernel/kthread.c 2010-10-21 13:07:57.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/kthread.c 2010-10-21 13:42:40.000000000 +0200 -@@ -16,6 +16,7 @@ - #include - #include +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-2.6.36.2/kernel/Makefile linux-2.6.36.2-vs2.3.0.36.38.2/kernel/Makefile ---- linux-2.6.36.2/kernel/Makefile 2010-10-21 13:07:56.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/Makefile 2010-10-21 13:09:36.000000000 +0200 -@@ -25,6 +25,7 @@ CFLAGS_REMOVE_sched_clock.o = -pg - CFLAGS_REMOVE_perf_event.o = -pg - endif - -+obj-y += vserver/ - obj-$(CONFIG_FREEZER) += freezer.o - obj-$(CONFIG_PROFILING) += profile.o - obj-$(CONFIG_SYSCTL_SYSCALL_CHECK) += sysctl_check.o -diff -NurpP --minimal linux-2.6.36.2/kernel/nsproxy.c linux-2.6.36.2-vs2.3.0.36.38.2/kernel/nsproxy.c ---- linux-2.6.36.2/kernel/nsproxy.c 2010-07-07 18:31:57.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/nsproxy.c 2010-10-21 13:09:36.000000000 +0200 -@@ -20,6 +20,8 @@ +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 @@ -15043,8 +13485,14 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/nsproxy.c linux-2.6.36.2-vs2.3.0.36. +#include #include #include + #include + #include + #include ++#include "../fs/mount.h" -@@ -43,8 +45,11 @@ static inline struct nsproxy *create_nsp + 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); @@ -15057,74 +13505,71 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/nsproxy.c linux-2.6.36.2-vs2.3.0.36. return nsproxy; } -@@ -53,41 +58,52 @@ static inline struct nsproxy *create_nsp +@@ -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 fs_struct *new_fs) -+static struct nsproxy *unshare_namespaces(unsigned long flags, -+ struct nsproxy *orig, struct fs_struct *new_fs) +- 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; - -+ vxdprintk(VXD_CBIT(space, 4), -+ "unshare_namespaces(0x%08lx,%p,%p)", -+ flags, orig, new_fs); -+ - new_nsp = create_nsproxy(); +@@ -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, new_fs); -+ new_nsp->mnt_ns = copy_mnt_ns(flags, orig->mnt_ns, new_fs); +- 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, tsk->nsproxy->uts_ns); -+ new_nsp->uts_ns = copy_utsname(flags, orig->uts_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, tsk->nsproxy->ipc_ns); -+ new_nsp->ipc_ns = copy_ipcs(flags, orig->ipc_ns); +- 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 = copy_pid_ns(flags, task_active_pid_ns(tsk)); -+ new_nsp->pid_ns = copy_pid_ns(flags, orig->pid_ns); - if (IS_ERR(new_nsp->pid_ns)) { - err = PTR_ERR(new_nsp->pid_ns); +- 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, tsk->nsproxy->net_ns); -+ /* disabled now? -+ new_nsp->user_ns = copy_user_ns(flags, orig->user_ns); -+ if (IS_ERR(new_nsp->user_ns)) { -+ err = PTR_ERR(new_nsp->user_ns); -+ goto out_user; -+ } */ -+ -+ new_nsp->net_ns = copy_net_ns(flags, orig->net_ns); +- 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; -@@ -112,6 +128,38 @@ out_ns: +@@ -117,6 +125,41 @@ out_ns: return ERR_PTR(err); } -+static struct nsproxy *create_new_namespaces(int flags, struct task_struct *tsk, -+ struct fs_struct *new_fs) ++static struct nsproxy *create_new_namespaces(unsigned long flags, ++ struct task_struct *tsk, struct user_namespace *user_ns, ++ struct fs_struct *new_fs) ++ +{ -+ return unshare_namespaces(flags, tsk->nsproxy, new_fs); ++ return unshare_namespaces(flags, tsk->nsproxy, ++ new_fs, user_ns, task_active_pid_ns(tsk)); +} + +/* @@ -15145,8 +13590,8 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/nsproxy.c linux-2.6.36.2-vs2.3.0.36. + 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->pid_ns_for_children) ++ get_pid_ns(ns->pid_ns_for_children); + if (ns->net_ns) + get_net(ns->net_ns); + } @@ -15156,43 +13601,41 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/nsproxy.c linux-2.6.36.2-vs2.3.0.36. /* * called from clone. This now handles copy for nsproxy and all * namespaces therein. -@@ -119,9 +167,12 @@ out_ns: - int copy_namespaces(unsigned long flags, struct task_struct *tsk) +@@ -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; - int err = 0; - ++ + vxdprintk(VXD_CBIT(space, 7), "copy_namespaces(0x%08lx,%p[%p])", + flags, tsk, old_ns); -+ - if (!old_ns) - return 0; -@@ -131,7 +182,7 @@ int copy_namespaces(unsigned long flags, - CLONE_NEWPID | CLONE_NEWNET))) + 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 (!capable(CAP_SYS_ADMIN)) { -+ if (!vx_can_unshare(CAP_SYS_ADMIN, flags)) { - err = -EPERM; - goto out; } -@@ -158,6 +209,9 @@ int copy_namespaces(unsigned long flags, - out: - put_nsproxy(old_ns); +- 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]) = %d [%p]", -+ flags, tsk, old_ns, err, new_ns); - return err; ++ "copy_namespaces(0x%08lx,%p[%p]) = [%p]", ++ flags, tsk, old_ns, new_ns); + return 0; } -@@ -171,7 +225,9 @@ void free_nsproxy(struct nsproxy *ns) +@@ -165,7 +214,9 @@ void free_nsproxy(struct nsproxy *ns) put_ipc_ns(ns->ipc_ns); - if (ns->pid_ns) - put_pid_ns(ns->pid_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); @@ -15200,8 +13643,8 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/nsproxy.c linux-2.6.36.2-vs2.3.0.36. kmem_cache_free(nsproxy_cachep, ns); } -@@ -184,11 +240,15 @@ int unshare_nsproxy_namespaces(unsigned - { +@@ -179,12 +230,16 @@ int unshare_nsproxy_namespaces(unsigned + struct user_namespace *user_ns; int err = 0; + vxdprintk(VXD_CBIT(space, 4), @@ -15209,35 +13652,36 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/nsproxy.c linux-2.6.36.2-vs2.3.0.36. + unshare_flags, current->nsproxy); + if (!(unshare_flags & (CLONE_NEWNS | CLONE_NEWUTS | CLONE_NEWIPC | - CLONE_NEWNET))) + CLONE_NEWNET | CLONE_NEWPID))) return 0; -- if (!capable(CAP_SYS_ADMIN)) -+ if (!vx_can_unshare(CAP_SYS_ADMIN, unshare_flags)) + 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, -diff -NurpP --minimal linux-2.6.36.2/kernel/pid.c linux-2.6.36.2-vs2.3.0.36.38.2/kernel/pid.c ---- linux-2.6.36.2/kernel/pid.c 2010-10-21 13:07:57.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/pid.c 2010-10-21 13:09:36.000000000 +0200 -@@ -36,6 +36,7 @@ - #include - #include + *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) -@@ -339,7 +340,7 @@ EXPORT_SYMBOL_GPL(find_pid_ns); +@@ -375,7 +376,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); +- 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); -@@ -399,6 +400,9 @@ void transfer_pid(struct task_struct *ol +@@ -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; @@ -15246,17 +13690,17 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/pid.c linux-2.6.36.2-vs2.3.0.36.38.2 + type = PIDTYPE_PID; if (pid) { struct hlist_node *first; - first = rcu_dereference_check(pid->tasks[type].first, -@@ -416,7 +420,7 @@ EXPORT_SYMBOL(pid_task); - */ - struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns) - { + 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) -@@ -458,7 +462,7 @@ struct pid *find_get_pid(pid_t nr) +@@ -494,7 +498,7 @@ struct pid *find_get_pid(pid_t nr) } EXPORT_SYMBOL_GPL(find_get_pid); @@ -15265,9 +13709,9 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/pid.c linux-2.6.36.2-vs2.3.0.36.38.2 { struct upid *upid; pid_t nr = 0; -@@ -471,6 +475,11 @@ pid_t pid_nr_ns(struct pid *pid, struct - return nr; +@@ -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) +{ @@ -15276,91 +13720,55 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/pid.c linux-2.6.36.2-vs2.3.0.36.38.2 + pid_t pid_vnr(struct pid *pid) { - return pid_nr_ns(pid, current->nsproxy->pid_ns); -diff -NurpP --minimal linux-2.6.36.2/kernel/pid_namespace.c linux-2.6.36.2-vs2.3.0.36.38.2/kernel/pid_namespace.c ---- linux-2.6.36.2/kernel/pid_namespace.c 2010-07-07 18:31:57.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/pid_namespace.c 2010-10-21 13:09:36.000000000 +0200 -@@ -14,6 +14,7 @@ - #include - #include - #include + 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 - #define BITS_PER_PAGE (PAGE_SIZE*8) - -@@ -87,6 +88,7 @@ static struct pid_namespace *create_pid_ + 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); - -@@ -112,6 +114,7 @@ static void destroy_pid_namespace(struct - - for (i = 0; i < PIDMAP_ENTRIES; i++) - kfree(ns->pidmap[i].page); + 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); - } - -diff -NurpP --minimal linux-2.6.36.2/kernel/posix-timers.c linux-2.6.36.2-vs2.3.0.36.38.2/kernel/posix-timers.c ---- linux-2.6.36.2/kernel/posix-timers.c 2010-10-21 13:07:57.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/posix-timers.c 2010-10-21 13:09:36.000000000 +0200 + 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 - - /* - * Management arrays for POSIX timers. Timers are kept in slab memory -@@ -363,6 +364,7 @@ int posix_timer_event(struct k_itimer *t - { - struct task_struct *task; - int shared, ret = -1; -+ - /* - * FIXME: if ->sigq is queued we can race with - * dequeue_signal()->do_schedule_next_timer(). -@@ -379,10 +381,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; -+ -+ 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(); -+ - /* If we failed to send the signal the timer stops. */ - return ret > 0; - } -diff -NurpP --minimal linux-2.6.36.2/kernel/printk.c linux-2.6.36.2-vs2.3.0.36.38.2/kernel/printk.c ---- linux-2.6.36.2/kernel/printk.c 2010-10-21 13:07:57.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/printk.c 2010-10-21 13:43:06.000000000 +0200 -@@ -39,6 +39,7 @@ - #include - #include - #include + #include + #include + #include +#include #include -@@ -266,18 +267,15 @@ int do_syslog(int type, char __user *buf - unsigned i, j, limit, count; - int do_clear = 0; - char c; -- int error = 0; -+ int error; +@@ -490,7 +491,7 @@ static int check_syslog_permissions(int + return 0; - error = security_syslog(type, from_file); + 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; @@ -15376,7 +13784,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/printk.c linux-2.6.36.2-vs2.3.0.36.3 error = -EINVAL; if (!buf || len < 0) goto out; -@@ -288,6 +286,16 @@ int do_syslog(int type, char __user *buf +@@ -1286,6 +1284,16 @@ int do_syslog(int type, char __user *buf error = -EFAULT; goto out; } @@ -15391,9 +13799,9 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/printk.c linux-2.6.36.2-vs2.3.0.36.3 + break; + case SYSLOG_ACTION_READ: /* Read from log */ error = wait_event_interruptible(log_wait, - (log_start - log_end)); + syslog_seq != log_next_seq); if (error) -@@ -314,16 +322,6 @@ int do_syslog(int type, char __user *buf +@@ -1298,16 +1306,6 @@ int do_syslog(int type, char __user *buf /* FALL THRU */ /* Read last kernel messages */ case SYSLOG_ACTION_READ_ALL: @@ -15407,157 +13815,192 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/printk.c linux-2.6.36.2-vs2.3.0.36.3 - error = -EFAULT; - goto out; - } - count = len; - if (count > log_buf_len) - count = log_buf_len; -diff -NurpP --minimal linux-2.6.36.2/kernel/ptrace.c linux-2.6.36.2-vs2.3.0.36.38.2/kernel/ptrace.c ---- linux-2.6.36.2/kernel/ptrace.c 2010-10-21 13:07:57.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/ptrace.c 2010-10-21 13:09:36.000000000 +0200 -@@ -22,6 +22,7 @@ + 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(); - - /* -@@ -150,6 +151,11 @@ int __ptrace_may_access(struct task_stru - dumpable = get_dumpable(task->mm); - if (!dumpable && !capable(CAP_SYS_PTRACE)) - return -EPERM; -+ if (!vx_check(task->xid, VS_ADMIN_P|VS_IDENT)) ++ 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); } -@@ -709,6 +715,10 @@ SYSCALL_DEFINE4(ptrace, long, request, l - goto out; - } -+ ret = -EPERM; -+ if (!vx_check(vx_task_xid(child), VS_WATCH_P | VS_IDENT)) -+ goto out_put_task_struct; +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 *); + - if (request == PTRACE_ATTACH) { - ret = ptrace_attach(child); - /* -diff -NurpP --minimal linux-2.6.36.2/kernel/sched.c linux-2.6.36.2-vs2.3.0.36.38.2/kernel/sched.c ---- linux-2.6.36.2/kernel/sched.c 2010-12-13 22:08:59.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/sched.c 2010-12-13 22:09:27.000000000 +0100 -@@ -72,6 +72,8 @@ - #include - #include - #include + /* + * 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); ++ + 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 - #include -@@ -3017,9 +3019,17 @@ static inline long calc_load_fold_idle(v - */ - 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; -+ } - } +@@ -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" - static unsigned long -@@ -3314,16 +3324,19 @@ void account_user_time(struct task_struc + +@@ -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 cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat; + struct vx_info *vxi = p->vx_info; /* p is _always_ current */ - cputime64_t tmp; -+ int nice = (TASK_NICE(p) > 0); ++ int nice = (task_nice(p) > 0); + int index; /* Add user time to process. */ - p->utime = cputime_add(p->utime, cputime); - p->utimescaled = cputime_add(p->utimescaled, cputime_scaled); + 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. */ - tmp = cputime_to_cputime64(cputime); -- if (TASK_NICE(p) > 0) -+ if (nice) - cpustat->nice = cputime64_add(cpustat->nice, tmp); - else - cpustat->user = cputime64_add(cpustat->user, tmp); -@@ -3374,6 +3387,7 @@ void account_system_time(struct task_str - cputime_t cputime, cputime_t cputime_scaled) + 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 cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat; + struct vx_info *vxi = p->vx_info; /* p is _always_ current */ - cputime64_t tmp; - - if ((p->flags & PF_VCPU) && (irq_count() - hardirq_offset == 0)) { -@@ -3384,6 +3398,7 @@ void account_system_time(struct task_str ++ /* Add system time to process. */ - p->stime = cputime_add(p->stime, cputime); - p->stimescaled = cputime_add(p->stimescaled, cputime_scaled); + 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. */ -@@ -4470,7 +4485,7 @@ SYSCALL_DEFINE1(nice, int, increment) - nice = 19; +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 - if (increment < 0 && !can_nice(current, nice)) -- return -EPERM; -+ return vx_flags(VXF_IGNEG_NICE, 0) ? 0 : -EPERM; + #include - retval = security_task_setnice(current, nice); - if (retval) -diff -NurpP --minimal linux-2.6.36.2/kernel/sched_fair.c linux-2.6.36.2-vs2.3.0.36.38.2/kernel/sched_fair.c ---- linux-2.6.36.2/kernel/sched_fair.c 2010-10-21 13:07:57.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/sched_fair.c 2010-10-21 13:09:36.000000000 +0200 -@@ -782,6 +782,9 @@ enqueue_entity(struct cfs_rq *cfs_rq, st - check_spread(cfs_rq, se); - if (se != cfs_rq->curr) +@@ -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)); - } - - static void __clear_buddies(struct cfs_rq *cfs_rq, struct sched_entity *se) -@@ -825,6 +828,8 @@ dequeue_entity(struct cfs_rq *cfs_rq, st - + 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); - update_min_vruntime(cfs_rq); -diff -NurpP --minimal linux-2.6.36.2/kernel/signal.c linux-2.6.36.2-vs2.3.0.36.38.2/kernel/signal.c ---- linux-2.6.36.2/kernel/signal.c 2010-10-21 13:07:57.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/signal.c 2010-10-21 13:09:36.000000000 +0200 -@@ -28,6 +28,8 @@ - #include - #include - #include + /* +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(); ++ ++ 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 - -@@ -646,9 +648,18 @@ static int check_kill_permission(int sig +@@ -767,9 +769,18 @@ static int check_kill_permission(int sig struct pid *sid; int error; @@ -15576,7 +14019,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/signal.c linux-2.6.36.2-vs2.3.0.36.3 if (!si_fromuser(info)) return 0; -@@ -678,6 +689,20 @@ static int check_kill_permission(int sig +@@ -793,6 +804,20 @@ static int check_kill_permission(int sig } } @@ -15597,7 +14040,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/signal.c linux-2.6.36.2-vs2.3.0.36.3 return security_task_kill(t, info, sig, 0); } -@@ -1170,7 +1195,7 @@ int kill_pid_info(int sig, struct siginf +@@ -1334,7 +1359,7 @@ int kill_pid_info(int sig, struct siginf rcu_read_lock(); retry: p = pid_task(pid, PIDTYPE_PID); @@ -15606,7 +14049,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/signal.c linux-2.6.36.2-vs2.3.0.36.3 error = group_send_sig_info(sig, info, p); if (unlikely(error == -ESRCH)) /* -@@ -1210,7 +1235,7 @@ int kill_pid_info_as_uid(int sig, struct +@@ -1382,7 +1407,7 @@ int kill_pid_info_as_cred(int sig, struc rcu_read_lock(); p = pid_task(pid, PIDTYPE_PID); @@ -15615,7 +14058,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/signal.c linux-2.6.36.2-vs2.3.0.36.3 ret = -ESRCH; goto out_unlock; } -@@ -1265,8 +1290,10 @@ static int kill_something_info(int sig, +@@ -1434,8 +1459,10 @@ static int kill_something_info(int sig, struct task_struct * p; for_each_process(p) { @@ -15628,41 +14071,41 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/signal.c linux-2.6.36.2-vs2.3.0.36.3 int err = group_send_sig_info(sig, info, p); ++count; if (err != -EPERM) -@@ -1933,6 +1960,11 @@ relock: +@@ -2288,6 +2315,11 @@ relock: !sig_kernel_only(signr)) continue; + /* virtual init is protected against user signals */ -+ if ((info->si_code == SI_USER) && ++ if ((ksig->info.si_code == SI_USER) && + vx_current_initpid(current->pid)) + continue; + if (sig_kernel_stop(signr)) { /* * The default action is to stop all threads in -diff -NurpP --minimal linux-2.6.36.2/kernel/softirq.c linux-2.6.36.2-vs2.3.0.36.38.2/kernel/softirq.c ---- linux-2.6.36.2/kernel/softirq.c 2010-08-02 16:52:57.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/softirq.c 2010-10-21 13:09:36.000000000 +0200 -@@ -24,6 +24,7 @@ - #include - #include +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-2.6.36.2/kernel/sys.c linux-2.6.36.2-vs2.3.0.36.38.2/kernel/sys.c ---- linux-2.6.36.2/kernel/sys.c 2010-10-21 13:07:57.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/sys.c 2010-10-21 13:45:48.000000000 +0200 -@@ -42,6 +42,7 @@ - #include - #include - #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 - #include - #include -@@ -131,7 +132,10 @@ static int set_one_prio(struct task_stru +@@ -145,7 +146,10 @@ static int set_one_prio(struct task_stru goto out; } if (niceval < task_nice(p) && !can_nice(p, niceval)) { @@ -15674,94 +14117,76 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/sys.c linux-2.6.36.2-vs2.3.0.36.38.2 goto out; } no_nice = security_task_setnice(p, niceval); -@@ -181,6 +185,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; -@@ -244,6 +250,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); +@@ -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) - retval = niceval; -@@ -357,6 +365,8 @@ EXPORT_SYMBOL_GPL(kernel_power_off); +@@ -1202,7 +1212,8 @@ SYSCALL_DEFINE2(sethostname, char __user + int errno; + char tmp[__NEW_UTS_LEN]; - static DEFINE_MUTEX(reboot_mutex); +- 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; -+long vs_reboot(unsigned int, void __user *); -+ - /* - * Reboot system call: for obvious reasons only root may call it, - * and even root needs to set up some magic numbers in the registers -@@ -389,6 +399,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); -+ - mutex_lock(&reboot_mutex); - switch (cmd) { - case LINUX_REBOOT_CMD_RESTART: -@@ -1169,7 +1182,7 @@ SYSCALL_DEFINE2(sethostname, char __user - int errno; - char tmp[__NEW_UTS_LEN]; - -- if (!capable(CAP_SYS_ADMIN)) -+ if (!vx_capable(CAP_SYS_ADMIN, VXC_SET_UTSNAME)) - return -EPERM; if (len < 0 || len > __NEW_UTS_LEN) - return -EINVAL; -@@ -1218,7 +1231,7 @@ SYSCALL_DEFINE2(setdomainname, char __us +@@ -1253,7 +1264,8 @@ SYSCALL_DEFINE2(setdomainname, char __us int errno; char tmp[__NEW_UTS_LEN]; -- if (!capable(CAP_SYS_ADMIN)) -+ if (!vx_capable(CAP_SYS_ADMIN, VXC_SET_UTSNAME)) +- 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; -@@ -1334,7 +1347,7 @@ int do_prlimit(struct task_struct *tsk, - task_lock(tsk->group_leader); - if (new_rlim) { +@@ -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, -@@ -1383,7 +1396,7 @@ static int check_prlimit_permission(stru - cred->gid != tcred->egid || - cred->gid != tcred->sgid || - cred->gid != tcred->gid) && -- !capable(CAP_SYS_RESOURCE)) { -+ !vx_capable(CAP_SYS_RESOURCE, VXC_SET_RLIMIT)) { - return -EPERM; - } - -diff -NurpP --minimal linux-2.6.36.2/kernel/sysctl_binary.c linux-2.6.36.2-vs2.3.0.36.38.2/kernel/sysctl_binary.c ---- linux-2.6.36.2/kernel/sysctl_binary.c 2010-08-02 16:52:57.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/sysctl_binary.c 2010-10-21 13:09:36.000000000 +0200 -@@ -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" }, +@@ -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; - { CTL_STR, KERN_SPARC_REBOOT, "reboot-cmd" }, - { CTL_INT, KERN_CTLALTDEL, "ctrl-alt-del" }, -diff -NurpP --minimal linux-2.6.36.2/kernel/sysctl.c linux-2.6.36.2-vs2.3.0.36.38.2/kernel/sysctl.c ---- linux-2.6.36.2/kernel/sysctl.c 2010-10-21 13:07:57.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/sysctl.c 2010-10-21 13:09:36.000000000 +0200 -@@ -73,6 +73,7 @@ + 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 @@ -15769,35 +14194,89 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/sysctl.c linux-2.6.36.2-vs2.3.0.36.3 #ifdef CONFIG_CHR_DEV_SG #include #endif -@@ -573,6 +574,13 @@ static struct ctl_table kern_table[] = { - .proc_handler = proc_dostring, - }, - #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, ++ .proc_handler = proc_dostring, + }, - #ifdef CONFIG_CHR_DEV_SG ++ { + .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 = "sg-big-buff", -diff -NurpP --minimal linux-2.6.36.2/kernel/time/timekeeping.c linux-2.6.36.2-vs2.3.0.36.38.2/kernel/time/timekeeping.c ---- linux-2.6.36.2/kernel/time/timekeeping.c 2010-10-21 13:07:57.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/time/timekeeping.c 2010-10-21 14:17:59.000000000 +0200 -@@ -229,6 +229,7 @@ void getnstimeofday(struct timespec *ts) - } while (read_seqretry(&xtime_lock, seq)); - - timespec_add_ns(ts, nsecs); -+ vx_adjust_timespec(ts); + .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; ++ + /* + * 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; ++ ++ 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(); ++ + /* 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 - EXPORT_SYMBOL(getnstimeofday); -diff -NurpP --minimal linux-2.6.36.2/kernel/time.c linux-2.6.36.2-vs2.3.0.36.38.2/kernel/time.c ---- linux-2.6.36.2/kernel/time.c 2010-10-21 13:07:57.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/time.c 2010-10-21 14:22:43.000000000 +0200 -@@ -92,7 +92,7 @@ SYSCALL_DEFINE1(stime, time_t __user *, + #include + #include +@@ -93,7 +94,7 @@ SYSCALL_DEFINE1(stime, time_t __user *, if (err) return err; @@ -15806,22 +14285,43 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/time.c linux-2.6.36.2-vs2.3.0.36.38. return 0; } -@@ -177,7 +177,7 @@ int do_sys_settimeofday(struct timespec - /* SMP safe, again the code in arch/foo/time.c should - * globally block out interrupts when it runs. - */ +@@ -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-2.6.36.2/kernel/timer.c linux-2.6.36.2-vs2.3.0.36.38.2/kernel/timer.c ---- linux-2.6.36.2/kernel/timer.c 2010-10-21 13:07:57.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/timer.c 2010-10-21 13:09:36.000000000 +0200 -@@ -40,6 +40,10 @@ - #include - #include + +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 @@ -15829,104 +14329,342 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/timer.c linux-2.6.36.2-vs2.3.0.36.38 #include #include -@@ -1332,12 +1336,6 @@ SYSCALL_DEFINE1(alarm, unsigned int, sec +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 - #endif + 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) --#ifndef __alpha__ -- --/* -- * The Alpha uses getxpid, getxuid, and getxgid instead. Maybe this -- * should be moved into arch/i386 instead? -- */ + 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); - /** - * sys_getpid - return the thread group id of the current process -@@ -1366,10 +1364,23 @@ SYSCALL_DEFINE0(getppid) - rcu_read_lock(); - pid = task_tgid_vnr(current->real_parent); - rcu_read_unlock(); -+ return vx_map_pid(pid); ++ktag_t make_ktag(struct user_namespace *from, vtag_t tag) ++{ ++ return KTAGT_INIT(tag); +} ++EXPORT_SYMBOL(make_ktag); ++ ++vtag_t from_ktag(struct user_namespace *to, ktag_t tag) ++{ ++ 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); + } -- return pid; -+#ifdef __alpha__ +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 ++# ++ ++menu "Linux VServer" ++ ++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. ++ ++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. ++ ++ (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) ++ ++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. ++ ++config VSERVER_DEVICE ++ bool "Enable Guest Device Mapping (EXPERIMENTAL)" ++ default n ++ help ++ This enables generic device remapping. ++ ++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. ++ ++ (note: on 1.2x the entries were visible by default) ++ ++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. ++ ++ ++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. ++ ++config TAGGING_GID16 ++ bool "UID32/GID16" ++ help ++ reduces GID to 16 bit, but leaves UID at 32 bit. ++ ++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. ++ ++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 ++ ++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) ++ ++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. ++ ++ note: this is not a strict upper limit. ++ ++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. ++ ++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. ++ ++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. ++ ++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. ++ ++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. ++ ++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. ++ ++config QUOTES_ASCII ++ bool "ASCII single quotes" ++ help ++ This uses the ASCII single quote character ++ (\x27) to quote file and process names. ++ ++endchoice ++ ++endmenu ++ ++ ++config VSERVER ++ bool ++ default y ++ select NAMESPACES ++ select UTS_NS ++ select IPC_NS ++# select USER_NS ++ select SYSVIPC ++ ++config VSERVER_SECURITY ++ bool ++ depends on SECURITY ++ default y ++ select SECURITY_CAPABILITIES + -+/* -+ * The Alpha uses getxpid, getxuid, and getxgid instead. -+ */ ++config VSERVER_DISABLED ++ bool ++ default n + -+asmlinkage long do_getxpid(long *ppid) -+{ -+ *ppid = sys_getppid(); -+ return sys_getpid(); - } - -+#else /* _alpha_ */ +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. ++# + - SYSCALL_DEFINE0(getuid) - { - /* Only we change this so SMP safe */ -diff -NurpP --minimal linux-2.6.36.2/kernel/user_namespace.c linux-2.6.36.2-vs2.3.0.36.38.2/kernel/user_namespace.c ---- linux-2.6.36.2/kernel/user_namespace.c 2010-10-21 13:07:57.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/user_namespace.c 2010-10-21 13:09:36.000000000 +0200 -@@ -11,6 +11,7 @@ - #include - #include - #include -+#include - - /* - * Create a new user namespace, deriving the creator from the user in the -@@ -31,6 +32,7 @@ int create_user_ns(struct cred *new) - return -ENOMEM; - - kref_init(&ns->kref); -+ atomic_inc(&vs_global_user_ns); - - for (n = 0; n < UIDHASH_SZ; ++n) - INIT_HLIST_HEAD(ns->uidhash_table + n); -@@ -79,6 +81,8 @@ void free_user_ns(struct kref *kref) - struct user_namespace *ns = - container_of(kref, struct user_namespace, kref); - -+ /* FIXME: maybe move into destroyer? */ -+ atomic_dec(&vs_global_user_ns); - INIT_WORK(&ns->destroyer, free_user_ns_work); - schedule_work(&ns->destroyer); - } -diff -NurpP --minimal linux-2.6.36.2/kernel/utsname.c linux-2.6.36.2-vs2.3.0.36.38.2/kernel/utsname.c ---- linux-2.6.36.2/kernel/utsname.c 2009-09-10 15:26:28.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/utsname.c 2010-10-21 13:09:36.000000000 +0200 -@@ -14,14 +14,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; - } - -@@ -71,5 +74,6 @@ void free_uts_ns(struct kref *kref) - struct uts_namespace *ns; - - ns = container_of(kref, struct uts_namespace, kref); -+ atomic_dec(&vs_global_uts_ns); - kfree(ns); - } -diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/cacct.c linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/cacct.c ---- linux-2.6.36.2/kernel/vserver/cacct.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/cacct.c 2010-10-21 13:09:36.000000000 +0200 ++ ++obj-y += vserver.o ++ ++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 ++ ++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.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 @@ -15970,9 +14708,9 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/cacct.c linux-2.6.36.2-vs2.3 + return 0; +} + -diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/cacct_init.h linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/cacct_init.h ---- linux-2.6.36.2/kernel/vserver/cacct_init.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/cacct_init.h 2010-10-21 13:09:36.000000000 +0200 +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 @@ + + @@ -15999,9 +14737,9 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/cacct_init.h linux-2.6.36.2- + return; +} + -diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/cacct_proc.h linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/cacct_proc.h ---- linux-2.6.36.2/kernel/vserver/cacct_proc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/cacct_proc.h 2010-10-21 13:09:36.000000000 +0200 +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 @@ -16056,16 +14794,16 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/cacct_proc.h linux-2.6.36.2- +} + +#endif /* _VX_CACCT_PROC_H */ -diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/context.c linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/context.c ---- linux-2.6.36.2/kernel/vserver/context.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/context.c 2010-12-01 20:34:45.000000000 +0100 -@@ -0,0 +1,1077 @@ +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-2010 Herbert Pötzl ++ * Copyright (C) 2003-2011 Herbert Pötzl + * + * V0.01 context helper + * V0.02 vx_ctx_kill syscall command @@ -16085,6 +14823,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/context.c linux-2.6.36.2-vs2 + * V0.16 have __create claim() the vxi + * V0.17 removed older and legacy stuff + * V0.18 added user credentials ++ * V0.19 added warn mask + * + */ + @@ -16092,6 +14831,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/context.c linux-2.6.36.2-vs2 +#include +#include +#include ++#include + +#include +#include @@ -16122,7 +14862,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/context.c linux-2.6.36.2-vs2 + +static struct hlist_head vx_info_inactive = HLIST_HEAD_INIT; + -+static spinlock_t vx_info_inactive_lock = SPIN_LOCK_UNLOCKED; ++static DEFINE_SPINLOCK(vx_info_inactive_lock); + + +/* __alloc_vx_info() @@ -16130,7 +14870,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/context.c linux-2.6.36.2-vs2 + * allocate an initialized vx_info struct + * doesn't make it visible (hash) */ + -+static struct vx_info *__alloc_vx_info(xid_t xid) ++static struct vx_info *__alloc_vx_info(vxid_t xid) +{ + struct vx_info *new = NULL; + int cpu, index; @@ -16176,24 +14916,29 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/context.c linux-2.6.36.2-vs2 + } + + new->vx_flags = VXF_INIT_SET; -+ cap_set_init_eff(new->vx_bcaps); ++ 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; + -+ // preconfig fs entries ++ // preconfig spaces + for (index = 0; index < VX_SPACES; index++) { ++ struct _vx_space *space = &new->space[index]; ++ ++ // filesystem + spin_lock(&init_fs.lock); + init_fs.users++; + spin_unlock(&init_fs.lock); -+ new->vx_fs[index] = &init_fs; ++ space->vx_fs = &init_fs; ++ ++ /* FIXME: do we want defaults? */ ++ // space->vx_real_cred = 0; ++ // space->vx_cred = 0; + } + -+ /* FIXME: we want defaults */ -+ new->vx_real_cred = 0; -+ new->vx_cred = 0; + + vxdprintk(VXD_CBIT(xid, 0), + "alloc_vx_info(%d) = %p", xid, new); @@ -16251,7 +14996,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/context.c linux-2.6.36.2-vs2 +{ + struct nsproxy *nsproxy; + struct fs_struct *fs; -+ const struct cred *cred; ++ struct cred *cred; + int index, kill; + + might_sleep(); @@ -16260,28 +15005,22 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/context.c linux-2.6.36.2-vs2 + vs_state_change(vxi, VSC_SHUTDOWN); + + for (index = 0; index < VX_SPACES; index++) { -+ nsproxy = xchg(&vxi->vx_nsproxy[index], NULL); ++ struct _vx_space *space = &vxi->space[index]; ++ ++ nsproxy = xchg(&space->vx_nsproxy, NULL); + if (nsproxy) + put_nsproxy(nsproxy); + -+ fs = xchg(&vxi->vx_fs[index], NULL); ++ fs = xchg(&space->vx_fs, NULL); + spin_lock(&fs->lock); + kill = !--fs->users; + spin_unlock(&fs->lock); + if (kill) + free_fs_struct(fs); -+ } -+ -+ cred = xchg(&vxi->vx_real_cred, NULL); -+ if (cred) { -+ alter_cred_subscribers(cred, -1); -+ put_cred(cred); -+ } + -+ cred = xchg(&vxi->vx_cred, NULL); -+ if (cred) { -+ alter_cred_subscribers(cred, -1); -+ put_cred(cred); ++ cred = (struct cred *)xchg(&space->vx_cred, NULL); ++ if (cred) ++ abort_creds(cred); + } +} + @@ -16302,10 +15041,14 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/context.c linux-2.6.36.2-vs2 + /* context shutdown is mandatory */ + BUG_ON(!vx_info_state(vxi, VXS_SHUTDOWN)); + -+ /* nsproxy and fs check */ ++ /* spaces check */ + for (index = 0; index < VX_SPACES; index++) { -+ BUG_ON(vxi->vx_nsproxy[index]); -+ BUG_ON(vxi->vx_fs[index]); ++ struct _vx_space *space = &vxi->space[index]; ++ ++ 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); @@ -16323,10 +15066,10 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/context.c linux-2.6.36.2-vs2 +static struct hlist_head vx_info_hash[VX_HASH_SIZE] = + { [0 ... VX_HASH_SIZE-1] = HLIST_HEAD_INIT }; + -+static spinlock_t vx_info_hash_lock = SPIN_LOCK_UNLOCKED; ++static DEFINE_SPINLOCK(vx_info_hash_lock); + + -+static inline unsigned int __hashval(xid_t xid) ++static inline unsigned int __hashval(vxid_t xid) +{ + return (xid % VX_HASH_SIZE); +} @@ -16390,7 +15133,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/context.c linux-2.6.36.2-vs2 + * requires the hash_lock to be held + * doesn't increment the vx_refcnt */ + -+static inline struct vx_info *__lookup_vx_info(xid_t xid) ++static inline struct vx_info *__lookup_vx_info(vxid_t xid) +{ + struct hlist_head *head = &vx_info_hash[__hashval(xid)]; + struct hlist_node *pos; @@ -16461,10 +15204,10 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/context.c linux-2.6.36.2-vs2 + +void unhash_vx_info(struct vx_info *vxi) +{ -+ __shutdown_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); +} + @@ -16492,7 +15235,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/context.c linux-2.6.36.2-vs2 + + * verify that xid is still hashed */ + -+int xid_is_hashed(xid_t xid) ++int xid_is_hashed(vxid_t xid) +{ + int hashed; + @@ -16618,7 +15361,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/context.c linux-2.6.36.2-vs2 + /* no rcu_read_lock() because of spin_lock() */ + spin_lock(&files->file_lock); + fdt = files_fdtable(files); -+ bptr = fdt->open_fds->fds_bits; ++ bptr = fdt->open_fds; + count = fdt->max_fds / (sizeof(unsigned long) * 8); + for (total = 0; count > 0; count--) { + if (*bptr) @@ -16708,7 +15451,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/context.c linux-2.6.36.2-vs2 + + ret = unshare_nsproxy_namespaces( + CLONE_NEWUTS | CLONE_NEWIPC | CLONE_NEWUSER, -+ &new_nsp, NULL); ++ &new_nsp, NULL, NULL); + if (ret) + goto out; + @@ -16726,6 +15469,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/context.c linux-2.6.36.2-vs2 +int vx_set_reaper(struct vx_info *vxi, struct task_struct *p) +{ + struct task_struct *old_reaper; ++ struct vx_info *reaper_vxi; + + if (!vxi) + return -EINVAL; @@ -16738,10 +15482,21 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/context.c linux-2.6.36.2-vs2 + 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; ++ } ++ + /* 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; +} + @@ -16835,15 +15590,15 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/context.c linux-2.6.36.2-vs2 + +int vc_task_xid(uint32_t id) +{ -+ xid_t xid; ++ vxid_t xid; + + if (id) { + struct task_struct *tsk; + -+ read_lock(&tasklist_lock); ++ rcu_read_lock(); + tsk = find_task_by_real_pid(id); + xid = (tsk) ? tsk->xid : -ESRCH; -+ read_unlock(&tasklist_lock); ++ rcu_read_unlock(); + } else + xid = vx_current_xid(); + return xid; @@ -17111,6 +15866,31 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/context.c linux-2.6.36.2-vs2 +} + + ++int vc_get_wmask(struct vx_info *vxi, void __user *data) ++{ ++ struct vcmd_wmask vc_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_wmask vc_data; ++ ++ if (copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; ++ ++ vxi->vx_wmask = vs_mask_flags(vxi->vx_wmask, ++ vc_data.wmask, vc_data.mask); ++ return 0; ++} ++ ++ +int vc_get_badness(struct vx_info *vxi, void __user *data) +{ + struct vcmd_badness_v0 vc_data; @@ -17137,10 +15917,10 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/context.c linux-2.6.36.2-vs2 + +EXPORT_SYMBOL_GPL(free_vx_info); + -diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/cvirt.c linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/cvirt.c ---- linux-2.6.36.2/kernel/vserver/cvirt.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/cvirt.c 2010-10-24 12:39:42.000000000 +0200 -@@ -0,0 +1,303 @@ +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/cvirt.c + * @@ -17163,6 +15943,16 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/cvirt.c linux-2.6.36.2-vs2.3 +#include + + ++void vx_vsi_boottime(struct timespec *boottime) ++{ ++ struct vx_info *vxi = current_vx_info(); ++ ++ set_normalized_timespec(boottime, ++ boottime->tv_sec + vxi->cvirt.bias_uptime.tv_sec, ++ boottime->tv_nsec + vxi->cvirt.bias_uptime.tv_nsec); ++ return; ++} ++ +void vx_vsi_uptime(struct timespec *uptime, struct timespec *idle) +{ + struct vx_info *vxi = current_vx_info(); @@ -17312,7 +16102,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/cvirt.c linux-2.6.36.2-vs2.3 + if (id == VHIN_CONTEXT) + return vxi->vx_name; + -+ nsproxy = vxi->vx_nsproxy[0]; ++ nsproxy = vxi->space[0].vx_nsproxy; + if (!nsproxy) + return NULL; + @@ -17426,7 +16216,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/cvirt.c linux-2.6.36.2-vs2.3 + } +} + -+int vx_settimeofday(struct timespec *ts) ++int vx_settimeofday(const struct timespec *ts) +{ + struct timespec ats, delta; + struct vx_info *vxi; @@ -17444,10 +16234,10 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/cvirt.c linux-2.6.36.2-vs2.3 + +#endif + -diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/cvirt_init.h linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/cvirt_init.h ---- linux-2.6.36.2/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/cvirt_init.h 2010-10-21 14:40:17.000000000 +0200 -@@ -0,0 +1,69 @@ +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 @@ + + +extern uint64_t vx_idle_jiffies(void); @@ -17494,8 +16284,9 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/cvirt_init.h linux-2.6.36.2- + +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); @@ -17517,10 +16308,10 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/cvirt_init.h linux-2.6.36.2- + return; +} + -diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/cvirt_proc.h linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/cvirt_proc.h ---- linux-2.6.36.2/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/cvirt_proc.h 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,135 @@ +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 + @@ -17530,6 +16321,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/cvirt_proc.h linux-2.6.36.2- +#include +#include + ++extern int vx_info_mnt_namespace(struct mnt_namespace *, char *); + +static inline +int vx_info_proc_nsproxy(struct nsproxy *nsproxy, char *buffer) @@ -17537,8 +16329,6 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/cvirt_proc.h linux-2.6.36.2- + struct mnt_namespace *ns; + struct uts_namespace *uts; + struct ipc_namespace *ipc; -+ struct path path; -+ char *pstr, *root; + int length = 0; + + if (!nsproxy) @@ -17553,19 +16343,8 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/cvirt_proc.h linux-2.6.36.2- + if (!ns) + goto skip_ns; + -+ pstr = kmalloc(PATH_MAX, GFP_KERNEL); -+ if (!pstr) -+ goto skip_ns; ++ length += vx_info_mnt_namespace(ns, buffer + length); + -+ path.mnt = ns->root; -+ path.dentry = ns->root->mnt_root; -+ root = d_path(&path, pstr, PATH_MAX - 2); -+ length += sprintf(buffer + length, -+ "Namespace:\t%p [#%u]\n" -+ "RootPath:\t%s\n", -+ ns, atomic_read(&ns->count), -+ root); -+ kfree(pstr); +skip_ns: + + uts = nsproxy->uts_ns; @@ -17594,7 +16373,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/cvirt_proc.h linux-2.6.36.2- + 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", ++ "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, @@ -17656,9 +16435,9 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/cvirt_proc.h linux-2.6.36.2- +} + +#endif /* _VX_CVIRT_PROC_H */ -diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/debug.c linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/debug.c ---- linux-2.6.36.2/kernel/vserver/debug.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/debug.c 2010-10-21 13:09:36.000000000 +0200 +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 @@ -17692,9 +16471,9 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/debug.c linux-2.6.36.2-vs2.3 + +EXPORT_SYMBOL_GPL(dump_vx_info); + -diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/device.c linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/device.c ---- linux-2.6.36.2/kernel/vserver/device.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/device.c 2010-10-21 13:09:36.000000000 +0200 +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/device.c @@ -17734,7 +16513,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/device.c linux-2.6.36.2-vs2. + } u; +#define dm_hlist u.hlist +#define dm_list u.list -+ xid_t xid; ++ vxid_t xid; + dev_t device; + struct vx_dmap_target target; +}; @@ -17742,7 +16521,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/device.c linux-2.6.36.2-vs2. + +static struct hlist_head dmap_main_hash[1 << DMAP_HASH_BITS]; + -+static spinlock_t dmap_main_hash_lock = SPIN_LOCK_UNLOCKED; ++static DEFINE_SPINLOCK(dmap_main_hash_lock); + +static struct vx_dmap_target dmap_defaults[2] = { + { .flags = DATTR_OPEN }, @@ -17846,7 +16625,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/device.c linux-2.6.36.2-vs2. + * + * caller must hold hash_lock + */ -+static inline int __find_mapping(xid_t xid, dev_t device, umode_t mode, ++static inline int __find_mapping(vxid_t xid, dev_t device, umode_t mode, + struct vs_mapping **local, struct vs_mapping **global) +{ + struct hlist_head *hash = dmap_main_hash; @@ -17888,7 +16667,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/device.c linux-2.6.36.2-vs2. + struct vs_mapping *vdm, *global; + struct vx_dmap_target *vdmt; + int ret = 0; -+ xid_t xid = vxi->vx_id; ++ vxid_t xid = vxi->vx_id; + int index; + + spin_lock(hash_lock); @@ -18139,10 +16918,10 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/device.c linux-2.6.36.2-vs2. +#endif /* CONFIG_COMPAT */ + + -diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/dlimit.c linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/dlimit.c ---- linux-2.6.36.2/kernel/vserver/dlimit.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/dlimit.c 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,531 @@ +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 + * @@ -18172,7 +16951,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/dlimit.c linux-2.6.36.2-vs2. + * 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) ++static struct dl_info *__alloc_dl_info(struct super_block *sb, vtag_t tag) +{ + struct dl_info *new = NULL; + @@ -18187,7 +16966,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/dlimit.c linux-2.6.36.2-vs2. + memset(new, 0, sizeof(struct dl_info)); + new->dl_tag = tag; + new->dl_sb = sb; -+ INIT_RCU_HEAD(&new->dl_rcu); ++ // INIT_RCU_HEAD(&new->dl_rcu); + INIT_HLIST_NODE(&new->dl_hlist); + spin_lock_init(&new->dl_lock); + atomic_set(&new->dl_refcnt, 0); @@ -18226,10 +17005,10 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/dlimit.c linux-2.6.36.2-vs2. + +struct hlist_head dl_info_hash[DL_HASH_SIZE]; + -+static spinlock_t dl_info_hash_lock = SPIN_LOCK_UNLOCKED; ++static DEFINE_SPINLOCK(dl_info_hash_lock); + + -+static inline unsigned int __hashval(struct super_block *sb, tag_t tag) ++static inline unsigned int __hashval(struct super_block *sb, vtag_t tag) +{ + return ((tag ^ (unsigned long)sb) % DL_HASH_SIZE); +} @@ -18271,23 +17050,20 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/dlimit.c linux-2.6.36.2-vs2. + * requires the rcu_read_lock() + * doesn't increment the dl_refcnt */ + -+static inline struct dl_info *__lookup_dl_info(struct super_block *sb, tag_t tag) ++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 hlist_node *pos; + struct dl_info *dli; + -+ hlist_for_each_entry_rcu(dli, pos, head, dl_hlist) { -+ -+ if (dli->dl_tag == tag && dli->dl_sb == sb) { ++ hlist_for_each_entry_rcu(dli, head, dl_hlist) { ++ if (dli->dl_tag == tag && dli->dl_sb == sb) + return dli; -+ } + } + return NULL; +} + + -+struct dl_info *locate_dl_info(struct super_block *sb, tag_t tag) ++struct dl_info *locate_dl_info(struct super_block *sb, vtag_t tag) +{ + struct dl_info *dli; + @@ -18674,10 +17450,10 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/dlimit.c linux-2.6.36.2-vs2. +EXPORT_SYMBOL_GPL(locate_dl_info); +EXPORT_SYMBOL_GPL(rcu_free_dl_info); + -diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/helper.c linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/helper.c ---- linux-2.6.36.2/kernel/vserver/helper.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/helper.c 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,223 @@ +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 + * @@ -18698,14 +17474,32 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/helper.c linux-2.6.36.2-vs2. + +char vshelper_path[255] = "/sbin/vshelper"; + ++static int vshelper_init(struct subprocess_info *info, struct cred *new_cred) ++{ ++ current->flags &= ~PF_NO_SETAFFINITY; ++ return 0; ++} ++ ++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; ++ ++ info = call_usermodehelper_setup(path, argv, envp, gfp_mask, ++ vshelper_init, NULL, NULL); ++ if (info == NULL) ++ return -ENOMEM; ++ ++ return call_usermodehelper_exec(info, wait); ++} + +static int do_vshelper(char *name, char *argv[], char *envp[], int sync) +{ + int ret; + -+ if ((ret = call_usermodehelper(name, argv, envp, sync))) { -+ printk( KERN_WARNING -+ "%s: (%s %s) returned %s with %d\n", ++ 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); + } @@ -18742,11 +17536,12 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/helper.c linux-2.6.36.2-vs2. + return -EAGAIN; + vxi->vx_state |= VXS_HELPER; + -+ snprintf(id_buf, sizeof(id_buf)-1, "%d", vxi->vx_id); ++ snprintf(id_buf, sizeof(id_buf), "%d", vxi->vx_id); + -+ snprintf(cmd_buf, sizeof(cmd_buf)-1, "VS_CMD=%08x", cmd); -+ snprintf(uid_buf, sizeof(uid_buf)-1, "VS_UID=%d", current_uid()); -+ snprintf(pid_buf, sizeof(pid_buf)-1, "VS_PID=%d", current->pid); ++ 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: @@ -18848,8 +17643,8 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/helper.c linux-2.6.36.2-vs2. + if (!vx_info_flags(vxi, VXF_SC_HELPER, 0)) + return 0; + -+ snprintf(id_buf, sizeof(id_buf)-1, "%d", vxi->vx_id); -+ snprintf(cmd_buf, sizeof(cmd_buf)-1, "VS_CMD=%08x", cmd); ++ snprintf(id_buf, sizeof(id_buf), "%d", vxi->vx_id); ++ snprintf(cmd_buf, sizeof(cmd_buf), "VS_CMD=%08x", cmd); + + switch (cmd) { + case VSC_STARTUP: @@ -18884,8 +17679,8 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/helper.c linux-2.6.36.2-vs2. + if (!nx_info_flags(nxi, NXF_SC_HELPER, 0)) + return 0; + -+ snprintf(id_buf, sizeof(id_buf)-1, "%d", nxi->nx_id); -+ snprintf(cmd_buf, sizeof(cmd_buf)-1, "VS_CMD=%08x", cmd); ++ 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: @@ -18901,9 +17696,9 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/helper.c linux-2.6.36.2-vs2. + return do_vshelper(vshelper_path, argv, envp, 1); +} + -diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/history.c linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/history.c ---- linux-2.6.36.2/kernel/vserver/history.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/history.c 2010-10-21 13:09:36.000000000 +0200 +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 @@ +/* + * kernel/vserver/history.c @@ -19163,13 +17958,14 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/history.c linux-2.6.36.2-vs2 + +#endif /* CONFIG_COMPAT */ + -diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/inet.c linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/inet.c ---- linux-2.6.36.2/kernel/vserver/inet.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/inet.c 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,224 @@ +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 @@ -19185,13 +17981,16 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/inet.c linux-2.6.36.2-vs2.3. + ret = 1; + else { + struct nx_addr_v4 *ptr; ++ unsigned long irqflags; + ++ 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); + } + + vxdprintk(VXD_CBIT(net, 2), @@ -19212,13 +18011,16 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/inet.c linux-2.6.36.2-vs2.3. + ret = 1; + else { + struct nx_addr_v6 *ptr; ++ unsigned long irqflags; + ++ 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); + } + + vxdprintk(VXD_CBIT(net, 2), @@ -19305,42 +18107,45 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/inet.c linux-2.6.36.2-vs2.3. + return ret; +} + -+int ip_v4_find_src(struct net *net, struct nx_info *nxi, -+ struct rtable **rp, struct flowi *fl) ++struct rtable *ip_v4_find_src(struct net *net, struct nx_info *nxi, ++ struct flowi4 *fl4) +{ ++ struct rtable *rt; ++ + if (!nxi) -+ return 0; ++ return NULL; + + /* FIXME: handle lback only case */ + if (!NX_IPV4(nxi)) -+ return -EPERM; ++ return ERR_PTR(-EPERM); + + vxdprintk(VXD_CBIT(net, 4), + "ip_v4_find_src(%p[#%u]) " NIPQUAD_FMT " -> " NIPQUAD_FMT, + nxi, nxi ? nxi->nx_id : 0, -+ NIPQUAD(fl->fl4_src), NIPQUAD(fl->fl4_dst)); ++ NIPQUAD(fl4->saddr), NIPQUAD(fl4->daddr)); + + /* single IP is unconditional */ + if (nx_info_flags(nxi, NXF_SINGLE_IP, 0) && -+ (fl->fl4_src == INADDR_ANY)) -+ fl->fl4_src = nxi->v4.ip[0].s_addr; ++ (fl4->saddr == INADDR_ANY)) ++ fl4->saddr = nxi->v4.ip[0].s_addr; + -+ if (fl->fl4_src == INADDR_ANY) { ++ if (fl4->saddr == INADDR_ANY) { + struct nx_addr_v4 *ptr; + __be32 found = 0; -+ int err; + -+ err = __ip_route_output_key(net, rp, fl); -+ if (!err) { -+ found = (*rp)->rt_src; -+ ip_rt_put(*rp); ++ 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, fl->oif, NIPQUAD(found)); ++ 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; @@ -19353,47 +18158,49 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/inet.c linux-2.6.36.2-vs2.3. + if ((found & mask) != neta) + continue; + -+ fl->fl4_src = primary; -+ err = __ip_route_output_key(net, rp, fl); ++ 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, fl->oif, NIPQUAD(primary)); -+ if (!err) { -+ found = (*rp)->rt_src; -+ ip_rt_put(*rp); ++ 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; ++ goto found_unlock; + } + } + /* still no source ip? */ -+ found = ipv4_is_loopback(fl->fl4_dst) ++ 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 */ -+ fl->fl4_src = found; ++ fl4->saddr = found; + + } else { -+ if (!v4_addr_in_nx_info(nxi, fl->fl4_src, NXA_MASK_BIND)) -+ return -EPERM; ++ 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(fl->fl4_dst)) -+ fl->fl4_dst = nxi->v4_lback.s_addr; -+ if (ipv4_is_loopback(fl->fl4_src)) -+ fl->fl4_src = nxi->v4_lback.s_addr; -+ } else if (ipv4_is_loopback(fl->fl4_dst) && ++ 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 -EPERM; ++ return ERR_PTR(-EPERM); + -+ return 0; ++ return NULL; +} + +EXPORT_SYMBOL_GPL(ip_v4_find_src); + -diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/init.c linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/init.c ---- linux-2.6.36.2/kernel/vserver/init.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/init.c 2010-10-21 13:09:36.000000000 +0200 +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/init.c @@ -19440,10 +18247,10 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/init.c linux-2.6.36.2-vs2.3. +module_init(init_vserver); +module_exit(exit_vserver); + -diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/inode.c linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/inode.c ---- linux-2.6.36.2/kernel/vserver/inode.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/inode.c 2010-10-21 17:40:44.000000000 +0200 -@@ -0,0 +1,435 @@ +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 + * @@ -19464,240 +18271,80 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/inode.c linux-2.6.36.2-vs2.3 +#include +#include +#include ++#include ++#include +#include +#include +#include +#include + -+#include -+ -+ -+static int __vc_get_iattr(struct inode *in, uint32_t *tag, uint32_t *flags, uint32_t *mask) -+{ -+ struct proc_dir_entry *entry; -+ -+ 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; -+ -+ if (S_ISDIR(in->i_mode)) -+ *mask |= IATTR_BARRIER; -+ -+ if (IS_TAGGED(in)) { -+ *tag = in->i_tag; -+ *mask |= IATTR_TAG; -+ } -+ -+ switch (in->i_sb->s_magic) { -+ case PROC_SUPER_MAGIC: -+ entry = PROC_I(in)->pde; -+ -+ /* 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; -+ -+ case DEVPTS_SUPER_MAGIC: -+ *tag = in->i_tag; -+ *mask |= IATTR_TAG; -+ break; -+ -+ default: -+ break; -+ } -+ return 0; -+} -+ -+int vc_get_iattr(void __user *data) -+{ -+ struct path path; -+ struct vcmd_ctx_iattr_v1 vc_data = { .tag = -1 }; -+ 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); -+ } -+ if (ret) -+ return ret; -+ -+ if (copy_to_user(data, &vc_data, sizeof(vc_data))) -+ ret = -EFAULT; -+ return ret; -+} -+ -+#ifdef CONFIG_COMPAT -+ -+int vc_get_iattr_x32(void __user *data) -+{ -+ struct path path; -+ struct vcmd_ctx_iattr_v1_x32 vc_data = { .tag = -1 }; -+ 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); -+ } -+ if (ret) -+ return ret; -+ -+ if (copy_to_user(data, &vc_data, sizeof(vc_data))) -+ ret = -EFAULT; -+ return ret; -+} -+ -+#endif /* CONFIG_COMPAT */ -+ -+ -+int vc_fget_iattr(uint32_t fd, void __user *data) -+{ -+ struct file *filp; -+ struct vcmd_ctx_fiattr_v0 vc_data = { .tag = -1 }; -+ int ret; -+ -+ 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; -+ -+ ret = __vc_get_iattr(filp->f_dentry->d_inode, -+ &vc_data.tag, &vc_data.flags, &vc_data.mask); -+ -+ fput(filp); -+ -+ if (copy_to_user(data, &vc_data, sizeof(vc_data))) -+ ret = -EFAULT; -+ return ret; -+} ++#include ++#include <../../fs/proc/internal.h> + + -+static int __vc_set_iattr(struct dentry *de, uint32_t *tag, uint32_t *flags, uint32_t *mask) ++static int __vc_get_iattr(struct inode *in, 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 }; ++ struct proc_dir_entry *entry; + + if (!in || !in->i_sb) + return -ESRCH; + -+ is_proc = (in->i_sb->s_magic == PROC_SUPER_MAGIC); -+ if ((*mask & IATTR_FLAGS) && !is_proc) -+ return -EINVAL; ++ *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; + -+ has_tag = IS_TAGGED(in) || -+ (in->i_sb->s_magic == DEVPTS_SUPER_MAGIC); -+ if ((*mask & IATTR_TAG) && !has_tag) -+ return -EINVAL; ++ if (S_ISDIR(in->i_mode)) ++ *mask |= IATTR_BARRIER; + -+ mutex_lock(&in->i_mutex); -+ if (*mask & IATTR_TAG) { -+ attr.ia_tag = *tag; -+ attr.ia_valid |= ATTR_TAG; ++ if (IS_TAGGED(in)) { ++ *tag = i_tag_read(in); ++ *mask |= IATTR_TAG; + } + -+ if (*mask & IATTR_FLAGS) { -+ struct proc_dir_entry *entry = PROC_I(in)->pde; -+ unsigned int iflags = PROC_I(in)->vx_flags; ++ switch (in->i_sb->s_magic) { ++ case PROC_SUPER_MAGIC: ++ entry = PROC_I(in)->pde; + -+ iflags = (iflags & ~(*mask & IATTR_FLAGS)) -+ | (*flags & IATTR_FLAGS); -+ PROC_I(in)->vx_flags = iflags; ++ /* check for specific inodes? */ + if (entry) -+ entry->vx_flags = iflags; -+ } -+ -+ if (*mask & (IATTR_IMMUTABLE | IATTR_IXUNLINK | -+ IATTR_BARRIER | IATTR_COW)) { -+ int iflags = in->i_flags; -+ int vflags = in->i_vflags; ++ *mask |= IATTR_FLAGS; ++ if (entry) ++ *flags |= (entry->vx_flags & IATTR_FLAGS); ++ else ++ *flags |= (PROC_I(in)->vx_flags & IATTR_FLAGS); ++ break; + -+ 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; -+ } -+ } ++ case DEVPTS_SUPER_MAGIC: ++ *tag = i_tag_read(in); ++ *mask |= IATTR_TAG; ++ break; + -+ 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); -+ } -+ } ++ default: ++ break; + } -+ -+out: -+ mutex_unlock(&in->i_mutex); -+ return error; ++ return 0; +} + -+int vc_set_iattr(void __user *data) ++int vc_get_iattr(void __user *data) +{ + struct path path; -+ struct vcmd_ctx_iattr_v1 vc_data; ++ struct vcmd_ctx_iattr_v1 vc_data = { .tag = -1 }; + 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, ++ ret = __vc_get_iattr(path.dentry->d_inode, + &vc_data.tag, &vc_data.flags, &vc_data.mask); + path_put(&path); + } ++ if (ret) ++ return ret; + + if (copy_to_user(data, &vc_data, sizeof(vc_data))) + ret = -EFAULT; @@ -19706,23 +18353,23 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/inode.c linux-2.6.36.2-vs2.3 + +#ifdef CONFIG_COMPAT + -+int vc_set_iattr_x32(void __user *data) ++int vc_get_iattr_x32(void __user *data) +{ + struct path path; -+ struct vcmd_ctx_iattr_v1_x32 vc_data; ++ struct vcmd_ctx_iattr_v1_x32 vc_data = { .tag = -1 }; + 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, ++ ret = __vc_get_iattr(path.dentry->d_inode, + &vc_data.tag, &vc_data.flags, &vc_data.mask); + path_put(&path); + } ++ if (ret) ++ return ret; + + if (copy_to_user(data, &vc_data, sizeof(vc_data))) + ret = -EFAULT; @@ -19731,14 +18378,13 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/inode.c linux-2.6.36.2-vs2.3 + +#endif /* CONFIG_COMPAT */ + -+int vc_fset_iattr(uint32_t fd, void __user *data) ++ ++int vc_fget_iattr(uint32_t fd, void __user *data) +{ + struct file *filp; -+ struct vcmd_ctx_fiattr_v0 vc_data; ++ struct vcmd_ctx_fiattr_v0 vc_data = { .tag = -1 }; + int ret; + -+ if (!capable(CAP_LINUX_IMMUTABLE)) -+ return -EPERM; + if (copy_from_user(&vc_data, data, sizeof(vc_data))) + return -EFAULT; + @@ -19746,412 +18392,309 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/inode.c linux-2.6.36.2-vs2.3 + 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); ++ ret = __vc_get_iattr(filp->f_dentry->d_inode, ++ &vc_data.tag, &vc_data.flags, &vc_data.mask); + + fput(filp); + + if (copy_to_user(data, &vc_data, sizeof(vc_data))) -+ return -EFAULT; ++ ret = -EFAULT; + return ret; +} + + -+enum { Opt_notagcheck, Opt_tag, Opt_notag, Opt_tagid, Opt_err }; -+ -+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} -+}; -+ -+ -+static void __dx_parse_remove(char *string, char *opt) -+{ -+ char *p = strstr(string, opt); -+ char *q = p; -+ -+ if (p) { -+ while (*q != '\0' && *q != ',') -+ q++; -+ while (*q) -+ *p++ = *q++; -+ while (*p) -+ *p++ = '\0'; -+ } -+} -+ -+int dx_parse_tag(char *string, tag_t *tag, int remove, int *mnt_flags, -+ unsigned long *flags) -+{ -+ int set = 0; -+ substring_t args[MAX_OPT_ARGS]; -+ int token, option = 0; -+ char *s, *p, *opts; -+ -+ if (!string) -+ return 0; -+ s = kstrdup(string, GFP_KERNEL | GFP_ATOMIC); -+ if (!s) -+ return 0; -+ -+ opts = s; -+ while ((p = strsep(&opts, ",")) != NULL) { -+ token = match_token(p, tokens, args); -+ -+ vxdprintk(VXD_CBIT(tag, 7), -+ "dx_parse_tag(" VS_Q("%s") "): %d:#%d", -+ p, token, option); -+ -+ 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 -+ case Opt_notagcheck: -+ if (remove) -+ __dx_parse_remove(s, "notagcheck"); -+ *flags |= MS_NOTAGCHECK; -+ set |= MS_NOTAGCHECK; -+ break; -+ } -+ } -+ if (set) -+ strcpy(string, s); -+ kfree(s); -+ return set; -+} -+ -+#ifdef CONFIG_PROPAGATE -+ -+void __dx_propagate_tag(struct nameidata *nd, struct inode *inode) ++static int __vc_set_iattr(struct dentry *de, uint32_t *tag, uint32_t *flags, uint32_t *mask) +{ -+ tag_t new_tag = 0; -+ struct vfsmount *mnt; -+ int propagate; -+ -+ if (!nd) -+ return; -+ mnt = nd->path.mnt; -+ if (!mnt) -+ return; -+ -+ propagate = (mnt->mnt_flags & MNT_TAGID); -+ if (propagate) -+ new_tag = mnt->mnt_tag; -+ -+ 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 (propagate) -+ inode->i_tag = new_tag; -+} -+ -+#include -+ -+EXPORT_SYMBOL_GPL(__dx_propagate_tag); ++ struct inode *in = de->d_inode; ++ int error = 0, is_proc = 0, has_tag = 0; ++ struct iattr attr = { 0 }; + -+#endif /* CONFIG_PROPAGATE */ ++ if (!in || !in->i_sb) ++ return -ESRCH; + -diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/Kconfig linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/Kconfig ---- linux-2.6.36.2/kernel/vserver/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/Kconfig 2010-10-21 21:49:28.000000000 +0200 -@@ -0,0 +1,265 @@ -+# -+# Linux VServer configuration -+# ++ is_proc = (in->i_sb->s_magic == PROC_SUPER_MAGIC); ++ if ((*mask & IATTR_FLAGS) && !is_proc) ++ return -EINVAL; + -+menu "Linux VServer" ++ has_tag = IS_TAGGED(in) || ++ (in->i_sb->s_magic == DEVPTS_SUPER_MAGIC); ++ if ((*mask & IATTR_TAG) && !has_tag) ++ return -EINVAL; + -+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. ++ mutex_lock(&in->i_mutex); ++ if (*mask & IATTR_TAG) { ++ attr.ia_tag = make_ktag(&init_user_ns, *tag); ++ attr.ia_valid |= ATTR_TAG; ++ } + -+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. ++ if (*mask & IATTR_FLAGS) { ++ struct proc_dir_entry *entry = PROC_I(in)->pde; ++ unsigned int iflags = PROC_I(in)->vx_flags; + -+ (note: such guests do not allow to change the ip -+ on the fly and do not show loopback addresses) ++ iflags = (iflags & ~(*mask & IATTR_FLAGS)) ++ | (*flags & IATTR_FLAGS); ++ PROC_I(in)->vx_flags = iflags; ++ if (entry) ++ entry->vx_flags = iflags; ++ } + -+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) ++ if (*mask & (IATTR_IMMUTABLE | IATTR_IXUNLINK | ++ IATTR_BARRIER | IATTR_COW)) { ++ int iflags = in->i_flags; ++ int vflags = in->i_vflags; + -+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. ++ 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; ++ } ++ } + -+config VSERVER_DEVICE -+ bool "Enable Guest Device Mapping" -+ depends on EXPERIMENTAL -+ default n -+ help -+ This enables generic device remapping. ++ 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); ++ } ++ } ++ } + -+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. ++out: ++ mutex_unlock(&in->i_mutex); ++ return error; ++} + -+ (note: on 1.2x the entries were visible by default) ++int vc_set_iattr(void __user *data) ++{ ++ struct path path; ++ struct vcmd_ctx_iattr_v1 vc_data; ++ int ret; + -+config VSERVER_HARDCPU -+ bool "Enable Hard CPU Limits" -+ default y -+ help -+ Activate the Hard CPU Limits ++ if (!capable(CAP_LINUX_IMMUTABLE)) ++ return -EPERM; ++ if (copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; + -+ This will compile in code that allows the Token Bucket -+ Scheduler to put processes on hold when a context's -+ tokens are depleted (provided that its per-context -+ sched_hard flag is set). ++ 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); ++ } + -+ Processes belonging to that context will not be able -+ to consume CPU resources again until a per-context -+ configured minimum of tokens has been reached. ++ if (copy_to_user(data, &vc_data, sizeof(vc_data))) ++ ret = -EFAULT; ++ return ret; ++} + -+config VSERVER_IDLETIME -+ bool "Avoid idle CPUs by skipping Time" -+ depends on VSERVER_HARDCPU -+ default y -+ help -+ This option allows the scheduler to artificially -+ advance time (per cpu) when otherwise the idle -+ task would be scheduled, thus keeping the cpu -+ busy and sharing the available resources among -+ certain contexts. -+ -+config VSERVER_IDLELIMIT -+ bool "Limit the IDLE task" -+ depends on VSERVER_HARDCPU -+ default n -+ help -+ Limit the idle slices, so the the next context -+ will be scheduled as soon as possible. ++#ifdef CONFIG_COMPAT + -+ This might improve interactivity and latency, but -+ will also marginally increase scheduling overhead. ++int vc_set_iattr_x32(void __user *data) ++{ ++ struct path path; ++ struct vcmd_ctx_iattr_v1_x32 vc_data; ++ int ret; + -+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. ++ 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); ++ } + -+config TAGGING_NONE -+ bool "Disabled" -+ help -+ do not store per-context information in inodes. ++ if (copy_to_user(data, &vc_data, sizeof(vc_data))) ++ ret = -EFAULT; ++ return ret; ++} + -+config TAGGING_UID16 -+ bool "UID16/GID32" -+ help -+ reduces UID to 16 bit, but leaves GID at 32 bit. ++#endif /* CONFIG_COMPAT */ + -+config TAGGING_GID16 -+ bool "UID32/GID16" -+ help -+ reduces GID to 16 bit, but leaves UID at 32 bit. ++int vc_fset_iattr(uint32_t fd, void __user *data) ++{ ++ struct file *filp; ++ struct vcmd_ctx_fiattr_v0 vc_data; ++ int ret; + -+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. ++ if (!capable(CAP_LINUX_IMMUTABLE)) ++ return -EPERM; ++ if (copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; + -+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) ++ filp = fget(fd); ++ if (!filp || !filp->f_dentry || !filp->f_dentry->d_inode) ++ return -EBADF; + -+endchoice ++ ret = __vc_set_iattr(filp->f_dentry, &vc_data.tag, ++ &vc_data.flags, &vc_data.mask); + -+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) ++ fput(filp); + -+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. ++ if (copy_to_user(data, &vc_data, sizeof(vc_data))) ++ return -EFAULT; ++ return ret; ++} + -+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. ++enum { Opt_notagcheck, Opt_tag, Opt_notag, Opt_tagid, Opt_err }; + -+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. ++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} ++}; + -+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. + -+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. ++static void __dx_parse_remove(char *string, char *opt) ++{ ++ char *p = strstr(string, opt); ++ char *q = p; + -+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. ++ if (p) { ++ while (*q != '\0' && *q != ',') ++ q++; ++ while (*q) ++ *p++ = *q++; ++ while (*p) ++ *p++ = '\0'; ++ } ++} + -+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. ++int dx_parse_tag(char *string, vtag_t *tag, int remove, int *mnt_flags, ++ unsigned long *flags) ++{ ++ 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 + -+config VSERVER_LEGACY_MEM -+ bool "Legacy Memory Limits" -+ default n -+ help -+ This provides fake memory limits to keep -+ older tools happy in the face of memory -+ cgroups ++ if (!string) ++ return 0; ++ s = kstrdup(string, GFP_KERNEL | GFP_ATOMIC); ++ if (!s) ++ return 0; + -+choice -+ prompt "Quotes used in debug and warn messages" -+ default QUOTES_ISO8859 ++ opts = s; ++ while ((p = strsep(&opts, ",")) != NULL) { ++ token = match_token(p, tokens, args); + -+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. ++ 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); ++ } ++ if (set) ++ strcpy(string, s); ++ kfree(s); ++ return set; ++} + -+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. ++#ifdef CONFIG_PROPAGATE + -+config QUOTES_ASCII -+ bool "ASCII single quotes" -+ help -+ This uses the ASCII single quote character -+ (\x27) to quote file and process names. ++void __dx_propagate_tag(struct nameidata *nd, struct inode *inode) ++{ ++ vtag_t new_tag = 0; ++ struct vfsmount *mnt; ++ int propagate; + -+endchoice ++ if (!nd) ++ return; ++ mnt = nd->path.mnt; ++ if (!mnt) ++ return; + -+endmenu ++ propagate = (mnt->mnt_flags & MNT_TAGID); ++ if (propagate) ++ new_tag = mnt->mnt_tag; ++ ++ 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 (propagate) ++ i_tag_write(inode, new_tag); ++} + -+config VSERVER -+ bool -+ default y -+ select NAMESPACES -+ select UTS_NS -+ select IPC_NS -+ select USER_NS -+ select SYSVIPC ++#include + -+config VSERVER_SECURITY -+ bool -+ depends on SECURITY -+ default y -+ select SECURITY_CAPABILITIES ++EXPORT_SYMBOL_GPL(__dx_propagate_tag); ++ ++#endif /* CONFIG_PROPAGATE */ + -diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/limit.c linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/limit.c ---- linux-2.6.36.2/kernel/vserver/limit.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/limit.c 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,354 @@ +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 + * @@ -20177,10 +18720,6 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/limit.c linux-2.6.36.2-vs2.3 + + +const char *vlimit_name[NUM_LIMITS] = { -+#ifdef CONFIG_VSERVER_LEGACY_MEM -+ [RLIMIT_RSS] = "RSS", -+ [RLIMIT_AS] = "VM", -+#endif /* CONFIG_VSERVER_LEGACY_MEM */ + [RLIMIT_CPU] = "CPU", + [RLIMIT_NPROC] = "NPROC", + [RLIMIT_NOFILE] = "NOFILE", @@ -20202,15 +18741,8 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/limit.c linux-2.6.36.2-vs2.3 + /* minimum */ + 0 + , /* softlimit */ -+#ifdef CONFIG_VSERVER_LEGACY_MEM -+ MASK_ENTRY( RLIMIT_RSS ) | -+#endif /* CONFIG_VSERVER_LEGACY_MEM */ + 0 + , /* maximum */ -+#ifdef CONFIG_VSERVER_LEGACY_MEM -+ MASK_ENTRY( RLIMIT_RSS ) | -+ MASK_ENTRY( RLIMIT_AS ) | -+#endif /* CONFIG_VSERVER_LEGACY_MEM */ + MASK_ENTRY( RLIMIT_NPROC ) | + MASK_ENTRY( RLIMIT_NOFILE ) | + MASK_ENTRY( RLIMIT_LOCKS ) | @@ -20422,93 +18954,95 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/limit.c linux-2.6.36.2-vs2.3 + +void vx_vsi_meminfo(struct sysinfo *val) +{ -+#ifdef CONFIG_CGROUP_MEM_RES_CTLR -+ struct mem_cgroup *mcg = mem_cgroup_from_task(current); ++#ifdef CONFIG_MEMCG ++ struct mem_cgroup *mcg; + u64 res_limit, res_usage; + ++ rcu_read_lock(); ++ mcg = mem_cgroup_from_task(current); ++ rcu_read_unlock(); + if (!mcg) -+ return; ++ goto out; + + res_limit = mem_cgroup_res_read_u64(mcg, RES_LIMIT); + res_usage = mem_cgroup_res_read_u64(mcg, RES_USAGE); + -+ if (res_limit != RESOURCE_MAX) ++ 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; -+#endif /* CONFIG_CGROUP_MEM_RES_CTLR */ ++out: ++#endif /* CONFIG_MEMCG */ + return; +} + +void vx_vsi_swapinfo(struct sysinfo *val) +{ -+#ifdef CONFIG_CGROUP_MEM_RES_CTLR -+#ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP -+ struct mem_cgroup *mcg = mem_cgroup_from_task(current); ++#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) -+ return; ++ goto out; + + 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); + -+ if (res_limit == RESOURCE_MAX) -+ return; ++ /* memory unlimited */ ++ if (res_limit == RES_COUNTER_MAX) ++ goto out; + + swap_limit = memsw_limit - res_limit; -+ if (memsw_limit != RESOURCE_MAX) ++ /* we have a swap limit? */ ++ if (memsw_limit != RES_COUNTER_MAX) + val->totalswap = swap_limit >> PAGE_SHIFT; + -+ swap_usage = memsw_usage - res_usage; ++ /* calculate swap part */ ++ swap_usage = (memsw_usage > res_usage) ? ++ memsw_usage - res_usage : 0; ++ ++ /* total shown minus usage gives free swap */ + val->freeswap = (swap_usage < swap_limit) ? + val->totalswap - (swap_usage >> PAGE_SHIFT) : 0; -+#else /* !CONFIG_CGROUP_MEM_RES_CTLR_SWAP */ ++out: ++#else /* !CONFIG_MEMCG_SWAP */ + val->totalswap = 0; + val->freeswap = 0; -+#endif /* !CONFIG_CGROUP_MEM_RES_CTLR_SWAP */ -+#endif /* CONFIG_CGROUP_MEM_RES_CTLR */ ++#endif /* !CONFIG_MEMCG_SWAP */ ++#endif /* CONFIG_MEMCG */ + return; +} + +long vx_vsi_cached(struct sysinfo *val) +{ -+#ifdef CONFIG_CGROUP_MEM_RES_CTLR -+ struct mem_cgroup *mcg = mem_cgroup_from_task(current); ++ long cache = 0; ++#ifdef CONFIG_MEMCG ++ struct mem_cgroup *mcg; + -+ return mem_cgroup_stat_read_cache(mcg); -+#else -+ return 0; -+#endif -+} -+ -+ -+unsigned long vx_badness(struct task_struct *task, struct mm_struct *mm) -+{ -+ struct vx_info *vxi = mm->mm_vx_info; -+ unsigned long points; -+ rlim_t v, w; -+ -+ if (!vxi) -+ return 0; -+ -+ points = vxi->vx_badness_bias; -+ -+ v = __vx_cres_array_fixup(&vxi->limit, VLA_RSS); -+ w = __rlim_soft(&vxi->limit, RLIMIT_RSS); -+ points += (v > w) ? (v - w) : 0; ++ rcu_read_lock(); ++ mcg = mem_cgroup_from_task(current); ++ rcu_read_unlock(); ++ if (!mcg) ++ goto out; + -+ return points; ++ cache = mem_cgroup_stat_read_cache(mcg); ++out: ++#endif ++ return cache; +} + -diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/limit_init.h linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/limit_init.h ---- linux-2.6.36.2/kernel/vserver/limit_init.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/limit_init.h 2010-10-21 13:09:36.000000000 +0200 +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 @@ + + @@ -20541,9 +19075,9 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/limit_init.h linux-2.6.36.2- + } +} + -diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/limit_proc.h linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/limit_proc.h ---- linux-2.6.36.2/kernel/vserver/limit_proc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/limit_proc.h 2010-10-21 13:09:36.000000000 +0200 +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 @@ -20602,32 +19136,10 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/limit_proc.h linux-2.6.36.2- +#endif /* _VX_LIMIT_PROC_H */ + + -diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/Makefile linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/Makefile ---- linux-2.6.36.2/kernel/vserver/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/Makefile 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,18 @@ -+# -+# Makefile for the Linux vserver routines. -+# -+ -+ -+obj-y += vserver.o -+ -+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 -+ -+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-2.6.36.2/kernel/vserver/network.c linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/network.c ---- linux-2.6.36.2/kernel/vserver/network.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/network.c 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,864 @@ +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 + * @@ -20648,6 +19160,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/network.c linux-2.6.36.2-vs2 +#include +#include +#include ++#include + +#include +#include @@ -20745,7 +19258,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/network.c linux-2.6.36.2-vs2 + * allocate an initialized nx_info struct + * doesn't make it visible (hash) */ + -+static struct nx_info *__alloc_nx_info(nid_t nid) ++static struct nx_info *__alloc_nx_info(vnid_t nid) +{ + struct nx_info *new = NULL; + @@ -20761,6 +19274,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/network.c linux-2.6.36.2-vs2 + 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; + + new->nx_flags = NXF_INIT_SET; @@ -20792,6 +19306,9 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/network.c linux-2.6.36.2-vs2 + 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); @@ -20839,10 +19356,10 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/network.c linux-2.6.36.2-vs2 + +struct hlist_head nx_info_hash[NX_HASH_SIZE]; + -+static spinlock_t nx_info_hash_lock = SPIN_LOCK_UNLOCKED; ++static DEFINE_SPINLOCK(nx_info_hash_lock); + + -+static inline unsigned int __hashval(nid_t nid) ++static inline unsigned int __hashval(vnid_t nid) +{ + return (nid % NX_HASH_SIZE); +} @@ -20899,7 +19416,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/network.c linux-2.6.36.2-vs2 + * requires the hash_lock to be held + * doesn't increment the nx_refcnt */ + -+static inline struct nx_info *__lookup_nx_info(nid_t nid) ++static inline struct nx_info *__lookup_nx_info(vnid_t nid) +{ + struct hlist_head *head = &nx_info_hash[__hashval(nid)]; + struct hlist_node *pos; @@ -20999,7 +19516,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/network.c linux-2.6.36.2-vs2 + + * verify that nid is still hashed */ + -+int nid_is_hashed(nid_t nid) ++int nid_is_hashed(vnid_t nid) +{ + int hashed; + @@ -21143,15 +19660,15 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/network.c linux-2.6.36.2-vs2 + +int vc_task_nid(uint32_t id) +{ -+ nid_t nid; ++ vnid_t nid; + + if (id) { + struct task_struct *tsk; + -+ read_lock(&tasklist_lock); ++ rcu_read_lock(); + tsk = find_task_by_real_pid(id); + nid = (tsk) ? tsk->nid : -ESRCH; -+ read_unlock(&tasklist_lock); ++ rcu_read_unlock(); + } else + nid = nx_current_nid(); + return nid; @@ -21218,32 +19735,108 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/network.c linux-2.6.36.2-vs2 +} + + ++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 nx_addr_v4 *nxa = &nxi->v4; ++ ++ 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; ++ } ++ return NULL; ++} + +int do_add_v4_addr(struct nx_info *nxi, __be32 ip, __be32 ip2, __be32 mask, + uint16_t type, uint16_t flags) +{ -+ struct nx_addr_v4 *nxa = &nxi->v4; ++ struct nx_addr_v4 *nxa = NULL; ++ struct nx_addr_v4 *new = __alloc_nx_addr_v4(); ++ unsigned long irqflags; ++ int ret = -EEXIST; ++ ++ 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)) { -+ /* locate last entry */ -+ for (; nxa->next; nxa = nxa->next); -+ nxa->next = __alloc_nx_addr_v4(); -+ nxa = nxa->next; ++ nxa->next = new; ++ nxa = new; ++ new = NULL; ++ ++ /* remove single ip for ip list */ ++ nxi->nx_flags &= ~NXF_SINGLE_IP; ++ } ++ ++ 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; ++} ++ ++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; ++ ++ case NXA_TYPE_ANY: ++ nxa = &nxi->v4; ++ old = nxa->next; ++ memset(nxa, 0, sizeof(*nxa)); ++ break; + -+ if (IS_ERR(nxa)) -+ return PTR_ERR(nxa); ++ default: ++ ret = -EINVAL; + } -+ -+ if (nxi->v4.next) -+ /* remove single ip for ip list */ -+ nxi->nx_flags &= ~NXF_SINGLE_IP; -+ -+ nxa->ip[0].s_addr = ip; -+ nxa->ip[1].s_addr = ip2; -+ nxa->mask.s_addr = mask; -+ nxa->type = type; -+ nxa->flags = flags; -+ return 0; ++ spin_unlock_irqrestore(&nxi->addr_lock, irqflags); ++ __dealloc_nx_addr_v4_all(old); ++ return ret; +} + + @@ -21297,10 +19890,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/network.c linux-2.6.36.2-vs2 + + 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; -+ ++ return do_remove_v4_addr(nxi, 0, 0, 0, vc_data.type, 0); + default: + return -EINVAL; + } @@ -21308,7 +19898,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/network.c linux-2.6.36.2-vs2 +} + + -+int vc_net_add_ipv4(struct nx_info *nxi, void __user *data) ++int vc_net_add_ipv4_v1(struct nx_info *nxi, void __user *data) +{ + struct vcmd_net_addr_ipv4_v1 vc_data; + @@ -21317,7 +19907,6 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/network.c linux-2.6.36.2-vs2 + + switch (vc_data.type) { + case NXA_TYPE_ADDR: -+ case NXA_TYPE_RANGE: + 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); @@ -21336,20 +19925,26 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/network.c linux-2.6.36.2-vs2 + return 0; +} + -+int vc_net_remove_ipv4(struct nx_info *nxi, void __user *data) ++int vc_net_add_ipv4(struct nx_info *nxi, void __user *data) +{ -+ struct vcmd_net_addr_ipv4_v1 vc_data; ++ 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: -+ break; */ ++ 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_ANY: -+ __dealloc_nx_addr_v4_all(xchg(&nxi->v4.next, NULL)); -+ memset(&nxi->v4, 0, sizeof(nxi->v4)); ++ 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; + + default: @@ -21358,23 +19953,74 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/network.c linux-2.6.36.2-vs2 + 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; ++ ++ return do_remove_v4_addr(nxi, vc_data.ip.s_addr, 0, ++ vc_data.mask.s_addr, vc_data.type, vc_data.flags); ++} ++ ++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; ++ ++ 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); ++} + +#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 nx_addr_v6 *nxa = &nxi->v6; ++ ++ 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; ++} ++ ++ +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; ++ struct nx_addr_v6 *nxa = NULL; ++ struct nx_addr_v6 *new = __alloc_nx_addr_v6(); ++ unsigned long irqflags; ++ int ret = -EEXIST; + -+ if (NX_IPV6(nxi)) { -+ /* locate last entry */ -+ for (; nxa->next; nxa = nxa->next); -+ nxa->next = __alloc_nx_addr_v6(); -+ nxa = nxa->next; ++ 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 (IS_ERR(nxa)) -+ return PTR_ERR(nxa); ++ if (NX_IPV6(nxi)) { ++ nxa->next = new; ++ nxa = new; ++ new = NULL; + } + + nxa->ip = *ip; @@ -21382,9 +20028,59 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/network.c linux-2.6.36.2-vs2 + nxa->prefix = prefix; + nxa->type = type; + nxa->flags = flags; -+ return 0; ++ ret = 0; ++out_unlock: ++ spin_unlock_irqrestore(&nxi->addr_lock, irqflags); ++ if (new) ++ __dealloc_nx_addr_v6(new); ++ return ret; +} + ++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 nx_addr_v6 *nxa = NULL; ++ struct nx_addr_v6 *old = NULL; ++ unsigned long irqflags; ++ int ret = 0; ++ ++ 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; ++ ++ case NXA_TYPE_ANY: ++ nxa = &nxi->v6; ++ old = nxa->next; ++ memset(nxa, 0, sizeof(*nxa)); ++ break; ++ ++ default: ++ ret = -EINVAL; ++ } ++ spin_unlock_irqrestore(&nxi->addr_lock, irqflags); ++ __dealloc_nx_addr_v6_all(old); ++ return ret; ++} + +int vc_net_add_ipv6(struct nx_info *nxi, void __user *data) +{ @@ -21395,6 +20091,8 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/network.c linux-2.6.36.2-vs2 + + 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); @@ -21412,11 +20110,14 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/network.c linux-2.6.36.2-vs2 + 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_remove_v6_addr(nxi, &vc_data.ip, &vc_data.mask, ++ vc_data.prefix, vc_data.type, vc_data.flags); + case NXA_TYPE_ANY: -+ __dealloc_nx_addr_v6_all(xchg(&nxi->v6.next, NULL)); -+ memset(&nxi->v6, 0, sizeof(nxi->v6)); -+ break; -+ ++ return do_remove_v6_addr(nxi, NULL, NULL, 0, vc_data.type, 0); + default: + return -EINVAL; + } @@ -21492,16 +20193,16 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/network.c linux-2.6.36.2-vs2 +EXPORT_SYMBOL_GPL(free_nx_info); +EXPORT_SYMBOL_GPL(unhash_nx_info); + -diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/proc.c linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/proc.c ---- linux-2.6.36.2/kernel/vserver/proc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/proc.c 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,1098 @@ +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/proc.c + * + * Virtual Context Support + * -+ * Copyright (C) 2003-2007 Herbert Pötzl ++ * Copyright (C) 2003-2011 Herbert Pötzl + * + * V0.01 basic structure + * V0.02 adaptation vs1.3.0 @@ -21511,12 +20212,14 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/proc.c linux-2.6.36.2-vs2.3. + * 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 @@ -21536,6 +20239,8 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/proc.c linux-2.6.36.2-vs2.3. +#include "sched_proc.h" +#include "vci_config.h" + ++#include <../../fs/proc/internal.h> ++ + +static inline char *print_cap_t(char *buffer, kernel_cap_t *c) +{ @@ -21630,9 +20335,13 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/proc.c linux-2.6.36.2-vs2.3. + + 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, -+ vxi->vx_nsmask[0], vxi->vx_nsmask[1]); ++ (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; +} + @@ -21656,12 +20365,12 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/proc.c linux-2.6.36.2-vs2.3. + +int proc_vxi_nsproxy0(struct vx_info *vxi, char *buffer) +{ -+ return vx_info_proc_nsproxy(vxi->vx_nsproxy[0], buffer); ++ return vx_info_proc_nsproxy(vxi->space[0].vx_nsproxy, buffer); +} + +int proc_vxi_nsproxy1(struct vx_info *vxi, char *buffer) +{ -+ return vx_info_proc_nsproxy(vxi->vx_nsproxy[1], buffer); ++ return vx_info_proc_nsproxy(vxi->space[1].vx_nsproxy, buffer); +} + +int proc_vxi_cvirt(struct vx_info *vxi, char *buffer) @@ -21775,14 +20484,14 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/proc.c linux-2.6.36.2-vs2.3. + if (p->fop) + inode->i_fop = p->fop; + -+ inode->i_nlink = (p->mode & S_IFDIR) ? 2 : 1; ++ 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; + -+ inode->i_uid = 0; -+ inode->i_gid = 0; -+ inode->i_tag = 0; ++ i_uid_write(inode, 0); ++ i_gid_write(inode, 0); ++ i_tag_write(inode, 0); +out: + return inode; +} @@ -21807,7 +20516,8 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/proc.c linux-2.6.36.2-vs2.3. + +/* Lookups */ + -+typedef struct dentry *instantiate_t(struct inode *, struct dentry *, int, void *); ++typedef struct dentry *vx_instantiate_t(struct inode *, struct dentry *, int, void *); ++ + +/* + * Fill a directory entry. @@ -21817,12 +20527,12 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/proc.c linux-2.6.36.2-vs2.3. + * + * 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 ++ * 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 proc_fill_cache(struct file *filp, void *dirent, filldir_t filldir, -+ char *name, int len, instantiate_t instantiate, int id, void *ptr) ++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; @@ -21856,10 +20566,8 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/proc.c linux-2.6.36.2-vs2.3. + 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); ++ return !dir_emit(ctx, name, len, ino, type); +} + + @@ -21872,10 +20580,13 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/proc.c linux-2.6.36.2-vs2.3. + return lookup_vx_info(PROC_I(inode)->fd); +} + -+static int proc_xid_revalidate(struct dentry *dentry, struct nameidata *nd) ++static int proc_xid_revalidate(struct dentry *dentry, unsigned int flags) +{ + struct inode *inode = dentry->d_inode; -+ xid_t xid = PROC_I(inode)->fd; ++ vxid_t xid = PROC_I(inode)->fd; ++ ++ if (flags & LOOKUP_RCU) /* FIXME: can be dropped? */ ++ return -ECHILD; + + if (!xid || xid_is_hashed(xid)) + return 1; @@ -21886,10 +20597,13 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/proc.c linux-2.6.36.2-vs2.3. + +/* get and revalidate nx_info/nid */ + -+static int proc_nid_revalidate(struct dentry *dentry, struct nameidata *nd) ++static int proc_nid_revalidate(struct dentry *dentry, unsigned int flags) +{ + struct inode *inode = dentry->d_inode; -+ nid_t nid = PROC_I(inode)->fd; ++ vnid_t nid = PROC_I(inode)->fd; ++ ++ if (flags & LOOKUP_RCU) /* FIXME: can be dropped? */ ++ return -ECHILD; + + if (!nid || nid_is_hashed(nid)) + return 1; @@ -21933,7 +20647,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/proc.c linux-2.6.36.2-vs2.3. +{ + struct inode *inode = file->f_dentry->d_inode; + struct vx_info *vxi = NULL; -+ xid_t xid = PROC_I(inode)->fd; ++ vxid_t xid = PROC_I(inode)->fd; + unsigned long page; + ssize_t length = 0; + @@ -21969,7 +20683,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/proc.c linux-2.6.36.2-vs2.3. +{ + struct inode *inode = file->f_dentry->d_inode; + struct nx_info *nxi = NULL; -+ nid_t nid = PROC_I(inode)->fd; ++ vnid_t nid = PROC_I(inode)->fd; + unsigned long page; + ssize_t length = 0; + @@ -22071,7 +20785,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/proc.c linux-2.6.36.2-vs2.3. +} + +static struct dentry *proc_xid_lookup(struct inode *dir, -+ struct dentry *dentry, struct nameidata *nd) ++ struct dentry *dentry, unsigned int flags) +{ + struct vs_entry *p = vx_base_stuff; + struct dentry *error = ERR_PTR(-ENOENT); @@ -22090,43 +20804,40 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/proc.c linux-2.6.36.2-vs2.3. + return error; +} + -+static int proc_xid_readdir(struct file *filp, -+ void *dirent, filldir_t filldir) ++static int proc_xid_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_base_stuff; + int size = sizeof(vx_base_stuff) / sizeof(struct vs_entry); -+ int pos, index; ++ int index; + u64 ino; + -+ pos = filp->f_pos; -+ switch (pos) { ++ switch (ctx->pos) { + case 0: + ino = inode->i_ino; -+ if (filldir(dirent, ".", 1, pos, ino, DT_DIR) < 0) ++ if (!dir_emit(ctx, ".", 1, ino, DT_DIR) < 0) + goto out; -+ pos++; ++ ctx->pos++; + /* fall through */ + case 1: + ino = parent_ino(dentry); -+ if (filldir(dirent, "..", 2, pos, ino, DT_DIR) < 0) ++ if (!dir_emit(ctx, "..", 2, ino, DT_DIR) < 0) + goto out; -+ pos++; ++ ctx->pos++; + /* fall through */ + default: -+ index = pos - 2; ++ index = ctx->pos - 2; + if (index >= size) + goto out; + for (p += index; p->name; p++) { -+ if (proc_fill_cache(filp, dirent, filldir, p->name, p->len, ++ if (vx_proc_fill_cache(filp, ctx, p->name, p->len, + vs_proc_instantiate, PROC_I(inode)->fd, p)) + goto out; -+ pos++; ++ ctx->pos++; + } + } +out: -+ filp->f_pos = pos; + return 1; +} + @@ -22155,7 +20866,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/proc.c linux-2.6.36.2-vs2.3. +} + +static struct dentry *proc_nid_lookup(struct inode *dir, -+ struct dentry *dentry, struct nameidata *nd) ++ struct dentry *dentry, unsigned int flags) +{ + struct vs_entry *p = nx_base_stuff; + struct dentry *error = ERR_PTR(-ENOENT); @@ -22174,43 +20885,40 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/proc.c linux-2.6.36.2-vs2.3. + return error; +} + -+static int proc_nid_readdir(struct file *filp, -+ void *dirent, filldir_t filldir) ++static int proc_nid_iterate(struct file *filp, struct dir_context *ctx) +{ + 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; ++ int index; + u64 ino; + -+ pos = filp->f_pos; -+ switch (pos) { ++ switch (ctx->pos) { + case 0: + ino = inode->i_ino; -+ if (filldir(dirent, ".", 1, pos, ino, DT_DIR) < 0) ++ if (!dir_emit(ctx, ".", 1, ino, DT_DIR) < 0) + goto out; -+ pos++; ++ ctx->pos++; + /* fall through */ + case 1: + ino = parent_ino(dentry); -+ if (filldir(dirent, "..", 2, pos, ino, DT_DIR) < 0) ++ if (!dir_emit(ctx, "..", 2, ino, DT_DIR) < 0) + goto out; -+ pos++; ++ ctx->pos++; + /* fall through */ + default: -+ index = pos - 2; ++ index = ctx->pos - 2; + if (index >= size) + goto out; + for (p += index; p->name; p++) { -+ if (proc_fill_cache(filp, dirent, filldir, p->name, p->len, ++ if (vx_proc_fill_cache(filp, ctx, p->name, p->len, + vs_proc_instantiate, PROC_I(inode)->fd, p)) + goto out; -+ pos++; ++ ctx->pos++; + } + } +out: -+ filp->f_pos = pos; + return 1; +} + @@ -22242,7 +20950,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/proc.c linux-2.6.36.2-vs2.3. + +static struct file_operations proc_xid_file_operations = { + .read = generic_read_dir, -+ .readdir = proc_xid_readdir, ++ .iterate = proc_xid_iterate, +}; + +static struct inode_operations proc_xid_inode_operations = { @@ -22257,7 +20965,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/proc.c linux-2.6.36.2-vs2.3. + + +static struct dentry *proc_virtual_lookup(struct inode *dir, -+ struct dentry *dentry, struct nameidata *nd) ++ struct dentry *dentry, unsigned int flags) +{ + struct vs_entry *p = vx_virtual_stuff; + struct dentry *error = ERR_PTR(-ENOENT); @@ -22284,7 +20992,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/proc.c linux-2.6.36.2-vs2.3. + +static struct file_operations proc_nid_file_operations = { + .read = generic_read_dir, -+ .readdir = proc_nid_readdir, ++ .iterate = proc_nid_iterate, +}; + +static struct inode_operations proc_nid_inode_operations = { @@ -22299,7 +21007,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/proc.c linux-2.6.36.2-vs2.3. + + +static struct dentry *proc_virtnet_lookup(struct inode *dir, -+ struct dentry *dentry, struct nameidata *nd) ++ struct dentry *dentry, unsigned int flags) +{ + struct vs_entry *p = nx_virtnet_stuff; + struct dentry *error = ERR_PTR(-ENOENT); @@ -22327,45 +21035,43 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/proc.c linux-2.6.36.2-vs2.3. + +#define PROC_MAXVIDS 32 + -+int proc_virtual_readdir(struct file *filp, -+ void *dirent, filldir_t filldir) ++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 pos, index; ++ int index; + unsigned int xid_array[PROC_MAXVIDS]; + char buf[PROC_NUMBUF]; + unsigned int nr_xids, i; + u64 ino; + -+ pos = filp->f_pos; -+ switch (pos) { ++ switch (ctx->pos) { + case 0: + ino = inode->i_ino; -+ if (filldir(dirent, ".", 1, pos, ino, DT_DIR) < 0) ++ if (!dir_emit(ctx, ".", 1, ino, DT_DIR) < 0) + goto out; -+ pos++; ++ ctx->pos++; + /* fall through */ + case 1: + ino = parent_ino(dentry); -+ if (filldir(dirent, "..", 2, pos, ino, DT_DIR) < 0) ++ if (!dir_emit(ctx, "..", 2, ino, DT_DIR) < 0) + goto out; -+ pos++; ++ ctx->pos++; + /* fall through */ + default: -+ index = pos - 2; ++ index = ctx->pos - 2; + if (index >= size) + goto entries; + for (p += index; p->name; p++) { -+ if (proc_fill_cache(filp, dirent, filldir, p->name, p->len, ++ if (vx_proc_fill_cache(filp, ctx, p->name, p->len, + vs_proc_instantiate, 0, p)) + goto out; -+ pos++; ++ ctx->pos++; + } + entries: -+ index = pos - size; ++ 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++) { @@ -22377,15 +21083,14 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/proc.c linux-2.6.36.2-vs2.3. + buf[--j] = '0' + (n % 10); + while (n /= 10); + -+ if (proc_fill_cache(filp, dirent, filldir, ++ if (vx_proc_fill_cache(filp, ctx, + buf + j, PROC_NUMBUF - j, + vs_proc_instantiate, xid, p)) + goto out; -+ pos++; ++ ctx->pos++; + } + } +out: -+ filp->f_pos = pos; + return 0; +} + @@ -22401,7 +21106,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/proc.c linux-2.6.36.2-vs2.3. + +static struct file_operations proc_virtual_dir_operations = { + .read = generic_read_dir, -+ .readdir = proc_virtual_readdir, ++ .iterate = proc_virtual_iterate, +}; + +static struct inode_operations proc_virtual_dir_inode_operations = { @@ -22411,47 +21116,43 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/proc.c linux-2.6.36.2-vs2.3. + + + -+ -+ -+int proc_virtnet_readdir(struct file *filp, -+ void *dirent, filldir_t filldir) ++int proc_virtnet_iterate(struct file *filp, struct dir_context *ctx) +{ + 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; ++ int index; + unsigned int nid_array[PROC_MAXVIDS]; + char buf[PROC_NUMBUF]; + unsigned int nr_nids, i; + u64 ino; + -+ pos = filp->f_pos; -+ switch (pos) { ++ switch (ctx->pos) { + case 0: + ino = inode->i_ino; -+ if (filldir(dirent, ".", 1, pos, ino, DT_DIR) < 0) ++ if (!dir_emit(ctx, ".", 1, ino, DT_DIR) < 0) + goto out; -+ pos++; ++ ctx->pos++; + /* fall through */ + case 1: + ino = parent_ino(dentry); -+ if (filldir(dirent, "..", 2, pos, ino, DT_DIR) < 0) ++ if (!dir_emit(ctx, "..", 2, ino, DT_DIR) < 0) + goto out; -+ pos++; ++ ctx->pos++; + /* fall through */ + default: -+ index = pos - 2; ++ index = ctx->pos - 2; + if (index >= size) + goto entries; + for (p += index; p->name; p++) { -+ if (proc_fill_cache(filp, dirent, filldir, p->name, p->len, ++ if (vx_proc_fill_cache(filp, ctx, p->name, p->len, + vs_proc_instantiate, 0, p)) + goto out; -+ pos++; ++ ctx->pos++; + } + entries: -+ index = pos - size; ++ 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++) { @@ -22463,15 +21164,14 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/proc.c linux-2.6.36.2-vs2.3. + buf[--j] = '0' + (n % 10); + while (n /= 10); + -+ if (proc_fill_cache(filp, dirent, filldir, ++ if (vx_proc_fill_cache(filp, ctx, + buf + j, PROC_NUMBUF - j, + vs_proc_instantiate, nid, p)) + goto out; -+ pos++; ++ ctx->pos++; + } + } +out: -+ filp->f_pos = pos; + return 0; +} + @@ -22487,7 +21187,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/proc.c linux-2.6.36.2-vs2.3. + +static struct file_operations proc_virtnet_dir_operations = { + .read = generic_read_dir, -+ .readdir = proc_virtnet_readdir, ++ .iterate = proc_virtnet_iterate, +}; + +static struct inode_operations proc_virtnet_dir_inode_operations = { @@ -22521,83 +21221,86 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/proc.c linux-2.6.36.2-vs2.3. + +/* per pid info */ + ++void render_cap_t(struct seq_file *, const char *, ++ struct vx_info *, kernel_cap_t *); + -+int proc_pid_vx_info(struct task_struct *p, char *buffer) ++ ++int proc_pid_vx_info( ++ struct seq_file *m, ++ struct pid_namespace *ns, ++ struct pid *pid, ++ struct task_struct *p) +{ + struct vx_info *vxi; -+ char *orig = buffer; + -+ buffer += sprintf(buffer, "XID:\t%d\n", vx_task_xid(p)); ++ seq_printf(m, "XID:\t%d\n", vx_task_xid(p)); + + vxi = task_get_vx_info(p); + if (!vxi) -+ goto out; ++ return 0; + -+ buffer += sprintf(buffer, "BCaps:\t"); -+ buffer = print_cap_t(buffer, &vxi->vx_bcaps); -+ buffer += sprintf(buffer, "\n"); -+ buffer += sprintf(buffer, "CCaps:\t%016llx\n", ++ render_cap_t(m, "BCaps:\t", vxi, &vxi->vx_bcaps); ++ seq_printf(m, "CCaps:\t%016llx\n", + (unsigned long long)vxi->vx_ccaps); -+ buffer += sprintf(buffer, "CFlags:\t%016llx\n", ++ seq_printf(m, "CFlags:\t%016llx\n", + (unsigned long long)vxi->vx_flags); -+ buffer += sprintf(buffer, "CIPid:\t%d\n", vxi->vx_initpid); ++ seq_printf(m, "CIPid:\t%d\n", vxi->vx_initpid); + + put_vx_info(vxi); -+out: -+ return buffer - orig; ++ return 0; +} + + -+int proc_pid_nx_info(struct task_struct *p, char *buffer) ++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 -+ char *orig = buffer; + int i; + -+ buffer += sprintf(buffer, "NID:\t%d\n", nx_task_nid(p)); ++ seq_printf(m, "NID:\t%d\n", nx_task_nid(p)); + + nxi = task_get_nx_info(p); + if (!nxi) -+ goto out; ++ return 0; + -+ buffer += sprintf(buffer, "NCaps:\t%016llx\n", ++ seq_printf(m, "NCaps:\t%016llx\n", + (unsigned long long)nxi->nx_ncaps); -+ buffer += sprintf(buffer, "NFlags:\t%016llx\n", ++ seq_printf(m, "NFlags:\t%016llx\n", + (unsigned long long)nxi->nx_flags); + -+ buffer += sprintf(buffer, -+ "V4Root[bcast]:\t" NIPQUAD_FMT "\n", ++ seq_printf(m, "V4Root[bcast]:\t" NIPQUAD_FMT "\n", + NIPQUAD(nxi->v4_bcast.s_addr)); -+ buffer += sprintf (buffer, -+ "V4Root[lback]:\t" NIPQUAD_FMT "\n", ++ 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) -+ buffer += sprintf(buffer, "V4Root[%d]:\t" NXAV4_FMT "\n", ++ 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) -+ buffer += sprintf(buffer, "V6Root[%d]:\t" NXAV6_FMT "\n", ++ seq_printf(m, "V6Root[%d]:\t" NXAV6_FMT "\n", + i, NXAV6(v6a)); +skip_v6: +#endif + put_nx_info(nxi); -+out: -+ return buffer - orig; ++ return 0; +} + -diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/sched.c linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/sched.c ---- linux-2.6.36.2/kernel/vserver/sched.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/sched.c 2010-10-28 19:13:19.000000000 +0200 -@@ -0,0 +1,82 @@ +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 @@ +/* + * linux/kernel/vserver/sched.c + * @@ -22615,6 +21318,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/sched.c linux-2.6.36.2-vs2.3 + +#include +#include ++#include +#include + +#include @@ -22637,10 +21341,10 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/sched.c linux-2.6.36.2-vs2.3 + + if (data->cpu_id != ~0) { + vxi->sched.update = cpumask_of_cpu(data->cpu_id); -+ cpus_and(vxi->sched.update, cpu_online_map, -+ vxi->sched.update); ++ cpumask_and(&vxi->sched.update, &vxi->sched.update, ++ cpu_online_mask); + } else -+ vxi->sched.update = cpu_online_map; ++ cpumask_copy(&vxi->sched.update, cpu_online_mask); + + for_each_cpu_mask(cpu, vxi->sched.update) + vx_update_sched_param(&vxi->sched, @@ -22680,9 +21384,9 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/sched.c linux-2.6.36.2-vs2.3 + return 0; +} + -diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/sched_init.h linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/sched_init.h ---- linux-2.6.36.2/kernel/vserver/sched_init.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/sched_init.h 2010-10-28 18:17:11.000000000 +0200 +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 @@ + +static inline void vx_info_init_sched(struct _vx_sched *sched) @@ -22711,9 +21415,9 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/sched_init.h linux-2.6.36.2- +{ + return; +} -diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/sched_proc.h linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/sched_proc.h ---- linux-2.6.36.2/kernel/vserver/sched_proc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/sched_proc.h 2010-10-28 18:15:30.000000000 +0200 +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 @@ -22747,10 +21451,10 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/sched_proc.h linux-2.6.36.2- +} + +#endif /* _VX_SCHED_PROC_H */ -diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/signal.c linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/signal.c ---- linux-2.6.36.2/kernel/vserver/signal.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/signal.c 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,132 @@ +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/signal.c + * @@ -22810,7 +21514,9 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/signal.c linux-2.6.36.2-vs2. + } + /* 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); @@ -22883,10 +21589,10 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/signal.c linux-2.6.36.2-vs2. + return ret; +} + -diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/space.c linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/space.c ---- linux-2.6.36.2/kernel/vserver/space.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/space.c 2010-12-01 20:39:35.000000000 +0100 -@@ -0,0 +1,422 @@ +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 + * @@ -22928,23 +21634,36 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/space.c linux-2.6.36.2-vs2.3 +#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 ++#ifdef CONFIG_IPC_NS + CLONE_NEWIPC | ++#endif ++#ifdef CONFIG_USER_NS + CLONE_NEWUSER | ++#endif + 0 +}; + +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 @@ -22957,9 +21676,15 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/space.c linux-2.6.36.2-vs2.3 +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 | -+ CLONE_NEWUSER | ++#endif ++#ifdef CONFIG_USER_NS ++// CLONE_NEWUSER | ++#endif +#ifdef CONFIG_PID_NS +// CLONE_NEWPID | +#endif @@ -23017,10 +21742,10 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/space.c linux-2.6.36.2-vs2.3 + +#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); ++ 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 @@ -23080,6 +21805,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/space.c linux-2.6.36.2-vs2.3 +{ + 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)", @@ -23088,18 +21814,23 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/space.c linux-2.6.36.2-vs2.3 + if (vx_info_flags(vxi, VXF_INFO_PRIVATE, 0)) + return -EACCES; + ++ if (index >= VX_SPACES) ++ return -EINVAL; ++ ++ space = &vxi->space[index]; ++ + if (!mask) -+ mask = vxi->vx_nsmask[index]; ++ mask = space->vx_nsmask; + -+ if ((mask & vxi->vx_nsmask[index]) != mask) ++ if ((mask & space->vx_nsmask) != mask) + return -EINVAL; + + if (mask & CLONE_FS) { -+ fs = copy_fs_struct(vxi->vx_fs[index]); ++ fs = copy_fs_struct(space->vx_fs); + if (!fs) + return -ENOMEM; + } -+ proxy = vxi->vx_nsproxy[index]; ++ proxy = space->vx_nsproxy; + + vxdprintk(VXD_CBIT(space, 9), + "vx_enter_space(%p[#%u],0x%08lx,%d) -> (%p,%p)", @@ -23131,15 +21862,18 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/space.c linux-2.6.36.2-vs2.3 + 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,%p) cred (%p,%p)", -+ vxi, vxi->vx_id, vxi->vx_real_cred, vxi->vx_cred, ++ "vx_enter_space(%p[#%u],%p) cred (%p,%p)", ++ vxi, vxi->vx_id, space->vx_cred, + current->real_cred, current->cred); -+ exit_creds(current); -+ current->real_cred = get_cred(vxi->vx_real_cred); -+ alter_cred_subscribers(current->real_cred, 1); -+ current->cred = get_cred(vxi->vx_cred); -+ alter_cred_subscribers(current->cred, 1); ++ ++ if (space->vx_cred) { ++ cred = __prepare_creds(space->vx_cred); ++ if (cred) ++ commit_creds(cred); ++ } + } + + ret = 0; @@ -23156,20 +21890,23 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/space.c linux-2.6.36.2-vs2.3 +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; ++ 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 0 -+ if (!mask) -+ mask = default_space_mask.mask; -+#endif ++ + if ((mask & space_mask.mask) != mask) + return -EINVAL; + -+ proxy_vxi = vxi->vx_nsproxy[index]; -+ fs_vxi = vxi->vx_fs[index]; ++ 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); @@ -23181,7 +21918,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/space.c linux-2.6.36.2-vs2.3 + + if (mask & CLONE_FS) { + spin_lock(&fs_vxi->lock); -+ vxi->vx_fs[index] = fs; ++ space->vx_fs = fs; + kill = !--fs_vxi->users; + spin_unlock(&fs_vxi->lock); + } @@ -23199,38 +21936,21 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/space.c linux-2.6.36.2-vs2.3 + goto out_put; + } + -+ proxy_new = xchg(&vxi->vx_nsproxy[index], proxy_new); -+ vxi->vx_nsmask[index] |= mask; ++ proxy_new = xchg(&space->vx_nsproxy, proxy_new); ++ space->vx_nsmask |= mask; + + if (mask & CLONE_NEWUSER) { -+ const struct cred *cred; ++ struct cred *cred; + + vxdprintk(VXD_CBIT(space, 10), -+ "vx_set_space(%p[#%u],%p,%p) cred (%p,%p)", -+ vxi, vxi->vx_id, vxi->vx_real_cred, vxi->vx_cred, ++ "vx_set_space(%p[#%u],%p) cred (%p,%p)", ++ vxi, vxi->vx_id, space->vx_cred, + current->real_cred, current->cred); + -+ if (current->real_cred) { -+ cred = get_cred(current->real_cred); -+ alter_cred_subscribers(cred, 1); -+ } else -+ cred = NULL; -+ cred = xchg(&vxi->vx_real_cred, cred); -+ if (cred) { -+ alter_cred_subscribers(cred, -1); -+ put_cred(cred); -+ } -+ -+ if (current->cred) { -+ cred = get_cred(current->cred); -+ alter_cred_subscribers(cred, 1); -+ } else -+ cred = NULL; -+ cred = xchg(&vxi->vx_cred, cred); -+ if (cred) { -+ alter_cred_subscribers(cred, -1); -+ put_cred(cred); -+ } ++ cred = prepare_creds(); ++ cred = (struct cred *)xchg(&space->vx_cred, cred); ++ if (cred) ++ abort_creds(cred); + } + + ret = 0; @@ -23309,16 +22029,16 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/space.c linux-2.6.36.2-vs2.3 + return 0; +} + -diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/switch.c linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/switch.c ---- linux-2.6.36.2/kernel/vserver/switch.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/switch.c 2010-10-28 19:10:47.000000000 +0200 -@@ -0,0 +1,531 @@ +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-2007 Herbert Pötzl ++ * Copyright (C) 2003-2011 Herbert Pötzl + * + * V0.01 syscall switch + * V0.02 added signal to context @@ -23331,6 +22051,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/switch.c linux-2.6.36.2-vs2. + * V0.09 added tag commands + * V0.10 added oom bias + * V0.11 added device commands ++ * V0.12 added warn mask + * + */ + @@ -23424,6 +22145,17 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/switch.c linux-2.6.36.2-vs2. + case VCMD_get_space_default: + return vc_get_space_mask(data, -1); + ++ case VCMD_set_umask: ++ return vc_set_umask(vxi, data); ++ ++ case VCMD_get_umask: ++ return vc_get_umask(vxi, data); ++ ++ case VCMD_set_wmask: ++ return vc_set_wmask(vxi, data); ++ ++ 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); @@ -23548,10 +22280,17 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/switch.c linux-2.6.36.2-vs2. + case VCMD_net_remove: + return vc_net_remove(nxi, data); + ++ 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); -+ case VCMD_net_remove_ipv4: -+ return vc_net_remove_ipv4(nxi, data); ++ ++ 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); @@ -23633,6 +22372,8 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/switch.c linux-2.6.36.2-vs2. + __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); @@ -23678,6 +22419,8 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/switch.c linux-2.6.36.2-vs2. + __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); + + __VCMD(set_vhi_name, 7, VCA_VXI, VCF_ARES | VCF_SETUP); @@ -23688,8 +22431,10 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/switch.c linux-2.6.36.2-vs2. + __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_remove_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); @@ -23844,10 +22589,10 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/switch.c linux-2.6.36.2-vs2. +} + +#endif /* CONFIG_COMPAT */ -diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/sysctl.c linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/sysctl.c ---- linux-2.6.36.2/kernel/vserver/sysctl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/sysctl.c 2010-10-21 13:09:36.000000000 +0200 -@@ -0,0 +1,241 @@ +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 + * @@ -23878,26 +22623,28 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/sysctl.c linux-2.6.36.2-vs2. + CTL_DEBUG_QUOTA, + CTL_DEBUG_CVIRT, + CTL_DEBUG_SPACE, ++ CTL_DEBUG_PERM, + CTL_DEBUG_MISC, +}; + + -+unsigned int vx_debug_switch = 0; -+unsigned int vx_debug_xid = 0; -+unsigned int vx_debug_nid = 0; -+unsigned int vx_debug_tag = 0; -+unsigned int vx_debug_net = 0; -+unsigned int vx_debug_limit = 0; -+unsigned int vx_debug_cres = 0; -+unsigned int vx_debug_dlim = 0; -+unsigned int vx_debug_quota = 0; -+unsigned int vx_debug_cvirt = 0; -+unsigned int vx_debug_space = 0; -+unsigned int vx_debug_misc = 0; ++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 struct ctl_table_header *vserver_table_header; -+static ctl_table vserver_root_table[]; ++static struct ctl_table vserver_root_table[]; + + +void vserver_register_sysctl(void) @@ -23917,7 +22664,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/sysctl.c linux-2.6.36.2-vs2. +} + + -+static int proc_dodebug(ctl_table *table, int write, ++static int proc_dodebug(struct ctl_table *table, int write, + void __user *buffer, size_t *lenp, loff_t *ppos) +{ + char tmpbuf[20], *p, c; @@ -23979,7 +22726,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/sysctl.c linux-2.6.36.2-vs2. +#define CTL_ENTRY(ctl, name) \ + { \ + .procname = #name, \ -+ .data = &vx_ ## name, \ ++ .data = &vs_ ## name, \ + .maxlen = sizeof(int), \ + .mode = 0644, \ + .proc_handler = &proc_dodebug, \ @@ -23987,7 +22734,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/sysctl.c linux-2.6.36.2-vs2. + .extra2 = &zero, \ + } + -+static ctl_table vserver_debug_table[] = { ++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), @@ -23999,11 +22746,12 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/sysctl.c linux-2.6.36.2-vs2. + 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[] = { ++static struct ctl_table vserver_root_table[] = { + { + .procname = "vserver", + .mode = 0555, @@ -24025,13 +22773,14 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/sysctl.c linux-2.6.36.2-vs2. + { 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: \ -+ vx_debug_ ## name = val; \ ++ vs_debug_ ## name = val; \ + printk("vs_debug_" #name "=0x%x\n", val); \ + break + @@ -24064,6 +22813,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/sysctl.c linux-2.6.36.2-vs2. + 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; @@ -24077,21 +22827,22 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/sysctl.c linux-2.6.36.2-vs2. + + + -+EXPORT_SYMBOL_GPL(vx_debug_switch); -+EXPORT_SYMBOL_GPL(vx_debug_xid); -+EXPORT_SYMBOL_GPL(vx_debug_nid); -+EXPORT_SYMBOL_GPL(vx_debug_net); -+EXPORT_SYMBOL_GPL(vx_debug_limit); -+EXPORT_SYMBOL_GPL(vx_debug_cres); -+EXPORT_SYMBOL_GPL(vx_debug_dlim); -+EXPORT_SYMBOL_GPL(vx_debug_quota); -+EXPORT_SYMBOL_GPL(vx_debug_cvirt); -+EXPORT_SYMBOL_GPL(vx_debug_space); -+EXPORT_SYMBOL_GPL(vx_debug_misc); ++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); + -diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/tag.c linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/tag.c ---- linux-2.6.36.2/kernel/vserver/tag.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/tag.c 2010-10-21 13:09:36.000000000 +0200 +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 @@ -24112,7 +22863,7 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/tag.c linux-2.6.36.2-vs2.3.0 +#include + + -+int dx_migrate_task(struct task_struct *p, tag_t tag) ++int dx_migrate_task(struct task_struct *p, vtag_t tag) +{ + if (!p) + BUG(); @@ -24136,14 +22887,14 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/tag.c linux-2.6.36.2-vs2.3.0 + +int vc_task_tag(uint32_t id) +{ -+ tag_t tag; ++ vtag_t tag; + + if (id) { + struct task_struct *tsk; -+ read_lock(&tasklist_lock); ++ rcu_read_lock(); + tsk = find_task_by_real_pid(id); + tag = (tsk) ? tsk->tag : -ESRCH; -+ read_unlock(&tasklist_lock); ++ rcu_read_unlock(); + } else + tag = dx_current_tag(); + return tag; @@ -24156,29 +22907,30 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/tag.c linux-2.6.36.2-vs2.3.0 +} + + -diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/vci_config.h linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/vci_config.h ---- linux-2.6.36.2/kernel/vserver/vci_config.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/kernel/vserver/vci_config.h 2010-10-28 20:45:52.000000000 +0200 -@@ -0,0 +1,82 @@ +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 @@ + +/* interface version */ + -+#define VCI_VERSION 0x00020307 ++#define VCI_VERSION 0x00020308 + + +enum { + VCI_KCBIT_NO_DYNAMIC = 0, + + VCI_KCBIT_PROC_SECURE = 4, -+ VCI_KCBIT_HARDCPU = 5, -+ VCI_KCBIT_IDLELIMIT = 6, -+ VCI_KCBIT_IDLETIME = 7, ++ /* VCI_KCBIT_HARDCPU = 5, */ ++ /* VCI_KCBIT_IDLELIMIT = 6, */ ++ /* VCI_KCBIT_IDLETIME = 7, */ + + 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, + + VCI_KCBIT_DEBUG = 16, + VCI_KCBIT_HISTORY = 20, @@ -24198,21 +22950,18 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/vci_config.h linux-2.6.36.2- +#ifdef CONFIG_VSERVER_PROC_SECURE + (1 << VCI_KCBIT_PROC_SECURE) | +#endif -+#ifdef CONFIG_VSERVER_IDLELIMIT -+ (1 << VCI_KCBIT_IDLELIMIT) | -+#endif -+#ifdef CONFIG_VSERVER_IDLETIME -+ (1 << VCI_KCBIT_IDLETIME) | -+#endif +#ifdef CONFIG_VSERVER_COWBL + (1 << VCI_KCBIT_COWBL) | + (1 << VCI_KCBIT_FULLCOWBL) | +#endif + (1 << VCI_KCBIT_SPACES) | + (1 << VCI_KCBIT_NETV2) | -+#ifdef CONFIG_CGROUP_MEM_RES_CTLR ++#ifdef CONFIG_MEMCG + (1 << VCI_KCBIT_MEMCG) | +#endif ++#ifdef CONFIG_MEMCG_SWAP ++ (1 << VCI_KCBIT_MEMCG_SWAP) | ++#endif + + /* debug options */ +#ifdef CONFIG_VSERVER_DEBUG @@ -24242,44 +22991,11 @@ diff -NurpP --minimal linux-2.6.36.2/kernel/vserver/vci_config.h linux-2.6.36.2- + 0; +} + -diff -NurpP --minimal linux-2.6.36.2/mm/filemap_xip.c linux-2.6.36.2-vs2.3.0.36.38.2/mm/filemap_xip.c ---- linux-2.6.36.2/mm/filemap_xip.c 2010-07-07 18:31:58.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/mm/filemap_xip.c 2010-10-21 13:09:36.000000000 +0200 -@@ -18,6 +18,7 @@ - #include - #include - #include -+#include - #include - #include - -diff -NurpP --minimal linux-2.6.36.2/mm/fremap.c linux-2.6.36.2-vs2.3.0.36.38.2/mm/fremap.c ---- linux-2.6.36.2/mm/fremap.c 2010-10-21 13:07:57.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/mm/fremap.c 2010-10-21 13:09:36.000000000 +0200 -@@ -16,6 +16,7 @@ - #include - #include - #include -+#include - - #include - #include -diff -NurpP --minimal linux-2.6.36.2/mm/hugetlb.c linux-2.6.36.2-vs2.3.0.36.38.2/mm/hugetlb.c ---- linux-2.6.36.2/mm/hugetlb.c 2010-12-13 22:08:59.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/mm/hugetlb.c 2010-12-13 22:09:27.000000000 +0100 -@@ -28,6 +28,7 @@ - - #include - #include -+#include - #include "internal.h" - - const unsigned long hugetlb_zero = 0, hugetlb_infinity = ~0UL; -diff -NurpP --minimal linux-2.6.36.2/mm/memcontrol.c linux-2.6.36.2-vs2.3.0.36.38.2/mm/memcontrol.c ---- linux-2.6.36.2/mm/memcontrol.c 2010-12-13 22:08:59.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/mm/memcontrol.c 2010-12-13 22:09:27.000000000 +0100 -@@ -639,6 +639,31 @@ struct mem_cgroup *mem_cgroup_from_task( - struct mem_cgroup, css); +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) @@ -24307,74 +23023,24 @@ diff -NurpP --minimal linux-2.6.36.2/mm/memcontrol.c linux-2.6.36.2-vs2.3.0.36.3 + return mem_cgroup_read_stat(mem, MEM_CGROUP_STAT_FILE_MAPPED); +} + - static struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm) - { - struct mem_cgroup *mem = NULL; -diff -NurpP --minimal linux-2.6.36.2/mm/memory.c linux-2.6.36.2-vs2.3.0.36.38.2/mm/memory.c ---- linux-2.6.36.2/mm/memory.c 2010-10-21 13:07:57.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/mm/memory.c 2010-10-21 13:09:36.000000000 +0200 -@@ -3145,6 +3145,7 @@ static inline int handle_pte_fault(struc - { - pte_t entry; - spinlock_t *ptl; -+ int ret = 0, type = VXPT_UNKNOWN; - - entry = *pte; - if (!pte_present(entry)) { -@@ -3169,9 +3170,12 @@ static inline int handle_pte_fault(struc - if (unlikely(!pte_same(*pte, entry))) - goto unlock; - if (flags & FAULT_FLAG_WRITE) { -- if (!pte_write(entry)) -- return do_wp_page(mm, vma, address, -+ if (!pte_write(entry)) { -+ ret = do_wp_page(mm, vma, address, - pte, pmd, ptl, entry); -+ type = VXPT_WRITE; -+ goto out; -+ } - entry = pte_mkdirty(entry); - } - entry = pte_mkyoung(entry); -@@ -3189,7 +3193,10 @@ static inline int handle_pte_fault(struc - } - unlock: - pte_unmap_unlock(pte, ptl); -- return 0; -+ ret = 0; -+out: -+ vx_page_fault(mm, vma, type, ret); -+ return ret; - } - /* -diff -NurpP --minimal linux-2.6.36.2/mm/mremap.c linux-2.6.36.2-vs2.3.0.36.38.2/mm/mremap.c ---- linux-2.6.36.2/mm/mremap.c 2010-07-07 18:31:58.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/mm/mremap.c 2010-10-21 13:09:36.000000000 +0200 -@@ -19,6 +19,7 @@ - #include - #include - #include -+#include - - #include - #include -diff -NurpP --minimal linux-2.6.36.2/mm/oom_kill.c linux-2.6.36.2-vs2.3.0.36.38.2/mm/oom_kill.c ---- linux-2.6.36.2/mm/oom_kill.c 2010-10-21 13:07:57.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/mm/oom_kill.c 2010-10-28 19:36:06.000000000 +0200 -@@ -31,6 +31,9 @@ - #include - #include - #include + * 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 +#include - int sysctl_panic_on_oom; - int sysctl_oom_kill_allocating_task; -@@ -124,11 +127,18 @@ struct task_struct *find_lock_task_mm(st + #define CREATE_TRACE_POINTS + #include +@@ -121,11 +123,18 @@ found: static bool oom_unkillable_task(struct task_struct *p, - const struct mem_cgroup *mem, const nodemask_t *nodemask) + const struct mem_cgroup *memcg, const nodemask_t *nodemask) { - if (is_global_init(p)) + unsigned xid = vx_current_xid(); @@ -24390,40 +23056,10 @@ diff -NurpP --minimal linux-2.6.36.2/mm/oom_kill.c linux-2.6.36.2-vs2.3.0.36.38. + return true; + /* When mem_cgroup_out_of_memory() and p is not member of the group */ - if (mem && !task_in_mem_cgroup(p, mem)) + if (memcg && !task_in_mem_cgroup(p, memcg)) return true; -@@ -209,6 +219,18 @@ unsigned int oom_badness(struct task_str - points += p->signal->oom_score_adj; - - /* -+ * add points for context badness and -+ * reduce badness for processes belonging to -+ * a different context -+ */ -+ -+ points += vx_badness(p, p->mm); -+ -+ if ((vx_current_xid() > 1) && -+ vx_current_xid() != vx_task_xid(p)) -+ points /= 16; -+ -+ /* - * Never return 0 for an eligible task that may be killed since it's - * possible that no single user task uses more than 0.1% of memory and - * no single admin tasks uses more than 3.0%. -@@ -407,8 +429,8 @@ static int oom_kill_task(struct task_str - if (!p) - return 1; - -- pr_err("Killed process %d (%s) total-vm:%lukB, anon-rss:%lukB, file-rss:%lukB\n", -- task_pid_nr(p), p->comm, K(p->mm->total_vm), -+ pr_err("Killed process %d:#%u (%s) total-vm:%lukB, anon-rss:%lukB, file-rss:%lukB\n", -+ task_pid_nr(p), p->xid, p->comm, K(p->mm->total_vm), - K(get_mm_counter(p->mm, MM_ANONPAGES)), - K(get_mm_counter(p->mm, MM_FILEPAGES))); - task_unlock(p); -@@ -452,8 +474,8 @@ static int oom_kill_process(struct task_ - } +@@ -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", @@ -24433,7 +23069,18 @@ diff -NurpP --minimal linux-2.6.36.2/mm/oom_kill.c linux-2.6.36.2-vs2.3.0.36.38. task_unlock(p); /* -@@ -542,6 +564,8 @@ int unregister_oom_notifier(struct notif +@@ -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); @@ -24442,33 +23089,33 @@ diff -NurpP --minimal linux-2.6.36.2/mm/oom_kill.c linux-2.6.36.2-vs2.3.0.36.38. /* * 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 -@@ -701,7 +725,12 @@ retry: +@@ -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); - read_unlock(&tasklist_lock); - panic("Out of memory and no killable processes...\n"); + + /* avoid panic for guest OOM */ -+ if (current->xid) ++ if (vx_current_xid()) + vs_oom_action(LINUX_REBOOT_CMD_OOM); + else + panic("Out of memory and no killable processes...\n"); } - - if (oom_kill_process(p, gfp_mask, order, points, totalpages, NULL, -diff -NurpP --minimal linux-2.6.36.2/mm/page_alloc.c linux-2.6.36.2-vs2.3.0.36.38.2/mm/page_alloc.c ---- linux-2.6.36.2/mm/page_alloc.c 2010-12-13 22:08:59.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/mm/page_alloc.c 2010-12-13 22:09:27.000000000 +0100 -@@ -52,6 +52,8 @@ - #include - #include - #include + 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 - #include -@@ -2334,6 +2336,9 @@ void si_meminfo(struct sysinfo *val) +@@ -3096,6 +3098,9 @@ void si_meminfo(struct sysinfo *val) val->totalhigh = totalhigh_pages; val->freehigh = nr_free_highpages(); val->mem_unit = PAGE_SIZE; @@ -24478,7 +23125,7 @@ diff -NurpP --minimal linux-2.6.36.2/mm/page_alloc.c linux-2.6.36.2-vs2.3.0.36.3 } EXPORT_SYMBOL(si_meminfo); -@@ -2354,6 +2359,9 @@ void si_meminfo_node(struct sysinfo *val +@@ -3121,6 +3126,9 @@ void si_meminfo_node(struct sysinfo *val val->freehigh = 0; #endif val->mem_unit = PAGE_SIZE; @@ -24488,21 +23135,22 @@ diff -NurpP --minimal linux-2.6.36.2/mm/page_alloc.c linux-2.6.36.2-vs2.3.0.36.3 } #endif -diff -NurpP --minimal linux-2.6.36.2/mm/rmap.c linux-2.6.36.2-vs2.3.0.36.38.2/mm/rmap.c ---- linux-2.6.36.2/mm/rmap.c 2010-10-21 13:07:57.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/mm/rmap.c 2010-10-21 13:19:11.000000000 +0200 -@@ -57,6 +57,7 @@ - #include - #include - #include -+#include - - #include +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 + */ -diff -NurpP --minimal linux-2.6.36.2/mm/shmem.c linux-2.6.36.2-vs2.3.0.36.38.2/mm/shmem.c ---- linux-2.6.36.2/mm/shmem.c 2010-10-21 13:07:57.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/mm/shmem.c 2010-10-21 13:09:36.000000000 +0200 -@@ -1815,7 +1815,7 @@ static int shmem_statfs(struct dentry *d ++#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); @@ -24511,19 +23159,19 @@ diff -NurpP --minimal linux-2.6.36.2/mm/shmem.c linux-2.6.36.2-vs2.3.0.36.38.2/m buf->f_bsize = PAGE_CACHE_SIZE; buf->f_namelen = NAME_MAX; if (sbinfo->max_blocks) { -@@ -2377,7 +2377,7 @@ int shmem_fill_super(struct super_block - sb->s_maxbytes = SHMEM_MAX_BYTES; +@@ -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_POSIX_ACL -diff -NurpP --minimal linux-2.6.36.2/mm/slab.c linux-2.6.36.2-vs2.3.0.36.38.2/mm/slab.c ---- linux-2.6.36.2/mm/slab.c 2010-10-21 13:07:57.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/mm/slab.c 2010-10-21 13:09:36.000000000 +0200 -@@ -407,6 +407,8 @@ static void kmem_list3_init(struct kmem_ + #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 @@ -24532,33 +23180,25 @@ diff -NurpP --minimal linux-2.6.36.2/mm/slab.c linux-2.6.36.2-vs2.3.0.36.38.2/mm #if DEBUG /* -@@ -3346,6 +3348,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); -@@ -3423,6 +3426,7 @@ __cache_alloc_node(struct kmem_cache *ca +@@ -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, obj_size(cachep), 1, cachep->flags, -@@ -3609,6 +3613,7 @@ static inline void __cache_free(struct k + 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, __builtin_return_address(0)); + objp = cache_free_debugcheck(cachep, objp, caller); + vx_slab_free(cachep); - kmemcheck_slab_free(cachep, objp, obj_size(cachep)); + kmemcheck_slab_free(cachep, objp, cachep->object_size); -diff -NurpP --minimal linux-2.6.36.2/mm/slab_vs.h linux-2.6.36.2-vs2.3.0.36.38.2/mm/slab_vs.h ---- linux-2.6.36.2/mm/slab_vs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/mm/slab_vs.h 2010-10-21 13:09:36.000000000 +0200 +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 @@ + +#include @@ -24568,40 +23208,39 @@ diff -NurpP --minimal linux-2.6.36.2/mm/slab_vs.h linux-2.6.36.2-vs2.3.0.36.38.2 +static inline +void vx_slab_alloc(struct kmem_cache *cachep, gfp_t flags) +{ -+ int what = gfp_zone(cachep->gfpflags); ++ int what = gfp_zone(cachep->allocflags); + struct vx_info *vxi = current_vx_info(); + + if (!vxi) + return; + -+ atomic_add(cachep->buffer_size, &vxi->cacct.slab[what]); ++ atomic_add(cachep->size, &vxi->cacct.slab[what]); +} + +static inline +void vx_slab_free(struct kmem_cache *cachep) +{ -+ int what = gfp_zone(cachep->gfpflags); ++ int what = gfp_zone(cachep->allocflags); + struct vx_info *vxi = current_vx_info(); + + if (!vxi) + return; + -+ atomic_sub(cachep->buffer_size, &vxi->cacct.slab[what]); ++ atomic_sub(cachep->size, &vxi->cacct.slab[what]); +} + -diff -NurpP --minimal linux-2.6.36.2/mm/swapfile.c linux-2.6.36.2-vs2.3.0.36.38.2/mm/swapfile.c ---- linux-2.6.36.2/mm/swapfile.c 2010-10-21 13:07:57.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/mm/swapfile.c 2010-10-21 13:09:36.000000000 +0200 -@@ -35,6 +35,8 @@ +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 -+#include static bool swap_count_continued(struct swap_info_struct *, pgoff_t, unsigned char); -@@ -1747,6 +1749,16 @@ static int swap_show(struct seq_file *sw +@@ -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"); @@ -24618,8 +23257,8 @@ diff -NurpP --minimal linux-2.6.36.2/mm/swapfile.c linux-2.6.36.2-vs2.3.0.36.38. return 0; } -@@ -2131,6 +2143,8 @@ void si_swapinfo(struct sysinfo *val) - val->freeswap = nr_swap_pages + nr_to_be_unused; +@@ -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)) @@ -24627,73 +23266,96 @@ diff -NurpP --minimal linux-2.6.36.2/mm/swapfile.c linux-2.6.36.2-vs2.3.0.36.38. } /* -diff -NurpP --minimal linux-2.6.36.2/net/core/dev.c linux-2.6.36.2-vs2.3.0.36.38.2/net/core/dev.c ---- linux-2.6.36.2/net/core/dev.c 2010-12-13 22:08:59.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/net/core/dev.c 2010-12-13 22:09:27.000000000 +0100 -@@ -127,6 +127,7 @@ +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 - -@@ -607,7 +608,8 @@ struct net_device *__dev_get_by_name(str + #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, p, head, name_hlist) + 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; -@@ -633,7 +635,8 @@ struct net_device *dev_get_by_name_rcu(s +@@ -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, p, head, name_hlist) + 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; -@@ -684,7 +687,8 @@ struct net_device *__dev_get_by_index(st +@@ -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, p, head, index_hlist) + 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; -@@ -709,7 +713,8 @@ struct net_device *dev_get_by_index_rcu( - struct hlist_head *head = dev_index_hash(net, ifindex); +@@ -767,7 +771,7 @@ EXPORT_SYMBOL(__dev_get_by_index); + * about locking. The caller must hold RCU lock. + */ - hlist_for_each_entry_rcu(dev, p, head, index_hlist) -- if (dev->ifindex == ifindex) -+ if ((dev->ifindex == ifindex) && -+ nx_dev_visible(current_nx_info(), dev)) - return dev; +-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; -@@ -762,10 +767,12 @@ struct net_device *dev_getbyhwaddr(struc + } ++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); ++ ++ if (nx_dev_visible(current_nx_info(), dev)) ++ return dev; ++ return NULL; ++} + EXPORT_SYMBOL(dev_get_by_index_rcu); - ASSERT_RTNL(); -- for_each_netdev(net, dev) -+ for_each_netdev(net, dev) { +@@ -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; - } -@@ -776,9 +783,11 @@ struct net_device *__dev_getfirstbyhwtyp +@@ -872,9 +887,11 @@ struct net_device *__dev_getfirstbyhwtyp struct net_device *dev; ASSERT_RTNL(); @@ -24707,7 +23369,27 @@ diff -NurpP --minimal linux-2.6.36.2/net/core/dev.c linux-2.6.36.2-vs2.3.0.36.38 return NULL; } -@@ -896,6 +905,8 @@ static int __dev_alloc_name(struct net * +@@ -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; @@ -24716,53 +23398,59 @@ diff -NurpP --minimal linux-2.6.36.2/net/core/dev.c linux-2.6.36.2-vs2.3.0.36.38 /* avoid cases where sscanf is not exact inverse of printf */ snprintf(buf, IFNAMSIZ, name, i); -@@ -3668,6 +3679,8 @@ static int dev_ifconf(struct net *net, c +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 - 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; -@@ -3739,6 +3752,10 @@ static void dev_seq_printf_stats(struct + #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 = dev_get_stats(dev, &temp); ++ const struct rtnl_link_stats64 *stats; ++ + /* 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-2.6.36.2/net/core/rtnetlink.c linux-2.6.36.2-vs2.3.0.36.38.2/net/core/rtnetlink.c ---- linux-2.6.36.2/net/core/rtnetlink.c 2010-10-21 13:07:58.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/net/core/rtnetlink.c 2010-10-21 13:09:36.000000000 +0200 -@@ -927,6 +927,8 @@ static int rtnl_dump_ifinfo(struct sk_bu - hlist_for_each_entry(dev, node, head, index_hlist) { +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; - if (rtnl_fill_ifinfo(skb, dev, RTM_NEWLINK, - NETLINK_CB(cb->skb).pid, - cb->nlh->nlmsg_seq, 0, -@@ -1643,6 +1645,9 @@ void rtmsg_ifinfo(int type, struct net_d - struct sk_buff *skb; + 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; + - skb = nlmsg_new(if_nlmsg_size(dev), GFP_KERNEL); + skb = nlmsg_new((if_info_size = if_nlmsg_size(dev, 0)), flags); if (skb == NULL) goto errout; -diff -NurpP --minimal linux-2.6.36.2/net/core/sock.c linux-2.6.36.2-vs2.3.0.36.38.2/net/core/sock.c ---- linux-2.6.36.2/net/core/sock.c 2010-10-21 13:07:58.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/net/core/sock.c 2010-10-21 13:09:36.000000000 +0200 -@@ -127,6 +127,10 @@ - #include +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 @@ -24770,9 +23458,9 @@ diff -NurpP --minimal linux-2.6.36.2/net/core/sock.c linux-2.6.36.2-vs2.3.0.36.3 +#include +#include - #ifdef CONFIG_INET - #include -@@ -1046,6 +1050,8 @@ static struct sock *sk_prot_alloc(struct + #include + +@@ -1310,6 +1314,8 @@ static struct sock *sk_prot_alloc(struct goto out_free_sec; sk_tx_queue_clear(sk); } @@ -24781,7 +23469,7 @@ diff -NurpP --minimal linux-2.6.36.2/net/core/sock.c linux-2.6.36.2-vs2.3.0.36.3 return sk; -@@ -1142,6 +1148,11 @@ static void __sk_free(struct sock *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)); @@ -24793,7 +23481,7 @@ diff -NurpP --minimal linux-2.6.36.2/net/core/sock.c linux-2.6.36.2-vs2.3.0.36.3 sk_prot_free(sk->sk_prot_creator, sk); } -@@ -1189,6 +1200,8 @@ struct sock *sk_clone(const struct sock +@@ -1467,6 +1478,8 @@ struct sock *sk_clone_lock(const struct /* SANITY */ get_net(sock_net(newsk)); @@ -24802,7 +23490,7 @@ diff -NurpP --minimal linux-2.6.36.2/net/core/sock.c linux-2.6.36.2-vs2.3.0.36.3 sk_node_init(&newsk->sk_node); sock_lock_init(newsk); bh_lock_sock(newsk); -@@ -1244,6 +1257,12 @@ struct sock *sk_clone(const struct sock +@@ -1524,6 +1537,12 @@ struct sock *sk_clone_lock(const struct smp_wmb(); atomic_set(&newsk->sk_refcnt, 2); @@ -24815,7 +23503,7 @@ diff -NurpP --minimal linux-2.6.36.2/net/core/sock.c linux-2.6.36.2-vs2.3.0.36.3 /* * Increment the counter in the same struct proto as the master * sock (sk_refcnt_debug_inc uses newsk->sk_prot->socks, that -@@ -1986,6 +2005,12 @@ void sock_init_data(struct socket *sock, +@@ -2302,6 +2321,12 @@ void sock_init_data(struct socket *sock, sk->sk_stamp = ktime_set(-1L, 0); @@ -24825,13 +23513,13 @@ diff -NurpP --minimal linux-2.6.36.2/net/core/sock.c linux-2.6.36.2-vs2.3.0.36.3 + set_nx_info(&sk->sk_nx_info, current_nx_info()); + sk->sk_nid = nx_current_nid(); + - /* - * Before updating sk_refcnt, we must commit prior changes to memory - * (Documentation/RCU/rculist_nulls.txt for details) -diff -NurpP --minimal linux-2.6.36.2/net/ipv4/af_inet.c linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv4/af_inet.c ---- linux-2.6.36.2/net/ipv4/af_inet.c 2010-10-21 13:07:58.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv4/af_inet.c 2010-10-21 13:09:36.000000000 +0200 -@@ -116,6 +116,7 @@ + #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 @@ -24839,52 +23527,52 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv4/af_inet.c linux-2.6.36.2-vs2.3.0.3 /* The inetsw table contains everything that inet_create needs to -@@ -327,9 +328,13 @@ lookup_protocol: +@@ -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 && !capable(CAP_NET_RAW)) + if (sock->type == SOCK_RAW && !kern && + !ns_capable(net->user_ns, CAP_NET_RAW)) goto out_rcu_unlock; - +override: - err = -EAFNOSUPPORT; - if (!inet_netns_ok(net, protocol)) - goto out_rcu_unlock; -@@ -453,6 +458,7 @@ int inet_bind(struct socket *sock, struc + 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; - int err; -@@ -466,7 +472,11 @@ int inet_bind(struct socket *sock, struc - if (addr_len < sizeof(struct sockaddr_in)) - goto out; +@@ -447,7 +452,11 @@ int inet_bind(struct socket *sock, struc + goto out; + } -- chk_addr_ret = inet_addr_type(sock_net(sk), addr->sin_addr.s_addr); +- 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(sock_net(sk), nsa.saddr); ++ 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 -@@ -478,7 +488,7 @@ int inet_bind(struct socket *sock, struc +@@ -459,7 +468,7 @@ int inet_bind(struct socket *sock, struc err = -EADDRNOTAVAIL; - if (!sysctl_ip_nonlocal_bind && + 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) -@@ -503,7 +513,7 @@ int inet_bind(struct socket *sock, struc +@@ -485,7 +494,7 @@ int inet_bind(struct socket *sock, struc if (sk->sk_state != TCP_CLOSE || inet->inet_num) goto out_release_sock; @@ -24893,7 +23581,7 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv4/af_inet.c linux-2.6.36.2-vs2.3.0.3 if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST) inet->inet_saddr = 0; /* Use device */ -@@ -705,11 +715,13 @@ int inet_getname(struct socket *sock, st +@@ -704,11 +713,13 @@ int inet_getname(struct socket *sock, st peer == 1)) return -ENOTCONN; sin->sin_port = inet->inet_dport; @@ -24908,10 +23596,29 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv4/af_inet.c linux-2.6.36.2-vs2.3.0.3 sin->sin_port = inet->inet_sport; sin->sin_addr.s_addr = addr; } -diff -NurpP --minimal linux-2.6.36.2/net/ipv4/devinet.c linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv4/devinet.c ---- linux-2.6.36.2/net/ipv4/devinet.c 2010-10-21 13:07:58.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv4/devinet.c 2010-10-21 13:09:36.000000000 +0200 -@@ -417,6 +417,7 @@ struct in_device *inetdev_by_index(struc +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); @@ -24919,7 +23626,7 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv4/devinet.c linux-2.6.36.2-vs2.3.0.3 /* Called only from RTNL semaphored context. No locks. */ struct in_ifaddr *inet_ifa_byprefix(struct in_device *in_dev, __be32 prefix, -@@ -659,6 +660,8 @@ int devinet_ioctl(struct net *net, unsig +@@ -958,6 +959,8 @@ int devinet_ioctl(struct net *net, unsig in_dev = __in_dev_get_rtnl(dev); if (in_dev) { @@ -24928,7 +23635,7 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv4/devinet.c linux-2.6.36.2-vs2.3.0.3 if (tryaddrmatch) { /* Matthias Andree */ /* compare label and address (4.4BSD style) */ -@@ -667,6 +670,8 @@ int devinet_ioctl(struct net *net, unsig +@@ -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) { @@ -24936,8 +23643,8 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv4/devinet.c linux-2.6.36.2-vs2.3.0.3 + continue; if (!strcmp(ifr.ifr_name, ifa->ifa_label) && sin_orig.sin_addr.s_addr == - ifa->ifa_address) { -@@ -679,9 +684,12 @@ int devinet_ioctl(struct net *net, unsig + 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; @@ -24951,7 +23658,7 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv4/devinet.c linux-2.6.36.2-vs2.3.0.3 } } -@@ -833,6 +841,8 @@ static int inet_gifconf(struct net_devic +@@ -1134,6 +1142,8 @@ static int inet_gifconf(struct net_devic goto out; for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) { @@ -24960,15 +23667,15 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv4/devinet.c linux-2.6.36.2-vs2.3.0.3 if (!buf) { done += sizeof(ifr); continue; -@@ -1182,6 +1192,7 @@ static int inet_dump_ifaddr(struct sk_bu +@@ -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; - struct hlist_node *node; -@@ -1204,6 +1215,8 @@ static int inet_dump_ifaddr(struct sk_bu + 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++) { @@ -24977,29 +23684,28 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv4/devinet.c linux-2.6.36.2-vs2.3.0.3 if (ip_idx < s_ip_idx) continue; if (inet_fill_ifaddr(skb, ifa, -diff -NurpP --minimal linux-2.6.36.2/net/ipv4/fib_hash.c linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv4/fib_hash.c ---- linux-2.6.36.2/net/ipv4/fib_hash.c 2010-07-07 18:31:59.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv4/fib_hash.c 2010-10-21 13:09:36.000000000 +0200 -@@ -1017,7 +1017,7 @@ static int fib_seq_show(struct seq_file - prefix = f->fn_key; - mask = FZ_MASK(iter->zone); - flags = fib_flag_trans(fa->fa_type, mask, fi); -- if (fi) -+ if (fi && nx_dev_visible(current_nx_info(), fi->fib_dev)) - seq_printf(seq, - "%s\t%08X\t%08X\t%04X\t%d\t%u\t%d\t%08X\t%d\t%u\t%u%n", - fi->fib_dev ? fi->fib_dev->name : "*", prefix, -diff -NurpP --minimal linux-2.6.36.2/net/ipv4/inet_connection_sock.c linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv4/inet_connection_sock.c ---- linux-2.6.36.2/net/ipv4/inet_connection_sock.c 2010-10-21 13:07:58.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv4/inet_connection_sock.c 2010-10-21 13:09:36.000000000 +0200 -@@ -52,10 +52,40 @@ void inet_get_local_port_range(int *low, +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 = inet_rcv_saddr(sk1), -+ sk2_rcv_saddr = inet_rcv_saddr(sk2); ++ __be32 sk1_rcv_saddr = sk1->sk_rcv_saddr, ++ sk2_rcv_saddr = sk2->sk_rcv_saddr; + + if (inet_v6_ipv6only(sk2)) + return 0; @@ -25028,39 +23734,42 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv4/inet_connection_sock.c linux-2.6.3 +} + int inet_csk_bind_conflict(const struct sock *sk, - const struct inet_bind_bucket *tb) + const struct inet_bind_bucket *tb, bool relax) { -- const __be32 sk_rcv_saddr = inet_rcv_saddr(sk); - struct sock *sk2; - struct hlist_node *node; - int reuse = sk->sk_reuse; -@@ -75,9 +105,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 = inet_rcv_saddr(sk2); -- if (!sk2_rcv_saddr || !sk_rcv_saddr || -- sk2_rcv_saddr == sk_rcv_saddr) +@@ -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-2.6.36.2/net/ipv4/inet_diag.c linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv4/inet_diag.c ---- linux-2.6.36.2/net/ipv4/inet_diag.c 2010-07-07 18:31:59.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv4/inet_diag.c 2010-10-21 13:09:36.000000000 +0200 -@@ -33,6 +33,8 @@ - #include +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 - static const struct inet_diag_handler **inet_diag_table; - -@@ -119,8 +121,10 @@ static int inet_csk_diag_fill(struct soc + #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_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, @@ -25068,36 +23777,43 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv4/inet_diag.c linux-2.6.36.2-vs2.3.0 + r->id.idiag_dst[0] = nx_map_sock_lback(sk->sk_nx_info, + inet->inet_daddr); - #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE) - if (r->idiag_family == AF_INET6) { -@@ -205,8 +209,8 @@ static int inet_twsk_diag_fill(struct in - r->id.idiag_cookie[1] = (u32)(((unsigned long)tw >> 31) >> 1); - r->id.idiag_sport = tw->tw_sport; - r->id.idiag_dport = tw->tw_dport; + 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; - r->idiag_expires = DIV_ROUND_UP(tmo * 1000, HZ); -@@ -263,6 +267,7 @@ static int inet_diag_get_exact(struct sk - err = -EINVAL; +@@ -298,12 +302,14 @@ int inet_diag_dump_one_icsk(struct inet_ - if (req->idiag_family == AF_INET) { + err = -EINVAL; + if (req->sdiag_family == AF_INET) { + /* TODO: lback */ - sk = inet_lookup(&init_net, hashinfo, req->id.idiag_dst[0], + 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); -@@ -505,6 +510,7 @@ static int inet_csk_diag_dump(struct soc - } else + } + #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; - } -@@ -541,6 +547,7 @@ static int inet_twsk_diag_dump(struct in + 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 { @@ -25105,67 +23821,58 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv4/inet_diag.c linux-2.6.36.2-vs2.3.0 entry.saddr = &tw->tw_rcv_saddr; entry.daddr = &tw->tw_daddr; } -@@ -587,8 +594,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); +@@ -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; - r->idiag_wqueue = 0; -@@ -658,6 +665,7 @@ static int inet_diag_dump_reqs(struct sk +@@ -806,6 +814,7 @@ static int inet_diag_dump_reqs(struct sk + r->id.idiag_dport) continue; ++ /* TODO: lback */ if (bc) { -+ /* TODO: lback */ - entry.saddr = - #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE) - (entry.family == AF_INET6) ? -@@ -728,6 +736,8 @@ static int inet_diag_dump(struct sk_buff - sk_nulls_for_each(sk, node, &ilb->head) { - struct inet_sock *inet = inet_sk(sk); + 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; -@@ -794,6 +804,8 @@ skip_listen_ht: - sk_nulls_for_each(sk, node, &head->chain) { - struct inet_sock *inet = inet_sk(sk); +@@ -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; - if (!(r->idiag_states & (1 << sk->sk_state))) -@@ -818,6 +830,8 @@ next_normal: - inet_twsk_for_each(tw, node, - &head->twchain) { - -+ if (!nx_check(tw->tw_nid, VS_WATCH_P | VS_IDENT)) -+ continue; - if (num < s_num) - goto next_dying; - if (r->id.idiag_sport != tw->tw_sport && -diff -NurpP --minimal linux-2.6.36.2/net/ipv4/inet_hashtables.c linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv4/inet_hashtables.c ---- linux-2.6.36.2/net/ipv4/inet_hashtables.c 2010-10-21 13:07:58.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv4/inet_hashtables.c 2010-10-21 13:09:36.000000000 +0200 -@@ -21,6 +21,7 @@ - + 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 - /* -@@ -132,6 +133,11 @@ static inline int compute_score(struct s + 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 += 2; + score += 4; + } else { + /* block non nx_info ips */ + if (!v4_addr_in_nx_info(sk->sk_nx_info, @@ -25174,49 +23881,38 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv4/inet_hashtables.c linux-2.6.36.2-v } if (sk->sk_bound_dev_if) { if (sk->sk_bound_dev_if != dif) -@@ -149,7 +155,6 @@ static inline int compute_score(struct s +@@ -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 daddr, const unsigned short hnum, -@@ -172,6 +177,7 @@ begin: - hiscore = score; + const __be32 saddr, __be16 sport, +@@ -234,6 +239,7 @@ begin: + phash = next_pseudo_random32(phash); } } + /* * 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-2.6.36.2/net/ipv4/netfilter/nf_nat_helper.c linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv4/netfilter/nf_nat_helper.c ---- linux-2.6.36.2/net/ipv4/netfilter/nf_nat_helper.c 2010-07-07 18:31:59.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv4/netfilter/nf_nat_helper.c 2010-10-21 13:09:36.000000000 +0200 -@@ -20,6 +20,7 @@ - #include - - #include -+#include - #include - #include - #include -diff -NurpP --minimal linux-2.6.36.2/net/ipv4/netfilter.c linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv4/netfilter.c ---- linux-2.6.36.2/net/ipv4/netfilter.c 2010-10-21 13:07:58.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv4/netfilter.c 2010-10-21 13:09:36.000000000 +0200 -@@ -5,7 +5,7 @@ - #include +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-2.6.36.2/net/ipv4/raw.c linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv4/raw.c ---- linux-2.6.36.2/net/ipv4/raw.c 2010-10-21 13:07:58.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv4/raw.c 2010-10-21 13:09:36.000000000 +0200 -@@ -116,7 +116,7 @@ static struct sock *__raw_v4_lookup(stru +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) && @@ -25225,7 +23921,7 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv4/raw.c linux-2.6.36.2-vs2.3.0.36.38 !(sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif)) goto found; /* gotcha */ } -@@ -383,6 +383,12 @@ static int raw_send_hdrinc(struct sock * +@@ -402,6 +402,12 @@ static int raw_send_hdrinc(struct sock * icmp_out_count(net, ((struct icmphdr *) skb_transport_header(skb))->type); @@ -25238,21 +23934,24 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv4/raw.c linux-2.6.36.2-vs2.3.0.36.38 err = NF_HOOK(NFPROTO_IPV4, NF_INET_LOCAL_OUT, skb, NULL, rt->dst.dev, dst_output); if (err > 0) -@@ -563,6 +569,13 @@ static int raw_sendmsg(struct kiocb *ioc - } +@@ -590,6 +596,16 @@ static int raw_sendmsg(struct kiocb *ioc + goto done; + } - security_sk_classify_flow(sk, &fl); -+ if (sk->sk_nx_info) { -+ err = ip_v4_find_src(sock_net(sk), -+ sk->sk_nx_info, &rt, &fl); -+ -+ if (err) -+ 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; + } - err = ip_route_output_flow(sock_net(sk), &rt, &fl, sk, 1); - } - if (err) -@@ -635,17 +648,19 @@ static int raw_bind(struct sock *sk, str ++ 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)) { +@@ -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; @@ -25275,7 +23974,7 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv4/raw.c linux-2.6.36.2-vs2.3.0.36.38 if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST) inet->inet_saddr = 0; /* Use device */ sk_dst_reset(sk); -@@ -697,7 +712,8 @@ static int raw_recvmsg(struct kiocb *ioc +@@ -727,7 +745,8 @@ static int raw_recvmsg(struct kiocb *ioc /* Copy the address. */ if (sin) { sin->sin_family = AF_INET; @@ -25284,18 +23983,18 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv4/raw.c linux-2.6.36.2-vs2.3.0.36.38 + 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)); - } -@@ -875,7 +891,8 @@ static struct sock *raw_get_first(struct - struct hlist_node *node; - - sk_for_each(sk, node, &state->h->ht[state->bucket]) + *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)) ++ nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)) goto found; } sk = NULL; -@@ -891,7 +908,8 @@ static struct sock *raw_get_next(struct +@@ -939,7 +959,8 @@ static struct sock *raw_get_next(struct sk = sk_next(sk); try_again: ; @@ -25305,33 +24004,33 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv4/raw.c linux-2.6.36.2-vs2.3.0.36.38 if (!sk && ++state->bucket < RAW_HTABLE_SIZE) { sk = sk_head(&state->h->ht[state->bucket]); -@@ -950,7 +968,10 @@ static void raw_sock_seq_show(struct seq - - seq_printf(seq, "%4d: %08X:%04X %08X:%04X" - " %02X %08X:%08X %02X:%08lX %08X %5d %8d %lu %d %p %d\n", -- i, src, srcp, dest, destp, sp->sk_state, -+ i, -+ nx_map_sock_lback(current_nx_info(), src), srcp, -+ nx_map_sock_lback(current_nx_info(), dest), destp, -+ sp->sk_state, - sk_wmem_alloc_get(sp), - sk_rmem_alloc_get(sp), - 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp), -diff -NurpP --minimal linux-2.6.36.2/net/ipv4/tcp.c linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv4/tcp.c ---- linux-2.6.36.2/net/ipv4/tcp.c 2010-10-21 13:07:58.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv4/tcp.c 2010-10-21 13:09:36.000000000 +0200 -@@ -266,6 +266,7 @@ +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-2.6.36.2/net/ipv4/tcp_ipv4.c linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv4/tcp_ipv4.c ---- linux-2.6.36.2/net/ipv4/tcp_ipv4.c 2010-10-21 13:07:58.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv4/tcp_ipv4.c 2010-10-21 13:09:36.000000000 +0200 -@@ -2016,6 +2016,12 @@ static void *listening_get_next(struct s + #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) { @@ -25344,7 +24043,7 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv4/tcp_ipv4.c linux-2.6.36.2-vs2.3.0. if (req->rsk_ops->family == st->family) { cur = req; goto out; -@@ -2041,6 +2047,10 @@ get_req: +@@ -1909,6 +1915,10 @@ get_req: } get_sk: sk_nulls_for_each_from(sk, node) { @@ -25352,10 +24051,10 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv4/tcp_ipv4.c linux-2.6.36.2-vs2.3.0. + 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)) { - cur = sk; - goto out; -@@ -2115,6 +2125,11 @@ static void *established_get_first(struc + 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) { @@ -25367,31 +24066,8 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv4/tcp_ipv4.c linux-2.6.36.2-vs2.3.0. if (sk->sk_family != st->family || !net_eq(sock_net(sk), net)) { continue; -@@ -2125,6 +2140,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; -@@ -2154,7 +2174,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) { -@@ -2178,6 +2200,11 @@ get_tw: - sk = sk_nulls_next(sk); +@@ -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), @@ -25400,47 +24076,45 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv4/tcp_ipv4.c linux-2.6.36.2-vs2.3.0. + 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; + return sk; } -@@ -2387,9 +2414,9 @@ static void get_openreq4(struct sock *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 %5d %8d %u %d %p%n", + " %02X %08X:%08X %02X:%08lX %08X %5u %8d %u %d %pK", i, -- ireq->loc_addr, -+ nx_map_sock_lback(current_nx_info(), ireq->loc_addr), +- ireq->ir_loc_addr, ++ nx_map_sock_lback(current_nx_info(), ireq->ir_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), +- 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. */ -@@ -2441,7 +2468,10 @@ static void get_tcp4_sock(struct sock *s - - seq_printf(f, "%4d: %08X:%04X %08X:%04X %02X %08X:%08X %02X:%08lX " - "%08X %5d %8d %lu %d %p %lu %lu %u %u %d%n", -- i, src, srcp, dest, destp, sk->sk_state, -+ i, -+ nx_map_sock_lback(current_nx_info(), src), srcp, -+ nx_map_sock_lback(current_nx_info(), dest), destp, -+ sk->sk_state, - tp->write_seq - tp->snd_una, - rx_queue, - timer_active, -@@ -2476,7 +2506,10 @@ static void get_timewait4_sock(struct in - - seq_printf(f, "%4d: %08X:%04X %08X:%04X" - " %02X %08X:%08X %02X:%08lX %08X %5d %8d %d %d %p%n", -- i, src, srcp, dest, destp, tw->tw_substate, 0, 0, -+ i, -+ nx_map_sock_lback(current_nx_info(), src), srcp, -+ nx_map_sock_lback(current_nx_info(), dest), destp, -+ tw->tw_substate, 0, 0, - 3, jiffies_to_clock_t(ttd), 0, 0, 0, 0, - atomic_read(&tw->tw_refcnt), tw, len); - } -diff -NurpP --minimal linux-2.6.36.2/net/ipv4/tcp_minisocks.c linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv4/tcp_minisocks.c ---- linux-2.6.36.2/net/ipv4/tcp_minisocks.c 2010-10-21 13:07:58.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv4/tcp_minisocks.c 2010-10-21 13:09:36.000000000 +0200 +@@ -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 @@ -25451,22 +24125,22 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv4/tcp_minisocks.c linux-2.6.36.2-vs2 #include #include #include -@@ -290,6 +293,11 @@ void tcp_time_wait(struct sock *sk, int - tcptw->tw_ts_recent = tp->rx_opt.ts_recent; +@@ -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; + - #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) + #if IS_ENABLED(CONFIG_IPV6) if (tw->tw_family == PF_INET6) { struct ipv6_pinfo *np = inet6_sk(sk); -diff -NurpP --minimal linux-2.6.36.2/net/ipv4/udp.c linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv4/udp.c ---- linux-2.6.36.2/net/ipv4/udp.c 2010-10-21 13:07:59.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv4/udp.c 2010-10-21 13:09:36.000000000 +0200 -@@ -296,14 +296,7 @@ fail: +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); @@ -25482,10 +24156,10 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv4/udp.c linux-2.6.36.2-vs2.3.0.36.38 static unsigned int udp4_portaddr_hash(struct net *net, __be32 saddr, unsigned int port) -@@ -338,6 +331,11 @@ static inline int compute_score(struct s +@@ -351,6 +344,11 @@ static inline int compute_score(struct s if (inet->inet_rcv_saddr != daddr) return -1; - score += 2; + score += 4; + } else { + /* block non nx_info ips */ + if (!v4_addr_in_nx_info(sk->sk_nx_info, @@ -25494,7 +24168,7 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv4/udp.c linux-2.6.36.2-vs2.3.0.36.38 } if (inet->inet_daddr) { if (inet->inet_daddr != saddr) -@@ -441,6 +439,7 @@ exact_match: +@@ -473,6 +471,7 @@ begin: return result; } @@ -25502,7 +24176,7 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv4/udp.c linux-2.6.36.2-vs2.3.0.36.38 /* UDP is nearly always wildcards out the wazoo, it makes no sense to try * harder than this. -DaveM */ -@@ -486,6 +485,11 @@ begin: +@@ -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); @@ -25514,15 +24188,15 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv4/udp.c linux-2.6.36.2-vs2.3.0.36.38 if (score > badness) { result = sk; badness = score; -@@ -499,6 +503,7 @@ begin: +@@ -543,6 +547,7 @@ begin: if (get_nulls_value(node) != slot) goto begin; + if (result) { - if (unlikely(!atomic_inc_not_zero(&result->sk_refcnt))) + if (unlikely(!atomic_inc_not_zero_hint(&result->sk_refcnt, 2))) result = NULL; -@@ -508,6 +513,7 @@ begin: +@@ -552,6 +557,7 @@ begin: goto begin; } } @@ -25530,31 +24204,33 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv4/udp.c linux-2.6.36.2-vs2.3.0.36.38 rcu_read_unlock(); return result; } -@@ -550,8 +556,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; -@@ -900,8 +905,13 @@ int udp_sendmsg(struct kiocb *iocb, stru - { .sport = inet->inet_sport, - .dport = dport } } }; - struct net *net = sock_net(sk); -+ struct nx_info *nxi = sk->sk_nx_info; - - security_sk_classify_flow(sk, &fl); -+ err = ip_v4_find_src(net, nxi, &rt, &fl); -+ if (err) -+ goto out; +@@ -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); ++ } + - err = ip_route_output_flow(net, &rt, &fl, sk, 1); - if (err) { - if (err == -ENETUNREACH) -@@ -1183,7 +1193,8 @@ try_again: + 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; @@ -25562,9 +24238,9 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv4/udp.c linux-2.6.36.2-vs2.3.0.36.38 + 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); } - if (inet->cmsg_flags) -@@ -1923,6 +1934,8 @@ static struct sock *udp_get_first(struct +@@ -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; @@ -25573,7 +24249,7 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv4/udp.c linux-2.6.36.2-vs2.3.0.36.38 if (sk->sk_family == state->family) goto found; } -@@ -1940,7 +1953,9 @@ static struct sock *udp_get_next(struct +@@ -2288,7 +2307,9 @@ static struct sock *udp_get_next(struct do { sk = sk_nulls_next(sk); @@ -25584,40 +24260,53 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv4/udp.c linux-2.6.36.2-vs2.3.0.36.38 if (!sk) { if (state->bucket <= state->udp_table->mask) -@@ -2047,7 +2062,10 @@ static void udp4_format_sock(struct sock - - seq_printf(f, "%5d: %08X:%04X %08X:%04X" - " %02X %08X:%08X %02X:%08lX %08X %5d %8d %lu %d %p %d%n", -- bucket, src, srcp, dest, destp, sp->sk_state, -+ bucket, -+ nx_map_sock_lback(current_nx_info(), src), srcp, -+ nx_map_sock_lback(current_nx_info(), dest), destp, -+ sp->sk_state, - sk_wmem_alloc_get(sp), - sk_rmem_alloc_get(sp), - 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp), -diff -NurpP --minimal linux-2.6.36.2/net/ipv6/addrconf.c linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv6/addrconf.c ---- linux-2.6.36.2/net/ipv6/addrconf.c 2010-10-21 13:07:59.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv6/addrconf.c 2010-10-21 13:09:36.000000000 +0200 -@@ -87,6 +87,8 @@ +@@ -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 -@@ -1119,7 +1121,7 @@ out: +@@ -1319,7 +1321,7 @@ out: - int ipv6_dev_get_saddr(struct net *net, struct net_device *dst_dev, + 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]; -@@ -1191,6 +1193,8 @@ int ipv6_dev_get_saddr(struct net *net, +@@ -1391,6 +1393,8 @@ int ipv6_dev_get_saddr(struct net *net, dev->name); continue; } @@ -25626,7 +24315,7 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv6/addrconf.c linux-2.6.36.2-vs2.3.0. score->rule = -1; bitmap_zero(score->scorebits, IPV6_SADDR_RULE_MAX); -@@ -3077,7 +3081,10 @@ static void if6_seq_stop(struct seq_file +@@ -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; @@ -25638,7 +24327,7 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv6/addrconf.c linux-2.6.36.2-vs2.3.0. &ifp->addr, ifp->idev->dev->ifindex, ifp->prefix_len, -@@ -3585,6 +3592,11 @@ static int in6_dump_addrs(struct inet6_d +@@ -4084,6 +4091,11 @@ static int in6_dump_addrs(struct inet6_d struct ifacaddr6 *ifaca; int err = 1; int ip_idx = *p_ip_idx; @@ -25650,47 +24339,54 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv6/addrconf.c linux-2.6.36.2-vs2.3.0. read_lock_bh(&idev->lock); switch (type) { -@@ -3595,6 +3607,8 @@ static int in6_dump_addrs(struct inet6_d +@@ -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).pid, + NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq, -@@ -3611,6 +3625,8 @@ static int in6_dump_addrs(struct inet6_d +@@ -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).pid, + NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq, -@@ -3626,6 +3642,8 @@ static int in6_dump_addrs(struct inet6_d +@@ -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).pid, + NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq, -@@ -3973,6 +3991,11 @@ static int inet6_dump_ifinfo(struct sk_b +@@ -4154,6 +4172,10 @@ static int inet6_dump_addr(struct sk_buf struct inet6_dev *idev; struct hlist_head *head; - struct hlist_node *node; -+ struct nx_info *nxi = skb->sk ? skb->sk->sk_nx_info : NULL; -+ + + /* 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]; -@@ -3984,6 +4007,8 @@ static int inet6_dump_ifinfo(struct sk_b - hlist_for_each_entry_rcu(dev, node, head, index_hlist) { +@@ -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)) @@ -25698,10 +24394,10 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv6/addrconf.c linux-2.6.36.2-vs2.3.0. idev = __in6_dev_get(dev); if (!idev) goto cont; -diff -NurpP --minimal linux-2.6.36.2/net/ipv6/af_inet6.c linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv6/af_inet6.c ---- linux-2.6.36.2/net/ipv6/af_inet6.c 2010-10-21 13:07:59.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv6/af_inet6.c 2010-10-21 13:09:36.000000000 +0200 -@@ -42,6 +42,8 @@ +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 @@ -25710,21 +24406,22 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv6/af_inet6.c linux-2.6.36.2-vs2.3.0. #include #include -@@ -160,9 +162,12 @@ lookup_protocol: +@@ -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 && !capable(CAP_NET_RAW)) + 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_no_check = answer->no_check; -@@ -261,6 +266,7 @@ int inet6_bind(struct socket *sock, stru + 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); @@ -25732,11 +24429,10 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv6/af_inet6.c linux-2.6.36.2-vs2.3.0. __be32 v4addr = 0; unsigned short snum; int addr_type = 0; -@@ -272,6 +278,11 @@ int inet6_bind(struct socket *sock, stru +@@ -271,6 +277,10 @@ int inet6_bind(struct socket *sock, stru + if (addr->sin6_family != AF_INET6) + return -EAFNOSUPPORT; - if (addr_len < SIN6_LEN_RFC2133) - return -EINVAL; -+ + err = v6_map_sock_addr(inet, addr, &nsa); + if (err) + return err; @@ -25744,15 +24440,7 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv6/af_inet6.c linux-2.6.36.2-vs2.3.0. addr_type = ipv6_addr_type(&addr->sin6_addr); if ((addr_type & IPV6_ADDR_MULTICAST) && sock->type == SOCK_STREAM) return -EINVAL; -@@ -303,6 +314,7 @@ int inet6_bind(struct socket *sock, stru - /* Reproduce AF_INET checks to make the bindings consitant */ - 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) && -@@ -312,6 +324,10 @@ int inet6_bind(struct socket *sock, stru +@@ -311,6 +321,10 @@ int inet6_bind(struct socket *sock, stru err = -EADDRNOTAVAIL; goto out; } @@ -25763,19 +24451,19 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv6/af_inet6.c linux-2.6.36.2-vs2.3.0. } else { if (addr_type != IPV6_ADDR_ANY) { struct net_device *dev = NULL; -@@ -338,6 +354,11 @@ int inet6_bind(struct socket *sock, stru +@@ -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; ++ goto out_unlock; + } + /* ipv4 addr of the socket is invalid. Only the * unspecified and mapped address have a v4 equivalent. */ -@@ -353,6 +374,9 @@ int inet6_bind(struct socket *sock, stru +@@ -353,6 +372,9 @@ int inet6_bind(struct socket *sock, stru } } @@ -25785,33 +24473,45 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv6/af_inet6.c linux-2.6.36.2-vs2.3.0. inet->inet_rcv_saddr = v4addr; inet->inet_saddr = v4addr; -@@ -454,9 +478,11 @@ int inet6_getname(struct socket *sock, s +@@ -454,9 +476,11 @@ int inet6_getname(struct socket *sock, s return -ENOTCONN; sin->sin6_port = inet->inet_dport; - ipv6_addr_copy(&sin->sin6_addr, &np->daddr); + 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(&np->rcv_saddr)) - ipv6_addr_copy(&sin->sin6_addr, &np->saddr); + if (ipv6_addr_any(&sk->sk_v6_rcv_saddr)) + sin->sin6_addr = np->saddr; else -diff -NurpP --minimal linux-2.6.36.2/net/ipv6/fib6_rules.c linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv6/fib6_rules.c ---- linux-2.6.36.2/net/ipv6/fib6_rules.c 2010-10-21 13:07:59.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv6/fib6_rules.c 2010-10-21 13:09:36.000000000 +0200 -@@ -89,7 +89,7 @@ static int fib6_rule_action(struct fib_r +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, - &flp->fl6_dst, + &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-2.6.36.2/net/ipv6/inet6_hashtables.c linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv6/inet6_hashtables.c ---- linux-2.6.36.2/net/ipv6/inet6_hashtables.c 2010-02-25 11:52:10.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv6/inet6_hashtables.c 2010-10-21 13:09:36.000000000 +0200 +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 @@ -25820,7 +24520,7 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv6/inet6_hashtables.c linux-2.6.36.2- #include #include -@@ -82,7 +83,6 @@ struct sock *__inet6_lookup_established( +@@ -116,7 +117,6 @@ struct sock *__inet6_lookup_established( unsigned int slot = hash & hashinfo->ehash_mask; struct inet_ehash_bucket *head = &hashinfo->ehash[slot]; @@ -25828,17 +24528,8 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv6/inet6_hashtables.c linux-2.6.36.2- rcu_read_lock(); begin: sk_nulls_for_each_rcu(sk, node, &head->chain) { -@@ -94,7 +94,7 @@ begin: - sock_put(sk); - goto begin; - } -- goto out; -+ goto out; - } - } - if (get_nulls_value(node) != slot) -@@ -140,6 +140,9 @@ static int inline compute_score(struct s - if (!ipv6_addr_equal(&np->rcv_saddr, daddr)) +@@ -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 { @@ -25847,56 +24538,66 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv6/inet6_hashtables.c linux-2.6.36.2- } if (sk->sk_bound_dev_if) { if (sk->sk_bound_dev_if != dif) -diff -NurpP --minimal linux-2.6.36.2/net/ipv6/ip6_output.c linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv6/ip6_output.c ---- linux-2.6.36.2/net/ipv6/ip6_output.c 2010-10-21 13:07:59.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv6/ip6_output.c 2010-10-21 13:09:36.000000000 +0200 -@@ -938,7 +938,7 @@ static int ip6_dst_lookup_tail(struct so - err = ipv6_dev_get_saddr(net, ip6_dst_idev(*dst)->dev, - &fl->fl6_dst, - sk ? inet6_sk(sk)->srcprefs : 0, -- &fl->fl6_src); -+ &fl->fl6_src, sk->sk_nx_info); +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-2.6.36.2/net/ipv6/Kconfig linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv6/Kconfig ---- linux-2.6.36.2/net/ipv6/Kconfig 2010-08-02 16:52:59.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv6/Kconfig 2010-10-21 13:09:36.000000000 +0200 -@@ -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-2.6.36.2/net/ipv6/ndisc.c linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv6/ndisc.c ---- linux-2.6.36.2/net/ipv6/ndisc.c 2010-10-21 13:07:59.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv6/ndisc.c 2010-10-21 13:09:36.000000000 +0200 -@@ -591,7 +591,7 @@ static void ndisc_send_na(struct net_dev +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 /* FIXME: ? */ )) ++ &tmpaddr, NULL)) return; src_addr = &tmpaddr; } -diff -NurpP --minimal linux-2.6.36.2/net/ipv6/raw.c linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv6/raw.c ---- linux-2.6.36.2/net/ipv6/raw.c 2010-10-21 13:07:59.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv6/raw.c 2010-10-21 13:09:36.000000000 +0200 +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 - #include -@@ -283,6 +284,13 @@ static int rawv6_bind(struct sock *sk, s +@@ -291,6 +292,13 @@ static int rawv6_bind(struct sock *sk, s goto out_unlock; } @@ -25910,22 +24611,51 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv6/raw.c linux-2.6.36.2-vs2.3.0.36.38 /* ipv4 addr of the socket is invalid. Only the * unspecified and mapped address have a v4 equivalent. */ -diff -NurpP --minimal linux-2.6.36.2/net/ipv6/route.c linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv6/route.c ---- linux-2.6.36.2/net/ipv6/route.c 2010-10-21 13:07:59.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv6/route.c 2010-10-21 13:09:36.000000000 +0200 -@@ -2272,7 +2272,8 @@ static int rt6_fill_node(struct net *net - struct inet6_dev *idev = ip6_dst_idev(&rt->dst); +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 (ipv6_dev_get_saddr(net, idev ? idev->dev : NULL, -- dst, 0, &saddr_buf) == 0) -+ dst, 0, &saddr_buf, -+ (skb->sk ? skb->sk->sk_nx_info : NULL)) == 0) - NLA_PUT(skb, RTA_PREFSRC, 16, &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-2.6.36.2/net/ipv6/tcp_ipv6.c linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv6/tcp_ipv6.c ---- linux-2.6.36.2/net/ipv6/tcp_ipv6.c 2010-10-21 13:07:59.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv6/tcp_ipv6.c 2010-10-21 13:09:36.000000000 +0200 +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 @@ -25934,11 +24664,11 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv6/tcp_ipv6.c linux-2.6.36.2-vs2.3.0. 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, -@@ -160,8 +161,15 @@ static int tcp_v6_connect(struct sock *s +@@ -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)) +- 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; @@ -25952,84 +24682,19 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv6/tcp_ipv6.c linux-2.6.36.2-vs2.3.0. addr_type = ipv6_addr_type(&usin->sin6_addr); -diff -NurpP --minimal linux-2.6.36.2/net/ipv6/udp.c linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv6/udp.c ---- linux-2.6.36.2/net/ipv6/udp.c 2010-10-21 13:07:59.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv6/udp.c 2010-10-21 13:09:36.000000000 +0200 -@@ -48,13 +48,14 @@ +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 -+#include - #include "udp_impl.h" - - int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2) - { - const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr; - const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2); -- __be32 sk1_rcv_saddr = inet_sk(sk)->inet_rcv_saddr; -+ __be32 sk_rcv_saddr = inet_sk(sk)->inet_rcv_saddr; - __be32 sk2_rcv_saddr = inet_rcv_saddr(sk2); - int sk_ipv6only = ipv6_only_sock(sk); - int sk2_ipv6only = inet_v6_ipv6only(sk2); -@@ -62,24 +63,49 @@ int ipv6_rcv_saddr_equal(const struct so - 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 && -- (!sk1_rcv_saddr || !sk2_rcv_saddr || -- sk1_rcv_saddr == sk2_rcv_saddr)); -+ if (addr_type == IPV6_ADDR_MAPPED && addr_type2 == IPV6_ADDR_MAPPED) { -+ if (!sk2_ipv6only && -+ (!sk_rcv_saddr || !sk2_rcv_saddr || -+ sk_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; -+ goto vs; - - if (sk2_rcv_saddr6 && - ipv6_addr_equal(sk_rcv_saddr6, sk2_rcv_saddr6)) -- return 1; -+ goto vs; - - return 0; -+ -+vs_v4: -+ if (!sk_rcv_saddr && !sk2_rcv_saddr) -+ return nx_v4_addr_conflict(sk->sk_nx_info, sk2->sk_nx_info); -+ if (!sk2_rcv_saddr) -+ return v4_addr_in_nx_info(sk->sk_nx_info, sk2_rcv_saddr, -1); -+ if (!sk_rcv_saddr) -+ return v4_addr_in_nx_info(sk2->sk_nx_info, sk_rcv_saddr, -1); -+ return 1; -+vs: -+ if (addr_type2 == IPV6_ADDR_ANY && addr_type == IPV6_ADDR_ANY) -+ return nx_v6_addr_conflict(sk->sk_nx_info, sk2->sk_nx_info); -+ else if (addr_type2 == IPV6_ADDR_ANY) -+ return v6_addr_in_nx_info(sk2->sk_nx_info, sk_rcv_saddr6, -1); -+ else if (addr_type == IPV6_ADDR_ANY) { -+ if (addr_type2 == IPV6_ADDR_MAPPED) -+ return nx_v4_addr_conflict(sk->sk_nx_info, sk2->sk_nx_info); -+ else -+ return v6_addr_in_nx_info(sk->sk_nx_info, sk2_rcv_saddr6, -1); -+ } -+ return 1; - } - - static unsigned int udp6_portaddr_hash(struct net *net, -@@ -143,6 +169,10 @@ static inline int compute_score(struct s - if (!ipv6_addr_equal(&np->rcv_saddr, daddr)) +@@ -159,6 +160,10 @@ static inline int compute_score(struct s + if (inet->inet_dport != sport) return -1; score++; + } else { @@ -26037,12 +24702,12 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv6/udp.c linux-2.6.36.2-vs2.3.0.36.38 + 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-2.6.36.2/net/ipv6/xfrm6_policy.c linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv6/xfrm6_policy.c ---- linux-2.6.36.2/net/ipv6/xfrm6_policy.c 2010-08-02 16:53:00.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/net/ipv6/xfrm6_policy.c 2010-10-21 13:09:36.000000000 +0200 -@@ -62,7 +62,7 @@ static int xfrm6_get_saddr(struct net *n + 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, @@ -26051,21 +24716,33 @@ diff -NurpP --minimal linux-2.6.36.2/net/ipv6/xfrm6_policy.c linux-2.6.36.2-vs2. dst_release(dst); return 0; } -diff -NurpP --minimal linux-2.6.36.2/net/netlink/af_netlink.c linux-2.6.36.2-vs2.3.0.36.38.2/net/netlink/af_netlink.c ---- linux-2.6.36.2/net/netlink/af_netlink.c 2010-10-21 13:08:01.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/net/netlink/af_netlink.c 2010-10-21 13:09:36.000000000 +0200 -@@ -55,6 +55,9 @@ - #include - #include - #include +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 -@@ -1928,6 +1931,8 @@ static struct sock *netlink_seq_socket_i - sk_for_each(s, node, &hash->table[j]) { +@@ -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)) @@ -26073,65 +24750,29 @@ diff -NurpP --minimal linux-2.6.36.2/net/netlink/af_netlink.c linux-2.6.36.2-vs2 if (off == pos) { iter->link = i; iter->hash_idx = j; -@@ -1962,7 +1967,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; - -@@ -1974,7 +1980,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-2.6.36.2/net/sctp/ipv6.c linux-2.6.36.2-vs2.3.0.36.38.2/net/sctp/ipv6.c ---- linux-2.6.36.2/net/sctp/ipv6.c 2010-08-02 16:53:01.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/net/sctp/ipv6.c 2010-10-21 13:09:36.000000000 +0200 -@@ -304,7 +304,8 @@ static void sctp_v6_get_saddr(struct sct - dst ? ip6_dst_idev(dst)->dev : NULL, - &daddr->v6.sin6_addr, - inet6_sk(&sk->inet.sk)->srcprefs, -- &saddr->v6.sin6_addr); -+ &saddr->v6.sin6_addr, -+ asoc->base.sk->sk_nx_info); - SCTP_DEBUG_PRINTK("saddr from ipv6_get_saddr: %pI6\n", - &saddr->v6.sin6_addr); - return; -diff -NurpP --minimal linux-2.6.36.2/net/socket.c linux-2.6.36.2-vs2.3.0.36.38.2/net/socket.c ---- linux-2.6.36.2/net/socket.c 2010-12-13 22:08:59.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/net/socket.c 2010-12-13 22:09:27.000000000 +0100 -@@ -98,6 +98,10 @@ +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 #include -@@ -551,7 +555,7 @@ static inline int __sock_sendmsg(struct - struct msghdr *msg, size_t size) +@@ -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); -- int err; -+ int err, len; - - sock_update_classid(sock->sk); ++ size_t len; -@@ -564,7 +568,22 @@ static inline int __sock_sendmsg(struct - if (err) - return err; + 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); @@ -26142,7 +24783,7 @@ diff -NurpP --minimal linux-2.6.36.2/net/socket.c linux-2.6.36.2-vs2.3.0.36.38.2 + vx_sock_fail(sock->sk, size); + } + vxdprintk(VXD_CBIT(net, 7), -+ "__sock_sendmsg: %p[%p,%p,%p;%d/%d]:%d/%d", ++ "__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, @@ -26152,16 +24793,16 @@ diff -NurpP --minimal linux-2.6.36.2/net/socket.c linux-2.6.36.2-vs2.3.0.36.38.2 + return len; } - int sock_sendmsg(struct socket *sock, struct msghdr *msg, size_t size) -@@ -681,6 +700,7 @@ static inline int __sock_recvmsg_nosec(s + 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; - sock_update_classid(sock->sk); - -@@ -690,7 +710,18 @@ static inline int __sock_recvmsg_nosec(s + si->sock = sock; + si->scm = NULL; +@@ -787,7 +807,18 @@ static inline int __sock_recvmsg_nosec(s si->size = size; si->flags = flags; @@ -26181,7 +24822,7 @@ diff -NurpP --minimal linux-2.6.36.2/net/socket.c linux-2.6.36.2-vs2.3.0.36.38.2 } static inline int __sock_recvmsg(struct kiocb *iocb, struct socket *sock, -@@ -1159,6 +1190,13 @@ static int __sock_create(struct net *net +@@ -1264,6 +1295,13 @@ int __sock_create(struct net *net, int f if (type < 0 || type >= SOCK_MAX) return -EINVAL; @@ -26195,7 +24836,7 @@ diff -NurpP --minimal linux-2.6.36.2/net/socket.c linux-2.6.36.2-vs2.3.0.36.38.2 /* Compatibility. This uglymoron is moved from INET layer to here to avoid -@@ -1293,6 +1331,7 @@ SYSCALL_DEFINE3(socket, int, family, int +@@ -1398,6 +1436,7 @@ SYSCALL_DEFINE3(socket, int, family, int if (retval < 0) goto out; @@ -26203,7 +24844,7 @@ diff -NurpP --minimal linux-2.6.36.2/net/socket.c linux-2.6.36.2-vs2.3.0.36.38.2 retval = sock_map_fd(sock, flags & (O_CLOEXEC | O_NONBLOCK)); if (retval < 0) goto out_release; -@@ -1334,10 +1373,12 @@ SYSCALL_DEFINE4(socketpair, int, family, +@@ -1439,10 +1478,12 @@ SYSCALL_DEFINE4(socketpair, int, family, err = sock_create(family, type, protocol, &sock1); if (err < 0) goto out; @@ -26216,52 +24857,51 @@ diff -NurpP --minimal linux-2.6.36.2/net/socket.c linux-2.6.36.2-vs2.3.0.36.38.2 err = sock1->ops->socketpair(sock1, sock2); if (err < 0) -diff -NurpP --minimal linux-2.6.36.2/net/sunrpc/auth.c linux-2.6.36.2-vs2.3.0.36.38.2/net/sunrpc/auth.c ---- linux-2.6.36.2/net/sunrpc/auth.c 2010-10-21 13:08:01.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/net/sunrpc/auth.c 2010-10-21 13:09:36.000000000 +0200 -@@ -14,6 +14,7 @@ - #include +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 -@@ -425,6 +426,7 @@ rpcauth_lookupcred(struct rpc_auth *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 = dx_current_tag(); - acred.group_info = get_group_info(((struct cred *)cred)->group_info); - ++ 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); -@@ -465,6 +467,7 @@ rpcauth_bind_root_cred(struct rpc_task * + return ret; +@@ -669,6 +671,7 @@ rpcauth_bind_root_cred(struct rpc_task * struct auth_cred acred = { - .uid = 0, - .gid = 0, -+ .tag = dx_current_tag(), + .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-2.6.36.2/net/sunrpc/auth_unix.c linux-2.6.36.2-vs2.3.0.36.38.2/net/sunrpc/auth_unix.c ---- linux-2.6.36.2/net/sunrpc/auth_unix.c 2010-10-21 13:08:01.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/net/sunrpc/auth_unix.c 2010-10-21 13:09:36.000000000 +0200 -@@ -12,12 +12,14 @@ - #include +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; - gid_t uc_gid; -+ tag_t uc_tag; - gid_t uc_gids[NFS_NGROUPS]; ++ ktag_t uc_tag; + kgid_t uc_gid; + kgid_t uc_gids[NFS_NGROUPS]; }; - #define uc_uid uc_base.cr_uid -@@ -78,6 +80,7 @@ unx_create_cred(struct rpc_auth *auth, s +@@ -80,6 +82,7 @@ unx_create_cred(struct rpc_auth *auth, s groups = NFS_NGROUPS; cred->uc_gid = acred->gid; @@ -26269,18 +24909,18 @@ diff -NurpP --minimal linux-2.6.36.2/net/sunrpc/auth_unix.c linux-2.6.36.2-vs2.3 for (i = 0; i < groups; i++) cred->uc_gids[i] = GROUP_AT(acred->group_info, i); if (i < NFS_NGROUPS) -@@ -119,7 +122,9 @@ unx_match(struct auth_cred *acred, struc +@@ -121,7 +124,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) +- 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) -@@ -142,7 +147,7 @@ unx_marshal(struct rpc_task *task, __be3 +@@ -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; @@ -26289,33 +24929,32 @@ diff -NurpP --minimal linux-2.6.36.2/net/sunrpc/auth_unix.c linux-2.6.36.2-vs2.3 *p++ = htonl(RPC_AUTH_UNIX); base = p++; -@@ -152,9 +157,12 @@ unx_marshal(struct rpc_task *task, __be3 - * Copy the UTS nodename captured when the client was created. +@@ -157,8 +162,11 @@ unx_marshal(struct rpc_task *task, __be3 */ 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)); +- *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 && cred->uc_gids[i] != (gid_t) NOGROUP; i++) - *p++ = htonl((u32) cred->uc_gids[i]); -diff -NurpP --minimal linux-2.6.36.2/net/sunrpc/clnt.c linux-2.6.36.2-vs2.3.0.36.38.2/net/sunrpc/clnt.c ---- linux-2.6.36.2/net/sunrpc/clnt.c 2010-12-13 22:08:59.000000000 +0100 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/net/sunrpc/clnt.c 2010-12-13 22:09:27.000000000 +0100 -@@ -33,6 +33,7 @@ - #include - #include + 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 -@@ -358,6 +359,9 @@ struct rpc_clnt *rpc_create(struct rpc_c + #include +@@ -468,6 +469,9 @@ struct rpc_clnt *rpc_create_xprt(struct if (!(args->flags & RPC_CLNT_CREATE_QUIET)) clnt->cl_chatty = 1; @@ -26324,20 +24963,20 @@ diff -NurpP --minimal linux-2.6.36.2/net/sunrpc/clnt.c linux-2.6.36.2-vs2.3.0.36 + clnt->cl_tag = 1; */ return clnt; } - EXPORT_SYMBOL_GPL(rpc_create); -diff -NurpP --minimal linux-2.6.36.2/net/unix/af_unix.c linux-2.6.36.2-vs2.3.0.36.38.2/net/unix/af_unix.c ---- linux-2.6.36.2/net/unix/af_unix.c 2010-10-21 13:08:01.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/net/unix/af_unix.c 2010-10-21 13:09:36.000000000 +0200 -@@ -114,6 +114,8 @@ - #include + 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 - static struct hlist_head unix_socket_table[UNIX_HASH_SIZE + 1]; - static DEFINE_SPINLOCK(unix_table_lock); -@@ -258,6 +260,8 @@ static struct sock *__unix_find_socket_b + 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; @@ -26346,29 +24985,28 @@ diff -NurpP --minimal linux-2.6.36.2/net/unix/af_unix.c linux-2.6.36.2-vs2.3.0.3 if (u->addr->len == len && !memcmp(u->addr->name, sunname, len)) goto found; -@@ -2148,6 +2152,8 @@ static struct sock *unix_seq_idx(struct - for (s = first_unix_socket(&iter->i); s; s = next_unix_socket(&iter->i, s)) { - if (sock_net(s) != seq_file_net(seq)) +@@ -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(s->sk_nid, VS_WATCH_P | VS_IDENT)) ++ if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)) + continue; - if (off == pos) - return s; - ++off; -@@ -2172,7 +2178,8 @@ static void *unix_seq_next(struct seq_fi - sk = first_unix_socket(&iter->i); - else - sk = next_unix_socket(&iter->i, sk); -- 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))) - sk = next_unix_socket(&iter->i, sk); - return sk; - } -diff -NurpP --minimal linux-2.6.36.2/scripts/checksyscalls.sh linux-2.6.36.2-vs2.3.0.36.38.2/scripts/checksyscalls.sh ---- linux-2.6.36.2/scripts/checksyscalls.sh 2010-10-21 13:08:01.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/scripts/checksyscalls.sh 2010-10-21 13:09:36.000000000 +0200 -@@ -193,7 +193,6 @@ cat << EOF + 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 @@ -26376,59 +25014,33 @@ diff -NurpP --minimal linux-2.6.36.2/scripts/checksyscalls.sh linux-2.6.36.2-vs2 EOF } -diff -NurpP --minimal linux-2.6.36.2/security/commoncap.c linux-2.6.36.2-vs2.3.0.36.38.2/security/commoncap.c ---- linux-2.6.36.2/security/commoncap.c 2010-10-21 13:08:02.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/security/commoncap.c 2010-10-21 13:09:36.000000000 +0200 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - /* - * If a non-root user executes a setuid-root binary in -@@ -53,7 +54,7 @@ static void warn_setuid_and_fcaps_mixed( - - int cap_netlink_send(struct sock *sk, struct sk_buff *skb) +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) { -- NETLINK_CB(skb).eff_cap = current_cap(); -+ NETLINK_CB(skb).eff_cap = vx_mbcaps(current_cap()); - return 0; - } - -@@ -63,6 +64,7 @@ int cap_netlink_recv(struct sk_buff *skb - return -EPERM; - return 0; - } -+ - EXPORT_SYMBOL(cap_netlink_recv); ++ struct vx_info *vxi = current_vx_info(); /* FIXME: get vxi from cred? */ + struct user_namespace *ns = targ_ns; - /** -@@ -83,7 +85,22 @@ EXPORT_SYMBOL(cap_netlink_recv); - int cap_capable(struct task_struct *tsk, const struct cred *cred, int cap, - int audit) - { -- return cap_raised(cred->cap_effective, cap) ? 0 : -EPERM; -+ struct vx_info *vxi = tsk->vx_info; -+ -+#if 0 -+ printk("cap_capable() VXF_STATE_SETUP = %llx, raised = %x, eff = %08x:%08x\n", -+ vx_info_flags(vxi, VXF_STATE_SETUP, 0), -+ cap_raised(tsk->cap_effective, cap), -+ tsk->cap_effective.cap[1], tsk->cap_effective.cap[0]); -+#endif -+ -+ /* special case SETUP */ -+ if (vx_info_flags(vxi, VXF_STATE_SETUP, 0) && -+ /* FIXME: maybe use cred instead? */ -+ cap_raised(tsk->cred->cap_effective, cap)) -+ return 0; -+ -+ return vx_cap_raised(vxi, cred->cap_effective, cap) ? 0 : -EPERM; - } + /* 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; ++ } - /** -@@ -571,7 +588,7 @@ int cap_inode_setxattr(struct dentry *de + /* 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) && @@ -26437,7 +25049,7 @@ diff -NurpP --minimal linux-2.6.36.2/security/commoncap.c linux-2.6.36.2-vs2.3.0 return -EPERM; return 0; } -@@ -597,7 +614,7 @@ int cap_inode_removexattr(struct dentry +@@ -657,7 +662,7 @@ int cap_inode_removexattr(struct dentry if (!strncmp(name, XATTR_SECURITY_PREFIX, sizeof(XATTR_SECURITY_PREFIX) - 1) && @@ -26446,25 +25058,10 @@ diff -NurpP --minimal linux-2.6.36.2/security/commoncap.c linux-2.6.36.2-vs2.3.0 return -EPERM; return 0; } -@@ -899,7 +916,8 @@ int cap_syslog(int type, bool from_file) - if (type != SYSLOG_ACTION_OPEN && from_file) - return 0; - if ((type != SYSLOG_ACTION_READ_ALL && -- type != SYSLOG_ACTION_SIZE_BUFFER) && !capable(CAP_SYS_ADMIN)) -+ type != SYSLOG_ACTION_SIZE_BUFFER) && -+ !vx_capable(CAP_SYS_ADMIN, VXC_SYSLOG)) - return -EPERM; - return 0; - } -@@ -951,3 +969,4 @@ int cap_file_mmap(struct file *file, uns - } - return ret; - } -+ -diff -NurpP --minimal linux-2.6.36.2/security/selinux/hooks.c linux-2.6.36.2-vs2.3.0.36.38.2/security/selinux/hooks.c ---- linux-2.6.36.2/security/selinux/hooks.c 2010-10-21 13:08:02.000000000 +0200 -+++ linux-2.6.36.2-vs2.3.0.36.38.2/security/selinux/hooks.c 2010-10-21 13:09:36.000000000 +0200 -@@ -64,7 +64,6 @@ +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 */