kernel-vserver-2.3.patch

   1 diff -NurpP --minimal linux-4.9.135/Documentation/vserver/debug.txt linux-4.9.135-vs2.3.9.8/Documentation/vserver/debug.txt
   2 --- linux-4.9.135/Documentation/vserver/debug.txt       1970-01-01 00:00:00.000000000 +0000
   3 +++ linux-4.9.135-vs2.3.9.8/Documentation/vserver/debug.txt     2018-10-20 04:58:12.000000000 +0000
   4 @@ -0,0 +1,154 @@
   5 +
   6 +debug_cvirt:
   7 +
   8 + 2   4 "vx_map_tgid: %p/%llx: %d -> %d"
   9 +       "vx_rmap_tgid: %p/%llx: %d -> %d"
  10 +
  11 +debug_dlim:
  12 +
  13 + 0   1 "ALLOC (%p,#%d)%c inode (%d)"
  14 +       "FREE  (%p,#%d)%c inode"
  15 + 1   2 "ALLOC (%p,#%d)%c %lld bytes (%d)"
  16 +       "FREE  (%p,#%d)%c %lld bytes"
  17 + 2   4 "ADJUST: %lld,%lld on %ld,%ld [mult=%d]"
  18 + 3   8 "ext3_has_free_blocks(%p): %lu<%lu+1, %c, %u!=%u r=%d"
  19 +       "ext3_has_free_blocks(%p): free=%lu, root=%lu"
  20 +       "rcu_free_dl_info(%p)"
  21 + 4  10 "alloc_dl_info(%p,%d) = %p"
  22 +       "dealloc_dl_info(%p)"
  23 +       "get_dl_info(%p[#%d.%d])"
  24 +       "put_dl_info(%p[#%d.%d])"
  25 + 5  20 "alloc_dl_info(%p,%d)*"
  26 + 6  40 "__hash_dl_info: %p[#%d]"
  27 +       "__unhash_dl_info: %p[#%d]"
  28 + 7  80 "locate_dl_info(%p,#%d) = %p"
  29 +
  30 +debug_misc:
  31 +
  32 + 0   1 "destroy_dqhash: %p [#0x%08x] c=%d"
  33 +       "new_dqhash: %p [#0x%08x]"
  34 +       "vroot[%d]_clr_dev: dev=%p[%lu,%d:%d]"
  35 +       "vroot[%d]_get_real_bdev: dev=%p[%lu,%d:%d]"
  36 +       "vroot[%d]_set_dev: dev=%p[%lu,%d:%d]"
  37 +       "vroot_get_real_bdev not set"
  38 + 1   2 "cow_break_link(?%s?)"
  39 +       "temp copy ?%s?"
  40 + 2   4 "dentry_open(new): %p"
  41 +       "dentry_open(old): %p"
  42 +       "lookup_create(new): %p"
  43 +       "old path ?%s?"
  44 +       "path_lookup(old): %d"
  45 +       "vfs_create(new): %d"
  46 +       "vfs_rename: %d"
  47 +       "vfs_sendfile: %d"
  48 + 3   8 "fput(new_file=%p[#%d])"
  49 +       "fput(old_file=%p[#%d])"
  50 + 4  10 "vx_info_kill(%p[#%d],%d,%d) = %d"
  51 +       "vx_info_kill(%p[#%d],%d,%d)*"
  52 + 5  20 "vs_reboot(%p[#%d],%d)"
  53 + 6  40 "dropping task %p[#%u,%u] for %p[#%u,%u]"
  54 +
  55 +debug_net:
  56 +
  57 + 2   4 "nx_addr_conflict(%p,%p) %d.%d,%d.%d"
  58 + 3   8 "inet_bind(%p) %d.%d.%d.%d, %d.%d.%d.%d, %d.%d.%d.%d"
  59 +       "inet_bind(%p)* %p,%p;%lx %d.%d.%d.%d"
  60 + 4  10 "ip_route_connect(%p) %p,%p;%lx"
  61 + 5  20 "__addr_in_socket(%p,%d.%d.%d.%d) %p:%d.%d.%d.%d %p;%lx"
  62 + 6  40 "sk,egf: %p [#%d] (from %d)"
  63 +       "sk,egn: %p [#%d] (from %d)"
  64 +       "sk,req: %p [#%d] (from %d)"
  65 +       "sk: %p [#%d] (from %d)"
  66 +       "tw: %p [#%d] (from %d)"
  67 + 7  80 "__sock_recvmsg: %p[%p,%p,%p;%d]:%d/%d"
  68 +       "__sock_sendmsg: %p[%p,%p,%p;%d]:%d/%d"
  69 +
  70 +debug_nid:
  71 +
  72 + 0   1 "__lookup_nx_info(#%u): %p[#%u]"
  73 +       "alloc_nx_info(%d) = %p"
  74 +       "create_nx_info(%d) (dynamic rejected)"
  75 +       "create_nx_info(%d) = %p (already there)"
  76 +       "create_nx_info(%d) = %p (new)"
  77 +       "dealloc_nx_info(%p)"
  78 + 1   2 "alloc_nx_info(%d)*"
  79 +       "create_nx_info(%d)*"
  80 + 2   4 "get_nx_info(%p[#%d.%d])"
  81 +       "put_nx_info(%p[#%d.%d])"
  82 + 3   8 "claim_nx_info(%p[#%d.%d.%d]) %p"
  83 +       "clr_nx_info(%p[#%d.%d])"
  84 +       "init_nx_info(%p[#%d.%d])"
  85 +       "release_nx_info(%p[#%d.%d.%d]) %p"
  86 +       "set_nx_info(%p[#%d.%d])"
  87 + 4  10 "__hash_nx_info: %p[#%d]"
  88 +       "__nx_dynamic_id: [#%d]"
  89 +       "__unhash_nx_info: %p[#%d.%d.%d]"
  90 + 5  20 "moved task %p into nxi:%p[#%d]"
  91 +       "nx_migrate_task(%p,%p[#%d.%d.%d])"
  92 +       "task_get_nx_info(%p)"
  93 + 6  40 "nx_clear_persistent(%p[#%d])"
  94 +
  95 +debug_quota:
  96 +
  97 + 0   1 "quota_sync_dqh(%p,%d) discard inode %p"
  98 + 1   2 "quota_sync_dqh(%p,%d)"
  99 +       "sync_dquots(%p,%d)"
 100 +       "sync_dquots_dqh(%p,%d)"
 101 + 3   8 "do_quotactl(%p,%d,cmd=%d,id=%d,%p)"
 102 +
 103 +debug_switch:
 104 +
 105 + 0   1 "vc: VCMD_%02d_%d[%d], %d,%p [%d,%d,%x,%x]"
 106 + 1   2 "vc: VCMD_%02d_%d[%d] = %08lx(%ld) [%d,%d]"
 107 + 4  10 "%s: (%s %s) returned %s with %d"
 108 +
 109 +debug_tag:
 110 +
 111 + 7  80 "dx_parse_tag(?%s?): %d:#%d"
 112 +       "dx_propagate_tag(%p[#%lu.%d]): %d,%d"
 113 +
 114 +debug_xid:
 115 +
 116 + 0   1 "__lookup_vx_info(#%u): %p[#%u]"
 117 +       "alloc_vx_info(%d) = %p"
 118 +       "alloc_vx_info(%d)*"
 119 +       "create_vx_info(%d) (dynamic rejected)"
 120 +       "create_vx_info(%d) = %p (already there)"
 121 +       "create_vx_info(%d) = %p (new)"
 122 +       "dealloc_vx_info(%p)"
 123 +       "loc_vx_info(%d) = %p (found)"
 124 +       "loc_vx_info(%d) = %p (new)"
 125 +       "loc_vx_info(%d) = %p (not available)"
 126 + 1   2 "create_vx_info(%d)*"
 127 +       "loc_vx_info(%d)*"
 128 + 2   4 "get_vx_info(%p[#%d.%d])"
 129 +       "put_vx_info(%p[#%d.%d])"
 130 + 3   8 "claim_vx_info(%p[#%d.%d.%d]) %p"
 131 +       "clr_vx_info(%p[#%d.%d])"
 132 +       "init_vx_info(%p[#%d.%d])"
 133 +       "release_vx_info(%p[#%d.%d.%d]) %p"
 134 +       "set_vx_info(%p[#%d.%d])"
 135 + 4  10 "__hash_vx_info: %p[#%d]"
 136 +       "__unhash_vx_info: %p[#%d.%d.%d]"
 137 +       "__vx_dynamic_id: [#%d]"
 138 + 5  20 "enter_vx_info(%p[#%d],%p) %p[#%d,%p]"
 139 +       "leave_vx_info(%p[#%d,%p]) %p[#%d,%p]"
 140 +       "moved task %p into vxi:%p[#%d]"
 141 +       "task_get_vx_info(%p)"
 142 +       "vx_migrate_task(%p,%p[#%d.%d])"
 143 + 6  40 "vx_clear_persistent(%p[#%d])"
 144 +       "vx_exit_init(%p[#%d],%p[#%d,%d,%d])"
 145 +       "vx_set_init(%p[#%d],%p[#%d,%d,%d])"
 146 +       "vx_set_persistent(%p[#%d])"
 147 +       "vx_set_reaper(%p[#%d],%p[#%d,%d])"
 148 + 7  80 "vx_child_reaper(%p[#%u,%u]) = %p[#%u,%u]"
 149 +
 150 +
 151 +debug_limit:
 152 +
 153 + n 2^n "vx_acc_cres[%5d,%s,%2d]: %5d%s"
 154 +       "vx_cres_avail[%5d,%s,%2d]: %5ld > %5d + %5d"
 155 +
 156 + m 2^m "vx_acc_page[%5d,%s,%2d]: %5d%s"
 157 +       "vx_acc_pages[%5d,%s,%2d]: %5d += %5d"
 158 +       "vx_pages_avail[%5d,%s,%2d]: %5ld > %5d + %5d"
 159 diff -NurpP --minimal linux-4.9.135/arch/alpha/Kconfig linux-4.9.135-vs2.3.9.8/arch/alpha/Kconfig
 160 --- linux-4.9.135/arch/alpha/Kconfig    2016-12-11 19:17:54.000000000 +0000
 161 +++ linux-4.9.135-vs2.3.9.8/arch/alpha/Kconfig  2018-10-20 04:58:12.000000000 +0000
 162 @@ -743,6 +743,8 @@ config DUMMY_CONSOLE
 163         depends on VGA_HOSE
 164         default y
 165
 166 +source "kernel/vserver/Kconfig"
 167 +
 168  source "security/Kconfig"
 169
 170  source "crypto/Kconfig"
 171 diff -NurpP --minimal linux-4.9.135/arch/alpha/kernel/systbls.S linux-4.9.135-vs2.3.9.8/arch/alpha/kernel/systbls.S
 172 --- linux-4.9.135/arch/alpha/kernel/systbls.S   2016-12-11 19:17:54.000000000 +0000
 173 +++ linux-4.9.135-vs2.3.9.8/arch/alpha/kernel/systbls.S 2018-10-20 04:58:12.000000000 +0000
 174 @@ -446,7 +446,7 @@ sys_call_table:
 175         .quad sys_stat64                        /* 425 */
 176         .quad sys_lstat64
 177         .quad sys_fstat64
 178 -       .quad sys_ni_syscall                    /* sys_vserver */
 179 +       .quad sys_vserver                       /* sys_vserver */
 180         .quad sys_ni_syscall                    /* sys_mbind */
 181         .quad sys_ni_syscall                    /* sys_get_mempolicy */
 182         .quad sys_ni_syscall                    /* sys_set_mempolicy */
 183 diff -NurpP --minimal linux-4.9.135/arch/alpha/kernel/traps.c linux-4.9.135-vs2.3.9.8/arch/alpha/kernel/traps.c
 184 --- linux-4.9.135/arch/alpha/kernel/traps.c     2018-10-20 10:38:42.000000000 +0000
 185 +++ linux-4.9.135-vs2.3.9.8/arch/alpha/kernel/traps.c   2018-10-20 04:58:12.000000000 +0000
 186 @@ -179,7 +179,8 @@ die_if_kernel(char * str, struct pt_regs
 187  #ifdef CONFIG_SMP
 188         printk("CPU %d ", hard_smp_processor_id());
 189  #endif
 190 -       printk("%s(%d): %s %ld\n", current->comm, task_pid_nr(current), str, err);
 191 +       printk("%s(%d:#%u): %s %ld\n", current->comm,
 192 +               task_pid_nr(current), current->xid, str, err);
 193         dik_show_regs(regs, r9_15);
 194         add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);
 195         dik_show_trace((unsigned long *)(regs+1));
 196 diff -NurpP --minimal linux-4.9.135/arch/arm/Kconfig linux-4.9.135-vs2.3.9.8/arch/arm/Kconfig
 197 --- linux-4.9.135/arch/arm/Kconfig      2016-12-11 19:17:54.000000000 +0000
 198 +++ linux-4.9.135-vs2.3.9.8/arch/arm/Kconfig    2018-10-20 04:58:12.000000000 +0000
 199 @@ -2199,6 +2199,8 @@ source "fs/Kconfig"
 200
 201  source "arch/arm/Kconfig.debug"
 202
 203 +source "kernel/vserver/Kconfig"
 204 +
 205  source "security/Kconfig"
 206
 207  source "crypto/Kconfig"
 208 diff -NurpP --minimal linux-4.9.135/arch/arm/kernel/calls.S linux-4.9.135-vs2.3.9.8/arch/arm/kernel/calls.S
 209 --- linux-4.9.135/arch/arm/kernel/calls.S       2016-12-11 19:17:54.000000000 +0000
 210 +++ linux-4.9.135-vs2.3.9.8/arch/arm/kernel/calls.S     2018-10-20 04:58:12.000000000 +0000
 211 @@ -322,7 +322,7 @@
 212  /* 310 */      CALL(sys_request_key)
 213                 CALL(sys_keyctl)
 214                 CALL(ABI(sys_semtimedop, sys_oabi_semtimedop))
 215 -/* vserver */  CALL(sys_ni_syscall)
 216 +               CALL(sys_vserver)
 217                 CALL(sys_ioprio_set)
 218  /* 315 */      CALL(sys_ioprio_get)
 219                 CALL(sys_inotify_init)
 220 diff -NurpP --minimal linux-4.9.135/arch/arm/kernel/traps.c linux-4.9.135-vs2.3.9.8/arch/arm/kernel/traps.c
 221 --- linux-4.9.135/arch/arm/kernel/traps.c       2018-10-20 10:38:42.000000000 +0000
 222 +++ linux-4.9.135-vs2.3.9.8/arch/arm/kernel/traps.c     2018-10-20 04:58:12.000000000 +0000
 223 @@ -279,8 +279,8 @@ static int __die(const char *str, int er
 224
 225         print_modules();
 226         __show_regs(regs);
 227 -       pr_emerg("Process %.*s (pid: %d, stack limit = 0x%p)\n",
 228 -                TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), end_of_stack(tsk));
 229 +       pr_emerg("Process %.*s (pid: %d:%u, stack limit = 0x%p)\n",
 230 +                TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), tsk->xid, end_of_stack(tsk));
 231
 232         if (!user_mode(regs) || in_interrupt()) {
 233                 dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
 234 diff -NurpP --minimal linux-4.9.135/arch/cris/Kconfig linux-4.9.135-vs2.3.9.8/arch/cris/Kconfig
 235 --- linux-4.9.135/arch/cris/Kconfig     2016-12-11 19:17:54.000000000 +0000
 236 +++ linux-4.9.135-vs2.3.9.8/arch/cris/Kconfig   2018-10-20 04:58:12.000000000 +0000
 237 @@ -583,6 +583,8 @@ source "fs/Kconfig"
 238
 239  source "arch/cris/Kconfig.debug"
 240
 241 +source "kernel/vserver/Kconfig"
 242 +
 243  source "security/Kconfig"
 244
 245  source "crypto/Kconfig"
 246 diff -NurpP --minimal linux-4.9.135/arch/ia64/Kconfig linux-4.9.135-vs2.3.9.8/arch/ia64/Kconfig
 247 --- linux-4.9.135/arch/ia64/Kconfig     2016-12-11 19:17:54.000000000 +0000
 248 +++ linux-4.9.135-vs2.3.9.8/arch/ia64/Kconfig   2018-10-20 04:58:12.000000000 +0000
 249 @@ -602,6 +602,8 @@ source "fs/Kconfig"
 250
 251  source "arch/ia64/Kconfig.debug"
 252
 253 +source "kernel/vserver/Kconfig"
 254 +
 255  source "security/Kconfig"
 256
 257  source "crypto/Kconfig"
 258 diff -NurpP --minimal linux-4.9.135/arch/ia64/kernel/entry.S linux-4.9.135-vs2.3.9.8/arch/ia64/kernel/entry.S
 259 --- linux-4.9.135/arch/ia64/kernel/entry.S      2016-12-11 19:17:54.000000000 +0000
 260 +++ linux-4.9.135-vs2.3.9.8/arch/ia64/kernel/entry.S    2018-10-20 04:58:12.000000000 +0000
 261 @@ -1697,7 +1697,7 @@ sys_call_table:
 262         data8 sys_mq_notify
 263         data8 sys_mq_getsetattr
 264         data8 sys_kexec_load
 265 -       data8 sys_ni_syscall                    // reserved for vserver
 266 +       data8 sys_vserver
 267         data8 sys_waitid                        // 1270
 268         data8 sys_add_key
 269         data8 sys_request_key
 270 diff -NurpP --minimal linux-4.9.135/arch/ia64/kernel/ptrace.c linux-4.9.135-vs2.3.9.8/arch/ia64/kernel/ptrace.c
 271 --- linux-4.9.135/arch/ia64/kernel/ptrace.c     2018-10-20 10:38:44.000000000 +0000
 272 +++ linux-4.9.135-vs2.3.9.8/arch/ia64/kernel/ptrace.c   2018-10-20 04:58:12.000000000 +0000
 273 @@ -21,6 +21,7 @@
 274  #include <linux/regset.h>
 275  #include <linux/elf.h>
 276  #include <linux/tracehook.h>
 277 +#include <linux/vs_base.h>
 278
 279  #include <asm/pgtable.h>
 280  #include <asm/processor.h>
 281 diff -NurpP --minimal linux-4.9.135/arch/ia64/kernel/traps.c linux-4.9.135-vs2.3.9.8/arch/ia64/kernel/traps.c
 282 --- linux-4.9.135/arch/ia64/kernel/traps.c      2016-12-11 19:17:54.000000000 +0000
 283 +++ linux-4.9.135-vs2.3.9.8/arch/ia64/kernel/traps.c    2018-10-20 04:58:12.000000000 +0000
 284 @@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re
 285         put_cpu();
 286
 287         if (++die.lock_owner_depth < 3) {
 288 -               printk("%s[%d]: %s %ld [%d]\n",
 289 -               current->comm, task_pid_nr(current), str, err, ++die_counter);
 290 +               printk("%s[%d:#%u]: %s %ld [%d]\n",
 291 +                       current->comm, task_pid_nr(current), current->xid,
 292 +                       str, err, ++die_counter);
 293                 if (notify_die(DIE_OOPS, str, regs, err, 255, SIGSEGV)
 294                     != NOTIFY_STOP)
 295                         show_regs(regs);
 296 @@ -324,8 +325,9 @@ handle_fpu_swa (int fp_fault, struct pt_
 297                         if ((last.count & 15) < 5 && (ia64_fetchadd(1, &last.count, acq) & 15) < 5) {
 298                                 last.time = current_jiffies + 5 * HZ;
 299                                 printk(KERN_WARNING
 300 -                                       "%s(%d): floating-point assist fault at ip %016lx, isr %016lx\n",
 301 -                                       current->comm, task_pid_nr(current), regs->cr_iip + ia64_psr(regs)->ri, isr);
 302 +                                       "%s(%d:#%u): floating-point assist fault at ip %016lx, isr %016lx\n",
 303 +                                       current->comm, task_pid_nr(current), current->xid,
 304 +                                       regs->cr_iip + ia64_psr(regs)->ri, isr);
 305                         }
 306                 }
 307         }
 308 diff -NurpP --minimal linux-4.9.135/arch/m32r/kernel/traps.c linux-4.9.135-vs2.3.9.8/arch/m32r/kernel/traps.c
 309 --- linux-4.9.135/arch/m32r/kernel/traps.c      2016-12-11 19:17:54.000000000 +0000
 310 +++ linux-4.9.135-vs2.3.9.8/arch/m32r/kernel/traps.c    2018-10-20 04:58:12.000000000 +0000
 311 @@ -184,8 +184,9 @@ static void show_registers(struct pt_reg
 312         } else {
 313                 printk("SPI: %08lx\n", sp);
 314         }
 315 -       printk("Process %s (pid: %d, process nr: %d, stackpage=%08lx)",
 316 -               current->comm, task_pid_nr(current), 0xffff & i, 4096+(unsigned long)current);
 317 +       printk("Process %s (pid: %d:#%u, process nr: %d, stackpage=%08lx)",
 318 +               current->comm, task_pid_nr(current), current->xid,
 319 +               0xffff & i, 4096+(unsigned long)current);
 320
 321         /*
 322          * When in-kernel, we also print out the stack and code at the
 323 diff -NurpP --minimal linux-4.9.135/arch/m68k/Kconfig linux-4.9.135-vs2.3.9.8/arch/m68k/Kconfig
 324 --- linux-4.9.135/arch/m68k/Kconfig     2016-12-11 19:17:54.000000000 +0000
 325 +++ linux-4.9.135-vs2.3.9.8/arch/m68k/Kconfig   2018-10-20 04:58:12.000000000 +0000
 326 @@ -163,6 +163,8 @@ source "fs/Kconfig"
 327
 328  source "arch/m68k/Kconfig.debug"
 329
 330 +source "kernel/vserver/Kconfig"
 331 +
 332  source "security/Kconfig"
 333
 334  source "crypto/Kconfig"
 335 diff -NurpP --minimal linux-4.9.135/arch/mips/Kconfig linux-4.9.135-vs2.3.9.8/arch/mips/Kconfig
 336 --- linux-4.9.135/arch/mips/Kconfig     2018-10-20 10:38:44.000000000 +0000
 337 +++ linux-4.9.135-vs2.3.9.8/arch/mips/Kconfig   2018-10-20 04:58:12.000000000 +0000
 338 @@ -3190,6 +3190,8 @@ source "fs/Kconfig"
 339
 340  source "arch/mips/Kconfig.debug"
 341
 342 +source "kernel/vserver/Kconfig"
 343 +
 344  source "security/Kconfig"
 345
 346  source "crypto/Kconfig"
 347 diff -NurpP --minimal linux-4.9.135/arch/mips/kernel/ptrace.c linux-4.9.135-vs2.3.9.8/arch/mips/kernel/ptrace.c
 348 --- linux-4.9.135/arch/mips/kernel/ptrace.c     2018-10-20 10:38:44.000000000 +0000
 349 +++ linux-4.9.135-vs2.3.9.8/arch/mips/kernel/ptrace.c   2018-10-20 05:55:33.000000000 +0000
 350 @@ -30,6 +30,7 @@
 351  #include <linux/audit.h>
 352  #include <linux/seccomp.h>
 353  #include <linux/ftrace.h>
 354 +#include <linux/vs_base.h>
 355
 356  #include <asm/byteorder.h>
 357  #include <asm/cpu.h>
 358 @@ -798,6 +799,9 @@ long arch_ptrace(struct task_struct *chi
 359         void __user *datavp = (void __user *) data;
 360         unsigned long __user *datalp = (void __user *) data;
 361
 362 +       if (!vx_check(vx_task_xid(child), VS_WATCH_P | VS_IDENT))
 363 +               goto out;
 364 +
 365         switch (request) {
 366         /* when I and D space are separate, these will need to be fixed. */
 367         case PTRACE_PEEKTEXT: /* read word at location addr. */
 368 diff -NurpP --minimal linux-4.9.135/arch/mips/kernel/scall32-o32.S linux-4.9.135-vs2.3.9.8/arch/mips/kernel/scall32-o32.S
 369 --- linux-4.9.135/arch/mips/kernel/scall32-o32.S        2018-10-20 10:38:44.000000000 +0000
 370 +++ linux-4.9.135-vs2.3.9.8/arch/mips/kernel/scall32-o32.S      2018-10-20 04:58:12.000000000 +0000
 371 @@ -511,7 +511,7 @@ EXPORT(sys_call_table)
 372         PTR     sys_mq_timedreceive
 373         PTR     sys_mq_notify                   /* 4275 */
 374         PTR     sys_mq_getsetattr
 375 -       PTR     sys_ni_syscall                  /* sys_vserver */
 376 +       PTR     sys_vserver
 377         PTR     sys_waitid
 378         PTR     sys_ni_syscall                  /* available, was setaltroot */
 379         PTR     sys_add_key                     /* 4280 */
 380 diff -NurpP --minimal linux-4.9.135/arch/mips/kernel/scall64-64.S linux-4.9.135-vs2.3.9.8/arch/mips/kernel/scall64-64.S
 381 --- linux-4.9.135/arch/mips/kernel/scall64-64.S 2018-10-20 10:38:44.000000000 +0000
 382 +++ linux-4.9.135-vs2.3.9.8/arch/mips/kernel/scall64-64.S       2018-10-20 04:58:12.000000000 +0000
 383 @@ -348,7 +348,7 @@ EXPORT(sys_call_table)
 384         PTR     sys_mq_timedreceive
 385         PTR     sys_mq_notify
 386         PTR     sys_mq_getsetattr               /* 5235 */
 387 -       PTR     sys_ni_syscall                  /* sys_vserver */
 388 +       PTR     sys_vserver
 389         PTR     sys_waitid
 390         PTR     sys_ni_syscall                  /* available, was setaltroot */
 391         PTR     sys_add_key
 392 diff -NurpP --minimal linux-4.9.135/arch/mips/kernel/scall64-n32.S linux-4.9.135-vs2.3.9.8/arch/mips/kernel/scall64-n32.S
 393 --- linux-4.9.135/arch/mips/kernel/scall64-n32.S        2018-10-20 10:38:44.000000000 +0000
 394 +++ linux-4.9.135-vs2.3.9.8/arch/mips/kernel/scall64-n32.S      2018-10-20 04:58:12.000000000 +0000
 395 @@ -343,7 +343,7 @@ EXPORT(sysn32_call_table)
 396         PTR     compat_sys_mq_timedreceive
 397         PTR     compat_sys_mq_notify
 398         PTR     compat_sys_mq_getsetattr
 399 -       PTR     sys_ni_syscall                  /* 6240, sys_vserver */
 400 +       PTR     sys32_vserver                   /* 6240 */
 401         PTR     compat_sys_waitid
 402         PTR     sys_ni_syscall                  /* available, was setaltroot */
 403         PTR     sys_add_key
 404 diff -NurpP --minimal linux-4.9.135/arch/mips/kernel/scall64-o32.S linux-4.9.135-vs2.3.9.8/arch/mips/kernel/scall64-o32.S
 405 --- linux-4.9.135/arch/mips/kernel/scall64-o32.S        2018-10-20 10:38:44.000000000 +0000
 406 +++ linux-4.9.135-vs2.3.9.8/arch/mips/kernel/scall64-o32.S      2018-10-20 04:58:12.000000000 +0000
 407 @@ -499,7 +499,7 @@ EXPORT(sys32_call_table)
 408         PTR     compat_sys_mq_timedreceive
 409         PTR     compat_sys_mq_notify            /* 4275 */
 410         PTR     compat_sys_mq_getsetattr
 411 -       PTR     sys_ni_syscall                  /* sys_vserver */
 412 +       PTR     sys32_vserver
 413         PTR     compat_sys_waitid
 414         PTR     sys_ni_syscall                  /* available, was setaltroot */
 415         PTR     sys_add_key                     /* 4280 */
 416 diff -NurpP --minimal linux-4.9.135/arch/mips/kernel/traps.c linux-4.9.135-vs2.3.9.8/arch/mips/kernel/traps.c
 417 --- linux-4.9.135/arch/mips/kernel/traps.c      2018-10-20 10:38:44.000000000 +0000
 418 +++ linux-4.9.135-vs2.3.9.8/arch/mips/kernel/traps.c    2018-10-20 04:58:13.000000000 +0000
 419 @@ -361,9 +361,10 @@ void show_registers(struct pt_regs *regs
 420
 421         __show_regs(regs);
 422         print_modules();
 423 -       printk("Process %s (pid: %d, threadinfo=%p, task=%p, tls=%0*lx)\n",
 424 -              current->comm, current->pid, current_thread_info(), current,
 425 -             field, current_thread_info()->tp_value);
 426 +       printk("Process %s (pid: %d:#%u, threadinfo=%p, task=%p, tls=%0*lx)\n",
 427 +               current->comm, task_pid_nr(current), current->xid,
 428 +               current_thread_info(), current,
 429 +               field, current_thread_info()->tp_value);
 430         if (cpu_has_userlocal) {
 431                 unsigned long tls;
 432
 433 diff -NurpP --minimal linux-4.9.135/arch/parisc/Kconfig linux-4.9.135-vs2.3.9.8/arch/parisc/Kconfig
 434 --- linux-4.9.135/arch/parisc/Kconfig   2018-10-20 10:38:44.000000000 +0000
 435 +++ linux-4.9.135-vs2.3.9.8/arch/parisc/Kconfig 2018-10-20 05:55:33.000000000 +0000
 436 @@ -348,6 +348,8 @@ config SECCOMP
 437
 438           If unsure, say Y. Only embedded should say N here.
 439
 440 +source "kernel/vserver/Kconfig"
 441 +
 442  source "security/Kconfig"
 443
 444  source "crypto/Kconfig"
 445 diff -NurpP --minimal linux-4.9.135/arch/parisc/kernel/syscall_table.S linux-4.9.135-vs2.3.9.8/arch/parisc/kernel/syscall_table.S
 446 --- linux-4.9.135/arch/parisc/kernel/syscall_table.S    2018-10-20 10:38:45.000000000 +0000
 447 +++ linux-4.9.135-vs2.3.9.8/arch/parisc/kernel/syscall_table.S  2018-10-20 04:58:13.000000000 +0000
 448 @@ -358,7 +358,7 @@
 449         ENTRY_COMP(mbind)               /* 260 */
 450         ENTRY_COMP(get_mempolicy)
 451         ENTRY_COMP(set_mempolicy)
 452 -       ENTRY_SAME(ni_syscall)  /* 263: reserved for vserver */
 453 +       ENTRY_DIFF(vserver)
 454         ENTRY_SAME(add_key)
 455         ENTRY_SAME(request_key)         /* 265 */
 456         ENTRY_COMP(keyctl)
 457 diff -NurpP --minimal linux-4.9.135/arch/parisc/kernel/traps.c linux-4.9.135-vs2.3.9.8/arch/parisc/kernel/traps.c
 458 --- linux-4.9.135/arch/parisc/kernel/traps.c    2016-12-11 19:17:54.000000000 +0000
 459 +++ linux-4.9.135-vs2.3.9.8/arch/parisc/kernel/traps.c  2018-10-20 04:58:13.000000000 +0000
 460 @@ -235,8 +235,9 @@ void die_if_kernel(char *str, struct pt_
 461                         return; /* STFU */
 462
 463                 parisc_printk_ratelimited(1, regs,
 464 -                       KERN_CRIT "%s (pid %d): %s (code %ld) at " RFMT "\n",
 465 -                       current->comm, task_pid_nr(current), str, err, regs->iaoq[0]);
 466 +                       KERN_CRIT "%s (pid %d:#%u): %s (code %ld) at " RFMT "\n",
 467 +                       current->comm, task_pid_nr(current), current->xid,
 468 +                       str, err, regs->iaoq[0]);
 469
 470                 return;
 471         }
 472 @@ -266,8 +267,8 @@ void die_if_kernel(char *str, struct pt_
 473                 pdc_console_restart();
 474
 475         if (err)
 476 -               printk(KERN_CRIT "%s (pid %d): %s (code %ld)\n",
 477 -                       current->comm, task_pid_nr(current), str, err);
 478 +               printk(KERN_CRIT "%s (pid %d:#%u): %s (code %ld)\n",
 479 +                       current->comm, task_pid_nr(current), current->xid, str, err);
 480
 481         /* Wot's wrong wif bein' racy? */
 482         if (current->thread.flags & PARISC_KERNEL_DEATH) {
 483 diff -NurpP --minimal linux-4.9.135/arch/powerpc/Kconfig linux-4.9.135-vs2.3.9.8/arch/powerpc/Kconfig
 484 --- linux-4.9.135/arch/powerpc/Kconfig  2018-10-20 10:38:45.000000000 +0000
 485 +++ linux-4.9.135-vs2.3.9.8/arch/powerpc/Kconfig        2018-10-20 04:58:13.000000000 +0000
 486 @@ -1086,6 +1086,8 @@ source "lib/Kconfig"
 487
 488  source "arch/powerpc/Kconfig.debug"
 489
 490 +source "kernel/vserver/Kconfig"
 491 +
 492  source "security/Kconfig"
 493
 494  source "crypto/Kconfig"
 495 diff -NurpP --minimal linux-4.9.135/arch/powerpc/include/uapi/asm/unistd.h linux-4.9.135-vs2.3.9.8/arch/powerpc/include/uapi/asm/unistd.h
 496 --- linux-4.9.135/arch/powerpc/include/uapi/asm/unistd.h        2016-12-11 19:17:54.000000000 +0000
 497 +++ linux-4.9.135-vs2.3.9.8/arch/powerpc/include/uapi/asm/unistd.h      2018-10-20 04:58:13.000000000 +0000
 498 @@ -275,7 +275,7 @@
 499  #endif
 500  #define __NR_rtas              255
 501  #define __NR_sys_debug_setcontext 256
 502 -/* Number 257 is reserved for vserver */
 503 +#define __NR_vserver           257
 504  #define __NR_migrate_pages     258
 505  #define __NR_mbind             259
 506  #define __NR_get_mempolicy     260
 507 diff -NurpP --minimal linux-4.9.135/arch/s390/Kconfig linux-4.9.135-vs2.3.9.8/arch/s390/Kconfig
 508 --- linux-4.9.135/arch/s390/Kconfig     2018-10-20 10:38:45.000000000 +0000
 509 +++ linux-4.9.135-vs2.3.9.8/arch/s390/Kconfig   2018-10-20 04:58:13.000000000 +0000
 510 @@ -775,6 +775,8 @@ source "fs/Kconfig"
 511
 512  source "arch/s390/Kconfig.debug"
 513
 514 +source "kernel/vserver/Kconfig"
 515 +
 516  source "security/Kconfig"
 517
 518  source "crypto/Kconfig"
 519 diff -NurpP --minimal linux-4.9.135/arch/s390/include/asm/tlb.h linux-4.9.135-vs2.3.9.8/arch/s390/include/asm/tlb.h
 520 --- linux-4.9.135/arch/s390/include/asm/tlb.h   2016-12-11 19:17:54.000000000 +0000
 521 +++ linux-4.9.135-vs2.3.9.8/arch/s390/include/asm/tlb.h 2018-10-20 04:58:13.000000000 +0000
 522 @@ -24,6 +24,7 @@
 523  #include <linux/mm.h>
 524  #include <linux/pagemap.h>
 525  #include <linux/swap.h>
 526 +
 527  #include <asm/processor.h>
 528  #include <asm/pgalloc.h>
 529  #include <asm/tlbflush.h>
 530 diff -NurpP --minimal linux-4.9.135/arch/s390/include/uapi/asm/unistd.h linux-4.9.135-vs2.3.9.8/arch/s390/include/uapi/asm/unistd.h
 531 --- linux-4.9.135/arch/s390/include/uapi/asm/unistd.h   2016-12-11 19:17:54.000000000 +0000
 532 +++ linux-4.9.135-vs2.3.9.8/arch/s390/include/uapi/asm/unistd.h 2018-10-20 04:58:13.000000000 +0000
 533 @@ -200,7 +200,7 @@
 534  #define __NR_clock_gettime     260
 535  #define __NR_clock_getres      261
 536  #define __NR_clock_nanosleep   262
 537 -/* Number 263 is reserved for vserver */
 538 +#define __NR_vserver           263
 539  #define __NR_statfs64          265
 540  #define __NR_fstatfs64         266
 541  #define __NR_remap_file_pages  267
 542 diff -NurpP --minimal linux-4.9.135/arch/s390/kernel/ptrace.c linux-4.9.135-vs2.3.9.8/arch/s390/kernel/ptrace.c
 543 --- linux-4.9.135/arch/s390/kernel/ptrace.c     2018-10-20 10:38:46.000000000 +0000
 544 +++ linux-4.9.135-vs2.3.9.8/arch/s390/kernel/ptrace.c   2018-10-20 04:58:13.000000000 +0000
 545 @@ -21,6 +21,7 @@
 546  #include <linux/tracehook.h>
 547  #include <linux/seccomp.h>
 548  #include <linux/compat.h>
 549 +#include <linux/vs_base.h>
 550  #include <trace/syscall.h>
 551  #include <asm/segment.h>
 552  #include <asm/page.h>
 553 diff -NurpP --minimal linux-4.9.135/arch/s390/kernel/syscalls.S linux-4.9.135-vs2.3.9.8/arch/s390/kernel/syscalls.S
 554 --- linux-4.9.135/arch/s390/kernel/syscalls.S   2018-10-20 10:38:46.000000000 +0000
 555 +++ linux-4.9.135-vs2.3.9.8/arch/s390/kernel/syscalls.S 2018-10-20 04:58:13.000000000 +0000
 556 @@ -271,7 +271,7 @@ SYSCALL(sys_clock_settime,compat_sys_clo
 557  SYSCALL(sys_clock_gettime,compat_sys_clock_gettime)    /* 260 */
 558  SYSCALL(sys_clock_getres,compat_sys_clock_getres)
 559  SYSCALL(sys_clock_nanosleep,compat_sys_clock_nanosleep)
 560 -NI_SYSCALL                                             /* reserved for vserver */
 561 +SYSCALL(sys_vserver,sys_vserver,sys32_vserver)
 562  SYSCALL(sys_ni_syscall,compat_sys_s390_fadvise64_64)
 563  SYSCALL(sys_statfs64,compat_sys_statfs64)
 564  SYSCALL(sys_fstatfs64,compat_sys_fstatfs64)
 565 diff -NurpP --minimal linux-4.9.135/arch/sh/Kconfig linux-4.9.135-vs2.3.9.8/arch/sh/Kconfig
 566 --- linux-4.9.135/arch/sh/Kconfig       2016-12-11 19:17:54.000000000 +0000
 567 +++ linux-4.9.135-vs2.3.9.8/arch/sh/Kconfig     2018-10-20 04:58:13.000000000 +0000
 568 @@ -904,6 +904,8 @@ source "fs/Kconfig"
 569
 570  source "arch/sh/Kconfig.debug"
 571
 572 +source "kernel/vserver/Kconfig"
 573 +
 574  source "security/Kconfig"
 575
 576  source "crypto/Kconfig"
 577 diff -NurpP --minimal linux-4.9.135/arch/sh/kernel/irq.c linux-4.9.135-vs2.3.9.8/arch/sh/kernel/irq.c
 578 --- linux-4.9.135/arch/sh/kernel/irq.c  2016-12-11 19:17:54.000000000 +0000
 579 +++ linux-4.9.135-vs2.3.9.8/arch/sh/kernel/irq.c        2018-10-20 04:58:13.000000000 +0000
 580 @@ -14,6 +14,7 @@
 581  #include <linux/ftrace.h>
 582  #include <linux/delay.h>
 583  #include <linux/ratelimit.h>
 584 +// #include <linux/vs_context.h>
 585  #include <asm/processor.h>
 586  #include <asm/machvec.h>
 587  #include <asm/uaccess.h>
 588 diff -NurpP --minimal linux-4.9.135/arch/sparc/Kconfig linux-4.9.135-vs2.3.9.8/arch/sparc/Kconfig
 589 --- linux-4.9.135/arch/sparc/Kconfig    2018-10-20 10:38:46.000000000 +0000
 590 +++ linux-4.9.135-vs2.3.9.8/arch/sparc/Kconfig  2018-10-20 04:58:13.000000000 +0000
 591 @@ -580,6 +580,8 @@ source "fs/Kconfig"
 592
 593  source "arch/sparc/Kconfig.debug"
 594
 595 +source "kernel/vserver/Kconfig"
 596 +
 597  source "security/Kconfig"
 598
 599  source "crypto/Kconfig"
 600 diff -NurpP --minimal linux-4.9.135/arch/sparc/include/uapi/asm/unistd.h linux-4.9.135-vs2.3.9.8/arch/sparc/include/uapi/asm/unistd.h
 601 --- linux-4.9.135/arch/sparc/include/uapi/asm/unistd.h  2016-12-11 19:17:54.000000000 +0000
 602 +++ linux-4.9.135-vs2.3.9.8/arch/sparc/include/uapi/asm/unistd.h        2018-10-20 04:58:13.000000000 +0000
 603 @@ -332,7 +332,7 @@
 604  #define __NR_timer_getoverrun  264
 605  #define __NR_timer_delete      265
 606  #define __NR_timer_create      266
 607 -/* #define __NR_vserver                267 Reserved for VSERVER */
 608 +#define __NR_vserver           267
 609  #define __NR_io_setup          268
 610  #define __NR_io_destroy                269
 611  #define __NR_io_submit         270
 612 diff -NurpP --minimal linux-4.9.135/arch/sparc/kernel/systbls_32.S linux-4.9.135-vs2.3.9.8/arch/sparc/kernel/systbls_32.S
 613 --- linux-4.9.135/arch/sparc/kernel/systbls_32.S        2016-12-11 19:17:54.000000000 +0000
 614 +++ linux-4.9.135-vs2.3.9.8/arch/sparc/kernel/systbls_32.S      2018-10-20 04:58:13.000000000 +0000
 615 @@ -70,7 +70,7 @@ sys_call_table:
 616  /*250*/        .long sys_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_ni_syscall
 617  /*255*/        .long sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep
 618  /*260*/        .long sys_sched_getaffinity, sys_sched_setaffinity, sys_timer_settime, sys_timer_gettime, sys_timer_getoverrun
 619 -/*265*/        .long sys_timer_delete, sys_timer_create, sys_nis_syscall, sys_io_setup, sys_io_destroy
 620 +/*265*/        .long sys_timer_delete, sys_timer_create, sys_vserver, sys_io_setup, sys_io_destroy
 621  /*270*/        .long sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink
 622  /*275*/        .long sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid
 623  /*280*/        .long sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat
 624 diff -NurpP --minimal linux-4.9.135/arch/sparc/kernel/systbls_64.S linux-4.9.135-vs2.3.9.8/arch/sparc/kernel/systbls_64.S
 625 --- linux-4.9.135/arch/sparc/kernel/systbls_64.S        2016-12-11 19:17:54.000000000 +0000
 626 +++ linux-4.9.135-vs2.3.9.8/arch/sparc/kernel/systbls_64.S      2018-10-20 04:58:13.000000000 +0000
 627 @@ -71,7 +71,7 @@ sys_call_table32:
 628  /*250*/        .word sys_mremap, compat_sys_sysctl, sys_getsid, sys_fdatasync, sys_nis_syscall
 629         .word sys32_sync_file_range, compat_sys_clock_settime, compat_sys_clock_gettime, compat_sys_clock_getres, sys32_clock_nanosleep
 630  /*260*/        .word compat_sys_sched_getaffinity, compat_sys_sched_setaffinity, sys32_timer_settime, compat_sys_timer_gettime, sys_timer_getoverrun
 631 -       .word sys_timer_delete, compat_sys_timer_create, sys_ni_syscall, compat_sys_io_setup, sys_io_destroy
 632 +       .word sys_timer_delete, compat_sys_timer_create, sys32_vserver, compat_sys_io_setup, sys_io_destroy
 633  /*270*/        .word sys32_io_submit, sys_io_cancel, compat_sys_io_getevents, sys32_mq_open, sys_mq_unlink
 634         .word compat_sys_mq_timedsend, compat_sys_mq_timedreceive, compat_sys_mq_notify, compat_sys_mq_getsetattr, compat_sys_waitid
 635  /*280*/        .word sys_tee, sys_add_key, sys_request_key, compat_sys_keyctl, compat_sys_openat
 636 @@ -152,7 +152,7 @@ sys_call_table:
 637  /*250*/        .word sys_64_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nis_syscall
 638         .word sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep
 639  /*260*/        .word sys_sched_getaffinity, sys_sched_setaffinity, sys_timer_settime, sys_timer_gettime, sys_timer_getoverrun
 640 -       .word sys_timer_delete, sys_timer_create, sys_ni_syscall, sys_io_setup, sys_io_destroy
 641 +       .word sys_timer_delete, sys_timer_create, sys_vserver, sys_io_setup, sys_io_destroy
 642  /*270*/        .word sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink
 643         .word sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid
 644  /*280*/        .word sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat
 645 diff -NurpP --minimal linux-4.9.135/arch/um/Kconfig.rest linux-4.9.135-vs2.3.9.8/arch/um/Kconfig.rest
 646 --- linux-4.9.135/arch/um/Kconfig.rest  2016-12-11 19:17:54.000000000 +0000
 647 +++ linux-4.9.135-vs2.3.9.8/arch/um/Kconfig.rest        2018-10-20 04:58:13.000000000 +0000
 648 @@ -12,6 +12,8 @@ source "arch/um/Kconfig.net"
 649
 650  source "fs/Kconfig"
 651
 652 +source "kernel/vserver/Kconfig"
 653 +
 654  source "security/Kconfig"
 655
 656  source "crypto/Kconfig"
 657 diff -NurpP --minimal linux-4.9.135/arch/x86/Kconfig linux-4.9.135-vs2.3.9.8/arch/x86/Kconfig
 658 --- linux-4.9.135/arch/x86/Kconfig      2018-10-20 10:38:46.000000000 +0000
 659 +++ linux-4.9.135-vs2.3.9.8/arch/x86/Kconfig    2018-10-20 05:55:34.000000000 +0000
 660 @@ -2778,6 +2778,8 @@ source "fs/Kconfig"
 661
 662  source "arch/x86/Kconfig.debug"
 663
 664 +source "kernel/vserver/Kconfig"
 665 +
 666  source "security/Kconfig"
 667
 668  source "crypto/Kconfig"
 669 diff -NurpP --minimal linux-4.9.135/arch/x86/entry/syscalls/syscall_32.tbl linux-4.9.135-vs2.3.9.8/arch/x86/entry/syscalls/syscall_32.tbl
 670 --- linux-4.9.135/arch/x86/entry/syscalls/syscall_32.tbl        2016-12-11 19:17:54.000000000 +0000
 671 +++ linux-4.9.135-vs2.3.9.8/arch/x86/entry/syscalls/syscall_32.tbl      2018-10-20 04:58:13.000000000 +0000
 672 @@ -279,7 +279,7 @@
 673  270    i386    tgkill                  sys_tgkill
 674  271    i386    utimes                  sys_utimes                      compat_sys_utimes
 675  272    i386    fadvise64_64            sys_fadvise64_64                sys32_fadvise64_64
 676 -273    i386    vserver
 677 +273    i386    vserver                 sys_vserver                     sys32_vserver
 678  274    i386    mbind                   sys_mbind
 679  275    i386    get_mempolicy           sys_get_mempolicy               compat_sys_get_mempolicy
 680  276    i386    set_mempolicy           sys_set_mempolicy
 681 diff -NurpP --minimal linux-4.9.135/arch/x86/entry/syscalls/syscall_64.tbl linux-4.9.135-vs2.3.9.8/arch/x86/entry/syscalls/syscall_64.tbl
 682 --- linux-4.9.135/arch/x86/entry/syscalls/syscall_64.tbl        2016-12-11 19:17:54.000000000 +0000
 683 +++ linux-4.9.135-vs2.3.9.8/arch/x86/entry/syscalls/syscall_64.tbl      2018-10-20 04:58:13.000000000 +0000
 684 @@ -242,7 +242,7 @@
 685  233    common  epoll_ctl               sys_epoll_ctl
 686  234    common  tgkill                  sys_tgkill
 687  235    common  utimes                  sys_utimes
 688 -236    64      vserver
 689 +236    64      vserver                 sys_vserver
 690  237    common  mbind                   sys_mbind
 691  238    common  set_mempolicy           sys_set_mempolicy
 692  239    common  get_mempolicy           sys_get_mempolicy
 693 diff -NurpP --minimal linux-4.9.135/block/ioprio.c linux-4.9.135-vs2.3.9.8/block/ioprio.c
 694 --- linux-4.9.135/block/ioprio.c        2016-12-11 19:17:54.000000000 +0000
 695 +++ linux-4.9.135-vs2.3.9.8/block/ioprio.c      2018-10-20 04:58:13.000000000 +0000
 696 @@ -28,6 +28,7 @@
 697  #include <linux/syscalls.h>
 698  #include <linux/security.h>
 699  #include <linux/pid_namespace.h>
 700 +#include <linux/vs_base.h>
 701
 702  int set_task_ioprio(struct task_struct *task, int ioprio)
 703  {
 704 @@ -105,6 +106,8 @@ SYSCALL_DEFINE3(ioprio_set, int, which,
 705                         else
 706                                 pgrp = find_vpid(who);
 707                         do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
 708 +                               if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT))
 709 +                                       continue;
 710                                 ret = set_task_ioprio(p, ioprio);
 711                                 if (ret)
 712                                         break;
 713 @@ -203,6 +206,8 @@ SYSCALL_DEFINE2(ioprio_get, int, which,
 714                         else
 715                                 pgrp = find_vpid(who);
 716                         do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
 717 +                               if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT))
 718 +                                       continue;
 719                                 tmpio = get_task_ioprio(p);
 720                                 if (tmpio < 0)
 721                                         continue;
 722 diff -NurpP --minimal linux-4.9.135/drivers/block/Kconfig linux-4.9.135-vs2.3.9.8/drivers/block/Kconfig
 723 --- linux-4.9.135/drivers/block/Kconfig 2016-12-11 19:17:54.000000000 +0000
 724 +++ linux-4.9.135-vs2.3.9.8/drivers/block/Kconfig       2018-10-20 04:58:13.000000000 +0000
 725 @@ -273,6 +273,13 @@ config BLK_DEV_CRYPTOLOOP
 726
 727  source "drivers/block/drbd/Kconfig"
 728
 729 +config BLK_DEV_VROOT
 730 +       tristate "Virtual Root device support"
 731 +       depends on QUOTACTL
 732 +       ---help---
 733 +         Saying Y here will allow you to use quota/fs ioctls on a shared
 734 +         partition within a virtual server without compromising security.
 735 +
 736  config BLK_DEV_NBD
 737         tristate "Network block device support"
 738         depends on NET
 739 diff -NurpP --minimal linux-4.9.135/drivers/block/Makefile linux-4.9.135-vs2.3.9.8/drivers/block/Makefile
 740 --- linux-4.9.135/drivers/block/Makefile        2016-12-11 19:17:54.000000000 +0000
 741 +++ linux-4.9.135-vs2.3.9.8/drivers/block/Makefile      2018-10-20 04:58:13.000000000 +0000
 742 @@ -31,6 +31,7 @@ obj-$(CONFIG_VIRTIO_BLK)      += virtio_blk.o
 743
 744  obj-$(CONFIG_BLK_DEV_SX8)      += sx8.o
 745  obj-$(CONFIG_BLK_DEV_HD)       += hd.o
 746 +obj-$(CONFIG_BLK_DEV_VROOT)    += vroot.o
 747
 748  obj-$(CONFIG_XEN_BLKDEV_FRONTEND)      += xen-blkfront.o
 749  obj-$(CONFIG_XEN_BLKDEV_BACKEND)       += xen-blkback/
 750 diff -NurpP --minimal linux-4.9.135/drivers/block/loop.c linux-4.9.135-vs2.3.9.8/drivers/block/loop.c
 751 --- linux-4.9.135/drivers/block/loop.c  2018-10-20 10:38:49.000000000 +0000
 752 +++ linux-4.9.135-vs2.3.9.8/drivers/block/loop.c        2018-10-20 04:58:13.000000000 +0000
 753 @@ -76,6 +76,7 @@
 754  #include <linux/miscdevice.h>
 755  #include <linux/falloc.h>
 756  #include <linux/uio.h>
 757 +#include <linux/vs_context.h>
 758  #include "loop.h"
 759
 760  #include <asm/uaccess.h>
 761 @@ -936,6 +937,7 @@ static int loop_set_fd(struct loop_devic
 762         lo->lo_blocksize = lo_blocksize;
 763         lo->lo_device = bdev;
 764         lo->lo_flags = lo_flags;
 765 +       lo->lo_xid = vx_current_xid();
 766         lo->lo_backing_file = file;
 767         lo->transfer = NULL;
 768         lo->ioctl = NULL;
 769 @@ -1056,6 +1058,7 @@ static int loop_clr_fd(struct loop_devic
 770         lo->lo_offset = 0;
 771         lo->lo_sizelimit = 0;
 772         lo->lo_encrypt_key_size = 0;
 773 +       lo->lo_xid = 0;
 774         memset(lo->lo_encrypt_key, 0, LO_KEY_SIZE);
 775         memset(lo->lo_crypt_name, 0, LO_NAME_SIZE);
 776         memset(lo->lo_file_name, 0, LO_NAME_SIZE);
 777 @@ -1102,7 +1105,7 @@ loop_set_status(struct loop_device *lo,
 778
 779         if (lo->lo_encrypt_key_size &&
 780             !uid_eq(lo->lo_key_owner, uid) &&
 781 -           !capable(CAP_SYS_ADMIN))
 782 +           !vx_capable(CAP_SYS_ADMIN, VXC_ADMIN_CLOOP))
 783                 return -EPERM;
 784         if (lo->lo_state != Lo_bound)
 785                 return -ENXIO;
 786 @@ -1207,7 +1210,8 @@ loop_get_status(struct loop_device *lo,
 787         memcpy(info->lo_crypt_name, lo->lo_crypt_name, LO_NAME_SIZE);
 788         info->lo_encrypt_type =
 789                 lo->lo_encryption ? lo->lo_encryption->number : 0;
 790 -       if (lo->lo_encrypt_key_size && capable(CAP_SYS_ADMIN)) {
 791 +       if (lo->lo_encrypt_key_size &&
 792 +               vx_capable(CAP_SYS_ADMIN, VXC_ADMIN_CLOOP)) {
 793                 info->lo_encrypt_key_size = lo->lo_encrypt_key_size;
 794                 memcpy(info->lo_encrypt_key, lo->lo_encrypt_key,
 795                        lo->lo_encrypt_key_size);
 796 @@ -1568,6 +1572,11 @@ static int lo_open(struct block_device *
 797                 goto out;
 798         }
 799
 800 +       if (!vx_check(lo->lo_xid, VS_IDENT|VS_HOSTID|VS_ADMIN_P)) {
 801 +               err = -EACCES;
 802 +               goto out;
 803 +       }
 804 +
 805         atomic_inc(&lo->lo_refcnt);
 806  out:
 807         mutex_unlock(&loop_index_mutex);
 808 diff -NurpP --minimal linux-4.9.135/drivers/block/loop.h linux-4.9.135-vs2.3.9.8/drivers/block/loop.h
 809 --- linux-4.9.135/drivers/block/loop.h  2018-10-20 10:38:49.000000000 +0000
 810 +++ linux-4.9.135-vs2.3.9.8/drivers/block/loop.h        2018-10-20 04:58:13.000000000 +0000
 811 @@ -43,6 +43,7 @@ struct loop_device {
 812         struct loop_func_table *lo_encryption;
 813         __u32           lo_init[2];
 814         kuid_t          lo_key_owner;   /* Who set the key */
 815 +       vxid_t          lo_xid;
 816         int             (*ioctl)(struct loop_device *, int cmd,
 817                                  unsigned long arg);
 818
 819 diff -NurpP --minimal linux-4.9.135/drivers/block/vroot.c linux-4.9.135-vs2.3.9.8/drivers/block/vroot.c
 820 --- linux-4.9.135/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000
 821 +++ linux-4.9.135-vs2.3.9.8/drivers/block/vroot.c       2018-10-20 04:58:13.000000000 +0000
 822 @@ -0,0 +1,291 @@
 823 +/*
 824 + *  linux/drivers/block/vroot.c
 825 + *
 826 + *  written by Herbert P?tzl, 9/11/2002
 827 + *  ported to 2.6.10 by Herbert P?tzl, 30/12/2004
 828 + *
 829 + *  based on the loop.c code by Theodore Ts'o.
 830 + *
 831 + * Copyright (C) 2002-2007 by Herbert P?tzl.
 832 + * Redistribution of this file is permitted under the
 833 + * GNU General Public License.
 834 + *
 835 + */
 836 +
 837 +#include <linux/module.h>
 838 +#include <linux/moduleparam.h>
 839 +#include <linux/file.h>
 840 +#include <linux/major.h>
 841 +#include <linux/blkdev.h>
 842 +#include <linux/slab.h>
 843 +
 844 +#include <linux/vroot.h>
 845 +#include <linux/vs_context.h>
 846 +
 847 +
 848 +static int max_vroot = 8;
 849 +
 850 +static struct vroot_device *vroot_dev;
 851 +static struct gendisk **disks;
 852 +
 853 +
 854 +static int vroot_set_dev(
 855 +       struct vroot_device *vr,
 856 +       struct block_device *bdev,
 857 +       unsigned int arg)
 858 +{
 859 +       struct block_device *real_bdev;
 860 +       struct file *file;
 861 +       struct inode *inode;
 862 +       int error;
 863 +
 864 +       error = -EBUSY;
 865 +       if (vr->vr_state != Vr_unbound)
 866 +               goto out;
 867 +
 868 +       error = -EBADF;
 869 +       file = fget(arg);
 870 +       if (!file)
 871 +               goto out;
 872 +
 873 +       error = -EINVAL;
 874 +       inode = file->f_path.dentry->d_inode;
 875 +
 876 +
 877 +       if (S_ISBLK(inode->i_mode)) {
 878 +               real_bdev = inode->i_bdev;
 879 +               vr->vr_device = real_bdev;
 880 +               __iget(real_bdev->bd_inode);
 881 +       } else
 882 +               goto out_fput;
 883 +
 884 +       vxdprintk(VXD_CBIT(misc, 0),
 885 +               "vroot[%d]_set_dev: dev=" VXF_DEV,
 886 +               vr->vr_number, VXD_DEV(real_bdev));
 887 +
 888 +       vr->vr_state = Vr_bound;
 889 +       error = 0;
 890 +
 891 + out_fput:
 892 +       fput(file);
 893 + out:
 894 +       return error;
 895 +}
 896 +
 897 +static int vroot_clr_dev(
 898 +       struct vroot_device *vr,
 899 +       struct block_device *bdev)
 900 +{
 901 +       struct block_device *real_bdev;
 902 +
 903 +       if (vr->vr_state != Vr_bound)
 904 +               return -ENXIO;
 905 +       if (vr->vr_refcnt > 1)  /* we needed one fd for the ioctl */
 906 +               return -EBUSY;
 907 +
 908 +       real_bdev = vr->vr_device;
 909 +
 910 +       vxdprintk(VXD_CBIT(misc, 0),
 911 +               "vroot[%d]_clr_dev: dev=" VXF_DEV,
 912 +               vr->vr_number, VXD_DEV(real_bdev));
 913 +
 914 +       bdput(real_bdev);
 915 +       vr->vr_state = Vr_unbound;
 916 +       vr->vr_device = NULL;
 917 +       return 0;
 918 +}
 919 +
 920 +
 921 +static int vr_ioctl(struct block_device *bdev, fmode_t mode,
 922 +       unsigned int cmd, unsigned long arg)
 923 +{
 924 +       struct vroot_device *vr = bdev->bd_disk->private_data;
 925 +       int err;
 926 +
 927 +       down(&vr->vr_ctl_mutex);
 928 +       switch (cmd) {
 929 +       case VROOT_SET_DEV:
 930 +               err = vroot_set_dev(vr, bdev, arg);
 931 +               break;
 932 +       case VROOT_CLR_DEV:
 933 +               err = vroot_clr_dev(vr, bdev);
 934 +               break;
 935 +       default:
 936 +               err = -EINVAL;
 937 +               break;
 938 +       }
 939 +       up(&vr->vr_ctl_mutex);
 940 +       return err;
 941 +}
 942 +
 943 +static int vr_open(struct block_device *bdev, fmode_t mode)
 944 +{
 945 +       struct vroot_device *vr = bdev->bd_disk->private_data;
 946 +
 947 +       down(&vr->vr_ctl_mutex);
 948 +       vr->vr_refcnt++;
 949 +       up(&vr->vr_ctl_mutex);
 950 +       return 0;
 951 +}
 952 +
 953 +static void vr_release(struct gendisk *disk, fmode_t mode)
 954 +{
 955 +       struct vroot_device *vr = disk->private_data;
 956 +
 957 +       down(&vr->vr_ctl_mutex);
 958 +       --vr->vr_refcnt;
 959 +       up(&vr->vr_ctl_mutex);
 960 +}
 961 +
 962 +static struct block_device_operations vr_fops = {
 963 +       .owner =        THIS_MODULE,
 964 +       .open =         vr_open,
 965 +       .release =      vr_release,
 966 +       .ioctl =        vr_ioctl,
 967 +};
 968 +
 969 +static blk_qc_t vroot_make_request(struct request_queue *q, struct bio *bio)
 970 +{
 971 +       printk("vroot_make_request %p, %p\n", q, bio);
 972 +       bio_io_error(bio);
 973 +       return BLK_QC_T_NONE;
 974 +}
 975 +
 976 +struct block_device *__vroot_get_real_bdev(struct block_device *bdev)
 977 +{
 978 +       struct inode *inode = bdev->bd_inode;
 979 +       struct vroot_device *vr;
 980 +       struct block_device *real_bdev;
 981 +       int minor = iminor(inode);
 982 +
 983 +       vr = &vroot_dev[minor];
 984 +       real_bdev = vr->vr_device;
 985 +
 986 +       vxdprintk(VXD_CBIT(misc, 0),
 987 +               "vroot[%d]_get_real_bdev: dev=" VXF_DEV,
 988 +               vr->vr_number, VXD_DEV(real_bdev));
 989 +
 990 +       if (vr->vr_state != Vr_bound)
 991 +               return ERR_PTR(-ENXIO);
 992 +
 993 +       __iget(real_bdev->bd_inode);
 994 +       return real_bdev;
 995 +}
 996 +
 997 +
 998 +
 999 +/*
1000 + * And now the modules code and kernel interface.
1001 + */
1002 +
1003 +module_param(max_vroot, int, 0);
1004 +
1005 +MODULE_PARM_DESC(max_vroot, "Maximum number of vroot devices (1-256)");
1006 +MODULE_LICENSE("GPL");
1007 +MODULE_ALIAS_BLOCKDEV_MAJOR(VROOT_MAJOR);
1008 +
1009 +MODULE_AUTHOR ("Herbert P?tzl");
1010 +MODULE_DESCRIPTION ("Virtual Root Device Mapper");
1011 +
1012 +
1013 +int __init vroot_init(void)
1014 +{
1015 +       int err, i;
1016 +
1017 +       if (max_vroot < 1 || max_vroot > 256) {
1018 +               max_vroot = MAX_VROOT_DEFAULT;
1019 +               printk(KERN_WARNING "vroot: invalid max_vroot "
1020 +                       "(must be between 1 and 256), "
1021 +                       "using default (%d)\n", max_vroot);
1022 +       }
1023 +
1024 +       if (register_blkdev(VROOT_MAJOR, "vroot"))
1025 +               return -EIO;
1026 +
1027 +       err = -ENOMEM;
1028 +       vroot_dev = kmalloc(max_vroot * sizeof(struct vroot_device), GFP_KERNEL);
1029 +       if (!vroot_dev)
1030 +               goto out_mem1;
1031 +       memset(vroot_dev, 0, max_vroot * sizeof(struct vroot_device));
1032 +
1033 +       disks = kmalloc(max_vroot * sizeof(struct gendisk *), GFP_KERNEL);
1034 +       if (!disks)
1035 +               goto out_mem2;
1036 +
1037 +       for (i = 0; i < max_vroot; i++) {
1038 +               disks[i] = alloc_disk(1);
1039 +               if (!disks[i])
1040 +                       goto out_mem3;
1041 +               disks[i]->queue = blk_alloc_queue(GFP_KERNEL);
1042 +               if (!disks[i]->queue)
1043 +                       goto out_mem3;
1044 +               blk_queue_make_request(disks[i]->queue, vroot_make_request);
1045 +       }
1046 +
1047 +       for (i = 0; i < max_vroot; i++) {
1048 +               struct vroot_device *vr = &vroot_dev[i];
1049 +               struct gendisk *disk = disks[i];
1050 +
1051 +               memset(vr, 0, sizeof(*vr));
1052 +               sema_init(&vr->vr_ctl_mutex, 1);
1053 +               vr->vr_number = i;
1054 +               disk->major = VROOT_MAJOR;
1055 +               disk->first_minor = i;
1056 +               disk->fops = &vr_fops;
1057 +               sprintf(disk->disk_name, "vroot%d", i);
1058 +               disk->private_data = vr;
1059 +       }
1060 +
1061 +       err = register_vroot_grb(&__vroot_get_real_bdev);
1062 +       if (err)
1063 +               goto out_mem3;
1064 +
1065 +       for (i = 0; i < max_vroot; i++)
1066 +               add_disk(disks[i]);
1067 +       printk(KERN_INFO "vroot: loaded (max %d devices)\n", max_vroot);
1068 +       return 0;
1069 +
1070 +out_mem3:
1071 +       while (i--)
1072 +               put_disk(disks[i]);
1073 +       kfree(disks);
1074 +out_mem2:
1075 +       kfree(vroot_dev);
1076 +out_mem1:
1077 +       unregister_blkdev(VROOT_MAJOR, "vroot");
1078 +       printk(KERN_ERR "vroot: ran out of memory\n");
1079 +       return err;
1080 +}
1081 +
1082 +void vroot_exit(void)
1083 +{
1084 +       int i;
1085 +
1086 +       if (unregister_vroot_grb(&__vroot_get_real_bdev))
1087 +               printk(KERN_WARNING "vroot: cannot unregister grb\n");
1088 +
1089 +       for (i = 0; i < max_vroot; i++) {
1090 +               del_gendisk(disks[i]);
1091 +               put_disk(disks[i]);
1092 +       }
1093 +       unregister_blkdev(VROOT_MAJOR, "vroot");
1094 +
1095 +       kfree(disks);
1096 +       kfree(vroot_dev);
1097 +}
1098 +
1099 +module_init(vroot_init);
1100 +module_exit(vroot_exit);
1101 +
1102 +#ifndef MODULE
1103 +
1104 +static int __init max_vroot_setup(char *str)
1105 +{
1106 +       max_vroot = simple_strtol(str, NULL, 0);
1107 +       return 1;
1108 +}
1109 +
1110 +__setup("max_vroot=", max_vroot_setup);
1111 +
1112 +#endif
1113 +
1114 diff -NurpP --minimal linux-4.9.135/drivers/md/dm-core.h linux-4.9.135-vs2.3.9.8/drivers/md/dm-core.h
1115 --- linux-4.9.135/drivers/md/dm-core.h  2018-10-20 10:38:58.000000000 +0000
1116 +++ linux-4.9.135-vs2.3.9.8/drivers/md/dm-core.h        2018-10-20 04:58:13.000000000 +0000
1117 @@ -52,6 +52,7 @@ struct mapped_device {
1118
1119         atomic_t holders;
1120         atomic_t open_count;
1121 +       vxid_t xid;
1122
1123         struct dm_target *immutable_target;
1124         struct target_type *immutable_target_type;
1125 diff -NurpP --minimal linux-4.9.135/drivers/md/dm-ioctl.c linux-4.9.135-vs2.3.9.8/drivers/md/dm-ioctl.c
1126 --- linux-4.9.135/drivers/md/dm-ioctl.c 2018-10-20 10:38:58.000000000 +0000
1127 +++ linux-4.9.135-vs2.3.9.8/drivers/md/dm-ioctl.c       2018-10-20 04:58:13.000000000 +0000
1128 @@ -16,6 +16,7 @@
1129  #include <linux/dm-ioctl.h>
1130  #include <linux/hdreg.h>
1131  #include <linux/compat.h>
1132 +#include <linux/vs_context.h>
1133
1134  #include <asm/uaccess.h>
1135
1136 @@ -114,7 +115,8 @@ static struct hash_cell *__get_name_cell
1137         unsigned int h = hash_str(str);
1138
1139         list_for_each_entry (hc, _name_buckets + h, name_list)
1140 -               if (!strcmp(hc->name, str)) {
1141 +               if (vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT) &&
1142 +                       !strcmp(hc->name, str)) {
1143                         dm_get(hc->md);
1144                         return hc;
1145                 }
1146 @@ -128,7 +130,8 @@ static struct hash_cell *__get_uuid_cell
1147         unsigned int h = hash_str(str);
1148
1149         list_for_each_entry (hc, _uuid_buckets + h, uuid_list)
1150 -               if (!strcmp(hc->uuid, str)) {
1151 +               if (vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT) &&
1152 +                       !strcmp(hc->uuid, str)) {
1153                         dm_get(hc->md);
1154                         return hc;
1155                 }
1156 @@ -139,13 +142,15 @@ static struct hash_cell *__get_uuid_cell
1157  static struct hash_cell *__get_dev_cell(uint64_t dev)
1158  {
1159         struct mapped_device *md;
1160 -       struct hash_cell *hc;
1161 +       struct hash_cell *hc = NULL;
1162
1163         md = dm_get_md(huge_decode_dev(dev));
1164         if (!md)
1165                 return NULL;
1166
1167 -       hc = dm_get_mdptr(md);
1168 +       if (vx_check(dm_get_xid(md), VS_WATCH_P | VS_IDENT))
1169 +               hc = dm_get_mdptr(md);
1170 +
1171         if (!hc) {
1172                 dm_put(md);
1173                 return NULL;
1174 @@ -467,6 +472,9 @@ typedef int (*ioctl_fn)(struct dm_ioctl
1175
1176  static int remove_all(struct dm_ioctl *param, size_t param_size)
1177  {
1178 +       if (!vx_check(0, VS_ADMIN))
1179 +               return -EPERM;
1180 +
1181         dm_hash_remove_all(true, !!(param->flags & DM_DEFERRED_REMOVE), false);
1182         param->data_size = 0;
1183         return 0;
1184 @@ -514,6 +522,8 @@ static int list_devices(struct dm_ioctl
1185          */
1186         for (i = 0; i < NUM_BUCKETS; i++) {
1187                 list_for_each_entry (hc, _name_buckets + i, name_list) {
1188 +                       if (!vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT))
1189 +                               continue;
1190                         needed += sizeof(struct dm_name_list);
1191                         needed += strlen(hc->name) + 1;
1192                         needed += ALIGN_MASK;
1193 @@ -537,6 +547,8 @@ static int list_devices(struct dm_ioctl
1194          */
1195         for (i = 0; i < NUM_BUCKETS; i++) {
1196                 list_for_each_entry (hc, _name_buckets + i, name_list) {
1197 +                       if (!vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT))
1198 +                               continue;
1199                         if (old_nl)
1200                                 old_nl->next = (uint32_t) ((void *) nl -
1201                                                            (void *) old_nl);
1202 @@ -1805,8 +1817,8 @@ static int ctl_ioctl(uint command, struc
1203         size_t input_param_size;
1204         struct dm_ioctl param_kernel;
1205
1206 -       /* only root can play with this */
1207 -       if (!capable(CAP_SYS_ADMIN))
1208 +       /* only root and certain contexts can play with this */
1209 +       if (!vx_capable(CAP_SYS_ADMIN, VXC_ADMIN_MAPPER))
1210                 return -EACCES;
1211
1212         if (_IOC_TYPE(command) != DM_IOCTL)
1213 diff -NurpP --minimal linux-4.9.135/drivers/md/dm.c linux-4.9.135-vs2.3.9.8/drivers/md/dm.c
1214 --- linux-4.9.135/drivers/md/dm.c       2018-10-20 10:38:58.000000000 +0000
1215 +++ linux-4.9.135-vs2.3.9.8/drivers/md/dm.c     2018-10-20 04:58:13.000000000 +0000
1216 @@ -22,6 +22,7 @@
1217  #include <linux/wait.h>
1218  #include <linux/pr.h>
1219  #include <linux/vmalloc.h>
1220 +#include <linux/vs_base.h>
1221
1222  #define DM_MSG_PREFIX "core"
1223
1224 @@ -300,6 +301,7 @@ int dm_deleting_md(struct mapped_device
1225  static int dm_blk_open(struct block_device *bdev, fmode_t mode)
1226  {
1227         struct mapped_device *md;
1228 +       int ret = -ENXIO;
1229
1230         spin_lock(&_minor_lock);
1231
1232 @@ -308,17 +310,19 @@ static int dm_blk_open(struct block_devi
1233                 goto out;
1234
1235         if (test_bit(DMF_FREEING, &md->flags) ||
1236 -           dm_deleting_md(md)) {
1237 -               md = NULL;
1238 +           dm_deleting_md(md))
1239 +               goto out;
1240 +
1241 +       ret = -EACCES;
1242 +       if (!vx_check(md->xid, VS_IDENT|VS_HOSTID))
1243                 goto out;
1244 -       }
1245
1246         dm_get(md);
1247         atomic_inc(&md->open_count);
1248 +       ret = 0;
1249  out:
1250         spin_unlock(&_minor_lock);
1251 -
1252 -       return md ? 0 : -ENXIO;
1253 +       return ret;
1254  }
1255
1256  static void dm_blk_close(struct gendisk *disk, fmode_t mode)
1257 @@ -744,6 +748,14 @@ int dm_set_geometry(struct mapped_device
1258         return 0;
1259  }
1260
1261 +/*
1262 + * Get the xid associated with a dm device
1263 + */
1264 +vxid_t dm_get_xid(struct mapped_device *md)
1265 +{
1266 +       return md->xid;
1267 +}
1268 +
1269  /*-----------------------------------------------------------------
1270   * CRUD START:
1271   *   A more elegant soln is in the works that uses the queue
1272 @@ -1549,6 +1561,7 @@ static struct mapped_device *alloc_dev(i
1273         INIT_LIST_HEAD(&md->uevent_list);
1274         INIT_LIST_HEAD(&md->table_devices);
1275         spin_lock_init(&md->uevent_lock);
1276 +       md->xid = vx_current_xid();
1277
1278         md->queue = blk_alloc_queue_node(GFP_KERNEL, numa_node_id);
1279         if (!md->queue)
1280 diff -NurpP --minimal linux-4.9.135/drivers/md/dm.h linux-4.9.135-vs2.3.9.8/drivers/md/dm.h
1281 --- linux-4.9.135/drivers/md/dm.h       2016-12-11 19:17:54.000000000 +0000
1282 +++ linux-4.9.135-vs2.3.9.8/drivers/md/dm.h     2018-10-20 04:58:13.000000000 +0000
1283 @@ -45,6 +45,8 @@ struct dm_dev_internal {
1284  struct dm_table;
1285  struct dm_md_mempools;
1286
1287 +vxid_t dm_get_xid(struct mapped_device *md);
1288 +
1289  /*-----------------------------------------------------------------
1290   * Internal table functions.
1291   *---------------------------------------------------------------*/
1292 diff -NurpP --minimal linux-4.9.135/drivers/net/tun.c linux-4.9.135-vs2.3.9.8/drivers/net/tun.c
1293 --- linux-4.9.135/drivers/net/tun.c     2018-10-20 10:39:05.000000000 +0000
1294 +++ linux-4.9.135-vs2.3.9.8/drivers/net/tun.c   2018-10-20 04:58:13.000000000 +0000
1295 @@ -65,6 +65,7 @@
1296  #include <linux/nsproxy.h>
1297  #include <linux/virtio_net.h>
1298  #include <linux/rcupdate.h>
1299 +#include <linux/vs_network.h>
1300  #include <net/net_namespace.h>
1301  #include <net/netns/generic.h>
1302  #include <net/rtnetlink.h>
1303 @@ -194,6 +195,7 @@ struct tun_struct {
1304         unsigned int            flags;
1305         kuid_t                  owner;
1306         kgid_t                  group;
1307 +       vnid_t                  nid;
1308
1309         struct net_device       *dev;
1310         netdev_features_t       set_features;
1311 @@ -490,6 +492,7 @@ static inline bool tun_not_capable(struc
1312         return ((uid_valid(tun->owner) && !uid_eq(cred->euid, tun->owner)) ||
1313                   (gid_valid(tun->group) && !in_egroup_p(tun->group))) &&
1314                 !ns_capable(net->user_ns, CAP_NET_ADMIN);
1315 +               /* !cap_raised(current_cap(), CAP_NET_ADMIN) */
1316  }
1317
1318  static void tun_set_real_num_queues(struct tun_struct *tun)
1319 @@ -1558,6 +1561,7 @@ static void tun_setup(struct net_device
1320
1321         tun->owner = INVALID_UID;
1322         tun->group = INVALID_GID;
1323 +       tun->nid = nx_current_nid();
1324
1325         dev->ethtool_ops = &tun_ethtool_ops;
1326         dev->destructor = tun_free_netdev;
1327 @@ -1769,7 +1773,7 @@ static int tun_set_iff(struct net *net,
1328                 int queues = ifr->ifr_flags & IFF_MULTI_QUEUE ?
1329                              MAX_TAP_QUEUES : 1;
1330
1331 -               if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
1332 +               if (!nx_ns_capable(net->user_ns, CAP_NET_ADMIN, NXC_TUN_CREATE))
1333                         return -EPERM;
1334                 err = security_tun_dev_create();
1335                 if (err < 0)
1336 @@ -2134,6 +2138,16 @@ static long __tun_chr_ioctl(struct file
1337                           from_kgid(&init_user_ns, tun->group));
1338                 break;
1339
1340 +       case TUNSETNID:
1341 +               if (!capable(CAP_CONTEXT))
1342 +                       return -EPERM;
1343 +
1344 +               /* Set nid owner of the device */
1345 +               tun->nid = (vnid_t) arg;
1346 +
1347 +               tun_debug(KERN_INFO, tun, "nid owner set to %u\n", tun->nid);
1348 +               break;
1349 +
1350         case TUNSETLINK:
1351                 /* Only allow setting the type when the interface is down */
1352                 if (tun->dev->flags & IFF_UP) {
1353 diff -NurpP --minimal linux-4.9.135/drivers/scsi/cxgbi/libcxgbi.c linux-4.9.135-vs2.3.9.8/drivers/scsi/cxgbi/libcxgbi.c
1354 --- linux-4.9.135/drivers/scsi/cxgbi/libcxgbi.c 2016-12-11 19:17:54.000000000 +0000
1355 +++ linux-4.9.135-vs2.3.9.8/drivers/scsi/cxgbi/libcxgbi.c       2018-10-20 04:58:13.000000000 +0000
1356 @@ -772,7 +772,8 @@ static struct cxgbi_sock *cxgbi_check_ro
1357                 struct inet6_dev *idev = ip6_dst_idev((struct dst_entry *)rt);
1358
1359                 err = ipv6_dev_get_saddr(&init_net, idev ? idev->dev : NULL,
1360 -                                        &daddr6->sin6_addr, 0, &pref_saddr);
1361 +                                        &daddr6->sin6_addr, 0, &pref_saddr,
1362 +                                        NULL);
1363                 if (err) {
1364                         pr_info("failed to get source address to reach %pI6\n",
1365                                 &daddr6->sin6_addr);
1366 diff -NurpP --minimal linux-4.9.135/drivers/tty/sysrq.c linux-4.9.135-vs2.3.9.8/drivers/tty/sysrq.c
1367 --- linux-4.9.135/drivers/tty/sysrq.c   2018-10-20 10:39:13.000000000 +0000
1368 +++ linux-4.9.135-vs2.3.9.8/drivers/tty/sysrq.c 2018-10-20 04:58:13.000000000 +0000
1369 @@ -47,6 +47,7 @@
1370  #include <linux/syscalls.h>
1371  #include <linux/of.h>
1372  #include <linux/rcupdate.h>
1373 +#include <linux/vserver/debug.h>
1374
1375  #include <asm/ptrace.h>
1376  #include <asm/irq_regs.h>
1377 @@ -428,6 +429,21 @@ static struct sysrq_key_op sysrq_unrt_op
1378         .enable_mask    = SYSRQ_ENABLE_RTNICE,
1379  };
1380
1381 +
1382 +#ifdef CONFIG_VSERVER_DEBUG
1383 +static void sysrq_handle_vxinfo(int key)
1384 +{
1385 +       dump_vx_info_inactive((key == 'x') ? 0 : 1);
1386 +}
1387 +
1388 +static struct sysrq_key_op sysrq_showvxinfo_op = {
1389 +       .handler        = sysrq_handle_vxinfo,
1390 +       .help_msg       = "conteXt",
1391 +       .action_msg     = "Show Context Info",
1392 +       .enable_mask    = SYSRQ_ENABLE_DUMP,
1393 +};
1394 +#endif
1395 +
1396  /* Key Operations table and lock */
1397  static DEFINE_SPINLOCK(sysrq_key_table_lock);
1398
1399 @@ -484,7 +500,11 @@ static struct sysrq_key_op *sysrq_key_ta
1400         /* x: May be registered on mips for TLB dump */
1401         /* x: May be registered on ppc/powerpc for xmon */
1402         /* x: May be registered on sparc64 for global PMU dump */
1403 +#ifdef CONFIG_VSERVER_DEBUG
1404 +       &sysrq_showvxinfo_op,           /* x */
1405 +#else
1406         NULL,                           /* x */
1407 +#endif
1408         /* y: May be registered on sparc64 for global register dump */
1409         NULL,                           /* y */
1410         &sysrq_ftrace_dump_op,          /* z */
1411 @@ -499,6 +519,8 @@ static int sysrq_key_table_key2index(int
1412                 retval = key - '0';
1413         else if ((key >= 'a') && (key <= 'z'))
1414                 retval = key + 10 - 'a';
1415 +       else if ((key >= 'A') && (key <= 'Z'))
1416 +               retval = key + 10 - 'A';
1417         else
1418                 retval = -1;
1419         return retval;
1420 diff -NurpP --minimal linux-4.9.135/drivers/tty/tty_io.c linux-4.9.135-vs2.3.9.8/drivers/tty/tty_io.c
1421 --- linux-4.9.135/drivers/tty/tty_io.c  2018-10-20 10:39:13.000000000 +0000
1422 +++ linux-4.9.135-vs2.3.9.8/drivers/tty/tty_io.c        2018-10-20 05:55:42.000000000 +0000
1423 @@ -104,6 +104,7 @@
1424
1425  #include <linux/kmod.h>
1426  #include <linux/nsproxy.h>
1427 +#include <linux/vs_pid.h>
1428
1429  #undef TTY_DEBUG_HANGUP
1430  #ifdef TTY_DEBUG_HANGUP
1431 @@ -2308,7 +2309,8 @@ static int tiocsti(struct tty_struct *tt
1432         char ch, mbz = 0;
1433         struct tty_ldisc *ld;
1434
1435 -       if ((current->signal->tty != tty) && !capable(CAP_SYS_ADMIN))
1436 +       if (((current->signal->tty != tty) &&
1437 +               !vx_capable(CAP_SYS_ADMIN, VXC_TIOCSTI)))
1438                 return -EPERM;
1439         if (get_user(ch, p))
1440                 return -EFAULT;
1441 @@ -2623,6 +2625,7 @@ static int tiocspgrp(struct tty_struct *
1442                 return -ENOTTY;
1443         if (get_user(pgrp_nr, p))
1444                 return -EFAULT;
1445 +       pgrp_nr = vx_rmap_pid(pgrp_nr);
1446         if (pgrp_nr < 0)
1447                 return -EINVAL;
1448         rcu_read_lock();
1449 diff -NurpP --minimal linux-4.9.135/fs/attr.c linux-4.9.135-vs2.3.9.8/fs/attr.c
1450 --- linux-4.9.135/fs/attr.c     2016-12-11 19:17:54.000000000 +0000
1451 +++ linux-4.9.135-vs2.3.9.8/fs/attr.c   2018-10-20 04:58:13.000000000 +0000
1452 @@ -15,6 +15,9 @@
1453  #include <linux/security.h>
1454  #include <linux/evm.h>
1455  #include <linux/ima.h>
1456 +#include <linux/proc_fs.h>
1457 +#include <linux/devpts_fs.h>
1458 +#include <linux/vs_tag.h>
1459
1460  /**
1461   * setattr_prepare - check if attribute changes to a dentry are allowed
1462 @@ -90,6 +93,10 @@ kill_priv:
1463                         return error;
1464         }
1465
1466 +       /* check for inode tag permission */
1467 +       if (dx_permission(inode, MAY_WRITE))
1468 +               return -EACCES;
1469 +
1470         return 0;
1471  }
1472  EXPORT_SYMBOL(setattr_prepare);
1473 @@ -160,6 +167,8 @@ void setattr_copy(struct inode *inode, c
1474                 inode->i_uid = attr->ia_uid;
1475         if (ia_valid & ATTR_GID)
1476                 inode->i_gid = attr->ia_gid;
1477 +       if ((ia_valid & ATTR_TAG) && IS_TAGGED(inode))
1478 +               inode->i_tag = attr->ia_tag;
1479         if (ia_valid & ATTR_ATIME)
1480                 inode->i_atime = timespec_trunc(attr->ia_atime,
1481                                                 inode->i_sb->s_time_gran);
1482 @@ -210,7 +219,8 @@ int notify_change(struct dentry * dentry
1483
1484         WARN_ON_ONCE(!inode_is_locked(inode));
1485
1486 -       if (ia_valid & (ATTR_MODE | ATTR_UID | ATTR_GID | ATTR_TIMES_SET)) {
1487 +       if (ia_valid & (ATTR_MODE | ATTR_UID | ATTR_GID |
1488 +               ATTR_TAG | ATTR_TIMES_SET)) {
1489                 if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
1490                         return -EPERM;
1491         }
1492 diff -NurpP --minimal linux-4.9.135/fs/block_dev.c linux-4.9.135-vs2.3.9.8/fs/block_dev.c
1493 --- linux-4.9.135/fs/block_dev.c        2018-10-20 10:39:16.000000000 +0000
1494 +++ linux-4.9.135-vs2.3.9.8/fs/block_dev.c      2018-10-20 04:58:13.000000000 +0000
1495 @@ -31,6 +31,7 @@
1496  #include <linux/dax.h>
1497  #include <linux/badblocks.h>
1498  #include <linux/falloc.h>
1499 +#include <linux/vs_device.h>
1500  #include <asm/uaccess.h>
1501  #include "internal.h"
1502
1503 @@ -720,6 +721,7 @@ struct block_device *bdget(dev_t dev)
1504                 bdev->bd_invalidated = 0;
1505                 inode->i_mode = S_IFBLK;
1506                 inode->i_rdev = dev;
1507 +               inode->i_mdev = dev;
1508                 inode->i_bdev = bdev;
1509                 inode->i_data.a_ops = &def_blk_aops;
1510                 mapping_set_gfp_mask(&inode->i_data, GFP_USER);
1511 @@ -766,6 +768,11 @@ EXPORT_SYMBOL(bdput);
1512  static struct block_device *bd_acquire(struct inode *inode)
1513  {
1514         struct block_device *bdev;
1515 +       dev_t mdev;
1516 +
1517 +       if (!vs_map_blkdev(inode->i_rdev, &mdev, DATTR_OPEN))
1518 +               return NULL;
1519 +       inode->i_mdev = mdev;
1520
1521         spin_lock(&bdev_lock);
1522         bdev = inode->i_bdev;
1523 @@ -776,7 +783,7 @@ static struct block_device *bd_acquire(s
1524         }
1525         spin_unlock(&bdev_lock);
1526
1527 -       bdev = bdget(inode->i_rdev);
1528 +       bdev = bdget(mdev);
1529         if (bdev) {
1530                 spin_lock(&bdev_lock);
1531                 if (!inode->i_bdev) {
1532 diff -NurpP --minimal linux-4.9.135/fs/btrfs/ctree.h linux-4.9.135-vs2.3.9.8/fs/btrfs/ctree.h
1533 --- linux-4.9.135/fs/btrfs/ctree.h      2018-10-20 10:39:16.000000000 +0000
1534 +++ linux-4.9.135-vs2.3.9.8/fs/btrfs/ctree.h    2018-10-20 04:58:13.000000000 +0000
1535 @@ -1321,6 +1321,8 @@ static inline u32 BTRFS_MAX_XATTR_SIZE(c
1536  #define BTRFS_DEFAULT_COMMIT_INTERVAL  (30)
1537  #define BTRFS_DEFAULT_MAX_INLINE       (2048)
1538
1539 +#define BTRFS_MOUNT_TAGGED             (1 << 24)
1540 +
1541  #define btrfs_clear_opt(o, opt)                ((o) &= ~BTRFS_MOUNT_##opt)
1542  #define btrfs_set_opt(o, opt)          ((o) |= BTRFS_MOUNT_##opt)
1543  #define btrfs_raw_test_opt(o, opt)     ((o) & BTRFS_MOUNT_##opt)
1544 @@ -1668,6 +1670,7 @@ BTRFS_SETGET_FUNCS(inode_block_group, st
1545  BTRFS_SETGET_FUNCS(inode_nlink, struct btrfs_inode_item, nlink, 32);
1546  BTRFS_SETGET_FUNCS(inode_uid, struct btrfs_inode_item, uid, 32);
1547  BTRFS_SETGET_FUNCS(inode_gid, struct btrfs_inode_item, gid, 32);
1548 +BTRFS_SETGET_FUNCS(inode_tag, struct btrfs_inode_item, tag, 16);
1549  BTRFS_SETGET_FUNCS(inode_mode, struct btrfs_inode_item, mode, 32);
1550  BTRFS_SETGET_FUNCS(inode_rdev, struct btrfs_inode_item, rdev, 64);
1551  BTRFS_SETGET_FUNCS(inode_flags, struct btrfs_inode_item, flags, 64);
1552 @@ -1715,6 +1718,10 @@ BTRFS_SETGET_FUNCS(extent_flags, struct
1553
1554  BTRFS_SETGET_FUNCS(extent_refs_v0, struct btrfs_extent_item_v0, refs, 32);
1555
1556 +#define BTRFS_INODE_IXUNLINK           (1 << 24)
1557 +#define BTRFS_INODE_BARRIER            (1 << 25)
1558 +#define BTRFS_INODE_COW                        (1 << 26)
1559 +
1560
1561  BTRFS_SETGET_FUNCS(tree_block_level, struct btrfs_tree_block_info, level, 8);
1562
1563 @@ -3197,6 +3204,7 @@ int btrfs_ioctl_get_supported_features(v
1564  void btrfs_update_iflags(struct inode *inode);
1565  void btrfs_inherit_iflags(struct inode *inode, struct inode *dir);
1566  int btrfs_is_empty_uuid(u8 *uuid);
1567 +int btrfs_sync_flags(struct inode *inode, int, int);
1568  int btrfs_defrag_file(struct inode *inode, struct file *file,
1569                       struct btrfs_ioctl_defrag_range_args *range,
1570                       u64 newer_than, unsigned long max_pages);
1571 diff -NurpP --minimal linux-4.9.135/fs/btrfs/disk-io.c linux-4.9.135-vs2.3.9.8/fs/btrfs/disk-io.c
1572 --- linux-4.9.135/fs/btrfs/disk-io.c    2018-10-20 10:39:16.000000000 +0000
1573 +++ linux-4.9.135-vs2.3.9.8/fs/btrfs/disk-io.c  2018-10-20 05:55:42.000000000 +0000
1574 @@ -2852,6 +2852,9 @@ int open_ctree(struct super_block *sb,
1575                 goto fail_alloc;
1576         }
1577
1578 +       if (btrfs_test_opt(fs_info, TAGGED))
1579 +               sb->s_flags |= MS_TAGGED;
1580 +
1581         features = btrfs_super_incompat_flags(disk_super) &
1582                 ~BTRFS_FEATURE_INCOMPAT_SUPP;
1583         if (features) {
1584 diff -NurpP --minimal linux-4.9.135/fs/btrfs/inode.c linux-4.9.135-vs2.3.9.8/fs/btrfs/inode.c
1585 --- linux-4.9.135/fs/btrfs/inode.c      2018-10-20 10:39:16.000000000 +0000
1586 +++ linux-4.9.135-vs2.3.9.8/fs/btrfs/inode.c    2018-10-20 04:58:13.000000000 +0000
1587 @@ -43,6 +43,7 @@
1588  #include <linux/blkdev.h>
1589  #include <linux/posix_acl_xattr.h>
1590  #include <linux/uio.h>
1591 +#include <linux/vs_tag.h>
1592  #include "ctree.h"
1593  #include "disk-io.h"
1594  #include "transaction.h"
1595 @@ -3701,6 +3702,9 @@ static int btrfs_read_locked_inode(struc
1596         unsigned long ptr;
1597         int maybe_acls;
1598         u32 rdev;
1599 +       kuid_t kuid;
1600 +       kgid_t kgid;
1601 +       ktag_t ktag;
1602         int ret;
1603         bool filled = false;
1604         int first_xattr_slot;
1605 @@ -3733,8 +3737,14 @@ static int btrfs_read_locked_inode(struc
1606                                     struct btrfs_inode_item);
1607         inode->i_mode = btrfs_inode_mode(leaf, inode_item);
1608         set_nlink(inode, btrfs_inode_nlink(leaf, inode_item));
1609 -       i_uid_write(inode, btrfs_inode_uid(leaf, inode_item));
1610 -       i_gid_write(inode, btrfs_inode_gid(leaf, inode_item));
1611 +
1612 +       kuid = make_kuid(&init_user_ns, btrfs_inode_uid(leaf, inode_item));
1613 +       kgid = make_kgid(&init_user_ns, btrfs_inode_gid(leaf, inode_item));
1614 +       ktag = make_ktag(&init_user_ns, btrfs_inode_tag(leaf, inode_item));
1615 +
1616 +       inode->i_uid = INOTAG_KUID(DX_TAG(inode), kuid, kgid);
1617 +       inode->i_gid = INOTAG_KGID(DX_TAG(inode), kuid, kgid);
1618 +       inode->i_tag = INOTAG_KTAG(DX_TAG(inode), kuid, kgid, ktag);
1619         btrfs_i_size_write(inode, btrfs_inode_size(leaf, inode_item));
1620
1621         inode->i_atime.tv_sec = btrfs_timespec_sec(leaf, &inode_item->atime);
1622 @@ -3889,11 +3899,18 @@ static void fill_inode_item(struct btrfs
1623                             struct inode *inode)
1624  {
1625         struct btrfs_map_token token;
1626 +       uid_t uid = from_kuid(&init_user_ns,
1627 +               TAGINO_KUID(DX_TAG(inode), inode->i_uid, inode->i_tag));
1628 +       gid_t gid = from_kgid(&init_user_ns,
1629 +               TAGINO_KGID(DX_TAG(inode), inode->i_gid, inode->i_tag));
1630
1631         btrfs_init_map_token(&token);
1632
1633 -       btrfs_set_token_inode_uid(leaf, item, i_uid_read(inode), &token);
1634 -       btrfs_set_token_inode_gid(leaf, item, i_gid_read(inode), &token);
1635 +       btrfs_set_token_inode_uid(leaf, item, uid, &token);
1636 +       btrfs_set_token_inode_gid(leaf, item, gid, &token);
1637 +#ifdef CONFIG_TAGGING_INTERN
1638 +       btrfs_set_token_inode_tag(leaf, item, i_tag_read(inode), &token);
1639 +#endif
1640         btrfs_set_token_inode_size(leaf, item, BTRFS_I(inode)->disk_i_size,
1641                                    &token);
1642         btrfs_set_token_inode_mode(leaf, item, inode->i_mode, &token);
1643 @@ -10646,6 +10663,7 @@ static const struct inode_operations btr
1644         .mknod          = btrfs_mknod,
1645         .listxattr      = btrfs_listxattr,
1646         .permission     = btrfs_permission,
1647 +       .sync_flags     = btrfs_sync_flags,
1648         .get_acl        = btrfs_get_acl,
1649         .set_acl        = btrfs_set_acl,
1650         .update_time    = btrfs_update_time,
1651 @@ -10654,6 +10672,7 @@ static const struct inode_operations btr
1652  static const struct inode_operations btrfs_dir_ro_inode_operations = {
1653         .lookup         = btrfs_lookup,
1654         .permission     = btrfs_permission,
1655 +       .sync_flags     = btrfs_sync_flags,
1656         .update_time    = btrfs_update_time,
1657  };
1658
1659 @@ -10719,6 +10738,7 @@ static const struct inode_operations btr
1660         .listxattr      = btrfs_listxattr,
1661         .permission     = btrfs_permission,
1662         .fiemap         = btrfs_fiemap,
1663 +       .sync_flags     = btrfs_sync_flags,
1664         .get_acl        = btrfs_get_acl,
1665         .set_acl        = btrfs_set_acl,
1666         .update_time    = btrfs_update_time,
1667 diff -NurpP --minimal linux-4.9.135/fs/btrfs/ioctl.c linux-4.9.135-vs2.3.9.8/fs/btrfs/ioctl.c
1668 --- linux-4.9.135/fs/btrfs/ioctl.c      2018-10-20 10:39:16.000000000 +0000
1669 +++ linux-4.9.135-vs2.3.9.8/fs/btrfs/ioctl.c    2018-10-20 04:58:13.000000000 +0000
1670 @@ -110,10 +110,13 @@ static unsigned int btrfs_flags_to_ioctl
1671  {
1672         unsigned int iflags = 0;
1673
1674 -       if (flags & BTRFS_INODE_SYNC)
1675 -               iflags |= FS_SYNC_FL;
1676         if (flags & BTRFS_INODE_IMMUTABLE)
1677                 iflags |= FS_IMMUTABLE_FL;
1678 +       if (flags & BTRFS_INODE_IXUNLINK)
1679 +               iflags |= FS_IXUNLINK_FL;
1680 +
1681 +       if (flags & BTRFS_INODE_SYNC)
1682 +               iflags |= FS_SYNC_FL;
1683         if (flags & BTRFS_INODE_APPEND)
1684                 iflags |= FS_APPEND_FL;
1685         if (flags & BTRFS_INODE_NODUMP)
1686 @@ -130,34 +133,84 @@ static unsigned int btrfs_flags_to_ioctl
1687         else if (flags & BTRFS_INODE_COMPRESS)
1688                 iflags |= FS_COMPR_FL;
1689
1690 +       if (flags & BTRFS_INODE_BARRIER)
1691 +               iflags |= FS_BARRIER_FL;
1692 +       if (flags & BTRFS_INODE_COW)
1693 +               iflags |= FS_COW_FL;
1694         return iflags;
1695  }
1696
1697  /*
1698 - * Update inode->i_flags based on the btrfs internal flags.
1699 + * Update inode->i_(v)flags based on the btrfs internal flags.
1700   */
1701  void btrfs_update_iflags(struct inode *inode)
1702  {
1703         struct btrfs_inode *ip = BTRFS_I(inode);
1704         unsigned int new_fl = 0;
1705
1706 -       if (ip->flags & BTRFS_INODE_SYNC)
1707 -               new_fl |= S_SYNC;
1708         if (ip->flags & BTRFS_INODE_IMMUTABLE)
1709                 new_fl |= S_IMMUTABLE;
1710 +       if (ip->flags & BTRFS_INODE_IXUNLINK)
1711 +               new_fl |= S_IXUNLINK;
1712 +
1713 +       if (ip->flags & BTRFS_INODE_SYNC)
1714 +               new_fl |= S_SYNC;
1715         if (ip->flags & BTRFS_INODE_APPEND)
1716                 new_fl |= S_APPEND;
1717         if (ip->flags & BTRFS_INODE_NOATIME)
1718                 new_fl |= S_NOATIME;
1719         if (ip->flags & BTRFS_INODE_DIRSYNC)
1720                 new_fl |= S_DIRSYNC;
1721 -
1722         set_mask_bits(&inode->i_flags,
1723 -                     S_SYNC | S_APPEND | S_IMMUTABLE | S_NOATIME | S_DIRSYNC,
1724 +                     S_SYNC | S_APPEND | S_IMMUTABLE | S_IXUNLINK | S_NOATIME | S_DIRSYNC,
1725                       new_fl);
1726 +
1727 +       new_fl = 0;
1728 +       if (ip->flags & BTRFS_INODE_BARRIER)
1729 +               new_fl |= V_BARRIER;
1730 +       if (ip->flags & BTRFS_INODE_COW)
1731 +               new_fl |= V_COW;
1732 +
1733 +       set_mask_bits(&inode->i_vflags,
1734 +               V_BARRIER | V_COW, new_fl);
1735  }
1736
1737  /*
1738 + * Update btrfs internal flags from inode->i_(v)flags.
1739 + */
1740 +void btrfs_update_flags(struct inode *inode)
1741 +{
1742 +       struct btrfs_inode *ip = BTRFS_I(inode);
1743 +
1744 +       unsigned int flags = inode->i_flags;
1745 +       unsigned int vflags = inode->i_vflags;
1746 +
1747 +       ip->flags &= ~(BTRFS_INODE_SYNC | BTRFS_INODE_APPEND |
1748 +                       BTRFS_INODE_IMMUTABLE | BTRFS_INODE_IXUNLINK |
1749 +                       BTRFS_INODE_NOATIME | BTRFS_INODE_DIRSYNC |
1750 +                       BTRFS_INODE_BARRIER | BTRFS_INODE_COW);
1751 +
1752 +       if (flags & S_IMMUTABLE)
1753 +               ip->flags |= BTRFS_INODE_IMMUTABLE;
1754 +       if (flags & S_IXUNLINK)
1755 +               ip->flags |= BTRFS_INODE_IXUNLINK;
1756 +
1757 +       if (flags & S_SYNC)
1758 +               ip->flags |= BTRFS_INODE_SYNC;
1759 +       if (flags & S_APPEND)
1760 +               ip->flags |= BTRFS_INODE_APPEND;
1761 +       if (flags & S_NOATIME)
1762 +               ip->flags |= BTRFS_INODE_NOATIME;
1763 +       if (flags & S_DIRSYNC)
1764 +               ip->flags |= BTRFS_INODE_DIRSYNC;
1765 +
1766 +       if (vflags & V_BARRIER)
1767 +               ip->flags |= BTRFS_INODE_BARRIER;
1768 +       if (vflags & V_COW)
1769 +               ip->flags |= BTRFS_INODE_COW;
1770 + }
1771 +
1772 +/*
1773   * Inherit flags from the parent inode.
1774   *
1775   * Currently only the compression flags and the cow flags are inherited.
1776 @@ -170,6 +223,7 @@ void btrfs_inherit_iflags(struct inode *
1777                 return;
1778
1779         flags = BTRFS_I(dir)->flags;
1780 +       flags &= ~BTRFS_INODE_BARRIER;
1781
1782         if (flags & BTRFS_INODE_NOCOMPRESS) {
1783                 BTRFS_I(inode)->flags &= ~BTRFS_INODE_COMPRESS;
1784 @@ -188,6 +242,30 @@ void btrfs_inherit_iflags(struct inode *
1785         btrfs_update_iflags(inode);
1786  }
1787
1788 +int btrfs_sync_flags(struct inode *inode, int flags, int vflags)
1789 +{
1790 +       struct btrfs_inode *ip = BTRFS_I(inode);
1791 +       struct btrfs_root *root = ip->root;
1792 +       struct btrfs_trans_handle *trans;
1793 +       int ret;
1794 +
1795 +       trans = btrfs_join_transaction(root);
1796 +       BUG_ON(!trans);
1797 +
1798 +       inode->i_flags = flags;
1799 +       inode->i_vflags = vflags;
1800 +       btrfs_update_flags(inode);
1801 +
1802 +       ret = btrfs_update_inode(trans, root, inode);
1803 +       BUG_ON(ret);
1804 +
1805 +       btrfs_update_iflags(inode);
1806 +       inode->i_ctime = CURRENT_TIME;
1807 +       btrfs_end_transaction(trans, root);
1808 +
1809 +       return 0;
1810 +}
1811 +
1812  static int btrfs_ioctl_getflags(struct file *file, void __user *arg)
1813  {
1814         struct btrfs_inode *ip = BTRFS_I(file_inode(file));
1815 @@ -250,21 +328,27 @@ static int btrfs_ioctl_setflags(struct f
1816
1817         flags = btrfs_mask_flags(inode->i_mode, flags);
1818         oldflags = btrfs_flags_to_ioctl(ip->flags);
1819 -       if ((flags ^ oldflags) & (FS_APPEND_FL | FS_IMMUTABLE_FL)) {
1820 +       if ((flags ^ oldflags) & (FS_APPEND_FL |
1821 +               FS_IMMUTABLE_FL | FS_IXUNLINK_FL)) {
1822                 if (!capable(CAP_LINUX_IMMUTABLE)) {
1823                         ret = -EPERM;
1824                         goto out_unlock;
1825                 }
1826         }
1827
1828 -       if (flags & FS_SYNC_FL)
1829 -               ip->flags |= BTRFS_INODE_SYNC;
1830 -       else
1831 -               ip->flags &= ~BTRFS_INODE_SYNC;
1832         if (flags & FS_IMMUTABLE_FL)
1833                 ip->flags |= BTRFS_INODE_IMMUTABLE;
1834         else
1835                 ip->flags &= ~BTRFS_INODE_IMMUTABLE;
1836 +       if (flags & FS_IXUNLINK_FL)
1837 +               ip->flags |= BTRFS_INODE_IXUNLINK;
1838 +       else
1839 +               ip->flags &= ~BTRFS_INODE_IXUNLINK;
1840 +
1841 +       if (flags & FS_SYNC_FL)
1842 +               ip->flags |= BTRFS_INODE_SYNC;
1843 +       else
1844 +               ip->flags &= ~BTRFS_INODE_SYNC;
1845         if (flags & FS_APPEND_FL)
1846                 ip->flags |= BTRFS_INODE_APPEND;
1847         else
1848 diff -NurpP --minimal linux-4.9.135/fs/btrfs/super.c linux-4.9.135-vs2.3.9.8/fs/btrfs/super.c
1849 --- linux-4.9.135/fs/btrfs/super.c      2018-10-20 10:39:16.000000000 +0000
1850 +++ linux-4.9.135-vs2.3.9.8/fs/btrfs/super.c    2018-10-20 04:58:13.000000000 +0000
1851 @@ -327,7 +327,7 @@ enum {
1852  #ifdef CONFIG_BTRFS_DEBUG
1853         Opt_fragment_data, Opt_fragment_metadata, Opt_fragment_all,
1854  #endif
1855 -       Opt_err,
1856 +       Opt_tag, Opt_notag, Opt_tagid, Opt_err,
1857  };
1858
1859  static const match_table_t tokens = {
1860 @@ -388,6 +388,9 @@ static const match_table_t tokens = {
1861         {Opt_fragment_metadata, "fragment=metadata"},
1862         {Opt_fragment_all, "fragment=all"},
1863  #endif
1864 +       {Opt_tag, "tag"},
1865 +       {Opt_notag, "notag"},
1866 +       {Opt_tagid, "tagid=%u"},
1867         {Opt_err, NULL},
1868  };
1869
1870 @@ -833,6 +836,22 @@ int btrfs_parse_options(struct btrfs_roo
1871                         btrfs_set_opt(info->mount_opt, FRAGMENT_DATA);
1872                         break;
1873  #endif
1874 +#ifndef CONFIG_TAGGING_NONE
1875 +               case Opt_tag:
1876 +                       printk(KERN_INFO "btrfs: use tagging\n");
1877 +                       btrfs_set_opt(info->mount_opt, TAGGED);
1878 +                       break;
1879 +               case Opt_notag:
1880 +                       printk(KERN_INFO "btrfs: disabled tagging\n");
1881 +                       btrfs_clear_opt(info->mount_opt, TAGGED);
1882 +                       break;
1883 +#endif
1884 +#ifdef CONFIG_PROPAGATE
1885 +               case Opt_tagid:
1886 +                       /* use args[0] */
1887 +                       btrfs_set_opt(info->mount_opt, TAGGED);
1888 +                       break;
1889 +#endif
1890                 case Opt_err:
1891                         btrfs_info(root->fs_info,
1892                                    "unrecognized mount option '%s'", p);
1893 @@ -1754,6 +1773,12 @@ static int btrfs_remount(struct super_bl
1894         btrfs_resize_thread_pool(fs_info,
1895                 fs_info->thread_pool_size, old_thread_pool_size);
1896
1897 +       if (btrfs_test_opt(fs_info, TAGGED) && !(sb->s_flags & MS_TAGGED)) {
1898 +               printk("btrfs: %s: tagging not permitted on remount.\n",
1899 +                       sb->s_id);
1900 +               return -EINVAL;
1901 +       }
1902 +
1903         if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
1904                 goto out;
1905
1906 diff -NurpP --minimal linux-4.9.135/fs/char_dev.c linux-4.9.135-vs2.3.9.8/fs/char_dev.c
1907 --- linux-4.9.135/fs/char_dev.c 2016-12-11 19:17:54.000000000 +0000
1908 +++ linux-4.9.135-vs2.3.9.8/fs/char_dev.c       2018-10-20 04:58:13.000000000 +0000
1909 @@ -21,6 +21,8 @@
1910  #include <linux/mutex.h>
1911  #include <linux/backing-dev.h>
1912  #include <linux/tty.h>
1913 +#include <linux/vs_context.h>
1914 +#include <linux/vs_device.h>
1915
1916  #include "internal.h"
1917
1918 @@ -354,14 +356,21 @@ static int chrdev_open(struct inode *ino
1919         struct cdev *p;
1920         struct cdev *new = NULL;
1921         int ret = 0;
1922 +       dev_t mdev;
1923 +
1924 +       if (!vs_map_chrdev(inode->i_rdev, &mdev, DATTR_OPEN))
1925 +               return -EPERM;
1926 +       inode->i_mdev = mdev;
1927
1928         spin_lock(&cdev_lock);
1929         p = inode->i_cdev;
1930         if (!p) {
1931                 struct kobject *kobj;
1932                 int idx;
1933 +
1934                 spin_unlock(&cdev_lock);
1935 -               kobj = kobj_lookup(cdev_map, inode->i_rdev, &idx);
1936 +
1937 +               kobj = kobj_lookup(cdev_map, mdev, &idx);
1938                 if (!kobj)
1939                         return -ENXIO;
1940                 new = container_of(kobj, struct cdev, kobj);
1941 diff -NurpP --minimal linux-4.9.135/fs/dcache.c linux-4.9.135-vs2.3.9.8/fs/dcache.c
1942 --- linux-4.9.135/fs/dcache.c   2018-10-20 10:39:17.000000000 +0000
1943 +++ linux-4.9.135-vs2.3.9.8/fs/dcache.c 2018-10-20 05:55:42.000000000 +0000
1944 @@ -39,6 +39,7 @@
1945  #include <linux/ratelimit.h>
1946  #include <linux/list_lru.h>
1947  #include <linux/kasan.h>
1948 +#include <linux/vs_limit.h>
1949
1950  #include "internal.h"
1951  #include "mount.h"
1952 @@ -690,6 +691,7 @@ static inline bool fast_dput(struct dent
1953                 spin_lock(&dentry->d_lock);
1954                 if (dentry->d_lockref.count > 1) {
1955                         dentry->d_lockref.count--;
1956 +                       vx_dentry_dec(dentry);
1957                         spin_unlock(&dentry->d_lock);
1958                         return 1;
1959                 }
1960 @@ -821,6 +823,7 @@ repeat:
1961         dentry_lru_add(dentry);
1962
1963         dentry->d_lockref.count--;
1964 +       vx_dentry_dec(dentry);
1965         spin_unlock(&dentry->d_lock);
1966         return;
1967
1968 @@ -838,6 +841,7 @@ EXPORT_SYMBOL(dput);
1969  static inline void __dget_dlock(struct dentry *dentry)
1970  {
1971         dentry->d_lockref.count++;
1972 +       vx_dentry_inc(dentry);
1973  }
1974
1975  static inline void __dget(struct dentry *dentry)
1976 @@ -850,6 +854,8 @@ struct dentry *dget_parent(struct dentry
1977         int gotref;
1978         struct dentry *ret;
1979
1980 +       vx_dentry_dec(dentry);
1981 +
1982         /*
1983          * Do optimistic parent lookup without any
1984          * locking.
1985 @@ -880,6 +886,7 @@ repeat:
1986         rcu_read_unlock();
1987         BUG_ON(!ret->d_lockref.count);
1988         ret->d_lockref.count++;
1989 +       vx_dentry_inc(ret);
1990         spin_unlock(&ret->d_lock);
1991         return ret;
1992  }
1993 @@ -1034,6 +1041,7 @@ static void shrink_dentry_list(struct li
1994                         parent = lock_parent(dentry);
1995                         if (dentry->d_lockref.count != 1) {
1996                                 dentry->d_lockref.count--;
1997 +                               vx_dentry_dec(dentry);
1998                                 spin_unlock(&dentry->d_lock);
1999                                 if (parent)
2000                                         spin_unlock(&parent->d_lock);
2001 @@ -1600,6 +1608,9 @@ struct dentry *__d_alloc(struct super_bl
2002         char *dname;
2003         int err;
2004
2005 +       if (!vx_dentry_avail(1))
2006 +               return NULL;
2007 +
2008         dentry = kmem_cache_alloc(dentry_cache, GFP_KERNEL);
2009         if (!dentry)
2010                 return NULL;
2011 @@ -1643,6 +1654,7 @@ struct dentry *__d_alloc(struct super_bl
2012
2013         dentry->d_lockref.count = 1;
2014         dentry->d_flags = 0;
2015 +       vx_dentry_inc(dentry);
2016         spin_lock_init(&dentry->d_lock);
2017         seqcount_init(&dentry->d_seq);
2018         dentry->d_inode = NULL;
2019 @@ -2316,6 +2328,7 @@ struct dentry *__d_lookup(const struct d
2020                         goto next;
2021
2022                 dentry->d_lockref.count++;
2023 +               vx_dentry_inc(dentry);
2024                 found = dentry;
2025                 spin_unlock(&dentry->d_lock);
2026                 break;
2027 @@ -3574,6 +3587,7 @@ static enum d_walk_ret d_genocide_kill(v
2028                 if (!(dentry->d_flags & DCACHE_GENOCIDE)) {
2029                         dentry->d_flags |= DCACHE_GENOCIDE;
2030                         dentry->d_lockref.count--;
2031 +                       vx_dentry_dec(dentry);
2032                 }
2033         }
2034         return D_WALK_CONTINUE;
2035 diff -NurpP --minimal linux-4.9.135/fs/devpts/inode.c linux-4.9.135-vs2.3.9.8/fs/devpts/inode.c
2036 --- linux-4.9.135/fs/devpts/inode.c     2016-12-11 19:17:54.000000000 +0000
2037 +++ linux-4.9.135-vs2.3.9.8/fs/devpts/inode.c   2018-10-20 04:58:13.000000000 +0000
2038 @@ -27,6 +27,7 @@
2039  #include <linux/parser.h>
2040  #include <linux/fsnotify.h>
2041  #include <linux/seq_file.h>
2042 +#include <linux/vs_base.h>
2043
2044  #define DEVPTS_DEFAULT_MODE 0600
2045  /*
2046 @@ -38,6 +39,21 @@
2047  #define DEVPTS_DEFAULT_PTMX_MODE 0000
2048  #define PTMX_MINOR     2
2049
2050 +static int devpts_permission(struct inode *inode, int mask)
2051 +{
2052 +       int ret = -EACCES;
2053 +
2054 +       /* devpts is xid tagged */
2055 +       if (vx_check((vxid_t)i_tag_read(inode), VS_WATCH_P | VS_IDENT))
2056 +               ret = generic_permission(inode, mask);
2057 +       return ret;
2058 +}
2059 +
2060 +static struct inode_operations devpts_file_inode_operations = {
2061 +       .permission     = devpts_permission,
2062 +};
2063 +
2064 +
2065  /*
2066   * sysctl support for setting limits on the number of Unix98 ptys allocated.
2067   * Otherwise one can eat up all kernel memory by opening /dev/ptmx repeatedly.
2068 @@ -363,6 +379,34 @@ static int devpts_show_options(struct se
2069         return 0;
2070  }
2071
2072 +static int devpts_filter(struct dentry *de)
2073 +{
2074 +       vxid_t xid = 0;
2075 +
2076 +       /* devpts is xid tagged */
2077 +       if (de && de->d_inode)
2078 +               xid = (vxid_t)i_tag_read(de->d_inode);
2079 +#ifdef CONFIG_VSERVER_WARN_DEVPTS
2080 +       else
2081 +               vxwprintk_task(1, "devpts " VS_Q("%.*s") " without inode.",
2082 +                       de->d_name.len, de->d_name.name);
2083 +#endif
2084 +       return vx_check(xid, VS_WATCH_P | VS_IDENT);
2085 +}
2086 +
2087 +static int devpts_readdir(struct file * filp, struct dir_context *ctx)
2088 +{
2089 +       return dcache_readdir_filter(filp, ctx, devpts_filter);
2090 +}
2091 +
2092 +static struct file_operations devpts_dir_operations = {
2093 +       .open           = dcache_dir_open,
2094 +       .release        = dcache_dir_close,
2095 +       .llseek         = dcache_dir_lseek,
2096 +       .read           = generic_read_dir,
2097 +       .iterate        = devpts_readdir,
2098 +};
2099 +
2100  static const struct super_operations devpts_sops = {
2101         .statfs         = simple_statfs,
2102         .remount_fs     = devpts_remount,
2103 @@ -415,8 +459,10 @@ devpts_fill_super(struct super_block *s,
2104         inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
2105         inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO | S_IWUSR;
2106         inode->i_op = &simple_dir_inode_operations;
2107 -       inode->i_fop = &simple_dir_operations;
2108 +       inode->i_fop = &devpts_dir_operations;
2109         set_nlink(inode, 2);
2110 +       /* devpts is xid tagged */
2111 +       i_tag_write(inode, (vtag_t)vx_current_xid());
2112
2113         s->s_root = d_make_root(inode);
2114         if (!s->s_root) {
2115 @@ -542,6 +588,9 @@ struct dentry *devpts_pty_new(struct pts
2116         inode->i_gid = opts->setgid ? opts->gid : current_fsgid();
2117         inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
2118         init_special_inode(inode, S_IFCHR|opts->mode, MKDEV(UNIX98_PTY_SLAVE_MAJOR, index));
2119 +       /* devpts is xid tagged */
2120 +       i_tag_write(inode, (vtag_t)vx_current_xid());
2121 +       inode->i_op = &devpts_file_inode_operations;
2122
2123         sprintf(s, "%d", index);
2124
2125 diff -NurpP --minimal linux-4.9.135/fs/ext2/balloc.c linux-4.9.135-vs2.3.9.8/fs/ext2/balloc.c
2126 --- linux-4.9.135/fs/ext2/balloc.c      2016-12-11 19:17:54.000000000 +0000
2127 +++ linux-4.9.135-vs2.3.9.8/fs/ext2/balloc.c    2018-10-20 04:58:13.000000000 +0000
2128 @@ -693,7 +693,6 @@ ext2_try_to_allocate(struct super_block
2129                         start = 0;
2130                 end = EXT2_BLOCKS_PER_GROUP(sb);
2131         }
2132 -
2133         BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb));
2134
2135  repeat:
2136 diff -NurpP --minimal linux-4.9.135/fs/ext2/ext2.h linux-4.9.135-vs2.3.9.8/fs/ext2/ext2.h
2137 --- linux-4.9.135/fs/ext2/ext2.h        2016-12-11 19:17:54.000000000 +0000
2138 +++ linux-4.9.135-vs2.3.9.8/fs/ext2/ext2.h      2018-10-20 04:58:13.000000000 +0000
2139 @@ -247,8 +247,12 @@ struct ext2_group_desc
2140  #define EXT2_NOTAIL_FL                 FS_NOTAIL_FL    /* file tail should not be merged */
2141  #define EXT2_DIRSYNC_FL                        FS_DIRSYNC_FL   /* dirsync behaviour (directories only) */
2142  #define EXT2_TOPDIR_FL                 FS_TOPDIR_FL    /* Top of directory hierarchies*/
2143 +#define EXT2_IXUNLINK_FL               FS_IXUNLINK_FL  /* Immutable invert on unlink */
2144  #define EXT2_RESERVED_FL               FS_RESERVED_FL  /* reserved for ext2 lib */
2145
2146 +#define EXT2_BARRIER_FL                        FS_BARRIER_FL   /* Barrier for chroot() */
2147 +#define EXT2_COW_FL                    FS_COW_FL       /* Copy on Write marker */
2148 +
2149  #define EXT2_FL_USER_VISIBLE           FS_FL_USER_VISIBLE      /* User visible flags */
2150  #define EXT2_FL_USER_MODIFIABLE                FS_FL_USER_MODIFIABLE   /* User modifiable flags */
2151
2152 @@ -332,7 +336,8 @@ struct ext2_inode {
2153                         __u16   i_pad1;
2154                         __le16  l_i_uid_high;   /* these 2 fields    */
2155                         __le16  l_i_gid_high;   /* were reserved2[0] */
2156 -                       __u32   l_i_reserved2;
2157 +                       __le16  l_i_tag;        /* Context Tag */
2158 +                       __u16   l_i_reserved2;
2159                 } linux2;
2160                 struct {
2161                         __u8    h_i_frag;       /* Fragment number */
2162 @@ -360,6 +365,7 @@ struct ext2_inode {
2163  #define i_gid_low      i_gid
2164  #define i_uid_high     osd2.linux2.l_i_uid_high
2165  #define i_gid_high     osd2.linux2.l_i_gid_high
2166 +#define i_raw_tag      osd2.linux2.l_i_tag
2167  #define i_reserved2    osd2.linux2.l_i_reserved2
2168
2169  /*
2170 @@ -393,6 +399,7 @@ struct ext2_inode {
2171  #else
2172  #define EXT2_MOUNT_DAX                 0
2173  #endif
2174 +#define EXT2_MOUNT_TAGGED              0x200000  /* Enable Context Tags */
2175
2176
2177  #define clear_opt(o, opt)              o &= ~EXT2_MOUNT_##opt
2178 @@ -782,6 +789,7 @@ extern void ext2_set_inode_flags(struct
2179  extern void ext2_get_inode_flags(struct ext2_inode_info *);
2180  extern int ext2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
2181                        u64 start, u64 len);
2182 +extern int ext2_sync_flags(struct inode *, int, int);
2183
2184  /* ioctl.c */
2185  extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
2186 diff -NurpP --minimal linux-4.9.135/fs/ext2/file.c linux-4.9.135-vs2.3.9.8/fs/ext2/file.c
2187 --- linux-4.9.135/fs/ext2/file.c        2016-12-11 19:17:54.000000000 +0000
2188 +++ linux-4.9.135-vs2.3.9.8/fs/ext2/file.c      2018-10-20 04:58:13.000000000 +0000
2189 @@ -247,4 +247,5 @@ const struct inode_operations ext2_file_
2190         .get_acl        = ext2_get_acl,
2191         .set_acl        = ext2_set_acl,
2192         .fiemap         = ext2_fiemap,
2193 +       .sync_flags     = ext2_sync_flags,
2194  };
2195 diff -NurpP --minimal linux-4.9.135/fs/ext2/ialloc.c linux-4.9.135-vs2.3.9.8/fs/ext2/ialloc.c
2196 --- linux-4.9.135/fs/ext2/ialloc.c      2016-12-11 19:17:54.000000000 +0000
2197 +++ linux-4.9.135-vs2.3.9.8/fs/ext2/ialloc.c    2018-10-20 04:58:13.000000000 +0000
2198 @@ -17,6 +17,7 @@
2199  #include <linux/backing-dev.h>
2200  #include <linux/buffer_head.h>
2201  #include <linux/random.h>
2202 +#include <linux/vs_tag.h>
2203  #include "ext2.h"
2204  #include "xattr.h"
2205  #include "acl.h"
2206 @@ -551,6 +552,7 @@ got:
2207                 inode->i_mode = mode;
2208                 inode->i_uid = current_fsuid();
2209                 inode->i_gid = dir->i_gid;
2210 +               i_tag_write(inode, dx_current_fstag(sb));
2211         } else
2212                 inode_init_owner(inode, dir, mode);
2213
2214 diff -NurpP --minimal linux-4.9.135/fs/ext2/inode.c linux-4.9.135-vs2.3.9.8/fs/ext2/inode.c
2215 --- linux-4.9.135/fs/ext2/inode.c       2018-10-20 10:39:17.000000000 +0000
2216 +++ linux-4.9.135-vs2.3.9.8/fs/ext2/inode.c     2018-10-20 04:58:13.000000000 +0000
2217 @@ -35,6 +35,7 @@
2218  #include <linux/iomap.h>
2219  #include <linux/namei.h>
2220  #include <linux/uio.h>
2221 +#include <linux/vs_tag.h>
2222  #include "ext2.h"
2223  #include "acl.h"
2224  #include "xattr.h"
2225 @@ -1357,39 +1358,61 @@ void ext2_set_inode_flags(struct inode *
2226  {
2227         unsigned int flags = EXT2_I(inode)->i_flags;
2228
2229 -       inode->i_flags &= ~(S_SYNC | S_APPEND | S_IMMUTABLE | S_NOATIME |
2230 -                               S_DIRSYNC | S_DAX);
2231 +       inode->i_flags &= ~(S_IMMUTABLE | S_IXUNLINK | S_DAX |
2232 +               S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
2233 +
2234 +       if (flags & EXT2_IMMUTABLE_FL)
2235 +               inode->i_flags |= S_IMMUTABLE;
2236 +       if (flags & EXT2_IXUNLINK_FL)
2237 +               inode->i_flags |= S_IXUNLINK;
2238         if (flags & EXT2_SYNC_FL)
2239                 inode->i_flags |= S_SYNC;
2240         if (flags & EXT2_APPEND_FL)
2241                 inode->i_flags |= S_APPEND;
2242 -       if (flags & EXT2_IMMUTABLE_FL)
2243 -               inode->i_flags |= S_IMMUTABLE;
2244         if (flags & EXT2_NOATIME_FL)
2245                 inode->i_flags |= S_NOATIME;
2246         if (flags & EXT2_DIRSYNC_FL)
2247                 inode->i_flags |= S_DIRSYNC;
2248         if (test_opt(inode->i_sb, DAX) && S_ISREG(inode->i_mode))
2249                 inode->i_flags |= S_DAX;
2250 +
2251 +       inode->i_vflags &= ~(V_BARRIER | V_COW);
2252 +
2253 +       if (flags & EXT2_BARRIER_FL)
2254 +               inode->i_vflags |= V_BARRIER;
2255 +       if (flags & EXT2_COW_FL)
2256 +               inode->i_vflags |= V_COW;
2257  }
2258
2259  /* Propagate flags from i_flags to EXT2_I(inode)->i_flags */
2260  void ext2_get_inode_flags(struct ext2_inode_info *ei)
2261  {
2262         unsigned int flags = ei->vfs_inode.i_flags;
2263 +       unsigned int vflags = ei->vfs_inode.i_vflags;
2264 +
2265 +       ei->i_flags &= ~(EXT2_SYNC_FL | EXT2_APPEND_FL |
2266 +                       EXT2_IMMUTABLE_FL | EXT2_IXUNLINK_FL |
2267 +                       EXT2_NOATIME_FL | EXT2_DIRSYNC_FL |
2268 +                       EXT2_BARRIER_FL | EXT2_COW_FL);
2269 +
2270 +       if (flags & S_IMMUTABLE)
2271 +               ei->i_flags |= EXT2_IMMUTABLE_FL;
2272 +       if (flags & S_IXUNLINK)
2273 +               ei->i_flags |= EXT2_IXUNLINK_FL;
2274
2275 -       ei->i_flags &= ~(EXT2_SYNC_FL|EXT2_APPEND_FL|
2276 -                       EXT2_IMMUTABLE_FL|EXT2_NOATIME_FL|EXT2_DIRSYNC_FL);
2277         if (flags & S_SYNC)
2278                 ei->i_flags |= EXT2_SYNC_FL;
2279         if (flags & S_APPEND)
2280                 ei->i_flags |= EXT2_APPEND_FL;
2281 -       if (flags & S_IMMUTABLE)
2282 -               ei->i_flags |= EXT2_IMMUTABLE_FL;
2283         if (flags & S_NOATIME)
2284                 ei->i_flags |= EXT2_NOATIME_FL;
2285         if (flags & S_DIRSYNC)
2286                 ei->i_flags |= EXT2_DIRSYNC_FL;
2287 +
2288 +       if (vflags & V_BARRIER)
2289 +               ei->i_flags |= EXT2_BARRIER_FL;
2290 +       if (vflags & V_COW)
2291 +               ei->i_flags |= EXT2_COW_FL;
2292  }
2293
2294  struct inode *ext2_iget (struct super_block *sb, unsigned long ino)
2295 @@ -1425,8 +1448,10 @@ struct inode *ext2_iget (struct super_bl
2296                 i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
2297                 i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
2298         }
2299 -       i_uid_write(inode, i_uid);
2300 -       i_gid_write(inode, i_gid);
2301 +       i_uid_write(inode, INOTAG_UID(DX_TAG(inode), i_uid, i_gid));
2302 +       i_gid_write(inode, INOTAG_GID(DX_TAG(inode), i_uid, i_gid));
2303 +       i_tag_write(inode, INOTAG_TAG(DX_TAG(inode), i_uid, i_gid,
2304 +               le16_to_cpu(raw_inode->i_raw_tag)));
2305         set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
2306         inode->i_size = le32_to_cpu(raw_inode->i_size);
2307         inode->i_atime.tv_sec = (signed)le32_to_cpu(raw_inode->i_atime);
2308 @@ -1533,8 +1558,10 @@ static int __ext2_write_inode(struct ino
2309         struct ext2_inode_info *ei = EXT2_I(inode);
2310         struct super_block *sb = inode->i_sb;
2311         ino_t ino = inode->i_ino;
2312 -       uid_t uid = i_uid_read(inode);
2313 -       gid_t gid = i_gid_read(inode);
2314 +       uid_t uid = from_kuid(&init_user_ns,
2315 +               TAGINO_KUID(DX_TAG(inode), inode->i_uid, inode->i_tag));
2316 +       gid_t gid = from_kgid(&init_user_ns,
2317 +               TAGINO_KGID(DX_TAG(inode), inode->i_gid, inode->i_tag));
2318         struct buffer_head * bh;
2319         struct ext2_inode * raw_inode = ext2_get_inode(sb, ino, &bh);
2320         int n;
2321 @@ -1570,6 +1597,9 @@ static int __ext2_write_inode(struct ino
2322                 raw_inode->i_uid_high = 0;
2323                 raw_inode->i_gid_high = 0;
2324         }
2325 +#ifdef CONFIG_TAGGING_INTERN
2326 +       raw_inode->i_raw_tag = cpu_to_le16(i_tag_read(inode));
2327 +#endif
2328         raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
2329         raw_inode->i_size = cpu_to_le32(inode->i_size);
2330         raw_inode->i_atime = cpu_to_le32(inode->i_atime.tv_sec);
2331 @@ -1653,7 +1683,8 @@ int ext2_setattr(struct dentry *dentry,
2332                         return error;
2333         }
2334         if ((iattr->ia_valid & ATTR_UID && !uid_eq(iattr->ia_uid, inode->i_uid)) ||
2335 -           (iattr->ia_valid & ATTR_GID && !gid_eq(iattr->ia_gid, inode->i_gid))) {
2336 +           (iattr->ia_valid & ATTR_GID && !gid_eq(iattr->ia_gid, inode->i_gid)) ||
2337 +           (iattr->ia_valid & ATTR_TAG && !tag_eq(iattr->ia_tag, inode->i_tag))) {
2338                 error = dquot_transfer(inode, iattr);
2339                 if (error)
2340                         return error;
2341 diff -NurpP --minimal linux-4.9.135/fs/ext2/ioctl.c linux-4.9.135-vs2.3.9.8/fs/ext2/ioctl.c
2342 --- linux-4.9.135/fs/ext2/ioctl.c       2016-12-11 19:17:54.000000000 +0000
2343 +++ linux-4.9.135-vs2.3.9.8/fs/ext2/ioctl.c     2018-10-20 04:58:13.000000000 +0000
2344 @@ -17,6 +17,16 @@
2345  #include <asm/uaccess.h>
2346
2347
2348 +int ext2_sync_flags(struct inode *inode, int flags, int vflags)
2349 +{
2350 +       inode->i_flags = flags;
2351 +       inode->i_vflags = vflags;
2352 +       ext2_get_inode_flags(EXT2_I(inode));
2353 +       inode->i_ctime = CURRENT_TIME_SEC;
2354 +       mark_inode_dirty(inode);
2355 +       return 0;
2356 +}
2357 +
2358  long ext2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
2359  {
2360         struct inode *inode = file_inode(filp);
2361 @@ -51,6 +61,11 @@ long ext2_ioctl(struct file *filp, unsig
2362
2363                 flags = ext2_mask_flags(inode->i_mode, flags);
2364
2365 +               if (IS_BARRIER(inode)) {
2366 +                       vxwprintk_task(1, "messing with the barrier.");
2367 +                       return -EACCES;
2368 +               }
2369 +
2370                 inode_lock(inode);
2371                 /* Is it quota file? Do not allow user to mess with it */
2372                 if (IS_NOQUOTA(inode)) {
2373 @@ -66,7 +81,9 @@ long ext2_ioctl(struct file *filp, unsig
2374                  *
2375                  * This test looks nicer. Thanks to Pauline Middelink
2376                  */
2377 -               if ((flags ^ oldflags) & (EXT2_APPEND_FL | EXT2_IMMUTABLE_FL)) {
2378 +               if ((oldflags & EXT2_IMMUTABLE_FL) ||
2379 +                       ((flags ^ oldflags) & (EXT2_APPEND_FL |
2380 +                       EXT2_IMMUTABLE_FL | EXT2_IXUNLINK_FL))) {
2381                         if (!capable(CAP_LINUX_IMMUTABLE)) {
2382                                 inode_unlock(inode);
2383                                 ret = -EPERM;
2384 @@ -74,7 +91,7 @@ long ext2_ioctl(struct file *filp, unsig
2385                         }
2386                 }
2387
2388 -               flags = flags & EXT2_FL_USER_MODIFIABLE;
2389 +               flags &= EXT2_FL_USER_MODIFIABLE;
2390                 flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
2391                 ei->i_flags = flags;
2392
2393 diff -NurpP --minimal linux-4.9.135/fs/ext2/namei.c linux-4.9.135-vs2.3.9.8/fs/ext2/namei.c
2394 --- linux-4.9.135/fs/ext2/namei.c       2018-10-20 10:39:17.000000000 +0000
2395 +++ linux-4.9.135-vs2.3.9.8/fs/ext2/namei.c     2018-10-20 04:58:13.000000000 +0000
2396 @@ -32,6 +32,7 @@
2397
2398  #include <linux/pagemap.h>
2399  #include <linux/quotaops.h>
2400 +#include <linux/vs_tag.h>
2401  #include "ext2.h"
2402  #include "xattr.h"
2403  #include "acl.h"
2404 @@ -71,6 +72,7 @@ static struct dentry *ext2_lookup(struct
2405                                         (unsigned long) ino);
2406                         return ERR_PTR(-EIO);
2407                 }
2408 +               dx_propagate_tag(nd, inode);
2409         }
2410         return d_splice_alias(inode, dentry);
2411  }
2412 @@ -443,6 +445,7 @@ const struct inode_operations ext2_speci
2413         .listxattr      = ext2_listxattr,
2414  #endif
2415         .setattr        = ext2_setattr,
2416 +       .sync_flags     = ext2_sync_flags,
2417         .get_acl        = ext2_get_acl,
2418         .set_acl        = ext2_set_acl,
2419  };
2420 diff -NurpP --minimal linux-4.9.135/fs/ext2/super.c linux-4.9.135-vs2.3.9.8/fs/ext2/super.c
2421 --- linux-4.9.135/fs/ext2/super.c       2016-12-11 19:17:54.000000000 +0000
2422 +++ linux-4.9.135-vs2.3.9.8/fs/ext2/super.c     2018-10-20 04:58:13.000000000 +0000
2423 @@ -411,7 +411,8 @@ enum {
2424         Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug,
2425         Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr,
2426         Opt_acl, Opt_noacl, Opt_xip, Opt_dax, Opt_ignore, Opt_err, Opt_quota,
2427 -       Opt_usrquota, Opt_grpquota, Opt_reservation, Opt_noreservation
2428 +       Opt_usrquota, Opt_grpquota, Opt_reservation, Opt_noreservation,
2429 +       Opt_tag, Opt_notag, Opt_tagid
2430  };
2431
2432  static const match_table_t tokens = {
2433 @@ -439,6 +440,9 @@ static const match_table_t tokens = {
2434         {Opt_acl, "acl"},
2435         {Opt_noacl, "noacl"},
2436         {Opt_xip, "xip"},
2437 +       {Opt_tag, "tag"},
2438 +       {Opt_notag, "notag"},
2439 +       {Opt_tagid, "tagid=%u"},
2440         {Opt_dax, "dax"},
2441         {Opt_grpquota, "grpquota"},
2442         {Opt_ignore, "noquota"},
2443 @@ -523,6 +527,20 @@ static int parse_options(char *options,
2444                 case Opt_nouid32:
2445                         set_opt (sbi->s_mount_opt, NO_UID32);
2446                         break;
2447 +#ifndef CONFIG_TAGGING_NONE
2448 +               case Opt_tag:
2449 +                       set_opt (sbi->s_mount_opt, TAGGED);
2450 +                       break;
2451 +               case Opt_notag:
2452 +                       clear_opt (sbi->s_mount_opt, TAGGED);
2453 +                       break;
2454 +#endif
2455 +#ifdef CONFIG_PROPAGATE
2456 +               case Opt_tagid:
2457 +                       /* use args[0] */
2458 +                       set_opt (sbi->s_mount_opt, TAGGED);
2459 +                       break;
2460 +#endif
2461                 case Opt_nocheck:
2462                         clear_opt (sbi->s_mount_opt, CHECK);
2463                         break;
2464 @@ -887,6 +905,8 @@ static int ext2_fill_super(struct super_
2465         if (!parse_options((char *) data, sb))
2466                 goto failed_mount;
2467
2468 +       if (EXT2_SB(sb)->s_mount_opt & EXT2_MOUNT_TAGGED)
2469 +               sb->s_flags |= MS_TAGGED;
2470         sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
2471                 ((EXT2_SB(sb)->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ?
2472                  MS_POSIXACL : 0);
2473 @@ -1300,6 +1320,14 @@ static int ext2_remount (struct super_bl
2474                 err = -EINVAL;
2475                 goto restore_opts;
2476         }
2477 +
2478 +       if ((sbi->s_mount_opt & EXT2_MOUNT_TAGGED) &&
2479 +               !(sb->s_flags & MS_TAGGED)) {
2480 +               printk("EXT2-fs: %s: tagging not permitted on remount.\n",
2481 +                      sb->s_id);
2482 +               err = -EINVAL;
2483 +               goto restore_opts;
2484 +       }
2485
2486         sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
2487                 ((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
2488 diff -NurpP --minimal linux-4.9.135/fs/ext4/ext4.h linux-4.9.135-vs2.3.9.8/fs/ext4/ext4.h
2489 --- linux-4.9.135/fs/ext4/ext4.h        2018-10-20 10:39:17.000000000 +0000
2490 +++ linux-4.9.135-vs2.3.9.8/fs/ext4/ext4.h      2018-10-20 11:46:17.000000000 +0000
2491 @@ -392,8 +392,11 @@ struct flex_groups {
2492  #define EXT4_EXTENTS_FL                        0x00080000 /* Inode uses extents */
2493  #define EXT4_EA_INODE_FL               0x00200000 /* Inode used for large EA */
2494  #define EXT4_EOFBLOCKS_FL              0x00400000 /* Blocks allocated beyond EOF */
2495 +#define EXT4_BARRIER_FL                        0x04000000 /* Barrier for chroot() */
2496 +#define EXT4_IXUNLINK_FL               0x08000000 /* Immutable invert on unlink */
2497  #define EXT4_INLINE_DATA_FL            0x10000000 /* Inode has inline data. */
2498  #define EXT4_PROJINHERIT_FL            0x20000000 /* Create with parents projid */
2499 +#define EXT4_COW_FL                    0x40000000 /* Copy on Write marker */
2500  #define EXT4_RESERVED_FL               0x80000000 /* reserved for ext4 lib */
2501
2502  #define EXT4_FL_USER_VISIBLE           0x304BDFFF /* User visible flags */
2503 @@ -735,7 +738,7 @@ struct ext4_inode {
2504                         __le16  l_i_uid_high;   /* these 2 fields */
2505                         __le16  l_i_gid_high;   /* were reserved2[0] */
2506                         __le16  l_i_checksum_lo;/* crc32c(uuid+inum+inode) LE */
2507 -                       __le16  l_i_reserved;
2508 +                       __le16  l_i_tag;        /* Context Tag */
2509                 } linux2;
2510                 struct {
2511                         __le16  h_i_reserved1;  /* Obsoleted fragment number/size which are removed in ext4 */
2512 @@ -892,6 +895,7 @@ do {                                                                               \
2513  #define i_gid_low      i_gid
2514  #define i_uid_high     osd2.linux2.l_i_uid_high
2515  #define i_gid_high     osd2.linux2.l_i_gid_high
2516 +#define i_raw_tag      osd2.linux2.l_i_tag
2517  #define i_checksum_lo  osd2.linux2.l_i_checksum_lo
2518
2519  #elif defined(__GNU__)
2520 @@ -1133,6 +1137,7 @@ struct ext4_inode_info {
2521  #define EXT4_MOUNT_DIOREAD_NOLOCK      0x400000 /* Enable support for dio read nolocking */
2522  #define EXT4_MOUNT_JOURNAL_CHECKSUM    0x800000 /* Journal checksums */
2523  #define EXT4_MOUNT_JOURNAL_ASYNC_COMMIT        0x1000000 /* Journal Async Commit */
2524 +#define EXT4_MOUNT_TAGGED              0x2000000 /* Enable Context Tags */
2525  #define EXT4_MOUNT_DELALLOC            0x8000000 /* Delalloc support */
2526  #define EXT4_MOUNT_DATA_ERR_ABORT      0x10000000 /* Abort on file data write */
2527  #define EXT4_MOUNT_BLOCK_VALIDITY      0x20000000 /* Block validity checking */
2528 @@ -2492,6 +2497,7 @@ extern int ext4_punch_hole(struct inode
2529  extern int ext4_truncate_restart_trans(handle_t *, struct inode *, int nblocks);
2530  extern void ext4_set_inode_flags(struct inode *);
2531  extern void ext4_get_inode_flags(struct ext4_inode_info *);
2532 +extern int ext4_sync_flags(struct inode *, int, int);
2533  extern int ext4_alloc_da_blocks(struct inode *inode);
2534  extern void ext4_set_aops(struct inode *inode);
2535  extern int ext4_writepage_trans_blocks(struct inode *);
2536 diff -NurpP --minimal linux-4.9.135/fs/ext4/file.c linux-4.9.135-vs2.3.9.8/fs/ext4/file.c
2537 --- linux-4.9.135/fs/ext4/file.c        2018-10-20 10:39:17.000000000 +0000
2538 +++ linux-4.9.135-vs2.3.9.8/fs/ext4/file.c      2018-10-20 04:58:13.000000000 +0000
2539 @@ -691,5 +691,6 @@ const struct inode_operations ext4_file_
2540         .get_acl        = ext4_get_acl,
2541         .set_acl        = ext4_set_acl,
2542         .fiemap         = ext4_fiemap,
2543 +       .sync_flags     = ext4_sync_flags,
2544  };
2545
2546 diff -NurpP --minimal linux-4.9.135/fs/ext4/ialloc.c linux-4.9.135-vs2.3.9.8/fs/ext4/ialloc.c
2547 --- linux-4.9.135/fs/ext4/ialloc.c      2018-10-20 10:39:17.000000000 +0000
2548 +++ linux-4.9.135-vs2.3.9.8/fs/ext4/ialloc.c    2018-10-20 05:55:42.000000000 +0000
2549 @@ -21,6 +21,7 @@
2550  #include <linux/random.h>
2551  #include <linux/bitops.h>
2552  #include <linux/blkdev.h>
2553 +#include <linux/vs_tag.h>
2554  #include <asm/byteorder.h>
2555
2556  #include "ext4.h"
2557 @@ -777,6 +778,7 @@ struct inode *__ext4_new_inode(handle_t
2558                 inode->i_mode = mode;
2559                 inode->i_uid = current_fsuid();
2560                 inode->i_gid = dir->i_gid;
2561 +               i_tag_write(inode, dx_current_fstag(sb));
2562         } else
2563                 inode_init_owner(inode, dir, mode);
2564
2565 diff -NurpP --minimal linux-4.9.135/fs/ext4/inode.c linux-4.9.135-vs2.3.9.8/fs/ext4/inode.c
2566 --- linux-4.9.135/fs/ext4/inode.c       2018-10-20 10:39:17.000000000 +0000
2567 +++ linux-4.9.135-vs2.3.9.8/fs/ext4/inode.c     2018-10-20 05:55:42.000000000 +0000
2568 @@ -37,6 +37,7 @@
2569  #include <linux/printk.h>
2570  #include <linux/slab.h>
2571  #include <linux/bitops.h>
2572 +#include <linux/vs_tag.h>
2573
2574  #include "ext4_jbd2.h"
2575  #include "xattr.h"
2576 @@ -4380,12 +4381,15 @@ void ext4_set_inode_flags(struct inode *
2577         unsigned int flags = EXT4_I(inode)->i_flags;
2578         unsigned int new_fl = 0;
2579
2580 +       if (flags & EXT4_IMMUTABLE_FL)
2581 +               new_fl |= S_IMMUTABLE;
2582 +       if (flags & EXT4_IXUNLINK_FL)
2583 +               new_fl |= S_IXUNLINK;
2584 +
2585         if (flags & EXT4_SYNC_FL)
2586                 new_fl |= S_SYNC;
2587         if (flags & EXT4_APPEND_FL)
2588                 new_fl |= S_APPEND;
2589 -       if (flags & EXT4_IMMUTABLE_FL)
2590 -               new_fl |= S_IMMUTABLE;
2591         if (flags & EXT4_NOATIME_FL)
2592                 new_fl |= S_NOATIME;
2593         if (flags & EXT4_DIRSYNC_FL)
2594 @@ -4393,31 +4397,52 @@ void ext4_set_inode_flags(struct inode *
2595         if (test_opt(inode->i_sb, DAX) && S_ISREG(inode->i_mode))
2596                 new_fl |= S_DAX;
2597         inode_set_flags(inode, new_fl,
2598 -                       S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC|S_DAX);
2599 +               S_IXUNLINK | S_IMMUTABLE | S_DAX |
2600 +               S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
2601 +
2602 +       new_fl = 0;
2603 +       if (flags & EXT4_BARRIER_FL)
2604 +               new_fl |= V_BARRIER;
2605 +       if (flags & EXT4_COW_FL)
2606 +               new_fl |= V_COW;
2607 +
2608 +       set_mask_bits(&inode->i_vflags,
2609 +               V_BARRIER | V_COW, new_fl);
2610  }
2611
2612  /* Propagate flags from i_flags to EXT4_I(inode)->i_flags */
2613  void ext4_get_inode_flags(struct ext4_inode_info *ei)
2614  {
2615 -       unsigned int vfs_fl;
2616 +       unsigned int vfs_fl, vfs_vf;
2617         unsigned long old_fl, new_fl;
2618
2619         do {
2620                 vfs_fl = ei->vfs_inode.i_flags;
2621 +               vfs_vf = ei->vfs_inode.i_vflags;
2622                 old_fl = ei->i_flags;
2623                 new_fl = old_fl & ~(EXT4_SYNC_FL|EXT4_APPEND_FL|
2624                                 EXT4_IMMUTABLE_FL|EXT4_NOATIME_FL|
2625 -                               EXT4_DIRSYNC_FL);
2626 +                               EXT4_DIRSYNC_FL|EXT4_BARRIER_FL|
2627 +                               EXT4_COW_FL);
2628 +
2629 +               if (vfs_fl & S_IMMUTABLE)
2630 +                       new_fl |= EXT4_IMMUTABLE_FL;
2631 +               if (vfs_fl & S_IXUNLINK)
2632 +                       new_fl |= EXT4_IXUNLINK_FL;
2633 +
2634                 if (vfs_fl & S_SYNC)
2635                         new_fl |= EXT4_SYNC_FL;
2636                 if (vfs_fl & S_APPEND)
2637                         new_fl |= EXT4_APPEND_FL;
2638 -               if (vfs_fl & S_IMMUTABLE)
2639 -                       new_fl |= EXT4_IMMUTABLE_FL;
2640                 if (vfs_fl & S_NOATIME)
2641                         new_fl |= EXT4_NOATIME_FL;
2642                 if (vfs_fl & S_DIRSYNC)
2643                         new_fl |= EXT4_DIRSYNC_FL;
2644 +
2645 +               if (vfs_vf & V_BARRIER)
2646 +                       new_fl |= EXT4_BARRIER_FL;
2647 +               if (vfs_vf & V_COW)
2648 +                       new_fl |= EXT4_COW_FL;
2649         } while (cmpxchg(&ei->i_flags, old_fl, new_fl) != old_fl);
2650  }
2651
2652 @@ -4543,8 +4568,10 @@ struct inode *ext4_iget(struct super_blo
2653                 i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
2654                 i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
2655         }
2656 -       i_uid_write(inode, i_uid);
2657 -       i_gid_write(inode, i_gid);
2658 +       i_uid_write(inode, INOTAG_UID(DX_TAG(inode), i_uid, i_gid));
2659 +       i_gid_write(inode, INOTAG_GID(DX_TAG(inode), i_uid, i_gid));
2660 +       i_tag_write(inode, INOTAG_TAG(DX_TAG(inode), i_uid, i_gid,
2661 +               le16_to_cpu(raw_inode->i_raw_tag)));
2662         ei->i_projid = make_kprojid(&init_user_ns, i_projid);
2663         set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
2664
2665 @@ -4860,8 +4887,10 @@ static int ext4_do_update_inode(handle_t
2666
2667         ext4_get_inode_flags(ei);
2668         raw_inode->i_mode = cpu_to_le16(inode->i_mode);
2669 -       i_uid = i_uid_read(inode);
2670 -       i_gid = i_gid_read(inode);
2671 +       i_uid = from_kuid(&init_user_ns,
2672 +               TAGINO_KUID(DX_TAG(inode), inode->i_uid, inode->i_tag));
2673 +       i_gid = from_kgid(&init_user_ns,
2674 +               TAGINO_KGID(DX_TAG(inode), inode->i_gid, inode->i_tag));
2675         i_projid = from_kprojid(&init_user_ns, ei->i_projid);
2676         if (!(test_opt(inode->i_sb, NO_UID32))) {
2677                 raw_inode->i_uid_low = cpu_to_le16(low_16_bits(i_uid));
2678 @@ -4885,6 +4914,9 @@ static int ext4_do_update_inode(handle_t
2679                 raw_inode->i_uid_high = 0;
2680                 raw_inode->i_gid_high = 0;
2681         }
2682 +#ifdef CONFIG_TAGGING_INTERN
2683 +       raw_inode->i_raw_tag = cpu_to_le16(i_tag_read(inode));
2684 +#endif
2685         raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
2686
2687         EXT4_INODE_SET_XTIME(i_ctime, inode, raw_inode);
2688 @@ -5138,7 +5170,8 @@ int ext4_setattr(struct dentry *dentry,
2689                         return error;
2690         }
2691         if ((ia_valid & ATTR_UID && !uid_eq(attr->ia_uid, inode->i_uid)) ||
2692 -           (ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, inode->i_gid))) {
2693 +           (ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, inode->i_gid)) ||
2694 +           (ia_valid & ATTR_TAG && !tag_eq(attr->ia_tag, inode->i_tag))) {
2695                 handle_t *handle;
2696
2697                 /* (user+group)*(old+new) structure, inode write (sb,
2698 @@ -5161,6 +5194,8 @@ int ext4_setattr(struct dentry *dentry,
2699                         inode->i_uid = attr->ia_uid;
2700                 if (attr->ia_valid & ATTR_GID)
2701                         inode->i_gid = attr->ia_gid;
2702 +               if ((attr->ia_valid & ATTR_TAG) && IS_TAGGED(inode))
2703 +                       inode->i_tag = attr->ia_tag;
2704                 error = ext4_mark_inode_dirty(handle, inode);
2705                 ext4_journal_stop(handle);
2706         }
2707 diff -NurpP --minimal linux-4.9.135/fs/ext4/ioctl.c linux-4.9.135-vs2.3.9.8/fs/ext4/ioctl.c
2708 --- linux-4.9.135/fs/ext4/ioctl.c       2016-12-11 19:17:54.000000000 +0000
2709 +++ linux-4.9.135-vs2.3.9.8/fs/ext4/ioctl.c     2018-10-20 04:58:13.000000000 +0000
2710 @@ -15,6 +15,7 @@
2711  #include <linux/file.h>
2712  #include <linux/quotaops.h>
2713  #include <linux/uuid.h>
2714 +#include <linux/vs_tag.h>
2715  #include <asm/uaccess.h>
2716  #include "ext4_jbd2.h"
2717  #include "ext4.h"
2718 @@ -226,7 +227,9 @@ static int ext4_ioctl_setflags(struct in
2719          *
2720          * This test looks nicer. Thanks to Pauline Middelink
2721          */
2722 -       if ((flags ^ oldflags) & (EXT4_APPEND_FL | EXT4_IMMUTABLE_FL)) {
2723 +       if ((oldflags & EXT4_IMMUTABLE_FL) ||
2724 +               ((flags ^ oldflags) & (EXT4_APPEND_FL |
2725 +               EXT4_IMMUTABLE_FL | EXT4_IXUNLINK_FL))) {
2726                 if (!capable(CAP_LINUX_IMMUTABLE))
2727                         goto flags_out;
2728         }
2729 @@ -430,6 +433,33 @@ static inline unsigned long ext4_xflags_
2730         return iflags;
2731  }
2732
2733 +int ext4_sync_flags(struct inode *inode, int flags, int vflags)
2734 +{
2735 +       handle_t *handle = NULL;
2736 +       struct ext4_iloc iloc;
2737 +       int err;
2738 +
2739 +       handle = ext4_journal_start(inode, EXT4_HT_INODE, 1);
2740 +       if (IS_ERR(handle))
2741 +               return PTR_ERR(handle);
2742 +
2743 +       if (IS_SYNC(inode))
2744 +               ext4_handle_sync(handle);
2745 +       err = ext4_reserve_inode_write(handle, inode, &iloc);
2746 +       if (err)
2747 +               goto flags_err;
2748 +
2749 +       inode->i_flags = flags;
2750 +       inode->i_vflags = vflags;
2751 +       ext4_get_inode_flags(EXT4_I(inode));
2752 +       inode->i_ctime = ext4_current_time(inode);
2753 +
2754 +       err = ext4_mark_iloc_dirty(handle, inode, &iloc);
2755 +flags_err:
2756 +       ext4_journal_stop(handle);
2757 +       return err;
2758 +}
2759 +
2760  long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
2761  {
2762         struct inode *inode = file_inode(filp);
2763 @@ -459,6 +489,11 @@ long ext4_ioctl(struct file *filp, unsig
2764
2765                 flags = ext4_mask_flags(inode->i_mode, flags);
2766
2767 +               if (IS_BARRIER(inode)) {
2768 +                       vxwprintk_task(1, "messing with the barrier.");
2769 +                       return -EACCES;
2770 +               }
2771 +
2772                 inode_lock(inode);
2773                 err = ext4_ioctl_setflags(inode, flags);
2774                 inode_unlock(inode);
2775 diff -NurpP --minimal linux-4.9.135/fs/ext4/namei.c linux-4.9.135-vs2.3.9.8/fs/ext4/namei.c
2776 --- linux-4.9.135/fs/ext4/namei.c       2018-10-20 10:39:17.000000000 +0000
2777 +++ linux-4.9.135-vs2.3.9.8/fs/ext4/namei.c     2018-10-20 05:55:42.000000000 +0000
2778 @@ -33,6 +33,7 @@
2779  #include <linux/quotaops.h>
2780  #include <linux/buffer_head.h>
2781  #include <linux/bio.h>
2782 +#include <linux/vs_tag.h>
2783  #include "ext4.h"
2784  #include "ext4_jbd2.h"
2785
2786 @@ -1460,6 +1461,7 @@ restart:
2787                                                     REQ_META | REQ_PRIO,
2788                                                     1, &bh);
2789                         }
2790 +               dx_propagate_tag(nd, inode);
2791                 }
2792                 if ((bh = bh_use[ra_ptr++]) == NULL)
2793                         goto next;
2794 @@ -3911,6 +3913,7 @@ const struct inode_operations ext4_dir_i
2795         .get_acl        = ext4_get_acl,
2796         .set_acl        = ext4_set_acl,
2797         .fiemap         = ext4_fiemap,
2798 +       .sync_flags     = ext4_sync_flags,
2799  };
2800
2801  const struct inode_operations ext4_special_inode_operations = {
2802 diff -NurpP --minimal linux-4.9.135/fs/ext4/super.c linux-4.9.135-vs2.3.9.8/fs/ext4/super.c
2803 --- linux-4.9.135/fs/ext4/super.c       2018-10-20 10:39:17.000000000 +0000
2804 +++ linux-4.9.135-vs2.3.9.8/fs/ext4/super.c     2018-10-20 05:55:42.000000000 +0000
2805 @@ -1281,6 +1281,7 @@ enum {
2806         Opt_dioread_nolock, Opt_dioread_lock,
2807         Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable,
2808         Opt_max_dir_size_kb, Opt_nojournal_checksum,
2809 +       Opt_tag, Opt_notag, Opt_tagid
2810  };
2811
2812  static const match_table_t tokens = {
2813 @@ -1367,6 +1368,9 @@ static const match_table_t tokens = {
2814         {Opt_removed, "reservation"},   /* mount option from ext2/3 */
2815         {Opt_removed, "noreservation"}, /* mount option from ext2/3 */
2816         {Opt_removed, "journal=%u"},    /* mount option from ext2/3 */
2817 +       {Opt_tag, "tag"},
2818 +       {Opt_notag, "notag"},
2819 +       {Opt_tagid, "tagid=%u"},
2820         {Opt_err, NULL},
2821  };
2822
2823 @@ -1612,6 +1616,20 @@ static int handle_mount_opt(struct super
2824         case Opt_nolazytime:
2825                 sb->s_flags &= ~MS_LAZYTIME;
2826                 return 1;
2827 +#ifndef CONFIG_TAGGING_NONE
2828 +       case Opt_tag:
2829 +               set_opt(sb, TAGGED);
2830 +               return 1;
2831 +       case Opt_notag:
2832 +               clear_opt(sb, TAGGED);
2833 +               return 1;
2834 +#endif
2835 +#ifdef CONFIG_PROPAGATE
2836 +       case Opt_tagid:
2837 +               /* use args[0] */
2838 +               set_opt(sb, TAGGED);
2839 +               return 1;
2840 +#endif
2841         }
2842
2843         for (m = ext4_mount_opts; m->token != Opt_err; m++)
2844 @@ -3587,6 +3605,9 @@ static int ext4_fill_super(struct super_
2845                 sb->s_iflags |= SB_I_CGROUPWB;
2846         }
2847
2848 +       if (EXT4_SB(sb)->s_mount_opt & EXT4_MOUNT_TAGGED)
2849 +               sb->s_flags |= MS_TAGGED;
2850 +
2851         sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
2852                 (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
2853
2854 @@ -4984,6 +5005,14 @@ static int ext4_remount(struct super_blo
2855         if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED)
2856                 ext4_abort(sb, "Abort forced by user");
2857
2858 +       if ((sbi->s_mount_opt & EXT4_MOUNT_TAGGED) &&
2859 +               !(sb->s_flags & MS_TAGGED)) {
2860 +               printk("EXT4-fs: %s: tagging not permitted on remount.\n",
2861 +                       sb->s_id);
2862 +               err = -EINVAL;
2863 +               goto restore_opts;
2864 +       }
2865 +
2866         sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
2867                 (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
2868
2869 diff -NurpP --minimal linux-4.9.135/fs/fcntl.c linux-4.9.135-vs2.3.9.8/fs/fcntl.c
2870 --- linux-4.9.135/fs/fcntl.c    2018-10-20 10:39:17.000000000 +0000
2871 +++ linux-4.9.135-vs2.3.9.8/fs/fcntl.c  2018-10-20 04:58:13.000000000 +0000
2872 @@ -22,6 +22,7 @@
2873  #include <linux/pid_namespace.h>
2874  #include <linux/user_namespace.h>
2875  #include <linux/shmem_fs.h>
2876 +#include <linux/vs_limit.h>
2877
2878  #include <asm/poll.h>
2879  #include <asm/siginfo.h>
2880 @@ -390,6 +391,8 @@ SYSCALL_DEFINE3(fcntl64, unsigned int, f
2881
2882         if (!f.file)
2883                 goto out;
2884 +       if (!vx_files_avail(1))
2885 +               goto out;
2886
2887         if (unlikely(f.file->f_mode & FMODE_PATH)) {
2888                 if (!check_fcntl_cmd(cmd))
2889 diff -NurpP --minimal linux-4.9.135/fs/file.c linux-4.9.135-vs2.3.9.8/fs/file.c
2890 --- linux-4.9.135/fs/file.c     2016-12-11 19:17:54.000000000 +0000
2891 +++ linux-4.9.135-vs2.3.9.8/fs/file.c   2018-10-20 04:58:13.000000000 +0000
2892 @@ -22,6 +22,7 @@
2893  #include <linux/spinlock.h>
2894  #include <linux/rcupdate.h>
2895  #include <linux/workqueue.h>
2896 +#include <linux/vs_limit.h>
2897
2898  unsigned int sysctl_nr_open __read_mostly = 1024*1024;
2899  unsigned int sysctl_nr_open_min = BITS_PER_LONG;
2900 @@ -357,6 +358,8 @@ struct files_struct *dup_fd(struct files
2901                 struct file *f = *old_fds++;
2902                 if (f) {
2903                         get_file(f);
2904 +                       /* TODO: sum it first for check and performance */
2905 +                       vx_openfd_inc(open_files - i);
2906                 } else {
2907                         /*
2908                          * The fd may be claimed in the fd bitmap but not yet
2909 @@ -406,9 +409,11 @@ static struct fdtable *close_files(struc
2910                                         filp_close(file, files);
2911                                         cond_resched_rcu_qs();
2912                                 }
2913 +                               vx_openfd_dec(i);
2914                         }
2915                         i++;
2916                         set >>= 1;
2917 +                       cond_resched();
2918                 }
2919         }
2920
2921 @@ -539,6 +544,7 @@ repeat:
2922         else
2923                 __clear_close_on_exec(fd, fdt);
2924         error = fd;
2925 +       vx_openfd_inc(fd);
2926  #if 1
2927         /* Sanity check */
2928         if (rcu_access_pointer(fdt->fd[fd]) != NULL) {
2929 @@ -569,6 +575,7 @@ static void __put_unused_fd(struct files
2930         __clear_open_fd(fd, fdt);
2931         if (fd < files->next_fd)
2932                 files->next_fd = fd;
2933 +       vx_openfd_dec(fd);
2934  }
2935
2936  void put_unused_fd(unsigned int fd)
2937 @@ -856,6 +863,8 @@ __releases(&files->file_lock)
2938
2939         if (tofree)
2940                 filp_close(tofree, files);
2941 +       else
2942 +               vx_openfd_inc(fd);      /* fd was unused */
2943
2944         return fd;
2945
2946 diff -NurpP --minimal linux-4.9.135/fs/file_table.c linux-4.9.135-vs2.3.9.8/fs/file_table.c
2947 --- linux-4.9.135/fs/file_table.c       2016-12-11 19:17:54.000000000 +0000
2948 +++ linux-4.9.135-vs2.3.9.8/fs/file_table.c     2018-10-20 04:58:13.000000000 +0000
2949 @@ -26,6 +26,8 @@
2950  #include <linux/task_work.h>
2951  #include <linux/ima.h>
2952  #include <linux/swap.h>
2953 +#include <linux/vs_limit.h>
2954 +#include <linux/vs_context.h>
2955
2956  #include <linux/atomic.h>
2957
2958 @@ -137,6 +139,8 @@ struct file *get_empty_filp(void)
2959         mutex_init(&f->f_pos_lock);
2960         eventpoll_init_file(f);
2961         /* f->f_version: 0 */
2962 +       f->f_xid = vx_current_xid();
2963 +       vx_files_inc(f);
2964         return f;
2965
2966  over:
2967 @@ -219,6 +223,8 @@ static void __fput(struct file *file)
2968                 put_write_access(inode);
2969                 __mnt_drop_write(mnt);
2970         }
2971 +       vx_files_dec(file);
2972 +       file->f_xid = 0;
2973         file->f_path.dentry = NULL;
2974         file->f_path.mnt = NULL;
2975         file->f_inode = NULL;
2976 @@ -305,6 +311,8 @@ void put_filp(struct file *file)
2977  {
2978         if (atomic_long_dec_and_test(&file->f_count)) {
2979                 security_file_free(file);
2980 +               vx_files_dec(file);
2981 +               file->f_xid = 0;
2982                 file_free(file);
2983         }
2984  }
2985 diff -NurpP --minimal linux-4.9.135/fs/fs_struct.c linux-4.9.135-vs2.3.9.8/fs/fs_struct.c
2986 --- linux-4.9.135/fs/fs_struct.c        2016-12-11 19:17:54.000000000 +0000
2987 +++ linux-4.9.135-vs2.3.9.8/fs/fs_struct.c      2018-10-20 04:58:13.000000000 +0000
2988 @@ -4,6 +4,7 @@
2989  #include <linux/path.h>
2990  #include <linux/slab.h>
2991  #include <linux/fs_struct.h>
2992 +#include <linux/vserver/global.h>
2993  #include "internal.h"
2994
2995  /*
2996 @@ -87,6 +88,7 @@ void free_fs_struct(struct fs_struct *fs
2997  {
2998         path_put(&fs->root);
2999         path_put(&fs->pwd);
3000 +       atomic_dec(&vs_global_fs);
3001         kmem_cache_free(fs_cachep, fs);
3002  }
3003
3004 @@ -124,6 +126,7 @@ struct fs_struct *copy_fs_struct(struct
3005                 fs->pwd = old->pwd;
3006                 path_get(&fs->pwd);
3007                 spin_unlock(&old->lock);
3008 +               atomic_inc(&vs_global_fs);
3009         }
3010         return fs;
3011  }
3012 diff -NurpP --minimal linux-4.9.135/fs/gfs2/file.c linux-4.9.135-vs2.3.9.8/fs/gfs2/file.c
3013 --- linux-4.9.135/fs/gfs2/file.c        2018-10-20 10:39:17.000000000 +0000
3014 +++ linux-4.9.135-vs2.3.9.8/fs/gfs2/file.c      2018-10-20 04:58:13.000000000 +0000
3015 @@ -137,6 +137,9 @@ static const u32 fsflags_to_gfs2[32] = {
3016         [12] = GFS2_DIF_EXHASH,
3017         [14] = GFS2_DIF_INHERIT_JDATA,
3018         [17] = GFS2_DIF_TOPDIR,
3019 +       [27] = GFS2_DIF_IXUNLINK,
3020 +       [26] = GFS2_DIF_BARRIER,
3021 +       [29] = GFS2_DIF_COW,
3022  };
3023
3024  static const u32 gfs2_to_fsflags[32] = {
3025 @@ -147,6 +150,9 @@ static const u32 gfs2_to_fsflags[32] = {
3026         [gfs2fl_ExHash] = FS_INDEX_FL,
3027         [gfs2fl_TopLevel] = FS_TOPDIR_FL,
3028         [gfs2fl_InheritJdata] = FS_JOURNAL_DATA_FL,
3029 +       [gfs2fl_IXUnlink] = FS_IXUNLINK_FL,
3030 +       [gfs2fl_Barrier] = FS_BARRIER_FL,
3031 +       [gfs2fl_Cow] = FS_COW_FL,
3032  };
3033
3034  static int gfs2_get_flags(struct file *filp, u32 __user *ptr)
3035 @@ -178,12 +184,17 @@ void gfs2_set_inode_flags(struct inode *
3036  {
3037         struct gfs2_inode *ip = GFS2_I(inode);
3038         unsigned int flags = inode->i_flags;
3039 +       unsigned int vflags = inode->i_vflags;
3040 +
3041 +       flags &= ~(S_IMMUTABLE | S_IXUNLINK |
3042 +               S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC | S_NOSEC);
3043
3044 -       flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC|S_NOSEC);
3045         if ((ip->i_eattr == 0) && !is_sxid(inode->i_mode))
3046                 flags |= S_NOSEC;
3047         if (ip->i_diskflags & GFS2_DIF_IMMUTABLE)
3048                 flags |= S_IMMUTABLE;
3049 +       if (ip->i_diskflags & GFS2_DIF_IXUNLINK)
3050 +               flags |= S_IXUNLINK;
3051         if (ip->i_diskflags & GFS2_DIF_APPENDONLY)
3052                 flags |= S_APPEND;
3053         if (ip->i_diskflags & GFS2_DIF_NOATIME)
3054 @@ -191,6 +202,43 @@ void gfs2_set_inode_flags(struct inode *
3055         if (ip->i_diskflags & GFS2_DIF_SYNC)
3056                 flags |= S_SYNC;
3057         inode->i_flags = flags;
3058 +
3059 +       vflags &= ~(V_BARRIER | V_COW);
3060 +
3061 +       if (ip->i_diskflags & GFS2_DIF_BARRIER)
3062 +               vflags |= V_BARRIER;
3063 +       if (ip->i_diskflags & GFS2_DIF_COW)
3064 +               vflags |= V_COW;
3065 +       inode->i_vflags = vflags;
3066 +}
3067 +
3068 +void gfs2_get_inode_flags(struct inode *inode)
3069 +{
3070 +       struct gfs2_inode *ip = GFS2_I(inode);
3071 +       unsigned int flags = inode->i_flags;
3072 +       unsigned int vflags = inode->i_vflags;
3073 +
3074 +       ip->i_diskflags &= ~(GFS2_DIF_APPENDONLY |
3075 +                       GFS2_DIF_NOATIME | GFS2_DIF_SYNC |
3076 +                       GFS2_DIF_IMMUTABLE | GFS2_DIF_IXUNLINK |
3077 +                       GFS2_DIF_BARRIER | GFS2_DIF_COW);
3078 +
3079 +       if (flags & S_IMMUTABLE)
3080 +               ip->i_diskflags |= GFS2_DIF_IMMUTABLE;
3081 +       if (flags & S_IXUNLINK)
3082 +               ip->i_diskflags |= GFS2_DIF_IXUNLINK;
3083 +
3084 +       if (flags & S_APPEND)
3085 +               ip->i_diskflags |= GFS2_DIF_APPENDONLY;
3086 +       if (flags & S_NOATIME)
3087 +               ip->i_diskflags |= GFS2_DIF_NOATIME;
3088 +       if (flags & S_SYNC)
3089 +               ip->i_diskflags |= GFS2_DIF_SYNC;
3090 +
3091 +       if (vflags & V_BARRIER)
3092 +               ip->i_diskflags |= GFS2_DIF_BARRIER;
3093 +       if (vflags & V_COW)
3094 +               ip->i_diskflags |= GFS2_DIF_COW;
3095  }
3096
3097  /* Flags that can be set by user space */
3098 @@ -306,6 +354,37 @@ static int gfs2_set_flags(struct file *f
3099         return do_gfs2_set_flags(filp, gfsflags, ~(GFS2_DIF_SYSTEM | GFS2_DIF_JDATA));
3100  }
3101
3102 +int gfs2_sync_flags(struct inode *inode, int flags, int vflags)
3103 +{
3104 +       struct gfs2_inode *ip = GFS2_I(inode);
3105 +       struct gfs2_sbd *sdp = GFS2_SB(inode);
3106 +       struct buffer_head *bh;
3107 +       struct gfs2_holder gh;
3108 +       int error;
3109 +
3110 +       error = gfs2_glock_nq_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, &gh);
3111 +       if (error)
3112 +               return error;
3113 +       error = gfs2_trans_begin(sdp, RES_DINODE, 0);
3114 +       if (error)
3115 +               goto out;
3116 +       error = gfs2_meta_inode_buffer(ip, &bh);
3117 +       if (error)
3118 +               goto out_trans_end;
3119 +       gfs2_trans_add_meta(ip->i_gl, bh);
3120 +       inode->i_flags = flags;
3121 +       inode->i_vflags = vflags;
3122 +       gfs2_get_inode_flags(inode);
3123 +       gfs2_dinode_out(ip, bh->b_data);
3124 +       brelse(bh);
3125 +       gfs2_set_aops(inode);
3126 +out_trans_end:
3127 +       gfs2_trans_end(sdp);
3128 +out:
3129 +       gfs2_glock_dq_uninit(&gh);
3130 +       return error;
3131 +}
3132 +
3133  static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
3134  {
3135         switch(cmd) {
3136 diff -NurpP --minimal linux-4.9.135/fs/gfs2/inode.h linux-4.9.135-vs2.3.9.8/fs/gfs2/inode.h
3137 --- linux-4.9.135/fs/gfs2/inode.h       2016-12-11 19:17:54.000000000 +0000
3138 +++ linux-4.9.135-vs2.3.9.8/fs/gfs2/inode.h     2018-10-20 04:58:13.000000000 +0000
3139 @@ -117,6 +117,7 @@ extern const struct file_operations gfs2
3140  extern const struct file_operations gfs2_dir_fops_nolock;
3141
3142  extern void gfs2_set_inode_flags(struct inode *inode);
3143 +extern int gfs2_sync_flags(struct inode *inode, int flags, int vflags);
3144
3145  #ifdef CONFIG_GFS2_FS_LOCKING_DLM
3146  extern const struct file_operations gfs2_file_fops;
3147 diff -NurpP --minimal linux-4.9.135/fs/hostfs/hostfs.h linux-4.9.135-vs2.3.9.8/fs/hostfs/hostfs.h
3148 --- linux-4.9.135/fs/hostfs/hostfs.h    2016-12-11 19:17:54.000000000 +0000
3149 +++ linux-4.9.135-vs2.3.9.8/fs/hostfs/hostfs.h  2018-10-20 04:58:13.000000000 +0000
3150 @@ -42,6 +42,7 @@ struct hostfs_iattr {
3151         unsigned short  ia_mode;
3152         uid_t           ia_uid;
3153         gid_t           ia_gid;
3154 +       vtag_t          ia_tag;
3155         loff_t          ia_size;
3156         struct timespec ia_atime;
3157         struct timespec ia_mtime;
3158 diff -NurpP --minimal linux-4.9.135/fs/inode.c linux-4.9.135-vs2.3.9.8/fs/inode.c
3159 --- linux-4.9.135/fs/inode.c    2018-10-20 10:39:17.000000000 +0000
3160 +++ linux-4.9.135-vs2.3.9.8/fs/inode.c  2018-10-20 04:58:13.000000000 +0000
3161 @@ -18,6 +18,7 @@
3162  #include <linux/buffer_head.h> /* for inode_has_buffers */
3163  #include <linux/ratelimit.h>
3164  #include <linux/list_lru.h>
3165 +#include <linux/vs_tag.h>
3166  #include <trace/events/writeback.h>
3167  #include "internal.h"
3168
3169 @@ -133,6 +134,8 @@ int inode_init_always(struct super_block
3170         struct address_space *const mapping = &inode->i_data;
3171
3172         inode->i_sb = sb;
3173 +
3174 +       /* essential because of inode slab reuse */
3175         inode->i_blkbits = sb->s_blocksize_bits;
3176         inode->i_flags = 0;
3177         atomic_set(&inode->i_count, 1);
3178 @@ -144,6 +147,7 @@ int inode_init_always(struct super_block
3179                 inode->i_opflags |= IOP_XATTR;
3180         i_uid_write(inode, 0);
3181         i_gid_write(inode, 0);
3182 +       i_tag_write(inode, 0);
3183         atomic_set(&inode->i_writecount, 0);
3184         inode->i_size = 0;
3185         inode->i_blocks = 0;
3186 @@ -155,6 +159,7 @@ int inode_init_always(struct super_block
3187         inode->i_link = NULL;
3188         inode->i_dir_seq = 0;
3189         inode->i_rdev = 0;
3190 +       inode->i_mdev = 0;
3191         inode->dirtied_when = 0;
3192
3193  #ifdef CONFIG_CGROUP_WRITEBACK
3194 @@ -479,6 +484,8 @@ void __insert_inode_hash(struct inode *i
3195  }
3196  EXPORT_SYMBOL(__insert_inode_hash);
3197
3198 +EXPORT_SYMBOL_GPL(__iget);
3199 +
3200  /**
3201   *     __remove_inode_hash - remove an inode from the hash
3202   *     @inode: inode to unhash
3203 @@ -1977,9 +1984,11 @@ void init_special_inode(struct inode *in
3204         if (S_ISCHR(mode)) {
3205                 inode->i_fop = &def_chr_fops;
3206                 inode->i_rdev = rdev;
3207 +               inode->i_mdev = rdev;
3208         } else if (S_ISBLK(mode)) {
3209                 inode->i_fop = &def_blk_fops;
3210                 inode->i_rdev = rdev;
3211 +               inode->i_mdev = rdev;
3212         } else if (S_ISFIFO(mode))
3213                 inode->i_fop = &pipefifo_fops;
3214         else if (S_ISSOCK(mode))
3215 @@ -2014,6 +2023,7 @@ void inode_init_owner(struct inode *inod
3216         } else
3217                 inode->i_gid = current_fsgid();
3218         inode->i_mode = mode;
3219 +       i_tag_write(inode, dx_current_fstag(inode->i_sb));
3220  }
3221  EXPORT_SYMBOL(inode_init_owner);
3222
3223 diff -NurpP --minimal linux-4.9.135/fs/ioctl.c linux-4.9.135-vs2.3.9.8/fs/ioctl.c
3224 --- linux-4.9.135/fs/ioctl.c    2016-12-11 19:17:54.000000000 +0000
3225 +++ linux-4.9.135-vs2.3.9.8/fs/ioctl.c  2018-10-20 04:58:13.000000000 +0000
3226 @@ -15,6 +15,9 @@
3227  #include <linux/writeback.h>
3228  #include <linux/buffer_head.h>
3229  #include <linux/falloc.h>
3230 +#include <linux/proc_fs.h>
3231 +#include <linux/vserver/inode.h>
3232 +#include <linux/vs_tag.h>
3233  #include "internal.h"
3234
3235  #include <asm/ioctls.h>
3236 diff -NurpP --minimal linux-4.9.135/fs/jfs/file.c linux-4.9.135-vs2.3.9.8/fs/jfs/file.c
3237 --- linux-4.9.135/fs/jfs/file.c 2016-12-11 19:17:54.000000000 +0000
3238 +++ linux-4.9.135-vs2.3.9.8/fs/jfs/file.c       2018-10-20 04:58:13.000000000 +0000
3239 @@ -113,7 +113,8 @@ int jfs_setattr(struct dentry *dentry, s
3240                         return rc;
3241         }
3242         if ((iattr->ia_valid & ATTR_UID && !uid_eq(iattr->ia_uid, inode->i_uid)) ||
3243 -           (iattr->ia_valid & ATTR_GID && !gid_eq(iattr->ia_gid, inode->i_gid))) {
3244 +           (iattr->ia_valid & ATTR_GID && !gid_eq(iattr->ia_gid, inode->i_gid)) ||
3245 +           (iattr->ia_valid & ATTR_TAG && !tag_eq(iattr->ia_tag, inode->i_tag))) {
3246                 rc = dquot_transfer(inode, iattr);
3247                 if (rc)
3248                         return rc;
3249 @@ -146,6 +147,7 @@ const struct inode_operations jfs_file_i
3250         .get_acl        = jfs_get_acl,
3251         .set_acl        = jfs_set_acl,
3252  #endif
3253 +       .sync_flags     = jfs_sync_flags,
3254  };
3255
3256  const struct file_operations jfs_file_operations = {
3257 diff -NurpP --minimal linux-4.9.135/fs/jfs/ioctl.c linux-4.9.135-vs2.3.9.8/fs/jfs/ioctl.c
3258 --- linux-4.9.135/fs/jfs/ioctl.c        2016-12-11 19:17:54.000000000 +0000
3259 +++ linux-4.9.135-vs2.3.9.8/fs/jfs/ioctl.c      2018-10-20 04:58:13.000000000 +0000
3260 @@ -12,6 +12,7 @@
3261  #include <linux/time.h>
3262  #include <linux/sched.h>
3263  #include <linux/blkdev.h>
3264 +#include <linux/mount.h>
3265  #include <asm/current.h>
3266  #include <asm/uaccess.h>
3267
3268 @@ -56,6 +57,16 @@ static long jfs_map_ext2(unsigned long f
3269  }
3270
3271
3272 +int jfs_sync_flags(struct inode *inode, int flags, int vflags)
3273 +{
3274 +       inode->i_flags = flags;
3275 +       inode->i_vflags = vflags;
3276 +       jfs_get_inode_flags(JFS_IP(inode));
3277 +       inode->i_ctime = CURRENT_TIME_SEC;
3278 +       mark_inode_dirty(inode);
3279 +       return 0;
3280 +}
3281 +
3282  long jfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
3283  {
3284         struct inode *inode = file_inode(filp);
3285 @@ -89,6 +100,11 @@ long jfs_ioctl(struct file *filp, unsign
3286                 if (!S_ISDIR(inode->i_mode))
3287                         flags &= ~JFS_DIRSYNC_FL;
3288
3289 +               if (IS_BARRIER(inode)) {
3290 +                       vxwprintk_task(1, "messing with the barrier.");
3291 +                       return -EACCES;
3292 +               }
3293 +
3294                 /* Is it quota file? Do not allow user to mess with it */
3295                 if (IS_NOQUOTA(inode)) {
3296                         err = -EPERM;
3297 @@ -106,8 +122,8 @@ long jfs_ioctl(struct file *filp, unsign
3298                  * the relevant capability.
3299                  */
3300                 if ((oldflags & JFS_IMMUTABLE_FL) ||
3301 -                       ((flags ^ oldflags) &
3302 -                       (JFS_APPEND_FL | JFS_IMMUTABLE_FL))) {
3303 +                       ((flags ^ oldflags) & (JFS_APPEND_FL |
3304 +                       JFS_IMMUTABLE_FL | JFS_IXUNLINK_FL))) {
3305                         if (!capable(CAP_LINUX_IMMUTABLE)) {
3306                                 inode_unlock(inode);
3307                                 err = -EPERM;
3308 @@ -115,7 +131,7 @@ long jfs_ioctl(struct file *filp, unsign
3309                         }
3310                 }
3311
3312 -               flags = flags & JFS_FL_USER_MODIFIABLE;
3313 +               flags &= JFS_FL_USER_MODIFIABLE;
3314                 flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;
3315                 jfs_inode->mode2 = flags;
3316
3317 diff -NurpP --minimal linux-4.9.135/fs/jfs/jfs_dinode.h linux-4.9.135-vs2.3.9.8/fs/jfs/jfs_dinode.h
3318 --- linux-4.9.135/fs/jfs/jfs_dinode.h   2016-12-11 19:17:54.000000000 +0000
3319 +++ linux-4.9.135-vs2.3.9.8/fs/jfs/jfs_dinode.h 2018-10-20 04:58:13.000000000 +0000
3320 @@ -161,9 +161,13 @@ struct dinode {
3321
3322  #define JFS_APPEND_FL          0x01000000 /* writes to file may only append */
3323  #define JFS_IMMUTABLE_FL       0x02000000 /* Immutable file */
3324 +#define JFS_IXUNLINK_FL                0x08000000 /* Immutable invert on unlink */
3325
3326 -#define JFS_FL_USER_VISIBLE    0x03F80000
3327 -#define JFS_FL_USER_MODIFIABLE 0x03F80000
3328 +#define JFS_BARRIER_FL         0x04000000 /* Barrier for chroot() */
3329 +#define JFS_COW_FL             0x20000000 /* Copy on Write marker */
3330 +
3331 +#define JFS_FL_USER_VISIBLE    0x07F80000
3332 +#define JFS_FL_USER_MODIFIABLE 0x07F80000
3333  #define JFS_FL_INHERIT         0x03C80000
3334
3335  /* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
3336 diff -NurpP --minimal linux-4.9.135/fs/jfs/jfs_filsys.h linux-4.9.135-vs2.3.9.8/fs/jfs/jfs_filsys.h
3337 --- linux-4.9.135/fs/jfs/jfs_filsys.h   2016-12-11 19:17:54.000000000 +0000
3338 +++ linux-4.9.135-vs2.3.9.8/fs/jfs/jfs_filsys.h 2018-10-20 04:58:13.000000000 +0000
3339 @@ -266,6 +266,7 @@
3340  #define JFS_NAME_MAX   255
3341  #define JFS_PATH_MAX   BPSIZE
3342
3343 +#define JFS_TAGGED             0x00800000      /* Context Tagging */
3344
3345  /*
3346   *     file system state (superblock state)
3347 diff -NurpP --minimal linux-4.9.135/fs/jfs/jfs_imap.c linux-4.9.135-vs2.3.9.8/fs/jfs/jfs_imap.c
3348 --- linux-4.9.135/fs/jfs/jfs_imap.c     2016-12-11 19:17:54.000000000 +0000
3349 +++ linux-4.9.135-vs2.3.9.8/fs/jfs/jfs_imap.c   2018-10-20 04:58:13.000000000 +0000
3350 @@ -46,6 +46,7 @@
3351  #include <linux/pagemap.h>
3352  #include <linux/quotaops.h>
3353  #include <linux/slab.h>
3354 +#include <linux/vs_tag.h>
3355
3356  #include "jfs_incore.h"
3357  #include "jfs_inode.h"
3358 @@ -3046,6 +3047,8 @@ static int copy_from_dinode(struct dinod
3359  {
3360         struct jfs_inode_info *jfs_ip = JFS_IP(ip);
3361         struct jfs_sb_info *sbi = JFS_SBI(ip->i_sb);
3362 +       kuid_t kuid;
3363 +       kgid_t kgid;
3364
3365         jfs_ip->fileset = le32_to_cpu(dip->di_fileset);
3366         jfs_ip->mode2 = le32_to_cpu(dip->di_mode);
3367 @@ -3066,14 +3069,18 @@ static int copy_from_dinode(struct dinod
3368         }
3369         set_nlink(ip, le32_to_cpu(dip->di_nlink));
3370
3371 -       jfs_ip->saved_uid = make_kuid(&init_user_ns, le32_to_cpu(dip->di_uid));
3372 +       kuid = make_kuid(&init_user_ns, le32_to_cpu(dip->di_uid));
3373 +       kgid = make_kgid(&init_user_ns, le32_to_cpu(dip->di_gid));
3374 +       ip->i_tag = INOTAG_KTAG(DX_TAG(ip), kuid, kgid, GLOBAL_ROOT_TAG);
3375 +
3376 +       jfs_ip->saved_uid = INOTAG_KUID(DX_TAG(ip), kuid, kgid);
3377         if (!uid_valid(sbi->uid))
3378                 ip->i_uid = jfs_ip->saved_uid;
3379         else {
3380                 ip->i_uid = sbi->uid;
3381         }
3382
3383 -       jfs_ip->saved_gid = make_kgid(&init_user_ns, le32_to_cpu(dip->di_gid));
3384 +       jfs_ip->saved_gid = INOTAG_KGID(DX_TAG(ip), kuid, kgid);
3385         if (!gid_valid(sbi->gid))
3386                 ip->i_gid = jfs_ip->saved_gid;
3387         else {
3388 @@ -3138,16 +3145,14 @@ static void copy_to_dinode(struct dinode
3389         dip->di_size = cpu_to_le64(ip->i_size);
3390         dip->di_nblocks = cpu_to_le64(PBLK2LBLK(ip->i_sb, ip->i_blocks));
3391         dip->di_nlink = cpu_to_le32(ip->i_nlink);
3392 -       if (!uid_valid(sbi->uid))
3393 -               dip->di_uid = cpu_to_le32(i_uid_read(ip));
3394 -       else
3395 -               dip->di_uid =cpu_to_le32(from_kuid(&init_user_ns,
3396 -                                                  jfs_ip->saved_uid));
3397 -       if (!gid_valid(sbi->gid))
3398 -               dip->di_gid = cpu_to_le32(i_gid_read(ip));
3399 -       else
3400 -               dip->di_gid = cpu_to_le32(from_kgid(&init_user_ns,
3401 -                                                   jfs_ip->saved_gid));
3402 +       dip->di_uid = cpu_to_le32(from_kuid(&init_user_ns,
3403 +               TAGINO_KUID(DX_TAG(ip),
3404 +               !uid_valid(sbi->uid) ? ip->i_uid : jfs_ip->saved_uid,
3405 +               ip->i_tag)));
3406 +       dip->di_gid = cpu_to_le32(from_kgid(&init_user_ns,
3407 +               TAGINO_KGID(DX_TAG(ip),
3408 +               !gid_valid(sbi->gid) ? ip->i_gid : jfs_ip->saved_gid,
3409 +               ip->i_tag)));
3410         jfs_get_inode_flags(jfs_ip);
3411         /*
3412          * mode2 is only needed for storing the higher order bits.
3413 diff -NurpP --minimal linux-4.9.135/fs/jfs/jfs_inode.c linux-4.9.135-vs2.3.9.8/fs/jfs/jfs_inode.c
3414 --- linux-4.9.135/fs/jfs/jfs_inode.c    2016-12-11 19:17:54.000000000 +0000
3415 +++ linux-4.9.135-vs2.3.9.8/fs/jfs/jfs_inode.c  2018-10-20 04:58:14.000000000 +0000
3416 @@ -18,6 +18,7 @@
3417
3418  #include <linux/fs.h>
3419  #include <linux/quotaops.h>
3420 +#include <linux/vs_tag.h>
3421  #include "jfs_incore.h"
3422  #include "jfs_inode.h"
3423  #include "jfs_filsys.h"
3424 @@ -33,6 +34,9 @@ void jfs_set_inode_flags(struct inode *i
3425
3426         if (flags & JFS_IMMUTABLE_FL)
3427                 new_fl |= S_IMMUTABLE;
3428 +       if (flags & JFS_IXUNLINK_FL)
3429 +               new_fl |= S_IXUNLINK;
3430 +
3431         if (flags & JFS_APPEND_FL)
3432                 new_fl |= S_APPEND;
3433         if (flags & JFS_NOATIME_FL)
3434 @@ -41,18 +45,35 @@ void jfs_set_inode_flags(struct inode *i
3435                 new_fl |= S_DIRSYNC;
3436         if (flags & JFS_SYNC_FL)
3437                 new_fl |= S_SYNC;
3438 -       inode_set_flags(inode, new_fl, S_IMMUTABLE | S_APPEND | S_NOATIME |
3439 -                       S_DIRSYNC | S_SYNC);
3440 +
3441 +       inode_set_flags(inode, new_fl, S_IMMUTABLE | S_IXUNLINK |
3442 +                       S_APPEND | S_NOATIME | S_DIRSYNC | S_SYNC);
3443 +
3444 +       new_fl = 0;
3445 +       if (flags & JFS_BARRIER_FL)
3446 +               new_fl |= V_BARRIER;
3447 +       if (flags & JFS_COW_FL)
3448 +               new_fl |= V_COW;
3449 +
3450 +       set_mask_bits(&inode->i_vflags,
3451 +               V_BARRIER | V_COW, new_fl);
3452  }
3453
3454  void jfs_get_inode_flags(struct jfs_inode_info *jfs_ip)
3455  {
3456         unsigned int flags = jfs_ip->vfs_inode.i_flags;
3457 +       unsigned int vflags = jfs_ip->vfs_inode.i_vflags;
3458 +
3459 +       jfs_ip->mode2 &= ~(JFS_IMMUTABLE_FL | JFS_IXUNLINK_FL |
3460 +                          JFS_APPEND_FL | JFS_NOATIME_FL |
3461 +                          JFS_DIRSYNC_FL | JFS_SYNC_FL |
3462 +                          JFS_BARRIER_FL | JFS_COW_FL);
3463
3464 -       jfs_ip->mode2 &= ~(JFS_IMMUTABLE_FL | JFS_APPEND_FL | JFS_NOATIME_FL |
3465 -                          JFS_DIRSYNC_FL | JFS_SYNC_FL);
3466         if (flags & S_IMMUTABLE)
3467                 jfs_ip->mode2 |= JFS_IMMUTABLE_FL;
3468 +       if (flags & S_IXUNLINK)
3469 +               jfs_ip->mode2 |= JFS_IXUNLINK_FL;
3470 +
3471         if (flags & S_APPEND)
3472                 jfs_ip->mode2 |= JFS_APPEND_FL;
3473         if (flags & S_NOATIME)
3474 @@ -61,6 +82,11 @@ void jfs_get_inode_flags(struct jfs_inod
3475                 jfs_ip->mode2 |= JFS_DIRSYNC_FL;
3476         if (flags & S_SYNC)
3477                 jfs_ip->mode2 |= JFS_SYNC_FL;
3478 +
3479 +       if (vflags & V_BARRIER)
3480 +               jfs_ip->mode2 |= JFS_BARRIER_FL;
3481 +       if (vflags & V_COW)
3482 +               jfs_ip->mode2 |= JFS_COW_FL;
3483  }
3484
3485  /*
3486 diff -NurpP --minimal linux-4.9.135/fs/jfs/jfs_inode.h linux-4.9.135-vs2.3.9.8/fs/jfs/jfs_inode.h
3487 --- linux-4.9.135/fs/jfs/jfs_inode.h    2016-12-11 19:17:54.000000000 +0000
3488 +++ linux-4.9.135-vs2.3.9.8/fs/jfs/jfs_inode.h  2018-10-20 04:58:14.000000000 +0000
3489 @@ -39,6 +39,7 @@ extern struct dentry *jfs_fh_to_dentry(s
3490  extern struct dentry *jfs_fh_to_parent(struct super_block *sb, struct fid *fid,
3491         int fh_len, int fh_type);
3492  extern void jfs_set_inode_flags(struct inode *);
3493 +extern int jfs_sync_flags(struct inode *, int, int);
3494  extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int);
3495  extern int jfs_setattr(struct dentry *, struct iattr *);
3496
3497 diff -NurpP --minimal linux-4.9.135/fs/jfs/namei.c linux-4.9.135-vs2.3.9.8/fs/jfs/namei.c
3498 --- linux-4.9.135/fs/jfs/namei.c        2018-10-20 10:39:17.000000000 +0000
3499 +++ linux-4.9.135-vs2.3.9.8/fs/jfs/namei.c      2018-10-20 04:58:14.000000000 +0000
3500 @@ -22,6 +22,7 @@
3501  #include <linux/ctype.h>
3502  #include <linux/quotaops.h>
3503  #include <linux/exportfs.h>
3504 +#include <linux/vs_tag.h>
3505  #include "jfs_incore.h"
3506  #include "jfs_superblock.h"
3507  #include "jfs_inode.h"
3508 @@ -1480,6 +1481,7 @@ static struct dentry *jfs_lookup(struct
3509                         jfs_err("jfs_lookup: iget failed on inum %d", (uint)inum);
3510         }
3511
3512 +       dx_propagate_tag(nd, ip);
3513         return d_splice_alias(ip, dentry);
3514  }
3515
3516 @@ -1542,6 +1544,7 @@ const struct inode_operations jfs_dir_in
3517         .get_acl        = jfs_get_acl,
3518         .set_acl        = jfs_set_acl,
3519  #endif
3520 +       .sync_flags     = jfs_sync_flags,
3521  };
3522
3523  const struct file_operations jfs_dir_operations = {
3524 diff -NurpP --minimal linux-4.9.135/fs/jfs/super.c linux-4.9.135-vs2.3.9.8/fs/jfs/super.c
3525 --- linux-4.9.135/fs/jfs/super.c        2018-10-20 10:39:17.000000000 +0000
3526 +++ linux-4.9.135-vs2.3.9.8/fs/jfs/super.c      2018-10-20 04:58:14.000000000 +0000
3527 @@ -206,7 +206,8 @@ enum {
3528         Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize,
3529         Opt_resize_nosize, Opt_errors, Opt_ignore, Opt_err, Opt_quota,
3530         Opt_usrquota, Opt_grpquota, Opt_uid, Opt_gid, Opt_umask,
3531 -       Opt_discard, Opt_nodiscard, Opt_discard_minblk
3532 +       Opt_discard, Opt_nodiscard, Opt_discard_minblk,
3533 +       Opt_tag, Opt_notag, Opt_tagid
3534  };
3535
3536  static const match_table_t tokens = {
3537 @@ -216,6 +217,10 @@ static const match_table_t tokens = {
3538         {Opt_resize, "resize=%u"},
3539         {Opt_resize_nosize, "resize"},
3540         {Opt_errors, "errors=%s"},
3541 +       {Opt_tag, "tag"},
3542 +       {Opt_notag, "notag"},
3543 +       {Opt_tagid, "tagid=%u"},
3544 +       {Opt_tag, "tagxid"},
3545         {Opt_ignore, "noquota"},
3546         {Opt_ignore, "quota"},
3547         {Opt_usrquota, "usrquota"},
3548 @@ -405,7 +410,20 @@ static int parse_options(char *options,
3549                                 pr_err("JFS: discard option not supported on device\n");
3550                         break;
3551                 }
3552 -
3553 +#ifndef CONFIG_TAGGING_NONE
3554 +               case Opt_tag:
3555 +                       *flag |= JFS_TAGGED;
3556 +                       break;
3557 +               case Opt_notag:
3558 +                       *flag &= JFS_TAGGED;
3559 +                       break;
3560 +#endif
3561 +#ifdef CONFIG_PROPAGATE
3562 +               case Opt_tagid:
3563 +                       /* use args[0] */
3564 +                       *flag |= JFS_TAGGED;
3565 +                       break;
3566 +#endif
3567                 default:
3568                         printk("jfs: Unrecognized mount option \"%s\" or missing value\n",
3569                                p);
3570 @@ -437,6 +455,12 @@ static int jfs_remount(struct super_bloc
3571         if (!parse_options(data, sb, &newLVSize, &flag))
3572                 return -EINVAL;
3573
3574 +       if ((flag & JFS_TAGGED) && !(sb->s_flags & MS_TAGGED)) {
3575 +               printk(KERN_ERR "JFS: %s: tagging not permitted on remount.\n",
3576 +                       sb->s_id);
3577 +               return -EINVAL;
3578 +       }
3579 +
3580         if (newLVSize) {
3581                 if (sb->s_flags & MS_RDONLY) {
3582                         pr_err("JFS: resize requires volume to be mounted read-write\n");
3583 @@ -517,6 +541,9 @@ static int jfs_fill_super(struct super_b
3584  #ifdef CONFIG_JFS_POSIX_ACL
3585         sb->s_flags |= MS_POSIXACL;
3586  #endif
3587 +       /* map mount option tagxid */
3588 +       if (sbi->flag & JFS_TAGGED)
3589 +               sb->s_flags |= MS_TAGGED;
3590
3591         if (newLVSize) {
3592                 pr_err("resize option for remount only\n");
3593 diff -NurpP --minimal linux-4.9.135/fs/libfs.c linux-4.9.135-vs2.3.9.8/fs/libfs.c
3594 --- linux-4.9.135/fs/libfs.c    2018-10-20 10:39:17.000000000 +0000
3595 +++ linux-4.9.135-vs2.3.9.8/fs/libfs.c  2018-10-20 04:58:14.000000000 +0000
3596 @@ -180,7 +180,8 @@ static inline unsigned char dt_type(stru
3597   * both impossible due to the lock on directory.
3598   */
3599
3600 -int dcache_readdir(struct file *file, struct dir_context *ctx)
3601 +static inline int do_dcache_readdir_filter(struct file *file,
3602 +       struct dir_context *ctx, int (*filter)(struct dentry *dentry))
3603  {
3604         struct dentry *dentry = file->f_path.dentry;
3605         struct dentry *cursor = file->private_data;
3606 @@ -194,9 +195,10 @@ int dcache_readdir(struct file *file, st
3607         if (ctx->pos == 2)
3608                 p = &dentry->d_subdirs;
3609         while ((next = next_positive(dentry, p, 1)) != NULL) {
3610 -               if (!dir_emit(ctx, next->d_name.name, next->d_name.len,
3611 +               if (!filter || filter(next))
3612 +                       if (!dir_emit(ctx, next->d_name.name, next->d_name.len,
3613                               d_inode(next)->i_ino, dt_type(d_inode(next))))
3614 -                       break;
3615 +                               break;
3616                 moved = true;
3617                 p = &next->d_child;
3618                 ctx->pos++;
3619 @@ -205,8 +207,22 @@ int dcache_readdir(struct file *file, st
3620                 move_cursor(cursor, p);
3621         return 0;
3622  }
3623 +
3624  EXPORT_SYMBOL(dcache_readdir);
3625
3626 +int dcache_readdir(struct file *filp, struct dir_context *ctx)
3627 +{
3628 +       return do_dcache_readdir_filter(filp, ctx, NULL);
3629 +}
3630 +
3631 +EXPORT_SYMBOL(dcache_readdir_filter);
3632 +
3633 +int dcache_readdir_filter(struct file *filp, struct dir_context *ctx,
3634 +       int (*filter)(struct dentry *))
3635 +{
3636 +       return do_dcache_readdir_filter(filp, ctx, filter);
3637 +}
3638 +
3639  ssize_t generic_read_dir(struct file *filp, char __user *buf, size_t siz, loff_t *ppos)
3640  {
3641         return -EISDIR;
3642 diff -NurpP --minimal linux-4.9.135/fs/locks.c linux-4.9.135-vs2.3.9.8/fs/locks.c
3643 --- linux-4.9.135/fs/locks.c    2016-12-11 19:17:54.000000000 +0000
3644 +++ linux-4.9.135-vs2.3.9.8/fs/locks.c  2018-10-20 04:58:14.000000000 +0000
3645 @@ -127,6 +127,8 @@
3646  #include <linux/pid_namespace.h>
3647  #include <linux/hashtable.h>
3648  #include <linux/percpu.h>
3649 +#include <linux/vs_base.h>
3650 +#include <linux/vs_limit.h>
3651
3652  #define CREATE_TRACE_POINTS
3653  #include <trace/events/filelock.h>
3654 @@ -292,11 +294,15 @@ static void locks_init_lock_heads(struct
3655  /* Allocate an empty lock structure. */
3656  struct file_lock *locks_alloc_lock(void)
3657  {
3658 -       struct file_lock *fl = kmem_cache_zalloc(filelock_cache, GFP_KERNEL);
3659 +       struct file_lock *fl;
3660
3661 -       if (fl)
3662 -               locks_init_lock_heads(fl);
3663 +       fl = kmem_cache_zalloc(filelock_cache, GFP_KERNEL);
3664
3665 +       if (fl) {
3666 +               locks_init_lock_heads(fl);
3667 +               vx_locks_inc(fl);
3668 +               fl->fl_xid = -1;
3669 +       }
3670         return fl;
3671  }
3672  EXPORT_SYMBOL_GPL(locks_alloc_lock);
3673 @@ -348,6 +354,7 @@ void locks_init_lock(struct file_lock *f
3674  {
3675         memset(fl, 0, sizeof(struct file_lock));
3676         locks_init_lock_heads(fl);
3677 +       fl->fl_xid = -1;
3678  }
3679
3680  EXPORT_SYMBOL(locks_init_lock);
3681 @@ -365,6 +372,7 @@ void locks_copy_conflock(struct file_loc
3682         new->fl_start = fl->fl_start;
3683         new->fl_end = fl->fl_end;
3684         new->fl_lmops = fl->fl_lmops;
3685 +       new->fl_xid = fl->fl_xid;
3686         new->fl_ops = NULL;
3687
3688         if (fl->fl_lmops) {
3689 @@ -426,7 +434,10 @@ flock_make_lock(struct file *filp, unsig
3690         fl->fl_flags = FL_FLOCK;
3691         fl->fl_type = type;
3692         fl->fl_end = OFFSET_MAX;
3693 -
3694 +
3695 +       vxd_assert(filp->f_xid == vx_current_xid(),
3696 +               "f_xid(%d) == current(%d)", filp->f_xid, vx_current_xid());
3697 +       fl->fl_xid = filp->f_xid;
3698         return fl;
3699  }
3700
3701 @@ -548,6 +559,7 @@ static int lease_init(struct file *filp,
3702
3703         fl->fl_owner = filp;
3704         fl->fl_pid = current->tgid;
3705 +       fl->fl_xid = vx_current_xid();
3706
3707         fl->fl_file = filp;
3708         fl->fl_flags = FL_LEASE;
3709 @@ -567,6 +579,10 @@ static struct file_lock *lease_alloc(str
3710         if (fl == NULL)
3711                 return ERR_PTR(error);
3712
3713 +       fl->fl_xid = vx_current_xid();
3714 +       if (filp)
3715 +               vxd_assert(filp->f_xid == fl->fl_xid,
3716 +                       "f_xid(%d) == fl_xid(%d)", filp->f_xid, fl->fl_xid);
3717         error = lease_init(filp, type, fl);
3718         if (error) {
3719                 locks_free_lock(fl);
3720 @@ -956,6 +972,7 @@ static int flock_lock_inode(struct inode
3721                 goto out;
3722         }
3723
3724 +       new_fl->fl_xid = -1;
3725  find_conflict:
3726         list_for_each_entry(fl, &ctx->flc_flock, fl_list) {
3727                 if (!flock_locks_conflict(request, fl))
3728 @@ -984,7 +1001,7 @@ out:
3729  }
3730
3731  static int posix_lock_inode(struct inode *inode, struct file_lock *request,
3732 -                           struct file_lock *conflock)
3733 +                           struct file_lock *conflock, vxid_t xid)
3734  {
3735         struct file_lock *fl, *tmp;
3736         struct file_lock *new_fl = NULL;
3737 @@ -1000,6 +1017,9 @@ static int posix_lock_inode(struct inode
3738         if (!ctx)
3739                 return (request->fl_type == F_UNLCK) ? 0 : -ENOMEM;
3740
3741 +       if (xid)
3742 +               vxd_assert(xid == vx_current_xid(),
3743 +                       "xid(%d) == current(%d)", xid, vx_current_xid());
3744         /*
3745          * We may need two file_lock structures for this operation,
3746          * so we get them in advance to avoid races.
3747 @@ -1010,7 +1030,11 @@ static int posix_lock_inode(struct inode
3748             (request->fl_type != F_UNLCK ||
3749              request->fl_start != 0 || request->fl_end != OFFSET_MAX)) {
3750                 new_fl = locks_alloc_lock();
3751 +               new_fl->fl_xid = xid;
3752 +               // vx_locks_inc(new_fl);
3753                 new_fl2 = locks_alloc_lock();
3754 +               new_fl2->fl_xid = xid;
3755 +               // vx_locks_inc(new_fl2);
3756         }
3757
3758         percpu_down_read_preempt_disable(&file_rwsem);
3759 @@ -1216,7 +1240,7 @@ static int posix_lock_inode(struct inode
3760  int posix_lock_file(struct file *filp, struct file_lock *fl,
3761                         struct file_lock *conflock)
3762  {
3763 -       return posix_lock_inode(locks_inode(filp), fl, conflock);
3764 +       return posix_lock_inode(locks_inode(filp), fl, conflock, filp->f_xid);
3765  }
3766  EXPORT_SYMBOL(posix_lock_file);
3767
3768 @@ -1232,7 +1256,7 @@ static int posix_lock_inode_wait(struct
3769         int error;
3770         might_sleep ();
3771         for (;;) {
3772 -               error = posix_lock_inode(inode, fl, NULL);
3773 +               error = posix_lock_inode(inode, fl, NULL, 0);
3774                 if (error != FILE_LOCK_DEFERRED)
3775                         break;
3776                 error = wait_event_interruptible(fl->fl_wait, !fl->fl_next);
3777 @@ -1308,10 +1332,13 @@ int locks_mandatory_area(struct inode *i
3778         fl.fl_end = end;
3779
3780         for (;;) {
3781 +               vxid_t f_xid = 0;
3782 +
3783                 if (filp) {
3784                         fl.fl_owner = filp;
3785                         fl.fl_flags &= ~FL_SLEEP;
3786 -                       error = posix_lock_inode(inode, &fl, NULL);
3787 +                       f_xid = filp->f_xid;
3788 +                       error = posix_lock_inode(inode, &fl, NULL, f_xid);
3789                         if (!error)
3790                                 break;
3791                 }
3792 @@ -1319,7 +1346,7 @@ int locks_mandatory_area(struct inode *i
3793                 if (sleep)
3794                         fl.fl_flags |= FL_SLEEP;
3795                 fl.fl_owner = current->files;
3796 -               error = posix_lock_inode(inode, &fl, NULL);
3797 +               error = posix_lock_inode(inode, &fl, NULL, f_xid);
3798                 if (error != FILE_LOCK_DEFERRED)
3799                         break;
3800                 error = wait_event_interruptible(fl.fl_wait, !fl.fl_next);
3801 @@ -2374,6 +2401,16 @@ int fcntl_setlk64(unsigned int fd, struc
3802         if (file_lock == NULL)
3803                 return -ENOLCK;
3804
3805 +       vxd_assert(filp->f_xid == vx_current_xid(),
3806 +               "f_xid(%d) == current(%d)", filp->f_xid, vx_current_xid());
3807 +       file_lock->fl_xid = filp->f_xid;
3808 +       // vx_locks_inc(file_lock);
3809 +
3810 +       vxd_assert(filp->f_xid == vx_current_xid(),
3811 +               "f_xid(%d) == current(%d)", filp->f_xid, vx_current_xid());
3812 +       file_lock->fl_xid = filp->f_xid;
3813 +       // vx_locks_inc(file_lock);
3814 +
3815         /*
3816          * This might block, so we do it before checking the inode.
3817          */
3818 @@ -2710,8 +2747,11 @@ static int locks_show(struct seq_file *f
3819
3820         lock_get_status(f, fl, iter->li_pos, "");
3821
3822 -       list_for_each_entry(bfl, &fl->fl_block, fl_block)
3823 +       list_for_each_entry(bfl, &fl->fl_block, fl_block) {
3824 +               if (!vx_check(fl->fl_xid, VS_WATCH_P | VS_IDENT))
3825 +                       continue;
3826                 lock_get_status(f, bfl, iter->li_pos, " ->");
3827 +       }
3828
3829         return 0;
3830  }
3831 diff -NurpP --minimal linux-4.9.135/fs/mount.h linux-4.9.135-vs2.3.9.8/fs/mount.h
3832 --- linux-4.9.135/fs/mount.h    2018-10-20 10:39:17.000000000 +0000
3833 +++ linux-4.9.135-vs2.3.9.8/fs/mount.h  2018-10-20 04:58:14.000000000 +0000
3834 @@ -69,6 +69,7 @@ struct mount {
3835         struct hlist_head mnt_pins;
3836         struct fs_pin mnt_umount;
3837         struct dentry *mnt_ex_mountpoint;
3838 +       vtag_t mnt_tag;                 /* tagging used for vfsmount */
3839  };
3840
3841  #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
3842 diff -NurpP --minimal linux-4.9.135/fs/namei.c linux-4.9.135-vs2.3.9.8/fs/namei.c
3843 --- linux-4.9.135/fs/namei.c    2018-10-20 10:39:17.000000000 +0000
3844 +++ linux-4.9.135-vs2.3.9.8/fs/namei.c  2018-10-20 04:58:14.000000000 +0000
3845 @@ -37,9 +37,19 @@
3846  #include <linux/hash.h>
3847  #include <linux/bitops.h>
3848  #include <linux/init_task.h>
3849 +#include <linux/proc_fs.h>
3850 +#include <linux/magic.h>
3851 +#include <linux/vserver/inode.h>
3852 +#include <linux/vs_base.h>
3853 +#include <linux/vs_tag.h>
3854 +#include <linux/vs_cowbl.h>
3855 +#include <linux/vs_device.h>
3856 +#include <linux/vs_context.h>
3857 +#include <linux/pid_namespace.h>
3858  #include <asm/uaccess.h>
3859
3860  #include "internal.h"
3861 +#include "proc/internal.h"
3862  #include "mount.h"
3863
3864  /* [Feb-1997 T. Schoebel-Theuer]
3865 @@ -286,6 +296,93 @@ static int check_acl(struct inode *inode
3866         return -EAGAIN;
3867  }
3868
3869 +static inline int dx_barrier(const struct inode *inode)
3870 +{
3871 +       if (IS_BARRIER(inode) && !vx_check(0, VS_ADMIN | VS_WATCH)) {
3872 +               vxwprintk_task(1, "did hit the barrier.");
3873 +               return 1;
3874 +       }
3875 +       return 0;
3876 +}
3877 +
3878 +static int __dx_permission(const struct inode *inode, int mask)
3879 +{
3880 +       if (dx_barrier(inode))
3881 +               return -EACCES;
3882 +
3883 +       if (inode->i_sb->s_magic == DEVPTS_SUPER_MAGIC) {
3884 +               /* devpts is xid tagged */
3885 +               if (S_ISDIR(inode->i_mode) ||
3886 +                   vx_check((vxid_t)i_tag_read(inode), VS_IDENT | VS_WATCH_P))
3887 +                       return 0;
3888 +
3889 +               /* just pretend we didn't find anything */
3890 +               return -ENOENT;
3891 +       }
3892 +       else if (inode->i_sb->s_magic == PROC_SUPER_MAGIC) {
3893 +               struct proc_dir_entry *de = PDE(inode);
3894 +
3895 +               if (de && !vx_hide_check(0, de->vx_flags)) {
3896 +                       vxdprintk(VXD_CBIT(misc, 9),
3897 +                               VS_Q("%*s") " hidden by _dx_permission",
3898 +                               de->namelen, de->name);
3899 +                       goto out;
3900 +               }
3901 +
3902 +               if ((mask & (MAY_WRITE | MAY_APPEND))) {
3903 +                       struct pid *pid;
3904 +                       struct task_struct *tsk;
3905 +
3906 +                       if (vx_check(0, VS_ADMIN | VS_WATCH_P) ||
3907 +                           vx_flags(VXF_STATE_SETUP, 0))
3908 +                               return 0;
3909 +
3910 +                       pid = PROC_I(inode)->pid;
3911 +                       if (!pid)
3912 +                               goto out;
3913 +
3914 +                       rcu_read_lock();
3915 +                       tsk = pid_task(pid, PIDTYPE_PID);
3916 +                       vxdprintk(VXD_CBIT(tag, 0), "accessing %p[#%u]",
3917 +                                 tsk, (tsk ? vx_task_xid(tsk) : 0));
3918 +                       if (tsk &&
3919 +                               vx_check(vx_task_xid(tsk), VS_IDENT | VS_WATCH_P)) {
3920 +                               rcu_read_unlock();
3921 +                               return 0;
3922 +                       }
3923 +                       rcu_read_unlock();
3924 +               }
3925 +               else {
3926 +                       /* FIXME: Should we block some entries here? */
3927 +                       return 0;
3928 +               }
3929 +       }
3930 +       else {
3931 +               if (dx_notagcheck(inode->i_sb) ||
3932 +                   dx_check((vxid_t)i_tag_read(inode),
3933 +                       DX_HOSTID | DX_ADMIN | DX_WATCH | DX_IDENT))
3934 +                       return 0;
3935 +       }
3936 +
3937 +out:
3938 +       return -EACCES;
3939 +}
3940 +
3941 +int dx_permission(const struct inode *inode, int mask)
3942 +{
3943 +       int ret = __dx_permission(inode, mask);
3944 +       if (unlikely(ret)) {
3945 +#ifndef        CONFIG_VSERVER_WARN_DEVPTS
3946 +               if (inode->i_sb->s_magic != DEVPTS_SUPER_MAGIC)
3947 +#endif
3948 +                   vxwprintk_task(1,
3949 +                       "denied [0x%x] access to inode %s:%p[#%d,%lu]",
3950 +                       mask, inode->i_sb->s_id, inode,
3951 +                       i_tag_read(inode), inode->i_ino);
3952 +       }
3953 +       return ret;
3954 +}
3955 +
3956  /*
3957   * This does the basic permission checking
3958   */
3959 @@ -410,7 +507,7 @@ int __inode_permission(struct inode *ino
3960                 /*
3961                  * Nobody gets write access to an immutable file.
3962                  */
3963 -               if (IS_IMMUTABLE(inode))
3964 +               if (IS_IMMUTABLE(inode) && !IS_COW(inode))
3965                         return -EPERM;
3966
3967                 /*
3968 @@ -422,6 +519,10 @@ int __inode_permission(struct inode *ino
3969                         return -EACCES;
3970         }
3971
3972 +       retval = dx_permission(inode, mask);
3973 +       if (retval)
3974 +               return retval;
3975 +
3976         retval = do_inode_permission(inode, mask);
3977         if (retval)
3978                 return retval;
3979 @@ -2783,7 +2884,7 @@ static int may_delete(struct inode *dir,
3980                 return -EPERM;
3981
3982         if (check_sticky(dir, inode) || IS_APPEND(inode) ||
3983 -           IS_IMMUTABLE(inode) || IS_SWAPFILE(inode) || HAS_UNMAPPED_ID(inode))
3984 +           IS_IXORUNLINK(inode) || IS_SWAPFILE(inode) || HAS_UNMAPPED_ID(inode))
3985                 return -EPERM;
3986         if (isdir) {
3987                 if (!d_is_dir(victim))
3988 @@ -2871,19 +2972,25 @@ int vfs_create(struct inode *dir, struct
3989                 bool want_excl)
3990  {
3991         int error = may_create(dir, dentry);
3992 -       if (error)
3993 +       if (error) {
3994 +               vxdprintk(VXD_CBIT(misc, 3), "may_create failed with %d", error);
3995                 return error;
3996 +       }
3997
3998         if (!dir->i_op->create)
3999                 return -EACCES; /* shouldn't it be ENOSYS? */
4000         mode &= S_IALLUGO;
4001         mode |= S_IFREG;
4002         error = security_inode_create(dir, dentry, mode);
4003 -       if (error)
4004 +       if (error) {
4005 +               vxdprintk(VXD_CBIT(misc, 3), "security_inode_create failed with %d", error);
4006                 return error;
4007 +       }
4008         error = dir->i_op->create(dir, dentry, mode, want_excl);
4009         if (!error)
4010                 fsnotify_create(dir, dentry);
4011 +       else
4012 +               vxdprintk(VXD_CBIT(misc, 3), "i_op->create failed with %d", error);
4013         return error;
4014  }
4015  EXPORT_SYMBOL(vfs_create);
4016 @@ -2921,6 +3028,15 @@ static int may_open(struct path *path, i
4017                 break;
4018         }
4019
4020 +#ifdef CONFIG_VSERVER_COWBL
4021 +       if (IS_COW(inode) &&
4022 +               ((flag & O_ACCMODE) != O_RDONLY)) {
4023 +               if (IS_COW_LINK(inode))
4024 +                       return -EMLINK;
4025 +               inode->i_flags &= ~(S_IXUNLINK|S_IMMUTABLE);
4026 +               mark_inode_dirty(inode);
4027 +       }
4028 +#endif
4029         error = inode_permission(inode, MAY_OPEN | acc_mode);
4030         if (error)
4031                 return error;
4032 @@ -3373,6 +3489,16 @@ finish_open:
4033         }
4034  finish_open_created:
4035         error = may_open(&nd->path, acc_mode, open_flag);
4036 +#ifdef CONFIG_VSERVER_COWBL
4037 +       if (error == -EMLINK) {
4038 +               struct dentry *dentry;
4039 +               dentry = cow_break_link(nd->name->name);
4040 +               if (IS_ERR(dentry))
4041 +                       error = PTR_ERR(dentry);
4042 +               else
4043 +                       dput(dentry);
4044 +       }
4045 +#endif
4046         if (error)
4047                 goto out;
4048         BUG_ON(*opened & FILE_OPENED); /* once it's opened, it's opened */
4049 @@ -3476,6 +3602,9 @@ static struct file *path_openat(struct n
4050         int opened = 0;
4051         int error;
4052
4053 +#ifdef CONFIG_VSERVER_COWBL
4054 +restart:
4055 +#endif
4056         file = get_empty_filp();
4057         if (IS_ERR(file))
4058                 return file;
4059 @@ -3509,6 +3638,12 @@ static struct file *path_openat(struct n
4060                 }
4061         }
4062         terminate_walk(nd);
4063 +#ifdef CONFIG_VSERVER_COWBL
4064 +       if (error == -EMLINK) {
4065 +               // path_cleanup(nd);
4066 +               goto restart;
4067 +       }
4068 +#endif
4069  out2:
4070         if (!(opened & FILE_OPENED)) {
4071                 BUG_ON(!error);
4072 @@ -3629,6 +3764,11 @@ static struct dentry *filename_create(in
4073                 goto fail;
4074         }
4075         putname(name);
4076 +       vxdprintk(VXD_CBIT(misc, 3), "filename_create path.dentry = %p (%.*s), dentry = %p (%.*s), d_inode = %p",
4077 +               path->dentry, path->dentry->d_name.len,
4078 +               path->dentry->d_name.name, dentry,
4079 +               dentry->d_name.len, dentry->d_name.name,
4080 +               path->dentry->d_inode);
4081         return dentry;
4082  fail:
4083         dput(dentry);
4084 @@ -3747,6 +3887,7 @@ retry:
4085                         error = vfs_mknod(path.dentry->d_inode,dentry,mode,0);
4086                         break;
4087         }
4088 +
4089  out:
4090         done_path_create(&path, dentry);
4091         if (retry_estale(error, lookup_flags)) {
4092 @@ -4168,7 +4309,7 @@ int vfs_link(struct dentry *old_dentry,
4093         /*
4094          * A link to an append-only or immutable file cannot be created.
4095          */
4096 -       if (IS_APPEND(inode) || IS_IMMUTABLE(inode))
4097 +       if (IS_APPEND(inode) || IS_IXORUNLINK(inode))
4098                 return -EPERM;
4099         /*
4100          * Updating the link count will likely cause i_uid and i_gid to
4101 @@ -4698,6 +4839,326 @@ const char *vfs_get_link(struct dentry *
4102  }
4103  EXPORT_SYMBOL(vfs_get_link);
4104
4105 +
4106 +#ifdef CONFIG_VSERVER_COWBL
4107 +
4108 +static inline
4109 +void dump_path(const char *name, struct path *path)
4110 +{
4111 +       vxdprintk(VXD_CBIT(misc, 3),
4112 +               "%s: path=%p mnt=%p dentry=%p", name, path,
4113 +               path ? path->mnt : NULL,
4114 +               path ? path->dentry : NULL);
4115 +
4116 +       if (path && path->mnt)
4117 +               vxdprintk(VXD_CBIT(misc, 3),
4118 +               "%s: path mnt_sb=%p[#%d,#%d] mnt_root=%p[#%d]", name,
4119 +               path->mnt->mnt_sb,
4120 +               path->mnt->mnt_sb ? path->mnt->mnt_sb->s_count : -1,
4121 +               path->mnt->mnt_sb ? atomic_read(&path->mnt->mnt_sb->s_active) : -1,
4122 +               path->mnt->mnt_root,
4123 +               path->mnt->mnt_root ? path->mnt->mnt_root->d_lockref.count : -1);
4124 +
4125 +       if (path && path->dentry)
4126 +               vxdprintk(VXD_CBIT(misc, 3),
4127 +               "%s: path dentry=%p[#%d]", name,
4128 +               path->dentry,
4129 +               path->dentry ? path->dentry->d_lockref.count : -1);
4130 +}
4131 +
4132 +static inline
4133 +long do_cow_splice(struct file *in, struct file *out, size_t len)
4134 +{
4135 +       loff_t ppos = 0;
4136 +       loff_t opos = 0;
4137 +
4138 +       return do_splice_direct(in, &ppos, out, &opos, len, 0);
4139 +}
4140 +
4141 +struct dentry *cow_break_link(const char *pathname)
4142 +{
4143 +       int ret, mode, pathlen, redo = 0, drop = 1;
4144 +       struct path old_path = {}, par_path = {}, dir_path = {}, *new_path = NULL;
4145 +       struct dentry *dir, *old_dentry, *new_dentry = NULL;
4146 +       struct file *old_file;
4147 +       struct file *new_file;
4148 +       struct qstr new_qstr;
4149 +       int new_type;
4150 +       char *to, *path, pad='\251';
4151 +       loff_t size;
4152 +       struct filename *filename = getname_kernel(pathname);
4153 +       struct filename *to_filename;
4154 +
4155 +       vxdprintk(VXD_CBIT(misc, 1),
4156 +               "cow_break_link(" VS_Q("%s") ")", pathname);
4157 +
4158 +       path = kmalloc(PATH_MAX, GFP_KERNEL);
4159 +       ret = -ENOMEM;
4160 +       if (!path || IS_ERR(filename))
4161 +               goto out;
4162 +
4163 +       /* old_path will have refs to dentry and mnt */
4164 +       ret = filename_lookup(AT_FDCWD, filename, LOOKUP_FOLLOW, &old_path, NULL);
4165 +       vxdprintk(VXD_CBIT(misc, 2),
4166 +               "do_path_lookup(old): %d", ret);
4167 +       if (ret < 0)
4168 +               goto out_free_path;
4169 +
4170 +       dump_path("cow (old)", &old_path);
4171 +
4172 +       /* no explicit reference for old_dentry here */
4173 +       old_dentry = old_path.dentry;
4174 +
4175 +       mode = old_dentry->d_inode->i_mode;
4176 +       to = d_path(&old_path, path, PATH_MAX-2);
4177 +       pathlen = strlen(to);
4178 +       vxdprintk(VXD_CBIT(misc, 2),
4179 +               "old path " VS_Q("%s") " [%p:" VS_Q("%.*s") ":%d]", to,
4180 +               old_dentry,
4181 +               old_dentry->d_name.len, old_dentry->d_name.name,
4182 +               old_dentry->d_name.len);
4183 +
4184 +       to[pathlen + 1] = 0;
4185 +retry:
4186 +       new_dentry = NULL;
4187 +       to[pathlen] = pad--;
4188 +       ret = -ELOOP;
4189 +       if (pad <= '\240')
4190 +               goto out_rel_old;
4191 +
4192 +       vxdprintk(VXD_CBIT(misc, 1), "temp copy " VS_Q("%s"), to);
4193 +
4194 +       /* dir_path will have refs to dentry and mnt */
4195 +       to_filename = getname_kernel(to);
4196 +       to_filename = filename_parentat(AT_FDCWD, to_filename,
4197 +               LOOKUP_PARENT | LOOKUP_OPEN | LOOKUP_CREATE, &par_path, &new_qstr, &new_type);
4198 +       vxdprintk(VXD_CBIT(misc, 2), "filename_parentat(new): %p", to_filename);
4199 +       dump_path("cow (par)", &par_path);
4200 +       if (IS_ERR(to_filename))
4201 +               goto retry;
4202 +
4203 +       vxdprintk(VXD_CBIT(misc, 2), "to_filename refcnt=%d", to_filename->refcnt);
4204 +
4205 +       /* this puppy downs the dir inode mutex if successful.
4206 +          dir_path will hold refs to dentry and mnt and
4207 +          we'll have write access to the mnt */
4208 +       new_dentry = filename_create(AT_FDCWD, to_filename, &dir_path, 0);
4209 +       if (!new_dentry || IS_ERR(new_dentry)) {
4210 +               path_put(&par_path);
4211 +               vxdprintk(VXD_CBIT(misc, 2),
4212 +                       "filename_create(new) failed with %ld",
4213 +                       PTR_ERR(new_dentry));
4214 +               goto retry;
4215 +       }
4216 +       vxdprintk(VXD_CBIT(misc, 2),
4217 +               "filename_create(new): %p [" VS_Q("%.*s") ":%d]",
4218 +               new_dentry,
4219 +               new_dentry->d_name.len, new_dentry->d_name.name,
4220 +               new_dentry->d_name.len);
4221 +
4222 +       dump_path("cow (dir)", &dir_path);
4223 +
4224 +       /* take a reference on new_dentry */
4225 +       dget(new_dentry);
4226 +
4227 +       /* dentry/mnt refs handed over to new_path */
4228 +       new_path = &dir_path;
4229 +
4230 +       /* dentry for old/new dir */
4231 +       dir = par_path.dentry;
4232 +
4233 +       /* give up reference on dir */
4234 +       dput(new_path->dentry);
4235 +
4236 +       /* new_dentry already has a reference */
4237 +       new_path->dentry = new_dentry;
4238 +
4239 +       ret = vfs_create(dir->d_inode, new_dentry, mode, 1);
4240 +       vxdprintk(VXD_CBIT(misc, 2),
4241 +               "vfs_create(new): %d", ret);
4242 +       if (ret == -EEXIST) {
4243 +               path_put(&par_path);
4244 +               inode_unlock(dir->d_inode);
4245 +               mnt_drop_write(new_path->mnt);
4246 +               path_put(new_path);
4247 +               new_dentry = NULL;
4248 +               goto retry;
4249 +       }
4250 +       else if (ret < 0)
4251 +               goto out_unlock_new;
4252 +
4253 +       /* the old file went away */
4254 +       ret = -ENOENT;
4255 +       if ((redo = d_unhashed(old_dentry)))
4256 +               goto out_unlock_new;
4257 +
4258 +       /* doesn't change refs for old_path */
4259 +       old_file = dentry_open(&old_path, O_RDONLY, current_cred());
4260 +       vxdprintk(VXD_CBIT(misc, 2),
4261 +               "dentry_open(old): %p", old_file);
4262 +       if (IS_ERR(old_file)) {
4263 +               ret = PTR_ERR(old_file);
4264 +               goto out_unlock_new;
4265 +       }
4266 +
4267 +       /* doesn't change refs for new_path */
4268 +       new_file = dentry_open(new_path, O_WRONLY, current_cred());
4269 +       vxdprintk(VXD_CBIT(misc, 2),
4270 +               "dentry_open(new): %p", new_file);
4271 +       if (IS_ERR(new_file)) {
4272 +               ret = PTR_ERR(new_file);
4273 +               goto out_fput_old;
4274 +       }
4275 +
4276 +       /* unlock the inode from filename_create() */
4277 +       inode_unlock(dir->d_inode);
4278 +
4279 +       /* drop write access to mnt */
4280 +       mnt_drop_write(new_path->mnt);
4281 +
4282 +       drop = 0;
4283 +
4284 +       size = i_size_read(old_file->f_path.dentry->d_inode);
4285 +       ret = do_cow_splice(old_file, new_file, size);
4286 +       vxdprintk(VXD_CBIT(misc, 2), "do_splice_direct: %d", ret);
4287 +       if (ret < 0) {
4288 +               goto out_fput_both;
4289 +       } else if (ret < size) {
4290 +               ret = -ENOSPC;
4291 +               goto out_fput_both;
4292 +       } else {
4293 +               struct inode *old_inode = old_dentry->d_inode;
4294 +               struct inode *new_inode = new_dentry->d_inode;
4295 +               struct iattr attr = {
4296 +                       .ia_uid = old_inode->i_uid,
4297 +                       .ia_gid = old_inode->i_gid,
4298 +                       .ia_valid = ATTR_UID | ATTR_GID
4299 +                       };
4300 +
4301 +               setattr_copy(new_inode, &attr);
4302 +               mark_inode_dirty(new_inode);
4303 +       }
4304 +
4305 +       /* lock rename mutex */
4306 +       mutex_lock(&old_dentry->d_inode->i_sb->s_vfs_rename_mutex);
4307 +
4308 +       /* drop out late */
4309 +       ret = -ENOENT;
4310 +       if ((redo = d_unhashed(old_dentry)))
4311 +               goto out_unlock;
4312 +
4313 +       vxdprintk(VXD_CBIT(misc, 2),
4314 +               "vfs_rename: [" VS_Q("%*s") ":%d] -> [" VS_Q("%*s") ":%d]",
4315 +               new_dentry->d_name.len, new_dentry->d_name.name,
4316 +               new_dentry->d_name.len,
4317 +               old_dentry->d_name.len, old_dentry->d_name.name,
4318 +               old_dentry->d_name.len);
4319 +       ret = vfs_rename(par_path.dentry->d_inode, new_dentry,
4320 +               old_dentry->d_parent->d_inode, old_dentry, NULL, 0);
4321 +       vxdprintk(VXD_CBIT(misc, 2), "vfs_rename: %d", ret);
4322 +
4323 +out_unlock:
4324 +       mutex_unlock(&old_dentry->d_inode->i_sb->s_vfs_rename_mutex);
4325 +
4326 +out_fput_both:
4327 +       vxdprintk(VXD_CBIT(misc, 3),
4328 +               "fput(new_file=%p[#%ld])", new_file,
4329 +               atomic_long_read(&new_file->f_count));
4330 +       fput(new_file);
4331 +
4332 +out_fput_old:
4333 +       vxdprintk(VXD_CBIT(misc, 3),
4334 +               "fput(old_file=%p[#%ld])", old_file,
4335 +               atomic_long_read(&old_file->f_count));
4336 +       fput(old_file);
4337 +
4338 +out_unlock_new:
4339 +       /* drop references from par_path */
4340 +       path_put(&par_path);
4341 +
4342 +       if (drop) {
4343 +               /* unlock the inode from filename_create() */
4344 +               inode_unlock(dir->d_inode);
4345 +
4346 +               /* drop write access to mnt */
4347 +               mnt_drop_write(new_path->mnt);
4348 +       }
4349 +
4350 +       if (!ret)
4351 +               goto out_redo;
4352 +
4353 +       /* error path cleanup */
4354 +       vfs_unlink(dir->d_inode, new_dentry, NULL);
4355 +
4356 +out_redo:
4357 +       if (!redo)
4358 +               goto out_rel_both;
4359 +
4360 +       /* lookup dentry once again
4361 +          old_path will be freed as old_path in out_rel_old */
4362 +       ret = filename_lookup(AT_FDCWD, filename, LOOKUP_FOLLOW, &old_path, NULL);
4363 +       if (ret)
4364 +               goto out_rel_both;
4365 +
4366 +       /* drop reference on new_dentry */
4367 +       dput(new_dentry);
4368 +       new_dentry = old_path.dentry;
4369 +       dget(new_dentry);
4370 +       vxdprintk(VXD_CBIT(misc, 2),
4371 +               "do_path_lookup(redo): %p [" VS_Q("%.*s") ":%d]",
4372 +               new_dentry,
4373 +               new_dentry->d_name.len, new_dentry->d_name.name,
4374 +               new_dentry->d_name.len);
4375 +
4376 +out_rel_both:
4377 +       dump_path("put (new)", new_path);
4378 +       if (new_path)
4379 +               path_put(new_path);
4380 +out_rel_old:
4381 +       dump_path("put (old)", &old_path);
4382 +       path_put(&old_path);
4383 +out_free_path:
4384 +       kfree(path);
4385 +out:
4386 +       if (ret) {
4387 +               dput(new_dentry);
4388 +               new_dentry = ERR_PTR(ret);
4389 +       }
4390 +       // if (!IS_ERR(filename))
4391 +       //        putname(filename);
4392 +       vxdprintk(VXD_CBIT(misc, 3),
4393 +               "cow_break_link returning with %p", new_dentry);
4394 +       return new_dentry;
4395 +}
4396 +
4397 +#endif
4398 +
4399 +int    vx_info_mnt_namespace(struct mnt_namespace *ns, char *buffer)
4400 +{
4401 +       struct path path;
4402 +       struct vfsmount *vmnt;
4403 +       char *pstr, *root;
4404 +       int length = 0;
4405 +
4406 +       pstr = kmalloc(PATH_MAX, GFP_KERNEL);
4407 +       if (!pstr)
4408 +               return 0;
4409 +
4410 +       vmnt = &ns->root->mnt;
4411 +       path.mnt = vmnt;
4412 +       path.dentry = vmnt->mnt_root;
4413 +       root = d_path(&path, pstr, PATH_MAX - 2);
4414 +       length = sprintf(buffer + length,
4415 +               "Namespace:\t%p [#%u]\n"
4416 +               "RootPath:\t%s\n",
4417 +               ns, atomic_read(&ns->count),
4418 +               root);
4419 +       kfree(pstr);
4420 +       return length;
4421 +}
4422 +
4423 +EXPORT_SYMBOL(vx_info_mnt_namespace);
4424 +
4425  /* get the link contents into pagecache */
4426  const char *page_get_link(struct dentry *dentry, struct inode *inode,
4427                           struct delayed_call *callback)
4428 diff -NurpP --minimal linux-4.9.135/fs/namespace.c linux-4.9.135-vs2.3.9.8/fs/namespace.c
4429 --- linux-4.9.135/fs/namespace.c        2018-10-20 10:39:17.000000000 +0000
4430 +++ linux-4.9.135-vs2.3.9.8/fs/namespace.c      2018-10-20 05:55:43.000000000 +0000
4431 @@ -24,6 +24,11 @@
4432  #include <linux/magic.h>
4433  #include <linux/bootmem.h>
4434  #include <linux/task_work.h>
4435 +#include <linux/vs_base.h>
4436 +#include <linux/vs_context.h>
4437 +#include <linux/vs_tag.h>
4438 +#include <linux/vserver/space.h>
4439 +#include <linux/vserver/global.h>
4440  #include "pnode.h"
4441  #include "internal.h"
4442
4443 @@ -980,6 +985,10 @@ vfs_kern_mount(struct file_system_type *
4444         if (!type)
4445                 return ERR_PTR(-ENODEV);
4446
4447 +       if ((type->fs_flags & FS_BINARY_MOUNTDATA) &&
4448 +               !vx_capable(CAP_SYS_ADMIN, VXC_BINARY_MOUNT))
4449 +               return ERR_PTR(-EPERM);
4450 +
4451         mnt = alloc_vfsmnt(name);
4452         if (!mnt)
4453                 return ERR_PTR(-ENOMEM);
4454 @@ -1071,6 +1080,7 @@ static struct mount *clone_mnt(struct mo
4455         mnt->mnt.mnt_root = dget(root);
4456         mnt->mnt_mountpoint = mnt->mnt.mnt_root;
4457         mnt->mnt_parent = mnt;
4458 +       mnt->mnt_tag = old->mnt_tag;
4459         lock_mount_hash();
4460         list_add_tail(&mnt->mnt_instance, &sb->s_mounts);
4461         unlock_mount_hash();
4462 @@ -1660,7 +1670,8 @@ out_unlock:
4463   */
4464  static inline bool may_mount(void)
4465  {
4466 -       return ns_capable(current->nsproxy->mnt_ns->user_ns, CAP_SYS_ADMIN);
4467 +       return vx_ns_capable(current->nsproxy->mnt_ns->user_ns,
4468 +               CAP_SYS_ADMIN, VXC_SECURE_MOUNT);
4469  }
4470
4471  static inline bool may_mandlock(void)
4472 @@ -2169,6 +2180,7 @@ static int do_change_type(struct path *p
4473                 if (err)
4474                         goto out_unlock;
4475         }
4476 +       // mnt->mnt_flags = mnt_flags;
4477
4478         lock_mount_hash();
4479         for (m = mnt; m; m = (recurse ? next_mnt(m, mnt) : NULL))
4480 @@ -2197,12 +2209,14 @@ static bool has_locked_children(struct m
4481   * do loopback mount.
4482   */
4483  static int do_loopback(struct path *path, const char *old_name,
4484 -                               int recurse)
4485 +       vtag_t tag, unsigned long flags, int mnt_flags)
4486  {
4487         struct path old_path;
4488         struct mount *mnt = NULL, *old, *parent;
4489         struct mountpoint *mp;
4490 +       int recurse = flags & MS_REC;
4491         int err;
4492 +
4493         if (!old_name || !*old_name)
4494                 return -EINVAL;
4495         err = kern_path(old_name, LOOKUP_FOLLOW|LOOKUP_AUTOMOUNT, &old_path);
4496 @@ -2282,7 +2296,7 @@ static int change_mount_flags(struct vfs
4497   * on it - tough luck.
4498   */
4499  static int do_remount(struct path *path, int flags, int mnt_flags,
4500 -                     void *data)
4501 +       void *data, vxid_t xid)
4502  {
4503         int err;
4504         struct super_block *sb = path->mnt->mnt_sb;
4505 @@ -2767,6 +2781,7 @@ long do_mount(const char *dev_name, cons
4506         struct path path;
4507         int retval = 0;
4508         int mnt_flags = 0;
4509 +       vtag_t tag = 0;
4510
4511         /* Discard magic */
4512         if ((flags & MS_MGC_MSK) == MS_MGC_VAL)
4513 @@ -2794,6 +2809,12 @@ long do_mount(const char *dev_name, cons
4514         if (!(flags & MS_NOATIME))
4515                 mnt_flags |= MNT_RELATIME;
4516
4517 +       if (dx_parse_tag(data_page, &tag, 1, &mnt_flags, &flags)) {
4518 +               /* FIXME: bind and re-mounts get the tag flag? */
4519 +               if (flags & (MS_BIND|MS_REMOUNT))
4520 +                       flags |= MS_TAGID;
4521 +       }
4522 +
4523         /* Separate the per-mountpoint flags */
4524         if (flags & MS_NOSUID)
4525                 mnt_flags |= MNT_NOSUID;
4526 @@ -2818,15 +2839,18 @@ long do_mount(const char *dev_name, cons
4527                 mnt_flags |= path.mnt->mnt_flags & MNT_ATIME_MASK;
4528         }
4529
4530 +       if (!vx_capable(CAP_SYS_ADMIN, VXC_DEV_MOUNT))
4531 +               mnt_flags |= MNT_NODEV;
4532 +
4533         flags &= ~(MS_NOSUID | MS_NOEXEC | MS_NODEV | MS_ACTIVE | MS_BORN |
4534                    MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
4535                    MS_STRICTATIME | MS_NOREMOTELOCK | MS_SUBMOUNT);
4536
4537         if (flags & MS_REMOUNT)
4538                 retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
4539 -                                   data_page);
4540 +                                   data_page, tag);
4541         else if (flags & MS_BIND)
4542 -               retval = do_loopback(&path, dev_name, flags & MS_REC);
4543 +               retval = do_loopback(&path, dev_name, tag, flags, mnt_flags);
4544         else if (flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE))
4545                 retval = do_change_type(&path, flags);
4546         else if (flags & MS_MOVE)
4547 @@ -2967,6 +2991,7 @@ struct mnt_namespace *copy_mnt_ns(unsign
4548                         p = next_mnt(p, old);
4549         }
4550         namespace_unlock();
4551 +       atomic_inc(&vs_global_mnt_ns);
4552
4553         if (rootmnt)
4554                 mntput(rootmnt);
4555 @@ -3142,9 +3167,10 @@ SYSCALL_DEFINE2(pivot_root, const char _
4556         new_mnt = real_mount(new.mnt);
4557         root_mnt = real_mount(root.mnt);
4558         old_mnt = real_mount(old.mnt);
4559 -       if (IS_MNT_SHARED(old_mnt) ||
4560 +       if ((IS_MNT_SHARED(old_mnt) ||
4561                 IS_MNT_SHARED(new_mnt->mnt_parent) ||
4562 -               IS_MNT_SHARED(root_mnt->mnt_parent))
4563 +               IS_MNT_SHARED(root_mnt->mnt_parent)) &&
4564 +               !vx_flags(VXF_STATE_SETUP, 0))
4565                 goto out4;
4566         if (!check_mnt(root_mnt) || !check_mnt(new_mnt))
4567                 goto out4;
4568 @@ -3282,6 +3308,7 @@ void put_mnt_ns(struct mnt_namespace *ns
4569         if (!atomic_dec_and_test(&ns->count))
4570                 return;
4571         drop_collected_mounts(&ns->root->mnt);
4572 +       atomic_dec(&vs_global_mnt_ns);
4573         free_mnt_ns(ns);
4574  }
4575
4576 diff -NurpP --minimal linux-4.9.135/fs/nfs/client.c linux-4.9.135-vs2.3.9.8/fs/nfs/client.c
4577 --- linux-4.9.135/fs/nfs/client.c       2016-12-11 19:17:54.000000000 +0000
4578 +++ linux-4.9.135-vs2.3.9.8/fs/nfs/client.c     2018-10-20 04:58:14.000000000 +0000
4579 @@ -586,6 +586,9 @@ int nfs_init_server_rpcclient(struct nfs
4580         if (server->flags & NFS_MOUNT_SOFT)
4581                 server->client->cl_softrtry = 1;
4582
4583 +       server->client->cl_tag = 0;
4584 +       if (server->flags & NFS_MOUNT_TAGGED)
4585 +               server->client->cl_tag = 1;
4586         return 0;
4587  }
4588  EXPORT_SYMBOL_GPL(nfs_init_server_rpcclient);
4589 @@ -762,6 +765,10 @@ static void nfs_server_set_fsinfo(struct
4590                 server->acdirmin = server->acdirmax = 0;
4591         }
4592
4593 +       /* FIXME: needs fsinfo
4594 +       if (server->flags & NFS_MOUNT_TAGGED)
4595 +               sb->s_flags |= MS_TAGGED;       */
4596 +
4597         server->maxfilesize = fsinfo->maxfilesize;
4598
4599         server->time_delta = fsinfo->time_delta;
4600 diff -NurpP --minimal linux-4.9.135/fs/nfs/dir.c linux-4.9.135-vs2.3.9.8/fs/nfs/dir.c
4601 --- linux-4.9.135/fs/nfs/dir.c  2018-10-20 10:39:17.000000000 +0000
4602 +++ linux-4.9.135-vs2.3.9.8/fs/nfs/dir.c        2018-10-20 04:58:14.000000000 +0000
4603 @@ -37,6 +37,7 @@
4604  #include <linux/sched.h>
4605  #include <linux/kmemleak.h>
4606  #include <linux/xattr.h>
4607 +#include <linux/vs_tag.h>
4608
4609  #include "delegation.h"
4610  #include "iostat.h"
4611 @@ -1420,6 +1421,7 @@ struct dentry *nfs_lookup(struct inode *
4612         /* Success: notify readdir to use READDIRPLUS */
4613         nfs_advise_use_readdirplus(dir);
4614
4615 +       dx_propagate_tag(nd, inode);
4616  no_entry:
4617         res = d_splice_alias(inode, dentry);
4618         if (res != NULL) {
4619 diff -NurpP --minimal linux-4.9.135/fs/nfs/inode.c linux-4.9.135-vs2.3.9.8/fs/nfs/inode.c
4620 --- linux-4.9.135/fs/nfs/inode.c        2018-10-20 10:39:17.000000000 +0000
4621 +++ linux-4.9.135-vs2.3.9.8/fs/nfs/inode.c      2018-10-20 04:58:14.000000000 +0000
4622 @@ -38,6 +38,7 @@
4623  #include <linux/slab.h>
4624  #include <linux/compat.h>
4625  #include <linux/freezer.h>
4626 +#include <linux/vs_tag.h>
4627
4628  #include <asm/uaccess.h>
4629
4630 @@ -383,6 +384,8 @@ nfs_fhget(struct super_block *sb, struct
4631         if (inode->i_state & I_NEW) {
4632                 struct nfs_inode *nfsi = NFS_I(inode);
4633                 unsigned long now = jiffies;
4634 +               kuid_t kuid;
4635 +               kgid_t kgid;
4636
4637                 /* We set i_ino for the few things that still rely on it,
4638                  * such as stat(2) */
4639 @@ -427,8 +430,8 @@ nfs_fhget(struct super_block *sb, struct
4640                 inode->i_version = 0;
4641                 inode->i_size = 0;
4642                 clear_nlink(inode);
4643 -               inode->i_uid = make_kuid(&init_user_ns, -2);
4644 -               inode->i_gid = make_kgid(&init_user_ns, -2);
4645 +               kuid = make_kuid(&init_user_ns, -2);
4646 +               kgid = make_kgid(&init_user_ns, -2);
4647                 inode->i_blocks = 0;
4648                 memset(nfsi->cookieverf, 0, sizeof(nfsi->cookieverf));
4649                 nfsi->write_io = 0;
4650 @@ -463,11 +466,11 @@ nfs_fhget(struct super_block *sb, struct
4651                 else if (nfs_server_capable(inode, NFS_CAP_NLINK))
4652                         nfs_set_cache_invalid(inode, NFS_INO_INVALID_ATTR);
4653                 if (fattr->valid & NFS_ATTR_FATTR_OWNER)
4654 -                       inode->i_uid = fattr->uid;
4655 +                       kuid = fattr->uid;
4656                 else if (nfs_server_capable(inode, NFS_CAP_OWNER))
4657                         nfs_set_cache_invalid(inode, NFS_INO_INVALID_ATTR);
4658                 if (fattr->valid & NFS_ATTR_FATTR_GROUP)
4659 -                       inode->i_gid = fattr->gid;
4660 +                       kgid = fattr->gid;
4661                 else if (nfs_server_capable(inode, NFS_CAP_OWNER_GROUP))
4662                         nfs_set_cache_invalid(inode, NFS_INO_INVALID_ATTR);
4663                 if (fattr->valid & NFS_ATTR_FATTR_BLOCKS_USED)
4664 @@ -478,6 +481,10 @@ nfs_fhget(struct super_block *sb, struct
4665                          */
4666                         inode->i_blocks = nfs_calc_block_size(fattr->du.nfs3.used);
4667                 }
4668 +               inode->i_uid = INOTAG_KUID(DX_TAG(inode), kuid, kgid);
4669 +               inode->i_gid = INOTAG_KGID(DX_TAG(inode), kuid, kgid);
4670 +               inode->i_tag = INOTAG_KTAG(DX_TAG(inode), kuid, kgid, GLOBAL_ROOT_TAG);
4671 +                               /* maybe fattr->xid someday */
4672
4673                 nfs_setsecurity(inode, fattr, label);
4674
4675 @@ -619,6 +626,8 @@ void nfs_setattr_update_inode(struct ino
4676                         inode->i_uid = attr->ia_uid;
4677                 if ((attr->ia_valid & ATTR_GID) != 0)
4678                         inode->i_gid = attr->ia_gid;
4679 +               if ((attr->ia_valid & ATTR_TAG) && IS_TAGGED(inode))
4680 +                       inode->i_tag = attr->ia_tag;
4681                 nfs_set_cache_invalid(inode, NFS_INO_INVALID_ACCESS
4682                                 | NFS_INO_INVALID_ACL);
4683         }
4684 @@ -1272,7 +1281,9 @@ static int nfs_check_inode_attributes(st
4685         struct nfs_inode *nfsi = NFS_I(inode);
4686         loff_t cur_size, new_isize;
4687         unsigned long invalid = 0;
4688 -
4689 +       kuid_t kuid;
4690 +       kgid_t kgid;
4691 +       ktag_t ktag;
4692
4693         if (nfs_have_delegated_attributes(inode))
4694                 return 0;
4695 @@ -1301,13 +1312,18 @@ static int nfs_check_inode_attributes(st
4696                 }
4697         }
4698
4699 +       kuid = INOTAG_KUID(DX_TAG(inode), fattr->uid, fattr->gid);
4700 +       kgid = INOTAG_KGID(DX_TAG(inode), fattr->uid, fattr->gid);
4701 +       ktag = INOTAG_KTAG(DX_TAG(inode), fattr->uid, fattr->gid, GLOBAL_ROOT_TAG);
4702 +
4703         /* Have any file permissions changed? */
4704         if ((fattr->valid & NFS_ATTR_FATTR_MODE) && (inode->i_mode & S_IALLUGO) != (fattr->mode & S_IALLUGO))
4705                 invalid |= NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ACCESS | NFS_INO_INVALID_ACL;
4706 -       if ((fattr->valid & NFS_ATTR_FATTR_OWNER) && !uid_eq(inode->i_uid, fattr->uid))
4707 +       if ((fattr->valid & NFS_ATTR_FATTR_OWNER) && !uid_eq(inode->i_uid, kuid))
4708                 invalid |= NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ACCESS | NFS_INO_INVALID_ACL;
4709 -       if ((fattr->valid & NFS_ATTR_FATTR_GROUP) && !gid_eq(inode->i_gid, fattr->gid))
4710 +       if ((fattr->valid & NFS_ATTR_FATTR_GROUP) && !gid_eq(inode->i_gid, kgid))
4711                 invalid |= NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ACCESS | NFS_INO_INVALID_ACL;
4712 +               /* maybe check for tag too? */
4713
4714         /* Has the link count changed? */
4715         if ((fattr->valid & NFS_ATTR_FATTR_NLINK) && inode->i_nlink != fattr->nlink)
4716 @@ -1666,6 +1682,9 @@ static int nfs_update_inode(struct inode
4717         unsigned long save_cache_validity;
4718         bool have_writers = nfs_file_has_buffered_writers(nfsi);
4719         bool cache_revalidated = true;
4720 +       kuid_t kuid;
4721 +       kgid_t kgid;
4722 +       ktag_t ktag;
4723
4724         dfprintk(VFS, "NFS: %s(%s/%lu fh_crc=0x%08x ct=%d info=0x%x)\n",
4725                         __func__, inode->i_sb->s_id, inode->i_ino,
4726 @@ -1785,6 +1804,9 @@ static int nfs_update_inode(struct inode
4727                 cache_revalidated = false;
4728         }
4729
4730 +       kuid = TAGINO_KUID(DX_TAG(inode), inode->i_uid, inode->i_tag);
4731 +       kgid = TAGINO_KGID(DX_TAG(inode), inode->i_gid, inode->i_tag);
4732 +       ktag = TAGINO_KTAG(DX_TAG(inode), inode->i_tag);
4733
4734         if (fattr->valid & NFS_ATTR_FATTR_ATIME)
4735                 memcpy(&inode->i_atime, &fattr->atime, sizeof(inode->i_atime));
4736 @@ -1839,6 +1861,10 @@ static int nfs_update_inode(struct inode
4737                 cache_revalidated = false;
4738         }
4739
4740 +       inode->i_uid = INOTAG_KUID(DX_TAG(inode), kuid, kgid);
4741 +       inode->i_gid = INOTAG_KGID(DX_TAG(inode), kuid, kgid);
4742 +       inode->i_tag = INOTAG_KTAG(DX_TAG(inode), kuid, kgid, ktag);
4743 +
4744         if (fattr->valid & NFS_ATTR_FATTR_NLINK) {
4745                 if (inode->i_nlink != fattr->nlink) {
4746                         invalid |= NFS_INO_INVALID_ATTR;
4747 diff -NurpP --minimal linux-4.9.135/fs/nfs/nfs3xdr.c linux-4.9.135-vs2.3.9.8/fs/nfs/nfs3xdr.c
4748 --- linux-4.9.135/fs/nfs/nfs3xdr.c      2016-12-11 19:17:54.000000000 +0000
4749 +++ linux-4.9.135-vs2.3.9.8/fs/nfs/nfs3xdr.c    2018-10-20 04:58:14.000000000 +0000
4750 @@ -20,6 +20,7 @@
4751  #include <linux/nfs3.h>
4752  #include <linux/nfs_fs.h>
4753  #include <linux/nfsacl.h>
4754 +#include <linux/vs_tag.h>
4755  #include "internal.h"
4756
4757  #define NFSDBG_FACILITY                NFSDBG_XDR
4758 @@ -558,7 +559,8 @@ static __be32 *xdr_decode_nfstime3(__be3
4759   *             set_mtime       mtime;
4760   *     };
4761   */
4762 -static void encode_sattr3(struct xdr_stream *xdr, const struct iattr *attr)
4763 +static void encode_sattr3(struct xdr_stream *xdr,
4764 +       const struct iattr *attr, int tag)
4765  {
4766         u32 nbytes;
4767         __be32 *p;
4768 @@ -590,15 +592,19 @@ static void encode_sattr3(struct xdr_str
4769         } else
4770                 *p++ = xdr_zero;
4771
4772 -       if (attr->ia_valid & ATTR_UID) {
4773 +       if (attr->ia_valid & ATTR_UID ||
4774 +               (tag && (attr->ia_valid & ATTR_TAG))) {
4775                 *p++ = xdr_one;
4776 -               *p++ = cpu_to_be32(from_kuid(&init_user_ns, attr->ia_uid));
4777 +               *p++ = cpu_to_be32(from_kuid(&init_user_ns,
4778 +                       TAGINO_KUID(tag, attr->ia_uid, attr->ia_tag)));
4779         } else
4780                 *p++ = xdr_zero;
4781
4782 -       if (attr->ia_valid & ATTR_GID) {
4783 +       if (attr->ia_valid & ATTR_GID ||
4784 +               (tag && (attr->ia_valid & ATTR_TAG))) {
4785                 *p++ = xdr_one;
4786 -               *p++ = cpu_to_be32(from_kgid(&init_user_ns, attr->ia_gid));
4787 +               *p++ = cpu_to_be32(from_kgid(&init_user_ns,
4788 +                       TAGINO_KGID(tag, attr->ia_gid, attr->ia_tag)));
4789         } else
4790                 *p++ = xdr_zero;
4791
4792 @@ -887,7 +893,7 @@ static void nfs3_xdr_enc_setattr3args(st
4793                                       const struct nfs3_sattrargs *args)
4794  {
4795         encode_nfs_fh3(xdr, args->fh);
4796 -       encode_sattr3(xdr, args->sattr);
4797 +       encode_sattr3(xdr, args->sattr, req->rq_task->tk_client->cl_tag);
4798         encode_sattrguard3(xdr, args);
4799  }
4800
4801 @@ -1037,13 +1043,13 @@ static void nfs3_xdr_enc_write3args(stru
4802   *     };
4803   */
4804  static void encode_createhow3(struct xdr_stream *xdr,
4805 -                             const struct nfs3_createargs *args)
4806 +       const struct nfs3_createargs *args, int tag)
4807  {
4808         encode_uint32(xdr, args->createmode);
4809         switch (args->createmode) {
4810         case NFS3_CREATE_UNCHECKED:
4811         case NFS3_CREATE_GUARDED:
4812 -               encode_sattr3(xdr, args->sattr);
4813 +               encode_sattr3(xdr, args->sattr, tag);
4814                 break;
4815         case NFS3_CREATE_EXCLUSIVE:
4816                 encode_createverf3(xdr, args->verifier);
4817 @@ -1058,7 +1064,7 @@ static void nfs3_xdr_enc_create3args(str
4818                                      const struct nfs3_createargs *args)
4819  {
4820         encode_diropargs3(xdr, args->fh, args->name, args->len);
4821 -       encode_createhow3(xdr, args);
4822 +       encode_createhow3(xdr, args, req->rq_task->tk_client->cl_tag);
4823  }
4824
4825  /*
4826 @@ -1074,7 +1080,7 @@ static void nfs3_xdr_enc_mkdir3args(stru
4827                                     const struct nfs3_mkdirargs *args)
4828  {
4829         encode_diropargs3(xdr, args->fh, args->name, args->len);
4830 -       encode_sattr3(xdr, args->sattr);
4831 +       encode_sattr3(xdr, args->sattr, req->rq_task->tk_client->cl_tag);
4832  }
4833
4834  /*
4835 @@ -1091,9 +1097,9 @@ static void nfs3_xdr_enc_mkdir3args(stru
4836   *     };
4837   */
4838  static void encode_symlinkdata3(struct xdr_stream *xdr,
4839 -                               const struct nfs3_symlinkargs *args)
4840 +       const struct nfs3_symlinkargs *args, int tag)
4841  {
4842 -       encode_sattr3(xdr, args->sattr);
4843 +       encode_sattr3(xdr, args->sattr, tag);
4844         encode_nfspath3(xdr, args->pages, args->pathlen);
4845  }
4846
4847 @@ -1102,7 +1108,7 @@ static void nfs3_xdr_enc_symlink3args(st
4848                                       const struct nfs3_symlinkargs *args)
4849  {
4850         encode_diropargs3(xdr, args->fromfh, args->fromname, args->fromlen);
4851 -       encode_symlinkdata3(xdr, args);
4852 +       encode_symlinkdata3(xdr, args, req->rq_task->tk_client->cl_tag);
4853         xdr->buf->flags |= XDRBUF_WRITE;
4854  }
4855
4856 @@ -1131,24 +1137,24 @@ static void nfs3_xdr_enc_symlink3args(st
4857   *     };
4858   */
4859  static void encode_devicedata3(struct xdr_stream *xdr,
4860 -                              const struct nfs3_mknodargs *args)
4861 +       const struct nfs3_mknodargs *args, int tag)
4862  {
4863 -       encode_sattr3(xdr, args->sattr);
4864 +       encode_sattr3(xdr, args->sattr, tag);
4865         encode_specdata3(xdr, args->rdev);
4866  }
4867
4868  static void encode_mknoddata3(struct xdr_stream *xdr,
4869 -                             const struct nfs3_mknodargs *args)
4870 +       const struct nfs3_mknodargs *args, int tag)
4871  {
4872         encode_ftype3(xdr, args->type);
4873         switch (args->type) {
4874         case NF3CHR:
4875         case NF3BLK:
4876 -               encode_devicedata3(xdr, args);
4877 +               encode_devicedata3(xdr, args, tag);
4878                 break;
4879         case NF3SOCK:
4880         case NF3FIFO:
4881 -               encode_sattr3(xdr, args->sattr);
4882 +               encode_sattr3(xdr, args->sattr, tag);
4883                 break;
4884         case NF3REG:
4885         case NF3DIR:
4886 @@ -1163,7 +1169,7 @@ static void nfs3_xdr_enc_mknod3args(stru
4887                                     const struct nfs3_mknodargs *args)
4888  {
4889         encode_diropargs3(xdr, args->fh, args->name, args->len);
4890 -       encode_mknoddata3(xdr, args);
4891 +       encode_mknoddata3(xdr, args, req->rq_task->tk_client->cl_tag);
4892  }
4893
4894  /*
4895 diff -NurpP --minimal linux-4.9.135/fs/nfs/super.c linux-4.9.135-vs2.3.9.8/fs/nfs/super.c
4896 --- linux-4.9.135/fs/nfs/super.c        2018-10-20 10:39:17.000000000 +0000
4897 +++ linux-4.9.135-vs2.3.9.8/fs/nfs/super.c      2018-10-20 04:58:14.000000000 +0000
4898 @@ -54,6 +54,7 @@
4899  #include <linux/parser.h>
4900  #include <linux/nsproxy.h>
4901  #include <linux/rcupdate.h>
4902 +#include <linux/vs_tag.h>
4903
4904  #include <asm/uaccess.h>
4905
4906 @@ -102,6 +103,7 @@ enum {
4907         Opt_mountport,
4908         Opt_mountvers,
4909         Opt_minorversion,
4910 +       Opt_tagid,
4911
4912         /* Mount options that take string arguments */
4913         Opt_nfsvers,
4914 @@ -114,6 +116,9 @@ enum {
4915         /* Special mount options */
4916         Opt_userspace, Opt_deprecated, Opt_sloppy,
4917
4918 +       /* Linux-VServer tagging options */
4919 +       Opt_tag, Opt_notag,
4920 +
4921         Opt_err
4922  };
4923
4924 @@ -183,6 +188,10 @@ static const match_table_t nfs_mount_opt
4925         { Opt_fscache_uniq, "fsc=%s" },
4926         { Opt_local_lock, "local_lock=%s" },
4927
4928 +       { Opt_tag, "tag" },
4929 +       { Opt_notag, "notag" },
4930 +       { Opt_tagid, "tagid=%u" },
4931 +
4932         /* The following needs to be listed after all other options */
4933         { Opt_nfsvers, "v%s" },
4934
4935 @@ -644,6 +653,7 @@ static void nfs_show_mount_options(struc
4936                 { NFS_MOUNT_NORDIRPLUS, ",nordirplus", "" },
4937                 { NFS_MOUNT_UNSHARED, ",nosharecache", "" },
4938                 { NFS_MOUNT_NORESVPORT, ",noresvport", "" },
4939 +               { NFS_MOUNT_TAGGED, ",tag", "" },
4940                 { 0, NULL, NULL }
4941         };
4942         const struct proc_nfs_info *nfs_infop;
4943 @@ -1341,6 +1351,14 @@ static int nfs_parse_mount_options(char
4944                 case Opt_nomigration:
4945                         mnt->options &= ~NFS_OPTION_MIGRATION;
4946                         break;
4947 +#ifndef CONFIG_TAGGING_NONE
4948 +               case Opt_tag:
4949 +                       mnt->flags |= NFS_MOUNT_TAGGED;
4950 +                       break;
4951 +               case Opt_notag:
4952 +                       mnt->flags &= ~NFS_MOUNT_TAGGED;
4953 +                       break;
4954 +#endif
4955
4956                 /*
4957                  * options that take numeric values
4958 @@ -1427,6 +1445,12 @@ static int nfs_parse_mount_options(char
4959                                 goto out_invalid_value;
4960                         mnt->minorversion = option;
4961                         break;
4962 +#ifdef CONFIG_PROPAGATE
4963 +               case Opt_tagid:
4964 +                       /* use args[0] */
4965 +                       nfs_data.flags |= NFS_MOUNT_TAGGED;
4966 +                       break;
4967 +#endif
4968
4969                 /*
4970                  * options that take text values
4971 diff -NurpP --minimal linux-4.9.135/fs/nfsd/auth.c linux-4.9.135-vs2.3.9.8/fs/nfsd/auth.c
4972 --- linux-4.9.135/fs/nfsd/auth.c        2018-10-20 10:39:18.000000000 +0000
4973 +++ linux-4.9.135-vs2.3.9.8/fs/nfsd/auth.c      2018-10-20 04:58:14.000000000 +0000
4974 @@ -1,6 +1,7 @@
4975  /* Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> */
4976
4977  #include <linux/sched.h>
4978 +#include <linux/vs_tag.h>
4979  #include "nfsd.h"
4980  #include "auth.h"
4981
4982 @@ -35,6 +36,9 @@ int nfsd_setuser(struct svc_rqst *rqstp,
4983
4984         new->fsuid = rqstp->rq_cred.cr_uid;
4985         new->fsgid = rqstp->rq_cred.cr_gid;
4986 +       /* FIXME: this desperately needs a tag :)
4987 +       new->xid = (vxid_t)INOTAG_TAG(DX_TAG_NFSD, cred.cr_uid, cred.cr_gid, 0);
4988 +                       */
4989
4990         rqgi = rqstp->rq_cred.cr_group_info;
4991
4992 diff -NurpP --minimal linux-4.9.135/fs/nfsd/nfs3xdr.c linux-4.9.135-vs2.3.9.8/fs/nfsd/nfs3xdr.c
4993 --- linux-4.9.135/fs/nfsd/nfs3xdr.c     2018-10-20 10:39:18.000000000 +0000
4994 +++ linux-4.9.135-vs2.3.9.8/fs/nfsd/nfs3xdr.c   2018-10-20 04:58:14.000000000 +0000
4995 @@ -8,6 +8,7 @@
4996
4997  #include <linux/namei.h>
4998  #include <linux/sunrpc/svc_xprt.h>
4999 +#include <linux/vs_tag.h>
5000  #include "xdr3.h"
5001  #include "auth.h"
5002  #include "netns.h"
5003 @@ -98,6 +99,8 @@ static __be32 *
5004  decode_sattr3(__be32 *p, struct iattr *iap)
5005  {
5006         u32     tmp;
5007 +       kuid_t  kuid = GLOBAL_ROOT_UID;
5008 +       kgid_t  kgid = GLOBAL_ROOT_GID;
5009
5010         iap->ia_valid = 0;
5011
5012 @@ -106,15 +109,18 @@ decode_sattr3(__be32 *p, struct iattr *i
5013                 iap->ia_mode = ntohl(*p++);
5014         }
5015         if (*p++) {
5016 -               iap->ia_uid = make_kuid(&init_user_ns, ntohl(*p++));
5017 +               kuid = make_kuid(&init_user_ns, ntohl(*p++));
5018                 if (uid_valid(iap->ia_uid))
5019                         iap->ia_valid |= ATTR_UID;
5020         }
5021         if (*p++) {
5022 -               iap->ia_gid = make_kgid(&init_user_ns, ntohl(*p++));
5023 +               kgid = make_kgid(&init_user_ns, ntohl(*p++));
5024                 if (gid_valid(iap->ia_gid))
5025                         iap->ia_valid |= ATTR_GID;
5026         }
5027 +       iap->ia_uid = INOTAG_KUID(DX_TAG_NFSD, kuid, kgid);
5028 +       iap->ia_gid = INOTAG_KGID(DX_TAG_NFSD, kuid, kgid);
5029 +       iap->ia_tag = INOTAG_KTAG(DX_TAG_NFSD, kuid, kgid, GLOBAL_ROOT_TAG);
5030         if (*p++) {
5031                 u64     newsize;
5032
5033 @@ -167,8 +173,12 @@ encode_fattr3(struct svc_rqst *rqstp, __
5034         *p++ = htonl(nfs3_ftypes[(stat->mode & S_IFMT) >> 12]);
5035         *p++ = htonl((u32) (stat->mode & S_IALLUGO));
5036         *p++ = htonl((u32) stat->nlink);
5037 -       *p++ = htonl((u32) from_kuid(&init_user_ns, stat->uid));
5038 -       *p++ = htonl((u32) from_kgid(&init_user_ns, stat->gid));
5039 +       *p++ = htonl((u32) from_kuid(&init_user_ns,
5040 +               TAGINO_KUID(0 /* FIXME: DX_TAG(dentry->d_inode) */,
5041 +               stat->uid, stat->tag)));
5042 +       *p++ = htonl((u32) from_kgid(&init_user_ns,
5043 +               TAGINO_KGID(0 /* FIXME: DX_TAG(dentry->d_inode) */,
5044 +               stat->gid, stat->tag)));
5045         if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
5046                 p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
5047         } else {
5048 diff -NurpP --minimal linux-4.9.135/fs/nfsd/nfs4xdr.c linux-4.9.135-vs2.3.9.8/fs/nfsd/nfs4xdr.c
5049 --- linux-4.9.135/fs/nfsd/nfs4xdr.c     2018-10-20 10:39:18.000000000 +0000
5050 +++ linux-4.9.135-vs2.3.9.8/fs/nfsd/nfs4xdr.c   2018-10-20 05:55:43.000000000 +0000
5051 @@ -40,6 +40,7 @@
5052  #include <linux/utsname.h>
5053  #include <linux/pagemap.h>
5054  #include <linux/sunrpc/svcauth_gss.h>
5055 +#include <linux/vs_tag.h>
5056
5057  #include "idmap.h"
5058  #include "acl.h"
5059 @@ -2679,12 +2680,16 @@ out_acl:
5060                 *p++ = cpu_to_be32(stat.nlink);
5061         }
5062         if (bmval1 & FATTR4_WORD1_OWNER) {
5063 -               status = nfsd4_encode_user(xdr, rqstp, stat.uid);
5064 +               status = nfsd4_encode_user(xdr, rqstp,
5065 +                       TAGINO_KUID(DX_TAG(dentry->d_inode),
5066 +                               stat.uid, stat.tag));
5067                 if (status)
5068                         goto out;
5069         }
5070         if (bmval1 & FATTR4_WORD1_OWNER_GROUP) {
5071 -               status = nfsd4_encode_group(xdr, rqstp, stat.gid);
5072 +               status = nfsd4_encode_group(xdr, rqstp,
5073 +                       TAGINO_KGID(DX_TAG(dentry->d_inode),
5074 +                               stat.gid, stat.tag));
5075                 if (status)
5076                         goto out;
5077         }
5078 diff -NurpP --minimal linux-4.9.135/fs/nfsd/nfsxdr.c linux-4.9.135-vs2.3.9.8/fs/nfsd/nfsxdr.c
5079 --- linux-4.9.135/fs/nfsd/nfsxdr.c      2018-10-20 10:39:18.000000000 +0000
5080 +++ linux-4.9.135-vs2.3.9.8/fs/nfsd/nfsxdr.c    2018-10-20 04:58:14.000000000 +0000
5081 @@ -7,6 +7,7 @@
5082  #include "vfs.h"
5083  #include "xdr.h"
5084  #include "auth.h"
5085 +#include <linux/vs_tag.h>
5086
5087  #define NFSDDBG_FACILITY               NFSDDBG_XDR
5088
5089 @@ -89,6 +90,8 @@ static __be32 *
5090  decode_sattr(__be32 *p, struct iattr *iap)
5091  {
5092         u32     tmp, tmp1;
5093 +       kuid_t  kuid = GLOBAL_ROOT_UID;
5094 +       kgid_t  kgid = GLOBAL_ROOT_GID;
5095
5096         iap->ia_valid = 0;
5097
5098 @@ -101,15 +104,18 @@ decode_sattr(__be32 *p, struct iattr *ia
5099                 iap->ia_mode = tmp;
5100         }
5101         if ((tmp = ntohl(*p++)) != (u32)-1) {
5102 -               iap->ia_uid = make_kuid(&init_user_ns, tmp);
5103 +               kuid = make_kuid(&init_user_ns, tmp);
5104                 if (uid_valid(iap->ia_uid))
5105                         iap->ia_valid |= ATTR_UID;
5106         }
5107         if ((tmp = ntohl(*p++)) != (u32)-1) {
5108 -               iap->ia_gid = make_kgid(&init_user_ns, tmp);
5109 +               kgid = make_kgid(&init_user_ns, tmp);
5110                 if (gid_valid(iap->ia_gid))
5111                         iap->ia_valid |= ATTR_GID;
5112         }
5113 +       iap->ia_uid = INOTAG_KUID(DX_TAG_NFSD, kuid, kgid);
5114 +       iap->ia_gid = INOTAG_KGID(DX_TAG_NFSD, kuid, kgid);
5115 +       iap->ia_tag = INOTAG_KTAG(DX_TAG_NFSD, kuid, kgid, GLOBAL_ROOT_TAG);
5116         if ((tmp = ntohl(*p++)) != (u32)-1) {
5117                 iap->ia_valid |= ATTR_SIZE;
5118                 iap->ia_size = tmp;
5119 @@ -154,8 +160,10 @@ encode_fattr(struct svc_rqst *rqstp, __b
5120         *p++ = htonl(nfs_ftypes[type >> 12]);
5121         *p++ = htonl((u32) stat->mode);
5122         *p++ = htonl((u32) stat->nlink);
5123 -       *p++ = htonl((u32) from_kuid(&init_user_ns, stat->uid));
5124 -       *p++ = htonl((u32) from_kgid(&init_user_ns, stat->gid));
5125 +       *p++ = htonl((u32) from_kuid(&init_user_ns,
5126 +               TAGINO_KUID(DX_TAG(dentry->d_inode), stat->uid, stat->tag)));
5127 +       *p++ = htonl((u32) from_kgid(&init_user_ns,
5128 +               TAGINO_KGID(DX_TAG(dentry->d_inode), stat->gid, stat->tag)));
5129
5130         if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
5131                 *p++ = htonl(NFS_MAXPATHLEN);
5132 diff -NurpP --minimal linux-4.9.135/fs/ocfs2/dlmglue.c linux-4.9.135-vs2.3.9.8/fs/ocfs2/dlmglue.c
5133 --- linux-4.9.135/fs/ocfs2/dlmglue.c    2018-10-20 10:39:18.000000000 +0000
5134 +++ linux-4.9.135-vs2.3.9.8/fs/ocfs2/dlmglue.c  2018-10-20 04:58:14.000000000 +0000
5135 @@ -2120,6 +2120,7 @@ static void __ocfs2_stuff_meta_lvb(struc
5136         lvb->lvb_iclusters = cpu_to_be32(oi->ip_clusters);
5137         lvb->lvb_iuid      = cpu_to_be32(i_uid_read(inode));
5138         lvb->lvb_igid      = cpu_to_be32(i_gid_read(inode));
5139 +       lvb->lvb_itag      = cpu_to_be16(i_tag_read(inode));
5140         lvb->lvb_imode     = cpu_to_be16(inode->i_mode);
5141         lvb->lvb_inlink    = cpu_to_be16(inode->i_nlink);
5142         lvb->lvb_iatime_packed  =
5143 @@ -2170,6 +2171,7 @@ static void ocfs2_refresh_inode_from_lvb
5144
5145         i_uid_write(inode, be32_to_cpu(lvb->lvb_iuid));
5146         i_gid_write(inode, be32_to_cpu(lvb->lvb_igid));
5147 +       i_tag_write(inode, be16_to_cpu(lvb->lvb_itag));
5148         inode->i_mode    = be16_to_cpu(lvb->lvb_imode);
5149         set_nlink(inode, be16_to_cpu(lvb->lvb_inlink));
5150         ocfs2_unpack_timespec(&inode->i_atime,
5151 diff -NurpP --minimal linux-4.9.135/fs/ocfs2/dlmglue.h linux-4.9.135-vs2.3.9.8/fs/ocfs2/dlmglue.h
5152 --- linux-4.9.135/fs/ocfs2/dlmglue.h    2018-10-20 10:39:18.000000000 +0000
5153 +++ linux-4.9.135-vs2.3.9.8/fs/ocfs2/dlmglue.h  2018-10-20 04:58:14.000000000 +0000
5154 @@ -46,7 +46,8 @@ struct ocfs2_meta_lvb {
5155         __be16       lvb_inlink;
5156         __be32       lvb_iattr;
5157         __be32       lvb_igeneration;
5158 -       __be32       lvb_reserved2;
5159 +       __be16       lvb_itag;
5160 +       __be16       lvb_reserved2;
5161  };
5162
5163  #define OCFS2_QINFO_LVB_VERSION 1
5164 diff -NurpP --minimal linux-4.9.135/fs/ocfs2/file.c linux-4.9.135-vs2.3.9.8/fs/ocfs2/file.c
5165 --- linux-4.9.135/fs/ocfs2/file.c       2018-10-20 10:39:18.000000000 +0000
5166 +++ linux-4.9.135-vs2.3.9.8/fs/ocfs2/file.c     2018-10-20 04:58:14.000000000 +0000
5167 @@ -1151,7 +1151,7 @@ int ocfs2_setattr(struct dentry *dentry,
5168                 attr->ia_valid &= ~ATTR_SIZE;
5169
5170  #define OCFS2_VALID_ATTRS (ATTR_ATIME | ATTR_MTIME | ATTR_CTIME | ATTR_SIZE \
5171 -                          | ATTR_GID | ATTR_UID | ATTR_MODE)
5172 +                          | ATTR_GID | ATTR_UID | ATTR_TAG | ATTR_MODE)
5173         if (!(attr->ia_valid & OCFS2_VALID_ATTRS))
5174                 return 0;
5175
5176 diff -NurpP --minimal linux-4.9.135/fs/ocfs2/inode.c linux-4.9.135-vs2.3.9.8/fs/ocfs2/inode.c
5177 --- linux-4.9.135/fs/ocfs2/inode.c      2016-12-11 19:17:54.000000000 +0000
5178 +++ linux-4.9.135-vs2.3.9.8/fs/ocfs2/inode.c    2018-10-20 04:58:14.000000000 +0000
5179 @@ -28,6 +28,7 @@
5180  #include <linux/highmem.h>
5181  #include <linux/pagemap.h>
5182  #include <linux/quotaops.h>
5183 +#include <linux/vs_tag.h>
5184
5185  #include <asm/byteorder.h>
5186
5187 @@ -87,11 +88,13 @@ void ocfs2_set_inode_flags(struct inode
5188  {
5189         unsigned int flags = OCFS2_I(inode)->ip_attr;
5190
5191 -       inode->i_flags &= ~(S_IMMUTABLE |
5192 +       inode->i_flags &= ~(S_IMMUTABLE | S_IXUNLINK |
5193                 S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
5194
5195         if (flags & OCFS2_IMMUTABLE_FL)
5196                 inode->i_flags |= S_IMMUTABLE;
5197 +       if (flags & OCFS2_IXUNLINK_FL)
5198 +               inode->i_flags |= S_IXUNLINK;
5199
5200         if (flags & OCFS2_SYNC_FL)
5201                 inode->i_flags |= S_SYNC;
5202 @@ -101,25 +104,44 @@ void ocfs2_set_inode_flags(struct inode
5203                 inode->i_flags |= S_NOATIME;
5204         if (flags & OCFS2_DIRSYNC_FL)
5205                 inode->i_flags |= S_DIRSYNC;
5206 +
5207 +       inode->i_vflags &= ~(V_BARRIER | V_COW);
5208 +
5209 +       if (flags & OCFS2_BARRIER_FL)
5210 +               inode->i_vflags |= V_BARRIER;
5211 +       if (flags & OCFS2_COW_FL)
5212 +               inode->i_vflags |= V_COW;
5213  }
5214
5215  /* Propagate flags from i_flags to OCFS2_I(inode)->ip_attr */
5216  void ocfs2_get_inode_flags(struct ocfs2_inode_info *oi)
5217  {
5218         unsigned int flags = oi->vfs_inode.i_flags;
5219 +       unsigned int vflags = oi->vfs_inode.i_vflags;
5220 +
5221 +       oi->ip_attr &= ~(OCFS2_SYNC_FL | OCFS2_APPEND_FL |
5222 +                       OCFS2_IMMUTABLE_FL | OCFS2_IXUNLINK_FL |
5223 +                       OCFS2_NOATIME_FL | OCFS2_DIRSYNC_FL |
5224 +                       OCFS2_BARRIER_FL | OCFS2_COW_FL);
5225 +
5226 +       if (flags & S_IMMUTABLE)
5227 +               oi->ip_attr |= OCFS2_IMMUTABLE_FL;
5228 +       if (flags & S_IXUNLINK)
5229 +               oi->ip_attr |= OCFS2_IXUNLINK_FL;
5230
5231 -       oi->ip_attr &= ~(OCFS2_SYNC_FL|OCFS2_APPEND_FL|
5232 -                       OCFS2_IMMUTABLE_FL|OCFS2_NOATIME_FL|OCFS2_DIRSYNC_FL);
5233         if (flags & S_SYNC)
5234                 oi->ip_attr |= OCFS2_SYNC_FL;
5235         if (flags & S_APPEND)
5236                 oi->ip_attr |= OCFS2_APPEND_FL;
5237 -       if (flags & S_IMMUTABLE)
5238 -               oi->ip_attr |= OCFS2_IMMUTABLE_FL;
5239         if (flags & S_NOATIME)
5240                 oi->ip_attr |= OCFS2_NOATIME_FL;
5241         if (flags & S_DIRSYNC)
5242                 oi->ip_attr |= OCFS2_DIRSYNC_FL;
5243 +
5244 +       if (vflags & V_BARRIER)
5245 +               oi->ip_attr |= OCFS2_BARRIER_FL;
5246 +       if (vflags & V_COW)
5247 +               oi->ip_attr |= OCFS2_COW_FL;
5248  }
5249
5250  struct inode *ocfs2_ilookup(struct super_block *sb, u64 blkno)
5251 @@ -278,6 +300,8 @@ void ocfs2_populate_inode(struct inode *
5252         struct super_block *sb;
5253         struct ocfs2_super *osb;
5254         int use_plocks = 1;
5255 +       uid_t uid;
5256 +       gid_t gid;
5257
5258         sb = inode->i_sb;
5259         osb = OCFS2_SB(sb);
5260 @@ -306,8 +330,12 @@ void ocfs2_populate_inode(struct inode *
5261         inode->i_generation = le32_to_cpu(fe->i_generation);
5262         inode->i_rdev = huge_decode_dev(le64_to_cpu(fe->id1.dev1.i_rdev));
5263         inode->i_mode = le16_to_cpu(fe->i_mode);
5264 -       i_uid_write(inode, le32_to_cpu(fe->i_uid));
5265 -       i_gid_write(inode, le32_to_cpu(fe->i_gid));
5266 +       uid = le32_to_cpu(fe->i_uid);
5267 +       gid = le32_to_cpu(fe->i_gid);
5268 +       i_uid_write(inode, INOTAG_UID(DX_TAG(inode), uid, gid));
5269 +       i_gid_write(inode, INOTAG_GID(DX_TAG(inode), uid, gid));
5270 +       i_tag_write(inode, INOTAG_TAG(DX_TAG(inode), uid, gid,
5271 +               /* le16_to_cpu(raw_inode->i_raw_tag) */ 0));
5272
5273         /* Fast symlinks will have i_size but no allocated clusters. */
5274         if (S_ISLNK(inode->i_mode) && !fe->i_clusters) {
5275 diff -NurpP --minimal linux-4.9.135/fs/ocfs2/inode.h linux-4.9.135-vs2.3.9.8/fs/ocfs2/inode.h
5276 --- linux-4.9.135/fs/ocfs2/inode.h      2016-12-11 19:17:54.000000000 +0000
5277 +++ linux-4.9.135-vs2.3.9.8/fs/ocfs2/inode.h    2018-10-20 04:58:14.000000000 +0000
5278 @@ -155,6 +155,7 @@ int ocfs2_mark_inode_dirty(handle_t *han
5279
5280  void ocfs2_set_inode_flags(struct inode *inode);
5281  void ocfs2_get_inode_flags(struct ocfs2_inode_info *oi);
5282 +int ocfs2_sync_flags(struct inode *inode, int, int);
5283
5284  static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
5285  {
5286 diff -NurpP --minimal linux-4.9.135/fs/ocfs2/ioctl.c linux-4.9.135-vs2.3.9.8/fs/ocfs2/ioctl.c
5287 --- linux-4.9.135/fs/ocfs2/ioctl.c      2016-12-11 19:17:54.000000000 +0000
5288 +++ linux-4.9.135-vs2.3.9.8/fs/ocfs2/ioctl.c    2018-10-20 04:58:14.000000000 +0000
5289 @@ -76,7 +76,41 @@ static int ocfs2_get_inode_attr(struct i
5290         return status;
5291  }
5292
5293 -static int ocfs2_set_inode_attr(struct inode *inode, unsigned flags,
5294 +int ocfs2_sync_flags(struct inode *inode, int flags, int vflags)
5295 +{
5296 +       struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
5297 +       struct buffer_head *bh = NULL;
5298 +       handle_t *handle = NULL;
5299 +       int status;
5300 +
5301 +       status = ocfs2_inode_lock(inode, &bh, 1);
5302 +       if (status < 0) {
5303 +               mlog_errno(status);
5304 +               return status;
5305 +       }
5306 +       handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);
5307 +       if (IS_ERR(handle)) {
5308 +               status = PTR_ERR(handle);
5309 +               mlog_errno(status);
5310 +               goto bail_unlock;
5311 +       }
5312 +
5313 +       inode->i_flags = flags;
5314 +       inode->i_vflags = vflags;
5315 +       ocfs2_get_inode_flags(OCFS2_I(inode));
5316 +
5317 +       status = ocfs2_mark_inode_dirty(handle, inode, bh);
5318 +       if (status < 0)
5319 +               mlog_errno(status);
5320 +
5321 +       ocfs2_commit_trans(osb, handle);
5322 +bail_unlock:
5323 +       ocfs2_inode_unlock(inode, 1);
5324 +       brelse(bh);
5325 +       return status;
5326 +}
5327 +
5328 +int ocfs2_set_inode_attr(struct inode *inode, unsigned flags,
5329                                 unsigned mask)
5330  {
5331         struct ocfs2_inode_info *ocfs2_inode = OCFS2_I(inode);
5332 @@ -116,6 +150,11 @@ static int ocfs2_set_inode_attr(struct i
5333                         goto bail_unlock;
5334         }
5335
5336 +       if (IS_BARRIER(inode)) {
5337 +               vxwprintk_task(1, "messing with the barrier.");
5338 +               goto bail_unlock;
5339 +       }
5340 +
5341         handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);
5342         if (IS_ERR(handle)) {
5343                 status = PTR_ERR(handle);
5344 @@ -839,6 +878,7 @@ bail:
5345         return status;
5346  }
5347
5348 +
5349  long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
5350  {
5351         struct inode *inode = file_inode(filp);
5352 diff -NurpP --minimal linux-4.9.135/fs/ocfs2/namei.c linux-4.9.135-vs2.3.9.8/fs/ocfs2/namei.c
5353 --- linux-4.9.135/fs/ocfs2/namei.c      2016-12-11 19:17:54.000000000 +0000
5354 +++ linux-4.9.135-vs2.3.9.8/fs/ocfs2/namei.c    2018-10-20 04:58:14.000000000 +0000
5355 @@ -41,6 +41,7 @@
5356  #include <linux/slab.h>
5357  #include <linux/highmem.h>
5358  #include <linux/quotaops.h>
5359 +#include <linux/vs_tag.h>
5360
5361  #include <cluster/masklog.h>
5362
5363 @@ -516,6 +517,7 @@ static int __ocfs2_mknod_locked(struct i
5364         struct ocfs2_extent_list *fel;
5365         u16 feat;
5366         struct ocfs2_inode_info *oi = OCFS2_I(inode);
5367 +       ktag_t ktag;
5368
5369         *new_fe_bh = NULL;
5370
5371 @@ -553,8 +555,13 @@ static int __ocfs2_mknod_locked(struct i
5372         fe->i_suballoc_loc = cpu_to_le64(suballoc_loc);
5373         fe->i_suballoc_bit = cpu_to_le16(suballoc_bit);
5374         fe->i_suballoc_slot = cpu_to_le16(inode_ac->ac_alloc_slot);
5375 -       fe->i_uid = cpu_to_le32(i_uid_read(inode));
5376 -       fe->i_gid = cpu_to_le32(i_gid_read(inode));
5377 +
5378 +       ktag = make_ktag(&init_user_ns, dx_current_fstag(osb->sb));
5379 +       fe->i_uid = cpu_to_le32(from_kuid(&init_user_ns,
5380 +               TAGINO_KUID(DX_TAG(inode), inode->i_uid, ktag)));
5381 +       fe->i_gid = cpu_to_le32(from_kgid(&init_user_ns,
5382 +               TAGINO_KGID(DX_TAG(inode), inode->i_gid, ktag)));
5383 +       inode->i_tag = ktag; /* is this correct? */
5384         fe->i_mode = cpu_to_le16(inode->i_mode);
5385         if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))
5386                 fe->id1.dev1.i_rdev = cpu_to_le64(huge_encode_dev(dev));
5387 diff -NurpP --minimal linux-4.9.135/fs/ocfs2/ocfs2.h linux-4.9.135-vs2.3.9.8/fs/ocfs2/ocfs2.h
5388 --- linux-4.9.135/fs/ocfs2/ocfs2.h      2018-10-20 10:39:18.000000000 +0000
5389 +++ linux-4.9.135-vs2.3.9.8/fs/ocfs2/ocfs2.h    2018-10-20 04:58:14.000000000 +0000
5390 @@ -289,6 +289,7 @@ enum ocfs2_mount_options
5391         OCFS2_MOUNT_JOURNAL_ASYNC_COMMIT = 1 << 15,  /* Journal Async Commit */
5392         OCFS2_MOUNT_ERRORS_CONT = 1 << 16, /* Return EIO to the calling process on error */
5393         OCFS2_MOUNT_ERRORS_ROFS = 1 << 17, /* Change filesystem to read-only on error */
5394 +       OCFS2_MOUNT_TAGGED = 1 << 18, /* use tagging */
5395  };
5396
5397  #define OCFS2_OSB_SOFT_RO      0x0001
5398 diff -NurpP --minimal linux-4.9.135/fs/ocfs2/ocfs2_fs.h linux-4.9.135-vs2.3.9.8/fs/ocfs2/ocfs2_fs.h
5399 --- linux-4.9.135/fs/ocfs2/ocfs2_fs.h   2016-12-11 19:17:54.000000000 +0000
5400 +++ linux-4.9.135-vs2.3.9.8/fs/ocfs2/ocfs2_fs.h 2018-10-20 04:58:14.000000000 +0000
5401 @@ -275,6 +275,11 @@
5402  #define OCFS2_TOPDIR_FL                        FS_TOPDIR_FL    /* Top of directory hierarchies*/
5403  #define OCFS2_RESERVED_FL              FS_RESERVED_FL  /* reserved for ext2 lib */
5404
5405 +#define OCFS2_IXUNLINK_FL              FS_IXUNLINK_FL  /* Immutable invert on unlink */
5406 +
5407 +#define OCFS2_BARRIER_FL               FS_BARRIER_FL   /* Barrier for chroot() */
5408 +#define OCFS2_COW_FL                   FS_COW_FL       /* Copy on Write marker */
5409 +
5410  #define OCFS2_FL_VISIBLE               FS_FL_USER_VISIBLE      /* User visible flags */
5411  #define OCFS2_FL_MODIFIABLE            FS_FL_USER_MODIFIABLE   /* User modifiable flags */
5412
5413 diff -NurpP --minimal linux-4.9.135/fs/ocfs2/super.c linux-4.9.135-vs2.3.9.8/fs/ocfs2/super.c
5414 --- linux-4.9.135/fs/ocfs2/super.c      2018-10-20 10:39:18.000000000 +0000
5415 +++ linux-4.9.135-vs2.3.9.8/fs/ocfs2/super.c    2018-10-20 04:58:14.000000000 +0000
5416 @@ -188,6 +188,7 @@ enum {
5417         Opt_dir_resv_level,
5418         Opt_journal_async_commit,
5419         Opt_err_cont,
5420 +       Opt_tag, Opt_notag, Opt_tagid,
5421         Opt_err,
5422  };
5423
5424 @@ -221,6 +222,9 @@ static const match_table_t tokens = {
5425         {Opt_dir_resv_level, "dir_resv_level=%u"},
5426         {Opt_journal_async_commit, "journal_async_commit"},
5427         {Opt_err_cont, "errors=continue"},
5428 +       {Opt_tag, "tag"},
5429 +       {Opt_notag, "notag"},
5430 +       {Opt_tagid, "tagid=%u"},
5431         {Opt_err, NULL}
5432  };
5433
5434 @@ -672,6 +676,13 @@ static int ocfs2_remount(struct super_bl
5435                 goto out;
5436         }
5437
5438 +       if ((osb->s_mount_opt & OCFS2_MOUNT_TAGGED) !=
5439 +           (parsed_options.mount_opt & OCFS2_MOUNT_TAGGED)) {
5440 +               ret = -EINVAL;
5441 +               mlog(ML_ERROR, "Cannot change tagging on remount\n");
5442 +               goto out;
5443 +       }
5444 +
5445         /* We're going to/from readonly mode. */
5446         if ((*flags & MS_RDONLY) != (sb->s_flags & MS_RDONLY)) {
5447                 /* Disable quota accounting before remounting RO */
5448 @@ -1161,6 +1172,9 @@ static int ocfs2_fill_super(struct super
5449
5450         ocfs2_complete_mount_recovery(osb);
5451
5452 +       if (osb->s_mount_opt & OCFS2_MOUNT_TAGGED)
5453 +               sb->s_flags |= MS_TAGGED;
5454 +
5455         if (ocfs2_mount_local(osb))
5456                 snprintf(nodestr, sizeof(nodestr), "local");
5457         else
5458 @@ -1480,6 +1494,20 @@ static int ocfs2_parse_options(struct su
5459                 case Opt_journal_async_commit:
5460                         mopt->mount_opt |= OCFS2_MOUNT_JOURNAL_ASYNC_COMMIT;
5461                         break;
5462 +#ifndef CONFIG_TAGGING_NONE
5463 +               case Opt_tag:
5464 +                       mopt->mount_opt |= OCFS2_MOUNT_TAGGED;
5465 +                       break;
5466 +               case Opt_notag:
5467 +                       mopt->mount_opt &= ~OCFS2_MOUNT_TAGGED;
5468 +                       break;
5469 +#endif
5470 +#ifdef CONFIG_PROPAGATE
5471 +               case Opt_tagid:
5472 +                       /* use args[0] */
5473 +                       mopt->mount_opt |= OCFS2_MOUNT_TAGGED;
5474 +                       break;
5475 +#endif
5476                 default:
5477                         mlog(ML_ERROR,
5478                              "Unrecognized mount option \"%s\" "
5479 diff -NurpP --minimal linux-4.9.135/fs/open.c linux-4.9.135-vs2.3.9.8/fs/open.c
5480 --- linux-4.9.135/fs/open.c     2018-10-20 10:39:18.000000000 +0000
5481 +++ linux-4.9.135-vs2.3.9.8/fs/open.c   2018-10-20 04:58:14.000000000 +0000
5482 @@ -31,6 +31,11 @@
5483  #include <linux/ima.h>
5484  #include <linux/dnotify.h>
5485  #include <linux/compat.h>
5486 +#include <linux/vs_base.h>
5487 +#include <linux/vs_limit.h>
5488 +#include <linux/vs_tag.h>
5489 +#include <linux/vs_cowbl.h>
5490 +#include <linux/vserver/dlimit.h>
5491
5492  #include "internal.h"
5493
5494 @@ -65,12 +70,17 @@ int do_truncate(struct dentry *dentry, l
5495         return ret;
5496  }
5497
5498 -long vfs_truncate(const struct path *path, loff_t length)
5499 +long vfs_truncate(struct path *path, loff_t length)
5500  {
5501         struct inode *inode;
5502         struct dentry *upperdentry;
5503         long error;
5504
5505 +#ifdef CONFIG_VSERVER_COWBL
5506 +       error = cow_check_and_break(path);
5507 +       if (error)
5508 +               goto out;
5509 +#endif
5510         inode = path->dentry->d_inode;
5511
5512         /* For directories it's -EISDIR, for other non-regulars - -EINVAL */
5513 @@ -565,6 +575,13 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons
5514         unsigned int lookup_flags = LOOKUP_FOLLOW;
5515  retry:
5516         error = user_path_at(dfd, filename, lookup_flags, &path);
5517 +#ifdef CONFIG_VSERVER_COWBL
5518 +       if (!error) {
5519 +               error = cow_check_and_break(&path);
5520 +               if (error)
5521 +                       path_put(&path);
5522 +       }
5523 +#endif
5524         if (!error) {
5525                 error = chmod_common(&path, mode);
5526                 path_put(&path);
5527 @@ -599,13 +616,15 @@ retry_deleg:
5528                 if (!uid_valid(uid))
5529                         return -EINVAL;
5530                 newattrs.ia_valid |= ATTR_UID;
5531 -               newattrs.ia_uid = uid;
5532 +               newattrs.ia_uid = make_kuid(&init_user_ns,
5533 +                       dx_map_uid(user));
5534         }
5535         if (group != (gid_t) -1) {
5536                 if (!gid_valid(gid))
5537                         return -EINVAL;
5538                 newattrs.ia_valid |= ATTR_GID;
5539 -               newattrs.ia_gid = gid;
5540 +               newattrs.ia_gid = make_kgid(&init_user_ns,
5541 +                       dx_map_gid(group));
5542         }
5543         if (!S_ISDIR(inode->i_mode))
5544                 newattrs.ia_valid |=
5545 @@ -643,6 +662,10 @@ retry:
5546         error = mnt_want_write(path.mnt);
5547         if (error)
5548                 goto out_release;
5549 +#ifdef CONFIG_VSERVER_COWBL
5550 +       error = cow_check_and_break(&path);
5551 +       if (!error)
5552 +#endif
5553         error = chown_common(&path, user, group);
5554         mnt_drop_write(path.mnt);
5555  out_release:
5556 diff -NurpP --minimal linux-4.9.135/fs/proc/array.c linux-4.9.135-vs2.3.9.8/fs/proc/array.c
5557 --- linux-4.9.135/fs/proc/array.c       2018-10-20 10:39:18.000000000 +0000
5558 +++ linux-4.9.135-vs2.3.9.8/fs/proc/array.c     2018-10-20 04:58:14.000000000 +0000
5559 @@ -86,6 +86,8 @@
5560  #include <linux/string_helpers.h>
5561  #include <linux/user_namespace.h>
5562  #include <linux/fs_struct.h>
5563 +#include <linux/vs_context.h>
5564 +#include <linux/vs_network.h>
5565
5566  #include <asm/pgtable.h>
5567  #include <asm/processor.h>
5568 @@ -170,6 +172,9 @@ static inline void task_state(struct seq
5569         ppid = pid_alive(p) ?
5570                 task_tgid_nr_ns(rcu_dereference(p->real_parent), ns) : 0;
5571
5572 +       if (unlikely(vx_current_initpid(p->pid)))
5573 +               ppid = 0;
5574 +
5575         tracer = ptrace_parent(p);
5576         if (tracer)
5577                 tpid = task_pid_nr_ns(tracer, ns);
5578 @@ -307,8 +312,8 @@ static inline void task_sig(struct seq_f
5579         render_sigset_t(m, "SigCgt:\t", &caught);
5580  }
5581
5582 -static void render_cap_t(struct seq_file *m, const char *header,
5583 -                       kernel_cap_t *a)
5584 +void render_cap_t(struct seq_file *m, const char *header,
5585 +                       struct vx_info *vxi, kernel_cap_t *a)
5586  {
5587         unsigned __capi;
5588
5589 @@ -335,11 +340,12 @@ static inline void task_cap(struct seq_f
5590         cap_ambient     = cred->cap_ambient;
5591         rcu_read_unlock();
5592
5593 -       render_cap_t(m, "CapInh:\t", &cap_inheritable);
5594 -       render_cap_t(m, "CapPrm:\t", &cap_permitted);
5595 -       render_cap_t(m, "CapEff:\t", &cap_effective);
5596 -       render_cap_t(m, "CapBnd:\t", &cap_bset);
5597 -       render_cap_t(m, "CapAmb:\t", &cap_ambient);
5598 +       /* FIXME: maybe move the p->vx_info masking to __task_cred() ? */
5599 +       render_cap_t(m, "CapInh:\t", p->vx_info, &cap_inheritable);
5600 +       render_cap_t(m, "CapPrm:\t", p->vx_info, &cap_permitted);
5601 +       render_cap_t(m, "CapEff:\t", p->vx_info, &cap_effective);
5602 +       render_cap_t(m, "CapBnd:\t", p->vx_info, &cap_bset);
5603 +       render_cap_t(m, "CapAmb:\t", p->vx_info, &cap_ambient);
5604  }
5605
5606  static inline void task_seccomp(struct seq_file *m, struct task_struct *p)
5607 @@ -390,6 +396,43 @@ static void task_cpus_allowed(struct seq
5608                    cpumask_pr_args(&task->cpus_allowed));
5609  }
5610
5611 +int proc_pid_nsproxy(struct seq_file *m, struct pid_namespace *ns,
5612 +                       struct pid *pid, struct task_struct *task)
5613 +{
5614 +       seq_printf(m,   "Proxy:\t%p(%c)\n"
5615 +                       "Count:\t%u\n"
5616 +                       "uts:\t%p(%c)\n"
5617 +                       "ipc:\t%p(%c)\n"
5618 +                       "mnt:\t%p(%c)\n"
5619 +                       "pid:\t%p(%c)\n"
5620 +                       "net:\t%p(%c)\n",
5621 +                       task->nsproxy,
5622 +                       (task->nsproxy == init_task.nsproxy ? 'I' : '-'),
5623 +                       atomic_read(&task->nsproxy->count),
5624 +                       task->nsproxy->uts_ns,
5625 +                       (task->nsproxy->uts_ns == init_task.nsproxy->uts_ns ? 'I' : '-'),
5626 +                       task->nsproxy->ipc_ns,
5627 +                       (task->nsproxy->ipc_ns == init_task.nsproxy->ipc_ns ? 'I' : '-'),
5628 +                       task->nsproxy->mnt_ns,
5629 +                       (task->nsproxy->mnt_ns == init_task.nsproxy->mnt_ns ? 'I' : '-'),
5630 +                       task->nsproxy->pid_ns_for_children,
5631 +                       (task->nsproxy->pid_ns_for_children ==
5632 +                               init_task.nsproxy->pid_ns_for_children ? 'I' : '-'),
5633 +                       task->nsproxy->net_ns,
5634 +                       (task->nsproxy->net_ns == init_task.nsproxy->net_ns ? 'I' : '-'));
5635 +       return 0;
5636 +}
5637 +
5638 +void task_vs_id(struct seq_file *m, struct task_struct *task)
5639 +{
5640 +       if (task_vx_flags(task, VXF_HIDE_VINFO, 0))
5641 +               return;
5642 +
5643 +       seq_printf(m, "VxID:\t%d\n", vx_task_xid(task));
5644 +       seq_printf(m, "NxID:\t%d\n", nx_task_nid(task));
5645 +}
5646 +
5647 +
5648  int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
5649                         struct pid *pid, struct task_struct *task)
5650  {
5651 @@ -407,6 +450,7 @@ int proc_pid_status(struct seq_file *m,
5652         task_seccomp(m, task);
5653         task_cpus_allowed(m, task);
5654         cpuset_task_status_allowed(m, task);
5655 +       task_vs_id(m, task);
5656         task_context_switch_counts(m, task);
5657         return 0;
5658  }
5659 @@ -522,6 +566,17 @@ static int do_task_stat(struct seq_file
5660         /* convert nsec -> ticks */
5661         start_time = nsec_to_clock_t(task->real_start_time);
5662
5663 +       /* fixup start time for virt uptime */
5664 +       if (vx_flags(VXF_VIRT_UPTIME, 0)) {
5665 +               unsigned long long bias =
5666 +                       current->vx_info->cvirt.bias_clock;
5667 +
5668 +               if (start_time > bias)
5669 +                       start_time -= bias;
5670 +               else
5671 +                       start_time = 0;
5672 +       }
5673 +
5674         seq_printf(m, "%d (%s) %c", pid_nr_ns(pid, ns), tcomm, state);
5675         seq_put_decimal_ll(m, " ", ppid);
5676         seq_put_decimal_ll(m, " ", pgid);
5677 diff -NurpP --minimal linux-4.9.135/fs/proc/base.c linux-4.9.135-vs2.3.9.8/fs/proc/base.c
5678 --- linux-4.9.135/fs/proc/base.c        2018-10-20 10:39:18.000000000 +0000
5679 +++ linux-4.9.135-vs2.3.9.8/fs/proc/base.c      2018-10-20 05:55:43.000000000 +0000
5680 @@ -87,6 +87,8 @@
5681  #include <linux/slab.h>
5682  #include <linux/flex_array.h>
5683  #include <linux/posix-timers.h>
5684 +#include <linux/vs_context.h>
5685 +#include <linux/vs_network.h>
5686  #ifdef CONFIG_HARDWALL
5687  #include <asm/hardwall.h>
5688  #endif
5689 @@ -1079,10 +1081,15 @@ static int __set_oom_adj(struct file *fi
5690         mutex_lock(&oom_adj_mutex);
5691         if (legacy) {
5692                 if (oom_adj < task->signal->oom_score_adj &&
5693 -                               !capable(CAP_SYS_RESOURCE)) {
5694 +                   !vx_capable(CAP_SYS_RESOURCE, VXC_OOM_ADJUST)) {
5695                         err = -EACCES;
5696                         goto err_unlock;
5697                 }
5698 +
5699 +               /* prevent guest processes from circumventing the oom killer */
5700 +               if (vx_current_xid() && (oom_adj == OOM_DISABLE))
5701 +                       oom_adj = OOM_ADJUST_MIN;
5702 +
5703                 /*
5704                  * /proc/pid/oom_adj is provided for legacy purposes, ask users to use
5705                  * /proc/pid/oom_score_adj instead.
5706 @@ -1712,6 +1719,8 @@ struct inode *proc_pid_make_inode(struct
5707                 inode->i_gid = cred->egid;
5708                 rcu_read_unlock();
5709         }
5710 +       /* procfs is xid tagged */
5711 +       i_tag_write(inode, (vtag_t)vx_task_xid(task));
5712         security_task_to_inode(task, inode);
5713
5714  out:
5715 @@ -1757,6 +1766,8 @@ int pid_getattr(struct vfsmount *mnt, st
5716
5717  /* dentry stuff */
5718
5719 +// static unsigned name_to_int(struct dentry *dentry);
5720 +
5721  /*
5722   *     Exceptional case: normally we are not allowed to unhash a busy
5723   * directory. In this case, however, we can do it - no aliasing problems
5724 @@ -1785,6 +1796,19 @@ int pid_revalidate(struct dentry *dentry
5725         task = get_proc_task(inode);
5726
5727         if (task) {
5728 +               unsigned pid = name_to_int(&dentry->d_name);
5729 +
5730 +               if (pid != ~0U && pid != vx_map_pid(task->pid) &&
5731 +                       pid != __task_pid_nr_ns(task, PIDTYPE_PID,
5732 +                               task_active_pid_ns(task))) {
5733 +                       vxdprintk(VXD_CBIT(misc, 10),
5734 +                               VS_Q("%*s") " dropped by pid_revalidate(%d!=%d)",
5735 +                               dentry->d_name.len, dentry->d_name.name,
5736 +                               pid, vx_map_pid(task->pid));
5737 +                       put_task_struct(task);
5738 +                       d_drop(dentry);
5739 +                       return 0;
5740 +               }
5741                 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
5742                     task_dumpable(task)) {
5743                         rcu_read_lock();
5744 @@ -2449,6 +2473,13 @@ static struct dentry *proc_pident_lookup
5745         if (!task)
5746                 goto out_no_task;
5747
5748 +       /* TODO: maybe we can come up with a generic approach? */
5749 +       if (task_vx_flags(task, VXF_HIDE_VINFO, 0) &&
5750 +               (dentry->d_name.len == 5) &&
5751 +               (!memcmp(dentry->d_name.name, "vinfo", 5) ||
5752 +               !memcmp(dentry->d_name.name, "ninfo", 5)))
5753 +               goto out;
5754 +
5755         /*
5756          * Yes, it does not scale. And it should not. Don't add
5757          * new entries into /proc/<tgid>/ without very good reasons.
5758 @@ -2888,6 +2919,11 @@ static int proc_pid_personality(struct s
5759  static const struct file_operations proc_task_operations;
5760  static const struct inode_operations proc_task_inode_operations;
5761
5762 +extern int proc_pid_vx_info(struct seq_file *,
5763 +       struct pid_namespace *, struct pid *, struct task_struct *);
5764 +extern int proc_pid_nx_info(struct seq_file *,
5765 +       struct pid_namespace *, struct pid *, struct task_struct *);
5766 +
5767  static const struct pid_entry tgid_base_stuff[] = {
5768         DIR("task",       S_IRUGO|S_IXUGO, proc_task_inode_operations, proc_task_operations),
5769         DIR("fd",         S_IRUSR|S_IXUSR, proc_fd_inode_operations, proc_fd_operations),
5770 @@ -2952,6 +2988,8 @@ static const struct pid_entry tgid_base_
5771  #ifdef CONFIG_CGROUPS
5772         ONE("cgroup",  S_IRUGO, proc_cgroup_show),
5773  #endif
5774 +       ONE("vinfo",      S_IRUGO, proc_pid_vx_info),
5775 +       ONE("ninfo",      S_IRUGO, proc_pid_nx_info),
5776         ONE("oom_score",  S_IRUGO, proc_oom_score),
5777         REG("oom_adj",    S_IRUGO|S_IWUSR, proc_oom_adj_operations),
5778         REG("oom_score_adj", S_IRUGO|S_IWUSR, proc_oom_score_adj_operations),
5779 @@ -3167,7 +3205,7 @@ retry:
5780         iter.task = NULL;
5781         pid = find_ge_pid(iter.tgid, ns);
5782         if (pid) {
5783 -               iter.tgid = pid_nr_ns(pid, ns);
5784 +               iter.tgid = pid_unmapped_nr_ns(pid, ns);
5785                 iter.task = pid_task(pid, PIDTYPE_PID);
5786                 /* What we to know is if the pid we have find is the
5787                  * pid of a thread_group_leader.  Testing for task
5788 @@ -3227,8 +3265,10 @@ int proc_pid_readdir(struct file *file,
5789                 if (!has_pid_permissions(ns, iter.task, 2))
5790                         continue;
5791
5792 -               len = snprintf(name, sizeof(name), "%d", iter.tgid);
5793 +               len = snprintf(name, sizeof(name), "%d", vx_map_tgid(iter.tgid));
5794                 ctx->pos = iter.tgid + TGID_OFFSET;
5795 +               if (!vx_proc_task_visible(iter.task))
5796 +                       continue;
5797                 if (!proc_fill_cache(file, ctx, name, len,
5798                                      proc_pid_instantiate, iter.task, NULL)) {
5799                         put_task_struct(iter.task);
5800 @@ -3365,6 +3405,7 @@ static const struct pid_entry tid_base_s
5801         REG("projid_map", S_IRUGO|S_IWUSR, proc_projid_map_operations),
5802         REG("setgroups",  S_IRUGO|S_IWUSR, proc_setgroups_operations),
5803  #endif
5804 +       ONE("nsproxy",  S_IRUGO, proc_pid_nsproxy),
5805  };
5806
5807  static int proc_tid_base_readdir(struct file *file, struct dir_context *ctx)
5808 @@ -3431,6 +3472,8 @@ static struct dentry *proc_task_lookup(s
5809         tid = name_to_int(&dentry->d_name);
5810         if (tid == ~0U)
5811                 goto out;
5812 +       if (vx_current_initpid(tid))
5813 +               goto out;
5814
5815         ns = dentry->d_sb->s_fs_info;
5816         rcu_read_lock();
5817 diff -NurpP --minimal linux-4.9.135/fs/proc/generic.c linux-4.9.135-vs2.3.9.8/fs/proc/generic.c
5818 --- linux-4.9.135/fs/proc/generic.c     2018-10-20 10:39:18.000000000 +0000
5819 +++ linux-4.9.135-vs2.3.9.8/fs/proc/generic.c   2018-10-20 04:58:14.000000000 +0000
5820 @@ -22,6 +22,7 @@
5821  #include <linux/bitops.h>
5822  #include <linux/spinlock.h>
5823  #include <linux/completion.h>
5824 +#include <linux/vserver/inode.h>
5825  #include <asm/uaccess.h>
5826
5827  #include "internal.h"
5828 @@ -66,8 +67,16 @@ static struct proc_dir_entry *pde_subdir
5829                         node = node->rb_left;
5830                 else if (result > 0)
5831                         node = node->rb_right;
5832 -               else
5833 +               else {
5834 +                       if (!vx_hide_check(0, de->vx_flags)) {
5835 +                               vxdprintk(VXD_CBIT(misc, 9),
5836 +                                       VS_Q("%*s")
5837 +                                       " hidden in pde_subdir_find()",
5838 +                                       de->namelen, de->name);
5839 +                               return 0;
5840 +                       }
5841                         return de;
5842 +               }
5843         }
5844         return NULL;
5845  }
5846 @@ -241,6 +250,8 @@ struct dentry *proc_lookup_de(struct pro
5847                         return ERR_PTR(-ENOMEM);
5848                 d_set_d_op(dentry, &simple_dentry_operations);
5849                 d_add(dentry, inode);
5850 +                       /* generic proc entries belong to the host */
5851 +                       i_tag_write(inode, 0);
5852                 return NULL;
5853         }
5854         read_unlock(&proc_subdir_lock);
5855 @@ -287,6 +298,12 @@ int proc_readdir_de(struct proc_dir_entr
5856         do {
5857                 struct proc_dir_entry *next;
5858                 pde_get(de);
5859 +               if (!vx_hide_check(0, de->vx_flags)) {
5860 +                       vxdprintk(VXD_CBIT(misc, 9),
5861 +                               VS_Q("%*s") " hidden in proc_readdir_de()",
5862 +                               de->namelen, de->name);
5863 +                       goto skip;
5864 +               }
5865                 read_unlock(&proc_subdir_lock);
5866                 if (!dir_emit(ctx, de->name, de->namelen,
5867                             de->low_ino, de->mode >> 12)) {
5868 @@ -294,6 +311,7 @@ int proc_readdir_de(struct proc_dir_entr
5869                         return 0;
5870                 }
5871                 read_lock(&proc_subdir_lock);
5872 +       skip:
5873                 ctx->pos++;
5874                 next = pde_subdir_next(de);
5875                 pde_put(de);
5876 @@ -387,6 +405,7 @@ static struct proc_dir_entry *__proc_cre
5877         ent->mode = mode;
5878         ent->nlink = nlink;
5879         ent->subdir = RB_ROOT;
5880 +       ent->vx_flags = IATTR_PROC_DEFAULT;
5881         atomic_set(&ent->count, 1);
5882         spin_lock_init(&ent->pde_unload_lock);
5883         INIT_LIST_HEAD(&ent->pde_openers);
5884 @@ -413,7 +432,8 @@ struct proc_dir_entry *proc_symlink(cons
5885                                 kfree(ent->data);
5886                                 kfree(ent);
5887                                 ent = NULL;
5888 -                       }
5889 +                       } else
5890 +                               ent->vx_flags = IATTR_PROC_SYMLINK;
5891                 } else {
5892                         kfree(ent);
5893                         ent = NULL;
5894 diff -NurpP --minimal linux-4.9.135/fs/proc/inode.c linux-4.9.135-vs2.3.9.8/fs/proc/inode.c
5895 --- linux-4.9.135/fs/proc/inode.c       2018-10-20 10:39:18.000000000 +0000
5896 +++ linux-4.9.135-vs2.3.9.8/fs/proc/inode.c     2018-10-20 05:55:43.000000000 +0000
5897 @@ -433,6 +433,8 @@ struct inode *proc_get_inode(struct supe
5898                         inode->i_uid = de->uid;
5899                         inode->i_gid = de->gid;
5900                 }
5901 +               if (de->vx_flags)
5902 +                       PROC_I(inode)->vx_flags = de->vx_flags;
5903                 if (de->size)
5904                         inode->i_size = de->size;
5905                 if (de->nlink)
5906 diff -NurpP --minimal linux-4.9.135/fs/proc/internal.h linux-4.9.135-vs2.3.9.8/fs/proc/internal.h
5907 --- linux-4.9.135/fs/proc/internal.h    2018-10-20 10:39:18.000000000 +0000
5908 +++ linux-4.9.135-vs2.3.9.8/fs/proc/internal.h  2018-10-20 05:55:43.000000000 +0000
5909 @@ -14,6 +14,7 @@
5910  #include <linux/spinlock.h>
5911  #include <linux/atomic.h>
5912  #include <linux/binfmts.h>
5913 +#include <linux/vs_pid.h>
5914
5915  struct ctl_table_header;
5916  struct mempolicy;
5917 @@ -34,6 +35,7 @@ struct proc_dir_entry {
5918         nlink_t nlink;
5919         kuid_t uid;
5920         kgid_t gid;
5921 +       int vx_flags;
5922         loff_t size;
5923         const struct inode_operations *proc_iops;
5924         const struct file_operations *proc_fops;
5925 @@ -51,15 +53,22 @@ struct proc_dir_entry {
5926         char name[];
5927  };
5928
5929 +struct vx_info;
5930 +struct nx_info;
5931 +
5932  union proc_op {
5933         int (*proc_get_link)(struct dentry *, struct path *);
5934         int (*proc_show)(struct seq_file *m,
5935                 struct pid_namespace *ns, struct pid *pid,
5936                 struct task_struct *task);
5937 +       int (*proc_vs_read)(char *page);
5938 +       int (*proc_vxi_read)(struct vx_info *vxi, char *page);
5939 +       int (*proc_nxi_read)(struct nx_info *nxi, char *page);
5940  };
5941
5942  struct proc_inode {
5943         struct pid *pid;
5944 +       int vx_flags;
5945         unsigned int fd;
5946         union proc_op op;
5947         struct proc_dir_entry *pde;
5948 @@ -93,11 +102,16 @@ static inline struct pid *proc_pid(struc
5949         return PROC_I(inode)->pid;
5950  }
5951
5952 -static inline struct task_struct *get_proc_task(struct inode *inode)
5953 +static inline struct task_struct *get_proc_task_real(struct inode *inode)
5954  {
5955         return get_pid_task(proc_pid(inode), PIDTYPE_PID);
5956  }
5957
5958 +static inline struct task_struct *get_proc_task(struct inode *inode)
5959 +{
5960 +       return vx_get_proc_task(inode, proc_pid(inode));
5961 +}
5962 +
5963  static inline int task_dumpable(struct task_struct *task)
5964  {
5965         int dumpable = 0;
5966 @@ -156,6 +170,8 @@ extern int proc_pid_status(struct seq_fi
5967                            struct pid *, struct task_struct *);
5968  extern int proc_pid_statm(struct seq_file *, struct pid_namespace *,
5969                           struct pid *, struct task_struct *);
5970 +extern int proc_pid_nsproxy(struct seq_file *m, struct pid_namespace *ns,
5971 +                           struct pid *pid, struct task_struct *task);
5972
5973  /*
5974   * base.c
5975 diff -NurpP --minimal linux-4.9.135/fs/proc/loadavg.c linux-4.9.135-vs2.3.9.8/fs/proc/loadavg.c
5976 --- linux-4.9.135/fs/proc/loadavg.c     2016-12-11 19:17:54.000000000 +0000
5977 +++ linux-4.9.135-vs2.3.9.8/fs/proc/loadavg.c   2018-10-20 04:58:14.000000000 +0000
5978 @@ -12,15 +12,27 @@
5979
5980  static int loadavg_proc_show(struct seq_file *m, void *v)
5981  {
5982 +       unsigned long running;
5983 +       unsigned int threads;
5984         unsigned long avnrun[3];
5985
5986         get_avenrun(avnrun, FIXED_1/200, 0);
5987
5988 +       if (vx_flags(VXF_VIRT_LOAD, 0)) {
5989 +               struct vx_info *vxi = current_vx_info();
5990 +
5991 +               running = atomic_read(&vxi->cvirt.nr_running);
5992 +               threads = atomic_read(&vxi->cvirt.nr_threads);
5993 +       } else {
5994 +               running = nr_running();
5995 +               threads = nr_threads;
5996 +       }
5997 +
5998         seq_printf(m, "%lu.%02lu %lu.%02lu %lu.%02lu %ld/%d %d\n",
5999                 LOAD_INT(avnrun[0]), LOAD_FRAC(avnrun[0]),
6000                 LOAD_INT(avnrun[1]), LOAD_FRAC(avnrun[1]),
6001                 LOAD_INT(avnrun[2]), LOAD_FRAC(avnrun[2]),
6002 -               nr_running(), nr_threads,
6003 +               running, threads,
6004                 task_active_pid_ns(current)->last_pid);
6005         return 0;
6006  }
6007 diff -NurpP --minimal linux-4.9.135/fs/proc/meminfo.c linux-4.9.135-vs2.3.9.8/fs/proc/meminfo.c
6008 --- linux-4.9.135/fs/proc/meminfo.c     2016-12-11 19:17:54.000000000 +0000
6009 +++ linux-4.9.135-vs2.3.9.8/fs/proc/meminfo.c   2018-10-20 04:58:14.000000000 +0000
6010 @@ -55,7 +55,8 @@ static int meminfo_proc_show(struct seq_
6011         si_swapinfo(&i);
6012         committed = percpu_counter_read_positive(&vm_committed_as);
6013
6014 -       cached = global_node_page_state(NR_FILE_PAGES) -
6015 +       cached = vx_flags(VXF_VIRT_MEM, 0) ?
6016 +               vx_vsi_cached(&i) : global_node_page_state(NR_FILE_PAGES) -
6017                         total_swapcache_pages() - i.bufferram;
6018         if (cached < 0)
6019                 cached = 0;
6020 diff -NurpP --minimal linux-4.9.135/fs/proc/root.c linux-4.9.135-vs2.3.9.8/fs/proc/root.c
6021 --- linux-4.9.135/fs/proc/root.c        2016-12-11 19:17:54.000000000 +0000
6022 +++ linux-4.9.135-vs2.3.9.8/fs/proc/root.c      2018-10-20 04:58:14.000000000 +0000
6023 @@ -20,9 +20,14 @@
6024  #include <linux/mount.h>
6025  #include <linux/pid_namespace.h>
6026  #include <linux/parser.h>
6027 +#include <linux/vserver/inode.h>
6028
6029  #include "internal.h"
6030
6031 +struct proc_dir_entry *proc_virtual;
6032 +
6033 +extern void proc_vx_init(void);
6034 +
6035  enum {
6036         Opt_gid, Opt_hidepid, Opt_err,
6037  };
6038 @@ -145,6 +150,7 @@ void __init proc_root_init(void)
6039         proc_tty_init();
6040         proc_mkdir("bus", NULL);
6041         proc_sys_init();
6042 +       proc_vx_init();
6043  }
6044
6045  static int proc_root_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat
6046 @@ -206,6 +212,7 @@ struct proc_dir_entry proc_root = {
6047         .proc_iops      = &proc_root_inode_operations,
6048         .proc_fops      = &proc_root_operations,
6049         .parent         = &proc_root,
6050 +       .vx_flags       = IATTR_ADMIN | IATTR_WATCH,
6051         .subdir         = RB_ROOT,
6052         .name           = "/proc",
6053  };
6054 diff -NurpP --minimal linux-4.9.135/fs/proc/self.c linux-4.9.135-vs2.3.9.8/fs/proc/self.c
6055 --- linux-4.9.135/fs/proc/self.c        2016-12-11 19:17:54.000000000 +0000
6056 +++ linux-4.9.135-vs2.3.9.8/fs/proc/self.c      2018-10-20 04:58:14.000000000 +0000
6057 @@ -1,6 +1,7 @@
6058  #include <linux/sched.h>
6059  #include <linux/slab.h>
6060  #include <linux/pid_namespace.h>
6061 +#include <linux/vserver/inode.h>
6062  #include "internal.h"
6063
6064  /*
6065 @@ -54,6 +55,8 @@ int proc_setup_self(struct super_block *
6066         self = d_alloc_name(s->s_root, "self");
6067         if (self) {
6068                 struct inode *inode = new_inode_pseudo(s);
6069 +
6070 +               // self->vx_flags = IATTR_PROC_SYMLINK;
6071                 if (inode) {
6072                         inode->i_ino = self_inum;
6073                         inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
6074 diff -NurpP --minimal linux-4.9.135/fs/proc/stat.c linux-4.9.135-vs2.3.9.8/fs/proc/stat.c
6075 --- linux-4.9.135/fs/proc/stat.c        2018-10-20 10:39:18.000000000 +0000
6076 +++ linux-4.9.135-vs2.3.9.8/fs/proc/stat.c      2018-10-20 11:46:17.000000000 +0000
6077 @@ -9,8 +9,10 @@
6078  #include <linux/slab.h>
6079  #include <linux/time.h>
6080  #include <linux/irqnr.h>
6081 +#include <linux/vserver/cvirt.h>
6082  #include <linux/cputime.h>
6083  #include <linux/tick.h>
6084 +#include <linux/cpuset.h>
6085
6086  #ifndef arch_irq_stat_cpu
6087  #define arch_irq_stat_cpu(cpu) 0
6088 @@ -86,13 +88,24 @@ static int show_stat(struct seq_file *p,
6089         u64 sum_softirq = 0;
6090         unsigned int per_softirq_sums[NR_SOFTIRQS] = {0};
6091         struct timespec64 boottime;
6092 +       cpumask_var_t cpus_allowed;
6093 +       bool virt_cpu = vx_flags(VXF_VIRT_CPU, 0);
6094
6095         user = nice = system = idle = iowait =
6096                 irq = softirq = steal = 0;
6097         guest = guest_nice = 0;
6098         getboottime64(&boottime);
6099
6100 +       if (vx_flags(VXF_VIRT_UPTIME, 0))
6101 +               vx_vsi_boottime64(&boottime);
6102 +
6103 +       if (virt_cpu)
6104 +               cpuset_cpus_allowed(current, cpus_allowed);
6105 +
6106         for_each_possible_cpu(i) {
6107 +               if (virt_cpu && !cpumask_test_cpu(i, cpus_allowed))
6108 +                       continue;
6109 +
6110                 user += kcpustat_cpu(i).cpustat[CPUTIME_USER];
6111                 nice += kcpustat_cpu(i).cpustat[CPUTIME_NICE];
6112                 system += kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
6113 @@ -128,6 +141,9 @@ static int show_stat(struct seq_file *p,
6114         seq_putc(p, '\n');
6115
6116         for_each_online_cpu(i) {
6117 +               if (virt_cpu && !cpumask_test_cpu(i, cpus_allowed))
6118 +                       continue;
6119 +
6120                 /* Copy values here to work around gcc-2.95.3, gcc-2.96 */
6121                 user = kcpustat_cpu(i).cpustat[CPUTIME_USER];
6122                 nice = kcpustat_cpu(i).cpustat[CPUTIME_NICE];
6123 diff -NurpP --minimal linux-4.9.135/fs/proc/uptime.c linux-4.9.135-vs2.3.9.8/fs/proc/uptime.c
6124 --- linux-4.9.135/fs/proc/uptime.c      2018-10-20 10:39:18.000000000 +0000
6125 +++ linux-4.9.135-vs2.3.9.8/fs/proc/uptime.c    2018-10-20 11:47:26.000000000 +0000
6126 @@ -5,6 +5,7 @@
6127  #include <linux/seq_file.h>
6128  #include <linux/time.h>
6129  #include <linux/kernel_stat.h>
6130 +#include <linux/vserver/cvirt.h>
6131
6132  static int uptime_proc_show(struct seq_file *m, void *v)
6133  {
6134 @@ -21,6 +22,10 @@ static int uptime_proc_show(struct seq_f
6135         get_monotonic_boottime(&uptime);
6136         idle.tv_sec = div_u64_rem(nsec, NSEC_PER_SEC, &rem);
6137         idle.tv_nsec = rem;
6138 +
6139 +       if (vx_flags(VXF_VIRT_UPTIME, 0))
6140 +               vx_vsi_uptime(&uptime, &idle);
6141 +
6142         seq_printf(m, "%lu.%02lu %lu.%02lu\n",
6143                         (unsigned long) uptime.tv_sec,
6144                         (uptime.tv_nsec / (NSEC_PER_SEC / 100)),
6145 diff -NurpP --minimal linux-4.9.135/fs/proc_namespace.c linux-4.9.135-vs2.3.9.8/fs/proc_namespace.c
6146 --- linux-4.9.135/fs/proc_namespace.c   2016-12-11 19:17:54.000000000 +0000
6147 +++ linux-4.9.135-vs2.3.9.8/fs/proc_namespace.c 2018-10-20 04:58:14.000000000 +0000
6148 @@ -46,6 +46,8 @@ static int show_sb_opts(struct seq_file
6149                 { MS_DIRSYNC, ",dirsync" },
6150                 { MS_MANDLOCK, ",mand" },
6151                 { MS_LAZYTIME, ",lazytime" },
6152 +               { MS_TAGGED, ",tag" },
6153 +               { MS_NOTAGCHECK, ",notagcheck" },
6154                 { 0, NULL }
6155         };
6156         const struct proc_fs_info *fs_infop;
6157 @@ -82,6 +84,38 @@ static inline void mangle(struct seq_fil
6158         seq_escape(m, s, " \t\n\\");
6159  }
6160
6161 +#ifdef CONFIG_VSERVER_EXTRA_MNT_CHECK
6162 +
6163 +static int mnt_is_reachable(struct vfsmount *vfsmnt)
6164 +{
6165 +       struct path root;
6166 +       struct dentry *point;
6167 +       struct mount *mnt = real_mount(vfsmnt);
6168 +       struct mount *root_mnt;
6169 +       int ret;
6170 +
6171 +       if (mnt == mnt->mnt_ns->root)
6172 +               return 1;
6173 +
6174 +       rcu_read_lock();
6175 +       root = current->fs->root;
6176 +       root_mnt = real_mount(root.mnt);
6177 +       point = root.dentry;
6178 +
6179 +       while ((mnt != mnt->mnt_parent) && (mnt != root_mnt)) {
6180 +               point = mnt->mnt_mountpoint;
6181 +               mnt = mnt->mnt_parent;
6182 +       }
6183 +       rcu_read_unlock();
6184 +
6185 +       ret = (mnt == root_mnt) && is_subdir(point, root.dentry);
6186 +       return ret;
6187 +}
6188 +
6189 +#else
6190 +#define        mnt_is_reachable(v)     (1)
6191 +#endif
6192 +
6193  static void show_type(struct seq_file *m, struct super_block *sb)
6194  {
6195         mangle(m, sb->s_type->name);
6196 @@ -99,6 +133,17 @@ static int show_vfsmnt(struct seq_file *
6197         struct super_block *sb = mnt_path.dentry->d_sb;
6198         int err;
6199
6200 +       if (vx_flags(VXF_HIDE_MOUNT, 0))
6201 +               return SEQ_SKIP;
6202 +       if (!mnt_is_reachable(mnt) && !vx_check(0, VS_WATCH_P))
6203 +               return SEQ_SKIP;
6204 +
6205 +       if (!vx_check(0, VS_ADMIN|VS_WATCH) &&
6206 +               mnt == current->fs->root.mnt) {
6207 +               seq_puts(m, "/dev/root / ");
6208 +               goto type;
6209 +       }
6210 +
6211         if (sb->s_op->show_devname) {
6212                 err = sb->s_op->show_devname(m, mnt_path.dentry);
6213                 if (err)
6214 @@ -112,6 +157,7 @@ static int show_vfsmnt(struct seq_file *
6215         if (err)
6216                 goto out;
6217         seq_putc(m, ' ');
6218 +type:
6219         show_type(m, sb);
6220         seq_puts(m, __mnt_is_readonly(mnt) ? " ro" : " rw");
6221         err = show_sb_opts(m, sb);
6222 @@ -133,6 +179,11 @@ static int show_mountinfo(struct seq_fil
6223         struct path mnt_path = { .dentry = mnt->mnt_root, .mnt = mnt };
6224         int err;
6225
6226 +       if (vx_flags(VXF_HIDE_MOUNT, 0))
6227 +               return SEQ_SKIP;
6228 +       if (!mnt_is_reachable(mnt) && !vx_check(0, VS_WATCH_P))
6229 +               return SEQ_SKIP;
6230 +
6231         seq_printf(m, "%i %i %u:%u ", r->mnt_id, r->mnt_parent->mnt_id,
6232                    MAJOR(sb->s_dev), MINOR(sb->s_dev));
6233         if (sb->s_op->show_path) {
6234 @@ -195,6 +246,17 @@ static int show_vfsstat(struct seq_file
6235         struct super_block *sb = mnt_path.dentry->d_sb;
6236         int err;
6237
6238 +       if (vx_flags(VXF_HIDE_MOUNT, 0))
6239 +               return SEQ_SKIP;
6240 +       if (!mnt_is_reachable(mnt) && !vx_check(0, VS_WATCH_P))
6241 +               return SEQ_SKIP;
6242 +
6243 +       if (!vx_check(0, VS_ADMIN|VS_WATCH) &&
6244 +               mnt == current->fs->root.mnt) {
6245 +               seq_puts(m, "device /dev/root mounted on / ");
6246 +               goto type;
6247 +       }
6248 +
6249         /* device */
6250         if (sb->s_op->show_devname) {
6251                 seq_puts(m, "device ");
6252 @@ -216,7 +278,7 @@ static int show_vfsstat(struct seq_file
6253         if (err)
6254                 goto out;
6255         seq_putc(m, ' ');
6256 -
6257 +type:
6258         /* file system type */
6259         seq_puts(m, "with fstype ");
6260         show_type(m, sb);
6261 diff -NurpP --minimal linux-4.9.135/fs/quota/dquot.c linux-4.9.135-vs2.3.9.8/fs/quota/dquot.c
6262 --- linux-4.9.135/fs/quota/dquot.c      2018-10-20 10:39:18.000000000 +0000
6263 +++ linux-4.9.135-vs2.3.9.8/fs/quota/dquot.c    2018-10-20 04:58:14.000000000 +0000
6264 @@ -1658,6 +1658,9 @@ int __dquot_alloc_space(struct inode *in
6265         int reserve = flags & DQUOT_SPACE_RESERVE;
6266         struct dquot **dquots;
6267
6268 +       if ((ret = dl_alloc_space(inode, number)))
6269 +               return ret;
6270 +
6271         if (!dquot_active(inode)) {
6272                 inode_incr_space(inode, number, reserve);
6273                 goto out;
6274 @@ -1710,6 +1713,9 @@ int dquot_alloc_inode(struct inode *inod
6275         struct dquot_warn warn[MAXQUOTAS];
6276         struct dquot * const *dquots;
6277
6278 +       if ((ret = dl_alloc_inode(inode)))
6279 +               return ret;
6280 +
6281         if (!dquot_active(inode))
6282                 return 0;
6283         for (cnt = 0; cnt < MAXQUOTAS; cnt++)
6284 @@ -1812,6 +1818,8 @@ void __dquot_free_space(struct inode *in
6285         struct dquot **dquots;
6286         int reserve = flags & DQUOT_SPACE_RESERVE, index;
6287
6288 +       dl_free_space(inode, number);
6289 +
6290         if (!dquot_active(inode)) {
6291                 inode_decr_space(inode, number, reserve);
6292                 return;
6293 @@ -1856,6 +1864,8 @@ void dquot_free_inode(struct inode *inod
6294         struct dquot * const *dquots;
6295         int index;
6296
6297 +       dl_free_inode(inode);
6298 +
6299         if (!dquot_active(inode))
6300                 return;
6301
6302 diff -NurpP --minimal linux-4.9.135/fs/quota/quota.c linux-4.9.135-vs2.3.9.8/fs/quota/quota.c
6303 --- linux-4.9.135/fs/quota/quota.c      2018-10-20 10:39:18.000000000 +0000
6304 +++ linux-4.9.135-vs2.3.9.8/fs/quota/quota.c    2018-10-20 05:55:43.000000000 +0000
6305 @@ -8,6 +8,7 @@
6306  #include <linux/fs.h>
6307  #include <linux/namei.h>
6308  #include <linux/slab.h>
6309 +#include <linux/vs_context.h>
6310  #include <asm/current.h>
6311  #include <linux/uaccess.h>
6312  #include <linux/kernel.h>
6313 @@ -39,7 +40,7 @@ static int check_quotactl_permission(str
6314                         break;
6315                 /*FALLTHROUGH*/
6316         default:
6317 -               if (!capable(CAP_SYS_ADMIN))
6318 +               if (!vx_capable(CAP_SYS_ADMIN, VXC_QUOTA_CTL))
6319                         return -EPERM;
6320         }
6321
6322 @@ -770,6 +771,46 @@ static int do_quotactl(struct super_bloc
6323
6324  #ifdef CONFIG_BLOCK
6325
6326 +#if defined(CONFIG_BLK_DEV_VROOT) || defined(CONFIG_BLK_DEV_VROOT_MODULE)
6327 +
6328 +#include <linux/vroot.h>
6329 +#include <linux/major.h>
6330 +#include <linux/module.h>
6331 +#include <linux/kallsyms.h>
6332 +#include <linux/vserver/debug.h>
6333 +
6334 +static vroot_grb_func *vroot_get_real_bdev = NULL;
6335 +
6336 +static DEFINE_SPINLOCK(vroot_grb_lock);
6337 +
6338 +int register_vroot_grb(vroot_grb_func *func) {
6339 +       int ret = -EBUSY;
6340 +
6341 +       spin_lock(&vroot_grb_lock);
6342 +       if (!vroot_get_real_bdev) {
6343 +               vroot_get_real_bdev = func;
6344 +               ret = 0;
6345 +       }
6346 +       spin_unlock(&vroot_grb_lock);
6347 +       return ret;
6348 +}
6349 +EXPORT_SYMBOL(register_vroot_grb);
6350 +
6351 +int unregister_vroot_grb(vroot_grb_func *func) {
6352 +       int ret = -EINVAL;
6353 +
6354 +       spin_lock(&vroot_grb_lock);
6355 +       if (vroot_get_real_bdev) {
6356 +               vroot_get_real_bdev = NULL;
6357 +               ret = 0;
6358 +       }
6359 +       spin_unlock(&vroot_grb_lock);
6360 +       return ret;
6361 +}
6362 +EXPORT_SYMBOL(unregister_vroot_grb);
6363 +
6364 +#endif
6365 +
6366  /* Return 1 if 'cmd' will block on frozen filesystem */
6367  static int quotactl_cmd_write(int cmd)
6368  {
6369 @@ -811,6 +852,22 @@ static struct super_block *quotactl_bloc
6370         putname(tmp);
6371         if (IS_ERR(bdev))
6372                 return ERR_CAST(bdev);
6373 +#if defined(CONFIG_BLK_DEV_VROOT) || defined(CONFIG_BLK_DEV_VROOT_MODULE)
6374 +       if (bdev && bdev->bd_inode &&
6375 +               imajor(bdev->bd_inode) == VROOT_MAJOR) {
6376 +               struct block_device *bdnew = (void *)-EINVAL;
6377 +
6378 +               if (vroot_get_real_bdev)
6379 +                       bdnew = vroot_get_real_bdev(bdev);
6380 +               else
6381 +                       vxdprintk(VXD_CBIT(misc, 0),
6382 +                                       "vroot_get_real_bdev not set");
6383 +               bdput(bdev);
6384 +               if (IS_ERR(bdnew))
6385 +                       return ERR_PTR(PTR_ERR(bdnew));
6386 +               bdev = bdnew;
6387 +       }
6388 +#endif
6389         if (quotactl_cmd_write(cmd))
6390                 sb = get_super_thawed(bdev);
6391         else
6392 diff -NurpP --minimal linux-4.9.135/fs/stat.c linux-4.9.135-vs2.3.9.8/fs/stat.c
6393 --- linux-4.9.135/fs/stat.c     2018-10-20 10:39:18.000000000 +0000
6394 +++ linux-4.9.135-vs2.3.9.8/fs/stat.c   2018-10-20 04:58:14.000000000 +0000
6395 @@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod
6396         stat->nlink = inode->i_nlink;
6397         stat->uid = inode->i_uid;
6398         stat->gid = inode->i_gid;
6399 +       stat->tag = inode->i_tag;
6400         stat->rdev = inode->i_rdev;
6401         stat->size = i_size_read(inode);
6402         stat->atime = inode->i_atime;
6403 diff -NurpP --minimal linux-4.9.135/fs/statfs.c linux-4.9.135-vs2.3.9.8/fs/statfs.c
6404 --- linux-4.9.135/fs/statfs.c   2016-12-11 19:17:54.000000000 +0000
6405 +++ linux-4.9.135-vs2.3.9.8/fs/statfs.c 2018-10-20 04:58:14.000000000 +0000
6406 @@ -7,6 +7,8 @@
6407  #include <linux/statfs.h>
6408  #include <linux/security.h>
6409  #include <linux/uaccess.h>
6410 +#include <linux/vs_base.h>
6411 +#include <linux/vs_dlimit.h>
6412  #include "internal.h"
6413
6414  static int flags_by_mnt(int mnt_flags)
6415 @@ -60,6 +62,8 @@ static int statfs_by_dentry(struct dentr
6416         retval = dentry->d_sb->s_op->statfs(dentry, buf);
6417         if (retval == 0 && buf->f_frsize == 0)
6418                 buf->f_frsize = buf->f_bsize;
6419 +       if (!vx_check(0, VS_ADMIN|VS_WATCH))
6420 +               vx_vsi_statfs(dentry->d_sb, buf);
6421         return retval;
6422  }
6423
6424 diff -NurpP --minimal linux-4.9.135/fs/super.c linux-4.9.135-vs2.3.9.8/fs/super.c
6425 --- linux-4.9.135/fs/super.c    2018-10-20 10:39:18.000000000 +0000
6426 +++ linux-4.9.135-vs2.3.9.8/fs/super.c  2018-10-20 04:58:14.000000000 +0000
6427 @@ -34,6 +34,8 @@
6428  #include <linux/fsnotify.h>
6429  #include <linux/lockdep.h>
6430  #include <linux/user_namespace.h>
6431 +#include <linux/magic.h>
6432 +#include <linux/vs_context.h>
6433  #include "internal.h"
6434
6435
6436 @@ -985,7 +987,8 @@ struct dentry *mount_ns(struct file_syst
6437         /* Don't allow mounting unless the caller has CAP_SYS_ADMIN
6438          * over the namespace.
6439          */
6440 -       if (!(flags & MS_KERNMOUNT) && !ns_capable(user_ns, CAP_SYS_ADMIN))
6441 +       if (!(flags & MS_KERNMOUNT) &&
6442 +               !vx_ns_capable(user_ns, CAP_SYS_ADMIN, VXC_SECURE_MOUNT))
6443                 return ERR_PTR(-EPERM);
6444
6445         sb = sget_userns(fs_type, ns_test_super, ns_set_super, flags,
6446 @@ -1195,6 +1198,13 @@ mount_fs(struct file_system_type *type,
6447         WARN_ON(!sb->s_bdi);
6448         sb->s_flags |= MS_BORN;
6449
6450 +       error = -EPERM;
6451 +       if (!vx_capable(CAP_SYS_ADMIN, VXC_BINARY_MOUNT) &&
6452 +               !sb->s_bdev &&
6453 +               (sb->s_magic != PROC_SUPER_MAGIC) &&
6454 +               (sb->s_magic != DEVPTS_SUPER_MAGIC))
6455 +               goto out_sb;
6456 +
6457         error = security_sb_kern_mount(sb, flags, secdata);
6458         if (error)
6459                 goto out_sb;
6460 diff -NurpP --minimal linux-4.9.135/fs/utimes.c linux-4.9.135-vs2.3.9.8/fs/utimes.c
6461 --- linux-4.9.135/fs/utimes.c   2016-12-11 19:17:54.000000000 +0000
6462 +++ linux-4.9.135-vs2.3.9.8/fs/utimes.c 2018-10-20 04:58:14.000000000 +0000
6463 @@ -8,6 +8,8 @@
6464  #include <linux/stat.h>
6465  #include <linux/utime.h>
6466  #include <linux/syscalls.h>
6467 +#include <linux/mount.h>
6468 +#include <linux/vs_cowbl.h>
6469  #include <asm/uaccess.h>
6470  #include <asm/unistd.h>
6471
6472 @@ -52,13 +54,19 @@ static int utimes_common(struct path *pa
6473  {
6474         int error;
6475         struct iattr newattrs;
6476 -       struct inode *inode = path->dentry->d_inode;
6477         struct inode *delegated_inode = NULL;
6478 +       struct inode *inode;
6479 +
6480 +       error = cow_check_and_break(path);
6481 +       if (error)
6482 +               goto out;
6483
6484         error = mnt_want_write(path->mnt);
6485         if (error)
6486                 goto out;
6487
6488 +       inode = path->dentry->d_inode;
6489 +
6490         if (times && times[0].tv_nsec == UTIME_NOW &&
6491                      times[1].tv_nsec == UTIME_NOW)
6492                 times = NULL;
6493 diff -NurpP --minimal linux-4.9.135/fs/xattr.c linux-4.9.135-vs2.3.9.8/fs/xattr.c
6494 --- linux-4.9.135/fs/xattr.c    2018-10-20 10:39:18.000000000 +0000
6495 +++ linux-4.9.135-vs2.3.9.8/fs/xattr.c  2018-10-20 05:55:43.000000000 +0000
6496 @@ -21,6 +21,7 @@
6497  #include <linux/audit.h>
6498  #include <linux/vmalloc.h>
6499  #include <linux/posix_acl_xattr.h>
6500 +#include <linux/mount.h>
6501
6502  #include <asm/uaccess.h>
6503
6504 @@ -112,7 +113,7 @@ xattr_permission(struct inode *inode, co
6505          * The trusted.* namespace can only be accessed by privileged users.
6506          */
6507         if (!strncmp(name, XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN)) {
6508 -               if (!capable(CAP_SYS_ADMIN))
6509 +               if (!vx_capable(CAP_SYS_ADMIN, VXC_FS_TRUSTED))
6510                         return (mask & MAY_WRITE) ? -EPERM : -ENODATA;
6511                 return 0;
6512         }
6513 diff -NurpP --minimal linux-4.9.135/include/linux/capability.h linux-4.9.135-vs2.3.9.8/include/linux/capability.h
6514 --- linux-4.9.135/include/linux/capability.h    2018-10-20 10:39:19.000000000 +0000
6515 +++ linux-4.9.135-vs2.3.9.8/include/linux/capability.h  2018-10-20 04:58:14.000000000 +0000
6516 @@ -78,7 +78,8 @@ extern const kernel_cap_t __cap_init_eff
6517  #else /* HAND-CODED capability initializers */
6518
6519  #define CAP_LAST_U32                   ((_KERNEL_CAPABILITY_U32S) - 1)
6520 -#define CAP_LAST_U32_VALID_MASK                (CAP_TO_MASK(CAP_LAST_CAP + 1) -1)
6521 +#define CAP_LAST_U32_VALID_MASK                ((CAP_TO_MASK(CAP_LAST_CAP + 1) -1) \
6522 +                                       | CAP_TO_MASK(CAP_CONTEXT))
6523
6524  # define CAP_EMPTY_SET    ((kernel_cap_t){{ 0, 0 }})
6525  # define CAP_FULL_SET     ((kernel_cap_t){{ ~0, CAP_LAST_U32_VALID_MASK }})
6526 diff -NurpP --minimal linux-4.9.135/include/linux/cred.h linux-4.9.135-vs2.3.9.8/include/linux/cred.h
6527 --- linux-4.9.135/include/linux/cred.h  2018-10-20 10:39:19.000000000 +0000
6528 +++ linux-4.9.135-vs2.3.9.8/include/linux/cred.h        2018-10-20 04:58:14.000000000 +0000
6529 @@ -152,6 +152,7 @@ extern void exit_creds(struct task_struc
6530  extern int copy_creds(struct task_struct *, unsigned long);
6531  extern const struct cred *get_task_cred(struct task_struct *);
6532  extern struct cred *cred_alloc_blank(void);
6533 +extern struct cred *__prepare_creds(const struct cred *);
6534  extern struct cred *prepare_creds(void);
6535  extern struct cred *prepare_exec_creds(void);
6536  extern int commit_creds(struct cred *);
6537 @@ -212,6 +213,31 @@ static inline bool cap_ambient_invariant
6538                                           cred->cap_inheritable));
6539  }
6540
6541 +static inline void set_cred_subscribers(struct cred *cred, int n)
6542 +{
6543 +#ifdef CONFIG_DEBUG_CREDENTIALS
6544 +       atomic_set(&cred->subscribers, n);
6545 +#endif
6546 +}
6547 +
6548 +static inline int read_cred_subscribers(const struct cred *cred)
6549 +{
6550 +#ifdef CONFIG_DEBUG_CREDENTIALS
6551 +       return atomic_read(&cred->subscribers);
6552 +#else
6553 +       return 0;
6554 +#endif
6555 +}
6556 +
6557 +static inline void alter_cred_subscribers(const struct cred *_cred, int n)
6558 +{
6559 +#ifdef CONFIG_DEBUG_CREDENTIALS
6560 +       struct cred *cred = (struct cred *) _cred;
6561 +
6562 +       atomic_add(n, &cred->subscribers);
6563 +#endif
6564 +}
6565 +
6566  /**
6567   * get_new_cred - Get a reference on a new set of credentials
6568   * @cred: The new credentials to reference
6569 diff -NurpP --minimal linux-4.9.135/include/linux/dcache.h linux-4.9.135-vs2.3.9.8/include/linux/dcache.h
6570 --- linux-4.9.135/include/linux/dcache.h        2018-10-20 10:39:19.000000000 +0000
6571 +++ linux-4.9.135-vs2.3.9.8/include/linux/dcache.h      2018-10-20 04:58:14.000000000 +0000
6572 @@ -308,8 +308,10 @@ extern char *dentry_path(struct dentry *
6573   */
6574  static inline struct dentry *dget_dlock(struct dentry *dentry)
6575  {
6576 -       if (dentry)
6577 +       if (dentry) {
6578                 dentry->d_lockref.count++;
6579 +               // vx_dentry_inc(dentry);
6580 +       }
6581         return dentry;
6582  }
6583
6584 diff -NurpP --minimal linux-4.9.135/include/linux/devpts_fs.h linux-4.9.135-vs2.3.9.8/include/linux/devpts_fs.h
6585 --- linux-4.9.135/include/linux/devpts_fs.h     2016-12-11 19:17:54.000000000 +0000
6586 +++ linux-4.9.135-vs2.3.9.8/include/linux/devpts_fs.h   2018-10-20 04:58:14.000000000 +0000
6587 @@ -34,5 +34,4 @@ void devpts_pty_kill(struct dentry *);
6588
6589  #endif
6590
6591 -
6592  #endif /* _LINUX_DEVPTS_FS_H */
6593 diff -NurpP --minimal linux-4.9.135/include/linux/fs.h linux-4.9.135-vs2.3.9.8/include/linux/fs.h
6594 --- linux-4.9.135/include/linux/fs.h    2018-10-20 10:39:19.000000000 +0000
6595 +++ linux-4.9.135-vs2.3.9.8/include/linux/fs.h  2018-10-20 04:58:14.000000000 +0000
6596 @@ -226,6 +226,7 @@ typedef int (dio_iodone_t)(struct kiocb
6597  #define ATTR_OPEN      (1 << 15) /* Truncating from open(O_TRUNC) */
6598  #define ATTR_TIMES_SET (1 << 16)
6599  #define ATTR_TOUCH     (1 << 17)
6600 +#define ATTR_TAG       (1 << 18)
6601
6602  /*
6603   * Whiteout is represented by a char device.  The following constants define the
6604 @@ -248,6 +249,7 @@ struct iattr {
6605         umode_t         ia_mode;
6606         kuid_t          ia_uid;
6607         kgid_t          ia_gid;
6608 +       ktag_t          ia_tag;
6609         loff_t          ia_size;
6610         struct timespec ia_atime;
6611         struct timespec ia_mtime;
6612 @@ -607,7 +609,9 @@ struct inode {
6613         unsigned short          i_opflags;
6614         kuid_t                  i_uid;
6615         kgid_t                  i_gid;
6616 -       unsigned int            i_flags;
6617 +       ktag_t                  i_tag;
6618 +       unsigned short          i_flags;
6619 +       unsigned short          i_vflags;
6620
6621  #ifdef CONFIG_FS_POSIX_ACL
6622         struct posix_acl        *i_acl;
6623 @@ -636,6 +640,7 @@ struct inode {
6624                 unsigned int __i_nlink;
6625         };
6626         dev_t                   i_rdev;
6627 +       dev_t                   i_mdev;
6628         loff_t                  i_size;
6629         struct timespec         i_atime;
6630         struct timespec         i_mtime;
6631 @@ -840,14 +845,19 @@ static inline void i_size_write(struct i
6632  #endif
6633  }
6634
6635 +static inline void i_tag_write(struct inode *inode, vtag_t tag)
6636 +{
6637 +       inode->i_tag = make_ktag(&init_user_ns, tag);
6638 +}
6639 +
6640  static inline unsigned iminor(const struct inode *inode)
6641  {
6642 -       return MINOR(inode->i_rdev);
6643 +       return MINOR(inode->i_mdev);
6644  }
6645
6646  static inline unsigned imajor(const struct inode *inode)
6647  {
6648 -       return MAJOR(inode->i_rdev);
6649 +       return MAJOR(inode->i_mdev);
6650  }
6651
6652  extern struct block_device *I_BDEV(struct inode *inode);
6653 @@ -904,6 +914,7 @@ struct file {
6654         loff_t                  f_pos;
6655         struct fown_struct      f_owner;
6656         const struct cred       *f_cred;
6657 +       vxid_t                  f_xid;
6658         struct file_ra_state    f_ra;
6659
6660         u64                     f_version;
6661 @@ -1038,6 +1049,7 @@ struct file_lock {
6662         struct file *fl_file;
6663         loff_t fl_start;
6664         loff_t fl_end;
6665 +       vxid_t fl_xid;
6666
6667         struct fasync_struct *  fl_fasync; /* for lease break notifications */
6668         /* for lease breaks: */
6669 @@ -1471,6 +1483,11 @@ static inline gid_t i_gid_read(const str
6670         return from_kgid(inode->i_sb->s_user_ns, inode->i_gid);
6671  }
6672
6673 +static inline vtag_t i_tag_read(const struct inode *inode)
6674 +{
6675 +       return from_ktag(&init_user_ns, inode->i_tag);
6676 +}
6677 +
6678  static inline void i_uid_write(struct inode *inode, uid_t uid)
6679  {
6680         inode->i_uid = make_kuid(inode->i_sb->s_user_ns, uid);
6681 @@ -1760,6 +1777,7 @@ struct inode_operations {
6682         int (*setattr) (struct dentry *, struct iattr *);
6683         int (*getattr) (struct vfsmount *mnt, struct dentry *, struct kstat *);
6684         ssize_t (*listxattr) (struct dentry *, char *, size_t);
6685 +       int (*sync_flags) (struct inode *, int, int);
6686         int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start,
6687                       u64 len);
6688         int (*update_time)(struct inode *, struct timespec *, int);
6689 @@ -1774,6 +1792,7 @@ ssize_t rw_copy_check_uvector(int type,
6690                               unsigned long nr_segs, unsigned long fast_segs,
6691                               struct iovec *fast_pointer,
6692                               struct iovec **ret_pointer);
6693 +ssize_t vfs_sendfile(struct file *, struct file *, loff_t *, size_t, loff_t);
6694
6695  extern ssize_t __vfs_read(struct file *, char __user *, size_t, loff_t *);
6696  extern ssize_t __vfs_write(struct file *, const char __user *, size_t, loff_t *);
6697 @@ -1845,6 +1864,14 @@ struct super_operations {
6698  #else
6699  #define S_DAX          0       /* Make all the DAX code disappear */
6700  #endif
6701 +#define S_IXUNLINK     16384   /* Immutable Invert on unlink */
6702 +
6703 +/* Linux-VServer related Inode flags */
6704 +
6705 +#define V_VALID                1
6706 +#define V_XATTR                2
6707 +#define V_BARRIER      4       /* Barrier for chroot() */
6708 +#define V_COW          8       /* Copy on Write */
6709
6710  /*
6711   * Note that nosuid etc flags are inode-specific: setting some file-system
6712 @@ -1869,10 +1896,13 @@ struct super_operations {
6713  #define IS_MANDLOCK(inode)     __IS_FLG(inode, MS_MANDLOCK)
6714  #define IS_NOATIME(inode)      __IS_FLG(inode, MS_RDONLY|MS_NOATIME)
6715  #define IS_I_VERSION(inode)    __IS_FLG(inode, MS_I_VERSION)
6716 +#define IS_TAGGED(inode)       __IS_FLG(inode, MS_TAGGED)
6717
6718  #define IS_NOQUOTA(inode)      ((inode)->i_flags & S_NOQUOTA)
6719  #define IS_APPEND(inode)       ((inode)->i_flags & S_APPEND)
6720  #define IS_IMMUTABLE(inode)    ((inode)->i_flags & S_IMMUTABLE)
6721 +#define IS_IXUNLINK(inode)     ((inode)->i_flags & S_IXUNLINK)
6722 +#define IS_IXORUNLINK(inode)   ((IS_IXUNLINK(inode) ? S_IMMUTABLE : 0) ^ IS_IMMUTABLE(inode))
6723  #define IS_POSIXACL(inode)     __IS_FLG(inode, MS_POSIXACL)
6724
6725  #define IS_DEADDIR(inode)      ((inode)->i_flags & S_DEAD)
6726 @@ -1892,6 +1922,16 @@ static inline bool HAS_UNMAPPED_ID(struc
6727         return !uid_valid(inode->i_uid) || !gid_valid(inode->i_gid);
6728  }
6729
6730 +#define IS_BARRIER(inode)      (S_ISDIR((inode)->i_mode) && ((inode)->i_vflags & V_BARRIER))
6731 +
6732 +#ifdef CONFIG_VSERVER_COWBL
6733 +#  define IS_COW(inode)                (IS_IXUNLINK(inode) && IS_IMMUTABLE(inode))
6734 +#  define IS_COW_LINK(inode)   (S_ISREG((inode)->i_mode) && ((inode)->i_nlink > 1))
6735 +#else
6736 +#  define IS_COW(inode)                (0)
6737 +#  define IS_COW_LINK(inode)   (0)
6738 +#endif
6739 +
6740  /*
6741   * Inode state bits.  Protected by inode->i_lock
6742   *
6743 @@ -2157,6 +2197,9 @@ extern struct kobject *fs_kobj;
6744  extern int locks_mandatory_locked(struct file *);
6745  extern int locks_mandatory_area(struct inode *, struct file *, loff_t, loff_t, unsigned char);
6746
6747 +#define ATTR_FLAG_BARRIER      512     /* Barrier for chroot() */
6748 +#define ATTR_FLAG_IXUNLINK     1024    /* Immutable invert on unlink */
6749 +
6750  /*
6751   * Candidates for mandatory locking have the setgid bit set
6752   * but no group execute bit -  an otherwise meaningless combination.
6753 @@ -2337,7 +2380,7 @@ struct filename {
6754         const char              iname[];
6755  };
6756
6757 -extern long vfs_truncate(const struct path *, loff_t);
6758 +extern long vfs_truncate(struct path *, loff_t);
6759  extern int do_truncate(struct dentry *, loff_t start, unsigned int time_attrs,
6760                        struct file *filp);
6761  extern int vfs_fallocate(struct file *file, int mode, loff_t offset,
6762 @@ -2967,6 +3010,7 @@ extern int dcache_dir_open(struct inode
6763  extern int dcache_dir_close(struct inode *, struct file *);
6764  extern loff_t dcache_dir_lseek(struct file *, loff_t, int);
6765  extern int dcache_readdir(struct file *, struct dir_context *);
6766 +extern int dcache_readdir_filter(struct file *, struct dir_context *, int (*)(struct dentry *));
6767  extern int simple_setattr(struct dentry *, struct iattr *);
6768  extern int simple_getattr(struct vfsmount *, struct dentry *, struct kstat *);
6769  extern int simple_statfs(struct dentry *, struct kstatfs *);
6770 diff -NurpP --minimal linux-4.9.135/include/linux/init_task.h linux-4.9.135-vs2.3.9.8/include/linux/init_task.h
6771 --- linux-4.9.135/include/linux/init_task.h     2016-12-11 19:17:54.000000000 +0000
6772 +++ linux-4.9.135-vs2.3.9.8/include/linux/init_task.h   2018-10-20 04:58:14.000000000 +0000
6773 @@ -271,6 +271,10 @@ extern struct task_group root_task_group
6774         INIT_VTIME(tsk)                                                 \
6775         INIT_NUMA_BALANCING(tsk)                                        \
6776         INIT_KASAN(tsk)                                                 \
6777 +       .xid            = 0,                                            \
6778 +       .vx_info        = NULL,                                         \
6779 +       .nid            = 0,                                            \
6780 +       .nx_info        = NULL,                                         \
6781  }
6782
6783
6784 diff -NurpP --minimal linux-4.9.135/include/linux/ipc.h linux-4.9.135-vs2.3.9.8/include/linux/ipc.h
6785 --- linux-4.9.135/include/linux/ipc.h   2016-12-11 19:17:54.000000000 +0000
6786 +++ linux-4.9.135-vs2.3.9.8/include/linux/ipc.h 2018-10-20 04:58:14.000000000 +0000
6787 @@ -16,6 +16,7 @@ struct kern_ipc_perm
6788         key_t           key;
6789         kuid_t          uid;
6790         kgid_t          gid;
6791 +       vxid_t          xid;
6792         kuid_t          cuid;
6793         kgid_t          cgid;
6794         umode_t         mode;
6795 diff -NurpP --minimal linux-4.9.135/include/linux/memcontrol.h linux-4.9.135-vs2.3.9.8/include/linux/memcontrol.h
6796 --- linux-4.9.135/include/linux/memcontrol.h    2018-10-20 10:39:19.000000000 +0000
6797 +++ linux-4.9.135-vs2.3.9.8/include/linux/memcontrol.h  2018-10-20 04:58:14.000000000 +0000
6798 @@ -92,6 +92,7 @@ enum mem_cgroup_events_target {
6799         MEM_CGROUP_NTARGETS,
6800  };
6801
6802 +
6803  #ifdef CONFIG_MEMCG
6804
6805  #define MEM_CGROUP_ID_SHIFT    16
6806 @@ -402,6 +403,12 @@ static inline bool mem_cgroup_is_descend
6807         return cgroup_is_descendant(memcg->css.cgroup, root->css.cgroup);
6808  }
6809
6810 +extern unsigned long mem_cgroup_mem_usage_pages(struct mem_cgroup *memcg);
6811 +extern unsigned long mem_cgroup_mem_limit_pages(struct mem_cgroup *memcg);
6812 +extern unsigned long mem_cgroup_memsw_usage_pages(struct mem_cgroup *memcg);
6813 +extern unsigned long mem_cgroup_memsw_limit_pages(struct mem_cgroup *memcg);
6814 +extern void dump_mem_cgroup(struct mem_cgroup *memcg);
6815 +
6816  static inline bool mm_match_cgroup(struct mm_struct *mm,
6817                                    struct mem_cgroup *memcg)
6818  {
6819 diff -NurpP --minimal linux-4.9.135/include/linux/mount.h linux-4.9.135-vs2.3.9.8/include/linux/mount.h
6820 --- linux-4.9.135/include/linux/mount.h 2018-10-20 10:39:19.000000000 +0000
6821 +++ linux-4.9.135-vs2.3.9.8/include/linux/mount.h       2018-10-20 04:58:14.000000000 +0000
6822 @@ -63,6 +63,9 @@ struct mnt_namespace;
6823  #define MNT_MARKED             0x4000000
6824  #define MNT_UMOUNT             0x8000000
6825
6826 +#define MNT_TAGID      0x10000
6827 +#define MNT_NOTAG      0x20000
6828 +
6829  struct vfsmount {
6830         struct dentry *mnt_root;        /* root of the mounted tree */
6831         struct super_block *mnt_sb;     /* pointer to superblock */
6832 diff -NurpP --minimal linux-4.9.135/include/linux/net.h linux-4.9.135-vs2.3.9.8/include/linux/net.h
6833 --- linux-4.9.135/include/linux/net.h   2016-12-11 19:17:54.000000000 +0000
6834 +++ linux-4.9.135-vs2.3.9.8/include/linux/net.h 2018-10-20 04:58:14.000000000 +0000
6835 @@ -44,6 +44,7 @@ struct net;
6836  #define SOCK_NOSPACE           2
6837  #define SOCK_PASSCRED          3
6838  #define SOCK_PASSSEC           4
6839 +#define SOCK_USER_SOCKET       5
6840
6841  #ifndef ARCH_HAS_SOCKET_TYPES
6842  /**
6843 diff -NurpP --minimal linux-4.9.135/include/linux/netdevice.h linux-4.9.135-vs2.3.9.8/include/linux/netdevice.h
6844 --- linux-4.9.135/include/linux/netdevice.h     2018-10-20 10:39:19.000000000 +0000
6845 +++ linux-4.9.135-vs2.3.9.8/include/linux/netdevice.h   2018-10-20 05:55:43.000000000 +0000
6846 @@ -2481,6 +2481,7 @@ static inline int dev_recursion_level(vo
6847
6848  struct net_device *dev_get_by_index(struct net *net, int ifindex);
6849  struct net_device *__dev_get_by_index(struct net *net, int ifindex);
6850 +struct net_device *dev_get_by_index_real_rcu(struct net *net, int ifindex);
6851  struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex);
6852  int netdev_get_name(struct net *net, char *name, int ifindex);
6853  int dev_restart(struct net_device *dev);
6854 diff -NurpP --minimal linux-4.9.135/include/linux/nsproxy.h linux-4.9.135-vs2.3.9.8/include/linux/nsproxy.h
6855 --- linux-4.9.135/include/linux/nsproxy.h       2016-12-11 19:17:54.000000000 +0000
6856 +++ linux-4.9.135-vs2.3.9.8/include/linux/nsproxy.h     2018-10-20 04:58:14.000000000 +0000
6857 @@ -3,6 +3,7 @@
6858
6859  #include <linux/spinlock.h>
6860  #include <linux/sched.h>
6861 +#include <linux/vserver/debug.h>
6862
6863  struct mnt_namespace;
6864  struct uts_namespace;
6865 @@ -65,6 +66,7 @@ extern struct nsproxy init_nsproxy;
6866   */
6867
6868  int copy_namespaces(unsigned long flags, struct task_struct *tsk);
6869 +struct nsproxy *copy_nsproxy(struct nsproxy *orig);
6870  void exit_task_namespaces(struct task_struct *tsk);
6871  void switch_task_namespaces(struct task_struct *tsk, struct nsproxy *new);
6872  void free_nsproxy(struct nsproxy *ns);
6873 @@ -72,16 +74,26 @@ int unshare_nsproxy_namespaces(unsigned
6874         struct cred *, struct fs_struct *);
6875  int __init nsproxy_cache_init(void);
6876
6877 -static inline void put_nsproxy(struct nsproxy *ns)
6878 +#define        get_nsproxy(n)  __get_nsproxy(n, __FILE__, __LINE__)
6879 +
6880 +static inline void __get_nsproxy(struct nsproxy *ns,
6881 +       const char *_file, int _line)
6882  {
6883 -       if (atomic_dec_and_test(&ns->count)) {
6884 -               free_nsproxy(ns);
6885 -       }
6886 +       vxlprintk(VXD_CBIT(space, 0), "get_nsproxy(%p[%u])",
6887 +               ns, atomic_read(&ns->count), _file, _line);
6888 +       atomic_inc(&ns->count);
6889  }
6890
6891 -static inline void get_nsproxy(struct nsproxy *ns)
6892 +#define        put_nsproxy(n)  __put_nsproxy(n, __FILE__, __LINE__)
6893 +
6894 +static inline void __put_nsproxy(struct nsproxy *ns,
6895 +       const char *_file, int _line)
6896  {
6897 -       atomic_inc(&ns->count);
6898 +       vxlprintk(VXD_CBIT(space, 0), "put_nsproxy(%p[%u])",
6899 +               ns, atomic_read(&ns->count), _file, _line);
6900 +       if (atomic_dec_and_test(&ns->count)) {
6901 +               free_nsproxy(ns);
6902 +       }
6903  }
6904
6905  #endif
6906 diff -NurpP --minimal linux-4.9.135/include/linux/pid.h linux-4.9.135-vs2.3.9.8/include/linux/pid.h
6907 --- linux-4.9.135/include/linux/pid.h   2018-10-20 10:39:20.000000000 +0000
6908 +++ linux-4.9.135-vs2.3.9.8/include/linux/pid.h 2018-10-20 04:58:14.000000000 +0000
6909 @@ -10,7 +10,8 @@ enum pid_type
6910         PIDTYPE_SID,
6911         PIDTYPE_MAX,
6912         /* only valid to __task_pid_nr_ns() */
6913 -       __PIDTYPE_TGID
6914 +       __PIDTYPE_TGID,
6915 +       __PIDTYPE_REALPID
6916  };
6917
6918  /*
6919 @@ -172,6 +173,7 @@ static inline pid_t pid_nr(struct pid *p
6920  }
6921
6922  pid_t pid_nr_ns(struct pid *pid, struct pid_namespace *ns);
6923 +pid_t pid_unmapped_nr_ns(struct pid *pid, struct pid_namespace *ns);
6924  pid_t pid_vnr(struct pid *pid);
6925
6926  #define do_each_pid_task(pid, type, task)                              \
6927 diff -NurpP --minimal linux-4.9.135/include/linux/quotaops.h linux-4.9.135-vs2.3.9.8/include/linux/quotaops.h
6928 --- linux-4.9.135/include/linux/quotaops.h      2016-12-11 19:17:54.000000000 +0000
6929 +++ linux-4.9.135-vs2.3.9.8/include/linux/quotaops.h    2018-10-20 04:58:14.000000000 +0000
6930 @@ -8,6 +8,7 @@
6931  #define _LINUX_QUOTAOPS_
6932
6933  #include <linux/fs.h>
6934 +#include <linux/vs_dlimit.h>
6935
6936  #define DQUOT_SPACE_WARN       0x1
6937  #define DQUOT_SPACE_RESERVE    0x2
6938 @@ -214,11 +215,12 @@ static inline void dquot_drop(struct ino
6939
6940  static inline int dquot_alloc_inode(struct inode *inode)
6941  {
6942 -       return 0;
6943 +       return dl_alloc_inode(inode);
6944  }
6945
6946  static inline void dquot_free_inode(struct inode *inode)
6947  {
6948 +       dl_free_inode(inode);
6949  }
6950
6951  static inline int dquot_transfer(struct inode *inode, struct iattr *iattr)
6952 @@ -229,6 +231,10 @@ static inline int dquot_transfer(struct
6953  static inline int __dquot_alloc_space(struct inode *inode, qsize_t number,
6954                 int flags)
6955  {
6956 +       int ret = 0;
6957 +
6958 +       if ((ret = dl_alloc_space(inode, number)))
6959 +               return ret;
6960         if (!(flags & DQUOT_SPACE_RESERVE))
6961                 inode_add_bytes(inode, number);
6962         return 0;
6963 @@ -239,6 +245,7 @@ static inline void __dquot_free_space(st
6964  {
6965         if (!(flags & DQUOT_SPACE_RESERVE))
6966                 inode_sub_bytes(inode, number);
6967 +       dl_free_space(inode, number);
6968  }
6969
6970  static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
6971 diff -NurpP --minimal linux-4.9.135/include/linux/sched.h linux-4.9.135-vs2.3.9.8/include/linux/sched.h
6972 --- linux-4.9.135/include/linux/sched.h 2018-10-20 10:39:20.000000000 +0000
6973 +++ linux-4.9.135-vs2.3.9.8/include/linux/sched.h       2018-10-20 05:55:43.000000000 +0000
6974 @@ -1718,6 +1718,14 @@ struct task_struct {
6975  #endif
6976         struct seccomp seccomp;
6977
6978 +/* vserver context data */
6979 +       struct vx_info *vx_info;
6980 +       struct nx_info *nx_info;
6981 +
6982 +       vxid_t xid;
6983 +       vnid_t nid;
6984 +       vtag_t tag;
6985 +
6986  /* Thread group tracking */
6987         u32 parent_exec_id;
6988         u32 self_exec_id;
6989 @@ -2111,6 +2119,11 @@ struct pid_namespace;
6990  pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
6991                         struct pid_namespace *ns);
6992
6993 +#include <linux/vserver/base.h>
6994 +#include <linux/vserver/context.h>
6995 +#include <linux/vserver/debug.h>
6996 +#include <linux/vserver/pid.h>
6997 +
6998  static inline pid_t task_pid_nr(struct task_struct *tsk)
6999  {
7000         return tsk->pid;
7001 @@ -2124,7 +2137,8 @@ static inline pid_t task_pid_nr_ns(struc
7002
7003  static inline pid_t task_pid_vnr(struct task_struct *tsk)
7004  {
7005 -       return __task_pid_nr_ns(tsk, PIDTYPE_PID, NULL);
7006 +       // return __task_pid_nr_ns(tsk, PIDTYPE_PID, NULL);
7007 +       return vx_map_pid(__task_pid_nr_ns(tsk, PIDTYPE_PID, NULL));
7008  }
7009
7010
7011 diff -NurpP --minimal linux-4.9.135/include/linux/shmem_fs.h linux-4.9.135-vs2.3.9.8/include/linux/shmem_fs.h
7012 --- linux-4.9.135/include/linux/shmem_fs.h      2016-12-11 19:17:54.000000000 +0000
7013 +++ linux-4.9.135-vs2.3.9.8/include/linux/shmem_fs.h    2018-10-20 04:58:14.000000000 +0000
7014 @@ -10,6 +10,9 @@
7015
7016  /* inode in-kernel data */
7017
7018 +#define TMPFS_SUPER_MAGIC      0x01021994
7019 +
7020 +
7021  struct shmem_inode_info {
7022         spinlock_t              lock;
7023         unsigned int            seals;          /* shmem seals */
7024 diff -NurpP --minimal linux-4.9.135/include/linux/stat.h linux-4.9.135-vs2.3.9.8/include/linux/stat.h
7025 --- linux-4.9.135/include/linux/stat.h  2016-12-11 19:17:54.000000000 +0000
7026 +++ linux-4.9.135-vs2.3.9.8/include/linux/stat.h        2018-10-20 04:58:14.000000000 +0000
7027 @@ -25,6 +25,7 @@ struct kstat {
7028         unsigned int    nlink;
7029         kuid_t          uid;
7030         kgid_t          gid;
7031 +       ktag_t          tag;
7032         dev_t           rdev;
7033         loff_t          size;
7034         struct timespec  atime;
7035 diff -NurpP --minimal linux-4.9.135/include/linux/sunrpc/auth.h linux-4.9.135-vs2.3.9.8/include/linux/sunrpc/auth.h
7036 --- linux-4.9.135/include/linux/sunrpc/auth.h   2016-12-11 19:17:54.000000000 +0000
7037 +++ linux-4.9.135-vs2.3.9.8/include/linux/sunrpc/auth.h 2018-10-20 04:58:14.000000000 +0000
7038 @@ -46,6 +46,7 @@ enum {
7039  struct auth_cred {
7040         kuid_t  uid;
7041         kgid_t  gid;
7042 +       ktag_t  tag;
7043         struct group_info *group_info;
7044         const char *principal;
7045         unsigned long ac_flags;
7046 diff -NurpP --minimal linux-4.9.135/include/linux/sunrpc/clnt.h linux-4.9.135-vs2.3.9.8/include/linux/sunrpc/clnt.h
7047 --- linux-4.9.135/include/linux/sunrpc/clnt.h   2018-10-20 10:39:20.000000000 +0000
7048 +++ linux-4.9.135-vs2.3.9.8/include/linux/sunrpc/clnt.h 2018-10-20 05:55:43.000000000 +0000
7049 @@ -52,7 +52,8 @@ struct rpc_clnt {
7050                                 cl_discrtry : 1,/* disconnect before retry */
7051                                 cl_noretranstimeo: 1,/* No retransmit timeouts */
7052                                 cl_autobind : 1,/* use getport() */
7053 -                               cl_chatty   : 1;/* be verbose */
7054 +                               cl_chatty   : 1,/* be verbose */
7055 +                               cl_tag      : 1;/* context tagging */
7056
7057         struct rpc_rtt *        cl_rtt;         /* RTO estimator data */
7058         const struct rpc_timeout *cl_timeout;   /* Timeout strategy */
7059 diff -NurpP --minimal linux-4.9.135/include/linux/types.h linux-4.9.135-vs2.3.9.8/include/linux/types.h
7060 --- linux-4.9.135/include/linux/types.h 2016-12-11 19:17:54.000000000 +0000
7061 +++ linux-4.9.135-vs2.3.9.8/include/linux/types.h       2018-10-20 04:58:14.000000000 +0000
7062 @@ -32,6 +32,9 @@ typedef __kernel_uid32_t      uid_t;
7063  typedef __kernel_gid32_t       gid_t;
7064  typedef __kernel_uid16_t        uid16_t;
7065  typedef __kernel_gid16_t        gid16_t;
7066 +typedef unsigned int           vxid_t;
7067 +typedef unsigned int           vnid_t;
7068 +typedef unsigned int           vtag_t;
7069
7070  typedef unsigned long          uintptr_t;
7071
7072 diff -NurpP --minimal linux-4.9.135/include/linux/uidgid.h linux-4.9.135-vs2.3.9.8/include/linux/uidgid.h
7073 --- linux-4.9.135/include/linux/uidgid.h        2016-12-11 19:17:54.000000000 +0000
7074 +++ linux-4.9.135-vs2.3.9.8/include/linux/uidgid.h      2018-10-20 04:58:14.000000000 +0000
7075 @@ -21,13 +21,17 @@ typedef struct {
7076         uid_t val;
7077  } kuid_t;
7078
7079 -
7080  typedef struct {
7081         gid_t val;
7082  } kgid_t;
7083
7084 +typedef struct {
7085 +       vtag_t val;
7086 +} ktag_t;
7087 +
7088  #define KUIDT_INIT(value) (kuid_t){ value }
7089  #define KGIDT_INIT(value) (kgid_t){ value }
7090 +#define KTAGT_INIT(value) (ktag_t){ value }
7091
7092  #ifdef CONFIG_MULTIUSER
7093  static inline uid_t __kuid_val(kuid_t uid)
7094 @@ -51,11 +55,18 @@ static inline gid_t __kgid_val(kgid_t gi
7095  }
7096  #endif
7097
7098 +static inline vtag_t __ktag_val(ktag_t tag)
7099 +{
7100 +       return tag.val;
7101 +}
7102 +
7103  #define GLOBAL_ROOT_UID KUIDT_INIT(0)
7104  #define GLOBAL_ROOT_GID KGIDT_INIT(0)
7105 +#define GLOBAL_ROOT_TAG KTAGT_INIT(0)
7106
7107  #define INVALID_UID KUIDT_INIT(-1)
7108  #define INVALID_GID KGIDT_INIT(-1)
7109 +#define INVALID_TAG KTAGT_INIT(-1)
7110
7111  static inline bool uid_eq(kuid_t left, kuid_t right)
7112  {
7113 @@ -67,6 +78,11 @@ static inline bool gid_eq(kgid_t left, k
7114         return __kgid_val(left) == __kgid_val(right);
7115  }
7116
7117 +static inline bool tag_eq(ktag_t left, ktag_t right)
7118 +{
7119 +       return __ktag_val(left) == __ktag_val(right);
7120 +}
7121 +
7122  static inline bool uid_gt(kuid_t left, kuid_t right)
7123  {
7124         return __kuid_val(left) > __kuid_val(right);
7125 @@ -117,13 +133,21 @@ static inline bool gid_valid(kgid_t gid)
7126         return __kgid_val(gid) != (gid_t) -1;
7127  }
7128
7129 +static inline bool tag_valid(ktag_t tag)
7130 +{
7131 +       return !tag_eq(tag, INVALID_TAG);
7132 +}
7133 +
7134  #ifdef CONFIG_USER_NS
7135
7136  extern kuid_t make_kuid(struct user_namespace *from, uid_t uid);
7137  extern kgid_t make_kgid(struct user_namespace *from, gid_t gid);
7138 +extern ktag_t make_ktag(struct user_namespace *from, gid_t gid);
7139
7140  extern uid_t from_kuid(struct user_namespace *to, kuid_t uid);
7141  extern gid_t from_kgid(struct user_namespace *to, kgid_t gid);
7142 +extern vtag_t from_ktag(struct user_namespace *to, ktag_t tag);
7143 +
7144  extern uid_t from_kuid_munged(struct user_namespace *to, kuid_t uid);
7145  extern gid_t from_kgid_munged(struct user_namespace *to, kgid_t gid);
7146
7147 @@ -149,6 +173,11 @@ static inline kgid_t make_kgid(struct us
7148         return KGIDT_INIT(gid);
7149  }
7150
7151 +static inline ktag_t make_ktag(struct user_namespace *from, vtag_t tag)
7152 +{
7153 +       return KTAGT_INIT(tag);
7154 +}
7155 +
7156  static inline uid_t from_kuid(struct user_namespace *to, kuid_t kuid)
7157  {
7158         return __kuid_val(kuid);
7159 @@ -159,6 +188,11 @@ static inline gid_t from_kgid(struct use
7160         return __kgid_val(kgid);
7161  }
7162
7163 +static inline vtag_t from_ktag(struct user_namespace *to, ktag_t ktag)
7164 +{
7165 +       return __ktag_val(ktag);
7166 +}
7167 +
7168  static inline uid_t from_kuid_munged(struct user_namespace *to, kuid_t kuid)
7169  {
7170         uid_t uid = from_kuid(to, kuid);
7171 diff -NurpP --minimal linux-4.9.135/include/linux/vroot.h linux-4.9.135-vs2.3.9.8/include/linux/vroot.h
7172 --- linux-4.9.135/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000
7173 +++ linux-4.9.135-vs2.3.9.8/include/linux/vroot.h       2018-10-20 04:58:14.000000000 +0000
7174 @@ -0,0 +1,51 @@
7175 +
7176 +/*
7177 + * include/linux/vroot.h
7178 + *
7179 + * written by Herbert P?tzl, 9/11/2002
7180 + * ported to 2.6 by Herbert P?tzl, 30/12/2004
7181 + *
7182 + * Copyright (C) 2002-2007 by Herbert P?tzl.
7183 + * Redistribution of this file is permitted under the
7184 + * GNU General Public License.
7185 + */
7186 +
7187 +#ifndef _LINUX_VROOT_H
7188 +#define _LINUX_VROOT_H
7189 +
7190 +
7191 +#ifdef __KERNEL__
7192 +
7193 +/* Possible states of device */
7194 +enum {
7195 +       Vr_unbound,
7196 +       Vr_bound,
7197 +};
7198 +
7199 +struct vroot_device {
7200 +       int             vr_number;
7201 +       int             vr_refcnt;
7202 +
7203 +       struct semaphore        vr_ctl_mutex;
7204 +       struct block_device    *vr_device;
7205 +       int                     vr_state;
7206 +};
7207 +
7208 +
7209 +typedef struct block_device *(vroot_grb_func)(struct block_device *);
7210 +
7211 +extern int register_vroot_grb(vroot_grb_func *);
7212 +extern int unregister_vroot_grb(vroot_grb_func *);
7213 +
7214 +#endif /* __KERNEL__ */
7215 +
7216 +#define MAX_VROOT_DEFAULT      8
7217 +
7218 +/*
7219 + * IOCTL commands --- we will commandeer 0x56 ('V')
7220 + */
7221 +
7222 +#define VROOT_SET_DEV          0x5600
7223 +#define VROOT_CLR_DEV          0x5601
7224 +
7225 +#endif /* _LINUX_VROOT_H */
7226 diff -NurpP --minimal linux-4.9.135/include/linux/vs_base.h linux-4.9.135-vs2.3.9.8/include/linux/vs_base.h
7227 --- linux-4.9.135/include/linux/vs_base.h       1970-01-01 00:00:00.000000000 +0000
7228 +++ linux-4.9.135-vs2.3.9.8/include/linux/vs_base.h     2018-10-20 04:58:14.000000000 +0000
7229 @@ -0,0 +1,10 @@
7230 +#ifndef _VS_BASE_H
7231 +#define _VS_BASE_H
7232 +
7233 +#include "vserver/base.h"
7234 +#include "vserver/check.h"
7235 +#include "vserver/debug.h"
7236 +
7237 +#else
7238 +#warning duplicate inclusion
7239 +#endif
7240 diff -NurpP --minimal linux-4.9.135/include/linux/vs_context.h linux-4.9.135-vs2.3.9.8/include/linux/vs_context.h
7241 --- linux-4.9.135/include/linux/vs_context.h    1970-01-01 00:00:00.000000000 +0000
7242 +++ linux-4.9.135-vs2.3.9.8/include/linux/vs_context.h  2018-10-20 04:58:14.000000000 +0000
7243 @@ -0,0 +1,242 @@
7244 +#ifndef _VS_CONTEXT_H
7245 +#define _VS_CONTEXT_H
7246 +
7247 +#include "vserver/base.h"
7248 +#include "vserver/check.h"
7249 +#include "vserver/context.h"
7250 +#include "vserver/history.h"
7251 +#include "vserver/debug.h"
7252 +
7253 +#include <linux/sched.h>
7254 +
7255 +
7256 +#define get_vx_info(i) __get_vx_info(i, __FILE__, __LINE__, __HERE__)
7257 +
7258 +static inline struct vx_info *__get_vx_info(struct vx_info *vxi,
7259 +       const char *_file, int _line, void *_here)
7260 +{
7261 +       if (!vxi)
7262 +               return NULL;
7263 +
7264 +       vxlprintk(VXD_CBIT(xid, 2), "get_vx_info(%p[#%d.%d])",
7265 +               vxi, vxi ? vxi->vx_id : 0,
7266 +               vxi ? atomic_read(&vxi->vx_usecnt) : 0,
7267 +               _file, _line);
7268 +       __vxh_get_vx_info(vxi, _here);
7269 +
7270 +       atomic_inc(&vxi->vx_usecnt);
7271 +       return vxi;
7272 +}
7273 +
7274 +
7275 +extern void free_vx_info(struct vx_info *);
7276 +
7277 +#define put_vx_info(i) __put_vx_info(i, __FILE__, __LINE__, __HERE__)
7278 +
7279 +static inline void __put_vx_info(struct vx_info *vxi,
7280 +       const char *_file, int _line, void *_here)
7281 +{
7282 +       if (!vxi)
7283 +               return;
7284 +
7285 +       vxlprintk(VXD_CBIT(xid, 2), "put_vx_info(%p[#%d.%d])",
7286 +               vxi, vxi ? vxi->vx_id : 0,
7287 +               vxi ? atomic_read(&vxi->vx_usecnt) : 0,
7288 +               _file, _line);
7289 +       __vxh_put_vx_info(vxi, _here);
7290 +
7291 +       if (atomic_dec_and_test(&vxi->vx_usecnt))
7292 +               free_vx_info(vxi);
7293 +}
7294 +
7295 +
7296 +#define init_vx_info(p, i) \
7297 +       __init_vx_info(p, i, __FILE__, __LINE__, __HERE__)
7298 +
7299 +static inline void __init_vx_info(struct vx_info **vxp, struct vx_info *vxi,
7300 +       const char *_file, int _line, void *_here)
7301 +{
7302 +       if (vxi) {
7303 +               vxlprintk(VXD_CBIT(xid, 3),
7304 +                       "init_vx_info(%p[#%d.%d])",
7305 +                       vxi, vxi ? vxi->vx_id : 0,
7306 +                       vxi ? atomic_read(&vxi->vx_usecnt) : 0,
7307 +                       _file, _line);
7308 +               __vxh_init_vx_info(vxi, vxp, _here);
7309 +
7310 +               atomic_inc(&vxi->vx_usecnt);
7311 +       }
7312 +       *vxp = vxi;
7313 +}
7314 +
7315 +
7316 +#define set_vx_info(p, i) \
7317 +       __set_vx_info(p, i, __FILE__, __LINE__, __HERE__)
7318 +
7319 +static inline void __set_vx_info(struct vx_info **vxp, struct vx_info *vxi,
7320 +       const char *_file, int _line, void *_here)
7321 +{
7322 +       struct vx_info *vxo;
7323 +
7324 +       if (!vxi)
7325 +               return;
7326 +
7327 +       vxlprintk(VXD_CBIT(xid, 3), "set_vx_info(%p[#%d.%d])",
7328 +               vxi, vxi ? vxi->vx_id : 0,
7329 +               vxi ? atomic_read(&vxi->vx_usecnt) : 0,
7330 +               _file, _line);
7331 +       __vxh_set_vx_info(vxi, vxp, _here);
7332 +
7333 +       atomic_inc(&vxi->vx_usecnt);
7334 +       vxo = xchg(vxp, vxi);
7335 +       BUG_ON(vxo);
7336 +}
7337 +
7338 +
7339 +#define clr_vx_info(p) __clr_vx_info(p, __FILE__, __LINE__, __HERE__)
7340 +
7341 +static inline void __clr_vx_info(struct vx_info **vxp,
7342 +       const char *_file, int _line, void *_here)
7343 +{
7344 +       struct vx_info *vxo;
7345 +
7346 +       vxo = xchg(vxp, NULL);
7347 +       if (!vxo)
7348 +               return;
7349 +
7350 +       vxlprintk(VXD_CBIT(xid, 3), "clr_vx_info(%p[#%d.%d])",
7351 +               vxo, vxo ? vxo->vx_id : 0,
7352 +               vxo ? atomic_read(&vxo->vx_usecnt) : 0,
7353 +               _file, _line);
7354 +       __vxh_clr_vx_info(vxo, vxp, _here);
7355 +
7356 +       if (atomic_dec_and_test(&vxo->vx_usecnt))
7357 +               free_vx_info(vxo);
7358 +}
7359 +
7360 +
7361 +#define claim_vx_info(v, p) \
7362 +       __claim_vx_info(v, p, __FILE__, __LINE__, __HERE__)
7363 +
7364 +static inline void __claim_vx_info(struct vx_info *vxi,
7365 +       struct task_struct *task,
7366 +       const char *_file, int _line, void *_here)
7367 +{
7368 +       vxlprintk(VXD_CBIT(xid, 3), "claim_vx_info(%p[#%d.%d.%d]) %p",
7369 +               vxi, vxi ? vxi->vx_id : 0,
7370 +               vxi ? atomic_read(&vxi->vx_usecnt) : 0,
7371 +               vxi ? atomic_read(&vxi->vx_tasks) : 0,
7372 +               task, _file, _line);
7373 +       __vxh_claim_vx_info(vxi, task, _here);
7374 +
7375 +       atomic_inc(&vxi->vx_tasks);
7376 +}
7377 +
7378 +
7379 +extern void unhash_vx_info(struct vx_info *);
7380 +
7381 +#define release_vx_info(v, p) \
7382 +       __release_vx_info(v, p, __FILE__, __LINE__, __HERE__)
7383 +
7384 +static inline void __release_vx_info(struct vx_info *vxi,
7385 +       struct task_struct *task,
7386 +       const char *_file, int _line, void *_here)
7387 +{
7388 +       vxlprintk(VXD_CBIT(xid, 3), "release_vx_info(%p[#%d.%d.%d]) %p",
7389 +               vxi, vxi ? vxi->vx_id : 0,
7390 +               vxi ? atomic_read(&vxi->vx_usecnt) : 0,
7391 +               vxi ? atomic_read(&vxi->vx_tasks) : 0,
7392 +               task, _file, _line);
7393 +       __vxh_release_vx_info(vxi, task, _here);
7394 +
7395 +       might_sleep();
7396 +
7397 +       if (atomic_dec_and_test(&vxi->vx_tasks))
7398 +               unhash_vx_info(vxi);
7399 +}
7400 +
7401 +
7402 +#define task_get_vx_info(p) \
7403 +       __task_get_vx_info(p, __FILE__, __LINE__, __HERE__)
7404 +
7405 +static inline struct vx_info *__task_get_vx_info(struct task_struct *p,
7406 +       const char *_file, int _line, void *_here)
7407 +{
7408 +       struct vx_info *vxi;
7409 +
7410 +       task_lock(p);
7411 +       vxlprintk(VXD_CBIT(xid, 5), "task_get_vx_info(%p)",
7412 +               p, _file, _line);
7413 +       vxi = __get_vx_info(p->vx_info, _file, _line, _here);
7414 +       task_unlock(p);
7415 +       return vxi;
7416 +}
7417 +
7418 +
7419 +static inline void __wakeup_vx_info(struct vx_info *vxi)
7420 +{
7421 +       if (waitqueue_active(&vxi->vx_wait))
7422 +               wake_up_interruptible(&vxi->vx_wait);
7423 +}
7424 +
7425 +
7426 +#define enter_vx_info(v, s) __enter_vx_info(v, s, __FILE__, __LINE__)
7427 +
7428 +static inline void __enter_vx_info(struct vx_info *vxi,
7429 +       struct vx_info_save *vxis, const char *_file, int _line)
7430 +{
7431 +       vxlprintk(VXD_CBIT(xid, 5), "enter_vx_info(%p[#%d],%p) %p[#%d,%p]",
7432 +               vxi, vxi ? vxi->vx_id : 0, vxis, current,
7433 +               current->xid, current->vx_info, _file, _line);
7434 +       vxis->vxi = xchg(&current->vx_info, vxi);
7435 +       vxis->xid = current->xid;
7436 +       current->xid = vxi ? vxi->vx_id : 0;
7437 +}
7438 +
7439 +#define leave_vx_info(s) __leave_vx_info(s, __FILE__, __LINE__)
7440 +
7441 +static inline void __leave_vx_info(struct vx_info_save *vxis,
7442 +       const char *_file, int _line)
7443 +{
7444 +       vxlprintk(VXD_CBIT(xid, 5), "leave_vx_info(%p[#%d,%p]) %p[#%d,%p]",
7445 +               vxis, vxis->xid, vxis->vxi, current,
7446 +               current->xid, current->vx_info, _file, _line);
7447 +       (void)xchg(&current->vx_info, vxis->vxi);
7448 +       current->xid = vxis->xid;
7449 +}
7450 +
7451 +
7452 +static inline void __enter_vx_admin(struct vx_info_save *vxis)
7453 +{
7454 +       vxis->vxi = xchg(&current->vx_info, NULL);
7455 +       vxis->xid = xchg(&current->xid, (vxid_t)0);
7456 +}
7457 +
7458 +static inline void __leave_vx_admin(struct vx_info_save *vxis)
7459 +{
7460 +       (void)xchg(&current->xid, vxis->xid);
7461 +       (void)xchg(&current->vx_info, vxis->vxi);
7462 +}
7463 +
7464 +#define task_is_init(p) \
7465 +       __task_is_init(p, __FILE__, __LINE__, __HERE__)
7466 +
7467 +static inline int __task_is_init(struct task_struct *p,
7468 +       const char *_file, int _line, void *_here)
7469 +{
7470 +       int is_init = is_global_init(p);
7471 +
7472 +       task_lock(p);
7473 +       if (p->vx_info)
7474 +               is_init = p->vx_info->vx_initpid == p->pid;
7475 +       task_unlock(p);
7476 +       return is_init;
7477 +}
7478 +
7479 +extern void exit_vx_info(struct task_struct *, int);
7480 +extern void exit_vx_info_early(struct task_struct *, int);
7481 +
7482 +
7483 +#else
7484 +#warning duplicate inclusion
7485 +#endif
7486 diff -NurpP --minimal linux-4.9.135/include/linux/vs_cowbl.h linux-4.9.135-vs2.3.9.8/include/linux/vs_cowbl.h
7487 --- linux-4.9.135/include/linux/vs_cowbl.h      1970-01-01 00:00:00.000000000 +0000
7488 +++ linux-4.9.135-vs2.3.9.8/include/linux/vs_cowbl.h    2018-10-20 04:58:14.000000000 +0000
7489 @@ -0,0 +1,48 @@
7490 +#ifndef _VS_COWBL_H
7491 +#define _VS_COWBL_H
7492 +
7493 +#include <linux/fs.h>
7494 +#include <linux/dcache.h>
7495 +#include <linux/namei.h>
7496 +#include <linux/slab.h>
7497 +
7498 +extern struct dentry *cow_break_link(const char *pathname);
7499 +
7500 +static inline int cow_check_and_break(struct path *path)
7501 +{
7502 +       struct inode *inode = path->dentry->d_inode;
7503 +       int error = 0;
7504 +
7505 +       /* do we need this check? */
7506 +       if (IS_RDONLY(inode))
7507 +               return -EROFS;
7508 +
7509 +       if (IS_COW(inode)) {
7510 +               if (IS_COW_LINK(inode)) {
7511 +                       struct dentry *new_dentry, *old_dentry = path->dentry;
7512 +                       char *pp, *buf;
7513 +
7514 +                       buf = kmalloc(PATH_MAX, GFP_KERNEL);
7515 +                       if (!buf) {
7516 +                               return -ENOMEM;
7517 +                       }
7518 +                       pp = d_path(path, buf, PATH_MAX);
7519 +                       new_dentry = cow_break_link(pp);
7520 +                       kfree(buf);
7521 +                       if (!IS_ERR(new_dentry)) {
7522 +                               path->dentry = new_dentry;
7523 +                               dput(old_dentry);
7524 +                       } else
7525 +                               error = PTR_ERR(new_dentry);
7526 +               } else {
7527 +                       inode->i_flags &= ~(S_IXUNLINK | S_IMMUTABLE);
7528 +                       inode->i_ctime = CURRENT_TIME;
7529 +                       mark_inode_dirty(inode);
7530 +               }
7531 +       }
7532 +       return error;
7533 +}
7534 +
7535 +#else
7536 +#warning duplicate inclusion
7537 +#endif
7538 diff -NurpP --minimal linux-4.9.135/include/linux/vs_cvirt.h linux-4.9.135-vs2.3.9.8/include/linux/vs_cvirt.h
7539 --- linux-4.9.135/include/linux/vs_cvirt.h      1970-01-01 00:00:00.000000000 +0000
7540 +++ linux-4.9.135-vs2.3.9.8/include/linux/vs_cvirt.h    2018-10-20 04:58:14.000000000 +0000
7541 @@ -0,0 +1,50 @@
7542 +#ifndef _VS_CVIRT_H
7543 +#define _VS_CVIRT_H
7544 +
7545 +#include "vserver/cvirt.h"
7546 +#include "vserver/context.h"
7547 +#include "vserver/base.h"
7548 +#include "vserver/check.h"
7549 +#include "vserver/debug.h"
7550 +
7551 +
7552 +static inline void vx_activate_task(struct task_struct *p)
7553 +{
7554 +       struct vx_info *vxi;
7555 +
7556 +       if ((vxi = p->vx_info)) {
7557 +               vx_update_load(vxi);
7558 +               atomic_inc(&vxi->cvirt.nr_running);
7559 +       }
7560 +}
7561 +
7562 +static inline void vx_deactivate_task(struct task_struct *p)
7563 +{
7564 +       struct vx_info *vxi;
7565 +
7566 +       if ((vxi = p->vx_info)) {
7567 +               vx_update_load(vxi);
7568 +               atomic_dec(&vxi->cvirt.nr_running);
7569 +       }
7570 +}
7571 +
7572 +static inline void vx_uninterruptible_inc(struct task_struct *p)
7573 +{
7574 +       struct vx_info *vxi;
7575 +
7576 +       if ((vxi = p->vx_info))
7577 +               atomic_inc(&vxi->cvirt.nr_uninterruptible);
7578 +}
7579 +
7580 +static inline void vx_uninterruptible_dec(struct task_struct *p)
7581 +{
7582 +       struct vx_info *vxi;
7583 +
7584 +       if ((vxi = p->vx_info))
7585 +               atomic_dec(&vxi->cvirt.nr_uninterruptible);
7586 +}
7587 +
7588 +
7589 +#else
7590 +#warning duplicate inclusion
7591 +#endif
7592 diff -NurpP --minimal linux-4.9.135/include/linux/vs_device.h linux-4.9.135-vs2.3.9.8/include/linux/vs_device.h
7593 --- linux-4.9.135/include/linux/vs_device.h     1970-01-01 00:00:00.000000000 +0000
7594 +++ linux-4.9.135-vs2.3.9.8/include/linux/vs_device.h   2018-10-20 04:58:14.000000000 +0000
7595 @@ -0,0 +1,45 @@
7596 +#ifndef _VS_DEVICE_H
7597 +#define _VS_DEVICE_H
7598 +
7599 +#include "vserver/base.h"
7600 +#include "vserver/device.h"
7601 +#include "vserver/debug.h"
7602 +
7603 +
7604 +#ifdef CONFIG_VSERVER_DEVICE
7605 +
7606 +int vs_map_device(struct vx_info *, dev_t, dev_t *, umode_t);
7607 +
7608 +#define vs_device_perm(v, d, m, p) \
7609 +       ((vs_map_device(current_vx_info(), d, NULL, m) & (p)) == (p))
7610 +
7611 +#else
7612 +
7613 +static inline
7614 +int vs_map_device(struct vx_info *vxi,
7615 +       dev_t device, dev_t *target, umode_t mode)
7616 +{
7617 +       if (target)
7618 +               *target = device;
7619 +       return ~0;
7620 +}
7621 +
7622 +#define vs_device_perm(v, d, m, p) ((p) == (p))
7623 +
7624 +#endif
7625 +
7626 +
7627 +#define vs_map_chrdev(d, t, p) \
7628 +       ((vs_map_device(current_vx_info(), d, t, S_IFCHR) & (p)) == (p))
7629 +#define vs_map_blkdev(d, t, p) \
7630 +       ((vs_map_device(current_vx_info(), d, t, S_IFBLK) & (p)) == (p))
7631 +
7632 +#define vs_chrdev_perm(d, p) \
7633 +       vs_device_perm(current_vx_info(), d, S_IFCHR, p)
7634 +#define vs_blkdev_perm(d, p) \
7635 +       vs_device_perm(current_vx_info(), d, S_IFBLK, p)
7636 +
7637 +
7638 +#else
7639 +#warning duplicate inclusion
7640 +#endif
7641 diff -NurpP --minimal linux-4.9.135/include/linux/vs_dlimit.h linux-4.9.135-vs2.3.9.8/include/linux/vs_dlimit.h
7642 --- linux-4.9.135/include/linux/vs_dlimit.h     1970-01-01 00:00:00.000000000 +0000
7643 +++ linux-4.9.135-vs2.3.9.8/include/linux/vs_dlimit.h   2018-10-20 04:58:14.000000000 +0000
7644 @@ -0,0 +1,215 @@
7645 +#ifndef _VS_DLIMIT_H
7646 +#define _VS_DLIMIT_H
7647 +
7648 +#include <linux/fs.h>
7649 +
7650 +#include "vserver/dlimit.h"
7651 +#include "vserver/base.h"
7652 +#include "vserver/debug.h"
7653 +
7654 +
7655 +#define get_dl_info(i) __get_dl_info(i, __FILE__, __LINE__)
7656 +
7657 +static inline struct dl_info *__get_dl_info(struct dl_info *dli,
7658 +       const char *_file, int _line)
7659 +{
7660 +       if (!dli)
7661 +               return NULL;
7662 +       vxlprintk(VXD_CBIT(dlim, 4), "get_dl_info(%p[#%d.%d])",
7663 +               dli, dli ? dli->dl_tag : 0,
7664 +               dli ? atomic_read(&dli->dl_usecnt) : 0,
7665 +               _file, _line);
7666 +       atomic_inc(&dli->dl_usecnt);
7667 +       return dli;
7668 +}
7669 +
7670 +
7671 +#define free_dl_info(i) \
7672 +       call_rcu(&(i)->dl_rcu, rcu_free_dl_info)
7673 +
7674 +#define put_dl_info(i) __put_dl_info(i, __FILE__, __LINE__)
7675 +
7676 +static inline void __put_dl_info(struct dl_info *dli,
7677 +       const char *_file, int _line)
7678 +{
7679 +       if (!dli)
7680 +               return;
7681 +       vxlprintk(VXD_CBIT(dlim, 4), "put_dl_info(%p[#%d.%d])",
7682 +               dli, dli ? dli->dl_tag : 0,
7683 +               dli ? atomic_read(&dli->dl_usecnt) : 0,
7684 +               _file, _line);
7685 +       if (atomic_dec_and_test(&dli->dl_usecnt))
7686 +               free_dl_info(dli);
7687 +}
7688 +
7689 +
7690 +#define __dlimit_char(d)       ((d) ? '*' : ' ')
7691 +
7692 +static inline int __dl_alloc_space(struct super_block *sb,
7693 +       vtag_t tag, dlsize_t nr, const char *file, int line)
7694 +{
7695 +       struct dl_info *dli = NULL;
7696 +       int ret = 0;
7697 +
7698 +       if (nr == 0)
7699 +               goto out;
7700 +       dli = locate_dl_info(sb, tag);
7701 +       if (!dli)
7702 +               goto out;
7703 +
7704 +       spin_lock(&dli->dl_lock);
7705 +       ret = (dli->dl_space_used + nr > dli->dl_space_total);
7706 +       if (!ret)
7707 +               dli->dl_space_used += nr;
7708 +       spin_unlock(&dli->dl_lock);
7709 +       put_dl_info(dli);
7710 +out:
7711 +       vxlprintk(VXD_CBIT(dlim, 1),
7712 +               "ALLOC (%p,#%d)%c %lld bytes (%d)",
7713 +               sb, tag, __dlimit_char(dli), (long long)nr,
7714 +               ret, file, line);
7715 +       return ret ? -ENOSPC : 0;
7716 +}
7717 +
7718 +static inline void __dl_free_space(struct super_block *sb,
7719 +       vtag_t tag, dlsize_t nr, const char *_file, int _line)
7720 +{
7721 +       struct dl_info *dli = NULL;
7722 +
7723 +       if (nr == 0)
7724 +               goto out;
7725 +       dli = locate_dl_info(sb, tag);
7726 +       if (!dli)
7727 +               goto out;
7728 +
7729 +       spin_lock(&dli->dl_lock);
7730 +       if (dli->dl_space_used > nr)
7731 +               dli->dl_space_used -= nr;
7732 +       else
7733 +               dli->dl_space_used = 0;
7734 +       spin_unlock(&dli->dl_lock);
7735 +       put_dl_info(dli);
7736 +out:
7737 +       vxlprintk(VXD_CBIT(dlim, 1),
7738 +               "FREE  (%p,#%d)%c %lld bytes",
7739 +               sb, tag, __dlimit_char(dli), (long long)nr,
7740 +               _file, _line);
7741 +}
7742 +
7743 +static inline int __dl_alloc_inode(struct super_block *sb,
7744 +       vtag_t tag, const char *_file, int _line)
7745 +{
7746 +       struct dl_info *dli;
7747 +       int ret = 0;
7748 +
7749 +       dli = locate_dl_info(sb, tag);
7750 +       if (!dli)
7751 +               goto out;
7752 +
7753 +       spin_lock(&dli->dl_lock);
7754 +       dli->dl_inodes_used++;
7755 +       ret = (dli->dl_inodes_used > dli->dl_inodes_total);
7756 +       spin_unlock(&dli->dl_lock);
7757 +       put_dl_info(dli);
7758 +out:
7759 +       vxlprintk(VXD_CBIT(dlim, 0),
7760 +               "ALLOC (%p,#%d)%c inode (%d)",
7761 +               sb, tag, __dlimit_char(dli), ret, _file, _line);
7762 +       return ret ? -ENOSPC : 0;
7763 +}
7764 +
7765 +static inline void __dl_free_inode(struct super_block *sb,
7766 +       vtag_t tag, const char *_file, int _line)
7767 +{
7768 +       struct dl_info *dli;
7769 +
7770 +       dli = locate_dl_info(sb, tag);
7771 +       if (!dli)
7772 +               goto out;
7773 +
7774 +       spin_lock(&dli->dl_lock);
7775 +       if (dli->dl_inodes_used > 1)
7776 +               dli->dl_inodes_used--;
7777 +       else
7778 +               dli->dl_inodes_used = 0;
7779 +       spin_unlock(&dli->dl_lock);
7780 +       put_dl_info(dli);
7781 +out:
7782 +       vxlprintk(VXD_CBIT(dlim, 0),
7783 +               "FREE  (%p,#%d)%c inode",
7784 +               sb, tag, __dlimit_char(dli), _file, _line);
7785 +}
7786 +
7787 +static inline void __dl_adjust_block(struct super_block *sb, vtag_t tag,
7788 +       unsigned long long *free_blocks, unsigned long long *root_blocks,
7789 +       const char *_file, int _line)
7790 +{
7791 +       struct dl_info *dli;
7792 +       uint64_t broot, bfree;
7793 +
7794 +       dli = locate_dl_info(sb, tag);
7795 +       if (!dli)
7796 +               return;
7797 +
7798 +       spin_lock(&dli->dl_lock);
7799 +       broot = (dli->dl_space_total -
7800 +               (dli->dl_space_total >> 10) * dli->dl_nrlmult)
7801 +               >> sb->s_blocksize_bits;
7802 +       bfree = (dli->dl_space_total - dli->dl_space_used)
7803 +                       >> sb->s_blocksize_bits;
7804 +       spin_unlock(&dli->dl_lock);
7805 +
7806 +       vxlprintk(VXD_CBIT(dlim, 2),
7807 +               "ADJUST: %lld,%lld on %lld,%lld [mult=%d]",
7808 +               (long long)bfree, (long long)broot,
7809 +               *free_blocks, *root_blocks, dli->dl_nrlmult,
7810 +               _file, _line);
7811 +       if (free_blocks) {
7812 +               if (*free_blocks > bfree)
7813 +                       *free_blocks = bfree;
7814 +       }
7815 +       if (root_blocks) {
7816 +               if (*root_blocks > broot)
7817 +                       *root_blocks = broot;
7818 +       }
7819 +       put_dl_info(dli);
7820 +}
7821 +
7822 +#define dl_prealloc_space(in, bytes) \
7823 +       __dl_alloc_space((in)->i_sb, i_tag_read(in), (dlsize_t)(bytes), \
7824 +               __FILE__, __LINE__ )
7825 +
7826 +#define dl_alloc_space(in, bytes) \
7827 +       __dl_alloc_space((in)->i_sb, i_tag_read(in), (dlsize_t)(bytes), \
7828 +               __FILE__, __LINE__ )
7829 +
7830 +#define dl_reserve_space(in, bytes) \
7831 +       __dl_alloc_space((in)->i_sb, i_tag_read(in), (dlsize_t)(bytes), \
7832 +               __FILE__, __LINE__ )
7833 +
7834 +#define dl_claim_space(in, bytes) (0)
7835 +
7836 +#define dl_release_space(in, bytes) \
7837 +       __dl_free_space((in)->i_sb, i_tag_read(in), (dlsize_t)(bytes), \
7838 +               __FILE__, __LINE__ )
7839 +
7840 +#define dl_free_space(in, bytes) \
7841 +       __dl_free_space((in)->i_sb, i_tag_read(in), (dlsize_t)(bytes), \
7842 +               __FILE__, __LINE__ )
7843 +
7844 +
7845 +
7846 +#define dl_alloc_inode(in) \
7847 +       __dl_alloc_inode((in)->i_sb, i_tag_read(in), __FILE__, __LINE__ )
7848 +
7849 +#define dl_free_inode(in) \
7850 +       __dl_free_inode((in)->i_sb, i_tag_read(in), __FILE__, __LINE__ )
7851 +
7852 +
7853 +#define dl_adjust_block(sb, tag, fb, rb) \
7854 +       __dl_adjust_block(sb, tag, fb, rb, __FILE__, __LINE__ )
7855 +
7856 +
7857 +#else
7858 +#warning duplicate inclusion
7859 +#endif
7860 diff -NurpP --minimal linux-4.9.135/include/linux/vs_inet.h linux-4.9.135-vs2.3.9.8/include/linux/vs_inet.h
7861 --- linux-4.9.135/include/linux/vs_inet.h       1970-01-01 00:00:00.000000000 +0000
7862 +++ linux-4.9.135-vs2.3.9.8/include/linux/vs_inet.h     2018-10-20 04:58:14.000000000 +0000
7863 @@ -0,0 +1,364 @@
7864 +#ifndef _VS_INET_H
7865 +#define _VS_INET_H
7866 +
7867 +#include "vserver/base.h"
7868 +#include "vserver/network.h"
7869 +#include "vserver/debug.h"
7870 +
7871 +#define IPI_LOOPBACK   htonl(INADDR_LOOPBACK)
7872 +
7873 +#define NXAV4(a)       NIPQUAD((a)->ip[0]), NIPQUAD((a)->ip[1]), \
7874 +                       NIPQUAD((a)->mask), (a)->type
7875 +#define NXAV4_FMT      "[" NIPQUAD_FMT "-" NIPQUAD_FMT "/" NIPQUAD_FMT ":%04x]"
7876 +
7877 +#define NIPQUAD(addr) \
7878 +       ((unsigned char *)&addr)[0], \
7879 +       ((unsigned char *)&addr)[1], \
7880 +       ((unsigned char *)&addr)[2], \
7881 +       ((unsigned char *)&addr)[3]
7882 +
7883 +#define NIPQUAD_FMT "%u.%u.%u.%u"
7884 +
7885 +
7886 +static inline
7887 +int v4_addr_match(struct nx_addr_v4 *nxa, __be32 addr, uint16_t tmask)
7888 +{
7889 +       __be32 ip = nxa->ip[0].s_addr;
7890 +       __be32 mask = nxa->mask.s_addr;
7891 +       __be32 bcast = ip | ~mask;
7892 +       int ret = 0;
7893 +
7894 +       switch (nxa->type & tmask) {
7895 +       case NXA_TYPE_MASK:
7896 +               ret = (ip == (addr & mask));
7897 +               break;
7898 +       case NXA_TYPE_ADDR:
7899 +               ret = 3;
7900 +               if (addr == ip)
7901 +                       break;
7902 +               /* fall through to broadcast */
7903 +       case NXA_MOD_BCAST:
7904 +               ret = ((tmask & NXA_MOD_BCAST) && (addr == bcast));
7905 +               break;
7906 +       case NXA_TYPE_RANGE:
7907 +               ret = ((nxa->ip[0].s_addr <= addr) &&
7908 +                       (nxa->ip[1].s_addr > addr));
7909 +               break;
7910 +       case NXA_TYPE_ANY:
7911 +               ret = 2;
7912 +               break;
7913 +       }
7914 +
7915 +       vxdprintk(VXD_CBIT(net, 0),
7916 +               "v4_addr_match(%p" NXAV4_FMT "," NIPQUAD_FMT ",%04x) = %d",
7917 +               nxa, NXAV4(nxa), NIPQUAD(addr), tmask, ret);
7918 +       return ret;
7919 +}
7920 +
7921 +static inline
7922 +int v4_addr_in_nx_info(struct nx_info *nxi, __be32 addr, uint16_t tmask)
7923 +{
7924 +       struct nx_addr_v4 *nxa;
7925 +       unsigned long irqflags;
7926 +       int ret = 1;
7927 +
7928 +       if (!nxi)
7929 +               goto out;
7930 +
7931 +       ret = 2;
7932 +       /* allow 127.0.0.1 when remapping lback */
7933 +       if ((tmask & NXA_LOOPBACK) &&
7934 +               (addr == IPI_LOOPBACK) &&
7935 +               nx_info_flags(nxi, NXF_LBACK_REMAP, 0))
7936 +               goto out;
7937 +       ret = 3;
7938 +       /* check for lback address */
7939 +       if ((tmask & NXA_MOD_LBACK) &&
7940 +               (nxi->v4_lback.s_addr == addr))
7941 +               goto out;
7942 +       ret = 4;
7943 +       /* check for broadcast address */
7944 +       if ((tmask & NXA_MOD_BCAST) &&
7945 +               (nxi->v4_bcast.s_addr == addr))
7946 +               goto out;
7947 +       ret = 5;
7948 +
7949 +       /* check for v4 addresses */
7950 +       spin_lock_irqsave(&nxi->addr_lock, irqflags);
7951 +       for (nxa = &nxi->v4; nxa; nxa = nxa->next)
7952 +               if (v4_addr_match(nxa, addr, tmask))
7953 +                       goto out_unlock;
7954 +       ret = 0;
7955 +out_unlock:
7956 +       spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
7957 +out:
7958 +       vxdprintk(VXD_CBIT(net, 0),
7959 +               "v4_addr_in_nx_info(%p[#%u]," NIPQUAD_FMT ",%04x) = %d",
7960 +               nxi, nxi ? nxi->nx_id : 0, NIPQUAD(addr), tmask, ret);
7961 +       return ret;
7962 +}
7963 +
7964 +static inline
7965 +int v4_nx_addr_match(struct nx_addr_v4 *nxa, struct nx_addr_v4 *addr, uint16_t mask)
7966 +{
7967 +       /* FIXME: needs full range checks */
7968 +       return v4_addr_match(nxa, addr->ip[0].s_addr, mask);
7969 +}
7970 +
7971 +static inline
7972 +int v4_nx_addr_in_nx_info(struct nx_info *nxi, struct nx_addr_v4 *nxa, uint16_t mask)
7973 +{
7974 +       struct nx_addr_v4 *ptr;
7975 +       unsigned long irqflags;
7976 +       int ret = 1;
7977 +
7978 +       spin_lock_irqsave(&nxi->addr_lock, irqflags);
7979 +       for (ptr = &nxi->v4; ptr; ptr = ptr->next)
7980 +               if (v4_nx_addr_match(ptr, nxa, mask))
7981 +                       goto out_unlock;
7982 +       ret = 0;
7983 +out_unlock:
7984 +       spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
7985 +       return ret;
7986 +}
7987 +
7988 +#include <net/inet_sock.h>
7989 +
7990 +/*
7991 + *     Check if a given address matches for a socket
7992 + *
7993 + *     nxi:            the socket's nx_info if any
7994 + *     addr:           to be verified address
7995 + */
7996 +static inline
7997 +int v4_sock_addr_match (
7998 +       struct nx_info *nxi,
7999 +       struct inet_sock *inet,
8000 +       __be32 addr)
8001 +{
8002 +       __be32 saddr = inet->inet_rcv_saddr;
8003 +       __be32 bcast = nxi ? nxi->v4_bcast.s_addr : INADDR_BROADCAST;
8004 +
8005 +       if (addr && (saddr == addr || bcast == addr))
8006 +               return 1;
8007 +       if (!saddr)
8008 +               return v4_addr_in_nx_info(nxi, addr, NXA_MASK_BIND);
8009 +       return 0;
8010 +}
8011 +
8012 +
8013 +/* inet related checks and helpers */
8014 +
8015 +
8016 +struct in_ifaddr;
8017 +struct net_device;
8018 +struct sock;
8019 +
8020 +#ifdef CONFIG_INET
8021 +
8022 +#include <linux/netdevice.h>
8023 +#include <linux/inetdevice.h>
8024 +#include <net/inet_sock.h>
8025 +#include <net/inet_timewait_sock.h>
8026 +
8027 +
8028 +int dev_in_nx_info(struct net_device *, struct nx_info *);
8029 +int v4_dev_in_nx_info(struct net_device *, struct nx_info *);
8030 +int nx_v4_addr_conflict(struct nx_info *, struct nx_info *);
8031 +
8032 +
8033 +/*
8034 + *     check if address is covered by socket
8035 + *
8036 + *     sk:     the socket to check against
8037 + *     addr:   the address in question (must be != 0)
8038 + */
8039 +
8040 +static inline
8041 +int __v4_addr_match_socket(const struct sock *sk, struct nx_addr_v4 *nxa)
8042 +{
8043 +       struct nx_info *nxi = sk->sk_nx_info;
8044 +       __be32 saddr = sk->sk_rcv_saddr;
8045 +
8046 +       vxdprintk(VXD_CBIT(net, 5),
8047 +               "__v4_addr_in_socket(%p," NXAV4_FMT ") %p:" NIPQUAD_FMT " %p;%lx",
8048 +               sk, NXAV4(nxa), nxi, NIPQUAD(saddr), sk->sk_socket,
8049 +               (sk->sk_socket?sk->sk_socket->flags:0));
8050 +
8051 +       if (saddr) {            /* direct address match */
8052 +               return v4_addr_match(nxa, saddr, -1);
8053 +       } else if (nxi) {       /* match against nx_info */
8054 +               return v4_nx_addr_in_nx_info(nxi, nxa, -1);
8055 +       } else {                /* unrestricted any socket */
8056 +               return 1;
8057 +       }
8058 +}
8059 +
8060 +
8061 +
8062 +static inline
8063 +int nx_dev_visible(struct nx_info *nxi, struct net_device *dev)
8064 +{
8065 +       vxdprintk(VXD_CBIT(net, 1),
8066 +               "nx_dev_visible(%p[#%u],%p " VS_Q("%s") ") %d",
8067 +               nxi, nxi ? nxi->nx_id : 0, dev, dev->name,
8068 +               nxi ? dev_in_nx_info(dev, nxi) : 0);
8069 +
8070 +       if (!nx_info_flags(nxi, NXF_HIDE_NETIF, 0))
8071 +               return 1;
8072 +       if (dev_in_nx_info(dev, nxi))
8073 +               return 1;
8074 +       return 0;
8075 +}
8076 +
8077 +
8078 +static inline
8079 +int v4_ifa_in_nx_info(struct in_ifaddr *ifa, struct nx_info *nxi)
8080 +{
8081 +       if (!nxi)
8082 +               return 1;
8083 +       if (!ifa)
8084 +               return 0;
8085 +       return v4_addr_in_nx_info(nxi, ifa->ifa_local, NXA_MASK_SHOW);
8086 +}
8087 +
8088 +static inline
8089 +int nx_v4_ifa_visible(struct nx_info *nxi, struct in_ifaddr *ifa)
8090 +{
8091 +       vxdprintk(VXD_CBIT(net, 1), "nx_v4_ifa_visible(%p[#%u],%p) %d",
8092 +               nxi, nxi ? nxi->nx_id : 0, ifa,
8093 +               nxi ? v4_ifa_in_nx_info(ifa, nxi) : 0);
8094 +
8095 +       if (!nx_info_flags(nxi, NXF_HIDE_NETIF, 0))
8096 +               return 1;
8097 +       if (v4_ifa_in_nx_info(ifa, nxi))
8098 +               return 1;
8099 +       return 0;
8100 +}
8101 +
8102 +
8103 +struct nx_v4_sock_addr {
8104 +       __be32 saddr;   /* Address used for validation */
8105 +       __be32 baddr;   /* Address used for socket bind */
8106 +};
8107 +
8108 +static inline
8109 +int v4_map_sock_addr(struct inet_sock *inet, struct sockaddr_in *addr,
8110 +       struct nx_v4_sock_addr *nsa)
8111 +{
8112 +       struct sock *sk = &inet->sk;
8113 +       struct nx_info *nxi = sk->sk_nx_info;
8114 +       __be32 saddr = addr->sin_addr.s_addr;
8115 +       __be32 baddr = saddr;
8116 +
8117 +       vxdprintk(VXD_CBIT(net, 3),
8118 +               "inet_bind(%p)* %p,%p;%lx " NIPQUAD_FMT,
8119 +               sk, sk->sk_nx_info, sk->sk_socket,
8120 +               (sk->sk_socket ? sk->sk_socket->flags : 0),
8121 +               NIPQUAD(saddr));
8122 +
8123 +       if (nxi) {
8124 +               if (saddr == INADDR_ANY) {
8125 +                       if (nx_info_flags(nxi, NXF_SINGLE_IP, 0))
8126 +                               baddr = nxi->v4.ip[0].s_addr;
8127 +               } else if (saddr == IPI_LOOPBACK) {
8128 +                       if (nx_info_flags(nxi, NXF_LBACK_REMAP, 0))
8129 +                               baddr = nxi->v4_lback.s_addr;
8130 +               } else if (!ipv4_is_multicast(saddr) ||
8131 +                       !nx_info_ncaps(nxi, NXC_MULTICAST)) {
8132 +                       /* normal address bind */
8133 +                       if (!v4_addr_in_nx_info(nxi, saddr, NXA_MASK_BIND))
8134 +                               return -EADDRNOTAVAIL;
8135 +               }
8136 +       }
8137 +
8138 +       vxdprintk(VXD_CBIT(net, 3),
8139 +               "inet_bind(%p) " NIPQUAD_FMT ", " NIPQUAD_FMT,
8140 +               sk, NIPQUAD(saddr), NIPQUAD(baddr));
8141 +
8142 +       nsa->saddr = saddr;
8143 +       nsa->baddr = baddr;
8144 +       return 0;
8145 +}
8146 +
8147 +static inline
8148 +void v4_set_sock_addr(struct inet_sock *inet, struct nx_v4_sock_addr *nsa)
8149 +{
8150 +       inet->inet_saddr = nsa->baddr;
8151 +       inet->inet_rcv_saddr = nsa->baddr;
8152 +}
8153 +
8154 +
8155 +/*
8156 + *      helper to simplify inet_lookup_listener
8157 + *
8158 + *      nxi:   the socket's nx_info if any
8159 + *      addr:  to be verified address
8160 + *      saddr: socket address
8161 + */
8162 +static inline int v4_inet_addr_match (
8163 +       struct nx_info *nxi,
8164 +       __be32 addr,
8165 +       __be32 saddr)
8166 +{
8167 +       if (addr && (saddr == addr))
8168 +               return 1;
8169 +       if (!saddr)
8170 +               return nxi ? v4_addr_in_nx_info(nxi, addr, NXA_MASK_BIND) : 1;
8171 +       return 0;
8172 +}
8173 +
8174 +static inline __be32 nx_map_sock_lback(struct nx_info *nxi, __be32 addr)
8175 +{
8176 +       if (nx_info_flags(nxi, NXF_HIDE_LBACK, 0) &&
8177 +               (addr == nxi->v4_lback.s_addr))
8178 +               return IPI_LOOPBACK;
8179 +       return addr;
8180 +}
8181 +
8182 +static inline
8183 +int nx_info_has_v4(struct nx_info *nxi)
8184 +{
8185 +       if (!nxi)
8186 +               return 1;
8187 +       if (NX_IPV4(nxi))
8188 +               return 1;
8189 +       if (nx_info_flags(nxi, NXF_LBACK_REMAP, 0))
8190 +               return 1;
8191 +       return 0;
8192 +}
8193 +
8194 +#else /* CONFIG_INET */
8195 +
8196 +static inline
8197 +int nx_dev_visible(struct nx_info *n, struct net_device *d)
8198 +{
8199 +       return 1;
8200 +}
8201 +
8202 +static inline
8203 +int nx_v4_addr_conflict(struct nx_info *n, uint32_t a, const struct sock *s)
8204 +{
8205 +       return 1;
8206 +}
8207 +
8208 +static inline
8209 +int v4_ifa_in_nx_info(struct in_ifaddr *a, struct nx_info *n)
8210 +{
8211 +       return 1;
8212 +}
8213 +
8214 +static inline
8215 +int nx_info_has_v4(struct nx_info *nxi)
8216 +{
8217 +       return 0;
8218 +}
8219 +
8220 +#endif /* CONFIG_INET */
8221 +
8222 +#define current_nx_info_has_v4() \
8223 +       nx_info_has_v4(current_nx_info())
8224 +
8225 +#else
8226 +// #warning duplicate inclusion
8227 +#endif
8228 diff -NurpP --minimal linux-4.9.135/include/linux/vs_inet6.h linux-4.9.135-vs2.3.9.8/include/linux/vs_inet6.h
8229 --- linux-4.9.135/include/linux/vs_inet6.h      1970-01-01 00:00:00.000000000 +0000
8230 +++ linux-4.9.135-vs2.3.9.8/include/linux/vs_inet6.h    2018-10-20 04:58:14.000000000 +0000
8231 @@ -0,0 +1,264 @@
8232 +#ifndef _VS_INET6_H
8233 +#define _VS_INET6_H
8234 +
8235 +#include "vserver/base.h"
8236 +#include "vserver/network.h"
8237 +#include "vserver/debug.h"
8238 +
8239 +#include <net/ipv6.h>
8240 +
8241 +#define NXAV6(a)       &(a)->ip, &(a)->mask, (a)->prefix, (a)->type
8242 +#define NXAV6_FMT      "[%pI6/%pI6/%d:%04x]"
8243 +
8244 +
8245 +#ifdef CONFIG_IPV6
8246 +
8247 +static inline
8248 +int v6_addr_match(struct nx_addr_v6 *nxa,
8249 +       const struct in6_addr *addr, uint16_t mask)
8250 +{
8251 +       int ret = 0;
8252 +
8253 +       switch (nxa->type & mask) {
8254 +       case NXA_TYPE_MASK:
8255 +               ret = ipv6_masked_addr_cmp(&nxa->ip, &nxa->mask, addr);
8256 +               break;
8257 +       case NXA_TYPE_ADDR:
8258 +               ret = ipv6_addr_equal(&nxa->ip, addr);
8259 +               break;
8260 +       case NXA_TYPE_ANY:
8261 +               ret = 1;
8262 +               break;
8263 +       }
8264 +       vxdprintk(VXD_CBIT(net, 0),
8265 +               "v6_addr_match(%p" NXAV6_FMT ",%pI6,%04x) = %d",
8266 +               nxa, NXAV6(nxa), addr, mask, ret);
8267 +       return ret;
8268 +}
8269 +
8270 +static inline
8271 +int v6_addr_in_nx_info(struct nx_info *nxi,
8272 +       const struct in6_addr *addr, uint16_t mask)
8273 +{
8274 +       struct nx_addr_v6 *nxa;
8275 +       unsigned long irqflags;
8276 +       int ret = 1;
8277 +
8278 +       if (!nxi)
8279 +               goto out;
8280 +
8281 +       spin_lock_irqsave(&nxi->addr_lock, irqflags);
8282 +       for (nxa = &nxi->v6; nxa; nxa = nxa->next)
8283 +               if (v6_addr_match(nxa, addr, mask))
8284 +                       goto out_unlock;
8285 +       ret = 0;
8286 +out_unlock:
8287 +       spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
8288 +out:
8289 +       vxdprintk(VXD_CBIT(net, 0),
8290 +               "v6_addr_in_nx_info(%p[#%u],%pI6,%04x) = %d",
8291 +               nxi, nxi ? nxi->nx_id : 0, addr, mask, ret);
8292 +       return ret;
8293 +}
8294 +
8295 +static inline
8296 +int v6_nx_addr_match(struct nx_addr_v6 *nxa, struct nx_addr_v6 *addr, uint16_t mask)
8297 +{
8298 +       /* FIXME: needs full range checks */
8299 +       return v6_addr_match(nxa, &addr->ip, mask);
8300 +}
8301 +
8302 +static inline
8303 +int v6_nx_addr_in_nx_info(struct nx_info *nxi, struct nx_addr_v6 *nxa, uint16_t mask)
8304 +{
8305 +       struct nx_addr_v6 *ptr;
8306 +       unsigned long irqflags;
8307 +       int ret = 1;
8308 +
8309 +       spin_lock_irqsave(&nxi->addr_lock, irqflags);
8310 +       for (ptr = &nxi->v6; ptr; ptr = ptr->next)
8311 +               if (v6_nx_addr_match(ptr, nxa, mask))
8312 +                       goto out_unlock;
8313 +       ret = 0;
8314 +out_unlock:
8315 +       spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
8316 +       return ret;
8317 +}
8318 +
8319 +
8320 +/*
8321 + *     Check if a given address matches for a socket
8322 + *
8323 + *     nxi:            the socket's nx_info if any
8324 + *     addr:           to be verified address
8325 + */
8326 +static inline
8327 +int v6_sock_addr_match (
8328 +       struct nx_info *nxi,
8329 +       struct inet_sock *inet,
8330 +       struct in6_addr *addr)
8331 +{
8332 +       struct sock *sk = &inet->sk;
8333 +       const struct in6_addr *saddr = inet6_rcv_saddr(sk);
8334 +
8335 +       if (!ipv6_addr_any(addr) &&
8336 +               ipv6_addr_equal(saddr, addr))
8337 +               return 1;
8338 +       if (ipv6_addr_any(saddr))
8339 +               return v6_addr_in_nx_info(nxi, addr, -1);
8340 +       return 0;
8341 +}
8342 +
8343 +/*
8344 + *     check if address is covered by socket
8345 + *
8346 + *     sk:     the socket to check against
8347 + *     addr:   the address in question (must be != 0)
8348 + */
8349 +
8350 +static inline
8351 +int __v6_addr_match_socket(const struct sock *sk, struct nx_addr_v6 *nxa)
8352 +{
8353 +       struct nx_info *nxi = sk->sk_nx_info;
8354 +       const struct in6_addr *saddr = inet6_rcv_saddr(sk);
8355 +
8356 +       vxdprintk(VXD_CBIT(net, 5),
8357 +               "__v6_addr_in_socket(%p," NXAV6_FMT ") %p:%pI6 %p;%lx",
8358 +               sk, NXAV6(nxa), nxi, saddr, sk->sk_socket,
8359 +               (sk->sk_socket?sk->sk_socket->flags:0));
8360 +
8361 +       if (!ipv6_addr_any(saddr)) {    /* direct address match */
8362 +               return v6_addr_match(nxa, saddr, -1);
8363 +       } else if (nxi) {               /* match against nx_info */
8364 +               return v6_nx_addr_in_nx_info(nxi, nxa, -1);
8365 +       } else {                        /* unrestricted any socket */
8366 +               return 1;
8367 +       }
8368 +}
8369 +
8370 +
8371 +/* inet related checks and helpers */
8372 +
8373 +
8374 +struct in_ifaddr;
8375 +struct net_device;
8376 +struct sock;
8377 +
8378 +
8379 +#include <linux/netdevice.h>
8380 +#include <linux/inetdevice.h>
8381 +#include <net/inet_timewait_sock.h>
8382 +
8383 +
8384 +int dev_in_nx_info(struct net_device *, struct nx_info *);
8385 +int v6_dev_in_nx_info(struct net_device *, struct nx_info *);
8386 +int nx_v6_addr_conflict(struct nx_info *, struct nx_info *);
8387 +
8388 +
8389 +
8390 +static inline
8391 +int v6_ifa_in_nx_info(struct inet6_ifaddr *ifa, struct nx_info *nxi)
8392 +{
8393 +       if (!nxi)
8394 +               return 1;
8395 +       if (!ifa)
8396 +               return 0;
8397 +       return v6_addr_in_nx_info(nxi, &ifa->addr, -1);
8398 +}
8399 +
8400 +static inline
8401 +int nx_v6_ifa_visible(struct nx_info *nxi, struct inet6_ifaddr *ifa)
8402 +{
8403 +       vxdprintk(VXD_CBIT(net, 1), "nx_v6_ifa_visible(%p[#%u],%p) %d",
8404 +               nxi, nxi ? nxi->nx_id : 0, ifa,
8405 +               nxi ? v6_ifa_in_nx_info(ifa, nxi) : 0);
8406 +
8407 +       if (!nx_info_flags(nxi, NXF_HIDE_NETIF, 0))
8408 +               return 1;
8409 +       if (v6_ifa_in_nx_info(ifa, nxi))
8410 +               return 1;
8411 +       return 0;
8412 +}
8413 +
8414 +
8415 +struct nx_v6_sock_addr {
8416 +       struct in6_addr saddr;  /* Address used for validation */
8417 +       struct in6_addr baddr;  /* Address used for socket bind */
8418 +};
8419 +
8420 +static inline
8421 +int v6_map_sock_addr(struct inet_sock *inet, struct sockaddr_in6 *addr,
8422 +       struct nx_v6_sock_addr *nsa)
8423 +{
8424 +       // struct sock *sk = &inet->sk;
8425 +       // struct nx_info *nxi = sk->sk_nx_info;
8426 +       struct in6_addr saddr = addr->sin6_addr;
8427 +       struct in6_addr baddr = saddr;
8428 +
8429 +       nsa->saddr = saddr;
8430 +       nsa->baddr = baddr;
8431 +       return 0;
8432 +}
8433 +
8434 +static inline
8435 +void v6_set_sock_addr(struct inet_sock *inet, struct nx_v6_sock_addr *nsa)
8436 +{
8437 +       // struct sock *sk = &inet->sk;
8438 +       // struct in6_addr *saddr = inet6_rcv_saddr(sk);
8439 +
8440 +       // *saddr = nsa->baddr;
8441 +       // inet->inet_saddr = nsa->baddr;
8442 +}
8443 +
8444 +static inline
8445 +int nx_info_has_v6(struct nx_info *nxi)
8446 +{
8447 +       if (!nxi)
8448 +               return 1;
8449 +       if (NX_IPV6(nxi))
8450 +               return 1;
8451 +       return 0;
8452 +}
8453 +
8454 +#else /* CONFIG_IPV6 */
8455 +
8456 +static inline
8457 +int nx_v6_dev_visible(struct nx_info *n, struct net_device *d)
8458 +{
8459 +       return 1;
8460 +}
8461 +
8462 +
8463 +static inline
8464 +int nx_v6_addr_conflict(struct nx_info *n, uint32_t a, const struct sock *s)
8465 +{
8466 +       return 1;
8467 +}
8468 +
8469 +static inline
8470 +int v6_ifa_in_nx_info(struct in_ifaddr *a, struct nx_info *n)
8471 +{
8472 +       return 1;
8473 +}
8474 +
8475 +static inline
8476 +int nx_info_has_v6(struct nx_info *nxi)
8477 +{
8478 +       return 0;
8479 +}
8480 +
8481 +static inline
8482 +int v6_addr_in_nx_info(struct nx_info *nxi,
8483 +       const struct in6_addr *addr, uint16_t mask)
8484 +{
8485 +       return 0;
8486 +}
8487 +
8488 +#endif /* CONFIG_IPV6 */
8489 +
8490 +#define current_nx_info_has_v6() \
8491 +       nx_info_has_v6(current_nx_info())
8492 +
8493 +#else
8494 +#warning duplicate inclusion
8495 +#endif
8496 diff -NurpP --minimal linux-4.9.135/include/linux/vs_limit.h linux-4.9.135-vs2.3.9.8/include/linux/vs_limit.h
8497 --- linux-4.9.135/include/linux/vs_limit.h      1970-01-01 00:00:00.000000000 +0000
8498 +++ linux-4.9.135-vs2.3.9.8/include/linux/vs_limit.h    2018-10-20 04:58:14.000000000 +0000
8499 @@ -0,0 +1,140 @@
8500 +#ifndef _VS_LIMIT_H
8501 +#define _VS_LIMIT_H
8502 +
8503 +#include "vserver/limit.h"
8504 +#include "vserver/base.h"
8505 +#include "vserver/context.h"
8506 +#include "vserver/debug.h"
8507 +#include "vserver/context.h"
8508 +#include "vserver/limit_int.h"
8509 +
8510 +
8511 +#define vx_acc_cres(v, d, p, r) \
8512 +       __vx_acc_cres(v, r, d, p, __FILE__, __LINE__)
8513 +
8514 +#define vx_acc_cres_cond(x, d, p, r) \
8515 +       __vx_acc_cres(((x) == vx_current_xid()) ? current_vx_info() : 0, \
8516 +       r, d, p, __FILE__, __LINE__)
8517 +
8518 +
8519 +#define vx_add_cres(v, a, p, r) \
8520 +       __vx_add_cres(v, r, a, p, __FILE__, __LINE__)
8521 +#define vx_sub_cres(v, a, p, r)                vx_add_cres(v, -(a), p, r)
8522 +
8523 +#define vx_add_cres_cond(x, a, p, r) \
8524 +       __vx_add_cres(((x) == vx_current_xid()) ? current_vx_info() : 0, \
8525 +       r, a, p, __FILE__, __LINE__)
8526 +#define vx_sub_cres_cond(x, a, p, r)   vx_add_cres_cond(x, -(a), p, r)
8527 +
8528 +
8529 +/* process and file limits */
8530 +
8531 +#define vx_nproc_inc(p) \
8532 +       vx_acc_cres((p)->vx_info, 1, p, RLIMIT_NPROC)
8533 +
8534 +#define vx_nproc_dec(p) \
8535 +       vx_acc_cres((p)->vx_info,-1, p, RLIMIT_NPROC)
8536 +
8537 +#define vx_files_inc(f) \
8538 +       vx_acc_cres_cond((f)->f_xid, 1, f, RLIMIT_NOFILE)
8539 +
8540 +#define vx_files_dec(f) \
8541 +       vx_acc_cres_cond((f)->f_xid,-1, f, RLIMIT_NOFILE)
8542 +
8543 +#define vx_locks_inc(l) \
8544 +       vx_acc_cres_cond((l)->fl_xid, 1, l, RLIMIT_LOCKS)
8545 +
8546 +#define vx_locks_dec(l) \
8547 +       vx_acc_cres_cond((l)->fl_xid,-1, l, RLIMIT_LOCKS)
8548 +
8549 +#define vx_openfd_inc(f) \
8550 +       vx_acc_cres(current_vx_info(), 1, (void *)(long)(f), VLIMIT_OPENFD)
8551 +
8552 +#define vx_openfd_dec(f) \
8553 +       vx_acc_cres(current_vx_info(),-1, (void *)(long)(f), VLIMIT_OPENFD)
8554 +
8555 +
8556 +#define vx_cres_avail(v, n, r) \
8557 +       __vx_cres_avail(v, r, n, __FILE__, __LINE__)
8558 +
8559 +
8560 +#define vx_nproc_avail(n) \
8561 +       vx_cres_avail(current_vx_info(), n, RLIMIT_NPROC)
8562 +
8563 +#define vx_files_avail(n) \
8564 +       vx_cres_avail(current_vx_info(), n, RLIMIT_NOFILE)
8565 +
8566 +#define vx_locks_avail(n) \
8567 +       vx_cres_avail(current_vx_info(), n, RLIMIT_LOCKS)
8568 +
8569 +#define vx_openfd_avail(n) \
8570 +       vx_cres_avail(current_vx_info(), n, VLIMIT_OPENFD)
8571 +
8572 +
8573 +/* dentry limits */
8574 +
8575 +#define vx_dentry_inc(d) do {                                          \
8576 +       if (d_count(d) == 1)                                            \
8577 +               vx_acc_cres(current_vx_info(), 1, d, VLIMIT_DENTRY);    \
8578 +       } while (0)
8579 +
8580 +#define vx_dentry_dec(d) do {                                          \
8581 +       if (d_count(d) == 0)                                            \
8582 +               vx_acc_cres(current_vx_info(),-1, d, VLIMIT_DENTRY);    \
8583 +       } while (0)
8584 +
8585 +#define vx_dentry_avail(n) \
8586 +       vx_cres_avail(current_vx_info(), n, VLIMIT_DENTRY)
8587 +
8588 +
8589 +/* socket limits */
8590 +
8591 +#define vx_sock_inc(s) \
8592 +       vx_acc_cres((s)->sk_vx_info, 1, s, VLIMIT_NSOCK)
8593 +
8594 +#define vx_sock_dec(s) \
8595 +       vx_acc_cres((s)->sk_vx_info,-1, s, VLIMIT_NSOCK)
8596 +
8597 +#define vx_sock_avail(n) \
8598 +       vx_cres_avail(current_vx_info(), n, VLIMIT_NSOCK)
8599 +
8600 +
8601 +/* ipc resource limits */
8602 +
8603 +#define vx_ipcmsg_add(v, u, a) \
8604 +       vx_add_cres(v, a, u, RLIMIT_MSGQUEUE)
8605 +
8606 +#define vx_ipcmsg_sub(v, u, a) \
8607 +       vx_sub_cres(v, a, u, RLIMIT_MSGQUEUE)
8608 +
8609 +#define vx_ipcmsg_avail(v, a) \
8610 +       vx_cres_avail(v, a, RLIMIT_MSGQUEUE)
8611 +
8612 +
8613 +#define vx_ipcshm_add(v, k, a) \
8614 +       vx_add_cres(v, a, (void *)(long)(k), VLIMIT_SHMEM)
8615 +
8616 +#define vx_ipcshm_sub(v, k, a) \
8617 +       vx_sub_cres(v, a, (void *)(long)(k), VLIMIT_SHMEM)
8618 +
8619 +#define vx_ipcshm_avail(v, a) \
8620 +       vx_cres_avail(v, a, VLIMIT_SHMEM)
8621 +
8622 +
8623 +#define vx_semary_inc(a) \
8624 +       vx_acc_cres(current_vx_info(), 1, a, VLIMIT_SEMARY)
8625 +
8626 +#define vx_semary_dec(a) \
8627 +       vx_acc_cres(current_vx_info(), -1, a, VLIMIT_SEMARY)
8628 +
8629 +
8630 +#define vx_nsems_add(a,n) \
8631 +       vx_add_cres(current_vx_info(), n, a, VLIMIT_NSEMS)
8632 +
8633 +#define vx_nsems_sub(a,n) \
8634 +       vx_sub_cres(current_vx_info(), n, a, VLIMIT_NSEMS)
8635 +
8636 +
8637 +#else
8638 +#warning duplicate inclusion
8639 +#endif
8640 diff -NurpP --minimal linux-4.9.135/include/linux/vs_network.h linux-4.9.135-vs2.3.9.8/include/linux/vs_network.h
8641 --- linux-4.9.135/include/linux/vs_network.h    1970-01-01 00:00:00.000000000 +0000
8642 +++ linux-4.9.135-vs2.3.9.8/include/linux/vs_network.h  2018-10-20 04:58:14.000000000 +0000
8643 @@ -0,0 +1,169 @@
8644 +#ifndef _NX_VS_NETWORK_H
8645 +#define _NX_VS_NETWORK_H
8646 +
8647 +#include "vserver/context.h"
8648 +#include "vserver/network.h"
8649 +#include "vserver/base.h"
8650 +#include "vserver/check.h"
8651 +#include "vserver/debug.h"
8652 +
8653 +#include <linux/sched.h>
8654 +
8655 +
8656 +#define get_nx_info(i) __get_nx_info(i, __FILE__, __LINE__)
8657 +
8658 +static inline struct nx_info *__get_nx_info(struct nx_info *nxi,
8659 +       const char *_file, int _line)
8660 +{
8661 +       if (!nxi)
8662 +               return NULL;
8663 +
8664 +       vxlprintk(VXD_CBIT(nid, 2), "get_nx_info(%p[#%d.%d])",
8665 +               nxi, nxi ? nxi->nx_id : 0,
8666 +               nxi ? atomic_read(&nxi->nx_usecnt) : 0,
8667 +               _file, _line);
8668 +
8669 +       atomic_inc(&nxi->nx_usecnt);
8670 +       return nxi;
8671 +}
8672 +
8673 +
8674 +extern void free_nx_info(struct nx_info *);
8675 +
8676 +#define put_nx_info(i) __put_nx_info(i, __FILE__, __LINE__)
8677 +
8678 +static inline void __put_nx_info(struct nx_info *nxi, const char *_file, int _line)
8679 +{
8680 +       if (!nxi)
8681 +               return;
8682 +
8683 +       vxlprintk(VXD_CBIT(nid, 2), "put_nx_info(%p[#%d.%d])",
8684 +               nxi, nxi ? nxi->nx_id : 0,
8685 +               nxi ? atomic_read(&nxi->nx_usecnt) : 0,
8686 +               _file, _line);
8687 +
8688 +       if (atomic_dec_and_test(&nxi->nx_usecnt))
8689 +               free_nx_info(nxi);
8690 +}
8691 +
8692 +
8693 +#define init_nx_info(p, i) __init_nx_info(p, i, __FILE__, __LINE__)
8694 +
8695 +static inline void __init_nx_info(struct nx_info **nxp, struct nx_info *nxi,
8696 +               const char *_file, int _line)
8697 +{
8698 +       if (nxi) {
8699 +               vxlprintk(VXD_CBIT(nid, 3),
8700 +                       "init_nx_info(%p[#%d.%d])",
8701 +                       nxi, nxi ? nxi->nx_id : 0,
8702 +                       nxi ? atomic_read(&nxi->nx_usecnt) : 0,
8703 +                       _file, _line);
8704 +
8705 +               atomic_inc(&nxi->nx_usecnt);
8706 +       }
8707 +       *nxp = nxi;
8708 +}
8709 +
8710 +
8711 +#define set_nx_info(p, i) __set_nx_info(p, i, __FILE__, __LINE__)
8712 +
8713 +static inline void __set_nx_info(struct nx_info **nxp, struct nx_info *nxi,
8714 +       const char *_file, int _line)
8715 +{
8716 +       struct nx_info *nxo;
8717 +
8718 +       if (!nxi)
8719 +               return;
8720 +
8721 +       vxlprintk(VXD_CBIT(nid, 3), "set_nx_info(%p[#%d.%d])",
8722 +               nxi, nxi ? nxi->nx_id : 0,
8723 +               nxi ? atomic_read(&nxi->nx_usecnt) : 0,
8724 +               _file, _line);
8725 +
8726 +       atomic_inc(&nxi->nx_usecnt);
8727 +       nxo = xchg(nxp, nxi);
8728 +       BUG_ON(nxo);
8729 +}
8730 +
8731 +#define clr_nx_info(p) __clr_nx_info(p, __FILE__, __LINE__)
8732 +
8733 +static inline void __clr_nx_info(struct nx_info **nxp,
8734 +       const char *_file, int _line)
8735 +{
8736 +       struct nx_info *nxo;
8737 +
8738 +       nxo = xchg(nxp, NULL);
8739 +       if (!nxo)
8740 +               return;
8741 +
8742 +       vxlprintk(VXD_CBIT(nid, 3), "clr_nx_info(%p[#%d.%d])",
8743 +               nxo, nxo ? nxo->nx_id : 0,
8744 +               nxo ? atomic_read(&nxo->nx_usecnt) : 0,
8745 +               _file, _line);
8746 +
8747 +       if (atomic_dec_and_test(&nxo->nx_usecnt))
8748 +               free_nx_info(nxo);
8749 +}
8750 +
8751 +
8752 +#define claim_nx_info(v, p) __claim_nx_info(v, p, __FILE__, __LINE__)
8753 +
8754 +static inline void __claim_nx_info(struct nx_info *nxi,
8755 +       struct task_struct *task, const char *_file, int _line)
8756 +{
8757 +       vxlprintk(VXD_CBIT(nid, 3), "claim_nx_info(%p[#%d.%d.%d]) %p",
8758 +               nxi, nxi ? nxi->nx_id : 0,
8759 +               nxi?atomic_read(&nxi->nx_usecnt):0,
8760 +               nxi?atomic_read(&nxi->nx_tasks):0,
8761 +               task, _file, _line);
8762 +
8763 +       atomic_inc(&nxi->nx_tasks);
8764 +}
8765 +
8766 +
8767 +extern void unhash_nx_info(struct nx_info *);
8768 +
8769 +#define release_nx_info(v, p) __release_nx_info(v, p, __FILE__, __LINE__)
8770 +
8771 +static inline void __release_nx_info(struct nx_info *nxi,
8772 +       struct task_struct *task, const char *_file, int _line)
8773 +{
8774 +       vxlprintk(VXD_CBIT(nid, 3), "release_nx_info(%p[#%d.%d.%d]) %p",
8775 +               nxi, nxi ? nxi->nx_id : 0,
8776 +               nxi ? atomic_read(&nxi->nx_usecnt) : 0,
8777 +               nxi ? atomic_read(&nxi->nx_tasks) : 0,
8778 +               task, _file, _line);
8779 +
8780 +       might_sleep();
8781 +
8782 +       if (atomic_dec_and_test(&nxi->nx_tasks))
8783 +               unhash_nx_info(nxi);
8784 +}
8785 +
8786 +
8787 +#define task_get_nx_info(i)    __task_get_nx_info(i, __FILE__, __LINE__)
8788 +
8789 +static __inline__ struct nx_info *__task_get_nx_info(struct task_struct *p,
8790 +       const char *_file, int _line)
8791 +{
8792 +       struct nx_info *nxi;
8793 +
8794 +       task_lock(p);
8795 +       vxlprintk(VXD_CBIT(nid, 5), "task_get_nx_info(%p)",
8796 +               p, _file, _line);
8797 +       nxi = __get_nx_info(p->nx_info, _file, _line);
8798 +       task_unlock(p);
8799 +       return nxi;
8800 +}
8801 +
8802 +
8803 +static inline void exit_nx_info(struct task_struct *p)
8804 +{
8805 +       if (p->nx_info)
8806 +               release_nx_info(p->nx_info, p);
8807 +}
8808 +
8809 +
8810 +#else
8811 +#warning duplicate inclusion
8812 +#endif
8813 diff -NurpP --minimal linux-4.9.135/include/linux/vs_pid.h linux-4.9.135-vs2.3.9.8/include/linux/vs_pid.h
8814 --- linux-4.9.135/include/linux/vs_pid.h        1970-01-01 00:00:00.000000000 +0000
8815 +++ linux-4.9.135-vs2.3.9.8/include/linux/vs_pid.h      2018-10-20 04:58:14.000000000 +0000
8816 @@ -0,0 +1,50 @@
8817 +#ifndef _VS_PID_H
8818 +#define _VS_PID_H
8819 +
8820 +#include "vserver/base.h"
8821 +#include "vserver/check.h"
8822 +#include "vserver/context.h"
8823 +#include "vserver/debug.h"
8824 +#include "vserver/pid.h"
8825 +#include <linux/pid_namespace.h>
8826 +
8827 +
8828 +#define VXF_FAKE_INIT  (VXF_INFO_INIT | VXF_STATE_INIT)
8829 +
8830 +static inline
8831 +int vx_proc_task_visible(struct task_struct *task)
8832 +{
8833 +       if ((task->pid == 1) &&
8834 +               !vx_flags(VXF_FAKE_INIT, VXF_FAKE_INIT))
8835 +               /* show a blend through init */
8836 +               goto visible;
8837 +       if (vx_check(vx_task_xid(task), VS_WATCH | VS_IDENT))
8838 +               goto visible;
8839 +       return 0;
8840 +visible:
8841 +       return 1;
8842 +}
8843 +
8844 +#define find_task_by_real_pid(pid) find_task_by_pid_ns(pid, &init_pid_ns)
8845 +
8846 +
8847 +static inline
8848 +struct task_struct *vx_get_proc_task(struct inode *inode, struct pid *pid)
8849 +{
8850 +       struct task_struct *task = get_pid_task(pid, PIDTYPE_PID);
8851 +
8852 +       if (task && !vx_proc_task_visible(task)) {
8853 +               vxdprintk(VXD_CBIT(misc, 6),
8854 +                       "dropping task (get) %p[#%u,%u] for %p[#%u,%u]",
8855 +                       task, task->xid, task->pid,
8856 +                       current, current->xid, current->pid);
8857 +               put_task_struct(task);
8858 +               task = NULL;
8859 +       }
8860 +       return task;
8861 +}
8862 +
8863 +
8864 +#else
8865 +#warning duplicate inclusion
8866 +#endif
8867 diff -NurpP --minimal linux-4.9.135/include/linux/vs_sched.h linux-4.9.135-vs2.3.9.8/include/linux/vs_sched.h
8868 --- linux-4.9.135/include/linux/vs_sched.h      1970-01-01 00:00:00.000000000 +0000
8869 +++ linux-4.9.135-vs2.3.9.8/include/linux/vs_sched.h    2018-10-20 04:58:14.000000000 +0000
8870 @@ -0,0 +1,40 @@
8871 +#ifndef _VS_SCHED_H
8872 +#define _VS_SCHED_H
8873 +
8874 +#include "vserver/base.h"
8875 +#include "vserver/context.h"
8876 +#include "vserver/sched.h"
8877 +
8878 +
8879 +#define MAX_PRIO_BIAS           20
8880 +#define MIN_PRIO_BIAS          -20
8881 +
8882 +static inline
8883 +int vx_adjust_prio(struct task_struct *p, int prio, int max_user)
8884 +{
8885 +       struct vx_info *vxi = p->vx_info;
8886 +
8887 +       if (vxi)
8888 +               prio += vx_cpu(vxi, sched_pc).prio_bias;
8889 +       return prio;
8890 +}
8891 +
8892 +static inline void vx_account_user(struct vx_info *vxi,
8893 +       cputime_t cputime, int nice)
8894 +{
8895 +       if (!vxi)
8896 +               return;
8897 +       vx_cpu(vxi, sched_pc).user_ticks += cputime;
8898 +}
8899 +
8900 +static inline void vx_account_system(struct vx_info *vxi,
8901 +       cputime_t cputime, int idle)
8902 +{
8903 +       if (!vxi)
8904 +               return;
8905 +       vx_cpu(vxi, sched_pc).sys_ticks += cputime;
8906 +}
8907 +
8908 +#else
8909 +#warning duplicate inclusion
8910 +#endif
8911 diff -NurpP --minimal linux-4.9.135/include/linux/vs_socket.h linux-4.9.135-vs2.3.9.8/include/linux/vs_socket.h
8912 --- linux-4.9.135/include/linux/vs_socket.h     1970-01-01 00:00:00.000000000 +0000
8913 +++ linux-4.9.135-vs2.3.9.8/include/linux/vs_socket.h   2018-10-20 04:58:14.000000000 +0000
8914 @@ -0,0 +1,67 @@
8915 +#ifndef _VS_SOCKET_H
8916 +#define _VS_SOCKET_H
8917 +
8918 +#include "vserver/debug.h"
8919 +#include "vserver/base.h"
8920 +#include "vserver/cacct.h"
8921 +#include "vserver/context.h"
8922 +#include "vserver/tag.h"
8923 +
8924 +
8925 +/* socket accounting */
8926 +
8927 +#include <linux/socket.h>
8928 +
8929 +static inline int vx_sock_type(int family)
8930 +{
8931 +       switch (family) {
8932 +       case PF_UNSPEC:
8933 +               return VXA_SOCK_UNSPEC;
8934 +       case PF_UNIX:
8935 +               return VXA_SOCK_UNIX;
8936 +       case PF_INET:
8937 +               return VXA_SOCK_INET;
8938 +       case PF_INET6:
8939 +               return VXA_SOCK_INET6;
8940 +       case PF_PACKET:
8941 +               return VXA_SOCK_PACKET;
8942 +       default:
8943 +               return VXA_SOCK_OTHER;
8944 +       }
8945 +}
8946 +
8947 +#define vx_acc_sock(v, f, p, s) \
8948 +       __vx_acc_sock(v, f, p, s, __FILE__, __LINE__)
8949 +
8950 +static inline void __vx_acc_sock(struct vx_info *vxi,
8951 +       int family, int pos, int size, char *file, int line)
8952 +{
8953 +       if (vxi) {
8954 +               int type = vx_sock_type(family);
8955 +
8956 +               atomic_long_inc(&vxi->cacct.sock[type][pos].count);
8957 +               atomic_long_add(size, &vxi->cacct.sock[type][pos].total);
8958 +       }
8959 +}
8960 +
8961 +#define vx_sock_recv(sk, s) \
8962 +       vx_acc_sock((sk)->sk_vx_info, (sk)->sk_family, 0, s)
8963 +#define vx_sock_send(sk, s) \
8964 +       vx_acc_sock((sk)->sk_vx_info, (sk)->sk_family, 1, s)
8965 +#define vx_sock_fail(sk, s) \
8966 +       vx_acc_sock((sk)->sk_vx_info, (sk)->sk_family, 2, s)
8967 +
8968 +
8969 +#define sock_vx_init(s) do {           \
8970 +       (s)->sk_xid = 0;                \
8971 +       (s)->sk_vx_info = NULL;         \
8972 +       } while (0)
8973 +
8974 +#define sock_nx_init(s) do {           \
8975 +       (s)->sk_nid = 0;                \
8976 +       (s)->sk_nx_info = NULL;         \
8977 +       } while (0)
8978 +
8979 +#else
8980 +#warning duplicate inclusion
8981 +#endif
8982 diff -NurpP --minimal linux-4.9.135/include/linux/vs_tag.h linux-4.9.135-vs2.3.9.8/include/linux/vs_tag.h
8983 --- linux-4.9.135/include/linux/vs_tag.h        1970-01-01 00:00:00.000000000 +0000
8984 +++ linux-4.9.135-vs2.3.9.8/include/linux/vs_tag.h      2018-10-20 04:58:14.000000000 +0000
8985 @@ -0,0 +1,47 @@
8986 +#ifndef _VS_TAG_H
8987 +#define _VS_TAG_H
8988 +
8989 +#include <linux/vserver/tag.h>
8990 +
8991 +/* check conditions */
8992 +
8993 +#define DX_ADMIN       0x0001
8994 +#define DX_WATCH       0x0002
8995 +#define DX_HOSTID      0x0008
8996 +
8997 +#define DX_IDENT       0x0010
8998 +
8999 +#define DX_ARG_MASK    0x0010
9000 +
9001 +
9002 +#define dx_task_tag(t) ((t)->tag)
9003 +
9004 +#define dx_current_tag() dx_task_tag(current)
9005 +
9006 +#define dx_check(c, m) __dx_check(dx_current_tag(), c, m)
9007 +
9008 +#define dx_weak_check(c, m)    ((m) ? dx_check(c, m) : 1)
9009 +
9010 +
9011 +/*
9012 + * check current context for ADMIN/WATCH and
9013 + * optionally against supplied argument
9014 + */
9015 +static inline int __dx_check(vtag_t cid, vtag_t id, unsigned int mode)
9016 +{
9017 +       if (mode & DX_ARG_MASK) {
9018 +               if ((mode & DX_IDENT) && (id == cid))
9019 +                       return 1;
9020 +       }
9021 +       return (((mode & DX_ADMIN) && (cid == 0)) ||
9022 +               ((mode & DX_WATCH) && (cid == 1)) ||
9023 +               ((mode & DX_HOSTID) && (id == 0)));
9024 +}
9025 +
9026 +struct inode;
9027 +int dx_permission(const struct inode *inode, int mask);
9028 +
9029 +
9030 +#else
9031 +#warning duplicate inclusion
9032 +#endif
9033 diff -NurpP --minimal linux-4.9.135/include/linux/vs_time.h linux-4.9.135-vs2.3.9.8/include/linux/vs_time.h
9034 --- linux-4.9.135/include/linux/vs_time.h       1970-01-01 00:00:00.000000000 +0000
9035 +++ linux-4.9.135-vs2.3.9.8/include/linux/vs_time.h     2018-10-20 04:58:14.000000000 +0000
9036 @@ -0,0 +1,21 @@
9037 +#ifndef _VS_TIME_H
9038 +#define _VS_TIME_H
9039 +
9040 +
9041 +/* time faking stuff */
9042 +
9043 +#ifdef CONFIG_VSERVER_VTIME
9044 +
9045 +extern void vx_adjust_timespec(struct timespec *ts);
9046 +extern int vx_settimeofday(const struct timespec *ts);
9047 +extern int vx_settimeofday64(const struct timespec64 *ts);
9048 +
9049 +#else
9050 +#define        vx_adjust_timespec(t)   do { } while (0)
9051 +#define        vx_settimeofday(t)      do_settimeofday(t)
9052 +#define        vx_settimeofday64(t)    do_settimeofday64(t)
9053 +#endif
9054 +
9055 +#else
9056 +#warning duplicate inclusion
9057 +#endif
9058 diff -NurpP --minimal linux-4.9.135/include/linux/vserver/base.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/base.h
9059 --- linux-4.9.135/include/linux/vserver/base.h  1970-01-01 00:00:00.000000000 +0000
9060 +++ linux-4.9.135-vs2.3.9.8/include/linux/vserver/base.h        2018-10-20 04:58:14.000000000 +0000
9061 @@ -0,0 +1,184 @@
9062 +#ifndef _VSERVER_BASE_H
9063 +#define _VSERVER_BASE_H
9064 +
9065 +
9066 +/* context state changes */
9067 +
9068 +enum {
9069 +       VSC_STARTUP = 1,
9070 +       VSC_SHUTDOWN,
9071 +
9072 +       VSC_NETUP,
9073 +       VSC_NETDOWN,
9074 +};
9075 +
9076 +
9077 +
9078 +#define vx_task_xid(t) ((t)->xid)
9079 +
9080 +#define vx_current_xid() vx_task_xid(current)
9081 +
9082 +#define current_vx_info() (current->vx_info)
9083 +
9084 +
9085 +#define nx_task_nid(t) ((t)->nid)
9086 +
9087 +#define nx_current_nid() nx_task_nid(current)
9088 +
9089 +#define current_nx_info() (current->nx_info)
9090 +
9091 +
9092 +/* generic flag merging */
9093 +
9094 +#define vs_check_flags(v, m, f)        (((v) & (m)) ^ (f))
9095 +
9096 +#define vs_mask_flags(v, f, m) (((v) & ~(m)) | ((f) & (m)))
9097 +
9098 +#define vs_mask_mask(v, f, m)  (((v) & ~(m)) | ((v) & (f) & (m)))
9099 +
9100 +#define vs_check_bit(v, n)     ((v) & (1LL << (n)))
9101 +
9102 +
9103 +/* context flags */
9104 +
9105 +#define __vx_flags(v)  ((v) ? (v)->vx_flags : 0)
9106 +
9107 +#define vx_current_flags()     __vx_flags(current_vx_info())
9108 +
9109 +#define vx_info_flags(v, m, f) \
9110 +       vs_check_flags(__vx_flags(v), m, f)
9111 +
9112 +#define task_vx_flags(t, m, f) \
9113 +       ((t) && vx_info_flags((t)->vx_info, m, f))
9114 +
9115 +#define vx_flags(m, f) vx_info_flags(current_vx_info(), m, f)
9116 +
9117 +
9118 +/* context caps */
9119 +
9120 +#define __vx_ccaps(v)  ((v) ? (v)->vx_ccaps : 0)
9121 +
9122 +#define vx_current_ccaps()     __vx_ccaps(current_vx_info())
9123 +
9124 +#define vx_info_ccaps(v, c)    (__vx_ccaps(v) & (c))
9125 +
9126 +#define vx_ccaps(c)    vx_info_ccaps(current_vx_info(), (c))
9127 +
9128 +
9129 +
9130 +/* network flags */
9131 +
9132 +#define __nx_flags(n)  ((n) ? (n)->nx_flags : 0)
9133 +
9134 +#define nx_current_flags()     __nx_flags(current_nx_info())
9135 +
9136 +#define nx_info_flags(n, m, f) \
9137 +       vs_check_flags(__nx_flags(n), m, f)
9138 +
9139 +#define task_nx_flags(t, m, f) \
9140 +       ((t) && nx_info_flags((t)->nx_info, m, f))
9141 +
9142 +#define nx_flags(m, f) nx_info_flags(current_nx_info(), m, f)
9143 +
9144 +
9145 +/* network caps */
9146 +
9147 +#define __nx_ncaps(n)  ((n) ? (n)->nx_ncaps : 0)
9148 +
9149 +#define nx_current_ncaps()     __nx_ncaps(current_nx_info())
9150 +
9151 +#define nx_info_ncaps(n, c)    (__nx_ncaps(n) & (c))
9152 +
9153 +#define nx_ncaps(c)    nx_info_ncaps(current_nx_info(), c)
9154 +
9155 +
9156 +/* context mask capabilities */
9157 +
9158 +#define __vx_mcaps(v)  ((v) ? (v)->vx_ccaps >> 32UL : ~0 )
9159 +
9160 +#define vx_info_mcaps(v, c)    (__vx_mcaps(v) & (c))
9161 +
9162 +#define vx_mcaps(c)    vx_info_mcaps(current_vx_info(), c)
9163 +
9164 +
9165 +/* context bcap mask */
9166 +
9167 +#define __vx_bcaps(v)          ((v)->vx_bcaps)
9168 +
9169 +#define vx_current_bcaps()     __vx_bcaps(current_vx_info())
9170 +
9171 +
9172 +/* mask given bcaps */
9173 +
9174 +#define vx_info_mbcaps(v, c)   ((v) ? cap_intersect(__vx_bcaps(v), c) : c)
9175 +
9176 +#define vx_mbcaps(c)           vx_info_mbcaps(current_vx_info(), c)
9177 +
9178 +
9179 +/* masked cap_bset */
9180 +
9181 +#define vx_info_cap_bset(v)    vx_info_mbcaps(v, current->cap_bset)
9182 +
9183 +#define vx_current_cap_bset()  vx_info_cap_bset(current_vx_info())
9184 +
9185 +#if 0
9186 +#define vx_info_mbcap(v, b) \
9187 +       (!vx_info_flags(v, VXF_STATE_SETUP, 0) ? \
9188 +       vx_info_bcaps(v, b) : (b))
9189 +
9190 +#define task_vx_mbcap(t, b) \
9191 +       vx_info_mbcap((t)->vx_info, (t)->b)
9192 +
9193 +#define vx_mbcap(b)    task_vx_mbcap(current, b)
9194 +#endif
9195 +
9196 +#define vx_cap_raised(v, c, f) cap_raised(vx_info_mbcaps(v, c), f)
9197 +
9198 +#define vx_capable(b, c) (capable(b) || \
9199 +       (cap_raised(current_cap(), b) && vx_ccaps(c)))
9200 +
9201 +#define vx_ns_capable(n, b, c) (ns_capable(n, b) || \
9202 +       (cap_raised(current_cap(), b) && vx_ccaps(c)))
9203 +
9204 +#define nx_capable(b, c) (capable(b) || \
9205 +       (cap_raised(current_cap(), b) && nx_ncaps(c)))
9206 +
9207 +#define nx_ns_capable(n, b, c) (ns_capable(n, b) || \
9208 +       (cap_raised(current_cap(), b) && nx_ncaps(c)))
9209 +
9210 +#define vx_task_initpid(t, n) \
9211 +       ((t)->vx_info && \
9212 +       ((t)->vx_info->vx_initpid == (n)))
9213 +
9214 +#define vx_current_initpid(n)  vx_task_initpid(current, n)
9215 +
9216 +
9217 +/* context unshare mask */
9218 +
9219 +#define __vx_umask(v)          ((v)->vx_umask)
9220 +
9221 +#define vx_current_umask()     __vx_umask(current_vx_info())
9222 +
9223 +#define vx_can_unshare(b, f) (capable(b) || \
9224 +       (cap_raised(current_cap(), b) && \
9225 +       !((f) & ~vx_current_umask())))
9226 +
9227 +#define vx_ns_can_unshare(n, b, f) (ns_capable(n, b) || \
9228 +       (cap_raised(current_cap(), b) && \
9229 +       !((f) & ~vx_current_umask())))
9230 +
9231 +#define __vx_wmask(v)          ((v)->vx_wmask)
9232 +
9233 +#define vx_current_wmask()     __vx_wmask(current_vx_info())
9234 +
9235 +
9236 +#define __vx_state(v)  ((v) ? ((v)->vx_state) : 0)
9237 +
9238 +#define vx_info_state(v, m)    (__vx_state(v) & (m))
9239 +
9240 +
9241 +#define __nx_state(n)  ((n) ? ((n)->nx_state) : 0)
9242 +
9243 +#define nx_info_state(n, m)    (__nx_state(n) & (m))
9244 +
9245 +#endif
9246 diff -NurpP --minimal linux-4.9.135/include/linux/vserver/cacct.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/cacct.h
9247 --- linux-4.9.135/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000
9248 +++ linux-4.9.135-vs2.3.9.8/include/linux/vserver/cacct.h       2018-10-20 04:58:14.000000000 +0000
9249 @@ -0,0 +1,15 @@
9250 +#ifndef _VSERVER_CACCT_H
9251 +#define _VSERVER_CACCT_H
9252 +
9253 +
9254 +enum sock_acc_field {
9255 +       VXA_SOCK_UNSPEC = 0,
9256 +       VXA_SOCK_UNIX,
9257 +       VXA_SOCK_INET,
9258 +       VXA_SOCK_INET6,
9259 +       VXA_SOCK_PACKET,
9260 +       VXA_SOCK_OTHER,
9261 +       VXA_SOCK_SIZE   /* array size */
9262 +};
9263 +
9264 +#endif /* _VSERVER_CACCT_H */
9265 diff -NurpP --minimal linux-4.9.135/include/linux/vserver/cacct_cmd.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/cacct_cmd.h
9266 --- linux-4.9.135/include/linux/vserver/cacct_cmd.h     1970-01-01 00:00:00.000000000 +0000
9267 +++ linux-4.9.135-vs2.3.9.8/include/linux/vserver/cacct_cmd.h   2018-10-20 04:58:14.000000000 +0000
9268 @@ -0,0 +1,10 @@
9269 +#ifndef _VSERVER_CACCT_CMD_H
9270 +#define _VSERVER_CACCT_CMD_H
9271 +
9272 +
9273 +#include <linux/compiler.h>
9274 +#include <uapi/vserver/cacct_cmd.h>
9275 +
9276 +extern int vc_sock_stat(struct vx_info *, void __user *);
9277 +
9278 +#endif /* _VSERVER_CACCT_CMD_H */
9279 diff -NurpP --minimal linux-4.9.135/include/linux/vserver/cacct_def.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/cacct_def.h
9280 --- linux-4.9.135/include/linux/vserver/cacct_def.h     1970-01-01 00:00:00.000000000 +0000
9281 +++ linux-4.9.135-vs2.3.9.8/include/linux/vserver/cacct_def.h   2018-10-20 04:58:14.000000000 +0000
9282 @@ -0,0 +1,43 @@
9283 +#ifndef _VSERVER_CACCT_DEF_H
9284 +#define _VSERVER_CACCT_DEF_H
9285 +
9286 +#include <asm/atomic.h>
9287 +#include <linux/vserver/cacct.h>
9288 +
9289 +
9290 +struct _vx_sock_acc {
9291 +       atomic_long_t count;
9292 +       atomic_long_t total;
9293 +};
9294 +
9295 +/* context sub struct */
9296 +
9297 +struct _vx_cacct {
9298 +       struct _vx_sock_acc sock[VXA_SOCK_SIZE][3];
9299 +       atomic_t slab[8];
9300 +       atomic_t page[6][8];
9301 +};
9302 +
9303 +#ifdef CONFIG_VSERVER_DEBUG
9304 +
9305 +static inline void __dump_vx_cacct(struct _vx_cacct *cacct)
9306 +{
9307 +       int i, j;
9308 +
9309 +       printk("\t_vx_cacct:");
9310 +       for (i = 0; i < 6; i++) {
9311 +               struct _vx_sock_acc *ptr = cacct->sock[i];
9312 +
9313 +               printk("\t [%d] =", i);
9314 +               for (j = 0; j < 3; j++) {
9315 +                       printk(" [%d] = %8lu, %8lu", j,
9316 +                               atomic_long_read(&ptr[j].count),
9317 +                               atomic_long_read(&ptr[j].total));
9318 +               }
9319 +               printk("\n");
9320 +       }
9321 +}
9322 +
9323 +#endif
9324 +
9325 +#endif /* _VSERVER_CACCT_DEF_H */
9326 diff -NurpP --minimal linux-4.9.135/include/linux/vserver/cacct_int.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/cacct_int.h
9327 --- linux-4.9.135/include/linux/vserver/cacct_int.h     1970-01-01 00:00:00.000000000 +0000
9328 +++ linux-4.9.135-vs2.3.9.8/include/linux/vserver/cacct_int.h   2018-10-20 04:58:14.000000000 +0000
9329 @@ -0,0 +1,17 @@
9330 +#ifndef _VSERVER_CACCT_INT_H
9331 +#define _VSERVER_CACCT_INT_H
9332 +
9333 +static inline
9334 +unsigned long vx_sock_count(struct _vx_cacct *cacct, int type, int pos)
9335 +{
9336 +       return atomic_long_read(&cacct->sock[type][pos].count);
9337 +}
9338 +
9339 +
9340 +static inline
9341 +unsigned long vx_sock_total(struct _vx_cacct *cacct, int type, int pos)
9342 +{
9343 +       return atomic_long_read(&cacct->sock[type][pos].total);
9344 +}
9345 +
9346 +#endif /* _VSERVER_CACCT_INT_H */
9347 diff -NurpP --minimal linux-4.9.135/include/linux/vserver/check.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/check.h
9348 --- linux-4.9.135/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000
9349 +++ linux-4.9.135-vs2.3.9.8/include/linux/vserver/check.h       2018-10-20 04:58:14.000000000 +0000
9350 @@ -0,0 +1,89 @@
9351 +#ifndef _VSERVER_CHECK_H
9352 +#define _VSERVER_CHECK_H
9353 +
9354 +
9355 +#define MAX_S_CONTEXT  65535   /* Arbitrary limit */
9356 +
9357 +#ifdef CONFIG_VSERVER_DYNAMIC_IDS
9358 +#define MIN_D_CONTEXT  49152   /* dynamic contexts start here */
9359 +#else
9360 +#define MIN_D_CONTEXT  65536
9361 +#endif
9362 +
9363 +/* check conditions */
9364 +
9365 +#define VS_ADMIN       0x0001
9366 +#define VS_WATCH       0x0002
9367 +#define VS_HIDE                0x0004
9368 +#define VS_HOSTID      0x0008
9369 +
9370 +#define VS_IDENT       0x0010
9371 +#define VS_EQUIV       0x0020
9372 +#define VS_PARENT      0x0040
9373 +#define VS_CHILD       0x0080
9374 +
9375 +#define VS_ARG_MASK    0x00F0
9376 +
9377 +#define VS_DYNAMIC     0x0100
9378 +#define VS_STATIC      0x0200
9379 +
9380 +#define VS_ATR_MASK    0x0F00
9381 +
9382 +#ifdef CONFIG_VSERVER_PRIVACY
9383 +#define VS_ADMIN_P     (0)
9384 +#define VS_WATCH_P     (0)
9385 +#else
9386 +#define VS_ADMIN_P     VS_ADMIN
9387 +#define VS_WATCH_P     VS_WATCH
9388 +#endif
9389 +
9390 +#define VS_HARDIRQ     0x1000
9391 +#define VS_SOFTIRQ     0x2000
9392 +#define VS_IRQ         0x4000
9393 +
9394 +#define VS_IRQ_MASK    0xF000
9395 +
9396 +#include <linux/hardirq.h>
9397 +
9398 +/*
9399 + * check current context for ADMIN/WATCH and
9400 + * optionally against supplied argument
9401 + */
9402 +static inline int __vs_check(int cid, int id, unsigned int mode)
9403 +{
9404 +       if (mode & VS_ARG_MASK) {
9405 +               if ((mode & VS_IDENT) && (id == cid))
9406 +                       return 1;
9407 +       }
9408 +       if (mode & VS_ATR_MASK) {
9409 +               if ((mode & VS_DYNAMIC) &&
9410 +                       (id >= MIN_D_CONTEXT) &&
9411 +                       (id <= MAX_S_CONTEXT))
9412 +                       return 1;
9413 +               if ((mode & VS_STATIC) &&
9414 +                       (id > 1) && (id < MIN_D_CONTEXT))
9415 +                       return 1;
9416 +       }
9417 +       if (mode & VS_IRQ_MASK) {
9418 +               if ((mode & VS_IRQ) && unlikely(in_interrupt()))
9419 +                       return 1;
9420 +               if ((mode & VS_HARDIRQ) && unlikely(in_irq()))
9421 +                       return 1;
9422 +               if ((mode & VS_SOFTIRQ) && unlikely(in_softirq()))
9423 +                       return 1;
9424 +       }
9425 +       return (((mode & VS_ADMIN) && (cid == 0)) ||
9426 +               ((mode & VS_WATCH) && (cid == 1)) ||
9427 +               ((mode & VS_HOSTID) && (id == 0)));
9428 +}
9429 +
9430 +#define vx_check(c, m) __vs_check(vx_current_xid(), c, (m) | VS_IRQ)
9431 +
9432 +#define vx_weak_check(c, m)    ((m) ? vx_check(c, m) : 1)
9433 +
9434 +
9435 +#define nx_check(c, m) __vs_check(nx_current_nid(), c, m)
9436 +
9437 +#define nx_weak_check(c, m)    ((m) ? nx_check(c, m) : 1)
9438 +
9439 +#endif
9440 diff -NurpP --minimal linux-4.9.135/include/linux/vserver/context.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/context.h
9441 --- linux-4.9.135/include/linux/vserver/context.h       1970-01-01 00:00:00.000000000 +0000
9442 +++ linux-4.9.135-vs2.3.9.8/include/linux/vserver/context.h     2018-10-20 04:58:14.000000000 +0000
9443 @@ -0,0 +1,110 @@
9444 +#ifndef _VSERVER_CONTEXT_H
9445 +#define _VSERVER_CONTEXT_H
9446 +
9447 +
9448 +#include <linux/list.h>
9449 +#include <linux/spinlock.h>
9450 +#include <linux/rcupdate.h>
9451 +#include <uapi/vserver/context.h>
9452 +
9453 +#include "limit_def.h"
9454 +#include "sched_def.h"
9455 +#include "cvirt_def.h"
9456 +#include "cacct_def.h"
9457 +#include "device_def.h"
9458 +
9459 +#define VX_SPACES      2
9460 +
9461 +struct _vx_info_pc {
9462 +       struct _vx_sched_pc sched_pc;
9463 +       struct _vx_cvirt_pc cvirt_pc;
9464 +};
9465 +
9466 +struct _vx_space {
9467 +       unsigned long vx_nsmask;                /* assignment mask */
9468 +       struct nsproxy *vx_nsproxy;             /* private namespaces */
9469 +       struct fs_struct *vx_fs;                /* private namespace fs */
9470 +       const struct cred *vx_cred;             /* task credentials */
9471 +};
9472 +
9473 +struct vx_info {
9474 +       struct hlist_node vx_hlist;             /* linked list of contexts */
9475 +       vxid_t vx_id;                           /* context id */
9476 +       atomic_t vx_usecnt;                     /* usage count */
9477 +       atomic_t vx_tasks;                      /* tasks count */
9478 +       struct vx_info *vx_parent;              /* parent context */
9479 +       int vx_state;                           /* context state */
9480 +
9481 +       struct _vx_space space[VX_SPACES];      /* namespace store */
9482 +
9483 +       uint64_t vx_flags;                      /* context flags */
9484 +       uint64_t vx_ccaps;                      /* context caps (vserver) */
9485 +       uint64_t vx_umask;                      /* unshare mask (guest) */
9486 +       uint64_t vx_wmask;                      /* warn mask (guest) */
9487 +       kernel_cap_t vx_bcaps;                  /* bounding caps (system) */
9488 +
9489 +       struct task_struct *vx_reaper;          /* guest reaper process */
9490 +       pid_t vx_initpid;                       /* PID of guest init */
9491 +       int64_t vx_badness_bias;                /* OOM points bias */
9492 +
9493 +       struct _vx_limit limit;                 /* vserver limits */
9494 +       struct _vx_sched sched;                 /* vserver scheduler */
9495 +       struct _vx_cvirt cvirt;                 /* virtual/bias stuff */
9496 +       struct _vx_cacct cacct;                 /* context accounting */
9497 +
9498 +       struct _vx_device dmap;                 /* default device map targets */
9499 +
9500 +#ifndef CONFIG_SMP
9501 +       struct _vx_info_pc info_pc;             /* per cpu data */
9502 +#else
9503 +       struct _vx_info_pc *ptr_pc;             /* per cpu array */
9504 +#endif
9505 +
9506 +       wait_queue_head_t vx_wait;              /* context exit waitqueue */
9507 +       int reboot_cmd;                         /* last sys_reboot() cmd */
9508 +       int exit_code;                          /* last process exit code */
9509 +
9510 +       char vx_name[65];                       /* vserver name */
9511 +};
9512 +
9513 +#ifndef CONFIG_SMP
9514 +#define        vx_ptr_pc(vxi)          (&(vxi)->info_pc)
9515 +#define        vx_per_cpu(vxi, v, id)  vx_ptr_pc(vxi)->v
9516 +#else
9517 +#define        vx_ptr_pc(vxi)          ((vxi)->ptr_pc)
9518 +#define        vx_per_cpu(vxi, v, id)  per_cpu_ptr(vx_ptr_pc(vxi), id)->v
9519 +#endif
9520 +
9521 +#define        vx_cpu(vxi, v)          vx_per_cpu(vxi, v, smp_processor_id())
9522 +
9523 +
9524 +struct vx_info_save {
9525 +       struct vx_info *vxi;
9526 +       vxid_t xid;
9527 +};
9528 +
9529 +
9530 +/* status flags */
9531 +
9532 +#define VXS_HASHED     0x0001
9533 +#define VXS_PAUSED     0x0010
9534 +#define VXS_SHUTDOWN   0x0100
9535 +#define VXS_HELPER     0x1000
9536 +#define VXS_RELEASED   0x8000
9537 +
9538 +
9539 +extern void claim_vx_info(struct vx_info *, struct task_struct *);
9540 +extern void release_vx_info(struct vx_info *, struct task_struct *);
9541 +
9542 +extern struct vx_info *lookup_vx_info(int);
9543 +extern struct vx_info *lookup_or_create_vx_info(int);
9544 +
9545 +extern int get_xid_list(int, unsigned int *, int);
9546 +extern int xid_is_hashed(vxid_t);
9547 +
9548 +extern int vx_migrate_task(struct task_struct *, struct vx_info *, int);
9549 +
9550 +extern long vs_state_change(struct vx_info *, unsigned int);
9551 +
9552 +
9553 +#endif /* _VSERVER_CONTEXT_H */
9554 diff -NurpP --minimal linux-4.9.135/include/linux/vserver/context_cmd.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/context_cmd.h
9555 --- linux-4.9.135/include/linux/vserver/context_cmd.h   1970-01-01 00:00:00.000000000 +0000
9556 +++ linux-4.9.135-vs2.3.9.8/include/linux/vserver/context_cmd.h 2018-10-20 04:58:14.000000000 +0000
9557 @@ -0,0 +1,33 @@
9558 +#ifndef _VSERVER_CONTEXT_CMD_H
9559 +#define _VSERVER_CONTEXT_CMD_H
9560 +
9561 +#include <uapi/vserver/context_cmd.h>
9562 +
9563 +extern int vc_task_xid(uint32_t);
9564 +
9565 +extern int vc_vx_info(struct vx_info *, void __user *);
9566 +
9567 +extern int vc_ctx_stat(struct vx_info *, void __user *);
9568 +
9569 +extern int vc_ctx_create(uint32_t, void __user *);
9570 +extern int vc_ctx_migrate(struct vx_info *, void __user *);
9571 +
9572 +extern int vc_get_cflags(struct vx_info *, void __user *);
9573 +extern int vc_set_cflags(struct vx_info *, void __user *);
9574 +
9575 +extern int vc_get_ccaps(struct vx_info *, void __user *);
9576 +extern int vc_set_ccaps(struct vx_info *, void __user *);
9577 +
9578 +extern int vc_get_bcaps(struct vx_info *, void __user *);
9579 +extern int vc_set_bcaps(struct vx_info *, void __user *);
9580 +
9581 +extern int vc_get_umask(struct vx_info *, void __user *);
9582 +extern int vc_set_umask(struct vx_info *, void __user *);
9583 +
9584 +extern int vc_get_wmask(struct vx_info *, void __user *);
9585 +extern int vc_set_wmask(struct vx_info *, void __user *);
9586 +
9587 +extern int vc_get_badness(struct vx_info *, void __user *);
9588 +extern int vc_set_badness(struct vx_info *, void __user *);
9589 +
9590 +#endif /* _VSERVER_CONTEXT_CMD_H */
9591 diff -NurpP --minimal linux-4.9.135/include/linux/vserver/cvirt.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/cvirt.h
9592 --- linux-4.9.135/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000
9593 +++ linux-4.9.135-vs2.3.9.8/include/linux/vserver/cvirt.h       2018-10-20 04:58:14.000000000 +0000
9594 @@ -0,0 +1,18 @@
9595 +#ifndef _VSERVER_CVIRT_H
9596 +#define _VSERVER_CVIRT_H
9597 +
9598 +struct timespec;
9599 +
9600 +void vx_vsi_boottime64(struct timespec64 *);
9601 +
9602 +void vx_vsi_uptime(struct timespec *, struct timespec *);
9603 +
9604 +
9605 +struct vx_info;
9606 +
9607 +void vx_update_load(struct vx_info *);
9608 +
9609 +
9610 +int vx_do_syslog(int, char __user *, int);
9611 +
9612 +#endif /* _VSERVER_CVIRT_H */
9613 diff -NurpP --minimal linux-4.9.135/include/linux/vserver/cvirt_cmd.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/cvirt_cmd.h
9614 --- linux-4.9.135/include/linux/vserver/cvirt_cmd.h     1970-01-01 00:00:00.000000000 +0000
9615 +++ linux-4.9.135-vs2.3.9.8/include/linux/vserver/cvirt_cmd.h   2018-10-20 04:58:14.000000000 +0000
9616 @@ -0,0 +1,13 @@
9617 +#ifndef _VSERVER_CVIRT_CMD_H
9618 +#define _VSERVER_CVIRT_CMD_H
9619 +
9620 +
9621 +#include <linux/compiler.h>
9622 +#include <uapi/vserver/cvirt_cmd.h>
9623 +
9624 +extern int vc_set_vhi_name(struct vx_info *, void __user *);
9625 +extern int vc_get_vhi_name(struct vx_info *, void __user *);
9626 +
9627 +extern int vc_virt_stat(struct vx_info *, void __user *);
9628 +
9629 +#endif /* _VSERVER_CVIRT_CMD_H */
9630 diff -NurpP --minimal linux-4.9.135/include/linux/vserver/cvirt_def.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/cvirt_def.h
9631 --- linux-4.9.135/include/linux/vserver/cvirt_def.h     1970-01-01 00:00:00.000000000 +0000
9632 +++ linux-4.9.135-vs2.3.9.8/include/linux/vserver/cvirt_def.h   2018-10-20 04:58:14.000000000 +0000
9633 @@ -0,0 +1,80 @@
9634 +#ifndef _VSERVER_CVIRT_DEF_H
9635 +#define _VSERVER_CVIRT_DEF_H
9636 +
9637 +#include <linux/jiffies.h>
9638 +#include <linux/spinlock.h>
9639 +#include <linux/wait.h>
9640 +#include <linux/time.h>
9641 +#include <asm/atomic.h>
9642 +
9643 +
9644 +struct _vx_usage_stat {
9645 +       uint64_t user;
9646 +       uint64_t nice;
9647 +       uint64_t system;
9648 +       uint64_t softirq;
9649 +       uint64_t irq;
9650 +       uint64_t idle;
9651 +       uint64_t iowait;
9652 +};
9653 +
9654 +struct _vx_syslog {
9655 +       wait_queue_head_t log_wait;
9656 +       spinlock_t logbuf_lock;         /* lock for the log buffer */
9657 +
9658 +       unsigned long log_start;        /* next char to be read by syslog() */
9659 +       unsigned long con_start;        /* next char to be sent to consoles */
9660 +       unsigned long log_end;  /* most-recently-written-char + 1 */
9661 +       unsigned long logged_chars;     /* #chars since last read+clear operation */
9662 +
9663 +       char log_buf[1024];
9664 +};
9665 +
9666 +
9667 +/* context sub struct */
9668 +
9669 +struct _vx_cvirt {
9670 +       atomic_t nr_threads;            /* number of current threads */
9671 +       atomic_t nr_running;            /* number of running threads */
9672 +       atomic_t nr_uninterruptible;    /* number of uninterruptible threads */
9673 +
9674 +       atomic_t nr_onhold;             /* processes on hold */
9675 +       uint32_t onhold_last;           /* jiffies when put on hold */
9676 +
9677 +       struct timespec64 bias_ts;      /* time offset to the host */
9678 +       struct timespec64 bias_idle;
9679 +       struct timespec64 bias_uptime;  /* context creation point */
9680 +       uint64_t bias_clock;            /* offset in clock_t */
9681 +
9682 +       spinlock_t load_lock;           /* lock for the load averages */
9683 +       atomic_t load_updates;          /* nr of load updates done so far */
9684 +       uint32_t load_last;             /* last time load was calculated */
9685 +       uint32_t load[3];               /* load averages 1,5,15 */
9686 +
9687 +       atomic_t total_forks;           /* number of forks so far */
9688 +
9689 +       struct _vx_syslog syslog;
9690 +};
9691 +
9692 +struct _vx_cvirt_pc {
9693 +       struct _vx_usage_stat cpustat;
9694 +};
9695 +
9696 +
9697 +#ifdef CONFIG_VSERVER_DEBUG
9698 +
9699 +static inline void __dump_vx_cvirt(struct _vx_cvirt *cvirt)
9700 +{
9701 +       printk("\t_vx_cvirt:\n");
9702 +       printk("\t threads: %4d, %4d, %4d, %4d\n",
9703 +               atomic_read(&cvirt->nr_threads),
9704 +               atomic_read(&cvirt->nr_running),
9705 +               atomic_read(&cvirt->nr_uninterruptible),
9706 +               atomic_read(&cvirt->nr_onhold));
9707 +       /* add rest here */
9708 +       printk("\t total_forks = %d\n", atomic_read(&cvirt->total_forks));
9709 +}
9710 +
9711 +#endif
9712 +
9713 +#endif /* _VSERVER_CVIRT_DEF_H */
9714 diff -NurpP --minimal linux-4.9.135/include/linux/vserver/debug.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/debug.h
9715 --- linux-4.9.135/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000
9716 +++ linux-4.9.135-vs2.3.9.8/include/linux/vserver/debug.h       2018-10-20 04:58:14.000000000 +0000
9717 @@ -0,0 +1,146 @@
9718 +#ifndef _VSERVER_DEBUG_H
9719 +#define _VSERVER_DEBUG_H
9720 +
9721 +
9722 +#define VXD_CBIT(n, m) (vs_debug_ ## n & (1 << (m)))
9723 +#define VXD_CMIN(n, m) (vs_debug_ ## n > (m))
9724 +#define VXD_MASK(n, m) (vs_debug_ ## n & (m))
9725 +
9726 +#define VXD_DEV(d)     (d), (d)->bd_inode->i_ino,              \
9727 +                       imajor((d)->bd_inode), iminor((d)->bd_inode)
9728 +#define VXF_DEV                "%p[%lu,%d:%d]"
9729 +
9730 +#if    defined(CONFIG_QUOTES_UTF8)
9731 +#define        VS_Q_LQM        "\xc2\xbb"
9732 +#define        VS_Q_RQM        "\xc2\xab"
9733 +#elif  defined(CONFIG_QUOTES_ASCII)
9734 +#define        VS_Q_LQM        "\x27"
9735 +#define        VS_Q_RQM        "\x27"
9736 +#else
9737 +#define        VS_Q_LQM        "\xbb"
9738 +#define        VS_Q_RQM        "\xab"
9739 +#endif
9740 +
9741 +#define        VS_Q(f)         VS_Q_LQM f VS_Q_RQM
9742 +
9743 +
9744 +#define vxd_path(p)                                            \
9745 +       ({ static char _buffer[PATH_MAX];                       \
9746 +          d_path(p, _buffer, sizeof(_buffer)); })
9747 +
9748 +#define vxd_cond_path(n)                                       \
9749 +       ((n) ? vxd_path(&(n)->path) : "<null>" )
9750 +
9751 +
9752 +#ifdef CONFIG_VSERVER_DEBUG
9753 +
9754 +extern unsigned int vs_debug_switch;
9755 +extern unsigned int vs_debug_xid;
9756 +extern unsigned int vs_debug_nid;
9757 +extern unsigned int vs_debug_tag;
9758 +extern unsigned int vs_debug_net;
9759 +extern unsigned int vs_debug_limit;
9760 +extern unsigned int vs_debug_cres;
9761 +extern unsigned int vs_debug_dlim;
9762 +extern unsigned int vs_debug_quota;
9763 +extern unsigned int vs_debug_cvirt;
9764 +extern unsigned int vs_debug_space;
9765 +extern unsigned int vs_debug_perm;
9766 +extern unsigned int vs_debug_misc;
9767 +
9768 +
9769 +#define VX_LOGLEVEL    "vxD: "
9770 +#define VX_PROC_FMT    "%p: "
9771 +#define VX_PROCESS     current
9772 +
9773 +#define vxdprintk(c, f, x...)                                  \
9774 +       do {                                                    \
9775 +               if (c)                                          \
9776 +                       printk(VX_LOGLEVEL VX_PROC_FMT f "\n",  \
9777 +                               VX_PROCESS , ##x);              \
9778 +       } while (0)
9779 +
9780 +#define vxlprintk(c, f, x...)                                  \
9781 +       do {                                                    \
9782 +               if (c)                                          \
9783 +                       printk(VX_LOGLEVEL f " @%s:%d\n", x);   \
9784 +       } while (0)
9785 +
9786 +#define vxfprintk(c, f, x...)                                  \
9787 +       do {                                                    \
9788 +               if (c)                                          \
9789 +                       printk(VX_LOGLEVEL f " %s@%s:%d\n", x); \
9790 +       } while (0)
9791 +
9792 +
9793 +struct vx_info;
9794 +
9795 +void dump_vx_info(struct vx_info *, int);
9796 +void dump_vx_info_inactive(int);
9797 +
9798 +#else  /* CONFIG_VSERVER_DEBUG */
9799 +
9800 +#define vs_debug_switch        0
9801 +#define vs_debug_xid   0
9802 +#define vs_debug_nid   0
9803 +#define vs_debug_tag   0
9804 +#define vs_debug_net   0
9805 +#define vs_debug_limit 0
9806 +#define vs_debug_cres  0
9807 +#define vs_debug_dlim  0
9808 +#define vs_debug_quota 0
9809 +#define vs_debug_cvirt 0
9810 +#define vs_debug_space 0
9811 +#define vs_debug_perm  0
9812 +#define vs_debug_misc  0
9813 +
9814 +#define vxdprintk(x...) do { } while (0)
9815 +#define vxlprintk(x...) do { } while (0)
9816 +#define vxfprintk(x...) do { } while (0)
9817 +
9818 +#endif /* CONFIG_VSERVER_DEBUG */
9819 +
9820 +
9821 +#ifdef CONFIG_VSERVER_WARN
9822 +
9823 +#define VX_WARNLEVEL   KERN_WARNING "vxW: "
9824 +#define VX_WARN_TASK   "[" VS_Q("%s") ",%u:#%u|%u|%u] "
9825 +#define VX_WARN_XID    "[xid #%u] "
9826 +#define VX_WARN_NID    "[nid #%u] "
9827 +#define VX_WARN_TAG    "[tag #%u] "
9828 +
9829 +#define vxwprintk(c, f, x...)                                  \
9830 +       do {                                                    \
9831 +               if (c)                                          \
9832 +                       printk(VX_WARNLEVEL f "\n", ##x);       \
9833 +       } while (0)
9834 +
9835 +#else  /* CONFIG_VSERVER_WARN */
9836 +
9837 +#define vxwprintk(x...) do { } while (0)
9838 +
9839 +#endif /* CONFIG_VSERVER_WARN */
9840 +
9841 +#define vxwprintk_task(c, f, x...)                             \
9842 +       vxwprintk(c, VX_WARN_TASK f,                            \
9843 +               current->comm, current->pid,                    \
9844 +               current->xid, current->nid,                     \
9845 +               current->tag, ##x)
9846 +#define vxwprintk_xid(c, f, x...)                              \
9847 +       vxwprintk(c, VX_WARN_XID f, current->xid, x)
9848 +#define vxwprintk_nid(c, f, x...)                              \
9849 +       vxwprintk(c, VX_WARN_NID f, current->nid, x)
9850 +#define vxwprintk_tag(c, f, x...)                              \
9851 +       vxwprintk(c, VX_WARN_TAG f, current->tag, x)
9852 +
9853 +#ifdef CONFIG_VSERVER_DEBUG
9854 +#define vxd_assert_lock(l)     assert_spin_locked(l)
9855 +#define vxd_assert(c, f, x...) vxlprintk(!(c), \
9856 +       "assertion [" f "] failed.", ##x, __FILE__, __LINE__)
9857 +#else
9858 +#define vxd_assert_lock(l)     do { } while (0)
9859 +#define vxd_assert(c, f, x...) do { } while (0)
9860 +#endif
9861 +
9862 +
9863 +#endif /* _VSERVER_DEBUG_H */
9864 diff -NurpP --minimal linux-4.9.135/include/linux/vserver/debug_cmd.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/debug_cmd.h
9865 --- linux-4.9.135/include/linux/vserver/debug_cmd.h     1970-01-01 00:00:00.000000000 +0000
9866 +++ linux-4.9.135-vs2.3.9.8/include/linux/vserver/debug_cmd.h   2018-10-20 04:58:14.000000000 +0000
9867 @@ -0,0 +1,37 @@
9868 +#ifndef _VSERVER_DEBUG_CMD_H
9869 +#define _VSERVER_DEBUG_CMD_H
9870 +
9871 +#include <uapi/vserver/debug_cmd.h>
9872 +
9873 +
9874 +#ifdef CONFIG_COMPAT
9875 +
9876 +#include <asm/compat.h>
9877 +
9878 +struct vcmd_read_history_v0_x32 {
9879 +       uint32_t index;
9880 +       uint32_t count;
9881 +       compat_uptr_t data_ptr;
9882 +};
9883 +
9884 +struct vcmd_read_monitor_v0_x32 {
9885 +       uint32_t index;
9886 +       uint32_t count;
9887 +       compat_uptr_t data_ptr;
9888 +};
9889 +
9890 +#endif  /* CONFIG_COMPAT */
9891 +
9892 +extern int vc_dump_history(uint32_t);
9893 +
9894 +extern int vc_read_history(uint32_t, void __user *);
9895 +extern int vc_read_monitor(uint32_t, void __user *);
9896 +
9897 +#ifdef CONFIG_COMPAT
9898 +
9899 +extern int vc_read_history_x32(uint32_t, void __user *);
9900 +extern int vc_read_monitor_x32(uint32_t, void __user *);
9901 +
9902 +#endif  /* CONFIG_COMPAT */
9903 +
9904 +#endif /* _VSERVER_DEBUG_CMD_H */
9905 diff -NurpP --minimal linux-4.9.135/include/linux/vserver/device.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/device.h
9906 --- linux-4.9.135/include/linux/vserver/device.h        1970-01-01 00:00:00.000000000 +0000
9907 +++ linux-4.9.135-vs2.3.9.8/include/linux/vserver/device.h      2018-10-20 04:58:14.000000000 +0000
9908 @@ -0,0 +1,9 @@
9909 +#ifndef _VSERVER_DEVICE_H
9910 +#define _VSERVER_DEVICE_H
9911 +
9912 +
9913 +#include <uapi/vserver/device.h>
9914 +
9915 +#else  /* _VSERVER_DEVICE_H */
9916 +#warning duplicate inclusion
9917 +#endif /* _VSERVER_DEVICE_H */
9918 diff -NurpP --minimal linux-4.9.135/include/linux/vserver/device_cmd.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/device_cmd.h
9919 --- linux-4.9.135/include/linux/vserver/device_cmd.h    1970-01-01 00:00:00.000000000 +0000
9920 +++ linux-4.9.135-vs2.3.9.8/include/linux/vserver/device_cmd.h  2018-10-20 04:58:14.000000000 +0000
9921 @@ -0,0 +1,31 @@
9922 +#ifndef _VSERVER_DEVICE_CMD_H
9923 +#define _VSERVER_DEVICE_CMD_H
9924 +
9925 +#include <uapi/vserver/device_cmd.h>
9926 +
9927 +
9928 +#ifdef CONFIG_COMPAT
9929 +
9930 +#include <asm/compat.h>
9931 +
9932 +struct vcmd_set_mapping_v0_x32 {
9933 +       compat_uptr_t device_ptr;
9934 +       compat_uptr_t target_ptr;
9935 +       uint32_t flags;
9936 +};
9937 +
9938 +#endif /* CONFIG_COMPAT */
9939 +
9940 +#include <linux/compiler.h>
9941 +
9942 +extern int vc_set_mapping(struct vx_info *, void __user *);
9943 +extern int vc_unset_mapping(struct vx_info *, void __user *);
9944 +
9945 +#ifdef CONFIG_COMPAT
9946 +
9947 +extern int vc_set_mapping_x32(struct vx_info *, void __user *);
9948 +extern int vc_unset_mapping_x32(struct vx_info *, void __user *);
9949 +
9950 +#endif /* CONFIG_COMPAT */
9951 +
9952 +#endif /* _VSERVER_DEVICE_CMD_H */
9953 diff -NurpP --minimal linux-4.9.135/include/linux/vserver/device_def.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/device_def.h
9954 --- linux-4.9.135/include/linux/vserver/device_def.h    1970-01-01 00:00:00.000000000 +0000
9955 +++ linux-4.9.135-vs2.3.9.8/include/linux/vserver/device_def.h  2018-10-20 04:58:14.000000000 +0000
9956 @@ -0,0 +1,17 @@
9957 +#ifndef _VSERVER_DEVICE_DEF_H
9958 +#define _VSERVER_DEVICE_DEF_H
9959 +
9960 +#include <linux/types.h>
9961 +
9962 +struct vx_dmap_target {
9963 +       dev_t target;
9964 +       uint32_t flags;
9965 +};
9966 +
9967 +struct _vx_device {
9968 +#ifdef CONFIG_VSERVER_DEVICE
9969 +       struct vx_dmap_target targets[2];
9970 +#endif
9971 +};
9972 +
9973 +#endif /* _VSERVER_DEVICE_DEF_H */
9974 diff -NurpP --minimal linux-4.9.135/include/linux/vserver/dlimit.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/dlimit.h
9975 --- linux-4.9.135/include/linux/vserver/dlimit.h        1970-01-01 00:00:00.000000000 +0000
9976 +++ linux-4.9.135-vs2.3.9.8/include/linux/vserver/dlimit.h      2018-10-20 04:58:14.000000000 +0000
9977 @@ -0,0 +1,54 @@
9978 +#ifndef _VSERVER_DLIMIT_H
9979 +#define _VSERVER_DLIMIT_H
9980 +
9981 +#include "switch.h"
9982 +
9983 +
9984 +#ifdef __KERNEL__
9985 +
9986 +/*      keep in sync with CDLIM_INFINITY       */
9987 +
9988 +#define DLIM_INFINITY          (~0ULL)
9989 +
9990 +#include <linux/spinlock.h>
9991 +#include <linux/rcupdate.h>
9992 +
9993 +struct super_block;
9994 +
9995 +struct dl_info {
9996 +       struct hlist_node dl_hlist;             /* linked list of contexts */
9997 +       struct rcu_head dl_rcu;                 /* the rcu head */
9998 +       vtag_t dl_tag;                          /* context tag */
9999 +       atomic_t dl_usecnt;                     /* usage count */
10000 +       atomic_t dl_refcnt;                     /* reference count */
10001 +
10002 +       struct super_block *dl_sb;              /* associated superblock */
10003 +
10004 +       spinlock_t dl_lock;                     /* protect the values */
10005 +
10006 +       unsigned long long dl_space_used;       /* used space in bytes */
10007 +       unsigned long long dl_space_total;      /* maximum space in bytes */
10008 +       unsigned long dl_inodes_used;           /* used inodes */
10009 +       unsigned long dl_inodes_total;          /* maximum inodes */
10010 +
10011 +       unsigned int dl_nrlmult;                /* non root limit mult */
10012 +};
10013 +
10014 +struct rcu_head;
10015 +
10016 +extern void rcu_free_dl_info(struct rcu_head *);
10017 +extern void unhash_dl_info(struct dl_info *);
10018 +
10019 +extern struct dl_info *locate_dl_info(struct super_block *, vtag_t);
10020 +
10021 +
10022 +struct kstatfs;
10023 +
10024 +extern void vx_vsi_statfs(struct super_block *, struct kstatfs *);
10025 +
10026 +typedef uint64_t dlsize_t;
10027 +
10028 +#endif /* __KERNEL__ */
10029 +#else  /* _VSERVER_DLIMIT_H */
10030 +#warning duplicate inclusion
10031 +#endif /* _VSERVER_DLIMIT_H */
10032 diff -NurpP --minimal linux-4.9.135/include/linux/vserver/dlimit_cmd.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/dlimit_cmd.h
10033 --- linux-4.9.135/include/linux/vserver/dlimit_cmd.h    1970-01-01 00:00:00.000000000 +0000
10034 +++ linux-4.9.135-vs2.3.9.8/include/linux/vserver/dlimit_cmd.h  2018-10-20 04:58:14.000000000 +0000
10035 @@ -0,0 +1,46 @@
10036 +#ifndef _VSERVER_DLIMIT_CMD_H
10037 +#define _VSERVER_DLIMIT_CMD_H
10038 +
10039 +#include <uapi/vserver/dlimit_cmd.h>
10040 +
10041 +
10042 +#ifdef CONFIG_COMPAT
10043 +
10044 +#include <asm/compat.h>
10045 +
10046 +struct vcmd_ctx_dlimit_base_v0_x32 {
10047 +       compat_uptr_t name_ptr;
10048 +       uint32_t flags;
10049 +};
10050 +
10051 +struct vcmd_ctx_dlimit_v0_x32 {
10052 +       compat_uptr_t name_ptr;
10053 +       uint32_t space_used;                    /* used space in kbytes */
10054 +       uint32_t space_total;                   /* maximum space in kbytes */
10055 +       uint32_t inodes_used;                   /* used inodes */
10056 +       uint32_t inodes_total;                  /* maximum inodes */
10057 +       uint32_t reserved;                      /* reserved for root in % */
10058 +       uint32_t flags;
10059 +};
10060 +
10061 +#endif /* CONFIG_COMPAT */
10062 +
10063 +#include <linux/compiler.h>
10064 +
10065 +extern int vc_add_dlimit(uint32_t, void __user *);
10066 +extern int vc_rem_dlimit(uint32_t, void __user *);
10067 +
10068 +extern int vc_set_dlimit(uint32_t, void __user *);
10069 +extern int vc_get_dlimit(uint32_t, void __user *);
10070 +
10071 +#ifdef CONFIG_COMPAT
10072 +
10073 +extern int vc_add_dlimit_x32(uint32_t, void __user *);
10074 +extern int vc_rem_dlimit_x32(uint32_t, void __user *);
10075 +
10076 +extern int vc_set_dlimit_x32(uint32_t, void __user *);
10077 +extern int vc_get_dlimit_x32(uint32_t, void __user *);
10078 +
10079 +#endif /* CONFIG_COMPAT */
10080 +
10081 +#endif /* _VSERVER_DLIMIT_CMD_H */
10082 diff -NurpP --minimal linux-4.9.135/include/linux/vserver/global.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/global.h
10083 --- linux-4.9.135/include/linux/vserver/global.h        1970-01-01 00:00:00.000000000 +0000
10084 +++ linux-4.9.135-vs2.3.9.8/include/linux/vserver/global.h      2018-10-20 04:58:14.000000000 +0000
10085 @@ -0,0 +1,20 @@
10086 +#ifndef _VSERVER_GLOBAL_H
10087 +#define _VSERVER_GLOBAL_H
10088 +
10089 +
10090 +extern atomic_t vx_global_ctotal;
10091 +extern atomic_t vx_global_cactive;
10092 +
10093 +extern atomic_t nx_global_ctotal;
10094 +extern atomic_t nx_global_cactive;
10095 +
10096 +extern atomic_t vs_global_nsproxy;
10097 +extern atomic_t vs_global_fs;
10098 +extern atomic_t vs_global_mnt_ns;
10099 +extern atomic_t vs_global_uts_ns;
10100 +extern atomic_t vs_global_ipc_ns;
10101 +extern atomic_t vs_global_user_ns;
10102 +extern atomic_t vs_global_pid_ns;
10103 +
10104 +
10105 +#endif /* _VSERVER_GLOBAL_H */
10106 diff -NurpP --minimal linux-4.9.135/include/linux/vserver/history.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/history.h
10107 --- linux-4.9.135/include/linux/vserver/history.h       1970-01-01 00:00:00.000000000 +0000
10108 +++ linux-4.9.135-vs2.3.9.8/include/linux/vserver/history.h     2018-10-20 04:58:14.000000000 +0000
10109 @@ -0,0 +1,197 @@
10110 +#ifndef _VSERVER_HISTORY_H
10111 +#define _VSERVER_HISTORY_H
10112 +
10113 +
10114 +enum {
10115 +       VXH_UNUSED = 0,
10116 +       VXH_THROW_OOPS = 1,
10117 +
10118 +       VXH_GET_VX_INFO,
10119 +       VXH_PUT_VX_INFO,
10120 +       VXH_INIT_VX_INFO,
10121 +       VXH_SET_VX_INFO,
10122 +       VXH_CLR_VX_INFO,
10123 +       VXH_CLAIM_VX_INFO,
10124 +       VXH_RELEASE_VX_INFO,
10125 +       VXH_ALLOC_VX_INFO,
10126 +       VXH_DEALLOC_VX_INFO,
10127 +       VXH_HASH_VX_INFO,
10128 +       VXH_UNHASH_VX_INFO,
10129 +       VXH_LOC_VX_INFO,
10130 +       VXH_LOOKUP_VX_INFO,
10131 +       VXH_CREATE_VX_INFO,
10132 +};
10133 +
10134 +struct _vxhe_vxi {
10135 +       struct vx_info *ptr;
10136 +       unsigned xid;
10137 +       unsigned usecnt;
10138 +       unsigned tasks;
10139 +};
10140 +
10141 +struct _vxhe_set_clr {
10142 +       void *data;
10143 +};
10144 +
10145 +struct _vxhe_loc_lookup {
10146 +       unsigned arg;
10147 +};
10148 +
10149 +struct _vx_hist_entry {
10150 +       void *loc;
10151 +       unsigned short seq;
10152 +       unsigned short type;
10153 +       struct _vxhe_vxi vxi;
10154 +       union {
10155 +               struct _vxhe_set_clr sc;
10156 +               struct _vxhe_loc_lookup ll;
10157 +       };
10158 +};
10159 +
10160 +#ifdef CONFIG_VSERVER_HISTORY
10161 +
10162 +extern unsigned volatile int vxh_active;
10163 +
10164 +struct _vx_hist_entry *vxh_advance(void *loc);
10165 +
10166 +
10167 +static inline
10168 +void   __vxh_copy_vxi(struct _vx_hist_entry *entry, struct vx_info *vxi)
10169 +{
10170 +       entry->vxi.ptr = vxi;
10171 +       if (vxi) {
10172 +               entry->vxi.usecnt = atomic_read(&vxi->vx_usecnt);
10173 +               entry->vxi.tasks = atomic_read(&vxi->vx_tasks);
10174 +               entry->vxi.xid = vxi->vx_id;
10175 +       }
10176 +}
10177 +
10178 +
10179 +#define        __HERE__ current_text_addr()
10180 +
10181 +#define __VXH_BODY(__type, __data, __here)     \
10182 +       struct _vx_hist_entry *entry;           \
10183 +                                               \
10184 +       preempt_disable();                      \
10185 +       entry = vxh_advance(__here);            \
10186 +       __data;                                 \
10187 +       entry->type = __type;                   \
10188 +       preempt_enable();
10189 +
10190 +
10191 +       /* pass vxi only */
10192 +
10193 +#define __VXH_SMPL                             \
10194 +       __vxh_copy_vxi(entry, vxi)
10195 +
10196 +static inline
10197 +void   __vxh_smpl(struct vx_info *vxi, int __type, void *__here)
10198 +{
10199 +       __VXH_BODY(__type, __VXH_SMPL, __here)
10200 +}
10201 +
10202 +       /* pass vxi and data (void *) */
10203 +
10204 +#define __VXH_DATA                             \
10205 +       __vxh_copy_vxi(entry, vxi);             \
10206 +       entry->sc.data = data
10207 +
10208 +static inline
10209 +void   __vxh_data(struct vx_info *vxi, void *data,
10210 +                       int __type, void *__here)
10211 +{
10212 +       __VXH_BODY(__type, __VXH_DATA, __here)
10213 +}
10214 +
10215 +       /* pass vxi and arg (long) */
10216 +
10217 +#define __VXH_LONG                             \
10218 +       __vxh_copy_vxi(entry, vxi);             \
10219 +       entry->ll.arg = arg
10220 +
10221 +static inline
10222 +void   __vxh_long(struct vx_info *vxi, long arg,
10223 +                       int __type, void *__here)
10224 +{
10225 +       __VXH_BODY(__type, __VXH_LONG, __here)
10226 +}
10227 +
10228 +
10229 +static inline
10230 +void   __vxh_throw_oops(void *__here)
10231 +{
10232 +       __VXH_BODY(VXH_THROW_OOPS, {}, __here);
10233 +       /* prevent further acquisition */
10234 +       vxh_active = 0;
10235 +}
10236 +
10237 +
10238 +#define vxh_throw_oops()       __vxh_throw_oops(__HERE__);
10239 +
10240 +#define __vxh_get_vx_info(v, h)        __vxh_smpl(v, VXH_GET_VX_INFO, h);
10241 +#define __vxh_put_vx_info(v, h)        __vxh_smpl(v, VXH_PUT_VX_INFO, h);
10242 +
10243 +#define __vxh_init_vx_info(v, d, h) \
10244 +       __vxh_data(v, d, VXH_INIT_VX_INFO, h);
10245 +#define __vxh_set_vx_info(v, d, h) \
10246 +       __vxh_data(v, d, VXH_SET_VX_INFO, h);
10247 +#define __vxh_clr_vx_info(v, d, h) \
10248 +       __vxh_data(v, d, VXH_CLR_VX_INFO, h);
10249 +
10250 +#define __vxh_claim_vx_info(v, d, h) \
10251 +       __vxh_data(v, d, VXH_CLAIM_VX_INFO, h);
10252 +#define __vxh_release_vx_info(v, d, h) \
10253 +       __vxh_data(v, d, VXH_RELEASE_VX_INFO, h);
10254 +
10255 +#define vxh_alloc_vx_info(v) \
10256 +       __vxh_smpl(v, VXH_ALLOC_VX_INFO, __HERE__);
10257 +#define vxh_dealloc_vx_info(v) \
10258 +       __vxh_smpl(v, VXH_DEALLOC_VX_INFO, __HERE__);
10259 +
10260 +#define vxh_hash_vx_info(v) \
10261 +       __vxh_smpl(v, VXH_HASH_VX_INFO, __HERE__);
10262 +#define vxh_unhash_vx_info(v) \
10263 +       __vxh_smpl(v, VXH_UNHASH_VX_INFO, __HERE__);
10264 +
10265 +#define vxh_loc_vx_info(v, l) \
10266 +       __vxh_long(v, l, VXH_LOC_VX_INFO, __HERE__);
10267 +#define vxh_lookup_vx_info(v, l) \
10268 +       __vxh_long(v, l, VXH_LOOKUP_VX_INFO, __HERE__);
10269 +#define vxh_create_vx_info(v, l) \
10270 +       __vxh_long(v, l, VXH_CREATE_VX_INFO, __HERE__);
10271 +
10272 +extern void vxh_dump_history(void);
10273 +
10274 +
10275 +#else  /* CONFIG_VSERVER_HISTORY */
10276 +
10277 +#define        __HERE__        0
10278 +
10279 +#define vxh_throw_oops()               do { } while (0)
10280 +
10281 +#define __vxh_get_vx_info(v, h)                do { } while (0)
10282 +#define __vxh_put_vx_info(v, h)                do { } while (0)
10283 +
10284 +#define __vxh_init_vx_info(v, d, h)    do { } while (0)
10285 +#define __vxh_set_vx_info(v, d, h)     do { } while (0)
10286 +#define __vxh_clr_vx_info(v, d, h)     do { } while (0)
10287 +
10288 +#define __vxh_claim_vx_info(v, d, h)   do { } while (0)
10289 +#define __vxh_release_vx_info(v, d, h) do { } while (0)
10290 +
10291 +#define vxh_alloc_vx_info(v)           do { } while (0)
10292 +#define vxh_dealloc_vx_info(v)         do { } while (0)
10293 +
10294 +#define vxh_hash_vx_info(v)            do { } while (0)
10295 +#define vxh_unhash_vx_info(v)          do { } while (0)
10296 +
10297 +#define vxh_loc_vx_info(v, l)          do { } while (0)
10298 +#define vxh_lookup_vx_info(v, l)       do { } while (0)
10299 +#define vxh_create_vx_info(v, l)       do { } while (0)
10300 +
10301 +#define vxh_dump_history()             do { } while (0)
10302 +
10303 +
10304 +#endif /* CONFIG_VSERVER_HISTORY */
10305 +
10306 +#endif /* _VSERVER_HISTORY_H */
10307 diff -NurpP --minimal linux-4.9.135/include/linux/vserver/inode.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/inode.h
10308 --- linux-4.9.135/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
10309 +++ linux-4.9.135-vs2.3.9.8/include/linux/vserver/inode.h       2018-10-20 04:58:14.000000000 +0000
10310 @@ -0,0 +1,19 @@
10311 +#ifndef _VSERVER_INODE_H
10312 +#define _VSERVER_INODE_H
10313 +
10314 +#include <uapi/vserver/inode.h>
10315 +
10316 +
10317 +#ifdef CONFIG_VSERVER_PROC_SECURE
10318 +#define IATTR_PROC_DEFAULT     ( IATTR_ADMIN | IATTR_HIDE )
10319 +#define IATTR_PROC_SYMLINK     ( IATTR_ADMIN )
10320 +#else
10321 +#define IATTR_PROC_DEFAULT     ( IATTR_ADMIN )
10322 +#define IATTR_PROC_SYMLINK     ( IATTR_ADMIN )
10323 +#endif
10324 +
10325 +#define vx_hide_check(c, m)    (((m) & IATTR_HIDE) ? vx_check(c, m) : 1)
10326 +
10327 +#else  /* _VSERVER_INODE_H */
10328 +#warning duplicate inclusion
10329 +#endif /* _VSERVER_INODE_H */
10330 diff -NurpP --minimal linux-4.9.135/include/linux/vserver/inode_cmd.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/inode_cmd.h
10331 --- linux-4.9.135/include/linux/vserver/inode_cmd.h     1970-01-01 00:00:00.000000000 +0000
10332 +++ linux-4.9.135-vs2.3.9.8/include/linux/vserver/inode_cmd.h   2018-10-20 04:58:14.000000000 +0000
10333 @@ -0,0 +1,36 @@
10334 +#ifndef _VSERVER_INODE_CMD_H
10335 +#define _VSERVER_INODE_CMD_H
10336 +
10337 +#include <uapi/vserver/inode_cmd.h>
10338 +
10339 +
10340 +
10341 +#ifdef CONFIG_COMPAT
10342 +
10343 +#include <asm/compat.h>
10344 +
10345 +struct vcmd_ctx_iattr_v1_x32 {
10346 +       compat_uptr_t name_ptr;
10347 +       uint32_t tag;
10348 +       uint32_t flags;
10349 +       uint32_t mask;
10350 +};
10351 +
10352 +#endif /* CONFIG_COMPAT */
10353 +
10354 +#include <linux/compiler.h>
10355 +
10356 +extern int vc_get_iattr(void __user *);
10357 +extern int vc_set_iattr(void __user *);
10358 +
10359 +extern int vc_fget_iattr(uint32_t, void __user *);
10360 +extern int vc_fset_iattr(uint32_t, void __user *);
10361 +
10362 +#ifdef CONFIG_COMPAT
10363 +
10364 +extern int vc_get_iattr_x32(void __user *);
10365 +extern int vc_set_iattr_x32(void __user *);
10366 +
10367 +#endif /* CONFIG_COMPAT */
10368 +
10369 +#endif /* _VSERVER_INODE_CMD_H */
10370 diff -NurpP --minimal linux-4.9.135/include/linux/vserver/limit.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/limit.h
10371 --- linux-4.9.135/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
10372 +++ linux-4.9.135-vs2.3.9.8/include/linux/vserver/limit.h       2018-10-20 04:58:14.000000000 +0000
10373 @@ -0,0 +1,67 @@
10374 +#ifndef _VSERVER_LIMIT_H
10375 +#define _VSERVER_LIMIT_H
10376 +
10377 +#include <uapi/vserver/limit.h>
10378 +
10379 +
10380 +#define        VLIM_NOCHECK    ((1L << VLIMIT_DENTRY) | (1L << RLIMIT_RSS))
10381 +
10382 +/*     keep in sync with CRLIM_INFINITY */
10383 +
10384 +#define        VLIM_INFINITY   (~0ULL)
10385 +
10386 +#include <asm/atomic.h>
10387 +#include <asm/resource.h>
10388 +
10389 +#ifndef RLIM_INFINITY
10390 +#warning RLIM_INFINITY is undefined
10391 +#endif
10392 +
10393 +#define __rlim_val(l, r, v)    ((l)->res[r].v)
10394 +
10395 +#define __rlim_soft(l, r)      __rlim_val(l, r, soft)
10396 +#define __rlim_hard(l, r)      __rlim_val(l, r, hard)
10397 +
10398 +#define __rlim_rcur(l, r)      __rlim_val(l, r, rcur)
10399 +#define __rlim_rmin(l, r)      __rlim_val(l, r, rmin)
10400 +#define __rlim_rmax(l, r)      __rlim_val(l, r, rmax)
10401 +
10402 +#define __rlim_lhit(l, r)      __rlim_val(l, r, lhit)
10403 +#define __rlim_hit(l, r)       atomic_inc(&__rlim_lhit(l, r))
10404 +
10405 +typedef atomic_long_t rlim_atomic_t;
10406 +typedef unsigned long rlim_t;
10407 +
10408 +#define __rlim_get(l, r)       atomic_long_read(&__rlim_rcur(l, r))
10409 +#define __rlim_set(l, r, v)    atomic_long_set(&__rlim_rcur(l, r), v)
10410 +#define __rlim_inc(l, r)       atomic_long_inc(&__rlim_rcur(l, r))
10411 +#define __rlim_dec(l, r)       atomic_long_dec(&__rlim_rcur(l, r))
10412 +#define __rlim_add(l, r, v)    atomic_long_add(v, &__rlim_rcur(l, r))
10413 +#define __rlim_sub(l, r, v)    atomic_long_sub(v, &__rlim_rcur(l, r))
10414 +
10415 +
10416 +#if    (RLIM_INFINITY == VLIM_INFINITY)
10417 +#define        VX_VLIM(r) ((long long)(long)(r))
10418 +#define        VX_RLIM(v) ((rlim_t)(v))
10419 +#else
10420 +#define        VX_VLIM(r) (((r) == RLIM_INFINITY) \
10421 +               ? VLIM_INFINITY : (long long)(r))
10422 +#define        VX_RLIM(v) (((v) == VLIM_INFINITY) \
10423 +               ? RLIM_INFINITY : (rlim_t)(v))
10424 +#endif
10425 +
10426 +struct sysinfo;
10427 +
10428 +#ifdef CONFIG_MEMCG
10429 +void vx_vsi_meminfo(struct sysinfo *);
10430 +void vx_vsi_swapinfo(struct sysinfo *);
10431 +long vx_vsi_cached(struct sysinfo *);
10432 +#else  /* !CONFIG_MEMCG */
10433 +#define vx_vsi_meminfo(s) do { } while (0)
10434 +#define vx_vsi_swapinfo(s) do { } while (0)
10435 +#define vx_vsi_cached(s) (0L)
10436 +#endif /* !CONFIG_MEMCG */
10437 +
10438 +#define NUM_LIMITS     24
10439 +
10440 +#endif /* _VSERVER_LIMIT_H */
10441 diff -NurpP --minimal linux-4.9.135/include/linux/vserver/limit_cmd.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/limit_cmd.h
10442 --- linux-4.9.135/include/linux/vserver/limit_cmd.h     1970-01-01 00:00:00.000000000 +0000
10443 +++ linux-4.9.135-vs2.3.9.8/include/linux/vserver/limit_cmd.h   2018-10-20 04:58:14.000000000 +0000
10444 @@ -0,0 +1,35 @@
10445 +#ifndef _VSERVER_LIMIT_CMD_H
10446 +#define _VSERVER_LIMIT_CMD_H
10447 +
10448 +#include <uapi/vserver/limit_cmd.h>
10449 +
10450 +
10451 +#ifdef CONFIG_IA32_EMULATION
10452 +
10453 +struct vcmd_ctx_rlimit_v0_x32 {
10454 +       uint32_t id;
10455 +       uint64_t minimum;
10456 +       uint64_t softlimit;
10457 +       uint64_t maximum;
10458 +} __attribute__ ((packed));
10459 +
10460 +#endif /* CONFIG_IA32_EMULATION */
10461 +
10462 +#include <linux/compiler.h>
10463 +
10464 +extern int vc_get_rlimit_mask(uint32_t, void __user *);
10465 +extern int vc_get_rlimit(struct vx_info *, void __user *);
10466 +extern int vc_set_rlimit(struct vx_info *, void __user *);
10467 +extern int vc_reset_hits(struct vx_info *, void __user *);
10468 +extern int vc_reset_minmax(struct vx_info *, void __user *);
10469 +
10470 +extern int vc_rlimit_stat(struct vx_info *, void __user *);
10471 +
10472 +#ifdef CONFIG_IA32_EMULATION
10473 +
10474 +extern int vc_get_rlimit_x32(struct vx_info *, void __user *);
10475 +extern int vc_set_rlimit_x32(struct vx_info *, void __user *);
10476 +
10477 +#endif /* CONFIG_IA32_EMULATION */
10478 +
10479 +#endif /* _VSERVER_LIMIT_CMD_H */
10480 diff -NurpP --minimal linux-4.9.135/include/linux/vserver/limit_def.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/limit_def.h
10481 --- linux-4.9.135/include/linux/vserver/limit_def.h     1970-01-01 00:00:00.000000000 +0000
10482 +++ linux-4.9.135-vs2.3.9.8/include/linux/vserver/limit_def.h   2018-10-20 04:58:14.000000000 +0000
10483 @@ -0,0 +1,47 @@
10484 +#ifndef _VSERVER_LIMIT_DEF_H
10485 +#define _VSERVER_LIMIT_DEF_H
10486 +
10487 +#include <asm/atomic.h>
10488 +#include <asm/resource.h>
10489 +
10490 +#include "limit.h"
10491 +
10492 +
10493 +struct _vx_res_limit {
10494 +       rlim_t soft;            /* Context soft limit */
10495 +       rlim_t hard;            /* Context hard limit */
10496 +
10497 +       rlim_atomic_t rcur;     /* Current value */
10498 +       rlim_t rmin;            /* Context minimum */
10499 +       rlim_t rmax;            /* Context maximum */
10500 +
10501 +       atomic_t lhit;          /* Limit hits */
10502 +};
10503 +
10504 +/* context sub struct */
10505 +
10506 +struct _vx_limit {
10507 +       struct _vx_res_limit res[NUM_LIMITS];
10508 +};
10509 +
10510 +#ifdef CONFIG_VSERVER_DEBUG
10511 +
10512 +static inline void __dump_vx_limit(struct _vx_limit *limit)
10513 +{
10514 +       int i;
10515 +
10516 +       printk("\t_vx_limit:");
10517 +       for (i = 0; i < NUM_LIMITS; i++) {
10518 +               printk("\t [%2d] = %8lu %8lu/%8lu, %8ld/%8ld, %8d\n",
10519 +                       i, (unsigned long)__rlim_get(limit, i),
10520 +                       (unsigned long)__rlim_rmin(limit, i),
10521 +                       (unsigned long)__rlim_rmax(limit, i),
10522 +                       (long)__rlim_soft(limit, i),
10523 +                       (long)__rlim_hard(limit, i),
10524 +                       atomic_read(&__rlim_lhit(limit, i)));
10525 +       }
10526 +}
10527 +
10528 +#endif
10529 +
10530 +#endif /* _VSERVER_LIMIT_DEF_H */
10531 diff -NurpP --minimal linux-4.9.135/include/linux/vserver/limit_int.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/limit_int.h
10532 --- linux-4.9.135/include/linux/vserver/limit_int.h     1970-01-01 00:00:00.000000000 +0000
10533 +++ linux-4.9.135-vs2.3.9.8/include/linux/vserver/limit_int.h   2018-10-20 04:58:14.000000000 +0000
10534 @@ -0,0 +1,193 @@
10535 +#ifndef _VSERVER_LIMIT_INT_H
10536 +#define _VSERVER_LIMIT_INT_H
10537 +
10538 +#define VXD_RCRES_COND(r)      VXD_CBIT(cres, r)
10539 +#define VXD_RLIMIT_COND(r)     VXD_CBIT(limit, r)
10540 +
10541 +extern const char *vlimit_name[NUM_LIMITS];
10542 +
10543 +static inline void __vx_acc_cres(struct vx_info *vxi,
10544 +       int res, int dir, void *_data, char *_file, int _line)
10545 +{
10546 +       if (VXD_RCRES_COND(res))
10547 +               vxlprintk(1, "vx_acc_cres[%5d,%s,%2d]: %5ld%s (%p)",
10548 +                       (vxi ? vxi->vx_id : -1), vlimit_name[res], res,
10549 +                       (vxi ? (long)__rlim_get(&vxi->limit, res) : 0),
10550 +                       (dir > 0) ? "++" : "--", _data, _file, _line);
10551 +       if (!vxi)
10552 +               return;
10553 +
10554 +       if (dir > 0)
10555 +               __rlim_inc(&vxi->limit, res);
10556 +       else
10557 +               __rlim_dec(&vxi->limit, res);
10558 +}
10559 +
10560 +static inline void __vx_add_cres(struct vx_info *vxi,
10561 +       int res, int amount, void *_data, char *_file, int _line)
10562 +{
10563 +       if (VXD_RCRES_COND(res))
10564 +               vxlprintk(1, "vx_add_cres[%5d,%s,%2d]: %5ld += %5d (%p)",
10565 +                       (vxi ? vxi->vx_id : -1), vlimit_name[res], res,
10566 +                       (vxi ? (long)__rlim_get(&vxi->limit, res) : 0),
10567 +                       amount, _data, _file, _line);
10568 +       if (amount == 0)
10569 +               return;
10570 +       if (!vxi)
10571 +               return;
10572 +       __rlim_add(&vxi->limit, res, amount);
10573 +}
10574 +
10575 +static inline
10576 +int __vx_cres_adjust_max(struct _vx_limit *limit, int res, rlim_t value)
10577 +{
10578 +       int cond = (value > __rlim_rmax(limit, res));
10579 +
10580 +       if (cond)
10581 +               __rlim_rmax(limit, res) = value;
10582 +       return cond;
10583 +}
10584 +
10585 +static inline
10586 +int __vx_cres_adjust_min(struct _vx_limit *limit, int res, rlim_t value)
10587 +{
10588 +       int cond = (value < __rlim_rmin(limit, res));
10589 +
10590 +       if (cond)
10591 +               __rlim_rmin(limit, res) = value;
10592 +       return cond;
10593 +}
10594 +
10595 +static inline
10596 +void __vx_cres_fixup(struct _vx_limit *limit, int res, rlim_t value)
10597 +{
10598 +       if (!__vx_cres_adjust_max(limit, res, value))
10599 +               __vx_cres_adjust_min(limit, res, value);
10600 +}
10601 +
10602 +
10603 +/*     return values:
10604 +        +1 ... no limit hit
10605 +        -1 ... over soft limit
10606 +         0 ... over hard limit         */
10607 +
10608 +static inline int __vx_cres_avail(struct vx_info *vxi,
10609 +       int res, int num, char *_file, int _line)
10610 +{
10611 +       struct _vx_limit *limit;
10612 +       rlim_t value;
10613 +
10614 +       if (VXD_RLIMIT_COND(res))
10615 +               vxlprintk(1, "vx_cres_avail[%5d,%s,%2d]: %5ld/%5ld > %5ld + %5d",
10616 +                       (vxi ? vxi->vx_id : -1), vlimit_name[res], res,
10617 +                       (vxi ? (long)__rlim_soft(&vxi->limit, res) : -1),
10618 +                       (vxi ? (long)__rlim_hard(&vxi->limit, res) : -1),
10619 +                       (vxi ? (long)__rlim_get(&vxi->limit, res) : 0),
10620 +                       num, _file, _line);
10621 +       if (!vxi)
10622 +               return 1;
10623 +
10624 +       limit = &vxi->limit;
10625 +       value = __rlim_get(limit, res);
10626 +
10627 +       if (!__vx_cres_adjust_max(limit, res, value))
10628 +               __vx_cres_adjust_min(limit, res, value);
10629 +
10630 +       if (num == 0)
10631 +               return 1;
10632 +
10633 +       if (__rlim_soft(limit, res) == RLIM_INFINITY)
10634 +               return -1;
10635 +       if (value + num <= __rlim_soft(limit, res))
10636 +               return -1;
10637 +
10638 +       if (__rlim_hard(limit, res) == RLIM_INFINITY)
10639 +               return 1;
10640 +       if (value + num <= __rlim_hard(limit, res))
10641 +               return 1;
10642 +
10643 +       __rlim_hit(limit, res);
10644 +       return 0;
10645 +}
10646 +
10647 +
10648 +static const int VLA_RSS[] = { RLIMIT_RSS, VLIMIT_ANON, VLIMIT_MAPPED, 0 };
10649 +
10650 +static inline
10651 +rlim_t __vx_cres_array_sum(struct _vx_limit *limit, const int *array)
10652 +{
10653 +       rlim_t value, sum = 0;
10654 +       int res;
10655 +
10656 +       while ((res = *array++)) {
10657 +               value = __rlim_get(limit, res);
10658 +               __vx_cres_fixup(limit, res, value);
10659 +               sum += value;
10660 +       }
10661 +       return sum;
10662 +}
10663 +
10664 +static inline
10665 +rlim_t __vx_cres_array_fixup(struct _vx_limit *limit, const int *array)
10666 +{
10667 +       rlim_t value = __vx_cres_array_sum(limit, array + 1);
10668 +       int res = *array;
10669 +
10670 +       if (value == __rlim_get(limit, res))
10671 +               return value;
10672 +
10673 +       __rlim_set(limit, res, value);
10674 +       /* now adjust min/max */
10675 +       if (!__vx_cres_adjust_max(limit, res, value))
10676 +               __vx_cres_adjust_min(limit, res, value);
10677 +
10678 +       return value;
10679 +}
10680 +
10681 +static inline int __vx_cres_array_avail(struct vx_info *vxi,
10682 +       const int *array, int num, char *_file, int _line)
10683 +{
10684 +       struct _vx_limit *limit;
10685 +       rlim_t value = 0;
10686 +       int res;
10687 +
10688 +       if (num == 0)
10689 +               return 1;
10690 +       if (!vxi)
10691 +               return 1;
10692 +
10693 +       limit = &vxi->limit;
10694 +       res = *array;
10695 +       value = __vx_cres_array_sum(limit, array + 1);
10696 +
10697 +       __rlim_set(limit, res, value);
10698 +       __vx_cres_fixup(limit, res, value);
10699 +
10700 +       return __vx_cres_avail(vxi, res, num, _file, _line);
10701 +}
10702 +
10703 +
10704 +static inline void vx_limit_fixup(struct _vx_limit *limit, int id)
10705 +{
10706 +       rlim_t value;
10707 +       int res;
10708 +
10709 +       /* complex resources first */
10710 +       if ((id < 0) || (id == RLIMIT_RSS))
10711 +               __vx_cres_array_fixup(limit, VLA_RSS);
10712 +
10713 +       for (res = 0; res < NUM_LIMITS; res++) {
10714 +               if ((id > 0) && (res != id))
10715 +                       continue;
10716 +
10717 +               value = __rlim_get(limit, res);
10718 +               __vx_cres_fixup(limit, res, value);
10719 +
10720 +               /* not supposed to happen, maybe warn? */
10721 +               if (__rlim_rmax(limit, res) > __rlim_hard(limit, res))
10722 +                       __rlim_rmax(limit, res) = __rlim_hard(limit, res);
10723 +       }
10724 +}
10725 +
10726 +
10727 +#endif /* _VSERVER_LIMIT_INT_H */
10728 diff -NurpP --minimal linux-4.9.135/include/linux/vserver/monitor.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/monitor.h
10729 --- linux-4.9.135/include/linux/vserver/monitor.h       1970-01-01 00:00:00.000000000 +0000
10730 +++ linux-4.9.135-vs2.3.9.8/include/linux/vserver/monitor.h     2018-10-20 04:58:14.000000000 +0000
10731 @@ -0,0 +1,6 @@
10732 +#ifndef _VSERVER_MONITOR_H
10733 +#define _VSERVER_MONITOR_H
10734 +
10735 +#include <uapi/vserver/monitor.h>
10736 +
10737 +#endif /* _VSERVER_MONITOR_H */
10738 diff -NurpP --minimal linux-4.9.135/include/linux/vserver/network.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/network.h
10739 --- linux-4.9.135/include/linux/vserver/network.h       1970-01-01 00:00:00.000000000 +0000
10740 +++ linux-4.9.135-vs2.3.9.8/include/linux/vserver/network.h     2018-10-20 04:58:14.000000000 +0000
10741 @@ -0,0 +1,76 @@
10742 +#ifndef _VSERVER_NETWORK_H
10743 +#define _VSERVER_NETWORK_H
10744 +
10745 +
10746 +#include <linux/list.h>
10747 +#include <linux/spinlock.h>
10748 +#include <linux/rcupdate.h>
10749 +#include <linux/in.h>
10750 +#include <linux/in6.h>
10751 +#include <asm/atomic.h>
10752 +#include <uapi/vserver/network.h>
10753 +
10754 +struct nx_addr_v4 {
10755 +       struct nx_addr_v4 *next;
10756 +       struct in_addr ip[2];
10757 +       struct in_addr mask;
10758 +       uint16_t type;
10759 +       uint16_t flags;
10760 +};
10761 +
10762 +struct nx_addr_v6 {
10763 +       struct nx_addr_v6 *next;
10764 +       struct in6_addr ip;
10765 +       struct in6_addr mask;
10766 +       uint32_t prefix;
10767 +       uint16_t type;
10768 +       uint16_t flags;
10769 +};
10770 +
10771 +struct nx_info {
10772 +       struct hlist_node nx_hlist;     /* linked list of nxinfos */
10773 +       vnid_t nx_id;                   /* vnet id */
10774 +       atomic_t nx_usecnt;             /* usage count */
10775 +       atomic_t nx_tasks;              /* tasks count */
10776 +       int nx_state;                   /* context state */
10777 +
10778 +       uint64_t nx_flags;              /* network flag word */
10779 +       uint64_t nx_ncaps;              /* network capabilities */
10780 +
10781 +       spinlock_t addr_lock;           /* protect address changes */
10782 +       struct in_addr v4_lback;        /* Loopback address */
10783 +       struct in_addr v4_bcast;        /* Broadcast address */
10784 +       struct nx_addr_v4 v4;           /* First/Single ipv4 address */
10785 +#ifdef CONFIG_IPV6
10786 +       struct nx_addr_v6 v6;           /* First/Single ipv6 address */
10787 +#endif
10788 +       char nx_name[65];               /* network context name */
10789 +};
10790 +
10791 +
10792 +/* status flags */
10793 +
10794 +#define NXS_HASHED      0x0001
10795 +#define NXS_SHUTDOWN    0x0100
10796 +#define NXS_RELEASED    0x8000
10797 +
10798 +extern struct nx_info *lookup_nx_info(int);
10799 +
10800 +extern int get_nid_list(int, unsigned int *, int);
10801 +extern int nid_is_hashed(vnid_t);
10802 +
10803 +extern int nx_migrate_task(struct task_struct *, struct nx_info *);
10804 +
10805 +extern long vs_net_change(struct nx_info *, unsigned int);
10806 +
10807 +struct sock;
10808 +
10809 +
10810 +#define NX_IPV4(n)     ((n)->v4.type != NXA_TYPE_NONE)
10811 +#ifdef  CONFIG_IPV6
10812 +#define NX_IPV6(n)     ((n)->v6.type != NXA_TYPE_NONE)
10813 +#else
10814 +#define NX_IPV6(n)     (0)
10815 +#endif
10816 +
10817 +#endif /* _VSERVER_NETWORK_H */
10818 diff -NurpP --minimal linux-4.9.135/include/linux/vserver/network_cmd.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/network_cmd.h
10819 --- linux-4.9.135/include/linux/vserver/network_cmd.h   1970-01-01 00:00:00.000000000 +0000
10820 +++ linux-4.9.135-vs2.3.9.8/include/linux/vserver/network_cmd.h 2018-10-20 04:58:14.000000000 +0000
10821 @@ -0,0 +1,37 @@
10822 +#ifndef _VSERVER_NETWORK_CMD_H
10823 +#define _VSERVER_NETWORK_CMD_H
10824 +
10825 +#include <uapi/vserver/network_cmd.h>
10826 +
10827 +extern int vc_task_nid(uint32_t);
10828 +
10829 +extern int vc_nx_info(struct nx_info *, void __user *);
10830 +
10831 +extern int vc_net_create(uint32_t, void __user *);
10832 +extern int vc_net_migrate(struct nx_info *, void __user *);
10833 +
10834 +extern int vc_net_add(struct nx_info *, void __user *);
10835 +extern int vc_net_remove(struct nx_info *, void __user *);
10836 +
10837 +extern int vc_net_add_ipv4_v1(struct nx_info *, void __user *);
10838 +extern int vc_net_add_ipv4(struct nx_info *, void __user *);
10839 +
10840 +extern int vc_net_rem_ipv4_v1(struct nx_info *, void __user *);
10841 +extern int vc_net_rem_ipv4(struct nx_info *, void __user *);
10842 +
10843 +extern int vc_net_add_ipv6(struct nx_info *, void __user *);
10844 +extern int vc_net_remove_ipv6(struct nx_info *, void __user *);
10845 +
10846 +extern int vc_add_match_ipv4(struct nx_info *, void __user *);
10847 +extern int vc_get_match_ipv4(struct nx_info *, void __user *);
10848 +
10849 +extern int vc_add_match_ipv6(struct nx_info *, void __user *);
10850 +extern int vc_get_match_ipv6(struct nx_info *, void __user *);
10851 +
10852 +extern int vc_get_nflags(struct nx_info *, void __user *);
10853 +extern int vc_set_nflags(struct nx_info *, void __user *);
10854 +
10855 +extern int vc_get_ncaps(struct nx_info *, void __user *);
10856 +extern int vc_set_ncaps(struct nx_info *, void __user *);
10857 +
10858 +#endif /* _VSERVER_CONTEXT_CMD_H */
10859 diff -NurpP --minimal linux-4.9.135/include/linux/vserver/percpu.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/percpu.h
10860 --- linux-4.9.135/include/linux/vserver/percpu.h        1970-01-01 00:00:00.000000000 +0000
10861 +++ linux-4.9.135-vs2.3.9.8/include/linux/vserver/percpu.h      2018-10-20 04:58:14.000000000 +0000
10862 @@ -0,0 +1,14 @@
10863 +#ifndef _VSERVER_PERCPU_H
10864 +#define _VSERVER_PERCPU_H
10865 +
10866 +#include "cvirt_def.h"
10867 +#include "sched_def.h"
10868 +
10869 +struct _vx_percpu {
10870 +       struct _vx_cvirt_pc cvirt;
10871 +       struct _vx_sched_pc sched;
10872 +};
10873 +
10874 +#define        PERCPU_PERCTX   (sizeof(struct _vx_percpu))
10875 +
10876 +#endif /* _VSERVER_PERCPU_H */
10877 diff -NurpP --minimal linux-4.9.135/include/linux/vserver/pid.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/pid.h
10878 --- linux-4.9.135/include/linux/vserver/pid.h   1970-01-01 00:00:00.000000000 +0000
10879 +++ linux-4.9.135-vs2.3.9.8/include/linux/vserver/pid.h 2018-10-20 04:58:14.000000000 +0000
10880 @@ -0,0 +1,51 @@
10881 +#ifndef _VSERVER_PID_H
10882 +#define _VSERVER_PID_H
10883 +
10884 +/* pid faking stuff */
10885 +
10886 +#define vx_info_map_pid(v, p) \
10887 +       __vx_info_map_pid((v), (p), __func__, __FILE__, __LINE__)
10888 +#define vx_info_map_tgid(v,p)  vx_info_map_pid(v,p)
10889 +#define vx_map_pid(p) vx_info_map_pid(current_vx_info(), p)
10890 +#define vx_map_tgid(p) vx_map_pid(p)
10891 +
10892 +static inline int __vx_info_map_pid(struct vx_info *vxi, int pid,
10893 +       const char *func, const char *file, int line)
10894 +{
10895 +       if (vx_info_flags(vxi, VXF_INFO_INIT, 0)) {
10896 +               vxfprintk(VXD_CBIT(cvirt, 2),
10897 +                       "vx_map_tgid: %p/%llx: %d -> %d",
10898 +                       vxi, (long long)vxi->vx_flags, pid,
10899 +                       (pid && pid == vxi->vx_initpid) ? 1 : pid,
10900 +                       func, file, line);
10901 +               if (pid == 0)
10902 +                       return 0;
10903 +               if (pid == vxi->vx_initpid)
10904 +                       return 1;
10905 +       }
10906 +       return pid;
10907 +}
10908 +
10909 +#define vx_info_rmap_pid(v, p) \
10910 +       __vx_info_rmap_pid((v), (p), __func__, __FILE__, __LINE__)
10911 +#define vx_rmap_pid(p) vx_info_rmap_pid(current_vx_info(), p)
10912 +#define vx_rmap_tgid(p) vx_rmap_pid(p)
10913 +
10914 +static inline int __vx_info_rmap_pid(struct vx_info *vxi, int pid,
10915 +       const char *func, const char *file, int line)
10916 +{
10917 +       if (vx_info_flags(vxi, VXF_INFO_INIT, 0)) {
10918 +               vxfprintk(VXD_CBIT(cvirt, 2),
10919 +                       "vx_rmap_tgid: %p/%llx: %d -> %d",
10920 +                       vxi, (long long)vxi->vx_flags, pid,
10921 +                       (pid == 1) ? vxi->vx_initpid : pid,
10922 +                       func, file, line);
10923 +               if ((pid == 1) && vxi->vx_initpid)
10924 +                       return vxi->vx_initpid;
10925 +               if (pid == vxi->vx_initpid)
10926 +                       return ~0U;
10927 +       }
10928 +       return pid;
10929 +}
10930 +
10931 +#endif
10932 diff -NurpP --minimal linux-4.9.135/include/linux/vserver/sched.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/sched.h
10933 --- linux-4.9.135/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000
10934 +++ linux-4.9.135-vs2.3.9.8/include/linux/vserver/sched.h       2018-10-20 04:58:14.000000000 +0000
10935 @@ -0,0 +1,23 @@
10936 +#ifndef _VSERVER_SCHED_H
10937 +#define _VSERVER_SCHED_H
10938 +
10939 +
10940 +#ifdef __KERNEL__
10941 +
10942 +struct timespec;
10943 +
10944 +void vx_vsi_uptime(struct timespec *, struct timespec *);
10945 +
10946 +
10947 +struct vx_info;
10948 +
10949 +void vx_update_load(struct vx_info *);
10950 +
10951 +
10952 +void vx_update_sched_param(struct _vx_sched *sched,
10953 +       struct _vx_sched_pc *sched_pc);
10954 +
10955 +#endif /* __KERNEL__ */
10956 +#else  /* _VSERVER_SCHED_H */
10957 +#warning duplicate inclusion
10958 +#endif /* _VSERVER_SCHED_H */
10959 diff -NurpP --minimal linux-4.9.135/include/linux/vserver/sched_cmd.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/sched_cmd.h
10960 --- linux-4.9.135/include/linux/vserver/sched_cmd.h     1970-01-01 00:00:00.000000000 +0000
10961 +++ linux-4.9.135-vs2.3.9.8/include/linux/vserver/sched_cmd.h   2018-10-20 04:58:14.000000000 +0000
10962 @@ -0,0 +1,11 @@
10963 +#ifndef _VSERVER_SCHED_CMD_H
10964 +#define _VSERVER_SCHED_CMD_H
10965 +
10966 +
10967 +#include <linux/compiler.h>
10968 +#include <uapi/vserver/sched_cmd.h>
10969 +
10970 +extern int vc_set_prio_bias(struct vx_info *, void __user *);
10971 +extern int vc_get_prio_bias(struct vx_info *, void __user *);
10972 +
10973 +#endif /* _VSERVER_SCHED_CMD_H */
10974 diff -NurpP --minimal linux-4.9.135/include/linux/vserver/sched_def.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/sched_def.h
10975 --- linux-4.9.135/include/linux/vserver/sched_def.h     1970-01-01 00:00:00.000000000 +0000
10976 +++ linux-4.9.135-vs2.3.9.8/include/linux/vserver/sched_def.h   2018-10-20 04:58:14.000000000 +0000
10977 @@ -0,0 +1,38 @@
10978 +#ifndef _VSERVER_SCHED_DEF_H
10979 +#define _VSERVER_SCHED_DEF_H
10980 +
10981 +#include <linux/spinlock.h>
10982 +#include <linux/jiffies.h>
10983 +#include <linux/cpumask.h>
10984 +#include <asm/atomic.h>
10985 +#include <asm/param.h>
10986 +
10987 +
10988 +/* context sub struct */
10989 +
10990 +struct _vx_sched {
10991 +       int prio_bias;                  /* bias offset for priority */
10992 +
10993 +       cpumask_t update;               /* CPUs which should update */
10994 +};
10995 +
10996 +struct _vx_sched_pc {
10997 +       int prio_bias;                  /* bias offset for priority */
10998 +
10999 +       uint64_t user_ticks;            /* token tick events */
11000 +       uint64_t sys_ticks;             /* token tick events */
11001 +       uint64_t hold_ticks;            /* token ticks paused */
11002 +};
11003 +
11004 +
11005 +#ifdef CONFIG_VSERVER_DEBUG
11006 +
11007 +static inline void __dump_vx_sched(struct _vx_sched *sched)
11008 +{
11009 +       printk("\t_vx_sched:\n");
11010 +       printk("\t priority = %4d\n", sched->prio_bias);
11011 +}
11012 +
11013 +#endif
11014 +
11015 +#endif /* _VSERVER_SCHED_DEF_H */
11016 diff -NurpP --minimal linux-4.9.135/include/linux/vserver/signal.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/signal.h
11017 --- linux-4.9.135/include/linux/vserver/signal.h        1970-01-01 00:00:00.000000000 +0000
11018 +++ linux-4.9.135-vs2.3.9.8/include/linux/vserver/signal.h      2018-10-20 04:58:14.000000000 +0000
11019 @@ -0,0 +1,14 @@
11020 +#ifndef _VSERVER_SIGNAL_H
11021 +#define _VSERVER_SIGNAL_H
11022 +
11023 +
11024 +#ifdef __KERNEL__
11025 +
11026 +struct vx_info;
11027 +
11028 +int vx_info_kill(struct vx_info *, int, int);
11029 +
11030 +#endif /* __KERNEL__ */
11031 +#else  /* _VSERVER_SIGNAL_H */
11032 +#warning duplicate inclusion
11033 +#endif /* _VSERVER_SIGNAL_H */
11034 diff -NurpP --minimal linux-4.9.135/include/linux/vserver/signal_cmd.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/signal_cmd.h
11035 --- linux-4.9.135/include/linux/vserver/signal_cmd.h    1970-01-01 00:00:00.000000000 +0000
11036 +++ linux-4.9.135-vs2.3.9.8/include/linux/vserver/signal_cmd.h  2018-10-20 04:58:14.000000000 +0000
11037 @@ -0,0 +1,14 @@
11038 +#ifndef _VSERVER_SIGNAL_CMD_H
11039 +#define _VSERVER_SIGNAL_CMD_H
11040 +
11041 +#include <uapi/vserver/signal_cmd.h>
11042 +
11043 +
11044 +extern int vc_ctx_kill(struct vx_info *, void __user *);
11045 +extern int vc_wait_exit(struct vx_info *, void __user *);
11046 +
11047 +
11048 +extern int vc_get_pflags(uint32_t pid, void __user *);
11049 +extern int vc_set_pflags(uint32_t pid, void __user *);
11050 +
11051 +#endif /* _VSERVER_SIGNAL_CMD_H */
11052 diff -NurpP --minimal linux-4.9.135/include/linux/vserver/space.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/space.h
11053 --- linux-4.9.135/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000
11054 +++ linux-4.9.135-vs2.3.9.8/include/linux/vserver/space.h       2018-10-20 04:58:14.000000000 +0000
11055 @@ -0,0 +1,12 @@
11056 +#ifndef _VSERVER_SPACE_H
11057 +#define _VSERVER_SPACE_H
11058 +
11059 +#include <linux/types.h>
11060 +
11061 +struct vx_info;
11062 +
11063 +int vx_set_space(struct vx_info *vxi, unsigned long mask, unsigned index);
11064 +
11065 +#else  /* _VSERVER_SPACE_H */
11066 +#warning duplicate inclusion
11067 +#endif /* _VSERVER_SPACE_H */
11068 diff -NurpP --minimal linux-4.9.135/include/linux/vserver/space_cmd.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/space_cmd.h
11069 --- linux-4.9.135/include/linux/vserver/space_cmd.h     1970-01-01 00:00:00.000000000 +0000
11070 +++ linux-4.9.135-vs2.3.9.8/include/linux/vserver/space_cmd.h   2018-10-20 04:58:14.000000000 +0000
11071 @@ -0,0 +1,13 @@
11072 +#ifndef _VSERVER_SPACE_CMD_H
11073 +#define _VSERVER_SPACE_CMD_H
11074 +
11075 +#include <uapi/vserver/space_cmd.h>
11076 +
11077 +
11078 +extern int vc_enter_space_v1(struct vx_info *, void __user *);
11079 +extern int vc_set_space_v1(struct vx_info *, void __user *);
11080 +extern int vc_enter_space(struct vx_info *, void __user *);
11081 +extern int vc_set_space(struct vx_info *, void __user *);
11082 +extern int vc_get_space_mask(void __user *, int);
11083 +
11084 +#endif /* _VSERVER_SPACE_CMD_H */
11085 diff -NurpP --minimal linux-4.9.135/include/linux/vserver/switch.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/switch.h
11086 --- linux-4.9.135/include/linux/vserver/switch.h        1970-01-01 00:00:00.000000000 +0000
11087 +++ linux-4.9.135-vs2.3.9.8/include/linux/vserver/switch.h      2018-10-20 04:58:14.000000000 +0000
11088 @@ -0,0 +1,8 @@
11089 +#ifndef _VSERVER_SWITCH_H
11090 +#define _VSERVER_SWITCH_H
11091 +
11092 +
11093 +#include <linux/errno.h>
11094 +#include <uapi/vserver/switch.h>
11095 +
11096 +#endif /* _VSERVER_SWITCH_H */
11097 diff -NurpP --minimal linux-4.9.135/include/linux/vserver/tag.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/tag.h
11098 --- linux-4.9.135/include/linux/vserver/tag.h   1970-01-01 00:00:00.000000000 +0000
11099 +++ linux-4.9.135-vs2.3.9.8/include/linux/vserver/tag.h 2018-10-20 04:58:14.000000000 +0000
11100 @@ -0,0 +1,160 @@
11101 +#ifndef _DX_TAG_H
11102 +#define _DX_TAG_H
11103 +
11104 +#include <linux/types.h>
11105 +#include <linux/uidgid.h>
11106 +
11107 +
11108 +#define DX_TAG(in)     (IS_TAGGED(in))
11109 +
11110 +
11111 +#ifdef CONFIG_TAG_NFSD
11112 +#define DX_TAG_NFSD    1
11113 +#else
11114 +#define DX_TAG_NFSD    0
11115 +#endif
11116 +
11117 +
11118 +#ifdef CONFIG_TAGGING_NONE
11119 +
11120 +#define MAX_UID                0xFFFFFFFF
11121 +#define MAX_GID                0xFFFFFFFF
11122 +
11123 +#define INOTAG_TAG(cond, uid, gid, tag)        (0)
11124 +
11125 +#define TAGINO_UID(cond, uid, tag)     (uid)
11126 +#define TAGINO_GID(cond, gid, tag)     (gid)
11127 +
11128 +#endif
11129 +
11130 +
11131 +#ifdef CONFIG_TAGGING_GID16
11132 +
11133 +#define MAX_UID                0xFFFFFFFF
11134 +#define MAX_GID                0x0000FFFF
11135 +
11136 +#define INOTAG_TAG(cond, uid, gid, tag)        \
11137 +       ((cond) ? (((gid) >> 16) & 0xFFFF) : 0)
11138 +
11139 +#define TAGINO_UID(cond, uid, tag)     (uid)
11140 +#define TAGINO_GID(cond, gid, tag)     \
11141 +       ((cond) ? (((gid) & 0xFFFF) | ((tag) << 16)) : (gid))
11142 +
11143 +#endif
11144 +
11145 +
11146 +#ifdef CONFIG_TAGGING_ID24
11147 +
11148 +#define MAX_UID                0x00FFFFFF
11149 +#define MAX_GID                0x00FFFFFF
11150 +
11151 +#define INOTAG_TAG(cond, uid, gid, tag)        \
11152 +       ((cond) ? ((((uid) >> 16) & 0xFF00) | (((gid) >> 24) & 0xFF)) : 0)
11153 +
11154 +#define TAGINO_UID(cond, uid, tag)     \
11155 +       ((cond) ? (((uid) & 0xFFFFFF) | (((tag) & 0xFF00) << 16)) : (uid))
11156 +#define TAGINO_GID(cond, gid, tag)     \
11157 +       ((cond) ? (((gid) & 0xFFFFFF) | (((tag) & 0x00FF) << 24)) : (gid))
11158 +
11159 +#endif
11160 +
11161 +
11162 +#ifdef CONFIG_TAGGING_UID16
11163 +
11164 +#define MAX_UID                0x0000FFFF
11165 +#define MAX_GID                0xFFFFFFFF
11166 +
11167 +#define INOTAG_TAG(cond, uid, gid, tag)        \
11168 +       ((cond) ? (((uid) >> 16) & 0xFFFF) : 0)
11169 +
11170 +#define TAGINO_UID(cond, uid, tag)     \
11171 +       ((cond) ? (((uid) & 0xFFFF) | ((tag) << 16)) : (uid))
11172 +#define TAGINO_GID(cond, gid, tag)     (gid)
11173 +
11174 +#endif
11175 +
11176 +
11177 +#ifdef CONFIG_TAGGING_INTERN
11178 +
11179 +#define MAX_UID                0xFFFFFFFF
11180 +#define MAX_GID                0xFFFFFFFF
11181 +
11182 +#define INOTAG_TAG(cond, uid, gid, tag)        \
11183 +       ((cond) ? (tag) : 0)
11184 +
11185 +#define TAGINO_UID(cond, uid, tag)     (uid)
11186 +#define TAGINO_GID(cond, gid, tag)     (gid)
11187 +
11188 +#endif
11189 +
11190 +
11191 +#ifndef CONFIG_TAGGING_NONE
11192 +#define dx_current_fstag(sb)   \
11193 +       ((sb)->s_flags & MS_TAGGED ? dx_current_tag() : 0)
11194 +#else
11195 +#define dx_current_fstag(sb)   (0)
11196 +#endif
11197 +
11198 +#ifndef CONFIG_TAGGING_INTERN
11199 +#define TAGINO_TAG(cond, tag)  (0)
11200 +#else
11201 +#define TAGINO_TAG(cond, tag)  ((cond) ? (tag) : 0)
11202 +#endif
11203 +
11204 +#define TAGINO_KUID(cond, kuid, ktag)  \
11205 +       KUIDT_INIT(TAGINO_UID(cond, __kuid_val(kuid), __ktag_val(ktag)))
11206 +#define TAGINO_KGID(cond, kgid, ktag)  \
11207 +       KGIDT_INIT(TAGINO_GID(cond, __kgid_val(kgid), __ktag_val(ktag)))
11208 +#define TAGINO_KTAG(cond, ktag)                \
11209 +       KTAGT_INIT(TAGINO_TAG(cond, __ktag_val(ktag)))
11210 +
11211 +
11212 +#define INOTAG_UID(cond, uid, gid)     \
11213 +       ((cond) ? ((uid) & MAX_UID) : (uid))
11214 +#define INOTAG_GID(cond, uid, gid)     \
11215 +       ((cond) ? ((gid) & MAX_GID) : (gid))
11216 +
11217 +#define INOTAG_KUID(cond, kuid, kgid)  \
11218 +       KUIDT_INIT(INOTAG_UID(cond, __kuid_val(kuid), __kgid_val(kgid)))
11219 +#define INOTAG_KGID(cond, kuid, kgid)  \
11220 +       KGIDT_INIT(INOTAG_GID(cond, __kuid_val(kuid), __kgid_val(kgid)))
11221 +#define INOTAG_KTAG(cond, kuid, kgid, ktag) \
11222 +       KTAGT_INIT(INOTAG_TAG(cond, \
11223 +               __kuid_val(kuid), __kgid_val(kgid), __ktag_val(ktag)))
11224 +
11225 +
11226 +static inline uid_t dx_map_uid(uid_t uid)
11227 +{
11228 +       if ((uid > MAX_UID) && (uid != -1))
11229 +               uid = -2;
11230 +       return (uid & MAX_UID);
11231 +}
11232 +
11233 +static inline gid_t dx_map_gid(gid_t gid)
11234 +{
11235 +       if ((gid > MAX_GID) && (gid != -1))
11236 +               gid = -2;
11237 +       return (gid & MAX_GID);
11238 +}
11239 +
11240 +struct peer_tag {
11241 +       int32_t xid;
11242 +       int32_t nid;
11243 +};
11244 +
11245 +#define dx_notagcheck(sb) ((sb) && ((sb)->s_flags & MS_NOTAGCHECK))
11246 +
11247 +int dx_parse_tag(char *string, vtag_t *tag, int remove, int *mnt_flags,
11248 +                unsigned long *flags);
11249 +
11250 +#ifdef CONFIG_PROPAGATE
11251 +
11252 +void __dx_propagate_tag(struct nameidata *nd, struct inode *inode);
11253 +
11254 +#define dx_propagate_tag(n, i) __dx_propagate_tag(n, i)
11255 +
11256 +#else
11257 +#define dx_propagate_tag(n, i) do { } while (0)
11258 +#endif
11259 +
11260 +#endif /* _DX_TAG_H */
11261 diff -NurpP --minimal linux-4.9.135/include/linux/vserver/tag_cmd.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/tag_cmd.h
11262 --- linux-4.9.135/include/linux/vserver/tag_cmd.h       1970-01-01 00:00:00.000000000 +0000
11263 +++ linux-4.9.135-vs2.3.9.8/include/linux/vserver/tag_cmd.h     2018-10-20 04:58:14.000000000 +0000
11264 @@ -0,0 +1,10 @@
11265 +#ifndef _VSERVER_TAG_CMD_H
11266 +#define _VSERVER_TAG_CMD_H
11267 +
11268 +#include <uapi/vserver/tag_cmd.h>
11269 +
11270 +extern int vc_task_tag(uint32_t);
11271 +
11272 +extern int vc_tag_migrate(uint32_t);
11273 +
11274 +#endif /* _VSERVER_TAG_CMD_H */
11275 diff -NurpP --minimal linux-4.9.135/include/net/addrconf.h linux-4.9.135-vs2.3.9.8/include/net/addrconf.h
11276 --- linux-4.9.135/include/net/addrconf.h        2018-10-20 10:39:20.000000000 +0000
11277 +++ linux-4.9.135-vs2.3.9.8/include/net/addrconf.h      2018-10-20 04:58:14.000000000 +0000
11278 @@ -85,7 +85,7 @@ struct inet6_ifaddr *ipv6_get_ifaddr(str
11279
11280  int ipv6_dev_get_saddr(struct net *net, const struct net_device *dev,
11281                        const struct in6_addr *daddr, unsigned int srcprefs,
11282 -                      struct in6_addr *saddr);
11283 +                      struct in6_addr *saddr, struct nx_info *nxi);
11284  int __ipv6_get_lladdr(struct inet6_dev *idev, struct in6_addr *addr,
11285                       u32 banned_flags);
11286  int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr,
11287 diff -NurpP --minimal linux-4.9.135/include/net/af_unix.h linux-4.9.135-vs2.3.9.8/include/net/af_unix.h
11288 --- linux-4.9.135/include/net/af_unix.h 2016-12-11 19:17:54.000000000 +0000
11289 +++ linux-4.9.135-vs2.3.9.8/include/net/af_unix.h       2018-10-20 04:58:14.000000000 +0000
11290 @@ -4,6 +4,7 @@
11291  #include <linux/socket.h>
11292  #include <linux/un.h>
11293  #include <linux/mutex.h>
11294 +// #include <linux/vs_base.h>
11295  #include <net/sock.h>
11296
11297  void unix_inflight(struct user_struct *user, struct file *fp);
11298 diff -NurpP --minimal linux-4.9.135/include/net/inet_timewait_sock.h linux-4.9.135-vs2.3.9.8/include/net/inet_timewait_sock.h
11299 --- linux-4.9.135/include/net/inet_timewait_sock.h      2018-10-20 10:39:20.000000000 +0000
11300 +++ linux-4.9.135-vs2.3.9.8/include/net/inet_timewait_sock.h    2018-10-20 04:58:14.000000000 +0000
11301 @@ -72,6 +72,10 @@ struct inet_timewait_sock {
11302  #define tw_num                 __tw_common.skc_num
11303  #define tw_cookie              __tw_common.skc_cookie
11304  #define tw_dr                  __tw_common.skc_tw_dr
11305 +#define tw_xid                 __tw_common.skc_xid
11306 +#define tw_vx_info             __tw_common.skc_vx_info
11307 +#define tw_nid                 __tw_common.skc_nid
11308 +#define tw_nx_info             __tw_common.skc_nx_info
11309
11310         int                     tw_timeout;
11311         volatile unsigned char  tw_substate;
11312 diff -NurpP --minimal linux-4.9.135/include/net/ip6_route.h linux-4.9.135-vs2.3.9.8/include/net/ip6_route.h
11313 --- linux-4.9.135/include/net/ip6_route.h       2018-10-20 10:39:20.000000000 +0000
11314 +++ linux-4.9.135-vs2.3.9.8/include/net/ip6_route.h     2018-10-20 04:58:14.000000000 +0000
11315 @@ -26,6 +26,7 @@ struct route_info {
11316  #include <linux/ip.h>
11317  #include <linux/ipv6.h>
11318  #include <linux/route.h>
11319 +#include <linux/vs_inet6.h>
11320
11321  #define RT6_LOOKUP_F_IFACE             0x00000001
11322  #define RT6_LOOKUP_F_REACHABLE         0x00000002
11323 @@ -98,17 +99,19 @@ int ip6_del_rt(struct rt6_info *);
11324  static inline int ip6_route_get_saddr(struct net *net, struct rt6_info *rt,
11325                                       const struct in6_addr *daddr,
11326                                       unsigned int prefs,
11327 -                                     struct in6_addr *saddr)
11328 +                                     struct in6_addr *saddr,
11329 +                                     struct nx_info *nxi)
11330  {
11331         struct inet6_dev *idev =
11332                         rt ? ip6_dst_idev((struct dst_entry *)rt) : NULL;
11333         int err = 0;
11334
11335 -       if (rt && rt->rt6i_prefsrc.plen)
11336 +       if (rt && rt->rt6i_prefsrc.plen && (!nxi ||
11337 +           v6_addr_in_nx_info(nxi, &rt->rt6i_prefsrc.addr, NXA_TYPE_ADDR)))
11338                 *saddr = rt->rt6i_prefsrc.addr;
11339         else
11340                 err = ipv6_dev_get_saddr(net, idev ? idev->dev : NULL,
11341 -                                        daddr, prefs, saddr);
11342 +                                        daddr, prefs, saddr, nxi);
11343
11344         return err;
11345  }
11346 diff -NurpP --minimal linux-4.9.135/include/net/route.h linux-4.9.135-vs2.3.9.8/include/net/route.h
11347 --- linux-4.9.135/include/net/route.h   2018-10-20 10:39:20.000000000 +0000
11348 +++ linux-4.9.135-vs2.3.9.8/include/net/route.h 2018-10-20 04:58:14.000000000 +0000
11349 @@ -226,6 +226,9 @@ static inline void ip_rt_put(struct rtab
11350         dst_release(&rt->dst);
11351  }
11352
11353 +#include <linux/vs_base.h>
11354 +#include <linux/vs_inet.h>
11355 +
11356  #define IPTOS_RT_MASK  (IPTOS_TOS_MASK & ~3)
11357
11358  extern const __u8 ip_tos2prio[16];
11359 @@ -273,6 +276,9 @@ static inline void ip_route_connect_init
11360                            protocol, flow_flags, dst, src, dport, sport);
11361  }
11362
11363 +extern struct rtable *ip_v4_find_src(struct net *net, struct nx_info *,
11364 +       struct flowi4 *);
11365 +
11366  static inline struct rtable *ip_route_connect(struct flowi4 *fl4,
11367                                               __be32 dst, __be32 src, u32 tos,
11368                                               int oif, u8 protocol,
11369 @@ -281,11 +287,25 @@ static inline struct rtable *ip_route_co
11370  {
11371         struct net *net = sock_net(sk);
11372         struct rtable *rt;
11373 +       struct nx_info *nx_info = current_nx_info();
11374
11375         ip_route_connect_init(fl4, dst, src, tos, oif, protocol,
11376                               sport, dport, sk);
11377
11378 -       if (!dst || !src) {
11379 +       if (sk)
11380 +               nx_info = sk->sk_nx_info;
11381 +
11382 +       vxdprintk(VXD_CBIT(net, 4),
11383 +               "ip_route_connect(%p) %p,%p;%lx",
11384 +               sk, nx_info, sk->sk_socket,
11385 +               (sk->sk_socket?sk->sk_socket->flags:0));
11386 +
11387 +       rt = ip_v4_find_src(net, nx_info, fl4);
11388 +       if (IS_ERR(rt))
11389 +               return rt;
11390 +       ip_rt_put(rt);
11391 +
11392 +       if (!fl4->daddr || !fl4->saddr) {
11393                 rt = __ip_route_output_key(net, fl4);
11394                 if (IS_ERR(rt))
11395                         return rt;
11396 diff -NurpP --minimal linux-4.9.135/include/net/sock.h linux-4.9.135-vs2.3.9.8/include/net/sock.h
11397 --- linux-4.9.135/include/net/sock.h    2018-10-20 10:39:20.000000000 +0000
11398 +++ linux-4.9.135-vs2.3.9.8/include/net/sock.h  2018-10-20 04:58:14.000000000 +0000
11399 @@ -187,6 +187,10 @@ struct sock_common {
11400         struct in6_addr         skc_v6_daddr;
11401         struct in6_addr         skc_v6_rcv_saddr;
11402  #endif
11403 +       vxid_t                  skc_xid;
11404 +       struct vx_info          *skc_vx_info;
11405 +       vnid_t                  skc_nid;
11406 +       struct nx_info          *skc_nx_info;
11407
11408         atomic64_t              skc_cookie;
11409
11410 @@ -336,8 +340,12 @@ struct sock {
11411  #define sk_prot                        __sk_common.skc_prot
11412  #define sk_net                 __sk_common.skc_net
11413  #define sk_v6_daddr            __sk_common.skc_v6_daddr
11414 -#define sk_v6_rcv_saddr        __sk_common.skc_v6_rcv_saddr
11415 +#define sk_v6_rcv_saddr                __sk_common.skc_v6_rcv_saddr
11416  #define sk_cookie              __sk_common.skc_cookie
11417 +#define sk_xid                 __sk_common.skc_xid
11418 +#define sk_vx_info             __sk_common.skc_vx_info
11419 +#define sk_nid                 __sk_common.skc_nid
11420 +#define sk_nx_info             __sk_common.skc_nx_info
11421  #define sk_incoming_cpu                __sk_common.skc_incoming_cpu
11422  #define sk_flags               __sk_common.skc_flags
11423  #define sk_rxhash              __sk_common.skc_rxhash
11424 diff -NurpP --minimal linux-4.9.135/include/uapi/Kbuild linux-4.9.135-vs2.3.9.8/include/uapi/Kbuild
11425 --- linux-4.9.135/include/uapi/Kbuild   2016-12-11 19:17:54.000000000 +0000
11426 +++ linux-4.9.135-vs2.3.9.8/include/uapi/Kbuild 2018-10-20 04:58:14.000000000 +0000
11427 @@ -13,3 +13,4 @@ header-y += drm/
11428  header-y += xen/
11429  header-y += scsi/
11430  header-y += misc/
11431 +header-y += vserver/
11432 diff -NurpP --minimal linux-4.9.135/include/uapi/linux/btrfs_tree.h linux-4.9.135-vs2.3.9.8/include/uapi/linux/btrfs_tree.h
11433 --- linux-4.9.135/include/uapi/linux/btrfs_tree.h       2018-10-20 10:39:20.000000000 +0000
11434 +++ linux-4.9.135-vs2.3.9.8/include/uapi/linux/btrfs_tree.h     2018-10-20 04:58:14.000000000 +0000
11435 @@ -564,11 +564,14 @@ struct btrfs_inode_item {
11436         /* modification sequence number for NFS */
11437         __le64 sequence;
11438
11439 +       __le16 tag;
11440         /*
11441          * a little future expansion, for more than this we can
11442          * just grow the inode item and version it
11443          */
11444 -       __le64 reserved[4];
11445 +       __le16 reserved16;
11446 +       __le32 reserved32;
11447 +       __le64 reserved[3];
11448         struct btrfs_timespec atime;
11449         struct btrfs_timespec ctime;
11450         struct btrfs_timespec mtime;
11451 diff -NurpP --minimal linux-4.9.135/include/uapi/linux/capability.h linux-4.9.135-vs2.3.9.8/include/uapi/linux/capability.h
11452 --- linux-4.9.135/include/uapi/linux/capability.h       2016-12-11 19:17:54.000000000 +0000
11453 +++ linux-4.9.135-vs2.3.9.8/include/uapi/linux/capability.h     2018-10-20 04:58:14.000000000 +0000
11454 @@ -257,6 +257,7 @@ struct vfs_cap_data {
11455     arbitrary SCSI commands */
11456  /* Allow setting encryption key on loopback filesystem */
11457  /* Allow setting zone reclaim policy */
11458 +/* Allow the selection of a security context */
11459
11460  #define CAP_SYS_ADMIN        21
11461
11462 @@ -352,7 +353,12 @@ struct vfs_cap_data {
11463
11464  #define CAP_LAST_CAP         CAP_AUDIT_READ
11465
11466 -#define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP)
11467 +/* Allow context manipulations */
11468 +/* Allow changing context info on files */
11469 +
11470 +#define CAP_CONTEXT         63
11471 +
11472 +#define cap_valid(x) ((x) >= 0 && ((x) <= CAP_LAST_CAP || (x) == CAP_CONTEXT))
11473
11474  /*
11475   * Bit location of each capability (used by user-space library and kernel)
11476 diff -NurpP --minimal linux-4.9.135/include/uapi/linux/fs.h linux-4.9.135-vs2.3.9.8/include/uapi/linux/fs.h
11477 --- linux-4.9.135/include/uapi/linux/fs.h       2018-10-20 10:39:20.000000000 +0000
11478 +++ linux-4.9.135-vs2.3.9.8/include/uapi/linux/fs.h     2018-10-20 04:58:14.000000000 +0000
11479 @@ -130,6 +130,9 @@ struct inodes_stat_t {
11480  #define MS_I_VERSION   (1<<23) /* Update inode I_version field */
11481  #define MS_STRICTATIME (1<<24) /* Always perform atime updates */
11482  #define MS_LAZYTIME    (1<<25) /* Update the on-disk [acm]times lazily */
11483 +#define MS_TAGGED      (1<<8)  /* use generic inode tagging */
11484 +#define MS_NOTAGCHECK  (1<<9)  /* don't check tags */
11485 +#define MS_TAGID       (1<<26) /* use specific tag for this mount */
11486
11487  /* These sb flags are internal to the kernel */
11488  #define MS_SUBMOUNT     (1<<26)
11489 @@ -313,13 +316,16 @@ struct fscrypt_policy {
11490  #define FS_EA_INODE_FL                 0x00200000 /* Inode used for large EA */
11491  #define FS_EOFBLOCKS_FL                        0x00400000 /* Reserved for ext4 */
11492  #define FS_NOCOW_FL                    0x00800000 /* Do not cow file */
11493 +#define FS_IXUNLINK_FL                 0x08000000 /* Immutable invert on unlink */
11494  #define FS_INLINE_DATA_FL              0x10000000 /* Reserved for ext4 */
11495  #define FS_PROJINHERIT_FL              0x20000000 /* Create with parents projid */
11496  #define FS_RESERVED_FL                 0x80000000 /* reserved for ext2 lib */
11497
11498 -#define FS_FL_USER_VISIBLE             0x0003DFFF /* User visible flags */
11499 -#define FS_FL_USER_MODIFIABLE          0x000380FF /* User modifiable flags */
11500 +#define FS_BARRIER_FL                  0x04000000 /* Barrier for chroot() */
11501 +#define FS_COW_FL                      0x20000000 /* Copy on Write marker */
11502
11503 +#define FS_FL_USER_VISIBLE             0x0103DFFF /* User visible flags */
11504 +#define FS_FL_USER_MODIFIABLE          0x010380FF /* User modifiable flags */
11505
11506  #define SYNC_FILE_RANGE_WAIT_BEFORE    1
11507  #define SYNC_FILE_RANGE_WRITE          2
11508 diff -NurpP --minimal linux-4.9.135/include/uapi/linux/gfs2_ondisk.h linux-4.9.135-vs2.3.9.8/include/uapi/linux/gfs2_ondisk.h
11509 --- linux-4.9.135/include/uapi/linux/gfs2_ondisk.h      2016-12-11 19:17:54.000000000 +0000
11510 +++ linux-4.9.135-vs2.3.9.8/include/uapi/linux/gfs2_ondisk.h    2018-10-20 04:58:14.000000000 +0000
11511 @@ -225,6 +225,9 @@ enum {
11512         gfs2fl_Sync             = 8,
11513         gfs2fl_System           = 9,
11514         gfs2fl_TopLevel         = 10,
11515 +       gfs2fl_IXUnlink         = 16,
11516 +       gfs2fl_Barrier          = 17,
11517 +       gfs2fl_Cow              = 18,
11518         gfs2fl_TruncInProg      = 29,
11519         gfs2fl_InheritDirectio  = 30,
11520         gfs2fl_InheritJdata     = 31,
11521 @@ -242,6 +245,9 @@ enum {
11522  #define GFS2_DIF_SYNC                  0x00000100
11523  #define GFS2_DIF_SYSTEM                        0x00000200 /* New in gfs2 */
11524  #define GFS2_DIF_TOPDIR                        0x00000400 /* New in gfs2 */
11525 +#define GFS2_DIF_IXUNLINK               0x00010000
11526 +#define GFS2_DIF_BARRIER                0x00020000
11527 +#define GFS2_DIF_COW                    0x00040000
11528  #define GFS2_DIF_TRUNC_IN_PROG         0x20000000 /* New in gfs2 */
11529  #define GFS2_DIF_INHERIT_DIRECTIO      0x40000000 /* only in gfs1 */
11530  #define GFS2_DIF_INHERIT_JDATA         0x80000000
11531 diff -NurpP --minimal linux-4.9.135/include/uapi/linux/if_tun.h linux-4.9.135-vs2.3.9.8/include/uapi/linux/if_tun.h
11532 --- linux-4.9.135/include/uapi/linux/if_tun.h   2016-12-11 19:17:54.000000000 +0000
11533 +++ linux-4.9.135-vs2.3.9.8/include/uapi/linux/if_tun.h 2018-10-20 04:58:14.000000000 +0000
11534 @@ -56,6 +56,7 @@
11535   */
11536  #define TUNSETVNETBE _IOW('T', 222, int)
11537  #define TUNGETVNETBE _IOR('T', 223, int)
11538 +#define TUNSETNID    _IOW('T', 224, int)
11539
11540  /* TUNSETIFF ifr flags */
11541  #define IFF_TUN                0x0001
11542 diff -NurpP --minimal linux-4.9.135/include/uapi/linux/major.h linux-4.9.135-vs2.3.9.8/include/uapi/linux/major.h
11543 --- linux-4.9.135/include/uapi/linux/major.h    2016-12-11 19:17:54.000000000 +0000
11544 +++ linux-4.9.135-vs2.3.9.8/include/uapi/linux/major.h  2018-10-20 04:58:14.000000000 +0000
11545 @@ -15,6 +15,7 @@
11546  #define HD_MAJOR               IDE0_MAJOR
11547  #define PTY_SLAVE_MAJOR                3
11548  #define TTY_MAJOR              4
11549 +#define VROOT_MAJOR            4
11550  #define TTYAUX_MAJOR           5
11551  #define LP_MAJOR               6
11552  #define VCS_MAJOR              7
11553 diff -NurpP --minimal linux-4.9.135/include/uapi/linux/nfs_mount.h linux-4.9.135-vs2.3.9.8/include/uapi/linux/nfs_mount.h
11554 --- linux-4.9.135/include/uapi/linux/nfs_mount.h        2016-12-11 19:17:54.000000000 +0000
11555 +++ linux-4.9.135-vs2.3.9.8/include/uapi/linux/nfs_mount.h      2018-10-20 04:58:14.000000000 +0000
11556 @@ -63,7 +63,8 @@ struct nfs_mount_data {
11557  #define NFS_MOUNT_SECFLAVOUR   0x2000  /* 5 non-text parsed mount data only */
11558  #define NFS_MOUNT_NORDIRPLUS   0x4000  /* 5 */
11559  #define NFS_MOUNT_UNSHARED     0x8000  /* 5 */
11560 -#define NFS_MOUNT_FLAGMASK     0xFFFF
11561 +#define NFS_MOUNT_TAGGED       0x10000 /* context tagging */
11562 +#define NFS_MOUNT_FLAGMASK     0x1FFFF
11563
11564  /* The following are for internal use only */
11565  #define NFS_MOUNT_LOOKUP_CACHE_NONEG   0x10000
11566 diff -NurpP --minimal linux-4.9.135/include/uapi/linux/reboot.h linux-4.9.135-vs2.3.9.8/include/uapi/linux/reboot.h
11567 --- linux-4.9.135/include/uapi/linux/reboot.h   2016-12-11 19:17:54.000000000 +0000
11568 +++ linux-4.9.135-vs2.3.9.8/include/uapi/linux/reboot.h 2018-10-20 04:58:14.000000000 +0000
11569 @@ -33,7 +33,7 @@
11570  #define        LINUX_REBOOT_CMD_RESTART2       0xA1B2C3D4
11571  #define        LINUX_REBOOT_CMD_SW_SUSPEND     0xD000FCE2
11572  #define        LINUX_REBOOT_CMD_KEXEC          0x45584543
11573 -
11574 +#define        LINUX_REBOOT_CMD_OOM            0xDEADBEEF
11575
11576
11577  #endif /* _UAPI_LINUX_REBOOT_H */
11578 diff -NurpP --minimal linux-4.9.135/include/uapi/linux/sysctl.h linux-4.9.135-vs2.3.9.8/include/uapi/linux/sysctl.h
11579 --- linux-4.9.135/include/uapi/linux/sysctl.h   2016-12-11 19:17:54.000000000 +0000
11580 +++ linux-4.9.135-vs2.3.9.8/include/uapi/linux/sysctl.h 2018-10-20 04:58:14.000000000 +0000
11581 @@ -58,6 +58,7 @@ enum
11582         CTL_ABI=9,              /* Binary emulation */
11583         CTL_CPU=10,             /* CPU stuff (speed scaling, etc) */
11584         CTL_ARLAN=254,          /* arlan wireless driver */
11585 +       CTL_VSERVER=4242,       /* Linux-VServer debug */
11586         CTL_S390DBF=5677,       /* s390 debug */
11587         CTL_SUNRPC=7249,        /* sunrpc debug */
11588         CTL_PM=9899,            /* frv power management */
11589 @@ -92,6 +93,7 @@ enum
11590
11591         KERN_PANIC=15,          /* int: panic timeout */
11592         KERN_REALROOTDEV=16,    /* real root device to mount after initrd */
11593 +       KERN_VSHELPER=17,       /* string: path to vshelper policy agent */
11594
11595         KERN_SPARC_REBOOT=21,   /* reboot command on Sparc */
11596         KERN_CTLALTDEL=22,      /* int: allow ctl-alt-del to reboot */
11597 diff -NurpP --minimal linux-4.9.135/include/uapi/vserver/Kbuild linux-4.9.135-vs2.3.9.8/include/uapi/vserver/Kbuild
11598 --- linux-4.9.135/include/uapi/vserver/Kbuild   1970-01-01 00:00:00.000000000 +0000
11599 +++ linux-4.9.135-vs2.3.9.8/include/uapi/vserver/Kbuild 2018-10-20 04:58:14.000000000 +0000
11600 @@ -0,0 +1,9 @@
11601 +
11602 +header-y += context_cmd.h network_cmd.h space_cmd.h \
11603 +       cacct_cmd.h cvirt_cmd.h limit_cmd.h dlimit_cmd.h \
11604 +       inode_cmd.h tag_cmd.h sched_cmd.h signal_cmd.h \
11605 +       debug_cmd.h device_cmd.h
11606 +
11607 +header-y += switch.h context.h network.h monitor.h \
11608 +       limit.h inode.h device.h
11609 +
11610 diff -NurpP --minimal linux-4.9.135/include/uapi/vserver/cacct_cmd.h linux-4.9.135-vs2.3.9.8/include/uapi/vserver/cacct_cmd.h
11611 --- linux-4.9.135/include/uapi/vserver/cacct_cmd.h      1970-01-01 00:00:00.000000000 +0000
11612 +++ linux-4.9.135-vs2.3.9.8/include/uapi/vserver/cacct_cmd.h    2018-10-20 04:58:14.000000000 +0000
11613 @@ -0,0 +1,15 @@
11614 +#ifndef _UAPI_VS_CACCT_CMD_H
11615 +#define _UAPI_VS_CACCT_CMD_H
11616 +
11617 +
11618 +/* virtual host info name commands */
11619 +
11620 +#define VCMD_sock_stat         VC_CMD(VSTAT, 5, 0)
11621 +
11622 +struct vcmd_sock_stat_v0 {
11623 +       uint32_t field;
11624 +       uint32_t count[3];
11625 +       uint64_t total[3];
11626 +};
11627 +
11628 +#endif /* _UAPI_VS_CACCT_CMD_H */
11629 diff -NurpP --minimal linux-4.9.135/include/uapi/vserver/context.h linux-4.9.135-vs2.3.9.8/include/uapi/vserver/context.h
11630 --- linux-4.9.135/include/uapi/vserver/context.h        1970-01-01 00:00:00.000000000 +0000
11631 +++ linux-4.9.135-vs2.3.9.8/include/uapi/vserver/context.h      2018-10-20 04:58:14.000000000 +0000
11632 @@ -0,0 +1,81 @@
11633 +#ifndef _UAPI_VS_CONTEXT_H
11634 +#define _UAPI_VS_CONTEXT_H
11635 +
11636 +#include <linux/types.h>
11637 +#include <linux/capability.h>
11638 +
11639 +
11640 +/* context flags */
11641 +
11642 +#define VXF_INFO_SCHED         0x00000002
11643 +#define VXF_INFO_NPROC         0x00000004
11644 +#define VXF_INFO_PRIVATE       0x00000008
11645 +
11646 +#define VXF_INFO_INIT          0x00000010
11647 +#define VXF_INFO_HIDE          0x00000020
11648 +#define VXF_INFO_ULIMIT                0x00000040
11649 +#define VXF_INFO_NSPACE                0x00000080
11650 +
11651 +#define VXF_SCHED_HARD         0x00000100
11652 +#define VXF_SCHED_PRIO         0x00000200
11653 +#define VXF_SCHED_PAUSE                0x00000400
11654 +
11655 +#define VXF_VIRT_MEM           0x00010000
11656 +#define VXF_VIRT_UPTIME                0x00020000
11657 +#define VXF_VIRT_CPU           0x00040000
11658 +#define VXF_VIRT_LOAD          0x00080000
11659 +#define VXF_VIRT_TIME          0x00100000
11660 +
11661 +#define VXF_HIDE_MOUNT         0x01000000
11662 +/* was VXF_HIDE_NETIF          0x02000000 */
11663 +#define VXF_HIDE_VINFO         0x04000000
11664 +
11665 +#define VXF_STATE_SETUP                (1ULL << 32)
11666 +#define VXF_STATE_INIT         (1ULL << 33)
11667 +#define VXF_STATE_ADMIN                (1ULL << 34)
11668 +
11669 +#define VXF_SC_HELPER          (1ULL << 36)
11670 +#define VXF_REBOOT_KILL                (1ULL << 37)
11671 +#define VXF_PERSISTENT         (1ULL << 38)
11672 +
11673 +#define VXF_FORK_RSS           (1ULL << 48)
11674 +#define VXF_PROLIFIC           (1ULL << 49)
11675 +
11676 +#define VXF_IGNEG_NICE         (1ULL << 52)
11677 +
11678 +#define VXF_ONE_TIME           (0x0007ULL << 32)
11679 +
11680 +#define VXF_INIT_SET           (VXF_STATE_SETUP | VXF_STATE_INIT | VXF_STATE_ADMIN)
11681 +
11682 +
11683 +/* context migration */
11684 +
11685 +#define VXM_SET_INIT           0x00000001
11686 +#define VXM_SET_REAPER         0x00000002
11687 +
11688 +/* context caps */
11689 +
11690 +#define VXC_SET_UTSNAME                0x00000001
11691 +#define VXC_SET_RLIMIT         0x00000002
11692 +#define VXC_FS_SECURITY                0x00000004
11693 +#define VXC_FS_TRUSTED         0x00000008
11694 +#define VXC_TIOCSTI            0x00000010
11695 +
11696 +/* was VXC_RAW_ICMP            0x00000100 */
11697 +#define VXC_SYSLOG             0x00001000
11698 +#define VXC_OOM_ADJUST         0x00002000
11699 +#define VXC_AUDIT_CONTROL      0x00004000
11700 +
11701 +#define VXC_SECURE_MOUNT       0x00010000
11702 +/* #define VXC_SECURE_REMOUNT  0x00020000 */
11703 +#define VXC_BINARY_MOUNT       0x00040000
11704 +#define VXC_DEV_MOUNT          0x00080000
11705 +
11706 +#define VXC_QUOTA_CTL          0x00100000
11707 +#define VXC_ADMIN_MAPPER       0x00200000
11708 +#define VXC_ADMIN_CLOOP                0x00400000
11709 +
11710 +#define VXC_KTHREAD            0x01000000
11711 +#define VXC_NAMESPACE          0x02000000
11712 +
11713 +#endif /* _UAPI_VS_CONTEXT_H */
11714 diff -NurpP --minimal linux-4.9.135/include/uapi/vserver/context_cmd.h linux-4.9.135-vs2.3.9.8/include/uapi/vserver/context_cmd.h
11715 --- linux-4.9.135/include/uapi/vserver/context_cmd.h    1970-01-01 00:00:00.000000000 +0000
11716 +++ linux-4.9.135-vs2.3.9.8/include/uapi/vserver/context_cmd.h  2018-10-20 04:58:14.000000000 +0000
11717 @@ -0,0 +1,115 @@
11718 +#ifndef _UAPI_VS_CONTEXT_CMD_H
11719 +#define _UAPI_VS_CONTEXT_CMD_H
11720 +
11721 +
11722 +/* vinfo commands */
11723 +
11724 +#define VCMD_task_xid          VC_CMD(VINFO, 1, 0)
11725 +
11726 +
11727 +#define VCMD_vx_info           VC_CMD(VINFO, 5, 0)
11728 +
11729 +struct vcmd_vx_info_v0 {
11730 +       uint32_t xid;
11731 +       uint32_t initpid;
11732 +       /* more to come */
11733 +};
11734 +
11735 +
11736 +#define VCMD_ctx_stat          VC_CMD(VSTAT, 0, 0)
11737 +
11738 +struct vcmd_ctx_stat_v0 {
11739 +       uint32_t usecnt;
11740 +       uint32_t tasks;
11741 +       /* more to come */
11742 +};
11743 +
11744 +
11745 +/* context commands */
11746 +
11747 +#define VCMD_ctx_create_v0     VC_CMD(VPROC, 1, 0)
11748 +#define VCMD_ctx_create                VC_CMD(VPROC, 1, 1)
11749 +
11750 +struct vcmd_ctx_create {
11751 +       uint64_t flagword;
11752 +};
11753 +
11754 +#define VCMD_ctx_migrate_v0    VC_CMD(PROCMIG, 1, 0)
11755 +#define VCMD_ctx_migrate       VC_CMD(PROCMIG, 1, 1)
11756 +
11757 +struct vcmd_ctx_migrate {
11758 +       uint64_t flagword;
11759 +};
11760 +
11761 +
11762 +
11763 +/* flag commands */
11764 +
11765 +#define VCMD_get_cflags                VC_CMD(FLAGS, 1, 0)
11766 +#define VCMD_set_cflags                VC_CMD(FLAGS, 2, 0)
11767 +
11768 +struct vcmd_ctx_flags_v0 {
11769 +       uint64_t flagword;
11770 +       uint64_t mask;
11771 +};
11772 +
11773 +
11774 +
11775 +/* context caps commands */
11776 +
11777 +#define VCMD_get_ccaps         VC_CMD(FLAGS, 3, 1)
11778 +#define VCMD_set_ccaps         VC_CMD(FLAGS, 4, 1)
11779 +
11780 +struct vcmd_ctx_caps_v1 {
11781 +       uint64_t ccaps;
11782 +       uint64_t cmask;
11783 +};
11784 +
11785 +
11786 +
11787 +/* bcaps commands */
11788 +
11789 +#define VCMD_get_bcaps         VC_CMD(FLAGS, 9, 0)
11790 +#define VCMD_set_bcaps         VC_CMD(FLAGS, 10, 0)
11791 +
11792 +struct vcmd_bcaps {
11793 +       uint64_t bcaps;
11794 +       uint64_t bmask;
11795 +};
11796 +
11797 +
11798 +
11799 +/* umask commands */
11800 +
11801 +#define VCMD_get_umask         VC_CMD(FLAGS, 13, 0)
11802 +#define VCMD_set_umask         VC_CMD(FLAGS, 14, 0)
11803 +
11804 +struct vcmd_umask {
11805 +       uint64_t umask;
11806 +       uint64_t mask;
11807 +};
11808 +
11809 +
11810 +
11811 +/* wmask commands */
11812 +
11813 +#define VCMD_get_wmask         VC_CMD(FLAGS, 15, 0)
11814 +#define VCMD_set_wmask         VC_CMD(FLAGS, 16, 0)
11815 +
11816 +struct vcmd_wmask {
11817 +       uint64_t wmask;
11818 +       uint64_t mask;
11819 +};
11820 +
11821 +
11822 +
11823 +/* OOM badness */
11824 +
11825 +#define VCMD_get_badness       VC_CMD(MEMCTRL, 5, 0)
11826 +#define VCMD_set_badness       VC_CMD(MEMCTRL, 6, 0)
11827 +
11828 +struct vcmd_badness_v0 {
11829 +       int64_t bias;
11830 +};
11831 +
11832 +#endif /* _UAPI_VS_CONTEXT_CMD_H */
11833 diff -NurpP --minimal linux-4.9.135/include/uapi/vserver/cvirt_cmd.h linux-4.9.135-vs2.3.9.8/include/uapi/vserver/cvirt_cmd.h
11834 --- linux-4.9.135/include/uapi/vserver/cvirt_cmd.h      1970-01-01 00:00:00.000000000 +0000
11835 +++ linux-4.9.135-vs2.3.9.8/include/uapi/vserver/cvirt_cmd.h    2018-10-20 04:58:14.000000000 +0000
11836 @@ -0,0 +1,41 @@
11837 +#ifndef _UAPI_VS_CVIRT_CMD_H
11838 +#define _UAPI_VS_CVIRT_CMD_H
11839 +
11840 +
11841 +/* virtual host info name commands */
11842 +
11843 +#define VCMD_set_vhi_name      VC_CMD(VHOST, 1, 0)
11844 +#define VCMD_get_vhi_name      VC_CMD(VHOST, 2, 0)
11845 +
11846 +struct vcmd_vhi_name_v0 {
11847 +       uint32_t field;
11848 +       char name[65];
11849 +};
11850 +
11851 +
11852 +enum vhi_name_field {
11853 +       VHIN_CONTEXT = 0,
11854 +       VHIN_SYSNAME,
11855 +       VHIN_NODENAME,
11856 +       VHIN_RELEASE,
11857 +       VHIN_VERSION,
11858 +       VHIN_MACHINE,
11859 +       VHIN_DOMAINNAME,
11860 +};
11861 +
11862 +
11863 +
11864 +#define VCMD_virt_stat         VC_CMD(VSTAT, 3, 0)
11865 +
11866 +struct vcmd_virt_stat_v0 {
11867 +       uint64_t offset;
11868 +       uint64_t uptime;
11869 +       uint32_t nr_threads;
11870 +       uint32_t nr_running;
11871 +       uint32_t nr_uninterruptible;
11872 +       uint32_t nr_onhold;
11873 +       uint32_t nr_forks;
11874 +       uint32_t load[3];
11875 +};
11876 +
11877 +#endif /* _UAPI_VS_CVIRT_CMD_H */
11878 diff -NurpP --minimal linux-4.9.135/include/uapi/vserver/debug_cmd.h linux-4.9.135-vs2.3.9.8/include/uapi/vserver/debug_cmd.h
11879 --- linux-4.9.135/include/uapi/vserver/debug_cmd.h      1970-01-01 00:00:00.000000000 +0000
11880 +++ linux-4.9.135-vs2.3.9.8/include/uapi/vserver/debug_cmd.h    2018-10-20 04:58:14.000000000 +0000
11881 @@ -0,0 +1,24 @@
11882 +#ifndef _UAPI_VS_DEBUG_CMD_H
11883 +#define _UAPI_VS_DEBUG_CMD_H
11884 +
11885 +
11886 +/* debug commands */
11887 +
11888 +#define VCMD_dump_history      VC_CMD(DEBUG, 1, 0)
11889 +
11890 +#define VCMD_read_history      VC_CMD(DEBUG, 5, 0)
11891 +#define VCMD_read_monitor      VC_CMD(DEBUG, 6, 0)
11892 +
11893 +struct  vcmd_read_history_v0 {
11894 +       uint32_t index;
11895 +       uint32_t count;
11896 +       char __user *data;
11897 +};
11898 +
11899 +struct  vcmd_read_monitor_v0 {
11900 +       uint32_t index;
11901 +       uint32_t count;
11902 +       char __user *data;
11903 +};
11904 +
11905 +#endif /* _UAPI_VS_DEBUG_CMD_H */
11906 diff -NurpP --minimal linux-4.9.135/include/uapi/vserver/device.h linux-4.9.135-vs2.3.9.8/include/uapi/vserver/device.h
11907 --- linux-4.9.135/include/uapi/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
11908 +++ linux-4.9.135-vs2.3.9.8/include/uapi/vserver/device.h       2018-10-20 04:58:14.000000000 +0000
11909 @@ -0,0 +1,12 @@
11910 +#ifndef _UAPI_VS_DEVICE_H
11911 +#define _UAPI_VS_DEVICE_H
11912 +
11913 +
11914 +#define DATTR_CREATE   0x00000001
11915 +#define DATTR_OPEN     0x00000002
11916 +
11917 +#define DATTR_REMAP    0x00000010
11918 +
11919 +#define DATTR_MASK     0x00000013
11920 +
11921 +#endif /* _UAPI_VS_DEVICE_H */
11922 diff -NurpP --minimal linux-4.9.135/include/uapi/vserver/device_cmd.h linux-4.9.135-vs2.3.9.8/include/uapi/vserver/device_cmd.h
11923 --- linux-4.9.135/include/uapi/vserver/device_cmd.h     1970-01-01 00:00:00.000000000 +0000
11924 +++ linux-4.9.135-vs2.3.9.8/include/uapi/vserver/device_cmd.h   2018-10-20 04:58:14.000000000 +0000
11925 @@ -0,0 +1,16 @@
11926 +#ifndef _UAPI_VS_DEVICE_CMD_H
11927 +#define _UAPI_VS_DEVICE_CMD_H
11928 +
11929 +
11930 +/*  device vserver commands */
11931 +
11932 +#define VCMD_set_mapping       VC_CMD(DEVICE, 1, 0)
11933 +#define VCMD_unset_mapping     VC_CMD(DEVICE, 2, 0)
11934 +
11935 +struct vcmd_set_mapping_v0 {
11936 +       const char __user *device;
11937 +       const char __user *target;
11938 +       uint32_t flags;
11939 +};
11940 +
11941 +#endif /* _UAPI_VS_DEVICE_CMD_H */
11942 diff -NurpP --minimal linux-4.9.135/include/uapi/vserver/dlimit_cmd.h linux-4.9.135-vs2.3.9.8/include/uapi/vserver/dlimit_cmd.h
11943 --- linux-4.9.135/include/uapi/vserver/dlimit_cmd.h     1970-01-01 00:00:00.000000000 +0000
11944 +++ linux-4.9.135-vs2.3.9.8/include/uapi/vserver/dlimit_cmd.h   2018-10-20 04:58:14.000000000 +0000
11945 @@ -0,0 +1,67 @@
11946 +#ifndef _UAPI_VS_DLIMIT_CMD_H
11947 +#define _UAPI_VS_DLIMIT_CMD_H
11948 +
11949 +
11950 +/*  dlimit vserver commands */
11951 +
11952 +#define VCMD_add_dlimit                VC_CMD(DLIMIT, 1, 0)
11953 +#define VCMD_rem_dlimit                VC_CMD(DLIMIT, 2, 0)
11954 +
11955 +#define VCMD_set_dlimit                VC_CMD(DLIMIT, 5, 0)
11956 +#define VCMD_get_dlimit                VC_CMD(DLIMIT, 6, 0)
11957 +
11958 +struct vcmd_ctx_dlimit_base_v0 {
11959 +       const char __user *name;
11960 +       uint32_t flags;
11961 +};
11962 +
11963 +struct vcmd_ctx_dlimit_v0 {
11964 +       const char __user *name;
11965 +       uint32_t space_used;                    /* used space in kbytes */
11966 +       uint32_t space_total;                   /* maximum space in kbytes */
11967 +       uint32_t inodes_used;                   /* used inodes */
11968 +       uint32_t inodes_total;                  /* maximum inodes */
11969 +       uint32_t reserved;                      /* reserved for root in % */
11970 +       uint32_t flags;
11971 +};
11972 +
11973 +#define CDLIM_UNSET            ((uint32_t)0UL)
11974 +#define CDLIM_INFINITY         ((uint32_t)~0UL)
11975 +#define CDLIM_KEEP             ((uint32_t)~1UL)
11976 +
11977 +#define DLIME_UNIT     0
11978 +#define DLIME_KILO     1
11979 +#define DLIME_MEGA     2
11980 +#define DLIME_GIGA     3
11981 +
11982 +#define DLIMF_SHIFT    0x10
11983 +
11984 +#define DLIMS_USED     0
11985 +#define DLIMS_TOTAL    2
11986 +
11987 +static inline
11988 +uint64_t dlimit_space_32to64(uint32_t val, uint32_t flags, int shift)
11989 +{
11990 +       int exp = (flags & DLIMF_SHIFT) ?
11991 +               (flags >> shift) & DLIME_GIGA : DLIME_KILO;
11992 +       return ((uint64_t)val) << (10 * exp);
11993 +}
11994 +
11995 +static inline
11996 +uint32_t dlimit_space_64to32(uint64_t val, uint32_t *flags, int shift)
11997 +{
11998 +       int exp = 0;
11999 +
12000 +       if (*flags & DLIMF_SHIFT) {
12001 +               while (val > (1LL << 32) && (exp < 3)) {
12002 +                       val >>= 10;
12003 +                       exp++;
12004 +               }
12005 +               *flags &= ~(DLIME_GIGA << shift);
12006 +               *flags |= exp << shift;
12007 +       } else
12008 +               val >>= 10;
12009 +       return val;
12010 +}
12011 +
12012 +#endif /* _UAPI_VS_DLIMIT_CMD_H */
12013 diff -NurpP --minimal linux-4.9.135/include/uapi/vserver/inode.h linux-4.9.135-vs2.3.9.8/include/uapi/vserver/inode.h
12014 --- linux-4.9.135/include/uapi/vserver/inode.h  1970-01-01 00:00:00.000000000 +0000
12015 +++ linux-4.9.135-vs2.3.9.8/include/uapi/vserver/inode.h        2018-10-20 04:58:14.000000000 +0000
12016 @@ -0,0 +1,23 @@
12017 +#ifndef _UAPI_VS_INODE_H
12018 +#define _UAPI_VS_INODE_H
12019 +
12020 +
12021 +#define IATTR_TAG      0x01000000
12022 +
12023 +#define IATTR_ADMIN    0x00000001
12024 +#define IATTR_WATCH    0x00000002
12025 +#define IATTR_HIDE     0x00000004
12026 +#define IATTR_FLAGS    0x00000007
12027 +
12028 +#define IATTR_BARRIER  0x00010000
12029 +#define IATTR_IXUNLINK 0x00020000
12030 +#define IATTR_IMMUTABLE 0x00040000
12031 +#define IATTR_COW      0x00080000
12032 +
12033 +
12034 +/* inode ioctls */
12035 +
12036 +#define FIOC_GETXFLG   _IOR('x', 5, long)
12037 +#define FIOC_SETXFLG   _IOW('x', 6, long)
12038 +
12039 +#endif /* _UAPI_VS_INODE_H */
12040 diff -NurpP --minimal linux-4.9.135/include/uapi/vserver/inode_cmd.h linux-4.9.135-vs2.3.9.8/include/uapi/vserver/inode_cmd.h
12041 --- linux-4.9.135/include/uapi/vserver/inode_cmd.h      1970-01-01 00:00:00.000000000 +0000
12042 +++ linux-4.9.135-vs2.3.9.8/include/uapi/vserver/inode_cmd.h    2018-10-20 04:58:14.000000000 +0000
12043 @@ -0,0 +1,26 @@
12044 +#ifndef _UAPI_VS_INODE_CMD_H
12045 +#define _UAPI_VS_INODE_CMD_H
12046 +
12047 +
12048 +/*  inode vserver commands */
12049 +
12050 +#define VCMD_get_iattr         VC_CMD(INODE, 1, 1)
12051 +#define VCMD_set_iattr         VC_CMD(INODE, 2, 1)
12052 +
12053 +#define VCMD_fget_iattr                VC_CMD(INODE, 3, 0)
12054 +#define VCMD_fset_iattr                VC_CMD(INODE, 4, 0)
12055 +
12056 +struct vcmd_ctx_iattr_v1 {
12057 +       const char __user *name;
12058 +       uint32_t tag;
12059 +       uint32_t flags;
12060 +       uint32_t mask;
12061 +};
12062 +
12063 +struct vcmd_ctx_fiattr_v0 {
12064 +       uint32_t tag;
12065 +       uint32_t flags;
12066 +       uint32_t mask;
12067 +};
12068 +
12069 +#endif /* _UAPI_VS_INODE_CMD_H */
12070 diff -NurpP --minimal linux-4.9.135/include/uapi/vserver/limit.h linux-4.9.135-vs2.3.9.8/include/uapi/vserver/limit.h
12071 --- linux-4.9.135/include/uapi/vserver/limit.h  1970-01-01 00:00:00.000000000 +0000
12072 +++ linux-4.9.135-vs2.3.9.8/include/uapi/vserver/limit.h        2018-10-20 04:58:14.000000000 +0000
12073 @@ -0,0 +1,14 @@
12074 +#ifndef _UAPI_VS_LIMIT_H
12075 +#define _UAPI_VS_LIMIT_H
12076 +
12077 +
12078 +#define VLIMIT_NSOCK   16
12079 +#define VLIMIT_OPENFD  17
12080 +#define VLIMIT_ANON    18
12081 +#define VLIMIT_SHMEM   19
12082 +#define VLIMIT_SEMARY  20
12083 +#define VLIMIT_NSEMS   21
12084 +#define VLIMIT_DENTRY  22
12085 +#define VLIMIT_MAPPED  23
12086 +
12087 +#endif /* _UAPI_VS_LIMIT_H */
12088 diff -NurpP --minimal linux-4.9.135/include/uapi/vserver/limit_cmd.h linux-4.9.135-vs2.3.9.8/include/uapi/vserver/limit_cmd.h
12089 --- linux-4.9.135/include/uapi/vserver/limit_cmd.h      1970-01-01 00:00:00.000000000 +0000
12090 +++ linux-4.9.135-vs2.3.9.8/include/uapi/vserver/limit_cmd.h    2018-10-20 04:58:14.000000000 +0000
12091 @@ -0,0 +1,40 @@
12092 +#ifndef _UAPI_VS_LIMIT_CMD_H
12093 +#define _UAPI_VS_LIMIT_CMD_H
12094 +
12095 +
12096 +/*  rlimit vserver commands */
12097 +
12098 +#define VCMD_get_rlimit                VC_CMD(RLIMIT, 1, 0)
12099 +#define VCMD_set_rlimit                VC_CMD(RLIMIT, 2, 0)
12100 +#define VCMD_get_rlimit_mask   VC_CMD(RLIMIT, 3, 0)
12101 +#define VCMD_reset_hits                VC_CMD(RLIMIT, 7, 0)
12102 +#define VCMD_reset_minmax      VC_CMD(RLIMIT, 9, 0)
12103 +
12104 +struct vcmd_ctx_rlimit_v0 {
12105 +       uint32_t id;
12106 +       uint64_t minimum;
12107 +       uint64_t softlimit;
12108 +       uint64_t maximum;
12109 +};
12110 +
12111 +struct vcmd_ctx_rlimit_mask_v0 {
12112 +       uint32_t minimum;
12113 +       uint32_t softlimit;
12114 +       uint32_t maximum;
12115 +};
12116 +
12117 +#define VCMD_rlimit_stat       VC_CMD(VSTAT, 1, 0)
12118 +
12119 +struct vcmd_rlimit_stat_v0 {
12120 +       uint32_t id;
12121 +       uint32_t hits;
12122 +       uint64_t value;
12123 +       uint64_t minimum;
12124 +       uint64_t maximum;
12125 +};
12126 +
12127 +#define CRLIM_UNSET            (0ULL)
12128 +#define CRLIM_INFINITY         (~0ULL)
12129 +#define CRLIM_KEEP             (~1ULL)
12130 +
12131 +#endif /* _UAPI_VS_LIMIT_CMD_H */
12132 diff -NurpP --minimal linux-4.9.135/include/uapi/vserver/monitor.h linux-4.9.135-vs2.3.9.8/include/uapi/vserver/monitor.h
12133 --- linux-4.9.135/include/uapi/vserver/monitor.h        1970-01-01 00:00:00.000000000 +0000
12134 +++ linux-4.9.135-vs2.3.9.8/include/uapi/vserver/monitor.h      2018-10-20 04:58:14.000000000 +0000
12135 @@ -0,0 +1,96 @@
12136 +#ifndef _UAPI_VS_MONITOR_H
12137 +#define _UAPI_VS_MONITOR_H
12138 +
12139 +#include <linux/types.h>
12140 +
12141 +
12142 +enum {
12143 +       VXM_UNUSED = 0,
12144 +
12145 +       VXM_SYNC = 0x10,
12146 +
12147 +       VXM_UPDATE = 0x20,
12148 +       VXM_UPDATE_1,
12149 +       VXM_UPDATE_2,
12150 +
12151 +       VXM_RQINFO_1 = 0x24,
12152 +       VXM_RQINFO_2,
12153 +
12154 +       VXM_ACTIVATE = 0x40,
12155 +       VXM_DEACTIVATE,
12156 +       VXM_IDLE,
12157 +
12158 +       VXM_HOLD = 0x44,
12159 +       VXM_UNHOLD,
12160 +
12161 +       VXM_MIGRATE = 0x48,
12162 +       VXM_RESCHED,
12163 +
12164 +       /* all other bits are flags */
12165 +       VXM_SCHED = 0x80,
12166 +};
12167 +
12168 +struct _vxm_update_1 {
12169 +       uint32_t tokens_max;
12170 +       uint32_t fill_rate;
12171 +       uint32_t interval;
12172 +};
12173 +
12174 +struct _vxm_update_2 {
12175 +       uint32_t tokens_min;
12176 +       uint32_t fill_rate;
12177 +       uint32_t interval;
12178 +};
12179 +
12180 +struct _vxm_rqinfo_1 {
12181 +       uint16_t running;
12182 +       uint16_t onhold;
12183 +       uint16_t iowait;
12184 +       uint16_t uintr;
12185 +       uint32_t idle_tokens;
12186 +};
12187 +
12188 +struct _vxm_rqinfo_2 {
12189 +       uint32_t norm_time;
12190 +       uint32_t idle_time;
12191 +       uint32_t idle_skip;
12192 +};
12193 +
12194 +struct _vxm_sched {
12195 +       uint32_t tokens;
12196 +       uint32_t norm_time;
12197 +       uint32_t idle_time;
12198 +};
12199 +
12200 +struct _vxm_task {
12201 +       uint16_t pid;
12202 +       uint16_t state;
12203 +};
12204 +
12205 +struct _vxm_event {
12206 +       uint32_t jif;
12207 +       union {
12208 +               uint32_t seq;
12209 +               uint32_t sec;
12210 +       };
12211 +       union {
12212 +               uint32_t tokens;
12213 +               uint32_t nsec;
12214 +               struct _vxm_task tsk;
12215 +       };
12216 +};
12217 +
12218 +struct _vx_mon_entry {
12219 +       uint16_t type;
12220 +       uint16_t xid;
12221 +       union {
12222 +               struct _vxm_event ev;
12223 +               struct _vxm_sched sd;
12224 +               struct _vxm_update_1 u1;
12225 +               struct _vxm_update_2 u2;
12226 +               struct _vxm_rqinfo_1 q1;
12227 +               struct _vxm_rqinfo_2 q2;
12228 +       };
12229 +};
12230 +
12231 +#endif /* _UAPI_VS_MONITOR_H */
12232 diff -NurpP --minimal linux-4.9.135/include/uapi/vserver/network.h linux-4.9.135-vs2.3.9.8/include/uapi/vserver/network.h
12233 --- linux-4.9.135/include/uapi/vserver/network.h        1970-01-01 00:00:00.000000000 +0000
12234 +++ linux-4.9.135-vs2.3.9.8/include/uapi/vserver/network.h      2018-10-20 04:58:14.000000000 +0000
12235 @@ -0,0 +1,76 @@
12236 +#ifndef _UAPI_VS_NETWORK_H
12237 +#define _UAPI_VS_NETWORK_H
12238 +
12239 +#include <linux/types.h>
12240 +
12241 +
12242 +#define MAX_N_CONTEXT  65535   /* Arbitrary limit */
12243 +
12244 +
12245 +/* network flags */
12246 +
12247 +#define NXF_INFO_PRIVATE       0x00000008
12248 +
12249 +#define NXF_SINGLE_IP          0x00000100
12250 +#define NXF_LBACK_REMAP                0x00000200
12251 +#define NXF_LBACK_ALLOW                0x00000400
12252 +
12253 +#define NXF_HIDE_NETIF         0x02000000
12254 +#define NXF_HIDE_LBACK         0x04000000
12255 +
12256 +#define NXF_STATE_SETUP                (1ULL << 32)
12257 +#define NXF_STATE_ADMIN                (1ULL << 34)
12258 +
12259 +#define NXF_SC_HELPER          (1ULL << 36)
12260 +#define NXF_PERSISTENT         (1ULL << 38)
12261 +
12262 +#define NXF_ONE_TIME           (0x0005ULL << 32)
12263 +
12264 +
12265 +#define        NXF_INIT_SET            (__nxf_init_set())
12266 +
12267 +static inline uint64_t __nxf_init_set(void) {
12268 +       return    NXF_STATE_ADMIN
12269 +#ifdef CONFIG_VSERVER_AUTO_LBACK
12270 +               | NXF_LBACK_REMAP
12271 +               | NXF_HIDE_LBACK
12272 +#endif
12273 +#ifdef CONFIG_VSERVER_AUTO_SINGLE
12274 +               | NXF_SINGLE_IP
12275 +#endif
12276 +               | NXF_HIDE_NETIF;
12277 +}
12278 +
12279 +
12280 +/* network caps */
12281 +
12282 +#define NXC_TUN_CREATE         0x00000001
12283 +
12284 +#define NXC_RAW_ICMP           0x00000100
12285 +
12286 +#define NXC_MULTICAST          0x00001000
12287 +
12288 +
12289 +/* address types */
12290 +
12291 +#define NXA_TYPE_IPV4          0x0001
12292 +#define NXA_TYPE_IPV6          0x0002
12293 +
12294 +#define NXA_TYPE_NONE          0x0000
12295 +#define NXA_TYPE_ANY           0x00FF
12296 +
12297 +#define NXA_TYPE_ADDR          0x0010
12298 +#define NXA_TYPE_MASK          0x0020
12299 +#define NXA_TYPE_RANGE         0x0040
12300 +
12301 +#define NXA_MASK_ALL           (NXA_TYPE_ADDR | NXA_TYPE_MASK | NXA_TYPE_RANGE)
12302 +
12303 +#define NXA_MOD_BCAST          0x0100
12304 +#define NXA_MOD_LBACK          0x0200
12305 +
12306 +#define NXA_LOOPBACK           0x1000
12307 +
12308 +#define NXA_MASK_BIND          (NXA_MASK_ALL | NXA_MOD_BCAST | NXA_MOD_LBACK)
12309 +#define NXA_MASK_SHOW          (NXA_MASK_ALL | NXA_LOOPBACK)
12310 +
12311 +#endif /* _UAPI_VS_NETWORK_H */
12312 diff -NurpP --minimal linux-4.9.135/include/uapi/vserver/network_cmd.h linux-4.9.135-vs2.3.9.8/include/uapi/vserver/network_cmd.h
12313 --- linux-4.9.135/include/uapi/vserver/network_cmd.h    1970-01-01 00:00:00.000000000 +0000
12314 +++ linux-4.9.135-vs2.3.9.8/include/uapi/vserver/network_cmd.h  2018-10-20 04:58:14.000000000 +0000
12315 @@ -0,0 +1,123 @@
12316 +#ifndef _UAPI_VS_NETWORK_CMD_H
12317 +#define _UAPI_VS_NETWORK_CMD_H
12318 +
12319 +
12320 +/* vinfo commands */
12321 +
12322 +#define VCMD_task_nid          VC_CMD(VINFO, 2, 0)
12323 +
12324 +
12325 +#define VCMD_nx_info           VC_CMD(VINFO, 6, 0)
12326 +
12327 +struct vcmd_nx_info_v0 {
12328 +       uint32_t nid;
12329 +       /* more to come */
12330 +};
12331 +
12332 +
12333 +#include <linux/in.h>
12334 +#include <linux/in6.h>
12335 +
12336 +#define VCMD_net_create_v0     VC_CMD(VNET, 1, 0)
12337 +#define VCMD_net_create                VC_CMD(VNET, 1, 1)
12338 +
12339 +struct  vcmd_net_create {
12340 +       uint64_t flagword;
12341 +};
12342 +
12343 +#define VCMD_net_migrate       VC_CMD(NETMIG, 1, 0)
12344 +
12345 +#define VCMD_net_add           VC_CMD(NETALT, 1, 0)
12346 +#define VCMD_net_remove                VC_CMD(NETALT, 2, 0)
12347 +
12348 +struct vcmd_net_addr_v0 {
12349 +       uint16_t type;
12350 +       uint16_t count;
12351 +       struct in_addr ip[4];
12352 +       struct in_addr mask[4];
12353 +};
12354 +
12355 +#define VCMD_net_add_ipv4_v1   VC_CMD(NETALT, 1, 1)
12356 +#define VCMD_net_rem_ipv4_v1   VC_CMD(NETALT, 2, 1)
12357 +
12358 +struct vcmd_net_addr_ipv4_v1 {
12359 +       uint16_t type;
12360 +       uint16_t flags;
12361 +       struct in_addr ip;
12362 +       struct in_addr mask;
12363 +};
12364 +
12365 +#define VCMD_net_add_ipv4      VC_CMD(NETALT, 1, 2)
12366 +#define VCMD_net_rem_ipv4      VC_CMD(NETALT, 2, 2)
12367 +
12368 +struct vcmd_net_addr_ipv4_v2 {
12369 +       uint16_t type;
12370 +       uint16_t flags;
12371 +       struct in_addr ip;
12372 +       struct in_addr ip2;
12373 +       struct in_addr mask;
12374 +};
12375 +
12376 +#define VCMD_net_add_ipv6      VC_CMD(NETALT, 3, 1)
12377 +#define VCMD_net_remove_ipv6   VC_CMD(NETALT, 4, 1)
12378 +
12379 +struct vcmd_net_addr_ipv6_v1 {
12380 +       uint16_t type;
12381 +       uint16_t flags;
12382 +       uint32_t prefix;
12383 +       struct in6_addr ip;
12384 +       struct in6_addr mask;
12385 +};
12386 +
12387 +#define VCMD_add_match_ipv4    VC_CMD(NETALT, 5, 0)
12388 +#define VCMD_get_match_ipv4    VC_CMD(NETALT, 6, 0)
12389 +
12390 +struct vcmd_match_ipv4_v0 {
12391 +       uint16_t type;
12392 +       uint16_t flags;
12393 +       uint16_t parent;
12394 +       uint16_t prefix;
12395 +       struct in_addr ip;
12396 +       struct in_addr ip2;
12397 +       struct in_addr mask;
12398 +};
12399 +
12400 +#define VCMD_add_match_ipv6    VC_CMD(NETALT, 7, 0)
12401 +#define VCMD_get_match_ipv6    VC_CMD(NETALT, 8, 0)
12402 +
12403 +struct vcmd_match_ipv6_v0 {
12404 +       uint16_t type;
12405 +       uint16_t flags;
12406 +       uint16_t parent;
12407 +       uint16_t prefix;
12408 +       struct in6_addr ip;
12409 +       struct in6_addr ip2;
12410 +       struct in6_addr mask;
12411 +};
12412 +
12413 +
12414 +
12415 +
12416 +/* flag commands */
12417 +
12418 +#define VCMD_get_nflags                VC_CMD(FLAGS, 5, 0)
12419 +#define VCMD_set_nflags                VC_CMD(FLAGS, 6, 0)
12420 +
12421 +struct vcmd_net_flags_v0 {
12422 +       uint64_t flagword;
12423 +       uint64_t mask;
12424 +};
12425 +
12426 +
12427 +
12428 +/* network caps commands */
12429 +
12430 +#define VCMD_get_ncaps         VC_CMD(FLAGS, 7, 0)
12431 +#define VCMD_set_ncaps         VC_CMD(FLAGS, 8, 0)
12432 +
12433 +struct vcmd_net_caps_v0 {
12434 +       uint64_t ncaps;
12435 +       uint64_t cmask;
12436 +};
12437 +
12438 +#endif /* _UAPI_VS_NETWORK_CMD_H */
12439 diff -NurpP --minimal linux-4.9.135/include/uapi/vserver/sched_cmd.h linux-4.9.135-vs2.3.9.8/include/uapi/vserver/sched_cmd.h
12440 --- linux-4.9.135/include/uapi/vserver/sched_cmd.h      1970-01-01 00:00:00.000000000 +0000
12441 +++ linux-4.9.135-vs2.3.9.8/include/uapi/vserver/sched_cmd.h    2018-10-20 04:58:14.000000000 +0000
12442 @@ -0,0 +1,13 @@
12443 +#ifndef _UAPI_VS_SCHED_CMD_H
12444 +#define _UAPI_VS_SCHED_CMD_H
12445 +
12446 +
12447 +struct vcmd_prio_bias {
12448 +       int32_t cpu_id;
12449 +       int32_t prio_bias;
12450 +};
12451 +
12452 +#define VCMD_set_prio_bias     VC_CMD(SCHED, 4, 0)
12453 +#define VCMD_get_prio_bias     VC_CMD(SCHED, 5, 0)
12454 +
12455 +#endif /* _UAPI_VS_SCHED_CMD_H */
12456 diff -NurpP --minimal linux-4.9.135/include/uapi/vserver/signal_cmd.h linux-4.9.135-vs2.3.9.8/include/uapi/vserver/signal_cmd.h
12457 --- linux-4.9.135/include/uapi/vserver/signal_cmd.h     1970-01-01 00:00:00.000000000 +0000
12458 +++ linux-4.9.135-vs2.3.9.8/include/uapi/vserver/signal_cmd.h   2018-10-20 04:58:14.000000000 +0000
12459 @@ -0,0 +1,31 @@
12460 +#ifndef _UAPI_VS_SIGNAL_CMD_H
12461 +#define _UAPI_VS_SIGNAL_CMD_H
12462 +
12463 +
12464 +/*  signalling vserver commands */
12465 +
12466 +#define VCMD_ctx_kill          VC_CMD(PROCTRL, 1, 0)
12467 +#define VCMD_wait_exit         VC_CMD(EVENT, 99, 0)
12468 +
12469 +struct vcmd_ctx_kill_v0 {
12470 +       int32_t pid;
12471 +       int32_t sig;
12472 +};
12473 +
12474 +struct vcmd_wait_exit_v0 {
12475 +       int32_t reboot_cmd;
12476 +       int32_t exit_code;
12477 +};
12478 +
12479 +
12480 +/*  process alteration commands */
12481 +
12482 +#define VCMD_get_pflags                VC_CMD(PROCALT, 5, 0)
12483 +#define VCMD_set_pflags                VC_CMD(PROCALT, 6, 0)
12484 +
12485 +struct vcmd_pflags_v0 {
12486 +       uint32_t flagword;
12487 +       uint32_t mask;
12488 +};
12489 +
12490 +#endif /* _UAPI_VS_SIGNAL_CMD_H */
12491 diff -NurpP --minimal linux-4.9.135/include/uapi/vserver/space_cmd.h linux-4.9.135-vs2.3.9.8/include/uapi/vserver/space_cmd.h
12492 --- linux-4.9.135/include/uapi/vserver/space_cmd.h      1970-01-01 00:00:00.000000000 +0000
12493 +++ linux-4.9.135-vs2.3.9.8/include/uapi/vserver/space_cmd.h    2018-10-20 04:58:14.000000000 +0000
12494 @@ -0,0 +1,28 @@
12495 +#ifndef _UAPI_VS_SPACE_CMD_H
12496 +#define _UAPI_VS_SPACE_CMD_H
12497 +
12498 +
12499 +#define VCMD_enter_space_v0    VC_CMD(PROCALT, 1, 0)
12500 +#define VCMD_enter_space_v1    VC_CMD(PROCALT, 1, 1)
12501 +#define VCMD_enter_space       VC_CMD(PROCALT, 1, 2)
12502 +
12503 +#define VCMD_set_space_v0      VC_CMD(PROCALT, 3, 0)
12504 +#define VCMD_set_space_v1      VC_CMD(PROCALT, 3, 1)
12505 +#define VCMD_set_space         VC_CMD(PROCALT, 3, 2)
12506 +
12507 +#define VCMD_get_space_mask_v0 VC_CMD(PROCALT, 4, 0)
12508 +
12509 +#define VCMD_get_space_mask    VC_CMD(VSPACE, 0, 1)
12510 +#define VCMD_get_space_default VC_CMD(VSPACE, 1, 0)
12511 +
12512 +
12513 +struct vcmd_space_mask_v1 {
12514 +       uint64_t mask;
12515 +};
12516 +
12517 +struct vcmd_space_mask_v2 {
12518 +       uint64_t mask;
12519 +       uint32_t index;
12520 +};
12521 +
12522 +#endif /* _UAPI_VS_SPACE_CMD_H */
12523 diff -NurpP --minimal linux-4.9.135/include/uapi/vserver/switch.h linux-4.9.135-vs2.3.9.8/include/uapi/vserver/switch.h
12524 --- linux-4.9.135/include/uapi/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
12525 +++ linux-4.9.135-vs2.3.9.8/include/uapi/vserver/switch.h       2018-10-20 04:58:14.000000000 +0000
12526 @@ -0,0 +1,90 @@
12527 +#ifndef _UAPI_VS_SWITCH_H
12528 +#define _UAPI_VS_SWITCH_H
12529 +
12530 +#include <linux/types.h>
12531 +
12532 +
12533 +#define VC_CATEGORY(c)         (((c) >> 24) & 0x3F)
12534 +#define VC_COMMAND(c)          (((c) >> 16) & 0xFF)
12535 +#define VC_VERSION(c)          ((c) & 0xFFF)
12536 +
12537 +#define VC_CMD(c, i, v)                ((((VC_CAT_ ## c) & 0x3F) << 24) \
12538 +                               | (((i) & 0xFF) << 16) | ((v) & 0xFFF))
12539 +
12540 +/*
12541 +
12542 +  Syscall Matrix V2.8
12543 +
12544 +        |VERSION|CREATE |MODIFY |MIGRATE|CONTROL|EXPERIM| |SPECIAL|SPECIAL|
12545 +        |STATS  |DESTROY|ALTER  |CHANGE |LIMIT  |TEST   | |       |       |
12546 +        |INFO   |SETUP  |       |MOVE   |       |       | |       |       |
12547 +  -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
12548 +  SYSTEM |VERSION|VSETUP |VHOST  |       |       |       | |DEVICE |       |
12549 +  HOST   |     00|     01|     02|     03|     04|     05| |     06|     07|
12550 +  -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
12551 +  CPU    |       |VPROC  |PROCALT|PROCMIG|PROCTRL|       | |SCHED. |       |
12552 +  PROCESS|     08|     09|     10|     11|     12|     13| |     14|     15|
12553 +  -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
12554 +  MEMORY |       |       |       |       |MEMCTRL|       | |SWAP   |       |
12555 +        |     16|     17|     18|     19|     20|     21| |     22|     23|
12556 +  -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
12557 +  NETWORK|       |VNET   |NETALT |NETMIG |NETCTL |       | |SERIAL |       |
12558 +        |     24|     25|     26|     27|     28|     29| |     30|     31|
12559 +  -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
12560 +  DISK   |       |       |       |TAGMIG |DLIMIT |       | |INODE  |       |
12561 +  VFS    |     32|     33|     34|     35|     36|     37| |     38|     39|
12562 +  -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
12563 +  OTHER  |VSTAT  |       |       |       |       |       | |VINFO  |       |
12564 +        |     40|     41|     42|     43|     44|     45| |     46|     47|
12565 +  =======+=======+=======+=======+=======+=======+=======+ +=======+=======+
12566 +  SPECIAL|EVENT  |       |       |       |FLAGS  |       | |VSPACE |       |
12567 +        |     48|     49|     50|     51|     52|     53| |     54|     55|
12568 +  -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
12569 +  SPECIAL|DEBUG  |       |       |       |RLIMIT |SYSCALL| |       |COMPAT |
12570 +        |     56|     57|     58|     59|     60|TEST 61| |     62|     63|
12571 +  -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
12572 +
12573 +*/
12574 +
12575 +#define VC_CAT_VERSION         0
12576 +
12577 +#define VC_CAT_VSETUP          1
12578 +#define VC_CAT_VHOST           2
12579 +
12580 +#define VC_CAT_DEVICE          6
12581 +
12582 +#define VC_CAT_VPROC           9
12583 +#define VC_CAT_PROCALT         10
12584 +#define VC_CAT_PROCMIG         11
12585 +#define VC_CAT_PROCTRL         12
12586 +
12587 +#define VC_CAT_SCHED           14
12588 +#define VC_CAT_MEMCTRL         20
12589 +
12590 +#define VC_CAT_VNET            25
12591 +#define VC_CAT_NETALT          26
12592 +#define VC_CAT_NETMIG          27
12593 +#define VC_CAT_NETCTRL         28
12594 +
12595 +#define VC_CAT_TAGMIG          35
12596 +#define VC_CAT_DLIMIT          36
12597 +#define VC_CAT_INODE           38
12598 +
12599 +#define VC_CAT_VSTAT           40
12600 +#define VC_CAT_VINFO           46
12601 +#define VC_CAT_EVENT           48
12602 +
12603 +#define VC_CAT_FLAGS           52
12604 +#define VC_CAT_VSPACE          54
12605 +#define VC_CAT_DEBUG           56
12606 +#define VC_CAT_RLIMIT          60
12607 +
12608 +#define VC_CAT_SYSTEST         61
12609 +#define VC_CAT_COMPAT          63
12610 +
12611 +/*  query version */
12612 +
12613 +#define VCMD_get_version       VC_CMD(VERSION, 0, 0)
12614 +#define VCMD_get_vci           VC_CMD(VERSION, 1, 0)
12615 +
12616 +#endif /* _UAPI_VS_SWITCH_H */
12617 diff -NurpP --minimal linux-4.9.135/include/uapi/vserver/tag_cmd.h linux-4.9.135-vs2.3.9.8/include/uapi/vserver/tag_cmd.h
12618 --- linux-4.9.135/include/uapi/vserver/tag_cmd.h        1970-01-01 00:00:00.000000000 +0000
12619 +++ linux-4.9.135-vs2.3.9.8/include/uapi/vserver/tag_cmd.h      2018-10-20 04:58:14.000000000 +0000
12620 @@ -0,0 +1,14 @@
12621 +#ifndef _UAPI_VS_TAG_CMD_H
12622 +#define _UAPI_VS_TAG_CMD_H
12623 +
12624 +
12625 +/* vinfo commands */
12626 +
12627 +#define VCMD_task_tag          VC_CMD(VINFO, 3, 0)
12628 +
12629 +
12630 +/* context commands */
12631 +
12632 +#define VCMD_tag_migrate       VC_CMD(TAGMIG, 1, 0)
12633 +
12634 +#endif /* _UAPI_VS_TAG_CMD_H */
12635 diff -NurpP --minimal linux-4.9.135/init/Kconfig linux-4.9.135-vs2.3.9.8/init/Kconfig
12636 --- linux-4.9.135/init/Kconfig  2018-10-20 10:39:20.000000000 +0000
12637 +++ linux-4.9.135-vs2.3.9.8/init/Kconfig        2018-10-20 04:58:14.000000000 +0000
12638 @@ -958,6 +958,7 @@ config NUMA_BALANCING_DEFAULT_ENABLED
12639  menuconfig CGROUPS
12640         bool "Control Group support"
12641         select KERNFS
12642 +       default y
12643         help
12644           This option adds support for grouping sets of processes together, for
12645           use with process control subsystems such as Cpusets, CFS, memory
12646 diff -NurpP --minimal linux-4.9.135/init/main.c linux-4.9.135-vs2.3.9.8/init/main.c
12647 --- linux-4.9.135/init/main.c   2018-10-20 10:39:20.000000000 +0000
12648 +++ linux-4.9.135-vs2.3.9.8/init/main.c 2018-10-20 05:55:43.000000000 +0000
12649 @@ -82,6 +82,7 @@
12650  #include <linux/io.h>
12651  #include <linux/kaiser.h>
12652  #include <linux/cache.h>
12653 +#include <linux/vserver/percpu.h>
12654
12655  #include <asm/io.h>
12656  #include <asm/bugs.h>
12657 diff -NurpP --minimal linux-4.9.135/ipc/mqueue.c linux-4.9.135-vs2.3.9.8/ipc/mqueue.c
12658 --- linux-4.9.135/ipc/mqueue.c  2018-10-20 10:39:20.000000000 +0000
12659 +++ linux-4.9.135-vs2.3.9.8/ipc/mqueue.c        2018-10-20 04:58:14.000000000 +0000
12660 @@ -35,6 +35,8 @@
12661  #include <linux/ipc_namespace.h>
12662  #include <linux/user_namespace.h>
12663  #include <linux/slab.h>
12664 +#include <linux/vs_context.h>
12665 +#include <linux/vs_limit.h>
12666
12667  #include <net/sock.h>
12668  #include "util.h"
12669 @@ -75,6 +77,7 @@ struct mqueue_inode_info {
12670         struct pid *notify_owner;
12671         struct user_namespace *notify_user_ns;
12672         struct user_struct *user;       /* user who created, for accounting */
12673 +       struct vx_info *vxi;
12674         struct sock *notify_sock;
12675         struct sk_buff *notify_cookie;
12676
12677 @@ -230,6 +233,7 @@ static struct inode *mqueue_get_inode(st
12678         if (S_ISREG(mode)) {
12679                 struct mqueue_inode_info *info;
12680                 unsigned long mq_bytes, mq_treesize;
12681 +               struct vx_info *vxi = current_vx_info();
12682
12683                 inode->i_fop = &mqueue_file_operations;
12684                 inode->i_size = FILENT_SIZE;
12685 @@ -243,6 +247,7 @@ static struct inode *mqueue_get_inode(st
12686                 info->notify_user_ns = NULL;
12687                 info->qsize = 0;
12688                 info->user = NULL;      /* set when all is ok */
12689 +               info->vxi = NULL;
12690                 info->msg_tree = RB_ROOT;
12691                 info->node_cache = NULL;
12692                 memset(&info->attr, 0, sizeof(info->attr));
12693 @@ -276,17 +281,20 @@ static struct inode *mqueue_get_inode(st
12694
12695                 spin_lock(&mq_lock);
12696                 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
12697 -                   u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE)) {
12698 +                   u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE) ||
12699 +                   !vx_ipcmsg_avail(vxi, mq_bytes)) {
12700                         spin_unlock(&mq_lock);
12701                         /* mqueue_evict_inode() releases info->messages */
12702                         ret = -EMFILE;
12703                         goto out_inode;
12704                 }
12705                 u->mq_bytes += mq_bytes;
12706 +               vx_ipcmsg_add(vxi, u, mq_bytes);
12707                 spin_unlock(&mq_lock);
12708
12709                 /* all is ok */
12710                 info->user = get_uid(u);
12711 +               info->vxi = get_vx_info(vxi);
12712         } else if (S_ISDIR(mode)) {
12713                 inc_nlink(inode);
12714                 /* Some things misbehave if size == 0 on a directory */
12715 @@ -396,8 +404,11 @@ static void mqueue_evict_inode(struct in
12716
12717         user = info->user;
12718         if (user) {
12719 +               struct vx_info *vxi = info->vxi;
12720 +
12721                 spin_lock(&mq_lock);
12722                 user->mq_bytes -= mq_bytes;
12723 +               vx_ipcmsg_sub(vxi, user, mq_bytes);
12724                 /*
12725                  * get_ns_from_inode() ensures that the
12726                  * (ipc_ns = sb->s_fs_info) is either a valid ipc_ns
12727 @@ -407,6 +418,7 @@ static void mqueue_evict_inode(struct in
12728                 if (ipc_ns)
12729                         ipc_ns->mq_queues_count--;
12730                 spin_unlock(&mq_lock);
12731 +               put_vx_info(vxi);
12732                 free_uid(user);
12733         }
12734         if (ipc_ns)
12735 diff -NurpP --minimal linux-4.9.135/ipc/msg.c linux-4.9.135-vs2.3.9.8/ipc/msg.c
12736 --- linux-4.9.135/ipc/msg.c     2018-10-20 10:39:20.000000000 +0000
12737 +++ linux-4.9.135-vs2.3.9.8/ipc/msg.c   2018-10-20 04:58:14.000000000 +0000
12738 @@ -37,6 +37,7 @@
12739  #include <linux/rwsem.h>
12740  #include <linux/nsproxy.h>
12741  #include <linux/ipc_namespace.h>
12742 +#include <linux/vs_base.h>
12743
12744  #include <asm/current.h>
12745  #include <linux/uaccess.h>
12746 @@ -124,6 +125,7 @@ static int newque(struct ipc_namespace *
12747
12748         msq->q_perm.mode = msgflg & S_IRWXUGO;
12749         msq->q_perm.key = key;
12750 +       msq->q_perm.xid = vx_current_xid();
12751
12752         msq->q_perm.security = NULL;
12753         retval = security_msg_queue_alloc(msq);
12754 diff -NurpP --minimal linux-4.9.135/ipc/namespace.c linux-4.9.135-vs2.3.9.8/ipc/namespace.c
12755 --- linux-4.9.135/ipc/namespace.c       2016-12-11 19:17:54.000000000 +0000
12756 +++ linux-4.9.135-vs2.3.9.8/ipc/namespace.c     2018-10-20 04:58:14.000000000 +0000
12757 @@ -13,6 +13,7 @@
12758  #include <linux/mount.h>
12759  #include <linux/user_namespace.h>
12760  #include <linux/proc_ns.h>
12761 +#include <linux/vserver/global.h>
12762
12763  #include "util.h"
12764
12765 @@ -59,6 +60,7 @@ static struct ipc_namespace *create_ipc_
12766         sem_init_ns(ns);
12767         msg_init_ns(ns);
12768         shm_init_ns(ns);
12769 +       atomic_inc(&vs_global_ipc_ns);
12770
12771         return ns;
12772
12773 @@ -121,6 +123,7 @@ static void free_ipc_ns(struct ipc_names
12774         dec_ipc_namespaces(ns->ucounts);
12775         put_user_ns(ns->user_ns);
12776         ns_free_inum(&ns->ns);
12777 +       atomic_dec(&vs_global_ipc_ns);
12778         kfree(ns);
12779  }
12780
12781 diff -NurpP --minimal linux-4.9.135/ipc/sem.c linux-4.9.135-vs2.3.9.8/ipc/sem.c
12782 --- linux-4.9.135/ipc/sem.c     2016-12-11 19:17:54.000000000 +0000
12783 +++ linux-4.9.135-vs2.3.9.8/ipc/sem.c   2018-10-20 04:58:14.000000000 +0000
12784 @@ -85,6 +85,8 @@
12785  #include <linux/rwsem.h>
12786  #include <linux/nsproxy.h>
12787  #include <linux/ipc_namespace.h>
12788 +#include <linux/vs_base.h>
12789 +#include <linux/vs_limit.h>
12790
12791  #include <linux/uaccess.h>
12792  #include "util.h"
12793 @@ -537,6 +539,7 @@ static int newary(struct ipc_namespace *
12794
12795         sma->sem_perm.mode = (semflg & S_IRWXUGO);
12796         sma->sem_perm.key = key;
12797 +       sma->sem_perm.xid = vx_current_xid();
12798
12799         sma->sem_perm.security = NULL;
12800         retval = security_sem_alloc(sma);
12801 @@ -567,6 +570,9 @@ static int newary(struct ipc_namespace *
12802                 return id;
12803         }
12804         ns->used_sems += nsems;
12805 +       /* FIXME: obsoleted? */
12806 +       vx_semary_inc(sma);
12807 +       vx_nsems_add(sma, nsems);
12808
12809         sem_unlock(sma, -1);
12810         rcu_read_unlock();
12811 @@ -1155,6 +1161,9 @@ static void freeary(struct ipc_namespace
12812
12813         wake_up_sem_queue_do(&tasks);
12814         ns->used_sems -= sma->sem_nsems;
12815 +       /* FIXME: obsoleted? */
12816 +       vx_nsems_sub(sma, sma->sem_nsems);
12817 +       vx_semary_dec(sma);
12818         ipc_rcu_putref(sma, sem_rcu_free);
12819  }
12820
12821 diff -NurpP --minimal linux-4.9.135/ipc/shm.c linux-4.9.135-vs2.3.9.8/ipc/shm.c
12822 --- linux-4.9.135/ipc/shm.c     2018-10-20 10:39:20.000000000 +0000
12823 +++ linux-4.9.135-vs2.3.9.8/ipc/shm.c   2018-10-20 04:58:14.000000000 +0000
12824 @@ -42,6 +42,8 @@
12825  #include <linux/nsproxy.h>
12826  #include <linux/mount.h>
12827  #include <linux/ipc_namespace.h>
12828 +#include <linux/vs_context.h>
12829 +#include <linux/vs_limit.h>
12830
12831  #include <linux/uaccess.h>
12832
12833 @@ -234,10 +236,14 @@ static void shm_open(struct vm_area_stru
12834  static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp)
12835  {
12836         struct file *shm_file;
12837 +       struct vx_info *vxi = lookup_vx_info(shp->shm_perm.xid);
12838 +       int numpages = (shp->shm_segsz + PAGE_SIZE - 1) >> PAGE_SHIFT;
12839
12840         shm_file = shp->shm_file;
12841         shp->shm_file = NULL;
12842 -       ns->shm_tot -= (shp->shm_segsz + PAGE_SIZE - 1) >> PAGE_SHIFT;
12843 +       vx_ipcshm_sub(vxi, shp, numpages);
12844 +       ns->shm_tot -= numpages;
12845 +
12846         shm_rmid(ns, shp);
12847         shm_unlock(shp);
12848         if (!is_file_hugepages(shm_file))
12849 @@ -246,6 +252,7 @@ static void shm_destroy(struct ipc_names
12850                 user_shm_unlock(i_size_read(file_inode(shm_file)),
12851                                 shp->mlock_user);
12852         fput(shm_file);
12853 +       put_vx_info(vxi);
12854         ipc_rcu_putref(shp, shm_rcu_free);
12855  }
12856
12857 @@ -559,11 +566,15 @@ static int newseg(struct ipc_namespace *
12858                         ns->shm_tot + numpages > ns->shm_ctlall)
12859                 return -ENOSPC;
12860
12861 +       if (!vx_ipcshm_avail(current_vx_info(), numpages))
12862 +               return -ENOSPC;
12863 +
12864         shp = ipc_rcu_alloc(sizeof(*shp));
12865         if (!shp)
12866                 return -ENOMEM;
12867
12868         shp->shm_perm.key = key;
12869 +       shp->shm_perm.xid = vx_current_xid();
12870         shp->shm_perm.mode = (shmflg & S_IRWXUGO);
12871         shp->mlock_user = NULL;
12872
12873 @@ -634,6 +645,7 @@ static int newseg(struct ipc_namespace *
12874
12875         ipc_unlock_object(&shp->shm_perm);
12876         rcu_read_unlock();
12877 +       vx_ipcshm_add(current_vx_info(), key, numpages);
12878         return error;
12879
12880  no_id:
12881 diff -NurpP --minimal linux-4.9.135/kernel/Makefile linux-4.9.135-vs2.3.9.8/kernel/Makefile
12882 --- linux-4.9.135/kernel/Makefile       2018-10-20 10:39:20.000000000 +0000
12883 +++ linux-4.9.135-vs2.3.9.8/kernel/Makefile     2018-10-20 04:58:14.000000000 +0000
12884 @@ -39,6 +39,7 @@ obj-y += printk/
12885  obj-y += irq/
12886  obj-y += rcu/
12887  obj-y += livepatch/
12888 +obj-y += vserver/
12889
12890  obj-$(CONFIG_CHECKPOINT_RESTORE) += kcmp.o
12891  obj-$(CONFIG_FREEZER) += freezer.o
12892 diff -NurpP --minimal linux-4.9.135/kernel/auditsc.c linux-4.9.135-vs2.3.9.8/kernel/auditsc.c
12893 --- linux-4.9.135/kernel/auditsc.c      2018-10-20 10:39:21.000000000 +0000
12894 +++ linux-4.9.135-vs2.3.9.8/kernel/auditsc.c    2018-10-20 05:55:43.000000000 +0000
12895 @@ -1967,7 +1967,7 @@ static int audit_set_loginuid_perm(kuid_
12896         if (is_audit_feature_set(AUDIT_FEATURE_LOGINUID_IMMUTABLE))
12897                 return -EPERM;
12898         /* it is set, you need permission */
12899 -       if (!capable(CAP_AUDIT_CONTROL))
12900 +       if (!vx_capable(CAP_AUDIT_CONTROL, VXC_AUDIT_CONTROL))
12901                 return -EPERM;
12902         /* reject if this is not an unset and we don't allow that */
12903         if (is_audit_feature_set(AUDIT_FEATURE_ONLY_UNSET_LOGINUID) && uid_valid(loginuid))
12904 diff -NurpP --minimal linux-4.9.135/kernel/capability.c linux-4.9.135-vs2.3.9.8/kernel/capability.c
12905 --- linux-4.9.135/kernel/capability.c   2018-10-20 10:39:21.000000000 +0000
12906 +++ linux-4.9.135-vs2.3.9.8/kernel/capability.c 2018-10-20 04:58:14.000000000 +0000
12907 @@ -17,6 +17,7 @@
12908  #include <linux/syscalls.h>
12909  #include <linux/pid_namespace.h>
12910  #include <linux/user_namespace.h>
12911 +#include <linux/vs_context.h>
12912  #include <asm/uaccess.h>
12913
12914  /*
12915 @@ -107,6 +108,7 @@ static int cap_validate_magic(cap_user_h
12916         return 0;
12917  }
12918
12919 +
12920  /*
12921   * The only thing that can change the capabilities of the current
12922   * process is the current process. As such, we can't be in this code
12923 @@ -344,6 +346,8 @@ bool has_ns_capability_noaudit(struct ta
12924         return (ret == 0);
12925  }
12926
12927 +#include <linux/vserver/base.h>
12928 +
12929  /**
12930   * has_capability_noaudit - Does a task have a capability (unaudited) in the
12931   * initial user ns
12932 diff -NurpP --minimal linux-4.9.135/kernel/compat.c linux-4.9.135-vs2.3.9.8/kernel/compat.c
12933 --- linux-4.9.135/kernel/compat.c       2016-12-11 19:17:54.000000000 +0000
12934 +++ linux-4.9.135-vs2.3.9.8/kernel/compat.c     2018-10-20 04:58:14.000000000 +0000
12935 @@ -27,6 +27,7 @@
12936  #include <linux/times.h>
12937  #include <linux/ptrace.h>
12938  #include <linux/gfp.h>
12939 +#include <linux/vs_time.h>
12940
12941  #include <asm/uaccess.h>
12942
12943 @@ -1059,7 +1060,7 @@ COMPAT_SYSCALL_DEFINE1(stime, compat_tim
12944         if (err)
12945                 return err;
12946
12947 -       do_settimeofday(&tv);
12948 +       vx_settimeofday(&tv);
12949         return 0;
12950  }
12951
12952 diff -NurpP --minimal linux-4.9.135/kernel/cred.c linux-4.9.135-vs2.3.9.8/kernel/cred.c
12953 --- linux-4.9.135/kernel/cred.c 2016-12-11 19:17:54.000000000 +0000
12954 +++ linux-4.9.135-vs2.3.9.8/kernel/cred.c       2018-10-20 04:58:14.000000000 +0000
12955 @@ -64,31 +64,6 @@ struct cred init_cred = {
12956         .group_info             = &init_groups,
12957  };
12958
12959 -static inline void set_cred_subscribers(struct cred *cred, int n)
12960 -{
12961 -#ifdef CONFIG_DEBUG_CREDENTIALS
12962 -       atomic_set(&cred->subscribers, n);
12963 -#endif
12964 -}
12965 -
12966 -static inline int read_cred_subscribers(const struct cred *cred)
12967 -{
12968 -#ifdef CONFIG_DEBUG_CREDENTIALS
12969 -       return atomic_read(&cred->subscribers);
12970 -#else
12971 -       return 0;
12972 -#endif
12973 -}
12974 -
12975 -static inline void alter_cred_subscribers(const struct cred *_cred, int n)
12976 -{
12977 -#ifdef CONFIG_DEBUG_CREDENTIALS
12978 -       struct cred *cred = (struct cred *) _cred;
12979 -
12980 -       atomic_add(n, &cred->subscribers);
12981 -#endif
12982 -}
12983 -
12984  /*
12985   * The RCU callback to actually dispose of a set of credentials
12986   */
12987 @@ -240,21 +215,16 @@ error:
12988   *
12989   * Call commit_creds() or abort_creds() to clean up.
12990   */
12991 -struct cred *prepare_creds(void)
12992 +struct cred *__prepare_creds(const struct cred *old)
12993  {
12994 -       struct task_struct *task = current;
12995 -       const struct cred *old;
12996         struct cred *new;
12997
12998 -       validate_process_creds();
12999 -
13000         new = kmem_cache_alloc(cred_jar, GFP_KERNEL);
13001         if (!new)
13002                 return NULL;
13003
13004         kdebug("prepare_creds() alloc %p", new);
13005
13006 -       old = task->cred;
13007         memcpy(new, old, sizeof(struct cred));
13008
13009         atomic_set(&new->usage, 1);
13010 @@ -283,6 +253,13 @@ error:
13011         abort_creds(new);
13012         return NULL;
13013  }
13014 +
13015 +struct cred *prepare_creds(void)
13016 +{
13017 +       validate_process_creds();
13018 +
13019 +       return __prepare_creds(current->cred);
13020 +}
13021  EXPORT_SYMBOL(prepare_creds);
13022
13023  /*
13024 diff -NurpP --minimal linux-4.9.135/kernel/exit.c linux-4.9.135-vs2.3.9.8/kernel/exit.c
13025 --- linux-4.9.135/kernel/exit.c 2018-10-20 10:39:21.000000000 +0000
13026 +++ linux-4.9.135-vs2.3.9.8/kernel/exit.c       2018-10-20 04:58:14.000000000 +0000
13027 @@ -48,6 +48,10 @@
13028  #include <linux/fs_struct.h>
13029  #include <linux/init_task.h>
13030  #include <linux/perf_event.h>
13031 +#include <linux/vs_limit.h>
13032 +#include <linux/vs_context.h>
13033 +#include <linux/vs_network.h>
13034 +#include <linux/vs_pid.h>
13035  #include <trace/events/sched.h>
13036  #include <linux/hw_breakpoint.h>
13037  #include <linux/oom.h>
13038 @@ -531,14 +535,24 @@ static struct task_struct *find_child_re
13039         struct pid_namespace *pid_ns = task_active_pid_ns(father);
13040         struct task_struct *reaper = pid_ns->child_reaper;
13041         struct task_struct *p, *n;
13042 +       struct vx_info *vxi = task_get_vx_info(father);
13043 +
13044 +       if (vxi) {
13045 +               BUG_ON(!vxi->vx_reaper);
13046 +               if (vxi->vx_reaper != init_pid_ns.child_reaper &&
13047 +                   vxi->vx_reaper != father) {
13048 +                       reaper = vxi->vx_reaper;
13049 +                       goto out_put;
13050 +               }
13051 +       }
13052
13053         if (likely(reaper != father))
13054 -               return reaper;
13055 +               goto out_put;
13056
13057         reaper = find_alive_thread(father);
13058         if (reaper) {
13059                 pid_ns->child_reaper = reaper;
13060 -               return reaper;
13061 +               goto out_put;
13062         }
13063
13064         write_unlock_irq(&tasklist_lock);
13065 @@ -549,7 +563,10 @@ static struct task_struct *find_child_re
13066         zap_pid_ns_processes(pid_ns);
13067         write_lock_irq(&tasklist_lock);
13068
13069 -       return father;
13070 +       reaper = father;
13071 +out_put:
13072 +       put_vx_info(vxi);
13073 +       return reaper;
13074  }
13075
13076  /*
13077 @@ -637,9 +654,13 @@ static void forget_original_parent(struc
13078                 return;
13079
13080         reaper = find_new_reaper(father, reaper);
13081 -       list_for_each_entry(p, &father->children, sibling) {
13082 +       for (p = list_first_entry(&father->children, struct task_struct, sibling);
13083 +            &p->sibling != &father->children; ) {
13084 +               struct task_struct *next, *this_reaper = reaper;
13085 +               if (p == reaper)
13086 +                       this_reaper = task_active_pid_ns(reaper)->child_reaper;
13087                 for_each_thread(p, t) {
13088 -                       t->real_parent = reaper;
13089 +                       t->real_parent = this_reaper;
13090                         BUG_ON((!t->ptrace) != (t->parent == father));
13091                         if (likely(!t->ptrace))
13092                                 t->parent = t->real_parent;
13093 @@ -651,10 +672,13 @@ static void forget_original_parent(struc
13094                  * If this is a threaded reparent there is no need to
13095                  * notify anyone anything has happened.
13096                  */
13097 -               if (!same_thread_group(reaper, father))
13098 +               if (!same_thread_group(this_reaper, father))
13099                         reparent_leader(father, p, dead);
13100 +               next = list_next_entry(p, sibling);
13101 +               list_add(&p->sibling, &this_reaper->children);
13102 +               p = next;
13103         }
13104 -       list_splice_tail_init(&father->children, &reaper->children);
13105 +       INIT_LIST_HEAD(&father->children);
13106  }
13107
13108  /*
13109 @@ -844,6 +868,9 @@ void __noreturn do_exit(long code)
13110          */
13111         flush_ptrace_hw_breakpoint(tsk);
13112
13113 +       /* needs to stay before exit_notify() */
13114 +       exit_vx_info_early(tsk, code);
13115 +
13116         TASKS_RCU(preempt_disable());
13117         TASKS_RCU(tasks_rcu_i = __srcu_read_lock(&tasks_rcu_exit_srcu));
13118         TASKS_RCU(preempt_enable());
13119 @@ -876,6 +903,10 @@ void __noreturn do_exit(long code)
13120
13121         validate_creds_for_do_exit(tsk);
13122
13123 +       /* needs to stay after exit_notify() and before preempt_disable() */
13124 +       exit_vx_info(tsk, code);
13125 +       exit_nx_info(tsk);
13126 +
13127         check_stack_usage();
13128         preempt_disable();
13129         if (tsk->nr_dirtied)
13130 diff -NurpP --minimal linux-4.9.135/kernel/fork.c linux-4.9.135-vs2.3.9.8/kernel/fork.c
13131 --- linux-4.9.135/kernel/fork.c 2018-10-20 10:39:21.000000000 +0000
13132 +++ linux-4.9.135-vs2.3.9.8/kernel/fork.c       2018-10-20 05:55:43.000000000 +0000
13133 @@ -77,6 +77,9 @@
13134  #include <linux/compiler.h>
13135  #include <linux/sysctl.h>
13136  #include <linux/kcov.h>
13137 +#include <linux/vs_context.h>
13138 +#include <linux/vs_network.h>
13139 +#include <linux/vs_limit.h>
13140
13141  #include <asm/pgtable.h>
13142  #include <asm/pgalloc.h>
13143 @@ -356,6 +359,8 @@ void free_task(struct task_struct *tsk)
13144         WARN_ON_ONCE(atomic_read(&tsk->stack_refcount) != 0);
13145  #endif
13146         rt_mutex_debug_task_free(tsk);
13147 +       clr_vx_info(&tsk->vx_info);
13148 +       clr_nx_info(&tsk->nx_info);
13149         ftrace_graph_exit_task(tsk);
13150         put_seccomp_filter(tsk);
13151         arch_release_task_struct(tsk);
13152 @@ -1480,6 +1485,8 @@ static __latent_entropy struct task_stru
13153  {
13154         int retval;
13155         struct task_struct *p;
13156 +       struct vx_info *vxi;
13157 +       struct nx_info *nxi;
13158
13159         if ((clone_flags & (CLONE_NEWNS|CLONE_FS)) == (CLONE_NEWNS|CLONE_FS))
13160                 return ERR_PTR(-EINVAL);
13161 @@ -1552,7 +1559,12 @@ static __latent_entropy struct task_stru
13162         DEBUG_LOCKS_WARN_ON(!p->hardirqs_enabled);
13163         DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
13164  #endif
13165 +       init_vx_info(&p->vx_info, current_vx_info());
13166 +       init_nx_info(&p->nx_info, current_nx_info());
13167 +
13168         retval = -EAGAIN;
13169 +       if (!vx_nproc_avail(1))
13170 +               goto bad_fork_free;
13171         if (atomic_read(&p->real_cred->user->processes) >=
13172                         task_rlimit(p, RLIMIT_NPROC)) {
13173                 if (p->real_cred->user != INIT_USER &&
13174 @@ -1844,6 +1856,18 @@ static __latent_entropy struct task_stru
13175         total_forks++;
13176         spin_unlock(&current->sighand->siglock);
13177         syscall_tracepoint_update(p);
13178 +
13179 +       /* p is copy of current */
13180 +       vxi = p->vx_info;
13181 +       if (vxi) {
13182 +               claim_vx_info(vxi, p);
13183 +               atomic_inc(&vxi->cvirt.nr_threads);
13184 +               atomic_inc(&vxi->cvirt.total_forks);
13185 +               vx_nproc_inc(p);
13186 +       }
13187 +       nxi = p->nx_info;
13188 +       if (nxi)
13189 +               claim_nx_info(nxi, p);
13190         write_unlock_irq(&tasklist_lock);
13191
13192         proc_fork_connector(p);
13193 diff -NurpP --minimal linux-4.9.135/kernel/kthread.c linux-4.9.135-vs2.3.9.8/kernel/kthread.c
13194 --- linux-4.9.135/kernel/kthread.c      2018-10-20 10:39:21.000000000 +0000
13195 +++ linux-4.9.135-vs2.3.9.8/kernel/kthread.c    2018-10-20 05:55:43.000000000 +0000
13196 @@ -19,6 +19,7 @@
13197  #include <linux/ptrace.h>
13198  #include <linux/uaccess.h>
13199  #include <linux/cgroup.h>
13200 +#include <linux/vs_pid.h>
13201  #include <trace/events/sched.h>
13202
13203  static DEFINE_SPINLOCK(kthread_create_lock);
13204 diff -NurpP --minimal linux-4.9.135/kernel/nsproxy.c linux-4.9.135-vs2.3.9.8/kernel/nsproxy.c
13205 --- linux-4.9.135/kernel/nsproxy.c      2016-12-11 19:17:54.000000000 +0000
13206 +++ linux-4.9.135-vs2.3.9.8/kernel/nsproxy.c    2018-10-20 04:58:14.000000000 +0000
13207 @@ -20,12 +20,15 @@
13208  #include <linux/mnt_namespace.h>
13209  #include <linux/utsname.h>
13210  #include <linux/pid_namespace.h>
13211 +#include <linux/vserver/global.h>
13212 +#include <linux/vserver/debug.h>
13213  #include <net/net_namespace.h>
13214  #include <linux/ipc_namespace.h>
13215  #include <linux/proc_ns.h>
13216  #include <linux/file.h>
13217  #include <linux/syscalls.h>
13218  #include <linux/cgroup.h>
13219 +#include "../fs/mount.h"
13220
13221  static struct kmem_cache *nsproxy_cachep;
13222
13223 @@ -50,8 +53,11 @@ static inline struct nsproxy *create_nsp
13224         struct nsproxy *nsproxy;
13225
13226         nsproxy = kmem_cache_alloc(nsproxy_cachep, GFP_KERNEL);
13227 -       if (nsproxy)
13228 +       if (nsproxy) {
13229                 atomic_set(&nsproxy->count, 1);
13230 +               atomic_inc(&vs_global_nsproxy);
13231 +       }
13232 +       vxdprintk(VXD_CBIT(space, 2), "create_nsproxy = %p[1]", nsproxy);
13233         return nsproxy;
13234  }
13235
13236 @@ -60,9 +66,12 @@ static inline struct nsproxy *create_nsp
13237   * Return the newly created nsproxy.  Do not attach this to the task,
13238   * leave it to the caller to do proper locking and attach it to task.
13239   */
13240 -static struct nsproxy *create_new_namespaces(unsigned long flags,
13241 -       struct task_struct *tsk, struct user_namespace *user_ns,
13242 -       struct fs_struct *new_fs)
13243 +static struct nsproxy *unshare_namespaces(
13244 +       unsigned long flags,
13245 +       struct nsproxy *orig,
13246 +       struct fs_struct *new_fs,
13247 +       struct user_namespace *new_user,
13248 +       struct pid_namespace *new_pid)
13249  {
13250         struct nsproxy *new_nsp;
13251         int err;
13252 @@ -71,39 +80,37 @@ static struct nsproxy *create_new_namesp
13253         if (!new_nsp)
13254                 return ERR_PTR(-ENOMEM);
13255
13256 -       new_nsp->mnt_ns = copy_mnt_ns(flags, tsk->nsproxy->mnt_ns, user_ns, new_fs);
13257 +       new_nsp->mnt_ns = copy_mnt_ns(flags, orig->mnt_ns, new_user, new_fs);
13258         if (IS_ERR(new_nsp->mnt_ns)) {
13259                 err = PTR_ERR(new_nsp->mnt_ns);
13260                 goto out_ns;
13261         }
13262
13263 -       new_nsp->uts_ns = copy_utsname(flags, user_ns, tsk->nsproxy->uts_ns);
13264 +       new_nsp->uts_ns = copy_utsname(flags, new_user, orig->uts_ns);
13265         if (IS_ERR(new_nsp->uts_ns)) {
13266                 err = PTR_ERR(new_nsp->uts_ns);
13267                 goto out_uts;
13268         }
13269
13270 -       new_nsp->ipc_ns = copy_ipcs(flags, user_ns, tsk->nsproxy->ipc_ns);
13271 +       new_nsp->ipc_ns = copy_ipcs(flags, new_user, orig->ipc_ns);
13272         if (IS_ERR(new_nsp->ipc_ns)) {
13273                 err = PTR_ERR(new_nsp->ipc_ns);
13274                 goto out_ipc;
13275         }
13276
13277 -       new_nsp->pid_ns_for_children =
13278 -               copy_pid_ns(flags, user_ns, tsk->nsproxy->pid_ns_for_children);
13279 +       new_nsp->pid_ns_for_children = copy_pid_ns(flags, new_user, new_pid);
13280         if (IS_ERR(new_nsp->pid_ns_for_children)) {
13281                 err = PTR_ERR(new_nsp->pid_ns_for_children);
13282                 goto out_pid;
13283         }
13284
13285 -       new_nsp->cgroup_ns = copy_cgroup_ns(flags, user_ns,
13286 -                                           tsk->nsproxy->cgroup_ns);
13287 +       new_nsp->cgroup_ns = copy_cgroup_ns(flags, new_user, orig->cgroup_ns);
13288         if (IS_ERR(new_nsp->cgroup_ns)) {
13289                 err = PTR_ERR(new_nsp->cgroup_ns);
13290                 goto out_cgroup;
13291         }
13292
13293 -       new_nsp->net_ns = copy_net_ns(flags, user_ns, tsk->nsproxy->net_ns);
13294 +       new_nsp->net_ns = copy_net_ns(flags, new_user, orig->net_ns);
13295         if (IS_ERR(new_nsp->net_ns)) {
13296                 err = PTR_ERR(new_nsp->net_ns);
13297                 goto out_net;
13298 @@ -130,6 +137,43 @@ out_ns:
13299         return ERR_PTR(err);
13300  }
13301
13302 +static struct nsproxy *create_new_namespaces(unsigned long flags,
13303 +       struct task_struct *tsk, struct user_namespace *user_ns,
13304 +       struct fs_struct *new_fs)
13305 +
13306 +{
13307 +       return unshare_namespaces(flags, tsk->nsproxy,
13308 +               new_fs, user_ns, task_active_pid_ns(tsk));
13309 +}
13310 +
13311 +/*
13312 + * copies the nsproxy, setting refcount to 1, and grabbing a
13313 + * reference to all contained namespaces.
13314 + */
13315 +struct nsproxy *copy_nsproxy(struct nsproxy *orig)
13316 +{
13317 +       struct nsproxy *ns = create_nsproxy();
13318 +
13319 +       if (ns) {
13320 +               memcpy(ns, orig, sizeof(struct nsproxy));
13321 +               atomic_set(&ns->count, 1);
13322 +
13323 +               if (ns->mnt_ns)
13324 +                       get_mnt_ns(ns->mnt_ns);
13325 +               if (ns->uts_ns)
13326 +                       get_uts_ns(ns->uts_ns);
13327 +               if (ns->ipc_ns)
13328 +                       get_ipc_ns(ns->ipc_ns);
13329 +               if (ns->pid_ns_for_children)
13330 +                       get_pid_ns(ns->pid_ns_for_children);
13331 +               if (ns->net_ns)
13332 +                       get_net(ns->net_ns);
13333 +               if (ns->cgroup_ns)
13334 +                       get_cgroup_ns(ns->cgroup_ns);
13335 +       }
13336 +       return ns;
13337 +}
13338 +
13339  /*
13340   * called from clone.  This now handles copy for nsproxy and all
13341   * namespaces therein.
13342 @@ -138,7 +182,10 @@ int copy_namespaces(unsigned long flags,
13343  {
13344         struct nsproxy *old_ns = tsk->nsproxy;
13345         struct user_namespace *user_ns = task_cred_xxx(tsk, user_ns);
13346 -       struct nsproxy *new_ns;
13347 +       struct nsproxy *new_ns = NULL;
13348 +
13349 +       vxdprintk(VXD_CBIT(space, 7), "copy_namespaces(0x%08lx,%p[%p])",
13350 +               flags, tsk, old_ns);
13351
13352         if (likely(!(flags & (CLONE_NEWNS | CLONE_NEWUTS | CLONE_NEWIPC |
13353                               CLONE_NEWPID | CLONE_NEWNET |
13354 @@ -147,7 +194,7 @@ int copy_namespaces(unsigned long flags,
13355                 return 0;
13356         }
13357
13358 -       if (!ns_capable(user_ns, CAP_SYS_ADMIN))
13359 +       if (!vx_ns_can_unshare(user_ns, CAP_SYS_ADMIN, flags))
13360                 return -EPERM;
13361
13362         /*
13363 @@ -166,6 +213,9 @@ int copy_namespaces(unsigned long flags,
13364                 return  PTR_ERR(new_ns);
13365
13366         tsk->nsproxy = new_ns;
13367 +       vxdprintk(VXD_CBIT(space, 3),
13368 +               "copy_namespaces(0x%08lx,%p[%p]) = [%p]",
13369 +               flags, tsk, old_ns, new_ns);
13370         return 0;
13371  }
13372
13373 @@ -179,8 +229,10 @@ void free_nsproxy(struct nsproxy *ns)
13374                 put_ipc_ns(ns->ipc_ns);
13375         if (ns->pid_ns_for_children)
13376                 put_pid_ns(ns->pid_ns_for_children);
13377 +       if (ns->net_ns)
13378 +               put_net(ns->net_ns);
13379         put_cgroup_ns(ns->cgroup_ns);
13380 -       put_net(ns->net_ns);
13381 +       atomic_dec(&vs_global_nsproxy);
13382         kmem_cache_free(nsproxy_cachep, ns);
13383  }
13384
13385 @@ -194,12 +246,16 @@ int unshare_nsproxy_namespaces(unsigned
13386         struct user_namespace *user_ns;
13387         int err = 0;
13388
13389 +       vxdprintk(VXD_CBIT(space, 4),
13390 +               "unshare_nsproxy_namespaces(0x%08lx,[%p])",
13391 +               unshare_flags, current->nsproxy);
13392 +
13393         if (!(unshare_flags & (CLONE_NEWNS | CLONE_NEWUTS | CLONE_NEWIPC |
13394                                CLONE_NEWNET | CLONE_NEWPID | CLONE_NEWCGROUP)))
13395                 return 0;
13396
13397         user_ns = new_cred ? new_cred->user_ns : current_user_ns();
13398 -       if (!ns_capable(user_ns, CAP_SYS_ADMIN))
13399 +       if (!vx_ns_can_unshare(user_ns, CAP_SYS_ADMIN, unshare_flags))
13400                 return -EPERM;
13401
13402         *new_nsp = create_new_namespaces(unshare_flags, current, user_ns,
13403 diff -NurpP --minimal linux-4.9.135/kernel/pid.c linux-4.9.135-vs2.3.9.8/kernel/pid.c
13404 --- linux-4.9.135/kernel/pid.c  2018-10-20 10:39:21.000000000 +0000
13405 +++ linux-4.9.135-vs2.3.9.8/kernel/pid.c        2018-10-20 04:58:14.000000000 +0000
13406 @@ -38,6 +38,7 @@
13407  #include <linux/syscalls.h>
13408  #include <linux/proc_ns.h>
13409  #include <linux/proc_fs.h>
13410 +#include <linux/vs_pid.h>
13411
13412  #define pid_hashfn(nr, ns)     \
13413         hash_long((unsigned long)nr + (unsigned long)ns, pidhash_shift)
13414 @@ -381,7 +382,7 @@ EXPORT_SYMBOL_GPL(find_pid_ns);
13415
13416  struct pid *find_vpid(int nr)
13417  {
13418 -       return find_pid_ns(nr, task_active_pid_ns(current));
13419 +       return find_pid_ns(vx_rmap_pid(nr), task_active_pid_ns(current));
13420  }
13421  EXPORT_SYMBOL_GPL(find_vpid);
13422
13423 @@ -437,6 +438,9 @@ void transfer_pid(struct task_struct *ol
13424  struct task_struct *pid_task(struct pid *pid, enum pid_type type)
13425  {
13426         struct task_struct *result = NULL;
13427 +
13428 +       if (type == __PIDTYPE_REALPID)
13429 +               type = PIDTYPE_PID;
13430         if (pid) {
13431                 struct hlist_node *first;
13432                 first = rcu_dereference_check(hlist_first_rcu(&pid->tasks[type]),
13433 @@ -455,7 +459,7 @@ struct task_struct *find_task_by_pid_ns(
13434  {
13435         RCU_LOCKDEP_WARN(!rcu_read_lock_held(),
13436                          "find_task_by_pid_ns() needs rcu_read_lock() protection");
13437 -       return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
13438 +       return pid_task(find_pid_ns(vx_rmap_pid(nr), ns), PIDTYPE_PID);
13439  }
13440
13441  struct task_struct *find_task_by_vpid(pid_t vnr)
13442 @@ -499,7 +503,7 @@ struct pid *find_get_pid(pid_t nr)
13443  }
13444  EXPORT_SYMBOL_GPL(find_get_pid);
13445
13446 -pid_t pid_nr_ns(struct pid *pid, struct pid_namespace *ns)
13447 +pid_t pid_unmapped_nr_ns(struct pid *pid, struct pid_namespace *ns)
13448  {
13449         struct upid *upid;
13450         pid_t nr = 0;
13451 @@ -513,6 +517,11 @@ pid_t pid_nr_ns(struct pid *pid, struct
13452  }
13453  EXPORT_SYMBOL_GPL(pid_nr_ns);
13454
13455 +pid_t pid_nr_ns(struct pid *pid, struct pid_namespace *ns)
13456 +{
13457 +       return vx_map_pid(pid_unmapped_nr_ns(pid, ns));
13458 +}
13459 +
13460  pid_t pid_vnr(struct pid *pid)
13461  {
13462         return pid_nr_ns(pid, task_active_pid_ns(current));
13463 diff -NurpP --minimal linux-4.9.135/kernel/pid_namespace.c linux-4.9.135-vs2.3.9.8/kernel/pid_namespace.c
13464 --- linux-4.9.135/kernel/pid_namespace.c        2018-10-20 10:39:21.000000000 +0000
13465 +++ linux-4.9.135-vs2.3.9.8/kernel/pid_namespace.c      2018-10-20 04:58:14.000000000 +0000
13466 @@ -18,6 +18,7 @@
13467  #include <linux/proc_ns.h>
13468  #include <linux/reboot.h>
13469  #include <linux/export.h>
13470 +#include <linux/vserver/global.h>
13471
13472  struct pid_cache {
13473         int nr_ids;
13474 @@ -124,6 +125,7 @@ static struct pid_namespace *create_pid_
13475         ns->ns.ops = &pidns_operations;
13476
13477         kref_init(&ns->kref);
13478 +       atomic_inc(&vs_global_pid_ns);
13479         ns->level = level;
13480         ns->parent = get_pid_ns(parent_pid_ns);
13481         ns->user_ns = get_user_ns(user_ns);
13482 @@ -142,6 +144,7 @@ static struct pid_namespace *create_pid_
13483  out_free_map:
13484         kfree(ns->pidmap[0].page);
13485  out_free:
13486 +       atomic_dec(&vs_global_pid_ns);
13487         kmem_cache_free(pid_ns_cachep, ns);
13488  out_dec:
13489         dec_pid_namespaces(ucounts);
13490 diff -NurpP --minimal linux-4.9.135/kernel/printk/printk.c linux-4.9.135-vs2.3.9.8/kernel/printk/printk.c
13491 --- linux-4.9.135/kernel/printk/printk.c        2018-10-20 10:39:21.000000000 +0000
13492 +++ linux-4.9.135-vs2.3.9.8/kernel/printk/printk.c      2018-10-20 04:58:14.000000000 +0000
13493 @@ -45,6 +45,7 @@
13494  #include <linux/utsname.h>
13495  #include <linux/ctype.h>
13496  #include <linux/uio.h>
13497 +#include <linux/vs_cvirt.h>
13498
13499  #include <asm/uaccess.h>
13500  #include <asm/sections.h>
13501 @@ -612,7 +613,7 @@ int check_syslog_permissions(int type, i
13502                 goto ok;
13503
13504         if (syslog_action_restricted(type)) {
13505 -               if (capable(CAP_SYSLOG))
13506 +               if (vx_capable(CAP_SYSLOG, VXC_SYSLOG))
13507                         goto ok;
13508                 /*
13509                  * For historical reasons, accept CAP_SYS_ADMIN too, with
13510 @@ -1432,12 +1433,9 @@ int do_syslog(int type, char __user *buf
13511         if (error)
13512                 goto out;
13513
13514 -       switch (type) {
13515 -       case SYSLOG_ACTION_CLOSE:       /* Close log */
13516 -               break;
13517 -       case SYSLOG_ACTION_OPEN:        /* Open log */
13518 -               break;
13519 -       case SYSLOG_ACTION_READ:        /* Read from log */
13520 +       if ((type == SYSLOG_ACTION_READ) ||
13521 +           (type == SYSLOG_ACTION_READ_ALL) ||
13522 +           (type == SYSLOG_ACTION_READ_CLEAR)) {
13523                 error = -EINVAL;
13524                 if (!buf || len < 0)
13525                         goto out;
13526 @@ -1448,6 +1446,16 @@ int do_syslog(int type, char __user *buf
13527                         error = -EFAULT;
13528                         goto out;
13529                 }
13530 +       }
13531 +       if (!vx_check(0, VS_ADMIN|VS_WATCH))
13532 +               return vx_do_syslog(type, buf, len);
13533 +
13534 +       switch (type) {
13535 +       case SYSLOG_ACTION_CLOSE:       /* Close log */
13536 +               break;
13537 +       case SYSLOG_ACTION_OPEN:        /* Open log */
13538 +               break;
13539 +       case SYSLOG_ACTION_READ:        /* Read from log */
13540                 error = wait_event_interruptible(log_wait,
13541                                                  syslog_seq != log_next_seq);
13542                 if (error)
13543 @@ -1460,16 +1468,6 @@ int do_syslog(int type, char __user *buf
13544                 /* FALL THRU */
13545         /* Read last kernel messages */
13546         case SYSLOG_ACTION_READ_ALL:
13547 -               error = -EINVAL;
13548 -               if (!buf || len < 0)
13549 -                       goto out;
13550 -               error = 0;
13551 -               if (!len)
13552 -                       goto out;
13553 -               if (!access_ok(VERIFY_WRITE, buf, len)) {
13554 -                       error = -EFAULT;
13555 -                       goto out;
13556 -               }
13557                 error = syslog_print_all(buf, len, clear);
13558                 break;
13559         /* Clear ring buffer */
13560 diff -NurpP --minimal linux-4.9.135/kernel/ptrace.c linux-4.9.135-vs2.3.9.8/kernel/ptrace.c
13561 --- linux-4.9.135/kernel/ptrace.c       2018-10-20 10:39:21.000000000 +0000
13562 +++ linux-4.9.135-vs2.3.9.8/kernel/ptrace.c     2018-10-20 04:58:15.000000000 +0000
13563 @@ -23,6 +23,7 @@
13564  #include <linux/syscalls.h>
13565  #include <linux/uaccess.h>
13566  #include <linux/regset.h>
13567 +#include <linux/vs_context.h>
13568  #include <linux/hw_breakpoint.h>
13569  #include <linux/cn_proc.h>
13570  #include <linux/compat.h>
13571 @@ -331,6 +331,12 @@ ok:
13572
13573         if (mode & PTRACE_MODE_SCHED)
13574                 return 0;
13575 +
13576 +       if (!vx_check(task->xid, VS_ADMIN_P|VS_WATCH_P|VS_IDENT))
13577 +               return -EPERM;
13578 +       if (!vx_check(task->xid, VS_IDENT) &&
13579 +                       !task_vx_flags(task, VXF_STATE_ADMIN, 0))
13580 +               return -EACCES;
13581         return security_ptrace_access_check(task, mode);
13582  }
13583
13584 diff -NurpP --minimal linux-4.9.135/kernel/reboot.c linux-4.9.135-vs2.3.9.8/kernel/reboot.c
13585 --- linux-4.9.135/kernel/reboot.c       2016-12-11 19:17:54.000000000 +0000
13586 +++ linux-4.9.135-vs2.3.9.8/kernel/reboot.c     2018-10-20 04:58:15.000000000 +0000
13587 @@ -16,6 +16,7 @@
13588  #include <linux/syscalls.h>
13589  #include <linux/syscore_ops.h>
13590  #include <linux/uaccess.h>
13591 +#include <linux/vs_pid.h>
13592
13593  /*
13594   * this indicates whether you can reboot with ctrl-alt-del: the default is yes
13595 @@ -269,6 +270,8 @@ EXPORT_SYMBOL_GPL(kernel_power_off);
13596
13597  static DEFINE_MUTEX(reboot_mutex);
13598
13599 +long vs_reboot(unsigned int, void __user *);
13600 +
13601  /*
13602   * Reboot system call: for obvious reasons only root may call it,
13603   * and even root needs to set up some magic numbers in the registers
13604 @@ -311,6 +314,9 @@ SYSCALL_DEFINE4(reboot, int, magic1, int
13605         if ((cmd == LINUX_REBOOT_CMD_POWER_OFF) && !pm_power_off)
13606                 cmd = LINUX_REBOOT_CMD_HALT;
13607
13608 +       if (!vx_check(0, VS_ADMIN|VS_WATCH))
13609 +               return vs_reboot(cmd, arg);
13610 +
13611         mutex_lock(&reboot_mutex);
13612         switch (cmd) {
13613         case LINUX_REBOOT_CMD_RESTART:
13614 diff -NurpP --minimal linux-4.9.135/kernel/sched/core.c linux-4.9.135-vs2.3.9.8/kernel/sched/core.c
13615 --- linux-4.9.135/kernel/sched/core.c   2018-10-20 10:39:21.000000000 +0000
13616 +++ linux-4.9.135-vs2.3.9.8/kernel/sched/core.c 2018-10-20 04:58:15.000000000 +0000
13617 @@ -75,6 +75,8 @@
13618  #include <linux/compiler.h>
13619  #include <linux/frame.h>
13620  #include <linux/prefetch.h>
13621 +#include <linux/vs_sched.h>
13622 +#include <linux/vs_cvirt.h>
13623
13624  #include <asm/switch_to.h>
13625  #include <asm/tlb.h>
13626 @@ -3431,6 +3433,7 @@ void __noreturn do_task_dead(void)
13627         __set_current_state(TASK_DEAD);
13628         current->flags |= PF_NOFREEZE;  /* tell freezer to ignore us */
13629         __schedule(false);
13630 +       printk("bad task: %p [%lx]\n", current, current->state);
13631         BUG();
13632         /* Avoid "noreturn function does return".  */
13633         for (;;)
13634 @@ -3824,7 +3827,7 @@ SYSCALL_DEFINE1(nice, int, increment)
13635
13636         nice = clamp_val(nice, MIN_NICE, MAX_NICE);
13637         if (increment < 0 && !can_nice(current, nice))
13638 -               return -EPERM;
13639 +               return vx_flags(VXF_IGNEG_NICE, 0) ? 0 : -EPERM;
13640
13641         retval = security_task_setnice(current, nice);
13642         if (retval)
13643 diff -NurpP --minimal linux-4.9.135/kernel/sched/cputime.c linux-4.9.135-vs2.3.9.8/kernel/sched/cputime.c
13644 --- linux-4.9.135/kernel/sched/cputime.c        2018-10-20 10:39:21.000000000 +0000
13645 +++ linux-4.9.135-vs2.3.9.8/kernel/sched/cputime.c      2018-10-20 11:46:17.000000000 +0000
13646 @@ -4,6 +4,7 @@
13647  #include <linux/kernel_stat.h>
13648  #include <linux/static_key.h>
13649  #include <linux/context_tracking.h>
13650 +#include <linux/vs_sched.h>
13651  #include "sched.h"
13652  #ifdef CONFIG_PARAVIRT
13653  #include <asm/paravirt.h>
13654 @@ -125,14 +126,17 @@ static inline void task_group_account_fi
13655  void account_user_time(struct task_struct *p, cputime_t cputime,
13656                        cputime_t cputime_scaled)
13657  {
13658 +       struct vx_info *vxi = p->vx_info;  /* p is _always_ current */
13659 +       int nice = (task_nice(p) > 0);
13660         int index;
13661
13662         /* Add user time to process. */
13663         p->utime += cputime;
13664         p->utimescaled += cputime_scaled;
13665 +       vx_account_user(vxi, cputime, nice);
13666         account_group_user_time(p, cputime);
13667
13668 -       index = (task_nice(p) > 0) ? CPUTIME_NICE : CPUTIME_USER;
13669 +       index = (nice) ? CPUTIME_NICE : CPUTIME_USER;
13670
13671         /* Add user time to cpustat. */
13672         task_group_account_field(p, index, cputime_to_nsecs(cputime));
13673 @@ -179,9 +183,12 @@ static inline
13674  void __account_system_time(struct task_struct *p, cputime_t cputime,
13675                         cputime_t cputime_scaled, int index)
13676  {
13677 +       struct vx_info *vxi = p->vx_info;  /* p is _always_ current */
13678 +
13679         /* Add system time to process. */
13680         p->stime += cputime;
13681         p->stimescaled += cputime_scaled;
13682 +       vx_account_system(vxi, cputime, 0 /* do we have idle time? */);
13683         account_group_system_time(p, cputime);
13684
13685         /* Add system time to cpustat. */
13686 diff -NurpP --minimal linux-4.9.135/kernel/sched/fair.c linux-4.9.135-vs2.3.9.8/kernel/sched/fair.c
13687 --- linux-4.9.135/kernel/sched/fair.c   2018-10-20 10:39:21.000000000 +0000
13688 +++ linux-4.9.135-vs2.3.9.8/kernel/sched/fair.c 2018-10-20 05:55:43.000000000 +0000
13689 @@ -30,6 +30,7 @@
13690  #include <linux/mempolicy.h>
13691  #include <linux/migrate.h>
13692  #include <linux/task_work.h>
13693 +#include <linux/vs_cvirt.h>
13694
13695  #include <trace/events/sched.h>
13696
13697 @@ -3411,6 +3412,8 @@ enqueue_entity(struct cfs_rq *cfs_rq, st
13698                 __enqueue_entity(cfs_rq, se);
13699         se->on_rq = 1;
13700
13701 +       if (entity_is_task(se))
13702 +               vx_activate_task(task_of(se));
13703         if (cfs_rq->nr_running == 1) {
13704                 list_add_leaf_cfs_rq(cfs_rq);
13705                 check_enqueue_throttle(cfs_rq);
13706 @@ -3480,6 +3483,8 @@ dequeue_entity(struct cfs_rq *cfs_rq, st
13707         if (se != cfs_rq->curr)
13708                 __dequeue_entity(cfs_rq, se);
13709         se->on_rq = 0;
13710 +       if (entity_is_task(se))
13711 +               vx_deactivate_task(task_of(se));
13712         account_entity_dequeue(cfs_rq, se);
13713
13714         /*
13715 diff -NurpP --minimal linux-4.9.135/kernel/sched/loadavg.c linux-4.9.135-vs2.3.9.8/kernel/sched/loadavg.c
13716 --- linux-4.9.135/kernel/sched/loadavg.c        2018-10-20 10:39:21.000000000 +0000
13717 +++ linux-4.9.135-vs2.3.9.8/kernel/sched/loadavg.c      2018-10-20 04:58:15.000000000 +0000
13718 @@ -73,9 +73,16 @@ EXPORT_SYMBOL(avenrun); /* should be rem
13719   */
13720  void get_avenrun(unsigned long *loads, unsigned long offset, int shift)
13721  {
13722 -       loads[0] = (avenrun[0] + offset) << shift;
13723 -       loads[1] = (avenrun[1] + offset) << shift;
13724 -       loads[2] = (avenrun[2] + offset) << shift;
13725 +       if (vx_flags(VXF_VIRT_LOAD, 0)) {
13726 +               struct vx_info *vxi = current_vx_info();
13727 +               loads[0] = (vxi->cvirt.load[0] + offset) << shift;
13728 +               loads[1] = (vxi->cvirt.load[1] + offset) << shift;
13729 +               loads[2] = (vxi->cvirt.load[2] + offset) << shift;
13730 +       } else {
13731 +               loads[0] = (avenrun[0] + offset) << shift;
13732 +               loads[1] = (avenrun[1] + offset) << shift;
13733 +               loads[2] = (avenrun[2] + offset) << shift;
13734 +       }
13735  }
13736
13737  long calc_load_fold_active(struct rq *this_rq, long adjust)
13738 diff -NurpP --minimal linux-4.9.135/kernel/signal.c linux-4.9.135-vs2.3.9.8/kernel/signal.c
13739 --- linux-4.9.135/kernel/signal.c       2018-10-20 10:39:21.000000000 +0000
13740 +++ linux-4.9.135-vs2.3.9.8/kernel/signal.c     2018-10-20 04:58:15.000000000 +0000
13741 @@ -34,6 +34,8 @@
13742  #include <linux/compat.h>
13743  #include <linux/cn_proc.h>
13744  #include <linux/compiler.h>
13745 +#include <linux/vs_context.h>
13746 +#include <linux/vs_pid.h>
13747
13748  #define CREATE_TRACE_POINTS
13749  #include <trace/events/signal.h>
13750 @@ -726,9 +728,18 @@ static int check_kill_permission(int sig
13751         struct pid *sid;
13752         int error;
13753
13754 +       vxdprintk(VXD_CBIT(misc, 7),
13755 +               "check_kill_permission(%d,%p,%p[#%u,%u])",
13756 +               sig, info, t, vx_task_xid(t), t->pid);
13757 +
13758         if (!valid_signal(sig))
13759                 return -EINVAL;
13760
13761 +/*     FIXME: needed? if so, why?
13762 +       if ((info != SEND_SIG_NOINFO) &&
13763 +               (is_si_special(info) || !si_fromuser(info)))
13764 +               goto skip;      */
13765 +
13766         if (!si_fromuser(info))
13767                 return 0;
13768
13769 @@ -752,6 +763,20 @@ static int check_kill_permission(int sig
13770                 }
13771         }
13772
13773 +       error = -EPERM;
13774 +       if (t->pid == 1 && current->xid)
13775 +               return error;
13776 +
13777 +       error = -ESRCH;
13778 +       /* FIXME: we shouldn't return ESRCH ever, to avoid
13779 +                 loops, maybe ENOENT or EACCES? */
13780 +       if (!vx_check(vx_task_xid(t), VS_WATCH_P | VS_IDENT)) {
13781 +               vxdprintk(current->xid || VXD_CBIT(misc, 7),
13782 +                       "signal %d[%p] xid mismatch %p[#%u,%u] xid=#%u",
13783 +                       sig, info, t, vx_task_xid(t), t->pid, current->xid);
13784 +               return error;
13785 +       }
13786 +/* skip: */
13787         return security_task_kill(t, info, sig, 0);
13788  }
13789
13790 @@ -1303,8 +1328,14 @@ int kill_pid_info(int sig, struct siginf
13791         for (;;) {
13792                 rcu_read_lock();
13793                 p = pid_task(pid, PIDTYPE_PID);
13794 -               if (p)
13795 -                       error = group_send_sig_info(sig, info, p);
13796 +               if (p) {
13797 +                       if (vx_check(vx_task_xid(p), VS_IDENT))
13798 +                               error = group_send_sig_info(sig, info, p);
13799 +                       else {
13800 +                               rcu_read_unlock();
13801 +                               return -ESRCH;
13802 +                       }
13803 +               }
13804                 rcu_read_unlock();
13805                 if (likely(!p || error != -ESRCH))
13806                         return error;
13807 @@ -1349,7 +1380,7 @@ int kill_pid_info_as_cred(int sig, struc
13808
13809         rcu_read_lock();
13810         p = pid_task(pid, PIDTYPE_PID);
13811 -       if (!p) {
13812 +       if (!p || !vx_check(vx_task_xid(p), VS_IDENT)) {
13813                 ret = -ESRCH;
13814                 goto out_unlock;
13815         }
13816 @@ -1405,8 +1436,10 @@ static int kill_something_info(int sig,
13817                 struct task_struct * p;
13818
13819                 for_each_process(p) {
13820 -                       if (task_pid_vnr(p) > 1 &&
13821 -                                       !same_thread_group(p, current)) {
13822 +                       if (vx_check(vx_task_xid(p), VS_ADMIN|VS_IDENT) &&
13823 +                               task_pid_vnr(p) > 1 &&
13824 +                               !same_thread_group(p, current) &&
13825 +                               !vx_current_initpid(p->pid)) {
13826                                 int err = group_send_sig_info(sig, info, p);
13827                                 ++count;
13828                                 if (err != -EPERM)
13829 @@ -2259,6 +2292,11 @@ relock:
13830                                 !sig_kernel_only(signr))
13831                         continue;
13832
13833 +               /* virtual init is protected against user signals */
13834 +               if ((ksig->info.si_code == SI_USER) &&
13835 +                       vx_current_initpid(current->pid))
13836 +                       continue;
13837 +
13838                 if (sig_kernel_stop(signr)) {
13839                         /*
13840                          * The default action is to stop all threads in
13841 diff -NurpP --minimal linux-4.9.135/kernel/softirq.c linux-4.9.135-vs2.3.9.8/kernel/softirq.c
13842 --- linux-4.9.135/kernel/softirq.c      2018-10-20 10:39:21.000000000 +0000
13843 +++ linux-4.9.135-vs2.3.9.8/kernel/softirq.c    2018-10-20 05:55:43.000000000 +0000
13844 @@ -26,6 +26,7 @@
13845  #include <linux/smpboot.h>
13846  #include <linux/tick.h>
13847  #include <linux/irq.h>
13848 +#include <linux/vs_context.h>
13849
13850  #define CREATE_TRACE_POINTS
13851  #include <trace/events/irq.h>
13852 diff -NurpP --minimal linux-4.9.135/kernel/sys.c linux-4.9.135-vs2.3.9.8/kernel/sys.c
13853 --- linux-4.9.135/kernel/sys.c  2018-10-20 10:39:21.000000000 +0000
13854 +++ linux-4.9.135-vs2.3.9.8/kernel/sys.c        2018-10-20 05:55:43.000000000 +0000
13855 @@ -56,6 +56,7 @@
13856  #include <linux/nospec.h>
13857
13858  #include <linux/kmsg_dump.h>
13859 +#include <linux/vs_pid.h>
13860  /* Move somewhere else to avoid recompiling? */
13861  #include <generated/utsrelease.h>
13862
13863 @@ -159,7 +160,10 @@ static int set_one_prio(struct task_stru
13864                 goto out;
13865         }
13866         if (niceval < task_nice(p) && !can_nice(p, niceval)) {
13867 -               error = -EACCES;
13868 +               if (vx_flags(VXF_IGNEG_NICE, 0))
13869 +                       error = 0;
13870 +               else
13871 +                       error = -EACCES;
13872                 goto out;
13873         }
13874         no_nice = security_task_setnice(p, niceval);
13875 @@ -210,6 +214,8 @@ SYSCALL_DEFINE3(setpriority, int, which,
13876                 else
13877                         pgrp = task_pgrp(current);
13878                 do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
13879 +                       if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT))
13880 +                               continue;
13881                         error = set_one_prio(p, niceval, error);
13882                 } while_each_pid_thread(pgrp, PIDTYPE_PGID, p);
13883                 break;
13884 @@ -276,6 +282,8 @@ SYSCALL_DEFINE2(getpriority, int, which,
13885                 else
13886                         pgrp = task_pgrp(current);
13887                 do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
13888 +                       if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT))
13889 +                               continue;
13890                         niceval = nice_to_rlimit(task_nice(p));
13891                         if (niceval > retval)
13892                                 retval = niceval;
13893 @@ -292,6 +300,8 @@ SYSCALL_DEFINE2(getpriority, int, which,
13894                                 goto out_unlock;        /* No processes for this user */
13895                 }
13896                 do_each_thread(g, p) {
13897 +                       if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT))
13898 +                               continue;
13899                         if (uid_eq(task_uid(p), uid) && task_pid_vnr(p)) {
13900                                 niceval = nice_to_rlimit(task_nice(p));
13901                                 if (niceval > retval)
13902 @@ -1211,7 +1221,8 @@ SYSCALL_DEFINE2(sethostname, char __user
13903         int errno;
13904         char tmp[__NEW_UTS_LEN];
13905
13906 -       if (!ns_capable(current->nsproxy->uts_ns->user_ns, CAP_SYS_ADMIN))
13907 +       if (!vx_ns_capable(current->nsproxy->uts_ns->user_ns,
13908 +               CAP_SYS_ADMIN, VXC_SET_UTSNAME))
13909                 return -EPERM;
13910
13911         if (len < 0 || len > __NEW_UTS_LEN)
13912 @@ -1264,7 +1275,8 @@ SYSCALL_DEFINE2(setdomainname, char __us
13913         int errno;
13914         char tmp[__NEW_UTS_LEN];
13915
13916 -       if (!ns_capable(current->nsproxy->uts_ns->user_ns, CAP_SYS_ADMIN))
13917 +       if (!vx_ns_capable(current->nsproxy->uts_ns->user_ns,
13918 +               CAP_SYS_ADMIN, VXC_SET_UTSNAME))
13919                 return -EPERM;
13920         if (len < 0 || len > __NEW_UTS_LEN)
13921                 return -EINVAL;
13922 @@ -1384,7 +1396,7 @@ int do_prlimit(struct task_struct *tsk,
13923                 /* Keep the capable check against init_user_ns until
13924                    cgroups can contain all limits */
13925                 if (new_rlim->rlim_max > rlim->rlim_max &&
13926 -                               !capable(CAP_SYS_RESOURCE))
13927 +                       !vx_capable(CAP_SYS_RESOURCE, VXC_SET_RLIMIT))
13928                         retval = -EPERM;
13929                 if (!retval)
13930                         retval = security_task_setrlimit(tsk->group_leader,
13931 @@ -1437,7 +1449,8 @@ static int check_prlimit_permission(stru
13932             gid_eq(cred->gid, tcred->sgid) &&
13933             gid_eq(cred->gid, tcred->gid))
13934                 return 0;
13935 -       if (ns_capable(tcred->user_ns, CAP_SYS_RESOURCE))
13936 +       if (vx_ns_capable(tcred->user_ns,
13937 +               CAP_SYS_RESOURCE, VXC_SET_RLIMIT))
13938                 return 0;
13939
13940         return -EPERM;
13941 diff -NurpP --minimal linux-4.9.135/kernel/sysctl.c linux-4.9.135-vs2.3.9.8/kernel/sysctl.c
13942 --- linux-4.9.135/kernel/sysctl.c       2018-10-20 10:39:21.000000000 +0000
13943 +++ linux-4.9.135-vs2.3.9.8/kernel/sysctl.c     2018-10-20 05:55:43.000000000 +0000
13944 @@ -87,6 +87,7 @@
13945  #if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT)
13946  #include <linux/lockdep.h>
13947  #endif
13948 +extern char vshelper_path[];
13949  #ifdef CONFIG_CHR_DEV_SG
13950  #include <scsi/sg.h>
13951  #endif
13952 @@ -282,6 +283,13 @@ static int max_extfrag_threshold = 1000;
13953
13954  static struct ctl_table kern_table[] = {
13955         {
13956 +               .procname       = "vshelper",
13957 +               .data           = &vshelper_path,
13958 +               .maxlen         = 256,
13959 +               .mode           = 0644,
13960 +               .proc_handler   = proc_dostring,
13961 +       },
13962 +       {
13963                 .procname       = "sched_child_runs_first",
13964                 .data           = &sysctl_sched_child_runs_first,
13965                 .maxlen         = sizeof(unsigned int),
13966 @@ -1427,7 +1435,6 @@ static struct ctl_table vm_table[] = {
13967                 .extra1         = &zero,
13968                 .extra2         = &one,
13969         },
13970 -
13971  #endif /* CONFIG_COMPACTION */
13972         {
13973                 .procname       = "min_free_kbytes",
13974 diff -NurpP --minimal linux-4.9.135/kernel/sysctl_binary.c linux-4.9.135-vs2.3.9.8/kernel/sysctl_binary.c
13975 --- linux-4.9.135/kernel/sysctl_binary.c        2016-12-11 19:17:54.000000000 +0000
13976 +++ linux-4.9.135-vs2.3.9.8/kernel/sysctl_binary.c      2018-10-20 04:58:15.000000000 +0000
13977 @@ -74,6 +74,7 @@ static const struct bin_table bin_kern_t
13978
13979         { CTL_INT,      KERN_PANIC,                     "panic" },
13980         { CTL_INT,      KERN_REALROOTDEV,               "real-root-dev" },
13981 +       { CTL_STR,      KERN_VSHELPER,                  "vshelper" },
13982
13983         { CTL_STR,      KERN_SPARC_REBOOT,              "reboot-cmd" },
13984         { CTL_INT,      KERN_CTLALTDEL,                 "ctrl-alt-del" },
13985 diff -NurpP --minimal linux-4.9.135/kernel/time/posix-timers.c linux-4.9.135-vs2.3.9.8/kernel/time/posix-timers.c
13986 --- linux-4.9.135/kernel/time/posix-timers.c    2018-10-20 10:39:21.000000000 +0000
13987 +++ linux-4.9.135-vs2.3.9.8/kernel/time/posix-timers.c  2018-10-20 04:58:15.000000000 +0000
13988 @@ -48,6 +48,7 @@
13989  #include <linux/workqueue.h>
13990  #include <linux/export.h>
13991  #include <linux/hashtable.h>
13992 +#include <linux/vs_context.h>
13993
13994  #include "timekeeping.h"
13995
13996 @@ -407,6 +408,7 @@ int posix_timer_event(struct k_itimer *t
13997  {
13998         struct task_struct *task;
13999         int shared, ret = -1;
14000 +
14001         /*
14002          * FIXME: if ->sigq is queued we can race with
14003          * dequeue_signal()->do_schedule_next_timer().
14004 @@ -423,10 +425,18 @@ int posix_timer_event(struct k_itimer *t
14005         rcu_read_lock();
14006         task = pid_task(timr->it_pid, PIDTYPE_PID);
14007         if (task) {
14008 +               struct vx_info_save vxis;
14009 +               struct vx_info *vxi;
14010 +
14011 +               vxi = get_vx_info(task->vx_info);
14012 +               enter_vx_info(vxi, &vxis);
14013                 shared = !(timr->it_sigev_notify & SIGEV_THREAD_ID);
14014                 ret = send_sigqueue(timr->sigq, task, shared);
14015 +               leave_vx_info(&vxis);
14016 +               put_vx_info(vxi);
14017         }
14018         rcu_read_unlock();
14019 +
14020         /* If we failed to send the signal the timer stops. */
14021         return ret > 0;
14022  }
14023 diff -NurpP --minimal linux-4.9.135/kernel/time/time.c linux-4.9.135-vs2.3.9.8/kernel/time/time.c
14024 --- linux-4.9.135/kernel/time/time.c    2018-10-20 10:39:21.000000000 +0000
14025 +++ linux-4.9.135-vs2.3.9.8/kernel/time/time.c  2018-10-20 05:55:43.000000000 +0000
14026 @@ -38,6 +38,7 @@
14027  #include <linux/fs.h>
14028  #include <linux/math64.h>
14029  #include <linux/ptrace.h>
14030 +#include <linux/vs_time.h>
14031
14032  #include <asm/uaccess.h>
14033  #include <asm/unistd.h>
14034 @@ -94,7 +95,7 @@ SYSCALL_DEFINE1(stime, time_t __user *,
14035         if (err)
14036                 return err;
14037
14038 -       do_settimeofday(&tv);
14039 +       vx_settimeofday(&tv);
14040         return 0;
14041  }
14042
14043 @@ -187,7 +188,7 @@ int do_sys_settimeofday64(const struct t
14044                 }
14045         }
14046         if (tv)
14047 -               return do_settimeofday64(tv);
14048 +               return vx_settimeofday64(tv);
14049         return 0;
14050  }
14051
14052 diff -NurpP --minimal linux-4.9.135/kernel/time/timekeeping.c linux-4.9.135-vs2.3.9.8/kernel/time/timekeeping.c
14053 --- linux-4.9.135/kernel/time/timekeeping.c     2018-10-20 10:39:21.000000000 +0000
14054 +++ linux-4.9.135-vs2.3.9.8/kernel/time/timekeeping.c   2018-10-20 04:58:15.000000000 +0000
14055 @@ -23,6 +23,7 @@
14056  #include <linux/stop_machine.h>
14057  #include <linux/pvclock_gtod.h>
14058  #include <linux/compiler.h>
14059 +#include <linux/vs_time.h>
14060
14061  #include "tick-internal.h"
14062  #include "ntp_internal.h"
14063 diff -NurpP --minimal linux-4.9.135/kernel/time/timer.c linux-4.9.135-vs2.3.9.8/kernel/time/timer.c
14064 --- linux-4.9.135/kernel/time/timer.c   2018-10-20 10:39:21.000000000 +0000
14065 +++ linux-4.9.135-vs2.3.9.8/kernel/time/timer.c 2018-10-20 05:55:43.000000000 +0000
14066 @@ -42,6 +42,10 @@
14067  #include <linux/sched/sysctl.h>
14068  #include <linux/slab.h>
14069  #include <linux/compat.h>
14070 +#include <linux/vs_base.h>
14071 +#include <linux/vs_cvirt.h>
14072 +#include <linux/vs_pid.h>
14073 +#include <linux/vserver/sched.h>
14074
14075  #include <asm/uaccess.h>
14076  #include <asm/unistd.h>
14077 diff -NurpP --minimal linux-4.9.135/kernel/user_namespace.c linux-4.9.135-vs2.3.9.8/kernel/user_namespace.c
14078 --- linux-4.9.135/kernel/user_namespace.c       2018-10-20 10:39:23.000000000 +0000
14079 +++ linux-4.9.135-vs2.3.9.8/kernel/user_namespace.c     2018-10-20 05:55:43.000000000 +0000
14080 @@ -22,6 +22,7 @@
14081  #include <linux/ctype.h>
14082  #include <linux/projid.h>
14083  #include <linux/fs_struct.h>
14084 +#include <linux/vserver/global.h>
14085
14086  static struct kmem_cache *user_ns_cachep __read_mostly;
14087  static DEFINE_MUTEX(userns_state_mutex);
14088 @@ -115,6 +116,7 @@ int create_user_ns(struct cred *new)
14089
14090         atomic_set(&ns->count, 1);
14091         /* Leave the new->user_ns reference with the new user namespace. */
14092 +       atomic_inc(&vs_global_user_ns);
14093         ns->parent = parent_ns;
14094         ns->level = parent_ns->level + 1;
14095         ns->owner = owner;
14096 @@ -185,6 +187,7 @@ static void free_user_ns(struct work_str
14097                 key_put(ns->persistent_keyring_register);
14098  #endif
14099                 ns_free_inum(&ns->ns);
14100 +               atomic_dec(&vs_global_user_ns);
14101                 kmem_cache_free(user_ns_cachep, ns);
14102                 dec_user_namespaces(ucounts);
14103                 ns = parent;
14104 @@ -404,6 +407,18 @@ gid_t from_kgid_munged(struct user_names
14105  }
14106  EXPORT_SYMBOL(from_kgid_munged);
14107
14108 +ktag_t make_ktag(struct user_namespace *from, vtag_t tag)
14109 +{
14110 +       return KTAGT_INIT(tag);
14111 +}
14112 +EXPORT_SYMBOL(make_ktag);
14113 +
14114 +vtag_t from_ktag(struct user_namespace *to, ktag_t tag)
14115 +{
14116 +       return __ktag_val(tag);
14117 +}
14118 +EXPORT_SYMBOL(from_ktag);
14119 +
14120  /**
14121   *     make_kprojid - Map a user-namespace projid pair into a kprojid.
14122   *     @ns:  User namespace that the projid is in
14123 diff -NurpP --minimal linux-4.9.135/kernel/utsname.c linux-4.9.135-vs2.3.9.8/kernel/utsname.c
14124 --- linux-4.9.135/kernel/utsname.c      2016-12-11 19:17:54.000000000 +0000
14125 +++ linux-4.9.135-vs2.3.9.8/kernel/utsname.c    2018-10-20 04:58:15.000000000 +0000
14126 @@ -16,6 +16,7 @@
14127  #include <linux/slab.h>
14128  #include <linux/user_namespace.h>
14129  #include <linux/proc_ns.h>
14130 +#include <linux/vserver/global.h>
14131
14132  static struct ucounts *inc_uts_namespaces(struct user_namespace *ns)
14133  {
14134 @@ -32,8 +33,10 @@ static struct uts_namespace *create_uts_
14135         struct uts_namespace *uts_ns;
14136
14137         uts_ns = kmalloc(sizeof(struct uts_namespace), GFP_KERNEL);
14138 -       if (uts_ns)
14139 +       if (uts_ns) {
14140                 kref_init(&uts_ns->kref);
14141 +               atomic_inc(&vs_global_uts_ns);
14142 +       }
14143         return uts_ns;
14144  }
14145
14146 @@ -111,6 +114,7 @@ void free_uts_ns(struct kref *kref)
14147         dec_uts_namespaces(ns->ucounts);
14148         put_user_ns(ns->user_ns);
14149         ns_free_inum(&ns->ns);
14150 +       atomic_dec(&vs_global_uts_ns);
14151         kfree(ns);
14152  }
14153
14154 diff -NurpP --minimal linux-4.9.135/kernel/vserver/Kconfig linux-4.9.135-vs2.3.9.8/kernel/vserver/Kconfig
14155 --- linux-4.9.135/kernel/vserver/Kconfig        1970-01-01 00:00:00.000000000 +0000
14156 +++ linux-4.9.135-vs2.3.9.8/kernel/vserver/Kconfig      2018-10-20 04:58:15.000000000 +0000
14157 @@ -0,0 +1,230 @@
14158 +#
14159 +# Linux VServer configuration
14160 +#
14161 +
14162 +menu "Linux VServer"
14163 +
14164 +config VSERVER_AUTO_LBACK
14165 +       bool    "Automatically Assign Loopback IP"
14166 +       default y
14167 +       help
14168 +         Automatically assign a guest specific loopback
14169 +         IP and add it to the kernel network stack on
14170 +         startup.
14171 +
14172 +config VSERVER_AUTO_SINGLE
14173 +       bool    "Automatic Single IP Special Casing"
14174 +       default n
14175 +       help
14176 +         This allows network contexts with a single IP to
14177 +         automatically remap 0.0.0.0 bindings to that IP,
14178 +         avoiding further network checks and improving
14179 +         performance.
14180 +
14181 +         (note: such guests do not allow to change the ip
14182 +          on the fly and do not show loopback addresses)
14183 +
14184 +config VSERVER_COWBL
14185 +       bool    "Enable COW Immutable Link Breaking"
14186 +       default y
14187 +       help
14188 +         This enables the COW (Copy-On-Write) link break code.
14189 +         It allows you to treat unified files like normal files
14190 +         when writing to them (which will implicitely break the
14191 +         link and create a copy of the unified file)
14192 +
14193 +config VSERVER_VTIME
14194 +       bool    "Enable Virtualized Guest Time (EXPERIMENTAL)"
14195 +       default n
14196 +       help
14197 +         This enables per guest time offsets to allow for
14198 +         adjusting the system clock individually per guest.
14199 +         this adds some overhead to the time functions and
14200 +         therefore should not be enabled without good reason.
14201 +
14202 +config VSERVER_DEVICE
14203 +       bool    "Enable Guest Device Mapping (EXPERIMENTAL)"
14204 +       default n
14205 +       help
14206 +         This enables generic device remapping.
14207 +
14208 +config VSERVER_PROC_SECURE
14209 +       bool    "Enable Proc Security"
14210 +       depends on PROC_FS
14211 +       default y
14212 +       help
14213 +         This configures ProcFS security to initially hide
14214 +         non-process entries for all contexts except the main and
14215 +         spectator context (i.e. for all guests), which is a secure
14216 +         default.
14217 +
14218 +         (note: on 1.2x the entries were visible by default)
14219 +
14220 +choice
14221 +       prompt  "Persistent Inode Tagging"
14222 +       default TAGGING_ID24
14223 +       help
14224 +         This adds persistent context information to filesystems
14225 +         mounted with the tagxid option. Tagging is a requirement
14226 +         for per-context disk limits and per-context quota.
14227 +
14228 +
14229 +config TAGGING_NONE
14230 +       bool    "Disabled"
14231 +       help
14232 +         do not store per-context information in inodes.
14233 +
14234 +config TAGGING_UID16
14235 +       bool    "UID16/GID32"
14236 +       help
14237 +         reduces UID to 16 bit, but leaves GID at 32 bit.
14238 +
14239 +config TAGGING_GID16
14240 +       bool    "UID32/GID16"
14241 +       help
14242 +         reduces GID to 16 bit, but leaves UID at 32 bit.
14243 +
14244 +config TAGGING_ID24
14245 +       bool    "UID24/GID24"
14246 +       help
14247 +         uses the upper 8bit from UID and GID for XID tagging
14248 +         which leaves 24bit for UID/GID each, which should be
14249 +         more than sufficient for normal use.
14250 +
14251 +config TAGGING_INTERN
14252 +       bool    "UID32/GID32"
14253 +       help
14254 +         this uses otherwise reserved inode fields in the on
14255 +         disk representation, which limits the use to a few
14256 +         filesystems (currently ext2 and ext3)
14257 +
14258 +endchoice
14259 +
14260 +config TAG_NFSD
14261 +       bool    "Tag NFSD User Auth and Files"
14262 +       default n
14263 +       help
14264 +         Enable this if you do want the in-kernel NFS
14265 +         Server to use the tagging specified above.
14266 +         (will require patched clients too)
14267 +
14268 +config VSERVER_PRIVACY
14269 +       bool    "Honor Privacy Aspects of Guests"
14270 +       default n
14271 +       help
14272 +         When enabled, most context checks will disallow
14273 +         access to structures assigned to a specific context,
14274 +         like ptys or loop devices.
14275 +
14276 +config VSERVER_CONTEXTS
14277 +       int     "Maximum number of Contexts (1-65533)"  if EMBEDDED
14278 +       range 1 65533
14279 +       default "768"   if 64BIT
14280 +       default "256"
14281 +       help
14282 +         This setting will optimize certain data structures
14283 +         and memory allocations according to the expected
14284 +         maximum.
14285 +
14286 +         note: this is not a strict upper limit.
14287 +
14288 +config VSERVER_WARN
14289 +       bool    "VServer Warnings"
14290 +       default y
14291 +       help
14292 +         This enables various runtime warnings, which will
14293 +         notify about potential manipulation attempts or
14294 +         resource shortage. It is generally considered to
14295 +         be a good idea to have that enabled.
14296 +
14297 +config VSERVER_WARN_DEVPTS
14298 +       bool    "VServer DevPTS Warnings"
14299 +       depends on VSERVER_WARN
14300 +       default y
14301 +       help
14302 +         This enables DevPTS related warnings, issued when a
14303 +         process inside a context tries to lookup or access
14304 +         a dynamic pts from the host or a different context.
14305 +
14306 +config VSERVER_DEBUG
14307 +       bool    "VServer Debugging Code"
14308 +       default n
14309 +       help
14310 +         Set this to yes if you want to be able to activate
14311 +         debugging output at runtime. It adds a very small
14312 +         overhead to all vserver related functions and
14313 +         increases the kernel size by about 20k.
14314 +
14315 +config VSERVER_HISTORY
14316 +       bool    "VServer History Tracing"
14317 +       depends on VSERVER_DEBUG
14318 +       default n
14319 +       help
14320 +         Set this to yes if you want to record the history of
14321 +         linux-vserver activities, so they can be replayed in
14322 +         the event of a kernel panic or oops.
14323 +
14324 +config VSERVER_HISTORY_SIZE
14325 +       int     "Per-CPU History Size (32-65536)"
14326 +       depends on VSERVER_HISTORY
14327 +       range 32 65536
14328 +       default 64
14329 +       help
14330 +         This allows you to specify the number of entries in
14331 +         the per-CPU history buffer.
14332 +
14333 +config VSERVER_EXTRA_MNT_CHECK
14334 +       bool    "Extra Checks for Reachability"
14335 +       default n
14336 +       help
14337 +         Set this to yes if you want to do extra checks for
14338 +         vfsmount reachability in the proc filesystem code.
14339 +         This shouldn't be required on any setup utilizing
14340 +         mnt namespaces.
14341 +
14342 +choice
14343 +       prompt  "Quotes used in debug and warn messages"
14344 +       default QUOTES_ISO8859
14345 +
14346 +config QUOTES_ISO8859
14347 +       bool    "Extended ASCII (ISO 8859) angle quotes"
14348 +       help
14349 +         This uses the extended ASCII characters \xbb
14350 +         and \xab for quoting file and process names.
14351 +
14352 +config QUOTES_UTF8
14353 +       bool    "UTF-8 angle quotes"
14354 +       help
14355 +         This uses the the UTF-8 sequences for angle
14356 +         quotes to quote file and process names.
14357 +
14358 +config QUOTES_ASCII
14359 +       bool    "ASCII single quotes"
14360 +       help
14361 +         This uses the ASCII single quote character
14362 +         (\x27) to quote file and process names.
14363 +
14364 +endchoice
14365 +
14366 +endmenu
14367 +
14368 +
14369 +config VSERVER
14370 +       bool
14371 +       default y
14372 +       select NAMESPACES
14373 +       select UTS_NS
14374 +       select IPC_NS
14375 +#      select USER_NS
14376 +       select SYSVIPC
14377 +
14378 +config VSERVER_SECURITY
14379 +       bool
14380 +       depends on SECURITY
14381 +       default y
14382 +       select SECURITY_CAPABILITIES
14383 +
14384 +config VSERVER_DISABLED
14385 +       bool
14386 +       default n
14387 +
14388 diff -NurpP --minimal linux-4.9.135/kernel/vserver/Makefile linux-4.9.135-vs2.3.9.8/kernel/vserver/Makefile
14389 --- linux-4.9.135/kernel/vserver/Makefile       1970-01-01 00:00:00.000000000 +0000
14390 +++ linux-4.9.135-vs2.3.9.8/kernel/vserver/Makefile     2018-10-20 04:58:15.000000000 +0000
14391 @@ -0,0 +1,18 @@
14392 +#
14393 +# Makefile for the Linux vserver routines.
14394 +#
14395 +
14396 +
14397 +obj-y          += vserver.o
14398 +
14399 +vserver-y      := switch.o context.o space.o sched.o network.o inode.o \
14400 +                  limit.o cvirt.o cacct.o signal.o helper.o init.o \
14401 +                  dlimit.o tag.o
14402 +
14403 +vserver-$(CONFIG_INET) += inet.o
14404 +vserver-$(CONFIG_PROC_FS) += proc.o
14405 +vserver-$(CONFIG_VSERVER_DEBUG) += sysctl.o debug.o
14406 +vserver-$(CONFIG_VSERVER_HISTORY) += history.o
14407 +vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o
14408 +vserver-$(CONFIG_VSERVER_DEVICE) += device.o
14409 +
14410 diff -NurpP --minimal linux-4.9.135/kernel/vserver/cacct.c linux-4.9.135-vs2.3.9.8/kernel/vserver/cacct.c
14411 --- linux-4.9.135/kernel/vserver/cacct.c        1970-01-01 00:00:00.000000000 +0000
14412 +++ linux-4.9.135-vs2.3.9.8/kernel/vserver/cacct.c      2018-10-20 04:58:15.000000000 +0000
14413 @@ -0,0 +1,42 @@
14414 +/*
14415 + *  linux/kernel/vserver/cacct.c
14416 + *
14417 + *  Virtual Server: Context Accounting
14418 + *
14419 + *  Copyright (C) 2006-2007 Herbert P?tzl
14420 + *
14421 + *  V0.01  added accounting stats
14422 + *
14423 + */
14424 +
14425 +#include <linux/types.h>
14426 +#include <linux/vs_context.h>
14427 +#include <linux/vserver/cacct_cmd.h>
14428 +#include <linux/vserver/cacct_int.h>
14429 +
14430 +#include <asm/errno.h>
14431 +#include <asm/uaccess.h>
14432 +
14433 +
14434 +int vc_sock_stat(struct vx_info *vxi, void __user *data)
14435 +{
14436 +       struct vcmd_sock_stat_v0 vc_data;
14437 +       int j, field;
14438 +
14439 +       if (copy_from_user(&vc_data, data, sizeof(vc_data)))
14440 +               return -EFAULT;
14441 +
14442 +       field = vc_data.field;
14443 +       if ((field < 0) || (field >= VXA_SOCK_SIZE))
14444 +               return -EINVAL;
14445 +
14446 +       for (j = 0; j < 3; j++) {
14447 +               vc_data.count[j] = vx_sock_count(&vxi->cacct, field, j);
14448 +               vc_data.total[j] = vx_sock_total(&vxi->cacct, field, j);
14449 +       }
14450 +
14451 +       if (copy_to_user(data, &vc_data, sizeof(vc_data)))
14452 +               return -EFAULT;
14453 +       return 0;
14454 +}
14455 +
14456 diff -NurpP --minimal linux-4.9.135/kernel/vserver/cacct_init.h linux-4.9.135-vs2.3.9.8/kernel/vserver/cacct_init.h
14457 --- linux-4.9.135/kernel/vserver/cacct_init.h   1970-01-01 00:00:00.000000000 +0000
14458 +++ linux-4.9.135-vs2.3.9.8/kernel/vserver/cacct_init.h 2018-10-20 04:58:15.000000000 +0000
14459 @@ -0,0 +1,25 @@
14460 +
14461 +
14462 +static inline void vx_info_init_cacct(struct _vx_cacct *cacct)
14463 +{
14464 +       int i, j;
14465 +
14466 +
14467 +       for (i = 0; i < VXA_SOCK_SIZE; i++) {
14468 +               for (j = 0; j < 3; j++) {
14469 +                       atomic_long_set(&cacct->sock[i][j].count, 0);
14470 +                       atomic_long_set(&cacct->sock[i][j].total, 0);
14471 +               }
14472 +       }
14473 +       for (i = 0; i < 8; i++)
14474 +               atomic_set(&cacct->slab[i], 0);
14475 +       for (i = 0; i < 5; i++)
14476 +               for (j = 0; j < 4; j++)
14477 +                       atomic_set(&cacct->page[i][j], 0);
14478 +}
14479 +
14480 +static inline void vx_info_exit_cacct(struct _vx_cacct *cacct)
14481 +{
14482 +       return;
14483 +}
14484 +
14485 diff -NurpP --minimal linux-4.9.135/kernel/vserver/cacct_proc.h linux-4.9.135-vs2.3.9.8/kernel/vserver/cacct_proc.h
14486 --- linux-4.9.135/kernel/vserver/cacct_proc.h   1970-01-01 00:00:00.000000000 +0000
14487 +++ linux-4.9.135-vs2.3.9.8/kernel/vserver/cacct_proc.h 2018-10-20 04:58:15.000000000 +0000
14488 @@ -0,0 +1,53 @@
14489 +#ifndef _VX_CACCT_PROC_H
14490 +#define _VX_CACCT_PROC_H
14491 +
14492 +#include <linux/vserver/cacct_int.h>
14493 +
14494 +
14495 +#define VX_SOCKA_TOP   \
14496 +       "Type\t    recv #/bytes\t\t   send #/bytes\t\t    fail #/bytes\n"
14497 +
14498 +static inline int vx_info_proc_cacct(struct _vx_cacct *cacct, char *buffer)
14499 +{
14500 +       int i, j, length = 0;
14501 +       static char *type[VXA_SOCK_SIZE] = {
14502 +               "UNSPEC", "UNIX", "INET", "INET6", "PACKET", "OTHER"
14503 +       };
14504 +
14505 +       length += sprintf(buffer + length, VX_SOCKA_TOP);
14506 +       for (i = 0; i < VXA_SOCK_SIZE; i++) {
14507 +               length += sprintf(buffer + length, "%s:", type[i]);
14508 +               for (j = 0; j < 3; j++) {
14509 +                       length += sprintf(buffer + length,
14510 +                               "\t%10lu/%-10lu",
14511 +                               vx_sock_count(cacct, i, j),
14512 +                               vx_sock_total(cacct, i, j));
14513 +               }
14514 +               buffer[length++] = '\n';
14515 +       }
14516 +
14517 +       length += sprintf(buffer + length, "\n");
14518 +       length += sprintf(buffer + length,
14519 +               "slab:\t %8u %8u %8u %8u\n",
14520 +               atomic_read(&cacct->slab[1]),
14521 +               atomic_read(&cacct->slab[4]),
14522 +               atomic_read(&cacct->slab[0]),
14523 +               atomic_read(&cacct->slab[2]));
14524 +
14525 +       length += sprintf(buffer + length, "\n");
14526 +       for (i = 0; i < 5; i++) {
14527 +               length += sprintf(buffer + length,
14528 +                       "page[%d]: %8u %8u %8u %8u\t %8u %8u %8u %8u\n", i,
14529 +                       atomic_read(&cacct->page[i][0]),
14530 +                       atomic_read(&cacct->page[i][1]),
14531 +                       atomic_read(&cacct->page[i][2]),
14532 +                       atomic_read(&cacct->page[i][3]),
14533 +                       atomic_read(&cacct->page[i][4]),
14534 +                       atomic_read(&cacct->page[i][5]),
14535 +                       atomic_read(&cacct->page[i][6]),
14536 +                       atomic_read(&cacct->page[i][7]));
14537 +       }
14538 +       return length;
14539 +}
14540 +
14541 +#endif /* _VX_CACCT_PROC_H */
14542 diff -NurpP --minimal linux-4.9.135/kernel/vserver/context.c linux-4.9.135-vs2.3.9.8/kernel/vserver/context.c
14543 --- linux-4.9.135/kernel/vserver/context.c      1970-01-01 00:00:00.000000000 +0000
14544 +++ linux-4.9.135-vs2.3.9.8/kernel/vserver/context.c    2018-10-20 04:58:15.000000000 +0000
14545 @@ -0,0 +1,1119 @@
14546 +/*
14547 + *  linux/kernel/vserver/context.c
14548 + *
14549 + *  Virtual Server: Context Support
14550 + *
14551 + *  Copyright (C) 2003-2011  Herbert P?tzl
14552 + *
14553 + *  V0.01  context helper
14554 + *  V0.02  vx_ctx_kill syscall command
14555 + *  V0.03  replaced context_info calls
14556 + *  V0.04  redesign of struct (de)alloc
14557 + *  V0.05  rlimit basic implementation
14558 + *  V0.06  task_xid and info commands
14559 + *  V0.07  context flags and caps
14560 + *  V0.08  switch to RCU based hash
14561 + *  V0.09  revert to non RCU for now
14562 + *  V0.10  and back to working RCU hash
14563 + *  V0.11  and back to locking again
14564 + *  V0.12  referenced context store
14565 + *  V0.13  separate per cpu data
14566 + *  V0.14  changed vcmds to vxi arg
14567 + *  V0.15  added context stat
14568 + *  V0.16  have __create claim() the vxi
14569 + *  V0.17  removed older and legacy stuff
14570 + *  V0.18  added user credentials
14571 + *  V0.19  added warn mask
14572 + *
14573 + */
14574 +
14575 +#include <linux/slab.h>
14576 +#include <linux/types.h>
14577 +#include <linux/security.h>
14578 +#include <linux/pid_namespace.h>
14579 +#include <linux/capability.h>
14580 +
14581 +#include <linux/vserver/context.h>
14582 +#include <linux/vserver/network.h>
14583 +#include <linux/vserver/debug.h>
14584 +#include <linux/vserver/limit.h>
14585 +#include <linux/vserver/limit_int.h>
14586 +#include <linux/vserver/space.h>
14587 +#include <linux/init_task.h>
14588 +#include <linux/fs_struct.h>
14589 +#include <linux/cred.h>
14590 +
14591 +#include <linux/vs_context.h>
14592 +#include <linux/vs_limit.h>
14593 +#include <linux/vs_pid.h>
14594 +#include <linux/vserver/context_cmd.h>
14595 +
14596 +#include "cvirt_init.h"
14597 +#include "cacct_init.h"
14598 +#include "limit_init.h"
14599 +#include "sched_init.h"
14600 +
14601 +
14602 +atomic_t vx_global_ctotal      = ATOMIC_INIT(0);
14603 +atomic_t vx_global_cactive     = ATOMIC_INIT(0);
14604 +
14605 +
14606 +/*     now inactive context structures */
14607 +
14608 +static struct hlist_head vx_info_inactive = HLIST_HEAD_INIT;
14609 +
14610 +static DEFINE_SPINLOCK(vx_info_inactive_lock);
14611 +
14612 +
14613 +/*     __alloc_vx_info()
14614 +
14615 +       * allocate an initialized vx_info struct
14616 +       * doesn't make it visible (hash)                        */
14617 +
14618 +static struct vx_info *__alloc_vx_info(vxid_t xid)
14619 +{
14620 +       struct vx_info *new = NULL;
14621 +       int cpu, index;
14622 +
14623 +       vxdprintk(VXD_CBIT(xid, 0), "alloc_vx_info(%d)*", xid);
14624 +
14625 +       /* would this benefit from a slab cache? */
14626 +       new = kmalloc(sizeof(struct vx_info), GFP_KERNEL);
14627 +       if (!new)
14628 +               return 0;
14629 +
14630 +       memset(new, 0, sizeof(struct vx_info));
14631 +#ifdef CONFIG_SMP
14632 +       new->ptr_pc = alloc_percpu(struct _vx_info_pc);
14633 +       if (!new->ptr_pc)
14634 +               goto error;
14635 +#endif
14636 +       new->vx_id = xid;
14637 +       INIT_HLIST_NODE(&new->vx_hlist);
14638 +       atomic_set(&new->vx_usecnt, 0);
14639 +       atomic_set(&new->vx_tasks, 0);
14640 +       new->vx_parent = NULL;
14641 +       new->vx_state = 0;
14642 +       init_waitqueue_head(&new->vx_wait);
14643 +
14644 +       /* prepare reaper */
14645 +       get_task_struct(init_pid_ns.child_reaper);
14646 +       new->vx_reaper = init_pid_ns.child_reaper;
14647 +       new->vx_badness_bias = 0;
14648 +
14649 +       /* rest of init goes here */
14650 +       vx_info_init_limit(&new->limit);
14651 +       vx_info_init_sched(&new->sched);
14652 +       vx_info_init_cvirt(&new->cvirt);
14653 +       vx_info_init_cacct(&new->cacct);
14654 +
14655 +       /* per cpu data structures */
14656 +       for_each_possible_cpu(cpu) {
14657 +               vx_info_init_sched_pc(
14658 +                       &vx_per_cpu(new, sched_pc, cpu), cpu);
14659 +               vx_info_init_cvirt_pc(
14660 +                       &vx_per_cpu(new, cvirt_pc, cpu), cpu);
14661 +       }
14662 +
14663 +       new->vx_flags = VXF_INIT_SET;
14664 +       new->vx_bcaps = CAP_FULL_SET;   // maybe ~CAP_SETPCAP
14665 +       new->vx_ccaps = 0;
14666 +       new->vx_umask = 0;
14667 +       new->vx_wmask = 0;
14668 +
14669 +       new->reboot_cmd = 0;
14670 +       new->exit_code = 0;
14671 +
14672 +       // preconfig spaces
14673 +       for (index = 0; index < VX_SPACES; index++) {
14674 +               struct _vx_space *space = &new->space[index];
14675 +
14676 +               // filesystem
14677 +               spin_lock(&init_fs.lock);
14678 +               init_fs.users++;
14679 +               spin_unlock(&init_fs.lock);
14680 +               space->vx_fs = &init_fs;
14681 +
14682 +               /* FIXME: do we want defaults? */
14683 +               // space->vx_real_cred = 0;
14684 +               // space->vx_cred = 0;
14685 +       }
14686 +
14687 +
14688 +       vxdprintk(VXD_CBIT(xid, 0),
14689 +               "alloc_vx_info(%d) = %p", xid, new);
14690 +       vxh_alloc_vx_info(new);
14691 +       atomic_inc(&vx_global_ctotal);
14692 +       return new;
14693 +#ifdef CONFIG_SMP
14694 +error:
14695 +       kfree(new);
14696 +       return 0;
14697 +#endif
14698 +}
14699 +
14700 +/*     __dealloc_vx_info()
14701 +
14702 +       * final disposal of vx_info                             */
14703 +
14704 +static void __dealloc_vx_info(struct vx_info *vxi)
14705 +{
14706 +#ifdef CONFIG_VSERVER_WARN
14707 +       struct vx_info_save vxis;
14708 +       int cpu;
14709 +#endif
14710 +       vxdprintk(VXD_CBIT(xid, 0),
14711 +               "dealloc_vx_info(%p)", vxi);
14712 +       vxh_dealloc_vx_info(vxi);
14713 +
14714 +#ifdef CONFIG_VSERVER_WARN
14715 +       enter_vx_info(vxi, &vxis);
14716 +       vx_info_exit_limit(&vxi->limit);
14717 +       vx_info_exit_sched(&vxi->sched);
14718 +       vx_info_exit_cvirt(&vxi->cvirt);
14719 +       vx_info_exit_cacct(&vxi->cacct);
14720 +
14721 +       for_each_possible_cpu(cpu) {
14722 +               vx_info_exit_sched_pc(
14723 +                       &vx_per_cpu(vxi, sched_pc, cpu), cpu);
14724 +               vx_info_exit_cvirt_pc(
14725 +                       &vx_per_cpu(vxi, cvirt_pc, cpu), cpu);
14726 +       }
14727 +       leave_vx_info(&vxis);
14728 +#endif
14729 +
14730 +       vxi->vx_id = -1;
14731 +       vxi->vx_state |= VXS_RELEASED;
14732 +
14733 +#ifdef CONFIG_SMP
14734 +       free_percpu(vxi->ptr_pc);
14735 +#endif
14736 +       kfree(vxi);
14737 +       atomic_dec(&vx_global_ctotal);
14738 +}
14739 +
14740 +static void __shutdown_vx_info(struct vx_info *vxi)
14741 +{
14742 +       struct nsproxy *nsproxy;
14743 +       struct fs_struct *fs;
14744 +       struct cred *cred;
14745 +       int index, kill;
14746 +
14747 +       might_sleep();
14748 +
14749 +       vxi->vx_state |= VXS_SHUTDOWN;
14750 +       vs_state_change(vxi, VSC_SHUTDOWN);
14751 +
14752 +       for (index = 0; index < VX_SPACES; index++) {
14753 +               struct _vx_space *space = &vxi->space[index];
14754 +
14755 +               nsproxy = xchg(&space->vx_nsproxy, NULL);
14756 +               if (nsproxy)
14757 +                       put_nsproxy(nsproxy);
14758 +
14759 +               fs = xchg(&space->vx_fs, NULL);
14760 +               spin_lock(&fs->lock);
14761 +               kill = !--fs->users;
14762 +               spin_unlock(&fs->lock);
14763 +               if (kill)
14764 +                       free_fs_struct(fs);
14765 +
14766 +               cred = (struct cred *)xchg(&space->vx_cred, NULL);
14767 +               if (cred)
14768 +                       abort_creds(cred);
14769 +       }
14770 +}
14771 +
14772 +/* exported stuff */
14773 +
14774 +void free_vx_info(struct vx_info *vxi)
14775 +{
14776 +       unsigned long flags;
14777 +       unsigned index;
14778 +
14779 +       /* check for reference counts first */
14780 +       BUG_ON(atomic_read(&vxi->vx_usecnt));
14781 +       BUG_ON(atomic_read(&vxi->vx_tasks));
14782 +
14783 +       /* context must not be hashed */
14784 +       BUG_ON(vx_info_state(vxi, VXS_HASHED));
14785 +
14786 +       /* context shutdown is mandatory */
14787 +       BUG_ON(!vx_info_state(vxi, VXS_SHUTDOWN));
14788 +
14789 +       /* spaces check */
14790 +       for (index = 0; index < VX_SPACES; index++) {
14791 +               struct _vx_space *space = &vxi->space[index];
14792 +
14793 +               BUG_ON(space->vx_nsproxy);
14794 +               BUG_ON(space->vx_fs);
14795 +               // BUG_ON(space->vx_real_cred);
14796 +               // BUG_ON(space->vx_cred);
14797 +       }
14798 +
14799 +       spin_lock_irqsave(&vx_info_inactive_lock, flags);
14800 +       hlist_del(&vxi->vx_hlist);
14801 +       spin_unlock_irqrestore(&vx_info_inactive_lock, flags);
14802 +
14803 +       __dealloc_vx_info(vxi);
14804 +}
14805 +
14806 +
14807 +/*     hash table for vx_info hash */
14808 +
14809 +#define VX_HASH_SIZE   13
14810 +
14811 +static struct hlist_head vx_info_hash[VX_HASH_SIZE] =
14812 +       { [0 ... VX_HASH_SIZE-1] = HLIST_HEAD_INIT };
14813 +
14814 +static DEFINE_SPINLOCK(vx_info_hash_lock);
14815 +
14816 +
14817 +static inline unsigned int __hashval(vxid_t xid)
14818 +{
14819 +       return (xid % VX_HASH_SIZE);
14820 +}
14821 +
14822 +
14823 +
14824 +/*     __hash_vx_info()
14825 +
14826 +       * add the vxi to the global hash table
14827 +       * requires the hash_lock to be held                     */
14828 +
14829 +static inline void __hash_vx_info(struct vx_info *vxi)
14830 +{
14831 +       struct hlist_head *head;
14832 +
14833 +       vxd_assert_lock(&vx_info_hash_lock);
14834 +       vxdprintk(VXD_CBIT(xid, 4),
14835 +               "__hash_vx_info: %p[#%d]", vxi, vxi->vx_id);
14836 +       vxh_hash_vx_info(vxi);
14837 +
14838 +       /* context must not be hashed */
14839 +       BUG_ON(vx_info_state(vxi, VXS_HASHED));
14840 +
14841 +       vxi->vx_state |= VXS_HASHED;
14842 +       head = &vx_info_hash[__hashval(vxi->vx_id)];
14843 +       hlist_add_head(&vxi->vx_hlist, head);
14844 +       atomic_inc(&vx_global_cactive);
14845 +}
14846 +
14847 +/*     __unhash_vx_info()
14848 +
14849 +       * remove the vxi from the global hash table
14850 +       * requires the hash_lock to be held                     */
14851 +
14852 +static inline void __unhash_vx_info(struct vx_info *vxi)
14853 +{
14854 +       unsigned long flags;
14855 +
14856 +       vxd_assert_lock(&vx_info_hash_lock);
14857 +       vxdprintk(VXD_CBIT(xid, 4),
14858 +               "__unhash_vx_info: %p[#%d.%d.%d]", vxi, vxi->vx_id,
14859 +               atomic_read(&vxi->vx_usecnt), atomic_read(&vxi->vx_tasks));
14860 +       vxh_unhash_vx_info(vxi);
14861 +
14862 +       /* context must be hashed */
14863 +       BUG_ON(!vx_info_state(vxi, VXS_HASHED));
14864 +       /* but without tasks */
14865 +       BUG_ON(atomic_read(&vxi->vx_tasks));
14866 +
14867 +       vxi->vx_state &= ~VXS_HASHED;
14868 +       hlist_del_init(&vxi->vx_hlist);
14869 +       spin_lock_irqsave(&vx_info_inactive_lock, flags);
14870 +       hlist_add_head(&vxi->vx_hlist, &vx_info_inactive);
14871 +       spin_unlock_irqrestore(&vx_info_inactive_lock, flags);
14872 +       atomic_dec(&vx_global_cactive);
14873 +}
14874 +
14875 +
14876 +/*     __lookup_vx_info()
14877 +
14878 +       * requires the hash_lock to be held
14879 +       * doesn't increment the vx_refcnt                       */
14880 +
14881 +static inline struct vx_info *__lookup_vx_info(vxid_t xid)
14882 +{
14883 +       struct hlist_head *head = &vx_info_hash[__hashval(xid)];
14884 +       struct hlist_node *pos;
14885 +       struct vx_info *vxi;
14886 +
14887 +       vxd_assert_lock(&vx_info_hash_lock);
14888 +       hlist_for_each(pos, head) {
14889 +               vxi = hlist_entry(pos, struct vx_info, vx_hlist);
14890 +
14891 +               if (vxi->vx_id == xid)
14892 +                       goto found;
14893 +       }
14894 +       vxi = NULL;
14895 +found:
14896 +       vxdprintk(VXD_CBIT(xid, 0),
14897 +               "__lookup_vx_info(#%u): %p[#%u]",
14898 +               xid, vxi, vxi ? vxi->vx_id : 0);
14899 +       vxh_lookup_vx_info(vxi, xid);
14900 +       return vxi;
14901 +}
14902 +
14903 +
14904 +/*     __create_vx_info()
14905 +
14906 +       * create the requested context
14907 +       * get(), claim() and hash it                            */
14908 +
14909 +static struct vx_info *__create_vx_info(int id)
14910 +{
14911 +       struct vx_info *new, *vxi = NULL;
14912 +
14913 +       vxdprintk(VXD_CBIT(xid, 1), "create_vx_info(%d)*", id);
14914 +
14915 +       if (!(new = __alloc_vx_info(id)))
14916 +               return ERR_PTR(-ENOMEM);
14917 +
14918 +       /* required to make dynamic xids unique */
14919 +       spin_lock(&vx_info_hash_lock);
14920 +
14921 +       /* static context requested */
14922 +       if ((vxi = __lookup_vx_info(id))) {
14923 +               vxdprintk(VXD_CBIT(xid, 0),
14924 +                       "create_vx_info(%d) = %p (already there)", id, vxi);
14925 +               if (vx_info_flags(vxi, VXF_STATE_SETUP, 0))
14926 +                       vxi = ERR_PTR(-EBUSY);
14927 +               else
14928 +                       vxi = ERR_PTR(-EEXIST);
14929 +               goto out_unlock;
14930 +       }
14931 +       /* new context */
14932 +       vxdprintk(VXD_CBIT(xid, 0),
14933 +               "create_vx_info(%d) = %p (new)", id, new);
14934 +       claim_vx_info(new, NULL);
14935 +       __hash_vx_info(get_vx_info(new));
14936 +       vxi = new, new = NULL;
14937 +
14938 +out_unlock:
14939 +       spin_unlock(&vx_info_hash_lock);
14940 +       vxh_create_vx_info(IS_ERR(vxi) ? NULL : vxi, id);
14941 +       if (new)
14942 +               __dealloc_vx_info(new);
14943 +       return vxi;
14944 +}
14945 +
14946 +
14947 +/*     exported stuff                                          */
14948 +
14949 +
14950 +void unhash_vx_info(struct vx_info *vxi)
14951 +{
14952 +       spin_lock(&vx_info_hash_lock);
14953 +       __unhash_vx_info(vxi);
14954 +       spin_unlock(&vx_info_hash_lock);
14955 +       __shutdown_vx_info(vxi);
14956 +       __wakeup_vx_info(vxi);
14957 +}
14958 +
14959 +
14960 +/*     lookup_vx_info()
14961 +
14962 +       * search for a vx_info and get() it
14963 +       * negative id means current                             */
14964 +
14965 +struct vx_info *lookup_vx_info(int id)
14966 +{
14967 +       struct vx_info *vxi = NULL;
14968 +
14969 +       if (id < 0) {
14970 +               vxi = get_vx_info(current_vx_info());
14971 +       } else if (id > 1) {
14972 +               spin_lock(&vx_info_hash_lock);
14973 +               vxi = get_vx_info(__lookup_vx_info(id));
14974 +               spin_unlock(&vx_info_hash_lock);
14975 +       }
14976 +       return vxi;
14977 +}
14978 +
14979 +/*     xid_is_hashed()
14980 +
14981 +       * verify that xid is still hashed                       */
14982 +
14983 +int xid_is_hashed(vxid_t xid)
14984 +{
14985 +       int hashed;
14986 +
14987 +       spin_lock(&vx_info_hash_lock);
14988 +       hashed = (__lookup_vx_info(xid) != NULL);
14989 +       spin_unlock(&vx_info_hash_lock);
14990 +       return hashed;
14991 +}
14992 +
14993 +#ifdef CONFIG_PROC_FS
14994 +
14995 +/*     get_xid_list()
14996 +
14997 +       * get a subset of hashed xids for proc
14998 +       * assumes size is at least one                          */
14999 +
15000 +int get_xid_list(int index, unsigned int *xids, int size)
15001 +{
15002 +       int hindex, nr_xids = 0;
15003 +
15004 +       /* only show current and children */
15005 +       if (!vx_check(0, VS_ADMIN | VS_WATCH)) {
15006 +               if (index > 0)
15007 +                       return 0;
15008 +               xids[nr_xids] = vx_current_xid();
15009 +               return 1;
15010 +       }
15011 +
15012 +       for (hindex = 0; hindex < VX_HASH_SIZE; hindex++) {
15013 +               struct hlist_head *head = &vx_info_hash[hindex];
15014 +               struct hlist_node *pos;
15015 +
15016 +               spin_lock(&vx_info_hash_lock);
15017 +               hlist_for_each(pos, head) {
15018 +                       struct vx_info *vxi;
15019 +
15020 +                       if (--index > 0)
15021 +                               continue;
15022 +
15023 +                       vxi = hlist_entry(pos, struct vx_info, vx_hlist);
15024 +                       xids[nr_xids] = vxi->vx_id;
15025 +                       if (++nr_xids >= size) {
15026 +                               spin_unlock(&vx_info_hash_lock);
15027 +                               goto out;
15028 +                       }
15029 +               }
15030 +               /* keep the lock time short */
15031 +               spin_unlock(&vx_info_hash_lock);
15032 +       }
15033 +out:
15034 +       return nr_xids;
15035 +}
15036 +#endif
15037 +
15038 +#ifdef CONFIG_VSERVER_DEBUG
15039 +
15040 +void   dump_vx_info_inactive(int level)
15041 +{
15042 +       struct hlist_node *entry, *next;
15043 +
15044 +       hlist_for_each_safe(entry, next, &vx_info_inactive) {
15045 +               struct vx_info *vxi =
15046 +                       list_entry(entry, struct vx_info, vx_hlist);
15047 +
15048 +               dump_vx_info(vxi, level);
15049 +       }
15050 +}
15051 +
15052 +#endif
15053 +
15054 +#if 0
15055 +int vx_migrate_user(struct task_struct *p, struct vx_info *vxi)
15056 +{
15057 +       struct user_struct *new_user, *old_user;
15058 +
15059 +       if (!p || !vxi)
15060 +               BUG();
15061 +
15062 +       if (vx_info_flags(vxi, VXF_INFO_PRIVATE, 0))
15063 +               return -EACCES;
15064 +
15065 +       new_user = alloc_uid(vxi->vx_id, p->uid);
15066 +       if (!new_user)
15067 +               return -ENOMEM;
15068 +
15069 +       old_user = p->user;
15070 +       if (new_user != old_user) {
15071 +               atomic_inc(&new_user->processes);
15072 +               atomic_dec(&old_user->processes);
15073 +               p->user = new_user;
15074 +       }
15075 +       free_uid(old_user);
15076 +       return 0;
15077 +}
15078 +#endif
15079 +
15080 +#if 0
15081 +void vx_mask_cap_bset(struct vx_info *vxi, struct task_struct *p)
15082 +{
15083 +       // p->cap_effective &= vxi->vx_cap_bset;
15084 +       p->cap_effective =
15085 +               cap_intersect(p->cap_effective, vxi->cap_bset);
15086 +       // p->cap_inheritable &= vxi->vx_cap_bset;
15087 +       p->cap_inheritable =
15088 +               cap_intersect(p->cap_inheritable, vxi->cap_bset);
15089 +       // p->cap_permitted &= vxi->vx_cap_bset;
15090 +       p->cap_permitted =
15091 +               cap_intersect(p->cap_permitted, vxi->cap_bset);
15092 +}
15093 +#endif
15094 +
15095 +
15096 +#include <linux/file.h>
15097 +#include <linux/fdtable.h>
15098 +
15099 +static int vx_openfd_task(struct task_struct *tsk)
15100 +{
15101 +       struct files_struct *files = tsk->files;
15102 +       struct fdtable *fdt;
15103 +       const unsigned long *bptr;
15104 +       int count, total;
15105 +
15106 +       /* no rcu_read_lock() because of spin_lock() */
15107 +       spin_lock(&files->file_lock);
15108 +       fdt = files_fdtable(files);
15109 +       bptr = fdt->open_fds;
15110 +       count = fdt->max_fds / (sizeof(unsigned long) * 8);
15111 +       for (total = 0; count > 0; count--) {
15112 +               if (*bptr)
15113 +                       total += hweight_long(*bptr);
15114 +               bptr++;
15115 +       }
15116 +       spin_unlock(&files->file_lock);
15117 +       return total;
15118 +}
15119 +
15120 +
15121 +/*     for *space compatibility */
15122 +
15123 +asmlinkage long sys_unshare(unsigned long);
15124 +
15125 +/*
15126 + *     migrate task to new context
15127 + *     gets vxi, puts old_vxi on change
15128 + *     optionally unshares namespaces (hack)
15129 + */
15130 +
15131 +int vx_migrate_task(struct task_struct *p, struct vx_info *vxi, int unshare)
15132 +{
15133 +       struct vx_info *old_vxi;
15134 +       int ret = 0;
15135 +
15136 +       if (!p || !vxi)
15137 +               BUG();
15138 +
15139 +       vxdprintk(VXD_CBIT(xid, 5),
15140 +               "vx_migrate_task(%p,%p[#%d.%d])", p, vxi,
15141 +               vxi->vx_id, atomic_read(&vxi->vx_usecnt));
15142 +
15143 +       if (vx_info_flags(vxi, VXF_INFO_PRIVATE, 0) &&
15144 +               !vx_info_flags(vxi, VXF_STATE_SETUP, 0))
15145 +               return -EACCES;
15146 +
15147 +       if (vx_info_state(vxi, VXS_SHUTDOWN))
15148 +               return -EFAULT;
15149 +
15150 +       old_vxi = task_get_vx_info(p);
15151 +       if (old_vxi == vxi)
15152 +               goto out;
15153 +
15154 +//     if (!(ret = vx_migrate_user(p, vxi))) {
15155 +       {
15156 +               int openfd;
15157 +
15158 +               task_lock(p);
15159 +               openfd = vx_openfd_task(p);
15160 +
15161 +               if (old_vxi) {
15162 +                       atomic_dec(&old_vxi->cvirt.nr_threads);
15163 +                       atomic_dec(&old_vxi->cvirt.nr_running);
15164 +                       __rlim_dec(&old_vxi->limit, RLIMIT_NPROC);
15165 +                       /* FIXME: what about the struct files here? */
15166 +                       __rlim_sub(&old_vxi->limit, VLIMIT_OPENFD, openfd);
15167 +                       /* account for the executable */
15168 +                       __rlim_dec(&old_vxi->limit, VLIMIT_DENTRY);
15169 +               }
15170 +               atomic_inc(&vxi->cvirt.nr_threads);
15171 +               atomic_inc(&vxi->cvirt.nr_running);
15172 +               __rlim_inc(&vxi->limit, RLIMIT_NPROC);
15173 +               /* FIXME: what about the struct files here? */
15174 +               __rlim_add(&vxi->limit, VLIMIT_OPENFD, openfd);
15175 +               /* account for the executable */
15176 +               __rlim_inc(&vxi->limit, VLIMIT_DENTRY);
15177 +
15178 +               if (old_vxi) {
15179 +                       release_vx_info(old_vxi, p);
15180 +                       clr_vx_info(&p->vx_info);
15181 +               }
15182 +               claim_vx_info(vxi, p);
15183 +               set_vx_info(&p->vx_info, vxi);
15184 +               p->xid = vxi->vx_id;
15185 +
15186 +               vxdprintk(VXD_CBIT(xid, 5),
15187 +                       "moved task %p into vxi:%p[#%d]",
15188 +                       p, vxi, vxi->vx_id);
15189 +
15190 +               // vx_mask_cap_bset(vxi, p);
15191 +               task_unlock(p);
15192 +
15193 +               /* hack for *spaces to provide compatibility */
15194 +               if (unshare) {
15195 +                       struct nsproxy *old_nsp, *new_nsp;
15196 +
15197 +                       ret = unshare_nsproxy_namespaces(
15198 +                               CLONE_NEWUTS | CLONE_NEWIPC | CLONE_NEWUSER,
15199 +                               &new_nsp, NULL, NULL);
15200 +                       if (ret)
15201 +                               goto out;
15202 +
15203 +                       old_nsp = xchg(&p->nsproxy, new_nsp);
15204 +                       vx_set_space(vxi,
15205 +                               CLONE_NEWUTS | CLONE_NEWIPC | CLONE_NEWUSER, 0);
15206 +                       put_nsproxy(old_nsp);
15207 +               }
15208 +       }
15209 +out:
15210 +       put_vx_info(old_vxi);
15211 +       return ret;
15212 +}
15213 +
15214 +int vx_set_reaper(struct vx_info *vxi, struct task_struct *p)
15215 +{
15216 +       struct task_struct *old_reaper;
15217 +       struct vx_info *reaper_vxi;
15218 +
15219 +       if (!vxi)
15220 +               return -EINVAL;
15221 +
15222 +       vxdprintk(VXD_CBIT(xid, 6),
15223 +               "vx_set_reaper(%p[#%d],%p[#%d,%d])",
15224 +               vxi, vxi->vx_id, p, p->xid, p->pid);
15225 +
15226 +       old_reaper = vxi->vx_reaper;
15227 +       if (old_reaper == p)
15228 +               return 0;
15229 +
15230 +       reaper_vxi = task_get_vx_info(p);
15231 +       if (reaper_vxi && reaper_vxi != vxi) {
15232 +               vxwprintk(1,
15233 +                       "Unsuitable reaper [" VS_Q("%s") ",%u:#%u] "
15234 +                       "for [xid #%u]",
15235 +                       p->comm, p->pid, p->xid, vx_current_xid());
15236 +               goto out;
15237 +       }
15238 +
15239 +       /* set new child reaper */
15240 +       get_task_struct(p);
15241 +       vxi->vx_reaper = p;
15242 +       put_task_struct(old_reaper);
15243 +out:
15244 +       put_vx_info(reaper_vxi);
15245 +       return 0;
15246 +}
15247 +
15248 +int vx_set_init(struct vx_info *vxi, struct task_struct *p)
15249 +{
15250 +       if (!vxi)
15251 +               return -EINVAL;
15252 +
15253 +       vxdprintk(VXD_CBIT(xid, 6),
15254 +               "vx_set_init(%p[#%d],%p[#%d,%d,%d])",
15255 +               vxi, vxi->vx_id, p, p->xid, p->pid, p->tgid);
15256 +
15257 +       vxi->vx_flags &= ~VXF_STATE_INIT;
15258 +       // vxi->vx_initpid = p->tgid;
15259 +       vxi->vx_initpid = p->pid;
15260 +       return 0;
15261 +}
15262 +
15263 +void vx_exit_init(struct vx_info *vxi, struct task_struct *p, int code)
15264 +{
15265 +       vxdprintk(VXD_CBIT(xid, 6),
15266 +               "vx_exit_init(%p[#%d],%p[#%d,%d,%d])",
15267 +               vxi, vxi->vx_id, p, p->xid, p->pid, p->tgid);
15268 +
15269 +       vxi->exit_code = code;
15270 +       vxi->vx_initpid = 0;
15271 +}
15272 +
15273 +
15274 +void vx_set_persistent(struct vx_info *vxi)
15275 +{
15276 +       vxdprintk(VXD_CBIT(xid, 6),
15277 +               "vx_set_persistent(%p[#%d])", vxi, vxi->vx_id);
15278 +
15279 +       get_vx_info(vxi);
15280 +       claim_vx_info(vxi, NULL);
15281 +}
15282 +
15283 +void vx_clear_persistent(struct vx_info *vxi)
15284 +{
15285 +       vxdprintk(VXD_CBIT(xid, 6),
15286 +               "vx_clear_persistent(%p[#%d])", vxi, vxi->vx_id);
15287 +
15288 +       release_vx_info(vxi, NULL);
15289 +       put_vx_info(vxi);
15290 +}
15291 +
15292 +void vx_update_persistent(struct vx_info *vxi)
15293 +{
15294 +       if (vx_info_flags(vxi, VXF_PERSISTENT, 0))
15295 +               vx_set_persistent(vxi);
15296 +       else
15297 +               vx_clear_persistent(vxi);
15298 +}
15299 +
15300 +
15301 +/*     task must be current or locked          */
15302 +
15303 +void   exit_vx_info(struct task_struct *p, int code)
15304 +{
15305 +       struct vx_info *vxi = p->vx_info;
15306 +
15307 +       if (vxi) {
15308 +               atomic_dec(&vxi->cvirt.nr_threads);
15309 +               vx_nproc_dec(p);
15310 +
15311 +               vxi->exit_code = code;
15312 +               release_vx_info(vxi, p);
15313 +       }
15314 +}
15315 +
15316 +void   exit_vx_info_early(struct task_struct *p, int code)
15317 +{
15318 +       struct vx_info *vxi = p->vx_info;
15319 +
15320 +       if (vxi) {
15321 +               if (vxi->vx_initpid == p->pid)
15322 +                       vx_exit_init(vxi, p, code);
15323 +               if (vxi->vx_reaper == p)
15324 +                       vx_set_reaper(vxi, init_pid_ns.child_reaper);
15325 +       }
15326 +}
15327 +
15328 +
15329 +/* vserver syscall commands below here */
15330 +
15331 +/* taks xid and vx_info functions */
15332 +
15333 +#include <asm/uaccess.h>
15334 +
15335 +
15336 +int vc_task_xid(uint32_t id)
15337 +{
15338 +       vxid_t xid;
15339 +
15340 +       if (id) {
15341 +               struct task_struct *tsk;
15342 +
15343 +               rcu_read_lock();
15344 +               tsk = find_task_by_real_pid(id);
15345 +               xid = (tsk) ? tsk->xid : -ESRCH;
15346 +               rcu_read_unlock();
15347 +       } else
15348 +               xid = vx_current_xid();
15349 +       return xid;
15350 +}
15351 +
15352 +
15353 +int vc_vx_info(struct vx_info *vxi, void __user *data)
15354 +{
15355 +       struct vcmd_vx_info_v0 vc_data;
15356 +
15357 +       vc_data.xid = vxi->vx_id;
15358 +       vc_data.initpid = vxi->vx_initpid;
15359 +
15360 +       if (copy_to_user(data, &vc_data, sizeof(vc_data)))
15361 +               return -EFAULT;
15362 +       return 0;
15363 +}
15364 +
15365 +
15366 +int vc_ctx_stat(struct vx_info *vxi, void __user *data)
15367 +{
15368 +       struct vcmd_ctx_stat_v0 vc_data;
15369 +
15370 +       vc_data.usecnt = atomic_read(&vxi->vx_usecnt);
15371 +       vc_data.tasks = atomic_read(&vxi->vx_tasks);
15372 +
15373 +       if (copy_to_user(data, &vc_data, sizeof(vc_data)))
15374 +               return -EFAULT;
15375 +       return 0;
15376 +}
15377 +
15378 +
15379 +/* context functions */
15380 +
15381 +int vc_ctx_create(uint32_t xid, void __user *data)
15382 +{
15383 +       struct vcmd_ctx_create vc_data = { .flagword = VXF_INIT_SET };
15384 +       struct vx_info *new_vxi;
15385 +       int ret;
15386 +
15387 +       if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
15388 +               return -EFAULT;
15389 +
15390 +       if ((xid > MAX_S_CONTEXT) || (xid < 2))
15391 +               return -EINVAL;
15392 +
15393 +       new_vxi = __create_vx_info(xid);
15394 +       if (IS_ERR(new_vxi))
15395 +               return PTR_ERR(new_vxi);
15396 +
15397 +       /* initial flags */
15398 +       new_vxi->vx_flags = vc_data.flagword;
15399 +
15400 +       ret = -ENOEXEC;
15401 +       if (vs_state_change(new_vxi, VSC_STARTUP))
15402 +               goto out;
15403 +
15404 +       ret = vx_migrate_task(current, new_vxi, (!data));
15405 +       if (ret)
15406 +               goto out;
15407 +
15408 +       /* return context id on success */
15409 +       ret = new_vxi->vx_id;
15410 +
15411 +       /* get a reference for persistent contexts */
15412 +       if ((vc_data.flagword & VXF_PERSISTENT))
15413 +               vx_set_persistent(new_vxi);
15414 +out:
15415 +       release_vx_info(new_vxi, NULL);
15416 +       put_vx_info(new_vxi);
15417 +       return ret;
15418 +}
15419 +
15420 +
15421 +int vc_ctx_migrate(struct vx_info *vxi, void __user *data)
15422 +{
15423 +       struct vcmd_ctx_migrate vc_data = { .flagword = 0 };
15424 +       int ret;
15425 +
15426 +       if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
15427 +               return -EFAULT;
15428 +
15429 +       ret = vx_migrate_task(current, vxi, 0);
15430 +       if (ret)
15431 +               return ret;
15432 +       if (vc_data.flagword & VXM_SET_INIT)
15433 +               ret = vx_set_init(vxi, current);
15434 +       if (ret)
15435 +               return ret;
15436 +       if (vc_data.flagword & VXM_SET_REAPER)
15437 +               ret = vx_set_reaper(vxi, current);
15438 +       return ret;
15439 +}
15440 +
15441 +
15442 +int vc_get_cflags(struct vx_info *vxi, void __user *data)
15443 +{
15444 +       struct vcmd_ctx_flags_v0 vc_data;
15445 +
15446 +       vc_data.flagword = vxi->vx_flags;
15447 +
15448 +       /* special STATE flag handling */
15449 +       vc_data.mask = vs_mask_flags(~0ULL, vxi->vx_flags, VXF_ONE_TIME);
15450 +
15451 +       if (copy_to_user(data, &vc_data, sizeof(vc_data)))
15452 +               return -EFAULT;
15453 +       return 0;
15454 +}
15455 +
15456 +int vc_set_cflags(struct vx_info *vxi, void __user *data)
15457 +{
15458 +       struct vcmd_ctx_flags_v0 vc_data;
15459 +       uint64_t mask, trigger;
15460 +
15461 +       if (copy_from_user(&vc_data, data, sizeof(vc_data)))
15462 +               return -EFAULT;
15463 +
15464 +       /* special STATE flag handling */
15465 +       mask = vs_mask_mask(vc_data.mask, vxi->vx_flags, VXF_ONE_TIME);
15466 +       trigger = (mask & vxi->vx_flags) ^ (mask & vc_data.flagword);
15467 +
15468 +       if (vxi == current_vx_info()) {
15469 +               /* if (trigger & VXF_STATE_SETUP)
15470 +                       vx_mask_cap_bset(vxi, current); */
15471 +               if (trigger & VXF_STATE_INIT) {
15472 +                       int ret;
15473 +
15474 +                       ret = vx_set_init(vxi, current);
15475 +                       if (ret)
15476 +                               return ret;
15477 +                       ret = vx_set_reaper(vxi, current);
15478 +                       if (ret)
15479 +                               return ret;
15480 +               }
15481 +       }
15482 +
15483 +       vxi->vx_flags = vs_mask_flags(vxi->vx_flags,
15484 +               vc_data.flagword, mask);
15485 +       if (trigger & VXF_PERSISTENT)
15486 +               vx_update_persistent(vxi);
15487 +
15488 +       return 0;
15489 +}
15490 +
15491 +
15492 +static inline uint64_t caps_from_cap_t(kernel_cap_t c)
15493 +{
15494 +       uint64_t v = c.cap[0] | ((uint64_t)c.cap[1] << 32);
15495 +
15496 +       // printk("caps_from_cap_t(%08x:%08x) = %016llx\n", c.cap[1], c.cap[0], v);
15497 +       return v;
15498 +}
15499 +
15500 +static inline kernel_cap_t cap_t_from_caps(uint64_t v)
15501 +{
15502 +       kernel_cap_t c = __cap_empty_set;
15503 +
15504 +       c.cap[0] = v & 0xFFFFFFFF;
15505 +       c.cap[1] = (v >> 32) & 0xFFFFFFFF;
15506 +
15507 +       // printk("cap_t_from_caps(%016llx) = %08x:%08x\n", v, c.cap[1], c.cap[0]);
15508 +       return c;
15509 +}
15510 +
15511 +
15512 +static int do_get_caps(struct vx_info *vxi, uint64_t *bcaps, uint64_t *ccaps)
15513 +{
15514 +       if (bcaps)
15515 +               *bcaps = caps_from_cap_t(vxi->vx_bcaps);
15516 +       if (ccaps)
15517 +               *ccaps = vxi->vx_ccaps;
15518 +
15519 +       return 0;
15520 +}
15521 +
15522 +int vc_get_ccaps(struct vx_info *vxi, void __user *data)
15523 +{
15524 +       struct vcmd_ctx_caps_v1 vc_data;
15525 +       int ret;
15526 +
15527 +       ret = do_get_caps(vxi, NULL, &vc_data.ccaps);
15528 +       if (ret)
15529 +               return ret;
15530 +       vc_data.cmask = ~0ULL;
15531 +
15532 +       if (copy_to_user(data, &vc_data, sizeof(vc_data)))
15533 +               return -EFAULT;
15534 +       return 0;
15535 +}
15536 +
15537 +static int do_set_caps(struct vx_info *vxi,
15538 +       uint64_t bcaps, uint64_t bmask, uint64_t ccaps, uint64_t cmask)
15539 +{
15540 +       uint64_t bcold = caps_from_cap_t(vxi->vx_bcaps);
15541 +
15542 +#if 0
15543 +       printk("do_set_caps(%16llx, %16llx, %16llx, %16llx)\n",
15544 +               bcaps, bmask, ccaps, cmask);
15545 +#endif
15546 +       vxi->vx_bcaps = cap_t_from_caps(
15547 +               vs_mask_flags(bcold, bcaps, bmask));
15548 +       vxi->vx_ccaps = vs_mask_flags(vxi->vx_ccaps, ccaps, cmask);
15549 +
15550 +       return 0;
15551 +}
15552 +
15553 +int vc_set_ccaps(struct vx_info *vxi, void __user *data)
15554 +{
15555 +       struct vcmd_ctx_caps_v1 vc_data;
15556 +
15557 +       if (copy_from_user(&vc_data, data, sizeof(vc_data)))
15558 +               return -EFAULT;
15559 +
15560 +       return do_set_caps(vxi, 0, 0, vc_data.ccaps, vc_data.cmask);
15561 +}
15562 +
15563 +int vc_get_bcaps(struct vx_info *vxi, void __user *data)
15564 +{
15565 +       struct vcmd_bcaps vc_data;
15566 +       int ret;
15567 +
15568 +       ret = do_get_caps(vxi, &vc_data.bcaps, NULL);
15569 +       if (ret)
15570 +               return ret;
15571 +       vc_data.bmask = ~0ULL;
15572 +
15573 +       if (copy_to_user(data, &vc_data, sizeof(vc_data)))
15574 +               return -EFAULT;
15575 +       return 0;
15576 +}
15577 +
15578 +int vc_set_bcaps(struct vx_info *vxi, void __user *data)
15579 +{
15580 +       struct vcmd_bcaps vc_data;
15581 +
15582 +       if (copy_from_user(&vc_data, data, sizeof(vc_data)))
15583 +               return -EFAULT;
15584 +
15585 +       return do_set_caps(vxi, vc_data.bcaps, vc_data.bmask, 0, 0);
15586 +}
15587 +
15588 +
15589 +int vc_get_umask(struct vx_info *vxi, void __user *data)
15590 +{
15591 +       struct vcmd_umask vc_data;
15592 +
15593 +       vc_data.umask = vxi->vx_umask;
15594 +       vc_data.mask = ~0ULL;
15595 +
15596 +       if (copy_to_user(data, &vc_data, sizeof(vc_data)))
15597 +               return -EFAULT;
15598 +       return 0;
15599 +}
15600 +
15601 +int vc_set_umask(struct vx_info *vxi, void __user *data)
15602 +{
15603 +       struct vcmd_umask vc_data;
15604 +
15605 +       if (copy_from_user(&vc_data, data, sizeof(vc_data)))
15606 +               return -EFAULT;
15607 +
15608 +       vxi->vx_umask = vs_mask_flags(vxi->vx_umask,
15609 +               vc_data.umask, vc_data.mask);
15610 +       return 0;
15611 +}
15612 +
15613 +
15614 +int vc_get_wmask(struct vx_info *vxi, void __user *data)
15615 +{
15616 +       struct vcmd_wmask vc_data;
15617 +
15618 +       vc_data.wmask = vxi->vx_wmask;
15619 +       vc_data.mask = ~0ULL;
15620 +
15621 +       if (copy_to_user(data, &vc_data, sizeof(vc_data)))
15622 +               return -EFAULT;
15623 +       return 0;
15624 +}
15625 +
15626 +int vc_set_wmask(struct vx_info *vxi, void __user *data)
15627 +{
15628 +       struct vcmd_wmask vc_data;
15629 +
15630 +       if (copy_from_user(&vc_data, data, sizeof(vc_data)))
15631 +               return -EFAULT;
15632 +
15633 +       vxi->vx_wmask = vs_mask_flags(vxi->vx_wmask,
15634 +               vc_data.wmask, vc_data.mask);
15635 +       return 0;
15636 +}
15637 +
15638 +
15639 +int vc_get_badness(struct vx_info *vxi, void __user *data)
15640 +{
15641 +       struct vcmd_badness_v0 vc_data;
15642 +
15643 +       vc_data.bias = vxi->vx_badness_bias;
15644 +
15645 +       if (copy_to_user(data, &vc_data, sizeof(vc_data)))
15646 +               return -EFAULT;
15647 +       return 0;
15648 +}
15649 +
15650 +int vc_set_badness(struct vx_info *vxi, void __user *data)
15651 +{
15652 +       struct vcmd_badness_v0 vc_data;
15653 +
15654 +       if (copy_from_user(&vc_data, data, sizeof(vc_data)))
15655 +               return -EFAULT;
15656 +
15657 +       vxi->vx_badness_bias = vc_data.bias;
15658 +       return 0;
15659 +}
15660 +
15661 +#include <linux/module.h>
15662 +
15663 +EXPORT_SYMBOL_GPL(free_vx_info);
15664 +
15665 diff -NurpP --minimal linux-4.9.135/kernel/vserver/cvirt.c linux-4.9.135-vs2.3.9.8/kernel/vserver/cvirt.c
15666 --- linux-4.9.135/kernel/vserver/cvirt.c        1970-01-01 00:00:00.000000000 +0000
15667 +++ linux-4.9.135-vs2.3.9.8/kernel/vserver/cvirt.c      2018-10-20 04:58:15.000000000 +0000
15668 @@ -0,0 +1,350 @@
15669 +/*
15670 + *  linux/kernel/vserver/cvirt.c
15671 + *
15672 + *  Virtual Server: Context Virtualization
15673 + *
15674 + *  Copyright (C) 2004-2007  Herbert P?tzl
15675 + *
15676 + *  V0.01  broken out from limit.c
15677 + *  V0.02  added utsname stuff
15678 + *  V0.03  changed vcmds to vxi arg
15679 + *
15680 + */
15681 +
15682 +#include <linux/types.h>
15683 +#include <linux/utsname.h>
15684 +#include <linux/vs_cvirt.h>
15685 +#include <linux/vserver/switch.h>
15686 +#include <linux/vserver/cvirt_cmd.h>
15687 +
15688 +#include <asm/uaccess.h>
15689 +
15690 +
15691 +void vx_vsi_boottime64(struct timespec64 *boottime)
15692 +{
15693 +       struct vx_info *vxi = current_vx_info();
15694 +
15695 +       set_normalized_timespec64(boottime,
15696 +               boottime->tv_sec + vxi->cvirt.bias_uptime.tv_sec,
15697 +               boottime->tv_nsec + vxi->cvirt.bias_uptime.tv_nsec);
15698 +       return;
15699 +}
15700 +
15701 +void vx_vsi_uptime(struct timespec *uptime, struct timespec *idle)
15702 +{
15703 +       struct vx_info *vxi = current_vx_info();
15704 +
15705 +       set_normalized_timespec(uptime,
15706 +               uptime->tv_sec - vxi->cvirt.bias_uptime.tv_sec,
15707 +               uptime->tv_nsec - vxi->cvirt.bias_uptime.tv_nsec);
15708 +       if (!idle)
15709 +               return;
15710 +       set_normalized_timespec(idle,
15711 +               idle->tv_sec - vxi->cvirt.bias_idle.tv_sec,
15712 +               idle->tv_nsec - vxi->cvirt.bias_idle.tv_nsec);
15713 +       return;
15714 +}
15715 +
15716 +uint64_t vx_idle_jiffies(void)
15717 +{
15718 +       return init_task.utime + init_task.stime;
15719 +}
15720 +
15721 +
15722 +
15723 +static inline uint32_t __update_loadavg(uint32_t load,
15724 +       int wsize, int delta, int n)
15725 +{
15726 +       unsigned long long calc, prev;
15727 +
15728 +       /* just set it to n */
15729 +       if (unlikely(delta >= wsize))
15730 +               return (n << FSHIFT);
15731 +
15732 +       calc = delta * n;
15733 +       calc <<= FSHIFT;
15734 +       prev = (wsize - delta);
15735 +       prev *= load;
15736 +       calc += prev;
15737 +       do_div(calc, wsize);
15738 +       return calc;
15739 +}
15740 +
15741 +
15742 +void vx_update_load(struct vx_info *vxi)
15743 +{
15744 +       uint32_t now, last, delta;
15745 +       unsigned int nr_running, nr_uninterruptible;
15746 +       unsigned int total;
15747 +       unsigned long flags;
15748 +
15749 +       spin_lock_irqsave(&vxi->cvirt.load_lock, flags);
15750 +
15751 +       now = jiffies;
15752 +       last = vxi->cvirt.load_last;
15753 +       delta = now - last;
15754 +
15755 +       if (delta < 5*HZ)
15756 +               goto out;
15757 +
15758 +       nr_running = atomic_read(&vxi->cvirt.nr_running);
15759 +       nr_uninterruptible = atomic_read(&vxi->cvirt.nr_uninterruptible);
15760 +       total = nr_running + nr_uninterruptible;
15761 +
15762 +       vxi->cvirt.load[0] = __update_loadavg(vxi->cvirt.load[0],
15763 +               60*HZ, delta, total);
15764 +       vxi->cvirt.load[1] = __update_loadavg(vxi->cvirt.load[1],
15765 +               5*60*HZ, delta, total);
15766 +       vxi->cvirt.load[2] = __update_loadavg(vxi->cvirt.load[2],
15767 +               15*60*HZ, delta, total);
15768 +
15769 +       vxi->cvirt.load_last = now;
15770 +out:
15771 +       atomic_inc(&vxi->cvirt.load_updates);
15772 +       spin_unlock_irqrestore(&vxi->cvirt.load_lock, flags);
15773 +}
15774 +
15775 +
15776 +/*
15777 + * Commands to do_syslog:
15778 + *
15779 + *      0 -- Close the log.  Currently a NOP.
15780 + *      1 -- Open the log. Currently a NOP.
15781 + *      2 -- Read from the log.
15782 + *      3 -- Read all messages remaining in the ring buffer.
15783 + *      4 -- Read and clear all messages remaining in the ring buffer
15784 + *      5 -- Clear ring buffer.
15785 + *      6 -- Disable printk's to console
15786 + *      7 -- Enable printk's to console
15787 + *      8 -- Set level of messages printed to console
15788 + *      9 -- Return number of unread characters in the log buffer
15789 + *     10 -- Return size of the log buffer
15790 + */
15791 +int vx_do_syslog(int type, char __user *buf, int len)
15792 +{
15793 +       int error = 0;
15794 +       int do_clear = 0;
15795 +       struct vx_info *vxi = current_vx_info();
15796 +       struct _vx_syslog *log;
15797 +
15798 +       if (!vxi)
15799 +               return -EINVAL;
15800 +       log = &vxi->cvirt.syslog;
15801 +
15802 +       switch (type) {
15803 +       case 0:         /* Close log */
15804 +       case 1:         /* Open log */
15805 +               break;
15806 +       case 2:         /* Read from log */
15807 +               error = wait_event_interruptible(log->log_wait,
15808 +                       (log->log_start - log->log_end));
15809 +               if (error)
15810 +                       break;
15811 +               spin_lock_irq(&log->logbuf_lock);
15812 +               spin_unlock_irq(&log->logbuf_lock);
15813 +               break;
15814 +       case 4:         /* Read/clear last kernel messages */
15815 +               do_clear = 1;
15816 +               /* fall through */
15817 +       case 3:         /* Read last kernel messages */
15818 +               return 0;
15819 +
15820 +       case 5:         /* Clear ring buffer */
15821 +               return 0;
15822 +
15823 +       case 6:         /* Disable logging to console */
15824 +       case 7:         /* Enable logging to console */
15825 +       case 8:         /* Set level of messages printed to console */
15826 +               break;
15827 +
15828 +       case 9:         /* Number of chars in the log buffer */
15829 +               return 0;
15830 +       case 10:        /* Size of the log buffer */
15831 +               return 0;
15832 +       default:
15833 +               error = -EINVAL;
15834 +               break;
15835 +       }
15836 +       return error;
15837 +}
15838 +
15839 +
15840 +/* virtual host info names */
15841 +
15842 +static char *vx_vhi_name(struct vx_info *vxi, int id)
15843 +{
15844 +       struct nsproxy *nsproxy;
15845 +       struct uts_namespace *uts;
15846 +
15847 +       if (id == VHIN_CONTEXT)
15848 +               return vxi->vx_name;
15849 +
15850 +       nsproxy = vxi->space[0].vx_nsproxy;
15851 +       if (!nsproxy)
15852 +               return NULL;
15853 +
15854 +       uts = nsproxy->uts_ns;
15855 +       if (!uts)
15856 +               return NULL;
15857 +
15858 +       switch (id) {
15859 +       case VHIN_SYSNAME:
15860 +               return uts->name.sysname;
15861 +       case VHIN_NODENAME:
15862 +               return uts->name.nodename;
15863 +       case VHIN_RELEASE:
15864 +               return uts->name.release;
15865 +       case VHIN_VERSION:
15866 +               return uts->name.version;
15867 +       case VHIN_MACHINE:
15868 +               return uts->name.machine;
15869 +       case VHIN_DOMAINNAME:
15870 +               return uts->name.domainname;
15871 +       default:
15872 +               return NULL;
15873 +       }
15874 +       return NULL;
15875 +}
15876 +
15877 +int vc_set_vhi_name(struct vx_info *vxi, void __user *data)
15878 +{
15879 +       struct vcmd_vhi_name_v0 vc_data;
15880 +       char *name;
15881 +
15882 +       if (copy_from_user(&vc_data, data, sizeof(vc_data)))
15883 +               return -EFAULT;
15884 +
15885 +       name = vx_vhi_name(vxi, vc_data.field);
15886 +       if (!name)
15887 +               return -EINVAL;
15888 +
15889 +       memcpy(name, vc_data.name, 65);
15890 +       return 0;
15891 +}
15892 +
15893 +int vc_get_vhi_name(struct vx_info *vxi, void __user *data)
15894 +{
15895 +       struct vcmd_vhi_name_v0 vc_data;
15896 +       char *name;
15897 +
15898 +       if (copy_from_user(&vc_data, data, sizeof(vc_data)))
15899 +               return -EFAULT;
15900 +
15901 +       name = vx_vhi_name(vxi, vc_data.field);
15902 +       if (!name)
15903 +               return -EINVAL;
15904 +
15905 +       memcpy(vc_data.name, name, 65);
15906 +       if (copy_to_user(data, &vc_data, sizeof(vc_data)))
15907 +               return -EFAULT;
15908 +       return 0;
15909 +}
15910 +
15911 +
15912 +int vc_virt_stat(struct vx_info *vxi, void __user *data)
15913 +{
15914 +       struct vcmd_virt_stat_v0 vc_data;
15915 +       struct _vx_cvirt *cvirt = &vxi->cvirt;
15916 +       struct timespec64 uptime;
15917 +
15918 +       ktime_get_ts64(&uptime);
15919 +       set_normalized_timespec64(&uptime,
15920 +               uptime.tv_sec - cvirt->bias_uptime.tv_sec,
15921 +               uptime.tv_nsec - cvirt->bias_uptime.tv_nsec);
15922 +
15923 +       vc_data.offset = timespec64_to_ns(&cvirt->bias_ts);
15924 +       vc_data.uptime = timespec64_to_ns(&uptime);
15925 +       vc_data.nr_threads = atomic_read(&cvirt->nr_threads);
15926 +       vc_data.nr_running = atomic_read(&cvirt->nr_running);
15927 +       vc_data.nr_uninterruptible = atomic_read(&cvirt->nr_uninterruptible);
15928 +       vc_data.nr_onhold = atomic_read(&cvirt->nr_onhold);
15929 +       vc_data.nr_forks = atomic_read(&cvirt->total_forks);
15930 +       vc_data.load[0] = cvirt->load[0];
15931 +       vc_data.load[1] = cvirt->load[1];
15932 +       vc_data.load[2] = cvirt->load[2];
15933 +
15934 +       if (copy_to_user(data, &vc_data, sizeof(vc_data)))
15935 +               return -EFAULT;
15936 +       return 0;
15937 +}
15938 +
15939 +
15940 +#ifdef CONFIG_VSERVER_VTIME
15941 +
15942 +/* virtualized time base */
15943 +
15944 +void vx_adjust_timespec(struct timespec *ts)
15945 +{
15946 +       struct vx_info *vxi;
15947 +
15948 +       if (!vx_flags(VXF_VIRT_TIME, 0))
15949 +               return;
15950 +
15951 +       vxi = current_vx_info();
15952 +       ts->tv_sec += vxi->cvirt.bias_ts.tv_sec;
15953 +       ts->tv_nsec += vxi->cvirt.bias_ts.tv_nsec;
15954 +
15955 +       if (ts->tv_nsec >= NSEC_PER_SEC) {
15956 +               ts->tv_sec++;
15957 +               ts->tv_nsec -= NSEC_PER_SEC;
15958 +       } else if (ts->tv_nsec < 0) {
15959 +               ts->tv_sec--;
15960 +               ts->tv_nsec += NSEC_PER_SEC;
15961 +       }
15962 +}
15963 +
15964 +void vx_adjust_timespec64(struct timespec64 *ts)
15965 +{
15966 +       struct vx_info *vxi;
15967 +
15968 +       if (!vx_flags(VXF_VIRT_TIME, 0))
15969 +               return;
15970 +
15971 +       vxi = current_vx_info();
15972 +       ts->tv_sec += vxi->cvirt.bias_ts.tv_sec;
15973 +       ts->tv_nsec += vxi->cvirt.bias_ts.tv_nsec;
15974 +
15975 +       if (ts->tv_nsec >= NSEC_PER_SEC) {
15976 +               ts->tv_sec++;
15977 +               ts->tv_nsec -= NSEC_PER_SEC;
15978 +       } else if (ts->tv_nsec < 0) {
15979 +               ts->tv_sec--;
15980 +               ts->tv_nsec += NSEC_PER_SEC;
15981 +       }
15982 +}
15983 +
15984 +int vx_settimeofday(const struct timespec *ts)
15985 +{
15986 +       struct timespec ats, delta;
15987 +       struct vx_info *vxi;
15988 +
15989 +       if (!vx_flags(VXF_VIRT_TIME, 0))
15990 +               return do_settimeofday(ts);
15991 +
15992 +       getnstimeofday(&ats);
15993 +       delta = timespec_sub(*ts, ats);
15994 +
15995 +       vxi = current_vx_info();
15996 +       vxi->cvirt.bias_ts = timespec64_add(vxi->cvirt.bias_ts,
15997 +               timespec_to_timespec64(delta));
15998 +       return 0;
15999 +}
16000 +
16001 +int vx_settimeofday64(const struct timespec64 *ts)
16002 +{
16003 +       struct timespec64 ats, delta;
16004 +       struct vx_info *vxi;
16005 +
16006 +       if (!vx_flags(VXF_VIRT_TIME, 0))
16007 +               return do_settimeofday64(ts);
16008 +
16009 +       getnstimeofday64(&ats);
16010 +       delta = timespec64_sub(*ts, ats);
16011 +
16012 +       vxi = current_vx_info();
16013 +       vxi->cvirt.bias_ts = timespec64_add(vxi->cvirt.bias_ts, delta);
16014 +       return 0;
16015 +}
16016 +
16017 +#endif
16018 +
16019 diff -NurpP --minimal linux-4.9.135/kernel/vserver/cvirt_init.h linux-4.9.135-vs2.3.9.8/kernel/vserver/cvirt_init.h
16020 --- linux-4.9.135/kernel/vserver/cvirt_init.h   1970-01-01 00:00:00.000000000 +0000
16021 +++ linux-4.9.135-vs2.3.9.8/kernel/vserver/cvirt_init.h 2018-10-20 04:58:15.000000000 +0000
16022 @@ -0,0 +1,70 @@
16023 +
16024 +
16025 +extern uint64_t vx_idle_jiffies(void);
16026 +
16027 +static inline void vx_info_init_cvirt(struct _vx_cvirt *cvirt)
16028 +{
16029 +       uint64_t idle_jiffies = vx_idle_jiffies();
16030 +       uint64_t nsuptime;
16031 +
16032 +       ktime_get_ts64(&cvirt->bias_uptime);
16033 +       nsuptime = (unsigned long long)cvirt->bias_uptime.tv_sec
16034 +               * NSEC_PER_SEC + cvirt->bias_uptime.tv_nsec;
16035 +       cvirt->bias_clock = nsec_to_clock_t(nsuptime);
16036 +       cvirt->bias_ts.tv_sec = 0;
16037 +       cvirt->bias_ts.tv_nsec = 0;
16038 +
16039 +       jiffies_to_timespec64(idle_jiffies, &cvirt->bias_idle);
16040 +       atomic_set(&cvirt->nr_threads, 0);
16041 +       atomic_set(&cvirt->nr_running, 0);
16042 +       atomic_set(&cvirt->nr_uninterruptible, 0);
16043 +       atomic_set(&cvirt->nr_onhold, 0);
16044 +
16045 +       spin_lock_init(&cvirt->load_lock);
16046 +       cvirt->load_last = jiffies;
16047 +       atomic_set(&cvirt->load_updates, 0);
16048 +       cvirt->load[0] = 0;
16049 +       cvirt->load[1] = 0;
16050 +       cvirt->load[2] = 0;
16051 +       atomic_set(&cvirt->total_forks, 0);
16052 +
16053 +       spin_lock_init(&cvirt->syslog.logbuf_lock);
16054 +       init_waitqueue_head(&cvirt->syslog.log_wait);
16055 +       cvirt->syslog.log_start = 0;
16056 +       cvirt->syslog.log_end = 0;
16057 +       cvirt->syslog.con_start = 0;
16058 +       cvirt->syslog.logged_chars = 0;
16059 +}
16060 +
16061 +static inline
16062 +void vx_info_init_cvirt_pc(struct _vx_cvirt_pc *cvirt_pc, int cpu)
16063 +{
16064 +       // cvirt_pc->cpustat = { 0 };
16065 +}
16066 +
16067 +static inline void vx_info_exit_cvirt(struct _vx_cvirt *cvirt)
16068 +{
16069 +#ifdef CONFIG_VSERVER_WARN
16070 +       int value;
16071 +#endif
16072 +       vxwprintk_xid((value = atomic_read(&cvirt->nr_threads)),
16073 +               "!!! cvirt: %p[nr_threads] = %d on exit.",
16074 +               cvirt, value);
16075 +       vxwprintk_xid((value = atomic_read(&cvirt->nr_running)),
16076 +               "!!! cvirt: %p[nr_running] = %d on exit.",
16077 +               cvirt, value);
16078 +       vxwprintk_xid((value = atomic_read(&cvirt->nr_uninterruptible)),
16079 +               "!!! cvirt: %p[nr_uninterruptible] = %d on exit.",
16080 +               cvirt, value);
16081 +       vxwprintk_xid((value = atomic_read(&cvirt->nr_onhold)),
16082 +               "!!! cvirt: %p[nr_onhold] = %d on exit.",
16083 +               cvirt, value);
16084 +       return;
16085 +}
16086 +
16087 +static inline
16088 +void vx_info_exit_cvirt_pc(struct _vx_cvirt_pc *cvirt_pc, int cpu)
16089 +{
16090 +       return;
16091 +}
16092 +
16093 diff -NurpP --minimal linux-4.9.135/kernel/vserver/cvirt_proc.h linux-4.9.135-vs2.3.9.8/kernel/vserver/cvirt_proc.h
16094 --- linux-4.9.135/kernel/vserver/cvirt_proc.h   1970-01-01 00:00:00.000000000 +0000
16095 +++ linux-4.9.135-vs2.3.9.8/kernel/vserver/cvirt_proc.h 2018-10-20 04:58:15.000000000 +0000
16096 @@ -0,0 +1,123 @@
16097 +#ifndef _VX_CVIRT_PROC_H
16098 +#define _VX_CVIRT_PROC_H
16099 +
16100 +#include <linux/nsproxy.h>
16101 +#include <linux/mnt_namespace.h>
16102 +#include <linux/ipc_namespace.h>
16103 +#include <linux/utsname.h>
16104 +#include <linux/ipc.h>
16105 +
16106 +extern int vx_info_mnt_namespace(struct mnt_namespace *, char *);
16107 +
16108 +static inline
16109 +int vx_info_proc_nsproxy(struct nsproxy *nsproxy, char *buffer)
16110 +{
16111 +       struct mnt_namespace *ns;
16112 +       struct uts_namespace *uts;
16113 +       struct ipc_namespace *ipc;
16114 +       int length = 0;
16115 +
16116 +       if (!nsproxy)
16117 +               goto out;
16118 +
16119 +       length += sprintf(buffer + length,
16120 +               "NSProxy:\t%p [%p,%p,%p]\n",
16121 +               nsproxy, nsproxy->mnt_ns,
16122 +               nsproxy->uts_ns, nsproxy->ipc_ns);
16123 +
16124 +       ns = nsproxy->mnt_ns;
16125 +       if (!ns)
16126 +               goto skip_ns;
16127 +
16128 +       length += vx_info_mnt_namespace(ns, buffer + length);
16129 +
16130 +skip_ns:
16131 +
16132 +       uts = nsproxy->uts_ns;
16133 +       if (!uts)
16134 +               goto skip_uts;
16135 +
16136 +       length += sprintf(buffer + length,
16137 +               "SysName:\t%.*s\n"
16138 +               "NodeName:\t%.*s\n"
16139 +               "Release:\t%.*s\n"
16140 +               "Version:\t%.*s\n"
16141 +               "Machine:\t%.*s\n"
16142 +               "DomainName:\t%.*s\n",
16143 +               __NEW_UTS_LEN, uts->name.sysname,
16144 +               __NEW_UTS_LEN, uts->name.nodename,
16145 +               __NEW_UTS_LEN, uts->name.release,
16146 +               __NEW_UTS_LEN, uts->name.version,
16147 +               __NEW_UTS_LEN, uts->name.machine,
16148 +               __NEW_UTS_LEN, uts->name.domainname);
16149 +skip_uts:
16150 +
16151 +       ipc = nsproxy->ipc_ns;
16152 +       if (!ipc)
16153 +               goto skip_ipc;
16154 +
16155 +       length += sprintf(buffer + length,
16156 +               "SEMS:\t\t%d %d %d %d  %d\n"
16157 +               "MSG:\t\t%d %d %d\n"
16158 +               "SHM:\t\t%lu %lu  %d %ld\n",
16159 +               ipc->sem_ctls[0], ipc->sem_ctls[1],
16160 +               ipc->sem_ctls[2], ipc->sem_ctls[3],
16161 +               ipc->used_sems,
16162 +               ipc->msg_ctlmax, ipc->msg_ctlmnb, ipc->msg_ctlmni,
16163 +               (unsigned long)ipc->shm_ctlmax,
16164 +               (unsigned long)ipc->shm_ctlall,
16165 +               ipc->shm_ctlmni, ipc->shm_tot);
16166 +skip_ipc:
16167 +out:
16168 +       return length;
16169 +}
16170 +
16171 +
16172 +#include <linux/sched.h>
16173 +
16174 +#define LOAD_INT(x) ((x) >> FSHIFT)
16175 +#define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1 - 1)) * 100)
16176 +
16177 +static inline
16178 +int vx_info_proc_cvirt(struct _vx_cvirt *cvirt, char *buffer)
16179 +{
16180 +       int length = 0;
16181 +       int a, b, c;
16182 +
16183 +       length += sprintf(buffer + length,
16184 +               "BiasUptime:\t%llu.%02lu\n",
16185 +               (unsigned long long)cvirt->bias_uptime.tv_sec,
16186 +               (cvirt->bias_uptime.tv_nsec / (NSEC_PER_SEC / 100)));
16187 +
16188 +       a = cvirt->load[0] + (FIXED_1 / 200);
16189 +       b = cvirt->load[1] + (FIXED_1 / 200);
16190 +       c = cvirt->load[2] + (FIXED_1 / 200);
16191 +       length += sprintf(buffer + length,
16192 +               "nr_threads:\t%d\n"
16193 +               "nr_running:\t%d\n"
16194 +               "nr_unintr:\t%d\n"
16195 +               "nr_onhold:\t%d\n"
16196 +               "load_updates:\t%d\n"
16197 +               "loadavg:\t%d.%02d %d.%02d %d.%02d\n"
16198 +               "total_forks:\t%d\n",
16199 +               atomic_read(&cvirt->nr_threads),
16200 +               atomic_read(&cvirt->nr_running),
16201 +               atomic_read(&cvirt->nr_uninterruptible),
16202 +               atomic_read(&cvirt->nr_onhold),
16203 +               atomic_read(&cvirt->load_updates),
16204 +               LOAD_INT(a), LOAD_FRAC(a),
16205 +               LOAD_INT(b), LOAD_FRAC(b),
16206 +               LOAD_INT(c), LOAD_FRAC(c),
16207 +               atomic_read(&cvirt->total_forks));
16208 +       return length;
16209 +}
16210 +
16211 +static inline
16212 +int vx_info_proc_cvirt_pc(struct _vx_cvirt_pc *cvirt_pc,
16213 +       char *buffer, int cpu)
16214 +{
16215 +       int length = 0;
16216 +       return length;
16217 +}
16218 +
16219 +#endif /* _VX_CVIRT_PROC_H */
16220 diff -NurpP --minimal linux-4.9.135/kernel/vserver/debug.c linux-4.9.135-vs2.3.9.8/kernel/vserver/debug.c
16221 --- linux-4.9.135/kernel/vserver/debug.c        1970-01-01 00:00:00.000000000 +0000
16222 +++ linux-4.9.135-vs2.3.9.8/kernel/vserver/debug.c      2018-10-20 04:58:15.000000000 +0000
16223 @@ -0,0 +1,32 @@
16224 +/*
16225 + *  kernel/vserver/debug.c
16226 + *
16227 + *  Copyright (C) 2005-2007 Herbert P?tzl
16228 + *
16229 + *  V0.01  vx_info dump support
16230 + *
16231 + */
16232 +
16233 +#include <linux/module.h>
16234 +
16235 +#include <linux/vserver/context.h>
16236 +
16237 +
16238 +void   dump_vx_info(struct vx_info *vxi, int level)
16239 +{
16240 +       printk("vx_info %p[#%d, %d.%d, %4x]\n", vxi, vxi->vx_id,
16241 +               atomic_read(&vxi->vx_usecnt),
16242 +               atomic_read(&vxi->vx_tasks),
16243 +               vxi->vx_state);
16244 +       if (level > 0) {
16245 +               __dump_vx_limit(&vxi->limit);
16246 +               __dump_vx_sched(&vxi->sched);
16247 +               __dump_vx_cvirt(&vxi->cvirt);
16248 +               __dump_vx_cacct(&vxi->cacct);
16249 +       }
16250 +       printk("---\n");
16251 +}
16252 +
16253 +
16254 +EXPORT_SYMBOL_GPL(dump_vx_info);
16255 +
16256 diff -NurpP --minimal linux-4.9.135/kernel/vserver/device.c linux-4.9.135-vs2.3.9.8/kernel/vserver/device.c
16257 --- linux-4.9.135/kernel/vserver/device.c       1970-01-01 00:00:00.000000000 +0000
16258 +++ linux-4.9.135-vs2.3.9.8/kernel/vserver/device.c     2018-10-20 04:58:15.000000000 +0000
16259 @@ -0,0 +1,443 @@
16260 +/*
16261 + *  linux/kernel/vserver/device.c
16262 + *
16263 + *  Linux-VServer: Device Support
16264 + *
16265 + *  Copyright (C) 2006  Herbert P?tzl
16266 + *  Copyright (C) 2007  Daniel Hokka Zakrisson
16267 + *
16268 + *  V0.01  device mapping basics
16269 + *  V0.02  added defaults
16270 + *
16271 + */
16272 +
16273 +#include <linux/slab.h>
16274 +#include <linux/rcupdate.h>
16275 +#include <linux/fs.h>
16276 +#include <linux/namei.h>
16277 +#include <linux/hash.h>
16278 +
16279 +#include <asm/errno.h>
16280 +#include <asm/uaccess.h>
16281 +#include <linux/vserver/base.h>
16282 +#include <linux/vserver/debug.h>
16283 +#include <linux/vserver/context.h>
16284 +#include <linux/vserver/device.h>
16285 +#include <linux/vserver/device_cmd.h>
16286 +
16287 +
16288 +#define DMAP_HASH_BITS 4
16289 +
16290 +
16291 +struct vs_mapping {
16292 +       union {
16293 +               struct hlist_node hlist;
16294 +               struct list_head list;
16295 +       } u;
16296 +#define dm_hlist       u.hlist
16297 +#define dm_list                u.list
16298 +       vxid_t xid;
16299 +       dev_t device;
16300 +       struct vx_dmap_target target;
16301 +};
16302 +
16303 +
16304 +static struct hlist_head dmap_main_hash[1 << DMAP_HASH_BITS];
16305 +
16306 +static DEFINE_SPINLOCK(dmap_main_hash_lock);
16307 +
16308 +static struct vx_dmap_target dmap_defaults[2] = {
16309 +       { .flags = DATTR_OPEN },
16310 +       { .flags = DATTR_OPEN },
16311 +};
16312 +
16313 +
16314 +struct kmem_cache *dmap_cachep __read_mostly;
16315 +
16316 +int __init dmap_cache_init(void)
16317 +{
16318 +       dmap_cachep = kmem_cache_create("dmap_cache",
16319 +               sizeof(struct vs_mapping), 0,
16320 +               SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
16321 +       return 0;
16322 +}
16323 +
16324 +__initcall(dmap_cache_init);
16325 +
16326 +
16327 +static inline unsigned int __hashval(dev_t dev, int bits)
16328 +{
16329 +       return hash_long((unsigned long)dev, bits);
16330 +}
16331 +
16332 +
16333 +/*     __hash_mapping()
16334 + *     add the mapping to the hash table
16335 + */
16336 +static inline void __hash_mapping(struct vx_info *vxi, struct vs_mapping *vdm)
16337 +{
16338 +       spinlock_t *hash_lock = &dmap_main_hash_lock;
16339 +       struct hlist_head *head, *hash = dmap_main_hash;
16340 +       int device = vdm->device;
16341 +
16342 +       spin_lock(hash_lock);
16343 +       vxdprintk(VXD_CBIT(misc, 8), "__hash_mapping: %p[#%d] %08x:%08x",
16344 +               vxi, vxi ? vxi->vx_id : 0, device, vdm->target.target);
16345 +
16346 +       head = &hash[__hashval(device, DMAP_HASH_BITS)];
16347 +       hlist_add_head(&vdm->dm_hlist, head);
16348 +       spin_unlock(hash_lock);
16349 +}
16350 +
16351 +
16352 +static inline int __mode_to_default(umode_t mode)
16353 +{
16354 +       switch (mode) {
16355 +       case S_IFBLK:
16356 +               return 0;
16357 +       case S_IFCHR:
16358 +               return 1;
16359 +       default:
16360 +               BUG();
16361 +       }
16362 +}
16363 +
16364 +
16365 +/*     __set_default()
16366 + *     set a default
16367 + */
16368 +static inline void __set_default(struct vx_info *vxi, umode_t mode,
16369 +       struct vx_dmap_target *vdmt)
16370 +{
16371 +       spinlock_t *hash_lock = &dmap_main_hash_lock;
16372 +       spin_lock(hash_lock);
16373 +
16374 +       if (vxi)
16375 +               vxi->dmap.targets[__mode_to_default(mode)] = *vdmt;
16376 +       else
16377 +               dmap_defaults[__mode_to_default(mode)] = *vdmt;
16378 +
16379 +
16380 +       spin_unlock(hash_lock);
16381 +
16382 +       vxdprintk(VXD_CBIT(misc, 8), "__set_default: %p[#%u] %08x %04x",
16383 +                 vxi, vxi ? vxi->vx_id : 0, vdmt->target, vdmt->flags);
16384 +}
16385 +
16386 +
16387 +/*     __remove_default()
16388 + *     remove a default
16389 + */
16390 +static inline int __remove_default(struct vx_info *vxi, umode_t mode)
16391 +{
16392 +       spinlock_t *hash_lock = &dmap_main_hash_lock;
16393 +       spin_lock(hash_lock);
16394 +
16395 +       if (vxi)
16396 +               vxi->dmap.targets[__mode_to_default(mode)].flags = 0;
16397 +       else    /* remove == reset */
16398 +               dmap_defaults[__mode_to_default(mode)].flags = DATTR_OPEN | mode;
16399 +
16400 +       spin_unlock(hash_lock);
16401 +       return 0;
16402 +}
16403 +
16404 +
16405 +/*     __find_mapping()
16406 + *     find a mapping in the hash table
16407 + *
16408 + *     caller must hold hash_lock
16409 + */
16410 +static inline int __find_mapping(vxid_t xid, dev_t device, umode_t mode,
16411 +       struct vs_mapping **local, struct vs_mapping **global)
16412 +{
16413 +       struct hlist_head *hash = dmap_main_hash;
16414 +       struct hlist_head *head = &hash[__hashval(device, DMAP_HASH_BITS)];
16415 +       struct hlist_node *pos;
16416 +       struct vs_mapping *vdm;
16417 +
16418 +       *local = NULL;
16419 +       if (global)
16420 +               *global = NULL;
16421 +
16422 +       hlist_for_each(pos, head) {
16423 +               vdm = hlist_entry(pos, struct vs_mapping, dm_hlist);
16424 +
16425 +               if ((vdm->device == device) &&
16426 +                       !((vdm->target.flags ^ mode) & S_IFMT)) {
16427 +                       if (vdm->xid == xid) {
16428 +                               *local = vdm;
16429 +                               return 1;
16430 +                       } else if (global && vdm->xid == 0)
16431 +                               *global = vdm;
16432 +               }
16433 +       }
16434 +
16435 +       if (global && *global)
16436 +               return 0;
16437 +       else
16438 +               return -ENOENT;
16439 +}
16440 +
16441 +
16442 +/*     __lookup_mapping()
16443 + *     find a mapping and store the result in target and flags
16444 + */
16445 +static inline int __lookup_mapping(struct vx_info *vxi,
16446 +       dev_t device, dev_t *target, int *flags, umode_t mode)
16447 +{
16448 +       spinlock_t *hash_lock = &dmap_main_hash_lock;
16449 +       struct vs_mapping *vdm, *global;
16450 +       struct vx_dmap_target *vdmt;
16451 +       int ret = 0;
16452 +       vxid_t xid = vxi->vx_id;
16453 +       int index;
16454 +
16455 +       spin_lock(hash_lock);
16456 +       if (__find_mapping(xid, device, mode, &vdm, &global) > 0) {
16457 +               ret = 1;
16458 +               vdmt = &vdm->target;
16459 +               goto found;
16460 +       }
16461 +
16462 +       index = __mode_to_default(mode);
16463 +       if (vxi && vxi->dmap.targets[index].flags) {
16464 +               ret = 2;
16465 +               vdmt = &vxi->dmap.targets[index];
16466 +       } else if (global) {
16467 +               ret = 3;
16468 +               vdmt = &global->target;
16469 +               goto found;
16470 +       } else {
16471 +               ret = 4;
16472 +               vdmt = &dmap_defaults[index];
16473 +       }
16474 +
16475 +found:
16476 +       if (target && (vdmt->flags & DATTR_REMAP))
16477 +               *target = vdmt->target;
16478 +       else if (target)
16479 +               *target = device;
16480 +       if (flags)
16481 +               *flags = vdmt->flags;
16482 +
16483 +       spin_unlock(hash_lock);
16484 +
16485 +       return ret;
16486 +}
16487 +
16488 +
16489 +/*     __remove_mapping()
16490 + *     remove a mapping from the hash table
16491 + */
16492 +static inline int __remove_mapping(struct vx_info *vxi, dev_t device,
16493 +       umode_t mode)
16494 +{
16495 +       spinlock_t *hash_lock = &dmap_main_hash_lock;
16496 +       struct vs_mapping *vdm = NULL;
16497 +       int ret = 0;
16498 +
16499 +       spin_lock(hash_lock);
16500 +
16501 +       ret = __find_mapping((vxi ? vxi->vx_id : 0), device, mode, &vdm,
16502 +               NULL);
16503 +       vxdprintk(VXD_CBIT(misc, 8), "__remove_mapping: %p[#%d] %08x %04x",
16504 +               vxi, vxi ? vxi->vx_id : 0, device, mode);
16505 +       if (ret < 0)
16506 +               goto out;
16507 +       hlist_del(&vdm->dm_hlist);
16508 +
16509 +out:
16510 +       spin_unlock(hash_lock);
16511 +       if (vdm)
16512 +               kmem_cache_free(dmap_cachep, vdm);
16513 +       return ret;
16514 +}
16515 +
16516 +
16517 +
16518 +int vs_map_device(struct vx_info *vxi,
16519 +       dev_t device, dev_t *target, umode_t mode)
16520 +{
16521 +       int ret, flags = DATTR_MASK;
16522 +
16523 +       if (!vxi) {
16524 +               if (target)
16525 +                       *target = device;
16526 +               goto out;
16527 +       }
16528 +       ret = __lookup_mapping(vxi, device, target, &flags, mode);
16529 +       vxdprintk(VXD_CBIT(misc, 8), "vs_map_device: %08x target: %08x flags: %04x mode: %04x mapped=%d",
16530 +               device, target ? *target : 0, flags, mode, ret);
16531 +out:
16532 +       return (flags & DATTR_MASK);
16533 +}
16534 +
16535 +
16536 +
16537 +static int do_set_mapping(struct vx_info *vxi,
16538 +       dev_t device, dev_t target, int flags, umode_t mode)
16539 +{
16540 +       if (device) {
16541 +               struct vs_mapping *new;
16542 +
16543 +               new = kmem_cache_alloc(dmap_cachep, GFP_KERNEL);
16544 +               if (!new)
16545 +                       return -ENOMEM;
16546 +
16547 +               INIT_HLIST_NODE(&new->dm_hlist);
16548 +               new->device = device;
16549 +               new->target.target = target;
16550 +               new->target.flags = flags | mode;
16551 +               new->xid = (vxi ? vxi->vx_id : 0);
16552 +
16553 +               vxdprintk(VXD_CBIT(misc, 8), "do_set_mapping: %08x target: %08x flags: %04x", device, target, flags);
16554 +               __hash_mapping(vxi, new);
16555 +       } else {
16556 +               struct vx_dmap_target new = {
16557 +                       .target = target,
16558 +                       .flags = flags | mode,
16559 +               };
16560 +               __set_default(vxi, mode, &new);
16561 +       }
16562 +       return 0;
16563 +}
16564 +
16565 +
16566 +static int do_unset_mapping(struct vx_info *vxi,
16567 +       dev_t device, dev_t target, int flags, umode_t mode)
16568 +{
16569 +       int ret = -EINVAL;
16570 +
16571 +       if (device) {
16572 +               ret = __remove_mapping(vxi, device, mode);
16573 +               if (ret < 0)
16574 +                       goto out;
16575 +       } else {
16576 +               ret = __remove_default(vxi, mode);
16577 +               if (ret < 0)
16578 +                       goto out;
16579 +       }
16580 +
16581 +out:
16582 +       return ret;
16583 +}
16584 +
16585 +
16586 +static inline int __user_device(const char __user *name, dev_t *dev,
16587 +       umode_t *mode)
16588 +{
16589 +       struct path path;
16590 +       int ret;
16591 +
16592 +       if (!name) {
16593 +               *dev = 0;
16594 +               return 0;
16595 +       }
16596 +       ret = user_lpath(name, &path);
16597 +       if (ret)
16598 +               return ret;
16599 +       if (path.dentry->d_inode) {
16600 +               *dev = path.dentry->d_inode->i_rdev;
16601 +               *mode = path.dentry->d_inode->i_mode;
16602 +       }
16603 +       path_put(&path);
16604 +       return 0;
16605 +}
16606 +
16607 +static inline int __mapping_mode(dev_t device, dev_t target,
16608 +       umode_t device_mode, umode_t target_mode, umode_t *mode)
16609 +{
16610 +       if (device)
16611 +               *mode = device_mode & S_IFMT;
16612 +       else if (target)
16613 +               *mode = target_mode & S_IFMT;
16614 +       else
16615 +               return -EINVAL;
16616 +
16617 +       /* if both given, device and target mode have to match */
16618 +       if (device && target &&
16619 +               ((device_mode ^ target_mode) & S_IFMT))
16620 +               return -EINVAL;
16621 +       return 0;
16622 +}
16623 +
16624 +
16625 +static inline int do_mapping(struct vx_info *vxi, const char __user *device_path,
16626 +       const char __user *target_path, int flags, int set)
16627 +{
16628 +       dev_t device = ~0, target = ~0;
16629 +       umode_t device_mode = 0, target_mode = 0, mode;
16630 +       int ret;
16631 +
16632 +       ret = __user_device(device_path, &device, &device_mode);
16633 +       if (ret)
16634 +               return ret;
16635 +       ret = __user_device(target_path, &target, &target_mode);
16636 +       if (ret)
16637 +               return ret;
16638 +
16639 +       ret = __mapping_mode(device, target,
16640 +               device_mode, target_mode, &mode);
16641 +       if (ret)
16642 +               return ret;
16643 +
16644 +       if (set)
16645 +               return do_set_mapping(vxi, device, target,
16646 +                       flags, mode);
16647 +       else
16648 +               return do_unset_mapping(vxi, device, target,
16649 +                       flags, mode);
16650 +}
16651 +
16652 +
16653 +int vc_set_mapping(struct vx_info *vxi, void __user *data)
16654 +{
16655 +       struct vcmd_set_mapping_v0 vc_data;
16656 +
16657 +       if (copy_from_user(&vc_data, data, sizeof(vc_data)))
16658 +               return -EFAULT;
16659 +
16660 +       return do_mapping(vxi, vc_data.device, vc_data.target,
16661 +               vc_data.flags, 1);
16662 +}
16663 +
16664 +int vc_unset_mapping(struct vx_info *vxi, void __user *data)
16665 +{
16666 +       struct vcmd_set_mapping_v0 vc_data;
16667 +
16668 +       if (copy_from_user(&vc_data, data, sizeof(vc_data)))
16669 +               return -EFAULT;
16670 +
16671 +       return do_mapping(vxi, vc_data.device, vc_data.target,
16672 +               vc_data.flags, 0);
16673 +}
16674 +
16675 +
16676 +#ifdef CONFIG_COMPAT
16677 +
16678 +int vc_set_mapping_x32(struct vx_info *vxi, void __user *data)
16679 +{
16680 +       struct vcmd_set_mapping_v0_x32 vc_data;
16681 +
16682 +       if (copy_from_user(&vc_data, data, sizeof(vc_data)))
16683 +               return -EFAULT;
16684 +
16685 +       return do_mapping(vxi, compat_ptr(vc_data.device_ptr),
16686 +               compat_ptr(vc_data.target_ptr), vc_data.flags, 1);
16687 +}
16688 +
16689 +int vc_unset_mapping_x32(struct vx_info *vxi, void __user *data)
16690 +{
16691 +       struct vcmd_set_mapping_v0_x32 vc_data;
16692 +
16693 +       if (copy_from_user(&vc_data, data, sizeof(vc_data)))
16694 +               return -EFAULT;
16695 +
16696 +       return do_mapping(vxi, compat_ptr(vc_data.device_ptr),
16697 +               compat_ptr(vc_data.target_ptr), vc_data.flags, 0);
16698 +}
16699 +
16700 +#endif /* CONFIG_COMPAT */
16701 +
16702 +
16703 diff -NurpP --minimal linux-4.9.135/kernel/vserver/dlimit.c linux-4.9.135-vs2.3.9.8/kernel/vserver/dlimit.c
16704 --- linux-4.9.135/kernel/vserver/dlimit.c       1970-01-01 00:00:00.000000000 +0000
16705 +++ linux-4.9.135-vs2.3.9.8/kernel/vserver/dlimit.c     2018-10-20 04:58:15.000000000 +0000
16706 @@ -0,0 +1,528 @@
16707 +/*
16708 + *  linux/kernel/vserver/dlimit.c
16709 + *
16710 + *  Virtual Server: Context Disk Limits
16711 + *
16712 + *  Copyright (C) 2004-2009  Herbert P?tzl
16713 + *
16714 + *  V0.01  initial version
16715 + *  V0.02  compat32 splitup
16716 + *  V0.03  extended interface
16717 + *
16718 + */
16719 +
16720 +#include <linux/statfs.h>
16721 +#include <linux/sched.h>
16722 +#include <linux/namei.h>
16723 +#include <linux/vs_tag.h>
16724 +#include <linux/vs_dlimit.h>
16725 +#include <linux/vserver/dlimit_cmd.h>
16726 +#include <linux/slab.h>
16727 +// #include <linux/gfp.h>
16728 +
16729 +#include <asm/uaccess.h>
16730 +
16731 +/*     __alloc_dl_info()
16732 +
16733 +       * allocate an initialized dl_info struct
16734 +       * doesn't make it visible (hash)                        */
16735 +
16736 +static struct dl_info *__alloc_dl_info(struct super_block *sb, vtag_t tag)
16737 +{
16738 +       struct dl_info *new = NULL;
16739 +
16740 +       vxdprintk(VXD_CBIT(dlim, 5),
16741 +               "alloc_dl_info(%p,%d)*", sb, tag);
16742 +
16743 +       /* would this benefit from a slab cache? */
16744 +       new = kmalloc(sizeof(struct dl_info), GFP_KERNEL);
16745 +       if (!new)
16746 +               return 0;
16747 +
16748 +       memset(new, 0, sizeof(struct dl_info));
16749 +       new->dl_tag = tag;
16750 +       new->dl_sb = sb;
16751 +       // INIT_RCU_HEAD(&new->dl_rcu);
16752 +       INIT_HLIST_NODE(&new->dl_hlist);
16753 +       spin_lock_init(&new->dl_lock);
16754 +       atomic_set(&new->dl_refcnt, 0);
16755 +       atomic_set(&new->dl_usecnt, 0);
16756 +
16757 +       /* rest of init goes here */
16758 +
16759 +       vxdprintk(VXD_CBIT(dlim, 4),
16760 +               "alloc_dl_info(%p,%d) = %p", sb, tag, new);
16761 +       return new;
16762 +}
16763 +
16764 +/*     __dealloc_dl_info()
16765 +
16766 +       * final disposal of dl_info                             */
16767 +
16768 +static void __dealloc_dl_info(struct dl_info *dli)
16769 +{
16770 +       vxdprintk(VXD_CBIT(dlim, 4),
16771 +               "dealloc_dl_info(%p)", dli);
16772 +
16773 +       dli->dl_hlist.next = LIST_POISON1;
16774 +       dli->dl_tag = -1;
16775 +       dli->dl_sb = 0;
16776 +
16777 +       BUG_ON(atomic_read(&dli->dl_usecnt));
16778 +       BUG_ON(atomic_read(&dli->dl_refcnt));
16779 +
16780 +       kfree(dli);
16781 +}
16782 +
16783 +
16784 +/*     hash table for dl_info hash */
16785 +
16786 +#define DL_HASH_SIZE   13
16787 +
16788 +struct hlist_head dl_info_hash[DL_HASH_SIZE];
16789 +
16790 +static DEFINE_SPINLOCK(dl_info_hash_lock);
16791 +
16792 +
16793 +static inline unsigned int __hashval(struct super_block *sb, vtag_t tag)
16794 +{
16795 +       return ((tag ^ (unsigned long)sb) % DL_HASH_SIZE);
16796 +}
16797 +
16798 +
16799 +
16800 +/*     __hash_dl_info()
16801 +
16802 +       * add the dli to the global hash table
16803 +       * requires the hash_lock to be held                     */
16804 +
16805 +static inline void __hash_dl_info(struct dl_info *dli)
16806 +{
16807 +       struct hlist_head *head;
16808 +
16809 +       vxdprintk(VXD_CBIT(dlim, 6),
16810 +               "__hash_dl_info: %p[#%d]", dli, dli->dl_tag);
16811 +       get_dl_info(dli);
16812 +       head = &dl_info_hash[__hashval(dli->dl_sb, dli->dl_tag)];
16813 +       hlist_add_head_rcu(&dli->dl_hlist, head);
16814 +}
16815 +
16816 +/*     __unhash_dl_info()
16817 +
16818 +       * remove the dli from the global hash table
16819 +       * requires the hash_lock to be held                     */
16820 +
16821 +static inline void __unhash_dl_info(struct dl_info *dli)
16822 +{
16823 +       vxdprintk(VXD_CBIT(dlim, 6),
16824 +               "__unhash_dl_info: %p[#%d]", dli, dli->dl_tag);
16825 +       hlist_del_rcu(&dli->dl_hlist);
16826 +       put_dl_info(dli);
16827 +}
16828 +
16829 +
16830 +/*     __lookup_dl_info()
16831 +
16832 +       * requires the rcu_read_lock()
16833 +       * doesn't increment the dl_refcnt                       */
16834 +
16835 +static inline struct dl_info *__lookup_dl_info(struct super_block *sb, vtag_t tag)
16836 +{
16837 +       struct hlist_head *head = &dl_info_hash[__hashval(sb, tag)];
16838 +       struct dl_info *dli;
16839 +
16840 +       hlist_for_each_entry_rcu(dli, head, dl_hlist) {
16841 +               if (dli->dl_tag == tag && dli->dl_sb == sb)
16842 +                       return dli;
16843 +       }
16844 +       return NULL;
16845 +}
16846 +
16847 +
16848 +struct dl_info *locate_dl_info(struct super_block *sb, vtag_t tag)
16849 +{
16850 +       struct dl_info *dli;
16851 +
16852 +       rcu_read_lock();
16853 +       dli = get_dl_info(__lookup_dl_info(sb, tag));
16854 +       vxdprintk(VXD_CBIT(dlim, 7),
16855 +               "locate_dl_info(%p,#%d) = %p", sb, tag, dli);
16856 +       rcu_read_unlock();
16857 +       return dli;
16858 +}
16859 +
16860 +void rcu_free_dl_info(struct rcu_head *head)
16861 +{
16862 +       struct dl_info *dli = container_of(head, struct dl_info, dl_rcu);
16863 +       int usecnt, refcnt;
16864 +
16865 +       BUG_ON(!dli || !head);
16866 +
16867 +       usecnt = atomic_read(&dli->dl_usecnt);
16868 +       BUG_ON(usecnt < 0);
16869 +
16870 +       refcnt = atomic_read(&dli->dl_refcnt);
16871 +       BUG_ON(refcnt < 0);
16872 +
16873 +       vxdprintk(VXD_CBIT(dlim, 3),
16874 +               "rcu_free_dl_info(%p)", dli);
16875 +       if (!usecnt)
16876 +               __dealloc_dl_info(dli);
16877 +       else
16878 +               printk("!!! rcu didn't free\n");
16879 +}
16880 +
16881 +
16882 +
16883 +
16884 +static int do_addrem_dlimit(uint32_t id, const char __user *name,
16885 +       uint32_t flags, int add)
16886 +{
16887 +       struct path path;
16888 +       int ret;
16889 +
16890 +       ret = user_lpath(name, &path);
16891 +       if (!ret) {
16892 +               struct super_block *sb;
16893 +               struct dl_info *dli;
16894 +
16895 +               ret = -EINVAL;
16896 +               if (!path.dentry->d_inode)
16897 +                       goto out_release;
16898 +               if (!(sb = path.dentry->d_inode->i_sb))
16899 +                       goto out_release;
16900 +
16901 +               if (add) {
16902 +                       dli = __alloc_dl_info(sb, id);
16903 +                       spin_lock(&dl_info_hash_lock);
16904 +
16905 +                       ret = -EEXIST;
16906 +                       if (__lookup_dl_info(sb, id))
16907 +                               goto out_unlock;
16908 +                       __hash_dl_info(dli);
16909 +                       dli = NULL;
16910 +               } else {
16911 +                       spin_lock(&dl_info_hash_lock);
16912 +                       dli = __lookup_dl_info(sb, id);
16913 +
16914 +                       ret = -ESRCH;
16915 +                       if (!dli)
16916 +                               goto out_unlock;
16917 +                       __unhash_dl_info(dli);
16918 +               }
16919 +               ret = 0;
16920 +       out_unlock:
16921 +               spin_unlock(&dl_info_hash_lock);
16922 +               if (add && dli)
16923 +                       __dealloc_dl_info(dli);
16924 +       out_release:
16925 +               path_put(&path);
16926 +       }
16927 +       return ret;
16928 +}
16929 +
16930 +int vc_add_dlimit(uint32_t id, void __user *data)
16931 +{
16932 +       struct vcmd_ctx_dlimit_base_v0 vc_data;
16933 +
16934 +       if (copy_from_user(&vc_data, data, sizeof(vc_data)))
16935 +               return -EFAULT;
16936 +
16937 +       return do_addrem_dlimit(id, vc_data.name, vc_data.flags, 1);
16938 +}
16939 +
16940 +int vc_rem_dlimit(uint32_t id, void __user *data)
16941 +{
16942 +       struct vcmd_ctx_dlimit_base_v0 vc_data;
16943 +
16944 +       if (copy_from_user(&vc_data, data, sizeof(vc_data)))
16945 +               return -EFAULT;
16946 +
16947 +       return do_addrem_dlimit(id, vc_data.name, vc_data.flags, 0);
16948 +}
16949 +
16950 +#ifdef CONFIG_COMPAT
16951 +
16952 +int vc_add_dlimit_x32(uint32_t id, void __user *data)
16953 +{
16954 +       struct vcmd_ctx_dlimit_base_v0_x32 vc_data;
16955 +
16956 +       if (copy_from_user(&vc_data, data, sizeof(vc_data)))
16957 +               return -EFAULT;
16958 +
16959 +       return do_addrem_dlimit(id,
16960 +               compat_ptr(vc_data.name_ptr), vc_data.flags, 1);
16961 +}
16962 +
16963 +int vc_rem_dlimit_x32(uint32_t id, void __user *data)
16964 +{
16965 +       struct vcmd_ctx_dlimit_base_v0_x32 vc_data;
16966 +
16967 +       if (copy_from_user(&vc_data, data, sizeof(vc_data)))
16968 +               return -EFAULT;
16969 +
16970 +       return do_addrem_dlimit(id,
16971 +               compat_ptr(vc_data.name_ptr), vc_data.flags, 0);
16972 +}
16973 +
16974 +#endif /* CONFIG_COMPAT */
16975 +
16976 +
16977 +static inline
16978 +int do_set_dlimit(uint32_t id, const char __user *name,
16979 +       uint32_t space_used, uint32_t space_total,
16980 +       uint32_t inodes_used, uint32_t inodes_total,
16981 +       uint32_t reserved, uint32_t flags)
16982 +{
16983 +       struct path path;
16984 +       int ret;
16985 +
16986 +       ret = user_lpath(name, &path);
16987 +       if (!ret) {
16988 +               struct super_block *sb;
16989 +               struct dl_info *dli;
16990 +
16991 +               ret = -EINVAL;
16992 +               if (!path.dentry->d_inode)
16993 +                       goto out_release;
16994 +               if (!(sb = path.dentry->d_inode->i_sb))
16995 +                       goto out_release;
16996 +
16997 +               /* sanity checks */
16998 +               if ((reserved != CDLIM_KEEP &&
16999 +                       reserved > 100) ||
17000 +                       (inodes_used != CDLIM_KEEP &&
17001 +                       inodes_used > inodes_total) ||
17002 +                       (space_used != CDLIM_KEEP &&
17003 +                       space_used > space_total))
17004 +                       goto out_release;
17005 +
17006 +               ret = -ESRCH;
17007 +               dli = locate_dl_info(sb, id);
17008 +               if (!dli)
17009 +                       goto out_release;
17010 +
17011 +               spin_lock(&dli->dl_lock);
17012 +
17013 +               if (inodes_used != CDLIM_KEEP)
17014 +                       dli->dl_inodes_used = inodes_used;
17015 +               if (inodes_total != CDLIM_KEEP)
17016 +                       dli->dl_inodes_total = inodes_total;
17017 +               if (space_used != CDLIM_KEEP)
17018 +                       dli->dl_space_used = dlimit_space_32to64(
17019 +                               space_used, flags, DLIMS_USED);
17020 +
17021 +               if (space_total == CDLIM_INFINITY)
17022 +                       dli->dl_space_total = DLIM_INFINITY;
17023 +               else if (space_total != CDLIM_KEEP)
17024 +                       dli->dl_space_total = dlimit_space_32to64(
17025 +                               space_total, flags, DLIMS_TOTAL);
17026 +
17027 +               if (reserved != CDLIM_KEEP)
17028 +                       dli->dl_nrlmult = (1 << 10) * (100 - reserved) / 100;
17029 +
17030 +               spin_unlock(&dli->dl_lock);
17031 +
17032 +               put_dl_info(dli);
17033 +               ret = 0;
17034 +
17035 +       out_release:
17036 +               path_put(&path);
17037 +       }
17038 +       return ret;
17039 +}
17040 +
17041 +int vc_set_dlimit(uint32_t id, void __user *data)
17042 +{
17043 +       struct vcmd_ctx_dlimit_v0 vc_data;
17044 +
17045 +       if (copy_from_user(&vc_data, data, sizeof(vc_data)))
17046 +               return -EFAULT;
17047 +
17048 +       return do_set_dlimit(id, vc_data.name,
17049 +               vc_data.space_used, vc_data.space_total,
17050 +               vc_data.inodes_used, vc_data.inodes_total,
17051 +               vc_data.reserved, vc_data.flags);
17052 +}
17053 +
17054 +#ifdef CONFIG_COMPAT
17055 +
17056 +int vc_set_dlimit_x32(uint32_t id, void __user *data)
17057 +{
17058 +       struct vcmd_ctx_dlimit_v0_x32 vc_data;
17059 +
17060 +       if (copy_from_user(&vc_data, data, sizeof(vc_data)))
17061 +               return -EFAULT;
17062 +
17063 +       return do_set_dlimit(id, compat_ptr(vc_data.name_ptr),
17064 +               vc_data.space_used, vc_data.space_total,
17065 +               vc_data.inodes_used, vc_data.inodes_total,
17066 +               vc_data.reserved, vc_data.flags);
17067 +}
17068 +
17069 +#endif /* CONFIG_COMPAT */
17070 +
17071 +
17072 +static inline
17073 +int do_get_dlimit(uint32_t id, const char __user *name,
17074 +       uint32_t *space_used, uint32_t *space_total,
17075 +       uint32_t *inodes_used, uint32_t *inodes_total,
17076 +       uint32_t *reserved, uint32_t *flags)
17077 +{
17078 +       struct path path;
17079 +       int ret;
17080 +
17081 +       ret = user_lpath(name, &path);
17082 +       if (!ret) {
17083 +               struct super_block *sb;
17084 +               struct dl_info *dli;
17085 +
17086 +               ret = -EINVAL;
17087 +               if (!path.dentry->d_inode)
17088 +                       goto out_release;
17089 +               if (!(sb = path.dentry->d_inode->i_sb))
17090 +                       goto out_release;
17091 +
17092 +               ret = -ESRCH;
17093 +               dli = locate_dl_info(sb, id);
17094 +               if (!dli)
17095 +                       goto out_release;
17096 +
17097 +               spin_lock(&dli->dl_lock);
17098 +               *inodes_used = dli->dl_inodes_used;
17099 +               *inodes_total = dli->dl_inodes_total;
17100 +
17101 +               *space_used = dlimit_space_64to32(
17102 +                       dli->dl_space_used, flags, DLIMS_USED);
17103 +
17104 +               if (dli->dl_space_total == DLIM_INFINITY)
17105 +                       *space_total = CDLIM_INFINITY;
17106 +               else
17107 +                       *space_total = dlimit_space_64to32(
17108 +                               dli->dl_space_total, flags, DLIMS_TOTAL);
17109 +
17110 +               *reserved = 100 - ((dli->dl_nrlmult * 100 + 512) >> 10);
17111 +               spin_unlock(&dli->dl_lock);
17112 +
17113 +               put_dl_info(dli);
17114 +               ret = -EFAULT;
17115 +
17116 +               ret = 0;
17117 +       out_release:
17118 +               path_put(&path);
17119 +       }
17120 +       return ret;
17121 +}
17122 +
17123 +
17124 +int vc_get_dlimit(uint32_t id, void __user *data)
17125 +{
17126 +       struct vcmd_ctx_dlimit_v0 vc_data;
17127 +       int ret;
17128 +
17129 +       if (copy_from_user(&vc_data, data, sizeof(vc_data)))
17130 +               return -EFAULT;
17131 +
17132 +       ret = do_get_dlimit(id, vc_data.name,
17133 +               &vc_data.space_used, &vc_data.space_total,
17134 +               &vc_data.inodes_used, &vc_data.inodes_total,
17135 +               &vc_data.reserved, &vc_data.flags);
17136 +       if (ret)
17137 +               return ret;
17138 +
17139 +       if (copy_to_user(data, &vc_data, sizeof(vc_data)))
17140 +               return -EFAULT;
17141 +       return 0;
17142 +}
17143 +
17144 +#ifdef CONFIG_COMPAT
17145 +
17146 +int vc_get_dlimit_x32(uint32_t id, void __user *data)
17147 +{
17148 +       struct vcmd_ctx_dlimit_v0_x32 vc_data;
17149 +       int ret;
17150 +
17151 +       if (copy_from_user(&vc_data, data, sizeof(vc_data)))
17152 +               return -EFAULT;
17153 +
17154 +       ret = do_get_dlimit(id, compat_ptr(vc_data.name_ptr),
17155 +               &vc_data.space_used, &vc_data.space_total,
17156 +               &vc_data.inodes_used, &vc_data.inodes_total,
17157 +               &vc_data.reserved, &vc_data.flags);
17158 +       if (ret)
17159 +               return ret;
17160 +
17161 +       if (copy_to_user(data, &vc_data, sizeof(vc_data)))
17162 +               return -EFAULT;
17163 +       return 0;
17164 +}
17165 +
17166 +#endif /* CONFIG_COMPAT */
17167 +
17168 +
17169 +void vx_vsi_statfs(struct super_block *sb, struct kstatfs *buf)
17170 +{
17171 +       struct dl_info *dli;
17172 +       __u64 blimit, bfree, bavail;
17173 +       __u32 ifree;
17174 +
17175 +       dli = locate_dl_info(sb, dx_current_tag());
17176 +       if (!dli)
17177 +               return;
17178 +
17179 +       spin_lock(&dli->dl_lock);
17180 +       if (dli->dl_inodes_total == (unsigned long)DLIM_INFINITY)
17181 +               goto no_ilim;
17182 +
17183 +       /* reduce max inodes available to limit */
17184 +       if (buf->f_files > dli->dl_inodes_total)
17185 +               buf->f_files = dli->dl_inodes_total;
17186 +
17187 +       ifree = dli->dl_inodes_total - dli->dl_inodes_used;
17188 +       /* reduce free inodes to min */
17189 +       if (ifree < buf->f_ffree)
17190 +               buf->f_ffree = ifree;
17191 +
17192 +no_ilim:
17193 +       if (dli->dl_space_total == DLIM_INFINITY)
17194 +               goto no_blim;
17195 +
17196 +       blimit = dli->dl_space_total >> sb->s_blocksize_bits;
17197 +
17198 +       if (dli->dl_space_total < dli->dl_space_used)
17199 +               bfree = 0;
17200 +       else
17201 +               bfree = (dli->dl_space_total - dli->dl_space_used)
17202 +                       >> sb->s_blocksize_bits;
17203 +
17204 +       bavail = ((dli->dl_space_total >> 10) * dli->dl_nrlmult);
17205 +       if (bavail < dli->dl_space_used)
17206 +               bavail = 0;
17207 +       else
17208 +               bavail = (bavail - dli->dl_space_used)
17209 +                       >> sb->s_blocksize_bits;
17210 +
17211 +       /* reduce max space available to limit */
17212 +       if (buf->f_blocks > blimit)
17213 +               buf->f_blocks = blimit;
17214 +
17215 +       /* reduce free space to min */
17216 +       if (bfree < buf->f_bfree)
17217 +               buf->f_bfree = bfree;
17218 +
17219 +       /* reduce avail space to min */
17220 +       if (bavail < buf->f_bavail)
17221 +               buf->f_bavail = bavail;
17222 +
17223 +no_blim:
17224 +       spin_unlock(&dli->dl_lock);
17225 +       put_dl_info(dli);
17226 +
17227 +       return;
17228 +}
17229 +
17230 +#include <linux/module.h>
17231 +
17232 +EXPORT_SYMBOL_GPL(locate_dl_info);
17233 +EXPORT_SYMBOL_GPL(rcu_free_dl_info);
17234 +
17235 diff -NurpP --minimal linux-4.9.135/kernel/vserver/helper.c linux-4.9.135-vs2.3.9.8/kernel/vserver/helper.c
17236 --- linux-4.9.135/kernel/vserver/helper.c       1970-01-01 00:00:00.000000000 +0000
17237 +++ linux-4.9.135-vs2.3.9.8/kernel/vserver/helper.c     2018-10-20 04:58:15.000000000 +0000
17238 @@ -0,0 +1,242 @@
17239 +/*
17240 + *  linux/kernel/vserver/helper.c
17241 + *
17242 + *  Virtual Context Support
17243 + *
17244 + *  Copyright (C) 2004-2007  Herbert P?tzl
17245 + *
17246 + *  V0.01  basic helper
17247 + *
17248 + */
17249 +
17250 +#include <linux/kmod.h>
17251 +#include <linux/reboot.h>
17252 +#include <linux/vs_context.h>
17253 +#include <linux/vs_network.h>
17254 +#include <linux/vserver/signal.h>
17255 +
17256 +
17257 +char vshelper_path[255] = "/sbin/vshelper";
17258 +
17259 +static int vshelper_init(struct subprocess_info *info, struct cred *new_cred)
17260 +{
17261 +       current->flags &= ~PF_NO_SETAFFINITY;
17262 +       return 0;
17263 +}
17264 +
17265 +static int vs_call_usermodehelper(char *path, char **argv, char **envp, int wait)
17266 +{
17267 +       struct subprocess_info *info;
17268 +       gfp_t gfp_mask = (wait == UMH_NO_WAIT) ? GFP_ATOMIC : GFP_KERNEL;
17269 +
17270 +       info = call_usermodehelper_setup(path, argv, envp, gfp_mask,
17271 +                                        vshelper_init, NULL, NULL);
17272 +       if (info == NULL)
17273 +               return -ENOMEM;
17274 +
17275 +       return call_usermodehelper_exec(info, wait);
17276 +}
17277 +
17278 +static int do_vshelper(char *name, char *argv[], char *envp[], int sync)
17279 +{
17280 +       int ret;
17281 +
17282 +       if ((ret = vs_call_usermodehelper(name, argv, envp,
17283 +               sync ? UMH_WAIT_PROC : UMH_WAIT_EXEC))) {
17284 +               printk(KERN_WARNING "%s: (%s %s) returned %s with %d\n",
17285 +                       name, argv[1], argv[2],
17286 +                       sync ? "sync" : "async", ret);
17287 +       }
17288 +       vxdprintk(VXD_CBIT(switch, 4),
17289 +               "%s: (%s %s) returned %s with %d",
17290 +               name, argv[1], argv[2], sync ? "sync" : "async", ret);
17291 +       return ret;
17292 +}
17293 +
17294 +/*
17295 + *      vshelper path is set via /proc/sys
17296 + *      invoked by vserver sys_reboot(), with
17297 + *      the following arguments
17298 + *
17299 + *      argv [0] = vshelper_path;
17300 + *      argv [1] = action: "restart", "halt", "poweroff", ...
17301 + *      argv [2] = context identifier
17302 + *
17303 + *      envp [*] = type-specific parameters
17304 + */
17305 +
17306 +long vs_reboot_helper(struct vx_info *vxi, int cmd, void __user *arg)
17307 +{
17308 +       char id_buf[8], cmd_buf[16];
17309 +       char uid_buf[16], pid_buf[16];
17310 +       int ret;
17311 +
17312 +       char *argv[] = {vshelper_path, NULL, id_buf, 0};
17313 +       char *envp[] = {"HOME=/", "TERM=linux",
17314 +                       "PATH=/sbin:/usr/sbin:/bin:/usr/bin",
17315 +                       uid_buf, pid_buf, cmd_buf, 0};
17316 +
17317 +       if (vx_info_state(vxi, VXS_HELPER))
17318 +               return -EAGAIN;
17319 +       vxi->vx_state |= VXS_HELPER;
17320 +
17321 +       snprintf(id_buf, sizeof(id_buf), "%d", vxi->vx_id);
17322 +
17323 +       snprintf(cmd_buf, sizeof(cmd_buf), "VS_CMD=%08x", cmd);
17324 +       snprintf(uid_buf, sizeof(uid_buf), "VS_UID=%d",
17325 +               from_kuid(&init_user_ns, current_uid()));
17326 +       snprintf(pid_buf, sizeof(pid_buf), "VS_PID=%d", current->pid);
17327 +
17328 +       switch (cmd) {
17329 +       case LINUX_REBOOT_CMD_RESTART:
17330 +               argv[1] = "restart";
17331 +               break;
17332 +
17333 +       case LINUX_REBOOT_CMD_HALT:
17334 +               argv[1] = "halt";
17335 +               break;
17336 +
17337 +       case LINUX_REBOOT_CMD_POWER_OFF:
17338 +               argv[1] = "poweroff";
17339 +               break;
17340 +
17341 +       case LINUX_REBOOT_CMD_SW_SUSPEND:
17342 +               argv[1] = "swsusp";
17343 +               break;
17344 +
17345 +       case LINUX_REBOOT_CMD_OOM:
17346 +               argv[1] = "oom";
17347 +               break;
17348 +
17349 +       default:
17350 +               vxi->vx_state &= ~VXS_HELPER;
17351 +               return 0;
17352 +       }
17353 +
17354 +       ret = do_vshelper(vshelper_path, argv, envp, 0);
17355 +       vxi->vx_state &= ~VXS_HELPER;
17356 +       __wakeup_vx_info(vxi);
17357 +       return (ret) ? -EPERM : 0;
17358 +}
17359 +
17360 +
17361 +long vs_reboot(unsigned int cmd, void __user *arg)
17362 +{
17363 +       struct vx_info *vxi = current_vx_info();
17364 +       long ret = 0;
17365 +
17366 +       vxdprintk(VXD_CBIT(misc, 5),
17367 +               "vs_reboot(%p[#%d],%u)",
17368 +               vxi, vxi ? vxi->vx_id : 0, cmd);
17369 +
17370 +       ret = vs_reboot_helper(vxi, cmd, arg);
17371 +       if (ret)
17372 +               return ret;
17373 +
17374 +       vxi->reboot_cmd = cmd;
17375 +       if (vx_info_flags(vxi, VXF_REBOOT_KILL, 0)) {
17376 +               switch (cmd) {
17377 +               case LINUX_REBOOT_CMD_RESTART:
17378 +               case LINUX_REBOOT_CMD_HALT:
17379 +               case LINUX_REBOOT_CMD_POWER_OFF:
17380 +                       vx_info_kill(vxi, 0, SIGKILL);
17381 +                       vx_info_kill(vxi, 1, SIGKILL);
17382 +               default:
17383 +                       break;
17384 +               }
17385 +       }
17386 +       return 0;
17387 +}
17388 +
17389 +long vs_oom_action(unsigned int cmd)
17390 +{
17391 +       struct vx_info *vxi = current_vx_info();
17392 +       long ret = 0;
17393 +
17394 +       vxdprintk(VXD_CBIT(misc, 5),
17395 +               "vs_oom_action(%p[#%d],%u)",
17396 +               vxi, vxi ? vxi->vx_id : 0, cmd);
17397 +
17398 +       ret = vs_reboot_helper(vxi, cmd, NULL);
17399 +       if (ret)
17400 +               return ret;
17401 +
17402 +       vxi->reboot_cmd = cmd;
17403 +       if (vx_info_flags(vxi, VXF_REBOOT_KILL, 0)) {
17404 +               vx_info_kill(vxi, 0, SIGKILL);
17405 +               vx_info_kill(vxi, 1, SIGKILL);
17406 +       }
17407 +       return 0;
17408 +}
17409 +
17410 +/*
17411 + *      argv [0] = vshelper_path;
17412 + *      argv [1] = action: "startup", "shutdown"
17413 + *      argv [2] = context identifier
17414 + *
17415 + *      envp [*] = type-specific parameters
17416 + */
17417 +
17418 +long vs_state_change(struct vx_info *vxi, unsigned int cmd)
17419 +{
17420 +       char id_buf[8], cmd_buf[16];
17421 +       char *argv[] = {vshelper_path, NULL, id_buf, 0};
17422 +       char *envp[] = {"HOME=/", "TERM=linux",
17423 +                       "PATH=/sbin:/usr/sbin:/bin:/usr/bin", cmd_buf, 0};
17424 +
17425 +       if (!vx_info_flags(vxi, VXF_SC_HELPER, 0))
17426 +               return 0;
17427 +
17428 +       snprintf(id_buf, sizeof(id_buf), "%d", vxi->vx_id);
17429 +       snprintf(cmd_buf, sizeof(cmd_buf), "VS_CMD=%08x", cmd);
17430 +
17431 +       switch (cmd) {
17432 +       case VSC_STARTUP:
17433 +               argv[1] = "startup";
17434 +               break;
17435 +       case VSC_SHUTDOWN:
17436 +               argv[1] = "shutdown";
17437 +               break;
17438 +       default:
17439 +               return 0;
17440 +       }
17441 +
17442 +       return do_vshelper(vshelper_path, argv, envp, 1);
17443 +}
17444 +
17445 +
17446 +/*
17447 + *      argv [0] = vshelper_path;
17448 + *      argv [1] = action: "netup", "netdown"
17449 + *      argv [2] = context identifier
17450 + *
17451 + *      envp [*] = type-specific parameters
17452 + */
17453 +
17454 +long vs_net_change(struct nx_info *nxi, unsigned int cmd)
17455 +{
17456 +       char id_buf[8], cmd_buf[16];
17457 +       char *argv[] = {vshelper_path, NULL, id_buf, 0};
17458 +       char *envp[] = {"HOME=/", "TERM=linux",
17459 +                       "PATH=/sbin:/usr/sbin:/bin:/usr/bin", cmd_buf, 0};
17460 +
17461 +       if (!nx_info_flags(nxi, NXF_SC_HELPER, 0))
17462 +               return 0;
17463 +
17464 +       snprintf(id_buf, sizeof(id_buf), "%d", nxi->nx_id);
17465 +       snprintf(cmd_buf, sizeof(cmd_buf), "VS_CMD=%08x", cmd);
17466 +
17467 +       switch (cmd) {
17468 +       case VSC_NETUP:
17469 +               argv[1] = "netup";
17470 +               break;
17471 +       case VSC_NETDOWN:
17472 +               argv[1] = "netdown";
17473 +               break;
17474 +       default:
17475 +               return 0;
17476 +       }
17477 +
17478 +       return do_vshelper(vshelper_path, argv, envp, 1);
17479 +}
17480 +
17481 diff -NurpP --minimal linux-4.9.135/kernel/vserver/history.c linux-4.9.135-vs2.3.9.8/kernel/vserver/history.c
17482 --- linux-4.9.135/kernel/vserver/history.c      1970-01-01 00:00:00.000000000 +0000
17483 +++ linux-4.9.135-vs2.3.9.8/kernel/vserver/history.c    2018-10-20 04:58:15.000000000 +0000
17484 @@ -0,0 +1,258 @@
17485 +/*
17486 + *  kernel/vserver/history.c
17487 + *
17488 + *  Virtual Context History Backtrace
17489 + *
17490 + *  Copyright (C) 2004-2007  Herbert P?tzl
17491 + *
17492 + *  V0.01  basic structure
17493 + *  V0.02  hash/unhash and trace
17494 + *  V0.03  preemption fixes
17495 + *
17496 + */
17497 +
17498 +#include <linux/module.h>
17499 +#include <asm/uaccess.h>
17500 +
17501 +#include <linux/vserver/context.h>
17502 +#include <linux/vserver/debug.h>
17503 +#include <linux/vserver/debug_cmd.h>
17504 +#include <linux/vserver/history.h>
17505 +
17506 +
17507 +#ifdef CONFIG_VSERVER_HISTORY
17508 +#define VXH_SIZE       CONFIG_VSERVER_HISTORY_SIZE
17509 +#else
17510 +#define VXH_SIZE       64
17511 +#endif
17512 +
17513 +struct _vx_history {
17514 +       unsigned int counter;
17515 +
17516 +       struct _vx_hist_entry entry[VXH_SIZE + 1];
17517 +};
17518 +
17519 +
17520 +DEFINE_PER_CPU(struct _vx_history, vx_history_buffer);
17521 +
17522 +unsigned volatile int vxh_active = 1;
17523 +
17524 +static atomic_t sequence = ATOMIC_INIT(0);
17525 +
17526 +
17527 +/*     vxh_advance()
17528 +
17529 +       * requires disabled preemption                          */
17530 +
17531 +struct _vx_hist_entry *vxh_advance(void *loc)
17532 +{
17533 +       unsigned int cpu = smp_processor_id();
17534 +       struct _vx_history *hist = &per_cpu(vx_history_buffer, cpu);
17535 +       struct _vx_hist_entry *entry;
17536 +       unsigned int index;
17537 +
17538 +       index = vxh_active ? (hist->counter++ % VXH_SIZE) : VXH_SIZE;
17539 +       entry = &hist->entry[index];
17540 +
17541 +       entry->seq = atomic_inc_return(&sequence);
17542 +       entry->loc = loc;
17543 +       return entry;
17544 +}
17545 +
17546 +EXPORT_SYMBOL_GPL(vxh_advance);
17547 +
17548 +
17549 +#define VXH_LOC_FMTS   "(#%04x,*%d):%p"
17550 +
17551 +#define VXH_LOC_ARGS(e)        (e)->seq, cpu, (e)->loc
17552 +
17553 +
17554 +#define VXH_VXI_FMTS   "%p[#%d,%d.%d]"
17555 +
17556 +#define VXH_VXI_ARGS(e)        (e)->vxi.ptr,                           \
17557 +                       (e)->vxi.ptr ? (e)->vxi.xid : 0,        \
17558 +                       (e)->vxi.ptr ? (e)->vxi.usecnt : 0,     \
17559 +                       (e)->vxi.ptr ? (e)->vxi.tasks : 0
17560 +
17561 +void   vxh_dump_entry(struct _vx_hist_entry *e, unsigned cpu)
17562 +{
17563 +       switch (e->type) {
17564 +       case VXH_THROW_OOPS:
17565 +               printk( VXH_LOC_FMTS " oops \n", VXH_LOC_ARGS(e));
17566 +               break;
17567 +
17568 +       case VXH_GET_VX_INFO:
17569 +       case VXH_PUT_VX_INFO:
17570 +               printk( VXH_LOC_FMTS " %s_vx_info " VXH_VXI_FMTS "\n",
17571 +                       VXH_LOC_ARGS(e),
17572 +                       (e->type == VXH_GET_VX_INFO) ? "get" : "put",
17573 +                       VXH_VXI_ARGS(e));
17574 +               break;
17575 +
17576 +       case VXH_INIT_VX_INFO:
17577 +       case VXH_SET_VX_INFO:
17578 +       case VXH_CLR_VX_INFO:
17579 +               printk( VXH_LOC_FMTS " %s_vx_info " VXH_VXI_FMTS " @%p\n",
17580 +                       VXH_LOC_ARGS(e),
17581 +                       (e->type == VXH_INIT_VX_INFO) ? "init" :
17582 +                       ((e->type == VXH_SET_VX_INFO) ? "set" : "clr"),
17583 +                       VXH_VXI_ARGS(e), e->sc.data);
17584 +               break;
17585 +
17586 +       case VXH_CLAIM_VX_INFO:
17587 +       case VXH_RELEASE_VX_INFO:
17588 +               printk( VXH_LOC_FMTS " %s_vx_info " VXH_VXI_FMTS " @%p\n",
17589 +                       VXH_LOC_ARGS(e),
17590 +                       (e->type == VXH_CLAIM_VX_INFO) ? "claim" : "release",
17591 +                       VXH_VXI_ARGS(e), e->sc.data);
17592 +               break;
17593 +
17594 +       case VXH_ALLOC_VX_INFO:
17595 +       case VXH_DEALLOC_VX_INFO:
17596 +               printk( VXH_LOC_FMTS " %s_vx_info " VXH_VXI_FMTS "\n",
17597 +                       VXH_LOC_ARGS(e),
17598 +                       (e->type == VXH_ALLOC_VX_INFO) ? "alloc" : "dealloc",
17599 +                       VXH_VXI_ARGS(e));
17600 +               break;
17601 +
17602 +       case VXH_HASH_VX_INFO:
17603 +       case VXH_UNHASH_VX_INFO:
17604 +               printk( VXH_LOC_FMTS " __%s_vx_info " VXH_VXI_FMTS "\n",
17605 +                       VXH_LOC_ARGS(e),
17606 +                       (e->type == VXH_HASH_VX_INFO) ? "hash" : "unhash",
17607 +                       VXH_VXI_ARGS(e));
17608 +               break;
17609 +
17610 +       case VXH_LOC_VX_INFO:
17611 +       case VXH_LOOKUP_VX_INFO:
17612 +       case VXH_CREATE_VX_INFO:
17613 +               printk( VXH_LOC_FMTS " __%s_vx_info [#%d] -> " VXH_VXI_FMTS "\n",
17614 +                       VXH_LOC_ARGS(e),
17615 +                       (e->type == VXH_CREATE_VX_INFO) ? "create" :
17616 +                       ((e->type == VXH_LOC_VX_INFO) ? "loc" : "lookup"),
17617 +                       e->ll.arg, VXH_VXI_ARGS(e));
17618 +               break;
17619 +       }
17620 +}
17621 +
17622 +static void __vxh_dump_history(void)
17623 +{
17624 +       unsigned int i, cpu;
17625 +
17626 +       printk("History:\tSEQ: %8x\tNR_CPUS: %d\n",
17627 +               atomic_read(&sequence), NR_CPUS);
17628 +
17629 +       for (i = 0; i < VXH_SIZE; i++) {
17630 +               for_each_online_cpu(cpu) {
17631 +                       struct _vx_history *hist =
17632 +                               &per_cpu(vx_history_buffer, cpu);
17633 +                       unsigned int index = (hist->counter - i) % VXH_SIZE;
17634 +                       struct _vx_hist_entry *entry = &hist->entry[index];
17635 +
17636 +                       vxh_dump_entry(entry, cpu);
17637 +               }
17638 +       }
17639 +}
17640 +
17641 +void   vxh_dump_history(void)
17642 +{
17643 +       vxh_active = 0;
17644 +#ifdef CONFIG_SMP
17645 +       local_irq_enable();
17646 +       smp_send_stop();
17647 +       local_irq_disable();
17648 +#endif
17649 +       __vxh_dump_history();
17650 +}
17651 +
17652 +
17653 +/* vserver syscall commands below here */
17654 +
17655 +
17656 +int vc_dump_history(uint32_t id)
17657 +{
17658 +       vxh_active = 0;
17659 +       __vxh_dump_history();
17660 +       vxh_active = 1;
17661 +
17662 +       return 0;
17663 +}
17664 +
17665 +
17666 +int do_read_history(struct __user _vx_hist_entry *data,
17667 +       int cpu, uint32_t *index, uint32_t *count)
17668 +{
17669 +       int pos, ret = 0;
17670 +       struct _vx_history *hist = &per_cpu(vx_history_buffer, cpu);
17671 +       int end = hist->counter;
17672 +       int start = end - VXH_SIZE + 2;
17673 +       int idx = *index;
17674 +
17675 +       /* special case: get current pos */
17676 +       if (!*count) {
17677 +               *index = end;
17678 +               return 0;
17679 +       }
17680 +
17681 +       /* have we lost some data? */
17682 +       if (idx < start)
17683 +               idx = start;
17684 +
17685 +       for (pos = 0; (pos < *count) && (idx < end); pos++, idx++) {
17686 +               struct _vx_hist_entry *entry =
17687 +                       &hist->entry[idx % VXH_SIZE];
17688 +
17689 +               /* send entry to userspace */
17690 +               ret = copy_to_user(&data[pos], entry, sizeof(*entry));
17691 +               if (ret)
17692 +                       break;
17693 +       }
17694 +       /* save new index and count */
17695 +       *index = idx;
17696 +       *count = pos;
17697 +       return ret ? ret : (*index < end);
17698 +}
17699 +
17700 +int vc_read_history(uint32_t id, void __user *data)
17701 +{
17702 +       struct vcmd_read_history_v0 vc_data;
17703 +       int ret;
17704 +
17705 +       if (id >= NR_CPUS)
17706 +               return -EINVAL;
17707 +
17708 +       if (copy_from_user(&vc_data, data, sizeof(vc_data)))
17709 +               return -EFAULT;
17710 +
17711 +       ret = do_read_history((struct __user _vx_hist_entry *)vc_data.data,
17712 +               id, &vc_data.index, &vc_data.count);
17713 +
17714 +       if (copy_to_user(data, &vc_data, sizeof(vc_data)))
17715 +               return -EFAULT;
17716 +       return ret;
17717 +}
17718 +
17719 +#ifdef CONFIG_COMPAT
17720 +
17721 +int vc_read_history_x32(uint32_t id, void __user *data)
17722 +{
17723 +       struct vcmd_read_history_v0_x32 vc_data;
17724 +       int ret;
17725 +
17726 +       if (id >= NR_CPUS)
17727 +               return -EINVAL;
17728 +
17729 +       if (copy_from_user(&vc_data, data, sizeof(vc_data)))
17730 +               return -EFAULT;
17731 +
17732 +       ret = do_read_history((struct __user _vx_hist_entry *)
17733 +               compat_ptr(vc_data.data_ptr),
17734 +               id, &vc_data.index, &vc_data.count);
17735 +
17736 +       if (copy_to_user(data, &vc_data, sizeof(vc_data)))
17737 +               return -EFAULT;
17738 +       return ret;
17739 +}
17740 +
17741 +#endif /* CONFIG_COMPAT */
17742 +
17743 diff -NurpP --minimal linux-4.9.135/kernel/vserver/inet.c linux-4.9.135-vs2.3.9.8/kernel/vserver/inet.c
17744 --- linux-4.9.135/kernel/vserver/inet.c 1970-01-01 00:00:00.000000000 +0000
17745 +++ linux-4.9.135-vs2.3.9.8/kernel/vserver/inet.c       2018-10-20 04:58:15.000000000 +0000
17746 @@ -0,0 +1,236 @@
17747 +
17748 +#include <linux/in.h>
17749 +#include <linux/inetdevice.h>
17750 +#include <linux/export.h>
17751 +#include <linux/vs_inet.h>
17752 +#include <linux/vs_inet6.h>
17753 +#include <linux/vserver/debug.h>
17754 +#include <net/route.h>
17755 +#include <net/addrconf.h>
17756 +
17757 +
17758 +int nx_v4_addr_conflict(struct nx_info *nxi1, struct nx_info *nxi2)
17759 +{
17760 +       int ret = 0;
17761 +
17762 +       if (!nxi1 || !nxi2 || nxi1 == nxi2)
17763 +               ret = 1;
17764 +       else {
17765 +               struct nx_addr_v4 *ptr;
17766 +               unsigned long irqflags;
17767 +
17768 +               spin_lock_irqsave(&nxi1->addr_lock, irqflags);
17769 +               for (ptr = &nxi1->v4; ptr; ptr = ptr->next) {
17770 +                       if (v4_nx_addr_in_nx_info(nxi2, ptr, -1)) {
17771 +                               ret = 1;
17772 +                               break;
17773 +                       }
17774 +               }
17775 +               spin_unlock_irqrestore(&nxi1->addr_lock, irqflags);
17776 +       }
17777 +
17778 +       vxdprintk(VXD_CBIT(net, 2),
17779 +               "nx_v4_addr_conflict(%p,%p): %d",
17780 +               nxi1, nxi2, ret);
17781 +
17782 +       return ret;
17783 +}
17784 +
17785 +
17786 +#ifdef CONFIG_IPV6
17787 +
17788 +int nx_v6_addr_conflict(struct nx_info *nxi1, struct nx_info *nxi2)
17789 +{
17790 +       int ret = 0;
17791 +
17792 +       if (!nxi1 || !nxi2 || nxi1 == nxi2)
17793 +               ret = 1;
17794 +       else {
17795 +               struct nx_addr_v6 *ptr;
17796 +               unsigned long irqflags;
17797 +
17798 +               spin_lock_irqsave(&nxi1->addr_lock, irqflags);
17799 +               for (ptr = &nxi1->v6; ptr; ptr = ptr->next) {
17800 +                       if (v6_nx_addr_in_nx_info(nxi2, ptr, -1)) {
17801 +                               ret = 1;
17802 +                               break;
17803 +                       }
17804 +               }
17805 +               spin_unlock_irqrestore(&nxi1->addr_lock, irqflags);
17806 +       }
17807 +
17808 +       vxdprintk(VXD_CBIT(net, 2),
17809 +               "nx_v6_addr_conflict(%p,%p): %d",
17810 +               nxi1, nxi2, ret);
17811 +
17812 +       return ret;
17813 +}
17814 +
17815 +#endif
17816 +
17817 +int v4_dev_in_nx_info(struct net_device *dev, struct nx_info *nxi)
17818 +{
17819 +       struct in_device *in_dev;
17820 +       struct in_ifaddr **ifap;
17821 +       struct in_ifaddr *ifa;
17822 +       int ret = 0;
17823 +
17824 +       if (!dev)
17825 +               goto out;
17826 +       in_dev = in_dev_get(dev);
17827 +       if (!in_dev)
17828 +               goto out;
17829 +
17830 +       for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL;
17831 +               ifap = &ifa->ifa_next) {
17832 +               if (v4_addr_in_nx_info(nxi, ifa->ifa_local, NXA_MASK_SHOW)) {
17833 +                       ret = 1;
17834 +                       break;
17835 +               }
17836 +       }
17837 +       in_dev_put(in_dev);
17838 +out:
17839 +       return ret;
17840 +}
17841 +
17842 +
17843 +#ifdef CONFIG_IPV6
17844 +
17845 +int v6_dev_in_nx_info(struct net_device *dev, struct nx_info *nxi)
17846 +{
17847 +       struct inet6_dev *in_dev;
17848 +       struct inet6_ifaddr *ifa;
17849 +       int ret = 0;
17850 +
17851 +       if (!dev)
17852 +               goto out;
17853 +       in_dev = in6_dev_get(dev);
17854 +       if (!in_dev)
17855 +               goto out;
17856 +
17857 +       // for (ifap = &in_dev->addr_list; (ifa = *ifap) != NULL;
17858 +       list_for_each_entry(ifa, &in_dev->addr_list, if_list) {
17859 +               if (v6_addr_in_nx_info(nxi, &ifa->addr, -1)) {
17860 +                       ret = 1;
17861 +                       break;
17862 +               }
17863 +       }
17864 +       in6_dev_put(in_dev);
17865 +out:
17866 +       return ret;
17867 +}
17868 +
17869 +#endif
17870 +
17871 +int dev_in_nx_info(struct net_device *dev, struct nx_info *nxi)
17872 +{
17873 +       int ret = 1;
17874 +
17875 +       if (!nxi)
17876 +               goto out;
17877 +       if (nxi->v4.type && v4_dev_in_nx_info(dev, nxi))
17878 +               goto out;
17879 +#ifdef CONFIG_IPV6
17880 +       ret = 2;
17881 +       if (nxi->v6.type && v6_dev_in_nx_info(dev, nxi))
17882 +               goto out;
17883 +#endif
17884 +       ret = 0;
17885 +out:
17886 +       vxdprintk(VXD_CBIT(net, 3),
17887 +               "dev_in_nx_info(%p,%p[#%d]) = %d",
17888 +               dev, nxi, nxi ? nxi->nx_id : 0, ret);
17889 +       return ret;
17890 +}
17891 +
17892 +struct rtable *ip_v4_find_src(struct net *net, struct nx_info *nxi,
17893 +       struct flowi4 *fl4)
17894 +{
17895 +       struct rtable *rt;
17896 +
17897 +       if (!nxi)
17898 +               return NULL;
17899 +
17900 +       /* FIXME: handle lback only case */
17901 +       if (!NX_IPV4(nxi))
17902 +               return ERR_PTR(-EPERM);
17903 +
17904 +       vxdprintk(VXD_CBIT(net, 4),
17905 +               "ip_v4_find_src(%p[#%u]) " NIPQUAD_FMT " -> " NIPQUAD_FMT,
17906 +               nxi, nxi ? nxi->nx_id : 0,
17907 +               NIPQUAD(fl4->saddr), NIPQUAD(fl4->daddr));
17908 +
17909 +       /* single IP is unconditional */
17910 +       if (nx_info_flags(nxi, NXF_SINGLE_IP, 0) &&
17911 +               (fl4->saddr == INADDR_ANY))
17912 +               fl4->saddr = nxi->v4.ip[0].s_addr;
17913 +
17914 +       if (fl4->saddr == INADDR_ANY) {
17915 +               struct nx_addr_v4 *ptr;
17916 +               __be32 found = 0;
17917 +
17918 +               rt = __ip_route_output_key(net, fl4);
17919 +               if (!IS_ERR(rt)) {
17920 +                       found = fl4->saddr;
17921 +                       ip_rt_put(rt);
17922 +                       vxdprintk(VXD_CBIT(net, 4),
17923 +                               "ip_v4_find_src(%p[#%u]) rok[%u]: " NIPQUAD_FMT,
17924 +                               nxi, nxi ? nxi->nx_id : 0, fl4->flowi4_oif, NIPQUAD(found));
17925 +                       if (v4_addr_in_nx_info(nxi, found, NXA_MASK_BIND))
17926 +                               goto found;
17927 +               }
17928 +
17929 +               WARN_ON_ONCE(in_irq());
17930 +               spin_lock_bh(&nxi->addr_lock);
17931 +               for (ptr = &nxi->v4; ptr; ptr = ptr->next) {
17932 +                       __be32 primary = ptr->ip[0].s_addr;
17933 +                       __be32 mask = ptr->mask.s_addr;
17934 +                       __be32 neta = primary & mask;
17935 +
17936 +                       vxdprintk(VXD_CBIT(net, 4), "ip_v4_find_src(%p[#%u]) chk: "
17937 +                               NIPQUAD_FMT "/" NIPQUAD_FMT "/" NIPQUAD_FMT,
17938 +                               nxi, nxi ? nxi->nx_id : 0, NIPQUAD(primary),
17939 +                               NIPQUAD(mask), NIPQUAD(neta));
17940 +                       if ((found & mask) != neta)
17941 +                               continue;
17942 +
17943 +                       fl4->saddr = primary;
17944 +                       rt = __ip_route_output_key(net, fl4);
17945 +                       vxdprintk(VXD_CBIT(net, 4),
17946 +                               "ip_v4_find_src(%p[#%u]) rok[%u]: " NIPQUAD_FMT,
17947 +                               nxi, nxi ? nxi->nx_id : 0, fl4->flowi4_oif, NIPQUAD(primary));
17948 +                       if (!IS_ERR(rt)) {
17949 +                               found = fl4->saddr;
17950 +                               ip_rt_put(rt);
17951 +                               if (found == primary)
17952 +                                       goto found_unlock;
17953 +                       }
17954 +               }
17955 +               /* still no source ip? */
17956 +               found = ipv4_is_loopback(fl4->daddr)
17957 +                       ? IPI_LOOPBACK : nxi->v4.ip[0].s_addr;
17958 +       found_unlock:
17959 +               spin_unlock_bh(&nxi->addr_lock);
17960 +       found:
17961 +               /* assign src ip to flow */
17962 +               fl4->saddr = found;
17963 +
17964 +       } else {
17965 +               if (!v4_addr_in_nx_info(nxi, fl4->saddr, NXA_MASK_BIND))
17966 +                       return ERR_PTR(-EPERM);
17967 +       }
17968 +
17969 +       if (nx_info_flags(nxi, NXF_LBACK_REMAP, 0)) {
17970 +               if (ipv4_is_loopback(fl4->daddr))
17971 +                       fl4->daddr = nxi->v4_lback.s_addr;
17972 +               if (ipv4_is_loopback(fl4->saddr))
17973 +                       fl4->saddr = nxi->v4_lback.s_addr;
17974 +       } else if (ipv4_is_loopback(fl4->daddr) &&
17975 +               !nx_info_flags(nxi, NXF_LBACK_ALLOW, 0))
17976 +               return ERR_PTR(-EPERM);
17977 +
17978 +       return NULL;
17979 +}
17980 +
17981 +EXPORT_SYMBOL_GPL(ip_v4_find_src);
17982 +
17983 diff -NurpP --minimal linux-4.9.135/kernel/vserver/init.c linux-4.9.135-vs2.3.9.8/kernel/vserver/init.c
17984 --- linux-4.9.135/kernel/vserver/init.c 1970-01-01 00:00:00.000000000 +0000
17985 +++ linux-4.9.135-vs2.3.9.8/kernel/vserver/init.c       2018-10-20 04:58:15.000000000 +0000
17986 @@ -0,0 +1,46 @@
17987 +/*
17988 + *  linux/kernel/init.c
17989 + *
17990 + *  Virtual Server Init
17991 + *
17992 + *  Copyright (C) 2004-2007  Herbert P?tzl
17993 + *
17994 + *  V0.01  basic structure
17995 + *
17996 + */
17997 +
17998 +#include <linux/init.h>
17999 +#include <linux/module.h>
18000 +
18001 +int    vserver_register_sysctl(void);
18002 +void   vserver_unregister_sysctl(void);
18003 +
18004 +
18005 +static int __init init_vserver(void)
18006 +{
18007 +       int ret = 0;
18008 +
18009 +#ifdef CONFIG_VSERVER_DEBUG
18010 +       vserver_register_sysctl();
18011 +#endif
18012 +       return ret;
18013 +}
18014 +
18015 +
18016 +static void __exit exit_vserver(void)
18017 +{
18018 +
18019 +#ifdef CONFIG_VSERVER_DEBUG
18020 +       vserver_unregister_sysctl();
18021 +#endif
18022 +       return;
18023 +}
18024 +
18025 +/* FIXME: GFP_ZONETYPES gone
18026 +long vx_slab[GFP_ZONETYPES]; */
18027 +long vx_area;
18028 +
18029 +
18030 +module_init(init_vserver);
18031 +module_exit(exit_vserver);
18032 +
18033 diff -NurpP --minimal linux-4.9.135/kernel/vserver/inode.c linux-4.9.135-vs2.3.9.8/kernel/vserver/inode.c
18034 --- linux-4.9.135/kernel/vserver/inode.c        1970-01-01 00:00:00.000000000 +0000
18035 +++ linux-4.9.135-vs2.3.9.8/kernel/vserver/inode.c      2018-10-20 04:58:15.000000000 +0000
18036 @@ -0,0 +1,440 @@
18037 +/*
18038 + *  linux/kernel/vserver/inode.c
18039 + *
18040 + *  Virtual Server: File System Support
18041 + *
18042 + *  Copyright (C) 2004-2007  Herbert P?tzl
18043 + *
18044 + *  V0.01  separated from vcontext V0.05
18045 + *  V0.02  moved to tag (instead of xid)
18046 + *
18047 + */
18048 +
18049 +#include <linux/tty.h>
18050 +#include <linux/proc_fs.h>
18051 +#include <linux/devpts_fs.h>
18052 +#include <linux/fs.h>
18053 +#include <linux/file.h>
18054 +#include <linux/mount.h>
18055 +#include <linux/parser.h>
18056 +#include <linux/namei.h>
18057 +#include <linux/magic.h>
18058 +#include <linux/slab.h>
18059 +#include <linux/vserver/inode.h>
18060 +#include <linux/vserver/inode_cmd.h>
18061 +#include <linux/vs_base.h>
18062 +#include <linux/vs_tag.h>
18063 +
18064 +#include <asm/uaccess.h>
18065 +#include <../../fs/proc/internal.h>
18066 +
18067 +
18068 +static int __vc_get_iattr(struct inode *in, uint32_t *tag, uint32_t *flags, uint32_t *mask)
18069 +{
18070 +       struct proc_dir_entry *entry;
18071 +
18072 +       if (!in || !in->i_sb)
18073 +               return -ESRCH;
18074 +
18075 +       *flags = IATTR_TAG
18076 +               | (IS_IMMUTABLE(in) ? IATTR_IMMUTABLE : 0)
18077 +               | (IS_IXUNLINK(in) ? IATTR_IXUNLINK : 0)
18078 +               | (IS_BARRIER(in) ? IATTR_BARRIER : 0)
18079 +               | (IS_COW(in) ? IATTR_COW : 0);
18080 +       *mask = IATTR_IXUNLINK | IATTR_IMMUTABLE | IATTR_COW;
18081 +
18082 +       if (S_ISDIR(in->i_mode))
18083 +               *mask |= IATTR_BARRIER;
18084 +
18085 +       if (IS_TAGGED(in)) {
18086 +               *tag = i_tag_read(in);
18087 +               *mask |= IATTR_TAG;
18088 +       }
18089 +
18090 +       switch (in->i_sb->s_magic) {
18091 +       case PROC_SUPER_MAGIC:
18092 +               entry = PROC_I(in)->pde;
18093 +
18094 +               /* check for specific inodes? */
18095 +               if (entry)
18096 +                       *mask |= IATTR_FLAGS;
18097 +               if (entry)
18098 +                       *flags |= (entry->vx_flags & IATTR_FLAGS);
18099 +               else
18100 +                       *flags |= (PROC_I(in)->vx_flags & IATTR_FLAGS);
18101 +               break;
18102 +
18103 +       case DEVPTS_SUPER_MAGIC:
18104 +               *tag = i_tag_read(in);
18105 +               *mask |= IATTR_TAG;
18106 +               break;
18107 +
18108 +       default:
18109 +               break;
18110 +       }
18111 +       return 0;
18112 +}
18113 +
18114 +int vc_get_iattr(void __user *data)
18115 +{
18116 +       struct path path;
18117 +       struct vcmd_ctx_iattr_v1 vc_data = { .tag = -1 };
18118 +       int ret;
18119 +
18120 +       if (copy_from_user(&vc_data, data, sizeof(vc_data)))
18121 +               return -EFAULT;
18122 +
18123 +       ret = user_lpath(vc_data.name, &path);
18124 +       if (!ret) {
18125 +               ret = __vc_get_iattr(path.dentry->d_inode,
18126 +                       &vc_data.tag, &vc_data.flags, &vc_data.mask);
18127 +               path_put(&path);
18128 +       }
18129 +       if (ret)
18130 +               return ret;
18131 +
18132 +       if (copy_to_user(data, &vc_data, sizeof(vc_data)))
18133 +               ret = -EFAULT;
18134 +       return ret;
18135 +}
18136 +
18137 +#ifdef CONFIG_COMPAT
18138 +
18139 +int vc_get_iattr_x32(void __user *data)
18140 +{
18141 +       struct path path;
18142 +       struct vcmd_ctx_iattr_v1_x32 vc_data = { .tag = -1 };
18143 +       int ret;
18144 +
18145 +       if (copy_from_user(&vc_data, data, sizeof(vc_data)))
18146 +               return -EFAULT;
18147 +
18148 +       ret = user_lpath(compat_ptr(vc_data.name_ptr), &path);
18149 +       if (!ret) {
18150 +               ret = __vc_get_iattr(path.dentry->d_inode,
18151 +                       &vc_data.tag, &vc_data.flags, &vc_data.mask);
18152 +               path_put(&path);
18153 +       }
18154 +       if (ret)
18155 +               return ret;
18156 +
18157 +       if (copy_to_user(data, &vc_data, sizeof(vc_data)))
18158 +               ret = -EFAULT;
18159 +       return ret;
18160 +}
18161 +
18162 +#endif /* CONFIG_COMPAT */
18163 +
18164 +
18165 +int vc_fget_iattr(uint32_t fd, void __user *data)
18166 +{
18167 +       struct file *filp;
18168 +       struct vcmd_ctx_fiattr_v0 vc_data = { .tag = -1 };
18169 +       int ret;
18170 +
18171 +       if (copy_from_user(&vc_data, data, sizeof(vc_data)))
18172 +               return -EFAULT;
18173 +
18174 +       filp = fget(fd);
18175 +       if (!filp || !filp->f_path.dentry || !filp->f_path.dentry->d_inode)
18176 +               return -EBADF;
18177 +
18178 +       ret = __vc_get_iattr(filp->f_path.dentry->d_inode,
18179 +               &vc_data.tag, &vc_data.flags, &vc_data.mask);
18180 +
18181 +       fput(filp);
18182 +
18183 +       if (copy_to_user(data, &vc_data, sizeof(vc_data)))
18184 +               ret = -EFAULT;
18185 +       return ret;
18186 +}
18187 +
18188 +
18189 +static int __vc_set_iattr(struct dentry *de, uint32_t *tag, uint32_t *flags, uint32_t *mask)
18190 +{
18191 +       struct inode *in = de->d_inode;
18192 +       int error = 0, is_proc = 0, has_tag = 0;
18193 +       struct iattr attr = { 0 };
18194 +
18195 +       if (!in || !in->i_sb)
18196 +               return -ESRCH;
18197 +
18198 +       is_proc = (in->i_sb->s_magic == PROC_SUPER_MAGIC);
18199 +       if ((*mask & IATTR_FLAGS) && !is_proc)
18200 +               return -EINVAL;
18201 +
18202 +       has_tag = IS_TAGGED(in) ||
18203 +               (in->i_sb->s_magic == DEVPTS_SUPER_MAGIC);
18204 +       if ((*mask & IATTR_TAG) && !has_tag)
18205 +               return -EINVAL;
18206 +
18207 +       inode_lock(in);
18208 +       if (*mask & IATTR_TAG) {
18209 +               attr.ia_tag = make_ktag(&init_user_ns, *tag);
18210 +               attr.ia_valid |= ATTR_TAG;
18211 +       }
18212 +
18213 +       if (*mask & IATTR_FLAGS) {
18214 +               struct proc_dir_entry *entry = PROC_I(in)->pde;
18215 +               unsigned int iflags = PROC_I(in)->vx_flags;
18216 +
18217 +               iflags = (iflags & ~(*mask & IATTR_FLAGS))
18218 +                       | (*flags & IATTR_FLAGS);
18219 +               PROC_I(in)->vx_flags = iflags;
18220 +               if (entry)
18221 +                       entry->vx_flags = iflags;
18222 +       }
18223 +
18224 +       if (*mask & (IATTR_IMMUTABLE | IATTR_IXUNLINK |
18225 +               IATTR_BARRIER | IATTR_COW)) {
18226 +               int iflags = in->i_flags;
18227 +               int vflags = in->i_vflags;
18228 +
18229 +               if (*mask & IATTR_IMMUTABLE) {
18230 +                       if (*flags & IATTR_IMMUTABLE)
18231 +                               iflags |= S_IMMUTABLE;
18232 +                       else
18233 +                               iflags &= ~S_IMMUTABLE;
18234 +               }
18235 +               if (*mask & IATTR_IXUNLINK) {
18236 +                       if (*flags & IATTR_IXUNLINK)
18237 +                               iflags |= S_IXUNLINK;
18238 +                       else
18239 +                               iflags &= ~S_IXUNLINK;
18240 +               }
18241 +               if (S_ISDIR(in->i_mode) && (*mask & IATTR_BARRIER)) {
18242 +                       if (*flags & IATTR_BARRIER)
18243 +                               vflags |= V_BARRIER;
18244 +                       else
18245 +                               vflags &= ~V_BARRIER;
18246 +               }
18247 +               if (S_ISREG(in->i_mode) && (*mask & IATTR_COW)) {
18248 +                       if (*flags & IATTR_COW)
18249 +                               vflags |= V_COW;
18250 +                       else
18251 +                               vflags &= ~V_COW;
18252 +               }
18253 +               if (in->i_op && in->i_op->sync_flags) {
18254 +                       error = in->i_op->sync_flags(in, iflags, vflags);
18255 +                       if (error)
18256 +                               goto out;
18257 +               }
18258 +       }
18259 +
18260 +       if (attr.ia_valid) {
18261 +               if (in->i_op && in->i_op->setattr)
18262 +                       error = in->i_op->setattr(de, &attr);
18263 +               else {
18264 +                       error = setattr_prepare(de, &attr);
18265 +                       if (!error) {
18266 +                               setattr_copy(in, &attr);
18267 +                               mark_inode_dirty(in);
18268 +                       }
18269 +               }
18270 +       }
18271 +
18272 +out:
18273 +       inode_unlock(in);
18274 +       return error;
18275 +}
18276 +
18277 +int vc_set_iattr(void __user *data)
18278 +{
18279 +       struct path path;
18280 +       struct vcmd_ctx_iattr_v1 vc_data;
18281 +       int ret;
18282 +
18283 +       if (!capable(CAP_LINUX_IMMUTABLE))
18284 +               return -EPERM;
18285 +       if (copy_from_user(&vc_data, data, sizeof(vc_data)))
18286 +               return -EFAULT;
18287 +
18288 +       ret = user_lpath(vc_data.name, &path);
18289 +       if (!ret) {
18290 +               ret = __vc_set_iattr(path.dentry,
18291 +                       &vc_data.tag, &vc_data.flags, &vc_data.mask);
18292 +               path_put(&path);
18293 +       }
18294 +
18295 +       if (copy_to_user(data, &vc_data, sizeof(vc_data)))
18296 +               ret = -EFAULT;
18297 +       return ret;
18298 +}
18299 +
18300 +#ifdef CONFIG_COMPAT
18301 +
18302 +int vc_set_iattr_x32(void __user *data)
18303 +{
18304 +       struct path path;
18305 +       struct vcmd_ctx_iattr_v1_x32 vc_data;
18306 +       int ret;
18307 +
18308 +       if (!capable(CAP_LINUX_IMMUTABLE))
18309 +               return -EPERM;
18310 +       if (copy_from_user(&vc_data, data, sizeof(vc_data)))
18311 +               return -EFAULT;
18312 +
18313 +       ret = user_lpath(compat_ptr(vc_data.name_ptr), &path);
18314 +       if (!ret) {
18315 +               ret = __vc_set_iattr(path.dentry,
18316 +                       &vc_data.tag, &vc_data.flags, &vc_data.mask);
18317 +               path_put(&path);
18318 +       }
18319 +
18320 +       if (copy_to_user(data, &vc_data, sizeof(vc_data)))
18321 +               ret = -EFAULT;
18322 +       return ret;
18323 +}
18324 +
18325 +#endif /* CONFIG_COMPAT */
18326 +
18327 +int vc_fset_iattr(uint32_t fd, void __user *data)
18328 +{
18329 +       struct file *filp;
18330 +       struct vcmd_ctx_fiattr_v0 vc_data;
18331 +       int ret;
18332 +
18333 +       if (!capable(CAP_LINUX_IMMUTABLE))
18334 +               return -EPERM;
18335 +       if (copy_from_user(&vc_data, data, sizeof(vc_data)))
18336 +               return -EFAULT;
18337 +
18338 +       filp = fget(fd);
18339 +       if (!filp || !filp->f_path.dentry || !filp->f_path.dentry->d_inode)
18340 +               return -EBADF;
18341 +
18342 +       ret = __vc_set_iattr(filp->f_path.dentry, &vc_data.tag,
18343 +               &vc_data.flags, &vc_data.mask);
18344 +
18345 +       fput(filp);
18346 +
18347 +       if (copy_to_user(data, &vc_data, sizeof(vc_data)))
18348 +               return -EFAULT;
18349 +       return ret;
18350 +}
18351 +
18352 +
18353 +enum { Opt_notagcheck, Opt_tag, Opt_notag, Opt_tagid, Opt_err };
18354 +
18355 +static match_table_t tokens = {
18356 +       {Opt_notagcheck, "notagcheck"},
18357 +#ifdef CONFIG_PROPAGATE
18358 +       {Opt_notag, "notag"},
18359 +       {Opt_tag, "tag"},
18360 +       {Opt_tagid, "tagid=%u"},
18361 +#endif
18362 +       {Opt_err, NULL}
18363 +};
18364 +
18365 +
18366 +static void __dx_parse_remove(char *string, char *opt)
18367 +{
18368 +       char *p = strstr(string, opt);
18369 +       char *q = p;
18370 +
18371 +       if (p) {
18372 +               while (*q != '\0' && *q != ',')
18373 +                       q++;
18374 +               while (*q)
18375 +                       *p++ = *q++;
18376 +               while (*p)
18377 +                       *p++ = '\0';
18378 +       }
18379 +}
18380 +
18381 +int dx_parse_tag(char *string, vtag_t *tag, int remove, int *mnt_flags,
18382 +                unsigned long *flags)
18383 +{
18384 +       int set = 0;
18385 +       substring_t args[MAX_OPT_ARGS];
18386 +       int token;
18387 +       char *s, *p, *opts;
18388 +#if defined(CONFIG_PROPAGATE) || defined(CONFIG_VSERVER_DEBUG)
18389 +       int option = 0;
18390 +#endif
18391 +
18392 +       if (!string)
18393 +               return 0;
18394 +       s = kstrdup(string, GFP_KERNEL | GFP_ATOMIC);
18395 +       if (!s)
18396 +               return 0;
18397 +
18398 +       opts = s;
18399 +       while ((p = strsep(&opts, ",")) != NULL) {
18400 +               token = match_token(p, tokens, args);
18401 +
18402 +               switch (token) {
18403 +#ifdef CONFIG_PROPAGATE
18404 +               case Opt_tag:
18405 +                       if (tag)
18406 +                               *tag = 0;
18407 +                       if (remove)
18408 +                               __dx_parse_remove(s, "tag");
18409 +                       *mnt_flags |= MNT_TAGID;
18410 +                       set |= MNT_TAGID;
18411 +                       break;
18412 +               case Opt_notag:
18413 +                       if (remove)
18414 +                               __dx_parse_remove(s, "notag");
18415 +                       *mnt_flags |= MNT_NOTAG;
18416 +                       set |= MNT_NOTAG;
18417 +                       break;
18418 +               case Opt_tagid:
18419 +                       if (tag && !match_int(args, &option))
18420 +                               *tag = option;
18421 +                       if (remove)
18422 +                               __dx_parse_remove(s, "tagid");
18423 +                       *mnt_flags |= MNT_TAGID;
18424 +                       set |= MNT_TAGID;
18425 +                       break;
18426 +#endif /* CONFIG_PROPAGATE */
18427 +               case Opt_notagcheck:
18428 +                       if (remove)
18429 +                               __dx_parse_remove(s, "notagcheck");
18430 +                       *flags |= MS_NOTAGCHECK;
18431 +                       set |= MS_NOTAGCHECK;
18432 +                       break;
18433 +               }
18434 +               vxdprintk(VXD_CBIT(tag, 7),
18435 +                       "dx_parse_tag(" VS_Q("%s") "): %d:#%d",
18436 +                       p, token, option);
18437 +       }
18438 +       if (set)
18439 +               strcpy(string, s);
18440 +       kfree(s);
18441 +       return set;
18442 +}
18443 +
18444 +#ifdef CONFIG_PROPAGATE
18445 +
18446 +void __dx_propagate_tag(struct nameidata *nd, struct inode *inode)
18447 +{
18448 +       vtag_t new_tag = 0;
18449 +       struct vfsmount *mnt;
18450 +       int propagate;
18451 +
18452 +       if (!nd)
18453 +               return;
18454 +       mnt = nd->path.mnt;
18455 +       if (!mnt)
18456 +               return;
18457 +
18458 +       propagate = (mnt->mnt_flags & MNT_TAGID);
18459 +       if (propagate)
18460 +               new_tag = mnt->mnt_tag;
18461 +
18462 +       vxdprintk(VXD_CBIT(tag, 7),
18463 +               "dx_propagate_tag(%p[#%lu.%d]): %d,%d",
18464 +               inode, inode->i_ino, inode->i_tag,
18465 +               new_tag, (propagate) ? 1 : 0);
18466 +
18467 +       if (propagate)
18468 +               i_tag_write(inode, new_tag);
18469 +}
18470 +
18471 +#include <linux/module.h>
18472 +
18473 +EXPORT_SYMBOL_GPL(__dx_propagate_tag);
18474 +
18475 +#endif /* CONFIG_PROPAGATE */
18476 +
18477 diff -NurpP --minimal linux-4.9.135/kernel/vserver/limit.c linux-4.9.135-vs2.3.9.8/kernel/vserver/limit.c
18478 --- linux-4.9.135/kernel/vserver/limit.c        1970-01-01 00:00:00.000000000 +0000
18479 +++ linux-4.9.135-vs2.3.9.8/kernel/vserver/limit.c      2018-10-20 04:58:15.000000000 +0000
18480 @@ -0,0 +1,386 @@
18481 +/*
18482 + *  linux/kernel/vserver/limit.c
18483 + *
18484 + *  Virtual Server: Context Limits
18485 + *
18486 + *  Copyright (C) 2004-2010  Herbert P?tzl
18487 + *
18488 + *  V0.01  broken out from vcontext V0.05
18489 + *  V0.02  changed vcmds to vxi arg
18490 + *  V0.03  added memory cgroup support
18491 + *
18492 + */
18493 +
18494 +#include <linux/sched.h>
18495 +#include <linux/module.h>
18496 +#include <linux/memcontrol.h>
18497 +#include <linux/page_counter.h>
18498 +#include <linux/vs_limit.h>
18499 +#include <linux/vserver/limit.h>
18500 +#include <linux/vserver/limit_cmd.h>
18501 +
18502 +#include <asm/uaccess.h>
18503 +
18504 +
18505 +const char *vlimit_name[NUM_LIMITS] = {
18506 +       [RLIMIT_CPU]            = "CPU",
18507 +       [RLIMIT_NPROC]          = "NPROC",
18508 +       [RLIMIT_NOFILE]         = "NOFILE",
18509 +       [RLIMIT_LOCKS]          = "LOCKS",
18510 +       [RLIMIT_SIGPENDING]     = "SIGP",
18511 +       [RLIMIT_MSGQUEUE]       = "MSGQ",
18512 +
18513 +       [VLIMIT_NSOCK]          = "NSOCK",
18514 +       [VLIMIT_OPENFD]         = "OPENFD",
18515 +       [VLIMIT_SHMEM]          = "SHMEM",
18516 +       [VLIMIT_DENTRY]         = "DENTRY",
18517 +};
18518 +
18519 +EXPORT_SYMBOL_GPL(vlimit_name);
18520 +
18521 +#define MASK_ENTRY(x)  (1 << (x))
18522 +
18523 +const struct vcmd_ctx_rlimit_mask_v0 vlimit_mask = {
18524 +               /* minimum */
18525 +       0
18526 +       ,       /* softlimit */
18527 +       0
18528 +       ,       /* maximum */
18529 +       MASK_ENTRY( RLIMIT_NPROC        ) |
18530 +       MASK_ENTRY( RLIMIT_NOFILE       ) |
18531 +       MASK_ENTRY( RLIMIT_LOCKS        ) |
18532 +       MASK_ENTRY( RLIMIT_MSGQUEUE     ) |
18533 +
18534 +       MASK_ENTRY( VLIMIT_NSOCK        ) |
18535 +       MASK_ENTRY( VLIMIT_OPENFD       ) |
18536 +       MASK_ENTRY( VLIMIT_SHMEM        ) |
18537 +       MASK_ENTRY( VLIMIT_DENTRY       ) |
18538 +       0
18539 +};
18540 +               /* accounting only */
18541 +uint32_t account_mask =
18542 +       MASK_ENTRY( VLIMIT_SEMARY       ) |
18543 +       MASK_ENTRY( VLIMIT_NSEMS        ) |
18544 +       MASK_ENTRY( VLIMIT_MAPPED       ) |
18545 +       0;
18546 +
18547 +
18548 +static int is_valid_vlimit(int id)
18549 +{
18550 +       uint32_t mask = vlimit_mask.minimum |
18551 +               vlimit_mask.softlimit | vlimit_mask.maximum;
18552 +       return mask & (1 << id);
18553 +}
18554 +
18555 +static int is_accounted_vlimit(int id)
18556 +{
18557 +       if (is_valid_vlimit(id))
18558 +               return 1;
18559 +       return account_mask & (1 << id);
18560 +}
18561 +
18562 +
18563 +static inline uint64_t vc_get_soft(struct vx_info *vxi, int id)
18564 +{
18565 +       rlim_t limit = __rlim_soft(&vxi->limit, id);
18566 +       return VX_VLIM(limit);
18567 +}
18568 +
18569 +static inline uint64_t vc_get_hard(struct vx_info *vxi, int id)
18570 +{
18571 +       rlim_t limit = __rlim_hard(&vxi->limit, id);
18572 +       return VX_VLIM(limit);
18573 +}
18574 +
18575 +static int do_get_rlimit(struct vx_info *vxi, uint32_t id,
18576 +       uint64_t *minimum, uint64_t *softlimit, uint64_t *maximum)
18577 +{
18578 +       if (!is_valid_vlimit(id))
18579 +               return -EINVAL;
18580 +
18581 +       if (minimum)
18582 +               *minimum = CRLIM_UNSET;
18583 +       if (softlimit)
18584 +               *softlimit = vc_get_soft(vxi, id);
18585 +       if (maximum)
18586 +               *maximum = vc_get_hard(vxi, id);
18587 +       return 0;
18588 +}
18589 +
18590 +int vc_get_rlimit(struct vx_info *vxi, void __user *data)
18591 +{
18592 +       struct vcmd_ctx_rlimit_v0 vc_data;
18593 +       int ret;
18594 +
18595 +       if (copy_from_user(&vc_data, data, sizeof(vc_data)))
18596 +               return -EFAULT;
18597 +
18598 +       ret = do_get_rlimit(vxi, vc_data.id,
18599 +               &vc_data.minimum, &vc_data.softlimit, &vc_data.maximum);
18600 +       if (ret)
18601 +               return ret;
18602 +
18603 +       if (copy_to_user(data, &vc_data, sizeof(vc_data)))
18604 +               return -EFAULT;
18605 +       return 0;
18606 +}
18607 +
18608 +static int do_set_rlimit(struct vx_info *vxi, uint32_t id,
18609 +       uint64_t minimum, uint64_t softlimit, uint64_t maximum)
18610 +{
18611 +       if (!is_valid_vlimit(id))
18612 +               return -EINVAL;
18613 +
18614 +       if (maximum != CRLIM_KEEP)
18615 +               __rlim_hard(&vxi->limit, id) = VX_RLIM(maximum);
18616 +       if (softlimit != CRLIM_KEEP)
18617 +               __rlim_soft(&vxi->limit, id) = VX_RLIM(softlimit);
18618 +
18619 +       /* clamp soft limit */
18620 +       if (__rlim_soft(&vxi->limit, id) > __rlim_hard(&vxi->limit, id))
18621 +               __rlim_soft(&vxi->limit, id) = __rlim_hard(&vxi->limit, id);
18622 +
18623 +       return 0;
18624 +}
18625 +
18626 +int vc_set_rlimit(struct vx_info *vxi, void __user *data)
18627 +{
18628 +       struct vcmd_ctx_rlimit_v0 vc_data;
18629 +
18630 +       if (copy_from_user(&vc_data, data, sizeof(vc_data)))
18631 +               return -EFAULT;
18632 +
18633 +       return do_set_rlimit(vxi, vc_data.id,
18634 +               vc_data.minimum, vc_data.softlimit, vc_data.maximum);
18635 +}
18636 +
18637 +#ifdef CONFIG_IA32_EMULATION
18638 +
18639 +int vc_set_rlimit_x32(struct vx_info *vxi, void __user *data)
18640 +{
18641 +       struct vcmd_ctx_rlimit_v0_x32 vc_data;
18642 +
18643 +       if (copy_from_user(&vc_data, data, sizeof(vc_data)))
18644 +               return -EFAULT;
18645 +
18646 +       return do_set_rlimit(vxi, vc_data.id,
18647 +               vc_data.minimum, vc_data.softlimit, vc_data.maximum);
18648 +}
18649 +
18650 +int vc_get_rlimit_x32(struct vx_info *vxi, void __user *data)
18651 +{
18652 +       struct vcmd_ctx_rlimit_v0_x32 vc_data;
18653 +       int ret;
18654 +
18655 +       if (copy_from_user(&vc_data, data, sizeof(vc_data)))
18656 +               return -EFAULT;
18657 +
18658 +       ret = do_get_rlimit(vxi, vc_data.id,
18659 +               &vc_data.minimum, &vc_data.softlimit, &vc_data.maximum);
18660 +       if (ret)
18661 +               return ret;
18662 +
18663 +       if (copy_to_user(data, &vc_data, sizeof(vc_data)))
18664 +               return -EFAULT;
18665 +       return 0;
18666 +}
18667 +
18668 +#endif /* CONFIG_IA32_EMULATION */
18669 +
18670 +
18671 +int vc_get_rlimit_mask(uint32_t id, void __user *data)
18672 +{
18673 +       if (copy_to_user(data, &vlimit_mask, sizeof(vlimit_mask)))
18674 +               return -EFAULT;
18675 +       return 0;
18676 +}
18677 +
18678 +
18679 +static inline void vx_reset_hits(struct _vx_limit *limit)
18680 +{
18681 +       int lim;
18682 +
18683 +       for (lim = 0; lim < NUM_LIMITS; lim++) {
18684 +               atomic_set(&__rlim_lhit(limit, lim), 0);
18685 +       }
18686 +}
18687 +
18688 +int vc_reset_hits(struct vx_info *vxi, void __user *data)
18689 +{
18690 +       vx_reset_hits(&vxi->limit);
18691 +       return 0;
18692 +}
18693 +
18694 +static inline void vx_reset_minmax(struct _vx_limit *limit)
18695 +{
18696 +       rlim_t value;
18697 +       int lim;
18698 +
18699 +       for (lim = 0; lim < NUM_LIMITS; lim++) {
18700 +               value = __rlim_get(limit, lim);
18701 +               __rlim_rmax(limit, lim) = value;
18702 +               __rlim_rmin(limit, lim) = value;
18703 +       }
18704 +}
18705 +
18706 +int vc_reset_minmax(struct vx_info *vxi, void __user *data)
18707 +{
18708 +       vx_reset_minmax(&vxi->limit);
18709 +       return 0;
18710 +}
18711 +
18712 +
18713 +int vc_rlimit_stat(struct vx_info *vxi, void __user *data)
18714 +{
18715 +       struct vcmd_rlimit_stat_v0 vc_data;
18716 +       struct _vx_limit *limit = &vxi->limit;
18717 +       int id;
18718 +
18719 +       if (copy_from_user(&vc_data, data, sizeof(vc_data)))
18720 +               return -EFAULT;
18721 +
18722 +       id = vc_data.id;
18723 +       if (!is_accounted_vlimit(id))
18724 +               return -EINVAL;
18725 +
18726 +       vx_limit_fixup(limit, id);
18727 +       vc_data.hits = atomic_read(&__rlim_lhit(limit, id));
18728 +       vc_data.value = __rlim_get(limit, id);
18729 +       vc_data.minimum = __rlim_rmin(limit, id);
18730 +       vc_data.maximum = __rlim_rmax(limit, id);
18731 +
18732 +       if (copy_to_user(data, &vc_data, sizeof(vc_data)))
18733 +               return -EFAULT;
18734 +       return 0;
18735 +}
18736 +
18737 +
18738 +#ifdef CONFIG_MEMCG
18739 +
18740 +void dump_sysinfo(struct sysinfo *si)
18741 +{
18742 +       printk(KERN_INFO "sysinfo: memunit=%u\n"
18743 +               "\ttotalram:\t%lu\n"
18744 +               "\tfreeram:\t%lu\n"
18745 +               "\tsharedram:\t%lu\n"
18746 +               "\tbufferram:\t%lu\n"
18747 +               "\ttotalswap:\t%lu\n"
18748 +               "\tfreeswap:\t%lu\n"
18749 +               "\ttotalhigh:\t%lu\n"
18750 +               "\tfreehigh:\t%lu\n",
18751 +               si->mem_unit,
18752 +               si->totalram,
18753 +               si->freeram,
18754 +               si->sharedram,
18755 +               si->bufferram,
18756 +               si->totalswap,
18757 +               si->freeswap,
18758 +               si->totalhigh,
18759 +               si->freehigh);
18760 +}
18761 +
18762 +void vx_vsi_meminfo(struct sysinfo *val)
18763 +{
18764 +       struct mem_cgroup *mcg;
18765 +       unsigned long res_limit, res_usage;
18766 +       unsigned shift;
18767 +
18768 +       if (VXD_CBIT(cvirt, 4))
18769 +               dump_sysinfo(val);
18770 +
18771 +       rcu_read_lock();
18772 +       mcg = mem_cgroup_from_task(current);
18773 +       if (VXD_CBIT(cvirt, 5))
18774 +               dump_mem_cgroup(mcg);
18775 +       rcu_read_unlock();
18776 +       if (!mcg)
18777 +               goto out;
18778 +
18779 +       res_limit = mem_cgroup_mem_limit_pages(mcg);
18780 +       res_usage = mem_cgroup_mem_usage_pages(mcg);
18781 +       shift = val->mem_unit == 1 ? PAGE_SHIFT : 0;
18782 +
18783 +       if (res_limit != PAGE_COUNTER_MAX)
18784 +               val->totalram = res_limit << shift;
18785 +       val->freeram = val->totalram - (res_usage << shift);
18786 +       val->bufferram = 0;
18787 +       val->totalhigh = 0;
18788 +       val->freehigh = 0;
18789 +out:
18790 +       return;
18791 +}
18792 +
18793 +void vx_vsi_swapinfo(struct sysinfo *val)
18794 +{
18795 +#ifdef CONFIG_MEMCG_SWAP
18796 +       struct mem_cgroup *mcg;
18797 +       unsigned long res_limit, res_usage, memsw_limit, memsw_usage;
18798 +       signed long swap_limit, swap_usage;
18799 +       unsigned shift;
18800 +
18801 +       if (VXD_CBIT(cvirt, 6))
18802 +               dump_sysinfo(val);
18803 +
18804 +       rcu_read_lock();
18805 +       mcg = mem_cgroup_from_task(current);
18806 +       if (VXD_CBIT(cvirt, 7))
18807 +               dump_mem_cgroup(mcg);
18808 +       rcu_read_unlock();
18809 +       if (!mcg)
18810 +               goto out;
18811 +
18812 +       res_limit = mem_cgroup_mem_limit_pages(mcg);
18813 +
18814 +       /* memory unlimited */
18815 +       if (res_limit == PAGE_COUNTER_MAX)
18816 +               goto out;
18817 +
18818 +       res_usage = mem_cgroup_mem_usage_pages(mcg);
18819 +       memsw_limit = mem_cgroup_memsw_limit_pages(mcg);
18820 +       memsw_usage = mem_cgroup_memsw_usage_pages(mcg);
18821 +       shift = val->mem_unit == 1 ? PAGE_SHIFT : 0;
18822 +
18823 +       swap_limit = memsw_limit - res_limit;
18824 +       /* we have a swap limit? */
18825 +       if (memsw_limit != PAGE_COUNTER_MAX)
18826 +               val->totalswap = swap_limit << shift;
18827 +
18828 +       /* calculate swap part */
18829 +       swap_usage = (memsw_usage > res_usage) ?
18830 +               memsw_usage - res_usage : 0;
18831 +
18832 +       /* total shown minus usage gives free swap */
18833 +       val->freeswap = (swap_usage < swap_limit) ?
18834 +               val->totalswap - (swap_usage << shift) : 0;
18835 +out:
18836 +#else  /* !CONFIG_MEMCG_SWAP */
18837 +       val->totalswap = 0;
18838 +       val->freeswap = 0;
18839 +#endif /* !CONFIG_MEMCG_SWAP */
18840 +       return;
18841 +}
18842 +
18843 +long vx_vsi_cached(struct sysinfo *val)
18844 +{
18845 +       long cache = 0;
18846 +#ifdef CONFIG_MEMCG_BROKEN
18847 +       struct mem_cgroup *mcg;
18848 +
18849 +       if (VXD_CBIT(cvirt, 8))
18850 +               dump_sysinfo(val);
18851 +
18852 +       rcu_read_lock();
18853 +       mcg = mem_cgroup_from_task(current);
18854 +       if (VXD_CBIT(cvirt, 9))
18855 +               dump_mem_cgroup(mcg);
18856 +       rcu_read_unlock();
18857 +       if (!mcg)
18858 +               goto out;
18859 +
18860 +       // cache = mem_cgroup_stat_read_cache(mcg);
18861 +out:
18862 +#endif
18863 +       return cache;
18864 +}
18865 +#endif /* !CONFIG_MEMCG */
18866 +
18867 diff -NurpP --minimal linux-4.9.135/kernel/vserver/limit_init.h linux-4.9.135-vs2.3.9.8/kernel/vserver/limit_init.h
18868 --- linux-4.9.135/kernel/vserver/limit_init.h   1970-01-01 00:00:00.000000000 +0000
18869 +++ linux-4.9.135-vs2.3.9.8/kernel/vserver/limit_init.h 2018-10-20 04:58:15.000000000 +0000
18870 @@ -0,0 +1,31 @@
18871 +
18872 +
18873 +static inline void vx_info_init_limit(struct _vx_limit *limit)
18874 +{
18875 +       int lim;
18876 +
18877 +       for (lim = 0; lim < NUM_LIMITS; lim++) {
18878 +               __rlim_soft(limit, lim) = RLIM_INFINITY;
18879 +               __rlim_hard(limit, lim) = RLIM_INFINITY;
18880 +               __rlim_set(limit, lim, 0);
18881 +               atomic_set(&__rlim_lhit(limit, lim), 0);
18882 +               __rlim_rmin(limit, lim) = 0;
18883 +               __rlim_rmax(limit, lim) = 0;
18884 +       }
18885 +}
18886 +
18887 +static inline void vx_info_exit_limit(struct _vx_limit *limit)
18888 +{
18889 +       rlim_t value;
18890 +       int lim;
18891 +
18892 +       for (lim = 0; lim < NUM_LIMITS; lim++) {
18893 +               if ((1 << lim) & VLIM_NOCHECK)
18894 +                       continue;
18895 +               value = __rlim_get(limit, lim);
18896 +               vxwprintk_xid(value,
18897 +                       "!!! limit: %p[%s,%d] = %ld on exit.",
18898 +                       limit, vlimit_name[lim], lim, (long)value);
18899 +       }
18900 +}
18901 +
18902 diff -NurpP --minimal linux-4.9.135/kernel/vserver/limit_proc.h linux-4.9.135-vs2.3.9.8/kernel/vserver/limit_proc.h
18903 --- linux-4.9.135/kernel/vserver/limit_proc.h   1970-01-01 00:00:00.000000000 +0000
18904 +++ linux-4.9.135-vs2.3.9.8/kernel/vserver/limit_proc.h 2018-10-20 04:58:15.000000000 +0000
18905 @@ -0,0 +1,57 @@
18906 +#ifndef _VX_LIMIT_PROC_H
18907 +#define _VX_LIMIT_PROC_H
18908 +
18909 +#include <linux/vserver/limit_int.h>
18910 +
18911 +
18912 +#define VX_LIMIT_FMT   ":\t%8ld\t%8ld/%8ld\t%8lld/%8lld\t%6d\n"
18913 +#define VX_LIMIT_TOP   \
18914 +       "Limit\t current\t     min/max\t\t    soft/hard\t\thits\n"
18915 +
18916 +#define VX_LIMIT_ARG(r)                                \
18917 +       (unsigned long)__rlim_get(limit, r),    \
18918 +       (unsigned long)__rlim_rmin(limit, r),   \
18919 +       (unsigned long)__rlim_rmax(limit, r),   \
18920 +       VX_VLIM(__rlim_soft(limit, r)),         \
18921 +       VX_VLIM(__rlim_hard(limit, r)),         \
18922 +       atomic_read(&__rlim_lhit(limit, r))
18923 +
18924 +static inline int vx_info_proc_limit(struct _vx_limit *limit, char *buffer)
18925 +{
18926 +       vx_limit_fixup(limit, -1);
18927 +       return sprintf(buffer, VX_LIMIT_TOP
18928 +               "PROC"  VX_LIMIT_FMT
18929 +               "VM"    VX_LIMIT_FMT
18930 +               "VML"   VX_LIMIT_FMT
18931 +               "RSS"   VX_LIMIT_FMT
18932 +               "ANON"  VX_LIMIT_FMT
18933 +               "RMAP"  VX_LIMIT_FMT
18934 +               "FILES" VX_LIMIT_FMT
18935 +               "OFD"   VX_LIMIT_FMT
18936 +               "LOCKS" VX_LIMIT_FMT
18937 +               "SOCK"  VX_LIMIT_FMT
18938 +               "MSGQ"  VX_LIMIT_FMT
18939 +               "SHM"   VX_LIMIT_FMT
18940 +               "SEMA"  VX_LIMIT_FMT
18941 +               "SEMS"  VX_LIMIT_FMT
18942 +               "DENT"  VX_LIMIT_FMT,
18943 +               VX_LIMIT_ARG(RLIMIT_NPROC),
18944 +               VX_LIMIT_ARG(RLIMIT_AS),
18945 +               VX_LIMIT_ARG(RLIMIT_MEMLOCK),
18946 +               VX_LIMIT_ARG(RLIMIT_RSS),
18947 +               VX_LIMIT_ARG(VLIMIT_ANON),
18948 +               VX_LIMIT_ARG(VLIMIT_MAPPED),
18949 +               VX_LIMIT_ARG(RLIMIT_NOFILE),
18950 +               VX_LIMIT_ARG(VLIMIT_OPENFD),
18951 +               VX_LIMIT_ARG(RLIMIT_LOCKS),
18952 +               VX_LIMIT_ARG(VLIMIT_NSOCK),
18953 +               VX_LIMIT_ARG(RLIMIT_MSGQUEUE),
18954 +               VX_LIMIT_ARG(VLIMIT_SHMEM),
18955 +               VX_LIMIT_ARG(VLIMIT_SEMARY),
18956 +               VX_LIMIT_ARG(VLIMIT_NSEMS),
18957 +               VX_LIMIT_ARG(VLIMIT_DENTRY));
18958 +}
18959 +
18960 +#endif /* _VX_LIMIT_PROC_H */
18961 +
18962 +
18963 diff -NurpP --minimal linux-4.9.135/kernel/vserver/network.c linux-4.9.135-vs2.3.9.8/kernel/vserver/network.c
18964 --- linux-4.9.135/kernel/vserver/network.c      1970-01-01 00:00:00.000000000 +0000
18965 +++ linux-4.9.135-vs2.3.9.8/kernel/vserver/network.c    2018-10-20 04:58:15.000000000 +0000
18966 @@ -0,0 +1,1053 @@
18967 +/*
18968 + *  linux/kernel/vserver/network.c
18969 + *
18970 + *  Virtual Server: Network Support
18971 + *
18972 + *  Copyright (C) 2003-2007  Herbert P?tzl
18973 + *
18974 + *  V0.01  broken out from vcontext V0.05
18975 + *  V0.02  cleaned up implementation
18976 + *  V0.03  added equiv nx commands
18977 + *  V0.04  switch to RCU based hash
18978 + *  V0.05  and back to locking again
18979 + *  V0.06  changed vcmds to nxi arg
18980 + *  V0.07  have __create claim() the nxi
18981 + *
18982 + */
18983 +
18984 +#include <linux/err.h>
18985 +#include <linux/slab.h>
18986 +#include <linux/rcupdate.h>
18987 +#include <net/ipv6.h>
18988 +
18989 +#include <linux/vs_network.h>
18990 +#include <linux/vs_pid.h>
18991 +#include <linux/vserver/network_cmd.h>
18992 +
18993 +
18994 +atomic_t nx_global_ctotal      = ATOMIC_INIT(0);
18995 +atomic_t nx_global_cactive     = ATOMIC_INIT(0);
18996 +
18997 +static struct kmem_cache *nx_addr_v4_cachep = NULL;
18998 +static struct kmem_cache *nx_addr_v6_cachep = NULL;
18999 +
19000 +
19001 +static int __init init_network(void)
19002 +{
19003 +       nx_addr_v4_cachep = kmem_cache_create("nx_v4_addr_cache",
19004 +               sizeof(struct nx_addr_v4), 0,
19005 +               SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
19006 +       nx_addr_v6_cachep = kmem_cache_create("nx_v6_addr_cache",
19007 +               sizeof(struct nx_addr_v6), 0,
19008 +               SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
19009 +       return 0;
19010 +}
19011 +
19012 +
19013 +/*     __alloc_nx_addr_v4()                                    */
19014 +
19015 +static inline struct nx_addr_v4 *__alloc_nx_addr_v4(void)
19016 +{
19017 +       struct nx_addr_v4 *nxa = kmem_cache_alloc(
19018 +               nx_addr_v4_cachep, GFP_KERNEL);
19019 +
19020 +       if (!IS_ERR(nxa))
19021 +               memset(nxa, 0, sizeof(*nxa));
19022 +       return nxa;
19023 +}
19024 +
19025 +/*     __dealloc_nx_addr_v4()                                  */
19026 +
19027 +static inline void __dealloc_nx_addr_v4(struct nx_addr_v4 *nxa)
19028 +{
19029 +       kmem_cache_free(nx_addr_v4_cachep, nxa);
19030 +}
19031 +
19032 +/*     __dealloc_nx_addr_v4_all()                              */
19033 +
19034 +static inline void __dealloc_nx_addr_v4_all(struct nx_addr_v4 *nxa)
19035 +{
19036 +       while (nxa) {
19037 +               struct nx_addr_v4 *next = nxa->next;
19038 +
19039 +               __dealloc_nx_addr_v4(nxa);
19040 +               nxa = next;
19041 +       }
19042 +}
19043 +
19044 +
19045 +#ifdef CONFIG_IPV6
19046 +
19047 +/*     __alloc_nx_addr_v6()                                    */
19048 +
19049 +static inline struct nx_addr_v6 *__alloc_nx_addr_v6(void)
19050 +{
19051 +       struct nx_addr_v6 *nxa = kmem_cache_alloc(
19052 +               nx_addr_v6_cachep, GFP_KERNEL);
19053 +
19054 +       if (!IS_ERR(nxa))
19055 +               memset(nxa, 0, sizeof(*nxa));
19056 +       return nxa;
19057 +}
19058 +
19059 +/*     __dealloc_nx_addr_v6()                                  */
19060 +
19061 +static inline void __dealloc_nx_addr_v6(struct nx_addr_v6 *nxa)
19062 +{
19063 +       kmem_cache_free(nx_addr_v6_cachep, nxa);
19064 +}
19065 +
19066 +/*     __dealloc_nx_addr_v6_all()                              */
19067 +
19068 +static inline void __dealloc_nx_addr_v6_all(struct nx_addr_v6 *nxa)
19069 +{
19070 +       while (nxa) {
19071 +               struct nx_addr_v6 *next = nxa->next;
19072 +
19073 +               __dealloc_nx_addr_v6(nxa);
19074 +               nxa = next;
19075 +       }
19076 +}
19077 +
19078 +#endif /* CONFIG_IPV6 */
19079 +
19080 +/*     __alloc_nx_info()
19081 +
19082 +       * allocate an initialized nx_info struct
19083 +       * doesn't make it visible (hash)                        */
19084 +
19085 +static struct nx_info *__alloc_nx_info(vnid_t nid)
19086 +{
19087 +       struct nx_info *new = NULL;
19088 +
19089 +       vxdprintk(VXD_CBIT(nid, 1), "alloc_nx_info(%d)*", nid);
19090 +
19091 +       /* would this benefit from a slab cache? */
19092 +       new = kmalloc(sizeof(struct nx_info), GFP_KERNEL);
19093 +       if (!new)
19094 +               return 0;
19095 +
19096 +       memset(new, 0, sizeof(struct nx_info));
19097 +       new->nx_id = nid;
19098 +       INIT_HLIST_NODE(&new->nx_hlist);
19099 +       atomic_set(&new->nx_usecnt, 0);
19100 +       atomic_set(&new->nx_tasks, 0);
19101 +       spin_lock_init(&new->addr_lock);
19102 +       new->nx_state = 0;
19103 +
19104 +       new->nx_flags = NXF_INIT_SET;
19105 +
19106 +       /* rest of init goes here */
19107 +
19108 +       new->v4_lback.s_addr = htonl(INADDR_LOOPBACK);
19109 +       new->v4_bcast.s_addr = htonl(INADDR_BROADCAST);
19110 +
19111 +       vxdprintk(VXD_CBIT(nid, 0),
19112 +               "alloc_nx_info(%d) = %p", nid, new);
19113 +       atomic_inc(&nx_global_ctotal);
19114 +       return new;
19115 +}
19116 +
19117 +/*     __dealloc_nx_info()
19118 +
19119 +       * final disposal of nx_info                             */
19120 +
19121 +static void __dealloc_nx_info(struct nx_info *nxi)
19122 +{
19123 +       vxdprintk(VXD_CBIT(nid, 0),
19124 +               "dealloc_nx_info(%p)", nxi);
19125 +
19126 +       nxi->nx_hlist.next = LIST_POISON1;
19127 +       nxi->nx_id = -1;
19128 +
19129 +       BUG_ON(atomic_read(&nxi->nx_usecnt));
19130 +       BUG_ON(atomic_read(&nxi->nx_tasks));
19131 +
19132 +       __dealloc_nx_addr_v4_all(nxi->v4.next);
19133 +#ifdef CONFIG_IPV6
19134 +       __dealloc_nx_addr_v6_all(nxi->v6.next);
19135 +#endif
19136 +
19137 +       nxi->nx_state |= NXS_RELEASED;
19138 +       kfree(nxi);
19139 +       atomic_dec(&nx_global_ctotal);
19140 +}
19141 +
19142 +static void __shutdown_nx_info(struct nx_info *nxi)
19143 +{
19144 +       nxi->nx_state |= NXS_SHUTDOWN;
19145 +       vs_net_change(nxi, VSC_NETDOWN);
19146 +}
19147 +
19148 +/*     exported stuff                                          */
19149 +
19150 +void free_nx_info(struct nx_info *nxi)
19151 +{
19152 +       /* context shutdown is mandatory */
19153 +       BUG_ON(nxi->nx_state != NXS_SHUTDOWN);
19154 +
19155 +       /* context must not be hashed */
19156 +       BUG_ON(nxi->nx_state & NXS_HASHED);
19157 +
19158 +       BUG_ON(atomic_read(&nxi->nx_usecnt));
19159 +       BUG_ON(atomic_read(&nxi->nx_tasks));
19160 +
19161 +       __dealloc_nx_info(nxi);
19162 +}
19163 +
19164 +
19165 +void __nx_set_lback(struct nx_info *nxi)
19166 +{
19167 +       int nid = nxi->nx_id;
19168 +       __be32 lback = htonl(INADDR_LOOPBACK ^ ((nid & 0xFFFF) << 8));
19169 +
19170 +       nxi->v4_lback.s_addr = lback;
19171 +}
19172 +
19173 +extern int __nx_inet_add_lback(__be32 addr);
19174 +extern int __nx_inet_del_lback(__be32 addr);
19175 +
19176 +
19177 +/*     hash table for nx_info hash */
19178 +
19179 +#define NX_HASH_SIZE   13
19180 +
19181 +struct hlist_head nx_info_hash[NX_HASH_SIZE];
19182 +
19183 +static DEFINE_SPINLOCK(nx_info_hash_lock);
19184 +
19185 +
19186 +static inline unsigned int __hashval(vnid_t nid)
19187 +{
19188 +       return (nid % NX_HASH_SIZE);
19189 +}
19190 +
19191 +
19192 +
19193 +/*     __hash_nx_info()
19194 +
19195 +       * add the nxi to the global hash table
19196 +       * requires the hash_lock to be held                     */
19197 +
19198 +static inline void __hash_nx_info(struct nx_info *nxi)
19199 +{
19200 +       struct hlist_head *head;
19201 +
19202 +       vxd_assert_lock(&nx_info_hash_lock);
19203 +       vxdprintk(VXD_CBIT(nid, 4),
19204 +               "__hash_nx_info: %p[#%d]", nxi, nxi->nx_id);
19205 +
19206 +       /* context must not be hashed */
19207 +       BUG_ON(nx_info_state(nxi, NXS_HASHED));
19208 +
19209 +       nxi->nx_state |= NXS_HASHED;
19210 +       head = &nx_info_hash[__hashval(nxi->nx_id)];
19211 +       hlist_add_head(&nxi->nx_hlist, head);
19212 +       atomic_inc(&nx_global_cactive);
19213 +}
19214 +
19215 +/*     __unhash_nx_info()
19216 +
19217 +       * remove the nxi from the global hash table
19218 +       * requires the hash_lock to be held                     */
19219 +
19220 +static inline void __unhash_nx_info(struct nx_info *nxi)
19221 +{
19222 +       vxd_assert_lock(&nx_info_hash_lock);
19223 +       vxdprintk(VXD_CBIT(nid, 4),
19224 +               "__unhash_nx_info: %p[#%d.%d.%d]", nxi, nxi->nx_id,
19225 +               atomic_read(&nxi->nx_usecnt), atomic_read(&nxi->nx_tasks));
19226 +
19227 +       /* context must be hashed */
19228 +       BUG_ON(!nx_info_state(nxi, NXS_HASHED));
19229 +       /* but without tasks */
19230 +       BUG_ON(atomic_read(&nxi->nx_tasks));
19231 +
19232 +       nxi->nx_state &= ~NXS_HASHED;
19233 +       hlist_del(&nxi->nx_hlist);
19234 +       atomic_dec(&nx_global_cactive);
19235 +}
19236 +
19237 +
19238 +/*     __lookup_nx_info()
19239 +
19240 +       * requires the hash_lock to be held
19241 +       * doesn't increment the nx_refcnt                       */
19242 +
19243 +static inline struct nx_info *__lookup_nx_info(vnid_t nid)
19244 +{
19245 +       struct hlist_head *head = &nx_info_hash[__hashval(nid)];
19246 +       struct hlist_node *pos;
19247 +       struct nx_info *nxi;
19248 +
19249 +       vxd_assert_lock(&nx_info_hash_lock);
19250 +       hlist_for_each(pos, head) {
19251 +               nxi = hlist_entry(pos, struct nx_info, nx_hlist);
19252 +
19253 +               if (nxi->nx_id == nid)
19254 +                       goto found;
19255 +       }
19256 +       nxi = NULL;
19257 +found:
19258 +       vxdprintk(VXD_CBIT(nid, 0),
19259 +               "__lookup_nx_info(#%u): %p[#%u]",
19260 +               nid, nxi, nxi ? nxi->nx_id : 0);
19261 +       return nxi;
19262 +}
19263 +
19264 +
19265 +/*     __create_nx_info()
19266 +
19267 +       * create the requested context
19268 +       * get(), claim() and hash it                            */
19269 +
19270 +static struct nx_info *__create_nx_info(int id)
19271 +{
19272 +       struct nx_info *new, *nxi = NULL;
19273 +
19274 +       vxdprintk(VXD_CBIT(nid, 1), "create_nx_info(%d)*", id);
19275 +
19276 +       if (!(new = __alloc_nx_info(id)))
19277 +               return ERR_PTR(-ENOMEM);
19278 +
19279 +       /* required to make dynamic xids unique */
19280 +       spin_lock(&nx_info_hash_lock);
19281 +
19282 +       /* static context requested */
19283 +       if ((nxi = __lookup_nx_info(id))) {
19284 +               vxdprintk(VXD_CBIT(nid, 0),
19285 +                       "create_nx_info(%d) = %p (already there)", id, nxi);
19286 +               if (nx_info_flags(nxi, NXF_STATE_SETUP, 0))
19287 +                       nxi = ERR_PTR(-EBUSY);
19288 +               else
19289 +                       nxi = ERR_PTR(-EEXIST);
19290 +               goto out_unlock;
19291 +       }
19292 +       /* new context */
19293 +       vxdprintk(VXD_CBIT(nid, 0),
19294 +               "create_nx_info(%d) = %p (new)", id, new);
19295 +       claim_nx_info(new, NULL);
19296 +       __nx_set_lback(new);
19297 +       __hash_nx_info(get_nx_info(new));
19298 +       nxi = new, new = NULL;
19299 +
19300 +out_unlock:
19301 +       spin_unlock(&nx_info_hash_lock);
19302 +       if (new)
19303 +               __dealloc_nx_info(new);
19304 +       return nxi;
19305 +}
19306 +
19307 +
19308 +
19309 +/*     exported stuff                                          */
19310 +
19311 +
19312 +void unhash_nx_info(struct nx_info *nxi)
19313 +{
19314 +       __shutdown_nx_info(nxi);
19315 +       spin_lock(&nx_info_hash_lock);
19316 +       __unhash_nx_info(nxi);
19317 +       spin_unlock(&nx_info_hash_lock);
19318 +}
19319 +
19320 +/*     lookup_nx_info()
19321 +
19322 +       * search for a nx_info and get() it
19323 +       * negative id means current                             */
19324 +
19325 +struct nx_info *lookup_nx_info(int id)
19326 +{
19327 +       struct nx_info *nxi = NULL;
19328 +
19329 +       if (id < 0) {
19330 +               nxi = get_nx_info(current_nx_info());
19331 +       } else if (id > 1) {
19332 +               spin_lock(&nx_info_hash_lock);
19333 +               nxi = get_nx_info(__lookup_nx_info(id));
19334 +               spin_unlock(&nx_info_hash_lock);
19335 +       }
19336 +       return nxi;
19337 +}
19338 +
19339 +/*     nid_is_hashed()
19340 +
19341 +       * verify that nid is still hashed                       */
19342 +
19343 +int nid_is_hashed(vnid_t nid)
19344 +{
19345 +       int hashed;
19346 +
19347 +       spin_lock(&nx_info_hash_lock);
19348 +       hashed = (__lookup_nx_info(nid) != NULL);
19349 +       spin_unlock(&nx_info_hash_lock);
19350 +       return hashed;
19351 +}
19352 +
19353 +
19354 +#ifdef CONFIG_PROC_FS
19355 +
19356 +/*     get_nid_list()
19357 +
19358 +       * get a subset of hashed nids for proc
19359 +       * assumes size is at least one                          */
19360 +
19361 +int get_nid_list(int index, unsigned int *nids, int size)
19362 +{
19363 +       int hindex, nr_nids = 0;
19364 +
19365 +       /* only show current and children */
19366 +       if (!nx_check(0, VS_ADMIN | VS_WATCH)) {
19367 +               if (index > 0)
19368 +                       return 0;
19369 +               nids[nr_nids] = nx_current_nid();
19370 +               return 1;
19371 +       }
19372 +
19373 +       for (hindex = 0; hindex < NX_HASH_SIZE; hindex++) {
19374 +               struct hlist_head *head = &nx_info_hash[hindex];
19375 +               struct hlist_node *pos;
19376 +
19377 +               spin_lock(&nx_info_hash_lock);
19378 +               hlist_for_each(pos, head) {
19379 +                       struct nx_info *nxi;
19380 +
19381 +                       if (--index > 0)
19382 +                               continue;
19383 +
19384 +                       nxi = hlist_entry(pos, struct nx_info, nx_hlist);
19385 +                       nids[nr_nids] = nxi->nx_id;
19386 +                       if (++nr_nids >= size) {
19387 +                               spin_unlock(&nx_info_hash_lock);
19388 +                               goto out;
19389 +                       }
19390 +               }
19391 +               /* keep the lock time short */
19392 +               spin_unlock(&nx_info_hash_lock);
19393 +       }
19394 +out:
19395 +       return nr_nids;
19396 +}
19397 +#endif
19398 +
19399 +
19400 +/*
19401 + *     migrate task to new network
19402 + *     gets nxi, puts old_nxi on change
19403 + */
19404 +
19405 +int nx_migrate_task(struct task_struct *p, struct nx_info *nxi)
19406 +{
19407 +       struct nx_info *old_nxi;
19408 +       int ret = 0;
19409 +
19410 +       if (!p || !nxi)
19411 +               BUG();
19412 +
19413 +       vxdprintk(VXD_CBIT(nid, 5),
19414 +               "nx_migrate_task(%p,%p[#%d.%d.%d])",
19415 +               p, nxi, nxi->nx_id,
19416 +               atomic_read(&nxi->nx_usecnt),
19417 +               atomic_read(&nxi->nx_tasks));
19418 +
19419 +       if (nx_info_flags(nxi, NXF_INFO_PRIVATE, 0) &&
19420 +               !nx_info_flags(nxi, NXF_STATE_SETUP, 0))
19421 +               return -EACCES;
19422 +
19423 +       if (nx_info_state(nxi, NXS_SHUTDOWN))
19424 +               return -EFAULT;
19425 +
19426 +       /* maybe disallow this completely? */
19427 +       old_nxi = task_get_nx_info(p);
19428 +       if (old_nxi == nxi)
19429 +               goto out;
19430 +
19431 +       task_lock(p);
19432 +       if (old_nxi)
19433 +               clr_nx_info(&p->nx_info);
19434 +       claim_nx_info(nxi, p);
19435 +       set_nx_info(&p->nx_info, nxi);
19436 +       p->nid = nxi->nx_id;
19437 +       task_unlock(p);
19438 +
19439 +       vxdprintk(VXD_CBIT(nid, 5),
19440 +               "moved task %p into nxi:%p[#%d]",
19441 +               p, nxi, nxi->nx_id);
19442 +
19443 +       if (old_nxi)
19444 +               release_nx_info(old_nxi, p);
19445 +       ret = 0;
19446 +out:
19447 +       put_nx_info(old_nxi);
19448 +       return ret;
19449 +}
19450 +
19451 +
19452 +void nx_set_persistent(struct nx_info *nxi)
19453 +{
19454 +       vxdprintk(VXD_CBIT(nid, 6),
19455 +               "nx_set_persistent(%p[#%d])", nxi, nxi->nx_id);
19456 +
19457 +       get_nx_info(nxi);
19458 +       claim_nx_info(nxi, NULL);
19459 +}
19460 +
19461 +void nx_clear_persistent(struct nx_info *nxi)
19462 +{
19463 +       vxdprintk(VXD_CBIT(nid, 6),
19464 +               "nx_clear_persistent(%p[#%d])", nxi, nxi->nx_id);
19465 +
19466 +       release_nx_info(nxi, NULL);
19467 +       put_nx_info(nxi);
19468 +}
19469 +
19470 +void nx_update_persistent(struct nx_info *nxi)
19471 +{
19472 +       if (nx_info_flags(nxi, NXF_PERSISTENT, 0))
19473 +               nx_set_persistent(nxi);
19474 +       else
19475 +               nx_clear_persistent(nxi);
19476 +}
19477 +
19478 +/* vserver syscall commands below here */
19479 +
19480 +/* taks nid and nx_info functions */
19481 +
19482 +#include <asm/uaccess.h>
19483 +
19484 +
19485 +int vc_task_nid(uint32_t id)
19486 +{
19487 +       vnid_t nid;
19488 +
19489 +       if (id) {
19490 +               struct task_struct *tsk;
19491 +
19492 +               rcu_read_lock();
19493 +               tsk = find_task_by_real_pid(id);
19494 +               nid = (tsk) ? tsk->nid : -ESRCH;
19495 +               rcu_read_unlock();
19496 +       } else
19497 +               nid = nx_current_nid();
19498 +       return nid;
19499 +}
19500 +
19501 +
19502 +int vc_nx_info(struct nx_info *nxi, void __user *data)
19503 +{
19504 +       struct vcmd_nx_info_v0 vc_data;
19505 +
19506 +       vc_data.nid = nxi->nx_id;
19507 +
19508 +       if (copy_to_user(data, &vc_data, sizeof(vc_data)))
19509 +               return -EFAULT;
19510 +       return 0;
19511 +}
19512 +
19513 +
19514 +/* network functions */
19515 +
19516 +int vc_net_create(uint32_t nid, void __user *data)
19517 +{
19518 +       struct vcmd_net_create vc_data = { .flagword = NXF_INIT_SET };
19519 +       struct nx_info *new_nxi;
19520 +       int ret;
19521 +
19522 +       if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
19523 +               return -EFAULT;
19524 +
19525 +       if ((nid > MAX_S_CONTEXT) || (nid < 2))
19526 +               return -EINVAL;
19527 +
19528 +       new_nxi = __create_nx_info(nid);
19529 +       if (IS_ERR(new_nxi))
19530 +               return PTR_ERR(new_nxi);
19531 +
19532 +       /* initial flags */
19533 +       new_nxi->nx_flags = vc_data.flagword;
19534 +
19535 +       ret = -ENOEXEC;
19536 +       if (vs_net_change(new_nxi, VSC_NETUP))
19537 +               goto out;
19538 +
19539 +       ret = nx_migrate_task(current, new_nxi);
19540 +       if (ret)
19541 +               goto out;
19542 +
19543 +       /* return context id on success */
19544 +       ret = new_nxi->nx_id;
19545 +
19546 +       /* get a reference for persistent contexts */
19547 +       if ((vc_data.flagword & NXF_PERSISTENT))
19548 +               nx_set_persistent(new_nxi);
19549 +out:
19550 +       release_nx_info(new_nxi, NULL);
19551 +       put_nx_info(new_nxi);
19552 +       return ret;
19553 +}
19554 +
19555 +
19556 +int vc_net_migrate(struct nx_info *nxi, void __user *data)
19557 +{
19558 +       return nx_migrate_task(current, nxi);
19559 +}
19560 +
19561 +
19562 +static inline
19563 +struct nx_addr_v4 *__find_v4_addr(struct nx_info *nxi,
19564 +       __be32 ip, __be32 ip2, __be32 mask, uint16_t type, uint16_t flags,
19565 +       struct nx_addr_v4 **prev)
19566 +{
19567 +       struct nx_addr_v4 *nxa = &nxi->v4;
19568 +
19569 +       for (; nxa; nxa = nxa->next) {
19570 +               if ((nxa->ip[0].s_addr == ip) &&
19571 +                   (nxa->ip[1].s_addr == ip2) &&
19572 +                   (nxa->mask.s_addr == mask) &&
19573 +                   (nxa->type == type) &&
19574 +                   (nxa->flags == flags))
19575 +                   return nxa;
19576 +
19577 +               /* save previous entry */
19578 +               if (prev)
19579 +                       *prev = nxa;
19580 +       }
19581 +       return NULL;
19582 +}
19583 +
19584 +int do_add_v4_addr(struct nx_info *nxi, __be32 ip, __be32 ip2, __be32 mask,
19585 +       uint16_t type, uint16_t flags)
19586 +{
19587 +       struct nx_addr_v4 *nxa = NULL;
19588 +       struct nx_addr_v4 *new = __alloc_nx_addr_v4();
19589 +       unsigned long irqflags;
19590 +       int ret = -EEXIST;
19591 +
19592 +       if (IS_ERR(new))
19593 +               return PTR_ERR(new);
19594 +
19595 +       spin_lock_irqsave(&nxi->addr_lock, irqflags);
19596 +       if (__find_v4_addr(nxi, ip, ip2, mask, type, flags, &nxa))
19597 +               goto out_unlock;
19598 +
19599 +       if (NX_IPV4(nxi)) {
19600 +               nxa->next = new;
19601 +               nxa = new;
19602 +               new = NULL;
19603 +
19604 +               /* remove single ip for ip list */
19605 +               nxi->nx_flags &= ~NXF_SINGLE_IP;
19606 +       }
19607 +
19608 +       nxa->ip[0].s_addr = ip;
19609 +       nxa->ip[1].s_addr = ip2;
19610 +       nxa->mask.s_addr = mask;
19611 +       nxa->type = type;
19612 +       nxa->flags = flags;
19613 +       ret = 0;
19614 +out_unlock:
19615 +       spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
19616 +       if (new)
19617 +               __dealloc_nx_addr_v4(new);
19618 +       return ret;
19619 +}
19620 +
19621 +int do_remove_v4_addr(struct nx_info *nxi, __be32 ip, __be32 ip2, __be32 mask,
19622 +       uint16_t type, uint16_t flags)
19623 +{
19624 +       struct nx_addr_v4 *nxa = NULL;
19625 +       struct nx_addr_v4 *old = NULL;
19626 +       unsigned long irqflags;
19627 +       int ret = 0;
19628 +
19629 +       spin_lock_irqsave(&nxi->addr_lock, irqflags);
19630 +       switch (type) {
19631 +       case NXA_TYPE_ADDR:
19632 +               old = __find_v4_addr(nxi, ip, ip2, mask, type, flags, &nxa);
19633 +               if (old) {
19634 +                       if (nxa) {
19635 +                               nxa->next = old->next;
19636 +                               old->next = NULL;
19637 +                       } else {
19638 +                               if (old->next) {
19639 +                                       nxa = old;
19640 +                                       old = old->next;
19641 +                                       *nxa = *old;
19642 +                                       old->next = NULL;
19643 +                               } else {
19644 +                                       memset(old, 0, sizeof(*old));
19645 +                                       old = NULL;
19646 +                               }
19647 +                       }
19648 +               } else
19649 +                       ret = -ESRCH;
19650 +               break;
19651 +
19652 +       case NXA_TYPE_ANY:
19653 +               nxa = &nxi->v4;
19654 +               old = nxa->next;
19655 +               memset(nxa, 0, sizeof(*nxa));
19656 +               break;
19657 +
19658 +       default:
19659 +               ret = -EINVAL;
19660 +       }
19661 +       spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
19662 +       __dealloc_nx_addr_v4_all(old);
19663 +       return ret;
19664 +}
19665 +
19666 +
19667 +int vc_net_add(struct nx_info *nxi, void __user *data)
19668 +{
19669 +       struct vcmd_net_addr_v0 vc_data;
19670 +       int index, ret = 0;
19671 +
19672 +       if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
19673 +               return -EFAULT;
19674 +
19675 +       switch (vc_data.type) {
19676 +       case NXA_TYPE_IPV4:
19677 +               if ((vc_data.count < 1) || (vc_data.count > 4))
19678 +                       return -EINVAL;
19679 +
19680 +               index = 0;
19681 +               while (index < vc_data.count) {
19682 +                       ret = do_add_v4_addr(nxi, vc_data.ip[index].s_addr, 0,
19683 +                               vc_data.mask[index].s_addr, NXA_TYPE_ADDR, 0);
19684 +                       if (ret)
19685 +                               return ret;
19686 +                       index++;
19687 +               }
19688 +               ret = index;
19689 +               break;
19690 +
19691 +       case NXA_TYPE_IPV4|NXA_MOD_BCAST:
19692 +               nxi->v4_bcast = vc_data.ip[0];
19693 +               ret = 1;
19694 +               break;
19695 +
19696 +       case NXA_TYPE_IPV4|NXA_MOD_LBACK:
19697 +               nxi->v4_lback = vc_data.ip[0];
19698 +               ret = 1;
19699 +               break;
19700 +
19701 +       default:
19702 +               ret = -EINVAL;
19703 +               break;
19704 +       }
19705 +       return ret;
19706 +}
19707 +
19708 +int vc_net_remove(struct nx_info *nxi, void __user *data)
19709 +{
19710 +       struct vcmd_net_addr_v0 vc_data;
19711 +
19712 +       if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
19713 +               return -EFAULT;
19714 +
19715 +       switch (vc_data.type) {
19716 +       case NXA_TYPE_ANY:
19717 +               return do_remove_v4_addr(nxi, 0, 0, 0, vc_data.type, 0);
19718 +       default:
19719 +               return -EINVAL;
19720 +       }
19721 +       return 0;
19722 +}
19723 +
19724 +
19725 +int vc_net_add_ipv4_v1(struct nx_info *nxi, void __user *data)
19726 +{
19727 +       struct vcmd_net_addr_ipv4_v1 vc_data;
19728 +
19729 +       if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
19730 +               return -EFAULT;
19731 +
19732 +       switch (vc_data.type) {
19733 +       case NXA_TYPE_ADDR:
19734 +       case NXA_TYPE_MASK:
19735 +               return do_add_v4_addr(nxi, vc_data.ip.s_addr, 0,
19736 +                       vc_data.mask.s_addr, vc_data.type, vc_data.flags);
19737 +
19738 +       case NXA_TYPE_ADDR | NXA_MOD_BCAST:
19739 +               nxi->v4_bcast = vc_data.ip;
19740 +               break;
19741 +
19742 +       case NXA_TYPE_ADDR | NXA_MOD_LBACK:
19743 +               nxi->v4_lback = vc_data.ip;
19744 +               break;
19745 +
19746 +       default:
19747 +               return -EINVAL;
19748 +       }
19749 +       return 0;
19750 +}
19751 +
19752 +int vc_net_add_ipv4(struct nx_info *nxi, void __user *data)
19753 +{
19754 +       struct vcmd_net_addr_ipv4_v2 vc_data;
19755 +
19756 +       if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
19757 +               return -EFAULT;
19758 +
19759 +       switch (vc_data.type) {
19760 +       case NXA_TYPE_ADDR:
19761 +       case NXA_TYPE_MASK:
19762 +       case NXA_TYPE_RANGE:
19763 +               return do_add_v4_addr(nxi, vc_data.ip.s_addr, vc_data.ip2.s_addr,
19764 +                       vc_data.mask.s_addr, vc_data.type, vc_data.flags);
19765 +
19766 +       case NXA_TYPE_ADDR | NXA_MOD_BCAST:
19767 +               nxi->v4_bcast = vc_data.ip;
19768 +               break;
19769 +
19770 +       case NXA_TYPE_ADDR | NXA_MOD_LBACK:
19771 +               nxi->v4_lback = vc_data.ip;
19772 +               break;
19773 +
19774 +       default:
19775 +               return -EINVAL;
19776 +       }
19777 +       return 0;
19778 +}
19779 +
19780 +int vc_net_rem_ipv4_v1(struct nx_info *nxi, void __user *data)
19781 +{
19782 +       struct vcmd_net_addr_ipv4_v1 vc_data;
19783 +
19784 +       if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
19785 +               return -EFAULT;
19786 +
19787 +       return do_remove_v4_addr(nxi, vc_data.ip.s_addr, 0,
19788 +               vc_data.mask.s_addr, vc_data.type, vc_data.flags);
19789 +}
19790 +
19791 +int vc_net_rem_ipv4(struct nx_info *nxi, void __user *data)
19792 +{
19793 +       struct vcmd_net_addr_ipv4_v2 vc_data;
19794 +
19795 +       if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
19796 +               return -EFAULT;
19797 +
19798 +       return do_remove_v4_addr(nxi, vc_data.ip.s_addr, vc_data.ip2.s_addr,
19799 +               vc_data.mask.s_addr, vc_data.type, vc_data.flags);
19800 +}
19801 +
19802 +#ifdef CONFIG_IPV6
19803 +
19804 +static inline
19805 +struct nx_addr_v6 *__find_v6_addr(struct nx_info *nxi,
19806 +       struct in6_addr *ip, struct in6_addr *mask,
19807 +       uint32_t prefix, uint16_t type, uint16_t flags,
19808 +       struct nx_addr_v6 **prev)
19809 +{
19810 +       struct nx_addr_v6 *nxa = &nxi->v6;
19811 +
19812 +       for (; nxa; nxa = nxa->next) {
19813 +               if (ipv6_addr_equal(&nxa->ip, ip) &&
19814 +                   ipv6_addr_equal(&nxa->mask, mask) &&
19815 +                   (nxa->prefix == prefix) &&
19816 +                   (nxa->type == type) &&
19817 +                   (nxa->flags == flags))
19818 +                   return nxa;
19819 +
19820 +               /* save previous entry */
19821 +               if (prev)
19822 +                       *prev = nxa;
19823 +       }
19824 +       return NULL;
19825 +}
19826 +
19827 +
19828 +int do_add_v6_addr(struct nx_info *nxi,
19829 +       struct in6_addr *ip, struct in6_addr *mask,
19830 +       uint32_t prefix, uint16_t type, uint16_t flags)
19831 +{
19832 +       struct nx_addr_v6 *nxa = NULL;
19833 +       struct nx_addr_v6 *new = __alloc_nx_addr_v6();
19834 +       unsigned long irqflags;
19835 +       int ret = -EEXIST;
19836 +
19837 +       if (IS_ERR(new))
19838 +               return PTR_ERR(new);
19839 +
19840 +       spin_lock_irqsave(&nxi->addr_lock, irqflags);
19841 +       if (__find_v6_addr(nxi, ip, mask, prefix, type, flags, &nxa))
19842 +               goto out_unlock;
19843 +
19844 +       if (NX_IPV6(nxi)) {
19845 +               nxa->next = new;
19846 +               nxa = new;
19847 +               new = NULL;
19848 +       }
19849 +
19850 +       nxa->ip = *ip;
19851 +       nxa->mask = *mask;
19852 +       nxa->prefix = prefix;
19853 +       nxa->type = type;
19854 +       nxa->flags = flags;
19855 +       ret = 0;
19856 +out_unlock:
19857 +       spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
19858 +       if (new)
19859 +               __dealloc_nx_addr_v6(new);
19860 +       return ret;
19861 +}
19862 +
19863 +int do_remove_v6_addr(struct nx_info *nxi,
19864 +       struct in6_addr *ip, struct in6_addr *mask,
19865 +       uint32_t prefix, uint16_t type, uint16_t flags)
19866 +{
19867 +       struct nx_addr_v6 *nxa = NULL;
19868 +       struct nx_addr_v6 *old = NULL;
19869 +       unsigned long irqflags;
19870 +       int ret = 0;
19871 +
19872 +       spin_lock_irqsave(&nxi->addr_lock, irqflags);
19873 +       switch (type) {
19874 +       case NXA_TYPE_ADDR:
19875 +               old = __find_v6_addr(nxi, ip, mask, prefix, type, flags, &nxa);
19876 +               if (old) {
19877 +                       if (nxa) {
19878 +                               nxa->next = old->next;
19879 +                               old->next = NULL;
19880 +                       } else {
19881 +                               if (old->next) {
19882 +                                       nxa = old;
19883 +                                       old = old->next;
19884 +                                       *nxa = *old;
19885 +                                       old->next = NULL;
19886 +                               } else {
19887 +                                       memset(old, 0, sizeof(*old));
19888 +                                       old = NULL;
19889 +                               }
19890 +                       }
19891 +               } else
19892 +                       ret = -ESRCH;
19893 +               break;
19894 +
19895 +       case NXA_TYPE_ANY:
19896 +               nxa = &nxi->v6;
19897 +               old = nxa->next;
19898 +               memset(nxa, 0, sizeof(*nxa));
19899 +               break;
19900 +
19901 +       default:
19902 +               ret = -EINVAL;
19903 +       }
19904 +       spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
19905 +       __dealloc_nx_addr_v6_all(old);
19906 +       return ret;
19907 +}
19908 +
19909 +int vc_net_add_ipv6(struct nx_info *nxi, void __user *data)
19910 +{
19911 +       struct vcmd_net_addr_ipv6_v1 vc_data;
19912 +
19913 +       if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
19914 +               return -EFAULT;
19915 +
19916 +       switch (vc_data.type) {
19917 +       case NXA_TYPE_ADDR:
19918 +               memset(&vc_data.mask, ~0, sizeof(vc_data.mask));
19919 +               /* fallthrough */
19920 +       case NXA_TYPE_MASK:
19921 +               return do_add_v6_addr(nxi, &vc_data.ip, &vc_data.mask,
19922 +                       vc_data.prefix, vc_data.type, vc_data.flags);
19923 +       default:
19924 +               return -EINVAL;
19925 +       }
19926 +       return 0;
19927 +}
19928 +
19929 +int vc_net_remove_ipv6(struct nx_info *nxi, void __user *data)
19930 +{
19931 +       struct vcmd_net_addr_ipv6_v1 vc_data;
19932 +
19933 +       if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
19934 +               return -EFAULT;
19935 +
19936 +       switch (vc_data.type) {
19937 +       case NXA_TYPE_ADDR:
19938 +               memset(&vc_data.mask, ~0, sizeof(vc_data.mask));
19939 +               /* fallthrough */
19940 +       case NXA_TYPE_MASK:
19941 +               return do_remove_v6_addr(nxi, &vc_data.ip, &vc_data.mask,
19942 +                       vc_data.prefix, vc_data.type, vc_data.flags);
19943 +       case NXA_TYPE_ANY:
19944 +               return do_remove_v6_addr(nxi, NULL, NULL, 0, vc_data.type, 0);
19945 +       default:
19946 +               return -EINVAL;
19947 +       }
19948 +       return 0;
19949 +}
19950 +
19951 +#endif /* CONFIG_IPV6 */
19952 +
19953 +
19954 +int vc_get_nflags(struct nx_info *nxi, void __user *data)
19955 +{
19956 +       struct vcmd_net_flags_v0 vc_data;
19957 +
19958 +       vc_data.flagword = nxi->nx_flags;
19959 +
19960 +       /* special STATE flag handling */
19961 +       vc_data.mask = vs_mask_flags(~0ULL, nxi->nx_flags, NXF_ONE_TIME);
19962 +
19963 +       if (copy_to_user(data, &vc_data, sizeof(vc_data)))
19964 +               return -EFAULT;
19965 +       return 0;
19966 +}
19967 +
19968 +int vc_set_nflags(struct nx_info *nxi, void __user *data)
19969 +{
19970 +       struct vcmd_net_flags_v0 vc_data;
19971 +       uint64_t mask, trigger;
19972 +
19973 +       if (copy_from_user(&vc_data, data, sizeof(vc_data)))
19974 +               return -EFAULT;
19975 +
19976 +       /* special STATE flag handling */
19977 +       mask = vs_mask_mask(vc_data.mask, nxi->nx_flags, NXF_ONE_TIME);
19978 +       trigger = (mask & nxi->nx_flags) ^ (mask & vc_data.flagword);
19979 +
19980 +       nxi->nx_flags = vs_mask_flags(nxi->nx_flags,
19981 +               vc_data.flagword, mask);
19982 +       if (trigger & NXF_PERSISTENT)
19983 +               nx_update_persistent(nxi);
19984 +
19985 +       return 0;
19986 +}
19987 +
19988 +int vc_get_ncaps(struct nx_info *nxi, void __user *data)
19989 +{
19990 +       struct vcmd_net_caps_v0 vc_data;
19991 +
19992 +       vc_data.ncaps = nxi->nx_ncaps;
19993 +       vc_data.cmask = ~0ULL;
19994 +
19995 +       if (copy_to_user(data, &vc_data, sizeof(vc_data)))
19996 +               return -EFAULT;
19997 +       return 0;
19998 +}
19999 +
20000 +int vc_set_ncaps(struct nx_info *nxi, void __user *data)
20001 +{
20002 +       struct vcmd_net_caps_v0 vc_data;
20003 +
20004 +       if (copy_from_user(&vc_data, data, sizeof(vc_data)))
20005 +               return -EFAULT;
20006 +
20007 +       nxi->nx_ncaps = vs_mask_flags(nxi->nx_ncaps,
20008 +               vc_data.ncaps, vc_data.cmask);
20009 +       return 0;
20010 +}
20011 +
20012 +
20013 +#include <linux/module.h>
20014 +
20015 +module_init(init_network);
20016 +
20017 +EXPORT_SYMBOL_GPL(free_nx_info);
20018 +EXPORT_SYMBOL_GPL(unhash_nx_info);
20019 +
20020 diff -NurpP --minimal linux-4.9.135/kernel/vserver/proc.c linux-4.9.135-vs2.3.9.8/kernel/vserver/proc.c
20021 --- linux-4.9.135/kernel/vserver/proc.c 1970-01-01 00:00:00.000000000 +0000
20022 +++ linux-4.9.135-vs2.3.9.8/kernel/vserver/proc.c       2018-10-20 04:58:15.000000000 +0000
20023 @@ -0,0 +1,1040 @@
20024 +/*
20025 + *  linux/kernel/vserver/proc.c
20026 + *
20027 + *  Virtual Context Support
20028 + *
20029 + *  Copyright (C) 2003-2011  Herbert P?tzl
20030 + *
20031 + *  V0.01  basic structure
20032 + *  V0.02  adaptation vs1.3.0
20033 + *  V0.03  proc permissions
20034 + *  V0.04  locking/generic
20035 + *  V0.05  next generation procfs
20036 + *  V0.06  inode validation
20037 + *  V0.07  generic rewrite vid
20038 + *  V0.08  remove inode type
20039 + *  V0.09  added u/wmask info
20040 + *
20041 + */
20042 +
20043 +#include <linux/proc_fs.h>
20044 +#include <linux/fs_struct.h>
20045 +#include <linux/mount.h>
20046 +#include <linux/namei.h>
20047 +#include <asm/unistd.h>
20048 +
20049 +#include <linux/vs_context.h>
20050 +#include <linux/vs_network.h>
20051 +#include <linux/vs_cvirt.h>
20052 +
20053 +#include <linux/in.h>
20054 +#include <linux/inetdevice.h>
20055 +#include <linux/vs_inet.h>
20056 +#include <linux/vs_inet6.h>
20057 +
20058 +#include <linux/vserver/global.h>
20059 +
20060 +#include "cvirt_proc.h"
20061 +#include "cacct_proc.h"
20062 +#include "limit_proc.h"
20063 +#include "sched_proc.h"
20064 +#include "vci_config.h"
20065 +
20066 +#include <../../fs/proc/internal.h>
20067 +
20068 +
20069 +static inline char *print_cap_t(char *buffer, kernel_cap_t *c)
20070 +{
20071 +       unsigned __capi;
20072 +
20073 +       CAP_FOR_EACH_U32(__capi) {
20074 +               buffer += sprintf(buffer, "%08x",
20075 +                       c->cap[(_KERNEL_CAPABILITY_U32S-1) - __capi]);
20076 +       }
20077 +       return buffer;
20078 +}
20079 +
20080 +
20081 +static struct proc_dir_entry *proc_virtual;
20082 +
20083 +static struct proc_dir_entry *proc_virtnet;
20084 +
20085 +
20086 +/* first the actual feeds */
20087 +
20088 +
20089 +static int proc_vci(char *buffer)
20090 +{
20091 +       return sprintf(buffer,
20092 +               "VCIVersion:\t%04x:%04x\n"
20093 +               "VCISyscall:\t%d\n"
20094 +               "VCIKernel:\t%08x\n",
20095 +               VCI_VERSION >> 16,
20096 +               VCI_VERSION & 0xFFFF,
20097 +               __NR_vserver,
20098 +               vci_kernel_config());
20099 +}
20100 +
20101 +static int proc_virtual_info(char *buffer)
20102 +{
20103 +       return proc_vci(buffer);
20104 +}
20105 +
20106 +static int proc_virtual_status(char *buffer)
20107 +{
20108 +       return sprintf(buffer,
20109 +               "#CTotal:\t%d\n"
20110 +               "#CActive:\t%d\n"
20111 +               "#NSProxy:\t%d\t%d %d %d %d %d %d\n"
20112 +               "#InitTask:\t%d\t%d %d\n",
20113 +               atomic_read(&vx_global_ctotal),
20114 +               atomic_read(&vx_global_cactive),
20115 +               atomic_read(&vs_global_nsproxy),
20116 +               atomic_read(&vs_global_fs),
20117 +               atomic_read(&vs_global_mnt_ns),
20118 +               atomic_read(&vs_global_uts_ns),
20119 +               atomic_read(&vs_global_ipc_ns),
20120 +               atomic_read(&vs_global_user_ns),
20121 +               atomic_read(&vs_global_pid_ns),
20122 +               atomic_read(&init_task.usage),
20123 +               atomic_read(&init_task.nsproxy->count),
20124 +               init_task.fs->users);
20125 +}
20126 +
20127 +
20128 +int proc_vxi_info(struct vx_info *vxi, char *buffer)
20129 +{
20130 +       int length;
20131 +
20132 +       length = sprintf(buffer,
20133 +               "ID:\t%d\n"
20134 +               "Info:\t%p\n"
20135 +               "Init:\t%d\n"
20136 +               "OOM:\t%lld\n",
20137 +               vxi->vx_id,
20138 +               vxi,
20139 +               vxi->vx_initpid,
20140 +               vxi->vx_badness_bias);
20141 +       return length;
20142 +}
20143 +
20144 +int proc_vxi_status(struct vx_info *vxi, char *buffer)
20145 +{
20146 +       char *orig = buffer;
20147 +
20148 +       buffer += sprintf(buffer,
20149 +               "UseCnt:\t%d\n"
20150 +               "Tasks:\t%d\n"
20151 +               "Flags:\t%016llx\n",
20152 +               atomic_read(&vxi->vx_usecnt),
20153 +               atomic_read(&vxi->vx_tasks),
20154 +               (unsigned long long)vxi->vx_flags);
20155 +
20156 +       buffer += sprintf(buffer, "BCaps:\t");
20157 +       buffer = print_cap_t(buffer, &vxi->vx_bcaps);
20158 +       buffer += sprintf(buffer, "\n");
20159 +
20160 +       buffer += sprintf(buffer,
20161 +               "CCaps:\t%016llx\n"
20162 +               "Umask:\t%16llx\n"
20163 +               "Wmask:\t%16llx\n"
20164 +               "Spaces:\t%08lx %08lx\n",
20165 +               (unsigned long long)vxi->vx_ccaps,
20166 +               (unsigned long long)vxi->vx_umask,
20167 +               (unsigned long long)vxi->vx_wmask,
20168 +               vxi->space[0].vx_nsmask, vxi->space[1].vx_nsmask);
20169 +       return buffer - orig;
20170 +}
20171 +
20172 +int proc_vxi_limit(struct vx_info *vxi, char *buffer)
20173 +{
20174 +       return vx_info_proc_limit(&vxi->limit, buffer);
20175 +}
20176 +
20177 +int proc_vxi_sched(struct vx_info *vxi, char *buffer)
20178 +{
20179 +       int cpu, length;
20180 +
20181 +       length = vx_info_proc_sched(&vxi->sched, buffer);
20182 +       for_each_online_cpu(cpu) {
20183 +               length += vx_info_proc_sched_pc(
20184 +                       &vx_per_cpu(vxi, sched_pc, cpu),
20185 +                       buffer + length, cpu);
20186 +       }
20187 +       return length;
20188 +}
20189 +
20190 +int proc_vxi_nsproxy0(struct vx_info *vxi, char *buffer)
20191 +{
20192 +       return vx_info_proc_nsproxy(vxi->space[0].vx_nsproxy, buffer);
20193 +}
20194 +
20195 +int proc_vxi_nsproxy1(struct vx_info *vxi, char *buffer)
20196 +{
20197 +       return vx_info_proc_nsproxy(vxi->space[1].vx_nsproxy, buffer);
20198 +}
20199 +
20200 +int proc_vxi_cvirt(struct vx_info *vxi, char *buffer)
20201 +{
20202 +       int cpu, length;
20203 +
20204 +       vx_update_load(vxi);
20205 +       length = vx_info_proc_cvirt(&vxi->cvirt, buffer);
20206 +       for_each_online_cpu(cpu) {
20207 +               length += vx_info_proc_cvirt_pc(
20208 +                       &vx_per_cpu(vxi, cvirt_pc, cpu),
20209 +                       buffer + length, cpu);
20210 +       }
20211 +       return length;
20212 +}
20213 +
20214 +int proc_vxi_cacct(struct vx_info *vxi, char *buffer)
20215 +{
20216 +       return vx_info_proc_cacct(&vxi->cacct, buffer);
20217 +}
20218 +
20219 +
20220 +static int proc_virtnet_info(char *buffer)
20221 +{
20222 +       return proc_vci(buffer);
20223 +}
20224 +
20225 +static int proc_virtnet_status(char *buffer)
20226 +{
20227 +       return sprintf(buffer,
20228 +               "#CTotal:\t%d\n"
20229 +               "#CActive:\t%d\n",
20230 +               atomic_read(&nx_global_ctotal),
20231 +               atomic_read(&nx_global_cactive));
20232 +}
20233 +
20234 +int proc_nxi_info(struct nx_info *nxi, char *buffer)
20235 +{
20236 +       struct nx_addr_v4 *v4a;
20237 +#ifdef CONFIG_IPV6
20238 +       struct nx_addr_v6 *v6a;
20239 +#endif
20240 +       int length, i;
20241 +
20242 +       length = sprintf(buffer,
20243 +               "ID:\t%d\n"
20244 +               "Info:\t%p\n"
20245 +               "Bcast:\t" NIPQUAD_FMT "\n"
20246 +               "Lback:\t" NIPQUAD_FMT "\n",
20247 +               nxi->nx_id,
20248 +               nxi,
20249 +               NIPQUAD(nxi->v4_bcast.s_addr),
20250 +               NIPQUAD(nxi->v4_lback.s_addr));
20251 +
20252 +       if (!NX_IPV4(nxi))
20253 +               goto skip_v4;
20254 +       for (i = 0, v4a = &nxi->v4; v4a; i++, v4a = v4a->next)
20255 +               length += sprintf(buffer + length, "%d:\t" NXAV4_FMT "\n",
20256 +                       i, NXAV4(v4a));
20257 +skip_v4:
20258 +#ifdef CONFIG_IPV6
20259 +       if (!NX_IPV6(nxi))
20260 +               goto skip_v6;
20261 +       for (i = 0, v6a = &nxi->v6; v6a; i++, v6a = v6a->next)
20262 +               length += sprintf(buffer + length, "%d:\t" NXAV6_FMT "\n",
20263 +                       i, NXAV6(v6a));
20264 +skip_v6:
20265 +#endif
20266 +       return length;
20267 +}
20268 +
20269 +int proc_nxi_status(struct nx_info *nxi, char *buffer)
20270 +{
20271 +       int length;
20272 +
20273 +       length = sprintf(buffer,
20274 +               "UseCnt:\t%d\n"
20275 +               "Tasks:\t%d\n"
20276 +               "Flags:\t%016llx\n"
20277 +               "NCaps:\t%016llx\n",
20278 +               atomic_read(&nxi->nx_usecnt),
20279 +               atomic_read(&nxi->nx_tasks),
20280 +               (unsigned long long)nxi->nx_flags,
20281 +               (unsigned long long)nxi->nx_ncaps);
20282 +       return length;
20283 +}
20284 +
20285 +
20286 +
20287 +/* here the inode helpers */
20288 +
20289 +struct vs_entry {
20290 +       int len;
20291 +       char *name;
20292 +       mode_t mode;
20293 +       struct inode_operations *iop;
20294 +       struct file_operations *fop;
20295 +       union proc_op op;
20296 +};
20297 +
20298 +static struct inode *vs_proc_make_inode(struct super_block *sb, struct vs_entry *p)
20299 +{
20300 +       struct inode *inode = new_inode(sb);
20301 +
20302 +       if (!inode)
20303 +               goto out;
20304 +
20305 +       inode->i_mode = p->mode;
20306 +       if (p->iop)
20307 +               inode->i_op = p->iop;
20308 +       if (p->fop)
20309 +               inode->i_fop = p->fop;
20310 +
20311 +       set_nlink(inode, (p->mode & S_IFDIR) ? 2 : 1);
20312 +       inode->i_flags |= S_IMMUTABLE;
20313 +
20314 +       inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
20315 +
20316 +       i_uid_write(inode, 0);
20317 +       i_gid_write(inode, 0);
20318 +       i_tag_write(inode, 0);
20319 +out:
20320 +       return inode;
20321 +}
20322 +
20323 +static struct dentry *vs_proc_instantiate(struct inode *dir,
20324 +       struct dentry *dentry, int id, void *ptr)
20325 +{
20326 +       struct vs_entry *p = ptr;
20327 +       struct inode *inode = vs_proc_make_inode(dir->i_sb, p);
20328 +       struct dentry *error = ERR_PTR(-EINVAL);
20329 +
20330 +       if (!inode)
20331 +               goto out;
20332 +
20333 +       PROC_I(inode)->op = p->op;
20334 +       PROC_I(inode)->fd = id;
20335 +       d_add(dentry, inode);
20336 +       error = NULL;
20337 +out:
20338 +       return error;
20339 +}
20340 +
20341 +/* Lookups */
20342 +
20343 +typedef struct dentry *vx_instantiate_t(struct inode *, struct dentry *, int, void *);
20344 +
20345 +
20346 +/*
20347 + * Fill a directory entry.
20348 + *
20349 + * If possible create the dcache entry and derive our inode number and
20350 + * file type from dcache entry.
20351 + *
20352 + * Since all of the proc inode numbers are dynamically generated, the inode
20353 + * numbers do not exist until the inode is cache.  This means creating the
20354 + * the dcache entry in iterate is necessary to keep the inode numbers
20355 + * reported by iterate in sync with the inode numbers reported
20356 + * by stat.
20357 + */
20358 +static int vx_proc_fill_cache(struct file *filp, struct dir_context *ctx,
20359 +       char *name, int len, vx_instantiate_t instantiate, int id, void *ptr)
20360 +{
20361 +       struct dentry *child, *dir = filp->f_path.dentry;
20362 +       struct inode *inode;
20363 +       struct qstr qname;
20364 +       ino_t ino = 0;
20365 +       unsigned type = DT_UNKNOWN;
20366 +
20367 +       qname.name = name;
20368 +       qname.len  = len;
20369 +       qname.hash = full_name_hash(NULL, name, len);
20370 +
20371 +       child = d_lookup(dir, &qname);
20372 +       if (!child) {
20373 +               struct dentry *new;
20374 +               new = d_alloc(dir, &qname);
20375 +               if (new) {
20376 +                       child = instantiate(dir->d_inode, new, id, ptr);
20377 +                       if (child)
20378 +                               dput(new);
20379 +                       else
20380 +                               child = new;
20381 +               }
20382 +       }
20383 +       if (!child || IS_ERR(child) || !child->d_inode)
20384 +               goto end_instantiate;
20385 +       inode = child->d_inode;
20386 +       if (inode) {
20387 +               ino = inode->i_ino;
20388 +               type = inode->i_mode >> 12;
20389 +       }
20390 +       dput(child);
20391 +end_instantiate:
20392 +       if (!ino)
20393 +               ino = 1;
20394 +       return !dir_emit(ctx, name, len, ino, type);
20395 +}
20396 +
20397 +
20398 +
20399 +/* get and revalidate vx_info/xid */
20400 +
20401 +static inline
20402 +struct vx_info *get_proc_vx_info(struct inode *inode)
20403 +{
20404 +       return lookup_vx_info(PROC_I(inode)->fd);
20405 +}
20406 +
20407 +static int proc_xid_revalidate(struct dentry *dentry, unsigned int flags)
20408 +{
20409 +       struct inode *inode = dentry->d_inode;
20410 +       vxid_t xid = PROC_I(inode)->fd;
20411 +
20412 +       if (flags & LOOKUP_RCU) /* FIXME: can be dropped? */
20413 +               return -ECHILD;
20414 +
20415 +       if (!xid || xid_is_hashed(xid))
20416 +               return 1;
20417 +       d_drop(dentry);
20418 +       return 0;
20419 +}
20420 +
20421 +
20422 +/* get and revalidate nx_info/nid */
20423 +
20424 +static int proc_nid_revalidate(struct dentry *dentry, unsigned int flags)
20425 +{
20426 +       struct inode *inode = dentry->d_inode;
20427 +       vnid_t nid = PROC_I(inode)->fd;
20428 +
20429 +       if (flags & LOOKUP_RCU) /* FIXME: can be dropped? */
20430 +               return -ECHILD;
20431 +
20432 +       if (!nid || nid_is_hashed(nid))
20433 +               return 1;
20434 +       d_drop(dentry);
20435 +       return 0;
20436 +}
20437 +
20438 +
20439 +
20440 +#define PROC_BLOCK_SIZE (PAGE_SIZE - 1024)
20441 +
20442 +static ssize_t proc_vs_info_read(struct file *file, char __user *buf,
20443 +                         size_t count, loff_t *ppos)
20444 +{
20445 +       struct inode *inode = file->f_path.dentry->d_inode;
20446 +       unsigned long page;
20447 +       ssize_t length = 0;
20448 +
20449 +       if (count > PROC_BLOCK_SIZE)
20450 +               count = PROC_BLOCK_SIZE;
20451 +
20452 +       /* fade that out as soon as stable */
20453 +       WARN_ON(PROC_I(inode)->fd);
20454 +
20455 +       if (!(page = __get_free_page(GFP_KERNEL)))
20456 +               return -ENOMEM;
20457 +
20458 +       BUG_ON(!PROC_I(inode)->op.proc_vs_read);
20459 +       length = PROC_I(inode)->op.proc_vs_read((char *)page);
20460 +
20461 +       if (length >= 0)
20462 +               length = simple_read_from_buffer(buf, count, ppos,
20463 +                       (char *)page, length);
20464 +
20465 +       free_page(page);
20466 +       return length;
20467 +}
20468 +
20469 +static ssize_t proc_vx_info_read(struct file *file, char __user *buf,
20470 +                         size_t count, loff_t *ppos)
20471 +{
20472 +       struct inode *inode = file->f_path.dentry->d_inode;
20473 +       struct vx_info *vxi = NULL;
20474 +       vxid_t xid = PROC_I(inode)->fd;
20475 +       unsigned long page;
20476 +       ssize_t length = 0;
20477 +
20478 +       if (count > PROC_BLOCK_SIZE)
20479 +               count = PROC_BLOCK_SIZE;
20480 +
20481 +       /* fade that out as soon as stable */
20482 +       WARN_ON(!xid);
20483 +       vxi = lookup_vx_info(xid);
20484 +       if (!vxi)
20485 +               goto out;
20486 +
20487 +       length = -ENOMEM;
20488 +       if (!(page = __get_free_page(GFP_KERNEL)))
20489 +               goto out_put;
20490 +
20491 +       BUG_ON(!PROC_I(inode)->op.proc_vxi_read);
20492 +       length = PROC_I(inode)->op.proc_vxi_read(vxi, (char *)page);
20493 +
20494 +       if (length >= 0)
20495 +               length = simple_read_from_buffer(buf, count, ppos,
20496 +                       (char *)page, length);
20497 +
20498 +       free_page(page);
20499 +out_put:
20500 +       put_vx_info(vxi);
20501 +out:
20502 +       return length;
20503 +}
20504 +
20505 +static ssize_t proc_nx_info_read(struct file *file, char __user *buf,
20506 +                         size_t count, loff_t *ppos)
20507 +{
20508 +       struct inode *inode = file->f_path.dentry->d_inode;
20509 +       struct nx_info *nxi = NULL;
20510 +       vnid_t nid = PROC_I(inode)->fd;
20511 +       unsigned long page;
20512 +       ssize_t length = 0;
20513 +
20514 +       if (count > PROC_BLOCK_SIZE)
20515 +               count = PROC_BLOCK_SIZE;
20516 +
20517 +       /* fade that out as soon as stable */
20518 +       WARN_ON(!nid);
20519 +       nxi = lookup_nx_info(nid);
20520 +       if (!nxi)
20521 +               goto out;
20522 +
20523 +       length = -ENOMEM;
20524 +       if (!(page = __get_free_page(GFP_KERNEL)))
20525 +               goto out_put;
20526 +
20527 +       BUG_ON(!PROC_I(inode)->op.proc_nxi_read);
20528 +       length = PROC_I(inode)->op.proc_nxi_read(nxi, (char *)page);
20529 +
20530 +       if (length >= 0)
20531 +               length = simple_read_from_buffer(buf, count, ppos,
20532 +                       (char *)page, length);
20533 +
20534 +       free_page(page);
20535 +out_put:
20536 +       put_nx_info(nxi);
20537 +out:
20538 +       return length;
20539 +}
20540 +
20541 +
20542 +
20543 +/* here comes the lower level */
20544 +
20545 +
20546 +#define NOD(NAME, MODE, IOP, FOP, OP) {        \
20547 +       .len  = sizeof(NAME) - 1,       \
20548 +       .name = (NAME),                 \
20549 +       .mode = MODE,                   \
20550 +       .iop  = IOP,                    \
20551 +       .fop  = FOP,                    \
20552 +       .op   = OP,                     \
20553 +}
20554 +
20555 +
20556 +#define DIR(NAME, MODE, OTYPE)                         \
20557 +       NOD(NAME, (S_IFDIR | (MODE)),                   \
20558 +               &proc_ ## OTYPE ## _inode_operations,   \
20559 +               &proc_ ## OTYPE ## _file_operations, { } )
20560 +
20561 +#define INF(NAME, MODE, OTYPE)                         \
20562 +       NOD(NAME, (S_IFREG | (MODE)), NULL,             \
20563 +               &proc_vs_info_file_operations,          \
20564 +               { .proc_vs_read = &proc_##OTYPE } )
20565 +
20566 +#define VINF(NAME, MODE, OTYPE)                                \
20567 +       NOD(NAME, (S_IFREG | (MODE)), NULL,             \
20568 +               &proc_vx_info_file_operations,          \
20569 +               { .proc_vxi_read = &proc_##OTYPE } )
20570 +
20571 +#define NINF(NAME, MODE, OTYPE)                                \
20572 +       NOD(NAME, (S_IFREG | (MODE)), NULL,             \
20573 +               &proc_nx_info_file_operations,          \
20574 +               { .proc_nxi_read = &proc_##OTYPE } )
20575 +
20576 +
20577 +static struct file_operations proc_vs_info_file_operations = {
20578 +       .read =         proc_vs_info_read,
20579 +};
20580 +
20581 +static struct file_operations proc_vx_info_file_operations = {
20582 +       .read =         proc_vx_info_read,
20583 +};
20584 +
20585 +static struct dentry_operations proc_xid_dentry_operations = {
20586 +       .d_revalidate = proc_xid_revalidate,
20587 +};
20588 +
20589 +static struct vs_entry vx_base_stuff[] = {
20590 +       VINF("info",    S_IRUGO, vxi_info),
20591 +       VINF("status",  S_IRUGO, vxi_status),
20592 +       VINF("limit",   S_IRUGO, vxi_limit),
20593 +       VINF("sched",   S_IRUGO, vxi_sched),
20594 +       VINF("nsproxy", S_IRUGO, vxi_nsproxy0),
20595 +       VINF("nsproxy1",S_IRUGO, vxi_nsproxy1),
20596 +       VINF("cvirt",   S_IRUGO, vxi_cvirt),
20597 +       VINF("cacct",   S_IRUGO, vxi_cacct),
20598 +       {}
20599 +};
20600 +
20601 +
20602 +
20603 +
20604 +static struct dentry *proc_xid_instantiate(struct inode *dir,
20605 +       struct dentry *dentry, int id, void *ptr)
20606 +{
20607 +       dentry->d_op = &proc_xid_dentry_operations;
20608 +       return vs_proc_instantiate(dir, dentry, id, ptr);
20609 +}
20610 +
20611 +static struct dentry *proc_xid_lookup(struct inode *dir,
20612 +       struct dentry *dentry, unsigned int flags)
20613 +{
20614 +       struct vs_entry *p = vx_base_stuff;
20615 +       struct dentry *error = ERR_PTR(-ENOENT);
20616 +
20617 +       for (; p->name; p++) {
20618 +               if (p->len != dentry->d_name.len)
20619 +                       continue;
20620 +               if (!memcmp(dentry->d_name.name, p->name, p->len))
20621 +                       break;
20622 +       }
20623 +       if (!p->name)
20624 +               goto out;
20625 +
20626 +       error = proc_xid_instantiate(dir, dentry, PROC_I(dir)->fd, p);
20627 +out:
20628 +       return error;
20629 +}
20630 +
20631 +static int proc_xid_iterate(struct file *filp, struct dir_context *ctx)
20632 +{
20633 +       struct dentry *dentry = filp->f_path.dentry;
20634 +       struct inode *inode = dentry->d_inode;
20635 +       struct vs_entry *p = vx_base_stuff;
20636 +       int size = sizeof(vx_base_stuff) / sizeof(struct vs_entry);
20637 +       int index;
20638 +
20639 +       if (!dir_emit_dots(filp, ctx))
20640 +               return 0;
20641 +
20642 +       index = ctx->pos - 2;
20643 +       if (index < size) {
20644 +               for (p += index; p->name; p++) {
20645 +                       if (vx_proc_fill_cache(filp, ctx, p->name, p->len,
20646 +                               vs_proc_instantiate, PROC_I(inode)->fd, p))
20647 +                               return 0;
20648 +                       ctx->pos++;
20649 +               }
20650 +       }
20651 +       return 1;
20652 +}
20653 +
20654 +
20655 +
20656 +static struct file_operations proc_nx_info_file_operations = {
20657 +       .read =         proc_nx_info_read,
20658 +};
20659 +
20660 +static struct dentry_operations proc_nid_dentry_operations = {
20661 +       .d_revalidate = proc_nid_revalidate,
20662 +};
20663 +
20664 +static struct vs_entry nx_base_stuff[] = {
20665 +       NINF("info",    S_IRUGO, nxi_info),
20666 +       NINF("status",  S_IRUGO, nxi_status),
20667 +       {}
20668 +};
20669 +
20670 +
20671 +static struct dentry *proc_nid_instantiate(struct inode *dir,
20672 +       struct dentry *dentry, int id, void *ptr)
20673 +{
20674 +       dentry->d_op = &proc_nid_dentry_operations;
20675 +       return vs_proc_instantiate(dir, dentry, id, ptr);
20676 +}
20677 +
20678 +static struct dentry *proc_nid_lookup(struct inode *dir,
20679 +       struct dentry *dentry, unsigned int flags)
20680 +{
20681 +       struct vs_entry *p = nx_base_stuff;
20682 +       struct dentry *error = ERR_PTR(-ENOENT);
20683 +
20684 +       for (; p->name; p++) {
20685 +               if (p->len != dentry->d_name.len)
20686 +                       continue;
20687 +               if (!memcmp(dentry->d_name.name, p->name, p->len))
20688 +                       break;
20689 +       }
20690 +       if (!p->name)
20691 +               goto out;
20692 +
20693 +       error = proc_nid_instantiate(dir, dentry, PROC_I(dir)->fd, p);
20694 +out:
20695 +       return error;
20696 +}
20697 +
20698 +static int proc_nid_iterate(struct file *filp, struct dir_context *ctx)
20699 +{
20700 +       struct dentry *dentry = filp->f_path.dentry;
20701 +       struct inode *inode = dentry->d_inode;
20702 +       struct vs_entry *p = nx_base_stuff;
20703 +       int size = sizeof(nx_base_stuff) / sizeof(struct vs_entry);
20704 +       int index;
20705 +
20706 +       if (!dir_emit_dots(filp, ctx))
20707 +               return 0;
20708 +
20709 +       index = ctx->pos - 2;
20710 +       if (index < size) {
20711 +               for (p += index; p->name; p++) {
20712 +                       if (vx_proc_fill_cache(filp, ctx, p->name, p->len,
20713 +                               vs_proc_instantiate, PROC_I(inode)->fd, p))
20714 +                               return 0;
20715 +                       ctx->pos++;
20716 +               }
20717 +       }
20718 +       return 1;
20719 +}
20720 +
20721 +
20722 +#define MAX_MULBY10    ((~0U - 9) / 10)
20723 +
20724 +static inline int atovid(const char *str, int len)
20725 +{
20726 +       int vid, c;
20727 +
20728 +       vid = 0;
20729 +       while (len-- > 0) {
20730 +               c = *str - '0';
20731 +               str++;
20732 +               if (c > 9)
20733 +                       return -1;
20734 +               if (vid >= MAX_MULBY10)
20735 +                       return -1;
20736 +               vid *= 10;
20737 +               vid += c;
20738 +               if (!vid)
20739 +                       return -1;
20740 +       }
20741 +       return vid;
20742 +}
20743 +
20744 +/* now the upper level (virtual) */
20745 +
20746 +
20747 +static struct file_operations proc_xid_file_operations = {
20748 +       .read =         generic_read_dir,
20749 +       .iterate =      proc_xid_iterate,
20750 +};
20751 +
20752 +static struct inode_operations proc_xid_inode_operations = {
20753 +       .lookup =       proc_xid_lookup,
20754 +};
20755 +
20756 +static struct vs_entry vx_virtual_stuff[] = {
20757 +       INF("info",     S_IRUGO, virtual_info),
20758 +       INF("status",   S_IRUGO, virtual_status),
20759 +       DIR(NULL,       S_IRUGO | S_IXUGO, xid),
20760 +};
20761 +
20762 +
20763 +static struct dentry *proc_virtual_lookup(struct inode *dir,
20764 +       struct dentry *dentry, unsigned int flags)
20765 +{
20766 +       struct vs_entry *p = vx_virtual_stuff;
20767 +       struct dentry *error = ERR_PTR(-ENOENT);
20768 +       int id = 0;
20769 +
20770 +       for (; p->name; p++) {
20771 +               if (p->len != dentry->d_name.len)
20772 +                       continue;
20773 +               if (!memcmp(dentry->d_name.name, p->name, p->len))
20774 +                       break;
20775 +       }
20776 +       if (p->name)
20777 +               goto instantiate;
20778 +
20779 +       id = atovid(dentry->d_name.name, dentry->d_name.len);
20780 +       if ((id < 0) || !xid_is_hashed(id))
20781 +               goto out;
20782 +
20783 +instantiate:
20784 +       error = proc_xid_instantiate(dir, dentry, id, p);
20785 +out:
20786 +       return error;
20787 +}
20788 +
20789 +static struct file_operations proc_nid_file_operations = {
20790 +       .read =         generic_read_dir,
20791 +       .iterate =      proc_nid_iterate,
20792 +};
20793 +
20794 +static struct inode_operations proc_nid_inode_operations = {
20795 +       .lookup =       proc_nid_lookup,
20796 +};
20797 +
20798 +static struct vs_entry nx_virtnet_stuff[] = {
20799 +       INF("info",     S_IRUGO, virtnet_info),
20800 +       INF("status",   S_IRUGO, virtnet_status),
20801 +       DIR(NULL,       S_IRUGO | S_IXUGO, nid),
20802 +};
20803 +
20804 +
20805 +static struct dentry *proc_virtnet_lookup(struct inode *dir,
20806 +       struct dentry *dentry, unsigned int flags)
20807 +{
20808 +       struct vs_entry *p = nx_virtnet_stuff;
20809 +       struct dentry *error = ERR_PTR(-ENOENT);
20810 +       int id = 0;
20811 +
20812 +       for (; p->name; p++) {
20813 +               if (p->len != dentry->d_name.len)
20814 +                       continue;
20815 +               if (!memcmp(dentry->d_name.name, p->name, p->len))
20816 +                       break;
20817 +       }
20818 +       if (p->name)
20819 +               goto instantiate;
20820 +
20821 +       id = atovid(dentry->d_name.name, dentry->d_name.len);
20822 +       if ((id < 0) || !nid_is_hashed(id))
20823 +               goto out;
20824 +
20825 +instantiate:
20826 +       error = proc_nid_instantiate(dir, dentry, id, p);
20827 +out:
20828 +       return error;
20829 +}
20830 +
20831 +
20832 +#define PROC_MAXVIDS 32
20833 +
20834 +int proc_virtual_iterate(struct file *filp, struct dir_context *ctx)
20835 +{
20836 +       struct vs_entry *p = vx_virtual_stuff;
20837 +       int size = sizeof(vx_virtual_stuff) / sizeof(struct vs_entry);
20838 +       int index;
20839 +       unsigned int xid_array[PROC_MAXVIDS];
20840 +       char buf[PROC_NUMBUF];
20841 +       unsigned int nr_xids, i;
20842 +
20843 +       if (!dir_emit_dots(filp, ctx))
20844 +               return 0;
20845 +
20846 +       index = ctx->pos - 2;
20847 +       if (index < size) {
20848 +               for (p += index; p->name; p++) {
20849 +                       if (vx_proc_fill_cache(filp, ctx, p->name, p->len,
20850 +                               vs_proc_instantiate, 0, p))
20851 +                               return 0;
20852 +                       ctx->pos++;
20853 +               }
20854 +       }
20855 +
20856 +       index = ctx->pos - size;
20857 +       p = &vx_virtual_stuff[size - 1];
20858 +       nr_xids = get_xid_list(index, xid_array, PROC_MAXVIDS);
20859 +       for (i = 0; i < nr_xids; i++) {
20860 +               int n, xid = xid_array[i];
20861 +               unsigned int j = PROC_NUMBUF;
20862 +
20863 +               n = xid;
20864 +               do
20865 +                       buf[--j] = '0' + (n % 10);
20866 +               while (n /= 10);
20867 +
20868 +               if (vx_proc_fill_cache(filp, ctx,
20869 +                       buf + j, PROC_NUMBUF - j,
20870 +                       vs_proc_instantiate, xid, p))
20871 +                       return 0;
20872 +               ctx->pos++;
20873 +       }
20874 +       return 0;
20875 +}
20876 +
20877 +static int proc_virtual_getattr(struct vfsmount *mnt,
20878 +       struct dentry *dentry, struct kstat *stat)
20879 +{
20880 +       struct inode *inode = dentry->d_inode;
20881 +
20882 +       generic_fillattr(inode, stat);
20883 +       stat->nlink = 2 + atomic_read(&vx_global_cactive);
20884 +       return 0;
20885 +}
20886 +
20887 +static struct file_operations proc_virtual_dir_operations = {
20888 +       .read =         generic_read_dir,
20889 +       .iterate =      proc_virtual_iterate,
20890 +};
20891 +
20892 +static struct inode_operations proc_virtual_dir_inode_operations = {
20893 +       .getattr =      proc_virtual_getattr,
20894 +       .lookup =       proc_virtual_lookup,
20895 +};
20896 +
20897 +
20898 +
20899 +int proc_virtnet_iterate(struct file *filp, struct dir_context *ctx)
20900 +{
20901 +       struct vs_entry *p = nx_virtnet_stuff;
20902 +       int size = sizeof(nx_virtnet_stuff) / sizeof(struct vs_entry);
20903 +       int index;
20904 +       unsigned int nid_array[PROC_MAXVIDS];
20905 +       char buf[PROC_NUMBUF];
20906 +       unsigned int nr_nids, i;
20907 +
20908 +       if (!dir_emit_dots(filp, ctx))
20909 +               return 0;
20910 +
20911 +       index = ctx->pos - 2;
20912 +       if (index < size) {
20913 +               for (p += index; p->name; p++) {
20914 +                       if (vx_proc_fill_cache(filp, ctx, p->name, p->len,
20915 +                               vs_proc_instantiate, 0, p))
20916 +                               return 0;
20917 +                       ctx->pos++;
20918 +               }
20919 +       }
20920 +
20921 +       index = ctx->pos - size;
20922 +       p = &nx_virtnet_stuff[size - 1];
20923 +       nr_nids = get_nid_list(index, nid_array, PROC_MAXVIDS);
20924 +       for (i = 0; i < nr_nids; i++) {
20925 +               int n, nid = nid_array[i];
20926 +               unsigned int j = PROC_NUMBUF;
20927 +
20928 +               n = nid;
20929 +               do
20930 +                       buf[--j] = '0' + (n % 10);
20931 +               while (n /= 10);
20932 +
20933 +               if (vx_proc_fill_cache(filp, ctx,
20934 +                       buf + j, PROC_NUMBUF - j,
20935 +                       vs_proc_instantiate, nid, p))
20936 +                       return 0;
20937 +               ctx->pos++;
20938 +       }
20939 +       return 0;
20940 +}
20941 +
20942 +static int proc_virtnet_getattr(struct vfsmount *mnt,
20943 +       struct dentry *dentry, struct kstat *stat)
20944 +{
20945 +       struct inode *inode = dentry->d_inode;
20946 +
20947 +       generic_fillattr(inode, stat);
20948 +       stat->nlink = 2 + atomic_read(&nx_global_cactive);
20949 +       return 0;
20950 +}
20951 +
20952 +static struct file_operations proc_virtnet_dir_operations = {
20953 +       .read =         generic_read_dir,
20954 +       .iterate =      proc_virtnet_iterate,
20955 +};
20956 +
20957 +static struct inode_operations proc_virtnet_dir_inode_operations = {
20958 +       .getattr =      proc_virtnet_getattr,
20959 +       .lookup =       proc_virtnet_lookup,
20960 +};
20961 +
20962 +
20963 +
20964 +void proc_vx_init(void)
20965 +{
20966 +       struct proc_dir_entry *ent;
20967 +
20968 +       ent = proc_mkdir("virtual", 0);
20969 +       if (ent) {
20970 +               ent->proc_fops = &proc_virtual_dir_operations;
20971 +               ent->proc_iops = &proc_virtual_dir_inode_operations;
20972 +       }
20973 +       proc_virtual = ent;
20974 +
20975 +       ent = proc_mkdir("virtnet", 0);
20976 +       if (ent) {
20977 +               ent->proc_fops = &proc_virtnet_dir_operations;
20978 +               ent->proc_iops = &proc_virtnet_dir_inode_operations;
20979 +       }
20980 +       proc_virtnet = ent;
20981 +}
20982 +
20983 +
20984 +
20985 +
20986 +/* per pid info */
20987 +
20988 +void render_cap_t(struct seq_file *, const char *,
20989 +       struct vx_info *, kernel_cap_t *);
20990 +
20991 +
20992 +int proc_pid_vx_info(
20993 +       struct seq_file *m,
20994 +       struct pid_namespace *ns,
20995 +       struct pid *pid,
20996 +       struct task_struct *p)
20997 +{
20998 +       struct vx_info *vxi;
20999 +
21000 +       seq_printf(m, "XID:\t%d\n", vx_task_xid(p));
21001 +
21002 +       vxi = task_get_vx_info(p);
21003 +       if (!vxi)
21004 +               return 0;
21005 +
21006 +       render_cap_t(m, "BCaps:\t", vxi, &vxi->vx_bcaps);
21007 +       seq_printf(m, "CCaps:\t%016llx\n",
21008 +               (unsigned long long)vxi->vx_ccaps);
21009 +       seq_printf(m, "CFlags:\t%016llx\n",
21010 +               (unsigned long long)vxi->vx_flags);
21011 +       seq_printf(m, "CIPid:\t%d\n", vxi->vx_initpid);
21012 +
21013 +       put_vx_info(vxi);
21014 +       return 0;
21015 +}
21016 +
21017 +
21018 +int proc_pid_nx_info(
21019 +       struct seq_file *m,
21020 +       struct pid_namespace *ns,
21021 +       struct pid *pid,
21022 +       struct task_struct *p)
21023 +{
21024 +       struct nx_info *nxi;
21025 +       struct nx_addr_v4 *v4a;
21026 +#ifdef CONFIG_IPV6
21027 +       struct nx_addr_v6 *v6a;
21028 +#endif
21029 +       int i;
21030 +
21031 +       seq_printf(m, "NID:\t%d\n", nx_task_nid(p));
21032 +
21033 +       nxi = task_get_nx_info(p);
21034 +       if (!nxi)
21035 +               return 0;
21036 +
21037 +       seq_printf(m, "NCaps:\t%016llx\n",
21038 +               (unsigned long long)nxi->nx_ncaps);
21039 +       seq_printf(m, "NFlags:\t%016llx\n",
21040 +               (unsigned long long)nxi->nx_flags);
21041 +
21042 +       seq_printf(m, "V4Root[bcast]:\t" NIPQUAD_FMT "\n",
21043 +               NIPQUAD(nxi->v4_bcast.s_addr));
21044 +       seq_printf(m, "V4Root[lback]:\t" NIPQUAD_FMT "\n",
21045 +               NIPQUAD(nxi->v4_lback.s_addr));
21046 +       if (!NX_IPV4(nxi))
21047 +               goto skip_v4;
21048 +       for (i = 0, v4a = &nxi->v4; v4a; i++, v4a = v4a->next)
21049 +               seq_printf(m, "V4Root[%d]:\t" NXAV4_FMT "\n",
21050 +                       i, NXAV4(v4a));
21051 +skip_v4:
21052 +#ifdef CONFIG_IPV6
21053 +       if (!NX_IPV6(nxi))
21054 +               goto skip_v6;
21055 +       for (i = 0, v6a = &nxi->v6; v6a; i++, v6a = v6a->next)
21056 +               seq_printf(m, "V6Root[%d]:\t" NXAV6_FMT "\n",
21057 +                       i, NXAV6(v6a));
21058 +skip_v6:
21059 +#endif
21060 +       put_nx_info(nxi);
21061 +       return 0;
21062 +}
21063 +
21064 diff -NurpP --minimal linux-4.9.135/kernel/vserver/sched.c linux-4.9.135-vs2.3.9.8/kernel/vserver/sched.c
21065 --- linux-4.9.135/kernel/vserver/sched.c        1970-01-01 00:00:00.000000000 +0000
21066 +++ linux-4.9.135-vs2.3.9.8/kernel/vserver/sched.c      2018-10-20 04:58:15.000000000 +0000
21067 @@ -0,0 +1,83 @@
21068 +/*
21069 + *  linux/kernel/vserver/sched.c
21070 + *
21071 + *  Virtual Server: Scheduler Support
21072 + *
21073 + *  Copyright (C) 2004-2010  Herbert P?tzl
21074 + *
21075 + *  V0.01  adapted Sam Vilains version to 2.6.3
21076 + *  V0.02  removed legacy interface
21077 + *  V0.03  changed vcmds to vxi arg
21078 + *  V0.04  removed older and legacy interfaces
21079 + *  V0.05  removed scheduler code/commands
21080 + *
21081 + */
21082 +
21083 +#include <linux/vs_context.h>
21084 +#include <linux/vs_sched.h>
21085 +#include <linux/cpumask.h>
21086 +#include <linux/vserver/sched_cmd.h>
21087 +
21088 +#include <asm/uaccess.h>
21089 +
21090 +
21091 +void vx_update_sched_param(struct _vx_sched *sched,
21092 +       struct _vx_sched_pc *sched_pc)
21093 +{
21094 +       sched_pc->prio_bias = sched->prio_bias;
21095 +}
21096 +
21097 +static int do_set_prio_bias(struct vx_info *vxi, struct vcmd_prio_bias *data)
21098 +{
21099 +       int cpu;
21100 +
21101 +       if (data->prio_bias > MAX_PRIO_BIAS)
21102 +               data->prio_bias = MAX_PRIO_BIAS;
21103 +       if (data->prio_bias < MIN_PRIO_BIAS)
21104 +               data->prio_bias = MIN_PRIO_BIAS;
21105 +
21106 +       if (data->cpu_id != ~0) {
21107 +               vxi->sched.update = *get_cpu_mask(data->cpu_id);
21108 +               cpumask_and(&vxi->sched.update, &vxi->sched.update,
21109 +                       cpu_online_mask);
21110 +       } else
21111 +               cpumask_copy(&vxi->sched.update, cpu_online_mask);
21112 +
21113 +       for ((cpu) = 0; (cpu) < 1; (cpu)++, (void)vxi->sched.update)
21114 +               vx_update_sched_param(&vxi->sched,
21115 +                       &vx_per_cpu(vxi, sched_pc, cpu));
21116 +       return 0;
21117 +}
21118 +
21119 +int vc_set_prio_bias(struct vx_info *vxi, void __user *data)
21120 +{
21121 +       struct vcmd_prio_bias vc_data;
21122 +
21123 +       if (copy_from_user(&vc_data, data, sizeof(vc_data)))
21124 +               return -EFAULT;
21125 +
21126 +       return do_set_prio_bias(vxi, &vc_data);
21127 +}
21128 +
21129 +int vc_get_prio_bias(struct vx_info *vxi, void __user *data)
21130 +{
21131 +       struct vcmd_prio_bias vc_data;
21132 +       struct _vx_sched_pc *pcd;
21133 +       int cpu;
21134 +
21135 +       if (copy_from_user(&vc_data, data, sizeof(vc_data)))
21136 +               return -EFAULT;
21137 +
21138 +       cpu = vc_data.cpu_id;
21139 +
21140 +       if (!cpu_possible(cpu))
21141 +               return -EINVAL;
21142 +
21143 +       pcd = &vx_per_cpu(vxi, sched_pc, cpu);
21144 +       vc_data.prio_bias = pcd->prio_bias;
21145 +
21146 +       if (copy_to_user(data, &vc_data, sizeof(vc_data)))
21147 +               return -EFAULT;
21148 +       return 0;
21149 +}
21150 +
21151 diff -NurpP --minimal linux-4.9.135/kernel/vserver/sched_init.h linux-4.9.135-vs2.3.9.8/kernel/vserver/sched_init.h
21152 --- linux-4.9.135/kernel/vserver/sched_init.h   1970-01-01 00:00:00.000000000 +0000
21153 +++ linux-4.9.135-vs2.3.9.8/kernel/vserver/sched_init.h 2018-10-20 04:58:15.000000000 +0000
21154 @@ -0,0 +1,27 @@
21155 +
21156 +static inline void vx_info_init_sched(struct _vx_sched *sched)
21157 +{
21158 +       /* scheduling; hard code starting values as constants */
21159 +       sched->prio_bias = 0;
21160 +}
21161 +
21162 +static inline
21163 +void vx_info_init_sched_pc(struct _vx_sched_pc *sched_pc, int cpu)
21164 +{
21165 +       sched_pc->prio_bias = 0;
21166 +
21167 +       sched_pc->user_ticks = 0;
21168 +       sched_pc->sys_ticks = 0;
21169 +       sched_pc->hold_ticks = 0;
21170 +}
21171 +
21172 +static inline void vx_info_exit_sched(struct _vx_sched *sched)
21173 +{
21174 +       return;
21175 +}
21176 +
21177 +static inline
21178 +void vx_info_exit_sched_pc(struct _vx_sched_pc *sched_pc, int cpu)
21179 +{
21180 +       return;
21181 +}
21182 diff -NurpP --minimal linux-4.9.135/kernel/vserver/sched_proc.h linux-4.9.135-vs2.3.9.8/kernel/vserver/sched_proc.h
21183 --- linux-4.9.135/kernel/vserver/sched_proc.h   1970-01-01 00:00:00.000000000 +0000
21184 +++ linux-4.9.135-vs2.3.9.8/kernel/vserver/sched_proc.h 2018-10-20 04:58:15.000000000 +0000
21185 @@ -0,0 +1,32 @@
21186 +#ifndef _VX_SCHED_PROC_H
21187 +#define _VX_SCHED_PROC_H
21188 +
21189 +
21190 +static inline
21191 +int vx_info_proc_sched(struct _vx_sched *sched, char *buffer)
21192 +{
21193 +       int length = 0;
21194 +
21195 +       length += sprintf(buffer,
21196 +               "PrioBias:\t%8d\n",
21197 +               sched->prio_bias);
21198 +       return length;
21199 +}
21200 +
21201 +static inline
21202 +int vx_info_proc_sched_pc(struct _vx_sched_pc *sched_pc,
21203 +       char *buffer, int cpu)
21204 +{
21205 +       int length = 0;
21206 +
21207 +       length += sprintf(buffer + length,
21208 +               "cpu %d: %lld %lld %lld", cpu,
21209 +               (unsigned long long)sched_pc->user_ticks,
21210 +               (unsigned long long)sched_pc->sys_ticks,
21211 +               (unsigned long long)sched_pc->hold_ticks);
21212 +       length += sprintf(buffer + length,
21213 +               " %d\n", sched_pc->prio_bias);
21214 +       return length;
21215 +}
21216 +
21217 +#endif /* _VX_SCHED_PROC_H */
21218 diff -NurpP --minimal linux-4.9.135/kernel/vserver/signal.c linux-4.9.135-vs2.3.9.8/kernel/vserver/signal.c
21219 --- linux-4.9.135/kernel/vserver/signal.c       1970-01-01 00:00:00.000000000 +0000
21220 +++ linux-4.9.135-vs2.3.9.8/kernel/vserver/signal.c     2018-10-20 04:58:15.000000000 +0000
21221 @@ -0,0 +1,134 @@
21222 +/*
21223 + *  linux/kernel/vserver/signal.c
21224 + *
21225 + *  Virtual Server: Signal Support
21226 + *
21227 + *  Copyright (C) 2003-2007  Herbert P?tzl
21228 + *
21229 + *  V0.01  broken out from vcontext V0.05
21230 + *  V0.02  changed vcmds to vxi arg
21231 + *  V0.03  adjusted siginfo for kill
21232 + *
21233 + */
21234 +
21235 +#include <asm/uaccess.h>
21236 +
21237 +#include <linux/vs_context.h>
21238 +#include <linux/vs_pid.h>
21239 +#include <linux/vserver/signal_cmd.h>
21240 +
21241 +
21242 +int vx_info_kill(struct vx_info *vxi, int pid, int sig)
21243 +{
21244 +       int retval, count = 0;
21245 +       struct task_struct *p;
21246 +       struct siginfo *sip = SEND_SIG_PRIV;
21247 +
21248 +       retval = -ESRCH;
21249 +       vxdprintk(VXD_CBIT(misc, 4),
21250 +               "vx_info_kill(%p[#%d],%d,%d)*",
21251 +               vxi, vxi->vx_id, pid, sig);
21252 +       read_lock(&tasklist_lock);
21253 +       switch (pid) {
21254 +       case  0:
21255 +       case -1:
21256 +               for_each_process(p) {
21257 +                       int err = 0;
21258 +
21259 +                       if (vx_task_xid(p) != vxi->vx_id || p->pid <= 1 ||
21260 +                               (pid && vxi->vx_initpid == p->pid))
21261 +                               continue;
21262 +
21263 +                       err = group_send_sig_info(sig, sip, p);
21264 +                       ++count;
21265 +                       if (err != -EPERM)
21266 +                               retval = err;
21267 +               }
21268 +               break;
21269 +
21270 +       case 1:
21271 +               if (vxi->vx_initpid) {
21272 +                       pid = vxi->vx_initpid;
21273 +                       /* for now, only SIGINT to private init ... */
21274 +                       if (!vx_info_flags(vxi, VXF_STATE_ADMIN, 0) &&
21275 +                               /* ... as long as there are tasks left */
21276 +                               (atomic_read(&vxi->vx_tasks) > 1))
21277 +                               sig = SIGINT;
21278 +               }
21279 +               /* fallthrough */
21280 +       default:
21281 +               rcu_read_lock();
21282 +               p = find_task_by_real_pid(pid);
21283 +               rcu_read_unlock();
21284 +               if (p) {
21285 +                       if (vx_task_xid(p) == vxi->vx_id)
21286 +                               retval = group_send_sig_info(sig, sip, p);
21287 +               }
21288 +               break;
21289 +       }
21290 +       read_unlock(&tasklist_lock);
21291 +       vxdprintk(VXD_CBIT(misc, 4),
21292 +               "vx_info_kill(%p[#%d],%d,%d,%ld) = %d",
21293 +               vxi, vxi->vx_id, pid, sig, (long)sip, retval);
21294 +       return retval;
21295 +}
21296 +
21297 +int vc_ctx_kill(struct vx_info *vxi, void __user *data)
21298 +{
21299 +       struct vcmd_ctx_kill_v0 vc_data;
21300 +
21301 +       if (copy_from_user(&vc_data, data, sizeof(vc_data)))
21302 +               return -EFAULT;
21303 +
21304 +       /* special check to allow guest shutdown */
21305 +       if (!vx_info_flags(vxi, VXF_STATE_ADMIN, 0) &&
21306 +               /* forbid killall pid=0 when init is present */
21307 +               (((vc_data.pid < 1) && vxi->vx_initpid) ||
21308 +               (vc_data.pid > 1)))
21309 +               return -EACCES;
21310 +
21311 +       return vx_info_kill(vxi, vc_data.pid, vc_data.sig);
21312 +}
21313 +
21314 +
21315 +static int __wait_exit(struct vx_info *vxi)
21316 +{
21317 +       DECLARE_WAITQUEUE(wait, current);
21318 +       int ret = 0;
21319 +
21320 +       add_wait_queue(&vxi->vx_wait, &wait);
21321 +       set_current_state(TASK_INTERRUPTIBLE);
21322 +
21323 +wait:
21324 +       if (vx_info_state(vxi,
21325 +               VXS_SHUTDOWN | VXS_HASHED | VXS_HELPER) == VXS_SHUTDOWN)
21326 +               goto out;
21327 +       if (signal_pending(current)) {
21328 +               ret = -ERESTARTSYS;
21329 +               goto out;
21330 +       }
21331 +       schedule();
21332 +       goto wait;
21333 +
21334 +out:
21335 +       set_current_state(TASK_RUNNING);
21336 +       remove_wait_queue(&vxi->vx_wait, &wait);
21337 +       return ret;
21338 +}
21339 +
21340 +
21341 +
21342 +int vc_wait_exit(struct vx_info *vxi, void __user *data)
21343 +{
21344 +       struct vcmd_wait_exit_v0 vc_data;
21345 +       int ret;
21346 +
21347 +       ret = __wait_exit(vxi);
21348 +       vc_data.reboot_cmd = vxi->reboot_cmd;
21349 +       vc_data.exit_code = vxi->exit_code;
21350 +
21351 +       if (copy_to_user(data, &vc_data, sizeof(vc_data)))
21352 +               ret = -EFAULT;
21353 +       return ret;
21354 +}
21355 +
21356 diff -NurpP --minimal linux-4.9.135/kernel/vserver/space.c linux-4.9.135-vs2.3.9.8/kernel/vserver/space.c
21357 --- linux-4.9.135/kernel/vserver/space.c        1970-01-01 00:00:00.000000000 +0000
21358 +++ linux-4.9.135-vs2.3.9.8/kernel/vserver/space.c      2018-10-20 04:58:15.000000000 +0000
21359 @@ -0,0 +1,437 @@
21360 +/*
21361 + *  linux/kernel/vserver/space.c
21362 + *
21363 + *  Virtual Server: Context Space Support
21364 + *
21365 + *  Copyright (C) 2003-2010  Herbert P?tzl
21366 + *
21367 + *  V0.01  broken out from context.c 0.07
21368 + *  V0.02  added task locking for namespace
21369 + *  V0.03  broken out vx_enter_namespace
21370 + *  V0.04  added *space support and commands
21371 + *  V0.05  added credential support
21372 + *
21373 + */
21374 +
21375 +#include <linux/utsname.h>
21376 +#include <linux/nsproxy.h>
21377 +#include <linux/err.h>
21378 +#include <linux/fs_struct.h>
21379 +#include <linux/cred.h>
21380 +#include <asm/uaccess.h>
21381 +
21382 +#include <linux/vs_context.h>
21383 +#include <linux/vserver/space.h>
21384 +#include <linux/vserver/space_cmd.h>
21385 +
21386 +atomic_t vs_global_nsproxy     = ATOMIC_INIT(0);
21387 +atomic_t vs_global_fs          = ATOMIC_INIT(0);
21388 +atomic_t vs_global_mnt_ns      = ATOMIC_INIT(0);
21389 +atomic_t vs_global_uts_ns      = ATOMIC_INIT(0);
21390 +atomic_t vs_global_ipc_ns      = ATOMIC_INIT(0);
21391 +atomic_t vs_global_user_ns     = ATOMIC_INIT(0);
21392 +atomic_t vs_global_pid_ns      = ATOMIC_INIT(0);
21393 +
21394 +
21395 +/* namespace functions */
21396 +
21397 +#include <linux/mnt_namespace.h>
21398 +#include <linux/user_namespace.h>
21399 +#include <linux/pid_namespace.h>
21400 +#include <linux/ipc_namespace.h>
21401 +#include <net/net_namespace.h>
21402 +#include "../fs/mount.h"
21403 +
21404 +
21405 +static const struct vcmd_space_mask_v1 space_mask_v0 = {
21406 +       .mask = CLONE_FS |
21407 +               CLONE_NEWNS |
21408 +#ifdef CONFIG_UTS_NS
21409 +               CLONE_NEWUTS |
21410 +#endif
21411 +#ifdef CONFIG_IPC_NS
21412 +               CLONE_NEWIPC |
21413 +#endif
21414 +#ifdef CONFIG_USER_NS
21415 +               CLONE_NEWUSER |
21416 +#endif
21417 +               0
21418 +};
21419 +
21420 +static const struct vcmd_space_mask_v1 space_mask = {
21421 +       .mask = CLONE_FS |
21422 +               CLONE_NEWNS |
21423 +#ifdef CONFIG_UTS_NS
21424 +               CLONE_NEWUTS |
21425 +#endif
21426 +#ifdef CONFIG_IPC_NS
21427 +               CLONE_NEWIPC |
21428 +#endif
21429 +#ifdef CONFIG_USER_NS
21430 +               CLONE_NEWUSER |
21431 +#endif
21432 +#ifdef CONFIG_PID_NS
21433 +               CLONE_NEWPID |
21434 +#endif
21435 +#ifdef CONFIG_NET_NS
21436 +               CLONE_NEWNET |
21437 +#endif
21438 +               0
21439 +};
21440 +
21441 +static const struct vcmd_space_mask_v1 default_space_mask = {
21442 +       .mask = CLONE_FS |
21443 +               CLONE_NEWNS |
21444 +#ifdef CONFIG_UTS_NS
21445 +               CLONE_NEWUTS |
21446 +#endif
21447 +#ifdef CONFIG_IPC_NS
21448 +               CLONE_NEWIPC |
21449 +#endif
21450 +#ifdef CONFIG_USER_NS
21451 +//             CLONE_NEWUSER |
21452 +#endif
21453 +#ifdef CONFIG_PID_NS
21454 +//             CLONE_NEWPID |
21455 +#endif
21456 +               0
21457 +};
21458 +
21459 +/*
21460 + *     build a new nsproxy mix
21461 + *      assumes that both proxies are 'const'
21462 + *     does not touch nsproxy refcounts
21463 + *     will hold a reference on the result.
21464 + */
21465 +
21466 +struct nsproxy *vs_mix_nsproxy(struct nsproxy *old_nsproxy,
21467 +       struct nsproxy *new_nsproxy, unsigned long mask)
21468 +{
21469 +       struct mnt_namespace *old_ns;
21470 +       struct uts_namespace *old_uts;
21471 +       struct ipc_namespace *old_ipc;
21472 +#ifdef CONFIG_PID_NS
21473 +       struct pid_namespace *old_pid;
21474 +#endif
21475 +#ifdef CONFIG_NET_NS
21476 +       struct net *old_net;
21477 +#endif
21478 +       struct nsproxy *nsproxy;
21479 +
21480 +       nsproxy = copy_nsproxy(old_nsproxy);
21481 +       if (!nsproxy)
21482 +               goto out;
21483 +
21484 +       if (mask & CLONE_NEWNS) {
21485 +               old_ns = nsproxy->mnt_ns;
21486 +               nsproxy->mnt_ns = new_nsproxy->mnt_ns;
21487 +               if (nsproxy->mnt_ns)
21488 +                       get_mnt_ns(nsproxy->mnt_ns);
21489 +       } else
21490 +               old_ns = NULL;
21491 +
21492 +       if (mask & CLONE_NEWUTS) {
21493 +               old_uts = nsproxy->uts_ns;
21494 +               nsproxy->uts_ns = new_nsproxy->uts_ns;
21495 +               if (nsproxy->uts_ns)
21496 +                       get_uts_ns(nsproxy->uts_ns);
21497 +       } else
21498 +               old_uts = NULL;
21499 +
21500 +       if (mask & CLONE_NEWIPC) {
21501 +               old_ipc = nsproxy->ipc_ns;
21502 +               nsproxy->ipc_ns = new_nsproxy->ipc_ns;
21503 +               if (nsproxy->ipc_ns)
21504 +                       get_ipc_ns(nsproxy->ipc_ns);
21505 +       } else
21506 +               old_ipc = NULL;
21507 +
21508 +#ifdef CONFIG_PID_NS
21509 +       if (mask & CLONE_NEWPID) {
21510 +               old_pid = nsproxy->pid_ns_for_children;
21511 +               nsproxy->pid_ns_for_children = new_nsproxy->pid_ns_for_children;
21512 +               if (nsproxy->pid_ns_for_children)
21513 +                       get_pid_ns(nsproxy->pid_ns_for_children);
21514 +       } else
21515 +               old_pid = NULL;
21516 +#endif
21517 +#ifdef CONFIG_NET_NS
21518 +       if (mask & CLONE_NEWNET) {
21519 +               old_net = nsproxy->net_ns;
21520 +               nsproxy->net_ns = new_nsproxy->net_ns;
21521 +               if (nsproxy->net_ns)
21522 +                       get_net(nsproxy->net_ns);
21523 +       } else
21524 +               old_net = NULL;
21525 +#endif
21526 +       if (old_ns)
21527 +               put_mnt_ns(old_ns);
21528 +       if (old_uts)
21529 +               put_uts_ns(old_uts);
21530 +       if (old_ipc)
21531 +               put_ipc_ns(old_ipc);
21532 +#ifdef CONFIG_PID_NS
21533 +       if (old_pid)
21534 +               put_pid_ns(old_pid);
21535 +#endif
21536 +#ifdef CONFIG_NET_NS
21537 +       if (old_net)
21538 +               put_net(old_net);
21539 +#endif
21540 +out:
21541 +       return nsproxy;
21542 +}
21543 +
21544 +
21545 +/*
21546 + *     merge two nsproxy structs into a new one.
21547 + *     will hold a reference on the result.
21548 + */
21549 +
21550 +static inline
21551 +struct nsproxy *__vs_merge_nsproxy(struct nsproxy *old,
21552 +       struct nsproxy *proxy, unsigned long mask)
21553 +{
21554 +       struct nsproxy null_proxy = { .mnt_ns = NULL };
21555 +
21556 +       if (!proxy)
21557 +               return NULL;
21558 +
21559 +       if (mask) {
21560 +               /* vs_mix_nsproxy returns with reference */
21561 +               return vs_mix_nsproxy(old ? old : &null_proxy,
21562 +                       proxy, mask);
21563 +       }
21564 +       get_nsproxy(proxy);
21565 +       return proxy;
21566 +}
21567 +
21568 +
21569 +int vx_enter_space(struct vx_info *vxi, unsigned long mask, unsigned index)
21570 +{
21571 +       struct nsproxy *proxy, *proxy_cur, *proxy_new;
21572 +       struct fs_struct *fs_cur, *fs = NULL;
21573 +       struct _vx_space *space;
21574 +       int ret, kill = 0;
21575 +
21576 +       vxdprintk(VXD_CBIT(space, 8), "vx_enter_space(%p[#%u],0x%08lx,%d)",
21577 +               vxi, vxi->vx_id, mask, index);
21578 +
21579 +       if (vx_info_flags(vxi, VXF_INFO_PRIVATE, 0))
21580 +               return -EACCES;
21581 +
21582 +       if (index >= VX_SPACES)
21583 +               return -EINVAL;
21584 +
21585 +       space = &vxi->space[index];
21586 +
21587 +       if (!mask)
21588 +               mask = space->vx_nsmask;
21589 +
21590 +       if ((mask & space->vx_nsmask) != mask)
21591 +               return -EINVAL;
21592 +
21593 +       if (mask & CLONE_FS) {
21594 +               fs = copy_fs_struct(space->vx_fs);
21595 +               if (!fs)
21596 +                       return -ENOMEM;
21597 +       }
21598 +       proxy = space->vx_nsproxy;
21599 +
21600 +       vxdprintk(VXD_CBIT(space, 9),
21601 +               "vx_enter_space(%p[#%u],0x%08lx,%d) -> (%p,%p)",
21602 +               vxi, vxi->vx_id, mask, index, proxy, fs);
21603 +
21604 +       task_lock(current);
21605 +       fs_cur = current->fs;
21606 +
21607 +       if (mask & CLONE_FS) {
21608 +               spin_lock(&fs_cur->lock);
21609 +               current->fs = fs;
21610 +               kill = !--fs_cur->users;
21611 +               spin_unlock(&fs_cur->lock);
21612 +       }
21613 +
21614 +       proxy_cur = current->nsproxy;
21615 +       get_nsproxy(proxy_cur);
21616 +       task_unlock(current);
21617 +
21618 +       if (kill)
21619 +               free_fs_struct(fs_cur);
21620 +
21621 +       proxy_new = __vs_merge_nsproxy(proxy_cur, proxy, mask);
21622 +       if (IS_ERR(proxy_new)) {
21623 +               ret = PTR_ERR(proxy_new);
21624 +               goto out_put;
21625 +       }
21626 +
21627 +       proxy_new = xchg(&current->nsproxy, proxy_new);
21628 +
21629 +       if (mask & CLONE_NEWUSER) {
21630 +               struct cred *cred;
21631 +
21632 +               vxdprintk(VXD_CBIT(space, 10),
21633 +                       "vx_enter_space(%p[#%u],%p) cred (%p,%p)",
21634 +                       vxi, vxi->vx_id, space->vx_cred,
21635 +                       current->real_cred, current->cred);
21636 +
21637 +               if (space->vx_cred) {
21638 +                       cred = __prepare_creds(space->vx_cred);
21639 +                       if (cred)
21640 +                               commit_creds(cred);
21641 +               }
21642 +       }
21643 +
21644 +       ret = 0;
21645 +
21646 +       if (proxy_new)
21647 +               put_nsproxy(proxy_new);
21648 +out_put:
21649 +       if (proxy_cur)
21650 +               put_nsproxy(proxy_cur);
21651 +       return ret;
21652 +}
21653 +
21654 +
21655 +int vx_set_space(struct vx_info *vxi, unsigned long mask, unsigned index)
21656 +{
21657 +       struct nsproxy *proxy_vxi, *proxy_cur, *proxy_new;
21658 +       struct fs_struct *fs_vxi, *fs = NULL;
21659 +       struct _vx_space *space;
21660 +       int ret, kill = 0;
21661 +
21662 +       vxdprintk(VXD_CBIT(space, 8), "vx_set_space(%p[#%u],0x%08lx,%d)",
21663 +               vxi, vxi->vx_id, mask, index);
21664 +
21665 +       if ((mask & space_mask.mask) != mask)
21666 +               return -EINVAL;
21667 +
21668 +       if (index >= VX_SPACES)
21669 +               return -EINVAL;
21670 +
21671 +       space = &vxi->space[index];
21672 +
21673 +       proxy_vxi = space->vx_nsproxy;
21674 +       fs_vxi = space->vx_fs;
21675 +
21676 +       if (mask & CLONE_FS) {
21677 +               fs = copy_fs_struct(current->fs);
21678 +               if (!fs)
21679 +                       return -ENOMEM;
21680 +       }
21681 +
21682 +       task_lock(current);
21683 +
21684 +       if (mask & CLONE_FS) {
21685 +               spin_lock(&fs_vxi->lock);
21686 +               space->vx_fs = fs;
21687 +               kill = !--fs_vxi->users;
21688 +               spin_unlock(&fs_vxi->lock);
21689 +       }
21690 +
21691 +       proxy_cur = current->nsproxy;
21692 +       get_nsproxy(proxy_cur);
21693 +       task_unlock(current);
21694 +
21695 +       if (kill)
21696 +               free_fs_struct(fs_vxi);
21697 +
21698 +       proxy_new = __vs_merge_nsproxy(proxy_vxi, proxy_cur, mask);
21699 +       if (IS_ERR(proxy_new)) {
21700 +               ret = PTR_ERR(proxy_new);
21701 +               goto out_put;
21702 +       }
21703 +
21704 +       proxy_new = xchg(&space->vx_nsproxy, proxy_new);
21705 +       space->vx_nsmask |= mask;
21706 +
21707 +       if (mask & CLONE_NEWUSER) {
21708 +               struct cred *cred;
21709 +
21710 +               vxdprintk(VXD_CBIT(space, 10),
21711 +                       "vx_set_space(%p[#%u],%p) cred (%p,%p)",
21712 +                       vxi, vxi->vx_id, space->vx_cred,
21713 +                       current->real_cred, current->cred);
21714 +
21715 +               cred = prepare_creds();
21716 +               cred = (struct cred *)xchg(&space->vx_cred, cred);
21717 +               if (cred)
21718 +                       abort_creds(cred);
21719 +       }
21720 +
21721 +       ret = 0;
21722 +
21723 +       if (proxy_new)
21724 +               put_nsproxy(proxy_new);
21725 +out_put:
21726 +       if (proxy_cur)
21727 +               put_nsproxy(proxy_cur);
21728 +       return ret;
21729 +}
21730 +
21731 +
21732 +int vc_enter_space_v1(struct vx_info *vxi, void __user *data)
21733 +{
21734 +       struct vcmd_space_mask_v1 vc_data = { .mask = 0 };
21735 +
21736 +       if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
21737 +               return -EFAULT;
21738 +
21739 +       return vx_enter_space(vxi, vc_data.mask, 0);
21740 +}
21741 +
21742 +int vc_enter_space(struct vx_info *vxi, void __user *data)
21743 +{
21744 +       struct vcmd_space_mask_v2 vc_data = { .mask = 0 };
21745 +
21746 +       if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
21747 +               return -EFAULT;
21748 +
21749 +       if (vc_data.index >= VX_SPACES)
21750 +               return -EINVAL;
21751 +
21752 +       return vx_enter_space(vxi, vc_data.mask, vc_data.index);
21753 +}
21754 +
21755 +int vc_set_space_v1(struct vx_info *vxi, void __user *data)
21756 +{
21757 +       struct vcmd_space_mask_v1 vc_data = { .mask = 0 };
21758 +
21759 +       if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
21760 +               return -EFAULT;
21761 +
21762 +       return vx_set_space(vxi, vc_data.mask, 0);
21763 +}
21764 +
21765 +int vc_set_space(struct vx_info *vxi, void __user *data)
21766 +{
21767 +       struct vcmd_space_mask_v2 vc_data = { .mask = 0 };
21768 +
21769 +       if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
21770 +               return -EFAULT;
21771 +
21772 +       if (vc_data.index >= VX_SPACES)
21773 +               return -EINVAL;
21774 +
21775 +       return vx_set_space(vxi, vc_data.mask, vc_data.index);
21776 +}
21777 +
21778 +int vc_get_space_mask(void __user *data, int type)
21779 +{
21780 +       const struct vcmd_space_mask_v1 *mask;
21781 +
21782 +       if (type == 0)
21783 +               mask = &space_mask_v0;
21784 +       else if (type == 1)
21785 +               mask = &space_mask;
21786 +       else
21787 +               mask = &default_space_mask;
21788 +
21789 +       vxdprintk(VXD_CBIT(space, 10),
21790 +               "vc_get_space_mask(%d) = %08llx", type, mask->mask);
21791 +
21792 +       if (copy_to_user(data, mask, sizeof(*mask)))
21793 +               return -EFAULT;
21794 +       return 0;
21795 +}
21796 +
21797 diff -NurpP --minimal linux-4.9.135/kernel/vserver/switch.c linux-4.9.135-vs2.3.9.8/kernel/vserver/switch.c
21798 --- linux-4.9.135/kernel/vserver/switch.c       1970-01-01 00:00:00.000000000 +0000
21799 +++ linux-4.9.135-vs2.3.9.8/kernel/vserver/switch.c     2018-10-20 04:58:15.000000000 +0000
21800 @@ -0,0 +1,556 @@
21801 +/*
21802 + *  linux/kernel/vserver/switch.c
21803 + *
21804 + *  Virtual Server: Syscall Switch
21805 + *
21806 + *  Copyright (C) 2003-2011  Herbert P?tzl
21807 + *
21808 + *  V0.01  syscall switch
21809 + *  V0.02  added signal to context
21810 + *  V0.03  added rlimit functions
21811 + *  V0.04  added iattr, task/xid functions
21812 + *  V0.05  added debug/history stuff
21813 + *  V0.06  added compat32 layer
21814 + *  V0.07  vcmd args and perms
21815 + *  V0.08  added status commands
21816 + *  V0.09  added tag commands
21817 + *  V0.10  added oom bias
21818 + *  V0.11  added device commands
21819 + *  V0.12  added warn mask
21820 + *
21821 + */
21822 +
21823 +#include <linux/vs_context.h>
21824 +#include <linux/vs_network.h>
21825 +#include <linux/vserver/switch.h>
21826 +
21827 +#include "vci_config.h"
21828 +
21829 +
21830 +static inline
21831 +int vc_get_version(uint32_t id)
21832 +{
21833 +       return VCI_VERSION;
21834 +}
21835 +
21836 +static inline
21837 +int vc_get_vci(uint32_t id)
21838 +{
21839 +       return vci_kernel_config();
21840 +}
21841 +
21842 +#include <linux/vserver/context_cmd.h>
21843 +#include <linux/vserver/cvirt_cmd.h>
21844 +#include <linux/vserver/cacct_cmd.h>
21845 +#include <linux/vserver/limit_cmd.h>
21846 +#include <linux/vserver/network_cmd.h>
21847 +#include <linux/vserver/sched_cmd.h>
21848 +#include <linux/vserver/debug_cmd.h>
21849 +#include <linux/vserver/inode_cmd.h>
21850 +#include <linux/vserver/dlimit_cmd.h>
21851 +#include <linux/vserver/signal_cmd.h>
21852 +#include <linux/vserver/space_cmd.h>
21853 +#include <linux/vserver/tag_cmd.h>
21854 +#include <linux/vserver/device_cmd.h>
21855 +
21856 +#include <linux/vserver/inode.h>
21857 +#include <linux/vserver/dlimit.h>
21858 +
21859 +
21860 +#ifdef CONFIG_COMPAT
21861 +#define __COMPAT(name, id, data, compat)       \
21862 +       (compat) ? name ## _x32(id, data) : name(id, data)
21863 +#define __COMPAT_NO_ID(name, data, compat)     \
21864 +       (compat) ? name ## _x32(data) : name(data)
21865 +#else
21866 +#define __COMPAT(name, id, data, compat)       \
21867 +       name(id, data)
21868 +#define __COMPAT_NO_ID(name, data, compat)     \
21869 +       name(data)
21870 +#endif
21871 +
21872 +
21873 +static inline
21874 +long do_vcmd(uint32_t cmd, uint32_t id,
21875 +       struct vx_info *vxi, struct nx_info *nxi,
21876 +       void __user *data, int compat)
21877 +{
21878 +       switch (cmd) {
21879 +
21880 +       case VCMD_get_version:
21881 +               return vc_get_version(id);
21882 +       case VCMD_get_vci:
21883 +               return vc_get_vci(id);
21884 +
21885 +       case VCMD_task_xid:
21886 +               return vc_task_xid(id);
21887 +       case VCMD_vx_info:
21888 +               return vc_vx_info(vxi, data);
21889 +
21890 +       case VCMD_task_nid:
21891 +               return vc_task_nid(id);
21892 +       case VCMD_nx_info:
21893 +               return vc_nx_info(nxi, data);
21894 +
21895 +       case VCMD_task_tag:
21896 +               return vc_task_tag(id);
21897 +
21898 +       case VCMD_set_space_v1:
21899 +               return vc_set_space_v1(vxi, data);
21900 +       /* this is version 2 */
21901 +       case VCMD_set_space:
21902 +               return vc_set_space(vxi, data);
21903 +
21904 +       case VCMD_get_space_mask_v0:
21905 +               return vc_get_space_mask(data, 0);
21906 +       /* this is version 1 */
21907 +       case VCMD_get_space_mask:
21908 +               return vc_get_space_mask(data, 1);
21909 +
21910 +       case VCMD_get_space_default:
21911 +               return vc_get_space_mask(data, -1);
21912 +
21913 +       case VCMD_set_umask:
21914 +               return vc_set_umask(vxi, data);
21915 +
21916 +       case VCMD_get_umask:
21917 +               return vc_get_umask(vxi, data);
21918 +
21919 +       case VCMD_set_wmask:
21920 +               return vc_set_wmask(vxi, data);
21921 +
21922 +       case VCMD_get_wmask:
21923 +               return vc_get_wmask(vxi, data);
21924 +#ifdef CONFIG_IA32_EMULATION
21925 +       case VCMD_get_rlimit:
21926 +               return __COMPAT(vc_get_rlimit, vxi, data, compat);
21927 +       case VCMD_set_rlimit:
21928 +               return __COMPAT(vc_set_rlimit, vxi, data, compat);
21929 +#else
21930 +       case VCMD_get_rlimit:
21931 +               return vc_get_rlimit(vxi, data);
21932 +       case VCMD_set_rlimit:
21933 +               return vc_set_rlimit(vxi, data);
21934 +#endif
21935 +       case VCMD_get_rlimit_mask:
21936 +               return vc_get_rlimit_mask(id, data);
21937 +       case VCMD_reset_hits:
21938 +               return vc_reset_hits(vxi, data);
21939 +       case VCMD_reset_minmax:
21940 +               return vc_reset_minmax(vxi, data);
21941 +
21942 +       case VCMD_get_vhi_name:
21943 +               return vc_get_vhi_name(vxi, data);
21944 +       case VCMD_set_vhi_name:
21945 +               return vc_set_vhi_name(vxi, data);
21946 +
21947 +       case VCMD_ctx_stat:
21948 +               return vc_ctx_stat(vxi, data);
21949 +       case VCMD_virt_stat:
21950 +               return vc_virt_stat(vxi, data);
21951 +       case VCMD_sock_stat:
21952 +               return vc_sock_stat(vxi, data);
21953 +       case VCMD_rlimit_stat:
21954 +               return vc_rlimit_stat(vxi, data);
21955 +
21956 +       case VCMD_set_cflags:
21957 +               return vc_set_cflags(vxi, data);
21958 +       case VCMD_get_cflags:
21959 +               return vc_get_cflags(vxi, data);
21960 +
21961 +       /* this is version 1 */
21962 +       case VCMD_set_ccaps:
21963 +               return vc_set_ccaps(vxi, data);
21964 +       /* this is version 1 */
21965 +       case VCMD_get_ccaps:
21966 +               return vc_get_ccaps(vxi, data);
21967 +       case VCMD_set_bcaps:
21968 +               return vc_set_bcaps(vxi, data);
21969 +       case VCMD_get_bcaps:
21970 +               return vc_get_bcaps(vxi, data);
21971 +
21972 +       case VCMD_set_badness:
21973 +               return vc_set_badness(vxi, data);
21974 +       case VCMD_get_badness:
21975 +               return vc_get_badness(vxi, data);
21976 +
21977 +       case VCMD_set_nflags:
21978 +               return vc_set_nflags(nxi, data);
21979 +       case VCMD_get_nflags:
21980 +               return vc_get_nflags(nxi, data);
21981 +
21982 +       case VCMD_set_ncaps:
21983 +               return vc_set_ncaps(nxi, data);
21984 +       case VCMD_get_ncaps:
21985 +               return vc_get_ncaps(nxi, data);
21986 +
21987 +       case VCMD_set_prio_bias:
21988 +               return vc_set_prio_bias(vxi, data);
21989 +       case VCMD_get_prio_bias:
21990 +               return vc_get_prio_bias(vxi, data);
21991 +       case VCMD_add_dlimit:
21992 +               return __COMPAT(vc_add_dlimit, id, data, compat);
21993 +       case VCMD_rem_dlimit:
21994 +               return __COMPAT(vc_rem_dlimit, id, data, compat);
21995 +       case VCMD_set_dlimit:
21996 +               return __COMPAT(vc_set_dlimit, id, data, compat);
21997 +       case VCMD_get_dlimit:
21998 +               return __COMPAT(vc_get_dlimit, id, data, compat);
21999 +
22000 +       case VCMD_ctx_kill:
22001 +               return vc_ctx_kill(vxi, data);
22002 +
22003 +       case VCMD_wait_exit:
22004 +               return vc_wait_exit(vxi, data);
22005 +
22006 +       case VCMD_get_iattr:
22007 +               return __COMPAT_NO_ID(vc_get_iattr, data, compat);
22008 +       case VCMD_set_iattr:
22009 +               return __COMPAT_NO_ID(vc_set_iattr, data, compat);
22010 +
22011 +       case VCMD_fget_iattr:
22012 +               return vc_fget_iattr(id, data);
22013 +       case VCMD_fset_iattr:
22014 +               return vc_fset_iattr(id, data);
22015 +
22016 +       case VCMD_enter_space_v0:
22017 +               return vc_enter_space_v1(vxi, NULL);
22018 +       case VCMD_enter_space_v1:
22019 +               return vc_enter_space_v1(vxi, data);
22020 +       /* this is version 2 */
22021 +       case VCMD_enter_space:
22022 +               return vc_enter_space(vxi, data);
22023 +
22024 +       case VCMD_ctx_create_v0:
22025 +               return vc_ctx_create(id, NULL);
22026 +       case VCMD_ctx_create:
22027 +               return vc_ctx_create(id, data);
22028 +       case VCMD_ctx_migrate_v0:
22029 +               return vc_ctx_migrate(vxi, NULL);
22030 +       case VCMD_ctx_migrate:
22031 +               return vc_ctx_migrate(vxi, data);
22032 +
22033 +       case VCMD_net_create_v0:
22034 +               return vc_net_create(id, NULL);
22035 +       case VCMD_net_create:
22036 +               return vc_net_create(id, data);
22037 +       case VCMD_net_migrate:
22038 +               return vc_net_migrate(nxi, data);
22039 +
22040 +       case VCMD_tag_migrate:
22041 +               return vc_tag_migrate(id);
22042 +
22043 +       case VCMD_net_add:
22044 +               return vc_net_add(nxi, data);
22045 +       case VCMD_net_remove:
22046 +               return vc_net_remove(nxi, data);
22047 +
22048 +       case VCMD_net_add_ipv4_v1:
22049 +               return vc_net_add_ipv4_v1(nxi, data);
22050 +       /* this is version 2 */
22051 +       case VCMD_net_add_ipv4:
22052 +               return vc_net_add_ipv4(nxi, data);
22053 +
22054 +       case VCMD_net_rem_ipv4_v1:
22055 +               return vc_net_rem_ipv4_v1(nxi, data);
22056 +       /* this is version 2 */
22057 +       case VCMD_net_rem_ipv4:
22058 +               return vc_net_rem_ipv4(nxi, data);
22059 +#ifdef CONFIG_IPV6
22060 +       case VCMD_net_add_ipv6:
22061 +               return vc_net_add_ipv6(nxi, data);
22062 +       case VCMD_net_remove_ipv6:
22063 +               return vc_net_remove_ipv6(nxi, data);
22064 +#endif
22065 +/*     case VCMD_add_match_ipv4:
22066 +               return vc_add_match_ipv4(nxi, data);
22067 +       case VCMD_get_match_ipv4:
22068 +               return vc_get_match_ipv4(nxi, data);
22069 +#ifdef CONFIG_IPV6
22070 +       case VCMD_add_match_ipv6:
22071 +               return vc_add_match_ipv6(nxi, data);
22072 +       case VCMD_get_match_ipv6:
22073 +               return vc_get_match_ipv6(nxi, data);
22074 +#endif */
22075 +
22076 +#ifdef CONFIG_VSERVER_DEVICE
22077 +       case VCMD_set_mapping:
22078 +               return __COMPAT(vc_set_mapping, vxi, data, compat);
22079 +       case VCMD_unset_mapping:
22080 +               return __COMPAT(vc_unset_mapping, vxi, data, compat);
22081 +#endif
22082 +#ifdef CONFIG_VSERVER_HISTORY
22083 +       case VCMD_dump_history:
22084 +               return vc_dump_history(id);
22085 +       case VCMD_read_history:
22086 +               return __COMPAT(vc_read_history, id, data, compat);
22087 +#endif
22088 +       default:
22089 +               vxwprintk_task(1, "unimplemented VCMD_%02d_%d[%d]",
22090 +                       VC_CATEGORY(cmd), VC_COMMAND(cmd), VC_VERSION(cmd));
22091 +       }
22092 +       return -ENOSYS;
22093 +}
22094 +
22095 +
22096 +#define        __VCMD(vcmd, _perm, _args, _flags)              \
22097 +       case VCMD_ ## vcmd: perm = _perm;               \
22098 +               args = _args; flags = _flags; break
22099 +
22100 +
22101 +#define VCA_NONE       0x00
22102 +#define VCA_VXI                0x01
22103 +#define VCA_NXI                0x02
22104 +
22105 +#define VCF_NONE       0x00
22106 +#define VCF_INFO       0x01
22107 +#define VCF_ADMIN      0x02
22108 +#define VCF_ARES       0x06    /* includes admin */
22109 +#define VCF_SETUP      0x08
22110 +
22111 +#define VCF_ZIDOK      0x10    /* zero id okay */
22112 +
22113 +
22114 +static inline
22115 +long do_vserver(uint32_t cmd, uint32_t id, void __user *data, int compat)
22116 +{
22117 +       long ret;
22118 +       int permit = -1, state = 0;
22119 +       int perm = -1, args = 0, flags = 0;
22120 +       struct vx_info *vxi = NULL;
22121 +       struct nx_info *nxi = NULL;
22122 +
22123 +       switch (cmd) {
22124 +       /* unpriviledged commands */
22125 +       __VCMD(get_version,      0, VCA_NONE,   0);
22126 +       __VCMD(get_vci,          0, VCA_NONE,   0);
22127 +       __VCMD(get_rlimit_mask,  0, VCA_NONE,   0);
22128 +       __VCMD(get_space_mask_v0,0, VCA_NONE,   0);
22129 +       __VCMD(get_space_mask,   0, VCA_NONE,   0);
22130 +       __VCMD(get_space_default,0, VCA_NONE,   0);
22131 +
22132 +       /* info commands */
22133 +       __VCMD(task_xid,         2, VCA_NONE,   0);
22134 +       __VCMD(reset_hits,       2, VCA_VXI,    0);
22135 +       __VCMD(reset_minmax,     2, VCA_VXI,    0);
22136 +       __VCMD(vx_info,          3, VCA_VXI,    VCF_INFO);
22137 +       __VCMD(get_bcaps,        3, VCA_VXI,    VCF_INFO);
22138 +       __VCMD(get_ccaps,        3, VCA_VXI,    VCF_INFO);
22139 +       __VCMD(get_cflags,       3, VCA_VXI,    VCF_INFO);
22140 +       __VCMD(get_umask,        3, VCA_VXI,    VCF_INFO);
22141 +       __VCMD(get_wmask,        3, VCA_VXI,    VCF_INFO);
22142 +       __VCMD(get_badness,      3, VCA_VXI,    VCF_INFO);
22143 +       __VCMD(get_vhi_name,     3, VCA_VXI,    VCF_INFO);
22144 +       __VCMD(get_rlimit,       3, VCA_VXI,    VCF_INFO);
22145 +
22146 +       __VCMD(ctx_stat,         3, VCA_VXI,    VCF_INFO);
22147 +       __VCMD(virt_stat,        3, VCA_VXI,    VCF_INFO);
22148 +       __VCMD(sock_stat,        3, VCA_VXI,    VCF_INFO);
22149 +       __VCMD(rlimit_stat,      3, VCA_VXI,    VCF_INFO);
22150 +
22151 +       __VCMD(task_nid,         2, VCA_NONE,   0);
22152 +       __VCMD(nx_info,          3, VCA_NXI,    VCF_INFO);
22153 +       __VCMD(get_ncaps,        3, VCA_NXI,    VCF_INFO);
22154 +       __VCMD(get_nflags,       3, VCA_NXI,    VCF_INFO);
22155 +
22156 +       __VCMD(task_tag,         2, VCA_NONE,   0);
22157 +
22158 +       __VCMD(get_iattr,        2, VCA_NONE,   0);
22159 +       __VCMD(fget_iattr,       2, VCA_NONE,   0);
22160 +       __VCMD(get_dlimit,       3, VCA_NONE,   VCF_INFO);
22161 +       __VCMD(get_prio_bias,    3, VCA_VXI,    VCF_INFO);
22162 +
22163 +       /* lower admin commands */
22164 +       __VCMD(wait_exit,        4, VCA_VXI,    VCF_INFO);
22165 +       __VCMD(ctx_create_v0,    5, VCA_NONE,   0);
22166 +       __VCMD(ctx_create,       5, VCA_NONE,   0);
22167 +       __VCMD(ctx_migrate_v0,   5, VCA_VXI,    VCF_ADMIN);
22168 +       __VCMD(ctx_migrate,      5, VCA_VXI,    VCF_ADMIN);
22169 +       __VCMD(enter_space_v0,   5, VCA_VXI,    VCF_ADMIN);
22170 +       __VCMD(enter_space_v1,   5, VCA_VXI,    VCF_ADMIN);
22171 +       __VCMD(enter_space,      5, VCA_VXI,    VCF_ADMIN);
22172 +
22173 +       __VCMD(net_create_v0,    5, VCA_NONE,   0);
22174 +       __VCMD(net_create,       5, VCA_NONE,   0);
22175 +       __VCMD(net_migrate,      5, VCA_NXI,    VCF_ADMIN);
22176 +
22177 +       __VCMD(tag_migrate,      5, VCA_NONE,   VCF_ADMIN);
22178 +
22179 +       /* higher admin commands */
22180 +       __VCMD(ctx_kill,         6, VCA_VXI,    VCF_ARES);
22181 +       __VCMD(set_space_v1,     7, VCA_VXI,    VCF_ARES | VCF_SETUP);
22182 +       __VCMD(set_space,        7, VCA_VXI,    VCF_ARES | VCF_SETUP);
22183 +
22184 +       __VCMD(set_ccaps,        7, VCA_VXI,    VCF_ARES | VCF_SETUP);
22185 +       __VCMD(set_bcaps,        7, VCA_VXI,    VCF_ARES | VCF_SETUP);
22186 +       __VCMD(set_cflags,       7, VCA_VXI,    VCF_ARES | VCF_SETUP);
22187 +       __VCMD(set_umask,        7, VCA_VXI,    VCF_ARES | VCF_SETUP);
22188 +       __VCMD(set_wmask,        7, VCA_VXI,    VCF_ARES | VCF_SETUP);
22189 +       __VCMD(set_badness,      7, VCA_VXI,    VCF_ARES | VCF_SETUP);
22190 +
22191 +       __VCMD(set_vhi_name,     7, VCA_VXI,    VCF_ARES | VCF_SETUP);
22192 +       __VCMD(set_rlimit,       7, VCA_VXI,    VCF_ARES | VCF_SETUP);
22193 +       __VCMD(set_prio_bias,    7, VCA_VXI,    VCF_ARES | VCF_SETUP);
22194 +
22195 +       __VCMD(set_ncaps,        7, VCA_NXI,    VCF_ARES | VCF_SETUP);
22196 +       __VCMD(set_nflags,       7, VCA_NXI,    VCF_ARES | VCF_SETUP);
22197 +       __VCMD(net_add,          8, VCA_NXI,    VCF_ARES | VCF_SETUP);
22198 +       __VCMD(net_remove,       8, VCA_NXI,    VCF_ARES | VCF_SETUP);
22199 +       __VCMD(net_add_ipv4_v1,  8, VCA_NXI,    VCF_ARES | VCF_SETUP);
22200 +       __VCMD(net_rem_ipv4_v1,  8, VCA_NXI,    VCF_ARES | VCF_SETUP);
22201 +       __VCMD(net_add_ipv4,     8, VCA_NXI,    VCF_ARES | VCF_SETUP);
22202 +       __VCMD(net_rem_ipv4,     8, VCA_NXI,    VCF_ARES | VCF_SETUP);
22203 +#ifdef CONFIG_IPV6
22204 +       __VCMD(net_add_ipv6,     8, VCA_NXI,    VCF_ARES | VCF_SETUP);
22205 +       __VCMD(net_remove_ipv6,  8, VCA_NXI,    VCF_ARES | VCF_SETUP);
22206 +#endif
22207 +       __VCMD(set_iattr,        7, VCA_NONE,   0);
22208 +       __VCMD(fset_iattr,       7, VCA_NONE,   0);
22209 +       __VCMD(set_dlimit,       7, VCA_NONE,   VCF_ARES);
22210 +       __VCMD(add_dlimit,       8, VCA_NONE,   VCF_ARES);
22211 +       __VCMD(rem_dlimit,       8, VCA_NONE,   VCF_ARES);
22212 +
22213 +#ifdef CONFIG_VSERVER_DEVICE
22214 +       __VCMD(set_mapping,      8, VCA_VXI,    VCF_ARES|VCF_ZIDOK);
22215 +       __VCMD(unset_mapping,    8, VCA_VXI,    VCF_ARES|VCF_ZIDOK);
22216 +#endif
22217 +       /* debug level admin commands */
22218 +#ifdef CONFIG_VSERVER_HISTORY
22219 +       __VCMD(dump_history,     9, VCA_NONE,   0);
22220 +       __VCMD(read_history,     9, VCA_NONE,   0);
22221 +#endif
22222 +
22223 +       default:
22224 +               perm = -1;
22225 +       }
22226 +
22227 +       vxdprintk(VXD_CBIT(switch, 0),
22228 +               "vc: VCMD_%02d_%d[%d], %d,%p [%d,%d,%x,%x]",
22229 +               VC_CATEGORY(cmd), VC_COMMAND(cmd),
22230 +               VC_VERSION(cmd), id, data, compat,
22231 +               perm, args, flags);
22232 +
22233 +       ret = -ENOSYS;
22234 +       if (perm < 0)
22235 +               goto out;
22236 +
22237 +       state = 1;
22238 +       if (!capable(CAP_CONTEXT))
22239 +               goto out;
22240 +
22241 +       state = 2;
22242 +       /* moved here from the individual commands */
22243 +       ret = -EPERM;
22244 +       if ((perm > 1) && !capable(CAP_SYS_ADMIN))
22245 +               goto out;
22246 +
22247 +       state = 3;
22248 +       /* vcmd involves resource management  */
22249 +       ret = -EPERM;
22250 +       if ((flags & VCF_ARES) && !capable(CAP_SYS_RESOURCE))
22251 +               goto out;
22252 +
22253 +       state = 4;
22254 +       /* various legacy exceptions */
22255 +       switch (cmd) {
22256 +       /* will go away when spectator is a cap */
22257 +       case VCMD_ctx_migrate_v0:
22258 +       case VCMD_ctx_migrate:
22259 +               if (id == 1) {
22260 +                       current->xid = 1;
22261 +                       ret = 1;
22262 +                       goto out;
22263 +               }
22264 +               break;
22265 +
22266 +       /* will go away when spectator is a cap */
22267 +       case VCMD_net_migrate:
22268 +               if (id == 1) {
22269 +                       current->nid = 1;
22270 +                       ret = 1;
22271 +                       goto out;
22272 +               }
22273 +               break;
22274 +       }
22275 +
22276 +       /* vcmds are fine by default */
22277 +       permit = 1;
22278 +
22279 +       /* admin type vcmds require admin ... */
22280 +       if (flags & VCF_ADMIN)
22281 +               permit = vx_check(0, VS_ADMIN) ? 1 : 0;
22282 +
22283 +       /* ... but setup type vcmds override that */
22284 +       if (!permit && (flags & VCF_SETUP))
22285 +               permit = vx_flags(VXF_STATE_SETUP, 0) ? 2 : 0;
22286 +
22287 +       state = 5;
22288 +       ret = -EPERM;
22289 +       if (!permit)
22290 +               goto out;
22291 +
22292 +       state = 6;
22293 +       if (!id && (flags & VCF_ZIDOK))
22294 +               goto skip_id;
22295 +
22296 +       ret = -ESRCH;
22297 +       if (args & VCA_VXI) {
22298 +               vxi = lookup_vx_info(id);
22299 +               if (!vxi)
22300 +                       goto out;
22301 +
22302 +               if ((flags & VCF_ADMIN) &&
22303 +                       /* special case kill for shutdown */
22304 +                       (cmd != VCMD_ctx_kill) &&
22305 +                       /* can context be administrated? */
22306 +                       !vx_info_flags(vxi, VXF_STATE_ADMIN, 0)) {
22307 +                       ret = -EACCES;
22308 +                       goto out_vxi;
22309 +               }
22310 +       }
22311 +       state = 7;
22312 +       if (args & VCA_NXI) {
22313 +               nxi = lookup_nx_info(id);
22314 +               if (!nxi)
22315 +                       goto out_vxi;
22316 +
22317 +               if ((flags & VCF_ADMIN) &&
22318 +                       /* can context be administrated? */
22319 +                       !nx_info_flags(nxi, NXF_STATE_ADMIN, 0)) {
22320 +                       ret = -EACCES;
22321 +                       goto out_nxi;
22322 +               }
22323 +       }
22324 +skip_id:
22325 +       state = 8;
22326 +       ret = do_vcmd(cmd, id, vxi, nxi, data, compat);
22327 +
22328 +out_nxi:
22329 +       if ((args & VCA_NXI) && nxi)
22330 +               put_nx_info(nxi);
22331 +out_vxi:
22332 +       if ((args & VCA_VXI) && vxi)
22333 +               put_vx_info(vxi);
22334 +out:
22335 +       vxdprintk(VXD_CBIT(switch, 1),
22336 +               "vc: VCMD_%02d_%d[%d] = %08lx(%ld) [%d,%d]",
22337 +               VC_CATEGORY(cmd), VC_COMMAND(cmd),
22338 +               VC_VERSION(cmd), ret, ret, state, permit);
22339 +       return ret;
22340 +}
22341 +
22342 +asmlinkage long
22343 +sys_vserver(uint32_t cmd, uint32_t id, void __user *data)
22344 +{
22345 +       return do_vserver(cmd, id, data, 0);
22346 +}
22347 +
22348 +#ifdef CONFIG_COMPAT
22349 +
22350 +asmlinkage long
22351 +sys32_vserver(uint32_t cmd, uint32_t id, void __user *data)
22352 +{
22353 +       return do_vserver(cmd, id, data, 1);
22354 +}
22355 +
22356 +#endif /* CONFIG_COMPAT */
22357 diff -NurpP --minimal linux-4.9.135/kernel/vserver/sysctl.c linux-4.9.135-vs2.3.9.8/kernel/vserver/sysctl.c
22358 --- linux-4.9.135/kernel/vserver/sysctl.c       1970-01-01 00:00:00.000000000 +0000
22359 +++ linux-4.9.135-vs2.3.9.8/kernel/vserver/sysctl.c     2018-10-20 04:58:15.000000000 +0000
22360 @@ -0,0 +1,249 @@
22361 +/*
22362 + *  kernel/vserver/sysctl.c
22363 + *
22364 + *  Virtual Context Support
22365 + *
22366 + *  Copyright (C) 2004-2007  Herbert P?tzl
22367 + *
22368 + *  V0.01  basic structure
22369 + *
22370 + */
22371 +
22372 +#include <linux/module.h>
22373 +#include <linux/ctype.h>
22374 +#include <linux/sysctl.h>
22375 +#include <linux/parser.h>
22376 +#include <linux/utsname.h>
22377 +
22378 +#include <asm/uaccess.h>
22379 +#include <asm/sections.h>
22380 +
22381 +enum {
22382 +       CTL_DEBUG_ERROR         = 0,
22383 +       CTL_DEBUG_SWITCH        = 1,
22384 +       CTL_DEBUG_XID,
22385 +       CTL_DEBUG_NID,
22386 +       CTL_DEBUG_TAG,
22387 +       CTL_DEBUG_NET,
22388 +       CTL_DEBUG_LIMIT,
22389 +       CTL_DEBUG_CRES,
22390 +       CTL_DEBUG_DLIM,
22391 +       CTL_DEBUG_QUOTA,
22392 +       CTL_DEBUG_CVIRT,
22393 +       CTL_DEBUG_SPACE,
22394 +       CTL_DEBUG_PERM,
22395 +       CTL_DEBUG_MISC,
22396 +};
22397 +
22398 +
22399 +unsigned int vs_debug_switch   = 0;
22400 +unsigned int vs_debug_xid      = 0;
22401 +unsigned int vs_debug_nid      = 0;
22402 +unsigned int vs_debug_tag      = 0;
22403 +unsigned int vs_debug_net      = 0;
22404 +unsigned int vs_debug_limit    = 0;
22405 +unsigned int vs_debug_cres     = 0;
22406 +unsigned int vs_debug_dlim     = 0;
22407 +unsigned int vs_debug_quota    = 0;
22408 +unsigned int vs_debug_cvirt    = 0;
22409 +unsigned int vs_debug_space    = 0;
22410 +unsigned int vs_debug_perm     = 0;
22411 +unsigned int vs_debug_misc     = 0;
22412 +
22413 +
22414 +static struct ctl_table_header *vserver_table_header;
22415 +static struct ctl_table vserver_root_table[];
22416 +
22417 +
22418 +void vserver_register_sysctl(void)
22419 +{
22420 +       if (!vserver_table_header) {
22421 +               vserver_table_header = register_sysctl_table(vserver_root_table);
22422 +       }
22423 +
22424 +}
22425 +
22426 +void vserver_unregister_sysctl(void)
22427 +{
22428 +       if (vserver_table_header) {
22429 +               unregister_sysctl_table(vserver_table_header);
22430 +               vserver_table_header = NULL;
22431 +       }
22432 +}
22433 +
22434 +static int proc_dodebug(struct ctl_table *table, int write,
22435 +       void __user *buffer, size_t *lenp, loff_t *ppos)
22436 +{
22437 +       char            tmpbuf[20], *p, c;
22438 +       unsigned int    value;
22439 +       size_t          left, len;
22440 +
22441 +       if ((*ppos && !write) || !*lenp) {
22442 +               *lenp = 0;
22443 +               return 0;
22444 +       }
22445 +
22446 +       left = *lenp;
22447 +
22448 +       if (write) {
22449 +               if (!access_ok(VERIFY_READ, buffer, left))
22450 +                       return -EFAULT;
22451 +               p = (char *)buffer;
22452 +               while (left && __get_user(c, p) >= 0 && isspace(c))
22453 +                       left--, p++;
22454 +               if (!left)
22455 +                       goto done;
22456 +
22457 +               if (left > sizeof(tmpbuf) - 1)
22458 +                       return -EINVAL;
22459 +               if (copy_from_user(tmpbuf, p, left))
22460 +                       return -EFAULT;
22461 +               tmpbuf[left] = '\0';
22462 +
22463 +               for (p = tmpbuf, value = 0; '0' <= *p && *p <= '9'; p++, left--)
22464 +                       value = 10 * value + (*p - '0');
22465 +               if (*p && !isspace(*p))
22466 +                       return -EINVAL;
22467 +               while (left && isspace(*p))
22468 +                       left--, p++;
22469 +               *(unsigned int *)table->data = value;
22470 +       } else {
22471 +               if (!access_ok(VERIFY_WRITE, buffer, left))
22472 +                       return -EFAULT;
22473 +               len = sprintf(tmpbuf, "%d", *(unsigned int *)table->data);
22474 +               if (len > left)
22475 +                       len = left;
22476 +               if (__copy_to_user(buffer, tmpbuf, len))
22477 +                       return -EFAULT;
22478 +               if ((left -= len) > 0) {
22479 +                       if (put_user('\n', (char *)buffer + len))
22480 +                               return -EFAULT;
22481 +                       left--;
22482 +               }
22483 +       }
22484 +
22485 +done:
22486 +       *lenp -= left;
22487 +       *ppos += *lenp;
22488 +       return 0;
22489 +}
22490 +
22491 +static int zero;
22492 +
22493 +#define        CTL_ENTRY(ctl, name)                            \
22494 +       {                                               \
22495 +               .procname       = #name,                \
22496 +               .data           = &vs_ ## name,         \
22497 +               .maxlen         = sizeof(int),          \
22498 +               .mode           = 0644,                 \
22499 +               .proc_handler   = &proc_dodebug,        \
22500 +               .extra1         = &zero,                \
22501 +               .extra2         = &zero,                \
22502 +       }
22503 +
22504 +static struct ctl_table vserver_debug_table[] = {
22505 +       CTL_ENTRY(CTL_DEBUG_SWITCH,     debug_switch),
22506 +       CTL_ENTRY(CTL_DEBUG_XID,        debug_xid),
22507 +       CTL_ENTRY(CTL_DEBUG_NID,        debug_nid),
22508 +       CTL_ENTRY(CTL_DEBUG_TAG,        debug_tag),
22509 +       CTL_ENTRY(CTL_DEBUG_NET,        debug_net),
22510 +       CTL_ENTRY(CTL_DEBUG_LIMIT,      debug_limit),
22511 +       CTL_ENTRY(CTL_DEBUG_CRES,       debug_cres),
22512 +       CTL_ENTRY(CTL_DEBUG_DLIM,       debug_dlim),
22513 +       CTL_ENTRY(CTL_DEBUG_QUOTA,      debug_quota),
22514 +       CTL_ENTRY(CTL_DEBUG_CVIRT,      debug_cvirt),
22515 +       CTL_ENTRY(CTL_DEBUG_SPACE,      debug_space),
22516 +       CTL_ENTRY(CTL_DEBUG_PERM,       debug_perm),
22517 +       CTL_ENTRY(CTL_DEBUG_MISC,       debug_misc),
22518 +       { 0 }
22519 +};
22520 +
22521 +static struct ctl_table vserver_root_table[] = {
22522 +       {
22523 +               .procname       = "vserver",
22524 +               .mode           = 0555,
22525 +               .child          = vserver_debug_table
22526 +       },
22527 +       { 0 }
22528 +};
22529 +
22530 +
22531 +static match_table_t tokens = {
22532 +       { CTL_DEBUG_SWITCH,     "switch=%x"     },
22533 +       { CTL_DEBUG_XID,        "xid=%x"        },
22534 +       { CTL_DEBUG_NID,        "nid=%x"        },
22535 +       { CTL_DEBUG_TAG,        "tag=%x"        },
22536 +       { CTL_DEBUG_NET,        "net=%x"        },
22537 +       { CTL_DEBUG_LIMIT,      "limit=%x"      },
22538 +       { CTL_DEBUG_CRES,       "cres=%x"       },
22539 +       { CTL_DEBUG_DLIM,       "dlim=%x"       },
22540 +       { CTL_DEBUG_QUOTA,      "quota=%x"      },
22541 +       { CTL_DEBUG_CVIRT,      "cvirt=%x"      },
22542 +       { CTL_DEBUG_SPACE,      "space=%x"      },
22543 +       { CTL_DEBUG_PERM,       "perm=%x"       },
22544 +       { CTL_DEBUG_MISC,       "misc=%x"       },
22545 +       { CTL_DEBUG_ERROR,      NULL            }
22546 +};
22547 +
22548 +#define        HANDLE_CASE(id, name, val)                              \
22549 +       case CTL_DEBUG_ ## id:                                  \
22550 +               vs_debug_ ## name = val;                        \
22551 +               printk("vs_debug_" #name "=0x%x\n", val);       \
22552 +               break
22553 +
22554 +
22555 +static int __init vs_debug_setup(char *str)
22556 +{
22557 +       char *p;
22558 +       int token;
22559 +
22560 +       printk("vs_debug_setup(%s)\n", str);
22561 +       while ((p = strsep(&str, ",")) != NULL) {
22562 +               substring_t args[MAX_OPT_ARGS];
22563 +               unsigned int value;
22564 +
22565 +               if (!*p)
22566 +                       continue;
22567 +
22568 +               token = match_token(p, tokens, args);
22569 +               value = (token > 0) ? simple_strtoul(args[0].from, NULL, 0) : 0;
22570 +
22571 +               switch (token) {
22572 +               HANDLE_CASE(SWITCH, switch, value);
22573 +               HANDLE_CASE(XID,    xid,    value);
22574 +               HANDLE_CASE(NID,    nid,    value);
22575 +               HANDLE_CASE(TAG,    tag,    value);
22576 +               HANDLE_CASE(NET,    net,    value);
22577 +               HANDLE_CASE(LIMIT,  limit,  value);
22578 +               HANDLE_CASE(CRES,   cres,   value);
22579 +               HANDLE_CASE(DLIM,   dlim,   value);
22580 +               HANDLE_CASE(QUOTA,  quota,  value);
22581 +               HANDLE_CASE(CVIRT,  cvirt,  value);
22582 +               HANDLE_CASE(SPACE,  space,  value);
22583 +               HANDLE_CASE(PERM,   perm,   value);
22584 +               HANDLE_CASE(MISC,   misc,   value);
22585 +               default:
22586 +                       return -EINVAL;
22587 +                       break;
22588 +               }
22589 +       }
22590 +       return 1;
22591 +}
22592 +
22593 +__setup("vsdebug=", vs_debug_setup);
22594 +
22595 +
22596 +
22597 +EXPORT_SYMBOL_GPL(vs_debug_switch);
22598 +EXPORT_SYMBOL_GPL(vs_debug_xid);
22599 +EXPORT_SYMBOL_GPL(vs_debug_nid);
22600 +EXPORT_SYMBOL_GPL(vs_debug_net);
22601 +EXPORT_SYMBOL_GPL(vs_debug_limit);
22602 +EXPORT_SYMBOL_GPL(vs_debug_cres);
22603 +EXPORT_SYMBOL_GPL(vs_debug_dlim);
22604 +EXPORT_SYMBOL_GPL(vs_debug_quota);
22605 +EXPORT_SYMBOL_GPL(vs_debug_cvirt);
22606 +EXPORT_SYMBOL_GPL(vs_debug_space);
22607 +EXPORT_SYMBOL_GPL(vs_debug_perm);
22608 +EXPORT_SYMBOL_GPL(vs_debug_misc);
22609 +
22610 diff -NurpP --minimal linux-4.9.135/kernel/vserver/tag.c linux-4.9.135-vs2.3.9.8/kernel/vserver/tag.c
22611 --- linux-4.9.135/kernel/vserver/tag.c  1970-01-01 00:00:00.000000000 +0000
22612 +++ linux-4.9.135-vs2.3.9.8/kernel/vserver/tag.c        2018-10-20 04:58:15.000000000 +0000
22613 @@ -0,0 +1,63 @@
22614 +/*
22615 + *  linux/kernel/vserver/tag.c
22616 + *
22617 + *  Virtual Server: Shallow Tag Space
22618 + *
22619 + *  Copyright (C) 2007  Herbert P?tzl
22620 + *
22621 + *  V0.01  basic implementation
22622 + *
22623 + */
22624 +
22625 +#include <linux/sched.h>
22626 +#include <linux/vserver/debug.h>
22627 +#include <linux/vs_pid.h>
22628 +#include <linux/vs_tag.h>
22629 +
22630 +#include <linux/vserver/tag_cmd.h>
22631 +
22632 +
22633 +int dx_migrate_task(struct task_struct *p, vtag_t tag)
22634 +{
22635 +       if (!p)
22636 +               BUG();
22637 +
22638 +       vxdprintk(VXD_CBIT(tag, 5),
22639 +               "dx_migrate_task(%p[#%d],#%d)", p, p->tag, tag);
22640 +
22641 +       task_lock(p);
22642 +       p->tag = tag;
22643 +       task_unlock(p);
22644 +
22645 +       vxdprintk(VXD_CBIT(tag, 5),
22646 +               "moved task %p into [#%d]", p, tag);
22647 +       return 0;
22648 +}
22649 +
22650 +/* vserver syscall commands below here */
22651 +
22652 +/* taks xid and vx_info functions */
22653 +
22654 +
22655 +int vc_task_tag(uint32_t id)
22656 +{
22657 +       vtag_t tag;
22658 +
22659 +       if (id) {
22660 +               struct task_struct *tsk;
22661 +               rcu_read_lock();
22662 +               tsk = find_task_by_real_pid(id);
22663 +               tag = (tsk) ? tsk->tag : -ESRCH;
22664 +               rcu_read_unlock();
22665 +       } else
22666 +               tag = dx_current_tag();
22667 +       return tag;
22668 +}
22669 +
22670 +
22671 +int vc_tag_migrate(uint32_t tag)
22672 +{
22673 +       return dx_migrate_task(current, tag & 0xFFFF);
22674 +}
22675 +
22676 +
22677 diff -NurpP --minimal linux-4.9.135/kernel/vserver/vci_config.h linux-4.9.135-vs2.3.9.8/kernel/vserver/vci_config.h
22678 --- linux-4.9.135/kernel/vserver/vci_config.h   1970-01-01 00:00:00.000000000 +0000
22679 +++ linux-4.9.135-vs2.3.9.8/kernel/vserver/vci_config.h 2018-10-20 04:58:15.000000000 +0000
22680 @@ -0,0 +1,80 @@
22681 +
22682 +/*  interface version */
22683 +
22684 +#define VCI_VERSION            0x00020308
22685 +
22686 +
22687 +enum {
22688 +       VCI_KCBIT_NO_DYNAMIC = 0,
22689 +
22690 +       VCI_KCBIT_PROC_SECURE = 4,
22691 +       /* VCI_KCBIT_HARDCPU = 5, */
22692 +       /* VCI_KCBIT_IDLELIMIT = 6, */
22693 +       /* VCI_KCBIT_IDLETIME = 7, */
22694 +
22695 +       VCI_KCBIT_COWBL = 8,
22696 +       VCI_KCBIT_FULLCOWBL = 9,
22697 +       VCI_KCBIT_SPACES = 10,
22698 +       VCI_KCBIT_NETV2 = 11,
22699 +       VCI_KCBIT_MEMCG = 12,
22700 +       VCI_KCBIT_MEMCG_SWAP = 13,
22701 +
22702 +       VCI_KCBIT_DEBUG = 16,
22703 +       VCI_KCBIT_HISTORY = 20,
22704 +       VCI_KCBIT_TAGGED = 24,
22705 +       VCI_KCBIT_PPTAG = 28,
22706 +
22707 +       VCI_KCBIT_MORE = 31,
22708 +};
22709 +
22710 +
22711 +static inline uint32_t vci_kernel_config(void)
22712 +{
22713 +       return
22714 +       (1 << VCI_KCBIT_NO_DYNAMIC) |
22715 +
22716 +       /* configured features */
22717 +#ifdef CONFIG_VSERVER_PROC_SECURE
22718 +       (1 << VCI_KCBIT_PROC_SECURE) |
22719 +#endif
22720 +#ifdef CONFIG_VSERVER_COWBL
22721 +       (1 << VCI_KCBIT_COWBL) |
22722 +       (1 << VCI_KCBIT_FULLCOWBL) |
22723 +#endif
22724 +       (1 << VCI_KCBIT_SPACES) |
22725 +       (1 << VCI_KCBIT_NETV2) |
22726 +#ifdef CONFIG_MEMCG
22727 +       (1 << VCI_KCBIT_MEMCG) |
22728 +#endif
22729 +#ifdef CONFIG_MEMCG_SWAP
22730 +       (1 << VCI_KCBIT_MEMCG_SWAP) |
22731 +#endif
22732 +
22733 +       /* debug options */
22734 +#ifdef CONFIG_VSERVER_DEBUG
22735 +       (1 << VCI_KCBIT_DEBUG) |
22736 +#endif
22737 +#ifdef CONFIG_VSERVER_HISTORY
22738 +       (1 << VCI_KCBIT_HISTORY) |
22739 +#endif
22740 +
22741 +       /* inode context tagging */
22742 +#if    defined(CONFIG_TAGGING_NONE)
22743 +       (0 << VCI_KCBIT_TAGGED) |
22744 +#elif  defined(CONFIG_TAGGING_UID16)
22745 +       (1 << VCI_KCBIT_TAGGED) |
22746 +#elif  defined(CONFIG_TAGGING_GID16)
22747 +       (2 << VCI_KCBIT_TAGGED) |
22748 +#elif  defined(CONFIG_TAGGING_ID24)
22749 +       (3 << VCI_KCBIT_TAGGED) |
22750 +#elif  defined(CONFIG_TAGGING_INTERN)
22751 +       (4 << VCI_KCBIT_TAGGED) |
22752 +#elif  defined(CONFIG_TAGGING_RUNTIME)
22753 +       (5 << VCI_KCBIT_TAGGED) |
22754 +#else
22755 +       (7 << VCI_KCBIT_TAGGED) |
22756 +#endif
22757 +       (1 << VCI_KCBIT_PPTAG) |
22758 +       0;
22759 +}
22760 +
22761 diff -NurpP --minimal linux-4.9.135/mm/memcontrol.c linux-4.9.135-vs2.3.9.8/mm/memcontrol.c
22762 --- linux-4.9.135/mm/memcontrol.c       2018-10-20 10:39:23.000000000 +0000
22763 +++ linux-4.9.135-vs2.3.9.8/mm/memcontrol.c     2018-10-20 05:55:43.000000000 +0000
22764 @@ -2825,6 +2825,41 @@ static u64 mem_cgroup_read_u64(struct cg
22765         }
22766  }
22767
22768 +unsigned long mem_cgroup_mem_usage_pages(struct mem_cgroup *memcg)
22769 +{
22770 +       return mem_cgroup_usage(memcg, false);
22771 +}
22772 +
22773 +unsigned long mem_cgroup_mem_limit_pages(struct mem_cgroup *memcg)
22774 +{
22775 +       return memcg->memory.limit;
22776 +}
22777 +
22778 +unsigned long mem_cgroup_memsw_usage_pages(struct mem_cgroup *memcg)
22779 +{
22780 +       return mem_cgroup_usage(memcg, true);
22781 +}
22782 +
22783 +unsigned long mem_cgroup_memsw_limit_pages(struct mem_cgroup *memcg)
22784 +{
22785 +       return memcg->memsw.limit;
22786 +}
22787 +
22788 +void dump_mem_cgroup(struct mem_cgroup *memcg)
22789 +{
22790 +       printk(KERN_INFO "memcg: %p/%d:\n"
22791 +               "\tmemory:\t%lu/%lu %lu/%lu\n"
22792 +               "\tmemsw:\t%lu/%lu %lu/%lu\n"
22793 +               "\tkmem:\t%lu/%lu %lu/%lu\n",
22794 +               memcg, memcg->id.id,
22795 +               page_counter_read(&memcg->memory), memcg->memory.limit,
22796 +               memcg->memory.watermark, memcg->memory.failcnt,
22797 +               page_counter_read(&memcg->memsw), memcg->memsw.limit,
22798 +               memcg->memsw.watermark, memcg->memsw.failcnt,
22799 +               page_counter_read(&memcg->kmem), memcg->kmem.limit,
22800 +               memcg->kmem.watermark, memcg->kmem.failcnt);
22801 +}
22802 +
22803  #ifndef CONFIG_SLOB
22804  static int memcg_online_kmem(struct mem_cgroup *memcg)
22805  {
22806 diff -NurpP --minimal linux-4.9.135/mm/oom_kill.c linux-4.9.135-vs2.3.9.8/mm/oom_kill.c
22807 --- linux-4.9.135/mm/oom_kill.c 2018-10-20 10:39:23.000000000 +0000
22808 +++ linux-4.9.135-vs2.3.9.8/mm/oom_kill.c       2018-10-20 04:58:15.000000000 +0000
22809 @@ -38,6 +38,8 @@
22810  #include <linux/kthread.h>
22811  #include <linux/init.h>
22812  #include <linux/mmu_notifier.h>
22813 +#include <linux/reboot.h>
22814 +#include <linux/vs_context.h>
22815
22816  #include <asm/tlb.h>
22817  #include "internal.h"
22818 @@ -142,11 +144,18 @@ static inline bool is_memcg_oom(struct o
22819  static bool oom_unkillable_task(struct task_struct *p,
22820                 struct mem_cgroup *memcg, const nodemask_t *nodemask)
22821  {
22822 -       if (is_global_init(p))
22823 +       unsigned xid = vx_current_xid();
22824 +
22825 +       /* skip the init task, global and per guest */
22826 +       if (task_is_init(p))
22827                 return true;
22828         if (p->flags & PF_KTHREAD)
22829                 return true;
22830
22831 +       /* skip other guest and host processes if oom in guest */
22832 +       if (xid && vx_task_xid(p) != xid)
22833 +               return true;
22834 +
22835         /* When mem_cgroup_out_of_memory() and p is not member of the group */
22836         if (memcg && !task_in_mem_cgroup(p, memcg))
22837                 return true;
22838 @@ -851,8 +860,8 @@ static void oom_kill_process(struct oom_
22839         if (__ratelimit(&oom_rs))
22840                 dump_header(oc, p);
22841
22842 -       pr_err("%s: Kill process %d (%s) score %u or sacrifice child\n",
22843 -               message, task_pid_nr(p), p->comm, points);
22844 +       pr_err("%s: Kill process %d:#%u (%s) score %d or sacrifice child\n",
22845 +               message, task_pid_nr(p), p->xid, p->comm, points);
22846
22847         /*
22848          * If any of p's children has a different mm and is eligible for kill,
22849 @@ -902,8 +911,8 @@ static void oom_kill_process(struct oom_
22850          */
22851         do_send_sig_info(SIGKILL, SEND_SIG_FORCED, victim, true);
22852         mark_oom_victim(victim);
22853 -       pr_err("Killed process %d (%s) total-vm:%lukB, anon-rss:%lukB, file-rss:%lukB, shmem-rss:%lukB\n",
22854 -               task_pid_nr(victim), victim->comm, K(victim->mm->total_vm),
22855 +       pr_err("Killed process %d:%u (%s) total-vm:%lukB, anon-rss:%lukB, file-rss:%lukB, shmem-rss:%lukB\n",
22856 +               task_pid_nr(victim), victim->xid, victim->comm, K(victim->mm->total_vm),
22857                 K(get_mm_counter(victim->mm, MM_ANONPAGES)),
22858                 K(get_mm_counter(victim->mm, MM_FILEPAGES)),
22859                 K(get_mm_counter(victim->mm, MM_SHMEMPAGES)));
22860 @@ -950,6 +959,8 @@ static void oom_kill_process(struct oom_
22861  }
22862  #undef K
22863
22864 +long vs_oom_action(unsigned int);
22865 +
22866  /*
22867   * Determines whether the kernel must panic because of the panic_on_oom sysctl.
22868   */
22869 @@ -1055,7 +1066,12 @@ bool out_of_memory(struct oom_control *o
22870         /* Found nothing?!?! Either we hang forever, or we panic. */
22871         if (!oc->chosen && !is_sysrq_oom(oc) && !is_memcg_oom(oc)) {
22872                 dump_header(oc, NULL);
22873 -               panic("Out of memory and no killable processes...\n");
22874 +
22875 +               /* avoid panic for guest OOM */
22876 +               if (vx_current_xid())
22877 +                       vs_oom_action(LINUX_REBOOT_CMD_OOM);
22878 +               else
22879 +                       panic("Out of memory and no killable processes...\n");
22880         }
22881         if (oc->chosen && oc->chosen != (void *)-1UL) {
22882                 oom_kill_process(oc, !is_memcg_oom(oc) ? "Out of memory" :
22883 diff -NurpP --minimal linux-4.9.135/mm/page_alloc.c linux-4.9.135-vs2.3.9.8/mm/page_alloc.c
22884 --- linux-4.9.135/mm/page_alloc.c       2018-10-20 10:39:23.000000000 +0000
22885 +++ linux-4.9.135-vs2.3.9.8/mm/page_alloc.c     2018-10-20 04:58:15.000000000 +0000
22886 @@ -64,6 +64,8 @@
22887  #include <linux/page_owner.h>
22888  #include <linux/kthread.h>
22889  #include <linux/memcontrol.h>
22890 +#include <linux/vs_base.h>
22891 +#include <linux/vs_limit.h>
22892
22893  #include <asm/sections.h>
22894  #include <asm/tlbflush.h>
22895 @@ -4198,6 +4200,9 @@ void si_meminfo(struct sysinfo *val)
22896         val->totalhigh = totalhigh_pages;
22897         val->freehigh = nr_free_highpages();
22898         val->mem_unit = PAGE_SIZE;
22899 +
22900 +       if (vx_flags(VXF_VIRT_MEM, 0))
22901 +               vx_vsi_meminfo(val);
22902  }
22903
22904  EXPORT_SYMBOL(si_meminfo);
22905 @@ -4232,6 +4237,9 @@ void si_meminfo_node(struct sysinfo *val
22906         val->freehigh = free_highpages;
22907  #endif
22908         val->mem_unit = PAGE_SIZE;
22909 +
22910 +       if (vx_flags(VXF_VIRT_MEM, 0))
22911 +               vx_vsi_meminfo(val);
22912  }
22913  #endif
22914
22915 diff -NurpP --minimal linux-4.9.135/mm/pgtable-generic.c linux-4.9.135-vs2.3.9.8/mm/pgtable-generic.c
22916 --- linux-4.9.135/mm/pgtable-generic.c  2016-12-11 19:17:54.000000000 +0000
22917 +++ linux-4.9.135-vs2.3.9.8/mm/pgtable-generic.c        2018-10-20 04:58:15.000000000 +0000
22918 @@ -6,6 +6,8 @@
22919   *  Copyright (C) 2010  Linus Torvalds
22920   */
22921
22922 +#include <linux/mm.h>
22923 +
22924  #include <linux/pagemap.h>
22925  #include <asm/tlb.h>
22926  #include <asm-generic/pgtable.h>
22927 diff -NurpP --minimal linux-4.9.135/mm/shmem.c linux-4.9.135-vs2.3.9.8/mm/shmem.c
22928 --- linux-4.9.135/mm/shmem.c    2018-10-20 10:39:23.000000000 +0000
22929 +++ linux-4.9.135-vs2.3.9.8/mm/shmem.c  2018-10-20 05:55:43.000000000 +0000
22930 @@ -2796,7 +2796,7 @@ static int shmem_statfs(struct dentry *d
22931  {
22932         struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb);
22933
22934 -       buf->f_type = TMPFS_MAGIC;
22935 +       buf->f_type = TMPFS_SUPER_MAGIC;
22936         buf->f_bsize = PAGE_SIZE;
22937         buf->f_namelen = NAME_MAX;
22938         if (sbinfo->max_blocks) {
22939 @@ -3617,7 +3617,7 @@ int shmem_fill_super(struct super_block
22940         sb->s_maxbytes = MAX_LFS_FILESIZE;
22941         sb->s_blocksize = PAGE_SIZE;
22942         sb->s_blocksize_bits = PAGE_SHIFT;
22943 -       sb->s_magic = TMPFS_MAGIC;
22944 +       sb->s_magic = TMPFS_SUPER_MAGIC;
22945         sb->s_op = &shmem_ops;
22946         sb->s_time_gran = 1;
22947  #ifdef CONFIG_TMPFS_XATTR
22948 diff -NurpP --minimal linux-4.9.135/mm/slab.c linux-4.9.135-vs2.3.9.8/mm/slab.c
22949 --- linux-4.9.135/mm/slab.c     2018-10-20 10:39:23.000000000 +0000
22950 +++ linux-4.9.135-vs2.3.9.8/mm/slab.c   2018-10-20 04:58:15.000000000 +0000
22951 @@ -307,6 +307,8 @@ static void kmem_cache_node_init(struct
22952  #define STATS_INC_FREEMISS(x)  do { } while (0)
22953  #endif
22954
22955 +#include "slab_vs.h"
22956 +
22957  #if DEBUG
22958
22959  /*
22960 @@ -3341,6 +3343,7 @@ slab_alloc_node(struct kmem_cache *cache
22961         /* ___cache_alloc_node can fall back to other nodes */
22962         ptr = ____cache_alloc_node(cachep, flags, nodeid);
22963    out:
22964 +       vx_slab_alloc(cachep, flags);
22965         local_irq_restore(save_flags);
22966         ptr = cache_alloc_debugcheck_after(cachep, flags, ptr, caller);
22967
22968 @@ -3522,6 +3525,7 @@ void ___cache_free(struct kmem_cache *ca
22969         check_irq_off();
22970         kmemleak_free_recursive(objp, cachep->flags);
22971         objp = cache_free_debugcheck(cachep, objp, caller);
22972 +       vx_slab_free(cachep);
22973
22974         kmemcheck_slab_free(cachep, objp, cachep->object_size);
22975
22976 diff -NurpP --minimal linux-4.9.135/mm/slab_vs.h linux-4.9.135-vs2.3.9.8/mm/slab_vs.h
22977 --- linux-4.9.135/mm/slab_vs.h  1970-01-01 00:00:00.000000000 +0000
22978 +++ linux-4.9.135-vs2.3.9.8/mm/slab_vs.h        2018-10-20 04:58:15.000000000 +0000
22979 @@ -0,0 +1,29 @@
22980 +
22981 +#include <linux/vserver/context.h>
22982 +
22983 +#include <linux/vs_context.h>
22984 +
22985 +static inline
22986 +void vx_slab_alloc(struct kmem_cache *cachep, gfp_t flags)
22987 +{
22988 +       int what = gfp_zone(cachep->allocflags);
22989 +       struct vx_info *vxi = current_vx_info();
22990 +
22991 +       if (!vxi)
22992 +               return;
22993 +
22994 +       atomic_add(cachep->size, &vxi->cacct.slab[what]);
22995 +}
22996 +
22997 +static inline
22998 +void vx_slab_free(struct kmem_cache *cachep)
22999 +{
23000 +       int what = gfp_zone(cachep->allocflags);
23001 +       struct vx_info *vxi = current_vx_info();
23002 +
23003 +       if (!vxi)
23004 +               return;
23005 +
23006 +       atomic_sub(cachep->size, &vxi->cacct.slab[what]);
23007 +}
23008 +
23009 diff -NurpP --minimal linux-4.9.135/mm/swapfile.c linux-4.9.135-vs2.3.9.8/mm/swapfile.c
23010 --- linux-4.9.135/mm/swapfile.c 2018-10-20 10:39:23.000000000 +0000
23011 +++ linux-4.9.135-vs2.3.9.8/mm/swapfile.c       2018-10-20 05:55:43.000000000 +0000
23012 @@ -39,6 +39,7 @@
23013  #include <asm/tlbflush.h>
23014  #include <linux/swapops.h>
23015  #include <linux/swap_cgroup.h>
23016 +#include <linux/vs_base.h>
23017
23018  static bool swap_count_continued(struct swap_info_struct *, pgoff_t,
23019                                  unsigned char);
23020 @@ -2083,6 +2084,16 @@ static int swap_show(struct seq_file *sw
23021
23022         if (si == SEQ_START_TOKEN) {
23023                 seq_puts(swap,"Filename\t\t\t\tType\t\tSize\tUsed\tPriority\n");
23024 +               if (vx_flags(VXF_VIRT_MEM, 0)) {
23025 +                       struct sysinfo si = { 0 };
23026 +
23027 +                       vx_vsi_swapinfo(&si);
23028 +                       if (si.totalswap < (1 << 10))
23029 +                               return 0;
23030 +                       seq_printf(swap, "%s\t\t\t\t\t%s\t%lu\t%lu\t%d\n",
23031 +                               "hdv0", "partition", si.totalswap >> 10,
23032 +                               (si.totalswap - si.freeswap) >> 10, -1);
23033 +               }
23034                 return 0;
23035         }
23036
23037 @@ -2630,6 +2641,8 @@ void si_swapinfo(struct sysinfo *val)
23038         val->freeswap = atomic_long_read(&nr_swap_pages) + nr_to_be_unused;
23039         val->totalswap = total_swap_pages + nr_to_be_unused;
23040         spin_unlock(&swap_lock);
23041 +       if (vx_flags(VXF_VIRT_MEM, 0))
23042 +               vx_vsi_swapinfo(val);
23043  }
23044
23045  /*
23046 diff -NurpP --minimal linux-4.9.135/net/bridge/br_multicast.c linux-4.9.135-vs2.3.9.8/net/bridge/br_multicast.c
23047 --- linux-4.9.135/net/bridge/br_multicast.c     2016-12-11 19:17:54.000000000 +0000
23048 +++ linux-4.9.135-vs2.3.9.8/net/bridge/br_multicast.c   2018-10-20 04:58:15.000000000 +0000
23049 @@ -465,7 +465,7 @@ static struct sk_buff *br_ip6_multicast_
23050         ip6h->hop_limit = 1;
23051         ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1));
23052         if (ipv6_dev_get_saddr(dev_net(br->dev), br->dev, &ip6h->daddr, 0,
23053 -                              &ip6h->saddr)) {
23054 +                              &ip6h->saddr, NULL)) {
23055                 kfree_skb(skb);
23056                 br->has_ipv6_addr = 0;
23057                 return NULL;
23058 diff -NurpP --minimal linux-4.9.135/net/core/dev.c linux-4.9.135-vs2.3.9.8/net/core/dev.c
23059 --- linux-4.9.135/net/core/dev.c        2018-10-20 10:39:24.000000000 +0000
23060 +++ linux-4.9.135-vs2.3.9.8/net/core/dev.c      2018-10-20 05:55:44.000000000 +0000
23061 @@ -126,6 +126,7 @@
23062  #include <linux/in.h>
23063  #include <linux/jhash.h>
23064  #include <linux/random.h>
23065 +#include <linux/vs_inet.h>
23066  #include <trace/events/napi.h>
23067  #include <trace/events/net.h>
23068  #include <trace/events/skb.h>
23069 @@ -730,7 +731,8 @@ struct net_device *__dev_get_by_name(str
23070         struct hlist_head *head = dev_name_hash(net, name);
23071
23072         hlist_for_each_entry(dev, head, name_hlist)
23073 -               if (!strncmp(dev->name, name, IFNAMSIZ))
23074 +               if (!strncmp(dev->name, name, IFNAMSIZ) &&
23075 +                   nx_dev_visible(current_nx_info(), dev))
23076                         return dev;
23077
23078         return NULL;
23079 @@ -755,7 +757,8 @@ struct net_device *dev_get_by_name_rcu(s
23080         struct hlist_head *head = dev_name_hash(net, name);
23081
23082         hlist_for_each_entry_rcu(dev, head, name_hlist)
23083 -               if (!strncmp(dev->name, name, IFNAMSIZ))
23084 +               if (!strncmp(dev->name, name, IFNAMSIZ) &&
23085 +                   nx_dev_visible(current_nx_info(), dev))
23086                         return dev;
23087
23088         return NULL;
23089 @@ -805,7 +808,8 @@ struct net_device *__dev_get_by_index(st
23090         struct hlist_head *head = dev_index_hash(net, ifindex);
23091
23092         hlist_for_each_entry(dev, head, index_hlist)
23093 -               if (dev->ifindex == ifindex)
23094 +               if ((dev->ifindex == ifindex) &&
23095 +                   nx_dev_visible(current_nx_info(), dev))
23096                         return dev;
23097
23098         return NULL;
23099 @@ -823,7 +827,7 @@ EXPORT_SYMBOL(__dev_get_by_index);
23100   *     about locking. The caller must hold RCU lock.
23101   */
23102
23103 -struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex)
23104 +struct net_device *dev_get_by_index_real_rcu(struct net *net, int ifindex)
23105  {
23106         struct net_device *dev;
23107         struct hlist_head *head = dev_index_hash(net, ifindex);
23108 @@ -834,6 +838,16 @@ struct net_device *dev_get_by_index_rcu(
23109
23110         return NULL;
23111  }
23112 +EXPORT_SYMBOL(dev_get_by_index_real_rcu);
23113 +
23114 +struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex)
23115 +{
23116 +       struct net_device *dev = dev_get_by_index_real_rcu(net, ifindex);
23117 +
23118 +       if (nx_dev_visible(current_nx_info(), dev))
23119 +               return dev;
23120 +       return NULL;
23121 +}
23122  EXPORT_SYMBOL(dev_get_by_index_rcu);
23123
23124
23125 @@ -916,7 +930,8 @@ struct net_device *dev_getbyhwaddr_rcu(s
23126
23127         for_each_netdev_rcu(net, dev)
23128                 if (dev->type == type &&
23129 -                   !memcmp(dev->dev_addr, ha, dev->addr_len))
23130 +                   !memcmp(dev->dev_addr, ha, dev->addr_len) &&
23131 +                   nx_dev_visible(current_nx_info(), dev))
23132                         return dev;
23133
23134         return NULL;
23135 @@ -928,9 +943,11 @@ struct net_device *__dev_getfirstbyhwtyp
23136         struct net_device *dev;
23137
23138         ASSERT_RTNL();
23139 -       for_each_netdev(net, dev)
23140 -               if (dev->type == type)
23141 +       for_each_netdev(net, dev) {
23142 +               if ((dev->type == type) &&
23143 +                   nx_dev_visible(current_nx_info(), dev))
23144                         return dev;
23145 +       }
23146
23147         return NULL;
23148  }
23149 @@ -942,7 +959,8 @@ struct net_device *dev_getfirstbyhwtype(
23150
23151         rcu_read_lock();
23152         for_each_netdev_rcu(net, dev)
23153 -               if (dev->type == type) {
23154 +               if ((dev->type == type) &&
23155 +                   nx_dev_visible(current_nx_info(), dev)) {
23156                         dev_hold(dev);
23157                         ret = dev;
23158                         break;
23159 @@ -972,7 +990,8 @@ struct net_device *__dev_get_by_flags(st
23160
23161         ret = NULL;
23162         for_each_netdev(net, dev) {
23163 -               if (((dev->flags ^ if_flags) & mask) == 0) {
23164 +               if ((((dev->flags ^ if_flags) & mask) == 0) &&
23165 +                       nx_dev_visible(current_nx_info(), dev)) {
23166                         ret = dev;
23167                         break;
23168                 }
23169 @@ -1050,6 +1069,8 @@ static int __dev_alloc_name(struct net *
23170                                 continue;
23171                         if (i < 0 || i >= max_netdevices)
23172                                 continue;
23173 +                       if (!nx_dev_visible(current_nx_info(), d))
23174 +                               continue;
23175
23176                         /*  avoid cases where sscanf is not exact inverse of printf */
23177                         snprintf(buf, IFNAMSIZ, name, i);
23178 diff -NurpP --minimal linux-4.9.135/net/core/net-procfs.c linux-4.9.135-vs2.3.9.8/net/core/net-procfs.c
23179 --- linux-4.9.135/net/core/net-procfs.c 2016-12-11 19:17:54.000000000 +0000
23180 +++ linux-4.9.135-vs2.3.9.8/net/core/net-procfs.c       2018-10-20 04:58:15.000000000 +0000
23181 @@ -1,6 +1,7 @@
23182  #include <linux/netdevice.h>
23183  #include <linux/proc_fs.h>
23184  #include <linux/seq_file.h>
23185 +#include <linux/vs_inet.h>
23186  #include <net/wext.h>
23187
23188  #define BUCKET_SPACE (32 - NETDEV_HASHBITS - 1)
23189 @@ -77,8 +78,13 @@ static void dev_seq_stop(struct seq_file
23190  static void dev_seq_printf_stats(struct seq_file *seq, struct net_device *dev)
23191  {
23192         struct rtnl_link_stats64 temp;
23193 -       const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp);
23194 +       const struct rtnl_link_stats64 *stats;
23195 +
23196 +       /* device visible inside network context? */
23197 +       if (!nx_dev_visible(current_nx_info(), dev))
23198 +               return;
23199
23200 +       stats = dev_get_stats(dev, &temp);
23201         seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
23202                    "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
23203                    dev->name, stats->rx_bytes, stats->rx_packets,
23204 diff -NurpP --minimal linux-4.9.135/net/core/rtnetlink.c linux-4.9.135-vs2.3.9.8/net/core/rtnetlink.c
23205 --- linux-4.9.135/net/core/rtnetlink.c  2018-10-20 10:39:24.000000000 +0000
23206 +++ linux-4.9.135-vs2.3.9.8/net/core/rtnetlink.c        2018-10-20 05:55:44.000000000 +0000
23207 @@ -1615,6 +1615,8 @@ static int rtnl_dump_ifinfo(struct sk_bu
23208                                 goto cont;
23209                         if (idx < s_idx)
23210                                 goto cont;
23211 +                       if (!nx_dev_visible(skb->sk->sk_nx_info, dev))
23212 +                               continue;
23213                         err = rtnl_fill_ifinfo(skb, dev, RTM_NEWLINK,
23214                                                NETLINK_CB(cb->skb).portid,
23215                                                cb->nlh->nlmsg_seq, 0,
23216 @@ -2820,6 +2822,9 @@ void rtmsg_ifinfo(int type, struct net_d
23217  {
23218         struct sk_buff *skb;
23219
23220 +       if (!nx_dev_visible(current_nx_info(), dev))
23221 +               return;
23222 +
23223         if (dev->reg_state != NETREG_REGISTERED)
23224                 return;
23225
23226 diff -NurpP --minimal linux-4.9.135/net/core/sock.c linux-4.9.135-vs2.3.9.8/net/core/sock.c
23227 --- linux-4.9.135/net/core/sock.c       2018-10-20 10:39:24.000000000 +0000
23228 +++ linux-4.9.135-vs2.3.9.8/net/core/sock.c     2018-10-20 04:58:15.000000000 +0000
23229 @@ -135,6 +135,10 @@
23230
23231  #include <linux/filter.h>
23232  #include <net/sock_reuseport.h>
23233 +#include <linux/vs_socket.h>
23234 +#include <linux/vs_limit.h>
23235 +#include <linux/vs_context.h>
23236 +#include <linux/vs_network.h>
23237
23238  #include <trace/events/sock.h>
23239
23240 @@ -1339,6 +1343,8 @@ static struct sock *sk_prot_alloc(struct
23241                         goto out_free_sec;
23242                 sk_tx_queue_clear(sk);
23243         }
23244 +               sock_vx_init(sk);
23245 +               sock_nx_init(sk);
23246
23247         return sk;
23248
23249 @@ -1444,6 +1450,11 @@ static void __sk_destruct(struct rcu_hea
23250         put_pid(sk->sk_peer_pid);
23251         if (likely(sk->sk_net_refcnt))
23252                 put_net(sock_net(sk));
23253 +       vx_sock_dec(sk);
23254 +       clr_vx_info(&sk->sk_vx_info);
23255 +       sk->sk_xid = -1;
23256 +       clr_nx_info(&sk->sk_nx_info);
23257 +       sk->sk_nid = -1;
23258         sk_prot_free(sk->sk_prot_creator, sk);
23259  }
23260
23261 @@ -1498,6 +1509,8 @@ struct sock *sk_clone_lock(const struct
23262                 /* SANITY */
23263                 if (likely(newsk->sk_net_refcnt))
23264                         get_net(sock_net(newsk));
23265 +               sock_vx_init(newsk);
23266 +               sock_nx_init(newsk);
23267                 sk_node_init(&newsk->sk_node);
23268                 sock_lock_init(newsk);
23269                 bh_lock_sock(newsk);
23270 @@ -1568,6 +1581,12 @@ struct sock *sk_clone_lock(const struct
23271                 smp_wmb();
23272                 atomic_set(&newsk->sk_refcnt, 2);
23273
23274 +               set_vx_info(&newsk->sk_vx_info, sk->sk_vx_info);
23275 +               newsk->sk_xid = sk->sk_xid;
23276 +               vx_sock_inc(newsk);
23277 +               set_nx_info(&newsk->sk_nx_info, sk->sk_nx_info);
23278 +               newsk->sk_nid = sk->sk_nid;
23279 +
23280                 /*
23281                  * Increment the counter in the same struct proto as the master
23282                  * sock (sk_refcnt_debug_inc uses newsk->sk_prot->socks, that
23283 @@ -2468,6 +2487,12 @@ void sock_init_data(struct socket *sock,
23284
23285         sk->sk_stamp = ktime_set(-1L, 0);
23286
23287 +       set_vx_info(&sk->sk_vx_info, current_vx_info());
23288 +       sk->sk_xid = vx_current_xid();
23289 +       vx_sock_inc(sk);
23290 +       set_nx_info(&sk->sk_nx_info, current_nx_info());
23291 +       sk->sk_nid = nx_current_nid();
23292 +
23293  #ifdef CONFIG_NET_RX_BUSY_POLL
23294         sk->sk_napi_id          =       0;
23295         sk->sk_ll_usec          =       sysctl_net_busy_read;
23296 diff -NurpP --minimal linux-4.9.135/net/ipv4/af_inet.c linux-4.9.135-vs2.3.9.8/net/ipv4/af_inet.c
23297 --- linux-4.9.135/net/ipv4/af_inet.c    2018-10-20 10:39:24.000000000 +0000
23298 +++ linux-4.9.135-vs2.3.9.8/net/ipv4/af_inet.c  2018-10-20 05:55:44.000000000 +0000
23299 @@ -303,10 +303,15 @@ lookup_protocol:
23300         }
23301
23302         err = -EPERM;
23303 +       if ((protocol == IPPROTO_ICMP) &&
23304 +               nx_capable(CAP_NET_RAW, NXC_RAW_ICMP))
23305 +               goto override;
23306 +
23307         if (sock->type == SOCK_RAW && !kern &&
23308             !ns_capable(net->user_ns, CAP_NET_RAW))
23309                 goto out_rcu_unlock;
23310
23311 +override:
23312         sock->ops = answer->ops;
23313         answer_prot = answer->prot;
23314         answer_flags = answer->flags;
23315 @@ -424,6 +429,7 @@ int inet_bind(struct socket *sock, struc
23316         struct sock *sk = sock->sk;
23317         struct inet_sock *inet = inet_sk(sk);
23318         struct net *net = sock_net(sk);
23319 +       struct nx_v4_sock_addr nsa;
23320         unsigned short snum;
23321         int chk_addr_ret;
23322         u32 tb_id = RT_TABLE_LOCAL;
23323 @@ -449,7 +455,11 @@ int inet_bind(struct socket *sock, struc
23324         }
23325
23326         tb_id = l3mdev_fib_table_by_index(net, sk->sk_bound_dev_if) ? : tb_id;
23327 -       chk_addr_ret = inet_addr_type_table(net, addr->sin_addr.s_addr, tb_id);
23328 +       err = v4_map_sock_addr(inet, addr, &nsa);
23329 +       if (err)
23330 +               goto out;
23331 +
23332 +       chk_addr_ret = inet_addr_type_table(net, nsa.saddr, tb_id);
23333
23334         /* Not specified by any standard per-se, however it breaks too
23335          * many applications when removed.  It is unfortunate since
23336 @@ -461,7 +471,7 @@ int inet_bind(struct socket *sock, struc
23337         err = -EADDRNOTAVAIL;
23338         if (!net->ipv4.sysctl_ip_nonlocal_bind &&
23339             !(inet->freebind || inet->transparent) &&
23340 -           addr->sin_addr.s_addr != htonl(INADDR_ANY) &&
23341 +           nsa.saddr != htonl(INADDR_ANY) &&
23342             chk_addr_ret != RTN_LOCAL &&
23343             chk_addr_ret != RTN_MULTICAST &&
23344             chk_addr_ret != RTN_BROADCAST)
23345 @@ -487,7 +497,7 @@ int inet_bind(struct socket *sock, struc
23346         if (sk->sk_state != TCP_CLOSE || inet->inet_num)
23347                 goto out_release_sock;
23348
23349 -       inet->inet_rcv_saddr = inet->inet_saddr = addr->sin_addr.s_addr;
23350 +       v4_set_sock_addr(inet, &nsa);
23351         if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)
23352                 inet->inet_saddr = 0;  /* Use device */
23353
23354 @@ -706,11 +716,13 @@ int inet_getname(struct socket *sock, st
23355                      peer == 1))
23356                         return -ENOTCONN;
23357                 sin->sin_port = inet->inet_dport;
23358 -               sin->sin_addr.s_addr = inet->inet_daddr;
23359 +               sin->sin_addr.s_addr =
23360 +                       nx_map_sock_lback(sk->sk_nx_info, inet->inet_daddr);
23361         } else {
23362                 __be32 addr = inet->inet_rcv_saddr;
23363                 if (!addr)
23364                         addr = inet->inet_saddr;
23365 +               addr = nx_map_sock_lback(sk->sk_nx_info, addr);
23366                 sin->sin_port = inet->inet_sport;
23367                 sin->sin_addr.s_addr = addr;
23368         }
23369 @@ -894,6 +906,7 @@ static int inet_compat_ioctl(struct sock
23370         return err;
23371  }
23372  #endif
23373 +#include <linux/vs_limit.h>
23374
23375  const struct proto_ops inet_stream_ops = {
23376         .family            = PF_INET,
23377 diff -NurpP --minimal linux-4.9.135/net/ipv4/arp.c linux-4.9.135-vs2.3.9.8/net/ipv4/arp.c
23378 --- linux-4.9.135/net/ipv4/arp.c        2018-10-20 10:39:24.000000000 +0000
23379 +++ linux-4.9.135-vs2.3.9.8/net/ipv4/arp.c      2018-10-20 04:58:15.000000000 +0000
23380 @@ -1320,6 +1320,7 @@ static void arp_format_neigh_entry(struc
23381         struct net_device *dev = n->dev;
23382         int hatype = dev->type;
23383
23384 +       /* FIXME: check for network context */
23385         read_lock(&n->lock);
23386         /* Convert hardware address to XX:XX:XX:XX ... form. */
23387  #if IS_ENABLED(CONFIG_AX25)
23388 @@ -1351,6 +1352,7 @@ static void arp_format_pneigh_entry(stru
23389         int hatype = dev ? dev->type : 0;
23390         char tbuf[16];
23391
23392 +       /* FIXME: check for network context */
23393         sprintf(tbuf, "%pI4", n->key);
23394         seq_printf(seq, "%-16s 0x%-10x0x%-10x%s     *        %s\n",
23395                    tbuf, hatype, ATF_PUBL | ATF_PERM, "00:00:00:00:00:00",
23396 diff -NurpP --minimal linux-4.9.135/net/ipv4/devinet.c linux-4.9.135-vs2.3.9.8/net/ipv4/devinet.c
23397 --- linux-4.9.135/net/ipv4/devinet.c    2018-10-20 10:39:24.000000000 +0000
23398 +++ linux-4.9.135-vs2.3.9.8/net/ipv4/devinet.c  2018-10-20 04:58:15.000000000 +0000
23399 @@ -538,6 +538,7 @@ struct in_device *inetdev_by_index(struc
23400  }
23401  EXPORT_SYMBOL(inetdev_by_index);
23402
23403 +
23404  /* Called only from RTNL semaphored context. No locks. */
23405
23406  struct in_ifaddr *inet_ifa_byprefix(struct in_device *in_dev, __be32 prefix,
23407 @@ -992,6 +993,8 @@ int devinet_ioctl(struct net *net, unsig
23408
23409         in_dev = __in_dev_get_rtnl(dev);
23410         if (in_dev) {
23411 +               struct nx_info *nxi = current_nx_info();
23412 +
23413                 if (tryaddrmatch) {
23414                         /* Matthias Andree */
23415                         /* compare label and address (4.4BSD style) */
23416 @@ -1000,6 +1003,8 @@ int devinet_ioctl(struct net *net, unsig
23417                            This is checked above. */
23418                         for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL;
23419                              ifap = &ifa->ifa_next) {
23420 +                               if (!nx_v4_ifa_visible(nxi, ifa))
23421 +                                       continue;
23422                                 if (!strcmp(ifr.ifr_name, ifa->ifa_label) &&
23423                                     sin_orig.sin_addr.s_addr ==
23424                                                         ifa->ifa_local) {
23425 @@ -1012,9 +1017,12 @@ int devinet_ioctl(struct net *net, unsig
23426                    comparing just the label */
23427                 if (!ifa) {
23428                         for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL;
23429 -                            ifap = &ifa->ifa_next)
23430 +                            ifap = &ifa->ifa_next) {
23431 +                               if (!nx_v4_ifa_visible(nxi, ifa))
23432 +                                       continue;
23433                                 if (!strcmp(ifr.ifr_name, ifa->ifa_label))
23434                                         break;
23435 +                       }
23436                 }
23437         }
23438
23439 @@ -1168,6 +1176,8 @@ static int inet_gifconf(struct net_devic
23440                 goto out;
23441
23442         for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) {
23443 +               if (!nx_v4_ifa_visible(current_nx_info(), ifa))
23444 +                       continue;
23445                 if (!buf) {
23446                         done += sizeof(ifr);
23447                         continue;
23448 @@ -1595,6 +1605,7 @@ static int inet_dump_ifaddr(struct sk_bu
23449         struct net_device *dev;
23450         struct in_device *in_dev;
23451         struct in_ifaddr *ifa;
23452 +       struct sock *sk = skb->sk;
23453         struct hlist_head *head;
23454
23455         s_h = cb->args[0];
23456 @@ -1618,6 +1629,8 @@ static int inet_dump_ifaddr(struct sk_bu
23457
23458                         for (ifa = in_dev->ifa_list, ip_idx = 0; ifa;
23459                              ifa = ifa->ifa_next, ip_idx++) {
23460 +                       if (sk && !nx_v4_ifa_visible(sk->sk_nx_info, ifa))
23461 +                               continue;
23462                                 if (ip_idx < s_ip_idx)
23463                                         continue;
23464                                 if (inet_fill_ifaddr(skb, ifa,
23465 diff -NurpP --minimal linux-4.9.135/net/ipv4/fib_trie.c linux-4.9.135-vs2.3.9.8/net/ipv4/fib_trie.c
23466 --- linux-4.9.135/net/ipv4/fib_trie.c   2018-10-20 10:39:24.000000000 +0000
23467 +++ linux-4.9.135-vs2.3.9.8/net/ipv4/fib_trie.c 2018-10-20 04:58:15.000000000 +0000
23468 @@ -2617,6 +2617,7 @@ static int fib_route_seq_show(struct seq
23469
23470                 seq_setwidth(seq, 127);
23471
23472 +               /* FIXME: check for network context? */
23473                 if (fi)
23474                         seq_printf(seq,
23475                                    "%s\t%08X\t%08X\t%04X\t%d\t%u\t"
23476 diff -NurpP --minimal linux-4.9.135/net/ipv4/inet_connection_sock.c linux-4.9.135-vs2.3.9.8/net/ipv4/inet_connection_sock.c
23477 --- linux-4.9.135/net/ipv4/inet_connection_sock.c       2018-10-20 10:39:24.000000000 +0000
23478 +++ linux-4.9.135-vs2.3.9.8/net/ipv4/inet_connection_sock.c     2018-10-20 05:55:44.000000000 +0000
23479 @@ -16,6 +16,7 @@
23480  #include <linux/module.h>
23481  #include <linux/jhash.h>
23482
23483 +#include <net/addrconf.h>
23484  #include <net/inet_connection_sock.h>
23485  #include <net/inet_hashtables.h>
23486  #include <net/inet_timewait_sock.h>
23487 @@ -44,6 +45,7 @@ void inet_get_local_port_range(struct ne
23488  }
23489  EXPORT_SYMBOL(inet_get_local_port_range);
23490
23491 +
23492  int inet_csk_bind_conflict(const struct sock *sk,
23493                            const struct inet_bind_bucket *tb, bool relax)
23494  {
23495 @@ -72,15 +74,13 @@ int inet_csk_bind_conflict(const struct
23496                              (sk2->sk_state != TCP_TIME_WAIT &&
23497                              !uid_eq(uid, sock_i_uid(sk2))))) {
23498
23499 -                               if (!sk2->sk_rcv_saddr || !sk->sk_rcv_saddr ||
23500 -                                   sk2->sk_rcv_saddr == sk->sk_rcv_saddr)
23501 +                               if (ipv4_rcv_saddr_equal(sk, sk2, true))
23502                                         break;
23503                         }
23504                         if (!relax && reuse && sk2->sk_reuse &&
23505                             sk2->sk_state != TCP_LISTEN) {
23506
23507 -                               if (!sk2->sk_rcv_saddr || !sk->sk_rcv_saddr ||
23508 -                                   sk2->sk_rcv_saddr == sk->sk_rcv_saddr)
23509 +                               if (ipv4_rcv_saddr_equal(sk, sk2, true))
23510                                         break;
23511                         }
23512                 }
23513 diff -NurpP --minimal linux-4.9.135/net/ipv4/inet_diag.c linux-4.9.135-vs2.3.9.8/net/ipv4/inet_diag.c
23514 --- linux-4.9.135/net/ipv4/inet_diag.c  2016-12-11 19:17:54.000000000 +0000
23515 +++ linux-4.9.135-vs2.3.9.8/net/ipv4/inet_diag.c        2018-10-20 06:33:52.000000000 +0000
23516 @@ -31,6 +31,8 @@
23517
23518  #include <linux/inet.h>
23519  #include <linux/stddef.h>
23520 +#include <linux/vs_network.h>
23521 +#include <linux/vs_inet.h>
23522
23523  #include <linux/inet_diag.h>
23524  #include <linux/sock_diag.h>
23525 @@ -87,8 +89,8 @@ void inet_diag_msg_common_fill(struct in
23526         memset(&r->id.idiag_src, 0, sizeof(r->id.idiag_src));
23527         memset(&r->id.idiag_dst, 0, sizeof(r->id.idiag_dst));
23528
23529 -       r->id.idiag_src[0] = sk->sk_rcv_saddr;
23530 -       r->id.idiag_dst[0] = sk->sk_daddr;
23531 +       r->id.idiag_src[0] = nx_map_sock_lback(sk->sk_nx_info, sk->sk_rcv_saddr);
23532 +       r->id.idiag_dst[0] = nx_map_sock_lback(sk->sk_nx_info, sk->sk_daddr);
23533         }
23534  }
23535  EXPORT_SYMBOL_GPL(inet_diag_msg_common_fill);
23536 @@ -879,6 +881,9 @@ void inet_diag_dump_icsk(struct inet_has
23537                                 if (!net_eq(sock_net(sk), net))
23538                                         continue;
23539
23540 +                               if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
23541 +                                       continue;
23542 +
23543                                 if (num < s_num) {
23544                                         num++;
23545                                         continue;
23546 @@ -941,6 +946,8 @@ skip_listen_ht:
23547
23548                         if (!net_eq(sock_net(sk), net))
23549                                 continue;
23550 +                       if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
23551 +                               continue;
23552                         if (num < s_num)
23553                                 goto next_normal;
23554                         state = (sk->sk_state == TCP_TIME_WAIT) ?
23555 diff -NurpP --minimal linux-4.9.135/net/ipv4/inet_hashtables.c linux-4.9.135-vs2.3.9.8/net/ipv4/inet_hashtables.c
23556 --- linux-4.9.135/net/ipv4/inet_hashtables.c    2018-10-20 10:39:24.000000000 +0000
23557 +++ linux-4.9.135-vs2.3.9.8/net/ipv4/inet_hashtables.c  2018-10-20 04:58:15.000000000 +0000
23558 @@ -24,6 +24,7 @@
23559  #include <net/inet_connection_sock.h>
23560  #include <net/inet_hashtables.h>
23561  #include <net/secure_seq.h>
23562 +#include <net/route.h>
23563  #include <net/ip.h>
23564  #include <net/tcp.h>
23565  #include <net/sock_reuseport.h>
23566 @@ -186,6 +187,11 @@ static inline int compute_score(struct s
23567                         if (rcv_saddr != daddr)
23568                                 return -1;
23569                         score += 4;
23570 +               } else {
23571 +                       /* block non nx_info ips */
23572 +                       if (!v4_addr_in_nx_info(sk->sk_nx_info,
23573 +                               daddr, NXA_MASK_BIND))
23574 +                               return -1;
23575                 }
23576                 if (sk->sk_bound_dev_if || exact_dif) {
23577                         if (sk->sk_bound_dev_if != dif)
23578 @@ -300,6 +306,7 @@ begin:
23579                         goto found;
23580                 }
23581         }
23582 +
23583         /*
23584          * if the nulls value we got at the end of this lookup is
23585          * not the expected one, we must restart lookup.
23586 diff -NurpP --minimal linux-4.9.135/net/ipv4/netfilter.c linux-4.9.135-vs2.3.9.8/net/ipv4/netfilter.c
23587 --- linux-4.9.135/net/ipv4/netfilter.c  2018-10-20 10:39:24.000000000 +0000
23588 +++ linux-4.9.135-vs2.3.9.8/net/ipv4/netfilter.c        2018-10-20 04:58:15.000000000 +0000
23589 @@ -11,7 +11,7 @@
23590  #include <linux/skbuff.h>
23591  #include <linux/gfp.h>
23592  #include <linux/export.h>
23593 -#include <net/route.h>
23594 +// #include <net/route.h>
23595  #include <net/xfrm.h>
23596  #include <net/ip.h>
23597  #include <net/netfilter/nf_queue.h>
23598 diff -NurpP --minimal linux-4.9.135/net/ipv4/raw.c linux-4.9.135-vs2.3.9.8/net/ipv4/raw.c
23599 --- linux-4.9.135/net/ipv4/raw.c        2018-10-20 10:39:25.000000000 +0000
23600 +++ linux-4.9.135-vs2.3.9.8/net/ipv4/raw.c      2018-10-20 04:58:15.000000000 +0000
23601 @@ -128,7 +128,7 @@ static struct sock *__raw_v4_lookup(stru
23602
23603                 if (net_eq(sock_net(sk), net) && inet->inet_num == num  &&
23604                     !(inet->inet_daddr && inet->inet_daddr != raddr)    &&
23605 -                   !(inet->inet_rcv_saddr && inet->inet_rcv_saddr != laddr) &&
23606 +                   v4_sock_addr_match(sk->sk_nx_info, inet, laddr)     &&
23607                     !(sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif))
23608                         goto found; /* gotcha */
23609         }
23610 @@ -418,6 +418,12 @@ static int raw_send_hdrinc(struct sock *
23611                                 skb_transport_header(skb))->type);
23612         }
23613
23614 +       err = -EPERM;
23615 +       if (!nx_check(0, VS_ADMIN) && !capable(CAP_NET_RAW) &&
23616 +               sk->sk_nx_info &&
23617 +               !v4_addr_in_nx_info(sk->sk_nx_info, iph->saddr, NXA_MASK_BIND))
23618 +               goto error_free;
23619 +
23620         err = NF_HOOK(NFPROTO_IPV4, NF_INET_LOCAL_OUT,
23621                       net, sk, skb, NULL, rt->dst.dev,
23622                       dst_output);
23623 @@ -623,6 +629,16 @@ static int raw_sendmsg(struct sock *sk,
23624                         goto done;
23625         }
23626
23627 +       if (sk->sk_nx_info) {
23628 +               rt = ip_v4_find_src(sock_net(sk), sk->sk_nx_info, &fl4);
23629 +               if (IS_ERR(rt)) {
23630 +                       err = PTR_ERR(rt);
23631 +                       rt = NULL;
23632 +                       goto done;
23633 +               }
23634 +               ip_rt_put(rt);
23635 +       }
23636 +
23637         security_sk_classify_flow(sk, flowi4_to_flowi(&fl4));
23638         rt = ip_route_output_flow(net, &fl4, sk);
23639         if (IS_ERR(rt)) {
23640 @@ -701,17 +717,19 @@ static int raw_bind(struct sock *sk, str
23641  {
23642         struct inet_sock *inet = inet_sk(sk);
23643         struct sockaddr_in *addr = (struct sockaddr_in *) uaddr;
23644 +       struct nx_v4_sock_addr nsa = { 0 };
23645         int ret = -EINVAL;
23646         int chk_addr_ret;
23647
23648         if (sk->sk_state != TCP_CLOSE || addr_len < sizeof(struct sockaddr_in))
23649                 goto out;
23650 -       chk_addr_ret = inet_addr_type(sock_net(sk), addr->sin_addr.s_addr);
23651 +       v4_map_sock_addr(inet, addr, &nsa);
23652 +       chk_addr_ret = inet_addr_type(sock_net(sk), nsa.saddr);
23653         ret = -EADDRNOTAVAIL;
23654 -       if (addr->sin_addr.s_addr && chk_addr_ret != RTN_LOCAL &&
23655 +       if (nsa.saddr && chk_addr_ret != RTN_LOCAL &&
23656             chk_addr_ret != RTN_MULTICAST && chk_addr_ret != RTN_BROADCAST)
23657                 goto out;
23658 -       inet->inet_rcv_saddr = inet->inet_saddr = addr->sin_addr.s_addr;
23659 +       v4_set_sock_addr(inet, &nsa);
23660         if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)
23661                 inet->inet_saddr = 0;  /* Use device */
23662         sk_dst_reset(sk);
23663 @@ -760,7 +778,8 @@ static int raw_recvmsg(struct sock *sk,
23664         /* Copy the address. */
23665         if (sin) {
23666                 sin->sin_family = AF_INET;
23667 -               sin->sin_addr.s_addr = ip_hdr(skb)->saddr;
23668 +               sin->sin_addr.s_addr =
23669 +                       nx_map_sock_lback(sk->sk_nx_info, ip_hdr(skb)->saddr);
23670                 sin->sin_port = 0;
23671                 memset(&sin->sin_zero, 0, sizeof(sin->sin_zero));
23672                 *addr_len = sizeof(*sin);
23673 @@ -956,7 +975,8 @@ static struct sock *raw_get_first(struct
23674         for (state->bucket = 0; state->bucket < RAW_HTABLE_SIZE;
23675                         ++state->bucket) {
23676                 sk_for_each(sk, &state->h->ht[state->bucket])
23677 -                       if (sock_net(sk) == seq_file_net(seq))
23678 +                       if ((sock_net(sk) == seq_file_net(seq)) &&
23679 +                           nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
23680                                 goto found;
23681         }
23682         sk = NULL;
23683 @@ -972,7 +992,8 @@ static struct sock *raw_get_next(struct
23684                 sk = sk_next(sk);
23685  try_again:
23686                 ;
23687 -       } while (sk && sock_net(sk) != seq_file_net(seq));
23688 +       } while (sk && ((sock_net(sk) != seq_file_net(seq)) ||
23689 +               !nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)));
23690
23691         if (!sk && ++state->bucket < RAW_HTABLE_SIZE) {
23692                 sk = sk_head(&state->h->ht[state->bucket]);
23693 diff -NurpP --minimal linux-4.9.135/net/ipv4/route.c linux-4.9.135-vs2.3.9.8/net/ipv4/route.c
23694 --- linux-4.9.135/net/ipv4/route.c      2018-10-20 10:39:25.000000000 +0000
23695 +++ linux-4.9.135-vs2.3.9.8/net/ipv4/route.c    2018-10-20 04:58:15.000000000 +0000
23696 @@ -2250,7 +2250,7 @@ struct rtable *__ip_route_output_key_has
23697
23698
23699         if (fl4->flowi4_oif) {
23700 -               dev_out = dev_get_by_index_rcu(net, fl4->flowi4_oif);
23701 +               dev_out = dev_get_by_index_real_rcu(net, fl4->flowi4_oif);
23702                 rth = ERR_PTR(-ENODEV);
23703                 if (!dev_out)
23704                         goto out;
23705 diff -NurpP --minimal linux-4.9.135/net/ipv4/tcp.c linux-4.9.135-vs2.3.9.8/net/ipv4/tcp.c
23706 --- linux-4.9.135/net/ipv4/tcp.c        2018-10-20 10:39:25.000000000 +0000
23707 +++ linux-4.9.135-vs2.3.9.8/net/ipv4/tcp.c      2018-10-20 05:55:44.000000000 +0000
23708 @@ -269,6 +269,7 @@
23709  #include <linux/err.h>
23710  #include <linux/time.h>
23711  #include <linux/slab.h>
23712 +#include <linux/in.h>
23713
23714  #include <net/icmp.h>
23715  #include <net/inet_common.h>
23716 diff -NurpP --minimal linux-4.9.135/net/ipv4/tcp_ipv4.c linux-4.9.135-vs2.3.9.8/net/ipv4/tcp_ipv4.c
23717 --- linux-4.9.135/net/ipv4/tcp_ipv4.c   2018-10-20 10:39:25.000000000 +0000
23718 +++ linux-4.9.135-vs2.3.9.8/net/ipv4/tcp_ipv4.c 2018-10-20 05:55:44.000000000 +0000
23719 @@ -1933,8 +1933,12 @@ get_head:
23720         sk = sk_next(sk);
23721  get_sk:
23722         sk_for_each_from(sk) {
23723 +               vxdprintk(VXD_CBIT(net, 6), "sk: %p [#%d] (from %d)",
23724 +                       sk, sk->sk_nid, nx_current_nid());
23725                 if (!net_eq(sock_net(sk), net))
23726                         continue;
23727 +               if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
23728 +                       continue;
23729                 if (sk->sk_family == st->family)
23730                         return sk;
23731         }
23732 @@ -1988,6 +1992,11 @@ static void *established_get_first(struc
23733
23734                 spin_lock_bh(lock);
23735                 sk_nulls_for_each(sk, node, &tcp_hashinfo.ehash[st->bucket].chain) {
23736 +                       vxdprintk(VXD_CBIT(net, 6),
23737 +                               "sk,egf: %p [#%d] (from %d)",
23738 +                               sk, sk->sk_nid, nx_current_nid());
23739 +                       if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
23740 +                               continue;
23741                         if (sk->sk_family != st->family ||
23742                             !net_eq(sock_net(sk), net)) {
23743                                 continue;
23744 @@ -2014,6 +2023,11 @@ static void *established_get_next(struct
23745         sk = sk_nulls_next(sk);
23746
23747         sk_nulls_for_each_from(sk, node) {
23748 +               vxdprintk(VXD_CBIT(net, 6),
23749 +                       "sk,egn: %p [#%d] (from %d)",
23750 +                       sk, sk->sk_nid, nx_current_nid());
23751 +               if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
23752 +                       continue;
23753                 if (sk->sk_family == st->family && net_eq(sock_net(sk), net))
23754                         return sk;
23755         }
23756 @@ -2205,9 +2219,9 @@ static void get_openreq4(const struct re
23757         seq_printf(f, "%4d: %08X:%04X %08X:%04X"
23758                 " %02X %08X:%08X %02X:%08lX %08X %5u %8d %u %d %pK",
23759                 i,
23760 -               ireq->ir_loc_addr,
23761 +               nx_map_sock_lback(current_nx_info(), ireq->ir_loc_addr),
23762                 ireq->ir_num,
23763 -               ireq->ir_rmt_addr,
23764 +               nx_map_sock_lback(current_nx_info(), ireq->ir_rmt_addr),
23765                 ntohs(ireq->ir_rmt_port),
23766                 TCP_SYN_RECV,
23767                 0, 0, /* could print option size, but that is af dependent. */
23768 @@ -2230,8 +2244,8 @@ static void get_tcp4_sock(struct sock *s
23769         const struct inet_connection_sock *icsk = inet_csk(sk);
23770         const struct inet_sock *inet = inet_sk(sk);
23771         const struct fastopen_queue *fastopenq = &icsk->icsk_accept_queue.fastopenq;
23772 -       __be32 dest = inet->inet_daddr;
23773 -       __be32 src = inet->inet_rcv_saddr;
23774 +       __be32 dest = nx_map_sock_lback(current_nx_info(), inet->inet_daddr);
23775 +       __be32 src = nx_map_sock_lback(current_nx_info(), inet->inet_rcv_saddr);
23776         __u16 destp = ntohs(inet->inet_dport);
23777         __u16 srcp = ntohs(inet->inet_sport);
23778         int rx_queue;
23779 @@ -2290,8 +2304,8 @@ static void get_timewait4_sock(const str
23780         __be32 dest, src;
23781         __u16 destp, srcp;
23782
23783 -       dest  = tw->tw_daddr;
23784 -       src   = tw->tw_rcv_saddr;
23785 +       dest  = nx_map_sock_lback(current_nx_info(), tw->tw_daddr);
23786 +       src   = nx_map_sock_lback(current_nx_info(), tw->tw_rcv_saddr);
23787         destp = ntohs(tw->tw_dport);
23788         srcp  = ntohs(tw->tw_sport);
23789
23790 diff -NurpP --minimal linux-4.9.135/net/ipv4/tcp_minisocks.c linux-4.9.135-vs2.3.9.8/net/ipv4/tcp_minisocks.c
23791 --- linux-4.9.135/net/ipv4/tcp_minisocks.c      2018-10-20 10:39:25.000000000 +0000
23792 +++ linux-4.9.135-vs2.3.9.8/net/ipv4/tcp_minisocks.c    2018-10-20 05:55:44.000000000 +0000
23793 @@ -23,6 +23,9 @@
23794  #include <linux/slab.h>
23795  #include <linux/sysctl.h>
23796  #include <linux/workqueue.h>
23797 +#include <linux/vs_limit.h>
23798 +#include <linux/vs_socket.h>
23799 +#include <linux/vs_context.h>
23800  #include <net/tcp.h>
23801  #include <net/inet_common.h>
23802  #include <net/xfrm.h>
23803 @@ -286,6 +289,11 @@ void tcp_time_wait(struct sock *sk, int
23804                 tcptw->tw_ts_offset     = tp->tsoffset;
23805                 tcptw->tw_last_oow_ack_time = 0;
23806
23807 +               tw->tw_xid              = sk->sk_xid;
23808 +               tw->tw_vx_info          = NULL;
23809 +               tw->tw_nid              = sk->sk_nid;
23810 +               tw->tw_nx_info          = NULL;
23811 +
23812  #if IS_ENABLED(CONFIG_IPV6)
23813                 if (tw->tw_family == PF_INET6) {
23814                         struct ipv6_pinfo *np = inet6_sk(sk);
23815 diff -NurpP --minimal linux-4.9.135/net/ipv4/udp.c linux-4.9.135-vs2.3.9.8/net/ipv4/udp.c
23816 --- linux-4.9.135/net/ipv4/udp.c        2018-10-20 10:39:25.000000000 +0000
23817 +++ linux-4.9.135-vs2.3.9.8/net/ipv4/udp.c      2018-10-20 05:55:44.000000000 +0000
23818 @@ -361,12 +361,26 @@ int ipv4_rcv_saddr_equal(const struct so
23819                          bool match_wildcard)
23820  {
23821         struct inet_sock *inet1 = inet_sk(sk1), *inet2 = inet_sk(sk2);
23822 +       __be32  sk1_rcv_saddr = inet1->inet_rcv_saddr,
23823 +               sk2_rcv_saddr = inet2->inet_rcv_saddr;
23824
23825 -       if (!ipv6_only_sock(sk2)) {
23826 -               if (inet1->inet_rcv_saddr == inet2->inet_rcv_saddr)
23827 -                       return 1;
23828 -               if (!inet1->inet_rcv_saddr || !inet2->inet_rcv_saddr)
23829 -                       return match_wildcard;
23830 +       if (ipv6_only_sock(sk2))
23831 +               return 0;
23832 +
23833 +       if (sk1_rcv_saddr && sk2_rcv_saddr && sk1_rcv_saddr == sk2_rcv_saddr)
23834 +               return 1;
23835 +
23836 +       if (match_wildcard) {
23837 +               if (!sk2_rcv_saddr && !sk1_rcv_saddr)
23838 +                       return nx_v4_addr_conflict(sk1->sk_nx_info, sk2->sk_nx_info);
23839 +
23840 +               if (!sk2_rcv_saddr && sk1_rcv_saddr)
23841 +                       return v4_addr_in_nx_info(sk2->sk_nx_info,
23842 +                               sk1_rcv_saddr, NXA_MASK_BIND);
23843 +
23844 +               if (!sk1_rcv_saddr && sk2_rcv_saddr)
23845 +                       return v4_addr_in_nx_info(sk1->sk_nx_info,
23846 +                               sk2_rcv_saddr, NXA_MASK_BIND);
23847         }
23848         return 0;
23849  }
23850 @@ -408,6 +422,11 @@ static int compute_score(struct sock *sk
23851                 if (inet->inet_rcv_saddr != daddr)
23852                         return -1;
23853                 score += 4;
23854 +               } else {
23855 +                       /* block non nx_info ips */
23856 +                       if (!v4_addr_in_nx_info(sk->sk_nx_info,
23857 +                               daddr, NXA_MASK_BIND))
23858 +                               return -1;
23859         }
23860
23861         if (inet->inet_daddr) {
23862 @@ -483,6 +502,7 @@ static struct sock *udp4_lib_lookup2(str
23863         return result;
23864  }
23865
23866 +
23867  /* UDP is nearly always wildcards out the wazoo, it makes no sense to try
23868   * harder than this. -DaveM
23869   */
23870 @@ -603,7 +623,7 @@ static inline bool __udp_is_mcast_sock(s
23871             udp_sk(sk)->udp_port_hash != hnum ||
23872             (inet->inet_daddr && inet->inet_daddr != rmt_addr) ||
23873             (inet->inet_dport != rmt_port && inet->inet_dport) ||
23874 -           (inet->inet_rcv_saddr && inet->inet_rcv_saddr != loc_addr) ||
23875 +           !v4_sock_addr_match(sk->sk_nx_info, inet, loc_addr) ||
23876             ipv6_only_sock(sk) ||
23877             (sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif))
23878                 return false;
23879 @@ -1020,6 +1040,16 @@ int udp_sendmsg(struct sock *sk, struct
23880                                    flow_flags,
23881                                    faddr, saddr, dport, inet->inet_sport);
23882
23883 +               if (sk->sk_nx_info) {
23884 +                       rt = ip_v4_find_src(net, sk->sk_nx_info, fl4);
23885 +                       if (IS_ERR(rt)) {
23886 +                               err = PTR_ERR(rt);
23887 +                               rt = NULL;
23888 +                               goto out;
23889 +                       }
23890 +                       ip_rt_put(rt);
23891 +               }
23892 +
23893                 security_sk_classify_flow(sk, flowi4_to_flowi(fl4));
23894                 rt = ip_route_output_flow(net, fl4, sk);
23895                 if (IS_ERR(rt)) {
23896 @@ -1317,7 +1347,8 @@ try_again:
23897         if (sin) {
23898                 sin->sin_family = AF_INET;
23899                 sin->sin_port = udp_hdr(skb)->source;
23900 -               sin->sin_addr.s_addr = ip_hdr(skb)->saddr;
23901 +               sin->sin_addr.s_addr = nx_map_sock_lback(
23902 +                       skb->sk->sk_nx_info, ip_hdr(skb)->saddr);
23903                 memset(sin->sin_zero, 0, sizeof(sin->sin_zero));
23904                 *addr_len = sizeof(*sin);
23905         }
23906 @@ -2271,6 +2302,8 @@ static struct sock *udp_get_first(struct
23907                 sk_for_each(sk, &hslot->head) {
23908                         if (!net_eq(sock_net(sk), net))
23909                                 continue;
23910 +                       if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
23911 +                               continue;
23912                         if (sk->sk_family == state->family)
23913                                 goto found;
23914                 }
23915 @@ -2288,7 +2321,9 @@ static struct sock *udp_get_next(struct
23916
23917         do {
23918                 sk = sk_next(sk);
23919 -       } while (sk && (!net_eq(sock_net(sk), net) || sk->sk_family != state->family));
23920 +       } while (sk && (!net_eq(sock_net(sk), net) ||
23921 +               sk->sk_family != state->family ||
23922 +               !nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)));
23923
23924         if (!sk) {
23925                 if (state->bucket <= state->udp_table->mask)
23926 @@ -2384,8 +2419,8 @@ static void udp4_format_sock(struct sock
23927                 int bucket)
23928  {
23929         struct inet_sock *inet = inet_sk(sp);
23930 -       __be32 dest = inet->inet_daddr;
23931 -       __be32 src  = inet->inet_rcv_saddr;
23932 +       __be32 dest = nx_map_sock_lback(current_nx_info(), inet->inet_daddr);
23933 +       __be32 src = nx_map_sock_lback(current_nx_info(), inet->inet_rcv_saddr);
23934         __u16 destp       = ntohs(inet->inet_dport);
23935         __u16 srcp        = ntohs(inet->inet_sport);
23936
23937 diff -NurpP --minimal linux-4.9.135/net/ipv4/udp_diag.c linux-4.9.135-vs2.3.9.8/net/ipv4/udp_diag.c
23938 --- linux-4.9.135/net/ipv4/udp_diag.c   2016-12-11 19:17:54.000000000 +0000
23939 +++ linux-4.9.135-vs2.3.9.8/net/ipv4/udp_diag.c 2018-10-20 06:31:18.000000000 +0000
23940 @@ -120,6 +120,8 @@ static void udp_dump(struct udp_table *t
23941
23942                         if (!net_eq(sock_net(sk), net))
23943                                 continue;
23944 +                       if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
23945 +                               continue;
23946                         if (num < s_num)
23947                                 goto next;
23948                         if (!(r->idiag_states & (1 << sk->sk_state)))
23949 diff -NurpP --minimal linux-4.9.135/net/ipv6/addrconf.c linux-4.9.135-vs2.3.9.8/net/ipv6/addrconf.c
23950 --- linux-4.9.135/net/ipv6/addrconf.c   2018-10-20 10:39:25.000000000 +0000
23951 +++ linux-4.9.135-vs2.3.9.8/net/ipv6/addrconf.c 2018-10-20 05:55:44.000000000 +0000
23952 @@ -92,6 +92,7 @@
23953  #include <linux/proc_fs.h>
23954  #include <linux/seq_file.h>
23955  #include <linux/export.h>
23956 +#include <linux/vs_network.h>
23957
23958  /* Set to 3 to get tracing... */
23959  #define ACONF_DEBUG 2
23960 @@ -1497,7 +1498,8 @@ static int __ipv6_dev_get_saddr(struct n
23961                                 struct ipv6_saddr_dst *dst,
23962                                 struct inet6_dev *idev,
23963                                 struct ipv6_saddr_score *scores,
23964 -                               int hiscore_idx)
23965 +                               int hiscore_idx,
23966 +                               struct nx_info *nxi)
23967  {
23968         struct ipv6_saddr_score *score = &scores[1 - hiscore_idx], *hiscore = &scores[hiscore_idx];
23969
23970 @@ -1527,6 +1529,8 @@ static int __ipv6_dev_get_saddr(struct n
23971                                             idev->dev->name);
23972                         continue;
23973                 }
23974 +               if (!v6_addr_in_nx_info(nxi, &score->ifa->addr, -1))
23975 +                       continue;
23976
23977                 score->rule = -1;
23978                 bitmap_zero(score->scorebits, IPV6_SADDR_RULE_MAX);
23979 @@ -1577,26 +1581,27 @@ static int ipv6_get_saddr_master(struct
23980                                  const struct net_device *master,
23981                                  struct ipv6_saddr_dst *dst,
23982                                  struct ipv6_saddr_score *scores,
23983 -                                int hiscore_idx)
23984 +                                int hiscore_idx,
23985 +                                struct nx_info *nxi)
23986  {
23987         struct inet6_dev *idev;
23988
23989         idev = __in6_dev_get(dst_dev);
23990         if (idev)
23991 -               hiscore_idx = __ipv6_dev_get_saddr(net, dst, idev,
23992 -                                                  scores, hiscore_idx);
23993 +               hiscore_idx = __ipv6_dev_get_saddr(net, dst,
23994 +                       idev, scores, hiscore_idx, nxi);
23995
23996         idev = __in6_dev_get(master);
23997         if (idev)
23998 -               hiscore_idx = __ipv6_dev_get_saddr(net, dst, idev,
23999 -                                                  scores, hiscore_idx);
24000 +               hiscore_idx = __ipv6_dev_get_saddr(net, dst,
24001 +                       idev, scores, hiscore_idx, nxi);
24002
24003         return hiscore_idx;
24004  }
24005
24006  int ipv6_dev_get_saddr(struct net *net, const struct net_device *dst_dev,
24007                        const struct in6_addr *daddr, unsigned int prefs,
24008 -                      struct in6_addr *saddr)
24009 +                      struct in6_addr *saddr, struct nx_info *nxi)
24010  {
24011         struct ipv6_saddr_score scores[2], *hiscore;
24012         struct ipv6_saddr_dst dst;
24013 @@ -1645,7 +1650,8 @@ int ipv6_dev_get_saddr(struct net *net,
24014
24015         if (use_oif_addr) {
24016                 if (idev)
24017 -                       hiscore_idx = __ipv6_dev_get_saddr(net, &dst, idev, scores, hiscore_idx);
24018 +                       hiscore_idx = __ipv6_dev_get_saddr(net,
24019 +                               &dst, idev, scores, hiscore_idx, nxi);
24020         } else {
24021                 const struct net_device *master;
24022                 int master_idx = 0;
24023 @@ -1659,8 +1665,8 @@ int ipv6_dev_get_saddr(struct net *net,
24024                         master_idx = master->ifindex;
24025
24026                         hiscore_idx = ipv6_get_saddr_master(net, dst_dev,
24027 -                                                           master, &dst,
24028 -                                                           scores, hiscore_idx);
24029 +                                               master, &dst, scores,
24030 +                                               hiscore_idx, nxi);
24031
24032                         if (scores[hiscore_idx].ifa)
24033                                 goto out;
24034 @@ -1675,7 +1681,8 @@ int ipv6_dev_get_saddr(struct net *net,
24035                         idev = __in6_dev_get(dev);
24036                         if (!idev)
24037                                 continue;
24038 -                       hiscore_idx = __ipv6_dev_get_saddr(net, &dst, idev, scores, hiscore_idx);
24039 +                       hiscore_idx = __ipv6_dev_get_saddr(net,
24040 +                               &dst, idev, scores, hiscore_idx, nxi);
24041                 }
24042         }
24043
24044 @@ -4129,7 +4136,10 @@ static void if6_seq_stop(struct seq_file
24045  static int if6_seq_show(struct seq_file *seq, void *v)
24046  {
24047         struct inet6_ifaddr *ifp = (struct inet6_ifaddr *)v;
24048 -       seq_printf(seq, "%pi6 %02x %02x %02x %02x %8s\n",
24049 +
24050 +       if (nx_check(0, VS_ADMIN|VS_WATCH) ||
24051 +           v6_addr_in_nx_info(current_nx_info(), &ifp->addr, -1))
24052 +               seq_printf(seq, "%pi6 %02x %02x %02x %02x %8s\n",
24053                    &ifp->addr,
24054                    ifp->idev->dev->ifindex,
24055                    ifp->prefix_len,
24056 @@ -4713,6 +4723,11 @@ static int in6_dump_addrs(struct inet6_d
24057         struct ifacaddr6 *ifaca;
24058         int err = 1;
24059         int ip_idx = *p_ip_idx;
24060 +       struct nx_info *nxi = skb->sk ? skb->sk->sk_nx_info : NULL;
24061 +
24062 +       /* disable ipv6 on non v6 guests */
24063 +       if (nxi && !nx_info_has_v6(nxi))
24064 +               return skb->len;
24065
24066         read_lock_bh(&idev->lock);
24067         switch (type) {
24068 @@ -4723,6 +4738,8 @@ static int in6_dump_addrs(struct inet6_d
24069                 list_for_each_entry(ifa, &idev->addr_list, if_list) {
24070                         if (ip_idx < s_ip_idx)
24071                                 goto next;
24072 +                       if (!v6_addr_in_nx_info(nxi, &ifa->addr, -1))
24073 +                               goto next;
24074                         err = inet6_fill_ifaddr(skb, ifa,
24075                                                 NETLINK_CB(cb->skb).portid,
24076                                                 cb->nlh->nlmsg_seq,
24077 @@ -4740,6 +4757,8 @@ static int in6_dump_addrs(struct inet6_d
24078                      ifmca = ifmca->next, ip_idx++) {
24079                         if (ip_idx < s_ip_idx)
24080                                 continue;
24081 +                       if (!v6_addr_in_nx_info(nxi, &ifmca->mca_addr, -1))
24082 +                               continue;
24083                         err = inet6_fill_ifmcaddr(skb, ifmca,
24084                                                   NETLINK_CB(cb->skb).portid,
24085                                                   cb->nlh->nlmsg_seq,
24086 @@ -4755,6 +4774,8 @@ static int in6_dump_addrs(struct inet6_d
24087                      ifaca = ifaca->aca_next, ip_idx++) {
24088                         if (ip_idx < s_ip_idx)
24089                                 continue;
24090 +                       if (!v6_addr_in_nx_info(nxi, &ifaca->aca_addr, -1))
24091 +                               continue;
24092                         err = inet6_fill_ifacaddr(skb, ifaca,
24093                                                   NETLINK_CB(cb->skb).portid,
24094                                                   cb->nlh->nlmsg_seq,
24095 @@ -4783,6 +4804,10 @@ static int inet6_dump_addr(struct sk_buf
24096         struct inet6_dev *idev;
24097         struct hlist_head *head;
24098
24099 +       /* FIXME: maybe disable ipv6 on non v6 guests?
24100 +       if (skb->sk && skb->sk->sk_vx_info)
24101 +               return skb->len; */
24102 +
24103         s_h = cb->args[0];
24104         s_idx = idx = cb->args[1];
24105         s_ip_idx = ip_idx = cb->args[2];
24106 @@ -5301,6 +5326,7 @@ static int inet6_dump_ifinfo(struct sk_b
24107         struct net_device *dev;
24108         struct inet6_dev *idev;
24109         struct hlist_head *head;
24110 +       struct nx_info *nxi = skb->sk ? skb->sk->sk_nx_info : NULL;
24111
24112         s_h = cb->args[0];
24113         s_idx = cb->args[1];
24114 @@ -5312,6 +5338,8 @@ static int inet6_dump_ifinfo(struct sk_b
24115                 hlist_for_each_entry_rcu(dev, head, index_hlist) {
24116                         if (idx < s_idx)
24117                                 goto cont;
24118 +                       if (!v6_dev_in_nx_info(dev, nxi))
24119 +                               goto cont;
24120                         idev = __in6_dev_get(dev);
24121                         if (!idev)
24122                                 goto cont;
24123 diff -NurpP --minimal linux-4.9.135/net/ipv6/af_inet6.c linux-4.9.135-vs2.3.9.8/net/ipv6/af_inet6.c
24124 --- linux-4.9.135/net/ipv6/af_inet6.c   2018-10-20 10:39:25.000000000 +0000
24125 +++ linux-4.9.135-vs2.3.9.8/net/ipv6/af_inet6.c 2018-10-20 04:58:15.000000000 +0000
24126 @@ -43,6 +43,7 @@
24127  #include <linux/netdevice.h>
24128  #include <linux/icmpv6.h>
24129  #include <linux/netfilter_ipv6.h>
24130 +#include <linux/vs_inet.h>
24131
24132  #include <net/ip.h>
24133  #include <net/ipv6.h>
24134 @@ -167,10 +168,13 @@ lookup_protocol:
24135         }
24136
24137         err = -EPERM;
24138 +       if ((protocol == IPPROTO_ICMPV6) &&
24139 +               nx_capable(CAP_NET_RAW, NXC_RAW_ICMP))
24140 +               goto override;
24141         if (sock->type == SOCK_RAW && !kern &&
24142             !ns_capable(net->user_ns, CAP_NET_RAW))
24143                 goto out_rcu_unlock;
24144 -
24145 +override:
24146         sock->ops = answer->ops;
24147         answer_prot = answer->prot;
24148         answer_flags = answer->flags;
24149 @@ -272,6 +276,7 @@ int inet6_bind(struct socket *sock, stru
24150         struct inet_sock *inet = inet_sk(sk);
24151         struct ipv6_pinfo *np = inet6_sk(sk);
24152         struct net *net = sock_net(sk);
24153 +       struct nx_v6_sock_addr nsa;
24154         __be32 v4addr = 0;
24155         unsigned short snum;
24156         bool saved_ipv6only;
24157 @@ -288,6 +293,10 @@ int inet6_bind(struct socket *sock, stru
24158         if (addr->sin6_family != AF_INET6)
24159                 return -EAFNOSUPPORT;
24160
24161 +       err = v6_map_sock_addr(inet, addr, &nsa);
24162 +       if (err)
24163 +               return err;
24164 +
24165         addr_type = ipv6_addr_type(&addr->sin6_addr);
24166         if ((addr_type & IPV6_ADDR_MULTICAST) && sock->type == SOCK_STREAM)
24167                 return -EINVAL;
24168 @@ -328,6 +337,10 @@ int inet6_bind(struct socket *sock, stru
24169                         err = -EADDRNOTAVAIL;
24170                         goto out;
24171                 }
24172 +               if (!v4_addr_in_nx_info(sk->sk_nx_info, v4addr, NXA_MASK_BIND)) {
24173 +                       err = -EADDRNOTAVAIL;
24174 +                       goto out;
24175 +               }
24176         } else {
24177                 if (addr_type != IPV6_ADDR_ANY) {
24178                         struct net_device *dev = NULL;
24179 @@ -354,6 +367,11 @@ int inet6_bind(struct socket *sock, stru
24180                                 }
24181                         }
24182
24183 +                       if (!v6_addr_in_nx_info(sk->sk_nx_info, &addr->sin6_addr, -1)) {
24184 +                               err = -EADDRNOTAVAIL;
24185 +                               goto out_unlock;
24186 +                       }
24187 +
24188                         /* ipv4 addr of the socket is invalid.  Only the
24189                          * unspecified and mapped address have a v4 equivalent.
24190                          */
24191 @@ -371,6 +389,9 @@ int inet6_bind(struct socket *sock, stru
24192                 }
24193         }
24194
24195 +       /* what's that for? */
24196 +       v6_set_sock_addr(inet, &nsa);
24197 +
24198         inet->inet_rcv_saddr = v4addr;
24199         inet->inet_saddr = v4addr;
24200
24201 @@ -477,9 +498,11 @@ int inet6_getname(struct socket *sock, s
24202                         return -ENOTCONN;
24203                 sin->sin6_port = inet->inet_dport;
24204                 sin->sin6_addr = sk->sk_v6_daddr;
24205 +               /* FIXME: remap lback? */
24206                 if (np->sndflow)
24207                         sin->sin6_flowinfo = np->flow_label;
24208         } else {
24209 +               /* FIXME: remap lback? */
24210                 if (ipv6_addr_any(&sk->sk_v6_rcv_saddr))
24211                         sin->sin6_addr = np->saddr;
24212                 else
24213 diff -NurpP --minimal linux-4.9.135/net/ipv6/datagram.c linux-4.9.135-vs2.3.9.8/net/ipv6/datagram.c
24214 --- linux-4.9.135/net/ipv6/datagram.c   2018-10-20 10:39:25.000000000 +0000
24215 +++ linux-4.9.135-vs2.3.9.8/net/ipv6/datagram.c 2018-10-20 05:55:44.000000000 +0000
24216 @@ -780,7 +780,7 @@ int ip6_datagram_send_ctl(struct net *ne
24217
24218                         rcu_read_lock();
24219                         if (fl6->flowi6_oif) {
24220 -                               dev = dev_get_by_index_rcu(net, fl6->flowi6_oif);
24221 +                               dev = dev_get_by_index_real_rcu(net, fl6->flowi6_oif);
24222                                 if (!dev) {
24223                                         rcu_read_unlock();
24224                                         return -ENODEV;
24225 diff -NurpP --minimal linux-4.9.135/net/ipv6/fib6_rules.c linux-4.9.135-vs2.3.9.8/net/ipv6/fib6_rules.c
24226 --- linux-4.9.135/net/ipv6/fib6_rules.c 2018-10-20 10:39:25.000000000 +0000
24227 +++ linux-4.9.135-vs2.3.9.8/net/ipv6/fib6_rules.c       2018-10-20 04:58:15.000000000 +0000
24228 @@ -102,7 +102,7 @@ static int fib6_rule_action(struct fib_r
24229                                                ip6_dst_idev(&rt->dst)->dev,
24230                                                &flp6->daddr,
24231                                                rt6_flags2srcprefs(flags),
24232 -                                              &saddr))
24233 +                                              &saddr, NULL))
24234                                 goto again;
24235                         if (!ipv6_prefix_equal(&saddr, &r->src.addr,
24236                                                r->src.plen))
24237 diff -NurpP --minimal linux-4.9.135/net/ipv6/inet6_hashtables.c linux-4.9.135-vs2.3.9.8/net/ipv6/inet6_hashtables.c
24238 --- linux-4.9.135/net/ipv6/inet6_hashtables.c   2016-12-11 19:17:54.000000000 +0000
24239 +++ linux-4.9.135-vs2.3.9.8/net/ipv6/inet6_hashtables.c 2018-10-20 04:58:15.000000000 +0000
24240 @@ -16,6 +16,7 @@
24241
24242  #include <linux/module.h>
24243  #include <linux/random.h>
24244 +#include <linux/vs_inet6.h>
24245
24246  #include <net/addrconf.h>
24247  #include <net/inet_connection_sock.h>
24248 @@ -108,6 +109,9 @@ static inline int compute_score(struct s
24249                         if (!ipv6_addr_equal(&sk->sk_v6_rcv_saddr, daddr))
24250                                 return -1;
24251                         score++;
24252 +               } else {
24253 +                       if (!v6_addr_in_nx_info(sk->sk_nx_info, daddr, -1))
24254 +                               return -1;
24255                 }
24256                 if (sk->sk_bound_dev_if || exact_dif) {
24257                         if (sk->sk_bound_dev_if != dif)
24258 @@ -282,39 +286,71 @@ EXPORT_SYMBOL_GPL(inet6_hash);
24259   *                          IPV6_ADDR_ANY only equals to IPV6_ADDR_ANY,
24260   *                          and 0.0.0.0 equals to 0.0.0.0 only
24261   */
24262 -int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2,
24263 +int ipv6_rcv_saddr_equal(const struct sock *sk1, const struct sock *sk2,
24264                          bool match_wildcard)
24265  {
24266 +       const struct in6_addr *sk1_rcv_saddr6 = inet6_rcv_saddr(sk1);
24267         const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2);
24268 +       __be32 sk1_rcv_saddr = sk1->sk_rcv_saddr;
24269 +       __be32 sk2_rcv_saddr = sk2->sk_rcv_saddr;
24270 +       int sk1_ipv6only = inet_v6_ipv6only(sk1);
24271         int sk2_ipv6only = inet_v6_ipv6only(sk2);
24272 -       int addr_type = ipv6_addr_type(&sk->sk_v6_rcv_saddr);
24273 +       int addr_type1 = ipv6_addr_type(sk1_rcv_saddr6);
24274         int addr_type2 = sk2_rcv_saddr6 ? ipv6_addr_type(sk2_rcv_saddr6) : IPV6_ADDR_MAPPED;
24275
24276 +
24277 +       /* if one is mapped and the other is ipv6only exit early */
24278 +       if (addr_type1 == IPV6_ADDR_MAPPED && sk2_ipv6only)
24279 +               return 0;
24280 +
24281 +       if (addr_type2 == IPV6_ADDR_MAPPED && sk1_ipv6only)
24282 +               return 0;
24283 +
24284         /* if both are mapped, treat as IPv4 */
24285 -       if (addr_type == IPV6_ADDR_MAPPED && addr_type2 == IPV6_ADDR_MAPPED) {
24286 -               if (!sk2_ipv6only) {
24287 -                       if (sk->sk_rcv_saddr == sk2->sk_rcv_saddr)
24288 -                               return 1;
24289 -                       if (!sk->sk_rcv_saddr || !sk2->sk_rcv_saddr)
24290 -                               return match_wildcard;
24291 -               }
24292 +       if (addr_type1 == IPV6_ADDR_MAPPED && addr_type2 == IPV6_ADDR_MAPPED) {
24293 +               if (sk1_rcv_saddr == sk2_rcv_saddr)
24294 +                       return 1;
24295 +               if ((!sk1_rcv_saddr || !sk2_rcv_saddr) && match_wildcard)
24296 +                       goto vs_v4;
24297                 return 0;
24298         }
24299
24300 -       if (addr_type == IPV6_ADDR_ANY && addr_type2 == IPV6_ADDR_ANY)
24301 -               return 1;
24302 +       /* if both are wildcards, check for overlap */
24303 +       if (addr_type1 == IPV6_ADDR_ANY && addr_type2 == IPV6_ADDR_ANY)
24304 +               return nx_v6_addr_conflict(sk1->sk_nx_info, sk2->sk_nx_info);
24305
24306 -       if (addr_type2 == IPV6_ADDR_ANY && match_wildcard &&
24307 -           !(sk2_ipv6only && addr_type == IPV6_ADDR_MAPPED))
24308 +       /* if both are valid ipv6 addresses, mapped handled above */
24309 +       if (addr_type1 != IPV6_ADDR_ANY && addr_type2 != IPV6_ADDR_ANY &&
24310 +           sk2_rcv_saddr6 && ipv6_addr_equal(sk1_rcv_saddr6, sk2_rcv_saddr6))
24311                 return 1;
24312
24313 -       if (addr_type == IPV6_ADDR_ANY && match_wildcard &&
24314 -           !(ipv6_only_sock(sk) && addr_type2 == IPV6_ADDR_MAPPED))
24315 -               return 1;
24316 +       if (addr_type1 == IPV6_ADDR_ANY && match_wildcard) {
24317 +               /* ipv6only case handled above */
24318 +               if (addr_type2 == IPV6_ADDR_MAPPED)
24319 +                       return v4_addr_in_nx_info(sk1->sk_nx_info, sk2_rcv_saddr, -1);
24320 +               else
24321 +                       return v6_addr_in_nx_info(sk1->sk_nx_info, sk2_rcv_saddr6, -1);
24322 +       }
24323
24324 -       if (sk2_rcv_saddr6 &&
24325 -           ipv6_addr_equal(&sk->sk_v6_rcv_saddr, sk2_rcv_saddr6))
24326 -               return 1;
24327 +       if (addr_type2 == IPV6_ADDR_ANY && match_wildcard) {
24328 +               /* ipv6only case handled above */
24329 +               if (addr_type1 == IPV6_ADDR_MAPPED)
24330 +                       return v4_addr_in_nx_info(sk2->sk_nx_info, sk1_rcv_saddr, -1);
24331 +               else
24332 +                       return v6_addr_in_nx_info(sk2->sk_nx_info, sk1_rcv_saddr6, -1);
24333 +       }
24334 +
24335 +       return 0;
24336 +
24337 +vs_v4:
24338 +       if (!sk1_rcv_saddr && !sk2_rcv_saddr)
24339 +               return nx_v4_addr_conflict(sk1->sk_nx_info, sk2->sk_nx_info);
24340 +
24341 +       if (!sk2_rcv_saddr)
24342 +               return v4_addr_in_nx_info(sk1->sk_nx_info, sk2_rcv_saddr, -1);
24343 +
24344 +       if (!sk1_rcv_saddr)
24345 +               return v4_addr_in_nx_info(sk2->sk_nx_info, sk1_rcv_saddr, -1);
24346
24347         return 0;
24348  }
24349 diff -NurpP --minimal linux-4.9.135/net/ipv6/ip6_fib.c linux-4.9.135-vs2.3.9.8/net/ipv6/ip6_fib.c
24350 --- linux-4.9.135/net/ipv6/ip6_fib.c    2018-10-20 10:39:25.000000000 +0000
24351 +++ linux-4.9.135-vs2.3.9.8/net/ipv6/ip6_fib.c  2018-10-20 04:58:15.000000000 +0000
24352 @@ -1976,6 +1976,7 @@ static int ipv6_route_seq_show(struct se
24353         struct rt6_info *rt = v;
24354         struct ipv6_route_iter *iter = seq->private;
24355
24356 +       /* FIXME: check for network context? */
24357         seq_printf(seq, "%pi6 %02x ", &rt->rt6i_dst.addr, rt->rt6i_dst.plen);
24358
24359  #ifdef CONFIG_IPV6_SUBTREES
24360 diff -NurpP --minimal linux-4.9.135/net/ipv6/ip6_output.c linux-4.9.135-vs2.3.9.8/net/ipv6/ip6_output.c
24361 --- linux-4.9.135/net/ipv6/ip6_output.c 2018-10-20 10:39:25.000000000 +0000
24362 +++ linux-4.9.135-vs2.3.9.8/net/ipv6/ip6_output.c       2018-10-20 05:55:44.000000000 +0000
24363 @@ -960,7 +960,8 @@ static int ip6_dst_lookup_tail(struct ne
24364                 rt = (*dst)->error ? NULL : (struct rt6_info *)*dst;
24365                 err = ip6_route_get_saddr(net, rt, &fl6->daddr,
24366                                           sk ? inet6_sk(sk)->srcprefs : 0,
24367 -                                         &fl6->saddr);
24368 +                                         &fl6->saddr,
24369 +                                         sk ? sk->sk_nx_info : NULL);
24370                 if (err)
24371                         goto out_err_release;
24372
24373 diff -NurpP --minimal linux-4.9.135/net/ipv6/ip6_tunnel.c linux-4.9.135-vs2.3.9.8/net/ipv6/ip6_tunnel.c
24374 --- linux-4.9.135/net/ipv6/ip6_tunnel.c 2018-10-20 10:39:25.000000000 +0000
24375 +++ linux-4.9.135-vs2.3.9.8/net/ipv6/ip6_tunnel.c       2018-10-20 05:55:44.000000000 +0000
24376 @@ -1115,7 +1115,7 @@ route_lookup:
24377                 }
24378                 if (t->parms.collect_md &&
24379                     ipv6_dev_get_saddr(net, ip6_dst_idev(dst)->dev,
24380 -                                      &fl6->daddr, 0, &fl6->saddr))
24381 +                                      &fl6->daddr, 0, &fl6->saddr, NULL))
24382                         goto tx_err_link_failure;
24383                 ndst = dst;
24384         }
24385 diff -NurpP --minimal linux-4.9.135/net/ipv6/ndisc.c linux-4.9.135-vs2.3.9.8/net/ipv6/ndisc.c
24386 --- linux-4.9.135/net/ipv6/ndisc.c      2018-10-20 10:39:25.000000000 +0000
24387 +++ linux-4.9.135-vs2.3.9.8/net/ipv6/ndisc.c    2018-10-20 04:58:15.000000000 +0000
24388 @@ -512,7 +512,7 @@ void ndisc_send_na(struct net_device *de
24389         } else {
24390                 if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr,
24391                                        inet6_sk(dev_net(dev)->ipv6.ndisc_sk)->srcprefs,
24392 -                                      &tmpaddr))
24393 +                                      &tmpaddr, NULL))
24394                         return;
24395                 src_addr = &tmpaddr;
24396         }
24397 diff -NurpP --minimal linux-4.9.135/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c linux-4.9.135-vs2.3.9.8/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c
24398 --- linux-4.9.135/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c   2016-12-11 19:17:54.000000000 +0000
24399 +++ linux-4.9.135-vs2.3.9.8/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c 2018-10-20 04:58:15.000000000 +0000
24400 @@ -39,7 +39,7 @@ nf_nat_masquerade_ipv6(struct sk_buff *s
24401                             ctinfo == IP_CT_RELATED_REPLY));
24402
24403         if (ipv6_dev_get_saddr(nf_ct_net(ct), out,
24404 -                              &ipv6_hdr(skb)->daddr, 0, &src) < 0)
24405 +                              &ipv6_hdr(skb)->daddr, 0, &src, NULL) < 0)
24406                 return NF_DROP;
24407
24408         nfct_nat(ct)->masq_index = out->ifindex;
24409 diff -NurpP --minimal linux-4.9.135/net/ipv6/raw.c linux-4.9.135-vs2.3.9.8/net/ipv6/raw.c
24410 --- linux-4.9.135/net/ipv6/raw.c        2018-10-20 10:39:25.000000000 +0000
24411 +++ linux-4.9.135-vs2.3.9.8/net/ipv6/raw.c      2018-10-20 05:55:44.000000000 +0000
24412 @@ -291,6 +291,13 @@ static int rawv6_bind(struct sock *sk, s
24413                                 goto out_unlock;
24414                 }
24415
24416 +               if (!v6_addr_in_nx_info(sk->sk_nx_info, &addr->sin6_addr, -1)) {
24417 +                       err = -EADDRNOTAVAIL;
24418 +                       if (dev)
24419 +                               dev_put(dev);
24420 +                       goto out;
24421 +               }
24422 +
24423                 /* ipv4 addr of the socket is invalid.  Only the
24424                  * unspecified and mapped address have a v4 equivalent.
24425                  */
24426 diff -NurpP --minimal linux-4.9.135/net/ipv6/route.c linux-4.9.135-vs2.3.9.8/net/ipv6/route.c
24427 --- linux-4.9.135/net/ipv6/route.c      2018-10-20 10:39:25.000000000 +0000
24428 +++ linux-4.9.135-vs2.3.9.8/net/ipv6/route.c    2018-10-20 04:58:15.000000000 +0000
24429 @@ -3291,7 +3291,8 @@ static int rt6_fill_node(struct net *net
24430                                 goto nla_put_failure;
24431         } else if (dst) {
24432                 struct in6_addr saddr_buf;
24433 -               if (ip6_route_get_saddr(net, rt, dst, 0, &saddr_buf) == 0 &&
24434 +               if (ip6_route_get_saddr(net, rt, dst, 0, &saddr_buf,
24435 +                   (skb->sk ? skb->sk->sk_nx_info : NULL)) == 0 &&
24436                     nla_put_in6_addr(skb, RTA_PREFSRC, &saddr_buf))
24437                         goto nla_put_failure;
24438         }
24439 diff -NurpP --minimal linux-4.9.135/net/ipv6/tcp_ipv6.c linux-4.9.135-vs2.3.9.8/net/ipv6/tcp_ipv6.c
24440 --- linux-4.9.135/net/ipv6/tcp_ipv6.c   2018-10-20 10:39:25.000000000 +0000
24441 +++ linux-4.9.135-vs2.3.9.8/net/ipv6/tcp_ipv6.c 2018-10-20 04:58:15.000000000 +0000
24442 @@ -149,11 +149,18 @@ static int tcp_v6_connect(struct sock *s
24443          */
24444
24445         if (ipv6_addr_any(&usin->sin6_addr)) {
24446 -               if (ipv6_addr_v4mapped(&sk->sk_v6_rcv_saddr))
24447 -                       ipv6_addr_set_v4mapped(htonl(INADDR_LOOPBACK),
24448 -                                              &usin->sin6_addr);
24449 -               else
24450 -                       usin->sin6_addr = in6addr_loopback;
24451 +               struct nx_info *nxi =  sk->sk_nx_info;
24452 +
24453 +               if (nxi && nx_info_has_v6(nxi))
24454 +                       /* FIXME: remap lback? */
24455 +                       usin->sin6_addr = nxi->v6.ip;
24456 +               else {
24457 +                       if (ipv6_addr_v4mapped(&sk->sk_v6_rcv_saddr))
24458 +                               ipv6_addr_set_v4mapped(htonl(INADDR_LOOPBACK),
24459 +                                                      &usin->sin6_addr);
24460 +                       else
24461 +                               usin->sin6_addr = in6addr_loopback;
24462 +               }
24463         }
24464
24465         addr_type = ipv6_addr_type(&usin->sin6_addr);
24466 diff -NurpP --minimal linux-4.9.135/net/ipv6/udp.c linux-4.9.135-vs2.3.9.8/net/ipv6/udp.c
24467 --- linux-4.9.135/net/ipv6/udp.c        2018-10-20 10:39:25.000000000 +0000
24468 +++ linux-4.9.135-vs2.3.9.8/net/ipv6/udp.c      2018-10-20 04:58:15.000000000 +0000
24469 @@ -135,6 +135,10 @@ static int compute_score(struct sock *sk
24470                 if (inet->inet_dport != sport)
24471                         return -1;
24472                 score++;
24473 +               } else {
24474 +                       /* block non nx_info ips */
24475 +                       if (!v6_addr_in_nx_info(sk->sk_nx_info, daddr, -1))
24476 +                               return -1;
24477         }
24478
24479         if (!ipv6_addr_any(&sk->sk_v6_rcv_saddr)) {
24480 diff -NurpP --minimal linux-4.9.135/net/ipv6/xfrm6_policy.c linux-4.9.135-vs2.3.9.8/net/ipv6/xfrm6_policy.c
24481 --- linux-4.9.135/net/ipv6/xfrm6_policy.c       2018-10-20 10:39:25.000000000 +0000
24482 +++ linux-4.9.135-vs2.3.9.8/net/ipv6/xfrm6_policy.c     2018-10-20 04:58:15.000000000 +0000
24483 @@ -64,7 +64,8 @@ static int xfrm6_get_saddr(struct net *n
24484                 return -EHOSTUNREACH;
24485
24486         dev = ip6_dst_idev(dst)->dev;
24487 -       ipv6_dev_get_saddr(dev_net(dev), dev, &daddr->in6, 0, &saddr->in6);
24488 +       ipv6_dev_get_saddr(dev_net(dev), dev, &daddr->in6,
24489 +               0, &saddr->in6, NULL);
24490         dst_release(dst);
24491         return 0;
24492  }
24493 diff -NurpP --minimal linux-4.9.135/net/netfilter/ipvs/ip_vs_xmit.c linux-4.9.135-vs2.3.9.8/net/netfilter/ipvs/ip_vs_xmit.c
24494 --- linux-4.9.135/net/netfilter/ipvs/ip_vs_xmit.c       2016-12-11 19:17:54.000000000 +0000
24495 +++ linux-4.9.135-vs2.3.9.8/net/netfilter/ipvs/ip_vs_xmit.c     2018-10-20 04:58:15.000000000 +0000
24496 @@ -381,7 +381,7 @@ __ip_vs_route_output_v6(struct net *net,
24497                 return dst;
24498         if (ipv6_addr_any(&fl6.saddr) &&
24499             ipv6_dev_get_saddr(net, ip6_dst_idev(dst)->dev,
24500 -                              &fl6.daddr, 0, &fl6.saddr) < 0)
24501 +                              &fl6.daddr, 0, &fl6.saddr, NULL) < 0)
24502                 goto out_err;
24503         if (do_xfrm) {
24504                 dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), NULL, 0);
24505 diff -NurpP --minimal linux-4.9.135/net/netlink/af_netlink.c linux-4.9.135-vs2.3.9.8/net/netlink/af_netlink.c
24506 --- linux-4.9.135/net/netlink/af_netlink.c      2018-10-20 10:39:25.000000000 +0000
24507 +++ linux-4.9.135-vs2.3.9.8/net/netlink/af_netlink.c    2018-10-20 05:56:16.000000000 +0000
24508 @@ -63,6 +63,8 @@
24509  #include <linux/hash.h>
24510  #include <linux/genetlink.h>
24511  #include <linux/nospec.h>
24512 +#include <linux/vs_context.h>
24513 +#include <linux/vs_network.h>
24514
24515  #include <net/net_namespace.h>
24516  #include <net/sock.h>
24517 @@ -2477,7 +2479,8 @@ static void *__netlink_seq_next(struct s
24518                         if (err)
24519                                 return ERR_PTR(err);
24520                 }
24521 -       } while (sock_net(&nlk->sk) != seq_file_net(seq));
24522 +       } while ((sock_net(&nlk->sk) != seq_file_net(seq)) ||
24523 +               !nx_check(nlk->sk.sk_nid, VS_WATCH_P | VS_IDENT));
24524
24525         return nlk;
24526  }
24527 diff -NurpP --minimal linux-4.9.135/net/packet/diag.c linux-4.9.135-vs2.3.9.8/net/packet/diag.c
24528 --- linux-4.9.135/net/packet/diag.c     2016-12-11 19:17:54.000000000 +0000
24529 +++ linux-4.9.135-vs2.3.9.8/net/packet/diag.c   2018-10-20 06:31:18.000000000 +0000
24530 @@ -4,6 +4,7 @@
24531  #include <linux/netdevice.h>
24532  #include <linux/packet_diag.h>
24533  #include <linux/percpu.h>
24534 +#include <linux/vs_network.h>
24535  #include <net/net_namespace.h>
24536  #include <net/sock.h>
24537
24538 @@ -201,6 +202,8 @@ static int packet_diag_dump(struct sk_bu
24539         sk_for_each(sk, &net->packet.sklist) {
24540                 if (!net_eq(sock_net(sk), net))
24541                         continue;
24542 +               if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
24543 +                       continue;
24544                 if (num < s_num)
24545                         goto next;
24546
24547 diff -NurpP --minimal linux-4.9.135/net/socket.c linux-4.9.135-vs2.3.9.8/net/socket.c
24548 --- linux-4.9.135/net/socket.c  2018-10-20 10:39:26.000000000 +0000
24549 +++ linux-4.9.135-vs2.3.9.8/net/socket.c        2018-10-20 05:55:45.000000000 +0000
24550 @@ -100,10 +100,12 @@
24551
24552  #include <net/sock.h>
24553  #include <linux/netfilter.h>
24554 +#include <linux/vs_socket.h>
24555 +#include <linux/vs_inet.h>
24556 +#include <linux/vs_inet6.h>
24557
24558  #include <linux/if_tun.h>
24559  #include <linux/ipv6_route.h>
24560 -#include <linux/route.h>
24561  #include <linux/sockios.h>
24562  #include <linux/atalk.h>
24563  #include <net/busy_poll.h>
24564 @@ -619,8 +621,24 @@ EXPORT_SYMBOL(__sock_tx_timestamp);
24565
24566  static inline int sock_sendmsg_nosec(struct socket *sock, struct msghdr *msg)
24567  {
24568 -       int ret = sock->ops->sendmsg(sock, msg, msg_data_left(msg));
24569 -       BUG_ON(ret == -EIOCBQUEUED);
24570 +       size_t size = msg_data_left(msg);
24571 +       int ret = sock->ops->sendmsg(sock, msg, size);
24572 +#if 0
24573 +       if (sock->sk) {
24574 +               if (!ret)
24575 +                       vx_sock_fail(sock->sk, size);
24576 +               else
24577 +                       vx_sock_send(sock->sk, size);
24578 +       }
24579 +#endif
24580 +       vxdprintk(VXD_CBIT(net, 7),
24581 +               "sock_sendmsg_nosec: %p[%p,%p,%p;%d/%d]:%zu/%zu",
24582 +               sock, sock->sk,
24583 +               (sock->sk)?sock->sk->sk_nx_info:0,
24584 +               (sock->sk)?sock->sk->sk_vx_info:0,
24585 +               (sock->sk)?sock->sk->sk_xid:0,
24586 +               (sock->sk)?sock->sk->sk_nid:0,
24587 +               size, msg_data_left(msg));
24588         return ret;
24589  }
24590
24591 @@ -1110,6 +1128,13 @@ int __sock_create(struct net *net, int f
24592         if (type < 0 || type >= SOCK_MAX)
24593                 return -EINVAL;
24594
24595 +       if (!nx_check(0, VS_ADMIN)) {
24596 +               if (family == PF_INET && !current_nx_info_has_v4())
24597 +                       return -EAFNOSUPPORT;
24598 +               if (family == PF_INET6 && !current_nx_info_has_v6())
24599 +                       return -EAFNOSUPPORT;
24600 +       }
24601 +
24602         /* Compatibility.
24603
24604            This uglymoron is moved from INET layer to here to avoid
24605 @@ -1240,6 +1265,7 @@ SYSCALL_DEFINE3(socket, int, family, int
24606         if (retval < 0)
24607                 goto out;
24608
24609 +       set_bit(SOCK_USER_SOCKET, &sock->flags);
24610         retval = sock_map_fd(sock, flags & (O_CLOEXEC | O_NONBLOCK));
24611         if (retval < 0)
24612                 goto out_release;
24613 @@ -1281,10 +1307,12 @@ SYSCALL_DEFINE4(socketpair, int, family,
24614         err = sock_create(family, type, protocol, &sock1);
24615         if (err < 0)
24616                 goto out;
24617 +       set_bit(SOCK_USER_SOCKET, &sock1->flags);
24618
24619         err = sock_create(family, type, protocol, &sock2);
24620         if (err < 0)
24621                 goto out_release_1;
24622 +       set_bit(SOCK_USER_SOCKET, &sock2->flags);
24623
24624         err = sock1->ops->socketpair(sock1, sock2);
24625         if (err < 0)
24626 diff -NurpP --minimal linux-4.9.135/net/sunrpc/auth.c linux-4.9.135-vs2.3.9.8/net/sunrpc/auth.c
24627 --- linux-4.9.135/net/sunrpc/auth.c     2016-12-11 19:17:54.000000000 +0000
24628 +++ linux-4.9.135-vs2.3.9.8/net/sunrpc/auth.c   2018-10-20 04:58:15.000000000 +0000
24629 @@ -15,6 +15,7 @@
24630  #include <linux/sunrpc/clnt.h>
24631  #include <linux/sunrpc/gss_api.h>
24632  #include <linux/spinlock.h>
24633 +#include <linux/vs_tag.h>
24634
24635  #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
24636  # define RPCDBG_FACILITY       RPCDBG_AUTH
24637 @@ -630,6 +631,7 @@ rpcauth_lookupcred(struct rpc_auth *auth
24638         memset(&acred, 0, sizeof(acred));
24639         acred.uid = cred->fsuid;
24640         acred.gid = cred->fsgid;
24641 +       acred.tag = make_ktag(&init_user_ns, dx_current_tag());
24642         acred.group_info = cred->group_info;
24643         ret = auth->au_ops->lookup_cred(auth, &acred, flags);
24644         return ret;
24645 @@ -669,6 +671,7 @@ rpcauth_bind_root_cred(struct rpc_task *
24646         struct auth_cred acred = {
24647                 .uid = GLOBAL_ROOT_UID,
24648                 .gid = GLOBAL_ROOT_GID,
24649 +               .tag = KTAGT_INIT(dx_current_tag()),
24650         };
24651
24652         dprintk("RPC: %5u looking up %s cred\n",
24653 diff -NurpP --minimal linux-4.9.135/net/sunrpc/auth_unix.c linux-4.9.135-vs2.3.9.8/net/sunrpc/auth_unix.c
24654 --- linux-4.9.135/net/sunrpc/auth_unix.c        2016-12-11 19:17:54.000000000 +0000
24655 +++ linux-4.9.135-vs2.3.9.8/net/sunrpc/auth_unix.c      2018-10-20 04:58:15.000000000 +0000
24656 @@ -13,11 +13,13 @@
24657  #include <linux/sunrpc/clnt.h>
24658  #include <linux/sunrpc/auth.h>
24659  #include <linux/user_namespace.h>
24660 +#include <linux/vs_tag.h>
24661
24662  #define NFS_NGROUPS    16
24663
24664  struct unx_cred {
24665         struct rpc_cred         uc_base;
24666 +       ktag_t                  uc_tag;
24667         kgid_t                  uc_gid;
24668         kgid_t                  uc_gids[NFS_NGROUPS];
24669  };
24670 @@ -86,6 +88,7 @@ unx_create_cred(struct rpc_auth *auth, s
24671                 groups = NFS_NGROUPS;
24672
24673         cred->uc_gid = acred->gid;
24674 +       cred->uc_tag = acred->tag;
24675         for (i = 0; i < groups; i++)
24676                 cred->uc_gids[i] = acred->group_info->gid[i];
24677         if (i < NFS_NGROUPS)
24678 @@ -127,7 +130,9 @@ unx_match(struct auth_cred *acred, struc
24679         unsigned int i;
24680
24681
24682 -       if (!uid_eq(cred->uc_uid, acred->uid) || !gid_eq(cred->uc_gid, acred->gid))
24683 +       if (!uid_eq(cred->uc_uid, acred->uid) ||
24684 +           !gid_eq(cred->uc_gid, acred->gid) ||
24685 +           !tag_eq(cred->uc_tag, acred->tag))
24686                 return 0;
24687
24688         if (acred->group_info != NULL)
24689 @@ -152,7 +157,7 @@ unx_marshal(struct rpc_task *task, __be3
24690         struct rpc_clnt *clnt = task->tk_client;
24691         struct unx_cred *cred = container_of(task->tk_rqstp->rq_cred, struct unx_cred, uc_base);
24692         __be32          *base, *hold;
24693 -       int             i;
24694 +       int             i, tag;
24695
24696         *p++ = htonl(RPC_AUTH_UNIX);
24697         base = p++;
24698 @@ -163,8 +168,11 @@ unx_marshal(struct rpc_task *task, __be3
24699          */
24700         p = xdr_encode_array(p, clnt->cl_nodename, clnt->cl_nodelen);
24701
24702 -       *p++ = htonl((u32) from_kuid(&init_user_ns, cred->uc_uid));
24703 -       *p++ = htonl((u32) from_kgid(&init_user_ns, cred->uc_gid));
24704 +       tag = task->tk_client->cl_tag;
24705 +       *p++ = htonl((u32) from_kuid(&init_user_ns,
24706 +               TAGINO_KUID(tag, cred->uc_uid, cred->uc_tag)));
24707 +       *p++ = htonl((u32) from_kgid(&init_user_ns,
24708 +               TAGINO_KGID(tag, cred->uc_gid, cred->uc_tag)));
24709         hold = p++;
24710         for (i = 0; i < 16 && gid_valid(cred->uc_gids[i]); i++)
24711                 *p++ = htonl((u32) from_kgid(&init_user_ns, cred->uc_gids[i]));
24712 diff -NurpP --minimal linux-4.9.135/net/sunrpc/clnt.c linux-4.9.135-vs2.3.9.8/net/sunrpc/clnt.c
24713 --- linux-4.9.135/net/sunrpc/clnt.c     2018-10-20 10:39:26.000000000 +0000
24714 +++ linux-4.9.135-vs2.3.9.8/net/sunrpc/clnt.c   2018-10-20 05:55:45.000000000 +0000
24715 @@ -31,6 +31,7 @@
24716  #include <linux/in.h>
24717  #include <linux/in6.h>
24718  #include <linux/un.h>
24719 +#include <linux/vs_cvirt.h>
24720
24721  #include <linux/sunrpc/clnt.h>
24722  #include <linux/sunrpc/addr.h>
24723 @@ -496,6 +497,9 @@ static struct rpc_clnt *rpc_create_xprt(
24724         if (!(args->flags & RPC_CLNT_CREATE_QUIET))
24725                 clnt->cl_chatty = 1;
24726
24727 +       /* TODO: handle RPC_CLNT_CREATE_TAGGED
24728 +       if (args->flags & RPC_CLNT_CREATE_TAGGED)
24729 +               clnt->cl_tag = 1; */
24730         return clnt;
24731  }
24732
24733 diff -NurpP --minimal linux-4.9.135/net/unix/af_unix.c linux-4.9.135-vs2.3.9.8/net/unix/af_unix.c
24734 --- linux-4.9.135/net/unix/af_unix.c    2018-10-20 10:39:26.000000000 +0000
24735 +++ linux-4.9.135-vs2.3.9.8/net/unix/af_unix.c  2018-10-20 04:58:15.000000000 +0000
24736 @@ -117,6 +117,8 @@
24737  #include <net/checksum.h>
24738  #include <linux/security.h>
24739  #include <linux/freezer.h>
24740 +#include <linux/vs_context.h>
24741 +#include <linux/vs_limit.h>
24742
24743  struct hlist_head unix_socket_table[2 * UNIX_HASH_SIZE];
24744  EXPORT_SYMBOL_GPL(unix_socket_table);
24745 @@ -282,6 +284,8 @@ static struct sock *__unix_find_socket_b
24746                 if (!net_eq(sock_net(s), net))
24747                         continue;
24748
24749 +               if (!nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT))
24750 +                       continue;
24751                 if (u->addr->len == len &&
24752                     !memcmp(u->addr->name, sunname, len))
24753                         goto found;
24754 @@ -2732,6 +2736,8 @@ static struct sock *unix_from_bucket(str
24755         for (sk = sk_head(&unix_socket_table[bucket]); sk; sk = sk_next(sk)) {
24756                 if (sock_net(sk) != seq_file_net(seq))
24757                         continue;
24758 +               if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
24759 +                       continue;
24760                 if (++count == offset)
24761                         break;
24762         }
24763 @@ -2749,6 +2755,8 @@ static struct sock *unix_next_socket(str
24764                 sk = sk_next(sk);
24765                 if (!sk)
24766                         goto next_bucket;
24767 +               if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
24768 +                       continue;
24769                 if (sock_net(sk) == seq_file_net(seq))
24770                         return sk;
24771         }
24772 diff -NurpP --minimal linux-4.9.135/net/unix/diag.c linux-4.9.135-vs2.3.9.8/net/unix/diag.c
24773 --- linux-4.9.135/net/unix/diag.c       2018-10-20 10:39:26.000000000 +0000
24774 +++ linux-4.9.135-vs2.3.9.8/net/unix/diag.c     2018-10-20 06:31:18.000000000 +0000
24775 @@ -4,6 +4,7 @@
24776  #include <linux/unix_diag.h>
24777  #include <linux/skbuff.h>
24778  #include <linux/module.h>
24779 +#include <linux/vs_network.h>
24780  #include <net/netlink.h>
24781  #include <net/af_unix.h>
24782  #include <net/tcp_states.h>
24783 @@ -199,6 +200,8 @@ static int unix_diag_dump(struct sk_buff
24784                 sk_for_each(sk, &unix_socket_table[slot]) {
24785                         if (!net_eq(sock_net(sk), net))
24786                                 continue;
24787 +                       if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
24788 +                               continue;
24789                         if (num < s_num)
24790                                 goto next;
24791                         if (!(req->udiag_states & (1 << sk->sk_state)))
24792 diff -NurpP --minimal linux-4.9.135/scripts/checksyscalls.sh linux-4.9.135-vs2.3.9.8/scripts/checksyscalls.sh
24793 --- linux-4.9.135/scripts/checksyscalls.sh      2016-12-11 19:17:54.000000000 +0000
24794 +++ linux-4.9.135-vs2.3.9.8/scripts/checksyscalls.sh    2018-10-20 04:58:15.000000000 +0000
24795 @@ -196,7 +196,6 @@ cat << EOF
24796  #define __IGNORE_afs_syscall
24797  #define __IGNORE_getpmsg
24798  #define __IGNORE_putpmsg
24799 -#define __IGNORE_vserver
24800  EOF
24801  }
24802
24803 diff -NurpP --minimal linux-4.9.135/security/commoncap.c linux-4.9.135-vs2.3.9.8/security/commoncap.c
24804 --- linux-4.9.135/security/commoncap.c  2016-12-11 19:17:54.000000000 +0000
24805 +++ linux-4.9.135-vs2.3.9.8/security/commoncap.c        2018-10-20 04:58:15.000000000 +0000
24806 @@ -71,6 +71,7 @@ static void warn_setuid_and_fcaps_mixed(
24807  int cap_capable(const struct cred *cred, struct user_namespace *targ_ns,
24808                 int cap, int audit)
24809  {
24810 +       struct vx_info *vxi = current_vx_info(); /* FIXME: get vxi from cred? */
24811         struct user_namespace *ns = targ_ns;
24812
24813         /* See if cred has the capability in the target user namespace
24814 @@ -79,8 +80,12 @@ int cap_capable(const struct cred *cred,
24815          */
24816         for (;;) {
24817                 /* Do we have the necessary capabilities? */
24818 -               if (ns == cred->user_ns)
24819 -                       return cap_raised(cred->cap_effective, cap) ? 0 : -EPERM;
24820 +               if (ns == cred->user_ns) {
24821 +                       if (vx_info_flags(vxi, VXF_STATE_SETUP, 0) &&
24822 +                           cap_raised(cred->cap_effective, cap))
24823 +                               return 0;
24824 +                       return vx_cap_raised(vxi, cred->cap_effective, cap) ? 0 : -EPERM;
24825 +               }
24826
24827                 /* Have we tried all of the parent namespaces? */
24828                 if (ns == &init_user_ns)
24829 @@ -667,7 +672,7 @@ int cap_inode_setxattr(struct dentry *de
24830
24831         if (!strncmp(name, XATTR_SECURITY_PREFIX,
24832                      sizeof(XATTR_SECURITY_PREFIX) - 1) &&
24833 -           !capable(CAP_SYS_ADMIN))
24834 +               !vx_capable(CAP_SYS_ADMIN, VXC_FS_SECURITY))
24835                 return -EPERM;
24836         return 0;
24837  }
24838 @@ -693,7 +698,7 @@ int cap_inode_removexattr(struct dentry
24839
24840         if (!strncmp(name, XATTR_SECURITY_PREFIX,
24841                      sizeof(XATTR_SECURITY_PREFIX) - 1) &&
24842 -           !capable(CAP_SYS_ADMIN))
24843 +               !vx_capable(CAP_SYS_ADMIN, VXC_FS_SECURITY))
24844                 return -EPERM;
24845         return 0;
24846  }
24847 diff -NurpP --minimal linux-4.9.135/security/selinux/hooks.c linux-4.9.135-vs2.3.9.8/security/selinux/hooks.c
24848 --- linux-4.9.135/security/selinux/hooks.c      2018-10-20 10:39:26.000000000 +0000
24849 +++ linux-4.9.135-vs2.3.9.8/security/selinux/hooks.c    2018-10-20 04:58:15.000000000 +0000
24850 @@ -67,7 +67,6 @@
24851  #include <linux/dccp.h>
24852  #include <linux/quota.h>
24853  #include <linux/un.h>          /* for Unix socket types */
24854 -#include <net/af_unix.h>       /* for Unix socket types */
24855  #include <linux/parser.h>
24856  #include <linux/nfs_mount.h>
24857  #include <net/ipv6.h>