-diff -NurpP --minimal linux-2.6.19.1/Documentation/vserver/debug.txt linux-2.6.19.1-vs2.3.0.6/Documentation/vserver/debug.txt
---- linux-2.6.19.1/Documentation/vserver/debug.txt 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/Documentation/vserver/debug.txt 2006-11-08 04:57:48 +0100
+diff -urNp -x '*.orig' linux-4.9/Documentation/vserver/debug.txt linux-4.9/Documentation/vserver/debug.txt
+--- linux-4.9/Documentation/vserver/debug.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/Documentation/vserver/debug.txt 2021-02-24 15:47:45.047741532 +0100
@@ -0,0 +1,154 @@
+
+debug_cvirt:
+ "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«"
++ 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«"
++ "old path ?%s?"
+ "path_lookup(old): %d"
+ "vfs_create(new): %d"
+ "vfs_rename: %d"
+ "set_nx_info(%p[#%d.%d])"
+ 4 10 "__hash_nx_info: %p[#%d]"
+ "__nx_dynamic_id: [#%d]"
-+ "__unhash_nx_info: %p[#%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)"
+
+debug_tag:
+
-+ 7 80 "dx_parse_tag(»%s«): %d:#%d"
++ 7 80 "dx_parse_tag(?%s?): %d:#%d"
+ "dx_propagate_tag(%p[#%lu.%d]): %d,%d"
+
+debug_xid:
+ "init_vx_info(%p[#%d.%d])"
+ "release_vx_info(%p[#%d.%d.%d]) %p"
+ "set_vx_info(%p[#%d.%d])"
-+ "vx_child_reaper(%p[#%u,%u]) = %p[#%u,%u]"
+ 4 10 "__hash_vx_info: %p[#%d]"
-+ "__unhash_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]"
+ "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:
+ 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.19.1/arch/alpha/Kconfig linux-2.6.19.1-vs2.3.0.6/arch/alpha/Kconfig
---- linux-2.6.19.1/arch/alpha/Kconfig 2006-11-30 21:18:23 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/alpha/Kconfig 2006-11-08 04:57:40 +0100
-@@ -632,6 +632,8 @@ source "arch/alpha/oprofile/Kconfig"
-
- source "arch/alpha/Kconfig.debug"
+diff -urNp -x '*.orig' linux-4.9/arch/alpha/Kconfig linux-4.9/arch/alpha/Kconfig
+--- linux-4.9/arch/alpha/Kconfig 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/arch/alpha/Kconfig 2021-02-24 15:47:45.037741219 +0100
+@@ -743,6 +743,8 @@ config DUMMY_CONSOLE
+ depends on VGA_HOSE
+ default y
+source "kernel/vserver/Kconfig"
+
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.19.1/arch/alpha/kernel/asm-offsets.c linux-2.6.19.1-vs2.3.0.6/arch/alpha/kernel/asm-offsets.c
---- linux-2.6.19.1/arch/alpha/kernel/asm-offsets.c 2006-02-15 13:54:10 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/alpha/kernel/asm-offsets.c 2006-11-08 04:57:50 +0100
-@@ -36,6 +36,7 @@ void foo(void)
- DEFINE(PT_PTRACED, PT_PTRACED);
- DEFINE(CLONE_VM, CLONE_VM);
- DEFINE(CLONE_UNTRACED, CLONE_UNTRACED);
-+ DEFINE(CLONE_KTHREAD, CLONE_KTHREAD);
- DEFINE(SIGCHLD, SIGCHLD);
- BLANK();
-
-diff -NurpP --minimal linux-2.6.19.1/arch/alpha/kernel/entry.S linux-2.6.19.1-vs2.3.0.6/arch/alpha/kernel/entry.S
---- linux-2.6.19.1/arch/alpha/kernel/entry.S 2006-11-30 21:18:23 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/alpha/kernel/entry.S 2006-11-08 04:57:52 +0100
-@@ -644,7 +644,7 @@ kernel_thread:
- stq $2, 152($sp) /* HAE */
-
- /* Shuffle FLAGS to the front; add CLONE_VM. */
-- ldi $1, CLONE_VM|CLONE_UNTRACED
-+ ldi $1, CLONE_VM | CLONE_UNTRACED | CLONE_KTHREAD;
- or $18, $1, $16
- bsr $26, sys_clone
-
-@@ -873,24 +873,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.19.1/arch/alpha/kernel/osf_sys.c linux-2.6.19.1-vs2.3.0.6/arch/alpha/kernel/osf_sys.c
---- linux-2.6.19.1/arch/alpha/kernel/osf_sys.c 2006-11-30 21:18:23 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/alpha/kernel/osf_sys.c 2006-12-02 01:37:05 +0100
-@@ -885,7 +885,7 @@ osf_gettimeofday(struct timeval32 __user
- {
- if (tv) {
- struct timeval ktv;
-- do_gettimeofday(&ktv);
-+ vx_gettimeofday(&ktv);
- if (put_tv32(tv, &ktv))
- return -EFAULT;
- }
-diff -NurpP --minimal linux-2.6.19.1/arch/alpha/kernel/ptrace.c linux-2.6.19.1-vs2.3.0.6/arch/alpha/kernel/ptrace.c
---- linux-2.6.19.1/arch/alpha/kernel/ptrace.c 2006-04-09 13:49:39 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/arch/alpha/kernel/ptrace.c 2006-11-30 18:53:18 +0100
-@@ -15,6 +15,7 @@
- #include <linux/slab.h>
- #include <linux/security.h>
- #include <linux/signal.h>
-+#include <linux/vs_base.h>
-
- #include <asm/uaccess.h>
- #include <asm/pgtable.h>
-@@ -283,6 +284,11 @@ do_sys_ptrace(long request, long pid, lo
- goto out_notsk;
- }
-
-+ if (!vx_check(vx_task_xid(child), VS_WATCH_P|VS_IDENT)) {
-+ ret = -EPERM;
-+ goto out;
-+ }
-+
- if (request == PTRACE_ATTACH) {
- ret = ptrace_attach(child);
- goto out;
-diff -NurpP --minimal linux-2.6.19.1/arch/alpha/kernel/semaphore.c linux-2.6.19.1-vs2.3.0.6/arch/alpha/kernel/semaphore.c
---- linux-2.6.19.1/arch/alpha/kernel/semaphore.c 2004-08-14 12:55:32 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/arch/alpha/kernel/semaphore.c 2006-11-08 04:57:42 +0100
-@@ -68,8 +68,8 @@ __down_failed(struct semaphore *sem)
- DECLARE_WAITQUEUE(wait, tsk);
-
- #ifdef CONFIG_DEBUG_SEMAPHORE
-- printk("%s(%d): down failed(%p)\n",
-- tsk->comm, tsk->pid, sem);
-+ printk("%s(%d:#%u): down failed(%p)\n",
-+ tsk->comm, tsk->pid, tsk->xid, sem);
- #endif
-
- tsk->state = TASK_UNINTERRUPTIBLE;
-@@ -97,8 +97,8 @@ __down_failed(struct semaphore *sem)
- wake_up(&sem->wait);
-
- #ifdef CONFIG_DEBUG_SEMAPHORE
-- printk("%s(%d): down acquired(%p)\n",
-- tsk->comm, tsk->pid, sem);
-+ printk("%s(%d:#%u): down acquired(%p)\n",
-+ tsk->comm, tsk->pid, tsk->xid, sem);
- #endif
- }
-
-@@ -110,8 +110,8 @@ __down_failed_interruptible(struct semap
- long ret = 0;
-
- #ifdef CONFIG_DEBUG_SEMAPHORE
-- printk("%s(%d): down failed(%p)\n",
-- tsk->comm, tsk->pid, sem);
-+ printk("%s(%d:#%u): down failed(%p)\n",
-+ tsk->comm, tsk->pid, tsk->xid, sem);
- #endif
-
- tsk->state = TASK_INTERRUPTIBLE;
-diff -NurpP --minimal linux-2.6.19.1/arch/alpha/kernel/systbls.S linux-2.6.19.1-vs2.3.0.6/arch/alpha/kernel/systbls.S
---- linux-2.6.19.1/arch/alpha/kernel/systbls.S 2006-11-30 21:18:23 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/alpha/kernel/systbls.S 2006-11-08 04:57:41 +0100
+diff -urNp -x '*.orig' linux-4.9/arch/alpha/kernel/systbls.S linux-4.9/arch/alpha/kernel/systbls.S
+--- linux-4.9/arch/alpha/kernel/systbls.S 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/arch/alpha/kernel/systbls.S 2021-02-24 15:47:45.037741219 +0100
@@ -446,7 +446,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
.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.19.1/arch/alpha/kernel/traps.c linux-2.6.19.1-vs2.3.0.6/arch/alpha/kernel/traps.c
---- linux-2.6.19.1/arch/alpha/kernel/traps.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/arch/alpha/kernel/traps.c 2006-11-08 04:57:42 +0100
-@@ -182,7 +182,8 @@ die_if_kernel(char * str, struct pt_regs
+diff -urNp -x '*.orig' linux-4.9/arch/alpha/kernel/traps.c linux-4.9/arch/alpha/kernel/traps.c
+--- linux-4.9/arch/alpha/kernel/traps.c 2021-02-24 15:47:30.747294162 +0100
++++ linux-4.9/arch/alpha/kernel/traps.c 2021-02-24 15:47:45.037741219 +0100
+@@ -179,7 +179,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, current->pid, str, err);
-+ printk("%s(%d[#%u]): %s %ld\n", current->comm,
-+ current->pid, current->xid, str, err);
+- printk("%s(%d): %s %ld\n", current->comm, task_pid_nr(current), str, err);
++ 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, LOCKDEP_NOW_UNRELIABLE);
dik_show_trace((unsigned long *)(regs+1));
- dik_show_code((unsigned int *)regs->pc);
-diff -NurpP --minimal linux-2.6.19.1/arch/alpha/mm/init.c linux-2.6.19.1-vs2.3.0.6/arch/alpha/mm/init.c
---- linux-2.6.19.1/arch/alpha/mm/init.c 2006-11-30 21:18:23 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/alpha/mm/init.c 2006-11-08 04:57:39 +0100
-@@ -20,6 +20,7 @@
- #include <linux/init.h>
- #include <linux/bootmem.h> /* max_low_pfn */
- #include <linux/vmalloc.h>
-+#include <linux/pagemap.h>
-
- #include <asm/system.h>
- #include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.19.1/arch/arm/Kconfig linux-2.6.19.1-vs2.3.0.6/arch/arm/Kconfig
---- linux-2.6.19.1/arch/arm/Kconfig 2006-11-30 21:18:24 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/arm/Kconfig 2006-11-30 20:55:45 +0100
-@@ -935,6 +935,8 @@ source "arch/arm/oprofile/Kconfig"
+diff -urNp -x '*.orig' linux-4.9/arch/arm/Kconfig linux-4.9/arch/arm/Kconfig
+--- linux-4.9/arch/arm/Kconfig 2021-02-24 15:47:30.757294474 +0100
++++ linux-4.9/arch/arm/Kconfig 2021-02-24 15:47:45.041074656 +0100
+@@ -2202,6 +2202,8 @@ source "fs/Kconfig"
source "arch/arm/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.19.1/arch/arm/kernel/calls.S linux-2.6.19.1-vs2.3.0.6/arch/arm/kernel/calls.S
---- linux-2.6.19.1/arch/arm/kernel/calls.S 2006-02-18 14:39:40 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/arm/kernel/calls.S 2006-11-08 04:57:41 +0100
+diff -urNp -x '*.orig' linux-4.9/arch/arm/kernel/calls.S linux-4.9/arch/arm/kernel/calls.S
+--- linux-4.9/arch/arm/kernel/calls.S 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/arch/arm/kernel/calls.S 2021-02-24 15:47:45.041074656 +0100
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-2.6.19.1/arch/arm/kernel/process.c linux-2.6.19.1-vs2.3.0.6/arch/arm/kernel/process.c
---- linux-2.6.19.1/arch/arm/kernel/process.c 2006-11-30 21:18:24 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/arm/kernel/process.c 2006-11-08 04:57:50 +0100
-@@ -246,7 +246,8 @@ void __show_regs(struct pt_regs *regs)
- void show_regs(struct pt_regs * regs)
- {
- printk("\n");
-- printk("Pid: %d, comm: %20s\n", current->pid, current->comm);
-+ printk("Pid: %d[#%u], comm: %20s\n",
-+ current->pid, current->xid, current->comm);
- __show_regs(regs);
- __backtrace();
- }
-@@ -469,7 +470,8 @@ pid_t kernel_thread(int (*fn)(void *), v
- regs.ARM_pc = (unsigned long)kernel_thread_helper;
- regs.ARM_cpsr = SVC_MODE;
-
-- return do_fork(flags|CLONE_VM|CLONE_UNTRACED, 0, ®s, 0, NULL, NULL);
-+ return do_fork(flags | CLONE_VM | CLONE_UNTRACED | CLONE_KTHREAD,
-+ 0, ®s, 0, NULL, NULL);
- }
- EXPORT_SYMBOL(kernel_thread);
+diff -urNp -x '*.orig' linux-4.9/arch/arm/kernel/traps.c linux-4.9/arch/arm/kernel/traps.c
+--- linux-4.9/arch/arm/kernel/traps.c 2021-02-24 15:47:30.797295726 +0100
++++ linux-4.9/arch/arm/kernel/traps.c 2021-02-24 15:47:45.041074656 +0100
+@@ -279,8 +279,8 @@ static int __die(const char *str, int er
-diff -NurpP --minimal linux-2.6.19.1/arch/arm/kernel/traps.c linux-2.6.19.1-vs2.3.0.6/arch/arm/kernel/traps.c
---- linux-2.6.19.1/arch/arm/kernel/traps.c 2006-11-30 21:18:24 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/arm/kernel/traps.c 2006-11-08 04:57:42 +0100
-@@ -205,8 +205,8 @@ static void __die(const char *str, int e
- printk("Internal error: %s: %x [#%d]\n", str, err, ++die_counter);
print_modules();
__show_regs(regs);
-- printk("Process %s (pid: %d, stack limit = 0x%p)\n",
-- tsk->comm, tsk->pid, thread + 1);
-+ printk("Process %s (pid: %d:#%u, stack limit = 0x%p)\n",
-+ tsk->comm, tsk->pid, tsk->xid, thread + 1);
-
- if (!user_mode(regs) || in_interrupt()) {
- dump_mem("Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-2.6.19.1/arch/arm26/Kconfig linux-2.6.19.1-vs2.3.0.6/arch/arm26/Kconfig
---- linux-2.6.19.1/arch/arm26/Kconfig 2006-09-20 16:57:57 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/arch/arm26/Kconfig 2006-11-08 04:57:40 +0100
-@@ -234,6 +234,8 @@ source "drivers/usb/Kconfig"
-
- source "arch/arm26/Kconfig.debug"
-
-+source "kernel/vserver/Kconfig"
-+
- source "security/Kconfig"
-
- source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.19.1/arch/arm26/kernel/calls.S linux-2.6.19.1-vs2.3.0.6/arch/arm26/kernel/calls.S
---- linux-2.6.19.1/arch/arm26/kernel/calls.S 2005-03-02 12:38:19 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/arm26/kernel/calls.S 2006-11-08 04:57:41 +0100
-@@ -257,6 +257,11 @@ __syscall_start:
- .long sys_lremovexattr
- .long sys_fremovexattr
- .long sys_tkill
-+
-+ .rept 313 - (. - __syscall_start) / 4
-+ .long sys_ni_syscall
-+ .endr
-+ .long sys_vserver /* 313 */
- __syscall_end:
-
- .rept NR_syscalls - (__syscall_end - __syscall_start) / 4
-diff -NurpP --minimal linux-2.6.19.1/arch/arm26/kernel/process.c linux-2.6.19.1-vs2.3.0.6/arch/arm26/kernel/process.c
---- linux-2.6.19.1/arch/arm26/kernel/process.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/arch/arm26/kernel/process.c 2006-11-08 04:57:50 +0100
-@@ -365,7 +365,8 @@ pid_t kernel_thread(int (*fn)(void *), v
- regs.ARM_r3 = (unsigned long)do_exit;
- regs.ARM_pc = (unsigned long)kernel_thread_helper | MODE_SVC26;
-
-- return do_fork(flags|CLONE_VM|CLONE_UNTRACED, 0, ®s, 0, NULL, NULL);
-+ return do_fork(flags | CLONE_VM | CLONE_UNTRACED | CLONE_KTHREAD,
-+ 0, ®s, 0, NULL, NULL);
- }
- EXPORT_SYMBOL(kernel_thread);
-
-diff -NurpP --minimal linux-2.6.19.1/arch/arm26/kernel/traps.c linux-2.6.19.1-vs2.3.0.6/arch/arm26/kernel/traps.c
---- linux-2.6.19.1/arch/arm26/kernel/traps.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/arch/arm26/kernel/traps.c 2006-11-08 04:57:42 +0100
-@@ -185,8 +185,9 @@ NORET_TYPE void die(const char *str, str
- printk("Internal error: %s: %x\n", str, err);
- printk("CPU: %d\n", smp_processor_id());
- show_regs(regs);
-- printk("Process %s (pid: %d, stack limit = 0x%p)\n",
-- current->comm, current->pid, end_of_stack(tsk));
-+ printk("Process %s (pid: %d[#%u], stack limit = 0x%p)\n",
-+ current->comm, current->pid,
-+ current->xid, end_of_stack(tsk));
+- pr_emerg("Process %.*s (pid: %d, stack limit = 0x%p)\n",
+- TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), end_of_stack(tsk));
++ pr_emerg("Process %.*s (pid: %d:%u, stack limit = 0x%p)\n",
++ TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), tsk->xid, end_of_stack(tsk));
if (!user_mode(regs) || in_interrupt()) {
- __dump_stack(tsk, (unsigned long)(regs + 1));
-diff -NurpP --minimal linux-2.6.19.1/arch/cris/Kconfig linux-2.6.19.1-vs2.3.0.6/arch/cris/Kconfig
---- linux-2.6.19.1/arch/cris/Kconfig 2006-09-20 16:57:57 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/arch/cris/Kconfig 2006-11-08 04:57:40 +0100
-@@ -185,6 +185,8 @@ source "drivers/usb/Kconfig"
+ dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
+diff -urNp -x '*.orig' linux-4.9/arch/cris/Kconfig linux-4.9/arch/cris/Kconfig
+--- linux-4.9/arch/cris/Kconfig 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/arch/cris/Kconfig 2021-02-24 15:47:45.041074656 +0100
+@@ -583,6 +583,8 @@ source "fs/Kconfig"
source "arch/cris/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.19.1/arch/cris/arch-v10/kernel/process.c linux-2.6.19.1-vs2.3.0.6/arch/cris/arch-v10/kernel/process.c
---- linux-2.6.19.1/arch/cris/arch-v10/kernel/process.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/arch/cris/arch-v10/kernel/process.c 2006-11-08 04:57:50 +0100
-@@ -103,7 +103,8 @@ int kernel_thread(int (*fn)(void *), voi
- regs.dccr = 1 << I_DCCR_BITNR;
-
- /* Ok, create the new process.. */
-- return do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0, ®s, 0, NULL, NULL);
-+ return do_fork(flags | CLONE_VM | CLONE_UNTRACED | CLONE_KTHREAD,
-+ 0, ®s, 0, NULL, NULL);
- }
-
- /* setup the child's kernel stack with a pt_regs and switch_stack on it.
-diff -NurpP --minimal linux-2.6.19.1/arch/cris/arch-v32/kernel/process.c linux-2.6.19.1-vs2.3.0.6/arch/cris/arch-v32/kernel/process.c
---- linux-2.6.19.1/arch/cris/arch-v32/kernel/process.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/arch/cris/arch-v32/kernel/process.c 2006-11-08 04:57:50 +0100
-@@ -120,7 +120,8 @@ kernel_thread(int (*fn)(void *), void *
- regs.ccs = 1 << (I_CCS_BITNR + CCS_SHIFT);
-
- /* Create the new process. */
-- return do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0, ®s, 0, NULL, NULL);
-+ return do_fork(flags | CLONE_VM | CLONE_UNTRACED | CLONE_KTHREAD,
-+ 0, ®s, 0, NULL, NULL);
- }
-
- /*
-diff -NurpP --minimal linux-2.6.19.1/arch/cris/kernel/irq.c linux-2.6.19.1-vs2.3.0.6/arch/cris/kernel/irq.c
---- linux-2.6.19.1/arch/cris/kernel/irq.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/arch/cris/kernel/irq.c 2006-11-30 18:26:05 +0100
-@@ -92,6 +92,7 @@ skip:
- asmlinkage void do_IRQ(int irq, struct pt_regs * regs)
- {
- unsigned long sp;
-+
- irq_enter();
- sp = rdsp();
- if (unlikely((sp & (PAGE_SIZE - 1)) < (PAGE_SIZE/8))) {
-diff -NurpP --minimal linux-2.6.19.1/arch/frv/kernel/kernel_thread.S linux-2.6.19.1-vs2.3.0.6/arch/frv/kernel/kernel_thread.S
---- linux-2.6.19.1/arch/frv/kernel/kernel_thread.S 2005-03-02 12:38:20 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/frv/kernel/kernel_thread.S 2006-11-08 04:57:50 +0100
-@@ -13,6 +13,8 @@
- #include <asm/unistd.h>
-
- #define CLONE_VM 0x00000100 /* set if VM shared between processes */
-+#define CLONE_KTHREAD 0x10000000 /* kernel thread */
-+#define CLONE_KT (CLONE_VM | CLONE_KTHREAD) /* kernel thread flags */
- #define KERN_ERR "<3>"
-
- .section .rodata
-@@ -37,7 +39,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.19.1/arch/h8300/Kconfig linux-2.6.19.1-vs2.3.0.6/arch/h8300/Kconfig
---- linux-2.6.19.1/arch/h8300/Kconfig 2006-06-18 04:51:49 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/arch/h8300/Kconfig 2006-11-08 04:57:40 +0100
-@@ -199,6 +199,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.19.1/arch/h8300/kernel/process.c linux-2.6.19.1-vs2.3.0.6/arch/h8300/kernel/process.c
---- linux-2.6.19.1/arch/h8300/kernel/process.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/arch/h8300/kernel/process.c 2006-11-08 04:57:50 +0100
-@@ -134,7 +134,7 @@ int kernel_thread(int (*fn)(void *), voi
-
- fs = get_fs();
- set_fs (KERNEL_DS);
-- clone_arg = flags | CLONE_VM;
-+ clone_arg = flags | CLONE_VM | CLONE_KTHREAD;
- __asm__("mov.l sp,er3\n\t"
- "sub.l er2,er2\n\t"
- "mov.l %2,er1\n\t"
-diff -NurpP --minimal linux-2.6.19.1/arch/i386/Kconfig linux-2.6.19.1-vs2.3.0.6/arch/i386/Kconfig
---- linux-2.6.19.1/arch/i386/Kconfig 2006-11-30 21:18:25 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/i386/Kconfig 2006-11-08 04:57:40 +0100
-@@ -1153,6 +1153,8 @@ endmenu
-
- source "arch/i386/Kconfig.debug"
-
-+source "kernel/vserver/Kconfig"
-+
- source "security/Kconfig"
-
- source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.19.1/arch/i386/kernel/irq.c linux-2.6.19.1-vs2.3.0.6/arch/i386/kernel/irq.c
---- linux-2.6.19.1/arch/i386/kernel/irq.c 2006-11-30 21:18:26 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/i386/kernel/irq.c 2006-11-30 18:26:37 +0100
-@@ -84,7 +84,6 @@ fastcall unsigned int do_IRQ(struct pt_r
- }
- }
- #endif
--
- #ifdef CONFIG_4KSTACKS
-
- curctx = (union irq_ctx *) current_thread_info();
-@@ -124,7 +123,6 @@ fastcall unsigned int do_IRQ(struct pt_r
- } else
- #endif
- desc->handle_irq(irq, desc);
--
- irq_exit();
- set_irq_regs(old_regs);
- return 1;
-diff -NurpP --minimal linux-2.6.19.1/arch/i386/kernel/process.c linux-2.6.19.1-vs2.3.0.6/arch/i386/kernel/process.c
---- linux-2.6.19.1/arch/i386/kernel/process.c 2006-11-30 21:18:26 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/i386/kernel/process.c 2006-11-30 20:55:45 +0100
-@@ -300,8 +300,10 @@ void show_regs(struct pt_regs * regs)
- unsigned long cr0 = 0L, cr2 = 0L, cr3 = 0L, cr4 = 0L;
-
- printk("\n");
-- printk("Pid: %d, comm: %20s\n", current->pid, current->comm);
-- printk("EIP: %04x:[<%08lx>] CPU: %d\n",0xffff & regs->xcs,regs->eip, smp_processor_id());
-+ printk("Pid: %d[#%u], comm: %20s\n",
-+ current->pid, current->xid, current->comm);
-+ printk("EIP: %04x:[<%08lx>] CPU: %d\n",
-+ 0xffff & regs->xcs,regs->eip, smp_processor_id());
- print_symbol("EIP is at %s\n", regs->eip);
-
- if (user_mode_vm(regs))
-@@ -352,7 +354,8 @@ int kernel_thread(int (*fn)(void *), voi
- regs.eflags = X86_EFLAGS_IF | X86_EFLAGS_SF | X86_EFLAGS_PF | 0x2;
-
- /* Ok, create the new process.. */
-- return do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0, ®s, 0, NULL, NULL);
-+ return do_fork(flags | CLONE_VM | CLONE_UNTRACED | CLONE_KTHREAD,
-+ 0, ®s, 0, NULL, NULL);
- }
- EXPORT_SYMBOL(kernel_thread);
-
-diff -NurpP --minimal linux-2.6.19.1/arch/i386/kernel/syscall_table.S linux-2.6.19.1-vs2.3.0.6/arch/i386/kernel/syscall_table.S
---- linux-2.6.19.1/arch/i386/kernel/syscall_table.S 2006-11-30 21:18:26 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/i386/kernel/syscall_table.S 2006-11-08 04:57:41 +0100
-@@ -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.19.1/arch/i386/kernel/sysenter.c linux-2.6.19.1-vs2.3.0.6/arch/i386/kernel/sysenter.c
---- linux-2.6.19.1/arch/i386/kernel/sysenter.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/arch/i386/kernel/sysenter.c 2006-11-08 04:57:47 +0100
-@@ -17,6 +17,7 @@
- #include <linux/elf.h>
- #include <linux/mm.h>
- #include <linux/module.h>
-+#include <linux/vs_memory.h>
-
- #include <asm/cpufeature.h>
- #include <asm/msr.h>
-@@ -156,7 +157,7 @@ int arch_setup_additional_pages(struct l
- current->mm->context.vdso = (void *)addr;
- current_thread_info()->sysenter_return =
- (void *)VDSO_SYM(&SYSENTER_RETURN);
-- mm->total_vm++;
-+ vx_vmpages_inc(mm);
- up_fail:
- up_write(&mm->mmap_sem);
- return ret;
-diff -NurpP --minimal linux-2.6.19.1/arch/i386/kernel/traps.c linux-2.6.19.1-vs2.3.0.6/arch/i386/kernel/traps.c
---- linux-2.6.19.1/arch/i386/kernel/traps.c 2006-11-30 21:18:26 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/i386/kernel/traps.c 2006-11-30 20:55:45 +0100
-@@ -54,6 +54,8 @@
- #include <asm/stacktrace.h>
-
- #include <linux/module.h>
-+#include <linux/vs_context.h>
-+#include <linux/vserver/history.h>
-
- #include "mach_traps.h"
-
-@@ -371,8 +373,8 @@ void show_registers(struct pt_regs *regs
- regs->esi, regs->edi, regs->ebp, esp);
- printk(KERN_EMERG "ds: %04x es: %04x ss: %04x\n",
- regs->xds & 0xffff, regs->xes & 0xffff, ss);
-- printk(KERN_EMERG "Process %.*s (pid: %d, ti=%p task=%p task.ti=%p)",
-- TASK_COMM_LEN, current->comm, current->pid,
-+ printk(KERN_EMERG "Process %.*s (pid: %d[#%u], ti=%p task=%p task.ti=%p)",
-+ TASK_COMM_LEN, current->comm, current->pid, current->xid,
- current_thread_info(), current, current->thread_info);
- /*
- * When in-kernel, we also print out the stack and code at the
-@@ -461,6 +463,8 @@ void die(const char * str, struct pt_reg
-
- oops_enter();
-
-+ vxh_throw_oops();
-+
- if (die.lock_owner != raw_smp_processor_id()) {
- console_verbose();
- spin_lock_irqsave(&die.lock, flags);
-@@ -497,9 +501,9 @@ void die(const char * str, struct pt_reg
- if (nl)
- printk("\n");
- if (notify_die(DIE_OOPS, str, regs, err,
-- current->thread.trap_no, SIGSEGV) !=
-- NOTIFY_STOP) {
-+ current->thread.trap_no, SIGSEGV) != NOTIFY_STOP) {
- show_registers(regs);
-+ vxh_dump_history();
- /* Executive summary in case the oops scrolled away */
- esp = (unsigned long) (®s->esp);
- savesegment(ss, ss);
-diff -NurpP --minimal linux-2.6.19.1/arch/ia64/Kconfig linux-2.6.19.1-vs2.3.0.6/arch/ia64/Kconfig
---- linux-2.6.19.1/arch/ia64/Kconfig 2006-11-30 21:18:26 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/ia64/Kconfig 2006-11-20 21:12:32 +0100
-@@ -537,6 +537,8 @@ endmenu
+diff -urNp -x '*.orig' linux-4.9/arch/ia64/Kconfig linux-4.9/arch/ia64/Kconfig
+--- linux-4.9/arch/ia64/Kconfig 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/arch/ia64/Kconfig 2021-02-24 15:47:45.041074656 +0100
+@@ -602,6 +602,8 @@ source "fs/Kconfig"
source "arch/ia64/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.19.1/arch/ia64/ia32/binfmt_elf32.c linux-2.6.19.1-vs2.3.0.6/arch/ia64/ia32/binfmt_elf32.c
---- linux-2.6.19.1/arch/ia64/ia32/binfmt_elf32.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/arch/ia64/ia32/binfmt_elf32.c 2006-11-08 04:57:47 +0100
-@@ -238,7 +238,8 @@ ia32_setup_arg_pages (struct linux_binpr
- kmem_cache_free(vm_area_cachep, mpnt);
- return ret;
- }
-- current->mm->stack_vm = current->mm->total_vm = vma_pages(mpnt);
-+ vx_vmpages_sub(current->mm, current->mm->total_vm - vma_pages(mpnt));
-+ current->mm->stack_vm = current->mm->total_vm;
- }
-
- for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
-diff -NurpP --minimal linux-2.6.19.1/arch/ia64/ia32/ia32_entry.S linux-2.6.19.1-vs2.3.0.6/arch/ia64/ia32/ia32_entry.S
---- linux-2.6.19.1/arch/ia64/ia32/ia32_entry.S 2006-06-18 04:51:55 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/arch/ia64/ia32/ia32_entry.S 2006-11-08 04:57:41 +0100
-@@ -483,7 +483,7 @@ ia32_syscall_table:
- data8 sys_tgkill /* 270 */
- data8 compat_sys_utimes
- data8 sys32_fadvise64_64
-- data8 sys_ni_syscall
-+ data8 sys32_vserver
- data8 sys_ni_syscall
- data8 sys_ni_syscall /* 275 */
- data8 sys_ni_syscall
-diff -NurpP --minimal linux-2.6.19.1/arch/ia64/ia32/sys_ia32.c linux-2.6.19.1-vs2.3.0.6/arch/ia64/ia32/sys_ia32.c
---- linux-2.6.19.1/arch/ia64/ia32/sys_ia32.c 2006-11-30 21:18:26 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/ia64/ia32/sys_ia32.c 2006-11-08 04:57:44 +0100
-@@ -1182,7 +1182,7 @@ sys32_gettimeofday (struct compat_timeva
- {
- if (tv) {
- struct timeval ktv;
-- do_gettimeofday(&ktv);
-+ vx_gettimeofday(&ktv);
- if (put_tv32(tv, &ktv))
- return -EFAULT;
- }
-diff -NurpP --minimal linux-2.6.19.1/arch/ia64/kernel/asm-offsets.c linux-2.6.19.1-vs2.3.0.6/arch/ia64/kernel/asm-offsets.c
---- linux-2.6.19.1/arch/ia64/kernel/asm-offsets.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/arch/ia64/kernel/asm-offsets.c 2006-11-08 04:57:50 +0100
-@@ -191,6 +191,7 @@ void foo(void)
- /* for assembly files which can't include sched.h: */
- DEFINE(IA64_CLONE_VFORK, CLONE_VFORK);
- DEFINE(IA64_CLONE_VM, CLONE_VM);
-+ DEFINE(IA64_CLONE_KTHREAD, CLONE_KTHREAD);
-
- BLANK();
- DEFINE(IA64_CPUINFO_NSEC_PER_CYC_OFFSET,
-diff -NurpP --minimal linux-2.6.19.1/arch/ia64/kernel/entry.S linux-2.6.19.1-vs2.3.0.6/arch/ia64/kernel/entry.S
---- linux-2.6.19.1/arch/ia64/kernel/entry.S 2006-11-30 21:18:26 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/ia64/kernel/entry.S 2006-11-08 04:57:41 +0100
-@@ -1576,7 +1576,7 @@ sys_call_table:
+diff -urNp -x '*.orig' linux-4.9/arch/ia64/kernel/entry.S linux-4.9/arch/ia64/kernel/entry.S
+--- linux-4.9/arch/ia64/kernel/entry.S 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/arch/ia64/kernel/entry.S 2021-02-24 15:47:45.041074656 +0100
+@@ -1697,7 +1697,7 @@ sys_call_table:
data8 sys_mq_notify
data8 sys_mq_getsetattr
- data8 sys_ni_syscall // reserved for kexec_load
+ data8 sys_kexec_load
- data8 sys_ni_syscall // reserved for vserver
+ data8 sys_vserver
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-2.6.19.1/arch/ia64/kernel/perfmon.c linux-2.6.19.1-vs2.3.0.6/arch/ia64/kernel/perfmon.c
---- linux-2.6.19.1/arch/ia64/kernel/perfmon.c 2006-11-30 21:18:27 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/ia64/kernel/perfmon.c 2006-11-08 04:57:47 +0100
-@@ -41,6 +41,7 @@
- #include <linux/capability.h>
- #include <linux/rcupdate.h>
- #include <linux/completion.h>
-+#include <linux/vs_memory.h>
-
- #include <asm/errno.h>
- #include <asm/intrinsics.h>
-@@ -2357,7 +2358,7 @@ pfm_smpl_buffer_alloc(struct task_struct
- */
- insert_vm_struct(mm, vma);
-
-- mm->total_vm += size >> PAGE_SHIFT;
-+ vx_vmpages_add(mm, size >> PAGE_SHIFT);
- vm_stat_account(vma->vm_mm, vma->vm_flags, vma->vm_file,
- vma_pages(vma));
- up_write(&task->mm->mmap_sem);
-diff -NurpP --minimal linux-2.6.19.1/arch/ia64/kernel/process.c linux-2.6.19.1-vs2.3.0.6/arch/ia64/kernel/process.c
---- linux-2.6.19.1/arch/ia64/kernel/process.c 2006-11-30 21:18:27 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/ia64/kernel/process.c 2006-11-08 04:57:50 +0100
-@@ -105,7 +105,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", current->pid, smp_processor_id(), current->comm);
-+ printk("\nPid: %d[#%u], CPU %d, comm: %20s\n",
-+ current->pid, current->xid, smp_processor_id(), current->comm);
- printk("psr : %016lx ifs : %016lx ip : [<%016lx>] %s\n",
- regs->cr_ipsr, regs->cr_ifs, ip, print_tainted());
- print_symbol("ip is at %s\n", ip);
-@@ -688,7 +689,8 @@ kernel_thread (int (*fn)(void *), void *
- regs.sw.ar_fpsr = regs.pt.ar_fpsr = ia64_getreg(_IA64_REG_AR_FPSR);
- regs.sw.ar_bspstore = (unsigned long) current + IA64_RBS_OFFSET;
- regs.sw.pr = (1 << PRED_KERNEL_STACK);
-- return do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0, ®s.pt, 0, NULL, NULL);
-+ return do_fork(flags | CLONE_VM | CLONE_UNTRACED | CLONE_KTHREAD,
-+ 0, ®s.pt, 0, NULL, NULL);
- }
- EXPORT_SYMBOL(kernel_thread);
-
-diff -NurpP --minimal linux-2.6.19.1/arch/ia64/kernel/ptrace.c linux-2.6.19.1-vs2.3.0.6/arch/ia64/kernel/ptrace.c
---- linux-2.6.19.1/arch/ia64/kernel/ptrace.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/arch/ia64/kernel/ptrace.c 2006-11-30 18:53:18 +0100
-@@ -17,6 +17,7 @@
- #include <linux/security.h>
- #include <linux/audit.h>
- #include <linux/signal.h>
+diff -urNp -x '*.orig' linux-4.9/arch/ia64/kernel/ptrace.c linux-4.9/arch/ia64/kernel/ptrace.c
+--- linux-4.9/arch/ia64/kernel/ptrace.c 2021-02-24 15:47:30.857297603 +0100
++++ linux-4.9/arch/ia64/kernel/ptrace.c 2021-02-24 15:47:45.041074656 +0100
+@@ -21,6 +21,7 @@
+ #include <linux/regset.h>
+ #include <linux/elf.h>
+ #include <linux/tracehook.h>
+#include <linux/vs_base.h>
#include <asm/pgtable.h>
#include <asm/processor.h>
-@@ -1442,6 +1443,9 @@ sys_ptrace (long request, pid_t pid, uns
- read_unlock(&tasklist_lock);
- if (!child)
- goto out;
-+ if (!vx_check(vx_task_xid(child), VS_WATCH_P|VS_IDENT))
-+ goto out_tsk;
-+
- ret = -EPERM;
- if (pid == 1) /* no messing around with init! */
- goto out_tsk;
-diff -NurpP --minimal linux-2.6.19.1/arch/ia64/kernel/traps.c linux-2.6.19.1-vs2.3.0.6/arch/ia64/kernel/traps.c
---- linux-2.6.19.1/arch/ia64/kernel/traps.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/arch/ia64/kernel/traps.c 2006-11-08 04:57:42 +0100
-@@ -106,8 +106,9 @@ die (const char *str, struct pt_regs *re
+diff -urNp -x '*.orig' linux-4.9/arch/ia64/kernel/traps.c linux-4.9/arch/ia64/kernel/traps.c
+--- linux-4.9/arch/ia64/kernel/traps.c 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/arch/ia64/kernel/traps.c 2021-02-24 15:47:45.041074656 +0100
+@@ -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, current->pid, str, err, ++die_counter);
-+ printk("%s[%d[#%u]]: %s %ld [%d]\n",
-+ current->comm, current->pid, current->xid,
+- current->comm, task_pid_nr(current), str, err, ++die_counter);
++ printk("%s[%d:#%u]: %s %ld [%d]\n",
++ current->comm, task_pid_nr(current), current->xid,
+ str, err, ++die_counter);
- (void) notify_die(DIE_OOPS, (char *)str, regs, err, 255, SIGSEGV);
- show_regs(regs);
- } else
-@@ -331,8 +332,9 @@ handle_fpu_swa (int fp_fault, struct pt_
- last_time = jiffies;
- ++fpu_swa_count;
- printk(KERN_WARNING
-- "%s(%d): floating-point assist fault at ip %016lx, isr %016lx\n",
-- current->comm, current->pid, regs->cr_iip + ia64_psr(regs)->ri, isr);
-+ "%s(%d[#%u]): floating-point assist fault at ip %016lx, isr %016lx\n",
-+ current->comm, current->pid, current->xid,
-+ regs->cr_iip + ia64_psr(regs)->ri, isr);
+ if (notify_die(DIE_OOPS, str, regs, err, 255, SIGSEGV)
+ != NOTIFY_STOP)
+ show_regs(regs);
+@@ -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",
++ current->comm, task_pid_nr(current), current->xid,
++ regs->cr_iip + ia64_psr(regs)->ri, isr);
+ }
+ }
}
-
- exception = fp_emulate(fp_fault, bundle, ®s->cr_ipsr, ®s->ar_fpsr, &isr, ®s->pr,
-diff -NurpP --minimal linux-2.6.19.1/arch/ia64/mm/fault.c linux-2.6.19.1-vs2.3.0.6/arch/ia64/mm/fault.c
---- linux-2.6.19.1/arch/ia64/mm/fault.c 2006-11-30 21:18:27 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/ia64/mm/fault.c 2006-11-08 04:57:40 +0100
-@@ -10,6 +10,7 @@
- #include <linux/smp_lock.h>
- #include <linux/interrupt.h>
- #include <linux/kprobes.h>
-+#include <linux/vs_memory.h>
-
- #include <asm/pgtable.h>
- #include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.19.1/arch/ia64/sn/kernel/xpc_main.c linux-2.6.19.1-vs2.3.0.6/arch/ia64/sn/kernel/xpc_main.c
---- linux-2.6.19.1/arch/ia64/sn/kernel/xpc_main.c 2006-11-30 21:18:28 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/ia64/sn/kernel/xpc_main.c 2006-11-08 04:57:40 +0100
-@@ -108,6 +108,7 @@ static ctl_table xpc_sys_xpc_hb_dir[] =
- 0644,
- NULL,
- &proc_dointvec_minmax,
-+ NULL,
- &sysctl_intvec,
- NULL,
- &xpc_hb_min_interval,
-@@ -121,6 +122,7 @@ static ctl_table xpc_sys_xpc_hb_dir[] =
- 0644,
- NULL,
- &proc_dointvec_minmax,
-+ NULL,
- &sysctl_intvec,
- NULL,
- &xpc_hb_check_min_interval,
-@@ -145,6 +147,7 @@ static ctl_table xpc_sys_xpc_dir[] = {
- 0644,
- NULL,
- &proc_dointvec_minmax,
-+ NULL,
- &sysctl_intvec,
- NULL,
- &xpc_disengage_request_min_timelimit,
-diff -NurpP --minimal linux-2.6.19.1/arch/m32r/kernel/irq.c linux-2.6.19.1-vs2.3.0.6/arch/m32r/kernel/irq.c
---- linux-2.6.19.1/arch/m32r/kernel/irq.c 2006-11-30 21:18:28 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/m32r/kernel/irq.c 2006-11-30 18:26:50 +0100
-@@ -78,6 +78,7 @@ skip:
- asmlinkage unsigned int do_IRQ(int irq, struct pt_regs *regs)
- {
- struct pt_regs *old_regs;
-+
- old_regs = set_irq_regs(regs);
- irq_enter();
-
-diff -NurpP --minimal linux-2.6.19.1/arch/m32r/kernel/process.c linux-2.6.19.1-vs2.3.0.6/arch/m32r/kernel/process.c
---- linux-2.6.19.1/arch/m32r/kernel/process.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/arch/m32r/kernel/process.c 2006-11-08 04:57:50 +0100
-@@ -211,8 +211,8 @@ int kernel_thread(int (*fn)(void *), voi
- regs.psw = M32R_PSW_BIE;
-
- /* Ok, create the new process. */
-- return do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0, ®s, 0, NULL,
-- NULL);
-+ return do_fork(flags | CLONE_VM | CLONE_UNTRACED | CLONE_KTHREAD,
-+ 0, ®s, 0, NULL, NULL);
- }
-
- /*
-diff -NurpP --minimal linux-2.6.19.1/arch/m32r/kernel/traps.c linux-2.6.19.1-vs2.3.0.6/arch/m32r/kernel/traps.c
---- linux-2.6.19.1/arch/m32r/kernel/traps.c 2006-11-30 21:18:28 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/m32r/kernel/traps.c 2006-11-08 04:57:42 +0100
-@@ -195,8 +195,9 @@ static void show_registers(struct pt_reg
+diff -urNp -x '*.orig' linux-4.9/arch/m32r/kernel/traps.c linux-4.9/arch/m32r/kernel/traps.c
+--- linux-4.9/arch/m32r/kernel/traps.c 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/arch/m32r/kernel/traps.c 2021-02-24 15:47:45.041074656 +0100
+@@ -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, current->pid, 0xffff & i, 4096+(unsigned long)current);
-+ printk("Process %s (pid: %d[#%u], process nr: %d, stackpage=%08lx)",
-+ current->comm, current->pid, current->xid,
+- current->comm, task_pid_nr(current), 0xffff & i, 4096+(unsigned long)current);
++ 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.19.1/arch/m68k/Kconfig linux-2.6.19.1-vs2.3.0.6/arch/m68k/Kconfig
---- linux-2.6.19.1/arch/m68k/Kconfig 2006-11-30 21:18:28 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/m68k/Kconfig 2006-11-08 04:57:40 +0100
-@@ -654,6 +654,8 @@ source "fs/Kconfig"
+diff -urNp -x '*.orig' linux-4.9/arch/m68k/Kconfig linux-4.9/arch/m68k/Kconfig
+--- linux-4.9/arch/m68k/Kconfig 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/arch/m68k/Kconfig 2021-02-24 15:47:45.041074656 +0100
+@@ -163,6 +163,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.19.1/arch/m68k/kernel/process.c linux-2.6.19.1-vs2.3.0.6/arch/m68k/kernel/process.c
---- linux-2.6.19.1/arch/m68k/kernel/process.c 2006-11-30 21:18:28 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/m68k/kernel/process.c 2006-11-08 04:57:50 +0100
-@@ -159,7 +159,8 @@ int kernel_thread(int (*fn)(void *), voi
-
- {
- register long retval __asm__ ("d0");
-- register long clone_arg __asm__ ("d1") = flags | CLONE_VM | CLONE_UNTRACED;
-+ register long clone_arg __asm__ ("d1") =
-+ flags | CLONE_VM | CLONE_UNTRACED | CLONE_KTHREAD;
-
- retval = __NR_clone;
- __asm__ __volatile__
-diff -NurpP --minimal linux-2.6.19.1/arch/m68k/kernel/ptrace.c linux-2.6.19.1-vs2.3.0.6/arch/m68k/kernel/ptrace.c
---- linux-2.6.19.1/arch/m68k/kernel/ptrace.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/arch/m68k/kernel/ptrace.c 2006-11-30 18:53:18 +0100
-@@ -19,6 +19,7 @@
- #include <linux/ptrace.h>
- #include <linux/user.h>
- #include <linux/signal.h>
-+#include <linux/vs_base.h>
-
- #include <asm/uaccess.h>
- #include <asm/page.h>
-@@ -279,6 +280,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.19.1/arch/m68k/kernel/traps.c linux-2.6.19.1-vs2.3.0.6/arch/m68k/kernel/traps.c
---- linux-2.6.19.1/arch/m68k/kernel/traps.c 2006-11-30 21:18:28 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/m68k/kernel/traps.c 2006-11-08 04:57:42 +0100
-@@ -899,8 +899,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, current->pid, current);
-+ printk("Process %s (pid: %d[#%u], task=%p)\n",
-+ current->comm, current->pid, current->xid, current);
- addr = (unsigned long)&fp->un;
- printk("Frame format=%X ", regs->format);
- switch (regs->format) {
-diff -NurpP --minimal linux-2.6.19.1/arch/m68knommu/Kconfig linux-2.6.19.1-vs2.3.0.6/arch/m68knommu/Kconfig
---- linux-2.6.19.1/arch/m68knommu/Kconfig 2006-11-30 21:18:28 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/m68knommu/Kconfig 2006-11-08 04:57:40 +0100
-@@ -663,6 +663,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.19.1/arch/m68knommu/kernel/process.c linux-2.6.19.1-vs2.3.0.6/arch/m68knommu/kernel/process.c
---- linux-2.6.19.1/arch/m68knommu/kernel/process.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/arch/m68knommu/kernel/process.c 2006-11-08 04:57:50 +0100
-@@ -122,7 +122,7 @@ void show_regs(struct pt_regs * regs)
- int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
- {
- int retval;
-- long clone_arg = flags | CLONE_VM;
-+ long clone_arg = flags | CLONE_VM | CLONE_KTHREAD;
- mm_segment_t fs;
-
- fs = get_fs();
-diff -NurpP --minimal linux-2.6.19.1/arch/m68knommu/kernel/traps.c linux-2.6.19.1-vs2.3.0.6/arch/m68knommu/kernel/traps.c
---- linux-2.6.19.1/arch/m68knommu/kernel/traps.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/arch/m68knommu/kernel/traps.c 2006-11-08 04:57:42 +0100
-@@ -80,8 +80,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, current->pid, current->xid,
-+ PAGE_SIZE+(unsigned long)current);
- show_stack(NULL, (unsigned long *)fp);
- do_exit(SIGSEGV);
- }
-diff -NurpP --minimal linux-2.6.19.1/arch/mips/Kconfig linux-2.6.19.1-vs2.3.0.6/arch/mips/Kconfig
---- linux-2.6.19.1/arch/mips/Kconfig 2006-11-30 21:18:28 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/mips/Kconfig 2006-11-08 21:52:07 +0100
-@@ -2006,6 +2006,8 @@ source "arch/mips/oprofile/Kconfig"
+diff -urNp -x '*.orig' linux-4.9/arch/mips/Kconfig linux-4.9/arch/mips/Kconfig
+--- linux-4.9/arch/mips/Kconfig 2021-02-24 15:47:30.863964478 +0100
++++ linux-4.9/arch/mips/Kconfig 2021-02-24 15:47:45.044408094 +0100
+@@ -3194,6 +3194,8 @@ source "fs/Kconfig"
source "arch/mips/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.19.1/arch/mips/kernel/linux32.c linux-2.6.19.1-vs2.3.0.6/arch/mips/kernel/linux32.c
---- linux-2.6.19.1/arch/mips/kernel/linux32.c 2006-11-30 21:18:29 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/mips/kernel/linux32.c 2006-12-02 01:37:05 +0100
-@@ -300,7 +300,7 @@ sys32_gettimeofday(struct compat_timeval
- {
- if (tv) {
- struct timeval ktv;
-- do_gettimeofday(&ktv);
-+ vx_gettimeofday(&ktv);
- if (put_tv32(tv, &ktv))
- return -EFAULT;
- }
-diff -NurpP --minimal linux-2.6.19.1/arch/mips/kernel/process.c linux-2.6.19.1-vs2.3.0.6/arch/mips/kernel/process.c
---- linux-2.6.19.1/arch/mips/kernel/process.c 2006-11-30 21:18:29 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/mips/kernel/process.c 2006-11-08 04:57:50 +0100
-@@ -271,7 +271,8 @@ long kernel_thread(int (*fn)(void *), vo
- #endif
-
- /* Ok, create the new process.. */
-- return do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0, ®s, 0, NULL, NULL);
-+ return do_fork(flags | CLONE_VM | CLONE_UNTRACED | CLONE_KTHREAD,
-+ 0, ®s, 0, NULL, NULL);
- }
-
- /*
-diff -NurpP --minimal linux-2.6.19.1/arch/mips/kernel/ptrace.c linux-2.6.19.1-vs2.3.0.6/arch/mips/kernel/ptrace.c
---- linux-2.6.19.1/arch/mips/kernel/ptrace.c 2006-11-30 21:18:29 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/mips/kernel/ptrace.c 2006-11-30 18:53:18 +0100
-@@ -26,6 +26,7 @@
- #include <linux/user.h>
- #include <linux/security.h>
- #include <linux/signal.h>
+diff -urNp -x '*.orig' linux-4.9/arch/mips/kernel/ptrace.c linux-4.9/arch/mips/kernel/ptrace.c
+--- linux-4.9/arch/mips/kernel/ptrace.c 2021-02-24 15:47:30.880631666 +0100
++++ linux-4.9/arch/mips/kernel/ptrace.c 2021-02-24 15:47:45.044408094 +0100
+@@ -30,6 +30,7 @@
+ #include <linux/audit.h>
+ #include <linux/seccomp.h>
+ #include <linux/ftrace.h>
+#include <linux/vs_base.h>
#include <asm/byteorder.h>
#include <asm/cpu.h>
-@@ -172,6 +173,9 @@ long arch_ptrace(struct task_struct *chi
- {
- int ret;
+@@ -798,6 +799,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))
++ if (!vx_check(vx_task_xid(child), VS_WATCH_P | VS_IDENT))
+ goto out;
+
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.19.1/arch/mips/kernel/scall32-o32.S linux-2.6.19.1-vs2.3.0.6/arch/mips/kernel/scall32-o32.S
---- linux-2.6.19.1/arch/mips/kernel/scall32-o32.S 2006-11-30 21:18:29 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/mips/kernel/scall32-o32.S 2006-11-08 04:57:41 +0100
-@@ -619,7 +619,7 @@ einval: li v0, -EINVAL
- 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.19.1/arch/mips/kernel/scall64-64.S linux-2.6.19.1-vs2.3.0.6/arch/mips/kernel/scall64-64.S
---- linux-2.6.19.1/arch/mips/kernel/scall64-64.S 2006-11-30 21:18:29 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/mips/kernel/scall64-64.S 2006-11-08 04:57:41 +0100
-@@ -434,7 +434,7 @@ sys_call_table:
+diff -urNp -x '*.orig' linux-4.9/arch/mips/kernel/scall32-o32.S linux-4.9/arch/mips/kernel/scall32-o32.S
+--- linux-4.9/arch/mips/kernel/scall32-o32.S 2021-02-24 15:47:30.880631666 +0100
++++ linux-4.9/arch/mips/kernel/scall32-o32.S 2021-02-24 15:47:45.044408094 +0100
+@@ -511,7 +511,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 -urNp -x '*.orig' linux-4.9/arch/mips/kernel/scall64-64.S linux-4.9/arch/mips/kernel/scall64-64.S
+--- linux-4.9/arch/mips/kernel/scall64-64.S 2021-02-24 15:47:30.880631666 +0100
++++ linux-4.9/arch/mips/kernel/scall64-64.S 2021-02-24 15:47:45.044408094 +0100
+@@ -348,7 +348,7 @@ EXPORT(sys_call_table)
PTR sys_mq_timedreceive
PTR sys_mq_notify
PTR sys_mq_getsetattr /* 5235 */
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-2.6.19.1/arch/mips/kernel/scall64-n32.S linux-2.6.19.1-vs2.3.0.6/arch/mips/kernel/scall64-n32.S
---- linux-2.6.19.1/arch/mips/kernel/scall64-n32.S 2006-11-30 21:18:29 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/mips/kernel/scall64-n32.S 2006-11-08 04:57:41 +0100
-@@ -360,7 +360,7 @@ EXPORT(sysn32_call_table)
+diff -urNp -x '*.orig' linux-4.9/arch/mips/kernel/scall64-n32.S linux-4.9/arch/mips/kernel/scall64-n32.S
+--- linux-4.9/arch/mips/kernel/scall64-n32.S 2021-02-24 15:47:30.880631666 +0100
++++ linux-4.9/arch/mips/kernel/scall64-n32.S 2021-02-24 15:47:45.044408094 +0100
+@@ -343,7 +343,7 @@ EXPORT(sysn32_call_table)
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify
PTR compat_sys_mq_getsetattr
- PTR sys_ni_syscall /* 6240, sys_vserver */
+ PTR sys32_vserver /* 6240 */
- PTR sysn32_waitid
+ PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-2.6.19.1/arch/mips/kernel/scall64-o32.S linux-2.6.19.1-vs2.3.0.6/arch/mips/kernel/scall64-o32.S
---- linux-2.6.19.1/arch/mips/kernel/scall64-o32.S 2006-11-30 21:18:29 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/mips/kernel/scall64-o32.S 2006-11-08 04:57:41 +0100
-@@ -482,7 +482,7 @@ sys_call_table:
+diff -urNp -x '*.orig' linux-4.9/arch/mips/kernel/scall64-o32.S linux-4.9/arch/mips/kernel/scall64-o32.S
+--- linux-4.9/arch/mips/kernel/scall64-o32.S 2021-02-24 15:47:30.880631666 +0100
++++ linux-4.9/arch/mips/kernel/scall64-o32.S 2021-02-24 15:47:45.044408094 +0100
+@@ -499,7 +499,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 sys32_waitid
+ PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-2.6.19.1/arch/mips/kernel/traps.c linux-2.6.19.1-vs2.3.0.6/arch/mips/kernel/traps.c
---- linux-2.6.19.1/arch/mips/kernel/traps.c 2006-11-30 21:18:29 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/mips/kernel/traps.c 2006-11-08 21:52:08 +0100
-@@ -297,8 +297,9 @@ void show_registers(struct pt_regs *regs
- {
- show_regs(regs);
+diff -urNp -x '*.orig' linux-4.9/arch/mips/kernel/traps.c linux-4.9/arch/mips/kernel/traps.c
+--- linux-4.9/arch/mips/kernel/traps.c 2021-02-24 15:47:30.880631666 +0100
++++ linux-4.9/arch/mips/kernel/traps.c 2021-02-24 15:47:45.044408094 +0100
+@@ -361,9 +361,10 @@ void show_registers(struct pt_regs *regs
+
+ __show_regs(regs);
print_modules();
-- printk("Process %s (pid: %d, threadinfo=%p, task=%p)\n",
-- current->comm, current->pid, current_thread_info(), current);
-+ printk("Process %s (pid: %d:#%u, threadinfo=%p, task=%p)\n",
-+ current->comm, current->pid, current->xid,
-+ current_thread_info(), current);
- show_stacktrace(current, regs);
- show_code((unsigned int *) regs->cp0_epc);
- printk("\n");
-diff -NurpP --minimal linux-2.6.19.1/arch/parisc/Kconfig linux-2.6.19.1-vs2.3.0.6/arch/parisc/Kconfig
---- linux-2.6.19.1/arch/parisc/Kconfig 2006-11-30 21:18:30 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/parisc/Kconfig 2006-11-08 04:57:40 +0100
-@@ -257,6 +257,8 @@ source "arch/parisc/oprofile/Kconfig"
-
- source "arch/parisc/Kconfig.debug"
+- printk("Process %s (pid: %d, threadinfo=%p, task=%p, tls=%0*lx)\n",
+- current->comm, current->pid, current_thread_info(), current,
+- field, current_thread_info()->tp_value);
++ printk("Process %s (pid: %d:#%u, threadinfo=%p, task=%p, tls=%0*lx)\n",
++ current->comm, task_pid_nr(current), current->xid,
++ current_thread_info(), current,
++ field, current_thread_info()->tp_value);
+ if (cpu_has_userlocal) {
+ unsigned long tls;
+
+diff -urNp -x '*.orig' linux-4.9/arch/parisc/Kconfig linux-4.9/arch/parisc/Kconfig
+--- linux-4.9/arch/parisc/Kconfig 2021-02-24 15:47:30.893965417 +0100
++++ linux-4.9/arch/parisc/Kconfig 2021-02-24 15:47:45.044408094 +0100
+@@ -348,6 +348,8 @@ config SECCOMP
+
+ 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.19.1/arch/parisc/kernel/entry.S linux-2.6.19.1-vs2.3.0.6/arch/parisc/kernel/entry.S
---- linux-2.6.19.1/arch/parisc/kernel/entry.S 2006-11-30 21:18:30 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/parisc/kernel/entry.S 2006-11-08 04:57:50 +0100
-@@ -761,6 +761,7 @@ fault_vector_11:
-
- #define CLONE_VM 0x100 /* Must agree with <linux/sched.h> */
- #define CLONE_UNTRACED 0x00800000
-+#define CLONE_KTHREAD 0x10000000
-
- .export __kernel_thread, code
- .import do_fork
-diff -NurpP --minimal linux-2.6.19.1/arch/parisc/kernel/process.c linux-2.6.19.1-vs2.3.0.6/arch/parisc/kernel/process.c
---- linux-2.6.19.1/arch/parisc/kernel/process.c 2006-11-30 21:18:30 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/parisc/kernel/process.c 2006-11-08 04:57:50 +0100
-@@ -173,7 +173,7 @@ pid_t kernel_thread(int (*fn)(void *), v
- * kernel_thread can become a #define.
- */
-
-- return __kernel_thread(fn, arg, flags);
-+ return __kernel_thread(fn, arg, flags | CLONE_KTHREAD);
- }
- EXPORT_SYMBOL(kernel_thread);
-
-diff -NurpP --minimal linux-2.6.19.1/arch/parisc/kernel/sys_parisc32.c linux-2.6.19.1-vs2.3.0.6/arch/parisc/kernel/sys_parisc32.c
---- linux-2.6.19.1/arch/parisc/kernel/sys_parisc32.c 2006-11-30 21:18:31 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/parisc/kernel/sys_parisc32.c 2006-11-08 04:57:44 +0100
-@@ -204,11 +204,11 @@ static inline long get_ts32(struct times
- asmlinkage int
- sys32_gettimeofday(struct compat_timeval __user *tv, struct timezone __user *tz)
- {
-- extern void do_gettimeofday(struct timeval *tv);
-+ extern void vx_gettimeofday(struct timeval *tv);
-
- if (tv) {
- struct timeval ktv;
-- do_gettimeofday(&ktv);
-+ vx_gettimeofday(&ktv);
- if (put_compat_timeval(tv, &ktv))
- return -EFAULT;
- }
-@@ -612,6 +612,7 @@ asmlinkage int sys32_sysinfo(struct sysi
-
- do {
- seq = read_seqbegin(&xtime_lock);
-+ /* FIXME: requires vx virtualization */
- val.uptime = jiffies / HZ;
-
- val.loads[0] = avenrun[0] << (SI_LOAD_SHIFT - FSHIFT);
-diff -NurpP --minimal linux-2.6.19.1/arch/parisc/kernel/syscall_table.S linux-2.6.19.1-vs2.3.0.6/arch/parisc/kernel/syscall_table.S
---- linux-2.6.19.1/arch/parisc/kernel/syscall_table.S 2006-11-30 21:18:31 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/parisc/kernel/syscall_table.S 2006-11-08 04:57:41 +0100
-@@ -368,7 +368,7 @@
+diff -urNp -x '*.orig' linux-4.9/arch/parisc/kernel/syscall_table.S linux-4.9/arch/parisc/kernel/syscall_table.S
+--- linux-4.9/arch/parisc/kernel/syscall_table.S 2021-02-24 15:47:30.897298854 +0100
++++ linux-4.9/arch/parisc/kernel/syscall_table.S 2021-02-24 15:47:45.044408094 +0100
+@@ -358,7 +358,7 @@
ENTRY_COMP(mbind) /* 260 */
ENTRY_COMP(get_mempolicy)
ENTRY_COMP(set_mempolicy)
+ ENTRY_DIFF(vserver)
ENTRY_SAME(add_key)
ENTRY_SAME(request_key) /* 265 */
- ENTRY_SAME(keyctl)
-diff -NurpP --minimal linux-2.6.19.1/arch/parisc/kernel/traps.c linux-2.6.19.1-vs2.3.0.6/arch/parisc/kernel/traps.c
---- linux-2.6.19.1/arch/parisc/kernel/traps.c 2006-11-30 21:18:31 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/parisc/kernel/traps.c 2006-11-08 04:57:42 +0100
-@@ -210,8 +210,9 @@ void die_if_kernel(char *str, struct pt_
- if (err == 0)
+ ENTRY_COMP(keyctl)
+diff -urNp -x '*.orig' linux-4.9/arch/parisc/kernel/traps.c linux-4.9/arch/parisc/kernel/traps.c
+--- linux-4.9/arch/parisc/kernel/traps.c 2021-02-24 15:47:30.897298854 +0100
++++ linux-4.9/arch/parisc/kernel/traps.c 2021-02-24 15:47:45.044408094 +0100
+@@ -235,8 +235,9 @@ void die_if_kernel(char *str, struct pt_
return; /* STFU */
-- printk(KERN_CRIT "%s (pid %d): %s (code %ld) at " RFMT "\n",
-- current->comm, current->pid, str, err, regs->iaoq[0]);
-+ printk(KERN_CRIT "%s (pid %d:#%u): %s (code %ld) at " RFMT "\n",
-+ current->comm, current->pid, current->xid,
+ 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]);
++ 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);
-@@ -242,8 +243,8 @@ void die_if_kernel(char *str, struct pt_
- if (!console_drivers)
+
+ return;
+ }
+@@ -266,8 +267,8 @@ void die_if_kernel(char *str, struct pt_
pdc_console_restart();
-- printk(KERN_CRIT "%s (pid %d): %s (code %ld)\n",
-- current->comm, current->pid, str, err);
-+ printk(KERN_CRIT "%s (pid %d:#%u): %s (code %ld)\n",
-+ current->comm, current->pid, current->xid, str, err);
- show_regs(regs);
-
- if (in_interrupt())
-diff -NurpP --minimal linux-2.6.19.1/arch/parisc/mm/fault.c linux-2.6.19.1-vs2.3.0.6/arch/parisc/mm/fault.c
---- linux-2.6.19.1/arch/parisc/mm/fault.c 2006-06-18 04:52:15 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/arch/parisc/mm/fault.c 2006-11-08 04:57:42 +0100
-@@ -213,8 +213,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",
-- tsk->pid, tsk->comm, code, address);
-+ printk(KERN_DEBUG "do_page_fault() pid=%d:#%u "
-+ "command='%s' type=%lu address=0x%08lx\n",
-+ tsk->pid, 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.19.1/arch/powerpc/Kconfig linux-2.6.19.1-vs2.3.0.6/arch/powerpc/Kconfig
---- linux-2.6.19.1/arch/powerpc/Kconfig 2006-11-30 21:18:31 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/powerpc/Kconfig 2006-11-20 21:12:32 +0100
-@@ -1102,6 +1102,8 @@ endmenu
+ if (err)
+- printk(KERN_CRIT "%s (pid %d): %s (code %ld)\n",
+- current->comm, task_pid_nr(current), str, err);
++ printk(KERN_CRIT "%s (pid %d:#%u): %s (code %ld)\n",
++ current->comm, task_pid_nr(current), current->xid, str, err);
+
+ /* Wot's wrong wif bein' racy? */
+ if (current->thread.flags & PARISC_KERNEL_DEATH) {
+diff -urNp -x '*.orig' linux-4.9/arch/powerpc/Kconfig linux-4.9/arch/powerpc/Kconfig
+--- linux-4.9/arch/powerpc/Kconfig 2021-02-24 15:47:30.900632291 +0100
++++ linux-4.9/arch/powerpc/Kconfig 2021-02-24 15:47:45.044408094 +0100
+@@ -1092,6 +1092,8 @@ source "lib/Kconfig"
source "arch/powerpc/Kconfig.debug"
-+source "kernel/vserver/Kconfig"
-+
- source "security/Kconfig"
-
- config KEYS_COMPAT
-diff -NurpP --minimal linux-2.6.19.1/arch/powerpc/kernel/asm-offsets.c linux-2.6.19.1-vs2.3.0.6/arch/powerpc/kernel/asm-offsets.c
---- linux-2.6.19.1/arch/powerpc/kernel/asm-offsets.c 2006-11-30 21:18:31 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/powerpc/kernel/asm-offsets.c 2006-11-08 04:57:50 +0100
-@@ -243,6 +243,7 @@ int main(void)
-
- DEFINE(CLONE_VM, CLONE_VM);
- DEFINE(CLONE_UNTRACED, CLONE_UNTRACED);
-+ DEFINE(CLONE_KTHREAD, CLONE_KTHREAD);
-
- #ifndef CONFIG_PPC64
- DEFINE(MM_PGD, offsetof(struct mm_struct, pgd));
-diff -NurpP --minimal linux-2.6.19.1/arch/powerpc/kernel/irq.c linux-2.6.19.1-vs2.3.0.6/arch/powerpc/kernel/irq.c
---- linux-2.6.19.1/arch/powerpc/kernel/irq.c 2006-11-30 21:18:31 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/powerpc/kernel/irq.c 2006-11-30 18:27:23 +0100
-@@ -53,6 +53,7 @@
- #include <linux/mutex.h>
- #include <linux/bootmem.h>
- #include <linux/pci.h>
-+#include <linux/vs_context.h>
-
- #include <asm/uaccess.h>
- #include <asm/system.h>
-diff -NurpP --minimal linux-2.6.19.1/arch/powerpc/kernel/misc_32.S linux-2.6.19.1-vs2.3.0.6/arch/powerpc/kernel/misc_32.S
---- linux-2.6.19.1/arch/powerpc/kernel/misc_32.S 2006-11-30 21:18:31 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/powerpc/kernel/misc_32.S 2006-11-08 04:57:50 +0100
-@@ -749,7 +749,7 @@ _GLOBAL(kernel_thread)
- mr r30,r3 /* function */
- mr r31,r4 /* argument */
- ori r3,r5,CLONE_VM /* flags */
-- oris r3,r3,CLONE_UNTRACED>>16
-+ oris r3,r3,(CLONE_UNTRACED|CLONE_KTHREAD)>>16
- li r4,0 /* new sp (unused) */
- li r0,__NR_clone
- sc
-diff -NurpP --minimal linux-2.6.19.1/arch/powerpc/kernel/misc_64.S linux-2.6.19.1-vs2.3.0.6/arch/powerpc/kernel/misc_64.S
---- linux-2.6.19.1/arch/powerpc/kernel/misc_64.S 2006-11-30 21:18:31 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/powerpc/kernel/misc_64.S 2006-11-08 04:57:50 +0100
-@@ -394,7 +394,7 @@ _GLOBAL(kernel_thread)
- mr r29,r3
- mr r30,r4
- ori r3,r5,CLONE_VM /* flags */
-- oris r3,r3,(CLONE_UNTRACED>>16)
-+ oris r3,r3,(CLONE_UNTRACED|CLONE_KTHREAD)>>16
- li r4,0 /* new sp (unused) */
- li r0,__NR_clone
- sc
-diff -NurpP --minimal linux-2.6.19.1/arch/powerpc/kernel/process.c linux-2.6.19.1-vs2.3.0.6/arch/powerpc/kernel/process.c
---- linux-2.6.19.1/arch/powerpc/kernel/process.c 2006-11-30 21:18:31 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/powerpc/kernel/process.c 2006-11-08 04:57:42 +0100
-@@ -425,8 +425,9 @@ void show_regs(struct pt_regs * regs)
- trap = TRAP(regs);
- if (trap == 0x300 || trap == 0x600)
- printk("DAR: "REG", DSISR: "REG"\n", regs->dar, regs->dsisr);
-- printk("TASK = %p[%d] '%s' THREAD: %p",
-- current, current->pid, current->comm, task_thread_info(current));
-+ printk("TASK = %p[%d,#%u] '%s' THREAD: %p",
-+ current, current->pid, current->xid,
-+ current->comm, task_thread_info(current));
-
- #ifdef CONFIG_SMP
- printk(" CPU: %d", smp_processor_id());
-diff -NurpP --minimal linux-2.6.19.1/arch/powerpc/kernel/sys_ppc32.c linux-2.6.19.1-vs2.3.0.6/arch/powerpc/kernel/sys_ppc32.c
---- linux-2.6.19.1/arch/powerpc/kernel/sys_ppc32.c 2006-11-30 21:18:31 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/powerpc/kernel/sys_ppc32.c 2006-11-08 04:57:44 +0100
-@@ -275,7 +275,7 @@ asmlinkage long compat_sys_gettimeofday(
- {
- if (tv) {
- struct timeval ktv;
-- do_gettimeofday(&ktv);
-+ vx_gettimeofday(&ktv);
- if (put_tv32(tv, &ktv))
- return -EFAULT;
- }
-diff -NurpP --minimal linux-2.6.19.1/arch/powerpc/kernel/traps.c linux-2.6.19.1-vs2.3.0.6/arch/powerpc/kernel/traps.c
---- linux-2.6.19.1/arch/powerpc/kernel/traps.c 2006-11-30 21:18:31 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/powerpc/kernel/traps.c 2006-11-08 21:52:08 +0100
-@@ -888,8 +888,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, current->pid, regs->nip, regs->link, regs->gpr[0],
-+ printk("Task: %p(%d[#%u]), PC: %08lX/%08lX, Syscall: %3ld, Result: %s%ld %s\n",
-+ current, current->pid, current->xid,
-+ regs->nip, regs->link, regs->gpr[0],
- regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
- }
-
-diff -NurpP --minimal linux-2.6.19.1/arch/powerpc/kernel/vdso.c linux-2.6.19.1-vs2.3.0.6/arch/powerpc/kernel/vdso.c
---- linux-2.6.19.1/arch/powerpc/kernel/vdso.c 2006-11-30 21:18:31 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/powerpc/kernel/vdso.c 2006-11-08 04:57:47 +0100
-@@ -22,6 +22,7 @@
- #include <linux/elf.h>
- #include <linux/security.h>
- #include <linux/bootmem.h>
-+#include <linux/vs_memory.h>
-
- #include <asm/pgtable.h>
- #include <asm/system.h>
-@@ -295,7 +296,7 @@ int arch_setup_additional_pages(struct l
-
- /* Put vDSO base into mm struct and account for memory usage */
- current->mm->context.vdso_base = vdso_base;
-- mm->total_vm += (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
-+ vx_vmpages_add(mm, (vma->vm_end - vma->vm_start) >> PAGE_SHIFT);
- up_write(&mm->mmap_sem);
- return 0;
-
-diff -NurpP --minimal linux-2.6.19.1/arch/ppc/Kconfig linux-2.6.19.1-vs2.3.0.6/arch/ppc/Kconfig
---- linux-2.6.19.1/arch/ppc/Kconfig 2006-11-30 21:18:32 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/ppc/Kconfig 2006-11-08 04:57:40 +0100
-@@ -1421,6 +1421,8 @@ source "arch/powerpc/oprofile/Kconfig"
-
- source "arch/ppc/Kconfig.debug"
-
+source "kernel/vserver/Kconfig"
+
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.19.1/arch/ppc/kernel/asm-offsets.c linux-2.6.19.1-vs2.3.0.6/arch/ppc/kernel/asm-offsets.c
---- linux-2.6.19.1/arch/ppc/kernel/asm-offsets.c 2006-09-20 16:58:01 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/arch/ppc/kernel/asm-offsets.c 2006-11-08 04:57:50 +0100
-@@ -121,6 +121,7 @@ main(void)
- DEFINE(TRAP, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, trap));
- DEFINE(CLONE_VM, CLONE_VM);
- DEFINE(CLONE_UNTRACED, CLONE_UNTRACED);
-+ DEFINE(CLONE_KTHREAD, CLONE_KTHREAD);
- DEFINE(MM_PGD, offsetof(struct mm_struct, pgd));
-
- /* About the CPU features table */
-diff -NurpP --minimal linux-2.6.19.1/arch/ppc/kernel/misc.S linux-2.6.19.1-vs2.3.0.6/arch/ppc/kernel/misc.S
---- linux-2.6.19.1/arch/ppc/kernel/misc.S 2006-11-30 21:18:32 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/ppc/kernel/misc.S 2006-11-08 04:57:50 +0100
-@@ -848,7 +848,7 @@ _GLOBAL(kernel_thread)
- mr r30,r3 /* function */
- mr r31,r4 /* argument */
- ori r3,r5,CLONE_VM /* flags */
-- oris r3,r3,CLONE_UNTRACED>>16
-+ oris r3,r3,(CLONE_UNTRACED|CLONE_KTHREAD)>>16
- li r4,0 /* new sp (unused) */
- li r0,__NR_clone
- sc
-diff -NurpP --minimal linux-2.6.19.1/arch/ppc/kernel/traps.c linux-2.6.19.1-vs2.3.0.6/arch/ppc/kernel/traps.c
---- linux-2.6.19.1/arch/ppc/kernel/traps.c 2006-11-30 21:18:32 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/ppc/kernel/traps.c 2006-11-08 21:52:08 +0100
-@@ -748,8 +748,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, current->pid, regs->nip, regs->link, regs->gpr[0],
-+ printk("Task: %p(%d[#%u]), PC: %08lX/%08lX, Syscall: %3ld, Result: %s%ld %s\n",
-+ current, current->pid, current->xid,
-+ regs->nip, regs->link, regs->gpr[0],
- regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
- }
-
-diff -NurpP --minimal linux-2.6.19.1/arch/s390/Kconfig linux-2.6.19.1-vs2.3.0.6/arch/s390/Kconfig
---- linux-2.6.19.1/arch/s390/Kconfig 2006-11-30 21:18:32 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/s390/Kconfig 2006-11-08 21:52:08 +0100
-@@ -519,6 +519,8 @@ endmenu
+diff -urNp -x '*.orig' linux-4.9/arch/powerpc/include/uapi/asm/unistd.h linux-4.9/arch/powerpc/include/uapi/asm/unistd.h
+--- linux-4.9/arch/powerpc/include/uapi/asm/unistd.h 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/arch/powerpc/include/uapi/asm/unistd.h 2021-02-24 15:47:45.044408094 +0100
+@@ -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 -urNp -x '*.orig' linux-4.9/arch/s390/Kconfig linux-4.9/arch/s390/Kconfig
+--- linux-4.9/arch/s390/Kconfig 2021-02-24 15:47:30.947300418 +0100
++++ linux-4.9/arch/s390/Kconfig 2021-02-24 15:47:45.044408094 +0100
+@@ -775,6 +775,8 @@ source "fs/Kconfig"
source "arch/s390/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.19.1/arch/s390/kernel/compat_linux.c linux-2.6.19.1-vs2.3.0.6/arch/s390/kernel/compat_linux.c
---- linux-2.6.19.1/arch/s390/kernel/compat_linux.c 2006-11-30 21:18:32 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/s390/kernel/compat_linux.c 2006-11-08 04:57:44 +0100
-@@ -600,7 +600,7 @@ asmlinkage long sys32_gettimeofday(struc
- {
- if (tv) {
- struct timeval ktv;
-- do_gettimeofday(&ktv);
-+ vx_gettimeofday(&ktv);
- if (put_tv32(tv, &ktv))
- return -EFAULT;
- }
-diff -NurpP --minimal linux-2.6.19.1/arch/s390/kernel/process.c linux-2.6.19.1-vs2.3.0.6/arch/s390/kernel/process.c
---- linux-2.6.19.1/arch/s390/kernel/process.c 2006-11-30 21:18:32 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/s390/kernel/process.c 2006-11-08 04:57:50 +0100
-@@ -165,9 +165,9 @@ void show_regs(struct pt_regs *regs)
- struct task_struct *tsk = current;
-
- printk("CPU: %d %s\n", task_thread_info(tsk)->cpu, print_tainted());
-- printk("Process %s (pid: %d, task: %p, ksp: %p)\n",
-- current->comm, current->pid, (void *) tsk,
-- (void *) tsk->thread.ksp);
-+ printk("Process %s (pid: %d[#%u], task: %p, ksp: %p)\n",
-+ current->comm, current->pid, current->xid,
-+ (void *) tsk, (void *) tsk->thread.ksp);
-
- show_registers(regs);
- /* Show stack backtrace if pt_regs is from kernel mode */
-@@ -198,7 +198,7 @@ int kernel_thread(int (*fn)(void *), voi
- regs.orig_gpr2 = -1;
-
- /* Ok, create the new process.. */
-- return do_fork(flags | CLONE_VM | CLONE_UNTRACED,
-+ return do_fork(flags | CLONE_VM | CLONE_UNTRACED | CLONE_KTHREAD,
- 0, ®s, 0, NULL, NULL);
- }
-
-diff -NurpP --minimal linux-2.6.19.1/arch/s390/kernel/ptrace.c linux-2.6.19.1-vs2.3.0.6/arch/s390/kernel/ptrace.c
---- linux-2.6.19.1/arch/s390/kernel/ptrace.c 2006-06-18 04:52:33 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/arch/s390/kernel/ptrace.c 2006-11-30 18:53:18 +0100
-@@ -33,6 +33,7 @@
- #include <linux/security.h>
- #include <linux/audit.h>
- #include <linux/signal.h>
+diff -urNp -x '*.orig' linux-4.9/arch/s390/include/asm/tlb.h linux-4.9/arch/s390/include/asm/tlb.h
+--- linux-4.9/arch/s390/include/asm/tlb.h 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/arch/s390/include/asm/tlb.h 2021-02-24 15:47:45.044408094 +0100
+@@ -24,6 +24,7 @@
+ #include <linux/mm.h>
+ #include <linux/pagemap.h>
+ #include <linux/swap.h>
++
+ #include <asm/processor.h>
+ #include <asm/pgalloc.h>
+ #include <asm/tlbflush.h>
+diff -urNp -x '*.orig' linux-4.9/arch/s390/include/uapi/asm/unistd.h linux-4.9/arch/s390/include/uapi/asm/unistd.h
+--- linux-4.9/arch/s390/include/uapi/asm/unistd.h 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/arch/s390/include/uapi/asm/unistd.h 2021-02-24 15:47:45.044408094 +0100
+@@ -200,7 +200,7 @@
+ #define __NR_clock_gettime 260
+ #define __NR_clock_getres 261
+ #define __NR_clock_nanosleep 262
+-/* Number 263 is reserved for vserver */
++#define __NR_vserver 263
+ #define __NR_statfs64 265
+ #define __NR_fstatfs64 266
+ #define __NR_remap_file_pages 267
+diff -urNp -x '*.orig' linux-4.9/arch/s390/kernel/ptrace.c linux-4.9/arch/s390/kernel/ptrace.c
+--- linux-4.9/arch/s390/kernel/ptrace.c 2021-02-24 15:47:30.957300731 +0100
++++ linux-4.9/arch/s390/kernel/ptrace.c 2021-02-24 15:47:45.047741532 +0100
+@@ -21,6 +21,7 @@
+ #include <linux/tracehook.h>
+ #include <linux/seccomp.h>
+ #include <linux/compat.h>
+#include <linux/vs_base.h>
-
+ #include <trace/syscall.h>
#include <asm/segment.h>
#include <asm/page.h>
-@@ -723,7 +724,13 @@ sys_ptrace(long request, long pid, long
- goto out;
- }
-
-+ if (!vx_check(vx_task_xid(child), VS_WATCH_P|VS_IDENT)) {
-+ ret = -EPERM;
-+ goto out_tsk;
-+ }
-+
- ret = do_ptrace(child, request, addr, data);
-+out_tsk:
- put_task_struct(child);
- out:
- unlock_kernel();
-diff -NurpP --minimal linux-2.6.19.1/arch/s390/kernel/syscalls.S linux-2.6.19.1-vs2.3.0.6/arch/s390/kernel/syscalls.S
---- linux-2.6.19.1/arch/s390/kernel/syscalls.S 2006-11-30 21:18:32 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/s390/kernel/syscalls.S 2006-11-08 04:57:41 +0100
-@@ -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)
--NI_SYSCALL /* reserved for vserver */
+diff -urNp -x '*.orig' linux-4.9/arch/s390/kernel/syscalls.S linux-4.9/arch/s390/kernel/syscalls.S
+--- linux-4.9/arch/s390/kernel/syscalls.S 2021-02-24 15:47:30.960634169 +0100
++++ linux-4.9/arch/s390/kernel/syscalls.S 2021-02-24 15:47:45.047741532 +0100
+@@ -271,7 +271,7 @@ SYSCALL(sys_clock_settime,compat_sys_clo
+ SYSCALL(sys_clock_gettime,compat_sys_clock_gettime) /* 260 */
+ SYSCALL(sys_clock_getres,compat_sys_clock_getres)
+ SYSCALL(sys_clock_nanosleep,compat_sys_clock_nanosleep)
+-NI_SYSCALL /* reserved for vserver */
+SYSCALL(sys_vserver,sys_vserver,sys32_vserver)
- SYSCALL(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.19.1/arch/sh/Kconfig linux-2.6.19.1-vs2.3.0.6/arch/sh/Kconfig
---- linux-2.6.19.1/arch/sh/Kconfig 2006-11-30 21:18:32 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/sh/Kconfig 2006-11-08 04:57:40 +0100
-@@ -627,6 +627,8 @@ source "arch/sh/oprofile/Kconfig"
+ SYSCALL(sys_ni_syscall,compat_sys_s390_fadvise64_64)
+ SYSCALL(sys_statfs64,compat_sys_statfs64)
+ SYSCALL(sys_fstatfs64,compat_sys_fstatfs64)
+diff -urNp -x '*.orig' linux-4.9/arch/sh/Kconfig linux-4.9/arch/sh/Kconfig
+--- linux-4.9/arch/sh/Kconfig 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/arch/sh/Kconfig 2021-02-24 15:47:45.047741532 +0100
+@@ -904,6 +904,8 @@ source "fs/Kconfig"
source "arch/sh/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.19.1/arch/sh/kernel/irq.c linux-2.6.19.1-vs2.3.0.6/arch/sh/kernel/irq.c
---- linux-2.6.19.1/arch/sh/kernel/irq.c 2006-11-30 21:18:34 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/sh/kernel/irq.c 2006-11-30 18:27:47 +0100
-@@ -12,6 +12,7 @@
- #include <linux/kernel_stat.h>
- #include <linux/seq_file.h>
- #include <linux/io.h>
-+#include <linux/vs_context.h>
- #include <asm/irq.h>
+diff -urNp -x '*.orig' linux-4.9/arch/sh/kernel/irq.c linux-4.9/arch/sh/kernel/irq.c
+--- linux-4.9/arch/sh/kernel/irq.c 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/arch/sh/kernel/irq.c 2021-02-24 15:47:45.047741532 +0100
+@@ -14,6 +14,7 @@
+ #include <linux/ftrace.h>
+ #include <linux/delay.h>
+ #include <linux/ratelimit.h>
++// #include <linux/vs_context.h>
#include <asm/processor.h>
+ #include <asm/machvec.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.19.1/arch/sh/kernel/kgdb_stub.c linux-2.6.19.1-vs2.3.0.6/arch/sh/kernel/kgdb_stub.c
---- linux-2.6.19.1/arch/sh/kernel/kgdb_stub.c 2006-11-30 21:18:34 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/sh/kernel/kgdb_stub.c 2006-11-08 04:57:52 +0100
-@@ -389,7 +389,7 @@ static struct task_struct *get_thread(in
- if (pid == PID_MAX) pid = 0;
-
- /* First check via PID */
-- thread = find_task_by_pid(pid);
-+ thread = find_task_by_real_pid(pid);
-
- if (thread)
- return thread;
-diff -NurpP --minimal linux-2.6.19.1/arch/sh/kernel/process.c linux-2.6.19.1-vs2.3.0.6/arch/sh/kernel/process.c
---- linux-2.6.19.1/arch/sh/kernel/process.c 2006-11-30 21:18:34 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/sh/kernel/process.c 2006-11-08 04:57:50 +0100
-@@ -104,7 +104,8 @@ void machine_power_off(void)
- void show_regs(struct pt_regs * regs)
- {
- printk("\n");
-- printk("Pid : %d, Comm: %20s\n", current->pid, current->comm);
-+ printk("Pid : %d:#%u, Comm: %20s\n",
-+ current->pid, current->xid, current->comm);
- print_symbol("PC is at %s\n", instruction_pointer(regs));
- printk("PC : %08lx SP : %08lx SR : %08lx ",
- regs->pc, regs->regs[15], regs->sr);
-@@ -164,7 +165,8 @@ int kernel_thread(int (*fn)(void *), voi
- regs.sr = (1 << 30);
-
- /* Ok, create the new process.. */
-- return do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0, ®s, 0, NULL, NULL);
-+ return do_fork(flags | CLONE_VM | CLONE_UNTRACED | CLONE_KTHREAD,
-+ 0, ®s, 0, NULL, NULL);
- }
-
- /*
-diff -NurpP --minimal linux-2.6.19.1/arch/sh/kernel/vsyscall/vsyscall.c linux-2.6.19.1-vs2.3.0.6/arch/sh/kernel/vsyscall/vsyscall.c
---- linux-2.6.19.1/arch/sh/kernel/vsyscall/vsyscall.c 2006-11-30 21:18:34 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/sh/kernel/vsyscall/vsyscall.c 2006-12-02 01:37:05 +0100
-@@ -17,6 +17,7 @@
- #include <linux/gfp.h>
- #include <linux/module.h>
- #include <linux/elf.h>
-+#include <linux/vs_memory.h>
-
- /*
- * Should the kernel map a VDSO page into processes and pass its
-@@ -120,7 +121,7 @@ int arch_setup_additional_pages(struct l
-
- current->mm->context.vdso = (void *)addr;
-
-- mm->total_vm++;
-+ vx_vmpages_inc(mm);
- up_fail:
- up_write(&mm->mmap_sem);
- return ret;
-diff -NurpP --minimal linux-2.6.19.1/arch/sh64/kernel/process.c linux-2.6.19.1-vs2.3.0.6/arch/sh64/kernel/process.c
---- linux-2.6.19.1/arch/sh64/kernel/process.c 2006-11-30 21:18:35 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/sh64/kernel/process.c 2006-11-08 04:57:50 +0100
-@@ -400,8 +400,8 @@ int kernel_thread(int (*fn)(void *), voi
- regs.pc = (unsigned long)kernel_thread_helper;
- regs.sr = (1 << 30);
-
-- return do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0,
-- ®s, 0, NULL, NULL);
-+ return do_fork(flags | CLONE_VM | CLONE_UNTRACED | CLONE_KTHREAD,
-+ 0, ®s, 0, NULL, NULL);
- }
-
- /*
-diff -NurpP --minimal linux-2.6.19.1/arch/sh64/mm/fault.c linux-2.6.19.1-vs2.3.0.6/arch/sh64/mm/fault.c
---- linux-2.6.19.1/arch/sh64/mm/fault.c 2006-11-30 21:18:35 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/sh64/mm/fault.c 2006-11-08 04:57:42 +0100
-@@ -82,7 +82,7 @@ static inline void print_vma(struct vm_a
-
- static inline void print_task(struct task_struct *tsk)
- {
-- printk("Task pid %d\n", tsk->pid);
-+ printk("Task pid %d:#%u\n", tsk->pid, tsk->xid);
- }
-
- static pte_t *lookup_pte(struct mm_struct *mm, unsigned long address)
-diff -NurpP --minimal linux-2.6.19.1/arch/sparc/Kconfig linux-2.6.19.1-vs2.3.0.6/arch/sparc/Kconfig
---- linux-2.6.19.1/arch/sparc/Kconfig 2006-11-30 21:18:35 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/sparc/Kconfig 2006-11-08 04:57:40 +0100
-@@ -298,6 +298,8 @@ endmenu
+diff -urNp -x '*.orig' linux-4.9/arch/sparc/Kconfig linux-4.9/arch/sparc/Kconfig
+--- linux-4.9/arch/sparc/Kconfig 2021-02-24 15:47:30.967301044 +0100
++++ linux-4.9/arch/sparc/Kconfig 2021-02-24 15:47:45.047741532 +0100
+@@ -584,6 +584,8 @@ source "fs/Kconfig"
source "arch/sparc/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.19.1/arch/sparc/kernel/process.c linux-2.6.19.1-vs2.3.0.6/arch/sparc/kernel/process.c
---- linux-2.6.19.1/arch/sparc/kernel/process.c 2006-09-20 16:58:01 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/arch/sparc/kernel/process.c 2006-11-08 04:57:50 +0100
-@@ -705,7 +705,8 @@ pid_t kernel_thread(int (*fn)(void *), v
- /* Notreached by child. */
- "1: mov %%o0, %0\n\t" :
- "=r" (retval) :
-- "i" (__NR_clone), "r" (flags | CLONE_VM | CLONE_UNTRACED),
-+ "i" (__NR_clone), "r" (flags |
-+ CLONE_VM | CLONE_UNTRACED | CLONE_KTHREAD),
- "i" (__NR_exit), "r" (fn), "r" (arg) :
- "g1", "g2", "g3", "o0", "o1", "memory", "cc");
- return retval;
-diff -NurpP --minimal linux-2.6.19.1/arch/sparc/kernel/ptrace.c linux-2.6.19.1-vs2.3.0.6/arch/sparc/kernel/ptrace.c
---- linux-2.6.19.1/arch/sparc/kernel/ptrace.c 2006-04-09 13:49:44 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/arch/sparc/kernel/ptrace.c 2006-11-30 18:53:18 +0100
-@@ -19,6 +19,7 @@
- #include <linux/smp_lock.h>
- #include <linux/security.h>
- #include <linux/signal.h>
-+#include <linux/vs_base.h>
-
- #include <asm/pgtable.h>
- #include <asm/system.h>
-@@ -299,6 +300,10 @@ asmlinkage void do_ptrace(struct pt_regs
- pt_error_return(regs, -ret);
- goto out;
- }
-+ if (!vx_check(vx_task_xid(child), VS_WATCH_P|VS_IDENT)) {
-+ pt_error_return(regs, ESRCH);
-+ goto out_tsk;
-+ }
-
- if ((current->personality == PER_SUNOS && request == PTRACE_SUNATTACH)
- || (current->personality != PER_SUNOS && request == PTRACE_ATTACH)) {
-diff -NurpP --minimal linux-2.6.19.1/arch/sparc/kernel/systbls.S linux-2.6.19.1-vs2.3.0.6/arch/sparc/kernel/systbls.S
---- linux-2.6.19.1/arch/sparc/kernel/systbls.S 2006-11-30 21:18:35 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/sparc/kernel/systbls.S 2006-11-08 21:52:08 +0100
-@@ -71,7 +71,7 @@ sys_call_table:
- /*250*/ .long sparc_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl
+diff -urNp -x '*.orig' linux-4.9/arch/sparc/include/uapi/asm/unistd.h linux-4.9/arch/sparc/include/uapi/asm/unistd.h
+--- linux-4.9/arch/sparc/include/uapi/asm/unistd.h 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/arch/sparc/include/uapi/asm/unistd.h 2021-02-24 15:47:45.047741532 +0100
+@@ -332,7 +332,7 @@
+ #define __NR_timer_getoverrun 264
+ #define __NR_timer_delete 265
+ #define __NR_timer_create 266
+-/* #define __NR_vserver 267 Reserved for VSERVER */
++#define __NR_vserver 267
+ #define __NR_io_setup 268
+ #define __NR_io_destroy 269
+ #define __NR_io_submit 270
+diff -urNp -x '*.orig' linux-4.9/arch/sparc/kernel/systbls_32.S linux-4.9/arch/sparc/kernel/systbls_32.S
+--- linux-4.9/arch/sparc/kernel/systbls_32.S 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/arch/sparc/kernel/systbls_32.S 2021-02-24 15:47:45.047741532 +0100
+@@ -70,7 +70,7 @@ sys_call_table:
+ /*250*/ .long sys_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_ni_syscall
/*255*/ .long sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep
/*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
/*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.19.1/arch/sparc/kernel/traps.c linux-2.6.19.1-vs2.3.0.6/arch/sparc/kernel/traps.c
---- linux-2.6.19.1/arch/sparc/kernel/traps.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/arch/sparc/kernel/traps.c 2006-11-08 04:57:42 +0100
-@@ -99,7 +99,8 @@ void die_if_kernel(char *str, struct pt_
- " /_| \\__/ |_\\\n"
- " \\__U_/\n");
-
-- printk("%s(%d): %s [#%d]\n", current->comm, current->pid, str, ++die_counter);
-+ printk("%s(%d[#%u]): %s [#%d]\n", current->comm,
-+ current->pid, current->xid, str, ++die_counter);
- show_regs(regs);
-
- __SAVE; __SAVE; __SAVE; __SAVE;
-diff -NurpP --minimal linux-2.6.19.1/arch/sparc64/Kconfig linux-2.6.19.1-vs2.3.0.6/arch/sparc64/Kconfig
---- linux-2.6.19.1/arch/sparc64/Kconfig 2006-11-30 21:18:35 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/sparc64/Kconfig 2006-11-08 04:57:40 +0100
-@@ -431,6 +431,8 @@ endmenu
-
- source "arch/sparc64/Kconfig.debug"
-
-+source "kernel/vserver/Kconfig"
-+
- source "security/Kconfig"
-
- source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.19.1/arch/sparc64/kernel/binfmt_aout32.c linux-2.6.19.1-vs2.3.0.6/arch/sparc64/kernel/binfmt_aout32.c
---- linux-2.6.19.1/arch/sparc64/kernel/binfmt_aout32.c 2006-06-18 04:52:34 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/arch/sparc64/kernel/binfmt_aout32.c 2006-11-08 04:57:40 +0100
-@@ -27,6 +27,7 @@
- #include <linux/binfmts.h>
- #include <linux/personality.h>
- #include <linux/init.h>
-+#include <linux/vs_memory.h>
-
- #include <asm/system.h>
- #include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.19.1/arch/sparc64/kernel/process.c linux-2.6.19.1-vs2.3.0.6/arch/sparc64/kernel/process.c
---- linux-2.6.19.1/arch/sparc64/kernel/process.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/arch/sparc64/kernel/process.c 2006-11-08 04:57:50 +0100
-@@ -696,7 +696,8 @@ pid_t kernel_thread(int (*fn)(void *), v
- /* Notreached by child. */
- "1:" :
- "=r" (retval) :
-- "i" (__NR_clone), "r" (flags | CLONE_VM | CLONE_UNTRACED),
-+ "i" (__NR_clone), "r" (flags |
-+ CLONE_VM | CLONE_UNTRACED | CLONE_KTHREAD),
- "i" (__NR_exit), "r" (fn), "r" (arg) :
- "g1", "g2", "g3", "o0", "o1", "memory", "cc");
- return retval;
-diff -NurpP --minimal linux-2.6.19.1/arch/sparc64/kernel/ptrace.c linux-2.6.19.1-vs2.3.0.6/arch/sparc64/kernel/ptrace.c
---- linux-2.6.19.1/arch/sparc64/kernel/ptrace.c 2006-06-18 04:52:35 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/arch/sparc64/kernel/ptrace.c 2006-11-30 18:53:18 +0100
-@@ -22,6 +22,7 @@
- #include <linux/seccomp.h>
- #include <linux/audit.h>
- #include <linux/signal.h>
-+#include <linux/vs_base.h>
-
- #include <asm/asi.h>
- #include <asm/pgtable.h>
-@@ -212,6 +213,10 @@ asmlinkage void do_ptrace(struct pt_regs
- pt_error_return(regs, -ret);
- goto out;
- }
-+ if (!vx_check(vx_task_xid(child), VS_WATCH_P|VS_IDENT)) {
-+ pt_error_return(regs, ESRCH);
-+ goto out_tsk;
-+ }
-
- if ((current->personality == PER_SUNOS && request == PTRACE_SUNATTACH)
- || (current->personality != PER_SUNOS && request == PTRACE_ATTACH)) {
-diff -NurpP --minimal linux-2.6.19.1/arch/sparc64/kernel/sys_sparc32.c linux-2.6.19.1-vs2.3.0.6/arch/sparc64/kernel/sys_sparc32.c
---- linux-2.6.19.1/arch/sparc64/kernel/sys_sparc32.c 2006-11-30 21:18:35 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/sparc64/kernel/sys_sparc32.c 2006-11-08 04:57:44 +0100
-@@ -793,7 +793,7 @@ asmlinkage long sys32_gettimeofday(struc
- {
- if (tv) {
- struct timeval ktv;
-- do_gettimeofday(&ktv);
-+ vx_gettimeofday(&ktv);
- if (put_tv32(tv, &ktv))
- return -EFAULT;
- }
-diff -NurpP --minimal linux-2.6.19.1/arch/sparc64/kernel/systbls.S linux-2.6.19.1-vs2.3.0.6/arch/sparc64/kernel/systbls.S
---- linux-2.6.19.1/arch/sparc64/kernel/systbls.S 2006-11-30 21:18:35 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/sparc64/kernel/systbls.S 2006-11-08 21:52:08 +0100
-@@ -72,7 +72,7 @@ sys_call_table32:
- /*250*/ .word sys32_mremap, sys32_sysctl, sys32_getsid, sys_fdatasync, sys32_nfsservctl
+diff -urNp -x '*.orig' linux-4.9/arch/sparc/kernel/systbls_64.S linux-4.9/arch/sparc/kernel/systbls_64.S
+--- linux-4.9/arch/sparc/kernel/systbls_64.S 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/arch/sparc/kernel/systbls_64.S 2021-02-24 15:47:45.047741532 +0100
+@@ -71,7 +71,7 @@ sys_call_table32:
+ /*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
-@@ -142,7 +142,7 @@ sys_call_table:
- /*250*/ .word sys64_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
+@@ -152,7 +152,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
/*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.19.1/arch/sparc64/kernel/traps.c linux-2.6.19.1-vs2.3.0.6/arch/sparc64/kernel/traps.c
---- linux-2.6.19.1/arch/sparc64/kernel/traps.c 2006-11-30 21:18:35 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/sparc64/kernel/traps.c 2006-11-08 21:52:08 +0100
-@@ -2223,7 +2223,8 @@ void die_if_kernel(char *str, struct pt_
- " /_| \\__/ |_\\\n"
- " \\__U_/\n");
-
-- printk("%s(%d): %s [#%d]\n", current->comm, current->pid, str, ++die_counter);
-+ printk("%s(%d[#%u]): %s [#%d]\n", current->comm,
-+ current->pid, current->xid, str, ++die_counter);
- notify_die(DIE_OOPS, str, regs, 0, 255, SIGSEGV);
- __asm__ __volatile__("flushw");
- __show_regs(regs);
-diff -NurpP --minimal linux-2.6.19.1/arch/sparc64/solaris/fs.c linux-2.6.19.1-vs2.3.0.6/arch/sparc64/solaris/fs.c
---- linux-2.6.19.1/arch/sparc64/solaris/fs.c 2006-11-30 21:18:35 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/sparc64/solaris/fs.c 2006-11-08 04:57:52 +0100
-@@ -368,7 +368,7 @@ static int report_statvfs(struct vfsmoun
- int j = strlen (p);
-
- if (j > 15) j = 15;
-- if (IS_RDONLY(inode)) i = 1;
-+ if (IS_RDONLY(inode) || MNT_IS_RDONLY(mnt)) i = 1;
- if (mnt->mnt_flags & MNT_NOSUID) i |= 2;
- if (!sysv_valid_dev(inode->i_sb->s_dev))
- return -EOVERFLOW;
-@@ -404,7 +404,7 @@ static int report_statvfs64(struct vfsmo
- int j = strlen (p);
-
- if (j > 15) j = 15;
-- if (IS_RDONLY(inode)) i = 1;
-+ if (IS_RDONLY(inode) || MNT_IS_RDONLY(mnt)) i = 1;
- if (mnt->mnt_flags & MNT_NOSUID) i |= 2;
- if (!sysv_valid_dev(inode->i_sb->s_dev))
- return -EOVERFLOW;
-diff -NurpP --minimal linux-2.6.19.1/arch/um/Kconfig linux-2.6.19.1-vs2.3.0.6/arch/um/Kconfig
---- linux-2.6.19.1/arch/um/Kconfig 2006-11-30 21:18:35 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/um/Kconfig 2006-11-08 04:57:40 +0100
-@@ -306,6 +306,8 @@ source "drivers/connector/Kconfig"
+diff -urNp -x '*.orig' linux-4.9/arch/um/Kconfig.rest linux-4.9/arch/um/Kconfig.rest
+--- linux-4.9/arch/um/Kconfig.rest 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/arch/um/Kconfig.rest 2021-02-24 15:47:45.047741532 +0100
+@@ -12,6 +12,8 @@ source "arch/um/Kconfig.net"
source "fs/Kconfig"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.19.1/arch/um/kernel/irq.c linux-2.6.19.1-vs2.3.0.6/arch/um/kernel/irq.c
---- linux-2.6.19.1/arch/um/kernel/irq.c 2006-11-30 21:18:36 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/um/kernel/irq.c 2006-11-30 18:28:41 +0100
-@@ -357,6 +357,7 @@ void forward_interrupts(int pid)
- unsigned int do_IRQ(int irq, union uml_pt_regs *regs)
- {
- struct pt_regs *old_regs = set_irq_regs((struct pt_regs *)regs);
-+
- irq_enter();
- __do_IRQ(irq);
- irq_exit();
-diff -NurpP --minimal linux-2.6.19.1/arch/um/kernel/syscall.c linux-2.6.19.1-vs2.3.0.6/arch/um/kernel/syscall.c
---- linux-2.6.19.1/arch/um/kernel/syscall.c 2006-11-30 21:18:36 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/um/kernel/syscall.c 2006-12-02 01:37:05 +0100
-@@ -15,6 +15,7 @@
- #include "linux/unistd.h"
- #include "linux/slab.h"
- #include "linux/utime.h"
-+
- #include "asm/mman.h"
- #include "asm/uaccess.h"
- #include "kern_util.h"
-@@ -118,6 +119,7 @@ long sys_uname(struct old_utsname __user
- long sys_olduname(struct oldold_utsname __user * name)
- {
- long error;
-+ struct new_utsname *ptr;
+diff -urNp -x '*.orig' linux-4.9/arch/x86/Kconfig linux-4.9/arch/x86/Kconfig
+--- linux-4.9/arch/x86/Kconfig 2021-02-24 15:47:30.980634795 +0100
++++ linux-4.9/arch/x86/Kconfig 2021-02-24 15:47:45.047741532 +0100
+@@ -2810,6 +2810,8 @@ source "fs/Kconfig"
- if (!name)
- return -EFAULT;
-diff -NurpP --minimal linux-2.6.19.1/arch/v850/Kconfig linux-2.6.19.1-vs2.3.0.6/arch/v850/Kconfig
---- linux-2.6.19.1/arch/v850/Kconfig 2006-06-18 04:52:42 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/arch/v850/Kconfig 2006-11-08 04:57:40 +0100
-@@ -326,6 +326,8 @@ source "drivers/usb/Kconfig"
-
- source "arch/v850/Kconfig.debug"
+ source "arch/x86/Kconfig.debug"
+source "kernel/vserver/Kconfig"
+
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.19.1/arch/v850/kernel/process.c linux-2.6.19.1-vs2.3.0.6/arch/v850/kernel/process.c
---- linux-2.6.19.1/arch/v850/kernel/process.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/arch/v850/kernel/process.c 2006-11-08 04:57:50 +0100
-@@ -83,7 +83,7 @@ int kernel_thread (int (*fn)(void *), vo
- /* Clone this thread. Note that we don't pass the clone syscall's
- second argument -- it's ignored for calls from kernel mode (the
- child's SP is always set to the top of the kernel stack). */
-- arg0 = flags | CLONE_VM;
-+ arg0 = flags | CLONE_VM | CLONE_KTHREAD;
- syscall = __NR_clone;
- asm volatile ("trap " SYSCALL_SHORT_TRAP
- : "=r" (ret), "=r" (syscall)
-diff -NurpP --minimal linux-2.6.19.1/arch/v850/kernel/ptrace.c linux-2.6.19.1-vs2.3.0.6/arch/v850/kernel/ptrace.c
---- linux-2.6.19.1/arch/v850/kernel/ptrace.c 2006-04-09 13:49:44 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/arch/v850/kernel/ptrace.c 2006-11-30 18:53:18 +0100
-@@ -24,6 +24,7 @@
- #include <linux/smp_lock.h>
- #include <linux/ptrace.h>
- #include <linux/signal.h>
+diff -urNp -x '*.orig' linux-4.9/arch/x86/entry/syscalls/syscall_32.tbl linux-4.9/arch/x86/entry/syscalls/syscall_32.tbl
+--- linux-4.9/arch/x86/entry/syscalls/syscall_32.tbl 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/arch/x86/entry/syscalls/syscall_32.tbl 2021-02-24 15:47:45.047741532 +0100
+@@ -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 -urNp -x '*.orig' linux-4.9/arch/x86/entry/syscalls/syscall_64.tbl linux-4.9/arch/x86/entry/syscalls/syscall_64.tbl
+--- linux-4.9/arch/x86/entry/syscalls/syscall_64.tbl 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/arch/x86/entry/syscalls/syscall_64.tbl 2021-02-24 15:47:45.047741532 +0100
+@@ -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 -urNp -x '*.orig' linux-4.9/block/ioprio.c linux-4.9/block/ioprio.c
+--- linux-4.9/block/ioprio.c 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/block/ioprio.c 2021-02-24 15:47:45.047741532 +0100
+@@ -28,6 +28,7 @@
+ #include <linux/syscalls.h>
+ #include <linux/security.h>
+ #include <linux/pid_namespace.h>
+#include <linux/vs_base.h>
- #include <asm/errno.h>
- #include <asm/ptrace.h>
-@@ -117,6 +118,9 @@ long arch_ptrace(struct task_struct *chi
- {
- int rval;
-
-+ if (!vx_check(vx_task_xid(child), VS_WATCH_P|VS_IDENT))
-+ goto out;
-+
- switch (request) {
- unsigned long val, copied;
-
-diff -NurpP --minimal linux-2.6.19.1/arch/x86_64/Kconfig linux-2.6.19.1-vs2.3.0.6/arch/x86_64/Kconfig
---- linux-2.6.19.1/arch/x86_64/Kconfig 2006-11-30 21:18:36 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/x86_64/Kconfig 2006-11-08 04:57:40 +0100
-@@ -701,6 +701,8 @@ endmenu
-
- source "arch/x86_64/Kconfig.debug"
-
-+source "kernel/vserver/Kconfig"
-+
- source "security/Kconfig"
-
- source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.19.1/arch/x86_64/ia32/ia32_aout.c linux-2.6.19.1-vs2.3.0.6/arch/x86_64/ia32/ia32_aout.c
---- linux-2.6.19.1/arch/x86_64/ia32/ia32_aout.c 2006-11-30 21:18:37 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/x86_64/ia32/ia32_aout.c 2006-11-08 04:57:40 +0100
-@@ -25,6 +25,7 @@
- #include <linux/binfmts.h>
- #include <linux/personality.h>
- #include <linux/init.h>
-+#include <linux/vs_memory.h>
-
- #include <asm/system.h>
- #include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.19.1/arch/x86_64/ia32/ia32_binfmt.c linux-2.6.19.1-vs2.3.0.6/arch/x86_64/ia32/ia32_binfmt.c
---- linux-2.6.19.1/arch/x86_64/ia32/ia32_binfmt.c 2006-11-30 21:18:37 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/x86_64/ia32/ia32_binfmt.c 2006-11-08 04:57:47 +0100
-@@ -375,7 +375,8 @@ int ia32_setup_arg_pages(struct linux_bi
- kmem_cache_free(vm_area_cachep, mpnt);
- return ret;
- }
-- mm->stack_vm = mm->total_vm = vma_pages(mpnt);
-+ vx_vmpages_sub(mm, mm->total_vm - vma_pages(mpnt));
-+ mm->stack_vm = mm->total_vm;
- }
-
- for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
-diff -NurpP --minimal linux-2.6.19.1/arch/x86_64/ia32/ia32entry.S linux-2.6.19.1-vs2.3.0.6/arch/x86_64/ia32/ia32entry.S
---- linux-2.6.19.1/arch/x86_64/ia32/ia32entry.S 2006-11-30 21:18:37 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/x86_64/ia32/ia32entry.S 2006-11-08 04:57:41 +0100
-@@ -672,7 +672,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.19.1/arch/x86_64/ia32/sys_ia32.c linux-2.6.19.1-vs2.3.0.6/arch/x86_64/ia32/sys_ia32.c
---- linux-2.6.19.1/arch/x86_64/ia32/sys_ia32.c 2006-11-30 21:18:37 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/x86_64/ia32/sys_ia32.c 2006-12-02 01:37:05 +0100
-@@ -454,7 +454,7 @@ sys32_gettimeofday(struct compat_timeval
+ int set_task_ioprio(struct task_struct *task, int ioprio)
{
- if (tv) {
- struct timeval ktv;
-- do_gettimeofday(&ktv);
-+ vx_gettimeofday(&ktv);
- if (put_tv32(tv, &ktv))
- return -EFAULT;
- }
-diff -NurpP --minimal linux-2.6.19.1/arch/x86_64/ia32/syscall32.c linux-2.6.19.1-vs2.3.0.6/arch/x86_64/ia32/syscall32.c
---- linux-2.6.19.1/arch/x86_64/ia32/syscall32.c 2005-10-28 20:49:18 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/arch/x86_64/ia32/syscall32.c 2006-11-08 04:57:47 +0100
-@@ -10,6 +10,7 @@
- #include <linux/init.h>
- #include <linux/stringify.h>
- #include <linux/security.h>
-+#include <linux/vs_memory.h>
- #include <asm/proto.h>
- #include <asm/tlbflush.h>
- #include <asm/ia32_unistd.h>
-@@ -70,7 +71,7 @@ int syscall32_setup_pages(struct linux_b
- kmem_cache_free(vm_area_cachep, vma);
- return ret;
- }
-- mm->total_vm += npages;
-+ vx_vmpages_add(mm, npages);
- up_write(&mm->mmap_sem);
- return 0;
- }
-diff -NurpP --minimal linux-2.6.19.1/arch/x86_64/kernel/irq.c linux-2.6.19.1-vs2.3.0.6/arch/x86_64/kernel/irq.c
---- linux-2.6.19.1/arch/x86_64/kernel/irq.c 2006-11-30 21:18:37 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/x86_64/kernel/irq.c 2006-11-30 18:28:58 +0100
-@@ -123,7 +123,6 @@ asmlinkage unsigned int do_IRQ(struct pt
- else
- printk(KERN_EMERG "%s: %d.%d No irq handler for vector\n",
- __func__, smp_processor_id(), vector);
--
- irq_exit();
-
- set_irq_regs(old_regs);
-diff -NurpP --minimal linux-2.6.19.1/arch/x86_64/kernel/process.c linux-2.6.19.1-vs2.3.0.6/arch/x86_64/kernel/process.c
---- linux-2.6.19.1/arch/x86_64/kernel/process.c 2006-11-30 21:18:37 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/x86_64/kernel/process.c 2006-11-30 20:55:45 +0100
-@@ -54,7 +54,8 @@
-
- asmlinkage extern void ret_from_fork(void);
-
--unsigned long kernel_thread_flags = CLONE_VM | CLONE_UNTRACED;
-+unsigned long kernel_thread_flags =
-+ CLONE_VM | CLONE_UNTRACED | CLONE_KTHREAD;
-
- unsigned long boot_option_idle_override = 0;
- EXPORT_SYMBOL(boot_option_idle_override);
-@@ -301,8 +302,8 @@ void __show_regs(struct pt_regs * regs)
-
- printk("\n");
- print_modules();
-- printk("Pid: %d, comm: %.20s %s %s %.*s\n",
-- current->pid, current->comm, print_tainted(),
-+ printk("Pid: %d:#%u, comm: %.20s %s %s %.*s\n",
-+ current->pid, current->xid, current->comm, print_tainted(),
- init_utsname()->release,
- (int)strcspn(init_utsname()->version, " "),
- init_utsname()->version);
-diff -NurpP --minimal linux-2.6.19.1/arch/x86_64/kernel/traps.c linux-2.6.19.1-vs2.3.0.6/arch/x86_64/kernel/traps.c
---- linux-2.6.19.1/arch/x86_64/kernel/traps.c 2006-11-30 21:18:37 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/x86_64/kernel/traps.c 2006-11-30 20:55:45 +0100
-@@ -487,8 +487,9 @@ void show_registers(struct pt_regs *regs
-
- printk("CPU %d ", cpu);
- __show_regs(regs);
-- printk("Process %s (pid: %d, threadinfo %p, task %p)\n",
-- cur->comm, cur->pid, task_thread_info(cur), cur);
-+ printk("Process %s (pid: %d[#%u], threadinfo %p, task %p)\n",
-+ cur->comm, cur->pid, cur->xid,
-+ task_thread_info(cur), cur);
-
- /*
- * When in-kernel, we also print out the stack and code at the
-@@ -657,8 +658,8 @@ static void __kprobes do_trap(int trapnr
- if (user_mode(regs)) {
- if (exception_trace && unhandled_signal(tsk, signr))
- printk(KERN_INFO
-- "%s[%d] trap %s rip:%lx rsp:%lx error:%lx\n",
-- tsk->comm, tsk->pid, str,
-+ "%s[%d:#%u] trap %s rip:%lx rsp:%lx error:%lx\n",
-+ tsk->comm, tsk->pid, tsk->xid, str,
- regs->rip, regs->rsp, error_code);
-
- if (info)
-@@ -758,8 +759,8 @@ asmlinkage void __kprobes do_general_pro
- if (user_mode(regs)) {
- if (exception_trace && unhandled_signal(tsk, SIGSEGV))
- printk(KERN_INFO
-- "%s[%d] general protection rip:%lx rsp:%lx error:%lx\n",
-- tsk->comm, tsk->pid,
-+ "%s[%d:#%u] general protection rip:%lx rsp:%lx error:%lx\n",
-+ tsk->comm, tsk->pid, tsk->xid,
- regs->rip, regs->rsp, error_code);
-
- force_sig(SIGSEGV, tsk);
-diff -NurpP --minimal linux-2.6.19.1/arch/x86_64/mm/fault.c linux-2.6.19.1-vs2.3.0.6/arch/x86_64/mm/fault.c
---- linux-2.6.19.1/arch/x86_64/mm/fault.c 2006-11-30 21:18:37 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/arch/x86_64/mm/fault.c 2006-11-08 04:57:42 +0100
-@@ -514,10 +514,10 @@ bad_area_nosemaphore:
-
- if (exception_trace && unhandled_signal(tsk, SIGSEGV)) {
- printk(
-- "%s%s[%d]: segfault at %016lx rip %016lx rsp %016lx error %lx\n",
-+ "%s%s[%d:#%u]: segfault at %016lx rip %016lx rsp %016lx error %lx\n",
- tsk->pid > 1 ? KERN_INFO : KERN_EMERG,
-- tsk->comm, tsk->pid, address, regs->rip,
-- regs->rsp, error_code);
-+ tsk->comm, tsk->pid, tsk->xid, address,
-+ regs->rip, regs->rsp, error_code);
- }
-
- tsk->thread.cr2 = address;
-diff -NurpP --minimal linux-2.6.19.1/arch/xtensa/kernel/irq.c linux-2.6.19.1-vs2.3.0.6/arch/xtensa/kernel/irq.c
---- linux-2.6.19.1/arch/xtensa/kernel/irq.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/arch/xtensa/kernel/irq.c 2006-11-30 18:29:29 +0100
-@@ -63,9 +63,7 @@ unsigned int do_IRQ(int irq, struct pt_
- sp - sizeof(struct thread_info));
- }
- #endif
--
- __do_IRQ(irq, regs);
--
- irq_exit();
-
- return 1;
-diff -NurpP --minimal linux-2.6.19.1/arch/xtensa/kernel/process.c linux-2.6.19.1-vs2.3.0.6/arch/xtensa/kernel/process.c
---- linux-2.6.19.1/arch/xtensa/kernel/process.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/arch/xtensa/kernel/process.c 2006-11-08 04:57:50 +0100
-@@ -206,7 +206,7 @@ int kernel_thread(int (*fn)(void *), voi
- :"=r" (retval)
- :"i" (__NR_clone), "i" (__NR_exit),
- "r" (arg), "r" (fn),
-- "r" (flags | CLONE_VM)
-+ "r" (flags | CLONE_VM | CLONE_KTHREAD)
- : "a2", "a3", "a4", "a5", "a6" );
- return retval;
- }
-diff -NurpP --minimal linux-2.6.19.1/block/cfq-iosched.c linux-2.6.19.1-vs2.3.0.6/block/cfq-iosched.c
---- linux-2.6.19.1/block/cfq-iosched.c 2006-11-30 21:18:37 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/block/cfq-iosched.c 2006-11-08 21:52:08 +0100
-@@ -221,6 +221,8 @@ static int cfq_queue_empty(request_queue
+@@ -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;
+@@ -203,6 +206,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 -urNp -x '*.orig' linux-4.9/drivers/block/Kconfig linux-4.9/drivers/block/Kconfig
+--- linux-4.9/drivers/block/Kconfig 2021-02-24 15:47:31.113972298 +0100
++++ linux-4.9/drivers/block/Kconfig 2021-02-24 15:47:45.047741532 +0100
+@@ -273,6 +273,13 @@ config BLK_DEV_CRYPTOLOOP
- static inline pid_t cfq_queue_pid(struct task_struct *task, int rw)
- {
-+ if (task->xid)
-+ return task->xid + (1 << 16);
- if (rw == READ || rw == WRITE_SYNC)
- return task->pid;
-
-diff -NurpP --minimal linux-2.6.19.1/drivers/block/Kconfig linux-2.6.19.1-vs2.3.0.6/drivers/block/Kconfig
---- linux-2.6.19.1/drivers/block/Kconfig 2006-12-13 07:46:36 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/drivers/block/Kconfig 2006-12-13 09:16:31 +0100
-@@ -317,6 +317,13 @@ config BLK_DEV_CRYPTOLOOP
- instead, which can be configured to be on-disk compatible with the
- cryptoloop device.
+ source "drivers/block/drbd/Kconfig"
+config BLK_DEV_VROOT
+ tristate "Virtual Root device support"
config BLK_DEV_NBD
tristate "Network block device support"
depends on NET
-diff -NurpP --minimal linux-2.6.19.1/drivers/block/Makefile linux-2.6.19.1-vs2.3.0.6/drivers/block/Makefile
---- linux-2.6.19.1/drivers/block/Makefile 2006-06-18 04:52:46 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/drivers/block/Makefile 2006-11-08 04:57:51 +0100
-@@ -29,4 +29,5 @@ obj-$(CONFIG_BLK_DEV_CRYPTOLOOP) += cryp
- obj-$(CONFIG_VIODASD) += viodasd.o
+diff -urNp -x '*.orig' linux-4.9/drivers/block/Makefile linux-4.9/drivers/block/Makefile
+--- linux-4.9/drivers/block/Makefile 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/drivers/block/Makefile 2021-02-24 15:47:45.051074969 +0100
+@@ -31,6 +31,7 @@ obj-$(CONFIG_VIRTIO_BLK) += virtio_blk.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
-diff -NurpP --minimal linux-2.6.19.1/drivers/block/loop.c linux-2.6.19.1-vs2.3.0.6/drivers/block/loop.c
---- linux-2.6.19.1/drivers/block/loop.c 2006-11-30 21:18:39 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/drivers/block/loop.c 2006-11-30 18:53:18 +0100
-@@ -74,6 +74,7 @@
- #include <linux/highmem.h>
- #include <linux/gfp.h>
- #include <linux/kthread.h>
+ obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o
+ obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/
+diff -urNp -x '*.orig' linux-4.9/drivers/block/loop.c linux-4.9/drivers/block/loop.c
+--- linux-4.9/drivers/block/loop.c 2021-02-24 15:47:31.117305737 +0100
++++ linux-4.9/drivers/block/loop.c 2021-02-24 15:47:45.051074969 +0100
+@@ -76,6 +76,7 @@
+ #include <linux/miscdevice.h>
+ #include <linux/falloc.h>
+ #include <linux/uio.h>
+#include <linux/vs_context.h>
+ #include "loop.h"
#include <asm/uaccess.h>
-
-@@ -795,6 +796,7 @@ static int loop_set_fd(struct loop_devic
+@@ -936,6 +937,7 @@ static int loop_set_fd(struct loop_devic
lo->lo_blocksize = lo_blocksize;
lo->lo_device = bdev;
lo->lo_flags = lo_flags;
+ lo->lo_xid = vx_current_xid();
lo->lo_backing_file = file;
- lo->transfer = transfer_none;
+ lo->transfer = NULL;
lo->ioctl = NULL;
-@@ -935,7 +937,7 @@ loop_set_status(struct loop_device *lo,
- struct loop_func_table *xfer;
-
- if (lo->lo_encrypt_key_size && lo->lo_key_owner != current->uid &&
+@@ -1056,6 +1058,7 @@ static int loop_clr_fd(struct loop_devic
+ lo->lo_offset = 0;
+ lo->lo_sizelimit = 0;
+ lo->lo_encrypt_key_size = 0;
++ 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);
+@@ -1102,7 +1105,7 @@ loop_set_status(struct loop_device *lo,
+
+ if (lo->lo_encrypt_key_size &&
+ !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;
-@@ -1015,7 +1017,8 @@ loop_get_status(struct loop_device *lo,
+@@ -1207,7 +1210,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;
info->lo_encrypt_key_size = lo->lo_encrypt_key_size;
memcpy(info->lo_encrypt_key, lo->lo_encrypt_key,
lo->lo_encrypt_key_size);
-@@ -1326,6 +1329,9 @@ static int lo_open(struct inode *inode,
- {
- struct loop_device *lo = inode->i_bdev->bd_disk->private_data;
+@@ -1569,6 +1573,11 @@ static int lo_open(struct block_device *
+ goto out;
+ }
-+ if (!vx_check(lo->lo_xid, VS_WATCH_P|VS_IDENT))
-+ return -EACCES;
++ if (!vx_check(lo->lo_xid, VS_IDENT|VS_HOSTID|VS_ADMIN_P)) {
++ err = -EACCES;
++ goto out;
++ }
+
- mutex_lock(&lo->lo_ctl_mutex);
- lo->lo_refcnt++;
- mutex_unlock(&lo->lo_ctl_mutex);
-diff -NurpP --minimal linux-2.6.19.1/drivers/block/vroot.c linux-2.6.19.1-vs2.3.0.6/drivers/block/vroot.c
---- linux-2.6.19.1/drivers/block/vroot.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/drivers/block/vroot.c 2006-11-30 19:40:17 +0100
-@@ -0,0 +1,281 @@
+ atomic_inc(&lo->lo_refcnt);
+ out:
+ mutex_unlock(&loop_index_mutex);
+diff -urNp -x '*.orig' linux-4.9/drivers/block/loop.h linux-4.9/drivers/block/loop.h
+--- linux-4.9/drivers/block/loop.h 2021-02-24 15:47:31.117305737 +0100
++++ linux-4.9/drivers/block/loop.h 2021-02-24 15:47:45.051074969 +0100
+@@ -43,6 +43,7 @@ struct loop_device {
+ struct loop_func_table *lo_encryption;
+ __u32 lo_init[2];
+ kuid_t lo_key_owner; /* Who set the key */
++ vxid_t lo_xid;
+ int (*ioctl)(struct loop_device *, int cmd,
+ unsigned long arg);
+
+diff -urNp -x '*.orig' linux-4.9/drivers/block/vroot.c linux-4.9/drivers/block/vroot.c
+--- linux-4.9/drivers/block/vroot.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/drivers/block/vroot.c 2021-02-24 15:47:45.051074969 +0100
+@@ -0,0 +1,291 @@
+/*
+ * linux/drivers/block/vroot.c
+ *
-+ * written by Herbert Pötzl, 9/11/2002
-+ * ported to 2.6.10 by Herbert Pötzl, 30/12/2004
++ * written by Herbert P?tzl, 9/11/2002
++ * ported to 2.6.10 by Herbert P?tzl, 30/12/2004
+ *
+ * based on the loop.c code by Theodore Ts'o.
+ *
-+ * Copyright (C) 2002-2006 by Herbert Pötzl.
++ * Copyright (C) 2002-2007 by Herbert P?tzl.
+ * Redistribution of this file is permitted under the
+ * GNU General Public License.
+ *
+#include <linux/file.h>
+#include <linux/major.h>
+#include <linux/blkdev.h>
++#include <linux/slab.h>
+
+#include <linux/vroot.h>
+#include <linux/vs_context.h>
+
+static int vroot_set_dev(
+ struct vroot_device *vr,
-+ struct file *vr_file,
+ struct block_device *bdev,
+ unsigned int arg)
+{
+ goto out;
+
+ error = -EINVAL;
-+ inode = file->f_dentry->d_inode;
++ inode = file->f_path.dentry->d_inode;
+
+
+ if (S_ISBLK(inode->i_mode)) {
+
+static int vroot_clr_dev(
+ struct vroot_device *vr,
-+ struct file *vr_file,
+ struct block_device *bdev)
+{
+ struct block_device *real_bdev;
+}
+
+
-+static int vr_ioctl(struct inode * inode, struct file * file,
++static int vr_ioctl(struct block_device *bdev, fmode_t mode,
+ unsigned int cmd, unsigned long arg)
+{
-+ struct vroot_device *vr = inode->i_bdev->bd_disk->private_data;
++ struct vroot_device *vr = bdev->bd_disk->private_data;
+ int err;
+
+ down(&vr->vr_ctl_mutex);
+ switch (cmd) {
+ case VROOT_SET_DEV:
-+ err = vroot_set_dev(vr, file, inode->i_bdev, arg);
++ err = vroot_set_dev(vr, bdev, arg);
+ break;
+ case VROOT_CLR_DEV:
-+ err = vroot_clr_dev(vr, file, inode->i_bdev);
++ err = vroot_clr_dev(vr, bdev);
+ break;
+ default:
+ err = -EINVAL;
+ return err;
+}
+
-+static int vr_open(struct inode *inode, struct file *file)
++static int vr_open(struct block_device *bdev, fmode_t mode)
+{
-+ struct vroot_device *vr = inode->i_bdev->bd_disk->private_data;
++ struct vroot_device *vr = bdev->bd_disk->private_data;
+
+ down(&vr->vr_ctl_mutex);
+ vr->vr_refcnt++;
+ return 0;
+}
+
-+static int vr_release(struct inode *inode, struct file *file)
++static void vr_release(struct gendisk *disk, fmode_t mode)
+{
-+ struct vroot_device *vr = inode->i_bdev->bd_disk->private_data;
++ 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 = {
+ .ioctl = vr_ioctl,
+};
+
++static blk_qc_t vroot_make_request(struct request_queue *q, struct bio *bio)
++{
++ printk("vroot_make_request %p, %p\n", q, bio);
++ bio_io_error(bio);
++ return BLK_QC_T_NONE;
++}
++
+struct block_device *__vroot_get_real_bdev(struct block_device *bdev)
+{
+ struct inode *inode = bdev->bd_inode;
+ return real_bdev;
+}
+
++
++
+/*
+ * And now the modules code and kernel interface.
+ */
+MODULE_LICENSE("GPL");
+MODULE_ALIAS_BLOCKDEV_MAJOR(VROOT_MAJOR);
+
-+MODULE_AUTHOR ("Herbert Pötzl");
++MODULE_AUTHOR ("Herbert P?tzl");
+MODULE_DESCRIPTION ("Virtual Root Device Mapper");
+
+
+ disks[i] = alloc_disk(1);
+ if (!disks[i])
+ goto out_mem3;
++ 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++) {
+ 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;
+ del_gendisk(disks[i]);
+ put_disk(disks[i]);
+ }
-+ if (unregister_blkdev(VROOT_MAJOR, "vroot"))
-+ printk(KERN_WARNING "vroot: cannot unregister blkdev\n");
++ unregister_blkdev(VROOT_MAJOR, "vroot");
+
+ kfree(disks);
+ kfree(vroot_dev);
+
+#endif
+
-diff -NurpP --minimal linux-2.6.19.1/drivers/char/random.c linux-2.6.19.1-vs2.3.0.6/drivers/char/random.c
---- linux-2.6.19.1/drivers/char/random.c 2006-11-30 21:18:40 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/drivers/char/random.c 2006-11-08 04:57:40 +0100
-@@ -1178,7 +1178,7 @@ static char sysctl_bootid[16];
- static int proc_do_uuid(ctl_table *table, int write, struct file *filp,
- void __user *buffer, size_t *lenp, loff_t *ppos)
- {
-- ctl_table fake_table;
-+ ctl_table fake_table = {0};
- unsigned char buf[64], tmp_uuid[16], *uuid;
-
- uuid = table->data;
-diff -NurpP --minimal linux-2.6.19.1/drivers/char/sysrq.c linux-2.6.19.1-vs2.3.0.6/drivers/char/sysrq.c
---- linux-2.6.19.1/drivers/char/sysrq.c 2006-11-30 21:18:41 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/drivers/char/sysrq.c 2006-12-02 01:37:05 +0100
-@@ -36,6 +36,7 @@
- #include <linux/workqueue.h>
- #include <linux/kexec.h>
- #include <linux/irq.h>
-+#include <linux/vserver/debug.h>
-
- #include <asm/ptrace.h>
- #include <asm/irq_regs.h>
-@@ -260,6 +261,21 @@ static struct sysrq_key_op sysrq_unrt_op
- .enable_mask = SYSRQ_ENABLE_RTNICE,
- };
-
-+
-+#ifdef CONFIG_VSERVER_DEBUG
-+static void sysrq_handle_vxinfo(int key, struct tty_struct *tty)
-+{
-+ 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);
-
-@@ -304,7 +320,11 @@ static struct sysrq_key_op *sysrq_key_ta
- /* May be assigned at init time by SMP VOYAGER */
- NULL, /* v */
- NULL, /* w */
-+#ifdef CONFIG_VSERVER_DEBUG
-+ &sysrq_showvxinfo_op, /* x */
-+#else
- NULL, /* x */
-+#endif
- NULL, /* y */
- NULL /* z */
- };
-@@ -318,6 +338,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.19.1/drivers/char/tty_io.c linux-2.6.19.1-vs2.3.0.6/drivers/char/tty_io.c
---- linux-2.6.19.1/drivers/char/tty_io.c 2006-11-30 21:18:41 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/drivers/char/tty_io.c 2006-11-08 04:57:52 +0100
-@@ -103,6 +103,7 @@
- #include <linux/selection.h>
-
- #include <linux/kmod.h>
-+#include <linux/vs_pid.h>
-
- #undef TTY_DEBUG_HANGUP
-
-@@ -2941,13 +2942,16 @@ static int tiocsctty(struct tty_struct *
-
- static int tiocgpgrp(struct tty_struct *tty, struct tty_struct *real_tty, pid_t __user *p)
- {
-+ pid_t pgrp;
- /*
- * (tty == real_tty) is a cheap way of
- * testing if the tty is NOT a master pty.
- */
- if (tty == real_tty && current->signal->tty != real_tty)
- return -ENOTTY;
-- return put_user(real_tty->pgrp, p);
-+
-+ pgrp = vx_map_pid(real_tty->pgrp);
-+ return put_user(pgrp, p);
- }
-
- /**
-@@ -2977,6 +2981,8 @@ static int tiocspgrp(struct tty_struct *
- return -ENOTTY;
- if (get_user(pgrp, p))
- return -EFAULT;
-+
-+ pgrp = vx_rmap_pid(pgrp);
- if (pgrp < 0)
- return -EINVAL;
- if (session_of_pgrp(pgrp) != current->signal->session)
-diff -NurpP --minimal linux-2.6.19.1/drivers/infiniband/core/uverbs_mem.c linux-2.6.19.1-vs2.3.0.6/drivers/infiniband/core/uverbs_mem.c
---- linux-2.6.19.1/drivers/infiniband/core/uverbs_mem.c 2006-06-18 04:53:04 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/drivers/infiniband/core/uverbs_mem.c 2006-11-08 04:57:47 +0100
-@@ -36,6 +36,7 @@
-
- #include <linux/mm.h>
- #include <linux/dma-mapping.h>
-+#include <linux/vs_memory.h>
-
- #include "uverbs.h"
+diff -urNp -x '*.orig' linux-4.9/drivers/md/dm-core.h linux-4.9/drivers/md/dm-core.h
+--- linux-4.9/drivers/md/dm-core.h 2021-02-24 15:47:31.450649498 +0100
++++ linux-4.9/drivers/md/dm-core.h 2021-02-24 15:47:45.051074969 +0100
+@@ -52,6 +52,7 @@ struct mapped_device {
-@@ -161,7 +162,7 @@ out:
- if (ret < 0)
- __ib_umem_release(dev, mem, 0);
- else
-- current->mm->locked_vm = locked;
-+ vx_vmlocked_sub(current->mm, current->mm->locked_vm - locked);
-
- up_write(¤t->mm->mmap_sem);
- free_page((unsigned long) page_list);
-@@ -174,8 +175,8 @@ void ib_umem_release(struct ib_device *d
- __ib_umem_release(dev, umem, 1);
-
- down_write(¤t->mm->mmap_sem);
-- current->mm->locked_vm -=
-- PAGE_ALIGN(umem->length + umem->offset) >> PAGE_SHIFT;
-+ vx_vmlocked_sub(current->mm,
-+ PAGE_ALIGN(umem->length + umem->offset) >> PAGE_SHIFT);
- up_write(¤t->mm->mmap_sem);
- }
-
-@@ -184,7 +185,7 @@ static void ib_umem_account(void *work_p
- struct ib_umem_account_work *work = work_ptr;
-
- down_write(&work->mm->mmap_sem);
-- work->mm->locked_vm -= work->diff;
-+ vx_vmlocked_sub(work->mm, work->diff);
- up_write(&work->mm->mmap_sem);
- mmput(work->mm);
- kfree(work);
-diff -NurpP --minimal linux-2.6.19.1/drivers/infiniband/hw/ipath/ipath_user_pages.c linux-2.6.19.1-vs2.3.0.6/drivers/infiniband/hw/ipath/ipath_user_pages.c
---- linux-2.6.19.1/drivers/infiniband/hw/ipath/ipath_user_pages.c 2006-11-30 21:18:44 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/drivers/infiniband/hw/ipath/ipath_user_pages.c 2006-11-08 04:57:47 +0100
-@@ -33,6 +33,7 @@
-
- #include <linux/mm.h>
- #include <linux/device.h>
-+#include <linux/vs_memory.h>
-
- #include "ipath_kernel.h"
-
-@@ -61,7 +62,8 @@ static int __get_user_pages(unsigned lon
- lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur >>
- PAGE_SHIFT;
-
-- if (num_pages > lock_limit) {
-+ if (num_pages > lock_limit ||
-+ !vx_vmlocked_avail(current->mm, num_pages)) {
- ret = -ENOMEM;
- goto bail;
- }
-@@ -78,7 +80,7 @@ static int __get_user_pages(unsigned lon
- goto bail_release;
- }
-
-- current->mm->locked_vm += num_pages;
-+ vx_vmlocked_add(current->mm, num_pages);
-
- ret = 0;
- goto bail;
-@@ -203,7 +205,7 @@ void ipath_release_user_pages(struct pag
-
- __ipath_release_user_pages(p, num_pages, 1);
-
-- current->mm->locked_vm -= num_pages;
-+ vx_vmlocked_sub(current->mm, num_pages);
+ atomic_t holders;
+ atomic_t open_count;
++ vxid_t xid;
- up_write(¤t->mm->mmap_sem);
- }
-@@ -219,7 +221,7 @@ static void user_pages_account(void *ptr
- struct ipath_user_pages_work *work = ptr;
-
- down_write(&work->mm->mmap_sem);
-- work->mm->locked_vm -= work->num_pages;
-+ vx_vmlocked_sub(work->mm, work->num_pages);
- up_write(&work->mm->mmap_sem);
- mmput(work->mm);
- kfree(work);
-diff -NurpP --minimal linux-2.6.19.1/drivers/md/dm-ioctl.c linux-2.6.19.1-vs2.3.0.6/drivers/md/dm-ioctl.c
---- linux-2.6.19.1/drivers/md/dm-ioctl.c 2006-11-30 21:18:46 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/drivers/md/dm-ioctl.c 2006-11-30 19:57:46 +0100
-@@ -15,6 +15,7 @@
- #include <linux/slab.h>
+ struct dm_target *immutable_target;
+ struct target_type *immutable_target_type;
+diff -urNp -x '*.orig' linux-4.9/drivers/md/dm-ioctl.c linux-4.9/drivers/md/dm-ioctl.c
+--- linux-4.9/drivers/md/dm-ioctl.c 2021-02-24 15:47:31.450649498 +0100
++++ linux-4.9/drivers/md/dm-ioctl.c 2021-02-24 15:47:45.051074969 +0100
+@@ -16,6 +16,7 @@
#include <linux/dm-ioctl.h>
#include <linux/hdreg.h>
+ #include <linux/compat.h>
+#include <linux/vs_context.h>
#include <asm/uaccess.h>
-@@ -100,7 +101,8 @@ static struct hash_cell *__get_name_cell
+@@ -114,7 +115,8 @@ static struct hash_cell *__get_name_cell
unsigned int h = hash_str(str);
list_for_each_entry (hc, _name_buckets + h, name_list)
- if (!strcmp(hc->name, str)) {
-+ if (vx_check(dm_get_xid(hc->md), VS_WATCH_P|VS_IDENT) &&
++ if (vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT) &&
+ !strcmp(hc->name, str)) {
dm_get(hc->md);
return hc;
}
-@@ -114,7 +116,8 @@ static struct hash_cell *__get_uuid_cell
+@@ -128,7 +130,8 @@ static struct hash_cell *__get_uuid_cell
unsigned int h = hash_str(str);
list_for_each_entry (hc, _uuid_buckets + h, uuid_list)
- if (!strcmp(hc->uuid, str)) {
-+ if (vx_check(dm_get_xid(hc->md), VS_WATCH_P|VS_IDENT) &&
++ if (vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT) &&
+ !strcmp(hc->uuid, str)) {
dm_get(hc->md);
return hc;
}
-@@ -349,6 +352,9 @@ typedef int (*ioctl_fn)(struct dm_ioctl
+@@ -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;
+
+ md = dm_get_md(huge_decode_dev(dev));
+ if (!md)
+ return NULL;
+
+- 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
static int remove_all(struct dm_ioctl *param, size_t param_size)
{
+ if (!vx_check(0, VS_ADMIN))
+ return -EPERM;
+
- dm_hash_remove_all(1);
+ dm_hash_remove_all(true, !!(param->flags & DM_DEFERRED_REMOVE), false);
param->data_size = 0;
return 0;
-@@ -396,6 +402,8 @@ static int list_devices(struct dm_ioctl
+@@ -514,6 +522,8 @@ static int list_devices(struct dm_ioctl
*/
for (i = 0; i < NUM_BUCKETS; i++) {
list_for_each_entry (hc, _name_buckets + i, name_list) {
-+ if (!vx_check(dm_get_xid(hc->md), VS_WATCH_P|VS_IDENT))
++ 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;
-@@ -419,6 +427,8 @@ static int list_devices(struct dm_ioctl
+@@ -537,6 +547,8 @@ static int list_devices(struct dm_ioctl
*/
for (i = 0; i < NUM_BUCKETS; i++) {
list_for_each_entry (hc, _name_buckets + i, name_list) {
-+ if (!vx_check(dm_get_xid(hc->md), VS_WATCH_P|VS_IDENT))
++ 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);
-@@ -609,10 +619,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;
- }
-@@ -1405,8 +1416,8 @@ static int ctl_ioctl(struct inode *inode
- ioctl_fn fn = NULL;
- size_t param_size;
+@@ -1800,8 +1812,8 @@ static int ctl_ioctl(uint command, struc
+ size_t input_param_size;
+ struct dm_ioctl param_kernel;
- /* only root can play with this */
- if (!capable(CAP_SYS_ADMIN))
return -EACCES;
if (_IOC_TYPE(command) != DM_IOCTL)
-diff -NurpP --minimal linux-2.6.19.1/drivers/md/dm.c linux-2.6.19.1-vs2.3.0.6/drivers/md/dm.c
---- linux-2.6.19.1/drivers/md/dm.c 2006-11-30 21:18:46 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/drivers/md/dm.c 2006-11-30 18:53:18 +0100
-@@ -21,6 +21,7 @@
- #include <linux/hdreg.h>
- #include <linux/blktrace_api.h>
- #include <linux/smp_lock.h>
+diff -urNp -x '*.orig' linux-4.9/drivers/md/dm.c linux-4.9/drivers/md/dm.c
+--- linux-4.9/drivers/md/dm.c 2021-02-24 15:47:31.457316373 +0100
++++ linux-4.9/drivers/md/dm.c 2021-02-24 15:47:45.051074969 +0100
+@@ -22,6 +22,7 @@
+ #include <linux/wait.h>
+ #include <linux/pr.h>
+ #include <linux/vmalloc.h>
+#include <linux/vs_base.h>
#define DM_MSG_PREFIX "core"
-@@ -75,6 +76,7 @@ struct mapped_device {
- rwlock_t map_lock;
- atomic_t holders;
- atomic_t open_count;
-+ xid_t xid;
-
- unsigned long flags;
-
-@@ -220,6 +222,7 @@ static void __exit dm_exit(void)
- static int dm_blk_open(struct inode *inode, struct file *file)
+@@ -300,6 +301,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;
spin_lock(&_minor_lock);
-@@ -228,18 +231,19 @@ static int dm_blk_open(struct inode *ino
+@@ -308,17 +310,19 @@ static int dm_blk_open(struct block_devi
goto out;
if (test_bit(DMF_FREEING, &md->flags) ||
-- test_bit(DMF_DELETING, &md->flags)) {
+- dm_deleting_md(md)) {
- md = NULL;
-+ test_bit(DMF_DELETING, &md->flags))
++ dm_deleting_md(md))
+ goto out;
+
+ ret = -EACCES;
-+ if (!vx_check(md->xid, VS_IDENT))
++ if (!vx_check(md->xid, VS_IDENT|VS_HOSTID))
goto out;
- }
dm_get(md);
atomic_inc(&md->open_count);
--
+ ret = 0;
out:
spin_unlock(&_minor_lock);
+ return ret;
}
- static int dm_blk_close(struct inode *inode, struct file *file)
-@@ -435,6 +439,14 @@ int dm_set_geometry(struct mapped_device
+ static void dm_blk_close(struct gendisk *disk, fmode_t mode)
+@@ -744,6 +748,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;
+}
/*-----------------------------------------------------------------
* CRUD START:
* A more elegant soln is in the works that uses the queue
-@@ -952,6 +964,7 @@ static struct mapped_device *alloc_dev(i
- atomic_set(&md->holders, 1);
- atomic_set(&md->open_count, 0);
- atomic_set(&md->event_nr, 0);
+@@ -1549,6 +1561,7 @@ static struct mapped_device *alloc_dev(i
+ INIT_LIST_HEAD(&md->uevent_list);
+ INIT_LIST_HEAD(&md->table_devices);
+ spin_lock_init(&md->uevent_lock);
+ md->xid = vx_current_xid();
- md->queue = blk_alloc_queue(GFP_KERNEL);
+ md->queue = blk_alloc_queue_node(GFP_KERNEL, numa_node_id);
if (!md->queue)
-diff -NurpP --minimal linux-2.6.19.1/drivers/md/dm.h linux-2.6.19.1-vs2.3.0.6/drivers/md/dm.h
---- linux-2.6.19.1/drivers/md/dm.h 2006-11-30 21:18:46 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/drivers/md/dm.h 2006-11-08 04:57:52 +0100
-@@ -72,6 +72,8 @@ void dm_put_target_type(struct target_ty
- int dm_target_iterate(void (*iter_func)(struct target_type *tt,
- void *param), void *param);
+diff -urNp -x '*.orig' linux-4.9/drivers/md/dm.h linux-4.9/drivers/md/dm.h
+--- linux-4.9/drivers/md/dm.h 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/drivers/md/dm.h 2021-02-24 15:47:45.051074969 +0100
+@@ -45,6 +45,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);
+
/*-----------------------------------------------------------------
- * Useful inlines.
+ * Internal table functions.
*---------------------------------------------------------------*/
-diff -NurpP --minimal linux-2.6.19.1/fs/attr.c linux-2.6.19.1-vs2.3.0.6/fs/attr.c
---- linux-2.6.19.1/fs/attr.c 2006-04-09 13:49:53 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/fs/attr.c 2006-11-30 19:40:56 +0100
+diff -urNp -x '*.orig' linux-4.9/drivers/net/tun.c linux-4.9/drivers/net/tun.c
+--- linux-4.9/drivers/net/tun.c 2021-02-24 15:47:31.743992008 +0100
++++ linux-4.9/drivers/net/tun.c 2021-02-24 15:47:45.051074969 +0100
+@@ -65,6 +65,7 @@
+ #include <linux/nsproxy.h>
+ #include <linux/virtio_net.h>
+ #include <linux/rcupdate.h>
++#include <linux/vs_network.h>
+ #include <net/net_namespace.h>
+ #include <net/netns/generic.h>
+ #include <net/rtnetlink.h>
+@@ -194,6 +195,7 @@ struct tun_struct {
+ unsigned int flags;
+ kuid_t owner;
+ kgid_t group;
++ vnid_t nid;
+
+ struct net_device *dev;
+ netdev_features_t set_features;
+@@ -490,6 +492,7 @@ static inline bool tun_not_capable(struc
+ return ((uid_valid(tun->owner) && !uid_eq(cred->euid, tun->owner)) ||
+ (gid_valid(tun->group) && !in_egroup_p(tun->group))) &&
+ !ns_capable(net->user_ns, CAP_NET_ADMIN);
++ /* !cap_raised(current_cap(), CAP_NET_ADMIN) */
+ }
+
+ static void tun_set_real_num_queues(struct tun_struct *tun)
+@@ -1569,6 +1572,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;
+@@ -1782,7 +1786,7 @@ static int tun_set_iff(struct net *net,
+ int queues = ifr->ifr_flags & IFF_MULTI_QUEUE ?
+ MAX_TAP_QUEUES : 1;
+
+- 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)
+@@ -2151,6 +2155,16 @@ static long __tun_chr_ioctl(struct file
+ from_kgid(&init_user_ns, tun->group));
+ break;
+
++ case TUNSETNID:
++ if (!capable(CAP_CONTEXT))
++ return -EPERM;
++
++ /* Set nid owner of the device */
++ tun->nid = (vnid_t) arg;
++
++ 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 -urNp -x '*.orig' linux-4.9/drivers/scsi/cxgbi/libcxgbi.c linux-4.9/drivers/scsi/cxgbi/libcxgbi.c
+--- linux-4.9/drivers/scsi/cxgbi/libcxgbi.c 2021-02-24 15:47:31.947331702 +0100
++++ linux-4.9/drivers/scsi/cxgbi/libcxgbi.c 2021-02-24 15:47:45.051074969 +0100
+@@ -777,7 +777,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 -urNp -x '*.orig' linux-4.9/drivers/tty/sysrq.c linux-4.9/drivers/tty/sysrq.c
+--- linux-4.9/drivers/tty/sysrq.c 2021-02-24 15:47:32.084002644 +0100
++++ linux-4.9/drivers/tty/sysrq.c 2021-02-24 15:47:45.051074969 +0100
+@@ -47,6 +47,7 @@
+ #include <linux/syscalls.h>
+ #include <linux/of.h>
+ #include <linux/rcupdate.h>
++#include <linux/vserver/debug.h>
+
+ #include <asm/ptrace.h>
+ #include <asm/irq_regs.h>
+@@ -428,6 +429,21 @@ static struct sysrq_key_op sysrq_unrt_op
+ .enable_mask = SYSRQ_ENABLE_RTNICE,
+ };
+
++
++#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);
+
+@@ -484,7 +500,11 @@ static struct sysrq_key_op *sysrq_key_ta
+ /* x: May be registered on mips for TLB dump */
+ /* 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 */
+@@ -499,6 +519,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 -urNp -x '*.orig' linux-4.9/drivers/tty/tty_io.c linux-4.9/drivers/tty/tty_io.c
+--- linux-4.9/drivers/tty/tty_io.c 2021-02-24 15:47:32.084002644 +0100
++++ linux-4.9/drivers/tty/tty_io.c 2021-02-24 15:47:45.054408406 +0100
+@@ -104,6 +104,7 @@
+
+ #include <linux/kmod.h>
+ #include <linux/nsproxy.h>
++#include <linux/vs_pid.h>
+
+ #undef TTY_DEBUG_HANGUP
+ #ifdef TTY_DEBUG_HANGUP
+@@ -2321,7 +2322,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;
+@@ -2634,6 +2636,7 @@ static int tiocspgrp(struct tty_struct *
+
+ if (get_user(pgrp_nr, p))
+ return -EFAULT;
++ pgrp_nr = vx_rmap_pid(pgrp_nr);
+ if (pgrp_nr < 0)
+ return -EINVAL;
+
+diff -urNp -x '*.orig' linux-4.9/fs/attr.c linux-4.9/fs/attr.c
+--- linux-4.9/fs/attr.c 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/fs/attr.c 2021-02-24 15:47:45.054408406 +0100
@@ -15,6 +15,9 @@
- #include <linux/fcntl.h>
- #include <linux/quotaops.h>
#include <linux/security.h>
+ #include <linux/evm.h>
+ #include <linux/ima.h>
+#include <linux/proc_fs.h>
+#include <linux/devpts_fs.h>
-+#include <linux/vs_base.h>
-
- /* Taken over from the old code... */
++#include <linux/vs_tag.h>
-@@ -56,6 +59,30 @@ int inode_change_ok(struct inode *inode,
- if (current->fsuid != inode->i_uid && !capable(CAP_FOWNER))
- goto error;
+ /**
+ * setattr_prepare - check if attribute changes to a dentry are allowed
+@@ -90,6 +93,10 @@ kill_priv:
+ return error;
}
+
++ /* check for inode tag permission */
++ if (dx_permission(inode, MAY_WRITE))
++ return -EACCES;
+
-+ /* Check for evil vserver activity */
-+ if (vx_check(0, VS_ADMIN))
-+ goto fine;
-+
-+ if (IS_BARRIER(inode)) {
-+ vxwprintk(1, "xid=%d messing with the barrier.",
-+ vx_current_xid());
-+ goto error;
-+ }
-+ switch (inode->i_sb->s_magic) {
-+ case PROC_SUPER_MAGIC:
-+ /* maybe allow that in the future? */
-+ vxwprintk(1, "xid=%d messing with the procfs.",
-+ vx_current_xid());
-+ goto error;
-+ case DEVPTS_SUPER_MAGIC:
-+ /* devpts is xid tagged */
-+ if (vx_check((xid_t)inode->i_tag, VS_IDENT))
-+ goto fine;
-+ vxwprintk(1, "xid=%d messing with the devpts.",
-+ vx_current_xid());
-+ goto error;
-+ }
- fine:
- retval = 0;
- error:
-@@ -79,6 +106,8 @@ int inode_setattr(struct inode * inode,
+ return 0;
+ }
+ EXPORT_SYMBOL(setattr_prepare);
+@@ -160,6 +167,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_ATIME)
inode->i_atime = timespec_trunc(attr->ia_atime,
inode->i_sb->s_time_gran);
-@@ -153,7 +182,8 @@ int notify_change(struct dentry * dentry
- error = security_inode_setattr(dentry, attr);
- if (!error) {
- 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))
- error = DQUOT_TRANSFER(inode, attr) ? -EDQUOT : 0;
- if (!error)
- error = inode_setattr(inode, attr);
-diff -NurpP --minimal linux-2.6.19.1/fs/binfmt_aout.c linux-2.6.19.1-vs2.3.0.6/fs/binfmt_aout.c
---- linux-2.6.19.1/fs/binfmt_aout.c 2006-11-30 21:19:18 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/binfmt_aout.c 2006-11-08 04:57:40 +0100
-@@ -24,6 +24,7 @@
- #include <linux/binfmts.h>
- #include <linux/personality.h>
- #include <linux/init.h>
-+#include <linux/vs_memory.h>
-
- #include <asm/system.h>
- #include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.19.1/fs/binfmt_elf.c linux-2.6.19.1-vs2.3.0.6/fs/binfmt_elf.c
---- linux-2.6.19.1/fs/binfmt_elf.c 2006-11-30 21:19:18 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/binfmt_elf.c 2006-12-02 01:37:05 +0100
-@@ -39,6 +39,7 @@
- #include <linux/syscalls.h>
- #include <linux/random.h>
- #include <linux/elf.h>
-+#include <linux/vs_memory.h>
- #include <asm/uaccess.h>
- #include <asm/param.h>
- #include <asm/page.h>
-diff -NurpP --minimal linux-2.6.19.1/fs/binfmt_flat.c linux-2.6.19.1-vs2.3.0.6/fs/binfmt_flat.c
---- linux-2.6.19.1/fs/binfmt_flat.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/fs/binfmt_flat.c 2006-11-08 04:57:40 +0100
-@@ -36,6 +36,7 @@
- #include <linux/init.h>
- #include <linux/flat.h>
- #include <linux/syscalls.h>
-+#include <linux/vs_memory.h>
+@@ -210,7 +219,8 @@ int notify_change(struct dentry * dentry
- #include <asm/byteorder.h>
- #include <asm/system.h>
-diff -NurpP --minimal linux-2.6.19.1/fs/binfmt_som.c linux-2.6.19.1-vs2.3.0.6/fs/binfmt_som.c
---- linux-2.6.19.1/fs/binfmt_som.c 2006-11-30 21:19:19 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/binfmt_som.c 2006-11-08 04:57:40 +0100
-@@ -28,6 +28,7 @@
- #include <linux/shm.h>
- #include <linux/personality.h>
- #include <linux/init.h>
-+#include <linux/vs_memory.h>
+ WARN_ON_ONCE(!inode_is_locked(inode));
- #include <asm/a.out.h>
+- if (ia_valid & (ATTR_MODE | ATTR_UID | ATTR_GID | ATTR_TIMES_SET)) {
++ if (ia_valid & (ATTR_MODE | ATTR_UID | ATTR_GID |
++ ATTR_TAG | ATTR_TIMES_SET)) {
+ if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
+ return -EPERM;
+ }
+diff -urNp -x '*.orig' linux-4.9/fs/block_dev.c linux-4.9/fs/block_dev.c
+--- linux-4.9/fs/block_dev.c 2021-02-24 15:47:32.207339836 +0100
++++ linux-4.9/fs/block_dev.c 2021-02-24 15:47:45.054408406 +0100
+@@ -31,6 +31,7 @@
+ #include <linux/dax.h>
+ #include <linux/badblocks.h>
+ #include <linux/falloc.h>
++#include <linux/vs_device.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.19.1/fs/dcache.c linux-2.6.19.1-vs2.3.0.6/fs/dcache.c
---- linux-2.6.19.1/fs/dcache.c 2006-11-30 21:19:19 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/dcache.c 2006-11-08 04:57:48 +0100
-@@ -32,6 +32,7 @@
- #include <linux/seqlock.h>
- #include <linux/swap.h>
- #include <linux/bootmem.h>
-+#include <linux/vs_limit.h>
#include "internal.h"
+@@ -734,6 +735,7 @@ struct block_device *bdget(dev_t dev)
+ bdev->bd_invalidated = 0;
+ inode->i_mode = S_IFBLK;
+ inode->i_rdev = dev;
++ inode->i_mdev = dev;
+ inode->i_bdev = bdev;
+ inode->i_data.a_ops = &def_blk_aops;
+ mapping_set_gfp_mask(&inode->i_data, GFP_USER);
+@@ -780,6 +782,11 @@ EXPORT_SYMBOL(bdput);
+ static struct block_device *bd_acquire(struct inode *inode)
+ {
+ struct block_device *bdev;
++ dev_t mdev;
++
++ if (!vs_map_blkdev(inode->i_rdev, &mdev, DATTR_OPEN))
++ return NULL;
++ inode->i_mdev = mdev;
-@@ -147,6 +148,7 @@ void dput(struct dentry *dentry)
- if (!dentry)
- return;
+ spin_lock(&bdev_lock);
+ bdev = inode->i_bdev;
+@@ -790,7 +797,7 @@ static struct block_device *bd_acquire(s
+ }
+ spin_unlock(&bdev_lock);
+
+- bdev = bdget(inode->i_rdev);
++ bdev = bdget(mdev);
+ if (bdev) {
+ spin_lock(&bdev_lock);
+ if (!inode->i_bdev) {
+diff -urNp -x '*.orig' linux-4.9/fs/btrfs/ctree.h linux-4.9/fs/btrfs/ctree.h
+--- linux-4.9/fs/btrfs/ctree.h 2021-02-24 15:47:32.210673274 +0100
++++ linux-4.9/fs/btrfs/ctree.h 2021-02-24 15:47:45.054408406 +0100
+@@ -1319,6 +1319,8 @@ static inline u32 BTRFS_MAX_XATTR_SIZE(c
+ #define BTRFS_DEFAULT_COMMIT_INTERVAL (30)
+ #define BTRFS_DEFAULT_MAX_INLINE (2048)
+
++#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_raw_test_opt(o, opt) ((o) & BTRFS_MOUNT_##opt)
+@@ -1669,6 +1671,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);
++BTRFS_SETGET_FUNCS(inode_tag, struct btrfs_inode_item, tag, 16);
+ 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);
+@@ -1716,6 +1719,10 @@ BTRFS_SETGET_FUNCS(extent_flags, struct
+
+ BTRFS_SETGET_FUNCS(extent_refs_v0, struct btrfs_extent_item_v0, refs, 32);
+
++#define BTRFS_INODE_IXUNLINK (1 << 24)
++#define BTRFS_INODE_BARRIER (1 << 25)
++#define BTRFS_INODE_COW (1 << 26)
++
+
+ BTRFS_SETGET_FUNCS(tree_block_level, struct btrfs_tree_block_info, level, 8);
+
+@@ -3199,6 +3206,7 @@ int btrfs_ioctl_get_supported_features(v
+ void btrfs_update_iflags(struct inode *inode);
+ void btrfs_inherit_iflags(struct inode *inode, struct inode *dir);
+ int btrfs_is_empty_uuid(u8 *uuid);
++int btrfs_sync_flags(struct inode *inode, int, int);
+ int btrfs_defrag_file(struct inode *inode, struct file *file,
+ struct btrfs_ioctl_defrag_range_args *range,
+ u64 newer_than, unsigned long max_pages);
+diff -urNp -x '*.orig' linux-4.9/fs/btrfs/disk-io.c linux-4.9/fs/btrfs/disk-io.c
+--- linux-4.9/fs/btrfs/disk-io.c 2021-02-24 15:47:32.210673274 +0100
++++ linux-4.9/fs/btrfs/disk-io.c 2021-02-24 15:47:45.054408406 +0100
+@@ -2712,6 +2712,9 @@ int open_ctree(struct super_block *sb,
+ goto fail_alloc;
+ }
-+ vx_dentry_dec(dentry);
- repeat:
- if (atomic_read(&dentry->d_count) == 1)
- might_sleep();
-@@ -160,6 +162,8 @@ repeat:
++ if (btrfs_test_opt(fs_info, TAGGED))
++ sb->s_flags |= MS_TAGGED;
++
+ features = btrfs_super_incompat_flags(disk_super) &
+ ~BTRFS_FEATURE_INCOMPAT_SUPP;
+ if (features) {
+diff -urNp -x '*.orig' linux-4.9/fs/btrfs/inode.c linux-4.9/fs/btrfs/inode.c
+--- linux-4.9/fs/btrfs/inode.c 2021-02-24 15:47:32.217340149 +0100
++++ linux-4.9/fs/btrfs/inode.c 2021-02-24 15:47:45.057741845 +0100
+@@ -43,6 +43,7 @@
+ #include <linux/blkdev.h>
+ #include <linux/posix_acl_xattr.h>
+ #include <linux/uio.h>
++#include <linux/vs_tag.h>
+ #include "ctree.h"
+ #include "disk-io.h"
+ #include "transaction.h"
+@@ -3717,6 +3718,9 @@ static int btrfs_read_locked_inode(struc
+ unsigned long ptr;
+ int maybe_acls;
+ u32 rdev;
++ kuid_t kuid;
++ kgid_t kgid;
++ ktag_t ktag;
+ int ret;
+ bool filled = false;
+ int first_xattr_slot;
+@@ -3749,8 +3753,14 @@ static int btrfs_read_locked_inode(struc
+ struct btrfs_inode_item);
+ inode->i_mode = btrfs_inode_mode(leaf, inode_item);
+ set_nlink(inode, btrfs_inode_nlink(leaf, inode_item));
+- i_uid_write(inode, btrfs_inode_uid(leaf, inode_item));
+- i_gid_write(inode, btrfs_inode_gid(leaf, inode_item));
++
++ 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));
+
+ inode->i_atime.tv_sec = btrfs_timespec_sec(leaf, &inode_item->atime);
+@@ -3905,11 +3915,18 @@ static void fill_inode_item(struct btrfs
+ struct inode *inode)
+ {
+ 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_token_inode_tag(leaf, item, i_tag_read(inode), &token);
++#endif
+ 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);
+@@ -10687,6 +10704,7 @@ static const struct inode_operations btr
+ .mknod = btrfs_mknod,
+ .listxattr = btrfs_listxattr,
+ .permission = btrfs_permission,
++ .sync_flags = btrfs_sync_flags,
+ .get_acl = btrfs_get_acl,
+ .set_acl = btrfs_set_acl,
+ .update_time = btrfs_update_time,
+@@ -10695,6 +10713,7 @@ static const struct inode_operations btr
+ static const struct inode_operations btrfs_dir_ro_inode_operations = {
+ .lookup = btrfs_lookup,
+ .permission = btrfs_permission,
++ .sync_flags = btrfs_sync_flags,
+ .update_time = btrfs_update_time,
+ };
+
+@@ -10760,6 +10779,7 @@ static const struct inode_operations btr
+ .listxattr = btrfs_listxattr,
+ .permission = btrfs_permission,
+ .fiemap = btrfs_fiemap,
++ .sync_flags = btrfs_sync_flags,
+ .get_acl = btrfs_get_acl,
+ .set_acl = btrfs_set_acl,
+ .update_time = btrfs_update_time,
+diff -urNp -x '*.orig' linux-4.9/fs/btrfs/ioctl.c linux-4.9/fs/btrfs/ioctl.c
+--- linux-4.9/fs/btrfs/ioctl.c 2021-02-24 15:47:32.217340149 +0100
++++ linux-4.9/fs/btrfs/ioctl.c 2021-02-24 15:47:45.057741845 +0100
+@@ -110,10 +110,13 @@ static unsigned int btrfs_flags_to_ioctl
+ {
+ unsigned int iflags = 0;
+
+- if (flags & BTRFS_INODE_SYNC)
+- iflags |= FS_SYNC_FL;
+ if (flags & BTRFS_INODE_IMMUTABLE)
+ iflags |= FS_IMMUTABLE_FL;
++ if (flags & BTRFS_INODE_IXUNLINK)
++ iflags |= FS_IXUNLINK_FL;
++
++ if (flags & BTRFS_INODE_SYNC)
++ iflags |= FS_SYNC_FL;
+ if (flags & BTRFS_INODE_APPEND)
+ iflags |= FS_APPEND_FL;
+ if (flags & BTRFS_INODE_NODUMP)
+@@ -130,34 +133,84 @@ static unsigned int btrfs_flags_to_ioctl
+ else if (flags & BTRFS_INODE_COMPRESS)
+ iflags |= FS_COMPR_FL;
+
++ if (flags & BTRFS_INODE_BARRIER)
++ iflags |= FS_BARRIER_FL;
++ if (flags & BTRFS_INODE_COW)
++ iflags |= FS_COW_FL;
+ return iflags;
+ }
+
+ /*
+- * Update inode->i_flags based on the btrfs internal flags.
++ * Update inode->i_(v)flags based on the btrfs internal flags.
+ */
+ void btrfs_update_iflags(struct inode *inode)
+ {
+ struct btrfs_inode *ip = BTRFS_I(inode);
+ unsigned int new_fl = 0;
+
+- if (ip->flags & BTRFS_INODE_SYNC)
+- new_fl |= S_SYNC;
+ if (ip->flags & BTRFS_INODE_IMMUTABLE)
+ new_fl |= S_IMMUTABLE;
++ if (ip->flags & BTRFS_INODE_IXUNLINK)
++ new_fl |= S_IXUNLINK;
++
++ if (ip->flags & BTRFS_INODE_SYNC)
++ new_fl |= S_SYNC;
+ if (ip->flags & BTRFS_INODE_APPEND)
+ new_fl |= S_APPEND;
+ if (ip->flags & BTRFS_INODE_NOATIME)
+ new_fl |= S_NOATIME;
+ if (ip->flags & BTRFS_INODE_DIRSYNC)
+ 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)
++ new_fl |= V_BARRIER;
++ if (ip->flags & BTRFS_INODE_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)
++{
++ struct btrfs_inode *ip = BTRFS_I(inode);
++
++ unsigned int flags = inode->i_flags;
++ unsigned int vflags = inode->i_vflags;
++
++ ip->flags &= ~(BTRFS_INODE_SYNC | BTRFS_INODE_APPEND |
++ BTRFS_INODE_IMMUTABLE | BTRFS_INODE_IXUNLINK |
++ BTRFS_INODE_NOATIME | BTRFS_INODE_DIRSYNC |
++ BTRFS_INODE_BARRIER | BTRFS_INODE_COW);
++
++ if (flags & S_IMMUTABLE)
++ ip->flags |= BTRFS_INODE_IMMUTABLE;
++ if (flags & S_IXUNLINK)
++ ip->flags |= BTRFS_INODE_IXUNLINK;
++
++ if (flags & S_SYNC)
++ ip->flags |= BTRFS_INODE_SYNC;
++ if (flags & S_APPEND)
++ ip->flags |= BTRFS_INODE_APPEND;
++ if (flags & S_NOATIME)
++ ip->flags |= BTRFS_INODE_NOATIME;
++ if (flags & S_DIRSYNC)
++ ip->flags |= BTRFS_INODE_DIRSYNC;
++
++ if (vflags & V_BARRIER)
++ 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.
+@@ -170,6 +223,7 @@ void btrfs_inherit_iflags(struct inode *
return;
+
+ flags = BTRFS_I(dir)->flags;
++ flags &= ~BTRFS_INODE_BARRIER;
+
+ if (flags & BTRFS_INODE_NOCOMPRESS) {
+ BTRFS_I(inode)->flags &= ~BTRFS_INODE_COMPRESS;
+@@ -188,6 +242,30 @@ void btrfs_inherit_iflags(struct inode *
+ btrfs_update_iflags(inode);
+ }
+
++int btrfs_sync_flags(struct inode *inode, int flags, int vflags)
++{
++ struct btrfs_inode *ip = BTRFS_I(inode);
++ struct btrfs_root *root = ip->root;
++ struct btrfs_trans_handle *trans;
++ int ret;
++
++ trans = btrfs_join_transaction(root);
++ BUG_ON(!trans);
++
++ inode->i_flags = flags;
++ inode->i_vflags = vflags;
++ btrfs_update_flags(inode);
++
++ ret = btrfs_update_inode(trans, root, inode);
++ BUG_ON(ret);
++
++ btrfs_update_iflags(inode);
++ inode->i_ctime = CURRENT_TIME;
++ btrfs_end_transaction(trans, root);
++
++ return 0;
++}
++
+ static int btrfs_ioctl_getflags(struct file *file, void __user *arg)
+ {
+ struct btrfs_inode *ip = BTRFS_I(file_inode(file));
+@@ -250,21 +328,27 @@ static int btrfs_ioctl_setflags(struct f
+
+ flags = btrfs_mask_flags(inode->i_mode, flags);
+ oldflags = btrfs_flags_to_ioctl(ip->flags);
+- if ((flags ^ oldflags) & (FS_APPEND_FL | FS_IMMUTABLE_FL)) {
++ if ((flags ^ oldflags) & (FS_APPEND_FL |
++ FS_IMMUTABLE_FL | FS_IXUNLINK_FL)) {
+ if (!capable(CAP_LINUX_IMMUTABLE)) {
+ ret = -EPERM;
+ goto out_unlock;
+ }
}
+- if (flags & FS_SYNC_FL)
+- ip->flags |= BTRFS_INODE_SYNC;
+- else
+- ip->flags &= ~BTRFS_INODE_SYNC;
+ if (flags & FS_IMMUTABLE_FL)
+ ip->flags |= BTRFS_INODE_IMMUTABLE;
+ else
+ ip->flags &= ~BTRFS_INODE_IMMUTABLE;
++ if (flags & FS_IXUNLINK_FL)
++ ip->flags |= BTRFS_INODE_IXUNLINK;
++ else
++ ip->flags &= ~BTRFS_INODE_IXUNLINK;
++
++ if (flags & FS_SYNC_FL)
++ ip->flags |= BTRFS_INODE_SYNC;
++ else
++ ip->flags &= ~BTRFS_INODE_SYNC;
+ if (flags & FS_APPEND_FL)
+ ip->flags |= BTRFS_INODE_APPEND;
+ else
+diff -urNp -x '*.orig' linux-4.9/fs/btrfs/super.c linux-4.9/fs/btrfs/super.c
+--- linux-4.9/fs/btrfs/super.c 2021-02-24 15:47:32.224007024 +0100
++++ linux-4.9/fs/btrfs/super.c 2021-02-24 15:47:45.057741845 +0100
+@@ -327,7 +327,7 @@ enum {
+ #ifdef CONFIG_BTRFS_DEBUG
+ Opt_fragment_data, Opt_fragment_metadata, Opt_fragment_all,
+ #endif
+- Opt_err,
++ Opt_tag, Opt_notag, Opt_tagid, Opt_err,
+ };
+
+ static const match_table_t tokens = {
+@@ -388,6 +388,9 @@ static const match_table_t tokens = {
+ {Opt_fragment_metadata, "fragment=metadata"},
+ {Opt_fragment_all, "fragment=all"},
+ #endif
++ {Opt_tag, "tag"},
++ {Opt_notag, "notag"},
++ {Opt_tagid, "tagid=%u"},
+ {Opt_err, NULL},
+ };
+
+@@ -833,6 +836,22 @@ int btrfs_parse_options(struct btrfs_roo
+ btrfs_set_opt(info->mount_opt, FRAGMENT_DATA);
+ break;
+ #endif
++#ifndef CONFIG_TAGGING_NONE
++ case Opt_tag:
++ printk(KERN_INFO "btrfs: use tagging\n");
++ btrfs_set_opt(info->mount_opt, TAGGED);
++ break;
++ case Opt_notag:
++ printk(KERN_INFO "btrfs: disabled tagging\n");
++ btrfs_clear_opt(info->mount_opt, TAGGED);
++ break;
++#endif
++#ifdef CONFIG_PROPAGATE
++ case Opt_tagid:
++ /* use args[0] */
++ btrfs_set_opt(info->mount_opt, TAGGED);
++ break;
++#endif
+ case Opt_err:
+ btrfs_info(root->fs_info,
+ "unrecognized mount option '%s'", p);
+@@ -1760,6 +1779,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(fs_info, TAGGED) && !(sb->s_flags & MS_TAGGED)) {
++ printk("btrfs: %s: tagging not permitted on remount.\n",
++ sb->s_id);
++ return -EINVAL;
++ }
++
+ if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
+ goto out;
+
+diff -urNp -x '*.orig' linux-4.9/fs/char_dev.c linux-4.9/fs/char_dev.c
+--- linux-4.9/fs/char_dev.c 2021-02-24 15:47:32.230673899 +0100
++++ linux-4.9/fs/char_dev.c 2021-02-24 15:47:45.057741845 +0100
+@@ -21,6 +21,8 @@
+ #include <linux/mutex.h>
+ #include <linux/backing-dev.h>
+ #include <linux/tty.h>
++#include <linux/vs_context.h>
++#include <linux/vs_device.h>
+
+ #include "internal.h"
+
+@@ -360,14 +362,21 @@ static int chrdev_open(struct inode *ino
+ struct cdev *p;
+ struct cdev *new = NULL;
+ int ret = 0;
++ dev_t mdev;
++
++ if (!vs_map_chrdev(inode->i_rdev, &mdev, DATTR_OPEN))
++ return -EPERM;
++ inode->i_mdev = mdev;
+
+ spin_lock(&cdev_lock);
+ p = inode->i_cdev;
+ if (!p) {
+ struct kobject *kobj;
+ int idx;
++
+ spin_unlock(&cdev_lock);
+- kobj = kobj_lookup(cdev_map, inode->i_rdev, &idx);
++
++ kobj = kobj_lookup(cdev_map, mdev, &idx);
+ if (!kobj)
+ return -ENXIO;
+ new = container_of(kobj, struct cdev, kobj);
+diff -urNp -x '*.orig' linux-4.9/fs/dcache.c linux-4.9/fs/dcache.c
+--- linux-4.9/fs/dcache.c 2021-02-24 15:47:32.247341088 +0100
++++ linux-4.9/fs/dcache.c 2021-02-24 15:47:45.061075282 +0100
+@@ -39,6 +39,7 @@
+ #include <linux/ratelimit.h>
+ #include <linux/list_lru.h>
+ #include <linux/kasan.h>
++#include <linux/vs_limit.h>
+
+ #include "internal.h"
+ #include "mount.h"
+@@ -690,6 +691,7 @@ static inline bool fast_dput(struct dent
+ spin_lock(&dentry->d_lock);
+ if (dentry->d_lockref.count > 1) {
+ dentry->d_lockref.count--;
++ vx_dentry_dec(dentry);
+ spin_unlock(&dentry->d_lock);
+ return 1;
+ }
+@@ -821,6 +823,7 @@ repeat:
+ dentry_lru_add(dentry);
+
+ dentry->d_lockref.count--;
++ vx_dentry_dec(dentry);
+ spin_unlock(&dentry->d_lock);
+ return;
+
+@@ -838,6 +841,7 @@ EXPORT_SYMBOL(dput);
+ static inline void __dget_dlock(struct dentry *dentry)
+ {
+ dentry->d_lockref.count++;
++ vx_dentry_inc(dentry);
+ }
+
+ static inline void __dget(struct dentry *dentry)
+@@ -850,6 +854,8 @@ struct dentry *dget_parent(struct dentry
+ int gotref;
+ struct dentry *ret;
+
+ vx_dentry_dec(dentry);
+
/*
- * AV: ->d_delete() is _NOT_ allowed to block now.
- */
-@@ -270,6 +274,7 @@ static inline struct dentry * __dget_loc
- if (!list_empty(&dentry->d_lru)) {
- dentry_stat.nr_unused--;
- list_del_init(&dentry->d_lru);
-+ vx_dentry_inc(dentry);
- }
- return dentry;
+ * Do optimistic parent lookup without any
+ * locking.
+@@ -880,6 +886,7 @@ repeat:
+ rcu_read_unlock();
+ BUG_ON(!ret->d_lockref.count);
+ ret->d_lockref.count++;
++ vx_dentry_inc(ret);
+ spin_unlock(&ret->d_lock);
+ return ret;
}
-@@ -861,6 +866,9 @@ struct dentry *d_alloc(struct dentry * p
- struct dentry *dentry;
+@@ -1034,6 +1041,7 @@ static void shrink_dentry_list(struct li
+ parent = lock_parent(dentry);
+ if (dentry->d_lockref.count != 1) {
+ dentry->d_lockref.count--;
++ vx_dentry_dec(dentry);
+ spin_unlock(&dentry->d_lock);
+ if (parent)
+ spin_unlock(&parent->d_lock);
+@@ -1594,6 +1602,9 @@ struct dentry *__d_alloc(struct super_bl
char *dname;
+ int err;
+ if (!vx_dentry_avail(1))
+ return NULL;
+
- dentry = kmem_cache_alloc(dentry_cache, GFP_KERNEL);
+ dentry = kmem_cache_alloc(dentry_cache, GFP_KERNEL);
if (!dentry)
return NULL;
-@@ -909,6 +917,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);
+@@ -1637,6 +1648,7 @@ struct dentry *__d_alloc(struct super_bl
- return dentry;
-@@ -1258,6 +1267,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;
+@@ -2310,6 +2322,7 @@ struct dentry *__d_lookup(const struct d
+ goto next;
- if (!d_unhashed(dentry)) {
- atomic_inc(&dentry->d_count);
-+ vx_dentry_inc(dentry);
- found = dentry;
- }
+ dentry->d_lockref.count++;
++ vx_dentry_inc(dentry);
+ found = dentry;
spin_unlock(&dentry->d_lock);
-diff -NurpP --minimal linux-2.6.19.1/fs/devpts/inode.c linux-2.6.19.1-vs2.3.0.6/fs/devpts/inode.c
---- linux-2.6.19.1/fs/devpts/inode.c 2006-11-30 21:19:19 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/devpts/inode.c 2006-11-30 18:53:18 +0100
-@@ -19,8 +19,22 @@
- #include <linux/tty.h>
- #include <linux/devpts_fs.h>
+ break;
+@@ -3568,6 +3581,7 @@ static enum d_walk_ret d_genocide_kill(v
+ if (!(dentry->d_flags & DCACHE_GENOCIDE)) {
+ dentry->d_flags |= DCACHE_GENOCIDE;
+ dentry->d_lockref.count--;
++ vx_dentry_dec(dentry);
+ }
+ }
+ return D_WALK_CONTINUE;
+diff -urNp -x '*.orig' linux-4.9/fs/devpts/inode.c linux-4.9/fs/devpts/inode.c
+--- linux-4.9/fs/devpts/inode.c 2021-02-24 15:47:32.247341088 +0100
++++ linux-4.9/fs/devpts/inode.c 2021-02-24 15:47:45.061075282 +0100
+@@ -27,6 +27,7 @@
#include <linux/parser.h>
+ #include <linux/fsnotify.h>
+ #include <linux/seq_file.h>
+#include <linux/vs_base.h>
--#define DEVPTS_SUPER_MAGIC 0x1cd1
-+
-+static int devpts_permission(struct inode *inode, int mask, struct nameidata *nd)
+ #define DEVPTS_DEFAULT_MODE 0600
+ /*
+@@ -38,6 +39,21 @@
+ #define DEVPTS_DEFAULT_PTMX_MODE 0000
+ #define PTMX_MINOR 2
+
++static int devpts_permission(struct inode *inode, int mask)
+{
+ 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;
+}
+
+static struct inode_operations devpts_file_inode_operations = {
+ .permission = devpts_permission,
+};
-
- static struct vfsmount *devpts_mnt;
- static struct dentry *devpts_root;
-@@ -91,6 +105,25 @@ static int devpts_remount(struct super_b
++
++
+ /*
+ * 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.
+@@ -363,6 +379,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 = {
+ .release = dcache_dir_close,
+ .llseek = dcache_dir_lseek,
+ .read = generic_read_dir,
-+ .readdir = devpts_readdir,
++ .iterate = devpts_readdir,
+};
+
- static struct super_operations devpts_sops = {
+ static const struct super_operations devpts_sops = {
.statfs = simple_statfs,
.remount_fs = devpts_remount,
-@@ -116,8 +149,10 @@ devpts_fill_super(struct super_block *s,
- inode->i_uid = inode->i_gid = 0;
+@@ -416,8 +460,10 @@ devpts_fill_super(struct super_block *s,
+ inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
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();
-
- devpts_root = s->s_root = d_alloc_root(inode);
- if (s->s_root)
-@@ -175,6 +210,9 @@ int devpts_pty_new(struct tty_struct *tt
- inode->i_gid = config.setgid ? config.gid : current->fsgid;
- inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
- init_special_inode(inode, S_IFCHR|config.mode, device);
++ i_tag_write(inode, (vtag_t)vx_current_xid());
+
+ s->s_root = d_make_root(inode);
+ if (!s->s_root) {
+@@ -543,6 +589,9 @@ struct dentry *devpts_pty_new(struct pts
+ inode->i_gid = opts->setgid ? opts->gid : current_fsgid();
+ inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
+ init_special_inode(inode, S_IFCHR|opts->mode, MKDEV(UNIX98_PTY_SLAVE_MAJOR, index));
+ /* 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;
- dentry = get_node(number);
-diff -NurpP --minimal linux-2.6.19.1/fs/dquot.c linux-2.6.19.1-vs2.3.0.6/fs/dquot.c
---- linux-2.6.19.1/fs/dquot.c 2006-11-30 21:19:19 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/dquot.c 2006-11-30 19:41:09 +0100
-@@ -185,7 +185,7 @@ static void put_quota_format(struct quot
- /*
- * Dquot List Management:
- * The quota code uses three lists for dquot management: the inuse_list,
-- * free_dquots, and dquot_hash[] array. A single dquot structure may be
-+ * free_dquots, and hash->dqh_hash[] array. A single dquot structure may be
- * on all three lists, depending on its current state.
- *
- * All dquots are placed to the end of inuse_list when first created, and this
-@@ -198,7 +198,7 @@ static void put_quota_format(struct quot
- * dquot is invalidated it's completely released from memory.
- *
- * Dquots with a specific identity (device, type and id) are placed on
-- * one of the dquot_hash[] hash chains. The provides an efficient search
-+ * one of the hash->dqh_hash[] hash chains. The provides an efficient search
- * mechanism to locate a specific dquot.
- */
+ sprintf(s, "%d", index);
-@@ -212,36 +212,44 @@ struct dqstats dqstats;
- static void dqput(struct dquot *dquot);
+diff -urNp -x '*.orig' linux-4.9/fs/ext2/balloc.c linux-4.9/fs/ext2/balloc.c
+--- linux-4.9/fs/ext2/balloc.c 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/fs/ext2/balloc.c 2021-02-24 15:47:45.061075282 +0100
+@@ -693,7 +693,6 @@ ext2_try_to_allocate(struct super_block
+ start = 0;
+ end = EXT2_BLOCKS_PER_GROUP(sb);
+ }
+-
+ BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb));
- static inline unsigned int
--hashfn(const struct super_block *sb, unsigned int id, int type)
-+hashfn(struct dqhash *hash, unsigned int id, int type)
- {
- unsigned long tmp;
+ repeat:
+diff -urNp -x '*.orig' linux-4.9/fs/ext2/ext2.h linux-4.9/fs/ext2/ext2.h
+--- linux-4.9/fs/ext2/ext2.h 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/fs/ext2/ext2.h 2021-02-24 15:47:45.061075282 +0100
+@@ -247,8 +247,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 */
-- tmp = (((unsigned long)sb>>L1_CACHE_SHIFT) ^ id) * (MAXQUOTAS - type);
-+ tmp = (((unsigned long)hash >> L1_CACHE_SHIFT) ^ id) * (MAXQUOTAS - type);
- return (tmp + (tmp >> dq_hash_bits)) & dq_hash_mask;
- }
++#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 */
- /*
- * Following list functions expect dq_list_lock to be held
- */
--static inline void insert_dquot_hash(struct dquot *dquot)
-+static inline void insert_dquot_hash(struct dqhash *hash, struct dquot *dquot)
- {
-- struct hlist_head *head = dquot_hash + hashfn(dquot->dq_sb, dquot->dq_id, dquot->dq_type);
-+ struct hlist_head *head = dquot_hash +
-+ hashfn(hash, dquot->dq_id, dquot->dq_type);
-+ /* struct hlist_head *head = hash->dqh_hash +
-+ hashfn(dquot->dq_dqh, dquot->dq_id, dquot->dq_type); */
- hlist_add_head(&dquot->dq_hash, head);
-+ dquot->dq_dqh = dqhget(hash);
- }
+@@ -332,7 +336,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 */
+@@ -360,6 +365,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
- static inline void remove_dquot_hash(struct dquot *dquot)
- {
- hlist_del_init(&dquot->dq_hash);
-+ dqhput(dquot->dq_dqh);
-+ dquot->dq_dqh = NULL;
- }
+ /*
+@@ -393,6 +399,7 @@ struct ext2_inode {
+ #else
+ #define EXT2_MOUNT_DAX 0
+ #endif
++#define EXT2_MOUNT_TAGGED 0x200000 /* Enable Context Tags */
--static inline struct dquot *find_dquot(unsigned int hashent, struct super_block *sb, unsigned int id, int type)
-+static inline struct dquot *find_dquot(struct dqhash *hash,
-+ unsigned int hashent, unsigned int id, int type)
- {
- struct hlist_node *node;
- struct dquot *dquot;
-
-- hlist_for_each (node, dquot_hash+hashent) {
-+ /* hlist_for_each (node, hash->dqh_hash + hashent) { */
-+ hlist_for_each (node, dquot_hash + hashent) {
- dquot = hlist_entry(node, struct dquot, dq_hash);
-- if (dquot->dq_sb == sb && dquot->dq_id == id && dquot->dq_type == type)
-+ if (dquot->dq_dqh == hash && dquot->dq_id == id && dquot->dq_type == type)
- return dquot;
- }
- return NODQUOT;
-@@ -285,13 +293,13 @@ static void wait_on_dquot(struct dquot *
- mutex_unlock(&dquot->dq_lock);
- }
--#define mark_dquot_dirty(dquot) ((dquot)->dq_sb->dq_op->mark_dirty(dquot))
-+#define mark_dquot_dirty(dquot) ((dquot)->dq_dqh->dqh_qop->mark_dirty(dquot))
+ #define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt
+@@ -782,6 +789,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);
++extern int ext2_sync_flags(struct inode *, int, int);
+
+ /* ioctl.c */
+ extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
+diff -urNp -x '*.orig' linux-4.9/fs/ext2/file.c linux-4.9/fs/ext2/file.c
+--- linux-4.9/fs/ext2/file.c 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/fs/ext2/file.c 2021-02-24 15:47:45.061075282 +0100
+@@ -247,4 +247,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 -urNp -x '*.orig' linux-4.9/fs/ext2/ialloc.c linux-4.9/fs/ext2/ialloc.c
+--- linux-4.9/fs/ext2/ialloc.c 2021-02-24 15:47:32.254007963 +0100
++++ linux-4.9/fs/ext2/ialloc.c 2021-02-24 15:47:45.061075282 +0100
+@@ -17,6 +17,7 @@
+ #include <linux/backing-dev.h>
+ #include <linux/buffer_head.h>
+ #include <linux/random.h>
++#include <linux/vs_tag.h>
+ #include "ext2.h"
+ #include "xattr.h"
+ #include "acl.h"
+@@ -552,6 +553,7 @@ got:
+ inode->i_mode = mode;
+ inode->i_uid = current_fsuid();
+ inode->i_gid = dir->i_gid;
++ i_tag_write(inode, dx_current_fstag(sb));
+ } else
+ inode_init_owner(inode, dir, mode);
- int dquot_mark_dquot_dirty(struct dquot *dquot)
+diff -urNp -x '*.orig' linux-4.9/fs/ext2/inode.c linux-4.9/fs/ext2/inode.c
+--- linux-4.9/fs/ext2/inode.c 2021-02-24 15:47:32.254007963 +0100
++++ linux-4.9/fs/ext2/inode.c 2021-02-24 15:47:45.061075282 +0100
+@@ -35,6 +35,7 @@
+ #include <linux/iomap.h>
+ #include <linux/namei.h>
+ #include <linux/uio.h>
++#include <linux/vs_tag.h>
+ #include "ext2.h"
+ #include "acl.h"
+ #include "xattr.h"
+@@ -1360,39 +1361,61 @@ void ext2_set_inode_flags(struct inode *
{
- spin_lock(&dq_list_lock);
- if (!test_and_set_bit(DQ_MOD_B, &dquot->dq_flags))
-- list_add(&dquot->dq_dirty, &sb_dqopt(dquot->dq_sb)->
-+ list_add(&dquot->dq_dirty, &dqh_dqopt(dquot->dq_dqh)->
- info[dquot->dq_type].dqi_dirty_list);
- spin_unlock(&dq_list_lock);
- return 0;
-@@ -306,9 +314,9 @@ static inline int clear_dquot_dirty(stru
- return 1;
+ unsigned int flags = EXT2_I(inode)->i_flags;
+
+- inode->i_flags &= ~(S_SYNC | S_APPEND | S_IMMUTABLE | S_NOATIME |
+- S_DIRSYNC | S_DAX);
++ inode->i_flags &= ~(S_IMMUTABLE | S_IXUNLINK | S_DAX |
++ S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
++
++ if (flags & EXT2_IMMUTABLE_FL)
++ inode->i_flags |= S_IMMUTABLE;
++ if (flags & EXT2_IXUNLINK_FL)
++ inode->i_flags |= S_IXUNLINK;
+ if (flags & EXT2_SYNC_FL)
+ inode->i_flags |= S_SYNC;
+ if (flags & EXT2_APPEND_FL)
+ inode->i_flags |= S_APPEND;
+- if (flags & EXT2_IMMUTABLE_FL)
+- inode->i_flags |= S_IMMUTABLE;
+ if (flags & EXT2_NOATIME_FL)
+ inode->i_flags |= S_NOATIME;
+ if (flags & EXT2_DIRSYNC_FL)
+ inode->i_flags |= S_DIRSYNC;
+ if (test_opt(inode->i_sb, DAX) && S_ISREG(inode->i_mode))
+ inode->i_flags |= S_DAX;
++
++ inode->i_vflags &= ~(V_BARRIER | V_COW);
++
++ if (flags & EXT2_BARRIER_FL)
++ inode->i_vflags |= V_BARRIER;
++ if (flags & EXT2_COW_FL)
++ inode->i_vflags |= V_COW;
}
--void mark_info_dirty(struct super_block *sb, int type)
-+void mark_info_dirty(struct dqhash *hash, int type)
+ /* Propagate flags from i_flags to EXT2_I(inode)->i_flags */
+ void ext2_get_inode_flags(struct ext2_inode_info *ei)
{
-- set_bit(DQF_INFO_DIRTY_B, &sb_dqopt(sb)->info[type].dqi_flags);
-+ set_bit(DQF_INFO_DIRTY_B, &dqh_dqopt(hash)->info[type].dqi_flags);
+ unsigned int flags = ei->vfs_inode.i_flags;
++ unsigned int vflags = ei->vfs_inode.i_vflags;
++
++ ei->i_flags &= ~(EXT2_SYNC_FL | EXT2_APPEND_FL |
++ EXT2_IMMUTABLE_FL | EXT2_IXUNLINK_FL |
++ EXT2_NOATIME_FL | EXT2_DIRSYNC_FL |
++ EXT2_BARRIER_FL | EXT2_COW_FL);
++
++ if (flags & S_IMMUTABLE)
++ ei->i_flags |= EXT2_IMMUTABLE_FL;
++ if (flags & S_IXUNLINK)
++ ei->i_flags |= EXT2_IXUNLINK_FL;
+
+- ei->i_flags &= ~(EXT2_SYNC_FL|EXT2_APPEND_FL|
+- EXT2_IMMUTABLE_FL|EXT2_NOATIME_FL|EXT2_DIRSYNC_FL);
+ if (flags & S_SYNC)
+ ei->i_flags |= EXT2_SYNC_FL;
+ if (flags & S_APPEND)
+ ei->i_flags |= EXT2_APPEND_FL;
+- if (flags & S_IMMUTABLE)
+- ei->i_flags |= EXT2_IMMUTABLE_FL;
+ if (flags & S_NOATIME)
+ ei->i_flags |= EXT2_NOATIME_FL;
+ if (flags & S_DIRSYNC)
+ ei->i_flags |= EXT2_DIRSYNC_FL;
++
++ if (vflags & V_BARRIER)
++ ei->i_flags |= EXT2_BARRIER_FL;
++ if (vflags & V_COW)
++ ei->i_flags |= EXT2_COW_FL;
}
- EXPORT_SYMBOL(mark_info_dirty);
-@@ -319,7 +327,7 @@ EXPORT_SYMBOL(mark_info_dirty);
- int dquot_acquire(struct dquot *dquot)
- {
- int ret = 0, ret2 = 0;
-- struct quota_info *dqopt = sb_dqopt(dquot->dq_sb);
-+ struct quota_info *dqopt = dqh_dqopt(dquot->dq_dqh);
-
- mutex_lock(&dquot->dq_lock);
- mutex_lock(&dqopt->dqio_mutex);
-@@ -333,7 +341,7 @@ int dquot_acquire(struct dquot *dquot)
- ret = dqopt->ops[dquot->dq_type]->commit_dqblk(dquot);
- /* Write the info if needed */
- if (info_dirty(&dqopt->info[dquot->dq_type]))
-- ret2 = dqopt->ops[dquot->dq_type]->write_file_info(dquot->dq_sb, dquot->dq_type);
-+ ret2 = dqopt->ops[dquot->dq_type]->write_file_info(dquot->dq_dqh, dquot->dq_type);
- if (ret < 0)
- goto out_iolock;
- if (ret2 < 0) {
-@@ -354,7 +362,7 @@ out_iolock:
- int dquot_commit(struct dquot *dquot)
- {
- int ret = 0, ret2 = 0;
-- struct quota_info *dqopt = sb_dqopt(dquot->dq_sb);
-+ struct quota_info *dqopt = dqh_dqopt(dquot->dq_dqh);
-
- mutex_lock(&dqopt->dqio_mutex);
- spin_lock(&dq_list_lock);
-@@ -368,7 +376,7 @@ int dquot_commit(struct dquot *dquot)
- if (test_bit(DQ_ACTIVE_B, &dquot->dq_flags)) {
- ret = dqopt->ops[dquot->dq_type]->commit_dqblk(dquot);
- if (info_dirty(&dqopt->info[dquot->dq_type]))
-- ret2 = dqopt->ops[dquot->dq_type]->write_file_info(dquot->dq_sb, dquot->dq_type);
-+ ret2 = dqopt->ops[dquot->dq_type]->write_file_info(dquot->dq_dqh, dquot->dq_type);
- if (ret >= 0)
- ret = ret2;
+ struct inode *ext2_iget (struct super_block *sb, unsigned long ino)
+@@ -1428,8 +1451,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;
}
-@@ -383,7 +391,7 @@ out_sem:
- int dquot_release(struct dquot *dquot)
- {
- int ret = 0, ret2 = 0;
-- struct quota_info *dqopt = sb_dqopt(dquot->dq_sb);
-+ struct quota_info *dqopt = dqh_dqopt(dquot->dq_dqh);
-
- mutex_lock(&dquot->dq_lock);
- /* Check whether we are not racing with some other dqget() */
-@@ -394,7 +402,7 @@ int dquot_release(struct dquot *dquot)
- ret = dqopt->ops[dquot->dq_type]->release_dqblk(dquot);
- /* Write the info */
- if (info_dirty(&dqopt->info[dquot->dq_type]))
-- ret2 = dqopt->ops[dquot->dq_type]->write_file_info(dquot->dq_sb, dquot->dq_type);
-+ ret2 = dqopt->ops[dquot->dq_type]->write_file_info(dquot->dq_dqh, dquot->dq_type);
- if (ret >= 0)
- ret = ret2;
+- 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);
+@@ -1536,8 +1561,10 @@ static int __ext2_write_inode(struct ino
+ struct ext2_inode_info *ei = EXT2_I(inode);
+ struct super_block *sb = inode->i_sb;
+ ino_t ino = inode->i_ino;
+- uid_t uid = i_uid_read(inode);
+- gid_t gid = i_gid_read(inode);
++ uid_t uid = 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;
+@@ -1573,6 +1600,9 @@ static int __ext2_write_inode(struct ino
+ raw_inode->i_uid_high = 0;
+ raw_inode->i_gid_high = 0;
}
-@@ -411,14 +419,14 @@ out_dqlock:
- * just deleted or pruned by prune_icache() (those are not attached to any
- * list). We have to wait for such users.
- */
--static void invalidate_dquots(struct super_block *sb, int type)
-+static void invalidate_dquots(struct dqhash *hash, int type)
- {
- struct dquot *dquot, *tmp;
++#ifdef CONFIG_TAGGING_INTERN
++ 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);
+@@ -1656,7 +1686,8 @@ int ext2_setattr(struct dentry *dentry,
+ return error;
+ }
+ 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 -urNp -x '*.orig' linux-4.9/fs/ext2/ioctl.c linux-4.9/fs/ext2/ioctl.c
+--- linux-4.9/fs/ext2/ioctl.c 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/fs/ext2/ioctl.c 2021-02-24 15:47:45.061075282 +0100
+@@ -17,6 +17,16 @@
+ #include <asm/uaccess.h>
- restart:
- spin_lock(&dq_list_lock);
- list_for_each_entry_safe(dquot, tmp, &inuse_list, dq_inuse) {
-- if (dquot->dq_sb != sb)
-+ if (dquot->dq_dqh != hash)
- continue;
- if (dquot->dq_type != type)
- continue;
-@@ -458,18 +466,18 @@ restart:
- spin_unlock(&dq_list_lock);
- }
--int vfs_quota_sync(struct super_block *sb, int type)
-+int vfs_quota_sync(struct dqhash *hash, int type)
++int ext2_sync_flags(struct inode *inode, int flags, int vflags)
++{
++ inode->i_flags = flags;
++ inode->i_vflags = vflags;
++ ext2_get_inode_flags(EXT2_I(inode));
++ inode->i_ctime = CURRENT_TIME_SEC;
++ mark_inode_dirty(inode);
++ return 0;
++}
++
+ long ext2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
- struct list_head *dirty;
- struct dquot *dquot;
-- struct quota_info *dqopt = sb_dqopt(sb);
-+ struct quota_info *dqopt = dqh_dqopt(hash);
- int cnt;
-
- mutex_lock(&dqopt->dqonoff_mutex);
- for (cnt = 0; cnt < MAXQUOTAS; cnt++) {
- if (type != -1 && cnt != type)
- continue;
-- if (!sb_has_quota_enabled(sb, cnt))
-+ if (!dqh_has_quota_enabled(hash, cnt))
- continue;
- spin_lock(&dq_list_lock);
- dirty = &dqopt->info[cnt].dqi_dirty_list;
-@@ -486,7 +494,7 @@ int vfs_quota_sync(struct super_block *s
- atomic_inc(&dquot->dq_count);
- dqstats.lookups++;
- spin_unlock(&dq_list_lock);
-- sb->dq_op->write_dquot(dquot);
-+ hash->dqh_qop->write_dquot(dquot);
- dqput(dquot);
- spin_lock(&dq_list_lock);
+ 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);
+
++ if (IS_BARRIER(inode)) {
++ vxwprintk_task(1, "messing with the barrier.");
++ return -EACCES;
++ }
++
+ inode_lock(inode);
+ /* Is it quota file? Do not allow user to mess with it */
+ if (IS_NOQUOTA(inode)) {
+@@ -66,7 +81,9 @@ long ext2_ioctl(struct file *filp, unsig
+ *
+ * This test looks nicer. Thanks to Pauline Middelink
+ */
+- if ((flags ^ oldflags) & (EXT2_APPEND_FL | EXT2_IMMUTABLE_FL)) {
++ if ((oldflags & EXT2_IMMUTABLE_FL) ||
++ ((flags ^ oldflags) & (EXT2_APPEND_FL |
++ EXT2_IMMUTABLE_FL | EXT2_IXUNLINK_FL))) {
+ if (!capable(CAP_LINUX_IMMUTABLE)) {
+ inode_unlock(inode);
+ ret = -EPERM;
+@@ -74,7 +91,7 @@ long ext2_ioctl(struct file *filp, unsig
+ }
}
-@@ -494,9 +502,10 @@ int vfs_quota_sync(struct super_block *s
- }
- for (cnt = 0; cnt < MAXQUOTAS; cnt++)
-- if ((cnt == type || type == -1) && sb_has_quota_enabled(sb, cnt)
-+ if ((cnt == type || type == -1)
-+ && dqh_has_quota_enabled(hash, cnt)
- && info_dirty(&dqopt->info[cnt]))
-- sb->dq_op->write_info(sb, cnt);
-+ hash->dqh_qop->write_info(hash, cnt);
- spin_lock(&dq_list_lock);
- dqstats.syncs++;
- spin_unlock(&dq_list_lock);
-@@ -551,7 +560,7 @@ static void dqput(struct dquot *dquot)
- if (!atomic_read(&dquot->dq_count)) {
- printk("VFS: dqput: trying to free free dquot\n");
- printk("VFS: device %s, dquot of %s %d\n",
-- dquot->dq_sb->s_id,
-+ dquot->dq_dqh->dqh_sb->s_id,
- quotatypes[dquot->dq_type],
- dquot->dq_id);
- BUG();
-@@ -567,7 +576,7 @@ we_slept:
- /* We have more than one user... nothing to do */
- atomic_dec(&dquot->dq_count);
- /* Releasing dquot during quotaoff phase? */
-- if (!sb_has_quota_enabled(dquot->dq_sb, dquot->dq_type) &&
-+ if (!dqh_has_quota_enabled(dquot->dq_dqh, dquot->dq_type) &&
- atomic_read(&dquot->dq_count) == 1)
- wake_up(&dquot->dq_wait_unused);
- spin_unlock(&dq_list_lock);
-@@ -577,14 +586,14 @@ we_slept:
- if (test_bit(DQ_ACTIVE_B, &dquot->dq_flags) && dquot_dirty(dquot)) {
- spin_unlock(&dq_list_lock);
- /* Commit dquot before releasing */
-- dquot->dq_sb->dq_op->write_dquot(dquot);
-+ dquot->dq_dqh->dqh_qop->write_dquot(dquot);
- goto we_slept;
- }
- /* Clear flag in case dquot was inactive (something bad happened) */
- clear_dquot_dirty(dquot);
- if (test_bit(DQ_ACTIVE_B, &dquot->dq_flags)) {
- spin_unlock(&dq_list_lock);
-- dquot->dq_sb->dq_op->release_dquot(dquot);
-+ dquot->dq_dqh->dqh_qop->release_dquot(dquot);
- goto we_slept;
- }
- atomic_dec(&dquot->dq_count);
-@@ -596,7 +605,7 @@ we_slept:
- spin_unlock(&dq_list_lock);
- }
+- flags = flags & EXT2_FL_USER_MODIFIABLE;
++ flags &= EXT2_FL_USER_MODIFIABLE;
+ flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
+ ei->i_flags = flags;
--static struct dquot *get_empty_dquot(struct super_block *sb, int type)
-+static struct dquot *get_empty_dquot(int type)
- {
- struct dquot *dquot;
-
-@@ -611,7 +620,7 @@ static struct dquot *get_empty_dquot(str
- INIT_HLIST_NODE(&dquot->dq_hash);
- INIT_LIST_HEAD(&dquot->dq_dirty);
- init_waitqueue_head(&dquot->dq_wait_unused);
-- dquot->dq_sb = sb;
-+ dquot->dq_dqh = NULL;
- dquot->dq_type = type;
- atomic_set(&dquot->dq_count, 1);
-
-@@ -622,19 +631,19 @@ static struct dquot *get_empty_dquot(str
- * Get reference to dquot
- * MUST be called with either dqptr_sem or dqonoff_mutex held
- */
--static struct dquot *dqget(struct super_block *sb, unsigned int id, int type)
-+static struct dquot *dqget(struct dqhash *hash, unsigned int id, int type)
- {
-- unsigned int hashent = hashfn(sb, id, type);
-+ unsigned int hashent = hashfn(hash, id, type);
- struct dquot *dquot, *empty = NODQUOT;
-
-- if (!sb_has_quota_enabled(sb, type))
-+ if (!dqh_has_quota_enabled(hash, type))
- return NODQUOT;
- we_slept:
- spin_lock(&dq_list_lock);
-- if ((dquot = find_dquot(hashent, sb, id, type)) == NODQUOT) {
-+ if ((dquot = find_dquot(hash, hashent, id, type)) == NODQUOT) {
- if (empty == NODQUOT) {
- spin_unlock(&dq_list_lock);
-- if ((empty = get_empty_dquot(sb, type)) == NODQUOT)
-+ if ((empty = get_empty_dquot(type)) == NODQUOT)
- schedule(); /* Try to wait for a moment... */
- goto we_slept;
+diff -urNp -x '*.orig' linux-4.9/fs/ext2/namei.c linux-4.9/fs/ext2/namei.c
+--- linux-4.9/fs/ext2/namei.c 2021-02-24 15:47:32.254007963 +0100
++++ linux-4.9/fs/ext2/namei.c 2021-02-24 15:47:45.061075282 +0100
+@@ -32,6 +32,7 @@
+
+ #include <linux/pagemap.h>
+ #include <linux/quotaops.h>
++#include <linux/vs_tag.h>
+ #include "ext2.h"
+ #include "xattr.h"
+ #include "acl.h"
+@@ -71,6 +72,7 @@ static struct dentry *ext2_lookup(struct
+ (unsigned long) ino);
+ return ERR_PTR(-EIO);
}
-@@ -643,7 +652,7 @@ we_slept:
- /* all dquots go on the inuse_list */
- put_inuse(dquot);
- /* hash it first so it can be found */
-- insert_dquot_hash(dquot);
-+ insert_dquot_hash(hash, dquot);
- dqstats.lookups++;
- spin_unlock(&dq_list_lock);
- } else {
-@@ -660,12 +669,13 @@ we_slept:
- * finished or it will be canceled due to dq_count > 1 test */
- wait_on_dquot(dquot);
- /* Read the dquot and instantiate it (everything done only if needed) */
-- if (!test_bit(DQ_ACTIVE_B, &dquot->dq_flags) && sb->dq_op->acquire_dquot(dquot) < 0) {
-+ if (!test_bit(DQ_ACTIVE_B, &dquot->dq_flags) &&
-+ hash->dqh_qop->acquire_dquot(dquot) < 0) {
- dqput(dquot);
- return NODQUOT;
++ dx_propagate_tag(nd, inode);
}
- #ifdef __DQUOT_PARANOIA
-- BUG_ON(!dquot->dq_sb); /* Has somebody invalidated entry under us? */
-+ BUG_ON(!dquot->dq_dqh); /* Has somebody invalidated entry under us? */
+ return d_splice_alias(inode, dentry);
+ }
+@@ -443,6 +445,7 @@ const struct inode_operations ext2_speci
+ .listxattr = ext2_listxattr,
#endif
+ .setattr = ext2_setattr,
++ .sync_flags = ext2_sync_flags,
+ .get_acl = ext2_get_acl,
+ .set_acl = ext2_set_acl,
+ };
+diff -urNp -x '*.orig' linux-4.9/fs/ext2/super.c linux-4.9/fs/ext2/super.c
+--- linux-4.9/fs/ext2/super.c 2021-02-24 15:47:32.254007963 +0100
++++ linux-4.9/fs/ext2/super.c 2021-02-24 15:47:45.061075282 +0100
+@@ -411,7 +411,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_dax, Opt_ignore, Opt_err, Opt_quota,
+- Opt_usrquota, Opt_grpquota, Opt_reservation, Opt_noreservation
++ Opt_usrquota, Opt_grpquota, Opt_reservation, Opt_noreservation,
++ Opt_tag, Opt_notag, Opt_tagid
+ };
- return dquot;
-@@ -686,9 +696,10 @@ static int dqinit_needed(struct inode *i
- }
+ static const match_table_t tokens = {
+@@ -439,6 +440,9 @@ static const match_table_t tokens = {
+ {Opt_acl, "acl"},
+ {Opt_noacl, "noacl"},
+ {Opt_xip, "xip"},
++ {Opt_tag, "tag"},
++ {Opt_notag, "notag"},
++ {Opt_tagid, "tagid=%u"},
+ {Opt_dax, "dax"},
+ {Opt_grpquota, "grpquota"},
+ {Opt_ignore, "noquota"},
+@@ -523,6 +527,20 @@ static int parse_options(char *options,
+ case Opt_nouid32:
+ set_opt (sbi->s_mount_opt, NO_UID32);
+ break;
++#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;
++#endif
++#ifdef CONFIG_PROPAGATE
++ case Opt_tagid:
++ /* use args[0] */
++ set_opt (sbi->s_mount_opt, TAGGED);
++ break;
++#endif
+ case Opt_nocheck:
+ clear_opt (sbi->s_mount_opt, CHECK);
+ break;
+@@ -898,6 +916,8 @@ static int ext2_fill_super(struct super_
+ if (!parse_options((char *) data, sb))
+ goto failed_mount;
- /* This routine is guarded by dqonoff_mutex mutex */
--static void add_dquot_ref(struct super_block *sb, int type)
-+static void add_dquot_ref(struct dqhash *hash, int type)
- {
- struct list_head *p;
-+ struct super_block *sb = hash->dqh_sb;
-
- restart:
- file_list_lock();
-@@ -698,7 +709,7 @@ restart:
- if (filp->f_mode & FMODE_WRITE && dqinit_needed(inode, type)) {
- struct dentry *dentry = dget(filp->f_dentry);
- file_list_unlock();
-- sb->dq_op->initialize(inode, type);
-+ hash->dqh_qop->initialize(inode, type);
- dput(dentry);
- /* As we may have blocked we had better restart... */
- goto restart;
-@@ -757,13 +768,13 @@ static void put_dquot_list(struct list_h
- }
++ if (EXT2_SB(sb)->s_mount_opt & EXT2_MOUNT_TAGGED)
++ sb->s_flags |= MS_TAGGED;
+ sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
+ ((EXT2_SB(sb)->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ?
+ MS_POSIXACL : 0);
+@@ -1311,6 +1331,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",
++ sb->s_id);
++ err = -EINVAL;
++ goto restore_opts;
++ }
- /* Gather all references from inodes and drop them */
--static void drop_dquot_ref(struct super_block *sb, int type)
-+static void drop_dquot_ref(struct dqhash *hash, int type)
- {
- LIST_HEAD(tofree_head);
-
-- down_write(&sb_dqopt(sb)->dqptr_sem);
-- remove_dquot_ref(sb, type, &tofree_head);
-- up_write(&sb_dqopt(sb)->dqptr_sem);
-+ down_write(&dqh_dqopt(hash)->dqptr_sem);
-+ remove_dquot_ref(hash, type, &tofree_head);
-+ up_write(&dqh_dqopt(hash)->dqptr_sem);
- put_dquot_list(&tofree_head);
- }
+ sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
+ ((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
+diff -urNp -x '*.orig' linux-4.9/fs/ext4/ext4.h linux-4.9/fs/ext4/ext4.h
+--- linux-4.9/fs/ext4/ext4.h 2021-02-24 15:47:32.254007963 +0100
++++ linux-4.9/fs/ext4/ext4.h 2021-02-24 15:47:45.064408719 +0100
+@@ -392,8 +392,11 @@ 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_PROJINHERIT_FL 0x20000000 /* Create with parents projid */
++#define EXT4_COW_FL 0x40000000 /* Copy on Write marker */
+ #define EXT4_RESERVED_FL 0x80000000 /* reserved for ext4 lib */
+
+ #define EXT4_FL_USER_VISIBLE 0x304BDFFF /* User visible flags */
+@@ -735,7 +738,7 @@ struct ext4_inode {
+ __le16 l_i_uid_high; /* these 2 fields */
+ __le16 l_i_gid_high; /* were reserved2[0] */
+ __le16 l_i_checksum_lo;/* crc32c(uuid+inum+inode) LE */
+- __le16 l_i_reserved;
++ __le16 l_i_tag; /* Context Tag */
+ } linux2;
+ struct {
+ __le16 h_i_reserved1; /* Obsoleted fragment number/size which are removed in ext4 */
+@@ -892,6 +895,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_checksum_lo osd2.linux2.l_i_checksum_lo
-@@ -837,7 +848,7 @@ static void print_warning(struct dquot *
- mutex_lock(&tty_mutex);
- if (!current->signal->tty)
- goto out_lock;
-- tty_write_message(current->signal->tty, dquot->dq_sb->s_id);
-+ tty_write_message(current->signal->tty, dquot->dq_dqh->dqh_sb->s_id);
- if (warntype == ISOFTWARN || warntype == BSOFTWARN)
- tty_write_message(current->signal->tty, ": warning, ");
- else
-@@ -879,7 +890,7 @@ static inline void flush_warnings(struct
+ #elif defined(__GNU__)
+@@ -1133,6 +1137,7 @@ struct ext4_inode_info {
+ #define EXT4_MOUNT_DIOREAD_NOLOCK 0x400000 /* Enable support for dio read nolocking */
+ #define EXT4_MOUNT_JOURNAL_CHECKSUM 0x800000 /* Journal checksums */
+ #define EXT4_MOUNT_JOURNAL_ASYNC_COMMIT 0x1000000 /* Journal Async Commit */
++#define EXT4_MOUNT_TAGGED 0x2000000 /* 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 */
+@@ -2527,6 +2532,7 @@ extern int ext4_punch_hole(struct inode
+ extern int ext4_truncate_restart_trans(handle_t *, struct inode *, int nblocks);
+ extern void ext4_set_inode_flags(struct inode *);
+ extern void ext4_get_inode_flags(struct ext4_inode_info *);
++extern int ext4_sync_flags(struct inode *, int, int);
+ extern int ext4_alloc_da_blocks(struct inode *inode);
+ extern void ext4_set_aops(struct inode *inode);
+ extern int ext4_writepage_trans_blocks(struct inode *);
+diff -urNp -x '*.orig' linux-4.9/fs/ext4/file.c linux-4.9/fs/ext4/file.c
+--- linux-4.9/fs/ext4/file.c 2021-02-24 15:47:32.257341400 +0100
++++ linux-4.9/fs/ext4/file.c 2021-02-24 15:47:45.064408719 +0100
+@@ -698,5 +698,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,
+ };
- static inline char ignore_hardlimit(struct dquot *dquot)
- {
-- struct mem_dqinfo *info = &sb_dqopt(dquot->dq_sb)->info[dquot->dq_type];
-+ struct mem_dqinfo *info = &dqh_dqopt(dquot->dq_dqh)->info[dquot->dq_type];
-
- return capable(CAP_SYS_RESOURCE) &&
- (info->dqi_format->qf_fmt_id != QFMT_VFS_OLD || !(info->dqi_flags & V1_DQF_RSQUASH));
-@@ -911,7 +922,7 @@ static int check_idq(struct dquot *dquot
- (dquot->dq_dqb.dqb_curinodes + inodes) > dquot->dq_dqb.dqb_isoftlimit &&
- dquot->dq_dqb.dqb_itime == 0) {
- *warntype = ISOFTWARN;
-- dquot->dq_dqb.dqb_itime = get_seconds() + sb_dqopt(dquot->dq_sb)->info[dquot->dq_type].dqi_igrace;
-+ dquot->dq_dqb.dqb_itime = get_seconds() + dqh_dqopt(dquot->dq_dqh)->info[dquot->dq_type].dqi_igrace;
- }
+diff -urNp -x '*.orig' linux-4.9/fs/ext4/ialloc.c linux-4.9/fs/ext4/ialloc.c
+--- linux-4.9/fs/ext4/ialloc.c 2021-02-24 15:47:32.257341400 +0100
++++ linux-4.9/fs/ext4/ialloc.c 2021-02-24 15:47:45.064408719 +0100
+@@ -21,6 +21,7 @@
+ #include <linux/random.h>
+ #include <linux/bitops.h>
+ #include <linux/blkdev.h>
++#include <linux/vs_tag.h>
+ #include <asm/byteorder.h>
- return QUOTA_OK;
-@@ -946,7 +957,7 @@ static int check_bdq(struct dquot *dquot
- dquot->dq_dqb.dqb_btime == 0) {
- if (!prealloc) {
- *warntype = BSOFTWARN;
-- dquot->dq_dqb.dqb_btime = get_seconds() + sb_dqopt(dquot->dq_sb)->info[dquot->dq_type].dqi_bgrace;
-+ dquot->dq_dqb.dqb_btime = get_seconds() + dqh_dqopt(dquot->dq_dqh)->info[dquot->dq_type].dqi_bgrace;
- }
- else
- /*
-@@ -972,7 +983,7 @@ int dquot_initialize(struct inode *inode
- * re-enter the quota code and are already holding the mutex */
- if (IS_NOQUOTA(inode))
- return 0;
-- down_write(&sb_dqopt(inode->i_sb)->dqptr_sem);
-+ down_write(&dqh_dqopt(inode->i_dqh)->dqptr_sem);
- /* Having dqptr_sem we know NOQUOTA flags can't be altered... */
- if (IS_NOQUOTA(inode))
- goto out_err;
-@@ -988,11 +999,11 @@ int dquot_initialize(struct inode *inode
- id = inode->i_gid;
- break;
- }
-- inode->i_dquot[cnt] = dqget(inode->i_sb, id, cnt);
-+ inode->i_dquot[cnt] = dqget(inode->i_dqh, id, cnt);
- }
- }
- out_err:
-- up_write(&sb_dqopt(inode->i_sb)->dqptr_sem);
-+ up_write(&dqh_dqopt(inode->i_dqh)->dqptr_sem);
- return ret;
+ #include "ext4.h"
+@@ -780,6 +781,7 @@ struct inode *__ext4_new_inode(handle_t
+ inode->i_mode = mode;
+ inode->i_uid = current_fsuid();
+ inode->i_gid = dir->i_gid;
++ i_tag_write(inode, dx_current_fstag(sb));
+ } else
+ inode_init_owner(inode, dir, mode);
+
+diff -urNp -x '*.orig' linux-4.9/fs/ext4/inode.c linux-4.9/fs/ext4/inode.c
+--- linux-4.9/fs/ext4/inode.c 2021-02-24 15:47:32.260674838 +0100
++++ linux-4.9/fs/ext4/inode.c 2021-02-24 15:47:45.064408719 +0100
+@@ -37,6 +37,7 @@
+ #include <linux/printk.h>
+ #include <linux/slab.h>
+ #include <linux/bitops.h>
++#include <linux/vs_tag.h>
+
+ #include "ext4_jbd2.h"
+ #include "xattr.h"
+@@ -4399,12 +4400,15 @@ void ext4_set_inode_flags(struct inode *
+ unsigned int flags = EXT4_I(inode)->i_flags;
+ unsigned int new_fl = 0;
+
++ if (flags & EXT4_IMMUTABLE_FL)
++ new_fl |= S_IMMUTABLE;
++ if (flags & EXT4_IXUNLINK_FL)
++ new_fl |= S_IXUNLINK;
++
+ if (flags & EXT4_SYNC_FL)
+ new_fl |= S_SYNC;
+ if (flags & EXT4_APPEND_FL)
+ new_fl |= S_APPEND;
+- if (flags & EXT4_IMMUTABLE_FL)
+- new_fl |= S_IMMUTABLE;
+ if (flags & EXT4_NOATIME_FL)
+ new_fl |= S_NOATIME;
+ if (flags & EXT4_DIRSYNC_FL)
+@@ -4412,31 +4416,52 @@ void ext4_set_inode_flags(struct inode *
+ if (test_opt(inode->i_sb, DAX) && S_ISREG(inode->i_mode))
+ new_fl |= S_DAX;
+ inode_set_flags(inode, new_fl,
+- S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC|S_DAX);
++ S_IXUNLINK | S_IMMUTABLE | S_DAX |
++ S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
++
++ new_fl = 0;
++ if (flags & EXT4_BARRIER_FL)
++ new_fl |= V_BARRIER;
++ if (flags & EXT4_COW_FL)
++ new_fl |= V_COW;
++
++ set_mask_bits(&inode->i_vflags,
++ V_BARRIER | V_COW, new_fl);
}
-@@ -1004,14 +1015,14 @@ int dquot_drop(struct inode *inode)
+ /* Propagate flags from i_flags to EXT4_I(inode)->i_flags */
+ void ext4_get_inode_flags(struct ext4_inode_info *ei)
{
- int cnt;
-
-- down_write(&sb_dqopt(inode->i_sb)->dqptr_sem);
-+ down_write(&dqh_dqopt(inode->i_dqh)->dqptr_sem);
- for (cnt = 0; cnt < MAXQUOTAS; cnt++) {
- if (inode->i_dquot[cnt] != NODQUOT) {
- dqput(inode->i_dquot[cnt]);
- inode->i_dquot[cnt] = NODQUOT;
- }
- }
-- up_write(&sb_dqopt(inode->i_sb)->dqptr_sem);
-+ up_write(&dqh_dqopt(inode->i_dqh)->dqptr_sem);
- return 0;
+- unsigned int vfs_fl;
++ unsigned int vfs_fl, vfs_vf;
+ unsigned long old_fl, new_fl;
+
+ do {
+ vfs_fl = ei->vfs_inode.i_flags;
++ vfs_vf = ei->vfs_inode.i_vflags;
+ old_fl = ei->i_flags;
+ new_fl = old_fl & ~(EXT4_SYNC_FL|EXT4_APPEND_FL|
+ EXT4_IMMUTABLE_FL|EXT4_NOATIME_FL|
+- EXT4_DIRSYNC_FL);
++ EXT4_DIRSYNC_FL|EXT4_BARRIER_FL|
++ EXT4_COW_FL);
++
++ if (vfs_fl & S_IMMUTABLE)
++ new_fl |= EXT4_IMMUTABLE_FL;
++ if (vfs_fl & S_IXUNLINK)
++ new_fl |= EXT4_IXUNLINK_FL;
++
+ if (vfs_fl & S_SYNC)
+ new_fl |= EXT4_SYNC_FL;
+ if (vfs_fl & S_APPEND)
+ new_fl |= EXT4_APPEND_FL;
+- if (vfs_fl & S_IMMUTABLE)
+- new_fl |= EXT4_IMMUTABLE_FL;
+ if (vfs_fl & S_NOATIME)
+ new_fl |= EXT4_NOATIME_FL;
+ if (vfs_fl & S_DIRSYNC)
+ new_fl |= EXT4_DIRSYNC_FL;
++
++ if (vfs_vf & V_BARRIER)
++ new_fl |= EXT4_BARRIER_FL;
++ if (vfs_vf & V_COW)
++ new_fl |= EXT4_COW_FL;
+ } while (cmpxchg(&ei->i_flags, old_fl, new_fl) != old_fl);
}
-@@ -1042,9 +1053,9 @@ out_add:
- for (cnt = 0; cnt < MAXQUOTAS; cnt++)
- warntype[cnt] = NOWARN;
-
-- down_read(&sb_dqopt(inode->i_sb)->dqptr_sem);
-+ down_read(&dqh_dqopt(inode->i_dqh)->dqptr_sem);
- if (IS_NOQUOTA(inode)) { /* Now we can do reliable test... */
-- up_read(&sb_dqopt(inode->i_sb)->dqptr_sem);
-+ up_read(&dqh_dqopt(inode->i_dqh)->dqptr_sem);
- goto out_add;
+@@ -4584,8 +4609,10 @@ struct inode *__ext4_iget(struct super_b
+ i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
+ i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
}
- spin_lock(&dq_data_lock);
-@@ -1069,7 +1080,7 @@ warn_put_all:
- if (inode->i_dquot[cnt])
- mark_dquot_dirty(inode->i_dquot[cnt]);
- flush_warnings(inode->i_dquot, warntype);
-- up_read(&sb_dqopt(inode->i_sb)->dqptr_sem);
-+ up_read(&dqh_dqopt(inode->i_dqh)->dqptr_sem);
- return ret;
- }
-
-@@ -1087,9 +1098,9 @@ int dquot_alloc_inode(const struct inode
- return QUOTA_OK;
- for (cnt = 0; cnt < MAXQUOTAS; cnt++)
- warntype[cnt] = NOWARN;
-- down_read(&sb_dqopt(inode->i_sb)->dqptr_sem);
-+ down_read(&dqh_dqopt(inode->i_dqh)->dqptr_sem);
- if (IS_NOQUOTA(inode)) {
-- up_read(&sb_dqopt(inode->i_sb)->dqptr_sem);
-+ up_read(&dqh_dqopt(inode->i_dqh)->dqptr_sem);
- return QUOTA_OK;
- }
- spin_lock(&dq_data_lock);
-@@ -1114,7 +1125,7 @@ warn_put_all:
- if (inode->i_dquot[cnt])
- mark_dquot_dirty(inode->i_dquot[cnt]);
- flush_warnings((struct dquot **)inode->i_dquot, warntype);
-- up_read(&sb_dqopt(inode->i_sb)->dqptr_sem);
-+ up_read(&dqh_dqopt(inode->i_dqh)->dqptr_sem);
- return ret;
- }
-
-@@ -1132,10 +1143,10 @@ out_sub:
- inode_sub_bytes(inode, number);
- return QUOTA_OK;
- }
-- down_read(&sb_dqopt(inode->i_sb)->dqptr_sem);
-+ down_read(&dqh_dqopt(inode->i_dqh)->dqptr_sem);
- /* Now recheck reliably when holding dqptr_sem */
- if (IS_NOQUOTA(inode)) {
-- up_read(&sb_dqopt(inode->i_sb)->dqptr_sem);
-+ up_read(&dqh_dqopt(inode->i_dqh)->dqptr_sem);
- goto out_sub;
+- 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)));
+ ei->i_projid = make_kprojid(&init_user_ns, i_projid);
+ set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
+
+@@ -4909,8 +4936,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));
+ i_projid = from_kprojid(&init_user_ns, ei->i_projid);
+ if (!(test_opt(inode->i_sb, NO_UID32))) {
+ raw_inode->i_uid_low = cpu_to_le16(low_16_bits(i_uid));
+@@ -4934,6 +4963,9 @@ static int ext4_do_update_inode(handle_t
+ raw_inode->i_uid_high = 0;
+ raw_inode->i_gid_high = 0;
}
- spin_lock(&dq_data_lock);
-@@ -1150,7 +1161,7 @@ out_sub:
- for (cnt = 0; cnt < MAXQUOTAS; cnt++)
- if (inode->i_dquot[cnt])
- mark_dquot_dirty(inode->i_dquot[cnt]);
-- up_read(&sb_dqopt(inode->i_sb)->dqptr_sem);
-+ up_read(&dqh_dqopt(inode->i_dqh)->dqptr_sem);
- return QUOTA_OK;
- }
++#ifdef CONFIG_TAGGING_INTERN
++ raw_inode->i_raw_tag = cpu_to_le16(i_tag_read(inode));
++#endif
+ raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
-@@ -1165,10 +1176,10 @@ int dquot_free_inode(const struct inode
- * re-enter the quota code and are already holding the mutex */
- if (IS_NOQUOTA(inode))
- return QUOTA_OK;
-- down_read(&sb_dqopt(inode->i_sb)->dqptr_sem);
-+ down_read(&dqh_dqopt(inode->i_dqh)->dqptr_sem);
- /* Now recheck reliably when holding dqptr_sem */
- if (IS_NOQUOTA(inode)) {
-- up_read(&sb_dqopt(inode->i_sb)->dqptr_sem);
-+ up_read(&dqh_dqopt(inode->i_dqh)->dqptr_sem);
- return QUOTA_OK;
+ EXT4_INODE_SET_XTIME(i_ctime, inode, raw_inode);
+@@ -5191,7 +5223,8 @@ int ext4_setattr(struct dentry *dentry,
+ return error;
}
- spin_lock(&dq_data_lock);
-@@ -1182,7 +1193,7 @@ int dquot_free_inode(const struct inode
- for (cnt = 0; cnt < MAXQUOTAS; cnt++)
- if (inode->i_dquot[cnt])
- mark_dquot_dirty(inode->i_dquot[cnt]);
-- up_read(&sb_dqopt(inode->i_sb)->dqptr_sem);
-+ up_read(&dqh_dqopt(inode->i_dqh)->dqptr_sem);
- return QUOTA_OK;
- }
+ 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;
-@@ -1197,6 +1208,7 @@ int dquot_transfer(struct inode *inode,
- qsize_t space;
- struct dquot *transfer_from[MAXQUOTAS];
- struct dquot *transfer_to[MAXQUOTAS];
-+ struct dqhash *dqh = inode->i_sb->s_dqh;
- int cnt, ret = NO_QUOTA, chuid = (iattr->ia_valid & ATTR_UID) && inode->i_uid != iattr->ia_uid,
- chgid = (iattr->ia_valid & ATTR_GID) && inode->i_gid != iattr->ia_gid;
- char warntype[MAXQUOTAS];
-@@ -1210,10 +1222,10 @@ int dquot_transfer(struct inode *inode,
- transfer_to[cnt] = transfer_from[cnt] = NODQUOT;
- warntype[cnt] = NOWARN;
- }
-- down_write(&sb_dqopt(inode->i_sb)->dqptr_sem);
-+ down_write(&dqh_dqopt(inode->i_dqh)->dqptr_sem);
- /* Now recheck reliably when holding dqptr_sem */
- if (IS_NOQUOTA(inode)) { /* File without quota accounting? */
-- up_write(&sb_dqopt(inode->i_sb)->dqptr_sem);
-+ up_write(&dqh_dqopt(inode->i_dqh)->dqptr_sem);
- return QUOTA_OK;
- }
- /* First build the transfer_to list - here we can block on
-@@ -1224,12 +1236,12 @@ int dquot_transfer(struct inode *inode,
- case USRQUOTA:
- if (!chuid)
- continue;
-- transfer_to[cnt] = dqget(inode->i_sb, iattr->ia_uid, cnt);
-+ transfer_to[cnt] = dqget(dqh, iattr->ia_uid, cnt);
- break;
- case GRPQUOTA:
- if (!chgid)
- continue;
-- transfer_to[cnt] = dqget(inode->i_sb, iattr->ia_gid, cnt);
-+ transfer_to[cnt] = dqget(dqh, iattr->ia_gid, cnt);
- break;
- }
+ /* (user+group)*(old+new) structure, inode write (sb,
+@@ -5214,6 +5247,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;
++ if ((attr->ia_valid & ATTR_TAG) && IS_TAGGED(inode))
++ inode->i_tag = attr->ia_tag;
+ error = ext4_mark_inode_dirty(handle, inode);
+ ext4_journal_stop(handle);
}
-@@ -1284,20 +1296,20 @@ warn_put_all:
- if (ret == NO_QUOTA && transfer_to[cnt] != NODQUOT)
- dqput(transfer_to[cnt]);
+diff -urNp -x '*.orig' linux-4.9/fs/ext4/ioctl.c linux-4.9/fs/ext4/ioctl.c
+--- linux-4.9/fs/ext4/ioctl.c 2021-02-24 15:47:32.260674838 +0100
++++ linux-4.9/fs/ext4/ioctl.c 2021-02-24 15:47:45.064408719 +0100
+@@ -15,6 +15,7 @@
+ #include <linux/file.h>
+ #include <linux/quotaops.h>
+ #include <linux/uuid.h>
++#include <linux/vs_tag.h>
+ #include <asm/uaccess.h>
+ #include "ext4_jbd2.h"
+ #include "ext4.h"
+@@ -226,7 +227,9 @@ static int ext4_ioctl_setflags(struct in
+ *
+ * This test looks nicer. Thanks to Pauline Middelink
+ */
+- if ((flags ^ oldflags) & (EXT4_APPEND_FL | EXT4_IMMUTABLE_FL)) {
++ if ((oldflags & EXT4_IMMUTABLE_FL) ||
++ ((flags ^ oldflags) & (EXT4_APPEND_FL |
++ EXT4_IMMUTABLE_FL | EXT4_IXUNLINK_FL))) {
+ if (!capable(CAP_LINUX_IMMUTABLE))
+ goto flags_out;
}
-- up_write(&sb_dqopt(inode->i_sb)->dqptr_sem);
-+ up_write(&dqh_dqopt(inode->i_dqh)->dqptr_sem);
- return ret;
+@@ -432,6 +435,33 @@ static inline unsigned long ext4_xflags_
+ return iflags;
}
- /*
- * Write info of quota file to disk
- */
--int dquot_commit_info(struct super_block *sb, int type)
-+int dquot_commit_info(struct dqhash *hash, int type)
++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, EXT4_HT_INODE, 1);
++ if (IS_ERR(handle))
++ return PTR_ERR(handle);
++
++ if (IS_SYNC(inode))
++ ext4_handle_sync(handle);
++ err = ext4_reserve_inode_write(handle, inode, &iloc);
++ if (err)
++ goto flags_err;
++
++ inode->i_flags = flags;
++ inode->i_vflags = vflags;
++ ext4_get_inode_flags(EXT4_I(inode));
++ inode->i_ctime = ext4_current_time(inode);
++
++ err = ext4_mark_iloc_dirty(handle, inode, &iloc);
++flags_err:
++ ext4_journal_stop(handle);
++ return err;
++}
++
+ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
- int ret;
-- struct quota_info *dqopt = sb_dqopt(sb);
-+ struct quota_info *dqopt = dqh_dqopt(hash);
+ struct inode *inode = file_inode(filp);
+@@ -461,6 +491,11 @@ long ext4_ioctl(struct file *filp, unsig
- mutex_lock(&dqopt->dqio_mutex);
-- ret = dqopt->ops[type]->write_file_info(sb, type);
-+ ret = dqopt->ops[type]->write_file_info(hash, type);
- mutex_unlock(&dqopt->dqio_mutex);
- return ret;
- }
-@@ -1347,10 +1359,10 @@ static inline void reset_enable_flags(st
- /*
- * Turn quota off on a device. type == -1 ==> quotaoff for all types (umount)
- */
--int vfs_quota_off(struct super_block *sb, int type)
-+int vfs_quota_off(struct dqhash *hash, int type)
- {
- int cnt;
-- struct quota_info *dqopt = sb_dqopt(sb);
-+ struct quota_info *dqopt = dqh_dqopt(hash);
- struct inode *toputinode[MAXQUOTAS];
-
- /* We need to serialize quota_off() for device */
-@@ -1359,21 +1371,21 @@ int vfs_quota_off(struct super_block *sb
- toputinode[cnt] = NULL;
- if (type != -1 && cnt != type)
- continue;
-- if (!sb_has_quota_enabled(sb, cnt))
-+ if (!dqh_has_quota_enabled(hash, cnt))
- continue;
- reset_enable_flags(dqopt, cnt);
+ flags = ext4_mask_flags(inode->i_mode, flags);
- /* Note: these are blocking operations */
-- drop_dquot_ref(sb, cnt);
-- invalidate_dquots(sb, cnt);
-+ drop_dquot_ref(hash, cnt);
-+ invalidate_dquots(hash, cnt);
- /*
- * Now all dquots should be invalidated, all writes done so we should be only
- * users of the info. No locks needed.
- */
- if (info_dirty(&dqopt->info[cnt]))
-- sb->dq_op->write_info(sb, cnt);
-+ hash->dqh_qop->write_info(hash, cnt);
- if (dqopt->ops[cnt]->free_file_info)
-- dqopt->ops[cnt]->free_file_info(sb, cnt);
-+ dqopt->ops[cnt]->free_file_info(hash, cnt);
- put_quota_format(dqopt->info[cnt].dqi_format);
-
- toputinode[cnt] = dqopt->files[cnt];
-@@ -1386,9 +1398,9 @@ int vfs_quota_off(struct super_block *sb
- mutex_unlock(&dqopt->dqonoff_mutex);
- /* Sync the superblock so that buffers with quota data are written to
- * disk (and so userspace sees correct data afterwards). */
-- if (sb->s_op->sync_fs)
-- sb->s_op->sync_fs(sb, 1);
-- sync_blockdev(sb->s_bdev);
-+ if (hash->dqh_sb->s_op->sync_fs)
-+ hash->dqh_sb->s_op->sync_fs(hash->dqh_sb, 1);
-+ sync_blockdev(hash->dqh_sb->s_bdev);
- /* Now the quota files are just ordinary files and we can set the
- * inode flags back. Moreover we discard the pagecache so that
- * userspace sees the writes we did bypassing the pagecache. We
-@@ -1399,7 +1411,7 @@ int vfs_quota_off(struct super_block *sb
- mutex_lock(&dqopt->dqonoff_mutex);
- /* If quota was reenabled in the meantime, we have
- * nothing to do */
-- if (!sb_has_quota_enabled(sb, cnt)) {
-+ if (!dqh_has_quota_enabled(hash, cnt)) {
- mutex_lock(&toputinode[cnt]->i_mutex);
- toputinode[cnt]->i_flags &= ~(S_IMMUTABLE |
- S_NOATIME | S_NOQUOTA);
-@@ -1410,8 +1422,8 @@ int vfs_quota_off(struct super_block *sb
++ if (IS_BARRIER(inode)) {
++ vxwprintk_task(1, "messing with the barrier.");
++ return -EACCES;
++ }
++
+ inode_lock(inode);
+ err = ext4_ioctl_setflags(inode, flags);
+ inode_unlock(inode);
+diff -urNp -x '*.orig' linux-4.9/fs/ext4/namei.c linux-4.9/fs/ext4/namei.c
+--- linux-4.9/fs/ext4/namei.c 2021-02-24 15:47:32.260674838 +0100
++++ linux-4.9/fs/ext4/namei.c 2021-02-24 15:47:45.064408719 +0100
+@@ -33,6 +33,7 @@
+ #include <linux/quotaops.h>
+ #include <linux/buffer_head.h>
+ #include <linux/bio.h>
++#include <linux/vs_tag.h>
+ #include "ext4.h"
+ #include "ext4_jbd2.h"
+
+@@ -1457,6 +1458,7 @@ restart:
+ REQ_META | REQ_PRIO,
+ 1, &bh);
}
- mutex_unlock(&dqopt->dqonoff_mutex);
++ dx_propagate_tag(nd, inode);
}
-- if (sb->s_bdev)
-- invalidate_bdev(sb->s_bdev, 0);
-+ if (hash->dqh_sb->s_bdev)
-+ invalidate_bdev(hash->dqh_sb->s_bdev, 0);
- return 0;
- }
+ if ((bh = bh_use[ra_ptr++]) == NULL)
+ goto next;
+@@ -3935,6 +3937,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,
+ };
-@@ -1424,7 +1436,8 @@ static int vfs_quota_on_inode(struct ino
- {
- struct quota_format_type *fmt = find_quota_format(format_id);
- struct super_block *sb = inode->i_sb;
-- struct quota_info *dqopt = sb_dqopt(sb);
-+ struct dqhash *hash = inode->i_dqh;
-+ struct quota_info *dqopt = dqh_dqopt(hash);
- int error;
- int oldflags = -1;
-
-@@ -1450,7 +1463,7 @@ static int vfs_quota_on_inode(struct ino
- invalidate_bdev(sb->s_bdev, 0);
- mutex_lock(&inode->i_mutex);
- mutex_lock(&dqopt->dqonoff_mutex);
-- if (sb_has_quota_enabled(sb, type)) {
-+ if (dqh_has_quota_enabled(hash, type)) {
- error = -EBUSY;
- goto out_lock;
+ const struct inode_operations ext4_special_inode_operations = {
+diff -urNp -x '*.orig' linux-4.9/fs/ext4/super.c linux-4.9/fs/ext4/super.c
+--- linux-4.9/fs/ext4/super.c 2021-02-24 15:47:32.264008276 +0100
++++ linux-4.9/fs/ext4/super.c 2021-02-24 15:47:45.067742158 +0100
+@@ -1294,6 +1294,7 @@ enum {
+ Opt_dioread_nolock, Opt_dioread_lock,
+ Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable,
+ Opt_max_dir_size_kb, Opt_nojournal_checksum,
++ Opt_tag, Opt_notag, Opt_tagid
+ };
+
+ static const match_table_t tokens = {
+@@ -1380,6 +1381,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},
+ };
+
+@@ -1625,6 +1629,20 @@ static int handle_mount_opt(struct super
+ case Opt_nolazytime:
+ sb->s_flags &= ~MS_LAZYTIME;
+ return 1;
++#ifndef CONFIG_TAGGING_NONE
++ 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(sb, TAGGED);
++ return 1;
++#endif
}
-@@ -1461,21 +1474,21 @@ static int vfs_quota_on_inode(struct ino
- oldflags = inode->i_flags & (S_NOATIME | S_IMMUTABLE | S_NOQUOTA);
- inode->i_flags |= S_NOQUOTA | S_NOATIME | S_IMMUTABLE;
- up_write(&dqopt->dqptr_sem);
-- sb->dq_op->drop(inode);
-+ hash->dqh_qop->drop(inode);
-
- error = -EIO;
- dqopt->files[type] = igrab(inode);
- if (!dqopt->files[type])
- goto out_lock;
- error = -EINVAL;
-- if (!fmt->qf_ops->check_quota_file(sb, type))
-+ if (!fmt->qf_ops->check_quota_file(hash, type))
- goto out_file_init;
-
- dqopt->ops[type] = fmt->qf_ops;
- dqopt->info[type].dqi_format = fmt;
- INIT_LIST_HEAD(&dqopt->info[type].dqi_dirty_list);
- mutex_lock(&dqopt->dqio_mutex);
-- if ((error = dqopt->ops[type]->read_file_info(sb, type)) < 0) {
-+ if ((error = dqopt->ops[type]->read_file_info(hash, type)) < 0) {
- mutex_unlock(&dqopt->dqio_mutex);
- goto out_file_init;
+
+ for (m = ext4_mount_opts; m->token != Opt_err; m++)
+@@ -3645,6 +3663,9 @@ static int ext4_fill_super(struct super_
+ sb->s_iflags |= SB_I_CGROUPWB;
}
-@@ -1483,7 +1496,7 @@ static int vfs_quota_on_inode(struct ino
- mutex_unlock(&inode->i_mutex);
- set_enable_flags(dqopt, type);
-- add_dquot_ref(sb, type);
-+ add_dquot_ref(hash, type);
- mutex_unlock(&dqopt->dqonoff_mutex);
++ if (EXT4_SB(sb)->s_mount_opt & EXT4_MOUNT_TAGGED)
++ sb->s_flags |= MS_TAGGED;
++
+ sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
+ (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
- return 0;
-@@ -1509,7 +1522,7 @@ out_fmt:
- }
+@@ -5032,6 +5053,14 @@ static int ext4_remount(struct super_blo
+ if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED)
+ ext4_abort(sb, "Abort forced by user");
- /* Actual function called from quotactl() */
--int vfs_quota_on(struct super_block *sb, int type, int format_id, char *path)
-+int vfs_quota_on(struct dqhash *hash, int type, int format_id, char *path)
- {
- struct nameidata nd;
- int error;
-@@ -1521,7 +1534,7 @@ int vfs_quota_on(struct super_block *sb,
- if (error)
- goto out_path;
- /* Quota file not on the same filesystem? */
-- if (nd.mnt->mnt_sb != sb)
-+ if (nd.mnt->mnt_sb != hash->dqh_sb)
- error = -EXDEV;
- else
- error = vfs_quota_on_inode(nd.dentry->d_inode, type, format_id);
-@@ -1534,13 +1547,13 @@ out_path:
- * This function is used when filesystem needs to initialize quotas
- * during mount time.
- */
--int vfs_quota_on_mount(struct super_block *sb, char *qf_name,
-+int vfs_quota_on_mount(struct dqhash *hash, char *qf_name,
- int format_id, int type)
- {
- struct dentry *dentry;
- int error;
++ if ((sbi->s_mount_opt & EXT4_MOUNT_TAGGED) &&
++ !(sb->s_flags & MS_TAGGED)) {
++ printk("EXT4-fs: %s: tagging not permitted on remount.\n",
++ sb->s_id);
++ err = -EINVAL;
++ goto restore_opts;
++ }
++
+ sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
+ (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-- dentry = lookup_one_len(qf_name, sb->s_root, strlen(qf_name));
-+ dentry = lookup_one_len(qf_name, hash->dqh_sb->s_root, strlen(qf_name));
- if (IS_ERR(dentry))
- return PTR_ERR(dentry);
+diff -urNp -x '*.orig' linux-4.9/fs/fcntl.c linux-4.9/fs/fcntl.c
+--- linux-4.9/fs/fcntl.c 2021-02-24 15:47:32.270675151 +0100
++++ linux-4.9/fs/fcntl.c 2021-02-24 15:47:45.067742158 +0100
+@@ -22,6 +22,7 @@
+ #include <linux/pid_namespace.h>
+ #include <linux/user_namespace.h>
+ #include <linux/shmem_fs.h>
++#include <linux/vs_limit.h>
-@@ -1576,18 +1589,18 @@ static void do_get_dqblk(struct dquot *d
- spin_unlock(&dq_data_lock);
- }
+ #include <asm/poll.h>
+ #include <asm/siginfo.h>
+@@ -390,6 +391,8 @@ SYSCALL_DEFINE3(fcntl64, unsigned int, f
--int vfs_get_dqblk(struct super_block *sb, int type, qid_t id, struct if_dqblk *di)
-+int vfs_get_dqblk(struct dqhash *hash, int type, qid_t id, struct if_dqblk *di)
- {
- struct dquot *dquot;
-
-- mutex_lock(&sb_dqopt(sb)->dqonoff_mutex);
-- if (!(dquot = dqget(sb, id, type))) {
-- mutex_unlock(&sb_dqopt(sb)->dqonoff_mutex);
-+ mutex_lock(&dqh_dqopt(hash)->dqonoff_mutex);
-+ if (!(dquot = dqget(hash, id, type))) {
-+ mutex_unlock(&dqh_dqopt(hash)->dqonoff_mutex);
- return -ESRCH;
- }
- do_get_dqblk(dquot, di);
- dqput(dquot);
-- mutex_unlock(&sb_dqopt(sb)->dqonoff_mutex);
-+ mutex_unlock(&dqh_dqopt(hash)->dqonoff_mutex);
- return 0;
- }
+ if (!f.file)
+ goto out;
++ if (!vx_files_avail(1))
++ goto out;
-@@ -1627,7 +1640,7 @@ static void do_set_dqblk(struct dquot *d
- clear_bit(DQ_BLKS_B, &dquot->dq_flags);
- }
- else if (!(di->dqb_valid & QIF_BTIME)) /* Set grace only if user hasn't provided his own... */
-- dm->dqb_btime = get_seconds() + sb_dqopt(dquot->dq_sb)->info[dquot->dq_type].dqi_bgrace;
-+ dm->dqb_btime = get_seconds() + dqh_dqopt(dquot->dq_dqh)->info[dquot->dq_type].dqi_bgrace;
- }
- if (check_ilim) {
- if (!dm->dqb_isoftlimit || dm->dqb_curinodes < dm->dqb_isoftlimit) {
-@@ -1635,7 +1648,7 @@ static void do_set_dqblk(struct dquot *d
- clear_bit(DQ_INODES_B, &dquot->dq_flags);
+ if (unlikely(f.file->f_mode & FMODE_PATH)) {
+ if (!check_fcntl_cmd(cmd))
+diff -urNp -x '*.orig' linux-4.9/fs/file.c linux-4.9/fs/file.c
+--- linux-4.9/fs/file.c 2021-02-24 15:47:32.270675151 +0100
++++ linux-4.9/fs/file.c 2021-02-24 15:47:45.067742158 +0100
+@@ -22,6 +22,7 @@
+ #include <linux/spinlock.h>
+ #include <linux/rcupdate.h>
+ #include <linux/workqueue.h>
++#include <linux/vs_limit.h>
+
+ unsigned int sysctl_nr_open __read_mostly = 1024*1024;
+ unsigned int sysctl_nr_open_min = BITS_PER_LONG;
+@@ -357,6 +358,8 @@ struct files_struct *dup_fd(struct files
+ struct file *f = *old_fds++;
+ if (f) {
+ get_file(f);
++ /* TODO: sum it first for check and performance */
++ vx_openfd_inc(open_files - i);
+ } else {
+ /*
+ * The fd may be claimed in the fd bitmap but not yet
+@@ -406,9 +409,11 @@ static struct fdtable *close_files(struc
+ filp_close(file, files);
+ cond_resched_rcu_qs();
+ }
++ vx_openfd_dec(i);
+ }
+ i++;
+ set >>= 1;
++ cond_resched();
}
- else if (!(di->dqb_valid & QIF_ITIME)) /* Set grace only if user hasn't provided his own... */
-- dm->dqb_itime = get_seconds() + sb_dqopt(dquot->dq_sb)->info[dquot->dq_type].dqi_igrace;
-+ dm->dqb_itime = get_seconds() + dqh_dqopt(dquot->dq_dqh)->info[dquot->dq_type].dqi_igrace;
}
- if (dm->dqb_bhardlimit || dm->dqb_bsoftlimit || dm->dqb_ihardlimit || dm->dqb_isoftlimit)
- clear_bit(DQ_FAKE_B, &dquot->dq_flags);
-@@ -1645,53 +1658,53 @@ static void do_set_dqblk(struct dquot *d
- mark_dquot_dirty(dquot);
- }
--int vfs_set_dqblk(struct super_block *sb, int type, qid_t id, struct if_dqblk *di)
-+int vfs_set_dqblk(struct dqhash *hash, int type, qid_t id, struct if_dqblk *di)
- {
- struct dquot *dquot;
-
-- mutex_lock(&sb_dqopt(sb)->dqonoff_mutex);
-- if (!(dquot = dqget(sb, id, type))) {
-- mutex_unlock(&sb_dqopt(sb)->dqonoff_mutex);
-+ mutex_lock(&dqh_dqopt(hash)->dqonoff_mutex);
-+ if (!(dquot = dqget(hash, id, type))) {
-+ mutex_unlock(&dqh_dqopt(hash)->dqonoff_mutex);
- return -ESRCH;
- }
- do_set_dqblk(dquot, di);
- dqput(dquot);
-- mutex_unlock(&sb_dqopt(sb)->dqonoff_mutex);
-+ mutex_unlock(&dqh_dqopt(hash)->dqonoff_mutex);
- return 0;
+@@ -540,6 +545,7 @@ repeat:
+ else
+ __clear_close_on_exec(fd, fdt);
+ error = fd;
++ vx_openfd_inc(fd);
+ #if 1
+ /* Sanity check */
+ if (rcu_access_pointer(fdt->fd[fd]) != NULL) {
+@@ -570,6 +576,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);
}
- /* Generic routine for getting common part of quota file information */
--int vfs_get_dqinfo(struct super_block *sb, int type, struct if_dqinfo *ii)
-+int vfs_get_dqinfo(struct dqhash *hash, int type, struct if_dqinfo *ii)
+ void put_unused_fd(unsigned int fd)
+@@ -857,6 +864,8 @@ __releases(&files->file_lock)
+
+ if (tofree)
+ filp_close(tofree, files);
++ else
++ vx_openfd_inc(fd); /* fd was unused */
+
+ return fd;
+
+diff -urNp -x '*.orig' linux-4.9/fs/file_table.c linux-4.9/fs/file_table.c
+--- linux-4.9/fs/file_table.c 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/fs/file_table.c 2021-02-24 15:47:45.067742158 +0100
+@@ -26,6 +26,8 @@
+ #include <linux/task_work.h>
+ #include <linux/ima.h>
+ #include <linux/swap.h>
++#include <linux/vs_limit.h>
++#include <linux/vs_context.h>
+
+ #include <linux/atomic.h>
+
+@@ -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();
++ vx_files_inc(f);
+ return f;
+
+ over:
+@@ -219,6 +223,8 @@ static void __fput(struct file *file)
+ put_write_access(inode);
+ __mnt_drop_write(mnt);
+ }
++ vx_files_dec(file);
++ file->f_xid = 0;
+ file->f_path.dentry = NULL;
+ file->f_path.mnt = NULL;
+ file->f_inode = NULL;
+@@ -305,6 +311,8 @@ void put_filp(struct file *file)
{
- struct mem_dqinfo *mi;
-
-- mutex_lock(&sb_dqopt(sb)->dqonoff_mutex);
-- if (!sb_has_quota_enabled(sb, type)) {
-- mutex_unlock(&sb_dqopt(sb)->dqonoff_mutex);
-+ mutex_lock(&dqh_dqopt(hash)->dqonoff_mutex);
-+ if (!dqh_has_quota_enabled(hash, type)) {
-+ mutex_unlock(&dqh_dqopt(hash)->dqonoff_mutex);
- return -ESRCH;
+ if (atomic_long_dec_and_test(&file->f_count)) {
+ security_file_free(file);
++ vx_files_dec(file);
++ file->f_xid = 0;
+ file_free(file);
}
-- mi = sb_dqopt(sb)->info + type;
-+ mi = dqh_dqopt(hash)->info + type;
- spin_lock(&dq_data_lock);
- ii->dqi_bgrace = mi->dqi_bgrace;
- ii->dqi_igrace = mi->dqi_igrace;
- ii->dqi_flags = mi->dqi_flags & DQF_MASK;
- ii->dqi_valid = IIF_ALL;
- spin_unlock(&dq_data_lock);
-- mutex_unlock(&sb_dqopt(sb)->dqonoff_mutex);
-+ mutex_unlock(&dqh_dqopt(hash)->dqonoff_mutex);
- return 0;
}
+diff -urNp -x '*.orig' linux-4.9/fs/fs_struct.c linux-4.9/fs/fs_struct.c
+--- linux-4.9/fs/fs_struct.c 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/fs/fs_struct.c 2021-02-24 15:47:45.067742158 +0100
+@@ -4,6 +4,7 @@
+ #include <linux/path.h>
+ #include <linux/slab.h>
+ #include <linux/fs_struct.h>
++#include <linux/vserver/global.h>
+ #include "internal.h"
- /* Generic routine for setting common part of quota file information */
--int vfs_set_dqinfo(struct super_block *sb, int type, struct if_dqinfo *ii)
-+int vfs_set_dqinfo(struct dqhash *hash, int type, struct if_dqinfo *ii)
+ /*
+@@ -87,6 +88,7 @@ void free_fs_struct(struct fs_struct *fs
{
- struct mem_dqinfo *mi;
-
-- mutex_lock(&sb_dqopt(sb)->dqonoff_mutex);
-- if (!sb_has_quota_enabled(sb, type)) {
-- mutex_unlock(&sb_dqopt(sb)->dqonoff_mutex);
-+ mutex_lock(&dqh_dqopt(hash)->dqonoff_mutex);
-+ if (!dqh_has_quota_enabled(hash, type)) {
-+ mutex_unlock(&dqh_dqopt(hash)->dqonoff_mutex);
- return -ESRCH;
- }
-- mi = sb_dqopt(sb)->info + type;
-+ mi = dqh_dqopt(hash)->info + type;
- spin_lock(&dq_data_lock);
- if (ii->dqi_valid & IIF_BGRACE)
- mi->dqi_bgrace = ii->dqi_bgrace;
-@@ -1700,10 +1713,10 @@ int vfs_set_dqinfo(struct super_block *s
- if (ii->dqi_valid & IIF_FLAGS)
- mi->dqi_flags = (mi->dqi_flags & ~DQF_MASK) | (ii->dqi_flags & DQF_MASK);
- spin_unlock(&dq_data_lock);
-- mark_info_dirty(sb, type);
-+ mark_info_dirty(hash, type);
- /* Force write to disk */
-- sb->dq_op->write_info(sb, type);
-- mutex_unlock(&sb_dqopt(sb)->dqonoff_mutex);
-+ hash->dqh_qop->write_info(hash, type);
-+ mutex_unlock(&dqh_dqopt(hash)->dqonoff_mutex);
- return 0;
+ path_put(&fs->root);
+ path_put(&fs->pwd);
++ atomic_dec(&vs_global_fs);
+ kmem_cache_free(fs_cachep, fs);
}
-diff -NurpP --minimal linux-2.6.19.1/fs/exec.c linux-2.6.19.1-vs2.3.0.6/fs/exec.c
---- linux-2.6.19.1/fs/exec.c 2006-12-13 07:46:36 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/exec.c 2006-12-13 09:16:31 +0100
-@@ -49,6 +49,7 @@
- #include <linux/tsacct_kern.h>
- #include <linux/cn_proc.h>
- #include <linux/audit.h>
-+#include <linux/vs_memory.h>
-
- #include <asm/uaccess.h>
- #include <asm/mmu_context.h>
-@@ -436,7 +437,8 @@ int setup_arg_pages(struct linux_binprm
- kmem_cache_free(vm_area_cachep, mpnt);
- return ret;
- }
-- mm->stack_vm = mm->total_vm = vma_pages(mpnt);
-+ vx_vmpages_sub(mm, mm->total_vm - vma_pages(mpnt));
-+ mm->stack_vm = mm->total_vm;
+@@ -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 -urNp -x '*.orig' linux-4.9/fs/gfs2/file.c linux-4.9/fs/gfs2/file.c
+--- linux-4.9/fs/gfs2/file.c 2021-02-24 15:47:32.277342026 +0100
++++ linux-4.9/fs/gfs2/file.c 2021-02-24 15:47:45.067742158 +0100
+@@ -137,6 +137,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,
+ };
- for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
-@@ -1306,7 +1308,7 @@ static void format_corename(char *corena
- /* UNIX time of coredump */
- case 't': {
- struct timeval tv;
-- do_gettimeofday(&tv);
-+ vx_gettimeofday(&tv);
- rc = snprintf(out_ptr, out_end - out_ptr,
- "%lu", tv.tv_sec);
- if (rc > out_end - out_ptr)
-diff -NurpP --minimal linux-2.6.19.1/fs/ext2/balloc.c linux-2.6.19.1-vs2.3.0.6/fs/ext2/balloc.c
---- linux-2.6.19.1/fs/ext2/balloc.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/fs/ext2/balloc.c 2006-12-01 23:38:46 +0100
-@@ -16,6 +16,8 @@
- #include <linux/sched.h>
- #include <linux/buffer_head.h>
- #include <linux/capability.h>
-+#include <linux/vs_dlimit.h>
-+#include <linux/vs_tag.h>
+ static const u32 gfs2_to_fsflags[32] = {
+@@ -147,6 +150,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,
++ [gfs2fl_Cow] = FS_COW_FL,
+ };
- /*
- * balloc.c contains the blocks allocation and deallocation routines
-@@ -102,12 +104,13 @@ static int reserve_blocks(struct super_b
+ static int gfs2_get_flags(struct file *filp, u32 __user *ptr)
+@@ -178,12 +184,17 @@ void gfs2_set_inode_flags(struct inode *
{
- struct ext2_sb_info *sbi = EXT2_SB(sb);
- struct ext2_super_block *es = sbi->s_es;
-- unsigned free_blocks;
-- unsigned root_blocks;
-+ unsigned long long free_blocks, root_blocks;
+ 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_NOSEC);
+
+- flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC|S_NOSEC);
+ if ((ip->i_eattr == 0) && !is_sxid(inode->i_mode))
+ flags |= S_NOSEC;
+ if (ip->i_diskflags & GFS2_DIF_IMMUTABLE)
+ flags |= S_IMMUTABLE;
++ if (ip->i_diskflags & GFS2_DIF_IXUNLINK)
++ flags |= S_IXUNLINK;
+ if (ip->i_diskflags & GFS2_DIF_APPENDONLY)
+ flags |= S_APPEND;
+ if (ip->i_diskflags & GFS2_DIF_NOATIME)
+@@ -191,6 +202,43 @@ void gfs2_set_inode_flags(struct inode *
+ if (ip->i_diskflags & GFS2_DIF_SYNC)
+ flags |= S_SYNC;
+ inode->i_flags = flags;
++
++ vflags &= ~(V_BARRIER | V_COW);
++
++ if (ip->i_diskflags & GFS2_DIF_BARRIER)
++ vflags |= V_BARRIER;
++ if (ip->i_diskflags & GFS2_DIF_COW)
++ vflags |= V_COW;
++ inode->i_vflags = vflags;
++}
++
++void gfs2_get_inode_flags(struct inode *inode)
++{
++ struct gfs2_inode *ip = GFS2_I(inode);
++ unsigned int flags = inode->i_flags;
++ unsigned int vflags = inode->i_vflags;
++
++ ip->i_diskflags &= ~(GFS2_DIF_APPENDONLY |
++ GFS2_DIF_NOATIME | GFS2_DIF_SYNC |
++ GFS2_DIF_IMMUTABLE | GFS2_DIF_IXUNLINK |
++ GFS2_DIF_BARRIER | GFS2_DIF_COW);
++
++ if (flags & S_IMMUTABLE)
++ ip->i_diskflags |= GFS2_DIF_IMMUTABLE;
++ if (flags & S_IXUNLINK)
++ ip->i_diskflags |= GFS2_DIF_IXUNLINK;
++
++ if (flags & S_APPEND)
++ ip->i_diskflags |= GFS2_DIF_APPENDONLY;
++ if (flags & S_NOATIME)
++ ip->i_diskflags |= GFS2_DIF_NOATIME;
++ if (flags & S_SYNC)
++ ip->i_diskflags |= GFS2_DIF_SYNC;
++
++ if (vflags & V_BARRIER)
++ ip->i_diskflags |= GFS2_DIF_BARRIER;
++ if (vflags & V_COW)
++ ip->i_diskflags |= GFS2_DIF_COW;
+ }
- free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
- root_blocks = le32_to_cpu(es->s_r_blocks_count);
+ /* Flags that can be set by user space */
+@@ -306,6 +354,37 @@ static int gfs2_set_flags(struct file *f
+ return do_gfs2_set_flags(filp, gfsflags, ~(GFS2_DIF_SYSTEM | GFS2_DIF_JDATA));
+ }
-+ DLIMIT_ADJUST_BLOCK(sb, dx_current_tag(), &free_blocks, &root_blocks);
++int gfs2_sync_flags(struct inode *inode, int flags, int vflags)
++{
++ struct gfs2_inode *ip = GFS2_I(inode);
++ struct gfs2_sbd *sdp = GFS2_SB(inode);
++ struct buffer_head *bh;
++ struct gfs2_holder gh;
++ int error;
++
++ error = gfs2_glock_nq_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, &gh);
++ if (error)
++ return error;
++ error = gfs2_trans_begin(sdp, RES_DINODE, 0);
++ if (error)
++ goto out;
++ error = gfs2_meta_inode_buffer(ip, &bh);
++ if (error)
++ goto out_trans_end;
++ gfs2_trans_add_meta(ip->i_gl, bh);
++ inode->i_flags = flags;
++ inode->i_vflags = vflags;
++ gfs2_get_inode_flags(inode);
++ gfs2_dinode_out(ip, bh->b_data);
++ brelse(bh);
++ gfs2_set_aops(inode);
++out_trans_end:
++ gfs2_trans_end(sdp);
++out:
++ gfs2_glock_dq_uninit(&gh);
++ return error;
++}
+
- if (free_blocks < count)
- count = free_blocks;
+ static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+ {
+ switch(cmd) {
+diff -urNp -x '*.orig' linux-4.9/fs/gfs2/inode.h linux-4.9/fs/gfs2/inode.h
+--- linux-4.9/fs/gfs2/inode.h 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/fs/gfs2/inode.h 2021-02-24 15:47:45.067742158 +0100
+@@ -117,6 +117,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);
++extern int gfs2_sync_flags(struct inode *inode, int flags, int vflags);
+
+ #ifdef CONFIG_GFS2_FS_LOCKING_DLM
+ extern const struct file_operations gfs2_file_fops;
+diff -urNp -x '*.orig' linux-4.9/fs/hostfs/hostfs.h linux-4.9/fs/hostfs/hostfs.h
+--- linux-4.9/fs/hostfs/hostfs.h 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/fs/hostfs/hostfs.h 2021-02-24 15:47:45.067742158 +0100
+@@ -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 -urNp -x '*.orig' linux-4.9/fs/inode.c linux-4.9/fs/inode.c
+--- linux-4.9/fs/inode.c 2021-02-24 15:47:32.280675463 +0100
++++ linux-4.9/fs/inode.c 2021-02-24 15:47:45.067742158 +0100
+@@ -18,6 +18,7 @@
+ #include <linux/buffer_head.h> /* for inode_has_buffers */
+ #include <linux/ratelimit.h>
+ #include <linux/list_lru.h>
++#include <linux/vs_tag.h>
+ #include <trace/events/writeback.h>
+ #include "internal.h"
-@@ -258,6 +261,7 @@ do_more:
- }
- error_return:
- brelse(bitmap_bh);
-+ DLIMIT_FREE_BLOCK(inode, freed);
- release_blocks(sb, freed);
- DQUOT_FREE_BLOCK(inode, freed);
+@@ -133,6 +134,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_blkbits = sb->s_blocksize_bits;
+ inode->i_flags = 0;
+ atomic64_set(&inode->i_sequence, 0);
+@@ -145,6 +148,7 @@ int inode_init_always(struct super_block
+ inode->i_opflags |= IOP_XATTR;
+ 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;
+@@ -156,6 +160,7 @@ int inode_init_always(struct super_block
+ inode->i_link = NULL;
+ inode->i_dir_seq = 0;
+ inode->i_rdev = 0;
++ inode->i_mdev = 0;
+ inode->dirtied_when = 0;
+
+ #ifdef CONFIG_CGROUP_WRITEBACK
+@@ -480,6 +485,8 @@ void __insert_inode_hash(struct inode *i
}
-@@ -361,6 +365,10 @@ int ext2_new_block(struct inode *inode,
- *err = -ENOSPC;
- goto out_dquot;
- }
-+ if (DLIMIT_ALLOC_BLOCK(inode, es_alloc)) {
-+ *err = -ENOSPC;
-+ goto out_dlimit;
-+ }
+ EXPORT_SYMBOL(__insert_inode_hash);
- ext2_debug ("goal=%lu.\n", goal);
++EXPORT_SYMBOL_GPL(__iget);
++
+ /**
+ * __remove_inode_hash - remove an inode from the hash
+ * @inode: inode to unhash
+@@ -1983,9 +1990,11 @@ void init_special_inode(struct inode *in
+ if (S_ISCHR(mode)) {
+ inode->i_fop = &def_chr_fops;
+ inode->i_rdev = rdev;
++ inode->i_mdev = rdev;
+ } else if (S_ISBLK(mode)) {
+ inode->i_fop = &def_blk_fops;
+ inode->i_rdev = rdev;
++ inode->i_mdev = rdev;
+ } else if (S_ISFIFO(mode))
+ inode->i_fop = &pipefifo_fops;
+ else if (S_ISSOCK(mode))
+@@ -2020,6 +2029,7 @@ void inode_init_owner(struct inode *inod
+ } else
+ inode->i_gid = current_fsgid();
+ inode->i_mode = mode;
++ i_tag_write(inode, dx_current_fstag(inode->i_sb));
+ }
+ EXPORT_SYMBOL(inode_init_owner);
-@@ -508,6 +516,8 @@ got_block:
- *err = 0;
- out_release:
- group_release_blocks(sb, group_no, desc, gdp_bh, group_alloc);
-+ DLIMIT_FREE_BLOCK(inode, es_alloc);
-+out_dlimit:
- release_blocks(sb, es_alloc);
- out_dquot:
- DQUOT_FREE_BLOCK(inode, dq_alloc);
-diff -NurpP --minimal linux-2.6.19.1/fs/ext2/ext2.h linux-2.6.19.1-vs2.3.0.6/fs/ext2/ext2.h
---- linux-2.6.19.1/fs/ext2/ext2.h 2006-11-30 21:19:19 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/ext2/ext2.h 2006-11-08 04:57:46 +0100
-@@ -166,6 +166,7 @@ extern const struct file_operations ext2
- extern const struct address_space_operations ext2_aops;
- extern const struct address_space_operations ext2_aops_xip;
- extern const struct address_space_operations ext2_nobh_aops;
-+extern int ext2_sync_flags(struct inode *inode);
-
- /* namei.c */
- extern struct inode_operations ext2_dir_inode_operations;
-diff -NurpP --minimal linux-2.6.19.1/fs/ext2/file.c linux-2.6.19.1-vs2.3.0.6/fs/ext2/file.c
---- linux-2.6.19.1/fs/ext2/file.c 2006-11-30 21:19:19 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/ext2/file.c 2006-11-08 04:57:51 +0100
-@@ -54,6 +54,7 @@ const struct file_operations ext2_file_o
- .release = ext2_release_file,
- .fsync = ext2_sync_file,
- .sendfile = generic_file_sendfile,
-+ .sendpage = generic_file_sendpage,
- .splice_read = generic_file_splice_read,
- .splice_write = generic_file_splice_write,
- };
-@@ -85,4 +86,5 @@ struct inode_operations ext2_file_inode_
- #endif
- .setattr = ext2_setattr,
- .permission = ext2_permission,
-+ .sync_flags = ext2_sync_flags,
- };
-diff -NurpP --minimal linux-2.6.19.1/fs/ext2/ialloc.c linux-2.6.19.1-vs2.3.0.6/fs/ext2/ialloc.c
---- linux-2.6.19.1/fs/ext2/ialloc.c 2006-11-30 21:19:19 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/ext2/ialloc.c 2006-11-08 04:57:50 +0100
-@@ -17,6 +17,8 @@
- #include <linux/backing-dev.h>
+diff -urNp -x '*.orig' linux-4.9/fs/ioctl.c linux-4.9/fs/ioctl.c
+--- linux-4.9/fs/ioctl.c 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/fs/ioctl.c 2021-02-24 15:47:45.067742158 +0100
+@@ -15,6 +15,9 @@
+ #include <linux/writeback.h>
#include <linux/buffer_head.h>
- #include <linux/random.h>
-+#include <linux/vs_dlimit.h>
+ #include <linux/falloc.h>
++#include <linux/proc_fs.h>
++#include <linux/vserver/inode.h>
+#include <linux/vs_tag.h>
- #include "ext2.h"
- #include "xattr.h"
- #include "acl.h"
-@@ -125,6 +127,7 @@ void ext2_free_inode (struct inode * ino
- ext2_xattr_delete_inode(inode);
- DQUOT_FREE_INODE(inode);
- DQUOT_DROP(inode);
-+ DLIMIT_FREE_INODE(inode);
- }
+ #include "internal.h"
- es = EXT2_SB(sb)->s_es;
-@@ -464,6 +467,11 @@ struct inode *ext2_new_inode(struct inod
- if (!inode)
- return ERR_PTR(-ENOMEM);
+ #include <asm/ioctls.h>
+diff -urNp -x '*.orig' linux-4.9/fs/jfs/file.c linux-4.9/fs/jfs/file.c
+--- linux-4.9/fs/jfs/file.c 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/fs/jfs/file.c 2021-02-24 15:47:45.067742158 +0100
+@@ -113,7 +113,8 @@ int jfs_setattr(struct dentry *dentry, s
+ return rc;
+ }
+ 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;
+@@ -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,
+ };
-+ inode->i_tag = dx_current_fstag(sb);
-+ if (DLIMIT_ALLOC_INODE(inode)) {
-+ err = -ENOSPC;
-+ goto fail_dlim;
-+ }
- ei = EXT2_I(inode);
- sbi = EXT2_SB(sb);
- es = sbi->s_es;
-@@ -577,7 +585,8 @@ got:
- inode->i_blocks = 0;
- inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC;
- memset(ei->i_data, 0, sizeof(ei->i_data));
-- ei->i_flags = EXT2_I(dir)->i_flags & ~EXT2_BTREE_FL;
-+ ei->i_flags = EXT2_I(dir)->i_flags &
-+ ~(EXT2_BTREE_FL|EXT2_IUNLINK_FL|EXT2_BARRIER_FL);
- if (S_ISLNK(mode))
- ei->i_flags &= ~(EXT2_IMMUTABLE_FL|EXT2_APPEND_FL);
- /* dirsync is only applied to directories */
-@@ -625,12 +634,15 @@ fail_free_drop:
-
- fail_drop:
- DQUOT_DROP(inode);
-+ DLIMIT_FREE_INODE(inode);
- inode->i_flags |= S_NOQUOTA;
- inode->i_nlink = 0;
- iput(inode);
- return ERR_PTR(err);
+ const struct file_operations jfs_file_operations = {
+diff -urNp -x '*.orig' linux-4.9/fs/jfs/ioctl.c linux-4.9/fs/jfs/ioctl.c
+--- linux-4.9/fs/jfs/ioctl.c 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/fs/jfs/ioctl.c 2021-02-24 15:47:45.067742158 +0100
+@@ -12,6 +12,7 @@
+ #include <linux/time.h>
+ #include <linux/sched.h>
+ #include <linux/blkdev.h>
++#include <linux/mount.h>
+ #include <asm/current.h>
+ #include <asm/uaccess.h>
- fail:
-+ DLIMIT_FREE_INODE(inode);
-+fail_dlim:
- make_bad_inode(inode);
- iput(inode);
- return ERR_PTR(err);
-diff -NurpP --minimal linux-2.6.19.1/fs/ext2/inode.c linux-2.6.19.1-vs2.3.0.6/fs/ext2/inode.c
---- linux-2.6.19.1/fs/ext2/inode.c 2006-11-30 21:19:19 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/ext2/inode.c 2006-11-30 18:53:18 +0100
-@@ -31,6 +31,7 @@
- #include <linux/writeback.h>
- #include <linux/buffer_head.h>
- #include <linux/mpage.h>
-+#include <linux/vs_tag.h>
- #include "ext2.h"
- #include "acl.h"
- #include "xip.h"
-@@ -913,7 +914,7 @@ void ext2_truncate (struct inode * inode
- return;
- if (ext2_inode_is_fast_symlink(inode))
- return;
-- if (IS_APPEND(inode) || IS_IMMUTABLE(inode))
-+ if (IS_APPEND(inode) || IS_IXORUNLINK(inode))
- return;
+@@ -56,6 +57,16 @@ static long jfs_map_ext2(unsigned long f
+ }
- ext2_discard_prealloc(inode);
-@@ -1042,25 +1043,70 @@ void ext2_set_inode_flags(struct inode *
- {
- unsigned int flags = EXT2_I(inode)->i_flags;
-- inode->i_flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC);
-+ inode->i_flags &= ~(S_IMMUTABLE | S_IUNLINK | S_BARRIER |
-+ S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
++int jfs_sync_flags(struct inode *inode, int flags, int vflags)
++{
++ inode->i_flags = flags;
++ inode->i_vflags = vflags;
++ jfs_get_inode_flags(JFS_IP(inode));
++ inode->i_ctime = CURRENT_TIME_SEC;
++ mark_inode_dirty(inode);
++ return 0;
++}
+
-+ if (flags & EXT2_IMMUTABLE_FL)
-+ inode->i_flags |= S_IMMUTABLE;
-+ if (flags & EXT2_IUNLINK_FL)
-+ inode->i_flags |= S_IUNLINK;
-+ if (flags & EXT2_BARRIER_FL)
-+ inode->i_flags |= S_BARRIER;
+ long jfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+ {
+ 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;
+
++ if (IS_BARRIER(inode)) {
++ vxwprintk_task(1, "messing with the barrier.");
++ return -EACCES;
++ }
+
- if (flags & EXT2_SYNC_FL)
- inode->i_flags |= S_SYNC;
- if (flags & EXT2_APPEND_FL)
- inode->i_flags |= S_APPEND;
-- if (flags & EXT2_IMMUTABLE_FL)
-- inode->i_flags |= S_IMMUTABLE;
- if (flags & EXT2_NOATIME_FL)
- inode->i_flags |= S_NOATIME;
- if (flags & EXT2_DIRSYNC_FL)
- inode->i_flags |= S_DIRSYNC;
- }
+ /* Is it quota file? Do not allow user to mess with it */
+ if (IS_NOQUOTA(inode)) {
+ err = -EPERM;
+@@ -106,8 +122,8 @@ long jfs_ioctl(struct file *filp, unsign
+ * the relevant capability.
+ */
+ if ((oldflags & JFS_IMMUTABLE_FL) ||
+- ((flags ^ oldflags) &
+- (JFS_APPEND_FL | JFS_IMMUTABLE_FL))) {
++ ((flags ^ oldflags) & (JFS_APPEND_FL |
++ JFS_IMMUTABLE_FL | JFS_IXUNLINK_FL))) {
+ if (!capable(CAP_LINUX_IMMUTABLE)) {
+ inode_unlock(inode);
+ err = -EPERM;
+@@ -115,7 +131,7 @@ long jfs_ioctl(struct file *filp, unsign
+ }
+ }
-+int ext2_sync_flags(struct inode *inode)
-+{
-+ unsigned int oldflags, newflags;
-+
-+ oldflags = EXT2_I(inode)->i_flags;
-+ newflags = oldflags & ~(EXT2_APPEND_FL |
-+ EXT2_IMMUTABLE_FL | EXT2_IUNLINK_FL |
-+ EXT2_BARRIER_FL | EXT2_NOATIME_FL |
-+ EXT2_SYNC_FL | EXT2_DIRSYNC_FL);
-+
-+ if (IS_APPEND(inode))
-+ newflags |= EXT2_APPEND_FL;
-+ if (IS_IMMUTABLE(inode))
-+ newflags |= EXT2_IMMUTABLE_FL;
-+ if (IS_IUNLINK(inode))
-+ newflags |= EXT2_IUNLINK_FL;
-+ if (IS_BARRIER(inode))
-+ newflags |= EXT2_BARRIER_FL;
-+
-+ /* we do not want to copy superblock flags */
-+ if (inode->i_flags & S_NOATIME)
-+ newflags |= EXT2_NOATIME_FL;
-+ if (inode->i_flags & S_SYNC)
-+ newflags |= EXT2_SYNC_FL;
-+ if (inode->i_flags & S_DIRSYNC)
-+ newflags |= EXT2_DIRSYNC_FL;
-+
-+ if (oldflags ^ newflags) {
-+ EXT2_I(inode)->i_flags = newflags;
-+ inode->i_ctime = CURRENT_TIME;
-+ mark_inode_dirty(inode);
-+ }
-+
-+ return 0;
-+}
+- flags = flags & JFS_FL_USER_MODIFIABLE;
++ flags &= JFS_FL_USER_MODIFIABLE;
+ flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;
+ jfs_inode->mode2 = flags;
+
+diff -urNp -x '*.orig' linux-4.9/fs/jfs/jfs_dinode.h linux-4.9/fs/jfs/jfs_dinode.h
+--- linux-4.9/fs/jfs/jfs_dinode.h 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/fs/jfs/jfs_dinode.h 2021-02-24 15:47:45.067742158 +0100
+@@ -161,9 +161,13 @@ struct dinode {
+
+ #define JFS_APPEND_FL 0x01000000 /* writes to file may only append */
+ #define JFS_IMMUTABLE_FL 0x02000000 /* Immutable file */
++#define JFS_IXUNLINK_FL 0x08000000 /* Immutable invert on unlink */
+
+-#define JFS_FL_USER_VISIBLE 0x03F80000
+-#define JFS_FL_USER_MODIFIABLE 0x03F80000
++#define JFS_BARRIER_FL 0x04000000 /* Barrier for chroot() */
++#define JFS_COW_FL 0x20000000 /* Copy on Write marker */
+
- void ext2_read_inode (struct inode * inode)
++#define JFS_FL_USER_VISIBLE 0x07F80000
++#define JFS_FL_USER_MODIFIABLE 0x07F80000
+ #define JFS_FL_INHERIT 0x03C80000
+
+ /* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
+diff -urNp -x '*.orig' linux-4.9/fs/jfs/jfs_filsys.h linux-4.9/fs/jfs/jfs_filsys.h
+--- linux-4.9/fs/jfs/jfs_filsys.h 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/fs/jfs/jfs_filsys.h 2021-02-24 15:47:45.067742158 +0100
+@@ -266,6 +266,7 @@
+ #define JFS_NAME_MAX 255
+ #define JFS_PATH_MAX BPSIZE
+
++#define JFS_TAGGED 0x00800000 /* Context Tagging */
+
+ /*
+ * file system state (superblock state)
+diff -urNp -x '*.orig' linux-4.9/fs/jfs/jfs_imap.c linux-4.9/fs/jfs/jfs_imap.c
+--- linux-4.9/fs/jfs/jfs_imap.c 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/fs/jfs/jfs_imap.c 2021-02-24 15:47:45.071075595 +0100
+@@ -46,6 +46,7 @@
+ #include <linux/pagemap.h>
+ #include <linux/quotaops.h>
+ #include <linux/slab.h>
++#include <linux/vs_tag.h>
+
+ #include "jfs_incore.h"
+ #include "jfs_inode.h"
+@@ -3046,6 +3047,8 @@ static int copy_from_dinode(struct dinod
{
- struct ext2_inode_info *ei = EXT2_I(inode);
- ino_t ino = inode->i_ino;
- struct buffer_head * bh;
- struct ext2_inode * raw_inode = ext2_get_inode(inode->i_sb, ino, &bh);
-+ uid_t uid;
-+ gid_t gid;
- int n;
+ struct jfs_inode_info *jfs_ip = JFS_IP(ip);
+ struct jfs_sb_info *sbi = JFS_SBI(ip->i_sb);
++ kuid_t kuid;
++ kgid_t kgid;
- #ifdef CONFIG_EXT2_FS_POSIX_ACL
-@@ -1071,12 +1117,17 @@ void ext2_read_inode (struct inode * ino
- goto bad_inode;
-
- 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;
+ jfs_ip->fileset = le32_to_cpu(dip->di_fileset);
+ jfs_ip->mode2 = le32_to_cpu(dip->di_mode);
+@@ -3066,14 +3069,18 @@ static int copy_from_dinode(struct dinod
}
-+ 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));
+ set_nlink(ip, le32_to_cpu(dip->di_nlink));
+
+- 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);
+
- inode->i_nlink = le16_to_cpu(raw_inode->i_links_count);
- inode->i_size = le32_to_cpu(raw_inode->i_size);
- inode->i_atime.tv_sec = le32_to_cpu(raw_inode->i_atime);
-@@ -1173,8 +1224,8 @@ static int ext2_update_inode(struct inod
- 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);
- struct buffer_head * bh;
- struct ext2_inode * raw_inode = ext2_get_inode(sb, ino, &bh);
- int n;
-@@ -1209,6 +1260,9 @@ static int ext2_update_inode(struct inod
- raw_inode->i_uid_high = 0;
- raw_inode->i_gid_high = 0;
++ 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;
}
-+#ifdef CONFIG_TAGGING_INTERN
-+ raw_inode->i_raw_tag = cpu_to_le16(inode->i_tag);
-+#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);
-@@ -1295,7 +1349,8 @@ int ext2_setattr(struct dentry *dentry,
- if (error)
- return error;
- 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)) {
- error = DQUOT_TRANSFER(inode, iattr) ? -EDQUOT : 0;
- if (error)
- return error;
-diff -NurpP --minimal linux-2.6.19.1/fs/ext2/ioctl.c linux-2.6.19.1-vs2.3.0.6/fs/ext2/ioctl.c
---- linux-2.6.19.1/fs/ext2/ioctl.c 2006-11-30 21:19:19 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/ext2/ioctl.c 2006-11-08 04:57:52 +0100
-@@ -13,6 +13,7 @@
- #include <linux/sched.h>
- #include <linux/compat.h>
- #include <linux/smp_lock.h>
-+#include <linux/mount.h>
- #include <asm/current.h>
- #include <asm/uaccess.h>
-@@ -32,7 +33,8 @@ int ext2_ioctl (struct inode * inode, st
- case EXT2_IOC_SETFLAGS: {
- unsigned int oldflags;
+- 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 {
+@@ -3138,16 +3145,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 (!uid_valid(sbi->uid))
+- dip->di_uid = cpu_to_le32(i_uid_read(ip));
+- else
+- 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(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 -urNp -x '*.orig' linux-4.9/fs/jfs/jfs_inode.c linux-4.9/fs/jfs/jfs_inode.c
+--- linux-4.9/fs/jfs/jfs_inode.c 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/fs/jfs/jfs_inode.c 2021-02-24 15:47:45.071075595 +0100
+@@ -18,6 +18,7 @@
-- if (IS_RDONLY(inode))
-+ if (IS_RDONLY(inode) ||
-+ (filp && MNT_IS_RDONLY(filp->f_vfsmnt)))
- return -EROFS;
+ #include <linux/fs.h>
+ #include <linux/quotaops.h>
++#include <linux/vs_tag.h>
+ #include "jfs_incore.h"
+ #include "jfs_inode.h"
+ #include "jfs_filsys.h"
+@@ -33,6 +34,9 @@ void jfs_set_inode_flags(struct inode *i
- if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
-@@ -52,7 +54,9 @@ int ext2_ioctl (struct inode * inode, st
- *
- * This test looks nicer. Thanks to Pauline Middelink
- */
-- if ((flags ^ oldflags) & (EXT2_APPEND_FL | EXT2_IMMUTABLE_FL)) {
-+ if ((oldflags & EXT2_IMMUTABLE_FL) ||
-+ ((flags ^ oldflags) & (EXT2_APPEND_FL |
-+ EXT2_IMMUTABLE_FL | EXT2_IUNLINK_FL))) {
- if (!capable(CAP_LINUX_IMMUTABLE))
- return -EPERM;
- }
-@@ -71,7 +75,8 @@ int ext2_ioctl (struct inode * inode, st
- case EXT2_IOC_SETVERSION:
- if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
- return -EPERM;
-- if (IS_RDONLY(inode))
-+ if (IS_RDONLY(inode) ||
-+ (filp && MNT_IS_RDONLY(filp->f_vfsmnt)))
- return -EROFS;
- if (get_user(inode->i_generation, (int __user *) arg))
- return -EFAULT;
-diff -NurpP --minimal linux-2.6.19.1/fs/ext2/namei.c linux-2.6.19.1-vs2.3.0.6/fs/ext2/namei.c
---- linux-2.6.19.1/fs/ext2/namei.c 2006-11-30 21:19:19 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/ext2/namei.c 2006-11-30 18:53:18 +0100
-@@ -31,6 +31,7 @@
- */
+ if (flags & JFS_IMMUTABLE_FL)
+ new_fl |= S_IMMUTABLE;
++ if (flags & JFS_IXUNLINK_FL)
++ new_fl |= S_IXUNLINK;
++
+ if (flags & JFS_APPEND_FL)
+ new_fl |= S_APPEND;
+ if (flags & JFS_NOATIME_FL)
+@@ -41,18 +45,35 @@ void jfs_set_inode_flags(struct inode *i
+ new_fl |= S_DIRSYNC;
+ if (flags & JFS_SYNC_FL)
+ new_fl |= S_SYNC;
+- inode_set_flags(inode, new_fl, S_IMMUTABLE | S_APPEND | S_NOATIME |
+- S_DIRSYNC | S_SYNC);
++
++ 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)
++ new_fl |= V_BARRIER;
++ if (flags & JFS_COW_FL)
++ new_fl |= V_COW;
++
++ set_mask_bits(&inode->i_vflags,
++ V_BARRIER | V_COW, new_fl);
+ }
- #include <linux/pagemap.h>
+ void jfs_get_inode_flags(struct jfs_inode_info *jfs_ip)
+ {
+ unsigned int flags = jfs_ip->vfs_inode.i_flags;
++ unsigned int vflags = jfs_ip->vfs_inode.i_vflags;
++
++ jfs_ip->mode2 &= ~(JFS_IMMUTABLE_FL | JFS_IXUNLINK_FL |
++ JFS_APPEND_FL | JFS_NOATIME_FL |
++ JFS_DIRSYNC_FL | JFS_SYNC_FL |
++ JFS_BARRIER_FL | JFS_COW_FL);
+
+- jfs_ip->mode2 &= ~(JFS_IMMUTABLE_FL | JFS_APPEND_FL | JFS_NOATIME_FL |
+- JFS_DIRSYNC_FL | JFS_SYNC_FL);
+ if (flags & S_IMMUTABLE)
+ jfs_ip->mode2 |= JFS_IMMUTABLE_FL;
++ if (flags & S_IXUNLINK)
++ jfs_ip->mode2 |= JFS_IXUNLINK_FL;
++
+ if (flags & S_APPEND)
+ jfs_ip->mode2 |= JFS_APPEND_FL;
+ if (flags & S_NOATIME)
+@@ -61,6 +82,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;
++
++ if (vflags & V_BARRIER)
++ jfs_ip->mode2 |= JFS_BARRIER_FL;
++ if (vflags & V_COW)
++ jfs_ip->mode2 |= JFS_COW_FL;
+ }
+
+ /*
+diff -urNp -x '*.orig' linux-4.9/fs/jfs/jfs_inode.h linux-4.9/fs/jfs/jfs_inode.h
+--- linux-4.9/fs/jfs/jfs_inode.h 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/fs/jfs/jfs_inode.h 2021-02-24 15:47:45.071075595 +0100
+@@ -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);
+ extern void jfs_set_inode_flags(struct inode *);
++extern int jfs_sync_flags(struct inode *, int, int);
+ extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int);
+ extern int jfs_setattr(struct dentry *, struct iattr *);
+
+diff -urNp -x '*.orig' linux-4.9/fs/jfs/namei.c linux-4.9/fs/jfs/namei.c
+--- linux-4.9/fs/jfs/namei.c 2021-02-24 15:47:32.287342339 +0100
++++ linux-4.9/fs/jfs/namei.c 2021-02-24 15:47:45.071075595 +0100
+@@ -22,6 +22,7 @@
+ #include <linux/ctype.h>
+ #include <linux/quotaops.h>
+ #include <linux/exportfs.h>
+#include <linux/vs_tag.h>
- #include "ext2.h"
- #include "xattr.h"
- #include "acl.h"
-@@ -66,6 +67,7 @@ static struct dentry *ext2_lookup(struct
- inode = iget(dir->i_sb, ino);
- if (!inode)
- return ERR_PTR(-EACCES);
-+ dx_propagate_tag(nd, inode);
+ #include "jfs_incore.h"
+ #include "jfs_superblock.h"
+ #include "jfs_inode.h"
+@@ -1480,6 +1481,7 @@ static struct dentry *jfs_lookup(struct
+ jfs_err("jfs_lookup: iget failed on inum %d", (uint)inum);
}
- return d_splice_alias(inode, dentry);
- }
-@@ -391,6 +393,7 @@ struct inode_operations ext2_dir_inode_o
- #endif
- .setattr = ext2_setattr,
- .permission = ext2_permission,
-+ .sync_flags = ext2_sync_flags,
- };
- struct inode_operations ext2_special_inode_operations = {
-@@ -402,4 +405,5 @@ struct inode_operations ext2_special_ino
- #endif
- .setattr = ext2_setattr,
- .permission = ext2_permission,
-+ .sync_flags = ext2_sync_flags,
- };
-diff -NurpP --minimal linux-2.6.19.1/fs/ext2/super.c linux-2.6.19.1-vs2.3.0.6/fs/ext2/super.c
---- linux-2.6.19.1/fs/ext2/super.c 2006-11-30 21:19:19 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/ext2/super.c 2006-11-08 04:57:51 +0100
-@@ -227,8 +227,8 @@ static int ext2_show_options(struct seq_
++ dx_propagate_tag(nd, ip);
+ return d_splice_alias(ip, dentry);
}
- #ifdef CONFIG_QUOTA
--static ssize_t ext2_quota_read(struct super_block *sb, int type, char *data, size_t len, loff_t off);
--static ssize_t ext2_quota_write(struct super_block *sb, int type, const char *data, size_t len, loff_t off);
-+static ssize_t ext2_quota_read(struct dqhash *hash, int type, char *data, size_t len, loff_t off);
-+static ssize_t ext2_quota_write(struct dqhash *hash, int type, const char *data, size_t len, loff_t off);
+@@ -1542,6 +1544,7 @@ const struct inode_operations jfs_dir_in
+ .get_acl = jfs_get_acl,
+ .set_acl = jfs_set_acl,
#endif
++ .sync_flags = jfs_sync_flags,
+ };
- static struct super_operations ext2_sops = {
-@@ -324,7 +324,7 @@ 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,
-- Opt_usrquota, Opt_grpquota
-+ Opt_usrquota, Opt_grpquota, Opt_tag, Opt_notag, Opt_tagid
+ const struct file_operations jfs_dir_operations = {
+diff -urNp -x '*.orig' linux-4.9/fs/jfs/super.c linux-4.9/fs/jfs/super.c
+--- linux-4.9/fs/jfs/super.c 2021-02-24 15:47:32.287342339 +0100
++++ linux-4.9/fs/jfs/super.c 2021-02-24 15:47:45.071075595 +0100
+@@ -206,7 +206,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_discard, Opt_nodiscard, Opt_discard_minblk
++ Opt_discard, Opt_nodiscard, Opt_discard_minblk,
++ Opt_tag, Opt_notag, Opt_tagid
};
- static match_table_t tokens = {
-@@ -352,6 +352,10 @@ static match_table_t tokens = {
- {Opt_acl, "acl"},
- {Opt_noacl, "noacl"},
- {Opt_xip, "xip"},
+ static const match_table_t tokens = {
+@@ -216,6 +217,10 @@ static const match_table_t tokens = {
+ {Opt_resize, "resize=%u"},
+ {Opt_resize_nosize, "resize"},
+ {Opt_errors, "errors=%s"},
+ {Opt_tag, "tag"},
+ {Opt_notag, "notag"},
+ {Opt_tagid, "tagid=%u"},
+ {Opt_tag, "tagxid"},
- {Opt_grpquota, "grpquota"},
{Opt_ignore, "noquota"},
- {Opt_quota, "quota"},
-@@ -420,6 +424,20 @@ static int parse_options (char * options
- case Opt_nouid32:
- set_opt (sbi->s_mount_opt, NO_UID32);
+ {Opt_ignore, "quota"},
+ {Opt_usrquota, "usrquota"},
+@@ -405,7 +410,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:
-+ set_opt (sbi->s_mount_opt, TAGGED);
++ *flag |= JFS_TAGGED;
+ break;
+ case Opt_notag:
-+ clear_opt (sbi->s_mount_opt, TAGGED);
++ *flag &= JFS_TAGGED;
+ break;
+#endif
+#ifdef CONFIG_PROPAGATE
+ case Opt_tagid:
+ /* use args[0] */
-+ set_opt (sbi->s_mount_opt, TAGGED);
++ *flag |= JFS_TAGGED;
+ break;
+#endif
- case Opt_nocheck:
- clear_opt (sbi->s_mount_opt, CHECK);
- break;
-@@ -728,6 +746,8 @@ static int ext2_fill_super(struct super_
- if (!parse_options ((char *) data, sbi))
- goto failed_mount;
-
-+ if (EXT2_SB(sb)->s_mount_opt & EXT2_MOUNT_TAGGED)
-+ sb->s_flags |= MS_TAGGED;
- sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
- ((EXT2_SB(sb)->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ?
- MS_POSIXACL : 0);
-@@ -1036,6 +1056,13 @@ static int ext2_remount (struct super_bl
- goto restore_opts;
- }
+ default:
+ printk("jfs: Unrecognized mount option \"%s\" or missing value\n",
+ p);
+@@ -437,6 +455,12 @@ static int jfs_remount(struct super_bloc
+ if (!parse_options(data, sb, &newLVSize, &flag))
+ return -EINVAL;
-+ if ((sbi->s_mount_opt & EXT2_MOUNT_TAGGED) &&
-+ !(sb->s_flags & MS_TAGGED)) {
-+ printk("EXT2-fs: %s: tagging not permitted on remount.\n",
-+ sb->s_id);
++ 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;
+ }
+
- sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
- ((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
-
-@@ -1148,10 +1175,11 @@ static int ext2_get_sb(struct file_syste
- * acquiring the locks... As quota files are never truncated and quota code
- * itself serializes the operations (and noone else should touch the files)
- * we don't have to be afraid of races */
--static ssize_t ext2_quota_read(struct super_block *sb, int type, char *data,
-+static ssize_t ext2_quota_read(struct dqhash *hash, int type, char *data,
- size_t len, loff_t off)
- {
-- struct inode *inode = sb_dqopt(sb)->files[type];
-+ struct inode *inode = dqh_dqopt(hash)->files[type];
-+ struct super_block *sb = hash->dqh_sb;
- sector_t blk = off >> EXT2_BLOCK_SIZE_BITS(sb);
- int err = 0;
- int offset = off & (sb->s_blocksize - 1);
-@@ -1192,10 +1220,11 @@ static ssize_t ext2_quota_read(struct su
- }
-
- /* Write to quotafile */
--static ssize_t ext2_quota_write(struct super_block *sb, int type,
-+static ssize_t ext2_quota_write(struct dqhash *hash, int type,
- const char *data, size_t len, loff_t off)
- {
-- struct inode *inode = sb_dqopt(sb)->files[type];
-+ struct inode *inode = dqh_dqopt(hash)->files[type];
-+ struct super_block *sb = hash->dqh_sb;
- sector_t blk = off >> EXT2_BLOCK_SIZE_BITS(sb);
- int err = 0;
- int offset = off & (sb->s_blocksize - 1);
-diff -NurpP --minimal linux-2.6.19.1/fs/ext2/symlink.c linux-2.6.19.1-vs2.3.0.6/fs/ext2/symlink.c
---- linux-2.6.19.1/fs/ext2/symlink.c 2005-08-29 22:25:30 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/fs/ext2/symlink.c 2006-11-08 04:57:46 +0100
-@@ -38,6 +38,7 @@ struct inode_operations ext2_symlink_ino
- .listxattr = ext2_listxattr,
- .removexattr = generic_removexattr,
- #endif
-+ .sync_flags = ext2_sync_flags,
- };
-
- struct inode_operations ext2_fast_symlink_inode_operations = {
-@@ -49,4 +50,5 @@ struct inode_operations ext2_fast_symlin
- .listxattr = ext2_listxattr,
- .removexattr = generic_removexattr,
+ if (newLVSize) {
+ if (sb->s_flags & MS_RDONLY) {
+ 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
-+ .sync_flags = ext2_sync_flags,
- };
-diff -NurpP --minimal linux-2.6.19.1/fs/ext2/xattr.c linux-2.6.19.1-vs2.3.0.6/fs/ext2/xattr.c
---- linux-2.6.19.1/fs/ext2/xattr.c 2006-11-30 21:19:19 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/ext2/xattr.c 2006-11-08 04:57:50 +0100
-@@ -60,6 +60,7 @@
- #include <linux/mbcache.h>
- #include <linux/quotaops.h>
- #include <linux/rwsem.h>
-+#include <linux/vs_dlimit.h>
- #include "ext2.h"
- #include "xattr.h"
- #include "acl.h"
-@@ -644,8 +645,12 @@ ext2_xattr_set2(struct inode *inode, str
- the inode. */
- ea_bdebug(new_bh, "reusing block");
-
-+ error = -ENOSPC;
-+ if (DLIMIT_ALLOC_BLOCK(inode, 1))
-+ goto cleanup;
- error = -EDQUOT;
- if (DQUOT_ALLOC_BLOCK(inode, 1)) {
-+ DLIMIT_FREE_BLOCK(inode, 1);
- unlock_buffer(new_bh);
- goto cleanup;
- }
-@@ -739,6 +744,7 @@ ext2_xattr_set2(struct inode *inode, str
- le32_to_cpu(HDR(old_bh)->h_refcount) - 1);
- if (ce)
- mb_cache_entry_release(ce);
-+ DLIMIT_FREE_BLOCK(inode, 1);
- DQUOT_FREE_BLOCK(inode, 1);
- mark_buffer_dirty(old_bh);
- ea_bdebug(old_bh, "refcount now=%d",
-@@ -803,6 +809,7 @@ ext2_xattr_delete_inode(struct inode *in
- mark_buffer_dirty(bh);
- if (IS_SYNC(inode))
- sync_dirty_buffer(bh);
-+ DLIMIT_FREE_BLOCK(inode, 1);
- DQUOT_FREE_BLOCK(inode, 1);
- }
- EXT2_I(inode)->i_file_acl = 0;
-diff -NurpP --minimal linux-2.6.19.1/fs/ext3/balloc.c linux-2.6.19.1-vs2.3.0.6/fs/ext3/balloc.c
---- linux-2.6.19.1/fs/ext3/balloc.c 2006-11-30 21:19:19 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/ext3/balloc.c 2006-12-01 23:41:10 +0100
-@@ -19,6 +19,8 @@
- #include <linux/ext3_jbd.h>
- #include <linux/quotaops.h>
- #include <linux/buffer_head.h>
-+#include <linux/vs_dlimit.h>
-+#include <linux/vs_tag.h>
-
- /*
- * balloc.c contains the blocks allocation and deallocation routines
-@@ -613,8 +615,10 @@ void ext3_free_blocks(handle_t *handle,
- return;
- }
- ext3_free_blocks_sb(handle, sb, block, count, &dquot_freed_blocks);
-- if (dquot_freed_blocks)
-+ if (dquot_freed_blocks) {
-+ DLIMIT_FREE_BLOCK(inode, dquot_freed_blocks);
- DQUOT_FREE_BLOCK(inode, dquot_freed_blocks);
-+ }
- return;
- }
++ /* map mount option tagxid */
++ if (sbi->flag & JFS_TAGGED)
++ sb->s_flags |= MS_TAGGED;
-@@ -1349,18 +1353,33 @@ out:
- *
- * Check if filesystem has at least 1 free block available for allocation.
+ if (newLVSize) {
+ pr_err("resize option for remount only\n");
+diff -urNp -x '*.orig' linux-4.9/fs/libfs.c linux-4.9/fs/libfs.c
+--- linux-4.9/fs/libfs.c 2021-02-24 15:47:32.287342339 +0100
++++ linux-4.9/fs/libfs.c 2021-02-24 15:47:45.071075595 +0100
+@@ -180,7 +180,8 @@ static inline unsigned char dt_type(stru
+ * both impossible due to the lock on directory.
*/
--static int ext3_has_free_blocks(struct ext3_sb_info *sbi)
-+static int ext3_has_free_blocks(struct super_block *sb)
+
+-int dcache_readdir(struct file *file, struct dir_context *ctx)
++static inline int do_dcache_readdir_filter(struct file *file,
++ struct dir_context *ctx, int (*filter)(struct dentry *dentry))
{
-- ext3_fsblk_t free_blocks, root_blocks;
-+ struct ext3_sb_info *sbi = EXT3_SB(sb);
-+ unsigned long long free_blocks, root_blocks;
-+ int cond;
+ struct dentry *dentry = file->f_path.dentry;
+ struct dentry *cursor = file->private_data;
+@@ -197,9 +198,10 @@ int dcache_readdir(struct file *file, st
+ p = &cursor->d_child;
+
+ while ((p = scan_positives(cursor, p, 1, &next)) != anchor) {
+- if (!dir_emit(ctx, next->d_name.name, next->d_name.len,
++ if (!filter || filter(next))
++ if (!dir_emit(ctx, next->d_name.name, next->d_name.len,
+ d_inode(next)->i_ino, dt_type(d_inode(next))))
+- break;
++ break;
+ ctx->pos++;
+ }
+ spin_lock(&dentry->d_lock);
+@@ -209,8 +211,22 @@ int dcache_readdir(struct file *file, st
- free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
- root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
-- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
-+
-+ vxdprintk(VXD_CBIT(dlim, 3),
-+ "ext3_has_free_blocks(%p): free=%llu, root=%llu",
-+ sb, free_blocks, root_blocks);
+ return 0;
+ }
+
-+ DLIMIT_ADJUST_BLOCK(sb, dx_current_tag(), &free_blocks, &root_blocks);
+ EXPORT_SYMBOL(dcache_readdir);
+
++int dcache_readdir(struct file *filp, struct dir_context *ctx)
++{
++ return do_dcache_readdir_filter(filp, ctx, NULL);
++}
+
-+ cond = (free_blocks < root_blocks + 1 &&
-+ !capable(CAP_SYS_RESOURCE) &&
- sbi->s_resuid != current->fsuid &&
-- (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
-- return 0;
-- }
-- return 1;
-+ (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid)));
++EXPORT_SYMBOL(dcache_readdir_filter);
+
-+ vxdprintk(VXD_CBIT(dlim, 3),
-+ "ext3_has_free_blocks(%p): %llu<%llu+1, %c, %u!=%u r=%d",
-+ sb, free_blocks, root_blocks,
-+ !capable(CAP_SYS_RESOURCE)?'1':'0',
-+ sbi->s_resuid, current->fsuid, cond?0:1);
++int dcache_readdir_filter(struct file *filp, struct dir_context *ctx,
++ int (*filter)(struct dentry *))
++{
++ return do_dcache_readdir_filter(filp, ctx, filter);
++}
+
-+ return (cond ? 0 : 1);
- }
-
- /**
-@@ -1377,7 +1396,7 @@ static int ext3_has_free_blocks(struct e
- */
- int ext3_should_retry_alloc(struct super_block *sb, int *retries)
+ ssize_t generic_read_dir(struct file *filp, char __user *buf, size_t siz, loff_t *ppos)
{
-- if (!ext3_has_free_blocks(EXT3_SB(sb)) || (*retries)++ > 3)
-+ if (!ext3_has_free_blocks(sb) || (*retries)++ > 3)
- return 0;
-
- jbd_debug(1, "%s: retrying operation after ENOSPC\n", sb->s_id);
-@@ -1440,6 +1459,8 @@ ext3_fsblk_t ext3_new_blocks(handle_t *h
- *errp = -EDQUOT;
- return 0;
- }
-+ if (DLIMIT_ALLOC_BLOCK(inode, 1))
-+ goto out_dlimit;
-
- sbi = EXT3_SB(sb);
- es = EXT3_SB(sb)->s_es;
-@@ -1456,7 +1477,7 @@ ext3_fsblk_t ext3_new_blocks(handle_t *h
- if (block_i && ((windowsz = block_i->rsv_window_node.rsv_goal_size) > 0))
- my_rsv = &block_i->rsv_window_node;
-
-- if (!ext3_has_free_blocks(sbi)) {
-+ if (!ext3_has_free_blocks(sb)) {
- *errp = -ENOSPC;
- goto out;
- }
-@@ -1650,6 +1671,9 @@ allocated:
- io_error:
- *errp = -EIO;
- out:
-+ if (!performed_allocation)
-+ DLIMIT_FREE_BLOCK(inode, 1);
-+out_dlimit:
- if (fatal) {
- *errp = fatal;
- ext3_std_error(sb, fatal);
-diff -NurpP --minimal linux-2.6.19.1/fs/ext3/file.c linux-2.6.19.1-vs2.3.0.6/fs/ext3/file.c
---- linux-2.6.19.1/fs/ext3/file.c 2006-11-30 21:19:19 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/ext3/file.c 2006-11-08 04:57:51 +0100
-@@ -121,6 +121,7 @@ const struct file_operations ext3_file_o
- .release = ext3_release_file,
- .fsync = ext3_sync_file,
- .sendfile = generic_file_sendfile,
-+ .sendpage = generic_file_sendpage,
- .splice_read = generic_file_splice_read,
- .splice_write = generic_file_splice_write,
- };
-@@ -135,5 +136,6 @@ struct inode_operations ext3_file_inode_
- .removexattr = generic_removexattr,
- #endif
- .permission = ext3_permission,
-+ .sync_flags = ext3_sync_flags,
- };
-
-diff -NurpP --minimal linux-2.6.19.1/fs/ext3/ialloc.c linux-2.6.19.1-vs2.3.0.6/fs/ext3/ialloc.c
---- linux-2.6.19.1/fs/ext3/ialloc.c 2006-11-30 21:19:19 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/ext3/ialloc.c 2006-11-08 04:57:50 +0100
-@@ -23,6 +23,8 @@
- #include <linux/buffer_head.h>
- #include <linux/random.h>
- #include <linux/bitops.h>
-+#include <linux/vs_dlimit.h>
-+#include <linux/vs_tag.h>
-
- #include <asm/byteorder.h>
+ return -EISDIR;
+diff -urNp -x '*.orig' linux-4.9/fs/locks.c linux-4.9/fs/locks.c
+--- linux-4.9/fs/locks.c 2021-02-24 15:47:32.287342339 +0100
++++ linux-4.9/fs/locks.c 2021-02-24 15:47:45.071075595 +0100
+@@ -127,6 +127,8 @@
+ #include <linux/pid_namespace.h>
+ #include <linux/hashtable.h>
+ #include <linux/percpu.h>
++#include <linux/vs_base.h>
++#include <linux/vs_limit.h>
-@@ -127,6 +129,7 @@ void ext3_free_inode (handle_t *handle,
- ext3_xattr_delete_inode(handle, inode);
- DQUOT_FREE_INODE(inode);
- DQUOT_DROP(inode);
-+ DLIMIT_FREE_INODE(inode);
+ #define CREATE_TRACE_POINTS
+ #include <trace/events/filelock.h>
+@@ -292,11 +294,15 @@ static void locks_init_lock_heads(struct
+ /* Allocate an empty lock structure. */
+ struct file_lock *locks_alloc_lock(void)
+ {
+- struct file_lock *fl = kmem_cache_zalloc(filelock_cache, GFP_KERNEL);
++ struct file_lock *fl;
- is_directory = S_ISDIR(inode->i_mode);
+- if (fl)
+- locks_init_lock_heads(fl);
++ fl = kmem_cache_zalloc(filelock_cache, GFP_KERNEL);
-@@ -445,6 +448,12 @@ struct inode *ext3_new_inode(handle_t *h
- inode = new_inode(sb);
- if (!inode)
- return ERR_PTR(-ENOMEM);
-+
-+ inode->i_tag = dx_current_fstag(sb);
-+ if (DLIMIT_ALLOC_INODE(inode)) {
-+ err = -ENOSPC;
-+ goto out_dlimit;
++ if (fl) {
++ locks_init_lock_heads(fl);
++ vx_locks_inc(fl);
++ fl->fl_xid = -1;
+ }
- ei = EXT3_I(inode);
-
- sbi = EXT3_SB(sb);
-@@ -566,7 +575,8 @@ got:
- ei->i_dir_start_lookup = 0;
- ei->i_disksize = 0;
-
-- ei->i_flags = EXT3_I(dir)->i_flags & ~EXT3_INDEX_FL;
-+ ei->i_flags = EXT3_I(dir)->i_flags &
-+ ~(EXT3_INDEX_FL|EXT3_IUNLINK_FL|EXT3_BARRIER_FL);
- if (S_ISLNK(mode))
- ei->i_flags &= ~(EXT3_IMMUTABLE_FL|EXT3_APPEND_FL);
- /* dirsync only applies to directories */
-@@ -621,6 +631,8 @@ got:
- fail:
- ext3_std_error(sb, err);
- out:
-+ DLIMIT_FREE_INODE(inode);
-+out_dlimit:
- iput(inode);
- ret = ERR_PTR(err);
- really_out:
-@@ -632,6 +644,7 @@ fail_free_drop:
-
- fail_drop:
- DQUOT_DROP(inode);
-+ DLIMIT_FREE_INODE(inode);
- inode->i_flags |= S_NOQUOTA;
- inode->i_nlink = 0;
- iput(inode);
-diff -NurpP --minimal linux-2.6.19.1/fs/ext3/inode.c linux-2.6.19.1-vs2.3.0.6/fs/ext3/inode.c
---- linux-2.6.19.1/fs/ext3/inode.c 2006-11-30 21:19:19 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/ext3/inode.c 2006-11-30 19:02:16 +0100
-@@ -37,6 +37,7 @@
- #include <linux/mpage.h>
- #include <linux/uio.h>
- #include <linux/bio.h>
-+#include <linux/vs_tag.h>
- #include "xattr.h"
- #include "acl.h"
-
-@@ -2246,7 +2247,7 @@ void ext3_truncate(struct inode *inode)
- return;
- if (ext3_inode_is_fast_symlink(inode))
- return;
-- if (IS_APPEND(inode) || IS_IMMUTABLE(inode))
-+ if (IS_APPEND(inode) || IS_IXORUNLINK(inode))
- return;
-
- /*
-@@ -2568,19 +2569,77 @@ void ext3_set_inode_flags(struct inode *
+ return fl;
+ }
+ EXPORT_SYMBOL_GPL(locks_alloc_lock);
+@@ -348,6 +354,7 @@ void locks_init_lock(struct file_lock *f
{
- unsigned int flags = EXT3_I(inode)->i_flags;
-
-- inode->i_flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC);
-+ inode->i_flags &= ~(S_IMMUTABLE | S_IUNLINK | S_BARRIER |
-+ S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
-+
-+ if (flags & EXT3_IMMUTABLE_FL)
-+ inode->i_flags |= S_IMMUTABLE;
-+ if (flags & EXT3_IUNLINK_FL)
-+ inode->i_flags |= S_IUNLINK;
-+ if (flags & EXT3_BARRIER_FL)
-+ inode->i_flags |= S_BARRIER;
-+
- if (flags & EXT3_SYNC_FL)
- inode->i_flags |= S_SYNC;
- if (flags & EXT3_APPEND_FL)
- inode->i_flags |= S_APPEND;
-- if (flags & EXT3_IMMUTABLE_FL)
-- inode->i_flags |= S_IMMUTABLE;
- if (flags & EXT3_NOATIME_FL)
- inode->i_flags |= S_NOATIME;
- if (flags & EXT3_DIRSYNC_FL)
- inode->i_flags |= S_DIRSYNC;
+ memset(fl, 0, sizeof(struct file_lock));
+ locks_init_lock_heads(fl);
++ fl->fl_xid = -1;
}
-+int ext3_sync_flags(struct inode *inode)
-+{
-+ unsigned int oldflags, newflags;
-+ int err = 0;
-+
-+ oldflags = EXT3_I(inode)->i_flags;
-+ newflags = oldflags & ~(EXT3_APPEND_FL |
-+ EXT3_IMMUTABLE_FL | EXT3_IUNLINK_FL |
-+ EXT3_BARRIER_FL | EXT3_NOATIME_FL |
-+ EXT3_SYNC_FL | EXT3_DIRSYNC_FL);
-+
-+ if (IS_APPEND(inode))
-+ newflags |= EXT3_APPEND_FL;
-+ if (IS_IMMUTABLE(inode))
-+ newflags |= EXT3_IMMUTABLE_FL;
-+ if (IS_IUNLINK(inode))
-+ newflags |= EXT3_IUNLINK_FL;
-+ if (IS_BARRIER(inode))
-+ newflags |= EXT3_BARRIER_FL;
-+
-+ /* we do not want to copy superblock flags */
-+ if (inode->i_flags & S_NOATIME)
-+ newflags |= EXT3_NOATIME_FL;
-+ if (inode->i_flags & S_SYNC)
-+ newflags |= EXT3_SYNC_FL;
-+ if (inode->i_flags & S_DIRSYNC)
-+ newflags |= EXT3_DIRSYNC_FL;
-+
-+ if (oldflags ^ newflags) {
-+ handle_t *handle;
-+ struct ext3_iloc iloc;
-+
-+ handle = ext3_journal_start(inode, 1);
-+ if (IS_ERR(handle))
-+ return PTR_ERR(handle);
-+ if (IS_SYNC(inode))
-+ handle->h_sync = 1;
-+ err = ext3_reserve_inode_write(handle, inode, &iloc);
-+ if (err)
-+ goto flags_err;
-+
-+ EXT3_I(inode)->i_flags = newflags;
-+ inode->i_ctime = CURRENT_TIME;
-+
-+ err = ext3_mark_iloc_dirty(handle, inode, &iloc);
-+ flags_err:
-+ ext3_journal_stop(handle);
-+ }
-+ return err;
-+}
-+
- void ext3_read_inode(struct inode * inode)
- {
- struct ext3_iloc iloc;
-@@ -2588,6 +2647,8 @@ void ext3_read_inode(struct inode * inod
- struct ext3_inode_info *ei = EXT3_I(inode);
- struct buffer_head *bh;
- int block;
-+ uid_t uid;
-+ gid_t gid;
+ EXPORT_SYMBOL(locks_init_lock);
+@@ -365,6 +372,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;
- #ifdef CONFIG_EXT3_FS_POSIX_ACL
- ei->i_acl = EXT3_ACL_NOT_CACHED;
-@@ -2600,12 +2661,17 @@ void ext3_read_inode(struct inode * inod
- 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;
- }
-+ 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));
+ if (fl->fl_lmops) {
+@@ -426,7 +434,10 @@ flock_make_lock(struct file *filp, unsig
+ fl->fl_flags = FL_FLOCK;
+ fl->fl_type = type;
+ fl->fl_end = OFFSET_MAX;
+-
+
- inode->i_nlink = le16_to_cpu(raw_inode->i_links_count);
- inode->i_size = le32_to_cpu(raw_inode->i_size);
- inode->i_atime.tv_sec = le32_to_cpu(raw_inode->i_atime);
-@@ -2729,6 +2795,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;
-
- /* For fields not not tracking in the in-memory inode,
-@@ -2738,29 +2806,32 @@ static int ext3_do_update_inode(handle_t
++ vxd_assert(filp->f_xid == vx_current_xid(),
++ "f_xid(%d) == current(%d)", filp->f_xid, vx_current_xid());
++ fl->fl_xid = filp->f_xid;
+ return fl;
+ }
- raw_inode->i_mode = cpu_to_le16(inode->i_mode);
- 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_high = 0;
- raw_inode->i_gid_high = 0;
- }
-+#ifdef CONFIG_TAGGING_INTERN
-+ raw_inode->i_raw_tag = cpu_to_le16(inode->i_tag);
-+#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);
-@@ -2913,7 +2984,8 @@ int ext3_setattr(struct dentry *dentry,
- return error;
+@@ -548,6 +559,7 @@ static int lease_init(struct file *filp,
- 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)) {
- handle_t *handle;
+ fl->fl_owner = filp;
+ fl->fl_pid = current->tgid;
++ fl->fl_xid = vx_current_xid();
- /* (user+group)*(old+new) structure, inode write (sb,
-@@ -2935,6 +3007,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;
-+ if ((attr->ia_valid & ATTR_TAG) && IS_TAGGED(inode))
-+ inode->i_tag = attr->ia_tag;
- error = ext3_mark_inode_dirty(handle, inode);
- ext3_journal_stop(handle);
+ fl->fl_file = filp;
+ fl->fl_flags = FL_LEASE;
+@@ -567,6 +579,10 @@ static struct file_lock *lease_alloc(str
+ if (fl == NULL)
+ return ERR_PTR(error);
+
++ fl->fl_xid = vx_current_xid();
++ if (filp)
++ vxd_assert(filp->f_xid == fl->fl_xid,
++ "f_xid(%d) == fl_xid(%d)", filp->f_xid, fl->fl_xid);
+ error = lease_init(filp, type, fl);
+ if (error) {
+ locks_free_lock(fl);
+@@ -956,6 +972,7 @@ static int flock_lock_inode(struct inode
+ goto out;
}
-diff -NurpP --minimal linux-2.6.19.1/fs/ext3/ioctl.c linux-2.6.19.1-vs2.3.0.6/fs/ext3/ioctl.c
---- linux-2.6.19.1/fs/ext3/ioctl.c 2006-11-30 21:19:19 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/ext3/ioctl.c 2006-12-17 04:30:46 +0100
-@@ -8,6 +8,7 @@
- */
- #include <linux/fs.h>
-+#include <linux/mount.h>
- #include <linux/jbd.h>
- #include <linux/capability.h>
- #include <linux/ext3_fs.h>
-@@ -15,6 +16,7 @@
- #include <linux/time.h>
- #include <linux/compat.h>
- #include <linux/smp_lock.h>
-+#include <linux/vs_tag.h>
- #include <asm/uaccess.h>
++ new_fl->fl_xid = -1;
+ find_conflict:
+ list_for_each_entry(fl, &ctx->flc_flock, fl_list) {
+ if (!flock_locks_conflict(request, fl))
+@@ -984,7 +1001,7 @@ out:
+ }
- int ext3_ioctl (struct inode * inode, struct file * filp, unsigned int cmd,
-@@ -37,7 +39,8 @@ int ext3_ioctl (struct inode * inode, st
- unsigned int oldflags;
- unsigned int jflag;
+ static int posix_lock_inode(struct inode *inode, struct file_lock *request,
+- struct file_lock *conflock)
++ struct file_lock *conflock, vxid_t xid)
+ {
+ struct file_lock *fl, *tmp;
+ struct file_lock *new_fl = NULL;
+@@ -1000,6 +1017,9 @@ static int posix_lock_inode(struct inode
+ if (!ctx)
+ return (request->fl_type == F_UNLCK) ? 0 : -ENOMEM;
-- if (IS_RDONLY(inode))
-+ if (IS_RDONLY(inode) ||
-+ (filp && MNT_IS_RDONLY(filp->f_vfsmnt)))
- return -EROFS;
++ if (xid)
++ 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.
+@@ -1010,7 +1030,11 @@ static int posix_lock_inode(struct inode
+ (request->fl_type != F_UNLCK ||
+ request->fl_start != 0 || request->fl_end != OFFSET_MAX)) {
+ new_fl = locks_alloc_lock();
++ new_fl->fl_xid = xid;
++ // vx_locks_inc(new_fl);
+ new_fl2 = locks_alloc_lock();
++ new_fl2->fl_xid = xid;
++ // vx_locks_inc(new_fl2);
+ }
- if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
-@@ -61,7 +64,9 @@ int ext3_ioctl (struct inode * inode, st
- *
- * This test looks nicer. Thanks to Pauline Middelink
- */
-- if ((flags ^ oldflags) & (EXT3_APPEND_FL | EXT3_IMMUTABLE_FL)) {
-+ if ((oldflags & EXT3_IMMUTABLE_FL) ||
-+ ((flags ^ oldflags) & (EXT3_APPEND_FL |
-+ EXT3_IMMUTABLE_FL | EXT3_IUNLINK_FL))) {
- if (!capable(CAP_LINUX_IMMUTABLE)) {
- mutex_unlock(&inode->i_mutex);
- return -EPERM;
-@@ -123,7 +128,8 @@ flags_err:
+ percpu_down_read_preempt_disable(&file_rwsem);
+@@ -1216,7 +1240,7 @@ static int posix_lock_inode(struct inode
+ int posix_lock_file(struct file *filp, struct file_lock *fl,
+ struct file_lock *conflock)
+ {
+- return posix_lock_inode(locks_inode(filp), fl, conflock);
++ return posix_lock_inode(locks_inode(filp), fl, conflock, filp->f_xid);
+ }
+ EXPORT_SYMBOL(posix_lock_file);
- if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
- return -EPERM;
-- if (IS_RDONLY(inode))
-+ if (IS_RDONLY(inode) ||
-+ (filp && MNT_IS_RDONLY(filp->f_vfsmnt)))
- return -EROFS;
- if (get_user(generation, (int __user *) arg))
- return -EFAULT;
-@@ -177,7 +183,8 @@ flags_err:
- if (!test_opt(inode->i_sb, RESERVATION) ||!S_ISREG(inode->i_mode))
- return -ENOTTY;
-
-- if (IS_RDONLY(inode))
-+ if (IS_RDONLY(inode) ||
-+ (filp && MNT_IS_RDONLY(filp->f_vfsmnt)))
- return -EROFS;
-
- if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
-@@ -212,7 +219,8 @@ flags_err:
- if (!capable(CAP_SYS_RESOURCE))
- return -EPERM;
+@@ -1232,7 +1256,7 @@ static int posix_lock_inode_wait(struct
+ int error;
+ might_sleep ();
+ for (;;) {
+- error = posix_lock_inode(inode, fl, NULL);
++ error = posix_lock_inode(inode, fl, NULL, 0);
+ if (error != FILE_LOCK_DEFERRED)
+ break;
+ error = wait_event_interruptible(fl->fl_wait, !fl->fl_next);
+@@ -1308,10 +1332,13 @@ int locks_mandatory_area(struct inode *i
+ fl.fl_end = end;
-- if (IS_RDONLY(inode))
-+ if (IS_RDONLY(inode) ||
-+ (filp && MNT_IS_RDONLY(filp->f_vfsmnt)))
- return -EROFS;
+ for (;;) {
++ vxid_t f_xid = 0;
++
+ if (filp) {
+ fl.fl_owner = filp;
+ fl.fl_flags &= ~FL_SLEEP;
+- error = posix_lock_inode(inode, &fl, NULL);
++ f_xid = filp->f_xid;
++ error = posix_lock_inode(inode, &fl, NULL, f_xid);
+ if (!error)
+ break;
+ }
+@@ -1319,7 +1346,7 @@ int locks_mandatory_area(struct inode *i
+ if (sleep)
+ fl.fl_flags |= FL_SLEEP;
+ fl.fl_owner = current->files;
+- error = posix_lock_inode(inode, &fl, NULL);
++ error = posix_lock_inode(inode, &fl, NULL, f_xid);
+ if (error != FILE_LOCK_DEFERRED)
+ break;
+ error = wait_event_interruptible(fl.fl_wait, !fl.fl_next);
+@@ -2374,6 +2401,16 @@ int fcntl_setlk64(unsigned int fd, struc
+ if (file_lock == NULL)
+ return -ENOLCK;
- if (get_user(n_blocks_count, (__u32 __user *)arg))
-@@ -233,7 +241,8 @@ flags_err:
- if (!capable(CAP_SYS_RESOURCE))
- return -EPERM;
++ vxd_assert(filp->f_xid == vx_current_xid(),
++ "f_xid(%d) == current(%d)", filp->f_xid, vx_current_xid());
++ file_lock->fl_xid = filp->f_xid;
++ // vx_locks_inc(file_lock);
++
++ vxd_assert(filp->f_xid == vx_current_xid(),
++ "f_xid(%d) == current(%d)", filp->f_xid, vx_current_xid());
++ file_lock->fl_xid = filp->f_xid;
++ // vx_locks_inc(file_lock);
++
+ /*
+ * This might block, so we do it before checking the inode.
+ */
+@@ -2710,8 +2747,11 @@ static int locks_show(struct seq_file *f
-- if (IS_RDONLY(inode))
-+ if (IS_RDONLY(inode) ||
-+ (filp && MNT_IS_RDONLY(filp->f_vfsmnt)))
- return -EROFS;
+ lock_get_status(f, fl, iter->li_pos, "");
- if (copy_from_user(&input, (struct ext3_new_group_input __user *)arg,
-@@ -247,8 +256,6 @@ flags_err:
+- 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, iter->li_pos, " ->");
++ }
- return err;
- }
--
--
- default:
- return -ENOTTY;
- }
-diff -NurpP --minimal linux-2.6.19.1/fs/ext3/namei.c linux-2.6.19.1-vs2.3.0.6/fs/ext3/namei.c
---- linux-2.6.19.1/fs/ext3/namei.c 2006-11-30 21:19:19 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/ext3/namei.c 2006-11-30 18:53:18 +0100
-@@ -37,6 +37,7 @@
- #include <linux/buffer_head.h>
- #include <linux/bio.h>
- #include <linux/smp_lock.h>
+ return 0;
+ }
+diff -urNp -x '*.orig' linux-4.9/fs/mount.h linux-4.9/fs/mount.h
+--- linux-4.9/fs/mount.h 2021-02-24 15:47:32.287342339 +0100
++++ linux-4.9/fs/mount.h 2021-02-24 15:47:45.071075595 +0100
+@@ -69,6 +69,7 @@ struct mount {
+ struct hlist_head mnt_pins;
+ struct fs_pin mnt_umount;
+ struct dentry *mnt_ex_mountpoint;
++ vtag_t mnt_tag; /* tagging used for vfsmount */
+ };
+
+ #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
+diff -urNp -x '*.orig' linux-4.9/fs/namei.c linux-4.9/fs/namei.c
+--- linux-4.9/fs/namei.c 2021-02-24 15:47:32.290675776 +0100
++++ linux-4.9/fs/namei.c 2021-02-24 15:47:45.071075595 +0100
+@@ -37,9 +37,19 @@
+ #include <linux/hash.h>
+ #include <linux/bitops.h>
+ #include <linux/init_task.h>
++#include <linux/proc_fs.h>
++#include <linux/magic.h>
++#include <linux/vserver/inode.h>
++#include <linux/vs_base.h>
+#include <linux/vs_tag.h>
++#include <linux/vs_cowbl.h>
++#include <linux/vs_device.h>
++#include <linux/vs_context.h>
++#include <linux/pid_namespace.h>
+ #include <asm/uaccess.h>
- #include "namei.h"
- #include "xattr.h"
-@@ -1010,6 +1011,7 @@ static struct dentry *ext3_lookup(struct
+ #include "internal.h"
++#include "proc/internal.h"
+ #include "mount.h"
- if (!inode)
- return ERR_PTR(-EACCES);
-+ dx_propagate_tag(nd, inode);
- }
- return d_splice_alias(inode, dentry);
+ /* [Feb-1997 T. Schoebel-Theuer]
+@@ -286,6 +296,93 @@ static int check_acl(struct inode *inode
+ return -EAGAIN;
}
-@@ -2383,6 +2385,7 @@ struct inode_operations ext3_dir_inode_o
- .removexattr = generic_removexattr,
- #endif
- .permission = ext3_permission,
-+ .sync_flags = ext3_sync_flags,
- };
-
- struct inode_operations ext3_special_inode_operations = {
-@@ -2394,4 +2397,5 @@ struct inode_operations ext3_special_ino
- .removexattr = generic_removexattr,
- #endif
- .permission = ext3_permission,
-+ .sync_flags = ext3_sync_flags,
- };
-diff -NurpP --minimal linux-2.6.19.1/fs/ext3/super.c linux-2.6.19.1-vs2.3.0.6/fs/ext3/super.c
---- linux-2.6.19.1/fs/ext3/super.c 2006-11-30 21:19:19 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/ext3/super.c 2006-11-08 04:57:51 +0100
-@@ -605,12 +605,12 @@ static int ext3_write_dquot(struct dquot
- static int ext3_acquire_dquot(struct dquot *dquot);
- static int ext3_release_dquot(struct dquot *dquot);
- static int ext3_mark_dquot_dirty(struct dquot *dquot);
--static int ext3_write_info(struct super_block *sb, int type);
--static int ext3_quota_on(struct super_block *sb, int type, int format_id, char *path);
--static int ext3_quota_on_mount(struct super_block *sb, int type);
--static ssize_t ext3_quota_read(struct super_block *sb, int type, char *data,
-+static int ext3_write_info(struct dqhash *hash, int type);
-+static int ext3_quota_on(struct dqhash *hash, int type, int format_id, char *path);
-+static int ext3_quota_on_mount(struct dqhash *hash, int type);
-+static ssize_t ext3_quota_read(struct dqhash *hash, int type, char *data,
- size_t len, loff_t off);
--static ssize_t ext3_quota_write(struct super_block *sb, int type,
-+static ssize_t ext3_quota_write(struct dqhash *hash, int type,
- const char *data, size_t len, loff_t off);
-
- static struct dquot_operations ext3_quota_operations = {
-@@ -677,7 +677,7 @@ enum {
- Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
- Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_quota, Opt_noquota,
- Opt_ignore, Opt_barrier, Opt_err, Opt_resize, Opt_usrquota,
-- Opt_grpquota
-+ Opt_grpquota, Opt_tag, Opt_notag, Opt_tagid
- };
- static match_table_t tokens = {
-@@ -727,6 +727,10 @@ static match_table_t tokens = {
- {Opt_quota, "quota"},
- {Opt_usrquota, "usrquota"},
- {Opt_barrier, "barrier=%u"},
-+ {Opt_tag, "tag"},
-+ {Opt_notag, "notag"},
-+ {Opt_tagid, "tagid=%u"},
-+ {Opt_tag, "tagxid"},
- {Opt_err, NULL},
- {Opt_resize, "resize"},
- };
-@@ -820,6 +824,20 @@ static int parse_options (char *options,
- case Opt_nouid32:
- set_opt (sbi->s_mount_opt, NO_UID32);
- break;
-+#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;
-+#endif
-+#ifdef CONFIG_PROPAGATE
-+ case Opt_tagid:
-+ /* use args[0] */
-+ set_opt (sbi->s_mount_opt, TAGGED);
-+ break;
-+#endif
- case Opt_nocheck:
- clear_opt (sbi->s_mount_opt, CHECK);
- break;
-@@ -938,7 +956,7 @@ static int parse_options (char *options,
- case Opt_grpjquota:
- qtype = GRPQUOTA;
- set_qf_name:
-- if (sb_any_quota_enabled(sb)) {
-+ if (dqh_any_quota_enabled(sb->s_dqh)) {
- printk(KERN_ERR
- "EXT3-fs: Cannot change journalled "
- "quota options when quota turned on.\n");
-@@ -976,7 +994,7 @@ set_qf_name:
- case Opt_offgrpjquota:
- qtype = GRPQUOTA;
- clear_qf_name:
-- if (sb_any_quota_enabled(sb)) {
-+ if (dqh_any_quota_enabled(sb->s_dqh)) {
- printk(KERN_ERR "EXT3-fs: Cannot change "
- "journalled quota options when "
- "quota turned on.\n");
-@@ -1004,7 +1022,7 @@ clear_qf_name:
- set_opt(sbi->s_mount_opt, GRPQUOTA);
- break;
- case Opt_noquota:
-- if (sb_any_quota_enabled(sb)) {
-+ if (dqh_any_quota_enabled(sb->s_dqh)) {
- printk(KERN_ERR "EXT3-fs: Cannot change quota "
- "options when quota turned on.\n");
- return 0;
-@@ -1284,7 +1302,7 @@ static void ext3_orphan_cleanup (struct
- /* Turn on quotas so that they are updated correctly */
- for (i = 0; i < MAXQUOTAS; i++) {
- if (EXT3_SB(sb)->s_qf_names[i]) {
-- int ret = ext3_quota_on_mount(sb, i);
-+ int ret = ext3_quota_on_mount(sb->s_dqh, i);
- if (ret < 0)
- printk(KERN_ERR
- "EXT3-fs: Cannot turn on journalled "
-@@ -1334,8 +1352,8 @@ static void ext3_orphan_cleanup (struct
- #ifdef CONFIG_QUOTA
- /* Turn quotas off */
- for (i = 0; i < MAXQUOTAS; i++) {
-- if (sb_dqopt(sb)->files[i])
-- vfs_quota_off(sb, i);
-+ if (dqh_dqopt(sb->s_dqh)->files[i])
-+ vfs_quota_off(sb->s_dqh, i);
- }
- #endif
- sb->s_flags = s_flags; /* Restore MS_RDONLY status */
-@@ -1482,6 +1500,9 @@ static int ext3_fill_super (struct super
- NULL, 0))
- goto failed_mount;
-
-+ if (EXT3_SB(sb)->s_mount_opt & EXT3_MOUNT_TAGGED)
-+ sb->s_flags |= MS_TAGGED;
-+
- sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
- ((sbi->s_mount_opt & EXT3_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
-
-@@ -1687,8 +1708,8 @@ static int ext3_fill_super (struct super
- sb->s_export_op = &ext3_export_ops;
- sb->s_xattr = ext3_xattr_handlers;
- #ifdef CONFIG_QUOTA
-- sb->s_qcop = &ext3_qctl_operations;
-- sb->dq_op = &ext3_quota_operations;
-+ sb->s_dqh->dqh_qop = &ext3_quota_operations;
-+ sb->s_dqh->dqh_qcop = &ext3_qctl_operations;
- #endif
- INIT_LIST_HEAD(&sbi->s_orphan); /* unlinked but open files */
-
-@@ -2297,6 +2318,12 @@ static int ext3_remount (struct super_bl
-
- if (sbi->s_mount_opt & EXT3_MOUNT_ABORT)
- ext3_abort(sb, __FUNCTION__, "Abort forced by user");
-+ if ((sbi->s_mount_opt & EXT3_MOUNT_TAGGED) &&
-+ !(sb->s_flags & MS_TAGGED)) {
-+ printk("EXT3-fs: %s: tagging not permitted on remount.\n",
-+ sb->s_id);
-+ return -EINVAL;
++static inline int dx_barrier(const struct inode *inode)
++{
++ if (IS_BARRIER(inode) && !vx_check(0, VS_ADMIN | VS_WATCH)) {
++ vxwprintk_task(1, "did hit the barrier.");
++ return 1;
+ }
-
- sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
- ((sbi->s_mount_opt & EXT3_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
-@@ -2450,7 +2477,7 @@ static int ext3_statfs (struct dentry *
-
- static inline struct inode *dquot_to_inode(struct dquot *dquot)
- {
-- return sb_dqopt(dquot->dq_sb)->files[dquot->dq_type];
-+ return dqh_dqopt(dquot->dq_dqh)->files[dquot->dq_type];
- }
-
- static int ext3_dquot_initialize(struct inode *inode, int type)
-@@ -2493,7 +2520,7 @@ static int ext3_write_dquot(struct dquot
-
- inode = dquot_to_inode(dquot);
- handle = ext3_journal_start(inode,
-- EXT3_QUOTA_TRANS_BLOCKS(dquot->dq_sb));
-+ EXT3_QUOTA_TRANS_BLOCKS(dquot->dq_dqh->dqh_sb));
- if (IS_ERR(handle))
- return PTR_ERR(handle);
- ret = dquot_commit(dquot);
-@@ -2509,7 +2536,7 @@ static int ext3_acquire_dquot(struct dqu
- handle_t *handle;
-
- handle = ext3_journal_start(dquot_to_inode(dquot),
-- EXT3_QUOTA_INIT_BLOCKS(dquot->dq_sb));
-+ EXT3_QUOTA_INIT_BLOCKS(dquot->dq_dqh->dqh_sb));
- if (IS_ERR(handle))
- return PTR_ERR(handle);
- ret = dquot_acquire(dquot);
-@@ -2525,7 +2552,7 @@ static int ext3_release_dquot(struct dqu
- handle_t *handle;
-
- handle = ext3_journal_start(dquot_to_inode(dquot),
-- EXT3_QUOTA_DEL_BLOCKS(dquot->dq_sb));
-+ EXT3_QUOTA_DEL_BLOCKS(dquot->dq_dqh->dqh_sb));
- if (IS_ERR(handle))
- return PTR_ERR(handle);
- ret = dquot_release(dquot);
-@@ -2538,8 +2565,8 @@ static int ext3_release_dquot(struct dqu
- static int ext3_mark_dquot_dirty(struct dquot *dquot)
- {
- /* Are we journalling quotas? */
-- if (EXT3_SB(dquot->dq_sb)->s_qf_names[USRQUOTA] ||
-- EXT3_SB(dquot->dq_sb)->s_qf_names[GRPQUOTA]) {
-+ if (EXT3_SB(dquot->dq_dqh->dqh_sb)->s_qf_names[USRQUOTA] ||
-+ EXT3_SB(dquot->dq_dqh->dqh_sb)->s_qf_names[GRPQUOTA]) {
- dquot_mark_dquot_dirty(dquot);
- return ext3_write_dquot(dquot);
- } else {
-@@ -2547,8 +2574,9 @@ static int ext3_mark_dquot_dirty(struct
- }
- }
-
--static int ext3_write_info(struct super_block *sb, int type)
-+static int ext3_write_info(struct dqhash *hash, int type)
- {
-+ struct super_block *sb = hash->dqh_sb;
- int ret, err;
- handle_t *handle;
-
-@@ -2556,7 +2584,7 @@ static int ext3_write_info(struct super_
- handle = ext3_journal_start(sb->s_root->d_inode, 2);
- if (IS_ERR(handle))
- return PTR_ERR(handle);
-- ret = dquot_commit_info(sb, type);
-+ ret = dquot_commit_info(hash, type);
- err = ext3_journal_stop(handle);
- if (!ret)
- ret = err;
-@@ -2567,18 +2595,20 @@ static int ext3_write_info(struct super_
- * Turn on quotas during mount time - we need to find
- * the quota file and such...
- */
--static int ext3_quota_on_mount(struct super_block *sb, int type)
-+static int ext3_quota_on_mount(struct dqhash *hash, int type)
- {
-- return vfs_quota_on_mount(sb, EXT3_SB(sb)->s_qf_names[type],
-- EXT3_SB(sb)->s_jquota_fmt, type);
-+ return vfs_quota_on_mount(hash,
-+ EXT3_SB(hash->dqh_sb)->s_qf_names[type],
-+ EXT3_SB(hash->dqh_sb)->s_jquota_fmt, type);
- }
-
- /*
- * Standard function to be called on quota_on
- */
--static int ext3_quota_on(struct super_block *sb, int type, int format_id,
-+static int ext3_quota_on(struct dqhash *hash, int type, int format_id,
- char *path)
- {
-+ struct super_block *sb = hash->dqh_sb;
- int err;
- struct nameidata nd;
-
-@@ -2587,7 +2617,7 @@ static int ext3_quota_on(struct super_bl
- /* Not journalling quota? */
- if (!EXT3_SB(sb)->s_qf_names[USRQUOTA] &&
- !EXT3_SB(sb)->s_qf_names[GRPQUOTA])
-- return vfs_quota_on(sb, type, format_id, path);
-+ return vfs_quota_on(hash, type, format_id, path);
- err = path_lookup(path, LOOKUP_FOLLOW, &nd);
- if (err)
- return err;
-@@ -2602,17 +2632,18 @@ static int ext3_quota_on(struct super_bl
- "EXT3-fs: Quota file not on filesystem root. "
- "Journalled quota will not work.\n");
- path_release(&nd);
-- return vfs_quota_on(sb, type, format_id, path);
-+ return vfs_quota_on(hash, type, format_id, path);
- }
-
- /* Read data from quotafile - avoid pagecache and such because we cannot afford
- * acquiring the locks... As quota files are never truncated and quota code
- * itself serializes the operations (and noone else should touch the files)
- * we don't have to be afraid of races */
--static ssize_t ext3_quota_read(struct super_block *sb, int type, char *data,
-+static ssize_t ext3_quota_read(struct dqhash *hash, int type, char *data,
- size_t len, loff_t off)
- {
-- struct inode *inode = sb_dqopt(sb)->files[type];
-+ struct inode *inode = dqh_dqopt(hash)->files[type];
-+ struct super_block *sb = hash->dqh_sb;
- sector_t blk = off >> EXT3_BLOCK_SIZE_BITS(sb);
- int err = 0;
- int offset = off & (sb->s_blocksize - 1);
-@@ -2647,10 +2678,11 @@ static ssize_t ext3_quota_read(struct su
-
- /* Write to quotafile (we know the transaction is already started and has
- * enough credits) */
--static ssize_t ext3_quota_write(struct super_block *sb, int type,
-+static ssize_t ext3_quota_write(struct dqhash *hash, int type,
- const char *data, size_t len, loff_t off)
- {
-- struct inode *inode = sb_dqopt(sb)->files[type];
-+ struct inode *inode = dqh_dqopt(hash)->files[type];
-+ struct super_block *sb = hash->dqh_sb;
- sector_t blk = off >> EXT3_BLOCK_SIZE_BITS(sb);
- int err = 0;
- int offset = off & (sb->s_blocksize - 1);
-diff -NurpP --minimal linux-2.6.19.1/fs/ext3/symlink.c linux-2.6.19.1-vs2.3.0.6/fs/ext3/symlink.c
---- linux-2.6.19.1/fs/ext3/symlink.c 2005-08-29 22:25:30 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/fs/ext3/symlink.c 2006-11-08 04:57:46 +0100
-@@ -40,6 +40,7 @@ struct inode_operations ext3_symlink_ino
- .listxattr = ext3_listxattr,
- .removexattr = generic_removexattr,
- #endif
-+ .sync_flags = ext3_sync_flags,
- };
-
- struct inode_operations ext3_fast_symlink_inode_operations = {
-@@ -51,4 +52,5 @@ struct inode_operations ext3_fast_symlin
- .listxattr = ext3_listxattr,
- .removexattr = generic_removexattr,
- #endif
-+ .sync_flags = ext3_sync_flags,
- };
-diff -NurpP --minimal linux-2.6.19.1/fs/ext3/xattr.c linux-2.6.19.1-vs2.3.0.6/fs/ext3/xattr.c
---- linux-2.6.19.1/fs/ext3/xattr.c 2006-11-30 21:19:19 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/ext3/xattr.c 2006-11-08 04:57:50 +0100
-@@ -58,6 +58,7 @@
- #include <linux/mbcache.h>
- #include <linux/quotaops.h>
- #include <linux/rwsem.h>
-+#include <linux/vs_dlimit.h>
- #include "xattr.h"
- #include "acl.h"
-
-@@ -495,6 +496,7 @@ ext3_xattr_release_block(handle_t *handl
- ext3_journal_dirty_metadata(handle, bh);
- if (IS_SYNC(inode))
- handle->h_sync = 1;
-+ DLIMIT_FREE_BLOCK(inode, 1);
- DQUOT_FREE_BLOCK(inode, 1);
- unlock_buffer(bh);
- ea_bdebug(bh, "refcount now=%d; releasing",
-@@ -763,11 +765,14 @@ inserted:
- if (new_bh == bs->bh)
- ea_bdebug(new_bh, "keeping");
- else {
-+ error = -ENOSPC;
-+ if (DLIMIT_ALLOC_BLOCK(inode, 1))
-+ goto cleanup;
- /* The old block is released after updating
- the inode. */
- error = -EDQUOT;
- if (DQUOT_ALLOC_BLOCK(inode, 1))
-- goto cleanup;
-+ goto cleanup_dlimit;
- error = ext3_journal_get_write_access(handle,
- new_bh);
- if (error)
-@@ -844,6 +849,8 @@ cleanup:
-
- cleanup_dquot:
- DQUOT_FREE_BLOCK(inode, 1);
-+cleanup_dlimit:
-+ DLIMIT_FREE_BLOCK(inode, 1);
- goto cleanup;
-
- bad_block:
-diff -NurpP --minimal linux-2.6.19.1/fs/ext4/balloc.c linux-2.6.19.1-vs2.3.0.6/fs/ext4/balloc.c
---- linux-2.6.19.1/fs/ext4/balloc.c 2006-11-30 21:19:19 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/ext4/balloc.c 2006-12-02 01:51:51 +0100
-@@ -19,6 +19,8 @@
- #include <linux/ext4_jbd2.h>
- #include <linux/quotaops.h>
- #include <linux/buffer_head.h>
-+#include <linux/vs_dlimit.h>
-+#include <linux/vs_tag.h>
-
- /*
- * balloc.c contains the blocks allocation and deallocation routines
-@@ -630,8 +632,10 @@ void ext4_free_blocks(handle_t *handle,
- return;
- }
- ext4_free_blocks_sb(handle, sb, block, count, &dquot_freed_blocks);
-- if (dquot_freed_blocks)
-+ if (dquot_freed_blocks) {
-+ DLIMIT_FREE_BLOCK(inode, dquot_freed_blocks);
- DQUOT_FREE_BLOCK(inode, dquot_freed_blocks);
++ return 0;
++}
++
++static int __dx_permission(const struct inode *inode, int mask)
++{
++ if (dx_barrier(inode))
++ return -EACCES;
++
++ if (inode->i_sb->s_magic == DEVPTS_SUPER_MAGIC) {
++ /* devpts is xid tagged */
++ if (S_ISDIR(inode->i_mode) ||
++ vx_check((vxid_t)i_tag_read(inode), VS_IDENT | VS_WATCH_P))
++ return 0;
++
++ /* just pretend we didn't find anything */
++ return -ENOENT;
+ }
- return;
- }
-
-@@ -1366,18 +1370,33 @@ out:
- *
- * Check if filesystem has at least 1 free block available for allocation.
- */
--static int ext4_has_free_blocks(struct ext4_sb_info *sbi)
-+static int ext4_has_free_blocks(struct super_block *sb)
- {
-- ext4_fsblk_t free_blocks, root_blocks;
-+ struct ext4_sb_info *sbi = EXT4_SB(sb);
-+ ext4_fsblk_t free_blocks, root_blocks;
-+ int cond;
-
- free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
- root_blocks = ext4_r_blocks_count(sbi->s_es);
-- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
++ else if (inode->i_sb->s_magic == PROC_SUPER_MAGIC) {
++ struct proc_dir_entry *de = PDE(inode);
+
-+ vxdprintk(VXD_CBIT(dlim, 3),
-+ "ext4_has_free_blocks(%p): free=%llu, root=%llu",
-+ sb, free_blocks, root_blocks);
++ 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;
++ }
+
-+ DLIMIT_ADJUST_BLOCK(sb, dx_current_tag(), &free_blocks, &root_blocks);
++ if ((mask & (MAY_WRITE | MAY_APPEND))) {
++ struct pid *pid;
++ struct task_struct *tsk;
+
-+ cond = (free_blocks < root_blocks + 1 &&
-+ !capable(CAP_SYS_RESOURCE) &&
- sbi->s_resuid != current->fsuid &&
-- (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
-- return 0;
-- }
-- return 1;
-+ (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid)));
++ if (vx_check(0, VS_ADMIN | VS_WATCH_P) ||
++ vx_flags(VXF_STATE_SETUP, 0))
++ return 0;
+
-+ vxdprintk(VXD_CBIT(dlim, 3),
-+ "ext4_has_free_blocks(%p): %llu<%llu+1, %c, %u!=%u r=%d",
-+ sb, free_blocks, root_blocks,
-+ !capable(CAP_SYS_RESOURCE)?'1':'0',
-+ sbi->s_resuid, current->fsuid, cond?0:1);
++ pid = PROC_I(inode)->pid;
++ if (!pid)
++ goto out;
+
-+ return (cond ? 0 : 1);
- }
-
- /**
-@@ -1394,7 +1413,7 @@ static int ext4_has_free_blocks(struct e
++ 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)) {
++ rcu_read_unlock();
++ return 0;
++ }
++ rcu_read_unlock();
++ }
++ else {
++ /* FIXME: Should we block some entries here? */
++ return 0;
++ }
++ }
++ else {
++ if (dx_notagcheck(inode->i_sb) ||
++ dx_check((vxid_t)i_tag_read(inode),
++ DX_HOSTID | DX_ADMIN | DX_WATCH | DX_IDENT))
++ return 0;
++ }
++
++out:
++ return -EACCES;
++}
++
++int dx_permission(const struct inode *inode, int mask)
++{
++ int ret = __dx_permission(inode, mask);
++ if (unlikely(ret)) {
++#ifndef CONFIG_VSERVER_WARN_DEVPTS
++ if (inode->i_sb->s_magic != DEVPTS_SUPER_MAGIC)
++#endif
++ vxwprintk_task(1,
++ "denied [0x%x] access to inode %s:%p[#%d,%lu]",
++ mask, inode->i_sb->s_id, inode,
++ i_tag_read(inode), inode->i_ino);
++ }
++ return ret;
++}
++
+ /*
+ * This does the basic permission checking
*/
- int ext4_should_retry_alloc(struct super_block *sb, int *retries)
- {
-- if (!ext4_has_free_blocks(EXT4_SB(sb)) || (*retries)++ > 3)
-+ if (!ext4_has_free_blocks(sb) || (*retries)++ > 3)
- return 0;
+@@ -410,7 +507,7 @@ int __inode_permission(struct inode *ino
+ /*
+ * Nobody gets write access to an immutable file.
+ */
+- if (IS_IMMUTABLE(inode))
++ if (IS_IMMUTABLE(inode) && !IS_COW(inode))
+ return -EPERM;
- jbd_debug(1, "%s: retrying operation after ENOSPC\n", sb->s_id);
-@@ -1457,6 +1476,8 @@ ext4_fsblk_t ext4_new_blocks(handle_t *h
- *errp = -EDQUOT;
- return 0;
- }
-+ if (DLIMIT_ALLOC_BLOCK(inode, 1))
-+ goto out_dlimit;
-
- sbi = EXT4_SB(sb);
- es = EXT4_SB(sb)->s_es;
-@@ -1473,7 +1494,7 @@ ext4_fsblk_t ext4_new_blocks(handle_t *h
- if (block_i && ((windowsz = block_i->rsv_window_node.rsv_goal_size) > 0))
- my_rsv = &block_i->rsv_window_node;
-
-- if (!ext4_has_free_blocks(sbi)) {
-+ if (!ext4_has_free_blocks(sb)) {
- *errp = -ENOSPC;
- goto out;
+ /*
+@@ -422,6 +519,10 @@ int __inode_permission(struct inode *ino
+ return -EACCES;
}
-@@ -1664,6 +1685,9 @@ allocated:
- io_error:
- *errp = -EIO;
- out:
-+ if (!performed_allocation)
-+ DLIMIT_FREE_BLOCK(inode, 1);
-+out_dlimit:
- if (fatal) {
- *errp = fatal;
- ext4_std_error(sb, fatal);
-diff -NurpP --minimal linux-2.6.19.1/fs/ext4/file.c linux-2.6.19.1-vs2.3.0.6/fs/ext4/file.c
---- linux-2.6.19.1/fs/ext4/file.c 2006-11-30 21:19:19 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/ext4/file.c 2006-12-01 23:01:47 +0100
-@@ -121,6 +121,7 @@ const struct file_operations ext4_file_o
- .release = ext4_release_file,
- .fsync = ext4_sync_file,
- .sendfile = generic_file_sendfile,
-+ .sendpage = generic_file_sendpage,
- .splice_read = generic_file_splice_read,
- .splice_write = generic_file_splice_write,
- };
-@@ -135,5 +136,6 @@ struct inode_operations ext4_file_inode_
- .removexattr = generic_removexattr,
- #endif
- .permission = ext4_permission,
-+ .sync_flags = ext4_sync_flags,
- };
-diff -NurpP --minimal linux-2.6.19.1/fs/ext4/ialloc.c linux-2.6.19.1-vs2.3.0.6/fs/ext4/ialloc.c
---- linux-2.6.19.1/fs/ext4/ialloc.c 2006-11-30 21:19:20 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/ext4/ialloc.c 2006-12-01 23:07:02 +0100
-@@ -24,6 +24,8 @@
- #include <linux/random.h>
- #include <linux/bitops.h>
- #include <linux/blkdev.h>
-+#include <linux/vs_dlimit.h>
-+#include <linux/vs_tag.h>
- #include <asm/byteorder.h>
++ retval = dx_permission(inode, mask);
++ if (retval)
++ return retval;
++
+ retval = do_inode_permission(inode, mask);
+ if (retval)
+ return retval;
+@@ -2825,7 +2926,7 @@ static int may_delete(struct inode *dir,
+ return -EPERM;
- #include "xattr.h"
-@@ -127,6 +129,7 @@ void ext4_free_inode (handle_t *handle,
- ext4_xattr_delete_inode(handle, inode);
- DQUOT_FREE_INODE(inode);
- DQUOT_DROP(inode);
-+ DLIMIT_FREE_INODE(inode);
+ if (check_sticky(dir, inode) || IS_APPEND(inode) ||
+- IS_IMMUTABLE(inode) || IS_SWAPFILE(inode) || HAS_UNMAPPED_ID(inode))
++ IS_IXORUNLINK(inode) || IS_SWAPFILE(inode) || HAS_UNMAPPED_ID(inode))
+ return -EPERM;
+ if (isdir) {
+ if (!d_is_dir(victim))
+@@ -2913,19 +3014,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;
++ }
- is_directory = S_ISDIR(inode->i_mode);
+ 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);
+@@ -2963,6 +3070,15 @@ static int may_open(struct path *path, i
+ break;
+ }
-@@ -448,6 +451,12 @@ struct inode *ext4_new_inode(handle_t *h
- inode = new_inode(sb);
- if (!inode)
- return ERR_PTR(-ENOMEM);
-+
-+ inode->i_tag = dx_current_fstag(sb);
-+ if (DLIMIT_ALLOC_INODE(inode)) {
-+ err = -ENOSPC;
-+ goto out_dlimit;
++#ifdef CONFIG_VSERVER_COWBL
++ if (IS_COW(inode) &&
++ ((flag & O_ACCMODE) != O_RDONLY)) {
++ if (IS_COW_LINK(inode))
++ return -EMLINK;
++ inode->i_flags &= ~(S_IXUNLINK|S_IMMUTABLE);
++ mark_inode_dirty(inode);
++ }
++#endif
+ error = inode_permission(inode, MAY_OPEN | acc_mode);
+ if (error)
+ return error;
+@@ -3423,6 +3539,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(nd->name->name);
++ if (IS_ERR(dentry))
++ error = PTR_ERR(dentry);
++ else
++ dput(dentry);
++ }
++#endif
+ if (error)
+ goto out;
+ BUG_ON(*opened & FILE_OPENED); /* once it's opened, it's opened */
+@@ -3526,6 +3652,9 @@ static struct file *path_openat(struct n
+ int opened = 0;
+ int error;
+
++#ifdef CONFIG_VSERVER_COWBL
++restart:
++#endif
+ file = get_empty_filp();
+ if (IS_ERR(file))
+ return file;
+@@ -3559,6 +3688,12 @@ static struct file *path_openat(struct n
+ }
+ }
+ terminate_walk(nd);
++#ifdef CONFIG_VSERVER_COWBL
++ if (error == -EMLINK) {
++ // path_cleanup(nd);
++ goto restart;
+ }
- ei = EXT4_I(inode);
-
- sbi = EXT4_SB(sb);
-@@ -569,7 +578,8 @@ got:
- ei->i_dir_start_lookup = 0;
- ei->i_disksize = 0;
-
-- ei->i_flags = EXT4_I(dir)->i_flags & ~EXT4_INDEX_FL;
-+ ei->i_flags = EXT4_I(dir)->i_flags &
-+ ~(EXT4_INDEX_FL|EXT4_IUNLINK_FL|EXT4_BARRIER_FL);
- if (S_ISLNK(mode))
- ei->i_flags &= ~(EXT4_IMMUTABLE_FL|EXT4_APPEND_FL);
- /* dirsync only applies to directories */
-@@ -635,6 +645,8 @@ got:
++#endif
+ out2:
+ if (!(opened & FILE_OPENED)) {
+ BUG_ON(!error);
+@@ -3679,6 +3814,11 @@ static struct dentry *filename_create(in
+ goto fail;
+ }
+ putname(name);
++ vxdprintk(VXD_CBIT(misc, 3), "filename_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:
- ext4_std_error(sb, err);
+ dput(dentry);
+@@ -3797,6 +3937,7 @@ retry:
+ error = vfs_mknod(path.dentry->d_inode,dentry,mode,0);
+ break;
+ }
++
out:
-+ DLIMIT_FREE_INODE(inode);
-+out_dlimit:
- iput(inode);
- ret = ERR_PTR(err);
- really_out:
-@@ -646,6 +658,7 @@ fail_free_drop:
-
- fail_drop:
- DQUOT_DROP(inode);
-+ DLIMIT_FREE_INODE(inode);
- inode->i_flags |= S_NOQUOTA;
- inode->i_nlink = 0;
- iput(inode);
-diff -NurpP --minimal linux-2.6.19.1/fs/ext4/inode.c linux-2.6.19.1-vs2.3.0.6/fs/ext4/inode.c
---- linux-2.6.19.1/fs/ext4/inode.c 2006-11-30 21:19:20 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/ext4/inode.c 2006-12-01 23:01:47 +0100
-@@ -37,6 +37,7 @@
- #include <linux/mpage.h>
- #include <linux/uio.h>
- #include <linux/bio.h>
-+#include <linux/vs_tag.h>
- #include "xattr.h"
- #include "acl.h"
-
-@@ -2245,7 +2246,7 @@ void ext4_truncate(struct inode *inode)
- return;
- if (ext4_inode_is_fast_symlink(inode))
- return;
+ done_path_create(&path, dentry);
+ if (retry_estale(error, lookup_flags)) {
+@@ -4218,7 +4359,7 @@ int vfs_link(struct dentry *old_dentry,
+ /*
+ * A link to an append-only or immutable file cannot be created.
+ */
- if (IS_APPEND(inode) || IS_IMMUTABLE(inode))
+ if (IS_APPEND(inode) || IS_IXORUNLINK(inode))
- return;
-
+ return -EPERM;
/*
-@@ -2571,19 +2572,77 @@ void ext4_set_inode_flags(struct inode *
- {
- unsigned int flags = EXT4_I(inode)->i_flags;
+ * Updating the link count will likely cause i_uid and i_gid to
+@@ -4748,6 +4889,326 @@ const char *vfs_get_link(struct dentry *
+ }
+ EXPORT_SYMBOL(vfs_get_link);
-- inode->i_flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC);
-+ inode->i_flags &= ~(S_IMMUTABLE | S_IUNLINK | S_BARRIER |
-+ S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
+
-+ if (flags & EXT4_IMMUTABLE_FL)
-+ inode->i_flags |= S_IMMUTABLE;
-+ if (flags & EXT4_IUNLINK_FL)
-+ inode->i_flags |= S_IUNLINK;
-+ if (flags & EXT4_BARRIER_FL)
-+ inode->i_flags |= S_BARRIER;
++#ifdef CONFIG_VSERVER_COWBL
+
- if (flags & EXT4_SYNC_FL)
- inode->i_flags |= S_SYNC;
- if (flags & EXT4_APPEND_FL)
- inode->i_flags |= S_APPEND;
-- if (flags & EXT4_IMMUTABLE_FL)
-- inode->i_flags |= S_IMMUTABLE;
- if (flags & EXT4_NOATIME_FL)
- inode->i_flags |= S_NOATIME;
- if (flags & EXT4_DIRSYNC_FL)
- inode->i_flags |= S_DIRSYNC;
- }
-
-+int ext4_sync_flags(struct inode *inode)
-+{
-+ unsigned int oldflags, newflags;
-+ int err = 0;
-+
-+ oldflags = EXT4_I(inode)->i_flags;
-+ newflags = oldflags & ~(EXT4_APPEND_FL |
-+ EXT4_IMMUTABLE_FL | EXT4_IUNLINK_FL |
-+ EXT4_BARRIER_FL | EXT4_NOATIME_FL |
-+ EXT4_SYNC_FL | EXT4_DIRSYNC_FL);
-+
-+ if (IS_APPEND(inode))
-+ newflags |= EXT4_APPEND_FL;
-+ if (IS_IMMUTABLE(inode))
-+ newflags |= EXT4_IMMUTABLE_FL;
-+ if (IS_IUNLINK(inode))
-+ newflags |= EXT4_IUNLINK_FL;
-+ if (IS_BARRIER(inode))
-+ newflags |= EXT4_BARRIER_FL;
-+
-+ /* we do not want to copy superblock flags */
-+ if (inode->i_flags & S_NOATIME)
-+ newflags |= EXT4_NOATIME_FL;
-+ if (inode->i_flags & S_SYNC)
-+ newflags |= EXT4_SYNC_FL;
-+ if (inode->i_flags & S_DIRSYNC)
-+ newflags |= EXT4_DIRSYNC_FL;
-+
-+ if (oldflags ^ newflags) {
-+ handle_t *handle;
-+ struct ext4_iloc iloc;
-+
-+ handle = ext4_journal_start(inode, 1);
-+ if (IS_ERR(handle))
-+ return PTR_ERR(handle);
-+ if (IS_SYNC(inode))
-+ handle->h_sync = 1;
-+ err = ext4_reserve_inode_write(handle, inode, &iloc);
-+ if (err)
-+ goto flags_err;
-+
-+ EXT4_I(inode)->i_flags = newflags;
-+ inode->i_ctime = CURRENT_TIME;
-+
-+ err = ext4_mark_iloc_dirty(handle, inode, &iloc);
-+ flags_err:
-+ ext4_journal_stop(handle);
-+ }
-+ return err;
++static inline
++void dump_path(const char *name, struct path *path)
++{
++ vxdprintk(VXD_CBIT(misc, 3),
++ "%s: path=%p mnt=%p dentry=%p", name, path,
++ path ? path->mnt : NULL,
++ path ? path->dentry : NULL);
++
++ if (path && path->mnt)
++ vxdprintk(VXD_CBIT(misc, 3),
++ "%s: path mnt_sb=%p[#%d,#%d] mnt_root=%p[#%d]", name,
++ path->mnt->mnt_sb,
++ path->mnt->mnt_sb ? path->mnt->mnt_sb->s_count : -1,
++ path->mnt->mnt_sb ? atomic_read(&path->mnt->mnt_sb->s_active) : -1,
++ path->mnt->mnt_root,
++ path->mnt->mnt_root ? path->mnt->mnt_root->d_lockref.count : -1);
++
++ if (path && path->dentry)
++ vxdprintk(VXD_CBIT(misc, 3),
++ "%s: path dentry=%p[#%d]", name,
++ path->dentry,
++ path->dentry ? path->dentry->d_lockref.count : -1);
+}
+
- void ext4_read_inode(struct inode * inode)
++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, &opos, len, 0);
++}
++
++struct dentry *cow_break_link(const char *pathname)
++{
++ int ret, mode, pathlen, redo = 0, drop = 1;
++ struct path old_path = {}, par_path = {}, dir_path = {}, *new_path = NULL;
++ struct dentry *dir, *old_dentry, *new_dentry = NULL;
++ struct file *old_file;
++ struct file *new_file;
++ struct qstr new_qstr;
++ int new_type;
++ char *to, *path, pad='\251';
++ loff_t size;
++ struct filename *filename = getname_kernel(pathname);
++ struct filename *to_filename;
++
++ vxdprintk(VXD_CBIT(misc, 1),
++ "cow_break_link(" VS_Q("%s") ")", pathname);
++
++ path = kmalloc(PATH_MAX, GFP_KERNEL);
++ ret = -ENOMEM;
++ if (!path || IS_ERR(filename))
++ goto out;
++
++ /* old_path will have refs to dentry and mnt */
++ ret = filename_lookup(AT_FDCWD, filename, LOOKUP_FOLLOW, &old_path, NULL);
++ vxdprintk(VXD_CBIT(misc, 2),
++ "do_path_lookup(old): %d", ret);
++ if (ret < 0)
++ goto out_free_path;
++
++ dump_path("cow (old)", &old_path);
++
++ /* no explicit reference for old_dentry here */
++ old_dentry = old_path.dentry;
++
++ 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") " [%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 = -ELOOP;
++ if (pad <= '\240')
++ goto out_rel_old;
++
++ vxdprintk(VXD_CBIT(misc, 1), "temp copy " VS_Q("%s"), to);
++
++ /* dir_path will have refs to dentry and mnt */
++ to_filename = getname_kernel(to);
++ to_filename = filename_parentat(AT_FDCWD, to_filename,
++ LOOKUP_PARENT | LOOKUP_OPEN | LOOKUP_CREATE, &par_path, &new_qstr, &new_type);
++ vxdprintk(VXD_CBIT(misc, 2), "filename_parentat(new): %p", to_filename);
++ dump_path("cow (par)", &par_path);
++ if (IS_ERR(to_filename))
++ goto retry;
++
++ vxdprintk(VXD_CBIT(misc, 2), "to_filename refcnt=%d", to_filename->refcnt);
++
++ /* 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 = filename_create(AT_FDCWD, to_filename, &dir_path, 0);
++ if (!new_dentry || IS_ERR(new_dentry)) {
++ path_put(&par_path);
++ vxdprintk(VXD_CBIT(misc, 2),
++ "filename_create(new) failed with %ld",
++ PTR_ERR(new_dentry));
++ goto retry;
++ }
++ vxdprintk(VXD_CBIT(misc, 2),
++ "filename_create(new): %p [" VS_Q("%.*s") ":%d]",
++ new_dentry,
++ new_dentry->d_name.len, new_dentry->d_name.name,
++ new_dentry->d_name.len);
++
++ dump_path("cow (dir)", &dir_path);
++
++ /* 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 = par_path.dentry;
++
++ /* 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) {
++ path_put(&par_path);
++ inode_unlock(dir->d_inode);
++ mnt_drop_write(new_path->mnt);
++ path_put(new_path);
++ new_dentry = NULL;
++ goto retry;
++ }
++ else if (ret < 0)
++ goto out_unlock_new;
++
++ /* the old file went away */
++ ret = -ENOENT;
++ if ((redo = d_unhashed(old_dentry)))
++ goto out_unlock_new;
++
++ /* 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 (IS_ERR(old_file)) {
++ ret = PTR_ERR(old_file);
++ goto out_unlock_new;
++ }
++
++ /* 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);
++ if (IS_ERR(new_file)) {
++ ret = PTR_ERR(new_file);
++ goto out_fput_old;
++ }
++
++ /* unlock the inode from filename_create() */
++ inode_unlock(dir->d_inode);
++
++ /* drop write access to mnt */
++ mnt_drop_write(new_path->mnt);
++
++ drop = 0;
++
++ size = i_size_read(old_file->f_path.dentry->d_inode);
++ ret = do_cow_splice(old_file, new_file, size);
++ vxdprintk(VXD_CBIT(misc, 2), "do_splice_direct: %d", ret);
++ if (ret < 0) {
++ goto out_fput_both;
++ } else if (ret < size) {
++ ret = -ENOSPC;
++ goto out_fput_both;
++ } else {
++ 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,
++ .ia_valid = ATTR_UID | ATTR_GID
++ };
++
++ setattr_copy(new_inode, &attr);
++ mark_inode_dirty(new_inode);
++ }
++
++ /* 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_dentry)))
++ goto out_unlock;
++
++ vxdprintk(VXD_CBIT(misc, 2),
++ "vfs_rename: [" VS_Q("%*s") ":%d] -> [" VS_Q("%*s") ":%d]",
++ 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(par_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);
++
++out_unlock:
++ mutex_unlock(&old_dentry->d_inode->i_sb->s_vfs_rename_mutex);
++
++out_fput_both:
++ vxdprintk(VXD_CBIT(misc, 3),
++ "fput(new_file=%p[#%ld])", new_file,
++ atomic_long_read(&new_file->f_count));
++ fput(new_file);
++
++out_fput_old:
++ vxdprintk(VXD_CBIT(misc, 3),
++ "fput(old_file=%p[#%ld])", old_file,
++ atomic_long_read(&old_file->f_count));
++ fput(old_file);
++
++out_unlock_new:
++ /* drop references from par_path */
++ path_put(&par_path);
++
++ if (drop) {
++ /* unlock the inode from filename_create() */
++ inode_unlock(dir->d_inode);
++
++ /* 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_dentry, NULL);
++
++out_redo:
++ if (!redo)
++ goto out_rel_both;
++
++ /* lookup dentry once again
++ old_path will be freed as old_path in out_rel_old */
++ ret = filename_lookup(AT_FDCWD, filename, LOOKUP_FOLLOW, &old_path, NULL);
++ if (ret)
++ goto out_rel_both;
++
++ /* drop reference on new_dentry */
++ dput(new_dentry);
++ new_dentry = old_path.dentry;
++ dget(new_dentry);
++ vxdprintk(VXD_CBIT(misc, 2),
++ "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:
++ dump_path("put (new)", new_path);
++ if (new_path)
++ path_put(new_path);
++out_rel_old:
++ dump_path("put (old)", &old_path);
++ path_put(&old_path);
++out_free_path:
++ kfree(path);
++out:
++ if (ret) {
++ dput(new_dentry);
++ new_dentry = ERR_PTR(ret);
++ }
++ // if (!IS_ERR(filename))
++ // putname(filename);
++ 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 */
+ const char *page_get_link(struct dentry *dentry, struct inode *inode,
+ struct delayed_call *callback)
+diff -urNp -x '*.orig' linux-4.9/fs/namespace.c linux-4.9/fs/namespace.c
+--- linux-4.9/fs/namespace.c 2021-02-24 15:47:32.290675776 +0100
++++ linux-4.9/fs/namespace.c 2021-02-24 15:47:45.074409033 +0100
+@@ -24,6 +24,11 @@
+ #include <linux/magic.h>
+ #include <linux/bootmem.h>
+ #include <linux/task_work.h>
++#include <linux/vs_base.h>
++#include <linux/vs_context.h>
++#include <linux/vs_tag.h>
++#include <linux/vserver/space.h>
++#include <linux/vserver/global.h>
+ #include "pnode.h"
+ #include "internal.h"
+
+@@ -980,6 +985,10 @@ vfs_kern_mount(struct file_system_type *
+ if (!type)
+ return ERR_PTR(-ENODEV);
+
++ if ((type->fs_flags & FS_BINARY_MOUNTDATA) &&
++ !vx_capable(CAP_SYS_ADMIN, VXC_BINARY_MOUNT))
++ return ERR_PTR(-EPERM);
++
+ mnt = alloc_vfsmnt(name);
+ if (!mnt)
+ return ERR_PTR(-ENOMEM);
+@@ -1071,6 +1080,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();
+@@ -1666,7 +1676,8 @@ out_unlock:
+ */
+ static inline bool may_mount(void)
{
- struct ext4_iloc iloc;
-@@ -2591,6 +2650,8 @@ void ext4_read_inode(struct inode * inod
- struct ext4_inode_info *ei = EXT4_I(inode);
- struct buffer_head *bh;
- int block;
-+ uid_t uid;
-+ gid_t gid;
+- 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);
+ }
- #ifdef CONFIG_EXT4DEV_FS_POSIX_ACL
- ei->i_acl = EXT4_ACL_NOT_CACHED;
-@@ -2603,12 +2664,17 @@ void ext4_read_inode(struct inode * inod
- bh = iloc.bh;
- 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;
+ static inline bool may_mandlock(void)
+@@ -2181,6 +2192,7 @@ static int do_change_type(struct path *p
+ if (err)
+ goto out_unlock;
}
-+ 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);
- inode->i_size = le32_to_cpu(raw_inode->i_size);
- inode->i_atime.tv_sec = le32_to_cpu(raw_inode->i_atime);
-@@ -2736,6 +2802,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,
-@@ -2745,29 +2813,32 @@ static int ext4_do_update_inode(handle_t
++ // mnt->mnt_flags = mnt_flags;
- raw_inode->i_mode = cpu_to_le16(inode->i_mode);
- 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
+ lock_mount_hash();
+ for (m = mnt; m; m = (recurse ? next_mnt(m, mnt) : NULL))
+@@ -2209,12 +2221,14 @@ static bool has_locked_children(struct m
+ * do loopback mount.
*/
- 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_high = 0;
- raw_inode->i_gid_high = 0;
+ static int do_loopback(struct path *path, const char *old_name,
+- int recurse)
++ vtag_t tag, unsigned long flags, int mnt_flags)
+ {
+ struct path old_path;
+ struct mount *mnt = NULL, *old, *parent;
+ struct mountpoint *mp;
++ int recurse = flags & MS_REC;
+ int err;
++
+ if (!old_name || !*old_name)
+ return -EINVAL;
+ err = kern_path(old_name, LOOKUP_FOLLOW|LOOKUP_AUTOMOUNT, &old_path);
+@@ -2294,7 +2308,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, vxid_t xid)
+ {
+ int err;
+ struct super_block *sb = path->mnt->mnt_sb;
+@@ -2779,6 +2793,7 @@ long do_mount(const char *dev_name, cons
+ struct path path;
+ int retval = 0;
+ int mnt_flags = 0;
++ vtag_t tag = 0;
+
+ /* Discard magic */
+ if ((flags & MS_MGC_MSK) == MS_MGC_VAL)
+@@ -2806,6 +2821,12 @@ long do_mount(const char *dev_name, cons
+ if (!(flags & MS_NOATIME))
+ mnt_flags |= MNT_RELATIME;
+
++ if (dx_parse_tag(data_page, &tag, 1, &mnt_flags, &flags)) {
++ /* FIXME: bind and re-mounts get the tag flag? */
++ if (flags & (MS_BIND|MS_REMOUNT))
++ flags |= MS_TAGID;
++ }
++
+ /* Separate the per-mountpoint flags */
+ if (flags & MS_NOSUID)
+ mnt_flags |= MNT_NOSUID;
+@@ -2830,15 +2851,18 @@ long do_mount(const char *dev_name, cons
+ mnt_flags |= path.mnt->mnt_flags & MNT_ATIME_MASK;
}
-+#ifdef CONFIG_TAGGING_INTERN
-+ raw_inode->i_raw_tag = cpu_to_le16(inode->i_tag);
-+#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);
-@@ -2924,7 +2995,8 @@ int ext4_setattr(struct dentry *dentry,
- return error;
- 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)) {
- handle_t *handle;
++ 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 |
+ MS_STRICTATIME | MS_NOREMOTELOCK | MS_SUBMOUNT);
- /* (user+group)*(old+new) structure, inode write (sb,
-@@ -2946,6 +3018,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;
-+ if ((attr->ia_valid & ATTR_TAG) && IS_TAGGED(inode))
-+ inode->i_tag = attr->ia_tag;
- error = ext4_mark_inode_dirty(handle, inode);
- ext4_journal_stop(handle);
+ if (flags & MS_REMOUNT)
+ retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
+- data_page);
++ data_page, tag);
+ else if (flags & MS_BIND)
+- retval = do_loopback(&path, dev_name, flags & MS_REC);
++ retval = do_loopback(&path, dev_name, tag, flags, mnt_flags);
+ else if (flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE))
+ retval = do_change_type(&path, flags);
+ else if (flags & MS_MOVE)
+@@ -2979,6 +3003,7 @@ struct mnt_namespace *copy_mnt_ns(unsign
+ p = next_mnt(p, old);
}
-diff -NurpP --minimal linux-2.6.19.1/fs/ext4/ioctl.c linux-2.6.19.1-vs2.3.0.6/fs/ext4/ioctl.c
---- linux-2.6.19.1/fs/ext4/ioctl.c 2006-11-30 21:19:20 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/ext4/ioctl.c 2006-12-17 04:31:01 +0100
-@@ -8,6 +8,7 @@
- */
+ namespace_unlock();
++ atomic_inc(&vs_global_mnt_ns);
+
+ if (rootmnt)
+ mntput(rootmnt);
+@@ -3154,9 +3179,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 out4;
+ if (!check_mnt(root_mnt) || !check_mnt(new_mnt))
+ goto out4;
+@@ -3294,6 +3320,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);
+ free_mnt_ns(ns);
+ }
- #include <linux/fs.h>
-+#include <linux/mount.h>
- #include <linux/jbd2.h>
- #include <linux/capability.h>
- #include <linux/ext4_fs.h>
-@@ -15,6 +16,7 @@
- #include <linux/time.h>
- #include <linux/compat.h>
- #include <linux/smp_lock.h>
-+#include <linux/vs_tag.h>
- #include <asm/uaccess.h>
+diff -urNp -x '*.orig' linux-4.9/fs/nfs/client.c linux-4.9/fs/nfs/client.c
+--- linux-4.9/fs/nfs/client.c 2021-02-24 15:47:32.290675776 +0100
++++ linux-4.9/fs/nfs/client.c 2021-02-24 15:47:45.074409033 +0100
+@@ -586,6 +586,9 @@ int nfs_init_server_rpcclient(struct nfs
+ if (server->flags & NFS_MOUNT_SOFT)
+ server->client->cl_softrtry = 1;
- int ext4_ioctl (struct inode * inode, struct file * filp, unsigned int cmd,
-@@ -37,7 +39,8 @@ int ext4_ioctl (struct inode * inode, st
- unsigned int oldflags;
- unsigned int jflag;
++ server->client->cl_tag = 0;
++ if (server->flags & NFS_MOUNT_TAGGED)
++ server->client->cl_tag = 1;
+ return 0;
+ }
+ EXPORT_SYMBOL_GPL(nfs_init_server_rpcclient);
+@@ -762,6 +765,10 @@ static void nfs_server_set_fsinfo(struct
+ server->acdirmin = server->acdirmax = 0;
+ }
-- if (IS_RDONLY(inode))
-+ if (IS_RDONLY(inode) ||
-+ (filp && MNT_IS_RDONLY(filp->f_vfsmnt)))
- return -EROFS;
++ /* FIXME: needs fsinfo
++ if (server->flags & NFS_MOUNT_TAGGED)
++ sb->s_flags |= MS_TAGGED; */
++
+ server->maxfilesize = fsinfo->maxfilesize;
- if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
-@@ -61,7 +64,9 @@ int ext4_ioctl (struct inode * inode, st
- *
- * This test looks nicer. Thanks to Pauline Middelink
- */
-- if ((flags ^ oldflags) & (EXT4_APPEND_FL | EXT4_IMMUTABLE_FL)) {
-+ if ((oldflags & EXT4_IMMUTABLE_FL) ||
-+ ((flags ^ oldflags) & (EXT4_APPEND_FL |
-+ EXT4_IMMUTABLE_FL | EXT4_IUNLINK_FL))) {
- if (!capable(CAP_LINUX_IMMUTABLE)) {
- mutex_unlock(&inode->i_mutex);
- return -EPERM;
-@@ -123,7 +128,8 @@ flags_err:
+ server->time_delta = fsinfo->time_delta;
+diff -urNp -x '*.orig' linux-4.9/fs/nfs/dir.c linux-4.9/fs/nfs/dir.c
+--- linux-4.9/fs/nfs/dir.c 2021-02-24 15:47:32.294009214 +0100
++++ linux-4.9/fs/nfs/dir.c 2021-02-24 15:47:45.074409033 +0100
+@@ -37,6 +37,7 @@
+ #include <linux/sched.h>
+ #include <linux/kmemleak.h>
+ #include <linux/xattr.h>
++#include <linux/vs_tag.h>
- if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
- return -EPERM;
-- if (IS_RDONLY(inode))
-+ if (IS_RDONLY(inode) ||
-+ (filp && MNT_IS_RDONLY(filp->f_vfsmnt)))
- return -EROFS;
- if (get_user(generation, (int __user *) arg))
- return -EFAULT;
-@@ -177,7 +183,8 @@ flags_err:
- if (!test_opt(inode->i_sb, RESERVATION) ||!S_ISREG(inode->i_mode))
- return -ENOTTY;
-
-- if (IS_RDONLY(inode))
-+ if (IS_RDONLY(inode) ||
-+ (filp && MNT_IS_RDONLY(filp->f_vfsmnt)))
- return -EROFS;
-
- if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
-@@ -212,7 +219,8 @@ flags_err:
- if (!capable(CAP_SYS_RESOURCE))
- return -EPERM;
+ #include "delegation.h"
+ #include "iostat.h"
+@@ -1431,6 +1432,7 @@ struct dentry *nfs_lookup(struct inode *
+ /* Success: notify readdir to use READDIRPLUS */
+ nfs_advise_use_readdirplus(dir);
-- if (IS_RDONLY(inode))
-+ if (IS_RDONLY(inode) ||
-+ (filp && MNT_IS_RDONLY(filp->f_vfsmnt)))
- return -EROFS;
++ dx_propagate_tag(nd, inode);
+ no_entry:
+ res = d_splice_alias(inode, dentry);
+ if (res != NULL) {
+diff -urNp -x '*.orig' linux-4.9/fs/nfs/inode.c linux-4.9/fs/nfs/inode.c
+--- linux-4.9/fs/nfs/inode.c 2021-02-24 15:47:32.294009214 +0100
++++ linux-4.9/fs/nfs/inode.c 2021-02-24 15:47:45.074409033 +0100
+@@ -38,6 +38,7 @@
+ #include <linux/slab.h>
+ #include <linux/compat.h>
+ #include <linux/freezer.h>
++#include <linux/vs_tag.h>
- if (get_user(n_blocks_count, (__u32 __user *)arg))
-@@ -233,7 +241,8 @@ flags_err:
- if (!capable(CAP_SYS_RESOURCE))
- return -EPERM;
+ #include <asm/uaccess.h>
-- if (IS_RDONLY(inode))
-+ if (IS_RDONLY(inode) ||
-+ (filp && MNT_IS_RDONLY(filp->f_vfsmnt)))
- return -EROFS;
+@@ -383,6 +384,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;
++ kuid_t kuid;
++ kgid_t kgid;
+
+ /* We set i_ino for the few things that still rely on it,
+ * such as stat(2) */
+@@ -427,8 +430,8 @@ nfs_fhget(struct super_block *sb, struct
+ inode->i_version = 0;
+ inode->i_size = 0;
+ 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));
+ nfsi->write_io = 0;
+@@ -463,11 +466,11 @@ nfs_fhget(struct super_block *sb, struct
+ else if (nfs_server_capable(inode, NFS_CAP_NLINK))
+ nfs_set_cache_invalid(inode, NFS_INO_INVALID_ATTR);
+ if (fattr->valid & NFS_ATTR_FATTR_OWNER)
+- inode->i_uid = fattr->uid;
++ kuid = fattr->uid;
+ else if (nfs_server_capable(inode, NFS_CAP_OWNER))
+ nfs_set_cache_invalid(inode, NFS_INO_INVALID_ATTR);
+ if (fattr->valid & NFS_ATTR_FATTR_GROUP)
+- inode->i_gid = fattr->gid;
++ kgid = fattr->gid;
+ else if (nfs_server_capable(inode, NFS_CAP_OWNER_GROUP))
+ nfs_set_cache_invalid(inode, NFS_INO_INVALID_ATTR);
+ if (fattr->valid & NFS_ATTR_FATTR_BLOCKS_USED)
+@@ -478,6 +481,10 @@ nfs_fhget(struct super_block *sb, struct
+ */
+ inode->i_blocks = nfs_calc_block_size(fattr->du.nfs3.used);
+ }
++ 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 */
- if (copy_from_user(&input, (struct ext4_new_group_input __user *)arg,
-@@ -247,7 +256,6 @@ flags_err:
+ nfs_setsecurity(inode, fattr, label);
- return err;
+@@ -619,6 +626,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_set_cache_invalid(inode, NFS_INO_INVALID_ACCESS
+ | NFS_INO_INVALID_ACL);
}
+@@ -1273,7 +1282,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;
-
- default:
- return -ENOTTY;
++ kuid_t kuid;
++ kgid_t kgid;
++ ktag_t ktag;
+
+ if (nfs_have_delegated_attributes(inode))
+ return 0;
+@@ -1302,13 +1313,18 @@ static int nfs_check_inode_attributes(st
+ }
}
-diff -NurpP --minimal linux-2.6.19.1/fs/ext4/namei.c linux-2.6.19.1-vs2.3.0.6/fs/ext4/namei.c
---- linux-2.6.19.1/fs/ext4/namei.c 2006-11-30 21:19:20 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/ext4/namei.c 2006-12-01 23:01:47 +0100
-@@ -37,6 +37,7 @@
- #include <linux/buffer_head.h>
- #include <linux/bio.h>
- #include <linux/smp_lock.h>
-+#include <linux/vs_tag.h>
- #include "namei.h"
- #include "xattr.h"
-@@ -1008,6 +1009,7 @@ static struct dentry *ext4_lookup(struct
++ 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) && !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) && !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? */
- if (!inode)
- return ERR_PTR(-EACCES);
-+ dx_propagate_tag(nd, inode);
+ /* Has the link count changed? */
+ if ((fattr->valid & NFS_ATTR_FATTR_NLINK) && inode->i_nlink != fattr->nlink)
+@@ -1667,6 +1683,9 @@ static int nfs_update_inode(struct inode
+ unsigned long save_cache_validity;
+ bool have_writers = nfs_file_has_buffered_writers(nfsi);
+ bool cache_revalidated = true;
++ kuid_t kuid;
++ kgid_t kgid;
++ ktag_t ktag;
+
+ 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,
+@@ -1786,6 +1805,9 @@ static int nfs_update_inode(struct inode
+ cache_revalidated = false;
}
- return d_splice_alias(inode, dentry);
- }
-@@ -2381,6 +2383,7 @@ struct inode_operations ext4_dir_inode_o
- .removexattr = generic_removexattr,
- #endif
- .permission = ext4_permission,
-+ .sync_flags = ext4_sync_flags,
- };
- struct inode_operations ext4_special_inode_operations = {
-@@ -2392,4 +2395,5 @@ struct inode_operations ext4_special_ino
- .removexattr = generic_removexattr,
- #endif
- .permission = ext4_permission,
-+ .sync_flags = ext4_sync_flags,
- };
-diff -NurpP --minimal linux-2.6.19.1/fs/ext4/super.c linux-2.6.19.1-vs2.3.0.6/fs/ext4/super.c
---- linux-2.6.19.1/fs/ext4/super.c 2006-11-30 21:19:20 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/ext4/super.c 2006-12-01 23:17:24 +0100
-@@ -656,12 +656,12 @@ static int ext4_write_dquot(struct dquot
- static int ext4_acquire_dquot(struct dquot *dquot);
- static int ext4_release_dquot(struct dquot *dquot);
- static int ext4_mark_dquot_dirty(struct dquot *dquot);
--static int ext4_write_info(struct super_block *sb, int type);
--static int ext4_quota_on(struct super_block *sb, int type, int format_id, char *path);
--static int ext4_quota_on_mount(struct super_block *sb, int type);
--static ssize_t ext4_quota_read(struct super_block *sb, int type, char *data,
-+static int ext4_write_info(struct dqhash *hash, int type);
-+static int ext4_quota_on(struct dqhash *hash, int type, int format_id, char *path);
-+static int ext4_quota_on_mount(struct dqhash *hash, int type);
-+static ssize_t ext4_quota_read(struct dqhash *hash, int type, char *data,
- size_t len, loff_t off);
--static ssize_t ext4_quota_write(struct super_block *sb, int type,
-+static ssize_t ext4_quota_write(struct dqhash *hash, int type,
- const char *data, size_t len, loff_t off);
-
- static struct dquot_operations ext4_quota_operations = {
-@@ -728,7 +728,7 @@ enum {
- Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
- Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_quota, Opt_noquota,
- Opt_ignore, Opt_barrier, Opt_err, Opt_resize, Opt_usrquota,
-- Opt_grpquota, Opt_extents,
-+ Opt_grpquota, Opt_extents, Opt_tag, Opt_notag, Opt_tagid
- };
++ 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);
- static match_table_t tokens = {
-@@ -779,6 +779,10 @@ static match_table_t tokens = {
- {Opt_usrquota, "usrquota"},
- {Opt_barrier, "barrier=%u"},
- {Opt_extents, "extents"},
-+ {Opt_tag, "tag"},
-+ {Opt_notag, "notag"},
-+ {Opt_tagid, "tagid=%u"},
-+ {Opt_tag, "tagxid"},
- {Opt_err, NULL},
- {Opt_resize, "resize"},
- };
-@@ -872,6 +876,20 @@ static int parse_options (char *options,
- case Opt_nouid32:
- set_opt (sbi->s_mount_opt, NO_UID32);
- break;
-+#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;
-+#endif
-+#ifdef CONFIG_PROPAGATE
-+ case Opt_tagid:
-+ /* use args[0] */
-+ set_opt (sbi->s_mount_opt, TAGGED);
-+ break;
-+#endif
- case Opt_nocheck:
- clear_opt (sbi->s_mount_opt, CHECK);
- break;
-@@ -990,7 +1008,7 @@ static int parse_options (char *options,
- case Opt_grpjquota:
- qtype = GRPQUOTA;
- set_qf_name:
-- if (sb_any_quota_enabled(sb)) {
-+ if (dqh_any_quota_enabled(sb->s_dqh)) {
- printk(KERN_ERR
- "EXT4-fs: Cannot change journalled "
- "quota options when quota turned on.\n");
-@@ -1028,7 +1046,7 @@ set_qf_name:
- case Opt_offgrpjquota:
- qtype = GRPQUOTA;
- clear_qf_name:
-- if (sb_any_quota_enabled(sb)) {
-+ if (dqh_any_quota_enabled(sb->s_dqh)) {
- printk(KERN_ERR "EXT4-fs: Cannot change "
- "journalled quota options when "
- "quota turned on.\n");
-@@ -1056,7 +1074,7 @@ clear_qf_name:
- set_opt(sbi->s_mount_opt, GRPQUOTA);
- break;
- case Opt_noquota:
-- if (sb_any_quota_enabled(sb)) {
-+ if (dqh_any_quota_enabled(sb->s_dqh)) {
- printk(KERN_ERR "EXT4-fs: Cannot change quota "
- "options when quota turned on.\n");
- return 0;
-@@ -1341,7 +1359,7 @@ static void ext4_orphan_cleanup (struct
- /* Turn on quotas so that they are updated correctly */
- for (i = 0; i < MAXQUOTAS; i++) {
- if (EXT4_SB(sb)->s_qf_names[i]) {
-- int ret = ext4_quota_on_mount(sb, i);
-+ int ret = ext4_quota_on_mount(sb->s_dqh, i);
- if (ret < 0)
- printk(KERN_ERR
- "EXT4-fs: Cannot turn on journalled "
-@@ -1391,8 +1409,8 @@ static void ext4_orphan_cleanup (struct
- #ifdef CONFIG_QUOTA
- /* Turn quotas off */
- for (i = 0; i < MAXQUOTAS; i++) {
-- if (sb_dqopt(sb)->files[i])
-- vfs_quota_off(sb, i);
-+ if (dqh_dqopt(sb->s_dqh)->files[i])
-+ vfs_quota_off(sb->s_dqh, i);
+ if (fattr->valid & NFS_ATTR_FATTR_ATIME)
+ memcpy(&inode->i_atime, &fattr->atime, sizeof(inode->i_atime));
+@@ -1840,6 +1862,10 @@ static int nfs_update_inode(struct inode
+ cache_revalidated = false;
}
- #endif
- sb->s_flags = s_flags; /* Restore MS_RDONLY status */
-@@ -1539,6 +1557,9 @@ static int ext4_fill_super (struct super
- NULL, 0))
- goto failed_mount;
-+ if (EXT4_SB(sb)->s_mount_opt & EXT4_MOUNT_TAGGED)
-+ sb->s_flags |= MS_TAGGED;
++ 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);
+
- sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
- ((sbi->s_mount_opt & EXT4_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
-
-@@ -1757,8 +1778,8 @@ static int ext4_fill_super (struct super
- sb->s_export_op = &ext4_export_ops;
- sb->s_xattr = ext4_xattr_handlers;
- #ifdef CONFIG_QUOTA
-- sb->s_qcop = &ext4_qctl_operations;
-- sb->dq_op = &ext4_quota_operations;
-+ sb->s_dqh->dqh_qop = &ext4_quota_operations;
-+ sb->s_dqh->dqh_qcop = &ext4_qctl_operations;
- #endif
- INIT_LIST_HEAD(&sbi->s_orphan); /* unlinked but open files */
+ if (fattr->valid & NFS_ATTR_FATTR_NLINK) {
+ if (inode->i_nlink != fattr->nlink) {
+ invalid |= NFS_INO_INVALID_ATTR;
+diff -urNp -x '*.orig' linux-4.9/fs/nfs/nfs3xdr.c linux-4.9/fs/nfs/nfs3xdr.c
+--- linux-4.9/fs/nfs/nfs3xdr.c 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/fs/nfs/nfs3xdr.c 2021-02-24 15:47:45.074409033 +0100
+@@ -20,6 +20,7 @@
+ #include <linux/nfs3.h>
+ #include <linux/nfs_fs.h>
+ #include <linux/nfsacl.h>
++#include <linux/vs_tag.h>
+ #include "internal.h"
-@@ -2370,6 +2391,12 @@ static int ext4_remount (struct super_bl
+ #define NFSDBG_FACILITY NFSDBG_XDR
+@@ -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)
+ {
+ u32 nbytes;
+ __be32 *p;
+@@ -590,15 +592,19 @@ static void encode_sattr3(struct xdr_str
+ } else
+ *p++ = xdr_zero;
- if (sbi->s_mount_opt & EXT4_MOUNT_ABORT)
- ext4_abort(sb, __FUNCTION__, "Abort forced by user");
-+ if ((sbi->s_mount_opt & EXT4_MOUNT_TAGGED) &&
-+ !(sb->s_flags & MS_TAGGED)) {
-+ printk("EXT4-fs: %s: tagging not permitted on remount.\n",
-+ sb->s_id);
-+ return -EINVAL;
-+ }
+- if (attr->ia_valid & ATTR_UID) {
++ if (attr->ia_valid & ATTR_UID ||
++ (tag && (attr->ia_valid & ATTR_TAG))) {
+ *p++ = xdr_one;
+- *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;
- sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
- ((sbi->s_mount_opt & EXT4_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
-@@ -2523,7 +2550,7 @@ static int ext4_statfs (struct dentry *
+- if (attr->ia_valid & ATTR_GID) {
++ if (attr->ia_valid & ATTR_GID ||
++ (tag && (attr->ia_valid & ATTR_TAG))) {
+ *p++ = xdr_one;
+- *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;
- static inline struct inode *dquot_to_inode(struct dquot *dquot)
+@@ -887,7 +893,7 @@ static void nfs3_xdr_enc_setattr3args(st
+ const struct nfs3_sattrargs *args)
{
-- return sb_dqopt(dquot->dq_sb)->files[dquot->dq_type];
-+ return dqh_dqopt(dquot->dq_dqh)->files[dquot->dq_type];
+ 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);
}
- static int ext4_dquot_initialize(struct inode *inode, int type)
-@@ -2566,7 +2593,7 @@ static int ext4_write_dquot(struct dquot
-
- inode = dquot_to_inode(dquot);
- handle = ext4_journal_start(inode,
-- EXT4_QUOTA_TRANS_BLOCKS(dquot->dq_sb));
-+ EXT4_QUOTA_TRANS_BLOCKS(dquot->dq_dqh->dqh_sb));
- if (IS_ERR(handle))
- return PTR_ERR(handle);
- ret = dquot_commit(dquot);
-@@ -2582,7 +2609,7 @@ static int ext4_acquire_dquot(struct dqu
- handle_t *handle;
-
- handle = ext4_journal_start(dquot_to_inode(dquot),
-- EXT4_QUOTA_INIT_BLOCKS(dquot->dq_sb));
-+ EXT4_QUOTA_INIT_BLOCKS(dquot->dq_dqh->dqh_sb));
- if (IS_ERR(handle))
- return PTR_ERR(handle);
- ret = dquot_acquire(dquot);
-@@ -2598,7 +2625,7 @@ static int ext4_release_dquot(struct dqu
- handle_t *handle;
-
- handle = ext4_journal_start(dquot_to_inode(dquot),
-- EXT4_QUOTA_DEL_BLOCKS(dquot->dq_sb));
-+ EXT4_QUOTA_DEL_BLOCKS(dquot->dq_dqh->dqh_sb));
- if (IS_ERR(handle))
- return PTR_ERR(handle);
- ret = dquot_release(dquot);
-@@ -2611,8 +2638,8 @@ static int ext4_release_dquot(struct dqu
- static int ext4_mark_dquot_dirty(struct dquot *dquot)
+@@ -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)
{
- /* Are we journalling quotas? */
-- if (EXT4_SB(dquot->dq_sb)->s_qf_names[USRQUOTA] ||
-- EXT4_SB(dquot->dq_sb)->s_qf_names[GRPQUOTA]) {
-+ if (EXT4_SB(dquot->dq_dqh->dqh_sb)->s_qf_names[USRQUOTA] ||
-+ EXT4_SB(dquot->dq_dqh->dqh_sb)->s_qf_names[GRPQUOTA]) {
- dquot_mark_dquot_dirty(dquot);
- return ext4_write_dquot(dquot);
- } else {
-@@ -2620,8 +2647,9 @@ static int ext4_mark_dquot_dirty(struct
- }
+ 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);
}
--static int ext4_write_info(struct super_block *sb, int type)
-+static int ext4_write_info(struct dqhash *hash, int type)
- {
-+ struct super_block *sb = hash->dqh_sb;
- int ret, err;
- handle_t *handle;
-
-@@ -2629,7 +2657,7 @@ static int ext4_write_info(struct super_
- handle = ext4_journal_start(sb->s_root->d_inode, 2);
- if (IS_ERR(handle))
- return PTR_ERR(handle);
-- ret = dquot_commit_info(sb, type);
-+ ret = dquot_commit_info(hash, type);
- err = ext4_journal_stop(handle);
- if (!ret)
- ret = err;
-@@ -2640,18 +2668,20 @@ static int ext4_write_info(struct super_
- * Turn on quotas during mount time - we need to find
- * the quota file and such...
- */
--static int ext4_quota_on_mount(struct super_block *sb, int type)
-+static int ext4_quota_on_mount(struct dqhash *hash, int type)
+ /*
+@@ -1074,7 +1080,7 @@ static void nfs3_xdr_enc_mkdir3args(stru
+ const struct nfs3_mkdirargs *args)
{
-- return vfs_quota_on_mount(sb, EXT4_SB(sb)->s_qf_names[type],
-- EXT4_SB(sb)->s_jquota_fmt, type);
-+ return vfs_quota_on_mount(hash,
-+ EXT4_SB(hash->dqh_sb)->s_qf_names[type],
-+ EXT4_SB(hash->dqh_sb)->s_jquota_fmt, type);
+ 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);
}
/*
- * Standard function to be called on quota_on
+@@ -1091,9 +1097,9 @@ static void nfs3_xdr_enc_mkdir3args(stru
+ * };
*/
--static int ext4_quota_on(struct super_block *sb, int type, int format_id,
-+static int ext4_quota_on(struct dqhash *hash, int type, int format_id,
- char *path)
+ static void encode_symlinkdata3(struct xdr_stream *xdr,
+- const struct nfs3_symlinkargs *args)
++ const struct nfs3_symlinkargs *args, int tag)
{
-+ struct super_block *sb = hash->dqh_sb;
- int err;
- struct nameidata nd;
-
-@@ -2660,7 +2690,7 @@ static int ext4_quota_on(struct super_bl
- /* Not journalling quota? */
- if (!EXT4_SB(sb)->s_qf_names[USRQUOTA] &&
- !EXT4_SB(sb)->s_qf_names[GRPQUOTA])
-- return vfs_quota_on(sb, type, format_id, path);
-+ return vfs_quota_on(hash, type, format_id, path);
- err = path_lookup(path, LOOKUP_FOLLOW, &nd);
- if (err)
- return err;
-@@ -2675,17 +2705,18 @@ static int ext4_quota_on(struct super_bl
- "EXT4-fs: Quota file not on filesystem root. "
- "Journalled quota will not work.\n");
- path_release(&nd);
-- return vfs_quota_on(sb, type, format_id, path);
-+ return vfs_quota_on(hash, type, format_id, path);
+- encode_sattr3(xdr, args->sattr);
++ encode_sattr3(xdr, args->sattr, tag);
+ encode_nfspath3(xdr, args->pages, args->pathlen);
}
- /* Read data from quotafile - avoid pagecache and such because we cannot afford
- * acquiring the locks... As quota files are never truncated and quota code
- * itself serializes the operations (and noone else should touch the files)
- * we don't have to be afraid of races */
--static ssize_t ext4_quota_read(struct super_block *sb, int type, char *data,
-+static ssize_t ext4_quota_read(struct dqhash *hash, int type, char *data,
- size_t len, loff_t off)
+@@ -1102,7 +1108,7 @@ static void nfs3_xdr_enc_symlink3args(st
+ const struct nfs3_symlinkargs *args)
{
-- struct inode *inode = sb_dqopt(sb)->files[type];
-+ struct inode *inode = dqh_dqopt(hash)->files[type];
-+ struct super_block *sb = hash->dqh_sb;
- sector_t blk = off >> EXT4_BLOCK_SIZE_BITS(sb);
- int err = 0;
- int offset = off & (sb->s_blocksize - 1);
-@@ -2720,10 +2751,11 @@ static ssize_t ext4_quota_read(struct su
-
- /* Write to quotafile (we know the transaction is already started and has
- * enough credits) */
--static ssize_t ext4_quota_write(struct super_block *sb, int type,
-+static ssize_t ext4_quota_write(struct dqhash *hash, int type,
- const char *data, size_t len, loff_t off)
+ encode_diropargs3(xdr, args->fromfh, args->fromname, args->fromlen);
+- encode_symlinkdata3(xdr, args);
++ encode_symlinkdata3(xdr, args, req->rq_task->tk_client->cl_tag);
+ xdr->buf->flags |= XDRBUF_WRITE;
+ }
+
+@@ -1131,24 +1137,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)
{
-- struct inode *inode = sb_dqopt(sb)->files[type];
-+ struct inode *inode = dqh_dqopt(hash)->files[type];
-+ struct super_block *sb = hash->dqh_sb;
- sector_t blk = off >> EXT4_BLOCK_SIZE_BITS(sb);
- int err = 0;
- int offset = off & (sb->s_blocksize - 1);
-diff -NurpP --minimal linux-2.6.19.1/fs/ext4/symlink.c linux-2.6.19.1-vs2.3.0.6/fs/ext4/symlink.c
---- linux-2.6.19.1/fs/ext4/symlink.c 2006-11-30 21:19:20 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/ext4/symlink.c 2006-12-01 23:01:47 +0100
-@@ -40,6 +40,7 @@ struct inode_operations ext4_symlink_ino
- .listxattr = ext4_listxattr,
- .removexattr = generic_removexattr,
- #endif
-+ .sync_flags = ext4_sync_flags,
- };
+- encode_sattr3(xdr, args->sattr);
++ encode_sattr3(xdr, args->sattr, tag);
+ encode_specdata3(xdr, args->rdev);
+ }
- struct inode_operations ext4_fast_symlink_inode_operations = {
-@@ -51,4 +52,5 @@ struct inode_operations ext4_fast_symlin
- .listxattr = ext4_listxattr,
- .removexattr = generic_removexattr,
- #endif
-+ .sync_flags = ext4_sync_flags,
- };
-diff -NurpP --minimal linux-2.6.19.1/fs/ext4/xattr.c linux-2.6.19.1-vs2.3.0.6/fs/ext4/xattr.c
---- linux-2.6.19.1/fs/ext4/xattr.c 2006-11-30 21:19:20 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/ext4/xattr.c 2006-12-01 23:01:47 +0100
-@@ -58,6 +58,7 @@
- #include <linux/mbcache.h>
- #include <linux/quotaops.h>
- #include <linux/rwsem.h>
-+#include <linux/vs_dlimit.h>
- #include "xattr.h"
- #include "acl.h"
+ 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:
+@@ -1163,7 +1169,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);
+ }
-@@ -495,6 +496,7 @@ ext4_xattr_release_block(handle_t *handl
- ext4_journal_dirty_metadata(handle, bh);
- if (IS_SYNC(inode))
- handle->h_sync = 1;
-+ DLIMIT_FREE_BLOCK(inode, 1);
- DQUOT_FREE_BLOCK(inode, 1);
- unlock_buffer(bh);
- ea_bdebug(bh, "refcount now=%d; releasing",
-@@ -763,11 +765,14 @@ inserted:
- if (new_bh == bs->bh)
- ea_bdebug(new_bh, "keeping");
- else {
-+ error = -ENOSPC;
-+ if (DLIMIT_ALLOC_BLOCK(inode, 1))
-+ goto cleanup;
- /* The old block is released after updating
- the inode. */
- error = -EDQUOT;
- if (DQUOT_ALLOC_BLOCK(inode, 1))
-- goto cleanup;
-+ goto cleanup_dlimit;
- error = ext4_journal_get_write_access(handle,
- new_bh);
- if (error)
-@@ -844,6 +849,8 @@ cleanup:
-
- cleanup_dquot:
- DQUOT_FREE_BLOCK(inode, 1);
-+cleanup_dlimit:
-+ DLIMIT_FREE_BLOCK(inode, 1);
- goto cleanup;
-
- bad_block:
-diff -NurpP --minimal linux-2.6.19.1/fs/fcntl.c linux-2.6.19.1-vs2.3.0.6/fs/fcntl.c
---- linux-2.6.19.1/fs/fcntl.c 2006-11-30 21:19:23 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/fcntl.c 2006-11-08 04:57:48 +0100
-@@ -18,6 +18,7 @@
- #include <linux/ptrace.h>
- #include <linux/signal.h>
+ /*
+diff -urNp -x '*.orig' linux-4.9/fs/nfs/super.c linux-4.9/fs/nfs/super.c
+--- linux-4.9/fs/nfs/super.c 2021-02-24 15:47:32.300676089 +0100
++++ linux-4.9/fs/nfs/super.c 2021-02-24 15:47:45.074409033 +0100
+@@ -54,6 +54,7 @@
+ #include <linux/parser.h>
+ #include <linux/nsproxy.h>
#include <linux/rcupdate.h>
-+#include <linux/vs_limit.h>
++#include <linux/vs_tag.h>
- #include <asm/poll.h>
- #include <asm/siginfo.h>
-@@ -85,6 +86,8 @@ repeat:
- error = -EMFILE;
- if (newfd >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
- goto out;
-+ if (!vx_files_avail(1))
-+ goto out;
+ #include <asm/uaccess.h>
- error = expand_files(files, newfd);
- if (error < 0)
-@@ -125,6 +128,7 @@ static int dupfd(struct file *file, unsi
- FD_SET(fd, fdt->open_fds);
- FD_CLR(fd, fdt->close_on_exec);
- spin_unlock(&files->file_lock);
-+ vx_openfd_inc(fd);
- fd_install(fd, file);
- } else {
- spin_unlock(&files->file_lock);
-@@ -177,6 +181,9 @@ asmlinkage long sys_dup2(unsigned int ol
+@@ -102,6 +103,7 @@ enum {
+ Opt_mountport,
+ Opt_mountvers,
+ Opt_minorversion,
++ Opt_tagid,
- if (tofree)
- filp_close(tofree, files);
-+ else
-+ vx_openfd_inc(newfd); /* fd was unused */
+ /* Mount options that take string arguments */
+ Opt_nfsvers,
+@@ -114,6 +116,9 @@ enum {
+ /* Special mount options */
+ Opt_userspace, Opt_deprecated, Opt_sloppy,
+
++ /* Linux-VServer tagging options */
++ Opt_tag, Opt_notag,
+
- err = newfd;
- out:
- return err;
-diff -NurpP --minimal linux-2.6.19.1/fs/file_table.c linux-2.6.19.1-vs2.3.0.6/fs/file_table.c
---- linux-2.6.19.1/fs/file_table.c 2006-11-30 21:19:25 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/file_table.c 2006-11-08 04:57:48 +0100
-@@ -21,6 +21,8 @@
- #include <linux/fsnotify.h>
- #include <linux/sysctl.h>
- #include <linux/percpu_counter.h>
-+#include <linux/vs_limit.h>
-+#include <linux/vs_context.h>
+ Opt_err
+ };
- #include <asm/atomic.h>
+@@ -183,6 +188,10 @@ static const match_table_t nfs_mount_opt
+ { Opt_fscache_uniq, "fsc=%s" },
+ { Opt_local_lock, "local_lock=%s" },
-@@ -120,6 +122,8 @@ struct file *get_empty_filp(void)
- f->f_gid = tsk->fsgid;
- eventpoll_init_file(f);
- /* f->f_version: 0 */
-+ f->f_xid = vx_current_xid();
-+ vx_files_inc(f);
- return f;
++ { Opt_tag, "tag" },
++ { Opt_notag, "notag" },
++ { Opt_tagid, "tagid=%u" },
++
+ /* The following needs to be listed after all other options */
+ { Opt_nfsvers, "v%s" },
- over:
-@@ -175,6 +179,8 @@ void fastcall __fput(struct file *file)
- if (file->f_mode & FMODE_WRITE)
- put_write_access(inode);
- put_pid(file->f_owner.pid);
-+ vx_files_dec(file);
-+ file->f_xid = 0;
- file_kill(file);
- file->f_dentry = NULL;
- file->f_vfsmnt = NULL;
-@@ -240,6 +246,8 @@ void put_filp(struct file *file)
- {
- if (atomic_dec_and_test(&file->f_count)) {
- security_file_free(file);
-+ vx_files_dec(file);
-+ file->f_xid = 0;
- file_kill(file);
- file_free(file);
- }
-diff -NurpP --minimal linux-2.6.19.1/fs/gfs2/log.c linux-2.6.19.1-vs2.3.0.6/fs/gfs2/log.c
---- linux-2.6.19.1/fs/gfs2/log.c 2006-11-30 21:19:25 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/gfs2/log.c 2006-11-08 22:48:20 +0100
-@@ -319,7 +319,7 @@ static u64 log_bmap(struct gfs2_sbd *sdp
- bh_map.b_size = 1 << inode->i_blkbits;
- error = gfs2_block_map(inode, lbn, 0, &bh_map);
- if (error || !bh_map.b_blocknr)
-- printk(KERN_INFO "error=%d, dbn=%llu lbn=%u", error, bh_map.b_blocknr, lbn);
-+ printk(KERN_INFO "error=%d, dbn=%lu lbn=%u", error, bh_map.b_blocknr, lbn);
- gfs2_assert_withdraw(sdp, !error && bh_map.b_blocknr);
-
- return bh_map.b_blocknr;
-diff -NurpP --minimal linux-2.6.19.1/fs/hfsplus/ioctl.c linux-2.6.19.1-vs2.3.0.6/fs/hfsplus/ioctl.c
---- linux-2.6.19.1/fs/hfsplus/ioctl.c 2006-11-30 21:19:25 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/hfsplus/ioctl.c 2006-11-08 04:57:52 +0100
-@@ -16,6 +16,7 @@
- #include <linux/fs.h>
- #include <linux/sched.h>
- #include <linux/xattr.h>
-+#include <linux/mount.h>
- #include <asm/uaccess.h>
- #include "hfsplus_fs.h"
-
-@@ -35,7 +36,8 @@ int hfsplus_ioctl(struct inode *inode, s
- flags |= FS_NODUMP_FL; /* EXT2_NODUMP_FL */
- return put_user(flags, (int __user *)arg);
- case HFSPLUS_IOC_EXT2_SETFLAGS: {
-- if (IS_RDONLY(inode))
-+ if (IS_RDONLY(inode) ||
-+ (filp && MNT_IS_RDONLY(filp->f_vfsmnt)))
- return -EROFS;
-
- if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
-diff -NurpP --minimal linux-2.6.19.1/fs/inode.c linux-2.6.19.1-vs2.3.0.6/fs/inode.c
---- linux-2.6.19.1/fs/inode.c 2006-11-30 21:19:25 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/inode.c 2006-11-08 04:57:53 +0100
-@@ -115,6 +115,9 @@ static struct inode *alloc_inode(struct
- 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);
-@@ -126,6 +129,9 @@ static struct inode *alloc_inode(struct
- inode->i_blocks = 0;
- inode->i_bytes = 0;
- inode->i_generation = 0;
-+#ifdef CONFIG_QUOTACTL
-+ inode->i_dqh = dqhget(sb->s_dqh);
+@@ -644,6 +653,7 @@ static void nfs_show_mount_options(struc
+ { NFS_MOUNT_NORDIRPLUS, ",nordirplus", "" },
+ { NFS_MOUNT_UNSHARED, ",nosharecache", "" },
+ { NFS_MOUNT_NORESVPORT, ",noresvport", "" },
++ { NFS_MOUNT_TAGGED, ",tag", "" },
+ { 0, NULL, NULL }
+ };
+ const struct proc_nfs_info *nfs_infop;
+@@ -1341,6 +1351,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
- #ifdef CONFIG_QUOTA
- memset(&inode->i_dquot, 0, sizeof(inode->i_dquot));
- #endif
-@@ -172,6 +178,8 @@ void destroy_inode(struct inode *inode)
- {
- BUG_ON(inode_has_buffers(inode));
- security_inode_free(inode);
-+ if (dqhash_valid(inode->i_dqh))
-+ dqhput(inode->i_dqh);
- if (inode->i_sb->s_op->destroy_inode)
- inode->i_sb->s_op->destroy_inode(inode);
- else
-@@ -233,6 +241,8 @@ void __iget(struct inode * inode)
- inodes_stat.nr_unused--;
- }
-+EXPORT_SYMBOL_GPL(__iget);
-+
- /**
- * clear_inode - clear an inode
- * @inode: inode to clear
-@@ -1245,12 +1255,13 @@ EXPORT_SYMBOL(inode_needs_sync);
- /* Function back in dquot.c */
- int remove_inode_dquot_ref(struct inode *, int, struct list_head *);
-
--void remove_dquot_ref(struct super_block *sb, int type,
-+void remove_dquot_ref(struct dqhash *hash, int type,
- struct list_head *tofree_head)
- {
- struct inode *inode;
-+ struct super_block *sb = hash->dqh_sb;
+ /*
+ * options that take numeric values
+@@ -1427,6 +1445,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
-- if (!sb->dq_op)
-+ if (!hash->dqh_qop)
- return; /* nothing to do */
- spin_lock(&inode_lock); /* This lock is for inodes code */
+ /*
+ * options that take text values
+diff -urNp -x '*.orig' linux-4.9/fs/nfsd/auth.c linux-4.9/fs/nfsd/auth.c
+--- linux-4.9/fs/nfsd/auth.c 2021-02-24 15:47:32.300676089 +0100
++++ linux-4.9/fs/nfsd/auth.c 2021-02-24 15:47:45.074409033 +0100
+@@ -1,6 +1,7 @@
+ /* Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> */
-diff -NurpP --minimal linux-2.6.19.1/fs/ioctl.c linux-2.6.19.1-vs2.3.0.6/fs/ioctl.c
---- linux-2.6.19.1/fs/ioctl.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/fs/ioctl.c 2006-12-17 04:31:15 +0100
-@@ -12,10 +12,14 @@
- #include <linux/fs.h>
- #include <linux/security.h>
- #include <linux/module.h>
-+#include <linux/proc_fs.h>
-+#include <linux/vserver/inode.h>
+ #include <linux/sched.h>
+#include <linux/vs_tag.h>
+ #include "nfsd.h"
+ #include "auth.h"
- #include <asm/uaccess.h>
- #include <asm/ioctls.h>
-
-+
- static long do_ioctl(struct file *filp, unsigned int cmd,
- unsigned long arg)
- {
-diff -NurpP --minimal linux-2.6.19.1/fs/ioprio.c linux-2.6.19.1-vs2.3.0.6/fs/ioprio.c
---- linux-2.6.19.1/fs/ioprio.c 2006-11-30 21:19:25 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/ioprio.c 2006-11-30 18:53:18 +0100
-@@ -25,6 +25,7 @@
- #include <linux/capability.h>
- #include <linux/syscalls.h>
- #include <linux/security.h>
-+#include <linux/vs_base.h>
+@@ -35,6 +36,9 @@ int nfsd_setuser(struct svc_rqst *rqstp,
- static int set_task_ioprio(struct task_struct *task, int ioprio)
- {
-@@ -109,7 +110,7 @@ asmlinkage long sys_ioprio_set(int which
- if (!who)
- user = current->user;
- else
-- user = find_user(who);
-+ user = find_user(vx_current_xid(), who);
+ new->fsuid = rqstp->rq_cred.cr_uid;
+ new->fsgid = rqstp->rq_cred.cr_gid;
++ /* FIXME: this desperately needs a tag :)
++ new->xid = (vxid_t)INOTAG_TAG(DX_TAG_NFSD, cred.cr_uid, cred.cr_gid, 0);
++ */
- if (!user)
- break;
-@@ -197,7 +198,7 @@ asmlinkage long sys_ioprio_get(int which
- if (!who)
- user = current->user;
- else
-- user = find_user(who);
-+ user = find_user(vx_current_xid(), who);
+ rqgi = rqstp->rq_cred.cr_group_info;
- if (!user)
- break;
-diff -NurpP --minimal linux-2.6.19.1/fs/jffs2/dir.c linux-2.6.19.1-vs2.3.0.6/fs/jffs2/dir.c
---- linux-2.6.19.1/fs/jffs2/dir.c 2006-11-30 21:19:25 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/jffs2/dir.c 2006-12-16 10:19:32 +0100
-@@ -37,6 +37,8 @@ static int jffs2_mknod (struct inode *,s
- static int jffs2_rename (struct inode *, struct dentry *,
- struct inode *, struct dentry *);
+diff -urNp -x '*.orig' linux-4.9/fs/nfsd/nfs3xdr.c linux-4.9/fs/nfsd/nfs3xdr.c
+--- linux-4.9/fs/nfsd/nfs3xdr.c 2021-02-24 15:47:32.300676089 +0100
++++ linux-4.9/fs/nfsd/nfs3xdr.c 2021-02-24 15:47:45.077742470 +0100
+@@ -8,6 +8,7 @@
-+extern int jffs2_sync_flags(struct inode *);
-+
- const struct file_operations jffs2_dir_operations =
- {
- .read = generic_read_dir,
-@@ -59,6 +61,7 @@ struct inode_operations jffs2_dir_inode_
- .rename = jffs2_rename,
- .permission = jffs2_permission,
- .setattr = jffs2_setattr,
-+ .sync_flags = jffs2_sync_flags,
- .setxattr = jffs2_setxattr,
- .getxattr = jffs2_getxattr,
- .listxattr = jffs2_listxattr,
-diff -NurpP --minimal linux-2.6.19.1/fs/jffs2/file.c linux-2.6.19.1-vs2.3.0.6/fs/jffs2/file.c
---- linux-2.6.19.1/fs/jffs2/file.c 2006-11-30 21:19:25 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/jffs2/file.c 2006-12-16 10:19:32 +0100
-@@ -27,6 +27,9 @@ static int jffs2_prepare_write (struct f
- unsigned start, unsigned end);
- static int jffs2_readpage (struct file *filp, struct page *pg);
-
-+extern int jffs2_sync_flags(struct inode *);
-+
-+
- int jffs2_fsync(struct file *filp, struct dentry *dentry, int datasync)
- {
- struct inode *inode = dentry->d_inode;
-@@ -58,6 +61,7 @@ struct inode_operations jffs2_file_inode
+ #include <linux/namei.h>
+ #include <linux/sunrpc/svc_xprt.h>
++#include <linux/vs_tag.h>
+ #include "xdr3.h"
+ #include "auth.h"
+ #include "netns.h"
+@@ -98,6 +99,8 @@ static __be32 *
+ decode_sattr3(__be32 *p, struct iattr *iap)
{
- .permission = jffs2_permission,
- .setattr = jffs2_setattr,
-+ .sync_flags = jffs2_sync_flags,
- .setxattr = jffs2_setxattr,
- .getxattr = jffs2_getxattr,
- .listxattr = jffs2_listxattr,
-@@ -165,6 +169,7 @@ static int jffs2_prepare_write (struct f
- ri.dsize = cpu_to_je32(pageofs - inode->i_size);
- ri.csize = cpu_to_je32(0);
- ri.compr = JFFS2_COMPR_ZERO;
-+ ri.flags = cpu_to_je16(f->flags);
- ri.node_crc = cpu_to_je32(crc32(0, &ri, sizeof(ri)-8));
- ri.data_crc = cpu_to_je32(0);
-
-@@ -252,6 +257,7 @@ static int jffs2_commit_write (struct fi
- ri->gid = cpu_to_je16(inode->i_gid);
- ri->isize = cpu_to_je32((uint32_t)inode->i_size);
- ri->atime = ri->ctime = ri->mtime = cpu_to_je32(get_seconds());
-+ ri->flags = cpu_to_je16(f->flags);
-
- /* In 2.4, it was already kmapped by generic_file_write(). Doesn't
- hurt to do it again. The alternative is ifdefs, which are ugly. */
-diff -NurpP --minimal linux-2.6.19.1/fs/jffs2/fs.c linux-2.6.19.1-vs2.3.0.6/fs/jffs2/fs.c
---- linux-2.6.19.1/fs/jffs2/fs.c 2006-11-30 21:19:25 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/jffs2/fs.c 2006-12-16 10:21:01 +0100
-@@ -118,6 +118,9 @@ static int jffs2_do_setattr (struct inod
- ri->offset = cpu_to_je32(0);
- ri->csize = ri->dsize = cpu_to_je32(mdatalen);
- ri->compr = JFFS2_COMPR_NONE;
-+ ri->flags = cpu_to_je16(f->flags);
-+ printk("··· do set attr flags: %04x\n", f->flags);
-+
- if (ivalid & ATTR_SIZE && inode->i_size < iattr->ia_size) {
- /* It's an extension. Make it a hole node */
- ri->compr = JFFS2_COMPR_ZERO;
-@@ -181,6 +184,52 @@ static int jffs2_do_setattr (struct inod
- return 0;
- }
+ u32 tmp;
++ kuid_t kuid = GLOBAL_ROOT_UID;
++ kgid_t kgid = GLOBAL_ROOT_GID;
-+void jffs2_set_inode_flags(struct inode *inode)
-+{
-+ struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);
-+ unsigned int flags = f->flags;
-+
-+ inode->i_flags &= ~(JFFS2_INO_FLAG_IMMUTABLE |
-+ JFFS2_INO_FLAG_IUNLINK | JFFS2_INO_FLAG_BARRIER);
-+
-+ if (flags & JFFS2_INO_FLAG_IMMUTABLE)
-+ inode->i_flags |= S_IMMUTABLE;
-+ if (flags & JFFS2_INO_FLAG_IUNLINK)
-+ inode->i_flags |= S_IUNLINK;
-+ if (flags & JFFS2_INO_FLAG_BARRIER)
-+ inode->i_flags |= S_BARRIER;
-+
-+ printk("··· set %p[#%lu] flags: %04x\n", inode, inode->i_ino, flags);
-+}
-+
-+int jffs2_sync_flags(struct inode *inode)
-+{
-+ struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);
-+ unsigned int oldflags, newflags;
-+
-+ oldflags = f->flags;
-+ newflags = oldflags & ~(JFFS2_INO_FLAG_IMMUTABLE |
-+ JFFS2_INO_FLAG_IUNLINK | JFFS2_INO_FLAG_BARRIER);
-+
-+ if (IS_IMMUTABLE(inode))
-+ newflags |= JFFS2_INO_FLAG_IMMUTABLE;
-+ if (IS_IUNLINK(inode))
-+ newflags |= JFFS2_INO_FLAG_IUNLINK;
-+ if (IS_BARRIER(inode))
-+ newflags |= JFFS2_INO_FLAG_BARRIER;
-+
-+ if (oldflags ^ newflags) {
-+ f->flags = newflags;
-+ inode->i_ctime = CURRENT_TIME;
-+ /* strange requirement, see jffs2_dirty_inode() */
-+ inode->i_state |= I_DIRTY_DATASYNC;
-+ mark_inode_dirty(inode);
-+ }
-+ printk("··· sync %p[#%lu] flags: %04x ^ %04x\n",
-+ inode, inode->i_ino, oldflags, newflags);
-+ return 0;
-+}
-+
- int jffs2_setattr(struct dentry *dentry, struct iattr *iattr)
- {
- int rc;
-@@ -287,6 +336,7 @@ void jffs2_read_inode (struct inode *ino
+ iap->ia_valid = 0;
- inode->i_op = &jffs2_dir_inode_operations;
- inode->i_fop = &jffs2_dir_operations;
-+ f->flags = je16_to_cpu(latest_node.flags);
- break;
+@@ -106,15 +109,18 @@ decode_sattr3(__be32 *p, struct iattr *i
+ iap->ia_mode = ntohl(*p++);
}
- case S_IFREG:
-@@ -294,6 +344,7 @@ void jffs2_read_inode (struct inode *ino
- inode->i_fop = &jffs2_file_operations;
- inode->i_mapping->a_ops = &jffs2_file_address_operations;
- inode->i_mapping->nrpages = 0;
-+ f->flags = je16_to_cpu(latest_node.flags);
- break;
-
- case S_IFBLK:
-@@ -330,7 +381,7 @@ void jffs2_read_inode (struct inode *ino
- default:
- printk(KERN_WARNING "jffs2_read_inode(): Bogus imode %o for ino %lu\n", inode->i_mode, (unsigned long)inode->i_ino);
+ if (*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;
}
--
-+ jffs2_set_inode_flags(inode);
- up(&f->sem);
-
- D1(printk(KERN_DEBUG "jffs2_read_inode() returning\n"));
-@@ -451,6 +502,8 @@ struct inode *jffs2_new_inode (struct in
- inode->i_blocks = 0;
- inode->i_size = 0;
-
-+ f->flags = je16_to_cpu(ri->flags);
-+ jffs2_set_inode_flags(inode);
- insert_inode_hash(inode);
-
- return inode;
-diff -NurpP --minimal linux-2.6.19.1/fs/jffs2/readinode.c linux-2.6.19.1-vs2.3.0.6/fs/jffs2/readinode.c
---- linux-2.6.19.1/fs/jffs2/readinode.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/fs/jffs2/readinode.c 2006-12-16 10:19:32 +0100
-@@ -759,6 +759,7 @@ static int jffs2_do_read_inode_internal(
- latest_node->isize = cpu_to_je32(0);
- latest_node->gid = cpu_to_je16(0);
- latest_node->uid = cpu_to_je16(0);
-+ latest_node->flags = cpu_to_je16(0);
- if (f->inocache->state == INO_STATE_READING)
- jffs2_set_inocache_state(c, f->inocache, INO_STATE_PRESENT);
- return 0;
-diff -NurpP --minimal linux-2.6.19.1/fs/jffs2/write.c linux-2.6.19.1-vs2.3.0.6/fs/jffs2/write.c
---- linux-2.6.19.1/fs/jffs2/write.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/fs/jffs2/write.c 2006-12-16 10:19:32 +0100
-@@ -46,6 +46,7 @@ int jffs2_do_new_inode(struct jffs2_sb_i
- ri->totlen = cpu_to_je32(PAD(sizeof(*ri)));
- ri->hdr_crc = cpu_to_je32(crc32(0, ri, sizeof(struct jffs2_unknown_node)-4));
- ri->mode = cpu_to_jemode(mode);
-+ ri->flags = cpu_to_je16(0);
-
- f->highest_version = 1;
- ri->version = cpu_to_je32(f->highest_version);
-diff -NurpP --minimal linux-2.6.19.1/fs/jfs/acl.c linux-2.6.19.1-vs2.3.0.6/fs/jfs/acl.c
---- linux-2.6.19.1/fs/jfs/acl.c 2006-11-30 21:19:25 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/jfs/acl.c 2006-11-08 04:57:46 +0100
-@@ -232,7 +232,8 @@ int jfs_setattr(struct dentry *dentry, s
- return rc;
-
- 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 (DQUOT_TRANSFER(inode, iattr))
- return -EDQUOT;
+ if (*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;
}
-diff -NurpP --minimal linux-2.6.19.1/fs/jfs/file.c linux-2.6.19.1-vs2.3.0.6/fs/jfs/file.c
---- linux-2.6.19.1/fs/jfs/file.c 2006-11-30 21:19:25 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/jfs/file.c 2006-11-08 21:52:37 +0100
-@@ -98,6 +98,7 @@ struct inode_operations jfs_file_inode_o
- .setattr = jfs_setattr,
- .permission = jfs_permission,
- #endif
-+ .sync_flags = jfs_sync_flags,
- };
++ 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;
- const struct file_operations jfs_file_operations = {
-@@ -109,6 +110,7 @@ const struct file_operations jfs_file_op
- .aio_write = generic_file_aio_write,
- .mmap = generic_file_mmap,
- .sendfile = generic_file_sendfile,
-+ .sendpage = generic_file_sendpage,
- .splice_read = generic_file_splice_read,
- .splice_write = generic_file_splice_write,
- .fsync = jfs_fsync,
-diff -NurpP --minimal linux-2.6.19.1/fs/jfs/inode.c linux-2.6.19.1-vs2.3.0.6/fs/jfs/inode.c
---- linux-2.6.19.1/fs/jfs/inode.c 2006-11-30 21:19:25 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/jfs/inode.c 2006-11-08 04:57:50 +0100
-@@ -22,6 +22,7 @@
- #include <linux/buffer_head.h>
+@@ -167,8 +173,12 @@ encode_fattr3(struct svc_rqst *rqstp, __
+ *p++ = htonl(nfs3_ftypes[(stat->mode & S_IFMT) >> 12]);
+ *p++ = htonl((u32) (stat->mode & S_IALLUGO));
+ *p++ = htonl((u32) stat->nlink);
+- *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) 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 -urNp -x '*.orig' linux-4.9/fs/nfsd/nfs4xdr.c linux-4.9/fs/nfsd/nfs4xdr.c
+--- linux-4.9/fs/nfsd/nfs4xdr.c 2021-02-24 15:47:32.304009527 +0100
++++ linux-4.9/fs/nfsd/nfs4xdr.c 2021-02-24 15:47:45.077742470 +0100
+@@ -40,6 +40,7 @@
+ #include <linux/utsname.h>
#include <linux/pagemap.h>
- #include <linux/quotaops.h>
-+#include <linux/vs_dlimit.h>
- #include "jfs_incore.h"
- #include "jfs_inode.h"
- #include "jfs_filsys.h"
-@@ -144,6 +145,7 @@ void jfs_delete_inode(struct inode *inod
- DQUOT_INIT(inode);
- DQUOT_FREE_INODE(inode);
- DQUOT_DROP(inode);
-+ DLIMIT_FREE_INODE(inode);
+ #include <linux/sunrpc/svcauth_gss.h>
++#include <linux/vs_tag.h>
+
+ #include "idmap.h"
+ #include "acl.h"
+@@ -2679,12 +2680,16 @@ out_acl:
+ *p++ = cpu_to_be32(stat.nlink);
+ }
+ if (bmval1 & FATTR4_WORD1_OWNER) {
+- 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(xdr, rqstp, stat.gid);
++ status = nfsd4_encode_group(xdr, rqstp,
++ TAGINO_KGID(DX_TAG(dentry->d_inode),
++ stat.gid, stat.tag));
+ if (status)
+ goto out;
}
+diff -urNp -x '*.orig' linux-4.9/fs/nfsd/nfsxdr.c linux-4.9/fs/nfsd/nfsxdr.c
+--- linux-4.9/fs/nfsd/nfsxdr.c 2021-02-24 15:47:32.307342964 +0100
++++ linux-4.9/fs/nfsd/nfsxdr.c 2021-02-24 15:47:45.077742470 +0100
+@@ -7,6 +7,7 @@
+ #include "vfs.h"
+ #include "xdr.h"
+ #include "auth.h"
++#include <linux/vs_tag.h>
- clear_inode(inode);
-diff -NurpP --minimal linux-2.6.19.1/fs/jfs/ioctl.c linux-2.6.19.1-vs2.3.0.6/fs/jfs/ioctl.c
---- linux-2.6.19.1/fs/jfs/ioctl.c 2006-11-30 21:19:25 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/jfs/ioctl.c 2006-11-08 04:57:51 +0100
-@@ -9,6 +9,7 @@
- #include <linux/ctype.h>
- #include <linux/capability.h>
- #include <linux/time.h>
-+#include <linux/mount.h>
- #include <asm/current.h>
- #include <asm/uaccess.h>
+ #define NFSDDBG_FACILITY NFSDDBG_XDR
-@@ -64,7 +65,8 @@ int jfs_ioctl(struct inode * inode, stru
- case JFS_IOC_SETFLAGS: {
- unsigned int oldflags;
+@@ -89,6 +90,8 @@ static __be32 *
+ decode_sattr(__be32 *p, struct iattr *iap)
+ {
+ u32 tmp, tmp1;
++ kuid_t kuid = GLOBAL_ROOT_UID;
++ kgid_t kgid = GLOBAL_ROOT_GID;
-- if (IS_RDONLY(inode))
-+ if (IS_RDONLY(inode) ||
-+ (filp && MNT_IS_RDONLY(filp->f_vfsmnt)))
- return -EROFS;
+ iap->ia_valid = 0;
- if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
-@@ -84,8 +86,8 @@ int jfs_ioctl(struct inode * inode, stru
- * the relevant capability.
- */
- if ((oldflags & JFS_IMMUTABLE_FL) ||
-- ((flags ^ oldflags) &
-- (JFS_APPEND_FL | JFS_IMMUTABLE_FL))) {
-+ ((flags ^ oldflags) & (JFS_APPEND_FL |
-+ JFS_IMMUTABLE_FL | JFS_IUNLINK_FL))) {
- if (!capable(CAP_LINUX_IMMUTABLE))
- return -EPERM;
- }
-diff -NurpP --minimal linux-2.6.19.1/fs/jfs/jfs_dinode.h linux-2.6.19.1-vs2.3.0.6/fs/jfs/jfs_dinode.h
---- linux-2.6.19.1/fs/jfs/jfs_dinode.h 2006-11-30 21:19:25 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/jfs/jfs_dinode.h 2006-11-08 04:57:51 +0100
-@@ -162,9 +162,12 @@ struct dinode {
- #define JFS_APPEND_FL 0x01000000 /* writes to file may only append */
- #define JFS_IMMUTABLE_FL 0x02000000 /* Immutable file */
+@@ -101,15 +104,18 @@ decode_sattr(__be32 *p, struct iattr *ia
+ iap->ia_mode = tmp;
+ }
+ if ((tmp = ntohl(*p++)) != (u32)-1) {
+- 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_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_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;
+@@ -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) 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)));
--#define JFS_FL_USER_VISIBLE 0x03F80000
-+#define JFS_BARRIER_FL 0x04000000 /* Barrier for chroot() */
-+#define JFS_IUNLINK_FL 0x08000000 /* Immutable unlink */
-+
-+#define JFS_FL_USER_VISIBLE 0x0FF80000
- #define JFS_FL_USER_MODIFIABLE 0x03F80000
--#define JFS_FL_INHERIT 0x03C80000
-+#define JFS_FL_INHERIT 0x0BC80000
+ if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
+ *p++ = htonl(NFS_MAXPATHLEN);
+diff -urNp -x '*.orig' linux-4.9/fs/ocfs2/dlmglue.c linux-4.9/fs/ocfs2/dlmglue.c
+--- linux-4.9/fs/ocfs2/dlmglue.c 2021-02-24 15:47:32.314009840 +0100
++++ linux-4.9/fs/ocfs2/dlmglue.c 2021-02-24 15:47:45.077742470 +0100
+@@ -2120,6 +2120,7 @@ static void __ocfs2_stuff_meta_lvb(struc
+ lvb->lvb_iclusters = cpu_to_be32(oi->ip_clusters);
+ 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 =
+@@ -2170,6 +2171,7 @@ static void ocfs2_refresh_inode_from_lvb
- /* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
- #define JFS_IOC_GETFLAGS _IOR('f', 1, long)
-diff -NurpP --minimal linux-2.6.19.1/fs/jfs/jfs_dtree.c linux-2.6.19.1-vs2.3.0.6/fs/jfs/jfs_dtree.c
---- linux-2.6.19.1/fs/jfs/jfs_dtree.c 2006-11-30 21:19:25 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/jfs/jfs_dtree.c 2006-11-08 04:57:50 +0100
-@@ -102,6 +102,7 @@
+ i_uid_write(inode, be32_to_cpu(lvb->lvb_iuid));
+ i_gid_write(inode, be32_to_cpu(lvb->lvb_igid));
++ i_tag_write(inode, be16_to_cpu(lvb->lvb_itag));
+ inode->i_mode = be16_to_cpu(lvb->lvb_imode);
+ set_nlink(inode, be16_to_cpu(lvb->lvb_inlink));
+ ocfs2_unpack_timespec(&inode->i_atime,
+diff -urNp -x '*.orig' linux-4.9/fs/ocfs2/dlmglue.h linux-4.9/fs/ocfs2/dlmglue.h
+--- linux-4.9/fs/ocfs2/dlmglue.h 2021-02-24 15:47:32.314009840 +0100
++++ linux-4.9/fs/ocfs2/dlmglue.h 2021-02-24 15:47:45.077742470 +0100
+@@ -46,7 +46,8 @@ struct ocfs2_meta_lvb {
+ __be16 lvb_inlink;
+ __be32 lvb_iattr;
+ __be32 lvb_igeneration;
+- __be32 lvb_reserved2;
++ __be16 lvb_itag;
++ __be16 lvb_reserved2;
+ };
- #include <linux/fs.h>
+ #define OCFS2_QINFO_LVB_VERSION 1
+diff -urNp -x '*.orig' linux-4.9/fs/ocfs2/file.c linux-4.9/fs/ocfs2/file.c
+--- linux-4.9/fs/ocfs2/file.c 2021-02-24 15:47:32.314009840 +0100
++++ linux-4.9/fs/ocfs2/file.c 2021-02-24 15:47:45.077742470 +0100
+@@ -1151,7 +1151,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))
+ return 0;
+
+diff -urNp -x '*.orig' linux-4.9/fs/ocfs2/inode.c linux-4.9/fs/ocfs2/inode.c
+--- linux-4.9/fs/ocfs2/inode.c 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/fs/ocfs2/inode.c 2021-02-24 15:47:45.077742470 +0100
+@@ -28,6 +28,7 @@
+ #include <linux/highmem.h>
+ #include <linux/pagemap.h>
#include <linux/quotaops.h>
-+#include <linux/vs_dlimit.h>
- #include "jfs_incore.h"
- #include "jfs_superblock.h"
- #include "jfs_filsys.h"
-@@ -383,10 +384,10 @@ static u32 add_index(tid_t tid, struct i
- */
- if (DQUOT_ALLOC_BLOCK(ip, sbi->nbperpage))
- goto clean_up;
-- if (dbAlloc(ip, 0, sbi->nbperpage, &xaddr)) {
-- DQUOT_FREE_BLOCK(ip, sbi->nbperpage);
-- goto clean_up;
-- }
-+ if (DLIMIT_ALLOC_BLOCK(ip, sbi->nbperpage))
-+ goto clean_up_dquot;
-+ if (dbAlloc(ip, 0, sbi->nbperpage, &xaddr))
-+ goto clean_up_dlimit;
++#include <linux/vs_tag.h>
- /*
- * Save the table, we're going to overwrite it with the
-@@ -479,6 +480,12 @@ static u32 add_index(tid_t tid, struct i
+ #include <asm/byteorder.h>
+
+@@ -87,11 +88,13 @@ void ocfs2_set_inode_flags(struct inode
+ {
+ unsigned int flags = OCFS2_I(inode)->ip_attr;
- return index;
+- inode->i_flags &= ~(S_IMMUTABLE |
++ inode->i_flags &= ~(S_IMMUTABLE | S_IXUNLINK |
+ S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
-+ clean_up_dlimit:
-+ DLIMIT_FREE_BLOCK(ip, sbi->nbperpage);
+ if (flags & OCFS2_IMMUTABLE_FL)
+ inode->i_flags |= S_IMMUTABLE;
++ if (flags & OCFS2_IXUNLINK_FL)
++ inode->i_flags |= S_IXUNLINK;
+
+ if (flags & OCFS2_SYNC_FL)
+ inode->i_flags |= S_SYNC;
+@@ -101,25 +104,44 @@ void ocfs2_set_inode_flags(struct inode
+ inode->i_flags |= S_NOATIME;
+ if (flags & OCFS2_DIRSYNC_FL)
+ inode->i_flags |= S_DIRSYNC;
+
-+ clean_up_dquot:
-+ DQUOT_FREE_BLOCK(ip, sbi->nbperpage);
++ inode->i_vflags &= ~(V_BARRIER | V_COW);
+
- clean_up:
++ if (flags & OCFS2_BARRIER_FL)
++ inode->i_vflags |= V_BARRIER;
++ if (flags & OCFS2_COW_FL)
++ inode->i_vflags |= V_COW;
+ }
- jfs_ip->next_index--;
-@@ -952,6 +959,7 @@ static int dtSplitUp(tid_t tid,
- struct tlock *tlck;
- struct lv *lv;
- int quota_allocation = 0;
-+ int dlimit_allocation = 0;
+ /* Propagate flags from i_flags to OCFS2_I(inode)->ip_attr */
+ void ocfs2_get_inode_flags(struct ocfs2_inode_info *oi)
+ {
+ unsigned int flags = oi->vfs_inode.i_flags;
++ unsigned int vflags = oi->vfs_inode.i_vflags;
++
++ oi->ip_attr &= ~(OCFS2_SYNC_FL | OCFS2_APPEND_FL |
++ OCFS2_IMMUTABLE_FL | OCFS2_IXUNLINK_FL |
++ OCFS2_NOATIME_FL | OCFS2_DIRSYNC_FL |
++ OCFS2_BARRIER_FL | OCFS2_COW_FL);
++
++ if (flags & S_IMMUTABLE)
++ oi->ip_attr |= OCFS2_IMMUTABLE_FL;
++ if (flags & S_IXUNLINK)
++ oi->ip_attr |= OCFS2_IXUNLINK_FL;
+
+- oi->ip_attr &= ~(OCFS2_SYNC_FL|OCFS2_APPEND_FL|
+- OCFS2_IMMUTABLE_FL|OCFS2_NOATIME_FL|OCFS2_DIRSYNC_FL);
+ if (flags & S_SYNC)
+ oi->ip_attr |= OCFS2_SYNC_FL;
+ if (flags & S_APPEND)
+ oi->ip_attr |= OCFS2_APPEND_FL;
+- if (flags & S_IMMUTABLE)
+- oi->ip_attr |= OCFS2_IMMUTABLE_FL;
+ if (flags & S_NOATIME)
+ oi->ip_attr |= OCFS2_NOATIME_FL;
+ if (flags & S_DIRSYNC)
+ oi->ip_attr |= OCFS2_DIRSYNC_FL;
++
++ if (vflags & V_BARRIER)
++ oi->ip_attr |= OCFS2_BARRIER_FL;
++ if (vflags & V_COW)
++ oi->ip_attr |= OCFS2_COW_FL;
+ }
- /* get split page */
- smp = split->mp;
-@@ -1036,6 +1044,12 @@ static int dtSplitUp(tid_t tid,
- }
- quota_allocation += n;
+ struct inode *ocfs2_ilookup(struct super_block *sb, u64 blkno)
+@@ -278,6 +300,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;
-+ if (DLIMIT_ALLOC_BLOCK(ip, n)) {
-+ rc = -ENOSPC;
-+ goto extendOut;
-+ }
-+ dlimit_allocation += n;
-+
- if ((rc = dbReAlloc(sbi->ipbmap, xaddr, (s64) xlen,
- (s64) n, &nxaddr)))
- goto extendOut;
-@@ -1309,6 +1323,9 @@ static int dtSplitUp(tid_t tid,
- freeKeyName:
- kfree(key.name);
-
-+ /* Rollback dlimit allocation */
-+ if (rc && dlimit_allocation)
-+ DLIMIT_FREE_BLOCK(ip, dlimit_allocation);
- /* Rollback quota allocation */
- if (rc && quota_allocation)
- DQUOT_FREE_BLOCK(ip, quota_allocation);
-@@ -1376,6 +1393,12 @@ static int dtSplitPage(tid_t tid, struct
- release_metapage(rmp);
- return -EDQUOT;
- }
-+ /* Allocate blocks to dlimit. */
-+ if (DLIMIT_ALLOC_BLOCK(ip, lengthPXD(pxd))) {
-+ DQUOT_FREE_BLOCK(ip, lengthPXD(pxd));
-+ release_metapage(rmp);
-+ return -ENOSPC;
-+ }
+ sb = inode->i_sb;
+ osb = OCFS2_SB(sb);
+@@ -306,8 +330,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);
+- 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);
++ 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 -urNp -x '*.orig' linux-4.9/fs/ocfs2/inode.h linux-4.9/fs/ocfs2/inode.h
+--- linux-4.9/fs/ocfs2/inode.h 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/fs/ocfs2/inode.h 2021-02-24 15:47:45.077742470 +0100
+@@ -155,6 +155,7 @@ int ocfs2_mark_inode_dirty(handle_t *han
+
+ void ocfs2_set_inode_flags(struct inode *inode);
+ void ocfs2_get_inode_flags(struct ocfs2_inode_info *oi);
++int ocfs2_sync_flags(struct inode *inode, int, int);
- jfs_info("dtSplitPage: ip:0x%p smp:0x%p rmp:0x%p", ip, smp, rmp);
+ static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
+ {
+diff -urNp -x '*.orig' linux-4.9/fs/ocfs2/ioctl.c linux-4.9/fs/ocfs2/ioctl.c
+--- linux-4.9/fs/ocfs2/ioctl.c 2021-02-24 15:47:32.314009840 +0100
++++ linux-4.9/fs/ocfs2/ioctl.c 2021-02-24 15:47:45.077742470 +0100
+@@ -76,7 +76,41 @@ static int ocfs2_get_inode_attr(struct i
+ return status;
+ }
-@@ -1926,6 +1949,12 @@ static int dtSplitRoot(tid_t tid,
- release_metapage(rmp);
- return -EDQUOT;
+-static int ocfs2_set_inode_attr(struct inode *inode, unsigned flags,
++int ocfs2_sync_flags(struct inode *inode, int flags, int vflags)
++{
++ struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
++ struct buffer_head *bh = NULL;
++ handle_t *handle = NULL;
++ int status;
++
++ status = ocfs2_inode_lock(inode, &bh, 1);
++ if (status < 0) {
++ mlog_errno(status);
++ return status;
++ }
++ handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);
++ if (IS_ERR(handle)) {
++ status = PTR_ERR(handle);
++ mlog_errno(status);
++ goto bail_unlock;
++ }
++
++ inode->i_flags = flags;
++ inode->i_vflags = vflags;
++ ocfs2_get_inode_flags(OCFS2_I(inode));
++
++ status = ocfs2_mark_inode_dirty(handle, inode, bh);
++ if (status < 0)
++ mlog_errno(status);
++
++ ocfs2_commit_trans(osb, handle);
++bail_unlock:
++ ocfs2_inode_unlock(inode, 1);
++ brelse(bh);
++ return status;
++}
++
++int ocfs2_set_inode_attr(struct inode *inode, unsigned flags,
+ unsigned mask)
+ {
+ struct ocfs2_inode_info *ocfs2_inode = OCFS2_I(inode);
+@@ -116,6 +150,11 @@ static int ocfs2_set_inode_attr(struct i
+ goto bail_unlock;
}
-+ /* Allocate blocks to dlimit. */
-+ if (DLIMIT_ALLOC_BLOCK(ip, lengthPXD(pxd))) {
-+ DQUOT_FREE_BLOCK(ip, lengthPXD(pxd));
-+ release_metapage(rmp);
-+ return -ENOSPC;
+
++ if (IS_BARRIER(inode)) {
++ vxwprintk_task(1, "messing with the barrier.");
++ goto bail_unlock;
+ }
++
+ handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);
+ if (IS_ERR(handle)) {
+ status = PTR_ERR(handle);
+@@ -839,6 +878,7 @@ bail:
+ return status;
+ }
- BT_MARK_DIRTY(rmp, ip);
- /*
-@@ -2292,6 +2321,8 @@ static int dtDeleteUp(tid_t tid, struct
++
+ long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+ {
+ struct inode *inode = file_inode(filp);
+diff -urNp -x '*.orig' linux-4.9/fs/ocfs2/namei.c linux-4.9/fs/ocfs2/namei.c
+--- linux-4.9/fs/ocfs2/namei.c 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/fs/ocfs2/namei.c 2021-02-24 15:47:45.081075908 +0100
+@@ -41,6 +41,7 @@
+ #include <linux/slab.h>
+ #include <linux/highmem.h>
+ #include <linux/quotaops.h>
++#include <linux/vs_tag.h>
- xlen = lengthPXD(&fp->header.self);
+ #include <cluster/masklog.h>
-+ /* Free dlimit allocation. */
-+ DLIMIT_FREE_BLOCK(ip, xlen);
- /* Free quota allocation. */
- DQUOT_FREE_BLOCK(ip, xlen);
+@@ -516,6 +517,7 @@ static int __ocfs2_mknod_locked(struct i
+ struct ocfs2_extent_list *fel;
+ u16 feat;
+ struct ocfs2_inode_info *oi = OCFS2_I(inode);
++ ktag_t ktag;
-@@ -2368,6 +2399,8 @@ static int dtDeleteUp(tid_t tid, struct
+ *new_fe_bh = NULL;
- xlen = lengthPXD(&p->header.self);
+@@ -553,8 +555,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(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 -urNp -x '*.orig' linux-4.9/fs/ocfs2/ocfs2.h linux-4.9/fs/ocfs2/ocfs2.h
+--- linux-4.9/fs/ocfs2/ocfs2.h 2021-02-24 15:47:32.317343277 +0100
++++ linux-4.9/fs/ocfs2/ocfs2.h 2021-02-24 15:47:45.081075908 +0100
+@@ -289,6 +289,7 @@ enum ocfs2_mount_options
+ OCFS2_MOUNT_JOURNAL_ASYNC_COMMIT = 1 << 15, /* Journal Async Commit */
+ OCFS2_MOUNT_ERRORS_CONT = 1 << 16, /* Return EIO to the calling process on error */
+ OCFS2_MOUNT_ERRORS_ROFS = 1 << 17, /* Change filesystem to read-only on error */
++ OCFS2_MOUNT_TAGGED = 1 << 18, /* use tagging */
+ };
-+ /* Free dlimit allocation */
-+ DLIMIT_FREE_BLOCK(ip, xlen);
- /* Free quota allocation */
- DQUOT_FREE_BLOCK(ip, xlen);
+ #define OCFS2_OSB_SOFT_RO 0x0001
+diff -urNp -x '*.orig' linux-4.9/fs/ocfs2/ocfs2_fs.h linux-4.9/fs/ocfs2/ocfs2_fs.h
+--- linux-4.9/fs/ocfs2/ocfs2_fs.h 2021-02-24 15:47:32.317343277 +0100
++++ linux-4.9/fs/ocfs2/ocfs2_fs.h 2021-02-24 15:47:45.081075908 +0100
+@@ -275,6 +275,11 @@
+ #define OCFS2_TOPDIR_FL FS_TOPDIR_FL /* Top of directory hierarchies*/
+ #define OCFS2_RESERVED_FL FS_RESERVED_FL /* reserved for ext2 lib */
+
++#define OCFS2_IXUNLINK_FL FS_IXUNLINK_FL /* Immutable invert on unlink */
++
++#define OCFS2_BARRIER_FL FS_BARRIER_FL /* Barrier for chroot() */
++#define OCFS2_COW_FL FS_COW_FL /* Copy on Write marker */
++
+ #define OCFS2_FL_VISIBLE FS_FL_USER_VISIBLE /* User visible flags */
+ #define OCFS2_FL_MODIFIABLE FS_FL_USER_MODIFIABLE /* User modifiable flags */
+
+diff -urNp -x '*.orig' linux-4.9/fs/ocfs2/super.c linux-4.9/fs/ocfs2/super.c
+--- linux-4.9/fs/ocfs2/super.c 2021-02-24 15:47:32.317343277 +0100
++++ linux-4.9/fs/ocfs2/super.c 2021-02-24 15:47:45.081075908 +0100
+@@ -188,6 +188,7 @@ enum {
+ Opt_dir_resv_level,
+ Opt_journal_async_commit,
+ Opt_err_cont,
++ Opt_tag, Opt_notag, Opt_tagid,
+ Opt_err,
+ };
-diff -NurpP --minimal linux-2.6.19.1/fs/jfs/jfs_extent.c linux-2.6.19.1-vs2.3.0.6/fs/jfs/jfs_extent.c
---- linux-2.6.19.1/fs/jfs/jfs_extent.c 2006-11-30 21:19:25 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/jfs/jfs_extent.c 2006-11-08 04:57:50 +0100
-@@ -18,6 +18,7 @@
+@@ -221,6 +222,9 @@ static const match_table_t tokens = {
+ {Opt_dir_resv_level, "dir_resv_level=%u"},
+ {Opt_journal_async_commit, "journal_async_commit"},
+ {Opt_err_cont, "errors=continue"},
++ {Opt_tag, "tag"},
++ {Opt_notag, "notag"},
++ {Opt_tagid, "tagid=%u"},
+ {Opt_err, NULL}
+ };
- #include <linux/fs.h>
- #include <linux/quotaops.h>
-+#include <linux/vs_dlimit.h>
- #include "jfs_incore.h"
- #include "jfs_inode.h"
- #include "jfs_superblock.h"
-@@ -147,6 +148,14 @@ extAlloc(struct inode *ip, s64 xlen, s64
- return -EDQUOT;
+@@ -672,6 +676,13 @@ static int ocfs2_remount(struct super_bl
+ goto out;
}
-+ /* Allocate blocks to dlimit. */
-+ if (DLIMIT_ALLOC_BLOCK(ip, nxlen)) {
-+ DQUOT_FREE_BLOCK(ip, nxlen);
-+ dbFree(ip, nxaddr, (s64) nxlen);
-+ mutex_unlock(&JFS_IP(ip)->commit_mutex);
-+ return -ENOSPC;
++ if ((osb->s_mount_opt & OCFS2_MOUNT_TAGGED) !=
++ (parsed_options.mount_opt & OCFS2_MOUNT_TAGGED)) {
++ ret = -EINVAL;
++ mlog(ML_ERROR, "Cannot change tagging on remount\n");
++ goto out;
+ }
+
- /* determine the value of the extent flag */
- xflag = abnr ? XAD_NOTRECORDED : 0;
-
-@@ -164,6 +173,7 @@ extAlloc(struct inode *ip, s64 xlen, s64
- */
- if (rc) {
- dbFree(ip, nxaddr, nxlen);
-+ DLIMIT_FREE_BLOCK(ip, nxlen);
- DQUOT_FREE_BLOCK(ip, nxlen);
- mutex_unlock(&JFS_IP(ip)->commit_mutex);
- return (rc);
-@@ -261,6 +271,13 @@ int extRealloc(struct inode *ip, s64 nxl
- mutex_unlock(&JFS_IP(ip)->commit_mutex);
- return -EDQUOT;
- }
-+ /* Allocate blocks to dlimit. */
-+ if (DLIMIT_ALLOC_BLOCK(ip, nxlen)) {
-+ DQUOT_FREE_BLOCK(ip, nxlen);
-+ dbFree(ip, nxaddr, (s64) nxlen);
-+ up(&JFS_IP(ip)->commit_sem);
-+ return -ENOSPC;
-+ }
+ /* We're going to/from readonly mode. */
+ if ((*flags & MS_RDONLY) != (sb->s_flags & MS_RDONLY)) {
+ /* Disable quota accounting before remounting RO */
+@@ -1161,6 +1172,9 @@ static int ocfs2_fill_super(struct super
- delta = nxlen - xlen;
+ ocfs2_complete_mount_recovery(osb);
-@@ -297,6 +314,7 @@ int extRealloc(struct inode *ip, s64 nxl
- /* extend the extent */
- if ((rc = xtExtend(0, ip, xoff + xlen, (int) nextend, 0))) {
- dbFree(ip, xaddr + xlen, delta);
-+ DLIMIT_FREE_BLOCK(ip, nxlen);
- DQUOT_FREE_BLOCK(ip, nxlen);
- goto exit;
- }
-@@ -308,6 +326,7 @@ int extRealloc(struct inode *ip, s64 nxl
- */
- if ((rc = xtTailgate(0, ip, xoff, (int) ntail, nxaddr, 0))) {
- dbFree(ip, nxaddr, nxlen);
-+ DLIMIT_FREE_BLOCK(ip, nxlen);
- DQUOT_FREE_BLOCK(ip, nxlen);
- goto exit;
- }
-diff -NurpP --minimal linux-2.6.19.1/fs/jfs/jfs_filsys.h linux-2.6.19.1-vs2.3.0.6/fs/jfs/jfs_filsys.h
---- linux-2.6.19.1/fs/jfs/jfs_filsys.h 2006-11-30 21:19:25 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/jfs/jfs_filsys.h 2006-11-08 04:57:46 +0100
-@@ -84,6 +84,7 @@
- #define JFS_DIR_INDEX 0x00200000 /* Persistant index for */
- /* directory entries */
++ if (osb->s_mount_opt & OCFS2_MOUNT_TAGGED)
++ sb->s_flags |= MS_TAGGED;
++
+ if (ocfs2_mount_local(osb))
+ snprintf(nodestr, sizeof(nodestr), "local");
+ else
+@@ -1480,6 +1494,20 @@ static int ocfs2_parse_options(struct su
+ case Opt_journal_async_commit:
+ mopt->mount_opt |= OCFS2_MOUNT_JOURNAL_ASYNC_COMMIT;
+ break;
++#ifndef CONFIG_TAGGING_NONE
++ case Opt_tag:
++ mopt->mount_opt |= OCFS2_MOUNT_TAGGED;
++ break;
++ case Opt_notag:
++ mopt->mount_opt &= ~OCFS2_MOUNT_TAGGED;
++ break;
++#endif
++#ifdef CONFIG_PROPAGATE
++ case Opt_tagid:
++ /* use args[0] */
++ mopt->mount_opt |= OCFS2_MOUNT_TAGGED;
++ break;
++#endif
+ default:
+ mlog(ML_ERROR,
+ "Unrecognized mount option \"%s\" "
+diff -urNp -x '*.orig' linux-4.9/fs/open.c linux-4.9/fs/open.c
+--- linux-4.9/fs/open.c 2021-02-24 15:47:32.320676715 +0100
++++ linux-4.9/fs/open.c 2021-02-24 15:47:45.081075908 +0100
+@@ -31,6 +31,11 @@
+ #include <linux/ima.h>
+ #include <linux/dnotify.h>
+ #include <linux/compat.h>
++#include <linux/vs_base.h>
++#include <linux/vs_limit.h>
++#include <linux/vs_tag.h>
++#include <linux/vs_cowbl.h>
++#include <linux/vserver/dlimit.h>
-+#define JFS_TAGGED 0x00800000 /* Context Tagging */
+ #include "internal.h"
- /*
- * buffer cache configuration
-diff -NurpP --minimal linux-2.6.19.1/fs/jfs/jfs_imap.c linux-2.6.19.1-vs2.3.0.6/fs/jfs/jfs_imap.c
---- linux-2.6.19.1/fs/jfs/jfs_imap.c 2006-11-30 21:19:25 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/jfs/jfs_imap.c 2006-11-30 18:53:18 +0100
-@@ -45,6 +45,7 @@
- #include <linux/buffer_head.h>
- #include <linux/pagemap.h>
- #include <linux/quotaops.h>
-+#include <linux/vs_tag.h>
+@@ -65,12 +70,17 @@ int do_truncate(struct dentry *dentry, l
+ return ret;
+ }
- #include "jfs_incore.h"
- #include "jfs_inode.h"
-@@ -3075,6 +3076,8 @@ static int copy_from_dinode(struct dinod
+-long vfs_truncate(const struct path *path, loff_t length)
++long vfs_truncate(struct path *path, loff_t length)
{
- 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;
+ struct inode *inode;
+ struct dentry *upperdentry;
+ long error;
- jfs_ip->fileset = le32_to_cpu(dip->di_fileset);
- jfs_ip->mode2 = le32_to_cpu(dip->di_mode);
-@@ -3094,14 +3097,18 @@ static int copy_from_dinode(struct dinod
- }
- ip->i_nlink = le32_to_cpu(dip->di_nlink);
++#ifdef CONFIG_VSERVER_COWBL
++ error = cow_check_and_break(path);
++ if (error)
++ goto out;
++#endif
+ inode = path->dentry->d_inode;
-- 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 = INOTAG_UID(DX_TAG(ip), uid, gid);
- if (sbi->uid == -1)
- ip->i_uid = jfs_ip->saved_uid;
- else {
- ip->i_uid = sbi->uid;
+ /* For directories it's -EISDIR, for other non-regulars - -EINVAL */
+@@ -584,6 +594,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);
+@@ -618,13 +635,15 @@ retry_deleg:
+ if (!uid_valid(uid))
+ return -EINVAL;
+ newattrs.ia_valid |= ATTR_UID;
+- 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 = gid;
++ newattrs.ia_gid = make_kgid(&init_user_ns,
++ dx_map_gid(group));
+ }
+ if (!S_ISDIR(inode->i_mode))
+ newattrs.ia_valid |=
+@@ -662,6 +681,10 @@ retry:
+ 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:
+diff -urNp -x '*.orig' linux-4.9/fs/proc/array.c linux-4.9/fs/proc/array.c
+--- linux-4.9/fs/proc/array.c 2021-02-24 15:47:32.324010153 +0100
++++ linux-4.9/fs/proc/array.c 2021-02-24 15:47:45.081075908 +0100
+@@ -86,6 +86,8 @@
+ #include <linux/string_helpers.h>
+ #include <linux/user_namespace.h>
+ #include <linux/fs_struct.h>
++#include <linux/vs_context.h>
++#include <linux/vs_network.h>
-- 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)
- ip->i_gid = jfs_ip->saved_gid;
- else {
-@@ -3166,14 +3173,12 @@ 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);
-- else
-- dip->di_uid = cpu_to_le32(jfs_ip->saved_uid);
-- if (sbi->gid == -1)
-- dip->di_gid = cpu_to_le32(ip->i_gid);
-- 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));
-+
- /*
- * mode2 is only needed for storing the higher order bits.
- * Trust i_mode for the lower order ones
-diff -NurpP --minimal linux-2.6.19.1/fs/jfs/jfs_inode.c linux-2.6.19.1-vs2.3.0.6/fs/jfs/jfs_inode.c
---- linux-2.6.19.1/fs/jfs/jfs_inode.c 2006-11-30 21:19:25 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/jfs/jfs_inode.c 2006-11-08 04:57:51 +0100
-@@ -18,6 +18,8 @@
-
- #include <linux/fs.h>
- #include <linux/quotaops.h>
-+#include <linux/vs_dlimit.h>
-+#include <linux/vs_tag.h>
- #include "jfs_incore.h"
- #include "jfs_inode.h"
- #include "jfs_filsys.h"
-@@ -30,19 +32,59 @@ void jfs_set_inode_flags(struct inode *i
+ #include <asm/pgtable.h>
+ #include <asm/processor.h>
+@@ -170,6 +172,9 @@ static inline void task_state(struct seq
+ ppid = pid_alive(p) ?
+ task_tgid_nr_ns(rcu_dereference(p->real_parent), ns) : 0;
+
++ if (unlikely(vx_current_initpid(p->pid)))
++ ppid = 0;
++
+ tracer = ptrace_parent(p);
+ if (tracer)
+ tpid = task_pid_nr_ns(tracer, ns);
+@@ -307,8 +312,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,
+- kernel_cap_t *a)
++void render_cap_t(struct seq_file *m, const char *header,
++ struct vx_info *vxi, kernel_cap_t *a)
{
- unsigned int flags = JFS_IP(inode)->mode2;
+ unsigned __capi;
-- inode->i_flags &= ~(S_IMMUTABLE | S_APPEND |
-- S_NOATIME | S_DIRSYNC | S_SYNC);
-+ inode->i_flags &= ~(S_IMMUTABLE | S_IUNLINK | S_BARRIER |
-+ S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
+@@ -335,11 +340,12 @@ static inline void task_cap(struct seq_f
+ cap_ambient = cred->cap_ambient;
+ rcu_read_unlock();
- if (flags & JFS_IMMUTABLE_FL)
- inode->i_flags |= S_IMMUTABLE;
-+ if (flags & JFS_IUNLINK_FL)
-+ inode->i_flags |= S_IUNLINK;
-+ if (flags & JFS_BARRIER_FL)
-+ inode->i_flags |= S_BARRIER;
-+
-+ if (flags & JFS_SYNC_FL)
-+ inode->i_flags |= S_SYNC;
- if (flags & JFS_APPEND_FL)
- inode->i_flags |= S_APPEND;
- if (flags & JFS_NOATIME_FL)
- inode->i_flags |= S_NOATIME;
- if (flags & JFS_DIRSYNC_FL)
- inode->i_flags |= S_DIRSYNC;
-- if (flags & JFS_SYNC_FL)
-- inode->i_flags |= S_SYNC;
-+}
-+
-+int jfs_sync_flags(struct inode *inode)
-+{
-+ unsigned int oldflags, newflags;
-+
-+ oldflags = JFS_IP(inode)->mode2;
-+ newflags = oldflags & ~(JFS_APPEND_FL |
-+ JFS_IMMUTABLE_FL | JFS_IUNLINK_FL |
-+ JFS_BARRIER_FL | JFS_NOATIME_FL |
-+ JFS_SYNC_FL | JFS_DIRSYNC_FL);
-+
-+ if (IS_APPEND(inode))
-+ newflags |= JFS_APPEND_FL;
-+ if (IS_IMMUTABLE(inode))
-+ newflags |= JFS_IMMUTABLE_FL;
-+ if (IS_IUNLINK(inode))
-+ newflags |= JFS_IUNLINK_FL;
-+ if (IS_BARRIER(inode))
-+ newflags |= JFS_BARRIER_FL;
-+
-+ /* we do not want to copy superblock flags */
-+ if (inode->i_flags & S_NOATIME)
-+ newflags |= JFS_NOATIME_FL;
-+ if (inode->i_flags & S_SYNC)
-+ newflags |= JFS_SYNC_FL;
-+ if (inode->i_flags & S_DIRSYNC)
-+ newflags |= JFS_DIRSYNC_FL;
-+
-+ if (oldflags ^ newflags) {
-+ JFS_IP(inode)->mode2 = newflags;
-+ inode->i_ctime = CURRENT_TIME;
-+ mark_inode_dirty(inode);
-+ }
-+ return 0;
+- render_cap_t(m, "CapInh:\t", &cap_inheritable);
+- render_cap_t(m, "CapPrm:\t", &cap_permitted);
+- render_cap_t(m, "CapEff:\t", &cap_effective);
+- render_cap_t(m, "CapBnd:\t", &cap_bset);
+- render_cap_t(m, "CapAmb:\t", &cap_ambient);
++ /* FIXME: maybe move the p->vx_info masking to __task_cred() ? */
++ render_cap_t(m, "CapInh:\t", p->vx_info, &cap_inheritable);
++ render_cap_t(m, "CapPrm:\t", p->vx_info, &cap_permitted);
++ render_cap_t(m, "CapEff:\t", p->vx_info, &cap_effective);
++ render_cap_t(m, "CapBnd:\t", p->vx_info, &cap_bset);
++ render_cap_t(m, "CapAmb:\t", p->vx_info, &cap_ambient);
}
- /*
-@@ -90,10 +132,17 @@ struct inode *ialloc(struct inode *paren
- jfs_inode->saved_uid = inode->i_uid;
- jfs_inode->saved_gid = inode->i_gid;
+ static inline void task_seccomp(struct seq_file *m, struct task_struct *p)
+@@ -391,6 +397,43 @@ static void task_cpus_allowed(struct seq
+ cpumask_pr_args(&task->cpus_allowed));
+ }
-+ inode->i_tag = dx_current_fstag(sb);
-+ if (DLIMIT_ALLOC_INODE(inode)) {
-+ iput(inode);
-+ return NULL;
-+ }
++int proc_pid_nsproxy(struct seq_file *m, struct pid_namespace *ns,
++ struct pid *pid, struct task_struct *task)
++{
++ seq_printf(m, "Proxy:\t%p(%c)\n"
++ "Count:\t%u\n"
++ "uts:\t%p(%c)\n"
++ "ipc:\t%p(%c)\n"
++ "mnt:\t%p(%c)\n"
++ "pid:\t%p(%c)\n"
++ "net:\t%p(%c)\n",
++ task->nsproxy,
++ (task->nsproxy == init_task.nsproxy ? 'I' : '-'),
++ atomic_read(&task->nsproxy->count),
++ task->nsproxy->uts_ns,
++ (task->nsproxy->uts_ns == init_task.nsproxy->uts_ns ? 'I' : '-'),
++ task->nsproxy->ipc_ns,
++ (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_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;
++}
+
- /*
- * Allocate inode to quota.
- */
- if (DQUOT_ALLOC_INODE(inode)) {
-+ DLIMIT_FREE_INODE(inode);
- DQUOT_DROP(inode);
- inode->i_flags |= S_NOQUOTA;
- inode->i_nlink = 0;
-diff -NurpP --minimal linux-2.6.19.1/fs/jfs/jfs_inode.h linux-2.6.19.1-vs2.3.0.6/fs/jfs/jfs_inode.h
---- linux-2.6.19.1/fs/jfs/jfs_inode.h 2006-11-30 21:19:25 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/jfs/jfs_inode.h 2006-11-08 04:57:51 +0100
-@@ -31,6 +31,7 @@ extern void jfs_truncate(struct inode *)
- extern void jfs_truncate_nolock(struct inode *, loff_t);
- extern void jfs_free_zero_link(struct inode *);
- extern struct dentry *jfs_get_parent(struct dentry *dentry);
-+extern int jfs_sync_flags(struct inode *);
- extern void jfs_set_inode_flags(struct inode *);
- extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int);
-
-diff -NurpP --minimal linux-2.6.19.1/fs/jfs/jfs_xtree.c linux-2.6.19.1-vs2.3.0.6/fs/jfs/jfs_xtree.c
---- linux-2.6.19.1/fs/jfs/jfs_xtree.c 2006-11-30 21:19:26 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/jfs/jfs_xtree.c 2006-11-08 04:57:50 +0100
-@@ -21,6 +21,7 @@
++void task_vs_id(struct seq_file *m, struct task_struct *task)
++{
++ if (task_vx_flags(task, VXF_HIDE_VINFO, 0))
++ return;
++
++ 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)
+ {
+@@ -408,6 +451,7 @@ int proc_pid_status(struct seq_file *m,
+ task_seccomp(m, task);
+ task_cpus_allowed(m, task);
+ cpuset_task_status_allowed(m, task);
++ task_vs_id(m, task);
+ task_context_switch_counts(m, task);
+ return 0;
+ }
+@@ -523,6 +567,17 @@ static int do_task_stat(struct seq_file
+ /* convert nsec -> ticks */
+ start_time = nsec_to_clock_t(task->real_start_time);
- #include <linux/fs.h>
- #include <linux/quotaops.h>
-+#include <linux/vs_dlimit.h>
- #include "jfs_incore.h"
- #include "jfs_filsys.h"
- #include "jfs_metapage.h"
-@@ -841,7 +842,12 @@ int xtInsert(tid_t tid, /* transaction
- hint = 0;
- if ((rc = DQUOT_ALLOC_BLOCK(ip, xlen)))
- goto out;
-+ if ((rc = DLIMIT_ALLOC_BLOCK(ip, xlen))) {
-+ DQUOT_FREE_BLOCK(ip, xlen);
-+ goto out;
-+ }
- if ((rc = dbAlloc(ip, hint, (s64) xlen, &xaddr))) {
-+ DLIMIT_FREE_BLOCK(ip, xlen);
- DQUOT_FREE_BLOCK(ip, xlen);
- goto out;
- }
-@@ -871,6 +877,7 @@ int xtInsert(tid_t tid, /* transaction
- /* undo data extent allocation */
- if (*xaddrp == 0) {
- dbFree(ip, xaddr, (s64) xlen);
-+ DLIMIT_FREE_BLOCK(ip, xlen);
- DQUOT_FREE_BLOCK(ip, xlen);
- }
- return rc;
-@@ -1231,6 +1238,7 @@ xtSplitPage(tid_t tid, struct inode *ip,
- struct tlock *tlck;
- struct xtlock *sxtlck = NULL, *rxtlck = NULL;
- int quota_allocation = 0;
-+ int dlimit_allocation = 0;
-
- smp = split->mp;
- sp = XT_PAGE(ip, smp);
-@@ -1250,6 +1258,13 @@ xtSplitPage(tid_t tid, struct inode *ip,
-
- quota_allocation += lengthPXD(pxd);
-
-+ /* Allocate blocks to dlimit. */
-+ if (DLIMIT_ALLOC_BLOCK(ip, lengthPXD(pxd))) {
-+ rc = -ENOSPC;
-+ goto clean_up;
++ /* fixup start time for virt uptime */
++ if (vx_flags(VXF_VIRT_UPTIME, 0)) {
++ unsigned long long bias =
++ current->vx_info->cvirt.bias_clock;
++
++ if (start_time > bias)
++ start_time -= bias;
++ else
++ start_time = 0;
+ }
-+ dlimit_allocation += lengthPXD(pxd);
+
- /*
- * allocate the new right page for the split
- */
-@@ -1451,6 +1466,9 @@ xtSplitPage(tid_t tid, struct inode *ip,
-
- clean_up:
-
-+ /* Rollback dlimit allocation. */
-+ if (dlimit_allocation)
-+ DLIMIT_FREE_BLOCK(ip, dlimit_allocation);
- /* Rollback quota allocation. */
- if (quota_allocation)
- DQUOT_FREE_BLOCK(ip, quota_allocation);
-@@ -1515,6 +1533,12 @@ xtSplitRoot(tid_t tid,
- release_metapage(rmp);
- return -EDQUOT;
+ 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 -urNp -x '*.orig' linux-4.9/fs/proc/base.c linux-4.9/fs/proc/base.c
+--- linux-4.9/fs/proc/base.c 2021-02-24 15:47:32.324010153 +0100
++++ linux-4.9/fs/proc/base.c 2021-02-24 15:47:45.081075908 +0100
+@@ -87,6 +87,8 @@
+ #include <linux/slab.h>
+ #include <linux/flex_array.h>
+ #include <linux/posix-timers.h>
++#include <linux/vs_context.h>
++#include <linux/vs_network.h>
+ #ifdef CONFIG_HARDWALL
+ #include <asm/hardwall.h>
+ #endif
+@@ -1079,10 +1081,15 @@ static int __set_oom_adj(struct file *fi
+ mutex_lock(&oom_adj_mutex);
+ if (legacy) {
+ if (oom_adj < task->signal->oom_score_adj &&
+- !capable(CAP_SYS_RESOURCE)) {
++ !vx_capable(CAP_SYS_RESOURCE, VXC_OOM_ADJUST)) {
+ err = -EACCES;
+ goto err_unlock;
+ }
++
++ /* prevent guest processes from circumventing the oom killer */
++ if (vx_current_xid() && (oom_adj == OOM_DISABLE))
++ oom_adj = OOM_ADJUST_MIN;
++
+ /*
+ * /proc/pid/oom_adj is provided for legacy purposes, ask users to use
+ * /proc/pid/oom_score_adj instead.
+@@ -1708,6 +1715,8 @@ struct inode *proc_pid_make_inode(struct
+ inode->i_gid = cred->egid;
+ rcu_read_unlock();
}
-+ /* Allocate blocks to dlimit. */
-+ if (DLIMIT_ALLOC_BLOCK(ip, lengthPXD(pxd))) {
-+ DQUOT_FREE_BLOCK(ip, lengthPXD(pxd));
-+ release_metapage(rmp);
-+ return -ENOSPC;
-+ }
++ /* procfs is xid tagged */
++ i_tag_write(inode, (vtag_t)vx_task_xid(task));
+ security_task_to_inode(task, inode);
- jfs_info("xtSplitRoot: ip:0x%p rmp:0x%p", ip, rmp);
+ out:
+@@ -1753,6 +1762,8 @@ int pid_getattr(struct vfsmount *mnt, st
-@@ -3941,6 +3965,8 @@ s64 xtTruncate(tid_t tid, struct inode *
- else
- ip->i_size = newsize;
+ /* dentry stuff */
-+ /* update dlimit allocation to reflect freed blocks */
-+ DLIMIT_FREE_BLOCK(ip, nfreed);
- /* update quota allocation to reflect freed blocks */
- DQUOT_FREE_BLOCK(ip, nfreed);
++// 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
+@@ -1781,6 +1792,19 @@ int pid_revalidate(struct dentry *dentry
+ task = get_proc_task(inode);
-diff -NurpP --minimal linux-2.6.19.1/fs/jfs/namei.c linux-2.6.19.1-vs2.3.0.6/fs/jfs/namei.c
---- linux-2.6.19.1/fs/jfs/namei.c 2006-11-30 21:19:26 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/jfs/namei.c 2006-11-30 18:53:18 +0100
-@@ -20,6 +20,7 @@
- #include <linux/fs.h>
- #include <linux/ctype.h>
- #include <linux/quotaops.h>
-+#include <linux/vs_tag.h>
- #include "jfs_incore.h"
- #include "jfs_superblock.h"
- #include "jfs_inode.h"
-@@ -1461,6 +1462,7 @@ static struct dentry *jfs_lookup(struct
- return ERR_PTR(-EACCES);
- }
+ 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();
+@@ -2445,6 +2469,13 @@ static struct dentry *proc_pident_lookup
+ if (!task)
+ goto out_no_task;
-+ dx_propagate_tag(nd, ip);
- dentry = d_splice_alias(ip, dentry);
++ /* TODO: maybe we can come up with a generic approach? */
++ if (task_vx_flags(task, VXF_HIDE_VINFO, 0) &&
++ (dentry->d_name.len == 5) &&
++ (!memcmp(dentry->d_name.name, "vinfo", 5) ||
++ !memcmp(dentry->d_name.name, "ninfo", 5)))
++ goto out;
++
+ /*
+ * Yes, it does not scale. And it should not. Don't add
+ * new entries into /proc/<tgid>/ without very good reasons.
+@@ -2884,6 +2915,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 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),
+@@ -2948,6 +2984,8 @@ static const struct pid_entry tgid_base_
+ #ifdef CONFIG_CGROUPS
+ ONE("cgroup", S_IRUGO, proc_cgroup_show),
+ #endif
++ 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),
+@@ -3163,7 +3201,7 @@ retry:
+ iter.task = NULL;
+ pid = find_ge_pid(iter.tgid, ns);
+ if (pid) {
+- iter.tgid = pid_nr_ns(pid, ns);
++ iter.tgid = pid_unmapped_nr_ns(pid, ns);
+ 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
+@@ -3223,8 +3261,10 @@ int proc_pid_readdir(struct file *file,
+ if (!has_pid_permissions(ns, iter.task, 2))
+ continue;
- if (dentry && (JFS_SBI(dip->i_sb)->mntflag & JFS_OS2))
-@@ -1513,6 +1515,7 @@ struct inode_operations jfs_dir_inode_op
- .setattr = jfs_setattr,
- .permission = jfs_permission,
+- 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_fill_cache(file, ctx, name, len,
+ proc_pid_instantiate, iter.task, NULL)) {
+ put_task_struct(iter.task);
+@@ -3361,6 +3401,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
-+ .sync_flags = jfs_sync_flags,
++ ONE("nsproxy", S_IRUGO, proc_pid_nsproxy),
};
- const struct file_operations jfs_dir_operations = {
-diff -NurpP --minimal linux-2.6.19.1/fs/jfs/super.c linux-2.6.19.1-vs2.3.0.6/fs/jfs/super.c
---- linux-2.6.19.1/fs/jfs/super.c 2006-11-30 21:19:26 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/jfs/super.c 2006-11-08 04:57:51 +0100
-@@ -194,7 +194,8 @@ static void jfs_put_super(struct super_b
- 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_tag, Opt_notag, Opt_tagid
- };
+ static int proc_tid_base_readdir(struct file *file, struct dir_context *ctx)
+@@ -3427,6 +3468,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))
++ goto out;
- static match_table_t tokens = {
-@@ -204,6 +205,10 @@ static match_table_t tokens = {
- {Opt_resize, "resize=%u"},
- {Opt_resize_nosize, "resize"},
- {Opt_errors, "errors=%s"},
-+ {Opt_tag, "tag"},
-+ {Opt_notag, "notag"},
-+ {Opt_tagid, "tagid=%u"},
-+ {Opt_tag, "tagxid"},
- {Opt_ignore, "noquota"},
- {Opt_ignore, "quota"},
- {Opt_usrquota, "usrquota"},
-@@ -338,6 +343,20 @@ static int parse_options(char *options,
- }
- break;
- }
-+#ifndef CONFIG_TAGGING_NONE
-+ case Opt_tag:
-+ *flag |= JFS_TAGGED;
-+ break;
-+ case Opt_notag:
-+ *flag &= JFS_TAGGED;
-+ break;
-+#endif
-+#ifdef CONFIG_PROPAGATE
-+ case Opt_tagid:
-+ /* use args[0] */
-+ *flag |= JFS_TAGGED;
-+ break;
-+#endif
- default:
- printk("jfs: Unrecognized mount option \"%s\" "
- " or missing value\n", p);
-@@ -368,6 +387,13 @@ static int jfs_remount(struct super_bloc
- if (!parse_options(data, sb, &newLVSize, &flag)) {
- return -EINVAL;
+ ns = dentry->d_sb->s_fs_info;
+ rcu_read_lock();
+diff -urNp -x '*.orig' linux-4.9/fs/proc/generic.c linux-4.9/fs/proc/generic.c
+--- linux-4.9/fs/proc/generic.c 2021-02-24 15:47:32.324010153 +0100
++++ linux-4.9/fs/proc/generic.c 2021-02-24 15:47:45.081075908 +0100
+@@ -22,6 +22,7 @@
+ #include <linux/bitops.h>
+ #include <linux/spinlock.h>
+ #include <linux/completion.h>
++#include <linux/vserver/inode.h>
+ #include <asm/uaccess.h>
+
+ #include "internal.h"
+@@ -66,8 +67,16 @@ static struct proc_dir_entry *pde_subdir
+ node = node->rb_left;
+ else if (result > 0)
+ node = node->rb_right;
+- else
++ else {
++ if (!vx_hide_check(0, de->vx_flags)) {
++ vxdprintk(VXD_CBIT(misc, 9),
++ VS_Q("%*s")
++ " hidden in pde_subdir_find()",
++ de->namelen, de->name);
++ return 0;
++ }
+ return de;
++ }
}
+ return NULL;
+ }
+@@ -241,6 +250,8 @@ struct dentry *proc_lookup_de(struct pro
+ return ERR_PTR(-ENOMEM);
+ d_set_d_op(dentry, &simple_dentry_operations);
+ d_add(dentry, inode);
++ /* generic proc entries belong to the host */
++ i_tag_write(inode, 0);
+ return NULL;
+ }
+ read_unlock(&proc_subdir_lock);
+@@ -287,6 +298,12 @@ 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;
++ }
+ read_unlock(&proc_subdir_lock);
+ if (!dir_emit(ctx, de->name, de->namelen,
+ de->low_ino, de->mode >> 12)) {
+@@ -294,6 +311,7 @@ int proc_readdir_de(struct proc_dir_entr
+ return 0;
+ }
+ read_lock(&proc_subdir_lock);
++ skip:
+ ctx->pos++;
+ next = pde_subdir_next(de);
+ pde_put(de);
+@@ -387,6 +405,7 @@ static struct proc_dir_entry *__proc_cre
+ ent->mode = mode;
+ ent->nlink = nlink;
+ ent->subdir = RB_ROOT;
++ ent->vx_flags = IATTR_PROC_DEFAULT;
+ atomic_set(&ent->count, 1);
+ spin_lock_init(&ent->pde_unload_lock);
+ INIT_LIST_HEAD(&ent->pde_openers);
+@@ -413,7 +432,8 @@ struct proc_dir_entry *proc_symlink(cons
+ kfree(ent->data);
+ kfree(ent);
+ ent = NULL;
+- }
++ } else
++ ent->vx_flags = IATTR_PROC_SYMLINK;
+ } else {
+ kfree(ent);
+ ent = NULL;
+diff -urNp -x '*.orig' linux-4.9/fs/proc/inode.c linux-4.9/fs/proc/inode.c
+--- linux-4.9/fs/proc/inode.c 2021-02-24 15:47:32.324010153 +0100
++++ linux-4.9/fs/proc/inode.c 2021-02-24 15:47:45.081075908 +0100
+@@ -433,6 +433,8 @@ struct inode *proc_get_inode(struct supe
+ inode->i_uid = de->uid;
+ inode->i_gid = de->gid;
+ }
++ if (de->vx_flags)
++ PROC_I(inode)->vx_flags = de->vx_flags;
+ if (de->size)
+ inode->i_size = de->size;
+ if (de->nlink)
+diff -urNp -x '*.orig' linux-4.9/fs/proc/internal.h linux-4.9/fs/proc/internal.h
+--- linux-4.9/fs/proc/internal.h 2021-02-24 15:47:32.324010153 +0100
++++ linux-4.9/fs/proc/internal.h 2021-02-24 15:47:45.084409345 +0100
+@@ -14,6 +14,7 @@
+ #include <linux/spinlock.h>
+ #include <linux/atomic.h>
+ #include <linux/binfmts.h>
++#include <linux/vs_pid.h>
+
+ struct ctl_table_header;
+ struct mempolicy;
+@@ -34,6 +35,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;
+@@ -51,15 +53,22 @@ struct proc_dir_entry {
+ char name[];
+ };
+
++struct vx_info;
++struct nx_info;
+
-+ 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;
-+ }
-+
- if (newLVSize) {
- if (sb->s_flags & MS_RDONLY) {
- printk(KERN_ERR
-@@ -439,6 +465,9 @@ static int jfs_fill_super(struct super_b
- #ifdef CONFIG_JFS_POSIX_ACL
- sb->s_flags |= MS_POSIXACL;
- #endif
-+ /* map mount option tagxid */
-+ if (sbi->flag & JFS_TAGGED)
-+ sb->s_flags |= MS_TAGGED;
+ 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);
+ };
- if (newLVSize) {
- printk(KERN_ERR "resize option for remount only\n");
-@@ -615,10 +644,11 @@ static int jfs_show_options(struct seq_f
- * acquiring the locks... As quota files are never truncated and quota code
- * itself serializes the operations (and noone else should touch the files)
- * we don't have to be afraid of races */
--static ssize_t jfs_quota_read(struct super_block *sb, int type, char *data,
-+static ssize_t jfs_quota_read(struct dqhash *hash, int type, char *data,
- size_t len, loff_t off)
- {
-- struct inode *inode = sb_dqopt(sb)->files[type];
-+ struct inode *inode = dqh_dqopt(hash)->files[type];
-+ struct super_block *sb = hash->dqh_sb;
- sector_t blk = off >> sb->s_blocksize_bits;
- int err = 0;
- int offset = off & (sb->s_blocksize - 1);
-@@ -660,10 +690,11 @@ static ssize_t jfs_quota_read(struct sup
+ struct proc_inode {
+ struct pid *pid;
++ int vx_flags;
+ unsigned int fd;
+ union proc_op op;
+ struct proc_dir_entry *pde;
+@@ -93,11 +102,16 @@ static inline struct pid *proc_pid(struc
+ return PROC_I(inode)->pid;
}
- /* Write to quotafile */
--static ssize_t jfs_quota_write(struct super_block *sb, int type,
-+static ssize_t jfs_quota_write(struct dqhash *hash, int type,
- const char *data, size_t len, loff_t off)
+-static inline struct task_struct *get_proc_task(struct inode *inode)
++static inline struct task_struct *get_proc_task_real(struct inode *inode)
{
-- struct inode *inode = sb_dqopt(sb)->files[type];
-+ struct inode *inode = dqh_dqopt(hash)->files[type];
-+ struct super_block *sb = hash->dqh_sb;
- sector_t blk = off >> sb->s_blocksize_bits;
- int err = 0;
- int offset = off & (sb->s_blocksize - 1);
-diff -NurpP --minimal linux-2.6.19.1/fs/jfs/xattr.c linux-2.6.19.1-vs2.3.0.6/fs/jfs/xattr.c
---- linux-2.6.19.1/fs/jfs/xattr.c 2006-11-30 21:19:26 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/jfs/xattr.c 2006-11-08 21:52:09 +0100
-@@ -23,6 +23,7 @@
- #include <linux/posix_acl_xattr.h>
- #include <linux/quotaops.h>
- #include <linux/security.h>
-+#include <linux/vs_dlimit.h>
- #include "jfs_incore.h"
- #include "jfs_superblock.h"
- #include "jfs_dmap.h"
-@@ -263,9 +264,16 @@ static int ea_write(struct inode *ip, st
- if (DQUOT_ALLOC_BLOCK(ip, nblocks)) {
- return -EDQUOT;
- }
-+ /* Allocate new blocks to dlimit. */
-+ if (DLIMIT_ALLOC_BLOCK(ip, nblocks)) {
-+ DQUOT_FREE_BLOCK(ip, nblocks);
-+ return -ENOSPC;
-+ }
-
- rc = dbAlloc(ip, INOHINT(ip), nblocks, &blkno);
- if (rc) {
-+ /*Rollback dlimit allocation. */
-+ DLIMIT_FREE_BLOCK(ip, nblocks);
- /*Rollback quota allocation. */
- DQUOT_FREE_BLOCK(ip, nblocks);
- return rc;
-@@ -332,6 +340,8 @@ static int ea_write(struct inode *ip, st
-
- failed:
- /* Rollback quota allocation. */
-+ DLIMIT_FREE_BLOCK(ip, nblocks);
-+ /* Rollback quota allocation. */
- DQUOT_FREE_BLOCK(ip, nblocks);
-
- dbFree(ip, blkno, nblocks);
-@@ -468,6 +478,7 @@ static int ea_get(struct inode *inode, s
- s64 blkno;
- int rc;
- int quota_allocation = 0;
-+ int dlimit_allocation = 0;
-
- /* When fsck.jfs clears a bad ea, it doesn't clear the size */
- if (ji->ea.flag == 0)
-@@ -543,6 +554,12 @@ static int ea_get(struct inode *inode, s
-
- quota_allocation = blocks_needed;
-
-+ /* Allocate new blocks to dlimit. */
-+ rc = -ENOSPC;
-+ if (DLIMIT_ALLOC_BLOCK(inode, blocks_needed))
-+ goto clean_up;
-+ dlimit_allocation = blocks_needed;
-+
- rc = dbAlloc(inode, INOHINT(inode), (s64) blocks_needed,
- &blkno);
- if (rc)
-@@ -599,6 +616,9 @@ static int ea_get(struct inode *inode, s
- return ea_size;
-
- clean_up:
-+ /* Rollback dlimit allocation */
-+ if (dlimit_allocation)
-+ DLIMIT_FREE_BLOCK(inode, dlimit_allocation);
- /* Rollback quota allocation */
- if (quota_allocation)
- DQUOT_FREE_BLOCK(inode, quota_allocation);
-@@ -675,8 +695,10 @@ static int ea_put(tid_t tid, struct inod
- }
-
- /* If old blocks exist, they must be removed from quota allocation. */
-- if (old_blocks)
-+ if (old_blocks) {
-+ DLIMIT_FREE_BLOCK(inode, old_blocks);
- DQUOT_FREE_BLOCK(inode, old_blocks);
-+ }
-
- inode->i_ctime = CURRENT_TIME;
-
-diff -NurpP --minimal linux-2.6.19.1/fs/libfs.c linux-2.6.19.1-vs2.3.0.6/fs/libfs.c
---- linux-2.6.19.1/fs/libfs.c 2006-11-30 21:19:26 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/libfs.c 2006-11-08 04:57:43 +0100
-@@ -124,7 +124,8 @@ 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)
-+static inline int do_dcache_readdir_filter(struct file * filp,
-+ void * dirent, filldir_t filldir, int (*filter)(struct dentry *dentry))
- {
- struct dentry *dentry = filp->f_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;
-
- spin_unlock(&dcache_lock);
- if (filldir(dirent, next->d_name.name, next->d_name.len, filp->f_pos, next->d_inode->i_ino, dt_type(next->d_inode)) < 0)
-@@ -172,6 +175,18 @@ int dcache_readdir(struct file * filp, v
- return 0;
+ return get_pid_task(proc_pid(inode), PIDTYPE_PID);
}
-+int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir)
-+{
-+ return do_dcache_readdir_filter(filp, dirent, filldir, NULL);
-+}
-+
-+int dcache_readdir_filter(struct file * filp, void * dirent, filldir_t filldir,
-+ int (*filter)(struct dentry *))
++static inline struct task_struct *get_proc_task(struct inode *inode)
+{
-+ return do_dcache_readdir_filter(filp, dirent, filldir, filter);
++ return vx_get_proc_task(inode, proc_pid(inode));
+}
+
-+
- ssize_t generic_read_dir(struct file *filp, char __user *buf, size_t siz, loff_t *ppos)
+ static inline int task_dumpable(struct task_struct *task)
{
- return -EISDIR;
-@@ -611,6 +626,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_commit_write);
-diff -NurpP --minimal linux-2.6.19.1/fs/locks.c linux-2.6.19.1-vs2.3.0.6/fs/locks.c
---- linux-2.6.19.1/fs/locks.c 2006-11-30 21:19:26 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/locks.c 2006-11-30 18:53:18 +0100
-@@ -125,6 +125,8 @@
- #include <linux/syscalls.h>
- #include <linux/time.h>
- #include <linux/rcupdate.h>
-+#include <linux/vs_base.h>
-+#include <linux/vs_limit.h>
+ int dumpable = 0;
+@@ -156,6 +170,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);
- #include <asm/semaphore.h>
- #include <asm/uaccess.h>
-@@ -147,6 +149,8 @@ static kmem_cache_t *filelock_cache __re
- /* Allocate an empty lock structure. */
- static struct file_lock *locks_alloc_lock(void)
- {
-+ if (!vx_locks_avail(1))
-+ return NULL;
- return kmem_cache_alloc(filelock_cache, SLAB_KERNEL);
- }
-
-@@ -172,6 +176,7 @@ static void locks_free_lock(struct file_
- BUG_ON(!list_empty(&fl->fl_block));
- BUG_ON(!list_empty(&fl->fl_link));
+ /*
+ * base.c
+diff -urNp -x '*.orig' linux-4.9/fs/proc/loadavg.c linux-4.9/fs/proc/loadavg.c
+--- linux-4.9/fs/proc/loadavg.c 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/fs/proc/loadavg.c 2021-02-24 15:47:45.084409345 +0100
+@@ -12,15 +12,27 @@
-+ vx_locks_dec(fl);
- locks_release_private(fl);
- kmem_cache_free(filelock_cache, fl);
- }
-@@ -191,6 +196,7 @@ void locks_init_lock(struct file_lock *f
- fl->fl_start = fl->fl_end = 0;
- fl->fl_ops = NULL;
- fl->fl_lmops = NULL;
-+ fl->fl_xid = -1;
- }
+ static int loadavg_proc_show(struct seq_file *m, void *v)
+ {
++ unsigned long running;
++ unsigned int threads;
+ unsigned long avnrun[3];
- 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;
- new->fl_lmops = fl->fl_lmops;
-+ new->fl_xid = fl->fl_xid;
+ get_avenrun(avnrun, FIXED_1/200, 0);
- locks_copy_private(new, fl);
- }
-@@ -286,6 +293,11 @@ static int flock_make_lock(struct file *
- fl->fl_flags = FL_FLOCK;
- fl->fl_type = type;
- fl->fl_end = OFFSET_MAX;
++ if (vx_flags(VXF_VIRT_LOAD, 0)) {
++ struct vx_info *vxi = current_vx_info();
+
-+ vxd_assert(filp->f_xid == vx_current_xid(),
-+ "f_xid(%d) == current(%d)", filp->f_xid, vx_current_xid());
-+ fl->fl_xid = filp->f_xid;
-+ vx_locks_inc(fl);
-
- *lock = fl;
++ running = atomic_read(&vxi->cvirt.nr_running);
++ threads = atomic_read(&vxi->cvirt.nr_threads);
++ } else {
++ running = nr_running();
++ threads = nr_threads;
++ }
++
+ seq_printf(m, "%lu.%02lu %lu.%02lu %lu.%02lu %ld/%d %d\n",
+ LOAD_INT(avnrun[0]), LOAD_FRAC(avnrun[0]),
+ LOAD_INT(avnrun[1]), LOAD_FRAC(avnrun[1]),
+ LOAD_INT(avnrun[2]), LOAD_FRAC(avnrun[2]),
+- nr_running(), nr_threads,
++ running, threads,
+ task_active_pid_ns(current)->last_pid);
return 0;
-@@ -451,6 +463,7 @@ static int lease_init(struct file *filp,
-
- fl->fl_owner = current->files;
- 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 int lease_alloc(struct file *filp
- if (fl == NULL)
- goto out;
-
-+ fl->fl_xid = vx_current_xid();
-+ if (filp)
-+ vxd_assert(filp->f_xid == fl->fl_xid,
-+ "f_xid(%d) == fl_xid(%d)", filp->f_xid, fl->fl_xid);
-+ vx_locks_inc(fl);
- error = lease_init(filp, type, fl);
- if (error) {
- locks_free_lock(fl);
-@@ -790,6 +808,7 @@ find_conflict:
- if (request->fl_flags & FL_ACCESS)
- goto out;
- locks_copy_lock(new_fl, request);
-+ vx_locks_inc(new_fl);
- locks_insert_lock(&inode->i_flock, new_fl);
- new_fl = NULL;
- error = 0;
-@@ -801,7 +820,8 @@ out:
- return error;
}
+diff -urNp -x '*.orig' linux-4.9/fs/proc/meminfo.c linux-4.9/fs/proc/meminfo.c
+--- linux-4.9/fs/proc/meminfo.c 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/fs/proc/meminfo.c 2021-02-24 15:47:45.084409345 +0100
+@@ -55,7 +55,8 @@ static int meminfo_proc_show(struct seq_
+ si_swapinfo(&i);
+ committed = percpu_counter_read_positive(&vm_committed_as);
+
+- cached = global_node_page_state(NR_FILE_PAGES) -
++ cached = vx_flags(VXF_VIRT_MEM, 0) ?
++ vx_vsi_cached(&i) : global_node_page_state(NR_FILE_PAGES) -
+ total_swapcache_pages() - i.bufferram;
+ if (cached < 0)
+ cached = 0;
+diff -urNp -x '*.orig' linux-4.9/fs/proc/root.c linux-4.9/fs/proc/root.c
+--- linux-4.9/fs/proc/root.c 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/fs/proc/root.c 2021-02-24 15:47:45.084409345 +0100
+@@ -20,9 +20,14 @@
+ #include <linux/mount.h>
+ #include <linux/pid_namespace.h>
+ #include <linux/parser.h>
++#include <linux/vserver/inode.h>
--static int __posix_lock_file_conf(struct inode *inode, struct file_lock *request, struct file_lock *conflock)
-+static int __posix_lock_file_conf(struct inode *inode, struct file_lock *request,
-+ struct file_lock *conflock, xid_t xid)
- {
- struct file_lock *fl;
- struct file_lock *new_fl = NULL;
-@@ -811,6 +831,8 @@ static int __posix_lock_file_conf(struct
- struct file_lock **before;
- int error, added = 0;
-
-+ 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.
-@@ -821,7 +843,11 @@ static int __posix_lock_file_conf(struct
- (request->fl_type != F_UNLCK ||
- request->fl_start != 0 || request->fl_end != OFFSET_MAX)) {
- new_fl = locks_alloc_lock();
-+ new_fl->fl_xid = xid;
-+ vx_locks_inc(new_fl);
- new_fl2 = locks_alloc_lock();
-+ new_fl2->fl_xid = xid;
-+ vx_locks_inc(new_fl2);
- }
-
- lock_kernel();
-@@ -1018,7 +1044,8 @@ static int __posix_lock_file_conf(struct
- */
- int posix_lock_file(struct file *filp, struct file_lock *fl)
- {
-- return __posix_lock_file_conf(filp->f_dentry->d_inode, fl, NULL);
-+ return __posix_lock_file_conf(filp->f_dentry->d_inode,
-+ fl, NULL, filp->f_xid);
- }
- EXPORT_SYMBOL(posix_lock_file);
+ #include "internal.h"
-@@ -1033,7 +1060,8 @@ EXPORT_SYMBOL(posix_lock_file);
- int posix_lock_file_conf(struct file *filp, struct file_lock *fl,
- struct file_lock *conflock)
- {
-- return __posix_lock_file_conf(filp->f_dentry->d_inode, fl, conflock);
-+ return __posix_lock_file_conf(filp->f_dentry->d_inode,
-+ fl, conflock, filp->f_xid);
++struct proc_dir_entry *proc_virtual;
++
++extern void proc_vx_init(void);
++
+ enum {
+ Opt_gid, Opt_hidepid, Opt_err,
+ };
+@@ -145,6 +150,7 @@ void __init proc_root_init(void)
+ proc_tty_init();
+ proc_mkdir("bus", NULL);
+ proc_sys_init();
++ proc_vx_init();
}
- EXPORT_SYMBOL(posix_lock_file_conf);
-@@ -1123,7 +1151,7 @@ int locks_mandatory_area(int read_write,
- fl.fl_end = offset + count - 1;
-
- for (;;) {
-- error = __posix_lock_file_conf(inode, &fl, NULL);
-+ error = __posix_lock_file_conf(inode, &fl, NULL, filp->f_xid);
- if (error != -EAGAIN)
- break;
- if (!(fl.fl_flags & FL_SLEEP))
-@@ -1685,6 +1713,11 @@ int fcntl_setlk(unsigned int fd, struct
- if (file_lock == NULL)
- return -ENOLCK;
+ static int proc_root_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat
+@@ -206,6 +212,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,
+ .subdir = RB_ROOT,
+ .name = "/proc",
+ };
+diff -urNp -x '*.orig' linux-4.9/fs/proc/self.c linux-4.9/fs/proc/self.c
+--- linux-4.9/fs/proc/self.c 2021-02-24 15:47:32.324010153 +0100
++++ linux-4.9/fs/proc/self.c 2021-02-24 15:47:45.084409345 +0100
+@@ -1,6 +1,7 @@
+ #include <linux/sched.h>
+ #include <linux/slab.h>
+ #include <linux/pid_namespace.h>
++#include <linux/vserver/inode.h>
+ #include "internal.h"
-+ vxd_assert(filp->f_xid == vx_current_xid(),
-+ "f_xid(%d) == current(%d)", filp->f_xid, vx_current_xid());
-+ file_lock->fl_xid = filp->f_xid;
-+ vx_locks_inc(file_lock);
+ /*
+@@ -61,6 +62,8 @@ int proc_setup_self(struct super_block *
+ self = d_alloc_name(s->s_root, "self");
+ if (self) {
+ struct inode *inode = new_inode(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(inode);
+diff -urNp -x '*.orig' linux-4.9/fs/proc/stat.c linux-4.9/fs/proc/stat.c
+--- linux-4.9/fs/proc/stat.c 2021-02-24 15:47:32.324010153 +0100
++++ linux-4.9/fs/proc/stat.c 2021-02-24 15:47:45.084409345 +0100
+@@ -9,8 +9,10 @@
+ #include <linux/slab.h>
+ #include <linux/time.h>
+ #include <linux/irqnr.h>
++#include <linux/vserver/cvirt.h>
+ #include <linux/cputime.h>
+ #include <linux/tick.h>
++#include <linux/cpuset.h>
+
+ #ifndef arch_irq_stat_cpu
+ #define arch_irq_stat_cpu(cpu) 0
+@@ -86,13 +88,21 @@ static int show_stat(struct seq_file *p,
+ u64 sum_softirq = 0;
+ unsigned int per_softirq_sums[NR_SOFTIRQS] = {0};
+ struct timespec64 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;
+ getboottime64(&boottime);
+
++ if (virt_cpu)
++ cpuset_cpus_allowed(current, cpus_allowed);
++
+ for_each_possible_cpu(i) {
++ if (virt_cpu && !cpumask_test_cpu(i, cpus_allowed))
++ continue;
+
- /*
- * This might block, so we do it before checking the inode.
- */
-@@ -1828,6 +1861,11 @@ int fcntl_setlk64(unsigned int fd, struc
- if (file_lock == NULL)
- return -ENOLCK;
+ user += kcpustat_cpu(i).cpustat[CPUTIME_USER];
+ nice += kcpustat_cpu(i).cpustat[CPUTIME_NICE];
+ system += kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
+@@ -128,6 +138,9 @@ static int show_stat(struct seq_file *p,
+ seq_putc(p, '\n');
-+ vxd_assert(filp->f_xid == vx_current_xid(),
-+ "f_xid(%d) == current(%d)", filp->f_xid, vx_current_xid());
-+ file_lock->fl_xid = filp->f_xid;
-+ vx_locks_inc(file_lock);
-+
- /*
- * This might block, so we do it before checking the inode.
- */
-@@ -2123,6 +2161,10 @@ int get_locks_status(char *buffer, char
- list_for_each(tmp, &file_lock_list) {
- struct list_head *btmp;
- struct file_lock *fl = list_entry(tmp, struct file_lock, fl_link);
-+
-+ if (!vx_check(fl->fl_xid, VS_WATCH_P|VS_IDENT))
+ for_each_online_cpu(i) {
++ if (virt_cpu && !cpumask_test_cpu(i, cpus_allowed))
+ continue;
+
- lock_get_status(q, fl, ++i, "");
- move_lock_status(&q, &pos, offset);
-
-diff -NurpP --minimal linux-2.6.19.1/fs/namei.c linux-2.6.19.1-vs2.3.0.6/fs/namei.c
---- linux-2.6.19.1/fs/namei.c 2006-11-30 21:19:26 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/namei.c 2006-11-30 19:41:35 +0100
-@@ -32,6 +32,11 @@
- #include <linux/file.h>
- #include <linux/fcntl.h>
- #include <linux/namei.h>
-+#include <linux/proc_fs.h>
-+#include <linux/vserver/inode.h>
-+#include <linux/vs_base.h>
-+#include <linux/vs_tag.h>
-+#include <linux/vs_cowbl.h>
- #include <asm/namei.h>
- #include <asm/uaccess.h>
+ /* 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 -urNp -x '*.orig' linux-4.9/fs/proc/uptime.c linux-4.9/fs/proc/uptime.c
+--- linux-4.9/fs/proc/uptime.c 2021-02-24 15:47:32.327343590 +0100
++++ linux-4.9/fs/proc/uptime.c 2021-02-24 15:47:45.084409345 +0100
+@@ -5,6 +5,7 @@
+ #include <linux/seq_file.h>
+ #include <linux/time.h>
+ #include <linux/kernel_stat.h>
++#include <linux/vserver/cvirt.h>
-@@ -225,6 +230,31 @@ int generic_permission(struct inode *ino
- return -EACCES;
+ static int uptime_proc_show(struct seq_file *m, void *v)
+ {
+@@ -21,6 +22,7 @@ static int uptime_proc_show(struct seq_f
+ get_monotonic_boottime(&uptime);
+ idle.tv_sec = div_u64_rem(nsec, NSEC_PER_SEC, &rem);
+ idle.tv_nsec = rem;
++
+ seq_printf(m, "%lu.%02lu %lu.%02lu\n",
+ (unsigned long) uptime.tv_sec,
+ (uptime.tv_nsec / (NSEC_PER_SEC / 100)),
+diff -urNp -x '*.orig' linux-4.9/fs/proc_namespace.c linux-4.9/fs/proc_namespace.c
+--- linux-4.9/fs/proc_namespace.c 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/fs/proc_namespace.c 2021-02-24 15:47:45.084409345 +0100
+@@ -46,6 +46,8 @@ static int show_sb_opts(struct seq_file
+ { MS_DIRSYNC, ",dirsync" },
+ { MS_MANDLOCK, ",mand" },
+ { MS_LAZYTIME, ",lazytime" },
++ { MS_TAGGED, ",tag" },
++ { MS_NOTAGCHECK, ",notagcheck" },
+ { 0, NULL }
+ };
+ const struct proc_fs_info *fs_infop;
+@@ -82,6 +84,38 @@ static inline void mangle(struct seq_fil
+ seq_escape(m, s, " \t\n\\");
}
-+static inline int dx_barrier(struct inode *inode)
++#ifdef CONFIG_VSERVER_EXTRA_MNT_CHECK
++
++static int mnt_is_reachable(struct vfsmount *vfsmnt)
+{
-+ if (IS_BARRIER(inode) && !vx_check(0, VS_ADMIN)) {
-+ vxwprintk(1, "xid=%d did hit the barrier.",
-+ vx_current_xid());
++ 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;
-+ }
-+ return 0;
-+}
+
-+static inline int dx_permission(struct inode *inode, int mask, struct nameidata *nd)
-+{
-+ if (dx_barrier(inode))
-+ return -EACCES;
-+ if (inode->i_tag == 0)
-+ return 0;
-+ if (dx_check(inode->i_tag, DX_ADMIN|DX_WATCH|DX_IDENT))
-+ return 0;
++ rcu_read_lock();
++ root = current->fs->root;
++ root_mnt = real_mount(root.mnt);
++ point = root.dentry;
+
-+ vxwprintk(1, "xid=%d denied access to %p[#%d,%lu] »%s«.",
-+ vx_current_xid(), inode, inode->i_tag, inode->i_ino,
-+ vxd_cond_path(nd));
-+ return -EACCES;
++ 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;
+}
+
- int permission(struct inode *inode, int mask, struct nameidata *nd)
- {
- umode_t mode = inode->i_mode;
-@@ -235,14 +265,14 @@ int permission(struct inode *inode, int
- /*
- * Nobody gets write access to a read-only fs.
- */
-- if (IS_RDONLY(inode) &&
-+ if ((IS_RDONLY(inode) || (nd && MNT_IS_RDONLY(nd->mnt))) &&
- (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode)))
- return -EROFS;
-
- /*
- * Nobody gets write access to an immutable file.
- */
-- if (IS_IMMUTABLE(inode))
-+ if (IS_IMMUTABLE(inode) && !IS_COW(inode))
- return -EACCES;
- }
-
-@@ -256,6 +286,8 @@ int permission(struct inode *inode, int
-
- /* Ordinary permission routines do not understand MAY_APPEND. */
- submask = mask & ~MAY_APPEND;
-+ if ((retval = dx_permission(inode, mask, nd)))
-+ return retval;
- if (inode->i_op && inode->i_op->permission)
- retval = inode->i_op->permission(inode, submask, nd);
- else
-@@ -431,6 +463,8 @@ static int exec_permission_lite(struct i
++#else
++#define mnt_is_reachable(v) (1)
++#endif
++
+ static void show_type(struct seq_file *m, struct super_block *sb)
{
- umode_t mode = inode->i_mode;
+ mangle(m, sb->s_type->name);
+@@ -99,6 +133,17 @@ static int show_vfsmnt(struct seq_file *
+ struct super_block *sb = mnt_path.dentry->d_sb;
+ int err;
-+ if (dx_barrier(inode))
-+ return -EACCES;
- if (inode->i_op && inode->i_op->permission)
- return -EAGAIN;
++ 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)
+@@ -112,6 +157,7 @@ static int show_vfsmnt(struct seq_file *
+ if (err)
+ goto out;
+ seq_putc(m, ' ');
++type:
+ show_type(m, sb);
+ seq_puts(m, __mnt_is_readonly(mnt) ? " ro" : " rw");
+ err = show_sb_opts(m, sb);
+@@ -133,6 +179,11 @@ static int show_mountinfo(struct seq_fil
+ struct path mnt_path = { .dentry = mnt->mnt_root, .mnt = mnt };
+ int err;
-@@ -736,7 +770,8 @@ static __always_inline void follow_dotdo
- if (nd->dentry == fs->root &&
- nd->mnt == fs->rootmnt) {
- read_unlock(&fs->lock);
-- break;
-+ /* FIXME: for sane '/' avoid follow_mount() */
-+ return;
- }
- read_unlock(&fs->lock);
- spin_lock(&dcache_lock);
-@@ -773,16 +808,34 @@ static int do_lookup(struct nameidata *n
- {
- struct vfsmount *mnt = nd->mnt;
- struct dentry *dentry = __d_lookup(nd->dentry, name);
-+ struct inode *inode;
++ 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) {
+@@ -195,6 +246,17 @@ static int show_vfsstat(struct seq_file
+ struct super_block *sb = mnt_path.dentry->d_sb;
+ int err;
- if (!dentry)
- goto need_lookup;
- if (dentry->d_op && dentry->d_op->d_revalidate)
- goto need_revalidate;
-+ inode = dentry->d_inode;
-+ if (!inode)
-+ goto done;
-+ if (inode->i_sb->s_magic == PROC_SUPER_MAGIC) {
-+ struct proc_dir_entry *de = PDE(inode);
++ 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 (de && !vx_hide_check(0, de->vx_flags))
-+ goto hidden;
++ if (!vx_check(0, VS_ADMIN|VS_WATCH) &&
++ mnt == current->fs->root.mnt) {
++ seq_puts(m, "device /dev/root mounted on / ");
++ goto type;
+ }
-+ if (!dx_check(inode->i_tag, DX_WATCH|DX_ADMIN|DX_HOSTID|DX_IDENT))
-+ goto hidden;
- done:
- path->mnt = mnt;
- path->dentry = dentry;
- __follow_mount(path);
- return 0;
-+hidden:
-+ vxwprintk(1, "xid=%d did lookup hidden %p[#%d,%lu] »%s«.",
-+ vx_current_xid(), inode, inode->i_tag, inode->i_ino,
-+ vxd_path(dentry, mnt));
-+ dput(dentry);
-+ return -ENOENT;
-
- need_lookup:
- dentry = real_lookup(nd->dentry, name, nd);
-@@ -1384,7 +1437,8 @@ static inline int check_sticky(struct in
- * 10. We don't allow removal of NFS sillyrenamed files; it's handled by
- * nfs_async_unlink().
- */
--static int may_delete(struct inode *dir,struct dentry *victim,int isdir)
-+static int may_delete(struct inode *dir, struct dentry *victim,
-+ int isdir, struct nameidata *nd)
- {
- int error;
++
+ /* device */
+ if (sb->s_op->show_devname) {
+ seq_puts(m, "device ");
+@@ -216,7 +278,7 @@ static int show_vfsstat(struct seq_file
+ if (err)
+ goto out;
+ seq_putc(m, ' ');
+-
++type:
+ /* file system type */
+ seq_puts(m, "with fstype ");
+ show_type(m, sb);
+diff -urNp -x '*.orig' linux-4.9/fs/quota/dquot.c linux-4.9/fs/quota/dquot.c
+--- linux-4.9/fs/quota/dquot.c 2021-02-24 15:47:32.327343590 +0100
++++ linux-4.9/fs/quota/dquot.c 2021-02-24 15:47:45.084409345 +0100
+@@ -1659,6 +1659,9 @@ int __dquot_alloc_space(struct inode *in
+ int reserve = flags & DQUOT_SPACE_RESERVE;
+ struct dquot **dquots;
+
++ if ((ret = dl_alloc_space(inode, number)))
++ return ret;
++
+ if (!dquot_active(inode)) {
+ inode_incr_space(inode, number, reserve);
+ goto out;
+@@ -1711,6 +1714,9 @@ int dquot_alloc_inode(struct inode *inod
+ struct dquot_warn warn[MAXQUOTAS];
+ struct dquot * const *dquots;
-@@ -1394,13 +1448,13 @@ static int may_delete(struct inode *dir,
- BUG_ON(victim->d_parent->d_inode != dir);
- audit_inode_child(victim->d_name.name, victim->d_inode, dir);
++ if ((ret = dl_alloc_inode(inode)))
++ return ret;
++
+ if (!dquot_active(inode))
+ return 0;
+ for (cnt = 0; cnt < MAXQUOTAS; cnt++)
+@@ -1813,6 +1819,8 @@ void __dquot_free_space(struct inode *in
+ struct dquot **dquots;
+ int reserve = flags & DQUOT_SPACE_RESERVE, index;
-- error = permission(dir,MAY_WRITE | MAY_EXEC, NULL);
-+ error = permission(dir,MAY_WRITE | MAY_EXEC, nd);
- if (error)
- return error;
- if (IS_APPEND(dir))
- return -EPERM;
- if (check_sticky(dir, victim->d_inode)||IS_APPEND(victim->d_inode)||
-- IS_IMMUTABLE(victim->d_inode))
-+ IS_IXORUNLINK(victim->d_inode))
- return -EPERM;
- if (isdir) {
- if (!S_ISDIR(victim->d_inode->i_mode))
-@@ -1531,6 +1585,14 @@ int may_open(struct nameidata *nd, int a
- if (S_ISDIR(inode->i_mode) && (flag & FMODE_WRITE))
- return -EISDIR;
++ dl_free_space(inode, number);
++
+ if (!dquot_active(inode)) {
+ inode_decr_space(inode, number, reserve);
+ return;
+@@ -1857,6 +1865,8 @@ void dquot_free_inode(struct inode *inod
+ struct dquot * const *dquots;
+ int index;
-+#ifdef CONFIG_VSERVER_COWBL
-+ if (IS_COW(inode) && (flag & FMODE_WRITE)) {
-+ if (IS_COW_LINK(inode))
-+ return -EMLINK;
-+ inode->i_flags &= ~(S_IUNLINK|S_IMMUTABLE);
-+ mark_inode_dirty(inode);
-+ }
-+#endif
- error = vfs_permission(nd, acc_mode);
- if (error)
- return error;
-@@ -1547,7 +1609,8 @@ int may_open(struct nameidata *nd, int a
- return -EACCES;
++ dl_free_inode(inode);
++
+ if (!dquot_active(inode))
+ return;
- flag &= ~O_TRUNC;
-- } else if (IS_RDONLY(inode) && (flag & FMODE_WRITE))
-+ } else if ((IS_RDONLY(inode) || MNT_IS_RDONLY(nd->mnt))
-+ && (flag & FMODE_WRITE))
- return -EROFS;
- /*
- * An append-only file must be opened in append mode for writing.
-@@ -1635,6 +1698,11 @@ int open_namei(int dfd, const char *path
- struct dentry *dir;
- int count = 0;
+diff -urNp -x '*.orig' linux-4.9/fs/quota/quota.c linux-4.9/fs/quota/quota.c
+--- linux-4.9/fs/quota/quota.c 2021-02-24 15:47:32.327343590 +0100
++++ linux-4.9/fs/quota/quota.c 2021-02-24 15:47:45.084409345 +0100
+@@ -8,6 +8,7 @@
+ #include <linux/fs.h>
+ #include <linux/namei.h>
+ #include <linux/slab.h>
++#include <linux/vs_context.h>
+ #include <asm/current.h>
+ #include <linux/uaccess.h>
+ #include <linux/kernel.h>
+@@ -39,7 +40,7 @@ static int check_quotactl_permission(str
+ break;
+ /*FALLTHROUGH*/
+ default:
+- if (!capable(CAP_SYS_ADMIN))
++ if (!vx_capable(CAP_SYS_ADMIN, VXC_QUOTA_CTL))
+ return -EPERM;
+ }
-+#ifdef CONFIG_VSERVER_COWBL
-+ int rflag = flag;
-+ int rmode = mode;
-+restart:
-+#endif
- acc_mode = ACC_MODE(flag);
+@@ -770,6 +771,46 @@ static int do_quotactl(struct super_bloc
- /* O_TRUNC implies we need access checks for write permissions */
-@@ -1728,6 +1796,22 @@ do_last:
- goto exit;
- ok:
- error = may_open(nd, acc_mode, flag);
-+#ifdef CONFIG_VSERVER_COWBL
-+ if (error == -EMLINK) {
-+ struct dentry *dentry;
-+ dentry = cow_break_link(pathname);
-+ if (IS_ERR(dentry)) {
-+ error = PTR_ERR(dentry);
-+ goto exit;
-+ }
-+ dput(dentry);
-+ release_open_intent(nd);
-+ path_release(nd);
-+ flag = rflag;
-+ mode = rmode;
-+ goto restart;
+ #ifdef CONFIG_BLOCK
+
++#if defined(CONFIG_BLK_DEV_VROOT) || defined(CONFIG_BLK_DEV_VROOT_MODULE)
++
++#include <linux/vroot.h>
++#include <linux/major.h>
++#include <linux/module.h>
++#include <linux/kallsyms.h>
++#include <linux/vserver/debug.h>
++
++static vroot_grb_func *vroot_get_real_bdev = NULL;
++
++static DEFINE_SPINLOCK(vroot_grb_lock);
++
++int register_vroot_grb(vroot_grb_func *func) {
++ int ret = -EBUSY;
++
++ spin_lock(&vroot_grb_lock);
++ if (!vroot_get_real_bdev) {
++ vroot_get_real_bdev = func;
++ ret = 0;
++ }
++ spin_unlock(&vroot_grb_lock);
++ return ret;
++}
++EXPORT_SYMBOL(register_vroot_grb);
++
++int unregister_vroot_grb(vroot_grb_func *func) {
++ int ret = -EINVAL;
++
++ spin_lock(&vroot_grb_lock);
++ if (vroot_get_real_bdev) {
++ vroot_get_real_bdev = NULL;
++ ret = 0;
+ }
++ spin_unlock(&vroot_grb_lock);
++ return ret;
++}
++EXPORT_SYMBOL(unregister_vroot_grb);
++
+#endif
- if (error)
- goto exit;
- return 0;
-@@ -1839,9 +1923,10 @@ fail:
- }
- EXPORT_SYMBOL_GPL(lookup_create);
-
--int vfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
-+int vfs_mknod(struct inode *dir, struct dentry *dentry,
-+ int mode, dev_t dev, struct nameidata *nd)
++
+ /* Return 1 if 'cmd' will block on frozen filesystem */
+ static int quotactl_cmd_write(int cmd)
{
-- int error = may_create(dir, dentry, NULL);
-+ int error = may_create(dir, dentry, nd);
+@@ -811,6 +852,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) {
++ struct block_device *bdnew = (void *)-EINVAL;
++
++ if (vroot_get_real_bdev)
++ bdnew = vroot_get_real_bdev(bdev);
++ else
++ vxdprintk(VXD_CBIT(misc, 0),
++ "vroot_get_real_bdev not set");
++ bdput(bdev);
++ if (IS_ERR(bdnew))
++ return ERR_PTR(PTR_ERR(bdnew));
++ bdev = bdnew;
++ }
++#endif
+ if (quotactl_cmd_write(cmd))
+ sb = get_super_thawed(bdev);
+ else
+diff -urNp -x '*.orig' linux-4.9/fs/stat.c linux-4.9/fs/stat.c
+--- linux-4.9/fs/stat.c 2021-02-24 15:47:32.334010466 +0100
++++ linux-4.9/fs/stat.c 2021-02-24 15:47:45.084409345 +0100
+@@ -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 -urNp -x '*.orig' linux-4.9/fs/statfs.c linux-4.9/fs/statfs.c
+--- linux-4.9/fs/statfs.c 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/fs/statfs.c 2021-02-24 15:47:45.084409345 +0100
+@@ -7,6 +7,8 @@
+ #include <linux/statfs.h>
+ #include <linux/security.h>
+ #include <linux/uaccess.h>
++#include <linux/vs_base.h>
++#include <linux/vs_dlimit.h>
+ #include "internal.h"
- if (error)
- return error;
-@@ -1891,11 +1976,12 @@ asmlinkage long sys_mknodat(int dfd, con
- error = vfs_create(nd.dentry->d_inode,dentry,mode,&nd);
- break;
- case S_IFCHR: case S_IFBLK:
-- error = vfs_mknod(nd.dentry->d_inode,dentry,mode,
-- new_decode_dev(dev));
-+ error = vfs_mknod(nd.dentry->d_inode, dentry, mode,
-+ new_decode_dev(dev), &nd);
- break;
- case S_IFIFO: case S_IFSOCK:
-- error = vfs_mknod(nd.dentry->d_inode,dentry,mode,0);
-+ error = vfs_mknod(nd.dentry->d_inode, dentry, mode,
-+ 0, &nd);
- break;
- case S_IFDIR:
- error = -EPERM;
-@@ -1918,9 +2004,10 @@ asmlinkage long sys_mknod(const char __u
- return sys_mknodat(AT_FDCWD, filename, mode, dev);
+ 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;
}
--int vfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
-+int vfs_mkdir(struct inode *dir, struct dentry *dentry,
-+ int mode, struct nameidata *nd)
- {
-- int error = may_create(dir, dentry, NULL);
-+ int error = may_create(dir, dentry, nd);
+diff -urNp -x '*.orig' linux-4.9/fs/super.c linux-4.9/fs/super.c
+--- linux-4.9/fs/super.c 2021-02-24 15:47:32.334010466 +0100
++++ linux-4.9/fs/super.c 2021-02-24 15:47:45.084409345 +0100
+@@ -34,6 +34,8 @@
+ #include <linux/fsnotify.h>
+ #include <linux/lockdep.h>
+ #include <linux/user_namespace.h>
++#include <linux/magic.h>
++#include <linux/vs_context.h>
+ #include "internal.h"
- if (error)
- return error;
-@@ -1962,7 +2049,7 @@ asmlinkage long sys_mkdirat(int dfd, con
- if (!IS_POSIXACL(nd.dentry->d_inode))
- mode &= ~current->fs->umask;
-- error = vfs_mkdir(nd.dentry->d_inode, dentry, mode);
-+ error = vfs_mkdir(nd.dentry->d_inode, dentry, mode, &nd);
- dput(dentry);
- out_unlock:
- mutex_unlock(&nd.dentry->d_inode->i_mutex);
-@@ -2006,9 +2093,10 @@ void dentry_unhash(struct dentry *dentry
- spin_unlock(&dcache_lock);
- }
+@@ -482,7 +484,7 @@ struct super_block *sget_userns(struct f
--int vfs_rmdir(struct inode *dir, struct dentry *dentry)
-+int vfs_rmdir(struct inode *dir, struct dentry *dentry,
-+ struct nameidata *nd)
- {
-- int error = may_delete(dir, dentry, 1);
-+ int error = may_delete(dir, dentry, 1, nd);
+ if (!(flags & (MS_KERNMOUNT|MS_SUBMOUNT)) &&
+ !(type->fs_flags & FS_USERNS_MOUNT) &&
+- !capable(CAP_SYS_ADMIN))
++ !vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT))
+ return ERR_PTR(-EPERM);
+ retry:
+ spin_lock(&sb_lock);
+@@ -563,7 +565,8 @@ struct super_block *sget(struct file_sys
+ user_ns = &init_user_ns;
+
+ /* Ensure the requestor has permissions over the target filesystem */
+- if (!(flags & (MS_KERNMOUNT|MS_SUBMOUNT)) && !ns_capable(user_ns, CAP_SYS_ADMIN))
++ if (!(flags & (MS_KERNMOUNT|MS_SUBMOUNT)) &&
++ !vx_ns_capable(user_ns, CAP_SYS_ADMIN, VXC_SECURE_MOUNT))
+ return ERR_PTR(-EPERM);
+
+ return sget_userns(type, test, set, flags, user_ns, data);
+@@ -995,7 +998,8 @@ struct dentry *mount_ns(struct file_syst
+ /* Don't allow mounting unless the caller has CAP_SYS_ADMIN
+ * over the namespace.
+ */
+- if (!(flags & MS_KERNMOUNT) && !ns_capable(user_ns, CAP_SYS_ADMIN))
++ if (!(flags & MS_KERNMOUNT) &&
++ !vx_ns_capable(user_ns, CAP_SYS_ADMIN, VXC_SECURE_MOUNT))
+ return ERR_PTR(-EPERM);
+
+ sb = sget_userns(fs_type, ns_test_super, ns_set_super, flags,
+@@ -1213,6 +1217,13 @@ mount_fs(struct file_system_type *type,
+ smp_wmb();
+ sb->s_flags |= MS_BORN;
++ error = -EPERM;
++ 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);
if (error)
- return error;
-@@ -2070,7 +2158,7 @@ static long do_rmdir(int dfd, const char
- error = PTR_ERR(dentry);
- if (IS_ERR(dentry))
- goto exit2;
-- error = vfs_rmdir(nd.dentry->d_inode, dentry);
-+ error = vfs_rmdir(nd.dentry->d_inode, dentry, &nd);
- dput(dentry);
- exit2:
- mutex_unlock(&nd.dentry->d_inode->i_mutex);
-@@ -2086,9 +2174,10 @@ asmlinkage long sys_rmdir(const char __u
- return do_rmdir(AT_FDCWD, pathname);
- }
+ goto out_sb;
+diff -urNp -x '*.orig' linux-4.9/fs/utimes.c linux-4.9/fs/utimes.c
+--- linux-4.9/fs/utimes.c 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/fs/utimes.c 2021-02-24 15:47:45.084409345 +0100
+@@ -8,6 +8,8 @@
+ #include <linux/stat.h>
+ #include <linux/utime.h>
+ #include <linux/syscalls.h>
++#include <linux/mount.h>
++#include <linux/vs_cowbl.h>
+ #include <asm/uaccess.h>
+ #include <asm/unistd.h>
--int vfs_unlink(struct inode *dir, struct dentry *dentry)
-+int vfs_unlink(struct inode *dir, struct dentry *dentry,
-+ struct nameidata *nd)
+@@ -52,13 +54,19 @@ static int utimes_common(struct path *pa
{
-- int error = may_delete(dir, dentry, 0);
-+ int error = may_delete(dir, dentry, 0, nd);
+ 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)
- return error;
-@@ -2150,7 +2239,7 @@ static long do_unlinkat(int dfd, const c
- inode = dentry->d_inode;
- if (inode)
- atomic_inc(&inode->i_count);
-- error = vfs_unlink(nd.dentry->d_inode, dentry);
-+ error = vfs_unlink(nd.dentry->d_inode, dentry, &nd);
- exit2:
- dput(dentry);
+ goto out;
+
++ inode = path->dentry->d_inode;
++
+ if (times && times[0].tv_nsec == UTIME_NOW &&
+ times[1].tv_nsec == UTIME_NOW)
+ times = NULL;
+diff -urNp -x '*.orig' linux-4.9/fs/xattr.c linux-4.9/fs/xattr.c
+--- linux-4.9/fs/xattr.c 2021-02-24 15:47:32.340677341 +0100
++++ linux-4.9/fs/xattr.c 2021-02-24 15:47:45.084409345 +0100
+@@ -21,6 +21,7 @@
+ #include <linux/audit.h>
+ #include <linux/vmalloc.h>
+ #include <linux/posix_acl_xattr.h>
++#include <linux/mount.h>
+
+ #include <asm/uaccess.h>
+
+@@ -112,7 +113,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)) {
+- if (!capable(CAP_SYS_ADMIN))
++ if (!vx_capable(CAP_SYS_ADMIN, VXC_FS_TRUSTED))
+ return (mask & MAY_WRITE) ? -EPERM : -ENODATA;
+ return 0;
}
-@@ -2185,9 +2274,10 @@ asmlinkage long sys_unlink(const char __
- return do_unlinkat(AT_FDCWD, pathname);
+diff -urNp -x '*.orig' linux-4.9/include/linux/capability.h linux-4.9/include/linux/capability.h
+--- linux-4.9/include/linux/capability.h 2021-02-24 15:47:32.377345154 +0100
++++ linux-4.9/include/linux/capability.h 2021-02-24 15:47:45.084409345 +0100
+@@ -78,7 +78,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 -urNp -x '*.orig' linux-4.9/include/linux/cred.h linux-4.9/include/linux/cred.h
+--- linux-4.9/include/linux/cred.h 2021-02-24 15:47:32.380678592 +0100
++++ linux-4.9/include/linux/cred.h 2021-02-24 15:47:45.087742783 +0100
+@@ -156,6 +156,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 *);
+@@ -216,6 +217,31 @@ static inline bool cap_ambient_invariant
+ cred->cap_inheritable));
}
--int vfs_symlink(struct inode *dir, struct dentry *dentry, const char *oldname, int mode)
-+int vfs_symlink(struct inode *dir, struct dentry *dentry,
-+ const char *oldname, int mode, struct nameidata *nd)
++static inline void set_cred_subscribers(struct cred *cred, int n)
++{
++#ifdef CONFIG_DEBUG_CREDENTIALS
++ atomic_set(&cred->subscribers, n);
++#endif
++}
++
++static inline int read_cred_subscribers(const struct cred *cred)
++{
++#ifdef CONFIG_DEBUG_CREDENTIALS
++ return atomic_read(&cred->subscribers);
++#else
++ return 0;
++#endif
++}
++
++static inline void alter_cred_subscribers(const struct cred *_cred, int n)
++{
++#ifdef CONFIG_DEBUG_CREDENTIALS
++ struct cred *cred = (struct cred *) _cred;
++
++ atomic_add(n, &cred->subscribers);
++#endif
++}
++
+ /**
+ * get_new_cred - Get a reference on a new set of credentials
+ * @cred: The new credentials to reference
+diff -urNp -x '*.orig' linux-4.9/include/linux/dcache.h linux-4.9/include/linux/dcache.h
+--- linux-4.9/include/linux/dcache.h 2021-02-24 15:47:32.380678592 +0100
++++ linux-4.9/include/linux/dcache.h 2021-02-24 15:47:45.087742783 +0100
+@@ -308,8 +308,10 @@ extern char *dentry_path(struct dentry *
+ */
+ static inline struct dentry *dget_dlock(struct dentry *dentry)
{
-- int error = may_create(dir, dentry, NULL);
-+ int error = may_create(dir, dentry, nd);
+- if (dentry)
++ if (dentry) {
+ dentry->d_lockref.count++;
++ // vx_dentry_inc(dentry);
++ }
+ return dentry;
+ }
- if (error)
- return error;
-@@ -2231,7 +2321,7 @@ asmlinkage long sys_symlinkat(const char
- if (IS_ERR(dentry))
- goto out_unlock;
+diff -urNp -x '*.orig' linux-4.9/include/linux/devpts_fs.h linux-4.9/include/linux/devpts_fs.h
+--- linux-4.9/include/linux/devpts_fs.h 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/include/linux/devpts_fs.h 2021-02-24 15:47:45.087742783 +0100
+@@ -34,5 +34,4 @@ void devpts_pty_kill(struct dentry *);
-- error = vfs_symlink(nd.dentry->d_inode, dentry, from, S_IALLUGO);
-+ error = vfs_symlink(nd.dentry->d_inode, dentry, from, S_IALLUGO, &nd);
- dput(dentry);
- out_unlock:
- mutex_unlock(&nd.dentry->d_inode->i_mutex);
-@@ -2248,7 +2338,8 @@ asmlinkage long sys_symlink(const char _
- return sys_symlinkat(oldname, AT_FDCWD, newname);
+ #endif
+
+-
+ #endif /* _LINUX_DEVPTS_FS_H */
+diff -urNp -x '*.orig' linux-4.9/include/linux/fs.h linux-4.9/include/linux/fs.h
+--- linux-4.9/include/linux/fs.h 2021-02-24 15:47:32.384012030 +0100
++++ linux-4.9/include/linux/fs.h 2021-02-24 15:47:45.087742783 +0100
+@@ -231,6 +231,7 @@ typedef int (dio_iodone_t)(struct kiocb
+ #define ATTR_OPEN (1 << 15) /* Truncating from open(O_TRUNC) */
+ #define ATTR_TIMES_SET (1 << 16)
+ #define ATTR_TOUCH (1 << 17)
++#define ATTR_TAG (1 << 18)
+
+ /*
+ * Whiteout is represented by a char device. The following constants define the
+@@ -253,6 +254,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;
+@@ -612,7 +614,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;
+
+ #ifdef CONFIG_FS_POSIX_ACL
+ struct posix_acl *i_acl;
+@@ -641,6 +645,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;
+@@ -846,14 +851,19 @@ static inline void i_size_write(struct i
+ #endif
}
--int vfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *new_dentry)
-+int vfs_link(struct dentry *old_dentry, struct inode *dir,
-+ struct dentry *new_dentry, struct nameidata *nd)
++static inline void i_tag_write(struct inode *inode, vtag_t tag)
++{
++ inode->i_tag = make_ktag(&init_user_ns, tag);
++}
++
+ static inline unsigned iminor(const struct inode *inode)
{
- struct inode *inode = old_dentry->d_inode;
- int error;
-@@ -2256,7 +2347,7 @@ int vfs_link(struct dentry *old_dentry,
- if (!inode)
- return -ENOENT;
+- return MINOR(inode->i_rdev);
++ return MINOR(inode->i_mdev);
+ }
-- error = may_create(dir, new_dentry, NULL);
-+ error = may_create(dir, new_dentry, nd);
- if (error)
- return error;
+ static inline unsigned imajor(const struct inode *inode)
+ {
+- return MAJOR(inode->i_rdev);
++ return MAJOR(inode->i_mdev);
+ }
-@@ -2266,7 +2357,7 @@ int vfs_link(struct dentry *old_dentry,
- /*
- * A link to an append-only or immutable file cannot be created.
- */
-- if (IS_APPEND(inode) || IS_IMMUTABLE(inode))
-+ if (IS_APPEND(inode) || IS_IXORUNLINK(inode))
- return -EPERM;
- if (!dir->i_op || !dir->i_op->link)
- return -EPERM;
-@@ -2326,7 +2417,7 @@ asmlinkage long sys_linkat(int olddfd, c
- error = PTR_ERR(new_dentry);
- if (IS_ERR(new_dentry))
- goto out_unlock;
-- error = vfs_link(old_nd.dentry, nd.dentry->d_inode, new_dentry);
-+ error = vfs_link(old_nd.dentry, nd.dentry->d_inode, new_dentry, &nd);
- dput(new_dentry);
- out_unlock:
- mutex_unlock(&nd.dentry->d_inode->i_mutex);
-@@ -2458,14 +2549,14 @@ int vfs_rename(struct inode *old_dir, st
- if (old_dentry->d_inode == new_dentry->d_inode)
- return 0;
-
-- error = may_delete(old_dir, old_dentry, is_dir);
-+ error = may_delete(old_dir, old_dentry, is_dir, NULL);
- if (error)
- return error;
+ extern struct block_device *I_BDEV(struct inode *inode);
+@@ -910,6 +920,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;
- if (!new_dentry->d_inode)
- error = may_create(new_dir, new_dentry, NULL);
- else
-- error = may_delete(new_dir, new_dentry, is_dir);
-+ error = may_delete(new_dir, new_dentry, is_dir, NULL);
- if (error)
- return error;
+ u64 f_version;
+@@ -1044,6 +1055,7 @@ struct file_lock {
+ struct file *fl_file;
+ loff_t fl_start;
+ loff_t fl_end;
++ vxid_t fl_xid;
-@@ -2543,6 +2634,9 @@ static int do_rename(int olddfd, const c
- error = -EINVAL;
- if (old_dentry == trap)
- goto exit4;
-+ error = -EROFS;
-+ if (MNT_IS_RDONLY(newnd.mnt))
-+ goto exit4;
- new_dentry = lookup_hash(&newnd);
- error = PTR_ERR(new_dentry);
- if (IS_ERR(new_dentry))
-@@ -2636,6 +2730,126 @@ int vfs_follow_link(struct nameidata *nd
- return __vfs_follow_link(nd, link);
+ struct fasync_struct * fl_fasync; /* for lease break notifications */
+ /* for lease breaks: */
+@@ -1477,6 +1489,11 @@ static inline gid_t i_gid_read(const str
+ return from_kgid(inode->i_sb->s_user_ns, inode->i_gid);
}
-+
-+#ifdef CONFIG_VSERVER_COWBL
-+
-+#include <linux/file.h>
-+
-+struct dentry *cow_break_link(const char *pathname)
++static inline vtag_t i_tag_read(const struct inode *inode)
+{
-+ int ret, mode, pathlen;
-+ struct nameidata old_nd, dir_nd;
-+ struct dentry *old_dentry, *new_dentry;
-+ struct dentry *res = ERR_PTR(-EMLINK);
-+ struct vfsmount *old_mnt, *new_mnt;
-+ struct file *old_file;
-+ struct file *new_file;
-+ char *to, *path, pad='\251';
-+ loff_t size;
++ return from_ktag(&init_user_ns, inode->i_tag);
++}
+
-+ vxdprintk(VXD_CBIT(misc, 1), "cow_break_link(»%s«)", pathname);
-+ path = kmalloc(PATH_MAX, GFP_KERNEL);
+ static inline void i_uid_write(struct inode *inode, uid_t uid)
+ {
+ inode->i_uid = make_kuid(inode->i_sb->s_user_ns, uid);
+@@ -1766,6 +1783,7 @@ struct inode_operations {
+ int (*setattr) (struct dentry *, struct iattr *);
+ int (*getattr) (struct vfsmount *mnt, struct dentry *, struct kstat *);
+ ssize_t (*listxattr) (struct dentry *, char *, size_t);
++ 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);
+@@ -1780,6 +1798,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);
+
+ 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 *);
+@@ -1851,6 +1870,14 @@ struct super_operations {
+ #else
+ #define S_DAX 0 /* Make all the DAX code disappear */
+ #endif
++#define S_IXUNLINK 16384 /* Immutable Invert on unlink */
+
-+ ret = path_lookup(pathname, LOOKUP_FOLLOW, &old_nd);
-+ vxdprintk(VXD_CBIT(misc, 2), "path_lookup(old): %d", ret);
-+ old_dentry = old_nd.dentry;
-+ old_mnt = old_nd.mnt;
-+ mode = old_dentry->d_inode->i_mode;
++/* Linux-VServer related Inode flags */
+
-+ to = d_path(old_dentry, old_mnt, path, PATH_MAX-2);
-+ pathlen = strlen(to);
-+ vxdprintk(VXD_CBIT(misc, 2), "old path »%s«", to);
-+
-+ to[pathlen+1] = 0;
-+retry:
-+ to[pathlen] = pad--;
-+ if (pad <= '\240')
-+ goto out_rel_old;
-+
-+ vxdprintk(VXD_CBIT(misc, 1), "temp copy »%s«", to);
-+ ret = path_lookup(to,
-+ LOOKUP_PARENT|LOOKUP_OPEN|LOOKUP_CREATE, &dir_nd);
-+
-+ /* this puppy downs the inode sem */
-+ new_dentry = lookup_create(&dir_nd, 0);
-+ vxdprintk(VXD_CBIT(misc, 2),
-+ "lookup_create(new): %p", new_dentry);
-+ if (!new_dentry) {
-+ path_release(&dir_nd);
-+ goto retry;
-+ }
-+
-+ ret = vfs_create(dir_nd.dentry->d_inode, new_dentry, mode, &dir_nd);
-+ vxdprintk(VXD_CBIT(misc, 2),
-+ "vfs_create(new): %d", ret);
-+ if (ret == -EEXIST) {
-+
-+ mutex_unlock(&dir_nd.dentry->d_inode->i_mutex);
-+ dput(new_dentry);
-+ path_release(&dir_nd);
-+ goto retry;
-+ }
-+
-+ new_mnt = dir_nd.mnt;
-+
-+ dget(old_dentry);
-+ mntget(old_mnt);
-+ /* this one cleans up the dentry in case of failure */
-+ old_file = dentry_open(old_dentry, old_mnt, O_RDONLY);
-+ vxdprintk(VXD_CBIT(misc, 2),
-+ "dentry_open(old): %p", old_file);
-+ if (!old_file)
-+ goto out_rel_both;
-+
-+ dget(new_dentry);
-+ mntget(new_mnt);
-+ /* this one cleans up the dentry in case of failure */
-+ new_file = dentry_open(new_dentry, new_mnt, O_WRONLY);
-+ vxdprintk(VXD_CBIT(misc, 2),
-+ "dentry_open(new): %p", new_file);
-+ if (!new_file)
-+ goto out_fput_old;
-+
-+ size = i_size_read(old_file->f_dentry->d_inode);
-+ ret = vfs_sendfile(new_file, old_file, NULL, size, 0);
-+ vxdprintk(VXD_CBIT(misc, 2), "vfs_sendfile: %d", ret);
-+
-+ if (ret < 0)
-+ goto out_fput_both;
-+
-+ ret = vfs_rename(dir_nd.dentry->d_inode, new_dentry,
-+ old_nd.dentry->d_parent->d_inode, old_dentry);
-+ vxdprintk(VXD_CBIT(misc, 2), "vfs_rename: %d", ret);
-+ if (!ret) {
-+ res = new_dentry;
-+ dget(new_dentry);
-+ }
-+
-+out_fput_both:
-+ vxdprintk(VXD_CBIT(misc, 3),
-+ "fput(new_file=%p[#%d])", new_file,
-+ atomic_read(&new_file->f_count));
-+ fput(new_file);
-+
-+out_fput_old:
-+ vxdprintk(VXD_CBIT(misc, 3),
-+ "fput(old_file=%p[#%d])", old_file,
-+ atomic_read(&old_file->f_count));
-+ fput(old_file);
-+
-+out_rel_both:
-+ mutex_unlock(&dir_nd.dentry->d_inode->i_mutex);
-+ dput(new_dentry);
-+
-+ path_release(&dir_nd);
-+out_rel_old:
-+ path_release(&old_nd);
-+ kfree(path);
-+ return res;
-+}
++#define V_VALID 1
++#define V_XATTR 2
++#define V_BARRIER 4 /* Barrier for chroot() */
++#define V_COW 8 /* Copy on Write */
+
+ /*
+ * Note that nosuid etc flags are inode-specific: setting some file-system
+@@ -1875,10 +1902,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_TAGGED(inode) __IS_FLG(inode, MS_TAGGED)
+
+ #define IS_NOQUOTA(inode) ((inode)->i_flags & S_NOQUOTA)
+ #define IS_APPEND(inode) ((inode)->i_flags & S_APPEND)
+ #define IS_IMMUTABLE(inode) ((inode)->i_flags & S_IMMUTABLE)
++#define IS_IXUNLINK(inode) ((inode)->i_flags & S_IXUNLINK)
++#define IS_IXORUNLINK(inode) ((IS_IXUNLINK(inode) ? S_IMMUTABLE : 0) ^ IS_IMMUTABLE(inode))
+ #define IS_POSIXACL(inode) __IS_FLG(inode, MS_POSIXACL)
+
+ #define IS_DEADDIR(inode) ((inode)->i_flags & S_DEAD)
+@@ -1898,6 +1928,16 @@ static inline bool HAS_UNMAPPED_ID(struc
+ return !uid_valid(inode->i_uid) || !gid_valid(inode->i_gid);
+ }
+
++#define IS_BARRIER(inode) (S_ISDIR((inode)->i_mode) && ((inode)->i_vflags & V_BARRIER))
+
++#ifdef CONFIG_VSERVER_COWBL
++# define IS_COW(inode) (IS_IXUNLINK(inode) && IS_IMMUTABLE(inode))
++# define IS_COW_LINK(inode) (S_ISREG((inode)->i_mode) && ((inode)->i_nlink > 1))
++#else
++# define IS_COW(inode) (0)
++# define IS_COW_LINK(inode) (0)
+#endif
+
- /* get the link contents into pagecache */
- static char *page_getlink(struct dentry * dentry, struct page **ppage)
- {
-diff -NurpP --minimal linux-2.6.19.1/fs/namespace.c linux-2.6.19.1-vs2.3.0.6/fs/namespace.c
---- linux-2.6.19.1/fs/namespace.c 2006-11-30 21:19:26 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/namespace.c 2006-12-05 18:17:10 +0100
-@@ -25,6 +25,10 @@
- #include <linux/security.h>
- #include <linux/mount.h>
- #include <linux/ramfs.h>
-+#include <linux/vs_base.h>
-+#include <linux/vserver/space.h>
-+#include <linux/vs_context.h>
-+#include <linux/vs_tag.h>
- #include <asm/uaccess.h>
- #include <asm/unistd.h>
- #include "pnode.h"
-@@ -241,6 +245,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);
-@@ -349,43 +354,85 @@ static inline void mangle(struct seq_fil
- seq_escape(m, s, " \t\n\\");
- }
+ /*
+ * Inode state bits. Protected by inode->i_lock
+ *
+@@ -2167,6 +2207,9 @@ extern struct kobject *fs_kobj;
+ extern int locks_mandatory_locked(struct file *);
+ extern int locks_mandatory_area(struct inode *, struct file *, loff_t, loff_t, unsigned char);
-+static int mnt_is_reachable(struct vfsmount *mnt)
-+{
-+ struct vfsmount *root_mnt;
-+ struct dentry *root, *point;
-+ int ret;
-+
-+ if (mnt == mnt->mnt_namespace->root)
-+ return 1;
-+
-+ spin_lock(&dcache_lock);
-+ root_mnt = current->fs->rootmnt;
-+ root = current->fs->root;
-+ point = root;
-+
-+ while ((mnt != mnt->mnt_parent) && (mnt != root_mnt)) {
-+ point = mnt->mnt_mountpoint;
-+ mnt = mnt->mnt_parent;
-+ }
-+
-+ ret = (mnt == root_mnt) && is_subdir(point, root);
-+
-+ spin_unlock(&dcache_lock);
-+
-+ return ret;
-+}
-+
- static int show_vfsmnt(struct seq_file *m, void *v)
- {
- struct vfsmount *mnt = v;
- int err = 0;
- static struct proc_fs_info {
-- int flag;
-- char *str;
-+ int s_flag;
-+ int mnt_flag;
-+ char *set_str;
-+ char *unset_str;
- } fs_info[] = {
-- { MS_SYNCHRONOUS, ",sync" },
-- { MS_DIRSYNC, ",dirsync" },
-- { MS_MANDLOCK, ",mand" },
-- { 0, NULL }
-- };
-- static struct proc_fs_info mnt_info[] = {
-- { MNT_NOSUID, ",nosuid" },
-- { MNT_NODEV, ",nodev" },
-- { MNT_NOEXEC, ",noexec" },
-- { MNT_NOATIME, ",noatime" },
-- { MNT_NODIRATIME, ",nodiratime" },
-- { 0, NULL }
-+ { MS_RDONLY, MNT_RDONLY, "ro", "rw" },
-+ { MS_SYNCHRONOUS, 0, ",sync", NULL },
-+ { MS_DIRSYNC, 0, ",dirsync", NULL },
-+ { MS_MANDLOCK, 0, ",mand", NULL },
-+ { MS_TAGGED, 0, ",tag", NULL },
-+ { MS_NOATIME, MNT_NOATIME, ",noatime", NULL },
-+ { MS_NODIRATIME, MNT_NODIRATIME, ",nodiratime", NULL },
-+ { 0, MNT_NOSUID, ",nosuid", NULL },
-+ { 0, MNT_NODEV, ",nodev", NULL },
-+ { 0, MNT_NOEXEC, ",noexec", NULL },
-+ { 0, 0, NULL, NULL }
- };
-- struct proc_fs_info *fs_infop;
-+ struct proc_fs_info *p;
-+ unsigned long s_flags = mnt->mnt_sb->s_flags;
-+ int mnt_flags = mnt->mnt_flags;
-
-- mangle(m, mnt->mnt_devname ? mnt->mnt_devname : "none");
-- seq_putc(m, ' ');
-- seq_path(m, mnt, mnt->mnt_root, " \t\n\\");
-- seq_putc(m, ' ');
-- mangle(m, mnt->mnt_sb->s_type->name);
-- seq_puts(m, mnt->mnt_sb->s_flags & MS_RDONLY ? " ro" : " rw");
-- for (fs_infop = fs_info; fs_infop->flag; fs_infop++) {
-- if (mnt->mnt_sb->s_flags & fs_infop->flag)
-- seq_puts(m, fs_infop->str);
-+ if (vx_flags(VXF_HIDE_MOUNT, 0))
-+ return 0;
-+ if (!mnt_is_reachable(mnt) && !vx_check(0, VS_WATCH_P))
-+ return 0;
++#define ATTR_FLAG_BARRIER 512 /* Barrier for chroot() */
++#define ATTR_FLAG_IXUNLINK 1024 /* Immutable invert on unlink */
+
-+ if (!vx_check(0, VS_ADMIN|VS_WATCH) &&
-+ mnt == current->fs->rootmnt) {
-+ seq_puts(m, "/dev/root / ");
-+ } else {
-+ mangle(m, mnt->mnt_devname ? mnt->mnt_devname : "none");
-+ seq_putc(m, ' ');
-+ seq_path(m, mnt, mnt->mnt_root, " \t\n\\");
-+ seq_putc(m, ' ');
- }
-- for (fs_infop = mnt_info; fs_infop->flag; fs_infop++) {
-- if (mnt->mnt_flags & fs_infop->flag)
-- seq_puts(m, fs_infop->str);
-+ mangle(m, mnt->mnt_sb->s_type->name);
-+ seq_putc(m, ' ');
-+ for (p = fs_info; (p->s_flag | p->mnt_flag) ; p++) {
-+ if ((s_flags & p->s_flag) || (mnt_flags & p->mnt_flag)) {
-+ if (p->set_str)
-+ seq_puts(m, p->set_str);
-+ } else {
-+ if (p->unset_str)
-+ seq_puts(m, p->unset_str);
-+ }
- }
-+ if (mnt->mnt_flags & MNT_TAGID)
-+ seq_printf(m, ",tag=%d", mnt->mnt_tag);
- if (mnt->mnt_sb->s_op->show_options)
- err = mnt->mnt_sb->s_op->show_options(m, mnt);
- seq_puts(m, " 0 0\n");
-@@ -404,17 +451,27 @@ static int show_vfsstat(struct seq_file
- struct vfsmount *mnt = v;
- int err = 0;
+ /*
+ * Candidates for mandatory locking have the setgid bit set
+ * but no group execute bit - an otherwise meaningless combination.
+@@ -2347,7 +2390,7 @@ struct filename {
+ const char iname[];
+ };
-- /* 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 0;
-+ if (!mnt_is_reachable(mnt) && !vx_check(0, VS_WATCH_P))
-+ return 0;
+-extern long vfs_truncate(const struct path *, loff_t);
++extern long vfs_truncate(struct path *, loff_t);
+ extern int do_truncate(struct dentry *, loff_t start, unsigned int time_attrs,
+ struct file *filp);
+ extern int vfs_fallocate(struct file *file, int mode, loff_t offset,
+@@ -2978,6 +3021,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 *, 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 -urNp -x '*.orig' linux-4.9/include/linux/init_task.h linux-4.9/include/linux/init_task.h
+--- linux-4.9/include/linux/init_task.h 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/include/linux/init_task.h 2021-02-24 15:47:45.087742783 +0100
+@@ -271,6 +271,10 @@ extern struct task_group root_task_group
+ INIT_VTIME(tsk) \
+ INIT_NUMA_BALANCING(tsk) \
+ INIT_KASAN(tsk) \
++ .xid = 0, \
++ .vx_info = NULL, \
++ .nid = 0, \
++ .nx_info = NULL, \
+ }
-- /* mount point */
-- seq_puts(m, " mounted on ");
-- seq_path(m, mnt, mnt->mnt_root, " \t\n\\");
-- seq_putc(m, ' ');
-+ if (!vx_check(0, VS_ADMIN|VS_WATCH) &&
-+ mnt == current->fs->rootmnt) {
-+ 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, mnt->mnt_root, " \t\n\\");
-+ seq_putc(m, ' ');
-+ }
- /* file system type */
- seq_puts(m, "with fstype ");
-@@ -595,7 +652,7 @@ static int do_umount(struct vfsmount *mn
- down_write(&sb->s_umount);
- if (!(sb->s_flags & MS_RDONLY)) {
- lock_kernel();
-- DQUOT_OFF(sb);
-+ DQUOT_OFF(sb->s_dqh);
- retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
- unlock_kernel();
- }
-@@ -644,7 +701,7 @@ asmlinkage long sys_umount(char __user *
- goto dput_and_out;
+diff -urNp -x '*.orig' linux-4.9/include/linux/ipc.h linux-4.9/include/linux/ipc.h
+--- linux-4.9/include/linux/ipc.h 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/include/linux/ipc.h 2021-02-24 15:47:45.087742783 +0100
+@@ -16,6 +16,7 @@ struct kern_ipc_perm
+ key_t key;
+ kuid_t uid;
+ kgid_t gid;
++ vxid_t xid;
+ kuid_t cuid;
+ kgid_t cgid;
+ umode_t mode;
+diff -urNp -x '*.orig' linux-4.9/include/linux/memcontrol.h linux-4.9/include/linux/memcontrol.h
+--- linux-4.9/include/linux/memcontrol.h 2021-02-24 15:47:32.397345780 +0100
++++ linux-4.9/include/linux/memcontrol.h 2021-02-24 15:47:45.087742783 +0100
+@@ -92,6 +92,7 @@ enum mem_cgroup_events_target {
+ MEM_CGROUP_NTARGETS,
+ };
- retval = -EPERM;
-- if (!capable(CAP_SYS_ADMIN))
-+ if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT))
- goto dput_and_out;
++
+ #ifdef CONFIG_MEMCG
- retval = do_umount(nd.mnt, flags);
-@@ -668,7 +725,7 @@ asmlinkage long sys_oldumount(char __use
+ #define MEM_CGROUP_ID_SHIFT 16
+@@ -402,6 +403,12 @@ static inline bool mem_cgroup_is_descend
+ return cgroup_is_descendant(memcg->css.cgroup, root->css.cgroup);
+ }
- static int mount_is_safe(struct nameidata *nd)
- {
-- if (capable(CAP_SYS_ADMIN))
-+ if (vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT))
- return 0;
- return -EPERM;
- #ifdef notyet
-@@ -897,11 +954,13 @@ static int do_change_type(struct nameida
- /*
- * do loopback mount.
- */
--static int do_loopback(struct nameidata *nd, char *old_name, int recurse)
-+static int do_loopback(struct nameidata *nd, char *old_name, tag_t tag,
-+ unsigned long flags, int mnt_flags)
++extern unsigned long mem_cgroup_mem_usage_pages(struct mem_cgroup *memcg);
++extern unsigned long mem_cgroup_mem_limit_pages(struct mem_cgroup *memcg);
++extern unsigned long mem_cgroup_memsw_usage_pages(struct mem_cgroup *memcg);
++extern unsigned long mem_cgroup_memsw_limit_pages(struct mem_cgroup *memcg);
++extern void dump_mem_cgroup(struct mem_cgroup *memcg);
++
+ static inline bool mm_match_cgroup(struct mm_struct *mm,
+ struct mem_cgroup *memcg)
{
- struct nameidata old_nd;
- struct vfsmount *mnt = NULL;
- int err = mount_is_safe(nd);
-+ int recurse = flags & MS_REC;
- if (err)
- return err;
- if (!old_name || !*old_name)
-@@ -927,6 +986,12 @@ static int do_loopback(struct nameidata
- if (!mnt)
- goto out;
+diff -urNp -x '*.orig' linux-4.9/include/linux/mount.h linux-4.9/include/linux/mount.h
+--- linux-4.9/include/linux/mount.h 2021-02-24 15:47:32.400679218 +0100
++++ linux-4.9/include/linux/mount.h 2021-02-24 15:47:45.087742783 +0100
+@@ -63,6 +63,9 @@ struct mnt_namespace;
+ #define MNT_MARKED 0x4000000
+ #define MNT_UMOUNT 0x8000000
-+ mnt->mnt_flags = mnt_flags;
-+ if (flags & MS_TAGID) {
-+ mnt->mnt_tag = tag;
-+ mnt->mnt_flags |= MNT_TAGID;
-+ }
++#define MNT_TAGID 0x10000
++#define MNT_NOTAG 0x20000
+
- err = graft_tree(mnt, nd);
- if (err) {
- LIST_HEAD(umount_list);
-@@ -935,6 +1000,7 @@ static int do_loopback(struct nameidata
- spin_unlock(&vfsmount_lock);
- release_mounts(&umount_list);
- }
-+ mnt->mnt_flags = mnt_flags;
+ struct vfsmount {
+ struct dentry *mnt_root; /* root of the mounted tree */
+ struct super_block *mnt_sb; /* pointer to superblock */
+diff -urNp -x '*.orig' linux-4.9/include/linux/net.h linux-4.9/include/linux/net.h
+--- linux-4.9/include/linux/net.h 2021-02-24 15:47:32.400679218 +0100
++++ linux-4.9/include/linux/net.h 2021-02-24 15:47:45.091076220 +0100
+@@ -44,6 +44,7 @@ struct net;
+ #define SOCK_NOSPACE 2
+ #define SOCK_PASSCRED 3
+ #define SOCK_PASSSEC 4
++#define SOCK_USER_SOCKET 5
- out:
- up_write(&namespace_sem);
-@@ -948,12 +1014,12 @@ out:
- * on it - tough luck.
+ #ifndef ARCH_HAS_SOCKET_TYPES
+ /**
+diff -urNp -x '*.orig' linux-4.9/include/linux/netdevice.h linux-4.9/include/linux/netdevice.h
+--- linux-4.9/include/linux/netdevice.h 2021-02-24 15:47:33.074033615 +0100
++++ linux-4.9/include/linux/netdevice.h 2021-02-24 15:47:45.087742783 +0100
+@@ -2489,6 +2489,7 @@ static inline int dev_recursion_level(vo
+
+ 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 -urNp -x '*.orig' linux-4.9/include/linux/nsproxy.h linux-4.9/include/linux/nsproxy.h
+--- linux-4.9/include/linux/nsproxy.h 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/include/linux/nsproxy.h 2021-02-24 15:47:45.091076220 +0100
+@@ -3,6 +3,7 @@
+
+ #include <linux/spinlock.h>
+ #include <linux/sched.h>
++#include <linux/vserver/debug.h>
+
+ struct mnt_namespace;
+ struct uts_namespace;
+@@ -65,6 +66,7 @@ extern struct nsproxy init_nsproxy;
*/
- static int do_remount(struct nameidata *nd, int flags, int mnt_flags,
-- void *data)
-+ void *data, xid_t xid)
- {
- int err;
- struct super_block *sb = nd->mnt->mnt_sb;
-- if (!capable(CAP_SYS_ADMIN))
-+ if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_REMOUNT))
- return -EPERM;
+ 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);
+@@ -72,16 +74,26 @@ int unshare_nsproxy_namespaces(unsigned
+ struct cred *, struct fs_struct *);
+ int __init nsproxy_cache_init(void);
- if (!check_mnt(nd->mnt))
-@@ -987,7 +1053,7 @@ static int do_move_mount(struct nameidat
- struct nameidata old_nd, parent_nd;
- 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;
-@@ -1067,7 +1133,7 @@ static int do_new_mount(struct nameidata
- return -EINVAL;
+-static inline void put_nsproxy(struct nsproxy *ns)
++#define get_nsproxy(n) __get_nsproxy(n, __FILE__, __LINE__)
++
++static inline void __get_nsproxy(struct nsproxy *ns,
++ const char *_file, int _line)
+ {
+- if (atomic_dec_and_test(&ns->count)) {
+- free_nsproxy(ns);
+- }
++ vxlprintk(VXD_CBIT(space, 0), "get_nsproxy(%p[%u])",
++ ns, atomic_read(&ns->count), _file, _line);
++ atomic_inc(&ns->count);
+ }
- /* we need capabilities... */
-- if (!capable(CAP_SYS_ADMIN))
-+ if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT))
- return -EPERM;
+-static inline void get_nsproxy(struct nsproxy *ns)
++#define put_nsproxy(n) __put_nsproxy(n, __FILE__, __LINE__)
++
++static inline void __put_nsproxy(struct nsproxy *ns,
++ const char *_file, int _line)
+ {
+- atomic_inc(&ns->count);
++ vxlprintk(VXD_CBIT(space, 0), "put_nsproxy(%p[%u])",
++ ns, atomic_read(&ns->count), _file, _line);
++ if (atomic_dec_and_test(&ns->count)) {
++ free_nsproxy(ns);
++ }
+ }
- mnt = do_kern_mount(type, flags, name, data);
-@@ -1379,6 +1445,7 @@ long do_mount(char *dev_name, char *dir_
- struct nameidata nd;
- int retval = 0;
- int mnt_flags = 0;
-+ tag_t tag = 0;
+ #endif
+diff -urNp -x '*.orig' linux-4.9/include/linux/pid.h linux-4.9/include/linux/pid.h
+--- linux-4.9/include/linux/pid.h 2021-02-24 15:47:32.407346093 +0100
++++ linux-4.9/include/linux/pid.h 2021-02-24 15:47:45.091076220 +0100
+@@ -10,7 +10,8 @@ enum pid_type
+ PIDTYPE_SID,
+ PIDTYPE_MAX,
+ /* only valid to __task_pid_nr_ns() */
+- __PIDTYPE_TGID
++ __PIDTYPE_TGID,
++ __PIDTYPE_REALPID
+ };
- /* Discard magic */
- if ((flags & MS_MGC_MSK) == MS_MGC_VAL)
-@@ -1394,7 +1461,19 @@ long do_mount(char *dev_name, char *dir_
- if (data_page)
- ((char *)data_page)[PAGE_SIZE - 1] = 0;
+ /*
+@@ -172,6 +173,7 @@ static inline pid_t pid_nr(struct pid *p
+ }
-+#ifdef CONFIG_PROPAGATE
-+ retval = dx_parse_tag(data_page, &tag, 1);
-+ if (retval) {
-+ mnt_flags |= MNT_TAGID;
-+ /* bind and re-mounts get the tag flag */
-+ if (flags & (MS_BIND|MS_REMOUNT))
-+ flags |= MS_TAGID;
-+ }
-+#endif
-+
- /* Separate the per-mountpoint flags */
-+ if (flags & MS_RDONLY)
-+ mnt_flags |= MNT_RDONLY;
- if (flags & MS_NOSUID)
- mnt_flags |= MNT_NOSUID;
- if (flags & MS_NODEV)
-@@ -1406,6 +1485,8 @@ long do_mount(char *dev_name, char *dir_
- if (flags & MS_NODIRATIME)
- mnt_flags |= MNT_NODIRATIME;
+ pid_t pid_nr_ns(struct pid *pid, struct pid_namespace *ns);
++pid_t pid_unmapped_nr_ns(struct pid *pid, struct pid_namespace *ns);
+ pid_t pid_vnr(struct pid *pid);
-+ if (!capable(CAP_SYS_ADMIN))
-+ mnt_flags |= MNT_NODEV;
- flags &= ~(MS_NOSUID | MS_NOEXEC | MS_NODEV | MS_ACTIVE |
- MS_NOATIME | MS_NODIRATIME);
+ #define do_each_pid_task(pid, type, task) \
+diff -urNp -x '*.orig' linux-4.9/include/linux/quotaops.h linux-4.9/include/linux/quotaops.h
+--- linux-4.9/include/linux/quotaops.h 2021-02-24 15:47:32.410679531 +0100
++++ linux-4.9/include/linux/quotaops.h 2021-02-24 15:47:45.091076220 +0100
+@@ -8,6 +8,7 @@
+ #define _LINUX_QUOTAOPS_
-@@ -1420,9 +1501,9 @@ long do_mount(char *dev_name, char *dir_
+ #include <linux/fs.h>
++#include <linux/vs_dlimit.h>
- if (flags & MS_REMOUNT)
- retval = do_remount(&nd, flags & ~MS_REMOUNT, mnt_flags,
-- data_page);
-+ data_page, tag);
- else if (flags & MS_BIND)
-- retval = do_loopback(&nd, dev_name, flags & MS_REC);
-+ retval = do_loopback(&nd, dev_name, tag, flags, mnt_flags);
- else if (flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE))
- retval = do_change_type(&nd, flags);
- else if (flags & MS_MOVE)
-@@ -1520,7 +1601,7 @@ int copy_namespace(int flags, struct tas
- if (!(flags & CLONE_NEWNS))
- return 0;
+ #define DQUOT_SPACE_WARN 0x1
+ #define DQUOT_SPACE_RESERVE 0x2
+@@ -224,11 +225,12 @@ static inline void dquot_drop(struct ino
-- if (!capable(CAP_SYS_ADMIN)) {
-+ if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT)) {
- err = -EPERM;
- goto out;
- }
-diff -NurpP --minimal linux-2.6.19.1/fs/nfs/client.c linux-2.6.19.1-vs2.3.0.6/fs/nfs/client.c
---- linux-2.6.19.1/fs/nfs/client.c 2006-11-30 21:19:26 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/nfs/client.c 2006-11-08 04:57:47 +0100
-@@ -520,6 +520,9 @@ static int nfs_init_server_rpcclient(str
- if (server->flags & NFS4_MOUNT_INTR)
- server->client->cl_intr = 1;
+ static inline int dquot_alloc_inode(struct inode *inode)
+ {
+- return 0;
++ return dl_alloc_inode(inode);
+ }
-+ server->client->cl_tag = 0;
-+ if (server->flags & NFS_MOUNT_TAGGED)
-+ server->client->cl_tag = 1;
+ static inline void dquot_free_inode(struct inode *inode)
+ {
++ dl_free_inode(inode);
+ }
+
+ static inline int dquot_transfer(struct inode *inode, struct iattr *iattr)
+@@ -239,6 +241,10 @@ static inline int dquot_transfer(struct
+ static inline int __dquot_alloc_space(struct inode *inode, qsize_t number,
+ int flags)
+ {
++ int ret = 0;
++
++ if ((ret = dl_alloc_space(inode, number)))
++ return ret;
+ if (!(flags & DQUOT_SPACE_RESERVE))
+ inode_add_bytes(inode, number);
return 0;
+@@ -249,6 +255,7 @@ static inline void __dquot_free_space(st
+ {
+ if (!(flags & DQUOT_SPACE_RESERVE))
+ inode_sub_bytes(inode, number);
++ dl_free_space(inode, number);
}
-@@ -676,6 +679,10 @@ static void nfs_server_set_fsinfo(struct
- server->acdirmin = server->acdirmax = 0;
- }
+ static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
+diff -urNp -x '*.orig' linux-4.9/include/linux/sched.h linux-4.9/include/linux/sched.h
+--- linux-4.9/include/linux/sched.h 2021-02-24 15:47:32.414012968 +0100
++++ linux-4.9/include/linux/sched.h 2021-02-24 15:47:45.091076220 +0100
+@@ -1719,6 +1719,14 @@ struct task_struct {
+ #endif
+ struct seccomp seccomp;
-+ /* FIXME: needs fsinfo
-+ if (server->flags & NFS_MOUNT_TAGGED)
-+ sb->s_flags |= MS_TAGGED; */
++/* vserver context data */
++ struct vx_info *vx_info;
++ struct nx_info *nx_info;
+
- server->maxfilesize = fsinfo->maxfilesize;
-
- /* We're airborne Set socket buffersize */
-diff -NurpP --minimal linux-2.6.19.1/fs/nfs/dir.c linux-2.6.19.1-vs2.3.0.6/fs/nfs/dir.c
---- linux-2.6.19.1/fs/nfs/dir.c 2006-11-30 21:19:26 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/nfs/dir.c 2006-11-30 19:09:28 +0100
-@@ -33,6 +33,7 @@
- #include <linux/pagevec.h>
- #include <linux/namei.h>
- #include <linux/mount.h>
-+#include <linux/vs_tag.h>
++ vxid_t xid;
++ vnid_t nid;
++ vtag_t tag;
++
+ /* Thread group tracking */
+ u64 parent_exec_id;
+ u64 self_exec_id;
+@@ -2114,6 +2122,11 @@ struct pid_namespace;
+ pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
+ struct pid_namespace *ns);
- #include "nfs4_fs.h"
- #include "delegation.h"
-@@ -933,6 +934,7 @@ static struct dentry *nfs_lookup(struct
- if (IS_ERR(res))
- goto out_unlock;
++#include <linux/vserver/base.h>
++#include <linux/vserver/context.h>
++#include <linux/vserver/debug.h>
++#include <linux/vserver/pid.h>
++
+ static inline pid_t task_pid_nr(struct task_struct *tsk)
+ {
+ return tsk->pid;
+@@ -2127,7 +2140,8 @@ static inline pid_t task_pid_nr_ns(struc
-+ dx_propagate_tag(nd, inode);
- no_entry:
- res = d_materialise_unique(dentry, inode);
- if (res != NULL) {
-@@ -975,7 +977,8 @@ static int is_atomic_open(struct inode *
- if (nd->flags & LOOKUP_DIRECTORY)
- return 0;
- /* Are we trying to write to a read only partition? */
-- if (IS_RDONLY(dir) && (nd->intent.open.flags & (O_CREAT|O_TRUNC|FMODE_WRITE)))
-+ if ((IS_RDONLY(dir) || MNT_IS_RDONLY(nd->mnt)) &&
-+ (nd->intent.open.flags & (O_CREAT|O_TRUNC|FMODE_WRITE)))
- return 0;
- return 1;
+ static inline pid_t task_pid_vnr(struct task_struct *tsk)
+ {
+- return __task_pid_nr_ns(tsk, PIDTYPE_PID, NULL);
++ // return __task_pid_nr_ns(tsk, PIDTYPE_PID, NULL);
++ return vx_map_pid(__task_pid_nr_ns(tsk, PIDTYPE_PID, NULL));
}
-diff -NurpP --minimal linux-2.6.19.1/fs/nfs/inode.c linux-2.6.19.1-vs2.3.0.6/fs/nfs/inode.c
---- linux-2.6.19.1/fs/nfs/inode.c 2006-11-30 21:19:26 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/nfs/inode.c 2006-11-30 18:53:18 +0100
-@@ -37,6 +37,7 @@
- #include <linux/vfs.h>
- #include <linux/inet.h>
- #include <linux/nfs_xdr.h>
-+#include <linux/vs_tag.h>
- #include <asm/system.h>
- #include <asm/uaccess.h>
-@@ -279,8 +280,10 @@ nfs_fhget(struct super_block *sb, struct
- nfsi->change_attr = fattr->change_attr;
- inode->i_size = nfs_size_to_loff_t(fattr->size);
- inode->i_nlink = fattr->nlink;
-- inode->i_uid = fattr->uid;
-- inode->i_gid = fattr->gid;
-+ inode->i_uid = INOTAG_UID(DX_TAG(inode), fattr->uid, fattr->gid);
-+ inode->i_gid = INOTAG_GID(DX_TAG(inode), fattr->uid, fattr->gid);
-+ inode->i_tag = INOTAG_TAG(DX_TAG(inode), fattr->uid, fattr->gid, 0);
-+ /* maybe fattr->xid someday */
- if (fattr->valid & (NFS_ATTR_FATTR_V3 | NFS_ATTR_FATTR_V4)) {
- /*
- * report the blocks in 512byte units
-@@ -369,6 +372,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;
- spin_lock(&inode->i_lock);
- NFS_I(inode)->cache_validity |= NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;
- spin_unlock(&inode->i_lock);
-@@ -778,6 +783,9 @@ static int nfs_check_inode_attributes(st
- struct nfs_inode *nfsi = NFS_I(inode);
- loff_t cur_size, new_isize;
- int data_unstable;
-+ uid_t uid;
-+ gid_t gid;
-+ tag_t tag;
+diff -urNp -x '*.orig' linux-4.9/include/linux/shmem_fs.h linux-4.9/include/linux/shmem_fs.h
+--- linux-4.9/include/linux/shmem_fs.h 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/include/linux/shmem_fs.h 2021-02-24 15:47:45.091076220 +0100
+@@ -10,6 +10,9 @@
- /* Has the inode gone and changed behind our back? */
-@@ -805,10 +813,15 @@ static int nfs_check_inode_attributes(st
- if (cur_size != new_isize && nfsi->npages == 0)
- nfsi->cache_validity |= NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE;
+ /* inode in-kernel data */
-+ 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);
++#define TMPFS_SUPER_MAGIC 0x01021994
+
- /* Have any file permissions changed? */
- if ((inode->i_mode & S_IALLUGO) != (fattr->mode & S_IALLUGO)
-- || inode->i_uid != fattr->uid
-- || inode->i_gid != fattr->gid)
-+ || inode->i_uid != uid
-+ || inode->i_gid != gid
-+ || inode->i_tag != tag)
- nfsi->cache_validity |= NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ACCESS | NFS_INO_INVALID_ACL;
-
- /* Has the link count changed? */
-@@ -898,6 +911,9 @@ static int nfs_update_inode(struct inode
- loff_t cur_isize, new_isize;
- unsigned int invalid = 0;
- int data_stable;
-+ uid_t uid;
-+ gid_t gid;
-+ tag_t tag;
-
- dfprintk(VFS, "NFS: %s(%s/%ld ct=%d info=0x%x)\n",
- __FUNCTION__, inode->i_sb->s_id, inode->i_ino,
-@@ -970,15 +986,21 @@ static int nfs_update_inode(struct inode
- }
- memcpy(&inode->i_atime, &fattr->atime, sizeof(inode->i_atime));
-
-+ 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);
-+
- if ((inode->i_mode & S_IALLUGO) != (fattr->mode & S_IALLUGO) ||
-- inode->i_uid != fattr->uid ||
-- inode->i_gid != fattr->gid)
-+ inode->i_uid != uid ||
-+ inode->i_gid != gid ||
-+ inode->i_tag != tag)
- invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;
-
- inode->i_mode = fattr->mode;
- inode->i_nlink = fattr->nlink;
-- inode->i_uid = fattr->uid;
-- inode->i_gid = fattr->gid;
-+ inode->i_uid = uid;
-+ inode->i_gid = gid;
-+ inode->i_tag = tag;
-
- if (fattr->valid & (NFS_ATTR_FATTR_V3 | NFS_ATTR_FATTR_V4)) {
- /*
-diff -NurpP --minimal linux-2.6.19.1/fs/nfs/nfs3xdr.c linux-2.6.19.1-vs2.3.0.6/fs/nfs/nfs3xdr.c
---- linux-2.6.19.1/fs/nfs/nfs3xdr.c 2006-11-30 21:19:26 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/nfs/nfs3xdr.c 2006-11-30 18:53:18 +0100
-@@ -22,6 +22,7 @@
- #include <linux/nfs3.h>
- #include <linux/nfs_fs.h>
- #include <linux/nfsacl.h>
-+#include <linux/vs_tag.h>
- #include "internal.h"
-
- #define NFSDBG_FACILITY NFSDBG_XDR
-@@ -178,7 +179,7 @@ xdr_decode_fattr(__be32 *p, struct nfs_f
- }
++
+ struct shmem_inode_info {
+ spinlock_t lock;
+ unsigned int seals; /* shmem seals */
+diff -urNp -x '*.orig' linux-4.9/include/linux/stat.h linux-4.9/include/linux/stat.h
+--- linux-4.9/include/linux/stat.h 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/include/linux/stat.h 2021-02-24 15:47:45.091076220 +0100
+@@ -25,6 +25,7 @@ struct kstat {
+ unsigned int nlink;
+ kuid_t uid;
+ kgid_t gid;
++ ktag_t tag;
+ dev_t rdev;
+ loff_t size;
+ struct timespec atime;
+diff -urNp -x '*.orig' linux-4.9/include/linux/sunrpc/auth.h linux-4.9/include/linux/sunrpc/auth.h
+--- linux-4.9/include/linux/sunrpc/auth.h 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/include/linux/sunrpc/auth.h 2021-02-24 15:47:45.091076220 +0100
+@@ -46,6 +46,7 @@ enum {
+ struct auth_cred {
+ kuid_t uid;
+ kgid_t gid;
++ ktag_t tag;
+ struct group_info *group_info;
+ const char *principal;
+ unsigned long ac_flags;
+diff -urNp -x '*.orig' linux-4.9/include/linux/sunrpc/clnt.h linux-4.9/include/linux/sunrpc/clnt.h
+--- linux-4.9/include/linux/sunrpc/clnt.h 2021-02-24 15:47:32.417346405 +0100
++++ linux-4.9/include/linux/sunrpc/clnt.h 2021-02-24 15:47:45.091076220 +0100
+@@ -52,7 +52,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 */
++ cl_tag : 1;/* context tagging */
- static inline __be32 *
--xdr_encode_sattr(__be32 *p, struct iattr *attr)
-+xdr_encode_sattr(__be32 *p, struct iattr *attr, int tag)
- {
- if (attr->ia_valid & ATTR_MODE) {
- *p++ = xdr_one;
-@@ -186,15 +187,17 @@ xdr_encode_sattr(__be32 *p, struct iattr
- } 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++ = 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++ = xdr_zero;
- }
-@@ -279,7 +282,8 @@ static int
- nfs3_xdr_sattrargs(struct rpc_rqst *req, __be32 *p, 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);
-@@ -370,7 +374,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);
+ struct rpc_rtt * cl_rtt; /* RTO estimator data */
+ const struct rpc_timeout *cl_timeout; /* Timeout strategy */
+diff -urNp -x '*.orig' linux-4.9/include/linux/types.h linux-4.9/include/linux/types.h
+--- linux-4.9/include/linux/types.h 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/include/linux/types.h 2021-02-24 15:47:45.091076220 +0100
+@@ -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;
- req->rq_slen = xdr_adjust_iovec(req->rq_svec, p);
- return 0;
-@@ -384,7 +389,8 @@ nfs3_xdr_mkdirargs(struct rpc_rqst *req,
- {
- 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;
- }
-@@ -397,7 +403,8 @@ nfs3_xdr_symlinkargs(struct rpc_rqst *re
- {
- 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);
-
-@@ -415,7 +422,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.19.1/fs/nfs/nfsroot.c linux-2.6.19.1-vs2.3.0.6/fs/nfs/nfsroot.c
---- linux-2.6.19.1/fs/nfs/nfsroot.c 2006-11-30 21:19:26 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/nfs/nfsroot.c 2006-12-02 01:37:05 +0100
-@@ -118,12 +118,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
- };
-@@ -160,6 +160,10 @@ static match_table_t __initdata tokens =
- {Opt_tcp, "tcp"},
- {Opt_acl, "acl"},
- {Opt_noacl, "noacl"},
-+ {Opt_tag, "tag"},
-+ {Opt_notag, "notag"},
-+ {Opt_tagid, "tagid=%u"},
-+ {Opt_tag, "tagxid"},
- {Opt_err, NULL}
-
- };
-@@ -274,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.19.1/fs/nfs/super.c linux-2.6.19.1-vs2.3.0.6/fs/nfs/super.c
---- linux-2.6.19.1/fs/nfs/super.c 2006-11-30 21:19:26 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/nfs/super.c 2006-11-30 18:53:18 +0100
-@@ -44,6 +44,7 @@
- #include <linux/vfs.h>
- #include <linux/inet.h>
- #include <linux/nfs_xdr.h>
-+#include <linux/vs_tag.h>
+ typedef unsigned long uintptr_t;
- #include <asm/system.h>
- #include <asm/uaccess.h>
-@@ -290,6 +291,7 @@ static void nfs_show_mount_options(struc
- { NFS_MOUNT_NOAC, ",noac", "" },
- { NFS_MOUNT_NONLM, ",nolock", "" },
- { NFS_MOUNT_NOACL, ",noacl", "" },
-+ { NFS_MOUNT_TAGGED, ",tag", "" },
- { 0, NULL, NULL }
- };
- const struct proc_nfs_info *nfs_infop;
-diff -NurpP --minimal linux-2.6.19.1/fs/nfsd/auth.c linux-2.6.19.1-vs2.3.0.6/fs/nfsd/auth.c
---- linux-2.6.19.1/fs/nfsd/auth.c 2006-06-18 04:54:42 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/fs/nfsd/auth.c 2006-11-30 18:53:18 +0100
-@@ -9,6 +9,7 @@
- #include <linux/sunrpc/svc.h>
- #include <linux/sunrpc/svcauth.h>
- #include <linux/nfsd/nfsd.h>
-+#include <linux/vs_tag.h>
+diff -urNp -x '*.orig' linux-4.9/include/linux/uidgid.h linux-4.9/include/linux/uidgid.h
+--- linux-4.9/include/linux/uidgid.h 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/include/linux/uidgid.h 2021-02-24 15:47:45.091076220 +0100
+@@ -21,13 +21,17 @@ typedef struct {
+ uid_t val;
+ } kuid_t;
- #define CAP_NFSD_MASK (CAP_FS_MASK|CAP_TO_MASK(CAP_SYS_RESOURCE))
+-
+ typedef struct {
+ gid_t val;
+ } kgid_t;
-@@ -41,19 +42,22 @@ int nfsd_setuser(struct svc_rqst *rqstp,
- get_group_info(cred.cr_group_info);
++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 }
- if (cred.cr_uid != (uid_t) -1)
-- current->fsuid = cred.cr_uid;
-+ current->fsuid = INOTAG_UID(DX_TAG_NFSD, cred.cr_uid, cred.cr_gid);
- else
- current->fsuid = exp->ex_anon_uid;
- if (cred.cr_gid != (gid_t) -1)
-- current->fsgid = cred.cr_gid;
-+ current->fsgid = INOTAG_GID(DX_TAG_NFSD, cred.cr_uid, cred.cr_gid);
- else
- current->fsgid = exp->ex_anon_gid;
+ #ifdef CONFIG_MULTIUSER
+ static inline uid_t __kuid_val(kuid_t uid)
+@@ -51,11 +55,18 @@ static inline gid_t __kgid_val(kgid_t gi
+ }
+ #endif
-+ /* this desperately needs a tag :) */
-+ current->xid = (xid_t)INOTAG_TAG(DX_TAG_NFSD, cred.cr_uid, cred.cr_gid, 0);
++static inline vtag_t __ktag_val(ktag_t tag)
++{
++ return tag.val;
++}
+
- if (!cred.cr_group_info)
- return -ENOMEM;
- ret = set_current_groups(cred.cr_group_info);
- put_group_info(cred.cr_group_info);
-- if ((cred.cr_uid)) {
-+ if (INOTAG_UID(DX_TAG_NFSD, cred.cr_uid, cred.cr_gid)) {
- cap_t(current->cap_effective) &= ~CAP_NFSD_MASK;
- } else {
- cap_t(current->cap_effective) |= (CAP_NFSD_MASK &
-diff -NurpP --minimal linux-2.6.19.1/fs/nfsd/nfs3xdr.c linux-2.6.19.1-vs2.3.0.6/fs/nfsd/nfs3xdr.c
---- linux-2.6.19.1/fs/nfsd/nfs3xdr.c 2006-11-30 21:19:26 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/nfsd/nfs3xdr.c 2006-11-30 18:53:18 +0100
-@@ -21,6 +21,7 @@
- #include <linux/sunrpc/svc.h>
- #include <linux/nfsd/nfsd.h>
- #include <linux/nfsd/xdr3.h>
-+#include <linux/vs_tag.h>
+ #define GLOBAL_ROOT_UID KUIDT_INIT(0)
+ #define GLOBAL_ROOT_GID KGIDT_INIT(0)
++#define GLOBAL_ROOT_TAG KTAGT_INIT(0)
- #define NFSDDBG_FACILITY NFSDDBG_XDR
+ #define INVALID_UID KUIDT_INIT(-1)
+ #define INVALID_GID KGIDT_INIT(-1)
++#define INVALID_TAG KTAGT_INIT(-1)
-@@ -111,6 +112,8 @@ static inline __be32 *
- decode_sattr3(__be32 *p, struct iattr *iap)
+ static inline bool uid_eq(kuid_t left, kuid_t right)
{
- u32 tmp;
-+ uid_t uid = 0;
-+ gid_t gid = 0;
-
- iap->ia_valid = 0;
-
-@@ -120,12 +123,15 @@ decode_sattr3(__be32 *p, struct iattr *i
- }
- if (*p++) {
- iap->ia_valid |= ATTR_UID;
-- iap->ia_uid = ntohl(*p++);
-+ uid = ntohl(*p++);
- }
- if (*p++) {
- iap->ia_valid |= ATTR_GID;
-- iap->ia_gid = ntohl(*p++);
-+ gid = ntohl(*p++);
- }
-+ 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);
- if (*p++) {
- u64 newsize;
-
-@@ -163,8 +169,10 @@ encode_fattr3(struct svc_rqst *rqstp, __
- *p++ = htonl(nfs3_ftypes[(stat->mode & S_IFMT) >> 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)));
- if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
- p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
- } else {
-diff -NurpP --minimal linux-2.6.19.1/fs/nfsd/nfs4recover.c linux-2.6.19.1-vs2.3.0.6/fs/nfsd/nfs4recover.c
---- linux-2.6.19.1/fs/nfsd/nfs4recover.c 2006-11-30 21:19:26 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/nfsd/nfs4recover.c 2006-11-08 21:53:01 +0100
-@@ -156,7 +156,7 @@ nfsd4_create_clid_dir(struct nfs4_client
- dprintk("NFSD: nfsd4_create_clid_dir: DIRECTORY EXISTS\n");
- goto out_put;
- }
-- status = vfs_mkdir(rec_dir.dentry->d_inode, dentry, S_IRWXU);
-+ status = vfs_mkdir(rec_dir.dentry->d_inode, dentry, S_IRWXU, NULL);
- out_put:
- dput(dentry);
- out_unlock:
-@@ -260,7 +260,7 @@ nfsd4_remove_clid_file(struct dentry *di
- return -EINVAL;
- }
- mutex_lock(&dir->d_inode->i_mutex);
-- status = vfs_unlink(dir->d_inode, dentry);
-+ status = vfs_unlink(dir->d_inode, dentry, NULL);
- mutex_unlock(&dir->d_inode->i_mutex);
- return status;
- }
-@@ -275,7 +275,7 @@ nfsd4_clear_clid_dir(struct dentry *dir,
- * a kernel from the future.... */
- nfsd4_list_rec_dir(dentry, nfsd4_remove_clid_file);
- mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_PARENT);
-- status = vfs_rmdir(dir->d_inode, dentry);
-+ status = vfs_rmdir(dir->d_inode, dentry, NULL);
- mutex_unlock(&dir->d_inode->i_mutex);
- return status;
+@@ -67,6 +78,11 @@ static inline bool gid_eq(kgid_t left, k
+ return __kgid_val(left) == __kgid_val(right);
}
-diff -NurpP --minimal linux-2.6.19.1/fs/nfsd/nfs4xdr.c linux-2.6.19.1-vs2.3.0.6/fs/nfsd/nfs4xdr.c
---- linux-2.6.19.1/fs/nfsd/nfs4xdr.c 2006-11-30 21:19:26 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/nfsd/nfs4xdr.c 2006-11-30 18:53:18 +0100
-@@ -57,6 +57,7 @@
- #include <linux/nfsd_idmap.h>
- #include <linux/nfs4.h>
- #include <linux/nfs4_acl.h>
-+#include <linux/vs_tag.h>
-
- #define NFSDDBG_FACILITY NFSDDBG_XDR
-
-@@ -1727,14 +1728,18 @@ out_acl:
- WRITE32(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;
- 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;
- if (status)
-diff -NurpP --minimal linux-2.6.19.1/fs/nfsd/nfsxdr.c linux-2.6.19.1-vs2.3.0.6/fs/nfsd/nfsxdr.c
---- linux-2.6.19.1/fs/nfsd/nfsxdr.c 2006-11-30 21:19:26 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/nfsd/nfsxdr.c 2006-11-30 18:53:18 +0100
-@@ -15,6 +15,7 @@
- #include <linux/nfsd/nfsd.h>
- #include <linux/nfsd/xdr.h>
- #include <linux/mm.h>
-+#include <linux/vs_tag.h>
-
- #define NFSDDBG_FACILITY NFSDDBG_XDR
-@@ -102,6 +103,8 @@ static inline __be32 *
- decode_sattr(__be32 *p, struct iattr *iap)
++static inline bool tag_eq(ktag_t left, ktag_t right)
++{
++ return __ktag_val(left) == __ktag_val(right);
++}
++
+ static inline bool uid_gt(kuid_t left, kuid_t right)
{
- u32 tmp, tmp1;
-+ uid_t uid = 0;
-+ gid_t gid = 0;
-
- iap->ia_valid = 0;
-
-@@ -115,12 +118,15 @@ decode_sattr(__be32 *p, struct iattr *ia
- }
- if ((tmp = ntohl(*p++)) != (u32)-1) {
- iap->ia_valid |= ATTR_UID;
-- iap->ia_uid = tmp;
-+ uid = tmp;
- }
- if ((tmp = ntohl(*p++)) != (u32)-1) {
- iap->ia_valid |= ATTR_GID;
-- iap->ia_gid = tmp;
-+ gid = tmp;
- }
-+ 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);
- if ((tmp = ntohl(*p++)) != (u32)-1) {
- iap->ia_valid |= ATTR_SIZE;
- iap->ia_size = tmp;
-@@ -164,8 +170,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)));
-
- if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
- *p++ = htonl(NFS_MAXPATHLEN);
-diff -NurpP --minimal linux-2.6.19.1/fs/nfsd/vfs.c linux-2.6.19.1-vs2.3.0.6/fs/nfsd/vfs.c
---- linux-2.6.19.1/fs/nfsd/vfs.c 2006-11-30 21:19:26 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/nfsd/vfs.c 2006-11-20 21:12:32 +0100
-@@ -1183,13 +1183,13 @@ nfsd_create(struct svc_rqst *rqstp, stru
- host_err = vfs_create(dirp, dchild, iap->ia_mode, NULL);
- break;
- case S_IFDIR:
-- host_err = vfs_mkdir(dirp, dchild, iap->ia_mode);
-+ host_err = vfs_mkdir(dirp, dchild, iap->ia_mode, NULL);
- break;
- case S_IFCHR:
- case S_IFBLK:
- case S_IFIFO:
- case S_IFSOCK:
-- host_err = vfs_mknod(dirp, dchild, iap->ia_mode, rdev);
-+ host_err = vfs_mknod(dirp, dchild, iap->ia_mode, rdev, NULL);
- break;
- default:
- printk("nfsd: bad file type %o in nfsd_create\n", type);
-@@ -1474,11 +1474,13 @@ nfsd_symlink(struct svc_rqst *rqstp, str
- else {
- strncpy(path_alloced, path, plen);
- path_alloced[plen] = 0;
-- host_err = vfs_symlink(dentry->d_inode, dnew, path_alloced, mode);
-+ host_err = vfs_symlink(dentry->d_inode, dnew,
-+ path_alloced, mode, NULL);
- kfree(path_alloced);
- }
- } else
-- host_err = vfs_symlink(dentry->d_inode, dnew, path, mode);
-+ host_err = vfs_symlink(dentry->d_inode, dnew,
-+ path, mode, NULL);
-
- if (!host_err) {
- if (EX_ISSYNC(fhp->fh_export))
-@@ -1537,7 +1539,7 @@ nfsd_link(struct svc_rqst *rqstp, struct
- dold = tfhp->fh_dentry;
- dest = dold->d_inode;
-
-- host_err = vfs_link(dold, dirp, dnew);
-+ host_err = vfs_link(dold, dirp, dnew, NULL);
- if (!host_err) {
- if (EX_ISSYNC(ffhp->fh_export)) {
- err = nfserrno(nfsd_sync_dir(ddir));
-@@ -1702,9 +1704,9 @@ nfsd_unlink(struct svc_rqst *rqstp, stru
- host_err = -EPERM;
- } else
- #endif
-- host_err = vfs_unlink(dirp, rdentry);
-+ host_err = vfs_unlink(dirp, rdentry, NULL);
- } else { /* It's RMDIR */
-- host_err = vfs_rmdir(dirp, rdentry);
-+ host_err = vfs_rmdir(dirp, rdentry, NULL);
- }
-
- dput(rdentry);
-@@ -1815,7 +1817,8 @@ nfsd_permission(struct svc_export *exp,
- */
- if (!(acc & MAY_LOCAL_ACCESS))
- if (acc & (MAY_WRITE | MAY_SATTR | MAY_TRUNC)) {
-- if (EX_RDONLY(exp) || IS_RDONLY(inode))
-+ if (EX_RDONLY(exp) || IS_RDONLY(inode)
-+ || MNT_IS_RDONLY(exp->ex_mnt))
- return nfserr_rofs;
- if (/* (acc & MAY_WRITE) && */ IS_IMMUTABLE(inode))
- return nfserr_perm;
-diff -NurpP --minimal linux-2.6.19.1/fs/ocfs2/dlm/dlmfs.c linux-2.6.19.1-vs2.3.0.6/fs/ocfs2/dlm/dlmfs.c
---- linux-2.6.19.1/fs/ocfs2/dlm/dlmfs.c 2006-11-30 21:19:27 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/ocfs2/dlm/dlmfs.c 2006-12-02 01:14:52 +0100
-@@ -44,6 +44,7 @@
- #include <linux/string.h>
- #include <linux/smp_lock.h>
- #include <linux/backing-dev.h>
-+#include <linux/vs_tag.h>
-
- #include <asm/uaccess.h>
-
-@@ -335,6 +336,7 @@ static struct inode *dlmfs_get_root_inod
- inode->i_mode = mode;
- inode->i_uid = current->fsuid;
- inode->i_gid = current->fsgid;
-+ inode->i_tag = dx_current_fstag(sb);
- inode->i_blocks = 0;
- inode->i_mapping->backing_dev_info = &dlmfs_backing_dev_info;
- inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
-@@ -361,6 +363,7 @@ static struct inode *dlmfs_get_inode(str
- inode->i_mode = mode;
- inode->i_uid = current->fsuid;
- inode->i_gid = current->fsgid;
-+ inode->i_tag = dx_current_fstag(sb);
- inode->i_blocks = 0;
- inode->i_mapping->backing_dev_info = &dlmfs_backing_dev_info;
- inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
-diff -NurpP --minimal linux-2.6.19.1/fs/ocfs2/dlmglue.c linux-2.6.19.1-vs2.3.0.6/fs/ocfs2/dlmglue.c
---- linux-2.6.19.1/fs/ocfs2/dlmglue.c 2006-11-30 21:19:28 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/ocfs2/dlmglue.c 2006-12-02 01:19:57 +0100
-@@ -1326,6 +1326,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_imode = cpu_to_be16(inode->i_mode);
- lvb->lvb_inlink = cpu_to_be16(inode->i_nlink);
- lvb->lvb_iatime_packed =
-@@ -1379,6 +1380,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);
- inode->i_mode = be16_to_cpu(lvb->lvb_imode);
- inode->i_nlink = be16_to_cpu(lvb->lvb_inlink);
- ocfs2_unpack_timespec(&inode->i_atime,
-diff -NurpP --minimal linux-2.6.19.1/fs/ocfs2/dlmglue.h linux-2.6.19.1-vs2.3.0.6/fs/ocfs2/dlmglue.h
---- linux-2.6.19.1/fs/ocfs2/dlmglue.h 2006-11-30 21:19:28 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/ocfs2/dlmglue.h 2006-12-02 01:14:52 +0100
-@@ -34,7 +34,7 @@
- struct ocfs2_meta_lvb {
- __u8 lvb_version;
- __u8 lvb_reserved0;
-- __be16 lvb_reserved1;
-+ __be16 lvb_itag;
- __be32 lvb_iclusters;
- __be32 lvb_iuid;
- __be32 lvb_igid;
-diff -NurpP --minimal linux-2.6.19.1/fs/ocfs2/file.c linux-2.6.19.1-vs2.3.0.6/fs/ocfs2/file.c
---- linux-2.6.19.1/fs/ocfs2/file.c 2006-11-30 21:19:28 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/ocfs2/file.c 2006-11-08 04:57:52 +0100
-@@ -800,13 +800,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");
-
- #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);
- return 0;
-@@ -1220,6 +1222,7 @@ bail:
- struct inode_operations ocfs2_file_iops = {
- .setattr = ocfs2_setattr,
- .getattr = ocfs2_getattr,
-+ .sync_flags = ocfs2_sync_flags,
- };
-
- struct inode_operations ocfs2_special_file_iops = {
-diff -NurpP --minimal linux-2.6.19.1/fs/ocfs2/inode.c linux-2.6.19.1-vs2.3.0.6/fs/ocfs2/inode.c
---- linux-2.6.19.1/fs/ocfs2/inode.c 2006-11-30 21:19:28 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/ocfs2/inode.c 2006-12-02 01:35:31 +0100
-@@ -29,6 +29,7 @@
- #include <linux/highmem.h>
- #include <linux/pagemap.h>
- #include <linux/smp_lock.h>
-+#include <linux/vs_tag.h>
+ return __kuid_val(left) > __kuid_val(right);
+@@ -117,13 +133,21 @@ static inline bool gid_valid(kgid_t gid)
+ return __kgid_val(gid) != (gid_t) -1;
+ }
- #include <asm/byteorder.h>
++static inline bool tag_valid(ktag_t tag)
++{
++ return !tag_eq(tag, INVALID_TAG);
++}
++
+ #ifdef CONFIG_USER_NS
-@@ -43,6 +44,7 @@
- #include "file.h"
- #include "heartbeat.h"
- #include "inode.h"
-+#include "ioctl.h"
- #include "journal.h"
- #include "namei.h"
- #include "suballoc.h"
-@@ -78,6 +80,10 @@ void ocfs2_set_inode_flags(struct inode
+ 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);
- if (flags & OCFS2_IMMUTABLE_FL)
- inode->i_flags |= S_IMMUTABLE;
-+ if (flags & OCFS2_IUNLINK_FL)
-+ inode->i_flags |= S_IUNLINK;
-+ if (flags & OCFS2_BARRIER_FL)
-+ inode->i_flags |= S_BARRIER;
+ 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);
- if (flags & OCFS2_SYNC_FL)
- inode->i_flags |= S_SYNC;
-@@ -89,6 +95,39 @@ void ocfs2_set_inode_flags(struct inode
- inode->i_flags |= S_DIRSYNC;
+@@ -149,6 +173,11 @@ static inline kgid_t make_kgid(struct us
+ return KGIDT_INIT(gid);
}
-+int ocfs2_sync_flags(struct inode *inode)
-+{
-+ unsigned int oldflags, newflags;
-+
-+ oldflags = OCFS2_I(inode)->ip_flags;
-+ newflags = oldflags & ~(OCFS2_APPEND_FL |
-+ OCFS2_IMMUTABLE_FL | OCFS2_IUNLINK_FL |
-+ OCFS2_BARRIER_FL | OCFS2_NOATIME_FL |
-+ OCFS2_SYNC_FL | OCFS2_DIRSYNC_FL);
-+
-+ if (IS_APPEND(inode))
-+ newflags |= OCFS2_APPEND_FL;
-+ if (IS_IMMUTABLE(inode))
-+ newflags |= OCFS2_IMMUTABLE_FL;
-+ if (IS_IUNLINK(inode))
-+ newflags |= OCFS2_IUNLINK_FL;
-+ if (IS_BARRIER(inode))
-+ newflags |= OCFS2_BARRIER_FL;
-+
-+ /* we do not want to copy superblock flags */
-+ if (inode->i_flags & S_NOATIME)
-+ newflags |= OCFS2_NOATIME_FL;
-+ if (inode->i_flags & S_SYNC)
-+ newflags |= OCFS2_SYNC_FL;
-+ if (inode->i_flags & S_DIRSYNC)
-+ newflags |= OCFS2_DIRSYNC_FL;
-+
-+ if (oldflags ^ newflags)
-+ return ocfs2_set_inode_attr(inode,
-+ newflags, OCFS2_FL_MASK);
-+ return 0;
++static inline ktag_t make_ktag(struct user_namespace *from, vtag_t tag)
++{
++ return KTAGT_INIT(tag);
+}
+
- struct inode *ocfs2_ilookup_for_vote(struct ocfs2_super *osb,
- u64 blkno,
- int delete_vote)
-@@ -236,6 +275,8 @@ int ocfs2_populate_inode(struct inode *i
- struct super_block *sb;
- struct ocfs2_super *osb;
- int status = -EINVAL;
-+ uid_t uid;
-+ gid_t gid;
-
- mlog_entry("(0x%p, size:%llu)\n", inode,
- (unsigned long long)fe->i_size);
-@@ -267,8 +308,12 @@ int ocfs2_populate_inode(struct inode *i
- 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);
-+ 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);
+ static inline uid_t from_kuid(struct user_namespace *to, kuid_t kuid)
+ {
+ return __kuid_val(kuid);
+@@ -159,6 +188,11 @@ static inline gid_t from_kgid(struct use
+ return __kgid_val(kgid);
+ }
- /* Fast symlinks will have i_size but no allocated clusters. */
- if (S_ISLNK(inode->i_mode) && !fe->i_clusters)
-@@ -1228,8 +1273,11 @@ int ocfs2_mark_inode_dirty(struct ocfs2_
-
- fe->i_size = cpu_to_le64(i_size_read(inode));
- fe->i_links_count = cpu_to_le16(inode->i_nlink);
-- fe->i_uid = cpu_to_le32(inode->i_uid);
-- fe->i_gid = cpu_to_le32(inode->i_gid);
-+ fe->i_uid = cpu_to_le32(TAGINO_UID(DX_TAG(inode),
-+ inode->i_uid, inode->i_tag));
-+ fe->i_gid = cpu_to_le32(TAGINO_GID(DX_TAG(inode),
-+ inode->i_gid, inode->i_tag));
-+ /* i_tag = = cpu_to_le16(inode->i_tag); */
- fe->i_mode = cpu_to_le16(inode->i_mode);
- fe->i_atime = cpu_to_le64(inode->i_atime.tv_sec);
- fe->i_atime_nsec = cpu_to_le32(inode->i_atime.tv_nsec);
-@@ -1257,15 +1305,24 @@ leave:
- void ocfs2_refresh_inode(struct inode *inode,
- struct ocfs2_dinode *fe)
++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;
-+ gid_t gid;
+ uid_t uid = from_kuid(to, kuid);
+diff -urNp -x '*.orig' linux-4.9/include/linux/vroot.h linux-4.9/include/linux/vroot.h
+--- linux-4.9/include/linux/vroot.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vroot.h 2021-02-24 15:47:45.091076220 +0100
+@@ -0,0 +1,51 @@
+
- spin_lock(&OCFS2_I(inode)->ip_lock);
-
- OCFS2_I(inode)->ip_clusters = le32_to_cpu(fe->i_clusters);
- OCFS2_I(inode)->ip_attr = le32_to_cpu(fe->i_attr);
-+ /* OCFS2_I(inode)->ip_flags &= ~OCFS2_FL_MASK;
-+ OCFS2_I(inode)->ip_flags |= le32_to_cpu(fe->i_flags) & OCFS2_FL_MASK; */
- ocfs2_set_inode_flags(inode);
- i_size_write(inode, le64_to_cpu(fe->i_size));
- inode->i_nlink = le16_to_cpu(fe->i_links_count);
-- inode->i_uid = le32_to_cpu(fe->i_uid);
-- inode->i_gid = 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);
- inode->i_mode = le16_to_cpu(fe->i_mode);
- if (S_ISLNK(inode->i_mode) && le32_to_cpu(fe->i_clusters) == 0)
- inode->i_blocks = 0;
-diff -NurpP --minimal linux-2.6.19.1/fs/ocfs2/inode.h linux-2.6.19.1-vs2.3.0.6/fs/ocfs2/inode.h
---- linux-2.6.19.1/fs/ocfs2/inode.h 2006-11-30 21:19:28 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/ocfs2/inode.h 2006-11-08 04:57:46 +0100
-@@ -150,5 +150,6 @@ int ocfs2_aio_read(struct file *file, st
- int ocfs2_aio_write(struct file *file, struct kiocb *req, struct iocb *iocb);
-
- void ocfs2_set_inode_flags(struct inode *inode);
-+int ocfs2_sync_flags(struct inode *inode);
-
- #endif /* OCFS2_INODE_H */
-diff -NurpP --minimal linux-2.6.19.1/fs/ocfs2/ioctl.c linux-2.6.19.1-vs2.3.0.6/fs/ocfs2/ioctl.c
---- linux-2.6.19.1/fs/ocfs2/ioctl.c 2006-11-30 21:19:28 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/ocfs2/ioctl.c 2006-12-02 01:28:36 +0100
-@@ -38,7 +38,7 @@ static int ocfs2_get_inode_attr(struct i
- return status;
- }
-
--static int ocfs2_set_inode_attr(struct inode *inode, unsigned flags,
-+int ocfs2_set_inode_attr(struct inode *inode, unsigned flags,
- unsigned mask)
- {
- struct ocfs2_inode_info *ocfs2_inode = OCFS2_I(inode);
-diff -NurpP --minimal linux-2.6.19.1/fs/ocfs2/ioctl.h linux-2.6.19.1-vs2.3.0.6/fs/ocfs2/ioctl.h
---- linux-2.6.19.1/fs/ocfs2/ioctl.h 2006-11-30 21:19:28 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/ocfs2/ioctl.h 2006-12-02 01:29:36 +0100
-@@ -10,6 +10,9 @@
- #ifndef OCFS2_IOCTL_H
- #define OCFS2_IOCTL_H
-
-+int ocfs2_set_inode_attr(struct inode *inode, unsigned flags,
-+ unsigned mask);
++/*
++ * include/linux/vroot.h
++ *
++ * written by Herbert P?tzl, 9/11/2002
++ * ported to 2.6 by Herbert P?tzl, 30/12/2004
++ *
++ * Copyright (C) 2002-2007 by Herbert P?tzl.
++ * Redistribution of this file is permitted under the
++ * GNU General Public License.
++ */
+
- int ocfs2_ioctl(struct inode * inode, struct file * filp,
- unsigned int cmd, unsigned long arg);
-
-diff -NurpP --minimal linux-2.6.19.1/fs/ocfs2/namei.c linux-2.6.19.1-vs2.3.0.6/fs/ocfs2/namei.c
---- linux-2.6.19.1/fs/ocfs2/namei.c 2006-11-30 21:19:28 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/ocfs2/namei.c 2006-11-08 04:57:52 +0100
-@@ -40,6 +40,7 @@
- #include <linux/types.h>
- #include <linux/slab.h>
- #include <linux/highmem.h>
-+#include <linux/vs_tag.h>
-
- #define MLOG_MASK_PREFIX ML_NAMEI
- #include <cluster/masklog.h>
-@@ -497,6 +498,9 @@ static int ocfs2_mknod_locked(struct ocf
- u64 fe_blkno = 0;
- u16 suballoc_bit;
- struct inode *inode = NULL;
-+ uid_t uid;
-+ gid_t gid;
-+ tag_t tag;
-
- mlog_entry("(0x%p, 0x%p, %d, %lu, '%.*s')\n", dir, dentry, mode,
- (unsigned long)dev, dentry->d_name.len,
-@@ -556,13 +560,19 @@ static int ocfs2_mknod_locked(struct ocf
- fe->i_blkno = cpu_to_le64(fe_blkno);
- fe->i_suballoc_bit = cpu_to_le16(suballoc_bit);
- fe->i_suballoc_slot = cpu_to_le16(osb->slot_num);
-- fe->i_uid = cpu_to_le32(current->fsuid);
-+
-+ tag = dx_current_fstag(osb->sb);
-+ uid = current->fsuid;
- if (dir->i_mode & S_ISGID) {
-- fe->i_gid = cpu_to_le32(dir->i_gid);
-+ gid = dir->i_gid;
- if (S_ISDIR(mode))
- mode |= S_ISGID;
- } else
-- fe->i_gid = cpu_to_le32(current->fsgid);
-+ gid = current->fsgid;
-+
-+ fe->i_uid = cpu_to_le32(TAGINO_UID(DX_TAG(inode), uid, tag));
-+ fe->i_gid = cpu_to_le32(TAGINO_GID(DX_TAG(inode), gid, tag));
-+ inode->i_tag = tag;
- fe->i_mode = cpu_to_le16(mode);
- if (S_ISCHR(mode) || S_ISBLK(mode))
- fe->id1.dev1.i_rdev = cpu_to_le64(huge_encode_dev(dev));
-@@ -2300,4 +2310,5 @@ struct inode_operations ocfs2_dir_iops =
- .rename = ocfs2_rename,
- .setattr = ocfs2_setattr,
- .getattr = ocfs2_getattr,
-+ .sync_flags = ocfs2_sync_flags,
- };
-diff -NurpP --minimal linux-2.6.19.1/fs/ocfs2/ocfs2.h linux-2.6.19.1-vs2.3.0.6/fs/ocfs2/ocfs2.h
---- linux-2.6.19.1/fs/ocfs2/ocfs2.h 2006-09-20 16:58:35 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/fs/ocfs2/ocfs2.h 2006-11-08 04:57:52 +0100
-@@ -174,6 +174,7 @@ enum ocfs2_mount_options
- OCFS2_MOUNT_NOINTR = 1 << 2, /* Don't catch signals */
- OCFS2_MOUNT_ERRORS_PANIC = 1 << 3, /* Panic on errors */
- OCFS2_MOUNT_DATA_WRITEBACK = 1 << 4, /* No data ordering */
-+ OCFS2_MOUNT_TAGGED = 1 << 8, /* use tagging */
- };
-
- #define OCFS2_OSB_SOFT_RO 0x0001
-diff -NurpP --minimal linux-2.6.19.1/fs/ocfs2/ocfs2_fs.h linux-2.6.19.1-vs2.3.0.6/fs/ocfs2/ocfs2_fs.h
---- linux-2.6.19.1/fs/ocfs2/ocfs2_fs.h 2006-11-30 21:19:28 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/ocfs2/ocfs2_fs.h 2006-12-02 01:33:58 +0100
-@@ -125,8 +125,12 @@
- #define OCFS2_NOATIME_FL (0x00000080) /* do not update atime */
- #define OCFS2_DIRSYNC_FL (0x00010000) /* dirsync behaviour (directories only) */
-
-+#define OCFS2_BARRIER_FL (0x04000000) /* Barrier for chroot() */
-+#define OCFS2_IUNLINK_FL (0x08000000) /* Immutable unlink */
++#ifndef _LINUX_VROOT_H
++#define _LINUX_VROOT_H
+
- #define OCFS2_FL_VISIBLE (0x000100FF) /* User visible flags */
- #define OCFS2_FL_MODIFIABLE (0x000100FF) /* User modifiable flags */
-+#define OCFS2_FL_MASK (0x0F0100FF)
-
- /*
- * ioctl commands
-diff -NurpP --minimal linux-2.6.19.1/fs/ocfs2/super.c linux-2.6.19.1-vs2.3.0.6/fs/ocfs2/super.c
---- linux-2.6.19.1/fs/ocfs2/super.c 2006-11-30 21:19:28 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/ocfs2/super.c 2006-11-08 04:57:52 +0100
-@@ -141,6 +141,7 @@ enum {
- Opt_hb_local,
- Opt_data_ordered,
- Opt_data_writeback,
-+ Opt_tag, Opt_notag, Opt_tagid,
- Opt_err,
- };
-
-@@ -154,6 +155,10 @@ static match_table_t tokens = {
- {Opt_hb_local, OCFS2_HB_LOCAL},
- {Opt_data_ordered, "data=ordered"},
- {Opt_data_writeback, "data=writeback"},
-+ {Opt_tag, "tag"},
-+ {Opt_tag, "tagxid"},
-+ {Opt_notag, "notag"},
-+ {Opt_tagid, "tagid=%u"},
- {Opt_err, NULL}
- };
-
-@@ -362,6 +367,14 @@ static int ocfs2_remount(struct super_bl
- goto out;
- }
-
-+ printk("ocfs2_remount: %lx,%lx\n", osb->s_mount_opt, sb->s_flags);
-+ if ((parsed_options & OCFS2_MOUNT_TAGGED) &&
-+ !(sb->s_flags & MS_TAGGED)) {
-+ ret = -EINVAL;
-+ mlog(ML_ERROR, "Cannot change tagging on remount\n");
-+ goto out;
-+ }
+
- if ((osb->s_mount_opt & OCFS2_MOUNT_HB_LOCAL) !=
- (parsed_options & OCFS2_MOUNT_HB_LOCAL)) {
- ret = -EINVAL;
-@@ -635,6 +648,9 @@ static int ocfs2_fill_super(struct super
-
- ocfs2_complete_mount_recovery(osb);
-
-+ if (osb->s_mount_opt & OCFS2_MOUNT_TAGGED)
-+ sb->s_flags |= MS_TAGGED;
++#ifdef __KERNEL__
+
- printk(KERN_INFO "ocfs2: Mounting device (%s) on (node %d, slot %d) "
- "with %s data mode.\n",
- osb->dev_str, osb->node_num, osb->slot_num,
-@@ -747,6 +763,20 @@ static int ocfs2_parse_options(struct su
- case Opt_data_writeback:
- *mount_opt |= OCFS2_MOUNT_DATA_WRITEBACK;
- break;
-+#ifndef CONFIG_TAGGING_NONE
-+ case Opt_tag:
-+ *mount_opt |= OCFS2_MOUNT_TAGGED;
-+ break;
-+ case Opt_notag:
-+ *mount_opt &= ~OCFS2_MOUNT_TAGGED;
-+ break;
-+#endif
-+#ifdef CONFIG_PROPAGATE
-+ case Opt_tagid:
-+ /* use args[0] */
-+ *mount_opt |= OCFS2_MOUNT_TAGGED;
-+ break;
-+#endif
- default:
- mlog(ML_ERROR,
- "Unrecognized mount option \"%s\" "
-diff -NurpP --minimal linux-2.6.19.1/fs/open.c linux-2.6.19.1-vs2.3.0.6/fs/open.c
---- linux-2.6.19.1/fs/open.c 2006-11-30 21:19:28 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/open.c 2006-11-30 18:53:18 +0100
-@@ -27,22 +27,31 @@
- #include <linux/syscalls.h>
- #include <linux/rcupdate.h>
- #include <linux/audit.h>
-+#include <linux/vs_base.h>
-+#include <linux/vs_limit.h>
-+#include <linux/vs_dlimit.h>
-+#include <linux/vs_tag.h>
-+#include <linux/vs_cowbl.h>
-
- int vfs_statfs(struct dentry *dentry, struct kstatfs *buf)
- {
- int retval = -ENODEV;
-
- if (dentry) {
-+ struct super_block *sb = dentry->d_sb;
-+
- retval = -ENOSYS;
-- if (dentry->d_sb->s_op->statfs) {
-+ if (sb->s_op->statfs) {
- memset(buf, 0, sizeof(*buf));
- retval = security_sb_statfs(dentry);
- if (retval)
- return retval;
-- retval = dentry->d_sb->s_op->statfs(dentry, buf);
-+ retval = 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(sb, buf);
- }
- return retval;
- }
-@@ -246,7 +255,7 @@ static long do_sys_truncate(const char _
- goto dput_and_out;
-
- error = -EROFS;
-- if (IS_RDONLY(inode))
-+ if (IS_RDONLY(inode) || MNT_IS_RDONLY(nd.mnt))
- goto dput_and_out;
-
- error = -EPERM;
-@@ -395,7 +404,7 @@ asmlinkage long sys_faccessat(int dfd, c
- special_file(nd.dentry->d_inode->i_mode))
- goto out_path_release;
-
-- if(IS_RDONLY(nd.dentry->d_inode))
-+ if(IS_RDONLY(nd.dentry->d_inode) || MNT_IS_RDONLY(nd.mnt))
- res = -EROFS;
-
- out_path_release:
-@@ -509,7 +518,7 @@ asmlinkage long sys_fchmod(unsigned int
- audit_inode(NULL, inode);
-
- err = -EROFS;
-- if (IS_RDONLY(inode))
-+ if (IS_RDONLY(inode) || MNT_IS_RDONLY(file->f_vfsmnt))
- goto out_putf;
- err = -EPERM;
- if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
-@@ -539,11 +548,11 @@ asmlinkage long sys_fchmodat(int dfd, co
- error = __user_walk_fd(dfd, filename, LOOKUP_FOLLOW, &nd);
- if (error)
- goto out;
-- inode = nd.dentry->d_inode;
-
-- error = -EROFS;
-- if (IS_RDONLY(inode))
-+ error = cow_check_and_break(&nd);
-+ if (error)
- goto dput_and_out;
-+ inode = nd.dentry->d_inode;
-
- error = -EPERM;
- if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
-@@ -568,7 +577,8 @@ asmlinkage long sys_chmod(const char __u
- return sys_fchmodat(AT_FDCWD, filename, mode);
- }
-
--static int chown_common(struct dentry * dentry, uid_t user, gid_t group)
-+static int chown_common(struct dentry *dentry, struct vfsmount *mnt,
-+ uid_t user, gid_t group)
- {
- struct inode * inode;
- int error;
-@@ -580,7 +590,7 @@ static int chown_common(struct dentry *
- goto out;
- }
- error = -EROFS;
-- if (IS_RDONLY(inode))
-+ if (IS_RDONLY(inode) || MNT_IS_RDONLY(mnt))
- goto out;
- error = -EPERM;
- if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
-@@ -588,11 +598,11 @@ static int chown_common(struct dentry *
- newattrs.ia_valid = ATTR_CTIME;
- if (user != (uid_t) -1) {
- newattrs.ia_valid |= ATTR_UID;
-- newattrs.ia_uid = user;
-+ newattrs.ia_uid = dx_map_uid(user);
- }
- if (group != (gid_t) -1) {
- newattrs.ia_valid |= ATTR_GID;
-- newattrs.ia_gid = group;
-+ newattrs.ia_gid = dx_map_gid(group);
- }
- if (!S_ISDIR(inode->i_mode))
- newattrs.ia_valid |= ATTR_KILL_SUID|ATTR_KILL_SGID;
-@@ -611,7 +621,11 @@ asmlinkage long sys_chown(const char __u
- error = user_path_walk(filename, &nd);
- if (error)
- goto out;
-- error = chown_common(nd.dentry, user, group);
-+#ifdef CONFIG_VSERVER_COWBL
-+ error = cow_check_and_break(&nd);
-+ if (!error)
-+#endif
-+ error = chown_common(nd.dentry, nd.mnt, user, group);
- path_release(&nd);
- out:
- return error;
-@@ -631,7 +645,11 @@ asmlinkage long sys_fchownat(int dfd, co
- error = __user_walk_fd(dfd, filename, follow, &nd);
- if (error)
- goto out;
-- error = chown_common(nd.dentry, user, group);
-+#ifdef CONFIG_VSERVER_COWBL
-+ error = cow_check_and_break(&nd);
-+ if (!error)
-+#endif
-+ error = chown_common(nd.dentry, nd.mnt, user, group);
- path_release(&nd);
- out:
- return error;
-@@ -645,7 +663,11 @@ asmlinkage long sys_lchown(const char __
- error = user_path_walk_link(filename, &nd);
- if (error)
- goto out;
-- error = chown_common(nd.dentry, user, group);
-+#ifdef CONFIG_VSERVER_COWBL
-+ error = cow_check_and_break(&nd);
-+ if (!error)
-+#endif
-+ error = chown_common(nd.dentry, nd.mnt, user, group);
- path_release(&nd);
- out:
- return error;
-@@ -664,7 +686,7 @@ asmlinkage long sys_fchown(unsigned int
-
- dentry = file->f_dentry;
- audit_inode(NULL, dentry->d_inode);
-- error = chown_common(dentry, user, group);
-+ error = chown_common(dentry, file->f_vfsmnt, user, group);
- fput(file);
- out:
- return error;
-@@ -892,6 +914,7 @@ repeat:
- FD_SET(fd, fdt->open_fds);
- FD_CLR(fd, fdt->close_on_exec);
- files->next_fd = fd + 1;
-+ vx_openfd_inc(fd);
- #if 1
- /* Sanity check */
- if (fdt->fd[fd] != NULL) {
-@@ -914,6 +937,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 fastcall put_unused_fd(unsigned int fd)
-diff -NurpP --minimal linux-2.6.19.1/fs/proc/array.c linux-2.6.19.1-vs2.3.0.6/fs/proc/array.c
---- linux-2.6.19.1/fs/proc/array.c 2006-11-30 21:19:28 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/proc/array.c 2006-12-17 04:32:56 +0100
-@@ -75,6 +75,8 @@
- #include <linux/cpuset.h>
- #include <linux/rcupdate.h>
- #include <linux/delayacct.h>
-+#include <linux/vs_context.h>
-+#include <linux/vs_network.h>
-
- #include <asm/uaccess.h>
- #include <asm/pgtable.h>
-@@ -134,8 +136,9 @@ static const char *task_state_array[] =
- "D (disk sleep)", /* 2 */
- "T (stopped)", /* 4 */
- "T (tracing stop)", /* 8 */
-- "Z (zombie)", /* 16 */
-- "X (dead)" /* 32 */
-+ "H (on hold)" /* 16 */
-+ "Z (zombie)", /* 32 */
-+ "X (dead)", /* 64 */
- };
-
- static inline const char * get_task_state(struct task_struct *tsk)
-@@ -144,7 +147,8 @@ static inline const char * get_task_stat
- TASK_INTERRUPTIBLE |
- TASK_UNINTERRUPTIBLE |
- TASK_STOPPED |
-- TASK_TRACED)) |
-+ TASK_TRACED |
-+ TASK_ONHOLD)) |
- (tsk->exit_state & (EXIT_ZOMBIE |
- EXIT_DEAD));
- const char **p = &task_state_array[0];
-@@ -161,8 +165,16 @@ static inline char * task_state(struct t
- struct group_info *group_info;
- int g;
- struct fdtable *fdt = NULL;
-+ pid_t pid, ptgid, tppid, tgid;
-
- rcu_read_lock();
-+ tgid = vx_map_tgid(p->tgid);
-+ pid = vx_map_pid(p->pid);
-+ ptgid = vx_map_pid(pid_alive(p) ?
-+ rcu_dereference(p->real_parent)->tgid : 0);
-+ tppid = vx_map_pid(pid_alive(p) && p->ptrace ?
-+ rcu_dereference(p->parent)->pid : 0);
-+
- buffer += sprintf(buffer,
- "State:\t%s\n"
- "SleepAVG:\t%lu%%\n"
-@@ -174,9 +186,7 @@ static inline char * task_state(struct t
- "Gid:\t%d\t%d\t%d\t%d\n",
- get_task_state(p),
- (p->sleep_avg/1024)*100/(1020000000/1024),
-- p->tgid, p->pid,
-- pid_alive(p) ? rcu_dereference(p->real_parent)->tgid : 0,
-- pid_alive(p) && p->ptrace ? rcu_dereference(p->parent)->pid : 0,
-+ tgid, pid, (pid > 1) ? ptgid : 0, tppid,
- p->uid, p->euid, p->suid, p->fsuid,
- p->gid, p->egid, p->sgid, p->fsgid);
-
-@@ -283,12 +293,15 @@ static inline char * task_sig(struct tas
-
- static inline char *task_cap(struct task_struct *p, char *buffer)
- {
-- return buffer + sprintf(buffer, "CapInh:\t%016x\n"
-- "CapPrm:\t%016x\n"
-- "CapEff:\t%016x\n",
-- cap_t(p->cap_inheritable),
-- cap_t(p->cap_permitted),
-- cap_t(p->cap_effective));
-+ struct vx_info *vxi = p->vx_info;
++/* Possible states of device */
++enum {
++ Vr_unbound,
++ Vr_bound,
++};
+
-+ return buffer + sprintf(buffer,
-+ "CapInh:\t%016x\n"
-+ "CapPrm:\t%016x\n"
-+ "CapEff:\t%016x\n",
-+ (unsigned)vx_info_mbcap(vxi, p->cap_inheritable),
-+ (unsigned)vx_info_mbcap(vxi, p->cap_permitted),
-+ (unsigned)vx_info_mbcap(vxi, p->cap_effective));
- }
-
- int proc_pid_status(struct task_struct *task, char * buffer)
-@@ -306,6 +319,12 @@ int proc_pid_status(struct task_struct *
- buffer = task_sig(task, buffer);
- buffer = task_cap(task, buffer);
- buffer = cpuset_task_status_allowed(task, buffer);
++struct vroot_device {
++ int vr_number;
++ int vr_refcnt;
+
-+ if (task_vx_flags(task, VXF_HIDE_VINFO, 0))
-+ goto skip;
-+ buffer += sprintf (buffer,"VxID: %d\n", vx_task_xid(task));
-+ buffer += sprintf (buffer,"NxID: %d\n", nx_task_nid(task));
-+skip:
- #if defined(CONFIG_S390)
- buffer = task_show_regs(task, buffer);
- #endif
-@@ -320,7 +339,7 @@ static int do_task_stat(struct task_stru
- sigset_t sigign, sigcatch;
- char state;
- int res;
-- pid_t ppid = 0, pgid = -1, sid = -1;
-+ pid_t pid = 0, ppid = 0, pgid = -1, sid = -1;
- int num_threads = 0;
- struct mm_struct *mm;
- unsigned long long start_time;
-@@ -389,8 +408,10 @@ static int do_task_stat(struct task_stru
- }
-
- sid = sig->session;
-- pgid = process_group(task);
-- ppid = rcu_dereference(task->real_parent)->tgid;
-+ pid = vx_info_map_pid(task->vx_info, task->pid);
-+ pgid = vx_info_map_pid(task->vx_info, process_group(task));
-+ ppid = (pid > 1) ? vx_info_map_tgid(task->vx_info,
-+ rcu_dereference(task->real_parent)->tgid) : 0;
-
- unlock_task_sighand(task, &flags);
- }
-@@ -418,10 +439,21 @@ static int do_task_stat(struct task_stru
- /* convert nsec -> ticks */
- start_time = nsec_to_clock_t(start_time);
-
-+ /* fixup start time for virt uptime */
-+ if (vx_flags(VXF_VIRT_UPTIME, 0)) {
-+ unsigned long long bias =
-+ current->vx_info->cvirt.bias_clock;
++ struct semaphore vr_ctl_mutex;
++ struct block_device *vr_device;
++ int vr_state;
++};
+
-+ if (start_time > bias)
-+ start_time -= bias;
-+ else
-+ start_time = 0;
-+ }
+
- res = sprintf(buffer,"%d (%s) %c %d %d %d %d %d %lu %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 %lu %lu %llu\n",
-- task->pid,
-+ pid,
- tcomm,
- state,
- ppid,
-diff -NurpP --minimal linux-2.6.19.1/fs/proc/base.c linux-2.6.19.1-vs2.3.0.6/fs/proc/base.c
---- linux-2.6.19.1/fs/proc/base.c 2006-11-30 21:19:28 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/proc/base.c 2006-12-04 06:53:21 +0100
-@@ -73,6 +73,9 @@
- #include <linux/poll.h>
- #include <linux/nsproxy.h>
- #include <linux/oom.h>
-+#include <linux/vs_context.h>
-+#include <linux/vs_network.h>
++typedef struct block_device *(vroot_grb_func)(struct block_device *);
+
- #include "internal.h"
-
- /* NOTE:
-@@ -971,6 +974,8 @@ static struct inode *proc_pid_make_inode
- inode->i_uid = task->euid;
- inode->i_gid = task->egid;
- }
-+ /* procfs is xid tagged */
-+ inode->i_tag = (tag_t)vx_task_xid(task);
- security_task_to_inode(task, inode);
-
- out:
-@@ -1023,7 +1028,13 @@ static int pid_revalidate(struct dentry
- {
- struct inode *inode = dentry->d_inode;
- struct task_struct *task = get_proc_task(inode);
-+ int ret = 0;
++extern int register_vroot_grb(vroot_grb_func *);
++extern int unregister_vroot_grb(vroot_grb_func *);
+
- if (task) {
-+ if (!vx_proc_task_visible(task))
-+ goto out_put;
++#endif /* __KERNEL__ */
+
-+ ret = 1;
- if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
- task_dumpable(task)) {
- inode->i_uid = task->euid;
-@@ -1034,11 +1045,11 @@ static int pid_revalidate(struct dentry
- }
- inode->i_mode &= ~(S_ISUID | S_ISGID);
- security_task_to_inode(task, inode);
-+ out_put:
- put_task_struct(task);
-- return 1;
- }
- d_drop(dentry);
-- return 0;
-+ return ret;
- }
-
- static int pid_delete_dentry(struct dentry * dentry)
-@@ -1404,6 +1415,13 @@ static struct dentry *proc_pident_lookup
- if (!task)
- goto out_no_task;
-
-+ /* FIXME: maybe we can come up with a generic approach? */
-+ if (task_vx_flags(task, VXF_HIDE_VINFO, 0) &&
-+ (dentry->d_name.len == 5) &&
-+ (!memcmp(dentry->d_name.name, "vinfo", 5) ||
-+ !memcmp(dentry->d_name.name, "ninfo", 5)))
-+ goto out;
++#define MAX_VROOT_DEFAULT 8
+
- /*
- * Yes, it does not scale. And it should not. Don't add
- * new entries into /proc/<tgid>/ without very good reasons.
-@@ -1608,14 +1626,14 @@ static int proc_self_readlink(struct den
- int buflen)
- {
- char tmp[PROC_NUMBUF];
-- sprintf(tmp, "%d", current->tgid);
-+ sprintf(tmp, "%d", vx_map_tgid(current->tgid));
- return vfs_readlink(dentry,buffer,buflen,tmp);
- }
-
- static void *proc_self_follow_link(struct dentry *dentry, struct nameidata *nd)
- {
- char tmp[PROC_NUMBUF];
-- sprintf(tmp, "%d", current->tgid);
-+ sprintf(tmp, "%d", vx_map_tgid(current->tgid));
- return ERR_PTR(vfs_follow_link(nd,tmp));
- }
-
-@@ -1709,7 +1727,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);
- struct pid_entry *p, *last;
-
- error = ERR_PTR(-ENOENT);
-@@ -1749,6 +1767,9 @@ static int proc_base_fill_cache(struct f
- static struct file_operations proc_task_operations;
- static 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 *);
-+
- static struct pid_entry tgid_base_stuff[] = {
- DIR("task", S_IRUGO|S_IXUGO, task),
- DIR("fd", S_IRUSR|S_IXUSR, fd),
-@@ -1786,6 +1807,8 @@ static struct pid_entry tgid_base_stuff[
- #ifdef CONFIG_CPUSETS
- REG("cpuset", S_IRUGO, cpuset),
- #endif
-+ INF("vinfo", S_IRUGO, pid_vx_info),
-+ INF("ninfo", S_IRUGO, pid_nx_info),
- INF("oom_score", S_IRUGO, oom_score),
- REG("oom_adj", S_IRUGO|S_IWUSR, oom_adjust),
- #ifdef CONFIG_AUDITSYSCALL
-@@ -1927,7 +1950,7 @@ struct dentry *proc_pid_lookup(struct in
- goto out;
-
- rcu_read_lock();
-- task = find_task_by_pid(tgid);
-+ task = vx_find_proc_task_by_pid(tgid);
- if (task)
- get_task_struct(task);
- rcu_read_unlock();
-@@ -1991,7 +2014,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_dentry->d_inode);
-+ struct task_struct *reaper = get_proc_task_real(filp->f_dentry->d_inode);
- struct task_struct *task;
- int tgid;
-
-@@ -2010,7 +2033,10 @@ int proc_pid_readdir(struct file * filp,
- put_task_struct(task), task = next_tgid(tgid + 1)) {
- tgid = task->pid;
- filp->f_pos = tgid + TGID_OFFSET;
-- if (proc_pid_fill_cache(filp, dirent, filldir, task, tgid) < 0) {
-+ if (!vx_proc_task_visible(task))
-+ continue;
-+ if (proc_pid_fill_cache(filp, dirent, filldir, task,
-+ vx_map_tgid(tgid)) < 0) {
- put_task_struct(task);
- goto out;
- }
-@@ -2131,9 +2157,11 @@ static struct dentry *proc_task_lookup(s
- tid = name_to_int(dentry);
- if (tid == ~0U)
- goto out;
-+ if (vx_current_initpid(tid))
-+ goto out;
-
- rcu_read_lock();
-- task = find_task_by_pid(tid);
-+ task = vx_find_proc_task_by_pid(tid);
- if (task)
- get_task_struct(task);
- rcu_read_unlock();
-@@ -2268,7 +2296,10 @@ static int proc_task_readdir(struct file
- for (task = first_tid(leader, tid, pos - 2);
- task;
- task = next_tid(task), pos++) {
-- tid = task->pid;
-+ tid = vx_map_pid(task->pid);
-+ /* FIXME: could go away now! */
-+ if (!vx_proc_task_visible(task))
-+ continue;
- if (proc_task_fill_cache(filp, dirent, filldir, task, tid) < 0) {
- /* returning this tgid failed, save it as the first
- * pid for the next readir call */
-diff -NurpP --minimal linux-2.6.19.1/fs/proc/generic.c linux-2.6.19.1-vs2.3.0.6/fs/proc/generic.c
---- linux-2.6.19.1/fs/proc/generic.c 2006-06-18 04:54:45 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/fs/proc/generic.c 2006-11-08 04:57:41 +0100
-@@ -20,6 +20,7 @@
- #include <linux/namei.h>
- #include <linux/bitops.h>
- #include <linux/spinlock.h>
-+#include <linux/vserver/inode.h>
- #include <asm/uaccess.h>
-
- #include "internal.h"
-@@ -395,12 +396,16 @@ struct dentry *proc_lookup(struct inode
- for (de = de->subdir; de ; de = de->next) {
- if (de->namelen != dentry->d_name.len)
- continue;
-+ if (!vx_hide_check(0, de->vx_flags))
-+ continue;
- if (!memcmp(dentry->d_name.name, de->name, de->namelen)) {
- unsigned int ino = de->low_ino;
-
- spin_unlock(&proc_subdir_lock);
- error = -EINVAL;
- inode = proc_get_inode(dir->i_sb, ino, de);
-+ /* generic proc entries belong to the host */
-+ inode->i_tag = 0;
- spin_lock(&proc_subdir_lock);
- break;
- }
-@@ -476,12 +481,15 @@ int proc_readdir(struct file * filp,
- }
-
- do {
-+ if (!vx_hide_check(0, de->vx_flags))
-+ goto skip;
- /* filldir passes info to user space */
- spin_unlock(&proc_subdir_lock);
- if (filldir(dirent, de->name, de->namelen, filp->f_pos,
- de->low_ino, de->mode >> 12) < 0)
- goto out;
- spin_lock(&proc_subdir_lock);
-+ skip:
- filp->f_pos++;
- de = de->next;
- } while (de);
-@@ -604,6 +612,7 @@ static struct proc_dir_entry *proc_creat
- ent->namelen = len;
- ent->mode = mode;
- ent->nlink = nlink;
-+ ent->vx_flags = IATTR_PROC_DEFAULT;
- out:
- return ent;
- }
-@@ -624,7 +633,8 @@ struct proc_dir_entry *proc_symlink(cons
- kfree(ent->data);
- kfree(ent);
- ent = NULL;
-- }
-+ } else
-+ ent->vx_flags = IATTR_PROC_SYMLINK;
- } else {
- kfree(ent);
- ent = NULL;
-diff -NurpP --minimal linux-2.6.19.1/fs/proc/inode.c linux-2.6.19.1-vs2.3.0.6/fs/proc/inode.c
---- linux-2.6.19.1/fs/proc/inode.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/fs/proc/inode.c 2006-11-08 04:57:41 +0100
-@@ -168,6 +168,8 @@ struct inode *proc_get_inode(struct supe
- inode->i_uid = de->uid;
- inode->i_gid = de->gid;
- }
-+ if (de->vx_flags)
-+ PROC_I(inode)->vx_flags = de->vx_flags;
- if (de->size)
- inode->i_size = de->size;
- if (de->nlink)
-diff -NurpP --minimal linux-2.6.19.1/fs/proc/internal.h linux-2.6.19.1-vs2.3.0.6/fs/proc/internal.h
---- linux-2.6.19.1/fs/proc/internal.h 2006-11-30 21:19:28 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/proc/internal.h 2006-12-04 02:53:55 +0100
-@@ -10,6 +10,7 @@
- */
-
- #include <linux/proc_fs.h>
-+#include <linux/vs_pid.h>
-
- struct vmalloc_info {
- unsigned long used;
-@@ -56,11 +57,16 @@ static inline struct pid *proc_pid(struc
- return PROC_I(inode)->pid;
- }
-
--static inline struct task_struct *get_proc_task(struct inode *inode)
-+static inline struct task_struct *get_proc_task_real(struct inode *inode)
- {
- return get_pid_task(proc_pid(inode), PIDTYPE_PID);
- }
-
-+static inline struct task_struct *get_proc_task(struct inode *inode)
++/*
++ * IOCTL commands --- we will commandeer 0x56 ('V')
++ */
++
++#define VROOT_SET_DEV 0x5600
++#define VROOT_CLR_DEV 0x5601
++
++#endif /* _LINUX_VROOT_H */
+diff -urNp -x '*.orig' linux-4.9/include/linux/vs_base.h linux-4.9/include/linux/vs_base.h
+--- linux-4.9/include/linux/vs_base.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vs_base.h 2021-02-24 15:47:45.091076220 +0100
+@@ -0,0 +1,10 @@
++#ifndef _VS_BASE_H
++#define _VS_BASE_H
++
++#include "vserver/base.h"
++#include "vserver/check.h"
++#include "vserver/debug.h"
++
++#else
++#warning duplicate inclusion
++#endif
+diff -urNp -x '*.orig' linux-4.9/include/linux/vs_context.h linux-4.9/include/linux/vs_context.h
+--- linux-4.9/include/linux/vs_context.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vs_context.h 2021-02-24 15:47:45.091076220 +0100
+@@ -0,0 +1,242 @@
++#ifndef _VS_CONTEXT_H
++#define _VS_CONTEXT_H
++
++#include "vserver/base.h"
++#include "vserver/check.h"
++#include "vserver/context.h"
++#include "vserver/history.h"
++#include "vserver/debug.h"
++
++#include <linux/sched.h>
++
++
++#define get_vx_info(i) __get_vx_info(i, __FILE__, __LINE__, __HERE__)
++
++static inline struct vx_info *__get_vx_info(struct vx_info *vxi,
++ const char *_file, int _line, void *_here)
+{
-+ return vx_get_proc_task(inode, proc_pid(inode));
++ if (!vxi)
++ return NULL;
++
++ vxlprintk(VXD_CBIT(xid, 2), "get_vx_info(%p[#%d.%d])",
++ vxi, vxi ? vxi->vx_id : 0,
++ vxi ? atomic_read(&vxi->vx_usecnt) : 0,
++ _file, _line);
++ __vxh_get_vx_info(vxi, _here);
++
++ atomic_inc(&vxi->vx_usecnt);
++ return vxi;
+}
+
- static inline int proc_fd(struct inode *inode)
- {
- return PROC_I(inode)->fd;
-diff -NurpP --minimal linux-2.6.19.1/fs/proc/proc_misc.c linux-2.6.19.1-vs2.3.0.6/fs/proc/proc_misc.c
---- linux-2.6.19.1/fs/proc/proc_misc.c 2006-11-30 21:19:28 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/proc/proc_misc.c 2006-12-06 08:48:35 +0100
-@@ -53,6 +53,8 @@
- #include <asm/div64.h>
- #include "internal.h"
-
-+#include <linux/vs_cvirt.h>
+
- #define LOAD_INT(x) ((x) >> FSHIFT)
- #define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100)
- /*
-@@ -82,17 +84,32 @@ static int proc_calc_metrics(char *page,
- static int loadavg_read_proc(char *page, char **start, off_t off,
- int count, int *eof, void *data)
- {
-+ unsigned int running, threads;
- int a, b, c;
- int len;
-
-- a = avenrun[0] + (FIXED_1/200);
-- b = avenrun[1] + (FIXED_1/200);
-- c = avenrun[2] + (FIXED_1/200);
-- len = sprintf(page,"%d.%02d %d.%02d %d.%02d %ld/%d %d\n",
-+ if (vx_flags(VXF_VIRT_LOAD, 0)) {
-+ struct vx_info *vxi = current->vx_info;
++extern void free_vx_info(struct vx_info *);
+
-+ a = vxi->cvirt.load[0] + (FIXED_1/200);
-+ b = vxi->cvirt.load[1] + (FIXED_1/200);
-+ c = vxi->cvirt.load[2] + (FIXED_1/200);
++#define put_vx_info(i) __put_vx_info(i, __FILE__, __LINE__, __HERE__)
+
-+ running = atomic_read(&vxi->cvirt.nr_running);
-+ threads = atomic_read(&vxi->cvirt.nr_threads);
-+ } else {
-+ a = avenrun[0] + (FIXED_1/200);
-+ b = avenrun[1] + (FIXED_1/200);
-+ c = avenrun[2] + (FIXED_1/200);
++static inline void __put_vx_info(struct vx_info *vxi,
++ const char *_file, int _line, void *_here)
++{
++ if (!vxi)
++ return;
+
-+ running = nr_running();
-+ threads = nr_threads;
++ vxlprintk(VXD_CBIT(xid, 2), "put_vx_info(%p[#%d.%d])",
++ vxi, vxi ? vxi->vx_id : 0,
++ vxi ? atomic_read(&vxi->vx_usecnt) : 0,
++ _file, _line);
++ __vxh_put_vx_info(vxi, _here);
++
++ if (atomic_dec_and_test(&vxi->vx_usecnt))
++ free_vx_info(vxi);
++}
++
++
++#define init_vx_info(p, i) \
++ __init_vx_info(p, i, __FILE__, __LINE__, __HERE__)
++
++static inline void __init_vx_info(struct vx_info **vxp, struct vx_info *vxi,
++ const char *_file, int _line, void *_here)
++{
++ if (vxi) {
++ vxlprintk(VXD_CBIT(xid, 3),
++ "init_vx_info(%p[#%d.%d])",
++ vxi, vxi ? vxi->vx_id : 0,
++ vxi ? atomic_read(&vxi->vx_usecnt) : 0,
++ _file, _line);
++ __vxh_init_vx_info(vxi, vxp, _here);
++
++ atomic_inc(&vxi->vx_usecnt);
+ }
-+ len = sprintf(page,"%d.%02d %d.%02d %d.%02d %d/%d %d\n",
- LOAD_INT(a), LOAD_FRAC(a),
- LOAD_INT(b), LOAD_FRAC(b),
- LOAD_INT(c), LOAD_FRAC(c),
-- nr_running(), nr_threads, init_pspace.last_pid);
-+ running, threads, init_pspace.last_pid);
- return proc_calc_metrics(page, start, off, count, eof, len);
- }
-
-@@ -106,6 +123,9 @@ static int uptime_read_proc(char *page,
-
- do_posix_clock_monotonic_gettime(&uptime);
- cputime_to_timespec(idletime, &idle);
-+ if (vx_flags(VXF_VIRT_UPTIME, 0))
-+ vx_vsi_uptime(&uptime, &idle);
++ *vxp = vxi;
++}
+
- len = sprintf(page,"%lu.%02lu %lu.%02lu\n",
- (unsigned long) uptime.tv_sec,
- (uptime.tv_nsec / (NSEC_PER_SEC / 100)),
-@@ -142,7 +162,7 @@ static int meminfo_read_proc(char *page,
-
- cached = global_page_state(NR_FILE_PAGES) -
- total_swapcache_pages - i.bufferram;
-- if (cached < 0)
-+ if (cached < 0 || vx_flags(VXF_VIRT_MEM, 0))
- cached = 0;
-
- get_vmalloc_info(&vmi);
-@@ -252,8 +272,8 @@ static int version_read_proc(char *page,
- {
- int len;
-
-- strcpy(page, linux_banner);
-- len = strlen(page);
-+ len = sprintf(page, linux_banner,
-+ utsname()->release, utsname()->version);
- return proc_calc_metrics(page, start, off, count, eof, len);
- }
-
-diff -NurpP --minimal linux-2.6.19.1/fs/proc/root.c linux-2.6.19.1-vs2.3.0.6/fs/proc/root.c
---- linux-2.6.19.1/fs/proc/root.c 2006-11-30 21:19:28 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/proc/root.c 2006-11-08 04:57:41 +0100
-@@ -25,6 +25,9 @@ struct proc_dir_entry *proc_net, *proc_n
- #ifdef CONFIG_SYSCTL
- struct proc_dir_entry *proc_sys_root;
- #endif
-+struct proc_dir_entry *proc_virtual;
+
-+extern void proc_vx_init(void);
-
- static int proc_get_sb(struct file_system_type *fs_type,
- int flags, const char *dev_name, void *data, struct vfsmount *mnt)
-@@ -89,6 +92,7 @@ void __init proc_root_init(void)
- proc_device_tree_init();
- #endif
- proc_bus = proc_mkdir("bus", NULL);
-+ proc_vx_init();
- }
-
- static int proc_root_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat
-diff -NurpP --minimal linux-2.6.19.1/fs/quota.c linux-2.6.19.1-vs2.3.0.6/fs/quota.c
---- linux-2.6.19.1/fs/quota.c 2006-11-30 21:19:28 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/quota.c 2006-12-01 22:46:55 +0100
-@@ -17,47 +17,122 @@
- #include <linux/buffer_head.h>
- #include <linux/capability.h>
- #include <linux/quotaops.h>
-+#include <linux/major.h>
-+#include <linux/blkdev.h>
-+#include <linux/vs_context.h>
++#define set_vx_info(p, i) \
++ __set_vx_info(p, i, __FILE__, __LINE__, __HERE__)
++
++static inline void __set_vx_info(struct vx_info **vxp, struct vx_info *vxi,
++ const char *_file, int _line, void *_here)
++{
++ struct vx_info *vxo;
++
++ if (!vxi)
++ return;
++
++ vxlprintk(VXD_CBIT(xid, 3), "set_vx_info(%p[#%d.%d])",
++ vxi, vxi ? vxi->vx_id : 0,
++ vxi ? atomic_read(&vxi->vx_usecnt) : 0,
++ _file, _line);
++ __vxh_set_vx_info(vxi, vxp, _here);
+
++ atomic_inc(&vxi->vx_usecnt);
++ vxo = xchg(vxp, vxi);
++ BUG_ON(vxo);
++}
+
-+/* Dquota Hash Management Functions */
+
-+static LIST_HEAD(dqhash_list);
++#define clr_vx_info(p) __clr_vx_info(p, __FILE__, __LINE__, __HERE__)
+
-+struct dqhash *new_dqhash(struct super_block *sb, unsigned int id)
++static inline void __clr_vx_info(struct vx_info **vxp,
++ const char *_file, int _line, void *_here)
+{
-+ struct dqhash *hash;
-+ int err;
++ struct vx_info *vxo;
+
-+ err = -ENOMEM;
-+ hash = kmalloc(sizeof(struct dqhash), GFP_USER);
-+ if (!hash)
-+ goto out;
++ vxo = xchg(vxp, NULL);
++ if (!vxo)
++ return;
++
++ vxlprintk(VXD_CBIT(xid, 3), "clr_vx_info(%p[#%d.%d])",
++ vxo, vxo ? vxo->vx_id : 0,
++ vxo ? atomic_read(&vxo->vx_usecnt) : 0,
++ _file, _line);
++ __vxh_clr_vx_info(vxo, vxp, _here);
+
-+ memset(hash, 0, sizeof(struct dqhash));
-+ hash->dqh_id = id;
-+ atomic_set(&hash->dqh_count, 1);
++ if (atomic_dec_and_test(&vxo->vx_usecnt))
++ free_vx_info(vxo);
++}
+
-+ INIT_LIST_HEAD(&hash->dqh_list);
+
-+ mutex_init(&hash->dqh_dqopt.dqio_mutex);
-+ mutex_init(&hash->dqh_dqopt.dqonoff_mutex);
-+ init_rwsem(&hash->dqh_dqopt.dqptr_sem);
-+ hash->dqh_qop = sb->s_qop;
-+ hash->dqh_qcop = sb->s_qcop;
-+ hash->dqh_sb = sb;
++#define claim_vx_info(v, p) \
++ __claim_vx_info(v, p, __FILE__, __LINE__, __HERE__)
+
-+ lock_kernel();
-+ list_add(&hash->dqh_list, &dqhash_list);
-+ unlock_kernel();
-+ vxdprintk(VXD_CBIT(misc, 0),
-+ "new_dqhash: %p [#0x%08x]", hash, hash->dqh_id);
-+ return hash;
++static inline void __claim_vx_info(struct vx_info *vxi,
++ struct task_struct *task,
++ const char *_file, int _line, void *_here)
++{
++ vxlprintk(VXD_CBIT(xid, 3), "claim_vx_info(%p[#%d.%d.%d]) %p",
++ vxi, vxi ? vxi->vx_id : 0,
++ vxi ? atomic_read(&vxi->vx_usecnt) : 0,
++ vxi ? atomic_read(&vxi->vx_tasks) : 0,
++ task, _file, _line);
++ __vxh_claim_vx_info(vxi, task, _here);
+
-+ // kfree(hash);
-+out:
-+ return ERR_PTR(err);
++ atomic_inc(&vxi->vx_tasks);
+}
+
-+void destroy_dqhash(struct dqhash *hash)
++
++extern void unhash_vx_info(struct vx_info *);
++
++#define release_vx_info(v, p) \
++ __release_vx_info(v, p, __FILE__, __LINE__, __HERE__)
++
++static inline void __release_vx_info(struct vx_info *vxi,
++ struct task_struct *task,
++ const char *_file, int _line, void *_here)
+{
-+ vxdprintk(VXD_CBIT(misc, 0),
-+ "destroy_dqhash: %p [#0x%08x] c=%d",
-+ hash, hash->dqh_id, atomic_read(&hash->dqh_count));
-+ lock_kernel();
-+ list_del_init(&hash->dqh_list);
-+ unlock_kernel();
-+ kfree(hash);
++ vxlprintk(VXD_CBIT(xid, 3), "release_vx_info(%p[#%d.%d.%d]) %p",
++ vxi, vxi ? vxi->vx_id : 0,
++ vxi ? atomic_read(&vxi->vx_usecnt) : 0,
++ vxi ? atomic_read(&vxi->vx_tasks) : 0,
++ task, _file, _line);
++ __vxh_release_vx_info(vxi, task, _here);
++
++ might_sleep();
++
++ if (atomic_dec_and_test(&vxi->vx_tasks))
++ unhash_vx_info(vxi);
+}
+
+
-+struct dqhash *find_dqhash(unsigned int id)
++#define task_get_vx_info(p) \
++ __task_get_vx_info(p, __FILE__, __LINE__, __HERE__)
++
++static inline struct vx_info *__task_get_vx_info(struct task_struct *p,
++ const char *_file, int _line, void *_here)
+{
-+ struct list_head *head;
-+ struct dqhash *hash;
++ struct vx_info *vxi;
++
++ task_lock(p);
++ vxlprintk(VXD_CBIT(xid, 5), "task_get_vx_info(%p)",
++ p, _file, _line);
++ vxi = __get_vx_info(p->vx_info, _file, _line, _here);
++ task_unlock(p);
++ return vxi;
++}
+
-+ lock_kernel();
-+ list_for_each(head, &dqhash_list) {
-+ hash = list_entry(head, struct dqhash, dqh_list);
-+ if (hash->dqh_id == id)
-+ goto dqh_found;
-+ }
-+ unlock_kernel();
-+ return NULL;
+
-+dqh_found:
-+ unlock_kernel();
-+ return dqhget(hash);
++static inline void __wakeup_vx_info(struct vx_info *vxi)
++{
++ if (waitqueue_active(&vxi->vx_wait))
++ wake_up_interruptible(&vxi->vx_wait);
+}
+
-
- /* Check validity of generic quotactl commands */
--static int generic_quotactl_valid(struct super_block *sb, int type, int cmd, qid_t id)
-+static int generic_quotactl_valid(struct dqhash *hash, int type, int cmd, qid_t id)
- {
- if (type >= MAXQUOTAS)
- return -EINVAL;
-- if (!sb && cmd != Q_SYNC)
-+ if (!hash && cmd != Q_SYNC)
- return -ENODEV;
- /* Is operation supported? */
-- if (sb && !sb->s_qcop)
-+ if (hash && !hash->dqh_qcop)
- return -ENOSYS;
-
- switch (cmd) {
- case Q_GETFMT:
- break;
- case Q_QUOTAON:
-- if (!sb->s_qcop->quota_on)
-+ if (!hash->dqh_qcop->quota_on)
- return -ENOSYS;
- break;
- case Q_QUOTAOFF:
-- if (!sb->s_qcop->quota_off)
-+ if (!hash->dqh_qcop->quota_off)
- return -ENOSYS;
- break;
- case Q_SETINFO:
-- if (!sb->s_qcop->set_info)
-+ if (!hash->dqh_qcop->set_info)
- return -ENOSYS;
- break;
- case Q_GETINFO:
-- if (!sb->s_qcop->get_info)
-+ if (!hash->dqh_qcop->get_info)
- return -ENOSYS;
- break;
- case Q_SETQUOTA:
-- if (!sb->s_qcop->set_dqblk)
-+ if (!hash->dqh_qcop->set_dqblk)
- return -ENOSYS;
- break;
- case Q_GETQUOTA:
-- if (!sb->s_qcop->get_dqblk)
-+ if (!hash->dqh_qcop->get_dqblk)
- return -ENOSYS;
- break;
- case Q_SYNC:
-- if (sb && !sb->s_qcop->quota_sync)
-+ if (hash && !hash->dqh_qcop->quota_sync)
- return -ENOSYS;
- break;
- default:
-@@ -73,7 +148,7 @@ static int generic_quotactl_valid(struct
- case Q_SETQUOTA:
- case Q_GETQUOTA:
- /* This is just informative test so we are satisfied without a lock */
-- if (!sb_has_quota_enabled(sb, type))
-+ if (!dqh_has_quota_enabled(hash, type))
- return -ESRCH;
- }
-
-@@ -81,47 +156,47 @@ static int generic_quotactl_valid(struct
- if (cmd == Q_GETQUOTA) {
- if (((type == USRQUOTA && current->euid != id) ||
- (type == GRPQUOTA && !in_egroup_p(id))) &&
-- !capable(CAP_SYS_ADMIN))
-+ !vx_capable(CAP_SYS_ADMIN, VXC_QUOTA_CTL))
- return -EPERM;
- }
- else if (cmd != Q_GETFMT && cmd != Q_SYNC && cmd != Q_GETINFO)
-- if (!capable(CAP_SYS_ADMIN))
-+ if (!vx_capable(CAP_SYS_ADMIN, VXC_QUOTA_CTL))
- return -EPERM;
-
- return 0;
- }
-
- /* Check validity of XFS Quota Manager commands */
--static int xqm_quotactl_valid(struct super_block *sb, int type, int cmd, qid_t id)
-+static int xqm_quotactl_valid(struct dqhash *hash, int type, int cmd, qid_t id)
- {
- if (type >= XQM_MAXQUOTAS)
- return -EINVAL;
-- if (!sb)
-+ if (!hash)
- return -ENODEV;
-- if (!sb->s_qcop)
-+ if (!hash->dqh_qcop)
- return -ENOSYS;
-
- switch (cmd) {
- case Q_XQUOTAON:
- case Q_XQUOTAOFF:
- case Q_XQUOTARM:
-- if (!sb->s_qcop->set_xstate)
-+ if (!hash->dqh_qcop->set_xstate)
- return -ENOSYS;
- break;
- case Q_XGETQSTAT:
-- if (!sb->s_qcop->get_xstate)
-+ if (!hash->dqh_qcop->get_xstate)
- return -ENOSYS;
- break;
- case Q_XSETQLIM:
-- if (!sb->s_qcop->set_xquota)
-+ if (!hash->dqh_qcop->set_xquota)
- return -ENOSYS;
- break;
- case Q_XGETQUOTA:
-- if (!sb->s_qcop->get_xquota)
-+ if (!hash->dqh_qcop->get_xquota)
- return -ENOSYS;
- break;
- case Q_XQUOTASYNC:
-- if (!sb->s_qcop->quota_sync)
-+ if (!hash->dqh_qcop->quota_sync)
- return -ENOSYS;
- break;
- default:
-@@ -132,57 +207,68 @@ static int xqm_quotactl_valid(struct sup
- if (cmd == Q_XGETQUOTA) {
- if (((type == XQM_USRQUOTA && current->euid != id) ||
- (type == XQM_GRPQUOTA && !in_egroup_p(id))) &&
-- !capable(CAP_SYS_ADMIN))
-+ !vx_capable(CAP_SYS_ADMIN, VXC_QUOTA_CTL))
- return -EPERM;
- } else if (cmd != Q_XGETQSTAT && cmd != Q_XQUOTASYNC) {
-- if (!capable(CAP_SYS_ADMIN))
-+ if (!vx_capable(CAP_SYS_ADMIN, VXC_QUOTA_CTL))
- return -EPERM;
- }
-
- return 0;
- }
-
--static int check_quotactl_valid(struct super_block *sb, int type, int cmd, qid_t id)
-+static int check_quotactl_valid(struct dqhash *hash, int type, int cmd, qid_t id)
- {
- int error;
-
- if (XQM_COMMAND(cmd))
-- error = xqm_quotactl_valid(sb, type, cmd, id);
-+ error = xqm_quotactl_valid(hash, type, cmd, id);
- else
-- error = generic_quotactl_valid(sb, type, cmd, id);
-+ error = generic_quotactl_valid(hash, type, cmd, id);
- if (!error)
-- error = security_quotactl(cmd, type, id, sb);
-+ error = security_quotactl(cmd, type, id, hash);
- return error;
- }
-
--static void quota_sync_sb(struct super_block *sb, int type)
-+static void quota_sync_sb(struct super_block *sb)
- {
-- int cnt;
-- struct inode *discard[MAXQUOTAS];
--
-- sb->s_qcop->quota_sync(sb, type);
- /* This is not very clever (and fast) but currently I don't know about
- * any other simple way of getting quota data to disk and we must get
- * them there for userspace to be visible... */
- if (sb->s_op->sync_fs)
- sb->s_op->sync_fs(sb, 1);
- sync_blockdev(sb->s_bdev);
-+}
-+
-+static void quota_sync_dqh(struct dqhash *hash, int type)
-+{
-+ int cnt;
-+ struct inode *discard[MAXQUOTAS];
-+
-+ vxdprintk(VXD_CBIT(quota, 1),
-+ "quota_sync_dqh(%p,%d)", hash, type);
-+ hash->dqh_qcop->quota_sync(hash, type);
-+
-+ quota_sync_sb(hash->dqh_sb);
-
- /* Now when everything is written we can discard the pagecache so
- * that userspace sees the changes. We need i_mutex and so we could
- * not do it inside dqonoff_mutex. Moreover we need to be carefull
- * about races with quotaoff() (that is the reason why we have own
- * reference to inode). */
-- mutex_lock(&sb_dqopt(sb)->dqonoff_mutex);
-+ mutex_lock(&dqh_dqopt(hash)->dqonoff_mutex);
- for (cnt = 0; cnt < MAXQUOTAS; cnt++) {
- discard[cnt] = NULL;
- if (type != -1 && cnt != type)
- continue;
-- if (!sb_has_quota_enabled(sb, cnt))
-+ if (!dqh_has_quota_enabled(hash, cnt))
- continue;
-- discard[cnt] = igrab(sb_dqopt(sb)->files[cnt]);
-+ vxdprintk(VXD_CBIT(quota, 0),
-+ "quota_sync_dqh(%p,%d) discard inode %p",
-+ hash, type, dqh_dqopt(hash)->files[cnt]);
-+ discard[cnt] = igrab(dqh_dqopt(hash)->files[cnt]);
- }
-- mutex_unlock(&sb_dqopt(sb)->dqonoff_mutex);
-+ mutex_unlock(&dqh_dqopt(hash)->dqonoff_mutex);
- for (cnt = 0; cnt < MAXQUOTAS; cnt++) {
- if (discard[cnt]) {
- mutex_lock(&discard[cnt]->i_mutex);
-@@ -193,67 +279,59 @@ static void quota_sync_sb(struct super_b
- }
- }
-
--void sync_dquots(struct super_block *sb, int type)
-+void sync_dquots_dqh(struct dqhash *hash, int type)
- {
-- int cnt, dirty;
-+ vxdprintk(VXD_CBIT(quota, 1),
-+ "sync_dquots_dqh(%p,%d)", hash, type);
-
-- if (sb) {
-- if (sb->s_qcop->quota_sync)
-- quota_sync_sb(sb, type);
-- return;
-- }
-+ if (hash->dqh_qcop->quota_sync)
-+ quota_sync_dqh(hash, type);
-+}
-
-- spin_lock(&sb_lock);
--restart:
-- list_for_each_entry(sb, &super_blocks, s_list) {
-- /* This test just improves performance so it needn't be reliable... */
-- for (cnt = 0, dirty = 0; cnt < MAXQUOTAS; cnt++)
-- if ((type == cnt || type == -1) && sb_has_quota_enabled(sb, cnt)
-- && info_any_dirty(&sb_dqopt(sb)->info[cnt]))
-- dirty = 1;
-- if (!dirty)
-- continue;
-- sb->s_count++;
-- spin_unlock(&sb_lock);
-- down_read(&sb->s_umount);
-- if (sb->s_root && sb->s_qcop->quota_sync)
-- quota_sync_sb(sb, type);
-- up_read(&sb->s_umount);
-- spin_lock(&sb_lock);
-- if (__put_super_and_need_restart(sb))
-- goto restart;
-+void sync_dquots(struct dqhash *hash, int type)
-+
-+{
-+ vxdprintk(VXD_CBIT(quota, 1),
-+ "sync_dquots(%p,%d)", hash, type);
-+
-+ if (hash) {
-+ if (hash->dqh_qcop->quota_sync)
-+ quota_sync_dqh(hash, type);
-+ return;
- }
-- spin_unlock(&sb_lock);
- }
-
- /* Copy parameters and call proper function */
--static int do_quotactl(struct super_block *sb, int type, int cmd, qid_t id, void __user *addr)
-+static int do_quotactl(struct dqhash *hash, int type, int cmd, qid_t id, void __user *addr)
- {
- int ret;
-
-+ vxdprintk(VXD_CBIT(quota, 3),
-+ "do_quotactl(%p,%d,cmd=%d,id=%d,%p)", hash, type, cmd, id, addr);
+
- switch (cmd) {
- case Q_QUOTAON: {
- char *pathname;
-
- if (IS_ERR(pathname = getname(addr)))
- return PTR_ERR(pathname);
-- ret = sb->s_qcop->quota_on(sb, type, id, pathname);
-+ ret = hash->dqh_qcop->quota_on(hash, type, id, pathname);
- putname(pathname);
- return ret;
- }
- case Q_QUOTAOFF:
-- return sb->s_qcop->quota_off(sb, type);
-+ return hash->dqh_qcop->quota_off(hash, type);
-
- case Q_GETFMT: {
- __u32 fmt;
-
-- down_read(&sb_dqopt(sb)->dqptr_sem);
-- if (!sb_has_quota_enabled(sb, type)) {
-- up_read(&sb_dqopt(sb)->dqptr_sem);
-+ down_read(&dqh_dqopt(hash)->dqptr_sem);
-+ if (!dqh_has_quota_enabled(hash, type)) {
-+ up_read(&dqh_dqopt(hash)->dqptr_sem);
- return -ESRCH;
- }
-- fmt = sb_dqopt(sb)->info[type].dqi_format->qf_fmt_id;
-- up_read(&sb_dqopt(sb)->dqptr_sem);
-+ fmt = dqh_dqopt(hash)->info[type].dqi_format->qf_fmt_id;
-+ up_read(&dqh_dqopt(hash)->dqptr_sem);
- if (copy_to_user(addr, &fmt, sizeof(fmt)))
- return -EFAULT;
- return 0;
-@@ -261,7 +339,7 @@ static int do_quotactl(struct super_bloc
- case Q_GETINFO: {
- struct if_dqinfo info;
-
-- if ((ret = sb->s_qcop->get_info(sb, type, &info)))
-+ if ((ret = hash->dqh_qcop->get_info(hash, type, &info)))
- return ret;
- if (copy_to_user(addr, &info, sizeof(info)))
- return -EFAULT;
-@@ -272,12 +350,12 @@ static int do_quotactl(struct super_bloc
-
- if (copy_from_user(&info, addr, sizeof(info)))
- return -EFAULT;
-- return sb->s_qcop->set_info(sb, type, &info);
-+ return hash->dqh_qcop->set_info(hash, type, &info);
- }
- case Q_GETQUOTA: {
- struct if_dqblk idq;
-
-- if ((ret = sb->s_qcop->get_dqblk(sb, type, id, &idq)))
-+ if ((ret = hash->dqh_qcop->get_dqblk(hash, type, id, &idq)))
- return ret;
- if (copy_to_user(addr, &idq, sizeof(idq)))
- return -EFAULT;
-@@ -288,10 +366,10 @@ static int do_quotactl(struct super_bloc
-
- if (copy_from_user(&idq, addr, sizeof(idq)))
- return -EFAULT;
-- return sb->s_qcop->set_dqblk(sb, type, id, &idq);
-+ return hash->dqh_qcop->set_dqblk(hash, type, id, &idq);
- }
- case Q_SYNC:
-- sync_dquots(sb, type);
-+ sync_dquots_dqh(hash, type);
- return 0;
-
- case Q_XQUOTAON:
-@@ -301,12 +379,12 @@ static int do_quotactl(struct super_bloc
-
- if (copy_from_user(&flags, addr, sizeof(flags)))
- return -EFAULT;
-- return sb->s_qcop->set_xstate(sb, flags, cmd);
-+ return hash->dqh_qcop->set_xstate(hash, flags, cmd);
- }
- case Q_XGETQSTAT: {
- struct fs_quota_stat fqs;
-
-- if ((ret = sb->s_qcop->get_xstate(sb, &fqs)))
-+ if ((ret = hash->dqh_qcop->get_xstate(hash, &fqs)))
- return ret;
- if (copy_to_user(addr, &fqs, sizeof(fqs)))
- return -EFAULT;
-@@ -317,19 +395,19 @@ static int do_quotactl(struct super_bloc
-
- if (copy_from_user(&fdq, addr, sizeof(fdq)))
- return -EFAULT;
-- return sb->s_qcop->set_xquota(sb, type, id, &fdq);
-+ return hash->dqh_qcop->set_xquota(hash, type, id, &fdq);
- }
- case Q_XGETQUOTA: {
- struct fs_disk_quota fdq;
-
-- if ((ret = sb->s_qcop->get_xquota(sb, type, id, &fdq)))
-+ if ((ret = hash->dqh_qcop->get_xquota(hash, type, id, &fdq)))
- return ret;
- if (copy_to_user(addr, &fdq, sizeof(fdq)))
- return -EFAULT;
- return 0;
- }
- case Q_XQUOTASYNC:
-- return sb->s_qcop->quota_sync(sb, type);
-+ return hash->dqh_qcop->quota_sync(hash, type);
- /* We never reach here unless validity check is broken */
- default:
- BUG();
-@@ -365,6 +443,43 @@ static inline struct super_block *quotac
- #endif
- }
-
-+#if defined(CONFIG_BLK_DEV_VROOT) || defined(CONFIG_BLK_DEV_VROOT_MODULE)
++#define enter_vx_info(v, s) __enter_vx_info(v, s, __FILE__, __LINE__)
+
-+#include <linux/vroot.h>
-+#include <linux/kallsyms.h>
++static inline void __enter_vx_info(struct vx_info *vxi,
++ struct vx_info_save *vxis, const char *_file, int _line)
++{
++ vxlprintk(VXD_CBIT(xid, 5), "enter_vx_info(%p[#%d],%p) %p[#%d,%p]",
++ vxi, vxi ? vxi->vx_id : 0, vxis, current,
++ current->xid, current->vx_info, _file, _line);
++ vxis->vxi = xchg(¤t->vx_info, vxi);
++ vxis->xid = current->xid;
++ current->xid = vxi ? vxi->vx_id : 0;
++}
+
-+static vroot_grb_func *vroot_get_real_bdev = NULL;
++#define leave_vx_info(s) __leave_vx_info(s, __FILE__, __LINE__)
+
-+static spinlock_t vroot_grb_lock = SPIN_LOCK_UNLOCKED;
++static inline void __leave_vx_info(struct vx_info_save *vxis,
++ const char *_file, int _line)
++{
++ vxlprintk(VXD_CBIT(xid, 5), "leave_vx_info(%p[#%d,%p]) %p[#%d,%p]",
++ vxis, vxis->xid, vxis->vxi, current,
++ current->xid, current->vx_info, _file, _line);
++ (void)xchg(¤t->vx_info, vxis->vxi);
++ current->xid = vxis->xid;
++}
+
-+int register_vroot_grb(vroot_grb_func *func) {
-+ int ret = -EBUSY;
+
-+ spin_lock(&vroot_grb_lock);
-+ if (!vroot_get_real_bdev) {
-+ vroot_get_real_bdev = func;
-+ ret = 0;
-+ }
-+ spin_unlock(&vroot_grb_lock);
-+ return ret;
++static inline void __enter_vx_admin(struct vx_info_save *vxis)
++{
++ vxis->vxi = xchg(¤t->vx_info, NULL);
++ vxis->xid = xchg(¤t->xid, (vxid_t)0);
+}
-+EXPORT_SYMBOL(register_vroot_grb);
+
-+int unregister_vroot_grb(vroot_grb_func *func) {
-+ int ret = -EINVAL;
-+
-+ spin_lock(&vroot_grb_lock);
-+ if (vroot_get_real_bdev) {
-+ vroot_get_real_bdev = NULL;
-+ ret = 0;
-+ }
-+ spin_unlock(&vroot_grb_lock);
-+ return ret;
++static inline void __leave_vx_admin(struct vx_info_save *vxis)
++{
++ (void)xchg(¤t->xid, vxis->xid);
++ (void)xchg(¤t->vx_info, vxis->vxi);
+}
-+EXPORT_SYMBOL(unregister_vroot_grb);
+
-+#endif
++#define task_is_init(p) \
++ __task_is_init(p, __FILE__, __LINE__, __HERE__)
+
- /*
- * This is the system call interface. This communicates with
- * the user-level programs. Currently this only supports diskquota
-@@ -375,6 +490,7 @@ asmlinkage long sys_quotactl(unsigned in
- {
- uint cmds, type;
- struct super_block *sb = NULL;
-+ struct dqhash *dqh = NULL;
- int ret;
-
- cmds = cmd >> SUBCMDSHIFT;
-@@ -386,9 +502,11 @@ asmlinkage long sys_quotactl(unsigned in
- return PTR_ERR(sb);
- }
-
-- ret = check_quotactl_valid(sb, type, cmds, id);
-+ if (sb)
-+ dqh = sb->s_dqh;
-+ ret = check_quotactl_valid(dqh, type, cmds, id);
- if (ret >= 0)
-- ret = do_quotactl(sb, type, cmds, id, addr);
-+ ret = do_quotactl(dqh, type, cmds, id, addr);
- if (sb)
- drop_super(sb);
-
-diff -NurpP --minimal linux-2.6.19.1/fs/quota_v1.c linux-2.6.19.1-vs2.3.0.6/fs/quota_v1.c
---- linux-2.6.19.1/fs/quota_v1.c 2005-03-02 12:38:45 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/quota_v1.c 2006-11-08 04:57:51 +0100
-@@ -42,12 +42,13 @@ static int v1_read_dqblk(struct dquot *d
- int type = dquot->dq_type;
- struct v1_disk_dqblk dqblk;
-
-- if (!sb_dqopt(dquot->dq_sb)->files[type])
-+ if (!dqh_dqopt(dquot->dq_dqh)->files[type])
- return -EINVAL;
-
- /* Set structure to 0s in case read fails/is after end of file */
- memset(&dqblk, 0, sizeof(struct v1_disk_dqblk));
-- dquot->dq_sb->s_op->quota_read(dquot->dq_sb, type, (char *)&dqblk, sizeof(struct v1_disk_dqblk), v1_dqoff(dquot->dq_id));
-+ dquot->dq_dqh->dqh_sb->s_op->quota_read(dquot->dq_dqh, type,
-+ (char *)&dqblk, sizeof(struct v1_disk_dqblk), v1_dqoff(dquot->dq_id));
-
- v1_disk2mem_dqblk(&dquot->dq_dqb, &dqblk);
- if (dquot->dq_dqb.dqb_bhardlimit == 0 && dquot->dq_dqb.dqb_bsoftlimit == 0 &&
-@@ -66,16 +67,16 @@ static int v1_commit_dqblk(struct dquot
-
- v1_mem2disk_dqblk(&dqblk, &dquot->dq_dqb);
- if (dquot->dq_id == 0) {
-- dqblk.dqb_btime = sb_dqopt(dquot->dq_sb)->info[type].dqi_bgrace;
-- dqblk.dqb_itime = sb_dqopt(dquot->dq_sb)->info[type].dqi_igrace;
-+ dqblk.dqb_btime = dqh_dqopt(dquot->dq_dqh)->info[type].dqi_bgrace;
-+ dqblk.dqb_itime = dqh_dqopt(dquot->dq_dqh)->info[type].dqi_igrace;
- }
- ret = 0;
-- if (sb_dqopt(dquot->dq_sb)->files[type])
-- ret = dquot->dq_sb->s_op->quota_write(dquot->dq_sb, type, (char *)&dqblk,
-- sizeof(struct v1_disk_dqblk), v1_dqoff(dquot->dq_id));
-+ if (dqh_dqopt(dquot->dq_dqh)->files[type])
-+ ret = dquot->dq_dqh->dqh_sb->s_op->quota_write(dquot->dq_dqh, type,
-+ (char *)&dqblk, sizeof(struct v1_disk_dqblk), v1_dqoff(dquot->dq_id));
- if (ret != sizeof(struct v1_disk_dqblk)) {
- printk(KERN_WARNING "VFS: dquota write failed on dev %s\n",
-- dquot->dq_sb->s_id);
-+ dquot->dq_dqh->dqh_sb->s_id);
- if (ret >= 0)
- ret = -EIO;
- goto out;
-@@ -100,9 +101,9 @@ struct v2_disk_dqheader {
- __le32 dqh_version; /* File version */
- };
-
--static int v1_check_quota_file(struct super_block *sb, int type)
-+static int v1_check_quota_file(struct dqhash *hash, int type)
- {
-- struct inode *inode = sb_dqopt(sb)->files[type];
-+ struct inode *inode = dqh_dqopt(hash)->files[type];
- ulong blocks;
- size_t off;
- struct v2_disk_dqheader dqhead;
-@@ -118,22 +119,26 @@ static int v1_check_quota_file(struct su
- if ((blocks % sizeof(struct v1_disk_dqblk) * BLOCK_SIZE + off) % sizeof(struct v1_disk_dqblk))
- return 0;
- /* Doublecheck whether we didn't get file with new format - with old quotactl() this could happen */
-- size = sb->s_op->quota_read(sb, type, (char *)&dqhead, sizeof(struct v2_disk_dqheader), 0);
-+ size = hash->dqh_sb->s_op->quota_read(hash, type,
-+ (char *)&dqhead, sizeof(struct v2_disk_dqheader), 0);
- if (size != sizeof(struct v2_disk_dqheader))
- return 1; /* Probably not new format */
- if (le32_to_cpu(dqhead.dqh_magic) != quota_magics[type])
- return 1; /* Definitely not new format */
-- printk(KERN_INFO "VFS: %s: Refusing to turn on old quota format on given file. It probably contains newer quota format.\n", sb->s_id);
-+ printk(KERN_INFO "VFS: %s: Refusing to turn on old quota format on given file."
-+ " It probably contains newer quota format.\n", hash->dqh_sb->s_id);
- return 0; /* Seems like a new format file -> refuse it */
- }
-
--static int v1_read_file_info(struct super_block *sb, int type)
-+static int v1_read_file_info(struct dqhash *hash, int type)
- {
-- struct quota_info *dqopt = sb_dqopt(sb);
-+ struct quota_info *dqopt = dqh_dqopt(hash);
- struct v1_disk_dqblk dqblk;
- int ret;
-
-- if ((ret = sb->s_op->quota_read(sb, type, (char *)&dqblk, sizeof(struct v1_disk_dqblk), v1_dqoff(0))) != sizeof(struct v1_disk_dqblk)) {
-+ if ((ret = hash->dqh_sb->s_op->quota_read(hash, type,
-+ (char *)&dqblk, sizeof(struct v1_disk_dqblk),
-+ v1_dqoff(0))) != sizeof(struct v1_disk_dqblk)) {
- if (ret >= 0)
- ret = -EIO;
- goto out;
-@@ -145,14 +150,14 @@ out:
- return ret;
- }
-
--static int v1_write_file_info(struct super_block *sb, int type)
-+static int v1_write_file_info(struct dqhash *hash, int type)
- {
-- struct quota_info *dqopt = sb_dqopt(sb);
-+ struct quota_info *dqopt = dqh_dqopt(hash);
- struct v1_disk_dqblk dqblk;
- int ret;
-
- dqopt->info[type].dqi_flags &= ~DQF_INFO_DIRTY;
-- if ((ret = sb->s_op->quota_read(sb, type, (char *)&dqblk,
-+ if ((ret = hash->dqh_sb->s_op->quota_read(hash, type, (char *)&dqblk,
- sizeof(struct v1_disk_dqblk), v1_dqoff(0))) != sizeof(struct v1_disk_dqblk)) {
- if (ret >= 0)
- ret = -EIO;
-@@ -160,7 +165,7 @@ static int v1_write_file_info(struct sup
- }
- dqblk.dqb_itime = dqopt->info[type].dqi_igrace;
- dqblk.dqb_btime = dqopt->info[type].dqi_bgrace;
-- ret = sb->s_op->quota_write(sb, type, (char *)&dqblk,
-+ ret = hash->dqh_sb->s_op->quota_write(hash, type, (char *)&dqblk,
- sizeof(struct v1_disk_dqblk), v1_dqoff(0));
- if (ret == sizeof(struct v1_disk_dqblk))
- ret = 0;
-diff -NurpP --minimal linux-2.6.19.1/fs/quota_v2.c linux-2.6.19.1-vs2.3.0.6/fs/quota_v2.c
---- linux-2.6.19.1/fs/quota_v2.c 2006-06-18 04:54:47 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/fs/quota_v2.c 2006-11-08 04:57:51 +0100
-@@ -26,14 +26,15 @@ typedef char *dqbuf_t;
- #define GETENTRIES(buf) ((struct v2_disk_dqblk *)(((char *)buf)+sizeof(struct v2_disk_dqdbheader)))
-
- /* Check whether given file is really vfsv0 quotafile */
--static int v2_check_quota_file(struct super_block *sb, int type)
-+static int v2_check_quota_file(struct dqhash *hash, int type)
- {
- struct v2_disk_dqheader dqhead;
- ssize_t size;
- static const uint quota_magics[] = V2_INITQMAGICS;
- static const uint quota_versions[] = V2_INITQVERSIONS;
-
-- size = sb->s_op->quota_read(sb, type, (char *)&dqhead, sizeof(struct v2_disk_dqheader), 0);
-+ size = hash->dqh_sb->s_op->quota_read(hash, type,
-+ (char *)&dqhead, sizeof(struct v2_disk_dqheader), 0);
- if (size != sizeof(struct v2_disk_dqheader)) {
- printk("quota_v2: failed read expected=%zd got=%zd\n",
- sizeof(struct v2_disk_dqheader), size);
-@@ -46,17 +47,17 @@ static int v2_check_quota_file(struct su
- }
-
- /* Read information header from quota file */
--static int v2_read_file_info(struct super_block *sb, int type)
-+static int v2_read_file_info(struct dqhash *hash, int type)
- {
- struct v2_disk_dqinfo dinfo;
-- struct mem_dqinfo *info = sb_dqopt(sb)->info+type;
-+ struct mem_dqinfo *info = dqh_dqopt(hash)->info+type;
- ssize_t size;
-
-- size = sb->s_op->quota_read(sb, type, (char *)&dinfo,
-- sizeof(struct v2_disk_dqinfo), V2_DQINFOOFF);
-+ size = hash->dqh_sb->s_op->quota_read(hash, type,
-+ (char *)&dinfo, sizeof(struct v2_disk_dqinfo), V2_DQINFOOFF);
- if (size != sizeof(struct v2_disk_dqinfo)) {
- printk(KERN_WARNING "Can't read info structure on device %s.\n",
-- sb->s_id);
-+ hash->dqh_sb->s_id);
- return -1;
- }
- info->dqi_bgrace = le32_to_cpu(dinfo.dqi_bgrace);
-@@ -69,10 +70,10 @@ static int v2_read_file_info(struct supe
- }
-
- /* Write information header to quota file */
--static int v2_write_file_info(struct super_block *sb, int type)
-+static int v2_write_file_info(struct dqhash *hash, int type)
- {
- struct v2_disk_dqinfo dinfo;
-- struct mem_dqinfo *info = sb_dqopt(sb)->info+type;
-+ struct mem_dqinfo *info = dqh_dqopt(hash)->info+type;
- ssize_t size;
-
- spin_lock(&dq_data_lock);
-@@ -84,11 +85,11 @@ static int v2_write_file_info(struct sup
- dinfo.dqi_blocks = cpu_to_le32(info->u.v2_i.dqi_blocks);
- dinfo.dqi_free_blk = cpu_to_le32(info->u.v2_i.dqi_free_blk);
- dinfo.dqi_free_entry = cpu_to_le32(info->u.v2_i.dqi_free_entry);
-- size = sb->s_op->quota_write(sb, type, (char *)&dinfo,
-+ size = hash->dqh_sb->s_op->quota_write(hash, type, (char *)&dinfo,
- sizeof(struct v2_disk_dqinfo), V2_DQINFOOFF);
- if (size != sizeof(struct v2_disk_dqinfo)) {
- printk(KERN_WARNING "Can't write info structure on device %s.\n",
-- sb->s_id);
-+ hash->dqh_sb->s_id);
- return -1;
- }
- return 0;
-@@ -132,24 +133,24 @@ static inline void freedqbuf(dqbuf_t buf
- kfree(buf);
- }
-
--static inline ssize_t read_blk(struct super_block *sb, int type, uint blk, dqbuf_t buf)
-+static inline ssize_t read_blk(struct dqhash *hash, int type, uint blk, dqbuf_t buf)
- {
- memset(buf, 0, V2_DQBLKSIZE);
-- return sb->s_op->quota_read(sb, type, (char *)buf,
-- V2_DQBLKSIZE, blk << V2_DQBLKSIZE_BITS);
-+ return hash->dqh_sb->s_op->quota_read(hash, type,
-+ (char *)buf, V2_DQBLKSIZE, blk << V2_DQBLKSIZE_BITS);
- }
-
--static inline ssize_t write_blk(struct super_block *sb, int type, uint blk, dqbuf_t buf)
-+static inline ssize_t write_blk(struct dqhash *hash, int type, uint blk, dqbuf_t buf)
- {
-- return sb->s_op->quota_write(sb, type, (char *)buf,
-- V2_DQBLKSIZE, blk << V2_DQBLKSIZE_BITS);
-+ return hash->dqh_sb->s_op->quota_write(hash, type,
-+ (char *)buf, V2_DQBLKSIZE, blk << V2_DQBLKSIZE_BITS);
- }
-
- /* Remove empty block from list and return it */
--static int get_free_dqblk(struct super_block *sb, int type)
-+static int get_free_dqblk(struct dqhash *hash, int type)
- {
- dqbuf_t buf = getdqbuf();
-- struct mem_dqinfo *info = sb_dqinfo(sb, type);
-+ struct mem_dqinfo *info = dqh_dqinfo(hash, type);
- struct v2_disk_dqdbheader *dh = (struct v2_disk_dqdbheader *)buf;
- int ret, blk;
-
-@@ -157,18 +158,18 @@ static int get_free_dqblk(struct super_b
- return -ENOMEM;
- if (info->u.v2_i.dqi_free_blk) {
- blk = info->u.v2_i.dqi_free_blk;
-- if ((ret = read_blk(sb, type, blk, buf)) < 0)
-+ if ((ret = read_blk(hash, type, blk, buf)) < 0)
- goto out_buf;
- info->u.v2_i.dqi_free_blk = le32_to_cpu(dh->dqdh_next_free);
- }
- else {
- memset(buf, 0, V2_DQBLKSIZE);
- /* Assure block allocation... */
-- if ((ret = write_blk(sb, type, info->u.v2_i.dqi_blocks, buf)) < 0)
-+ if ((ret = write_blk(hash, type, info->u.v2_i.dqi_blocks, buf)) < 0)
- goto out_buf;
- blk = info->u.v2_i.dqi_blocks++;
- }
-- mark_info_dirty(sb, type);
-+ mark_info_dirty(hash, type);
- ret = blk;
- out_buf:
- freedqbuf(buf);
-@@ -176,9 +177,9 @@ out_buf:
- }
-
- /* Insert empty block to the list */
--static int put_free_dqblk(struct super_block *sb, int type, dqbuf_t buf, uint blk)
-+static int put_free_dqblk(struct dqhash *hash, int type, dqbuf_t buf, uint blk)
- {
-- struct mem_dqinfo *info = sb_dqinfo(sb, type);
-+ struct mem_dqinfo *info = dqh_dqinfo(hash, type);
- struct v2_disk_dqdbheader *dh = (struct v2_disk_dqdbheader *)buf;
- int err;
-
-@@ -186,18 +187,18 @@ static int put_free_dqblk(struct super_b
- dh->dqdh_prev_free = cpu_to_le32(0);
- dh->dqdh_entries = cpu_to_le16(0);
- info->u.v2_i.dqi_free_blk = blk;
-- mark_info_dirty(sb, type);
-+ mark_info_dirty(hash, type);
- /* Some strange block. We had better leave it... */
-- if ((err = write_blk(sb, type, blk, buf)) < 0)
-+ if ((err = write_blk(hash, type, blk, buf)) < 0)
- return err;
- return 0;
- }
-
- /* Remove given block from the list of blocks with free entries */
--static int remove_free_dqentry(struct super_block *sb, int type, dqbuf_t buf, uint blk)
-+static int remove_free_dqentry(struct dqhash *hash, int type, dqbuf_t buf, uint blk)
- {
- dqbuf_t tmpbuf = getdqbuf();
-- struct mem_dqinfo *info = sb_dqinfo(sb, type);
-+ struct mem_dqinfo *info = dqh_dqinfo(hash, type);
- struct v2_disk_dqdbheader *dh = (struct v2_disk_dqdbheader *)buf;
- uint nextblk = le32_to_cpu(dh->dqdh_next_free), prevblk = le32_to_cpu(dh->dqdh_prev_free);
- int err;
-@@ -205,27 +206,27 @@ static int remove_free_dqentry(struct su
- if (!tmpbuf)
- return -ENOMEM;
- if (nextblk) {
-- if ((err = read_blk(sb, type, nextblk, tmpbuf)) < 0)
-+ if ((err = read_blk(hash, type, nextblk, tmpbuf)) < 0)
- goto out_buf;
- ((struct v2_disk_dqdbheader *)tmpbuf)->dqdh_prev_free = dh->dqdh_prev_free;
-- if ((err = write_blk(sb, type, nextblk, tmpbuf)) < 0)
-+ if ((err = write_blk(hash, type, nextblk, tmpbuf)) < 0)
- goto out_buf;
- }
- if (prevblk) {
-- if ((err = read_blk(sb, type, prevblk, tmpbuf)) < 0)
-+ if ((err = read_blk(hash, type, prevblk, tmpbuf)) < 0)
- goto out_buf;
- ((struct v2_disk_dqdbheader *)tmpbuf)->dqdh_next_free = dh->dqdh_next_free;
-- if ((err = write_blk(sb, type, prevblk, tmpbuf)) < 0)
-+ if ((err = write_blk(hash, type, prevblk, tmpbuf)) < 0)
- goto out_buf;
- }
- else {
- info->u.v2_i.dqi_free_entry = nextblk;
-- mark_info_dirty(sb, type);
-+ mark_info_dirty(hash, type);
- }
- freedqbuf(tmpbuf);
- dh->dqdh_next_free = dh->dqdh_prev_free = cpu_to_le32(0);
- /* No matter whether write succeeds block is out of list */
-- if (write_blk(sb, type, blk, buf) < 0)
-+ if (write_blk(hash, type, blk, buf) < 0)
- printk(KERN_ERR "VFS: Can't write block (%u) with free entries.\n", blk);
- return 0;
- out_buf:
-@@ -234,10 +235,10 @@ out_buf:
- }
-
- /* Insert given block to the beginning of list with free entries */
--static int insert_free_dqentry(struct super_block *sb, int type, dqbuf_t buf, uint blk)
-+static int insert_free_dqentry(struct dqhash *hash, int type, dqbuf_t buf, uint blk)
- {
- dqbuf_t tmpbuf = getdqbuf();
-- struct mem_dqinfo *info = sb_dqinfo(sb, type);
-+ struct mem_dqinfo *info = dqh_dqinfo(hash, type);
- struct v2_disk_dqdbheader *dh = (struct v2_disk_dqdbheader *)buf;
- int err;
-
-@@ -245,18 +246,18 @@ static int insert_free_dqentry(struct su
- return -ENOMEM;
- dh->dqdh_next_free = cpu_to_le32(info->u.v2_i.dqi_free_entry);
- dh->dqdh_prev_free = cpu_to_le32(0);
-- if ((err = write_blk(sb, type, blk, buf)) < 0)
-+ if ((err = write_blk(hash, type, blk, buf)) < 0)
- goto out_buf;
- if (info->u.v2_i.dqi_free_entry) {
-- if ((err = read_blk(sb, type, info->u.v2_i.dqi_free_entry, tmpbuf)) < 0)
-+ if ((err = read_blk(hash, type, info->u.v2_i.dqi_free_entry, tmpbuf)) < 0)
- goto out_buf;
- ((struct v2_disk_dqdbheader *)tmpbuf)->dqdh_prev_free = cpu_to_le32(blk);
-- if ((err = write_blk(sb, type, info->u.v2_i.dqi_free_entry, tmpbuf)) < 0)
-+ if ((err = write_blk(hash, type, info->u.v2_i.dqi_free_entry, tmpbuf)) < 0)
- goto out_buf;
- }
- freedqbuf(tmpbuf);
- info->u.v2_i.dqi_free_entry = blk;
-- mark_info_dirty(sb, type);
-+ mark_info_dirty(hash, type);
- return 0;
- out_buf:
- freedqbuf(tmpbuf);
-@@ -266,8 +267,9 @@ out_buf:
- /* Find space for dquot */
- static uint find_free_dqentry(struct dquot *dquot, int *err)
- {
-- struct super_block *sb = dquot->dq_sb;
-- struct mem_dqinfo *info = sb_dqopt(sb)->info+dquot->dq_type;
-+ // struct super_block *sb = dquot->dq_sb;
-+ struct dqhash *dqh = dquot->dq_dqh;
-+ struct mem_dqinfo *info = dqh_dqopt(dqh)->info+dquot->dq_type;
- uint blk, i;
- struct v2_disk_dqdbheader *dh;
- struct v2_disk_dqblk *ddquot;
-@@ -283,11 +285,11 @@ static uint find_free_dqentry(struct dqu
- ddquot = GETENTRIES(buf);
- if (info->u.v2_i.dqi_free_entry) {
- blk = info->u.v2_i.dqi_free_entry;
-- if ((*err = read_blk(sb, dquot->dq_type, blk, buf)) < 0)
-+ if ((*err = read_blk(dqh, dquot->dq_type, blk, buf)) < 0)
- goto out_buf;
- }
- else {
-- blk = get_free_dqblk(sb, dquot->dq_type);
-+ blk = get_free_dqblk(dqh, dquot->dq_type);
- if ((int)blk < 0) {
- *err = blk;
- freedqbuf(buf);
-@@ -296,10 +298,10 @@ static uint find_free_dqentry(struct dqu
- memset(buf, 0, V2_DQBLKSIZE);
- /* This is enough as block is already zeroed and entry list is empty... */
- info->u.v2_i.dqi_free_entry = blk;
-- mark_info_dirty(sb, dquot->dq_type);
-+ mark_info_dirty(dqh, dquot->dq_type);
- }
- if (le16_to_cpu(dh->dqdh_entries)+1 >= V2_DQSTRINBLK) /* Block will be full? */
-- if ((*err = remove_free_dqentry(sb, dquot->dq_type, buf, blk)) < 0) {
-+ if ((*err = remove_free_dqentry(dqh, dquot->dq_type, buf, blk)) < 0) {
- printk(KERN_ERR "VFS: find_free_dqentry(): Can't remove block (%u) from entry free list.\n", blk);
- goto out_buf;
- }
-@@ -314,7 +316,7 @@ static uint find_free_dqentry(struct dqu
- goto out_buf;
- }
- #endif
-- if ((*err = write_blk(sb, dquot->dq_type, blk, buf)) < 0) {
-+ if ((*err = write_blk(dqh, dquot->dq_type, blk, buf)) < 0) {
- printk(KERN_ERR "VFS: find_free_dqentry(): Can't write quota data block %u.\n", blk);
- goto out_buf;
- }
-@@ -329,7 +331,7 @@ out_buf:
- /* Insert reference to structure into the trie */
- static int do_insert_tree(struct dquot *dquot, uint *treeblk, int depth)
- {
-- struct super_block *sb = dquot->dq_sb;
-+ struct dqhash *dqh = dquot->dq_dqh;
- dqbuf_t buf;
- int ret = 0, newson = 0, newact = 0;
- __le32 *ref;
-@@ -338,7 +340,7 @@ static int do_insert_tree(struct dquot *
- if (!(buf = getdqbuf()))
- return -ENOMEM;
- if (!*treeblk) {
-- ret = get_free_dqblk(sb, dquot->dq_type);
-+ ret = get_free_dqblk(dqh, dquot->dq_type);
- if (ret < 0)
- goto out_buf;
- *treeblk = ret;
-@@ -346,7 +348,7 @@ static int do_insert_tree(struct dquot *
- newact = 1;
- }
- else {
-- if ((ret = read_blk(sb, dquot->dq_type, *treeblk, buf)) < 0) {
-+ if ((ret = read_blk(dqh, dquot->dq_type, *treeblk, buf)) < 0) {
- printk(KERN_ERR "VFS: Can't read tree quota block %u.\n", *treeblk);
- goto out_buf;
- }
-@@ -369,10 +371,10 @@ static int do_insert_tree(struct dquot *
- ret = do_insert_tree(dquot, &newblk, depth+1);
- if (newson && ret >= 0) {
- ref[GETIDINDEX(dquot->dq_id, depth)] = cpu_to_le32(newblk);
-- ret = write_blk(sb, dquot->dq_type, *treeblk, buf);
-+ ret = write_blk(dqh, dquot->dq_type, *treeblk, buf);
- }
- else if (newact && ret < 0)
-- put_free_dqblk(sb, dquot->dq_type, buf, *treeblk);
-+ put_free_dqblk(dqh, dquot->dq_type, buf, *treeblk);
- out_buf:
- freedqbuf(buf);
- return ret;
-@@ -409,10 +411,11 @@ static int v2_write_dquot(struct dquot *
- if (!memcmp(&empty, &ddquot, sizeof(struct v2_disk_dqblk)))
- ddquot.dqb_itime = cpu_to_le64(1);
- spin_unlock(&dq_data_lock);
-- ret = dquot->dq_sb->s_op->quota_write(dquot->dq_sb, type,
-+ ret = dquot->dq_dqh->dqh_sb->s_op->quota_write(dquot->dq_dqh, type,
- (char *)&ddquot, sizeof(struct v2_disk_dqblk), dquot->dq_off);
- if (ret != sizeof(struct v2_disk_dqblk)) {
-- printk(KERN_WARNING "VFS: dquota write failed on dev %s\n", dquot->dq_sb->s_id);
-+ printk(KERN_WARNING "VFS: dquota write failed on dev %s\n",
-+ dquot->dq_dqh->dqh_sb->s_id);
- if (ret >= 0)
- ret = -ENOSPC;
- }
-@@ -426,7 +429,8 @@ static int v2_write_dquot(struct dquot *
- /* Free dquot entry in data block */
- static int free_dqentry(struct dquot *dquot, uint blk)
- {
-- struct super_block *sb = dquot->dq_sb;
-+ // struct super_block *sb = dquot->dq_sb;
-+ struct dqhash *dqh = dquot->dq_dqh;
- int type = dquot->dq_type;
- struct v2_disk_dqdbheader *dh;
- dqbuf_t buf = getdqbuf();
-@@ -440,15 +444,15 @@ static int free_dqentry(struct dquot *dq
- (uint)(dquot->dq_off >> V2_DQBLKSIZE_BITS));
- goto out_buf;
- }
-- if ((ret = read_blk(sb, type, blk, buf)) < 0) {
-+ if ((ret = read_blk(dqh, type, blk, buf)) < 0) {
- printk(KERN_ERR "VFS: Can't read quota data block %u\n", blk);
- goto out_buf;
- }
- dh = (struct v2_disk_dqdbheader *)buf;
- dh->dqdh_entries = cpu_to_le16(le16_to_cpu(dh->dqdh_entries)-1);
- if (!le16_to_cpu(dh->dqdh_entries)) { /* Block got free? */
-- if ((ret = remove_free_dqentry(sb, type, buf, blk)) < 0 ||
-- (ret = put_free_dqblk(sb, type, buf, blk)) < 0) {
-+ if ((ret = remove_free_dqentry(dqh, type, buf, blk)) < 0 ||
-+ (ret = put_free_dqblk(dqh, type, buf, blk)) < 0) {
- printk(KERN_ERR "VFS: Can't move quota data block (%u) "
- "to free list.\n", blk);
- goto out_buf;
-@@ -459,13 +463,13 @@ static int free_dqentry(struct dquot *dq
- sizeof(struct v2_disk_dqblk));
- if (le16_to_cpu(dh->dqdh_entries) == V2_DQSTRINBLK-1) {
- /* Insert will write block itself */
-- if ((ret = insert_free_dqentry(sb, type, buf, blk)) < 0) {
-+ if ((ret = insert_free_dqentry(dqh, type, buf, blk)) < 0) {
- printk(KERN_ERR "VFS: Can't insert quota data block (%u) to free entry list.\n", blk);
- goto out_buf;
- }
- }
- else
-- if ((ret = write_blk(sb, type, blk, buf)) < 0) {
-+ if ((ret = write_blk(dqh, type, blk, buf)) < 0) {
- printk(KERN_ERR "VFS: Can't write quota data "
- "block %u\n", blk);
- goto out_buf;
-@@ -480,7 +484,7 @@ out_buf:
- /* Remove reference to dquot from tree */
- static int remove_tree(struct dquot *dquot, uint *blk, int depth)
- {
-- struct super_block *sb = dquot->dq_sb;
-+ struct dqhash *dqh = dquot->dq_dqh;
- int type = dquot->dq_type;
- dqbuf_t buf = getdqbuf();
- int ret = 0;
-@@ -489,7 +493,7 @@ static int remove_tree(struct dquot *dqu
-
- if (!buf)
- return -ENOMEM;
-- if ((ret = read_blk(sb, type, *blk, buf)) < 0) {
-+ if ((ret = read_blk(dqh, type, *blk, buf)) < 0) {
- printk(KERN_ERR "VFS: Can't read quota data block %u\n", *blk);
- goto out_buf;
- }
-@@ -506,11 +510,11 @@ static int remove_tree(struct dquot *dqu
- for (i = 0; i < V2_DQBLKSIZE && !buf[i]; i++); /* Block got empty? */
- /* Don't put the root block into the free block list */
- if (i == V2_DQBLKSIZE && *blk != V2_DQTREEOFF) {
-- put_free_dqblk(sb, type, buf, *blk);
-+ put_free_dqblk(dqh, type, buf, *blk);
- *blk = 0;
- }
- else
-- if ((ret = write_blk(sb, type, *blk, buf)) < 0)
-+ if ((ret = write_blk(dqh, type, *blk, buf)) < 0)
- printk(KERN_ERR "VFS: Can't write quota tree "
- "block %u.\n", *blk);
- }
-@@ -539,7 +543,7 @@ static loff_t find_block_dqentry(struct
-
- if (!buf)
- return -ENOMEM;
-- if ((ret = read_blk(dquot->dq_sb, dquot->dq_type, blk, buf)) < 0) {
-+ if ((ret = read_blk(dquot->dq_dqh, dquot->dq_type, blk, buf)) < 0) {
- printk(KERN_ERR "VFS: Can't read quota tree block %u.\n", blk);
- goto out_buf;
- }
-@@ -578,7 +582,7 @@ static loff_t find_tree_dqentry(struct d
-
- if (!buf)
- return -ENOMEM;
-- if ((ret = read_blk(dquot->dq_sb, dquot->dq_type, blk, buf)) < 0) {
-+ if ((ret = read_blk(dquot->dq_dqh, dquot->dq_type, blk, buf)) < 0) {
- printk(KERN_ERR "VFS: Can't read quota tree block %u.\n", blk);
- goto out_buf;
- }
-@@ -610,7 +614,7 @@ static int v2_read_dquot(struct dquot *d
-
- #ifdef __QUOTA_V2_PARANOIA
- /* Invalidated quota? */
-- if (!dquot->dq_sb || !sb_dqopt(dquot->dq_sb)->files[type]) {
-+ if (!dquot->dq_dqh || !dqh_dqopt(dquot->dq_dqh)->files[type]) {
- printk(KERN_ERR "VFS: Quota invalidated while reading!\n");
- return -EIO;
- }
-@@ -627,7 +631,7 @@ static int v2_read_dquot(struct dquot *d
- }
- else {
- dquot->dq_off = offset;
-- if ((ret = dquot->dq_sb->s_op->quota_read(dquot->dq_sb, type,
-+ if ((ret = dquot->dq_dqh->dqh_sb->s_op->quota_read(dquot->dq_dqh, type,
- (char *)&ddquot, sizeof(struct v2_disk_dqblk), offset))
- != sizeof(struct v2_disk_dqblk)) {
- if (ret >= 0)
-diff -NurpP --minimal linux-2.6.19.1/fs/read_write.c linux-2.6.19.1-vs2.3.0.6/fs/read_write.c
---- linux-2.6.19.1/fs/read_write.c 2006-11-30 21:19:28 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/read_write.c 2006-11-08 04:57:51 +0100
-@@ -703,12 +703,77 @@ sys_writev(unsigned long fd, const struc
- return ret;
- }
-
-+ssize_t vfs_sendfile(struct file *out_file, struct file *in_file, loff_t *ppos,
-+ size_t count, loff_t max)
++static inline int __task_is_init(struct task_struct *p,
++ const char *_file, int _line, void *_here)
+{
-+ struct inode * in_inode, * out_inode;
-+ loff_t pos;
-+ ssize_t ret;
++ int is_init = is_global_init(p);
+
-+ /* verify in_file */
-+ in_inode = in_file->f_dentry->d_inode;
-+ if (!in_inode)
-+ return -EINVAL;
-+ if (!in_file->f_op || !in_file->f_op->sendfile)
-+ return -EINVAL;
++ task_lock(p);
++ if (p->vx_info)
++ is_init = p->vx_info->vx_initpid == p->pid;
++ task_unlock(p);
++ return is_init;
++}
+
-+ if (!ppos)
-+ ppos = &in_file->f_pos;
-+ else
-+ if (!(in_file->f_mode & FMODE_PREAD))
-+ return -ESPIPE;
++extern void exit_vx_info(struct task_struct *, int);
++extern void exit_vx_info_early(struct task_struct *, int);
+
-+ ret = rw_verify_area(READ, in_file, ppos, count);
-+ if (ret < 0)
-+ return ret;
-+ count = ret;
+
-+ /* verify out_file */
-+ out_inode = out_file->f_dentry->d_inode;
-+ if (!out_inode)
-+ return -EINVAL;
-+ if (!out_file->f_op || !out_file->f_op->sendpage)
-+ return -EINVAL;
++#else
++#warning duplicate inclusion
++#endif
+diff -urNp -x '*.orig' linux-4.9/include/linux/vs_cowbl.h linux-4.9/include/linux/vs_cowbl.h
+--- linux-4.9/include/linux/vs_cowbl.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vs_cowbl.h 2021-02-24 15:47:45.094409658 +0100
+@@ -0,0 +1,48 @@
++#ifndef _VS_COWBL_H
++#define _VS_COWBL_H
+
-+ ret = rw_verify_area(WRITE, out_file, &out_file->f_pos, count);
-+ if (ret < 0)
-+ return ret;
-+ count = ret;
++#include <linux/fs.h>
++#include <linux/dcache.h>
++#include <linux/namei.h>
++#include <linux/slab.h>
+
-+ ret = security_file_permission (out_file, MAY_WRITE);
-+ if (ret)
-+ return ret;
++extern struct dentry *cow_break_link(const char *pathname);
+
-+ if (!max)
-+ max = min(in_inode->i_sb->s_maxbytes, out_inode->i_sb->s_maxbytes);
++static inline int cow_check_and_break(struct path *path)
++{
++ struct inode *inode = path->dentry->d_inode;
++ int error = 0;
+
-+ pos = *ppos;
-+ if (unlikely(pos < 0))
-+ return -EINVAL;
-+ if (unlikely(pos + count > max)) {
-+ if (pos >= max)
-+ return -EOVERFLOW;
-+ count = max - pos;
-+ }
++ /* do we need this check? */
++ if (IS_RDONLY(inode))
++ return -EROFS;
+
-+ ret = in_file->f_op->sendfile(in_file, ppos, count, file_send_actor, out_file);
++ if (IS_COW(inode)) {
++ if (IS_COW_LINK(inode)) {
++ struct dentry *new_dentry, *old_dentry = path->dentry;
++ char *pp, *buf;
+
-+ if (ret > 0) {
-+ current->rchar += ret;
-+ current->wchar += ret;
++ buf = kmalloc(PATH_MAX, GFP_KERNEL);
++ if (!buf) {
++ return -ENOMEM;
++ }
++ pp = d_path(path, buf, PATH_MAX);
++ new_dentry = cow_break_link(pp);
++ kfree(buf);
++ if (!IS_ERR(new_dentry)) {
++ path->dentry = new_dentry;
++ dput(old_dentry);
++ } else
++ error = PTR_ERR(new_dentry);
++ } else {
++ inode->i_flags &= ~(S_IXUNLINK | S_IMMUTABLE);
++ inode->i_ctime = CURRENT_TIME;
++ mark_inode_dirty(inode);
++ }
+ }
-+
-+ if (*ppos > max)
-+ return -EOVERFLOW;
-+ return ret;
++ return error;
+}
+
-+EXPORT_SYMBOL(vfs_sendfile);
++#else
++#warning duplicate inclusion
++#endif
+diff -urNp -x '*.orig' linux-4.9/include/linux/vs_cvirt.h linux-4.9/include/linux/vs_cvirt.h
+--- linux-4.9/include/linux/vs_cvirt.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vs_cvirt.h 2021-02-24 15:47:45.094409658 +0100
+@@ -0,0 +1,50 @@
++#ifndef _VS_CVIRT_H
++#define _VS_CVIRT_H
+
- static ssize_t do_sendfile(int out_fd, int in_fd, loff_t *ppos,
- size_t count, loff_t max)
- {
- struct file * in_file, * out_file;
-- struct inode * in_inode, * out_inode;
-- loff_t pos;
- ssize_t retval;
- int fput_needed_in, fput_needed_out;
-
-@@ -721,22 +786,6 @@ static ssize_t do_sendfile(int out_fd, i
- goto out;
- if (!(in_file->f_mode & FMODE_READ))
- goto fput_in;
-- retval = -EINVAL;
-- in_inode = in_file->f_dentry->d_inode;
-- if (!in_inode)
-- goto fput_in;
-- if (!in_file->f_op || !in_file->f_op->sendfile)
-- goto fput_in;
-- retval = -ESPIPE;
-- if (!ppos)
-- ppos = &in_file->f_pos;
-- else
-- if (!(in_file->f_mode & FMODE_PREAD))
-- goto fput_in;
-- retval = rw_verify_area(READ, in_file, ppos, count);
-- if (retval < 0)
-- goto fput_in;
-- count = retval;
-
- retval = security_file_permission (in_file, MAY_READ);
- if (retval)
-@@ -751,45 +800,12 @@ static ssize_t do_sendfile(int out_fd, i
- goto fput_in;
- if (!(out_file->f_mode & FMODE_WRITE))
- goto fput_out;
-- retval = -EINVAL;
-- if (!out_file->f_op || !out_file->f_op->sendpage)
-- goto fput_out;
-- out_inode = out_file->f_dentry->d_inode;
-- retval = rw_verify_area(WRITE, out_file, &out_file->f_pos, count);
-- if (retval < 0)
-- goto fput_out;
-- count = retval;
--
-- retval = security_file_permission (out_file, MAY_WRITE);
-- if (retval)
-- goto fput_out;
--
-- if (!max)
-- max = min(in_inode->i_sb->s_maxbytes, out_inode->i_sb->s_maxbytes);
--
-- pos = *ppos;
-- retval = -EINVAL;
-- if (unlikely(pos < 0))
-- goto fput_out;
-- if (unlikely(pos + count > max)) {
-- retval = -EOVERFLOW;
-- if (pos >= max)
-- goto fput_out;
-- count = max - pos;
-- }
-
-- retval = in_file->f_op->sendfile(in_file, ppos, count, file_send_actor, out_file);
-+ retval = vfs_sendfile(out_file, in_file, ppos, count, max);
-
-- if (retval > 0) {
-- current->rchar += retval;
-- current->wchar += retval;
-- }
- current->syscr++;
- current->syscw++;
-
-- if (*ppos > max)
-- retval = -EOVERFLOW;
--
- fput_out:
- fput_light(out_file, fput_needed_out);
- fput_in:
-diff -NurpP --minimal linux-2.6.19.1/fs/reiserfs/bitmap.c linux-2.6.19.1-vs2.3.0.6/fs/reiserfs/bitmap.c
---- linux-2.6.19.1/fs/reiserfs/bitmap.c 2006-11-30 21:19:28 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/reiserfs/bitmap.c 2006-11-08 04:57:50 +0100
-@@ -13,6 +13,7 @@
- #include <linux/reiserfs_fs_sb.h>
- #include <linux/reiserfs_fs_i.h>
- #include <linux/quotaops.h>
-+#include <linux/vs_dlimit.h>
-
- #define PREALLOCATION_SIZE 9
-
-@@ -425,8 +426,10 @@ static void _reiserfs_free_block(struct
- set_sb_free_blocks(rs, sb_free_blocks(rs) + 1);
-
- journal_mark_dirty(th, s, sbh);
-- if (for_unformatted)
-+ if (for_unformatted) {
-+ DLIMIT_FREE_BLOCK(inode, 1);
- DQUOT_FREE_BLOCK_NODIRTY(inode, 1);
-+ }
- }
-
- void reiserfs_free_block(struct reiserfs_transaction_handle *th,
-@@ -1034,6 +1037,7 @@ static inline int blocknrs_and_prealloc_
- b_blocknr_t finish = SB_BLOCK_COUNT(s) - 1;
- int passno = 0;
- int nr_allocated = 0;
-+ int blocks;
-
- determine_prealloc_size(hint);
- if (!hint->formatted_node) {
-@@ -1043,19 +1047,30 @@ static inline int blocknrs_and_prealloc_
- "reiserquota: allocating %d blocks id=%u",
- amount_needed, hint->inode->i_uid);
- #endif
-- quota_ret =
-- DQUOT_ALLOC_BLOCK_NODIRTY(hint->inode, amount_needed);
-- if (quota_ret) /* Quota exceeded? */
-+ quota_ret = DQUOT_ALLOC_BLOCK_NODIRTY(hint->inode,
-+ amount_needed);
-+ if (quota_ret)
- return QUOTA_EXCEEDED;
-+ if (DLIMIT_ALLOC_BLOCK(hint->inode, amount_needed)) {
-+ DQUOT_FREE_BLOCK_NODIRTY(hint->inode,
-+ amount_needed);
-+ return NO_DISK_SPACE;
-+ }
++#include "vserver/cvirt.h"
++#include "vserver/context.h"
++#include "vserver/base.h"
++#include "vserver/check.h"
++#include "vserver/debug.h"
+
- if (hint->preallocate && hint->prealloc_size) {
- #ifdef REISERQUOTA_DEBUG
- reiserfs_debug(s, REISERFS_DEBUG_CODE,
- "reiserquota: allocating (prealloc) %d blocks id=%u",
- hint->prealloc_size, hint->inode->i_uid);
- #endif
-- quota_ret =
-- DQUOT_PREALLOC_BLOCK_NODIRTY(hint->inode,
-- hint->prealloc_size);
-+ quota_ret = DQUOT_PREALLOC_BLOCK_NODIRTY(hint->inode,
-+ hint->prealloc_size);
-+ if (!quota_ret &&
-+ DLIMIT_ALLOC_BLOCK(hint->inode, hint->prealloc_size)) {
-+ DQUOT_FREE_BLOCK_NODIRTY(hint->inode,
-+ hint->prealloc_size);
-+ quota_ret = 1;
-+ }
- if (quota_ret)
- hint->preallocate = hint->prealloc_size = 0;
- }
-@@ -1087,7 +1102,10 @@ static inline int blocknrs_and_prealloc_
- nr_allocated,
- hint->inode->i_uid);
- #endif
-- DQUOT_FREE_BLOCK_NODIRTY(hint->inode, amount_needed + hint->prealloc_size - nr_allocated); /* Free not allocated blocks */
-+ /* Free not allocated blocks */
-+ blocks = amount_needed + hint->prealloc_size - nr_allocated;
-+ DLIMIT_FREE_BLOCK(hint->inode, blocks);
-+ DQUOT_FREE_BLOCK_NODIRTY(hint->inode, blocks);
- }
- while (nr_allocated--)
- reiserfs_free_block(hint->th, hint->inode,
-@@ -1118,10 +1136,10 @@ static inline int blocknrs_and_prealloc_
- REISERFS_I(hint->inode)->i_prealloc_count,
- hint->inode->i_uid);
- #endif
-- DQUOT_FREE_BLOCK_NODIRTY(hint->inode, amount_needed +
-- hint->prealloc_size - nr_allocated -
-- REISERFS_I(hint->inode)->
-- i_prealloc_count);
-+ blocks = amount_needed + hint->prealloc_size - nr_allocated -
-+ REISERFS_I(hint->inode)->i_prealloc_count;
-+ DLIMIT_FREE_BLOCK(hint->inode, blocks);
-+ DQUOT_FREE_BLOCK_NODIRTY(hint->inode, blocks);
- }
-
- return CARRY_ON;
-diff -NurpP --minimal linux-2.6.19.1/fs/reiserfs/file.c linux-2.6.19.1-vs2.3.0.6/fs/reiserfs/file.c
---- linux-2.6.19.1/fs/reiserfs/file.c 2006-11-30 21:19:28 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/reiserfs/file.c 2006-11-30 20:55:45 +0100
-@@ -1575,6 +1575,7 @@ const struct file_operations reiserfs_fi
- .release = reiserfs_file_release,
- .fsync = reiserfs_sync_file,
- .sendfile = generic_file_sendfile,
-+ .sendpage = generic_file_sendpage,
- .aio_read = generic_file_aio_read,
- .aio_write = generic_file_aio_write,
- .splice_read = generic_file_splice_read,
-@@ -1589,4 +1590,5 @@ struct inode_operations reiserfs_file_in
- .listxattr = reiserfs_listxattr,
- .removexattr = reiserfs_removexattr,
- .permission = reiserfs_permission,
-+ .sync_flags = reiserfs_sync_flags,
- };
-diff -NurpP --minimal linux-2.6.19.1/fs/reiserfs/inode.c linux-2.6.19.1-vs2.3.0.6/fs/reiserfs/inode.c
---- linux-2.6.19.1/fs/reiserfs/inode.c 2006-11-30 21:19:28 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/reiserfs/inode.c 2006-11-30 18:53:18 +0100
-@@ -16,6 +16,8 @@
- #include <linux/mpage.h>
- #include <linux/writeback.h>
- #include <linux/quotaops.h>
-+#include <linux/vs_dlimit.h>
-+#include <linux/vs_tag.h>
-
- static int reiserfs_commit_write(struct file *f, struct page *page,
- unsigned from, unsigned to);
-@@ -50,6 +52,7 @@ void reiserfs_delete_inode(struct inode
- * stat data deletion */
- if (!err)
- DQUOT_FREE_INODE(inode);
-+ DLIMIT_FREE_INODE(inode);
-
- if (journal_end(&th, inode->i_sb, jbegin_count))
- goto out;
-@@ -1114,6 +1117,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);
-@@ -1136,12 +1141,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);
-@@ -1183,11 +1189,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);
-@@ -1217,6 +1224,10 @@ static void init_inode(struct inode *ino
- sd_attrs_to_i_attrs(sd_v2_attrs(sd), inode);
- }
-
-+ 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;
-@@ -1239,13 +1250,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);
-@@ -1776,6 +1789,10 @@ int reiserfs_new_inode(struct reiserfs_t
-
- BUG_ON(!th->t_trans_id);
-
-+ if (DLIMIT_ALLOC_INODE(inode)) {
-+ err = -ENOSPC;
-+ goto out_bad_dlimit;
-+ }
- if (DQUOT_ALLOC_INODE(inode)) {
- err = -EDQUOT;
- goto out_end_trans;
-@@ -1960,6 +1977,9 @@ int reiserfs_new_inode(struct reiserfs_t
- DQUOT_FREE_INODE(inode);
-
- out_end_trans:
-+ DLIMIT_FREE_INODE(inode);
-+
-+ out_bad_dlimit:
- journal_end(th, th->t_super, th->t_blocks_allocated);
- /* Drop can be outside and it needs more credits so it's better to have it outside */
- DQUOT_DROP(inode);
-@@ -2699,6 +2719,14 @@ void sd_attrs_to_i_attrs(__u16 sd_attrs,
- inode->i_flags |= S_IMMUTABLE;
- else
- inode->i_flags &= ~S_IMMUTABLE;
-+ if (sd_attrs & REISERFS_IUNLINK_FL)
-+ inode->i_flags |= S_IUNLINK;
-+ else
-+ inode->i_flags &= ~S_IUNLINK;
-+ if (sd_attrs & REISERFS_BARRIER_FL)
-+ inode->i_flags |= S_BARRIER;
-+ else
-+ inode->i_flags &= ~S_BARRIER;
- if (sd_attrs & REISERFS_APPEND_FL)
- inode->i_flags |= S_APPEND;
- else
-@@ -2721,6 +2749,14 @@ 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_IUNLINK)
-+ *sd_attrs |= REISERFS_IUNLINK_FL;
-+ else
-+ *sd_attrs &= ~REISERFS_IUNLINK_FL;
-+ if (inode->i_flags & S_BARRIER)
-+ *sd_attrs |= REISERFS_BARRIER_FL;
-+ else
-+ *sd_attrs &= ~REISERFS_BARRIER_FL;
- if (inode->i_flags & S_SYNC)
- *sd_attrs |= REISERFS_SYNC_FL;
- else
-@@ -2900,6 +2936,22 @@ static ssize_t reiserfs_direct_IO(int rw
- reiserfs_get_blocks_direct_io, NULL);
- }
-
-+int reiserfs_sync_flags(struct inode *inode)
++static inline void vx_activate_task(struct task_struct *p)
+{
-+ u16 oldflags, newflags;
++ struct vx_info *vxi;
+
-+ oldflags = REISERFS_I(inode)->i_attrs;
-+ newflags = oldflags;
-+ i_attrs_to_sd_attrs(inode, &newflags);
++ if ((vxi = p->vx_info)) {
++ vx_update_load(vxi);
++ atomic_inc(&vxi->cvirt.nr_running);
++ }
++}
+
-+ if (oldflags ^ newflags) {
-+ REISERFS_I(inode)->i_attrs = newflags;
-+ inode->i_ctime = CURRENT_TIME_SEC;
-+ mark_inode_dirty(inode);
++static inline void vx_deactivate_task(struct task_struct *p)
++{
++ struct vx_info *vxi;
++
++ if ((vxi = p->vx_info)) {
++ vx_update_load(vxi);
++ atomic_dec(&vxi->cvirt.nr_running);
+ }
-+ return 0;
+}
+
- int reiserfs_setattr(struct dentry *dentry, struct iattr *attr)
- {
- struct inode *inode = dentry->d_inode;
-@@ -2949,9 +3001,11 @@ int reiserfs_setattr(struct dentry *dent
- }
-
- error = inode_change_ok(inode, attr);
++static inline void vx_uninterruptible_inc(struct task_struct *p)
++{
++ struct vx_info *vxi;
+
- if (!error) {
- 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)) {
- error = reiserfs_chown_xattrs(inode, attr);
-
- if (!error) {
-@@ -2981,6 +3035,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);
-diff -NurpP --minimal linux-2.6.19.1/fs/reiserfs/ioctl.c linux-2.6.19.1-vs2.3.0.6/fs/reiserfs/ioctl.c
---- linux-2.6.19.1/fs/reiserfs/ioctl.c 2006-11-30 21:19:28 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/reiserfs/ioctl.c 2006-11-08 04:57:52 +0100
-@@ -4,6 +4,7 @@
-
- #include <linux/capability.h>
- #include <linux/fs.h>
-+#include <linux/mount.h>
- #include <linux/reiserfs_fs.h>
- #include <linux/time.h>
- #include <asm/uaccess.h>
-@@ -24,7 +25,7 @@ static int reiserfs_unpack(struct inode
- int reiserfs_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
- unsigned long arg)
- {
-- unsigned int flags;
-+ unsigned int flags, oldflags;
-
- switch (cmd) {
- case REISERFS_IOC_UNPACK:
-@@ -43,12 +44,14 @@ int reiserfs_ioctl(struct inode *inode,
-
- flags = REISERFS_I(inode)->i_attrs;
- i_attrs_to_sd_attrs(inode, (__u16 *) & flags);
-+ flags &= REISERFS_FL_USER_VISIBLE;
- return put_user(flags, (int __user *)arg);
- case REISERFS_IOC_SETFLAGS:{
- if (!reiserfs_attrs(inode->i_sb))
- return -ENOTTY;
-
-- if (IS_RDONLY(inode))
-+ if (IS_RDONLY(inode) ||
-+ (filp && MNT_IS_RDONLY(filp->f_vfsmnt)))
- return -EROFS;
-
- if ((current->fsuid != inode->i_uid)
-@@ -58,10 +61,12 @@ int reiserfs_ioctl(struct inode *inode,
- if (get_user(flags, (int __user *)arg))
- return -EFAULT;
-
-- if (((flags ^ REISERFS_I(inode)->
-- i_attrs) & (REISERFS_IMMUTABLE_FL |
-- REISERFS_APPEND_FL))
-- && !capable(CAP_LINUX_IMMUTABLE))
-+ oldflags = REISERFS_I(inode) -> i_attrs;
-+ if (((oldflags & REISERFS_IMMUTABLE_FL) ||
-+ ((flags ^ oldflags) &
-+ (REISERFS_IMMUTABLE_FL | REISERFS_IUNLINK_FL |
-+ REISERFS_APPEND_FL))) &&
-+ !capable(CAP_LINUX_IMMUTABLE))
- return -EPERM;
-
- if ((flags & REISERFS_NOTAIL_FL) &&
-@@ -72,6 +77,9 @@ int reiserfs_ioctl(struct inode *inode,
- if (result)
- return result;
- }
++ if ((vxi = p->vx_info))
++ atomic_inc(&vxi->cvirt.nr_uninterruptible);
++}
+
-+ flags = 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;
-@@ -83,7 +91,8 @@ int reiserfs_ioctl(struct inode *inode,
- case REISERFS_IOC_SETVERSION:
- if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
- return -EPERM;
-- if (IS_RDONLY(inode))
-+ if (IS_RDONLY(inode) ||
-+ (filp && MNT_IS_RDONLY(filp->f_vfsmnt)))
- return -EROFS;
- if (get_user(inode->i_generation, (int __user *)arg))
- return -EFAULT;
-diff -NurpP --minimal linux-2.6.19.1/fs/reiserfs/namei.c linux-2.6.19.1-vs2.3.0.6/fs/reiserfs/namei.c
---- linux-2.6.19.1/fs/reiserfs/namei.c 2006-11-30 21:19:28 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/reiserfs/namei.c 2006-11-08 04:57:47 +0100
-@@ -18,6 +18,7 @@
- #include <linux/reiserfs_xattr.h>
- #include <linux/smp_lock.h>
- #include <linux/quotaops.h>
-+#include <linux/vs_tag.h>
-
- #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);
-@@ -361,6 +362,7 @@ static struct dentry *reiserfs_lookup(st
- reiserfs_write_unlock(dir->i_sb);
- return ERR_PTR(-EACCES);
- }
-+ dx_propagate_tag(nd, inode);
-
- /* Propogate the priv_object flag so we know we're in the priv tree */
- if (is_reiserfs_priv_object(dir))
-@@ -596,6 +598,7 @@ static int new_inode_init(struct inode *
- } else {
- inode->i_gid = current->fsgid;
- }
-+ inode->i_tag = dx_current_fstag(inode->i_sb);
- DQUOT_INIT(inode);
- return 0;
- }
-@@ -1542,6 +1545,7 @@ struct inode_operations reiserfs_dir_ino
- .listxattr = reiserfs_listxattr,
- .removexattr = reiserfs_removexattr,
- .permission = reiserfs_permission,
-+ .sync_flags = reiserfs_sync_flags,
- };
-
- /*
-@@ -1558,6 +1562,7 @@ struct inode_operations reiserfs_symlink
- .listxattr = reiserfs_listxattr,
- .removexattr = reiserfs_removexattr,
- .permission = reiserfs_permission,
-+ .sync_flags = reiserfs_sync_flags,
-
- };
-
-@@ -1571,5 +1576,6 @@ struct inode_operations reiserfs_special
- .listxattr = reiserfs_listxattr,
- .removexattr = reiserfs_removexattr,
- .permission = reiserfs_permission,
-+ .sync_flags = reiserfs_sync_flags,
-
- };
-diff -NurpP --minimal linux-2.6.19.1/fs/reiserfs/stree.c linux-2.6.19.1-vs2.3.0.6/fs/reiserfs/stree.c
---- linux-2.6.19.1/fs/reiserfs/stree.c 2006-11-30 21:19:28 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/reiserfs/stree.c 2006-11-08 04:57:50 +0100
-@@ -56,6 +56,7 @@
- #include <linux/smp_lock.h>
- #include <linux/buffer_head.h>
- #include <linux/quotaops.h>
-+#include <linux/vs_dlimit.h>
-
- /* Does the buffer contain a disk block which is in the tree. */
- inline int B_IS_IN_TREE(const struct buffer_head *p_s_bh)
-@@ -1297,6 +1298,7 @@ int reiserfs_delete_item(struct reiserfs
- "reiserquota delete_item(): freeing %u, id=%u type=%c",
- quota_cut_bytes, p_s_inode->i_uid, head2type(&s_ih));
- #endif
-+ DLIMIT_FREE_SPACE(p_s_inode, quota_cut_bytes);
- DQUOT_FREE_SPACE_NODIRTY(p_s_inode, quota_cut_bytes);
-
- /* Return deleted body length */
-@@ -1385,6 +1387,7 @@ void reiserfs_delete_solid_item(struct r
- #endif
- DQUOT_FREE_SPACE_NODIRTY(inode,
- quota_cut_bytes);
-+ DLIMIT_FREE_SPACE(inode, quota_cut_bytes);
- }
- break;
- }
-@@ -1738,6 +1741,7 @@ int reiserfs_cut_from_item(struct reiser
- "reiserquota cut_from_item(): freeing %u id=%u type=%c",
- quota_cut_bytes, p_s_inode->i_uid, '?');
- #endif
-+ DLIMIT_FREE_SPACE(p_s_inode, quota_cut_bytes);
- DQUOT_FREE_SPACE_NODIRTY(p_s_inode, quota_cut_bytes);
- return n_ret_value;
- }
-@@ -1979,6 +1983,11 @@ int reiserfs_paste_into_item(struct reis
- pathrelse(p_s_search_path);
- return -EDQUOT;
- }
-+ if (DLIMIT_ALLOC_SPACE(inode, n_pasted_size)) {
-+ DQUOT_FREE_SPACE_NODIRTY(inode, n_pasted_size);
-+ pathrelse(p_s_search_path);
-+ return -ENOSPC;
-+ }
- init_tb_struct(th, &s_paste_balance, th->t_super, p_s_search_path,
- n_pasted_size);
- #ifdef DISPLACE_NEW_PACKING_LOCALITIES
-@@ -2031,6 +2040,7 @@ int reiserfs_paste_into_item(struct reis
- n_pasted_size, inode->i_uid,
- key2type(&(p_s_key->on_disk_key)));
- #endif
-+ DLIMIT_FREE_SPACE(inode, n_pasted_size);
- DQUOT_FREE_SPACE_NODIRTY(inode, n_pasted_size);
- return retval;
- }
-@@ -2068,6 +2078,11 @@ int reiserfs_insert_item(struct reiserfs
- pathrelse(p_s_path);
- return -EDQUOT;
- }
-+ if (DLIMIT_ALLOC_SPACE(inode, quota_bytes)) {
-+ DQUOT_FREE_SPACE_NODIRTY(inode, quota_bytes);
-+ pathrelse(p_s_path);
-+ return -ENOSPC;
-+ }
- }
- init_tb_struct(th, &s_ins_balance, th->t_super, p_s_path,
- IH_SIZE + ih_item_len(p_s_ih));
-@@ -2115,7 +2130,9 @@ int reiserfs_insert_item(struct reiserfs
- "reiserquota insert_item(): freeing %u id=%u type=%c",
- quota_bytes, inode->i_uid, head2type(p_s_ih));
- #endif
-- if (inode)
-+ if (inode) {
-+ DLIMIT_FREE_SPACE(inode, quota_bytes);
- DQUOT_FREE_SPACE_NODIRTY(inode, quota_bytes);
-+ }
- return retval;
- }
-diff -NurpP --minimal linux-2.6.19.1/fs/reiserfs/super.c linux-2.6.19.1-vs2.3.0.6/fs/reiserfs/super.c
---- linux-2.6.19.1/fs/reiserfs/super.c 2006-11-30 21:19:28 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/reiserfs/super.c 2006-11-08 21:52:09 +0100
-@@ -137,7 +137,7 @@ static int remove_save_link_only(struct
- }
-
- #ifdef CONFIG_QUOTA
--static int reiserfs_quota_on_mount(struct super_block *, int);
-+static int reiserfs_quota_on_mount(struct dqhash *, int);
- #endif
-
- /* look for uncompleted unlinks and truncates and complete them */
-@@ -177,7 +177,7 @@ static int finish_unfinished(struct supe
- /* Turn on quotas so that they are updated correctly */
- for (i = 0; i < MAXQUOTAS; i++) {
- if (REISERFS_SB(s)->s_qf_names[i]) {
-- int ret = reiserfs_quota_on_mount(s, i);
-+ int ret = reiserfs_quota_on_mount(s->s_dqh, i);
- if (ret < 0)
- reiserfs_warning(s,
- "reiserfs: cannot turn on journalled quota: error %d",
-@@ -291,8 +291,8 @@ static int finish_unfinished(struct supe
- #ifdef CONFIG_QUOTA
- /* Turn quotas off */
- for (i = 0; i < MAXQUOTAS; i++) {
-- if (sb_dqopt(s)->files[i])
-- vfs_quota_off_mount(s, i);
-+ if (dqh_dqopt(s->s_dqh)->files[i])
-+ vfs_quota_off_mount(s->s_dqh, i);
- }
- if (ms_active_set)
- /* Restore the flag back */
-@@ -587,9 +587,9 @@ static void reiserfs_clear_inode(struct
- #endif
-
- #ifdef CONFIG_QUOTA
--static ssize_t reiserfs_quota_write(struct super_block *, int, const char *,
-+static ssize_t reiserfs_quota_write(struct dqhash *, int, const char *,
- size_t, loff_t);
--static ssize_t reiserfs_quota_read(struct super_block *, int, char *, size_t,
-+static ssize_t reiserfs_quota_read(struct dqhash *, int, char *, size_t,
- loff_t);
- #endif
-
-@@ -622,8 +622,8 @@ static int reiserfs_write_dquot(struct d
- static int reiserfs_acquire_dquot(struct dquot *);
- static int reiserfs_release_dquot(struct dquot *);
- static int reiserfs_mark_dquot_dirty(struct dquot *);
--static int reiserfs_write_info(struct super_block *, int);
--static int reiserfs_quota_on(struct super_block *, int, int, char *);
-+static int reiserfs_write_info(struct dqhash *, int);
-+static int reiserfs_quota_on(struct dqhash *, int, int, char *);
-
- static struct dquot_operations reiserfs_quota_operations = {
- .initialize = reiserfs_dquot_initialize,
-@@ -885,6 +885,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},
++static inline void vx_uninterruptible_dec(struct task_struct *p)
++{
++ struct vx_info *vxi;
++
++ if ((vxi = p->vx_info))
++ atomic_dec(&vxi->cvirt.nr_uninterruptible);
++}
++
++
++#else
++#warning duplicate inclusion
+#endif
-+#ifdef CONFIG_PROPAGATE
-+ {"tag",.arg_required = 'T',.values = NULL},
+diff -urNp -x '*.orig' linux-4.9/include/linux/vs_device.h linux-4.9/include/linux/vs_device.h
+--- linux-4.9/include/linux/vs_device.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vs_device.h 2021-02-24 15:47:45.094409658 +0100
+@@ -0,0 +1,45 @@
++#ifndef _VS_DEVICE_H
++#define _VS_DEVICE_H
++
++#include "vserver/base.h"
++#include "vserver/device.h"
++#include "vserver/debug.h"
++
++
++#ifdef CONFIG_VSERVER_DEVICE
++
++int vs_map_device(struct vx_info *, dev_t, dev_t *, umode_t);
++
++#define vs_device_perm(v, d, m, p) \
++ ((vs_map_device(current_vx_info(), d, NULL, m) & (p)) == (p))
++
++#else
++
++static inline
++int vs_map_device(struct vx_info *vxi,
++ dev_t device, dev_t *target, umode_t mode)
++{
++ if (target)
++ *target = device;
++ return ~0;
++}
++
++#define vs_device_perm(v, d, m, p) ((p) == (p))
++
+#endif
- #ifdef CONFIG_REISERFS_FS_POSIX_ACL
- {"acl",.setmask = 1 << REISERFS_POSIXACL},
- {"noacl",.clrmask = 1 << REISERFS_POSIXACL},
-@@ -981,7 +989,7 @@ static int reiserfs_parse_options(struct
- if (c == 'u' || c == 'g') {
- int qtype = c == 'u' ? USRQUOTA : GRPQUOTA;
-
-- if (sb_any_quota_enabled(s)) {
-+ if (dqh_any_quota_enabled(s->s_dqh)) {
- reiserfs_warning(s,
- "reiserfs_parse_options: cannot change journalled quota options when quota turned on.");
- return 0;
-@@ -1044,7 +1052,7 @@ static int reiserfs_parse_options(struct
- }
- /* This checking is not precise wrt the quota type but for our purposes it is sufficient */
- if (!(*mount_options & (1 << REISERFS_QUOTA))
-- && sb_any_quota_enabled(s)) {
-+ && dqh_any_quota_enabled(s->s_dqh)) {
- reiserfs_warning(s,
- "reiserfs_parse_options: quota options must be present when quota is turned on.");
- return 0;
-@@ -1146,6 +1154,12 @@ static int reiserfs_remount(struct super
- return -EINVAL;
- }
-
-+ if ((mount_options & (1 << REISERFS_TAGGED)) &&
-+ !(s->s_flags & MS_TAGGED)) {
-+ reiserfs_warning(s, "reiserfs: tagging not permitted on remount.");
-+ return -EINVAL;
-+ }
+
- handle_attrs(s);
-
- /* Add options that are safe here */
-@@ -1336,7 +1350,7 @@ static int read_super_block(struct super
- s->s_export_op = &reiserfs_export_ops;
- #ifdef CONFIG_QUOTA
- s->s_qcop = &reiserfs_qctl_operations;
-- s->dq_op = &reiserfs_quota_operations;
-+ s->s_qop = &reiserfs_quota_operations;
- #endif
-
- /* new format is limited by the 32 bit wide i_blocks field, want to
-@@ -1594,6 +1608,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,
-@@ -1869,16 +1887,16 @@ static int reiserfs_write_dquot(struct d
- struct reiserfs_transaction_handle th;
- int ret, err;
-
-- reiserfs_write_lock(dquot->dq_sb);
-+ reiserfs_write_lock(dquot->dq_dqh->dqh_sb);
- ret =
-- journal_begin(&th, dquot->dq_sb,
-- REISERFS_QUOTA_TRANS_BLOCKS(dquot->dq_sb));
-+ journal_begin(&th, dquot->dq_dqh->dqh_sb,
-+ REISERFS_QUOTA_TRANS_BLOCKS(dquot->dq_dqh->dqh_sb));
- if (ret)
- goto out;
- ret = dquot_commit(dquot);
- err =
-- journal_end(&th, dquot->dq_sb,
-- REISERFS_QUOTA_TRANS_BLOCKS(dquot->dq_sb));
-+ journal_end(&th, dquot->dq_dqh->dqh_sb,
-+ REISERFS_QUOTA_TRANS_BLOCKS(dquot->dq_dqh->dqh_sb));
- if (!ret && err)
- ret = err;
- out:
-@@ -1891,20 +1909,20 @@ static int reiserfs_acquire_dquot(struct
- struct reiserfs_transaction_handle th;
- int ret, err;
-
-- reiserfs_write_lock(dquot->dq_sb);
-+ reiserfs_write_lock(dquot->dq_dqh->dqh_sb);
- ret =
-- journal_begin(&th, dquot->dq_sb,
-- REISERFS_QUOTA_INIT_BLOCKS(dquot->dq_sb));
-+ journal_begin(&th, dquot->dq_dqh->dqh_sb,
-+ REISERFS_QUOTA_INIT_BLOCKS(dquot->dq_dqh->dqh_sb));
- if (ret)
- goto out;
- ret = dquot_acquire(dquot);
- err =
-- journal_end(&th, dquot->dq_sb,
-- REISERFS_QUOTA_INIT_BLOCKS(dquot->dq_sb));
-+ journal_end(&th, dquot->dq_dqh->dqh_sb,
-+ REISERFS_QUOTA_INIT_BLOCKS(dquot->dq_dqh->dqh_sb));
- if (!ret && err)
- ret = err;
- out:
-- reiserfs_write_unlock(dquot->dq_sb);
-+ reiserfs_write_unlock(dquot->dq_dqh->dqh_sb);
- return ret;
- }
-
-@@ -1913,37 +1931,38 @@ static int reiserfs_release_dquot(struct
- struct reiserfs_transaction_handle th;
- int ret, err;
-
-- reiserfs_write_lock(dquot->dq_sb);
-+ reiserfs_write_lock(dquot->dq_dqh->dqh_sb);
- ret =
-- journal_begin(&th, dquot->dq_sb,
-- REISERFS_QUOTA_DEL_BLOCKS(dquot->dq_sb));
-+ journal_begin(&th, dquot->dq_dqh->dqh_sb,
-+ REISERFS_QUOTA_DEL_BLOCKS(dquot->dq_dqh->dqh_sb));
- if (ret)
- goto out;
- ret = dquot_release(dquot);
- err =
-- journal_end(&th, dquot->dq_sb,
-- REISERFS_QUOTA_DEL_BLOCKS(dquot->dq_sb));
-+ journal_end(&th, dquot->dq_dqh->dqh_sb,
-+ REISERFS_QUOTA_DEL_BLOCKS(dquot->dq_dqh->dqh_sb));
- if (!ret && err)
- ret = err;
- out:
-- reiserfs_write_unlock(dquot->dq_sb);
-+ reiserfs_write_unlock(dquot->dq_dqh->dqh_sb);
- return ret;
- }
-
- static int reiserfs_mark_dquot_dirty(struct dquot *dquot)
- {
- /* Are we journalling quotas? */
-- if (REISERFS_SB(dquot->dq_sb)->s_qf_names[USRQUOTA] ||
-- REISERFS_SB(dquot->dq_sb)->s_qf_names[GRPQUOTA]) {
-+ if (REISERFS_SB(dquot->dq_dqh->dqh_sb)->s_qf_names[USRQUOTA] ||
-+ REISERFS_SB(dquot->dq_dqh->dqh_sb)->s_qf_names[GRPQUOTA]) {
- dquot_mark_dquot_dirty(dquot);
- return reiserfs_write_dquot(dquot);
- } else
- return dquot_mark_dquot_dirty(dquot);
- }
-
--static int reiserfs_write_info(struct super_block *sb, int type)
-+static int reiserfs_write_info(struct dqhash *hash, int type)
- {
- struct reiserfs_transaction_handle th;
-+ struct super_block *sb = hash->dqh_sb;
- int ret, err;
-
- /* Data block + inode block */
-@@ -1951,7 +1970,7 @@ static int reiserfs_write_info(struct su
- ret = journal_begin(&th, sb, 2);
- if (ret)
- goto out;
-- ret = dquot_commit_info(sb, type);
-+ ret = dquot_commit_info(hash, type);
- err = journal_end(&th, sb, 2);
- if (!ret && err)
- ret = err;
-@@ -1963,18 +1982,21 @@ static int reiserfs_write_info(struct su
- /*
- * Turn on quotas during mount time - we need to find the quota file and such...
- */
--static int reiserfs_quota_on_mount(struct super_block *sb, int type)
-+static int reiserfs_quota_on_mount(struct dqhash *hash, int type)
- {
-- return vfs_quota_on_mount(sb, REISERFS_SB(sb)->s_qf_names[type],
-+ struct super_block *sb = hash->dqh_sb;
+
-+ return vfs_quota_on_mount(hash, REISERFS_SB(sb)->s_qf_names[type],
- REISERFS_SB(sb)->s_jquota_fmt, type);
- }
-
- /*
- * Standard function to be called on quota_on
- */
--static int reiserfs_quota_on(struct super_block *sb, int type, int format_id,
-+static int reiserfs_quota_on(struct dqhash *hash, int type, int format_id,
- char *path)
- {
-+ struct super_block *sb = hash->dqh_sb;
- int err;
- struct nameidata nd;
-
-@@ -1999,7 +2021,7 @@ static int reiserfs_quota_on(struct supe
- if (!REISERFS_SB(sb)->s_qf_names[USRQUOTA] &&
- !REISERFS_SB(sb)->s_qf_names[GRPQUOTA]) {
- path_release(&nd);
-- return vfs_quota_on(sb, type, format_id, path);
-+ return vfs_quota_on(hash, type, format_id, path);
- }
- /* Quotafile not of fs root? */
- if (nd.dentry->d_parent->d_inode != sb->s_root->d_inode)
-@@ -2007,17 +2029,18 @@ static int reiserfs_quota_on(struct supe
- "reiserfs: Quota file not on filesystem root. "
- "Journalled quota will not work.");
- path_release(&nd);
-- return vfs_quota_on(sb, type, format_id, path);
-+ return vfs_quota_on(hash, type, format_id, path);
- }
-
- /* Read data from quotafile - avoid pagecache and such because we cannot afford
- * acquiring the locks... As quota files are never truncated and quota code
- * itself serializes the operations (and noone else should touch the files)
- * we don't have to be afraid of races */
--static ssize_t reiserfs_quota_read(struct super_block *sb, int type, char *data,
-+static ssize_t reiserfs_quota_read(struct dqhash *hash, int type, char *data,
- size_t len, loff_t off)
- {
-- struct inode *inode = sb_dqopt(sb)->files[type];
-+ struct inode *inode = dqh_dqopt(hash)->files[type];
-+ struct super_block *sb = hash->dqh_sb;
- unsigned long blk = off >> sb->s_blocksize_bits;
- int err = 0, offset = off & (sb->s_blocksize - 1), tocopy;
- size_t toread;
-@@ -2059,10 +2082,11 @@ static ssize_t reiserfs_quota_read(struc
-
- /* Write to quotafile (we know the transaction is already started and has
- * enough credits) */
--static ssize_t reiserfs_quota_write(struct super_block *sb, int type,
-+static ssize_t reiserfs_quota_write(struct dqhash *hash, int type,
- const char *data, size_t len, loff_t off)
- {
-- struct inode *inode = sb_dqopt(sb)->files[type];
-+ struct inode *inode = dqh_dqopt(hash)->files[type];
-+ struct super_block *sb = hash->dqh_sb;
- unsigned long blk = off >> sb->s_blocksize_bits;
- int err = 0, offset = off & (sb->s_blocksize - 1), tocopy;
- int journal_quota = REISERFS_SB(sb)->s_qf_names[type] != NULL;
-diff -NurpP --minimal linux-2.6.19.1/fs/reiserfs/xattr.c linux-2.6.19.1-vs2.3.0.6/fs/reiserfs/xattr.c
---- linux-2.6.19.1/fs/reiserfs/xattr.c 2006-11-30 21:19:28 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/reiserfs/xattr.c 2006-11-08 04:57:52 +0100
-@@ -35,6 +35,7 @@
- #include <linux/namei.h>
- #include <linux/errno.h>
- #include <linux/fs.h>
-+#include <linux/mount.h>
- #include <linux/file.h>
- #include <linux/pagemap.h>
- #include <linux/xattr.h>
-@@ -823,7 +824,7 @@ int reiserfs_delete_xattrs(struct inode
- if (dir->d_inode->i_nlink <= 2) {
- root = get_xa_root(inode->i_sb);
- reiserfs_write_lock_xattrs(inode->i_sb);
-- err = vfs_rmdir(root->d_inode, dir);
-+ err = vfs_rmdir(root->d_inode, dir, NULL);
- reiserfs_write_unlock_xattrs(inode->i_sb);
- dput(root);
- } else {
-diff -NurpP --minimal linux-2.6.19.1/fs/stat.c linux-2.6.19.1-vs2.3.0.6/fs/stat.c
---- linux-2.6.19.1/fs/stat.c 2006-11-30 21:19:28 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/stat.c 2006-11-08 04:57:46 +0100
-@@ -27,6 +27,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.19.1/fs/super.c linux-2.6.19.1-vs2.3.0.6/fs/super.c
---- linux-2.6.19.1/fs/super.c 2006-11-30 21:19:28 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/super.c 2006-11-30 19:49:06 +0100
-@@ -37,6 +37,9 @@
- #include <linux/idr.h>
- #include <linux/kobject.h>
- #include <linux/mutex.h>
-+#include <linux/devpts_fs.h>
-+#include <linux/proc_fs.h>
-+#include <linux/vs_context.h>
- #include <asm/uaccess.h>
-
-
-@@ -84,15 +87,14 @@ static struct super_block *alloc_super(s
- s->s_count = S_BIAS;
- atomic_set(&s->s_active, 1);
- mutex_init(&s->s_vfs_rename_mutex);
-- mutex_init(&s->s_dquot.dqio_mutex);
-- mutex_init(&s->s_dquot.dqonoff_mutex);
-- init_rwsem(&s->s_dquot.dqptr_sem);
- init_waitqueue_head(&s->s_wait_unfrozen);
- s->s_maxbytes = MAX_NON_LFS;
-- s->dq_op = sb_dquot_ops;
-+ s->s_qop = sb_dquot_ops;
- s->s_qcop = sb_quotactl_ops;
- s->s_op = &default_op;
- s->s_time_gran = 1000000000;
-+ /* quick hack to make dqhash id unique, sufficient for now */
-+ s->s_dqh = new_dqhash(s, (unsigned long)s);
- }
- out:
- return s;
-@@ -107,6 +109,7 @@ out:
- static inline void destroy_super(struct super_block *s)
- {
- security_sb_free(s);
-+ dqhput(s->s_dqh);
- kfree(s);
- }
-
-@@ -178,7 +181,7 @@ void deactivate_super(struct super_block
- if (atomic_dec_and_lock(&s->s_active, &sb_lock)) {
- s->s_count -= S_BIAS-1;
- spin_unlock(&sb_lock);
-- DQUOT_OFF(s);
-+ DQUOT_OFF(s->s_dqh);
- down_write(&s->s_umount);
- fs->kill_sb(s);
- put_filesystem(fs);
-@@ -229,7 +232,7 @@ static int grab_super(struct super_block
- void __fsync_super(struct super_block *sb)
- {
- sync_inodes_sb(sb, 0);
-- DQUOT_SYNC(sb);
-+ DQUOT_SYNC(sb->s_dqh);
- lock_super(sb);
- if (sb->s_dirt && sb->s_op->write_super)
- sb->s_op->write_super(sb);
-@@ -853,6 +856,7 @@ 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;
-
-@@ -878,7 +882,14 @@ vfs_kern_mount(struct file_system_type *
- if (error < 0)
- goto out_free_secdata;
-
-- error = security_sb_kern_mount(mnt->mnt_sb, secdata);
-+ sb = mnt->mnt_sb;
-+ error = -EPERM;
-+ 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;
++#define vs_map_chrdev(d, t, p) \
++ ((vs_map_device(current_vx_info(), d, t, S_IFCHR) & (p)) == (p))
++#define vs_map_blkdev(d, t, p) \
++ ((vs_map_device(current_vx_info(), d, t, S_IFBLK) & (p)) == (p))
+
-+ error = security_sb_kern_mount(sb, secdata);
- if (error)
- goto out_sb;
-
-@@ -906,9 +917,17 @@ do_kern_mount(const char *fstype, int fl
- {
- struct file_system_type *type = get_fs_type(fstype);
- struct vfsmount *mnt;
++#define vs_chrdev_perm(d, p) \
++ vs_device_perm(current_vx_info(), d, S_IFCHR, p)
++#define vs_blkdev_perm(d, p) \
++ vs_device_perm(current_vx_info(), d, S_IFBLK, p)
+
- if (!type)
- return ERR_PTR(-ENODEV);
+
-+ mnt = ERR_PTR(-EPERM);
-+ if ((type->fs_flags & FS_BINARY_MOUNTDATA) &&
-+ !vx_capable(CAP_SYS_ADMIN, VXC_BINARY_MOUNT))
-+ goto out_put;
++#else
++#warning duplicate inclusion
++#endif
+diff -urNp -x '*.orig' linux-4.9/include/linux/vs_dlimit.h linux-4.9/include/linux/vs_dlimit.h
+--- linux-4.9/include/linux/vs_dlimit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vs_dlimit.h 2021-02-24 15:47:45.094409658 +0100
+@@ -0,0 +1,215 @@
++#ifndef _VS_DLIMIT_H
++#define _VS_DLIMIT_H
+
- mnt = vfs_kern_mount(type, flags, name, data);
-+out_put:
- put_filesystem(type);
- return mnt;
- }
-diff -NurpP --minimal linux-2.6.19.1/fs/sysfs/mount.c linux-2.6.19.1-vs2.3.0.6/fs/sysfs/mount.c
---- linux-2.6.19.1/fs/sysfs/mount.c 2006-11-30 21:19:28 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/sysfs/mount.c 2006-11-08 04:57:53 +0100
-@@ -11,8 +11,6 @@
-
- #include "sysfs.h"
-
--/* Random magic number */
--#define SYSFS_MAGIC 0x62656572
-
- struct vfsmount *sysfs_mount;
- struct super_block * sysfs_sb = NULL;
-@@ -38,7 +36,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;
- sysfs_sb = sb;
-diff -NurpP --minimal linux-2.6.19.1/fs/udf/super.c linux-2.6.19.1-vs2.3.0.6/fs/udf/super.c
---- linux-2.6.19.1/fs/udf/super.c 2006-11-30 21:19:28 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/udf/super.c 2006-11-08 04:57:51 +0100
-@@ -1576,7 +1576,7 @@ static int udf_fill_super(struct super_b
-
- /* Fill in the rest of the superblock */
- sb->s_op = &udf_sb_ops;
-- sb->dq_op = NULL;
-+ sb->s_qop = NULL;
- sb->s_dirt = 0;
- sb->s_magic = UDF_SUPER_MAGIC;
- sb->s_time_gran = 1000;
-diff -NurpP --minimal linux-2.6.19.1/fs/ufs/super.c linux-2.6.19.1-vs2.3.0.6/fs/ufs/super.c
---- linux-2.6.19.1/fs/ufs/super.c 2006-11-30 21:19:28 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/ufs/super.c 2006-11-08 04:57:51 +0100
-@@ -930,7 +930,7 @@ magic_found:
- * Read ufs_super_block into internal data structures
- */
- sb->s_op = &ufs_super_ops;
-- sb->dq_op = NULL; /***/
-+ sb->s_qop = NULL; /***/
- sb->s_magic = fs32_to_cpu(sb, usb3->fs_magic);
-
- uspi->s_sblkno = fs32_to_cpu(sb, usb1->fs_sblkno);
-@@ -1248,8 +1248,8 @@ static void destroy_inodecache(void)
- }
-
- #ifdef CONFIG_QUOTA
--static ssize_t ufs_quota_read(struct super_block *, int, char *,size_t, loff_t);
--static ssize_t ufs_quota_write(struct super_block *, int, const char *, size_t, loff_t);
-+static ssize_t ufs_quota_read(struct dqhash *, int, char *,size_t, loff_t);
-+static ssize_t ufs_quota_write(struct dqhash *, int, const char *, size_t, loff_t);
- #endif
-
- static struct super_operations ufs_super_ops = {
-@@ -1274,10 +1274,11 @@ static struct super_operations ufs_super
- * acquiring the locks... As quota files are never truncated and quota code
- * itself serializes the operations (and noone else should touch the files)
- * we don't have to be afraid of races */
--static ssize_t ufs_quota_read(struct super_block *sb, int type, char *data,
-+static ssize_t ufs_quota_read(struct dqhash *hash, int type, char *data,
- size_t len, loff_t off)
- {
-- struct inode *inode = sb_dqopt(sb)->files[type];
-+ struct inode *inode = dqh_dqopt(hash)->files[type];
-+ struct super_block *sb = hash->dqh_sb;
- sector_t blk = off >> sb->s_blocksize_bits;
- int err = 0;
- int offset = off & (sb->s_blocksize - 1);
-@@ -1313,10 +1314,11 @@ static ssize_t ufs_quota_read(struct sup
- }
-
- /* Write to quotafile */
--static ssize_t ufs_quota_write(struct super_block *sb, int type,
-+static ssize_t ufs_quota_write(struct dqhash *hash, int type,
- const char *data, size_t len, loff_t off)
- {
-- struct inode *inode = sb_dqopt(sb)->files[type];
-+ struct inode *inode = dqh_dqopt(hash)->files[type];
-+ struct super_block *sb = hash->dqh_sb;
- sector_t blk = off >> sb->s_blocksize_bits;
- int err = 0;
- int offset = off & (sb->s_blocksize - 1);
-diff -NurpP --minimal linux-2.6.19.1/fs/utimes.c linux-2.6.19.1-vs2.3.0.6/fs/utimes.c
---- linux-2.6.19.1/fs/utimes.c 2006-11-30 21:19:28 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/utimes.c 2006-11-08 22:44:42 +0100
-@@ -3,6 +3,8 @@
- #include <linux/linkage.h>
- #include <linux/namei.h>
- #include <linux/utime.h>
-+#include <linux/mount.h>
-+#include <linux/vs_cowbl.h>
- #include <asm/uaccess.h>
- #include <asm/unistd.h>
-
-@@ -32,7 +34,7 @@ asmlinkage long sys_utime(char __user *
- inode = nd.dentry->d_inode;
-
- error = -EROFS;
-- if (IS_RDONLY(inode))
-+ if (IS_RDONLY(inode) || MNT_IS_RDONLY(nd.mnt))
- goto dput_and_out;
-
- /* Don't worry, the checks are done in inode_change_ok() */
-@@ -83,14 +85,13 @@ long do_utimes(int dfd, char __user *fil
- struct iattr newattrs;
-
- error = __user_walk_fd(dfd, filename, LOOKUP_FOLLOW, &nd);
--
- if (error)
- goto out;
-- inode = nd.dentry->d_inode;
-
-- error = -EROFS;
-- if (IS_RDONLY(inode))
-+ error = cow_check_and_break(&nd);
-+ if (error)
- goto dput_and_out;
-+ inode = nd.dentry->d_inode;
-
- /* Don't worry, the checks are done in inode_change_ok() */
- newattrs.ia_valid = ATTR_CTIME | ATTR_MTIME | ATTR_ATIME;
-diff -NurpP --minimal linux-2.6.19.1/fs/xattr.c linux-2.6.19.1-vs2.3.0.6/fs/xattr.c
---- linux-2.6.19.1/fs/xattr.c 2006-11-30 21:19:28 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/xattr.c 2006-11-08 21:52:09 +0100
-@@ -18,6 +18,7 @@
- #include <linux/module.h>
- #include <linux/fsnotify.h>
- #include <linux/audit.h>
-+#include <linux/mount.h>
- #include <asm/uaccess.h>
-
-
-@@ -195,7 +196,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
- */
- static long
- setxattr(struct dentry *d, char __user *name, void __user *value,
-- size_t size, int flags)
-+ size_t size, int flags, struct vfsmount *mnt)
- {
- int error;
- void *kvalue = NULL;
-@@ -222,6 +223,9 @@ setxattr(struct dentry *d, char __user *
- }
- }
-
-+ if (MNT_IS_RDONLY(mnt))
-+ return -EROFS;
++#include <linux/fs.h>
+
- error = vfs_setxattr(d, kname, kvalue, size, flags);
- kfree(kvalue);
- return error;
-@@ -237,7 +241,7 @@ sys_setxattr(char __user *path, char __u
- error = user_path_walk(path, &nd);
- if (error)
- return error;
-- error = setxattr(nd.dentry, name, value, size, flags);
-+ error = setxattr(nd.dentry, name, value, size, flags, nd.mnt);
- path_release(&nd);
- return error;
- }
-@@ -252,7 +256,7 @@ sys_lsetxattr(char __user *path, char __
- error = user_path_walk_link(path, &nd);
- if (error)
- return error;
-- error = setxattr(nd.dentry, name, value, size, flags);
-+ error = setxattr(nd.dentry, name, value, size, flags, nd.mnt);
- path_release(&nd);
- return error;
- }
-@@ -270,7 +274,7 @@ sys_fsetxattr(int fd, char __user *name,
- return error;
- dentry = f->f_dentry;
- audit_inode(NULL, dentry->d_inode);
-- error = setxattr(dentry, name, value, size, flags);
-+ error = setxattr(dentry, name, value, size, flags, f->f_vfsmnt);
- fput(f);
- return error;
- }
-@@ -432,7 +436,7 @@ sys_flistxattr(int fd, char __user *list
- * Extended attribute REMOVE operations
- */
- static long
--removexattr(struct dentry *d, char __user *name)
-+removexattr(struct dentry *d, char __user *name, struct vfsmount *mnt)
- {
- int error;
- char kname[XATTR_NAME_MAX + 1];
-@@ -443,6 +447,9 @@ removexattr(struct dentry *d, char __use
- if (error < 0)
- return error;
-
-+ if (MNT_IS_RDONLY(mnt))
-+ return -EROFS;
++#include "vserver/dlimit.h"
++#include "vserver/base.h"
++#include "vserver/debug.h"
+
- return vfs_removexattr(d, kname);
- }
-
-@@ -455,7 +462,7 @@ sys_removexattr(char __user *path, char
- error = user_path_walk(path, &nd);
- if (error)
- return error;
-- error = removexattr(nd.dentry, name);
-+ error = removexattr(nd.dentry, name, nd.mnt);
- path_release(&nd);
- return error;
- }
-@@ -469,7 +476,7 @@ sys_lremovexattr(char __user *path, char
- error = user_path_walk_link(path, &nd);
- if (error)
- return error;
-- error = removexattr(nd.dentry, name);
-+ error = removexattr(nd.dentry, name, nd.mnt);
- path_release(&nd);
- return error;
- }
-@@ -486,7 +493,7 @@ sys_fremovexattr(int fd, char __user *na
- return error;
- dentry = f->f_dentry;
- audit_inode(NULL, dentry->d_inode);
-- error = removexattr(dentry, name);
-+ error = removexattr(dentry, name, f->f_vfsmnt);
- fput(f);
- return error;
- }
-diff -NurpP --minimal linux-2.6.19.1/fs/xfs/linux-2.6/xfs_file.c linux-2.6.19.1-vs2.3.0.6/fs/xfs/linux-2.6/xfs_file.c
---- linux-2.6.19.1/fs/xfs/linux-2.6/xfs_file.c 2006-11-30 21:19:29 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/xfs/linux-2.6/xfs_file.c 2006-11-08 04:57:51 +0100
-@@ -453,6 +453,7 @@ const struct file_operations xfs_file_op
- .aio_read = xfs_file_aio_read,
- .aio_write = xfs_file_aio_write,
- .sendfile = xfs_file_sendfile,
-+ .sendpage = generic_file_sendpage,
- .splice_read = xfs_file_splice_read,
- .splice_write = xfs_file_splice_write,
- .unlocked_ioctl = xfs_file_ioctl,
-@@ -476,6 +477,7 @@ const struct file_operations xfs_invis_f
- .aio_read = xfs_file_aio_read_invis,
- .aio_write = xfs_file_aio_write_invis,
- .sendfile = xfs_file_sendfile_invis,
-+ .sendpage = generic_file_sendpage,
- .splice_read = xfs_file_splice_read_invis,
- .splice_write = xfs_file_splice_write_invis,
- .unlocked_ioctl = xfs_file_ioctl_invis,
-diff -NurpP --minimal linux-2.6.19.1/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.19.1-vs2.3.0.6/fs/xfs/linux-2.6/xfs_ioctl.c
---- linux-2.6.19.1/fs/xfs/linux-2.6/xfs_ioctl.c 2006-11-30 21:19:29 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/xfs/linux-2.6/xfs_ioctl.c 2006-11-20 21:12:32 +0100
-@@ -1100,6 +1100,8 @@ xfs_ioc_fsgeometry(
- #define LINUX_XFLAG_APPEND 0x00000020 /* writes to file may only append */
- #define LINUX_XFLAG_NODUMP 0x00000040 /* do not dump file */
- #define LINUX_XFLAG_NOATIME 0x00000080 /* do not update atime */
-+#define LINUX_XFLAG_BARRIER 0x04000000 /* chroot() barrier */
-+#define LINUX_XFLAG_IUNLINK 0x08000000 /* immutable unlink */
-
- STATIC unsigned int
- xfs_merge_ioc_xflags(
-@@ -1140,6 +1142,10 @@ xfs_di2lxflags(
-
- if (di_flags & XFS_DIFLAG_IMMUTABLE)
- flags |= LINUX_XFLAG_IMMUTABLE;
-+ if (di_flags & XFS_DIFLAG_IUNLINK)
-+ flags |= LINUX_XFLAG_IUNLINK;
-+ if (di_flags & XFS_DIFLAG_BARRIER)
-+ flags |= LINUX_XFLAG_BARRIER;
- if (di_flags & XFS_DIFLAG_APPEND)
- flags |= LINUX_XFLAG_APPEND;
- if (di_flags & XFS_DIFLAG_SYNC)
-diff -NurpP --minimal linux-2.6.19.1/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.19.1-vs2.3.0.6/fs/xfs/linux-2.6/xfs_iops.c
---- linux-2.6.19.1/fs/xfs/linux-2.6/xfs_iops.c 2006-11-30 21:19:29 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/xfs/linux-2.6/xfs_iops.c 2006-11-30 18:53:18 +0100
-@@ -53,6 +53,7 @@
- #include <linux/xattr.h>
- #include <linux/namei.h>
- #include <linux/security.h>
-+#include <linux/vs_tag.h>
-
- /*
- * Get a XFS inode from a given vnode.
-@@ -402,6 +403,7 @@ xfs_vn_lookup(
- d_add(dentry, NULL);
- return NULL;
- }
-+ dx_propagate_tag(nd, vn_to_inode(cvp));
-
- return d_splice_alias(vn_to_inode(cvp), dentry);
- }
-@@ -659,6 +661,10 @@ xfs_vn_setattr(
- int flags = 0;
- int error;
-
-+ error = inode_change_ok(inode, attr);
-+ if (error)
-+ return error;
+
- if (ia_valid & ATTR_UID) {
- vattr.va_mask |= XFS_AT_UID;
- vattr.va_uid = attr->ia_uid;
-@@ -667,6 +673,10 @@ xfs_vn_setattr(
- vattr.va_mask |= XFS_AT_GID;
- vattr.va_gid = attr->ia_gid;
- }
-+ if ((ia_valid & ATTR_TAG) && IS_TAGGED(inode)) {
-+ vattr.va_mask |= XFS_AT_TAG;
-+ vattr.va_tag = attr->ia_tag;
-+ }
- if (ia_valid & ATTR_SIZE) {
- vattr.va_mask |= XFS_AT_SIZE;
- vattr.va_size = attr->ia_size;
-@@ -712,6 +722,42 @@ xfs_vn_truncate(
- }
-
- STATIC int
-+xfs_vn_sync_flags(struct inode *inode)
++#define get_dl_info(i) __get_dl_info(i, __FILE__, __LINE__)
++
++static inline struct dl_info *__get_dl_info(struct dl_info *dli,
++ const char *_file, int _line)
+{
-+ unsigned int oldflags, newflags;
-+ int flags = 0;
-+ int error;
-+ bhv_vattr_t vattr;
-+ bhv_vnode_t *vp = vn_from_inode(inode);
++ if (!dli)
++ return NULL;
++ vxlprintk(VXD_CBIT(dlim, 4), "get_dl_info(%p[#%d.%d])",
++ dli, dli ? dli->dl_tag : 0,
++ dli ? atomic_read(&dli->dl_usecnt) : 0,
++ _file, _line);
++ atomic_inc(&dli->dl_usecnt);
++ return dli;
++}
+
-+ memset(&vattr, 0, sizeof vattr);
+
-+ vattr.va_mask = XFS_AT_XFLAGS;
-+ error = bhv_vop_getattr(vp, &vattr, 0, NULL);
++#define free_dl_info(i) \
++ call_rcu(&(i)->dl_rcu, rcu_free_dl_info)
+
-+ if (error)
-+ return error;
-+ oldflags = vattr.va_xflags;
-+ newflags = oldflags & ~(XFS_XFLAG_IMMUTABLE |
-+ XFS_XFLAG_IUNLINK | XFS_XFLAG_BARRIER);
-+
-+ if (IS_IMMUTABLE(inode))
-+ newflags |= XFS_XFLAG_IMMUTABLE;
-+ if (IS_IUNLINK(inode))
-+ newflags |= XFS_XFLAG_IUNLINK;
-+ if (IS_BARRIER(inode))
-+ newflags |= XFS_XFLAG_BARRIER;
-+
-+ if (oldflags ^ newflags) {
-+ vattr.va_xflags = newflags;
-+ vattr.va_mask |= XFS_AT_XFLAGS;
-+ error = bhv_vop_setattr(vp, &vattr, flags, NULL);
-+ }
-+ vn_revalidate(vp);
-+ return error;
++#define put_dl_info(i) __put_dl_info(i, __FILE__, __LINE__)
++
++static inline void __put_dl_info(struct dl_info *dli,
++ const char *_file, int _line)
++{
++ if (!dli)
++ return;
++ vxlprintk(VXD_CBIT(dlim, 4), "put_dl_info(%p[#%d.%d])",
++ dli, dli ? dli->dl_tag : 0,
++ dli ? atomic_read(&dli->dl_usecnt) : 0,
++ _file, _line);
++ if (atomic_dec_and_test(&dli->dl_usecnt))
++ free_dl_info(dli);
+}
+
-+STATIC int
- xfs_vn_setxattr(
- struct dentry *dentry,
- const char *name,
-@@ -824,6 +870,7 @@ struct inode_operations xfs_inode_operat
- .getxattr = xfs_vn_getxattr,
- .listxattr = xfs_vn_listxattr,
- .removexattr = xfs_vn_removexattr,
-+ .sync_flags = xfs_vn_sync_flags,
- };
-
- struct inode_operations xfs_dir_inode_operations = {
-@@ -843,6 +890,7 @@ struct inode_operations xfs_dir_inode_op
- .getxattr = xfs_vn_getxattr,
- .listxattr = xfs_vn_listxattr,
- .removexattr = xfs_vn_removexattr,
-+ .sync_flags = xfs_vn_sync_flags,
- };
-
- struct inode_operations xfs_symlink_inode_operations = {
-@@ -856,4 +904,5 @@ struct inode_operations xfs_symlink_inod
- .getxattr = xfs_vn_getxattr,
- .listxattr = xfs_vn_listxattr,
- .removexattr = xfs_vn_removexattr,
-+ .sync_flags = xfs_vn_sync_flags,
- };
-diff -NurpP --minimal linux-2.6.19.1/fs/xfs/linux-2.6/xfs_linux.h linux-2.6.19.1-vs2.3.0.6/fs/xfs/linux-2.6/xfs_linux.h
---- linux-2.6.19.1/fs/xfs/linux-2.6/xfs_linux.h 2006-11-30 21:19:29 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/xfs/linux-2.6/xfs_linux.h 2006-11-08 04:57:47 +0100
-@@ -139,6 +139,7 @@ BUFFER_FNS(PrivateStart, unwritten);
- #define current_pid() (current->pid)
- #define current_fsuid(cred) (current->fsuid)
- #define current_fsgid(cred) (current->fsgid)
-+#define current_fstag(cred,vp) (dx_current_fstag(vn_to_inode(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.19.1/fs/xfs/linux-2.6/xfs_super.c linux-2.6.19.1-vs2.3.0.6/fs/xfs/linux-2.6/xfs_super.c
---- linux-2.6.19.1/fs/xfs/linux-2.6/xfs_super.c 2006-11-30 21:19:29 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/xfs/linux-2.6/xfs_super.c 2006-11-20 21:12:32 +0100
-@@ -158,6 +158,7 @@ xfs_revalidate_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:
-@@ -185,6 +186,14 @@ xfs_revalidate_inode(
- inode->i_flags |= S_IMMUTABLE;
- else
- inode->i_flags &= ~S_IMMUTABLE;
-+ if (ip->i_d.di_flags & XFS_DIFLAG_IUNLINK)
-+ inode->i_flags |= S_IUNLINK;
-+ else
-+ inode->i_flags &= ~S_IUNLINK;
-+ if (ip->i_d.di_flags & XFS_DIFLAG_BARRIER)
-+ inode->i_flags |= S_BARRIER;
-+ else
-+ inode->i_flags &= ~S_BARRIER;
- if (ip->i_d.di_flags & XFS_DIFLAG_APPEND)
- inode->i_flags |= S_APPEND;
- else
-@@ -708,6 +717,12 @@ xfs_fs_remount(
- int error;
-
- error = bhv_vfs_parseargs(vfsp, options, args, 1);
-+ if ((args->flags2 & XFSMNT2_TAGGED) &&
-+ !(sb->s_flags & MS_TAGGED)) {
-+ printk("XFS: %s: tagging not permitted on remount.\n",
-+ sb->s_id);
-+ error = EINVAL;
-+ }
- if (!error)
- error = bhv_vfs_mntupdate(vfsp, flags, args);
- kmem_free(args, sizeof(*args));
-@@ -731,36 +746,40 @@ xfs_fs_show_options(
-
- STATIC int
- xfs_fs_quotasync(
-- struct super_block *sb,
-+ struct dqhash *hash,
- int type)
- {
-+ struct super_block *sb = hash->dqh_sb;
- return -bhv_vfs_quotactl(vfs_from_sb(sb), Q_XQUOTASYNC, 0, NULL);
- }
-
- STATIC int
- xfs_fs_getxstate(
-- struct super_block *sb,
-+ struct dqhash *hash,
- struct fs_quota_stat *fqs)
- {
-+ struct super_block *sb = hash->dqh_sb;
- return -bhv_vfs_quotactl(vfs_from_sb(sb), Q_XGETQSTAT, 0, (caddr_t)fqs);
- }
-
- STATIC int
- xfs_fs_setxstate(
-- struct super_block *sb,
-+ struct dqhash *hash,
- unsigned int flags,
- int op)
- {
-+ struct super_block *sb = hash->dqh_sb;
- return -bhv_vfs_quotactl(vfs_from_sb(sb), op, 0, (caddr_t)&flags);
- }
-
- STATIC int
- xfs_fs_getxquota(
-- struct super_block *sb,
-+ struct dqhash *hash,
- int type,
- qid_t id,
- struct fs_disk_quota *fdq)
- {
-+ struct super_block *sb = hash->dqh_sb;
- return -bhv_vfs_quotactl(vfs_from_sb(sb),
- (type == USRQUOTA) ? Q_XGETQUOTA :
- ((type == GRPQUOTA) ? Q_XGETGQUOTA :
-@@ -769,11 +788,12 @@ xfs_fs_getxquota(
-
- STATIC int
- xfs_fs_setxquota(
-- struct super_block *sb,
-+ struct dqhash *hash,
- int type,
- qid_t id,
- struct fs_disk_quota *fdq)
- {
-+ struct super_block *sb = hash->dqh_sb;
- return -bhv_vfs_quotactl(vfs_from_sb(sb),
- (type == USRQUOTA) ? Q_XSETQLIM :
- ((type == GRPQUOTA) ? Q_XSETGQLIM :
-@@ -803,6 +823,9 @@ xfs_fs_fill_super(
- sb_min_blocksize(sb, BBSIZE);
- sb->s_export_op = &xfs_export_operations;
- sb->s_qcop = &xfs_quotactl_operations;
-+#ifdef CONFIG_QUOTACTL
-+ sb->s_dqh->dqh_qcop = &xfs_quotactl_operations;
-+#endif
- sb->s_op = &xfs_super_operations;
-
- error = bhv_vfs_mount(vfsp, args, NULL);
-diff -NurpP --minimal linux-2.6.19.1/fs/xfs/linux-2.6/xfs_sysctl.c linux-2.6.19.1-vs2.3.0.6/fs/xfs/linux-2.6/xfs_sysctl.c
---- linux-2.6.19.1/fs/xfs/linux-2.6/xfs_sysctl.c 2006-09-20 16:58:39 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/fs/xfs/linux-2.6/xfs_sysctl.c 2006-11-08 04:57:40 +0100
-@@ -57,79 +57,79 @@ xfs_stats_clear_proc_handler(
- STATIC ctl_table xfs_table[] = {
- {XFS_RESTRICT_CHOWN, "restrict_chown", &xfs_params.restrict_chown.val,
- sizeof(int), 0644, NULL, &proc_dointvec_minmax,
-- &sysctl_intvec, NULL,
-+ NULL, &sysctl_intvec, NULL,
- &xfs_params.restrict_chown.min, &xfs_params.restrict_chown.max},
-
- {XFS_SGID_INHERIT, "irix_sgid_inherit", &xfs_params.sgid_inherit.val,
- sizeof(int), 0644, NULL, &proc_dointvec_minmax,
-- &sysctl_intvec, NULL,
-+ NULL, &sysctl_intvec, NULL,
- &xfs_params.sgid_inherit.min, &xfs_params.sgid_inherit.max},
-
- {XFS_SYMLINK_MODE, "irix_symlink_mode", &xfs_params.symlink_mode.val,
- sizeof(int), 0644, NULL, &proc_dointvec_minmax,
-- &sysctl_intvec, NULL,
-+ NULL, &sysctl_intvec, NULL,
- &xfs_params.symlink_mode.min, &xfs_params.symlink_mode.max},
-
- {XFS_PANIC_MASK, "panic_mask", &xfs_params.panic_mask.val,
- sizeof(int), 0644, NULL, &proc_dointvec_minmax,
-- &sysctl_intvec, NULL,
-+ NULL, &sysctl_intvec, NULL,
- &xfs_params.panic_mask.min, &xfs_params.panic_mask.max},
-
- {XFS_ERRLEVEL, "error_level", &xfs_params.error_level.val,
- sizeof(int), 0644, NULL, &proc_dointvec_minmax,
-- &sysctl_intvec, NULL,
-+ NULL, &sysctl_intvec, NULL,
- &xfs_params.error_level.min, &xfs_params.error_level.max},
-
- {XFS_SYNCD_TIMER, "xfssyncd_centisecs", &xfs_params.syncd_timer.val,
- sizeof(int), 0644, NULL, &proc_dointvec_minmax,
-- &sysctl_intvec, NULL,
-+ NULL, &sysctl_intvec, NULL,
- &xfs_params.syncd_timer.min, &xfs_params.syncd_timer.max},
-
- {XFS_INHERIT_SYNC, "inherit_sync", &xfs_params.inherit_sync.val,
- sizeof(int), 0644, NULL, &proc_dointvec_minmax,
-- &sysctl_intvec, NULL,
-+ NULL, &sysctl_intvec, NULL,
- &xfs_params.inherit_sync.min, &xfs_params.inherit_sync.max},
-
- {XFS_INHERIT_NODUMP, "inherit_nodump", &xfs_params.inherit_nodump.val,
- sizeof(int), 0644, NULL, &proc_dointvec_minmax,
-- &sysctl_intvec, NULL,
-+ NULL, &sysctl_intvec, NULL,
- &xfs_params.inherit_nodump.min, &xfs_params.inherit_nodump.max},
-
- {XFS_INHERIT_NOATIME, "inherit_noatime", &xfs_params.inherit_noatim.val,
- sizeof(int), 0644, NULL, &proc_dointvec_minmax,
-- &sysctl_intvec, NULL,
-+ NULL, &sysctl_intvec, NULL,
- &xfs_params.inherit_noatim.min, &xfs_params.inherit_noatim.max},
-
- {XFS_BUF_TIMER, "xfsbufd_centisecs", &xfs_params.xfs_buf_timer.val,
- sizeof(int), 0644, NULL, &proc_dointvec_minmax,
-- &sysctl_intvec, NULL,
-+ NULL, &sysctl_intvec, NULL,
- &xfs_params.xfs_buf_timer.min, &xfs_params.xfs_buf_timer.max},
-
- {XFS_BUF_AGE, "age_buffer_centisecs", &xfs_params.xfs_buf_age.val,
- sizeof(int), 0644, NULL, &proc_dointvec_minmax,
-- &sysctl_intvec, NULL,
-+ NULL, &sysctl_intvec, NULL,
- &xfs_params.xfs_buf_age.min, &xfs_params.xfs_buf_age.max},
-
- {XFS_INHERIT_NOSYM, "inherit_nosymlinks", &xfs_params.inherit_nosym.val,
- sizeof(int), 0644, NULL, &proc_dointvec_minmax,
-- &sysctl_intvec, NULL,
-+ NULL, &sysctl_intvec, NULL,
- &xfs_params.inherit_nosym.min, &xfs_params.inherit_nosym.max},
-
- {XFS_ROTORSTEP, "rotorstep", &xfs_params.rotorstep.val,
- sizeof(int), 0644, NULL, &proc_dointvec_minmax,
-- &sysctl_intvec, NULL,
-+ NULL, &sysctl_intvec, NULL,
- &xfs_params.rotorstep.min, &xfs_params.rotorstep.max},
-
- {XFS_INHERIT_NODFRG, "inherit_nodefrag", &xfs_params.inherit_nodfrg.val,
- sizeof(int), 0644, NULL, &proc_dointvec_minmax,
-- &sysctl_intvec, NULL,
-+ NULL, &sysctl_intvec, NULL,
- &xfs_params.inherit_nodfrg.min, &xfs_params.inherit_nodfrg.max},
-
- /* please keep this the last entry */
- #ifdef CONFIG_PROC_FS
- {XFS_STATS_CLEAR, "stats_clear", &xfs_params.stats_clear.val,
- sizeof(int), 0644, NULL, &xfs_stats_clear_proc_handler,
-- &sysctl_intvec, NULL,
-+ NULL, &sysctl_intvec, NULL,
- &xfs_params.stats_clear.min, &xfs_params.stats_clear.max},
- #endif /* CONFIG_PROC_FS */
-
-diff -NurpP --minimal linux-2.6.19.1/fs/xfs/linux-2.6/xfs_vnode.c linux-2.6.19.1-vs2.3.0.6/fs/xfs/linux-2.6/xfs_vnode.c
---- linux-2.6.19.1/fs/xfs/linux-2.6/xfs_vnode.c 2006-11-30 21:19:29 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/xfs/linux-2.6/xfs_vnode.c 2006-11-08 04:57:46 +0100
-@@ -119,6 +119,7 @@ vn_revalidate_core(
- inode->i_nlink = vap->va_nlink;
- inode->i_uid = vap->va_uid;
- inode->i_gid = vap->va_gid;
-+ inode->i_tag = vap->va_tag;
- inode->i_blocks = vap->va_nblocks;
- inode->i_mtime = vap->va_mtime;
- inode->i_ctime = vap->va_ctime;
-@@ -126,6 +127,14 @@ vn_revalidate_core(
- inode->i_flags |= S_IMMUTABLE;
- else
- inode->i_flags &= ~S_IMMUTABLE;
-+ if (vap->va_xflags & XFS_XFLAG_IUNLINK)
-+ inode->i_flags |= S_IUNLINK;
-+ else
-+ inode->i_flags &= ~S_IUNLINK;
-+ if (vap->va_xflags & XFS_XFLAG_BARRIER)
-+ inode->i_flags |= S_BARRIER;
-+ else
-+ inode->i_flags &= ~S_BARRIER;
- if (vap->va_xflags & XFS_XFLAG_APPEND)
- inode->i_flags |= S_APPEND;
- else
-diff -NurpP --minimal linux-2.6.19.1/fs/xfs/linux-2.6/xfs_vnode.h linux-2.6.19.1-vs2.3.0.6/fs/xfs/linux-2.6/xfs_vnode.h
---- linux-2.6.19.1/fs/xfs/linux-2.6/xfs_vnode.h 2006-11-30 21:19:29 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/xfs/linux-2.6/xfs_vnode.h 2006-11-08 04:57:46 +0100
-@@ -350,6 +350,7 @@ typedef struct bhv_vattr {
- xfs_nlink_t va_nlink; /* number of references to file */
- uid_t va_uid; /* owner user id */
- gid_t va_gid; /* owner group id */
-+ tag_t va_tag; /* owner group id */
- xfs_ino_t va_nodeid; /* file id */
- xfs_off_t va_size; /* file size in bytes */
- u_long va_blocksize; /* blocksize preferred for i/o */
-@@ -398,13 +399,15 @@ typedef struct bhv_vattr {
- #define XFS_AT_PROJID 0x04000000
- #define XFS_AT_SIZE_NOPERM 0x08000000
- #define XFS_AT_GENCOUNT 0x10000000
-+#define XFS_AT_TAG 0x20000000
-
- #define XFS_AT_ALL (XFS_AT_TYPE|XFS_AT_MODE|XFS_AT_UID|XFS_AT_GID|\
- XFS_AT_FSID|XFS_AT_NODEID|XFS_AT_NLINK|XFS_AT_SIZE|\
- XFS_AT_ATIME|XFS_AT_MTIME|XFS_AT_CTIME|XFS_AT_RDEV|\
- XFS_AT_BLKSIZE|XFS_AT_NBLOCKS|XFS_AT_VCODE|XFS_AT_MAC|\
- XFS_AT_ACL|XFS_AT_CAP|XFS_AT_INF|XFS_AT_XFLAGS|XFS_AT_EXTSIZE|\
-- XFS_AT_NEXTENTS|XFS_AT_ANEXTENTS|XFS_AT_PROJID|XFS_AT_GENCOUNT)
-+ XFS_AT_NEXTENTS|XFS_AT_ANEXTENTS|XFS_AT_PROJID|XFS_AT_GENCOUNT\
-+ XFS_AT_TAG)
-
- #define XFS_AT_STAT (XFS_AT_TYPE|XFS_AT_MODE|XFS_AT_UID|XFS_AT_GID|\
- XFS_AT_FSID|XFS_AT_NODEID|XFS_AT_NLINK|XFS_AT_SIZE|\
-diff -NurpP --minimal linux-2.6.19.1/fs/xfs/quota/xfs_qm_syscalls.c linux-2.6.19.1-vs2.3.0.6/fs/xfs/quota/xfs_qm_syscalls.c
---- linux-2.6.19.1/fs/xfs/quota/xfs_qm_syscalls.c 2006-09-20 16:58:40 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/fs/xfs/quota/xfs_qm_syscalls.c 2006-11-30 18:53:18 +0100
-@@ -17,6 +17,7 @@
- */
-
- #include <linux/capability.h>
-+#include <linux/vs_context.h>
-
- #include "xfs.h"
- #include "xfs_fs.h"
-@@ -213,7 +214,7 @@ xfs_qm_scall_quotaoff(
- xfs_qoff_logitem_t *qoffstart;
- int nculprits;
-
-- if (!force && !capable(CAP_SYS_ADMIN))
-+ if (!force && !vx_capable(CAP_SYS_ADMIN, VXC_QUOTA_CTL))
- return XFS_ERROR(EPERM);
- /*
- * No file system can have quotas enabled on disk but not in core.
-@@ -382,7 +383,7 @@ xfs_qm_scall_trunc_qfiles(
- int error;
- xfs_inode_t *qip;
-
-- if (!capable(CAP_SYS_ADMIN))
-+ if (!vx_capable(CAP_SYS_ADMIN, VXC_QUOTA_CTL))
- return XFS_ERROR(EPERM);
- error = 0;
- if (!XFS_SB_VERSION_HASQUOTA(&mp->m_sb) || flags == 0) {
-@@ -427,7 +428,7 @@ xfs_qm_scall_quotaon(
- uint accflags;
- __int64_t sbflags;
-
-- if (!capable(CAP_SYS_ADMIN))
-+ if (!vx_capable(CAP_SYS_ADMIN, VXC_QUOTA_CTL))
- return XFS_ERROR(EPERM);
-
- flags &= (XFS_ALL_QUOTA_ACCT | XFS_ALL_QUOTA_ENFD);
-@@ -598,7 +599,7 @@ xfs_qm_scall_setqlim(
- int error;
- xfs_qcnt_t hard, soft;
-
-- if (!capable(CAP_SYS_ADMIN))
-+ if (!vx_capable(CAP_SYS_ADMIN, VXC_QUOTA_CTL))
- return XFS_ERROR(EPERM);
-
- if ((newlim->d_fieldmask &
-diff -NurpP --minimal linux-2.6.19.1/fs/xfs/xfs_clnt.h linux-2.6.19.1-vs2.3.0.6/fs/xfs/xfs_clnt.h
---- linux-2.6.19.1/fs/xfs/xfs_clnt.h 2006-06-18 04:54:50 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/fs/xfs/xfs_clnt.h 2006-11-08 04:57:46 +0100
-@@ -99,5 +99,7 @@ struct xfs_mount_args {
- */
- #define XFSMNT2_COMPAT_IOSIZE 0x00000001 /* don't report large preferred
- * I/O size in stat(2) */
-+#define XFSMNT2_TAGGED 0x80000000 /* context tagging */
-+
-
- #endif /* __XFS_CLNT_H__ */
-diff -NurpP --minimal linux-2.6.19.1/fs/xfs/xfs_dinode.h linux-2.6.19.1-vs2.3.0.6/fs/xfs/xfs_dinode.h
---- linux-2.6.19.1/fs/xfs/xfs_dinode.h 2006-09-20 16:58:40 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/fs/xfs/xfs_dinode.h 2006-11-08 04:57:46 +0100
-@@ -53,7 +53,8 @@ typedef struct xfs_dinode_core
- __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 */
-+ __uint8_t di_pad[6]; /* unused, zeroed space */
- __uint16_t di_flushiter; /* incremented on flush */
- xfs_timestamp_t di_atime; /* time last accessed */
- xfs_timestamp_t di_mtime; /* time last modified */
-@@ -257,6 +258,9 @@ typedef enum xfs_dinode_fmt
- #define XFS_DIFLAG_EXTSIZE_BIT 11 /* inode extent size allocator hint */
- #define XFS_DIFLAG_EXTSZINHERIT_BIT 12 /* inherit inode extent size */
- #define XFS_DIFLAG_NODEFRAG_BIT 13 /* do not reorganize/defragment */
-+#define XFS_DIFLAG_BARRIER_BIT 14 /* chroot() barrier */
-+#define XFS_DIFLAG_IUNLINK_BIT 15 /* immutable 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)
-@@ -271,12 +275,15 @@ typedef enum xfs_dinode_fmt
- #define XFS_DIFLAG_EXTSIZE (1 << XFS_DIFLAG_EXTSIZE_BIT)
- #define XFS_DIFLAG_EXTSZINHERIT (1 << XFS_DIFLAG_EXTSZINHERIT_BIT)
- #define XFS_DIFLAG_NODEFRAG (1 << XFS_DIFLAG_NODEFRAG_BIT)
-+#define XFS_DIFLAG_BARRIER (1 << XFS_DIFLAG_BARRIER_BIT)
-+#define XFS_DIFLAG_IUNLINK (1 << XFS_DIFLAG_IUNLINK_BIT)
-
- #define XFS_DIFLAG_ANY \
- (XFS_DIFLAG_REALTIME | XFS_DIFLAG_PREALLOC | XFS_DIFLAG_NEWRTBM | \
- 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_EXTSZINHERIT | XFS_DIFLAG_NODEFRAG | XFS_DIFLAG_BARRIER | \
-+ XFS_DIFLAG_IUNLINK)
-
- #endif /* __XFS_DINODE_H__ */
-diff -NurpP --minimal linux-2.6.19.1/fs/xfs/xfs_fs.h linux-2.6.19.1-vs2.3.0.6/fs/xfs/xfs_fs.h
---- linux-2.6.19.1/fs/xfs/xfs_fs.h 2006-11-30 21:19:29 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/xfs/xfs_fs.h 2006-11-08 04:57:46 +0100
-@@ -66,6 +66,8 @@ struct fsxattr {
- #define XFS_XFLAG_EXTSIZE 0x00000800 /* extent size allocator hint */
- #define XFS_XFLAG_EXTSZINHERIT 0x00001000 /* inherit inode extent size */
- #define XFS_XFLAG_NODEFRAG 0x00002000 /* do not defragment */
-+#define XFS_XFLAG_BARRIER 0x00004000 /* chroot() barrier */
-+#define XFS_XFLAG_IUNLINK 0x00008000 /* immutable unlink */
- #define XFS_XFLAG_HASATTR 0x80000000 /* no DIFLAG for this */
-
- /*
-@@ -294,7 +296,8 @@ typedef struct xfs_bstat {
- __s32 bs_extents; /* number of extents */
- __u32 bs_gen; /* generation count */
- __u16 bs_projid; /* project id */
-- unsigned char bs_pad[14]; /* pad space, unused */
-+ __u16 bs_tag; /* context tagging */
-+ unsigned char bs_pad[12]; /* 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.19.1/fs/xfs/xfs_inode.c linux-2.6.19.1-vs2.3.0.6/fs/xfs/xfs_inode.c
---- linux-2.6.19.1/fs/xfs/xfs_inode.c 2006-11-30 21:19:29 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/xfs/xfs_inode.c 2006-11-30 20:55:45 +0100
-@@ -50,6 +50,7 @@
- #include "xfs_mac.h"
- #include "xfs_acl.h"
-
-+#include <linux/vs_tag.h>
-
- kmem_zone_t *xfs_ifork_zone;
- kmem_zone_t *xfs_inode_zone;
-@@ -736,20 +737,35 @@ xfs_xlate_dinode_core(
- xfs_dinode_core_t *buf_core = (xfs_dinode_core_t *)buf;
- xfs_dinode_core_t *mem_core = (xfs_dinode_core_t *)dip;
- xfs_arch_t arch = ARCH_CONVERT;
-+ uint32_t uid = 0, gid = 0;
-+ uint16_t tag = 0;
-
- ASSERT(dir);
-
-+ if (dir < 0) {
-+ tag = mem_core->di_tag;
-+ /* FIXME: supposed to use superblock flag */
-+ uid = TAGINO_UID(1, mem_core->di_uid, tag);
-+ gid = TAGINO_GID(1, mem_core->di_gid, tag);
-+ tag = TAGINO_TAG(1, tag);
-+ }
+
- INT_XLATE(buf_core->di_magic, mem_core->di_magic, dir, arch);
- INT_XLATE(buf_core->di_mode, mem_core->di_mode, dir, arch);
- INT_XLATE(buf_core->di_version, mem_core->di_version, dir, arch);
- INT_XLATE(buf_core->di_format, mem_core->di_format, dir, arch);
- INT_XLATE(buf_core->di_onlink, mem_core->di_onlink, dir, arch);
-- INT_XLATE(buf_core->di_uid, mem_core->di_uid, dir, arch);
-- INT_XLATE(buf_core->di_gid, mem_core->di_gid, dir, arch);
-+ INT_XLATE(buf_core->di_uid, uid, dir, arch);
-+ INT_XLATE(buf_core->di_gid, gid, dir, arch);
-+ INT_XLATE(buf_core->di_tag, tag, dir, arch);
- INT_XLATE(buf_core->di_nlink, mem_core->di_nlink, dir, arch);
- INT_XLATE(buf_core->di_projid, mem_core->di_projid, dir, arch);
-
- if (dir > 0) {
-+ /* FIXME: supposed to use superblock flag */
-+ mem_core->di_uid = INOTAG_UID(1, uid, gid);
-+ mem_core->di_gid = INOTAG_GID(1, uid, gid);
-+ mem_core->di_tag = INOTAG_TAG(1, uid, gid, tag);
- memcpy(mem_core->di_pad, buf_core->di_pad,
- sizeof(buf_core->di_pad));
- } else {
-@@ -797,6 +813,10 @@ _xfs_dic2xflags(
- flags |= XFS_XFLAG_PREALLOC;
- if (di_flags & XFS_DIFLAG_IMMUTABLE)
- flags |= XFS_XFLAG_IMMUTABLE;
-+ if (di_flags & XFS_DIFLAG_IUNLINK)
-+ flags |= XFS_XFLAG_IUNLINK;
-+ if (di_flags & XFS_DIFLAG_BARRIER)
-+ flags |= XFS_XFLAG_BARRIER;
- if (di_flags & XFS_DIFLAG_APPEND)
- flags |= XFS_XFLAG_APPEND;
- if (di_flags & XFS_DIFLAG_SYNC)
-@@ -1128,6 +1148,7 @@ xfs_ialloc(
- ASSERT(ip->i_d.di_nlink == nlink);
- ip->i_d.di_uid = current_fsuid(cr);
- ip->i_d.di_gid = current_fsgid(cr);
-+ ip->i_d.di_tag = current_fstag(cr, vp);
- ip->i_d.di_projid = prid;
- memset(&(ip->i_d.di_pad[0]), 0, sizeof(ip->i_d.di_pad));
-
-diff -NurpP --minimal linux-2.6.19.1/fs/xfs/xfs_itable.c linux-2.6.19.1-vs2.3.0.6/fs/xfs/xfs_itable.c
---- linux-2.6.19.1/fs/xfs/xfs_itable.c 2006-11-30 21:19:29 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/xfs/xfs_itable.c 2006-11-08 04:57:46 +0100
-@@ -89,6 +89,7 @@ xfs_bulkstat_one_iget(
- 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;
- vn_atime_to_bstime(vp, &buf->bs_atime);
- buf->bs_mtime.tv_sec = dic->di_mtime.t_sec;
-@@ -163,6 +164,7 @@ xfs_bulkstat_one_dinode(
- buf->bs_mode = INT_GET(dic->di_mode, ARCH_CONVERT);
- buf->bs_uid = INT_GET(dic->di_uid, ARCH_CONVERT);
- buf->bs_gid = INT_GET(dic->di_gid, ARCH_CONVERT);
-+ buf->bs_tag = INT_GET(dic->di_tag, ARCH_CONVERT);
- buf->bs_size = INT_GET(dic->di_size, ARCH_CONVERT);
- buf->bs_atime.tv_sec = INT_GET(dic->di_atime.t_sec, ARCH_CONVERT);
- buf->bs_atime.tv_nsec = INT_GET(dic->di_atime.t_nsec, ARCH_CONVERT);
-diff -NurpP --minimal linux-2.6.19.1/fs/xfs/xfs_mount.h linux-2.6.19.1-vs2.3.0.6/fs/xfs/xfs_mount.h
---- linux-2.6.19.1/fs/xfs/xfs_mount.h 2006-11-30 21:19:29 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/xfs/xfs_mount.h 2006-11-08 04:57:46 +0100
-@@ -460,6 +460,7 @@ typedef struct xfs_mount {
- #define XFS_MOUNT_NO_PERCPU_SB (1ULL << 23) /* don't use per-cpu superblock
- counters */
-
-+#define XFS_MOUNT_TAGGED (1ULL << 31) /* context tagging */
-
- /*
- * Default minimum read and write sizes.
-diff -NurpP --minimal linux-2.6.19.1/fs/xfs/xfs_vfsops.c linux-2.6.19.1-vs2.3.0.6/fs/xfs/xfs_vfsops.c
---- linux-2.6.19.1/fs/xfs/xfs_vfsops.c 2006-11-30 21:19:29 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/xfs/xfs_vfsops.c 2006-11-08 04:57:47 +0100
-@@ -300,6 +300,8 @@ xfs_start_flags(
-
- if (ap->flags2 & XFSMNT2_COMPAT_IOSIZE)
- mp->m_flags |= XFS_MOUNT_COMPAT_IOSIZE;
-+ if (ap->flags2 & XFSMNT2_TAGGED)
-+ mp->m_flags |= XFS_MOUNT_TAGGED;
-
- /*
- * no recovery flag requires a read-only mount
-@@ -394,6 +396,8 @@ xfs_finish_flags(
- return XFS_ERROR(EINVAL);
- }
-
-+ if (ap->flags2 & XFSMNT2_TAGGED)
-+ vfs->vfs_super->s_flags |= MS_TAGGED;
- return 0;
- }
-
-@@ -1645,6 +1649,9 @@ xfs_vget(
- * in stat(). */
- #define MNTOPT_ATTR2 "attr2" /* do use attr2 attribute format */
- #define MNTOPT_NOATTR2 "noattr2" /* do not use attr2 attribute format */
-+#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 */
-
- STATIC unsigned long
- suffix_strtoul(char *s, char **endp, unsigned int base)
-@@ -1831,6 +1838,19 @@ xfs_parseargs(
- args->flags |= XFSMNT_ATTR2;
- } else if (!strcmp(this_char, MNTOPT_NOATTR2)) {
- args->flags &= ~XFSMNT_ATTR2;
-+#ifndef CONFIG_TAGGING_NONE
-+ } else if (!strcmp(this_char, MNTOPT_TAGGED)) {
-+ args->flags2 |= XFSMNT2_TAGGED;
-+ } else if (!strcmp(this_char, MNTOPT_NOTAGTAG)) {
-+ args->flags2 &= ~XFSMNT2_TAGGED;
-+ } else if (!strcmp(this_char, MNTOPT_TAGXID)) {
-+ args->flags2 |= XFSMNT2_TAGGED;
-+#endif
-+#ifdef CONFIG_PROPAGATE
-+ } else if (!strcmp(this_char, MNTOPT_TAGGED)) {
-+ /* use value */
-+ args->flags2 |= XFSMNT2_TAGGED;
-+#endif
- } else if (!strcmp(this_char, "osyncisdsync")) {
- /* no-op, this is now the default */
- cmn_err(CE_WARN,
-diff -NurpP --minimal linux-2.6.19.1/fs/xfs/xfs_vnodeops.c linux-2.6.19.1-vs2.3.0.6/fs/xfs/xfs_vnodeops.c
---- linux-2.6.19.1/fs/xfs/xfs_vnodeops.c 2006-11-30 21:19:29 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/fs/xfs/xfs_vnodeops.c 2006-11-20 21:12:32 +0100
-@@ -160,6 +160,7 @@ xfs_getattr(
- vap->va_mode = ip->i_d.di_mode;
- vap->va_uid = ip->i_d.di_uid;
- vap->va_gid = ip->i_d.di_gid;
-+ vap->va_tag = ip->i_d.di_tag;
- vap->va_projid = ip->i_d.di_projid;
-
- /*
-@@ -260,6 +261,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;
- int timeflags = 0;
- bhv_vnode_t *vp;
- xfs_prid_t projid=0, iprojid=0;
-@@ -316,6 +318,7 @@ xfs_setattr(
- (mask & (XFS_AT_UID|XFS_AT_GID|XFS_AT_PROJID))) {
- uint qflags = 0;
-
-+ /* FIXME: handle tagging? */
- if ((mask & XFS_AT_UID) && XFS_IS_UQUOTA_ON(mp)) {
- uid = vap->va_uid;
- qflags |= XFS_QMOPT_UQUOTA;
-@@ -395,6 +398,8 @@ xfs_setattr(
- if (mask &
- (XFS_AT_MODE|XFS_AT_XFLAGS|XFS_AT_EXTSIZE|XFS_AT_UID|
- XFS_AT_GID|XFS_AT_PROJID)) {
-+ /* FIXME: handle tagging? */
++#define __dlimit_char(d) ((d) ? '*' : ' ')
+
- /*
- * CAP_FOWNER overrides the following restrictions:
- *
-@@ -443,7 +448,7 @@ xfs_setattr(
- * and can change the group id only to a group of which he
- * or she is a member.
- */
-- if (mask & (XFS_AT_UID|XFS_AT_GID|XFS_AT_PROJID)) {
-+ if (mask & (XFS_AT_UID|XFS_AT_GID|XFS_AT_TAG|XFS_AT_PROJID)) {
- /*
- * These IDs could have changed since we last looked at them.
- * But, we're assured that if the ownership did change
-@@ -451,10 +456,12 @@ xfs_setattr(
- * would have changed also.
- */
- iuid = ip->i_d.di_uid;
-- iprojid = ip->i_d.di_projid;
- igid = ip->i_d.di_gid;
-- gid = (mask & XFS_AT_GID) ? vap->va_gid : igid;
-+ itag = ip->i_d.di_tag;
-+ iprojid = ip->i_d.di_projid;
- uid = (mask & XFS_AT_UID) ? vap->va_uid : iuid;
-+ gid = (mask & XFS_AT_GID) ? vap->va_gid : igid;
-+ tag = (mask & XFS_AT_TAG) ? vap->va_tag : itag;
- projid = (mask & XFS_AT_PROJID) ? (xfs_prid_t)vap->va_projid :
- iprojid;
-
-@@ -482,6 +489,7 @@ xfs_setattr(
- if ((XFS_IS_UQUOTA_ON(mp) && iuid != uid) ||
- (XFS_IS_PQUOTA_ON(mp) && iprojid != projid) ||
- (XFS_IS_GQUOTA_ON(mp) && igid != gid)) {
-+ /* FIXME: handle tagging? */
- ASSERT(tp);
- code = XFS_QM_DQVOPCHOWNRESV(mp, tp, ip, udqp, gdqp,
- capable(CAP_FOWNER) ?
-@@ -707,7 +715,7 @@ xfs_setattr(
- * and can change the group id only to a group of which he
- * or she is a member.
- */
-- if (mask & (XFS_AT_UID|XFS_AT_GID|XFS_AT_PROJID)) {
-+ if (mask & (XFS_AT_UID|XFS_AT_GID|XFS_AT_TAG|XFS_AT_PROJID)) {
- /*
- * CAP_FSETID overrides the following restrictions:
- *
-@@ -723,6 +731,12 @@ xfs_setattr(
- * Change the ownerships and register quota modifications
- * in the transaction.
- */
-+ if (itag != tag) {
-+ if (XFS_IS_GQUOTA_ON(mp)) {
-+ /* FIXME: handle tag quota? */
-+ }
-+ ip->i_d.di_tag = tag;
-+ }
- if (iuid != uid) {
- if (XFS_IS_UQUOTA_ON(mp)) {
- ASSERT(mask & XFS_AT_UID);
-@@ -803,6 +817,10 @@ xfs_setattr(
- di_flags = (ip->i_d.di_flags & XFS_DIFLAG_PREALLOC);
- if (vap->va_xflags & XFS_XFLAG_IMMUTABLE)
- di_flags |= XFS_DIFLAG_IMMUTABLE;
-+ if (vap->va_xflags & XFS_XFLAG_IUNLINK)
-+ di_flags |= XFS_DIFLAG_IUNLINK;
-+ if (vap->va_xflags & XFS_XFLAG_BARRIER)
-+ di_flags |= XFS_DIFLAG_BARRIER;
- if (vap->va_xflags & XFS_XFLAG_APPEND)
- di_flags |= XFS_DIFLAG_APPEND;
- if (vap->va_xflags & XFS_XFLAG_SYNC)
-diff -NurpP --minimal linux-2.6.19.1/include/asm-arm/tlb.h linux-2.6.19.1-vs2.3.0.6/include/asm-arm/tlb.h
---- linux-2.6.19.1/include/asm-arm/tlb.h 2006-06-18 04:54:58 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/include/asm-arm/tlb.h 2006-11-08 04:57:40 +0100
-@@ -28,6 +28,7 @@
- #else /* !CONFIG_MMU */
-
- #include <asm/pgalloc.h>
-+#include <linux/vs_memory.h>
-
- /*
- * TLB handling. This allows us to remove pages from the page
-diff -NurpP --minimal linux-2.6.19.1/include/asm-arm26/tlb.h linux-2.6.19.1-vs2.3.0.6/include/asm-arm26/tlb.h
---- linux-2.6.19.1/include/asm-arm26/tlb.h 2006-01-03 17:30:02 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/asm-arm26/tlb.h 2006-11-08 04:57:40 +0100
-@@ -3,6 +3,7 @@
-
- #include <asm/pgalloc.h>
- #include <asm/tlbflush.h>
-+#include <linux/vs_memory.h>
-
- /*
- * TLB handling. This allows us to remove pages from the page
-diff -NurpP --minimal linux-2.6.19.1/include/asm-arm26/unistd.h linux-2.6.19.1-vs2.3.0.6/include/asm-arm26/unistd.h
---- linux-2.6.19.1/include/asm-arm26/unistd.h 2006-11-30 21:19:31 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/asm-arm26/unistd.h 2006-11-08 04:57:41 +0100
-@@ -302,6 +302,8 @@
- #define __NR_mq_getsetattr (__NR_SYSCALL_BASE+279)
- #define __NR_waitid (__NR_SYSCALL_BASE+280)
-
-+#define __NR_vserver (__NR_SYSCALL_BASE+313)
-+
- /*
- * The following SWIs are ARM private. FIXME - make appropriate for arm26
- */
-diff -NurpP --minimal linux-2.6.19.1/include/asm-generic/tlb.h linux-2.6.19.1-vs2.3.0.6/include/asm-generic/tlb.h
---- linux-2.6.19.1/include/asm-generic/tlb.h 2006-11-30 21:19:31 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/asm-generic/tlb.h 2006-11-08 04:57:40 +0100
-@@ -14,6 +14,7 @@
- #define _ASM_GENERIC__TLB_H
-
- #include <linux/swap.h>
-+#include <linux/vs_memory.h>
- #include <asm/pgalloc.h>
- #include <asm/tlbflush.h>
-
-diff -NurpP --minimal linux-2.6.19.1/include/asm-i386/elf.h linux-2.6.19.1-vs2.3.0.6/include/asm-i386/elf.h
---- linux-2.6.19.1/include/asm-i386/elf.h 2006-11-30 21:19:31 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/asm-i386/elf.h 2006-11-08 04:57:53 +0100
-@@ -75,7 +75,7 @@ typedef struct user_fxsr_struct elf_fpxr
- the loader. We need to make sure that it is out of the way of the program
- that it will "exec", and that there is sufficient room for the brk. */
-
--#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
-+#define ELF_ET_DYN_BASE ((TASK_UNMAPPED_BASE) * 2)
-
- /* regs is struct pt_regs, pr_reg is elf_gregset_t (which is
- now struct_user_regs, they are different) */
-diff -NurpP --minimal linux-2.6.19.1/include/asm-ia64/tlb.h linux-2.6.19.1-vs2.3.0.6/include/asm-ia64/tlb.h
---- linux-2.6.19.1/include/asm-ia64/tlb.h 2006-09-20 16:58:40 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/include/asm-ia64/tlb.h 2006-11-08 04:57:40 +0100
-@@ -40,6 +40,7 @@
- #include <linux/mm.h>
- #include <linux/pagemap.h>
- #include <linux/swap.h>
-+#include <linux/vs_memory.h>
-
- #include <asm/pgalloc.h>
- #include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.19.1/include/asm-powerpc/systbl.h linux-2.6.19.1-vs2.3.0.6/include/asm-powerpc/systbl.h
---- linux-2.6.19.1/include/asm-powerpc/systbl.h 2006-11-30 21:19:33 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/asm-powerpc/systbl.h 2006-11-20 21:12:32 +0100
-@@ -260,7 +260,7 @@ COMPAT_SYS_SPU(fstatfs64)
- SYSX(sys_ni_syscall, ppc_fadvise64_64, ppc_fadvise64_64)
- PPC_SYS_SPU(rtas)
- OLDSYS(debug_setcontext)
--SYSCALL(ni_syscall)
-+SYSX(sys_vserver, sys32_vserver, sys_vserver)
- COMPAT_SYS(migrate_pages)
- COMPAT_SYS(mbind)
- COMPAT_SYS(get_mempolicy)
-diff -NurpP --minimal linux-2.6.19.1/include/asm-powerpc/unistd.h linux-2.6.19.1-vs2.3.0.6/include/asm-powerpc/unistd.h
---- linux-2.6.19.1/include/asm-powerpc/unistd.h 2006-11-30 21:19:33 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/asm-powerpc/unistd.h 2006-11-20 21:12:32 +0100
-@@ -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.19.1/include/asm-s390/unistd.h linux-2.6.19.1-vs2.3.0.6/include/asm-s390/unistd.h
---- linux-2.6.19.1/include/asm-s390/unistd.h 2006-11-30 21:19:33 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/asm-s390/unistd.h 2006-11-08 04:57:41 +0100
-@@ -202,7 +202,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)
--/* Number 263 is reserved for vserver */
-+#define __NR_vserver 263
- #define __NR_statfs64 265
- #define __NR_fstatfs64 266
- #define __NR_remap_file_pages 267
-diff -NurpP --minimal linux-2.6.19.1/include/asm-sparc/unistd.h linux-2.6.19.1-vs2.3.0.6/include/asm-sparc/unistd.h
---- linux-2.6.19.1/include/asm-sparc/unistd.h 2006-11-30 21:19:34 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/asm-sparc/unistd.h 2006-11-08 21:52:09 +0100
-@@ -283,7 +283,7 @@
- #define __NR_timer_getoverrun 264
- #define __NR_timer_delete 265
- #define __NR_timer_create 266
--/* #define __NR_vserver 267 Reserved for VSERVER */
-+#define __NR_vserver 267
- #define __NR_io_setup 268
- #define __NR_io_destroy 269
- #define __NR_io_submit 270
-diff -NurpP --minimal linux-2.6.19.1/include/asm-sparc64/tlb.h linux-2.6.19.1-vs2.3.0.6/include/asm-sparc64/tlb.h
---- linux-2.6.19.1/include/asm-sparc64/tlb.h 2006-09-20 16:58:43 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/include/asm-sparc64/tlb.h 2006-11-08 04:57:40 +0100
-@@ -2,6 +2,7 @@
- #define _SPARC64_TLB_H
-
- #include <linux/swap.h>
-+#include <linux/vs_memory.h>
- #include <asm/pgalloc.h>
- #include <asm/tlbflush.h>
- #include <asm/mmu_context.h>
-diff -NurpP --minimal linux-2.6.19.1/include/asm-sparc64/unistd.h linux-2.6.19.1-vs2.3.0.6/include/asm-sparc64/unistd.h
---- linux-2.6.19.1/include/asm-sparc64/unistd.h 2006-11-30 21:19:35 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/asm-sparc64/unistd.h 2006-11-08 21:52:09 +0100
-@@ -285,7 +285,7 @@
- #define __NR_timer_getoverrun 264
- #define __NR_timer_delete 265
- #define __NR_timer_create 266
--/* #define __NR_vserver 267 Reserved for VSERVER */
-+#define __NR_vserver 267
- #define __NR_io_setup 268
- #define __NR_io_destroy 269
- #define __NR_io_submit 270
-diff -NurpP --minimal linux-2.6.19.1/include/asm-x86_64/unistd.h linux-2.6.19.1-vs2.3.0.6/include/asm-x86_64/unistd.h
---- linux-2.6.19.1/include/asm-x86_64/unistd.h 2006-11-30 21:19:37 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/asm-x86_64/unistd.h 2006-11-08 04:57:41 +0100
-@@ -532,7 +532,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.19.1/include/linux/Kbuild linux-2.6.19.1-vs2.3.0.6/include/linux/Kbuild
---- linux-2.6.19.1/include/linux/Kbuild 2006-11-30 21:19:37 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/Kbuild 2006-11-08 04:57:49 +0100
-@@ -345,3 +345,6 @@ unifdef-y += xfrm.h
- unifdef-y += zftape.h
-
- objhdr-y += version.h
-+
-+header-y += vserver/
-+
-diff -NurpP --minimal linux-2.6.19.1/include/linux/capability.h linux-2.6.19.1-vs2.3.0.6/include/linux/capability.h
---- linux-2.6.19.1/include/linux/capability.h 2006-06-18 04:55:15 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/capability.h 2006-11-08 04:57:40 +0100
-@@ -235,6 +235,7 @@ typedef __u32 kernel_cap_t;
- 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
-
-@@ -288,6 +289,11 @@ typedef __u32 kernel_cap_t;
-
- #define CAP_AUDIT_CONTROL 30
-
-+/* Allow context manipulations */
-+/* Allow changing context info on files */
-+
-+#define CAP_CONTEXT 31
-+
- #ifdef __KERNEL__
- /*
- * Bounding set
-diff -NurpP --minimal linux-2.6.19.1/include/linux/devpts_fs.h linux-2.6.19.1-vs2.3.0.6/include/linux/devpts_fs.h
---- linux-2.6.19.1/include/linux/devpts_fs.h 2004-08-14 12:55:59 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/devpts_fs.h 2006-11-08 04:57:53 +0100
-@@ -30,5 +30,7 @@ static inline void devpts_pty_kill(int n
-
- #endif
-
-+#define DEVPTS_SUPER_MAGIC 0x00001cd1
-+
-
- #endif /* _LINUX_DEVPTS_FS_H */
-diff -NurpP --minimal linux-2.6.19.1/include/linux/ext2_fs.h linux-2.6.19.1-vs2.3.0.6/include/linux/ext2_fs.h
---- linux-2.6.19.1/include/linux/ext2_fs.h 2006-11-30 21:19:37 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/ext2_fs.h 2006-11-08 04:57:46 +0100
-@@ -188,6 +188,8 @@ 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_BARRIER_FL FS_BARRIER_FL /* Barrier for chroot() */
-+#define EXT2_IUNLINK_FL FS_IUNLINK_FL /* Immutable unlink */
- #define EXT2_RESERVED_FL FS_RESERVED_FL /* reserved for ext2 lib */
-
- #define EXT2_FL_USER_VISIBLE FS_FL_USER_VISIBLE /* User visible flags */
-@@ -244,7 +246,7 @@ struct ext2_inode {
- struct {
- __u8 l_i_frag; /* Fragment number */
- __u8 l_i_fsize; /* Fragment size */
-- __u16 i_pad1;
-+ __u16 l_i_tag; /* Context Tag */
- __le16 l_i_uid_high; /* these 2 fields */
- __le16 l_i_gid_high; /* were reserved2[0] */
- __u32 l_i_reserved2;
-@@ -276,6 +278,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
-
-@@ -317,8 +320,9 @@ struct ext2_inode {
- #define EXT2_MOUNT_XATTR_USER 0x004000 /* Extended user attributes */
- #define EXT2_MOUNT_POSIX_ACL 0x008000 /* POSIX Access Control Lists */
- #define EXT2_MOUNT_XIP 0x010000 /* Execute in place */
--#define EXT2_MOUNT_USRQUOTA 0x020000 /* user quota */
--#define EXT2_MOUNT_GRPQUOTA 0x040000 /* group quota */
-+#define EXT2_MOUNT_USRQUOTA 0x020000 /* user quota */
-+#define EXT2_MOUNT_GRPQUOTA 0x040000 /* group quota */
-+#define EXT2_MOUNT_TAGGED (1<<24) /* Enable Context Tags */
-
-
- #define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt
-diff -NurpP --minimal linux-2.6.19.1/include/linux/ext3_fs.h linux-2.6.19.1-vs2.3.0.6/include/linux/ext3_fs.h
---- linux-2.6.19.1/include/linux/ext3_fs.h 2006-11-30 21:19:37 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/ext3_fs.h 2006-12-17 04:14:42 +0100
-@@ -177,6 +177,8 @@ 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_BARRIER_FL 0x04000000 /* Barrier for chroot() */
-+#define EXT3_IUNLINK_FL 0x08000000 /* Immutable unlink */
- #define EXT3_RESERVED_FL 0x80000000 /* reserved for ext3 lib */
-
- #define EXT3_FL_USER_VISIBLE 0x0003DFFF /* User visible flags */
-@@ -296,7 +298,7 @@ struct ext3_inode {
- struct {
- __u8 l_i_frag; /* Fragment number */
- __u8 l_i_fsize; /* Fragment size */
-- __u16 i_pad1;
-+ __u16 l_i_tag; /* Context Tag */
- __le16 l_i_uid_high; /* these 2 fields */
- __le16 l_i_gid_high; /* were reserved2[0] */
- __u32 l_i_reserved2;
-@@ -330,6 +332,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
-
- #elif defined(__GNU__)
-@@ -384,6 +387,7 @@ struct ext3_inode {
- #define EXT3_MOUNT_QUOTA 0x80000 /* Some quota option set */
- #define EXT3_MOUNT_USRQUOTA 0x100000 /* "old" user quota */
- #define EXT3_MOUNT_GRPQUOTA 0x200000 /* "old" group quota */
-+#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
-@@ -812,6 +816,7 @@ struct buffer_head * ext3_bread (handle_
- int ext3_get_blocks_handle(handle_t *handle, struct inode *inode,
- sector_t iblock, unsigned long maxblocks, struct buffer_head *bh_result,
- int create, int extend_disksize);
-+extern int ext3_sync_flags(struct inode *inode);
-
- extern void ext3_read_inode (struct inode *);
- extern int ext3_write_inode (struct inode *, int);
-diff -NurpP --minimal linux-2.6.19.1/include/linux/ext3_jbd.h linux-2.6.19.1-vs2.3.0.6/include/linux/ext3_jbd.h
---- linux-2.6.19.1/include/linux/ext3_jbd.h 2006-11-30 21:19:37 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/ext3_jbd.h 2006-11-08 04:57:51 +0100
-@@ -77,10 +77,10 @@
- #define EXT3_QUOTA_TRANS_BLOCKS(sb) (test_opt(sb, QUOTA) ? 2 : 0)
- /* Amount of blocks needed for quota insert/delete - we do some block writes
- * but inode, sb and group updates are done only once */
--#define EXT3_QUOTA_INIT_BLOCKS(sb) (test_opt(sb, QUOTA) ? (DQUOT_INIT_ALLOC*\
-- (EXT3_SINGLEDATA_TRANS_BLOCKS-3)+3+DQUOT_INIT_REWRITE) : 0)
--#define EXT3_QUOTA_DEL_BLOCKS(sb) (test_opt(sb, QUOTA) ? (DQUOT_DEL_ALLOC*\
-- (EXT3_SINGLEDATA_TRANS_BLOCKS-3)+3+DQUOT_DEL_REWRITE) : 0)
-+#define EXT3_QUOTA_INIT_BLOCKS(sb) (test_opt(sb, QUOTA) ? \
-+ (DQUOT_INIT_ALLOC*(EXT3_SINGLEDATA_TRANS_BLOCKS-3)+3+DQUOT_INIT_REWRITE) : 0)
-+#define EXT3_QUOTA_DEL_BLOCKS(sb) (test_opt(sb, QUOTA) ? \
-+ (DQUOT_DEL_ALLOC*(EXT3_SINGLEDATA_TRANS_BLOCKS-3)+3+DQUOT_DEL_REWRITE) : 0)
- #else
- #define EXT3_QUOTA_TRANS_BLOCKS(sb) 0
- #define EXT3_QUOTA_INIT_BLOCKS(sb) 0
-diff -NurpP --minimal linux-2.6.19.1/include/linux/ext4_fs.h linux-2.6.19.1-vs2.3.0.6/include/linux/ext4_fs.h
---- linux-2.6.19.1/include/linux/ext4_fs.h 2006-11-30 21:19:37 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/ext4_fs.h 2006-12-17 04:16:26 +0100
-@@ -189,8 +189,10 @@ struct ext4_group_desc
- #define EXT4_NOTAIL_FL 0x00008000 /* file tail should not be merged */
- #define EXT4_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */
- #define EXT4_TOPDIR_FL 0x00020000 /* Top of directory hierarchies*/
--#define EXT4_RESERVED_FL 0x80000000 /* reserved for ext4 lib */
- #define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */
-+#define EXT4_BARRIER_FL 0x04000000 /* Barrier for chroot() */
-+#define EXT4_IUNLINK_FL 0x08000000 /* Immutable unlink */
-+#define EXT4_RESERVED_FL 0x80000000 /* reserved for ext4 lib */
-
- #define EXT4_FL_USER_VISIBLE 0x000BDFFF /* User visible flags */
- #define EXT4_FL_USER_MODIFIABLE 0x000380FF /* User modifiable flags */
-@@ -312,7 +314,8 @@ struct ext4_inode {
- __le16 l_i_file_acl_high;
- __le16 l_i_uid_high; /* these 2 fields */
- __le16 l_i_gid_high; /* were reserved2[0] */
-- __u32 l_i_reserved2;
-+ __u16 l_i_tag; /* Context Tag */
-+ __u16 l_i_reserved2;
- } linux2;
- struct {
- __u8 h_i_frag; /* Fragment number */
-@@ -344,6 +347,7 @@ struct ext4_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
-
- #elif defined(__GNU__)
-@@ -400,6 +404,7 @@ struct ext4_inode {
- #define EXT4_MOUNT_USRQUOTA 0x100000 /* "old" user quota */
- #define EXT4_MOUNT_GRPQUOTA 0x200000 /* "old" group quota */
- #define EXT4_MOUNT_EXTENTS 0x400000 /* Extents support */
-+#define EXT4_MOUNT_TAGGED (1<<24) /* Enable Context Tags */
-
- /* Compatibility, for having both ext2_fs.h and ext4_fs.h included at once */
- #ifndef _LINUX_EXT2_FS_H
-@@ -843,6 +848,7 @@ struct buffer_head * ext4_bread (handle_
- int ext4_get_blocks_handle(handle_t *handle, struct inode *inode,
- sector_t iblock, unsigned long maxblocks, struct buffer_head *bh_result,
- int create, int extend_disksize);
-+extern int ext4_sync_flags(struct inode *inode);
-
- extern void ext4_read_inode (struct inode *);
- extern int ext4_write_inode (struct inode *, int);
-diff -NurpP --minimal linux-2.6.19.1/include/linux/fs.h linux-2.6.19.1-vs2.3.0.6/include/linux/fs.h
---- linux-2.6.19.1/include/linux/fs.h 2006-11-30 21:19:38 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/fs.h 2006-12-17 04:16:36 +0100
-@@ -120,6 +120,8 @@ extern int dir_notify_enable;
- #define MS_PRIVATE (1<<18) /* change to private */
- #define MS_SLAVE (1<<19) /* change to slave */
- #define MS_SHARED (1<<20) /* change to shared */
-+#define MS_TAGGED (1<<24) /* use generic inode tagging */
-+#define MS_TAGID (1<<25) /* use specific tag for this mount */
- #define MS_ACTIVE (1<<30)
- #define MS_NOUSER (1<<31)
-
-@@ -146,6 +148,8 @@ extern int dir_notify_enable;
- #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_BARRIER 1024 /* Barrier for chroot() */
-+#define S_IUNLINK 2048 /* Immutable unlink */
-
- /*
- * Note that nosuid etc flags are inode-specific: setting some file-system
-@@ -162,23 +166,35 @@ extern int dir_notify_enable;
- */
- #define __IS_FLG(inode,flg) ((inode)->i_sb->s_flags & (flg))
-
--#define IS_RDONLY(inode) ((inode)->i_sb->s_flags & MS_RDONLY)
-+#define IS_RDONLY(inode) __IS_FLG(inode, MS_RDONLY)
- #define IS_SYNC(inode) (__IS_FLG(inode, MS_SYNCHRONOUS) || \
- ((inode)->i_flags & S_SYNC))
- #define IS_DIRSYNC(inode) (__IS_FLG(inode, MS_SYNCHRONOUS|MS_DIRSYNC) || \
- ((inode)->i_flags & (S_SYNC|S_DIRSYNC)))
- #define IS_MANDLOCK(inode) __IS_FLG(inode, MS_MANDLOCK)
-+#define IS_TAGGED(inode) __IS_FLG(inode, MS_TAGGED)
-
- #define IS_NOQUOTA(inode) ((inode)->i_flags & S_NOQUOTA)
- #define IS_APPEND(inode) ((inode)->i_flags & S_APPEND)
- #define IS_IMMUTABLE(inode) ((inode)->i_flags & S_IMMUTABLE)
-+#define IS_IUNLINK(inode) ((inode)->i_flags & S_IUNLINK)
-+#define IS_IXORUNLINK(inode) ((IS_IUNLINK(inode) ? S_IMMUTABLE : 0) ^ IS_IMMUTABLE(inode))
- #define IS_POSIXACL(inode) __IS_FLG(inode, MS_POSIXACL)
-
-+#define IS_BARRIER(inode) (S_ISDIR((inode)->i_mode) && ((inode)->i_flags & S_BARRIER))
- #define IS_DEADDIR(inode) ((inode)->i_flags & S_DEAD)
- #define IS_NOCMTIME(inode) ((inode)->i_flags & S_NOCMTIME)
- #define IS_SWAPFILE(inode) ((inode)->i_flags & S_SWAPFILE)
- #define IS_PRIVATE(inode) ((inode)->i_flags & S_PRIVATE)
-
-+#ifdef CONFIG_VSERVER_COWBL
-+# define IS_COW(inode) (IS_IUNLINK(inode) && IS_IMMUTABLE(inode))
-+# define IS_COW_LINK(inode) (S_ISREG((inode)->i_mode) && ((inode)->i_nlink > 1))
-+#else
-+# define IS_COW(inode) (0)
-+# 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. */
-
-@@ -252,12 +268,13 @@ extern int dir_notify_enable;
- #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_BARRIER_FL 0x04000000 /* Barrier for chroot() */
-+#define FS_IUNLINK_FL 0x08000000 /* Immutable 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 SYNC_FILE_RANGE_WAIT_BEFORE 1
- #define SYNC_FILE_RANGE_WRITE 2
- #define SYNC_FILE_RANGE_WAIT_AFTER 4
-@@ -322,6 +339,7 @@ typedef void (dio_iodone_t)(struct kiocb
- #define ATTR_KILL_SUID 2048
- #define ATTR_KILL_SGID 4096
- #define ATTR_FILE 8192
-+#define ATTR_TAG 16384
-
- /*
- * This is the Inode Attributes structure, used for notify_change(). It
-@@ -337,6 +355,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;
-@@ -350,6 +369,9 @@ struct iattr {
- struct file *ia_file;
- };
-
-+#define ATTR_FLAG_BARRIER 512 /* Barrier for chroot() */
-+#define ATTR_FLAG_IUNLINK 1024 /* Immutable unlink */
-+
- /*
- * Includes for diskquotas.
- */
-@@ -547,6 +569,7 @@ struct inode {
- unsigned int i_nlink;
- uid_t i_uid;
- gid_t i_gid;
-+ tag_t i_tag;
- dev_t i_rdev;
- loff_t i_size;
- struct timespec i_atime;
-@@ -565,6 +588,9 @@ struct inode {
- struct file_lock *i_flock;
- struct address_space *i_mapping;
- struct address_space i_data;
-+#ifdef CONFIG_QUOTACTL
-+ struct dqhash *i_dqh;
-+#endif
- #ifdef CONFIG_QUOTA
- struct dquot *i_dquot[MAXQUOTAS];
- #endif
-@@ -735,6 +761,7 @@ struct file {
- loff_t f_pos;
- struct fown_struct f_owner;
- unsigned int f_uid, f_gid;
-+ xid_t f_xid;
- struct file_ra_state f_ra;
-
- unsigned long f_version;
-@@ -817,6 +844,7 @@ struct file_lock {
- unsigned char fl_type;
- 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 */
-@@ -918,7 +946,7 @@ struct super_block {
- unsigned long long s_maxbytes; /* Max file size */
- struct file_system_type *s_type;
- struct super_operations *s_op;
-- struct dquot_operations *dq_op;
-+ struct dquot_operations *s_qop;
- struct quotactl_ops *s_qcop;
- struct export_operations *s_export_op;
- unsigned long s_flags;
-@@ -943,7 +971,7 @@ struct super_block {
-
- struct block_device *s_bdev;
- struct list_head s_instances;
-- struct quota_info s_dquot; /* Diskquota specific options */
-+ struct dqhash *s_dqh; /* Diskquota hash */
-
- int s_frozen;
- wait_queue_head_t s_wait_unfrozen;
-@@ -1013,12 +1041,12 @@ static inline void unlock_super(struct s
- */
- extern int vfs_permission(struct nameidata *, int);
- extern int vfs_create(struct inode *, struct dentry *, int, struct nameidata *);
--extern int vfs_mkdir(struct inode *, struct dentry *, int);
--extern int vfs_mknod(struct inode *, struct dentry *, int, dev_t);
--extern int vfs_symlink(struct inode *, struct dentry *, const char *, int);
--extern int vfs_link(struct dentry *, struct inode *, struct dentry *);
--extern int vfs_rmdir(struct inode *, struct dentry *);
--extern int vfs_unlink(struct inode *, struct dentry *);
-+extern int vfs_mkdir(struct inode *, struct dentry *, int, struct nameidata *);
-+extern int vfs_mknod(struct inode *, struct dentry *, int, dev_t, struct nameidata *);
-+extern int vfs_symlink(struct inode *, struct dentry *, const char *, int, struct nameidata *);
-+extern int vfs_link(struct dentry *, struct inode *, struct dentry *, struct nameidata *);
-+extern int vfs_rmdir(struct inode *, struct dentry *, struct nameidata *);
-+extern int vfs_unlink(struct inode *, struct dentry *, struct nameidata *);
- extern int vfs_rename(struct inode *, struct dentry *, struct inode *, struct dentry *);
-
- /*
-@@ -1158,6 +1186,7 @@ struct inode_operations {
- ssize_t (*listxattr) (struct dentry *, char *, size_t);
- int (*removexattr) (struct dentry *, const char *);
- void (*truncate_range)(struct inode *, loff_t, loff_t);
-+ int (*sync_flags) (struct inode *);
- };
-
- struct seq_file;
-@@ -1173,6 +1202,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);
-
- /*
- * NOTE: write_inode, delete_inode, clear_inode, put_inode can be called
-@@ -1202,8 +1232,8 @@ struct super_operations {
- int (*show_options)(struct seq_file *, struct vfsmount *);
- int (*show_stats)(struct seq_file *, struct vfsmount *);
- #ifdef CONFIG_QUOTA
-- ssize_t (*quota_read)(struct super_block *, int, char *, size_t, loff_t);
-- ssize_t (*quota_write)(struct super_block *, int, const char *, size_t, loff_t);
-+ ssize_t (*quota_read)(struct dqhash *, int, char *, size_t, loff_t);
-+ ssize_t (*quota_write)(struct dqhash *, int, const char *, size_t, loff_t);
- #endif
- };
-
-@@ -1715,7 +1745,7 @@ extern struct inode *new_inode(struct su
- extern int __remove_suid(struct dentry *, int);
- extern int should_remove_suid(struct dentry *);
- extern int remove_suid(struct dentry *);
--extern void remove_dquot_ref(struct super_block *, int, struct list_head *);
-+extern void remove_dquot_ref(struct dqhash *, int, struct list_head *);
-
- extern void __insert_inode_hash(struct inode *, unsigned long hashval);
- extern void remove_inode_hash(struct inode *);
-@@ -1751,6 +1781,7 @@ extern ssize_t generic_file_buffered_wri
- extern ssize_t do_sync_read(struct file *filp, char __user *buf, size_t len, loff_t *ppos);
- extern ssize_t do_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos);
- extern ssize_t generic_file_sendfile(struct file *, loff_t *, size_t, read_actor_t, void *);
-+extern ssize_t generic_file_sendpage(struct file *, struct page *, int, size_t, loff_t *, int);
- extern void do_generic_mapping_read(struct address_space *mapping,
- struct file_ra_state *, struct file *,
- loff_t *, read_descriptor_t *, read_actor_t);
-@@ -1884,6 +1915,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 simple_getattr(struct vfsmount *, struct dentry *, struct kstat *);
- extern int simple_statfs(struct dentry *, struct kstatfs *);
- extern int simple_link(struct dentry *, struct inode *, struct dentry *);
-diff -NurpP --minimal linux-2.6.19.1/include/linux/init_task.h linux-2.6.19.1-vs2.3.0.6/include/linux/init_task.h
---- linux-2.6.19.1/include/linux/init_task.h 2006-11-30 21:19:38 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/init_task.h 2006-11-08 04:57:40 +0100
-@@ -140,6 +140,10 @@ extern struct group_info init_groups;
- .pi_lock = SPIN_LOCK_UNLOCKED, \
- INIT_TRACE_IRQFLAGS \
- INIT_LOCKDEP \
-+ .xid = 0, \
-+ .vx_info = NULL, \
-+ .nid = 0, \
-+ .nx_info = NULL, \
- }
-
-
-diff -NurpP --minimal linux-2.6.19.1/include/linux/ipc.h linux-2.6.19.1-vs2.3.0.6/include/linux/ipc.h
---- linux-2.6.19.1/include/linux/ipc.h 2006-11-30 21:19:38 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/ipc.h 2006-11-08 20:20:37 +0100
-@@ -63,6 +63,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.19.1/include/linux/jffs2.h linux-2.6.19.1-vs2.3.0.6/include/linux/jffs2.h
---- linux-2.6.19.1/include/linux/jffs2.h 2006-11-30 21:19:38 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/jffs2.h 2006-12-16 10:19:32 +0100
-@@ -82,12 +82,16 @@
- //#define JFFS2_NODETYPE_OPTIONS (JFFS2_FEATURE_RWCOMPAT_COPY | JFFS2_NODE_ACCURATE | 4)
-
-
--#define JFFS2_INO_FLAG_PREREAD 1 /* Do read_inode() for this one at
-+#define JFFS2_INO_FLAG_PREREAD 0x01 /* Do read_inode() for this one at
- mount time, don't wait for it to
- happen later */
--#define JFFS2_INO_FLAG_USERCOMPR 2 /* User has requested a specific
-+#define JFFS2_INO_FLAG_USERCOMPR 0x02 /* User has requested a specific
- compression type */
-
-+#define JFFS2_INO_FLAG_IMMUTABLE 0x10 /* immutable node */
-+#define JFFS2_INO_FLAG_IUNLINK 0x20 /* immutable unlink */
-+#define JFFS2_INO_FLAG_BARRIER 0x40 /* barrier */
-+
-
- /* These can go once we've made sure we've caught all uses without
- byteswapping */
-diff -NurpP --minimal linux-2.6.19.1/include/linux/loop.h linux-2.6.19.1-vs2.3.0.6/include/linux/loop.h
---- linux-2.6.19.1/include/linux/loop.h 2006-11-30 21:19:38 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/loop.h 2006-11-08 04:57:52 +0100
-@@ -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.19.1/include/linux/major.h linux-2.6.19.1-vs2.3.0.6/include/linux/major.h
---- linux-2.6.19.1/include/linux/major.h 2006-06-18 04:55:19 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/major.h 2006-11-08 04:57:51 +0100
-@@ -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.19.1/include/linux/mount.h linux-2.6.19.1-vs2.3.0.6/include/linux/mount.h
---- linux-2.6.19.1/include/linux/mount.h 2006-09-20 16:58:44 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/mount.h 2006-11-08 04:57:52 +0100
-@@ -27,12 +27,16 @@ struct namespace;
- #define MNT_NOEXEC 0x04
- #define MNT_NOATIME 0x08
- #define MNT_NODIRATIME 0x10
-+#define MNT_RDONLY 0x20
-+
-+#define MNT_IS_RDONLY(m) ((m) && ((m)->mnt_flags & MNT_RDONLY))
-
- #define MNT_SHRINKABLE 0x100
-
- #define MNT_SHARED 0x1000 /* if the vfsmount is a shared mount */
- #define MNT_UNBINDABLE 0x2000 /* if the vfsmount is a unbindable mount */
- #define MNT_PNODE_MASK 0x3000 /* propogation flag mask */
-+#define MNT_TAGID 0x8000
-
- struct vfsmount {
- struct list_head mnt_hash;
-@@ -54,6 +58,7 @@ struct vfsmount {
- struct vfsmount *mnt_master; /* slave is on master->mnt_slave_list */
- struct namespace *mnt_namespace; /* containing namespace */
- int mnt_pinned;
-+ tag_t mnt_tag; /* tagging used for vfsmount */
- };
-
- static inline struct vfsmount *mntget(struct vfsmount *mnt)
-diff -NurpP --minimal linux-2.6.19.1/include/linux/net.h linux-2.6.19.1-vs2.3.0.6/include/linux/net.h
---- linux-2.6.19.1/include/linux/net.h 2006-11-30 21:19:38 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/net.h 2006-11-08 04:57:42 +0100
-@@ -63,6 +63,7 @@ typedef enum {
- #define SOCK_NOSPACE 2
- #define SOCK_PASSCRED 3
- #define SOCK_PASSSEC 4
-+#define SOCK_USER_SOCKET 5
-
- #ifndef ARCH_HAS_SOCKET_TYPES
- /**
-diff -NurpP --minimal linux-2.6.19.1/include/linux/nfs_mount.h linux-2.6.19.1-vs2.3.0.6/include/linux/nfs_mount.h
---- linux-2.6.19.1/include/linux/nfs_mount.h 2005-08-29 22:25:42 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/nfs_mount.h 2006-11-08 04:57:47 +0100
-@@ -61,6 +61,7 @@ struct nfs_mount_data {
- #define NFS_MOUNT_NOACL 0x0800 /* 4 */
- #define NFS_MOUNT_STRICTLOCK 0x1000 /* reserved for NFSv4 */
- #define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 */
-+#define NFS_MOUNT_TAGGED 0x8000 /* context tagging */
- #define NFS_MOUNT_FLAGMASK 0xFFFF
-
- #endif
-diff -NurpP --minimal linux-2.6.19.1/include/linux/nsproxy.h linux-2.6.19.1-vs2.3.0.6/include/linux/nsproxy.h
---- linux-2.6.19.1/include/linux/nsproxy.h 2006-11-30 21:19:39 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/nsproxy.h 2006-11-30 20:55:45 +0100
-@@ -51,4 +51,10 @@ static inline void exit_task_namespaces(
- put_nsproxy(ns);
- }
- }
-+
-+static inline void get_nsproxy(struct nsproxy *ns)
-+{
-+ atomic_inc(&ns->count);
-+}
-+
- #endif
-diff -NurpP --minimal linux-2.6.19.1/include/linux/percpu.h linux-2.6.19.1-vs2.3.0.6/include/linux/percpu.h
---- linux-2.6.19.1/include/linux/percpu.h 2006-11-30 21:19:39 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/percpu.h 2006-11-08 04:57:40 +0100
-@@ -11,7 +11,7 @@
-
- /* Enough to cover all DEFINE_PER_CPUs in kernel, including modules. */
- #ifndef PERCPU_ENOUGH_ROOM
--#define PERCPU_ENOUGH_ROOM 32768
-+#define PERCPU_ENOUGH_ROOM 65536
- #endif
-
- /*
-diff -NurpP --minimal linux-2.6.19.1/include/linux/pid.h linux-2.6.19.1-vs2.3.0.6/include/linux/pid.h
---- linux-2.6.19.1/include/linux/pid.h 2006-11-30 21:19:39 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/pid.h 2006-11-08 04:57:52 +0100
-@@ -8,7 +8,8 @@ enum pid_type
- PIDTYPE_PID,
- PIDTYPE_PGID,
- PIDTYPE_SID,
-- PIDTYPE_MAX
-+ PIDTYPE_MAX,
-+ PIDTYPE_REALPID
- };
-
- /*
-diff -NurpP --minimal linux-2.6.19.1/include/linux/proc_fs.h linux-2.6.19.1-vs2.3.0.6/include/linux/proc_fs.h
---- linux-2.6.19.1/include/linux/proc_fs.h 2006-11-30 21:19:39 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/proc_fs.h 2006-12-09 03:46:57 +0100
-@@ -54,6 +54,7 @@ struct proc_dir_entry {
- nlink_t nlink;
- uid_t uid;
- gid_t gid;
-+ int vx_flags;
- loff_t size;
- struct inode_operations * proc_iops;
- const struct file_operations * proc_fops;
-@@ -247,10 +248,14 @@ extern void kclist_add(struct kcore_list
- union proc_op {
- int (*proc_get_link)(struct inode *, struct dentry **, struct vfsmount **);
- int (*proc_read)(struct task_struct *task, char *page);
-+ 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 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.19.1/include/linux/quota.h linux-2.6.19.1-vs2.3.0.6/include/linux/quota.h
---- linux-2.6.19.1/include/linux/quota.h 2006-09-20 16:58:44 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/quota.h 2006-11-08 04:57:51 +0100
-@@ -55,6 +55,13 @@ extern spinlock_t dq_data_lock;
- #define kb2qb(x) ((x) >> (QUOTABLOCK_BITS-10))
- #define toqb(x) (((x) + QUOTABLOCK_SIZE - 1) >> QUOTABLOCK_BITS)
-
-+/* are NULL dqhash ptrs valid? */
-+#ifdef HANDLE_DQHASH_NULL
-+#define dqhash_valid(hash) ((hash) != NULL)
-+#else
-+#define dqhash_valid(hash) (0 == 0)
-+#endif
-+
- #define MAXQUOTAS 2
- #define USRQUOTA 0 /* element used for user quotas */
- #define GRPQUOTA 1 /* element used for group quotas */
-@@ -176,19 +183,20 @@ struct mem_dqinfo {
- } u;
- };
-
--struct super_block;
-+struct dqhash;
-
- #define DQF_MASK 0xffff /* Mask for format specific flags */
- #define DQF_INFO_DIRTY_B 16
- #define DQF_INFO_DIRTY (1 << DQF_INFO_DIRTY_B) /* Is info dirty? */
-
--extern void mark_info_dirty(struct super_block *sb, int type);
-+extern void mark_info_dirty(struct dqhash *hash, int type);
-+
- #define info_dirty(info) test_bit(DQF_INFO_DIRTY_B, &(info)->dqi_flags)
- #define info_any_dquot_dirty(info) (!list_empty(&(info)->dqi_dirty_list))
- #define info_any_dirty(info) (info_dirty(info) || info_any_dquot_dirty(info))
-
--#define sb_dqopt(sb) (&(sb)->s_dquot)
--#define sb_dqinfo(sb, type) (sb_dqopt(sb)->info+(type))
-+#define dqh_dqopt(hash) (&(hash)->dqh_dqopt)
-+#define dqh_dqinfo(hash, type) (dqh_dqopt(hash)->info+(type))
-
- struct dqstats {
- int lookups;
-@@ -218,7 +226,7 @@ struct dquot {
- struct mutex dq_lock; /* dquot IO lock */
- atomic_t dq_count; /* Use count */
- wait_queue_head_t dq_wait_unused; /* Wait queue for dquot to become unused */
-- struct super_block *dq_sb; /* superblock this applies to */
-+ struct dqhash *dq_dqh; /* quota hash backpointer */
- unsigned int dq_id; /* ID this applies to (uid, gid) */
- loff_t dq_off; /* Offset of dquot on disk */
- unsigned long dq_flags; /* See DQ_* */
-@@ -233,13 +241,14 @@ struct dquot {
-
- /* Operations which must be implemented by each quota format */
- struct quota_format_ops {
-- int (*check_quota_file)(struct super_block *sb, int type); /* Detect whether file is in our format */
-- int (*read_file_info)(struct super_block *sb, int type); /* Read main info about file - called on quotaon() */
-- int (*write_file_info)(struct super_block *sb, int type); /* Write main info about file */
-- int (*free_file_info)(struct super_block *sb, int type); /* Called on quotaoff() */
-- int (*read_dqblk)(struct dquot *dquot); /* Read structure for one user */
-- int (*commit_dqblk)(struct dquot *dquot); /* Write structure for one user */
-- int (*release_dqblk)(struct dquot *dquot); /* Called when last reference to dquot is being dropped */
-+ int (*check_quota_file)(struct dqhash *, int); /* Detect whether file is in our format */
-+ int (*read_file_info)(struct dqhash *, int); /* Read main info about file - called on quotaon() */
-+ int (*write_file_info)(struct dqhash *, int); /* Write main info about file */
-+ int (*free_file_info)(struct dqhash *, int); /* Called on quotaoff() */
-+
-+ int (*read_dqblk)(struct dquot *); /* Read structure for one user */
-+ int (*commit_dqblk)(struct dquot *); /* Write structure for one user */
-+ int (*release_dqblk)(struct dquot *); /* Called when last reference to dquot is being dropped */
- };
-
- /* Operations working with dquots */
-@@ -255,22 +264,22 @@ struct dquot_operations {
- int (*acquire_dquot) (struct dquot *); /* Quota is going to be created on disk */
- int (*release_dquot) (struct dquot *); /* Quota is going to be deleted from disk */
- int (*mark_dirty) (struct dquot *); /* Dquot is marked dirty */
-- int (*write_info) (struct super_block *, int); /* Write of quota "superblock" */
-+ int (*write_info) (struct dqhash *, int); /* Write of quota "superblock" */
- };
-
- /* Operations handling requests from userspace */
- struct quotactl_ops {
-- int (*quota_on)(struct super_block *, int, int, char *);
-- int (*quota_off)(struct super_block *, int);
-- int (*quota_sync)(struct super_block *, int);
-- int (*get_info)(struct super_block *, int, struct if_dqinfo *);
-- int (*set_info)(struct super_block *, int, struct if_dqinfo *);
-- int (*get_dqblk)(struct super_block *, int, qid_t, struct if_dqblk *);
-- int (*set_dqblk)(struct super_block *, int, qid_t, struct if_dqblk *);
-- int (*get_xstate)(struct super_block *, struct fs_quota_stat *);
-- int (*set_xstate)(struct super_block *, unsigned int, int);
-- int (*get_xquota)(struct super_block *, int, qid_t, struct fs_disk_quota *);
-- int (*set_xquota)(struct super_block *, int, qid_t, struct fs_disk_quota *);
-+ int (*quota_on)(struct dqhash *, int, int, char *);
-+ int (*quota_off)(struct dqhash *, int);
-+ int (*quota_sync)(struct dqhash *, int);
-+ int (*get_info)(struct dqhash *, int, struct if_dqinfo *);
-+ int (*set_info)(struct dqhash *, int, struct if_dqinfo *);
-+ int (*get_dqblk)(struct dqhash *, int, qid_t, struct if_dqblk *);
-+ int (*set_dqblk)(struct dqhash *, int, qid_t, struct if_dqblk *);
-+ int (*get_xstate)(struct dqhash *, struct fs_quota_stat *);
-+ int (*set_xstate)(struct dqhash *, unsigned int, int);
-+ int (*get_xquota)(struct dqhash *, int, qid_t, struct fs_disk_quota *);
-+ int (*set_xquota)(struct dqhash *, int, qid_t, struct fs_disk_quota *);
- };
-
- struct quota_format_type {
-@@ -293,16 +302,15 @@ struct quota_info {
- struct quota_format_ops *ops[MAXQUOTAS]; /* Operations for each type */
- };
-
--/* Inline would be better but we need to dereference super_block which is not defined yet */
--int mark_dquot_dirty(struct dquot *dquot);
-
- #define dquot_dirty(dquot) test_bit(DQ_MOD_B, &(dquot)->dq_flags)
-
--#define sb_has_quota_enabled(sb, type) ((type)==USRQUOTA ? \
-- (sb_dqopt(sb)->flags & DQUOT_USR_ENABLED) : (sb_dqopt(sb)->flags & DQUOT_GRP_ENABLED))
-+#define dqh_has_quota_enabled(hash, type) (dqhash_valid(hash) && ((type)==USRQUOTA ? \
-+ (dqh_dqopt(hash)->flags & DQUOT_USR_ENABLED) : (dqh_dqopt(hash)->flags & DQUOT_GRP_ENABLED)))
-+
-+#define dqh_any_quota_enabled(hash) (dqhash_valid(hash) && \
-+ (dqh_has_quota_enabled(hash, USRQUOTA) || dqh_has_quota_enabled(hash, GRPQUOTA)))
-
--#define sb_any_quota_enabled(sb) (sb_has_quota_enabled(sb, USRQUOTA) | \
-- sb_has_quota_enabled(sb, GRPQUOTA))
-
- int register_quota_format(struct quota_format_type *fmt);
- void unregister_quota_format(struct quota_format_type *fmt);
-@@ -317,6 +325,50 @@ struct quota_module_name {
- {QFMT_VFS_V0, "quota_v2"},\
- {0, NULL}}
-
-+struct dqhash {
-+ struct list_head dqh_list; /* List of all quota hashes */
-+ unsigned int dqh_id; /* ID for hash */
-+ atomic_t dqh_count; /* Use count */
-+ struct quota_info dqh_dqopt; /* Diskquota specific options */
-+ struct dquot_operations *dqh_qop;
-+ struct quotactl_ops *dqh_qcop;
-+ struct super_block *dqh_sb; /* super block */
-+ unsigned int dqh_hash_bits;
-+ unsigned int dqh_hash_mask;
-+ struct hlist_head *dqh_hash;
-+};
-+
-+#ifdef CONFIG_QUOTACTL
-+
-+struct dqhash *new_dqhash(struct super_block *, unsigned int);
-+void destroy_dqhash(struct dqhash *);
-+struct dqhash *find_dqhash(unsigned int);
-+
-+static inline void dqhput(struct dqhash *hash)
-+{
-+ if (dqhash_valid(hash))
-+ if (atomic_dec_and_test(&hash->dqh_count))
-+ destroy_dqhash(hash);
-+}
-+
-+static inline struct dqhash *dqhget(struct dqhash *hash)
-+{
-+ if (dqhash_valid(hash))
-+ atomic_inc(&hash->dqh_count);
-+ return hash;
-+}
-+
-+#else /* CONFIG_QUOTACTL */
-+
-+#define new_dqhash(sb, dqdom) (0)
-+#define find_dqhash(dqdom) (0)
-+#define destroy_dqhash(hash) do { } while(0)
-+
-+#define dqhput(hash) do { } while(0)
-+#define dqhget(hash) (hash)
-+
-+#endif /* CONFIG_QUOTACTL */
-+
- #else
-
- # /* nodep */ include <sys/cdefs.h>
-diff -NurpP --minimal linux-2.6.19.1/include/linux/quotaops.h linux-2.6.19.1-vs2.3.0.6/include/linux/quotaops.h
---- linux-2.6.19.1/include/linux/quotaops.h 2006-09-20 16:58:44 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/quotaops.h 2006-11-08 04:57:51 +0100
-@@ -19,7 +19,7 @@
- /*
- * declaration of quota_function calls in kernel.
- */
--extern void sync_dquots(struct super_block *sb, int type);
-+extern void sync_dquots(struct dqhash *hash, int type);
-
- extern int dquot_initialize(struct inode *inode, int type);
- extern int dquot_drop(struct inode *inode);
-@@ -34,19 +34,19 @@ extern int dquot_transfer(struct inode *
- extern int dquot_commit(struct dquot *dquot);
- extern int dquot_acquire(struct dquot *dquot);
- extern int dquot_release(struct dquot *dquot);
--extern int dquot_commit_info(struct super_block *sb, int type);
-+extern int dquot_commit_info(struct dqhash *hash, int type);
- extern int dquot_mark_dquot_dirty(struct dquot *dquot);
-
--extern int vfs_quota_on(struct super_block *sb, int type, int format_id, char *path);
--extern int vfs_quota_on_mount(struct super_block *sb, char *qf_name,
-+extern int vfs_quota_on(struct dqhash *hash, int type, int format_id, char *path);
-+extern int vfs_quota_on_mount(struct dqhash *hash, char *qf_name,
- int format_id, int type);
--extern int vfs_quota_off(struct super_block *sb, int type);
--#define vfs_quota_off_mount(sb, type) vfs_quota_off(sb, type)
--extern int vfs_quota_sync(struct super_block *sb, int type);
--extern int vfs_get_dqinfo(struct super_block *sb, int type, struct if_dqinfo *ii);
--extern int vfs_set_dqinfo(struct super_block *sb, int type, struct if_dqinfo *ii);
--extern int vfs_get_dqblk(struct super_block *sb, int type, qid_t id, struct if_dqblk *di);
--extern int vfs_set_dqblk(struct super_block *sb, int type, qid_t id, struct if_dqblk *di);
-+extern int vfs_quota_off(struct dqhash *hash, int type);
-+#define vfs_quota_off_mount(dqh, type) vfs_quota_off(dqh, type)
-+extern int vfs_quota_sync(struct dqhash *hash, int type);
-+extern int vfs_get_dqinfo(struct dqhash *hash, int type, struct if_dqinfo *ii);
-+extern int vfs_set_dqinfo(struct dqhash *hash, int type, struct if_dqinfo *ii);
-+extern int vfs_get_dqblk(struct dqhash *hash, int type, qid_t id, struct if_dqblk *di);
-+extern int vfs_set_dqblk(struct dqhash *hash, int type, qid_t id, struct if_dqblk *di);
-
- /*
- * Operations supported for diskquotas.
-@@ -61,9 +61,12 @@ extern struct quotactl_ops vfs_quotactl_
- * need a lot of space in journal for dquot structure allocation. */
- static __inline__ void DQUOT_INIT(struct inode *inode)
- {
-- BUG_ON(!inode->i_sb);
-- if (sb_any_quota_enabled(inode->i_sb) && !IS_NOQUOTA(inode))
-- inode->i_sb->dq_op->initialize(inode, -1);
-+ if (!dqhash_valid(inode->i_dqh))
-+ return;
-+ BUG_ON(!inode->i_dqh);
-+ // printk("DQUOT_INIT(%p,%p,%d)\n", inode, inode->i_dqh, dqh_any_quota_enabled(inode->i_dqh));
-+ if (dqh_any_quota_enabled(inode->i_dqh) && !IS_NOQUOTA(inode))
-+ inode->i_dqh->dqh_qop->initialize(inode, -1);
- }
-
- /* The same as with DQUOT_INIT */
-@@ -72,8 +75,8 @@ static __inline__ void DQUOT_DROP(struct
- /* Here we can get arbitrary inode from clear_inode() so we have
- * to be careful. OTOH we don't need locking as quota operations
- * are allowed to change only at mount time */
-- if (!IS_NOQUOTA(inode) && inode->i_sb && inode->i_sb->dq_op
-- && inode->i_sb->dq_op->drop) {
-+ if (!IS_NOQUOTA(inode) && inode->i_dqh && inode->i_dqh->dqh_qop
-+ && inode->i_dqh->dqh_qop->drop) {
- int cnt;
- /* Test before calling to rule out calls from proc and such
- * where we are not allowed to block. Note that this is
-@@ -84,7 +87,7 @@ static __inline__ void DQUOT_DROP(struct
- if (inode->i_dquot[cnt] != NODQUOT)
- break;
- if (cnt < MAXQUOTAS)
-- inode->i_sb->dq_op->drop(inode);
-+ inode->i_dqh->dqh_qop->drop(inode);
- }
- }
-
-@@ -92,9 +95,9 @@ static __inline__ void DQUOT_DROP(struct
- * a transaction (deadlocks possible otherwise) */
- static __inline__ int DQUOT_PREALLOC_SPACE_NODIRTY(struct inode *inode, qsize_t nr)
- {
-- if (sb_any_quota_enabled(inode->i_sb)) {
-+ if (dqh_any_quota_enabled(inode->i_dqh)) {
- /* Used space is updated in alloc_space() */
-- if (inode->i_sb->dq_op->alloc_space(inode, nr, 1) == NO_QUOTA)
-+ if (inode->i_dqh->dqh_qop->alloc_space(inode, nr, 1) == NO_QUOTA)
- return 1;
- }
- else
-@@ -112,9 +115,9 @@ static __inline__ int DQUOT_PREALLOC_SPA
-
- static __inline__ int DQUOT_ALLOC_SPACE_NODIRTY(struct inode *inode, qsize_t nr)
- {
-- if (sb_any_quota_enabled(inode->i_sb)) {
-+ if (dqh_any_quota_enabled(inode->i_dqh)) {
- /* Used space is updated in alloc_space() */
-- if (inode->i_sb->dq_op->alloc_space(inode, nr, 0) == NO_QUOTA)
-+ if (inode->i_dqh->dqh_qop->alloc_space(inode, nr, 0) == NO_QUOTA)
- return 1;
- }
- else
-@@ -132,9 +135,9 @@ static __inline__ int DQUOT_ALLOC_SPACE(
-
- static __inline__ int DQUOT_ALLOC_INODE(struct inode *inode)
- {
-- if (sb_any_quota_enabled(inode->i_sb)) {
-+ if (dqh_any_quota_enabled(inode->i_dqh)) {
- DQUOT_INIT(inode);
-- if (inode->i_sb->dq_op->alloc_inode(inode, 1) == NO_QUOTA)
-+ if (inode->i_dqh->dqh_qop->alloc_inode(inode, 1) == NO_QUOTA)
- return 1;
- }
- return 0;
-@@ -142,8 +145,8 @@ static __inline__ int DQUOT_ALLOC_INODE(
-
- static __inline__ void DQUOT_FREE_SPACE_NODIRTY(struct inode *inode, qsize_t nr)
- {
-- if (sb_any_quota_enabled(inode->i_sb))
-- inode->i_sb->dq_op->free_space(inode, nr);
-+ if (dqh_any_quota_enabled(inode->i_dqh))
-+ inode->i_dqh->dqh_qop->free_space(inode, nr);
- else
- inode_sub_bytes(inode, nr);
- }
-@@ -156,29 +159,30 @@ static __inline__ void DQUOT_FREE_SPACE(
-
- static __inline__ void DQUOT_FREE_INODE(struct inode *inode)
- {
-- if (sb_any_quota_enabled(inode->i_sb))
-- inode->i_sb->dq_op->free_inode(inode, 1);
-+ if (dqh_any_quota_enabled(inode->i_dqh))
-+ inode->i_dqh->dqh_qop->free_inode(inode, 1);
- }
-
- static __inline__ int DQUOT_TRANSFER(struct inode *inode, struct iattr *iattr)
- {
-- if (sb_any_quota_enabled(inode->i_sb) && !IS_NOQUOTA(inode)) {
-+ if (dqh_any_quota_enabled(inode->i_dqh) && !IS_NOQUOTA(inode)) {
- DQUOT_INIT(inode);
-- if (inode->i_sb->dq_op->transfer(inode, iattr) == NO_QUOTA)
-+ if (inode->i_dqh->dqh_qop->transfer(inode, iattr) == NO_QUOTA)
- return 1;
- }
- return 0;
- }
-
- /* The following two functions cannot be called inside a transaction */
--#define DQUOT_SYNC(sb) sync_dquots(sb, -1)
-+#define DQUOT_SYNC(hash) sync_dquots(hash, -1)
-
--static __inline__ int DQUOT_OFF(struct super_block *sb)
-+static __inline__ int DQUOT_OFF(struct dqhash *hash)
- {
- int ret = -ENOSYS;
-
-- if (sb_any_quota_enabled(sb) && sb->s_qcop && sb->s_qcop->quota_off)
-- ret = sb->s_qcop->quota_off(sb, -1);
-+ if (dqh_any_quota_enabled(hash) && hash->dqh_qcop &&
-+ hash->dqh_qcop->quota_off)
-+ ret = hash->dqh_qcop->quota_off(hash, -1);
- return ret;
- }
-
-@@ -193,8 +197,8 @@ static __inline__ int DQUOT_OFF(struct s
- #define DQUOT_DROP(inode) do { } while(0)
- #define DQUOT_ALLOC_INODE(inode) (0)
- #define DQUOT_FREE_INODE(inode) do { } while(0)
--#define DQUOT_SYNC(sb) do { } while(0)
--#define DQUOT_OFF(sb) do { } while(0)
-+#define DQUOT_SYNC(hash) do { } while(0)
-+#define DQUOT_OFF(hash) do { } while(0)
- #define DQUOT_TRANSFER(inode, iattr) (0)
- static inline int DQUOT_PREALLOC_SPACE_NODIRTY(struct inode *inode, qsize_t nr)
- {
-diff -NurpP --minimal linux-2.6.19.1/include/linux/reiserfs_fs.h linux-2.6.19.1-vs2.3.0.6/include/linux/reiserfs_fs.h
---- linux-2.6.19.1/include/linux/reiserfs_fs.h 2006-11-30 21:19:39 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/reiserfs_fs.h 2006-12-17 04:16:56 +0100
-@@ -821,6 +821,10 @@ 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_BARRIER_FL (FS_BARRIER_FL >> 16)
-+#define REISERFS_IUNLINK_FL (FS_IUNLINK_FL >> 16)
-+
- /* persistent flags that file inherits from the parent directory */
- #define REISERFS_INHERIT_MASK ( REISERFS_IMMUTABLE_FL | \
- REISERFS_SYNC_FL | \
-@@ -830,6 +834,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 {
-@@ -1901,6 +1908,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);
-
- /* namei.c */
- void set_de_name_and_namelen(struct reiserfs_dir_entry *de);
-diff -NurpP --minimal linux-2.6.19.1/include/linux/reiserfs_fs_sb.h linux-2.6.19.1-vs2.3.0.6/include/linux/reiserfs_fs_sb.h
---- linux-2.6.19.1/include/linux/reiserfs_fs_sb.h 2006-11-30 21:19:39 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/reiserfs_fs_sb.h 2006-11-08 04:57:46 +0100
-@@ -456,6 +456,7 @@ enum reiserfs_mount_options {
- REISERFS_POSIXACL,
- REISERFS_BARRIER_NONE,
- REISERFS_BARRIER_FLUSH,
-+ REISERFS_TAGGED,
-
- /* Actions on error */
- REISERFS_ERROR_PANIC,
-diff -NurpP --minimal linux-2.6.19.1/include/linux/sched.h linux-2.6.19.1-vs2.3.0.6/include/linux/sched.h
---- linux-2.6.19.1/include/linux/sched.h 2006-11-30 21:19:39 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/sched.h 2006-12-13 09:15:23 +0100
-@@ -26,6 +26,7 @@
- #define CLONE_STOPPED 0x02000000 /* Start in stopped state */
- #define CLONE_NEWUTS 0x04000000 /* New utsname group? */
- #define CLONE_NEWIPC 0x08000000 /* New ipcs */
-+#define CLONE_KTHREAD 0x10000000 /* clone a kernel thread */
-
- /*
- * Scheduling policies
-@@ -54,6 +55,7 @@ struct sched_param {
- #include <linux/cpumask.h>
- #include <linux/errno.h>
- #include <linux/nodemask.h>
-+// #include <linux/vs_base.h>
-
- #include <asm/system.h>
- #include <asm/semaphore.h>
-@@ -92,7 +94,7 @@ struct futex_pi_state;
- * List of flags we want to share for kernel threads,
- * if only because they are not used by them anyway.
- */
--#define CLONE_KERNEL (CLONE_FS | CLONE_FILES | CLONE_SIGHAND)
-+#define CLONE_KERNEL (CLONE_FS|CLONE_FILES|CLONE_SIGHAND|CLONE_KTHREAD)
-
- /*
- * These are the constant used to fake the fixed-point load-average
-@@ -144,12 +146,13 @@ extern unsigned long weighted_cpuload(co
- #define TASK_UNINTERRUPTIBLE 2
- #define TASK_STOPPED 4
- #define TASK_TRACED 8
-+#define TASK_ONHOLD 16
- /* in tsk->exit_state */
--#define EXIT_ZOMBIE 16
--#define EXIT_DEAD 32
-+#define EXIT_ZOMBIE 32
-+#define EXIT_DEAD 64
- /* in tsk->state again */
--#define TASK_NONINTERACTIVE 64
--#define TASK_DEAD 128
-+#define TASK_NONINTERACTIVE 128
-+#define TASK_DEAD 256
-
- #define __set_task_state(tsk, state_value) \
- do { (tsk)->state = (state_value); } while (0)
-@@ -264,27 +267,30 @@ extern void arch_unmap_area_topdown(stru
- * The mm counters are not protected by its page_table_lock,
- * so must be incremented atomically.
- */
--#define set_mm_counter(mm, member, value) atomic_long_set(&(mm)->_##member, value)
--#define get_mm_counter(mm, member) ((unsigned long)atomic_long_read(&(mm)->_##member))
--#define add_mm_counter(mm, member, value) atomic_long_add(value, &(mm)->_##member)
--#define inc_mm_counter(mm, member) atomic_long_inc(&(mm)->_##member)
--#define dec_mm_counter(mm, member) atomic_long_dec(&(mm)->_##member)
- typedef atomic_long_t mm_counter_t;
-+#define __set_mm_counter(mm, member, value) \
-+ atomic_long_set(&(mm)->_##member, value)
-+#define get_mm_counter(mm, member) \
-+ ((unsigned long)atomic_long_read(&(mm)->_##member))
-
- #else /* NR_CPUS < CONFIG_SPLIT_PTLOCK_CPUS */
- /*
- * The mm counters are protected by its page_table_lock,
- * so can be incremented directly.
- */
--#define set_mm_counter(mm, member, value) (mm)->_##member = (value)
--#define get_mm_counter(mm, member) ((mm)->_##member)
--#define add_mm_counter(mm, member, value) (mm)->_##member += (value)
--#define inc_mm_counter(mm, member) (mm)->_##member++
--#define dec_mm_counter(mm, member) (mm)->_##member--
- typedef unsigned long mm_counter_t;
-+#define __set_mm_counter(mm, member, value) (mm)->_##member = (value)
-+#define get_mm_counter(mm, member) ((mm)->_##member)
-
- #endif /* NR_CPUS < CONFIG_SPLIT_PTLOCK_CPUS */
-
-+#define set_mm_counter(mm, member, value) \
-+ vx_ ## member ## pages_sub((mm), (get_mm_counter(mm, member) - value))
-+#define add_mm_counter(mm, member, value) \
-+ vx_ ## member ## pages_add((mm), (value))
-+#define inc_mm_counter(mm, member) vx_ ## member ## pages_inc((mm))
-+#define dec_mm_counter(mm, member) vx_ ## member ## pages_dec((mm))
-+
- #define get_mm_rss(mm) \
- (get_mm_counter(mm, file_rss) + get_mm_counter(mm, anon_rss))
- #define update_hiwater_rss(mm) do { \
-@@ -343,6 +349,7 @@ struct mm_struct {
-
- /* Architecture-specific MM context */
- mm_context_t context;
-+ struct vx_info *mm_vx_info;
-
- /* Token based thrashing protection. */
- unsigned long swap_token_time;
-@@ -532,9 +539,10 @@ struct user_struct {
- /* Hash table maintenance information */
- struct list_head uidhash_list;
- uid_t uid;
-+ xid_t xid;
- };
-
--extern struct user_struct *find_user(uid_t);
-+extern struct user_struct *find_user(xid_t, uid_t);
-
- extern struct user_struct root_user;
- #define INIT_USER (&root_user)
-@@ -925,6 +933,14 @@ struct task_struct {
-
- void *security;
- struct audit_context *audit_context;
-+
-+/* vserver context data */
-+ struct vx_info *vx_info;
-+ struct nx_info *nx_info;
-+
-+ xid_t xid;
-+ nid_t nid;
-+
- seccomp_t seccomp;
-
- /* Thread group tracking */
-@@ -1221,13 +1237,18 @@ extern struct task_struct init_task;
-
- extern struct mm_struct init_mm;
-
--#define find_task_by_pid(nr) find_task_by_pid_type(PIDTYPE_PID, nr)
-+
-+#define find_task_by_real_pid(nr) \
-+ find_task_by_pid_type(PIDTYPE_REALPID, nr)
-+#define find_task_by_pid(nr) \
-+ find_task_by_pid_type(PIDTYPE_PID, nr)
-+
- extern struct task_struct *find_task_by_pid_type(int type, int pid);
- extern void set_special_pids(pid_t session, pid_t pgrp);
- extern void __set_special_pids(pid_t session, pid_t pgrp);
-
- /* per-UID process charging. */
--extern struct user_struct * alloc_uid(uid_t);
-+extern struct user_struct * alloc_uid(xid_t, uid_t);
- static inline struct user_struct *get_uid(struct user_struct *u)
- {
- atomic_inc(&u->__count);
-diff -NurpP --minimal linux-2.6.19.1/include/linux/security.h linux-2.6.19.1-vs2.3.0.6/include/linux/security.h
---- linux-2.6.19.1/include/linux/security.h 2006-11-30 21:19:39 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/security.h 2006-11-08 04:57:51 +0100
-@@ -1172,7 +1172,7 @@ struct security_operations {
- int (*capable) (struct task_struct * tsk, int cap);
- int (*acct) (struct file * file);
- int (*sysctl) (struct ctl_table * table, int op);
-- int (*quotactl) (int cmds, int type, int id, struct super_block * sb);
-+ int (*quotactl) (int cmds, int type, int id, struct dqhash *);
- int (*quota_on) (struct dentry * dentry);
- int (*syslog) (int type);
- int (*settime) (struct timespec *ts, struct timezone *tz);
-@@ -1456,9 +1456,9 @@ static inline int security_sysctl(struct
- }
-
- static inline int security_quotactl (int cmds, int type, int id,
-- struct super_block *sb)
-+ struct dqhash *hash)
- {
-- return security_ops->quotactl (cmds, type, id, sb);
-+ return security_ops->quotactl (cmds, type, id, hash);
- }
-
- static inline int security_quota_on (struct dentry * dentry)
-@@ -2201,7 +2201,7 @@ static inline int security_sysctl(struct
- }
-
- static inline int security_quotactl (int cmds, int type, int id,
-- struct super_block * sb)
-+ struct dqhash * hash)
- {
- return 0;
- }
-diff -NurpP --minimal linux-2.6.19.1/include/linux/shmem_fs.h linux-2.6.19.1-vs2.3.0.6/include/linux/shmem_fs.h
---- linux-2.6.19.1/include/linux/shmem_fs.h 2006-11-30 21:19:39 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/shmem_fs.h 2006-11-08 04:57:53 +0100
-@@ -8,6 +8,9 @@
-
- #define SHMEM_NR_DIRECT 16
-
-+#define TMPFS_SUPER_MAGIC 0x01021994
-+
-+
- struct shmem_inode_info {
- spinlock_t lock;
- unsigned long flags;
-diff -NurpP --minimal linux-2.6.19.1/include/linux/stat.h linux-2.6.19.1-vs2.3.0.6/include/linux/stat.h
---- linux-2.6.19.1/include/linux/stat.h 2006-11-30 21:19:40 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/stat.h 2006-11-08 04:57:46 +0100
-@@ -63,6 +63,7 @@ struct kstat {
- unsigned int nlink;
- uid_t uid;
- gid_t gid;
-+ tag_t tag;
- dev_t rdev;
- loff_t size;
- struct timespec atime;
-diff -NurpP --minimal linux-2.6.19.1/include/linux/sunrpc/auth.h linux-2.6.19.1-vs2.3.0.6/include/linux/sunrpc/auth.h
---- linux-2.6.19.1/include/linux/sunrpc/auth.h 2006-11-30 21:19:40 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/sunrpc/auth.h 2006-11-08 04:57:47 +0100
-@@ -24,6 +24,7 @@
- struct auth_cred {
- uid_t uid;
- gid_t gid;
-+ tag_t tag;
- struct group_info *group_info;
- };
-
-diff -NurpP --minimal linux-2.6.19.1/include/linux/sunrpc/clnt.h linux-2.6.19.1-vs2.3.0.6/include/linux/sunrpc/clnt.h
---- linux-2.6.19.1/include/linux/sunrpc/clnt.h 2006-11-30 21:19:40 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/sunrpc/clnt.h 2006-11-08 04:57:47 +0100
-@@ -42,7 +42,8 @@ struct rpc_clnt {
- cl_intr : 1,/* interruptible */
- cl_autobind : 1,/* use getport() */
- cl_oneshot : 1,/* dispose after use */
-- cl_dead : 1;/* abandoned */
-+ cl_dead : 1,/* abandoned */
-+ cl_tag : 1;/* context tagging */
-
- struct rpc_rtt * cl_rtt; /* RTO estimator data */
-
-diff -NurpP --minimal linux-2.6.19.1/include/linux/syscalls.h linux-2.6.19.1-vs2.3.0.6/include/linux/syscalls.h
---- linux-2.6.19.1/include/linux/syscalls.h 2006-11-30 21:19:40 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/syscalls.h 2006-11-08 04:57:51 +0100
-@@ -294,6 +294,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.19.1/include/linux/sysctl.h linux-2.6.19.1-vs2.3.0.6/include/linux/sysctl.h
---- linux-2.6.19.1/include/linux/sysctl.h 2006-11-30 21:19:40 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/sysctl.h 2006-11-08 21:52:09 +0100
-@@ -101,6 +101,7 @@ enum
- KERN_CAP_BSET=14, /* int: capability bounding set */
- 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 */
-@@ -932,6 +933,9 @@ typedef int ctl_handler (ctl_table *tabl
- typedef int proc_handler (ctl_table *ctl, int write, struct file * filp,
- void __user *buffer, size_t *lenp, loff_t *ppos);
-
-+typedef int virt_handler (struct ctl_table *ctl, int write, xid_t xid,
-+ void **datap, size_t *lenp);
-+
- extern int proc_dostring(ctl_table *, int, struct file *,
- void __user *, size_t *, loff_t *);
- extern int proc_dointvec(ctl_table *, int, struct file *,
-@@ -1016,6 +1020,7 @@ struct ctl_table
- mode_t mode;
- ctl_table *child;
- proc_handler *proc_handler; /* Callback for text formatting */
-+ virt_handler *virt_handler; /* Context virtualization */
- ctl_handler *strategy; /* Callback function for all r/w */
- struct proc_dir_entry *de; /* /proc control block */
- void *extra1;
-diff -NurpP --minimal linux-2.6.19.1/include/linux/sysfs.h linux-2.6.19.1-vs2.3.0.6/include/linux/sysfs.h
---- linux-2.6.19.1/include/linux/sysfs.h 2006-11-30 21:19:40 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/sysfs.h 2006-11-08 04:57:53 +0100
-@@ -13,6 +13,8 @@
- #include <linux/compiler.h>
- #include <asm/atomic.h>
-
-+#define SYSFS_SUPER_MAGIC 0x62656572
-+
- struct kobject;
- struct module;
-
-diff -NurpP --minimal linux-2.6.19.1/include/linux/time.h linux-2.6.19.1-vs2.3.0.6/include/linux/time.h
---- linux-2.6.19.1/include/linux/time.h 2006-09-20 16:58:44 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/time.h 2006-11-08 04:57:40 +0100
-@@ -174,6 +174,9 @@ static inline void timespec_add_ns(struc
- }
- a->tv_nsec = ns;
- }
-+
-+#include <linux/vs_time.h>
-+
- #endif /* __KERNEL__ */
-
- #define NFDBITS __NFDBITS
-diff -NurpP --minimal linux-2.6.19.1/include/linux/types.h linux-2.6.19.1-vs2.3.0.6/include/linux/types.h
---- linux-2.6.19.1/include/linux/types.h 2006-11-30 21:19:40 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/types.h 2006-11-08 04:57:40 +0100
-@@ -39,6 +39,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;
-
- #ifdef CONFIG_UID16
- /* This is defined by include/asm-{arch}/posix_types.h */
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vroot.h linux-2.6.19.1-vs2.3.0.6/include/linux/vroot.h
---- linux-2.6.19.1/include/linux/vroot.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vroot.h 2006-11-08 04:57:51 +0100
-@@ -0,0 +1,51 @@
-+
-+/*
-+ * include/linux/vroot.h
-+ *
-+ * written by Herbert Pötzl, 9/11/2002
-+ * ported to 2.6 by Herbert Pötzl, 30/12/2004
-+ *
-+ * Copyright (C) 2002-2005 by Herbert Pötzl.
-+ * Redistribution of this file is permitted under the
-+ * GNU General Public License.
-+ */
-+
-+#ifndef _LINUX_VROOT_H
-+#define _LINUX_VROOT_H
-+
-+
-+#ifdef __KERNEL__
-+
-+/* Possible states of device */
-+enum {
-+ Vr_unbound,
-+ Vr_bound,
-+};
-+
-+struct vroot_device {
-+ int vr_number;
-+ int vr_refcnt;
-+
-+ struct semaphore vr_ctl_mutex;
-+ struct block_device *vr_device;
-+ int vr_state;
-+};
-+
-+
-+typedef struct block_device *(vroot_grb_func)(struct block_device *);
-+
-+extern int register_vroot_grb(vroot_grb_func *);
-+extern int unregister_vroot_grb(vroot_grb_func *);
-+
-+#endif /* __KERNEL__ */
-+
-+#define MAX_VROOT_DEFAULT 8
-+
-+/*
-+ * IOCTL commands --- we will commandeer 0x56 ('V')
-+ */
-+
-+#define VROOT_SET_DEV 0x5600
-+#define VROOT_CLR_DEV 0x5601
-+
-+#endif /* _LINUX_VROOT_H */
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vs_base.h linux-2.6.19.1-vs2.3.0.6/include/linux/vs_base.h
---- linux-2.6.19.1/include/linux/vs_base.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vs_base.h 2006-11-30 19:39:09 +0100
-@@ -0,0 +1,9 @@
-+#ifndef _VS_BASE_H
-+#define _VS_BASE_H
-+
-+#include "vserver/base.h"
-+#include "vserver/debug.h"
-+
-+#else
-+#warning duplicate inclusion
-+#endif
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vs_context.h linux-2.6.19.1-vs2.3.0.6/include/linux/vs_context.h
---- linux-2.6.19.1/include/linux/vs_context.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vs_context.h 2006-11-30 18:53:18 +0100
-@@ -0,0 +1,244 @@
-+#ifndef _VS_CONTEXT_H
-+#define _VS_CONTEXT_H
-+
-+#include "vserver/base.h"
-+#include "vserver/context.h"
-+#include "vserver/history.h"
-+#include "vserver/debug.h"
-+
-+
-+#define get_vx_info(i) __get_vx_info(i,__FILE__,__LINE__,__HERE__)
-+
-+static inline struct vx_info *__get_vx_info(struct vx_info *vxi,
-+ const char *_file, int _line, void *_here)
++static inline int __dl_alloc_space(struct super_block *sb,
++ vtag_t tag, dlsize_t nr, const char *file, int line)
+{
-+ if (!vxi)
-+ return NULL;
++ struct dl_info *dli = NULL;
++ int ret = 0;
+
-+ vxlprintk(VXD_CBIT(xid, 2), "get_vx_info(%p[#%d.%d])",
-+ vxi, vxi?vxi->vx_id:0, vxi?atomic_read(&vxi->vx_usecnt):0,
-+ _file, _line);
-+ __vxh_get_vx_info(vxi, _here);
++ if (nr == 0)
++ goto out;
++ dli = locate_dl_info(sb, tag);
++ if (!dli)
++ goto out;
+
-+ atomic_inc(&vxi->vx_usecnt);
-+ return vxi;
++ spin_lock(&dli->dl_lock);
++ ret = (dli->dl_space_used + nr > dli->dl_space_total);
++ if (!ret)
++ dli->dl_space_used += nr;
++ spin_unlock(&dli->dl_lock);
++ put_dl_info(dli);
++out:
++ vxlprintk(VXD_CBIT(dlim, 1),
++ "ALLOC (%p,#%d)%c %lld bytes (%d)",
++ sb, tag, __dlimit_char(dli), (long long)nr,
++ ret, file, line);
++ return ret ? -ENOSPC : 0;
+}
+
-+
-+extern void free_vx_info(struct vx_info *);
-+
-+#define put_vx_info(i) __put_vx_info(i,__FILE__,__LINE__,__HERE__)
-+
-+static inline void __put_vx_info(struct vx_info *vxi,
-+ const char *_file, int _line, void *_here)
++static inline void __dl_free_space(struct super_block *sb,
++ vtag_t tag, dlsize_t nr, const char *_file, int _line)
+{
-+ if (!vxi)
-+ return;
++ struct dl_info *dli = NULL;
+
-+ vxlprintk(VXD_CBIT(xid, 2), "put_vx_info(%p[#%d.%d])",
-+ vxi, vxi?vxi->vx_id:0, vxi?atomic_read(&vxi->vx_usecnt):0,
-+ _file, _line);
-+ __vxh_put_vx_info(vxi, _here);
++ if (nr == 0)
++ goto out;
++ dli = locate_dl_info(sb, tag);
++ if (!dli)
++ goto out;
+
-+ if (atomic_dec_and_test(&vxi->vx_usecnt))
-+ free_vx_info(vxi);
++ spin_lock(&dli->dl_lock);
++ if (dli->dl_space_used > nr)
++ dli->dl_space_used -= nr;
++ else
++ dli->dl_space_used = 0;
++ spin_unlock(&dli->dl_lock);
++ put_dl_info(dli);
++out:
++ vxlprintk(VXD_CBIT(dlim, 1),
++ "FREE (%p,#%d)%c %lld bytes",
++ sb, tag, __dlimit_char(dli), (long long)nr,
++ _file, _line);
+}
+
-+
-+#define init_vx_info(p,i) __init_vx_info(p,i,__FILE__,__LINE__,__HERE__)
-+
-+static inline void __init_vx_info(struct vx_info **vxp, struct vx_info *vxi,
-+ const char *_file, int _line, void *_here)
++static inline int __dl_alloc_inode(struct super_block *sb,
++ vtag_t tag, const char *_file, int _line)
+{
-+ if (vxi) {
-+ vxlprintk(VXD_CBIT(xid, 3),
-+ "init_vx_info(%p[#%d.%d])",
-+ vxi, vxi?vxi->vx_id:0,
-+ vxi?atomic_read(&vxi->vx_usecnt):0,
-+ _file, _line);
-+ __vxh_init_vx_info(vxi, vxp, _here);
-+
-+ atomic_inc(&vxi->vx_usecnt);
-+ }
-+ *vxp = vxi;
-+}
++ struct dl_info *dli;
++ int ret = 0;
+
++ dli = locate_dl_info(sb, tag);
++ if (!dli)
++ goto out;
+
-+#define set_vx_info(p,i) __set_vx_info(p,i,__FILE__,__LINE__,__HERE__)
++ spin_lock(&dli->dl_lock);
++ dli->dl_inodes_used++;
++ ret = (dli->dl_inodes_used > dli->dl_inodes_total);
++ spin_unlock(&dli->dl_lock);
++ put_dl_info(dli);
++out:
++ vxlprintk(VXD_CBIT(dlim, 0),
++ "ALLOC (%p,#%d)%c inode (%d)",
++ sb, tag, __dlimit_char(dli), ret, _file, _line);
++ return ret ? -ENOSPC : 0;
++}
+
-+static inline void __set_vx_info(struct vx_info **vxp, struct vx_info *vxi,
-+ const char *_file, int _line, void *_here)
++static inline void __dl_free_inode(struct super_block *sb,
++ vtag_t tag, const char *_file, int _line)
+{
-+ struct vx_info *vxo;
-+
-+ if (!vxi)
-+ return;
++ struct dl_info *dli;
+
-+ vxlprintk(VXD_CBIT(xid, 3), "set_vx_info(%p[#%d.%d])",
-+ vxi, vxi?vxi->vx_id:0,
-+ vxi?atomic_read(&vxi->vx_usecnt):0,
-+ _file, _line);
-+ __vxh_set_vx_info(vxi, vxp, _here);
++ dli = locate_dl_info(sb, tag);
++ if (!dli)
++ goto out;
+
-+ atomic_inc(&vxi->vx_usecnt);
-+ vxo = xchg(vxp, vxi);
-+ BUG_ON(vxo);
++ spin_lock(&dli->dl_lock);
++ if (dli->dl_inodes_used > 1)
++ dli->dl_inodes_used--;
++ else
++ dli->dl_inodes_used = 0;
++ spin_unlock(&dli->dl_lock);
++ put_dl_info(dli);
++out:
++ vxlprintk(VXD_CBIT(dlim, 0),
++ "FREE (%p,#%d)%c inode",
++ sb, tag, __dlimit_char(dli), _file, _line);
+}
+
-+
-+#define clr_vx_info(p) __clr_vx_info(p,__FILE__,__LINE__,__HERE__)
-+
-+static inline void __clr_vx_info(struct vx_info **vxp,
-+ const char *_file, int _line, void *_here)
++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)
+{
-+ struct vx_info *vxo;
++ struct dl_info *dli;
++ uint64_t broot, bfree;
+
-+ vxo = xchg(vxp, NULL);
-+ if (!vxo)
++ dli = locate_dl_info(sb, tag);
++ if (!dli)
+ return;
+
-+ vxlprintk(VXD_CBIT(xid, 3), "clr_vx_info(%p[#%d.%d])",
-+ vxo, vxo?vxo->vx_id:0,
-+ vxo?atomic_read(&vxo->vx_usecnt):0,
-+ _file, _line);
-+ __vxh_clr_vx_info(vxo, vxp, _here);
++ spin_lock(&dli->dl_lock);
++ broot = (dli->dl_space_total -
++ (dli->dl_space_total >> 10) * dli->dl_nrlmult)
++ >> sb->s_blocksize_bits;
++ bfree = (dli->dl_space_total - dli->dl_space_used)
++ >> sb->s_blocksize_bits;
++ spin_unlock(&dli->dl_lock);
+
-+ if (atomic_dec_and_test(&vxo->vx_usecnt))
-+ free_vx_info(vxo);
++ vxlprintk(VXD_CBIT(dlim, 2),
++ "ADJUST: %lld,%lld on %lld,%lld [mult=%d]",
++ (long long)bfree, (long long)broot,
++ *free_blocks, *root_blocks, dli->dl_nrlmult,
++ _file, _line);
++ if (free_blocks) {
++ if (*free_blocks > bfree)
++ *free_blocks = bfree;
++ }
++ if (root_blocks) {
++ if (*root_blocks > broot)
++ *root_blocks = broot;
++ }
++ put_dl_info(dli);
+}
+
++#define dl_prealloc_space(in, bytes) \
++ __dl_alloc_space((in)->i_sb, i_tag_read(in), (dlsize_t)(bytes), \
++ __FILE__, __LINE__ )
+
-+#define claim_vx_info(v,p) \
-+ __claim_vx_info(v,p,__FILE__,__LINE__,__HERE__)
++#define dl_alloc_space(in, bytes) \
++ __dl_alloc_space((in)->i_sb, i_tag_read(in), (dlsize_t)(bytes), \
++ __FILE__, __LINE__ )
+
-+static inline void __claim_vx_info(struct vx_info *vxi,
-+ struct task_struct *task,
-+ const char *_file, int _line, void *_here)
-+{
-+ vxlprintk(VXD_CBIT(xid, 3), "claim_vx_info(%p[#%d.%d.%d]) %p",
-+ vxi, vxi?vxi->vx_id:0,
-+ vxi?atomic_read(&vxi->vx_usecnt):0,
-+ vxi?atomic_read(&vxi->vx_tasks):0,
-+ task, _file, _line);
-+ __vxh_claim_vx_info(vxi, task, _here);
++#define dl_reserve_space(in, bytes) \
++ __dl_alloc_space((in)->i_sb, i_tag_read(in), (dlsize_t)(bytes), \
++ __FILE__, __LINE__ )
+
-+ atomic_inc(&vxi->vx_tasks);
-+}
++#define dl_claim_space(in, bytes) (0)
+
++#define dl_release_space(in, bytes) \
++ __dl_free_space((in)->i_sb, i_tag_read(in), (dlsize_t)(bytes), \
++ __FILE__, __LINE__ )
+
-+extern void unhash_vx_info(struct vx_info *);
++#define dl_free_space(in, bytes) \
++ __dl_free_space((in)->i_sb, i_tag_read(in), (dlsize_t)(bytes), \
++ __FILE__, __LINE__ )
+
-+#define release_vx_info(v,p) \
-+ __release_vx_info(v,p,__FILE__,__LINE__,__HERE__)
+
-+static inline void __release_vx_info(struct vx_info *vxi,
-+ struct task_struct *task,
-+ const char *_file, int _line, void *_here)
-+{
-+ vxlprintk(VXD_CBIT(xid, 3), "release_vx_info(%p[#%d.%d.%d]) %p",
-+ vxi, vxi?vxi->vx_id:0,
-+ vxi?atomic_read(&vxi->vx_usecnt):0,
-+ vxi?atomic_read(&vxi->vx_tasks):0,
-+ task, _file, _line);
-+ __vxh_release_vx_info(vxi, task, _here);
+
-+ might_sleep();
++#define dl_alloc_inode(in) \
++ __dl_alloc_inode((in)->i_sb, i_tag_read(in), __FILE__, __LINE__ )
+
-+ if (atomic_dec_and_test(&vxi->vx_tasks))
-+ unhash_vx_info(vxi);
-+}
++#define dl_free_inode(in) \
++ __dl_free_inode((in)->i_sb, i_tag_read(in), __FILE__, __LINE__ )
+
+
-+#define task_get_vx_info(p) \
-+ __task_get_vx_info(p,__FILE__,__LINE__,__HERE__)
++#define dl_adjust_block(sb, tag, fb, rb) \
++ __dl_adjust_block(sb, tag, fb, rb, __FILE__, __LINE__ )
+
-+static inline struct vx_info *__task_get_vx_info(struct task_struct *p,
-+ const char *_file, int _line, void *_here)
-+{
-+ struct vx_info *vxi;
+
-+ task_lock(p);
-+ vxlprintk(VXD_CBIT(xid, 5), "task_get_vx_info(%p)",
-+ p, _file, _line);
-+ vxi = __get_vx_info(p->vx_info, _file, _line, _here);
-+ task_unlock(p);
-+ return vxi;
-+}
++#else
++#warning duplicate inclusion
++#endif
+diff -urNp -x '*.orig' linux-4.9/include/linux/vs_inet.h linux-4.9/include/linux/vs_inet.h
+--- linux-4.9/include/linux/vs_inet.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vs_inet.h 2021-02-24 15:47:45.097743096 +0100
+@@ -0,0 +1,364 @@
++#ifndef _VS_INET_H
++#define _VS_INET_H
+
++#include "vserver/base.h"
++#include "vserver/network.h"
++#include "vserver/debug.h"
+
-+static inline void __wakeup_vx_info(struct vx_info *vxi)
-+{
-+ if (waitqueue_active(&vxi->vx_wait))
-+ wake_up_interruptible(&vxi->vx_wait);
-+}
++#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 enter_vx_info(v,s) __enter_vx_info(v,s,__FILE__,__LINE__)
++#define NIPQUAD(addr) \
++ ((unsigned char *)&addr)[0], \
++ ((unsigned char *)&addr)[1], \
++ ((unsigned char *)&addr)[2], \
++ ((unsigned char *)&addr)[3]
+
-+static inline void __enter_vx_info(struct vx_info *vxi,
-+ struct vx_info_save *vxis, const char *_file, int _line)
-+{
-+ vxlprintk(VXD_CBIT(xid, 5), "enter_vx_info(%p[#%d],%p) %p[#%d,%p]",
-+ vxi, vxi ? vxi->vx_id : 0, vxis, current,
-+ current->xid, current->vx_info, _file, _line);
-+ vxis->vxi = xchg(¤t->vx_info, vxi);
-+ vxis->xid = current->xid;
-+ current->xid = vxi ? vxi->vx_id : 0;
-+}
++#define NIPQUAD_FMT "%u.%u.%u.%u"
+
-+#define leave_vx_info(s) __leave_vx_info(s,__FILE__,__LINE__)
+
-+static inline void __leave_vx_info(struct vx_info_save *vxis,
-+ const char *_file, int _line)
++static inline
++int v4_addr_match(struct nx_addr_v4 *nxa, __be32 addr, uint16_t tmask)
+{
-+ vxlprintk(VXD_CBIT(xid, 5), "leave_vx_info(%p[#%d,%p]) %p[#%d,%p]",
-+ vxis, vxis->xid, vxis->vxi, current,
-+ current->xid, current->vx_info, _file, _line);
-+ (void)xchg(¤t->vx_info, vxis->vxi);
-+ current->xid = vxis->xid;
-+}
-+
++ __be32 ip = nxa->ip[0].s_addr;
++ __be32 mask = nxa->mask.s_addr;
++ __be32 bcast = ip | ~mask;
++ int ret = 0;
+
-+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);
-+}
++ 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;
++ }
+
-+static inline void __leave_vx_admin(struct vx_info_save *vxis)
-+{
-+ (void)xchg(¤t->xid, vxis->xid);
-+ (void)xchg(¤t->vx_info, vxis->vxi);
++ vxdprintk(VXD_CBIT(net, 0),
++ "v4_addr_match(%p" NXAV4_FMT "," NIPQUAD_FMT ",%04x) = %d",
++ nxa, NXAV4(nxa), NIPQUAD(addr), tmask, ret);
++ return ret;
+}
+
-+extern void exit_vx_info(struct task_struct *, int);
-+extern void exit_vx_info_early(struct task_struct *, int);
-+
-+
+static inline
-+struct task_struct *vx_child_reaper(struct task_struct *p)
++int v4_addr_in_nx_info(struct nx_info *nxi, __be32 addr, uint16_t tmask)
+{
-+ struct vx_info *vxi = p->vx_info;
-+ struct task_struct *reaper = child_reaper;
++ struct nx_addr_v4 *nxa;
++ unsigned long irqflags;
++ int ret = 1;
+
-+ if (!vxi)
++ if (!nxi)
+ goto out;
+
-+ BUG_ON(!p->vx_info->vx_reaper);
-+
-+ /* child reaper for the guest reaper */
-+ if (vxi->vx_reaper == p)
++ 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;
+
-+ reaper = vxi->vx_reaper;
++ /* 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(xid, 3),
-+ "vx_child_reaper(%p[#%u,%u]) = %p[#%u,%u]\n",
-+ p, p->xid, p->pid, reaper, reaper->xid, reaper->pid);
-+ return reaper;
++ 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;
+}
+
-+
-+#else
-+#warning duplicate inclusion
-+#endif
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vs_cowbl.h linux-2.6.19.1-vs2.3.0.6/include/linux/vs_cowbl.h
---- linux-2.6.19.1/include/linux/vs_cowbl.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vs_cowbl.h 2006-11-30 18:53:18 +0100
-@@ -0,0 +1,44 @@
-+#ifndef _VS_COWBL_H
-+#define _VS_COWBL_H
-+
-+#include <linux/fs.h>
-+#include <linux/dcache.h>
-+#include <linux/namei.h>
-+
-+extern struct dentry *cow_break_link(const char *pathname);
-+
-+static inline int cow_check_and_break(struct nameidata *nd)
++static inline
++int v4_nx_addr_match(struct nx_addr_v4 *nxa, struct nx_addr_v4 *addr, uint16_t mask)
+{
-+ struct inode *inode = nd->dentry->d_inode;
-+ int error = 0;
-+ if (IS_RDONLY(inode) || MNT_IS_RDONLY(nd->mnt))
-+ return -EROFS;
-+ if (IS_COW(inode)) {
-+ if (IS_COW_LINK(inode)) {
-+ struct dentry *new_dentry, *old_dentry = nd->dentry;
-+ char *path, *buf;
-+
-+ buf = kmalloc(PATH_MAX, GFP_KERNEL);
-+ if (!buf) {
-+ return -ENOMEM;
-+ }
-+ path = d_path(nd->dentry, nd->mnt, buf, PATH_MAX);
-+ new_dentry = cow_break_link(path);
-+ kfree(buf);
-+ if (!IS_ERR(new_dentry)) {
-+ nd->dentry = new_dentry;
-+ dput(old_dentry);
-+ } else
-+ error = PTR_ERR(new_dentry);
-+ } else {
-+ inode->i_flags &= ~(S_IUNLINK|S_IMMUTABLE);
-+ inode->i_ctime = CURRENT_TIME;
-+ mark_inode_dirty(inode);
-+ }
-+ }
-+ return error;
++ /* FIXME: needs full range checks */
++ return v4_addr_match(nxa, addr->ip[0].s_addr, mask);
+}
+
-+#else
-+#warning duplicate inclusion
-+#endif
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vs_cvirt.h linux-2.6.19.1-vs2.3.0.6/include/linux/vs_cvirt.h
---- linux-2.6.19.1/include/linux/vs_cvirt.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vs_cvirt.h 2006-11-30 19:12:40 +0100
-@@ -0,0 +1,49 @@
-+#ifndef _VS_CVIRT_H
-+#define _VS_CVIRT_H
-+
-+#include "vserver/cvirt.h"
-+#include "vserver/context.h"
-+#include "vserver/base.h"
-+#include "vserver/debug.h"
-+
-+
-+static inline void vx_activate_task(struct task_struct *p)
++static inline
++int v4_nx_addr_in_nx_info(struct nx_info *nxi, struct nx_addr_v4 *nxa, uint16_t mask)
+{
-+ struct vx_info *vxi;
++ struct nx_addr_v4 *ptr;
++ unsigned long irqflags;
++ int ret = 1;
+
-+ if ((vxi = p->vx_info)) {
-+ vx_update_load(vxi);
-+ atomic_inc(&vxi->cvirt.nr_running);
-+ }
++ 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;
+}
+
-+static inline void vx_deactivate_task(struct task_struct *p)
++#include <net/inet_sock.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 v4_sock_addr_match (
++ struct nx_info *nxi,
++ struct inet_sock *inet,
++ __be32 addr)
+{
-+ struct vx_info *vxi;
++ __be32 saddr = inet->inet_rcv_saddr;
++ __be32 bcast = nxi ? nxi->v4_bcast.s_addr : INADDR_BROADCAST;
+
-+ if ((vxi = p->vx_info)) {
-+ vx_update_load(vxi);
-+ atomic_dec(&vxi->cvirt.nr_running);
-+ }
++ if (addr && (saddr == addr || bcast == addr))
++ return 1;
++ if (!saddr)
++ return v4_addr_in_nx_info(nxi, addr, NXA_MASK_BIND);
++ return 0;
+}
+
-+static inline void vx_uninterruptible_inc(struct task_struct *p)
-+{
-+ struct vx_info *vxi;
+
-+ if ((vxi = p->vx_info))
-+ atomic_inc(&vxi->cvirt.nr_uninterruptible);
-+}
++/* inet related checks and helpers */
+
-+static inline void vx_uninterruptible_dec(struct task_struct *p)
-+{
-+ struct vx_info *vxi;
+
-+ if ((vxi = p->vx_info))
-+ atomic_dec(&vxi->cvirt.nr_uninterruptible);
-+}
++struct in_ifaddr;
++struct net_device;
++struct sock;
+
++#ifdef CONFIG_INET
+
-+#else
-+#warning duplicate inclusion
-+#endif
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vs_dlimit.h linux-2.6.19.1-vs2.3.0.6/include/linux/vs_dlimit.h
---- linux-2.6.19.1/include/linux/vs_dlimit.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vs_dlimit.h 2006-12-01 23:37:57 +0100
-@@ -0,0 +1,214 @@
-+#ifndef _VS_DLIMIT_H
-+#define _VS_DLIMIT_H
++#include <linux/netdevice.h>
++#include <linux/inetdevice.h>
++#include <net/inet_sock.h>
++#include <net/inet_timewait_sock.h>
+
-+#include "vserver/dlimit.h"
-+#include "vserver/base.h"
-+#include "vserver/debug.h"
+
++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 *);
+
-+#define get_dl_info(i) __get_dl_info(i,__FILE__,__LINE__)
+
-+static inline struct dl_info *__get_dl_info(struct dl_info *dli,
-+ const char *_file, int _line)
++/*
++ * 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)
+{
-+ if (!dli)
-+ return NULL;
-+ vxlprintk(VXD_CBIT(dlim, 4), "get_dl_info(%p[#%d.%d])",
-+ dli, dli?dli->dl_tag:0, dli?atomic_read(&dli->dl_usecnt):0,
-+ _file, _line);
-+ atomic_inc(&dli->dl_usecnt);
-+ return dli;
-+}
++ struct nx_info *nxi = sk->sk_nx_info;
++ __be32 saddr = sk->sk_rcv_saddr;
++
++ 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));
+
++ 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 free_dl_info(i) \
-+ call_rcu(&i->dl_rcu, rcu_free_dl_info);
+
-+#define put_dl_info(i) __put_dl_info(i,__FILE__,__LINE__)
+
-+static inline void __put_dl_info(struct dl_info *dli,
-+ const char *_file, int _line)
++static inline
++int nx_dev_visible(struct nx_info *nxi, struct net_device *dev)
+{
-+ if (!dli)
-+ return;
-+ vxlprintk(VXD_CBIT(dlim, 4), "put_dl_info(%p[#%d.%d])",
-+ dli, dli?dli->dl_tag:0, dli?atomic_read(&dli->dl_usecnt):0,
-+ _file, _line);
-+ if (atomic_dec_and_test(&dli->dl_usecnt))
-+ free_dl_info(dli);
-+}
++ 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);
+
++ if (!nx_info_flags(nxi, NXF_HIDE_NETIF, 0))
++ return 1;
++ if (dev_in_nx_info(dev, nxi))
++ return 1;
++ return 0;
++}
+
-+#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)
++static inline
++int v4_ifa_in_nx_info(struct in_ifaddr *ifa, struct nx_info *nxi)
+{
-+ struct dl_info *dli = NULL;
-+ int ret = 0;
++ if (!nxi)
++ return 1;
++ if (!ifa)
++ return 0;
++ return v4_addr_in_nx_info(nxi, ifa->ifa_local, NXA_MASK_SHOW);
++}
+
-+ if (nr == 0)
-+ goto out;
-+ dli = locate_dl_info(sb, tag);
-+ if (!dli)
-+ goto out;
++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);
+
-+ spin_lock(&dli->dl_lock);
-+ ret = (dli->dl_space_used + nr > dli->dl_space_total);
-+ if (!ret)
-+ dli->dl_space_used += nr;
-+ spin_unlock(&dli->dl_lock);
-+ put_dl_info(dli);
-+out:
-+ vxlprintk(VXD_CBIT(dlim, 1),
-+ "ALLOC (%p,#%d)%c %lld bytes (%d)",
-+ sb, tag, __dlimit_char(dli), (long long)nr,
-+ ret, file, line);
-+ return ret;
++ if (!nx_info_flags(nxi, NXF_HIDE_NETIF, 0))
++ return 1;
++ if (v4_ifa_in_nx_info(ifa, nxi))
++ return 1;
++ return 0;
+}
+
-+static inline void __dl_free_space(struct super_block *sb,
-+ tag_t tag, dlsize_t nr, const char *_file, int _line)
++
++struct nx_v4_sock_addr {
++ __be32 saddr; /* Address used for validation */
++ __be32 baddr; /* Address used for socket bind */
++};
++
++static inline
++int v4_map_sock_addr(struct inet_sock *inet, struct sockaddr_in *addr,
++ struct nx_v4_sock_addr *nsa)
+{
-+ struct dl_info *dli = NULL;
++ struct sock *sk = &inet->sk;
++ struct nx_info *nxi = sk->sk_nx_info;
++ __be32 saddr = addr->sin_addr.s_addr;
++ __be32 baddr = saddr;
+
-+ if (nr == 0)
-+ goto out;
-+ dli = locate_dl_info(sb, tag);
-+ if (!dli)
-+ goto out;
++ 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));
+
-+ spin_lock(&dli->dl_lock);
-+ if (dli->dl_space_used > nr)
-+ dli->dl_space_used -= nr;
-+ else
-+ dli->dl_space_used = 0;
-+ spin_unlock(&dli->dl_lock);
-+ put_dl_info(dli);
-+out:
-+ vxlprintk(VXD_CBIT(dlim, 1),
-+ "FREE (%p,#%d)%c %lld bytes",
-+ sb, tag, __dlimit_char(dli), (long long)nr,
-+ _file, _line);
++ 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;
++ }
++ }
++
++ vxdprintk(VXD_CBIT(net, 3),
++ "inet_bind(%p) " NIPQUAD_FMT ", " NIPQUAD_FMT,
++ sk, NIPQUAD(saddr), NIPQUAD(baddr));
++
++ nsa->saddr = saddr;
++ nsa->baddr = baddr;
++ return 0;
+}
+
-+static inline int __dl_alloc_inode(struct super_block *sb,
-+ tag_t tag, const char *_file, int _line)
++static inline
++void v4_set_sock_addr(struct inet_sock *inet, struct nx_v4_sock_addr *nsa)
+{
-+ struct dl_info *dli;
-+ int ret = 0;
++ inet->inet_saddr = nsa->baddr;
++ inet->inet_rcv_saddr = nsa->baddr;
++}
+
-+ dli = locate_dl_info(sb, tag);
-+ if (!dli)
-+ goto out;
+
-+ spin_lock(&dli->dl_lock);
-+ ret = (dli->dl_inodes_used >= dli->dl_inodes_total);
-+ if (!ret)
-+ dli->dl_inodes_used++;
-+#if 0
-+ else
-+ vxwprintk("DLIMIT hit (%p,#%d), inode %d>=%d @ %s:%d",
-+ sb, tag,
-+ dli->dl_inodes_used, dli->dl_inodes_total,
-+ file, line);
-+#endif
-+ spin_unlock(&dli->dl_lock);
-+ put_dl_info(dli);
-+out:
-+ vxlprintk(VXD_CBIT(dlim, 0),
-+ "ALLOC (%p,#%d)%c inode (%d)",
-+ sb, tag, __dlimit_char(dli), ret, _file, _line);
-+ return ret;
++/*
++ * 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 void __dl_free_inode(struct super_block *sb,
-+ tag_t tag, const char *_file, int _line)
++static inline __be32 nx_map_sock_lback(struct nx_info *nxi, __be32 addr)
+{
-+ struct dl_info *dli;
-+
-+ dli = locate_dl_info(sb, tag);
-+ if (!dli)
-+ goto out;
-+
-+ spin_lock(&dli->dl_lock);
-+ if (dli->dl_inodes_used > 1)
-+ dli->dl_inodes_used--;
-+ else
-+ dli->dl_inodes_used = 0;
-+ spin_unlock(&dli->dl_lock);
-+ put_dl_info(dli);
-+out:
-+ vxlprintk(VXD_CBIT(dlim, 0),
-+ "FREE (%p,#%d)%c inode",
-+ sb, tag, __dlimit_char(dli), _file, _line);
++ if (nx_info_flags(nxi, NXF_HIDE_LBACK, 0) &&
++ (addr == nxi->v4_lback.s_addr))
++ return IPI_LOOPBACK;
++ return addr;
+}
+
-+static inline void __dl_adjust_block(struct super_block *sb, tag_t tag,
-+ unsigned long long *free_blocks, unsigned long long *root_blocks,
-+ const char *_file, int _line)
++static inline
++int nx_info_has_v4(struct nx_info *nxi)
+{
-+ struct dl_info *dli;
-+ uint64_t broot, bfree;
++ if (!nxi)
++ return 1;
++ if (NX_IPV4(nxi))
++ return 1;
++ if (nx_info_flags(nxi, NXF_LBACK_REMAP, 0))
++ return 1;
++ return 0;
++}
+
-+ dli = locate_dl_info(sb, tag);
-+ if (!dli)
-+ return;
++#else /* CONFIG_INET */
+
-+ spin_lock(&dli->dl_lock);
-+ broot = (dli->dl_space_total -
-+ (dli->dl_space_total >> 10) * dli->dl_nrlmult)
-+ >> sb->s_blocksize_bits;
-+ bfree = (dli->dl_space_total - dli->dl_space_used)
-+ >> sb->s_blocksize_bits;
-+ spin_unlock(&dli->dl_lock);
++static inline
++int nx_dev_visible(struct nx_info *n, struct net_device *d)
++{
++ return 1;
++}
+
-+ vxlprintk(VXD_CBIT(dlim, 2),
-+ "ADJUST: %lld,%lld on %lld,%lld [mult=%d]",
-+ (long long)bfree, (long long)broot,
-+ *free_blocks, *root_blocks, dli->dl_nrlmult,
-+ _file, _line);
-+ if (free_blocks) {
-+ if (*free_blocks > bfree)
-+ *free_blocks = bfree;
-+ }
-+ if (root_blocks) {
-+ if (*root_blocks > broot)
-+ *root_blocks = broot;
-+ }
-+ put_dl_info(dli);
++static inline
++int nx_v4_addr_conflict(struct nx_info *n, uint32_t a, const struct sock *s)
++{
++ return 1;
+}
+
-+#define DLIMIT_ALLOC_SPACE(in, bytes) \
-+ __dl_alloc_space((in)->i_sb, (in)->i_tag, (dlsize_t)(bytes), \
-+ __FILE__, __LINE__ )
++static inline
++int v4_ifa_in_nx_info(struct in_ifaddr *a, struct nx_info *n)
++{
++ return 1;
++}
+
-+#define DLIMIT_FREE_SPACE(in, bytes) \
-+ __dl_free_space((in)->i_sb, (in)->i_tag, (dlsize_t)(bytes), \
-+ __FILE__, __LINE__ )
++static inline
++int nx_info_has_v4(struct nx_info *nxi)
++{
++ return 0;
++}
+
-+#define DLIMIT_ALLOC_BLOCK(in, nr) \
-+ __dl_alloc_space((in)->i_sb, (in)->i_tag, \
-+ ((dlsize_t)(nr)) << (in)->i_sb->s_blocksize_bits, \
-+ __FILE__, __LINE__ )
++#endif /* CONFIG_INET */
+
-+#define DLIMIT_FREE_BLOCK(in, nr) \
-+ __dl_free_space((in)->i_sb, (in)->i_tag, \
-+ ((dlsize_t)(nr)) << (in)->i_sb->s_blocksize_bits, \
-+ __FILE__, __LINE__ )
++#define current_nx_info_has_v4() \
++ nx_info_has_v4(current_nx_info())
+
++#else
++// #warning duplicate inclusion
++#endif
+diff -urNp -x '*.orig' linux-4.9/include/linux/vs_inet6.h linux-4.9/include/linux/vs_inet6.h
+--- linux-4.9/include/linux/vs_inet6.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vs_inet6.h 2021-02-24 15:47:45.097743096 +0100
+@@ -0,0 +1,264 @@
++#ifndef _VS_INET6_H
++#define _VS_INET6_H
+
-+#define DLIMIT_ALLOC_INODE(in) \
-+ __dl_alloc_inode((in)->i_sb, (in)->i_tag, __FILE__, __LINE__ )
++#include "vserver/base.h"
++#include "vserver/network.h"
++#include "vserver/debug.h"
+
-+#define DLIMIT_FREE_INODE(in) \
-+ __dl_free_inode((in)->i_sb, (in)->i_tag, __FILE__, __LINE__ )
++#include <net/ipv6.h>
+
++#define NXAV6(a) &(a)->ip, &(a)->mask, (a)->prefix, (a)->type
++#define NXAV6_FMT "[%pI6/%pI6/%d:%04x]"
+
-+#define DLIMIT_ADJUST_BLOCK(sb, tag, fb, rb) \
-+ __dl_adjust_block(sb, tag, fb, rb, __FILE__, __LINE__ )
+
++#ifdef CONFIG_IPV6
+
-+#else
-+#warning duplicate inclusion
-+#endif
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vs_inet.h linux-2.6.19.1-vs2.3.0.6/include/linux/vs_inet.h
---- linux-2.6.19.1/include/linux/vs_inet.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vs_inet.h 2006-12-17 03:46:17 +0100
-@@ -0,0 +1,155 @@
-+#ifndef _VS_INET_H
-+#define _VS_INET_H
++static inline
++int v6_addr_match(struct nx_addr_v6 *nxa,
++ const struct in6_addr *addr, uint16_t mask)
++{
++ int ret = 0;
+
-+#include <linux/vs_network.h>
++ 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 IPI_LOOPBACK htonl(INADDR_LOOPBACK)
++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;
+
++ 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;
++}
+
-+static inline int addr_in_nx_info(struct nx_info *nxi, uint32_t addr)
++static inline
++int v6_nx_addr_match(struct nx_addr_v6 *nxa, struct nx_addr_v6 *addr, uint16_t mask)
+{
-+ int n,i;
++ /* FIXME: needs full range checks */
++ return v6_addr_match(nxa, &addr->ip, mask);
++}
+
-+ if (!nxi)
-+ return 1;
++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;
+
-+ n = nxi->nbipv4;
-+ if (n && (nxi->ipv4[0] == 0))
-+ return 1;
-+ for (i=0; i<n; i++) {
-+ if (nxi->ipv4[i] == addr)
-+ return 1;
-+ }
-+ return 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;
+}
+
+
+ *
+ * nxi: the socket's nx_info if any
+ * addr: to be verified address
-+ * saddr/baddr: socket addresses
+ */
-+static inline int raw_addr_match (
++static inline
++int v6_sock_addr_match (
+ struct nx_info *nxi,
-+ uint32_t addr,
-+ uint32_t saddr,
-+ uint32_t baddr)
++ 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;
++}
++
++/*
++ * check if address is covered by socket
++ *
++ * sk: the socket to check against
++ * addr: the address in question (must be != 0)
++ */
++
++static inline
++int __v6_addr_match_socket(const struct sock *sk, struct nx_addr_v6 *nxa)
+{
-+ if (addr && (saddr == addr || baddr == addr))
++ struct nx_info *nxi = sk->sk_nx_info;
++ const struct in6_addr *saddr = inet6_rcv_saddr(sk);
++
++ vxdprintk(VXD_CBIT(net, 5),
++ "__v6_addr_in_socket(%p," NXAV6_FMT ") %p:%pI6 %p;%lx",
++ 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;
-+ if (!saddr)
-+ return addr_in_nx_info(nxi, addr);
-+ return 0;
++ }
+}
+
+
+struct net_device;
+struct sock;
+
-+#ifdef CONFIG_INET
+
+#include <linux/netdevice.h>
+#include <linux/inetdevice.h>
+
+
+int dev_in_nx_info(struct net_device *, struct nx_info *);
-+int nx_addr_conflict(struct nx_info *, uint32_t, struct sock *);
++int v6_dev_in_nx_info(struct net_device *, struct nx_info *);
++int nx_v6_addr_conflict(struct nx_info *, struct nx_info *);
+
+
-+/*
-+ * check if address is covered by socket
-+ *
-+ * sk: the socket to check against
-+ * addr: the address in question (must be != 0)
-+ */
+
+static inline
-+int __addr_in_socket(struct sock *sk, uint32_t addr)
++int v6_ifa_in_nx_info(struct inet6_ifaddr *ifa, struct nx_info *nxi)
+{
-+ struct nx_info *nxi = sk->sk_nx_info;
-+ uint32_t saddr = inet_rcv_saddr(sk);
-+
-+ vxdprintk(VXD_CBIT(net, 5),
-+ "__addr_in_socket(%p,%d.%d.%d.%d) %p:%d.%d.%d.%d %p;%lx",
-+ sk, VXD_QUAD(addr), nxi, VXD_QUAD(saddr), sk->sk_socket,
-+ (sk->sk_socket?sk->sk_socket->flags:0));
-+
-+ if (saddr) {
-+ /* direct address match */
-+ return (saddr == addr);
-+ } else if (nxi) {
-+ /* match against nx_info */
-+ return addr_in_nx_info(nxi, addr);
-+ } else {
-+ /* unrestricted any socket */
++ if (!nxi)
+ return 1;
-+ }
++ if (!ifa)
++ return 0;
++ return v6_addr_in_nx_info(nxi, &ifa->addr, -1);
+}
+
-+
-+
+static inline
-+int nx_dev_visible(struct nx_info *nxi, struct net_device *dev)
++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);
++
+ if (!nx_info_flags(nxi, NXF_HIDE_NETIF, 0))
+ return 1;
-+ if (dev_in_nx_info(dev, nxi))
++ if (v6_ifa_in_nx_info(ifa, nxi))
+ return 1;
+ return 0;
+}
+
+
++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 ifa_in_nx_info(struct in_ifaddr *ifa, struct nx_info *nxi)
++int v6_map_sock_addr(struct inet_sock *inet, struct sockaddr_in6 *addr,
++ struct nx_v6_sock_addr *nsa)
+{
-+ if (!nxi)
-+ return 1;
-+ if (!ifa)
-+ return 0;
-+ return addr_in_nx_info(nxi, ifa->ifa_local);
++ // 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
-+int nx_ifa_visible(struct nx_info *nxi, struct in_ifaddr *ifa)
++void v6_set_sock_addr(struct inet_sock *inet, struct nx_v6_sock_addr *nsa)
+{
-+ if (!nx_info_flags(nxi, NXF_HIDE_NETIF, 0))
++ // struct sock *sk = &inet->sk;
++ // struct in6_addr *saddr = inet6_rcv_saddr(sk);
++
++ // *saddr = nsa->baddr;
++ // inet->inet_saddr = nsa->baddr;
++}
++
++static inline
++int nx_info_has_v6(struct nx_info *nxi)
++{
++ if (!nxi)
+ return 1;
-+ if (ifa_in_nx_info(ifa, nxi))
++ if (NX_IPV6(nxi))
+ return 1;
+ return 0;
+}
+
-+#else /* CONFIG_INET */
++#else /* CONFIG_IPV6 */
+
+static inline
-+int nx_dev_visible(struct nx_info *n, struct net_device *d)
++int nx_v6_dev_visible(struct nx_info *n, struct net_device *d)
+{
+ return 1;
+}
+
+
+static inline
-+int nx_addr_conflict(struct nx_info *n, uint32_t a, struct sock *s)
++int nx_v6_addr_conflict(struct nx_info *n, uint32_t a, const struct sock *s)
+{
+ return 1;
+}
+
+static inline
-+int ifa_in_nx_info(struct in_ifaddr *a, struct nx_info *n)
++int v6_ifa_in_nx_info(struct in_ifaddr *a, struct nx_info *n)
+{
+ return 1;
+}
+
-+#endif /* CONFIG_INET */
++static inline
++int nx_info_has_v6(struct nx_info *nxi)
++{
++ return 0;
++}
++
++static inline
++int v6_addr_in_nx_info(struct nx_info *nxi,
++ const struct in6_addr *addr, uint16_t mask)
++{
++ return 0;
++}
+
++#endif /* CONFIG_IPV6 */
++
++#define current_nx_info_has_v6() \
++ nx_info_has_v6(current_nx_info())
+
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vs_limit.h linux-2.6.19.1-vs2.3.0.6/include/linux/vs_limit.h
---- linux-2.6.19.1/include/linux/vs_limit.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vs_limit.h 2006-11-30 18:53:18 +0100
+diff -urNp -x '*.orig' linux-4.9/include/linux/vs_limit.h linux-4.9/include/linux/vs_limit.h
+--- linux-4.9/include/linux/vs_limit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vs_limit.h 2021-02-24 15:47:45.101076533 +0100
@@ -0,0 +1,140 @@
+#ifndef _VS_LIMIT_H
+#define _VS_LIMIT_H
+#include "vserver/limit_int.h"
+
+
-+#define vx_acc_cres(v,d,p,r) \
++#define vx_acc_cres(v, d, p, r) \
+ __vx_acc_cres(v, r, d, p, __FILE__, __LINE__)
+
-+#define vx_acc_cres_cond(x,d,p,r) \
-+ __vx_acc_cres(((x) == vx_current_xid()) ? current->vx_info : 0, \
++#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_add_cres(v,a,p,r) \
++#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_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, \
++#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 vx_sub_cres_cond(x, a, p, r) vx_add_cres_cond(x, -(a), p, r)
+
+
+/* process and file limits */
+ 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)
++ vx_acc_cres(current_vx_info(), 1, (void *)(long)(f), VLIMIT_OPENFD)
+
+#define vx_openfd_dec(f) \
-+ vx_acc_cres(current->vx_info,-1, (void *)(long)(f), VLIMIT_OPENFD)
++ vx_acc_cres(current_vx_info(),-1, (void *)(long)(f), VLIMIT_OPENFD)
+
+
-+#define vx_cres_avail(v,n,r) \
++#define vx_cres_avail(v, n, r) \
+ __vx_cres_avail(v, r, n, __FILE__, __LINE__)
+
+
+#define vx_nproc_avail(n) \
-+ vx_cres_avail(current->vx_info, n, RLIMIT_NPROC)
++ vx_cres_avail(current_vx_info(), n, RLIMIT_NPROC)
+
+#define vx_files_avail(n) \
-+ vx_cres_avail(current->vx_info, n, RLIMIT_NOFILE)
++ vx_cres_avail(current_vx_info(), n, RLIMIT_NOFILE)
+
+#define vx_locks_avail(n) \
-+ vx_cres_avail(current->vx_info, n, RLIMIT_LOCKS)
++ vx_cres_avail(current_vx_info(), n, RLIMIT_LOCKS)
+
+#define vx_openfd_avail(n) \
-+ vx_cres_avail(current->vx_info, n, VLIMIT_OPENFD)
++ vx_cres_avail(current_vx_info(), n, VLIMIT_OPENFD)
+
+
+/* dentry limits */
+
+#define vx_dentry_inc(d) do { \
-+ if (atomic_read(&d->d_count) == 1) \
-+ vx_acc_cres(current->vx_info, 1, d, VLIMIT_DENTRY); \
++ if (d_count(d) == 1) \
++ vx_acc_cres(current_vx_info(), 1, d, VLIMIT_DENTRY); \
+ } while (0)
+
+#define vx_dentry_dec(d) do { \
-+ if (atomic_read(&d->d_count) == 0) \
-+ vx_acc_cres(current->vx_info,-1, d, VLIMIT_DENTRY); \
++ if (d_count(d) == 0) \
++ vx_acc_cres(current_vx_info(),-1, d, VLIMIT_DENTRY); \
+ } while (0)
+
+#define vx_dentry_avail(n) \
-+ vx_cres_avail(current->vx_info, n, VLIMIT_DENTRY)
++ vx_cres_avail(current_vx_info(), n, VLIMIT_DENTRY)
+
+
+/* socket limits */
+ 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)
++ vx_cres_avail(current_vx_info(), n, VLIMIT_NSOCK)
+
+
+/* ipc resource limits */
+
-+#define vx_ipcmsg_add(v,u,a) \
++#define vx_ipcmsg_add(v, u, a) \
+ vx_add_cres(v, a, u, RLIMIT_MSGQUEUE)
+
-+#define vx_ipcmsg_sub(v,u,a) \
++#define vx_ipcmsg_sub(v, u, a) \
+ vx_sub_cres(v, a, u, RLIMIT_MSGQUEUE)
+
-+#define vx_ipcmsg_avail(v,a) \
++#define vx_ipcmsg_avail(v, a) \
+ vx_cres_avail(v, a, RLIMIT_MSGQUEUE)
+
+
-+#define vx_ipcshm_add(v,k,a) \
++#define vx_ipcshm_add(v, k, a) \
+ vx_add_cres(v, a, (void *)(long)(k), VLIMIT_SHMEM)
+
-+#define vx_ipcshm_sub(v,k,a) \
++#define vx_ipcshm_sub(v, k, a) \
+ vx_sub_cres(v, a, (void *)(long)(k), VLIMIT_SHMEM)
+
-+#define vx_ipcshm_avail(v,a) \
++#define vx_ipcshm_avail(v, a) \
+ vx_cres_avail(v, a, VLIMIT_SHMEM)
+
+
+#define vx_semary_inc(a) \
-+ vx_acc_cres(current->vx_info, 1, a, VLIMIT_SEMARY)
++ vx_acc_cres(current_vx_info(), 1, a, VLIMIT_SEMARY)
+
+#define vx_semary_dec(a) \
-+ vx_acc_cres(current->vx_info,-1, a, VLIMIT_SEMARY)
++ vx_acc_cres(current_vx_info(), -1, a, VLIMIT_SEMARY)
+
+
+#define vx_nsems_add(a,n) \
-+ vx_add_cres(current->vx_info, n, a, VLIMIT_NSEMS)
++ vx_add_cres(current_vx_info(), n, a, VLIMIT_NSEMS)
+
+#define vx_nsems_sub(a,n) \
-+ vx_sub_cres(current->vx_info, n, a, VLIMIT_NSEMS)
-+
-+
-+#else
-+#warning duplicate inclusion
-+#endif
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vs_memory.h linux-2.6.19.1-vs2.3.0.6/include/linux/vs_memory.h
---- linux-2.6.19.1/include/linux/vs_memory.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vs_memory.h 2006-11-30 19:31:41 +0100
-@@ -0,0 +1,159 @@
-+#ifndef _VS_MEMORY_H
-+#define _VS_MEMORY_H
++ vx_sub_cres(current_vx_info(), n, a, VLIMIT_NSEMS)
+
-+#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 __acc_add_long(a,v) (*(v) += (a))
-+#define __acc_inc_long(v) (++*(v))
-+#define __acc_dec_long(v) (--*(v))
-+
-+#if NR_CPUS >= CONFIG_SPLIT_PTLOCK_CPUS
-+#define __acc_add_atomic(a,v) atomic_long_add(a,v)
-+#define __acc_inc_atomic(v) atomic_long_inc(v)
-+#define __acc_dec_atomic(v) atomic_long_dec(v)
-+#else /* NR_CPUS < CONFIG_SPLIT_PTLOCK_CPUS */
-+#define __acc_add_atomic(a,v) __acc_add_long(a,v)
-+#define __acc_inc_atomic(v) __acc_inc_long(v)
-+#define __acc_dec_atomic(v) __acc_dec_long(v)
-+#endif /* NR_CPUS < CONFIG_SPLIT_PTLOCK_CPUS */
-+
-+
-+#define vx_acc_page(m,d,v,r) do { \
-+ if ((d) > 0) \
-+ __acc_inc_long(&(m->v)); \
-+ else \
-+ __acc_dec_long(&(m->v)); \
-+ __vx_acc_cres(m->mm_vx_info, r, d, m, __FILE__, __LINE__); \
-+} while (0)
-+
-+#define vx_acc_page_atomic(m,d,v,r) do { \
-+ if ((d) > 0) \
-+ __acc_inc_atomic(&(m->v)); \
-+ else \
-+ __acc_dec_atomic(&(m->v)); \
-+ __vx_acc_cres(m->mm_vx_info, r, d, m, __FILE__, __LINE__); \
-+} while (0)
-+
-+
-+#define vx_acc_pages(m,p,v,r) do { \
-+ unsigned long __p = (p); \
-+ __acc_add_long(__p, &(m->v)); \
-+ __vx_add_cres(m->mm_vx_info, r, __p, m, __FILE__, __LINE__); \
-+} while (0)
-+
-+#define vx_acc_pages_atomic(m,p,v,r) do { \
-+ unsigned long __p = (p); \
-+ __acc_add_atomic(__p, &(m->v)); \
-+ __vx_add_cres(m->mm_vx_info, r, __p, m, __FILE__, __LINE__); \
-+} while (0)
-+
-+
-+
-+#define vx_acc_vmpage(m,d) \
-+ vx_acc_page(m, d, total_vm, RLIMIT_AS)
-+#define vx_acc_vmlpage(m,d) \
-+ vx_acc_page(m, d, locked_vm, RLIMIT_MEMLOCK)
-+#define vx_acc_file_rsspage(m,d) \
-+ vx_acc_page_atomic(m, d, _file_rss, VLIMIT_MAPPED)
-+#define vx_acc_anon_rsspage(m,d) \
-+ vx_acc_page_atomic(m, d, _anon_rss, VLIMIT_ANON)
-+
-+#define vx_acc_vmpages(m,p) \
-+ vx_acc_pages(m, p, total_vm, RLIMIT_AS)
-+#define vx_acc_vmlpages(m,p) \
-+ vx_acc_pages(m, p, locked_vm, RLIMIT_MEMLOCK)
-+#define vx_acc_file_rsspages(m,p) \
-+ vx_acc_pages_atomic(m, p, _file_rss, VLIMIT_MAPPED)
-+#define vx_acc_anon_rsspages(m,p) \
-+ vx_acc_pages_atomic(m, p, _anon_rss, VLIMIT_ANON)
-+
-+#define vx_pages_add(s,r,p) __vx_add_cres(s, r, p, 0, __FILE__, __LINE__)
-+#define vx_pages_sub(s,r,p) vx_pages_add(s, r, -(p))
-+
-+#define vx_vmpages_inc(m) vx_acc_vmpage(m, 1)
-+#define vx_vmpages_dec(m) vx_acc_vmpage(m,-1)
-+#define vx_vmpages_add(m,p) vx_acc_vmpages(m, p)
-+#define vx_vmpages_sub(m,p) vx_acc_vmpages(m,-(p))
-+
-+#define vx_vmlocked_inc(m) vx_acc_vmlpage(m, 1)
-+#define vx_vmlocked_dec(m) vx_acc_vmlpage(m,-1)
-+#define vx_vmlocked_add(m,p) vx_acc_vmlpages(m, p)
-+#define vx_vmlocked_sub(m,p) vx_acc_vmlpages(m,-(p))
-+
-+#define vx_file_rsspages_inc(m) vx_acc_file_rsspage(m, 1)
-+#define vx_file_rsspages_dec(m) vx_acc_file_rsspage(m,-1)
-+#define vx_file_rsspages_add(m,p) vx_acc_file_rsspages(m, p)
-+#define vx_file_rsspages_sub(m,p) vx_acc_file_rsspages(m,-(p))
-+
-+#define vx_anon_rsspages_inc(m) vx_acc_anon_rsspage(m, 1)
-+#define vx_anon_rsspages_dec(m) vx_acc_anon_rsspage(m,-1)
-+#define vx_anon_rsspages_add(m,p) vx_acc_anon_rsspages(m, p)
-+#define vx_anon_rsspages_sub(m,p) vx_acc_anon_rsspages(m,-(p))
-+
-+
-+#define vx_pages_avail(m,p,r) \
-+ __vx_cres_avail((m)->mm_vx_info, r, p, __FILE__, __LINE__)
-+
-+#define vx_vmpages_avail(m,p) vx_pages_avail(m, p, RLIMIT_AS)
-+#define vx_vmlocked_avail(m,p) vx_pages_avail(m, p, RLIMIT_MEMLOCK)
-+#define vx_anon_avail(m,p) vx_pages_avail(m, p, VLIMIT_ANON)
-+#define vx_mapped_avail(m,p) vx_pages_avail(m, p, VLIMIT_MAPPED)
-+
-+#define vx_rss_avail(m,p) \
-+ __vx_cres_array_avail((m)->mm_vx_info, VLA_RSS, p, __FILE__, __LINE__)
-+
-+
-+enum {
-+ VXPT_UNKNOWN = 0,
-+ VXPT_ANON,
-+ VXPT_NONE,
-+ VXPT_FILE,
-+ VXPT_SWAP,
-+ VXPT_WRITE
-+};
-+
-+#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" };
-+*/
-+
-+ if (!vxi)
-+ return;
-+
-+ what = (ret & 0x3);
-+
-+/* 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
-+
-+
-+extern unsigned long vx_badness(struct task_struct *task, struct mm_struct *mm);
+
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vs_network.h linux-2.6.19.1-vs2.3.0.6/include/linux/vs_network.h
---- linux-2.6.19.1/include/linux/vs_network.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vs_network.h 2006-12-17 03:46:02 +0100
-@@ -0,0 +1,165 @@
+diff -urNp -x '*.orig' linux-4.9/include/linux/vs_network.h linux-4.9/include/linux/vs_network.h
+--- linux-4.9/include/linux/vs_network.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vs_network.h 2021-02-24 15:47:45.101076533 +0100
+@@ -0,0 +1,169 @@
+#ifndef _NX_VS_NETWORK_H
+#define _NX_VS_NETWORK_H
+
+#include "vserver/context.h"
+#include "vserver/network.h"
+#include "vserver/base.h"
++#include "vserver/check.h"
+#include "vserver/debug.h"
+
++#include <linux/sched.h>
++
+
-+#define get_nx_info(i) __get_nx_info(i,__FILE__,__LINE__)
++#define get_nx_info(i) __get_nx_info(i, __FILE__, __LINE__)
+
+static inline struct nx_info *__get_nx_info(struct nx_info *nxi,
+ const char *_file, int _line)
+ 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,
++ nxi, nxi ? nxi->nx_id : 0,
++ nxi ? atomic_read(&nxi->nx_usecnt) : 0,
+ _file, _line);
+
+ atomic_inc(&nxi->nx_usecnt);
+
+extern void free_nx_info(struct nx_info *);
+
-+#define put_nx_info(i) __put_nx_info(i,__FILE__,__LINE__)
++#define put_nx_info(i) __put_nx_info(i, __FILE__, __LINE__)
+
+static inline void __put_nx_info(struct nx_info *nxi, const char *_file, int _line)
+{
+ return;
+
+ vxlprintk(VXD_CBIT(nid, 2), "put_nx_info(%p[#%d.%d])",
-+ nxi, nxi?nxi->nx_id:0, nxi?atomic_read(&nxi->nx_usecnt):0,
++ nxi, nxi ? nxi->nx_id : 0,
++ nxi ? atomic_read(&nxi->nx_usecnt) : 0,
+ _file, _line);
+
+ if (atomic_dec_and_test(&nxi->nx_usecnt))
+}
+
+
-+#define init_nx_info(p,i) __init_nx_info(p,i,__FILE__,__LINE__)
++#define init_nx_info(p, i) __init_nx_info(p, i, __FILE__, __LINE__)
+
+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,
++ nxi, nxi ? nxi->nx_id : 0,
++ nxi ? atomic_read(&nxi->nx_usecnt) : 0,
+ _file, _line);
+
+ atomic_inc(&nxi->nx_usecnt);
+}
+
+
-+#define set_nx_info(p,i) __set_nx_info(p,i,__FILE__,__LINE__)
++#define set_nx_info(p, i) __set_nx_info(p, i, __FILE__, __LINE__)
+
+static inline void __set_nx_info(struct nx_info **nxp, struct nx_info *nxi,
+ const char *_file, int _line)
+ return;
+
+ vxlprintk(VXD_CBIT(nid, 3), "set_nx_info(%p[#%d.%d])",
-+ nxi, nxi?nxi->nx_id:0,
-+ nxi?atomic_read(&nxi->nx_usecnt):0,
++ nxi, nxi ? nxi->nx_id : 0,
++ nxi ? atomic_read(&nxi->nx_usecnt) : 0,
+ _file, _line);
+
+ atomic_inc(&nxi->nx_usecnt);
+ BUG_ON(nxo);
+}
+
-+#define clr_nx_info(p) __clr_nx_info(p,__FILE__,__LINE__)
++#define clr_nx_info(p) __clr_nx_info(p, __FILE__, __LINE__)
+
+static inline void __clr_nx_info(struct nx_info **nxp,
+ const char *_file, int _line)
+ 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,
++ nxo, nxo ? nxo->nx_id : 0,
++ nxo ? atomic_read(&nxo->nx_usecnt) : 0,
+ _file, _line);
+
+ if (atomic_dec_and_test(&nxo->nx_usecnt))
+}
+
+
-+#define claim_nx_info(v,p) __claim_nx_info(v,p,__FILE__,__LINE__)
++#define claim_nx_info(v, p) __claim_nx_info(v, p, __FILE__, __LINE__)
+
+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, nxi ? nxi->nx_id : 0,
+ nxi?atomic_read(&nxi->nx_usecnt):0,
+ nxi?atomic_read(&nxi->nx_tasks):0,
+ task, _file, _line);
+
+extern void unhash_nx_info(struct nx_info *);
+
-+#define release_nx_info(v,p) __release_nx_info(v,p,__FILE__,__LINE__)
++#define release_nx_info(v, p) __release_nx_info(v, p, __FILE__, __LINE__)
+
+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,
++ nxi, nxi ? nxi->nx_id : 0,
++ nxi ? atomic_read(&nxi->nx_usecnt) : 0,
++ nxi ? atomic_read(&nxi->nx_tasks) : 0,
+ task, _file, _line);
+
+ might_sleep();
+}
+
+
-+#define task_get_nx_info(i) __task_get_nx_info(i,__FILE__,__LINE__)
++#define task_get_nx_info(i) __task_get_nx_info(i, __FILE__, __LINE__)
+
+static __inline__ struct nx_info *__task_get_nx_info(struct task_struct *p,
+ const char *_file, int _line)
+}
+
+
-+
+static inline void exit_nx_info(struct task_struct *p)
+{
+ if (p->nx_info)
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vs_pid.h linux-2.6.19.1-vs2.3.0.6/include/linux/vs_pid.h
---- linux-2.6.19.1/include/linux/vs_pid.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vs_pid.h 2006-12-04 05:21:53 +0100
-@@ -0,0 +1,108 @@
+diff -urNp -x '*.orig' linux-4.9/include/linux/vs_pid.h linux-4.9/include/linux/vs_pid.h
+--- linux-4.9/include/linux/vs_pid.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vs_pid.h 2021-02-24 15:47:45.101076533 +0100
+@@ -0,0 +1,50 @@
+#ifndef _VS_PID_H
+#define _VS_PID_H
+
+#include "vserver/base.h"
++#include "vserver/check.h"
+#include "vserver/context.h"
+#include "vserver/debug.h"
++#include "vserver/pid.h"
++#include <linux/pid_namespace.h>
+
+
-+/* pid faking stuff */
-+
-+
-+#define vx_info_map_pid(v,p) \
-+ __vx_info_map_pid((v), (p), __FUNC__, __FILE__, __LINE__)
-+#define vx_info_map_tgid(v,p) vx_info_map_pid(v,p)
-+#define vx_map_pid(p) vx_info_map_pid(current->vx_info, p)
-+#define vx_map_tgid(p) vx_map_pid(p)
-+
-+static inline int __vx_info_map_pid(struct vx_info *vxi, int pid,
-+ const char *func, const char *file, int line)
-+{
-+ if (vx_info_flags(vxi, VXF_INFO_INIT, 0)) {
-+ vxfprintk(VXD_CBIT(cvirt, 2),
-+ "vx_map_tgid: %p/%llx: %d -> %d",
-+ vxi, (long long)vxi->vx_flags, pid,
-+ (pid && pid == vxi->vx_initpid)?1:pid,
-+ func, file, line);
-+ if (pid == 0)
-+ return 0;
-+ if (pid == vxi->vx_initpid)
-+ return 1;
-+ }
-+ return pid;
-+}
-+
-+#define vx_info_rmap_pid(v,p) \
-+ __vx_info_rmap_pid((v), (p), __FUNC__, __FILE__, __LINE__)
-+#define vx_rmap_pid(p) vx_info_rmap_pid(current->vx_info, p)
-+#define vx_rmap_tgid(p) vx_rmap_pid(p)
-+
-+static inline int __vx_info_rmap_pid(struct vx_info *vxi, int pid,
-+ const char *func, const char *file, int line)
-+{
-+ if (vx_info_flags(vxi, VXF_INFO_INIT, 0)) {
-+ vxfprintk(VXD_CBIT(cvirt, 2),
-+ "vx_rmap_tgid: %p/%llx: %d -> %d",
-+ vxi, (long long)vxi->vx_flags, pid,
-+ (pid == 1)?vxi->vx_initpid:pid,
-+ func, file, line);
-+ if ((pid == 1) && vxi->vx_initpid)
-+ return vxi->vx_initpid;
-+ if (pid == vxi->vx_initpid)
-+ return ~0U;
-+ }
-+ return pid;
-+}
-+
-+
-+#define VXF_FAKE_INIT (VXF_INFO_INIT|VXF_STATE_INIT)
++#define VXF_FAKE_INIT (VXF_INFO_INIT | VXF_STATE_INIT)
+
+static inline
+int vx_proc_task_visible(struct task_struct *task)
+ !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))
++ if (vx_check(vx_task_xid(task), VS_WATCH | VS_IDENT))
+ goto visible;
+ return 0;
+visible:
+ return 1;
+}
+
-+static inline
-+struct task_struct *vx_find_proc_task_by_pid(int pid)
-+{
-+ struct task_struct *task = find_task_by_pid(pid);
++#define find_task_by_real_pid(pid) find_task_by_pid_ns(pid, &init_pid_ns)
+
-+ 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;
-+}
+
+static inline
+struct task_struct *vx_get_proc_task(struct inode *inode, struct pid *pid)
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vs_sched.h linux-2.6.19.1-vs2.3.0.6/include/linux/vs_sched.h
---- linux-2.6.19.1/include/linux/vs_sched.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vs_sched.h 2006-11-30 18:53:18 +0100
-@@ -0,0 +1,109 @@
+diff -urNp -x '*.orig' linux-4.9/include/linux/vs_sched.h linux-4.9/include/linux/vs_sched.h
+--- linux-4.9/include/linux/vs_sched.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vs_sched.h 2021-02-24 15:47:45.101076533 +0100
+@@ -0,0 +1,40 @@
+#ifndef _VS_SCHED_H
+#define _VS_SCHED_H
+
+#include "vserver/sched.h"
+
+
-+#define VAVAVOOM_RATIO 50
-+
+#define MAX_PRIO_BIAS 20
+#define MIN_PRIO_BIAS -20
+
-+
-+#ifdef CONFIG_VSERVER_HARDCPU
-+
-+/*
-+ * effective_prio - return the priority that is based on the static
-+ * priority but is modified by bonuses/penalties.
-+ *
-+ * We scale the actual sleep average [0 .... MAX_SLEEP_AVG]
-+ * into a -4 ... 0 ... +4 bonus/penalty range.
-+ *
-+ * Additionally, we scale another amount based on the number of
-+ * CPU tokens currently held by the context, if the process is
-+ * part of a context (and the appropriate SCHED flag is set).
-+ * This ranges from -5 ... 0 ... +15, quadratically.
-+ *
-+ * So, the total bonus is -9 .. 0 .. +19
-+ * We use ~50% of the full 0...39 priority range so that:
-+ *
-+ * 1) nice +19 interactive tasks do not preempt nice 0 CPU hogs.
-+ * 2) nice -20 CPU hogs do not get preempted by nice 0 tasks.
-+ * unless that context is far exceeding its CPU allocation.
-+ *
-+ * Both properties are important to certain workloads.
-+ */
-+static inline
-+int vx_effective_vavavoom(struct _vx_sched_pc *sched_pc, int max_prio)
-+{
-+ int vavavoom, max;
-+
-+ /* lots of tokens = lots of vavavoom
-+ * no tokens = no vavavoom */
-+ if ((vavavoom = sched_pc->tokens) >= 0) {
-+ max = sched_pc->tokens_max;
-+ vavavoom = max - vavavoom;
-+ max = max * max;
-+ vavavoom = max_prio * VAVAVOOM_RATIO / 100
-+ * (vavavoom*vavavoom - (max >> 2)) / max;
-+ return vavavoom;
-+ }
-+ return 0;
-+}
-+
-+
-+static inline
-+int vx_adjust_prio(struct task_struct *p, int prio, int max_user)
-+{
-+ struct vx_info *vxi = p->vx_info;
-+
-+ if (!vxi)
-+ return prio;
-+
-+ if (vx_info_flags(vxi, VXF_SCHED_PRIO, 0)) {
-+ struct _vx_sched_pc *sched_pc = &vx_cpu(vxi, sched_pc);
-+ int vavavoom = vx_effective_vavavoom(sched_pc, max_user);
-+
-+ vxi->sched.vavavoom = vavavoom;
-+ prio += vavavoom;
-+ }
-+ prio += vxi->sched.prio_bias;
-+ return prio;
-+}
-+
-+#else /* !CONFIG_VSERVER_HARDCPU */
-+
+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 += vxi->sched.prio_bias;
++ prio += vx_cpu(vxi, sched_pc).prio_bias;
+ return prio;
+}
+
-+#endif /* CONFIG_VSERVER_HARDCPU */
-+
-+
+static inline void vx_account_user(struct vx_info *vxi,
+ cputime_t cputime, int nice)
+{
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vs_socket.h linux-2.6.19.1-vs2.3.0.6/include/linux/vs_socket.h
---- linux-2.6.19.1/include/linux/vs_socket.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vs_socket.h 2006-11-30 19:13:42 +0100
+diff -urNp -x '*.orig' linux-4.9/include/linux/vs_socket.h linux-4.9/include/linux/vs_socket.h
+--- linux-4.9/include/linux/vs_socket.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vs_socket.h 2021-02-24 15:47:45.101076533 +0100
@@ -0,0 +1,67 @@
+#ifndef _VS_SOCKET_H
+#define _VS_SOCKET_H
+#include "vserver/base.h"
+#include "vserver/cacct.h"
+#include "vserver/context.h"
++#include "vserver/tag.h"
+
+
+/* socket accounting */
+ }
+}
+
-+#define vx_acc_sock(v,f,p,s) \
-+ __vx_acc_sock((v), (f), (p), (s), __FILE__, __LINE__)
++#define vx_acc_sock(v, f, p, s) \
++ __vx_acc_sock(v, f, p, s, __FILE__, __LINE__)
+
+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);
+
-+ atomic_inc(&vxi->cacct.sock[type][pos].count);
-+ atomic_add(size, &vxi->cacct.sock[type][pos].total);
++ atomic_long_inc(&vxi->cacct.sock[type][pos].count);
++ atomic_long_add(size, &vxi->cacct.sock[type][pos].total);
+ }
+}
+
-+#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 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 sock_vx_init(s) do { \
+ (s)->sk_nx_info = NULL; \
+ } while (0)
+
-+
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vs_tag.h linux-2.6.19.1-vs2.3.0.6/include/linux/vs_tag.h
---- linux-2.6.19.1/include/linux/vs_tag.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vs_tag.h 2006-11-30 18:53:18 +0100
-@@ -0,0 +1,44 @@
+diff -urNp -x '*.orig' linux-4.9/include/linux/vs_tag.h linux-4.9/include/linux/vs_tag.h
+--- linux-4.9/include/linux/vs_tag.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vs_tag.h 2021-02-24 15:47:45.101076533 +0100
+@@ -0,0 +1,47 @@
+#ifndef _VS_TAG_H
+#define _VS_TAG_H
+
+#define DX_ARG_MASK 0x0010
+
+
-+#define dx_task_tag(t) ((t)->xid)
++#define dx_task_tag(t) ((t)->tag)
+
+#define dx_current_tag() dx_task_tag(current)
+
-+#define dx_check(c,m) __dx_check(dx_current_tag(),c,m)
++#define dx_check(c, m) __dx_check(dx_current_tag(), c, m)
+
-+#define dx_weak_check(c,m) ((m) ? dx_check(c,m) : 1)
++#define dx_weak_check(c, m) ((m) ? dx_check(c, m) : 1)
+
+
+/*
+ * check current context for ADMIN/WATCH and
+ * optionally against supplied argument
+ */
-+static inline int __dx_check(tag_t cid, tag_t id, unsigned int mode)
++static inline int __dx_check(vtag_t cid, vtag_t id, unsigned int mode)
+{
+ if (mode & DX_ARG_MASK) {
-+ if ((mode & DX_IDENT) &&
-+ (id == cid))
++ if ((mode & DX_IDENT) && (id == cid))
+ return 1;
+ }
+ return (((mode & DX_ADMIN) && (cid == 0)) ||
+ ((mode & DX_HOSTID) && (id == 0)));
+}
+
++struct inode;
++int dx_permission(const struct inode *inode, int mask);
++
++
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vs_time.h linux-2.6.19.1-vs2.3.0.6/include/linux/vs_time.h
---- linux-2.6.19.1/include/linux/vs_time.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vs_time.h 2006-11-30 18:53:18 +0100
-@@ -0,0 +1,19 @@
+diff -urNp -x '*.orig' linux-4.9/include/linux/vs_time.h linux-4.9/include/linux/vs_time.h
+--- linux-4.9/include/linux/vs_time.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vs_time.h 2021-02-24 15:47:45.101076533 +0100
+@@ -0,0 +1,21 @@
+#ifndef _VS_TIME_H
+#define _VS_TIME_H
+
+
+#ifdef CONFIG_VSERVER_VTIME
+
-+extern void vx_gettimeofday(struct timeval *tv);
-+extern int vx_settimeofday(struct timespec *ts);
++extern void vx_adjust_timespec(struct timespec *ts);
++extern int vx_settimeofday(const struct timespec *ts);
++extern int vx_settimeofday64(const struct timespec64 *ts);
+
+#else
-+#define vx_gettimeofday(t) do_gettimeofday(t)
++#define vx_adjust_timespec(t) do { } while (0)
+#define vx_settimeofday(t) do_settimeofday(t)
++#define vx_settimeofday64(t) do_settimeofday64(t)
+#endif
+
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vserver/Kbuild linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/Kbuild
---- linux-2.6.19.1/include/linux/vserver/Kbuild 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/Kbuild 2006-12-17 04:40:51 +0100
-@@ -0,0 +1,7 @@
-+
-+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 sched_cmd.h signal_cmd.h debug_cmd.h
-+
-+unifdef-y += switch.h network.h monitor.h
-+
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vserver/base.h linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/base.h
---- linux-2.6.19.1/include/linux/vserver/base.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/base.h 2006-12-17 05:26:45 +0100
-@@ -0,0 +1,217 @@
-+#ifndef _VX_BASE_H
-+#define _VX_BASE_H
+diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/base.h linux-4.9/include/linux/vserver/base.h
+--- linux-4.9/include/linux/vserver/base.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vserver/base.h 2021-02-24 15:47:45.094409658 +0100
+@@ -0,0 +1,184 @@
++#ifndef _VSERVER_BASE_H
++#define _VSERVER_BASE_H
+
+
+/* context state changes */
+
-+enum {
-+ VSC_STARTUP = 1,
-+ VSC_SHUTDOWN,
-+
-+ VSC_NETUP,
-+ VSC_NETDOWN,
-+};
-+
-+
-+#define MAX_S_CONTEXT 65535 /* Arbitrary limit */
-+
-+/* check conditions */
-+
-+#define VS_ADMIN 0x0001
-+#define VS_WATCH 0x0002
-+#define VS_HIDE 0x0004
-+#define VS_HOSTID 0x0008
-+
-+#define VS_IDENT 0x0010
-+#define VS_EQUIV 0x0020
-+#define VS_PARENT 0x0040
-+#define VS_CHILD 0x0080
-+
-+#define VS_ARG_MASK 0x00F0
-+
-+#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
-+
-+#define VS_HARDIRQ 0x1000
-+#define VS_SOFTIRQ 0x2000
-+#define VS_IRQ 0x4000
-+
-+#define VS_IRQ_MASK 0xF000
-+
-+#include <linux/hardirq.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_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_task_xid(t) ((t)->xid)
++enum {
++ VSC_STARTUP = 1,
++ VSC_SHUTDOWN,
++
++ VSC_NETUP,
++ VSC_NETDOWN,
++};
+
-+#define vx_current_xid() vx_task_xid(current)
+
-+#define current_vx_info() (current->vx_info)
+
++#define vx_task_xid(t) ((t)->xid)
+
-+#define vx_check(c,m) __vs_check(vx_current_xid(),c,(m)|VS_IRQ)
++#define vx_current_xid() vx_task_xid(current)
+
-+#define vx_weak_check(c,m) ((m) ? vx_check(c,m) : 1)
++#define current_vx_info() (current->vx_info)
+
+
+#define nx_task_nid(t) ((t)->nid)
+#define current_nx_info() (current->nx_info)
+
+
-+#define nx_check(c,m) __vs_check(nx_current_nid(),c,m)
-+
-+#define nx_weak_check(c,m) ((m) ? nx_check(c,m) : 1)
-+
-+
-+
+/* generic flag merging */
+
-+#define vs_check_flags(v,m,f) (((v) & (m)) ^ (f))
++#define vs_check_flags(v, m, f) (((v) & (m)) ^ (f))
+
-+#define vs_mask_flags(v,f,m) (((v) & ~(m)) | ((f) & (m)))
++#define vs_mask_flags(v, f, m) (((v) & ~(m)) | ((f) & (m)))
+
-+#define vs_mask_mask(v,f,m) (((v) & ~(m)) | ((v) & (f) & (m)))
++#define vs_mask_mask(v, f, m) (((v) & ~(m)) | ((v) & (f) & (m)))
+
-+#define vs_check_bit(v,n) ((v) & (1LL << (n)))
++#define vs_check_bit(v, n) ((v) & (1LL << (n)))
+
+
+/* context flags */
+
+#define __vx_flags(v) ((v) ? (v)->vx_flags : 0)
+
-+#define vx_current_flags() __vx_flags(current->vx_info)
++#define vx_current_flags() __vx_flags(current_vx_info())
+
-+#define vx_info_flags(v,m,f) \
-+ vs_check_flags(__vx_flags(v),(m),(f))
++#define vx_info_flags(v, m, f) \
++ vs_check_flags(__vx_flags(v), m, f)
+
-+#define task_vx_flags(t,m,f) \
-+ ((t) && vx_info_flags((t)->vx_info, (m), (f)))
++#define task_vx_flags(t, m, f) \
++ ((t) && vx_info_flags((t)->vx_info, m, f))
+
-+#define vx_flags(m,f) vx_info_flags(current->vx_info,(m),(f))
++#define vx_flags(m, f) vx_info_flags(current_vx_info(), m, f)
+
+
+/* context caps */
+
+#define __vx_ccaps(v) ((v) ? (v)->vx_ccaps : 0)
+
-+#define vx_current_ccaps() __vx_ccaps(current->vx_info)
++#define vx_current_ccaps() __vx_ccaps(current_vx_info())
+
-+#define vx_info_ccaps(v,c) (__vx_ccaps(v) & (c))
++#define vx_info_ccaps(v, c) (__vx_ccaps(v) & (c))
+
-+#define vx_ccaps(c) vx_info_ccaps(current->vx_info,(c))
++#define vx_ccaps(c) vx_info_ccaps(current_vx_info(), (c))
+
+
+
+/* network flags */
+
-+#define __nx_flags(v) ((v) ? (v)->nx_flags : 0)
++#define __nx_flags(n) ((n) ? (n)->nx_flags : 0)
+
-+#define nx_current_flags() __nx_flags(current->nx_info)
++#define nx_current_flags() __nx_flags(current_nx_info())
+
-+#define nx_info_flags(v,m,f) \
-+ vs_check_flags(__nx_flags(v),(m),(f))
++#define nx_info_flags(n, m, f) \
++ vs_check_flags(__nx_flags(n), m, f)
+
-+#define task_nx_flags(t,m,f) \
-+ ((t) && nx_info_flags((t)->nx_info, (m), (f)))
++#define task_nx_flags(t, m, f) \
++ ((t) && nx_info_flags((t)->nx_info, m, f))
+
-+#define nx_flags(m,f) nx_info_flags(current->nx_info,(m),(f))
++#define nx_flags(m, f) nx_info_flags(current_nx_info(), m, f)
+
+
+/* network caps */
+
-+#define __nx_ncaps(v) ((v) ? (v)->nx_ncaps : 0)
++#define __nx_ncaps(n) ((n) ? (n)->nx_ncaps : 0)
+
-+#define nx_current_ncaps() __nx_ncaps(current->nx_info)
++#define nx_current_ncaps() __nx_ncaps(current_nx_info())
+
-+#define nx_info_ncaps(v,c) (__nx_ncaps(v) & (c))
++#define nx_info_ncaps(n, c) (__nx_ncaps(n) & (c))
+
-+#define nx_ncaps(c) nx_info_ncaps(current->nx_info,(c))
++#define nx_ncaps(c) nx_info_ncaps(current_nx_info(), c)
+
+
+/* context mask capabilities */
+
+#define __vx_mcaps(v) ((v) ? (v)->vx_ccaps >> 32UL : ~0 )
+
-+#define vx_info_mcaps(v,c) (__vx_mcaps(v) & (c))
++#define vx_info_mcaps(v, c) (__vx_mcaps(v) & (c))
+
-+#define vx_mcaps(c) vx_info_mcaps(current->vx_info,(c))
++#define vx_mcaps(c) vx_info_mcaps(current_vx_info(), c)
+
+
+/* context bcap mask */
+
-+#define __vx_bcaps(v) ((v) ? (v)->vx_bcaps : ~0 )
++#define __vx_bcaps(v) ((v)->vx_bcaps)
++
++#define vx_current_bcaps() __vx_bcaps(current_vx_info())
+
-+#define vx_current_bcaps() __vx_bcaps(current->vx_info)
+
-+#define vx_info_bcaps(v,c) (__vx_bcaps(v) & (c))
++/* mask given bcaps */
+
-+#define vx_bcaps(c) vx_info_bcaps(current->vx_info,(c))
++#define vx_info_mbcaps(v, c) ((v) ? cap_intersect(__vx_bcaps(v), c) : c)
+
++#define vx_mbcaps(c) vx_info_mbcaps(current_vx_info(), c)
+
-+#define vx_info_cap_bset(v) ((v) ? (v)->vx_cap_bset : cap_bset)
+
-+#define vx_current_cap_bset() vx_info_cap_bset(current->vx_info)
++/* masked cap_bset */
+
++#define vx_info_cap_bset(v) vx_info_mbcaps(v, current->cap_bset)
+
-+#define __vx_info_mbcap(v,b) \
++#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))
+
-+#define vx_info_mbcap(v,b) __vx_info_mbcap(v,cap_t(b))
-+
-+#define task_vx_mbcap(t,b) \
++#define task_vx_mbcap(t, b) \
+ vx_info_mbcap((t)->vx_info, (t)->b)
+
-+#define vx_mbcap(b) task_vx_mbcap(current,b)
++#define vx_mbcap(b) task_vx_mbcap(current, b)
++#endif
++
++#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)))
++
++#define vx_ns_capable(n, b, c) (ns_capable(n, b) || \
++ (cap_raised(current_cap(), b) && vx_ccaps(c)))
++
++#define nx_capable(b, c) (capable(b) || \
++ (cap_raised(current_cap(), b) && nx_ncaps(c)))
++
++#define nx_ns_capable(n, b, c) (ns_capable(n, b) || \
++ (cap_raised(current_cap(), b) && nx_ncaps(c)))
++
++#define vx_task_initpid(t, n) \
++ ((t)->vx_info && \
++ ((t)->vx_info->vx_initpid == (n)))
++
++#define vx_current_initpid(n) vx_task_initpid(current, n)
++
++
++/* context unshare mask */
++
++#define __vx_umask(v) ((v)->vx_umask)
+
-+#define vx_cap_raised(v,c,f) (vx_info_mbcap(v,c) & CAP_TO_MASK(f))
++#define vx_current_umask() __vx_umask(current_vx_info())
+
-+#define vx_capable(b,c) (capable(b) || \
-+ (cap_raised(current->cap_effective,b) && vx_ccaps(c)))
++#define vx_can_unshare(b, f) (capable(b) || \
++ (cap_raised(current_cap(), b) && \
++ !((f) & ~vx_current_umask())))
+
++#define vx_ns_can_unshare(n, b, f) (ns_capable(n, b) || \
++ (cap_raised(current_cap(), b) && \
++ !((f) & ~vx_current_umask())))
+
-+#define vx_current_initpid(n) \
-+ (current->vx_info && \
-+ (current->vx_info->vx_initpid == (n)))
++#define __vx_wmask(v) ((v)->vx_wmask)
++
++#define vx_current_wmask() __vx_wmask(current_vx_info())
+
+
+#define __vx_state(v) ((v) ? ((v)->vx_state) : 0)
+
-+#define vx_info_state(v,m) (__vx_state(v) & (m))
++#define vx_info_state(v, m) (__vx_state(v) & (m))
+
+
-+#define __nx_state(v) ((v) ? ((v)->nx_state) : 0)
++#define __nx_state(n) ((n) ? ((n)->nx_state) : 0)
+
-+#define nx_info_state(v,m) (__nx_state(v) & (m))
++#define nx_info_state(n, m) (__nx_state(n) & (m))
+
+#endif
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vserver/cacct.h linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/cacct.h
---- linux-2.6.19.1/include/linux/vserver/cacct.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/cacct.h 2006-11-08 04:57:44 +0100
+diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/cacct.h linux-4.9/include/linux/vserver/cacct.h
+--- linux-4.9/include/linux/vserver/cacct.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vserver/cacct.h 2021-02-24 15:47:45.094409658 +0100
@@ -0,0 +1,15 @@
-+#ifndef _VX_CACCT_H
-+#define _VX_CACCT_H
++#ifndef _VSERVER_CACCT_H
++#define _VSERVER_CACCT_H
+
+
+enum sock_acc_field {
+ VXA_SOCK_SIZE /* array size */
+};
+
-+#endif /* _VX_CACCT_H */
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vserver/cacct_cmd.h linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/cacct_cmd.h
---- linux-2.6.19.1/include/linux/vserver/cacct_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/cacct_cmd.h 2006-11-08 04:57:49 +0100
-@@ -0,0 +1,23 @@
-+#ifndef _VX_CACCT_CMD_H
-+#define _VX_CACCT_CMD_H
-+
-+
-+/* virtual host info name commands */
-+
-+#define VCMD_sock_stat VC_CMD(VSTAT, 5, 0)
-+
-+struct vcmd_sock_stat_v0 {
-+ uint32_t field;
-+ uint32_t count[3];
-+ uint64_t total[3];
-+};
-+
++#endif /* _VSERVER_CACCT_H */
+diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/cacct_cmd.h linux-4.9/include/linux/vserver/cacct_cmd.h
+--- linux-4.9/include/linux/vserver/cacct_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vserver/cacct_cmd.h 2021-02-24 15:47:45.094409658 +0100
+@@ -0,0 +1,10 @@
++#ifndef _VSERVER_CACCT_CMD_H
++#define _VSERVER_CACCT_CMD_H
+
-+#ifdef __KERNEL__
+
+#include <linux/compiler.h>
++#include <uapi/vserver/cacct_cmd.h>
+
+extern int vc_sock_stat(struct vx_info *, void __user *);
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_CACCT_CMD_H */
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vserver/cacct_def.h linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/cacct_def.h
---- linux-2.6.19.1/include/linux/vserver/cacct_def.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/cacct_def.h 2006-11-08 04:57:49 +0100
++#endif /* _VSERVER_CACCT_CMD_H */
+diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/cacct_def.h linux-4.9/include/linux/vserver/cacct_def.h
+--- linux-4.9/include/linux/vserver/cacct_def.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vserver/cacct_def.h 2021-02-24 15:47:45.094409658 +0100
@@ -0,0 +1,43 @@
-+#ifndef _VX_CACCT_DEF_H
-+#define _VX_CACCT_DEF_H
++#ifndef _VSERVER_CACCT_DEF_H
++#define _VSERVER_CACCT_DEF_H
+
+#include <asm/atomic.h>
+#include <linux/vserver/cacct.h>
+
+
+struct _vx_sock_acc {
-+ atomic_t count;
-+ atomic_t total;
++ atomic_long_t count;
++ atomic_long_t total;
+};
+
+/* context sub struct */
+
+static inline void __dump_vx_cacct(struct _vx_cacct *cacct)
+{
-+ int i,j;
++ int i, j;
+
+ printk("\t_vx_cacct:");
-+ for (i=0; i<6; i++) {
++ 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] = %8d, %8d", j,
-+ atomic_read(&ptr[j].count),
-+ atomic_read(&ptr[j].total));
++ 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 /* _VX_CACCT_DEF_H */
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vserver/cacct_int.h linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/cacct_int.h
---- linux-2.6.19.1/include/linux/vserver/cacct_int.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/cacct_int.h 2006-11-08 04:57:44 +0100
-@@ -0,0 +1,21 @@
-+#ifndef _VX_CACCT_INT_H
-+#define _VX_CACCT_INT_H
-+
-+
-+#ifdef __KERNEL__
++#endif /* _VSERVER_CACCT_DEF_H */
+diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/cacct_int.h linux-4.9/include/linux/vserver/cacct_int.h
+--- linux-4.9/include/linux/vserver/cacct_int.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vserver/cacct_int.h 2021-02-24 15:47:45.094409658 +0100
+@@ -0,0 +1,17 @@
++#ifndef _VSERVER_CACCT_INT_H
++#define _VSERVER_CACCT_INT_H
+
+static inline
+unsigned long vx_sock_count(struct _vx_cacct *cacct, int type, int pos)
+{
-+ return atomic_read(&cacct->sock[type][pos].count);
++ return atomic_long_read(&cacct->sock[type][pos].count);
+}
+
+
+static inline
+unsigned long vx_sock_total(struct _vx_cacct *cacct, int type, int pos)
+{
-+ return atomic_read(&cacct->sock[type][pos].total);
++ return atomic_long_read(&cacct->sock[type][pos].total);
+}
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_CACCT_INT_H */
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vserver/context.h linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/context.h
---- linux-2.6.19.1/include/linux/vserver/context.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/context.h 2006-12-17 05:24:26 +0100
-@@ -0,0 +1,170 @@
-+#ifndef _VX_CONTEXT_H
-+#define _VX_CONTEXT_H
-+
-+#include <linux/types.h>
-+#include <linux/capability.h>
-+
-+
-+/* context flags */
-+
-+#define VXF_INFO_SCHED 0x00000002
-+#define VXF_INFO_NPROC 0x00000004
-+#define VXF_INFO_PRIVATE 0x00000008
++#endif /* _VSERVER_CACCT_INT_H */
+diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/check.h linux-4.9/include/linux/vserver/check.h
+--- linux-4.9/include/linux/vserver/check.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vserver/check.h 2021-02-24 15:47:45.094409658 +0100
+@@ -0,0 +1,89 @@
++#ifndef _VSERVER_CHECK_H
++#define _VSERVER_CHECK_H
+
-+#define VXF_INFO_INIT 0x00000010
-+#define VXF_INFO_HIDE 0x00000020
-+#define VXF_INFO_ULIMIT 0x00000040
-+#define VXF_INFO_NSPACE 0x00000080
+
-+#define VXF_SCHED_HARD 0x00000100
-+#define VXF_SCHED_PRIO 0x00000200
-+#define VXF_SCHED_PAUSE 0x00000400
++#define MAX_S_CONTEXT 65535 /* Arbitrary limit */
+
-+#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
++#ifdef CONFIG_VSERVER_DYNAMIC_IDS
++#define MIN_D_CONTEXT 49152 /* dynamic contexts start here */
++#else
++#define MIN_D_CONTEXT 65536
++#endif
+
-+#define VXF_HIDE_MOUNT 0x01000000
-+/* was VXF_HIDE_NETIF 0x02000000 */
-+#define VXF_HIDE_VINFO 0x04000000
++/* check conditions */
+
-+#define VXF_STATE_SETUP (1ULL<<32)
-+#define VXF_STATE_INIT (1ULL<<33)
-+#define VXF_STATE_ADMIN (1ULL<<34)
++#define VS_ADMIN 0x0001
++#define VS_WATCH 0x0002
++#define VS_HIDE 0x0004
++#define VS_HOSTID 0x0008
+
-+#define VXF_SC_HELPER (1ULL<<36)
-+#define VXF_REBOOT_KILL (1ULL<<37)
-+#define VXF_PERSISTENT (1ULL<<38)
++#define VS_IDENT 0x0010
++#define VS_EQUIV 0x0020
++#define VS_PARENT 0x0040
++#define VS_CHILD 0x0080
+
-+#define VXF_FORK_RSS (1ULL<<48)
-+#define VXF_PROLIFIC (1ULL<<49)
++#define VS_ARG_MASK 0x00F0
+
-+#define VXF_IGNEG_NICE (1ULL<<52)
++#define VS_DYNAMIC 0x0100
++#define VS_STATIC 0x0200
+
-+#define VXF_ONE_TIME (0x0007ULL<<32)
++#define VS_ATR_MASK 0x0F00
+
-+#define VXF_INIT_SET (VXF_STATE_SETUP|VXF_STATE_INIT|VXF_STATE_ADMIN)
++#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
+
++#define VS_HARDIRQ 0x1000
++#define VS_SOFTIRQ 0x2000
++#define VS_IRQ 0x4000
+
-+/* context migration */
++#define VS_IRQ_MASK 0xF000
+
-+#define VXM_SET_INIT 0x00000001
-+#define VXM_SET_REAPER 0x00000002
++#include <linux/hardirq.h>
+
-+/* context caps */
++/*
++ * 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 VXC_CAP_MASK 0x00000000
++#define vx_check(c, m) __vs_check(vx_current_xid(), c, (m) | VS_IRQ)
+
-+#define VXC_SET_UTSNAME 0x00000001
-+#define VXC_SET_RLIMIT 0x00000002
++#define vx_weak_check(c, m) ((m) ? vx_check(c, m) : 1)
+
-+#define VXC_RAW_ICMP 0x00000100
-+#define VXC_SYSLOG 0x00001000
+
-+#define VXC_SECURE_MOUNT 0x00010000
-+#define VXC_SECURE_REMOUNT 0x00020000
-+#define VXC_BINARY_MOUNT 0x00040000
++#define nx_check(c, m) __vs_check(nx_current_nid(), c, m)
+
-+#define VXC_QUOTA_CTL 0x00100000
-+#define VXC_ADMIN_MAPPER 0x00200000
-+#define VXC_ADMIN_CLOOP 0x00400000
++#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1)
+
++#endif
+diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/context.h linux-4.9/include/linux/vserver/context.h
+--- linux-4.9/include/linux/vserver/context.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vserver/context.h 2021-02-24 15:47:45.094409658 +0100
+@@ -0,0 +1,110 @@
++#ifndef _VSERVER_CONTEXT_H
++#define _VSERVER_CONTEXT_H
+
-+#ifdef __KERNEL__
+
+#include <linux/list.h>
+#include <linux/spinlock.h>
+#include <linux/rcupdate.h>
++#include <uapi/vserver/context.h>
+
+#include "limit_def.h"
+#include "sched_def.h"
+#include "cvirt_def.h"
+#include "cacct_def.h"
++#include "device_def.h"
++
++#define VX_SPACES 2
+
+struct _vx_info_pc {
+ struct _vx_sched_pc sched_pc;
+ struct _vx_cvirt_pc cvirt_pc;
+};
+
++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 */
++};
++
+struct vx_info {
+ struct hlist_node vx_hlist; /* linked list of contexts */
-+ xid_t vx_id; /* context id */
++ vxid_t vx_id; /* context id */
+ atomic_t vx_usecnt; /* usage count */
+ atomic_t vx_tasks; /* tasks count */
+ struct vx_info *vx_parent; /* parent context */
+ int vx_state; /* context state */
+
-+ unsigned long vx_nsmask; /* assignment mask */
-+ struct nsproxy *vx_nsproxy; /* private namespace */
-+ struct fs_struct *vx_fs; /* private namespace fs */
++ struct _vx_space space[VX_SPACES]; /* namespace store */
+
+ uint64_t vx_flags; /* context flags */
-+ uint64_t vx_bcaps; /* bounding caps (system) */
+ uint64_t vx_ccaps; /* context caps (vserver) */
-+ kernel_cap_t vx_cap_bset; /* the guest's bset */
++ uint64_t vx_umask; /* unshare mask (guest) */
++ uint64_t vx_wmask; /* warn mask (guest) */
++ kernel_cap_t vx_bcaps; /* bounding caps (system) */
+
+ struct task_struct *vx_reaper; /* guest reaper process */
+ pid_t vx_initpid; /* PID of guest init */
++ int64_t vx_badness_bias; /* OOM points bias */
+
+ 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 */
++
+#ifndef CONFIG_SMP
+ struct _vx_info_pc info_pc; /* per cpu data */
+#else
+#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())
-+
-+
-+struct vx_info_save {
-+ struct vx_info *vxi;
-+ xid_t xid;
-+};
-+
-+
-+/* status flags */
-+
-+#define VXS_HASHED 0x0001
-+#define VXS_PAUSED 0x0010
-+#define VXS_SHUTDOWN 0x0100
-+#define VXS_HELPER 0x1000
-+#define VXS_RELEASED 0x8000
-+
-+
-+extern void claim_vx_info(struct vx_info *, struct task_struct *);
-+extern void release_vx_info(struct vx_info *, struct task_struct *);
-+
-+extern struct vx_info *lookup_vx_info(int);
-+extern struct vx_info *lookup_or_create_vx_info(int);
-+
-+extern int get_xid_list(int, unsigned int *, int);
-+extern int xid_is_hashed(xid_t);
-+
-+extern int vx_migrate_task(struct task_struct *, struct vx_info *, int);
-+
-+extern long vs_state_change(struct vx_info *, unsigned int);
-+
-+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_CONTEXT_H */
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vserver/context_cmd.h linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/context_cmd.h
---- linux-2.6.19.1/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/context_cmd.h 2006-11-08 04:57:49 +0100
-@@ -0,0 +1,123 @@
-+#ifndef _VX_CONTEXT_CMD_H
-+#define _VX_CONTEXT_CMD_H
-+
-+
-+/* vinfo commands */
-+
-+#define VCMD_task_xid VC_CMD(VINFO, 1, 0)
-+
-+#ifdef __KERNEL__
-+extern int vc_task_xid(uint32_t, void __user *);
-+
-+#endif /* __KERNEL__ */
-+
-+#define VCMD_vx_info VC_CMD(VINFO, 5, 0)
-+
-+struct vcmd_vx_info_v0 {
-+ uint32_t xid;
-+ uint32_t initpid;
-+ /* more to come */
-+};
-+
-+#ifdef __KERNEL__
-+extern int vc_vx_info(struct vx_info *, void __user *);
-+
-+#endif /* __KERNEL__ */
-+
-+#define VCMD_ctx_stat VC_CMD(VSTAT, 0, 0)
-+
-+struct vcmd_ctx_stat_v0 {
-+ uint32_t usecnt;
-+ uint32_t tasks;
-+ /* more to come */
-+};
-+
-+#ifdef __KERNEL__
-+extern int vc_ctx_stat(struct vx_info *, void __user *);
-+
-+#endif /* __KERNEL__ */
-+
-+/* context commands */
-+
-+#define VCMD_ctx_create_v0 VC_CMD(VPROC, 1, 0)
-+#define VCMD_ctx_create VC_CMD(VPROC, 1, 1)
-+
-+struct vcmd_ctx_create {
-+ uint64_t flagword;
-+};
-+
-+#define VCMD_ctx_migrate_v0 VC_CMD(PROCMIG, 1, 0)
-+#define VCMD_ctx_migrate VC_CMD(PROCMIG, 1, 1)
-+
-+struct vcmd_ctx_migrate {
-+ uint64_t flagword;
-+};
-+
-+#ifdef __KERNEL__
-+extern int vc_ctx_create(uint32_t, void __user *);
-+extern int vc_ctx_migrate(struct vx_info *, void __user *);
-+
-+#endif /* __KERNEL__ */
-+
-+
-+/* flag commands */
-+
-+#define VCMD_get_cflags VC_CMD(FLAGS, 1, 0)
-+#define VCMD_set_cflags VC_CMD(FLAGS, 2, 0)
-+
-+struct vcmd_ctx_flags_v0 {
-+ uint64_t flagword;
-+ uint64_t mask;
-+};
-+
-+#ifdef __KERNEL__
-+extern int vc_get_cflags(struct vx_info *, void __user *);
-+extern int vc_set_cflags(struct vx_info *, void __user *);
-+
-+#endif /* __KERNEL__ */
-+
-+
-+/* context caps commands */
++#define vx_cpu(vxi, v) vx_per_cpu(vxi, v, smp_processor_id())
+
-+#define VCMD_get_ccaps_v0 VC_CMD(FLAGS, 3, 0)
-+#define VCMD_set_ccaps_v0 VC_CMD(FLAGS, 4, 0)
+
-+struct vcmd_ctx_caps_v0 {
-+ uint64_t bcaps;
-+ uint64_t ccaps;
-+ uint64_t cmask;
++struct vx_info_save {
++ struct vx_info *vxi;
++ vxid_t xid;
+};
+
-+#define VCMD_get_ccaps VC_CMD(FLAGS, 3, 1)
-+#define VCMD_set_ccaps VC_CMD(FLAGS, 4, 1)
+
-+struct vcmd_ctx_caps_v1 {
-+ uint64_t ccaps;
-+ uint64_t cmask;
-+};
++/* status flags */
+
-+#ifdef __KERNEL__
-+extern int vc_get_ccaps_v0(struct vx_info *, void __user *);
-+extern int vc_set_ccaps_v0(struct vx_info *, void __user *);
-+extern int vc_get_ccaps(struct vx_info *, void __user *);
-+extern int vc_set_ccaps(struct vx_info *, void __user *);
++#define VXS_HASHED 0x0001
++#define VXS_PAUSED 0x0010
++#define VXS_SHUTDOWN 0x0100
++#define VXS_HELPER 0x1000
++#define VXS_RELEASED 0x8000
+
-+#endif /* __KERNEL__ */
+
++extern void claim_vx_info(struct vx_info *, struct task_struct *);
++extern void release_vx_info(struct vx_info *, struct task_struct *);
+
-+/* bcaps commands */
++extern struct vx_info *lookup_vx_info(int);
++extern struct vx_info *lookup_or_create_vx_info(int);
+
-+#define VCMD_get_bcaps VC_CMD(FLAGS, 9, 0)
-+#define VCMD_set_bcaps VC_CMD(FLAGS,10, 0)
++extern int get_xid_list(int, unsigned int *, int);
++extern int xid_is_hashed(vxid_t);
+
-+struct vcmd_bcaps {
-+ uint64_t bcaps;
-+ uint64_t bmask;
-+};
++extern int vx_migrate_task(struct task_struct *, struct vx_info *, int);
+
-+#ifdef __KERNEL__
-+extern int vc_get_bcaps(struct vx_info *, void __user *);
-+extern int vc_set_bcaps(struct vx_info *, void __user *);
++extern long vs_state_change(struct vx_info *, unsigned int);
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vserver/cvirt.h linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/cvirt.h
---- linux-2.6.19.1/include/linux/vserver/cvirt.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/cvirt.h 2006-11-14 02:23:11 +0100
-@@ -0,0 +1,20 @@
-+#ifndef _VX_CVIRT_H
-+#define _VX_CVIRT_H
+
++#endif /* _VSERVER_CONTEXT_H */
+diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/context_cmd.h linux-4.9/include/linux/vserver/context_cmd.h
+--- linux-4.9/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vserver/context_cmd.h 2021-02-24 15:47:45.094409658 +0100
+@@ -0,0 +1,33 @@
++#ifndef _VSERVER_CONTEXT_CMD_H
++#define _VSERVER_CONTEXT_CMD_H
+
-+#ifdef __KERNEL__
++#include <uapi/vserver/context_cmd.h>
+
-+struct timespec;
++extern int vc_task_xid(uint32_t);
+
-+void vx_vsi_uptime(struct timespec *, struct timespec *);
++extern int vc_vx_info(struct vx_info *, void __user *);
+
++extern int vc_ctx_stat(struct vx_info *, void __user *);
+
-+struct vx_info;
++extern int vc_ctx_create(uint32_t, void __user *);
++extern int vc_ctx_migrate(struct vx_info *, void __user *);
+
-+void vx_update_load(struct vx_info *);
++extern int vc_get_cflags(struct vx_info *, void __user *);
++extern int vc_set_cflags(struct vx_info *, void __user *);
+
++extern int vc_get_ccaps(struct vx_info *, void __user *);
++extern int vc_set_ccaps(struct vx_info *, void __user *);
+
-+int vx_do_syslog(int, char __user *, int);
++extern int vc_get_bcaps(struct vx_info *, void __user *);
++extern int vc_set_bcaps(struct vx_info *, void __user *);
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_CVIRT_H */
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vserver/cvirt_cmd.h linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/cvirt_cmd.h
---- linux-2.6.19.1/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/cvirt_cmd.h 2006-11-08 04:57:49 +0100
-@@ -0,0 +1,53 @@
-+#ifndef _VX_CVIRT_CMD_H
-+#define _VX_CVIRT_CMD_H
++extern int vc_get_umask(struct vx_info *, void __user *);
++extern int vc_set_umask(struct vx_info *, void __user *);
+
++extern int vc_get_wmask(struct vx_info *, void __user *);
++extern int vc_set_wmask(struct vx_info *, void __user *);
+
-+/* virtual host info name commands */
++extern int vc_get_badness(struct vx_info *, void __user *);
++extern int vc_set_badness(struct vx_info *, void __user *);
+
-+#define VCMD_set_vhi_name VC_CMD(VHOST, 1, 0)
-+#define VCMD_get_vhi_name VC_CMD(VHOST, 2, 0)
++#endif /* _VSERVER_CONTEXT_CMD_H */
+diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/cvirt.h linux-4.9/include/linux/vserver/cvirt.h
+--- linux-4.9/include/linux/vserver/cvirt.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vserver/cvirt.h 2021-02-24 15:47:45.094409658 +0100
+@@ -0,0 +1,11 @@
++#ifndef _VSERVER_CVIRT_H
++#define _VSERVER_CVIRT_H
+
-+struct vcmd_vhi_name_v0 {
-+ uint32_t field;
-+ char name[65];
-+};
++struct vx_info;
+
++void vx_update_load(struct vx_info *);
+
-+enum vhi_name_field {
-+ VHIN_CONTEXT=0,
-+ VHIN_SYSNAME,
-+ VHIN_NODENAME,
-+ VHIN_RELEASE,
-+ VHIN_VERSION,
-+ VHIN_MACHINE,
-+ VHIN_DOMAINNAME,
-+};
+
++int vx_do_syslog(int, char __user *, int);
++
++#endif /* _VSERVER_CVIRT_H */
+diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/cvirt_cmd.h linux-4.9/include/linux/vserver/cvirt_cmd.h
+--- linux-4.9/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vserver/cvirt_cmd.h 2021-02-24 15:47:45.094409658 +0100
+@@ -0,0 +1,13 @@
++#ifndef _VSERVER_CVIRT_CMD_H
++#define _VSERVER_CVIRT_CMD_H
+
-+#ifdef __KERNEL__
+
+#include <linux/compiler.h>
++#include <uapi/vserver/cvirt_cmd.h>
+
+extern int vc_set_vhi_name(struct vx_info *, void __user *);
+extern int vc_get_vhi_name(struct vx_info *, void __user *);
+
-+#endif /* __KERNEL__ */
-+
-+#define VCMD_virt_stat VC_CMD(VSTAT, 3, 0)
-+
-+struct vcmd_virt_stat_v0 {
-+ uint64_t offset;
-+ uint64_t uptime;
-+ uint32_t nr_threads;
-+ uint32_t nr_running;
-+ uint32_t nr_uninterruptible;
-+ uint32_t nr_onhold;
-+ uint32_t nr_forks;
-+ uint32_t load[3];
-+};
-+
-+#ifdef __KERNEL__
+extern int vc_virt_stat(struct vx_info *, void __user *);
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_CVIRT_CMD_H */
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vserver/cvirt_def.h linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/cvirt_def.h
---- linux-2.6.19.1/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/cvirt_def.h 2006-11-14 00:04:36 +0100
-@@ -0,0 +1,82 @@
-+#ifndef _VX_CVIRT_DEF_H
-+#define _VX_CVIRT_DEF_H
++#endif /* _VSERVER_CVIRT_CMD_H */
+diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/cvirt_def.h linux-4.9/include/linux/vserver/cvirt_def.h
+--- linux-4.9/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vserver/cvirt_def.h 2021-02-24 15:47:45.094409658 +0100
+@@ -0,0 +1,80 @@
++#ifndef _VSERVER_CVIRT_DEF_H
++#define _VSERVER_CVIRT_DEF_H
+
+#include <linux/jiffies.h>
+#include <linux/spinlock.h>
+#include <linux/wait.h>
+#include <linux/time.h>
-+#include <linux/utsname.h>
+#include <asm/atomic.h>
+
+
+/* context sub struct */
+
+struct _vx_cvirt {
-+// int max_threads; /* maximum allowed threads */
+ atomic_t nr_threads; /* number of current threads */
+ atomic_t nr_running; /* number of running threads */
+ atomic_t nr_uninterruptible; /* number of uninterruptible threads */
+ atomic_t nr_onhold; /* processes on hold */
+ uint32_t onhold_last; /* jiffies when put on hold */
+
-+ struct timeval bias_tv; /* time offset to the host */
-+ struct timespec bias_idle;
-+ struct timespec bias_uptime; /* context creation point */
++ struct timespec64 bias_ts; /* time offset to the host */
++ struct timespec64 bias_idle;
++ struct timespec64 bias_uptime; /* context creation point */
+ uint64_t bias_clock; /* offset in clock_t */
+
+ spinlock_t load_lock; /* lock for the load averages */
+
+#endif
+
-+#endif /* _VX_CVIRT_DEF_H */
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vserver/debug.h linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/debug.h
---- linux-2.6.19.1/include/linux/vserver/debug.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/debug.h 2006-11-08 04:57:48 +0100
-@@ -0,0 +1,112 @@
-+#ifndef _VX_DEBUG_H
-+#define _VX_DEBUG_H
-+
++#endif /* _VSERVER_CVIRT_DEF_H */
+diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/debug.h linux-4.9/include/linux/vserver/debug.h
+--- linux-4.9/include/linux/vserver/debug.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vserver/debug.h 2021-02-24 15:47:45.094409658 +0100
+@@ -0,0 +1,146 @@
++#ifndef _VSERVER_DEBUG_H
++#define _VSERVER_DEBUG_H
+
-+#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 VXD_QPOS(v,p) (((uint32_t)(v) >> ((p)*8)) & 0xFF)
-+#define VXD_QUAD(v) VXD_QPOS(v,0), VXD_QPOS(v,1), \
-+ VXD_QPOS(v,2), VXD_QPOS(v,3)
-+#define VXF_QUAD "%u.%u.%u.%u"
++#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]"
+
++#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
++
+
-+#define __FUNC__ __func__
++#define vxd_path(p) \
++ ({ static char _buffer[PATH_MAX]; \
++ d_path(p, _buffer, sizeof(_buffer)); })
++
++#define vxd_cond_path(n) \
++ ((n) ? vxd_path(&(n)->path) : "<null>" )
+
+
+#ifdef CONFIG_VSERVER_DEBUG
+
-+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_misc;
++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;
+
+
+#define VX_LOGLEVEL "vxD: "
-+#define VX_WARNLEVEL KERN_WARNING "vxW: "
++#define VX_PROC_FMT "%p: "
++#define VX_PROCESS current
+
-+#define vxdprintk(c,f,x...) \
++#define vxdprintk(c, f, x...) \
+ do { \
+ if (c) \
-+ printk(VX_LOGLEVEL f "\n" , ##x); \
++ printk(VX_LOGLEVEL VX_PROC_FMT f "\n", \
++ VX_PROCESS , ##x); \
+ } while (0)
+
-+#define vxlprintk(c,f,x...) \
++#define vxlprintk(c, f, x...) \
+ do { \
+ if (c) \
+ printk(VX_LOGLEVEL f " @%s:%d\n", x); \
+ } while (0)
+
-+#define vxfprintk(c,f,x...) \
++#define vxfprintk(c, f, x...) \
+ do { \
+ if (c) \
+ printk(VX_LOGLEVEL f " %s@%s:%d\n", x); \
+ } while (0)
+
+
-+#define vxwprintk(c,f,x...) \
-+ do { \
-+ if (c) \
-+ printk(VX_WARNLEVEL f "\n" , ##x); \
-+ } while (0)
-+
-+
-+#define vxd_path(d,m) \
-+ ({ static char _buffer[PATH_MAX]; \
-+ d_path((d), (m), _buffer, sizeof(_buffer)); })
-+
-+#define vxd_cond_path(n) \
-+ ((n) ? vxd_path((n)->dentry, (n)->mnt) : "<null>" )
-+
-+
+struct vx_info;
+
+void dump_vx_info(struct vx_info *, int);
+
+#else /* CONFIG_VSERVER_DEBUG */
+
-+#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 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)
-+#define vxwprintk(x...) do { } while (0)
-+
-+#define vxd_path "<none>"
-+#define vxd_cond_path vxd_path
+
+#endif /* CONFIG_VSERVER_DEBUG */
+
+
-+#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
++#ifdef CONFIG_VSERVER_WARN
++
++#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 vxwprintk(c, f, x...) \
++ do { \
++ if (c) \
++ printk(VX_WARNLEVEL f "\n", ##x); \
++ } while (0)
+
-+#endif /* _VX_DEBUG_H */
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vserver/debug_cmd.h linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/debug_cmd.h
---- linux-2.6.19.1/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/debug_cmd.h 2006-11-08 04:57:49 +0100
-@@ -0,0 +1,58 @@
-+#ifndef _VX_DEBUG_CMD_H
-+#define _VX_DEBUG_CMD_H
++#else /* CONFIG_VSERVER_WARN */
+
++#define vxwprintk(x...) do { } while (0)
+
-+/* debug commands */
++#endif /* CONFIG_VSERVER_WARN */
+
-+#define VCMD_dump_history VC_CMD(DEBUG, 1, 0)
++#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)
+
-+#define VCMD_read_history VC_CMD(DEBUG, 5, 0)
-+#define VCMD_read_monitor VC_CMD(DEBUG, 6, 0)
++#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
+
-+struct vcmd_read_history_v0 {
-+ uint32_t index;
-+ uint32_t count;
-+ char __user *data;
-+};
+
-+struct vcmd_read_monitor_v0 {
-+ uint32_t index;
-+ uint32_t count;
-+ char __user *data;
-+};
++#endif /* _VSERVER_DEBUG_H */
+diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/debug_cmd.h linux-4.9/include/linux/vserver/debug_cmd.h
+--- linux-4.9/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vserver/debug_cmd.h 2021-02-24 15:47:45.094409658 +0100
+@@ -0,0 +1,37 @@
++#ifndef _VSERVER_DEBUG_CMD_H
++#define _VSERVER_DEBUG_CMD_H
+
++#include <uapi/vserver/debug_cmd.h>
+
-+#ifdef __KERNEL__
+
+#ifdef CONFIG_COMPAT
+
+#include <asm/compat.h>
+
-+struct vcmd_read_history_v0_x32 {
++struct vcmd_read_history_v0_x32 {
+ uint32_t index;
+ uint32_t count;
+ compat_uptr_t data_ptr;
+};
+
-+struct vcmd_read_monitor_v0_x32 {
++struct vcmd_read_monitor_v0_x32 {
+ uint32_t index;
+ uint32_t count;
+ compat_uptr_t data_ptr;
+
+#endif /* CONFIG_COMPAT */
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_DEBUG_CMD_H */
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vserver/device.h linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/device.h
---- linux-2.6.19.1/include/linux/vserver/device.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/device.h 2006-12-09 03:45:16 +0100
-@@ -0,0 +1,13 @@
-+#ifndef _VX_DEVICE_H
-+#define _VX_DEVICE_H
-+
-+
-+#define DATTR_CREATE 0x00000001
-+#define DATTR_OPEN 0x00000002
++#endif /* _VSERVER_DEBUG_CMD_H */
+diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/device.h linux-4.9/include/linux/vserver/device.h
+--- linux-4.9/include/linux/vserver/device.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vserver/device.h 2021-02-24 15:47:45.094409658 +0100
+@@ -0,0 +1,9 @@
++#ifndef _VSERVER_DEVICE_H
++#define _VSERVER_DEVICE_H
+
-+#define DATTR_REMAP 0x00000010
+
++#include <uapi/vserver/device.h>
+
-+#else /* _VX_DEVICE_H */
++#else /* _VSERVER_DEVICE_H */
+#warning duplicate inclusion
-+#endif /* _VX_DEVICE_H */
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vserver/device_cmd.h linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/device_cmd.h
---- linux-2.6.19.1/include/linux/vserver/device_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/device_cmd.h 2006-12-09 03:47:06 +0100
-@@ -0,0 +1,41 @@
-+#ifndef _VX_DEVICE_CMD_H
-+#define _VX_DEVICE_CMD_H
-+
-+
-+/* device vserver commands */
-+
-+#define VCMD_set_mapping VC_CMD(DEVICE, 1, 0)
-+
-+struct vcmd_set_mapping_v0 {
-+ const char __user *device;
-+ const char __user *target;
-+ uint32_t flags;
-+};
++#endif /* _VSERVER_DEVICE_H */
+diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/device_cmd.h linux-4.9/include/linux/vserver/device_cmd.h
+--- linux-4.9/include/linux/vserver/device_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vserver/device_cmd.h 2021-02-24 15:47:45.094409658 +0100
+@@ -0,0 +1,31 @@
++#ifndef _VSERVER_DEVICE_CMD_H
++#define _VSERVER_DEVICE_CMD_H
+
++#include <uapi/vserver/device_cmd.h>
+
-+#ifdef __KERNEL__
+
+#ifdef CONFIG_COMPAT
+
+
+#include <linux/compiler.h>
+
-+extern int vc_set_mapping(uint32_t, void __user *);
++extern int vc_set_mapping(struct vx_info *, void __user *);
++extern int vc_unset_mapping(struct vx_info *, void __user *);
+
+#ifdef CONFIG_COMPAT
+
-+extern int vc_set_mapping_x32(uint32_t, void __user *);
++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 /* __KERNEL__ */
-+#endif /* _VX_DEVICE_CMD_H */
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vserver/dlimit.h linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/dlimit.h
---- linux-2.6.19.1/include/linux/vserver/dlimit.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/dlimit.h 2006-11-08 04:57:50 +0100
-@@ -0,0 +1,53 @@
-+#ifndef _VX_DLIMIT_H
-+#define _VX_DLIMIT_H
++#endif /* _VSERVER_DEVICE_CMD_H */
+diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/device_def.h linux-4.9/include/linux/vserver/device_def.h
+--- linux-4.9/include/linux/vserver/device_def.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vserver/device_def.h 2021-02-24 15:47:45.094409658 +0100
+@@ -0,0 +1,17 @@
++#ifndef _VSERVER_DEVICE_DEF_H
++#define _VSERVER_DEVICE_DEF_H
++
++#include <linux/types.h>
++
++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 /* _VSERVER_DEVICE_DEF_H */
+diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/dlimit.h linux-4.9/include/linux/vserver/dlimit.h
+--- linux-4.9/include/linux/vserver/dlimit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vserver/dlimit.h 2021-02-24 15:47:45.094409658 +0100
+@@ -0,0 +1,54 @@
++#ifndef _VSERVER_DLIMIT_H
++#define _VSERVER_DLIMIT_H
+
+#include "switch.h"
+
+#define DLIM_INFINITY (~0ULL)
+
+#include <linux/spinlock.h>
++#include <linux/rcupdate.h>
+
+struct super_block;
+
+struct dl_info {
+ struct hlist_node dl_hlist; /* linked list of contexts */
+ struct rcu_head dl_rcu; /* the rcu head */
-+ tag_t dl_tag; /* context tag */
++ vtag_t dl_tag; /* context tag */
+ atomic_t dl_usecnt; /* usage count */
+ atomic_t dl_refcnt; /* reference count */
+
+extern void rcu_free_dl_info(struct rcu_head *);
+extern void unhash_dl_info(struct dl_info *);
+
-+extern struct dl_info *locate_dl_info(struct super_block *, tag_t);
++extern struct dl_info *locate_dl_info(struct super_block *, vtag_t);
+
+
+struct kstatfs;
+typedef uint64_t dlsize_t;
+
+#endif /* __KERNEL__ */
-+#else /* _VX_DLIMIT_H */
++#else /* _VSERVER_DLIMIT_H */
+#warning duplicate inclusion
-+#endif /* _VX_DLIMIT_H */
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vserver/dlimit_cmd.h linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/dlimit_cmd.h
---- linux-2.6.19.1/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/dlimit_cmd.h 2006-11-08 04:57:49 +0100
-@@ -0,0 +1,74 @@
-+#ifndef _VX_DLIMIT_CMD_H
-+#define _VX_DLIMIT_CMD_H
-+
-+
-+/* dlimit vserver commands */
-+
-+#define VCMD_add_dlimit VC_CMD(DLIMIT, 1, 0)
-+#define VCMD_rem_dlimit VC_CMD(DLIMIT, 2, 0)
++#endif /* _VSERVER_DLIMIT_H */
+diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/dlimit_cmd.h linux-4.9/include/linux/vserver/dlimit_cmd.h
+--- linux-4.9/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vserver/dlimit_cmd.h 2021-02-24 15:47:45.094409658 +0100
+@@ -0,0 +1,46 @@
++#ifndef _VSERVER_DLIMIT_CMD_H
++#define _VSERVER_DLIMIT_CMD_H
+
-+#define VCMD_set_dlimit VC_CMD(DLIMIT, 5, 0)
-+#define VCMD_get_dlimit VC_CMD(DLIMIT, 6, 0)
-+
-+struct vcmd_ctx_dlimit_base_v0 {
-+ const char __user *name;
-+ uint32_t flags;
-+};
-+
-+struct vcmd_ctx_dlimit_v0 {
-+ const char __user *name;
-+ uint32_t space_used; /* used space in kbytes */
-+ uint32_t space_total; /* maximum space in kbytes */
-+ uint32_t inodes_used; /* used inodes */
-+ uint32_t inodes_total; /* maximum inodes */
-+ uint32_t reserved; /* reserved for root in % */
-+ uint32_t flags;
-+};
-+
-+#define CDLIM_UNSET ((uint32_t)0UL)
-+#define CDLIM_INFINITY ((uint32_t)~0UL)
-+#define CDLIM_KEEP ((uint32_t)~1UL)
++#include <uapi/vserver/dlimit_cmd.h>
+
-+#ifdef __KERNEL__
+
+#ifdef CONFIG_COMPAT
+
+
+#endif /* CONFIG_COMPAT */
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_DLIMIT_CMD_H */
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vserver/global.h linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/global.h
---- linux-2.6.19.1/include/linux/vserver/global.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/global.h 2006-12-06 21:16:15 +0100
-@@ -0,0 +1,11 @@
-+#ifndef _VX_GLOBAL_H
-+#define _VX_GLOBAL_H
++#endif /* _VSERVER_DLIMIT_CMD_H */
+diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/global.h linux-4.9/include/linux/vserver/global.h
+--- linux-4.9/include/linux/vserver/global.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vserver/global.h 2021-02-24 15:47:45.094409658 +0100
+@@ -0,0 +1,20 @@
++#ifndef _VSERVER_GLOBAL_H
++#define _VSERVER_GLOBAL_H
+
+
+extern atomic_t vx_global_ctotal;
+extern atomic_t nx_global_ctotal;
+extern atomic_t nx_global_cactive;
+
-+#endif /* _VX_GLOBAL_H */
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vserver/history.h linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/history.h
---- linux-2.6.19.1/include/linux/vserver/history.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/history.h 2006-11-30 19:59:44 +0100
++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_ipc_ns;
++extern atomic_t vs_global_user_ns;
++extern atomic_t vs_global_pid_ns;
++
++
++#endif /* _VSERVER_GLOBAL_H */
+diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/history.h linux-4.9/include/linux/vserver/history.h
+--- linux-4.9/include/linux/vserver/history.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vserver/history.h 2021-02-24 15:47:45.094409658 +0100
@@ -0,0 +1,197 @@
-+#ifndef _VX_HISTORY_H
-+#define _VX_HISTORY_H
++#ifndef _VSERVER_HISTORY_H
++#define _VSERVER_HISTORY_H
+
+
+enum {
-+ VXH_UNUSED=0,
-+ VXH_THROW_OOPS=1,
++ VXH_UNUSED = 0,
++ VXH_THROW_OOPS = 1,
+
+ VXH_GET_VX_INFO,
+ VXH_PUT_VX_INFO,
+
+#define vxh_throw_oops() __vxh_throw_oops(__HERE__);
+
-+#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_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);
++#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);
+
-+#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);
++#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);
+
+#define vxh_alloc_vx_info(v) \
+ __vxh_smpl(v, VXH_ALLOC_VX_INFO, __HERE__);
+#define vxh_unhash_vx_info(v) \
+ __vxh_smpl(v, VXH_UNHASH_VX_INFO, __HERE__);
+
-+#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__);
++#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__);
+
+extern void vxh_dump_history(void);
+
+
+#define vxh_throw_oops() do { } while (0)
+
-+#define __vxh_get_vx_info(v,h) do { } while (0)
-+#define __vxh_put_vx_info(v,h) do { } while (0)
++#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)
++#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)
+
-+#define __vxh_claim_vx_info(v,d,h) do { } while (0)
-+#define __vxh_release_vx_info(v,d,h) do { } while (0)
++#define __vxh_claim_vx_info(v, d, h) do { } while (0)
++#define __vxh_release_vx_info(v, d, h) do { } while (0)
+
+#define vxh_alloc_vx_info(v) do { } while (0)
+#define vxh_dealloc_vx_info(v) do { } while (0)
+#define vxh_hash_vx_info(v) do { } while (0)
+#define vxh_unhash_vx_info(v) do { } while (0)
+
-+#define vxh_loc_vx_info(a,v) do { } while (0)
-+#define vxh_lookup_vx_info(a,v) do { } while (0)
-+#define vxh_create_vx_info(a,v) do { } while (0)
++#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)
+
+#define vxh_dump_history() do { } while (0)
+
+
+#endif /* CONFIG_VSERVER_HISTORY */
+
-+#endif /* _VX_HISTORY_H */
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vserver/inode.h linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/inode.h
---- linux-2.6.19.1/include/linux/vserver/inode.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/inode.h 2006-11-08 04:57:45 +0100
-@@ -0,0 +1,38 @@
-+#ifndef _VX_INODE_H
-+#define _VX_INODE_H
-+
-+
-+#define IATTR_TAG 0x01000000
-+
-+#define IATTR_ADMIN 0x00000001
-+#define IATTR_WATCH 0x00000002
-+#define IATTR_HIDE 0x00000004
-+#define IATTR_FLAGS 0x00000007
-+
-+#define IATTR_BARRIER 0x00010000
-+#define IATTR_IUNLINK 0x00020000
-+#define IATTR_IMMUTABLE 0x00040000
++#endif /* _VSERVER_HISTORY_H */
+diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/inode.h linux-4.9/include/linux/vserver/inode.h
+--- linux-4.9/include/linux/vserver/inode.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vserver/inode.h 2021-02-24 15:47:45.097743096 +0100
+@@ -0,0 +1,19 @@
++#ifndef _VSERVER_INODE_H
++#define _VSERVER_INODE_H
+
-+#ifdef __KERNEL__
++#include <uapi/vserver/inode.h>
+
+
+#ifdef CONFIG_VSERVER_PROC_SECURE
+#else
+#define IATTR_PROC_DEFAULT ( IATTR_ADMIN )
+#define IATTR_PROC_SYMLINK ( IATTR_ADMIN )
-+#endif
-+
-+#define vx_hide_check(c,m) (((m) & IATTR_HIDE) ? vx_check(c,m) : 1)
-+
-+#endif /* __KERNEL__ */
-+
-+/* inode ioctls */
-+
-+#define FIOC_GETXFLG _IOR('x', 5, long)
-+#define FIOC_SETXFLG _IOW('x', 6, long)
-+
-+#else /* _VX_INODE_H */
-+#warning duplicate inclusion
-+#endif /* _VX_INODE_H */
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vserver/inode_cmd.h linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/inode_cmd.h
---- linux-2.6.19.1/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/inode_cmd.h 2006-11-08 04:57:49 +0100
-@@ -0,0 +1,61 @@
-+#ifndef _VX_INODE_CMD_H
-+#define _VX_INODE_CMD_H
-+
-+
-+/* inode vserver commands */
-+
-+#define VCMD_get_iattr_v0 VC_CMD(INODE, 1, 0)
-+#define VCMD_set_iattr_v0 VC_CMD(INODE, 2, 0)
-+
-+#define VCMD_get_iattr VC_CMD(INODE, 1, 1)
-+#define VCMD_set_iattr VC_CMD(INODE, 2, 1)
-+
-+struct vcmd_ctx_iattr_v0 {
-+ /* device handle in id */
-+ uint64_t ino;
-+ uint32_t xid;
-+ uint32_t flags;
-+ uint32_t mask;
-+};
++#endif
+
-+struct vcmd_ctx_iattr_v1 {
-+ const char __user *name;
-+ uint32_t xid;
-+ uint32_t flags;
-+ uint32_t mask;
-+};
++#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 -urNp -x '*.orig' linux-4.9/include/linux/vserver/inode_cmd.h linux-4.9/include/linux/vserver/inode_cmd.h
+--- linux-4.9/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vserver/inode_cmd.h 2021-02-24 15:47:45.097743096 +0100
+@@ -0,0 +1,36 @@
++#ifndef _VSERVER_INODE_CMD_H
++#define _VSERVER_INODE_CMD_H
+
++#include <uapi/vserver/inode_cmd.h>
+
-+#ifdef __KERNEL__
+
+
+#ifdef CONFIG_COMPAT
+
+struct vcmd_ctx_iattr_v1_x32 {
+ compat_uptr_t name_ptr;
-+ uint32_t xid;
++ uint32_t tag;
+ uint32_t flags;
+ uint32_t mask;
+};
+
+#include <linux/compiler.h>
+
-+extern int vc_get_iattr_v0(uint32_t, void __user *);
-+extern int vc_set_iattr_v0(uint32_t, void __user *);
++extern int vc_get_iattr(void __user *);
++extern int vc_set_iattr(void __user *);
+
-+extern int vc_get_iattr(uint32_t, void __user *);
-+extern int vc_set_iattr(uint32_t, void __user *);
++extern int vc_fget_iattr(uint32_t, void __user *);
++extern int vc_fset_iattr(uint32_t, void __user *);
+
+#ifdef CONFIG_COMPAT
+
-+extern int vc_get_iattr_x32(uint32_t, void __user *);
-+extern int vc_set_iattr_x32(uint32_t, void __user *);
++extern int vc_get_iattr_x32(void __user *);
++extern int vc_set_iattr_x32(void __user *);
+
+#endif /* CONFIG_COMPAT */
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_INODE_CMD_H */
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vserver/limit.h linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/limit.h
---- linux-2.6.19.1/include/linux/vserver/limit.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/limit.h 2006-11-30 19:31:41 +0100
-@@ -0,0 +1,68 @@
-+#ifndef _VX_LIMIT_H
-+#define _VX_LIMIT_H
-+
-+
-+#define VLIMIT_NSOCK 16
-+#define VLIMIT_OPENFD 17
-+#define VLIMIT_ANON 18
-+#define VLIMIT_SHMEM 19
-+#define VLIMIT_SEMARY 20
-+#define VLIMIT_NSEMS 21
-+#define VLIMIT_DENTRY 22
-+#define VLIMIT_MAPPED 23
++#endif /* _VSERVER_INODE_CMD_H */
+diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/limit.h linux-4.9/include/linux/vserver/limit.h
+--- linux-4.9/include/linux/vserver/limit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vserver/limit.h 2021-02-24 15:47:45.097743096 +0100
+@@ -0,0 +1,67 @@
++#ifndef _VSERVER_LIMIT_H
++#define _VSERVER_LIMIT_H
+
++#include <uapi/vserver/limit.h>
+
-+#ifdef __KERNEL__
+
+#define VLIM_NOCHECK ((1L << VLIMIT_DENTRY) | (1L << RLIMIT_RSS))
+
+
+#define VLIM_INFINITY (~0ULL)
+
++#include <asm/atomic.h>
++#include <asm/resource.h>
++
+#ifndef RLIM_INFINITY
+#warning RLIM_INFINITY is undefined
+#endif
+
-+#define __rlim_val(l,r,v) ((l)->res[(r)].v)
++#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)
++#define __rlim_soft(l, r) __rlim_val(l, r, soft)
++#define __rlim_hard(l, r) __rlim_val(l, r, hard)
+
-+#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)
++#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)
+
-+#define __rlim_lhit(l,r) __rlim_val(l,r,lhit)
-+#define __rlim_hit(l,r) atomic_inc(&__rlim_lhit(l,r))
++#define __rlim_lhit(l, r) __rlim_val(l, r, lhit)
++#define __rlim_hit(l, r) atomic_inc(&__rlim_lhit(l, r))
+
+typedef atomic_long_t rlim_atomic_t;
+typedef unsigned long rlim_t;
+
-+#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))
++#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))
+
+
+#if (RLIM_INFINITY == VLIM_INFINITY)
+
+struct sysinfo;
+
++#ifdef CONFIG_MEMCG
+void vx_vsi_meminfo(struct sysinfo *);
+void vx_vsi_swapinfo(struct sysinfo *);
++long vx_vsi_cached(struct sysinfo *);
++#else /* !CONFIG_MEMCG */
++#define vx_vsi_meminfo(s) do { } while (0)
++#define vx_vsi_swapinfo(s) do { } while (0)
++#define vx_vsi_cached(s) (0L)
++#endif /* !CONFIG_MEMCG */
+
+#define NUM_LIMITS 24
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_LIMIT_H */
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vserver/limit_cmd.h linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/limit_cmd.h
---- linux-2.6.19.1/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/limit_cmd.h 2006-11-08 04:57:49 +0100
-@@ -0,0 +1,69 @@
-+#ifndef _VX_LIMIT_CMD_H
-+#define _VX_LIMIT_CMD_H
-+
-+
-+/* rlimit vserver commands */
-+
-+#define VCMD_get_rlimit VC_CMD(RLIMIT, 1, 0)
-+#define VCMD_set_rlimit VC_CMD(RLIMIT, 2, 0)
-+#define VCMD_get_rlimit_mask VC_CMD(RLIMIT, 3, 0)
-+#define VCMD_reset_minmax VC_CMD(RLIMIT, 9, 0)
-+
-+struct vcmd_ctx_rlimit_v0 {
-+ uint32_t id;
-+ uint64_t minimum;
-+ uint64_t softlimit;
-+ uint64_t maximum;
-+};
-+
-+struct vcmd_ctx_rlimit_mask_v0 {
-+ uint32_t minimum;
-+ uint32_t softlimit;
-+ uint32_t maximum;
-+};
-+
-+#define VCMD_rlimit_stat VC_CMD(VSTAT, 1, 0)
-+
-+struct vcmd_rlimit_stat_v0 {
-+ uint32_t id;
-+ uint32_t hits;
-+ uint64_t value;
-+ uint64_t minimum;
-+ uint64_t maximum;
-+};
++#endif /* _VSERVER_LIMIT_H */
+diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/limit_cmd.h linux-4.9/include/linux/vserver/limit_cmd.h
+--- linux-4.9/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vserver/limit_cmd.h 2021-02-24 15:47:45.097743096 +0100
+@@ -0,0 +1,35 @@
++#ifndef _VSERVER_LIMIT_CMD_H
++#define _VSERVER_LIMIT_CMD_H
+
-+#define CRLIM_UNSET (0ULL)
-+#define CRLIM_INFINITY (~0ULL)
-+#define CRLIM_KEEP (~1ULL)
++#include <uapi/vserver/limit_cmd.h>
+
-+#ifdef __KERNEL__
+
+#ifdef CONFIG_IA32_EMULATION
+
+ uint64_t minimum;
+ uint64_t softlimit;
+ uint64_t maximum;
-+} __attribute__ ((aligned (4)));
++} __attribute__ ((packed));
+
+#endif /* CONFIG_IA32_EMULATION */
+
+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_rlimit_stat(struct vx_info *, void __user *);
+
+#endif /* CONFIG_IA32_EMULATION */
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_LIMIT_CMD_H */
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vserver/limit_def.h linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/limit_def.h
---- linux-2.6.19.1/include/linux/vserver/limit_def.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/limit_def.h 2006-11-08 04:57:49 +0100
++#endif /* _VSERVER_LIMIT_CMD_H */
+diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/limit_def.h linux-4.9/include/linux/vserver/limit_def.h
+--- linux-4.9/include/linux/vserver/limit_def.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vserver/limit_def.h 2021-02-24 15:47:45.097743096 +0100
@@ -0,0 +1,47 @@
-+#ifndef _VX_LIMIT_DEF_H
-+#define _VX_LIMIT_DEF_H
++#ifndef _VSERVER_LIMIT_DEF_H
++#define _VSERVER_LIMIT_DEF_H
+
+#include <asm/atomic.h>
+#include <asm/resource.h>
+ int i;
+
+ printk("\t_vx_limit:");
-+ for (i=0; i<NUM_LIMITS; i++) {
++ 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),
+
+#endif
+
-+#endif /* _VX_LIMIT_DEF_H */
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vserver/limit_int.h linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/limit_int.h
---- linux-2.6.19.1/include/linux/vserver/limit_int.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/limit_int.h 2006-12-04 05:22:12 +0100
-@@ -0,0 +1,175 @@
-+#ifndef _VX_LIMIT_INT_H
-+#define _VX_LIMIT_INT_H
-+
-+#include "context.h"
-+
-+#ifdef __KERNEL__
++#endif /* _VSERVER_LIMIT_DEF_H */
+diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/limit_int.h linux-4.9/include/linux/vserver/limit_int.h
+--- linux-4.9/include/linux/vserver/limit_int.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vserver/limit_int.h 2021-02-24 15:47:45.097743096 +0100
+@@ -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))
++#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];
+
+ -1 ... over soft limit
+ 0 ... over hard limit */
+
-+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;
++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;
++
++ 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);
++
++ if (!__vx_cres_adjust_max(limit, res, value))
++ __vx_cres_adjust_min(limit, res, value);
++
++ 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 -urNp -x '*.orig' linux-4.9/include/linux/vserver/monitor.h linux-4.9/include/linux/vserver/monitor.h
+--- linux-4.9/include/linux/vserver/monitor.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vserver/monitor.h 2021-02-24 15:47:45.097743096 +0100
+@@ -0,0 +1,6 @@
++#ifndef _VSERVER_MONITOR_H
++#define _VSERVER_MONITOR_H
++
++#include <uapi/vserver/monitor.h>
++
++#endif /* _VSERVER_MONITOR_H */
+diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/network.h linux-4.9/include/linux/vserver/network.h
+--- linux-4.9/include/linux/vserver/network.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vserver/network.h 2021-02-24 15:47:45.097743096 +0100
+@@ -0,0 +1,76 @@
++#ifndef _VSERVER_NETWORK_H
++#define _VSERVER_NETWORK_H
++
++
++#include <linux/list.h>
++#include <linux/spinlock.h>
++#include <linux/rcupdate.h>
++#include <linux/in.h>
++#include <linux/in6.h>
++#include <asm/atomic.h>
++#include <uapi/vserver/network.h>
++
++struct nx_addr_v4 {
++ struct nx_addr_v4 *next;
++ struct in_addr ip[2];
++ struct in_addr mask;
++ uint16_t type;
++ uint16_t flags;
++};
++
++struct nx_addr_v6 {
++ struct nx_addr_v6 *next;
++ struct in6_addr ip;
++ struct in6_addr mask;
++ uint32_t prefix;
++ uint16_t type;
++ uint16_t flags;
++};
++
++struct nx_info {
++ struct hlist_node nx_hlist; /* linked list of nxinfos */
++ vnid_t nx_id; /* vnet id */
++ atomic_t nx_usecnt; /* usage count */
++ atomic_t nx_tasks; /* tasks count */
++ int nx_state; /* context state */
++
++ 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 */
++#ifdef CONFIG_IPV6
++ struct nx_addr_v6 v6; /* First/Single ipv6 address */
++#endif
++ char nx_name[65]; /* network context name */
++};
++
++
++/* status flags */
++
++#define NXS_HASHED 0x0001
++#define NXS_SHUTDOWN 0x0100
++#define NXS_RELEASED 0x8000
++
++extern struct nx_info *lookup_nx_info(int);
++
++extern int get_nid_list(int, unsigned int *, int);
++extern int nid_is_hashed(vnid_t);
++
++extern int nx_migrate_task(struct task_struct *, struct nx_info *);
++
++extern long vs_net_change(struct nx_info *, unsigned int);
++
++struct sock;
++
++
++#define NX_IPV4(n) ((n)->v4.type != NXA_TYPE_NONE)
++#ifdef CONFIG_IPV6
++#define NX_IPV6(n) ((n)->v6.type != NXA_TYPE_NONE)
++#else
++#define NX_IPV6(n) (0)
++#endif
++
++#endif /* _VSERVER_NETWORK_H */
+diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/network_cmd.h linux-4.9/include/linux/vserver/network_cmd.h
+--- linux-4.9/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vserver/network_cmd.h 2021-02-24 15:47:45.097743096 +0100
+@@ -0,0 +1,37 @@
++#ifndef _VSERVER_NETWORK_CMD_H
++#define _VSERVER_NETWORK_CMD_H
++
++#include <uapi/vserver/network_cmd.h>
++
++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 *);
+
-+ 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;
++extern int vc_get_nflags(struct nx_info *, void __user *);
++extern int vc_set_nflags(struct nx_info *, void __user *);
+
-+ limit = &vxi->limit;
-+ value = __rlim_get(limit, res);
++extern int vc_get_ncaps(struct nx_info *, void __user *);
++extern int vc_set_ncaps(struct nx_info *, void __user *);
+
-+ if (!__vx_cres_adjust_max(limit, res, value))
-+ __vx_cres_adjust_min(limit, res, value);
++#endif /* _VSERVER_CONTEXT_CMD_H */
+diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/percpu.h linux-4.9/include/linux/vserver/percpu.h
+--- linux-4.9/include/linux/vserver/percpu.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vserver/percpu.h 2021-02-24 15:47:45.097743096 +0100
+@@ -0,0 +1,14 @@
++#ifndef _VSERVER_PERCPU_H
++#define _VSERVER_PERCPU_H
+
-+ if (num == 0)
-+ return 1;
++#include "cvirt_def.h"
++#include "sched_def.h"
+
-+ if (__rlim_soft(limit, res) == RLIM_INFINITY)
-+ return -1;
-+ if (value + num <= __rlim_soft(limit, res))
-+ return -1;
++struct _vx_percpu {
++ struct _vx_cvirt_pc cvirt;
++ struct _vx_sched_pc sched;
++};
+
-+ if (__rlim_hard(limit, res) == RLIM_INFINITY)
-+ return 1;
-+ if (value + num <= __rlim_hard(limit, res))
-+ return 1;
++#define PERCPU_PERCTX (sizeof(struct _vx_percpu))
+
-+ __rlim_hit(limit, res);
-+ return 0;
-+}
++#endif /* _VSERVER_PERCPU_H */
+diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/pid.h linux-4.9/include/linux/vserver/pid.h
+--- linux-4.9/include/linux/vserver/pid.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vserver/pid.h 2021-02-24 15:47:45.097743096 +0100
+@@ -0,0 +1,51 @@
++#ifndef _VSERVER_PID_H
++#define _VSERVER_PID_H
+
++/* pid faking stuff */
+
-+static const int VLA_RSS[] = { RLIMIT_RSS, VLIMIT_ANON, VLIMIT_MAPPED, 0 };
++#define vx_info_map_pid(v, p) \
++ __vx_info_map_pid((v), (p), __func__, __FILE__, __LINE__)
++#define vx_info_map_tgid(v,p) vx_info_map_pid(v,p)
++#define vx_map_pid(p) vx_info_map_pid(current_vx_info(), p)
++#define vx_map_tgid(p) vx_map_pid(p)
+
-+static inline
-+rlim_t __vx_cres_array_sum(struct _vx_limit *limit, const int *array)
++static inline int __vx_info_map_pid(struct vx_info *vxi, int pid,
++ const char *func, const char *file, int line)
+{
-+ rlim_t value, sum = 0;
-+ int res;
-+
-+ while ((res = *array++)) {
-+ value = __rlim_get(limit, res);
-+ __vx_cres_fixup(limit, res, value);
-+ sum += value;
++ if (vx_info_flags(vxi, VXF_INFO_INIT, 0)) {
++ vxfprintk(VXD_CBIT(cvirt, 2),
++ "vx_map_tgid: %p/%llx: %d -> %d",
++ vxi, (long long)vxi->vx_flags, pid,
++ (pid && pid == vxi->vx_initpid) ? 1 : pid,
++ func, file, line);
++ if (pid == 0)
++ return 0;
++ if (pid == vxi->vx_initpid)
++ return 1;
+ }
-+ return sum;
++ return pid;
+}
+
-+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;
++#define vx_info_rmap_pid(v, p) \
++ __vx_info_rmap_pid((v), (p), __func__, __FILE__, __LINE__)
++#define vx_rmap_pid(p) vx_info_rmap_pid(current_vx_info(), p)
++#define vx_rmap_tgid(p) vx_rmap_pid(p)
+
-+ if (value == __rlim_get(limit, res))
-+ return value;
++static inline int __vx_info_rmap_pid(struct vx_info *vxi, int pid,
++ const char *func, const char *file, int line)
++{
++ if (vx_info_flags(vxi, VXF_INFO_INIT, 0)) {
++ vxfprintk(VXD_CBIT(cvirt, 2),
++ "vx_rmap_tgid: %p/%llx: %d -> %d",
++ vxi, (long long)vxi->vx_flags, pid,
++ (pid == 1) ? vxi->vx_initpid : pid,
++ func, file, line);
++ if ((pid == 1) && vxi->vx_initpid)
++ return vxi->vx_initpid;
++ if (pid == vxi->vx_initpid)
++ return ~0U;
++ }
++ return pid;
++}
+
-+ __rlim_set(limit, res, value);
-+ /* now adjust min/max */
-+ if (!__vx_cres_adjust_max(limit, res, value))
-+ __vx_cres_adjust_min(limit, res, value);
++#endif
+diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/sched.h linux-4.9/include/linux/vserver/sched.h
+--- linux-4.9/include/linux/vserver/sched.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vserver/sched.h 2021-02-24 15:47:45.097743096 +0100
+@@ -0,0 +1,23 @@
++#ifndef _VSERVER_SCHED_H
++#define _VSERVER_SCHED_H
+
-+ 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;
++#ifdef __KERNEL__
+
-+ if (num == 0)
-+ return 1;
-+ if (!vxi)
-+ return 1;
++struct timespec;
+
-+ limit = &vxi->limit;
-+ res = *array;
-+ value = __vx_cres_array_sum(limit, array+1);
++void vx_vsi_uptime(struct timespec *, struct timespec *);
+
-+ __rlim_set(limit, res, value);
-+ __vx_cres_fixup(limit, res, value);
+
-+ return __vx_cres_avail(vxi, res, num, _file, _line);
-+}
++struct vx_info;
+
++void vx_update_load(struct vx_info *);
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_LIMIT_INT_H */
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vserver/monitor.h linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/monitor.h
---- linux-2.6.19.1/include/linux/vserver/monitor.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/monitor.h 2006-11-08 04:57:48 +0100
-@@ -0,0 +1,95 @@
-+#ifndef _VX_MONITOR_H
-+#define _VX_MONITOR_H
+
++void vx_update_sched_param(struct _vx_sched *sched,
++ struct _vx_sched_pc *sched_pc);
+
-+enum {
-+ VXM_UNUSED = 0,
++#endif /* __KERNEL__ */
++#else /* _VSERVER_SCHED_H */
++#warning duplicate inclusion
++#endif /* _VSERVER_SCHED_H */
+diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/sched_cmd.h linux-4.9/include/linux/vserver/sched_cmd.h
+--- linux-4.9/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vserver/sched_cmd.h 2021-02-24 15:47:45.097743096 +0100
+@@ -0,0 +1,11 @@
++#ifndef _VSERVER_SCHED_CMD_H
++#define _VSERVER_SCHED_CMD_H
+
-+ VXM_SYNC = 0x10,
+
-+ VXM_UPDATE = 0x20,
-+ VXM_UPDATE_1,
-+ VXM_UPDATE_2,
++#include <linux/compiler.h>
++#include <uapi/vserver/sched_cmd.h>
+
-+ VXM_RQINFO_1 = 0x24,
-+ VXM_RQINFO_2,
++extern int vc_set_prio_bias(struct vx_info *, void __user *);
++extern int vc_get_prio_bias(struct vx_info *, void __user *);
+
-+ VXM_ACTIVATE = 0x40,
-+ VXM_DEACTIVATE,
-+ VXM_IDLE,
++#endif /* _VSERVER_SCHED_CMD_H */
+diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/sched_def.h linux-4.9/include/linux/vserver/sched_def.h
+--- linux-4.9/include/linux/vserver/sched_def.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vserver/sched_def.h 2021-02-24 15:47:45.097743096 +0100
+@@ -0,0 +1,38 @@
++#ifndef _VSERVER_SCHED_DEF_H
++#define _VSERVER_SCHED_DEF_H
+
-+ VXM_HOLD = 0x44,
-+ VXM_UNHOLD,
++#include <linux/spinlock.h>
++#include <linux/jiffies.h>
++#include <linux/cpumask.h>
++#include <asm/atomic.h>
++#include <asm/param.h>
+
-+ VXM_MIGRATE = 0x48,
-+ VXM_RESCHED,
+
-+ /* all other bits are flags */
-+ VXM_SCHED = 0x80,
-+};
++/* context sub struct */
+
-+struct _vxm_update_1 {
-+ uint32_t tokens_max;
-+ uint32_t fill_rate;
-+ uint32_t interval;
-+};
++struct _vx_sched {
++ int prio_bias; /* bias offset for priority */
+
-+struct _vxm_update_2 {
-+ uint32_t tokens_min;
-+ uint32_t fill_rate;
-+ uint32_t interval;
++ cpumask_t update; /* CPUs which should update */
+};
+
-+struct _vxm_rqinfo_1 {
-+ uint16_t running;
-+ uint16_t onhold;
-+ uint16_t iowait;
-+ uint16_t uintr;
-+ uint32_t idle_tokens;
-+};
++struct _vx_sched_pc {
++ int prio_bias; /* bias offset for priority */
+
-+struct _vxm_rqinfo_2 {
-+ uint32_t norm_time;
-+ uint32_t idle_time;
-+ uint32_t idle_skip;
++ uint64_t user_ticks; /* token tick events */
++ uint64_t sys_ticks; /* token tick events */
++ uint64_t hold_ticks; /* token ticks paused */
+};
+
-+struct _vxm_sched {
-+ uint32_t tokens;
-+ uint32_t norm_time;
-+ uint32_t idle_time;
-+};
+
-+struct _vxm_task {
-+ uint16_t pid;
-+ uint16_t state;
-+};
++#ifdef CONFIG_VSERVER_DEBUG
+
-+struct _vxm_event {
-+ uint32_t jif;
-+ union {
-+ uint32_t seq;
-+ uint32_t sec;
-+ };
-+ union {
-+ uint32_t tokens;
-+ uint32_t nsec;
-+ struct _vxm_task tsk;
-+ };
-+};
++static inline void __dump_vx_sched(struct _vx_sched *sched)
++{
++ printk("\t_vx_sched:\n");
++ printk("\t priority = %4d\n", sched->prio_bias);
++}
+
-+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
+
++#endif /* _VSERVER_SCHED_DEF_H */
+diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/signal.h linux-4.9/include/linux/vserver/signal.h
+--- linux-4.9/include/linux/vserver/signal.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vserver/signal.h 2021-02-24 15:47:45.097743096 +0100
+@@ -0,0 +1,14 @@
++#ifndef _VSERVER_SIGNAL_H
++#define _VSERVER_SIGNAL_H
+
-+#endif /* _VX_MONITOR_H */
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vserver/network.h linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/network.h
---- linux-2.6.19.1/include/linux/vserver/network.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/network.h 2006-12-17 05:24:42 +0100
-@@ -0,0 +1,99 @@
-+#ifndef _VX_NETWORK_H
-+#define _VX_NETWORK_H
+
-+#include <linux/types.h>
++#ifdef __KERNEL__
+
++struct vx_info;
+
-+#define MAX_N_CONTEXT 65535 /* Arbitrary limit */
++int vx_info_kill(struct vx_info *, int, int);
+
-+#define NB_IPV4ROOT 16
++#endif /* __KERNEL__ */
++#else /* _VSERVER_SIGNAL_H */
++#warning duplicate inclusion
++#endif /* _VSERVER_SIGNAL_H */
+diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/signal_cmd.h linux-4.9/include/linux/vserver/signal_cmd.h
+--- linux-4.9/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vserver/signal_cmd.h 2021-02-24 15:47:45.097743096 +0100
+@@ -0,0 +1,14 @@
++#ifndef _VSERVER_SIGNAL_CMD_H
++#define _VSERVER_SIGNAL_CMD_H
+
++#include <uapi/vserver/signal_cmd.h>
+
-+/* network flags */
+
-+#define NXF_INFO_PRIVATE 0x00000008
++extern int vc_ctx_kill(struct vx_info *, void __user *);
++extern int vc_wait_exit(struct vx_info *, void __user *);
+
-+#define NXF_SINGLE_IP 0x00000100
+
-+#define NXF_HIDE_NETIF 0x02000000
++extern int vc_get_pflags(uint32_t pid, void __user *);
++extern int vc_set_pflags(uint32_t pid, void __user *);
+
-+#define NXF_STATE_SETUP (1ULL<<32)
-+#define NXF_STATE_ADMIN (1ULL<<34)
++#endif /* _VSERVER_SIGNAL_CMD_H */
+diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/space.h linux-4.9/include/linux/vserver/space.h
+--- linux-4.9/include/linux/vserver/space.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vserver/space.h 2021-02-24 15:47:45.097743096 +0100
+@@ -0,0 +1,12 @@
++#ifndef _VSERVER_SPACE_H
++#define _VSERVER_SPACE_H
+
-+#define NXF_SC_HELPER (1ULL<<36)
-+#define NXF_PERSISTENT (1ULL<<38)
++#include <linux/types.h>
+
-+#define NXF_ONE_TIME (0x0005ULL<<32)
++struct vx_info;
+
-+#define NXF_INIT_SET (NXF_STATE_ADMIN)
++int vx_set_space(struct vx_info *vxi, unsigned long mask, unsigned index);
+
++#else /* _VSERVER_SPACE_H */
++#warning duplicate inclusion
++#endif /* _VSERVER_SPACE_H */
+diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/space_cmd.h linux-4.9/include/linux/vserver/space_cmd.h
+--- linux-4.9/include/linux/vserver/space_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vserver/space_cmd.h 2021-02-24 15:47:45.097743096 +0100
+@@ -0,0 +1,13 @@
++#ifndef _VSERVER_SPACE_CMD_H
++#define _VSERVER_SPACE_CMD_H
+
-+/* address types */
++#include <uapi/vserver/space_cmd.h>
+
-+#define NXA_TYPE_IPV4 0x0001
-+#define NXA_TYPE_IPV6 0x0002
+
-+#define NXA_MOD_BCAST 0x0100
-+#define NXA_MOD_LBACK 0x0200
++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);
+
-+#define NXA_TYPE_ANY ((uint16_t)-1)
++#endif /* _VSERVER_SPACE_CMD_H */
+diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/switch.h linux-4.9/include/linux/vserver/switch.h
+--- linux-4.9/include/linux/vserver/switch.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vserver/switch.h 2021-02-24 15:47:45.097743096 +0100
+@@ -0,0 +1,8 @@
++#ifndef _VSERVER_SWITCH_H
++#define _VSERVER_SWITCH_H
+
-+#define NXA_TYPE_ADDR 0x0003
-+#define NXA_TYPE_MASK 0x0013
-+#define NXA_TYPE_RANGE 0x0023
+
++#include <linux/errno.h>
++#include <uapi/vserver/switch.h>
+
-+#ifdef __KERNEL__
++#endif /* _VSERVER_SWITCH_H */
+diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/tag.h linux-4.9/include/linux/vserver/tag.h
+--- linux-4.9/include/linux/vserver/tag.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vserver/tag.h 2021-02-24 15:47:45.097743096 +0100
+@@ -0,0 +1,160 @@
++#ifndef _DX_TAG_H
++#define _DX_TAG_H
+
-+#include <linux/list.h>
-+#include <linux/spinlock.h>
-+#include <linux/rcupdate.h>
-+#include <asm/atomic.h>
++#include <linux/types.h>
++#include <linux/uidgid.h>
+
+
-+struct nx_info {
-+ struct hlist_node nx_hlist; /* linked list of nxinfos */
-+ nid_t nx_id; /* vnet id */
-+ atomic_t nx_usecnt; /* usage count */
-+ atomic_t nx_tasks; /* tasks count */
-+ int nx_state; /* context state */
++#define DX_TAG(in) (IS_TAGGED(in))
+
-+ uint64_t nx_flags; /* network flag word */
-+ uint64_t nx_ncaps; /* network capabilities */
+
-+ int nbipv4;
-+ __be32 ipv4[NB_IPV4ROOT]; /* Process can only bind to these IPs */
-+ /* The first one is used to connect */
-+ /* and for bind any service */
-+ /* The other must be used explicity */
-+ __be32 mask[NB_IPV4ROOT]; /* Netmask for each ipv4 */
-+ /* Used to select the proper source */
-+ /* address for sockets */
-+ __be32 v4_bcast; /* Broadcast address to receive UDP */
-+ __be32 v4_lback; /* Loopback address */
++#ifdef CONFIG_TAG_NFSD
++#define DX_TAG_NFSD 1
++#else
++#define DX_TAG_NFSD 0
++#endif
+
-+ char nx_name[65]; /* network context name */
-+};
+
++#ifdef CONFIG_TAGGING_NONE
+
-+/* status flags */
++#define MAX_UID 0xFFFFFFFF
++#define MAX_GID 0xFFFFFFFF
+
-+#define NXS_HASHED 0x0001
-+#define NXS_SHUTDOWN 0x0100
-+#define NXS_RELEASED 0x8000
++#define INOTAG_TAG(cond, uid, gid, tag) (0)
+
-+extern struct nx_info *lookup_nx_info(int);
++#define TAGINO_UID(cond, uid, tag) (uid)
++#define TAGINO_GID(cond, gid, tag) (gid)
+
-+extern int get_nid_list(int, unsigned int *, int);
-+extern int nid_is_hashed(nid_t);
++#endif
+
-+extern int nx_migrate_task(struct task_struct *, struct nx_info *);
+
-+extern long vs_net_change(struct nx_info *, unsigned int);
++#ifdef CONFIG_TAGGING_GID16
+
-+struct sock;
++#define MAX_UID 0xFFFFFFFF
++#define MAX_GID 0x0000FFFF
+
-+#endif /* __KERNEL__ */
-+#else /* _VX_NETWORK_H */
-+#warning duplicate inclusion
-+#endif /* _VX_NETWORK_H */
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vserver/network_cmd.h linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/network_cmd.h
---- linux-2.6.19.1/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/network_cmd.h 2006-12-18 05:02:31 +0100
-@@ -0,0 +1,124 @@
-+#ifndef _VX_NETWORK_CMD_H
-+#define _VX_NETWORK_CMD_H
++#define INOTAG_TAG(cond, uid, gid, tag) \
++ ((cond) ? (((gid) >> 16) & 0xFFFF) : 0)
+
++#define TAGINO_UID(cond, uid, tag) (uid)
++#define TAGINO_GID(cond, gid, tag) \
++ ((cond) ? (((gid) & 0xFFFF) | ((tag) << 16)) : (gid))
+
-+/* vinfo commands */
++#endif
+
-+#define VCMD_task_nid VC_CMD(VINFO, 2, 0)
+
-+#ifdef __KERNEL__
-+extern int vc_task_nid(uint32_t, void __user *);
++#ifdef CONFIG_TAGGING_ID24
+
-+#endif /* __KERNEL__ */
++#define MAX_UID 0x00FFFFFF
++#define MAX_GID 0x00FFFFFF
+
-+#define VCMD_nx_info VC_CMD(VINFO, 6, 0)
++#define INOTAG_TAG(cond, uid, gid, tag) \
++ ((cond) ? ((((uid) >> 16) & 0xFF00) | (((gid) >> 24) & 0xFF)) : 0)
+
-+struct vcmd_nx_info_v0 {
-+ uint32_t nid;
-+ /* more to come */
-+};
++#define TAGINO_UID(cond, uid, tag) \
++ ((cond) ? (((uid) & 0xFFFFFF) | (((tag) & 0xFF00) << 16)) : (uid))
++#define TAGINO_GID(cond, gid, tag) \
++ ((cond) ? (((gid) & 0xFFFFFF) | (((tag) & 0x00FF) << 24)) : (gid))
+
-+#ifdef __KERNEL__
-+extern int vc_nx_info(struct nx_info *, void __user *);
++#endif
+
-+#endif /* __KERNEL__ */
+
-+#include <linux/in.h>
-+#include <linux/in6.h>
++#ifdef CONFIG_TAGGING_UID16
+
-+#define VCMD_net_create_v0 VC_CMD(VNET, 1, 0)
-+#define VCMD_net_create VC_CMD(VNET, 1, 1)
++#define MAX_UID 0x0000FFFF
++#define MAX_GID 0xFFFFFFFF
+
-+struct vcmd_net_create {
-+ uint64_t flagword;
-+};
++#define INOTAG_TAG(cond, uid, gid, tag) \
++ ((cond) ? (((uid) >> 16) & 0xFFFF) : 0)
+
-+#define VCMD_net_migrate VC_CMD(NETMIG, 1, 0)
++#define TAGINO_UID(cond, uid, tag) \
++ ((cond) ? (((uid) & 0xFFFF) | ((tag) << 16)) : (uid))
++#define TAGINO_GID(cond, gid, tag) (gid)
+
-+#define VCMD_net_add VC_CMD(NETALT, 1, 0)
-+#define VCMD_net_remove VC_CMD(NETALT, 2, 0)
++#endif
+
-+struct vcmd_net_addr_v0 {
-+ uint16_t type;
-+ uint16_t count;
-+ struct in_addr ip[4];
-+ struct in_addr mask[4];
-+ /* more to come */
-+};
+
-+#define VCMD_add_match_ipv4 VC_CMD(NETALT, 4, 0)
-+#define VCMD_get_match_ipv4 VC_CMD(NETALT, 5, 0)
++#ifdef CONFIG_TAGGING_INTERN
+
-+struct vcmd_match_ipv4_v0 {
-+ uint16_t type;
-+ uint16_t flags;
-+ uint32_t parent;
-+ uint32_t prefix;
-+ struct in_addr ip;
-+ struct in_addr ip2;
-+ struct in_addr mask;
-+};
++#define MAX_UID 0xFFFFFFFF
++#define MAX_GID 0xFFFFFFFF
+
-+#define VCMD_add_match_ipv6 VC_CMD(NETALT, 6, 0)
-+#define VCMD_get_match_ipv6 VC_CMD(NETALT, 7, 0)
++#define INOTAG_TAG(cond, uid, gid, tag) \
++ ((cond) ? (tag) : 0)
+
-+struct vcmd_match_ipv6_v0 {
-+ uint16_t type;
-+ uint16_t flags;
-+ uint32_t parent;
-+ uint32_t prefix;
-+ struct in6_addr ip;
-+ struct in6_addr ip2;
-+ struct in6_addr mask;
-+};
++#define TAGINO_UID(cond, uid, tag) (uid)
++#define TAGINO_GID(cond, gid, tag) (gid)
+
++#endif
+
-+#ifdef __KERNEL__
-+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 *);
++#ifndef CONFIG_TAGGING_NONE
++#define dx_current_fstag(sb) \
++ ((sb)->s_flags & MS_TAGGED ? dx_current_tag() : 0)
++#else
++#define dx_current_fstag(sb) (0)
++#endif
+
-+extern int vc_add_match_ipv4(struct nx_info *, void __user *);
-+extern int vc_get_match_ipv4(struct nx_info *, void __user *);
++#ifndef CONFIG_TAGGING_INTERN
++#define TAGINO_TAG(cond, tag) (0)
++#else
++#define TAGINO_TAG(cond, tag) ((cond) ? (tag) : 0)
++#endif
+
-+extern int vc_add_match_ipv6(struct nx_info *, void __user *);
-+extern int vc_get_match_ipv6(struct nx_info *, void __user *);
++#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)))
+
-+#endif /* __KERNEL__ */
+
++#define INOTAG_UID(cond, uid, gid) \
++ ((cond) ? ((uid) & MAX_UID) : (uid))
++#define INOTAG_GID(cond, uid, gid) \
++ ((cond) ? ((gid) & MAX_GID) : (gid))
+
-+/* flag commands */
++#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)))
+
-+#define VCMD_get_nflags VC_CMD(FLAGS, 5, 0)
-+#define VCMD_set_nflags VC_CMD(FLAGS, 6, 0)
+
-+struct vcmd_net_flags_v0 {
-+ uint64_t flagword;
-+ uint64_t mask;
-+};
++static inline uid_t dx_map_uid(uid_t uid)
++{
++ if ((uid > MAX_UID) && (uid != -1))
++ uid = -2;
++ return (uid & MAX_UID);
++}
+
-+#ifdef __KERNEL__
-+extern int vc_get_nflags(struct nx_info *, void __user *);
-+extern int vc_set_nflags(struct nx_info *, void __user *);
++static inline gid_t dx_map_gid(gid_t gid)
++{
++ if ((gid > MAX_GID) && (gid != -1))
++ gid = -2;
++ return (gid & MAX_GID);
++}
+
-+#endif /* __KERNEL__ */
++struct peer_tag {
++ int32_t xid;
++ int32_t nid;
++};
+
++#define dx_notagcheck(sb) ((sb) && ((sb)->s_flags & MS_NOTAGCHECK))
+
-+/* network caps commands */
++int dx_parse_tag(char *string, vtag_t *tag, int remove, int *mnt_flags,
++ unsigned long *flags);
+
-+#define VCMD_get_ncaps VC_CMD(FLAGS, 7, 0)
-+#define VCMD_set_ncaps VC_CMD(FLAGS, 8, 0)
++#ifdef CONFIG_PROPAGATE
+
-+struct vcmd_net_caps_v0 {
-+ uint64_t ncaps;
-+ uint64_t cmask;
-+};
++void __dx_propagate_tag(struct nameidata *nd, struct inode *inode);
+
-+#ifdef __KERNEL__
-+extern int vc_get_ncaps(struct nx_info *, void __user *);
-+extern int vc_set_ncaps(struct nx_info *, void __user *);
++#define dx_propagate_tag(n, i) __dx_propagate_tag(n, i)
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vserver/sched.h linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/sched.h
---- linux-2.6.19.1/include/linux/vserver/sched.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/sched.h 2006-11-08 04:57:45 +0100
-@@ -0,0 +1,26 @@
-+#ifndef _VX_SCHED_H
-+#define _VX_SCHED_H
++#else
++#define dx_propagate_tag(n, i) do { } while (0)
++#endif
++
++#endif /* _DX_TAG_H */
+diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/tag_cmd.h linux-4.9/include/linux/vserver/tag_cmd.h
+--- linux-4.9/include/linux/vserver/tag_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/linux/vserver/tag_cmd.h 2021-02-24 15:47:45.097743096 +0100
+@@ -0,0 +1,10 @@
++#ifndef _VSERVER_TAG_CMD_H
++#define _VSERVER_TAG_CMD_H
++
++#include <uapi/vserver/tag_cmd.h>
++
++extern int vc_task_tag(uint32_t);
++
++extern int vc_tag_migrate(uint32_t);
++
++#endif /* _VSERVER_TAG_CMD_H */
+diff -urNp -x '*.orig' linux-4.9/include/net/addrconf.h linux-4.9/include/net/addrconf.h
+--- linux-4.9/include/net/addrconf.h 2021-02-24 15:47:32.424013281 +0100
++++ linux-4.9/include/net/addrconf.h 2021-02-24 15:47:45.101076533 +0100
+@@ -85,7 +85,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 -urNp -x '*.orig' linux-4.9/include/net/af_unix.h linux-4.9/include/net/af_unix.h
+--- linux-4.9/include/net/af_unix.h 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/include/net/af_unix.h 2021-02-24 15:47:45.101076533 +0100
+@@ -4,6 +4,7 @@
+ #include <linux/socket.h>
+ #include <linux/un.h>
+ #include <linux/mutex.h>
++// #include <linux/vs_base.h>
+ #include <net/sock.h>
+
+ void unix_inflight(struct user_struct *user, struct file *fp);
+diff -urNp -x '*.orig' linux-4.9/include/net/inet_timewait_sock.h linux-4.9/include/net/inet_timewait_sock.h
+--- linux-4.9/include/net/inet_timewait_sock.h 2021-02-24 15:47:32.427346719 +0100
++++ linux-4.9/include/net/inet_timewait_sock.h 2021-02-24 15:47:45.101076533 +0100
+@@ -72,6 +72,10 @@ struct inet_timewait_sock {
+ #define tw_num __tw_common.skc_num
+ #define tw_cookie __tw_common.skc_cookie
+ #define tw_dr __tw_common.skc_tw_dr
++#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 -urNp -x '*.orig' linux-4.9/include/net/ip6_route.h linux-4.9/include/net/ip6_route.h
+--- linux-4.9/include/net/ip6_route.h 2021-02-24 15:47:32.427346719 +0100
++++ linux-4.9/include/net/ip6_route.h 2021-02-24 15:47:45.101076533 +0100
+@@ -26,6 +26,7 @@ struct route_info {
+ #include <linux/ip.h>
+ #include <linux/ipv6.h>
+ #include <linux/route.h>
++#include <linux/vs_inet6.h>
+
+ #define RT6_LOOKUP_F_IFACE 0x00000001
+ #define RT6_LOOKUP_F_REACHABLE 0x00000002
+@@ -98,17 +99,19 @@ int ip6_del_rt(struct rt6_info *);
+ static inline 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 =
+ rt ? ip6_dst_idev((struct dst_entry *)rt) : NULL;
+ int err = 0;
+
+- if (rt && rt->rt6i_prefsrc.plen)
++ if (rt && 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;
+ }
+diff -urNp -x '*.orig' linux-4.9/include/net/route.h linux-4.9/include/net/route.h
+--- linux-4.9/include/net/route.h 2021-02-24 15:47:32.434013594 +0100
++++ linux-4.9/include/net/route.h 2021-02-24 15:47:45.101076533 +0100
+@@ -226,6 +226,9 @@ static inline void ip_rt_put(struct rtab
+ dst_release(&rt->dst);
+ }
+
++#include <linux/vs_base.h>
++#include <linux/vs_inet.h>
+
+ #define IPTOS_RT_MASK (IPTOS_TOS_MASK & ~3)
+
+ extern const __u8 ip_tos2prio[16];
+@@ -273,6 +276,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 *);
+
-+#ifdef __KERNEL__
+ static inline struct rtable *ip_route_connect(struct flowi4 *fl4,
+ __be32 dst, __be32 src, u32 tos,
+ int oif, u8 protocol,
+@@ -281,11 +287,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;
+
-+struct timespec;
++ 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));
+
-+void vx_vsi_uptime(struct timespec *, struct timespec *);
++ 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 -urNp -x '*.orig' linux-4.9/include/net/sock.h linux-4.9/include/net/sock.h
+--- linux-4.9/include/net/sock.h 2021-02-24 15:47:32.434013594 +0100
++++ linux-4.9/include/net/sock.h 2021-02-24 15:47:45.101076533 +0100
+@@ -187,6 +187,10 @@ struct sock_common {
+ struct in6_addr skc_v6_daddr;
+ struct in6_addr skc_v6_rcv_saddr;
+ #endif
++ vxid_t skc_xid;
++ struct vx_info *skc_vx_info;
++ vnid_t skc_nid;
++ struct nx_info *skc_nx_info;
+
+ atomic64_t skc_cookie;
+
+@@ -337,8 +341,12 @@ 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_cookie __sk_common.skc_cookie
++#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
+ #define sk_incoming_cpu __sk_common.skc_incoming_cpu
+ #define sk_flags __sk_common.skc_flags
+ #define sk_rxhash __sk_common.skc_rxhash
+diff -urNp -x '*.orig' linux-4.9/include/uapi/Kbuild linux-4.9/include/uapi/Kbuild
+--- linux-4.9/include/uapi/Kbuild 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/include/uapi/Kbuild 2021-02-24 15:47:45.101076533 +0100
+@@ -13,3 +13,4 @@ header-y += drm/
+ header-y += xen/
+ header-y += scsi/
+ header-y += misc/
++header-y += vserver/
+diff -urNp -x '*.orig' linux-4.9/include/uapi/linux/btrfs_tree.h linux-4.9/include/uapi/linux/btrfs_tree.h
+--- linux-4.9/include/uapi/linux/btrfs_tree.h 2021-02-24 15:47:32.444013907 +0100
++++ linux-4.9/include/uapi/linux/btrfs_tree.h 2021-02-24 15:47:45.101076533 +0100
+@@ -566,11 +566,14 @@ struct btrfs_inode_item {
+ /* modification sequence number for NFS */
+ __le64 sequence;
+
++ __le16 tag;
+ /*
+ * a little future expansion, for more than this we can
+ * just grow the inode item and version it
+ */
+- __le64 reserved[4];
++ __le16 reserved16;
++ __le32 reserved32;
++ __le64 reserved[3];
+ struct btrfs_timespec atime;
+ struct btrfs_timespec ctime;
+ struct btrfs_timespec mtime;
+diff -urNp -x '*.orig' linux-4.9/include/uapi/linux/capability.h linux-4.9/include/uapi/linux/capability.h
+--- linux-4.9/include/uapi/linux/capability.h 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/include/uapi/linux/capability.h 2021-02-24 15:47:45.101076533 +0100
+@@ -257,6 +257,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
+
+@@ -352,7 +353,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 */
+
++#define CAP_CONTEXT 63
+
-+struct vx_info;
++#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 -urNp -x '*.orig' linux-4.9/include/uapi/linux/fs.h linux-4.9/include/uapi/linux/fs.h
+--- linux-4.9/include/uapi/linux/fs.h 2021-02-24 15:47:32.444013907 +0100
++++ linux-4.9/include/uapi/linux/fs.h 2021-02-24 15:47:45.101076533 +0100
+@@ -130,6 +130,9 @@ struct inodes_stat_t {
+ #define MS_I_VERSION (1<<23) /* Update inode I_version field */
+ #define MS_STRICTATIME (1<<24) /* Always perform atime updates */
+ #define MS_LAZYTIME (1<<25) /* Update the on-disk [acm]times lazily */
++#define MS_TAGGED (1<<8) /* use generic inode tagging */
++#define MS_NOTAGCHECK (1<<9) /* don't check tags */
++#define MS_TAGID (1<<26) /* use specific tag for this mount */
+
+ /* These sb flags are internal to the kernel */
+ #define MS_SUBMOUNT (1<<26)
+@@ -313,13 +316,16 @@ struct fscrypt_policy {
+ #define FS_EA_INODE_FL 0x00200000 /* Inode used for large EA */
+ #define FS_EOFBLOCKS_FL 0x00400000 /* Reserved for ext4 */
+ #define FS_NOCOW_FL 0x00800000 /* Do not cow file */
++#define FS_IXUNLINK_FL 0x08000000 /* Immutable invert on unlink */
+ #define FS_INLINE_DATA_FL 0x10000000 /* Reserved for ext4 */
+ #define FS_PROJINHERIT_FL 0x20000000 /* Create with parents projid */
+ #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 -urNp -x '*.orig' linux-4.9/include/uapi/linux/gfs2_ondisk.h linux-4.9/include/uapi/linux/gfs2_ondisk.h
+--- linux-4.9/include/uapi/linux/gfs2_ondisk.h 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/include/uapi/linux/gfs2_ondisk.h 2021-02-24 15:47:45.104409971 +0100
+@@ -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 -urNp -x '*.orig' linux-4.9/include/uapi/linux/if_tun.h linux-4.9/include/uapi/linux/if_tun.h
+--- linux-4.9/include/uapi/linux/if_tun.h 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/include/uapi/linux/if_tun.h 2021-02-24 15:47:45.104409971 +0100
+@@ -56,6 +56,7 @@
+ */
+ #define TUNSETVNETBE _IOW('T', 222, int)
+ #define TUNGETVNETBE _IOR('T', 223, int)
++#define TUNSETNID _IOW('T', 224, int)
+
+ /* TUNSETIFF ifr flags */
+ #define IFF_TUN 0x0001
+diff -urNp -x '*.orig' linux-4.9/include/uapi/linux/major.h linux-4.9/include/uapi/linux/major.h
+--- linux-4.9/include/uapi/linux/major.h 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/include/uapi/linux/major.h 2021-02-24 15:47:45.104409971 +0100
+@@ -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 -urNp -x '*.orig' linux-4.9/include/uapi/linux/nfs_mount.h linux-4.9/include/uapi/linux/nfs_mount.h
+--- linux-4.9/include/uapi/linux/nfs_mount.h 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/include/uapi/linux/nfs_mount.h 2021-02-24 15:47:45.104409971 +0100
+@@ -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 -urNp -x '*.orig' linux-4.9/include/uapi/linux/reboot.h linux-4.9/include/uapi/linux/reboot.h
+--- linux-4.9/include/uapi/linux/reboot.h 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/include/uapi/linux/reboot.h 2021-02-24 15:47:45.104409971 +0100
+@@ -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 -urNp -x '*.orig' linux-4.9/include/uapi/linux/sysctl.h linux-4.9/include/uapi/linux/sysctl.h
+--- linux-4.9/include/uapi/linux/sysctl.h 2021-02-24 15:47:32.450680782 +0100
++++ linux-4.9/include/uapi/linux/sysctl.h 2021-02-24 15:47:45.104409971 +0100
+@@ -58,6 +58,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 */
+@@ -92,6 +93,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 -urNp -x '*.orig' linux-4.9/include/uapi/vserver/Kbuild linux-4.9/include/uapi/vserver/Kbuild
+--- linux-4.9/include/uapi/vserver/Kbuild 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/uapi/vserver/Kbuild 2021-02-24 15:47:45.104409971 +0100
+@@ -0,0 +1,9 @@
+
-+void vx_update_load(struct vx_info *);
++header-y += context_cmd.h network_cmd.h space_cmd.h \
++ cacct_cmd.h cvirt_cmd.h limit_cmd.h dlimit_cmd.h \
++ inode_cmd.h tag_cmd.h sched_cmd.h signal_cmd.h \
++ debug_cmd.h device_cmd.h
+
++header-y += switch.h context.h network.h monitor.h \
++ limit.h inode.h device.h
+
-+int vx_tokens_recalc(struct _vx_sched_pc *,
-+ unsigned long *, unsigned long *, int [2]);
+diff -urNp -x '*.orig' linux-4.9/include/uapi/vserver/cacct_cmd.h linux-4.9/include/uapi/vserver/cacct_cmd.h
+--- linux-4.9/include/uapi/vserver/cacct_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/uapi/vserver/cacct_cmd.h 2021-02-24 15:47:45.104409971 +0100
+@@ -0,0 +1,15 @@
++#ifndef _UAPI_VS_CACCT_CMD_H
++#define _UAPI_VS_CACCT_CMD_H
+
-+void vx_update_sched_param(struct _vx_sched *sched,
-+ struct _vx_sched_pc *sched_pc);
+
-+#endif /* __KERNEL__ */
-+#else /* _VX_SCHED_H */
-+#warning duplicate inclusion
-+#endif /* _VX_SCHED_H */
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vserver/sched_cmd.h linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/sched_cmd.h
---- linux-2.6.19.1/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/sched_cmd.h 2006-11-08 04:57:49 +0100
-@@ -0,0 +1,72 @@
-+#ifndef _VX_SCHED_CMD_H
-+#define _VX_SCHED_CMD_H
-+
-+
-+/* sched vserver commands */
-+
-+#define VCMD_set_sched_v2 VC_CMD(SCHED, 1, 2)
-+#define VCMD_set_sched_v3 VC_CMD(SCHED, 1, 3)
-+#define VCMD_set_sched VC_CMD(SCHED, 1, 4)
-+
-+struct vcmd_set_sched_v2 {
-+ int32_t fill_rate;
-+ int32_t interval;
-+ int32_t tokens;
-+ int32_t tokens_min;
-+ int32_t tokens_max;
-+ uint64_t cpu_mask;
-+};
++/* virtual host info name commands */
+
-+struct vcmd_set_sched_v3 {
-+ uint32_t set_mask;
-+ int32_t fill_rate;
-+ int32_t interval;
-+ int32_t tokens;
-+ int32_t tokens_min;
-+ int32_t tokens_max;
-+ int32_t priority_bias;
-+};
++#define VCMD_sock_stat VC_CMD(VSTAT, 5, 0)
+
-+struct vcmd_set_sched_v4 {
-+ uint32_t set_mask;
-+ int32_t fill_rate;
-+ int32_t interval;
-+ int32_t tokens;
-+ int32_t tokens_min;
-+ int32_t tokens_max;
-+ int32_t prio_bias;
-+ int32_t cpu_id;
-+ int32_t bucket_id;
++struct vcmd_sock_stat_v0 {
++ uint32_t field;
++ uint32_t count[3];
++ uint64_t total[3];
+};
+
++#endif /* _UAPI_VS_CACCT_CMD_H */
+diff -urNp -x '*.orig' linux-4.9/include/uapi/vserver/context.h linux-4.9/include/uapi/vserver/context.h
+--- linux-4.9/include/uapi/vserver/context.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/uapi/vserver/context.h 2021-02-24 15:47:45.104409971 +0100
+@@ -0,0 +1,81 @@
++#ifndef _UAPI_VS_CONTEXT_H
++#define _UAPI_VS_CONTEXT_H
+
-+#define VXSM_FILL_RATE 0x0001
-+#define VXSM_INTERVAL 0x0002
-+#define VXSM_FILL_RATE2 0x0004
-+#define VXSM_INTERVAL2 0x0008
-+#define VXSM_TOKENS 0x0010
-+#define VXSM_TOKENS_MIN 0x0020
-+#define VXSM_TOKENS_MAX 0x0040
-+#define VXSM_PRIO_BIAS 0x0100
-+
-+#define VXSM_IDLE_TIME 0x0200
-+#define VXSM_FORCE 0x0400
-+
-+#define VXSM_V3_MASK 0x0173
-+#define VXSM_SET_MASK 0x01FF
-+
-+#define VXSM_CPU_ID 0x1000
-+#define VXSM_BUCKET_ID 0x2000
-+
-+#define SCHED_KEEP (-2) /* only for v2 */
-+
-+#ifdef __KERNEL__
++#include <linux/types.h>
++#include <linux/capability.h>
+
-+#include <linux/compiler.h>
+
-+extern int vc_set_sched_v2(struct vx_info *, void __user *);
-+extern int vc_set_sched_v3(struct vx_info *, void __user *);
-+extern int vc_set_sched(struct vx_info *, void __user *);
++/* context flags */
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_SCHED_CMD_H */
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vserver/sched_def.h linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/sched_def.h
---- linux-2.6.19.1/include/linux/vserver/sched_def.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/sched_def.h 2006-11-08 04:57:49 +0100
-@@ -0,0 +1,67 @@
-+#ifndef _VX_SCHED_DEF_H
-+#define _VX_SCHED_DEF_H
++#define VXF_INFO_SCHED 0x00000002
++#define VXF_INFO_NPROC 0x00000004
++#define VXF_INFO_PRIVATE 0x00000008
+
-+#include <linux/spinlock.h>
-+#include <linux/jiffies.h>
-+#include <linux/cpumask.h>
-+#include <asm/atomic.h>
-+#include <asm/param.h>
++#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
+
-+/* context sub struct */
++#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
+
-+struct _vx_sched {
-+ spinlock_t tokens_lock; /* lock for token bucket */
++#define VXF_HIDE_MOUNT 0x01000000
++/* was VXF_HIDE_NETIF 0x02000000 */
++#define VXF_HIDE_VINFO 0x04000000
+
-+ int tokens; /* number of CPU tokens */
-+ int fill_rate[2]; /* Fill rate: add X tokens... */
-+ int interval[2]; /* Divisor: per Y jiffies */
-+ int tokens_min; /* Limit: minimum for unhold */
-+ int tokens_max; /* Limit: no more than N tokens */
++#define VXF_STATE_SETUP (1ULL << 32)
++#define VXF_STATE_INIT (1ULL << 33)
++#define VXF_STATE_ADMIN (1ULL << 34)
+
-+ unsigned update_mask; /* which features should be updated */
-+ cpumask_t update; /* CPUs which should update */
++#define VXF_SC_HELPER (1ULL << 36)
++#define VXF_REBOOT_KILL (1ULL << 37)
++#define VXF_PERSISTENT (1ULL << 38)
+
-+ int prio_bias; /* bias offset for priority */
-+ int vavavoom; /* last calculated vavavoom */
-+};
++#define VXF_FORK_RSS (1ULL << 48)
++#define VXF_PROLIFIC (1ULL << 49)
+
-+struct _vx_sched_pc {
-+ int tokens; /* number of CPU tokens */
-+ int flags; /* bucket flags */
++#define VXF_IGNEG_NICE (1ULL << 52)
+
-+ int fill_rate[2]; /* Fill rate: add X tokens... */
-+ int interval[2]; /* Divisor: per Y jiffies */
-+ int tokens_min; /* Limit: minimum for unhold */
-+ int tokens_max; /* Limit: no more than N tokens */
++#define VXF_ONE_TIME (0x0007ULL << 32)
+
-+ unsigned long norm_time; /* last time accounted */
-+ unsigned long idle_time; /* non linear time for fair sched */
-+ unsigned long token_time; /* token time for accounting */
-+ unsigned long onhold; /* jiffies when put on hold */
++#define VXF_INIT_SET (VXF_STATE_SETUP | VXF_STATE_INIT | VXF_STATE_ADMIN)
+
-+ uint64_t user_ticks; /* token tick events */
-+ uint64_t sys_ticks; /* token tick events */
-+ uint64_t hold_ticks; /* token ticks paused */
-+};
+
++/* context migration */
+
-+#define VXSF_ONHOLD 0x0001
-+#define VXSF_IDLE_TIME 0x0100
++#define VXM_SET_INIT 0x00000001
++#define VXM_SET_REAPER 0x00000002
+
-+#ifdef CONFIG_VSERVER_DEBUG
++/* context caps */
+
-+static inline void __dump_vx_sched(struct _vx_sched *sched)
-+{
-+ printk("\t_vx_sched:\n");
-+ printk("\t tokens: %4d/%4d, %4d/%4d, %4d, %4d\n",
-+ sched->fill_rate[0], sched->interval[0],
-+ sched->fill_rate[1], sched->interval[1],
-+ sched->tokens_min, sched->tokens_max);
-+ printk("\t priority = %4d, %4d\n",
-+ sched->prio_bias, sched->vavavoom);
-+}
++#define VXC_SET_UTSNAME 0x00000001
++#define VXC_SET_RLIMIT 0x00000002
++#define VXC_FS_SECURITY 0x00000004
++#define VXC_FS_TRUSTED 0x00000008
++#define VXC_TIOCSTI 0x00000010
+
-+#endif
++/* was VXC_RAW_ICMP 0x00000100 */
++#define VXC_SYSLOG 0x00001000
++#define VXC_OOM_ADJUST 0x00002000
++#define VXC_AUDIT_CONTROL 0x00004000
+
-+#endif /* _VX_SCHED_DEF_H */
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vserver/signal.h linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/signal.h
---- linux-2.6.19.1/include/linux/vserver/signal.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/signal.h 2006-11-08 04:57:45 +0100
-@@ -0,0 +1,14 @@
-+#ifndef _VX_SIGNAL_H
-+#define _VX_SIGNAL_H
++#define VXC_SECURE_MOUNT 0x00010000
++/* #define VXC_SECURE_REMOUNT 0x00020000 */
++#define VXC_BINARY_MOUNT 0x00040000
++#define VXC_DEV_MOUNT 0x00080000
+
++#define VXC_QUOTA_CTL 0x00100000
++#define VXC_ADMIN_MAPPER 0x00200000
++#define VXC_ADMIN_CLOOP 0x00400000
+
-+#ifdef __KERNEL__
++#define VXC_KTHREAD 0x01000000
++#define VXC_NAMESPACE 0x02000000
+
-+struct vx_info;
++#endif /* _UAPI_VS_CONTEXT_H */
+diff -urNp -x '*.orig' linux-4.9/include/uapi/vserver/context_cmd.h linux-4.9/include/uapi/vserver/context_cmd.h
+--- linux-4.9/include/uapi/vserver/context_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/uapi/vserver/context_cmd.h 2021-02-24 15:47:45.104409971 +0100
+@@ -0,0 +1,115 @@
++#ifndef _UAPI_VS_CONTEXT_CMD_H
++#define _UAPI_VS_CONTEXT_CMD_H
+
-+int vx_info_kill(struct vx_info *, int, int);
+
-+#endif /* __KERNEL__ */
-+#else /* _VX_SIGNAL_H */
-+#warning duplicate inclusion
-+#endif /* _VX_SIGNAL_H */
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vserver/signal_cmd.h linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/signal_cmd.h
---- linux-2.6.19.1/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/signal_cmd.h 2006-12-05 17:36:09 +0100
-@@ -0,0 +1,43 @@
-+#ifndef _VX_SIGNAL_CMD_H
-+#define _VX_SIGNAL_CMD_H
++/* vinfo commands */
+
++#define VCMD_task_xid VC_CMD(VINFO, 1, 0)
+
-+/* signalling vserver commands */
+
-+#define VCMD_ctx_kill VC_CMD(PROCTRL, 1, 0)
-+#define VCMD_wait_exit VC_CMD(EVENT, 99, 0)
++#define VCMD_vx_info VC_CMD(VINFO, 5, 0)
+
-+struct vcmd_ctx_kill_v0 {
-+ int32_t pid;
-+ int32_t sig;
++struct vcmd_vx_info_v0 {
++ uint32_t xid;
++ uint32_t initpid;
++ /* more to come */
+};
+
-+struct vcmd_wait_exit_v0 {
-+ int32_t reboot_cmd;
-+ int32_t exit_code;
-+};
+
-+#ifdef __KERNEL__
++#define VCMD_ctx_stat VC_CMD(VSTAT, 0, 0)
+
-+extern int vc_ctx_kill(struct vx_info *, void __user *);
-+extern int vc_wait_exit(struct vx_info *, void __user *);
++struct vcmd_ctx_stat_v0 {
++ uint32_t usecnt;
++ uint32_t tasks;
++ /* more to come */
++};
+
-+#endif /* __KERNEL__ */
+
-+/* process alteration commands */
++/* context commands */
+
-+#define VCMD_get_pflags VC_CMD(PROCALT, 5, 0)
-+#define VCMD_set_pflags VC_CMD(PROCALT, 6, 0)
++#define VCMD_ctx_create_v0 VC_CMD(VPROC, 1, 0)
++#define VCMD_ctx_create VC_CMD(VPROC, 1, 1)
+
-+struct vcmd_pflags_v0 {
-+ uint32_t flagword;
-+ uint32_t mask;
++struct vcmd_ctx_create {
++ uint64_t flagword;
+};
+
-+#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.19.1/include/linux/vserver/space.h linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/space.h
---- linux-2.6.19.1/include/linux/vserver/space.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/space.h 2006-12-05 18:57:02 +0100
-@@ -0,0 +1,13 @@
-+#ifndef _VX_SPACE_H
-+#define _VX_SPACE_H
++#define VCMD_ctx_migrate_v0 VC_CMD(PROCMIG, 1, 0)
++#define VCMD_ctx_migrate VC_CMD(PROCMIG, 1, 1)
+
++struct vcmd_ctx_migrate {
++ uint64_t flagword;
++};
+
-+#include <linux/types.h>
+
-+struct vx_info;
+
-+int vx_set_space(struct vx_info *vxi, unsigned long mask);
++/* flag commands */
+
-+#else /* _VX_SPACE_H */
-+#warning duplicate inclusion
-+#endif /* _VX_SPACE_H */
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vserver/space_cmd.h linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/space_cmd.h
---- linux-2.6.19.1/include/linux/vserver/space_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/space_cmd.h 2006-12-05 18:14:49 +0100
-@@ -0,0 +1,26 @@
-+#ifndef _VX_SPACE_CMD_H
-+#define _VX_SPACE_CMD_H
++#define VCMD_get_cflags VC_CMD(FLAGS, 1, 0)
++#define VCMD_set_cflags VC_CMD(FLAGS, 2, 0)
+
++struct vcmd_ctx_flags_v0 {
++ uint64_t flagword;
++ uint64_t mask;
++};
+
-+#define VCMD_enter_space_v0 VC_CMD(PROCALT, 1, 0)
-+#define VCMD_enter_space VC_CMD(PROCALT, 1, 1)
+
-+#define VCMD_set_space_v0 VC_CMD(PROCALT, 3, 0)
-+#define VCMD_set_space VC_CMD(PROCALT, 3, 1)
+
-+#define VCMD_get_space_mask VC_CMD(PROCALT, 4, 0)
++/* context caps commands */
+
++#define VCMD_get_ccaps VC_CMD(FLAGS, 3, 1)
++#define VCMD_set_ccaps VC_CMD(FLAGS, 4, 1)
+
-+struct vcmd_space_mask {
-+ uint64_t mask;
++struct vcmd_ctx_caps_v1 {
++ uint64_t ccaps;
++ uint64_t cmask;
+};
+
+
-+#ifdef __KERNEL__
-+
-+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(struct vx_info *, void __user *);
-+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_SPACE_CMD_H */
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vserver/switch.h linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/switch.h
---- linux-2.6.19.1/include/linux/vserver/switch.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/switch.h 2006-12-09 03:45:16 +0100
-@@ -0,0 +1,102 @@
-+#ifndef _VX_SWITCH_H
-+#define _VX_SWITCH_H
-+
-+#include <linux/types.h>
+
++/* bcaps commands */
+
-+#define VC_CATEGORY(c) (((c) >> 24) & 0x3F)
-+#define VC_COMMAND(c) (((c) >> 16) & 0xFF)
-+#define VC_VERSION(c) ((c) & 0xFFF)
++#define VCMD_get_bcaps VC_CMD(FLAGS, 9, 0)
++#define VCMD_set_bcaps VC_CMD(FLAGS, 10, 0)
+
-+#define VC_CMD(c,i,v) ((((VC_CAT_ ## c) & 0x3F) << 24) \
-+ | (((i) & 0xFF) << 16) | ((v) & 0xFFF))
++struct vcmd_bcaps {
++ uint64_t bcaps;
++ uint64_t bmask;
++};
+
-+/*
+
-+ 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 | | | | | | | |SWAP | |
-+ | 16| 17| 18| 19| 20| 21| | 22| 23|
-+ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
-+ NETWORK| |VNET |NETALT |NETMIG |NETCTL | | |SERIAL | |
-+ | 24| 25| 26| 27| 28| 29| | 30| 31|
-+ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
-+ DISK | | | | |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 | | | | |
-+ | 48| 49| 50| 51| 52| 53| | 54| 55|
-+ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
-+ SPECIAL|DEBUG | | | |RLIMIT |SYSCALL| | |COMPAT |
-+ | 56| 57| 58| 59| 60|TEST 61| | 62| 63|
-+ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
++/* umask commands */
+
-+*/
++#define VCMD_get_umask VC_CMD(FLAGS, 13, 0)
++#define VCMD_set_umask VC_CMD(FLAGS, 14, 0)
+
-+#define VC_CAT_VERSION 0
++struct vcmd_umask {
++ uint64_t umask;
++ uint64_t mask;
++};
+
-+#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
++/* wmask commands */
+
-+#define VC_CAT_SCHED 14
++#define VCMD_get_wmask VC_CMD(FLAGS, 15, 0)
++#define VCMD_set_wmask VC_CMD(FLAGS, 16, 0)
+
-+#define VC_CAT_VNET 25
-+#define VC_CAT_NETALT 26
-+#define VC_CAT_NETMIG 27
-+#define VC_CAT_NETCTRL 28
++struct vcmd_wmask {
++ uint64_t wmask;
++ uint64_t mask;
++};
+
-+#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_DEBUG 56
-+#define VC_CAT_RLIMIT 60
++/* OOM badness */
+
-+#define VC_CAT_SYSTEST 61
-+#define VC_CAT_COMPAT 63
++#define VCMD_get_badness VC_CMD(MEMCTRL, 5, 0)
++#define VCMD_set_badness VC_CMD(MEMCTRL, 6, 0)
+
-+/* interface version */
++struct vcmd_badness_v0 {
++ int64_t bias;
++};
+
-+#define VCI_VERSION 0x00020102
-+#define VCI_LEGACY_VERSION 0x000100FF
++#endif /* _UAPI_VS_CONTEXT_CMD_H */
+diff -urNp -x '*.orig' linux-4.9/include/uapi/vserver/cvirt_cmd.h linux-4.9/include/uapi/vserver/cvirt_cmd.h
+--- linux-4.9/include/uapi/vserver/cvirt_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/uapi/vserver/cvirt_cmd.h 2021-02-24 15:47:45.104409971 +0100
+@@ -0,0 +1,41 @@
++#ifndef _UAPI_VS_CVIRT_CMD_H
++#define _UAPI_VS_CVIRT_CMD_H
+
-+/* query version */
+
-+#define VCMD_get_version VC_CMD(VERSION, 0, 0)
-+#define VCMD_get_vci VC_CMD(VERSION, 1, 0)
++/* virtual host info name commands */
+
++#define VCMD_set_vhi_name VC_CMD(VHOST, 1, 0)
++#define VCMD_get_vhi_name VC_CMD(VHOST, 2, 0)
+
-+#ifdef __KERNEL__
++struct vcmd_vhi_name_v0 {
++ uint32_t field;
++ char name[65];
++};
+
-+#include <linux/errno.h>
+
++enum vhi_name_field {
++ VHIN_CONTEXT = 0,
++ VHIN_SYSNAME,
++ VHIN_NODENAME,
++ VHIN_RELEASE,
++ VHIN_VERSION,
++ VHIN_MACHINE,
++ VHIN_DOMAINNAME,
++};
+
-+#else /* __KERNEL__ */
-+#define __user
-+#endif /* __KERNEL__ */
+
-+#endif /* _VX_SWITCH_H */
-diff -NurpP --minimal linux-2.6.19.1/include/linux/vserver/tag.h linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/tag.h
---- linux-2.6.19.1/include/linux/vserver/tag.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/linux/vserver/tag.h 2006-12-17 04:19:20 +0100
-@@ -0,0 +1,147 @@
-+#ifndef _DX_TAG_H
-+#define _DX_TAG_H
+
++#define VCMD_virt_stat VC_CMD(VSTAT, 3, 0)
+
-+#define DX_TAG(in) (IS_TAGGED(in))
++struct vcmd_virt_stat_v0 {
++ uint64_t offset;
++ uint64_t uptime;
++ uint32_t nr_threads;
++ uint32_t nr_running;
++ uint32_t nr_uninterruptible;
++ uint32_t nr_onhold;
++ uint32_t nr_forks;
++ uint32_t load[3];
++};
+
++#endif /* _UAPI_VS_CVIRT_CMD_H */
+diff -urNp -x '*.orig' linux-4.9/include/uapi/vserver/debug_cmd.h linux-4.9/include/uapi/vserver/debug_cmd.h
+--- linux-4.9/include/uapi/vserver/debug_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/uapi/vserver/debug_cmd.h 2021-02-24 15:47:45.104409971 +0100
+@@ -0,0 +1,24 @@
++#ifndef _UAPI_VS_DEBUG_CMD_H
++#define _UAPI_VS_DEBUG_CMD_H
+
-+#ifdef CONFIG_DX_TAG_NFSD
-+#define DX_TAG_NFSD 1
-+#else
-+#define DX_TAG_NFSD 0
-+#endif
+
++/* debug commands */
+
-+#ifdef CONFIG_TAGGING_NONE
++#define VCMD_dump_history VC_CMD(DEBUG, 1, 0)
+
-+#define MAX_UID 0xFFFFFFFF
-+#define MAX_GID 0xFFFFFFFF
++#define VCMD_read_history VC_CMD(DEBUG, 5, 0)
++#define VCMD_read_monitor VC_CMD(DEBUG, 6, 0)
+
-+#define INOTAG_TAG(cond, uid, gid, tag) (0)
++struct vcmd_read_history_v0 {
++ uint32_t index;
++ uint32_t count;
++ char __user *data;
++};
+
-+#define TAGINO_UID(cond, uid, tag) (uid)
-+#define TAGINO_GID(cond, gid, tag) (gid)
++struct vcmd_read_monitor_v0 {
++ uint32_t index;
++ uint32_t count;
++ char __user *data;
++};
+
-+#endif
++#endif /* _UAPI_VS_DEBUG_CMD_H */
+diff -urNp -x '*.orig' linux-4.9/include/uapi/vserver/device.h linux-4.9/include/uapi/vserver/device.h
+--- linux-4.9/include/uapi/vserver/device.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/uapi/vserver/device.h 2021-02-24 15:47:45.104409971 +0100
+@@ -0,0 +1,12 @@
++#ifndef _UAPI_VS_DEVICE_H
++#define _UAPI_VS_DEVICE_H
+
+
-+#ifdef CONFIG_TAGGING_GID16
++#define DATTR_CREATE 0x00000001
++#define DATTR_OPEN 0x00000002
+
-+#define MAX_UID 0xFFFFFFFF
-+#define MAX_GID 0x0000FFFF
++#define DATTR_REMAP 0x00000010
+
-+#define INOTAG_TAG(cond, uid, gid, tag) \
-+ ((cond) ? (((gid) >> 16) & 0xFFFF) : 0)
++#define DATTR_MASK 0x00000013
+
-+#define TAGINO_UID(cond, uid, tag) (uid)
-+#define TAGINO_GID(cond, gid, tag) \
-+ ((cond) ? (((gid) & 0xFFFF) | ((tag) << 16)) : (gid))
++#endif /* _UAPI_VS_DEVICE_H */
+diff -urNp -x '*.orig' linux-4.9/include/uapi/vserver/device_cmd.h linux-4.9/include/uapi/vserver/device_cmd.h
+--- linux-4.9/include/uapi/vserver/device_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/uapi/vserver/device_cmd.h 2021-02-24 15:47:45.104409971 +0100
+@@ -0,0 +1,16 @@
++#ifndef _UAPI_VS_DEVICE_CMD_H
++#define _UAPI_VS_DEVICE_CMD_H
+
-+#endif
+
++/* device vserver commands */
+
-+#ifdef CONFIG_TAGGING_ID24
++#define VCMD_set_mapping VC_CMD(DEVICE, 1, 0)
++#define VCMD_unset_mapping VC_CMD(DEVICE, 2, 0)
+
-+#define MAX_UID 0x00FFFFFF
-+#define MAX_GID 0x00FFFFFF
++struct vcmd_set_mapping_v0 {
++ const char __user *device;
++ const char __user *target;
++ uint32_t flags;
++};
+
-+#define INOTAG_TAG(cond, uid, gid, tag) \
-+ ((cond) ? ((((uid) >> 16) & 0xFF00) | (((gid) >> 24) & 0xFF)) : 0)
++#endif /* _UAPI_VS_DEVICE_CMD_H */
+diff -urNp -x '*.orig' linux-4.9/include/uapi/vserver/dlimit_cmd.h linux-4.9/include/uapi/vserver/dlimit_cmd.h
+--- linux-4.9/include/uapi/vserver/dlimit_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/uapi/vserver/dlimit_cmd.h 2021-02-24 15:47:45.104409971 +0100
+@@ -0,0 +1,67 @@
++#ifndef _UAPI_VS_DLIMIT_CMD_H
++#define _UAPI_VS_DLIMIT_CMD_H
+
-+#define TAGINO_UID(cond, uid, tag) \
-+ ((cond) ? (((uid) & 0xFFFFFF) | (((tag) & 0xFF00) << 16)) : (uid))
-+#define TAGINO_GID(cond, gid, tag) \
-+ ((cond) ? (((gid) & 0xFFFFFF) | (((tag) & 0x00FF) << 24)) : (gid))
+
-+#endif
++/* dlimit vserver commands */
+
++#define VCMD_add_dlimit VC_CMD(DLIMIT, 1, 0)
++#define VCMD_rem_dlimit VC_CMD(DLIMIT, 2, 0)
+
-+#ifdef CONFIG_TAGGING_UID16
++#define VCMD_set_dlimit VC_CMD(DLIMIT, 5, 0)
++#define VCMD_get_dlimit VC_CMD(DLIMIT, 6, 0)
+
-+#define MAX_UID 0x0000FFFF
-+#define MAX_GID 0xFFFFFFFF
++struct vcmd_ctx_dlimit_base_v0 {
++ const char __user *name;
++ uint32_t flags;
++};
+
-+#define INOTAG_TAG(cond, uid, gid, tag) \
-+ ((cond) ? (((uid) >> 16) & 0xFFFF) : 0)
++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 TAGINO_UID(cond, uid, tag) \
-+ ((cond) ? (((uid) & 0xFFFF) | ((tag) << 16)) : (uid))
-+#define TAGINO_GID(cond, gid, tag) (gid)
++#define CDLIM_UNSET ((uint32_t)0UL)
++#define CDLIM_INFINITY ((uint32_t)~0UL)
++#define CDLIM_KEEP ((uint32_t)~1UL)
+
-+#endif
++#define DLIME_UNIT 0
++#define DLIME_KILO 1
++#define DLIME_MEGA 2
++#define DLIME_GIGA 3
+
++#define DLIMF_SHIFT 0x10
+
-+#ifdef CONFIG_TAGGING_INTERN
++#define DLIMS_USED 0
++#define DLIMS_TOTAL 2
+
-+#define MAX_UID 0xFFFFFFFF
-+#define MAX_GID 0xFFFFFFFF
++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);
++}
+
-+#define INOTAG_TAG(cond, uid, gid, tag) \
-+ ((cond) ? (tag) : 0)
++static inline
++uint32_t dlimit_space_64to32(uint64_t val, uint32_t *flags, int shift)
++{
++ int exp = 0;
+
-+#define TAGINO_UID(cond, uid, tag) (uid)
-+#define TAGINO_GID(cond, gid, tag) (gid)
++ 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;
++}
+
-+#endif
++#endif /* _UAPI_VS_DLIMIT_CMD_H */
+diff -urNp -x '*.orig' linux-4.9/include/uapi/vserver/inode.h linux-4.9/include/uapi/vserver/inode.h
+--- linux-4.9/include/uapi/vserver/inode.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/uapi/vserver/inode.h 2021-02-24 15:47:45.104409971 +0100
+@@ -0,0 +1,23 @@
++#ifndef _UAPI_VS_INODE_H
++#define _UAPI_VS_INODE_H
+
+
-+#ifdef CONFIG_TAGGING_RUNTIME
++#define IATTR_TAG 0x01000000
+
-+#define MAX_UID 0xFFFFFFFF
-+#define MAX_GID 0xFFFFFFFF
++#define IATTR_ADMIN 0x00000001
++#define IATTR_WATCH 0x00000002
++#define IATTR_HIDE 0x00000004
++#define IATTR_FLAGS 0x00000007
+
-+#define INOTAG_TAG(cond, uid, gid, tag) (0)
++#define IATTR_BARRIER 0x00010000
++#define IATTR_IXUNLINK 0x00020000
++#define IATTR_IMMUTABLE 0x00040000
++#define IATTR_COW 0x00080000
+
-+#define TAGINO_UID(cond, uid, tag) (uid)
-+#define TAGINO_GID(cond, gid, tag) (gid)
+
-+#endif
++/* inode ioctls */
+
++#define FIOC_GETXFLG _IOR('x', 5, long)
++#define FIOC_SETXFLG _IOW('x', 6, long)
+
-+#ifndef CONFIG_TAGGING_NONE
-+#define dx_current_fstag(sb) \
-+ ((sb)->s_flags & MS_TAGGED ? dx_current_tag(): 0)
-+#else
-+#define dx_current_fstag(sb) (0)
-+#endif
++#endif /* _UAPI_VS_INODE_H */
+diff -urNp -x '*.orig' linux-4.9/include/uapi/vserver/inode_cmd.h linux-4.9/include/uapi/vserver/inode_cmd.h
+--- linux-4.9/include/uapi/vserver/inode_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/uapi/vserver/inode_cmd.h 2021-02-24 15:47:45.104409971 +0100
+@@ -0,0 +1,26 @@
++#ifndef _UAPI_VS_INODE_CMD_H
++#define _UAPI_VS_INODE_CMD_H
+
-+#ifndef CONFIG_TAGGING_INTERN
-+#define TAGINO_TAG(cond, tag) (0)
-+#else
-+#define TAGINO_TAG(cond, tag) ((cond) ? (tag) : 0)
-+#endif
+
-+#define INOTAG_UID(cond, uid, gid) \
-+ ((cond) ? ((uid) & MAX_UID) : (uid))
-+#define INOTAG_GID(cond, uid, gid) \
-+ ((cond) ? ((gid) & MAX_GID) : (gid))
++/* inode vserver commands */
+
++#define VCMD_get_iattr VC_CMD(INODE, 1, 1)
++#define VCMD_set_iattr VC_CMD(INODE, 2, 1)
+
-+static inline uid_t dx_map_uid(uid_t uid)
-+{
-+ if ((uid > MAX_UID) && (uid != -1))
-+ uid = -2;
-+ return (uid & MAX_UID);
-+}
++#define VCMD_fget_iattr VC_CMD(INODE, 3, 0)
++#define VCMD_fset_iattr VC_CMD(INODE, 4, 0)
+
-+static inline gid_t dx_map_gid(gid_t gid)
-+{
-+ if ((gid > MAX_GID) && (gid != -1))
-+ gid = -2;
-+ return (gid & MAX_GID);
-+}
++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;
++};
+
-+#ifdef CONFIG_PROPAGATE
++#endif /* _UAPI_VS_INODE_CMD_H */
+diff -urNp -x '*.orig' linux-4.9/include/uapi/vserver/limit.h linux-4.9/include/uapi/vserver/limit.h
+--- linux-4.9/include/uapi/vserver/limit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/uapi/vserver/limit.h 2021-02-24 15:47:45.104409971 +0100
+@@ -0,0 +1,14 @@
++#ifndef _UAPI_VS_LIMIT_H
++#define _UAPI_VS_LIMIT_H
+
-+int dx_parse_tag(char *string, tag_t *tag, int remove);
+
-+void __dx_propagate_tag(struct nameidata *nd, struct inode *inode);
++#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 dx_propagate_tag(n,i) __dx_propagate_tag(n,i)
++#endif /* _UAPI_VS_LIMIT_H */
+diff -urNp -x '*.orig' linux-4.9/include/uapi/vserver/limit_cmd.h linux-4.9/include/uapi/vserver/limit_cmd.h
+--- linux-4.9/include/uapi/vserver/limit_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/uapi/vserver/limit_cmd.h 2021-02-24 15:47:45.104409971 +0100
+@@ -0,0 +1,40 @@
++#ifndef _UAPI_VS_LIMIT_CMD_H
++#define _UAPI_VS_LIMIT_CMD_H
+
-+#else
-+#define dx_propagate_tag(n,i) do { } while (0)
-+#endif
+
-+#endif /* _DX_TAG_H */
-diff -NurpP --minimal linux-2.6.19.1/include/net/af_unix.h linux-2.6.19.1-vs2.3.0.6/include/net/af_unix.h
---- linux-2.6.19.1/include/net/af_unix.h 2006-09-20 16:58:44 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/include/net/af_unix.h 2006-12-04 05:06:17 +0100
-@@ -4,6 +4,7 @@
- #include <linux/socket.h>
- #include <linux/un.h>
- #include <linux/mutex.h>
-+#include <linux/vs_base.h>
- #include <net/sock.h>
-
- extern void unix_inflight(struct file *fp);
-@@ -17,9 +18,9 @@ extern spinlock_t unix_table_lock;
-
- extern atomic_t unix_tot_inflight;
-
--static inline struct sock *first_unix_socket(int *i)
-+static inline struct sock *next_unix_socket_table(int *i)
- {
-- for (*i = 0; *i <= UNIX_HASH_SIZE; (*i)++) {
-+ for ((*i)++; *i <= UNIX_HASH_SIZE; (*i)++) {
- if (!hlist_empty(&unix_socket_table[*i]))
- return __sk_head(&unix_socket_table[*i]);
- }
-@@ -28,16 +29,19 @@ static inline struct sock *first_unix_so
-
- static inline struct sock *next_unix_socket(int *i, struct sock *s)
- {
-- struct sock *next = sk_next(s);
-- /* More in this chain? */
-- if (next)
-- return next;
-- /* Look for next non-empty chain. */
-- for ((*i)++; *i <= UNIX_HASH_SIZE; (*i)++) {
-- if (!hlist_empty(&unix_socket_table[*i]))
-- return __sk_head(&unix_socket_table[*i]);
-- }
-- return NULL;
-+ do {
-+ if (s)
-+ s = sk_next(s);
-+ if (!s)
-+ s = next_unix_socket_table(i);
-+ } while (s && !nx_check(s->sk_nid, VS_WATCH_P|VS_IDENT));
-+ return s;
-+}
++/* rlimit vserver commands */
+
-+static inline struct sock *first_unix_socket(int *i)
-+{
-+ *i = 0;
-+ return next_unix_socket(i, NULL);
- }
-
- #define forall_unix_sockets(i, s) \
-diff -NurpP --minimal linux-2.6.19.1/include/net/inet_hashtables.h linux-2.6.19.1-vs2.3.0.6/include/net/inet_hashtables.h
---- linux-2.6.19.1/include/net/inet_hashtables.h 2006-11-30 21:19:40 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/net/inet_hashtables.h 2006-11-08 04:57:42 +0100
-@@ -271,6 +271,26 @@ static inline int inet_iif(const struct
- return ((struct rtable *)skb->dst)->rt_iif;
- }
-
-+/*
-+ * Check if a given address matches for an inet socket
-+ *
-+ * nxi: the socket's nx_info if any
-+ * addr: to be verified address
-+ * saddr: socket addresses
-+ */
-+static inline int inet_addr_match (
-+ struct nx_info *nxi,
-+ uint32_t addr,
-+ uint32_t saddr)
-+{
-+ if (addr && (saddr == addr))
-+ return 1;
-+ if (!saddr)
-+ return addr_in_nx_info(nxi, addr);
-+ return 0;
-+}
++#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;
++};
+
- extern struct sock *__inet_lookup_listener(struct inet_hashinfo *hashinfo,
- const __be32 daddr,
- const unsigned short hnum,
-diff -NurpP --minimal linux-2.6.19.1/include/net/inet_sock.h linux-2.6.19.1-vs2.3.0.6/include/net/inet_sock.h
---- linux-2.6.19.1/include/net/inet_sock.h 2006-11-30 21:19:40 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/net/inet_sock.h 2006-11-08 04:57:42 +0100
-@@ -112,6 +112,7 @@ struct inet_sock {
- /* Socket demultiplex comparisons on incoming packets. */
- __be32 daddr;
- __be32 rcv_saddr;
-+ __be32 rcv_saddr2; /* Second bound ipv4 addr, for ipv4root */
- __be16 dport;
- __u16 num;
- __be32 saddr;
-diff -NurpP --minimal linux-2.6.19.1/include/net/inet_timewait_sock.h linux-2.6.19.1-vs2.3.0.6/include/net/inet_timewait_sock.h
---- linux-2.6.19.1/include/net/inet_timewait_sock.h 2006-11-30 21:19:40 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/net/inet_timewait_sock.h 2006-11-08 04:57:42 +0100
-@@ -115,6 +115,10 @@ struct inet_timewait_sock {
- #define tw_refcnt __tw_common.skc_refcnt
- #define tw_hash __tw_common.skc_hash
- #define tw_prot __tw_common.skc_prot
-+#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
- volatile unsigned char tw_substate;
- /* 3 bits hole, try to pack */
- unsigned char tw_rcv_wscale;
-diff -NurpP --minimal linux-2.6.19.1/include/net/route.h linux-2.6.19.1-vs2.3.0.6/include/net/route.h
---- linux-2.6.19.1/include/net/route.h 2006-11-30 21:19:40 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/net/route.h 2006-12-17 03:25:02 +0100
-@@ -27,12 +27,16 @@
- #include <net/dst.h>
- #include <net/inetpeer.h>
- #include <net/flow.h>
-+#include <net/inet_sock.h>
- #include <linux/in_route.h>
- #include <linux/rtnetlink.h>
- #include <linux/route.h>
- #include <linux/ip.h>
- #include <linux/cache.h>
- #include <linux/security.h>
-+#include <linux/vs_base.h>
-+#include <linux/vs_inet.h>
-+#include <linux/in.h>
-
- #ifndef __KERNEL__
- #warning This file is not supposed to be used outside of kernel.
-@@ -144,6 +148,8 @@ static inline char rt_tos2priority(u8 to
- return ip_tos2prio[IPTOS_TOS(tos)>>1];
- }
-
-+#include "route_vs.h"
++struct vcmd_ctx_rlimit_mask_v0 {
++ uint32_t minimum;
++ uint32_t softlimit;
++ uint32_t maximum;
++};
+
- 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)
-@@ -158,7 +164,21 @@ static inline int ip_route_connect(struc
- .dport = dport } } };
-
- int err;
-- if (!dst || !src) {
-+ struct nx_info *nx_info = current->nx_info;
++#define VCMD_rlimit_stat VC_CMD(VSTAT, 1, 0)
+
-+ if (sk)
-+ nx_info = sk->sk_nx_info;
++struct vcmd_rlimit_stat_v0 {
++ uint32_t id;
++ uint32_t hits;
++ uint64_t value;
++ uint64_t minimum;
++ uint64_t maximum;
++};
+
-+ 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 CRLIM_UNSET (0ULL)
++#define CRLIM_INFINITY (~0ULL)
++#define CRLIM_KEEP (~1ULL)
+
-+ err = ip_find_src(nx_info, rp, &fl);
-+ if (err)
-+ return err;
++#endif /* _UAPI_VS_LIMIT_CMD_H */
+diff -urNp -x '*.orig' linux-4.9/include/uapi/vserver/monitor.h linux-4.9/include/uapi/vserver/monitor.h
+--- linux-4.9/include/uapi/vserver/monitor.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/uapi/vserver/monitor.h 2021-02-24 15:47:45.104409971 +0100
+@@ -0,0 +1,96 @@
++#ifndef _UAPI_VS_MONITOR_H
++#define _UAPI_VS_MONITOR_H
+
-+ if (!fl.fl4_dst || !fl.fl4_src) {
- err = __ip_route_output_key(rp, &fl);
- if (err)
- return err;
-diff -NurpP --minimal linux-2.6.19.1/include/net/route_vs.h linux-2.6.19.1-vs2.3.0.6/include/net/route_vs.h
---- linux-2.6.19.1/include/net/route_vs.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/net/route_vs.h 2006-12-17 03:47:12 +0100
-@@ -0,0 +1,64 @@
++#include <linux/types.h>
+
-+static inline int ip_find_src(struct nx_info *nxi, struct rtable **rp, struct flowi *fl)
-+{
-+ int err;
-+ int i, n;
-+ uint32_t ipv4root;
+
-+ if (!nxi)
-+ return 0;
++enum {
++ VXM_UNUSED = 0,
+
-+ ipv4root = nxi->ipv4[0];
-+ if (ipv4root == 0)
-+ return 0;
++ VXM_SYNC = 0x10,
+
-+ n = nxi->nbipv4;
-+ if (fl->fl4_src == 0) {
-+ if (n > 1) {
-+ u32 foundsrc;
++ VXM_UPDATE = 0x20,
++ VXM_UPDATE_1,
++ VXM_UPDATE_2,
+
-+ err = __ip_route_output_key(rp, fl);
-+ if (err) {
-+ fl->fl4_src = ipv4root;
-+ err = __ip_route_output_key(rp, fl);
-+ }
-+ if (err)
-+ return err;
++ VXM_RQINFO_1 = 0x24,
++ VXM_RQINFO_2,
+
-+ foundsrc = (*rp)->rt_src;
-+ ip_rt_put(*rp);
++ VXM_ACTIVATE = 0x40,
++ VXM_DEACTIVATE,
++ VXM_IDLE,
+
-+ for (i=0; i<n; i++){
-+ u32 mask = nxi->mask[i];
-+ u32 ipv4 = nxi->ipv4[i];
-+ u32 net4 = ipv4 & mask;
++ VXM_HOLD = 0x44,
++ VXM_UNHOLD,
+
-+ if (foundsrc == ipv4) {
-+ fl->fl4_src = ipv4;
-+ break;
-+ }
-+ if (!fl->fl4_src && (foundsrc & mask) == net4)
-+ fl->fl4_src = ipv4;
-+ }
-+ }
-+ if (fl->fl4_src == 0)
-+ fl->fl4_src = (fl->fl4_dst == IPI_LOOPBACK)
-+ ? IPI_LOOPBACK : ipv4root;
-+ } else {
-+ for (i=0; i<n; i++) {
-+ if (nxi->ipv4[i] == fl->fl4_src)
-+ break;
-+ }
-+ if (i == n)
-+ return -EPERM;
-+ }
++ VXM_MIGRATE = 0x48,
++ VXM_RESCHED,
+
-+ if (fl->fl4_dst == IPI_LOOPBACK && !nx_check(0, VS_ADMIN))
-+ fl->fl4_dst = nxi->ipv4[0];
-+#ifdef CONFIG_VSERVER_REMAP_SADDR
-+ if (fl->fl4_src == IPI_LOOPBACK && !nx_check(0, VS_ADMIN))
-+ fl->fl4_src = nxi->ipv4[0];
-+#endif
-+ return 0;
-+}
++ /* all other bits are flags */
++ VXM_SCHED = 0x80,
++};
+
-diff -NurpP --minimal linux-2.6.19.1/include/net/sock.h linux-2.6.19.1-vs2.3.0.6/include/net/sock.h
---- linux-2.6.19.1/include/net/sock.h 2006-11-30 21:19:41 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/include/net/sock.h 2006-11-30 20:55:45 +0100
-@@ -118,6 +118,10 @@ struct sock_common {
- atomic_t skc_refcnt;
- unsigned int skc_hash;
- struct proto *skc_prot;
-+ xid_t skc_xid;
-+ struct vx_info *skc_vx_info;
-+ nid_t skc_nid;
-+ struct nx_info *skc_nx_info;
- };
-
- /**
-@@ -194,6 +198,10 @@ struct sock {
- #define sk_refcnt __sk_common.skc_refcnt
- #define sk_hash __sk_common.skc_hash
- #define sk_prot __sk_common.skc_prot
-+#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
- unsigned char sk_shutdown : 2,
- sk_no_check : 2,
- sk_userlocks : 4;
-diff -NurpP --minimal linux-2.6.19.1/init/Makefile linux-2.6.19.1-vs2.3.0.6/init/Makefile
---- linux-2.6.19.1/init/Makefile 2006-09-20 16:58:44 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/init/Makefile 2006-12-06 21:16:15 +0100
-@@ -15,6 +15,7 @@ clean-files := ../include/linux/compile.
-
- # dependencies on generated files need to be listed explicitly
-
-+$(obj)/main.o: include/linux/compile.h
- $(obj)/version.o: include/linux/compile.h
-
- # compile.h changes depending on hostname, generation number, etc,
-diff -NurpP --minimal linux-2.6.19.1/init/main.c linux-2.6.19.1-vs2.3.0.6/init/main.c
---- linux-2.6.19.1/init/main.c 2006-11-30 21:19:43 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/init/main.c 2006-12-06 08:48:35 +0100
-@@ -49,6 +49,8 @@
- #include <linux/buffer_head.h>
- #include <linux/debug_locks.h>
- #include <linux/lockdep.h>
-+#include <linux/utsrelease.h>
-+#include <linux/compile.h>
-
- #include <asm/io.h>
- #include <asm/bugs.h>
-@@ -501,7 +503,7 @@ asmlinkage void __init start_kernel(void
- boot_cpu_init();
- page_address_init();
- printk(KERN_NOTICE);
-- printk(linux_banner);
-+ printk(linux_banner, UTS_RELEASE, UTS_VERSION);
- setup_arch(&command_line);
- unwind_setup();
- setup_per_cpu_areas();
-diff -NurpP --minimal linux-2.6.19.1/init/version.c linux-2.6.19.1-vs2.3.0.6/init/version.c
---- linux-2.6.19.1/init/version.c 2006-11-30 21:19:43 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/init/version.c 2006-12-06 08:48:35 +0100
-@@ -35,5 +35,6 @@ struct uts_namespace init_uts_ns = {
- EXPORT_SYMBOL_GPL(init_uts_ns);
-
- const char linux_banner[] =
-- "Linux version " UTS_RELEASE " (" LINUX_COMPILE_BY "@"
-- LINUX_COMPILE_HOST ") (" LINUX_COMPILER ") " UTS_VERSION "\n";
-+ "Linux version %s (" LINUX_COMPILE_BY "@"
-+ LINUX_COMPILE_HOST ") (" LINUX_COMPILER ") %s\n";
-+
-diff -NurpP --minimal linux-2.6.19.1/ipc/mqueue.c linux-2.6.19.1-vs2.3.0.6/ipc/mqueue.c
---- linux-2.6.19.1/ipc/mqueue.c 2006-11-30 21:19:43 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/ipc/mqueue.c 2006-11-08 04:57:52 +0100
-@@ -29,6 +29,8 @@
- #include <linux/audit.h>
- #include <linux/signal.h>
- #include <linux/mutex.h>
-+#include <linux/vs_context.h>
-+#include <linux/vs_limit.h>
-
- #include <net/sock.h>
- #include "util.h"
-@@ -151,17 +153,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 >
-- p->signal->rlim[RLIMIT_MSGQUEUE].rlim_cur) {
-+ p->signal->rlim[RLIMIT_MSGQUEUE].rlim_cur ||
-+ !vx_ipcmsg_avail(p->vx_info, mq_bytes)) {
- spin_unlock(&mq_lock);
- goto out_inode;
- }
- u->mq_bytes += mq_bytes;
-+ vx_ipcmsg_add(p->vx_info, u, mq_bytes);
- spin_unlock(&mq_lock);
-
- info->messages = kmalloc(mq_msg_tblsz, GFP_KERNEL);
- if (!info->messages) {
- spin_lock(&mq_lock);
- u->mq_bytes -= mq_bytes;
-+ vx_ipcmsg_sub(p->vx_info, u, mq_bytes);
- spin_unlock(&mq_lock);
- goto out_inode;
- }
-@@ -259,10 +264,14 @@ static void mqueue_delete_inode(struct i
- (info->attr.mq_maxmsg * info->attr.mq_msgsize));
- user = info->user;
- if (user) {
-+ struct vx_info *vxi = lookup_vx_info(user->xid);
++struct _vxm_update_1 {
++ uint32_t tokens_max;
++ uint32_t fill_rate;
++ uint32_t interval;
++};
+
- spin_lock(&mq_lock);
- user->mq_bytes -= mq_bytes;
-+ vx_ipcmsg_sub(vxi, user, mq_bytes);
- queues_count--;
- spin_unlock(&mq_lock);
-+ put_vx_info(vxi);
- free_uid(user);
- }
- }
-@@ -747,7 +756,7 @@ asmlinkage long sys_mq_unlink(const char
- if (inode)
- atomic_inc(&inode->i_count);
-
-- err = vfs_unlink(dentry->d_parent->d_inode, dentry);
-+ err = vfs_unlink(dentry->d_parent->d_inode, dentry, NULL);
- out_err:
- dput(dentry);
-
-diff -NurpP --minimal linux-2.6.19.1/ipc/msg.c linux-2.6.19.1-vs2.3.0.6/ipc/msg.c
---- linux-2.6.19.1/ipc/msg.c 2006-11-30 21:19:43 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/ipc/msg.c 2006-11-30 18:53:18 +0100
-@@ -36,6 +36,7 @@
- #include <linux/seq_file.h>
- #include <linux/mutex.h>
- #include <linux/nsproxy.h>
-+#include <linux/vs_base.h>
-
- #include <asm/current.h>
- #include <asm/uaccess.h>
-@@ -149,6 +150,7 @@ static int newque (struct ipc_namespace
-
- msq->q_perm.mode = msgflg & S_IRWXUGO;
- msq->q_perm.key = key;
-+ msq->q_perm.xid = vx_current_xid();
-
- msq->q_perm.security = NULL;
- retval = security_msg_queue_alloc(msq);
-@@ -903,6 +905,9 @@ static int sysvipc_msg_proc_show(struct
- {
- struct msg_queue *msq = it;
-
-+ if (!vx_check(msq->q_perm.xid, VS_WATCH_P|VS_IDENT))
-+ return 0;
++struct _vxm_update_2 {
++ uint32_t tokens_min;
++ uint32_t fill_rate;
++ uint32_t interval;
++};
+
- return seq_printf(s,
- "%10d %10d %4o %10lu %10lu %5u %5u %5u %5u %5u %5u %10lu %10lu %10lu\n",
- msq->q_perm.key,
-diff -NurpP --minimal linux-2.6.19.1/ipc/sem.c linux-2.6.19.1-vs2.3.0.6/ipc/sem.c
---- linux-2.6.19.1/ipc/sem.c 2006-11-30 21:19:43 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/ipc/sem.c 2006-11-30 18:53:18 +0100
-@@ -83,6 +83,8 @@
- #include <linux/seq_file.h>
- #include <linux/mutex.h>
- #include <linux/nsproxy.h>
-+#include <linux/vs_base.h>
-+#include <linux/vs_limit.h>
-
- #include <asm/uaccess.h>
- #include "util.h"
-@@ -230,6 +232,7 @@ static int newary (struct ipc_namespace
-
- sma->sem_perm.mode = (semflg & S_IRWXUGO);
- sma->sem_perm.key = key;
-+ sma->sem_perm.xid = vx_current_xid();
-
- sma->sem_perm.security = NULL;
- retval = security_sem_alloc(sma);
-@@ -245,6 +248,9 @@ static int newary (struct ipc_namespace
- return -ENOSPC;
- }
- ns->used_sems += nsems;
-+ /* FIXME: obsoleted? */
-+ vx_semary_inc(sma);
-+ vx_nsems_add(sma, nsems);
-
- sma->sem_id = sem_buildid(ns, id, sma->sem_perm.seq);
- sma->sem_base = (struct sem *) &sma[1];
-@@ -526,6 +532,9 @@ static void freeary (struct ipc_namespac
- sem_unlock(sma);
-
- ns->used_sems -= sma->sem_nsems;
-+ /* FIXME: obsoleted? */
-+ vx_nsems_sub(sma, sma->sem_nsems);
-+ vx_semary_dec(sma);
- size = sizeof (*sma) + sma->sem_nsems * sizeof (struct sem);
- security_sem_free(sma);
- ipc_rcu_putref(sma);
-@@ -1403,6 +1412,9 @@ static int sysvipc_sem_proc_show(struct
- {
- struct sem_array *sma = it;
-
-+ if (!vx_check(sma->sem_perm.xid, VS_WATCH_P|VS_IDENT))
-+ return 0;
++struct _vxm_rqinfo_1 {
++ uint16_t running;
++ uint16_t onhold;
++ uint16_t iowait;
++ uint16_t uintr;
++ uint32_t idle_tokens;
++};
+
- return seq_printf(s,
- "%10d %10d %4o %10lu %5u %5u %5u %5u %10lu %10lu\n",
- sma->sem_perm.key,
-diff -NurpP --minimal linux-2.6.19.1/ipc/shm.c linux-2.6.19.1-vs2.3.0.6/ipc/shm.c
---- linux-2.6.19.1/ipc/shm.c 2006-11-30 21:19:43 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/ipc/shm.c 2006-11-30 18:53:18 +0100
-@@ -37,6 +37,8 @@
- #include <linux/seq_file.h>
- #include <linux/mutex.h>
- #include <linux/nsproxy.h>
-+#include <linux/vs_context.h>
-+#include <linux/vs_limit.h>
-
- #include <asm/uaccess.h>
-
-@@ -181,7 +183,12 @@ static void shm_open(struct vm_area_stru
- */
- static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp)
- {
-- ns->shm_tot -= (shp->shm_segsz + PAGE_SIZE - 1) >> PAGE_SHIFT;
-+ struct vx_info *vxi = lookup_vx_info(shp->shm_perm.xid);
-+ int numpages = (shp->shm_segsz + PAGE_SIZE - 1) >> PAGE_SHIFT;
++struct _vxm_rqinfo_2 {
++ uint32_t norm_time;
++ uint32_t idle_time;
++ uint32_t idle_skip;
++};
+
-+ vx_ipcshm_sub(vxi, shp, numpages);
-+ ns->shm_tot -= numpages;
++struct _vxm_sched {
++ uint32_t tokens;
++ uint32_t norm_time;
++ uint32_t idle_time;
++};
+
- shm_rmid(ns, shp->id);
- shm_unlock(shp);
- if (!is_file_hugepages(shp->shm_file))
-@@ -191,6 +198,7 @@ static void shm_destroy(struct ipc_names
- shp->mlock_user);
- fput (shp->shm_file);
- security_shm_free(shp);
-+ put_vx_info(vxi);
- ipc_rcu_putref(shp);
- }
-
-@@ -282,11 +290,15 @@ static int newseg (struct ipc_namespace
- if (ns->shm_tot + numpages >= ns->shm_ctlall)
- return -ENOSPC;
-
-+ if (!vx_ipcshm_avail(current->vx_info, numpages))
-+ return -ENOSPC;
++struct _vxm_task {
++ uint16_t pid;
++ uint16_t state;
++};
+
- shp = ipc_rcu_alloc(sizeof(*shp));
- if (!shp)
- return -ENOMEM;
-
- shp->shm_perm.key = key;
-+ shp->shm_perm.xid = vx_current_xid();
- shp->shm_perm.mode = (shmflg & S_IRWXUGO);
- shp->mlock_user = NULL;
-
-@@ -339,6 +351,7 @@ static int newseg (struct ipc_namespace
- file->f_op = &shm_file_operations;
-
- ns->shm_tot += numpages;
-+ vx_ipcshm_add(current->vx_info, key, numpages);
- shm_unlock(shp);
- return shp->id;
-
-@@ -993,6 +1006,9 @@ static int sysvipc_shm_proc_show(struct
- #define SMALL_STRING "%10d %10d %4o %10u %5u %5u %5d %5u %5u %5u %5u %10lu %10lu %10lu\n"
- #define BIG_STRING "%10d %10d %4o %21u %5u %5u %5d %5u %5u %5u %5u %10lu %10lu %10lu\n"
-
-+ if (!vx_check(shp->shm_perm.xid, VS_WATCH_P|VS_IDENT))
-+ return 0;
++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 (sizeof(size_t) <= sizeof(int))
- format = SMALL_STRING;
- else
-diff -NurpP --minimal linux-2.6.19.1/ipc/util.c linux-2.6.19.1-vs2.3.0.6/ipc/util.c
---- linux-2.6.19.1/ipc/util.c 2006-11-30 21:19:43 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/ipc/util.c 2006-11-30 18:53:18 +0100
-@@ -33,6 +33,7 @@
- #include <linux/proc_fs.h>
- #include <linux/audit.h>
- #include <linux/nsproxy.h>
-+#include <linux/vs_base.h>
-
- #include <asm/unistd.h>
-
-@@ -261,7 +262,9 @@ int ipc_findkey(struct ipc_ids* ids, key
- */
- for (id = 0; id <= max_id; id++) {
- p = ids->entries->p[id];
-- if(p==NULL)
-+ if (p==NULL)
-+ continue;
-+ if (!vx_check(p->xid, VS_WATCH_P|VS_IDENT))
- continue;
- if (key == p->key)
- return id;
-@@ -574,6 +577,9 @@ int ipcperms (struct kern_ipc_perm *ipcp
-
- if (unlikely((err = audit_ipc_obj(ipcp))))
- return err;
++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;
++ };
++};
+
-+ if (!vx_check(ipcp->xid, VS_WATCH_P|VS_IDENT)) /* maybe just VS_IDENT? */
-+ return -1;
- requested_mode = (flag >> 6) | (flag >> 3) | flag;
- granted_mode = ipcp->mode;
- if (current->euid == ipcp->cuid || current->euid == ipcp->uid)
-diff -NurpP --minimal linux-2.6.19.1/kernel/Makefile linux-2.6.19.1-vs2.3.0.6/kernel/Makefile
---- linux-2.6.19.1/kernel/Makefile 2006-11-30 21:19:43 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/Makefile 2006-11-08 23:23:13 +0100
-@@ -10,6 +10,8 @@ obj-y = sched.o fork.o exec_domain.o
- kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o mutex.o \
- hrtimer.o rwsem.o latency.o nsproxy.o srcu.o
-
-+obj-y += vserver/
-+
- obj-$(CONFIG_STACKTRACE) += stacktrace.o
- obj-y += time/
- obj-$(CONFIG_DEBUG_MUTEXES) += mutex-debug.o
-diff -NurpP --minimal linux-2.6.19.1/kernel/capability.c linux-2.6.19.1-vs2.3.0.6/kernel/capability.c
---- linux-2.6.19.1/kernel/capability.c 2006-11-30 21:19:43 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/capability.c 2006-11-30 19:37:57 +0100
-@@ -12,6 +12,7 @@
- #include <linux/module.h>
- #include <linux/security.h>
- #include <linux/syscalls.h>
-+#include <linux/vs_context.h>
- #include <asm/uaccess.h>
-
- unsigned securebits = SECUREBITS_DEFAULT; /* systemwide security settings */
-@@ -244,8 +245,12 @@ int __capable(struct task_struct *t, int
- }
- EXPORT_SYMBOL(__capable);
-
-+#include <linux/vserver/base.h>
- 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;
- return __capable(current, cap);
- }
- EXPORT_SYMBOL(capable);
-diff -NurpP --minimal linux-2.6.19.1/kernel/compat.c linux-2.6.19.1-vs2.3.0.6/kernel/compat.c
---- linux-2.6.19.1/kernel/compat.c 2006-11-30 21:19:43 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/compat.c 2006-11-08 21:52:09 +0100
-@@ -846,7 +846,7 @@ asmlinkage long compat_sys_time(compat_t
- compat_time_t i;
- struct timeval tv;
-
-- do_gettimeofday(&tv);
-+ vx_gettimeofday(&tv);
- i = tv.tv_sec;
-
- if (tloc) {
-@@ -870,7 +870,7 @@ asmlinkage long compat_sys_stime(compat_
- if (err)
- return err;
-
-- do_settimeofday(&tv);
-+ vx_settimeofday(&tv);
- return 0;
- }
-
-diff -NurpP --minimal linux-2.6.19.1/kernel/exit.c linux-2.6.19.1-vs2.3.0.6/kernel/exit.c
---- linux-2.6.19.1/kernel/exit.c 2006-11-30 21:19:43 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/exit.c 2006-11-08 04:57:53 +0100
-@@ -41,6 +41,9 @@
- #include <linux/audit.h> /* for audit_free() */
- #include <linux/resource.h>
- #include <linux/blkdev.h>
-+#include <linux/vs_limit.h>
-+#include <linux/vs_context.h>
-+#include <linux/vs_network.h>
-
- #include <asm/uaccess.h>
- #include <asm/unistd.h>
-@@ -437,9 +440,11 @@ static void close_files(struct files_str
- struct file * file = xchg(&fdt->fd[i], NULL);
- if (file)
- filp_close(file, files);
-+ vx_openfd_dec(i);
- }
- i++;
- set >>= 1;
-+ cond_resched();
- }
- }
- }
-@@ -592,6 +597,11 @@ static void exit_mm(struct task_struct *
- static inline void
- choose_new_parent(struct task_struct *p, struct task_struct *reaper)
- {
-+ /* check for reaper context */
-+ vxwprintk((p->xid != reaper->xid) && (reaper != child_reaper),
-+ "rogue reaper: %p[%d,#%u] <> %p[%d,#%u]",
-+ p, p->pid, p->xid, reaper, reaper->pid, reaper->xid);
++#endif /* _UAPI_VS_MONITOR_H */
+diff -urNp -x '*.orig' linux-4.9/include/uapi/vserver/network.h linux-4.9/include/uapi/vserver/network.h
+--- linux-4.9/include/uapi/vserver/network.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/uapi/vserver/network.h 2021-02-24 15:47:45.104409971 +0100
+@@ -0,0 +1,76 @@
++#ifndef _UAPI_VS_NETWORK_H
++#define _UAPI_VS_NETWORK_H
+
- /*
- * Make sure we're not reparenting to ourselves and that
- * the parent is not a zombie.
-@@ -674,7 +684,7 @@ forget_original_parent(struct task_struc
- do {
- reaper = next_thread(reaper);
- if (reaper == father) {
-- reaper = child_reaper;
-+ reaper = vx_child_reaper(father);
- break;
- }
- } while (reaper->exit_state);
-@@ -698,7 +708,7 @@ forget_original_parent(struct task_struc
-
- if (father == p->real_parent) {
- /* reparent with a reaper, real father it's us */
-- choose_new_parent(p, reaper);
-+ choose_new_parent(p, vx_child_reaper(p));
- reparent_thread(p, father, 0);
- } else {
- /* reparent ptraced task to its real parent */
-@@ -934,6 +944,8 @@ fastcall NORET_TYPE void do_exit(long co
-
- tsk->exit_code = code;
- proc_exit_connector(tsk);
-+ /* needs to stay before exit_notify() */
-+ exit_vx_info_early(tsk, code);
- exit_notify(tsk);
- exit_task_namespaces(tsk);
- #ifdef CONFIG_NUMA
-@@ -959,6 +971,10 @@ fastcall NORET_TYPE void do_exit(long co
- if (tsk->splice_pipe)
- __free_pipe_info(tsk->splice_pipe);
-
-+ /* needs to stay after exit_notify() */
-+ exit_vx_info(tsk, code);
-+ exit_nx_info(tsk);
++#include <linux/types.h>
+
- preempt_disable();
- /* causes final put_task_struct in finish_task_switch(). */
- tsk->state = TASK_DEAD;
-diff -NurpP --minimal linux-2.6.19.1/kernel/fork.c linux-2.6.19.1-vs2.3.0.6/kernel/fork.c
---- linux-2.6.19.1/kernel/fork.c 2006-11-30 21:19:43 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/fork.c 2006-11-30 20:55:45 +0100
-@@ -48,6 +48,10 @@
- #include <linux/delayacct.h>
- #include <linux/taskstats_kern.h>
- #include <linux/random.h>
-+#include <linux/vs_context.h>
-+#include <linux/vs_network.h>
-+#include <linux/vs_limit.h>
-+#include <linux/vs_memory.h>
-
- #include <asm/pgtable.h>
- #include <asm/pgalloc.h>
-@@ -107,6 +111,8 @@ void free_task(struct task_struct *tsk)
- {
- free_thread_info(tsk->thread_info);
- rt_mutex_debug_task_free(tsk);
-+ clr_vx_info(&tsk->vx_info);
-+ clr_nx_info(&tsk->nx_info);
- free_task_struct(tsk);
- }
- EXPORT_SYMBOL(free_task);
-@@ -214,6 +220,8 @@ static inline int dup_mmap(struct mm_str
- mm->free_area_cache = oldmm->mmap_base;
- mm->cached_hole_size = ~0UL;
- mm->map_count = 0;
-+ __set_mm_counter(mm, file_rss, 0);
-+ __set_mm_counter(mm, anon_rss, 0);
- cpus_clear(mm->cpu_vm_mask);
- mm->mm_rb = RB_ROOT;
- rb_link = &mm->mm_rb.rb_node;
-@@ -225,7 +233,7 @@ static inline int dup_mmap(struct mm_str
-
- if (mpnt->vm_flags & VM_DONTCOPY) {
- long pages = vma_pages(mpnt);
-- mm->total_vm -= pages;
-+ vx_vmpages_sub(mm, pages);
- vm_stat_account(mm, mpnt->vm_flags, mpnt->vm_file,
- -pages);
- continue;
-@@ -332,8 +340,6 @@ static struct mm_struct * mm_init(struct
- INIT_LIST_HEAD(&mm->mmlist);
- mm->core_waiters = 0;
- mm->nr_ptes = 0;
-- set_mm_counter(mm, file_rss, 0);
-- set_mm_counter(mm, anon_rss, 0);
- spin_lock_init(&mm->page_table_lock);
- rwlock_init(&mm->ioctx_list_lock);
- mm->ioctx_list = NULL;
-@@ -342,6 +348,7 @@ static struct mm_struct * mm_init(struct
-
- if (likely(!mm_alloc_pgd(mm))) {
- mm->def_flags = 0;
-+ set_vx_info(&mm->mm_vx_info, current->vx_info);
- return mm;
- }
- free_mm(mm);
-@@ -373,6 +380,7 @@ void fastcall __mmdrop(struct mm_struct
- BUG_ON(mm == &init_mm);
- mm_free_pgd(mm);
- destroy_context(mm);
-+ clr_vx_info(&mm->mm_vx_info);
- free_mm(mm);
- }
-
-@@ -478,6 +486,7 @@ static struct mm_struct *dup_mm(struct t
- goto fail_nomem;
-
- memcpy(mm, oldmm, sizeof(*mm));
-+ mm->mm_vx_info = NULL;
-
- if (!mm_init(mm))
- goto fail_nomem;
-@@ -505,6 +514,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;
-@@ -700,6 +710,8 @@ static struct files_struct *dup_fd(struc
- struct file *f = *old_fds++;
- if (f) {
- get_file(f);
-+ /* FIXME: sum it first for check and performance */
-+ vx_openfd_inc(open_files - i);
- } else {
- /*
- * The fd may be claimed in the fd bitmap but not yet
-@@ -955,6 +967,8 @@ static struct task_struct *copy_process(
- {
- int retval;
- struct task_struct *p = NULL;
-+ struct vx_info *vxi;
-+ struct nx_info *nxi;
-
- if ((clone_flags & (CLONE_NEWNS|CLONE_FS)) == (CLONE_NEWNS|CLONE_FS))
- return ERR_PTR(-EINVAL);
-@@ -989,12 +1003,30 @@ static struct task_struct *copy_process(
- DEBUG_LOCKS_WARN_ON(!p->hardirqs_enabled);
- DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
- #endif
-+ init_vx_info(&p->vx_info, current->vx_info);
-+ init_nx_info(&p->nx_info, current->nx_info);
+
-+ /* check vserver memory */
-+ if (p->mm && !(clone_flags & CLONE_VM)) {
-+ if (vx_vmpages_avail(p->mm, p->mm->total_vm))
-+ vx_pages_add(p->vx_info, RLIMIT_AS, p->mm->total_vm);
-+ else
-+ goto bad_fork_free;
-+ }
-+ if (p->mm && vx_flags(VXF_FORK_RSS, 0)) {
-+ if (!vx_rss_avail(p->mm, get_mm_counter(p->mm, file_rss)))
-+ goto bad_fork_cleanup_vm;
-+ }
++#define MAX_N_CONTEXT 65535 /* Arbitrary limit */
+
- retval = -EAGAIN;
-+ if (!vx_nproc_avail(1))
-+ goto bad_fork_cleanup_vm;
-+
- if (atomic_read(&p->user->processes) >=
- p->signal->rlim[RLIMIT_NPROC].rlim_cur) {
- if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) &&
- p->user != &root_user)
-- goto bad_fork_free;
-+ goto bad_fork_cleanup_vm;
- }
-
- atomic_inc(&p->user->__count);
-@@ -1256,6 +1288,18 @@ static struct task_struct *copy_process(
-
- total_forks++;
- spin_unlock(¤t->sighand->siglock);
+
-+ /* p is copy of current */
-+ vxi = p->vx_info;
-+ if (vxi) {
-+ claim_vx_info(vxi, p);
-+ atomic_inc(&vxi->cvirt.nr_threads);
-+ atomic_inc(&vxi->cvirt.total_forks);
-+ vx_nproc_inc(p);
-+ }
-+ nxi = p->nx_info;
-+ if (nxi)
-+ claim_nx_info(nxi, p);
- write_unlock_irq(&tasklist_lock);
- proc_fork_connector(p);
- return p;
-@@ -1297,6 +1341,9 @@ bad_fork_cleanup_count:
- put_group_info(p->group_info);
- atomic_dec(&p->user->processes);
- free_uid(p->user);
-+bad_fork_cleanup_vm:
-+ if (p->mm && !(clone_flags & CLONE_VM))
-+ vx_pages_sub(p->vx_info, RLIMIT_AS, p->mm->total_vm);
- bad_fork_free:
- free_task(p);
- fork_out:
-@@ -1357,6 +1404,19 @@ long do_fork(unsigned long clone_flags,
-
- if (!pid)
- return -EAGAIN;
-+
-+ /* kernel threads are host only */
-+ if ((clone_flags & CLONE_KTHREAD) && !vx_check(0, VS_ADMIN)) {
-+ vxwprintk(1, "xid=%d tried to spawn a kernel thread.",
-+ vx_current_xid());
-+ free_pid(pid);
-+ return -EPERM;
-+ }
++/* network flags */
+
-+ /* fake ipc/uts on namespace */
-+ if (clone_flags & CLONE_NEWNS)
-+ clone_flags |= CLONE_NEWUTS|CLONE_NEWIPC;
-+
- nr = pid->nr;
- if (unlikely(current->ptrace)) {
- trace = fork_traceflag (clone_flags);
-diff -NurpP --minimal linux-2.6.19.1/kernel/kthread.c linux-2.6.19.1-vs2.3.0.6/kernel/kthread.c
---- linux-2.6.19.1/kernel/kthread.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/kthread.c 2006-11-08 04:57:52 +0100
-@@ -123,7 +123,7 @@ static void keventd_create_kthread(void
- } else {
- wait_for_completion(&create->started);
- read_lock(&tasklist_lock);
-- create->result = find_task_by_pid(pid);
-+ create->result = find_task_by_real_pid(pid);
- read_unlock(&tasklist_lock);
- }
- complete(&create->done);
-diff -NurpP --minimal linux-2.6.19.1/kernel/nsproxy.c linux-2.6.19.1-vs2.3.0.6/kernel/nsproxy.c
---- linux-2.6.19.1/kernel/nsproxy.c 2006-11-30 21:19:43 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/nsproxy.c 2006-11-14 02:14:48 +0100
-@@ -22,11 +22,6 @@
-
- struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
-
--static inline void get_nsproxy(struct nsproxy *ns)
--{
-- atomic_inc(&ns->count);
--}
--
- void get_task_namespaces(struct task_struct *tsk)
- {
- struct nsproxy *ns = tsk->nsproxy;
-diff -NurpP --minimal linux-2.6.19.1/kernel/pid.c linux-2.6.19.1-vs2.3.0.6/kernel/pid.c
---- linux-2.6.19.1/kernel/pid.c 2006-11-30 21:19:43 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/pid.c 2006-12-04 01:47:02 +0100
-@@ -27,6 +27,7 @@
- #include <linux/bootmem.h>
- #include <linux/hash.h>
- #include <linux/pspace.h>
-+#include <linux/vs_pid.h>
-
- #define pid_hashfn(nr) hash_long((unsigned long)nr, pidhash_shift)
- static struct hlist_head *pid_hash;
-@@ -299,6 +300,10 @@ struct task_struct * fastcall pid_task(s
- */
- struct task_struct *find_task_by_pid_type(int type, int nr)
- {
-+ if (type == PIDTYPE_PID)
-+ nr = vx_rmap_pid(nr);
-+ else if (type == PIDTYPE_REALPID)
-+ type = PIDTYPE_PID;
- return pid_task(find_pid(nr), type);
- }
-
-diff -NurpP --minimal linux-2.6.19.1/kernel/posix-timers.c linux-2.6.19.1-vs2.3.0.6/kernel/posix-timers.c
---- linux-2.6.19.1/kernel/posix-timers.c 2006-11-30 21:19:43 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/posix-timers.c 2006-11-08 04:57:52 +0100
-@@ -48,6 +48,7 @@
- #include <linux/wait.h>
- #include <linux/workqueue.h>
- #include <linux/module.h>
-+#include <linux/vs_context.h>
-
- /*
- * Management arrays for POSIX timers. Timers are kept in slab memory
-@@ -298,6 +299,10 @@ void do_schedule_next_timer(struct sigin
-
- int posix_timer_event(struct k_itimer *timr,int si_private)
- {
-+ struct vx_info_save vxis;
-+ int ret;
++#define NXF_INFO_PRIVATE 0x00000008
+
-+ enter_vx_info(task_get_vx_info(timr->it_process), &vxis);
- memset(&timr->sigq->info, 0, sizeof(siginfo_t));
- timr->sigq->info.si_sys_private = si_private;
- /* Send signal to the process that owns this timer.*/
-@@ -310,11 +315,11 @@ int posix_timer_event(struct k_itimer *t
-
- if (timr->it_sigev_notify & SIGEV_THREAD_ID) {
- struct task_struct *leader;
-- int ret = send_sigqueue(timr->it_sigev_signo, timr->sigq,
-- timr->it_process);
-
-+ ret = send_sigqueue(timr->it_sigev_signo, timr->sigq,
-+ timr->it_process);
- if (likely(ret >= 0))
-- return ret;
-+ goto out;
-
- timr->it_sigev_notify = SIGEV_SIGNAL;
- leader = timr->it_process->group_leader;
-@@ -322,8 +327,12 @@ int posix_timer_event(struct k_itimer *t
- timr->it_process = leader;
- }
-
-- return send_group_sigqueue(timr->it_sigev_signo, timr->sigq,
-- timr->it_process);
-+ ret = send_group_sigqueue(timr->it_sigev_signo, timr->sigq,
-+ timr->it_process);
-+out:
-+ leave_vx_info(&vxis);
-+ put_vx_info(vxis.vxi);
-+ return ret;
- }
- EXPORT_SYMBOL_GPL(posix_timer_event);
-
-@@ -372,7 +381,7 @@ static struct task_struct * good_sigeven
- struct task_struct *rtn = current->group_leader;
-
- if ((event->sigev_notify & SIGEV_THREAD_ID ) &&
-- (!(rtn = find_task_by_pid(event->sigev_notify_thread_id)) ||
-+ (!(rtn = find_task_by_real_pid(event->sigev_notify_thread_id)) ||
- rtn->tgid != current->tgid ||
- (event->sigev_notify & ~SIGEV_THREAD_ID) != SIGEV_SIGNAL))
- return NULL;
-diff -NurpP --minimal linux-2.6.19.1/kernel/printk.c linux-2.6.19.1-vs2.3.0.6/kernel/printk.c
---- linux-2.6.19.1/kernel/printk.c 2006-11-30 21:19:44 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/printk.c 2006-11-30 19:14:49 +0100
-@@ -32,6 +32,7 @@
- #include <linux/bootmem.h>
- #include <linux/syscalls.h>
- #include <linux/jiffies.h>
-+#include <linux/vs_cvirt.h>
-
- #include <asm/uaccess.h>
-
-@@ -185,18 +186,13 @@ int do_syslog(int type, char __user *buf
- unsigned long i, j, limit, count;
- int do_clear = 0;
- char c;
-- int error = 0;
-+ int error;
-
- error = security_syslog(type);
- if (error)
- return error;
-
-- switch (type) {
-- case 0: /* Close log */
-- break;
-- case 1: /* Open log */
-- break;
-- case 2: /* Read from log */
-+ if ((type >= 2) && (type <= 4)) {
- error = -EINVAL;
- if (!buf || len < 0)
- goto out;
-@@ -207,6 +203,16 @@ int do_syslog(int type, char __user *buf
- error = -EFAULT;
- goto out;
- }
-+ }
-+ if (!vx_check(0, VS_ADMIN|VS_WATCH))
-+ return vx_do_syslog(type, buf, len);
++#define NXF_SINGLE_IP 0x00000100
++#define NXF_LBACK_REMAP 0x00000200
++#define NXF_LBACK_ALLOW 0x00000400
+
-+ switch (type) {
-+ case 0: /* Close log */
-+ break;
-+ case 1: /* Open log */
-+ break;
-+ case 2: /* Read from log */
- error = wait_event_interruptible(log_wait,
- (log_start - log_end));
- if (error)
-@@ -231,16 +237,6 @@ int do_syslog(int type, char __user *buf
- do_clear = 1;
- /* FALL THRU */
- case 3: /* Read last kernel messages */
-- error = -EINVAL;
-- if (!buf || len < 0)
-- goto out;
-- error = 0;
-- if (!len)
-- goto out;
-- if (!access_ok(VERIFY_WRITE, buf, len)) {
-- error = -EFAULT;
-- goto out;
-- }
- count = len;
- if (count > log_buf_len)
- count = log_buf_len;
-diff -NurpP --minimal linux-2.6.19.1/kernel/ptrace.c linux-2.6.19.1-vs2.3.0.6/kernel/ptrace.c
---- linux-2.6.19.1/kernel/ptrace.c 2006-11-30 21:19:44 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/ptrace.c 2006-11-30 19:38:18 +0100
-@@ -18,6 +18,7 @@
- #include <linux/ptrace.h>
- #include <linux/security.h>
- #include <linux/signal.h>
-+#include <linux/vs_context.h>
-
- #include <asm/pgtable.h>
- #include <asm/uaccess.h>
-@@ -144,6 +145,11 @@ static int may_attach(struct task_struct
- dumpable = task->mm->dumpable;
- if (!dumpable && !capable(CAP_SYS_PTRACE))
- return -EPERM;
-+ if (!vx_check(task->xid, VS_ADMIN_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(current, task);
- }
-@@ -468,6 +474,10 @@ asmlinkage long sys_ptrace(long request,
- goto out;
- }
-
-+ ret = -EPERM;
-+ if (!vx_check(vx_task_xid(child), VS_WATCH_P|VS_IDENT))
-+ goto out_put_task_struct;
-+
- if (request == PTRACE_ATTACH) {
- ret = ptrace_attach(child);
- goto out_put_task_struct;
-diff -NurpP --minimal linux-2.6.19.1/kernel/sched.c linux-2.6.19.1-vs2.3.0.6/kernel/sched.c
---- linux-2.6.19.1/kernel/sched.c 2006-11-30 21:19:44 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/sched.c 2006-11-30 18:53:18 +0100
-@@ -55,6 +55,8 @@
- #include <asm/tlb.h>
-
- #include <asm/unistd.h>
-+#include <linux/vs_sched.h>
-+#include <linux/vs_cvirt.h>
-
- /*
- * Convert user-nice values [ -20 ... 0 ... 19 ]
-@@ -243,6 +245,16 @@ struct rq {
- struct task_struct *migration_thread;
- struct list_head migration_queue;
- #endif
-+ unsigned long norm_time;
-+ unsigned long idle_time;
-+#ifdef CONFIG_VSERVER_IDLETIME
-+ int idle_skip;
++#define NXF_HIDE_NETIF 0x02000000
++#define NXF_HIDE_LBACK 0x04000000
++
++#define NXF_STATE_SETUP (1ULL << 32)
++#define NXF_STATE_ADMIN (1ULL << 34)
++
++#define NXF_SC_HELPER (1ULL << 36)
++#define NXF_PERSISTENT (1ULL << 38)
++
++#define NXF_ONE_TIME (0x0005ULL << 32)
++
++
++#define NXF_INIT_SET (__nxf_init_set())
++
++static inline uint64_t __nxf_init_set(void) {
++ return NXF_STATE_ADMIN
++#ifdef CONFIG_VSERVER_AUTO_LBACK
++ | NXF_LBACK_REMAP
++ | NXF_HIDE_LBACK
+#endif
-+#ifdef CONFIG_VSERVER_HARDCPU
-+ struct list_head hold_queue;
-+ unsigned long nr_onhold;
-+ int idle_tokens;
++#ifdef CONFIG_VSERVER_AUTO_SINGLE
++ | NXF_SINGLE_IP
+#endif
-
- #ifdef CONFIG_SCHEDSTATS
- /* latency stats */
-@@ -672,6 +684,7 @@ sched_info_switch(struct task_struct *pr
- */
- static void dequeue_task(struct task_struct *p, struct prio_array *array)
- {
-+ BUG_ON(p->state & TASK_ONHOLD);
- array->nr_active--;
- list_del(&p->run_list);
- if (list_empty(array->queue + p->prio))
-@@ -680,6 +693,7 @@ static void dequeue_task(struct task_str
-
- static void enqueue_task(struct task_struct *p, struct prio_array *array)
- {
-+ BUG_ON(p->state & TASK_ONHOLD);
- sched_info_queued(p);
- list_add_tail(&p->run_list, array->queue + p->prio);
- __set_bit(p->prio, array->bitmap);
-@@ -693,12 +707,14 @@ static void enqueue_task(struct task_str
- */
- static void requeue_task(struct task_struct *p, struct prio_array *array)
- {
-+ BUG_ON(p->state & TASK_ONHOLD);
- list_move_tail(&p->run_list, array->queue + p->prio);
- }
-
- static inline void
- enqueue_task_head(struct task_struct *p, struct prio_array *array)
- {
-+ BUG_ON(p->state & TASK_ONHOLD);
- list_add(&p->run_list, array->queue + p->prio);
- __set_bit(p->prio, array->bitmap);
- array->nr_active++;
-@@ -727,6 +743,10 @@ static inline int __normal_prio(struct t
- bonus = CURRENT_BONUS(p) - MAX_BONUS / 2;
-
- prio = p->static_prio - bonus;
-+
-+ /* adjust effective priority */
-+ prio = vx_adjust_prio(p, prio, MAX_USER_PRIO);
-+
- if (prio < MAX_RT_PRIO)
- prio = MAX_RT_PRIO;
- if (prio > MAX_PRIO-1)
-@@ -836,6 +856,9 @@ static int effective_prio(struct task_st
- return p->prio;
- }
-
-+#include "sched_mon.h"
++ | NXF_HIDE_NETIF;
++}
++
++
++/* network caps */
++
++#define NXC_TUN_CREATE 0x00000001
++
++#define NXC_RAW_ICMP 0x00000100
++
++#define NXC_MULTICAST 0x00001000
+
+
- /*
- * __activate_task - move a task to the runqueue.
- */
-@@ -845,6 +868,7 @@ static void __activate_task(struct task_
-
- if (batch_task(p))
- target = rq->expired;
-+ vxm_activate_task(p, rq);
- enqueue_task(p, target);
- inc_nr_running(p, rq);
- }
-@@ -854,6 +878,7 @@ static void __activate_task(struct task_
- */
- static inline void __activate_idle_task(struct task_struct *p, struct rq *rq)
- {
-+ vxm_activate_idle(p, rq);
- enqueue_task_head(p, rq->active);
- inc_nr_running(p, rq);
- }
-@@ -975,19 +1000,30 @@ static void activate_task(struct task_st
- }
- p->timestamp = now;
-
-+ vx_activate_task(p);
- __activate_task(p, rq);
- }
-
- /*
- * deactivate_task - remove a task from the runqueue.
- */
--static void deactivate_task(struct task_struct *p, struct rq *rq)
-+static void __deactivate_task(struct task_struct *p, struct rq *rq)
- {
- dec_nr_running(p, rq);
- dequeue_task(p, p->array);
-+ vxm_deactivate_task(p, rq);
- p->array = NULL;
- }
-
-+static inline
-+void deactivate_task(struct task_struct *p, struct rq *rq)
-+{
-+ vx_deactivate_task(p);
-+ __deactivate_task(p, rq);
-+}
++/* address types */
+
-+#include "sched_hard.h"
++#define NXA_TYPE_IPV4 0x0001
++#define NXA_TYPE_IPV6 0x0002
+
- /*
- * resched_task - mark a task 'to be rescheduled now'.
- *
-@@ -1063,6 +1099,7 @@ migrate_task(struct task_struct *p, int
- {
- struct rq *rq = task_rq(p);
-
-+ vxm_migrate_task(p, rq, dest_cpu);
- /*
- * If the task is not on a runqueue (and not running), then
- * it is sufficient to simply update the task's cpu field.
-@@ -1391,6 +1428,12 @@ static int try_to_wake_up(struct task_st
-
- rq = task_rq_lock(p, &flags);
- old_state = p->state;
++#define NXA_TYPE_NONE 0x0000
++#define NXA_TYPE_ANY 0x00FF
+
-+ /* we need to unhold suspended tasks */
-+ if (old_state & TASK_ONHOLD) {
-+ vx_unhold_task(p, rq);
-+ old_state = p->state;
-+ }
- if (!(old_state & state))
- goto out;
-
-@@ -1496,6 +1539,7 @@ out_activate:
- #endif /* CONFIG_SMP */
- if (old_state == TASK_UNINTERRUPTIBLE) {
- rq->nr_uninterruptible--;
-+ vx_uninterruptible_dec(p);
- /*
- * Tasks on involuntary sleep don't earn
- * sleep_avg beyond just interactive state.
-@@ -1642,6 +1686,7 @@ void fastcall wake_up_new_task(struct ta
-
- p->prio = effective_prio(p);
-
-+ vx_activate_task(p);
- if (likely(cpu == this_cpu)) {
- if (!(clone_flags & CLONE_VM)) {
- /*
-@@ -1653,6 +1698,7 @@ void fastcall wake_up_new_task(struct ta
- __activate_task(p, rq);
- else {
- p->prio = current->prio;
-+ BUG_ON(p->state & TASK_ONHOLD);
- p->normal_prio = current->normal_prio;
- list_add_tail(&p->run_list, ¤t->run_list);
- p->array = current->array;
-@@ -2973,13 +3019,16 @@ static inline int expired_starving(struc
- void account_user_time(struct task_struct *p, cputime_t cputime)
- {
- 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);
-
- p->utime = cputime_add(p->utime, cputime);
-+ vx_account_user(vxi, cputime, nice);
-
- /* 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);
-@@ -2995,10 +3044,12 @@ void account_system_time(struct task_str
- cputime_t cputime)
- {
- struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
-+ struct vx_info *vxi = p->vx_info; /* p is _always_ current */
- struct rq *rq = this_rq();
- cputime64_t tmp;
-
- p->stime = cputime_add(p->stime, cputime);
-+ vx_account_system(vxi, cputime, (p == rq->idle));
-
- /* Add system time to cpustat. */
- tmp = cputime_to_cputime64(cputime);
-@@ -3052,12 +3103,14 @@ void scheduler_tick(void)
- struct rq *rq = cpu_rq(cpu);
-
- update_cpu_clock(p, rq, now);
-+ vxm_sync(now, cpu);
-
- rq->timestamp_last_tick = now;
-
- if (p == rq->idle) {
- if (wake_priority_sleeper(rq))
- goto out;
-+ vx_idle_resched(rq);
- rebalance_tick(cpu, rq, SCHED_IDLE);
- return;
- }
-@@ -3090,7 +3143,7 @@ void scheduler_tick(void)
- }
- goto out_unlock;
- }
-- if (!--p->time_slice) {
-+ if (vx_need_resched(p, --p->time_slice, cpu)) {
- dequeue_task(p, rq->active);
- set_tsk_need_resched(p);
- p->prio = effective_prio(p);
-@@ -3377,14 +3430,25 @@ need_resched_nonpreemptible:
- unlikely(signal_pending(prev))))
- prev->state = TASK_RUNNING;
- else {
-- if (prev->state == TASK_UNINTERRUPTIBLE)
-+ if (prev->state == TASK_UNINTERRUPTIBLE) {
- rq->nr_uninterruptible++;
-+ vx_uninterruptible_inc(prev);
-+ }
- deactivate_task(prev, rq);
- }
- }
-
- cpu = smp_processor_id();
-+ vx_set_rq_time(rq, jiffies);
-+try_unhold:
-+ vx_try_unhold(rq, cpu);
-+pick_next:
-+
- if (unlikely(!rq->nr_running)) {
-+ /* can we skip idle time? */
-+ if (vx_try_skip(rq, cpu))
-+ goto try_unhold;
-+
- idle_balance(cpu, rq);
- if (!rq->nr_running) {
- next = rq->idle;
-@@ -3411,6 +3475,10 @@ need_resched_nonpreemptible:
- queue = array->queue + idx;
- next = list_entry(queue->next, struct task_struct, run_list);
-
-+ /* check before we schedule this context */
-+ if (!vx_schedule(next, rq, cpu))
-+ goto pick_next;
-+
- if (!rt_task(next) && interactive_sleep(next->sleep_type)) {
- unsigned long long delta = now - next->timestamp;
- if (unlikely((long long)(now - next->timestamp) < 0))
-@@ -4013,7 +4081,7 @@ asmlinkage long sys_nice(int increment)
- nice = 19;
-
- if (increment < 0 && !can_nice(current, nice))
-- return -EPERM;
-+ return vx_flags(VXF_IGNEG_NICE, 0) ? 0 : -EPERM;
-
- retval = security_task_setnice(current, nice);
- if (retval)
-@@ -4186,6 +4254,7 @@ recheck:
- oldprio = p->prio;
- __setscheduler(p, policy, param->sched_priority);
- if (array) {
-+ vx_activate_task(p);
- __activate_task(p, rq);
- /*
- * Reschedule if we are currently running on this runqueue and
-@@ -4976,6 +5045,7 @@ static int __migrate_task(struct task_st
- p->timestamp = p->timestamp - rq_src->timestamp_last_tick
- + rq_dest->timestamp_last_tick;
- deactivate_task(p, rq_src);
-+ vx_activate_task(p);
- __activate_task(p, rq_dest);
- if (TASK_PREEMPTS_CURR(p, rq_dest))
- resched_task(rq_dest->curr);
-@@ -6819,7 +6889,10 @@ void __init sched_init(void)
- INIT_LIST_HEAD(&rq->migration_queue);
- #endif
- atomic_set(&rq->nr_iowait, 0);
--
-+#ifdef CONFIG_VSERVER_HARDCPU
-+ INIT_LIST_HEAD(&rq->hold_queue);
-+ rq->nr_onhold = 0;
-+#endif
- for (j = 0; j < 2; j++) {
- array = rq->arrays + j;
- for (k = 0; k < MAX_PRIO; k++) {
-@@ -6895,6 +6968,7 @@ void normalize_rt_tasks(void)
- deactivate_task(p, task_rq(p));
- __setscheduler(p, SCHED_NORMAL, 0);
- if (array) {
-+ vx_activate_task(p);
- __activate_task(p, task_rq(p));
- resched_task(rq->curr);
- }
-diff -NurpP --minimal linux-2.6.19.1/kernel/sched_hard.h linux-2.6.19.1-vs2.3.0.6/kernel/sched_hard.h
---- linux-2.6.19.1/kernel/sched_hard.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/sched_hard.h 2006-11-30 18:53:18 +0100
-@@ -0,0 +1,324 @@
++#define NXA_TYPE_ADDR 0x0010
++#define NXA_TYPE_MASK 0x0020
++#define NXA_TYPE_RANGE 0x0040
+
-+#ifdef CONFIG_VSERVER_IDLELIMIT
++#define NXA_MASK_ALL (NXA_TYPE_ADDR | NXA_TYPE_MASK | NXA_TYPE_RANGE)
+
-+/*
-+ * vx_idle_resched - reschedule after maxidle
-+ */
-+static inline
-+void vx_idle_resched(struct rq *rq)
-+{
-+ /* maybe have a better criterion for paused */
-+ if (!--rq->idle_tokens && !list_empty(&rq->hold_queue))
-+ set_need_resched();
-+}
++#define NXA_MOD_BCAST 0x0100
++#define NXA_MOD_LBACK 0x0200
+
-+#else /* !CONFIG_VSERVER_IDLELIMIT */
++#define NXA_LOOPBACK 0x1000
+
-+#define vx_idle_resched(rq)
++#define NXA_MASK_BIND (NXA_MASK_ALL | NXA_MOD_BCAST | NXA_MOD_LBACK)
++#define NXA_MASK_SHOW (NXA_MASK_ALL | NXA_LOOPBACK)
+
-+#endif /* CONFIG_VSERVER_IDLELIMIT */
++#endif /* _UAPI_VS_NETWORK_H */
+diff -urNp -x '*.orig' linux-4.9/include/uapi/vserver/network_cmd.h linux-4.9/include/uapi/vserver/network_cmd.h
+--- linux-4.9/include/uapi/vserver/network_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/uapi/vserver/network_cmd.h 2021-02-24 15:47:45.104409971 +0100
+@@ -0,0 +1,123 @@
++#ifndef _UAPI_VS_NETWORK_CMD_H
++#define _UAPI_VS_NETWORK_CMD_H
+
+
++/* vinfo commands */
+
-+#ifdef CONFIG_VSERVER_IDLETIME
++#define VCMD_task_nid VC_CMD(VINFO, 2, 0)
+
-+#define vx_set_rq_min_skip(rq, min) \
-+ (rq)->idle_skip = (min)
+
-+#define vx_save_min_skip(ret, min, val) \
-+ __vx_save_min_skip(ret, min, val)
++#define VCMD_nx_info VC_CMD(VINFO, 6, 0)
+
-+static inline
-+void __vx_save_min_skip(int ret, int *min, int val)
-+{
-+ if (ret > -2)
-+ return;
-+ if ((*min > val) || !*min)
-+ *min = val;
-+}
++struct vcmd_nx_info_v0 {
++ uint32_t nid;
++ /* more to come */
++};
+
-+static inline
-+int vx_try_skip(struct rq *rq, int cpu)
-+{
-+ /* artificially advance time */
-+ if (rq->idle_skip > 0) {
-+ vxdprintk(list_empty(&rq->hold_queue),
-+ "hold queue empty on cpu %d", cpu);
-+ rq->idle_time += rq->idle_skip;
-+ vxm_idle_skip(rq, cpu);
-+ return 1;
-+ }
-+ return 0;
-+}
+
-+#else /* !CONFIG_VSERVER_IDLETIME */
++#include <linux/in.h>
++#include <linux/in6.h>
+
-+#define vx_set_rq_min_skip(rq, min) \
-+ ({ int dummy = (min); dummy; })
++#define VCMD_net_create_v0 VC_CMD(VNET, 1, 0)
++#define VCMD_net_create VC_CMD(VNET, 1, 1)
+
-+#define vx_save_min_skip(ret, min, val)
++struct vcmd_net_create {
++ uint64_t flagword;
++};
+
-+static inline
-+int vx_try_skip(struct rq *rq, int cpu)
-+{
-+ return 0;
-+}
++#define VCMD_net_migrate VC_CMD(NETMIG, 1, 0)
+
-+#endif /* CONFIG_VSERVER_IDLETIME */
++#define VCMD_net_add VC_CMD(NETALT, 1, 0)
++#define VCMD_net_remove VC_CMD(NETALT, 2, 0)
+
++struct vcmd_net_addr_v0 {
++ uint16_t type;
++ uint16_t count;
++ struct in_addr ip[4];
++ struct in_addr mask[4];
++};
+
++#define VCMD_net_add_ipv4_v1 VC_CMD(NETALT, 1, 1)
++#define VCMD_net_rem_ipv4_v1 VC_CMD(NETALT, 2, 1)
+
-+#ifdef CONFIG_VSERVER_HARDCPU
++struct vcmd_net_addr_ipv4_v1 {
++ uint16_t type;
++ uint16_t flags;
++ struct in_addr ip;
++ struct in_addr mask;
++};
+
-+#define vx_set_rq_max_idle(rq, max) \
-+ (rq)->idle_tokens = (max)
++#define VCMD_net_add_ipv4 VC_CMD(NETALT, 1, 2)
++#define VCMD_net_rem_ipv4 VC_CMD(NETALT, 2, 2)
+
-+#define vx_save_max_idle(ret, min, val) \
-+ __vx_save_max_idle(ret, min, val)
++struct vcmd_net_addr_ipv4_v2 {
++ uint16_t type;
++ uint16_t flags;
++ struct in_addr ip;
++ struct in_addr ip2;
++ struct in_addr mask;
++};
+
-+static inline
-+void __vx_save_max_idle(int ret, int *min, int val)
-+{
-+ if (*min > val)
-+ *min = val;
-+}
++#define VCMD_net_add_ipv6 VC_CMD(NETALT, 3, 1)
++#define VCMD_net_remove_ipv6 VC_CMD(NETALT, 4, 1)
+
++struct vcmd_net_addr_ipv6_v1 {
++ uint16_t type;
++ uint16_t flags;
++ uint32_t prefix;
++ struct in6_addr ip;
++ struct in6_addr mask;
++};
+
-+/*
-+ * vx_hold_task - put a task on the hold queue
-+ */
-+static inline
-+void vx_hold_task(struct task_struct *p, struct rq *rq)
-+{
-+ __deactivate_task(p, rq);
-+ p->state |= TASK_ONHOLD;
-+ /* a new one on hold */
-+ rq->nr_onhold++;
-+ vxm_hold_task(p, rq);
-+ list_add_tail(&p->run_list, &rq->hold_queue);
-+}
++#define VCMD_add_match_ipv4 VC_CMD(NETALT, 5, 0)
++#define VCMD_get_match_ipv4 VC_CMD(NETALT, 6, 0)
+
-+/*
-+ * vx_unhold_task - put a task back to the runqueue
-+ */
-+static inline
-+void vx_unhold_task(struct task_struct *p, struct rq *rq)
-+{
-+ list_del(&p->run_list);
-+ /* one less waiting */
-+ rq->nr_onhold--;
-+ p->state &= ~TASK_ONHOLD;
-+ enqueue_task(p, rq->expired);
-+ inc_nr_running(p, rq);
-+ vxm_unhold_task(p, rq);
++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;
++};
+
-+ if (p->static_prio < rq->best_expired_prio)
-+ rq->best_expired_prio = p->static_prio;
-+}
++#define VCMD_add_match_ipv6 VC_CMD(NETALT, 7, 0)
++#define VCMD_get_match_ipv6 VC_CMD(NETALT, 8, 0)
+
-+unsigned long nr_onhold(void)
-+{
-+ unsigned long i, sum = 0;
++struct vcmd_match_ipv6_v0 {
++ uint16_t type;
++ uint16_t flags;
++ uint16_t parent;
++ uint16_t prefix;
++ struct in6_addr ip;
++ struct in6_addr ip2;
++ struct in6_addr mask;
++};
+
-+ for_each_online_cpu(i)
-+ sum += cpu_rq(i)->nr_onhold;
+
-+ return sum;
-+}
+
+
++/* flag commands */
+
-+static inline
-+int __vx_tokens_avail(struct _vx_sched_pc *sched_pc)
-+{
-+ return sched_pc->tokens;
-+}
++#define VCMD_get_nflags VC_CMD(FLAGS, 5, 0)
++#define VCMD_set_nflags VC_CMD(FLAGS, 6, 0)
+
-+static inline
-+void __vx_consume_token(struct _vx_sched_pc *sched_pc)
-+{
-+ sched_pc->tokens--;
-+}
++struct vcmd_net_flags_v0 {
++ uint64_t flagword;
++ uint64_t mask;
++};
+
-+static inline
-+int vx_need_resched(struct task_struct *p, int slice, int cpu)
-+{
-+ struct vx_info *vxi = p->vx_info;
+
-+ if (vx_info_flags(vxi, VXF_SCHED_HARD|VXF_SCHED_PRIO, 0)) {
-+ struct _vx_sched_pc *sched_pc =
-+ &vx_per_cpu(vxi, sched_pc, cpu);
-+ int tokens;
+
-+ /* maybe we can simplify that to decrement
-+ the token counter unconditional? */
++/* network caps commands */
+
-+ if ((tokens = __vx_tokens_avail(sched_pc)) > 0)
-+ __vx_consume_token(sched_pc);
++#define VCMD_get_ncaps VC_CMD(FLAGS, 7, 0)
++#define VCMD_set_ncaps VC_CMD(FLAGS, 8, 0)
+
-+ /* for tokens > 0, one token was consumed */
-+ if (tokens < 2)
-+ slice = 0;
-+ }
-+ vxm_need_resched(p, slice, cpu);
-+ return (slice == 0);
-+}
++struct vcmd_net_caps_v0 {
++ uint64_t ncaps;
++ uint64_t cmask;
++};
++
++#endif /* _UAPI_VS_NETWORK_CMD_H */
+diff -urNp -x '*.orig' linux-4.9/include/uapi/vserver/sched_cmd.h linux-4.9/include/uapi/vserver/sched_cmd.h
+--- linux-4.9/include/uapi/vserver/sched_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/uapi/vserver/sched_cmd.h 2021-02-24 15:47:45.104409971 +0100
+@@ -0,0 +1,13 @@
++#ifndef _UAPI_VS_SCHED_CMD_H
++#define _UAPI_VS_SCHED_CMD_H
++
++
++struct vcmd_prio_bias {
++ int32_t cpu_id;
++ int32_t prio_bias;
++};
+
++#define VCMD_set_prio_bias VC_CMD(SCHED, 4, 0)
++#define VCMD_get_prio_bias VC_CMD(SCHED, 5, 0)
+
-+#define vx_set_rq_time(rq, time) do { \
-+ rq->norm_time = time; \
-+} while (0)
++#endif /* _UAPI_VS_SCHED_CMD_H */
+diff -urNp -x '*.orig' linux-4.9/include/uapi/vserver/signal_cmd.h linux-4.9/include/uapi/vserver/signal_cmd.h
+--- linux-4.9/include/uapi/vserver/signal_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/uapi/vserver/signal_cmd.h 2021-02-24 15:47:45.107743409 +0100
+@@ -0,0 +1,31 @@
++#ifndef _UAPI_VS_SIGNAL_CMD_H
++#define _UAPI_VS_SIGNAL_CMD_H
+
+
-+static inline
-+void vx_try_unhold(struct rq *rq, int cpu)
-+{
-+ struct vx_info *vxi = NULL;
-+ struct list_head *l, *n;
-+ int maxidle = HZ;
-+ int minskip = 0;
++/* signalling vserver commands */
+
-+ /* nothing to do? what about pause? */
-+ if (list_empty(&rq->hold_queue))
-+ return;
++#define VCMD_ctx_kill VC_CMD(PROCTRL, 1, 0)
++#define VCMD_wait_exit VC_CMD(EVENT, 99, 0)
+
-+ list_for_each_safe(l, n, &rq->hold_queue) {
-+ int ret, delta_min[2];
-+ struct _vx_sched_pc *sched_pc;
-+ struct task_struct *p;
++struct vcmd_ctx_kill_v0 {
++ int32_t pid;
++ int32_t sig;
++};
+
-+ p = list_entry(l, struct task_struct, run_list);
-+ /* don't bother with same context */
-+ if (vxi == p->vx_info)
-+ continue;
++struct vcmd_wait_exit_v0 {
++ int32_t reboot_cmd;
++ int32_t exit_code;
++};
+
-+ vxi = p->vx_info;
-+ /* ignore paused contexts */
-+ if (vx_info_flags(vxi, VXF_SCHED_PAUSE, 0))
-+ continue;
+
-+ sched_pc = &vx_per_cpu(vxi, sched_pc, cpu);
++/* process alteration commands */
+
-+ /* recalc tokens */
-+ vxm_sched_info(sched_pc, vxi, cpu);
-+ ret = vx_tokens_recalc(sched_pc,
-+ &rq->norm_time, &rq->idle_time, delta_min);
-+ vxm_tokens_recalc(sched_pc, rq, vxi, cpu);
++#define VCMD_get_pflags VC_CMD(PROCALT, 5, 0)
++#define VCMD_set_pflags VC_CMD(PROCALT, 6, 0)
+
-+ if (ret > 0) {
-+ /* we found a runable context */
-+ vx_unhold_task(p, rq);
-+ break;
-+ }
-+ vx_save_max_idle(ret, &maxidle, delta_min[0]);
-+ vx_save_min_skip(ret, &minskip, delta_min[1]);
-+ }
-+ vx_set_rq_max_idle(rq, maxidle);
-+ vx_set_rq_min_skip(rq, minskip);
-+ vxm_rq_max_min(rq, cpu);
-+}
++struct vcmd_pflags_v0 {
++ uint32_t flagword;
++ uint32_t mask;
++};
+
++#endif /* _UAPI_VS_SIGNAL_CMD_H */
+diff -urNp -x '*.orig' linux-4.9/include/uapi/vserver/space_cmd.h linux-4.9/include/uapi/vserver/space_cmd.h
+--- linux-4.9/include/uapi/vserver/space_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/uapi/vserver/space_cmd.h 2021-02-24 15:47:45.107743409 +0100
+@@ -0,0 +1,28 @@
++#ifndef _UAPI_VS_SPACE_CMD_H
++#define _UAPI_VS_SPACE_CMD_H
+
-+static inline
-+int vx_schedule(struct task_struct *next, struct rq *rq, int cpu)
-+{
-+ struct vx_info *vxi = next->vx_info;
-+ struct _vx_sched_pc *sched_pc;
-+ int delta_min[2];
-+ int flags, ret;
+
-+ if (!vxi)
-+ return 1;
++#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)
+
-+ flags = vxi->vx_flags;
++#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)
+
-+ if (unlikely(vs_check_flags(flags , VXF_SCHED_PAUSE, 0)))
-+ goto put_on_hold;
-+ if (!vs_check_flags(flags , VXF_SCHED_HARD|VXF_SCHED_PRIO, 0))
-+ return 1;
++#define VCMD_get_space_mask_v0 VC_CMD(PROCALT, 4, 0)
+
-+ sched_pc = &vx_per_cpu(vxi, sched_pc, cpu);
-+#ifdef CONFIG_SMP
-+ /* update scheduler params */
-+ if (cpu_isset(cpu, vxi->sched.update)) {
-+ vx_update_sched_param(&vxi->sched, sched_pc);
-+ vxm_update_sched(sched_pc, vxi, cpu);
-+ cpu_clear(cpu, vxi->sched.update);
-+ }
-+#endif
-+ vxm_sched_info(sched_pc, vxi, cpu);
-+ ret = vx_tokens_recalc(sched_pc,
-+ &rq->norm_time, &rq->idle_time, delta_min);
-+ vxm_tokens_recalc(sched_pc, rq, vxi, cpu);
++#define VCMD_get_space_mask VC_CMD(VSPACE, 0, 1)
++#define VCMD_get_space_default VC_CMD(VSPACE, 1, 0)
+
-+ if (!vs_check_flags(flags , VXF_SCHED_HARD, 0))
-+ return 1;
+
-+ if (unlikely(ret < 0)) {
-+ vx_save_max_idle(ret, &rq->idle_tokens, delta_min[0]);
-+ vx_save_min_skip(ret, &rq->idle_skip, delta_min[1]);
-+ vxm_rq_max_min(rq, cpu);
-+ put_on_hold:
-+ vx_hold_task(next, rq);
-+ return 0;
-+ }
-+ return 1;
-+}
++struct vcmd_space_mask_v1 {
++ uint64_t mask;
++};
+
++struct vcmd_space_mask_v2 {
++ uint64_t mask;
++ uint32_t index;
++};
+
-+#else /* CONFIG_VSERVER_HARDCPU */
++#endif /* _UAPI_VS_SPACE_CMD_H */
+diff -urNp -x '*.orig' linux-4.9/include/uapi/vserver/switch.h linux-4.9/include/uapi/vserver/switch.h
+--- linux-4.9/include/uapi/vserver/switch.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/uapi/vserver/switch.h 2021-02-24 15:47:45.107743409 +0100
+@@ -0,0 +1,90 @@
++#ifndef _UAPI_VS_SWITCH_H
++#define _UAPI_VS_SWITCH_H
+
-+static inline
-+void vx_hold_task(struct task_struct *p, struct rq *rq)
-+{
-+ return;
-+}
++#include <linux/types.h>
+
-+static inline
-+void vx_unhold_task(struct task_struct *p, struct rq *rq)
-+{
-+ return;
-+}
+
-+unsigned long nr_onhold(void)
-+{
-+ return 0;
-+}
++#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))
+
-+static inline
-+int vx_need_resched(struct task_struct *p, int slice, int cpu)
-+{
-+ return (slice == 0);
-+}
++/*
+
++ Syscall Matrix V2.8
+
-+#define vx_set_rq_time(rq, time)
++ |VERSION|CREATE |MODIFY |MIGRATE|CONTROL|EXPERIM| |SPECIAL|SPECIAL|
++ |STATS |DESTROY|ALTER |CHANGE |LIMIT |TEST | | | |
++ |INFO |SETUP | |MOVE | | | | | |
++ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
++ SYSTEM |VERSION|VSETUP |VHOST | | | | |DEVICE | |
++ HOST | 00| 01| 02| 03| 04| 05| | 06| 07|
++ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
++ CPU | |VPROC |PROCALT|PROCMIG|PROCTRL| | |SCHED. | |
++ PROCESS| 08| 09| 10| 11| 12| 13| | 14| 15|
++ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
++ MEMORY | | | | |MEMCTRL| | |SWAP | |
++ | 16| 17| 18| 19| 20| 21| | 22| 23|
++ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
++ NETWORK| |VNET |NETALT |NETMIG |NETCTL | | |SERIAL | |
++ | 24| 25| 26| 27| 28| 29| | 30| 31|
++ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
++ DISK | | | |TAGMIG |DLIMIT | | |INODE | |
++ VFS | 32| 33| 34| 35| 36| 37| | 38| 39|
++ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
++ OTHER |VSTAT | | | | | | |VINFO | |
++ | 40| 41| 42| 43| 44| 45| | 46| 47|
++ =======+=======+=======+=======+=======+=======+=======+ +=======+=======+
++ SPECIAL|EVENT | | | |FLAGS | | |VSPACE | |
++ | 48| 49| 50| 51| 52| 53| | 54| 55|
++ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
++ SPECIAL|DEBUG | | | |RLIMIT |SYSCALL| | |COMPAT |
++ | 56| 57| 58| 59| 60|TEST 61| | 62| 63|
++ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
+
-+static inline
-+void vx_try_unhold(struct rq *rq, int cpu)
-+{
-+ return;
-+}
++*/
+
-+static inline
-+int vx_schedule(struct task_struct *next, struct rq *rq, int cpu)
-+{
-+ struct vx_info *vxi = next->vx_info;
-+ struct _vx_sched_pc *sched_pc;
-+ int delta_min[2];
-+ int ret;
++#define VC_CAT_VERSION 0
+
-+ if (!vx_info_flags(vxi, VXF_SCHED_PRIO, 0))
-+ return 1;
++#define VC_CAT_VSETUP 1
++#define VC_CAT_VHOST 2
+
-+ sched_pc = &vx_per_cpu(vxi, sched_pc, cpu);
-+ vxm_sched_info(sched_pc, vxi, cpu);
-+ ret = vx_tokens_recalc(sched_pc,
-+ &rq->norm_time, &rq->idle_time, delta_min);
-+ vxm_tokens_recalc(sched_pc, rq, vxi, cpu);
-+ return 1;
-+}
++#define VC_CAT_DEVICE 6
+
-+#endif /* CONFIG_VSERVER_HARDCPU */
++#define VC_CAT_VPROC 9
++#define VC_CAT_PROCALT 10
++#define VC_CAT_PROCMIG 11
++#define VC_CAT_PROCTRL 12
+
-diff -NurpP --minimal linux-2.6.19.1/kernel/sched_mon.h linux-2.6.19.1-vs2.3.0.6/kernel/sched_mon.h
---- linux-2.6.19.1/kernel/sched_mon.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/sched_mon.h 2006-11-08 04:57:48 +0100
-@@ -0,0 +1,200 @@
++#define VC_CAT_SCHED 14
++#define VC_CAT_MEMCTRL 20
+
-+#include <linux/vserver/monitor.h>
++#define VC_CAT_VNET 25
++#define VC_CAT_NETALT 26
++#define VC_CAT_NETMIG 27
++#define VC_CAT_NETCTRL 28
+
-+#ifdef CONFIG_VSERVER_MONITOR
++#define VC_CAT_TAGMIG 35
++#define VC_CAT_DLIMIT 36
++#define VC_CAT_INODE 38
+
-+#ifdef CONFIG_VSERVER_HARDCPU
-+#define HARDCPU(x) (x)
-+#else
-+#define HARDCPU(x) (0)
-+#endif
++#define VC_CAT_VSTAT 40
++#define VC_CAT_VINFO 46
++#define VC_CAT_EVENT 48
+
-+#ifdef CONFIG_VSERVER_IDLETIME
-+#define IDLETIME(x) (x)
-+#else
-+#define IDLETIME(x) (0)
-+#endif
++#define VC_CAT_FLAGS 52
++#define VC_CAT_VSPACE 54
++#define VC_CAT_DEBUG 56
++#define VC_CAT_RLIMIT 60
+
-+struct _vx_mon_entry *vxm_advance(int cpu);
++#define VC_CAT_SYSTEST 61
++#define VC_CAT_COMPAT 63
+
++/* query version */
+
-+static inline
-+void __vxm_basic(struct _vx_mon_entry *entry, xid_t xid, int type)
-+{
-+ entry->type = type;
-+ entry->xid = xid;
-+}
++#define VCMD_get_version VC_CMD(VERSION, 0, 0)
++#define VCMD_get_vci VC_CMD(VERSION, 1, 0)
+
-+static inline
-+void __vxm_sync(int cpu)
-+{
-+ struct _vx_mon_entry *entry = vxm_advance(cpu);
++#endif /* _UAPI_VS_SWITCH_H */
+diff -urNp -x '*.orig' linux-4.9/include/uapi/vserver/tag_cmd.h linux-4.9/include/uapi/vserver/tag_cmd.h
+--- linux-4.9/include/uapi/vserver/tag_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/include/uapi/vserver/tag_cmd.h 2021-02-24 15:47:45.107743409 +0100
+@@ -0,0 +1,14 @@
++#ifndef _UAPI_VS_TAG_CMD_H
++#define _UAPI_VS_TAG_CMD_H
+
-+ __vxm_basic(entry, 0, VXM_SYNC);
-+ entry->ev.sec = xtime.tv_sec;
-+ entry->ev.nsec = xtime.tv_nsec;
-+}
+
-+static inline
-+void __vxm_task(struct task_struct *p, int type)
-+{
-+ struct _vx_mon_entry *entry = vxm_advance(task_cpu(p));
++/* vinfo commands */
+
-+ __vxm_basic(entry, p->xid, type);
-+ entry->ev.tsk.pid = p->pid;
-+ entry->ev.tsk.state = p->state;
-+}
++#define VCMD_task_tag VC_CMD(VINFO, 3, 0)
+
-+static inline
-+void __vxm_sched(struct _vx_sched_pc *s, struct vx_info *vxi, int cpu)
-+{
-+ struct _vx_mon_entry *entry = vxm_advance(cpu);
+
-+ __vxm_basic(entry, vxi->vx_id, (VXM_SCHED | s->flags));
-+ entry->sd.tokens = s->tokens;
-+ entry->sd.norm_time = s->norm_time;
-+ entry->sd.idle_time = s->idle_time;
-+}
++/* context commands */
+
-+static inline
-+void __vxm_rqinfo1(struct rq *q, int cpu)
-+{
-+ struct _vx_mon_entry *entry = vxm_advance(cpu);
++#define VCMD_tag_migrate VC_CMD(TAGMIG, 1, 0)
+
-+ entry->type = VXM_RQINFO_1;
-+ entry->xid = ((unsigned long)q >> 16) & 0xffff;
-+ entry->q1.running = q->nr_running;
-+ entry->q1.onhold = HARDCPU(q->nr_onhold);
-+ entry->q1.iowait = atomic_read(&q->nr_iowait);
-+ entry->q1.uintr = q->nr_uninterruptible;
-+ entry->q1.idle_tokens = IDLETIME(q->idle_tokens);
-+}
++#endif /* _UAPI_VS_TAG_CMD_H */
+diff -urNp -x '*.orig' linux-4.9/init/Kconfig linux-4.9/init/Kconfig
+--- linux-4.9/init/Kconfig 2021-02-24 15:47:32.454014219 +0100
++++ linux-4.9/init/Kconfig 2021-02-24 15:47:45.107743409 +0100
+@@ -959,6 +959,7 @@ config NUMA_BALANCING_DEFAULT_ENABLED
+ menuconfig CGROUPS
+ bool "Control Group support"
+ select KERNFS
++ default y
+ help
+ This option adds support for grouping sets of processes together, for
+ use with process control subsystems such as Cpusets, CFS, memory
+diff -urNp -x '*.orig' linux-4.9/init/main.c linux-4.9/init/main.c
+--- linux-4.9/init/main.c 2021-02-24 15:47:32.454014219 +0100
++++ linux-4.9/init/main.c 2021-02-24 15:47:45.107743409 +0100
+@@ -82,6 +82,7 @@
+ #include <linux/io.h>
+ #include <linux/kaiser.h>
+ #include <linux/cache.h>
++#include <linux/vserver/percpu.h>
+
+ #include <asm/io.h>
+ #include <asm/bugs.h>
+diff -urNp -x '*.orig' linux-4.9/ipc/mqueue.c linux-4.9/ipc/mqueue.c
+--- linux-4.9/ipc/mqueue.c 2021-02-24 15:47:32.454014219 +0100
++++ linux-4.9/ipc/mqueue.c 2021-02-24 15:47:45.107743409 +0100
+@@ -35,6 +35,8 @@
+ #include <linux/ipc_namespace.h>
+ #include <linux/user_namespace.h>
+ #include <linux/slab.h>
++#include <linux/vs_context.h>
++#include <linux/vs_limit.h>
+
+ #include <net/sock.h>
+ #include "util.h"
+@@ -75,6 +77,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;
+
+@@ -230,6 +233,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;
+@@ -243,6 +247,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));
+@@ -276,17 +281,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 */
+@@ -393,6 +401,7 @@ static void mqueue_evict_inode(struct in
+
+ user = info->user;
+ if (user) {
++ struct vx_info *vxi = info->vxi;
+ unsigned long mq_bytes, mq_treesize;
+
+ /* Total amount of bytes accounted for the mqueue */
+@@ -405,6 +414,7 @@ static void mqueue_evict_inode(struct in
+
+ spin_lock(&mq_lock);
+ user->mq_bytes -= mq_bytes;
++ vx_ipcmsg_sub(vxi, user, mq_bytes);
+ /*
+ * get_ns_from_inode() ensures that the
+ * (ipc_ns = sb->s_fs_info) is either a valid ipc_ns
+@@ -414,6 +424,7 @@ static void mqueue_evict_inode(struct in
+ if (ipc_ns)
+ ipc_ns->mq_queues_count--;
+ spin_unlock(&mq_lock);
++ put_vx_info(vxi);
+ free_uid(user);
+ }
+ if (ipc_ns)
+diff -urNp -x '*.orig' linux-4.9/ipc/msg.c linux-4.9/ipc/msg.c
+--- linux-4.9/ipc/msg.c 2021-02-24 15:47:32.454014219 +0100
++++ linux-4.9/ipc/msg.c 2021-02-24 15:47:45.107743409 +0100
+@@ -37,6 +37,7 @@
+ #include <linux/rwsem.h>
+ #include <linux/nsproxy.h>
+ #include <linux/ipc_namespace.h>
++#include <linux/vs_base.h>
+
+ #include <asm/current.h>
+ #include <linux/uaccess.h>
+@@ -124,6 +125,7 @@ static int newque(struct ipc_namespace *
+
+ msq->q_perm.mode = msgflg & S_IRWXUGO;
+ msq->q_perm.key = key;
++ msq->q_perm.xid = vx_current_xid();
+
+ msq->q_perm.security = NULL;
+ retval = security_msg_queue_alloc(msq);
+diff -urNp -x '*.orig' linux-4.9/ipc/namespace.c linux-4.9/ipc/namespace.c
+--- linux-4.9/ipc/namespace.c 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/ipc/namespace.c 2021-02-24 15:47:45.107743409 +0100
+@@ -13,6 +13,7 @@
+ #include <linux/mount.h>
+ #include <linux/user_namespace.h>
+ #include <linux/proc_ns.h>
++#include <linux/vserver/global.h>
+
+ #include "util.h"
+
+@@ -59,6 +60,7 @@ static struct ipc_namespace *create_ipc_
+ sem_init_ns(ns);
+ msg_init_ns(ns);
+ shm_init_ns(ns);
++ atomic_inc(&vs_global_ipc_ns);
+
+ return ns;
+
+@@ -121,6 +123,7 @@ static void free_ipc_ns(struct ipc_names
+ dec_ipc_namespaces(ns->ucounts);
+ put_user_ns(ns->user_ns);
+ ns_free_inum(&ns->ns);
++ atomic_dec(&vs_global_ipc_ns);
+ kfree(ns);
+ }
+
+diff -urNp -x '*.orig' linux-4.9/ipc/sem.c linux-4.9/ipc/sem.c
+--- linux-4.9/ipc/sem.c 2021-02-24 15:47:32.454014219 +0100
++++ linux-4.9/ipc/sem.c 2021-02-24 15:47:45.107743409 +0100
+@@ -85,6 +85,8 @@
+ #include <linux/rwsem.h>
+ #include <linux/nsproxy.h>
+ #include <linux/ipc_namespace.h>
++#include <linux/vs_base.h>
++#include <linux/vs_limit.h>
+
+ #include <linux/uaccess.h>
+ #include "util.h"
+@@ -537,6 +539,7 @@ static int newary(struct ipc_namespace *
+
+ sma->sem_perm.mode = (semflg & S_IRWXUGO);
+ sma->sem_perm.key = key;
++ sma->sem_perm.xid = vx_current_xid();
+
+ sma->sem_perm.security = NULL;
+ retval = security_sem_alloc(sma);
+@@ -567,6 +570,9 @@ static int newary(struct ipc_namespace *
+ return id;
+ }
+ ns->used_sems += nsems;
++ /* FIXME: obsoleted? */
++ vx_semary_inc(sma);
++ vx_nsems_add(sma, nsems);
+
+ sem_unlock(sma, -1);
+ rcu_read_unlock();
+@@ -1155,6 +1161,9 @@ static void freeary(struct ipc_namespace
+
+ wake_up_sem_queue_do(&tasks);
+ ns->used_sems -= sma->sem_nsems;
++ /* FIXME: obsoleted? */
++ vx_nsems_sub(sma, sma->sem_nsems);
++ vx_semary_dec(sma);
+ ipc_rcu_putref(sma, sem_rcu_free);
+ }
+
+diff -urNp -x '*.orig' linux-4.9/ipc/shm.c linux-4.9/ipc/shm.c
+--- linux-4.9/ipc/shm.c 2021-02-24 15:47:32.454014219 +0100
++++ linux-4.9/ipc/shm.c 2021-02-24 15:47:45.107743409 +0100
+@@ -42,6 +42,8 @@
+ #include <linux/nsproxy.h>
+ #include <linux/mount.h>
+ #include <linux/ipc_namespace.h>
++#include <linux/vs_context.h>
++#include <linux/vs_limit.h>
+
+ #include <linux/uaccess.h>
+
+@@ -234,10 +236,14 @@ static void shm_open(struct vm_area_stru
+ static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp)
+ {
+ struct file *shm_file;
++ struct vx_info *vxi = lookup_vx_info(shp->shm_perm.xid);
++ int numpages = (shp->shm_segsz + PAGE_SIZE - 1) >> PAGE_SHIFT;
+
+ shm_file = shp->shm_file;
+ shp->shm_file = NULL;
+- ns->shm_tot -= (shp->shm_segsz + PAGE_SIZE - 1) >> PAGE_SHIFT;
++ vx_ipcshm_sub(vxi, shp, numpages);
++ ns->shm_tot -= numpages;
+
-+static inline
-+void __vxm_rqinfo2(struct rq *q, int cpu)
-+{
-+ struct _vx_mon_entry *entry = vxm_advance(cpu);
+ shm_rmid(ns, shp);
+ shm_unlock(shp);
+ if (!is_file_hugepages(shm_file))
+@@ -246,6 +252,7 @@ static void shm_destroy(struct ipc_names
+ user_shm_unlock(i_size_read(file_inode(shm_file)),
+ shp->mlock_user);
+ fput(shm_file);
++ put_vx_info(vxi);
+ ipc_rcu_putref(shp, shm_rcu_free);
+ }
+
+@@ -559,11 +566,15 @@ static int newseg(struct ipc_namespace *
+ ns->shm_tot + numpages > ns->shm_ctlall)
+ return -ENOSPC;
+
++ if (!vx_ipcshm_avail(current_vx_info(), numpages))
++ return -ENOSPC;
+
-+ entry->type = VXM_RQINFO_2;
-+ entry->xid = (unsigned long)q & 0xffff;
-+ entry->q2.norm_time = q->norm_time;
-+ entry->q2.idle_time = q->idle_time;
-+ entry->q2.idle_skip = IDLETIME(q->idle_skip);
-+}
+ shp = ipc_rcu_alloc(sizeof(*shp));
+ if (!shp)
+ return -ENOMEM;
+
+ shp->shm_perm.key = key;
++ shp->shm_perm.xid = vx_current_xid();
+ shp->shm_perm.mode = (shmflg & S_IRWXUGO);
+ shp->mlock_user = NULL;
+
+@@ -634,6 +645,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 -urNp -x '*.orig' linux-4.9/kernel/Makefile linux-4.9/kernel/Makefile
+--- linux-4.9/kernel/Makefile 2021-02-24 15:47:32.454014219 +0100
++++ linux-4.9/kernel/Makefile 2021-02-24 15:47:45.111076846 +0100
+@@ -40,6 +40,7 @@ obj-y += printk/
+ obj-y += irq/
+ obj-y += rcu/
+ obj-y += livepatch/
++obj-y += vserver/
+
+ obj-$(CONFIG_CHECKPOINT_RESTORE) += kcmp.o
+ obj-$(CONFIG_FREEZER) += freezer.o
+diff -urNp -x '*.orig' linux-4.9/kernel/auditsc.c linux-4.9/kernel/auditsc.c
+--- linux-4.9/kernel/auditsc.c 2021-02-24 15:47:32.457347657 +0100
++++ linux-4.9/kernel/auditsc.c 2021-02-24 15:47:45.107743409 +0100
+@@ -1967,7 +1967,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 -urNp -x '*.orig' linux-4.9/kernel/capability.c linux-4.9/kernel/capability.c
+--- linux-4.9/kernel/capability.c 2021-02-24 15:47:32.460681095 +0100
++++ linux-4.9/kernel/capability.c 2021-02-24 15:47:45.111076846 +0100
+@@ -17,6 +17,7 @@
+ #include <linux/syscalls.h>
+ #include <linux/pid_namespace.h>
+ #include <linux/user_namespace.h>
++#include <linux/vs_context.h>
+ #include <asm/uaccess.h>
+
+ /*
+@@ -107,6 +108,7 @@ static int cap_validate_magic(cap_user_h
+ return 0;
+ }
+
+
-+static inline
-+void __vxm_update(struct _vx_sched_pc *s, struct vx_info *vxi, int cpu)
-+{
-+ struct _vx_mon_entry *entry = vxm_advance(cpu);
+ /*
+ * 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
+@@ -344,6 +346,8 @@ bool has_ns_capability_noaudit(struct ta
+ return (ret == 0);
+ }
+
++#include <linux/vserver/base.h>
+
-+ __vxm_basic(entry, vxi->vx_id, VXM_UPDATE);
-+ entry->ev.tokens = s->tokens;
-+}
+ /**
+ * has_capability_noaudit - Does a task have a capability (unaudited) in the
+ * initial user ns
+diff -urNp -x '*.orig' linux-4.9/kernel/compat.c linux-4.9/kernel/compat.c
+--- linux-4.9/kernel/compat.c 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/kernel/compat.c 2021-02-24 15:47:45.111076846 +0100
+@@ -27,6 +27,7 @@
+ #include <linux/times.h>
+ #include <linux/ptrace.h>
+ #include <linux/gfp.h>
++#include <linux/vs_time.h>
+
+ #include <asm/uaccess.h>
+
+@@ -1059,7 +1060,7 @@ COMPAT_SYSCALL_DEFINE1(stime, compat_tim
+ if (err)
+ return err;
+
+- do_settimeofday(&tv);
++ vx_settimeofday(&tv);
+ return 0;
+ }
+
+diff -urNp -x '*.orig' linux-4.9/kernel/cred.c linux-4.9/kernel/cred.c
+--- linux-4.9/kernel/cred.c 2021-02-24 15:47:32.460681095 +0100
++++ linux-4.9/kernel/cred.c 2021-02-24 15:47:45.111076846 +0100
+@@ -64,31 +64,6 @@ struct cred init_cred = {
+ .group_info = &init_groups,
+ };
+
+-static inline void set_cred_subscribers(struct cred *cred, int n)
+-{
+-#ifdef CONFIG_DEBUG_CREDENTIALS
+- atomic_set(&cred->subscribers, n);
+-#endif
+-}
+-
+-static inline int read_cred_subscribers(const struct cred *cred)
+-{
+-#ifdef CONFIG_DEBUG_CREDENTIALS
+- return atomic_read(&cred->subscribers);
+-#else
+- return 0;
+-#endif
+-}
+-
+-static inline void alter_cred_subscribers(const struct cred *_cred, int n)
+-{
+-#ifdef CONFIG_DEBUG_CREDENTIALS
+- struct cred *cred = (struct cred *) _cred;
+-
+- atomic_add(n, &cred->subscribers);
+-#endif
+-}
+-
+ /*
+ * The RCU callback to actually dispose of a set of credentials
+ */
+@@ -243,21 +218,16 @@ error:
+ *
+ * Call commit_creds() or abort_creds() to clean up.
+ */
+-struct cred *prepare_creds(void)
++struct cred *__prepare_creds(const struct cred *old)
+ {
+- struct task_struct *task = current;
+- const struct cred *old;
+ struct cred *new;
+
+- validate_process_creds();
+-
+ new = kmem_cache_alloc(cred_jar, GFP_KERNEL);
+ if (!new)
+ return NULL;
+
+ kdebug("prepare_creds() alloc %p", new);
+
+- old = task->cred;
+ memcpy(new, old, sizeof(struct cred));
+
+ new->non_rcu = 0;
+@@ -287,6 +257,13 @@ error:
+ abort_creds(new);
+ return NULL;
+ }
+
-+static inline
-+void __vxm_update1(struct _vx_sched_pc *s, struct vx_info *vxi, int cpu)
++struct cred *prepare_creds(void)
+{
-+ struct _vx_mon_entry *entry = vxm_advance(cpu);
++ validate_process_creds();
+
-+ __vxm_basic(entry, vxi->vx_id, VXM_UPDATE_1);
-+ entry->u1.tokens_max = s->tokens_max;
-+ entry->u1.fill_rate = s->fill_rate[0];
-+ entry->u1.interval = s->interval[0];
++ return __prepare_creds(current->cred);
+}
+ EXPORT_SYMBOL(prepare_creds);
+
+ /*
+diff -urNp -x '*.orig' linux-4.9/kernel/exit.c linux-4.9/kernel/exit.c
+--- linux-4.9/kernel/exit.c 2021-02-24 15:47:32.467347970 +0100
++++ linux-4.9/kernel/exit.c 2021-02-24 15:47:45.111076846 +0100
+@@ -48,6 +48,10 @@
+ #include <linux/fs_struct.h>
+ #include <linux/init_task.h>
+ #include <linux/perf_event.h>
++#include <linux/vs_limit.h>
++#include <linux/vs_context.h>
++#include <linux/vs_network.h>
++#include <linux/vs_pid.h>
+ #include <trace/events/sched.h>
+ #include <linux/hw_breakpoint.h>
+ #include <linux/oom.h>
+@@ -535,15 +539,25 @@ static struct task_struct *find_child_re
+ {
+ struct pid_namespace *pid_ns = task_active_pid_ns(father);
+ struct task_struct *reaper = pid_ns->child_reaper;
++ struct vx_info *vxi = task_get_vx_info(father);
+ struct task_struct *p, *n;
+
++ if (vxi) {
++ BUG_ON(!vxi->vx_reaper);
++ if (vxi->vx_reaper != init_pid_ns.child_reaper &&
++ vxi->vx_reaper != father) {
++ reaper = vxi->vx_reaper;
++ goto out_put;
++ }
++ }
+
-+static inline
-+void __vxm_update2(struct _vx_sched_pc *s, struct vx_info *vxi, int cpu)
-+{
-+ struct _vx_mon_entry *entry = vxm_advance(cpu);
+ if (likely(reaper != father))
+- return reaper;
++ goto out_put;
+
+ reaper = find_alive_thread(father);
+ if (reaper) {
+ pid_ns->child_reaper = reaper;
+- return reaper;
++ goto out_put;
+ }
+
+ write_unlock_irq(&tasklist_lock);
+@@ -560,7 +574,10 @@ static struct task_struct *find_child_re
+ zap_pid_ns_processes(pid_ns);
+ write_lock_irq(&tasklist_lock);
+
+- return father;
++ reaper = father;
++out_put:
++ put_vx_info(vxi);
++ return reaper;
+ }
+
+ /*
+@@ -648,9 +665,13 @@ static void forget_original_parent(struc
+ return;
+
+ reaper = find_new_reaper(father, reaper);
+- list_for_each_entry(p, &father->children, sibling) {
++ for (p = list_first_entry(&father->children, struct task_struct, sibling);
++ &p->sibling != &father->children; ) {
++ struct task_struct *next, *this_reaper = reaper;
++ if (p == reaper)
++ this_reaper = task_active_pid_ns(reaper)->child_reaper;
+ for_each_thread(p, t) {
+- t->real_parent = reaper;
++ t->real_parent = this_reaper;
+ BUG_ON((!t->ptrace) != (t->parent == father));
+ if (likely(!t->ptrace))
+ t->parent = t->real_parent;
+@@ -662,10 +683,13 @@ static void forget_original_parent(struc
+ * If this is a threaded reparent there is no need to
+ * notify anyone anything has happened.
+ */
+- if (!same_thread_group(reaper, father))
++ if (!same_thread_group(this_reaper, father))
+ reparent_leader(father, p, dead);
++ next = list_next_entry(p, sibling);
++ list_add(&p->sibling, &this_reaper->children);
++ p = next;
+ }
+- list_splice_tail_init(&father->children, &reaper->children);
++ INIT_LIST_HEAD(&father->children);
+ }
+
+ /*
+@@ -843,6 +867,9 @@ void __noreturn do_exit(long code)
+ */
+ flush_ptrace_hw_breakpoint(tsk);
+
++ /* needs to stay before exit_notify() */
++ exit_vx_info_early(tsk, code);
+
-+ __vxm_basic(entry, vxi->vx_id, VXM_UPDATE_2);
-+ entry->u2.tokens_min = s->tokens_min;
-+ entry->u2.fill_rate = s->fill_rate[1];
-+ entry->u2.interval = s->interval[1];
-+}
+ TASKS_RCU(preempt_disable());
+ TASKS_RCU(tasks_rcu_i = __srcu_read_lock(&tasks_rcu_exit_srcu));
+ TASKS_RCU(preempt_enable());
+@@ -869,6 +896,10 @@ void __noreturn do_exit(long code)
+
+ validate_creds_for_do_exit(tsk);
+
++ /* needs to stay after exit_notify() and before preempt_disable() */
++ exit_vx_info(tsk, code);
++ exit_nx_info(tsk);
+
+ check_stack_usage();
+ preempt_disable();
+ if (tsk->nr_dirtied)
+diff -urNp -x '*.orig' linux-4.9/kernel/fork.c linux-4.9/kernel/fork.c
+--- linux-4.9/kernel/fork.c 2021-02-24 15:47:32.467347970 +0100
++++ linux-4.9/kernel/fork.c 2021-02-24 15:47:45.111076846 +0100
+@@ -77,6 +77,9 @@
+ #include <linux/compiler.h>
+ #include <linux/sysctl.h>
+ #include <linux/kcov.h>
++#include <linux/vs_context.h>
++#include <linux/vs_network.h>
++#include <linux/vs_limit.h>
+
+ #include <asm/pgtable.h>
+ #include <asm/pgalloc.h>
+@@ -356,6 +359,8 @@ void free_task(struct task_struct *tsk)
+ WARN_ON_ONCE(atomic_read(&tsk->stack_refcount) != 0);
+ #endif
+ rt_mutex_debug_task_free(tsk);
++ clr_vx_info(&tsk->vx_info);
++ clr_nx_info(&tsk->nx_info);
+ ftrace_graph_exit_task(tsk);
+ put_seccomp_filter(tsk);
+ arch_release_task_struct(tsk);
+@@ -1476,6 +1481,8 @@ static __latent_entropy struct task_stru
+ {
+ int retval;
+ struct task_struct *p;
++ struct vx_info *vxi;
++ struct nx_info *nxi;
+
+ if ((clone_flags & (CLONE_NEWNS|CLONE_FS)) == (CLONE_NEWNS|CLONE_FS))
+ return ERR_PTR(-EINVAL);
+@@ -1548,7 +1555,12 @@ static __latent_entropy struct task_stru
+ DEBUG_LOCKS_WARN_ON(!p->hardirqs_enabled);
+ DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
+ #endif
++ init_vx_info(&p->vx_info, current_vx_info());
++ init_nx_info(&p->nx_info, current_nx_info());
+
-+#define vxm_activate_task(p,q) __vxm_task(p, VXM_ACTIVATE)
-+#define vxm_activate_idle(p,q) __vxm_task(p, VXM_IDLE)
-+#define vxm_deactivate_task(p,q) __vxm_task(p, VXM_DEACTIVATE)
-+#define vxm_hold_task(p,q) __vxm_task(p, VXM_HOLD)
-+#define vxm_unhold_task(p,q) __vxm_task(p, VXM_UNHOLD)
+ retval = -EAGAIN;
++ if (!vx_nproc_avail(1))
++ goto bad_fork_free;
+ if (atomic_read(&p->real_cred->user->processes) >=
+ task_rlimit(p, RLIMIT_NPROC)) {
+ if (p->real_cred->user != INIT_USER &&
+@@ -1843,6 +1855,18 @@ static __latent_entropy struct task_stru
+ total_forks++;
+ spin_unlock(¤t->sighand->siglock);
+ syscall_tracepoint_update(p);
+
-+static inline
-+void vxm_migrate_task(struct task_struct *p, struct rq *rq, int dest)
-+{
-+ __vxm_task(p, VXM_MIGRATE);
-+ __vxm_rqinfo1(rq, task_cpu(p));
-+ __vxm_rqinfo2(rq, task_cpu(p));
-+}
++ /* p is copy of current */
++ vxi = p->vx_info;
++ if (vxi) {
++ claim_vx_info(vxi, p);
++ atomic_inc(&vxi->cvirt.nr_threads);
++ atomic_inc(&vxi->cvirt.total_forks);
++ vx_nproc_inc(p);
++ }
++ nxi = p->nx_info;
++ if (nxi)
++ claim_nx_info(nxi, p);
+ write_unlock_irq(&tasklist_lock);
+
+ proc_fork_connector(p);
+diff -urNp -x '*.orig' linux-4.9/kernel/kthread.c linux-4.9/kernel/kthread.c
+--- linux-4.9/kernel/kthread.c 2021-02-24 15:47:32.474014845 +0100
++++ linux-4.9/kernel/kthread.c 2021-02-24 15:47:45.111076846 +0100
+@@ -19,6 +19,7 @@
+ #include <linux/ptrace.h>
+ #include <linux/uaccess.h>
+ #include <linux/cgroup.h>
++#include <linux/vs_pid.h>
+ #include <trace/events/sched.h>
+
+ static DEFINE_SPINLOCK(kthread_create_lock);
+diff -urNp -x '*.orig' linux-4.9/kernel/nsproxy.c linux-4.9/kernel/nsproxy.c
+--- linux-4.9/kernel/nsproxy.c 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/kernel/nsproxy.c 2021-02-24 15:47:45.111076846 +0100
+@@ -20,12 +20,15 @@
+ #include <linux/mnt_namespace.h>
+ #include <linux/utsname.h>
+ #include <linux/pid_namespace.h>
++#include <linux/vserver/global.h>
++#include <linux/vserver/debug.h>
+ #include <net/net_namespace.h>
+ #include <linux/ipc_namespace.h>
+ #include <linux/proc_ns.h>
+ #include <linux/file.h>
+ #include <linux/syscalls.h>
+ #include <linux/cgroup.h>
++#include "../fs/mount.h"
+
+ static struct kmem_cache *nsproxy_cachep;
+
+@@ -50,8 +53,11 @@ static inline struct nsproxy *create_nsp
+ struct nsproxy *nsproxy;
+
+ nsproxy = kmem_cache_alloc(nsproxy_cachep, GFP_KERNEL);
+- if (nsproxy)
++ if (nsproxy) {
+ atomic_set(&nsproxy->count, 1);
++ atomic_inc(&vs_global_nsproxy);
++ }
++ vxdprintk(VXD_CBIT(space, 2), "create_nsproxy = %p[1]", nsproxy);
+ return nsproxy;
+ }
+
+@@ -60,9 +66,12 @@ static inline struct nsproxy *create_nsp
+ * Return the newly created nsproxy. Do not attach this to the task,
+ * leave it to the caller to do proper locking and attach it to task.
+ */
+-static struct nsproxy *create_new_namespaces(unsigned long flags,
+- struct task_struct *tsk, struct user_namespace *user_ns,
+- struct fs_struct *new_fs)
++static struct nsproxy *unshare_namespaces(
++ unsigned long flags,
++ struct nsproxy *orig,
++ struct fs_struct *new_fs,
++ struct user_namespace *new_user,
++ struct pid_namespace *new_pid)
+ {
+ struct nsproxy *new_nsp;
+ int err;
+@@ -71,39 +80,37 @@ static struct nsproxy *create_new_namesp
+ if (!new_nsp)
+ return ERR_PTR(-ENOMEM);
+
+- new_nsp->mnt_ns = copy_mnt_ns(flags, tsk->nsproxy->mnt_ns, user_ns, new_fs);
++ new_nsp->mnt_ns = copy_mnt_ns(flags, orig->mnt_ns, new_user, new_fs);
+ if (IS_ERR(new_nsp->mnt_ns)) {
+ err = PTR_ERR(new_nsp->mnt_ns);
+ goto out_ns;
+ }
+
+- new_nsp->uts_ns = copy_utsname(flags, user_ns, tsk->nsproxy->uts_ns);
++ new_nsp->uts_ns = copy_utsname(flags, new_user, orig->uts_ns);
+ if (IS_ERR(new_nsp->uts_ns)) {
+ err = PTR_ERR(new_nsp->uts_ns);
+ goto out_uts;
+ }
+
+- new_nsp->ipc_ns = copy_ipcs(flags, user_ns, tsk->nsproxy->ipc_ns);
++ new_nsp->ipc_ns = copy_ipcs(flags, new_user, orig->ipc_ns);
+ if (IS_ERR(new_nsp->ipc_ns)) {
+ err = PTR_ERR(new_nsp->ipc_ns);
+ goto out_ipc;
+ }
+
+- new_nsp->pid_ns_for_children =
+- copy_pid_ns(flags, user_ns, tsk->nsproxy->pid_ns_for_children);
++ new_nsp->pid_ns_for_children = copy_pid_ns(flags, new_user, new_pid);
+ if (IS_ERR(new_nsp->pid_ns_for_children)) {
+ err = PTR_ERR(new_nsp->pid_ns_for_children);
+ goto out_pid;
+ }
+
+- new_nsp->cgroup_ns = copy_cgroup_ns(flags, user_ns,
+- tsk->nsproxy->cgroup_ns);
++ new_nsp->cgroup_ns = copy_cgroup_ns(flags, new_user, orig->cgroup_ns);
+ if (IS_ERR(new_nsp->cgroup_ns)) {
+ err = PTR_ERR(new_nsp->cgroup_ns);
+ goto out_cgroup;
+ }
+
+- 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;
+@@ -130,6 +137,43 @@ out_ns:
+ return ERR_PTR(err);
+ }
+
++static struct nsproxy *create_new_namespaces(unsigned long flags,
++ struct task_struct *tsk, struct user_namespace *user_ns,
++ struct fs_struct *new_fs)
+
-+static inline
-+void vxm_idle_skip(struct rq *rq, int cpu)
+{
-+ __vxm_rqinfo1(rq, cpu);
-+ __vxm_rqinfo2(rq, cpu);
++ return unshare_namespaces(flags, tsk->nsproxy,
++ new_fs, user_ns, task_active_pid_ns(tsk));
+}
+
-+static inline
-+void vxm_need_resched(struct task_struct *p, int slice, int cpu)
-+{
-+ if (slice)
-+ return;
-+
-+ __vxm_task(p, VXM_RESCHED);
++/*
++ * copies the nsproxy, setting refcount to 1, and grabbing a
++ * reference to all contained namespaces.
++ */
++struct nsproxy *copy_nsproxy(struct nsproxy *orig)
++{
++ struct nsproxy *ns = create_nsproxy();
++
++ if (ns) {
++ memcpy(ns, orig, sizeof(struct nsproxy));
++ atomic_set(&ns->count, 1);
++
++ if (ns->mnt_ns)
++ get_mnt_ns(ns->mnt_ns);
++ if (ns->uts_ns)
++ get_uts_ns(ns->uts_ns);
++ if (ns->ipc_ns)
++ get_ipc_ns(ns->ipc_ns);
++ if (ns->pid_ns_for_children)
++ get_pid_ns(ns->pid_ns_for_children);
++ if (ns->net_ns)
++ get_net(ns->net_ns);
++ if (ns->cgroup_ns)
++ get_cgroup_ns(ns->cgroup_ns);
++ }
++ return ns;
+}
+
-+static inline
-+void vxm_sync(unsigned long now, int cpu)
-+{
-+ if (!CONFIG_VSERVER_MONITOR_SYNC ||
-+ (now % CONFIG_VSERVER_MONITOR_SYNC))
-+ return;
-+
-+ __vxm_sync(cpu);
-+}
+ /*
+ * called from clone. This now handles copy for nsproxy and all
+ * namespaces therein.
+@@ -138,7 +182,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;
+
-+#define vxm_sched_info(s,v,c) __vxm_sched(s,v,c)
++ vxdprintk(VXD_CBIT(space, 7), "copy_namespaces(0x%08lx,%p[%p])",
++ flags, tsk, old_ns);
+
+ if (likely(!(flags & (CLONE_NEWNS | CLONE_NEWUTS | CLONE_NEWIPC |
+ CLONE_NEWPID | CLONE_NEWNET |
+@@ -147,7 +194,7 @@ int copy_namespaces(unsigned long flags,
+ return 0;
+ }
+
+- if (!ns_capable(user_ns, CAP_SYS_ADMIN))
++ if (!vx_ns_can_unshare(user_ns, CAP_SYS_ADMIN, flags))
+ return -EPERM;
+
+ /*
+@@ -166,6 +213,9 @@ int copy_namespaces(unsigned long flags,
+ return PTR_ERR(new_ns);
+
+ tsk->nsproxy = new_ns;
++ vxdprintk(VXD_CBIT(space, 3),
++ "copy_namespaces(0x%08lx,%p[%p]) = [%p]",
++ flags, tsk, old_ns, new_ns);
+ return 0;
+ }
+
+@@ -179,8 +229,10 @@ void free_nsproxy(struct nsproxy *ns)
+ put_ipc_ns(ns->ipc_ns);
+ if (ns->pid_ns_for_children)
+ put_pid_ns(ns->pid_ns_for_children);
++ if (ns->net_ns)
++ put_net(ns->net_ns);
+ put_cgroup_ns(ns->cgroup_ns);
+- put_net(ns->net_ns);
++ atomic_dec(&vs_global_nsproxy);
+ kmem_cache_free(nsproxy_cachep, ns);
+ }
+
+@@ -194,12 +246,16 @@ int unshare_nsproxy_namespaces(unsigned
+ struct user_namespace *user_ns;
+ int err = 0;
+
++ vxdprintk(VXD_CBIT(space, 4),
++ "unshare_nsproxy_namespaces(0x%08lx,[%p])",
++ unshare_flags, current->nsproxy);
+
-+static inline
-+void vxm_tokens_recalc(struct _vx_sched_pc *s, struct rq *rq,
-+ struct vx_info *vxi, int cpu)
-+{
-+ __vxm_sched(s, vxi, cpu);
-+ __vxm_rqinfo2(rq, cpu);
-+}
+ if (!(unshare_flags & (CLONE_NEWNS | CLONE_NEWUTS | CLONE_NEWIPC |
+ CLONE_NEWNET | CLONE_NEWPID | CLONE_NEWCGROUP)))
+ return 0;
+
+ user_ns = new_cred ? new_cred->user_ns : current_user_ns();
+- if (!ns_capable(user_ns, CAP_SYS_ADMIN))
++ if (!vx_ns_can_unshare(user_ns, CAP_SYS_ADMIN, unshare_flags))
+ return -EPERM;
+
+ *new_nsp = create_new_namespaces(unshare_flags, current, user_ns,
+diff -urNp -x '*.orig' linux-4.9/kernel/pid.c linux-4.9/kernel/pid.c
+--- linux-4.9/kernel/pid.c 2021-02-24 15:47:32.477348283 +0100
++++ linux-4.9/kernel/pid.c 2021-02-24 15:47:45.111076846 +0100
+@@ -38,6 +38,7 @@
+ #include <linux/syscalls.h>
+ #include <linux/proc_ns.h>
+ #include <linux/proc_fs.h>
++#include <linux/vs_pid.h>
+
+ #define pid_hashfn(nr, ns) \
+ hash_long((unsigned long)nr + (unsigned long)ns, pidhash_shift)
+@@ -381,7 +382,7 @@ EXPORT_SYMBOL_GPL(find_pid_ns);
+
+ struct pid *find_vpid(int nr)
+ {
+- return find_pid_ns(nr, task_active_pid_ns(current));
++ return find_pid_ns(vx_rmap_pid(nr), task_active_pid_ns(current));
+ }
+ EXPORT_SYMBOL_GPL(find_vpid);
+
+@@ -437,6 +438,9 @@ void transfer_pid(struct task_struct *ol
+ struct task_struct *pid_task(struct pid *pid, enum pid_type type)
+ {
+ struct task_struct *result = NULL;
+
-+static inline
-+void vxm_update_sched(struct _vx_sched_pc *s, struct vx_info *vxi, int cpu)
++ if (type == __PIDTYPE_REALPID)
++ type = PIDTYPE_PID;
+ if (pid) {
+ struct hlist_node *first;
+ first = rcu_dereference_check(hlist_first_rcu(&pid->tasks[type]),
+@@ -455,7 +459,7 @@ struct task_struct *find_task_by_pid_ns(
+ {
+ RCU_LOCKDEP_WARN(!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)
+@@ -499,7 +503,7 @@ struct pid *find_get_pid(pid_t nr)
+ }
+ EXPORT_SYMBOL_GPL(find_get_pid);
+
+-pid_t pid_nr_ns(struct pid *pid, struct pid_namespace *ns)
++pid_t pid_unmapped_nr_ns(struct pid *pid, struct pid_namespace *ns)
+ {
+ struct upid *upid;
+ pid_t nr = 0;
+@@ -513,6 +517,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)
+{
-+ __vxm_sched(s, vxi, cpu);
-+ __vxm_update(s, vxi, cpu);
-+ __vxm_update1(s, vxi, cpu);
-+ __vxm_update2(s, vxi, cpu);
++ return vx_map_pid(pid_unmapped_nr_ns(pid, ns));
+}
+
-+static inline
-+void vxm_rq_max_min(struct rq *rq, int cpu)
-+{
-+ __vxm_rqinfo1(rq, cpu);
-+ __vxm_rqinfo2(rq, cpu);
-+}
+ pid_t pid_vnr(struct pid *pid)
+ {
+ return pid_nr_ns(pid, task_active_pid_ns(current));
+diff -urNp -x '*.orig' linux-4.9/kernel/pid_namespace.c linux-4.9/kernel/pid_namespace.c
+--- linux-4.9/kernel/pid_namespace.c 2021-02-24 15:47:32.477348283 +0100
++++ linux-4.9/kernel/pid_namespace.c 2021-02-24 15:47:45.111076846 +0100
+@@ -18,6 +18,7 @@
+ #include <linux/proc_ns.h>
+ #include <linux/reboot.h>
+ #include <linux/export.h>
++#include <linux/vserver/global.h>
+
+ struct pid_cache {
+ int nr_ids;
+@@ -124,6 +125,7 @@ static struct pid_namespace *create_pid_
+ ns->ns.ops = &pidns_operations;
+
+ kref_init(&ns->kref);
++ atomic_inc(&vs_global_pid_ns);
+ ns->level = level;
+ ns->parent = get_pid_ns(parent_pid_ns);
+ ns->user_ns = get_user_ns(user_ns);
+@@ -142,6 +144,7 @@ static struct pid_namespace *create_pid_
+ out_free_map:
+ kfree(ns->pidmap[0].page);
+ out_free:
++ atomic_dec(&vs_global_pid_ns);
+ kmem_cache_free(pid_ns_cachep, ns);
+ out_dec:
+ dec_pid_namespaces(ucounts);
+diff -urNp -x '*.orig' linux-4.9/kernel/printk/printk.c linux-4.9/kernel/printk/printk.c
+--- linux-4.9/kernel/printk/printk.c 2021-02-24 15:47:32.480681720 +0100
++++ linux-4.9/kernel/printk/printk.c 2021-02-24 15:47:45.114410284 +0100
+@@ -45,6 +45,7 @@
+ #include <linux/utsname.h>
+ #include <linux/ctype.h>
+ #include <linux/uio.h>
++#include <linux/vs_cvirt.h>
+
+ #include <asm/uaccess.h>
+ #include <asm/sections.h>
+@@ -611,7 +612,7 @@ int check_syslog_permissions(int type, i
+ goto ok;
+
+ if (syslog_action_restricted(type)) {
+- if (capable(CAP_SYSLOG))
++ if (vx_capable(CAP_SYSLOG, VXC_SYSLOG))
+ goto ok;
+ /*
+ * For historical reasons, accept CAP_SYS_ADMIN too, with
+@@ -1398,12 +1399,9 @@ int do_syslog(int type, char __user *buf
+ if (error)
+ goto out;
+
+- switch (type) {
+- case SYSLOG_ACTION_CLOSE: /* Close log */
+- break;
+- case SYSLOG_ACTION_OPEN: /* Open log */
+- break;
+- case SYSLOG_ACTION_READ: /* Read from log */
++ if ((type == SYSLOG_ACTION_READ) ||
++ (type == SYSLOG_ACTION_READ_ALL) ||
++ (type == SYSLOG_ACTION_READ_CLEAR)) {
+ error = -EINVAL;
+ if (!buf || len < 0)
+ goto out;
+@@ -1414,6 +1412,16 @@ int do_syslog(int type, char __user *buf
+ error = -EFAULT;
+ goto out;
+ }
++ }
++ if (!vx_check(0, VS_ADMIN|VS_WATCH))
++ return vx_do_syslog(type, buf, len);
+
-+#else /* CONFIG_VSERVER_MONITOR */
++ switch (type) {
++ case SYSLOG_ACTION_CLOSE: /* Close log */
++ break;
++ case SYSLOG_ACTION_OPEN: /* Open log */
++ break;
++ case SYSLOG_ACTION_READ: /* Read from log */
+ error = wait_event_interruptible(log_wait,
+ syslog_seq != log_next_seq);
+ if (error)
+@@ -1426,16 +1434,6 @@ int do_syslog(int type, char __user *buf
+ /* FALL THRU */
+ /* Read last kernel messages */
+ case SYSLOG_ACTION_READ_ALL:
+- error = -EINVAL;
+- if (!buf || len < 0)
+- goto out;
+- error = 0;
+- if (!len)
+- goto out;
+- if (!access_ok(VERIFY_WRITE, buf, len)) {
+- error = -EFAULT;
+- goto out;
+- }
+ error = syslog_print_all(buf, len, clear);
+ break;
+ /* Clear ring buffer */
+diff -urNp -x '*.orig' linux-4.9/kernel/ptrace.c linux-4.9/kernel/ptrace.c
+--- linux-4.9/kernel/ptrace.c 2021-02-24 15:47:32.480681720 +0100
++++ linux-4.9/kernel/ptrace.c 2021-02-24 15:47:45.114410284 +0100
+@@ -23,6 +23,7 @@
+ #include <linux/syscalls.h>
+ #include <linux/uaccess.h>
+ #include <linux/regset.h>
++#include <linux/vs_context.h>
+ #include <linux/hw_breakpoint.h>
+ #include <linux/cn_proc.h>
+ #include <linux/compat.h>
+@@ -336,6 +337,11 @@ ok:
+ !ptrace_has_cap(mm->user_ns, mode)))
+ return -EPERM;
+
++ if (!vx_check(task->xid, VS_ADMIN_P|VS_WATCH_P|VS_IDENT))
++ return -EPERM;
++ if (!vx_check(task->xid, VS_IDENT) &&
++ !task_vx_flags(task, VXF_STATE_ADMIN, 0))
++ return -EACCES;
+ if (mode & PTRACE_MODE_SCHED)
+ return 0;
+ return security_ptrace_access_check(task, mode);
+diff -urNp -x '*.orig' linux-4.9/kernel/reboot.c linux-4.9/kernel/reboot.c
+--- linux-4.9/kernel/reboot.c 2021-02-24 15:47:32.484015158 +0100
++++ linux-4.9/kernel/reboot.c 2021-02-24 15:47:45.114410284 +0100
+@@ -16,6 +16,7 @@
+ #include <linux/syscalls.h>
+ #include <linux/syscore_ops.h>
+ #include <linux/uaccess.h>
++#include <linux/vs_pid.h>
+
+ /*
+ * 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 *);
+
-+#define vxm_activate_task(t,q) do { } while (0)
-+#define vxm_activate_idle(t,q) do { } while (0)
-+#define vxm_deactivate_task(t,q) do { } while (0)
-+#define vxm_hold_task(t,q) do { } while (0)
-+#define vxm_unhold_task(t,q) do { } while (0)
-+#define vxm_migrate_task(t,q,d) do { } while (0)
-+#define vxm_idle_skip(q,c) do { } while (0)
-+#define vxm_need_resched(t,s,c) do { } while (0)
-+#define vxm_sync(s,c) do { } while (0)
-+#define vxm_sched_info(s,v,c) do { } while (0)
-+#define vxm_tokens_recalc(s,q,v,c) do { } while (0)
-+#define vxm_update_sched(s,v,c) do { } while (0)
-+#define vxm_rq_max_min(q,c) do { } while (0)
+ /*
+ * 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);
+
-+#endif /* CONFIG_VSERVER_MONITOR */
+ mutex_lock(&reboot_mutex);
+ switch (cmd) {
+ case LINUX_REBOOT_CMD_RESTART:
+diff -urNp -x '*.orig' linux-4.9/kernel/sched/core.c linux-4.9/kernel/sched/core.c
+--- linux-4.9/kernel/sched/core.c 2021-02-24 15:47:32.484015158 +0100
++++ linux-4.9/kernel/sched/core.c 2021-02-24 15:47:45.114410284 +0100
+@@ -75,6 +75,8 @@
+ #include <linux/compiler.h>
+ #include <linux/frame.h>
+ #include <linux/prefetch.h>
++#include <linux/vs_sched.h>
++#include <linux/vs_cvirt.h>
+
+ #include <asm/switch_to.h>
+ #include <asm/tlb.h>
+@@ -3431,6 +3433,7 @@ void __noreturn do_task_dead(void)
+ __set_current_state(TASK_DEAD);
+ current->flags |= PF_NOFREEZE; /* tell freezer to ignore us */
+ __schedule(false);
++ printk("bad task: %p [%lx]\n", current, current->state);
+ BUG();
+ /* Avoid "noreturn function does return". */
+ for (;;)
+@@ -3825,7 +3828,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 -urNp -x '*.orig' linux-4.9/kernel/sched/cputime.c linux-4.9/kernel/sched/cputime.c
+--- linux-4.9/kernel/sched/cputime.c 2021-02-24 15:47:32.484015158 +0100
++++ linux-4.9/kernel/sched/cputime.c 2021-02-24 15:47:45.114410284 +0100
+@@ -4,6 +4,7 @@
+ #include <linux/kernel_stat.h>
+ #include <linux/static_key.h>
+ #include <linux/context_tracking.h>
++#include <linux/vs_sched.h>
+ #include "sched.h"
+ #ifdef CONFIG_PARAVIRT
+ #include <asm/paravirt.h>
+@@ -125,14 +126,17 @@ static inline void task_group_account_fi
+ void account_user_time(struct task_struct *p, cputime_t cputime,
+ cputime_t cputime_scaled)
+ {
++ struct vx_info *vxi = p->vx_info; /* p is _always_ current */
++ int nice = (task_nice(p) > 0);
+ int index;
+
+ /* Add user time to process. */
+ p->utime += cputime;
+ p->utimescaled += cputime_scaled;
++ vx_account_user(vxi, cputime, nice);
+ account_group_user_time(p, cputime);
+
+- index = (task_nice(p) > 0) ? CPUTIME_NICE : CPUTIME_USER;
++ index = (nice) ? CPUTIME_NICE : CPUTIME_USER;
+
+ /* Add user time to cpustat. */
+ task_group_account_field(p, index, cputime_to_nsecs(cputime));
+@@ -179,9 +183,12 @@ static inline
+ void __account_system_time(struct task_struct *p, cputime_t cputime,
+ cputime_t cputime_scaled, int index)
+ {
++ struct vx_info *vxi = p->vx_info; /* p is _always_ current */
+
-diff -NurpP --minimal linux-2.6.19.1/kernel/signal.c linux-2.6.19.1-vs2.3.0.6/kernel/signal.c
---- linux-2.6.19.1/kernel/signal.c 2006-11-30 21:19:44 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/signal.c 2006-11-30 19:43:08 +0100
-@@ -23,6 +23,7 @@
- #include <linux/binfmts.h>
- #include <linux/security.h>
- #include <linux/syscalls.h>
-+#include <linux/vs_context.h>
- #include <linux/ptrace.h>
- #include <linux/signal.h>
- #include <linux/capability.h>
-@@ -577,17 +578,30 @@ static int check_kill_permission(int sig
- struct task_struct *t)
+ /* Add system time to process. */
+ p->stime += cputime;
+ p->stimescaled += cputime_scaled;
++ vx_account_system(vxi, cputime, 0 /* do we have idle time? */);
+ account_group_system_time(p, cputime);
+
+ /* Add system time to cpustat. */
+diff -urNp -x '*.orig' linux-4.9/kernel/sched/fair.c linux-4.9/kernel/sched/fair.c
+--- linux-4.9/kernel/sched/fair.c 2021-02-24 15:47:32.487348596 +0100
++++ linux-4.9/kernel/sched/fair.c 2021-02-24 15:47:45.117743722 +0100
+@@ -30,6 +30,7 @@
+ #include <linux/mempolicy.h>
+ #include <linux/migrate.h>
+ #include <linux/task_work.h>
++#include <linux/vs_cvirt.h>
+
+ #include <trace/events/sched.h>
+
+@@ -3431,6 +3432,8 @@ enqueue_entity(struct cfs_rq *cfs_rq, st
+ __enqueue_entity(cfs_rq, se);
+ se->on_rq = 1;
+
++ if (entity_is_task(se))
++ vx_activate_task(task_of(se));
+ if (cfs_rq->nr_running == 1) {
+ list_add_leaf_cfs_rq(cfs_rq);
+ check_enqueue_throttle(cfs_rq);
+@@ -3500,6 +3503,8 @@ dequeue_entity(struct cfs_rq *cfs_rq, st
+ if (se != cfs_rq->curr)
+ __dequeue_entity(cfs_rq, se);
+ se->on_rq = 0;
++ if (entity_is_task(se))
++ vx_deactivate_task(task_of(se));
+ account_entity_dequeue(cfs_rq, se);
+
+ /*
+diff -urNp -x '*.orig' linux-4.9/kernel/sched/loadavg.c linux-4.9/kernel/sched/loadavg.c
+--- linux-4.9/kernel/sched/loadavg.c 2021-02-24 15:47:32.487348596 +0100
++++ linux-4.9/kernel/sched/loadavg.c 2021-02-24 15:47:45.117743722 +0100
+@@ -73,9 +73,16 @@ EXPORT_SYMBOL(avenrun); /* should be rem
+ */
+ void get_avenrun(unsigned long *loads, unsigned long offset, int shift)
{
- int error = -EINVAL;
+- 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, long adjust)
+diff -urNp -x '*.orig' linux-4.9/kernel/signal.c linux-4.9/kernel/signal.c
+--- linux-4.9/kernel/signal.c 2021-02-24 15:47:32.490682033 +0100
++++ linux-4.9/kernel/signal.c 2021-02-24 15:47:45.117743722 +0100
+@@ -34,6 +34,8 @@
+ #include <linux/compat.h>
+ #include <linux/cn_proc.h>
+ #include <linux/compiler.h>
++#include <linux/vs_context.h>
++#include <linux/vs_pid.h>
+
+ #define CREATE_TRACE_POINTS
+ #include <trace/events/signal.h>
+@@ -782,9 +784,18 @@ static int check_kill_permission(int sig
+ struct pid *sid;
+ int error;
+
++ vxdprintk(VXD_CBIT(misc, 7),
++ "check_kill_permission(%d,%p,%p[#%u,%u])",
++ sig, info, t, vx_task_xid(t), t->pid);
+
if (!valid_signal(sig))
- return error;
-+
+ return -EINVAL;
+
++/* FIXME: needed? if so, why?
+ if ((info != SEND_SIG_NOINFO) &&
-+ (is_si_special(info) || !SI_FROMUSER(info)))
-+ goto skip;
-+
- error = -EPERM;
-- if ((info == SEND_SIG_NOINFO || (!is_si_special(info) && SI_FROMUSER(info)))
-- && ((sig != SIGCONT) ||
-+ if (((sig != SIGCONT) ||
- (current->signal->session != t->signal->session))
- && (current->euid ^ t->suid) && (current->euid ^ t->uid)
- && (current->uid ^ t->suid) && (current->uid ^ t->uid)
- && !capable(CAP_KILL))
- return error;
++ (is_si_special(info) || !si_fromuser(info)))
++ goto skip; */
++
+ if (!si_fromuser(info))
+ return 0;
+@@ -808,6 +819,20 @@ static int check_kill_permission(int sig
+ }
+ }
+
++ error = -EPERM;
++ if (t->pid == 1 && current->xid)
++ return error;
++
+ error = -ESRCH;
-+ if (!vx_check(vx_task_xid(t), VS_WATCH_P|VS_IDENT)) {
-+ vxwprintk(current->xid,
-+ "signal xid mismatch %p[#%u,%u] xid=#%u\n",
-+ t, vx_task_xid(t), t->pid, current->xid);
++ /* FIXME: we shouldn't return ESRCH ever, to avoid
++ loops, maybe ENOENT or EACCES? */
++ if (!vx_check(vx_task_xid(t), VS_WATCH_P | VS_IDENT)) {
++ vxdprintk(current->xid || VXD_CBIT(misc, 7),
++ "signal %d[%p] xid mismatch %p[#%u,%u] xid=#%u",
++ sig, info, t, vx_task_xid(t), t->pid, current->xid);
+ return error;
+ }
-+skip:
- error = security_task_kill(t, info, sig, 0);
- if (!error)
- audit_signal_info(sig, t); /* Let audit system see the signal */
-@@ -1125,7 +1139,7 @@ int kill_pid_info(int sig, struct siginf
- }
++/* skip: */
+ return security_task_kill(t, info, sig, 0);
+ }
+
+@@ -1359,8 +1384,14 @@ int kill_pid_info(int sig, struct siginf
+ for (;;) {
+ rcu_read_lock();
+ p = pid_task(pid, PIDTYPE_PID);
+- if (p)
+- error = group_send_sig_info(sig, info, p);
++ if (p) {
++ if (vx_check(vx_task_xid(p), VS_IDENT))
++ error = group_send_sig_info(sig, info, p);
++ else {
++ rcu_read_unlock();
++ return -ESRCH;
++ }
++ }
+ rcu_read_unlock();
+ if (likely(!p || error != -ESRCH))
+ return error;
+@@ -1405,7 +1436,7 @@ int kill_pid_info_as_cred(int sig, struc
+
+ rcu_read_lock();
p = pid_task(pid, PIDTYPE_PID);
- error = -ESRCH;
-- if (p)
-+ if (p && vx_check(vx_task_xid(p), VS_IDENT))
- error = group_send_sig_info(sig, info, p);
- if (unlikely(acquired_tasklist_lock))
- read_unlock(&tasklist_lock);
-@@ -1197,7 +1211,8 @@ static int kill_something_info(int sig,
-
- read_lock(&tasklist_lock);
+- if (!p) {
++ if (!p || !vx_check(vx_task_xid(p), VS_IDENT)) {
+ ret = -ESRCH;
+ goto out_unlock;
+ }
+@@ -1461,8 +1492,10 @@ static int kill_something_info(int sig,
+ struct task_struct * p;
+
for_each_process(p) {
-- if (p->pid > 1 && p->tgid != current->tgid) {
-+ if (vx_check(vx_task_xid(p), VS_ADMIN_P|VS_IDENT) &&
-+ p->pid > 1 && p->tgid != current->tgid) {
+- if (task_pid_vnr(p) > 1 &&
+- !same_thread_group(p, current)) {
++ if (vx_check(vx_task_xid(p), VS_ADMIN|VS_IDENT) &&
++ task_pid_vnr(p) > 1 &&
++ !same_thread_group(p, current) &&
++ !vx_current_initpid(p->pid)) {
int err = group_send_sig_info(sig, info, p);
++count;
if (err != -EPERM)
-@@ -1881,6 +1896,11 @@ relock:
- if (current == child_reaper)
+@@ -2333,6 +2366,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.19.1/kernel/softirq.c linux-2.6.19.1-vs2.3.0.6/kernel/softirq.c
---- linux-2.6.19.1/kernel/softirq.c 2006-12-13 07:46:36 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/softirq.c 2006-12-13 09:16:31 +0100
-@@ -17,6 +17,7 @@
- #include <linux/kthread.h>
- #include <linux/rcupdate.h>
- #include <linux/smp.h>
+diff -urNp -x '*.orig' linux-4.9/kernel/softirq.c linux-4.9/kernel/softirq.c
+--- linux-4.9/kernel/softirq.c 2021-02-24 15:47:32.490682033 +0100
++++ linux-4.9/kernel/softirq.c 2021-02-24 15:47:45.117743722 +0100
+@@ -26,6 +26,7 @@
+ #include <linux/smpboot.h>
+ #include <linux/tick.h>
+ #include <linux/irq.h>
+#include <linux/vs_context.h>
- #include <asm/irq.h>
- /*
-diff -NurpP --minimal linux-2.6.19.1/kernel/sys.c linux-2.6.19.1-vs2.3.0.6/kernel/sys.c
---- linux-2.6.19.1/kernel/sys.c 2006-11-30 21:19:44 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/sys.c 2006-12-02 01:37:05 +0100
-@@ -10,6 +10,7 @@
- #include <linux/mman.h>
- #include <linux/smp_lock.h>
- #include <linux/notifier.h>
-+#include <linux/kmod.h>
- #include <linux/reboot.h>
- #include <linux/prctl.h>
- #include <linux/highuid.h>
-@@ -33,6 +34,7 @@
- #include <linux/compat.h>
- #include <linux/syscalls.h>
- #include <linux/kprobes.h>
+ #define CREATE_TRACE_POINTS
+ #include <trace/events/irq.h>
+diff -urNp -x '*.orig' linux-4.9/kernel/sys.c linux-4.9/kernel/sys.c
+--- linux-4.9/kernel/sys.c 2021-02-24 15:47:32.490682033 +0100
++++ linux-4.9/kernel/sys.c 2021-02-24 15:47:45.117743722 +0100
+@@ -56,6 +56,7 @@
+ #include <linux/nospec.h>
+
+ #include <linux/kmsg_dump.h>
+#include <linux/vs_pid.h>
+ /* Move somewhere else to avoid recompiling? */
+ #include <generated/utsrelease.h>
- #include <asm/uaccess.h>
- #include <asm/io.h>
-@@ -569,7 +571,10 @@ static int set_one_prio(struct task_stru
+@@ -159,7 +160,10 @@ static int set_one_prio(struct task_stru
goto out;
}
if (niceval < task_nice(p) && !can_nice(p, niceval)) {
goto out;
}
no_nice = security_task_setnice(p, niceval);
-@@ -621,7 +626,8 @@ asmlinkage long sys_setpriority(int whic
- if (!who)
- who = current->uid;
- else
-- if ((who != current->uid) && !(user = find_user(who)))
-+ if ((who != current->uid) &&
-+ !(user = find_user(vx_current_xid(), who)))
- goto out_unlock; /* No processes for this user */
-
- do_each_thread(g, p)
-@@ -679,7 +685,8 @@ asmlinkage long sys_getpriority(int whic
- if (!who)
- who = current->uid;
- else
-- if ((who != current->uid) && !(user = find_user(who)))
-+ if ((who != current->uid) &&
-+ !(user = find_user(vx_current_xid(), who)))
- goto out_unlock; /* No processes for this user */
-
- do_each_thread(g, p)
-@@ -792,6 +799,9 @@ void kernel_power_off(void)
- machine_power_off();
- }
- EXPORT_SYMBOL_GPL(kernel_power_off);
-+
-+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
-@@ -822,6 +832,9 @@ asmlinkage long sys_reboot(int magic1, i
- 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);
-+
- lock_kernel();
- switch (cmd) {
- case LINUX_REBOOT_CMD_RESTART:
-@@ -1001,7 +1014,7 @@ static int set_user(uid_t new_ruid, int
- {
- struct user_struct *new_user;
-
-- new_user = alloc_uid(new_ruid);
-+ new_user = alloc_uid(vx_current_xid(), new_ruid);
- if (!new_user)
- return -EAGAIN;
-
-@@ -1356,15 +1369,18 @@ asmlinkage long sys_setpgid(pid_t pid, p
- {
- struct task_struct *p;
- struct task_struct *group_leader = current->group_leader;
-+ pid_t rpgid;
- int err = -EINVAL;
-
- if (!pid)
-- pid = group_leader->pid;
-+ pid = vx_map_pid(group_leader->pid);
- if (!pgid)
- pgid = pid;
- if (pgid < 0)
- return -EINVAL;
-
-+ rpgid = vx_rmap_pid(pgid);
-+
- /* From this point forward we keep holding onto the tasklist lock
- * so that our parent does not change from under us. -DaveM
- */
-@@ -1399,22 +1415,22 @@ asmlinkage long sys_setpgid(pid_t pid, p
- if (pgid != pid) {
- struct task_struct *p;
-
-- do_each_task_pid(pgid, PIDTYPE_PGID, p) {
-+ do_each_task_pid(rpgid, PIDTYPE_PGID, p) {
- if (p->signal->session == group_leader->signal->session)
- goto ok_pgid;
-- } while_each_task_pid(pgid, PIDTYPE_PGID, p);
-+ } while_each_task_pid(rpgid, PIDTYPE_PGID, p);
- goto out;
- }
-
- ok_pgid:
-- err = security_task_setpgid(p, pgid);
-+ err = security_task_setpgid(p, rpgid);
- if (err)
- goto out;
-
-- if (process_group(p) != pgid) {
-+ if (process_group(p) != rpgid) {
- detach_pid(p, PIDTYPE_PGID);
-- p->signal->pgrp = pgid;
-- attach_pid(p, PIDTYPE_PGID, pgid);
-+ p->signal->pgrp = rpgid;
-+ attach_pid(p, PIDTYPE_PGID, rpgid);
- }
-
- err = 0;
-@@ -1427,7 +1443,7 @@ out:
- asmlinkage long sys_getpgid(pid_t pid)
- {
- if (!pid)
-- return process_group(current);
-+ return vx_rmap_pid(process_group(current));
- else {
- int retval;
- struct task_struct *p;
-@@ -1439,7 +1455,7 @@ asmlinkage long sys_getpgid(pid_t pid)
- if (p) {
- retval = security_task_getpgid(p);
- if (!retval)
-- retval = process_group(p);
-+ retval = vx_rmap_pid(process_group(p));
+@@ -210,6 +214,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;
+@@ -276,6 +282,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;
+@@ -292,6 +300,8 @@ SYSCALL_DEFINE2(getpriority, int, which,
+ goto out_unlock; /* No processes for this user */
}
- read_unlock(&tasklist_lock);
- return retval;
-@@ -1789,7 +1805,7 @@ asmlinkage long sys_sethostname(char __u
+ do_each_thread(g, p) {
++ if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT))
++ continue;
+ if (uid_eq(task_uid(p), uid) && task_pid_vnr(p)) {
+ niceval = nice_to_rlimit(task_nice(p));
+ if (niceval > retval)
+@@ -1213,7 +1223,8 @@ 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))
+- 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;
-@@ -1834,7 +1850,7 @@ asmlinkage long sys_setdomainname(char _
+@@ -1266,7 +1277,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;
-@@ -1901,7 +1917,7 @@ asmlinkage long sys_setrlimit(unsigned i
- return -EINVAL;
- old_rlim = current->signal->rlim + resource;
- if ((new_rlim.rlim_max > old_rlim->rlim_max) &&
-- !capable(CAP_SYS_RESOURCE))
-+ !vx_capable(CAP_SYS_RESOURCE, VXC_SET_RLIMIT))
- return -EPERM;
- if (resource == RLIMIT_NOFILE && new_rlim.rlim_max > NR_OPEN)
- return -EPERM;
-diff -NurpP --minimal linux-2.6.19.1/kernel/sysctl.c linux-2.6.19.1-vs2.3.0.6/kernel/sysctl.c
---- linux-2.6.19.1/kernel/sysctl.c 2006-11-30 21:19:44 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/sysctl.c 2006-12-02 01:37:05 +0100
-@@ -87,6 +87,7 @@ static int ngroups_max = NGROUPS_MAX;
- #ifdef CONFIG_KMOD
- extern char modprobe_path[];
+@@ -1386,7 +1398,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,
+@@ -1439,7 +1451,8 @@ static int check_prlimit_permission(stru
+ gid_eq(cred->gid, tcred->sgid) &&
+ gid_eq(cred->gid, tcred->gid))
+ return 0;
+- if (ns_capable(tcred->user_ns, CAP_SYS_RESOURCE))
++ if (vx_ns_capable(tcred->user_ns,
++ CAP_SYS_RESOURCE, VXC_SET_RLIMIT))
+ return 0;
+
+ return -EPERM;
+@@ -2328,7 +2341,12 @@ static int do_sysinfo(struct sysinfo *in
+
+ get_avenrun(info->loads, 0, SI_LOAD_SHIFT - FSHIFT);
+
+- info->procs = nr_threads;
++ if (vx_flags(VXF_VIRT_LOAD, 0)) {
++ struct vx_info *vxi = current_vx_info();
++ info->procs = atomic_read(&vxi->cvirt.nr_threads);
++ } else {
++ info->procs = nr_threads;
++ }
+
+ si_meminfo(info);
+ si_swapinfo(info);
+diff -urNp -x '*.orig' linux-4.9/kernel/sysctl.c linux-4.9/kernel/sysctl.c
+--- linux-4.9/kernel/sysctl.c 2021-02-24 15:47:32.490682033 +0100
++++ linux-4.9/kernel/sysctl.c 2021-02-24 15:47:45.117743722 +0100
+@@ -87,6 +87,7 @@
+ #if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT)
+ #include <linux/lockdep.h>
#endif
+extern char vshelper_path[];
#ifdef CONFIG_CHR_DEV_SG
- extern int sg_big_buff;
- #endif
-@@ -456,6 +457,15 @@ static ctl_table kern_table[] = {
- .strategy = &sysctl_string,
- },
+ #include <scsi/sg.h>
#endif
-+ {
-+ .ctl_name = KERN_VSHELPER,
+@@ -284,6 +285,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,
-+ .strategy = &sysctl_string,
++ .proc_handler = proc_dostring,
+ },
- #ifdef CONFIG_CHR_DEV_SG
++ {
+ .procname = "sched_child_runs_first",
+ .data = &sysctl_sched_child_runs_first,
+ .maxlen = sizeof(unsigned int),
+@@ -1429,7 +1437,6 @@ static struct ctl_table vm_table[] = {
+ .extra1 = &zero,
+ .extra2 = &one,
+ },
+-
+ #endif /* CONFIG_COMPACTION */
{
- .ctl_name = KERN_SG_BIG_BUFF,
-diff -NurpP --minimal linux-2.6.19.1/kernel/time.c linux-2.6.19.1-vs2.3.0.6/kernel/time.c
---- linux-2.6.19.1/kernel/time.c 2006-11-30 21:19:44 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/time.c 2006-11-08 04:57:44 +0100
-@@ -61,7 +61,7 @@ asmlinkage long sys_time(time_t __user *
- time_t i;
- struct timeval tv;
-
-- do_gettimeofday(&tv);
-+ vx_gettimeofday(&tv);
- i = tv.tv_sec;
-
- if (tloc) {
-@@ -92,7 +92,7 @@ asmlinkage long sys_stime(time_t __user
+ .procname = "min_free_kbytes",
+diff -urNp -x '*.orig' linux-4.9/kernel/sysctl_binary.c linux-4.9/kernel/sysctl_binary.c
+--- linux-4.9/kernel/sysctl_binary.c 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/kernel/sysctl_binary.c 2021-02-24 15:47:45.117743722 +0100
+@@ -74,6 +74,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 -urNp -x '*.orig' linux-4.9/kernel/time/posix-timers.c linux-4.9/kernel/time/posix-timers.c
+--- linux-4.9/kernel/time/posix-timers.c 2021-02-24 15:47:32.494015471 +0100
++++ linux-4.9/kernel/time/posix-timers.c 2021-02-24 15:47:45.117743722 +0100
+@@ -48,6 +48,7 @@
+ #include <linux/workqueue.h>
+ #include <linux/export.h>
+ #include <linux/hashtable.h>
++#include <linux/vs_context.h>
+
+ #include "timekeeping.h"
+
+@@ -417,6 +418,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().
+@@ -433,10 +435,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 -urNp -x '*.orig' linux-4.9/kernel/time/time.c linux-4.9/kernel/time/time.c
+--- linux-4.9/kernel/time/time.c 2021-02-24 15:47:32.494015471 +0100
++++ linux-4.9/kernel/time/time.c 2021-02-24 15:47:45.117743722 +0100
+@@ -38,6 +38,7 @@
+ #include <linux/fs.h>
+ #include <linux/math64.h>
+ #include <linux/ptrace.h>
++#include <linux/vs_time.h>
+
+ #include <asm/uaccess.h>
+ #include <asm/unistd.h>
+@@ -94,7 +95,7 @@ SYSCALL_DEFINE1(stime, time_t __user *,
if (err)
return err;
return 0;
}
-@@ -102,7 +102,7 @@ asmlinkage long sys_gettimeofday(struct
- {
- if (likely(tv != NULL)) {
- struct timeval ktv;
-- do_gettimeofday(&ktv);
-+ vx_gettimeofday(&ktv);
- if (copy_to_user(tv, &ktv, sizeof(ktv)))
- return -EFAULT;
- }
-@@ -176,7 +176,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.
- */
-- return do_settimeofday(tv);
-+ return vx_settimeofday(tv);
+@@ -187,7 +188,7 @@ int do_sys_settimeofday64(const struct t
+ }
}
+ if (tv)
+- return do_settimeofday64(tv);
++ return vx_settimeofday64(tv);
return 0;
}
-@@ -359,7 +359,7 @@ void getnstimeofday(struct timespec *tv)
- {
- struct timeval x;
-- do_gettimeofday(&x);
-+ vx_gettimeofday(&x);
- tv->tv_sec = x.tv_sec;
- tv->tv_nsec = x.tv_usec * NSEC_PER_USEC;
+diff -urNp -x '*.orig' linux-4.9/kernel/time/timekeeping.c linux-4.9/kernel/time/timekeeping.c
+--- linux-4.9/kernel/time/timekeeping.c 2021-02-24 15:47:32.494015471 +0100
++++ linux-4.9/kernel/time/timekeeping.c 2021-02-24 15:47:45.121077159 +0100
+@@ -23,6 +23,8 @@
+ #include <linux/stop_machine.h>
+ #include <linux/pvclock_gtod.h>
+ #include <linux/compiler.h>
++#include <linux/vs_time.h>
++#include <linux/vs_base.h>
+
+ #include "tick-internal.h"
+ #include "ntp_internal.h"
+@@ -768,6 +770,15 @@ ktime_t ktime_get_with_offset(enum tk_of
+
+ } while (read_seqcount_retry(&tk_core.seq, seq));
+
++#ifdef CONFIG_VSERVER_VTIME
++ if ((offs == TK_OFFS_BOOT) &&
++ vx_flags(VXF_VIRT_UPTIME, 0) &&
++ !vx_check(0, VS_ADMIN|VS_WATCH)) {
++ struct vx_info *vxi = current_vx_info();
++ ktime_t bias_uptime = timespec64_to_ktime(vxi->cvirt.bias_uptime);
++ base = ktime_sub(base, bias_uptime);
++ }
++#endif
+ return ktime_add_ns(base, nsecs);
+
}
-diff -NurpP --minimal linux-2.6.19.1/kernel/timer.c linux-2.6.19.1-vs2.3.0.6/kernel/timer.c
---- linux-2.6.19.1/kernel/timer.c 2006-11-30 21:19:44 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/timer.c 2006-11-08 06:18:54 +0100
-@@ -34,6 +34,10 @@
- #include <linux/time.h>
- #include <linux/jiffies.h>
- #include <linux/posix-timers.h>
+diff -urNp -x '*.orig' linux-4.9/kernel/time/timer.c linux-4.9/kernel/time/timer.c
+--- linux-4.9/kernel/time/timer.c 2021-02-24 15:47:32.494015471 +0100
++++ linux-4.9/kernel/time/timer.c 2021-02-24 15:47:45.121077159 +0100
+@@ -43,6 +43,10 @@
+ #include <linux/slab.h>
+ #include <linux/compat.h>
+ #include <linux/random.h>
+#include <linux/vs_base.h>
+#include <linux/vs_cvirt.h>
+#include <linux/vs_pid.h>
+#include <linux/vserver/sched.h>
- #include <linux/cpu.h>
- #include <linux/syscalls.h>
- #include <linux/delay.h>
-@@ -1082,12 +1086,6 @@ asmlinkage unsigned long sys_alarm(unsig
-
- #endif
--#ifndef __alpha__
--
--/*
-- * The Alpha uses getxpid, getxuid, and getxgid instead. Maybe this
-- * should be moved into arch/i386 instead?
-- */
+ #include <asm/uaccess.h>
+ #include <asm/unistd.h>
+diff -urNp -x '*.orig' linux-4.9/kernel/user_namespace.c linux-4.9/kernel/user_namespace.c
+--- linux-4.9/kernel/user_namespace.c 2021-02-24 15:47:32.504015783 +0100
++++ linux-4.9/kernel/user_namespace.c 2021-02-24 15:47:45.121077159 +0100
+@@ -22,6 +22,7 @@
+ #include <linux/ctype.h>
+ #include <linux/projid.h>
+ #include <linux/fs_struct.h>
++#include <linux/vserver/global.h>
- /**
- * sys_getpid - return the thread group id of the current process
-@@ -1100,7 +1098,7 @@ asmlinkage unsigned long sys_alarm(unsig
- */
- asmlinkage long sys_getpid(void)
- {
-- return current->tgid;
-+ return vx_map_tgid(current->tgid);
+ static struct kmem_cache *user_ns_cachep __read_mostly;
+ static DEFINE_MUTEX(userns_state_mutex);
+@@ -115,6 +116,7 @@ int create_user_ns(struct cred *new)
+
+ atomic_set(&ns->count, 1);
+ /* Leave the new->user_ns reference with the new user namespace. */
++ atomic_inc(&vs_global_user_ns);
+ ns->parent = parent_ns;
+ ns->level = parent_ns->level + 1;
+ ns->owner = owner;
+@@ -185,6 +187,7 @@ static void free_user_ns(struct work_str
+ key_put(ns->persistent_keyring_register);
+ #endif
+ ns_free_inum(&ns->ns);
++ atomic_dec(&vs_global_user_ns);
+ kmem_cache_free(user_ns_cachep, ns);
+ dec_user_namespaces(ucounts);
+ ns = parent;
+@@ -404,6 +407,18 @@ gid_t from_kgid_munged(struct user_names
}
+ EXPORT_SYMBOL(from_kgid_munged);
- /*
-@@ -1116,10 +1114,23 @@ asmlinkage long sys_getppid(void)
- rcu_read_lock();
- pid = rcu_dereference(current->real_parent)->tgid;
- rcu_read_unlock();
-+ return vx_map_pid(pid);
++ktag_t make_ktag(struct user_namespace *from, vtag_t tag)
++{
++ return KTAGT_INIT(tag);
+}
-
-- return pid;
-+#ifdef __alpha__
-+
-+/*
-+ * The Alpha uses getxpid, getxuid, and getxgid instead.
-+ */
++EXPORT_SYMBOL(make_ktag);
+
-+asmlinkage long do_getxpid(long *ppid)
++vtag_t from_ktag(struct user_namespace *to, ktag_t tag)
+{
-+ *ppid = sys_getppid();
-+ return sys_getpid();
- }
-
-+#else /* _alpha_ */
++ return __ktag_val(tag);
++}
++EXPORT_SYMBOL(from_ktag);
+
- asmlinkage long sys_getuid(void)
- {
- /* Only we change this so SMP safe */
-@@ -1281,6 +1292,8 @@ asmlinkage long sys_sysinfo(struct sysin
- tp.tv_nsec = tp.tv_nsec - NSEC_PER_SEC;
- tp.tv_sec++;
- }
-+ if (vx_flags(VXF_VIRT_UPTIME, 0))
-+ vx_vsi_uptime(&tp, NULL);
- val.uptime = tp.tv_sec + (tp.tv_nsec ? 1 : 0);
-
- val.loads[0] = avenrun[0] << (SI_LOAD_SHIFT - FSHIFT);
-diff -NurpP --minimal linux-2.6.19.1/kernel/user.c linux-2.6.19.1-vs2.3.0.6/kernel/user.c
---- linux-2.6.19.1/kernel/user.c 2006-11-30 21:19:44 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/user.c 2006-11-08 21:52:09 +0100
-@@ -23,8 +23,8 @@
- #define UIDHASH_BITS (CONFIG_BASE_SMALL ? 3 : 8)
- #define UIDHASH_SZ (1 << UIDHASH_BITS)
- #define UIDHASH_MASK (UIDHASH_SZ - 1)
--#define __uidhashfn(uid) (((uid >> UIDHASH_BITS) + uid) & UIDHASH_MASK)
--#define uidhashentry(uid) (uidhash_table + __uidhashfn((uid)))
-+#define __uidhashfn(xid,uid) ((((uid) >> UIDHASH_BITS) + ((uid)^(xid))) & UIDHASH_MASK)
-+#define uidhashentry(xid,uid) (uidhash_table + __uidhashfn((xid),(uid)))
-
- static kmem_cache_t *uid_cachep;
- static struct list_head uidhash_table[UIDHASH_SZ];
-@@ -66,7 +66,7 @@ static inline void uid_hash_remove(struc
- list_del(&up->uidhash_list);
- }
-
--static inline struct user_struct *uid_hash_find(uid_t uid, struct list_head *hashent)
-+static inline struct user_struct *uid_hash_find(xid_t xid, uid_t uid, struct list_head *hashent)
- {
- struct list_head *up;
-
-@@ -75,7 +75,7 @@ static inline struct user_struct *uid_ha
-
- user = list_entry(up, struct user_struct, uidhash_list);
+ /**
+ * make_kprojid - Map a user-namespace projid pair into a kprojid.
+ * @ns: User namespace that the projid is in
+diff -urNp -x '*.orig' linux-4.9/kernel/utsname.c linux-4.9/kernel/utsname.c
+--- linux-4.9/kernel/utsname.c 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/kernel/utsname.c 2021-02-24 15:47:45.121077159 +0100
+@@ -16,6 +16,7 @@
+ #include <linux/slab.h>
+ #include <linux/user_namespace.h>
+ #include <linux/proc_ns.h>
++#include <linux/vserver/global.h>
-- if(user->uid == uid) {
-+ if(user->uid == uid && user->xid == xid) {
- atomic_inc(&user->__count);
- return user;
- }
-@@ -90,13 +90,13 @@ static inline struct user_struct *uid_ha
- *
- * If the user_struct could not be found, return NULL.
- */
--struct user_struct *find_user(uid_t uid)
-+struct user_struct *find_user(xid_t xid, uid_t uid)
+ static struct ucounts *inc_uts_namespaces(struct user_namespace *ns)
{
- struct user_struct *ret;
- unsigned long flags;
-
- spin_lock_irqsave(&uidhash_lock, flags);
-- ret = uid_hash_find(uid, uidhashentry(uid));
-+ ret = uid_hash_find(xid, uid, uidhashentry(xid, uid));
- spin_unlock_irqrestore(&uidhash_lock, flags);
- return ret;
- }
-@@ -120,13 +120,13 @@ void free_uid(struct user_struct *up)
- }
+@@ -32,8 +33,10 @@ static struct uts_namespace *create_uts_
+ 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;
}
--struct user_struct * alloc_uid(uid_t uid)
-+struct user_struct * alloc_uid(xid_t xid, uid_t uid)
- {
-- struct list_head *hashent = uidhashentry(uid);
-+ struct list_head *hashent = uidhashentry(xid, uid);
- struct user_struct *up;
-
- spin_lock_irq(&uidhash_lock);
-- up = uid_hash_find(uid, hashent);
-+ up = uid_hash_find(xid, uid, hashent);
- spin_unlock_irq(&uidhash_lock);
-
- if (!up) {
-@@ -136,6 +136,7 @@ struct user_struct * alloc_uid(uid_t uid
- if (!new)
- return NULL;
- new->uid = uid;
-+ new->xid = xid;
- atomic_set(&new->__count, 1);
- atomic_set(&new->processes, 0);
- atomic_set(&new->files, 0);
-@@ -158,7 +159,7 @@ struct user_struct * alloc_uid(uid_t uid
- * on adding the same user already..
- */
- spin_lock_irq(&uidhash_lock);
-- up = uid_hash_find(uid, hashent);
-+ up = uid_hash_find(xid, uid, hashent);
- if (up) {
- key_put(new->uid_keyring);
- key_put(new->session_keyring);
-@@ -215,7 +216,7 @@ static int __init uid_cache_init(void)
-
- /* Insert the root user immediately (init already runs as root) */
- spin_lock_irq(&uidhash_lock);
-- uid_hash_insert(&root_user, uidhashentry(0));
-+ uid_hash_insert(&root_user, uidhashentry(0,0));
- spin_unlock_irq(&uidhash_lock);
+@@ -111,6 +114,7 @@ void free_uts_ns(struct kref *kref)
+ dec_uts_namespaces(ns->ucounts);
+ put_user_ns(ns->user_ns);
+ ns_free_inum(&ns->ns);
++ atomic_dec(&vs_global_uts_ns);
+ kfree(ns);
+ }
- return 0;
-diff -NurpP --minimal linux-2.6.19.1/kernel/vserver/Kconfig linux-2.6.19.1-vs2.3.0.6/kernel/vserver/Kconfig
---- linux-2.6.19.1/kernel/vserver/Kconfig 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/vserver/Kconfig 2006-12-17 04:04:22 +0100
-@@ -0,0 +1,241 @@
+diff -urNp -x '*.orig' linux-4.9/kernel/vserver/Kconfig linux-4.9/kernel/vserver/Kconfig
+--- linux-4.9/kernel/vserver/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/kernel/vserver/Kconfig 2021-02-24 15:47:45.124410596 +0100
+@@ -0,0 +1,230 @@
+#
+# Linux VServer configuration
+#
+
+menu "Linux VServer"
+
-+config VSERVER_SINGLE_IP
-+ bool "Single IP Special Casing"
-+ depends on EXPERIMENTAL
-+ default n
-+ help
-+ This allows to have network contexts with a single
-+ IP to 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_AUTO_LBACK
-+ bool "Automatically Assign Loopback IP"
++ bool "Automatically Assign Loopback IP"
+ default y
+ help
-+ This allows to have network contexts with a single
-+ IP to remap 0.0.0.0 bindings to that IP, avoiding
-+ further network checks and improving performance.
++ 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"
-+ depends on EXPERIMENTAL
+ default y
+ help
+ This enables the COW (Copy-On-Write) link break code.
+ link and create a copy of the unified file)
+
+config VSERVER_VTIME
-+ bool "Enable Virtualized Guest Time"
-+ depends on EXPERIMENTAL
++ bool "Enable Virtualized Guest Time (EXPERIMENTAL)"
+ default n
+ help
+ This enables per guest time offsets to allow for
+ 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
+
+ (note: on 1.2x the entries were visible by default)
+
-+config VSERVER_HARDCPU
-+ bool "Enable Hard CPU Limits"
-+ depends on EXPERIMENTAL
-+ default n
-+ help
-+ Activate the Hard CPU Limits
-+
-+ 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).
-+
-+ 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.
-+
-+config VSERVER_IDLETIME
-+ bool "Avoid idle CPUs by skipping Time"
-+ depends on VSERVER_HARDCPU
-+ default n
-+ 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.
-+
-+ This might improve interactivity and latency, but
-+ will also marginally increase scheduling overhead.
-+
+choice
+ prompt "Persistent Inode Tagging"
+ default TAGGING_ID24
+ disk representation, which limits the use to a few
+ filesystems (currently ext2 and ext3)
+
-+config TAGGING_RUNTIME
-+ bool "Runtime"
-+ depends on EXPERIMENTAL
-+ help
-+ inodes are tagged when first accessed, this doesn't
-+ require any persistant information, but might give
-+ funny results for mixed access.
-+
+endchoice
+
+config TAG_NFSD
+ Server to use the tagging specified above.
+ (will require patched clients too)
+
-+config PROPAGATE
-+ bool "Enable Inode Tag Propagation"
-+ default n
-+ depends on EXPERIMENTAL
-+ help
-+ This allows for the tagid= mount option to specify
-+ a tagid which is to be used for the entire mount
-+ tree.
-+
+config VSERVER_PRIVACY
+ bool "Honor Privacy Aspects of Guests"
-+ default y
++ 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 probably small
++ debugging output at runtime. It adds a very small
+ overhead to all vserver related functions and
+ increases the kernel size by about 20k.
+
+ This allows you to specify the number of entries in
+ the per-CPU history buffer.
+
-+config VSERVER_MONITOR
-+ bool "VServer Scheduling Monitor"
-+ depends on VSERVER_DEBUG
++config VSERVER_EXTRA_MNT_CHECK
++ bool "Extra Checks for Reachability"
+ default n
+ help
-+ Set this to yes if you want to record the scheduling
-+ decisions, so that they can be relayed to userspace
-+ for detailed analysis.
++ 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.
+
-+config VSERVER_MONITOR_SIZE
-+ int "Per-CPU Monitor Queue Size (32-65536)"
-+ depends on VSERVER_MONITOR
-+ range 32 65536
-+ default 1024
++choice
++ prompt "Quotes used in debug and warn messages"
++ default QUOTES_ISO8859
++
++config QUOTES_ISO8859
++ bool "Extended ASCII (ISO 8859) angle quotes"
+ help
-+ This allows you to specify the number of entries in
-+ the per-CPU scheduling monitor buffer.
++ 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 VSERVER_MONITOR_SYNC
-+ int "Per-CPU Monitor Sync Interval (0-65536)"
-+ depends on VSERVER_MONITOR
-+ range 0 65536
-+ default 256
++config QUOTES_ASCII
++ bool "ASCII single quotes"
+ help
-+ This allows you to specify the interval in ticks
-+ when a time sync entry is inserted.
++ 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
+ default y
+ select SECURITY_CAPABILITIES
+
-diff -NurpP --minimal linux-2.6.19.1/kernel/vserver/Makefile linux-2.6.19.1-vs2.3.0.6/kernel/vserver/Makefile
---- linux-2.6.19.1/kernel/vserver/Makefile 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/vserver/Makefile 2006-12-17 04:10:21 +0100
-@@ -0,0 +1,16 @@
++config VSERVER_DISABLED
++ bool
++ default n
++
+diff -urNp -x '*.orig' linux-4.9/kernel/vserver/Makefile linux-4.9/kernel/vserver/Makefile
+--- linux-4.9/kernel/vserver/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/kernel/vserver/Makefile 2021-02-24 15:47:45.124410596 +0100
+@@ -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
++ 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.19.1/kernel/vserver/cacct.c linux-2.6.19.1-vs2.3.0.6/kernel/vserver/cacct.c
---- linux-2.6.19.1/kernel/vserver/cacct.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/vserver/cacct.c 2006-11-30 18:53:18 +0100
-@@ -0,0 +1,44 @@
+diff -urNp -x '*.orig' linux-4.9/kernel/vserver/cacct.c linux-4.9/kernel/vserver/cacct.c
+--- linux-4.9/kernel/vserver/cacct.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/kernel/vserver/cacct.c 2021-02-24 15:47:45.121077159 +0100
+@@ -0,0 +1,42 @@
+/*
+ * linux/kernel/vserver/cacct.c
+ *
+ * Virtual Server: Context Accounting
+ *
-+ * Copyright (C) 2006 Herbert Pötzl
++ * Copyright (C) 2006-2007 Herbert P?tzl
+ *
+ * V0.01 added accounting stats
+ *
+ */
+
+#include <linux/types.h>
-+#include <linux/sched.h>
+#include <linux/vs_context.h>
-+#include <linux/vserver/switch.h>
+#include <linux/vserver/cacct_cmd.h>
+#include <linux/vserver/cacct_int.h>
+
+ struct vcmd_sock_stat_v0 vc_data;
+ int j, field;
+
-+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ if (copy_from_user(&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
+ field = vc_data.field;
+ if ((field < 0) || (field >= VXA_SOCK_SIZE))
+ return -EINVAL;
+
-+ for (j=0; j<3; j++) {
++ for (j = 0; j < 3; j++) {
+ vc_data.count[j] = vx_sock_count(&vxi->cacct, field, j);
+ vc_data.total[j] = vx_sock_total(&vxi->cacct, field, j);
+ }
+
-+ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
++ if (copy_to_user(data, &vc_data, sizeof(vc_data)))
+ return -EFAULT;
+ return 0;
+}
+
-diff -NurpP --minimal linux-2.6.19.1/kernel/vserver/cacct_init.h linux-2.6.19.1-vs2.3.0.6/kernel/vserver/cacct_init.h
---- linux-2.6.19.1/kernel/vserver/cacct_init.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/vserver/cacct_init.h 2006-11-08 04:57:49 +0100
+diff -urNp -x '*.orig' linux-4.9/kernel/vserver/cacct_init.h linux-4.9/kernel/vserver/cacct_init.h
+--- linux-4.9/kernel/vserver/cacct_init.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/kernel/vserver/cacct_init.h 2021-02-24 15:47:45.121077159 +0100
@@ -0,0 +1,25 @@
+
+
+static inline void vx_info_init_cacct(struct _vx_cacct *cacct)
+{
-+ int i,j;
++ int i, j;
+
+
-+ for (i=0; i<VXA_SOCK_SIZE; i++) {
-+ for (j=0; j<3; j++) {
-+ atomic_set(&cacct->sock[i][j].count, 0);
-+ atomic_set(&cacct->sock[i][j].total, 0);
++ for (i = 0; i < VXA_SOCK_SIZE; i++) {
++ for (j = 0; j < 3; j++) {
++ atomic_long_set(&cacct->sock[i][j].count, 0);
++ atomic_long_set(&cacct->sock[i][j].total, 0);
+ }
+ }
-+ for (i=0; i<8; i++)
++ for (i = 0; i < 8; i++)
+ atomic_set(&cacct->slab[i], 0);
-+ for (i=0; i<5; i++)
-+ for (j=0; j<4; j++)
++ for (i = 0; i < 5; i++)
++ for (j = 0; j < 4; j++)
+ atomic_set(&cacct->page[i][j], 0);
+}
+
+ return;
+}
+
-diff -NurpP --minimal linux-2.6.19.1/kernel/vserver/cacct_proc.h linux-2.6.19.1-vs2.3.0.6/kernel/vserver/cacct_proc.h
---- linux-2.6.19.1/kernel/vserver/cacct_proc.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/vserver/cacct_proc.h 2006-11-08 04:57:49 +0100
-@@ -0,0 +1,58 @@
+diff -urNp -x '*.orig' linux-4.9/kernel/vserver/cacct_proc.h linux-4.9/kernel/vserver/cacct_proc.h
+--- linux-4.9/kernel/vserver/cacct_proc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/kernel/vserver/cacct_proc.h 2021-02-24 15:47:45.121077159 +0100
+@@ -0,0 +1,53 @@
+#ifndef _VX_CACCT_PROC_H
+#define _VX_CACCT_PROC_H
+
+
+static inline int vx_info_proc_cacct(struct _vx_cacct *cacct, char *buffer)
+{
-+ int i,j, length = 0;
++ int i, j, length = 0;
+ static char *type[VXA_SOCK_SIZE] = {
-+ "UNSPEC", "UNIX", "INET", "INET6", "PACKET", "OTHER" };
++ "UNSPEC", "UNIX", "INET", "INET6", "PACKET", "OTHER"
++ };
+
+ length += sprintf(buffer + length, VX_SOCKA_TOP);
-+ for (i=0; i<VXA_SOCK_SIZE; i++) {
-+ length += sprintf(buffer + length,
-+ "%s:", type[i]);
-+ for (j=0; j<3; j++) {
++ for (i = 0; i < VXA_SOCK_SIZE; i++) {
++ length += sprintf(buffer + length, "%s:", type[i]);
++ for (j = 0; j < 3; j++) {
+ length += sprintf(buffer + length,
-+ "\t%10lu/%-10lu"
-+ ,vx_sock_count(cacct, i, j)
-+ ,vx_sock_total(cacct, i, j)
-+ );
++ "\t%10lu/%-10lu",
++ vx_sock_count(cacct, i, j),
++ vx_sock_total(cacct, i, j));
+ }
+ buffer[length++] = '\n';
+ }
+
+ length += sprintf(buffer + length, "\n");
+ length += sprintf(buffer + length,
-+ "slab:\t %8u %8u %8u %8u\n"
-+ ,atomic_read(&cacct->slab[1])
-+ ,atomic_read(&cacct->slab[4])
-+ ,atomic_read(&cacct->slab[0])
-+ ,atomic_read(&cacct->slab[2])
-+ );
++ "slab:\t %8u %8u %8u %8u\n",
++ atomic_read(&cacct->slab[1]),
++ atomic_read(&cacct->slab[4]),
++ atomic_read(&cacct->slab[0]),
++ atomic_read(&cacct->slab[2]));
+
+ length += sprintf(buffer + length, "\n");
-+ for (i=0; i<5; i++) {
++ for (i = 0; i < 5; i++) {
+ length += sprintf(buffer + length,
-+ "page[%d]: %8u %8u %8u %8u\t %8u %8u %8u %8u\n"
-+ ,i
-+ ,atomic_read(&cacct->page[i][0])
-+ ,atomic_read(&cacct->page[i][1])
-+ ,atomic_read(&cacct->page[i][2])
-+ ,atomic_read(&cacct->page[i][3])
-+ ,atomic_read(&cacct->page[i][4])
-+ ,atomic_read(&cacct->page[i][5])
-+ ,atomic_read(&cacct->page[i][6])
-+ ,atomic_read(&cacct->page[i][7])
-+ );
++ "page[%d]: %8u %8u %8u %8u\t %8u %8u %8u %8u\n", i,
++ atomic_read(&cacct->page[i][0]),
++ atomic_read(&cacct->page[i][1]),
++ atomic_read(&cacct->page[i][2]),
++ atomic_read(&cacct->page[i][3]),
++ atomic_read(&cacct->page[i][4]),
++ atomic_read(&cacct->page[i][5]),
++ atomic_read(&cacct->page[i][6]),
++ atomic_read(&cacct->page[i][7]));
+ }
-+
+ return length;
+}
+
+#endif /* _VX_CACCT_PROC_H */
-diff -NurpP --minimal linux-2.6.19.1/kernel/vserver/context.c linux-2.6.19.1-vs2.3.0.6/kernel/vserver/context.c
---- linux-2.6.19.1/kernel/vserver/context.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/vserver/context.c 2006-12-17 05:32:40 +0100
-@@ -0,0 +1,959 @@
+diff -urNp -x '*.orig' linux-4.9/kernel/vserver/context.c linux-4.9/kernel/vserver/context.c
+--- linux-4.9/kernel/vserver/context.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/kernel/vserver/context.c 2021-02-24 15:47:45.121077159 +0100
+@@ -0,0 +1,1119 @@
+/*
+ * linux/kernel/vserver/context.c
+ *
+ * Virtual Server: Context Support
+ *
-+ * Copyright (C) 2003-2006 Herbert Pötzl
++ * Copyright (C) 2003-2011 Herbert P?tzl
+ *
+ * V0.01 context helper
+ * V0.02 vx_ctx_kill syscall command
+ * V0.13 separate per cpu data
+ * V0.14 changed vcmds to vxi arg
+ * V0.15 added context stat
++ * V0.16 have __create claim() the vxi
++ * V0.17 removed older and legacy stuff
++ * V0.18 added user credentials
++ * V0.19 added warn mask
+ *
+ */
+
+#include <linux/slab.h>
+#include <linux/types.h>
-+#include <linux/namespace.h>
++#include <linux/security.h>
++#include <linux/pid_namespace.h>
++#include <linux/capability.h>
+
-+#include <linux/sched.h>
+#include <linux/vserver/context.h>
+#include <linux/vserver/network.h>
+#include <linux/vserver/debug.h>
+#include <linux/vserver/limit.h>
+#include <linux/vserver/limit_int.h>
+#include <linux/vserver/space.h>
++#include <linux/init_task.h>
++#include <linux/fs_struct.h>
++#include <linux/cred.h>
+
+#include <linux/vs_context.h>
+#include <linux/vs_limit.h>
++#include <linux/vs_pid.h>
+#include <linux/vserver/context_cmd.h>
+
-+#include <linux/err.h>
-+#include <asm/errno.h>
-+
+#include "cvirt_init.h"
+#include "cacct_init.h"
+#include "limit_init.h"
+
+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()
+ * 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;
++ int cpu, index;
+
+ vxdprintk(VXD_CBIT(xid, 0), "alloc_vx_info(%d)*", xid);
+
+ if (!new)
+ return 0;
+
-+ memset (new, 0, sizeof(struct vx_info));
++ memset(new, 0, sizeof(struct vx_info));
+#ifdef CONFIG_SMP
+ new->ptr_pc = alloc_percpu(struct _vx_info_pc);
+ if (!new->ptr_pc)
+ init_waitqueue_head(&new->vx_wait);
+
+ /* prepare reaper */
-+ get_task_struct(child_reaper);
-+ new->vx_reaper = child_reaper;
++ get_task_struct(init_pid_ns.child_reaper);
++ new->vx_reaper = init_pid_ns.child_reaper;
++ new->vx_badness_bias = 0;
+
+ /* rest of init goes here */
+ vx_info_init_limit(&new->limit);
+ }
+
+ new->vx_flags = VXF_INIT_SET;
-+ new->vx_bcaps = CAP_INIT_EFF_SET;
++ new->vx_bcaps = CAP_FULL_SET; // maybe ~CAP_SETPCAP
+ new->vx_ccaps = 0;
-+ new->vx_cap_bset = cap_bset;
++ new->vx_umask = 0;
++ new->vx_wmask = 0;
+
+ new->reboot_cmd = 0;
+ new->exit_code = 0;
+
++ // 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);
++ space->vx_fs = &init_fs;
++
++ /* FIXME: do we want defaults? */
++ // space->vx_real_cred = 0;
++ // space->vx_cred = 0;
++ }
++
++
+ vxdprintk(VXD_CBIT(xid, 0),
+ "alloc_vx_info(%d) = %p", xid, new);
+ vxh_alloc_vx_info(new);
+
+static void __dealloc_vx_info(struct vx_info *vxi)
+{
++#ifdef CONFIG_VSERVER_WARN
++ struct vx_info_save vxis;
+ int cpu;
-+
++#endif
+ vxdprintk(VXD_CBIT(xid, 0),
+ "dealloc_vx_info(%p)", vxi);
+ vxh_dealloc_vx_info(vxi);
+
-+ vxi->vx_id = -1;
-+
++#ifdef CONFIG_VSERVER_WARN
++ enter_vx_info(vxi, &vxis);
+ vx_info_exit_limit(&vxi->limit);
+ vx_info_exit_sched(&vxi->sched);
+ vx_info_exit_cvirt(&vxi->cvirt);
+ vx_info_exit_cvirt_pc(
+ &vx_per_cpu(vxi, cvirt_pc, cpu), cpu);
+ }
++ leave_vx_info(&vxis);
++#endif
+
++ vxi->vx_id = -1;
+ vxi->vx_state |= VXS_RELEASED;
+
+#ifdef CONFIG_SMP
+{
+ struct nsproxy *nsproxy;
+ struct fs_struct *fs;
++ struct cred *cred;
++ int index, kill;
+
+ might_sleep();
+
+ vxi->vx_state |= VXS_SHUTDOWN;
+ vs_state_change(vxi, VSC_SHUTDOWN);
+
-+ nsproxy = xchg(&vxi->vx_nsproxy, NULL);
-+ if (nsproxy)
-+ put_nsproxy(nsproxy);
++ for (index = 0; index < VX_SPACES; index++) {
++ struct _vx_space *space = &vxi->space[index];
++
++ nsproxy = xchg(&space->vx_nsproxy, NULL);
++ if (nsproxy)
++ put_nsproxy(nsproxy);
+
-+ fs = xchg(&vxi->vx_fs, NULL);
-+ if (fs)
-+ put_fs_struct(fs);
++ fs = xchg(&space->vx_fs, NULL);
++ spin_lock(&fs->lock);
++ kill = !--fs->users;
++ spin_unlock(&fs->lock);
++ if (kill)
++ free_fs_struct(fs);
++
++ cred = (struct cred *)xchg(&space->vx_cred, NULL);
++ if (cred)
++ abort_creds(cred);
++ }
+}
+
+/* exported stuff */
+void free_vx_info(struct vx_info *vxi)
+{
+ unsigned long flags;
++ unsigned index;
+
-+ /* context shutdown is mandatory */
-+ BUG_ON(!vx_info_state(vxi, VXS_SHUTDOWN));
-+
++ /* check for reference counts first */
+ BUG_ON(atomic_read(&vxi->vx_usecnt));
+ BUG_ON(atomic_read(&vxi->vx_tasks));
+
++ /* context must not be hashed */
+ BUG_ON(vx_info_state(vxi, VXS_HASHED));
+
-+ BUG_ON(vxi->vx_nsproxy);
-+ BUG_ON(vxi->vx_fs);
++ /* context shutdown is mandatory */
++ BUG_ON(!vx_info_state(vxi, VXS_SHUTDOWN));
++
++ /* spaces check */
++ for (index = 0; index < VX_SPACES; index++) {
++ struct _vx_space *space = &vxi->space[index];
++
++ BUG_ON(space->vx_nsproxy);
++ BUG_ON(space->vx_fs);
++ // BUG_ON(space->vx_real_cred);
++ // BUG_ON(space->vx_cred);
++ }
+
+ spin_lock_irqsave(&vx_info_inactive_lock, flags);
+ hlist_del(&vxi->vx_hlist);
+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);
+}
+
+ vxd_assert_lock(&vx_info_hash_lock);
+ vxdprintk(VXD_CBIT(xid, 4),
-+ "__unhash_vx_info: %p[#%d]", vxi, vxi->vx_id);
++ "__unhash_vx_info: %p[#%d.%d.%d]", vxi, vxi->vx_id,
++ atomic_read(&vxi->vx_usecnt), atomic_read(&vxi->vx_tasks));
+ vxh_unhash_vx_info(vxi);
+
+ /* context must be hashed */
+ BUG_ON(!vx_info_state(vxi, VXS_HASHED));
++ /* but without tasks */
++ BUG_ON(atomic_read(&vxi->vx_tasks));
+
+ vxi->vx_state &= ~VXS_HASHED;
+ hlist_del_init(&vxi->vx_hlist);
+ * 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;
+found:
+ vxdprintk(VXD_CBIT(xid, 0),
+ "__lookup_vx_info(#%u): %p[#%u]",
-+ xid, vxi, vxi?vxi->vx_id:0);
++ xid, vxi, vxi ? vxi->vx_id : 0);
+ vxh_lookup_vx_info(vxi, xid);
+ return vxi;
+}
+/* __create_vx_info()
+
+ * create the requested context
-+ * get() and hash it */
++ * get(), claim() and hash it */
+
-+static struct vx_info * __create_vx_info(int id)
++static struct vx_info *__create_vx_info(int id)
+{
+ struct vx_info *new, *vxi = NULL;
+
+ /* new context */
+ vxdprintk(VXD_CBIT(xid, 0),
+ "create_vx_info(%d) = %p (new)", id, new);
++ claim_vx_info(new, NULL);
+ __hash_vx_info(get_vx_info(new));
+ vxi = new, new = NULL;
+
+out_unlock:
+ spin_unlock(&vx_info_hash_lock);
-+ vxh_create_vx_info(IS_ERR(vxi)?NULL:vxi, id);
++ vxh_create_vx_info(IS_ERR(vxi) ? NULL : vxi, id);
+ if (new)
+ __dealloc_vx_info(new);
+ return vxi;
+
+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);
+}
+
+ struct vx_info *vxi = NULL;
+
+ if (id < 0) {
-+ vxi = get_vx_info(current->vx_info);
++ vxi = get_vx_info(current_vx_info());
+ } else if (id > 1) {
+ spin_lock(&vx_info_hash_lock);
+ vxi = get_vx_info(__lookup_vx_info(id));
+
+ * verify that xid is still hashed */
+
-+int xid_is_hashed(xid_t xid)
++int xid_is_hashed(vxid_t xid)
+{
+ int hashed;
+
+ int hindex, nr_xids = 0;
+
+ /* only show current and children */
-+ if (!vx_check(0, VS_ADMIN|VS_WATCH)) {
++ if (!vx_check(0, VS_ADMIN | VS_WATCH)) {
+ if (index > 0)
+ return 0;
+ xids[nr_xids] = vx_current_xid();
+
+#endif
+
++#if 0
+int vx_migrate_user(struct task_struct *p, struct vx_info *vxi)
+{
+ struct user_struct *new_user, *old_user;
+ free_uid(old_user);
+ return 0;
+}
++#endif
+
++#if 0
+void vx_mask_cap_bset(struct vx_info *vxi, struct task_struct *p)
+{
-+ p->cap_effective &= vxi->vx_cap_bset;
-+ p->cap_inheritable &= vxi->vx_cap_bset;
-+ p->cap_permitted &= vxi->vx_cap_bset;
++ // p->cap_effective &= vxi->vx_cap_bset;
++ p->cap_effective =
++ cap_intersect(p->cap_effective, vxi->cap_bset);
++ // p->cap_inheritable &= vxi->vx_cap_bset;
++ p->cap_inheritable =
++ cap_intersect(p->cap_inheritable, vxi->cap_bset);
++ // p->cap_permitted &= vxi->vx_cap_bset;
++ p->cap_permitted =
++ cap_intersect(p->cap_permitted, vxi->cap_bset);
+}
++#endif
+
+
+#include <linux/file.h>
++#include <linux/fdtable.h>
+
+static int vx_openfd_task(struct task_struct *tsk)
+{
+ /* 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)
+}
+
+
-+/* for *space compatibility */
++/* for *space compatibility */
+
+asmlinkage long sys_unshare(unsigned long);
+
+ !vx_info_flags(vxi, VXF_STATE_SETUP, 0))
+ return -EACCES;
+
++ if (vx_info_state(vxi, VXS_SHUTDOWN))
++ return -EFAULT;
++
+ old_vxi = task_get_vx_info(p);
+ if (old_vxi == vxi)
+ goto out;
+
-+ if (!(ret = vx_migrate_user(p, vxi))) {
++// if (!(ret = vx_migrate_user(p, vxi))) {
++ {
+ int openfd;
+
+ task_lock(p);
+ "moved task %p into vxi:%p[#%d]",
+ p, vxi, vxi->vx_id);
+
-+ vx_mask_cap_bset(vxi, p);
++ // vx_mask_cap_bset(vxi, p);
+ task_unlock(p);
+
+ /* hack for *spaces to provide compatibility */
+ if (unshare) {
-+ ret = sys_unshare(CLONE_NEWUTS|CLONE_NEWIPC);
-+ vx_set_space(vxi, CLONE_NEWUTS|CLONE_NEWIPC);
++ struct nsproxy *old_nsp, *new_nsp;
++
++ ret = unshare_nsproxy_namespaces(
++ CLONE_NEWUTS | CLONE_NEWIPC | CLONE_NEWUSER,
++ &new_nsp, NULL, NULL);
++ if (ret)
++ goto out;
++
++ old_nsp = xchg(&p->nsproxy, new_nsp);
++ vx_set_space(vxi,
++ CLONE_NEWUTS | CLONE_NEWIPC | CLONE_NEWUSER, 0);
++ put_nsproxy(old_nsp);
+ }
+ }
+out:
+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;
+ 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;
+}
+
+ vxi, vxi->vx_id, p, p->xid, p->pid, p->tgid);
+
+ vxi->vx_flags &= ~VXF_STATE_INIT;
-+ vxi->vx_initpid = p->tgid;
++ // vxi->vx_initpid = p->tgid;
++ vxi->vx_initpid = p->pid;
+ return 0;
+}
+
+ "vx_set_persistent(%p[#%d])", vxi, vxi->vx_id);
+
+ get_vx_info(vxi);
-+ claim_vx_info(vxi, current);
++ claim_vx_info(vxi, NULL);
+}
+
+void vx_clear_persistent(struct vx_info *vxi)
+ vxdprintk(VXD_CBIT(xid, 6),
+ "vx_clear_persistent(%p[#%d])", vxi, vxi->vx_id);
+
-+ release_vx_info(vxi, current);
++ release_vx_info(vxi, NULL);
+ put_vx_info(vxi);
+}
+
+ struct vx_info *vxi = p->vx_info;
+
+ if (vxi) {
-+ if (vxi->vx_initpid == p->tgid)
++ if (vxi->vx_initpid == p->pid)
+ vx_exit_init(vxi, p, code);
+ if (vxi->vx_reaper == p)
-+ vx_set_reaper(vxi, child_reaper);
++ vx_set_reaper(vxi, init_pid_ns.child_reaper);
+ }
+}
+
+#include <asm/uaccess.h>
+
+
-+int vc_task_xid(uint32_t id, void __user *data)
++int vc_task_xid(uint32_t id)
+{
-+ xid_t xid;
++ vxid_t xid;
+
+ if (id) {
+ struct task_struct *tsk;
+
-+ if (!vx_check(0, VS_ADMIN|VS_WATCH))
-+ return -EPERM;
-+
-+ read_lock(&tasklist_lock);
++ rcu_read_lock();
+ tsk = find_task_by_real_pid(id);
+ xid = (tsk) ? tsk->xid : -ESRCH;
-+ read_unlock(&tasklist_lock);
-+ }
-+ else
++ rcu_read_unlock();
++ } else
+ xid = vx_current_xid();
+ return xid;
+}
+ vc_data.xid = vxi->vx_id;
+ vc_data.initpid = vxi->vx_initpid;
+
-+ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
++ if (copy_to_user(data, &vc_data, sizeof(vc_data)))
+ return -EFAULT;
+ return 0;
+}
+ vc_data.usecnt = atomic_read(&vxi->vx_usecnt);
+ vc_data.tasks = atomic_read(&vxi->vx_tasks);
+
-+ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
++ if (copy_to_user(data, &vc_data, sizeof(vc_data)))
+ return -EFAULT;
+ return 0;
+}
+ struct vx_info *new_vxi;
+ int ret;
+
-+ if (data && copy_from_user (&vc_data, data, sizeof(vc_data)))
++ if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
+ if ((xid > MAX_S_CONTEXT) || (xid < 2))
+ /* initial flags */
+ new_vxi->vx_flags = vc_data.flagword;
+
-+ /* get a reference for persistent contexts */
-+ if ((vc_data.flagword & VXF_PERSISTENT))
-+ vx_set_persistent(new_vxi);
-+
+ ret = -ENOEXEC;
+ if (vs_state_change(new_vxi, VSC_STARTUP))
-+ goto out_unhash;
++ goto out;
++
+ ret = vx_migrate_task(current, new_vxi, (!data));
-+ if (!ret) {
-+ /* return context id on success */
-+ ret = new_vxi->vx_id;
++ if (ret)
+ goto out;
-+ }
-+out_unhash:
-+ /* prepare for context disposal */
-+ new_vxi->vx_state |= VXS_SHUTDOWN;
++
++ /* return context id on success */
++ ret = new_vxi->vx_id;
++
++ /* get a reference for persistent contexts */
+ if ((vc_data.flagword & VXF_PERSISTENT))
-+ vx_clear_persistent(new_vxi);
-+ __unhash_vx_info(new_vxi);
++ vx_set_persistent(new_vxi);
+out:
++ release_vx_info(new_vxi, NULL);
+ put_vx_info(new_vxi);
+ return ret;
+}
+ struct vcmd_ctx_migrate vc_data = { .flagword = 0 };
+ int ret;
+
-+ if (data && copy_from_user (&vc_data, data, sizeof(vc_data)))
++ if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
+ ret = vx_migrate_task(current, vxi, 0);
+ vc_data.flagword = vxi->vx_flags;
+
+ /* special STATE flag handling */
-+ vc_data.mask = vs_mask_flags(~0UL, vxi->vx_flags, VXF_ONE_TIME);
++ vc_data.mask = vs_mask_flags(~0ULL, vxi->vx_flags, VXF_ONE_TIME);
+
-+ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
++ if (copy_to_user(data, &vc_data, sizeof(vc_data)))
+ return -EFAULT;
+ return 0;
+}
+ struct vcmd_ctx_flags_v0 vc_data;
+ uint64_t mask, trigger;
+
-+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ if (copy_from_user(&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
+ /* special STATE flag handling */
+ mask = vs_mask_mask(vc_data.mask, vxi->vx_flags, VXF_ONE_TIME);
+ trigger = (mask & vxi->vx_flags) ^ (mask & vc_data.flagword);
+
-+ if (vxi == current->vx_info) {
-+ if (trigger & VXF_STATE_SETUP)
-+ vx_mask_cap_bset(vxi, current);
++ if (vxi == current_vx_info()) {
++ /* if (trigger & VXF_STATE_SETUP)
++ vx_mask_cap_bset(vxi, current); */
+ if (trigger & VXF_STATE_INIT) {
+ int ret;
+
+ return 0;
+}
+
-+static int do_get_caps(struct vx_info *vxi, uint64_t *bcaps, uint64_t *ccaps)
++
++static inline uint64_t caps_from_cap_t(kernel_cap_t c)
+{
-+ if (bcaps)
-+ *bcaps = vxi->vx_bcaps;
-+ if (ccaps)
-+ *ccaps = vxi->vx_ccaps;
++ uint64_t v = c.cap[0] | ((uint64_t)c.cap[1] << 32);
+
-+ return 0;
++ // printk("caps_from_cap_t(%08x:%08x) = %016llx\n", c.cap[1], c.cap[0], v);
++ return v;
+}
+
-+int vc_get_ccaps_v0(struct vx_info *vxi, void __user *data)
++static inline kernel_cap_t cap_t_from_caps(uint64_t v)
+{
-+ struct vcmd_ctx_caps_v0 vc_data;
-+ int ret;
++ kernel_cap_t c = __cap_empty_set;
+
-+ ret = do_get_caps(vxi, &vc_data.bcaps, &vc_data.ccaps);
-+ if (ret)
-+ return ret;
-+ vc_data.cmask = ~0UL;
++ c.cap[0] = v & 0xFFFFFFFF;
++ c.cap[1] = (v >> 32) & 0xFFFFFFFF;
++
++ // printk("cap_t_from_caps(%016llx) = %08x:%08x\n", v, c.cap[1], c.cap[0]);
++ return c;
++}
++
++
++static int do_get_caps(struct vx_info *vxi, uint64_t *bcaps, uint64_t *ccaps)
++{
++ if (bcaps)
++ *bcaps = caps_from_cap_t(vxi->vx_bcaps);
++ if (ccaps)
++ *ccaps = vxi->vx_ccaps;
+
-+ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
-+ return -EFAULT;
+ return 0;
+}
+
+ ret = do_get_caps(vxi, NULL, &vc_data.ccaps);
+ if (ret)
+ return ret;
-+ vc_data.cmask = ~0UL;
++ vc_data.cmask = ~0ULL;
+
-+ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
++ if (copy_to_user(data, &vc_data, sizeof(vc_data)))
+ return -EFAULT;
+ return 0;
+}
+static int do_set_caps(struct vx_info *vxi,
+ uint64_t bcaps, uint64_t bmask, uint64_t ccaps, uint64_t cmask)
+{
-+ vxi->vx_bcaps = vs_mask_flags(vxi->vx_bcaps, bcaps, bmask);
++ uint64_t bcold = caps_from_cap_t(vxi->vx_bcaps);
++
++#if 0
++ printk("do_set_caps(%16llx, %16llx, %16llx, %16llx)\n",
++ bcaps, bmask, ccaps, cmask);
++#endif
++ vxi->vx_bcaps = cap_t_from_caps(
++ vs_mask_flags(bcold, bcaps, bmask));
+ vxi->vx_ccaps = vs_mask_flags(vxi->vx_ccaps, ccaps, cmask);
+
+ return 0;
+}
+
-+int vc_set_ccaps_v0(struct vx_info *vxi, void __user *data)
-+{
-+ struct vcmd_ctx_caps_v0 vc_data;
-+
-+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
-+ return -EFAULT;
-+
-+ /* simulate old &= behaviour for bcaps */
-+ return do_set_caps(vxi, 0, ~vc_data.bcaps,
-+ vc_data.ccaps, vc_data.cmask);
-+}
-+
+int vc_set_ccaps(struct vx_info *vxi, void __user *data)
+{
+ struct vcmd_ctx_caps_v1 vc_data;
+
-+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ if (copy_from_user(&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
+ return do_set_caps(vxi, 0, 0, vc_data.ccaps, vc_data.cmask);
+ ret = do_get_caps(vxi, &vc_data.bcaps, NULL);
+ if (ret)
+ return ret;
-+ vc_data.bmask = ~0UL;
++ vc_data.bmask = ~0ULL;
+
-+ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
++ if (copy_to_user(data, &vc_data, sizeof(vc_data)))
+ return -EFAULT;
+ return 0;
+}
+{
+ struct vcmd_bcaps vc_data;
+
-+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ if (copy_from_user(&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
+ return do_set_caps(vxi, vc_data.bcaps, vc_data.bmask, 0, 0);
+}
+
++
++int vc_get_umask(struct vx_info *vxi, void __user *data)
++{
++ struct vcmd_umask vc_data;
++
++ vc_data.umask = vxi->vx_umask;
++ vc_data.mask = ~0ULL;
++
++ if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++ return -EFAULT;
++ return 0;
++}
++
++int vc_set_umask(struct vx_info *vxi, void __user *data)
++{
++ struct vcmd_umask vc_data;
++
++ if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
++
++ vxi->vx_umask = vs_mask_flags(vxi->vx_umask,
++ vc_data.umask, vc_data.mask);
++ return 0;
++}
++
++
++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;
++
++ vc_data.bias = vxi->vx_badness_bias;
++
++ if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++ return -EFAULT;
++ return 0;
++}
++
++int vc_set_badness(struct vx_info *vxi, void __user *data)
++{
++ struct vcmd_badness_v0 vc_data;
++
++ if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
++
++ vxi->vx_badness_bias = vc_data.bias;
++ return 0;
++}
++
+#include <linux/module.h>
+
+EXPORT_SYMBOL_GPL(free_vx_info);
+
-diff -NurpP --minimal linux-2.6.19.1/kernel/vserver/cvirt.c linux-2.6.19.1-vs2.3.0.6/kernel/vserver/cvirt.c
---- linux-2.6.19.1/kernel/vserver/cvirt.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/vserver/cvirt.c 2006-11-14 02:30:02 +0100
-@@ -0,0 +1,305 @@
+diff -urNp -x '*.orig' linux-4.9/kernel/vserver/cvirt.c linux-4.9/kernel/vserver/cvirt.c
+--- linux-4.9/kernel/vserver/cvirt.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/kernel/vserver/cvirt.c 2021-02-24 15:47:45.121077159 +0100
+@@ -0,0 +1,350 @@
+/*
+ * linux/kernel/vserver/cvirt.c
+ *
+ * Virtual Server: Context Virtualization
+ *
-+ * Copyright (C) 2004-2006 Herbert Pötzl
++ * Copyright (C) 2004-2007 Herbert P?tzl
+ *
+ * V0.01 broken out from limit.c
+ * V0.02 added utsname stuff
+ *
+ */
+
-+#include <linux/sched.h>
-+#include <linux/sysctl.h>
+#include <linux/types.h>
-+#include <linux/vs_context.h>
++#include <linux/utsname.h>
+#include <linux/vs_cvirt.h>
+#include <linux/vserver/switch.h>
+#include <linux/vserver/cvirt_cmd.h>
-+//#include <linux/vserver/cacct_cmd.h>
+
-+#include <asm/errno.h>
+#include <asm/uaccess.h>
+
+
++void vx_vsi_boottime64(struct timespec64 *boottime)
++{
++ struct vx_info *vxi = current_vx_info();
++
++ set_normalized_timespec64(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;
++ struct vx_info *vxi = current_vx_info();
+
+ set_normalized_timespec(uptime,
+ uptime->tv_sec - vxi->cvirt.bias_uptime.tv_sec,
+{
+ int error = 0;
+ int do_clear = 0;
-+ struct vx_info *vxi = current->vx_info;
++ struct vx_info *vxi = current_vx_info();
+ struct _vx_syslog *log;
+
+ if (!vxi)
+
+/* virtual host info names */
+
-+static char * vx_vhi_name(struct vx_info *vxi, int id)
++static char *vx_vhi_name(struct vx_info *vxi, int id)
+{
+ struct nsproxy *nsproxy;
+ struct uts_namespace *uts;
+
-+
+ if (id == VHIN_CONTEXT)
+ return vxi->vx_name;
+
-+ nsproxy = vxi->vx_nsproxy;
++ nsproxy = vxi->space[0].vx_nsproxy;
+ if (!nsproxy)
+ return NULL;
+
+ struct vcmd_vhi_name_v0 vc_data;
+ char *name;
+
-+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ if (copy_from_user(&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
+ name = vx_vhi_name(vxi, vc_data.field);
+ struct vcmd_vhi_name_v0 vc_data;
+ char *name;
+
-+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ if (copy_from_user(&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
+ name = vx_vhi_name(vxi, vc_data.field);
+ return -EINVAL;
+
+ memcpy(vc_data.name, name, 65);
-+ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
++ if (copy_to_user(data, &vc_data, sizeof(vc_data)))
+ return -EFAULT;
+ return 0;
+}
+{
+ struct vcmd_virt_stat_v0 vc_data;
+ struct _vx_cvirt *cvirt = &vxi->cvirt;
-+ struct timespec uptime;
++ struct timespec64 uptime;
+
-+ do_posix_clock_monotonic_gettime(&uptime);
-+ set_normalized_timespec(&uptime,
++ ktime_get_ts64(&uptime);
++ set_normalized_timespec64(&uptime,
+ uptime.tv_sec - cvirt->bias_uptime.tv_sec,
+ uptime.tv_nsec - cvirt->bias_uptime.tv_nsec);
+
-+ vc_data.offset = timeval_to_ns(&cvirt->bias_tv);
-+ vc_data.uptime = timespec_to_ns(&uptime);
++ vc_data.offset = timespec64_to_ns(&cvirt->bias_ts);
++ vc_data.uptime = timespec64_to_ns(&uptime);
+ vc_data.nr_threads = atomic_read(&cvirt->nr_threads);
+ vc_data.nr_running = atomic_read(&cvirt->nr_running);
+ vc_data.nr_uninterruptible = atomic_read(&cvirt->nr_uninterruptible);
+ vc_data.load[1] = cvirt->load[1];
+ vc_data.load[2] = cvirt->load[2];
+
-+ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
++ if (copy_to_user(data, &vc_data, sizeof(vc_data)))
+ return -EFAULT;
+ return 0;
+}
+
+/* virtualized time base */
+
-+void vx_gettimeofday(struct timeval *tv)
++void vx_adjust_timespec(struct timespec *ts)
++{
++ struct vx_info *vxi;
++
++ if (!vx_flags(VXF_VIRT_TIME, 0))
++ return;
++
++ vxi = current_vx_info();
++ ts->tv_sec += vxi->cvirt.bias_ts.tv_sec;
++ ts->tv_nsec += vxi->cvirt.bias_ts.tv_nsec;
++
++ if (ts->tv_nsec >= NSEC_PER_SEC) {
++ ts->tv_sec++;
++ ts->tv_nsec -= NSEC_PER_SEC;
++ } else if (ts->tv_nsec < 0) {
++ ts->tv_sec--;
++ ts->tv_nsec += NSEC_PER_SEC;
++ }
++}
++
++void vx_adjust_timespec64(struct timespec64 *ts)
+{
-+ do_gettimeofday(tv);
++ struct vx_info *vxi;
++
+ if (!vx_flags(VXF_VIRT_TIME, 0))
+ return;
+
-+ tv->tv_sec += current->vx_info->cvirt.bias_tv.tv_sec;
-+ tv->tv_usec += current->vx_info->cvirt.bias_tv.tv_usec;
++ vxi = current_vx_info();
++ ts->tv_sec += vxi->cvirt.bias_ts.tv_sec;
++ ts->tv_nsec += vxi->cvirt.bias_ts.tv_nsec;
+
-+ if (tv->tv_usec >= USEC_PER_SEC) {
-+ tv->tv_sec++;
-+ tv->tv_usec -= USEC_PER_SEC;
-+ } else if (tv->tv_usec < 0) {
-+ tv->tv_sec--;
-+ tv->tv_usec += USEC_PER_SEC;
++ if (ts->tv_nsec >= NSEC_PER_SEC) {
++ ts->tv_sec++;
++ ts->tv_nsec -= NSEC_PER_SEC;
++ } else if (ts->tv_nsec < 0) {
++ ts->tv_sec--;
++ ts->tv_nsec += NSEC_PER_SEC;
+ }
+}
+
-+int vx_settimeofday(struct timespec *ts)
++int vx_settimeofday(const struct timespec *ts)
++{
++ struct timespec ats, delta;
++ struct vx_info *vxi;
++
++ if (!vx_flags(VXF_VIRT_TIME, 0))
++ return do_settimeofday(ts);
++
++ getnstimeofday(&ats);
++ delta = timespec_sub(*ts, ats);
++
++ vxi = current_vx_info();
++ vxi->cvirt.bias_ts = timespec64_add(vxi->cvirt.bias_ts,
++ timespec_to_timespec64(delta));
++ return 0;
++}
++
++int vx_settimeofday64(const struct timespec64 *ts)
+{
-+ struct timeval tv;
++ struct timespec64 ats, delta;
++ struct vx_info *vxi;
+
+ if (!vx_flags(VXF_VIRT_TIME, 0))
-+ return do_settimeofday(ts);
++ return do_settimeofday64(ts);
++
++ getnstimeofday64(&ats);
++ delta = timespec64_sub(*ts, ats);
+
-+ do_gettimeofday(&tv);
-+ current->vx_info->cvirt.bias_tv.tv_sec =
-+ ts->tv_sec - tv.tv_sec;
-+ current->vx_info->cvirt.bias_tv.tv_usec =
-+ (ts->tv_nsec/NSEC_PER_USEC) - tv.tv_usec;
++ vxi = current_vx_info();
++ vxi->cvirt.bias_ts = timespec64_add(vxi->cvirt.bias_ts, delta);
+ return 0;
+}
+
+#endif
+
-diff -NurpP --minimal linux-2.6.19.1/kernel/vserver/cvirt_init.h linux-2.6.19.1-vs2.3.0.6/kernel/vserver/cvirt_init.h
---- linux-2.6.19.1/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/vserver/cvirt_init.h 2006-11-14 02:11:41 +0100
-@@ -0,0 +1,71 @@
+diff -urNp -x '*.orig' linux-4.9/kernel/vserver/cvirt_init.h linux-4.9/kernel/vserver/cvirt_init.h
+--- linux-4.9/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/kernel/vserver/cvirt_init.h 2021-02-24 15:47:45.121077159 +0100
+@@ -0,0 +1,70 @@
+
+
+extern uint64_t vx_idle_jiffies(void);
+ uint64_t idle_jiffies = vx_idle_jiffies();
+ uint64_t nsuptime;
+
-+ do_posix_clock_monotonic_gettime(&cvirt->bias_uptime);
++ ktime_get_ts64(&cvirt->bias_uptime);
+ nsuptime = (unsigned long long)cvirt->bias_uptime.tv_sec
+ * NSEC_PER_SEC + cvirt->bias_uptime.tv_nsec;
+ cvirt->bias_clock = nsec_to_clock_t(nsuptime);
-+ cvirt->bias_tv.tv_sec = 0;
-+ cvirt->bias_tv.tv_usec = 0;
++ cvirt->bias_ts.tv_sec = 0;
++ cvirt->bias_ts.tv_nsec = 0;
+
-+ jiffies_to_timespec(idle_jiffies, &cvirt->bias_idle);
++ jiffies_to_timespec64(idle_jiffies, &cvirt->bias_idle);
+ atomic_set(&cvirt->nr_threads, 0);
+ atomic_set(&cvirt->nr_running, 0);
+ atomic_set(&cvirt->nr_uninterruptible, 0);
+
+static inline void vx_info_exit_cvirt(struct _vx_cvirt *cvirt)
+{
-+#ifdef CONFIG_VSERVER_DEBUG
++#ifdef CONFIG_VSERVER_WARN
+ int value;
-+
-+ vxwprintk((value = atomic_read(&cvirt->nr_threads)),
++#endif
++ vxwprintk_xid((value = atomic_read(&cvirt->nr_threads)),
+ "!!! cvirt: %p[nr_threads] = %d on exit.",
+ cvirt, value);
-+ vxwprintk((value = atomic_read(&cvirt->nr_running)),
++ vxwprintk_xid((value = atomic_read(&cvirt->nr_running)),
+ "!!! cvirt: %p[nr_running] = %d on exit.",
+ cvirt, value);
-+ vxwprintk((value = atomic_read(&cvirt->nr_uninterruptible)),
++ vxwprintk_xid((value = atomic_read(&cvirt->nr_uninterruptible)),
+ "!!! cvirt: %p[nr_uninterruptible] = %d on exit.",
+ cvirt, value);
-+ vxwprintk((value = atomic_read(&cvirt->nr_onhold)),
++ vxwprintk_xid((value = atomic_read(&cvirt->nr_onhold)),
+ "!!! cvirt: %p[nr_onhold] = %d on exit.",
+ cvirt, value);
-+#endif
+ return;
+}
+
+ return;
+}
+
-diff -NurpP --minimal linux-2.6.19.1/kernel/vserver/cvirt_proc.h linux-2.6.19.1-vs2.3.0.6/kernel/vserver/cvirt_proc.h
---- linux-2.6.19.1/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/vserver/cvirt_proc.h 2006-11-14 03:08:43 +0100
-@@ -0,0 +1,138 @@
+diff -urNp -x '*.orig' linux-4.9/kernel/vserver/cvirt_proc.h linux-4.9/kernel/vserver/cvirt_proc.h
+--- linux-4.9/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/kernel/vserver/cvirt_proc.h 2021-02-24 15:47:45.121077159 +0100
+@@ -0,0 +1,123 @@
+#ifndef _VX_CVIRT_PROC_H
+#define _VX_CVIRT_PROC_H
+
+#include <linux/nsproxy.h>
-+#include <linux/namespace.h>
++#include <linux/mnt_namespace.h>
++#include <linux/ipc_namespace.h>
+#include <linux/utsname.h>
+#include <linux/ipc.h>
+
++extern int vx_info_mnt_namespace(struct mnt_namespace *, char *);
+
+static inline
+int vx_info_proc_nsproxy(struct nsproxy *nsproxy, char *buffer)
+{
-+ struct namespace *ns;
++ struct mnt_namespace *ns;
+ struct uts_namespace *uts;
+ struct ipc_namespace *ipc;
-+ struct vfsmount *mnt;
-+ char *path, *root;
+ int length = 0;
+
+ if (!nsproxy)
+
+ length += sprintf(buffer + length,
+ "NSProxy:\t%p [%p,%p,%p]\n",
-+ nsproxy, nsproxy->namespace,
++ nsproxy, nsproxy->mnt_ns,
+ nsproxy->uts_ns, nsproxy->ipc_ns);
+
-+ ns = nsproxy->namespace;
++ ns = nsproxy->mnt_ns;
+ if (!ns)
+ goto skip_ns;
+
-+ path = kmalloc(PATH_MAX, GFP_KERNEL);
-+ if (!path)
-+ goto skip_ns;
++ length += vx_info_mnt_namespace(ns, buffer + length);
+
-+ mnt = ns->root;
-+ root = d_path(mnt->mnt_root, mnt->mnt_parent, path, PATH_MAX-2);
-+ length += sprintf(buffer + length,
-+ "Namespace:\t%p [#%u]\n"
-+ "RootPath:\t%s\n"
-+ ,ns , atomic_read(&ns->count)
-+ ,root);
-+ kfree(path);
+skip_ns:
+
+ uts = nsproxy->uts_ns;
+ "Release:\t%.*s\n"
+ "Version:\t%.*s\n"
+ "Machine:\t%.*s\n"
-+ "DomainName:\t%.*s\n"
-+ ,__NEW_UTS_LEN, uts->name.sysname
-+ ,__NEW_UTS_LEN, uts->name.nodename
-+ ,__NEW_UTS_LEN, uts->name.release
-+ ,__NEW_UTS_LEN, uts->name.version
-+ ,__NEW_UTS_LEN, uts->name.machine
-+ ,__NEW_UTS_LEN, uts->name.domainname
-+ );
++ "DomainName:\t%.*s\n",
++ __NEW_UTS_LEN, uts->name.sysname,
++ __NEW_UTS_LEN, uts->name.nodename,
++ __NEW_UTS_LEN, uts->name.release,
++ __NEW_UTS_LEN, uts->name.version,
++ __NEW_UTS_LEN, uts->name.machine,
++ __NEW_UTS_LEN, uts->name.domainname);
+skip_uts:
+
+ ipc = nsproxy->ipc_ns;
+ length += sprintf(buffer + length,
+ "SEMS:\t\t%d %d %d %d %d\n"
+ "MSG:\t\t%d %d %d\n"
-+ "SHM:\t\t%lu %lu %d %d\n"
-+ ,ipc->sem_ctls[0], ipc->sem_ctls[1]
-+ ,ipc->sem_ctls[2], ipc->sem_ctls[3]
-+ ,ipc->used_sems
-+ ,ipc->msg_ctlmax, ipc->msg_ctlmnb, ipc->msg_ctlmni
-+ ,(unsigned long)ipc->shm_ctlmax
-+ ,(unsigned long)ipc->shm_ctlall
-+ ,ipc->shm_ctlmni, ipc->shm_tot
-+ );
++ "SHM:\t\t%lu %lu %d %ld\n",
++ ipc->sem_ctls[0], ipc->sem_ctls[1],
++ ipc->sem_ctls[2], ipc->sem_ctls[3],
++ ipc->used_sems,
++ ipc->msg_ctlmax, ipc->msg_ctlmnb, ipc->msg_ctlmni,
++ (unsigned long)ipc->shm_ctlmax,
++ (unsigned long)ipc->shm_ctlall,
++ ipc->shm_ctlmni, ipc->shm_tot);
+skip_ipc:
-+
+out:
+ return length;
+}
+
+
-+#include <linux/sched.h>
++#include <linux/sched.h>
++
++#define LOAD_INT(x) ((x) >> FSHIFT)
++#define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1 - 1)) * 100)
++
++static inline
++int vx_info_proc_cvirt(struct _vx_cvirt *cvirt, char *buffer)
++{
++ int length = 0;
++ int a, b, c;
++
++ length += sprintf(buffer + length,
++ "BiasUptime:\t%llu.%02lu\n",
++ (unsigned long long)cvirt->bias_uptime.tv_sec,
++ (cvirt->bias_uptime.tv_nsec / (NSEC_PER_SEC / 100)));
++
++ a = cvirt->load[0] + (FIXED_1 / 200);
++ b = cvirt->load[1] + (FIXED_1 / 200);
++ c = cvirt->load[2] + (FIXED_1 / 200);
++ length += sprintf(buffer + length,
++ "nr_threads:\t%d\n"
++ "nr_running:\t%d\n"
++ "nr_unintr:\t%d\n"
++ "nr_onhold:\t%d\n"
++ "load_updates:\t%d\n"
++ "loadavg:\t%d.%02d %d.%02d %d.%02d\n"
++ "total_forks:\t%d\n",
++ atomic_read(&cvirt->nr_threads),
++ atomic_read(&cvirt->nr_running),
++ atomic_read(&cvirt->nr_uninterruptible),
++ atomic_read(&cvirt->nr_onhold),
++ atomic_read(&cvirt->load_updates),
++ LOAD_INT(a), LOAD_FRAC(a),
++ LOAD_INT(b), LOAD_FRAC(b),
++ LOAD_INT(c), LOAD_FRAC(c),
++ atomic_read(&cvirt->total_forks));
++ return length;
++}
++
++static inline
++int vx_info_proc_cvirt_pc(struct _vx_cvirt_pc *cvirt_pc,
++ char *buffer, int cpu)
++{
++ int length = 0;
++ return length;
++}
++
++#endif /* _VX_CVIRT_PROC_H */
+diff -urNp -x '*.orig' linux-4.9/kernel/vserver/debug.c linux-4.9/kernel/vserver/debug.c
+--- linux-4.9/kernel/vserver/debug.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/kernel/vserver/debug.c 2021-02-24 15:47:45.121077159 +0100
+@@ -0,0 +1,32 @@
++/*
++ * kernel/vserver/debug.c
++ *
++ * Copyright (C) 2005-2007 Herbert P?tzl
++ *
++ * V0.01 vx_info dump support
++ *
++ */
++
++#include <linux/module.h>
++
++#include <linux/vserver/context.h>
++
++
++void dump_vx_info(struct vx_info *vxi, int level)
++{
++ printk("vx_info %p[#%d, %d.%d, %4x]\n", vxi, vxi->vx_id,
++ atomic_read(&vxi->vx_usecnt),
++ atomic_read(&vxi->vx_tasks),
++ vxi->vx_state);
++ if (level > 0) {
++ __dump_vx_limit(&vxi->limit);
++ __dump_vx_sched(&vxi->sched);
++ __dump_vx_cvirt(&vxi->cvirt);
++ __dump_vx_cacct(&vxi->cacct);
++ }
++ printk("---\n");
++}
++
++
++EXPORT_SYMBOL_GPL(dump_vx_info);
++
+diff -urNp -x '*.orig' linux-4.9/kernel/vserver/device.c linux-4.9/kernel/vserver/device.c
+--- linux-4.9/kernel/vserver/device.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/kernel/vserver/device.c 2021-02-24 15:47:45.121077159 +0100
+@@ -0,0 +1,443 @@
++/*
++ * linux/kernel/vserver/device.c
++ *
++ * Linux-VServer: Device Support
++ *
++ * Copyright (C) 2006 Herbert P?tzl
++ * Copyright (C) 2007 Daniel Hokka Zakrisson
++ *
++ * V0.01 device mapping basics
++ * V0.02 added defaults
++ *
++ */
++
++#include <linux/slab.h>
++#include <linux/rcupdate.h>
++#include <linux/fs.h>
++#include <linux/namei.h>
++#include <linux/hash.h>
++
++#include <asm/errno.h>
++#include <asm/uaccess.h>
++#include <linux/vserver/base.h>
++#include <linux/vserver/debug.h>
++#include <linux/vserver/context.h>
++#include <linux/vserver/device.h>
++#include <linux/vserver/device_cmd.h>
++
++
++#define DMAP_HASH_BITS 4
++
++
++struct vs_mapping {
++ union {
++ struct hlist_node hlist;
++ struct list_head list;
++ } u;
++#define dm_hlist u.hlist
++#define dm_list u.list
++ vxid_t xid;
++ dev_t device;
++ struct vx_dmap_target target;
++};
++
++
++static struct hlist_head dmap_main_hash[1 << DMAP_HASH_BITS];
++
++static DEFINE_SPINLOCK(dmap_main_hash_lock);
++
++static struct vx_dmap_target dmap_defaults[2] = {
++ { .flags = DATTR_OPEN },
++ { .flags = DATTR_OPEN },
++};
++
++
++struct kmem_cache *dmap_cachep __read_mostly;
++
++int __init dmap_cache_init(void)
++{
++ dmap_cachep = kmem_cache_create("dmap_cache",
++ sizeof(struct vs_mapping), 0,
++ SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
++ return 0;
++}
++
++__initcall(dmap_cache_init);
++
++
++static inline unsigned int __hashval(dev_t dev, int bits)
++{
++ return hash_long((unsigned long)dev, bits);
++}
++
++
++/* __hash_mapping()
++ * add the mapping to the hash table
++ */
++static inline void __hash_mapping(struct vx_info *vxi, struct vs_mapping *vdm)
++{
++ spinlock_t *hash_lock = &dmap_main_hash_lock;
++ struct hlist_head *head, *hash = dmap_main_hash;
++ int device = vdm->device;
++
++ spin_lock(hash_lock);
++ vxdprintk(VXD_CBIT(misc, 8), "__hash_mapping: %p[#%d] %08x:%08x",
++ vxi, vxi ? vxi->vx_id : 0, device, vdm->target.target);
++
++ head = &hash[__hashval(device, DMAP_HASH_BITS)];
++ hlist_add_head(&vdm->dm_hlist, head);
++ spin_unlock(hash_lock);
++}
++
++
++static inline int __mode_to_default(umode_t mode)
++{
++ switch (mode) {
++ case S_IFBLK:
++ return 0;
++ case S_IFCHR:
++ return 1;
++ default:
++ BUG();
++ }
++}
++
++
++/* __set_default()
++ * set a default
++ */
++static inline void __set_default(struct vx_info *vxi, umode_t mode,
++ struct vx_dmap_target *vdmt)
++{
++ spinlock_t *hash_lock = &dmap_main_hash_lock;
++ spin_lock(hash_lock);
++
++ if (vxi)
++ vxi->dmap.targets[__mode_to_default(mode)] = *vdmt;
++ else
++ dmap_defaults[__mode_to_default(mode)] = *vdmt;
++
++
++ spin_unlock(hash_lock);
++
++ vxdprintk(VXD_CBIT(misc, 8), "__set_default: %p[#%u] %08x %04x",
++ vxi, vxi ? vxi->vx_id : 0, vdmt->target, vdmt->flags);
++}
++
++
++/* __remove_default()
++ * remove a default
++ */
++static inline int __remove_default(struct vx_info *vxi, umode_t mode)
++{
++ spinlock_t *hash_lock = &dmap_main_hash_lock;
++ spin_lock(hash_lock);
++
++ if (vxi)
++ vxi->dmap.targets[__mode_to_default(mode)].flags = 0;
++ else /* remove == reset */
++ dmap_defaults[__mode_to_default(mode)].flags = DATTR_OPEN | mode;
++
++ spin_unlock(hash_lock);
++ return 0;
++}
++
++
++/* __find_mapping()
++ * find a mapping in the hash table
++ *
++ * caller must hold hash_lock
++ */
++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;
++ struct hlist_head *head = &hash[__hashval(device, DMAP_HASH_BITS)];
++ struct hlist_node *pos;
++ struct vs_mapping *vdm;
++
++ *local = NULL;
++ if (global)
++ *global = NULL;
++
++ hlist_for_each(pos, head) {
++ vdm = hlist_entry(pos, struct vs_mapping, dm_hlist);
++
++ if ((vdm->device == device) &&
++ !((vdm->target.flags ^ mode) & S_IFMT)) {
++ if (vdm->xid == xid) {
++ *local = vdm;
++ return 1;
++ } else if (global && vdm->xid == 0)
++ *global = vdm;
++ }
++ }
++
++ if (global && *global)
++ return 0;
++ else
++ return -ENOENT;
++}
++
++
++/* __lookup_mapping()
++ * find a mapping and store the result in target and flags
++ */
++static inline int __lookup_mapping(struct vx_info *vxi,
++ dev_t device, dev_t *target, int *flags, umode_t mode)
++{
++ spinlock_t *hash_lock = &dmap_main_hash_lock;
++ struct vs_mapping *vdm, *global;
++ struct vx_dmap_target *vdmt;
++ int ret = 0;
++ vxid_t xid = vxi->vx_id;
++ int index;
++
++ spin_lock(hash_lock);
++ if (__find_mapping(xid, device, mode, &vdm, &global) > 0) {
++ ret = 1;
++ vdmt = &vdm->target;
++ goto found;
++ }
++
++ index = __mode_to_default(mode);
++ if (vxi && vxi->dmap.targets[index].flags) {
++ ret = 2;
++ vdmt = &vxi->dmap.targets[index];
++ } else if (global) {
++ ret = 3;
++ vdmt = &global->target;
++ goto found;
++ } else {
++ ret = 4;
++ vdmt = &dmap_defaults[index];
++ }
++
++found:
++ if (target && (vdmt->flags & DATTR_REMAP))
++ *target = vdmt->target;
++ else if (target)
++ *target = device;
++ if (flags)
++ *flags = vdmt->flags;
++
++ spin_unlock(hash_lock);
++
++ return ret;
++}
++
++
++/* __remove_mapping()
++ * remove a mapping from the hash table
++ */
++static inline int __remove_mapping(struct vx_info *vxi, dev_t device,
++ umode_t mode)
++{
++ spinlock_t *hash_lock = &dmap_main_hash_lock;
++ struct vs_mapping *vdm = NULL;
++ int ret = 0;
++
++ spin_lock(hash_lock);
++
++ ret = __find_mapping((vxi ? vxi->vx_id : 0), device, mode, &vdm,
++ NULL);
++ vxdprintk(VXD_CBIT(misc, 8), "__remove_mapping: %p[#%d] %08x %04x",
++ vxi, vxi ? vxi->vx_id : 0, device, mode);
++ if (ret < 0)
++ goto out;
++ hlist_del(&vdm->dm_hlist);
++
++out:
++ spin_unlock(hash_lock);
++ if (vdm)
++ kmem_cache_free(dmap_cachep, vdm);
++ return ret;
++}
++
++
++
++int vs_map_device(struct vx_info *vxi,
++ dev_t device, dev_t *target, umode_t mode)
++{
++ int ret, flags = DATTR_MASK;
++
++ if (!vxi) {
++ if (target)
++ *target = device;
++ goto out;
++ }
++ ret = __lookup_mapping(vxi, device, target, &flags, mode);
++ vxdprintk(VXD_CBIT(misc, 8), "vs_map_device: %08x target: %08x flags: %04x mode: %04x mapped=%d",
++ device, target ? *target : 0, flags, mode, ret);
++out:
++ return (flags & DATTR_MASK);
++}
++
++
++
++static int do_set_mapping(struct vx_info *vxi,
++ dev_t device, dev_t target, int flags, umode_t mode)
++{
++ if (device) {
++ struct vs_mapping *new;
++
++ new = kmem_cache_alloc(dmap_cachep, GFP_KERNEL);
++ if (!new)
++ return -ENOMEM;
++
++ INIT_HLIST_NODE(&new->dm_hlist);
++ new->device = device;
++ new->target.target = target;
++ new->target.flags = flags | mode;
++ new->xid = (vxi ? vxi->vx_id : 0);
++
++ vxdprintk(VXD_CBIT(misc, 8), "do_set_mapping: %08x target: %08x flags: %04x", device, target, flags);
++ __hash_mapping(vxi, new);
++ } else {
++ struct vx_dmap_target new = {
++ .target = target,
++ .flags = flags | mode,
++ };
++ __set_default(vxi, mode, &new);
++ }
++ return 0;
++}
++
++
++static int do_unset_mapping(struct vx_info *vxi,
++ dev_t device, dev_t target, int flags, umode_t mode)
++{
++ int ret = -EINVAL;
++
++ if (device) {
++ ret = __remove_mapping(vxi, device, mode);
++ if (ret < 0)
++ goto out;
++ } else {
++ ret = __remove_default(vxi, mode);
++ if (ret < 0)
++ goto out;
++ }
++
++out:
++ return ret;
++}
++
++
++static inline int __user_device(const char __user *name, dev_t *dev,
++ umode_t *mode)
++{
++ struct path path;
++ int ret;
++
++ if (!name) {
++ *dev = 0;
++ return 0;
++ }
++ ret = user_lpath(name, &path);
++ if (ret)
++ return ret;
++ if (path.dentry->d_inode) {
++ *dev = path.dentry->d_inode->i_rdev;
++ *mode = path.dentry->d_inode->i_mode;
++ }
++ path_put(&path);
++ return 0;
++}
++
++static inline int __mapping_mode(dev_t device, dev_t target,
++ umode_t device_mode, umode_t target_mode, umode_t *mode)
++{
++ if (device)
++ *mode = device_mode & S_IFMT;
++ else if (target)
++ *mode = target_mode & S_IFMT;
++ else
++ return -EINVAL;
++
++ /* if both given, device and target mode have to match */
++ if (device && target &&
++ ((device_mode ^ target_mode) & S_IFMT))
++ return -EINVAL;
++ return 0;
++}
++
++
++static inline int do_mapping(struct vx_info *vxi, const char __user *device_path,
++ const char __user *target_path, int flags, int set)
++{
++ dev_t device = ~0, target = ~0;
++ umode_t device_mode = 0, target_mode = 0, mode;
++ int ret;
+
-+#define LOAD_INT(x) ((x) >> FSHIFT)
-+#define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100)
++ ret = __user_device(device_path, &device, &device_mode);
++ if (ret)
++ return ret;
++ ret = __user_device(target_path, &target, &target_mode);
++ if (ret)
++ return ret;
+
-+static inline
-+int vx_info_proc_cvirt(struct _vx_cvirt *cvirt, char *buffer)
-+{
-+ int length = 0;
-+ int a, b, c;
++ ret = __mapping_mode(device, target,
++ device_mode, target_mode, &mode);
++ if (ret)
++ return ret;
+
-+ length += sprintf(buffer + length,
-+ "BiasUptime:\t%lu.%02lu\n",
-+ (unsigned long)cvirt->bias_uptime.tv_sec,
-+ (cvirt->bias_uptime.tv_nsec / (NSEC_PER_SEC / 100)));
++ if (set)
++ return do_set_mapping(vxi, device, target,
++ flags, mode);
++ else
++ return do_unset_mapping(vxi, device, target,
++ flags, mode);
++}
+
-+ a = cvirt->load[0] + (FIXED_1/200);
-+ b = cvirt->load[1] + (FIXED_1/200);
-+ c = cvirt->load[2] + (FIXED_1/200);
-+ length += sprintf(buffer + length,
-+ "nr_threads:\t%d\n"
-+ "nr_running:\t%d\n"
-+ "nr_unintr:\t%d\n"
-+ "nr_onhold:\t%d\n"
-+ "load_updates:\t%d\n"
-+ "loadavg:\t%d.%02d %d.%02d %d.%02d\n"
-+ "total_forks:\t%d\n"
-+ ,atomic_read(&cvirt->nr_threads)
-+ ,atomic_read(&cvirt->nr_running)
-+ ,atomic_read(&cvirt->nr_uninterruptible)
-+ ,atomic_read(&cvirt->nr_onhold)
-+ ,atomic_read(&cvirt->load_updates)
-+ ,LOAD_INT(a), LOAD_FRAC(a)
-+ ,LOAD_INT(b), LOAD_FRAC(b)
-+ ,LOAD_INT(c), LOAD_FRAC(c)
-+ ,atomic_read(&cvirt->total_forks)
-+ );
+
-+ return length;
++int vc_set_mapping(struct vx_info *vxi, void __user *data)
++{
++ struct vcmd_set_mapping_v0 vc_data;
++
++ if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
++
++ return do_mapping(vxi, vc_data.device, vc_data.target,
++ vc_data.flags, 1);
+}
+
-+static inline
-+int vx_info_proc_cvirt_pc(struct _vx_cvirt_pc *cvirt_pc,
-+ char *buffer, int cpu)
++int vc_unset_mapping(struct vx_info *vxi, void __user *data)
+{
-+ int length = 0;
-+ return length;
++ struct vcmd_set_mapping_v0 vc_data;
++
++ if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
++
++ return do_mapping(vxi, vc_data.device, vc_data.target,
++ vc_data.flags, 0);
+}
+
-+#endif /* _VX_CVIRT_PROC_H */
-diff -NurpP --minimal linux-2.6.19.1/kernel/vserver/debug.c linux-2.6.19.1-vs2.3.0.6/kernel/vserver/debug.c
---- linux-2.6.19.1/kernel/vserver/debug.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/vserver/debug.c 2006-11-30 18:53:18 +0100
-@@ -0,0 +1,35 @@
-+/*
-+ * kernel/vserver/debug.c
-+ *
-+ * Copyright (C) 2005 Herbert Pötzl
-+ *
-+ * V0.01 vx_info dump support
-+ *
-+ */
+
-+#include <linux/errno.h>
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/vs_base.h>
++#ifdef CONFIG_COMPAT
+
-+#include <linux/vserver/context.h>
++int vc_set_mapping_x32(struct vx_info *vxi, void __user *data)
++{
++ struct vcmd_set_mapping_v0_x32 vc_data;
+
++ if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
+
-+void dump_vx_info(struct vx_info *vxi, int level)
++ return do_mapping(vxi, compat_ptr(vc_data.device_ptr),
++ compat_ptr(vc_data.target_ptr), vc_data.flags, 1);
++}
++
++int vc_unset_mapping_x32(struct vx_info *vxi, void __user *data)
+{
-+ printk("vx_info %p[#%d, %d.%d, %4x]\n", vxi, vxi->vx_id,
-+ atomic_read(&vxi->vx_usecnt),
-+ atomic_read(&vxi->vx_tasks),
-+ vxi->vx_state);
-+ if (level > 0) {
-+ __dump_vx_limit(&vxi->limit);
-+ __dump_vx_sched(&vxi->sched);
-+ __dump_vx_cvirt(&vxi->cvirt);
-+ __dump_vx_cacct(&vxi->cacct);
-+ }
-+ printk("---\n");
++ struct vcmd_set_mapping_v0_x32 vc_data;
++
++ if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
++
++ return do_mapping(vxi, compat_ptr(vc_data.device_ptr),
++ compat_ptr(vc_data.target_ptr), vc_data.flags, 0);
+}
+
++#endif /* CONFIG_COMPAT */
+
-+EXPORT_SYMBOL_GPL(dump_vx_info);
+
-diff -NurpP --minimal linux-2.6.19.1/kernel/vserver/dlimit.c linux-2.6.19.1-vs2.3.0.6/kernel/vserver/dlimit.c
---- linux-2.6.19.1/kernel/vserver/dlimit.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/vserver/dlimit.c 2006-11-08 04:57:50 +0100
-@@ -0,0 +1,527 @@
+diff -urNp -x '*.orig' linux-4.9/kernel/vserver/dlimit.c linux-4.9/kernel/vserver/dlimit.c
+--- linux-4.9/kernel/vserver/dlimit.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/kernel/vserver/dlimit.c 2021-02-24 15:47:45.121077159 +0100
+@@ -0,0 +1,528 @@
+/*
+ * linux/kernel/vserver/dlimit.c
+ *
+ * Virtual Server: Context Disk Limits
+ *
-+ * Copyright (C) 2004-2005 Herbert Pötzl
++ * Copyright (C) 2004-2009 Herbert P?tzl
+ *
+ * V0.01 initial version
+ * V0.02 compat32 splitup
++ * V0.03 extended interface
+ *
+ */
+
-+#include <linux/fs.h>
-+#include <linux/namespace.h>
-+#include <linux/namei.h>
+#include <linux/statfs.h>
-+#include <linux/compat.h>
-+#include <linux/vserver/switch.h>
-+#include <linux/vs_context.h>
++#include <linux/sched.h>
++#include <linux/namei.h>
+#include <linux/vs_tag.h>
+#include <linux/vs_dlimit.h>
+#include <linux/vserver/dlimit_cmd.h>
++#include <linux/slab.h>
++// #include <linux/gfp.h>
+
-+#include <asm/errno.h>
+#include <asm/uaccess.h>
+
+/* __alloc_dl_info()
+ * allocate an initialized dl_info struct
+ * doesn't make it visible (hash) */
+
-+static struct dl_info *__alloc_dl_info(struct super_block *sb, tag_t tag)
++static struct dl_info *__alloc_dl_info(struct super_block *sb, vtag_t tag)
+{
+ struct dl_info *new = NULL;
+
+ if (!new)
+ return 0;
+
-+ memset (new, 0, sizeof(struct dl_info));
++ 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);
+
+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);
+}
+ * 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;
+
+static int do_addrem_dlimit(uint32_t id, const char __user *name,
+ uint32_t flags, int add)
+{
-+ struct nameidata nd;
++ struct path path;
+ int ret;
+
-+ ret = user_path_walk_link(name, &nd);
++ ret = user_lpath(name, &path);
+ if (!ret) {
+ struct super_block *sb;
+ struct dl_info *dli;
+
+ ret = -EINVAL;
-+ if (!nd.dentry->d_inode)
++ if (!path.dentry->d_inode)
+ goto out_release;
-+ if (!(sb = nd.dentry->d_inode->i_sb))
++ if (!(sb = path.dentry->d_inode->i_sb))
+ goto out_release;
+
+ if (add) {
+ if (add && dli)
+ __dealloc_dl_info(dli);
+ out_release:
-+ path_release(&nd);
++ path_put(&path);
+ }
+ return ret;
+}
+{
+ struct vcmd_ctx_dlimit_base_v0 vc_data;
+
-+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ if (copy_from_user(&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
+ return do_addrem_dlimit(id, vc_data.name, vc_data.flags, 1);
+{
+ struct vcmd_ctx_dlimit_base_v0 vc_data;
+
-+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ if (copy_from_user(&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
+ return do_addrem_dlimit(id, vc_data.name, vc_data.flags, 0);
+{
+ struct vcmd_ctx_dlimit_base_v0_x32 vc_data;
+
-+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ if (copy_from_user(&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
+ return do_addrem_dlimit(id,
+{
+ struct vcmd_ctx_dlimit_base_v0_x32 vc_data;
+
-+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ if (copy_from_user(&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
+ return do_addrem_dlimit(id,
+ uint32_t inodes_used, uint32_t inodes_total,
+ uint32_t reserved, uint32_t flags)
+{
-+ struct nameidata nd;
++ struct path path;
+ int ret;
+
-+ ret = user_path_walk_link(name, &nd);
++ ret = user_lpath(name, &path);
+ if (!ret) {
+ struct super_block *sb;
+ struct dl_info *dli;
+
+ ret = -EINVAL;
-+ if (!nd.dentry->d_inode)
++ if (!path.dentry->d_inode)
+ goto out_release;
-+ if (!(sb = nd.dentry->d_inode->i_sb))
++ if (!(sb = path.dentry->d_inode->i_sb))
+ goto out_release;
++
++ /* sanity checks */
+ if ((reserved != CDLIM_KEEP &&
+ reserved > 100) ||
+ (inodes_used != CDLIM_KEEP &&
+ dli->dl_inodes_used = inodes_used;
+ if (inodes_total != CDLIM_KEEP)
+ dli->dl_inodes_total = inodes_total;
-+ if (space_used != CDLIM_KEEP) {
-+ dli->dl_space_used = space_used;
-+ dli->dl_space_used <<= 10;
-+ }
++ if (space_used != CDLIM_KEEP)
++ dli->dl_space_used = dlimit_space_32to64(
++ space_used, flags, DLIMS_USED);
++
+ if (space_total == CDLIM_INFINITY)
+ dli->dl_space_total = DLIM_INFINITY;
-+ else if (space_total != CDLIM_KEEP) {
-+ dli->dl_space_total = space_total;
-+ dli->dl_space_total <<= 10;
-+ }
++ else if (space_total != CDLIM_KEEP)
++ dli->dl_space_total = dlimit_space_32to64(
++ space_total, flags, DLIMS_TOTAL);
++
+ if (reserved != CDLIM_KEEP)
+ dli->dl_nrlmult = (1 << 10) * (100 - reserved) / 100;
+
+ ret = 0;
+
+ out_release:
-+ path_release(&nd);
++ path_put(&path);
+ }
+ return ret;
+}
+{
+ struct vcmd_ctx_dlimit_v0 vc_data;
+
-+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ if (copy_from_user(&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
+ return do_set_dlimit(id, vc_data.name,
+{
+ struct vcmd_ctx_dlimit_v0_x32 vc_data;
+
-+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ if (copy_from_user(&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
+ return do_set_dlimit(id, compat_ptr(vc_data.name_ptr),
+ uint32_t *inodes_used, uint32_t *inodes_total,
+ uint32_t *reserved, uint32_t *flags)
+{
-+ struct nameidata nd;
++ struct path path;
+ int ret;
+
-+ ret = user_path_walk_link(name, &nd);
++ ret = user_lpath(name, &path);
+ if (!ret) {
+ struct super_block *sb;
+ struct dl_info *dli;
+
+ ret = -EINVAL;
-+ if (!nd.dentry->d_inode)
++ if (!path.dentry->d_inode)
+ goto out_release;
-+ if (!(sb = nd.dentry->d_inode->i_sb))
++ if (!(sb = path.dentry->d_inode->i_sb))
+ goto out_release;
+
+ ret = -ESRCH;
+ spin_lock(&dli->dl_lock);
+ *inodes_used = dli->dl_inodes_used;
+ *inodes_total = dli->dl_inodes_total;
-+ *space_used = dli->dl_space_used >> 10;
++
++ *space_used = dlimit_space_64to32(
++ dli->dl_space_used, flags, DLIMS_USED);
++
+ if (dli->dl_space_total == DLIM_INFINITY)
+ *space_total = CDLIM_INFINITY;
+ else
-+ *space_total = dli->dl_space_total >> 10;
++ *space_total = dlimit_space_64to32(
++ dli->dl_space_total, flags, DLIMS_TOTAL);
+
+ *reserved = 100 - ((dli->dl_nrlmult * 100 + 512) >> 10);
+ spin_unlock(&dli->dl_lock);
+
+ ret = 0;
+ out_release:
-+ path_release(&nd);
++ path_put(&path);
+ }
+ return ret;
+}
+ struct vcmd_ctx_dlimit_v0 vc_data;
+ int ret;
+
-+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ if (copy_from_user(&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
+ ret = do_get_dlimit(id, vc_data.name,
+ struct vcmd_ctx_dlimit_v0_x32 vc_data;
+ int ret;
+
-+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ if (copy_from_user(&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
+ ret = do_get_dlimit(id, compat_ptr(vc_data.name_ptr),
+EXPORT_SYMBOL_GPL(locate_dl_info);
+EXPORT_SYMBOL_GPL(rcu_free_dl_info);
+
-diff -NurpP --minimal linux-2.6.19.1/kernel/vserver/helper.c linux-2.6.19.1-vs2.3.0.6/kernel/vserver/helper.c
---- linux-2.6.19.1/kernel/vserver/helper.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/vserver/helper.c 2006-12-17 04:34:43 +0100
-@@ -0,0 +1,204 @@
+diff -urNp -x '*.orig' linux-4.9/kernel/vserver/helper.c linux-4.9/kernel/vserver/helper.c
+--- linux-4.9/kernel/vserver/helper.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/kernel/vserver/helper.c 2021-02-24 15:47:45.124410596 +0100
+@@ -0,0 +1,242 @@
+/*
+ * linux/kernel/vserver/helper.c
+ *
+ * Virtual Context Support
+ *
-+ * Copyright (C) 2004-2005 Herbert Pötzl
++ * Copyright (C) 2004-2007 Herbert P?tzl
+ *
+ * V0.01 basic helper
+ *
+ */
+
-+#include <linux/errno.h>
+#include <linux/kmod.h>
-+#include <linux/sched.h>
+#include <linux/reboot.h>
+#include <linux/vs_context.h>
+#include <linux/vs_network.h>
+#include <linux/vserver/signal.h>
+
-+#include <asm/uaccess.h>
-+#include <asm/unistd.h>
-+
+
+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);
++ sync ? "sync" : "async", ret);
+ }
+ vxdprintk(VXD_CBIT(switch, 4),
+ "%s: (%s %s) returned %s with %d",
-+ name, argv[1], argv[2], sync?"sync":"async", ret);
++ name, argv[1], argv[2], sync ? "sync" : "async", ret);
+ return ret;
+}
+
+ 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:
+ argv[1] = "swsusp";
+ break;
+
++ case LINUX_REBOOT_CMD_OOM:
++ argv[1] = "oom";
++ break;
++
+ default:
+ vxi->vx_state &= ~VXS_HELPER;
+ return 0;
+}
+
+
-+long vs_reboot(unsigned int cmd, void __user * arg)
++long vs_reboot(unsigned int cmd, void __user *arg)
+{
-+ struct vx_info *vxi = current->vx_info;
++ struct vx_info *vxi = current_vx_info();
+ long ret = 0;
+
+ vxdprintk(VXD_CBIT(misc, 5),
-+ "vs_reboot(%p[#%d],%d)",
-+ vxi, vxi?vxi->vx_id:0, cmd);
++ "vs_reboot(%p[#%d],%u)",
++ vxi, vxi ? vxi->vx_id : 0, cmd);
+
+ ret = vs_reboot_helper(vxi, cmd, arg);
+ if (ret)
+ return 0;
+}
+
++long vs_oom_action(unsigned int cmd)
++{
++ struct vx_info *vxi = current_vx_info();
++ long ret = 0;
++
++ vxdprintk(VXD_CBIT(misc, 5),
++ "vs_oom_action(%p[#%d],%u)",
++ vxi, vxi ? vxi->vx_id : 0, cmd);
++
++ ret = vs_reboot_helper(vxi, cmd, NULL);
++ if (ret)
++ return ret;
++
++ vxi->reboot_cmd = cmd;
++ if (vx_info_flags(vxi, VXF_REBOOT_KILL, 0)) {
++ vx_info_kill(vxi, 0, SIGKILL);
++ vx_info_kill(vxi, 1, SIGKILL);
++ }
++ return 0;
++}
+
+/*
+ * argv [0] = vshelper_path;
+ 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:
+ 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:
+ return do_vshelper(vshelper_path, argv, envp, 1);
+}
+
-diff -NurpP --minimal linux-2.6.19.1/kernel/vserver/history.c linux-2.6.19.1-vs2.3.0.6/kernel/vserver/history.c
---- linux-2.6.19.1/kernel/vserver/history.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/vserver/history.c 2006-11-30 18:53:18 +0100
-@@ -0,0 +1,264 @@
+diff -urNp -x '*.orig' linux-4.9/kernel/vserver/history.c linux-4.9/kernel/vserver/history.c
+--- linux-4.9/kernel/vserver/history.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/kernel/vserver/history.c 2021-02-24 15:47:45.124410596 +0100
+@@ -0,0 +1,258 @@
+/*
+ * kernel/vserver/history.c
+ *
+ * Virtual Context History Backtrace
+ *
-+ * Copyright (C) 2004-2005 Herbert Pötzl
++ * Copyright (C) 2004-2007 Herbert P?tzl
+ *
+ * V0.01 basic structure
+ * V0.02 hash/unhash and trace
+ *
+ */
+
-+#include <linux/errno.h>
+#include <linux/module.h>
-+#include <linux/types.h>
-+#include <linux/ctype.h>
-+
+#include <asm/uaccess.h>
-+#include <asm/atomic.h>
-+#include <asm/unistd.h>
+
+#include <linux/vserver/context.h>
+#include <linux/vserver/debug.h>
+struct _vx_history {
+ unsigned int counter;
+
-+ struct _vx_hist_entry entry[VXH_SIZE+1];
++ struct _vx_hist_entry entry[VXH_SIZE + 1];
+};
+
+
+
+#define VXH_VXI_FMTS "%p[#%d,%d.%d]"
+
-+#define VXH_VXI_ARGS(e) (e)->vxi.ptr, \
-+ (e)->vxi.ptr?(e)->vxi.xid:0, \
-+ (e)->vxi.ptr?(e)->vxi.usecnt:0, \
-+ (e)->vxi.ptr?(e)->vxi.tasks:0
++#define VXH_VXI_ARGS(e) (e)->vxi.ptr, \
++ (e)->vxi.ptr ? (e)->vxi.xid : 0, \
++ (e)->vxi.ptr ? (e)->vxi.usecnt : 0, \
++ (e)->vxi.ptr ? (e)->vxi.tasks : 0
+
+void vxh_dump_entry(struct _vx_hist_entry *e, unsigned cpu)
+{
+ case VXH_PUT_VX_INFO:
+ printk( VXH_LOC_FMTS " %s_vx_info " VXH_VXI_FMTS "\n",
+ VXH_LOC_ARGS(e),
-+ (e->type==VXH_GET_VX_INFO)?"get":"put",
++ (e->type == VXH_GET_VX_INFO) ? "get" : "put",
+ VXH_VXI_ARGS(e));
+ break;
+
+ case VXH_CLR_VX_INFO:
+ printk( VXH_LOC_FMTS " %s_vx_info " VXH_VXI_FMTS " @%p\n",
+ VXH_LOC_ARGS(e),
-+ (e->type==VXH_INIT_VX_INFO)?"init":
-+ ((e->type==VXH_SET_VX_INFO)?"set":"clr"),
++ (e->type == VXH_INIT_VX_INFO) ? "init" :
++ ((e->type == VXH_SET_VX_INFO) ? "set" : "clr"),
+ VXH_VXI_ARGS(e), e->sc.data);
+ break;
+
+ case VXH_RELEASE_VX_INFO:
+ printk( VXH_LOC_FMTS " %s_vx_info " VXH_VXI_FMTS " @%p\n",
+ VXH_LOC_ARGS(e),
-+ (e->type==VXH_CLAIM_VX_INFO)?"claim":"release",
++ (e->type == VXH_CLAIM_VX_INFO) ? "claim" : "release",
+ VXH_VXI_ARGS(e), e->sc.data);
+ break;
+
+ case VXH_DEALLOC_VX_INFO:
+ printk( VXH_LOC_FMTS " %s_vx_info " VXH_VXI_FMTS "\n",
+ VXH_LOC_ARGS(e),
-+ (e->type==VXH_ALLOC_VX_INFO)?"alloc":"dealloc",
++ (e->type == VXH_ALLOC_VX_INFO) ? "alloc" : "dealloc",
+ VXH_VXI_ARGS(e));
+ break;
+
+ case VXH_UNHASH_VX_INFO:
+ printk( VXH_LOC_FMTS " __%s_vx_info " VXH_VXI_FMTS "\n",
+ VXH_LOC_ARGS(e),
-+ (e->type==VXH_HASH_VX_INFO)?"hash":"unhash",
++ (e->type == VXH_HASH_VX_INFO) ? "hash" : "unhash",
+ VXH_VXI_ARGS(e));
+ break;
+
+ case VXH_CREATE_VX_INFO:
+ printk( VXH_LOC_FMTS " __%s_vx_info [#%d] -> " VXH_VXI_FMTS "\n",
+ VXH_LOC_ARGS(e),
-+ (e->type==VXH_CREATE_VX_INFO)?"create":
-+ ((e->type==VXH_LOC_VX_INFO)?"loc":"lookup"),
++ (e->type == VXH_CREATE_VX_INFO) ? "create" :
++ ((e->type == VXH_LOC_VX_INFO) ? "loc" : "lookup"),
+ e->ll.arg, VXH_VXI_ARGS(e));
+ break;
+ }
+ printk("History:\tSEQ: %8x\tNR_CPUS: %d\n",
+ atomic_read(&sequence), NR_CPUS);
+
-+ for (i=0; i < VXH_SIZE; i++) {
++ for (i = 0; i < VXH_SIZE; i++) {
+ for_each_online_cpu(cpu) {
+ struct _vx_history *hist =
+ &per_cpu(vx_history_buffer, cpu);
-+ unsigned int index = (hist->counter-i) % VXH_SIZE;
++ unsigned int index = (hist->counter - i) % VXH_SIZE;
+ struct _vx_hist_entry *entry = &hist->entry[index];
+
+ vxh_dump_entry(entry, cpu);
+ &hist->entry[idx % VXH_SIZE];
+
+ /* send entry to userspace */
-+ ret = copy_to_user (&data[pos], entry, sizeof(*entry));
++ ret = copy_to_user(&data[pos], entry, sizeof(*entry));
+ if (ret)
+ break;
+ }
+ if (id >= NR_CPUS)
+ return -EINVAL;
+
-+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ if (copy_from_user(&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
+ ret = do_read_history((struct __user _vx_hist_entry *)vc_data.data,
+ id, &vc_data.index, &vc_data.count);
+
-+ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
++ if (copy_to_user(data, &vc_data, sizeof(vc_data)))
+ return -EFAULT;
+ return ret;
+}
+ if (id >= NR_CPUS)
+ return -EINVAL;
+
-+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ if (copy_from_user(&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
+ ret = do_read_history((struct __user _vx_hist_entry *)
+ compat_ptr(vc_data.data_ptr),
+ id, &vc_data.index, &vc_data.count);
+
-+ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
++ if (copy_to_user(data, &vc_data, sizeof(vc_data)))
+ return -EFAULT;
+ return ret;
+}
+
+#endif /* CONFIG_COMPAT */
+
-diff -NurpP --minimal linux-2.6.19.1/kernel/vserver/inet.c linux-2.6.19.1-vs2.3.0.6/kernel/vserver/inet.c
---- linux-2.6.19.1/kernel/vserver/inet.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/vserver/inet.c 2006-12-17 03:23:33 +0100
-@@ -0,0 +1,56 @@
+diff -urNp -x '*.orig' linux-4.9/kernel/vserver/inet.c linux-4.9/kernel/vserver/inet.c
+--- linux-4.9/kernel/vserver/inet.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/kernel/vserver/inet.c 2021-02-24 15:47:45.124410596 +0100
+@@ -0,0 +1,236 @@
+
-+#include <linux/sched.h>
++#include <linux/in.h>
++#include <linux/inetdevice.h>
++#include <linux/export.h>
+#include <linux/vs_inet.h>
++#include <linux/vs_inet6.h>
++#include <linux/vserver/debug.h>
++#include <net/route.h>
++#include <net/addrconf.h>
+
+
-+int nx_addr_conflict(struct nx_info *nxi, uint32_t addr, struct sock *sk)
++int nx_v4_addr_conflict(struct nx_info *nxi1, struct nx_info *nxi2)
+{
++ int ret = 0;
++
++ if (!nxi1 || !nxi2 || nxi1 == nxi2)
++ 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),
-+ "nx_addr_conflict(%p,%p) %d.%d,%d.%d",
-+ nxi, sk, VXD_QUAD(addr));
-+
-+ if (addr) {
-+ /* check real address */
-+ return __addr_in_socket(sk, addr);
-+ } else if (nxi) {
-+ /* check against nx_info */
-+ int i, n = nxi->nbipv4;
-+
-+ for (i=0; i<n; i++)
-+ if (__addr_in_socket(sk, nxi->ipv4[i]))
-+ return 1;
-+ return 0;
-+ } else {
-+ /* check against any */
-+ return 1;
++ "nx_v4_addr_conflict(%p,%p): %d",
++ nxi1, nxi2, ret);
++
++ return ret;
++}
++
++
++#ifdef CONFIG_IPV6
++
++int nx_v6_addr_conflict(struct nx_info *nxi1, struct nx_info *nxi2)
++{
++ int ret = 0;
++
++ if (!nxi1 || !nxi2 || nxi1 == nxi2)
++ 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),
++ "nx_v6_addr_conflict(%p,%p): %d",
++ nxi1, nxi2, ret);
++
++ return ret;
+}
+
++#endif
+
-+int dev_in_nx_info(struct net_device *dev, struct nx_info *nxi)
++int v4_dev_in_nx_info(struct net_device *dev, struct nx_info *nxi)
+{
+ struct in_device *in_dev;
+ struct in_ifaddr **ifap;
+ struct in_ifaddr *ifa;
+ int ret = 0;
+
-+ if (!nxi)
-+ return 1;
-+
++ if (!dev)
++ goto out;
+ in_dev = in_dev_get(dev);
+ if (!in_dev)
+ goto out;
+
+ for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL;
+ ifap = &ifa->ifa_next) {
-+ if (addr_in_nx_info(nxi, ifa->ifa_local)) {
++ if (v4_addr_in_nx_info(nxi, ifa->ifa_local, NXA_MASK_SHOW)) {
+ ret = 1;
+ break;
+ }
+}
+
+
-diff -NurpP --minimal linux-2.6.19.1/kernel/vserver/init.c linux-2.6.19.1-vs2.3.0.6/kernel/vserver/init.c
---- linux-2.6.19.1/kernel/vserver/init.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/vserver/init.c 2006-11-09 01:00:34 +0100
-@@ -0,0 +1,47 @@
++#ifdef CONFIG_IPV6
++
++int v6_dev_in_nx_info(struct net_device *dev, struct nx_info *nxi)
++{
++ struct inet6_dev *in_dev;
++ struct inet6_ifaddr *ifa;
++ int ret = 0;
++
++ if (!dev)
++ goto out;
++ in_dev = in6_dev_get(dev);
++ if (!in_dev)
++ goto out;
++
++ // for (ifap = &in_dev->addr_list; (ifa = *ifap) != NULL;
++ list_for_each_entry(ifa, &in_dev->addr_list, if_list) {
++ if (v6_addr_in_nx_info(nxi, &ifa->addr, -1)) {
++ ret = 1;
++ break;
++ }
++ }
++ in6_dev_put(in_dev);
++out:
++ return ret;
++}
++
++#endif
++
++int dev_in_nx_info(struct net_device *dev, struct nx_info *nxi)
++{
++ int ret = 1;
++
++ if (!nxi)
++ goto out;
++ if (nxi->v4.type && v4_dev_in_nx_info(dev, nxi))
++ goto out;
++#ifdef CONFIG_IPV6
++ ret = 2;
++ if (nxi->v6.type && v6_dev_in_nx_info(dev, nxi))
++ goto out;
++#endif
++ ret = 0;
++out:
++ vxdprintk(VXD_CBIT(net, 3),
++ "dev_in_nx_info(%p,%p[#%d]) = %d",
++ dev, nxi, nxi ? nxi->nx_id : 0, ret);
++ return ret;
++}
++
++struct rtable *ip_v4_find_src(struct net *net, struct nx_info *nxi,
++ struct flowi4 *fl4)
++{
++ struct rtable *rt;
++
++ if (!nxi)
++ return NULL;
++
++ /* FIXME: handle lback only case */
++ if (!NX_IPV4(nxi))
++ 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(fl4->saddr), NIPQUAD(fl4->daddr));
++
++ /* single IP is unconditional */
++ if (nx_info_flags(nxi, NXF_SINGLE_IP, 0) &&
++ (fl4->saddr == INADDR_ANY))
++ fl4->saddr = nxi->v4.ip[0].s_addr;
++
++ if (fl4->saddr == INADDR_ANY) {
++ struct nx_addr_v4 *ptr;
++ __be32 found = 0;
++
++ rt = __ip_route_output_key(net, fl4);
++ if (!IS_ERR(rt)) {
++ found = fl4->saddr;
++ ip_rt_put(rt);
++ vxdprintk(VXD_CBIT(net, 4),
++ "ip_v4_find_src(%p[#%u]) rok[%u]: " NIPQUAD_FMT,
++ nxi, nxi ? nxi->nx_id : 0, fl4->flowi4_oif, NIPQUAD(found));
++ if (v4_addr_in_nx_info(nxi, found, NXA_MASK_BIND))
++ goto found;
++ }
++
++ WARN_ON_ONCE(in_irq());
++ spin_lock_bh(&nxi->addr_lock);
++ for (ptr = &nxi->v4; ptr; ptr = ptr->next) {
++ __be32 primary = ptr->ip[0].s_addr;
++ __be32 mask = ptr->mask.s_addr;
++ __be32 neta = primary & mask;
++
++ vxdprintk(VXD_CBIT(net, 4), "ip_v4_find_src(%p[#%u]) chk: "
++ NIPQUAD_FMT "/" NIPQUAD_FMT "/" NIPQUAD_FMT,
++ nxi, nxi ? nxi->nx_id : 0, NIPQUAD(primary),
++ NIPQUAD(mask), NIPQUAD(neta));
++ if ((found & mask) != neta)
++ continue;
++
++ fl4->saddr = primary;
++ rt = __ip_route_output_key(net, fl4);
++ vxdprintk(VXD_CBIT(net, 4),
++ "ip_v4_find_src(%p[#%u]) rok[%u]: " NIPQUAD_FMT,
++ nxi, nxi ? nxi->nx_id : 0, fl4->flowi4_oif, NIPQUAD(primary));
++ if (!IS_ERR(rt)) {
++ found = fl4->saddr;
++ ip_rt_put(rt);
++ if (found == primary)
++ goto found_unlock;
++ }
++ }
++ /* still no source ip? */
++ found = ipv4_is_loopback(fl4->daddr)
++ ? IPI_LOOPBACK : nxi->v4.ip[0].s_addr;
++ found_unlock:
++ spin_unlock_bh(&nxi->addr_lock);
++ found:
++ /* assign src ip to flow */
++ fl4->saddr = found;
++
++ } else {
++ if (!v4_addr_in_nx_info(nxi, fl4->saddr, NXA_MASK_BIND))
++ return ERR_PTR(-EPERM);
++ }
++
++ if (nx_info_flags(nxi, NXF_LBACK_REMAP, 0)) {
++ if (ipv4_is_loopback(fl4->daddr))
++ fl4->daddr = nxi->v4_lback.s_addr;
++ if (ipv4_is_loopback(fl4->saddr))
++ fl4->saddr = nxi->v4_lback.s_addr;
++ } else if (ipv4_is_loopback(fl4->daddr) &&
++ !nx_info_flags(nxi, NXF_LBACK_ALLOW, 0))
++ return ERR_PTR(-EPERM);
++
++ return NULL;
++}
++
++EXPORT_SYMBOL_GPL(ip_v4_find_src);
++
+diff -urNp -x '*.orig' linux-4.9/kernel/vserver/init.c linux-4.9/kernel/vserver/init.c
+--- linux-4.9/kernel/vserver/init.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/kernel/vserver/init.c 2021-02-24 15:47:45.124410596 +0100
+@@ -0,0 +1,46 @@
+/*
+ * linux/kernel/init.c
+ *
+ * Virtual Server Init
+ *
-+ * Copyright (C) 2004-2005 Herbert Pötzl
++ * Copyright (C) 2004-2007 Herbert P?tzl
+ *
+ * V0.01 basic structure
+ *
+ */
+
-+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/module.h>
+
+module_init(init_vserver);
+module_exit(exit_vserver);
+
-diff -NurpP --minimal linux-2.6.19.1/kernel/vserver/inode.c linux-2.6.19.1-vs2.3.0.6/kernel/vserver/inode.c
---- linux-2.6.19.1/kernel/vserver/inode.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/vserver/inode.c 2006-12-17 04:29:30 +0100
-@@ -0,0 +1,321 @@
+diff -urNp -x '*.orig' linux-4.9/kernel/vserver/inode.c linux-4.9/kernel/vserver/inode.c
+--- linux-4.9/kernel/vserver/inode.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/kernel/vserver/inode.c 2021-02-24 15:47:45.124410596 +0100
+@@ -0,0 +1,440 @@
+/*
+ * linux/kernel/vserver/inode.c
+ *
+ * Virtual Server: File System Support
+ *
-+ * Copyright (C) 2004-2005 Herbert Pötzl
++ * Copyright (C) 2004-2007 Herbert P?tzl
+ *
+ * V0.01 separated from vcontext V0.05
++ * V0.02 moved to tag (instead of xid)
+ *
+ */
+
-+#include <linux/sched.h>
++#include <linux/tty.h>
+#include <linux/proc_fs.h>
+#include <linux/devpts_fs.h>
-+#include <linux/namei.h>
++#include <linux/fs.h>
++#include <linux/file.h>
+#include <linux/mount.h>
+#include <linux/parser.h>
-+#include <linux/compat.h>
++#include <linux/namei.h>
++#include <linux/magic.h>
++#include <linux/slab.h>
+#include <linux/vserver/inode.h>
+#include <linux/vserver/inode_cmd.h>
+#include <linux/vs_base.h>
+#include <linux/vs_tag.h>
+
-+#include <asm/errno.h>
+#include <asm/uaccess.h>
++#include <../../fs/proc/internal.h>
+
+
+static int __vc_get_iattr(struct inode *in, uint32_t *tag, uint32_t *flags, uint32_t *mask)
+ return -ESRCH;
+
+ *flags = IATTR_TAG
++ | (IS_IMMUTABLE(in) ? IATTR_IMMUTABLE : 0)
++ | (IS_IXUNLINK(in) ? IATTR_IXUNLINK : 0)
+ | (IS_BARRIER(in) ? IATTR_BARRIER : 0)
-+ | (IS_IUNLINK(in) ? IATTR_IUNLINK : 0)
-+ | (IS_IMMUTABLE(in) ? IATTR_IMMUTABLE : 0);
-+ *mask = IATTR_IUNLINK | IATTR_IMMUTABLE;
++ | (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;
++ *tag = i_tag_read(in);
+ *mask |= IATTR_TAG;
+ }
+
+ break;
+
+ case DEVPTS_SUPER_MAGIC:
-+ *tag = in->i_tag;
++ *tag = i_tag_read(in);
+ *mask |= IATTR_TAG;
+ break;
+
+ return 0;
+}
+
-+int vc_get_iattr(uint32_t id, void __user *data)
++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 nameidata nd;
-+ struct vcmd_ctx_iattr_v1 vc_data = { .xid = -1 };
++ 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)))
++ if (copy_from_user(&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
-+ ret = user_path_walk_link(vc_data.name, &nd);
++ ret = user_lpath(compat_ptr(vc_data.name_ptr), &path);
+ if (!ret) {
-+ ret = __vc_get_iattr(nd.dentry->d_inode,
-+ &vc_data.xid, &vc_data.flags, &vc_data.mask);
-+ path_release(&nd);
++ 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)))
++ if (copy_to_user(data, &vc_data, sizeof(vc_data)))
+ ret = -EFAULT;
+ return ret;
+}
+
-+#ifdef CONFIG_COMPAT
++#endif /* CONFIG_COMPAT */
++
+
-+int vc_get_iattr_x32(uint32_t id, void __user *data)
++int vc_fget_iattr(uint32_t fd, void __user *data)
+{
-+ struct nameidata nd;
-+ struct vcmd_ctx_iattr_v1_x32 vc_data = { .xid = -1 };
++ struct file *filp;
++ struct vcmd_ctx_fiattr_v0 vc_data = { .tag = -1 };
+ int ret;
+
-+ if (!vx_check(0, VS_ADMIN))
-+ return -ENOSYS;
-+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ if (copy_from_user(&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
-+ ret = user_path_walk_link(compat_ptr(vc_data.name_ptr), &nd);
-+ if (!ret) {
-+ ret = __vc_get_iattr(nd.dentry->d_inode,
-+ &vc_data.xid, &vc_data.flags, &vc_data.mask);
-+ path_release(&nd);
-+ }
-+ if (ret)
-+ return ret;
++ filp = fget(fd);
++ if (!filp || !filp->f_path.dentry || !filp->f_path.dentry->d_inode)
++ return -EBADF;
++
++ ret = __vc_get_iattr(filp->f_path.dentry->d_inode,
++ &vc_data.tag, &vc_data.flags, &vc_data.mask);
+
-+ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
++ fput(filp);
++
++ if (copy_to_user(data, &vc_data, sizeof(vc_data)))
+ ret = -EFAULT;
+ return ret;
+}
+
-+#endif /* CONFIG_COMPAT */
-+
+
+static int __vc_set_iattr(struct dentry *de, uint32_t *tag, uint32_t *flags, uint32_t *mask)
+{
+ if ((*mask & IATTR_TAG) && !has_tag)
+ return -EINVAL;
+
-+ mutex_lock(&in->i_mutex);
++ inode_lock(in);
+ if (*mask & IATTR_TAG) {
-+ attr.ia_tag = *tag;
++ attr.ia_tag = make_ktag(&init_user_ns, *tag);
+ attr.ia_valid |= ATTR_TAG;
+ }
+
+ entry->vx_flags = iflags;
+ }
+
-+ if (*mask & (IATTR_BARRIER | IATTR_IUNLINK | IATTR_IMMUTABLE)) {
++ if (*mask & (IATTR_IMMUTABLE | IATTR_IXUNLINK |
++ IATTR_BARRIER | IATTR_COW)) {
++ int iflags = in->i_flags;
++ int vflags = in->i_vflags;
++
+ if (*mask & IATTR_IMMUTABLE) {
+ if (*flags & IATTR_IMMUTABLE)
-+ in->i_flags |= S_IMMUTABLE;
++ iflags |= S_IMMUTABLE;
+ else
-+ in->i_flags &= ~S_IMMUTABLE;
++ iflags &= ~S_IMMUTABLE;
+ }
-+ if (*mask & IATTR_IUNLINK) {
-+ if (*flags & IATTR_IUNLINK)
-+ in->i_flags |= S_IUNLINK;
++ if (*mask & IATTR_IXUNLINK) {
++ if (*flags & IATTR_IXUNLINK)
++ iflags |= S_IXUNLINK;
+ else
-+ in->i_flags &= ~S_IUNLINK;
++ iflags &= ~S_IXUNLINK;
+ }
+ if (S_ISDIR(in->i_mode) && (*mask & IATTR_BARRIER)) {
+ if (*flags & IATTR_BARRIER)
-+ in->i_flags |= S_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
-+ in->i_flags &= ~S_BARRIER;
++ vflags &= ~V_COW;
+ }
+ if (in->i_op && in->i_op->sync_flags) {
-+ error = in->i_op->sync_flags(in);
++ error = in->i_op->sync_flags(in, iflags, vflags);
+ if (error)
+ goto out;
+ }
+ if (in->i_op && in->i_op->setattr)
+ error = in->i_op->setattr(de, &attr);
+ else {
-+ error = inode_change_ok(in, &attr);
-+ if (!error)
-+ error = inode_setattr(in, &attr);
++ error = setattr_prepare(de, &attr);
++ if (!error) {
++ setattr_copy(in, &attr);
++ mark_inode_dirty(in);
++ }
+ }
+ }
+
+out:
-+ mutex_unlock(&in->i_mutex);
++ inode_unlock(in);
+ return error;
+}
+
-+int vc_set_iattr(uint32_t id, void __user *data)
++int vc_set_iattr(void __user *data)
+{
-+ struct nameidata nd;
++ struct path path;
+ struct vcmd_ctx_iattr_v1 vc_data;
+ int ret;
+
+ if (!capable(CAP_LINUX_IMMUTABLE))
+ return -EPERM;
-+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ if (copy_from_user(&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
-+ ret = user_path_walk_link(vc_data.name, &nd);
++ ret = user_lpath(vc_data.name, &path);
+ if (!ret) {
-+ ret = __vc_set_iattr(nd.dentry,
-+ &vc_data.xid, &vc_data.flags, &vc_data.mask);
-+ path_release(&nd);
++ ret = __vc_set_iattr(path.dentry,
++ &vc_data.tag, &vc_data.flags, &vc_data.mask);
++ path_put(&path);
+ }
+
-+ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
++ if (copy_to_user(data, &vc_data, sizeof(vc_data)))
+ ret = -EFAULT;
+ return ret;
+}
+
+#ifdef CONFIG_COMPAT
+
-+int vc_set_iattr_x32(uint32_t id, void __user *data)
++int vc_set_iattr_x32(void __user *data)
+{
-+ struct nameidata nd;
++ struct path path;
+ struct vcmd_ctx_iattr_v1_x32 vc_data;
+ int ret;
+
+ if (!capable(CAP_LINUX_IMMUTABLE))
+ return -EPERM;
-+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ if (copy_from_user(&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
-+ ret = user_path_walk_link(compat_ptr(vc_data.name_ptr), &nd);
++ ret = user_lpath(compat_ptr(vc_data.name_ptr), &path);
+ if (!ret) {
-+ ret = __vc_set_iattr(nd.dentry,
-+ &vc_data.xid, &vc_data.flags, &vc_data.mask);
-+ path_release(&nd);
++ ret = __vc_set_iattr(path.dentry,
++ &vc_data.tag, &vc_data.flags, &vc_data.mask);
++ path_put(&path);
+ }
+
-+ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
++ if (copy_to_user(data, &vc_data, sizeof(vc_data)))
+ ret = -EFAULT;
+ return ret;
+}
+
+#endif /* CONFIG_COMPAT */
+
++int vc_fset_iattr(uint32_t fd, void __user *data)
++{
++ struct file *filp;
++ struct vcmd_ctx_fiattr_v0 vc_data;
++ int ret;
++
++ if (!capable(CAP_LINUX_IMMUTABLE))
++ return -EPERM;
++ if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
++
++ filp = fget(fd);
++ if (!filp || !filp->f_path.dentry || !filp->f_path.dentry->d_inode)
++ return -EBADF;
++
++ ret = __vc_set_iattr(filp->f_path.dentry, &vc_data.tag,
++ &vc_data.flags, &vc_data.mask);
++
++ fput(filp);
++
++ if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++ return -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}
++};
+
-+int dx_parse_tag(char *string, tag_t *tag, int remove)
++
++static void __dx_parse_remove(char *string, char *opt)
+{
-+ static match_table_t tokens = {
-+ {1, "tagid=%u"},
-+ {0, NULL}
-+ };
++ 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, vtag_t *tag, int remove, int *mnt_flags,
++ unsigned long *flags)
++{
++ int set = 0;
+ substring_t args[MAX_OPT_ARGS];
-+ int token, option = 0;
++ int token;
++ char *s, *p, *opts;
++#if defined(CONFIG_PROPAGATE) || defined(CONFIG_VSERVER_DEBUG)
++ int option = 0;
++#endif
+
+ if (!string)
+ return 0;
++ s = kstrdup(string, GFP_KERNEL | GFP_ATOMIC);
++ if (!s)
++ return 0;
+
-+ token = match_token(string, tokens, args);
-+ if (token && tag && !match_int(args, &option))
-+ *tag = option;
-+
-+ vxdprintk(VXD_CBIT(tag, 7),
-+ "dx_parse_tag(»%s«): %d:#%d",
-+ string, token, option);
-+
-+ if ((token == 1) && remove) {
-+ char *p = strstr(string, "tagid=");
-+ char *q = p;
++ opts = s;
++ while ((p = strsep(&opts, ",")) != NULL) {
++ token = match_token(p, tokens, args);
+
-+ if (p) {
-+ while (*q != '\0' && *q != ',')
-+ q++;
-+ while (*q)
-+ *p++ = *q++;
-+ while (*p)
-+ *p++ = '\0';
++ 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);
+ }
-+ return token;
++ if (set)
++ strcpy(string, s);
++ kfree(s);
++ return set;
+}
+
++#ifdef CONFIG_PROPAGATE
++
+void __dx_propagate_tag(struct nameidata *nd, struct inode *inode)
+{
-+ tag_t new_tag = 0;
++ vtag_t new_tag = 0;
+ struct vfsmount *mnt;
+ int propagate;
+
+ if (!nd)
+ return;
-+ mnt = nd->mnt;
++ mnt = nd->path.mnt;
+ if (!mnt)
+ return;
+
+ 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);
++ new_tag, (propagate) ? 1 : 0);
+
+ if (propagate)
-+ inode->i_tag = new_tag;
++ i_tag_write(inode, new_tag);
+}
+
+#include <linux/module.h>
+
+#endif /* CONFIG_PROPAGATE */
+
-diff -NurpP --minimal linux-2.6.19.1/kernel/vserver/limit.c linux-2.6.19.1-vs2.3.0.6/kernel/vserver/limit.c
---- linux-2.6.19.1/kernel/vserver/limit.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/vserver/limit.c 2006-11-30 19:32:53 +0100
-@@ -0,0 +1,317 @@
+diff -urNp -x '*.orig' linux-4.9/kernel/vserver/limit.c linux-4.9/kernel/vserver/limit.c
+--- linux-4.9/kernel/vserver/limit.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/kernel/vserver/limit.c 2021-02-24 15:47:45.124410596 +0100
+@@ -0,0 +1,386 @@
+/*
+ * linux/kernel/vserver/limit.c
+ *
+ * Virtual Server: Context Limits
+ *
-+ * Copyright (C) 2004-2006 Herbert Pötzl
++ * Copyright (C) 2004-2010 Herbert P?tzl
+ *
+ * V0.01 broken out from vcontext V0.05
+ * V0.02 changed vcmds to vxi arg
++ * V0.03 added memory cgroup support
+ *
+ */
+
++#include <linux/sched.h>
+#include <linux/module.h>
-+#include <linux/vs_context.h>
++#include <linux/memcontrol.h>
++#include <linux/page_counter.h>
+#include <linux/vs_limit.h>
+#include <linux/vserver/limit.h>
-+#include <linux/vserver/switch.h>
+#include <linux/vserver/limit_cmd.h>
+
-+#include <asm/errno.h>
+#include <asm/uaccess.h>
+
+
+const char *vlimit_name[NUM_LIMITS] = {
+ [RLIMIT_CPU] = "CPU",
-+ [RLIMIT_RSS] = "RSS",
+ [RLIMIT_NPROC] = "NPROC",
+ [RLIMIT_NOFILE] = "NOFILE",
-+ [RLIMIT_MEMLOCK] = "VML",
-+ [RLIMIT_AS] = "VM",
+ [RLIMIT_LOCKS] = "LOCKS",
+ [RLIMIT_SIGPENDING] = "SIGP",
+ [RLIMIT_MSGQUEUE] = "MSGQ",
+
+ [VLIMIT_NSOCK] = "NSOCK",
+ [VLIMIT_OPENFD] = "OPENFD",
-+ [VLIMIT_ANON] = "ANON",
+ [VLIMIT_SHMEM] = "SHMEM",
+ [VLIMIT_DENTRY] = "DENTRY",
+};
+ /* minimum */
+ 0
+ , /* softlimit */
-+ MASK_ENTRY( RLIMIT_RSS ) |
-+ MASK_ENTRY( VLIMIT_ANON ) |
+ 0
+ , /* maximum */
-+ MASK_ENTRY( RLIMIT_RSS ) |
+ MASK_ENTRY( RLIMIT_NPROC ) |
+ MASK_ENTRY( RLIMIT_NOFILE ) |
-+ MASK_ENTRY( RLIMIT_MEMLOCK ) |
-+ MASK_ENTRY( RLIMIT_AS ) |
+ MASK_ENTRY( RLIMIT_LOCKS ) |
+ MASK_ENTRY( RLIMIT_MSGQUEUE ) |
+
+ MASK_ENTRY( VLIMIT_NSOCK ) |
+ MASK_ENTRY( VLIMIT_OPENFD ) |
-+ MASK_ENTRY( VLIMIT_ANON ) |
+ MASK_ENTRY( VLIMIT_SHMEM ) |
+ MASK_ENTRY( VLIMIT_DENTRY ) |
+ 0
+uint32_t account_mask =
+ MASK_ENTRY( VLIMIT_SEMARY ) |
+ MASK_ENTRY( VLIMIT_NSEMS ) |
++ MASK_ENTRY( VLIMIT_MAPPED ) |
+ 0;
+
+
+ struct vcmd_ctx_rlimit_v0 vc_data;
+ int ret;
+
-+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ if (copy_from_user(&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
+ ret = do_get_rlimit(vxi, vc_data.id,
+ if (ret)
+ return ret;
+
-+ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
++ if (copy_to_user(data, &vc_data, sizeof(vc_data)))
+ return -EFAULT;
+ return 0;
+}
+{
+ struct vcmd_ctx_rlimit_v0 vc_data;
+
-+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ if (copy_from_user(&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
+ return do_set_rlimit(vxi, vc_data.id,
+{
+ struct vcmd_ctx_rlimit_v0_x32 vc_data;
+
-+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ if (copy_from_user(&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
+ return do_set_rlimit(vxi, vc_data.id,
+ struct vcmd_ctx_rlimit_v0_x32 vc_data;
+ int ret;
+
-+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ if (copy_from_user(&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
+ ret = do_get_rlimit(vxi, vc_data.id,
+ if (ret)
+ return ret;
+
-+ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
++ if (copy_to_user(data, &vc_data, sizeof(vc_data)))
+ return -EFAULT;
+ return 0;
+}
+}
+
+
++static inline void vx_reset_hits(struct _vx_limit *limit)
++{
++ int lim;
++
++ for (lim = 0; lim < NUM_LIMITS; lim++) {
++ atomic_set(&__rlim_lhit(limit, lim), 0);
++ }
++}
++
++int vc_reset_hits(struct vx_info *vxi, void __user *data)
++{
++ vx_reset_hits(&vxi->limit);
++ return 0;
++}
++
+static inline void vx_reset_minmax(struct _vx_limit *limit)
+{
+ rlim_t value;
+ int lim;
+
-+ for (lim=0; lim<NUM_LIMITS; lim++) {
++ for (lim = 0; lim < NUM_LIMITS; lim++) {
+ value = __rlim_get(limit, lim);
+ __rlim_rmax(limit, lim) = value;
+ __rlim_rmin(limit, lim) = value;
+ }
+}
+
-+
+int vc_reset_minmax(struct vx_info *vxi, void __user *data)
+{
+ vx_reset_minmax(&vxi->limit);
+ struct _vx_limit *limit = &vxi->limit;
+ int id;
+
-+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ if (copy_from_user(&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
+ id = vc_data.id;
+ if (!is_accounted_vlimit(id))
+ return -EINVAL;
+
++ vx_limit_fixup(limit, id);
+ vc_data.hits = atomic_read(&__rlim_lhit(limit, id));
+ vc_data.value = __rlim_get(limit, id);
+ vc_data.minimum = __rlim_rmin(limit, id);
+ vc_data.maximum = __rlim_rmax(limit, id);
+
-+ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
++ if (copy_to_user(data, &vc_data, sizeof(vc_data)))
+ return -EFAULT;
+ return 0;
+}
+
+
++#ifdef CONFIG_MEMCG
++
++void dump_sysinfo(struct sysinfo *si)
++{
++ printk(KERN_INFO "sysinfo: memunit=%u\n"
++ "\ttotalram:\t%lu\n"
++ "\tfreeram:\t%lu\n"
++ "\tsharedram:\t%lu\n"
++ "\tbufferram:\t%lu\n"
++ "\ttotalswap:\t%lu\n"
++ "\tfreeswap:\t%lu\n"
++ "\ttotalhigh:\t%lu\n"
++ "\tfreehigh:\t%lu\n",
++ si->mem_unit,
++ si->totalram,
++ si->freeram,
++ si->sharedram,
++ si->bufferram,
++ si->totalswap,
++ si->freeswap,
++ si->totalhigh,
++ si->freehigh);
++}
++
+void vx_vsi_meminfo(struct sysinfo *val)
+{
-+ struct vx_info *vxi = current->vx_info;
-+ unsigned long totalram, freeram;
-+ rlim_t v;
++ struct mem_cgroup *mcg;
++ unsigned long res_limit, res_usage;
++ unsigned shift;
+
-+ /* we blindly accept the max */
-+ v = __rlim_soft(&vxi->limit, RLIMIT_RSS);
-+ totalram = (v != RLIM_INFINITY) ? v : val->totalram;
++ if (VXD_CBIT(cvirt, 4))
++ dump_sysinfo(val);
++
++ rcu_read_lock();
++ mcg = mem_cgroup_from_task(current);
++ if (VXD_CBIT(cvirt, 5))
++ dump_mem_cgroup(mcg);
++ rcu_read_unlock();
++ if (!mcg)
++ goto out;
+
-+ /* total minus used equals free */
-+ v = __vx_cres_array_fixup(&vxi->limit, VLA_RSS);
-+ freeram = (v < totalram) ? totalram - v : 0;
++ res_limit = mem_cgroup_mem_limit_pages(mcg);
++ res_usage = mem_cgroup_mem_usage_pages(mcg);
++ shift = val->mem_unit == 1 ? PAGE_SHIFT : 0;
+
-+ val->totalram = totalram;
-+ val->freeram = freeram;
++ if (res_limit != PAGE_COUNTER_MAX)
++ val->totalram = res_limit << shift;
++ val->freeram = val->totalram - (res_usage << shift);
+ val->bufferram = 0;
+ val->totalhigh = 0;
+ val->freehigh = 0;
++out:
+ return;
+}
+
+void vx_vsi_swapinfo(struct sysinfo *val)
+{
-+ struct vx_info *vxi = current->vx_info;
-+ unsigned long totalswap, freeswap;
-+ rlim_t v, w;
++#ifdef CONFIG_MEMCG_SWAP
++ struct mem_cgroup *mcg;
++ unsigned long res_limit, res_usage, memsw_limit, memsw_usage;
++ signed long swap_limit, swap_usage;
++ unsigned shift;
+
-+ v = __rlim_soft(&vxi->limit, RLIMIT_RSS);
-+ if (v == RLIM_INFINITY) {
-+ val->freeswap = val->totalswap;
-+ return;
-+ }
++ if (VXD_CBIT(cvirt, 6))
++ dump_sysinfo(val);
++
++ rcu_read_lock();
++ mcg = mem_cgroup_from_task(current);
++ if (VXD_CBIT(cvirt, 7))
++ dump_mem_cgroup(mcg);
++ rcu_read_unlock();
++ if (!mcg)
++ goto out;
++
++ res_limit = mem_cgroup_mem_limit_pages(mcg);
+
-+ /* we blindly accept the max */
-+ w = __rlim_hard(&vxi->limit, RLIMIT_RSS);
-+ totalswap = (w != RLIM_INFINITY) ? (w - v) : val->totalswap;
++ /* memory unlimited */
++ if (res_limit == PAGE_COUNTER_MAX)
++ goto out;
++
++ res_usage = mem_cgroup_mem_usage_pages(mcg);
++ memsw_limit = mem_cgroup_memsw_limit_pages(mcg);
++ memsw_usage = mem_cgroup_memsw_usage_pages(mcg);
++ shift = val->mem_unit == 1 ? PAGE_SHIFT : 0;
+
-+ /* currently 'used' swap */
-+ w = __vx_cres_array_fixup(&vxi->limit, VLA_RSS);
-+ w -= (w > v) ? v : w;
++ swap_limit = memsw_limit - res_limit;
++ /* we have a swap limit? */
++ if (memsw_limit != PAGE_COUNTER_MAX)
++ val->totalswap = swap_limit << shift;
+
-+ /* total minus used equals free */
-+ freeswap = (w < totalswap) ? totalswap - w : 0;
++ /* calculate swap part */
++ swap_usage = (memsw_usage > res_usage) ?
++ memsw_usage - res_usage : 0;
+
-+ val->totalswap = totalswap;
-+ val->freeswap = freeswap;
++ /* total shown minus usage gives free swap */
++ val->freeswap = (swap_usage < swap_limit) ?
++ val->totalswap - (swap_usage << shift) : 0;
++out:
++#else /* !CONFIG_MEMCG_SWAP */
++ val->totalswap = 0;
++ val->freeswap = 0;
++#endif /* !CONFIG_MEMCG_SWAP */
+ return;
+}
+
-+
-+unsigned long vx_badness(struct task_struct *task, struct mm_struct *mm)
++long vx_vsi_cached(struct sysinfo *val)
+{
-+ struct vx_info *vxi = mm->mm_vx_info;
-+ unsigned long points;
-+ rlim_t v, w;
++ long cache = 0;
++#ifdef CONFIG_MEMCG_BROKEN
++ struct mem_cgroup *mcg;
+
-+ if (!vxi)
-+ return 0;
++ if (VXD_CBIT(cvirt, 8))
++ dump_sysinfo(val);
+
-+ 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);
++ if (VXD_CBIT(cvirt, 9))
++ dump_mem_cgroup(mcg);
++ rcu_read_unlock();
++ if (!mcg)
++ goto out;
+
-+ return points;
++ // cache = mem_cgroup_stat_read_cache(mcg);
++out:
++#endif
++ return cache;
+}
++#endif /* !CONFIG_MEMCG */
+
-diff -NurpP --minimal linux-2.6.19.1/kernel/vserver/limit_init.h linux-2.6.19.1-vs2.3.0.6/kernel/vserver/limit_init.h
---- linux-2.6.19.1/kernel/vserver/limit_init.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/vserver/limit_init.h 2006-11-08 04:57:49 +0100
-@@ -0,0 +1,33 @@
+diff -urNp -x '*.orig' linux-4.9/kernel/vserver/limit_init.h linux-4.9/kernel/vserver/limit_init.h
+--- linux-4.9/kernel/vserver/limit_init.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/kernel/vserver/limit_init.h 2021-02-24 15:47:45.124410596 +0100
+@@ -0,0 +1,31 @@
+
+
+static inline void vx_info_init_limit(struct _vx_limit *limit)
+{
+ int lim;
+
-+ for (lim=0; lim<NUM_LIMITS; lim++) {
++ for (lim = 0; lim < NUM_LIMITS; lim++) {
+ __rlim_soft(limit, lim) = RLIM_INFINITY;
+ __rlim_hard(limit, lim) = RLIM_INFINITY;
+ __rlim_set(limit, lim, 0);
+
+static inline void vx_info_exit_limit(struct _vx_limit *limit)
+{
-+#ifdef CONFIG_VSERVER_DEBUG
+ rlim_t value;
+ int lim;
+
-+ for (lim=0; lim<NUM_LIMITS; lim++) {
++ for (lim = 0; lim < NUM_LIMITS; lim++) {
+ if ((1 << lim) & VLIM_NOCHECK)
+ continue;
+ value = __rlim_get(limit, lim);
-+ vxwprintk(value,
-+ "!!! limit: %p[%s,%d] = %ld on exit.",
-+ limit, vlimit_name[lim], lim, (long)value);
-+ }
-+#endif
-+}
-+
-diff -NurpP --minimal linux-2.6.19.1/kernel/vserver/limit_proc.h linux-2.6.19.1-vs2.3.0.6/kernel/vserver/limit_proc.h
---- linux-2.6.19.1/kernel/vserver/limit_proc.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/vserver/limit_proc.h 2006-11-30 19:31:41 +0100
-@@ -0,0 +1,76 @@
-+#ifndef _VX_LIMIT_PROC_H
-+#define _VX_LIMIT_PROC_H
-+
-+#include <linux/vserver/limit_int.h>
-+
-+static inline void vx_limit_fixup(struct _vx_limit *limit)
-+{
-+ rlim_t value;
-+ int res;
-+
-+ /* complex resources first */
-+ __vx_cres_array_fixup(limit, VLA_RSS);
-+
-+ for (res=0; res<NUM_LIMITS; res++) {
-+ 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);
-+ }
-+}
-+
-+
-+#define VX_LIMIT_FMT ":\t%8ld\t%8ld/%8ld\t%8lld/%8lld\t%6d\n"
-+#define VX_LIMIT_TOP \
-+ "Limit\t current\t min/max\t\t soft/hard\t\thits\n"
-+
-+#define VX_LIMIT_ARG(r) \
-+ ,(unsigned long)__rlim_get(limit, r) \
-+ ,(unsigned long)__rlim_rmin(limit, r) \
-+ ,(unsigned long)__rlim_rmax(limit, r) \
-+ ,VX_VLIM(__rlim_soft(limit, r)) \
-+ ,VX_VLIM(__rlim_hard(limit, r)) \
-+ ,atomic_read(&__rlim_lhit(limit, r))
-+
-+static inline int vx_info_proc_limit(struct _vx_limit *limit, char *buffer)
-+{
-+ vx_limit_fixup(limit);
-+ return sprintf(buffer, VX_LIMIT_TOP
-+ "PROC" VX_LIMIT_FMT
-+ "VM" VX_LIMIT_FMT
-+ "VML" VX_LIMIT_FMT
-+ "RSS" VX_LIMIT_FMT
-+ "ANON" VX_LIMIT_FMT
-+ "RMAP" VX_LIMIT_FMT
-+ "FILES" VX_LIMIT_FMT
-+ "OFD" VX_LIMIT_FMT
-+ "LOCKS" VX_LIMIT_FMT
-+ "SOCK" VX_LIMIT_FMT
-+ "MSGQ" VX_LIMIT_FMT
-+ "SHM" VX_LIMIT_FMT
-+ "SEMA" VX_LIMIT_FMT
-+ "SEMS" VX_LIMIT_FMT
-+ "DENT" VX_LIMIT_FMT
-+ VX_LIMIT_ARG(RLIMIT_NPROC)
-+ VX_LIMIT_ARG(RLIMIT_AS)
-+ VX_LIMIT_ARG(RLIMIT_MEMLOCK)
-+ VX_LIMIT_ARG(RLIMIT_RSS)
-+ VX_LIMIT_ARG(VLIMIT_ANON)
-+ VX_LIMIT_ARG(VLIMIT_MAPPED)
-+ VX_LIMIT_ARG(RLIMIT_NOFILE)
-+ VX_LIMIT_ARG(VLIMIT_OPENFD)
-+ VX_LIMIT_ARG(RLIMIT_LOCKS)
-+ VX_LIMIT_ARG(VLIMIT_NSOCK)
-+ VX_LIMIT_ARG(RLIMIT_MSGQUEUE)
-+ VX_LIMIT_ARG(VLIMIT_SHMEM)
-+ VX_LIMIT_ARG(VLIMIT_SEMARY)
-+ VX_LIMIT_ARG(VLIMIT_NSEMS)
-+ VX_LIMIT_ARG(VLIMIT_DENTRY)
-+ );
-+}
-+
-+#endif /* _VX_LIMIT_PROC_H */
-+
-+
-diff -NurpP --minimal linux-2.6.19.1/kernel/vserver/monitor.c linux-2.6.19.1-vs2.3.0.6/kernel/vserver/monitor.c
---- linux-2.6.19.1/kernel/vserver/monitor.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/vserver/monitor.c 2006-11-08 04:57:48 +0100
-@@ -0,0 +1,142 @@
-+/*
-+ * kernel/vserver/monitor.c
-+ *
-+ * Virtual Context Scheduler Monitor
-+ *
-+ * Copyright (C) 2006 Herbert Pötzl
-+ *
-+ * V0.01 basic design
-+ *
-+ */
-+
-+#include <linux/errno.h>
-+#include <linux/module.h>
-+#include <linux/types.h>
-+#include <linux/ctype.h>
-+
-+#include <asm/uaccess.h>
-+#include <asm/atomic.h>
-+#include <asm/unistd.h>
-+
-+#include <linux/vserver/monitor.h>
-+#include <linux/vserver/debug_cmd.h>
-+
-+
-+#ifdef CONFIG_VSERVER_MONITOR
-+#define VXM_SIZE CONFIG_VSERVER_MONITOR_SIZE
-+#else
-+#define VXM_SIZE 64
-+#endif
-+
-+struct _vx_monitor {
-+ unsigned int counter;
-+
-+ struct _vx_mon_entry entry[VXM_SIZE+1];
-+};
-+
-+
-+DEFINE_PER_CPU(struct _vx_monitor, vx_monitor_buffer);
-+
-+unsigned volatile int vxm_active = 1;
-+
-+static atomic_t sequence = ATOMIC_INIT(0);
-+
-+
-+/* vxm_advance()
-+
-+ * requires disabled preemption */
-+
-+struct _vx_mon_entry *vxm_advance(int cpu)
-+{
-+ struct _vx_monitor *mon = &per_cpu(vx_monitor_buffer, cpu);
-+ struct _vx_mon_entry *entry;
-+ unsigned int index;
-+
-+ index = vxm_active ? (mon->counter++ % VXM_SIZE) : VXM_SIZE;
-+ entry = &mon->entry[index];
-+
-+ entry->ev.seq = atomic_inc_return(&sequence);
-+ entry->ev.jif = jiffies;
-+ return entry;
-+}
-+
-+EXPORT_SYMBOL_GPL(vxm_advance);
-+
-+
-+int do_read_monitor(struct __user _vx_mon_entry *data,
-+ int cpu, uint32_t *index, uint32_t *count)
-+{
-+ int pos, ret = 0;
-+ struct _vx_monitor *mon = &per_cpu(vx_monitor_buffer, cpu);
-+ int end = mon->counter;
-+ int start = end - VXM_SIZE + 2;
-+ int idx = *index;
-+
-+ /* special case: get current pos */
-+ if (!*count) {
-+ *index = end;
-+ return 0;
-+ }
-+
-+ /* have we lost some data? */
-+ if (idx < start)
-+ idx = start;
-+
-+ for (pos = 0; (pos < *count) && (idx < end); pos++, idx++) {
-+ struct _vx_mon_entry *entry =
-+ &mon->entry[idx % VXM_SIZE];
-+
-+ /* send entry to userspace */
-+ ret = copy_to_user (&data[pos], entry, sizeof(*entry));
-+ if (ret)
-+ break;
-+ }
-+ /* save new index and count */
-+ *index = idx;
-+ *count = pos;
-+ return ret ? ret : (*index < end);
-+}
-+
-+int vc_read_monitor(uint32_t id, void __user *data)
-+{
-+ struct vcmd_read_monitor_v0 vc_data;
-+ int ret;
-+
-+ if (id >= NR_CPUS)
-+ return -EINVAL;
-+
-+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
-+ return -EFAULT;
-+
-+ ret = do_read_monitor((struct __user _vx_mon_entry *)vc_data.data,
-+ id, &vc_data.index, &vc_data.count);
-+
-+ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
-+ return -EFAULT;
-+ return ret;
++ vxwprintk_xid(value,
++ "!!! limit: %p[%s,%d] = %ld on exit.",
++ limit, vlimit_name[lim], lim, (long)value);
++ }
+}
+
-+#ifdef CONFIG_COMPAT
+diff -urNp -x '*.orig' linux-4.9/kernel/vserver/limit_proc.h linux-4.9/kernel/vserver/limit_proc.h
+--- linux-4.9/kernel/vserver/limit_proc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/kernel/vserver/limit_proc.h 2021-02-24 15:47:45.124410596 +0100
+@@ -0,0 +1,57 @@
++#ifndef _VX_LIMIT_PROC_H
++#define _VX_LIMIT_PROC_H
+
-+int vc_read_monitor_x32(uint32_t id, void __user *data)
-+{
-+ struct vcmd_read_monitor_v0_x32 vc_data;
-+ int ret;
++#include <linux/vserver/limit_int.h>
+
-+ if (id >= NR_CPUS)
-+ return -EINVAL;
+
-+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
-+ return -EFAULT;
++#define VX_LIMIT_FMT ":\t%8ld\t%8ld/%8ld\t%8lld/%8lld\t%6d\n"
++#define VX_LIMIT_TOP \
++ "Limit\t current\t min/max\t\t soft/hard\t\thits\n"
+
-+ ret = do_read_monitor((struct __user _vx_mon_entry *)
-+ compat_ptr(vc_data.data_ptr),
-+ id, &vc_data.index, &vc_data.count);
++#define VX_LIMIT_ARG(r) \
++ (unsigned long)__rlim_get(limit, r), \
++ (unsigned long)__rlim_rmin(limit, r), \
++ (unsigned long)__rlim_rmax(limit, r), \
++ VX_VLIM(__rlim_soft(limit, r)), \
++ VX_VLIM(__rlim_hard(limit, r)), \
++ atomic_read(&__rlim_lhit(limit, r))
+
-+ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
-+ return -EFAULT;
-+ return ret;
++static inline int vx_info_proc_limit(struct _vx_limit *limit, char *buffer)
++{
++ vx_limit_fixup(limit, -1);
++ return sprintf(buffer, VX_LIMIT_TOP
++ "PROC" VX_LIMIT_FMT
++ "VM" VX_LIMIT_FMT
++ "VML" VX_LIMIT_FMT
++ "RSS" VX_LIMIT_FMT
++ "ANON" VX_LIMIT_FMT
++ "RMAP" VX_LIMIT_FMT
++ "FILES" VX_LIMIT_FMT
++ "OFD" VX_LIMIT_FMT
++ "LOCKS" VX_LIMIT_FMT
++ "SOCK" VX_LIMIT_FMT
++ "MSGQ" VX_LIMIT_FMT
++ "SHM" VX_LIMIT_FMT
++ "SEMA" VX_LIMIT_FMT
++ "SEMS" VX_LIMIT_FMT
++ "DENT" VX_LIMIT_FMT,
++ VX_LIMIT_ARG(RLIMIT_NPROC),
++ VX_LIMIT_ARG(RLIMIT_AS),
++ VX_LIMIT_ARG(RLIMIT_MEMLOCK),
++ VX_LIMIT_ARG(RLIMIT_RSS),
++ VX_LIMIT_ARG(VLIMIT_ANON),
++ VX_LIMIT_ARG(VLIMIT_MAPPED),
++ VX_LIMIT_ARG(RLIMIT_NOFILE),
++ VX_LIMIT_ARG(VLIMIT_OPENFD),
++ VX_LIMIT_ARG(RLIMIT_LOCKS),
++ VX_LIMIT_ARG(VLIMIT_NSOCK),
++ VX_LIMIT_ARG(RLIMIT_MSGQUEUE),
++ VX_LIMIT_ARG(VLIMIT_SHMEM),
++ VX_LIMIT_ARG(VLIMIT_SEMARY),
++ VX_LIMIT_ARG(VLIMIT_NSEMS),
++ VX_LIMIT_ARG(VLIMIT_DENTRY));
+}
+
-+#endif /* CONFIG_COMPAT */
++#endif /* _VX_LIMIT_PROC_H */
++
+
-diff -NurpP --minimal linux-2.6.19.1/kernel/vserver/network.c linux-2.6.19.1-vs2.3.0.6/kernel/vserver/network.c
---- linux-2.6.19.1/kernel/vserver/network.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/vserver/network.c 2006-12-17 05:38:36 +0100
-@@ -0,0 +1,626 @@
+diff -urNp -x '*.orig' linux-4.9/kernel/vserver/network.c linux-4.9/kernel/vserver/network.c
+--- linux-4.9/kernel/vserver/network.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/kernel/vserver/network.c 2021-02-24 15:47:45.124410596 +0100
+@@ -0,0 +1,1053 @@
+/*
+ * linux/kernel/vserver/network.c
+ *
+ * Virtual Server: Network Support
+ *
-+ * Copyright (C) 2003-2006 Herbert Pötzl
++ * Copyright (C) 2003-2007 Herbert P?tzl
+ *
+ * V0.01 broken out from vcontext V0.05
+ * V0.02 cleaned up implementation
+ * V0.04 switch to RCU based hash
+ * V0.05 and back to locking again
+ * V0.06 changed vcmds to nxi arg
++ * V0.07 have __create claim() the nxi
+ *
+ */
+
++#include <linux/err.h>
+#include <linux/slab.h>
+#include <linux/rcupdate.h>
-+#include <net/tcp.h>
++#include <net/ipv6.h>
+
-+#include <asm/errno.h>
-+#include <linux/vserver/base.h>
++#include <linux/vs_network.h>
++#include <linux/vs_pid.h>
+#include <linux/vserver/network_cmd.h>
+
+
+atomic_t nx_global_ctotal = ATOMIC_INIT(0);
+atomic_t nx_global_cactive = ATOMIC_INIT(0);
+
++static struct kmem_cache *nx_addr_v4_cachep = NULL;
++static struct kmem_cache *nx_addr_v6_cachep = NULL;
++
++
++static int __init init_network(void)
++{
++ nx_addr_v4_cachep = kmem_cache_create("nx_v4_addr_cache",
++ sizeof(struct nx_addr_v4), 0,
++ SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
++ nx_addr_v6_cachep = kmem_cache_create("nx_v6_addr_cache",
++ sizeof(struct nx_addr_v6), 0,
++ SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
++ return 0;
++}
++
++
++/* __alloc_nx_addr_v4() */
++
++static inline struct nx_addr_v4 *__alloc_nx_addr_v4(void)
++{
++ struct nx_addr_v4 *nxa = kmem_cache_alloc(
++ nx_addr_v4_cachep, GFP_KERNEL);
++
++ if (!IS_ERR(nxa))
++ memset(nxa, 0, sizeof(*nxa));
++ return nxa;
++}
++
++/* __dealloc_nx_addr_v4() */
++
++static inline void __dealloc_nx_addr_v4(struct nx_addr_v4 *nxa)
++{
++ kmem_cache_free(nx_addr_v4_cachep, nxa);
++}
++
++/* __dealloc_nx_addr_v4_all() */
++
++static inline void __dealloc_nx_addr_v4_all(struct nx_addr_v4 *nxa)
++{
++ while (nxa) {
++ struct nx_addr_v4 *next = nxa->next;
++
++ __dealloc_nx_addr_v4(nxa);
++ nxa = next;
++ }
++}
++
++
++#ifdef CONFIG_IPV6
++
++/* __alloc_nx_addr_v6() */
++
++static inline struct nx_addr_v6 *__alloc_nx_addr_v6(void)
++{
++ struct nx_addr_v6 *nxa = kmem_cache_alloc(
++ nx_addr_v6_cachep, GFP_KERNEL);
++
++ if (!IS_ERR(nxa))
++ memset(nxa, 0, sizeof(*nxa));
++ return nxa;
++}
++
++/* __dealloc_nx_addr_v6() */
++
++static inline void __dealloc_nx_addr_v6(struct nx_addr_v6 *nxa)
++{
++ kmem_cache_free(nx_addr_v6_cachep, nxa);
++}
++
++/* __dealloc_nx_addr_v6_all() */
++
++static inline void __dealloc_nx_addr_v6_all(struct nx_addr_v6 *nxa)
++{
++ while (nxa) {
++ struct nx_addr_v6 *next = nxa->next;
++
++ __dealloc_nx_addr_v6(nxa);
++ nxa = next;
++ }
++}
++
++#endif /* CONFIG_IPV6 */
+
+/* __alloc_nx_info()
+
+ * 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;
+
+ if (!new)
+ return 0;
+
-+ memset (new, 0, sizeof(struct nx_info));
++ memset(new, 0, sizeof(struct nx_info));
+ new->nx_id = nid;
+ INIT_HLIST_NODE(&new->nx_hlist);
+ atomic_set(&new->nx_usecnt, 0);
+ atomic_set(&new->nx_tasks, 0);
++ spin_lock_init(&new->addr_lock);
+ new->nx_state = 0;
+
+ new->nx_flags = NXF_INIT_SET;
+
+ /* rest of init goes here */
+
++ new->v4_lback.s_addr = htonl(INADDR_LOOPBACK);
++ new->v4_bcast.s_addr = htonl(INADDR_BROADCAST);
++
+ vxdprintk(VXD_CBIT(nid, 0),
+ "alloc_nx_info(%d) = %p", nid, new);
+ atomic_inc(&nx_global_ctotal);
+ BUG_ON(atomic_read(&nxi->nx_usecnt));
+ 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);
+ atomic_dec(&nx_global_ctotal);
+void __nx_set_lback(struct nx_info *nxi)
+{
+ int nid = nxi->nx_id;
-+ uint32_t lback = htonl(INADDR_LOOPBACK ^ ((nid & 0xFFFF) << 8));
++ __be32 lback = htonl(INADDR_LOOPBACK ^ ((nid & 0xFFFF) << 8));
+
-+ nxi->v4_lback = lback;
++ nxi->v4_lback.s_addr = lback;
+}
+
++extern int __nx_inet_add_lback(__be32 addr);
++extern int __nx_inet_del_lback(__be32 addr);
++
+
+/* hash table for nx_info hash */
+
+
+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);
+}
+{
+ vxd_assert_lock(&nx_info_hash_lock);
+ vxdprintk(VXD_CBIT(nid, 4),
-+ "__unhash_nx_info: %p[#%d]", nxi, nxi->nx_id);
++ "__unhash_nx_info: %p[#%d.%d.%d]", nxi, nxi->nx_id,
++ atomic_read(&nxi->nx_usecnt), atomic_read(&nxi->nx_tasks));
+
+ /* context must be hashed */
+ BUG_ON(!nx_info_state(nxi, NXS_HASHED));
++ /* but without tasks */
++ BUG_ON(atomic_read(&nxi->nx_tasks));
+
+ nxi->nx_state &= ~NXS_HASHED;
+ hlist_del(&nxi->nx_hlist);
+ * 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;
+found:
+ vxdprintk(VXD_CBIT(nid, 0),
+ "__lookup_nx_info(#%u): %p[#%u]",
-+ nid, nxi, nxi?nxi->nx_id:0);
++ nid, nxi, nxi ? nxi->nx_id : 0);
+ return nxi;
+}
+
+/* __create_nx_info()
+
+ * create the requested context
-+ * get() and hash it */
++ * get(), claim() and hash it */
+
-+static struct nx_info * __create_nx_info(int id)
++static struct nx_info *__create_nx_info(int id)
+{
+ struct nx_info *new, *nxi = NULL;
+
+ /* new context */
+ vxdprintk(VXD_CBIT(nid, 0),
+ "create_nx_info(%d) = %p (new)", id, new);
++ claim_nx_info(new, NULL);
++ __nx_set_lback(new);
+ __hash_nx_info(get_nx_info(new));
+ nxi = new, new = NULL;
+
+ spin_unlock(&nx_info_hash_lock);
+}
+
-+
+/* lookup_nx_info()
+
+ * search for a nx_info and get() it
+ struct nx_info *nxi = NULL;
+
+ if (id < 0) {
-+ nxi = get_nx_info(current->nx_info);
++ nxi = get_nx_info(current_nx_info());
+ } else if (id > 1) {
+ spin_lock(&nx_info_hash_lock);
+ nxi = get_nx_info(__lookup_nx_info(id));
+
+ * verify that nid is still hashed */
+
-+int nid_is_hashed(nid_t nid)
++int nid_is_hashed(vnid_t nid)
+{
+ int hashed;
+
+ int hindex, nr_nids = 0;
+
+ /* only show current and children */
-+ if (!nx_check(0, VS_ADMIN|VS_WATCH)) {
++ if (!nx_check(0, VS_ADMIN | VS_WATCH)) {
+ if (index > 0)
+ return 0;
+ nids[nr_nids] = nx_current_nid();
+ !nx_info_flags(nxi, NXF_STATE_SETUP, 0))
+ return -EACCES;
+
++ if (nx_info_state(nxi, NXS_SHUTDOWN))
++ return -EFAULT;
++
+ /* maybe disallow this completely? */
+ old_nxi = task_get_nx_info(p);
+ if (old_nxi == nxi)
+
+void nx_set_persistent(struct nx_info *nxi)
+{
++ vxdprintk(VXD_CBIT(nid, 6),
++ "nx_set_persistent(%p[#%d])", nxi, nxi->nx_id);
++
+ get_nx_info(nxi);
-+ claim_nx_info(nxi, current);
++ claim_nx_info(nxi, NULL);
+}
+
+void nx_clear_persistent(struct nx_info *nxi)
+ vxdprintk(VXD_CBIT(nid, 6),
+ "nx_clear_persistent(%p[#%d])", nxi, nxi->nx_id);
+
-+ release_nx_info(nxi, current);
++ release_nx_info(nxi, NULL);
+ put_nx_info(nxi);
+}
+
+#include <asm/uaccess.h>
+
+
-+int vc_task_nid(uint32_t id, void __user *data)
++int vc_task_nid(uint32_t id)
+{
-+ nid_t nid;
++ vnid_t nid;
+
+ if (id) {
+ struct task_struct *tsk;
+
-+ if (!vx_check(0, VS_ADMIN|VS_WATCH))
-+ return -EPERM;
-+
-+ read_lock(&tasklist_lock);
++ rcu_read_lock();
+ tsk = find_task_by_real_pid(id);
+ nid = (tsk) ? tsk->nid : -ESRCH;
-+ read_unlock(&tasklist_lock);
-+ }
-+ else
++ rcu_read_unlock();
++ } else
+ nid = nx_current_nid();
+ return nid;
+}
+
+ vc_data.nid = nxi->nx_id;
+
-+ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
++ if (copy_to_user(data, &vc_data, sizeof(vc_data)))
+ return -EFAULT;
+ return 0;
+}
+ struct nx_info *new_nxi;
+ int ret;
+
-+ if (data && copy_from_user (&vc_data, data, sizeof(vc_data)))
++ if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
+ if ((nid > MAX_S_CONTEXT) || (nid < 2))
+ /* initial flags */
+ new_nxi->nx_flags = vc_data.flagword;
+
-+ /* get a reference for persistent contexts */
-+ if ((vc_data.flagword & NXF_PERSISTENT))
-+ nx_set_persistent(new_nxi);
-+
+ ret = -ENOEXEC;
+ if (vs_net_change(new_nxi, VSC_NETUP))
-+ goto out_unhash;
++ goto out;
++
+ ret = nx_migrate_task(current, new_nxi);
-+ if (!ret) {
-+ /* return context id on success */
-+ ret = new_nxi->nx_id;
++ if (ret)
+ goto out;
-+ }
-+out_unhash:
-+ /* prepare for context disposal */
-+ new_nxi->nx_state |= NXS_SHUTDOWN;
++
++ /* return context id on success */
++ ret = new_nxi->nx_id;
++
++ /* get a reference for persistent contexts */
+ if ((vc_data.flagword & NXF_PERSISTENT))
-+ nx_clear_persistent(new_nxi);
-+ __unhash_nx_info(new_nxi);
++ nx_set_persistent(new_nxi);
+out:
++ release_nx_info(new_nxi, NULL);
+ put_nx_info(new_nxi);
+ return ret;
+}
+
+
-+int vc_net_migrate(struct nx_info *nxi, void __user *data)
-+{
-+ return nx_migrate_task(current, nxi);
-+}
-+
-+int vc_net_add(struct nx_info *nxi, void __user *data)
++int vc_net_migrate(struct nx_info *nxi, void __user *data)
++{
++ return nx_migrate_task(current, nxi);
++}
++
++
++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 = 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)) {
++ 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;
++
++ default:
++ ret = -EINVAL;
++ }
++ spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
++ __dealloc_nx_addr_v4_all(old);
++ return ret;
++}
++
++
++int vc_net_add(struct nx_info *nxi, void __user *data)
++{
++ struct vcmd_net_addr_v0 vc_data;
++ int index, ret = 0;
++
++ if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
++
++ switch (vc_data.type) {
++ case NXA_TYPE_IPV4:
++ if ((vc_data.count < 1) || (vc_data.count > 4))
++ return -EINVAL;
++
++ index = 0;
++ while (index < vc_data.count) {
++ ret = do_add_v4_addr(nxi, vc_data.ip[index].s_addr, 0,
++ vc_data.mask[index].s_addr, NXA_TYPE_ADDR, 0);
++ if (ret)
++ return ret;
++ index++;
++ }
++ ret = index;
++ break;
++
++ case NXA_TYPE_IPV4|NXA_MOD_BCAST:
++ nxi->v4_bcast = vc_data.ip[0];
++ ret = 1;
++ break;
++
++ case NXA_TYPE_IPV4|NXA_MOD_LBACK:
++ nxi->v4_lback = vc_data.ip[0];
++ ret = 1;
++ break;
++
++ default:
++ ret = -EINVAL;
++ break;
++ }
++ return ret;
++}
++
++int vc_net_remove(struct nx_info *nxi, void __user *data)
++{
++ struct vcmd_net_addr_v0 vc_data;
++
++ if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
++
++ switch (vc_data.type) {
++ case NXA_TYPE_ANY:
++ return do_remove_v4_addr(nxi, 0, 0, 0, vc_data.type, 0);
++ default:
++ return -EINVAL;
++ }
++ return 0;
++}
++
++
++int vc_net_add_ipv4_v1(struct nx_info *nxi, void __user *data)
++{
++ struct vcmd_net_addr_ipv4_v1 vc_data;
++
++ if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
++
++ switch (vc_data.type) {
++ case NXA_TYPE_ADDR:
++ case NXA_TYPE_MASK:
++ return do_add_v4_addr(nxi, vc_data.ip.s_addr, 0,
++ vc_data.mask.s_addr, vc_data.type, vc_data.flags);
++
++ case NXA_TYPE_ADDR | NXA_MOD_BCAST:
++ nxi->v4_bcast = vc_data.ip;
++ break;
++
++ case NXA_TYPE_ADDR | NXA_MOD_LBACK:
++ nxi->v4_lback = vc_data.ip;
++ break;
++
++ default:
++ return -EINVAL;
++ }
++ return 0;
++}
++
++int vc_net_add_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;
++
++ switch (vc_data.type) {
++ case NXA_TYPE_ADDR:
++ case NXA_TYPE_MASK:
++ case NXA_TYPE_RANGE:
++ return do_add_v4_addr(nxi, vc_data.ip.s_addr, vc_data.ip2.s_addr,
++ vc_data.mask.s_addr, vc_data.type, vc_data.flags);
++
++ case NXA_TYPE_ADDR | NXA_MOD_BCAST:
++ nxi->v4_bcast = vc_data.ip;
++ break;
++
++ case NXA_TYPE_ADDR | NXA_MOD_LBACK:
++ nxi->v4_lback = vc_data.ip;
++ break;
++
++ default:
++ return -EINVAL;
++ }
++ 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 vcmd_net_addr_v0 vc_data;
-+ int index, pos, ret = 0;
++ struct nx_addr_v6 *nxa = NULL;
++ struct nx_addr_v6 *new = __alloc_nx_addr_v6();
++ unsigned long irqflags;
++ int ret = -EEXIST;
+
-+ if (data && copy_from_user (&vc_data, data, sizeof(vc_data)))
-+ return -EFAULT;
++ if (IS_ERR(new))
++ return PTR_ERR(new);
+
-+ switch (vc_data.type) {
-+ case NXA_TYPE_IPV4:
-+ if ((vc_data.count < 1) || (vc_data.count > 4))
-+ return -EINVAL;
-+ break;
++ spin_lock_irqsave(&nxi->addr_lock, irqflags);
++ if (__find_v6_addr(nxi, ip, mask, prefix, type, flags, &nxa))
++ goto out_unlock;
+
-+ default:
-+ break;
++ if (NX_IPV6(nxi)) {
++ nxa->next = new;
++ nxa = new;
++ new = NULL;
+ }
+
-+ switch (vc_data.type) {
-+ case NXA_TYPE_IPV4:
-+ index = 0;
-+ while ((index < vc_data.count) &&
-+ ((pos = nxi->nbipv4) < NB_IPV4ROOT)) {
-+ nxi->ipv4[pos] = vc_data.ip[index].s_addr;
-+ nxi->mask[pos] = vc_data.mask[index].s_addr;
-+ index++;
-+ nxi->nbipv4++;
-+ }
-+ ret = index;
-+ break;
++ nxa->ip = *ip;
++ nxa->mask = *mask;
++ nxa->prefix = prefix;
++ nxa->type = type;
++ nxa->flags = flags;
++ ret = 0;
++out_unlock:
++ spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
++ if (new)
++ __dealloc_nx_addr_v6(new);
++ return ret;
++}
+
-+ case NXA_TYPE_IPV4|NXA_MOD_BCAST:
-+ nxi->v4_bcast = vc_data.ip[0].s_addr;
-+ ret = 1;
++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_IPV4|NXA_MOD_LBACK:
-+ nxi->v4_lback = vc_data.ip[0].s_addr;
-+ ret = 1;
++ case NXA_TYPE_ANY:
++ nxa = &nxi->v6;
++ old = nxa->next;
++ memset(nxa, 0, sizeof(*nxa));
+ break;
+
+ default:
+ ret = -EINVAL;
-+ break;
+ }
++ spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
++ __dealloc_nx_addr_v6_all(old);
+ return ret;
+}
+
-+int vc_net_remove(struct nx_info * nxi, void __user *data)
++int vc_net_add_ipv6(struct nx_info *nxi, void __user *data)
+{
-+ struct vcmd_net_addr_v0 vc_data;
++ struct vcmd_net_addr_ipv6_v1 vc_data;
+
-+ if (data && copy_from_user (&vc_data, data, sizeof(vc_data)))
++ if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
+ switch (vc_data.type) {
-+ case NXA_TYPE_ANY:
-+ nxi->nbipv4 = 0;
-+ break;
++ case NXA_TYPE_ADDR:
++ memset(&vc_data.mask, ~0, sizeof(vc_data.mask));
++ /* fallthrough */
++ case NXA_TYPE_MASK:
++ return do_add_v6_addr(nxi, &vc_data.ip, &vc_data.mask,
++ vc_data.prefix, vc_data.type, vc_data.flags);
++ default:
++ return -EINVAL;
++ }
++ return 0;
++}
++
++int vc_net_remove_ipv6(struct nx_info *nxi, void __user *data)
++{
++ struct vcmd_net_addr_ipv6_v1 vc_data;
++
++ if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
+
++ switch (vc_data.type) {
++ case NXA_TYPE_ADDR:
++ memset(&vc_data.mask, ~0, sizeof(vc_data.mask));
++ /* fallthrough */
++ case NXA_TYPE_MASK:
++ return do_remove_v6_addr(nxi, &vc_data.ip, &vc_data.mask,
++ vc_data.prefix, vc_data.type, vc_data.flags);
++ case NXA_TYPE_ANY:
++ return do_remove_v6_addr(nxi, NULL, NULL, 0, vc_data.type, 0);
+ default:
+ return -EINVAL;
+ }
+ return 0;
+}
+
++#endif /* CONFIG_IPV6 */
++
++
+int vc_get_nflags(struct nx_info *nxi, void __user *data)
+{
+ struct vcmd_net_flags_v0 vc_data;
+ vc_data.flagword = nxi->nx_flags;
+
+ /* special STATE flag handling */
-+ vc_data.mask = vs_mask_flags(~0UL, nxi->nx_flags, NXF_ONE_TIME);
++ vc_data.mask = vs_mask_flags(~0ULL, nxi->nx_flags, NXF_ONE_TIME);
+
-+ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
++ if (copy_to_user(data, &vc_data, sizeof(vc_data)))
+ return -EFAULT;
+ return 0;
+}
+ struct vcmd_net_flags_v0 vc_data;
+ uint64_t mask, trigger;
+
-+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ if (copy_from_user(&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
+ /* special STATE flag handling */
+ struct vcmd_net_caps_v0 vc_data;
+
+ vc_data.ncaps = nxi->nx_ncaps;
-+ vc_data.cmask = ~0UL;
++ vc_data.cmask = ~0ULL;
+
-+ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
++ if (copy_to_user(data, &vc_data, sizeof(vc_data)))
+ return -EFAULT;
+ return 0;
+}
+{
+ struct vcmd_net_caps_v0 vc_data;
+
-+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ if (copy_from_user(&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
+ nxi->nx_ncaps = vs_mask_flags(nxi->nx_ncaps,
+
+#include <linux/module.h>
+
++module_init(init_network);
++
+EXPORT_SYMBOL_GPL(free_nx_info);
+EXPORT_SYMBOL_GPL(unhash_nx_info);
+
-diff -NurpP --minimal linux-2.6.19.1/kernel/vserver/proc.c linux-2.6.19.1-vs2.3.0.6/kernel/vserver/proc.c
---- linux-2.6.19.1/kernel/vserver/proc.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/vserver/proc.c 2006-12-17 03:23:33 +0100
-@@ -0,0 +1,1009 @@
+diff -urNp -x '*.orig' linux-4.9/kernel/vserver/proc.c linux-4.9/kernel/vserver/proc.c
+--- linux-4.9/kernel/vserver/proc.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/kernel/vserver/proc.c 2021-02-24 15:47:45.124410596 +0100
+@@ -0,0 +1,1040 @@
+/*
+ * linux/kernel/vserver/proc.c
+ *
+ * Virtual Context Support
+ *
-+ * Copyright (C) 2003-2006 Herbert Pötzl
++ * Copyright (C) 2003-2011 Herbert P?tzl
+ *
+ * V0.01 basic structure
+ * V0.02 adaptation vs1.3.0
+ * V0.06 inode validation
+ * V0.07 generic rewrite vid
+ * V0.08 remove inode type
++ * V0.09 added u/wmask info
+ *
+ */
+
-+#include <linux/errno.h>
+#include <linux/proc_fs.h>
-+#include <linux/sched.h>
++#include <linux/fs_struct.h>
++#include <linux/mount.h>
++#include <linux/namei.h>
++#include <asm/unistd.h>
++
+#include <linux/vs_context.h>
+#include <linux/vs_network.h>
+#include <linux/vs_cvirt.h>
+
-+#include <linux/vserver/switch.h>
-+#include <linux/vserver/global.h>
++#include <linux/in.h>
++#include <linux/inetdevice.h>
++#include <linux/vs_inet.h>
++#include <linux/vs_inet6.h>
+
-+#include <asm/uaccess.h>
-+#include <asm/unistd.h>
++#include <linux/vserver/global.h>
+
+#include "cvirt_proc.h"
+#include "cacct_proc.h"
+#include "sched_proc.h"
+#include "vci_config.h"
+
-+static struct proc_dir_entry *proc_virtual;
++#include <../../fs/proc/internal.h>
+
-+static struct proc_dir_entry *proc_virtnet;
++
++static inline char *print_cap_t(char *buffer, kernel_cap_t *c)
++{
++ unsigned __capi;
++
++ CAP_FOR_EACH_U32(__capi) {
++ buffer += sprintf(buffer, "%08x",
++ c->cap[(_KERNEL_CAPABILITY_U32S-1) - __capi]);
++ }
++ return buffer;
++}
+
+
++static struct proc_dir_entry *proc_virtual;
+
-+// #define PROC_VID_MASK 0x60
++static struct proc_dir_entry *proc_virtnet;
+
+
+/* first the actual feeds */
+ return sprintf(buffer,
+ "VCIVersion:\t%04x:%04x\n"
+ "VCISyscall:\t%d\n"
-+ "VCIKernel:\t%08x\n"
-+ ,VCI_VERSION >> 16
-+ ,VCI_VERSION & 0xFFFF
-+ ,__NR_vserver
-+ ,vci_kernel_config()
-+ );
++ "VCIKernel:\t%08x\n",
++ VCI_VERSION >> 16,
++ VCI_VERSION & 0xFFFF,
++ __NR_vserver,
++ vci_kernel_config());
+}
+
+static int proc_virtual_info(char *buffer)
+ return sprintf(buffer,
+ "#CTotal:\t%d\n"
+ "#CActive:\t%d\n"
-+ ,atomic_read(&vx_global_ctotal)
-+ ,atomic_read(&vx_global_cactive)
-+ );
++ "#NSProxy:\t%d\t%d %d %d %d %d %d\n"
++ "#InitTask:\t%d\t%d %d\n",
++ atomic_read(&vx_global_ctotal),
++ atomic_read(&vx_global_cactive),
++ atomic_read(&vs_global_nsproxy),
++ atomic_read(&vs_global_fs),
++ atomic_read(&vs_global_mnt_ns),
++ atomic_read(&vs_global_uts_ns),
++ atomic_read(&vs_global_ipc_ns),
++ atomic_read(&vs_global_user_ns),
++ atomic_read(&vs_global_pid_ns),
++ atomic_read(&init_task.usage),
++ atomic_read(&init_task.nsproxy->count),
++ init_task.fs->users);
+}
+
+
-+int proc_vxi_info (struct vx_info *vxi, char *buffer)
++int proc_vxi_info(struct vx_info *vxi, char *buffer)
+{
+ int length;
+
+ "ID:\t%d\n"
+ "Info:\t%p\n"
+ "Init:\t%d\n"
-+ ,vxi->vx_id
-+ ,vxi
-+ ,vxi->vx_initpid
-+ );
++ "OOM:\t%lld\n",
++ vxi->vx_id,
++ vxi,
++ vxi->vx_initpid,
++ vxi->vx_badness_bias);
+ return length;
+}
+
-+int proc_vxi_status (struct vx_info *vxi, char *buffer)
++int proc_vxi_status(struct vx_info *vxi, char *buffer)
+{
-+ int length;
++ char *orig = buffer;
+
-+ length = sprintf(buffer,
++ buffer += sprintf(buffer,
+ "UseCnt:\t%d\n"
+ "Tasks:\t%d\n"
-+ "Flags:\t%016llx\n"
-+ "BCaps:\t%016llx\n"
++ "Flags:\t%016llx\n",
++ atomic_read(&vxi->vx_usecnt),
++ atomic_read(&vxi->vx_tasks),
++ (unsigned long long)vxi->vx_flags);
++
++ buffer += sprintf(buffer, "BCaps:\t");
++ buffer = print_cap_t(buffer, &vxi->vx_bcaps);
++ buffer += sprintf(buffer, "\n");
++
++ buffer += sprintf(buffer,
+ "CCaps:\t%016llx\n"
-+ "Spaces:\t%08lx\n"
-+// "Ticks:\t%d\n"
-+ ,atomic_read(&vxi->vx_usecnt)
-+ ,atomic_read(&vxi->vx_tasks)
-+ ,(unsigned long long)vxi->vx_flags
-+ ,(unsigned long long)vxi->vx_bcaps
-+ ,(unsigned long long)vxi->vx_ccaps
-+ ,vxi->vx_nsmask
-+// ,atomic_read(&vxi->limit.ticks)
-+ );
-+ return length;
++ "Umask:\t%16llx\n"
++ "Wmask:\t%16llx\n"
++ "Spaces:\t%08lx %08lx\n",
++ (unsigned long long)vxi->vx_ccaps,
++ (unsigned long long)vxi->vx_umask,
++ (unsigned long long)vxi->vx_wmask,
++ vxi->space[0].vx_nsmask, vxi->space[1].vx_nsmask);
++ return buffer - orig;
+}
+
-+int proc_vxi_limit (struct vx_info *vxi, char *buffer)
++int proc_vxi_limit(struct vx_info *vxi, char *buffer)
+{
+ return vx_info_proc_limit(&vxi->limit, buffer);
+}
+
-+int proc_vxi_sched (struct vx_info *vxi, char *buffer)
++int proc_vxi_sched(struct vx_info *vxi, char *buffer)
+{
+ int cpu, length;
+
+ return length;
+}
+
-+int proc_vxi_nsproxy (struct vx_info *vxi, char *buffer)
++int proc_vxi_nsproxy0(struct vx_info *vxi, char *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, buffer);
++ return vx_info_proc_nsproxy(vxi->space[1].vx_nsproxy, buffer);
+}
+
-+int proc_vxi_cvirt (struct vx_info *vxi, char *buffer)
++int proc_vxi_cvirt(struct vx_info *vxi, char *buffer)
+{
+ int cpu, length;
+
+ return length;
+}
+
-+int proc_vxi_cacct (struct vx_info *vxi, char *buffer)
++int proc_vxi_cacct(struct vx_info *vxi, char *buffer)
+{
+ return vx_info_proc_cacct(&vxi->cacct, buffer);
+}
+{
+ return sprintf(buffer,
+ "#CTotal:\t%d\n"
-+ "#CActive:\t%d\n"
-+ ,atomic_read(&nx_global_ctotal)
-+ ,atomic_read(&nx_global_cactive)
-+ );
++ "#CActive:\t%d\n",
++ atomic_read(&nx_global_ctotal),
++ atomic_read(&nx_global_cactive));
+}
+
-+int proc_nxi_info (struct nx_info *nxi, char *buffer)
++int proc_nxi_info(struct nx_info *nxi, char *buffer)
+{
++ struct nx_addr_v4 *v4a;
++#ifdef CONFIG_IPV6
++ struct nx_addr_v6 *v6a;
++#endif
+ int length, i;
+
+ length = sprintf(buffer,
+ "ID:\t%d\n"
+ "Info:\t%p\n"
-+ ,nxi->nx_id
-+ ,nxi
-+ );
-+ for (i=0; i<nxi->nbipv4; i++) {
-+ length += sprintf(buffer + length,
-+ "%d:\t" NIPQUAD_FMT "/" NIPQUAD_FMT "\n", i,
-+ NIPQUAD(nxi->ipv4[i]), NIPQUAD(nxi->mask[i]));
-+ }
++ "Bcast:\t" NIPQUAD_FMT "\n"
++ "Lback:\t" NIPQUAD_FMT "\n",
++ nxi->nx_id,
++ nxi,
++ NIPQUAD(nxi->v4_bcast.s_addr),
++ NIPQUAD(nxi->v4_lback.s_addr));
++
++ if (!NX_IPV4(nxi))
++ goto skip_v4;
++ for (i = 0, v4a = &nxi->v4; v4a; i++, v4a = v4a->next)
++ length += sprintf(buffer + length, "%d:\t" NXAV4_FMT "\n",
++ i, NXAV4(v4a));
++skip_v4:
++#ifdef CONFIG_IPV6
++ if (!NX_IPV6(nxi))
++ goto skip_v6;
++ for (i = 0, v6a = &nxi->v6; v6a; i++, v6a = v6a->next)
++ length += sprintf(buffer + length, "%d:\t" NXAV6_FMT "\n",
++ i, NXAV6(v6a));
++skip_v6:
++#endif
+ return length;
+}
+
-+int proc_nxi_status (struct nx_info *nxi, char *buffer)
++int proc_nxi_status(struct nx_info *nxi, char *buffer)
+{
+ int length;
+
+ length = sprintf(buffer,
+ "UseCnt:\t%d\n"
+ "Tasks:\t%d\n"
-+ ,atomic_read(&nxi->nx_usecnt)
-+ ,atomic_read(&nxi->nx_tasks)
-+ );
++ "Flags:\t%016llx\n"
++ "NCaps:\t%016llx\n",
++ atomic_read(&nxi->nx_usecnt),
++ atomic_read(&nxi->nx_tasks),
++ (unsigned long long)nxi->nx_flags,
++ (unsigned long long)nxi->nx_ncaps);
+ return length;
+}
+
+ if (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;
+}
+
+/* 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.
+ *
+ * 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 dentry *child, *dir = filp->f_path.dentry;
+ struct inode *inode;
+ struct qstr qname;
+ ino_t ino = 0;
+
+ qname.name = name;
+ qname.len = len;
-+ qname.hash = full_name_hash(name, len);
++ qname.hash = full_name_hash(NULL, name, len);
+
+ child = d_lookup(dir, &qname);
+ if (!child) {
+ 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);
+}
+
+
+ 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;
+
+/* 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;
+
+#define PROC_BLOCK_SIZE (PAGE_SIZE - 1024)
+
-+static ssize_t proc_vs_info_read(struct file * file, char __user * buf,
++static ssize_t proc_vs_info_read(struct file *file, char __user *buf,
+ size_t count, loff_t *ppos)
+{
-+ struct inode *inode = file->f_dentry->d_inode;
++ struct inode *inode = file->f_path.dentry->d_inode;
+ unsigned long page;
+ ssize_t length = 0;
+
+ return -ENOMEM;
+
+ BUG_ON(!PROC_I(inode)->op.proc_vs_read);
-+ length = PROC_I(inode)->op.proc_vs_read((char*)page);
++ length = PROC_I(inode)->op.proc_vs_read((char *)page);
+
+ if (length >= 0)
+ length = simple_read_from_buffer(buf, count, ppos,
+ return length;
+}
+
-+static ssize_t proc_vx_info_read(struct file * file, char __user * buf,
++static ssize_t proc_vx_info_read(struct file *file, char __user *buf,
+ size_t count, loff_t *ppos)
+{
-+ struct inode *inode = file->f_dentry->d_inode;
++ struct inode *inode = file->f_path.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;
+
+ goto out_put;
+
+ BUG_ON(!PROC_I(inode)->op.proc_vxi_read);
-+ length = PROC_I(inode)->op.proc_vxi_read(vxi, (char*)page);
++ length = PROC_I(inode)->op.proc_vxi_read(vxi, (char *)page);
+
+ if (length >= 0)
+ length = simple_read_from_buffer(buf, count, ppos,
+ return length;
+}
+
-+static ssize_t proc_nx_info_read(struct file * file, char __user * buf,
++static ssize_t proc_nx_info_read(struct file *file, char __user *buf,
+ size_t count, loff_t *ppos)
+{
-+ struct inode *inode = file->f_dentry->d_inode;
++ struct inode *inode = file->f_path.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;
+
+ goto out_put;
+
+ BUG_ON(!PROC_I(inode)->op.proc_nxi_read);
-+ length = PROC_I(inode)->op.proc_nxi_read(nxi, (char*)page);
++ length = PROC_I(inode)->op.proc_nxi_read(nxi, (char *)page);
+
+ if (length >= 0)
+ length = simple_read_from_buffer(buf, count, ppos,
+
+
+#define DIR(NAME, MODE, OTYPE) \
-+ NOD(NAME, (S_IFDIR|(MODE)), \
-+ &proc_##OTYPE##_inode_operations, \
-+ &proc_##OTYPE##_file_operations, { } )
++ NOD(NAME, (S_IFDIR | (MODE)), \
++ &proc_ ## OTYPE ## _inode_operations, \
++ &proc_ ## OTYPE ## _file_operations, { } )
+
+#define INF(NAME, MODE, OTYPE) \
-+ NOD(NAME, (S_IFREG|(MODE)), NULL, \
++ NOD(NAME, (S_IFREG | (MODE)), NULL, \
+ &proc_vs_info_file_operations, \
+ { .proc_vs_read = &proc_##OTYPE } )
+
+#define VINF(NAME, MODE, OTYPE) \
-+ NOD(NAME, (S_IFREG|(MODE)), NULL, \
++ NOD(NAME, (S_IFREG | (MODE)), NULL, \
+ &proc_vx_info_file_operations, \
+ { .proc_vxi_read = &proc_##OTYPE } )
+
+#define NINF(NAME, MODE, OTYPE) \
-+ NOD(NAME, (S_IFREG|(MODE)), NULL, \
++ NOD(NAME, (S_IFREG | (MODE)), NULL, \
+ &proc_nx_info_file_operations, \
+ { .proc_nxi_read = &proc_##OTYPE } )
+
+ VINF("status", S_IRUGO, vxi_status),
+ VINF("limit", S_IRUGO, vxi_limit),
+ VINF("sched", S_IRUGO, vxi_sched),
-+ VINF("nsproxy", S_IRUGO, vxi_nsproxy),
++ VINF("nsproxy", S_IRUGO, vxi_nsproxy0),
++ VINF("nsproxy1",S_IRUGO, vxi_nsproxy1),
+ VINF("cvirt", S_IRUGO, vxi_cvirt),
+ VINF("cacct", S_IRUGO, vxi_cacct),
+ {}
+}
+
+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);
+ 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 dentry *dentry = filp->f_path.dentry;
+ struct inode *inode = dentry->d_inode;
+ struct vs_entry *p = vx_base_stuff;
-+ int size = sizeof(vx_base_stuff)/sizeof(struct vs_entry);
-+ int pos, index;
-+ u64 ino;
++ int size = sizeof(vx_base_stuff) / sizeof(struct vs_entry);
++ int index;
+
-+ pos = filp->f_pos;
-+ switch (pos) {
-+ case 0:
-+ ino = inode->i_ino;
-+ if (filldir(dirent, ".", 1, pos, ino, DT_DIR) < 0)
-+ goto out;
-+ pos++;
-+ /* fall through */
-+ case 1:
-+ ino = parent_ino(dentry);
-+ if (filldir(dirent, "..", 2, pos, ino, DT_DIR) < 0)
-+ goto out;
-+ pos++;
-+ /* fall through */
-+ default:
-+ index = pos - 2;
-+ if (index >= size)
-+ goto out;
++ if (!dir_emit_dots(filp, ctx))
++ return 0;
++
++ index = ctx->pos - 2;
++ if (index < size) {
+ 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++;
++ return 0;
++ ctx->pos++;
+ }
+ }
-+out:
-+ filp->f_pos = pos;
+ return 1;
+}
+
+}
+
+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);
+ 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 dentry *dentry = filp->f_path.dentry;
+ struct inode *inode = dentry->d_inode;
+ struct vs_entry *p = nx_base_stuff;
-+ int size = sizeof(nx_base_stuff)/sizeof(struct vs_entry);
-+ int pos, index;
-+ u64 ino;
++ int size = sizeof(nx_base_stuff) / sizeof(struct vs_entry);
++ int index;
+
-+ pos = filp->f_pos;
-+ switch (pos) {
-+ case 0:
-+ ino = inode->i_ino;
-+ if (filldir(dirent, ".", 1, pos, ino, DT_DIR) < 0)
-+ goto out;
-+ pos++;
-+ /* fall through */
-+ case 1:
-+ ino = parent_ino(dentry);
-+ if (filldir(dirent, "..", 2, pos, ino, DT_DIR) < 0)
-+ goto out;
-+ pos++;
-+ /* fall through */
-+ default:
-+ index = pos - 2;
-+ if (index >= size)
-+ goto out;
++ if (!dir_emit_dots(filp, ctx))
++ return 0;
++
++ index = ctx->pos - 2;
++ if (index < size) {
+ 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++;
++ return 0;
++ ctx->pos++;
+ }
+ }
-+out:
-+ filp->f_pos = pos;
+ return 1;
+}
+
+
-+#define MAX_MULBY10 ((~0U-9)/10)
++#define MAX_MULBY10 ((~0U - 9) / 10)
+
+static inline int atovid(const char *str, int len)
+{
+
+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 = {
+static struct vs_entry vx_virtual_stuff[] = {
+ INF("info", S_IRUGO, virtual_info),
+ INF("status", S_IRUGO, virtual_status),
-+ DIR(NULL, S_IRUGO|S_IXUGO, xid),
++ DIR(NULL, S_IRUGO | S_IXUGO, xid),
+};
+
+
+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);
+
+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 = {
+static struct vs_entry nx_virtnet_stuff[] = {
+ INF("info", S_IRUGO, virtnet_info),
+ INF("status", S_IRUGO, virtnet_status),
-+ DIR(NULL, S_IRUGO|S_IXUGO, nid),
++ DIR(NULL, S_IRUGO | S_IXUGO, nid),
+};
+
+
+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);
+}
+
+
-+
-+#define PROC_NUMBUF 10
+#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 size = sizeof(vx_virtual_stuff) / sizeof(struct vs_entry);
++ int index;
+ unsigned int xid_array[PROC_MAXVIDS];
+ char buf[PROC_NUMBUF];
+ unsigned int nr_xids, i;
-+ u64 ino;
+
-+ pos = filp->f_pos;
-+ switch (pos) {
-+ case 0:
-+ ino = inode->i_ino;
-+ if (filldir(dirent, ".", 1, pos, ino, DT_DIR) < 0)
-+ goto out;
-+ pos++;
-+ /* fall through */
-+ case 1:
-+ ino = parent_ino(dentry);
-+ if (filldir(dirent, "..", 2, pos, ino, DT_DIR) < 0)
-+ goto out;
-+ pos++;
-+ /* fall through */
-+ default:
-+ index = pos - 2;
-+ if (index >= size)
-+ goto entries;
++ if (!dir_emit_dots(filp, ctx))
++ return 0;
++
++ index = ctx->pos - 2;
++ if (index < size) {
+ 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++;
-+ }
-+ entries:
-+ index = pos - size;
-+ p = &vx_virtual_stuff[size-1];
-+ nr_xids = get_xid_list(index, xid_array, PROC_MAXVIDS);
-+ for (i = 0; i < nr_xids; i++) {
-+ int n, xid = xid_array[i];
-+ unsigned int j = PROC_NUMBUF;
-+
-+ n = xid;
-+ do buf[--j] = '0' + (n % 10); while (n /= 10);
-+
-+ if (proc_fill_cache(filp, dirent, filldir, buf+j, PROC_NUMBUF-j,
-+ vs_proc_instantiate, xid, p))
-+ goto out;
-+ pos++;
++ return 0;
++ ctx->pos++;
+ }
+ }
-+out:
-+ filp->f_pos = pos;
++
++ index = ctx->pos - size;
++ p = &vx_virtual_stuff[size - 1];
++ nr_xids = get_xid_list(index, xid_array, PROC_MAXVIDS);
++ for (i = 0; i < nr_xids; i++) {
++ int n, xid = xid_array[i];
++ unsigned int j = PROC_NUMBUF;
++
++ n = xid;
++ do
++ buf[--j] = '0' + (n % 10);
++ while (n /= 10);
++
++ if (vx_proc_fill_cache(filp, ctx,
++ buf + j, PROC_NUMBUF - j,
++ vs_proc_instantiate, xid, p))
++ return 0;
++ ctx->pos++;
++ }
+ return 0;
+}
+
++static int proc_virtual_getattr(struct vfsmount *mnt,
++ struct dentry *dentry, struct kstat *stat)
++{
++ struct inode *inode = dentry->d_inode;
++
++ generic_fillattr(inode, stat);
++ stat->nlink = 2 + atomic_read(&vx_global_cactive);
++ return 0;
++}
+
+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 = {
++ .getattr = proc_virtual_getattr,
+ .lookup = proc_virtual_lookup,
+};
+
+
+
-+
-+
-+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 size = sizeof(nx_virtnet_stuff) / sizeof(struct vs_entry);
++ int index;
+ unsigned int nid_array[PROC_MAXVIDS];
+ char buf[PROC_NUMBUF];
+ unsigned int nr_nids, i;
-+ u64 ino;
+
-+ pos = filp->f_pos;
-+ switch (pos) {
-+ case 0:
-+ ino = inode->i_ino;
-+ if (filldir(dirent, ".", 1, pos, ino, DT_DIR) < 0)
-+ goto out;
-+ pos++;
-+ /* fall through */
-+ case 1:
-+ ino = parent_ino(dentry);
-+ if (filldir(dirent, "..", 2, pos, ino, DT_DIR) < 0)
-+ goto out;
-+ pos++;
-+ /* fall through */
-+ default:
-+ index = pos - 2;
-+ if (index >= size)
-+ goto entries;
++ if (!dir_emit_dots(filp, ctx))
++ return 0;
++
++ index = ctx->pos - 2;
++ if (index < size) {
+ 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++;
-+ }
-+ entries:
-+ index = pos - size;
-+ p = &nx_virtnet_stuff[size-1];
-+ nr_nids = get_nid_list(index, nid_array, PROC_MAXVIDS);
-+ for (i = 0; i < nr_nids; i++) {
-+ int n, nid = nid_array[i];
-+ unsigned int j = PROC_NUMBUF;
-+
-+ n = nid;
-+ do buf[--j] = '0' + (n % 10); while (n /= 10);
-+
-+ if (proc_fill_cache(filp, dirent, filldir, buf+j, PROC_NUMBUF-j,
-+ vs_proc_instantiate, nid, p))
-+ goto out;
-+ pos++;
++ return 0;
++ ctx->pos++;
+ }
+ }
-+out:
-+ filp->f_pos = pos;
++
++ index = ctx->pos - size;
++ p = &nx_virtnet_stuff[size - 1];
++ nr_nids = get_nid_list(index, nid_array, PROC_MAXVIDS);
++ for (i = 0; i < nr_nids; i++) {
++ int n, nid = nid_array[i];
++ unsigned int j = PROC_NUMBUF;
++
++ n = nid;
++ do
++ buf[--j] = '0' + (n % 10);
++ while (n /= 10);
++
++ if (vx_proc_fill_cache(filp, ctx,
++ buf + j, PROC_NUMBUF - j,
++ vs_proc_instantiate, nid, p))
++ return 0;
++ ctx->pos++;
++ }
+ return 0;
+}
+
++static int proc_virtnet_getattr(struct vfsmount *mnt,
++ struct dentry *dentry, struct kstat *stat)
++{
++ struct inode *inode = dentry->d_inode;
++
++ generic_fillattr(inode, stat);
++ stat->nlink = 2 + atomic_read(&nx_global_cactive);
++ return 0;
++}
+
+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 = {
++ .getattr = proc_virtnet_getattr,
+ .lookup = proc_virtnet_lookup,
+};
+
+
+/* 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%016llx\n"
-+ ,(unsigned long long)vxi->vx_bcaps);
-+ buffer += sprintf (buffer,"CCaps:\t%016llx\n"
-+ ,(unsigned long long)vxi->vx_ccaps);
-+ buffer += sprintf (buffer,"CFlags:\t%016llx\n"
-+ ,(unsigned long long)vxi->vx_flags);
-+ buffer += sprintf (buffer,"CIPid:\t%d\n"
-+ ,vxi->vx_initpid);
++ render_cap_t(m, "BCaps:\t", vxi, &vxi->vx_bcaps);
++ seq_printf(m, "CCaps:\t%016llx\n",
++ (unsigned long long)vxi->vx_ccaps);
++ seq_printf(m, "CFlags:\t%016llx\n",
++ (unsigned long long)vxi->vx_flags);
++ seq_printf(m, "CIPid:\t%d\n", vxi->vx_initpid);
+
+ 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;
-+ char * orig = buffer;
++ struct nx_addr_v4 *v4a;
++#ifdef CONFIG_IPV6
++ struct nx_addr_v6 *v6a;
++#endif
+ 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;
-+
-+ for (i=0; i<nxi->nbipv4; i++){
-+ buffer += sprintf (buffer,
-+ "V4Root[%d]:\t%d.%d.%d.%d/%d.%d.%d.%d\n", i
-+ ,NIPQUAD(nxi->ipv4[i])
-+ ,NIPQUAD(nxi->mask[i]));
-+ }
-+ buffer += sprintf (buffer,
-+ "V4Root[bcast]:\t%d.%d.%d.%d\n"
-+ ,NIPQUAD(nxi->v4_bcast));
-+ buffer += sprintf (buffer,
-+ "V4Root[lback]:\t%d.%d.%d.%d\n"
-+ ,NIPQUAD(nxi->v4_lback));
-+
-+ put_nx_info(nxi);
-+out:
-+ return buffer - orig;
-+}
-+
-diff -NurpP --minimal linux-2.6.19.1/kernel/vserver/sched.c linux-2.6.19.1-vs2.3.0.6/kernel/vserver/sched.c
---- linux-2.6.19.1/kernel/vserver/sched.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/vserver/sched.c 2006-12-17 04:30:06 +0100
-@@ -0,0 +1,289 @@
-+/*
-+ * linux/kernel/vserver/sched.c
-+ *
-+ * Virtual Server: Scheduler Support
-+ *
-+ * Copyright (C) 2004-2006 Herbert Pötzl
-+ *
-+ * V0.01 adapted Sam Vilains version to 2.6.3
-+ * V0.02 removed legacy interface
-+ * V0.03 changed vcmds to vxi arg
-+ *
-+ */
-+
-+#include <linux/sched.h>
-+#include <linux/vs_context.h>
-+#include <linux/vs_sched.h>
-+#include <linux/vserver/sched_cmd.h>
-+
-+#include <asm/errno.h>
-+#include <asm/uaccess.h>
-+
-+#define vxd_check_range(val, min, max) do { \
-+ vxlprintk((val<min) || (val>max), \
-+ "check_range(%ld,%ld,%ld)", \
-+ (long)val, (long)min, (long)max, \
-+ __FILE__, __LINE__); \
-+ } while (0)
-+
-+
-+void vx_update_sched_param(struct _vx_sched *sched,
-+ struct _vx_sched_pc *sched_pc)
-+{
-+ unsigned int set_mask = sched->update_mask;
-+
-+ if (set_mask & VXSM_FILL_RATE)
-+ sched_pc->fill_rate[0] = sched->fill_rate[0];
-+ if (set_mask & VXSM_INTERVAL)
-+ sched_pc->interval[0] = sched->interval[0];
-+ if (set_mask & VXSM_FILL_RATE2)
-+ sched_pc->fill_rate[1] = sched->fill_rate[1];
-+ if (set_mask & VXSM_INTERVAL2)
-+ sched_pc->interval[1] = sched->interval[1];
-+ if (set_mask & VXSM_TOKENS)
-+ sched_pc->tokens = sched->tokens;
-+ if (set_mask & VXSM_TOKENS_MIN)
-+ sched_pc->tokens_min = sched->tokens_min;
-+ if (set_mask & VXSM_TOKENS_MAX)
-+ sched_pc->tokens_max = sched->tokens_max;
-+
-+ if (set_mask & VXSM_IDLE_TIME)
-+ sched_pc->flags |= VXSF_IDLE_TIME;
-+ else
-+ sched_pc->flags &= ~VXSF_IDLE_TIME;
-+
-+ /* reset time */
-+ sched_pc->norm_time = jiffies;
-+}
-+
-+
-+/*
-+ * recalculate the context's scheduling tokens
-+ *
-+ * ret > 0 : number of tokens available
-+ * ret < 0 : on hold, check delta_min[]
-+ * -1 only jiffies
-+ * -2 also idle time
-+ *
-+ */
-+int vx_tokens_recalc(struct _vx_sched_pc *sched_pc,
-+ unsigned long *norm_time, unsigned long *idle_time, int delta_min[2])
-+{
-+ long delta;
-+ long tokens = 0;
-+ int flags = sched_pc->flags;
-+
-+ /* how much time did pass? */
-+ delta = *norm_time - sched_pc->norm_time;
-+ vxd_check_range(delta, 0, INT_MAX);
-+
-+ if (delta >= sched_pc->interval[0]) {
-+ long tokens, integral;
-+
-+ /* calc integral token part */
-+ tokens = delta / sched_pc->interval[0];
-+ integral = tokens * sched_pc->interval[0];
-+ tokens *= sched_pc->fill_rate[0];
-+#ifdef CONFIG_VSERVER_HARDCPU
-+ delta_min[0] = delta - integral;
-+ vxd_check_range(delta_min[0], 0, sched_pc->interval[0]);
-+#endif
-+ /* advance time */
-+ sched_pc->norm_time += delta;
-+
-+ /* add tokens */
-+ sched_pc->tokens += tokens;
-+ sched_pc->token_time += tokens;
-+ }
-+ else
-+ delta_min[0] = delta;
-+
-+#ifdef CONFIG_VSERVER_IDLETIME
-+ if (!(flags & VXSF_IDLE_TIME))
-+ goto skip_idle;
-+
-+ /* how much was the idle skip? */
-+ delta = *idle_time - sched_pc->idle_time;
-+ vxd_check_range(delta, 0, INT_MAX);
-+
-+ if (delta >= sched_pc->interval[1]) {
-+ long tokens, integral;
-+
-+ /* calc fair share token part */
-+ tokens = delta / sched_pc->interval[1];
-+ integral = tokens * sched_pc->interval[1];
-+ tokens *= sched_pc->fill_rate[1];
-+ delta_min[1] = delta - integral;
-+ vxd_check_range(delta_min[1], 0, sched_pc->interval[1]);
-+
-+ /* advance idle time */
-+ sched_pc->idle_time += integral;
-+
-+ /* add tokens */
-+ sched_pc->tokens += tokens;
-+ sched_pc->token_time += tokens;
-+ }
-+ else
-+ delta_min[1] = delta;
-+skip_idle:
-+#endif
-+
-+ /* clip at maximum */
-+ if (sched_pc->tokens > sched_pc->tokens_max)
-+ sched_pc->tokens = sched_pc->tokens_max;
-+ tokens = sched_pc->tokens;
-+
-+ if ((flags & VXSF_ONHOLD)) {
-+ /* can we unhold? */
-+ if (tokens >= sched_pc->tokens_min) {
-+ flags &= ~VXSF_ONHOLD;
-+ sched_pc->hold_ticks +=
-+ *norm_time - sched_pc->onhold;
-+ }
-+ else
-+ goto on_hold;
-+ } else {
-+ /* put on hold? */
-+ if (tokens <= 0) {
-+ flags |= VXSF_ONHOLD;
-+ sched_pc->onhold = *norm_time;
-+ goto on_hold;
-+ }
-+ }
-+ sched_pc->flags = flags;
-+ return tokens;
-+
-+on_hold:
-+ tokens = sched_pc->tokens_min - tokens;
-+ sched_pc->flags = flags;
-+ BUG_ON(tokens < 0);
-+
-+#ifdef CONFIG_VSERVER_HARDCPU
-+ /* next interval? */
-+ if (!sched_pc->fill_rate[0])
-+ delta_min[0] = HZ;
-+ else if (tokens > sched_pc->fill_rate[0])
-+ delta_min[0] += sched_pc->interval[0] *
-+ tokens / sched_pc->fill_rate[0];
-+ else
-+ delta_min[0] = sched_pc->interval[0] - delta_min[0];
-+ vxd_check_range(delta_min[0], 0, INT_MAX);
-+
-+#ifdef CONFIG_VSERVER_IDLETIME
-+ if (!(flags & VXSF_IDLE_TIME))
-+ return -1;
-+
-+ /* next interval? */
-+ if (!sched_pc->fill_rate[1])
-+ delta_min[1] = HZ;
-+ else if (tokens > sched_pc->fill_rate[1])
-+ delta_min[1] += sched_pc->interval[1] *
-+ tokens / sched_pc->fill_rate[1];
-+ else
-+ delta_min[1] = sched_pc->interval[1] - delta_min[1];
-+ vxd_check_range(delta_min[1], 0, INT_MAX);
++ return 0;
+
-+ return -2;
-+#else
-+ return -1;
-+#endif /* CONFIG_VSERVER_IDLETIME */
-+#else
++ seq_printf(m, "NCaps:\t%016llx\n",
++ (unsigned long long)nxi->nx_ncaps);
++ seq_printf(m, "NFlags:\t%016llx\n",
++ (unsigned long long)nxi->nx_flags);
++
++ seq_printf(m, "V4Root[bcast]:\t" NIPQUAD_FMT "\n",
++ NIPQUAD(nxi->v4_bcast.s_addr));
++ seq_printf(m, "V4Root[lback]:\t" NIPQUAD_FMT "\n",
++ NIPQUAD(nxi->v4_lback.s_addr));
++ if (!NX_IPV4(nxi))
++ goto skip_v4;
++ for (i = 0, v4a = &nxi->v4; v4a; i++, v4a = v4a->next)
++ seq_printf(m, "V4Root[%d]:\t" NXAV4_FMT "\n",
++ i, NXAV4(v4a));
++skip_v4:
++#ifdef CONFIG_IPV6
++ if (!NX_IPV6(nxi))
++ goto skip_v6;
++ for (i = 0, v6a = &nxi->v6; v6a; i++, v6a = v6a->next)
++ seq_printf(m, "V6Root[%d]:\t" NXAV6_FMT "\n",
++ i, NXAV6(v6a));
++skip_v6:
++#endif
++ put_nx_info(nxi);
+ return 0;
-+#endif /* CONFIG_VSERVER_HARDCPU */
+}
+
+diff -urNp -x '*.orig' linux-4.9/kernel/vserver/sched.c linux-4.9/kernel/vserver/sched.c
+--- linux-4.9/kernel/vserver/sched.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/kernel/vserver/sched.c 2021-02-24 15:47:45.124410596 +0100
+@@ -0,0 +1,83 @@
++/*
++ * linux/kernel/vserver/sched.c
++ *
++ * Virtual Server: Scheduler Support
++ *
++ * Copyright (C) 2004-2010 Herbert P?tzl
++ *
++ * V0.01 adapted Sam Vilains version to 2.6.3
++ * V0.02 removed legacy interface
++ * V0.03 changed vcmds to vxi arg
++ * V0.04 removed older and legacy interfaces
++ * V0.05 removed scheduler code/commands
++ *
++ */
++
++#include <linux/vs_context.h>
++#include <linux/vs_sched.h>
++#include <linux/cpumask.h>
++#include <linux/vserver/sched_cmd.h>
+
-+static int do_set_sched(struct vx_info *vxi, struct vcmd_set_sched_v4 *data)
++#include <asm/uaccess.h>
++
++
++void vx_update_sched_param(struct _vx_sched *sched,
++ struct _vx_sched_pc *sched_pc)
+{
-+ unsigned int set_mask = data->set_mask;
-+ unsigned int update_mask;
++ sched_pc->prio_bias = sched->prio_bias;
++}
+
-+ /* Sanity check data values */
-+ if (data->fill_rate < 0)
-+ data->fill_rate = 1;
-+ if (data->interval <= 0)
-+ data->interval = HZ;
-+ if (data->tokens_max <= 0)
-+ data->tokens_max = HZ;
-+ if (data->tokens_min < 0)
-+ data->tokens_min = data->fill_rate*3;
-+ if (data->tokens_min >= data->tokens_max)
-+ data->tokens_min = data->tokens_max;
++static int do_set_prio_bias(struct vx_info *vxi, struct vcmd_prio_bias *data)
++{
++ int cpu;
+
+ if (data->prio_bias > MAX_PRIO_BIAS)
+ data->prio_bias = MAX_PRIO_BIAS;
+ if (data->prio_bias < MIN_PRIO_BIAS)
+ data->prio_bias = MIN_PRIO_BIAS;
+
-+ spin_lock(&vxi->sched.tokens_lock);
-+
-+ if (set_mask & VXSM_FILL_RATE)
-+ vxi->sched.fill_rate[0] = data->fill_rate;
-+ if (set_mask & VXSM_INTERVAL)
-+ vxi->sched.interval[0] = data->interval;
-+ if (set_mask & VXSM_FILL_RATE2)
-+ vxi->sched.fill_rate[1] = data->fill_rate;
-+ if (set_mask & VXSM_INTERVAL2)
-+ vxi->sched.interval[1] = data->interval;
-+ if (set_mask & VXSM_TOKENS)
-+ vxi->sched.tokens = data->tokens;
-+ if (set_mask & VXSM_TOKENS_MIN)
-+ vxi->sched.tokens_min = data->tokens_min;
-+ if (set_mask & VXSM_TOKENS_MAX)
-+ vxi->sched.tokens_max = data->tokens_max;
-+ if (set_mask & VXSM_PRIO_BIAS)
-+ vxi->sched.prio_bias = data->prio_bias;
-+
-+ update_mask = vxi->sched.update_mask & VXSM_SET_MASK;
-+ update_mask |= (set_mask & (VXSM_SET_MASK|VXSM_IDLE_TIME));
-+ vxi->sched.update_mask = update_mask;
-+#ifdef CONFIG_SMP
-+ rmb();
-+ if (set_mask & VXSM_CPU_ID)
-+ vxi->sched.update = cpumask_of_cpu(data->cpu_id);
-+ else
-+ vxi->sched.update = CPU_MASK_ALL;
-+ /* forced reload? */
-+ if (set_mask & VXSM_FORCE) {
-+ int cpu;
-+
-+ for_each_possible_cpu(cpu)
-+ vx_update_sched_param(&vxi->sched,
-+ &vx_per_cpu(vxi, sched_pc, cpu));
-+ }
-+#else
-+ /* on UP we update immediately */
-+ vx_update_sched_param(&vxi->sched,
-+ &vx_per_cpu(vxi, sched_pc, 0));
-+#endif
++ if (data->cpu_id != ~0) {
++ vxi->sched.update = *get_cpu_mask(data->cpu_id);
++ cpumask_and(&vxi->sched.update, &vxi->sched.update,
++ cpu_online_mask);
++ } else
++ cpumask_copy(&vxi->sched.update, cpu_online_mask);
+
-+ spin_unlock(&vxi->sched.tokens_lock);
++ for ((cpu) = 0; (cpu) < 1; (cpu)++, (void)vxi->sched.update)
++ vx_update_sched_param(&vxi->sched,
++ &vx_per_cpu(vxi, sched_pc, cpu));
+ return 0;
+}
+
-+int vc_set_sched_v3(struct vx_info *vxi, void __user *data)
++int vc_set_prio_bias(struct vx_info *vxi, void __user *data)
+{
-+ struct vcmd_set_sched_v3 vc_data;
-+ struct vcmd_set_sched_v4 vc_data_v4;
++ struct vcmd_prio_bias vc_data;
+
-+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ if (copy_from_user(&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
-+ /* structures are binary compatible */
-+ memcpy(&vc_data_v4, &vc_data, sizeof(vc_data));
-+ vc_data_v4.set_mask &= VXSM_V3_MASK;
-+ vc_data_v4.bucket_id = 0;
-+
-+ return do_set_sched(vxi, &vc_data_v4);
++ return do_set_prio_bias(vxi, &vc_data);
+}
+
-+int vc_set_sched(struct vx_info *vxi, void __user *data)
++int vc_get_prio_bias(struct vx_info *vxi, void __user *data)
+{
-+ struct vcmd_set_sched_v4 vc_data;
++ struct vcmd_prio_bias vc_data;
++ struct _vx_sched_pc *pcd;
++ int cpu;
+
-+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ if (copy_from_user(&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
-+ return do_set_sched(vxi, &vc_data);
++ cpu = vc_data.cpu_id;
++
++ if (!cpu_possible(cpu))
++ return -EINVAL;
++
++ pcd = &vx_per_cpu(vxi, sched_pc, cpu);
++ vc_data.prio_bias = pcd->prio_bias;
++
++ if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++ return -EFAULT;
++ return 0;
+}
+
-diff -NurpP --minimal linux-2.6.19.1/kernel/vserver/sched_init.h linux-2.6.19.1-vs2.3.0.6/kernel/vserver/sched_init.h
---- linux-2.6.19.1/kernel/vserver/sched_init.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/vserver/sched_init.h 2006-11-08 04:57:49 +0100
-@@ -0,0 +1,49 @@
+diff -urNp -x '*.orig' linux-4.9/kernel/vserver/sched_init.h linux-4.9/kernel/vserver/sched_init.h
+--- linux-4.9/kernel/vserver/sched_init.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/kernel/vserver/sched_init.h 2021-02-24 15:47:45.124410596 +0100
+@@ -0,0 +1,27 @@
+
+static inline void vx_info_init_sched(struct _vx_sched *sched)
+{
-+ static struct lock_class_key tokens_lock_key;
-+
+ /* scheduling; hard code starting values as constants */
-+ sched->fill_rate[0] = 1;
-+ sched->interval[0] = 4;
-+ sched->fill_rate[1] = 1;
-+ sched->interval[1] = 8;
-+ sched->tokens = HZ >> 2;
-+ sched->tokens_min = HZ >> 4;
-+ sched->tokens_max = HZ >> 1;
-+ sched->tokens_lock = SPIN_LOCK_UNLOCKED;
-+ sched->prio_bias = 0;
-+ sched->vavavoom = 0;
-+
-+ lockdep_set_class(&sched->tokens_lock, &tokens_lock_key);
++ sched->prio_bias = 0;
+}
+
+static inline
+void vx_info_init_sched_pc(struct _vx_sched_pc *sched_pc, int cpu)
+{
-+ sched_pc->fill_rate[0] = 1;
-+ sched_pc->interval[0] = 4;
-+ sched_pc->fill_rate[1] = 1;
-+ sched_pc->interval[1] = 8;
-+ sched_pc->tokens = HZ >> 2;
-+ sched_pc->tokens_min = HZ >> 4;
-+ sched_pc->tokens_max = HZ >> 1;
-+ sched_pc->token_time = 0;
-+ sched_pc->idle_time = 0;
-+ sched_pc->norm_time = jiffies;
++ sched_pc->prio_bias = 0;
+
+ sched_pc->user_ticks = 0;
+ sched_pc->sys_ticks = 0;
+{
+ return;
+}
-diff -NurpP --minimal linux-2.6.19.1/kernel/vserver/sched_proc.h linux-2.6.19.1-vs2.3.0.6/kernel/vserver/sched_proc.h
---- linux-2.6.19.1/kernel/vserver/sched_proc.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/vserver/sched_proc.h 2006-11-08 04:57:49 +0100
-@@ -0,0 +1,59 @@
+diff -urNp -x '*.orig' linux-4.9/kernel/vserver/sched_proc.h linux-4.9/kernel/vserver/sched_proc.h
+--- linux-4.9/kernel/vserver/sched_proc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/kernel/vserver/sched_proc.h 2021-02-24 15:47:45.124410596 +0100
+@@ -0,0 +1,32 @@
+#ifndef _VX_SCHED_PROC_H
+#define _VX_SCHED_PROC_H
+
+ int length = 0;
+
+ length += sprintf(buffer,
-+ "FillRate:\t%8d,%d\n"
-+ "Interval:\t%8d,%d\n"
-+ "TokensMin:\t%8d\n"
-+ "TokensMax:\t%8d\n"
-+ "PrioBias:\t%8d\n"
-+ "VaVaVoom:\t%8d\n"
-+ ,sched->fill_rate[0]
-+ ,sched->fill_rate[1]
-+ ,sched->interval[0]
-+ ,sched->interval[1]
-+ ,sched->tokens_min
-+ ,sched->tokens_max
-+ ,sched->prio_bias
-+ ,sched->vavavoom
-+ );
++ "PrioBias:\t%8d\n",
++ sched->prio_bias);
+ return length;
+}
+
+ int length = 0;
+
+ length += sprintf(buffer + length,
-+ "cpu %d: %lld %lld %lld %ld %ld"
-+ ,cpu
-+ ,(unsigned long long)sched_pc->user_ticks
-+ ,(unsigned long long)sched_pc->sys_ticks
-+ ,(unsigned long long)sched_pc->hold_ticks
-+ ,sched_pc->token_time
-+ ,sched_pc->idle_time
-+ );
++ "cpu %d: %lld %lld %lld", cpu,
++ (unsigned long long)sched_pc->user_ticks,
++ (unsigned long long)sched_pc->sys_ticks,
++ (unsigned long long)sched_pc->hold_ticks);
+ length += sprintf(buffer + length,
-+ " %c%c %d %d %d %d/%d %d/%d\n"
-+ ,(sched_pc->flags & VXSF_ONHOLD) ? 'H' : 'R'
-+ ,(sched_pc->flags & VXSF_IDLE_TIME) ? 'I' : '-'
-+ ,sched_pc->tokens
-+ ,sched_pc->tokens_min
-+ ,sched_pc->tokens_max
-+ ,sched_pc->fill_rate[0]
-+ ,sched_pc->interval[0]
-+ ,sched_pc->fill_rate[1]
-+ ,sched_pc->interval[1]
-+ );
++ " %d\n", sched_pc->prio_bias);
+ return length;
+}
+
+#endif /* _VX_SCHED_PROC_H */
-diff -NurpP --minimal linux-2.6.19.1/kernel/vserver/signal.c linux-2.6.19.1-vs2.3.0.6/kernel/vserver/signal.c
---- linux-2.6.19.1/kernel/vserver/signal.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/vserver/signal.c 2006-11-08 04:57:45 +0100
-@@ -0,0 +1,136 @@
+diff -urNp -x '*.orig' linux-4.9/kernel/vserver/signal.c linux-4.9/kernel/vserver/signal.c
+--- linux-4.9/kernel/vserver/signal.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/kernel/vserver/signal.c 2021-02-24 15:47:45.124410596 +0100
+@@ -0,0 +1,134 @@
+/*
+ * linux/kernel/vserver/signal.c
+ *
+ * Virtual Server: Signal Support
+ *
-+ * Copyright (C) 2003-2006 Herbert Pötzl
++ * Copyright (C) 2003-2007 Herbert P?tzl
+ *
+ * V0.01 broken out from vcontext V0.05
+ * V0.02 changed vcmds to vxi arg
++ * V0.03 adjusted siginfo for kill
+ *
+ */
+
-+#include <linux/sched.h>
-+
-+#include <asm/errno.h>
+#include <asm/uaccess.h>
+
+#include <linux/vs_context.h>
++#include <linux/vs_pid.h>
+#include <linux/vserver/signal_cmd.h>
+
+
+int vx_info_kill(struct vx_info *vxi, int pid, int sig)
+{
-+ int retval, count=0;
++ int retval, count = 0;
+ struct task_struct *p;
-+ unsigned long priv = 0;
++ struct siginfo *sip = SEND_SIG_PRIV;
+
+ retval = -ESRCH;
+ vxdprintk(VXD_CBIT(misc, 4),
+ read_lock(&tasklist_lock);
+ switch (pid) {
+ case 0:
-+ priv = 1;
+ case -1:
+ for_each_process(p) {
+ int err = 0;
+ (pid && vxi->vx_initpid == p->pid))
+ continue;
+
-+ err = group_send_sig_info(sig, (void*)priv, p);
++ err = group_send_sig_info(sig, sip, p);
+ ++count;
+ if (err != -EPERM)
+ retval = err;
+ /* ... as long as there are tasks left */
+ (atomic_read(&vxi->vx_tasks) > 1))
+ sig = SIGINT;
-+ priv = 1;
+ }
+ /* 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,
-+ (void*)priv, p);
++ retval = group_send_sig_info(sig, sip, p);
+ }
+ break;
+ }
+ read_unlock(&tasklist_lock);
+ vxdprintk(VXD_CBIT(misc, 4),
-+ "vx_info_kill(%p[#%d],%d,%d) = %d",
-+ vxi, vxi->vx_id, pid, sig, retval);
++ "vx_info_kill(%p[#%d],%d,%d,%ld) = %d",
++ vxi, vxi->vx_id, pid, sig, (long)sip, retval);
+ return retval;
+}
+
+{
+ struct vcmd_ctx_kill_v0 vc_data;
+
-+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ if (copy_from_user(&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
+ /* special check to allow guest shutdown */
+
+wait:
+ if (vx_info_state(vxi,
-+ VXS_SHUTDOWN|VXS_HASHED|VXS_HELPER) == VXS_SHUTDOWN)
++ VXS_SHUTDOWN | VXS_HASHED | VXS_HELPER) == VXS_SHUTDOWN)
+ goto out;
+ if (signal_pending(current)) {
+ ret = -ERESTARTSYS;
+ vc_data.reboot_cmd = vxi->reboot_cmd;
+ vc_data.exit_code = vxi->exit_code;
+
-+ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
++ if (copy_to_user(data, &vc_data, sizeof(vc_data)))
+ ret = -EFAULT;
+ return ret;
+}
+
-diff -NurpP --minimal linux-2.6.19.1/kernel/vserver/space.c linux-2.6.19.1-vs2.3.0.6/kernel/vserver/space.c
---- linux-2.6.19.1/kernel/vserver/space.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/vserver/space.c 2006-12-17 19:44:46 +0100
-@@ -0,0 +1,223 @@
+diff -urNp -x '*.orig' linux-4.9/kernel/vserver/space.c linux-4.9/kernel/vserver/space.c
+--- linux-4.9/kernel/vserver/space.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/kernel/vserver/space.c 2021-02-24 15:47:45.124410596 +0100
+@@ -0,0 +1,437 @@
+/*
+ * linux/kernel/vserver/space.c
+ *
+ * Virtual Server: Context Space Support
+ *
-+ * Copyright (C) 2003-2006 Herbert Pötzl
++ * Copyright (C) 2003-2010 Herbert P?tzl
+ *
+ * V0.01 broken out from context.c 0.07
+ * V0.02 added task locking for namespace
+ * V0.03 broken out vx_enter_namespace
+ * V0.04 added *space support and commands
++ * V0.05 added credential support
+ *
+ */
+
+#include <linux/utsname.h>
-+#include <linux/sched.h>
++#include <linux/nsproxy.h>
++#include <linux/err.h>
++#include <linux/fs_struct.h>
++#include <linux/cred.h>
++#include <asm/uaccess.h>
++
+#include <linux/vs_context.h>
+#include <linux/vserver/space.h>
+#include <linux/vserver/space_cmd.h>
-+#include <linux/dcache.h>
-+#include <linux/mount.h>
-+#include <linux/fs.h>
+
-+#include <asm/errno.h>
-+#include <asm/uaccess.h>
++atomic_t vs_global_nsproxy = ATOMIC_INIT(0);
++atomic_t vs_global_fs = ATOMIC_INIT(0);
++atomic_t vs_global_mnt_ns = ATOMIC_INIT(0);
++atomic_t vs_global_uts_ns = ATOMIC_INIT(0);
++atomic_t vs_global_ipc_ns = ATOMIC_INIT(0);
++atomic_t vs_global_user_ns = ATOMIC_INIT(0);
++atomic_t vs_global_pid_ns = ATOMIC_INIT(0);
+
+
+/* namespace functions */
+
-+#include <linux/namespace.h>
++#include <linux/mnt_namespace.h>
++#include <linux/user_namespace.h>
++#include <linux/pid_namespace.h>
++#include <linux/ipc_namespace.h>
++#include <net/net_namespace.h>
++#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
++};
+
-+const struct vcmd_space_mask space_mask = {
-+ .mask = CLONE_NEWNS |
++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 |
-+ CLONE_FS
++#endif
++#ifdef CONFIG_USER_NS
++ CLONE_NEWUSER |
++#endif
++#ifdef CONFIG_PID_NS
++ CLONE_NEWPID |
++#endif
++#ifdef CONFIG_NET_NS
++ CLONE_NEWNET |
++#endif
++ 0
+};
+
++static const struct vcmd_space_mask_v1 default_space_mask = {
++ .mask = CLONE_FS |
++ CLONE_NEWNS |
++#ifdef CONFIG_UTS_NS
++ CLONE_NEWUTS |
++#endif
++#ifdef CONFIG_IPC_NS
++ CLONE_NEWIPC |
++#endif
++#ifdef CONFIG_USER_NS
++// CLONE_NEWUSER |
++#endif
++#ifdef CONFIG_PID_NS
++// CLONE_NEWPID |
++#endif
++ 0
++};
+
+/*
+ * build a new nsproxy mix
+ * assumes that both proxies are 'const'
+ * does not touch nsproxy refcounts
++ * will hold a reference on the result.
+ */
+
+struct nsproxy *vs_mix_nsproxy(struct nsproxy *old_nsproxy,
+ struct nsproxy *new_nsproxy, unsigned long mask)
+{
-+ struct namespace *old_ns;
++ struct mnt_namespace *old_ns;
+ struct uts_namespace *old_uts;
+ struct ipc_namespace *old_ipc;
++#ifdef CONFIG_PID_NS
++ struct pid_namespace *old_pid;
++#endif
++#ifdef CONFIG_NET_NS
++ struct net *old_net;
++#endif
+ struct nsproxy *nsproxy;
+
-+ old_ns = old_nsproxy->namespace;
-+ old_uts = old_nsproxy->uts_ns;
-+ old_ipc = old_nsproxy->ipc_ns;
-+
-+ nsproxy = dup_namespaces(old_nsproxy);
++ nsproxy = copy_nsproxy(old_nsproxy);
+ if (!nsproxy)
+ goto out;
+
+ if (mask & CLONE_NEWNS) {
-+ nsproxy->namespace = new_nsproxy->namespace;
-+ if (nsproxy->namespace)
-+ get_namespace(nsproxy->namespace);
++ old_ns = nsproxy->mnt_ns;
++ nsproxy->mnt_ns = new_nsproxy->mnt_ns;
++ if (nsproxy->mnt_ns)
++ get_mnt_ns(nsproxy->mnt_ns);
+ } else
+ old_ns = NULL;
+
+ if (mask & CLONE_NEWUTS) {
++ old_uts = nsproxy->uts_ns;
+ nsproxy->uts_ns = new_nsproxy->uts_ns;
+ if (nsproxy->uts_ns)
+ get_uts_ns(nsproxy->uts_ns);
+ old_uts = NULL;
+
+ if (mask & CLONE_NEWIPC) {
++ old_ipc = nsproxy->ipc_ns;
+ nsproxy->ipc_ns = new_nsproxy->ipc_ns;
+ if (nsproxy->ipc_ns)
+ get_ipc_ns(nsproxy->ipc_ns);
+ } else
+ old_ipc = NULL;
+
++#ifdef CONFIG_PID_NS
++ if (mask & CLONE_NEWPID) {
++ old_pid = nsproxy->pid_ns_for_children;
++ nsproxy->pid_ns_for_children = new_nsproxy->pid_ns_for_children;
++ if (nsproxy->pid_ns_for_children)
++ get_pid_ns(nsproxy->pid_ns_for_children);
++ } else
++ old_pid = NULL;
++#endif
++#ifdef CONFIG_NET_NS
++ if (mask & CLONE_NEWNET) {
++ old_net = nsproxy->net_ns;
++ nsproxy->net_ns = new_nsproxy->net_ns;
++ if (nsproxy->net_ns)
++ get_net(nsproxy->net_ns);
++ } else
++ old_net = NULL;
++#endif
+ if (old_ns)
-+ put_namespace(old_ns);
++ put_mnt_ns(old_ns);
+ if (old_uts)
+ put_uts_ns(old_uts);
+ if (old_ipc)
+ put_ipc_ns(old_ipc);
++#ifdef CONFIG_PID_NS
++ if (old_pid)
++ put_pid_ns(old_pid);
++#endif
++#ifdef CONFIG_NET_NS
++ if (old_net)
++ put_net(old_net);
++#endif
+out:
+ return nsproxy;
+}
+
-+static inline
-+void __vs_merge_nsproxy(struct nsproxy **ptr,
-+ struct nsproxy *nsproxy, unsigned long mask)
-+{
-+ struct nsproxy *old = *ptr;
-+ struct nsproxy null_proxy = { .namespace = NULL };
-+
-+ BUG_ON(!nsproxy);
+
-+ if (mask)
-+ *ptr = vs_mix_nsproxy(old ? old : &null_proxy,
-+ nsproxy, mask);
-+ else {
-+ *ptr = nsproxy;
-+ get_nsproxy(nsproxy);
-+ }
-+ if (old)
-+ put_nsproxy(old);
-+}
++/*
++ * merge two nsproxy structs into a new one.
++ * will hold a reference on the result.
++ */
+
+static inline
-+void __vs_merge_fs(struct fs_struct **ptr, struct fs_struct *fs)
++struct nsproxy *__vs_merge_nsproxy(struct nsproxy *old,
++ struct nsproxy *proxy, unsigned long mask)
+{
-+ struct fs_struct *old = *ptr;
++ struct nsproxy null_proxy = { .mnt_ns = NULL };
++
++ if (!proxy)
++ return NULL;
+
-+ *ptr = fs;
-+ atomic_inc(&fs->count);
-+ if (old)
-+ put_fs_struct(old);
++ if (mask) {
++ /* vs_mix_nsproxy returns with reference */
++ return vs_mix_nsproxy(old ? old : &null_proxy,
++ proxy, mask);
++ }
++ get_nsproxy(proxy);
++ return proxy;
+}
+
+
-+int vx_enter_space(struct vx_info *vxi, unsigned long mask)
++int vx_enter_space(struct vx_info *vxi, unsigned long mask, unsigned index)
+{
-+ struct fs_struct *fs = NULL;
-+ struct nsproxy *nsproxy;
++ struct nsproxy *proxy, *proxy_cur, *proxy_new;
++ struct fs_struct *fs_cur, *fs = NULL;
++ struct _vx_space *space;
++ int ret, kill = 0;
++
++ vxdprintk(VXD_CBIT(space, 8), "vx_enter_space(%p[#%u],0x%08lx,%d)",
++ vxi, vxi->vx_id, mask, index);
+
+ 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;
++ mask = space->vx_nsmask;
+
-+ if ((mask & vxi->vx_nsmask) != mask)
++ if ((mask & space->vx_nsmask) != mask)
+ return -EINVAL;
+
-+ nsproxy = vxi->vx_nsproxy;
-+ if ((mask & CLONE_FS)) {
-+ BUG_ON(!vxi->vx_fs);
-+ fs = copy_fs_struct(vxi->vx_fs);
++ if (mask & CLONE_FS) {
++ fs = copy_fs_struct(space->vx_fs);
+ if (!fs)
+ return -ENOMEM;
+ }
++ proxy = space->vx_nsproxy;
++
++ vxdprintk(VXD_CBIT(space, 9),
++ "vx_enter_space(%p[#%u],0x%08lx,%d) -> (%p,%p)",
++ vxi, vxi->vx_id, mask, index, proxy, fs);
+
+ task_lock(current);
-+ if (nsproxy)
-+ __vs_merge_nsproxy(¤t->nsproxy, nsproxy, mask);
-+ if (fs)
-+ __vs_merge_fs(¤t->fs, fs);
++ fs_cur = current->fs;
++
++ if (mask & CLONE_FS) {
++ spin_lock(&fs_cur->lock);
++ current->fs = fs;
++ kill = !--fs_cur->users;
++ spin_unlock(&fs_cur->lock);
++ }
++
++ proxy_cur = current->nsproxy;
++ get_nsproxy(proxy_cur);
+ task_unlock(current);
-+ return 0;
++
++ if (kill)
++ free_fs_struct(fs_cur);
++
++ proxy_new = __vs_merge_nsproxy(proxy_cur, proxy, mask);
++ if (IS_ERR(proxy_new)) {
++ ret = PTR_ERR(proxy_new);
++ goto out_put;
++ }
++
++ proxy_new = xchg(¤t->nsproxy, proxy_new);
++
++ if (mask & CLONE_NEWUSER) {
++ struct cred *cred;
++
++ vxdprintk(VXD_CBIT(space, 10),
++ "vx_enter_space(%p[#%u],%p) cred (%p,%p)",
++ vxi, vxi->vx_id, space->vx_cred,
++ current->real_cred, current->cred);
++
++ if (space->vx_cred) {
++ cred = __prepare_creds(space->vx_cred);
++ if (cred)
++ commit_creds(cred);
++ }
++ }
++
++ ret = 0;
++
++ if (proxy_new)
++ put_nsproxy(proxy_new);
++out_put:
++ if (proxy_cur)
++ put_nsproxy(proxy_cur);
++ return ret;
+}
+
+
-+int vx_set_space(struct vx_info *vxi, unsigned long mask)
++int vx_set_space(struct vx_info *vxi, unsigned long mask, unsigned index)
+{
-+ struct fs_struct *fs, *fs_copy = NULL;
-+ struct nsproxy *nsproxy;
-+ int ret;
++ struct nsproxy *proxy_vxi, *proxy_cur, *proxy_new;
++ struct fs_struct *fs_vxi, *fs = NULL;
++ struct _vx_space *space;
++ int ret, kill = 0;
+
-+ if (!mask)
-+ mask = space_mask.mask;
++ vxdprintk(VXD_CBIT(space, 8), "vx_set_space(%p[#%u],0x%08lx,%d)",
++ vxi, vxi->vx_id, mask, index);
+
+ if ((mask & space_mask.mask) != mask)
+ return -EINVAL;
+
++ if (index >= VX_SPACES)
++ return -EINVAL;
++
++ space = &vxi->space[index];
++
++ proxy_vxi = space->vx_nsproxy;
++ fs_vxi = space->vx_fs;
++
++ if (mask & CLONE_FS) {
++ fs = copy_fs_struct(current->fs);
++ if (!fs)
++ return -ENOMEM;
++ }
++
+ task_lock(current);
-+ fs = current->fs;
-+ atomic_inc(&fs->count);
-+ nsproxy = current->nsproxy;
-+ get_nsproxy(nsproxy);
++
++ if (mask & CLONE_FS) {
++ spin_lock(&fs_vxi->lock);
++ space->vx_fs = fs;
++ kill = !--fs_vxi->users;
++ spin_unlock(&fs_vxi->lock);
++ }
++
++ proxy_cur = current->nsproxy;
++ get_nsproxy(proxy_cur);
+ task_unlock(current);
+
-+ ret = -ENOMEM;
-+ if ((mask & CLONE_FS)) {
-+ fs_copy = copy_fs_struct(fs);
-+ if (!fs_copy)
-+ goto out_put;
++ if (kill)
++ free_fs_struct(fs_vxi);
++
++ proxy_new = __vs_merge_nsproxy(proxy_vxi, proxy_cur, mask);
++ if (IS_ERR(proxy_new)) {
++ ret = PTR_ERR(proxy_new);
++ goto out_put;
+ }
+
-+ if (nsproxy)
-+ __vs_merge_nsproxy(&vxi->vx_nsproxy, nsproxy, mask);
-+ if (fs_copy)
-+ __vs_merge_fs(&vxi->vx_fs, fs_copy);
-+ vxi->vx_nsmask |= mask;
++ proxy_new = xchg(&space->vx_nsproxy, proxy_new);
++ space->vx_nsmask |= mask;
++
++ if (mask & CLONE_NEWUSER) {
++ struct cred *cred;
++
++ vxdprintk(VXD_CBIT(space, 10),
++ "vx_set_space(%p[#%u],%p) cred (%p,%p)",
++ vxi, vxi->vx_id, space->vx_cred,
++ current->real_cred, current->cred);
++
++ cred = prepare_creds();
++ cred = (struct cred *)xchg(&space->vx_cred, cred);
++ if (cred)
++ abort_creds(cred);
++ }
+
+ ret = 0;
++
++ if (proxy_new)
++ put_nsproxy(proxy_new);
+out_put:
-+ put_fs_struct(fs);
-+ put_nsproxy(nsproxy);
++ if (proxy_cur)
++ put_nsproxy(proxy_cur);
+ return ret;
+}
+
+
++int vc_enter_space_v1(struct vx_info *vxi, void __user *data)
++{
++ struct vcmd_space_mask_v1 vc_data = { .mask = 0 };
++
++ if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
++
++ return vx_enter_space(vxi, vc_data.mask, 0);
++}
++
+int vc_enter_space(struct vx_info *vxi, void __user *data)
+{
-+ struct vcmd_space_mask vc_data = { .mask = 0 };
++ struct vcmd_space_mask_v2 vc_data = { .mask = 0 };
++
++ if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
++
++ if (vc_data.index >= VX_SPACES)
++ return -EINVAL;
++
++ return vx_enter_space(vxi, vc_data.mask, vc_data.index);
++}
++
++int vc_set_space_v1(struct vx_info *vxi, void __user *data)
++{
++ struct vcmd_space_mask_v1 vc_data = { .mask = 0 };
+
-+ if (data && copy_from_user (&vc_data, data, sizeof(vc_data)))
++ if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
-+ return vx_enter_space(vxi, vc_data.mask);
++ return vx_set_space(vxi, vc_data.mask, 0);
+}
+
+int vc_set_space(struct vx_info *vxi, void __user *data)
+{
-+ struct vcmd_space_mask vc_data = { .mask = 0 };
++ struct vcmd_space_mask_v2 vc_data = { .mask = 0 };
+
-+ if (data && copy_from_user (&vc_data, data, sizeof(vc_data)))
++ if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
-+ return vx_set_space(vxi, vc_data.mask);
++ if (vc_data.index >= VX_SPACES)
++ return -EINVAL;
++
++ return vx_set_space(vxi, vc_data.mask, vc_data.index);
+}
+
-+int vc_get_space_mask(struct vx_info *vxi, void __user *data)
++int vc_get_space_mask(void __user *data, int type)
+{
-+ if (copy_to_user(data, &space_mask, sizeof(space_mask)))
++ const struct vcmd_space_mask_v1 *mask;
++
++ if (type == 0)
++ mask = &space_mask_v0;
++ else if (type == 1)
++ mask = &space_mask;
++ else
++ mask = &default_space_mask;
++
++ vxdprintk(VXD_CBIT(space, 10),
++ "vc_get_space_mask(%d) = %08llx", type, mask->mask);
++
++ if (copy_to_user(data, mask, sizeof(*mask)))
+ return -EFAULT;
+ return 0;
+}
+
-diff -NurpP --minimal linux-2.6.19.1/kernel/vserver/switch.c linux-2.6.19.1-vs2.3.0.6/kernel/vserver/switch.c
---- linux-2.6.19.1/kernel/vserver/switch.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/vserver/switch.c 2006-12-17 04:45:00 +0100
-@@ -0,0 +1,456 @@
+diff -urNp -x '*.orig' linux-4.9/kernel/vserver/switch.c linux-4.9/kernel/vserver/switch.c
+--- linux-4.9/kernel/vserver/switch.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/kernel/vserver/switch.c 2021-02-24 15:47:45.124410596 +0100
+@@ -0,0 +1,556 @@
+/*
+ * linux/kernel/vserver/switch.c
+ *
+ * Virtual Server: Syscall Switch
+ *
-+ * Copyright (C) 2003-2006 Herbert Pötzl
++ * Copyright (C) 2003-2011 Herbert P?tzl
+ *
+ * V0.01 syscall switch
+ * V0.02 added signal to context
+ * V0.06 added compat32 layer
+ * V0.07 vcmd args and perms
+ * V0.08 added status commands
++ * V0.09 added tag commands
++ * V0.10 added oom bias
++ * V0.11 added device commands
++ * V0.12 added warn mask
+ *
+ */
+
-+#include <linux/linkage.h>
-+#include <linux/sched.h>
-+#include <linux/compat.h>
-+#include <asm/errno.h>
-+
+#include <linux/vs_context.h>
+#include <linux/vs_network.h>
+#include <linux/vserver/switch.h>
+
++#include "vci_config.h"
++
++
+static inline
+int vc_get_version(uint32_t id)
+{
+ return VCI_VERSION;
+}
+
-+#include "vci_config.h"
-+
+static inline
+int vc_get_vci(uint32_t id)
+{
+#include <linux/vserver/dlimit_cmd.h>
+#include <linux/vserver/signal_cmd.h>
+#include <linux/vserver/space_cmd.h>
++#include <linux/vserver/tag_cmd.h>
++#include <linux/vserver/device_cmd.h>
+
+#include <linux/vserver/inode.h>
+#include <linux/vserver/dlimit.h>
+
+#ifdef CONFIG_COMPAT
+#define __COMPAT(name, id, data, compat) \
-+ (compat) ? name ## _x32 (id, data) : name (id, data)
++ (compat) ? name ## _x32(id, data) : name(id, data)
++#define __COMPAT_NO_ID(name, data, compat) \
++ (compat) ? name ## _x32(data) : name(data)
+#else
+#define __COMPAT(name, id, data, compat) \
-+ name (id, data)
++ name(id, data)
++#define __COMPAT_NO_ID(name, data, compat) \
++ name(data)
+#endif
+
+
+ return vc_get_vci(id);
+
+ case VCMD_task_xid:
-+ return vc_task_xid(id, data);
++ return vc_task_xid(id);
+ case VCMD_vx_info:
+ return vc_vx_info(vxi, data);
+
+ case VCMD_task_nid:
-+ return vc_task_nid(id, data);
++ return vc_task_nid(id);
+ case VCMD_nx_info:
+ return vc_nx_info(nxi, data);
+
-+ case VCMD_set_space_v0:
-+ /* this is version 1 */
++ case VCMD_task_tag:
++ return vc_task_tag(id);
++
++ case VCMD_set_space_v1:
++ return vc_set_space_v1(vxi, data);
++ /* this is version 2 */
+ case VCMD_set_space:
+ return vc_set_space(vxi, data);
+
++ case VCMD_get_space_mask_v0:
++ return vc_get_space_mask(data, 0);
++ /* this is version 1 */
+ case VCMD_get_space_mask:
-+ return vc_get_space_mask(vxi, data);
++ return vc_get_space_mask(data, 1);
++
++ 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);
+#endif
+ case VCMD_get_rlimit_mask:
+ return vc_get_rlimit_mask(id, data);
++ case VCMD_reset_hits:
++ return vc_reset_hits(vxi, data);
+ case VCMD_reset_minmax:
+ return vc_reset_minmax(vxi, data);
+
+ case VCMD_get_cflags:
+ return vc_get_cflags(vxi, data);
+
-+ case VCMD_set_ccaps_v0:
-+ return vc_set_ccaps_v0(vxi, data);
+ /* this is version 1 */
+ case VCMD_set_ccaps:
+ return vc_set_ccaps(vxi, data);
-+ case VCMD_get_ccaps_v0:
-+ return vc_get_ccaps_v0(vxi, data);
+ /* this is version 1 */
+ case VCMD_get_ccaps:
+ return vc_get_ccaps(vxi, data);
+ case VCMD_get_bcaps:
+ return vc_get_bcaps(vxi, data);
+
++ case VCMD_set_badness:
++ return vc_set_badness(vxi, data);
++ case VCMD_get_badness:
++ return vc_get_badness(vxi, data);
++
+ case VCMD_set_nflags:
+ return vc_set_nflags(nxi, data);
+ case VCMD_get_nflags:
+ case VCMD_get_ncaps:
+ return vc_get_ncaps(nxi, data);
+
-+ case VCMD_set_sched_v3:
-+ return vc_set_sched_v3(vxi, data);
-+ /* this is version 4 */
-+ case VCMD_set_sched:
-+ return vc_set_sched(vxi, data);
-+
++ case VCMD_set_prio_bias:
++ return vc_set_prio_bias(vxi, data);
++ case VCMD_get_prio_bias:
++ return vc_get_prio_bias(vxi, data);
+ case VCMD_add_dlimit:
+ return __COMPAT(vc_add_dlimit, id, data, compat);
+ case VCMD_rem_dlimit:
+ return vc_wait_exit(vxi, data);
+
+ case VCMD_get_iattr:
-+ return __COMPAT(vc_get_iattr, id, data, compat);
++ return __COMPAT_NO_ID(vc_get_iattr, data, compat);
+ case VCMD_set_iattr:
-+ return __COMPAT(vc_set_iattr, id, data, compat);
++ return __COMPAT_NO_ID(vc_set_iattr, data, compat);
++
++ case VCMD_fget_iattr:
++ return vc_fget_iattr(id, data);
++ case VCMD_fset_iattr:
++ return vc_fset_iattr(id, data);
+
+ case VCMD_enter_space_v0:
-+ return vc_enter_space(vxi, NULL);
-+ /* this is version 1 */
++ return vc_enter_space_v1(vxi, NULL);
++ case VCMD_enter_space_v1:
++ return vc_enter_space_v1(vxi, data);
++ /* this is version 2 */
+ case VCMD_enter_space:
+ return vc_enter_space(vxi, data);
+
+ return vc_net_create(id, data);
+ case VCMD_net_migrate:
+ return vc_net_migrate(nxi, data);
++
++ case VCMD_tag_migrate:
++ return vc_tag_migrate(id);
++
+ case VCMD_net_add:
+ return vc_net_add(nxi, data);
+ 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_rem_ipv4_v1:
++ return vc_net_rem_ipv4_v1(nxi, data);
++ /* this is version 2 */
++ case VCMD_net_rem_ipv4:
++ return vc_net_rem_ipv4(nxi, data);
++#ifdef CONFIG_IPV6
++ case VCMD_net_add_ipv6:
++ return vc_net_add_ipv6(nxi, data);
++ case VCMD_net_remove_ipv6:
++ return vc_net_remove_ipv6(nxi, data);
++#endif
++/* case VCMD_add_match_ipv4:
++ return vc_add_match_ipv4(nxi, data);
++ case VCMD_get_match_ipv4:
++ return vc_get_match_ipv4(nxi, data);
++#ifdef CONFIG_IPV6
++ case VCMD_add_match_ipv6:
++ return vc_add_match_ipv6(nxi, data);
++ case VCMD_get_match_ipv6:
++ return vc_get_match_ipv6(nxi, data);
++#endif */
++
++#ifdef CONFIG_VSERVER_DEVICE
++ case VCMD_set_mapping:
++ return __COMPAT(vc_set_mapping, vxi, data, compat);
++ case VCMD_unset_mapping:
++ return __COMPAT(vc_unset_mapping, vxi, data, compat);
++#endif
+#ifdef CONFIG_VSERVER_HISTORY
+ case VCMD_dump_history:
+ return vc_dump_history(id);
+ case VCMD_read_history:
+ return __COMPAT(vc_read_history, id, data, compat);
+#endif
-+#ifdef CONFIG_VSERVER_MONITOR
-+ case VCMD_read_monitor:
-+ return __COMPAT(vc_read_monitor, id, data, compat);
-+#endif
+ default:
-+ vxwprintk(1, "unimplemented VCMD_%02d_%d[%d]",
++ vxwprintk_task(1, "unimplemented VCMD_%02d_%d[%d]",
+ VC_CATEGORY(cmd), VC_COMMAND(cmd), VC_VERSION(cmd));
+ }
+ return -ENOSYS;
+#define VCF_ARES 0x06 /* includes admin */
+#define VCF_SETUP 0x08
+
++#define VCF_ZIDOK 0x10 /* zero id okay */
++
+
+static inline
+long do_vserver(uint32_t cmd, uint32_t id, void __user *data, int compat)
+ __VCMD(get_version, 0, VCA_NONE, 0);
+ __VCMD(get_vci, 0, VCA_NONE, 0);
+ __VCMD(get_rlimit_mask, 0, VCA_NONE, 0);
++ __VCMD(get_space_mask_v0,0, VCA_NONE, 0);
+ __VCMD(get_space_mask, 0, VCA_NONE, 0);
++ __VCMD(get_space_default,0, VCA_NONE, 0);
+
+ /* info commands */
+ __VCMD(task_xid, 2, VCA_NONE, 0);
++ __VCMD(reset_hits, 2, VCA_VXI, 0);
+ __VCMD(reset_minmax, 2, VCA_VXI, 0);
+ __VCMD(vx_info, 3, VCA_VXI, VCF_INFO);
+ __VCMD(get_bcaps, 3, VCA_VXI, VCF_INFO);
-+ __VCMD(get_ccaps_v0, 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);
+
+ __VCMD(get_ncaps, 3, VCA_NXI, VCF_INFO);
+ __VCMD(get_nflags, 3, VCA_NXI, VCF_INFO);
+
++ __VCMD(task_tag, 2, VCA_NONE, 0);
++
+ __VCMD(get_iattr, 2, VCA_NONE, 0);
++ __VCMD(fget_iattr, 2, VCA_NONE, 0);
+ __VCMD(get_dlimit, 3, VCA_NONE, VCF_INFO);
++ __VCMD(get_prio_bias, 3, VCA_VXI, VCF_INFO);
+
+ /* lower admin commands */
+ __VCMD(wait_exit, 4, VCA_VXI, VCF_INFO);
+ __VCMD(ctx_migrate_v0, 5, VCA_VXI, VCF_ADMIN);
+ __VCMD(ctx_migrate, 5, VCA_VXI, VCF_ADMIN);
+ __VCMD(enter_space_v0, 5, VCA_VXI, VCF_ADMIN);
++ __VCMD(enter_space_v1, 5, VCA_VXI, VCF_ADMIN);
+ __VCMD(enter_space, 5, VCA_VXI, VCF_ADMIN);
+
+ __VCMD(net_create_v0, 5, VCA_NONE, 0);
+ __VCMD(net_create, 5, VCA_NONE, 0);
+ __VCMD(net_migrate, 5, VCA_NXI, VCF_ADMIN);
+
++ __VCMD(tag_migrate, 5, VCA_NONE, VCF_ADMIN);
++
+ /* higher admin commands */
+ __VCMD(ctx_kill, 6, VCA_VXI, VCF_ARES);
-+ __VCMD(set_space_v0, 7, VCA_VXI, VCF_ARES|VCF_SETUP);
-+ __VCMD(set_space, 7, VCA_VXI, VCF_ARES|VCF_SETUP);
-+
-+ __VCMD(set_ccaps_v0, 7, VCA_VXI, VCF_ARES|VCF_SETUP);
-+ __VCMD(set_ccaps, 7, VCA_VXI, VCF_ARES|VCF_SETUP);
-+ __VCMD(set_bcaps, 7, VCA_VXI, VCF_ARES|VCF_SETUP);
-+ __VCMD(set_cflags, 7, VCA_VXI, VCF_ARES|VCF_SETUP);
-+
-+ __VCMD(set_vhi_name, 7, VCA_VXI, VCF_ARES|VCF_SETUP);
-+ __VCMD(set_rlimit, 7, VCA_VXI, VCF_ARES|VCF_SETUP);
-+ __VCMD(set_sched, 7, VCA_VXI, VCF_ARES|VCF_SETUP);
-+ __VCMD(set_sched_v2, 7, VCA_VXI, VCF_ARES|VCF_SETUP);
-+ __VCMD(set_sched_v3, 7, VCA_VXI, VCF_ARES|VCF_SETUP);
-+
-+ __VCMD(set_ncaps, 7, VCA_NXI, VCF_ARES|VCF_SETUP);
-+ __VCMD(set_nflags, 7, VCA_NXI, VCF_ARES|VCF_SETUP);
-+ __VCMD(net_add, 8, VCA_NXI, VCF_ARES|VCF_SETUP);
-+ __VCMD(net_remove, 8, VCA_NXI, VCF_ARES|VCF_SETUP);
-+
++ __VCMD(set_space_v1, 7, VCA_VXI, VCF_ARES | VCF_SETUP);
++ __VCMD(set_space, 7, VCA_VXI, VCF_ARES | VCF_SETUP);
++
++ __VCMD(set_ccaps, 7, VCA_VXI, VCF_ARES | VCF_SETUP);
++ __VCMD(set_bcaps, 7, VCA_VXI, VCF_ARES | VCF_SETUP);
++ __VCMD(set_cflags, 7, VCA_VXI, VCF_ARES | VCF_SETUP);
++ __VCMD(set_umask, 7, VCA_VXI, VCF_ARES | VCF_SETUP);
++ __VCMD(set_wmask, 7, VCA_VXI, VCF_ARES | VCF_SETUP);
++ __VCMD(set_badness, 7, VCA_VXI, VCF_ARES | VCF_SETUP);
++
++ __VCMD(set_vhi_name, 7, VCA_VXI, VCF_ARES | VCF_SETUP);
++ __VCMD(set_rlimit, 7, VCA_VXI, VCF_ARES | VCF_SETUP);
++ __VCMD(set_prio_bias, 7, VCA_VXI, VCF_ARES | VCF_SETUP);
++
++ __VCMD(set_ncaps, 7, VCA_NXI, VCF_ARES | VCF_SETUP);
++ __VCMD(set_nflags, 7, VCA_NXI, VCF_ARES | VCF_SETUP);
++ __VCMD(net_add, 8, VCA_NXI, VCF_ARES | VCF_SETUP);
++ __VCMD(net_remove, 8, VCA_NXI, VCF_ARES | VCF_SETUP);
++ __VCMD(net_add_ipv4_v1, 8, VCA_NXI, VCF_ARES | VCF_SETUP);
++ __VCMD(net_rem_ipv4_v1, 8, VCA_NXI, VCF_ARES | VCF_SETUP);
++ __VCMD(net_add_ipv4, 8, VCA_NXI, VCF_ARES | VCF_SETUP);
++ __VCMD(net_rem_ipv4, 8, VCA_NXI, VCF_ARES | VCF_SETUP);
++#ifdef CONFIG_IPV6
++ __VCMD(net_add_ipv6, 8, VCA_NXI, VCF_ARES | VCF_SETUP);
++ __VCMD(net_remove_ipv6, 8, VCA_NXI, VCF_ARES | VCF_SETUP);
++#endif
+ __VCMD(set_iattr, 7, VCA_NONE, 0);
++ __VCMD(fset_iattr, 7, VCA_NONE, 0);
+ __VCMD(set_dlimit, 7, VCA_NONE, VCF_ARES);
+ __VCMD(add_dlimit, 8, VCA_NONE, VCF_ARES);
+ __VCMD(rem_dlimit, 8, VCA_NONE, VCF_ARES);
+
++#ifdef CONFIG_VSERVER_DEVICE
++ __VCMD(set_mapping, 8, VCA_VXI, VCF_ARES|VCF_ZIDOK);
++ __VCMD(unset_mapping, 8, VCA_VXI, VCF_ARES|VCF_ZIDOK);
++#endif
+ /* debug level admin commands */
+#ifdef CONFIG_VSERVER_HISTORY
+ __VCMD(dump_history, 9, VCA_NONE, 0);
+ __VCMD(read_history, 9, VCA_NONE, 0);
+#endif
-+#ifdef CONFIG_VSERVER_MONITOR
-+ __VCMD(read_monitor, 9, VCA_NONE, 0);
-+#endif
++
+ default:
+ perm = -1;
+ }
+ state = 4;
+ /* various legacy exceptions */
+ switch (cmd) {
-+ /* will go away when admin is a cap */
++ /* will go away when spectator is a cap */
+ case VCMD_ctx_migrate_v0:
+ case VCMD_ctx_migrate:
+ if (id == 1) {
+ }
+ break;
+
-+ /* legacy special casing */
-+ case VCMD_set_space_v0:
-+ id = -1;
++ /* will go away when spectator is a cap */
++ case VCMD_net_migrate:
++ if (id == 1) {
++ current->nid = 1;
++ ret = 1;
++ goto out;
++ }
+ break;
+ }
+
+ goto out;
+
+ state = 6;
++ if (!id && (flags & VCF_ZIDOK))
++ goto skip_id;
++
+ ret = -ESRCH;
+ if (args & VCA_VXI) {
+ vxi = lookup_vx_info(id);
+ goto out_nxi;
+ }
+ }
-+
++skip_id:
+ state = 8;
+ ret = do_vcmd(cmd, id, vxi, nxi, data, compat);
+
+out_nxi:
-+ if (args & VCA_NXI)
++ if ((args & VCA_NXI) && nxi)
+ put_nx_info(nxi);
+out_vxi:
-+ if (args & VCA_VXI)
++ if ((args & VCA_VXI) && vxi)
+ put_vx_info(vxi);
+out:
+ vxdprintk(VXD_CBIT(switch, 1),
+}
+
+#endif /* CONFIG_COMPAT */
-diff -NurpP --minimal linux-2.6.19.1/kernel/vserver/sysctl.c linux-2.6.19.1-vs2.3.0.6/kernel/vserver/sysctl.c
---- linux-2.6.19.1/kernel/vserver/sysctl.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/vserver/sysctl.c 2006-11-08 04:57:40 +0100
-@@ -0,0 +1,242 @@
+diff -urNp -x '*.orig' linux-4.9/kernel/vserver/sysctl.c linux-4.9/kernel/vserver/sysctl.c
+--- linux-4.9/kernel/vserver/sysctl.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/kernel/vserver/sysctl.c 2021-02-24 15:47:45.127744035 +0100
+@@ -0,0 +1,249 @@
+/*
+ * kernel/vserver/sysctl.c
+ *
+ * Virtual Context Support
+ *
-+ * Copyright (C) 2004-2005 Herbert Pötzl
++ * Copyright (C) 2004-2007 Herbert P?tzl
+ *
+ * V0.01 basic structure
+ *
+ */
+
-+#include <linux/errno.h>
+#include <linux/module.h>
-+#include <linux/types.h>
+#include <linux/ctype.h>
+#include <linux/sysctl.h>
+#include <linux/parser.h>
-+#include <linux/fs.h>
++#include <linux/utsname.h>
+
+#include <asm/uaccess.h>
-+#include <asm/unistd.h>
-+
-+
-+#define CTL_VSERVER 4242 /* unused? */
++#include <asm/sections.h>
+
+enum {
+ CTL_DEBUG_ERROR = 0,
+ CTL_DEBUG_DLIM,
+ 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_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_table[];
++static struct ctl_table vserver_root_table[];
+
+
+void vserver_register_sysctl(void)
+{
+ if (!vserver_table_header) {
-+ vserver_table_header = register_sysctl_table(vserver_table, 1);
++ vserver_table_header = register_sysctl_table(vserver_root_table);
+ }
+
+}
+ }
+}
+
-+
-+static int proc_dodebug(ctl_table *table, int write,
-+ struct file *filp, void __user *buffer, size_t *lenp, loff_t *ppos)
++static int proc_dodebug(struct ctl_table *table, int write,
++ void __user *buffer, size_t *lenp, loff_t *ppos)
+{
+ char tmpbuf[20], *p, c;
+ unsigned int value;
+ if (write) {
+ if (!access_ok(VERIFY_READ, buffer, left))
+ return -EFAULT;
-+ p = (char *) buffer;
++ p = (char *)buffer;
+ while (left && __get_user(c, p) >= 0 && isspace(c))
+ left--, p++;
+ if (!left)
+ return -EINVAL;
+ while (left && isspace(*p))
+ left--, p++;
-+ *(unsigned int *) table->data = value;
++ *(unsigned int *)table->data = value;
+ } else {
+ if (!access_ok(VERIFY_WRITE, buffer, left))
+ return -EFAULT;
-+ len = sprintf(tmpbuf, "%d", *(unsigned int *) table->data);
++ len = sprintf(tmpbuf, "%d", *(unsigned int *)table->data);
+ if (len > left)
+ len = left;
+ if (__copy_to_user(buffer, tmpbuf, len))
+ return 0;
+}
+
++static int zero;
+
+#define CTL_ENTRY(ctl, name) \
+ { \
-+ .ctl_name = ctl, \
+ .procname = #name, \
-+ .data = &vx_##name, \
++ .data = &vs_ ## name, \
+ .maxlen = sizeof(int), \
+ .mode = 0644, \
-+ .proc_handler = &proc_dodebug \
++ .proc_handler = &proc_dodebug, \
++ .extra1 = &zero, \
++ .extra2 = &zero, \
+ }
+
-+static ctl_table debug_table[] = {
-+ CTL_ENTRY (CTL_DEBUG_SWITCH, debug_switch),
-+ CTL_ENTRY (CTL_DEBUG_XID, debug_xid),
-+ CTL_ENTRY (CTL_DEBUG_NID, debug_nid),
-+ CTL_ENTRY (CTL_DEBUG_TAG, debug_tag),
-+ CTL_ENTRY (CTL_DEBUG_NET, debug_net),
-+ CTL_ENTRY (CTL_DEBUG_LIMIT, debug_limit),
-+ CTL_ENTRY (CTL_DEBUG_CRES, debug_cres),
-+ CTL_ENTRY (CTL_DEBUG_DLIM, debug_dlim),
-+ CTL_ENTRY (CTL_DEBUG_QUOTA, debug_quota),
-+ CTL_ENTRY (CTL_DEBUG_CVIRT, debug_cvirt),
-+ CTL_ENTRY (CTL_DEBUG_MISC, debug_misc),
-+ { .ctl_name = 0 }
++static struct ctl_table vserver_debug_table[] = {
++ CTL_ENTRY(CTL_DEBUG_SWITCH, debug_switch),
++ CTL_ENTRY(CTL_DEBUG_XID, debug_xid),
++ CTL_ENTRY(CTL_DEBUG_NID, debug_nid),
++ CTL_ENTRY(CTL_DEBUG_TAG, debug_tag),
++ CTL_ENTRY(CTL_DEBUG_NET, debug_net),
++ CTL_ENTRY(CTL_DEBUG_LIMIT, debug_limit),
++ CTL_ENTRY(CTL_DEBUG_CRES, debug_cres),
++ CTL_ENTRY(CTL_DEBUG_DLIM, debug_dlim),
++ CTL_ENTRY(CTL_DEBUG_QUOTA, debug_quota),
++ CTL_ENTRY(CTL_DEBUG_CVIRT, debug_cvirt),
++ CTL_ENTRY(CTL_DEBUG_SPACE, debug_space),
++ CTL_ENTRY(CTL_DEBUG_PERM, debug_perm),
++ CTL_ENTRY(CTL_DEBUG_MISC, debug_misc),
++ { 0 }
+};
+
-+static ctl_table vserver_table[] = {
++static struct ctl_table vserver_root_table[] = {
+ {
-+ .ctl_name = CTL_VSERVER,
+ .procname = "vserver",
+ .mode = 0555,
-+ .child = debug_table
++ .child = vserver_debug_table
+ },
-+ { .ctl_name = 0 }
++ { 0 }
+};
+
+
+ { CTL_DEBUG_DLIM, "dlim=%x" },
+ { CTL_DEBUG_QUOTA, "quota=%x" },
+ { CTL_DEBUG_CVIRT, "cvirt=%x" },
++ { CTL_DEBUG_SPACE, "space=%x" },
++ { CTL_DEBUG_PERM, "perm=%x" },
+ { CTL_DEBUG_MISC, "misc=%x" },
+ { CTL_DEBUG_ERROR, NULL }
+};
+
+#define HANDLE_CASE(id, name, val) \
+ case CTL_DEBUG_ ## id: \
-+ vx_debug_ ## name = val; \
++ vs_debug_ ## name = val; \
+ printk("vs_debug_" #name "=0x%x\n", val); \
+ break
+
+ continue;
+
+ token = match_token(p, tokens, args);
-+ value = (token>0)?simple_strtoul(args[0].from, NULL, 0):0;
++ value = (token > 0) ? simple_strtoul(args[0].from, NULL, 0) : 0;
+
+ switch (token) {
+ HANDLE_CASE(SWITCH, switch, value);
+ HANDLE_CASE(DLIM, dlim, value);
+ HANDLE_CASE(QUOTA, quota, value);
+ HANDLE_CASE(CVIRT, cvirt, value);
++ HANDLE_CASE(SPACE, space, value);
++ HANDLE_CASE(PERM, perm, value);
+ HANDLE_CASE(MISC, misc, value);
+ default:
+ return -EINVAL;
+ return 1;
+}
+
-+__setup("vsdebug=", vs_debug_setup);
++__setup("vsdebug=", vs_debug_setup);
++
++
++
++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 -urNp -x '*.orig' linux-4.9/kernel/vserver/tag.c linux-4.9/kernel/vserver/tag.c
+--- linux-4.9/kernel/vserver/tag.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/kernel/vserver/tag.c 2021-02-24 15:47:45.127744035 +0100
+@@ -0,0 +1,63 @@
++/*
++ * linux/kernel/vserver/tag.c
++ *
++ * Virtual Server: Shallow Tag Space
++ *
++ * Copyright (C) 2007 Herbert P?tzl
++ *
++ * V0.01 basic implementation
++ *
++ */
++
++#include <linux/sched.h>
++#include <linux/vserver/debug.h>
++#include <linux/vs_pid.h>
++#include <linux/vs_tag.h>
++
++#include <linux/vserver/tag_cmd.h>
++
++
++int dx_migrate_task(struct task_struct *p, vtag_t tag)
++{
++ if (!p)
++ BUG();
++
++ vxdprintk(VXD_CBIT(tag, 5),
++ "dx_migrate_task(%p[#%d],#%d)", p, p->tag, tag);
++
++ task_lock(p);
++ p->tag = tag;
++ task_unlock(p);
++
++ vxdprintk(VXD_CBIT(tag, 5),
++ "moved task %p into [#%d]", p, tag);
++ return 0;
++}
++
++/* vserver syscall commands below here */
++
++/* taks xid and vx_info functions */
++
++
++int vc_task_tag(uint32_t id)
++{
++ vtag_t tag;
++
++ if (id) {
++ struct task_struct *tsk;
++ rcu_read_lock();
++ tsk = find_task_by_real_pid(id);
++ tag = (tsk) ? tsk->tag : -ESRCH;
++ rcu_read_unlock();
++ } else
++ tag = dx_current_tag();
++ return tag;
++}
++
++
++int vc_tag_migrate(uint32_t tag)
++{
++ return dx_migrate_task(current, tag & 0xFFFF);
++}
+
+
+diff -urNp -x '*.orig' linux-4.9/kernel/vserver/vci_config.h linux-4.9/kernel/vserver/vci_config.h
+--- linux-4.9/kernel/vserver/vci_config.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/kernel/vserver/vci_config.h 2021-02-24 15:47:45.127744035 +0100
+@@ -0,0 +1,80 @@
+
-+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_misc);
++/* interface version */
++
++#define VCI_VERSION 0x00020308
+
-diff -NurpP --minimal linux-2.6.19.1/kernel/vserver/vci_config.h linux-2.6.19.1-vs2.3.0.6/kernel/vserver/vci_config.h
---- linux-2.6.19.1/kernel/vserver/vci_config.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/kernel/vserver/vci_config.h 2006-12-17 04:40:29 +0100
-@@ -0,0 +1,74 @@
+
+enum {
+ VCI_KCBIT_NO_DYNAMIC = 0,
-+ VCI_KCBIT_LEGACY = 1,
-+ VCI_KCBIT_LEGACYNET = 2,
-+ VCI_KCBIT_NGNET = 3,
+
+ 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_LEGACY_VERSION = 15,
+ VCI_KCBIT_DEBUG = 16,
+ VCI_KCBIT_HISTORY = 20,
+ VCI_KCBIT_TAGGED = 24,
++ VCI_KCBIT_PPTAG = 28,
++
++ VCI_KCBIT_MORE = 31,
+};
+
+
+{
+ return
+ (1 << VCI_KCBIT_NO_DYNAMIC) |
-+ (1 << VCI_KCBIT_NGNET) |
+
+ /* configured features */
+#ifdef CONFIG_VSERVER_PROC_SECURE
+ (1 << VCI_KCBIT_PROC_SECURE) |
+#endif
-+#ifdef CONFIG_VSERVER_HARDCPU
-+ (1 << VCI_KCBIT_HARDCPU) |
-+#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_MEMCG
++ (1 << VCI_KCBIT_MEMCG) |
++#endif
++#ifdef CONFIG_MEMCG_SWAP
++ (1 << VCI_KCBIT_MEMCG_SWAP) |
++#endif
+
+ /* debug options */
+#ifdef CONFIG_VSERVER_DEBUG
+#ifdef CONFIG_VSERVER_HISTORY
+ (1 << VCI_KCBIT_HISTORY) |
+#endif
++
+ /* inode context tagging */
+#if defined(CONFIG_TAGGING_NONE)
+ (0 << VCI_KCBIT_TAGGED) |
+#else
+ (7 << VCI_KCBIT_TAGGED) |
+#endif
++ (1 << VCI_KCBIT_PPTAG) |
+ 0;
+}
+
-diff -NurpP --minimal linux-2.6.19.1/mm/filemap.c linux-2.6.19.1-vs2.3.0.6/mm/filemap.c
---- linux-2.6.19.1/mm/filemap.c 2006-11-30 21:19:44 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/mm/filemap.c 2006-11-08 22:42:35 +0100
-@@ -1236,6 +1236,31 @@ int file_send_actor(read_descriptor_t *
- return written;
+diff -urNp -x '*.orig' linux-4.9/mm/memcontrol.c linux-4.9/mm/memcontrol.c
+--- linux-4.9/mm/memcontrol.c 2021-02-24 15:47:32.527349847 +0100
++++ linux-4.9/mm/memcontrol.c 2021-02-24 15:47:45.127744035 +0100
+@@ -2873,6 +2873,41 @@ static u64 mem_cgroup_read_u64(struct cg
+ }
}
-+/* FIXME: It would be as simple as this, if we had a (void __user*) to write.
-+ * We already have a kernel buffer, so it should be even simpler, right? ;)
-+ *
-+ * Yes, sorta. After duplicating the complete path of generic_file_write(),
-+ * at least some special cases could be removed, so the copy is simpler than
-+ * the original. But it remains a copy, so overall complexity increases.
-+ */
-+static ssize_t
-+generic_kernel_file_write(struct file *, const char *, size_t, loff_t *);
-+
-+ssize_t generic_file_sendpage(struct file *file, struct page *page,
-+ int offset, size_t size, loff_t *ppos, int more)
++unsigned long mem_cgroup_mem_usage_pages(struct mem_cgroup *memcg)
+{
-+ ssize_t ret;
-+ char *kaddr;
-+
-+ kaddr = kmap(page);
-+ ret = generic_kernel_file_write(file, kaddr + offset, size, ppos);
-+ kunmap(page);
-+
-+ return ret;
++ return mem_cgroup_usage(memcg, false);
+}
+
-+EXPORT_SYMBOL(generic_file_sendpage);
-+
- ssize_t generic_file_sendfile(struct file *in_file, loff_t *ppos,
- size_t count, read_actor_t actor, void *target)
- {
-@@ -1913,6 +1938,19 @@ int remove_suid(struct dentry *dentry)
- }
- EXPORT_SYMBOL(remove_suid);
-
-+static inline size_t
-+filemap_copy_from_kernel(struct page *page, unsigned long offset,
-+ const char *buf, unsigned bytes)
++unsigned long mem_cgroup_mem_limit_pages(struct mem_cgroup *memcg)
+{
-+ char *kaddr;
-+
-+ kaddr = kmap(page);
-+ memcpy(kaddr + offset, buf, bytes);
-+ kunmap(page);
-+
-+ return bytes;
++ return memcg->memory.limit;
+}
+
- size_t
- __filemap_copy_from_user_iovec_inatomic(char *vaddr,
- const struct iovec *iov, size_t base, size_t bytes)
-@@ -2219,6 +2257,175 @@ zero_length_segment:
- }
- EXPORT_SYMBOL(generic_file_buffered_write);
-
-+static inline void
-+filemap_set_next_kvec(const struct kvec **iovp, size_t *basep, size_t bytes)
++unsigned long mem_cgroup_memsw_usage_pages(struct mem_cgroup *memcg)
+{
-+ const struct kvec *iov = *iovp;
-+ size_t base = *basep;
-+
-+ while (bytes) {
-+ int copy = min(bytes, iov->iov_len - base);
-+
-+ bytes -= copy;
-+ base += copy;
-+ if (iov->iov_len == base) {
-+ iov++;
-+ base = 0;
-+ }
-+ }
-+ *iovp = iov;
-+ *basep = base;
-+}
-+
-+/*
-+ * TODO:
-+ * This largely tries to copy generic_file_aio_write_nolock(), although it
-+ * doesn't have to be nearly as generic. A real cleanup should either
-+ * merge this into generic_file_aio_write_nolock() as well or keep it special
-+ * and remove as much code as possible.
-+ */
-+static ssize_t
-+generic_kernel_file_aio_write_nolock(struct kiocb *iocb, const struct kvec*iov,
-+ unsigned long nr_segs, loff_t *ppos)
-+{
-+ struct file *file = iocb->ki_filp;
-+ struct address_space * mapping = file->f_mapping;
-+ const struct address_space_operations *a_ops = mapping->a_ops;
-+ size_t ocount; /* original count */
-+ size_t count; /* after file limit checks */
-+ struct inode *inode = mapping->host;
-+ long status = 0;
-+ loff_t pos;
-+ struct page *page;
-+ struct page *cached_page = NULL;
-+ const int isblk = S_ISBLK(inode->i_mode);
-+ ssize_t written;
-+ ssize_t err;
-+ size_t bytes;
-+ struct pagevec lru_pvec;
-+ const struct kvec *cur_iov = iov; /* current kvec */
-+ size_t iov_base = 0; /* offset in the current kvec */
-+ unsigned long seg;
-+ char *buf;
-+
-+ ocount = 0;
-+ for (seg = 0; seg < nr_segs; seg++) {
-+ const struct kvec *iv = &iov[seg];
-+
-+ /*
-+ * If any segment has a negative length, or the cumulative
-+ * length ever wraps negative then return -EINVAL.
-+ */
-+ ocount += iv->iov_len;
-+ if (unlikely((ssize_t)(ocount|iv->iov_len) < 0))
-+ return -EINVAL;
-+ }
-+
-+ count = ocount;
-+ pos = *ppos;
-+ pagevec_init(&lru_pvec, 0);
-+
-+ /* We can write back this queue in page reclaim */
-+ current->backing_dev_info = mapping->backing_dev_info;
-+ written = 0;
-+
-+ err = generic_write_checks(file, &pos, &count, isblk);
-+ if (err)
-+ goto out;
-+
-+
-+ if (count == 0)
-+ goto out;
-+
-+ remove_suid(file->f_dentry);
-+ file_update_time(file);
-+
-+ /* There is no sane reason to use O_DIRECT */
-+ BUG_ON(file->f_flags & O_DIRECT);
-+
-+ buf = iov->iov_base;
-+ do {
-+ unsigned long index;
-+ unsigned long offset;
-+ size_t copied;
-+
-+ offset = (pos & (PAGE_CACHE_SIZE -1)); /* Within page */
-+ index = pos >> PAGE_CACHE_SHIFT;
-+ bytes = PAGE_CACHE_SIZE - offset;
-+ if (bytes > count)
-+ bytes = count;
-+
-+ page = __grab_cache_page(mapping,index,&cached_page,&lru_pvec);
-+ if (!page) {
-+ status = -ENOMEM;
-+ break;
-+ }
-+
-+ status = a_ops->prepare_write(file, page, offset, offset+bytes);
-+ if (unlikely(status)) {
-+ loff_t isize = i_size_read(inode);
-+ /*
-+ * prepare_write() may have instantiated a few blocks
-+ * outside i_size. Trim these off again.
-+ */
-+ unlock_page(page);
-+ page_cache_release(page);
-+ if (pos + bytes > isize)
-+ vmtruncate(inode, isize);
-+ break;
-+ }
-+
-+ BUG_ON(nr_segs != 1);
-+ copied = filemap_copy_from_kernel(page, offset, buf, bytes);
-+
-+ flush_dcache_page(page);
-+ status = a_ops->commit_write(file, page, offset, offset+bytes);
-+ if (likely(copied > 0)) {
-+ if (!status)
-+ status = copied;
-+
-+ if (status >= 0) {
-+ written += status;
-+ count -= status;
-+ pos += status;
-+ buf += status;
-+ if (unlikely(nr_segs > 1))
-+ filemap_set_next_kvec(&cur_iov,
-+ &iov_base, status);
-+ }
-+ }
-+ if (unlikely(copied != bytes))
-+ if (status >= 0)
-+ status = -EFAULT;
-+ unlock_page(page);
-+ mark_page_accessed(page);
-+ page_cache_release(page);
-+ if (status < 0)
-+ break;
-+ balance_dirty_pages_ratelimited(mapping);
-+ cond_resched();
-+ } while (count);
-+ *ppos = pos;
-+
-+ if (cached_page)
-+ page_cache_release(cached_page);
-+
-+ /*
-+ * For now, when the user asks for O_SYNC, we'll actually give O_DSYNC
-+ */
-+ if (status >= 0) {
-+ if ((file->f_flags & O_SYNC) || IS_SYNC(inode))
-+ status = generic_osync_inode(inode, mapping,
-+ OSYNC_METADATA|OSYNC_DATA);
-+ }
-+
-+ err = written ? written : status;
-+out:
-+ pagevec_lru_add(&lru_pvec);
-+ current->backing_dev_info = 0;
-+ return err;
++ return mem_cgroup_usage(memcg, true);
+}
+
- static ssize_t
- __generic_file_aio_write_nolock(struct kiocb *iocb, const struct iovec *iov,
- unsigned long nr_segs, loff_t *ppos)
-@@ -2335,6 +2542,36 @@ out:
- return written ? written : err;
- }
-
-+static ssize_t
-+generic_kernel_file_write_nolock(struct file *file, const struct kvec *iov,
-+ unsigned long nr_segs, loff_t *ppos)
++unsigned long mem_cgroup_memsw_limit_pages(struct mem_cgroup *memcg)
+{
-+ struct kiocb kiocb;
-+ ssize_t ret;
-+
-+ init_sync_kiocb(&kiocb, file);
-+ ret = generic_kernel_file_aio_write_nolock(&kiocb, iov, nr_segs, ppos);
-+ if (ret == -EIOCBQUEUED)
-+ ret = wait_on_sync_kiocb(&kiocb);
-+ return ret;
++ return memcg->memsw.limit;
+}
+
-+static ssize_t generic_kernel_file_write(struct file *file, const char *buf,
-+ size_t count, loff_t *ppos)
++void dump_mem_cgroup(struct mem_cgroup *memcg)
+{
-+ struct inode *inode = file->f_mapping->host;
-+ ssize_t err;
-+ struct kvec local_iov = { .iov_base = (char *) buf,
-+ .iov_len = count };
-+
-+ mutex_lock(&inode->i_mutex);
-+ err = generic_kernel_file_write_nolock(file, &local_iov, 1, ppos);
-+ mutex_unlock(&inode->i_mutex);
-+
-+ return err;
++ printk(KERN_INFO "memcg: %p/%d:\n"
++ "\tmemory:\t%lu/%lu %lu/%lu\n"
++ "\tmemsw:\t%lu/%lu %lu/%lu\n"
++ "\tkmem:\t%lu/%lu %lu/%lu\n",
++ memcg, memcg->id.id,
++ page_counter_read(&memcg->memory), memcg->memory.limit,
++ memcg->memory.watermark, memcg->memory.failcnt,
++ page_counter_read(&memcg->memsw), memcg->memsw.limit,
++ memcg->memsw.watermark, memcg->memsw.failcnt,
++ page_counter_read(&memcg->kmem), memcg->kmem.limit,
++ memcg->kmem.watermark, memcg->kmem.failcnt);
+}
+
-+
- ssize_t generic_file_aio_write_nolock(struct kiocb *iocb,
- const struct iovec *iov, unsigned long nr_segs, loff_t pos)
+ #ifndef CONFIG_SLOB
+ static int memcg_online_kmem(struct mem_cgroup *memcg)
{
-diff -NurpP --minimal linux-2.6.19.1/mm/filemap_xip.c linux-2.6.19.1-vs2.3.0.6/mm/filemap_xip.c
---- linux-2.6.19.1/mm/filemap_xip.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/mm/filemap_xip.c 2006-11-08 04:57:40 +0100
-@@ -13,6 +13,7 @@
- #include <linux/module.h>
- #include <linux/uio.h>
- #include <linux/rmap.h>
-+#include <linux/vs_memory.h>
- #include <asm/tlbflush.h>
- #include "filemap.h"
-
-diff -NurpP --minimal linux-2.6.19.1/mm/fremap.c linux-2.6.19.1-vs2.3.0.6/mm/fremap.c
---- linux-2.6.19.1/mm/fremap.c 2006-11-30 21:19:44 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/mm/fremap.c 2006-11-30 19:31:41 +0100
-@@ -15,6 +15,7 @@
- #include <linux/rmap.h>
- #include <linux/module.h>
- #include <linux/syscalls.h>
-+#include <linux/vs_memory.h>
-
- #include <asm/mmu_context.h>
- #include <asm/cacheflush.h>
-@@ -74,6 +75,8 @@ int install_page(struct mm_struct *mm, s
- err = -ENOMEM;
- if (page_mapcount(page) > INT_MAX/2)
- goto unlock;
-+ if (!vx_rss_avail(mm, 1))
-+ goto unlock;
-
- if (pte_none(*pte) || !zap_pte(mm, vma, addr, pte))
- inc_mm_counter(mm, file_rss);
-diff -NurpP --minimal linux-2.6.19.1/mm/hugetlb.c linux-2.6.19.1-vs2.3.0.6/mm/hugetlb.c
---- linux-2.6.19.1/mm/hugetlb.c 2006-11-30 21:19:44 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/mm/hugetlb.c 2006-11-08 04:57:40 +0100
-@@ -19,6 +19,7 @@
- #include <asm/pgtable.h>
+diff -urNp -x '*.orig' linux-4.9/mm/oom_kill.c linux-4.9/mm/oom_kill.c
+--- linux-4.9/mm/oom_kill.c 2021-02-24 15:47:32.534016722 +0100
++++ linux-4.9/mm/oom_kill.c 2021-02-24 15:47:45.127744035 +0100
+@@ -38,6 +38,8 @@
+ #include <linux/kthread.h>
+ #include <linux/init.h>
+ #include <linux/mmu_notifier.h>
++#include <linux/reboot.h>
++#include <linux/vs_context.h>
- #include <linux/hugetlb.h>
-+#include <linux/vs_memory.h>
+ #include <asm/tlb.h>
#include "internal.h"
-
- const unsigned long hugetlb_zero = 0, hugetlb_infinity = ~0UL;
-diff -NurpP --minimal linux-2.6.19.1/mm/memory.c linux-2.6.19.1-vs2.3.0.6/mm/memory.c
---- linux-2.6.19.1/mm/memory.c 2006-11-30 21:19:44 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/mm/memory.c 2006-11-30 19:31:41 +0100
-@@ -498,6 +498,9 @@ static int copy_pte_range(struct mm_stru
- int progress = 0;
- int rss[2];
-
-+ if (!vx_rss_avail(dst_mm, ((end - addr)/PAGE_SIZE + 1)))
-+ return -ENOMEM;
-+
- again:
- rss[1] = rss[0] = 0;
- dst_pte = pte_alloc_map_lock(dst_mm, dst_pmd, addr, &dst_ptl);
-@@ -2011,6 +2014,11 @@ static int do_swap_page(struct mm_struct
- grab_swap_token();
- }
-
-+ if (!vx_rss_avail(mm, 1)) {
-+ ret = VM_FAULT_OOM;
-+ goto out;
-+ }
-+
- delayacct_clear_flag(DELAYACCT_PF_SWAPIN);
- mark_page_accessed(page);
- lock_page(page);
-@@ -2083,6 +2091,8 @@ static int do_anonymous_page(struct mm_s
- /* Allocate our own private page. */
- pte_unmap(page_table);
-
-+ if (!vx_rss_avail(mm, 1))
-+ goto oom;
- if (unlikely(anon_vma_prepare(vma)))
- goto oom;
- page = alloc_zeroed_user_highpage(vma, address);
-@@ -2156,6 +2166,9 @@ static int do_no_page(struct mm_struct *
- pte_unmap(page_table);
- BUG_ON(vma->vm_flags & VM_PFNMAP);
-
-+ if (!vx_rss_avail(mm, 1))
-+ return VM_FAULT_OOM;
-+
- if (vma->vm_file) {
- mapping = vma->vm_file->f_mapping;
- sequence = mapping->truncate_count;
-@@ -2380,6 +2393,7 @@ static inline int handle_pte_fault(struc
- pte_t entry;
- pte_t old_entry;
- spinlock_t *ptl;
-+ int ret, type = VXPT_UNKNOWN;
-
- old_entry = entry = *pte;
- if (!pte_present(entry)) {
-@@ -2408,9 +2422,12 @@ static inline int handle_pte_fault(struc
- if (unlikely(!pte_same(*pte, entry)))
- goto unlock;
- if (write_access) {
-- 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);
-@@ -2430,7 +2447,10 @@ static inline int handle_pte_fault(struc
- }
- unlock:
- pte_unmap_unlock(pte, ptl);
-- return VM_FAULT_MINOR;
-+ ret = VM_FAULT_MINOR;
-+out:
-+ vx_page_fault(mm, vma, type, ret);
-+ return ret;
- }
-
- /*
-diff -NurpP --minimal linux-2.6.19.1/mm/mlock.c linux-2.6.19.1-vs2.3.0.6/mm/mlock.c
---- linux-2.6.19.1/mm/mlock.c 2006-04-09 13:49:58 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/mm/mlock.c 2006-11-08 04:57:47 +0100
-@@ -10,6 +10,7 @@
- #include <linux/mm.h>
- #include <linux/mempolicy.h>
- #include <linux/syscalls.h>
-+#include <linux/vs_memory.h>
-
-
- static int mlock_fixup(struct vm_area_struct *vma, struct vm_area_struct **prev,
-@@ -65,7 +66,7 @@ success:
- ret = make_pages_present(start, end);
- }
-
-- vma->vm_mm->locked_vm -= pages;
-+ vx_vmlocked_sub(vma->vm_mm, pages);
- out:
- if (ret == -ENOMEM)
- ret = -EAGAIN;
-@@ -123,7 +124,7 @@ static int do_mlock(unsigned long start,
-
- asmlinkage long sys_mlock(unsigned long start, size_t len)
+@@ -142,11 +144,18 @@ static inline bool is_memcg_oom(struct o
+ static bool oom_unkillable_task(struct task_struct *p,
+ struct mem_cgroup *memcg, const nodemask_t *nodemask)
{
-- unsigned long locked;
-+ unsigned long locked, grow;
- unsigned long lock_limit;
- int error = -ENOMEM;
-
-@@ -134,8 +135,10 @@ asmlinkage long sys_mlock(unsigned long
- len = PAGE_ALIGN(len + (start & ~PAGE_MASK));
- start &= PAGE_MASK;
-
-- locked = len >> PAGE_SHIFT;
-- locked += current->mm->locked_vm;
-+ grow = len >> PAGE_SHIFT;
-+ if (!vx_vmlocked_avail(current->mm, grow))
-+ goto out;
-+ locked = current->mm->locked_vm + grow;
-
- lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur;
- lock_limit >>= PAGE_SHIFT;
-@@ -143,6 +146,7 @@ asmlinkage long sys_mlock(unsigned long
- /* check against resource limits */
- if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
- error = do_mlock(start, len, 1);
-+out:
- up_write(¤t->mm->mmap_sem);
- return error;
- }
-@@ -202,6 +206,8 @@ asmlinkage long sys_mlockall(int flags)
- lock_limit >>= PAGE_SHIFT;
-
- ret = -ENOMEM;
-+ if (!vx_vmlocked_avail(current->mm, current->mm->total_vm))
-+ goto out;
- if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
- capable(CAP_IPC_LOCK))
- ret = do_mlockall(flags);
-diff -NurpP --minimal linux-2.6.19.1/mm/mmap.c linux-2.6.19.1-vs2.3.0.6/mm/mmap.c
---- linux-2.6.19.1/mm/mmap.c 2006-11-30 21:19:44 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/mm/mmap.c 2006-11-20 21:12:32 +0100
-@@ -1141,10 +1141,10 @@ munmap_back:
- kmem_cache_free(vm_area_cachep, vma);
- }
- out:
-- mm->total_vm += len >> PAGE_SHIFT;
-+ vx_vmpages_add(mm, len >> PAGE_SHIFT);
- vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
- if (vm_flags & VM_LOCKED) {
-- mm->locked_vm += len >> PAGE_SHIFT;
-+ vx_vmlocked_add(mm, len >> PAGE_SHIFT);
- make_pages_present(addr, addr + len);
- }
- if (flags & MAP_POPULATE) {
-@@ -1504,9 +1504,9 @@ static int acct_stack_growth(struct vm_a
- return -ENOMEM;
-
- /* Ok, everything looks good - let it rip */
-- mm->total_vm += grow;
-+ vx_vmpages_add(mm, grow);
- if (vma->vm_flags & VM_LOCKED)
-- mm->locked_vm += grow;
-+ vx_vmlocked_add(mm, grow);
- vm_stat_account(mm, vma->vm_flags, vma->vm_file, grow);
- return 0;
- }
-@@ -1659,9 +1659,9 @@ static void remove_vma_list(struct mm_st
- do {
- long nrpages = vma_pages(vma);
-
-- mm->total_vm -= nrpages;
-+ vx_vmpages_sub(mm, nrpages);
- if (vma->vm_flags & VM_LOCKED)
-- mm->locked_vm -= nrpages;
-+ vx_vmlocked_sub(mm, nrpages);
- vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
- vma = remove_vma(vma);
- } while (vma);
-@@ -1900,6 +1900,8 @@ unsigned long do_brk(unsigned long addr,
- lock_limit >>= PAGE_SHIFT;
- if (locked > lock_limit && !capable(CAP_IPC_LOCK))
- return -EAGAIN;
-+ if (!vx_vmlocked_avail(mm, len >> PAGE_SHIFT))
-+ return -ENOMEM;
- }
-
- /*
-@@ -1926,7 +1928,8 @@ unsigned long do_brk(unsigned long addr,
- if (mm->map_count > sysctl_max_map_count)
- return -ENOMEM;
-
-- if (security_vm_enough_memory(len >> PAGE_SHIFT))
-+ if (security_vm_enough_memory(len >> PAGE_SHIFT) ||
-+ !vx_vmpages_avail(mm, len >> PAGE_SHIFT))
- return -ENOMEM;
-
- /* Can we just expand an old private anonymous mapping? */
-@@ -1952,9 +1955,9 @@ unsigned long do_brk(unsigned long addr,
- (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)];
- vma_link(mm, vma, prev, rb_link, rb_parent);
- out:
-- mm->total_vm += len >> PAGE_SHIFT;
-+ vx_vmpages_add(mm, len >> PAGE_SHIFT);
- if (flags & VM_LOCKED) {
-- mm->locked_vm += len >> PAGE_SHIFT;
-+ vx_vmlocked_add(mm, len >> PAGE_SHIFT);
- make_pages_present(addr, addr + len);
- }
- return addr;
-@@ -1980,6 +1983,11 @@ void exit_mmap(struct mm_struct *mm)
- free_pgtables(&tlb, vma, FIRST_USER_ADDRESS, 0);
- tlb_finish_mmu(tlb, 0, end);
-
-+ set_mm_counter(mm, file_rss, 0);
-+ set_mm_counter(mm, anon_rss, 0);
-+ vx_vmpages_sub(mm, mm->total_vm);
-+ vx_vmlocked_sub(mm, mm->locked_vm);
-+
- /*
- * Walk the list again, actually closing and freeing it,
- * with preemption enabled, without holding any MM locks.
-@@ -2019,7 +2027,8 @@ int insert_vm_struct(struct mm_struct *
- if (__vma && __vma->vm_start < vma->vm_end)
- return -ENOMEM;
- if ((vma->vm_flags & VM_ACCOUNT) &&
-- security_vm_enough_memory(vma_pages(vma)))
-+ (security_vm_enough_memory(vma_pages(vma)) ||
-+ !vx_vmpages_avail(mm, vma_pages(vma))))
- return -ENOMEM;
- vma_link(mm, vma, prev, rb_link, rb_parent);
- return 0;
-@@ -2092,5 +2101,7 @@ int may_expand_vm(struct mm_struct *mm,
-
- if (cur + npages > lim)
- return 0;
-+ if (!vx_vmpages_avail(mm, npages))
-+ return 0;
- return 1;
- }
-diff -NurpP --minimal linux-2.6.19.1/mm/mremap.c linux-2.6.19.1-vs2.3.0.6/mm/mremap.c
---- linux-2.6.19.1/mm/mremap.c 2006-11-30 21:19:44 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/mm/mremap.c 2006-11-08 04:57:47 +0100
-@@ -18,6 +18,7 @@
- #include <linux/highmem.h>
- #include <linux/security.h>
- #include <linux/syscalls.h>
-+#include <linux/vs_memory.h>
-
- #include <asm/uaccess.h>
- #include <asm/cacheflush.h>
-@@ -213,7 +214,7 @@ static unsigned long move_vma(struct vm_
- * If this were a serious issue, we'd add a flag to do_munmap().
- */
- hiwater_vm = mm->hiwater_vm;
-- mm->total_vm += new_len >> PAGE_SHIFT;
-+ vx_vmpages_add(mm, new_len >> PAGE_SHIFT);
- vm_stat_account(mm, vma->vm_flags, vma->vm_file, new_len>>PAGE_SHIFT);
-
- if (do_munmap(mm, old_addr, old_len) < 0) {
-@@ -231,7 +232,7 @@ static unsigned long move_vma(struct vm_
- }
-
- if (vm_flags & VM_LOCKED) {
-- mm->locked_vm += new_len >> PAGE_SHIFT;
-+ vx_vmlocked_add(mm, new_len >> PAGE_SHIFT);
- if (new_len > old_len)
- make_pages_present(new_addr + old_len,
- new_addr + new_len);
-@@ -338,6 +339,9 @@ unsigned long do_mremap(unsigned long ad
- ret = -EAGAIN;
- if (locked > lock_limit && !capable(CAP_IPC_LOCK))
- goto out;
-+ if (!vx_vmlocked_avail(current->mm,
-+ (new_len - old_len) >> PAGE_SHIFT))
-+ goto out;
- }
- if (!may_expand_vm(mm, (new_len - old_len) >> PAGE_SHIFT)) {
- ret = -ENOMEM;
-@@ -366,10 +370,10 @@ unsigned long do_mremap(unsigned long ad
- vma_adjust(vma, vma->vm_start,
- addr + new_len, vma->vm_pgoff, NULL);
-
-- mm->total_vm += pages;
-+ vx_vmpages_add(mm, pages);
- vm_stat_account(mm, vma->vm_flags, vma->vm_file, pages);
- if (vma->vm_flags & VM_LOCKED) {
-- mm->locked_vm += pages;
-+ vx_vmlocked_add(mm, pages);
- make_pages_present(addr + old_len,
- addr + new_len);
- }
-diff -NurpP --minimal linux-2.6.19.1/mm/nommu.c linux-2.6.19.1-vs2.3.0.6/mm/nommu.c
---- linux-2.6.19.1/mm/nommu.c 2006-11-30 21:19:44 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/mm/nommu.c 2006-11-08 04:57:47 +0100
-@@ -921,7 +921,7 @@ unsigned long do_mmap_pgoff(struct file
- realalloc += kobjsize(vma);
- askedalloc += sizeof(*vma);
-
-- current->mm->total_vm += len >> PAGE_SHIFT;
-+ vx_vmpages_add(current->mm, len >> PAGE_SHIFT);
-
- add_nommu_vma(vma);
-
-@@ -1046,7 +1046,7 @@ int do_munmap(struct mm_struct *mm, unsi
- kfree(vml);
-
- update_hiwater_vm(mm);
-- mm->total_vm -= len >> PAGE_SHIFT;
-+ vx_vmpages_sub(mm, len >> PAGE_SHIFT);
-
- #ifdef DEBUG
- show_process_blocks();
-@@ -1078,7 +1078,7 @@ void exit_mmap(struct mm_struct * mm)
- printk("Exit_mmap:\n");
- #endif
-
-- mm->total_vm = 0;
-+ vx_vmpages_sub(mm, mm->total_vm);
-
- while ((tmp = mm->context.vmlist)) {
- mm->context.vmlist = tmp->next;
-diff -NurpP --minimal linux-2.6.19.1/mm/oom_kill.c linux-2.6.19.1-vs2.3.0.6/mm/oom_kill.c
---- linux-2.6.19.1/mm/oom_kill.c 2006-11-30 21:19:44 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/mm/oom_kill.c 2006-11-30 19:33:42 +0100
-@@ -24,6 +24,7 @@
- #include <linux/cpuset.h>
- #include <linux/module.h>
- #include <linux/notifier.h>
-+#include <linux/vs_memory.h>
-
- int sysctl_panic_on_oom;
- /* #define DEBUG */
-@@ -72,6 +73,12 @@ unsigned long badness(struct task_struct
- points = mm->total_vm;
+- if (is_global_init(p))
++ unsigned xid = vx_current_xid();
++
++ /* skip the init task, global and per guest */
++ if (task_is_init(p))
+ return true;
+ if (p->flags & PF_KTHREAD)
+ return true;
+
++ /* skip other guest and host processes if oom in guest */
++ if (xid && vx_task_xid(p) != xid)
++ return true;
++
+ /* When mem_cgroup_out_of_memory() and p is not member of the group */
+ if (memcg && !task_in_mem_cgroup(p, memcg))
+ return true;
+@@ -851,8 +860,8 @@ static void oom_kill_process(struct oom_
+ if (__ratelimit(&oom_rs))
+ dump_header(oc, p);
+
+- pr_err("%s: Kill process %d (%s) score %u or sacrifice child\n",
+- message, task_pid_nr(p), p->comm, points);
++ pr_err("%s: Kill process %d:#%u (%s) score %d or sacrifice child\n",
++ message, task_pid_nr(p), p->xid, p->comm, points);
/*
-+ * add points for context badness
-+ */
-+
-+ points += vx_badness(p, mm);
-+
-+ /*
- * After this unlock we can no longer dereference local variable `mm'
+ * If any of p's children has a different mm and is eligible for kill,
+@@ -910,8 +919,8 @@ static void oom_kill_process(struct oom_
*/
- task_unlock(p);
-@@ -154,8 +161,8 @@ unsigned long badness(struct task_struct
- }
-
- #ifdef DEBUG
-- printk(KERN_DEBUG "OOMkill: task %d (%s) got %d points\n",
-- p->pid, p->comm, points);
-+ printk(KERN_DEBUG "OOMkill: task %d:#%u (%s) got %d points\n",
-+ p->pid, p->xid, p->comm, points);
- #endif
- return points;
+ do_send_sig_info(SIGKILL, SEND_SIG_FORCED, victim, true);
+ mark_oom_victim(victim);
+- pr_err("Killed process %d (%s) total-vm:%lukB, anon-rss:%lukB, file-rss:%lukB, shmem-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, shmem-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)),
+ K(get_mm_counter(victim->mm, MM_SHMEMPAGES)));
+@@ -958,6 +967,8 @@ static void oom_kill_process(struct oom_
}
-@@ -279,8 +286,8 @@ static void __oom_kill_task(struct task_
- }
-
- if (message) {
-- printk(KERN_ERR "%s: Killed process %d (%s).\n",
-- message, p->pid, p->comm);
-+ printk(KERN_ERR "%s: Killed process %d:#%u (%s).\n",
-+ message, p->pid, p->xid, p->comm);
- }
+ #undef K
- /*
-@@ -341,8 +348,8 @@ static int oom_kill_process(struct task_
- return 0;
++long vs_oom_action(unsigned int);
++
+ /*
+ * Determines whether the kernel must panic because of the panic_on_oom sysctl.
+ */
+@@ -1063,7 +1074,12 @@ bool out_of_memory(struct oom_control *o
+ /* Found nothing?!?! Either we hang forever, or we panic. */
+ if (!oc->chosen && !is_sysrq_oom(oc) && !is_memcg_oom(oc)) {
+ dump_header(oc, NULL);
+- panic("Out of memory and no killable processes...\n");
++
++ /* avoid panic for guest OOM */
++ if (vx_current_xid())
++ vs_oom_action(LINUX_REBOOT_CMD_OOM);
++ else
++ panic("Out of memory and no killable processes...\n");
}
-
-- printk(KERN_ERR "Out of Memory: Kill process %d (%s) score %li"
-- " and children.\n", p->pid, p->comm, points);
-+ printk(KERN_ERR "Out of Memory: Kill process %d:#%u (%s) score %li"
-+ " and children.\n", p->pid, p->xid, p->comm, points);
- /* Try to kill a child first */
- list_for_each(tsk, &p->children) {
- c = list_entry(tsk, struct task_struct, sibling);
-diff -NurpP --minimal linux-2.6.19.1/mm/page_alloc.c linux-2.6.19.1-vs2.3.0.6/mm/page_alloc.c
---- linux-2.6.19.1/mm/page_alloc.c 2006-11-30 21:19:44 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/mm/page_alloc.c 2006-11-30 20:55:45 +0100
-@@ -40,6 +40,8 @@
- #include <linux/sort.h>
- #include <linux/pfn.h>
- #include <linux/backing-dev.h>
+ if (oc->chosen && oc->chosen != (void *)-1UL) {
+ oom_kill_process(oc, !is_memcg_oom(oc) ? "Out of memory" :
+diff -urNp -x '*.orig' linux-4.9/mm/page_alloc.c linux-4.9/mm/page_alloc.c
+--- linux-4.9/mm/page_alloc.c 2021-02-24 15:47:32.534016722 +0100
++++ linux-4.9/mm/page_alloc.c 2021-02-24 15:47:45.127744035 +0100
+@@ -65,6 +65,8 @@
+ #include <linux/kthread.h>
+ #include <linux/memcontrol.h>
+ #include <linux/khugepaged.h>
+#include <linux/vs_base.h>
+#include <linux/vs_limit.h>
+ #include <asm/sections.h>
#include <asm/tlbflush.h>
- #include <asm/div64.h>
-@@ -1274,6 +1276,9 @@ void si_meminfo(struct sysinfo *val)
+@@ -4171,14 +4173,17 @@ long si_mem_available(void)
+ */
+ pagecache = pages[LRU_ACTIVE_FILE] + pages[LRU_INACTIVE_FILE];
+ pagecache -= min(pagecache / 2, wmark_low);
+- available += pagecache;
++ if (!vx_flags(VXF_VIRT_MEM, 0))
++ available += pagecache;
+
+ /*
+ * Part of the reclaimable slab consists of items that are in use,
+ * and cannot be freed. Cap this estimate at the low watermark.
+ */
+- available += global_page_state(NR_SLAB_RECLAIMABLE) -
+- min(global_page_state(NR_SLAB_RECLAIMABLE) / 2, wmark_low);
++ if (!vx_flags(VXF_VIRT_MEM, 0))
++ available += global_page_state(NR_SLAB_RECLAIMABLE) -
++ min(global_page_state(NR_SLAB_RECLAIMABLE) / 2,
++ wmark_low);
+
+ if (available < 0)
+ available = 0;
+@@ -4195,6 +4200,9 @@ void si_meminfo(struct sysinfo *val)
val->totalhigh = totalhigh_pages;
val->freehigh = nr_free_highpages();
val->mem_unit = PAGE_SIZE;
}
EXPORT_SYMBOL(si_meminfo);
-@@ -1293,6 +1298,9 @@ void si_meminfo_node(struct sysinfo *val
- val->freehigh = 0;
+@@ -4229,6 +4237,9 @@ void si_meminfo_node(struct sysinfo *val
+ val->freehigh = free_highpages;
#endif
val->mem_unit = PAGE_SIZE;
+
}
#endif
-diff -NurpP --minimal linux-2.6.19.1/mm/rmap.c linux-2.6.19.1-vs2.3.0.6/mm/rmap.c
---- linux-2.6.19.1/mm/rmap.c 2006-11-30 21:19:44 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/mm/rmap.c 2006-11-08 04:57:40 +0100
-@@ -47,6 +47,7 @@
- #include <linux/rmap.h>
- #include <linux/rcupdate.h>
- #include <linux/module.h>
-+#include <linux/vs_memory.h>
-
- #include <asm/tlbflush.h>
-
-diff -NurpP --minimal linux-2.6.19.1/mm/shmem.c linux-2.6.19.1-vs2.3.0.6/mm/shmem.c
---- linux-2.6.19.1/mm/shmem.c 2006-11-30 21:19:44 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/mm/shmem.c 2006-11-08 04:57:53 +0100
-@@ -55,7 +55,6 @@
- #include <asm/pgtable.h>
-
- /* This magic number is used in glibc for posix shared memory */
--#define TMPFS_MAGIC 0x01021994
+diff -urNp -x '*.orig' linux-4.9/mm/pgtable-generic.c linux-4.9/mm/pgtable-generic.c
+--- linux-4.9/mm/pgtable-generic.c 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/mm/pgtable-generic.c 2021-02-24 15:47:45.127744035 +0100
+@@ -6,6 +6,8 @@
+ * Copyright (C) 2010 Linus Torvalds
+ */
- #define ENTRIES_PER_PAGE (PAGE_CACHE_SIZE/sizeof(unsigned long))
- #define ENTRIES_PER_PAGEPAGE (ENTRIES_PER_PAGE*ENTRIES_PER_PAGE)
-@@ -1658,7 +1657,7 @@ static int shmem_statfs(struct dentry *d
++#include <linux/mm.h>
++
+ #include <linux/pagemap.h>
+ #include <asm/tlb.h>
+ #include <asm-generic/pgtable.h>
+diff -urNp -x '*.orig' linux-4.9/mm/shmem.c linux-4.9/mm/shmem.c
+--- linux-4.9/mm/shmem.c 2021-02-24 15:47:32.537350160 +0100
++++ linux-4.9/mm/shmem.c 2021-02-24 15:47:45.127744035 +0100
+@@ -2806,7 +2806,7 @@ static int shmem_statfs(struct dentry *d
{
struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb);
- buf->f_type = TMPFS_MAGIC;
+ buf->f_type = TMPFS_SUPER_MAGIC;
- buf->f_bsize = PAGE_CACHE_SIZE;
+ buf->f_bsize = PAGE_SIZE;
buf->f_namelen = NAME_MAX;
- spin_lock(&sbinfo->stat_lock);
-@@ -2232,7 +2231,7 @@ static int shmem_fill_super(struct super
- sb->s_maxbytes = SHMEM_MAX_BYTES;
- sb->s_blocksize = PAGE_CACHE_SIZE;
- sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
+ if (sbinfo->max_blocks) {
+@@ -3631,7 +3631,7 @@ int shmem_fill_super(struct super_block
+ sb->s_maxbytes = MAX_LFS_FILESIZE;
+ sb->s_blocksize = PAGE_SIZE;
+ sb->s_blocksize_bits = PAGE_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.19.1/mm/slab.c linux-2.6.19.1-vs2.3.0.6/mm/slab.c
---- linux-2.6.19.1/mm/slab.c 2006-11-30 21:19:44 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/mm/slab.c 2006-11-08 21:52:09 +0100
-@@ -499,6 +499,8 @@ struct kmem_cache {
+ #ifdef CONFIG_TMPFS_XATTR
+diff -urNp -x '*.orig' linux-4.9/mm/slab.c linux-4.9/mm/slab.c
+--- linux-4.9/mm/slab.c 2021-02-24 15:47:32.537350160 +0100
++++ linux-4.9/mm/slab.c 2021-02-24 15:47:45.131077472 +0100
+@@ -307,6 +307,8 @@ static void kmem_cache_node_init(struct
#define STATS_INC_FREEMISS(x) do { } while (0)
#endif
#if DEBUG
/*
-@@ -3109,6 +3111,8 @@ static __always_inline void *__cache_all
- */
- if (NUMA_BUILD && !objp)
- objp = __cache_alloc_node(cachep, flags, numa_node_id());
-+
+@@ -3344,6 +3346,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);
- objp = cache_alloc_debugcheck_after(cachep, flags, objp,
- caller);
-@@ -3202,6 +3206,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);
-@@ -3339,6 +3344,7 @@ static inline void __cache_free(struct k
+ ptr = cache_alloc_debugcheck_after(cachep, flags, ptr, caller);
+@@ -3525,6 +3528,7 @@ void ___cache_free(struct kmem_cache *ca
check_irq_off();
- objp = cache_free_debugcheck(cachep, objp, __builtin_return_address(0));
+ kmemleak_free_recursive(objp, cachep->flags);
+ objp = cache_free_debugcheck(cachep, objp, caller);
+ vx_slab_free(cachep);
- if (cache_free_alien(cachep, objp))
- return;
-diff -NurpP --minimal linux-2.6.19.1/mm/slab_vs.h linux-2.6.19.1-vs2.3.0.6/mm/slab_vs.h
---- linux-2.6.19.1/mm/slab_vs.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/mm/slab_vs.h 2006-11-30 18:53:18 +0100
-@@ -0,0 +1,27 @@
+ kmemcheck_slab_free(cachep, objp, cachep->object_size);
+
+diff -urNp -x '*.orig' linux-4.9/mm/slab_vs.h linux-4.9/mm/slab_vs.h
+--- linux-4.9/mm/slab_vs.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.9/mm/slab_vs.h 2021-02-24 15:47:45.131077472 +0100
+@@ -0,0 +1,29 @@
+
+#include <linux/vserver/context.h>
+
+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 (!current->vx_info)
++ if (!vxi)
+ return;
+
-+ atomic_add(cachep->buffer_size, ¤t->vx_info->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 (!current->vx_info)
++ if (!vxi)
+ return;
+
-+ atomic_sub(cachep->buffer_size, ¤t->vx_info->cacct.slab[what]);
++ atomic_sub(cachep->size, &vxi->cacct.slab[what]);
+}
+
-diff -NurpP --minimal linux-2.6.19.1/mm/swapfile.c linux-2.6.19.1-vs2.3.0.6/mm/swapfile.c
---- linux-2.6.19.1/mm/swapfile.c 2006-11-30 21:19:44 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/mm/swapfile.c 2006-11-08 06:23:28 +0100
-@@ -31,6 +31,8 @@
- #include <asm/pgtable.h>
+diff -urNp -x '*.orig' linux-4.9/mm/swapfile.c linux-4.9/mm/swapfile.c
+--- linux-4.9/mm/swapfile.c 2021-02-24 15:47:32.540683597 +0100
++++ linux-4.9/mm/swapfile.c 2021-02-24 15:47:45.131077472 +0100
+@@ -39,6 +39,7 @@
#include <asm/tlbflush.h>
#include <linux/swapops.h>
+ #include <linux/swap_cgroup.h>
+#include <linux/vs_base.h>
-+#include <linux/vs_memory.h>
- DEFINE_SPINLOCK(swap_lock);
- unsigned int nr_swapfiles;
-@@ -1667,6 +1669,8 @@ void si_swapinfo(struct sysinfo *val)
- val->freeswap = nr_swap_pages + nr_to_be_unused;
- val->totalswap = total_swap_pages + nr_to_be_unused;
- spin_unlock(&swap_lock);
-+ if (vx_flags(VXF_VIRT_MEM, 0))
-+ vx_vsi_swapinfo(val);
- }
+ static bool swap_count_continued(struct swap_info_struct *, pgoff_t,
+ unsigned char);
+@@ -2083,6 +2084,16 @@ static int swap_show(struct seq_file *sw
+
+ if (si == SEQ_START_TOKEN) {
+ seq_puts(swap,"Filename\t\t\t\tType\t\tSize\tUsed\tPriority\n");
++ if (vx_flags(VXF_VIRT_MEM, 0)) {
++ struct sysinfo si = { 0 };
++
++ vx_vsi_swapinfo(&si);
++ if (si.totalswap < (1 << 10))
++ return 0;
++ seq_printf(swap, "%s\t\t\t\t\t%s\t%lu\t%lu\t%d\n",
++ "hdv0", "partition", si.totalswap >> 10,
++ (si.totalswap - si.freeswap) >> 10, -1);
++ }
+ return 0;
+ }
+
+@@ -2630,6 +2641,8 @@ void si_swapinfo(struct sysinfo *val)
+ val->freeswap = atomic_long_read(&nr_swap_pages) + nr_to_be_unused;
+ val->totalswap = total_swap_pages + nr_to_be_unused;
+ spin_unlock(&swap_lock);
++ if (vx_flags(VXF_VIRT_MEM, 0))
++ vx_vsi_swapinfo(val);
+ }
+
+ /*
+diff -urNp -x '*.orig' linux-4.9/net/bridge/br_multicast.c linux-4.9/net/bridge/br_multicast.c
+--- linux-4.9/net/bridge/br_multicast.c 2021-02-24 15:47:32.564017661 +0100
++++ linux-4.9/net/bridge/br_multicast.c 2021-02-24 15:47:45.131077472 +0100
+@@ -465,7 +465,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);
+ br->has_ipv6_addr = 0;
+ return NULL;
+diff -urNp -x '*.orig' linux-4.9/net/core/dev.c linux-4.9/net/core/dev.c
+--- linux-4.9/net/core/dev.c 2021-02-24 15:47:33.077367054 +0100
++++ linux-4.9/net/core/dev.c 2021-02-24 15:47:45.131077472 +0100
+@@ -127,6 +127,7 @@
+ #include <linux/in.h>
+ #include <linux/jhash.h>
+ #include <linux/random.h>
++#include <linux/vs_inet.h>
+ #include <trace/events/napi.h>
+ #include <trace/events/net.h>
+ #include <trace/events/skb.h>
+@@ -734,7 +735,8 @@ struct net_device *__dev_get_by_name(str
+ struct hlist_head *head = dev_name_hash(net, name);
+
+ hlist_for_each_entry(dev, head, name_hlist)
+- if (!strncmp(dev->name, name, IFNAMSIZ))
++ if (!strncmp(dev->name, name, IFNAMSIZ) &&
++ nx_dev_visible(current_nx_info(), dev))
+ return dev;
+
+ return NULL;
+@@ -759,7 +761,8 @@ struct net_device *dev_get_by_name_rcu(s
+ struct hlist_head *head = dev_name_hash(net, name);
+
+ hlist_for_each_entry_rcu(dev, head, name_hlist)
+- if (!strncmp(dev->name, name, IFNAMSIZ))
++ if (!strncmp(dev->name, name, IFNAMSIZ) &&
++ nx_dev_visible(current_nx_info(), dev))
+ return dev;
+
+ return NULL;
+@@ -809,7 +812,8 @@ struct net_device *__dev_get_by_index(st
+ struct hlist_head *head = dev_index_hash(net, ifindex);
+
+ hlist_for_each_entry(dev, head, index_hlist)
+- if (dev->ifindex == ifindex)
++ if ((dev->ifindex == ifindex) &&
++ nx_dev_visible(current_nx_info(), dev))
+ return dev;
+
+ return NULL;
+@@ -827,7 +831,7 @@ EXPORT_SYMBOL(__dev_get_by_index);
+ * about locking. The caller must hold RCU lock.
+ */
+
+-struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex)
++struct net_device *dev_get_by_index_real_rcu(struct net *net, int ifindex)
+ {
+ struct net_device *dev;
+ struct hlist_head *head = dev_index_hash(net, ifindex);
+@@ -838,6 +842,16 @@ struct net_device *dev_get_by_index_rcu(
+
+ return NULL;
+ }
++EXPORT_SYMBOL(dev_get_by_index_real_rcu);
++
++struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex)
++{
++ struct net_device *dev = dev_get_by_index_real_rcu(net, ifindex);
++
++ if (nx_dev_visible(current_nx_info(), dev))
++ return dev;
++ return NULL;
++}
+ EXPORT_SYMBOL(dev_get_by_index_rcu);
+
- /*
-diff -NurpP --minimal linux-2.6.19.1/net/core/dev.c linux-2.6.19.1-vs2.3.0.6/net/core/dev.c
---- linux-2.6.19.1/net/core/dev.c 2006-11-30 21:19:44 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/net/core/dev.c 2006-12-17 03:23:33 +0100
-@@ -117,6 +117,7 @@
- #include <linux/dmaengine.h>
- #include <linux/err.h>
- #include <linux/ctype.h>
-+#include <linux/vs_inet.h>
+@@ -915,7 +929,8 @@ struct net_device *dev_getbyhwaddr_rcu(s
- /*
- * The list of packet types we will receive (as opposed to discard)
-@@ -2051,6 +2052,8 @@ static int dev_ifconf(char __user *arg)
+ 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;
- total = 0;
- for (dev = dev_base; dev; dev = dev->next) {
-+ if (!nx_dev_visible(current->nx_info, dev))
-+ continue;
- for (i = 0; i < NPROTO; i++) {
- if (gifconf_list[i]) {
- int done;
-@@ -2111,6 +2114,8 @@ void dev_seq_stop(struct seq_file *seq,
+ return NULL;
+@@ -927,9 +942,11 @@ struct net_device *__dev_getfirstbyhwtyp
+ struct net_device *dev;
+
+ ASSERT_RTNL();
+- for_each_netdev(net, dev)
+- if (dev->type == type)
++ for_each_netdev(net, dev) {
++ if ((dev->type == type) &&
++ nx_dev_visible(current_nx_info(), dev))
+ return dev;
++ }
+
+ return NULL;
+ }
+@@ -941,7 +958,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;
+@@ -971,7 +989,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;
+ }
+@@ -1049,6 +1068,8 @@ static int __dev_alloc_name(struct net *
+ continue;
+ if (i < 0 || i >= max_netdevices)
+ continue;
++ if (!nx_dev_visible(current_nx_info(), d))
++ continue;
+
+ /* avoid cases where sscanf is not exact inverse of printf */
+ snprintf(buf, IFNAMSIZ, name, i);
+diff -urNp -x '*.orig' linux-4.9/net/core/net-procfs.c linux-4.9/net/core/net-procfs.c
+--- linux-4.9/net/core/net-procfs.c 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/net/core/net-procfs.c 2021-02-24 15:47:45.131077472 +0100
+@@ -1,6 +1,7 @@
+ #include <linux/netdevice.h>
+ #include <linux/proc_fs.h>
+ #include <linux/seq_file.h>
++#include <linux/vs_inet.h>
+ #include <net/wext.h>
+ #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)
{
-+ if (!nx_dev_visible(current->nx_info, dev))
+ struct rtnl_link_stats64 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;
- if (dev->get_stats) {
- struct net_device_stats *stats = dev->get_stats(dev);
-
-diff -NurpP --minimal linux-2.6.19.1/net/core/rtnetlink.c linux-2.6.19.1-vs2.3.0.6/net/core/rtnetlink.c
---- linux-2.6.19.1/net/core/rtnetlink.c 2006-11-30 21:19:44 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/net/core/rtnetlink.c 2006-12-17 03:34:44 +0100
-@@ -359,6 +359,8 @@ static int rtnl_dump_ifinfo(struct sk_bu
- for (dev=dev_base, idx=0; dev; dev = dev->next, idx++) {
- if (idx < s_idx)
- continue;
-+ if (!nx_dev_visible(skb->sk->sk_nx_info, dev))
-+ continue;
- if (rtnl_fill_ifinfo(skb, dev, NULL, 0, RTM_NEWLINK,
- NETLINK_CB(cb->skb).pid,
- cb->nlh->nlmsg_seq, 0, NLM_F_MULTI) <= 0)
-@@ -639,6 +641,9 @@ void rtmsg_ifinfo(int type, struct net_d
++
++ 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 -urNp -x '*.orig' linux-4.9/net/core/rtnetlink.c linux-4.9/net/core/rtnetlink.c
+--- linux-4.9/net/core/rtnetlink.c 2021-02-24 15:47:32.577351411 +0100
++++ linux-4.9/net/core/rtnetlink.c 2021-02-24 15:47:45.134410910 +0100
+@@ -1615,6 +1615,8 @@ static int rtnl_dump_ifinfo(struct sk_bu
+ goto cont;
+ if (idx < s_idx)
+ goto cont;
++ if (!nx_dev_visible(skb->sk->sk_nx_info, dev))
++ continue;
+ err = rtnl_fill_ifinfo(skb, dev, RTM_NEWLINK,
+ NETLINK_CB(cb->skb).portid,
+ cb->nlh->nlmsg_seq, 0,
+@@ -2841,6 +2843,9 @@ void rtmsg_ifinfo(int type, struct net_d
+ {
struct sk_buff *skb;
- int err = -ENOBUFS;
-+ if (!nx_dev_visible(current->nx_info, dev))
++ if (!nx_dev_visible(current_nx_info(), dev))
+ return;
+
- skb = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
- if (skb == NULL)
- goto errout;
-diff -NurpP --minimal linux-2.6.19.1/net/core/sock.c linux-2.6.19.1-vs2.3.0.6/net/core/sock.c
---- linux-2.6.19.1/net/core/sock.c 2006-11-30 21:19:44 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/net/core/sock.c 2006-11-08 21:52:09 +0100
-@@ -124,6 +124,9 @@
- #include <linux/ipsec.h>
+ if (dev->reg_state != NETREG_REGISTERED)
+ return;
+
+diff -urNp -x '*.orig' linux-4.9/net/core/sock.c linux-4.9/net/core/sock.c
+--- linux-4.9/net/core/sock.c 2021-02-24 15:47:32.580684849 +0100
++++ linux-4.9/net/core/sock.c 2021-02-24 15:47:45.134410910 +0100
+@@ -135,6 +135,10 @@
#include <linux/filter.h>
+ #include <net/sock_reuseport.h>
+#include <linux/vs_socket.h>
+#include <linux/vs_limit.h>
+#include <linux/vs_context.h>
++#include <linux/vs_network.h>
- #ifdef CONFIG_INET
- #include <net/tcp.h>
-@@ -855,6 +858,8 @@ struct sock *sk_alloc(int family, gfp_t
- sk->sk_prot = sk->sk_prot_creator = prot;
- sock_lock_init(sk);
- }
+ #include <trace/events/sock.h>
+
+@@ -1339,6 +1343,9 @@ static struct sock *sk_prot_alloc(struct
+ if (!try_module_get(prot->owner))
+ goto out_free_sec;
+ sk_tx_queue_clear(sk);
++
+ sock_vx_init(sk);
+ sock_nx_init(sk);
-
- if (security_sk_alloc(sk, family, priority))
- goto out_free;
-@@ -893,6 +898,11 @@ void sk_free(struct sock *sk)
- __FUNCTION__, atomic_read(&sk->sk_omem_alloc));
+ }
- security_sk_free(sk);
+ return sk;
+@@ -1444,6 +1451,11 @@ static void __sk_destruct(struct rcu_hea
+ put_pid(sk->sk_peer_pid);
+ if (likely(sk->sk_net_refcnt))
+ put_net(sock_net(sk));
+ vx_sock_dec(sk);
+ clr_vx_info(&sk->sk_vx_info);
+ sk->sk_xid = -1;
+ clr_nx_info(&sk->sk_nx_info);
+ sk->sk_nid = -1;
- if (sk->sk_prot_creator->slab != NULL)
- kmem_cache_free(sk->sk_prot_creator->slab, sk);
- else
-@@ -910,6 +920,8 @@ struct sock *sk_clone(const struct sock
- sock_copy(newsk, sk);
+ sk_prot_free(sk->sk_prot_creator, sk);
+ }
+@@ -1505,6 +1517,8 @@ struct sock *sk_clone_lock(const struct
/* SANITY */
+ if (likely(newsk->sk_net_refcnt))
+ get_net(sock_net(newsk));
+ sock_vx_init(newsk);
+ sock_nx_init(newsk);
sk_node_init(&newsk->sk_node);
sock_lock_init(newsk);
bh_lock_sock(newsk);
-@@ -955,6 +967,12 @@ struct sock *sk_clone(const struct sock
- newsk->sk_priority = 0;
+@@ -1575,6 +1589,12 @@ struct sock *sk_clone_lock(const struct
+ smp_wmb();
atomic_set(&newsk->sk_refcnt, 2);
+ set_vx_info(&newsk->sk_vx_info, sk->sk_vx_info);
/*
* Increment the counter in the same struct proto as the master
* sock (sk_refcnt_debug_inc uses newsk->sk_prot->socks, that
-@@ -1524,6 +1542,11 @@ void sock_init_data(struct socket *sock,
- sk->sk_stamp.tv_sec = -1L;
- sk->sk_stamp.tv_usec = -1L;
+@@ -2500,6 +2520,12 @@ void sock_init_data(struct socket *sock,
+ seqlock_init(&sk->sk_stamp_seq);
+ #endif
-+ set_vx_info(&sk->sk_vx_info, current->vx_info);
++ set_vx_info(&sk->sk_vx_info, current_vx_info());
+ sk->sk_xid = vx_current_xid();
+ vx_sock_inc(sk);
-+ set_nx_info(&sk->sk_nx_info, current->nx_info);
++ set_nx_info(&sk->sk_nx_info, current_nx_info());
+ sk->sk_nid = nx_current_nid();
- atomic_set(&sk->sk_refcnt, 1);
- }
-
-diff -NurpP --minimal linux-2.6.19.1/net/ipv4/af_inet.c linux-2.6.19.1-vs2.3.0.6/net/ipv4/af_inet.c
---- linux-2.6.19.1/net/ipv4/af_inet.c 2006-11-30 21:19:45 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/net/ipv4/af_inet.c 2006-11-08 04:57:50 +0100
-@@ -114,6 +114,7 @@
- #ifdef CONFIG_IP_MROUTE
- #include <linux/mroute.h>
- #endif
-+#include <linux/vs_limit.h>
-
- DEFINE_SNMP_STAT(struct linux_mib, net_statistics) __read_mostly;
-
-@@ -282,9 +283,11 @@ lookup_protocol:
++
+ #ifdef CONFIG_NET_RX_BUSY_POLL
+ sk->sk_napi_id = 0;
+ sk->sk_ll_usec = sysctl_net_busy_read;
+diff -urNp -x '*.orig' linux-4.9/net/ipv4/af_inet.c linux-4.9/net/ipv4/af_inet.c
+--- linux-4.9/net/ipv4/af_inet.c 2021-02-24 15:47:32.587351724 +0100
++++ linux-4.9/net/ipv4/af_inet.c 2021-02-24 15:47:45.134410910 +0100
+@@ -303,10 +303,15 @@ lookup_protocol:
}
err = -EPERM;
-+ if ((protocol == IPPROTO_ICMP) && vx_ccaps(VXC_RAW_ICMP))
++ if ((protocol == IPPROTO_ICMP) &&
++ nx_capable(CAP_NET_RAW, NXC_RAW_ICMP))
+ goto override;
- if (answer->capability > 0 && !capable(answer->capability))
++
+ 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;
-@@ -401,6 +404,10 @@ int inet_bind(struct socket *sock, struc
+ answer_flags = answer->flags;
+@@ -424,6 +429,7 @@ int inet_bind(struct socket *sock, struc
+ struct sock *sk = sock->sk;
+ struct inet_sock *inet = inet_sk(sk);
+ struct net *net = sock_net(sk);
++ struct nx_v4_sock_addr nsa;
unsigned short snum;
int chk_addr_ret;
- int err;
-+ __u32 s_addr; /* Address used for validation */
-+ __u32 s_addr1; /* Address used for socket */
-+ __u32 s_addr2; /* Broadcast address for the socket */
-+ struct nx_info *nxi = sk->sk_nx_info;
-
- /* If the socket has its own bind function then use it. (RAW) */
- if (sk->sk_prot->bind) {
-@@ -411,7 +418,40 @@ int inet_bind(struct socket *sock, struc
- if (addr_len < sizeof(struct sockaddr_in))
- goto out;
+ u32 tb_id = RT_TABLE_LOCAL;
+@@ -449,7 +455,11 @@ int inet_bind(struct socket *sock, struc
+ }
-- chk_addr_ret = inet_addr_type(addr->sin_addr.s_addr);
-+ s_addr = addr->sin_addr.s_addr;
-+ s_addr1 = s_addr;
-+ s_addr2 = 0xffffffffl;
-+
-+ vxdprintk(VXD_CBIT(net, 3),
-+ "inet_bind(%p)* %p,%p;%lx %d.%d.%d.%d",
-+ sk, sk->sk_nx_info, sk->sk_socket,
-+ (sk->sk_socket?sk->sk_socket->flags:0),
-+ VXD_QUAD(s_addr));
-+ if (nxi) {
-+ __u32 v4_bcast = nxi->v4_bcast;
-+ __u32 ipv4root = nxi->ipv4[0];
-+ int nbipv4 = nxi->nbipv4;
-+
-+ if (s_addr == 0) {
-+ /* bind to any for 1-n */
-+ s_addr = ipv4root;
-+ s_addr1 = (nbipv4 > 1) ? 0 : s_addr;
-+ s_addr2 = v4_bcast;
-+ } else if (s_addr == IPI_LOOPBACK) {
-+ /* rewrite localhost to ipv4root */
-+ s_addr = ipv4root;
-+ s_addr1 = ipv4root;
-+ } else if (s_addr != v4_bcast) {
-+ /* normal address bind */
-+ if (!addr_in_nx_info(nxi, s_addr))
-+ return -EADDRNOTAVAIL;
-+ }
-+ }
-+ chk_addr_ret = inet_addr_type(s_addr);
+ tb_id = l3mdev_fib_table_by_index(net, sk->sk_bound_dev_if) ? : tb_id;
+- chk_addr_ret = inet_addr_type_table(net, addr->sin_addr.s_addr, tb_id);
++ err = v4_map_sock_addr(inet, addr, &nsa);
++ if (err)
++ goto out;
+
-+ vxdprintk(VXD_CBIT(net, 3),
-+ "inet_bind(%p) %d.%d.%d.%d, %d.%d.%d.%d, %d.%d.%d.%d",
-+ sk, VXD_QUAD(s_addr), VXD_QUAD(s_addr1), VXD_QUAD(s_addr2));
++ chk_addr_ret = inet_addr_type_table(net, nsa.saddr, tb_id);
/* Not specified by any standard per-se, however it breaks too
* many applications when removed. It is unfortunate since
-@@ -423,7 +463,7 @@ int inet_bind(struct socket *sock, struc
+@@ -461,7 +471,7 @@ int inet_bind(struct socket *sock, struc
err = -EADDRNOTAVAIL;
- if (!sysctl_ip_nonlocal_bind &&
- !inet->freebind &&
-- addr->sin_addr.s_addr != INADDR_ANY &&
-+ s_addr != INADDR_ANY &&
+ 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)
-@@ -448,7 +488,8 @@ int inet_bind(struct socket *sock, struc
- if (sk->sk_state != TCP_CLOSE || inet->num)
+@@ -487,7 +497,7 @@ int inet_bind(struct socket *sock, struc
+ if (sk->sk_state != TCP_CLOSE || inet->inet_num)
goto out_release_sock;
-- inet->rcv_saddr = inet->saddr = addr->sin_addr.s_addr;
-+ inet->rcv_saddr = inet->saddr = s_addr1;
-+ inet->rcv_saddr2 = s_addr2;
+- inet->inet_rcv_saddr = inet->inet_saddr = addr->sin_addr.s_addr;
++ v4_set_sock_addr(inet, &nsa);
if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)
- inet->saddr = 0; /* Use device */
+ inet->inet_saddr = 0; /* Use device */
+
+@@ -706,11 +716,13 @@ int inet_getname(struct socket *sock, st
+ peer == 1))
+ return -ENOTCONN;
+ sin->sin_port = inet->inet_dport;
+- sin->sin_addr.s_addr = inet->inet_daddr;
++ sin->sin_addr.s_addr =
++ nx_map_sock_lback(sk->sk_nx_info, inet->inet_daddr);
+ } else {
+ __be32 addr = inet->inet_rcv_saddr;
+ if (!addr)
+ addr = inet->inet_saddr;
++ addr = nx_map_sock_lback(sk->sk_nx_info, addr);
+ sin->sin_port = inet->inet_sport;
+ sin->sin_addr.s_addr = addr;
+ }
+@@ -894,6 +906,7 @@ static int inet_compat_ioctl(struct sock
+ return err;
+ }
+ #endif
++#include <linux/vs_limit.h>
+
+ const struct proto_ops inet_stream_ops = {
+ .family = PF_INET,
+diff -urNp -x '*.orig' linux-4.9/net/ipv4/arp.c linux-4.9/net/ipv4/arp.c
+--- linux-4.9/net/ipv4/arp.c 2021-02-24 15:47:32.587351724 +0100
++++ linux-4.9/net/ipv4/arp.c 2021-02-24 15:47:45.134410910 +0100
+@@ -1320,6 +1320,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)
+@@ -1351,6 +1352,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 -urNp -x '*.orig' linux-4.9/net/ipv4/devinet.c linux-4.9/net/ipv4/devinet.c
+--- linux-4.9/net/ipv4/devinet.c 2021-02-24 15:47:32.587351724 +0100
++++ linux-4.9/net/ipv4/devinet.c 2021-02-24 15:47:45.134410910 +0100
+@@ -547,6 +547,7 @@ struct in_device *inetdev_by_index(struc
+ }
+ EXPORT_SYMBOL(inetdev_by_index);
+
++
+ /* Called only from RTNL semaphored context. No locks. */
-diff -NurpP --minimal linux-2.6.19.1/net/ipv4/devinet.c linux-2.6.19.1-vs2.3.0.6/net/ipv4/devinet.c
---- linux-2.6.19.1/net/ipv4/devinet.c 2006-11-30 21:19:45 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/net/ipv4/devinet.c 2006-12-17 03:23:33 +0100
-@@ -675,6 +675,8 @@ int devinet_ioctl(unsigned int cmd, void
- *colon = ':';
+ struct in_ifaddr *inet_ifa_byprefix(struct in_device *in_dev, __be32 prefix,
+@@ -1006,6 +1007,8 @@ int devinet_ioctl(struct net *net, unsig
- if ((in_dev = __in_dev_get_rtnl(dev)) != NULL) {
-+ struct nx_info *nxi = current->nx_info;
+ in_dev = __in_dev_get_rtnl(dev);
+ if (in_dev) {
++ struct nx_info *nxi = current_nx_info();
+
if (tryaddrmatch) {
/* Matthias Andree */
/* compare label and address (4.4BSD style) */
-@@ -683,6 +685,8 @@ int devinet_ioctl(unsigned int cmd, void
+@@ -1014,6 +1017,8 @@ int devinet_ioctl(struct net *net, unsig
This is checked above. */
for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL;
ifap = &ifa->ifa_next) {
-+ if (!nx_ifa_visible(nxi, ifa))
++ if (!nx_v4_ifa_visible(nxi, ifa))
+ continue;
if (!strcmp(ifr.ifr_name, ifa->ifa_label) &&
sin_orig.sin_addr.s_addr ==
- ifa->ifa_address) {
-@@ -695,9 +699,12 @@ int devinet_ioctl(unsigned int cmd, void
+ ifa->ifa_local) {
+@@ -1026,9 +1031,12 @@ int devinet_ioctl(struct net *net, unsig
comparing just the label */
if (!ifa) {
for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL;
- ifap = &ifa->ifa_next)
+ ifap = &ifa->ifa_next) {
-+ if (!nx_ifa_visible(nxi, ifa))
++ if (!nx_v4_ifa_visible(nxi, ifa))
+ continue;
if (!strcmp(ifr.ifr_name, ifa->ifa_label))
break;
}
}
-@@ -848,6 +855,8 @@ static int inet_gifconf(struct net_devic
+@@ -1182,6 +1190,8 @@ static int inet_gifconf(struct net_devic
goto out;
- for (; ifa; ifa = ifa->ifa_next) {
-+ if (!nx_ifa_visible(current->nx_info, ifa))
+ for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) {
++ if (!nx_v4_ifa_visible(current_nx_info(), ifa))
+ continue;
if (!buf) {
done += sizeof(ifr);
continue;
-@@ -1164,6 +1173,7 @@ static int inet_dump_ifaddr(struct sk_bu
+@@ -1604,6 +1614,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;
- int s_ip_idx, s_idx = cb->args[0];
+ struct hlist_head *head;
- s_ip_idx = ip_idx = cb->args[1];
-@@ -1181,6 +1191,8 @@ static int inet_dump_ifaddr(struct sk_bu
+ s_h = cb->args[0];
+@@ -1627,6 +1638,8 @@ static int inet_dump_ifaddr(struct sk_bu
- for (ifa = in_dev->ifa_list, ip_idx = 0; ifa;
- ifa = ifa->ifa_next, ip_idx++) {
-+ if (sk && !nx_ifa_visible(sk->sk_nx_info, ifa))
+ for (ifa = in_dev->ifa_list, ip_idx = 0; ifa;
+ ifa = ifa->ifa_next, ip_idx++) {
++ if (sk && !nx_v4_ifa_visible(sk->sk_nx_info, ifa))
+ continue;
- if (ip_idx < s_ip_idx)
- continue;
- if (inet_fill_ifaddr(skb, ifa, NETLINK_CB(cb->skb).pid,
-diff -NurpP --minimal linux-2.6.19.1/net/ipv4/fib_hash.c linux-2.6.19.1-vs2.3.0.6/net/ipv4/fib_hash.c
---- linux-2.6.19.1/net/ipv4/fib_hash.c 2006-11-30 21:19:45 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/net/ipv4/fib_hash.c 2006-12-17 03:23:33 +0100
-@@ -1011,7 +1011,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))
- snprintf(bf, sizeof(bf),
- "%s\t%08X\t%08X\t%04X\t%d\t%u\t%d\t%08X\t%d\t%u\t%u",
- fi->fib_dev ? fi->fib_dev->name : "*", prefix,
-diff -NurpP --minimal linux-2.6.19.1/net/ipv4/inet_connection_sock.c linux-2.6.19.1-vs2.3.0.6/net/ipv4/inet_connection_sock.c
---- linux-2.6.19.1/net/ipv4/inet_connection_sock.c 2006-11-30 21:19:45 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/net/ipv4/inet_connection_sock.c 2006-11-08 04:57:42 +0100
-@@ -39,7 +39,6 @@ int sysctl_local_port_range[2] = { 1024,
+ if (ip_idx < s_ip_idx)
+ continue;
+ if (inet_fill_ifaddr(skb, ifa,
+diff -urNp -x '*.orig' linux-4.9/net/ipv4/fib_trie.c linux-4.9/net/ipv4/fib_trie.c
+--- linux-4.9/net/ipv4/fib_trie.c 2021-02-24 15:47:32.590685161 +0100
++++ linux-4.9/net/ipv4/fib_trie.c 2021-02-24 15:47:45.134410910 +0100
+@@ -2630,6 +2630,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 -urNp -x '*.orig' linux-4.9/net/ipv4/inet_connection_sock.c linux-4.9/net/ipv4/inet_connection_sock.c
+--- linux-4.9/net/ipv4/inet_connection_sock.c 2021-02-24 15:47:32.590685161 +0100
++++ linux-4.9/net/ipv4/inet_connection_sock.c 2021-02-24 15:47:45.134410910 +0100
+@@ -16,6 +16,7 @@
+ #include <linux/module.h>
+ #include <linux/jhash.h>
+
++#include <net/addrconf.h>
+ #include <net/inet_connection_sock.h>
+ #include <net/inet_hashtables.h>
+ #include <net/inet_timewait_sock.h>
+@@ -44,6 +45,7 @@ void inet_get_local_port_range(struct ne
+ }
+ EXPORT_SYMBOL(inet_get_local_port_range);
+
++
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;
-@@ -52,9 +51,8 @@ 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)
-+ if (nx_addr_conflict(sk->sk_nx_info,
-+ inet_rcv_saddr(sk), sk2))
+@@ -72,15 +74,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, true))
+ 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, true))
break;
}
}
-diff -NurpP --minimal linux-2.6.19.1/net/ipv4/inet_diag.c linux-2.6.19.1-vs2.3.0.6/net/ipv4/inet_diag.c
---- linux-2.6.19.1/net/ipv4/inet_diag.c 2006-11-30 21:19:45 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/net/ipv4/inet_diag.c 2006-12-04 05:06:57 +0100
-@@ -18,6 +18,7 @@
- #include <linux/cache.h>
- #include <linux/init.h>
- #include <linux/time.h>
-+// #include <linux/vs_base.h>
+diff -urNp -x '*.orig' linux-4.9/net/ipv4/inet_diag.c linux-4.9/net/ipv4/inet_diag.c
+--- linux-4.9/net/ipv4/inet_diag.c 2021-02-24 15:47:32.590685161 +0100
++++ linux-4.9/net/ipv4/inet_diag.c 2021-02-24 15:47:45.134410910 +0100
+@@ -31,6 +31,8 @@
- #include <net/icmp.h>
- #include <net/tcp.h>
-@@ -693,6 +694,8 @@ static int inet_diag_dump(struct sk_buff
- sk_for_each(sk, node, &hashinfo->listening_hash[i]) {
- struct inet_sock *inet = inet_sk(sk);
+ #include <linux/inet.h>
+ #include <linux/stddef.h>
++#include <linux/vs_network.h>
++#include <linux/vs_inet.h>
+
+ #include <linux/inet_diag.h>
+ #include <linux/sock_diag.h>
+@@ -87,8 +89,8 @@ void inet_diag_msg_common_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] = sk->sk_rcv_saddr;
+- r->id.idiag_dst[0] = sk->sk_daddr;
++ r->id.idiag_src[0] = nx_map_sock_lback(sk->sk_nx_info, sk->sk_rcv_saddr);
++ r->id.idiag_dst[0] = nx_map_sock_lback(sk->sk_nx_info, sk->sk_daddr);
+ }
+ }
+ EXPORT_SYMBOL_GPL(inet_diag_msg_common_fill);
+@@ -882,6 +884,9 @@ 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))
++ if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
+ continue;
++
if (num < s_num) {
num++;
continue;
-@@ -753,6 +756,8 @@ skip_listen_ht:
- sk_for_each(sk, node, &head->chain) {
- struct inet_sock *inet = inet_sk(sk);
+@@ -944,6 +949,8 @@ skip_listen_ht:
-+ if (!nx_check(sk->sk_nid, VS_WATCH_P|VS_IDENT))
+ 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)))
-@@ -777,6 +782,8 @@ next_normal:
- inet_twsk_for_each(tw, node,
- &hashinfo->ehash[i + hashinfo->ehash_size].chain) {
-
-+ if (!vx_check(tw->tw_xid, 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.19.1/net/ipv4/inet_hashtables.c linux-2.6.19.1-vs2.3.0.6/net/ipv4/inet_hashtables.c
---- linux-2.6.19.1/net/ipv4/inet_hashtables.c 2006-11-30 21:19:45 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/net/ipv4/inet_hashtables.c 2006-11-08 04:57:42 +0100
-@@ -140,11 +140,10 @@ static struct sock *inet_lookup_listener
- const __be32 rcv_saddr = inet->rcv_saddr;
- int score = sk->sk_family == PF_INET ? 1 : 0;
-
-- if (rcv_saddr) {
-- if (rcv_saddr != daddr)
-- continue;
-+ if (inet_addr_match(sk->sk_nx_info, daddr, rcv_saddr))
- score += 2;
-- }
-+ else
-+ continue;
- if (sk->sk_bound_dev_if) {
- if (sk->sk_bound_dev_if != dif)
- continue;
-@@ -175,7 +174,7 @@ struct sock *__inet_lookup_listener(stru
- const struct inet_sock *inet = inet_sk((sk = __sk_head(head)));
-
- if (inet->num == hnum && !sk->sk_node.next &&
-- (!inet->rcv_saddr || inet->rcv_saddr == daddr) &&
-+ inet_addr_match(sk->sk_nx_info, daddr, inet->rcv_saddr) &&
- (sk->sk_family == PF_INET || !ipv6_only_sock(sk)) &&
- !sk->sk_bound_dev_if)
- goto sherry_cache;
-diff -NurpP --minimal linux-2.6.19.1/net/ipv4/raw.c linux-2.6.19.1-vs2.3.0.6/net/ipv4/raw.c
---- linux-2.6.19.1/net/ipv4/raw.c 2006-11-30 21:19:45 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/net/ipv4/raw.c 2006-12-17 03:23:33 +0100
-@@ -78,6 +78,7 @@
- #include <linux/seq_file.h>
- #include <linux/netfilter.h>
- #include <linux/netfilter_ipv4.h>
-+// #include <linux/vs_base.h>
-
- struct hlist_head raw_v4_htable[RAWV4_HTABLE_SIZE];
- DEFINE_RWLOCK(raw_v4_lock);
-@@ -112,7 +113,8 @@ struct sock *__raw_v4_lookup(struct sock
-
- if (inet->num == num &&
- !(inet->daddr && inet->daddr != raddr) &&
-- !(inet->rcv_saddr && inet->rcv_saddr != laddr) &&
-+ raw_addr_match(sk->sk_nx_info, laddr,
-+ inet->rcv_saddr, inet->rcv_saddr2) &&
+ state = (sk->sk_state == TCP_TIME_WAIT) ?
+diff -urNp -x '*.orig' linux-4.9/net/ipv4/inet_hashtables.c linux-4.9/net/ipv4/inet_hashtables.c
+--- linux-4.9/net/ipv4/inet_hashtables.c 2021-02-24 15:47:32.594018600 +0100
++++ linux-4.9/net/ipv4/inet_hashtables.c 2021-02-24 15:47:45.134410910 +0100
+@@ -24,6 +24,7 @@
+ #include <net/inet_connection_sock.h>
+ #include <net/inet_hashtables.h>
+ #include <net/secure_seq.h>
++#include <net/route.h>
+ #include <net/ip.h>
+ #include <net/tcp.h>
+ #include <net/sock_reuseport.h>
+@@ -187,6 +188,11 @@ static inline int compute_score(struct s
+ if (rcv_saddr != daddr)
+ return -1;
+ score += 4;
++ } else {
++ /* block non nx_info ips */
++ if (!v4_addr_in_nx_info(sk->sk_nx_info,
++ daddr, NXA_MASK_BIND))
++ return -1;
+ }
+ if (sk->sk_bound_dev_if || exact_dif) {
+ if (sk->sk_bound_dev_if != dif)
+@@ -302,6 +308,7 @@ begin:
+ goto found;
+ }
+ }
++
+ /*
+ * if the nulls value we got at the end of this lookup is
+ * not the expected one, we must restart lookup.
+diff -urNp -x '*.orig' linux-4.9/net/ipv4/netfilter.c linux-4.9/net/ipv4/netfilter.c
+--- linux-4.9/net/ipv4/netfilter.c 2021-02-24 15:47:32.597352037 +0100
++++ linux-4.9/net/ipv4/netfilter.c 2021-02-24 15:47:45.134410910 +0100
+@@ -11,7 +11,7 @@
+ #include <linux/skbuff.h>
+ #include <linux/gfp.h>
+ #include <linux/export.h>
+-#include <net/route.h>
++// #include <net/route.h>
+ #include <net/xfrm.h>
+ #include <net/ip.h>
+ #include <net/netfilter/nf_queue.h>
+diff -urNp -x '*.orig' linux-4.9/net/ipv4/raw.c linux-4.9/net/ipv4/raw.c
+--- linux-4.9/net/ipv4/raw.c 2021-02-24 15:47:32.600685475 +0100
++++ linux-4.9/net/ipv4/raw.c 2021-02-24 15:47:45.137744347 +0100
+@@ -128,7 +128,7 @@ static struct sock *__raw_v4_lookup(stru
+
+ if (net_eq(sock_net(sk), net) && inet->inet_num == num &&
+ !(inet->inet_daddr && inet->inet_daddr != raddr) &&
+- !(inet->inet_rcv_saddr && inet->inet_rcv_saddr != laddr) &&
++ v4_sock_addr_match(sk->sk_nx_info, inet, laddr) &&
!(sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif))
goto found; /* gotcha */
}
-@@ -312,6 +314,11 @@ static int raw_send_hdrinc(struct sock *
- iph->check = ip_fast_csum((unsigned char *)iph, iph->ihl);
+@@ -418,6 +418,12 @@ static int raw_send_hdrinc(struct sock *
+ skb_transport_header(skb))->type);
}
+ err = -EPERM;
-+ if (!vx_check(0, VS_ADMIN) && !capable(CAP_NET_RAW)
-+ && (!addr_in_nx_info(sk->sk_nx_info, iph->saddr)))
++ if (!nx_check(0, VS_ADMIN) && !capable(CAP_NET_RAW) &&
++ sk->sk_nx_info &&
++ !v4_addr_in_nx_info(sk->sk_nx_info, iph->saddr, NXA_MASK_BIND))
+ goto error_free;
+
- err = NF_HOOK(PF_INET, NF_IP_LOCAL_OUT, skb, NULL, rt->u.dst.dev,
+ err = NF_HOOK(NFPROTO_IPV4, NF_INET_LOCAL_OUT,
+ net, sk, skb, NULL, rt->dst.dev,
dst_output);
- if (err > 0)
-@@ -323,6 +330,7 @@ out:
-
- error_fault:
- err = -EFAULT;
-+error_free:
- kfree_skb(skb);
- error:
- IP_INC_STATS(IPSTATS_MIB_OUTDISCARDS);
-@@ -489,6 +497,12 @@ static int raw_sendmsg(struct kiocb *ioc
- }
+@@ -625,6 +631,16 @@ static int raw_sendmsg(struct sock *sk,
+ goto done;
+ }
- security_sk_classify_flow(sk, &fl);
-+ if (sk->sk_nx_info) {
-+ err = ip_find_src(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(&rt, &fl, sk, !(msg->msg_flags&MSG_DONTWAIT));
- }
- if (err)
-@@ -793,7 +807,8 @@ static struct sock *raw_get_first(struct
- struct hlist_node *node;
++ ip_rt_put(rt);
++ }
++
+ security_sk_classify_flow(sk, flowi4_to_flowi(&fl4));
+ rt = ip_route_output_flow(net, &fl4, sk);
+ if (IS_ERR(rt)) {
+@@ -703,17 +719,19 @@ static int raw_bind(struct sock *sk, str
+ {
+ struct inet_sock *inet = inet_sk(sk);
+ struct sockaddr_in *addr = (struct sockaddr_in *) uaddr;
++ struct nx_v4_sock_addr nsa = { 0 };
+ int ret = -EINVAL;
+ int chk_addr_ret;
- sk_for_each(sk, node, &raw_v4_htable[state->bucket])
-- if (sk->sk_family == PF_INET)
-+ if (sk->sk_family == PF_INET &&
-+ nx_check(sk->sk_nid, VS_WATCH_P|VS_IDENT))
+ if (sk->sk_state != TCP_CLOSE || addr_len < sizeof(struct sockaddr_in))
+ goto out;
+- chk_addr_ret = inet_addr_type(sock_net(sk), addr->sin_addr.s_addr);
++ v4_map_sock_addr(inet, addr, &nsa);
++ chk_addr_ret = inet_addr_type(sock_net(sk), nsa.saddr);
+ ret = -EADDRNOTAVAIL;
+- if (addr->sin_addr.s_addr && chk_addr_ret != RTN_LOCAL &&
++ if (nsa.saddr && chk_addr_ret != RTN_LOCAL &&
+ chk_addr_ret != RTN_MULTICAST && chk_addr_ret != RTN_BROADCAST)
+ goto out;
+- inet->inet_rcv_saddr = inet->inet_saddr = addr->sin_addr.s_addr;
++ v4_set_sock_addr(inet, &nsa);
+ if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)
+ inet->inet_saddr = 0; /* Use device */
+ sk_dst_reset(sk);
+@@ -762,7 +780,8 @@ static int raw_recvmsg(struct sock *sk,
+ /* Copy the address. */
+ if (sin) {
+ sin->sin_family = AF_INET;
+- sin->sin_addr.s_addr = ip_hdr(skb)->saddr;
++ sin->sin_addr.s_addr =
++ nx_map_sock_lback(sk->sk_nx_info, ip_hdr(skb)->saddr);
+ sin->sin_port = 0;
+ memset(&sin->sin_zero, 0, sizeof(sin->sin_zero));
+ *addr_len = sizeof(*sin);
+@@ -958,7 +977,8 @@ static struct sock *raw_get_first(struct
+ for (state->bucket = 0; state->bucket < RAW_HTABLE_SIZE;
+ ++state->bucket) {
+ sk_for_each(sk, &state->h->ht[state->bucket])
+- if (sock_net(sk) == seq_file_net(seq))
++ if ((sock_net(sk) == seq_file_net(seq)) &&
++ nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
goto found;
}
sk = NULL;
-@@ -809,7 +824,8 @@ static struct sock *raw_get_next(struct
+@@ -974,7 +994,8 @@ static struct sock *raw_get_next(struct
sk = sk_next(sk);
try_again:
;
-- } while (sk && sk->sk_family != PF_INET);
-+ } while (sk && (sk->sk_family != PF_INET ||
-+ !nx_check(sk->sk_nid, VS_WATCH_P|VS_IDENT)));
-
- if (!sk && ++state->bucket < RAWV4_HTABLE_SIZE) {
- sk = sk_head(&raw_v4_htable[state->bucket]);
-diff -NurpP --minimal linux-2.6.19.1/net/ipv4/tcp.c linux-2.6.19.1-vs2.3.0.6/net/ipv4/tcp.c
---- linux-2.6.19.1/net/ipv4/tcp.c 2006-11-30 21:19:45 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/net/ipv4/tcp.c 2006-11-30 20:55:45 +0100
-@@ -258,6 +258,7 @@
- #include <linux/bootmem.h>
- #include <linux/cache.h>
+- } while (sk && sock_net(sk) != seq_file_net(seq));
++ } while (sk && ((sock_net(sk) != seq_file_net(seq)) ||
++ !nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)));
+
+ if (!sk && ++state->bucket < RAW_HTABLE_SIZE) {
+ sk = sk_head(&state->h->ht[state->bucket]);
+diff -urNp -x '*.orig' linux-4.9/net/ipv4/route.c linux-4.9/net/ipv4/route.c
+--- linux-4.9/net/ipv4/route.c 2021-02-24 15:47:32.600685475 +0100
++++ linux-4.9/net/ipv4/route.c 2021-02-24 15:47:45.137744347 +0100
+@@ -2287,7 +2287,7 @@ struct rtable *__ip_route_output_key_has
+
+
+ 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)
+ goto out;
+diff -urNp -x '*.orig' linux-4.9/net/ipv4/tcp.c linux-4.9/net/ipv4/tcp.c
+--- linux-4.9/net/ipv4/tcp.c 2021-02-24 15:47:32.600685475 +0100
++++ linux-4.9/net/ipv4/tcp.c 2021-02-24 15:47:45.137744347 +0100
+@@ -269,6 +269,7 @@
#include <linux/err.h>
+ #include <linux/time.h>
+ #include <linux/slab.h>
+#include <linux/in.h>
#include <net/icmp.h>
- #include <net/tcp.h>
-diff -NurpP --minimal linux-2.6.19.1/net/ipv4/tcp_ipv4.c linux-2.6.19.1-vs2.3.0.6/net/ipv4/tcp_ipv4.c
---- linux-2.6.19.1/net/ipv4/tcp_ipv4.c 2006-11-30 21:19:45 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/net/ipv4/tcp_ipv4.c 2006-12-04 04:51:13 +0100
-@@ -77,6 +77,7 @@
- #include <linux/stddef.h>
- #include <linux/proc_fs.h>
- #include <linux/seq_file.h>
-+// #include <linux/vs_base.h>
-
- int sysctl_tcp_tw_reuse __read_mostly;
- int sysctl_tcp_low_latency __read_mostly;
-@@ -1389,6 +1390,12 @@ static void *listening_get_next(struct s
- req = req->dl_next;
- while (1) {
- while (req) {
-+ vxdprintk(VXD_CBIT(net, 6),
-+ "sk,req: %p [#%d] (from %d)", req->sk,
-+ (req->sk)?req->sk->sk_nid:0, nx_current_nid());
-+ if (req->sk &&
-+ !nx_check(req->sk->sk_nid, VS_WATCH_P|VS_IDENT))
-+ continue;
- if (req->rsk_ops->family == st->family) {
- cur = req;
- goto out;
-@@ -1413,6 +1420,10 @@ get_req:
- }
+ #include <net/inet_common.h>
+diff -urNp -x '*.orig' linux-4.9/net/ipv4/tcp_ipv4.c linux-4.9/net/ipv4/tcp_ipv4.c
+--- linux-4.9/net/ipv4/tcp_ipv4.c 2021-02-24 15:47:32.604018912 +0100
++++ linux-4.9/net/ipv4/tcp_ipv4.c 2021-02-24 15:47:45.137744347 +0100
+@@ -1944,8 +1944,12 @@ get_head:
+ sk = sk_nulls_next(sk);
get_sk:
- sk_for_each_from(sk, node) {
+ sk_nulls_for_each_from(sk, node) {
+ vxdprintk(VXD_CBIT(net, 6), "sk: %p [#%d] (from %d)",
+ sk, sk->sk_nid, nx_current_nid());
-+ if (!nx_check(sk->sk_nid, VS_WATCH_P|VS_IDENT))
+ if (!net_eq(sock_net(sk), net))
+ continue;
++ if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
+ continue;
- if (sk->sk_family == st->family) {
- cur = sk;
- goto out;
-@@ -1464,18 +1475,26 @@ static void *established_get_first(struc
+ if (sk->sk_family == st->family)
+ return sk;
+ }
+@@ -1999,6 +2003,11 @@ static void *established_get_first(struc
- read_lock(&tcp_hashinfo.ehash[st->bucket].lock);
- sk_for_each(sk, node, &tcp_hashinfo.ehash[st->bucket].chain) {
-- if (sk->sk_family != st->family) {
+ spin_lock_bh(lock);
+ sk_nulls_for_each(sk, node, &tcp_hashinfo.ehash[st->bucket].chain) {
+ vxdprintk(VXD_CBIT(net, 6),
+ "sk,egf: %p [#%d] (from %d)",
+ sk, sk->sk_nid, nx_current_nid());
-+ if (!nx_check(sk->sk_nid, VS_WATCH_P|VS_IDENT))
-+ continue;
-+ if (sk->sk_family != st->family)
- continue;
-- }
- rc = sk;
- goto out;
- }
- st->state = TCP_SEQ_STATE_TIME_WAIT;
- inet_twsk_for_each(tw, node,
- &tcp_hashinfo.ehash[st->bucket + tcp_hashinfo.ehash_size].chain) {
-- if (tw->tw_family != st->family) {
-+ 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))
++ if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
+ continue;
-+ if (tw->tw_family != st->family)
+ if (sk->sk_family != st->family ||
+ !net_eq(sock_net(sk), net)) {
continue;
-- }
- rc = tw;
- goto out;
- }
-@@ -1499,7 +1518,8 @@ static void *established_get_next(struct
- tw = cur;
- tw = tw_next(tw);
- get_tw:
-- while (tw && tw->tw_family != st->family) {
-+ while (tw && (tw->tw_family != st->family ||
-+ !nx_check(tw->tw_nid, VS_WATCH_P|VS_IDENT))) {
- tw = tw_next(tw);
- }
- if (tw) {
-@@ -1523,6 +1543,11 @@ get_tw:
- sk = sk_next(sk);
+@@ -2025,6 +2034,11 @@ static void *established_get_next(struct
+ sk = sk_nulls_next(sk);
- sk_for_each_from(sk, node) {
+ sk_nulls_for_each_from(sk, node) {
+ vxdprintk(VXD_CBIT(net, 6),
+ "sk,egn: %p [#%d] (from %d)",
+ sk, sk->sk_nid, nx_current_nid());
-+ if (!nx_check(sk->sk_nid, VS_WATCH_P|VS_IDENT))
++ if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
+ continue;
- if (sk->sk_family == st->family)
- goto found;
+ if (sk->sk_family == st->family && net_eq(sock_net(sk), net))
+ return sk;
+ }
+@@ -2216,9 +2230,9 @@ static void get_openreq4(const struct re
+ seq_printf(f, "%4d: %08X:%04X %08X:%04X"
+ " %02X %08X:%08X %02X:%08lX %08X %5u %8d %u %d %pK",
+ i,
+- ireq->ir_loc_addr,
++ nx_map_sock_lback(current_nx_info(), ireq->ir_loc_addr),
+ ireq->ir_num,
+- 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. */
+@@ -2241,8 +2255,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);
+ const 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;
+@@ -2301,8 +2315,8 @@ static void get_timewait4_sock(const str
+ __be32 dest, src;
+ __u16 destp, srcp;
+
+- 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 -urNp -x '*.orig' linux-4.9/net/ipv4/tcp_minisocks.c linux-4.9/net/ipv4/tcp_minisocks.c
+--- linux-4.9/net/ipv4/tcp_minisocks.c 2021-02-24 15:47:32.604018912 +0100
++++ linux-4.9/net/ipv4/tcp_minisocks.c 2021-02-24 15:47:45.137744347 +0100
+@@ -23,6 +23,9 @@
+ #include <linux/slab.h>
+ #include <linux/sysctl.h>
+ #include <linux/workqueue.h>
++#include <linux/vs_limit.h>
++#include <linux/vs_socket.h>
++#include <linux/vs_context.h>
+ #include <net/tcp.h>
+ #include <net/inet_common.h>
+ #include <net/xfrm.h>
+@@ -286,6 +289,11 @@ void tcp_time_wait(struct sock *sk, int
+ tcptw->tw_ts_offset = tp->tsoffset;
+ tcptw->tw_last_oow_ack_time = 0;
+
++ tw->tw_xid = sk->sk_xid;
++ tw->tw_vx_info = NULL;
++ tw->tw_nid = sk->sk_nid;
++ tw->tw_nx_info = NULL;
++
+ #if IS_ENABLED(CONFIG_IPV6)
+ if (tw->tw_family == PF_INET6) {
+ struct ipv6_pinfo *np = inet6_sk(sk);
+diff -urNp -x '*.orig' linux-4.9/net/ipv4/udp.c linux-4.9/net/ipv4/udp.c
+--- linux-4.9/net/ipv4/udp.c 2021-02-24 15:47:32.607352350 +0100
++++ linux-4.9/net/ipv4/udp.c 2021-02-24 15:47:45.137744347 +0100
+@@ -361,12 +361,26 @@ int ipv4_rcv_saddr_equal(const struct so
+ bool match_wildcard)
+ {
+ struct inet_sock *inet1 = inet_sk(sk1), *inet2 = inet_sk(sk2);
++ __be32 sk1_rcv_saddr = inet1->inet_rcv_saddr,
++ sk2_rcv_saddr = inet2->inet_rcv_saddr;
+
+- if (!ipv6_only_sock(sk2)) {
+- if (inet1->inet_rcv_saddr == inet2->inet_rcv_saddr)
+- return 1;
+- if (!inet1->inet_rcv_saddr || !inet2->inet_rcv_saddr)
+- return match_wildcard;
++ if (ipv6_only_sock(sk2))
++ return 0;
++
++ if (sk1_rcv_saddr && sk2_rcv_saddr && sk1_rcv_saddr == sk2_rcv_saddr)
++ return 1;
++
++ if (match_wildcard) {
++ if (!sk2_rcv_saddr && !sk1_rcv_saddr)
++ return nx_v4_addr_conflict(sk1->sk_nx_info, sk2->sk_nx_info);
++
++ if (!sk2_rcv_saddr && sk1_rcv_saddr)
++ return v4_addr_in_nx_info(sk2->sk_nx_info,
++ sk1_rcv_saddr, NXA_MASK_BIND);
++
++ if (!sk1_rcv_saddr && sk2_rcv_saddr)
++ return v4_addr_in_nx_info(sk1->sk_nx_info,
++ sk2_rcv_saddr, NXA_MASK_BIND);
+ }
+ return 0;
+ }
+@@ -408,6 +422,11 @@ static int compute_score(struct sock *sk
+ if (inet->inet_rcv_saddr != daddr)
+ return -1;
+ score += 4;
++ } else {
++ /* block non nx_info ips */
++ if (!v4_addr_in_nx_info(sk->sk_nx_info,
++ daddr, NXA_MASK_BIND))
++ return -1;
+ }
+
+ if (inet->inet_daddr) {
+@@ -483,6 +502,7 @@ static struct sock *udp4_lib_lookup2(str
+ return result;
+ }
+
++
+ /* UDP is nearly always wildcards out the wazoo, it makes no sense to try
+ * harder than this. -DaveM
+ */
+@@ -607,7 +627,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;
+@@ -1024,6 +1044,16 @@ int udp_sendmsg(struct sock *sk, struct
+ flow_flags,
+ faddr, saddr, dport, inet->inet_sport);
+
++ if (sk->sk_nx_info) {
++ rt = ip_v4_find_src(net, sk->sk_nx_info, fl4);
++ if (IS_ERR(rt)) {
++ err = PTR_ERR(rt);
++ rt = NULL;
++ goto out;
++ }
++ ip_rt_put(rt);
++ }
++
+ security_sk_classify_flow(sk, flowi4_to_flowi(fl4));
+ rt = ip_route_output_flow(net, fl4, sk);
+ if (IS_ERR(rt)) {
+@@ -1321,7 +1351,8 @@ try_again:
+ if (sin) {
+ sin->sin_family = AF_INET;
+ sin->sin_port = udp_hdr(skb)->source;
+- sin->sin_addr.s_addr = ip_hdr(skb)->saddr;
++ sin->sin_addr.s_addr = nx_map_sock_lback(
++ skb->sk->sk_nx_info, ip_hdr(skb)->saddr);
+ memset(sin->sin_zero, 0, sizeof(sin->sin_zero));
+ *addr_len = sizeof(*sin);
+ }
+@@ -2291,6 +2322,8 @@ static struct sock *udp_get_first(struct
+ sk_for_each(sk, &hslot->head) {
+ if (!net_eq(sock_net(sk), net))
+ continue;
++ if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
++ continue;
+ if (sk->sk_family == state->family)
+ goto found;
+ }
+@@ -2308,7 +2341,9 @@ static struct sock *udp_get_next(struct
+
+ do {
+ sk = sk_next(sk);
+- } while (sk && (!net_eq(sock_net(sk), net) || sk->sk_family != state->family));
++ } while (sk && (!net_eq(sock_net(sk), net) ||
++ sk->sk_family != state->family ||
++ !nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)));
+
+ if (!sk) {
+ if (state->bucket <= state->udp_table->mask)
+@@ -2404,8 +2439,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 -urNp -x '*.orig' linux-4.9/net/ipv4/udp_diag.c linux-4.9/net/ipv4/udp_diag.c
+--- linux-4.9/net/ipv4/udp_diag.c 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/net/ipv4/udp_diag.c 2021-02-24 15:47:45.137744347 +0100
+@@ -120,6 +120,8 @@ static void udp_dump(struct udp_table *t
+
+ 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;
+ if (!(r->idiag_states & (1 << sk->sk_state)))
+diff -urNp -x '*.orig' linux-4.9/net/ipv6/addrconf.c linux-4.9/net/ipv6/addrconf.c
+--- linux-4.9/net/ipv6/addrconf.c 2021-02-24 15:47:32.607352350 +0100
++++ linux-4.9/net/ipv6/addrconf.c 2021-02-24 15:47:45.141077785 +0100
+@@ -92,6 +92,7 @@
+ #include <linux/proc_fs.h>
+ #include <linux/seq_file.h>
+ #include <linux/export.h>
++#include <linux/vs_network.h>
+
+ /* Set to 3 to get tracing... */
+ #define ACONF_DEBUG 2
+@@ -1498,7 +1499,8 @@ static int __ipv6_dev_get_saddr(struct n
+ struct ipv6_saddr_dst *dst,
+ struct inet6_dev *idev,
+ struct ipv6_saddr_score *scores,
+- int hiscore_idx)
++ int hiscore_idx,
++ struct nx_info *nxi)
+ {
+ struct ipv6_saddr_score *score = &scores[1 - hiscore_idx], *hiscore = &scores[hiscore_idx];
+
+@@ -1528,6 +1530,8 @@ static int __ipv6_dev_get_saddr(struct n
+ idev->dev->name);
+ continue;
+ }
++ if (!v6_addr_in_nx_info(nxi, &score->ifa->addr, -1))
++ continue;
+
+ score->rule = -1;
+ bitmap_zero(score->scorebits, IPV6_SADDR_RULE_MAX);
+@@ -1578,26 +1582,27 @@ static int ipv6_get_saddr_master(struct
+ const struct net_device *master,
+ struct ipv6_saddr_dst *dst,
+ struct ipv6_saddr_score *scores,
+- int hiscore_idx)
++ int hiscore_idx,
++ struct nx_info *nxi)
+ {
+ struct inet6_dev *idev;
+
+ idev = __in6_dev_get(dst_dev);
+ if (idev)
+- hiscore_idx = __ipv6_dev_get_saddr(net, dst, idev,
+- scores, hiscore_idx);
++ hiscore_idx = __ipv6_dev_get_saddr(net, dst,
++ idev, scores, hiscore_idx, nxi);
+
+ idev = __in6_dev_get(master);
+ if (idev)
+- hiscore_idx = __ipv6_dev_get_saddr(net, dst, idev,
+- scores, hiscore_idx);
++ hiscore_idx = __ipv6_dev_get_saddr(net, dst,
++ idev, scores, hiscore_idx, nxi);
+
+ return hiscore_idx;
+ }
+
+ 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], *hiscore;
+ struct ipv6_saddr_dst dst;
+@@ -1646,7 +1651,8 @@ int ipv6_dev_get_saddr(struct net *net,
+
+ if (use_oif_addr) {
+ if (idev)
+- hiscore_idx = __ipv6_dev_get_saddr(net, &dst, idev, scores, hiscore_idx);
++ hiscore_idx = __ipv6_dev_get_saddr(net,
++ &dst, idev, scores, hiscore_idx, nxi);
+ } else {
+ const struct net_device *master;
+ int master_idx = 0;
+@@ -1660,8 +1666,8 @@ int ipv6_dev_get_saddr(struct net *net,
+ master_idx = master->ifindex;
+
+ hiscore_idx = ipv6_get_saddr_master(net, dst_dev,
+- master, &dst,
+- scores, hiscore_idx);
++ master, &dst, scores,
++ hiscore_idx, nxi);
+
+ if (scores[hiscore_idx].ifa)
+ goto out;
+@@ -1676,7 +1682,8 @@ int ipv6_dev_get_saddr(struct net *net,
+ idev = __in6_dev_get(dev);
+ if (!idev)
+ continue;
+- hiscore_idx = __ipv6_dev_get_saddr(net, &dst, idev, scores, hiscore_idx);
++ hiscore_idx = __ipv6_dev_get_saddr(net,
++ &dst, idev, scores, hiscore_idx, nxi);
+ }
}
-diff -NurpP --minimal linux-2.6.19.1/net/ipv4/tcp_minisocks.c linux-2.6.19.1-vs2.3.0.6/net/ipv4/tcp_minisocks.c
---- linux-2.6.19.1/net/ipv4/tcp_minisocks.c 2006-11-30 21:19:45 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/net/ipv4/tcp_minisocks.c 2006-11-08 04:57:42 +0100
-@@ -28,6 +28,10 @@
- #include <net/inet_common.h>
- #include <net/xfrm.h>
-+#include <linux/vs_limit.h>
-+#include <linux/vs_socket.h>
-+#include <linux/vs_context.h>
+@@ -4135,7 +4142,10 @@ static void if6_seq_stop(struct seq_file
+ static int if6_seq_show(struct seq_file *seq, void *v)
+ {
+ struct inet6_ifaddr *ifp = (struct inet6_ifaddr *)v;
+- seq_printf(seq, "%pi6 %02x %02x %02x %02x %8s\n",
+
- #ifdef CONFIG_SYSCTL
- #define SYNC_INIT 0 /* let the user enable it */
- #else
-@@ -294,6 +298,11 @@ void tcp_time_wait(struct sock *sk, int
- tcptw->tw_ts_recent = tp->rx_opt.ts_recent;
- tcptw->tw_ts_recent_stamp = tp->rx_opt.ts_recent_stamp;
++ if (nx_check(0, VS_ADMIN|VS_WATCH) ||
++ v6_addr_in_nx_info(current_nx_info(), &ifp->addr, -1))
++ seq_printf(seq, "%pi6 %02x %02x %02x %02x %8s\n",
+ &ifp->addr,
+ ifp->idev->dev->ifindex,
+ ifp->prefix_len,
+@@ -4719,6 +4729,11 @@ static int in6_dump_addrs(struct inet6_d
+ struct ifacaddr6 *ifaca;
+ int err = 1;
+ int ip_idx = *p_ip_idx;
++ struct nx_info *nxi = skb->sk ? skb->sk->sk_nx_info : NULL;
++
++ /* disable ipv6 on non v6 guests */
++ if (nxi && !nx_info_has_v6(nxi))
++ return skb->len;
-+ tw->tw_xid = sk->sk_xid;
-+ tw->tw_vx_info = NULL;
-+ tw->tw_nid = sk->sk_nid;
-+ tw->tw_nx_info = NULL;
+ read_lock_bh(&idev->lock);
+ switch (type) {
+@@ -4729,6 +4744,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)
+ goto next;
++ if (!v6_addr_in_nx_info(nxi, &ifa->addr, -1))
++ goto next;
+ err = inet6_fill_ifaddr(skb, ifa,
+ NETLINK_CB(cb->skb).portid,
+ cb->nlh->nlmsg_seq,
+@@ -4748,6 +4765,8 @@ next:
+ ifmca = ifmca->next, ip_idx++) {
+ if (ip_idx < s_ip_idx)
+ continue;
++ if (!v6_addr_in_nx_info(nxi, &ifmca->mca_addr, -1))
++ continue;
+ err = inet6_fill_ifmcaddr(skb, ifmca,
+ NETLINK_CB(cb->skb).portid,
+ cb->nlh->nlmsg_seq,
+@@ -4763,6 +4782,8 @@ next:
+ ifaca = ifaca->aca_next, ip_idx++) {
+ if (ip_idx < s_ip_idx)
+ continue;
++ if (!v6_addr_in_nx_info(nxi, &ifaca->aca_addr, -1))
++ continue;
+ err = inet6_fill_ifacaddr(skb, ifaca,
+ NETLINK_CB(cb->skb).portid,
+ cb->nlh->nlmsg_seq,
+@@ -4791,6 +4812,10 @@ static int inet6_dump_addr(struct sk_buf
+ struct inet6_dev *idev;
+ struct hlist_head *head;
+
++ /* FIXME: maybe disable ipv6 on non v6 guests?
++ if (skb->sk && skb->sk->sk_vx_info)
++ return skb->len; */
+
- #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
- if (tw->tw_family == PF_INET6) {
- struct ipv6_pinfo *np = inet6_sk(sk);
-diff -NurpP --minimal linux-2.6.19.1/net/ipv4/udp.c linux-2.6.19.1-vs2.3.0.6/net/ipv4/udp.c
---- linux-2.6.19.1/net/ipv4/udp.c 2006-11-30 21:19:45 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/net/ipv4/udp.c 2006-12-17 03:36:34 +0100
-@@ -108,6 +108,7 @@
- #include <net/inet_common.h>
- #include <net/checksum.h>
- #include <net/xfrm.h>
-+// #include <linux/vs_base.h>
+ s_h = cb->args[0];
+ s_idx = idx = cb->args[1];
+ s_ip_idx = ip_idx = cb->args[2];
+@@ -5309,6 +5334,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];
+@@ -5320,6 +5346,8 @@ static int inet6_dump_ifinfo(struct sk_b
+ hlist_for_each_entry_rcu(dev, head, index_hlist) {
+ if (idx < s_idx)
+ goto cont;
++ if (!v6_dev_in_nx_info(dev, nxi))
++ goto cont;
+ idev = __in6_dev_get(dev);
+ if (!idev)
+ goto cont;
+diff -urNp -x '*.orig' linux-4.9/net/ipv6/af_inet6.c linux-4.9/net/ipv6/af_inet6.c
+--- linux-4.9/net/ipv6/af_inet6.c 2021-02-24 15:47:32.607352350 +0100
++++ linux-4.9/net/ipv6/af_inet6.c 2021-02-24 15:47:45.141077785 +0100
+@@ -43,6 +43,7 @@
+ #include <linux/netdevice.h>
+ #include <linux/icmpv6.h>
+ #include <linux/netfilter_ipv6.h>
++#include <linux/vs_inet.h>
- /*
- * Snmp MIB for the UDP layer
-@@ -195,6 +196,8 @@ gotit:
- (!sk2->sk_reuse || !sk->sk_reuse) &&
- (!sk2->sk_bound_dev_if || !sk->sk_bound_dev_if
- || sk2->sk_bound_dev_if == sk->sk_bound_dev_if) &&
-+ /* FIXME: nx_addr_conflict(sk->sk_nx_info,
-+ inet_rcv_saddr(sk), sk2) && */
- (*saddr_cmp)(sk, sk2) )
- goto fail;
+ #include <net/ip.h>
+ #include <net/ipv6.h>
+@@ -167,10 +168,13 @@ lookup_protocol:
}
-@@ -260,6 +263,11 @@ static struct sock *udp_v4_lookup_longwa
- if (inet->rcv_saddr != daddr)
- continue;
- score+=2;
-+ } else if (sk->sk_nx_info) {
-+ if (addr_in_nx_info(sk->sk_nx_info, daddr))
-+ score+=2;
-+ else
-+ continue;
- }
- if (inet->daddr) {
- if (inet->daddr != saddr)
-@@ -316,7 +324,8 @@ static inline struct sock *udp_v4_mcast_
- if (inet->num != hnum ||
- (inet->daddr && inet->daddr != rmt_addr) ||
- (inet->dport != rmt_port && inet->dport) ||
-- (inet->rcv_saddr && inet->rcv_saddr != loc_addr) ||
-+ (inet->rcv_saddr && inet->rcv_saddr != loc_addr &&
-+ inet->rcv_saddr2 && inet->rcv_saddr2 != loc_addr) ||
- ipv6_only_sock(s) ||
- (s->sk_bound_dev_if && s->sk_bound_dev_if != dif))
- continue;
-@@ -626,7 +635,13 @@ int udp_sendmsg(struct kiocb *iocb, stru
- .uli_u = { .ports =
- { .sport = inet->sport,
- .dport = dport } } };
-+ struct nx_info *nxi = sk->sk_nx_info;
-+
- security_sk_classify_flow(sk, &fl);
-+ err = ip_find_src(nxi, &rt, &fl);
-+ if (err)
-+ goto out;
+
+ err = -EPERM;
++ if ((protocol == IPPROTO_ICMPV6) &&
++ nx_capable(CAP_NET_RAW, NXC_RAW_ICMP))
++ goto override;
+ if (sock->type == SOCK_RAW && !kern &&
+ !ns_capable(net->user_ns, CAP_NET_RAW))
+ goto out_rcu_unlock;
+-
++override:
+ sock->ops = answer->ops;
+ answer_prot = answer->prot;
+ answer_flags = answer->flags;
+@@ -272,6 +276,7 @@ int inet6_bind(struct socket *sock, stru
+ struct inet_sock *inet = inet_sk(sk);
+ struct ipv6_pinfo *np = inet6_sk(sk);
+ struct net *net = sock_net(sk);
++ struct nx_v6_sock_addr nsa;
+ __be32 v4addr = 0;
+ unsigned short snum;
+ bool saved_ipv6only;
+@@ -288,6 +293,10 @@ int inet6_bind(struct socket *sock, stru
+ if (addr->sin6_family != AF_INET6)
+ return -EAFNOSUPPORT;
+
++ err = v6_map_sock_addr(inet, addr, &nsa);
++ if (err)
++ return err;
+
- err = ip_route_output_flow(&rt, &fl, sk, !(msg->msg_flags&MSG_DONTWAIT));
- if (err)
+ addr_type = ipv6_addr_type(&addr->sin6_addr);
+ if ((addr_type & IPV6_ADDR_MULTICAST) && sock->type == SOCK_STREAM)
+ return -EINVAL;
+@@ -340,6 +349,10 @@ int inet6_bind(struct socket *sock, stru
+ err = -EADDRNOTAVAIL;
goto out;
-@@ -1451,8 +1466,10 @@ static struct sock *udp_get_first(struct
+ }
++ if (!v4_addr_in_nx_info(sk->sk_nx_info, v4addr, NXA_MASK_BIND)) {
++ err = -EADDRNOTAVAIL;
++ goto out;
++ }
+ } else {
+ if (addr_type != IPV6_ADDR_ANY) {
+ struct net_device *dev = NULL;
+@@ -369,6 +382,11 @@ int inet6_bind(struct socket *sock, stru
+ }
+ }
- for (state->bucket = 0; state->bucket < UDP_HTABLE_SIZE; ++state->bucket) {
- struct hlist_node *node;
++ if (!v6_addr_in_nx_info(sk->sk_nx_info, &addr->sin6_addr, -1)) {
++ err = -EADDRNOTAVAIL;
++ goto out_unlock;
++ }
+
- sk_for_each(sk, node, &udp_hash[state->bucket]) {
-- if (sk->sk_family == state->family)
-+ if (sk->sk_family == state->family &&
-+ nx_check(sk->sk_nid, VS_WATCH_P|VS_IDENT))
- goto found;
+ /* ipv4 addr of the socket is invalid. Only the
+ * unspecified and mapped address have a v4 equivalent.
+ */
+@@ -386,6 +404,9 @@ int inet6_bind(struct socket *sock, stru
}
}
-@@ -1469,7 +1486,8 @@ static struct sock *udp_get_next(struct
- sk = sk_next(sk);
- try_again:
- ;
-- } while (sk && sk->sk_family != state->family);
-+ } while (sk && (sk->sk_family != state->family ||
-+ !nx_check(sk->sk_nid, VS_WATCH_P|VS_IDENT)));
-
- if (!sk && ++state->bucket < UDP_HTABLE_SIZE) {
- sk = sk_head(&udp_hash[state->bucket]);
-diff -NurpP --minimal linux-2.6.19.1/net/ipv6/addrconf.c linux-2.6.19.1-vs2.3.0.6/net/ipv6/addrconf.c
---- linux-2.6.19.1/net/ipv6/addrconf.c 2006-11-30 21:19:45 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/net/ipv6/addrconf.c 2006-12-08 00:31:37 +0100
-@@ -2730,7 +2730,10 @@ static void if6_seq_stop(struct seq_file
- static int if6_seq_show(struct seq_file *seq, void *v)
+
++ /* what's that for? */
++ v6_set_sock_addr(inet, &nsa);
++
+ inet->inet_rcv_saddr = v4addr;
+ inet->inet_saddr = v4addr;
+
+@@ -492,9 +513,11 @@ int inet6_getname(struct socket *sock, s
+ return -ENOTCONN;
+ sin->sin6_port = inet->inet_dport;
+ sin->sin6_addr = sk->sk_v6_daddr;
++ /* FIXME: remap lback? */
+ if (np->sndflow)
+ sin->sin6_flowinfo = np->flow_label;
+ } else {
++ /* FIXME: remap lback? */
+ if (ipv6_addr_any(&sk->sk_v6_rcv_saddr))
+ sin->sin6_addr = np->saddr;
+ else
+diff -urNp -x '*.orig' linux-4.9/net/ipv6/datagram.c linux-4.9/net/ipv6/datagram.c
+--- linux-4.9/net/ipv6/datagram.c 2021-02-24 15:47:32.610685787 +0100
++++ linux-4.9/net/ipv6/datagram.c 2021-02-24 15:47:45.141077785 +0100
+@@ -792,7 +792,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 -urNp -x '*.orig' linux-4.9/net/ipv6/fib6_rules.c linux-4.9/net/ipv6/fib6_rules.c
+--- linux-4.9/net/ipv6/fib6_rules.c 2021-02-24 15:47:32.610685787 +0100
++++ linux-4.9/net/ipv6/fib6_rules.c 2021-02-24 15:47:45.141077785 +0100
+@@ -102,7 +102,7 @@ static int fib6_rule_action(struct fib_r
+ ip6_dst_idev(&rt->dst)->dev,
+ &flp6->daddr,
+ rt6_flags2srcprefs(flags),
+- &saddr))
++ &saddr, NULL))
+ goto again;
+ if (!ipv6_prefix_equal(&saddr, &r->src.addr,
+ r->src.plen))
+diff -urNp -x '*.orig' linux-4.9/net/ipv6/inet6_hashtables.c linux-4.9/net/ipv6/inet6_hashtables.c
+--- linux-4.9/net/ipv6/inet6_hashtables.c 2021-02-24 15:47:32.610685787 +0100
++++ linux-4.9/net/ipv6/inet6_hashtables.c 2021-02-24 15:47:45.141077785 +0100
+@@ -16,6 +16,7 @@
+
+ #include <linux/module.h>
+ #include <linux/random.h>
++#include <linux/vs_inet6.h>
+
+ #include <net/addrconf.h>
+ #include <net/inet_connection_sock.h>
+@@ -108,6 +109,9 @@ static inline int compute_score(struct s
+ if (!ipv6_addr_equal(&sk->sk_v6_rcv_saddr, daddr))
+ return -1;
+ score++;
++ } else {
++ if (!v6_addr_in_nx_info(sk->sk_nx_info, daddr, -1))
++ return -1;
+ }
+ if (sk->sk_bound_dev_if || exact_dif) {
+ if (sk->sk_bound_dev_if != dif)
+@@ -283,39 +287,71 @@ EXPORT_SYMBOL_GPL(inet6_hash);
+ * IPV6_ADDR_ANY only equals to IPV6_ADDR_ANY,
+ * and 0.0.0.0 equals to 0.0.0.0 only
+ */
+-int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2,
++int ipv6_rcv_saddr_equal(const struct sock *sk1, const struct sock *sk2,
+ bool match_wildcard)
{
- struct inet6_ifaddr *ifp = (struct inet6_ifaddr *)v;
-- seq_printf(seq,
++ const struct in6_addr *sk1_rcv_saddr6 = inet6_rcv_saddr(sk1);
+ const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2);
++ __be32 sk1_rcv_saddr = sk1->sk_rcv_saddr;
++ __be32 sk2_rcv_saddr = sk2->sk_rcv_saddr;
++ int sk1_ipv6only = inet_v6_ipv6only(sk1);
+ int sk2_ipv6only = inet_v6_ipv6only(sk2);
+- int addr_type = ipv6_addr_type(&sk->sk_v6_rcv_saddr);
++ int addr_type1 = ipv6_addr_type(sk1_rcv_saddr6);
+ int addr_type2 = sk2_rcv_saddr6 ? ipv6_addr_type(sk2_rcv_saddr6) : IPV6_ADDR_MAPPED;
+
++
++ /* if one is mapped and the other is ipv6only exit early */
++ if (addr_type1 == IPV6_ADDR_MAPPED && sk2_ipv6only)
++ return 0;
+
-+ /* no ipv6 inside a vserver for now */
-+ if (vx_check(0, VS_ADMIN|VS_WATCH))
-+ seq_printf(seq,
- NIP6_SEQFMT " %02x %02x %02x %02x %8s\n",
- NIP6(ifp->addr),
- ifp->idev->dev->ifindex,
-@@ -3203,6 +3206,10 @@ static int inet6_dump_addr(struct sk_buf
- struct ifmcaddr6 *ifmca;
- struct ifacaddr6 *ifaca;
++ if (addr_type2 == IPV6_ADDR_MAPPED && sk1_ipv6only)
++ return 0;
++
+ /* if both are mapped, treat as IPv4 */
+- if (addr_type == IPV6_ADDR_MAPPED && addr_type2 == IPV6_ADDR_MAPPED) {
+- if (!sk2_ipv6only) {
+- if (sk->sk_rcv_saddr == sk2->sk_rcv_saddr)
+- return 1;
+- if (!sk->sk_rcv_saddr || !sk2->sk_rcv_saddr)
+- return match_wildcard;
+- }
++ if (addr_type1 == IPV6_ADDR_MAPPED && addr_type2 == IPV6_ADDR_MAPPED) {
++ if (sk1_rcv_saddr == sk2_rcv_saddr)
++ return 1;
++ if ((!sk1_rcv_saddr || !sk2_rcv_saddr) && match_wildcard)
++ goto vs_v4;
+ return 0;
+ }
-+ /* no ipv6 inside a vserver for now */
-+ if (skb->sk && skb->sk->sk_vx_info)
-+ return skb->len;
+- if (addr_type == IPV6_ADDR_ANY && addr_type2 == IPV6_ADDR_ANY)
++ /* if both are wildcards, check for overlap */
++ if (addr_type1 == IPV6_ADDR_ANY && addr_type2 == IPV6_ADDR_ANY)
++ return nx_v6_addr_conflict(sk1->sk_nx_info, sk2->sk_nx_info);
+
- s_idx = cb->args[0];
- s_ip_idx = ip_idx = cb->args[1];
- read_lock(&dev_base_lock);
-@@ -3480,6 +3487,10 @@ static int inet6_dump_ifinfo(struct sk_b
- struct net_device *dev;
- struct inet6_dev *idev;
++ /* if both are valid ipv6 addresses, mapped handled above */
++ if (addr_type1 != IPV6_ADDR_ANY && addr_type2 != IPV6_ADDR_ANY &&
++ sk2_rcv_saddr6 && ipv6_addr_equal(sk1_rcv_saddr6, sk2_rcv_saddr6))
+ return 1;
-+ /* no ipv6 inside a vserver for now */
-+ if (skb->sk && skb->sk->sk_vx_info)
-+ return skb->len;
+- if (addr_type2 == IPV6_ADDR_ANY && match_wildcard &&
+- !(sk2_ipv6only && addr_type == IPV6_ADDR_MAPPED))
+- return 1;
++ if (addr_type1 == IPV6_ADDR_ANY && match_wildcard) {
++ /* ipv6only case handled above */
++ if (addr_type2 == IPV6_ADDR_MAPPED)
++ return v4_addr_in_nx_info(sk1->sk_nx_info, sk2_rcv_saddr, -1);
++ else
++ return v6_addr_in_nx_info(sk1->sk_nx_info, sk2_rcv_saddr6, -1);
++ }
+
+- if (addr_type == IPV6_ADDR_ANY && match_wildcard &&
+- !(ipv6_only_sock(sk) && addr_type2 == IPV6_ADDR_MAPPED))
+- return 1;
++ if (addr_type2 == IPV6_ADDR_ANY && match_wildcard) {
++ /* ipv6only case handled above */
++ if (addr_type1 == IPV6_ADDR_MAPPED)
++ return v4_addr_in_nx_info(sk2->sk_nx_info, sk1_rcv_saddr, -1);
++ else
++ return v6_addr_in_nx_info(sk2->sk_nx_info, sk1_rcv_saddr6, -1);
++ }
+
+- if (sk2_rcv_saddr6 &&
+- ipv6_addr_equal(&sk->sk_v6_rcv_saddr, sk2_rcv_saddr6))
+- return 1;
++ return 0;
+
- read_lock(&dev_base_lock);
- for (dev=dev_base, idx=0; dev; dev = dev->next, idx++) {
- if (idx < s_idx)
-diff -NurpP --minimal linux-2.6.19.1/net/netlink/af_netlink.c linux-2.6.19.1-vs2.3.0.6/net/netlink/af_netlink.c
---- linux-2.6.19.1/net/netlink/af_netlink.c 2006-11-30 21:19:46 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/net/netlink/af_netlink.c 2006-11-08 21:52:09 +0100
-@@ -56,6 +56,9 @@
- #include <linux/types.h>
- #include <linux/audit.h>
- #include <linux/selinux.h>
++vs_v4:
++ if (!sk1_rcv_saddr && !sk2_rcv_saddr)
++ return nx_v4_addr_conflict(sk1->sk_nx_info, sk2->sk_nx_info);
++
++ if (!sk2_rcv_saddr)
++ return v4_addr_in_nx_info(sk1->sk_nx_info, sk2_rcv_saddr, -1);
++
++ if (!sk1_rcv_saddr)
++ return v4_addr_in_nx_info(sk2->sk_nx_info, sk1_rcv_saddr, -1);
+
+ return 0;
+ }
+diff -urNp -x '*.orig' linux-4.9/net/ipv6/ip6_fib.c linux-4.9/net/ipv6/ip6_fib.c
+--- linux-4.9/net/ipv6/ip6_fib.c 2021-02-24 15:47:32.610685787 +0100
++++ linux-4.9/net/ipv6/ip6_fib.c 2021-02-24 15:47:45.141077785 +0100
+@@ -1977,6 +1977,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 -urNp -x '*.orig' linux-4.9/net/ipv6/ip6_output.c linux-4.9/net/ipv6/ip6_output.c
+--- linux-4.9/net/ipv6/ip6_output.c 2021-02-24 15:47:33.077367054 +0100
++++ linux-4.9/net/ipv6/ip6_output.c 2021-02-24 15:47:45.141077785 +0100
+@@ -966,7 +966,8 @@ static int ip6_dst_lookup_tail(struct ne
+ rt = (*dst)->error ? NULL : (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 -urNp -x '*.orig' linux-4.9/net/ipv6/ip6_tunnel.c linux-4.9/net/ipv6/ip6_tunnel.c
+--- linux-4.9/net/ipv6/ip6_tunnel.c 2021-02-24 15:47:32.614019225 +0100
++++ linux-4.9/net/ipv6/ip6_tunnel.c 2021-02-24 15:47:45.141077785 +0100
+@@ -1124,7 +1124,7 @@ route_lookup:
+ }
+ if (t->parms.collect_md &&
+ ipv6_dev_get_saddr(net, ip6_dst_idev(dst)->dev,
+- &fl6->daddr, 0, &fl6->saddr))
++ &fl6->daddr, 0, &fl6->saddr, NULL))
+ goto tx_err_link_failure;
+ ndst = dst;
+ }
+diff -urNp -x '*.orig' linux-4.9/net/ipv6/ndisc.c linux-4.9/net/ipv6/ndisc.c
+--- linux-4.9/net/ipv6/ndisc.c 2021-02-24 15:47:32.614019225 +0100
++++ linux-4.9/net/ipv6/ndisc.c 2021-02-24 15:47:45.141077785 +0100
+@@ -512,7 +512,7 @@ void ndisc_send_na(struct net_device *de
+ } else {
+ if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr,
+ inet6_sk(dev_net(dev)->ipv6.ndisc_sk)->srcprefs,
+- &tmpaddr))
++ &tmpaddr, NULL))
+ return;
+ src_addr = &tmpaddr;
+ }
+diff -urNp -x '*.orig' linux-4.9/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c linux-4.9/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c
+--- linux-4.9/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c 2021-02-24 15:47:45.141077785 +0100
+@@ -39,7 +39,7 @@ nf_nat_masquerade_ipv6(struct sk_buff *s
+ ctinfo == IP_CT_RELATED_REPLY));
+
+ if (ipv6_dev_get_saddr(nf_ct_net(ct), 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 -urNp -x '*.orig' linux-4.9/net/ipv6/raw.c linux-4.9/net/ipv6/raw.c
+--- linux-4.9/net/ipv6/raw.c 2021-02-24 15:47:32.617352663 +0100
++++ linux-4.9/net/ipv6/raw.c 2021-02-24 15:47:45.141077785 +0100
+@@ -293,6 +293,13 @@ static int rawv6_bind(struct sock *sk, s
+ goto out_unlock;
+ }
+
++ if (!v6_addr_in_nx_info(sk->sk_nx_info, &addr->sin6_addr, -1)) {
++ err = -EADDRNOTAVAIL;
++ if (dev)
++ dev_put(dev);
++ goto out;
++ }
++
+ /* ipv4 addr of the socket is invalid. Only the
+ * unspecified and mapped address have a v4 equivalent.
+ */
+diff -urNp -x '*.orig' linux-4.9/net/ipv6/route.c linux-4.9/net/ipv6/route.c
+--- linux-4.9/net/ipv6/route.c 2021-02-24 15:47:32.617352663 +0100
++++ linux-4.9/net/ipv6/route.c 2021-02-24 15:47:45.144411223 +0100
+@@ -3297,7 +3297,8 @@ static int rt6_fill_node(struct net *net
+ goto nla_put_failure;
+ } else if (dst) {
+ struct in6_addr saddr_buf;
+- if (ip6_route_get_saddr(net, rt, dst, 0, &saddr_buf) == 0 &&
++ if (ip6_route_get_saddr(net, rt, dst, 0, &saddr_buf,
++ (skb->sk ? skb->sk->sk_nx_info : NULL)) == 0 &&
+ nla_put_in6_addr(skb, RTA_PREFSRC, &saddr_buf))
+ goto nla_put_failure;
+ }
+diff -urNp -x '*.orig' linux-4.9/net/ipv6/tcp_ipv6.c linux-4.9/net/ipv6/tcp_ipv6.c
+--- linux-4.9/net/ipv6/tcp_ipv6.c 2021-02-24 15:47:32.620686100 +0100
++++ linux-4.9/net/ipv6/tcp_ipv6.c 2021-02-24 15:47:45.144411223 +0100
+@@ -149,11 +149,18 @@ static int tcp_v6_connect(struct sock *s
+ */
+
+ if (ipv6_addr_any(&usin->sin6_addr)) {
+- if (ipv6_addr_v4mapped(&sk->sk_v6_rcv_saddr))
+- ipv6_addr_set_v4mapped(htonl(INADDR_LOOPBACK),
+- &usin->sin6_addr);
+- else
+- usin->sin6_addr = in6addr_loopback;
++ struct nx_info *nxi = sk->sk_nx_info;
++
++ if (nxi && nx_info_has_v6(nxi))
++ /* FIXME: remap lback? */
++ usin->sin6_addr = nxi->v6.ip;
++ else {
++ if (ipv6_addr_v4mapped(&sk->sk_v6_rcv_saddr))
++ ipv6_addr_set_v4mapped(htonl(INADDR_LOOPBACK),
++ &usin->sin6_addr);
++ else
++ usin->sin6_addr = in6addr_loopback;
++ }
+ }
+
+ addr_type = ipv6_addr_type(&usin->sin6_addr);
+diff -urNp -x '*.orig' linux-4.9/net/ipv6/udp.c linux-4.9/net/ipv6/udp.c
+--- linux-4.9/net/ipv6/udp.c 2021-02-24 15:47:32.620686100 +0100
++++ linux-4.9/net/ipv6/udp.c 2021-02-24 15:47:45.144411223 +0100
+@@ -135,6 +135,10 @@ static int compute_score(struct sock *sk
+ if (inet->inet_dport != sport)
+ return -1;
+ score++;
++ } else {
++ /* block non nx_info ips */
++ if (!v6_addr_in_nx_info(sk->sk_nx_info, daddr, -1))
++ return -1;
+ }
+
+ if (!ipv6_addr_any(&sk->sk_v6_rcv_saddr)) {
+diff -urNp -x '*.orig' linux-4.9/net/ipv6/xfrm6_policy.c linux-4.9/net/ipv6/xfrm6_policy.c
+--- linux-4.9/net/ipv6/xfrm6_policy.c 2021-02-24 15:47:32.620686100 +0100
++++ linux-4.9/net/ipv6/xfrm6_policy.c 2021-02-24 15:47:45.144411223 +0100
+@@ -64,7 +64,8 @@ static int xfrm6_get_saddr(struct net *n
+ return -EHOSTUNREACH;
+
+ dev = ip6_dst_idev(dst)->dev;
+- ipv6_dev_get_saddr(dev_net(dev), dev, &daddr->in6, 0, &saddr->in6);
++ ipv6_dev_get_saddr(dev_net(dev), dev, &daddr->in6,
++ 0, &saddr->in6, NULL);
+ dst_release(dst);
+ return 0;
+ }
+diff -urNp -x '*.orig' linux-4.9/net/netfilter/ipvs/ip_vs_xmit.c linux-4.9/net/netfilter/ipvs/ip_vs_xmit.c
+--- linux-4.9/net/netfilter/ipvs/ip_vs_xmit.c 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/net/netfilter/ipvs/ip_vs_xmit.c 2021-02-24 15:47:45.144411223 +0100
+@@ -381,7 +381,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 -urNp -x '*.orig' linux-4.9/net/netlink/af_netlink.c linux-4.9/net/netlink/af_netlink.c
+--- linux-4.9/net/netlink/af_netlink.c 2021-02-24 15:47:32.654020476 +0100
++++ linux-4.9/net/netlink/af_netlink.c 2021-02-24 15:47:45.144411223 +0100
+@@ -63,6 +63,8 @@
+ #include <linux/hash.h>
+ #include <linux/genetlink.h>
+ #include <linux/nospec.h>
+#include <linux/vs_context.h>
+#include <linux/vs_network.h>
-+#include <linux/vs_limit.h>
+ #include <net/net_namespace.h>
+ #include <net/sock.h>
+@@ -2478,7 +2480,8 @@ static void *__netlink_seq_next(struct s
+ if (err)
+ return ERR_PTR(err);
+ }
+- } while (sock_net(&nlk->sk) != seq_file_net(seq));
++ } while ((sock_net(&nlk->sk) != seq_file_net(seq)) ||
++ !nx_check(nlk->sk.sk_nid, VS_WATCH_P | VS_IDENT));
+
+ return nlk;
+ }
+diff -urNp -x '*.orig' linux-4.9/net/packet/diag.c linux-4.9/net/packet/diag.c
+--- linux-4.9/net/packet/diag.c 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/net/packet/diag.c 2021-02-24 15:47:45.144411223 +0100
+@@ -4,6 +4,7 @@
+ #include <linux/netdevice.h>
+ #include <linux/packet_diag.h>
+ #include <linux/percpu.h>
++#include <linux/vs_network.h>
+ #include <net/net_namespace.h>
#include <net/sock.h>
- #include <net/scm.h>
-diff -NurpP --minimal linux-2.6.19.1/net/socket.c linux-2.6.19.1-vs2.3.0.6/net/socket.c
---- linux-2.6.19.1/net/socket.c 2006-11-30 21:19:46 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/net/socket.c 2006-12-04 05:08:37 +0100
-@@ -93,6 +93,8 @@
+
+@@ -201,6 +202,8 @@ static int packet_diag_dump(struct sk_bu
+ sk_for_each(sk, &net->packet.sklist) {
+ 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;
+
+diff -urNp -x '*.orig' linux-4.9/net/socket.c linux-4.9/net/socket.c
+--- linux-4.9/net/socket.c 2021-02-24 15:47:32.680687977 +0100
++++ linux-4.9/net/socket.c 2021-02-24 15:47:45.144411223 +0100
+@@ -100,10 +100,12 @@
#include <net/sock.h>
#include <linux/netfilter.h>
-+#include <linux/vs_base.h>
+#include <linux/vs_socket.h>
++#include <linux/vs_inet.h>
++#include <linux/vs_inet6.h>
- static int sock_no_open(struct inode *irrelevant, struct file *dontcare);
- static ssize_t sock_aio_read(struct kiocb *iocb, const struct iovec *iov,
-@@ -540,7 +542,7 @@ static inline int __sock_sendmsg(struct
- struct msghdr *msg, size_t size)
- {
- struct sock_iocb *si = kiocb_to_siocb(iocb);
-- int err;
-+ int err, len;
-
- si->sock = sock;
- si->scm = NULL;
-@@ -551,7 +553,22 @@ static inline int __sock_sendmsg(struct
- if (err)
- return err;
+ #include <linux/if_tun.h>
+ #include <linux/ipv6_route.h>
+-#include <linux/route.h>
+ #include <linux/sockios.h>
+ #include <linux/atalk.h>
+ #include <net/busy_poll.h>
+@@ -619,8 +621,24 @@ EXPORT_SYMBOL(__sock_tx_timestamp);
-- return sock->ops->sendmsg(iocb, sock, msg, size);
-+ len = sock->ops->sendmsg(iocb, sock, msg, size);
+ static inline int sock_sendmsg_nosec(struct socket *sock, struct msghdr *msg)
+ {
+- int ret = sock->ops->sendmsg(sock, msg, msg_data_left(msg));
+- BUG_ON(ret == -EIOCBQUEUED);
++ size_t size = msg_data_left(msg);
++ int ret = sock->ops->sendmsg(sock, msg, size);
++#if 0
+ if (sock->sk) {
-+ if (len == size)
-+ vx_sock_send(sock->sk, size);
-+ else
++ if (!ret)
+ vx_sock_fail(sock->sk, size);
++ else
++ vx_sock_send(sock->sk, size);
+ }
++#endif
+ vxdprintk(VXD_CBIT(net, 7),
-+ "__sock_sendmsg: %p[%p,%p,%p;%d/%d]:%d/%d",
-+ sock, sock->sk,
-+ (sock->sk)?sock->sk->sk_nx_info:0,
-+ (sock->sk)?sock->sk->sk_vx_info:0,
-+ (sock->sk)?sock->sk->sk_xid:0,
-+ (sock->sk)?sock->sk->sk_nid:0,
-+ (unsigned int)size, len);
-+ return len;
- }
-
- int sock_sendmsg(struct socket *sock, struct msghdr *msg, size_t size)
-@@ -589,7 +606,7 @@ int kernel_sendmsg(struct socket *sock,
- static inline int __sock_recvmsg(struct kiocb *iocb, struct socket *sock,
- struct msghdr *msg, size_t size, int flags)
- {
-- int err;
-+ int err, len;
- struct sock_iocb *si = kiocb_to_siocb(iocb);
-
- si->sock = sock;
-@@ -602,7 +619,18 @@ static inline int __sock_recvmsg(struct
- if (err)
- return err;
-
-- return sock->ops->recvmsg(iocb, sock, msg, size, flags);
-+ len = sock->ops->recvmsg(iocb, sock, msg, size, flags);
-+ if ((len >= 0) && sock->sk)
-+ vx_sock_recv(sock->sk, len);
-+ vxdprintk(VXD_CBIT(net, 7),
-+ "__sock_recvmsg: %p[%p,%p,%p;%d/%d]:%d/%d",
++ "sock_sendmsg_nosec: %p[%p,%p,%p;%d/%d]:%zu/%zu",
+ sock, sock->sk,
+ (sock->sk)?sock->sk->sk_nx_info:0,
+ (sock->sk)?sock->sk->sk_vx_info:0,
+ (sock->sk)?sock->sk->sk_xid:0,
+ (sock->sk)?sock->sk->sk_nid:0,
-+ (unsigned int)size, len);
-+ return len;
++ size, msg_data_left(msg));
+ return ret;
}
- int sock_recvmsg(struct socket *sock, struct msghdr *msg,
-@@ -1061,6 +1089,10 @@ static int __sock_create(int family, int
+@@ -1110,6 +1128,13 @@ int __sock_create(struct net *net, int f
if (type < 0 || type >= SOCK_MAX)
return -EINVAL;
-+ /* disable IPv6 inside vservers for now */
-+ if (family == PF_INET6 && !vx_check(0, VS_ADMIN))
-+ return -EAFNOSUPPORT;
++ if (!nx_check(0, VS_ADMIN)) {
++ if (family == PF_INET && !current_nx_info_has_v4())
++ return -EAFNOSUPPORT;
++ if (family == PF_INET6 && !current_nx_info_has_v6())
++ return -EAFNOSUPPORT;
++ }
+
/* Compatibility.
This uglymoron is moved from INET layer to here to avoid
-@@ -1178,6 +1210,7 @@ asmlinkage long sys_socket(int family, i
+@@ -1240,6 +1265,7 @@ SYSCALL_DEFINE3(socket, int, family, int
if (retval < 0)
goto out;
+ set_bit(SOCK_USER_SOCKET, &sock->flags);
- retval = sock_map_fd(sock);
+ retval = sock_map_fd(sock, flags & (O_CLOEXEC | O_NONBLOCK));
if (retval < 0)
goto out_release;
-@@ -1209,10 +1242,12 @@ asmlinkage long sys_socketpair(int famil
+@@ -1281,10 +1307,12 @@ SYSCALL_DEFINE4(socketpair, int, family,
err = sock_create(family, type, protocol, &sock1);
if (err < 0)
goto out;
err = sock1->ops->socketpair(sock1, sock2);
if (err < 0)
-diff -NurpP --minimal linux-2.6.19.1/net/sunrpc/auth.c linux-2.6.19.1-vs2.3.0.6/net/sunrpc/auth.c
---- linux-2.6.19.1/net/sunrpc/auth.c 2006-11-30 21:19:46 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/net/sunrpc/auth.c 2006-11-08 04:57:47 +0100
-@@ -13,6 +13,7 @@
- #include <linux/errno.h>
+diff -urNp -x '*.orig' linux-4.9/net/sunrpc/auth.c linux-4.9/net/sunrpc/auth.c
+--- linux-4.9/net/sunrpc/auth.c 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/net/sunrpc/auth.c 2021-02-24 15:47:45.144411223 +0100
+@@ -15,6 +15,7 @@
#include <linux/sunrpc/clnt.h>
+ #include <linux/sunrpc/gss_api.h>
#include <linux/spinlock.h>
+#include <linux/vs_tag.h>
- #ifdef RPC_DEBUG
+ #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
# define RPCDBG_FACILITY RPCDBG_AUTH
-@@ -263,6 +264,7 @@ rpcauth_lookupcred(struct rpc_auth *auth
- struct auth_cred acred = {
- .uid = current->fsuid,
- .gid = current->fsgid,
-+ .tag = dx_current_tag(),
- .group_info = current->group_info,
- };
- struct rpc_cred *ret;
-@@ -282,6 +284,7 @@ rpcauth_bindcred(struct rpc_task *task)
+@@ -630,6 +631,7 @@ rpcauth_lookupcred(struct rpc_auth *auth
+ memset(&acred, 0, sizeof(acred));
+ acred.uid = cred->fsuid;
+ acred.gid = cred->fsgid;
++ acred.tag = make_ktag(&init_user_ns, dx_current_tag());
+ acred.group_info = cred->group_info;
+ ret = auth->au_ops->lookup_cred(auth, &acred, flags);
+ return ret;
+@@ -669,6 +671,7 @@ rpcauth_bind_root_cred(struct rpc_task *
struct auth_cred acred = {
- .uid = current->fsuid,
- .gid = current->fsgid,
-+ .tag = dx_current_tag(),
- .group_info = current->group_info,
+ .uid = GLOBAL_ROOT_UID,
+ .gid = GLOBAL_ROOT_GID,
++ .tag = KTAGT_INIT(dx_current_tag()),
};
- struct rpc_cred *ret;
-diff -NurpP --minimal linux-2.6.19.1/net/sunrpc/auth_unix.c linux-2.6.19.1-vs2.3.0.6/net/sunrpc/auth_unix.c
---- linux-2.6.19.1/net/sunrpc/auth_unix.c 2006-11-30 21:19:46 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/net/sunrpc/auth_unix.c 2006-11-08 04:57:47 +0100
-@@ -11,12 +11,14 @@
- #include <linux/module.h>
+
+ dprintk("RPC: %5u looking up %s cred\n",
+diff -urNp -x '*.orig' linux-4.9/net/sunrpc/auth_unix.c linux-4.9/net/sunrpc/auth_unix.c
+--- linux-4.9/net/sunrpc/auth_unix.c 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/net/sunrpc/auth_unix.c 2021-02-24 15:47:45.144411223 +0100
+@@ -13,11 +13,13 @@
#include <linux/sunrpc/clnt.h>
#include <linux/sunrpc/auth.h>
+ #include <linux/user_namespace.h>
+#include <linux/vs_tag.h>
#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
- if (flags & RPCAUTH_LOOKUP_ROOTCREDS) {
- cred->uc_uid = 0;
- cred->uc_gid = 0;
-+ cred->uc_tag = dx_current_tag();
- cred->uc_gids[0] = NOGROUP;
- } else {
- int groups = acred->group_info->ngroups;
-@@ -86,6 +89,7 @@ unx_create_cred(struct rpc_auth *auth, s
-
- cred->uc_uid = acred->uid;
- cred->uc_gid = acred->gid;
-+ cred->uc_tag = acred->tag;
- for (i = 0; i < groups; i++)
- cred->uc_gids[i] = GROUP_AT(acred->group_info, i);
- if (i < NFS_NGROUPS)
-@@ -117,7 +121,8 @@ unx_match(struct auth_cred *acred, struc
- int groups;
-
- if (cred->uc_uid != acred->uid
-- || cred->uc_gid != acred->gid)
-+ || cred->uc_gid != acred->gid
-+ || cred->uc_tag != acred->tag)
- return 0;
+@@ -86,6 +88,7 @@ unx_create_cred(struct rpc_auth *auth, s
+ groups = NFS_NGROUPS;
+
+ cred->uc_gid = acred->gid;
++ cred->uc_tag = acred->tag;
+ for (i = 0; i < groups; i++)
+ cred->uc_gids[i] = acred->group_info->gid[i];
+ if (i < NFS_NGROUPS)
+@@ -127,7 +130,9 @@ unx_match(struct auth_cred *acred, struc
+ unsigned int i;
+
+
+- if (!uid_eq(cred->uc_uid, acred->uid) || !gid_eq(cred->uc_gid, acred->gid))
++ if (!uid_eq(cred->uc_uid, acred->uid) ||
++ !gid_eq(cred->uc_gid, acred->gid) ||
++ !tag_eq(cred->uc_tag, acred->tag))
+ return 0;
- groups = acred->group_info->ngroups;
-@@ -143,7 +148,7 @@ unx_marshal(struct rpc_task *task, __be3
+ if (acred->group_info != NULL)
+@@ -152,7 +157,7 @@ unx_marshal(struct rpc_task *task, __be3
struct rpc_clnt *clnt = task->tk_client;
- struct unx_cred *cred = (struct unx_cred *) task->tk_msg.rpc_cred;
+ struct unx_cred *cred = container_of(task->tk_rqstp->rq_cred, struct unx_cred, uc_base);
__be32 *base, *hold;
- int i;
+ int i, tag;
*p++ = htonl(RPC_AUTH_UNIX);
base = p++;
-@@ -153,9 +158,12 @@ unx_marshal(struct rpc_task *task, __be3
- * Copy the UTS nodename captured when the client was created.
+@@ -163,8 +168,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.19.1/net/sunrpc/clnt.c linux-2.6.19.1-vs2.3.0.6/net/sunrpc/clnt.c
---- linux-2.6.19.1/net/sunrpc/clnt.c 2006-11-30 21:19:46 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/net/sunrpc/clnt.c 2006-11-08 04:57:47 +0100
-@@ -29,6 +29,7 @@
- #include <linux/slab.h>
- #include <linux/utsname.h>
- #include <linux/workqueue.h>
+ 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 -urNp -x '*.orig' linux-4.9/net/sunrpc/clnt.c linux-4.9/net/sunrpc/clnt.c
+--- linux-4.9/net/sunrpc/clnt.c 2021-02-24 15:47:32.684021415 +0100
++++ linux-4.9/net/sunrpc/clnt.c 2021-02-24 15:47:45.147744660 +0100
+@@ -31,6 +31,7 @@
+ #include <linux/in.h>
+ #include <linux/in6.h>
+ #include <linux/un.h>
+#include <linux/vs_cvirt.h>
#include <linux/sunrpc/clnt.h>
- #include <linux/sunrpc/rpc_pipe_fs.h>
-@@ -238,7 +239,9 @@ struct rpc_clnt *rpc_create(struct rpc_c
- clnt->cl_autobind = 1;
- if (args->flags & RPC_CLNT_CREATE_ONESHOT)
- clnt->cl_oneshot = 1;
--
-+ /* FIXME: handle RPC_CLNT_CREATE_TAGGED
+ #include <linux/sunrpc/addr.h>
+@@ -496,6 +497,9 @@ static struct rpc_clnt *rpc_create_xprt(
+ if (!(args->flags & RPC_CLNT_CREATE_QUIET))
+ clnt->cl_chatty = 1;
+
++ /* TODO: handle RPC_CLNT_CREATE_TAGGED
+ if (args->flags & RPC_CLNT_CREATE_TAGGED)
+ clnt->cl_tag = 1; */
return clnt;
}
- EXPORT_SYMBOL_GPL(rpc_create);
-diff -NurpP --minimal linux-2.6.19.1/net/unix/af_unix.c linux-2.6.19.1-vs2.3.0.6/net/unix/af_unix.c
---- linux-2.6.19.1/net/unix/af_unix.c 2006-11-30 21:19:46 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/net/unix/af_unix.c 2006-12-04 05:08:47 +0100
-@@ -116,6 +116,8 @@
- #include <linux/mount.h>
+
+diff -urNp -x '*.orig' linux-4.9/net/unix/af_unix.c linux-4.9/net/unix/af_unix.c
+--- linux-4.9/net/unix/af_unix.c 2021-02-24 15:47:32.694021728 +0100
++++ linux-4.9/net/unix/af_unix.c 2021-02-24 15:47:45.147744660 +0100
+@@ -117,6 +117,8 @@
#include <net/checksum.h>
#include <linux/security.h>
+ #include <linux/freezer.h>
+#include <linux/vs_context.h>
+#include <linux/vs_limit.h>
- int sysctl_unix_max_dgram_qlen __read_mostly = 10;
-
-@@ -252,6 +254,8 @@ static struct sock *__unix_find_socket_b
- sk_for_each(s, node, &unix_socket_table[hash ^ type]) {
- struct unix_sock *u = unix_sk(s);
+ struct hlist_head unix_socket_table[2 * UNIX_HASH_SIZE];
+ EXPORT_SYMBOL_GPL(unix_socket_table);
+@@ -290,6 +292,8 @@ static struct sock *__unix_find_socket_b
+ if (!net_eq(sock_net(s), net))
+ continue;
-+ if (!nx_check(s->sk_nid, VS_WATCH_P|VS_IDENT))
++ if (!nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT))
+ continue;
if (u->addr->len == len &&
!memcmp(u->addr->name, sunname, len))
goto found;
-@@ -807,7 +811,7 @@ static int unix_bind(struct socket *sock
- */
- mode = S_IFSOCK |
- (SOCK_INODE(sock)->i_mode & ~current->fs->umask);
-- err = vfs_mknod(nd.dentry->d_inode, dentry, mode, 0);
-+ err = vfs_mknod(nd.dentry->d_inode, dentry, mode, 0, NULL);
- if (err)
- goto out_mknod_dput;
- mutex_unlock(&nd.dentry->d_inode->i_mutex);
-diff -NurpP --minimal linux-2.6.19.1/net/x25/af_x25.c linux-2.6.19.1-vs2.3.0.6/net/x25/af_x25.c
---- linux-2.6.19.1/net/x25/af_x25.c 2006-09-20 16:58:54 +0200
-+++ linux-2.6.19.1-vs2.3.0.6/net/x25/af_x25.c 2006-11-08 04:57:42 +0100
-@@ -501,7 +501,10 @@ static int x25_create(struct socket *soc
-
- x25 = x25_sk(sk);
-
-- sock_init_data(sock, sk);
-+ sk->sk_socket = sock;
-+ sk->sk_type = sock->type;
-+ sk->sk_sleep = &sock->wait;
-+ sock->sk = sk;
-
- x25_init_timers(sk);
-
-Files linux-2.6.19.1/scripts/kconfig/mconf and linux-2.6.19.1-vs2.3.0.6/scripts/kconfig/mconf differ
-diff -NurpP --minimal linux-2.6.19.1/security/commoncap.c linux-2.6.19.1-vs2.3.0.6/security/commoncap.c
---- linux-2.6.19.1/security/commoncap.c 2006-11-30 21:19:47 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/security/commoncap.c 2006-11-30 19:54:52 +0100
-@@ -23,10 +23,11 @@
- #include <linux/ptrace.h>
- #include <linux/xattr.h>
- #include <linux/hugetlb.h>
-+#include <linux/vs_context.h>
-
- int cap_netlink_send(struct sock *sk, struct sk_buff *skb)
- {
-- NETLINK_CB(skb).eff_cap = current->cap_effective;
-+ cap_t(NETLINK_CB(skb).eff_cap) = vx_mbcap(cap_effective);
- return 0;
+@@ -2751,6 +2755,8 @@ static struct sock *unix_from_bucket(str
+ for (sk = sk_head(&unix_socket_table[bucket]); sk; sk = sk_next(sk)) {
+ if (sock_net(sk) != seq_file_net(seq))
+ continue;
++ if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
++ continue;
+ if (++count == offset)
+ break;
+ }
+@@ -2768,6 +2774,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 -urNp -x '*.orig' linux-4.9/net/unix/diag.c linux-4.9/net/unix/diag.c
+--- linux-4.9/net/unix/diag.c 2021-02-24 15:47:32.694021728 +0100
++++ linux-4.9/net/unix/diag.c 2021-02-24 15:47:45.147744660 +0100
+@@ -4,6 +4,7 @@
+ #include <linux/unix_diag.h>
+ #include <linux/skbuff.h>
+ #include <linux/module.h>
++#include <linux/vs_network.h>
+ #include <net/netlink.h>
+ #include <net/af_unix.h>
+ #include <net/tcp_states.h>
+@@ -200,6 +201,8 @@ static int unix_diag_dump(struct sk_buff
+ sk_for_each(sk, &unix_socket_table[slot]) {
+ 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;
+ if (!(req->udiag_states & (1 << sk->sk_state)))
+diff -urNp -x '*.orig' linux-4.9/scripts/checksyscalls.sh linux-4.9/scripts/checksyscalls.sh
+--- linux-4.9/scripts/checksyscalls.sh 2016-12-11 20:17:54.000000000 +0100
++++ linux-4.9/scripts/checksyscalls.sh 2021-02-24 15:47:45.147744660 +0100
+@@ -196,7 +196,6 @@ cat << EOF
+ #define __IGNORE_afs_syscall
+ #define __IGNORE_getpmsg
+ #define __IGNORE_putpmsg
+-#define __IGNORE_vserver
+ EOF
}
-@@ -44,7 +45,7 @@ EXPORT_SYMBOL(cap_netlink_recv);
- int cap_capable (struct task_struct *tsk, int cap)
+diff -urNp -x '*.orig' linux-4.9/security/commoncap.c linux-4.9/security/commoncap.c
+--- linux-4.9/security/commoncap.c 2021-02-24 15:47:32.714022353 +0100
++++ linux-4.9/security/commoncap.c 2021-02-24 15:47:45.147744660 +0100
+@@ -71,6 +71,7 @@ static void warn_setuid_and_fcaps_mixed(
+ int cap_capable(const struct cred *cred, struct user_namespace *targ_ns,
+ int cap, int audit)
{
- /* Derived from include/linux/sched.h:capable. */
-- if (cap_raised(tsk->cap_effective, cap))
-+ if (vx_cap_raised(tsk->vx_info, tsk->cap_effective, cap))
- return 0;
- return -EPERM;
- }
-@@ -142,7 +143,8 @@ void cap_bprm_apply_creds (struct linux_
- /* Derived from fs/exec.c:compute_creds. */
- kernel_cap_t new_permitted, working;
-
-- new_permitted = cap_intersect (bprm->cap_permitted, cap_bset);
-+ new_permitted = cap_intersect (bprm->cap_permitted,
-+ vx_current_cap_bset());
- working = cap_intersect (bprm->cap_inheritable,
- current->cap_inheritable);
- new_permitted = cap_combine (new_permitted, working);
-@@ -311,7 +313,8 @@ void cap_task_reparent_to_init (struct t
-
- int cap_syslog (int type)
- {
-- if ((type != 3 && type != 10) && !capable(CAP_SYS_ADMIN))
-+ if ((type != 3 && type != 10) &&
-+ !vx_capable(CAP_SYS_ADMIN, VXC_SYSLOG))
- return -EPERM;
- return 0;
- }
-diff -NurpP --minimal linux-2.6.19.1/security/dummy.c linux-2.6.19.1-vs2.3.0.6/security/dummy.c
---- linux-2.6.19.1/security/dummy.c 2006-11-30 21:19:47 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/security/dummy.c 2006-11-30 19:53:55 +0100
-@@ -28,6 +28,7 @@
- #include <linux/hugetlb.h>
- #include <linux/ptrace.h>
- #include <linux/file.h>
-+#include <linux/vs_context.h>
++ struct vx_info *vxi = current_vx_info(); /* FIXME: get vxi from cred? */
+ struct user_namespace *ns = targ_ns;
- static int dummy_ptrace (struct task_struct *parent, struct task_struct *child)
- {
-@@ -84,7 +85,7 @@ static int dummy_sysctl (ctl_table * tab
- return 0;
- }
+ /* See if cred has the capability in the target user namespace
+@@ -79,8 +80,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;
++ }
--static int dummy_quotactl (int cmds, int type, int id, struct super_block *sb)
-+static int dummy_quotactl (int cmds, int type, int id, struct dqhash *hash)
- {
- return 0;
- }
-@@ -678,7 +679,7 @@ static int dummy_sem_semop (struct sem_a
+ /* Have we tried all of the parent namespaces? */
+ if (ns == &init_user_ns)
+@@ -668,7 +673,7 @@ int cap_inode_setxattr(struct dentry *de
- static int dummy_netlink_send (struct sock *sk, struct sk_buff *skb)
- {
-- NETLINK_CB(skb).eff_cap = current->cap_effective;
-+ cap_t(NETLINK_CB(skb).eff_cap) = vx_mbcap(cap_effective);
+ if (!strncmp(name, XATTR_SECURITY_PREFIX,
+ sizeof(XATTR_SECURITY_PREFIX) - 1) &&
+- !capable(CAP_SYS_ADMIN))
++ !vx_capable(CAP_SYS_ADMIN, VXC_FS_SECURITY))
+ return -EPERM;
return 0;
}
+@@ -694,7 +699,7 @@ int cap_inode_removexattr(struct dentry
-diff -NurpP --minimal linux-2.6.19.1/security/selinux/hooks.c linux-2.6.19.1-vs2.3.0.6/security/selinux/hooks.c
---- linux-2.6.19.1/security/selinux/hooks.c 2006-11-30 21:19:47 +0100
-+++ linux-2.6.19.1-vs2.3.0.6/security/selinux/hooks.c 2006-11-30 20:55:45 +0100
-@@ -1461,9 +1461,10 @@ static int selinux_sysctl(ctl_table *tab
- return error;
+ if (!strncmp(name, XATTR_SECURITY_PREFIX,
+ sizeof(XATTR_SECURITY_PREFIX) - 1) &&
+- !capable(CAP_SYS_ADMIN))
++ !vx_capable(CAP_SYS_ADMIN, VXC_FS_SECURITY))
+ return -EPERM;
+ return 0;
}
-
--static int selinux_quotactl(int cmds, int type, int id, struct super_block *sb)
-+static int selinux_quotactl(int cmds, int type, int id, struct dqhash *hash)
- {
- int rc = 0;
-+ struct super_block *sb = hash->dqh_sb;
-
- if (!sb)
- return 0;
+diff -urNp -x '*.orig' linux-4.9/security/selinux/hooks.c linux-4.9/security/selinux/hooks.c
+--- linux-4.9/security/selinux/hooks.c 2021-02-24 15:47:32.720689229 +0100
++++ linux-4.9/security/selinux/hooks.c 2021-02-24 15:47:45.147744660 +0100
+@@ -67,7 +67,6 @@
+ #include <linux/dccp.h>
+ #include <linux/quota.h>
+ #include <linux/un.h> /* for Unix socket types */
+-#include <net/af_unix.h> /* for Unix socket types */
+ #include <linux/parser.h>
+ #include <linux/nfs_mount.h>
+ #include <net/ipv6.h>
projects / packages / kernel.git / blobdiff