1 diff -NurpP --minimal linux-4.9.82/Documentation/vserver/debug.txt linux-4.9.82-vs2.3.9.7/Documentation/vserver/debug.txt
2 --- linux-4.9.82/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000
3 +++ linux-4.9.82-vs2.3.9.7/Documentation/vserver/debug.txt 2018-01-10 02:50:49.000000000 +0000
8 + 2 4 "vx_map_tgid: %p/%llx: %d -> %d"
9 + "vx_rmap_tgid: %p/%llx: %d -> %d"
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"
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?)"
40 + 2 4 "dentry_open(new): %p"
41 + "dentry_open(old): %p"
42 + "lookup_create(new): %p"
44 + "path_lookup(old): %d"
45 + "vfs_create(new): %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]"
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"
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])"
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)"
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"
111 + 7 80 "dx_parse_tag(?%s?): %d:#%d"
112 + "dx_propagate_tag(%p[#%lu.%d]): %d,%d"
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)*"
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]"
153 + n 2^n "vx_acc_cres[%5d,%s,%2d]: %5d%s"
154 + "vx_cres_avail[%5d,%s,%2d]: %5ld > %5d + %5d"
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.82/arch/alpha/Kconfig linux-4.9.82-vs2.3.9.7/arch/alpha/Kconfig
160 --- linux-4.9.82/arch/alpha/Kconfig 2016-12-11 19:17:54.000000000 +0000
161 +++ linux-4.9.82-vs2.3.9.7/arch/alpha/Kconfig 2018-01-10 02:50:49.000000000 +0000
162 @@ -743,6 +743,8 @@ config DUMMY_CONSOLE
166 +source "kernel/vserver/Kconfig"
168 source "security/Kconfig"
170 source "crypto/Kconfig"
171 diff -NurpP --minimal linux-4.9.82/arch/alpha/kernel/systbls.S linux-4.9.82-vs2.3.9.7/arch/alpha/kernel/systbls.S
172 --- linux-4.9.82/arch/alpha/kernel/systbls.S 2016-12-11 19:17:54.000000000 +0000
173 +++ linux-4.9.82-vs2.3.9.7/arch/alpha/kernel/systbls.S 2018-01-10 02:50:49.000000000 +0000
174 @@ -446,7 +446,7 @@ sys_call_table:
175 .quad sys_stat64 /* 425 */
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.82/arch/alpha/kernel/traps.c linux-4.9.82-vs2.3.9.7/arch/alpha/kernel/traps.c
184 --- linux-4.9.82/arch/alpha/kernel/traps.c 2018-02-22 21:18:14.000000000 +0000
185 +++ linux-4.9.82-vs2.3.9.7/arch/alpha/kernel/traps.c 2018-02-22 21:31:39.000000000 +0000
186 @@ -179,7 +179,8 @@ die_if_kernel(char * str, struct pt_regs
188 printk("CPU %d ", hard_smp_processor_id());
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.82/arch/arm/Kconfig linux-4.9.82-vs2.3.9.7/arch/arm/Kconfig
197 --- linux-4.9.82/arch/arm/Kconfig 2016-12-11 19:17:54.000000000 +0000
198 +++ linux-4.9.82-vs2.3.9.7/arch/arm/Kconfig 2018-01-10 02:50:49.000000000 +0000
199 @@ -2199,6 +2199,8 @@ source "fs/Kconfig"
201 source "arch/arm/Kconfig.debug"
203 +source "kernel/vserver/Kconfig"
205 source "security/Kconfig"
207 source "crypto/Kconfig"
208 diff -NurpP --minimal linux-4.9.82/arch/arm/kernel/calls.S linux-4.9.82-vs2.3.9.7/arch/arm/kernel/calls.S
209 --- linux-4.9.82/arch/arm/kernel/calls.S 2016-12-11 19:17:54.000000000 +0000
210 +++ linux-4.9.82-vs2.3.9.7/arch/arm/kernel/calls.S 2018-01-10 02:50:49.000000000 +0000
212 /* 310 */ CALL(sys_request_key)
214 CALL(ABI(sys_semtimedop, sys_oabi_semtimedop))
215 -/* vserver */ CALL(sys_ni_syscall)
218 /* 315 */ CALL(sys_ioprio_get)
219 CALL(sys_inotify_init)
220 diff -NurpP --minimal linux-4.9.82/arch/arm/kernel/traps.c linux-4.9.82-vs2.3.9.7/arch/arm/kernel/traps.c
221 --- linux-4.9.82/arch/arm/kernel/traps.c 2018-02-22 21:18:14.000000000 +0000
222 +++ linux-4.9.82-vs2.3.9.7/arch/arm/kernel/traps.c 2018-01-10 02:50:49.000000000 +0000
223 @@ -278,8 +278,8 @@ static int __die(const char *str, int er
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));
232 if (!user_mode(regs) || in_interrupt()) {
233 dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
234 diff -NurpP --minimal linux-4.9.82/arch/cris/Kconfig linux-4.9.82-vs2.3.9.7/arch/cris/Kconfig
235 --- linux-4.9.82/arch/cris/Kconfig 2016-12-11 19:17:54.000000000 +0000
236 +++ linux-4.9.82-vs2.3.9.7/arch/cris/Kconfig 2018-01-10 02:50:49.000000000 +0000
237 @@ -583,6 +583,8 @@ source "fs/Kconfig"
239 source "arch/cris/Kconfig.debug"
241 +source "kernel/vserver/Kconfig"
243 source "security/Kconfig"
245 source "crypto/Kconfig"
246 diff -NurpP --minimal linux-4.9.82/arch/ia64/Kconfig linux-4.9.82-vs2.3.9.7/arch/ia64/Kconfig
247 --- linux-4.9.82/arch/ia64/Kconfig 2016-12-11 19:17:54.000000000 +0000
248 +++ linux-4.9.82-vs2.3.9.7/arch/ia64/Kconfig 2018-01-10 02:50:49.000000000 +0000
249 @@ -602,6 +602,8 @@ source "fs/Kconfig"
251 source "arch/ia64/Kconfig.debug"
253 +source "kernel/vserver/Kconfig"
255 source "security/Kconfig"
257 source "crypto/Kconfig"
258 diff -NurpP --minimal linux-4.9.82/arch/ia64/kernel/entry.S linux-4.9.82-vs2.3.9.7/arch/ia64/kernel/entry.S
259 --- linux-4.9.82/arch/ia64/kernel/entry.S 2016-12-11 19:17:54.000000000 +0000
260 +++ linux-4.9.82-vs2.3.9.7/arch/ia64/kernel/entry.S 2018-01-10 02:50:49.000000000 +0000
261 @@ -1697,7 +1697,7 @@ sys_call_table:
263 data8 sys_mq_getsetattr
265 - data8 sys_ni_syscall // reserved for vserver
267 data8 sys_waitid // 1270
269 data8 sys_request_key
270 diff -NurpP --minimal linux-4.9.82/arch/ia64/kernel/ptrace.c linux-4.9.82-vs2.3.9.7/arch/ia64/kernel/ptrace.c
271 --- linux-4.9.82/arch/ia64/kernel/ptrace.c 2018-02-22 21:18:15.000000000 +0000
272 +++ linux-4.9.82-vs2.3.9.7/arch/ia64/kernel/ptrace.c 2018-01-10 02:50:49.000000000 +0000
274 #include <linux/regset.h>
275 #include <linux/elf.h>
276 #include <linux/tracehook.h>
277 +#include <linux/vs_base.h>
279 #include <asm/pgtable.h>
280 #include <asm/processor.h>
281 diff -NurpP --minimal linux-4.9.82/arch/ia64/kernel/traps.c linux-4.9.82-vs2.3.9.7/arch/ia64/kernel/traps.c
282 --- linux-4.9.82/arch/ia64/kernel/traps.c 2016-12-11 19:17:54.000000000 +0000
283 +++ linux-4.9.82-vs2.3.9.7/arch/ia64/kernel/traps.c 2018-01-10 02:50:49.000000000 +0000
284 @@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re
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)
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;
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);
308 diff -NurpP --minimal linux-4.9.82/arch/m32r/kernel/traps.c linux-4.9.82-vs2.3.9.7/arch/m32r/kernel/traps.c
309 --- linux-4.9.82/arch/m32r/kernel/traps.c 2016-12-11 19:17:54.000000000 +0000
310 +++ linux-4.9.82-vs2.3.9.7/arch/m32r/kernel/traps.c 2018-01-10 02:50:49.000000000 +0000
311 @@ -184,8 +184,9 @@ static void show_registers(struct pt_reg
313 printk("SPI: %08lx\n", sp);
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);
322 * When in-kernel, we also print out the stack and code at the
323 diff -NurpP --minimal linux-4.9.82/arch/m68k/Kconfig linux-4.9.82-vs2.3.9.7/arch/m68k/Kconfig
324 --- linux-4.9.82/arch/m68k/Kconfig 2016-12-11 19:17:54.000000000 +0000
325 +++ linux-4.9.82-vs2.3.9.7/arch/m68k/Kconfig 2018-01-10 02:50:49.000000000 +0000
326 @@ -163,6 +163,8 @@ source "fs/Kconfig"
328 source "arch/m68k/Kconfig.debug"
330 +source "kernel/vserver/Kconfig"
332 source "security/Kconfig"
334 source "crypto/Kconfig"
335 diff -NurpP --minimal linux-4.9.82/arch/mips/Kconfig linux-4.9.82-vs2.3.9.7/arch/mips/Kconfig
336 --- linux-4.9.82/arch/mips/Kconfig 2018-02-22 21:18:15.000000000 +0000
337 +++ linux-4.9.82-vs2.3.9.7/arch/mips/Kconfig 2018-01-10 02:50:49.000000000 +0000
338 @@ -3189,6 +3189,8 @@ source "fs/Kconfig"
340 source "arch/mips/Kconfig.debug"
342 +source "kernel/vserver/Kconfig"
344 source "security/Kconfig"
346 source "crypto/Kconfig"
347 diff -NurpP --minimal linux-4.9.82/arch/mips/kernel/ptrace.c linux-4.9.82-vs2.3.9.7/arch/mips/kernel/ptrace.c
348 --- linux-4.9.82/arch/mips/kernel/ptrace.c 2018-02-22 21:18:16.000000000 +0000
349 +++ linux-4.9.82-vs2.3.9.7/arch/mips/kernel/ptrace.c 2018-01-25 00:21:31.000000000 +0000
351 #include <linux/audit.h>
352 #include <linux/seccomp.h>
353 #include <linux/ftrace.h>
354 +#include <linux/vs_base.h>
356 #include <asm/byteorder.h>
358 @@ -784,6 +785,9 @@ long arch_ptrace(struct task_struct *chi
359 void __user *datavp = (void __user *) data;
360 unsigned long __user *datalp = (void __user *) data;
362 + if (!vx_check(vx_task_xid(child), VS_WATCH_P | VS_IDENT))
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.82/arch/mips/kernel/scall32-o32.S linux-4.9.82-vs2.3.9.7/arch/mips/kernel/scall32-o32.S
369 --- linux-4.9.82/arch/mips/kernel/scall32-o32.S 2018-02-22 21:18:16.000000000 +0000
370 +++ linux-4.9.82-vs2.3.9.7/arch/mips/kernel/scall32-o32.S 2018-01-10 02:50:49.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 */
378 PTR sys_ni_syscall /* available, was setaltroot */
379 PTR sys_add_key /* 4280 */
380 diff -NurpP --minimal linux-4.9.82/arch/mips/kernel/scall64-64.S linux-4.9.82-vs2.3.9.7/arch/mips/kernel/scall64-64.S
381 --- linux-4.9.82/arch/mips/kernel/scall64-64.S 2018-02-22 21:18:16.000000000 +0000
382 +++ linux-4.9.82-vs2.3.9.7/arch/mips/kernel/scall64-64.S 2018-01-10 02:50:49.000000000 +0000
383 @@ -348,7 +348,7 @@ EXPORT(sys_call_table)
384 PTR sys_mq_timedreceive
386 PTR sys_mq_getsetattr /* 5235 */
387 - PTR sys_ni_syscall /* sys_vserver */
390 PTR sys_ni_syscall /* available, was setaltroot */
392 diff -NurpP --minimal linux-4.9.82/arch/mips/kernel/scall64-n32.S linux-4.9.82-vs2.3.9.7/arch/mips/kernel/scall64-n32.S
393 --- linux-4.9.82/arch/mips/kernel/scall64-n32.S 2018-02-22 21:18:16.000000000 +0000
394 +++ linux-4.9.82-vs2.3.9.7/arch/mips/kernel/scall64-n32.S 2018-01-10 02:50:49.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 */
404 diff -NurpP --minimal linux-4.9.82/arch/mips/kernel/scall64-o32.S linux-4.9.82-vs2.3.9.7/arch/mips/kernel/scall64-o32.S
405 --- linux-4.9.82/arch/mips/kernel/scall64-o32.S 2018-02-22 21:18:16.000000000 +0000
406 +++ linux-4.9.82-vs2.3.9.7/arch/mips/kernel/scall64-o32.S 2018-01-10 02:50:49.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 */
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.82/arch/mips/kernel/traps.c linux-4.9.82-vs2.3.9.7/arch/mips/kernel/traps.c
417 --- linux-4.9.82/arch/mips/kernel/traps.c 2018-02-22 21:18:16.000000000 +0000
418 +++ linux-4.9.82-vs2.3.9.7/arch/mips/kernel/traps.c 2018-01-10 02:50:49.000000000 +0000
419 @@ -360,9 +360,10 @@ void show_registers(struct pt_regs *regs
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) {
433 diff -NurpP --minimal linux-4.9.82/arch/parisc/Kconfig linux-4.9.82-vs2.3.9.7/arch/parisc/Kconfig
434 --- linux-4.9.82/arch/parisc/Kconfig 2016-12-11 19:17:54.000000000 +0000
435 +++ linux-4.9.82-vs2.3.9.7/arch/parisc/Kconfig 2018-01-10 02:50:49.000000000 +0000
436 @@ -348,6 +348,8 @@ config SECCOMP
438 If unsure, say Y. Only embedded should say N here.
440 +source "kernel/vserver/Kconfig"
442 source "security/Kconfig"
444 source "crypto/Kconfig"
445 diff -NurpP --minimal linux-4.9.82/arch/parisc/kernel/syscall_table.S linux-4.9.82-vs2.3.9.7/arch/parisc/kernel/syscall_table.S
446 --- linux-4.9.82/arch/parisc/kernel/syscall_table.S 2018-02-22 21:18:16.000000000 +0000
447 +++ linux-4.9.82-vs2.3.9.7/arch/parisc/kernel/syscall_table.S 2018-01-10 02:50:49.000000000 +0000
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)
455 ENTRY_SAME(request_key) /* 265 */
457 diff -NurpP --minimal linux-4.9.82/arch/parisc/kernel/traps.c linux-4.9.82-vs2.3.9.7/arch/parisc/kernel/traps.c
458 --- linux-4.9.82/arch/parisc/kernel/traps.c 2016-12-11 19:17:54.000000000 +0000
459 +++ linux-4.9.82-vs2.3.9.7/arch/parisc/kernel/traps.c 2018-01-10 02:50:49.000000000 +0000
460 @@ -235,8 +235,9 @@ void die_if_kernel(char *str, struct pt_
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]);
472 @@ -266,8 +267,8 @@ void die_if_kernel(char *str, struct pt_
473 pdc_console_restart();
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);
481 /* Wot's wrong wif bein' racy? */
482 if (current->thread.flags & PARISC_KERNEL_DEATH) {
483 diff -NurpP --minimal linux-4.9.82/arch/powerpc/Kconfig linux-4.9.82-vs2.3.9.7/arch/powerpc/Kconfig
484 --- linux-4.9.82/arch/powerpc/Kconfig 2018-02-22 21:18:16.000000000 +0000
485 +++ linux-4.9.82-vs2.3.9.7/arch/powerpc/Kconfig 2018-02-22 21:31:39.000000000 +0000
486 @@ -1086,6 +1086,8 @@ source "lib/Kconfig"
488 source "arch/powerpc/Kconfig.debug"
490 +source "kernel/vserver/Kconfig"
492 source "security/Kconfig"
494 source "crypto/Kconfig"
495 diff -NurpP --minimal linux-4.9.82/arch/powerpc/include/uapi/asm/unistd.h linux-4.9.82-vs2.3.9.7/arch/powerpc/include/uapi/asm/unistd.h
496 --- linux-4.9.82/arch/powerpc/include/uapi/asm/unistd.h 2016-12-11 19:17:54.000000000 +0000
497 +++ linux-4.9.82-vs2.3.9.7/arch/powerpc/include/uapi/asm/unistd.h 2018-01-10 02:50:49.000000000 +0000
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.82/arch/s390/Kconfig linux-4.9.82-vs2.3.9.7/arch/s390/Kconfig
508 --- linux-4.9.82/arch/s390/Kconfig 2018-02-22 21:18:17.000000000 +0000
509 +++ linux-4.9.82-vs2.3.9.7/arch/s390/Kconfig 2018-01-10 02:50:49.000000000 +0000
510 @@ -729,6 +729,8 @@ source "fs/Kconfig"
512 source "arch/s390/Kconfig.debug"
514 +source "kernel/vserver/Kconfig"
516 source "security/Kconfig"
518 source "crypto/Kconfig"
519 diff -NurpP --minimal linux-4.9.82/arch/s390/include/asm/tlb.h linux-4.9.82-vs2.3.9.7/arch/s390/include/asm/tlb.h
520 --- linux-4.9.82/arch/s390/include/asm/tlb.h 2016-12-11 19:17:54.000000000 +0000
521 +++ linux-4.9.82-vs2.3.9.7/arch/s390/include/asm/tlb.h 2018-01-10 02:50:49.000000000 +0000
523 #include <linux/mm.h>
524 #include <linux/pagemap.h>
525 #include <linux/swap.h>
527 #include <asm/processor.h>
528 #include <asm/pgalloc.h>
529 #include <asm/tlbflush.h>
530 diff -NurpP --minimal linux-4.9.82/arch/s390/include/uapi/asm/unistd.h linux-4.9.82-vs2.3.9.7/arch/s390/include/uapi/asm/unistd.h
531 --- linux-4.9.82/arch/s390/include/uapi/asm/unistd.h 2016-12-11 19:17:54.000000000 +0000
532 +++ linux-4.9.82-vs2.3.9.7/arch/s390/include/uapi/asm/unistd.h 2018-01-10 02:50:49.000000000 +0000
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.82/arch/s390/kernel/ptrace.c linux-4.9.82-vs2.3.9.7/arch/s390/kernel/ptrace.c
543 --- linux-4.9.82/arch/s390/kernel/ptrace.c 2018-02-22 21:18:17.000000000 +0000
544 +++ linux-4.9.82-vs2.3.9.7/arch/s390/kernel/ptrace.c 2018-01-10 02:50:49.000000000 +0000
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.82/arch/s390/kernel/syscalls.S linux-4.9.82-vs2.3.9.7/arch/s390/kernel/syscalls.S
554 --- linux-4.9.82/arch/s390/kernel/syscalls.S 2018-02-22 21:18:17.000000000 +0000
555 +++ linux-4.9.82-vs2.3.9.7/arch/s390/kernel/syscalls.S 2018-01-10 02:50:49.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.82/arch/sh/Kconfig linux-4.9.82-vs2.3.9.7/arch/sh/Kconfig
566 --- linux-4.9.82/arch/sh/Kconfig 2016-12-11 19:17:54.000000000 +0000
567 +++ linux-4.9.82-vs2.3.9.7/arch/sh/Kconfig 2018-01-10 02:50:49.000000000 +0000
568 @@ -904,6 +904,8 @@ source "fs/Kconfig"
570 source "arch/sh/Kconfig.debug"
572 +source "kernel/vserver/Kconfig"
574 source "security/Kconfig"
576 source "crypto/Kconfig"
577 diff -NurpP --minimal linux-4.9.82/arch/sh/kernel/irq.c linux-4.9.82-vs2.3.9.7/arch/sh/kernel/irq.c
578 --- linux-4.9.82/arch/sh/kernel/irq.c 2016-12-11 19:17:54.000000000 +0000
579 +++ linux-4.9.82-vs2.3.9.7/arch/sh/kernel/irq.c 2018-01-10 02:50:49.000000000 +0000
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.82/arch/sparc/Kconfig linux-4.9.82-vs2.3.9.7/arch/sparc/Kconfig
589 --- linux-4.9.82/arch/sparc/Kconfig 2018-02-22 21:18:17.000000000 +0000
590 +++ linux-4.9.82-vs2.3.9.7/arch/sparc/Kconfig 2018-01-10 02:50:49.000000000 +0000
591 @@ -580,6 +580,8 @@ source "fs/Kconfig"
593 source "arch/sparc/Kconfig.debug"
595 +source "kernel/vserver/Kconfig"
597 source "security/Kconfig"
599 source "crypto/Kconfig"
600 diff -NurpP --minimal linux-4.9.82/arch/sparc/include/uapi/asm/unistd.h linux-4.9.82-vs2.3.9.7/arch/sparc/include/uapi/asm/unistd.h
601 --- linux-4.9.82/arch/sparc/include/uapi/asm/unistd.h 2016-12-11 19:17:54.000000000 +0000
602 +++ linux-4.9.82-vs2.3.9.7/arch/sparc/include/uapi/asm/unistd.h 2018-01-10 02:50:49.000000000 +0000
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.82/arch/sparc/kernel/systbls_32.S linux-4.9.82-vs2.3.9.7/arch/sparc/kernel/systbls_32.S
613 --- linux-4.9.82/arch/sparc/kernel/systbls_32.S 2016-12-11 19:17:54.000000000 +0000
614 +++ linux-4.9.82-vs2.3.9.7/arch/sparc/kernel/systbls_32.S 2018-01-10 02:50:49.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.82/arch/sparc/kernel/systbls_64.S linux-4.9.82-vs2.3.9.7/arch/sparc/kernel/systbls_64.S
625 --- linux-4.9.82/arch/sparc/kernel/systbls_64.S 2016-12-11 19:17:54.000000000 +0000
626 +++ linux-4.9.82-vs2.3.9.7/arch/sparc/kernel/systbls_64.S 2018-01-10 02:50:49.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.82/arch/um/Kconfig.rest linux-4.9.82-vs2.3.9.7/arch/um/Kconfig.rest
646 --- linux-4.9.82/arch/um/Kconfig.rest 2016-12-11 19:17:54.000000000 +0000
647 +++ linux-4.9.82-vs2.3.9.7/arch/um/Kconfig.rest 2018-01-10 02:50:49.000000000 +0000
648 @@ -12,6 +12,8 @@ source "arch/um/Kconfig.net"
652 +source "kernel/vserver/Kconfig"
654 source "security/Kconfig"
656 source "crypto/Kconfig"
657 diff -NurpP --minimal linux-4.9.82/arch/x86/Kconfig linux-4.9.82-vs2.3.9.7/arch/x86/Kconfig
658 --- linux-4.9.82/arch/x86/Kconfig 2018-02-22 21:18:17.000000000 +0000
659 +++ linux-4.9.82-vs2.3.9.7/arch/x86/Kconfig 2018-01-25 00:21:31.000000000 +0000
660 @@ -2777,6 +2777,8 @@ source "fs/Kconfig"
662 source "arch/x86/Kconfig.debug"
664 +source "kernel/vserver/Kconfig"
666 source "security/Kconfig"
668 source "crypto/Kconfig"
669 diff -NurpP --minimal linux-4.9.82/arch/x86/entry/syscalls/syscall_32.tbl linux-4.9.82-vs2.3.9.7/arch/x86/entry/syscalls/syscall_32.tbl
670 --- linux-4.9.82/arch/x86/entry/syscalls/syscall_32.tbl 2016-12-11 19:17:54.000000000 +0000
671 +++ linux-4.9.82-vs2.3.9.7/arch/x86/entry/syscalls/syscall_32.tbl 2018-01-10 02:50:49.000000000 +0000
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
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.82/arch/x86/entry/syscalls/syscall_64.tbl linux-4.9.82-vs2.3.9.7/arch/x86/entry/syscalls/syscall_64.tbl
682 --- linux-4.9.82/arch/x86/entry/syscalls/syscall_64.tbl 2016-12-11 19:17:54.000000000 +0000
683 +++ linux-4.9.82-vs2.3.9.7/arch/x86/entry/syscalls/syscall_64.tbl 2018-01-10 02:50:49.000000000 +0000
685 233 common epoll_ctl sys_epoll_ctl
686 234 common tgkill sys_tgkill
687 235 common utimes sys_utimes
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.82/block/ioprio.c linux-4.9.82-vs2.3.9.7/block/ioprio.c
694 --- linux-4.9.82/block/ioprio.c 2016-12-11 19:17:54.000000000 +0000
695 +++ linux-4.9.82-vs2.3.9.7/block/ioprio.c 2018-01-10 02:50:49.000000000 +0000
697 #include <linux/syscalls.h>
698 #include <linux/security.h>
699 #include <linux/pid_namespace.h>
700 +#include <linux/vs_base.h>
702 int set_task_ioprio(struct task_struct *task, int ioprio)
704 @@ -105,6 +106,8 @@ SYSCALL_DEFINE3(ioprio_set, int, which,
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))
710 ret = set_task_ioprio(p, ioprio);
713 @@ -203,6 +206,8 @@ SYSCALL_DEFINE2(ioprio_get, int, which,
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))
719 tmpio = get_task_ioprio(p);
722 diff -NurpP --minimal linux-4.9.82/drivers/block/Kconfig linux-4.9.82-vs2.3.9.7/drivers/block/Kconfig
723 --- linux-4.9.82/drivers/block/Kconfig 2016-12-11 19:17:54.000000000 +0000
724 +++ linux-4.9.82-vs2.3.9.7/drivers/block/Kconfig 2018-01-10 02:50:49.000000000 +0000
725 @@ -273,6 +273,13 @@ config BLK_DEV_CRYPTOLOOP
727 source "drivers/block/drbd/Kconfig"
729 +config BLK_DEV_VROOT
730 + tristate "Virtual Root device support"
731 + depends on QUOTACTL
733 + Saying Y here will allow you to use quota/fs ioctls on a shared
734 + partition within a virtual server without compromising security.
737 tristate "Network block device support"
739 diff -NurpP --minimal linux-4.9.82/drivers/block/Makefile linux-4.9.82-vs2.3.9.7/drivers/block/Makefile
740 --- linux-4.9.82/drivers/block/Makefile 2016-12-11 19:17:54.000000000 +0000
741 +++ linux-4.9.82-vs2.3.9.7/drivers/block/Makefile 2018-01-10 02:50:49.000000000 +0000
742 @@ -31,6 +31,7 @@ obj-$(CONFIG_VIRTIO_BLK) += virtio_blk.o
744 obj-$(CONFIG_BLK_DEV_SX8) += sx8.o
745 obj-$(CONFIG_BLK_DEV_HD) += hd.o
746 +obj-$(CONFIG_BLK_DEV_VROOT) += vroot.o
748 obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o
749 obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/
750 diff -NurpP --minimal linux-4.9.82/drivers/block/loop.c linux-4.9.82-vs2.3.9.7/drivers/block/loop.c
751 --- linux-4.9.82/drivers/block/loop.c 2018-02-22 21:18:20.000000000 +0000
752 +++ linux-4.9.82-vs2.3.9.7/drivers/block/loop.c 2018-02-10 15:15:43.000000000 +0000
754 #include <linux/miscdevice.h>
755 #include <linux/falloc.h>
756 #include <linux/uio.h>
757 +#include <linux/vs_context.h>
760 #include <asm/uaccess.h>
761 @@ -924,6 +925,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;
769 @@ -1044,6 +1046,7 @@ static int loop_clr_fd(struct loop_devic
771 lo->lo_sizelimit = 0;
772 lo->lo_encrypt_key_size = 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 @@ -1090,7 +1093,7 @@ loop_set_status(struct loop_device *lo,
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))
784 if (lo->lo_state != Lo_bound)
786 @@ -1191,7 +1194,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 @@ -1552,6 +1556,11 @@ static int lo_open(struct block_device *
800 + if (!vx_check(lo->lo_xid, VS_IDENT|VS_HOSTID|VS_ADMIN_P)) {
805 atomic_inc(&lo->lo_refcnt);
807 mutex_unlock(&loop_index_mutex);
808 diff -NurpP --minimal linux-4.9.82/drivers/block/loop.h linux-4.9.82-vs2.3.9.7/drivers/block/loop.h
809 --- linux-4.9.82/drivers/block/loop.h 2016-12-11 19:17:54.000000000 +0000
810 +++ linux-4.9.82-vs2.3.9.7/drivers/block/loop.h 2018-01-10 02:50:49.000000000 +0000
811 @@ -43,6 +43,7 @@ struct loop_device {
812 struct loop_func_table *lo_encryption;
814 kuid_t lo_key_owner; /* Who set the key */
816 int (*ioctl)(struct loop_device *, int cmd,
819 diff -NurpP --minimal linux-4.9.82/drivers/block/vroot.c linux-4.9.82-vs2.3.9.7/drivers/block/vroot.c
820 --- linux-4.9.82/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000
821 +++ linux-4.9.82-vs2.3.9.7/drivers/block/vroot.c 2018-01-13 22:00:41.000000000 +0000
824 + * linux/drivers/block/vroot.c
826 + * written by Herbert P?tzl, 9/11/2002
827 + * ported to 2.6.10 by Herbert P?tzl, 30/12/2004
829 + * based on the loop.c code by Theodore Ts'o.
831 + * Copyright (C) 2002-2007 by Herbert P?tzl.
832 + * Redistribution of this file is permitted under the
833 + * GNU General Public License.
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>
844 +#include <linux/vroot.h>
845 +#include <linux/vs_context.h>
848 +static int max_vroot = 8;
850 +static struct vroot_device *vroot_dev;
851 +static struct gendisk **disks;
854 +static int vroot_set_dev(
855 + struct vroot_device *vr,
856 + struct block_device *bdev,
859 + struct block_device *real_bdev;
861 + struct inode *inode;
865 + if (vr->vr_state != Vr_unbound)
874 + inode = file->f_path.dentry->d_inode;
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);
884 + vxdprintk(VXD_CBIT(misc, 0),
885 + "vroot[%d]_set_dev: dev=" VXF_DEV,
886 + vr->vr_number, VXD_DEV(real_bdev));
888 + vr->vr_state = Vr_bound;
897 +static int vroot_clr_dev(
898 + struct vroot_device *vr,
899 + struct block_device *bdev)
901 + struct block_device *real_bdev;
903 + if (vr->vr_state != Vr_bound)
905 + if (vr->vr_refcnt > 1) /* we needed one fd for the ioctl */
908 + real_bdev = vr->vr_device;
910 + vxdprintk(VXD_CBIT(misc, 0),
911 + "vroot[%d]_clr_dev: dev=" VXF_DEV,
912 + vr->vr_number, VXD_DEV(real_bdev));
915 + vr->vr_state = Vr_unbound;
916 + vr->vr_device = NULL;
921 +static int vr_ioctl(struct block_device *bdev, fmode_t mode,
922 + unsigned int cmd, unsigned long arg)
924 + struct vroot_device *vr = bdev->bd_disk->private_data;
927 + down(&vr->vr_ctl_mutex);
929 + case VROOT_SET_DEV:
930 + err = vroot_set_dev(vr, bdev, arg);
932 + case VROOT_CLR_DEV:
933 + err = vroot_clr_dev(vr, bdev);
939 + up(&vr->vr_ctl_mutex);
943 +static int vr_open(struct block_device *bdev, fmode_t mode)
945 + struct vroot_device *vr = bdev->bd_disk->private_data;
947 + down(&vr->vr_ctl_mutex);
949 + up(&vr->vr_ctl_mutex);
953 +static void vr_release(struct gendisk *disk, fmode_t mode)
955 + struct vroot_device *vr = disk->private_data;
957 + down(&vr->vr_ctl_mutex);
959 + up(&vr->vr_ctl_mutex);
962 +static struct block_device_operations vr_fops = {
963 + .owner = THIS_MODULE,
965 + .release = vr_release,
969 +static blk_qc_t vroot_make_request(struct request_queue *q, struct bio *bio)
971 + printk("vroot_make_request %p, %p\n", q, bio);
973 + return BLK_QC_T_NONE;
976 +struct block_device *__vroot_get_real_bdev(struct block_device *bdev)
978 + struct inode *inode = bdev->bd_inode;
979 + struct vroot_device *vr;
980 + struct block_device *real_bdev;
981 + int minor = iminor(inode);
983 + vr = &vroot_dev[minor];
984 + real_bdev = vr->vr_device;
986 + vxdprintk(VXD_CBIT(misc, 0),
987 + "vroot[%d]_get_real_bdev: dev=" VXF_DEV,
988 + vr->vr_number, VXD_DEV(real_bdev));
990 + if (vr->vr_state != Vr_bound)
991 + return ERR_PTR(-ENXIO);
993 + __iget(real_bdev->bd_inode);
1000 + * And now the modules code and kernel interface.
1003 +module_param(max_vroot, int, 0);
1005 +MODULE_PARM_DESC(max_vroot, "Maximum number of vroot devices (1-256)");
1006 +MODULE_LICENSE("GPL");
1007 +MODULE_ALIAS_BLOCKDEV_MAJOR(VROOT_MAJOR);
1009 +MODULE_AUTHOR ("Herbert P?tzl");
1010 +MODULE_DESCRIPTION ("Virtual Root Device Mapper");
1013 +int __init vroot_init(void)
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);
1024 + if (register_blkdev(VROOT_MAJOR, "vroot"))
1028 + vroot_dev = kmalloc(max_vroot * sizeof(struct vroot_device), GFP_KERNEL);
1031 + memset(vroot_dev, 0, max_vroot * sizeof(struct vroot_device));
1033 + disks = kmalloc(max_vroot * sizeof(struct gendisk *), GFP_KERNEL);
1037 + for (i = 0; i < max_vroot; i++) {
1038 + disks[i] = alloc_disk(1);
1041 + disks[i]->queue = blk_alloc_queue(GFP_KERNEL);
1042 + if (!disks[i]->queue)
1044 + blk_queue_make_request(disks[i]->queue, vroot_make_request);
1047 + for (i = 0; i < max_vroot; i++) {
1048 + struct vroot_device *vr = &vroot_dev[i];
1049 + struct gendisk *disk = disks[i];
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;
1061 + err = register_vroot_grb(&__vroot_get_real_bdev);
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);
1072 + put_disk(disks[i]);
1077 + unregister_blkdev(VROOT_MAJOR, "vroot");
1078 + printk(KERN_ERR "vroot: ran out of memory\n");
1082 +void vroot_exit(void)
1086 + if (unregister_vroot_grb(&__vroot_get_real_bdev))
1087 + printk(KERN_WARNING "vroot: cannot unregister grb\n");
1089 + for (i = 0; i < max_vroot; i++) {
1090 + del_gendisk(disks[i]);
1091 + put_disk(disks[i]);
1093 + unregister_blkdev(VROOT_MAJOR, "vroot");
1099 +module_init(vroot_init);
1100 +module_exit(vroot_exit);
1104 +static int __init max_vroot_setup(char *str)
1106 + max_vroot = simple_strtol(str, NULL, 0);
1110 +__setup("max_vroot=", max_vroot_setup);
1114 diff -NurpP --minimal linux-4.9.82/drivers/md/dm-core.h linux-4.9.82-vs2.3.9.7/drivers/md/dm-core.h
1115 --- linux-4.9.82/drivers/md/dm-core.h 2018-02-22 21:18:28.000000000 +0000
1116 +++ linux-4.9.82-vs2.3.9.7/drivers/md/dm-core.h 2018-01-10 08:35:10.000000000 +0000
1117 @@ -52,6 +52,7 @@ struct mapped_device {
1120 atomic_t open_count;
1123 struct dm_target *immutable_target;
1124 struct target_type *immutable_target_type;
1125 diff -NurpP --minimal linux-4.9.82/drivers/md/dm-ioctl.c linux-4.9.82-vs2.3.9.7/drivers/md/dm-ioctl.c
1126 --- linux-4.9.82/drivers/md/dm-ioctl.c 2018-02-22 21:18:28.000000000 +0000
1127 +++ linux-4.9.82-vs2.3.9.7/drivers/md/dm-ioctl.c 2018-01-10 02:50:49.000000000 +0000
1129 #include <linux/dm-ioctl.h>
1130 #include <linux/hdreg.h>
1131 #include <linux/compat.h>
1132 +#include <linux/vs_context.h>
1134 #include <asm/uaccess.h>
1136 @@ -114,7 +115,8 @@ static struct hash_cell *__get_name_cell
1137 unsigned int h = hash_str(str);
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)) {
1146 @@ -128,7 +130,8 @@ static struct hash_cell *__get_uuid_cell
1147 unsigned int h = hash_str(str);
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)) {
1156 @@ -139,13 +142,15 @@ static struct hash_cell *__get_uuid_cell
1157 static struct hash_cell *__get_dev_cell(uint64_t dev)
1159 struct mapped_device *md;
1160 - struct hash_cell *hc;
1161 + struct hash_cell *hc = NULL;
1163 md = dm_get_md(huge_decode_dev(dev));
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);
1174 @@ -467,6 +472,9 @@ typedef int (*ioctl_fn)(struct dm_ioctl
1176 static int remove_all(struct dm_ioctl *param, size_t param_size)
1178 + if (!vx_check(0, VS_ADMIN))
1181 dm_hash_remove_all(true, !!(param->flags & DM_DEFERRED_REMOVE), false);
1182 param->data_size = 0;
1184 @@ -514,6 +522,8 @@ static int list_devices(struct dm_ioctl
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))
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
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))
1200 old_nl->next = (uint32_t) ((void *) 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;
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))
1212 if (_IOC_TYPE(command) != DM_IOCTL)
1213 diff -NurpP --minimal linux-4.9.82/drivers/md/dm.c linux-4.9.82-vs2.3.9.7/drivers/md/dm.c
1214 --- linux-4.9.82/drivers/md/dm.c 2018-02-22 21:18:28.000000000 +0000
1215 +++ linux-4.9.82-vs2.3.9.7/drivers/md/dm.c 2018-01-10 08:32:35.000000000 +0000
1217 #include <linux/wait.h>
1218 #include <linux/pr.h>
1219 #include <linux/vmalloc.h>
1220 +#include <linux/vs_base.h>
1222 #define DM_MSG_PREFIX "core"
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)
1227 struct mapped_device *md;
1230 spin_lock(&_minor_lock);
1232 @@ -308,17 +310,19 @@ static int dm_blk_open(struct block_devi
1235 if (test_bit(DMF_FREEING, &md->flags) ||
1236 - dm_deleting_md(md)) {
1238 + dm_deleting_md(md))
1242 + if (!vx_check(md->xid, VS_IDENT|VS_HOSTID))
1247 atomic_inc(&md->open_count);
1250 spin_unlock(&_minor_lock);
1252 - return md ? 0 : -ENXIO;
1256 static void dm_blk_close(struct gendisk *disk, fmode_t mode)
1257 @@ -744,6 +748,14 @@ int dm_set_geometry(struct mapped_device
1262 + * Get the xid associated with a dm device
1264 +vxid_t dm_get_xid(struct mapped_device *md)
1269 /*-----------------------------------------------------------------
1271 * A more elegant soln is in the works that uses the queue
1272 @@ -1548,6 +1560,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();
1278 md->queue = blk_alloc_queue_node(GFP_KERNEL, numa_node_id);
1280 diff -NurpP --minimal linux-4.9.82/drivers/md/dm.h linux-4.9.82-vs2.3.9.7/drivers/md/dm.h
1281 --- linux-4.9.82/drivers/md/dm.h 2016-12-11 19:17:54.000000000 +0000
1282 +++ linux-4.9.82-vs2.3.9.7/drivers/md/dm.h 2018-01-10 02:50:49.000000000 +0000
1283 @@ -45,6 +45,8 @@ struct dm_dev_internal {
1285 struct dm_md_mempools;
1287 +vxid_t dm_get_xid(struct mapped_device *md);
1289 /*-----------------------------------------------------------------
1290 * Internal table functions.
1291 *---------------------------------------------------------------*/
1292 diff -NurpP --minimal linux-4.9.82/drivers/net/tun.c linux-4.9.82-vs2.3.9.7/drivers/net/tun.c
1293 --- linux-4.9.82/drivers/net/tun.c 2018-02-22 21:18:32.000000000 +0000
1294 +++ linux-4.9.82-vs2.3.9.7/drivers/net/tun.c 2018-02-10 15:15:43.000000000 +0000
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 {
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) */
1318 static void tun_set_real_num_queues(struct tun_struct *tun)
1319 @@ -1558,6 +1561,7 @@ static void tun_setup(struct net_device
1321 tun->owner = INVALID_UID;
1322 tun->group = INVALID_GID;
1323 + tun->nid = nx_current_nid();
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 ?
1331 - if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
1332 + if (!nx_ns_capable(net->user_ns, CAP_NET_ADMIN, NXC_TUN_CREATE))
1334 err = security_tun_dev_create();
1336 @@ -2134,6 +2138,16 @@ static long __tun_chr_ioctl(struct file
1337 from_kgid(&init_user_ns, tun->group));
1341 + if (!capable(CAP_CONTEXT))
1344 + /* Set nid owner of the device */
1345 + tun->nid = (vnid_t) arg;
1347 + tun_debug(KERN_INFO, tun, "nid owner set to %u\n", tun->nid);
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.82/drivers/scsi/cxgbi/libcxgbi.c linux-4.9.82-vs2.3.9.7/drivers/scsi/cxgbi/libcxgbi.c
1354 --- linux-4.9.82/drivers/scsi/cxgbi/libcxgbi.c 2016-12-11 19:17:54.000000000 +0000
1355 +++ linux-4.9.82-vs2.3.9.7/drivers/scsi/cxgbi/libcxgbi.c 2018-01-10 02:50:49.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);
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,
1364 pr_info("failed to get source address to reach %pI6\n",
1365 &daddr6->sin6_addr);
1366 diff -NurpP --minimal linux-4.9.82/drivers/tty/sysrq.c linux-4.9.82-vs2.3.9.7/drivers/tty/sysrq.c
1367 --- linux-4.9.82/drivers/tty/sysrq.c 2018-02-22 21:18:37.000000000 +0000
1368 +++ linux-4.9.82-vs2.3.9.7/drivers/tty/sysrq.c 2018-01-10 02:50:49.000000000 +0000
1370 #include <linux/syscalls.h>
1371 #include <linux/of.h>
1372 #include <linux/rcupdate.h>
1373 +#include <linux/vserver/debug.h>
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,
1382 +#ifdef CONFIG_VSERVER_DEBUG
1383 +static void sysrq_handle_vxinfo(int key)
1385 + dump_vx_info_inactive((key == 'x') ? 0 : 1);
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,
1396 /* Key Operations table and lock */
1397 static DEFINE_SPINLOCK(sysrq_key_table_lock);
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 */
1408 /* y: May be registered on sparc64 for global register dump */
1410 &sysrq_ftrace_dump_op, /* z */
1411 @@ -499,6 +519,8 @@ static int sysrq_key_table_key2index(int
1413 else if ((key >= 'a') && (key <= 'z'))
1414 retval = key + 10 - 'a';
1415 + else if ((key >= 'A') && (key <= 'Z'))
1416 + retval = key + 10 - 'A';
1420 diff -NurpP --minimal linux-4.9.82/drivers/tty/tty_io.c linux-4.9.82-vs2.3.9.7/drivers/tty/tty_io.c
1421 --- linux-4.9.82/drivers/tty/tty_io.c 2018-02-22 21:18:37.000000000 +0000
1422 +++ linux-4.9.82-vs2.3.9.7/drivers/tty/tty_io.c 2018-02-10 15:15:43.000000000 +0000
1425 #include <linux/kmod.h>
1426 #include <linux/nsproxy.h>
1427 +#include <linux/vs_pid.h>
1429 #undef TTY_DEBUG_HANGUP
1430 #ifdef TTY_DEBUG_HANGUP
1431 @@ -2292,7 +2293,8 @@ static int tiocsti(struct tty_struct *tt
1433 struct tty_ldisc *ld;
1435 - if ((current->signal->tty != tty) && !capable(CAP_SYS_ADMIN))
1436 + if (((current->signal->tty != tty) &&
1437 + !vx_capable(CAP_SYS_ADMIN, VXC_TIOCSTI)))
1439 if (get_user(ch, p))
1441 @@ -2607,6 +2609,7 @@ static int tiocspgrp(struct tty_struct *
1443 if (get_user(pgrp_nr, p))
1445 + pgrp_nr = vx_rmap_pid(pgrp_nr);
1449 diff -NurpP --minimal linux-4.9.82/fs/attr.c linux-4.9.82-vs2.3.9.7/fs/attr.c
1450 --- linux-4.9.82/fs/attr.c 2016-12-11 19:17:54.000000000 +0000
1451 +++ linux-4.9.82-vs2.3.9.7/fs/attr.c 2018-01-10 02:50:49.000000000 +0000
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>
1461 * setattr_prepare - check if attribute changes to a dentry are allowed
1462 @@ -90,6 +93,10 @@ kill_priv:
1466 + /* check for inode tag permission */
1467 + if (dx_permission(inode, MAY_WRITE))
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
1484 WARN_ON_ONCE(!inode_is_locked(inode));
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))
1492 diff -NurpP --minimal linux-4.9.82/fs/block_dev.c linux-4.9.82-vs2.3.9.7/fs/block_dev.c
1493 --- linux-4.9.82/fs/block_dev.c 2018-02-22 21:18:42.000000000 +0000
1494 +++ linux-4.9.82-vs2.3.9.7/fs/block_dev.c 2018-01-13 00:48:31.000000000 +0000
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"
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)
1514 struct block_device *bdev;
1517 + if (!vs_map_blkdev(inode->i_rdev, &mdev, DATTR_OPEN))
1519 + inode->i_mdev = mdev;
1521 spin_lock(&bdev_lock);
1522 bdev = inode->i_bdev;
1523 @@ -776,7 +783,7 @@ static struct block_device *bd_acquire(s
1525 spin_unlock(&bdev_lock);
1527 - bdev = bdget(inode->i_rdev);
1528 + bdev = bdget(mdev);
1530 spin_lock(&bdev_lock);
1531 if (!inode->i_bdev) {
1532 diff -NurpP --minimal linux-4.9.82/fs/btrfs/ctree.h linux-4.9.82-vs2.3.9.7/fs/btrfs/ctree.h
1533 --- linux-4.9.82/fs/btrfs/ctree.h 2018-02-22 21:18:43.000000000 +0000
1534 +++ linux-4.9.82-vs2.3.9.7/fs/btrfs/ctree.h 2018-01-10 02:50:49.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)
1539 +#define BTRFS_MOUNT_TAGGED (1 << 24)
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
1554 BTRFS_SETGET_FUNCS(extent_refs_v0, struct btrfs_extent_item_v0, refs, 32);
1556 +#define BTRFS_INODE_IXUNLINK (1 << 24)
1557 +#define BTRFS_INODE_BARRIER (1 << 25)
1558 +#define BTRFS_INODE_COW (1 << 26)
1561 BTRFS_SETGET_FUNCS(tree_block_level, struct btrfs_tree_block_info, level, 8);
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.82/fs/btrfs/disk-io.c linux-4.9.82-vs2.3.9.7/fs/btrfs/disk-io.c
1572 --- linux-4.9.82/fs/btrfs/disk-io.c 2018-02-22 21:18:43.000000000 +0000
1573 +++ linux-4.9.82-vs2.3.9.7/fs/btrfs/disk-io.c 2018-01-13 05:55:56.000000000 +0000
1574 @@ -2850,6 +2850,9 @@ int open_ctree(struct super_block *sb,
1578 + if (btrfs_test_opt(fs_info, TAGGED))
1579 + sb->s_flags |= MS_TAGGED;
1581 features = btrfs_super_incompat_flags(disk_super) &
1582 ~BTRFS_FEATURE_INCOMPAT_SUPP;
1584 diff -NurpP --minimal linux-4.9.82/fs/btrfs/inode.c linux-4.9.82-vs2.3.9.7/fs/btrfs/inode.c
1585 --- linux-4.9.82/fs/btrfs/inode.c 2018-02-22 21:18:43.000000000 +0000
1586 +++ linux-4.9.82-vs2.3.9.7/fs/btrfs/inode.c 2018-02-22 21:31:40.000000000 +0000
1588 #include <linux/blkdev.h>
1589 #include <linux/posix_acl_xattr.h>
1590 #include <linux/uio.h>
1591 +#include <linux/vs_tag.h>
1593 #include "disk-io.h"
1594 #include "transaction.h"
1595 @@ -3669,6 +3670,9 @@ static int btrfs_read_locked_inode(struc
1603 bool filled = false;
1604 int first_xattr_slot;
1605 @@ -3701,8 +3705,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));
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));
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));
1621 inode->i_atime.tv_sec = btrfs_timespec_sec(leaf, &inode_item->atime);
1622 @@ -3857,11 +3867,18 @@ static void fill_inode_item(struct btrfs
1623 struct inode *inode)
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));
1631 btrfs_init_map_token(&token);
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);
1640 btrfs_set_token_inode_size(leaf, item, BTRFS_I(inode)->disk_i_size,
1642 btrfs_set_token_inode_mode(leaf, item, inode->i_mode, &token);
1643 @@ -10620,6 +10637,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 @@ -10628,6 +10646,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,
1659 @@ -10693,6 +10712,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.82/fs/btrfs/ioctl.c linux-4.9.82-vs2.3.9.7/fs/btrfs/ioctl.c
1668 --- linux-4.9.82/fs/btrfs/ioctl.c 2018-02-22 21:18:43.000000000 +0000
1669 +++ linux-4.9.82-vs2.3.9.7/fs/btrfs/ioctl.c 2018-01-10 02:50:49.000000000 +0000
1670 @@ -110,10 +110,13 @@ static unsigned int btrfs_flags_to_ioctl
1672 unsigned int iflags = 0;
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;
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;
1690 + if (flags & BTRFS_INODE_BARRIER)
1691 + iflags |= FS_BARRIER_FL;
1692 + if (flags & BTRFS_INODE_COW)
1693 + iflags |= FS_COW_FL;
1698 - * Update inode->i_flags based on the btrfs internal flags.
1699 + * Update inode->i_(v)flags based on the btrfs internal flags.
1701 void btrfs_update_iflags(struct inode *inode)
1703 struct btrfs_inode *ip = BTRFS_I(inode);
1704 unsigned int new_fl = 0;
1706 - if (ip->flags & BTRFS_INODE_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;
1713 + if (ip->flags & BTRFS_INODE_SYNC)
1715 if (ip->flags & BTRFS_INODE_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;
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,
1728 + if (ip->flags & BTRFS_INODE_BARRIER)
1729 + new_fl |= V_BARRIER;
1730 + if (ip->flags & BTRFS_INODE_COW)
1733 + set_mask_bits(&inode->i_vflags,
1734 + V_BARRIER | V_COW, new_fl);
1738 + * Update btrfs internal flags from inode->i_(v)flags.
1740 +void btrfs_update_flags(struct inode *inode)
1742 + struct btrfs_inode *ip = BTRFS_I(inode);
1744 + unsigned int flags = inode->i_flags;
1745 + unsigned int vflags = inode->i_vflags;
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);
1752 + if (flags & S_IMMUTABLE)
1753 + ip->flags |= BTRFS_INODE_IMMUTABLE;
1754 + if (flags & S_IXUNLINK)
1755 + ip->flags |= BTRFS_INODE_IXUNLINK;
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;
1766 + if (vflags & V_BARRIER)
1767 + ip->flags |= BTRFS_INODE_BARRIER;
1768 + if (vflags & V_COW)
1769 + ip->flags |= BTRFS_INODE_COW;
1773 * Inherit flags from the parent inode.
1775 * Currently only the compression flags and the cow flags are inherited.
1776 @@ -170,6 +223,7 @@ void btrfs_inherit_iflags(struct inode *
1779 flags = BTRFS_I(dir)->flags;
1780 + flags &= ~BTRFS_INODE_BARRIER;
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);
1788 +int btrfs_sync_flags(struct inode *inode, int flags, int vflags)
1790 + struct btrfs_inode *ip = BTRFS_I(inode);
1791 + struct btrfs_root *root = ip->root;
1792 + struct btrfs_trans_handle *trans;
1795 + trans = btrfs_join_transaction(root);
1798 + inode->i_flags = flags;
1799 + inode->i_vflags = vflags;
1800 + btrfs_update_flags(inode);
1802 + ret = btrfs_update_inode(trans, root, inode);
1805 + btrfs_update_iflags(inode);
1806 + inode->i_ctime = CURRENT_TIME;
1807 + btrfs_end_transaction(trans, root);
1812 static int btrfs_ioctl_getflags(struct file *file, void __user *arg)
1814 struct btrfs_inode *ip = BTRFS_I(file_inode(file));
1815 @@ -250,21 +328,27 @@ static int btrfs_ioctl_setflags(struct f
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)) {
1828 - if (flags & FS_SYNC_FL)
1829 - ip->flags |= BTRFS_INODE_SYNC;
1831 - ip->flags &= ~BTRFS_INODE_SYNC;
1832 if (flags & FS_IMMUTABLE_FL)
1833 ip->flags |= BTRFS_INODE_IMMUTABLE;
1835 ip->flags &= ~BTRFS_INODE_IMMUTABLE;
1836 + if (flags & FS_IXUNLINK_FL)
1837 + ip->flags |= BTRFS_INODE_IXUNLINK;
1839 + ip->flags &= ~BTRFS_INODE_IXUNLINK;
1841 + if (flags & FS_SYNC_FL)
1842 + ip->flags |= BTRFS_INODE_SYNC;
1844 + ip->flags &= ~BTRFS_INODE_SYNC;
1845 if (flags & FS_APPEND_FL)
1846 ip->flags |= BTRFS_INODE_APPEND;
1848 diff -NurpP --minimal linux-4.9.82/fs/btrfs/super.c linux-4.9.82-vs2.3.9.7/fs/btrfs/super.c
1849 --- linux-4.9.82/fs/btrfs/super.c 2018-02-22 21:18:43.000000000 +0000
1850 +++ linux-4.9.82-vs2.3.9.7/fs/btrfs/super.c 2018-01-13 05:51:52.000000000 +0000
1851 @@ -327,7 +327,7 @@ enum {
1852 #ifdef CONFIG_BTRFS_DEBUG
1853 Opt_fragment_data, Opt_fragment_metadata, Opt_fragment_all,
1856 + Opt_tag, Opt_notag, Opt_tagid, Opt_err,
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"},
1865 + {Opt_notag, "notag"},
1866 + {Opt_tagid, "tagid=%u"},
1870 @@ -833,6 +836,22 @@ int btrfs_parse_options(struct btrfs_roo
1871 btrfs_set_opt(info->mount_opt, FRAGMENT_DATA);
1874 +#ifndef CONFIG_TAGGING_NONE
1876 + printk(KERN_INFO "btrfs: use tagging\n");
1877 + btrfs_set_opt(info->mount_opt, TAGGED);
1880 + printk(KERN_INFO "btrfs: disabled tagging\n");
1881 + btrfs_clear_opt(info->mount_opt, TAGGED);
1884 +#ifdef CONFIG_PROPAGATE
1887 + btrfs_set_opt(info->mount_opt, TAGGED);
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);
1897 + if (btrfs_test_opt(fs_info, TAGGED) && !(sb->s_flags & MS_TAGGED)) {
1898 + printk("btrfs: %s: tagging not permitted on remount.\n",
1903 if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
1906 diff -NurpP --minimal linux-4.9.82/fs/char_dev.c linux-4.9.82-vs2.3.9.7/fs/char_dev.c
1907 --- linux-4.9.82/fs/char_dev.c 2016-12-11 19:17:54.000000000 +0000
1908 +++ linux-4.9.82-vs2.3.9.7/fs/char_dev.c 2018-01-10 02:50:49.000000000 +0000
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>
1916 #include "internal.h"
1918 @@ -354,14 +356,21 @@ static int chrdev_open(struct inode *ino
1920 struct cdev *new = NULL;
1924 + if (!vs_map_chrdev(inode->i_rdev, &mdev, DATTR_OPEN))
1926 + inode->i_mdev = mdev;
1928 spin_lock(&cdev_lock);
1931 struct kobject *kobj;
1934 spin_unlock(&cdev_lock);
1935 - kobj = kobj_lookup(cdev_map, inode->i_rdev, &idx);
1937 + kobj = kobj_lookup(cdev_map, mdev, &idx);
1940 new = container_of(kobj, struct cdev, kobj);
1941 diff -NurpP --minimal linux-4.9.82/fs/dcache.c linux-4.9.82-vs2.3.9.7/fs/dcache.c
1942 --- linux-4.9.82/fs/dcache.c 2018-02-22 21:18:45.000000000 +0000
1943 +++ linux-4.9.82-vs2.3.9.7/fs/dcache.c 2018-01-10 02:50:49.000000000 +0000
1945 #include <linux/ratelimit.h>
1946 #include <linux/list_lru.h>
1947 #include <linux/kasan.h>
1948 +#include <linux/vs_limit.h>
1950 #include "internal.h"
1952 @@ -680,6 +681,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);
1960 @@ -811,6 +813,7 @@ repeat:
1961 dentry_lru_add(dentry);
1963 dentry->d_lockref.count--;
1964 + vx_dentry_dec(dentry);
1965 spin_unlock(&dentry->d_lock);
1968 @@ -828,6 +831,7 @@ EXPORT_SYMBOL(dput);
1969 static inline void __dget_dlock(struct dentry *dentry)
1971 dentry->d_lockref.count++;
1972 + vx_dentry_inc(dentry);
1975 static inline void __dget(struct dentry *dentry)
1976 @@ -840,6 +844,8 @@ struct dentry *dget_parent(struct dentry
1980 + vx_dentry_dec(dentry);
1983 * Do optimistic parent lookup without any
1985 @@ -870,6 +876,7 @@ repeat:
1987 BUG_ON(!ret->d_lockref.count);
1988 ret->d_lockref.count++;
1989 + vx_dentry_inc(ret);
1990 spin_unlock(&ret->d_lock);
1993 @@ -1024,6 +1031,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);
2000 spin_unlock(&parent->d_lock);
2001 @@ -1590,6 +1598,9 @@ struct dentry *__d_alloc(struct super_bl
2005 + if (!vx_dentry_avail(1))
2008 dentry = kmem_cache_alloc(dentry_cache, GFP_KERNEL);
2011 @@ -1633,6 +1644,7 @@ struct dentry *__d_alloc(struct super_bl
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 @@ -2282,6 +2294,7 @@ struct dentry *__d_lookup(const struct d
2022 dentry->d_lockref.count++;
2023 + vx_dentry_inc(dentry);
2025 spin_unlock(&dentry->d_lock);
2027 @@ -3532,6 +3545,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);
2034 return D_WALK_CONTINUE;
2035 diff -NurpP --minimal linux-4.9.82/fs/devpts/inode.c linux-4.9.82-vs2.3.9.7/fs/devpts/inode.c
2036 --- linux-4.9.82/fs/devpts/inode.c 2016-12-11 19:17:54.000000000 +0000
2037 +++ linux-4.9.82-vs2.3.9.7/fs/devpts/inode.c 2018-01-13 01:06:29.000000000 +0000
2039 #include <linux/parser.h>
2040 #include <linux/fsnotify.h>
2041 #include <linux/seq_file.h>
2042 +#include <linux/vs_base.h>
2044 #define DEVPTS_DEFAULT_MODE 0600
2047 #define DEVPTS_DEFAULT_PTMX_MODE 0000
2048 #define PTMX_MINOR 2
2050 +static int devpts_permission(struct inode *inode, int mask)
2052 + int ret = -EACCES;
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);
2060 +static struct inode_operations devpts_file_inode_operations = {
2061 + .permission = devpts_permission,
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
2072 +static int devpts_filter(struct dentry *de)
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
2081 + vxwprintk_task(1, "devpts " VS_Q("%.*s") " without inode.",
2082 + de->d_name.len, de->d_name.name);
2084 + return vx_check(xid, VS_WATCH_P | VS_IDENT);
2087 +static int devpts_readdir(struct file * filp, struct dir_context *ctx)
2089 + return dcache_readdir_filter(filp, ctx, devpts_filter);
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,
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());
2113 s->s_root = d_make_root(inode);
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;
2123 sprintf(s, "%d", index);
2125 diff -NurpP --minimal linux-4.9.82/fs/ext2/balloc.c linux-4.9.82-vs2.3.9.7/fs/ext2/balloc.c
2126 --- linux-4.9.82/fs/ext2/balloc.c 2016-12-11 19:17:54.000000000 +0000
2127 +++ linux-4.9.82-vs2.3.9.7/fs/ext2/balloc.c 2018-01-10 02:50:49.000000000 +0000
2128 @@ -693,7 +693,6 @@ ext2_try_to_allocate(struct super_block
2130 end = EXT2_BLOCKS_PER_GROUP(sb);
2133 BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb));
2136 diff -NurpP --minimal linux-4.9.82/fs/ext2/ext2.h linux-4.9.82-vs2.3.9.7/fs/ext2/ext2.h
2137 --- linux-4.9.82/fs/ext2/ext2.h 2016-12-11 19:17:54.000000000 +0000
2138 +++ linux-4.9.82-vs2.3.9.7/fs/ext2/ext2.h 2018-01-10 02:50:49.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 */
2146 +#define EXT2_BARRIER_FL FS_BARRIER_FL /* Barrier for chroot() */
2147 +#define EXT2_COW_FL FS_COW_FL /* Copy on Write marker */
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 */
2152 @@ -332,7 +336,8 @@ struct ext2_inode {
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;
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
2170 @@ -393,6 +399,7 @@ struct ext2_inode {
2172 #define EXT2_MOUNT_DAX 0
2174 +#define EXT2_MOUNT_TAGGED 0x200000 /* Enable Context Tags */
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);
2185 extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
2186 diff -NurpP --minimal linux-4.9.82/fs/ext2/file.c linux-4.9.82-vs2.3.9.7/fs/ext2/file.c
2187 --- linux-4.9.82/fs/ext2/file.c 2016-12-11 19:17:54.000000000 +0000
2188 +++ linux-4.9.82-vs2.3.9.7/fs/ext2/file.c 2018-01-10 02:50:49.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,
2195 diff -NurpP --minimal linux-4.9.82/fs/ext2/ialloc.c linux-4.9.82-vs2.3.9.7/fs/ext2/ialloc.c
2196 --- linux-4.9.82/fs/ext2/ialloc.c 2016-12-11 19:17:54.000000000 +0000
2197 +++ linux-4.9.82-vs2.3.9.7/fs/ext2/ialloc.c 2018-01-10 02:50:49.000000000 +0000
2199 #include <linux/backing-dev.h>
2200 #include <linux/buffer_head.h>
2201 #include <linux/random.h>
2202 +#include <linux/vs_tag.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));
2212 inode_init_owner(inode, dir, mode);
2214 diff -NurpP --minimal linux-4.9.82/fs/ext2/inode.c linux-4.9.82-vs2.3.9.7/fs/ext2/inode.c
2215 --- linux-4.9.82/fs/ext2/inode.c 2016-12-11 19:17:54.000000000 +0000
2216 +++ linux-4.9.82-vs2.3.9.7/fs/ext2/inode.c 2018-01-13 01:19:54.000000000 +0000
2218 #include <linux/iomap.h>
2219 #include <linux/namei.h>
2220 #include <linux/uio.h>
2221 +#include <linux/vs_tag.h>
2225 @@ -1367,39 +1368,61 @@ void ext2_set_inode_flags(struct inode *
2227 unsigned int flags = EXT2_I(inode)->i_flags;
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);
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;
2251 + inode->i_vflags &= ~(V_BARRIER | V_COW);
2253 + if (flags & EXT2_BARRIER_FL)
2254 + inode->i_vflags |= V_BARRIER;
2255 + if (flags & EXT2_COW_FL)
2256 + inode->i_vflags |= V_COW;
2259 /* Propagate flags from i_flags to EXT2_I(inode)->i_flags */
2260 void ext2_get_inode_flags(struct ext2_inode_info *ei)
2262 unsigned int flags = ei->vfs_inode.i_flags;
2263 + unsigned int vflags = ei->vfs_inode.i_vflags;
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);
2270 + if (flags & S_IMMUTABLE)
2271 + ei->i_flags |= EXT2_IMMUTABLE_FL;
2272 + if (flags & S_IXUNLINK)
2273 + ei->i_flags |= EXT2_IXUNLINK_FL;
2275 - ei->i_flags &= ~(EXT2_SYNC_FL|EXT2_APPEND_FL|
2276 - EXT2_IMMUTABLE_FL|EXT2_NOATIME_FL|EXT2_DIRSYNC_FL);
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;
2288 + if (vflags & V_BARRIER)
2289 + ei->i_flags |= EXT2_BARRIER_FL;
2290 + if (vflags & V_COW)
2291 + ei->i_flags |= EXT2_COW_FL;
2294 struct inode *ext2_iget (struct super_block *sb, unsigned long ino)
2295 @@ -1435,8 +1458,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;
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 @@ -1543,8 +1568,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);
2321 @@ -1580,6 +1607,9 @@ static int __ext2_write_inode(struct ino
2322 raw_inode->i_uid_high = 0;
2323 raw_inode->i_gid_high = 0;
2325 +#ifdef CONFIG_TAGGING_INTERN
2326 + raw_inode->i_raw_tag = cpu_to_le16(i_tag_read(inode));
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 @@ -1663,7 +1693,8 @@ int ext2_setattr(struct dentry *dentry,
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);
2341 diff -NurpP --minimal linux-4.9.82/fs/ext2/ioctl.c linux-4.9.82-vs2.3.9.7/fs/ext2/ioctl.c
2342 --- linux-4.9.82/fs/ext2/ioctl.c 2016-12-11 19:17:54.000000000 +0000
2343 +++ linux-4.9.82-vs2.3.9.7/fs/ext2/ioctl.c 2018-01-13 01:20:40.000000000 +0000
2345 #include <asm/uaccess.h>
2348 +int ext2_sync_flags(struct inode *inode, int flags, int vflags)
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);
2358 long ext2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
2360 struct inode *inode = file_inode(filp);
2361 @@ -51,6 +61,11 @@ long ext2_ioctl(struct file *filp, unsig
2363 flags = ext2_mask_flags(inode->i_mode, flags);
2365 + if (IS_BARRIER(inode)) {
2366 + vxwprintk_task(1, "messing with the barrier.");
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
2375 * This test looks nicer. Thanks to Pauline Middelink
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);
2384 @@ -74,7 +91,7 @@ long ext2_ioctl(struct file *filp, unsig
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;
2393 diff -NurpP --minimal linux-4.9.82/fs/ext2/namei.c linux-4.9.82-vs2.3.9.7/fs/ext2/namei.c
2394 --- linux-4.9.82/fs/ext2/namei.c 2016-12-11 19:17:54.000000000 +0000
2395 +++ linux-4.9.82-vs2.3.9.7/fs/ext2/namei.c 2018-01-10 02:50:49.000000000 +0000
2398 #include <linux/pagemap.h>
2399 #include <linux/quotaops.h>
2400 +#include <linux/vs_tag.h>
2404 @@ -72,6 +73,7 @@ static struct dentry *ext2_lookup(struct
2405 (unsigned long) ino);
2406 return ERR_PTR(-EIO);
2408 + dx_propagate_tag(nd, inode);
2410 return d_splice_alias(inode, dentry);
2412 @@ -445,6 +447,7 @@ const struct inode_operations ext2_speci
2413 .listxattr = ext2_listxattr,
2415 .setattr = ext2_setattr,
2416 + .sync_flags = ext2_sync_flags,
2417 .get_acl = ext2_get_acl,
2418 .set_acl = ext2_set_acl,
2420 diff -NurpP --minimal linux-4.9.82/fs/ext2/super.c linux-4.9.82-vs2.3.9.7/fs/ext2/super.c
2421 --- linux-4.9.82/fs/ext2/super.c 2016-12-11 19:17:54.000000000 +0000
2422 +++ linux-4.9.82-vs2.3.9.7/fs/ext2/super.c 2018-01-10 02:50:49.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
2432 static const match_table_t tokens = {
2433 @@ -439,6 +440,9 @@ static const match_table_t tokens = {
2435 {Opt_noacl, "noacl"},
2438 + {Opt_notag, "notag"},
2439 + {Opt_tagid, "tagid=%u"},
2441 {Opt_grpquota, "grpquota"},
2442 {Opt_ignore, "noquota"},
2443 @@ -523,6 +527,20 @@ static int parse_options(char *options,
2445 set_opt (sbi->s_mount_opt, NO_UID32);
2447 +#ifndef CONFIG_TAGGING_NONE
2449 + set_opt (sbi->s_mount_opt, TAGGED);
2452 + clear_opt (sbi->s_mount_opt, TAGGED);
2455 +#ifdef CONFIG_PROPAGATE
2458 + set_opt (sbi->s_mount_opt, TAGGED);
2462 clear_opt (sbi->s_mount_opt, CHECK);
2464 @@ -887,6 +905,8 @@ static int ext2_fill_super(struct super_
2465 if (!parse_options((char *) data, sb))
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) ?
2473 @@ -1300,6 +1320,14 @@ static int ext2_remount (struct super_bl
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",
2483 + goto restore_opts;
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.82/fs/ext4/ext4.h linux-4.9.82-vs2.3.9.7/fs/ext4/ext4.h
2489 --- linux-4.9.82/fs/ext4/ext4.h 2016-12-11 19:17:54.000000000 +0000
2490 +++ linux-4.9.82-vs2.3.9.7/fs/ext4/ext4.h 2018-01-13 02:00:49.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 */
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 */
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
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 @@ -2497,6 +2502,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.82/fs/ext4/file.c linux-4.9.82-vs2.3.9.7/fs/ext4/file.c
2537 --- linux-4.9.82/fs/ext4/file.c 2018-02-22 21:18:46.000000000 +0000
2538 +++ linux-4.9.82-vs2.3.9.7/fs/ext4/file.c 2018-01-10 02:50:49.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,
2546 diff -NurpP --minimal linux-4.9.82/fs/ext4/ialloc.c linux-4.9.82-vs2.3.9.7/fs/ext4/ialloc.c
2547 --- linux-4.9.82/fs/ext4/ialloc.c 2018-02-22 21:18:46.000000000 +0000
2548 +++ linux-4.9.82-vs2.3.9.7/fs/ext4/ialloc.c 2018-01-10 02:50:49.000000000 +0000
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>
2557 @@ -799,6 +800,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));
2563 inode_init_owner(inode, dir, mode);
2565 diff -NurpP --minimal linux-4.9.82/fs/ext4/inode.c linux-4.9.82-vs2.3.9.7/fs/ext4/inode.c
2566 --- linux-4.9.82/fs/ext4/inode.c 2018-02-22 21:18:46.000000000 +0000
2567 +++ linux-4.9.82-vs2.3.9.7/fs/ext4/inode.c 2018-01-13 02:02:12.000000000 +0000
2569 #include <linux/printk.h>
2570 #include <linux/slab.h>
2571 #include <linux/bitops.h>
2572 +#include <linux/vs_tag.h>
2574 #include "ext4_jbd2.h"
2576 @@ -4374,12 +4375,15 @@ void ext4_set_inode_flags(struct inode *
2577 unsigned int flags = EXT4_I(inode)->i_flags;
2578 unsigned int new_fl = 0;
2580 + if (flags & EXT4_IMMUTABLE_FL)
2581 + new_fl |= S_IMMUTABLE;
2582 + if (flags & EXT4_IXUNLINK_FL)
2583 + new_fl |= S_IXUNLINK;
2585 if (flags & EXT4_SYNC_FL)
2587 if (flags & EXT4_APPEND_FL)
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 @@ -4387,31 +4391,52 @@ void ext4_set_inode_flags(struct inode *
2595 if (test_opt(inode->i_sb, DAX) && S_ISREG(inode->i_mode))
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);
2603 + if (flags & EXT4_BARRIER_FL)
2604 + new_fl |= V_BARRIER;
2605 + if (flags & EXT4_COW_FL)
2608 + set_mask_bits(&inode->i_vflags,
2609 + V_BARRIER | V_COW, new_fl);
2612 /* Propagate flags from i_flags to EXT4_I(inode)->i_flags */
2613 void ext4_get_inode_flags(struct ext4_inode_info *ei)
2615 - unsigned int vfs_fl;
2616 + unsigned int vfs_fl, vfs_vf;
2617 unsigned long old_fl, new_fl;
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|
2626 + EXT4_DIRSYNC_FL|EXT4_BARRIER_FL|
2629 + if (vfs_fl & S_IMMUTABLE)
2630 + new_fl |= EXT4_IMMUTABLE_FL;
2631 + if (vfs_fl & S_IXUNLINK)
2632 + new_fl |= EXT4_IXUNLINK_FL;
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;
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);
2652 @@ -4531,8 +4556,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;
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));
2665 @@ -4848,8 +4875,10 @@ static int ext4_do_update_inode(handle_t
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 @@ -4873,6 +4902,9 @@ static int ext4_do_update_inode(handle_t
2679 raw_inode->i_uid_high = 0;
2680 raw_inode->i_gid_high = 0;
2682 +#ifdef CONFIG_TAGGING_INTERN
2683 + raw_inode->i_raw_tag = cpu_to_le16(i_tag_read(inode));
2685 raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
2687 EXT4_INODE_SET_XTIME(i_ctime, inode, raw_inode);
2688 @@ -5126,7 +5158,8 @@ int ext4_setattr(struct dentry *dentry,
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))) {
2697 /* (user+group)*(old+new) structure, inode write (sb,
2698 @@ -5149,6 +5182,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);
2707 diff -NurpP --minimal linux-4.9.82/fs/ext4/ioctl.c linux-4.9.82-vs2.3.9.7/fs/ext4/ioctl.c
2708 --- linux-4.9.82/fs/ext4/ioctl.c 2016-12-11 19:17:54.000000000 +0000
2709 +++ linux-4.9.82-vs2.3.9.7/fs/ext4/ioctl.c 2018-01-13 02:03:59.000000000 +0000
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"
2718 @@ -226,7 +227,9 @@ static int ext4_ioctl_setflags(struct in
2720 * This test looks nicer. Thanks to Pauline Middelink
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))
2729 @@ -430,6 +433,33 @@ static inline unsigned long ext4_xflags_
2733 +int ext4_sync_flags(struct inode *inode, int flags, int vflags)
2735 + handle_t *handle = NULL;
2736 + struct ext4_iloc iloc;
2739 + handle = ext4_journal_start(inode, EXT4_HT_INODE, 1);
2740 + if (IS_ERR(handle))
2741 + return PTR_ERR(handle);
2743 + if (IS_SYNC(inode))
2744 + ext4_handle_sync(handle);
2745 + err = ext4_reserve_inode_write(handle, inode, &iloc);
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);
2754 + err = ext4_mark_iloc_dirty(handle, inode, &iloc);
2756 + ext4_journal_stop(handle);
2760 long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
2762 struct inode *inode = file_inode(filp);
2763 @@ -459,6 +489,11 @@ long ext4_ioctl(struct file *filp, unsig
2765 flags = ext4_mask_flags(inode->i_mode, flags);
2767 + if (IS_BARRIER(inode)) {
2768 + vxwprintk_task(1, "messing with the barrier.");
2773 err = ext4_ioctl_setflags(inode, flags);
2774 inode_unlock(inode);
2775 diff -NurpP --minimal linux-4.9.82/fs/ext4/namei.c linux-4.9.82-vs2.3.9.7/fs/ext4/namei.c
2776 --- linux-4.9.82/fs/ext4/namei.c 2018-02-22 21:18:46.000000000 +0000
2777 +++ linux-4.9.82-vs2.3.9.7/fs/ext4/namei.c 2018-01-10 02:50:49.000000000 +0000
2779 #include <linux/quotaops.h>
2780 #include <linux/buffer_head.h>
2781 #include <linux/bio.h>
2782 +#include <linux/vs_tag.h>
2784 #include "ext4_jbd2.h"
2786 @@ -1459,6 +1460,7 @@ restart:
2787 REQ_META | REQ_PRIO,
2790 + dx_propagate_tag(nd, inode);
2792 if ((bh = bh_use[ra_ptr++]) == NULL)
2794 @@ -3906,6 +3908,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,
2801 const struct inode_operations ext4_special_inode_operations = {
2802 diff -NurpP --minimal linux-4.9.82/fs/ext4/super.c linux-4.9.82-vs2.3.9.7/fs/ext4/super.c
2803 --- linux-4.9.82/fs/ext4/super.c 2018-02-22 21:18:46.000000000 +0000
2804 +++ linux-4.9.82-vs2.3.9.7/fs/ext4/super.c 2018-01-10 02:50:49.000000000 +0000
2805 @@ -1280,6 +1280,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
2812 static const match_table_t tokens = {
2813 @@ -1366,6 +1367,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 */
2818 + {Opt_notag, "notag"},
2819 + {Opt_tagid, "tagid=%u"},
2823 @@ -1611,6 +1615,20 @@ static int handle_mount_opt(struct super
2824 case Opt_nolazytime:
2825 sb->s_flags &= ~MS_LAZYTIME;
2827 +#ifndef CONFIG_TAGGING_NONE
2829 + set_opt(sb, TAGGED);
2832 + clear_opt(sb, TAGGED);
2835 +#ifdef CONFIG_PROPAGATE
2838 + set_opt(sb, TAGGED);
2843 for (m = ext4_mount_opts; m->token != Opt_err; m++)
2844 @@ -3550,6 +3568,9 @@ static int ext4_fill_super(struct super_
2845 sb->s_iflags |= SB_I_CGROUPWB;
2848 + if (EXT4_SB(sb)->s_mount_opt & EXT4_MOUNT_TAGGED)
2849 + sb->s_flags |= MS_TAGGED;
2851 sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
2852 (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
2854 @@ -4917,6 +4938,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");
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",
2863 + goto restore_opts;
2866 sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
2867 (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
2869 diff -NurpP --minimal linux-4.9.82/fs/fcntl.c linux-4.9.82-vs2.3.9.7/fs/fcntl.c
2870 --- linux-4.9.82/fs/fcntl.c 2018-02-22 21:18:46.000000000 +0000
2871 +++ linux-4.9.82-vs2.3.9.7/fs/fcntl.c 2018-02-10 15:15:43.000000000 +0000
2873 #include <linux/pid_namespace.h>
2874 #include <linux/user_namespace.h>
2875 #include <linux/shmem_fs.h>
2876 +#include <linux/vs_limit.h>
2878 #include <asm/poll.h>
2879 #include <asm/siginfo.h>
2880 @@ -390,6 +391,8 @@ SYSCALL_DEFINE3(fcntl64, unsigned int, f
2884 + if (!vx_files_avail(1))
2887 if (unlikely(f.file->f_mode & FMODE_PATH)) {
2888 if (!check_fcntl_cmd(cmd))
2889 diff -NurpP --minimal linux-4.9.82/fs/file.c linux-4.9.82-vs2.3.9.7/fs/file.c
2890 --- linux-4.9.82/fs/file.c 2016-12-11 19:17:54.000000000 +0000
2891 +++ linux-4.9.82-vs2.3.9.7/fs/file.c 2018-01-10 02:50:49.000000000 +0000
2893 #include <linux/spinlock.h>
2894 #include <linux/rcupdate.h>
2895 #include <linux/workqueue.h>
2896 +#include <linux/vs_limit.h>
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++;
2904 + /* TODO: sum it first for check and performance */
2905 + vx_openfd_inc(open_files - i);
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();
2921 @@ -539,6 +544,7 @@ repeat:
2923 __clear_close_on_exec(fd, fdt);
2925 + vx_openfd_inc(fd);
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);
2936 void put_unused_fd(unsigned int fd)
2937 @@ -856,6 +863,8 @@ __releases(&files->file_lock)
2940 filp_close(tofree, files);
2942 + vx_openfd_inc(fd); /* fd was unused */
2946 diff -NurpP --minimal linux-4.9.82/fs/file_table.c linux-4.9.82-vs2.3.9.7/fs/file_table.c
2947 --- linux-4.9.82/fs/file_table.c 2016-12-11 19:17:54.000000000 +0000
2948 +++ linux-4.9.82-vs2.3.9.7/fs/file_table.c 2018-01-10 02:50:49.000000000 +0000
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>
2956 #include <linux/atomic.h>
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();
2967 @@ -219,6 +223,8 @@ static void __fput(struct file *file)
2968 put_write_access(inode);
2969 __mnt_drop_write(mnt);
2971 + vx_files_dec(file);
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)
2978 if (atomic_long_dec_and_test(&file->f_count)) {
2979 security_file_free(file);
2980 + vx_files_dec(file);
2985 diff -NurpP --minimal linux-4.9.82/fs/fs_struct.c linux-4.9.82-vs2.3.9.7/fs/fs_struct.c
2986 --- linux-4.9.82/fs/fs_struct.c 2016-12-11 19:17:54.000000000 +0000
2987 +++ linux-4.9.82-vs2.3.9.7/fs/fs_struct.c 2018-01-10 02:50:49.000000000 +0000
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"
2996 @@ -87,6 +88,7 @@ void free_fs_struct(struct fs_struct *fs
2998 path_put(&fs->root);
3000 + atomic_dec(&vs_global_fs);
3001 kmem_cache_free(fs_cachep, fs);
3004 @@ -124,6 +126,7 @@ struct fs_struct *copy_fs_struct(struct
3007 spin_unlock(&old->lock);
3008 + atomic_inc(&vs_global_fs);
3012 diff -NurpP --minimal linux-4.9.82/fs/gfs2/file.c linux-4.9.82-vs2.3.9.7/fs/gfs2/file.c
3013 --- linux-4.9.82/fs/gfs2/file.c 2018-02-22 21:18:47.000000000 +0000
3014 +++ linux-4.9.82-vs2.3.9.7/fs/gfs2/file.c 2018-01-10 02:50:49.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,
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,
3034 static int gfs2_get_flags(struct file *filp, u32 __user *ptr)
3035 @@ -178,12 +184,17 @@ void gfs2_set_inode_flags(struct inode *
3037 struct gfs2_inode *ip = GFS2_I(inode);
3038 unsigned int flags = inode->i_flags;
3039 + unsigned int vflags = inode->i_vflags;
3041 + flags &= ~(S_IMMUTABLE | S_IXUNLINK |
3042 + S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC | S_NOSEC);
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))
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)
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)
3057 inode->i_flags = flags;
3059 + vflags &= ~(V_BARRIER | V_COW);
3061 + if (ip->i_diskflags & GFS2_DIF_BARRIER)
3062 + vflags |= V_BARRIER;
3063 + if (ip->i_diskflags & GFS2_DIF_COW)
3065 + inode->i_vflags = vflags;
3068 +void gfs2_get_inode_flags(struct inode *inode)
3070 + struct gfs2_inode *ip = GFS2_I(inode);
3071 + unsigned int flags = inode->i_flags;
3072 + unsigned int vflags = inode->i_vflags;
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);
3079 + if (flags & S_IMMUTABLE)
3080 + ip->i_diskflags |= GFS2_DIF_IMMUTABLE;
3081 + if (flags & S_IXUNLINK)
3082 + ip->i_diskflags |= GFS2_DIF_IXUNLINK;
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;
3091 + if (vflags & V_BARRIER)
3092 + ip->i_diskflags |= GFS2_DIF_BARRIER;
3093 + if (vflags & V_COW)
3094 + ip->i_diskflags |= GFS2_DIF_COW;
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));
3102 +int gfs2_sync_flags(struct inode *inode, int flags, int vflags)
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;
3110 + error = gfs2_glock_nq_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, &gh);
3113 + error = gfs2_trans_begin(sdp, RES_DINODE, 0);
3116 + error = gfs2_meta_inode_buffer(ip, &bh);
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);
3125 + gfs2_set_aops(inode);
3127 + gfs2_trans_end(sdp);
3129 + gfs2_glock_dq_uninit(&gh);
3133 static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
3136 diff -NurpP --minimal linux-4.9.82/fs/gfs2/inode.h linux-4.9.82-vs2.3.9.7/fs/gfs2/inode.h
3137 --- linux-4.9.82/fs/gfs2/inode.h 2016-12-11 19:17:54.000000000 +0000
3138 +++ linux-4.9.82-vs2.3.9.7/fs/gfs2/inode.h 2018-01-10 02:50:49.000000000 +0000
3139 @@ -117,6 +117,7 @@ extern const struct file_operations gfs2
3140 extern const struct file_operations gfs2_dir_fops_nolock;
3142 extern void gfs2_set_inode_flags(struct inode *inode);
3143 +extern int gfs2_sync_flags(struct inode *inode, int flags, int vflags);
3145 #ifdef CONFIG_GFS2_FS_LOCKING_DLM
3146 extern const struct file_operations gfs2_file_fops;
3147 diff -NurpP --minimal linux-4.9.82/fs/hostfs/hostfs.h linux-4.9.82-vs2.3.9.7/fs/hostfs/hostfs.h
3148 --- linux-4.9.82/fs/hostfs/hostfs.h 2016-12-11 19:17:54.000000000 +0000
3149 +++ linux-4.9.82-vs2.3.9.7/fs/hostfs/hostfs.h 2018-01-10 02:50:49.000000000 +0000
3150 @@ -42,6 +42,7 @@ struct hostfs_iattr {
3151 unsigned short ia_mode;
3156 struct timespec ia_atime;
3157 struct timespec ia_mtime;
3158 diff -NurpP --minimal linux-4.9.82/fs/inode.c linux-4.9.82-vs2.3.9.7/fs/inode.c
3159 --- linux-4.9.82/fs/inode.c 2018-02-22 21:18:47.000000000 +0000
3160 +++ linux-4.9.82-vs2.3.9.7/fs/inode.c 2018-01-10 02:50:49.000000000 +0000
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"
3169 @@ -133,6 +134,8 @@ int inode_init_always(struct super_block
3170 struct address_space *const mapping = &inode->i_data;
3174 + /* essential because of inode slab reuse */
3175 inode->i_blkbits = sb->s_blocksize_bits;
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);
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;
3190 + inode->i_mdev = 0;
3191 inode->dirtied_when = 0;
3193 #ifdef CONFIG_CGROUP_WRITEBACK
3194 @@ -479,6 +484,8 @@ void __insert_inode_hash(struct inode *i
3196 EXPORT_SYMBOL(__insert_inode_hash);
3198 +EXPORT_SYMBOL_GPL(__iget);
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 @@ -2008,6 +2017,7 @@ void inode_init_owner(struct inode *inod
3217 inode->i_gid = current_fsgid();
3218 inode->i_mode = mode;
3219 + i_tag_write(inode, dx_current_fstag(inode->i_sb));
3221 EXPORT_SYMBOL(inode_init_owner);
3223 diff -NurpP --minimal linux-4.9.82/fs/ioctl.c linux-4.9.82-vs2.3.9.7/fs/ioctl.c
3224 --- linux-4.9.82/fs/ioctl.c 2016-12-11 19:17:54.000000000 +0000
3225 +++ linux-4.9.82-vs2.3.9.7/fs/ioctl.c 2018-01-13 01:03:36.000000000 +0000
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"
3235 #include <asm/ioctls.h>
3236 diff -NurpP --minimal linux-4.9.82/fs/jfs/file.c linux-4.9.82-vs2.3.9.7/fs/jfs/file.c
3237 --- linux-4.9.82/fs/jfs/file.c 2016-12-11 19:17:54.000000000 +0000
3238 +++ linux-4.9.82-vs2.3.9.7/fs/jfs/file.c 2018-01-10 02:50:49.000000000 +0000
3239 @@ -113,7 +113,8 @@ int jfs_setattr(struct dentry *dentry, s
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);
3249 @@ -146,6 +147,7 @@ const struct inode_operations jfs_file_i
3250 .get_acl = jfs_get_acl,
3251 .set_acl = jfs_set_acl,
3253 + .sync_flags = jfs_sync_flags,
3256 const struct file_operations jfs_file_operations = {
3257 diff -NurpP --minimal linux-4.9.82/fs/jfs/ioctl.c linux-4.9.82-vs2.3.9.7/fs/jfs/ioctl.c
3258 --- linux-4.9.82/fs/jfs/ioctl.c 2016-12-11 19:17:54.000000000 +0000
3259 +++ linux-4.9.82-vs2.3.9.7/fs/jfs/ioctl.c 2018-01-10 02:50:49.000000000 +0000
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>
3268 @@ -56,6 +57,16 @@ static long jfs_map_ext2(unsigned long f
3272 +int jfs_sync_flags(struct inode *inode, int flags, int vflags)
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);
3282 long jfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
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;
3289 + if (IS_BARRIER(inode)) {
3290 + vxwprintk_task(1, "messing with the barrier.");
3294 /* Is it quota file? Do not allow user to mess with it */
3295 if (IS_NOQUOTA(inode)) {
3297 @@ -106,8 +122,8 @@ long jfs_ioctl(struct file *filp, unsign
3298 * the relevant capability.
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);
3308 @@ -115,7 +131,7 @@ long jfs_ioctl(struct file *filp, unsign
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;
3317 diff -NurpP --minimal linux-4.9.82/fs/jfs/jfs_dinode.h linux-4.9.82-vs2.3.9.7/fs/jfs/jfs_dinode.h
3318 --- linux-4.9.82/fs/jfs/jfs_dinode.h 2016-12-11 19:17:54.000000000 +0000
3319 +++ linux-4.9.82-vs2.3.9.7/fs/jfs/jfs_dinode.h 2018-01-10 02:50:49.000000000 +0000
3320 @@ -161,9 +161,13 @@ struct dinode {
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 */
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 */
3331 +#define JFS_FL_USER_VISIBLE 0x07F80000
3332 +#define JFS_FL_USER_MODIFIABLE 0x07F80000
3333 #define JFS_FL_INHERIT 0x03C80000
3335 /* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
3336 diff -NurpP --minimal linux-4.9.82/fs/jfs/jfs_filsys.h linux-4.9.82-vs2.3.9.7/fs/jfs/jfs_filsys.h
3337 --- linux-4.9.82/fs/jfs/jfs_filsys.h 2016-12-11 19:17:54.000000000 +0000
3338 +++ linux-4.9.82-vs2.3.9.7/fs/jfs/jfs_filsys.h 2018-01-10 02:50:49.000000000 +0000
3340 #define JFS_NAME_MAX 255
3341 #define JFS_PATH_MAX BPSIZE
3343 +#define JFS_TAGGED 0x00800000 /* Context Tagging */
3346 * file system state (superblock state)
3347 diff -NurpP --minimal linux-4.9.82/fs/jfs/jfs_imap.c linux-4.9.82-vs2.3.9.7/fs/jfs/jfs_imap.c
3348 --- linux-4.9.82/fs/jfs/jfs_imap.c 2016-12-11 19:17:54.000000000 +0000
3349 +++ linux-4.9.82-vs2.3.9.7/fs/jfs/jfs_imap.c 2018-01-10 02:50:49.000000000 +0000
3351 #include <linux/pagemap.h>
3352 #include <linux/quotaops.h>
3353 #include <linux/slab.h>
3354 +#include <linux/vs_tag.h>
3356 #include "jfs_incore.h"
3357 #include "jfs_inode.h"
3358 @@ -3046,6 +3047,8 @@ static int copy_from_dinode(struct dinod
3360 struct jfs_inode_info *jfs_ip = JFS_IP(ip);
3361 struct jfs_sb_info *sbi = JFS_SBI(ip->i_sb);
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
3369 set_nlink(ip, le32_to_cpu(dip->di_nlink));
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);
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;
3380 ip->i_uid = sbi->uid;
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;
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));
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));
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,
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,
3410 jfs_get_inode_flags(jfs_ip);
3412 * mode2 is only needed for storing the higher order bits.
3413 diff -NurpP --minimal linux-4.9.82/fs/jfs/jfs_inode.c linux-4.9.82-vs2.3.9.7/fs/jfs/jfs_inode.c
3414 --- linux-4.9.82/fs/jfs/jfs_inode.c 2016-12-11 19:17:54.000000000 +0000
3415 +++ linux-4.9.82-vs2.3.9.7/fs/jfs/jfs_inode.c 2018-01-14 06:01:31.000000000 +0000
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
3426 if (flags & JFS_IMMUTABLE_FL)
3427 new_fl |= S_IMMUTABLE;
3428 + if (flags & JFS_IXUNLINK_FL)
3429 + new_fl |= S_IXUNLINK;
3431 if (flags & JFS_APPEND_FL)
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)
3438 - inode_set_flags(inode, new_fl, S_IMMUTABLE | S_APPEND | S_NOATIME |
3439 - S_DIRSYNC | S_SYNC);
3441 + inode_set_flags(inode, new_fl, S_IMMUTABLE | S_IXUNLINK |
3442 + S_APPEND | S_NOATIME | S_DIRSYNC | S_SYNC);
3445 + if (flags & JFS_BARRIER_FL)
3446 + new_fl |= V_BARRIER;
3447 + if (flags & JFS_COW_FL)
3450 + set_mask_bits(&inode->i_vflags,
3451 + V_BARRIER | V_COW, new_fl);
3454 void jfs_get_inode_flags(struct jfs_inode_info *jfs_ip)
3456 unsigned int flags = jfs_ip->vfs_inode.i_flags;
3457 + unsigned int vflags = jfs_ip->vfs_inode.i_vflags;
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);
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;
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;
3477 jfs_ip->mode2 |= JFS_SYNC_FL;
3479 + if (vflags & V_BARRIER)
3480 + jfs_ip->mode2 |= JFS_BARRIER_FL;
3481 + if (vflags & V_COW)
3482 + jfs_ip->mode2 |= JFS_COW_FL;
3486 diff -NurpP --minimal linux-4.9.82/fs/jfs/jfs_inode.h linux-4.9.82-vs2.3.9.7/fs/jfs/jfs_inode.h
3487 --- linux-4.9.82/fs/jfs/jfs_inode.h 2016-12-11 19:17:54.000000000 +0000
3488 +++ linux-4.9.82-vs2.3.9.7/fs/jfs/jfs_inode.h 2018-01-10 02:50:49.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 *);
3497 diff -NurpP --minimal linux-4.9.82/fs/jfs/namei.c linux-4.9.82-vs2.3.9.7/fs/jfs/namei.c
3498 --- linux-4.9.82/fs/jfs/namei.c 2016-12-11 19:17:54.000000000 +0000
3499 +++ linux-4.9.82-vs2.3.9.7/fs/jfs/namei.c 2018-01-10 02:50:49.000000000 +0000
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 @@ -1484,6 +1485,7 @@ static struct dentry *jfs_lookup(struct
3509 jfs_err("jfs_lookup: iget failed on inum %d", (uint)inum);
3512 + dx_propagate_tag(nd, ip);
3513 return d_splice_alias(ip, dentry);
3516 @@ -1546,6 +1548,7 @@ const struct inode_operations jfs_dir_in
3517 .get_acl = jfs_get_acl,
3518 .set_acl = jfs_set_acl,
3520 + .sync_flags = jfs_sync_flags,
3523 const struct file_operations jfs_dir_operations = {
3524 diff -NurpP --minimal linux-4.9.82/fs/jfs/super.c linux-4.9.82-vs2.3.9.7/fs/jfs/super.c
3525 --- linux-4.9.82/fs/jfs/super.c 2018-02-22 21:18:47.000000000 +0000
3526 +++ linux-4.9.82-vs2.3.9.7/fs/jfs/super.c 2018-01-10 02:50:49.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
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"},
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");
3553 +#ifndef CONFIG_TAGGING_NONE
3555 + *flag |= JFS_TAGGED;
3558 + *flag &= JFS_TAGGED;
3561 +#ifdef CONFIG_PROPAGATE
3564 + *flag |= JFS_TAGGED;
3568 printk("jfs: Unrecognized mount option \"%s\" or missing value\n",
3570 @@ -437,6 +455,12 @@ static int jfs_remount(struct super_bloc
3571 if (!parse_options(data, sb, &newLVSize, &flag))
3574 + if ((flag & JFS_TAGGED) && !(sb->s_flags & MS_TAGGED)) {
3575 + printk(KERN_ERR "JFS: %s: tagging not permitted on remount.\n",
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;
3587 + /* map mount option tagxid */
3588 + if (sbi->flag & JFS_TAGGED)
3589 + sb->s_flags |= MS_TAGGED;
3592 pr_err("resize option for remount only\n");
3593 diff -NurpP --minimal linux-4.9.82/fs/libfs.c linux-4.9.82-vs2.3.9.7/fs/libfs.c
3594 --- linux-4.9.82/fs/libfs.c 2018-02-22 21:18:47.000000000 +0000
3595 +++ linux-4.9.82-vs2.3.9.7/fs/libfs.c 2018-01-13 01:03:09.000000000 +0000
3596 @@ -180,7 +180,8 @@ static inline unsigned char dt_type(stru
3597 * both impossible due to the lock on directory.
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))
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
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))))
3619 @@ -205,8 +207,22 @@ int dcache_readdir(struct file *file, st
3620 move_cursor(cursor, p);
3624 EXPORT_SYMBOL(dcache_readdir);
3626 +int dcache_readdir(struct file *filp, struct dir_context *ctx)
3628 + return do_dcache_readdir_filter(filp, ctx, NULL);
3631 +EXPORT_SYMBOL(dcache_readdir_filter);
3633 +int dcache_readdir_filter(struct file *filp, struct dir_context *ctx,
3634 + int (*filter)(struct dentry *))
3636 + return do_dcache_readdir_filter(filp, ctx, filter);
3639 ssize_t generic_read_dir(struct file *filp, char __user *buf, size_t siz, loff_t *ppos)
3642 diff -NurpP --minimal linux-4.9.82/fs/locks.c linux-4.9.82-vs2.3.9.7/fs/locks.c
3643 --- linux-4.9.82/fs/locks.c 2016-12-11 19:17:54.000000000 +0000
3644 +++ linux-4.9.82-vs2.3.9.7/fs/locks.c 2018-01-13 01:28:30.000000000 +0000
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>
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)
3658 - struct file_lock *fl = kmem_cache_zalloc(filelock_cache, GFP_KERNEL);
3659 + struct file_lock *fl;
3662 - locks_init_lock_heads(fl);
3663 + fl = kmem_cache_zalloc(filelock_cache, GFP_KERNEL);
3666 + locks_init_lock_heads(fl);
3672 EXPORT_SYMBOL_GPL(locks_alloc_lock);
3673 @@ -348,6 +354,7 @@ void locks_init_lock(struct file_lock *f
3675 memset(fl, 0, sizeof(struct file_lock));
3676 locks_init_lock_heads(fl);
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;
3689 @@ -426,7 +434,10 @@ flock_make_lock(struct file *filp, unsig
3690 fl->fl_flags = FL_FLOCK;
3692 fl->fl_end = OFFSET_MAX;
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;
3701 @@ -548,6 +559,7 @@ static int lease_init(struct file *filp,
3703 fl->fl_owner = filp;
3704 fl->fl_pid = current->tgid;
3705 + fl->fl_xid = vx_current_xid();
3708 fl->fl_flags = FL_LEASE;
3709 @@ -567,6 +579,10 @@ static struct file_lock *lease_alloc(str
3711 return ERR_PTR(error);
3713 + fl->fl_xid = vx_current_xid();
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);
3719 locks_free_lock(fl);
3720 @@ -956,6 +972,7 @@ static int flock_lock_inode(struct inode
3724 + new_fl->fl_xid = -1;
3726 list_for_each_entry(fl, &ctx->flc_flock, fl_list) {
3727 if (!flock_locks_conflict(request, fl))
3728 @@ -984,7 +1001,7 @@ out:
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)
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
3739 return (request->fl_type == F_UNLCK) ? 0 : -ENOMEM;
3742 + vxd_assert(xid == vx_current_xid(),
3743 + "xid(%d) == current(%d)", xid, vx_current_xid());
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);
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)
3763 - return posix_lock_inode(locks_inode(filp), fl, conflock);
3764 + return posix_lock_inode(locks_inode(filp), fl, conflock, filp->f_xid);
3766 EXPORT_SYMBOL(posix_lock_file);
3768 @@ -1232,7 +1256,7 @@ static int posix_lock_inode_wait(struct
3772 - error = posix_lock_inode(inode, fl, NULL);
3773 + error = posix_lock_inode(inode, fl, NULL, 0);
3774 if (error != FILE_LOCK_DEFERRED)
3776 error = wait_event_interruptible(fl->fl_wait, !fl->fl_next);
3777 @@ -1308,10 +1332,13 @@ int locks_mandatory_area(struct inode *i
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);
3792 @@ -1319,7 +1346,7 @@ int locks_mandatory_area(struct inode *i
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)
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)
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);
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);
3816 * This might block, so we do it before checking the inode.
3818 @@ -2710,8 +2747,11 @@ static int locks_show(struct seq_file *f
3820 lock_get_status(f, fl, iter->li_pos, "");
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))
3826 lock_get_status(f, bfl, iter->li_pos, " ->");
3831 diff -NurpP --minimal linux-4.9.82/fs/mount.h linux-4.9.82-vs2.3.9.7/fs/mount.h
3832 --- linux-4.9.82/fs/mount.h 2018-02-22 21:18:47.000000000 +0000
3833 +++ linux-4.9.82-vs2.3.9.7/fs/mount.h 2018-01-10 02:50:49.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 */
3841 #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
3842 diff -NurpP --minimal linux-4.9.82/fs/namei.c linux-4.9.82-vs2.3.9.7/fs/namei.c
3843 --- linux-4.9.82/fs/namei.c 2018-02-22 21:18:47.000000000 +0000
3844 +++ linux-4.9.82-vs2.3.9.7/fs/namei.c 2018-01-13 05:43:43.000000000 +0000
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>
3860 #include "internal.h"
3861 +#include "proc/internal.h"
3864 /* [Feb-1997 T. Schoebel-Theuer]
3865 @@ -285,6 +295,93 @@ static int check_acl(struct inode *inode
3869 +static inline int dx_barrier(const struct inode *inode)
3871 + if (IS_BARRIER(inode) && !vx_check(0, VS_ADMIN | VS_WATCH)) {
3872 + vxwprintk_task(1, "did hit the barrier.");
3878 +static int __dx_permission(const struct inode *inode, int mask)
3880 + if (dx_barrier(inode))
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))
3889 + /* just pretend we didn't find anything */
3892 + else if (inode->i_sb->s_magic == PROC_SUPER_MAGIC) {
3893 + struct proc_dir_entry *de = PDE(inode);
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);
3902 + if ((mask & (MAY_WRITE | MAY_APPEND))) {
3904 + struct task_struct *tsk;
3906 + if (vx_check(0, VS_ADMIN | VS_WATCH_P) ||
3907 + vx_flags(VXF_STATE_SETUP, 0))
3910 + pid = PROC_I(inode)->pid;
3915 + tsk = pid_task(pid, PIDTYPE_PID);
3916 + vxdprintk(VXD_CBIT(tag, 0), "accessing %p[#%u]",
3917 + tsk, (tsk ? vx_task_xid(tsk) : 0));
3919 + vx_check(vx_task_xid(tsk), VS_IDENT | VS_WATCH_P)) {
3920 + rcu_read_unlock();
3923 + rcu_read_unlock();
3926 + /* FIXME: Should we block some entries here? */
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))
3941 +int dx_permission(const struct inode *inode, int mask)
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)
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);
3957 * This does the basic permission checking
3959 @@ -409,7 +506,7 @@ int __inode_permission(struct inode *ino
3961 * Nobody gets write access to an immutable file.
3963 - if (IS_IMMUTABLE(inode))
3964 + if (IS_IMMUTABLE(inode) && !IS_COW(inode))
3968 @@ -421,6 +518,10 @@ int __inode_permission(struct inode *ino
3972 + retval = dx_permission(inode, mask);
3976 retval = do_inode_permission(inode, mask);
3979 @@ -2781,7 +2882,7 @@ static int may_delete(struct inode *dir,
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))
3987 if (!d_is_dir(victim))
3988 @@ -2869,19 +2970,25 @@ int vfs_create(struct inode *dir, struct
3991 int error = may_create(dir, dentry);
3994 + vxdprintk(VXD_CBIT(misc, 3), "may_create failed with %d", error);
3998 if (!dir->i_op->create)
3999 return -EACCES; /* shouldn't it be ENOSYS? */
4002 error = security_inode_create(dir, dentry, mode);
4005 + vxdprintk(VXD_CBIT(misc, 3), "security_inode_create failed with %d", error);
4008 error = dir->i_op->create(dir, dentry, mode, want_excl);
4010 fsnotify_create(dir, dentry);
4012 + vxdprintk(VXD_CBIT(misc, 3), "i_op->create failed with %d", error);
4015 EXPORT_SYMBOL(vfs_create);
4016 @@ -2919,6 +3026,15 @@ static int may_open(struct path *path, i
4020 +#ifdef CONFIG_VSERVER_COWBL
4021 + if (IS_COW(inode) &&
4022 + ((flag & O_ACCMODE) != O_RDONLY)) {
4023 + if (IS_COW_LINK(inode))
4025 + inode->i_flags &= ~(S_IXUNLINK|S_IMMUTABLE);
4026 + mark_inode_dirty(inode);
4029 error = inode_permission(inode, MAY_OPEN | acc_mode);
4032 @@ -3371,6 +3487,16 @@ finish_open:
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);
4048 BUG_ON(*opened & FILE_OPENED); /* once it's opened, it's opened */
4049 @@ -3474,6 +3600,9 @@ static struct file *path_openat(struct n
4053 +#ifdef CONFIG_VSERVER_COWBL
4056 file = get_empty_filp();
4059 @@ -3507,6 +3636,12 @@ static struct file *path_openat(struct n
4063 +#ifdef CONFIG_VSERVER_COWBL
4064 + if (error == -EMLINK) {
4065 + // path_cleanup(nd);
4070 if (!(opened & FILE_OPENED)) {
4072 @@ -3627,6 +3762,11 @@ static struct dentry *filename_create(in
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);
4084 @@ -3745,6 +3885,7 @@ retry:
4085 error = vfs_mknod(path.dentry->d_inode,dentry,mode,0);
4090 done_path_create(&path, dentry);
4091 if (retry_estale(error, lookup_flags)) {
4092 @@ -4166,7 +4307,7 @@ int vfs_link(struct dentry *old_dentry,
4094 * A link to an append-only or immutable file cannot be created.
4096 - if (IS_APPEND(inode) || IS_IMMUTABLE(inode))
4097 + if (IS_APPEND(inode) || IS_IXORUNLINK(inode))
4100 * Updating the link count will likely cause i_uid and i_gid to
4101 @@ -4696,6 +4837,326 @@ const char *vfs_get_link(struct dentry *
4103 EXPORT_SYMBOL(vfs_get_link);
4106 +#ifdef CONFIG_VSERVER_COWBL
4109 +void dump_path(const char *name, struct path *path)
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);
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);
4125 + if (path && path->dentry)
4126 + vxdprintk(VXD_CBIT(misc, 3),
4127 + "%s: path dentry=%p[#%d]", name,
4129 + path->dentry ? path->dentry->d_lockref.count : -1);
4133 +long do_cow_splice(struct file *in, struct file *out, size_t len)
4138 + return do_splice_direct(in, &ppos, out, &opos, len, 0);
4141 +struct dentry *cow_break_link(const char *pathname)
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;
4150 + char *to, *path, pad='\251';
4152 + struct filename *filename = getname_kernel(pathname);
4153 + struct filename *to_filename;
4155 + vxdprintk(VXD_CBIT(misc, 1),
4156 + "cow_break_link(" VS_Q("%s") ")", pathname);
4158 + path = kmalloc(PATH_MAX, GFP_KERNEL);
4160 + if (!path || IS_ERR(filename))
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);
4168 + goto out_free_path;
4170 + dump_path("cow (old)", &old_path);
4172 + /* no explicit reference for old_dentry here */
4173 + old_dentry = old_path.dentry;
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,
4181 + old_dentry->d_name.len, old_dentry->d_name.name,
4182 + old_dentry->d_name.len);
4184 + to[pathlen + 1] = 0;
4186 + new_dentry = NULL;
4187 + to[pathlen] = pad--;
4189 + if (pad <= '\240')
4192 + vxdprintk(VXD_CBIT(misc, 1), "temp copy " VS_Q("%s"), to);
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))
4203 + vxdprintk(VXD_CBIT(misc, 2), "to_filename refcnt=%d", to_filename->refcnt);
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));
4216 + vxdprintk(VXD_CBIT(misc, 2),
4217 + "filename_create(new): %p [" VS_Q("%.*s") ":%d]",
4219 + new_dentry->d_name.len, new_dentry->d_name.name,
4220 + new_dentry->d_name.len);
4222 + dump_path("cow (dir)", &dir_path);
4224 + /* take a reference on new_dentry */
4227 + /* dentry/mnt refs handed over to new_path */
4228 + new_path = &dir_path;
4230 + /* dentry for old/new dir */
4231 + dir = par_path.dentry;
4233 + /* give up reference on dir */
4234 + dput(new_path->dentry);
4236 + /* new_dentry already has a reference */
4237 + new_path->dentry = new_dentry;
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;
4251 + goto out_unlock_new;
4253 + /* the old file went away */
4255 + if ((redo = d_unhashed(old_dentry)))
4256 + goto out_unlock_new;
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;
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;
4276 + /* unlock the inode from filename_create() */
4277 + inode_unlock(dir->d_inode);
4279 + /* drop write access to mnt */
4280 + mnt_drop_write(new_path->mnt);
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);
4288 + goto out_fput_both;
4289 + } else if (ret < size) {
4291 + goto out_fput_both;
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
4301 + setattr_copy(new_inode, &attr);
4302 + mark_inode_dirty(new_inode);
4305 + /* lock rename mutex */
4306 + mutex_lock(&old_dentry->d_inode->i_sb->s_vfs_rename_mutex);
4308 + /* drop out late */
4310 + if ((redo = d_unhashed(old_dentry)))
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);
4324 + mutex_unlock(&old_dentry->d_inode->i_sb->s_vfs_rename_mutex);
4327 + vxdprintk(VXD_CBIT(misc, 3),
4328 + "fput(new_file=%p[#%ld])", new_file,
4329 + atomic_long_read(&new_file->f_count));
4333 + vxdprintk(VXD_CBIT(misc, 3),
4334 + "fput(old_file=%p[#%ld])", old_file,
4335 + atomic_long_read(&old_file->f_count));
4339 + /* drop references from par_path */
4340 + path_put(&par_path);
4343 + /* unlock the inode from filename_create() */
4344 + inode_unlock(dir->d_inode);
4346 + /* drop write access to mnt */
4347 + mnt_drop_write(new_path->mnt);
4353 + /* error path cleanup */
4354 + vfs_unlink(dir->d_inode, new_dentry, NULL);
4358 + goto out_rel_both;
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);
4364 + goto out_rel_both;
4366 + /* drop reference on new_dentry */
4368 + new_dentry = old_path.dentry;
4370 + vxdprintk(VXD_CBIT(misc, 2),
4371 + "do_path_lookup(redo): %p [" VS_Q("%.*s") ":%d]",
4373 + new_dentry->d_name.len, new_dentry->d_name.name,
4374 + new_dentry->d_name.len);
4377 + dump_path("put (new)", new_path);
4379 + path_put(new_path);
4381 + dump_path("put (old)", &old_path);
4382 + path_put(&old_path);
4388 + new_dentry = ERR_PTR(ret);
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;
4399 +int vx_info_mnt_namespace(struct mnt_namespace *ns, char *buffer)
4402 + struct vfsmount *vmnt;
4403 + char *pstr, *root;
4406 + pstr = kmalloc(PATH_MAX, GFP_KERNEL);
4410 + vmnt = &ns->root->mnt;
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),
4423 +EXPORT_SYMBOL(vx_info_mnt_namespace);
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.82/fs/namespace.c linux-4.9.82-vs2.3.9.7/fs/namespace.c
4429 --- linux-4.9.82/fs/namespace.c 2018-02-22 21:18:47.000000000 +0000
4430 +++ linux-4.9.82-vs2.3.9.7/fs/namespace.c 2018-01-13 01:17:24.000000000 +0000
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>
4441 #include "internal.h"
4443 @@ -971,6 +976,10 @@ vfs_kern_mount(struct file_system_type *
4445 return ERR_PTR(-ENODEV);
4447 + if ((type->fs_flags & FS_BINARY_MOUNTDATA) &&
4448 + !vx_capable(CAP_SYS_ADMIN, VXC_BINARY_MOUNT))
4449 + return ERR_PTR(-EPERM);
4451 mnt = alloc_vfsmnt(name);
4453 return ERR_PTR(-ENOMEM);
4454 @@ -1061,6 +1070,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;
4460 list_add_tail(&mnt->mnt_instance, &sb->s_mounts);
4461 unlock_mount_hash();
4462 @@ -1635,7 +1645,8 @@ out_unlock:
4464 static inline bool may_mount(void)
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);
4471 static inline bool may_mandlock(void)
4472 @@ -2144,6 +2155,7 @@ static int do_change_type(struct path *p
4476 + // mnt->mnt_flags = mnt_flags;
4479 for (m = mnt; m; m = (recurse ? next_mnt(m, mnt) : NULL))
4480 @@ -2172,12 +2184,14 @@ static bool has_locked_children(struct m
4481 * do loopback mount.
4483 static int do_loopback(struct path *path, const char *old_name,
4485 + vtag_t tag, unsigned long flags, int mnt_flags)
4487 struct path old_path;
4488 struct mount *mnt = NULL, *old, *parent;
4489 struct mountpoint *mp;
4490 + int recurse = flags & MS_REC;
4493 if (!old_name || !*old_name)
4495 err = kern_path(old_name, LOOKUP_FOLLOW|LOOKUP_AUTOMOUNT, &old_path);
4496 @@ -2257,7 +2271,7 @@ static int change_mount_flags(struct vfs
4497 * on it - tough luck.
4499 static int do_remount(struct path *path, int flags, int mnt_flags,
4501 + void *data, vxid_t xid)
4504 struct super_block *sb = path->mnt->mnt_sb;
4505 @@ -2742,6 +2756,7 @@ long do_mount(const char *dev_name, cons
4512 if ((flags & MS_MGC_MSK) == MS_MGC_VAL)
4513 @@ -2769,6 +2784,12 @@ long do_mount(const char *dev_name, cons
4514 if (!(flags & MS_NOATIME))
4515 mnt_flags |= MNT_RELATIME;
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;
4523 /* Separate the per-mountpoint flags */
4524 if (flags & MS_NOSUID)
4525 mnt_flags |= MNT_NOSUID;
4526 @@ -2793,15 +2814,18 @@ long do_mount(const char *dev_name, cons
4527 mnt_flags |= path.mnt->mnt_flags & MNT_ATIME_MASK;
4530 + if (!vx_capable(CAP_SYS_ADMIN, VXC_DEV_MOUNT))
4531 + mnt_flags |= MNT_NODEV;
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);
4537 if (flags & MS_REMOUNT)
4538 retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
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 @@ -2942,6 +2966,7 @@ struct mnt_namespace *copy_mnt_ns(unsign
4548 p = next_mnt(p, old);
4551 + atomic_inc(&vs_global_mnt_ns);
4555 @@ -3117,9 +3142,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))
4566 if (!check_mnt(root_mnt) || !check_mnt(new_mnt))
4568 @@ -3257,6 +3283,7 @@ void put_mnt_ns(struct mnt_namespace *ns
4569 if (!atomic_dec_and_test(&ns->count))
4571 drop_collected_mounts(&ns->root->mnt);
4572 + atomic_dec(&vs_global_mnt_ns);
4576 diff -NurpP --minimal linux-4.9.82/fs/nfs/client.c linux-4.9.82-vs2.3.9.7/fs/nfs/client.c
4577 --- linux-4.9.82/fs/nfs/client.c 2016-12-11 19:17:54.000000000 +0000
4578 +++ linux-4.9.82-vs2.3.9.7/fs/nfs/client.c 2018-01-10 02:50:49.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;
4583 + server->client->cl_tag = 0;
4584 + if (server->flags & NFS_MOUNT_TAGGED)
4585 + server->client->cl_tag = 1;
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;
4593 + /* FIXME: needs fsinfo
4594 + if (server->flags & NFS_MOUNT_TAGGED)
4595 + sb->s_flags |= MS_TAGGED; */
4597 server->maxfilesize = fsinfo->maxfilesize;
4599 server->time_delta = fsinfo->time_delta;
4600 diff -NurpP --minimal linux-4.9.82/fs/nfs/dir.c linux-4.9.82-vs2.3.9.7/fs/nfs/dir.c
4601 --- linux-4.9.82/fs/nfs/dir.c 2018-02-22 21:18:47.000000000 +0000
4602 +++ linux-4.9.82-vs2.3.9.7/fs/nfs/dir.c 2018-01-10 02:50:49.000000000 +0000
4604 #include <linux/sched.h>
4605 #include <linux/kmemleak.h>
4606 #include <linux/xattr.h>
4607 +#include <linux/vs_tag.h>
4609 #include "delegation.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);
4615 + dx_propagate_tag(nd, inode);
4617 res = d_splice_alias(inode, dentry);
4619 diff -NurpP --minimal linux-4.9.82/fs/nfs/inode.c linux-4.9.82-vs2.3.9.7/fs/nfs/inode.c
4620 --- linux-4.9.82/fs/nfs/inode.c 2018-02-22 21:18:47.000000000 +0000
4621 +++ linux-4.9.82-vs2.3.9.7/fs/nfs/inode.c 2018-01-10 02:50:49.000000000 +0000
4623 #include <linux/slab.h>
4624 #include <linux/compat.h>
4625 #include <linux/freezer.h>
4626 +#include <linux/vs_tag.h>
4628 #include <asm/uaccess.h>
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;
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;
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));
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
4666 inode->i_blocks = nfs_calc_block_size(fattr->du.nfs3.used);
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 */
4673 nfs_setsecurity(inode, fattr, label);
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);
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;
4693 if (nfs_have_delegated_attributes(inode))
4695 @@ -1301,13 +1312,18 @@ static int nfs_check_inode_attributes(st
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);
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? */
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;
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;
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);
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;
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);
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.82/fs/nfs/nfs3xdr.c linux-4.9.82-vs2.3.9.7/fs/nfs/nfs3xdr.c
4748 --- linux-4.9.82/fs/nfs/nfs3xdr.c 2016-12-11 19:17:54.000000000 +0000
4749 +++ linux-4.9.82-vs2.3.9.7/fs/nfs/nfs3xdr.c 2018-01-10 02:50:49.000000000 +0000
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"
4757 #define NFSDBG_FACILITY NFSDBG_XDR
4758 @@ -558,7 +559,8 @@ static __be32 *xdr_decode_nfstime3(__be3
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)
4768 @@ -590,15 +592,19 @@ static void encode_sattr3(struct xdr_str
4772 - if (attr->ia_valid & ATTR_UID) {
4773 + if (attr->ia_valid & ATTR_UID ||
4774 + (tag && (attr->ia_valid & ATTR_TAG))) {
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)));
4782 - if (attr->ia_valid & ATTR_GID) {
4783 + if (attr->ia_valid & ATTR_GID ||
4784 + (tag && (attr->ia_valid & ATTR_TAG))) {
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)));
4792 @@ -887,7 +893,7 @@ static void nfs3_xdr_enc_setattr3args(st
4793 const struct nfs3_sattrargs *args)
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);
4801 @@ -1037,13 +1043,13 @@ static void nfs3_xdr_enc_write3args(stru
4804 static void encode_createhow3(struct xdr_stream *xdr,
4805 - const struct nfs3_createargs *args)
4806 + const struct nfs3_createargs *args, int tag)
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);
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)
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);
4826 @@ -1074,7 +1080,7 @@ static void nfs3_xdr_enc_mkdir3args(stru
4827 const struct nfs3_mkdirargs *args)
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);
4835 @@ -1091,9 +1097,9 @@ static void nfs3_xdr_enc_mkdir3args(stru
4838 static void encode_symlinkdata3(struct xdr_stream *xdr,
4839 - const struct nfs3_symlinkargs *args)
4840 + const struct nfs3_symlinkargs *args, int tag)
4842 - encode_sattr3(xdr, args->sattr);
4843 + encode_sattr3(xdr, args->sattr, tag);
4844 encode_nfspath3(xdr, args->pages, args->pathlen);
4847 @@ -1102,7 +1108,7 @@ static void nfs3_xdr_enc_symlink3args(st
4848 const struct nfs3_symlinkargs *args)
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;
4856 @@ -1131,24 +1137,24 @@ static void nfs3_xdr_enc_symlink3args(st
4859 static void encode_devicedata3(struct xdr_stream *xdr,
4860 - const struct nfs3_mknodargs *args)
4861 + const struct nfs3_mknodargs *args, int tag)
4863 - encode_sattr3(xdr, args->sattr);
4864 + encode_sattr3(xdr, args->sattr, tag);
4865 encode_specdata3(xdr, args->rdev);
4868 static void encode_mknoddata3(struct xdr_stream *xdr,
4869 - const struct nfs3_mknodargs *args)
4870 + const struct nfs3_mknodargs *args, int tag)
4872 encode_ftype3(xdr, args->type);
4873 switch (args->type) {
4876 - encode_devicedata3(xdr, args);
4877 + encode_devicedata3(xdr, args, tag);
4881 - encode_sattr3(xdr, args->sattr);
4882 + encode_sattr3(xdr, args->sattr, tag);
4886 @@ -1163,7 +1169,7 @@ static void nfs3_xdr_enc_mknod3args(stru
4887 const struct nfs3_mknodargs *args)
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);
4895 diff -NurpP --minimal linux-4.9.82/fs/nfs/super.c linux-4.9.82-vs2.3.9.7/fs/nfs/super.c
4896 --- linux-4.9.82/fs/nfs/super.c 2018-02-22 21:18:48.000000000 +0000
4897 +++ linux-4.9.82-vs2.3.9.7/fs/nfs/super.c 2018-01-10 02:50:49.000000000 +0000
4899 #include <linux/parser.h>
4900 #include <linux/nsproxy.h>
4901 #include <linux/rcupdate.h>
4902 +#include <linux/vs_tag.h>
4904 #include <asm/uaccess.h>
4906 @@ -102,6 +103,7 @@ enum {
4912 /* Mount options that take string arguments */
4914 @@ -114,6 +116,9 @@ enum {
4915 /* Special mount options */
4916 Opt_userspace, Opt_deprecated, Opt_sloppy,
4918 + /* Linux-VServer tagging options */
4919 + Opt_tag, Opt_notag,
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" },
4928 + { Opt_tag, "tag" },
4929 + { Opt_notag, "notag" },
4930 + { Opt_tagid, "tagid=%u" },
4932 /* The following needs to be listed after all other options */
4933 { Opt_nfsvers, "v%s" },
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", "" },
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;
4947 +#ifndef CONFIG_TAGGING_NONE
4949 + mnt->flags |= NFS_MOUNT_TAGGED;
4952 + mnt->flags &= ~NFS_MOUNT_TAGGED;
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;
4962 +#ifdef CONFIG_PROPAGATE
4965 + nfs_data.flags |= NFS_MOUNT_TAGGED;
4970 * options that take text values
4971 diff -NurpP --minimal linux-4.9.82/fs/nfsd/auth.c linux-4.9.82-vs2.3.9.7/fs/nfsd/auth.c
4972 --- linux-4.9.82/fs/nfsd/auth.c 2018-02-22 21:18:48.000000000 +0000
4973 +++ linux-4.9.82-vs2.3.9.7/fs/nfsd/auth.c 2018-02-10 15:15:43.000000000 +0000
4975 /* Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> */
4977 #include <linux/sched.h>
4978 +#include <linux/vs_tag.h>
4982 @@ -35,6 +36,9 @@ int nfsd_setuser(struct svc_rqst *rqstp,
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);
4990 rqgi = rqstp->rq_cred.cr_group_info;
4992 diff -NurpP --minimal linux-4.9.82/fs/nfsd/nfs3xdr.c linux-4.9.82-vs2.3.9.7/fs/nfsd/nfs3xdr.c
4993 --- linux-4.9.82/fs/nfsd/nfs3xdr.c 2018-02-22 21:18:48.000000000 +0000
4994 +++ linux-4.9.82-vs2.3.9.7/fs/nfsd/nfs3xdr.c 2018-01-10 02:50:49.000000000 +0000
4997 #include <linux/namei.h>
4998 #include <linux/sunrpc/svc_xprt.h>
4999 +#include <linux/vs_tag.h>
5003 @@ -98,6 +99,8 @@ static __be32 *
5004 decode_sattr3(__be32 *p, struct iattr *iap)
5007 + kuid_t kuid = GLOBAL_ROOT_UID;
5008 + kgid_t kgid = GLOBAL_ROOT_GID;
5012 @@ -106,15 +109,18 @@ decode_sattr3(__be32 *p, struct iattr *i
5013 iap->ia_mode = ntohl(*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;
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;
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);
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);
5048 diff -NurpP --minimal linux-4.9.82/fs/nfsd/nfs4xdr.c linux-4.9.82-vs2.3.9.7/fs/nfsd/nfs4xdr.c
5049 --- linux-4.9.82/fs/nfsd/nfs4xdr.c 2018-02-22 21:18:48.000000000 +0000
5050 +++ linux-4.9.82-vs2.3.9.7/fs/nfsd/nfs4xdr.c 2018-01-10 02:50:49.000000000 +0000
5052 #include <linux/utsname.h>
5053 #include <linux/pagemap.h>
5054 #include <linux/sunrpc/svcauth_gss.h>
5055 +#include <linux/vs_tag.h>
5059 @@ -2677,12 +2678,16 @@ out_acl:
5060 *p++ = cpu_to_be32(stat.nlink);
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));
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));
5078 diff -NurpP --minimal linux-4.9.82/fs/nfsd/nfsxdr.c linux-4.9.82-vs2.3.9.7/fs/nfsd/nfsxdr.c
5079 --- linux-4.9.82/fs/nfsd/nfsxdr.c 2018-02-22 21:18:48.000000000 +0000
5080 +++ linux-4.9.82-vs2.3.9.7/fs/nfsd/nfsxdr.c 2018-01-10 02:50:49.000000000 +0000
5085 +#include <linux/vs_tag.h>
5087 #define NFSDDBG_FACILITY NFSDDBG_XDR
5089 @@ -89,6 +90,8 @@ static __be32 *
5090 decode_sattr(__be32 *p, struct iattr *iap)
5093 + kuid_t kuid = GLOBAL_ROOT_UID;
5094 + kgid_t kgid = GLOBAL_ROOT_GID;
5098 @@ -101,15 +104,18 @@ decode_sattr(__be32 *p, struct iattr *ia
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;
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;
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;
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)));
5130 if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
5131 *p++ = htonl(NFS_MAXPATHLEN);
5132 diff -NurpP --minimal linux-4.9.82/fs/ocfs2/dlmglue.c linux-4.9.82-vs2.3.9.7/fs/ocfs2/dlmglue.c
5133 --- linux-4.9.82/fs/ocfs2/dlmglue.c 2018-02-22 21:18:49.000000000 +0000
5134 +++ linux-4.9.82-vs2.3.9.7/fs/ocfs2/dlmglue.c 2018-01-10 02:50:49.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
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.82/fs/ocfs2/dlmglue.h linux-4.9.82-vs2.3.9.7/fs/ocfs2/dlmglue.h
5152 --- linux-4.9.82/fs/ocfs2/dlmglue.h 2018-02-22 21:18:49.000000000 +0000
5153 +++ linux-4.9.82-vs2.3.9.7/fs/ocfs2/dlmglue.h 2018-01-10 02:50:49.000000000 +0000
5154 @@ -46,7 +46,8 @@ struct ocfs2_meta_lvb {
5157 __be32 lvb_igeneration;
5158 - __be32 lvb_reserved2;
5160 + __be16 lvb_reserved2;
5163 #define OCFS2_QINFO_LVB_VERSION 1
5164 diff -NurpP --minimal linux-4.9.82/fs/ocfs2/file.c linux-4.9.82-vs2.3.9.7/fs/ocfs2/file.c
5165 --- linux-4.9.82/fs/ocfs2/file.c 2018-02-22 21:18:49.000000000 +0000
5166 +++ linux-4.9.82-vs2.3.9.7/fs/ocfs2/file.c 2018-01-10 02:50:49.000000000 +0000
5167 @@ -1151,7 +1151,7 @@ int ocfs2_setattr(struct dentry *dentry,
5168 attr->ia_valid &= ~ATTR_SIZE;
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))
5176 diff -NurpP --minimal linux-4.9.82/fs/ocfs2/inode.c linux-4.9.82-vs2.3.9.7/fs/ocfs2/inode.c
5177 --- linux-4.9.82/fs/ocfs2/inode.c 2016-12-11 19:17:54.000000000 +0000
5178 +++ linux-4.9.82-vs2.3.9.7/fs/ocfs2/inode.c 2018-01-10 02:50:49.000000000 +0000
5180 #include <linux/highmem.h>
5181 #include <linux/pagemap.h>
5182 #include <linux/quotaops.h>
5183 +#include <linux/vs_tag.h>
5185 #include <asm/byteorder.h>
5187 @@ -87,11 +88,13 @@ void ocfs2_set_inode_flags(struct inode
5189 unsigned int flags = OCFS2_I(inode)->ip_attr;
5191 - inode->i_flags &= ~(S_IMMUTABLE |
5192 + inode->i_flags &= ~(S_IMMUTABLE | S_IXUNLINK |
5193 S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
5195 if (flags & OCFS2_IMMUTABLE_FL)
5196 inode->i_flags |= S_IMMUTABLE;
5197 + if (flags & OCFS2_IXUNLINK_FL)
5198 + inode->i_flags |= S_IXUNLINK;
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;
5207 + inode->i_vflags &= ~(V_BARRIER | V_COW);
5209 + if (flags & OCFS2_BARRIER_FL)
5210 + inode->i_vflags |= V_BARRIER;
5211 + if (flags & OCFS2_COW_FL)
5212 + inode->i_vflags |= V_COW;
5215 /* Propagate flags from i_flags to OCFS2_I(inode)->ip_attr */
5216 void ocfs2_get_inode_flags(struct ocfs2_inode_info *oi)
5218 unsigned int flags = oi->vfs_inode.i_flags;
5219 + unsigned int vflags = oi->vfs_inode.i_vflags;
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);
5226 + if (flags & S_IMMUTABLE)
5227 + oi->ip_attr |= OCFS2_IMMUTABLE_FL;
5228 + if (flags & S_IXUNLINK)
5229 + oi->ip_attr |= OCFS2_IXUNLINK_FL;
5231 - oi->ip_attr &= ~(OCFS2_SYNC_FL|OCFS2_APPEND_FL|
5232 - OCFS2_IMMUTABLE_FL|OCFS2_NOATIME_FL|OCFS2_DIRSYNC_FL);
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;
5244 + if (vflags & V_BARRIER)
5245 + oi->ip_attr |= OCFS2_BARRIER_FL;
5246 + if (vflags & V_COW)
5247 + oi->ip_attr |= OCFS2_COW_FL;
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;
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));
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.82/fs/ocfs2/inode.h linux-4.9.82-vs2.3.9.7/fs/ocfs2/inode.h
5276 --- linux-4.9.82/fs/ocfs2/inode.h 2016-12-11 19:17:54.000000000 +0000
5277 +++ linux-4.9.82-vs2.3.9.7/fs/ocfs2/inode.h 2018-01-10 02:50:49.000000000 +0000
5278 @@ -155,6 +155,7 @@ int ocfs2_mark_inode_dirty(handle_t *han
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);
5284 static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
5286 diff -NurpP --minimal linux-4.9.82/fs/ocfs2/ioctl.c linux-4.9.82-vs2.3.9.7/fs/ocfs2/ioctl.c
5287 --- linux-4.9.82/fs/ocfs2/ioctl.c 2016-12-11 19:17:54.000000000 +0000
5288 +++ linux-4.9.82-vs2.3.9.7/fs/ocfs2/ioctl.c 2018-01-10 02:50:49.000000000 +0000
5289 @@ -76,7 +76,41 @@ static int ocfs2_get_inode_attr(struct i
5293 -static int ocfs2_set_inode_attr(struct inode *inode, unsigned flags,
5294 +int ocfs2_sync_flags(struct inode *inode, int flags, int vflags)
5296 + struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
5297 + struct buffer_head *bh = NULL;
5298 + handle_t *handle = NULL;
5301 + status = ocfs2_inode_lock(inode, &bh, 1);
5303 + mlog_errno(status);
5306 + handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);
5307 + if (IS_ERR(handle)) {
5308 + status = PTR_ERR(handle);
5309 + mlog_errno(status);
5313 + inode->i_flags = flags;
5314 + inode->i_vflags = vflags;
5315 + ocfs2_get_inode_flags(OCFS2_I(inode));
5317 + status = ocfs2_mark_inode_dirty(handle, inode, bh);
5319 + mlog_errno(status);
5321 + ocfs2_commit_trans(osb, handle);
5323 + ocfs2_inode_unlock(inode, 1);
5328 +int ocfs2_set_inode_attr(struct inode *inode, unsigned flags,
5331 struct ocfs2_inode_info *ocfs2_inode = OCFS2_I(inode);
5332 @@ -116,6 +150,11 @@ static int ocfs2_set_inode_attr(struct i
5336 + if (IS_BARRIER(inode)) {
5337 + vxwprintk_task(1, "messing with the barrier.");
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:
5349 long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
5351 struct inode *inode = file_inode(filp);
5352 diff -NurpP --minimal linux-4.9.82/fs/ocfs2/namei.c linux-4.9.82-vs2.3.9.7/fs/ocfs2/namei.c
5353 --- linux-4.9.82/fs/ocfs2/namei.c 2016-12-11 19:17:54.000000000 +0000
5354 +++ linux-4.9.82-vs2.3.9.7/fs/ocfs2/namei.c 2018-01-10 02:50:49.000000000 +0000
5356 #include <linux/slab.h>
5357 #include <linux/highmem.h>
5358 #include <linux/quotaops.h>
5359 +#include <linux/vs_tag.h>
5361 #include <cluster/masklog.h>
5363 @@ -516,6 +517,7 @@ static int __ocfs2_mknod_locked(struct i
5364 struct ocfs2_extent_list *fel;
5366 struct ocfs2_inode_info *oi = OCFS2_I(inode);
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));
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.82/fs/ocfs2/ocfs2.h linux-4.9.82-vs2.3.9.7/fs/ocfs2/ocfs2.h
5388 --- linux-4.9.82/fs/ocfs2/ocfs2.h 2018-02-22 21:18:49.000000000 +0000
5389 +++ linux-4.9.82-vs2.3.9.7/fs/ocfs2/ocfs2.h 2018-01-10 02:50:49.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 */
5397 #define OCFS2_OSB_SOFT_RO 0x0001
5398 diff -NurpP --minimal linux-4.9.82/fs/ocfs2/ocfs2_fs.h linux-4.9.82-vs2.3.9.7/fs/ocfs2/ocfs2_fs.h
5399 --- linux-4.9.82/fs/ocfs2/ocfs2_fs.h 2016-12-11 19:17:54.000000000 +0000
5400 +++ linux-4.9.82-vs2.3.9.7/fs/ocfs2/ocfs2_fs.h 2018-01-10 02:50:49.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 */
5405 +#define OCFS2_IXUNLINK_FL FS_IXUNLINK_FL /* Immutable invert on unlink */
5407 +#define OCFS2_BARRIER_FL FS_BARRIER_FL /* Barrier for chroot() */
5408 +#define OCFS2_COW_FL FS_COW_FL /* Copy on Write marker */
5410 #define OCFS2_FL_VISIBLE FS_FL_USER_VISIBLE /* User visible flags */
5411 #define OCFS2_FL_MODIFIABLE FS_FL_USER_MODIFIABLE /* User modifiable flags */
5413 diff -NurpP --minimal linux-4.9.82/fs/ocfs2/super.c linux-4.9.82-vs2.3.9.7/fs/ocfs2/super.c
5414 --- linux-4.9.82/fs/ocfs2/super.c 2016-12-11 19:17:54.000000000 +0000
5415 +++ linux-4.9.82-vs2.3.9.7/fs/ocfs2/super.c 2018-01-10 02:50:49.000000000 +0000
5416 @@ -188,6 +188,7 @@ enum {
5418 Opt_journal_async_commit,
5420 + Opt_tag, Opt_notag, Opt_tagid,
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"},
5429 + {Opt_notag, "notag"},
5430 + {Opt_tagid, "tagid=%u"},
5434 @@ -673,6 +677,13 @@ static int ocfs2_remount(struct super_bl
5438 + if ((osb->s_mount_opt & OCFS2_MOUNT_TAGGED) !=
5439 + (parsed_options.mount_opt & OCFS2_MOUNT_TAGGED)) {
5441 + mlog(ML_ERROR, "Cannot change tagging on remount\n");
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 @@ -1162,6 +1173,9 @@ static int ocfs2_fill_super(struct super
5450 ocfs2_complete_mount_recovery(osb);
5452 + if (osb->s_mount_opt & OCFS2_MOUNT_TAGGED)
5453 + sb->s_flags |= MS_TAGGED;
5455 if (ocfs2_mount_local(osb))
5456 snprintf(nodestr, sizeof(nodestr), "local");
5458 @@ -1481,6 +1495,20 @@ static int ocfs2_parse_options(struct su
5459 case Opt_journal_async_commit:
5460 mopt->mount_opt |= OCFS2_MOUNT_JOURNAL_ASYNC_COMMIT;
5462 +#ifndef CONFIG_TAGGING_NONE
5464 + mopt->mount_opt |= OCFS2_MOUNT_TAGGED;
5467 + mopt->mount_opt &= ~OCFS2_MOUNT_TAGGED;
5470 +#ifdef CONFIG_PROPAGATE
5473 + mopt->mount_opt |= OCFS2_MOUNT_TAGGED;
5478 "Unrecognized mount option \"%s\" "
5479 diff -NurpP --minimal linux-4.9.82/fs/open.c linux-4.9.82-vs2.3.9.7/fs/open.c
5480 --- linux-4.9.82/fs/open.c 2018-02-22 21:18:49.000000000 +0000
5481 +++ linux-4.9.82-vs2.3.9.7/fs/open.c 2018-01-13 22:17:33.000000000 +0000
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>
5492 #include "internal.h"
5494 @@ -65,12 +70,17 @@ int do_truncate(struct dentry *dentry, l
5498 -long vfs_truncate(const struct path *path, loff_t length)
5499 +long vfs_truncate(struct path *path, loff_t length)
5501 struct inode *inode;
5502 struct dentry *upperdentry;
5505 +#ifdef CONFIG_VSERVER_COWBL
5506 + error = cow_check_and_break(path);
5510 inode = path->dentry->d_inode;
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;
5516 error = user_path_at(dfd, filename, lookup_flags, &path);
5517 +#ifdef CONFIG_VSERVER_COWBL
5519 + error = cow_check_and_break(&path);
5525 error = chmod_common(&path, mode);
5527 @@ -599,13 +616,15 @@ retry_deleg:
5528 if (!uid_valid(uid))
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));
5535 if (group != (gid_t) -1) {
5536 if (!gid_valid(gid))
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));
5543 if (!S_ISDIR(inode->i_mode))
5544 newattrs.ia_valid |=
5545 @@ -643,6 +662,10 @@ retry:
5546 error = mnt_want_write(path.mnt);
5549 +#ifdef CONFIG_VSERVER_COWBL
5550 + error = cow_check_and_break(&path);
5553 error = chown_common(&path, user, group);
5554 mnt_drop_write(path.mnt);
5556 diff -NurpP --minimal linux-4.9.82/fs/proc/array.c linux-4.9.82-vs2.3.9.7/fs/proc/array.c
5557 --- linux-4.9.82/fs/proc/array.c 2018-02-22 21:18:51.000000000 +0000
5558 +++ linux-4.9.82-vs2.3.9.7/fs/proc/array.c 2018-01-25 00:21:32.000000000 +0000
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>
5566 #include <asm/pgtable.h>
5567 #include <asm/processor.h>
5568 @@ -169,6 +171,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;
5572 + if (unlikely(vx_current_initpid(p->pid)))
5575 tracer = ptrace_parent(p);
5577 tpid = task_pid_nr_ns(tracer, ns);
5578 @@ -306,8 +311,8 @@ static inline void task_sig(struct seq_f
5579 render_sigset_t(m, "SigCgt:\t", &caught);
5582 -static void render_cap_t(struct seq_file *m, const char *header,
5584 +void render_cap_t(struct seq_file *m, const char *header,
5585 + struct vx_info *vxi, kernel_cap_t *a)
5589 @@ -334,11 +339,12 @@ static inline void task_cap(struct seq_f
5590 cap_ambient = cred->cap_ambient;
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);
5606 static inline void task_seccomp(struct seq_file *m, struct task_struct *p)
5607 @@ -365,6 +371,43 @@ static void task_cpus_allowed(struct seq
5608 cpumask_pr_args(&task->cpus_allowed));
5611 +int proc_pid_nsproxy(struct seq_file *m, struct pid_namespace *ns,
5612 + struct pid *pid, struct task_struct *task)
5614 + seq_printf(m, "Proxy:\t%p(%c)\n"
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' : '-'));
5638 +void task_vs_id(struct seq_file *m, struct task_struct *task)
5640 + if (task_vx_flags(task, VXF_HIDE_VINFO, 0))
5643 + seq_printf(m, "VxID:\t%d\n", vx_task_xid(task));
5644 + seq_printf(m, "NxID:\t%d\n", nx_task_nid(task));
5648 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
5649 struct pid *pid, struct task_struct *task)
5651 @@ -382,6 +425,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);
5659 @@ -497,6 +541,17 @@ static int do_task_stat(struct seq_file
5660 /* convert nsec -> ticks */
5661 start_time = nsec_to_clock_t(task->real_start_time);
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;
5668 + if (start_time > bias)
5669 + start_time -= bias;
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.82/fs/proc/base.c linux-4.9.82-vs2.3.9.7/fs/proc/base.c
5678 --- linux-4.9.82/fs/proc/base.c 2018-02-22 21:18:51.000000000 +0000
5679 +++ linux-4.9.82-vs2.3.9.7/fs/proc/base.c 2018-01-13 01:59:11.000000000 +0000
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>
5689 @@ -1063,10 +1065,15 @@ static int __set_oom_adj(struct file *fi
5690 mutex_lock(&oom_adj_mutex);
5692 if (oom_adj < task->signal->oom_score_adj &&
5693 - !capable(CAP_SYS_RESOURCE)) {
5694 + !vx_capable(CAP_SYS_RESOURCE, VXC_OOM_ADJUST)) {
5699 + /* prevent guest processes from circumventing the oom killer */
5700 + if (vx_current_xid() && (oom_adj == OOM_DISABLE))
5701 + oom_adj = OOM_ADJUST_MIN;
5704 * /proc/pid/oom_adj is provided for legacy purposes, ask users to use
5705 * /proc/pid/oom_score_adj instead.
5706 @@ -1696,6 +1703,8 @@ struct inode *proc_pid_make_inode(struct
5707 inode->i_gid = cred->egid;
5710 + /* procfs is xid tagged */
5711 + i_tag_write(inode, (vtag_t)vx_task_xid(task));
5712 security_task_to_inode(task, inode);
5715 @@ -1741,6 +1750,8 @@ int pid_getattr(struct vfsmount *mnt, st
5719 +// static unsigned name_to_int(struct dentry *dentry);
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 @@ -1769,6 +1780,19 @@ int pid_revalidate(struct dentry *dentry
5725 task = get_proc_task(inode);
5728 + unsigned pid = name_to_int(&dentry->d_name);
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);
5741 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
5742 task_dumpable(task)) {
5744 @@ -2408,6 +2432,13 @@ static struct dentry *proc_pident_lookup
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)))
5756 * Yes, it does not scale. And it should not. Don't add
5757 * new entries into /proc/<tgid>/ without very good reasons.
5758 @@ -2847,6 +2878,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;
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 *);
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 @@ -2911,6 +2947,8 @@ static const struct pid_entry tgid_base_
5771 #ifdef CONFIG_CGROUPS
5772 ONE("cgroup", S_IRUGO, proc_cgroup_show),
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 @@ -3126,7 +3164,7 @@ retry:
5781 pid = find_ge_pid(iter.tgid, ns);
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 @@ -3186,8 +3224,10 @@ int proc_pid_readdir(struct file *file,
5789 if (!has_pid_permissions(ns, iter.task, 2))
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))
5797 if (!proc_fill_cache(file, ctx, name, len,
5798 proc_pid_instantiate, iter.task, NULL)) {
5799 put_task_struct(iter.task);
5800 @@ -3324,6 +3364,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),
5804 + ONE("nsproxy", S_IRUGO, proc_pid_nsproxy),
5807 static int proc_tid_base_readdir(struct file *file, struct dir_context *ctx)
5808 @@ -3390,6 +3431,8 @@ static struct dentry *proc_task_lookup(s
5809 tid = name_to_int(&dentry->d_name);
5812 + if (vx_current_initpid(tid))
5815 ns = dentry->d_sb->s_fs_info;
5817 diff -NurpP --minimal linux-4.9.82/fs/proc/generic.c linux-4.9.82-vs2.3.9.7/fs/proc/generic.c
5818 --- linux-4.9.82/fs/proc/generic.c 2018-02-22 21:18:51.000000000 +0000
5819 +++ linux-4.9.82-vs2.3.9.7/fs/proc/generic.c 2018-01-10 02:50:49.000000000 +0000
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>
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;
5834 + if (!vx_hide_check(0, de->vx_flags)) {
5835 + vxdprintk(VXD_CBIT(misc, 9),
5837 + " hidden in pde_subdir_find()",
5838 + de->namelen, de->name);
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);
5854 read_unlock(&proc_subdir_lock);
5855 @@ -287,6 +298,12 @@ int proc_readdir_de(struct proc_dir_entr
5857 struct proc_dir_entry *next;
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);
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
5871 read_lock(&proc_subdir_lock);
5874 next = pde_subdir_next(de);
5876 @@ -387,6 +405,7 @@ static struct proc_dir_entry *__proc_cre
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
5890 + ent->vx_flags = IATTR_PROC_SYMLINK;
5894 diff -NurpP --minimal linux-4.9.82/fs/proc/inode.c linux-4.9.82-vs2.3.9.7/fs/proc/inode.c
5895 --- linux-4.9.82/fs/proc/inode.c 2016-12-11 19:17:54.000000000 +0000
5896 +++ linux-4.9.82-vs2.3.9.7/fs/proc/inode.c 2018-01-10 02:50:49.000000000 +0000
5897 @@ -432,6 +432,8 @@ struct inode *proc_get_inode(struct supe
5898 inode->i_uid = de->uid;
5899 inode->i_gid = de->gid;
5902 + PROC_I(inode)->vx_flags = de->vx_flags;
5904 inode->i_size = de->size;
5906 diff -NurpP --minimal linux-4.9.82/fs/proc/internal.h linux-4.9.82-vs2.3.9.7/fs/proc/internal.h
5907 --- linux-4.9.82/fs/proc/internal.h 2016-12-11 19:17:54.000000000 +0000
5908 +++ linux-4.9.82-vs2.3.9.7/fs/proc/internal.h 2018-01-13 01:48:13.000000000 +0000
5910 #include <linux/spinlock.h>
5911 #include <linux/atomic.h>
5912 #include <linux/binfmts.h>
5913 +#include <linux/vs_pid.h>
5915 struct ctl_table_header;
5917 @@ -34,6 +35,7 @@ struct proc_dir_entry {
5923 const struct inode_operations *proc_iops;
5924 const struct file_operations *proc_fops;
5925 @@ -51,15 +53,22 @@ struct proc_dir_entry {
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);
5947 struct proc_dir_entry *pde;
5948 @@ -92,11 +101,16 @@ static inline struct pid *proc_pid(struc
5949 return PROC_I(inode)->pid;
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)
5955 return get_pid_task(proc_pid(inode), PIDTYPE_PID);
5958 +static inline struct task_struct *get_proc_task(struct inode *inode)
5960 + return vx_get_proc_task(inode, proc_pid(inode));
5963 static inline int task_dumpable(struct task_struct *task)
5966 @@ -155,6 +169,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);
5975 diff -NurpP --minimal linux-4.9.82/fs/proc/loadavg.c linux-4.9.82-vs2.3.9.7/fs/proc/loadavg.c
5976 --- linux-4.9.82/fs/proc/loadavg.c 2016-12-11 19:17:54.000000000 +0000
5977 +++ linux-4.9.82-vs2.3.9.7/fs/proc/loadavg.c 2018-01-10 02:50:49.000000000 +0000
5980 static int loadavg_proc_show(struct seq_file *m, void *v)
5982 + unsigned long running;
5983 + unsigned int threads;
5984 unsigned long avnrun[3];
5986 get_avenrun(avnrun, FIXED_1/200, 0);
5988 + if (vx_flags(VXF_VIRT_LOAD, 0)) {
5989 + struct vx_info *vxi = current_vx_info();
5991 + running = atomic_read(&vxi->cvirt.nr_running);
5992 + threads = atomic_read(&vxi->cvirt.nr_threads);
5994 + running = nr_running();
5995 + threads = nr_threads;
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,
6004 task_active_pid_ns(current)->last_pid);
6007 diff -NurpP --minimal linux-4.9.82/fs/proc/meminfo.c linux-4.9.82-vs2.3.9.7/fs/proc/meminfo.c
6008 --- linux-4.9.82/fs/proc/meminfo.c 2016-12-11 19:17:54.000000000 +0000
6009 +++ linux-4.9.82-vs2.3.9.7/fs/proc/meminfo.c 2018-01-13 01:55:40.000000000 +0000
6010 @@ -55,7 +55,8 @@ static int meminfo_proc_show(struct seq_
6012 committed = percpu_counter_read_positive(&vm_committed_as);
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;
6020 diff -NurpP --minimal linux-4.9.82/fs/proc/root.c linux-4.9.82-vs2.3.9.7/fs/proc/root.c
6021 --- linux-4.9.82/fs/proc/root.c 2016-12-11 19:17:54.000000000 +0000
6022 +++ linux-4.9.82-vs2.3.9.7/fs/proc/root.c 2018-01-13 01:48:57.000000000 +0000
6024 #include <linux/mount.h>
6025 #include <linux/pid_namespace.h>
6026 #include <linux/parser.h>
6027 +#include <linux/vserver/inode.h>
6029 #include "internal.h"
6031 +struct proc_dir_entry *proc_virtual;
6033 +extern void proc_vx_init(void);
6036 Opt_gid, Opt_hidepid, Opt_err,
6038 @@ -145,6 +150,7 @@ void __init proc_root_init(void)
6040 proc_mkdir("bus", NULL);
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,
6054 diff -NurpP --minimal linux-4.9.82/fs/proc/self.c linux-4.9.82-vs2.3.9.7/fs/proc/self.c
6055 --- linux-4.9.82/fs/proc/self.c 2016-12-11 19:17:54.000000000 +0000
6056 +++ linux-4.9.82-vs2.3.9.7/fs/proc/self.c 2018-01-10 02:50:49.000000000 +0000
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"
6065 @@ -54,6 +55,8 @@ int proc_setup_self(struct super_block *
6066 self = d_alloc_name(s->s_root, "self");
6068 struct inode *inode = new_inode_pseudo(s);
6070 + // self->vx_flags = IATTR_PROC_SYMLINK;
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.82/fs/proc/stat.c linux-4.9.82-vs2.3.9.7/fs/proc/stat.c
6075 --- linux-4.9.82/fs/proc/stat.c 2016-12-11 19:17:54.000000000 +0000
6076 +++ linux-4.9.82-vs2.3.9.7/fs/proc/stat.c 2018-01-16 00:55:05.000000000 +0000
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>
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);
6095 user = nice = system = idle = iowait =
6096 irq = softirq = steal = 0;
6097 guest = guest_nice = 0;
6098 getboottime64(&boottime);
6100 + if (vx_flags(VXF_VIRT_UPTIME, 0))
6101 + vx_vsi_boottime64(&boottime);
6104 + cpuset_cpus_allowed(current, cpus_allowed);
6106 for_each_possible_cpu(i) {
6107 + if (virt_cpu && !cpumask_test_cpu(i, cpus_allowed))
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,
6116 for_each_online_cpu(i) {
6117 + if (virt_cpu && !cpumask_test_cpu(i, cpus_allowed))
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.82/fs/proc/uptime.c linux-4.9.82-vs2.3.9.7/fs/proc/uptime.c
6124 --- linux-4.9.82/fs/proc/uptime.c 2016-12-11 19:17:54.000000000 +0000
6125 +++ linux-4.9.82-vs2.3.9.7/fs/proc/uptime.c 2018-01-16 00:56:48.000000000 +0000
6127 #include <linux/seq_file.h>
6128 #include <linux/time.h>
6129 #include <linux/kernel_stat.h>
6130 +#include <linux/vserver/cvirt.h>
6131 #include <linux/cputime.h>
6133 static int uptime_proc_show(struct seq_file *m, void *v)
6134 @@ -24,6 +25,10 @@ static int uptime_proc_show(struct seq_f
6135 nsec = cputime64_to_jiffies64(idletime) * TICK_NSEC;
6136 idle.tv_sec = div_u64_rem(nsec, NSEC_PER_SEC, &rem);
6139 + if (vx_flags(VXF_VIRT_UPTIME, 0))
6140 + vx_vsi_uptime(&uptime, &idle);
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.82/fs/proc_namespace.c linux-4.9.82-vs2.3.9.7/fs/proc_namespace.c
6146 --- linux-4.9.82/fs/proc_namespace.c 2016-12-11 19:17:54.000000000 +0000
6147 +++ linux-4.9.82-vs2.3.9.7/fs/proc_namespace.c 2018-01-10 02:50:49.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" },
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\\");
6161 +#ifdef CONFIG_VSERVER_EXTRA_MNT_CHECK
6163 +static int mnt_is_reachable(struct vfsmount *vfsmnt)
6166 + struct dentry *point;
6167 + struct mount *mnt = real_mount(vfsmnt);
6168 + struct mount *root_mnt;
6171 + if (mnt == mnt->mnt_ns->root)
6175 + root = current->fs->root;
6176 + root_mnt = real_mount(root.mnt);
6177 + point = root.dentry;
6179 + while ((mnt != mnt->mnt_parent) && (mnt != root_mnt)) {
6180 + point = mnt->mnt_mountpoint;
6181 + mnt = mnt->mnt_parent;
6183 + rcu_read_unlock();
6185 + ret = (mnt == root_mnt) && is_subdir(point, root.dentry);
6190 +#define mnt_is_reachable(v) (1)
6193 static void show_type(struct seq_file *m, struct super_block *sb)
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;
6200 + if (vx_flags(VXF_HIDE_MOUNT, 0))
6202 + if (!mnt_is_reachable(mnt) && !vx_check(0, VS_WATCH_P))
6205 + if (!vx_check(0, VS_ADMIN|VS_WATCH) &&
6206 + mnt == current->fs->root.mnt) {
6207 + seq_puts(m, "/dev/root / ");
6211 if (sb->s_op->show_devname) {
6212 err = sb->s_op->show_devname(m, mnt_path.dentry);
6214 @@ -112,6 +157,7 @@ static int show_vfsmnt(struct seq_file *
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 };
6226 + if (vx_flags(VXF_HIDE_MOUNT, 0))
6228 + if (!mnt_is_reachable(mnt) && !vx_check(0, VS_WATCH_P))
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;
6238 + if (vx_flags(VXF_HIDE_MOUNT, 0))
6240 + if (!mnt_is_reachable(mnt) && !vx_check(0, VS_WATCH_P))
6243 + if (!vx_check(0, VS_ADMIN|VS_WATCH) &&
6244 + mnt == current->fs->root.mnt) {
6245 + seq_puts(m, "device /dev/root mounted on / ");
6250 if (sb->s_op->show_devname) {
6251 seq_puts(m, "device ");
6252 @@ -216,7 +278,7 @@ static int show_vfsstat(struct seq_file
6258 /* file system type */
6259 seq_puts(m, "with fstype ");
6261 diff -NurpP --minimal linux-4.9.82/fs/quota/dquot.c linux-4.9.82-vs2.3.9.7/fs/quota/dquot.c
6262 --- linux-4.9.82/fs/quota/dquot.c 2018-02-22 21:18:51.000000000 +0000
6263 +++ linux-4.9.82-vs2.3.9.7/fs/quota/dquot.c 2018-02-10 15:15:43.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;
6268 + if ((ret = dl_alloc_space(inode, number)))
6271 if (!dquot_active(inode)) {
6272 inode_incr_space(inode, number, reserve);
6274 @@ -1710,6 +1713,9 @@ int dquot_alloc_inode(struct inode *inod
6275 struct dquot_warn warn[MAXQUOTAS];
6276 struct dquot * const *dquots;
6278 + if ((ret = dl_alloc_inode(inode)))
6281 if (!dquot_active(inode))
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;
6288 + dl_free_space(inode, number);
6290 if (!dquot_active(inode)) {
6291 inode_decr_space(inode, number, reserve);
6293 @@ -1856,6 +1864,8 @@ void dquot_free_inode(struct inode *inod
6294 struct dquot * const *dquots;
6297 + dl_free_inode(inode);
6299 if (!dquot_active(inode))
6302 diff -NurpP --minimal linux-4.9.82/fs/quota/quota.c linux-4.9.82-vs2.3.9.7/fs/quota/quota.c
6303 --- linux-4.9.82/fs/quota/quota.c 2016-12-11 19:17:54.000000000 +0000
6304 +++ linux-4.9.82-vs2.3.9.7/fs/quota/quota.c 2018-01-10 02:50:49.000000000 +0000
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 @@ -38,7 +39,7 @@ static int check_quotactl_permission(str
6317 - if (!capable(CAP_SYS_ADMIN))
6318 + if (!vx_capable(CAP_SYS_ADMIN, VXC_QUOTA_CTL))
6322 @@ -768,6 +769,46 @@ static int do_quotactl(struct super_bloc
6326 +#if defined(CONFIG_BLK_DEV_VROOT) || defined(CONFIG_BLK_DEV_VROOT_MODULE)
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>
6334 +static vroot_grb_func *vroot_get_real_bdev = NULL;
6336 +static DEFINE_SPINLOCK(vroot_grb_lock);
6338 +int register_vroot_grb(vroot_grb_func *func) {
6341 + spin_lock(&vroot_grb_lock);
6342 + if (!vroot_get_real_bdev) {
6343 + vroot_get_real_bdev = func;
6346 + spin_unlock(&vroot_grb_lock);
6349 +EXPORT_SYMBOL(register_vroot_grb);
6351 +int unregister_vroot_grb(vroot_grb_func *func) {
6352 + int ret = -EINVAL;
6354 + spin_lock(&vroot_grb_lock);
6355 + if (vroot_get_real_bdev) {
6356 + vroot_get_real_bdev = NULL;
6359 + spin_unlock(&vroot_grb_lock);
6362 +EXPORT_SYMBOL(unregister_vroot_grb);
6366 /* Return 1 if 'cmd' will block on frozen filesystem */
6367 static int quotactl_cmd_write(int cmd)
6369 @@ -809,6 +850,22 @@ static struct super_block *quotactl_bloc
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;
6378 + if (vroot_get_real_bdev)
6379 + bdnew = vroot_get_real_bdev(bdev);
6381 + vxdprintk(VXD_CBIT(misc, 0),
6382 + "vroot_get_real_bdev not set");
6384 + if (IS_ERR(bdnew))
6385 + return ERR_PTR(PTR_ERR(bdnew));
6389 if (quotactl_cmd_write(cmd))
6390 sb = get_super_thawed(bdev);
6392 diff -NurpP --minimal linux-4.9.82/fs/stat.c linux-4.9.82-vs2.3.9.7/fs/stat.c
6393 --- linux-4.9.82/fs/stat.c 2018-02-22 21:18:51.000000000 +0000
6394 +++ linux-4.9.82-vs2.3.9.7/fs/stat.c 2018-01-10 02:50:49.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.82/fs/statfs.c linux-4.9.82-vs2.3.9.7/fs/statfs.c
6404 --- linux-4.9.82/fs/statfs.c 2016-12-11 19:17:54.000000000 +0000
6405 +++ linux-4.9.82-vs2.3.9.7/fs/statfs.c 2018-01-10 02:50:49.000000000 +0000
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"
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);
6424 diff -NurpP --minimal linux-4.9.82/fs/super.c linux-4.9.82-vs2.3.9.7/fs/super.c
6425 --- linux-4.9.82/fs/super.c 2018-02-22 21:18:51.000000000 +0000
6426 +++ linux-4.9.82-vs2.3.9.7/fs/super.c 2018-01-13 01:53:26.000000000 +0000
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"
6436 @@ -981,7 +983,8 @@ struct dentry *mount_ns(struct file_syst
6437 /* Don't allow mounting unless the caller has CAP_SYS_ADMIN
6438 * over the namespace.
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);
6445 sb = sget_userns(fs_type, ns_test_super, ns_set_super, flags,
6446 @@ -1191,6 +1194,13 @@ mount_fs(struct file_system_type *type,
6447 WARN_ON(!sb->s_bdi);
6448 sb->s_flags |= MS_BORN;
6451 + if (!vx_capable(CAP_SYS_ADMIN, VXC_BINARY_MOUNT) &&
6453 + (sb->s_magic != PROC_SUPER_MAGIC) &&
6454 + (sb->s_magic != DEVPTS_SUPER_MAGIC))
6457 error = security_sb_kern_mount(sb, flags, secdata);
6460 diff -NurpP --minimal linux-4.9.82/fs/utimes.c linux-4.9.82-vs2.3.9.7/fs/utimes.c
6461 --- linux-4.9.82/fs/utimes.c 2016-12-11 19:17:54.000000000 +0000
6462 +++ linux-4.9.82-vs2.3.9.7/fs/utimes.c 2018-01-10 02:50:49.000000000 +0000
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>
6472 @@ -52,13 +54,19 @@ static int utimes_common(struct path *pa
6475 struct iattr newattrs;
6476 - struct inode *inode = path->dentry->d_inode;
6477 struct inode *delegated_inode = NULL;
6478 + struct inode *inode;
6480 + error = cow_check_and_break(path);
6484 error = mnt_want_write(path->mnt);
6488 + inode = path->dentry->d_inode;
6490 if (times && times[0].tv_nsec == UTIME_NOW &&
6491 times[1].tv_nsec == UTIME_NOW)
6493 diff -NurpP --minimal linux-4.9.82/fs/xattr.c linux-4.9.82-vs2.3.9.7/fs/xattr.c
6494 --- linux-4.9.82/fs/xattr.c 2018-02-22 21:18:51.000000000 +0000
6495 +++ linux-4.9.82-vs2.3.9.7/fs/xattr.c 2018-01-10 02:50:49.000000000 +0000
6497 #include <linux/audit.h>
6498 #include <linux/vmalloc.h>
6499 #include <linux/posix_acl_xattr.h>
6500 +#include <linux/mount.h>
6502 #include <asm/uaccess.h>
6504 @@ -112,7 +113,7 @@ xattr_permission(struct inode *inode, co
6505 * The trusted.* namespace can only be accessed by privileged users.
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;
6513 diff -NurpP --minimal linux-4.9.82/include/linux/capability.h linux-4.9.82-vs2.3.9.7/include/linux/capability.h
6514 --- linux-4.9.82/include/linux/capability.h 2018-02-22 21:18:53.000000000 +0000
6515 +++ linux-4.9.82-vs2.3.9.7/include/linux/capability.h 2018-01-10 02:50:49.000000000 +0000
6516 @@ -78,7 +78,8 @@ extern const kernel_cap_t __cap_init_eff
6517 #else /* HAND-CODED capability initializers */
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))
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.82/include/linux/cred.h linux-4.9.82-vs2.3.9.7/include/linux/cred.h
6527 --- linux-4.9.82/include/linux/cred.h 2018-02-22 21:18:53.000000000 +0000
6528 +++ linux-4.9.82-vs2.3.9.7/include/linux/cred.h 2018-01-13 21:30:31.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));
6541 +static inline void set_cred_subscribers(struct cred *cred, int n)
6543 +#ifdef CONFIG_DEBUG_CREDENTIALS
6544 + atomic_set(&cred->subscribers, n);
6548 +static inline int read_cred_subscribers(const struct cred *cred)
6550 +#ifdef CONFIG_DEBUG_CREDENTIALS
6551 + return atomic_read(&cred->subscribers);
6557 +static inline void alter_cred_subscribers(const struct cred *_cred, int n)
6559 +#ifdef CONFIG_DEBUG_CREDENTIALS
6560 + struct cred *cred = (struct cred *) _cred;
6562 + atomic_add(n, &cred->subscribers);
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.82/include/linux/dcache.h linux-4.9.82-vs2.3.9.7/include/linux/dcache.h
6570 --- linux-4.9.82/include/linux/dcache.h 2018-02-22 21:18:53.000000000 +0000
6571 +++ linux-4.9.82-vs2.3.9.7/include/linux/dcache.h 2018-01-10 02:50:49.000000000 +0000
6572 @@ -307,8 +307,10 @@ extern char *dentry_path(struct dentry *
6574 static inline struct dentry *dget_dlock(struct dentry *dentry)
6578 dentry->d_lockref.count++;
6579 + // vx_dentry_inc(dentry);
6584 diff -NurpP --minimal linux-4.9.82/include/linux/devpts_fs.h linux-4.9.82-vs2.3.9.7/include/linux/devpts_fs.h
6585 --- linux-4.9.82/include/linux/devpts_fs.h 2016-12-11 19:17:54.000000000 +0000
6586 +++ linux-4.9.82-vs2.3.9.7/include/linux/devpts_fs.h 2018-01-10 02:50:49.000000000 +0000
6587 @@ -34,5 +34,4 @@ void devpts_pty_kill(struct dentry *);
6592 #endif /* _LINUX_DEVPTS_FS_H */
6593 diff -NurpP --minimal linux-4.9.82/include/linux/fs.h linux-4.9.82-vs2.3.9.7/include/linux/fs.h
6594 --- linux-4.9.82/include/linux/fs.h 2018-02-22 21:18:53.000000000 +0000
6595 +++ linux-4.9.82-vs2.3.9.7/include/linux/fs.h 2018-01-13 22:18:13.000000000 +0000
6596 @@ -225,6 +225,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)
6603 * Whiteout is represented by a char device. The following constants define the
6604 @@ -247,6 +248,7 @@ struct iattr {
6610 struct timespec ia_atime;
6611 struct timespec ia_mtime;
6612 @@ -606,7 +608,9 @@ struct inode {
6613 unsigned short i_opflags;
6616 - unsigned int i_flags;
6618 + unsigned short i_flags;
6619 + unsigned short i_vflags;
6621 #ifdef CONFIG_FS_POSIX_ACL
6622 struct posix_acl *i_acl;
6623 @@ -635,6 +639,7 @@ struct inode {
6624 unsigned int __i_nlink;
6629 struct timespec i_atime;
6630 struct timespec i_mtime;
6631 @@ -839,14 +844,19 @@ static inline void i_size_write(struct i
6635 +static inline void i_tag_write(struct inode *inode, vtag_t tag)
6637 + inode->i_tag = make_ktag(&init_user_ns, tag);
6640 static inline unsigned iminor(const struct inode *inode)
6642 - return MINOR(inode->i_rdev);
6643 + return MINOR(inode->i_mdev);
6646 static inline unsigned imajor(const struct inode *inode)
6648 - return MAJOR(inode->i_rdev);
6649 + return MAJOR(inode->i_mdev);
6652 extern struct block_device *I_BDEV(struct inode *inode);
6653 @@ -903,6 +913,7 @@ struct file {
6655 struct fown_struct f_owner;
6656 const struct cred *f_cred;
6658 struct file_ra_state f_ra;
6661 @@ -1037,6 +1048,7 @@ struct file_lock {
6662 struct file *fl_file;
6667 struct fasync_struct * fl_fasync; /* for lease break notifications */
6668 /* for lease breaks: */
6669 @@ -1469,6 +1481,11 @@ static inline gid_t i_gid_read(const str
6670 return from_kgid(inode->i_sb->s_user_ns, inode->i_gid);
6673 +static inline vtag_t i_tag_read(const struct inode *inode)
6675 + return from_ktag(&init_user_ns, inode->i_tag);
6678 static inline void i_uid_write(struct inode *inode, uid_t uid)
6680 inode->i_uid = make_kuid(inode->i_sb->s_user_ns, uid);
6681 @@ -1758,6 +1775,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,
6688 int (*update_time)(struct inode *, struct timespec *, int);
6689 @@ -1772,6 +1790,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);
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 @@ -1843,6 +1862,14 @@ struct super_operations {
6699 #define S_DAX 0 /* Make all the DAX code disappear */
6701 +#define S_IXUNLINK 16384 /* Immutable Invert on unlink */
6703 +/* Linux-VServer related Inode flags */
6707 +#define V_BARRIER 4 /* Barrier for chroot() */
6708 +#define V_COW 8 /* Copy on Write */
6711 * Note that nosuid etc flags are inode-specific: setting some file-system
6712 @@ -1867,10 +1894,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)
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)
6725 #define IS_DEADDIR(inode) ((inode)->i_flags & S_DEAD)
6726 @@ -1890,6 +1920,16 @@ static inline bool HAS_UNMAPPED_ID(struc
6727 return !uid_valid(inode->i_uid) || !gid_valid(inode->i_gid);
6730 +#define IS_BARRIER(inode) (S_ISDIR((inode)->i_mode) && ((inode)->i_vflags & V_BARRIER))
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))
6736 +# define IS_COW(inode) (0)
6737 +# define IS_COW_LINK(inode) (0)
6741 * Inode state bits. Protected by inode->i_lock
6743 @@ -2155,6 +2195,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);
6747 +#define ATTR_FLAG_BARRIER 512 /* Barrier for chroot() */
6748 +#define ATTR_FLAG_IXUNLINK 1024 /* Immutable invert on unlink */
6751 * Candidates for mandatory locking have the setgid bit set
6752 * but no group execute bit - an otherwise meaningless combination.
6753 @@ -2335,7 +2378,7 @@ struct filename {
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,
6761 extern int vfs_fallocate(struct file *file, int mode, loff_t offset,
6762 @@ -2965,6 +3008,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.82/include/linux/init_task.h linux-4.9.82-vs2.3.9.7/include/linux/init_task.h
6771 --- linux-4.9.82/include/linux/init_task.h 2016-12-11 19:17:54.000000000 +0000
6772 +++ linux-4.9.82-vs2.3.9.7/include/linux/init_task.h 2018-01-10 02:50:49.000000000 +0000
6773 @@ -271,6 +271,10 @@ extern struct task_group root_task_group
6775 INIT_NUMA_BALANCING(tsk) \
6778 + .vx_info = NULL, \
6780 + .nx_info = NULL, \
6784 diff -NurpP --minimal linux-4.9.82/include/linux/ipc.h linux-4.9.82-vs2.3.9.7/include/linux/ipc.h
6785 --- linux-4.9.82/include/linux/ipc.h 2016-12-11 19:17:54.000000000 +0000
6786 +++ linux-4.9.82-vs2.3.9.7/include/linux/ipc.h 2018-01-10 02:50:49.000000000 +0000
6787 @@ -16,6 +16,7 @@ struct kern_ipc_perm
6795 diff -NurpP --minimal linux-4.9.82/include/linux/memcontrol.h linux-4.9.82-vs2.3.9.7/include/linux/memcontrol.h
6796 --- linux-4.9.82/include/linux/memcontrol.h 2018-02-22 21:18:54.000000000 +0000
6797 +++ linux-4.9.82-vs2.3.9.7/include/linux/memcontrol.h 2018-01-25 00:07:15.000000000 +0000
6798 @@ -92,6 +92,7 @@ enum mem_cgroup_events_target {
6799 MEM_CGROUP_NTARGETS,
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);
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);
6816 static inline bool mm_match_cgroup(struct mm_struct *mm,
6817 struct mem_cgroup *memcg)
6819 diff -NurpP --minimal linux-4.9.82/include/linux/mount.h linux-4.9.82-vs2.3.9.7/include/linux/mount.h
6820 --- linux-4.9.82/include/linux/mount.h 2018-02-22 21:18:54.000000000 +0000
6821 +++ linux-4.9.82-vs2.3.9.7/include/linux/mount.h 2018-01-10 02:50:49.000000000 +0000
6822 @@ -63,6 +63,9 @@ struct mnt_namespace;
6823 #define MNT_MARKED 0x4000000
6824 #define MNT_UMOUNT 0x8000000
6826 +#define MNT_TAGID 0x10000
6827 +#define MNT_NOTAG 0x20000
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.82/include/linux/net.h linux-4.9.82-vs2.3.9.7/include/linux/net.h
6833 --- linux-4.9.82/include/linux/net.h 2016-12-11 19:17:54.000000000 +0000
6834 +++ linux-4.9.82-vs2.3.9.7/include/linux/net.h 2018-01-10 02:50:49.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
6841 #ifndef ARCH_HAS_SOCKET_TYPES
6843 diff -NurpP --minimal linux-4.9.82/include/linux/netdevice.h linux-4.9.82-vs2.3.9.7/include/linux/netdevice.h
6844 --- linux-4.9.82/include/linux/netdevice.h 2018-02-22 21:18:54.000000000 +0000
6845 +++ linux-4.9.82-vs2.3.9.7/include/linux/netdevice.h 2018-01-10 02:50:49.000000000 +0000
6846 @@ -2474,6 +2474,7 @@ static inline int dev_recursion_level(vo
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.82/include/linux/nsproxy.h linux-4.9.82-vs2.3.9.7/include/linux/nsproxy.h
6855 --- linux-4.9.82/include/linux/nsproxy.h 2016-12-11 19:17:54.000000000 +0000
6856 +++ linux-4.9.82-vs2.3.9.7/include/linux/nsproxy.h 2018-01-10 02:50:49.000000000 +0000
6859 #include <linux/spinlock.h>
6860 #include <linux/sched.h>
6861 +#include <linux/vserver/debug.h>
6863 struct mnt_namespace;
6864 struct uts_namespace;
6865 @@ -65,6 +66,7 @@ extern struct nsproxy init_nsproxy;
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);
6877 -static inline void put_nsproxy(struct nsproxy *ns)
6878 +#define get_nsproxy(n) __get_nsproxy(n, __FILE__, __LINE__)
6880 +static inline void __get_nsproxy(struct nsproxy *ns,
6881 + const char *_file, int _line)
6883 - if (atomic_dec_and_test(&ns->count)) {
6886 + vxlprintk(VXD_CBIT(space, 0), "get_nsproxy(%p[%u])",
6887 + ns, atomic_read(&ns->count), _file, _line);
6888 + atomic_inc(&ns->count);
6891 -static inline void get_nsproxy(struct nsproxy *ns)
6892 +#define put_nsproxy(n) __put_nsproxy(n, __FILE__, __LINE__)
6894 +static inline void __put_nsproxy(struct nsproxy *ns,
6895 + const char *_file, int _line)
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)) {
6906 diff -NurpP --minimal linux-4.9.82/include/linux/pid.h linux-4.9.82-vs2.3.9.7/include/linux/pid.h
6907 --- linux-4.9.82/include/linux/pid.h 2018-02-22 21:18:54.000000000 +0000
6908 +++ linux-4.9.82-vs2.3.9.7/include/linux/pid.h 2018-01-10 02:50:49.000000000 +0000
6909 @@ -10,7 +10,8 @@ enum pid_type
6912 /* only valid to __task_pid_nr_ns() */
6919 @@ -172,6 +173,7 @@ static inline pid_t pid_nr(struct pid *p
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);
6926 #define do_each_pid_task(pid, type, task) \
6927 diff -NurpP --minimal linux-4.9.82/include/linux/quotaops.h linux-4.9.82-vs2.3.9.7/include/linux/quotaops.h
6928 --- linux-4.9.82/include/linux/quotaops.h 2016-12-11 19:17:54.000000000 +0000
6929 +++ linux-4.9.82-vs2.3.9.7/include/linux/quotaops.h 2018-01-10 02:50:49.000000000 +0000
6931 #define _LINUX_QUOTAOPS_
6933 #include <linux/fs.h>
6934 +#include <linux/vs_dlimit.h>
6936 #define DQUOT_SPACE_WARN 0x1
6937 #define DQUOT_SPACE_RESERVE 0x2
6938 @@ -214,11 +215,12 @@ static inline void dquot_drop(struct ino
6940 static inline int dquot_alloc_inode(struct inode *inode)
6943 + return dl_alloc_inode(inode);
6946 static inline void dquot_free_inode(struct inode *inode)
6948 + dl_free_inode(inode);
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,
6958 + if ((ret = dl_alloc_space(inode, number)))
6960 if (!(flags & DQUOT_SPACE_RESERVE))
6961 inode_add_bytes(inode, number);
6963 @@ -239,6 +245,7 @@ static inline void __dquot_free_space(st
6965 if (!(flags & DQUOT_SPACE_RESERVE))
6966 inode_sub_bytes(inode, number);
6967 + dl_free_space(inode, number);
6970 static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
6971 diff -NurpP --minimal linux-4.9.82/include/linux/sched.h linux-4.9.82-vs2.3.9.7/include/linux/sched.h
6972 --- linux-4.9.82/include/linux/sched.h 2018-02-22 21:18:54.000000000 +0000
6973 +++ linux-4.9.82-vs2.3.9.7/include/linux/sched.h 2018-01-10 02:50:49.000000000 +0000
6974 @@ -1717,6 +1717,14 @@ struct task_struct {
6976 struct seccomp seccomp;
6978 +/* vserver context data */
6979 + struct vx_info *vx_info;
6980 + struct nx_info *nx_info;
6986 /* Thread group tracking */
6989 @@ -2110,6 +2118,11 @@ struct pid_namespace;
6990 pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
6991 struct pid_namespace *ns);
6993 +#include <linux/vserver/base.h>
6994 +#include <linux/vserver/context.h>
6995 +#include <linux/vserver/debug.h>
6996 +#include <linux/vserver/pid.h>
6998 static inline pid_t task_pid_nr(struct task_struct *tsk)
7001 @@ -2123,7 +2136,8 @@ static inline pid_t task_pid_nr_ns(struc
7003 static inline pid_t task_pid_vnr(struct task_struct *tsk)
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));
7011 diff -NurpP --minimal linux-4.9.82/include/linux/shmem_fs.h linux-4.9.82-vs2.3.9.7/include/linux/shmem_fs.h
7012 --- linux-4.9.82/include/linux/shmem_fs.h 2016-12-11 19:17:54.000000000 +0000
7013 +++ linux-4.9.82-vs2.3.9.7/include/linux/shmem_fs.h 2018-01-10 02:50:49.000000000 +0000
7016 /* inode in-kernel data */
7018 +#define TMPFS_SUPER_MAGIC 0x01021994
7021 struct shmem_inode_info {
7023 unsigned int seals; /* shmem seals */
7024 diff -NurpP --minimal linux-4.9.82/include/linux/stat.h linux-4.9.82-vs2.3.9.7/include/linux/stat.h
7025 --- linux-4.9.82/include/linux/stat.h 2016-12-11 19:17:54.000000000 +0000
7026 +++ linux-4.9.82-vs2.3.9.7/include/linux/stat.h 2018-01-10 02:50:49.000000000 +0000
7027 @@ -25,6 +25,7 @@ struct kstat {
7034 struct timespec atime;
7035 diff -NurpP --minimal linux-4.9.82/include/linux/sunrpc/auth.h linux-4.9.82-vs2.3.9.7/include/linux/sunrpc/auth.h
7036 --- linux-4.9.82/include/linux/sunrpc/auth.h 2016-12-11 19:17:54.000000000 +0000
7037 +++ linux-4.9.82-vs2.3.9.7/include/linux/sunrpc/auth.h 2018-01-10 02:50:49.000000000 +0000
7038 @@ -46,6 +46,7 @@ enum {
7043 struct group_info *group_info;
7044 const char *principal;
7045 unsigned long ac_flags;
7046 diff -NurpP --minimal linux-4.9.82/include/linux/sunrpc/clnt.h linux-4.9.82-vs2.3.9.7/include/linux/sunrpc/clnt.h
7047 --- linux-4.9.82/include/linux/sunrpc/clnt.h 2018-02-22 21:18:55.000000000 +0000
7048 +++ linux-4.9.82-vs2.3.9.7/include/linux/sunrpc/clnt.h 2018-01-10 02:50:49.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 */
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.82/include/linux/types.h linux-4.9.82-vs2.3.9.7/include/linux/types.h
7060 --- linux-4.9.82/include/linux/types.h 2016-12-11 19:17:54.000000000 +0000
7061 +++ linux-4.9.82-vs2.3.9.7/include/linux/types.h 2018-01-10 02:50:49.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;
7070 typedef unsigned long uintptr_t;
7072 diff -NurpP --minimal linux-4.9.82/include/linux/uidgid.h linux-4.9.82-vs2.3.9.7/include/linux/uidgid.h
7073 --- linux-4.9.82/include/linux/uidgid.h 2016-12-11 19:17:54.000000000 +0000
7074 +++ linux-4.9.82-vs2.3.9.7/include/linux/uidgid.h 2018-01-10 02:50:49.000000000 +0000
7075 @@ -21,13 +21,17 @@ typedef struct {
7088 #define KUIDT_INIT(value) (kuid_t){ value }
7089 #define KGIDT_INIT(value) (kgid_t){ value }
7090 +#define KTAGT_INIT(value) (ktag_t){ value }
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
7098 +static inline vtag_t __ktag_val(ktag_t tag)
7103 #define GLOBAL_ROOT_UID KUIDT_INIT(0)
7104 #define GLOBAL_ROOT_GID KGIDT_INIT(0)
7105 +#define GLOBAL_ROOT_TAG KTAGT_INIT(0)
7107 #define INVALID_UID KUIDT_INIT(-1)
7108 #define INVALID_GID KGIDT_INIT(-1)
7109 +#define INVALID_TAG KTAGT_INIT(-1)
7111 static inline bool uid_eq(kuid_t left, kuid_t right)
7113 @@ -67,6 +78,11 @@ static inline bool gid_eq(kgid_t left, k
7114 return __kgid_val(left) == __kgid_val(right);
7117 +static inline bool tag_eq(ktag_t left, ktag_t right)
7119 + return __ktag_val(left) == __ktag_val(right);
7122 static inline bool uid_gt(kuid_t left, kuid_t right)
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;
7129 +static inline bool tag_valid(ktag_t tag)
7131 + return !tag_eq(tag, INVALID_TAG);
7134 #ifdef CONFIG_USER_NS
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);
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);
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);
7147 @@ -149,6 +173,11 @@ static inline kgid_t make_kgid(struct us
7148 return KGIDT_INIT(gid);
7151 +static inline ktag_t make_ktag(struct user_namespace *from, vtag_t tag)
7153 + return KTAGT_INIT(tag);
7156 static inline uid_t from_kuid(struct user_namespace *to, kuid_t kuid)
7158 return __kuid_val(kuid);
7159 @@ -159,6 +188,11 @@ static inline gid_t from_kgid(struct use
7160 return __kgid_val(kgid);
7163 +static inline vtag_t from_ktag(struct user_namespace *to, ktag_t ktag)
7165 + return __ktag_val(ktag);
7168 static inline uid_t from_kuid_munged(struct user_namespace *to, kuid_t kuid)
7170 uid_t uid = from_kuid(to, kuid);
7171 diff -NurpP --minimal linux-4.9.82/include/linux/vroot.h linux-4.9.82-vs2.3.9.7/include/linux/vroot.h
7172 --- linux-4.9.82/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000
7173 +++ linux-4.9.82-vs2.3.9.7/include/linux/vroot.h 2018-01-10 02:50:49.000000000 +0000
7177 + * include/linux/vroot.h
7179 + * written by Herbert P?tzl, 9/11/2002
7180 + * ported to 2.6 by Herbert P?tzl, 30/12/2004
7182 + * Copyright (C) 2002-2007 by Herbert P?tzl.
7183 + * Redistribution of this file is permitted under the
7184 + * GNU General Public License.
7187 +#ifndef _LINUX_VROOT_H
7188 +#define _LINUX_VROOT_H
7193 +/* Possible states of device */
7199 +struct vroot_device {
7203 + struct semaphore vr_ctl_mutex;
7204 + struct block_device *vr_device;
7209 +typedef struct block_device *(vroot_grb_func)(struct block_device *);
7211 +extern int register_vroot_grb(vroot_grb_func *);
7212 +extern int unregister_vroot_grb(vroot_grb_func *);
7214 +#endif /* __KERNEL__ */
7216 +#define MAX_VROOT_DEFAULT 8
7219 + * IOCTL commands --- we will commandeer 0x56 ('V')
7222 +#define VROOT_SET_DEV 0x5600
7223 +#define VROOT_CLR_DEV 0x5601
7225 +#endif /* _LINUX_VROOT_H */
7226 diff -NurpP --minimal linux-4.9.82/include/linux/vs_base.h linux-4.9.82-vs2.3.9.7/include/linux/vs_base.h
7227 --- linux-4.9.82/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000
7228 +++ linux-4.9.82-vs2.3.9.7/include/linux/vs_base.h 2018-01-10 02:50:49.000000000 +0000
7233 +#include "vserver/base.h"
7234 +#include "vserver/check.h"
7235 +#include "vserver/debug.h"
7238 +#warning duplicate inclusion
7240 diff -NurpP --minimal linux-4.9.82/include/linux/vs_context.h linux-4.9.82-vs2.3.9.7/include/linux/vs_context.h
7241 --- linux-4.9.82/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000
7242 +++ linux-4.9.82-vs2.3.9.7/include/linux/vs_context.h 2018-01-10 02:50:49.000000000 +0000
7244 +#ifndef _VS_CONTEXT_H
7245 +#define _VS_CONTEXT_H
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"
7253 +#include <linux/sched.h>
7256 +#define get_vx_info(i) __get_vx_info(i, __FILE__, __LINE__, __HERE__)
7258 +static inline struct vx_info *__get_vx_info(struct vx_info *vxi,
7259 + const char *_file, int _line, void *_here)
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,
7268 + __vxh_get_vx_info(vxi, _here);
7270 + atomic_inc(&vxi->vx_usecnt);
7275 +extern void free_vx_info(struct vx_info *);
7277 +#define put_vx_info(i) __put_vx_info(i, __FILE__, __LINE__, __HERE__)
7279 +static inline void __put_vx_info(struct vx_info *vxi,
7280 + const char *_file, int _line, void *_here)
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,
7289 + __vxh_put_vx_info(vxi, _here);
7291 + if (atomic_dec_and_test(&vxi->vx_usecnt))
7292 + free_vx_info(vxi);
7296 +#define init_vx_info(p, i) \
7297 + __init_vx_info(p, i, __FILE__, __LINE__, __HERE__)
7299 +static inline void __init_vx_info(struct vx_info **vxp, struct vx_info *vxi,
7300 + const char *_file, int _line, void *_here)
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,
7308 + __vxh_init_vx_info(vxi, vxp, _here);
7310 + atomic_inc(&vxi->vx_usecnt);
7316 +#define set_vx_info(p, i) \
7317 + __set_vx_info(p, i, __FILE__, __LINE__, __HERE__)
7319 +static inline void __set_vx_info(struct vx_info **vxp, struct vx_info *vxi,
7320 + const char *_file, int _line, void *_here)
7322 + struct vx_info *vxo;
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,
7331 + __vxh_set_vx_info(vxi, vxp, _here);
7333 + atomic_inc(&vxi->vx_usecnt);
7334 + vxo = xchg(vxp, vxi);
7339 +#define clr_vx_info(p) __clr_vx_info(p, __FILE__, __LINE__, __HERE__)
7341 +static inline void __clr_vx_info(struct vx_info **vxp,
7342 + const char *_file, int _line, void *_here)
7344 + struct vx_info *vxo;
7346 + vxo = xchg(vxp, NULL);
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,
7354 + __vxh_clr_vx_info(vxo, vxp, _here);
7356 + if (atomic_dec_and_test(&vxo->vx_usecnt))
7357 + free_vx_info(vxo);
7361 +#define claim_vx_info(v, p) \
7362 + __claim_vx_info(v, p, __FILE__, __LINE__, __HERE__)
7364 +static inline void __claim_vx_info(struct vx_info *vxi,
7365 + struct task_struct *task,
7366 + const char *_file, int _line, void *_here)
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);
7375 + atomic_inc(&vxi->vx_tasks);
7379 +extern void unhash_vx_info(struct vx_info *);
7381 +#define release_vx_info(v, p) \
7382 + __release_vx_info(v, p, __FILE__, __LINE__, __HERE__)
7384 +static inline void __release_vx_info(struct vx_info *vxi,
7385 + struct task_struct *task,
7386 + const char *_file, int _line, void *_here)
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);
7397 + if (atomic_dec_and_test(&vxi->vx_tasks))
7398 + unhash_vx_info(vxi);
7402 +#define task_get_vx_info(p) \
7403 + __task_get_vx_info(p, __FILE__, __LINE__, __HERE__)
7405 +static inline struct vx_info *__task_get_vx_info(struct task_struct *p,
7406 + const char *_file, int _line, void *_here)
7408 + struct vx_info *vxi;
7411 + vxlprintk(VXD_CBIT(xid, 5), "task_get_vx_info(%p)",
7413 + vxi = __get_vx_info(p->vx_info, _file, _line, _here);
7419 +static inline void __wakeup_vx_info(struct vx_info *vxi)
7421 + if (waitqueue_active(&vxi->vx_wait))
7422 + wake_up_interruptible(&vxi->vx_wait);
7426 +#define enter_vx_info(v, s) __enter_vx_info(v, s, __FILE__, __LINE__)
7428 +static inline void __enter_vx_info(struct vx_info *vxi,
7429 + struct vx_info_save *vxis, const char *_file, int _line)
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(¤t->vx_info, vxi);
7435 + vxis->xid = current->xid;
7436 + current->xid = vxi ? vxi->vx_id : 0;
7439 +#define leave_vx_info(s) __leave_vx_info(s, __FILE__, __LINE__)
7441 +static inline void __leave_vx_info(struct vx_info_save *vxis,
7442 + const char *_file, int _line)
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(¤t->vx_info, vxis->vxi);
7448 + current->xid = vxis->xid;
7452 +static inline void __enter_vx_admin(struct vx_info_save *vxis)
7454 + vxis->vxi = xchg(¤t->vx_info, NULL);
7455 + vxis->xid = xchg(¤t->xid, (vxid_t)0);
7458 +static inline void __leave_vx_admin(struct vx_info_save *vxis)
7460 + (void)xchg(¤t->xid, vxis->xid);
7461 + (void)xchg(¤t->vx_info, vxis->vxi);
7464 +#define task_is_init(p) \
7465 + __task_is_init(p, __FILE__, __LINE__, __HERE__)
7467 +static inline int __task_is_init(struct task_struct *p,
7468 + const char *_file, int _line, void *_here)
7470 + int is_init = is_global_init(p);
7474 + is_init = p->vx_info->vx_initpid == p->pid;
7479 +extern void exit_vx_info(struct task_struct *, int);
7480 +extern void exit_vx_info_early(struct task_struct *, int);
7484 +#warning duplicate inclusion
7486 diff -NurpP --minimal linux-4.9.82/include/linux/vs_cowbl.h linux-4.9.82-vs2.3.9.7/include/linux/vs_cowbl.h
7487 --- linux-4.9.82/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000
7488 +++ linux-4.9.82-vs2.3.9.7/include/linux/vs_cowbl.h 2018-01-13 22:17:14.000000000 +0000
7490 +#ifndef _VS_COWBL_H
7491 +#define _VS_COWBL_H
7493 +#include <linux/fs.h>
7494 +#include <linux/dcache.h>
7495 +#include <linux/namei.h>
7496 +#include <linux/slab.h>
7498 +extern struct dentry *cow_break_link(const char *pathname);
7500 +static inline int cow_check_and_break(struct path *path)
7502 + struct inode *inode = path->dentry->d_inode;
7505 + /* do we need this check? */
7506 + if (IS_RDONLY(inode))
7509 + if (IS_COW(inode)) {
7510 + if (IS_COW_LINK(inode)) {
7511 + struct dentry *new_dentry, *old_dentry = path->dentry;
7514 + buf = kmalloc(PATH_MAX, GFP_KERNEL);
7518 + pp = d_path(path, buf, PATH_MAX);
7519 + new_dentry = cow_break_link(pp);
7521 + if (!IS_ERR(new_dentry)) {
7522 + path->dentry = new_dentry;
7525 + error = PTR_ERR(new_dentry);
7527 + inode->i_flags &= ~(S_IXUNLINK | S_IMMUTABLE);
7528 + inode->i_ctime = CURRENT_TIME;
7529 + mark_inode_dirty(inode);
7536 +#warning duplicate inclusion
7538 diff -NurpP --minimal linux-4.9.82/include/linux/vs_cvirt.h linux-4.9.82-vs2.3.9.7/include/linux/vs_cvirt.h
7539 --- linux-4.9.82/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000
7540 +++ linux-4.9.82-vs2.3.9.7/include/linux/vs_cvirt.h 2018-01-10 02:50:49.000000000 +0000
7542 +#ifndef _VS_CVIRT_H
7543 +#define _VS_CVIRT_H
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"
7552 +static inline void vx_activate_task(struct task_struct *p)
7554 + struct vx_info *vxi;
7556 + if ((vxi = p->vx_info)) {
7557 + vx_update_load(vxi);
7558 + atomic_inc(&vxi->cvirt.nr_running);
7562 +static inline void vx_deactivate_task(struct task_struct *p)
7564 + struct vx_info *vxi;
7566 + if ((vxi = p->vx_info)) {
7567 + vx_update_load(vxi);
7568 + atomic_dec(&vxi->cvirt.nr_running);
7572 +static inline void vx_uninterruptible_inc(struct task_struct *p)
7574 + struct vx_info *vxi;
7576 + if ((vxi = p->vx_info))
7577 + atomic_inc(&vxi->cvirt.nr_uninterruptible);
7580 +static inline void vx_uninterruptible_dec(struct task_struct *p)
7582 + struct vx_info *vxi;
7584 + if ((vxi = p->vx_info))
7585 + atomic_dec(&vxi->cvirt.nr_uninterruptible);
7590 +#warning duplicate inclusion
7592 diff -NurpP --minimal linux-4.9.82/include/linux/vs_device.h linux-4.9.82-vs2.3.9.7/include/linux/vs_device.h
7593 --- linux-4.9.82/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000
7594 +++ linux-4.9.82-vs2.3.9.7/include/linux/vs_device.h 2018-01-10 02:50:49.000000000 +0000
7596 +#ifndef _VS_DEVICE_H
7597 +#define _VS_DEVICE_H
7599 +#include "vserver/base.h"
7600 +#include "vserver/device.h"
7601 +#include "vserver/debug.h"
7604 +#ifdef CONFIG_VSERVER_DEVICE
7606 +int vs_map_device(struct vx_info *, dev_t, dev_t *, umode_t);
7608 +#define vs_device_perm(v, d, m, p) \
7609 + ((vs_map_device(current_vx_info(), d, NULL, m) & (p)) == (p))
7614 +int vs_map_device(struct vx_info *vxi,
7615 + dev_t device, dev_t *target, umode_t mode)
7622 +#define vs_device_perm(v, d, m, p) ((p) == (p))
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))
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)
7639 +#warning duplicate inclusion
7641 diff -NurpP --minimal linux-4.9.82/include/linux/vs_dlimit.h linux-4.9.82-vs2.3.9.7/include/linux/vs_dlimit.h
7642 --- linux-4.9.82/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000
7643 +++ linux-4.9.82-vs2.3.9.7/include/linux/vs_dlimit.h 2018-01-10 02:50:49.000000000 +0000
7645 +#ifndef _VS_DLIMIT_H
7646 +#define _VS_DLIMIT_H
7648 +#include <linux/fs.h>
7650 +#include "vserver/dlimit.h"
7651 +#include "vserver/base.h"
7652 +#include "vserver/debug.h"
7655 +#define get_dl_info(i) __get_dl_info(i, __FILE__, __LINE__)
7657 +static inline struct dl_info *__get_dl_info(struct dl_info *dli,
7658 + const char *_file, int _line)
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,
7666 + atomic_inc(&dli->dl_usecnt);
7671 +#define free_dl_info(i) \
7672 + call_rcu(&(i)->dl_rcu, rcu_free_dl_info)
7674 +#define put_dl_info(i) __put_dl_info(i, __FILE__, __LINE__)
7676 +static inline void __put_dl_info(struct dl_info *dli,
7677 + const char *_file, int _line)
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,
7685 + if (atomic_dec_and_test(&dli->dl_usecnt))
7686 + free_dl_info(dli);
7690 +#define __dlimit_char(d) ((d) ? '*' : ' ')
7692 +static inline int __dl_alloc_space(struct super_block *sb,
7693 + vtag_t tag, dlsize_t nr, const char *file, int line)
7695 + struct dl_info *dli = NULL;
7700 + dli = locate_dl_info(sb, tag);
7704 + spin_lock(&dli->dl_lock);
7705 + ret = (dli->dl_space_used + nr > dli->dl_space_total);
7707 + dli->dl_space_used += nr;
7708 + spin_unlock(&dli->dl_lock);
7711 + vxlprintk(VXD_CBIT(dlim, 1),
7712 + "ALLOC (%p,#%d)%c %lld bytes (%d)",
7713 + sb, tag, __dlimit_char(dli), (long long)nr,
7715 + return ret ? -ENOSPC : 0;
7718 +static inline void __dl_free_space(struct super_block *sb,
7719 + vtag_t tag, dlsize_t nr, const char *_file, int _line)
7721 + struct dl_info *dli = NULL;
7725 + dli = locate_dl_info(sb, tag);
7729 + spin_lock(&dli->dl_lock);
7730 + if (dli->dl_space_used > nr)
7731 + dli->dl_space_used -= nr;
7733 + dli->dl_space_used = 0;
7734 + spin_unlock(&dli->dl_lock);
7737 + vxlprintk(VXD_CBIT(dlim, 1),
7738 + "FREE (%p,#%d)%c %lld bytes",
7739 + sb, tag, __dlimit_char(dli), (long long)nr,
7743 +static inline int __dl_alloc_inode(struct super_block *sb,
7744 + vtag_t tag, const char *_file, int _line)
7746 + struct dl_info *dli;
7749 + dli = locate_dl_info(sb, tag);
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);
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;
7765 +static inline void __dl_free_inode(struct super_block *sb,
7766 + vtag_t tag, const char *_file, int _line)
7768 + struct dl_info *dli;
7770 + dli = locate_dl_info(sb, tag);
7774 + spin_lock(&dli->dl_lock);
7775 + if (dli->dl_inodes_used > 1)
7776 + dli->dl_inodes_used--;
7778 + dli->dl_inodes_used = 0;
7779 + spin_unlock(&dli->dl_lock);
7782 + vxlprintk(VXD_CBIT(dlim, 0),
7783 + "FREE (%p,#%d)%c inode",
7784 + sb, tag, __dlimit_char(dli), _file, _line);
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)
7791 + struct dl_info *dli;
7792 + uint64_t broot, bfree;
7794 + dli = locate_dl_info(sb, tag);
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);
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,
7811 + if (free_blocks) {
7812 + if (*free_blocks > bfree)
7813 + *free_blocks = bfree;
7815 + if (root_blocks) {
7816 + if (*root_blocks > broot)
7817 + *root_blocks = broot;
7822 +#define dl_prealloc_space(in, bytes) \
7823 + __dl_alloc_space((in)->i_sb, i_tag_read(in), (dlsize_t)(bytes), \
7824 + __FILE__, __LINE__ )
7826 +#define dl_alloc_space(in, bytes) \
7827 + __dl_alloc_space((in)->i_sb, i_tag_read(in), (dlsize_t)(bytes), \
7828 + __FILE__, __LINE__ )
7830 +#define dl_reserve_space(in, bytes) \
7831 + __dl_alloc_space((in)->i_sb, i_tag_read(in), (dlsize_t)(bytes), \
7832 + __FILE__, __LINE__ )
7834 +#define dl_claim_space(in, bytes) (0)
7836 +#define dl_release_space(in, bytes) \
7837 + __dl_free_space((in)->i_sb, i_tag_read(in), (dlsize_t)(bytes), \
7838 + __FILE__, __LINE__ )
7840 +#define dl_free_space(in, bytes) \
7841 + __dl_free_space((in)->i_sb, i_tag_read(in), (dlsize_t)(bytes), \
7842 + __FILE__, __LINE__ )
7846 +#define dl_alloc_inode(in) \
7847 + __dl_alloc_inode((in)->i_sb, i_tag_read(in), __FILE__, __LINE__ )
7849 +#define dl_free_inode(in) \
7850 + __dl_free_inode((in)->i_sb, i_tag_read(in), __FILE__, __LINE__ )
7853 +#define dl_adjust_block(sb, tag, fb, rb) \
7854 + __dl_adjust_block(sb, tag, fb, rb, __FILE__, __LINE__ )
7858 +#warning duplicate inclusion
7860 diff -NurpP --minimal linux-4.9.82/include/linux/vs_inet.h linux-4.9.82-vs2.3.9.7/include/linux/vs_inet.h
7861 --- linux-4.9.82/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000
7862 +++ linux-4.9.82-vs2.3.9.7/include/linux/vs_inet.h 2018-01-10 02:50:49.000000000 +0000
7867 +#include "vserver/base.h"
7868 +#include "vserver/network.h"
7869 +#include "vserver/debug.h"
7871 +#define IPI_LOOPBACK htonl(INADDR_LOOPBACK)
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]"
7877 +#define NIPQUAD(addr) \
7878 + ((unsigned char *)&addr)[0], \
7879 + ((unsigned char *)&addr)[1], \
7880 + ((unsigned char *)&addr)[2], \
7881 + ((unsigned char *)&addr)[3]
7883 +#define NIPQUAD_FMT "%u.%u.%u.%u"
7887 +int v4_addr_match(struct nx_addr_v4 *nxa, __be32 addr, uint16_t tmask)
7889 + __be32 ip = nxa->ip[0].s_addr;
7890 + __be32 mask = nxa->mask.s_addr;
7891 + __be32 bcast = ip | ~mask;
7894 + switch (nxa->type & tmask) {
7895 + case NXA_TYPE_MASK:
7896 + ret = (ip == (addr & mask));
7898 + case NXA_TYPE_ADDR:
7902 + /* fall through to broadcast */
7903 + case NXA_MOD_BCAST:
7904 + ret = ((tmask & NXA_MOD_BCAST) && (addr == bcast));
7906 + case NXA_TYPE_RANGE:
7907 + ret = ((nxa->ip[0].s_addr <= addr) &&
7908 + (nxa->ip[1].s_addr > addr));
7910 + case NXA_TYPE_ANY:
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);
7922 +int v4_addr_in_nx_info(struct nx_info *nxi, __be32 addr, uint16_t tmask)
7924 + struct nx_addr_v4 *nxa;
7925 + unsigned long irqflags;
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))
7938 + /* check for lback address */
7939 + if ((tmask & NXA_MOD_LBACK) &&
7940 + (nxi->v4_lback.s_addr == addr))
7943 + /* check for broadcast address */
7944 + if ((tmask & NXA_MOD_BCAST) &&
7945 + (nxi->v4_bcast.s_addr == addr))
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))
7956 + spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
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);
7965 +int v4_nx_addr_match(struct nx_addr_v4 *nxa, struct nx_addr_v4 *addr, uint16_t mask)
7967 + /* FIXME: needs full range checks */
7968 + return v4_addr_match(nxa, addr->ip[0].s_addr, mask);
7972 +int v4_nx_addr_in_nx_info(struct nx_info *nxi, struct nx_addr_v4 *nxa, uint16_t mask)
7974 + struct nx_addr_v4 *ptr;
7975 + unsigned long irqflags;
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))
7984 + spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
7988 +#include <net/inet_sock.h>
7991 + * Check if a given address matches for a socket
7993 + * nxi: the socket's nx_info if any
7994 + * addr: to be verified address
7997 +int v4_sock_addr_match (
7998 + struct nx_info *nxi,
7999 + struct inet_sock *inet,
8002 + __be32 saddr = inet->inet_rcv_saddr;
8003 + __be32 bcast = nxi ? nxi->v4_bcast.s_addr : INADDR_BROADCAST;
8005 + if (addr && (saddr == addr || bcast == addr))
8008 + return v4_addr_in_nx_info(nxi, addr, NXA_MASK_BIND);
8013 +/* inet related checks and helpers */
8022 +#include <linux/netdevice.h>
8023 +#include <linux/inetdevice.h>
8024 +#include <net/inet_sock.h>
8025 +#include <net/inet_timewait_sock.h>
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 *);
8034 + * check if address is covered by socket
8036 + * sk: the socket to check against
8037 + * addr: the address in question (must be != 0)
8041 +int __v4_addr_match_socket(const struct sock *sk, struct nx_addr_v4 *nxa)
8043 + struct nx_info *nxi = sk->sk_nx_info;
8044 + __be32 saddr = sk->sk_rcv_saddr;
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));
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 */
8063 +int nx_dev_visible(struct nx_info *nxi, struct net_device *dev)
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);
8070 + if (!nx_info_flags(nxi, NXF_HIDE_NETIF, 0))
8072 + if (dev_in_nx_info(dev, nxi))
8079 +int v4_ifa_in_nx_info(struct in_ifaddr *ifa, struct nx_info *nxi)
8085 + return v4_addr_in_nx_info(nxi, ifa->ifa_local, NXA_MASK_SHOW);
8089 +int nx_v4_ifa_visible(struct nx_info *nxi, struct in_ifaddr *ifa)
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);
8095 + if (!nx_info_flags(nxi, NXF_HIDE_NETIF, 0))
8097 + if (v4_ifa_in_nx_info(ifa, nxi))
8103 +struct nx_v4_sock_addr {
8104 + __be32 saddr; /* Address used for validation */
8105 + __be32 baddr; /* Address used for socket bind */
8109 +int v4_map_sock_addr(struct inet_sock *inet, struct sockaddr_in *addr,
8110 + struct nx_v4_sock_addr *nsa)
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;
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),
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;
8138 + vxdprintk(VXD_CBIT(net, 3),
8139 + "inet_bind(%p) " NIPQUAD_FMT ", " NIPQUAD_FMT,
8140 + sk, NIPQUAD(saddr), NIPQUAD(baddr));
8142 + nsa->saddr = saddr;
8143 + nsa->baddr = baddr;
8148 +void v4_set_sock_addr(struct inet_sock *inet, struct nx_v4_sock_addr *nsa)
8150 + inet->inet_saddr = nsa->baddr;
8151 + inet->inet_rcv_saddr = nsa->baddr;
8156 + * helper to simplify inet_lookup_listener
8158 + * nxi: the socket's nx_info if any
8159 + * addr: to be verified address
8160 + * saddr: socket address
8162 +static inline int v4_inet_addr_match (
8163 + struct nx_info *nxi,
8167 + if (addr && (saddr == addr))
8170 + return nxi ? v4_addr_in_nx_info(nxi, addr, NXA_MASK_BIND) : 1;
8174 +static inline __be32 nx_map_sock_lback(struct nx_info *nxi, __be32 addr)
8176 + if (nx_info_flags(nxi, NXF_HIDE_LBACK, 0) &&
8177 + (addr == nxi->v4_lback.s_addr))
8178 + return IPI_LOOPBACK;
8183 +int nx_info_has_v4(struct nx_info *nxi)
8189 + if (nx_info_flags(nxi, NXF_LBACK_REMAP, 0))
8194 +#else /* CONFIG_INET */
8197 +int nx_dev_visible(struct nx_info *n, struct net_device *d)
8203 +int nx_v4_addr_conflict(struct nx_info *n, uint32_t a, const struct sock *s)
8209 +int v4_ifa_in_nx_info(struct in_ifaddr *a, struct nx_info *n)
8215 +int nx_info_has_v4(struct nx_info *nxi)
8220 +#endif /* CONFIG_INET */
8222 +#define current_nx_info_has_v4() \
8223 + nx_info_has_v4(current_nx_info())
8226 +// #warning duplicate inclusion
8228 diff -NurpP --minimal linux-4.9.82/include/linux/vs_inet6.h linux-4.9.82-vs2.3.9.7/include/linux/vs_inet6.h
8229 --- linux-4.9.82/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000
8230 +++ linux-4.9.82-vs2.3.9.7/include/linux/vs_inet6.h 2018-01-16 10:02:29.000000000 +0000
8232 +#ifndef _VS_INET6_H
8233 +#define _VS_INET6_H
8235 +#include "vserver/base.h"
8236 +#include "vserver/network.h"
8237 +#include "vserver/debug.h"
8239 +#include <net/ipv6.h>
8241 +#define NXAV6(a) &(a)->ip, &(a)->mask, (a)->prefix, (a)->type
8242 +#define NXAV6_FMT "[%pI6/%pI6/%d:%04x]"
8248 +int v6_addr_match(struct nx_addr_v6 *nxa,
8249 + const struct in6_addr *addr, uint16_t mask)
8253 + switch (nxa->type & mask) {
8254 + case NXA_TYPE_MASK:
8255 + ret = ipv6_masked_addr_cmp(&nxa->ip, &nxa->mask, addr);
8257 + case NXA_TYPE_ADDR:
8258 + ret = ipv6_addr_equal(&nxa->ip, addr);
8260 + case NXA_TYPE_ANY:
8264 + vxdprintk(VXD_CBIT(net, 0),
8265 + "v6_addr_match(%p" NXAV6_FMT ",%pI6,%04x) = %d",
8266 + nxa, NXAV6(nxa), addr, mask, ret);
8271 +int v6_addr_in_nx_info(struct nx_info *nxi,
8272 + const struct in6_addr *addr, uint16_t mask)
8274 + struct nx_addr_v6 *nxa;
8275 + unsigned long irqflags;
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))
8287 + spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
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);
8296 +int v6_nx_addr_match(struct nx_addr_v6 *nxa, struct nx_addr_v6 *addr, uint16_t mask)
8298 + /* FIXME: needs full range checks */
8299 + return v6_addr_match(nxa, &addr->ip, mask);
8303 +int v6_nx_addr_in_nx_info(struct nx_info *nxi, struct nx_addr_v6 *nxa, uint16_t mask)
8305 + struct nx_addr_v6 *ptr;
8306 + unsigned long irqflags;
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))
8315 + spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
8321 + * Check if a given address matches for a socket
8323 + * nxi: the socket's nx_info if any
8324 + * addr: to be verified address
8327 +int v6_sock_addr_match (
8328 + struct nx_info *nxi,
8329 + struct inet_sock *inet,
8330 + struct in6_addr *addr)
8332 + struct sock *sk = &inet->sk;
8333 + const struct in6_addr *saddr = inet6_rcv_saddr(sk);
8335 + if (!ipv6_addr_any(addr) &&
8336 + ipv6_addr_equal(saddr, addr))
8338 + if (ipv6_addr_any(saddr))
8339 + return v6_addr_in_nx_info(nxi, addr, -1);
8344 + * check if address is covered by socket
8346 + * sk: the socket to check against
8347 + * addr: the address in question (must be != 0)
8351 +int __v6_addr_match_socket(const struct sock *sk, struct nx_addr_v6 *nxa)
8353 + struct nx_info *nxi = sk->sk_nx_info;
8354 + const struct in6_addr *saddr = inet6_rcv_saddr(sk);
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));
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 */
8371 +/* inet related checks and helpers */
8379 +#include <linux/netdevice.h>
8380 +#include <linux/inetdevice.h>
8381 +#include <net/inet_timewait_sock.h>
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 *);
8391 +int v6_ifa_in_nx_info(struct inet6_ifaddr *ifa, struct nx_info *nxi)
8397 + return v6_addr_in_nx_info(nxi, &ifa->addr, -1);
8401 +int nx_v6_ifa_visible(struct nx_info *nxi, struct inet6_ifaddr *ifa)
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);
8407 + if (!nx_info_flags(nxi, NXF_HIDE_NETIF, 0))
8409 + if (v6_ifa_in_nx_info(ifa, nxi))
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 */
8421 +int v6_map_sock_addr(struct inet_sock *inet, struct sockaddr_in6 *addr,
8422 + struct nx_v6_sock_addr *nsa)
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;
8429 + nsa->saddr = saddr;
8430 + nsa->baddr = baddr;
8435 +void v6_set_sock_addr(struct inet_sock *inet, struct nx_v6_sock_addr *nsa)
8437 + // struct sock *sk = &inet->sk;
8438 + // struct in6_addr *saddr = inet6_rcv_saddr(sk);
8440 + // *saddr = nsa->baddr;
8441 + // inet->inet_saddr = nsa->baddr;
8445 +int nx_info_has_v6(struct nx_info *nxi)
8454 +#else /* CONFIG_IPV6 */
8457 +int nx_v6_dev_visible(struct nx_info *n, struct net_device *d)
8464 +int nx_v6_addr_conflict(struct nx_info *n, uint32_t a, const struct sock *s)
8470 +int v6_ifa_in_nx_info(struct in_ifaddr *a, struct nx_info *n)
8476 +int nx_info_has_v6(struct nx_info *nxi)
8482 +int v6_addr_in_nx_info(struct nx_info *nxi,
8483 + const struct in6_addr *addr, uint16_t mask)
8488 +#endif /* CONFIG_IPV6 */
8490 +#define current_nx_info_has_v6() \
8491 + nx_info_has_v6(current_nx_info())
8494 +#warning duplicate inclusion
8496 diff -NurpP --minimal linux-4.9.82/include/linux/vs_limit.h linux-4.9.82-vs2.3.9.7/include/linux/vs_limit.h
8497 --- linux-4.9.82/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000
8498 +++ linux-4.9.82-vs2.3.9.7/include/linux/vs_limit.h 2018-01-10 02:50:49.000000000 +0000
8500 +#ifndef _VS_LIMIT_H
8501 +#define _VS_LIMIT_H
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"
8511 +#define vx_acc_cres(v, d, p, r) \
8512 + __vx_acc_cres(v, r, d, p, __FILE__, __LINE__)
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__)
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)
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)
8529 +/* process and file limits */
8531 +#define vx_nproc_inc(p) \
8532 + vx_acc_cres((p)->vx_info, 1, p, RLIMIT_NPROC)
8534 +#define vx_nproc_dec(p) \
8535 + vx_acc_cres((p)->vx_info,-1, p, RLIMIT_NPROC)
8537 +#define vx_files_inc(f) \
8538 + vx_acc_cres_cond((f)->f_xid, 1, f, RLIMIT_NOFILE)
8540 +#define vx_files_dec(f) \
8541 + vx_acc_cres_cond((f)->f_xid,-1, f, RLIMIT_NOFILE)
8543 +#define vx_locks_inc(l) \
8544 + vx_acc_cres_cond((l)->fl_xid, 1, l, RLIMIT_LOCKS)
8546 +#define vx_locks_dec(l) \
8547 + vx_acc_cres_cond((l)->fl_xid,-1, l, RLIMIT_LOCKS)
8549 +#define vx_openfd_inc(f) \
8550 + vx_acc_cres(current_vx_info(), 1, (void *)(long)(f), VLIMIT_OPENFD)
8552 +#define vx_openfd_dec(f) \
8553 + vx_acc_cres(current_vx_info(),-1, (void *)(long)(f), VLIMIT_OPENFD)
8556 +#define vx_cres_avail(v, n, r) \
8557 + __vx_cres_avail(v, r, n, __FILE__, __LINE__)
8560 +#define vx_nproc_avail(n) \
8561 + vx_cres_avail(current_vx_info(), n, RLIMIT_NPROC)
8563 +#define vx_files_avail(n) \
8564 + vx_cres_avail(current_vx_info(), n, RLIMIT_NOFILE)
8566 +#define vx_locks_avail(n) \
8567 + vx_cres_avail(current_vx_info(), n, RLIMIT_LOCKS)
8569 +#define vx_openfd_avail(n) \
8570 + vx_cres_avail(current_vx_info(), n, VLIMIT_OPENFD)
8573 +/* dentry limits */
8575 +#define vx_dentry_inc(d) do { \
8576 + if (d_count(d) == 1) \
8577 + vx_acc_cres(current_vx_info(), 1, d, VLIMIT_DENTRY); \
8580 +#define vx_dentry_dec(d) do { \
8581 + if (d_count(d) == 0) \
8582 + vx_acc_cres(current_vx_info(),-1, d, VLIMIT_DENTRY); \
8585 +#define vx_dentry_avail(n) \
8586 + vx_cres_avail(current_vx_info(), n, VLIMIT_DENTRY)
8589 +/* socket limits */
8591 +#define vx_sock_inc(s) \
8592 + vx_acc_cres((s)->sk_vx_info, 1, s, VLIMIT_NSOCK)
8594 +#define vx_sock_dec(s) \
8595 + vx_acc_cres((s)->sk_vx_info,-1, s, VLIMIT_NSOCK)
8597 +#define vx_sock_avail(n) \
8598 + vx_cres_avail(current_vx_info(), n, VLIMIT_NSOCK)
8601 +/* ipc resource limits */
8603 +#define vx_ipcmsg_add(v, u, a) \
8604 + vx_add_cres(v, a, u, RLIMIT_MSGQUEUE)
8606 +#define vx_ipcmsg_sub(v, u, a) \
8607 + vx_sub_cres(v, a, u, RLIMIT_MSGQUEUE)
8609 +#define vx_ipcmsg_avail(v, a) \
8610 + vx_cres_avail(v, a, RLIMIT_MSGQUEUE)
8613 +#define vx_ipcshm_add(v, k, a) \
8614 + vx_add_cres(v, a, (void *)(long)(k), VLIMIT_SHMEM)
8616 +#define vx_ipcshm_sub(v, k, a) \
8617 + vx_sub_cres(v, a, (void *)(long)(k), VLIMIT_SHMEM)
8619 +#define vx_ipcshm_avail(v, a) \
8620 + vx_cres_avail(v, a, VLIMIT_SHMEM)
8623 +#define vx_semary_inc(a) \
8624 + vx_acc_cres(current_vx_info(), 1, a, VLIMIT_SEMARY)
8626 +#define vx_semary_dec(a) \
8627 + vx_acc_cres(current_vx_info(), -1, a, VLIMIT_SEMARY)
8630 +#define vx_nsems_add(a,n) \
8631 + vx_add_cres(current_vx_info(), n, a, VLIMIT_NSEMS)
8633 +#define vx_nsems_sub(a,n) \
8634 + vx_sub_cres(current_vx_info(), n, a, VLIMIT_NSEMS)
8638 +#warning duplicate inclusion
8640 diff -NurpP --minimal linux-4.9.82/include/linux/vs_network.h linux-4.9.82-vs2.3.9.7/include/linux/vs_network.h
8641 --- linux-4.9.82/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000
8642 +++ linux-4.9.82-vs2.3.9.7/include/linux/vs_network.h 2018-01-10 02:50:49.000000000 +0000
8644 +#ifndef _NX_VS_NETWORK_H
8645 +#define _NX_VS_NETWORK_H
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"
8653 +#include <linux/sched.h>
8656 +#define get_nx_info(i) __get_nx_info(i, __FILE__, __LINE__)
8658 +static inline struct nx_info *__get_nx_info(struct nx_info *nxi,
8659 + const char *_file, int _line)
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,
8669 + atomic_inc(&nxi->nx_usecnt);
8674 +extern void free_nx_info(struct nx_info *);
8676 +#define put_nx_info(i) __put_nx_info(i, __FILE__, __LINE__)
8678 +static inline void __put_nx_info(struct nx_info *nxi, const char *_file, int _line)
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,
8688 + if (atomic_dec_and_test(&nxi->nx_usecnt))
8689 + free_nx_info(nxi);
8693 +#define init_nx_info(p, i) __init_nx_info(p, i, __FILE__, __LINE__)
8695 +static inline void __init_nx_info(struct nx_info **nxp, struct nx_info *nxi,
8696 + const char *_file, int _line)
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,
8705 + atomic_inc(&nxi->nx_usecnt);
8711 +#define set_nx_info(p, i) __set_nx_info(p, i, __FILE__, __LINE__)
8713 +static inline void __set_nx_info(struct nx_info **nxp, struct nx_info *nxi,
8714 + const char *_file, int _line)
8716 + struct nx_info *nxo;
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,
8726 + atomic_inc(&nxi->nx_usecnt);
8727 + nxo = xchg(nxp, nxi);
8731 +#define clr_nx_info(p) __clr_nx_info(p, __FILE__, __LINE__)
8733 +static inline void __clr_nx_info(struct nx_info **nxp,
8734 + const char *_file, int _line)
8736 + struct nx_info *nxo;
8738 + nxo = xchg(nxp, NULL);
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,
8747 + if (atomic_dec_and_test(&nxo->nx_usecnt))
8748 + free_nx_info(nxo);
8752 +#define claim_nx_info(v, p) __claim_nx_info(v, p, __FILE__, __LINE__)
8754 +static inline void __claim_nx_info(struct nx_info *nxi,
8755 + struct task_struct *task, const char *_file, int _line)
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);
8763 + atomic_inc(&nxi->nx_tasks);
8767 +extern void unhash_nx_info(struct nx_info *);
8769 +#define release_nx_info(v, p) __release_nx_info(v, p, __FILE__, __LINE__)
8771 +static inline void __release_nx_info(struct nx_info *nxi,
8772 + struct task_struct *task, const char *_file, int _line)
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);
8782 + if (atomic_dec_and_test(&nxi->nx_tasks))
8783 + unhash_nx_info(nxi);
8787 +#define task_get_nx_info(i) __task_get_nx_info(i, __FILE__, __LINE__)
8789 +static __inline__ struct nx_info *__task_get_nx_info(struct task_struct *p,
8790 + const char *_file, int _line)
8792 + struct nx_info *nxi;
8795 + vxlprintk(VXD_CBIT(nid, 5), "task_get_nx_info(%p)",
8797 + nxi = __get_nx_info(p->nx_info, _file, _line);
8803 +static inline void exit_nx_info(struct task_struct *p)
8806 + release_nx_info(p->nx_info, p);
8811 +#warning duplicate inclusion
8813 diff -NurpP --minimal linux-4.9.82/include/linux/vs_pid.h linux-4.9.82-vs2.3.9.7/include/linux/vs_pid.h
8814 --- linux-4.9.82/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000
8815 +++ linux-4.9.82-vs2.3.9.7/include/linux/vs_pid.h 2018-01-10 02:50:49.000000000 +0000
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>
8828 +#define VXF_FAKE_INIT (VXF_INFO_INIT | VXF_STATE_INIT)
8831 +int vx_proc_task_visible(struct task_struct *task)
8833 + if ((task->pid == 1) &&
8834 + !vx_flags(VXF_FAKE_INIT, VXF_FAKE_INIT))
8835 + /* show a blend through init */
8837 + if (vx_check(vx_task_xid(task), VS_WATCH | VS_IDENT))
8844 +#define find_task_by_real_pid(pid) find_task_by_pid_ns(pid, &init_pid_ns)
8848 +struct task_struct *vx_get_proc_task(struct inode *inode, struct pid *pid)
8850 + struct task_struct *task = get_pid_task(pid, PIDTYPE_PID);
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);
8865 +#warning duplicate inclusion
8867 diff -NurpP --minimal linux-4.9.82/include/linux/vs_sched.h linux-4.9.82-vs2.3.9.7/include/linux/vs_sched.h
8868 --- linux-4.9.82/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000
8869 +++ linux-4.9.82-vs2.3.9.7/include/linux/vs_sched.h 2018-01-10 02:50:49.000000000 +0000
8871 +#ifndef _VS_SCHED_H
8872 +#define _VS_SCHED_H
8874 +#include "vserver/base.h"
8875 +#include "vserver/context.h"
8876 +#include "vserver/sched.h"
8879 +#define MAX_PRIO_BIAS 20
8880 +#define MIN_PRIO_BIAS -20
8883 +int vx_adjust_prio(struct task_struct *p, int prio, int max_user)
8885 + struct vx_info *vxi = p->vx_info;
8888 + prio += vx_cpu(vxi, sched_pc).prio_bias;
8892 +static inline void vx_account_user(struct vx_info *vxi,
8893 + cputime_t cputime, int nice)
8897 + vx_cpu(vxi, sched_pc).user_ticks += cputime;
8900 +static inline void vx_account_system(struct vx_info *vxi,
8901 + cputime_t cputime, int idle)
8905 + vx_cpu(vxi, sched_pc).sys_ticks += cputime;
8909 +#warning duplicate inclusion
8911 diff -NurpP --minimal linux-4.9.82/include/linux/vs_socket.h linux-4.9.82-vs2.3.9.7/include/linux/vs_socket.h
8912 --- linux-4.9.82/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000
8913 +++ linux-4.9.82-vs2.3.9.7/include/linux/vs_socket.h 2018-01-10 02:50:49.000000000 +0000
8915 +#ifndef _VS_SOCKET_H
8916 +#define _VS_SOCKET_H
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"
8925 +/* socket accounting */
8927 +#include <linux/socket.h>
8929 +static inline int vx_sock_type(int family)
8933 + return VXA_SOCK_UNSPEC;
8935 + return VXA_SOCK_UNIX;
8937 + return VXA_SOCK_INET;
8939 + return VXA_SOCK_INET6;
8941 + return VXA_SOCK_PACKET;
8943 + return VXA_SOCK_OTHER;
8947 +#define vx_acc_sock(v, f, p, s) \
8948 + __vx_acc_sock(v, f, p, s, __FILE__, __LINE__)
8950 +static inline void __vx_acc_sock(struct vx_info *vxi,
8951 + int family, int pos, int size, char *file, int line)
8954 + int type = vx_sock_type(family);
8956 + atomic_long_inc(&vxi->cacct.sock[type][pos].count);
8957 + atomic_long_add(size, &vxi->cacct.sock[type][pos].total);
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)
8969 +#define sock_vx_init(s) do { \
8970 + (s)->sk_xid = 0; \
8971 + (s)->sk_vx_info = NULL; \
8974 +#define sock_nx_init(s) do { \
8975 + (s)->sk_nid = 0; \
8976 + (s)->sk_nx_info = NULL; \
8980 +#warning duplicate inclusion
8982 diff -NurpP --minimal linux-4.9.82/include/linux/vs_tag.h linux-4.9.82-vs2.3.9.7/include/linux/vs_tag.h
8983 --- linux-4.9.82/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000
8984 +++ linux-4.9.82-vs2.3.9.7/include/linux/vs_tag.h 2018-01-10 02:50:49.000000000 +0000
8989 +#include <linux/vserver/tag.h>
8991 +/* check conditions */
8993 +#define DX_ADMIN 0x0001
8994 +#define DX_WATCH 0x0002
8995 +#define DX_HOSTID 0x0008
8997 +#define DX_IDENT 0x0010
8999 +#define DX_ARG_MASK 0x0010
9002 +#define dx_task_tag(t) ((t)->tag)
9004 +#define dx_current_tag() dx_task_tag(current)
9006 +#define dx_check(c, m) __dx_check(dx_current_tag(), c, m)
9008 +#define dx_weak_check(c, m) ((m) ? dx_check(c, m) : 1)
9012 + * check current context for ADMIN/WATCH and
9013 + * optionally against supplied argument
9015 +static inline int __dx_check(vtag_t cid, vtag_t id, unsigned int mode)
9017 + if (mode & DX_ARG_MASK) {
9018 + if ((mode & DX_IDENT) && (id == cid))
9021 + return (((mode & DX_ADMIN) && (cid == 0)) ||
9022 + ((mode & DX_WATCH) && (cid == 1)) ||
9023 + ((mode & DX_HOSTID) && (id == 0)));
9027 +int dx_permission(const struct inode *inode, int mask);
9031 +#warning duplicate inclusion
9033 diff -NurpP --minimal linux-4.9.82/include/linux/vs_time.h linux-4.9.82-vs2.3.9.7/include/linux/vs_time.h
9034 --- linux-4.9.82/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000
9035 +++ linux-4.9.82-vs2.3.9.7/include/linux/vs_time.h 2018-01-16 00:51:52.000000000 +0000
9041 +/* time faking stuff */
9043 +#ifdef CONFIG_VSERVER_VTIME
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);
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)
9056 +#warning duplicate inclusion
9058 diff -NurpP --minimal linux-4.9.82/include/linux/vserver/base.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/base.h
9059 --- linux-4.9.82/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000
9060 +++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/base.h 2018-01-10 02:50:49.000000000 +0000
9062 +#ifndef _VSERVER_BASE_H
9063 +#define _VSERVER_BASE_H
9066 +/* context state changes */
9078 +#define vx_task_xid(t) ((t)->xid)
9080 +#define vx_current_xid() vx_task_xid(current)
9082 +#define current_vx_info() (current->vx_info)
9085 +#define nx_task_nid(t) ((t)->nid)
9087 +#define nx_current_nid() nx_task_nid(current)
9089 +#define current_nx_info() (current->nx_info)
9092 +/* generic flag merging */
9094 +#define vs_check_flags(v, m, f) (((v) & (m)) ^ (f))
9096 +#define vs_mask_flags(v, f, m) (((v) & ~(m)) | ((f) & (m)))
9098 +#define vs_mask_mask(v, f, m) (((v) & ~(m)) | ((v) & (f) & (m)))
9100 +#define vs_check_bit(v, n) ((v) & (1LL << (n)))
9103 +/* context flags */
9105 +#define __vx_flags(v) ((v) ? (v)->vx_flags : 0)
9107 +#define vx_current_flags() __vx_flags(current_vx_info())
9109 +#define vx_info_flags(v, m, f) \
9110 + vs_check_flags(__vx_flags(v), m, f)
9112 +#define task_vx_flags(t, m, f) \
9113 + ((t) && vx_info_flags((t)->vx_info, m, f))
9115 +#define vx_flags(m, f) vx_info_flags(current_vx_info(), m, f)
9120 +#define __vx_ccaps(v) ((v) ? (v)->vx_ccaps : 0)
9122 +#define vx_current_ccaps() __vx_ccaps(current_vx_info())
9124 +#define vx_info_ccaps(v, c) (__vx_ccaps(v) & (c))
9126 +#define vx_ccaps(c) vx_info_ccaps(current_vx_info(), (c))
9130 +/* network flags */
9132 +#define __nx_flags(n) ((n) ? (n)->nx_flags : 0)
9134 +#define nx_current_flags() __nx_flags(current_nx_info())
9136 +#define nx_info_flags(n, m, f) \
9137 + vs_check_flags(__nx_flags(n), m, f)
9139 +#define task_nx_flags(t, m, f) \
9140 + ((t) && nx_info_flags((t)->nx_info, m, f))
9142 +#define nx_flags(m, f) nx_info_flags(current_nx_info(), m, f)
9147 +#define __nx_ncaps(n) ((n) ? (n)->nx_ncaps : 0)
9149 +#define nx_current_ncaps() __nx_ncaps(current_nx_info())
9151 +#define nx_info_ncaps(n, c) (__nx_ncaps(n) & (c))
9153 +#define nx_ncaps(c) nx_info_ncaps(current_nx_info(), c)
9156 +/* context mask capabilities */
9158 +#define __vx_mcaps(v) ((v) ? (v)->vx_ccaps >> 32UL : ~0 )
9160 +#define vx_info_mcaps(v, c) (__vx_mcaps(v) & (c))
9162 +#define vx_mcaps(c) vx_info_mcaps(current_vx_info(), c)
9165 +/* context bcap mask */
9167 +#define __vx_bcaps(v) ((v)->vx_bcaps)
9169 +#define vx_current_bcaps() __vx_bcaps(current_vx_info())
9172 +/* mask given bcaps */
9174 +#define vx_info_mbcaps(v, c) ((v) ? cap_intersect(__vx_bcaps(v), c) : c)
9176 +#define vx_mbcaps(c) vx_info_mbcaps(current_vx_info(), c)
9179 +/* masked cap_bset */
9181 +#define vx_info_cap_bset(v) vx_info_mbcaps(v, current->cap_bset)
9183 +#define vx_current_cap_bset() vx_info_cap_bset(current_vx_info())
9186 +#define vx_info_mbcap(v, b) \
9187 + (!vx_info_flags(v, VXF_STATE_SETUP, 0) ? \
9188 + vx_info_bcaps(v, b) : (b))
9190 +#define task_vx_mbcap(t, b) \
9191 + vx_info_mbcap((t)->vx_info, (t)->b)
9193 +#define vx_mbcap(b) task_vx_mbcap(current, b)
9196 +#define vx_cap_raised(v, c, f) cap_raised(vx_info_mbcaps(v, c), f)
9198 +#define vx_capable(b, c) (capable(b) || \
9199 + (cap_raised(current_cap(), b) && vx_ccaps(c)))
9201 +#define vx_ns_capable(n, b, c) (ns_capable(n, b) || \
9202 + (cap_raised(current_cap(), b) && vx_ccaps(c)))
9204 +#define nx_capable(b, c) (capable(b) || \
9205 + (cap_raised(current_cap(), b) && nx_ncaps(c)))
9207 +#define nx_ns_capable(n, b, c) (ns_capable(n, b) || \
9208 + (cap_raised(current_cap(), b) && nx_ncaps(c)))
9210 +#define vx_task_initpid(t, n) \
9211 + ((t)->vx_info && \
9212 + ((t)->vx_info->vx_initpid == (n)))
9214 +#define vx_current_initpid(n) vx_task_initpid(current, n)
9217 +/* context unshare mask */
9219 +#define __vx_umask(v) ((v)->vx_umask)
9221 +#define vx_current_umask() __vx_umask(current_vx_info())
9223 +#define vx_can_unshare(b, f) (capable(b) || \
9224 + (cap_raised(current_cap(), b) && \
9225 + !((f) & ~vx_current_umask())))
9227 +#define vx_ns_can_unshare(n, b, f) (ns_capable(n, b) || \
9228 + (cap_raised(current_cap(), b) && \
9229 + !((f) & ~vx_current_umask())))
9231 +#define __vx_wmask(v) ((v)->vx_wmask)
9233 +#define vx_current_wmask() __vx_wmask(current_vx_info())
9236 +#define __vx_state(v) ((v) ? ((v)->vx_state) : 0)
9238 +#define vx_info_state(v, m) (__vx_state(v) & (m))
9241 +#define __nx_state(n) ((n) ? ((n)->nx_state) : 0)
9243 +#define nx_info_state(n, m) (__nx_state(n) & (m))
9246 diff -NurpP --minimal linux-4.9.82/include/linux/vserver/cacct.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/cacct.h
9247 --- linux-4.9.82/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000
9248 +++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/cacct.h 2018-01-10 02:50:49.000000000 +0000
9250 +#ifndef _VSERVER_CACCT_H
9251 +#define _VSERVER_CACCT_H
9254 +enum sock_acc_field {
9255 + VXA_SOCK_UNSPEC = 0,
9261 + VXA_SOCK_SIZE /* array size */
9264 +#endif /* _VSERVER_CACCT_H */
9265 diff -NurpP --minimal linux-4.9.82/include/linux/vserver/cacct_cmd.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/cacct_cmd.h
9266 --- linux-4.9.82/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
9267 +++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/cacct_cmd.h 2018-01-10 02:50:49.000000000 +0000
9269 +#ifndef _VSERVER_CACCT_CMD_H
9270 +#define _VSERVER_CACCT_CMD_H
9273 +#include <linux/compiler.h>
9274 +#include <uapi/vserver/cacct_cmd.h>
9276 +extern int vc_sock_stat(struct vx_info *, void __user *);
9278 +#endif /* _VSERVER_CACCT_CMD_H */
9279 diff -NurpP --minimal linux-4.9.82/include/linux/vserver/cacct_def.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/cacct_def.h
9280 --- linux-4.9.82/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000
9281 +++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/cacct_def.h 2018-01-10 02:50:49.000000000 +0000
9283 +#ifndef _VSERVER_CACCT_DEF_H
9284 +#define _VSERVER_CACCT_DEF_H
9286 +#include <asm/atomic.h>
9287 +#include <linux/vserver/cacct.h>
9290 +struct _vx_sock_acc {
9291 + atomic_long_t count;
9292 + atomic_long_t total;
9295 +/* context sub struct */
9298 + struct _vx_sock_acc sock[VXA_SOCK_SIZE][3];
9300 + atomic_t page[6][8];
9303 +#ifdef CONFIG_VSERVER_DEBUG
9305 +static inline void __dump_vx_cacct(struct _vx_cacct *cacct)
9309 + printk("\t_vx_cacct:");
9310 + for (i = 0; i < 6; i++) {
9311 + struct _vx_sock_acc *ptr = cacct->sock[i];
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));
9325 +#endif /* _VSERVER_CACCT_DEF_H */
9326 diff -NurpP --minimal linux-4.9.82/include/linux/vserver/cacct_int.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/cacct_int.h
9327 --- linux-4.9.82/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000
9328 +++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/cacct_int.h 2018-01-10 02:50:49.000000000 +0000
9330 +#ifndef _VSERVER_CACCT_INT_H
9331 +#define _VSERVER_CACCT_INT_H
9334 +unsigned long vx_sock_count(struct _vx_cacct *cacct, int type, int pos)
9336 + return atomic_long_read(&cacct->sock[type][pos].count);
9341 +unsigned long vx_sock_total(struct _vx_cacct *cacct, int type, int pos)
9343 + return atomic_long_read(&cacct->sock[type][pos].total);
9346 +#endif /* _VSERVER_CACCT_INT_H */
9347 diff -NurpP --minimal linux-4.9.82/include/linux/vserver/check.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/check.h
9348 --- linux-4.9.82/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000
9349 +++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/check.h 2018-01-10 02:50:49.000000000 +0000
9351 +#ifndef _VSERVER_CHECK_H
9352 +#define _VSERVER_CHECK_H
9355 +#define MAX_S_CONTEXT 65535 /* Arbitrary limit */
9357 +#ifdef CONFIG_VSERVER_DYNAMIC_IDS
9358 +#define MIN_D_CONTEXT 49152 /* dynamic contexts start here */
9360 +#define MIN_D_CONTEXT 65536
9363 +/* check conditions */
9365 +#define VS_ADMIN 0x0001
9366 +#define VS_WATCH 0x0002
9367 +#define VS_HIDE 0x0004
9368 +#define VS_HOSTID 0x0008
9370 +#define VS_IDENT 0x0010
9371 +#define VS_EQUIV 0x0020
9372 +#define VS_PARENT 0x0040
9373 +#define VS_CHILD 0x0080
9375 +#define VS_ARG_MASK 0x00F0
9377 +#define VS_DYNAMIC 0x0100
9378 +#define VS_STATIC 0x0200
9380 +#define VS_ATR_MASK 0x0F00
9382 +#ifdef CONFIG_VSERVER_PRIVACY
9383 +#define VS_ADMIN_P (0)
9384 +#define VS_WATCH_P (0)
9386 +#define VS_ADMIN_P VS_ADMIN
9387 +#define VS_WATCH_P VS_WATCH
9390 +#define VS_HARDIRQ 0x1000
9391 +#define VS_SOFTIRQ 0x2000
9392 +#define VS_IRQ 0x4000
9394 +#define VS_IRQ_MASK 0xF000
9396 +#include <linux/hardirq.h>
9399 + * check current context for ADMIN/WATCH and
9400 + * optionally against supplied argument
9402 +static inline int __vs_check(int cid, int id, unsigned int mode)
9404 + if (mode & VS_ARG_MASK) {
9405 + if ((mode & VS_IDENT) && (id == cid))
9408 + if (mode & VS_ATR_MASK) {
9409 + if ((mode & VS_DYNAMIC) &&
9410 + (id >= MIN_D_CONTEXT) &&
9411 + (id <= MAX_S_CONTEXT))
9413 + if ((mode & VS_STATIC) &&
9414 + (id > 1) && (id < MIN_D_CONTEXT))
9417 + if (mode & VS_IRQ_MASK) {
9418 + if ((mode & VS_IRQ) && unlikely(in_interrupt()))
9420 + if ((mode & VS_HARDIRQ) && unlikely(in_irq()))
9422 + if ((mode & VS_SOFTIRQ) && unlikely(in_softirq()))
9425 + return (((mode & VS_ADMIN) && (cid == 0)) ||
9426 + ((mode & VS_WATCH) && (cid == 1)) ||
9427 + ((mode & VS_HOSTID) && (id == 0)));
9430 +#define vx_check(c, m) __vs_check(vx_current_xid(), c, (m) | VS_IRQ)
9432 +#define vx_weak_check(c, m) ((m) ? vx_check(c, m) : 1)
9435 +#define nx_check(c, m) __vs_check(nx_current_nid(), c, m)
9437 +#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1)
9440 diff -NurpP --minimal linux-4.9.82/include/linux/vserver/context.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/context.h
9441 --- linux-4.9.82/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
9442 +++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/context.h 2018-01-10 02:50:49.000000000 +0000
9444 +#ifndef _VSERVER_CONTEXT_H
9445 +#define _VSERVER_CONTEXT_H
9448 +#include <linux/list.h>
9449 +#include <linux/spinlock.h>
9450 +#include <linux/rcupdate.h>
9451 +#include <uapi/vserver/context.h>
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"
9459 +#define VX_SPACES 2
9461 +struct _vx_info_pc {
9462 + struct _vx_sched_pc sched_pc;
9463 + struct _vx_cvirt_pc cvirt_pc;
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 */
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 */
9481 + struct _vx_space space[VX_SPACES]; /* namespace store */
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) */
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 */
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 */
9498 + struct _vx_device dmap; /* default device map targets */
9501 + struct _vx_info_pc info_pc; /* per cpu data */
9503 + struct _vx_info_pc *ptr_pc; /* per cpu array */
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 */
9510 + char vx_name[65]; /* vserver name */
9514 +#define vx_ptr_pc(vxi) (&(vxi)->info_pc)
9515 +#define vx_per_cpu(vxi, v, id) vx_ptr_pc(vxi)->v
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
9521 +#define vx_cpu(vxi, v) vx_per_cpu(vxi, v, smp_processor_id())
9524 +struct vx_info_save {
9525 + struct vx_info *vxi;
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
9539 +extern void claim_vx_info(struct vx_info *, struct task_struct *);
9540 +extern void release_vx_info(struct vx_info *, struct task_struct *);
9542 +extern struct vx_info *lookup_vx_info(int);
9543 +extern struct vx_info *lookup_or_create_vx_info(int);
9545 +extern int get_xid_list(int, unsigned int *, int);
9546 +extern int xid_is_hashed(vxid_t);
9548 +extern int vx_migrate_task(struct task_struct *, struct vx_info *, int);
9550 +extern long vs_state_change(struct vx_info *, unsigned int);
9553 +#endif /* _VSERVER_CONTEXT_H */
9554 diff -NurpP --minimal linux-4.9.82/include/linux/vserver/context_cmd.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/context_cmd.h
9555 --- linux-4.9.82/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
9556 +++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/context_cmd.h 2018-01-10 02:50:49.000000000 +0000
9558 +#ifndef _VSERVER_CONTEXT_CMD_H
9559 +#define _VSERVER_CONTEXT_CMD_H
9561 +#include <uapi/vserver/context_cmd.h>
9563 +extern int vc_task_xid(uint32_t);
9565 +extern int vc_vx_info(struct vx_info *, void __user *);
9567 +extern int vc_ctx_stat(struct vx_info *, void __user *);
9569 +extern int vc_ctx_create(uint32_t, void __user *);
9570 +extern int vc_ctx_migrate(struct vx_info *, void __user *);
9572 +extern int vc_get_cflags(struct vx_info *, void __user *);
9573 +extern int vc_set_cflags(struct vx_info *, void __user *);
9575 +extern int vc_get_ccaps(struct vx_info *, void __user *);
9576 +extern int vc_set_ccaps(struct vx_info *, void __user *);
9578 +extern int vc_get_bcaps(struct vx_info *, void __user *);
9579 +extern int vc_set_bcaps(struct vx_info *, void __user *);
9581 +extern int vc_get_umask(struct vx_info *, void __user *);
9582 +extern int vc_set_umask(struct vx_info *, void __user *);
9584 +extern int vc_get_wmask(struct vx_info *, void __user *);
9585 +extern int vc_set_wmask(struct vx_info *, void __user *);
9587 +extern int vc_get_badness(struct vx_info *, void __user *);
9588 +extern int vc_set_badness(struct vx_info *, void __user *);
9590 +#endif /* _VSERVER_CONTEXT_CMD_H */
9591 diff -NurpP --minimal linux-4.9.82/include/linux/vserver/cvirt.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/cvirt.h
9592 --- linux-4.9.82/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000
9593 +++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/cvirt.h 2018-01-16 00:54:34.000000000 +0000
9595 +#ifndef _VSERVER_CVIRT_H
9596 +#define _VSERVER_CVIRT_H
9600 +void vx_vsi_boottime64(struct timespec64 *);
9602 +void vx_vsi_uptime(struct timespec *, struct timespec *);
9607 +void vx_update_load(struct vx_info *);
9610 +int vx_do_syslog(int, char __user *, int);
9612 +#endif /* _VSERVER_CVIRT_H */
9613 diff -NurpP --minimal linux-4.9.82/include/linux/vserver/cvirt_cmd.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/cvirt_cmd.h
9614 --- linux-4.9.82/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
9615 +++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/cvirt_cmd.h 2018-01-10 02:50:49.000000000 +0000
9617 +#ifndef _VSERVER_CVIRT_CMD_H
9618 +#define _VSERVER_CVIRT_CMD_H
9621 +#include <linux/compiler.h>
9622 +#include <uapi/vserver/cvirt_cmd.h>
9624 +extern int vc_set_vhi_name(struct vx_info *, void __user *);
9625 +extern int vc_get_vhi_name(struct vx_info *, void __user *);
9627 +extern int vc_virt_stat(struct vx_info *, void __user *);
9629 +#endif /* _VSERVER_CVIRT_CMD_H */
9630 diff -NurpP --minimal linux-4.9.82/include/linux/vserver/cvirt_def.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/cvirt_def.h
9631 --- linux-4.9.82/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000
9632 +++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/cvirt_def.h 2018-01-10 10:07:41.000000000 +0000
9634 +#ifndef _VSERVER_CVIRT_DEF_H
9635 +#define _VSERVER_CVIRT_DEF_H
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>
9644 +struct _vx_usage_stat {
9654 +struct _vx_syslog {
9655 + wait_queue_head_t log_wait;
9656 + spinlock_t logbuf_lock; /* lock for the log buffer */
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 */
9663 + char log_buf[1024];
9667 +/* context sub struct */
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 */
9674 + atomic_t nr_onhold; /* processes on hold */
9675 + uint32_t onhold_last; /* jiffies when put on hold */
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 */
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 */
9687 + atomic_t total_forks; /* number of forks so far */
9689 + struct _vx_syslog syslog;
9692 +struct _vx_cvirt_pc {
9693 + struct _vx_usage_stat cpustat;
9697 +#ifdef CONFIG_VSERVER_DEBUG
9699 +static inline void __dump_vx_cvirt(struct _vx_cvirt *cvirt)
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));
9713 +#endif /* _VSERVER_CVIRT_DEF_H */
9714 diff -NurpP --minimal linux-4.9.82/include/linux/vserver/debug.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/debug.h
9715 --- linux-4.9.82/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000
9716 +++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/debug.h 2018-01-10 02:50:49.000000000 +0000
9718 +#ifndef _VSERVER_DEBUG_H
9719 +#define _VSERVER_DEBUG_H
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))
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]"
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"
9737 +#define VS_Q_LQM "\xbb"
9738 +#define VS_Q_RQM "\xab"
9741 +#define VS_Q(f) VS_Q_LQM f VS_Q_RQM
9744 +#define vxd_path(p) \
9745 + ({ static char _buffer[PATH_MAX]; \
9746 + d_path(p, _buffer, sizeof(_buffer)); })
9748 +#define vxd_cond_path(n) \
9749 + ((n) ? vxd_path(&(n)->path) : "<null>" )
9752 +#ifdef CONFIG_VSERVER_DEBUG
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;
9769 +#define VX_LOGLEVEL "vxD: "
9770 +#define VX_PROC_FMT "%p: "
9771 +#define VX_PROCESS current
9773 +#define vxdprintk(c, f, x...) \
9776 + printk(VX_LOGLEVEL VX_PROC_FMT f "\n", \
9777 + VX_PROCESS , ##x); \
9780 +#define vxlprintk(c, f, x...) \
9783 + printk(VX_LOGLEVEL f " @%s:%d\n", x); \
9786 +#define vxfprintk(c, f, x...) \
9789 + printk(VX_LOGLEVEL f " %s@%s:%d\n", x); \
9795 +void dump_vx_info(struct vx_info *, int);
9796 +void dump_vx_info_inactive(int);
9798 +#else /* CONFIG_VSERVER_DEBUG */
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
9814 +#define vxdprintk(x...) do { } while (0)
9815 +#define vxlprintk(x...) do { } while (0)
9816 +#define vxfprintk(x...) do { } while (0)
9818 +#endif /* CONFIG_VSERVER_DEBUG */
9821 +#ifdef CONFIG_VSERVER_WARN
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] "
9829 +#define vxwprintk(c, f, x...) \
9832 + printk(VX_WARNLEVEL f "\n", ##x); \
9835 +#else /* CONFIG_VSERVER_WARN */
9837 +#define vxwprintk(x...) do { } while (0)
9839 +#endif /* CONFIG_VSERVER_WARN */
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)
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__)
9858 +#define vxd_assert_lock(l) do { } while (0)
9859 +#define vxd_assert(c, f, x...) do { } while (0)
9863 +#endif /* _VSERVER_DEBUG_H */
9864 diff -NurpP --minimal linux-4.9.82/include/linux/vserver/debug_cmd.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/debug_cmd.h
9865 --- linux-4.9.82/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
9866 +++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/debug_cmd.h 2018-01-10 02:50:49.000000000 +0000
9868 +#ifndef _VSERVER_DEBUG_CMD_H
9869 +#define _VSERVER_DEBUG_CMD_H
9871 +#include <uapi/vserver/debug_cmd.h>
9874 +#ifdef CONFIG_COMPAT
9876 +#include <asm/compat.h>
9878 +struct vcmd_read_history_v0_x32 {
9881 + compat_uptr_t data_ptr;
9884 +struct vcmd_read_monitor_v0_x32 {
9887 + compat_uptr_t data_ptr;
9890 +#endif /* CONFIG_COMPAT */
9892 +extern int vc_dump_history(uint32_t);
9894 +extern int vc_read_history(uint32_t, void __user *);
9895 +extern int vc_read_monitor(uint32_t, void __user *);
9897 +#ifdef CONFIG_COMPAT
9899 +extern int vc_read_history_x32(uint32_t, void __user *);
9900 +extern int vc_read_monitor_x32(uint32_t, void __user *);
9902 +#endif /* CONFIG_COMPAT */
9904 +#endif /* _VSERVER_DEBUG_CMD_H */
9905 diff -NurpP --minimal linux-4.9.82/include/linux/vserver/device.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/device.h
9906 --- linux-4.9.82/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
9907 +++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/device.h 2018-01-10 02:50:49.000000000 +0000
9909 +#ifndef _VSERVER_DEVICE_H
9910 +#define _VSERVER_DEVICE_H
9913 +#include <uapi/vserver/device.h>
9915 +#else /* _VSERVER_DEVICE_H */
9916 +#warning duplicate inclusion
9917 +#endif /* _VSERVER_DEVICE_H */
9918 diff -NurpP --minimal linux-4.9.82/include/linux/vserver/device_cmd.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/device_cmd.h
9919 --- linux-4.9.82/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
9920 +++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/device_cmd.h 2018-01-10 02:50:49.000000000 +0000
9922 +#ifndef _VSERVER_DEVICE_CMD_H
9923 +#define _VSERVER_DEVICE_CMD_H
9925 +#include <uapi/vserver/device_cmd.h>
9928 +#ifdef CONFIG_COMPAT
9930 +#include <asm/compat.h>
9932 +struct vcmd_set_mapping_v0_x32 {
9933 + compat_uptr_t device_ptr;
9934 + compat_uptr_t target_ptr;
9938 +#endif /* CONFIG_COMPAT */
9940 +#include <linux/compiler.h>
9942 +extern int vc_set_mapping(struct vx_info *, void __user *);
9943 +extern int vc_unset_mapping(struct vx_info *, void __user *);
9945 +#ifdef CONFIG_COMPAT
9947 +extern int vc_set_mapping_x32(struct vx_info *, void __user *);
9948 +extern int vc_unset_mapping_x32(struct vx_info *, void __user *);
9950 +#endif /* CONFIG_COMPAT */
9952 +#endif /* _VSERVER_DEVICE_CMD_H */
9953 diff -NurpP --minimal linux-4.9.82/include/linux/vserver/device_def.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/device_def.h
9954 --- linux-4.9.82/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000
9955 +++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/device_def.h 2018-01-10 02:50:49.000000000 +0000
9957 +#ifndef _VSERVER_DEVICE_DEF_H
9958 +#define _VSERVER_DEVICE_DEF_H
9960 +#include <linux/types.h>
9962 +struct vx_dmap_target {
9967 +struct _vx_device {
9968 +#ifdef CONFIG_VSERVER_DEVICE
9969 + struct vx_dmap_target targets[2];
9973 +#endif /* _VSERVER_DEVICE_DEF_H */
9974 diff -NurpP --minimal linux-4.9.82/include/linux/vserver/dlimit.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/dlimit.h
9975 --- linux-4.9.82/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000
9976 +++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/dlimit.h 2018-01-10 02:50:49.000000000 +0000
9978 +#ifndef _VSERVER_DLIMIT_H
9979 +#define _VSERVER_DLIMIT_H
9981 +#include "switch.h"
9986 +/* keep in sync with CDLIM_INFINITY */
9988 +#define DLIM_INFINITY (~0ULL)
9990 +#include <linux/spinlock.h>
9991 +#include <linux/rcupdate.h>
9993 +struct super_block;
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 */
10002 + struct super_block *dl_sb; /* associated superblock */
10004 + spinlock_t dl_lock; /* protect the values */
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 */
10011 + unsigned int dl_nrlmult; /* non root limit mult */
10016 +extern void rcu_free_dl_info(struct rcu_head *);
10017 +extern void unhash_dl_info(struct dl_info *);
10019 +extern struct dl_info *locate_dl_info(struct super_block *, vtag_t);
10024 +extern void vx_vsi_statfs(struct super_block *, struct kstatfs *);
10026 +typedef uint64_t dlsize_t;
10028 +#endif /* __KERNEL__ */
10029 +#else /* _VSERVER_DLIMIT_H */
10030 +#warning duplicate inclusion
10031 +#endif /* _VSERVER_DLIMIT_H */
10032 diff -NurpP --minimal linux-4.9.82/include/linux/vserver/dlimit_cmd.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/dlimit_cmd.h
10033 --- linux-4.9.82/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
10034 +++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/dlimit_cmd.h 2018-01-10 02:50:49.000000000 +0000
10036 +#ifndef _VSERVER_DLIMIT_CMD_H
10037 +#define _VSERVER_DLIMIT_CMD_H
10039 +#include <uapi/vserver/dlimit_cmd.h>
10042 +#ifdef CONFIG_COMPAT
10044 +#include <asm/compat.h>
10046 +struct vcmd_ctx_dlimit_base_v0_x32 {
10047 + compat_uptr_t name_ptr;
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 % */
10061 +#endif /* CONFIG_COMPAT */
10063 +#include <linux/compiler.h>
10065 +extern int vc_add_dlimit(uint32_t, void __user *);
10066 +extern int vc_rem_dlimit(uint32_t, void __user *);
10068 +extern int vc_set_dlimit(uint32_t, void __user *);
10069 +extern int vc_get_dlimit(uint32_t, void __user *);
10071 +#ifdef CONFIG_COMPAT
10073 +extern int vc_add_dlimit_x32(uint32_t, void __user *);
10074 +extern int vc_rem_dlimit_x32(uint32_t, void __user *);
10076 +extern int vc_set_dlimit_x32(uint32_t, void __user *);
10077 +extern int vc_get_dlimit_x32(uint32_t, void __user *);
10079 +#endif /* CONFIG_COMPAT */
10081 +#endif /* _VSERVER_DLIMIT_CMD_H */
10082 diff -NurpP --minimal linux-4.9.82/include/linux/vserver/global.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/global.h
10083 --- linux-4.9.82/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000
10084 +++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/global.h 2018-01-13 03:51:55.000000000 +0000
10086 +#ifndef _VSERVER_GLOBAL_H
10087 +#define _VSERVER_GLOBAL_H
10090 +extern atomic_t vx_global_ctotal;
10091 +extern atomic_t vx_global_cactive;
10093 +extern atomic_t nx_global_ctotal;
10094 +extern atomic_t nx_global_cactive;
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;
10105 +#endif /* _VSERVER_GLOBAL_H */
10106 diff -NurpP --minimal linux-4.9.82/include/linux/vserver/history.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/history.h
10107 --- linux-4.9.82/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000
10108 +++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/history.h 2018-01-10 02:50:49.000000000 +0000
10110 +#ifndef _VSERVER_HISTORY_H
10111 +#define _VSERVER_HISTORY_H
10116 + VXH_THROW_OOPS = 1,
10120 + VXH_INIT_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,
10130 + VXH_LOOKUP_VX_INFO,
10131 + VXH_CREATE_VX_INFO,
10134 +struct _vxhe_vxi {
10135 + struct vx_info *ptr;
10141 +struct _vxhe_set_clr {
10145 +struct _vxhe_loc_lookup {
10149 +struct _vx_hist_entry {
10151 + unsigned short seq;
10152 + unsigned short type;
10153 + struct _vxhe_vxi vxi;
10155 + struct _vxhe_set_clr sc;
10156 + struct _vxhe_loc_lookup ll;
10160 +#ifdef CONFIG_VSERVER_HISTORY
10162 +extern unsigned volatile int vxh_active;
10164 +struct _vx_hist_entry *vxh_advance(void *loc);
10168 +void __vxh_copy_vxi(struct _vx_hist_entry *entry, struct vx_info *vxi)
10170 + entry->vxi.ptr = 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;
10179 +#define __HERE__ current_text_addr()
10181 +#define __VXH_BODY(__type, __data, __here) \
10182 + struct _vx_hist_entry *entry; \
10184 + preempt_disable(); \
10185 + entry = vxh_advance(__here); \
10187 + entry->type = __type; \
10188 + preempt_enable();
10191 + /* pass vxi only */
10193 +#define __VXH_SMPL \
10194 + __vxh_copy_vxi(entry, vxi)
10197 +void __vxh_smpl(struct vx_info *vxi, int __type, void *__here)
10199 + __VXH_BODY(__type, __VXH_SMPL, __here)
10202 + /* pass vxi and data (void *) */
10204 +#define __VXH_DATA \
10205 + __vxh_copy_vxi(entry, vxi); \
10206 + entry->sc.data = data
10209 +void __vxh_data(struct vx_info *vxi, void *data,
10210 + int __type, void *__here)
10212 + __VXH_BODY(__type, __VXH_DATA, __here)
10215 + /* pass vxi and arg (long) */
10217 +#define __VXH_LONG \
10218 + __vxh_copy_vxi(entry, vxi); \
10219 + entry->ll.arg = arg
10222 +void __vxh_long(struct vx_info *vxi, long arg,
10223 + int __type, void *__here)
10225 + __VXH_BODY(__type, __VXH_LONG, __here)
10230 +void __vxh_throw_oops(void *__here)
10232 + __VXH_BODY(VXH_THROW_OOPS, {}, __here);
10233 + /* prevent further acquisition */
10238 +#define vxh_throw_oops() __vxh_throw_oops(__HERE__);
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);
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);
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);
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__);
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__);
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__);
10272 +extern void vxh_dump_history(void);
10275 +#else /* CONFIG_VSERVER_HISTORY */
10277 +#define __HERE__ 0
10279 +#define vxh_throw_oops() do { } while (0)
10281 +#define __vxh_get_vx_info(v, h) do { } while (0)
10282 +#define __vxh_put_vx_info(v, h) do { } while (0)
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)
10288 +#define __vxh_claim_vx_info(v, d, h) do { } while (0)
10289 +#define __vxh_release_vx_info(v, d, h) do { } while (0)
10291 +#define vxh_alloc_vx_info(v) do { } while (0)
10292 +#define vxh_dealloc_vx_info(v) do { } while (0)
10294 +#define vxh_hash_vx_info(v) do { } while (0)
10295 +#define vxh_unhash_vx_info(v) do { } while (0)
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)
10301 +#define vxh_dump_history() do { } while (0)
10304 +#endif /* CONFIG_VSERVER_HISTORY */
10306 +#endif /* _VSERVER_HISTORY_H */
10307 diff -NurpP --minimal linux-4.9.82/include/linux/vserver/inode.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/inode.h
10308 --- linux-4.9.82/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
10309 +++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/inode.h 2018-01-10 02:50:49.000000000 +0000
10311 +#ifndef _VSERVER_INODE_H
10312 +#define _VSERVER_INODE_H
10314 +#include <uapi/vserver/inode.h>
10317 +#ifdef CONFIG_VSERVER_PROC_SECURE
10318 +#define IATTR_PROC_DEFAULT ( IATTR_ADMIN | IATTR_HIDE )
10319 +#define IATTR_PROC_SYMLINK ( IATTR_ADMIN )
10321 +#define IATTR_PROC_DEFAULT ( IATTR_ADMIN )
10322 +#define IATTR_PROC_SYMLINK ( IATTR_ADMIN )
10325 +#define vx_hide_check(c, m) (((m) & IATTR_HIDE) ? vx_check(c, m) : 1)
10327 +#else /* _VSERVER_INODE_H */
10328 +#warning duplicate inclusion
10329 +#endif /* _VSERVER_INODE_H */
10330 diff -NurpP --minimal linux-4.9.82/include/linux/vserver/inode_cmd.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/inode_cmd.h
10331 --- linux-4.9.82/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
10332 +++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/inode_cmd.h 2018-01-10 02:50:49.000000000 +0000
10334 +#ifndef _VSERVER_INODE_CMD_H
10335 +#define _VSERVER_INODE_CMD_H
10337 +#include <uapi/vserver/inode_cmd.h>
10341 +#ifdef CONFIG_COMPAT
10343 +#include <asm/compat.h>
10345 +struct vcmd_ctx_iattr_v1_x32 {
10346 + compat_uptr_t name_ptr;
10352 +#endif /* CONFIG_COMPAT */
10354 +#include <linux/compiler.h>
10356 +extern int vc_get_iattr(void __user *);
10357 +extern int vc_set_iattr(void __user *);
10359 +extern int vc_fget_iattr(uint32_t, void __user *);
10360 +extern int vc_fset_iattr(uint32_t, void __user *);
10362 +#ifdef CONFIG_COMPAT
10364 +extern int vc_get_iattr_x32(void __user *);
10365 +extern int vc_set_iattr_x32(void __user *);
10367 +#endif /* CONFIG_COMPAT */
10369 +#endif /* _VSERVER_INODE_CMD_H */
10370 diff -NurpP --minimal linux-4.9.82/include/linux/vserver/limit.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/limit.h
10371 --- linux-4.9.82/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
10372 +++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/limit.h 2018-01-10 02:50:49.000000000 +0000
10374 +#ifndef _VSERVER_LIMIT_H
10375 +#define _VSERVER_LIMIT_H
10377 +#include <uapi/vserver/limit.h>
10380 +#define VLIM_NOCHECK ((1L << VLIMIT_DENTRY) | (1L << RLIMIT_RSS))
10382 +/* keep in sync with CRLIM_INFINITY */
10384 +#define VLIM_INFINITY (~0ULL)
10386 +#include <asm/atomic.h>
10387 +#include <asm/resource.h>
10389 +#ifndef RLIM_INFINITY
10390 +#warning RLIM_INFINITY is undefined
10393 +#define __rlim_val(l, r, v) ((l)->res[r].v)
10395 +#define __rlim_soft(l, r) __rlim_val(l, r, soft)
10396 +#define __rlim_hard(l, r) __rlim_val(l, r, hard)
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)
10402 +#define __rlim_lhit(l, r) __rlim_val(l, r, lhit)
10403 +#define __rlim_hit(l, r) atomic_inc(&__rlim_lhit(l, r))
10405 +typedef atomic_long_t rlim_atomic_t;
10406 +typedef unsigned long rlim_t;
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))
10416 +#if (RLIM_INFINITY == VLIM_INFINITY)
10417 +#define VX_VLIM(r) ((long long)(long)(r))
10418 +#define VX_RLIM(v) ((rlim_t)(v))
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))
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 */
10438 +#define NUM_LIMITS 24
10440 +#endif /* _VSERVER_LIMIT_H */
10441 diff -NurpP --minimal linux-4.9.82/include/linux/vserver/limit_cmd.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/limit_cmd.h
10442 --- linux-4.9.82/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
10443 +++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/limit_cmd.h 2018-01-10 02:50:49.000000000 +0000
10445 +#ifndef _VSERVER_LIMIT_CMD_H
10446 +#define _VSERVER_LIMIT_CMD_H
10448 +#include <uapi/vserver/limit_cmd.h>
10451 +#ifdef CONFIG_IA32_EMULATION
10453 +struct vcmd_ctx_rlimit_v0_x32 {
10455 + uint64_t minimum;
10456 + uint64_t softlimit;
10457 + uint64_t maximum;
10458 +} __attribute__ ((packed));
10460 +#endif /* CONFIG_IA32_EMULATION */
10462 +#include <linux/compiler.h>
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 *);
10470 +extern int vc_rlimit_stat(struct vx_info *, void __user *);
10472 +#ifdef CONFIG_IA32_EMULATION
10474 +extern int vc_get_rlimit_x32(struct vx_info *, void __user *);
10475 +extern int vc_set_rlimit_x32(struct vx_info *, void __user *);
10477 +#endif /* CONFIG_IA32_EMULATION */
10479 +#endif /* _VSERVER_LIMIT_CMD_H */
10480 diff -NurpP --minimal linux-4.9.82/include/linux/vserver/limit_def.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/limit_def.h
10481 --- linux-4.9.82/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000
10482 +++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/limit_def.h 2018-01-10 02:50:49.000000000 +0000
10484 +#ifndef _VSERVER_LIMIT_DEF_H
10485 +#define _VSERVER_LIMIT_DEF_H
10487 +#include <asm/atomic.h>
10488 +#include <asm/resource.h>
10490 +#include "limit.h"
10493 +struct _vx_res_limit {
10494 + rlim_t soft; /* Context soft limit */
10495 + rlim_t hard; /* Context hard limit */
10497 + rlim_atomic_t rcur; /* Current value */
10498 + rlim_t rmin; /* Context minimum */
10499 + rlim_t rmax; /* Context maximum */
10501 + atomic_t lhit; /* Limit hits */
10504 +/* context sub struct */
10506 +struct _vx_limit {
10507 + struct _vx_res_limit res[NUM_LIMITS];
10510 +#ifdef CONFIG_VSERVER_DEBUG
10512 +static inline void __dump_vx_limit(struct _vx_limit *limit)
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)));
10530 +#endif /* _VSERVER_LIMIT_DEF_H */
10531 diff -NurpP --minimal linux-4.9.82/include/linux/vserver/limit_int.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/limit_int.h
10532 --- linux-4.9.82/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000
10533 +++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/limit_int.h 2018-01-10 02:50:49.000000000 +0000
10535 +#ifndef _VSERVER_LIMIT_INT_H
10536 +#define _VSERVER_LIMIT_INT_H
10538 +#define VXD_RCRES_COND(r) VXD_CBIT(cres, r)
10539 +#define VXD_RLIMIT_COND(r) VXD_CBIT(limit, r)
10541 +extern const char *vlimit_name[NUM_LIMITS];
10543 +static inline void __vx_acc_cres(struct vx_info *vxi,
10544 + int res, int dir, void *_data, char *_file, int _line)
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);
10555 + __rlim_inc(&vxi->limit, res);
10557 + __rlim_dec(&vxi->limit, res);
10560 +static inline void __vx_add_cres(struct vx_info *vxi,
10561 + int res, int amount, void *_data, char *_file, int _line)
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);
10572 + __rlim_add(&vxi->limit, res, amount);
10576 +int __vx_cres_adjust_max(struct _vx_limit *limit, int res, rlim_t value)
10578 + int cond = (value > __rlim_rmax(limit, res));
10581 + __rlim_rmax(limit, res) = value;
10586 +int __vx_cres_adjust_min(struct _vx_limit *limit, int res, rlim_t value)
10588 + int cond = (value < __rlim_rmin(limit, res));
10591 + __rlim_rmin(limit, res) = value;
10596 +void __vx_cres_fixup(struct _vx_limit *limit, int res, rlim_t value)
10598 + if (!__vx_cres_adjust_max(limit, res, value))
10599 + __vx_cres_adjust_min(limit, res, value);
10604 + +1 ... no limit hit
10605 + -1 ... over soft limit
10606 + 0 ... over hard limit */
10608 +static inline int __vx_cres_avail(struct vx_info *vxi,
10609 + int res, int num, char *_file, int _line)
10611 + struct _vx_limit *limit;
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);
10624 + limit = &vxi->limit;
10625 + value = __rlim_get(limit, res);
10627 + if (!__vx_cres_adjust_max(limit, res, value))
10628 + __vx_cres_adjust_min(limit, res, value);
10633 + if (__rlim_soft(limit, res) == RLIM_INFINITY)
10635 + if (value + num <= __rlim_soft(limit, res))
10638 + if (__rlim_hard(limit, res) == RLIM_INFINITY)
10640 + if (value + num <= __rlim_hard(limit, res))
10643 + __rlim_hit(limit, res);
10648 +static const int VLA_RSS[] = { RLIMIT_RSS, VLIMIT_ANON, VLIMIT_MAPPED, 0 };
10651 +rlim_t __vx_cres_array_sum(struct _vx_limit *limit, const int *array)
10653 + rlim_t value, sum = 0;
10656 + while ((res = *array++)) {
10657 + value = __rlim_get(limit, res);
10658 + __vx_cres_fixup(limit, res, value);
10665 +rlim_t __vx_cres_array_fixup(struct _vx_limit *limit, const int *array)
10667 + rlim_t value = __vx_cres_array_sum(limit, array + 1);
10668 + int res = *array;
10670 + if (value == __rlim_get(limit, res))
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);
10681 +static inline int __vx_cres_array_avail(struct vx_info *vxi,
10682 + const int *array, int num, char *_file, int _line)
10684 + struct _vx_limit *limit;
10685 + rlim_t value = 0;
10693 + limit = &vxi->limit;
10695 + value = __vx_cres_array_sum(limit, array + 1);
10697 + __rlim_set(limit, res, value);
10698 + __vx_cres_fixup(limit, res, value);
10700 + return __vx_cres_avail(vxi, res, num, _file, _line);
10704 +static inline void vx_limit_fixup(struct _vx_limit *limit, int id)
10709 + /* complex resources first */
10710 + if ((id < 0) || (id == RLIMIT_RSS))
10711 + __vx_cres_array_fixup(limit, VLA_RSS);
10713 + for (res = 0; res < NUM_LIMITS; res++) {
10714 + if ((id > 0) && (res != id))
10717 + value = __rlim_get(limit, res);
10718 + __vx_cres_fixup(limit, res, value);
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);
10727 +#endif /* _VSERVER_LIMIT_INT_H */
10728 diff -NurpP --minimal linux-4.9.82/include/linux/vserver/monitor.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/monitor.h
10729 --- linux-4.9.82/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
10730 +++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/monitor.h 2018-01-10 02:50:49.000000000 +0000
10732 +#ifndef _VSERVER_MONITOR_H
10733 +#define _VSERVER_MONITOR_H
10735 +#include <uapi/vserver/monitor.h>
10737 +#endif /* _VSERVER_MONITOR_H */
10738 diff -NurpP --minimal linux-4.9.82/include/linux/vserver/network.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/network.h
10739 --- linux-4.9.82/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
10740 +++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/network.h 2018-01-10 02:50:49.000000000 +0000
10742 +#ifndef _VSERVER_NETWORK_H
10743 +#define _VSERVER_NETWORK_H
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>
10754 +struct nx_addr_v4 {
10755 + struct nx_addr_v4 *next;
10756 + struct in_addr ip[2];
10757 + struct in_addr mask;
10762 +struct nx_addr_v6 {
10763 + struct nx_addr_v6 *next;
10764 + struct in6_addr ip;
10765 + struct in6_addr mask;
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 */
10778 + uint64_t nx_flags; /* network flag word */
10779 + uint64_t nx_ncaps; /* network capabilities */
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 */
10788 + char nx_name[65]; /* network context name */
10792 +/* status flags */
10794 +#define NXS_HASHED 0x0001
10795 +#define NXS_SHUTDOWN 0x0100
10796 +#define NXS_RELEASED 0x8000
10798 +extern struct nx_info *lookup_nx_info(int);
10800 +extern int get_nid_list(int, unsigned int *, int);
10801 +extern int nid_is_hashed(vnid_t);
10803 +extern int nx_migrate_task(struct task_struct *, struct nx_info *);
10805 +extern long vs_net_change(struct nx_info *, unsigned int);
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)
10814 +#define NX_IPV6(n) (0)
10817 +#endif /* _VSERVER_NETWORK_H */
10818 diff -NurpP --minimal linux-4.9.82/include/linux/vserver/network_cmd.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/network_cmd.h
10819 --- linux-4.9.82/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
10820 +++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/network_cmd.h 2018-01-10 02:50:49.000000000 +0000
10822 +#ifndef _VSERVER_NETWORK_CMD_H
10823 +#define _VSERVER_NETWORK_CMD_H
10825 +#include <uapi/vserver/network_cmd.h>
10827 +extern int vc_task_nid(uint32_t);
10829 +extern int vc_nx_info(struct nx_info *, void __user *);
10831 +extern int vc_net_create(uint32_t, void __user *);
10832 +extern int vc_net_migrate(struct nx_info *, void __user *);
10834 +extern int vc_net_add(struct nx_info *, void __user *);
10835 +extern int vc_net_remove(struct nx_info *, void __user *);
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 *);
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 *);
10843 +extern int vc_net_add_ipv6(struct nx_info *, void __user *);
10844 +extern int vc_net_remove_ipv6(struct nx_info *, void __user *);
10846 +extern int vc_add_match_ipv4(struct nx_info *, void __user *);
10847 +extern int vc_get_match_ipv4(struct nx_info *, void __user *);
10849 +extern int vc_add_match_ipv6(struct nx_info *, void __user *);
10850 +extern int vc_get_match_ipv6(struct nx_info *, void __user *);
10852 +extern int vc_get_nflags(struct nx_info *, void __user *);
10853 +extern int vc_set_nflags(struct nx_info *, void __user *);
10855 +extern int vc_get_ncaps(struct nx_info *, void __user *);
10856 +extern int vc_set_ncaps(struct nx_info *, void __user *);
10858 +#endif /* _VSERVER_CONTEXT_CMD_H */
10859 diff -NurpP --minimal linux-4.9.82/include/linux/vserver/percpu.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/percpu.h
10860 --- linux-4.9.82/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000
10861 +++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/percpu.h 2018-01-10 02:50:49.000000000 +0000
10863 +#ifndef _VSERVER_PERCPU_H
10864 +#define _VSERVER_PERCPU_H
10866 +#include "cvirt_def.h"
10867 +#include "sched_def.h"
10869 +struct _vx_percpu {
10870 + struct _vx_cvirt_pc cvirt;
10871 + struct _vx_sched_pc sched;
10874 +#define PERCPU_PERCTX (sizeof(struct _vx_percpu))
10876 +#endif /* _VSERVER_PERCPU_H */
10877 diff -NurpP --minimal linux-4.9.82/include/linux/vserver/pid.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/pid.h
10878 --- linux-4.9.82/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000
10879 +++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/pid.h 2018-01-10 02:50:49.000000000 +0000
10881 +#ifndef _VSERVER_PID_H
10882 +#define _VSERVER_PID_H
10884 +/* pid faking stuff */
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)
10892 +static inline int __vx_info_map_pid(struct vx_info *vxi, int pid,
10893 + const char *func, const char *file, int line)
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);
10903 + if (pid == vxi->vx_initpid)
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)
10914 +static inline int __vx_info_rmap_pid(struct vx_info *vxi, int pid,
10915 + const char *func, const char *file, int line)
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)
10932 diff -NurpP --minimal linux-4.9.82/include/linux/vserver/sched.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/sched.h
10933 --- linux-4.9.82/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000
10934 +++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/sched.h 2018-01-10 02:50:49.000000000 +0000
10936 +#ifndef _VSERVER_SCHED_H
10937 +#define _VSERVER_SCHED_H
10944 +void vx_vsi_uptime(struct timespec *, struct timespec *);
10949 +void vx_update_load(struct vx_info *);
10952 +void vx_update_sched_param(struct _vx_sched *sched,
10953 + struct _vx_sched_pc *sched_pc);
10955 +#endif /* __KERNEL__ */
10956 +#else /* _VSERVER_SCHED_H */
10957 +#warning duplicate inclusion
10958 +#endif /* _VSERVER_SCHED_H */
10959 diff -NurpP --minimal linux-4.9.82/include/linux/vserver/sched_cmd.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/sched_cmd.h
10960 --- linux-4.9.82/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
10961 +++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/sched_cmd.h 2018-01-10 02:50:49.000000000 +0000
10963 +#ifndef _VSERVER_SCHED_CMD_H
10964 +#define _VSERVER_SCHED_CMD_H
10967 +#include <linux/compiler.h>
10968 +#include <uapi/vserver/sched_cmd.h>
10970 +extern int vc_set_prio_bias(struct vx_info *, void __user *);
10971 +extern int vc_get_prio_bias(struct vx_info *, void __user *);
10973 +#endif /* _VSERVER_SCHED_CMD_H */
10974 diff -NurpP --minimal linux-4.9.82/include/linux/vserver/sched_def.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/sched_def.h
10975 --- linux-4.9.82/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000
10976 +++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/sched_def.h 2018-01-10 02:50:49.000000000 +0000
10978 +#ifndef _VSERVER_SCHED_DEF_H
10979 +#define _VSERVER_SCHED_DEF_H
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>
10988 +/* context sub struct */
10990 +struct _vx_sched {
10991 + int prio_bias; /* bias offset for priority */
10993 + cpumask_t update; /* CPUs which should update */
10996 +struct _vx_sched_pc {
10997 + int prio_bias; /* bias offset for priority */
10999 + uint64_t user_ticks; /* token tick events */
11000 + uint64_t sys_ticks; /* token tick events */
11001 + uint64_t hold_ticks; /* token ticks paused */
11005 +#ifdef CONFIG_VSERVER_DEBUG
11007 +static inline void __dump_vx_sched(struct _vx_sched *sched)
11009 + printk("\t_vx_sched:\n");
11010 + printk("\t priority = %4d\n", sched->prio_bias);
11015 +#endif /* _VSERVER_SCHED_DEF_H */
11016 diff -NurpP --minimal linux-4.9.82/include/linux/vserver/signal.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/signal.h
11017 --- linux-4.9.82/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000
11018 +++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/signal.h 2018-01-10 02:50:49.000000000 +0000
11020 +#ifndef _VSERVER_SIGNAL_H
11021 +#define _VSERVER_SIGNAL_H
11028 +int vx_info_kill(struct vx_info *, int, int);
11030 +#endif /* __KERNEL__ */
11031 +#else /* _VSERVER_SIGNAL_H */
11032 +#warning duplicate inclusion
11033 +#endif /* _VSERVER_SIGNAL_H */
11034 diff -NurpP --minimal linux-4.9.82/include/linux/vserver/signal_cmd.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/signal_cmd.h
11035 --- linux-4.9.82/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
11036 +++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/signal_cmd.h 2018-01-10 02:50:49.000000000 +0000
11038 +#ifndef _VSERVER_SIGNAL_CMD_H
11039 +#define _VSERVER_SIGNAL_CMD_H
11041 +#include <uapi/vserver/signal_cmd.h>
11044 +extern int vc_ctx_kill(struct vx_info *, void __user *);
11045 +extern int vc_wait_exit(struct vx_info *, void __user *);
11048 +extern int vc_get_pflags(uint32_t pid, void __user *);
11049 +extern int vc_set_pflags(uint32_t pid, void __user *);
11051 +#endif /* _VSERVER_SIGNAL_CMD_H */
11052 diff -NurpP --minimal linux-4.9.82/include/linux/vserver/space.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/space.h
11053 --- linux-4.9.82/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000
11054 +++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/space.h 2018-01-10 02:50:49.000000000 +0000
11056 +#ifndef _VSERVER_SPACE_H
11057 +#define _VSERVER_SPACE_H
11059 +#include <linux/types.h>
11063 +int vx_set_space(struct vx_info *vxi, unsigned long mask, unsigned index);
11065 +#else /* _VSERVER_SPACE_H */
11066 +#warning duplicate inclusion
11067 +#endif /* _VSERVER_SPACE_H */
11068 diff -NurpP --minimal linux-4.9.82/include/linux/vserver/space_cmd.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/space_cmd.h
11069 --- linux-4.9.82/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
11070 +++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/space_cmd.h 2018-01-10 02:50:49.000000000 +0000
11072 +#ifndef _VSERVER_SPACE_CMD_H
11073 +#define _VSERVER_SPACE_CMD_H
11075 +#include <uapi/vserver/space_cmd.h>
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);
11084 +#endif /* _VSERVER_SPACE_CMD_H */
11085 diff -NurpP --minimal linux-4.9.82/include/linux/vserver/switch.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/switch.h
11086 --- linux-4.9.82/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
11087 +++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/switch.h 2018-01-10 02:50:49.000000000 +0000
11089 +#ifndef _VSERVER_SWITCH_H
11090 +#define _VSERVER_SWITCH_H
11093 +#include <linux/errno.h>
11094 +#include <uapi/vserver/switch.h>
11096 +#endif /* _VSERVER_SWITCH_H */
11097 diff -NurpP --minimal linux-4.9.82/include/linux/vserver/tag.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/tag.h
11098 --- linux-4.9.82/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000
11099 +++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/tag.h 2018-01-10 02:50:49.000000000 +0000
11104 +#include <linux/types.h>
11105 +#include <linux/uidgid.h>
11108 +#define DX_TAG(in) (IS_TAGGED(in))
11111 +#ifdef CONFIG_TAG_NFSD
11112 +#define DX_TAG_NFSD 1
11114 +#define DX_TAG_NFSD 0
11118 +#ifdef CONFIG_TAGGING_NONE
11120 +#define MAX_UID 0xFFFFFFFF
11121 +#define MAX_GID 0xFFFFFFFF
11123 +#define INOTAG_TAG(cond, uid, gid, tag) (0)
11125 +#define TAGINO_UID(cond, uid, tag) (uid)
11126 +#define TAGINO_GID(cond, gid, tag) (gid)
11131 +#ifdef CONFIG_TAGGING_GID16
11133 +#define MAX_UID 0xFFFFFFFF
11134 +#define MAX_GID 0x0000FFFF
11136 +#define INOTAG_TAG(cond, uid, gid, tag) \
11137 + ((cond) ? (((gid) >> 16) & 0xFFFF) : 0)
11139 +#define TAGINO_UID(cond, uid, tag) (uid)
11140 +#define TAGINO_GID(cond, gid, tag) \
11141 + ((cond) ? (((gid) & 0xFFFF) | ((tag) << 16)) : (gid))
11146 +#ifdef CONFIG_TAGGING_ID24
11148 +#define MAX_UID 0x00FFFFFF
11149 +#define MAX_GID 0x00FFFFFF
11151 +#define INOTAG_TAG(cond, uid, gid, tag) \
11152 + ((cond) ? ((((uid) >> 16) & 0xFF00) | (((gid) >> 24) & 0xFF)) : 0)
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))
11162 +#ifdef CONFIG_TAGGING_UID16
11164 +#define MAX_UID 0x0000FFFF
11165 +#define MAX_GID 0xFFFFFFFF
11167 +#define INOTAG_TAG(cond, uid, gid, tag) \
11168 + ((cond) ? (((uid) >> 16) & 0xFFFF) : 0)
11170 +#define TAGINO_UID(cond, uid, tag) \
11171 + ((cond) ? (((uid) & 0xFFFF) | ((tag) << 16)) : (uid))
11172 +#define TAGINO_GID(cond, gid, tag) (gid)
11177 +#ifdef CONFIG_TAGGING_INTERN
11179 +#define MAX_UID 0xFFFFFFFF
11180 +#define MAX_GID 0xFFFFFFFF
11182 +#define INOTAG_TAG(cond, uid, gid, tag) \
11183 + ((cond) ? (tag) : 0)
11185 +#define TAGINO_UID(cond, uid, tag) (uid)
11186 +#define TAGINO_GID(cond, gid, tag) (gid)
11191 +#ifndef CONFIG_TAGGING_NONE
11192 +#define dx_current_fstag(sb) \
11193 + ((sb)->s_flags & MS_TAGGED ? dx_current_tag() : 0)
11195 +#define dx_current_fstag(sb) (0)
11198 +#ifndef CONFIG_TAGGING_INTERN
11199 +#define TAGINO_TAG(cond, tag) (0)
11201 +#define TAGINO_TAG(cond, tag) ((cond) ? (tag) : 0)
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)))
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))
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)))
11226 +static inline uid_t dx_map_uid(uid_t uid)
11228 + if ((uid > MAX_UID) && (uid != -1))
11230 + return (uid & MAX_UID);
11233 +static inline gid_t dx_map_gid(gid_t gid)
11235 + if ((gid > MAX_GID) && (gid != -1))
11237 + return (gid & MAX_GID);
11245 +#define dx_notagcheck(sb) ((sb) && ((sb)->s_flags & MS_NOTAGCHECK))
11247 +int dx_parse_tag(char *string, vtag_t *tag, int remove, int *mnt_flags,
11248 + unsigned long *flags);
11250 +#ifdef CONFIG_PROPAGATE
11252 +void __dx_propagate_tag(struct nameidata *nd, struct inode *inode);
11254 +#define dx_propagate_tag(n, i) __dx_propagate_tag(n, i)
11257 +#define dx_propagate_tag(n, i) do { } while (0)
11260 +#endif /* _DX_TAG_H */
11261 diff -NurpP --minimal linux-4.9.82/include/linux/vserver/tag_cmd.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/tag_cmd.h
11262 --- linux-4.9.82/include/linux/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
11263 +++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/tag_cmd.h 2018-01-10 02:50:49.000000000 +0000
11265 +#ifndef _VSERVER_TAG_CMD_H
11266 +#define _VSERVER_TAG_CMD_H
11268 +#include <uapi/vserver/tag_cmd.h>
11270 +extern int vc_task_tag(uint32_t);
11272 +extern int vc_tag_migrate(uint32_t);
11274 +#endif /* _VSERVER_TAG_CMD_H */
11275 diff -NurpP --minimal linux-4.9.82/include/net/addrconf.h linux-4.9.82-vs2.3.9.7/include/net/addrconf.h
11276 --- linux-4.9.82/include/net/addrconf.h 2018-02-22 21:18:55.000000000 +0000
11277 +++ linux-4.9.82-vs2.3.9.7/include/net/addrconf.h 2018-01-10 02:50:49.000000000 +0000
11278 @@ -85,7 +85,7 @@ struct inet6_ifaddr *ipv6_get_ifaddr(str
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,
11286 int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr,
11287 diff -NurpP --minimal linux-4.9.82/include/net/af_unix.h linux-4.9.82-vs2.3.9.7/include/net/af_unix.h
11288 --- linux-4.9.82/include/net/af_unix.h 2016-12-11 19:17:54.000000000 +0000
11289 +++ linux-4.9.82-vs2.3.9.7/include/net/af_unix.h 2018-01-10 02:50:49.000000000 +0000
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>
11297 void unix_inflight(struct user_struct *user, struct file *fp);
11298 diff -NurpP --minimal linux-4.9.82/include/net/inet_timewait_sock.h linux-4.9.82-vs2.3.9.7/include/net/inet_timewait_sock.h
11299 --- linux-4.9.82/include/net/inet_timewait_sock.h 2016-12-11 19:17:54.000000000 +0000
11300 +++ linux-4.9.82-vs2.3.9.7/include/net/inet_timewait_sock.h 2018-01-10 02:50:49.000000000 +0000
11301 @@ -71,6 +71,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
11311 volatile unsigned char tw_substate;
11312 diff -NurpP --minimal linux-4.9.82/include/net/ip6_route.h linux-4.9.82-vs2.3.9.7/include/net/ip6_route.h
11313 --- linux-4.9.82/include/net/ip6_route.h 2018-02-22 21:18:55.000000000 +0000
11314 +++ linux-4.9.82-vs2.3.9.7/include/net/ip6_route.h 2018-01-13 06:10:51.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>
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)
11331 struct inet6_dev *idev =
11332 rt ? ip6_dst_idev((struct dst_entry *)rt) : NULL;
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;
11340 err = ipv6_dev_get_saddr(net, idev ? idev->dev : NULL,
11341 - daddr, prefs, saddr);
11342 + daddr, prefs, saddr, nxi);
11346 diff -NurpP --minimal linux-4.9.82/include/net/route.h linux-4.9.82-vs2.3.9.7/include/net/route.h
11347 --- linux-4.9.82/include/net/route.h 2016-12-11 19:17:54.000000000 +0000
11348 +++ linux-4.9.82-vs2.3.9.7/include/net/route.h 2018-01-10 07:57:27.000000000 +0000
11349 @@ -225,6 +225,9 @@ static inline void ip_rt_put(struct rtab
11350 dst_release(&rt->dst);
11353 +#include <linux/vs_base.h>
11354 +#include <linux/vs_inet.h>
11356 #define IPTOS_RT_MASK (IPTOS_TOS_MASK & ~3)
11358 extern const __u8 ip_tos2prio[16];
11359 @@ -272,6 +275,9 @@ static inline void ip_route_connect_init
11360 protocol, flow_flags, dst, src, dport, sport);
11363 +extern struct rtable *ip_v4_find_src(struct net *net, struct nx_info *,
11364 + struct flowi4 *);
11366 static inline struct rtable *ip_route_connect(struct flowi4 *fl4,
11367 __be32 dst, __be32 src, u32 tos,
11368 int oif, u8 protocol,
11369 @@ -280,11 +286,25 @@ static inline struct rtable *ip_route_co
11371 struct net *net = sock_net(sk);
11373 + struct nx_info *nx_info = current_nx_info();
11375 ip_route_connect_init(fl4, dst, src, tos, oif, protocol,
11378 - if (!dst || !src) {
11380 + nx_info = sk->sk_nx_info;
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));
11387 + rt = ip_v4_find_src(net, nx_info, fl4);
11392 + if (!fl4->daddr || !fl4->saddr) {
11393 rt = __ip_route_output_key(net, fl4);
11396 diff -NurpP --minimal linux-4.9.82/include/net/sock.h linux-4.9.82-vs2.3.9.7/include/net/sock.h
11397 --- linux-4.9.82/include/net/sock.h 2018-02-22 21:18:55.000000000 +0000
11398 +++ linux-4.9.82-vs2.3.9.7/include/net/sock.h 2018-01-10 02:50:49.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;
11404 + struct vx_info *skc_vx_info;
11406 + struct nx_info *skc_nx_info;
11408 atomic64_t skc_cookie;
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.82/include/uapi/Kbuild linux-4.9.82-vs2.3.9.7/include/uapi/Kbuild
11425 --- linux-4.9.82/include/uapi/Kbuild 2016-12-11 19:17:54.000000000 +0000
11426 +++ linux-4.9.82-vs2.3.9.7/include/uapi/Kbuild 2018-01-10 02:50:49.000000000 +0000
11427 @@ -13,3 +13,4 @@ header-y += drm/
11431 +header-y += vserver/
11432 diff -NurpP --minimal linux-4.9.82/include/uapi/linux/btrfs_tree.h linux-4.9.82-vs2.3.9.7/include/uapi/linux/btrfs_tree.h
11433 --- linux-4.9.82/include/uapi/linux/btrfs_tree.h 2016-12-11 19:17:54.000000000 +0000
11434 +++ linux-4.9.82-vs2.3.9.7/include/uapi/linux/btrfs_tree.h 2018-01-13 01:45:34.000000000 +0000
11435 @@ -563,11 +563,14 @@ struct btrfs_inode_item {
11436 /* modification sequence number for NFS */
11441 * a little future expansion, for more than this we can
11442 * just grow the inode item and version it
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.82/include/uapi/linux/capability.h linux-4.9.82-vs2.3.9.7/include/uapi/linux/capability.h
11452 --- linux-4.9.82/include/uapi/linux/capability.h 2016-12-11 19:17:54.000000000 +0000
11453 +++ linux-4.9.82-vs2.3.9.7/include/uapi/linux/capability.h 2018-01-10 02:50:49.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 */
11460 #define CAP_SYS_ADMIN 21
11462 @@ -352,7 +353,12 @@ struct vfs_cap_data {
11464 #define CAP_LAST_CAP CAP_AUDIT_READ
11466 -#define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP)
11467 +/* Allow context manipulations */
11468 +/* Allow changing context info on files */
11470 +#define CAP_CONTEXT 63
11472 +#define cap_valid(x) ((x) >= 0 && ((x) <= CAP_LAST_CAP || (x) == CAP_CONTEXT))
11475 * Bit location of each capability (used by user-space library and kernel)
11476 diff -NurpP --minimal linux-4.9.82/include/uapi/linux/fs.h linux-4.9.82-vs2.3.9.7/include/uapi/linux/fs.h
11477 --- linux-4.9.82/include/uapi/linux/fs.h 2018-02-22 21:18:55.000000000 +0000
11478 +++ linux-4.9.82-vs2.3.9.7/include/uapi/linux/fs.h 2018-01-10 08:09:10.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 */
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 */
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 */
11503 +#define FS_FL_USER_VISIBLE 0x0103DFFF /* User visible flags */
11504 +#define FS_FL_USER_MODIFIABLE 0x010380FF /* User modifiable flags */
11506 #define SYNC_FILE_RANGE_WAIT_BEFORE 1
11507 #define SYNC_FILE_RANGE_WRITE 2
11508 diff -NurpP --minimal linux-4.9.82/include/uapi/linux/gfs2_ondisk.h linux-4.9.82-vs2.3.9.7/include/uapi/linux/gfs2_ondisk.h
11509 --- linux-4.9.82/include/uapi/linux/gfs2_ondisk.h 2016-12-11 19:17:54.000000000 +0000
11510 +++ linux-4.9.82-vs2.3.9.7/include/uapi/linux/gfs2_ondisk.h 2018-01-10 02:50:49.000000000 +0000
11511 @@ -225,6 +225,9 @@ enum {
11514 gfs2fl_TopLevel = 10,
11515 + gfs2fl_IXUnlink = 16,
11516 + gfs2fl_Barrier = 17,
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.82/include/uapi/linux/if_tun.h linux-4.9.82-vs2.3.9.7/include/uapi/linux/if_tun.h
11532 --- linux-4.9.82/include/uapi/linux/if_tun.h 2016-12-11 19:17:54.000000000 +0000
11533 +++ linux-4.9.82-vs2.3.9.7/include/uapi/linux/if_tun.h 2018-01-10 02:50:49.000000000 +0000
11536 #define TUNSETVNETBE _IOW('T', 222, int)
11537 #define TUNGETVNETBE _IOR('T', 223, int)
11538 +#define TUNSETNID _IOW('T', 224, int)
11540 /* TUNSETIFF ifr flags */
11541 #define IFF_TUN 0x0001
11542 diff -NurpP --minimal linux-4.9.82/include/uapi/linux/major.h linux-4.9.82-vs2.3.9.7/include/uapi/linux/major.h
11543 --- linux-4.9.82/include/uapi/linux/major.h 2016-12-11 19:17:54.000000000 +0000
11544 +++ linux-4.9.82-vs2.3.9.7/include/uapi/linux/major.h 2018-01-10 02:50:49.000000000 +0000
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
11552 #define VCS_MAJOR 7
11553 diff -NurpP --minimal linux-4.9.82/include/uapi/linux/nfs_mount.h linux-4.9.82-vs2.3.9.7/include/uapi/linux/nfs_mount.h
11554 --- linux-4.9.82/include/uapi/linux/nfs_mount.h 2016-12-11 19:17:54.000000000 +0000
11555 +++ linux-4.9.82-vs2.3.9.7/include/uapi/linux/nfs_mount.h 2018-01-10 02:50:49.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
11564 /* The following are for internal use only */
11565 #define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000
11566 diff -NurpP --minimal linux-4.9.82/include/uapi/linux/reboot.h linux-4.9.82-vs2.3.9.7/include/uapi/linux/reboot.h
11567 --- linux-4.9.82/include/uapi/linux/reboot.h 2016-12-11 19:17:54.000000000 +0000
11568 +++ linux-4.9.82-vs2.3.9.7/include/uapi/linux/reboot.h 2018-01-10 02:50:49.000000000 +0000
11570 #define LINUX_REBOOT_CMD_RESTART2 0xA1B2C3D4
11571 #define LINUX_REBOOT_CMD_SW_SUSPEND 0xD000FCE2
11572 #define LINUX_REBOOT_CMD_KEXEC 0x45584543
11574 +#define LINUX_REBOOT_CMD_OOM 0xDEADBEEF
11577 #endif /* _UAPI_LINUX_REBOOT_H */
11578 diff -NurpP --minimal linux-4.9.82/include/uapi/linux/sysctl.h linux-4.9.82-vs2.3.9.7/include/uapi/linux/sysctl.h
11579 --- linux-4.9.82/include/uapi/linux/sysctl.h 2016-12-11 19:17:54.000000000 +0000
11580 +++ linux-4.9.82-vs2.3.9.7/include/uapi/linux/sysctl.h 2018-01-10 02:50:49.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
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 */
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.82/include/uapi/vserver/Kbuild linux-4.9.82-vs2.3.9.7/include/uapi/vserver/Kbuild
11598 --- linux-4.9.82/include/uapi/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000
11599 +++ linux-4.9.82-vs2.3.9.7/include/uapi/vserver/Kbuild 2018-01-10 02:50:49.000000000 +0000
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
11607 +header-y += switch.h context.h network.h monitor.h \
11608 + limit.h inode.h device.h
11610 diff -NurpP --minimal linux-4.9.82/include/uapi/vserver/cacct_cmd.h linux-4.9.82-vs2.3.9.7/include/uapi/vserver/cacct_cmd.h
11611 --- linux-4.9.82/include/uapi/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
11612 +++ linux-4.9.82-vs2.3.9.7/include/uapi/vserver/cacct_cmd.h 2018-01-10 02:50:49.000000000 +0000
11614 +#ifndef _UAPI_VS_CACCT_CMD_H
11615 +#define _UAPI_VS_CACCT_CMD_H
11618 +/* virtual host info name commands */
11620 +#define VCMD_sock_stat VC_CMD(VSTAT, 5, 0)
11622 +struct vcmd_sock_stat_v0 {
11624 + uint32_t count[3];
11625 + uint64_t total[3];
11628 +#endif /* _UAPI_VS_CACCT_CMD_H */
11629 diff -NurpP --minimal linux-4.9.82/include/uapi/vserver/context.h linux-4.9.82-vs2.3.9.7/include/uapi/vserver/context.h
11630 --- linux-4.9.82/include/uapi/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
11631 +++ linux-4.9.82-vs2.3.9.7/include/uapi/vserver/context.h 2018-01-10 02:50:49.000000000 +0000
11633 +#ifndef _UAPI_VS_CONTEXT_H
11634 +#define _UAPI_VS_CONTEXT_H
11636 +#include <linux/types.h>
11637 +#include <linux/capability.h>
11640 +/* context flags */
11642 +#define VXF_INFO_SCHED 0x00000002
11643 +#define VXF_INFO_NPROC 0x00000004
11644 +#define VXF_INFO_PRIVATE 0x00000008
11646 +#define VXF_INFO_INIT 0x00000010
11647 +#define VXF_INFO_HIDE 0x00000020
11648 +#define VXF_INFO_ULIMIT 0x00000040
11649 +#define VXF_INFO_NSPACE 0x00000080
11651 +#define VXF_SCHED_HARD 0x00000100
11652 +#define VXF_SCHED_PRIO 0x00000200
11653 +#define VXF_SCHED_PAUSE 0x00000400
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
11661 +#define VXF_HIDE_MOUNT 0x01000000
11662 +/* was VXF_HIDE_NETIF 0x02000000 */
11663 +#define VXF_HIDE_VINFO 0x04000000
11665 +#define VXF_STATE_SETUP (1ULL << 32)
11666 +#define VXF_STATE_INIT (1ULL << 33)
11667 +#define VXF_STATE_ADMIN (1ULL << 34)
11669 +#define VXF_SC_HELPER (1ULL << 36)
11670 +#define VXF_REBOOT_KILL (1ULL << 37)
11671 +#define VXF_PERSISTENT (1ULL << 38)
11673 +#define VXF_FORK_RSS (1ULL << 48)
11674 +#define VXF_PROLIFIC (1ULL << 49)
11676 +#define VXF_IGNEG_NICE (1ULL << 52)
11678 +#define VXF_ONE_TIME (0x0007ULL << 32)
11680 +#define VXF_INIT_SET (VXF_STATE_SETUP | VXF_STATE_INIT | VXF_STATE_ADMIN)
11683 +/* context migration */
11685 +#define VXM_SET_INIT 0x00000001
11686 +#define VXM_SET_REAPER 0x00000002
11688 +/* context caps */
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
11696 +/* was VXC_RAW_ICMP 0x00000100 */
11697 +#define VXC_SYSLOG 0x00001000
11698 +#define VXC_OOM_ADJUST 0x00002000
11699 +#define VXC_AUDIT_CONTROL 0x00004000
11701 +#define VXC_SECURE_MOUNT 0x00010000
11702 +/* #define VXC_SECURE_REMOUNT 0x00020000 */
11703 +#define VXC_BINARY_MOUNT 0x00040000
11704 +#define VXC_DEV_MOUNT 0x00080000
11706 +#define VXC_QUOTA_CTL 0x00100000
11707 +#define VXC_ADMIN_MAPPER 0x00200000
11708 +#define VXC_ADMIN_CLOOP 0x00400000
11710 +#define VXC_KTHREAD 0x01000000
11711 +#define VXC_NAMESPACE 0x02000000
11713 +#endif /* _UAPI_VS_CONTEXT_H */
11714 diff -NurpP --minimal linux-4.9.82/include/uapi/vserver/context_cmd.h linux-4.9.82-vs2.3.9.7/include/uapi/vserver/context_cmd.h
11715 --- linux-4.9.82/include/uapi/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
11716 +++ linux-4.9.82-vs2.3.9.7/include/uapi/vserver/context_cmd.h 2018-01-10 02:50:49.000000000 +0000
11718 +#ifndef _UAPI_VS_CONTEXT_CMD_H
11719 +#define _UAPI_VS_CONTEXT_CMD_H
11722 +/* vinfo commands */
11724 +#define VCMD_task_xid VC_CMD(VINFO, 1, 0)
11727 +#define VCMD_vx_info VC_CMD(VINFO, 5, 0)
11729 +struct vcmd_vx_info_v0 {
11731 + uint32_t initpid;
11732 + /* more to come */
11736 +#define VCMD_ctx_stat VC_CMD(VSTAT, 0, 0)
11738 +struct vcmd_ctx_stat_v0 {
11741 + /* more to come */
11745 +/* context commands */
11747 +#define VCMD_ctx_create_v0 VC_CMD(VPROC, 1, 0)
11748 +#define VCMD_ctx_create VC_CMD(VPROC, 1, 1)
11750 +struct vcmd_ctx_create {
11751 + uint64_t flagword;
11754 +#define VCMD_ctx_migrate_v0 VC_CMD(PROCMIG, 1, 0)
11755 +#define VCMD_ctx_migrate VC_CMD(PROCMIG, 1, 1)
11757 +struct vcmd_ctx_migrate {
11758 + uint64_t flagword;
11763 +/* flag commands */
11765 +#define VCMD_get_cflags VC_CMD(FLAGS, 1, 0)
11766 +#define VCMD_set_cflags VC_CMD(FLAGS, 2, 0)
11768 +struct vcmd_ctx_flags_v0 {
11769 + uint64_t flagword;
11775 +/* context caps commands */
11777 +#define VCMD_get_ccaps VC_CMD(FLAGS, 3, 1)
11778 +#define VCMD_set_ccaps VC_CMD(FLAGS, 4, 1)
11780 +struct vcmd_ctx_caps_v1 {
11787 +/* bcaps commands */
11789 +#define VCMD_get_bcaps VC_CMD(FLAGS, 9, 0)
11790 +#define VCMD_set_bcaps VC_CMD(FLAGS, 10, 0)
11792 +struct vcmd_bcaps {
11799 +/* umask commands */
11801 +#define VCMD_get_umask VC_CMD(FLAGS, 13, 0)
11802 +#define VCMD_set_umask VC_CMD(FLAGS, 14, 0)
11804 +struct vcmd_umask {
11811 +/* wmask commands */
11813 +#define VCMD_get_wmask VC_CMD(FLAGS, 15, 0)
11814 +#define VCMD_set_wmask VC_CMD(FLAGS, 16, 0)
11816 +struct vcmd_wmask {
11825 +#define VCMD_get_badness VC_CMD(MEMCTRL, 5, 0)
11826 +#define VCMD_set_badness VC_CMD(MEMCTRL, 6, 0)
11828 +struct vcmd_badness_v0 {
11832 +#endif /* _UAPI_VS_CONTEXT_CMD_H */
11833 diff -NurpP --minimal linux-4.9.82/include/uapi/vserver/cvirt_cmd.h linux-4.9.82-vs2.3.9.7/include/uapi/vserver/cvirt_cmd.h
11834 --- linux-4.9.82/include/uapi/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
11835 +++ linux-4.9.82-vs2.3.9.7/include/uapi/vserver/cvirt_cmd.h 2018-01-10 02:50:49.000000000 +0000
11837 +#ifndef _UAPI_VS_CVIRT_CMD_H
11838 +#define _UAPI_VS_CVIRT_CMD_H
11841 +/* virtual host info name commands */
11843 +#define VCMD_set_vhi_name VC_CMD(VHOST, 1, 0)
11844 +#define VCMD_get_vhi_name VC_CMD(VHOST, 2, 0)
11846 +struct vcmd_vhi_name_v0 {
11852 +enum vhi_name_field {
11853 + VHIN_CONTEXT = 0,
11864 +#define VCMD_virt_stat VC_CMD(VSTAT, 3, 0)
11866 +struct vcmd_virt_stat_v0 {
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];
11877 +#endif /* _UAPI_VS_CVIRT_CMD_H */
11878 diff -NurpP --minimal linux-4.9.82/include/uapi/vserver/debug_cmd.h linux-4.9.82-vs2.3.9.7/include/uapi/vserver/debug_cmd.h
11879 --- linux-4.9.82/include/uapi/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
11880 +++ linux-4.9.82-vs2.3.9.7/include/uapi/vserver/debug_cmd.h 2018-01-10 02:50:49.000000000 +0000
11882 +#ifndef _UAPI_VS_DEBUG_CMD_H
11883 +#define _UAPI_VS_DEBUG_CMD_H
11886 +/* debug commands */
11888 +#define VCMD_dump_history VC_CMD(DEBUG, 1, 0)
11890 +#define VCMD_read_history VC_CMD(DEBUG, 5, 0)
11891 +#define VCMD_read_monitor VC_CMD(DEBUG, 6, 0)
11893 +struct vcmd_read_history_v0 {
11896 + char __user *data;
11899 +struct vcmd_read_monitor_v0 {
11902 + char __user *data;
11905 +#endif /* _UAPI_VS_DEBUG_CMD_H */
11906 diff -NurpP --minimal linux-4.9.82/include/uapi/vserver/device.h linux-4.9.82-vs2.3.9.7/include/uapi/vserver/device.h
11907 --- linux-4.9.82/include/uapi/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
11908 +++ linux-4.9.82-vs2.3.9.7/include/uapi/vserver/device.h 2018-01-10 02:50:49.000000000 +0000
11910 +#ifndef _UAPI_VS_DEVICE_H
11911 +#define _UAPI_VS_DEVICE_H
11914 +#define DATTR_CREATE 0x00000001
11915 +#define DATTR_OPEN 0x00000002
11917 +#define DATTR_REMAP 0x00000010
11919 +#define DATTR_MASK 0x00000013
11921 +#endif /* _UAPI_VS_DEVICE_H */
11922 diff -NurpP --minimal linux-4.9.82/include/uapi/vserver/device_cmd.h linux-4.9.82-vs2.3.9.7/include/uapi/vserver/device_cmd.h
11923 --- linux-4.9.82/include/uapi/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
11924 +++ linux-4.9.82-vs2.3.9.7/include/uapi/vserver/device_cmd.h 2018-01-10 02:50:49.000000000 +0000
11926 +#ifndef _UAPI_VS_DEVICE_CMD_H
11927 +#define _UAPI_VS_DEVICE_CMD_H
11930 +/* device vserver commands */
11932 +#define VCMD_set_mapping VC_CMD(DEVICE, 1, 0)
11933 +#define VCMD_unset_mapping VC_CMD(DEVICE, 2, 0)
11935 +struct vcmd_set_mapping_v0 {
11936 + const char __user *device;
11937 + const char __user *target;
11941 +#endif /* _UAPI_VS_DEVICE_CMD_H */
11942 diff -NurpP --minimal linux-4.9.82/include/uapi/vserver/dlimit_cmd.h linux-4.9.82-vs2.3.9.7/include/uapi/vserver/dlimit_cmd.h
11943 --- linux-4.9.82/include/uapi/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
11944 +++ linux-4.9.82-vs2.3.9.7/include/uapi/vserver/dlimit_cmd.h 2018-01-10 02:50:49.000000000 +0000
11946 +#ifndef _UAPI_VS_DLIMIT_CMD_H
11947 +#define _UAPI_VS_DLIMIT_CMD_H
11950 +/* dlimit vserver commands */
11952 +#define VCMD_add_dlimit VC_CMD(DLIMIT, 1, 0)
11953 +#define VCMD_rem_dlimit VC_CMD(DLIMIT, 2, 0)
11955 +#define VCMD_set_dlimit VC_CMD(DLIMIT, 5, 0)
11956 +#define VCMD_get_dlimit VC_CMD(DLIMIT, 6, 0)
11958 +struct vcmd_ctx_dlimit_base_v0 {
11959 + const char __user *name;
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 % */
11973 +#define CDLIM_UNSET ((uint32_t)0UL)
11974 +#define CDLIM_INFINITY ((uint32_t)~0UL)
11975 +#define CDLIM_KEEP ((uint32_t)~1UL)
11977 +#define DLIME_UNIT 0
11978 +#define DLIME_KILO 1
11979 +#define DLIME_MEGA 2
11980 +#define DLIME_GIGA 3
11982 +#define DLIMF_SHIFT 0x10
11984 +#define DLIMS_USED 0
11985 +#define DLIMS_TOTAL 2
11988 +uint64_t dlimit_space_32to64(uint32_t val, uint32_t flags, int shift)
11990 + int exp = (flags & DLIMF_SHIFT) ?
11991 + (flags >> shift) & DLIME_GIGA : DLIME_KILO;
11992 + return ((uint64_t)val) << (10 * exp);
11996 +uint32_t dlimit_space_64to32(uint64_t val, uint32_t *flags, int shift)
12000 + if (*flags & DLIMF_SHIFT) {
12001 + while (val > (1LL << 32) && (exp < 3)) {
12005 + *flags &= ~(DLIME_GIGA << shift);
12006 + *flags |= exp << shift;
12012 +#endif /* _UAPI_VS_DLIMIT_CMD_H */
12013 diff -NurpP --minimal linux-4.9.82/include/uapi/vserver/inode.h linux-4.9.82-vs2.3.9.7/include/uapi/vserver/inode.h
12014 --- linux-4.9.82/include/uapi/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
12015 +++ linux-4.9.82-vs2.3.9.7/include/uapi/vserver/inode.h 2018-01-10 02:50:49.000000000 +0000
12017 +#ifndef _UAPI_VS_INODE_H
12018 +#define _UAPI_VS_INODE_H
12021 +#define IATTR_TAG 0x01000000
12023 +#define IATTR_ADMIN 0x00000001
12024 +#define IATTR_WATCH 0x00000002
12025 +#define IATTR_HIDE 0x00000004
12026 +#define IATTR_FLAGS 0x00000007
12028 +#define IATTR_BARRIER 0x00010000
12029 +#define IATTR_IXUNLINK 0x00020000
12030 +#define IATTR_IMMUTABLE 0x00040000
12031 +#define IATTR_COW 0x00080000
12034 +/* inode ioctls */
12036 +#define FIOC_GETXFLG _IOR('x', 5, long)
12037 +#define FIOC_SETXFLG _IOW('x', 6, long)
12039 +#endif /* _UAPI_VS_INODE_H */
12040 diff -NurpP --minimal linux-4.9.82/include/uapi/vserver/inode_cmd.h linux-4.9.82-vs2.3.9.7/include/uapi/vserver/inode_cmd.h
12041 --- linux-4.9.82/include/uapi/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
12042 +++ linux-4.9.82-vs2.3.9.7/include/uapi/vserver/inode_cmd.h 2018-01-10 02:50:49.000000000 +0000
12044 +#ifndef _UAPI_VS_INODE_CMD_H
12045 +#define _UAPI_VS_INODE_CMD_H
12048 +/* inode vserver commands */
12050 +#define VCMD_get_iattr VC_CMD(INODE, 1, 1)
12051 +#define VCMD_set_iattr VC_CMD(INODE, 2, 1)
12053 +#define VCMD_fget_iattr VC_CMD(INODE, 3, 0)
12054 +#define VCMD_fset_iattr VC_CMD(INODE, 4, 0)
12056 +struct vcmd_ctx_iattr_v1 {
12057 + const char __user *name;
12063 +struct vcmd_ctx_fiattr_v0 {
12069 +#endif /* _UAPI_VS_INODE_CMD_H */
12070 diff -NurpP --minimal linux-4.9.82/include/uapi/vserver/limit.h linux-4.9.82-vs2.3.9.7/include/uapi/vserver/limit.h
12071 --- linux-4.9.82/include/uapi/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
12072 +++ linux-4.9.82-vs2.3.9.7/include/uapi/vserver/limit.h 2018-01-10 02:50:49.000000000 +0000
12074 +#ifndef _UAPI_VS_LIMIT_H
12075 +#define _UAPI_VS_LIMIT_H
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
12087 +#endif /* _UAPI_VS_LIMIT_H */
12088 diff -NurpP --minimal linux-4.9.82/include/uapi/vserver/limit_cmd.h linux-4.9.82-vs2.3.9.7/include/uapi/vserver/limit_cmd.h
12089 --- linux-4.9.82/include/uapi/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
12090 +++ linux-4.9.82-vs2.3.9.7/include/uapi/vserver/limit_cmd.h 2018-01-10 02:50:49.000000000 +0000
12092 +#ifndef _UAPI_VS_LIMIT_CMD_H
12093 +#define _UAPI_VS_LIMIT_CMD_H
12096 +/* rlimit vserver commands */
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)
12104 +struct vcmd_ctx_rlimit_v0 {
12106 + uint64_t minimum;
12107 + uint64_t softlimit;
12108 + uint64_t maximum;
12111 +struct vcmd_ctx_rlimit_mask_v0 {
12112 + uint32_t minimum;
12113 + uint32_t softlimit;
12114 + uint32_t maximum;
12117 +#define VCMD_rlimit_stat VC_CMD(VSTAT, 1, 0)
12119 +struct vcmd_rlimit_stat_v0 {
12123 + uint64_t minimum;
12124 + uint64_t maximum;
12127 +#define CRLIM_UNSET (0ULL)
12128 +#define CRLIM_INFINITY (~0ULL)
12129 +#define CRLIM_KEEP (~1ULL)
12131 +#endif /* _UAPI_VS_LIMIT_CMD_H */
12132 diff -NurpP --minimal linux-4.9.82/include/uapi/vserver/monitor.h linux-4.9.82-vs2.3.9.7/include/uapi/vserver/monitor.h
12133 --- linux-4.9.82/include/uapi/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
12134 +++ linux-4.9.82-vs2.3.9.7/include/uapi/vserver/monitor.h 2018-01-10 02:50:49.000000000 +0000
12136 +#ifndef _UAPI_VS_MONITOR_H
12137 +#define _UAPI_VS_MONITOR_H
12139 +#include <linux/types.h>
12147 + VXM_UPDATE = 0x20,
12151 + VXM_RQINFO_1 = 0x24,
12154 + VXM_ACTIVATE = 0x40,
12161 + VXM_MIGRATE = 0x48,
12164 + /* all other bits are flags */
12165 + VXM_SCHED = 0x80,
12168 +struct _vxm_update_1 {
12169 + uint32_t tokens_max;
12170 + uint32_t fill_rate;
12171 + uint32_t interval;
12174 +struct _vxm_update_2 {
12175 + uint32_t tokens_min;
12176 + uint32_t fill_rate;
12177 + uint32_t interval;
12180 +struct _vxm_rqinfo_1 {
12181 + uint16_t running;
12185 + uint32_t idle_tokens;
12188 +struct _vxm_rqinfo_2 {
12189 + uint32_t norm_time;
12190 + uint32_t idle_time;
12191 + uint32_t idle_skip;
12194 +struct _vxm_sched {
12196 + uint32_t norm_time;
12197 + uint32_t idle_time;
12200 +struct _vxm_task {
12205 +struct _vxm_event {
12214 + struct _vxm_task tsk;
12218 +struct _vx_mon_entry {
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;
12231 +#endif /* _UAPI_VS_MONITOR_H */
12232 diff -NurpP --minimal linux-4.9.82/include/uapi/vserver/network.h linux-4.9.82-vs2.3.9.7/include/uapi/vserver/network.h
12233 --- linux-4.9.82/include/uapi/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
12234 +++ linux-4.9.82-vs2.3.9.7/include/uapi/vserver/network.h 2018-01-10 02:50:49.000000000 +0000
12236 +#ifndef _UAPI_VS_NETWORK_H
12237 +#define _UAPI_VS_NETWORK_H
12239 +#include <linux/types.h>
12242 +#define MAX_N_CONTEXT 65535 /* Arbitrary limit */
12245 +/* network flags */
12247 +#define NXF_INFO_PRIVATE 0x00000008
12249 +#define NXF_SINGLE_IP 0x00000100
12250 +#define NXF_LBACK_REMAP 0x00000200
12251 +#define NXF_LBACK_ALLOW 0x00000400
12253 +#define NXF_HIDE_NETIF 0x02000000
12254 +#define NXF_HIDE_LBACK 0x04000000
12256 +#define NXF_STATE_SETUP (1ULL << 32)
12257 +#define NXF_STATE_ADMIN (1ULL << 34)
12259 +#define NXF_SC_HELPER (1ULL << 36)
12260 +#define NXF_PERSISTENT (1ULL << 38)
12262 +#define NXF_ONE_TIME (0x0005ULL << 32)
12265 +#define NXF_INIT_SET (__nxf_init_set())
12267 +static inline uint64_t __nxf_init_set(void) {
12268 + return NXF_STATE_ADMIN
12269 +#ifdef CONFIG_VSERVER_AUTO_LBACK
12270 + | NXF_LBACK_REMAP
12273 +#ifdef CONFIG_VSERVER_AUTO_SINGLE
12276 + | NXF_HIDE_NETIF;
12280 +/* network caps */
12282 +#define NXC_TUN_CREATE 0x00000001
12284 +#define NXC_RAW_ICMP 0x00000100
12286 +#define NXC_MULTICAST 0x00001000
12289 +/* address types */
12291 +#define NXA_TYPE_IPV4 0x0001
12292 +#define NXA_TYPE_IPV6 0x0002
12294 +#define NXA_TYPE_NONE 0x0000
12295 +#define NXA_TYPE_ANY 0x00FF
12297 +#define NXA_TYPE_ADDR 0x0010
12298 +#define NXA_TYPE_MASK 0x0020
12299 +#define NXA_TYPE_RANGE 0x0040
12301 +#define NXA_MASK_ALL (NXA_TYPE_ADDR | NXA_TYPE_MASK | NXA_TYPE_RANGE)
12303 +#define NXA_MOD_BCAST 0x0100
12304 +#define NXA_MOD_LBACK 0x0200
12306 +#define NXA_LOOPBACK 0x1000
12308 +#define NXA_MASK_BIND (NXA_MASK_ALL | NXA_MOD_BCAST | NXA_MOD_LBACK)
12309 +#define NXA_MASK_SHOW (NXA_MASK_ALL | NXA_LOOPBACK)
12311 +#endif /* _UAPI_VS_NETWORK_H */
12312 diff -NurpP --minimal linux-4.9.82/include/uapi/vserver/network_cmd.h linux-4.9.82-vs2.3.9.7/include/uapi/vserver/network_cmd.h
12313 --- linux-4.9.82/include/uapi/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
12314 +++ linux-4.9.82-vs2.3.9.7/include/uapi/vserver/network_cmd.h 2018-01-10 02:50:49.000000000 +0000
12316 +#ifndef _UAPI_VS_NETWORK_CMD_H
12317 +#define _UAPI_VS_NETWORK_CMD_H
12320 +/* vinfo commands */
12322 +#define VCMD_task_nid VC_CMD(VINFO, 2, 0)
12325 +#define VCMD_nx_info VC_CMD(VINFO, 6, 0)
12327 +struct vcmd_nx_info_v0 {
12329 + /* more to come */
12333 +#include <linux/in.h>
12334 +#include <linux/in6.h>
12336 +#define VCMD_net_create_v0 VC_CMD(VNET, 1, 0)
12337 +#define VCMD_net_create VC_CMD(VNET, 1, 1)
12339 +struct vcmd_net_create {
12340 + uint64_t flagword;
12343 +#define VCMD_net_migrate VC_CMD(NETMIG, 1, 0)
12345 +#define VCMD_net_add VC_CMD(NETALT, 1, 0)
12346 +#define VCMD_net_remove VC_CMD(NETALT, 2, 0)
12348 +struct vcmd_net_addr_v0 {
12351 + struct in_addr ip[4];
12352 + struct in_addr mask[4];
12355 +#define VCMD_net_add_ipv4_v1 VC_CMD(NETALT, 1, 1)
12356 +#define VCMD_net_rem_ipv4_v1 VC_CMD(NETALT, 2, 1)
12358 +struct vcmd_net_addr_ipv4_v1 {
12361 + struct in_addr ip;
12362 + struct in_addr mask;
12365 +#define VCMD_net_add_ipv4 VC_CMD(NETALT, 1, 2)
12366 +#define VCMD_net_rem_ipv4 VC_CMD(NETALT, 2, 2)
12368 +struct vcmd_net_addr_ipv4_v2 {
12371 + struct in_addr ip;
12372 + struct in_addr ip2;
12373 + struct in_addr mask;
12376 +#define VCMD_net_add_ipv6 VC_CMD(NETALT, 3, 1)
12377 +#define VCMD_net_remove_ipv6 VC_CMD(NETALT, 4, 1)
12379 +struct vcmd_net_addr_ipv6_v1 {
12383 + struct in6_addr ip;
12384 + struct in6_addr mask;
12387 +#define VCMD_add_match_ipv4 VC_CMD(NETALT, 5, 0)
12388 +#define VCMD_get_match_ipv4 VC_CMD(NETALT, 6, 0)
12390 +struct vcmd_match_ipv4_v0 {
12395 + struct in_addr ip;
12396 + struct in_addr ip2;
12397 + struct in_addr mask;
12400 +#define VCMD_add_match_ipv6 VC_CMD(NETALT, 7, 0)
12401 +#define VCMD_get_match_ipv6 VC_CMD(NETALT, 8, 0)
12403 +struct vcmd_match_ipv6_v0 {
12408 + struct in6_addr ip;
12409 + struct in6_addr ip2;
12410 + struct in6_addr mask;
12416 +/* flag commands */
12418 +#define VCMD_get_nflags VC_CMD(FLAGS, 5, 0)
12419 +#define VCMD_set_nflags VC_CMD(FLAGS, 6, 0)
12421 +struct vcmd_net_flags_v0 {
12422 + uint64_t flagword;
12428 +/* network caps commands */
12430 +#define VCMD_get_ncaps VC_CMD(FLAGS, 7, 0)
12431 +#define VCMD_set_ncaps VC_CMD(FLAGS, 8, 0)
12433 +struct vcmd_net_caps_v0 {
12438 +#endif /* _UAPI_VS_NETWORK_CMD_H */
12439 diff -NurpP --minimal linux-4.9.82/include/uapi/vserver/sched_cmd.h linux-4.9.82-vs2.3.9.7/include/uapi/vserver/sched_cmd.h
12440 --- linux-4.9.82/include/uapi/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
12441 +++ linux-4.9.82-vs2.3.9.7/include/uapi/vserver/sched_cmd.h 2018-01-10 02:50:49.000000000 +0000
12443 +#ifndef _UAPI_VS_SCHED_CMD_H
12444 +#define _UAPI_VS_SCHED_CMD_H
12447 +struct vcmd_prio_bias {
12449 + int32_t prio_bias;
12452 +#define VCMD_set_prio_bias VC_CMD(SCHED, 4, 0)
12453 +#define VCMD_get_prio_bias VC_CMD(SCHED, 5, 0)
12455 +#endif /* _UAPI_VS_SCHED_CMD_H */
12456 diff -NurpP --minimal linux-4.9.82/include/uapi/vserver/signal_cmd.h linux-4.9.82-vs2.3.9.7/include/uapi/vserver/signal_cmd.h
12457 --- linux-4.9.82/include/uapi/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
12458 +++ linux-4.9.82-vs2.3.9.7/include/uapi/vserver/signal_cmd.h 2018-01-10 02:50:49.000000000 +0000
12460 +#ifndef _UAPI_VS_SIGNAL_CMD_H
12461 +#define _UAPI_VS_SIGNAL_CMD_H
12464 +/* signalling vserver commands */
12466 +#define VCMD_ctx_kill VC_CMD(PROCTRL, 1, 0)
12467 +#define VCMD_wait_exit VC_CMD(EVENT, 99, 0)
12469 +struct vcmd_ctx_kill_v0 {
12474 +struct vcmd_wait_exit_v0 {
12475 + int32_t reboot_cmd;
12476 + int32_t exit_code;
12480 +/* process alteration commands */
12482 +#define VCMD_get_pflags VC_CMD(PROCALT, 5, 0)
12483 +#define VCMD_set_pflags VC_CMD(PROCALT, 6, 0)
12485 +struct vcmd_pflags_v0 {
12486 + uint32_t flagword;
12490 +#endif /* _UAPI_VS_SIGNAL_CMD_H */
12491 diff -NurpP --minimal linux-4.9.82/include/uapi/vserver/space_cmd.h linux-4.9.82-vs2.3.9.7/include/uapi/vserver/space_cmd.h
12492 --- linux-4.9.82/include/uapi/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
12493 +++ linux-4.9.82-vs2.3.9.7/include/uapi/vserver/space_cmd.h 2018-01-10 02:50:49.000000000 +0000
12495 +#ifndef _UAPI_VS_SPACE_CMD_H
12496 +#define _UAPI_VS_SPACE_CMD_H
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)
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)
12507 +#define VCMD_get_space_mask_v0 VC_CMD(PROCALT, 4, 0)
12509 +#define VCMD_get_space_mask VC_CMD(VSPACE, 0, 1)
12510 +#define VCMD_get_space_default VC_CMD(VSPACE, 1, 0)
12513 +struct vcmd_space_mask_v1 {
12517 +struct vcmd_space_mask_v2 {
12522 +#endif /* _UAPI_VS_SPACE_CMD_H */
12523 diff -NurpP --minimal linux-4.9.82/include/uapi/vserver/switch.h linux-4.9.82-vs2.3.9.7/include/uapi/vserver/switch.h
12524 --- linux-4.9.82/include/uapi/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
12525 +++ linux-4.9.82-vs2.3.9.7/include/uapi/vserver/switch.h 2018-01-10 02:50:49.000000000 +0000
12527 +#ifndef _UAPI_VS_SWITCH_H
12528 +#define _UAPI_VS_SWITCH_H
12530 +#include <linux/types.h>
12533 +#define VC_CATEGORY(c) (((c) >> 24) & 0x3F)
12534 +#define VC_COMMAND(c) (((c) >> 16) & 0xFF)
12535 +#define VC_VERSION(c) ((c) & 0xFFF)
12537 +#define VC_CMD(c, i, v) ((((VC_CAT_ ## c) & 0x3F) << 24) \
12538 + | (((i) & 0xFF) << 16) | ((v) & 0xFFF))
12542 + Syscall Matrix V2.8
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 + -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
12575 +#define VC_CAT_VERSION 0
12577 +#define VC_CAT_VSETUP 1
12578 +#define VC_CAT_VHOST 2
12580 +#define VC_CAT_DEVICE 6
12582 +#define VC_CAT_VPROC 9
12583 +#define VC_CAT_PROCALT 10
12584 +#define VC_CAT_PROCMIG 11
12585 +#define VC_CAT_PROCTRL 12
12587 +#define VC_CAT_SCHED 14
12588 +#define VC_CAT_MEMCTRL 20
12590 +#define VC_CAT_VNET 25
12591 +#define VC_CAT_NETALT 26
12592 +#define VC_CAT_NETMIG 27
12593 +#define VC_CAT_NETCTRL 28
12595 +#define VC_CAT_TAGMIG 35
12596 +#define VC_CAT_DLIMIT 36
12597 +#define VC_CAT_INODE 38
12599 +#define VC_CAT_VSTAT 40
12600 +#define VC_CAT_VINFO 46
12601 +#define VC_CAT_EVENT 48
12603 +#define VC_CAT_FLAGS 52
12604 +#define VC_CAT_VSPACE 54
12605 +#define VC_CAT_DEBUG 56
12606 +#define VC_CAT_RLIMIT 60
12608 +#define VC_CAT_SYSTEST 61
12609 +#define VC_CAT_COMPAT 63
12611 +/* query version */
12613 +#define VCMD_get_version VC_CMD(VERSION, 0, 0)
12614 +#define VCMD_get_vci VC_CMD(VERSION, 1, 0)
12616 +#endif /* _UAPI_VS_SWITCH_H */
12617 diff -NurpP --minimal linux-4.9.82/include/uapi/vserver/tag_cmd.h linux-4.9.82-vs2.3.9.7/include/uapi/vserver/tag_cmd.h
12618 --- linux-4.9.82/include/uapi/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
12619 +++ linux-4.9.82-vs2.3.9.7/include/uapi/vserver/tag_cmd.h 2018-01-10 02:50:49.000000000 +0000
12621 +#ifndef _UAPI_VS_TAG_CMD_H
12622 +#define _UAPI_VS_TAG_CMD_H
12625 +/* vinfo commands */
12627 +#define VCMD_task_tag VC_CMD(VINFO, 3, 0)
12630 +/* context commands */
12632 +#define VCMD_tag_migrate VC_CMD(TAGMIG, 1, 0)
12634 +#endif /* _UAPI_VS_TAG_CMD_H */
12635 diff -NurpP --minimal linux-4.9.82/init/Kconfig linux-4.9.82-vs2.3.9.7/init/Kconfig
12636 --- linux-4.9.82/init/Kconfig 2018-02-22 21:18:55.000000000 +0000
12637 +++ linux-4.9.82-vs2.3.9.7/init/Kconfig 2018-02-10 15:15:43.000000000 +0000
12638 @@ -958,6 +958,7 @@ config NUMA_BALANCING_DEFAULT_ENABLED
12640 bool "Control Group support"
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.82/init/main.c linux-4.9.82-vs2.3.9.7/init/main.c
12647 --- linux-4.9.82/init/main.c 2018-02-22 21:18:56.000000000 +0000
12648 +++ linux-4.9.82-vs2.3.9.7/init/main.c 2018-01-10 02:50:49.000000000 +0000
12650 #include <linux/io.h>
12651 #include <linux/kaiser.h>
12652 #include <linux/cache.h>
12653 +#include <linux/vserver/percpu.h>
12655 #include <asm/io.h>
12656 #include <asm/bugs.h>
12657 diff -NurpP --minimal linux-4.9.82/ipc/mqueue.c linux-4.9.82-vs2.3.9.7/ipc/mqueue.c
12658 --- linux-4.9.82/ipc/mqueue.c 2018-02-22 21:18:56.000000000 +0000
12659 +++ linux-4.9.82-vs2.3.9.7/ipc/mqueue.c 2018-01-10 02:50:49.000000000 +0000
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>
12667 #include <net/sock.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;
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();
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;
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
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 */
12705 u->mq_bytes += mq_bytes;
12706 + vx_ipcmsg_add(vxi, u, mq_bytes);
12707 spin_unlock(&mq_lock);
12710 info->user = get_uid(u);
12711 + info->vxi = get_vx_info(vxi);
12712 } else if (S_ISDIR(mode)) {
12714 /* Some things misbehave if size == 0 on a directory */
12715 @@ -396,8 +404,11 @@ static void mqueue_evict_inode(struct in
12719 + struct vx_info *vxi = info->vxi;
12721 spin_lock(&mq_lock);
12722 user->mq_bytes -= mq_bytes;
12723 + vx_ipcmsg_sub(vxi, user, mq_bytes);
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
12729 ipc_ns->mq_queues_count--;
12730 spin_unlock(&mq_lock);
12731 + put_vx_info(vxi);
12735 diff -NurpP --minimal linux-4.9.82/ipc/msg.c linux-4.9.82-vs2.3.9.7/ipc/msg.c
12736 --- linux-4.9.82/ipc/msg.c 2018-02-22 21:18:56.000000000 +0000
12737 +++ linux-4.9.82-vs2.3.9.7/ipc/msg.c 2018-02-10 15:15:43.000000000 +0000
12739 #include <linux/rwsem.h>
12740 #include <linux/nsproxy.h>
12741 #include <linux/ipc_namespace.h>
12742 +#include <linux/vs_base.h>
12744 #include <asm/current.h>
12745 #include <linux/uaccess.h>
12746 @@ -124,6 +125,7 @@ static int newque(struct ipc_namespace *
12748 msq->q_perm.mode = msgflg & S_IRWXUGO;
12749 msq->q_perm.key = key;
12750 + msq->q_perm.xid = vx_current_xid();
12752 msq->q_perm.security = NULL;
12753 retval = security_msg_queue_alloc(msq);
12754 diff -NurpP --minimal linux-4.9.82/ipc/namespace.c linux-4.9.82-vs2.3.9.7/ipc/namespace.c
12755 --- linux-4.9.82/ipc/namespace.c 2016-12-11 19:17:54.000000000 +0000
12756 +++ linux-4.9.82-vs2.3.9.7/ipc/namespace.c 2018-01-13 03:52:55.000000000 +0000
12758 #include <linux/mount.h>
12759 #include <linux/user_namespace.h>
12760 #include <linux/proc_ns.h>
12761 +#include <linux/vserver/global.h>
12765 @@ -59,6 +60,7 @@ static struct ipc_namespace *create_ipc_
12769 + atomic_inc(&vs_global_ipc_ns);
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);
12781 diff -NurpP --minimal linux-4.9.82/ipc/sem.c linux-4.9.82-vs2.3.9.7/ipc/sem.c
12782 --- linux-4.9.82/ipc/sem.c 2016-12-11 19:17:54.000000000 +0000
12783 +++ linux-4.9.82-vs2.3.9.7/ipc/sem.c 2018-01-10 02:50:49.000000000 +0000
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>
12791 #include <linux/uaccess.h>
12793 @@ -537,6 +539,7 @@ static int newary(struct ipc_namespace *
12795 sma->sem_perm.mode = (semflg & S_IRWXUGO);
12796 sma->sem_perm.key = key;
12797 + sma->sem_perm.xid = vx_current_xid();
12799 sma->sem_perm.security = NULL;
12800 retval = security_sem_alloc(sma);
12801 @@ -567,6 +570,9 @@ static int newary(struct ipc_namespace *
12804 ns->used_sems += nsems;
12805 + /* FIXME: obsoleted? */
12806 + vx_semary_inc(sma);
12807 + vx_nsems_add(sma, nsems);
12809 sem_unlock(sma, -1);
12811 @@ -1155,6 +1161,9 @@ static void freeary(struct ipc_namespace
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);
12821 diff -NurpP --minimal linux-4.9.82/ipc/shm.c linux-4.9.82-vs2.3.9.7/ipc/shm.c
12822 --- linux-4.9.82/ipc/shm.c 2018-02-22 21:18:56.000000000 +0000
12823 +++ linux-4.9.82-vs2.3.9.7/ipc/shm.c 2018-01-10 02:50:49.000000000 +0000
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>
12831 #include <linux/uaccess.h>
12833 @@ -228,10 +230,14 @@ static void shm_open(struct vm_area_stru
12834 static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp)
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;
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;
12848 if (!is_file_hugepages(shm_file))
12849 @@ -240,6 +246,7 @@ static void shm_destroy(struct ipc_names
12850 user_shm_unlock(i_size_read(file_inode(shm_file)),
12853 + put_vx_info(vxi);
12854 ipc_rcu_putref(shp, shm_rcu_free);
12857 @@ -539,11 +546,15 @@ static int newseg(struct ipc_namespace *
12858 ns->shm_tot + numpages > ns->shm_ctlall)
12861 + if (!vx_ipcshm_avail(current_vx_info(), numpages))
12864 shp = ipc_rcu_alloc(sizeof(*shp));
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;
12873 @@ -614,6 +625,7 @@ static int newseg(struct ipc_namespace *
12875 ipc_unlock_object(&shp->shm_perm);
12877 + vx_ipcshm_add(current_vx_info(), key, numpages);
12881 diff -NurpP --minimal linux-4.9.82/kernel/Makefile linux-4.9.82-vs2.3.9.7/kernel/Makefile
12882 --- linux-4.9.82/kernel/Makefile 2018-02-22 21:18:56.000000000 +0000
12883 +++ linux-4.9.82-vs2.3.9.7/kernel/Makefile 2018-01-10 02:50:49.000000000 +0000
12884 @@ -39,6 +39,7 @@ obj-y += printk/
12887 obj-y += livepatch/
12890 obj-$(CONFIG_CHECKPOINT_RESTORE) += kcmp.o
12891 obj-$(CONFIG_FREEZER) += freezer.o
12892 diff -NurpP --minimal linux-4.9.82/kernel/auditsc.c linux-4.9.82-vs2.3.9.7/kernel/auditsc.c
12893 --- linux-4.9.82/kernel/auditsc.c 2016-12-11 19:17:54.000000000 +0000
12894 +++ linux-4.9.82-vs2.3.9.7/kernel/auditsc.c 2018-01-10 02:50:49.000000000 +0000
12895 @@ -1965,7 +1965,7 @@ static int audit_set_loginuid_perm(kuid_
12896 if (is_audit_feature_set(AUDIT_FEATURE_LOGINUID_IMMUTABLE))
12898 /* it is set, you need permission */
12899 - if (!capable(CAP_AUDIT_CONTROL))
12900 + if (!vx_capable(CAP_AUDIT_CONTROL, VXC_AUDIT_CONTROL))
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.82/kernel/capability.c linux-4.9.82-vs2.3.9.7/kernel/capability.c
12905 --- linux-4.9.82/kernel/capability.c 2018-02-22 21:18:56.000000000 +0000
12906 +++ linux-4.9.82-vs2.3.9.7/kernel/capability.c 2018-01-10 02:50:49.000000000 +0000
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>
12915 @@ -107,6 +108,7 @@ static int cap_validate_magic(cap_user_h
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
12927 +#include <linux/vserver/base.h>
12930 * has_capability_noaudit - Does a task have a capability (unaudited) in the
12932 diff -NurpP --minimal linux-4.9.82/kernel/compat.c linux-4.9.82-vs2.3.9.7/kernel/compat.c
12933 --- linux-4.9.82/kernel/compat.c 2016-12-11 19:17:54.000000000 +0000
12934 +++ linux-4.9.82-vs2.3.9.7/kernel/compat.c 2018-01-10 02:50:49.000000000 +0000
12936 #include <linux/times.h>
12937 #include <linux/ptrace.h>
12938 #include <linux/gfp.h>
12939 +#include <linux/vs_time.h>
12941 #include <asm/uaccess.h>
12943 @@ -1059,7 +1060,7 @@ COMPAT_SYSCALL_DEFINE1(stime, compat_tim
12947 - do_settimeofday(&tv);
12948 + vx_settimeofday(&tv);
12952 diff -NurpP --minimal linux-4.9.82/kernel/cred.c linux-4.9.82-vs2.3.9.7/kernel/cred.c
12953 --- linux-4.9.82/kernel/cred.c 2016-12-11 19:17:54.000000000 +0000
12954 +++ linux-4.9.82-vs2.3.9.7/kernel/cred.c 2018-01-10 02:50:49.000000000 +0000
12955 @@ -64,31 +64,6 @@ struct cred init_cred = {
12956 .group_info = &init_groups,
12959 -static inline void set_cred_subscribers(struct cred *cred, int n)
12961 -#ifdef CONFIG_DEBUG_CREDENTIALS
12962 - atomic_set(&cred->subscribers, n);
12966 -static inline int read_cred_subscribers(const struct cred *cred)
12968 -#ifdef CONFIG_DEBUG_CREDENTIALS
12969 - return atomic_read(&cred->subscribers);
12975 -static inline void alter_cred_subscribers(const struct cred *_cred, int n)
12977 -#ifdef CONFIG_DEBUG_CREDENTIALS
12978 - struct cred *cred = (struct cred *) _cred;
12980 - atomic_add(n, &cred->subscribers);
12985 * The RCU callback to actually dispose of a set of credentials
12987 @@ -240,21 +215,16 @@ error:
12989 * Call commit_creds() or abort_creds() to clean up.
12991 -struct cred *prepare_creds(void)
12992 +struct cred *__prepare_creds(const struct cred *old)
12994 - struct task_struct *task = current;
12995 - const struct cred *old;
12998 - validate_process_creds();
13000 new = kmem_cache_alloc(cred_jar, GFP_KERNEL);
13004 kdebug("prepare_creds() alloc %p", new);
13006 - old = task->cred;
13007 memcpy(new, old, sizeof(struct cred));
13009 atomic_set(&new->usage, 1);
13010 @@ -283,6 +253,13 @@ error:
13015 +struct cred *prepare_creds(void)
13017 + validate_process_creds();
13019 + return __prepare_creds(current->cred);
13021 EXPORT_SYMBOL(prepare_creds);
13024 diff -NurpP --minimal linux-4.9.82/kernel/exit.c linux-4.9.82-vs2.3.9.7/kernel/exit.c
13025 --- linux-4.9.82/kernel/exit.c 2016-12-11 19:17:54.000000000 +0000
13026 +++ linux-4.9.82-vs2.3.9.7/kernel/exit.c 2018-02-06 17:14:57.000000000 +0000
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
13040 struct pid_namespace *pid_ns = task_active_pid_ns(father);
13041 struct task_struct *reaper = pid_ns->child_reaper;
13042 + struct vx_info *vxi = task_get_vx_info(father);
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;
13053 if (likely(reaper != father))
13057 reaper = find_alive_thread(father);
13059 pid_ns->child_reaper = reaper;
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);
13072 + put_vx_info(vxi);
13077 @@ -637,9 +654,13 @@ static void forget_original_parent(struc
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;
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.
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);
13104 - list_splice_tail_init(&father->children, &reaper->children);
13105 + INIT_LIST_HEAD(&father->children);
13109 @@ -844,6 +868,9 @@ void __noreturn do_exit(long code)
13111 flush_ptrace_hw_breakpoint(tsk);
13113 + /* needs to stay before exit_notify() */
13114 + exit_vx_info_early(tsk, code);
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)
13121 validate_creds_for_do_exit(tsk);
13123 + /* needs to stay after exit_notify() and before preempt_disable() */
13124 + exit_vx_info(tsk, code);
13125 + exit_nx_info(tsk);
13127 check_stack_usage();
13129 if (tsk->nr_dirtied)
13130 diff -NurpP --minimal linux-4.9.82/kernel/fork.c linux-4.9.82-vs2.3.9.7/kernel/fork.c
13131 --- linux-4.9.82/kernel/fork.c 2018-02-22 21:18:56.000000000 +0000
13132 +++ linux-4.9.82-vs2.3.9.7/kernel/fork.c 2018-01-10 09:23:14.000000000 +0000
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>
13141 #include <asm/pgtable.h>
13142 #include <asm/pgalloc.h>
13143 @@ -353,6 +356,8 @@ void free_task(struct task_struct *tsk)
13144 WARN_ON_ONCE(atomic_read(&tsk->stack_refcount) != 0);
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 @@ -1475,6 +1480,8 @@ static __latent_entropy struct task_stru
13155 struct task_struct *p;
13156 + struct vx_info *vxi;
13157 + struct nx_info *nxi;
13159 if ((clone_flags & (CLONE_NEWNS|CLONE_FS)) == (CLONE_NEWNS|CLONE_FS))
13160 return ERR_PTR(-EINVAL);
13161 @@ -1535,7 +1542,12 @@ static __latent_entropy struct task_stru
13162 DEBUG_LOCKS_WARN_ON(!p->hardirqs_enabled);
13163 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
13165 + init_vx_info(&p->vx_info, current_vx_info());
13166 + init_nx_info(&p->nx_info, current_nx_info());
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 @@ -1832,6 +1844,18 @@ static __latent_entropy struct task_stru
13176 spin_unlock(¤t->sighand->siglock);
13177 syscall_tracepoint_update(p);
13179 + /* p is copy of current */
13180 + vxi = p->vx_info;
13182 + claim_vx_info(vxi, p);
13183 + atomic_inc(&vxi->cvirt.nr_threads);
13184 + atomic_inc(&vxi->cvirt.total_forks);
13187 + nxi = p->nx_info;
13189 + claim_nx_info(nxi, p);
13190 write_unlock_irq(&tasklist_lock);
13192 proc_fork_connector(p);
13193 diff -NurpP --minimal linux-4.9.82/kernel/kthread.c linux-4.9.82-vs2.3.9.7/kernel/kthread.c
13194 --- linux-4.9.82/kernel/kthread.c 2018-02-22 21:18:56.000000000 +0000
13195 +++ linux-4.9.82-vs2.3.9.7/kernel/kthread.c 2018-01-10 02:50:49.000000000 +0000
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>
13203 static DEFINE_SPINLOCK(kthread_create_lock);
13204 diff -NurpP --minimal linux-4.9.82/kernel/nsproxy.c linux-4.9.82-vs2.3.9.7/kernel/nsproxy.c
13205 --- linux-4.9.82/kernel/nsproxy.c 2016-12-11 19:17:54.000000000 +0000
13206 +++ linux-4.9.82-vs2.3.9.7/kernel/nsproxy.c 2018-01-14 06:25:23.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"
13221 static struct kmem_cache *nsproxy_cachep;
13223 @@ -50,8 +53,11 @@ static inline struct nsproxy *create_nsp
13224 struct nsproxy *nsproxy;
13226 nsproxy = kmem_cache_alloc(nsproxy_cachep, GFP_KERNEL);
13229 atomic_set(&nsproxy->count, 1);
13230 + atomic_inc(&vs_global_nsproxy);
13232 + vxdprintk(VXD_CBIT(space, 2), "create_nsproxy = %p[1]", nsproxy);
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.
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)
13250 struct nsproxy *new_nsp;
13252 @@ -71,39 +80,37 @@ static struct nsproxy *create_new_namesp
13254 return ERR_PTR(-ENOMEM);
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);
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);
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);
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);
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);
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);
13298 @@ -130,6 +137,43 @@ out_ns:
13299 return ERR_PTR(err);
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)
13307 + return unshare_namespaces(flags, tsk->nsproxy,
13308 + new_fs, user_ns, task_active_pid_ns(tsk));
13312 + * copies the nsproxy, setting refcount to 1, and grabbing a
13313 + * reference to all contained namespaces.
13315 +struct nsproxy *copy_nsproxy(struct nsproxy *orig)
13317 + struct nsproxy *ns = create_nsproxy();
13320 + memcpy(ns, orig, sizeof(struct nsproxy));
13321 + atomic_set(&ns->count, 1);
13324 + get_mnt_ns(ns->mnt_ns);
13326 + get_uts_ns(ns->uts_ns);
13328 + get_ipc_ns(ns->ipc_ns);
13329 + if (ns->pid_ns_for_children)
13330 + get_pid_ns(ns->pid_ns_for_children);
13332 + get_net(ns->net_ns);
13333 + if (ns->cgroup_ns)
13334 + get_cgroup_ns(ns->cgroup_ns);
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,
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;
13349 + vxdprintk(VXD_CBIT(space, 7), "copy_namespaces(0x%08lx,%p[%p])",
13350 + flags, tsk, old_ns);
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,
13358 - if (!ns_capable(user_ns, CAP_SYS_ADMIN))
13359 + if (!vx_ns_can_unshare(user_ns, CAP_SYS_ADMIN, flags))
13363 @@ -166,6 +213,9 @@ int copy_namespaces(unsigned long flags,
13364 return PTR_ERR(new_ns);
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);
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);
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);
13385 @@ -194,12 +246,16 @@ int unshare_nsproxy_namespaces(unsigned
13386 struct user_namespace *user_ns;
13389 + vxdprintk(VXD_CBIT(space, 4),
13390 + "unshare_nsproxy_namespaces(0x%08lx,[%p])",
13391 + unshare_flags, current->nsproxy);
13393 if (!(unshare_flags & (CLONE_NEWNS | CLONE_NEWUTS | CLONE_NEWIPC |
13394 CLONE_NEWNET | CLONE_NEWPID | CLONE_NEWCGROUP)))
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))
13402 *new_nsp = create_new_namespaces(unshare_flags, current, user_ns,
13403 diff -NurpP --minimal linux-4.9.82/kernel/pid.c linux-4.9.82-vs2.3.9.7/kernel/pid.c
13404 --- linux-4.9.82/kernel/pid.c 2018-02-22 21:18:56.000000000 +0000
13405 +++ linux-4.9.82-vs2.3.9.7/kernel/pid.c 2018-01-10 02:50:49.000000000 +0000
13407 #include <linux/syscalls.h>
13408 #include <linux/proc_ns.h>
13409 #include <linux/proc_fs.h>
13410 +#include <linux/vs_pid.h>
13412 #define pid_hashfn(nr, ns) \
13413 hash_long((unsigned long)nr + (unsigned long)ns, pidhash_shift)
13414 @@ -379,7 +380,7 @@ EXPORT_SYMBOL_GPL(find_pid_ns);
13416 struct pid *find_vpid(int nr)
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));
13421 EXPORT_SYMBOL_GPL(find_vpid);
13423 @@ -435,6 +436,9 @@ void transfer_pid(struct task_struct *ol
13424 struct task_struct *pid_task(struct pid *pid, enum pid_type type)
13426 struct task_struct *result = NULL;
13428 + if (type == __PIDTYPE_REALPID)
13429 + type = PIDTYPE_PID;
13431 struct hlist_node *first;
13432 first = rcu_dereference_check(hlist_first_rcu(&pid->tasks[type]),
13433 @@ -453,7 +457,7 @@ struct task_struct *find_task_by_pid_ns(
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);
13441 struct task_struct *find_task_by_vpid(pid_t vnr)
13442 @@ -497,7 +501,7 @@ struct pid *find_get_pid(pid_t nr)
13444 EXPORT_SYMBOL_GPL(find_get_pid);
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)
13451 @@ -511,6 +515,11 @@ pid_t pid_nr_ns(struct pid *pid, struct
13453 EXPORT_SYMBOL_GPL(pid_nr_ns);
13455 +pid_t pid_nr_ns(struct pid *pid, struct pid_namespace *ns)
13457 + return vx_map_pid(pid_unmapped_nr_ns(pid, ns));
13460 pid_t pid_vnr(struct pid *pid)
13462 return pid_nr_ns(pid, task_active_pid_ns(current));
13463 diff -NurpP --minimal linux-4.9.82/kernel/pid_namespace.c linux-4.9.82-vs2.3.9.7/kernel/pid_namespace.c
13464 --- linux-4.9.82/kernel/pid_namespace.c 2018-02-22 21:18:56.000000000 +0000
13465 +++ linux-4.9.82-vs2.3.9.7/kernel/pid_namespace.c 2018-01-10 02:50:49.000000000 +0000
13467 #include <linux/proc_ns.h>
13468 #include <linux/reboot.h>
13469 #include <linux/export.h>
13470 +#include <linux/vserver/global.h>
13474 @@ -124,6 +125,7 @@ static struct pid_namespace *create_pid_
13475 ns->ns.ops = &pidns_operations;
13477 kref_init(&ns->kref);
13478 + atomic_inc(&vs_global_pid_ns);
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_
13484 kfree(ns->pidmap[0].page);
13486 + atomic_dec(&vs_global_pid_ns);
13487 kmem_cache_free(pid_ns_cachep, ns);
13489 dec_pid_namespaces(ucounts);
13490 diff -NurpP --minimal linux-4.9.82/kernel/printk/printk.c linux-4.9.82-vs2.3.9.7/kernel/printk/printk.c
13491 --- linux-4.9.82/kernel/printk/printk.c 2018-02-22 21:18:56.000000000 +0000
13492 +++ linux-4.9.82-vs2.3.9.7/kernel/printk/printk.c 2018-01-10 02:50:49.000000000 +0000
13494 #include <linux/utsname.h>
13495 #include <linux/ctype.h>
13496 #include <linux/uio.h>
13497 +#include <linux/vs_cvirt.h>
13499 #include <asm/uaccess.h>
13500 #include <asm/sections.h>
13501 @@ -612,7 +613,7 @@ int check_syslog_permissions(int type, i
13504 if (syslog_action_restricted(type)) {
13505 - if (capable(CAP_SYSLOG))
13506 + if (vx_capable(CAP_SYSLOG, VXC_SYSLOG))
13509 * For historical reasons, accept CAP_SYS_ADMIN too, with
13510 @@ -1432,12 +1433,9 @@ int do_syslog(int type, char __user *buf
13515 - case SYSLOG_ACTION_CLOSE: /* Close log */
13517 - case SYSLOG_ACTION_OPEN: /* Open log */
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)) {
13524 if (!buf || len < 0)
13526 @@ -1448,6 +1446,16 @@ int do_syslog(int type, char __user *buf
13531 + if (!vx_check(0, VS_ADMIN|VS_WATCH))
13532 + return vx_do_syslog(type, buf, len);
13535 + case SYSLOG_ACTION_CLOSE: /* Close log */
13537 + case SYSLOG_ACTION_OPEN: /* Open log */
13539 + case SYSLOG_ACTION_READ: /* Read from log */
13540 error = wait_event_interruptible(log_wait,
13541 syslog_seq != log_next_seq);
13543 @@ -1460,16 +1468,6 @@ int do_syslog(int type, char __user *buf
13545 /* Read last kernel messages */
13546 case SYSLOG_ACTION_READ_ALL:
13548 - if (!buf || len < 0)
13553 - if (!access_ok(VERIFY_WRITE, buf, len)) {
13557 error = syslog_print_all(buf, len, clear);
13559 /* Clear ring buffer */
13560 diff -NurpP --minimal linux-4.9.82/kernel/ptrace.c linux-4.9.82-vs2.3.9.7/kernel/ptrace.c
13561 --- linux-4.9.82/kernel/ptrace.c 2018-02-22 21:18:56.000000000 +0000
13562 +++ linux-4.9.82-vs2.3.9.7/kernel/ptrace.c 2018-01-10 02:50:49.000000000 +0000
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 @@ -325,6 +326,11 @@ ok:
13572 !ptrace_has_cap(mm->user_ns, mode)))
13575 + if (!vx_check(task->xid, VS_ADMIN_P|VS_WATCH_P|VS_IDENT))
13577 + if (!vx_check(task->xid, VS_IDENT) &&
13578 + !task_vx_flags(task, VXF_STATE_ADMIN, 0))
13580 return security_ptrace_access_check(task, mode);
13583 diff -NurpP --minimal linux-4.9.82/kernel/reboot.c linux-4.9.82-vs2.3.9.7/kernel/reboot.c
13584 --- linux-4.9.82/kernel/reboot.c 2016-12-11 19:17:54.000000000 +0000
13585 +++ linux-4.9.82-vs2.3.9.7/kernel/reboot.c 2018-01-10 02:50:49.000000000 +0000
13587 #include <linux/syscalls.h>
13588 #include <linux/syscore_ops.h>
13589 #include <linux/uaccess.h>
13590 +#include <linux/vs_pid.h>
13593 * this indicates whether you can reboot with ctrl-alt-del: the default is yes
13594 @@ -269,6 +270,8 @@ EXPORT_SYMBOL_GPL(kernel_power_off);
13596 static DEFINE_MUTEX(reboot_mutex);
13598 +long vs_reboot(unsigned int, void __user *);
13601 * Reboot system call: for obvious reasons only root may call it,
13602 * and even root needs to set up some magic numbers in the registers
13603 @@ -311,6 +314,9 @@ SYSCALL_DEFINE4(reboot, int, magic1, int
13604 if ((cmd == LINUX_REBOOT_CMD_POWER_OFF) && !pm_power_off)
13605 cmd = LINUX_REBOOT_CMD_HALT;
13607 + if (!vx_check(0, VS_ADMIN|VS_WATCH))
13608 + return vs_reboot(cmd, arg);
13610 mutex_lock(&reboot_mutex);
13612 case LINUX_REBOOT_CMD_RESTART:
13613 diff -NurpP --minimal linux-4.9.82/kernel/sched/core.c linux-4.9.82-vs2.3.9.7/kernel/sched/core.c
13614 --- linux-4.9.82/kernel/sched/core.c 2018-02-22 21:18:56.000000000 +0000
13615 +++ linux-4.9.82-vs2.3.9.7/kernel/sched/core.c 2018-02-22 21:31:40.000000000 +0000
13617 #include <linux/compiler.h>
13618 #include <linux/frame.h>
13619 #include <linux/prefetch.h>
13620 +#include <linux/vs_sched.h>
13621 +#include <linux/vs_cvirt.h>
13623 #include <asm/switch_to.h>
13624 #include <asm/tlb.h>
13625 @@ -3429,6 +3431,7 @@ void __noreturn do_task_dead(void)
13626 __set_current_state(TASK_DEAD);
13627 current->flags |= PF_NOFREEZE; /* tell freezer to ignore us */
13629 + printk("bad task: %p [%lx]\n", current, current->state);
13631 /* Avoid "noreturn function does return". */
13633 @@ -3822,7 +3825,7 @@ SYSCALL_DEFINE1(nice, int, increment)
13635 nice = clamp_val(nice, MIN_NICE, MAX_NICE);
13636 if (increment < 0 && !can_nice(current, nice))
13638 + return vx_flags(VXF_IGNEG_NICE, 0) ? 0 : -EPERM;
13640 retval = security_task_setnice(current, nice);
13642 diff -NurpP --minimal linux-4.9.82/kernel/sched/cputime.c linux-4.9.82-vs2.3.9.7/kernel/sched/cputime.c
13643 --- linux-4.9.82/kernel/sched/cputime.c 2016-12-11 19:17:54.000000000 +0000
13644 +++ linux-4.9.82-vs2.3.9.7/kernel/sched/cputime.c 2018-01-10 02:50:49.000000000 +0000
13646 #include <linux/kernel_stat.h>
13647 #include <linux/static_key.h>
13648 #include <linux/context_tracking.h>
13649 +#include <linux/vs_sched.h>
13651 #ifdef CONFIG_PARAVIRT
13652 #include <asm/paravirt.h>
13653 @@ -133,14 +134,17 @@ static inline void task_group_account_fi
13654 void account_user_time(struct task_struct *p, cputime_t cputime,
13655 cputime_t cputime_scaled)
13657 + struct vx_info *vxi = p->vx_info; /* p is _always_ current */
13658 + int nice = (task_nice(p) > 0);
13661 /* Add user time to process. */
13662 p->utime += cputime;
13663 p->utimescaled += cputime_scaled;
13664 + vx_account_user(vxi, cputime, nice);
13665 account_group_user_time(p, cputime);
13667 - index = (task_nice(p) > 0) ? CPUTIME_NICE : CPUTIME_USER;
13668 + index = (nice) ? CPUTIME_NICE : CPUTIME_USER;
13670 /* Add user time to cpustat. */
13671 task_group_account_field(p, index, (__force u64) cputime);
13672 @@ -187,9 +191,12 @@ static inline
13673 void __account_system_time(struct task_struct *p, cputime_t cputime,
13674 cputime_t cputime_scaled, int index)
13676 + struct vx_info *vxi = p->vx_info; /* p is _always_ current */
13678 /* Add system time to process. */
13679 p->stime += cputime;
13680 p->stimescaled += cputime_scaled;
13681 + vx_account_system(vxi, cputime, 0 /* do we have idle time? */);
13682 account_group_system_time(p, cputime);
13684 /* Add system time to cpustat. */
13685 diff -NurpP --minimal linux-4.9.82/kernel/sched/fair.c linux-4.9.82-vs2.3.9.7/kernel/sched/fair.c
13686 --- linux-4.9.82/kernel/sched/fair.c 2018-02-22 21:18:57.000000000 +0000
13687 +++ linux-4.9.82-vs2.3.9.7/kernel/sched/fair.c 2018-01-10 02:50:49.000000000 +0000
13689 #include <linux/mempolicy.h>
13690 #include <linux/migrate.h>
13691 #include <linux/task_work.h>
13692 +#include <linux/vs_cvirt.h>
13694 #include <trace/events/sched.h>
13696 @@ -3410,6 +3411,8 @@ enqueue_entity(struct cfs_rq *cfs_rq, st
13697 __enqueue_entity(cfs_rq, se);
13700 + if (entity_is_task(se))
13701 + vx_activate_task(task_of(se));
13702 if (cfs_rq->nr_running == 1) {
13703 list_add_leaf_cfs_rq(cfs_rq);
13704 check_enqueue_throttle(cfs_rq);
13705 @@ -3479,6 +3482,8 @@ dequeue_entity(struct cfs_rq *cfs_rq, st
13706 if (se != cfs_rq->curr)
13707 __dequeue_entity(cfs_rq, se);
13709 + if (entity_is_task(se))
13710 + vx_deactivate_task(task_of(se));
13711 account_entity_dequeue(cfs_rq, se);
13714 diff -NurpP --minimal linux-4.9.82/kernel/sched/loadavg.c linux-4.9.82-vs2.3.9.7/kernel/sched/loadavg.c
13715 --- linux-4.9.82/kernel/sched/loadavg.c 2018-02-22 21:18:57.000000000 +0000
13716 +++ linux-4.9.82-vs2.3.9.7/kernel/sched/loadavg.c 2018-01-29 08:40:41.000000000 +0000
13717 @@ -73,9 +73,16 @@ EXPORT_SYMBOL(avenrun); /* should be rem
13719 void get_avenrun(unsigned long *loads, unsigned long offset, int shift)
13721 - loads[0] = (avenrun[0] + offset) << shift;
13722 - loads[1] = (avenrun[1] + offset) << shift;
13723 - loads[2] = (avenrun[2] + offset) << shift;
13724 + if (vx_flags(VXF_VIRT_LOAD, 0)) {
13725 + struct vx_info *vxi = current_vx_info();
13726 + loads[0] = (vxi->cvirt.load[0] + offset) << shift;
13727 + loads[1] = (vxi->cvirt.load[1] + offset) << shift;
13728 + loads[2] = (vxi->cvirt.load[2] + offset) << shift;
13730 + loads[0] = (avenrun[0] + offset) << shift;
13731 + loads[1] = (avenrun[1] + offset) << shift;
13732 + loads[2] = (avenrun[2] + offset) << shift;
13736 long calc_load_fold_active(struct rq *this_rq, long adjust)
13737 diff -NurpP --minimal linux-4.9.82/kernel/signal.c linux-4.9.82-vs2.3.9.7/kernel/signal.c
13738 --- linux-4.9.82/kernel/signal.c 2018-02-22 21:18:57.000000000 +0000
13739 +++ linux-4.9.82-vs2.3.9.7/kernel/signal.c 2018-01-13 21:30:31.000000000 +0000
13741 #include <linux/compat.h>
13742 #include <linux/cn_proc.h>
13743 #include <linux/compiler.h>
13744 +#include <linux/vs_context.h>
13745 +#include <linux/vs_pid.h>
13747 #define CREATE_TRACE_POINTS
13748 #include <trace/events/signal.h>
13749 @@ -726,9 +728,18 @@ static int check_kill_permission(int sig
13753 + vxdprintk(VXD_CBIT(misc, 7),
13754 + "check_kill_permission(%d,%p,%p[#%u,%u])",
13755 + sig, info, t, vx_task_xid(t), t->pid);
13757 if (!valid_signal(sig))
13760 +/* FIXME: needed? if so, why?
13761 + if ((info != SEND_SIG_NOINFO) &&
13762 + (is_si_special(info) || !si_fromuser(info)))
13765 if (!si_fromuser(info))
13768 @@ -752,6 +763,20 @@ static int check_kill_permission(int sig
13773 + if (t->pid == 1 && current->xid)
13777 + /* FIXME: we shouldn't return ESRCH ever, to avoid
13778 + loops, maybe ENOENT or EACCES? */
13779 + if (!vx_check(vx_task_xid(t), VS_WATCH_P | VS_IDENT)) {
13780 + vxdprintk(current->xid || VXD_CBIT(misc, 7),
13781 + "signal %d[%p] xid mismatch %p[#%u,%u] xid=#%u",
13782 + sig, info, t, vx_task_xid(t), t->pid, current->xid);
13786 return security_task_kill(t, info, sig, 0);
13789 @@ -1303,8 +1328,14 @@ int kill_pid_info(int sig, struct siginf
13792 p = pid_task(pid, PIDTYPE_PID);
13794 - error = group_send_sig_info(sig, info, p);
13796 + if (vx_check(vx_task_xid(p), VS_IDENT))
13797 + error = group_send_sig_info(sig, info, p);
13799 + rcu_read_unlock();
13804 if (likely(!p || error != -ESRCH))
13806 @@ -1349,7 +1380,7 @@ int kill_pid_info_as_cred(int sig, struc
13809 p = pid_task(pid, PIDTYPE_PID);
13811 + if (!p || !vx_check(vx_task_xid(p), VS_IDENT)) {
13815 @@ -1401,8 +1432,10 @@ static int kill_something_info(int sig,
13816 struct task_struct * p;
13818 for_each_process(p) {
13819 - if (task_pid_vnr(p) > 1 &&
13820 - !same_thread_group(p, current)) {
13821 + if (vx_check(vx_task_xid(p), VS_ADMIN|VS_IDENT) &&
13822 + task_pid_vnr(p) > 1 &&
13823 + !same_thread_group(p, current) &&
13824 + !vx_current_initpid(p->pid)) {
13825 int err = group_send_sig_info(sig, info, p);
13828 @@ -2255,6 +2288,11 @@ relock:
13829 !sig_kernel_only(signr))
13832 + /* virtual init is protected against user signals */
13833 + if ((ksig->info.si_code == SI_USER) &&
13834 + vx_current_initpid(current->pid))
13837 if (sig_kernel_stop(signr)) {
13839 * The default action is to stop all threads in
13840 diff -NurpP --minimal linux-4.9.82/kernel/softirq.c linux-4.9.82-vs2.3.9.7/kernel/softirq.c
13841 --- linux-4.9.82/kernel/softirq.c 2016-12-11 19:17:54.000000000 +0000
13842 +++ linux-4.9.82-vs2.3.9.7/kernel/softirq.c 2018-01-10 02:50:49.000000000 +0000
13844 #include <linux/smpboot.h>
13845 #include <linux/tick.h>
13846 #include <linux/irq.h>
13847 +#include <linux/vs_context.h>
13849 #define CREATE_TRACE_POINTS
13850 #include <trace/events/irq.h>
13851 diff -NurpP --minimal linux-4.9.82/kernel/sys.c linux-4.9.82-vs2.3.9.7/kernel/sys.c
13852 --- linux-4.9.82/kernel/sys.c 2016-12-11 19:17:54.000000000 +0000
13853 +++ linux-4.9.82-vs2.3.9.7/kernel/sys.c 2018-01-10 02:50:49.000000000 +0000
13855 #include <linux/cred.h>
13857 #include <linux/kmsg_dump.h>
13858 +#include <linux/vs_pid.h>
13859 /* Move somewhere else to avoid recompiling? */
13860 #include <generated/utsrelease.h>
13862 @@ -157,7 +158,10 @@ static int set_one_prio(struct task_stru
13865 if (niceval < task_nice(p) && !can_nice(p, niceval)) {
13867 + if (vx_flags(VXF_IGNEG_NICE, 0))
13873 no_nice = security_task_setnice(p, niceval);
13874 @@ -208,6 +212,8 @@ SYSCALL_DEFINE3(setpriority, int, which,
13876 pgrp = task_pgrp(current);
13877 do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
13878 + if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT))
13880 error = set_one_prio(p, niceval, error);
13881 } while_each_pid_thread(pgrp, PIDTYPE_PGID, p);
13883 @@ -274,6 +280,8 @@ SYSCALL_DEFINE2(getpriority, int, which,
13885 pgrp = task_pgrp(current);
13886 do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
13887 + if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT))
13889 niceval = nice_to_rlimit(task_nice(p));
13890 if (niceval > retval)
13892 @@ -290,6 +298,8 @@ SYSCALL_DEFINE2(getpriority, int, which,
13893 goto out_unlock; /* No processes for this user */
13895 do_each_thread(g, p) {
13896 + if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT))
13898 if (uid_eq(task_uid(p), uid) && task_pid_vnr(p)) {
13899 niceval = nice_to_rlimit(task_nice(p));
13900 if (niceval > retval)
13901 @@ -1217,7 +1227,8 @@ SYSCALL_DEFINE2(sethostname, char __user
13903 char tmp[__NEW_UTS_LEN];
13905 - if (!ns_capable(current->nsproxy->uts_ns->user_ns, CAP_SYS_ADMIN))
13906 + if (!vx_ns_capable(current->nsproxy->uts_ns->user_ns,
13907 + CAP_SYS_ADMIN, VXC_SET_UTSNAME))
13910 if (len < 0 || len > __NEW_UTS_LEN)
13911 @@ -1268,7 +1279,8 @@ SYSCALL_DEFINE2(setdomainname, char __us
13913 char tmp[__NEW_UTS_LEN];
13915 - if (!ns_capable(current->nsproxy->uts_ns->user_ns, CAP_SYS_ADMIN))
13916 + if (!vx_ns_capable(current->nsproxy->uts_ns->user_ns,
13917 + CAP_SYS_ADMIN, VXC_SET_UTSNAME))
13919 if (len < 0 || len > __NEW_UTS_LEN)
13921 @@ -1386,7 +1398,7 @@ int do_prlimit(struct task_struct *tsk,
13922 /* Keep the capable check against init_user_ns until
13923 cgroups can contain all limits */
13924 if (new_rlim->rlim_max > rlim->rlim_max &&
13925 - !capable(CAP_SYS_RESOURCE))
13926 + !vx_capable(CAP_SYS_RESOURCE, VXC_SET_RLIMIT))
13929 retval = security_task_setrlimit(tsk->group_leader,
13930 @@ -1439,7 +1451,8 @@ static int check_prlimit_permission(stru
13931 gid_eq(cred->gid, tcred->sgid) &&
13932 gid_eq(cred->gid, tcred->gid))
13934 - if (ns_capable(tcred->user_ns, CAP_SYS_RESOURCE))
13935 + if (vx_ns_capable(tcred->user_ns,
13936 + CAP_SYS_RESOURCE, VXC_SET_RLIMIT))
13940 diff -NurpP --minimal linux-4.9.82/kernel/sysctl.c linux-4.9.82-vs2.3.9.7/kernel/sysctl.c
13941 --- linux-4.9.82/kernel/sysctl.c 2018-02-22 21:18:57.000000000 +0000
13942 +++ linux-4.9.82-vs2.3.9.7/kernel/sysctl.c 2018-01-10 02:50:49.000000000 +0000
13944 #if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT)
13945 #include <linux/lockdep.h>
13947 +extern char vshelper_path[];
13948 #ifdef CONFIG_CHR_DEV_SG
13949 #include <scsi/sg.h>
13951 @@ -282,6 +283,13 @@ static int max_extfrag_threshold = 1000;
13953 static struct ctl_table kern_table[] = {
13955 + .procname = "vshelper",
13956 + .data = &vshelper_path,
13959 + .proc_handler = proc_dostring,
13962 .procname = "sched_child_runs_first",
13963 .data = &sysctl_sched_child_runs_first,
13964 .maxlen = sizeof(unsigned int),
13965 @@ -1426,7 +1434,6 @@ static struct ctl_table vm_table[] = {
13970 #endif /* CONFIG_COMPACTION */
13972 .procname = "min_free_kbytes",
13973 diff -NurpP --minimal linux-4.9.82/kernel/sysctl_binary.c linux-4.9.82-vs2.3.9.7/kernel/sysctl_binary.c
13974 --- linux-4.9.82/kernel/sysctl_binary.c 2016-12-11 19:17:54.000000000 +0000
13975 +++ linux-4.9.82-vs2.3.9.7/kernel/sysctl_binary.c 2018-01-10 02:50:49.000000000 +0000
13976 @@ -74,6 +74,7 @@ static const struct bin_table bin_kern_t
13978 { CTL_INT, KERN_PANIC, "panic" },
13979 { CTL_INT, KERN_REALROOTDEV, "real-root-dev" },
13980 + { CTL_STR, KERN_VSHELPER, "vshelper" },
13982 { CTL_STR, KERN_SPARC_REBOOT, "reboot-cmd" },
13983 { CTL_INT, KERN_CTLALTDEL, "ctrl-alt-del" },
13984 diff -NurpP --minimal linux-4.9.82/kernel/time/posix-timers.c linux-4.9.82-vs2.3.9.7/kernel/time/posix-timers.c
13985 --- linux-4.9.82/kernel/time/posix-timers.c 2018-02-22 21:18:57.000000000 +0000
13986 +++ linux-4.9.82-vs2.3.9.7/kernel/time/posix-timers.c 2018-02-22 21:31:40.000000000 +0000
13988 #include <linux/workqueue.h>
13989 #include <linux/export.h>
13990 #include <linux/hashtable.h>
13991 +#include <linux/vs_context.h>
13993 #include "timekeeping.h"
13995 @@ -407,6 +408,7 @@ int posix_timer_event(struct k_itimer *t
13997 struct task_struct *task;
13998 int shared, ret = -1;
14001 * FIXME: if ->sigq is queued we can race with
14002 * dequeue_signal()->do_schedule_next_timer().
14003 @@ -423,10 +425,18 @@ int posix_timer_event(struct k_itimer *t
14005 task = pid_task(timr->it_pid, PIDTYPE_PID);
14007 + struct vx_info_save vxis;
14008 + struct vx_info *vxi;
14010 + vxi = get_vx_info(task->vx_info);
14011 + enter_vx_info(vxi, &vxis);
14012 shared = !(timr->it_sigev_notify & SIGEV_THREAD_ID);
14013 ret = send_sigqueue(timr->sigq, task, shared);
14014 + leave_vx_info(&vxis);
14015 + put_vx_info(vxi);
14019 /* If we failed to send the signal the timer stops. */
14022 diff -NurpP --minimal linux-4.9.82/kernel/time/time.c linux-4.9.82-vs2.3.9.7/kernel/time/time.c
14023 --- linux-4.9.82/kernel/time/time.c 2016-12-11 19:17:54.000000000 +0000
14024 +++ linux-4.9.82-vs2.3.9.7/kernel/time/time.c 2018-01-10 09:31:11.000000000 +0000
14026 #include <linux/fs.h>
14027 #include <linux/math64.h>
14028 #include <linux/ptrace.h>
14029 +#include <linux/vs_time.h>
14031 #include <asm/uaccess.h>
14032 #include <asm/unistd.h>
14033 @@ -93,7 +94,7 @@ SYSCALL_DEFINE1(stime, time_t __user *,
14037 - do_settimeofday(&tv);
14038 + vx_settimeofday(&tv);
14042 @@ -186,7 +187,7 @@ int do_sys_settimeofday64(const struct t
14046 - return do_settimeofday64(tv);
14047 + return vx_settimeofday64(tv);
14051 diff -NurpP --minimal linux-4.9.82/kernel/time/timekeeping.c linux-4.9.82-vs2.3.9.7/kernel/time/timekeeping.c
14052 --- linux-4.9.82/kernel/time/timekeeping.c 2018-02-22 21:18:57.000000000 +0000
14053 +++ linux-4.9.82-vs2.3.9.7/kernel/time/timekeeping.c 2018-01-10 02:50:49.000000000 +0000
14055 #include <linux/stop_machine.h>
14056 #include <linux/pvclock_gtod.h>
14057 #include <linux/compiler.h>
14058 +#include <linux/vs_time.h>
14060 #include "tick-internal.h"
14061 #include "ntp_internal.h"
14062 diff -NurpP --minimal linux-4.9.82/kernel/time/timer.c linux-4.9.82-vs2.3.9.7/kernel/time/timer.c
14063 --- linux-4.9.82/kernel/time/timer.c 2018-02-22 21:18:57.000000000 +0000
14064 +++ linux-4.9.82-vs2.3.9.7/kernel/time/timer.c 2018-01-25 00:21:32.000000000 +0000
14066 #include <linux/sched/sysctl.h>
14067 #include <linux/slab.h>
14068 #include <linux/compat.h>
14069 +#include <linux/vs_base.h>
14070 +#include <linux/vs_cvirt.h>
14071 +#include <linux/vs_pid.h>
14072 +#include <linux/vserver/sched.h>
14074 #include <asm/uaccess.h>
14075 #include <asm/unistd.h>
14076 diff -NurpP --minimal linux-4.9.82/kernel/user_namespace.c linux-4.9.82-vs2.3.9.7/kernel/user_namespace.c
14077 --- linux-4.9.82/kernel/user_namespace.c 2016-12-11 19:17:54.000000000 +0000
14078 +++ linux-4.9.82-vs2.3.9.7/kernel/user_namespace.c 2018-01-10 02:50:49.000000000 +0000
14080 #include <linux/ctype.h>
14081 #include <linux/projid.h>
14082 #include <linux/fs_struct.h>
14083 +#include <linux/vserver/global.h>
14085 static struct kmem_cache *user_ns_cachep __read_mostly;
14086 static DEFINE_MUTEX(userns_state_mutex);
14087 @@ -115,6 +116,7 @@ int create_user_ns(struct cred *new)
14089 atomic_set(&ns->count, 1);
14090 /* Leave the new->user_ns reference with the new user namespace. */
14091 + atomic_inc(&vs_global_user_ns);
14092 ns->parent = parent_ns;
14093 ns->level = parent_ns->level + 1;
14095 @@ -185,6 +187,7 @@ static void free_user_ns(struct work_str
14096 key_put(ns->persistent_keyring_register);
14098 ns_free_inum(&ns->ns);
14099 + atomic_dec(&vs_global_user_ns);
14100 kmem_cache_free(user_ns_cachep, ns);
14101 dec_user_namespaces(ucounts);
14103 @@ -404,6 +407,18 @@ gid_t from_kgid_munged(struct user_names
14105 EXPORT_SYMBOL(from_kgid_munged);
14107 +ktag_t make_ktag(struct user_namespace *from, vtag_t tag)
14109 + return KTAGT_INIT(tag);
14111 +EXPORT_SYMBOL(make_ktag);
14113 +vtag_t from_ktag(struct user_namespace *to, ktag_t tag)
14115 + return __ktag_val(tag);
14117 +EXPORT_SYMBOL(from_ktag);
14120 * make_kprojid - Map a user-namespace projid pair into a kprojid.
14121 * @ns: User namespace that the projid is in
14122 diff -NurpP --minimal linux-4.9.82/kernel/utsname.c linux-4.9.82-vs2.3.9.7/kernel/utsname.c
14123 --- linux-4.9.82/kernel/utsname.c 2016-12-11 19:17:54.000000000 +0000
14124 +++ linux-4.9.82-vs2.3.9.7/kernel/utsname.c 2018-01-10 09:05:33.000000000 +0000
14126 #include <linux/slab.h>
14127 #include <linux/user_namespace.h>
14128 #include <linux/proc_ns.h>
14129 +#include <linux/vserver/global.h>
14131 static struct ucounts *inc_uts_namespaces(struct user_namespace *ns)
14133 @@ -32,8 +33,10 @@ static struct uts_namespace *create_uts_
14134 struct uts_namespace *uts_ns;
14136 uts_ns = kmalloc(sizeof(struct uts_namespace), GFP_KERNEL);
14139 kref_init(&uts_ns->kref);
14140 + atomic_inc(&vs_global_uts_ns);
14145 @@ -111,6 +114,7 @@ void free_uts_ns(struct kref *kref)
14146 dec_uts_namespaces(ns->ucounts);
14147 put_user_ns(ns->user_ns);
14148 ns_free_inum(&ns->ns);
14149 + atomic_dec(&vs_global_uts_ns);
14153 diff -NurpP --minimal linux-4.9.82/kernel/vserver/Kconfig linux-4.9.82-vs2.3.9.7/kernel/vserver/Kconfig
14154 --- linux-4.9.82/kernel/vserver/Kconfig 1970-01-01 00:00:00.000000000 +0000
14155 +++ linux-4.9.82-vs2.3.9.7/kernel/vserver/Kconfig 2018-01-10 02:50:49.000000000 +0000
14158 +# Linux VServer configuration
14161 +menu "Linux VServer"
14163 +config VSERVER_AUTO_LBACK
14164 + bool "Automatically Assign Loopback IP"
14167 + Automatically assign a guest specific loopback
14168 + IP and add it to the kernel network stack on
14171 +config VSERVER_AUTO_SINGLE
14172 + bool "Automatic Single IP Special Casing"
14175 + This allows network contexts with a single IP to
14176 + automatically remap 0.0.0.0 bindings to that IP,
14177 + avoiding further network checks and improving
14180 + (note: such guests do not allow to change the ip
14181 + on the fly and do not show loopback addresses)
14183 +config VSERVER_COWBL
14184 + bool "Enable COW Immutable Link Breaking"
14187 + This enables the COW (Copy-On-Write) link break code.
14188 + It allows you to treat unified files like normal files
14189 + when writing to them (which will implicitely break the
14190 + link and create a copy of the unified file)
14192 +config VSERVER_VTIME
14193 + bool "Enable Virtualized Guest Time (EXPERIMENTAL)"
14196 + This enables per guest time offsets to allow for
14197 + adjusting the system clock individually per guest.
14198 + this adds some overhead to the time functions and
14199 + therefore should not be enabled without good reason.
14201 +config VSERVER_DEVICE
14202 + bool "Enable Guest Device Mapping (EXPERIMENTAL)"
14205 + This enables generic device remapping.
14207 +config VSERVER_PROC_SECURE
14208 + bool "Enable Proc Security"
14209 + depends on PROC_FS
14212 + This configures ProcFS security to initially hide
14213 + non-process entries for all contexts except the main and
14214 + spectator context (i.e. for all guests), which is a secure
14217 + (note: on 1.2x the entries were visible by default)
14220 + prompt "Persistent Inode Tagging"
14221 + default TAGGING_ID24
14223 + This adds persistent context information to filesystems
14224 + mounted with the tagxid option. Tagging is a requirement
14225 + for per-context disk limits and per-context quota.
14228 +config TAGGING_NONE
14231 + do not store per-context information in inodes.
14233 +config TAGGING_UID16
14234 + bool "UID16/GID32"
14236 + reduces UID to 16 bit, but leaves GID at 32 bit.
14238 +config TAGGING_GID16
14239 + bool "UID32/GID16"
14241 + reduces GID to 16 bit, but leaves UID at 32 bit.
14243 +config TAGGING_ID24
14244 + bool "UID24/GID24"
14246 + uses the upper 8bit from UID and GID for XID tagging
14247 + which leaves 24bit for UID/GID each, which should be
14248 + more than sufficient for normal use.
14250 +config TAGGING_INTERN
14251 + bool "UID32/GID32"
14253 + this uses otherwise reserved inode fields in the on
14254 + disk representation, which limits the use to a few
14255 + filesystems (currently ext2 and ext3)
14260 + bool "Tag NFSD User Auth and Files"
14263 + Enable this if you do want the in-kernel NFS
14264 + Server to use the tagging specified above.
14265 + (will require patched clients too)
14267 +config VSERVER_PRIVACY
14268 + bool "Honor Privacy Aspects of Guests"
14271 + When enabled, most context checks will disallow
14272 + access to structures assigned to a specific context,
14273 + like ptys or loop devices.
14275 +config VSERVER_CONTEXTS
14276 + int "Maximum number of Contexts (1-65533)" if EMBEDDED
14278 + default "768" if 64BIT
14281 + This setting will optimize certain data structures
14282 + and memory allocations according to the expected
14285 + note: this is not a strict upper limit.
14287 +config VSERVER_WARN
14288 + bool "VServer Warnings"
14291 + This enables various runtime warnings, which will
14292 + notify about potential manipulation attempts or
14293 + resource shortage. It is generally considered to
14294 + be a good idea to have that enabled.
14296 +config VSERVER_WARN_DEVPTS
14297 + bool "VServer DevPTS Warnings"
14298 + depends on VSERVER_WARN
14301 + This enables DevPTS related warnings, issued when a
14302 + process inside a context tries to lookup or access
14303 + a dynamic pts from the host or a different context.
14305 +config VSERVER_DEBUG
14306 + bool "VServer Debugging Code"
14309 + Set this to yes if you want to be able to activate
14310 + debugging output at runtime. It adds a very small
14311 + overhead to all vserver related functions and
14312 + increases the kernel size by about 20k.
14314 +config VSERVER_HISTORY
14315 + bool "VServer History Tracing"
14316 + depends on VSERVER_DEBUG
14319 + Set this to yes if you want to record the history of
14320 + linux-vserver activities, so they can be replayed in
14321 + the event of a kernel panic or oops.
14323 +config VSERVER_HISTORY_SIZE
14324 + int "Per-CPU History Size (32-65536)"
14325 + depends on VSERVER_HISTORY
14329 + This allows you to specify the number of entries in
14330 + the per-CPU history buffer.
14332 +config VSERVER_EXTRA_MNT_CHECK
14333 + bool "Extra Checks for Reachability"
14336 + Set this to yes if you want to do extra checks for
14337 + vfsmount reachability in the proc filesystem code.
14338 + This shouldn't be required on any setup utilizing
14342 + prompt "Quotes used in debug and warn messages"
14343 + default QUOTES_ISO8859
14345 +config QUOTES_ISO8859
14346 + bool "Extended ASCII (ISO 8859) angle quotes"
14348 + This uses the extended ASCII characters \xbb
14349 + and \xab for quoting file and process names.
14351 +config QUOTES_UTF8
14352 + bool "UTF-8 angle quotes"
14354 + This uses the the UTF-8 sequences for angle
14355 + quotes to quote file and process names.
14357 +config QUOTES_ASCII
14358 + bool "ASCII single quotes"
14360 + This uses the ASCII single quote character
14361 + (\x27) to quote file and process names.
14371 + select NAMESPACES
14377 +config VSERVER_SECURITY
14379 + depends on SECURITY
14381 + select SECURITY_CAPABILITIES
14383 +config VSERVER_DISABLED
14387 diff -NurpP --minimal linux-4.9.82/kernel/vserver/Makefile linux-4.9.82-vs2.3.9.7/kernel/vserver/Makefile
14388 --- linux-4.9.82/kernel/vserver/Makefile 1970-01-01 00:00:00.000000000 +0000
14389 +++ linux-4.9.82-vs2.3.9.7/kernel/vserver/Makefile 2018-01-10 02:50:49.000000000 +0000
14392 +# Makefile for the Linux vserver routines.
14396 +obj-y += vserver.o
14398 +vserver-y := switch.o context.o space.o sched.o network.o inode.o \
14399 + limit.o cvirt.o cacct.o signal.o helper.o init.o \
14402 +vserver-$(CONFIG_INET) += inet.o
14403 +vserver-$(CONFIG_PROC_FS) += proc.o
14404 +vserver-$(CONFIG_VSERVER_DEBUG) += sysctl.o debug.o
14405 +vserver-$(CONFIG_VSERVER_HISTORY) += history.o
14406 +vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o
14407 +vserver-$(CONFIG_VSERVER_DEVICE) += device.o
14409 diff -NurpP --minimal linux-4.9.82/kernel/vserver/cacct.c linux-4.9.82-vs2.3.9.7/kernel/vserver/cacct.c
14410 --- linux-4.9.82/kernel/vserver/cacct.c 1970-01-01 00:00:00.000000000 +0000
14411 +++ linux-4.9.82-vs2.3.9.7/kernel/vserver/cacct.c 2018-01-10 02:50:49.000000000 +0000
14414 + * linux/kernel/vserver/cacct.c
14416 + * Virtual Server: Context Accounting
14418 + * Copyright (C) 2006-2007 Herbert P?tzl
14420 + * V0.01 added accounting stats
14424 +#include <linux/types.h>
14425 +#include <linux/vs_context.h>
14426 +#include <linux/vserver/cacct_cmd.h>
14427 +#include <linux/vserver/cacct_int.h>
14429 +#include <asm/errno.h>
14430 +#include <asm/uaccess.h>
14433 +int vc_sock_stat(struct vx_info *vxi, void __user *data)
14435 + struct vcmd_sock_stat_v0 vc_data;
14438 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
14441 + field = vc_data.field;
14442 + if ((field < 0) || (field >= VXA_SOCK_SIZE))
14445 + for (j = 0; j < 3; j++) {
14446 + vc_data.count[j] = vx_sock_count(&vxi->cacct, field, j);
14447 + vc_data.total[j] = vx_sock_total(&vxi->cacct, field, j);
14450 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
14455 diff -NurpP --minimal linux-4.9.82/kernel/vserver/cacct_init.h linux-4.9.82-vs2.3.9.7/kernel/vserver/cacct_init.h
14456 --- linux-4.9.82/kernel/vserver/cacct_init.h 1970-01-01 00:00:00.000000000 +0000
14457 +++ linux-4.9.82-vs2.3.9.7/kernel/vserver/cacct_init.h 2018-01-10 02:50:49.000000000 +0000
14461 +static inline void vx_info_init_cacct(struct _vx_cacct *cacct)
14466 + for (i = 0; i < VXA_SOCK_SIZE; i++) {
14467 + for (j = 0; j < 3; j++) {
14468 + atomic_long_set(&cacct->sock[i][j].count, 0);
14469 + atomic_long_set(&cacct->sock[i][j].total, 0);
14472 + for (i = 0; i < 8; i++)
14473 + atomic_set(&cacct->slab[i], 0);
14474 + for (i = 0; i < 5; i++)
14475 + for (j = 0; j < 4; j++)
14476 + atomic_set(&cacct->page[i][j], 0);
14479 +static inline void vx_info_exit_cacct(struct _vx_cacct *cacct)
14484 diff -NurpP --minimal linux-4.9.82/kernel/vserver/cacct_proc.h linux-4.9.82-vs2.3.9.7/kernel/vserver/cacct_proc.h
14485 --- linux-4.9.82/kernel/vserver/cacct_proc.h 1970-01-01 00:00:00.000000000 +0000
14486 +++ linux-4.9.82-vs2.3.9.7/kernel/vserver/cacct_proc.h 2018-01-10 02:50:49.000000000 +0000
14488 +#ifndef _VX_CACCT_PROC_H
14489 +#define _VX_CACCT_PROC_H
14491 +#include <linux/vserver/cacct_int.h>
14494 +#define VX_SOCKA_TOP \
14495 + "Type\t recv #/bytes\t\t send #/bytes\t\t fail #/bytes\n"
14497 +static inline int vx_info_proc_cacct(struct _vx_cacct *cacct, char *buffer)
14499 + int i, j, length = 0;
14500 + static char *type[VXA_SOCK_SIZE] = {
14501 + "UNSPEC", "UNIX", "INET", "INET6", "PACKET", "OTHER"
14504 + length += sprintf(buffer + length, VX_SOCKA_TOP);
14505 + for (i = 0; i < VXA_SOCK_SIZE; i++) {
14506 + length += sprintf(buffer + length, "%s:", type[i]);
14507 + for (j = 0; j < 3; j++) {
14508 + length += sprintf(buffer + length,
14509 + "\t%10lu/%-10lu",
14510 + vx_sock_count(cacct, i, j),
14511 + vx_sock_total(cacct, i, j));
14513 + buffer[length++] = '\n';
14516 + length += sprintf(buffer + length, "\n");
14517 + length += sprintf(buffer + length,
14518 + "slab:\t %8u %8u %8u %8u\n",
14519 + atomic_read(&cacct->slab[1]),
14520 + atomic_read(&cacct->slab[4]),
14521 + atomic_read(&cacct->slab[0]),
14522 + atomic_read(&cacct->slab[2]));
14524 + length += sprintf(buffer + length, "\n");
14525 + for (i = 0; i < 5; i++) {
14526 + length += sprintf(buffer + length,
14527 + "page[%d]: %8u %8u %8u %8u\t %8u %8u %8u %8u\n", i,
14528 + atomic_read(&cacct->page[i][0]),
14529 + atomic_read(&cacct->page[i][1]),
14530 + atomic_read(&cacct->page[i][2]),
14531 + atomic_read(&cacct->page[i][3]),
14532 + atomic_read(&cacct->page[i][4]),
14533 + atomic_read(&cacct->page[i][5]),
14534 + atomic_read(&cacct->page[i][6]),
14535 + atomic_read(&cacct->page[i][7]));
14540 +#endif /* _VX_CACCT_PROC_H */
14541 diff -NurpP --minimal linux-4.9.82/kernel/vserver/context.c linux-4.9.82-vs2.3.9.7/kernel/vserver/context.c
14542 --- linux-4.9.82/kernel/vserver/context.c 1970-01-01 00:00:00.000000000 +0000
14543 +++ linux-4.9.82-vs2.3.9.7/kernel/vserver/context.c 2018-01-10 02:50:49.000000000 +0000
14546 + * linux/kernel/vserver/context.c
14548 + * Virtual Server: Context Support
14550 + * Copyright (C) 2003-2011 Herbert P?tzl
14552 + * V0.01 context helper
14553 + * V0.02 vx_ctx_kill syscall command
14554 + * V0.03 replaced context_info calls
14555 + * V0.04 redesign of struct (de)alloc
14556 + * V0.05 rlimit basic implementation
14557 + * V0.06 task_xid and info commands
14558 + * V0.07 context flags and caps
14559 + * V0.08 switch to RCU based hash
14560 + * V0.09 revert to non RCU for now
14561 + * V0.10 and back to working RCU hash
14562 + * V0.11 and back to locking again
14563 + * V0.12 referenced context store
14564 + * V0.13 separate per cpu data
14565 + * V0.14 changed vcmds to vxi arg
14566 + * V0.15 added context stat
14567 + * V0.16 have __create claim() the vxi
14568 + * V0.17 removed older and legacy stuff
14569 + * V0.18 added user credentials
14570 + * V0.19 added warn mask
14574 +#include <linux/slab.h>
14575 +#include <linux/types.h>
14576 +#include <linux/security.h>
14577 +#include <linux/pid_namespace.h>
14578 +#include <linux/capability.h>
14580 +#include <linux/vserver/context.h>
14581 +#include <linux/vserver/network.h>
14582 +#include <linux/vserver/debug.h>
14583 +#include <linux/vserver/limit.h>
14584 +#include <linux/vserver/limit_int.h>
14585 +#include <linux/vserver/space.h>
14586 +#include <linux/init_task.h>
14587 +#include <linux/fs_struct.h>
14588 +#include <linux/cred.h>
14590 +#include <linux/vs_context.h>
14591 +#include <linux/vs_limit.h>
14592 +#include <linux/vs_pid.h>
14593 +#include <linux/vserver/context_cmd.h>
14595 +#include "cvirt_init.h"
14596 +#include "cacct_init.h"
14597 +#include "limit_init.h"
14598 +#include "sched_init.h"
14601 +atomic_t vx_global_ctotal = ATOMIC_INIT(0);
14602 +atomic_t vx_global_cactive = ATOMIC_INIT(0);
14605 +/* now inactive context structures */
14607 +static struct hlist_head vx_info_inactive = HLIST_HEAD_INIT;
14609 +static DEFINE_SPINLOCK(vx_info_inactive_lock);
14612 +/* __alloc_vx_info()
14614 + * allocate an initialized vx_info struct
14615 + * doesn't make it visible (hash) */
14617 +static struct vx_info *__alloc_vx_info(vxid_t xid)
14619 + struct vx_info *new = NULL;
14622 + vxdprintk(VXD_CBIT(xid, 0), "alloc_vx_info(%d)*", xid);
14624 + /* would this benefit from a slab cache? */
14625 + new = kmalloc(sizeof(struct vx_info), GFP_KERNEL);
14629 + memset(new, 0, sizeof(struct vx_info));
14631 + new->ptr_pc = alloc_percpu(struct _vx_info_pc);
14632 + if (!new->ptr_pc)
14635 + new->vx_id = xid;
14636 + INIT_HLIST_NODE(&new->vx_hlist);
14637 + atomic_set(&new->vx_usecnt, 0);
14638 + atomic_set(&new->vx_tasks, 0);
14639 + new->vx_parent = NULL;
14640 + new->vx_state = 0;
14641 + init_waitqueue_head(&new->vx_wait);
14643 + /* prepare reaper */
14644 + get_task_struct(init_pid_ns.child_reaper);
14645 + new->vx_reaper = init_pid_ns.child_reaper;
14646 + new->vx_badness_bias = 0;
14648 + /* rest of init goes here */
14649 + vx_info_init_limit(&new->limit);
14650 + vx_info_init_sched(&new->sched);
14651 + vx_info_init_cvirt(&new->cvirt);
14652 + vx_info_init_cacct(&new->cacct);
14654 + /* per cpu data structures */
14655 + for_each_possible_cpu(cpu) {
14656 + vx_info_init_sched_pc(
14657 + &vx_per_cpu(new, sched_pc, cpu), cpu);
14658 + vx_info_init_cvirt_pc(
14659 + &vx_per_cpu(new, cvirt_pc, cpu), cpu);
14662 + new->vx_flags = VXF_INIT_SET;
14663 + new->vx_bcaps = CAP_FULL_SET; // maybe ~CAP_SETPCAP
14664 + new->vx_ccaps = 0;
14665 + new->vx_umask = 0;
14666 + new->vx_wmask = 0;
14668 + new->reboot_cmd = 0;
14669 + new->exit_code = 0;
14671 + // preconfig spaces
14672 + for (index = 0; index < VX_SPACES; index++) {
14673 + struct _vx_space *space = &new->space[index];
14676 + spin_lock(&init_fs.lock);
14678 + spin_unlock(&init_fs.lock);
14679 + space->vx_fs = &init_fs;
14681 + /* FIXME: do we want defaults? */
14682 + // space->vx_real_cred = 0;
14683 + // space->vx_cred = 0;
14687 + vxdprintk(VXD_CBIT(xid, 0),
14688 + "alloc_vx_info(%d) = %p", xid, new);
14689 + vxh_alloc_vx_info(new);
14690 + atomic_inc(&vx_global_ctotal);
14699 +/* __dealloc_vx_info()
14701 + * final disposal of vx_info */
14703 +static void __dealloc_vx_info(struct vx_info *vxi)
14705 +#ifdef CONFIG_VSERVER_WARN
14706 + struct vx_info_save vxis;
14709 + vxdprintk(VXD_CBIT(xid, 0),
14710 + "dealloc_vx_info(%p)", vxi);
14711 + vxh_dealloc_vx_info(vxi);
14713 +#ifdef CONFIG_VSERVER_WARN
14714 + enter_vx_info(vxi, &vxis);
14715 + vx_info_exit_limit(&vxi->limit);
14716 + vx_info_exit_sched(&vxi->sched);
14717 + vx_info_exit_cvirt(&vxi->cvirt);
14718 + vx_info_exit_cacct(&vxi->cacct);
14720 + for_each_possible_cpu(cpu) {
14721 + vx_info_exit_sched_pc(
14722 + &vx_per_cpu(vxi, sched_pc, cpu), cpu);
14723 + vx_info_exit_cvirt_pc(
14724 + &vx_per_cpu(vxi, cvirt_pc, cpu), cpu);
14726 + leave_vx_info(&vxis);
14730 + vxi->vx_state |= VXS_RELEASED;
14733 + free_percpu(vxi->ptr_pc);
14736 + atomic_dec(&vx_global_ctotal);
14739 +static void __shutdown_vx_info(struct vx_info *vxi)
14741 + struct nsproxy *nsproxy;
14742 + struct fs_struct *fs;
14743 + struct cred *cred;
14748 + vxi->vx_state |= VXS_SHUTDOWN;
14749 + vs_state_change(vxi, VSC_SHUTDOWN);
14751 + for (index = 0; index < VX_SPACES; index++) {
14752 + struct _vx_space *space = &vxi->space[index];
14754 + nsproxy = xchg(&space->vx_nsproxy, NULL);
14756 + put_nsproxy(nsproxy);
14758 + fs = xchg(&space->vx_fs, NULL);
14759 + spin_lock(&fs->lock);
14760 + kill = !--fs->users;
14761 + spin_unlock(&fs->lock);
14763 + free_fs_struct(fs);
14765 + cred = (struct cred *)xchg(&space->vx_cred, NULL);
14767 + abort_creds(cred);
14771 +/* exported stuff */
14773 +void free_vx_info(struct vx_info *vxi)
14775 + unsigned long flags;
14778 + /* check for reference counts first */
14779 + BUG_ON(atomic_read(&vxi->vx_usecnt));
14780 + BUG_ON(atomic_read(&vxi->vx_tasks));
14782 + /* context must not be hashed */
14783 + BUG_ON(vx_info_state(vxi, VXS_HASHED));
14785 + /* context shutdown is mandatory */
14786 + BUG_ON(!vx_info_state(vxi, VXS_SHUTDOWN));
14788 + /* spaces check */
14789 + for (index = 0; index < VX_SPACES; index++) {
14790 + struct _vx_space *space = &vxi->space[index];
14792 + BUG_ON(space->vx_nsproxy);
14793 + BUG_ON(space->vx_fs);
14794 + // BUG_ON(space->vx_real_cred);
14795 + // BUG_ON(space->vx_cred);
14798 + spin_lock_irqsave(&vx_info_inactive_lock, flags);
14799 + hlist_del(&vxi->vx_hlist);
14800 + spin_unlock_irqrestore(&vx_info_inactive_lock, flags);
14802 + __dealloc_vx_info(vxi);
14806 +/* hash table for vx_info hash */
14808 +#define VX_HASH_SIZE 13
14810 +static struct hlist_head vx_info_hash[VX_HASH_SIZE] =
14811 + { [0 ... VX_HASH_SIZE-1] = HLIST_HEAD_INIT };
14813 +static DEFINE_SPINLOCK(vx_info_hash_lock);
14816 +static inline unsigned int __hashval(vxid_t xid)
14818 + return (xid % VX_HASH_SIZE);
14823 +/* __hash_vx_info()
14825 + * add the vxi to the global hash table
14826 + * requires the hash_lock to be held */
14828 +static inline void __hash_vx_info(struct vx_info *vxi)
14830 + struct hlist_head *head;
14832 + vxd_assert_lock(&vx_info_hash_lock);
14833 + vxdprintk(VXD_CBIT(xid, 4),
14834 + "__hash_vx_info: %p[#%d]", vxi, vxi->vx_id);
14835 + vxh_hash_vx_info(vxi);
14837 + /* context must not be hashed */
14838 + BUG_ON(vx_info_state(vxi, VXS_HASHED));
14840 + vxi->vx_state |= VXS_HASHED;
14841 + head = &vx_info_hash[__hashval(vxi->vx_id)];
14842 + hlist_add_head(&vxi->vx_hlist, head);
14843 + atomic_inc(&vx_global_cactive);
14846 +/* __unhash_vx_info()
14848 + * remove the vxi from the global hash table
14849 + * requires the hash_lock to be held */
14851 +static inline void __unhash_vx_info(struct vx_info *vxi)
14853 + unsigned long flags;
14855 + vxd_assert_lock(&vx_info_hash_lock);
14856 + vxdprintk(VXD_CBIT(xid, 4),
14857 + "__unhash_vx_info: %p[#%d.%d.%d]", vxi, vxi->vx_id,
14858 + atomic_read(&vxi->vx_usecnt), atomic_read(&vxi->vx_tasks));
14859 + vxh_unhash_vx_info(vxi);
14861 + /* context must be hashed */
14862 + BUG_ON(!vx_info_state(vxi, VXS_HASHED));
14863 + /* but without tasks */
14864 + BUG_ON(atomic_read(&vxi->vx_tasks));
14866 + vxi->vx_state &= ~VXS_HASHED;
14867 + hlist_del_init(&vxi->vx_hlist);
14868 + spin_lock_irqsave(&vx_info_inactive_lock, flags);
14869 + hlist_add_head(&vxi->vx_hlist, &vx_info_inactive);
14870 + spin_unlock_irqrestore(&vx_info_inactive_lock, flags);
14871 + atomic_dec(&vx_global_cactive);
14875 +/* __lookup_vx_info()
14877 + * requires the hash_lock to be held
14878 + * doesn't increment the vx_refcnt */
14880 +static inline struct vx_info *__lookup_vx_info(vxid_t xid)
14882 + struct hlist_head *head = &vx_info_hash[__hashval(xid)];
14883 + struct hlist_node *pos;
14884 + struct vx_info *vxi;
14886 + vxd_assert_lock(&vx_info_hash_lock);
14887 + hlist_for_each(pos, head) {
14888 + vxi = hlist_entry(pos, struct vx_info, vx_hlist);
14890 + if (vxi->vx_id == xid)
14895 + vxdprintk(VXD_CBIT(xid, 0),
14896 + "__lookup_vx_info(#%u): %p[#%u]",
14897 + xid, vxi, vxi ? vxi->vx_id : 0);
14898 + vxh_lookup_vx_info(vxi, xid);
14903 +/* __create_vx_info()
14905 + * create the requested context
14906 + * get(), claim() and hash it */
14908 +static struct vx_info *__create_vx_info(int id)
14910 + struct vx_info *new, *vxi = NULL;
14912 + vxdprintk(VXD_CBIT(xid, 1), "create_vx_info(%d)*", id);
14914 + if (!(new = __alloc_vx_info(id)))
14915 + return ERR_PTR(-ENOMEM);
14917 + /* required to make dynamic xids unique */
14918 + spin_lock(&vx_info_hash_lock);
14920 + /* static context requested */
14921 + if ((vxi = __lookup_vx_info(id))) {
14922 + vxdprintk(VXD_CBIT(xid, 0),
14923 + "create_vx_info(%d) = %p (already there)", id, vxi);
14924 + if (vx_info_flags(vxi, VXF_STATE_SETUP, 0))
14925 + vxi = ERR_PTR(-EBUSY);
14927 + vxi = ERR_PTR(-EEXIST);
14930 + /* new context */
14931 + vxdprintk(VXD_CBIT(xid, 0),
14932 + "create_vx_info(%d) = %p (new)", id, new);
14933 + claim_vx_info(new, NULL);
14934 + __hash_vx_info(get_vx_info(new));
14935 + vxi = new, new = NULL;
14938 + spin_unlock(&vx_info_hash_lock);
14939 + vxh_create_vx_info(IS_ERR(vxi) ? NULL : vxi, id);
14941 + __dealloc_vx_info(new);
14946 +/* exported stuff */
14949 +void unhash_vx_info(struct vx_info *vxi)
14951 + spin_lock(&vx_info_hash_lock);
14952 + __unhash_vx_info(vxi);
14953 + spin_unlock(&vx_info_hash_lock);
14954 + __shutdown_vx_info(vxi);
14955 + __wakeup_vx_info(vxi);
14959 +/* lookup_vx_info()
14961 + * search for a vx_info and get() it
14962 + * negative id means current */
14964 +struct vx_info *lookup_vx_info(int id)
14966 + struct vx_info *vxi = NULL;
14969 + vxi = get_vx_info(current_vx_info());
14970 + } else if (id > 1) {
14971 + spin_lock(&vx_info_hash_lock);
14972 + vxi = get_vx_info(__lookup_vx_info(id));
14973 + spin_unlock(&vx_info_hash_lock);
14978 +/* xid_is_hashed()
14980 + * verify that xid is still hashed */
14982 +int xid_is_hashed(vxid_t xid)
14986 + spin_lock(&vx_info_hash_lock);
14987 + hashed = (__lookup_vx_info(xid) != NULL);
14988 + spin_unlock(&vx_info_hash_lock);
14992 +#ifdef CONFIG_PROC_FS
14996 + * get a subset of hashed xids for proc
14997 + * assumes size is at least one */
14999 +int get_xid_list(int index, unsigned int *xids, int size)
15001 + int hindex, nr_xids = 0;
15003 + /* only show current and children */
15004 + if (!vx_check(0, VS_ADMIN | VS_WATCH)) {
15007 + xids[nr_xids] = vx_current_xid();
15011 + for (hindex = 0; hindex < VX_HASH_SIZE; hindex++) {
15012 + struct hlist_head *head = &vx_info_hash[hindex];
15013 + struct hlist_node *pos;
15015 + spin_lock(&vx_info_hash_lock);
15016 + hlist_for_each(pos, head) {
15017 + struct vx_info *vxi;
15022 + vxi = hlist_entry(pos, struct vx_info, vx_hlist);
15023 + xids[nr_xids] = vxi->vx_id;
15024 + if (++nr_xids >= size) {
15025 + spin_unlock(&vx_info_hash_lock);
15029 + /* keep the lock time short */
15030 + spin_unlock(&vx_info_hash_lock);
15037 +#ifdef CONFIG_VSERVER_DEBUG
15039 +void dump_vx_info_inactive(int level)
15041 + struct hlist_node *entry, *next;
15043 + hlist_for_each_safe(entry, next, &vx_info_inactive) {
15044 + struct vx_info *vxi =
15045 + list_entry(entry, struct vx_info, vx_hlist);
15047 + dump_vx_info(vxi, level);
15054 +int vx_migrate_user(struct task_struct *p, struct vx_info *vxi)
15056 + struct user_struct *new_user, *old_user;
15061 + if (vx_info_flags(vxi, VXF_INFO_PRIVATE, 0))
15064 + new_user = alloc_uid(vxi->vx_id, p->uid);
15068 + old_user = p->user;
15069 + if (new_user != old_user) {
15070 + atomic_inc(&new_user->processes);
15071 + atomic_dec(&old_user->processes);
15072 + p->user = new_user;
15074 + free_uid(old_user);
15080 +void vx_mask_cap_bset(struct vx_info *vxi, struct task_struct *p)
15082 + // p->cap_effective &= vxi->vx_cap_bset;
15083 + p->cap_effective =
15084 + cap_intersect(p->cap_effective, vxi->cap_bset);
15085 + // p->cap_inheritable &= vxi->vx_cap_bset;
15086 + p->cap_inheritable =
15087 + cap_intersect(p->cap_inheritable, vxi->cap_bset);
15088 + // p->cap_permitted &= vxi->vx_cap_bset;
15089 + p->cap_permitted =
15090 + cap_intersect(p->cap_permitted, vxi->cap_bset);
15095 +#include <linux/file.h>
15096 +#include <linux/fdtable.h>
15098 +static int vx_openfd_task(struct task_struct *tsk)
15100 + struct files_struct *files = tsk->files;
15101 + struct fdtable *fdt;
15102 + const unsigned long *bptr;
15103 + int count, total;
15105 + /* no rcu_read_lock() because of spin_lock() */
15106 + spin_lock(&files->file_lock);
15107 + fdt = files_fdtable(files);
15108 + bptr = fdt->open_fds;
15109 + count = fdt->max_fds / (sizeof(unsigned long) * 8);
15110 + for (total = 0; count > 0; count--) {
15112 + total += hweight_long(*bptr);
15115 + spin_unlock(&files->file_lock);
15120 +/* for *space compatibility */
15122 +asmlinkage long sys_unshare(unsigned long);
15125 + * migrate task to new context
15126 + * gets vxi, puts old_vxi on change
15127 + * optionally unshares namespaces (hack)
15130 +int vx_migrate_task(struct task_struct *p, struct vx_info *vxi, int unshare)
15132 + struct vx_info *old_vxi;
15138 + vxdprintk(VXD_CBIT(xid, 5),
15139 + "vx_migrate_task(%p,%p[#%d.%d])", p, vxi,
15140 + vxi->vx_id, atomic_read(&vxi->vx_usecnt));
15142 + if (vx_info_flags(vxi, VXF_INFO_PRIVATE, 0) &&
15143 + !vx_info_flags(vxi, VXF_STATE_SETUP, 0))
15146 + if (vx_info_state(vxi, VXS_SHUTDOWN))
15149 + old_vxi = task_get_vx_info(p);
15150 + if (old_vxi == vxi)
15153 +// if (!(ret = vx_migrate_user(p, vxi))) {
15158 + openfd = vx_openfd_task(p);
15161 + atomic_dec(&old_vxi->cvirt.nr_threads);
15162 + atomic_dec(&old_vxi->cvirt.nr_running);
15163 + __rlim_dec(&old_vxi->limit, RLIMIT_NPROC);
15164 + /* FIXME: what about the struct files here? */
15165 + __rlim_sub(&old_vxi->limit, VLIMIT_OPENFD, openfd);
15166 + /* account for the executable */
15167 + __rlim_dec(&old_vxi->limit, VLIMIT_DENTRY);
15169 + atomic_inc(&vxi->cvirt.nr_threads);
15170 + atomic_inc(&vxi->cvirt.nr_running);
15171 + __rlim_inc(&vxi->limit, RLIMIT_NPROC);
15172 + /* FIXME: what about the struct files here? */
15173 + __rlim_add(&vxi->limit, VLIMIT_OPENFD, openfd);
15174 + /* account for the executable */
15175 + __rlim_inc(&vxi->limit, VLIMIT_DENTRY);
15178 + release_vx_info(old_vxi, p);
15179 + clr_vx_info(&p->vx_info);
15181 + claim_vx_info(vxi, p);
15182 + set_vx_info(&p->vx_info, vxi);
15183 + p->xid = vxi->vx_id;
15185 + vxdprintk(VXD_CBIT(xid, 5),
15186 + "moved task %p into vxi:%p[#%d]",
15187 + p, vxi, vxi->vx_id);
15189 + // vx_mask_cap_bset(vxi, p);
15192 + /* hack for *spaces to provide compatibility */
15194 + struct nsproxy *old_nsp, *new_nsp;
15196 + ret = unshare_nsproxy_namespaces(
15197 + CLONE_NEWUTS | CLONE_NEWIPC | CLONE_NEWUSER,
15198 + &new_nsp, NULL, NULL);
15202 + old_nsp = xchg(&p->nsproxy, new_nsp);
15203 + vx_set_space(vxi,
15204 + CLONE_NEWUTS | CLONE_NEWIPC | CLONE_NEWUSER, 0);
15205 + put_nsproxy(old_nsp);
15209 + put_vx_info(old_vxi);
15213 +int vx_set_reaper(struct vx_info *vxi, struct task_struct *p)
15215 + struct task_struct *old_reaper;
15216 + struct vx_info *reaper_vxi;
15221 + vxdprintk(VXD_CBIT(xid, 6),
15222 + "vx_set_reaper(%p[#%d],%p[#%d,%d])",
15223 + vxi, vxi->vx_id, p, p->xid, p->pid);
15225 + old_reaper = vxi->vx_reaper;
15226 + if (old_reaper == p)
15229 + reaper_vxi = task_get_vx_info(p);
15230 + if (reaper_vxi && reaper_vxi != vxi) {
15232 + "Unsuitable reaper [" VS_Q("%s") ",%u:#%u] "
15234 + p->comm, p->pid, p->xid, vx_current_xid());
15238 + /* set new child reaper */
15239 + get_task_struct(p);
15240 + vxi->vx_reaper = p;
15241 + put_task_struct(old_reaper);
15243 + put_vx_info(reaper_vxi);
15247 +int vx_set_init(struct vx_info *vxi, struct task_struct *p)
15252 + vxdprintk(VXD_CBIT(xid, 6),
15253 + "vx_set_init(%p[#%d],%p[#%d,%d,%d])",
15254 + vxi, vxi->vx_id, p, p->xid, p->pid, p->tgid);
15256 + vxi->vx_flags &= ~VXF_STATE_INIT;
15257 + // vxi->vx_initpid = p->tgid;
15258 + vxi->vx_initpid = p->pid;
15262 +void vx_exit_init(struct vx_info *vxi, struct task_struct *p, int code)
15264 + vxdprintk(VXD_CBIT(xid, 6),
15265 + "vx_exit_init(%p[#%d],%p[#%d,%d,%d])",
15266 + vxi, vxi->vx_id, p, p->xid, p->pid, p->tgid);
15268 + vxi->exit_code = code;
15269 + vxi->vx_initpid = 0;
15273 +void vx_set_persistent(struct vx_info *vxi)
15275 + vxdprintk(VXD_CBIT(xid, 6),
15276 + "vx_set_persistent(%p[#%d])", vxi, vxi->vx_id);
15278 + get_vx_info(vxi);
15279 + claim_vx_info(vxi, NULL);
15282 +void vx_clear_persistent(struct vx_info *vxi)
15284 + vxdprintk(VXD_CBIT(xid, 6),
15285 + "vx_clear_persistent(%p[#%d])", vxi, vxi->vx_id);
15287 + release_vx_info(vxi, NULL);
15288 + put_vx_info(vxi);
15291 +void vx_update_persistent(struct vx_info *vxi)
15293 + if (vx_info_flags(vxi, VXF_PERSISTENT, 0))
15294 + vx_set_persistent(vxi);
15296 + vx_clear_persistent(vxi);
15300 +/* task must be current or locked */
15302 +void exit_vx_info(struct task_struct *p, int code)
15304 + struct vx_info *vxi = p->vx_info;
15307 + atomic_dec(&vxi->cvirt.nr_threads);
15310 + vxi->exit_code = code;
15311 + release_vx_info(vxi, p);
15315 +void exit_vx_info_early(struct task_struct *p, int code)
15317 + struct vx_info *vxi = p->vx_info;
15320 + if (vxi->vx_initpid == p->pid)
15321 + vx_exit_init(vxi, p, code);
15322 + if (vxi->vx_reaper == p)
15323 + vx_set_reaper(vxi, init_pid_ns.child_reaper);
15328 +/* vserver syscall commands below here */
15330 +/* taks xid and vx_info functions */
15332 +#include <asm/uaccess.h>
15335 +int vc_task_xid(uint32_t id)
15340 + struct task_struct *tsk;
15343 + tsk = find_task_by_real_pid(id);
15344 + xid = (tsk) ? tsk->xid : -ESRCH;
15345 + rcu_read_unlock();
15347 + xid = vx_current_xid();
15352 +int vc_vx_info(struct vx_info *vxi, void __user *data)
15354 + struct vcmd_vx_info_v0 vc_data;
15356 + vc_data.xid = vxi->vx_id;
15357 + vc_data.initpid = vxi->vx_initpid;
15359 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
15365 +int vc_ctx_stat(struct vx_info *vxi, void __user *data)
15367 + struct vcmd_ctx_stat_v0 vc_data;
15369 + vc_data.usecnt = atomic_read(&vxi->vx_usecnt);
15370 + vc_data.tasks = atomic_read(&vxi->vx_tasks);
15372 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
15378 +/* context functions */
15380 +int vc_ctx_create(uint32_t xid, void __user *data)
15382 + struct vcmd_ctx_create vc_data = { .flagword = VXF_INIT_SET };
15383 + struct vx_info *new_vxi;
15386 + if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
15389 + if ((xid > MAX_S_CONTEXT) || (xid < 2))
15392 + new_vxi = __create_vx_info(xid);
15393 + if (IS_ERR(new_vxi))
15394 + return PTR_ERR(new_vxi);
15396 + /* initial flags */
15397 + new_vxi->vx_flags = vc_data.flagword;
15400 + if (vs_state_change(new_vxi, VSC_STARTUP))
15403 + ret = vx_migrate_task(current, new_vxi, (!data));
15407 + /* return context id on success */
15408 + ret = new_vxi->vx_id;
15410 + /* get a reference for persistent contexts */
15411 + if ((vc_data.flagword & VXF_PERSISTENT))
15412 + vx_set_persistent(new_vxi);
15414 + release_vx_info(new_vxi, NULL);
15415 + put_vx_info(new_vxi);
15420 +int vc_ctx_migrate(struct vx_info *vxi, void __user *data)
15422 + struct vcmd_ctx_migrate vc_data = { .flagword = 0 };
15425 + if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
15428 + ret = vx_migrate_task(current, vxi, 0);
15431 + if (vc_data.flagword & VXM_SET_INIT)
15432 + ret = vx_set_init(vxi, current);
15435 + if (vc_data.flagword & VXM_SET_REAPER)
15436 + ret = vx_set_reaper(vxi, current);
15441 +int vc_get_cflags(struct vx_info *vxi, void __user *data)
15443 + struct vcmd_ctx_flags_v0 vc_data;
15445 + vc_data.flagword = vxi->vx_flags;
15447 + /* special STATE flag handling */
15448 + vc_data.mask = vs_mask_flags(~0ULL, vxi->vx_flags, VXF_ONE_TIME);
15450 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
15455 +int vc_set_cflags(struct vx_info *vxi, void __user *data)
15457 + struct vcmd_ctx_flags_v0 vc_data;
15458 + uint64_t mask, trigger;
15460 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
15463 + /* special STATE flag handling */
15464 + mask = vs_mask_mask(vc_data.mask, vxi->vx_flags, VXF_ONE_TIME);
15465 + trigger = (mask & vxi->vx_flags) ^ (mask & vc_data.flagword);
15467 + if (vxi == current_vx_info()) {
15468 + /* if (trigger & VXF_STATE_SETUP)
15469 + vx_mask_cap_bset(vxi, current); */
15470 + if (trigger & VXF_STATE_INIT) {
15473 + ret = vx_set_init(vxi, current);
15476 + ret = vx_set_reaper(vxi, current);
15482 + vxi->vx_flags = vs_mask_flags(vxi->vx_flags,
15483 + vc_data.flagword, mask);
15484 + if (trigger & VXF_PERSISTENT)
15485 + vx_update_persistent(vxi);
15491 +static inline uint64_t caps_from_cap_t(kernel_cap_t c)
15493 + uint64_t v = c.cap[0] | ((uint64_t)c.cap[1] << 32);
15495 + // printk("caps_from_cap_t(%08x:%08x) = %016llx\n", c.cap[1], c.cap[0], v);
15499 +static inline kernel_cap_t cap_t_from_caps(uint64_t v)
15501 + kernel_cap_t c = __cap_empty_set;
15503 + c.cap[0] = v & 0xFFFFFFFF;
15504 + c.cap[1] = (v >> 32) & 0xFFFFFFFF;
15506 + // printk("cap_t_from_caps(%016llx) = %08x:%08x\n", v, c.cap[1], c.cap[0]);
15511 +static int do_get_caps(struct vx_info *vxi, uint64_t *bcaps, uint64_t *ccaps)
15514 + *bcaps = caps_from_cap_t(vxi->vx_bcaps);
15516 + *ccaps = vxi->vx_ccaps;
15521 +int vc_get_ccaps(struct vx_info *vxi, void __user *data)
15523 + struct vcmd_ctx_caps_v1 vc_data;
15526 + ret = do_get_caps(vxi, NULL, &vc_data.ccaps);
15529 + vc_data.cmask = ~0ULL;
15531 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
15536 +static int do_set_caps(struct vx_info *vxi,
15537 + uint64_t bcaps, uint64_t bmask, uint64_t ccaps, uint64_t cmask)
15539 + uint64_t bcold = caps_from_cap_t(vxi->vx_bcaps);
15542 + printk("do_set_caps(%16llx, %16llx, %16llx, %16llx)\n",
15543 + bcaps, bmask, ccaps, cmask);
15545 + vxi->vx_bcaps = cap_t_from_caps(
15546 + vs_mask_flags(bcold, bcaps, bmask));
15547 + vxi->vx_ccaps = vs_mask_flags(vxi->vx_ccaps, ccaps, cmask);
15552 +int vc_set_ccaps(struct vx_info *vxi, void __user *data)
15554 + struct vcmd_ctx_caps_v1 vc_data;
15556 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
15559 + return do_set_caps(vxi, 0, 0, vc_data.ccaps, vc_data.cmask);
15562 +int vc_get_bcaps(struct vx_info *vxi, void __user *data)
15564 + struct vcmd_bcaps vc_data;
15567 + ret = do_get_caps(vxi, &vc_data.bcaps, NULL);
15570 + vc_data.bmask = ~0ULL;
15572 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
15577 +int vc_set_bcaps(struct vx_info *vxi, void __user *data)
15579 + struct vcmd_bcaps vc_data;
15581 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
15584 + return do_set_caps(vxi, vc_data.bcaps, vc_data.bmask, 0, 0);
15588 +int vc_get_umask(struct vx_info *vxi, void __user *data)
15590 + struct vcmd_umask vc_data;
15592 + vc_data.umask = vxi->vx_umask;
15593 + vc_data.mask = ~0ULL;
15595 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
15600 +int vc_set_umask(struct vx_info *vxi, void __user *data)
15602 + struct vcmd_umask vc_data;
15604 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
15607 + vxi->vx_umask = vs_mask_flags(vxi->vx_umask,
15608 + vc_data.umask, vc_data.mask);
15613 +int vc_get_wmask(struct vx_info *vxi, void __user *data)
15615 + struct vcmd_wmask vc_data;
15617 + vc_data.wmask = vxi->vx_wmask;
15618 + vc_data.mask = ~0ULL;
15620 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
15625 +int vc_set_wmask(struct vx_info *vxi, void __user *data)
15627 + struct vcmd_wmask vc_data;
15629 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
15632 + vxi->vx_wmask = vs_mask_flags(vxi->vx_wmask,
15633 + vc_data.wmask, vc_data.mask);
15638 +int vc_get_badness(struct vx_info *vxi, void __user *data)
15640 + struct vcmd_badness_v0 vc_data;
15642 + vc_data.bias = vxi->vx_badness_bias;
15644 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
15649 +int vc_set_badness(struct vx_info *vxi, void __user *data)
15651 + struct vcmd_badness_v0 vc_data;
15653 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
15656 + vxi->vx_badness_bias = vc_data.bias;
15660 +#include <linux/module.h>
15662 +EXPORT_SYMBOL_GPL(free_vx_info);
15664 diff -NurpP --minimal linux-4.9.82/kernel/vserver/cvirt.c linux-4.9.82-vs2.3.9.7/kernel/vserver/cvirt.c
15665 --- linux-4.9.82/kernel/vserver/cvirt.c 1970-01-01 00:00:00.000000000 +0000
15666 +++ linux-4.9.82-vs2.3.9.7/kernel/vserver/cvirt.c 2018-01-16 00:54:54.000000000 +0000
15669 + * linux/kernel/vserver/cvirt.c
15671 + * Virtual Server: Context Virtualization
15673 + * Copyright (C) 2004-2007 Herbert P?tzl
15675 + * V0.01 broken out from limit.c
15676 + * V0.02 added utsname stuff
15677 + * V0.03 changed vcmds to vxi arg
15681 +#include <linux/types.h>
15682 +#include <linux/utsname.h>
15683 +#include <linux/vs_cvirt.h>
15684 +#include <linux/vserver/switch.h>
15685 +#include <linux/vserver/cvirt_cmd.h>
15687 +#include <asm/uaccess.h>
15690 +void vx_vsi_boottime64(struct timespec64 *boottime)
15692 + struct vx_info *vxi = current_vx_info();
15694 + set_normalized_timespec64(boottime,
15695 + boottime->tv_sec + vxi->cvirt.bias_uptime.tv_sec,
15696 + boottime->tv_nsec + vxi->cvirt.bias_uptime.tv_nsec);
15700 +void vx_vsi_uptime(struct timespec *uptime, struct timespec *idle)
15702 + struct vx_info *vxi = current_vx_info();
15704 + set_normalized_timespec(uptime,
15705 + uptime->tv_sec - vxi->cvirt.bias_uptime.tv_sec,
15706 + uptime->tv_nsec - vxi->cvirt.bias_uptime.tv_nsec);
15709 + set_normalized_timespec(idle,
15710 + idle->tv_sec - vxi->cvirt.bias_idle.tv_sec,
15711 + idle->tv_nsec - vxi->cvirt.bias_idle.tv_nsec);
15715 +uint64_t vx_idle_jiffies(void)
15717 + return init_task.utime + init_task.stime;
15722 +static inline uint32_t __update_loadavg(uint32_t load,
15723 + int wsize, int delta, int n)
15725 + unsigned long long calc, prev;
15727 + /* just set it to n */
15728 + if (unlikely(delta >= wsize))
15729 + return (n << FSHIFT);
15731 + calc = delta * n;
15733 + prev = (wsize - delta);
15736 + do_div(calc, wsize);
15741 +void vx_update_load(struct vx_info *vxi)
15743 + uint32_t now, last, delta;
15744 + unsigned int nr_running, nr_uninterruptible;
15745 + unsigned int total;
15746 + unsigned long flags;
15748 + spin_lock_irqsave(&vxi->cvirt.load_lock, flags);
15751 + last = vxi->cvirt.load_last;
15752 + delta = now - last;
15754 + if (delta < 5*HZ)
15757 + nr_running = atomic_read(&vxi->cvirt.nr_running);
15758 + nr_uninterruptible = atomic_read(&vxi->cvirt.nr_uninterruptible);
15759 + total = nr_running + nr_uninterruptible;
15761 + vxi->cvirt.load[0] = __update_loadavg(vxi->cvirt.load[0],
15762 + 60*HZ, delta, total);
15763 + vxi->cvirt.load[1] = __update_loadavg(vxi->cvirt.load[1],
15764 + 5*60*HZ, delta, total);
15765 + vxi->cvirt.load[2] = __update_loadavg(vxi->cvirt.load[2],
15766 + 15*60*HZ, delta, total);
15768 + vxi->cvirt.load_last = now;
15770 + atomic_inc(&vxi->cvirt.load_updates);
15771 + spin_unlock_irqrestore(&vxi->cvirt.load_lock, flags);
15776 + * Commands to do_syslog:
15778 + * 0 -- Close the log. Currently a NOP.
15779 + * 1 -- Open the log. Currently a NOP.
15780 + * 2 -- Read from the log.
15781 + * 3 -- Read all messages remaining in the ring buffer.
15782 + * 4 -- Read and clear all messages remaining in the ring buffer
15783 + * 5 -- Clear ring buffer.
15784 + * 6 -- Disable printk's to console
15785 + * 7 -- Enable printk's to console
15786 + * 8 -- Set level of messages printed to console
15787 + * 9 -- Return number of unread characters in the log buffer
15788 + * 10 -- Return size of the log buffer
15790 +int vx_do_syslog(int type, char __user *buf, int len)
15793 + int do_clear = 0;
15794 + struct vx_info *vxi = current_vx_info();
15795 + struct _vx_syslog *log;
15799 + log = &vxi->cvirt.syslog;
15802 + case 0: /* Close log */
15803 + case 1: /* Open log */
15805 + case 2: /* Read from log */
15806 + error = wait_event_interruptible(log->log_wait,
15807 + (log->log_start - log->log_end));
15810 + spin_lock_irq(&log->logbuf_lock);
15811 + spin_unlock_irq(&log->logbuf_lock);
15813 + case 4: /* Read/clear last kernel messages */
15815 + /* fall through */
15816 + case 3: /* Read last kernel messages */
15819 + case 5: /* Clear ring buffer */
15822 + case 6: /* Disable logging to console */
15823 + case 7: /* Enable logging to console */
15824 + case 8: /* Set level of messages printed to console */
15827 + case 9: /* Number of chars in the log buffer */
15829 + case 10: /* Size of the log buffer */
15839 +/* virtual host info names */
15841 +static char *vx_vhi_name(struct vx_info *vxi, int id)
15843 + struct nsproxy *nsproxy;
15844 + struct uts_namespace *uts;
15846 + if (id == VHIN_CONTEXT)
15847 + return vxi->vx_name;
15849 + nsproxy = vxi->space[0].vx_nsproxy;
15853 + uts = nsproxy->uts_ns;
15858 + case VHIN_SYSNAME:
15859 + return uts->name.sysname;
15860 + case VHIN_NODENAME:
15861 + return uts->name.nodename;
15862 + case VHIN_RELEASE:
15863 + return uts->name.release;
15864 + case VHIN_VERSION:
15865 + return uts->name.version;
15866 + case VHIN_MACHINE:
15867 + return uts->name.machine;
15868 + case VHIN_DOMAINNAME:
15869 + return uts->name.domainname;
15876 +int vc_set_vhi_name(struct vx_info *vxi, void __user *data)
15878 + struct vcmd_vhi_name_v0 vc_data;
15881 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
15884 + name = vx_vhi_name(vxi, vc_data.field);
15888 + memcpy(name, vc_data.name, 65);
15892 +int vc_get_vhi_name(struct vx_info *vxi, void __user *data)
15894 + struct vcmd_vhi_name_v0 vc_data;
15897 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
15900 + name = vx_vhi_name(vxi, vc_data.field);
15904 + memcpy(vc_data.name, name, 65);
15905 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
15911 +int vc_virt_stat(struct vx_info *vxi, void __user *data)
15913 + struct vcmd_virt_stat_v0 vc_data;
15914 + struct _vx_cvirt *cvirt = &vxi->cvirt;
15915 + struct timespec64 uptime;
15917 + ktime_get_ts64(&uptime);
15918 + set_normalized_timespec64(&uptime,
15919 + uptime.tv_sec - cvirt->bias_uptime.tv_sec,
15920 + uptime.tv_nsec - cvirt->bias_uptime.tv_nsec);
15922 + vc_data.offset = timespec64_to_ns(&cvirt->bias_ts);
15923 + vc_data.uptime = timespec64_to_ns(&uptime);
15924 + vc_data.nr_threads = atomic_read(&cvirt->nr_threads);
15925 + vc_data.nr_running = atomic_read(&cvirt->nr_running);
15926 + vc_data.nr_uninterruptible = atomic_read(&cvirt->nr_uninterruptible);
15927 + vc_data.nr_onhold = atomic_read(&cvirt->nr_onhold);
15928 + vc_data.nr_forks = atomic_read(&cvirt->total_forks);
15929 + vc_data.load[0] = cvirt->load[0];
15930 + vc_data.load[1] = cvirt->load[1];
15931 + vc_data.load[2] = cvirt->load[2];
15933 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
15939 +#ifdef CONFIG_VSERVER_VTIME
15941 +/* virtualized time base */
15943 +void vx_adjust_timespec(struct timespec *ts)
15945 + struct vx_info *vxi;
15947 + if (!vx_flags(VXF_VIRT_TIME, 0))
15950 + vxi = current_vx_info();
15951 + ts->tv_sec += vxi->cvirt.bias_ts.tv_sec;
15952 + ts->tv_nsec += vxi->cvirt.bias_ts.tv_nsec;
15954 + if (ts->tv_nsec >= NSEC_PER_SEC) {
15956 + ts->tv_nsec -= NSEC_PER_SEC;
15957 + } else if (ts->tv_nsec < 0) {
15959 + ts->tv_nsec += NSEC_PER_SEC;
15963 +void vx_adjust_timespec64(struct timespec64 *ts)
15965 + struct vx_info *vxi;
15967 + if (!vx_flags(VXF_VIRT_TIME, 0))
15970 + vxi = current_vx_info();
15971 + ts->tv_sec += vxi->cvirt.bias_ts.tv_sec;
15972 + ts->tv_nsec += vxi->cvirt.bias_ts.tv_nsec;
15974 + if (ts->tv_nsec >= NSEC_PER_SEC) {
15976 + ts->tv_nsec -= NSEC_PER_SEC;
15977 + } else if (ts->tv_nsec < 0) {
15979 + ts->tv_nsec += NSEC_PER_SEC;
15983 +int vx_settimeofday(const struct timespec *ts)
15985 + struct timespec ats, delta;
15986 + struct vx_info *vxi;
15988 + if (!vx_flags(VXF_VIRT_TIME, 0))
15989 + return do_settimeofday(ts);
15991 + getnstimeofday(&ats);
15992 + delta = timespec_sub(*ts, ats);
15994 + vxi = current_vx_info();
15995 + vxi->cvirt.bias_ts = timespec64_add(vxi->cvirt.bias_ts,
15996 + timespec_to_timespec64(delta));
16000 +int vx_settimeofday64(const struct timespec64 *ts)
16002 + struct timespec64 ats, delta;
16003 + struct vx_info *vxi;
16005 + if (!vx_flags(VXF_VIRT_TIME, 0))
16006 + return do_settimeofday64(ts);
16008 + getnstimeofday64(&ats);
16009 + delta = timespec64_sub(*ts, ats);
16011 + vxi = current_vx_info();
16012 + vxi->cvirt.bias_ts = timespec64_add(vxi->cvirt.bias_ts, delta);
16018 diff -NurpP --minimal linux-4.9.82/kernel/vserver/cvirt_init.h linux-4.9.82-vs2.3.9.7/kernel/vserver/cvirt_init.h
16019 --- linux-4.9.82/kernel/vserver/cvirt_init.h 1970-01-01 00:00:00.000000000 +0000
16020 +++ linux-4.9.82-vs2.3.9.7/kernel/vserver/cvirt_init.h 2018-01-11 08:38:34.000000000 +0000
16024 +extern uint64_t vx_idle_jiffies(void);
16026 +static inline void vx_info_init_cvirt(struct _vx_cvirt *cvirt)
16028 + uint64_t idle_jiffies = vx_idle_jiffies();
16029 + uint64_t nsuptime;
16031 + ktime_get_ts64(&cvirt->bias_uptime);
16032 + nsuptime = (unsigned long long)cvirt->bias_uptime.tv_sec
16033 + * NSEC_PER_SEC + cvirt->bias_uptime.tv_nsec;
16034 + cvirt->bias_clock = nsec_to_clock_t(nsuptime);
16035 + cvirt->bias_ts.tv_sec = 0;
16036 + cvirt->bias_ts.tv_nsec = 0;
16038 + jiffies_to_timespec64(idle_jiffies, &cvirt->bias_idle);
16039 + atomic_set(&cvirt->nr_threads, 0);
16040 + atomic_set(&cvirt->nr_running, 0);
16041 + atomic_set(&cvirt->nr_uninterruptible, 0);
16042 + atomic_set(&cvirt->nr_onhold, 0);
16044 + spin_lock_init(&cvirt->load_lock);
16045 + cvirt->load_last = jiffies;
16046 + atomic_set(&cvirt->load_updates, 0);
16047 + cvirt->load[0] = 0;
16048 + cvirt->load[1] = 0;
16049 + cvirt->load[2] = 0;
16050 + atomic_set(&cvirt->total_forks, 0);
16052 + spin_lock_init(&cvirt->syslog.logbuf_lock);
16053 + init_waitqueue_head(&cvirt->syslog.log_wait);
16054 + cvirt->syslog.log_start = 0;
16055 + cvirt->syslog.log_end = 0;
16056 + cvirt->syslog.con_start = 0;
16057 + cvirt->syslog.logged_chars = 0;
16061 +void vx_info_init_cvirt_pc(struct _vx_cvirt_pc *cvirt_pc, int cpu)
16063 + // cvirt_pc->cpustat = { 0 };
16066 +static inline void vx_info_exit_cvirt(struct _vx_cvirt *cvirt)
16068 +#ifdef CONFIG_VSERVER_WARN
16071 + vxwprintk_xid((value = atomic_read(&cvirt->nr_threads)),
16072 + "!!! cvirt: %p[nr_threads] = %d on exit.",
16074 + vxwprintk_xid((value = atomic_read(&cvirt->nr_running)),
16075 + "!!! cvirt: %p[nr_running] = %d on exit.",
16077 + vxwprintk_xid((value = atomic_read(&cvirt->nr_uninterruptible)),
16078 + "!!! cvirt: %p[nr_uninterruptible] = %d on exit.",
16080 + vxwprintk_xid((value = atomic_read(&cvirt->nr_onhold)),
16081 + "!!! cvirt: %p[nr_onhold] = %d on exit.",
16087 +void vx_info_exit_cvirt_pc(struct _vx_cvirt_pc *cvirt_pc, int cpu)
16092 diff -NurpP --minimal linux-4.9.82/kernel/vserver/cvirt_proc.h linux-4.9.82-vs2.3.9.7/kernel/vserver/cvirt_proc.h
16093 --- linux-4.9.82/kernel/vserver/cvirt_proc.h 1970-01-01 00:00:00.000000000 +0000
16094 +++ linux-4.9.82-vs2.3.9.7/kernel/vserver/cvirt_proc.h 2018-01-11 08:39:19.000000000 +0000
16096 +#ifndef _VX_CVIRT_PROC_H
16097 +#define _VX_CVIRT_PROC_H
16099 +#include <linux/nsproxy.h>
16100 +#include <linux/mnt_namespace.h>
16101 +#include <linux/ipc_namespace.h>
16102 +#include <linux/utsname.h>
16103 +#include <linux/ipc.h>
16105 +extern int vx_info_mnt_namespace(struct mnt_namespace *, char *);
16108 +int vx_info_proc_nsproxy(struct nsproxy *nsproxy, char *buffer)
16110 + struct mnt_namespace *ns;
16111 + struct uts_namespace *uts;
16112 + struct ipc_namespace *ipc;
16118 + length += sprintf(buffer + length,
16119 + "NSProxy:\t%p [%p,%p,%p]\n",
16120 + nsproxy, nsproxy->mnt_ns,
16121 + nsproxy->uts_ns, nsproxy->ipc_ns);
16123 + ns = nsproxy->mnt_ns;
16127 + length += vx_info_mnt_namespace(ns, buffer + length);
16131 + uts = nsproxy->uts_ns;
16135 + length += sprintf(buffer + length,
16136 + "SysName:\t%.*s\n"
16137 + "NodeName:\t%.*s\n"
16138 + "Release:\t%.*s\n"
16139 + "Version:\t%.*s\n"
16140 + "Machine:\t%.*s\n"
16141 + "DomainName:\t%.*s\n",
16142 + __NEW_UTS_LEN, uts->name.sysname,
16143 + __NEW_UTS_LEN, uts->name.nodename,
16144 + __NEW_UTS_LEN, uts->name.release,
16145 + __NEW_UTS_LEN, uts->name.version,
16146 + __NEW_UTS_LEN, uts->name.machine,
16147 + __NEW_UTS_LEN, uts->name.domainname);
16150 + ipc = nsproxy->ipc_ns;
16154 + length += sprintf(buffer + length,
16155 + "SEMS:\t\t%d %d %d %d %d\n"
16156 + "MSG:\t\t%d %d %d\n"
16157 + "SHM:\t\t%lu %lu %d %ld\n",
16158 + ipc->sem_ctls[0], ipc->sem_ctls[1],
16159 + ipc->sem_ctls[2], ipc->sem_ctls[3],
16161 + ipc->msg_ctlmax, ipc->msg_ctlmnb, ipc->msg_ctlmni,
16162 + (unsigned long)ipc->shm_ctlmax,
16163 + (unsigned long)ipc->shm_ctlall,
16164 + ipc->shm_ctlmni, ipc->shm_tot);
16171 +#include <linux/sched.h>
16173 +#define LOAD_INT(x) ((x) >> FSHIFT)
16174 +#define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1 - 1)) * 100)
16177 +int vx_info_proc_cvirt(struct _vx_cvirt *cvirt, char *buffer)
16182 + length += sprintf(buffer + length,
16183 + "BiasUptime:\t%llu.%02lu\n",
16184 + (unsigned long long)cvirt->bias_uptime.tv_sec,
16185 + (cvirt->bias_uptime.tv_nsec / (NSEC_PER_SEC / 100)));
16187 + a = cvirt->load[0] + (FIXED_1 / 200);
16188 + b = cvirt->load[1] + (FIXED_1 / 200);
16189 + c = cvirt->load[2] + (FIXED_1 / 200);
16190 + length += sprintf(buffer + length,
16191 + "nr_threads:\t%d\n"
16192 + "nr_running:\t%d\n"
16193 + "nr_unintr:\t%d\n"
16194 + "nr_onhold:\t%d\n"
16195 + "load_updates:\t%d\n"
16196 + "loadavg:\t%d.%02d %d.%02d %d.%02d\n"
16197 + "total_forks:\t%d\n",
16198 + atomic_read(&cvirt->nr_threads),
16199 + atomic_read(&cvirt->nr_running),
16200 + atomic_read(&cvirt->nr_uninterruptible),
16201 + atomic_read(&cvirt->nr_onhold),
16202 + atomic_read(&cvirt->load_updates),
16203 + LOAD_INT(a), LOAD_FRAC(a),
16204 + LOAD_INT(b), LOAD_FRAC(b),
16205 + LOAD_INT(c), LOAD_FRAC(c),
16206 + atomic_read(&cvirt->total_forks));
16211 +int vx_info_proc_cvirt_pc(struct _vx_cvirt_pc *cvirt_pc,
16212 + char *buffer, int cpu)
16218 +#endif /* _VX_CVIRT_PROC_H */
16219 diff -NurpP --minimal linux-4.9.82/kernel/vserver/debug.c linux-4.9.82-vs2.3.9.7/kernel/vserver/debug.c
16220 --- linux-4.9.82/kernel/vserver/debug.c 1970-01-01 00:00:00.000000000 +0000
16221 +++ linux-4.9.82-vs2.3.9.7/kernel/vserver/debug.c 2018-01-10 02:50:49.000000000 +0000
16224 + * kernel/vserver/debug.c
16226 + * Copyright (C) 2005-2007 Herbert P?tzl
16228 + * V0.01 vx_info dump support
16232 +#include <linux/module.h>
16234 +#include <linux/vserver/context.h>
16237 +void dump_vx_info(struct vx_info *vxi, int level)
16239 + printk("vx_info %p[#%d, %d.%d, %4x]\n", vxi, vxi->vx_id,
16240 + atomic_read(&vxi->vx_usecnt),
16241 + atomic_read(&vxi->vx_tasks),
16244 + __dump_vx_limit(&vxi->limit);
16245 + __dump_vx_sched(&vxi->sched);
16246 + __dump_vx_cvirt(&vxi->cvirt);
16247 + __dump_vx_cacct(&vxi->cacct);
16253 +EXPORT_SYMBOL_GPL(dump_vx_info);
16255 diff -NurpP --minimal linux-4.9.82/kernel/vserver/device.c linux-4.9.82-vs2.3.9.7/kernel/vserver/device.c
16256 --- linux-4.9.82/kernel/vserver/device.c 1970-01-01 00:00:00.000000000 +0000
16257 +++ linux-4.9.82-vs2.3.9.7/kernel/vserver/device.c 2018-01-10 02:50:49.000000000 +0000
16260 + * linux/kernel/vserver/device.c
16262 + * Linux-VServer: Device Support
16264 + * Copyright (C) 2006 Herbert P?tzl
16265 + * Copyright (C) 2007 Daniel Hokka Zakrisson
16267 + * V0.01 device mapping basics
16268 + * V0.02 added defaults
16272 +#include <linux/slab.h>
16273 +#include <linux/rcupdate.h>
16274 +#include <linux/fs.h>
16275 +#include <linux/namei.h>
16276 +#include <linux/hash.h>
16278 +#include <asm/errno.h>
16279 +#include <asm/uaccess.h>
16280 +#include <linux/vserver/base.h>
16281 +#include <linux/vserver/debug.h>
16282 +#include <linux/vserver/context.h>
16283 +#include <linux/vserver/device.h>
16284 +#include <linux/vserver/device_cmd.h>
16287 +#define DMAP_HASH_BITS 4
16290 +struct vs_mapping {
16292 + struct hlist_node hlist;
16293 + struct list_head list;
16295 +#define dm_hlist u.hlist
16296 +#define dm_list u.list
16299 + struct vx_dmap_target target;
16303 +static struct hlist_head dmap_main_hash[1 << DMAP_HASH_BITS];
16305 +static DEFINE_SPINLOCK(dmap_main_hash_lock);
16307 +static struct vx_dmap_target dmap_defaults[2] = {
16308 + { .flags = DATTR_OPEN },
16309 + { .flags = DATTR_OPEN },
16313 +struct kmem_cache *dmap_cachep __read_mostly;
16315 +int __init dmap_cache_init(void)
16317 + dmap_cachep = kmem_cache_create("dmap_cache",
16318 + sizeof(struct vs_mapping), 0,
16319 + SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
16323 +__initcall(dmap_cache_init);
16326 +static inline unsigned int __hashval(dev_t dev, int bits)
16328 + return hash_long((unsigned long)dev, bits);
16332 +/* __hash_mapping()
16333 + * add the mapping to the hash table
16335 +static inline void __hash_mapping(struct vx_info *vxi, struct vs_mapping *vdm)
16337 + spinlock_t *hash_lock = &dmap_main_hash_lock;
16338 + struct hlist_head *head, *hash = dmap_main_hash;
16339 + int device = vdm->device;
16341 + spin_lock(hash_lock);
16342 + vxdprintk(VXD_CBIT(misc, 8), "__hash_mapping: %p[#%d] %08x:%08x",
16343 + vxi, vxi ? vxi->vx_id : 0, device, vdm->target.target);
16345 + head = &hash[__hashval(device, DMAP_HASH_BITS)];
16346 + hlist_add_head(&vdm->dm_hlist, head);
16347 + spin_unlock(hash_lock);
16351 +static inline int __mode_to_default(umode_t mode)
16364 +/* __set_default()
16367 +static inline void __set_default(struct vx_info *vxi, umode_t mode,
16368 + struct vx_dmap_target *vdmt)
16370 + spinlock_t *hash_lock = &dmap_main_hash_lock;
16371 + spin_lock(hash_lock);
16374 + vxi->dmap.targets[__mode_to_default(mode)] = *vdmt;
16376 + dmap_defaults[__mode_to_default(mode)] = *vdmt;
16379 + spin_unlock(hash_lock);
16381 + vxdprintk(VXD_CBIT(misc, 8), "__set_default: %p[#%u] %08x %04x",
16382 + vxi, vxi ? vxi->vx_id : 0, vdmt->target, vdmt->flags);
16386 +/* __remove_default()
16387 + * remove a default
16389 +static inline int __remove_default(struct vx_info *vxi, umode_t mode)
16391 + spinlock_t *hash_lock = &dmap_main_hash_lock;
16392 + spin_lock(hash_lock);
16395 + vxi->dmap.targets[__mode_to_default(mode)].flags = 0;
16396 + else /* remove == reset */
16397 + dmap_defaults[__mode_to_default(mode)].flags = DATTR_OPEN | mode;
16399 + spin_unlock(hash_lock);
16404 +/* __find_mapping()
16405 + * find a mapping in the hash table
16407 + * caller must hold hash_lock
16409 +static inline int __find_mapping(vxid_t xid, dev_t device, umode_t mode,
16410 + struct vs_mapping **local, struct vs_mapping **global)
16412 + struct hlist_head *hash = dmap_main_hash;
16413 + struct hlist_head *head = &hash[__hashval(device, DMAP_HASH_BITS)];
16414 + struct hlist_node *pos;
16415 + struct vs_mapping *vdm;
16421 + hlist_for_each(pos, head) {
16422 + vdm = hlist_entry(pos, struct vs_mapping, dm_hlist);
16424 + if ((vdm->device == device) &&
16425 + !((vdm->target.flags ^ mode) & S_IFMT)) {
16426 + if (vdm->xid == xid) {
16429 + } else if (global && vdm->xid == 0)
16434 + if (global && *global)
16441 +/* __lookup_mapping()
16442 + * find a mapping and store the result in target and flags
16444 +static inline int __lookup_mapping(struct vx_info *vxi,
16445 + dev_t device, dev_t *target, int *flags, umode_t mode)
16447 + spinlock_t *hash_lock = &dmap_main_hash_lock;
16448 + struct vs_mapping *vdm, *global;
16449 + struct vx_dmap_target *vdmt;
16451 + vxid_t xid = vxi->vx_id;
16454 + spin_lock(hash_lock);
16455 + if (__find_mapping(xid, device, mode, &vdm, &global) > 0) {
16457 + vdmt = &vdm->target;
16461 + index = __mode_to_default(mode);
16462 + if (vxi && vxi->dmap.targets[index].flags) {
16464 + vdmt = &vxi->dmap.targets[index];
16465 + } else if (global) {
16467 + vdmt = &global->target;
16471 + vdmt = &dmap_defaults[index];
16475 + if (target && (vdmt->flags & DATTR_REMAP))
16476 + *target = vdmt->target;
16478 + *target = device;
16480 + *flags = vdmt->flags;
16482 + spin_unlock(hash_lock);
16488 +/* __remove_mapping()
16489 + * remove a mapping from the hash table
16491 +static inline int __remove_mapping(struct vx_info *vxi, dev_t device,
16494 + spinlock_t *hash_lock = &dmap_main_hash_lock;
16495 + struct vs_mapping *vdm = NULL;
16498 + spin_lock(hash_lock);
16500 + ret = __find_mapping((vxi ? vxi->vx_id : 0), device, mode, &vdm,
16502 + vxdprintk(VXD_CBIT(misc, 8), "__remove_mapping: %p[#%d] %08x %04x",
16503 + vxi, vxi ? vxi->vx_id : 0, device, mode);
16506 + hlist_del(&vdm->dm_hlist);
16509 + spin_unlock(hash_lock);
16511 + kmem_cache_free(dmap_cachep, vdm);
16517 +int vs_map_device(struct vx_info *vxi,
16518 + dev_t device, dev_t *target, umode_t mode)
16520 + int ret, flags = DATTR_MASK;
16524 + *target = device;
16527 + ret = __lookup_mapping(vxi, device, target, &flags, mode);
16528 + vxdprintk(VXD_CBIT(misc, 8), "vs_map_device: %08x target: %08x flags: %04x mode: %04x mapped=%d",
16529 + device, target ? *target : 0, flags, mode, ret);
16531 + return (flags & DATTR_MASK);
16536 +static int do_set_mapping(struct vx_info *vxi,
16537 + dev_t device, dev_t target, int flags, umode_t mode)
16540 + struct vs_mapping *new;
16542 + new = kmem_cache_alloc(dmap_cachep, GFP_KERNEL);
16546 + INIT_HLIST_NODE(&new->dm_hlist);
16547 + new->device = device;
16548 + new->target.target = target;
16549 + new->target.flags = flags | mode;
16550 + new->xid = (vxi ? vxi->vx_id : 0);
16552 + vxdprintk(VXD_CBIT(misc, 8), "do_set_mapping: %08x target: %08x flags: %04x", device, target, flags);
16553 + __hash_mapping(vxi, new);
16555 + struct vx_dmap_target new = {
16556 + .target = target,
16557 + .flags = flags | mode,
16559 + __set_default(vxi, mode, &new);
16565 +static int do_unset_mapping(struct vx_info *vxi,
16566 + dev_t device, dev_t target, int flags, umode_t mode)
16568 + int ret = -EINVAL;
16571 + ret = __remove_mapping(vxi, device, mode);
16575 + ret = __remove_default(vxi, mode);
16585 +static inline int __user_device(const char __user *name, dev_t *dev,
16588 + struct path path;
16595 + ret = user_lpath(name, &path);
16598 + if (path.dentry->d_inode) {
16599 + *dev = path.dentry->d_inode->i_rdev;
16600 + *mode = path.dentry->d_inode->i_mode;
16606 +static inline int __mapping_mode(dev_t device, dev_t target,
16607 + umode_t device_mode, umode_t target_mode, umode_t *mode)
16610 + *mode = device_mode & S_IFMT;
16612 + *mode = target_mode & S_IFMT;
16616 + /* if both given, device and target mode have to match */
16617 + if (device && target &&
16618 + ((device_mode ^ target_mode) & S_IFMT))
16624 +static inline int do_mapping(struct vx_info *vxi, const char __user *device_path,
16625 + const char __user *target_path, int flags, int set)
16627 + dev_t device = ~0, target = ~0;
16628 + umode_t device_mode = 0, target_mode = 0, mode;
16631 + ret = __user_device(device_path, &device, &device_mode);
16634 + ret = __user_device(target_path, &target, &target_mode);
16638 + ret = __mapping_mode(device, target,
16639 + device_mode, target_mode, &mode);
16644 + return do_set_mapping(vxi, device, target,
16647 + return do_unset_mapping(vxi, device, target,
16652 +int vc_set_mapping(struct vx_info *vxi, void __user *data)
16654 + struct vcmd_set_mapping_v0 vc_data;
16656 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
16659 + return do_mapping(vxi, vc_data.device, vc_data.target,
16660 + vc_data.flags, 1);
16663 +int vc_unset_mapping(struct vx_info *vxi, void __user *data)
16665 + struct vcmd_set_mapping_v0 vc_data;
16667 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
16670 + return do_mapping(vxi, vc_data.device, vc_data.target,
16671 + vc_data.flags, 0);
16675 +#ifdef CONFIG_COMPAT
16677 +int vc_set_mapping_x32(struct vx_info *vxi, void __user *data)
16679 + struct vcmd_set_mapping_v0_x32 vc_data;
16681 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
16684 + return do_mapping(vxi, compat_ptr(vc_data.device_ptr),
16685 + compat_ptr(vc_data.target_ptr), vc_data.flags, 1);
16688 +int vc_unset_mapping_x32(struct vx_info *vxi, void __user *data)
16690 + struct vcmd_set_mapping_v0_x32 vc_data;
16692 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
16695 + return do_mapping(vxi, compat_ptr(vc_data.device_ptr),
16696 + compat_ptr(vc_data.target_ptr), vc_data.flags, 0);
16699 +#endif /* CONFIG_COMPAT */
16702 diff -NurpP --minimal linux-4.9.82/kernel/vserver/dlimit.c linux-4.9.82-vs2.3.9.7/kernel/vserver/dlimit.c
16703 --- linux-4.9.82/kernel/vserver/dlimit.c 1970-01-01 00:00:00.000000000 +0000
16704 +++ linux-4.9.82-vs2.3.9.7/kernel/vserver/dlimit.c 2018-01-10 02:50:49.000000000 +0000
16707 + * linux/kernel/vserver/dlimit.c
16709 + * Virtual Server: Context Disk Limits
16711 + * Copyright (C) 2004-2009 Herbert P?tzl
16713 + * V0.01 initial version
16714 + * V0.02 compat32 splitup
16715 + * V0.03 extended interface
16719 +#include <linux/statfs.h>
16720 +#include <linux/sched.h>
16721 +#include <linux/namei.h>
16722 +#include <linux/vs_tag.h>
16723 +#include <linux/vs_dlimit.h>
16724 +#include <linux/vserver/dlimit_cmd.h>
16725 +#include <linux/slab.h>
16726 +// #include <linux/gfp.h>
16728 +#include <asm/uaccess.h>
16730 +/* __alloc_dl_info()
16732 + * allocate an initialized dl_info struct
16733 + * doesn't make it visible (hash) */
16735 +static struct dl_info *__alloc_dl_info(struct super_block *sb, vtag_t tag)
16737 + struct dl_info *new = NULL;
16739 + vxdprintk(VXD_CBIT(dlim, 5),
16740 + "alloc_dl_info(%p,%d)*", sb, tag);
16742 + /* would this benefit from a slab cache? */
16743 + new = kmalloc(sizeof(struct dl_info), GFP_KERNEL);
16747 + memset(new, 0, sizeof(struct dl_info));
16748 + new->dl_tag = tag;
16750 + // INIT_RCU_HEAD(&new->dl_rcu);
16751 + INIT_HLIST_NODE(&new->dl_hlist);
16752 + spin_lock_init(&new->dl_lock);
16753 + atomic_set(&new->dl_refcnt, 0);
16754 + atomic_set(&new->dl_usecnt, 0);
16756 + /* rest of init goes here */
16758 + vxdprintk(VXD_CBIT(dlim, 4),
16759 + "alloc_dl_info(%p,%d) = %p", sb, tag, new);
16763 +/* __dealloc_dl_info()
16765 + * final disposal of dl_info */
16767 +static void __dealloc_dl_info(struct dl_info *dli)
16769 + vxdprintk(VXD_CBIT(dlim, 4),
16770 + "dealloc_dl_info(%p)", dli);
16772 + dli->dl_hlist.next = LIST_POISON1;
16773 + dli->dl_tag = -1;
16776 + BUG_ON(atomic_read(&dli->dl_usecnt));
16777 + BUG_ON(atomic_read(&dli->dl_refcnt));
16783 +/* hash table for dl_info hash */
16785 +#define DL_HASH_SIZE 13
16787 +struct hlist_head dl_info_hash[DL_HASH_SIZE];
16789 +static DEFINE_SPINLOCK(dl_info_hash_lock);
16792 +static inline unsigned int __hashval(struct super_block *sb, vtag_t tag)
16794 + return ((tag ^ (unsigned long)sb) % DL_HASH_SIZE);
16799 +/* __hash_dl_info()
16801 + * add the dli to the global hash table
16802 + * requires the hash_lock to be held */
16804 +static inline void __hash_dl_info(struct dl_info *dli)
16806 + struct hlist_head *head;
16808 + vxdprintk(VXD_CBIT(dlim, 6),
16809 + "__hash_dl_info: %p[#%d]", dli, dli->dl_tag);
16810 + get_dl_info(dli);
16811 + head = &dl_info_hash[__hashval(dli->dl_sb, dli->dl_tag)];
16812 + hlist_add_head_rcu(&dli->dl_hlist, head);
16815 +/* __unhash_dl_info()
16817 + * remove the dli from the global hash table
16818 + * requires the hash_lock to be held */
16820 +static inline void __unhash_dl_info(struct dl_info *dli)
16822 + vxdprintk(VXD_CBIT(dlim, 6),
16823 + "__unhash_dl_info: %p[#%d]", dli, dli->dl_tag);
16824 + hlist_del_rcu(&dli->dl_hlist);
16825 + put_dl_info(dli);
16829 +/* __lookup_dl_info()
16831 + * requires the rcu_read_lock()
16832 + * doesn't increment the dl_refcnt */
16834 +static inline struct dl_info *__lookup_dl_info(struct super_block *sb, vtag_t tag)
16836 + struct hlist_head *head = &dl_info_hash[__hashval(sb, tag)];
16837 + struct dl_info *dli;
16839 + hlist_for_each_entry_rcu(dli, head, dl_hlist) {
16840 + if (dli->dl_tag == tag && dli->dl_sb == sb)
16847 +struct dl_info *locate_dl_info(struct super_block *sb, vtag_t tag)
16849 + struct dl_info *dli;
16852 + dli = get_dl_info(__lookup_dl_info(sb, tag));
16853 + vxdprintk(VXD_CBIT(dlim, 7),
16854 + "locate_dl_info(%p,#%d) = %p", sb, tag, dli);
16855 + rcu_read_unlock();
16859 +void rcu_free_dl_info(struct rcu_head *head)
16861 + struct dl_info *dli = container_of(head, struct dl_info, dl_rcu);
16862 + int usecnt, refcnt;
16864 + BUG_ON(!dli || !head);
16866 + usecnt = atomic_read(&dli->dl_usecnt);
16867 + BUG_ON(usecnt < 0);
16869 + refcnt = atomic_read(&dli->dl_refcnt);
16870 + BUG_ON(refcnt < 0);
16872 + vxdprintk(VXD_CBIT(dlim, 3),
16873 + "rcu_free_dl_info(%p)", dli);
16875 + __dealloc_dl_info(dli);
16877 + printk("!!! rcu didn't free\n");
16883 +static int do_addrem_dlimit(uint32_t id, const char __user *name,
16884 + uint32_t flags, int add)
16886 + struct path path;
16889 + ret = user_lpath(name, &path);
16891 + struct super_block *sb;
16892 + struct dl_info *dli;
16895 + if (!path.dentry->d_inode)
16896 + goto out_release;
16897 + if (!(sb = path.dentry->d_inode->i_sb))
16898 + goto out_release;
16901 + dli = __alloc_dl_info(sb, id);
16902 + spin_lock(&dl_info_hash_lock);
16905 + if (__lookup_dl_info(sb, id))
16907 + __hash_dl_info(dli);
16910 + spin_lock(&dl_info_hash_lock);
16911 + dli = __lookup_dl_info(sb, id);
16916 + __unhash_dl_info(dli);
16920 + spin_unlock(&dl_info_hash_lock);
16922 + __dealloc_dl_info(dli);
16929 +int vc_add_dlimit(uint32_t id, void __user *data)
16931 + struct vcmd_ctx_dlimit_base_v0 vc_data;
16933 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
16936 + return do_addrem_dlimit(id, vc_data.name, vc_data.flags, 1);
16939 +int vc_rem_dlimit(uint32_t id, void __user *data)
16941 + struct vcmd_ctx_dlimit_base_v0 vc_data;
16943 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
16946 + return do_addrem_dlimit(id, vc_data.name, vc_data.flags, 0);
16949 +#ifdef CONFIG_COMPAT
16951 +int vc_add_dlimit_x32(uint32_t id, void __user *data)
16953 + struct vcmd_ctx_dlimit_base_v0_x32 vc_data;
16955 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
16958 + return do_addrem_dlimit(id,
16959 + compat_ptr(vc_data.name_ptr), vc_data.flags, 1);
16962 +int vc_rem_dlimit_x32(uint32_t id, void __user *data)
16964 + struct vcmd_ctx_dlimit_base_v0_x32 vc_data;
16966 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
16969 + return do_addrem_dlimit(id,
16970 + compat_ptr(vc_data.name_ptr), vc_data.flags, 0);
16973 +#endif /* CONFIG_COMPAT */
16977 +int do_set_dlimit(uint32_t id, const char __user *name,
16978 + uint32_t space_used, uint32_t space_total,
16979 + uint32_t inodes_used, uint32_t inodes_total,
16980 + uint32_t reserved, uint32_t flags)
16982 + struct path path;
16985 + ret = user_lpath(name, &path);
16987 + struct super_block *sb;
16988 + struct dl_info *dli;
16991 + if (!path.dentry->d_inode)
16992 + goto out_release;
16993 + if (!(sb = path.dentry->d_inode->i_sb))
16994 + goto out_release;
16996 + /* sanity checks */
16997 + if ((reserved != CDLIM_KEEP &&
16998 + reserved > 100) ||
16999 + (inodes_used != CDLIM_KEEP &&
17000 + inodes_used > inodes_total) ||
17001 + (space_used != CDLIM_KEEP &&
17002 + space_used > space_total))
17003 + goto out_release;
17006 + dli = locate_dl_info(sb, id);
17008 + goto out_release;
17010 + spin_lock(&dli->dl_lock);
17012 + if (inodes_used != CDLIM_KEEP)
17013 + dli->dl_inodes_used = inodes_used;
17014 + if (inodes_total != CDLIM_KEEP)
17015 + dli->dl_inodes_total = inodes_total;
17016 + if (space_used != CDLIM_KEEP)
17017 + dli->dl_space_used = dlimit_space_32to64(
17018 + space_used, flags, DLIMS_USED);
17020 + if (space_total == CDLIM_INFINITY)
17021 + dli->dl_space_total = DLIM_INFINITY;
17022 + else if (space_total != CDLIM_KEEP)
17023 + dli->dl_space_total = dlimit_space_32to64(
17024 + space_total, flags, DLIMS_TOTAL);
17026 + if (reserved != CDLIM_KEEP)
17027 + dli->dl_nrlmult = (1 << 10) * (100 - reserved) / 100;
17029 + spin_unlock(&dli->dl_lock);
17031 + put_dl_info(dli);
17040 +int vc_set_dlimit(uint32_t id, void __user *data)
17042 + struct vcmd_ctx_dlimit_v0 vc_data;
17044 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
17047 + return do_set_dlimit(id, vc_data.name,
17048 + vc_data.space_used, vc_data.space_total,
17049 + vc_data.inodes_used, vc_data.inodes_total,
17050 + vc_data.reserved, vc_data.flags);
17053 +#ifdef CONFIG_COMPAT
17055 +int vc_set_dlimit_x32(uint32_t id, void __user *data)
17057 + struct vcmd_ctx_dlimit_v0_x32 vc_data;
17059 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
17062 + return do_set_dlimit(id, compat_ptr(vc_data.name_ptr),
17063 + vc_data.space_used, vc_data.space_total,
17064 + vc_data.inodes_used, vc_data.inodes_total,
17065 + vc_data.reserved, vc_data.flags);
17068 +#endif /* CONFIG_COMPAT */
17072 +int do_get_dlimit(uint32_t id, const char __user *name,
17073 + uint32_t *space_used, uint32_t *space_total,
17074 + uint32_t *inodes_used, uint32_t *inodes_total,
17075 + uint32_t *reserved, uint32_t *flags)
17077 + struct path path;
17080 + ret = user_lpath(name, &path);
17082 + struct super_block *sb;
17083 + struct dl_info *dli;
17086 + if (!path.dentry->d_inode)
17087 + goto out_release;
17088 + if (!(sb = path.dentry->d_inode->i_sb))
17089 + goto out_release;
17092 + dli = locate_dl_info(sb, id);
17094 + goto out_release;
17096 + spin_lock(&dli->dl_lock);
17097 + *inodes_used = dli->dl_inodes_used;
17098 + *inodes_total = dli->dl_inodes_total;
17100 + *space_used = dlimit_space_64to32(
17101 + dli->dl_space_used, flags, DLIMS_USED);
17103 + if (dli->dl_space_total == DLIM_INFINITY)
17104 + *space_total = CDLIM_INFINITY;
17106 + *space_total = dlimit_space_64to32(
17107 + dli->dl_space_total, flags, DLIMS_TOTAL);
17109 + *reserved = 100 - ((dli->dl_nrlmult * 100 + 512) >> 10);
17110 + spin_unlock(&dli->dl_lock);
17112 + put_dl_info(dli);
17123 +int vc_get_dlimit(uint32_t id, void __user *data)
17125 + struct vcmd_ctx_dlimit_v0 vc_data;
17128 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
17131 + ret = do_get_dlimit(id, vc_data.name,
17132 + &vc_data.space_used, &vc_data.space_total,
17133 + &vc_data.inodes_used, &vc_data.inodes_total,
17134 + &vc_data.reserved, &vc_data.flags);
17138 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
17143 +#ifdef CONFIG_COMPAT
17145 +int vc_get_dlimit_x32(uint32_t id, void __user *data)
17147 + struct vcmd_ctx_dlimit_v0_x32 vc_data;
17150 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
17153 + ret = do_get_dlimit(id, compat_ptr(vc_data.name_ptr),
17154 + &vc_data.space_used, &vc_data.space_total,
17155 + &vc_data.inodes_used, &vc_data.inodes_total,
17156 + &vc_data.reserved, &vc_data.flags);
17160 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
17165 +#endif /* CONFIG_COMPAT */
17168 +void vx_vsi_statfs(struct super_block *sb, struct kstatfs *buf)
17170 + struct dl_info *dli;
17171 + __u64 blimit, bfree, bavail;
17174 + dli = locate_dl_info(sb, dx_current_tag());
17178 + spin_lock(&dli->dl_lock);
17179 + if (dli->dl_inodes_total == (unsigned long)DLIM_INFINITY)
17182 + /* reduce max inodes available to limit */
17183 + if (buf->f_files > dli->dl_inodes_total)
17184 + buf->f_files = dli->dl_inodes_total;
17186 + ifree = dli->dl_inodes_total - dli->dl_inodes_used;
17187 + /* reduce free inodes to min */
17188 + if (ifree < buf->f_ffree)
17189 + buf->f_ffree = ifree;
17192 + if (dli->dl_space_total == DLIM_INFINITY)
17195 + blimit = dli->dl_space_total >> sb->s_blocksize_bits;
17197 + if (dli->dl_space_total < dli->dl_space_used)
17200 + bfree = (dli->dl_space_total - dli->dl_space_used)
17201 + >> sb->s_blocksize_bits;
17203 + bavail = ((dli->dl_space_total >> 10) * dli->dl_nrlmult);
17204 + if (bavail < dli->dl_space_used)
17207 + bavail = (bavail - dli->dl_space_used)
17208 + >> sb->s_blocksize_bits;
17210 + /* reduce max space available to limit */
17211 + if (buf->f_blocks > blimit)
17212 + buf->f_blocks = blimit;
17214 + /* reduce free space to min */
17215 + if (bfree < buf->f_bfree)
17216 + buf->f_bfree = bfree;
17218 + /* reduce avail space to min */
17219 + if (bavail < buf->f_bavail)
17220 + buf->f_bavail = bavail;
17223 + spin_unlock(&dli->dl_lock);
17224 + put_dl_info(dli);
17229 +#include <linux/module.h>
17231 +EXPORT_SYMBOL_GPL(locate_dl_info);
17232 +EXPORT_SYMBOL_GPL(rcu_free_dl_info);
17234 diff -NurpP --minimal linux-4.9.82/kernel/vserver/helper.c linux-4.9.82-vs2.3.9.7/kernel/vserver/helper.c
17235 --- linux-4.9.82/kernel/vserver/helper.c 1970-01-01 00:00:00.000000000 +0000
17236 +++ linux-4.9.82-vs2.3.9.7/kernel/vserver/helper.c 2018-01-10 02:50:49.000000000 +0000
17239 + * linux/kernel/vserver/helper.c
17241 + * Virtual Context Support
17243 + * Copyright (C) 2004-2007 Herbert P?tzl
17245 + * V0.01 basic helper
17249 +#include <linux/kmod.h>
17250 +#include <linux/reboot.h>
17251 +#include <linux/vs_context.h>
17252 +#include <linux/vs_network.h>
17253 +#include <linux/vserver/signal.h>
17256 +char vshelper_path[255] = "/sbin/vshelper";
17258 +static int vshelper_init(struct subprocess_info *info, struct cred *new_cred)
17260 + current->flags &= ~PF_NO_SETAFFINITY;
17264 +static int vs_call_usermodehelper(char *path, char **argv, char **envp, int wait)
17266 + struct subprocess_info *info;
17267 + gfp_t gfp_mask = (wait == UMH_NO_WAIT) ? GFP_ATOMIC : GFP_KERNEL;
17269 + info = call_usermodehelper_setup(path, argv, envp, gfp_mask,
17270 + vshelper_init, NULL, NULL);
17271 + if (info == NULL)
17274 + return call_usermodehelper_exec(info, wait);
17277 +static int do_vshelper(char *name, char *argv[], char *envp[], int sync)
17281 + if ((ret = vs_call_usermodehelper(name, argv, envp,
17282 + sync ? UMH_WAIT_PROC : UMH_WAIT_EXEC))) {
17283 + printk(KERN_WARNING "%s: (%s %s) returned %s with %d\n",
17284 + name, argv[1], argv[2],
17285 + sync ? "sync" : "async", ret);
17287 + vxdprintk(VXD_CBIT(switch, 4),
17288 + "%s: (%s %s) returned %s with %d",
17289 + name, argv[1], argv[2], sync ? "sync" : "async", ret);
17294 + * vshelper path is set via /proc/sys
17295 + * invoked by vserver sys_reboot(), with
17296 + * the following arguments
17298 + * argv [0] = vshelper_path;
17299 + * argv [1] = action: "restart", "halt", "poweroff", ...
17300 + * argv [2] = context identifier
17302 + * envp [*] = type-specific parameters
17305 +long vs_reboot_helper(struct vx_info *vxi, int cmd, void __user *arg)
17307 + char id_buf[8], cmd_buf[16];
17308 + char uid_buf[16], pid_buf[16];
17311 + char *argv[] = {vshelper_path, NULL, id_buf, 0};
17312 + char *envp[] = {"HOME=/", "TERM=linux",
17313 + "PATH=/sbin:/usr/sbin:/bin:/usr/bin",
17314 + uid_buf, pid_buf, cmd_buf, 0};
17316 + if (vx_info_state(vxi, VXS_HELPER))
17318 + vxi->vx_state |= VXS_HELPER;
17320 + snprintf(id_buf, sizeof(id_buf), "%d", vxi->vx_id);
17322 + snprintf(cmd_buf, sizeof(cmd_buf), "VS_CMD=%08x", cmd);
17323 + snprintf(uid_buf, sizeof(uid_buf), "VS_UID=%d",
17324 + from_kuid(&init_user_ns, current_uid()));
17325 + snprintf(pid_buf, sizeof(pid_buf), "VS_PID=%d", current->pid);
17328 + case LINUX_REBOOT_CMD_RESTART:
17329 + argv[1] = "restart";
17332 + case LINUX_REBOOT_CMD_HALT:
17333 + argv[1] = "halt";
17336 + case LINUX_REBOOT_CMD_POWER_OFF:
17337 + argv[1] = "poweroff";
17340 + case LINUX_REBOOT_CMD_SW_SUSPEND:
17341 + argv[1] = "swsusp";
17344 + case LINUX_REBOOT_CMD_OOM:
17349 + vxi->vx_state &= ~VXS_HELPER;
17353 + ret = do_vshelper(vshelper_path, argv, envp, 0);
17354 + vxi->vx_state &= ~VXS_HELPER;
17355 + __wakeup_vx_info(vxi);
17356 + return (ret) ? -EPERM : 0;
17360 +long vs_reboot(unsigned int cmd, void __user *arg)
17362 + struct vx_info *vxi = current_vx_info();
17365 + vxdprintk(VXD_CBIT(misc, 5),
17366 + "vs_reboot(%p[#%d],%u)",
17367 + vxi, vxi ? vxi->vx_id : 0, cmd);
17369 + ret = vs_reboot_helper(vxi, cmd, arg);
17373 + vxi->reboot_cmd = cmd;
17374 + if (vx_info_flags(vxi, VXF_REBOOT_KILL, 0)) {
17376 + case LINUX_REBOOT_CMD_RESTART:
17377 + case LINUX_REBOOT_CMD_HALT:
17378 + case LINUX_REBOOT_CMD_POWER_OFF:
17379 + vx_info_kill(vxi, 0, SIGKILL);
17380 + vx_info_kill(vxi, 1, SIGKILL);
17388 +long vs_oom_action(unsigned int cmd)
17390 + struct vx_info *vxi = current_vx_info();
17393 + vxdprintk(VXD_CBIT(misc, 5),
17394 + "vs_oom_action(%p[#%d],%u)",
17395 + vxi, vxi ? vxi->vx_id : 0, cmd);
17397 + ret = vs_reboot_helper(vxi, cmd, NULL);
17401 + vxi->reboot_cmd = cmd;
17402 + if (vx_info_flags(vxi, VXF_REBOOT_KILL, 0)) {
17403 + vx_info_kill(vxi, 0, SIGKILL);
17404 + vx_info_kill(vxi, 1, SIGKILL);
17410 + * argv [0] = vshelper_path;
17411 + * argv [1] = action: "startup", "shutdown"
17412 + * argv [2] = context identifier
17414 + * envp [*] = type-specific parameters
17417 +long vs_state_change(struct vx_info *vxi, unsigned int cmd)
17419 + char id_buf[8], cmd_buf[16];
17420 + char *argv[] = {vshelper_path, NULL, id_buf, 0};
17421 + char *envp[] = {"HOME=/", "TERM=linux",
17422 + "PATH=/sbin:/usr/sbin:/bin:/usr/bin", cmd_buf, 0};
17424 + if (!vx_info_flags(vxi, VXF_SC_HELPER, 0))
17427 + snprintf(id_buf, sizeof(id_buf), "%d", vxi->vx_id);
17428 + snprintf(cmd_buf, sizeof(cmd_buf), "VS_CMD=%08x", cmd);
17431 + case VSC_STARTUP:
17432 + argv[1] = "startup";
17434 + case VSC_SHUTDOWN:
17435 + argv[1] = "shutdown";
17441 + return do_vshelper(vshelper_path, argv, envp, 1);
17446 + * argv [0] = vshelper_path;
17447 + * argv [1] = action: "netup", "netdown"
17448 + * argv [2] = context identifier
17450 + * envp [*] = type-specific parameters
17453 +long vs_net_change(struct nx_info *nxi, unsigned int cmd)
17455 + char id_buf[8], cmd_buf[16];
17456 + char *argv[] = {vshelper_path, NULL, id_buf, 0};
17457 + char *envp[] = {"HOME=/", "TERM=linux",
17458 + "PATH=/sbin:/usr/sbin:/bin:/usr/bin", cmd_buf, 0};
17460 + if (!nx_info_flags(nxi, NXF_SC_HELPER, 0))
17463 + snprintf(id_buf, sizeof(id_buf), "%d", nxi->nx_id);
17464 + snprintf(cmd_buf, sizeof(cmd_buf), "VS_CMD=%08x", cmd);
17468 + argv[1] = "netup";
17470 + case VSC_NETDOWN:
17471 + argv[1] = "netdown";
17477 + return do_vshelper(vshelper_path, argv, envp, 1);
17480 diff -NurpP --minimal linux-4.9.82/kernel/vserver/history.c linux-4.9.82-vs2.3.9.7/kernel/vserver/history.c
17481 --- linux-4.9.82/kernel/vserver/history.c 1970-01-01 00:00:00.000000000 +0000
17482 +++ linux-4.9.82-vs2.3.9.7/kernel/vserver/history.c 2018-01-10 02:50:49.000000000 +0000
17485 + * kernel/vserver/history.c
17487 + * Virtual Context History Backtrace
17489 + * Copyright (C) 2004-2007 Herbert P?tzl
17491 + * V0.01 basic structure
17492 + * V0.02 hash/unhash and trace
17493 + * V0.03 preemption fixes
17497 +#include <linux/module.h>
17498 +#include <asm/uaccess.h>
17500 +#include <linux/vserver/context.h>
17501 +#include <linux/vserver/debug.h>
17502 +#include <linux/vserver/debug_cmd.h>
17503 +#include <linux/vserver/history.h>
17506 +#ifdef CONFIG_VSERVER_HISTORY
17507 +#define VXH_SIZE CONFIG_VSERVER_HISTORY_SIZE
17509 +#define VXH_SIZE 64
17512 +struct _vx_history {
17513 + unsigned int counter;
17515 + struct _vx_hist_entry entry[VXH_SIZE + 1];
17519 +DEFINE_PER_CPU(struct _vx_history, vx_history_buffer);
17521 +unsigned volatile int vxh_active = 1;
17523 +static atomic_t sequence = ATOMIC_INIT(0);
17528 + * requires disabled preemption */
17530 +struct _vx_hist_entry *vxh_advance(void *loc)
17532 + unsigned int cpu = smp_processor_id();
17533 + struct _vx_history *hist = &per_cpu(vx_history_buffer, cpu);
17534 + struct _vx_hist_entry *entry;
17535 + unsigned int index;
17537 + index = vxh_active ? (hist->counter++ % VXH_SIZE) : VXH_SIZE;
17538 + entry = &hist->entry[index];
17540 + entry->seq = atomic_inc_return(&sequence);
17541 + entry->loc = loc;
17545 +EXPORT_SYMBOL_GPL(vxh_advance);
17548 +#define VXH_LOC_FMTS "(#%04x,*%d):%p"
17550 +#define VXH_LOC_ARGS(e) (e)->seq, cpu, (e)->loc
17553 +#define VXH_VXI_FMTS "%p[#%d,%d.%d]"
17555 +#define VXH_VXI_ARGS(e) (e)->vxi.ptr, \
17556 + (e)->vxi.ptr ? (e)->vxi.xid : 0, \
17557 + (e)->vxi.ptr ? (e)->vxi.usecnt : 0, \
17558 + (e)->vxi.ptr ? (e)->vxi.tasks : 0
17560 +void vxh_dump_entry(struct _vx_hist_entry *e, unsigned cpu)
17562 + switch (e->type) {
17563 + case VXH_THROW_OOPS:
17564 + printk( VXH_LOC_FMTS " oops \n", VXH_LOC_ARGS(e));
17567 + case VXH_GET_VX_INFO:
17568 + case VXH_PUT_VX_INFO:
17569 + printk( VXH_LOC_FMTS " %s_vx_info " VXH_VXI_FMTS "\n",
17571 + (e->type == VXH_GET_VX_INFO) ? "get" : "put",
17572 + VXH_VXI_ARGS(e));
17575 + case VXH_INIT_VX_INFO:
17576 + case VXH_SET_VX_INFO:
17577 + case VXH_CLR_VX_INFO:
17578 + printk( VXH_LOC_FMTS " %s_vx_info " VXH_VXI_FMTS " @%p\n",
17580 + (e->type == VXH_INIT_VX_INFO) ? "init" :
17581 + ((e->type == VXH_SET_VX_INFO) ? "set" : "clr"),
17582 + VXH_VXI_ARGS(e), e->sc.data);
17585 + case VXH_CLAIM_VX_INFO:
17586 + case VXH_RELEASE_VX_INFO:
17587 + printk( VXH_LOC_FMTS " %s_vx_info " VXH_VXI_FMTS " @%p\n",
17589 + (e->type == VXH_CLAIM_VX_INFO) ? "claim" : "release",
17590 + VXH_VXI_ARGS(e), e->sc.data);
17593 + case VXH_ALLOC_VX_INFO:
17594 + case VXH_DEALLOC_VX_INFO:
17595 + printk( VXH_LOC_FMTS " %s_vx_info " VXH_VXI_FMTS "\n",
17597 + (e->type == VXH_ALLOC_VX_INFO) ? "alloc" : "dealloc",
17598 + VXH_VXI_ARGS(e));
17601 + case VXH_HASH_VX_INFO:
17602 + case VXH_UNHASH_VX_INFO:
17603 + printk( VXH_LOC_FMTS " __%s_vx_info " VXH_VXI_FMTS "\n",
17605 + (e->type == VXH_HASH_VX_INFO) ? "hash" : "unhash",
17606 + VXH_VXI_ARGS(e));
17609 + case VXH_LOC_VX_INFO:
17610 + case VXH_LOOKUP_VX_INFO:
17611 + case VXH_CREATE_VX_INFO:
17612 + printk( VXH_LOC_FMTS " __%s_vx_info [#%d] -> " VXH_VXI_FMTS "\n",
17614 + (e->type == VXH_CREATE_VX_INFO) ? "create" :
17615 + ((e->type == VXH_LOC_VX_INFO) ? "loc" : "lookup"),
17616 + e->ll.arg, VXH_VXI_ARGS(e));
17621 +static void __vxh_dump_history(void)
17623 + unsigned int i, cpu;
17625 + printk("History:\tSEQ: %8x\tNR_CPUS: %d\n",
17626 + atomic_read(&sequence), NR_CPUS);
17628 + for (i = 0; i < VXH_SIZE; i++) {
17629 + for_each_online_cpu(cpu) {
17630 + struct _vx_history *hist =
17631 + &per_cpu(vx_history_buffer, cpu);
17632 + unsigned int index = (hist->counter - i) % VXH_SIZE;
17633 + struct _vx_hist_entry *entry = &hist->entry[index];
17635 + vxh_dump_entry(entry, cpu);
17640 +void vxh_dump_history(void)
17644 + local_irq_enable();
17646 + local_irq_disable();
17648 + __vxh_dump_history();
17652 +/* vserver syscall commands below here */
17655 +int vc_dump_history(uint32_t id)
17658 + __vxh_dump_history();
17665 +int do_read_history(struct __user _vx_hist_entry *data,
17666 + int cpu, uint32_t *index, uint32_t *count)
17668 + int pos, ret = 0;
17669 + struct _vx_history *hist = &per_cpu(vx_history_buffer, cpu);
17670 + int end = hist->counter;
17671 + int start = end - VXH_SIZE + 2;
17672 + int idx = *index;
17674 + /* special case: get current pos */
17680 + /* have we lost some data? */
17684 + for (pos = 0; (pos < *count) && (idx < end); pos++, idx++) {
17685 + struct _vx_hist_entry *entry =
17686 + &hist->entry[idx % VXH_SIZE];
17688 + /* send entry to userspace */
17689 + ret = copy_to_user(&data[pos], entry, sizeof(*entry));
17693 + /* save new index and count */
17696 + return ret ? ret : (*index < end);
17699 +int vc_read_history(uint32_t id, void __user *data)
17701 + struct vcmd_read_history_v0 vc_data;
17704 + if (id >= NR_CPUS)
17707 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
17710 + ret = do_read_history((struct __user _vx_hist_entry *)vc_data.data,
17711 + id, &vc_data.index, &vc_data.count);
17713 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
17718 +#ifdef CONFIG_COMPAT
17720 +int vc_read_history_x32(uint32_t id, void __user *data)
17722 + struct vcmd_read_history_v0_x32 vc_data;
17725 + if (id >= NR_CPUS)
17728 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
17731 + ret = do_read_history((struct __user _vx_hist_entry *)
17732 + compat_ptr(vc_data.data_ptr),
17733 + id, &vc_data.index, &vc_data.count);
17735 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
17740 +#endif /* CONFIG_COMPAT */
17742 diff -NurpP --minimal linux-4.9.82/kernel/vserver/inet.c linux-4.9.82-vs2.3.9.7/kernel/vserver/inet.c
17743 --- linux-4.9.82/kernel/vserver/inet.c 1970-01-01 00:00:00.000000000 +0000
17744 +++ linux-4.9.82-vs2.3.9.7/kernel/vserver/inet.c 2018-01-10 02:50:49.000000000 +0000
17747 +#include <linux/in.h>
17748 +#include <linux/inetdevice.h>
17749 +#include <linux/export.h>
17750 +#include <linux/vs_inet.h>
17751 +#include <linux/vs_inet6.h>
17752 +#include <linux/vserver/debug.h>
17753 +#include <net/route.h>
17754 +#include <net/addrconf.h>
17757 +int nx_v4_addr_conflict(struct nx_info *nxi1, struct nx_info *nxi2)
17761 + if (!nxi1 || !nxi2 || nxi1 == nxi2)
17764 + struct nx_addr_v4 *ptr;
17765 + unsigned long irqflags;
17767 + spin_lock_irqsave(&nxi1->addr_lock, irqflags);
17768 + for (ptr = &nxi1->v4; ptr; ptr = ptr->next) {
17769 + if (v4_nx_addr_in_nx_info(nxi2, ptr, -1)) {
17774 + spin_unlock_irqrestore(&nxi1->addr_lock, irqflags);
17777 + vxdprintk(VXD_CBIT(net, 2),
17778 + "nx_v4_addr_conflict(%p,%p): %d",
17779 + nxi1, nxi2, ret);
17785 +#ifdef CONFIG_IPV6
17787 +int nx_v6_addr_conflict(struct nx_info *nxi1, struct nx_info *nxi2)
17791 + if (!nxi1 || !nxi2 || nxi1 == nxi2)
17794 + struct nx_addr_v6 *ptr;
17795 + unsigned long irqflags;
17797 + spin_lock_irqsave(&nxi1->addr_lock, irqflags);
17798 + for (ptr = &nxi1->v6; ptr; ptr = ptr->next) {
17799 + if (v6_nx_addr_in_nx_info(nxi2, ptr, -1)) {
17804 + spin_unlock_irqrestore(&nxi1->addr_lock, irqflags);
17807 + vxdprintk(VXD_CBIT(net, 2),
17808 + "nx_v6_addr_conflict(%p,%p): %d",
17809 + nxi1, nxi2, ret);
17816 +int v4_dev_in_nx_info(struct net_device *dev, struct nx_info *nxi)
17818 + struct in_device *in_dev;
17819 + struct in_ifaddr **ifap;
17820 + struct in_ifaddr *ifa;
17825 + in_dev = in_dev_get(dev);
17829 + for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL;
17830 + ifap = &ifa->ifa_next) {
17831 + if (v4_addr_in_nx_info(nxi, ifa->ifa_local, NXA_MASK_SHOW)) {
17836 + in_dev_put(in_dev);
17842 +#ifdef CONFIG_IPV6
17844 +int v6_dev_in_nx_info(struct net_device *dev, struct nx_info *nxi)
17846 + struct inet6_dev *in_dev;
17847 + struct inet6_ifaddr *ifa;
17852 + in_dev = in6_dev_get(dev);
17856 + // for (ifap = &in_dev->addr_list; (ifa = *ifap) != NULL;
17857 + list_for_each_entry(ifa, &in_dev->addr_list, if_list) {
17858 + if (v6_addr_in_nx_info(nxi, &ifa->addr, -1)) {
17863 + in6_dev_put(in_dev);
17870 +int dev_in_nx_info(struct net_device *dev, struct nx_info *nxi)
17876 + if (nxi->v4.type && v4_dev_in_nx_info(dev, nxi))
17878 +#ifdef CONFIG_IPV6
17880 + if (nxi->v6.type && v6_dev_in_nx_info(dev, nxi))
17885 + vxdprintk(VXD_CBIT(net, 3),
17886 + "dev_in_nx_info(%p,%p[#%d]) = %d",
17887 + dev, nxi, nxi ? nxi->nx_id : 0, ret);
17891 +struct rtable *ip_v4_find_src(struct net *net, struct nx_info *nxi,
17892 + struct flowi4 *fl4)
17894 + struct rtable *rt;
17899 + /* FIXME: handle lback only case */
17900 + if (!NX_IPV4(nxi))
17901 + return ERR_PTR(-EPERM);
17903 + vxdprintk(VXD_CBIT(net, 4),
17904 + "ip_v4_find_src(%p[#%u]) " NIPQUAD_FMT " -> " NIPQUAD_FMT,
17905 + nxi, nxi ? nxi->nx_id : 0,
17906 + NIPQUAD(fl4->saddr), NIPQUAD(fl4->daddr));
17908 + /* single IP is unconditional */
17909 + if (nx_info_flags(nxi, NXF_SINGLE_IP, 0) &&
17910 + (fl4->saddr == INADDR_ANY))
17911 + fl4->saddr = nxi->v4.ip[0].s_addr;
17913 + if (fl4->saddr == INADDR_ANY) {
17914 + struct nx_addr_v4 *ptr;
17915 + __be32 found = 0;
17917 + rt = __ip_route_output_key(net, fl4);
17918 + if (!IS_ERR(rt)) {
17919 + found = fl4->saddr;
17921 + vxdprintk(VXD_CBIT(net, 4),
17922 + "ip_v4_find_src(%p[#%u]) rok[%u]: " NIPQUAD_FMT,
17923 + nxi, nxi ? nxi->nx_id : 0, fl4->flowi4_oif, NIPQUAD(found));
17924 + if (v4_addr_in_nx_info(nxi, found, NXA_MASK_BIND))
17928 + WARN_ON_ONCE(in_irq());
17929 + spin_lock_bh(&nxi->addr_lock);
17930 + for (ptr = &nxi->v4; ptr; ptr = ptr->next) {
17931 + __be32 primary = ptr->ip[0].s_addr;
17932 + __be32 mask = ptr->mask.s_addr;
17933 + __be32 neta = primary & mask;
17935 + vxdprintk(VXD_CBIT(net, 4), "ip_v4_find_src(%p[#%u]) chk: "
17936 + NIPQUAD_FMT "/" NIPQUAD_FMT "/" NIPQUAD_FMT,
17937 + nxi, nxi ? nxi->nx_id : 0, NIPQUAD(primary),
17938 + NIPQUAD(mask), NIPQUAD(neta));
17939 + if ((found & mask) != neta)
17942 + fl4->saddr = primary;
17943 + rt = __ip_route_output_key(net, fl4);
17944 + vxdprintk(VXD_CBIT(net, 4),
17945 + "ip_v4_find_src(%p[#%u]) rok[%u]: " NIPQUAD_FMT,
17946 + nxi, nxi ? nxi->nx_id : 0, fl4->flowi4_oif, NIPQUAD(primary));
17947 + if (!IS_ERR(rt)) {
17948 + found = fl4->saddr;
17950 + if (found == primary)
17951 + goto found_unlock;
17954 + /* still no source ip? */
17955 + found = ipv4_is_loopback(fl4->daddr)
17956 + ? IPI_LOOPBACK : nxi->v4.ip[0].s_addr;
17958 + spin_unlock_bh(&nxi->addr_lock);
17960 + /* assign src ip to flow */
17961 + fl4->saddr = found;
17964 + if (!v4_addr_in_nx_info(nxi, fl4->saddr, NXA_MASK_BIND))
17965 + return ERR_PTR(-EPERM);
17968 + if (nx_info_flags(nxi, NXF_LBACK_REMAP, 0)) {
17969 + if (ipv4_is_loopback(fl4->daddr))
17970 + fl4->daddr = nxi->v4_lback.s_addr;
17971 + if (ipv4_is_loopback(fl4->saddr))
17972 + fl4->saddr = nxi->v4_lback.s_addr;
17973 + } else if (ipv4_is_loopback(fl4->daddr) &&
17974 + !nx_info_flags(nxi, NXF_LBACK_ALLOW, 0))
17975 + return ERR_PTR(-EPERM);
17980 +EXPORT_SYMBOL_GPL(ip_v4_find_src);
17982 diff -NurpP --minimal linux-4.9.82/kernel/vserver/init.c linux-4.9.82-vs2.3.9.7/kernel/vserver/init.c
17983 --- linux-4.9.82/kernel/vserver/init.c 1970-01-01 00:00:00.000000000 +0000
17984 +++ linux-4.9.82-vs2.3.9.7/kernel/vserver/init.c 2018-01-10 02:50:49.000000000 +0000
17987 + * linux/kernel/init.c
17989 + * Virtual Server Init
17991 + * Copyright (C) 2004-2007 Herbert P?tzl
17993 + * V0.01 basic structure
17997 +#include <linux/init.h>
17998 +#include <linux/module.h>
18000 +int vserver_register_sysctl(void);
18001 +void vserver_unregister_sysctl(void);
18004 +static int __init init_vserver(void)
18008 +#ifdef CONFIG_VSERVER_DEBUG
18009 + vserver_register_sysctl();
18015 +static void __exit exit_vserver(void)
18018 +#ifdef CONFIG_VSERVER_DEBUG
18019 + vserver_unregister_sysctl();
18024 +/* FIXME: GFP_ZONETYPES gone
18025 +long vx_slab[GFP_ZONETYPES]; */
18029 +module_init(init_vserver);
18030 +module_exit(exit_vserver);
18032 diff -NurpP --minimal linux-4.9.82/kernel/vserver/inode.c linux-4.9.82-vs2.3.9.7/kernel/vserver/inode.c
18033 --- linux-4.9.82/kernel/vserver/inode.c 1970-01-01 00:00:00.000000000 +0000
18034 +++ linux-4.9.82-vs2.3.9.7/kernel/vserver/inode.c 2018-01-13 03:26:08.000000000 +0000
18037 + * linux/kernel/vserver/inode.c
18039 + * Virtual Server: File System Support
18041 + * Copyright (C) 2004-2007 Herbert P?tzl
18043 + * V0.01 separated from vcontext V0.05
18044 + * V0.02 moved to tag (instead of xid)
18048 +#include <linux/tty.h>
18049 +#include <linux/proc_fs.h>
18050 +#include <linux/devpts_fs.h>
18051 +#include <linux/fs.h>
18052 +#include <linux/file.h>
18053 +#include <linux/mount.h>
18054 +#include <linux/parser.h>
18055 +#include <linux/namei.h>
18056 +#include <linux/magic.h>
18057 +#include <linux/slab.h>
18058 +#include <linux/vserver/inode.h>
18059 +#include <linux/vserver/inode_cmd.h>
18060 +#include <linux/vs_base.h>
18061 +#include <linux/vs_tag.h>
18063 +#include <asm/uaccess.h>
18064 +#include <../../fs/proc/internal.h>
18067 +static int __vc_get_iattr(struct inode *in, uint32_t *tag, uint32_t *flags, uint32_t *mask)
18069 + struct proc_dir_entry *entry;
18071 + if (!in || !in->i_sb)
18074 + *flags = IATTR_TAG
18075 + | (IS_IMMUTABLE(in) ? IATTR_IMMUTABLE : 0)
18076 + | (IS_IXUNLINK(in) ? IATTR_IXUNLINK : 0)
18077 + | (IS_BARRIER(in) ? IATTR_BARRIER : 0)
18078 + | (IS_COW(in) ? IATTR_COW : 0);
18079 + *mask = IATTR_IXUNLINK | IATTR_IMMUTABLE | IATTR_COW;
18081 + if (S_ISDIR(in->i_mode))
18082 + *mask |= IATTR_BARRIER;
18084 + if (IS_TAGGED(in)) {
18085 + *tag = i_tag_read(in);
18086 + *mask |= IATTR_TAG;
18089 + switch (in->i_sb->s_magic) {
18090 + case PROC_SUPER_MAGIC:
18091 + entry = PROC_I(in)->pde;
18093 + /* check for specific inodes? */
18095 + *mask |= IATTR_FLAGS;
18097 + *flags |= (entry->vx_flags & IATTR_FLAGS);
18099 + *flags |= (PROC_I(in)->vx_flags & IATTR_FLAGS);
18102 + case DEVPTS_SUPER_MAGIC:
18103 + *tag = i_tag_read(in);
18104 + *mask |= IATTR_TAG;
18113 +int vc_get_iattr(void __user *data)
18115 + struct path path;
18116 + struct vcmd_ctx_iattr_v1 vc_data = { .tag = -1 };
18119 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
18122 + ret = user_lpath(vc_data.name, &path);
18124 + ret = __vc_get_iattr(path.dentry->d_inode,
18125 + &vc_data.tag, &vc_data.flags, &vc_data.mask);
18131 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
18136 +#ifdef CONFIG_COMPAT
18138 +int vc_get_iattr_x32(void __user *data)
18140 + struct path path;
18141 + struct vcmd_ctx_iattr_v1_x32 vc_data = { .tag = -1 };
18144 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
18147 + ret = user_lpath(compat_ptr(vc_data.name_ptr), &path);
18149 + ret = __vc_get_iattr(path.dentry->d_inode,
18150 + &vc_data.tag, &vc_data.flags, &vc_data.mask);
18156 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
18161 +#endif /* CONFIG_COMPAT */
18164 +int vc_fget_iattr(uint32_t fd, void __user *data)
18166 + struct file *filp;
18167 + struct vcmd_ctx_fiattr_v0 vc_data = { .tag = -1 };
18170 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
18174 + if (!filp || !filp->f_path.dentry || !filp->f_path.dentry->d_inode)
18177 + ret = __vc_get_iattr(filp->f_path.dentry->d_inode,
18178 + &vc_data.tag, &vc_data.flags, &vc_data.mask);
18182 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
18188 +static int __vc_set_iattr(struct dentry *de, uint32_t *tag, uint32_t *flags, uint32_t *mask)
18190 + struct inode *in = de->d_inode;
18191 + int error = 0, is_proc = 0, has_tag = 0;
18192 + struct iattr attr = { 0 };
18194 + if (!in || !in->i_sb)
18197 + is_proc = (in->i_sb->s_magic == PROC_SUPER_MAGIC);
18198 + if ((*mask & IATTR_FLAGS) && !is_proc)
18201 + has_tag = IS_TAGGED(in) ||
18202 + (in->i_sb->s_magic == DEVPTS_SUPER_MAGIC);
18203 + if ((*mask & IATTR_TAG) && !has_tag)
18207 + if (*mask & IATTR_TAG) {
18208 + attr.ia_tag = make_ktag(&init_user_ns, *tag);
18209 + attr.ia_valid |= ATTR_TAG;
18212 + if (*mask & IATTR_FLAGS) {
18213 + struct proc_dir_entry *entry = PROC_I(in)->pde;
18214 + unsigned int iflags = PROC_I(in)->vx_flags;
18216 + iflags = (iflags & ~(*mask & IATTR_FLAGS))
18217 + | (*flags & IATTR_FLAGS);
18218 + PROC_I(in)->vx_flags = iflags;
18220 + entry->vx_flags = iflags;
18223 + if (*mask & (IATTR_IMMUTABLE | IATTR_IXUNLINK |
18224 + IATTR_BARRIER | IATTR_COW)) {
18225 + int iflags = in->i_flags;
18226 + int vflags = in->i_vflags;
18228 + if (*mask & IATTR_IMMUTABLE) {
18229 + if (*flags & IATTR_IMMUTABLE)
18230 + iflags |= S_IMMUTABLE;
18232 + iflags &= ~S_IMMUTABLE;
18234 + if (*mask & IATTR_IXUNLINK) {
18235 + if (*flags & IATTR_IXUNLINK)
18236 + iflags |= S_IXUNLINK;
18238 + iflags &= ~S_IXUNLINK;
18240 + if (S_ISDIR(in->i_mode) && (*mask & IATTR_BARRIER)) {
18241 + if (*flags & IATTR_BARRIER)
18242 + vflags |= V_BARRIER;
18244 + vflags &= ~V_BARRIER;
18246 + if (S_ISREG(in->i_mode) && (*mask & IATTR_COW)) {
18247 + if (*flags & IATTR_COW)
18250 + vflags &= ~V_COW;
18252 + if (in->i_op && in->i_op->sync_flags) {
18253 + error = in->i_op->sync_flags(in, iflags, vflags);
18259 + if (attr.ia_valid) {
18260 + if (in->i_op && in->i_op->setattr)
18261 + error = in->i_op->setattr(de, &attr);
18263 + error = setattr_prepare(de, &attr);
18265 + setattr_copy(in, &attr);
18266 + mark_inode_dirty(in);
18272 + inode_unlock(in);
18276 +int vc_set_iattr(void __user *data)
18278 + struct path path;
18279 + struct vcmd_ctx_iattr_v1 vc_data;
18282 + if (!capable(CAP_LINUX_IMMUTABLE))
18284 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
18287 + ret = user_lpath(vc_data.name, &path);
18289 + ret = __vc_set_iattr(path.dentry,
18290 + &vc_data.tag, &vc_data.flags, &vc_data.mask);
18294 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
18299 +#ifdef CONFIG_COMPAT
18301 +int vc_set_iattr_x32(void __user *data)
18303 + struct path path;
18304 + struct vcmd_ctx_iattr_v1_x32 vc_data;
18307 + if (!capable(CAP_LINUX_IMMUTABLE))
18309 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
18312 + ret = user_lpath(compat_ptr(vc_data.name_ptr), &path);
18314 + ret = __vc_set_iattr(path.dentry,
18315 + &vc_data.tag, &vc_data.flags, &vc_data.mask);
18319 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
18324 +#endif /* CONFIG_COMPAT */
18326 +int vc_fset_iattr(uint32_t fd, void __user *data)
18328 + struct file *filp;
18329 + struct vcmd_ctx_fiattr_v0 vc_data;
18332 + if (!capable(CAP_LINUX_IMMUTABLE))
18334 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
18338 + if (!filp || !filp->f_path.dentry || !filp->f_path.dentry->d_inode)
18341 + ret = __vc_set_iattr(filp->f_path.dentry, &vc_data.tag,
18342 + &vc_data.flags, &vc_data.mask);
18346 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
18352 +enum { Opt_notagcheck, Opt_tag, Opt_notag, Opt_tagid, Opt_err };
18354 +static match_table_t tokens = {
18355 + {Opt_notagcheck, "notagcheck"},
18356 +#ifdef CONFIG_PROPAGATE
18357 + {Opt_notag, "notag"},
18358 + {Opt_tag, "tag"},
18359 + {Opt_tagid, "tagid=%u"},
18365 +static void __dx_parse_remove(char *string, char *opt)
18367 + char *p = strstr(string, opt);
18371 + while (*q != '\0' && *q != ',')
18380 +int dx_parse_tag(char *string, vtag_t *tag, int remove, int *mnt_flags,
18381 + unsigned long *flags)
18384 + substring_t args[MAX_OPT_ARGS];
18386 + char *s, *p, *opts;
18387 +#if defined(CONFIG_PROPAGATE) || defined(CONFIG_VSERVER_DEBUG)
18393 + s = kstrdup(string, GFP_KERNEL | GFP_ATOMIC);
18398 + while ((p = strsep(&opts, ",")) != NULL) {
18399 + token = match_token(p, tokens, args);
18402 +#ifdef CONFIG_PROPAGATE
18407 + __dx_parse_remove(s, "tag");
18408 + *mnt_flags |= MNT_TAGID;
18409 + set |= MNT_TAGID;
18413 + __dx_parse_remove(s, "notag");
18414 + *mnt_flags |= MNT_NOTAG;
18415 + set |= MNT_NOTAG;
18418 + if (tag && !match_int(args, &option))
18421 + __dx_parse_remove(s, "tagid");
18422 + *mnt_flags |= MNT_TAGID;
18423 + set |= MNT_TAGID;
18425 +#endif /* CONFIG_PROPAGATE */
18426 + case Opt_notagcheck:
18428 + __dx_parse_remove(s, "notagcheck");
18429 + *flags |= MS_NOTAGCHECK;
18430 + set |= MS_NOTAGCHECK;
18433 + vxdprintk(VXD_CBIT(tag, 7),
18434 + "dx_parse_tag(" VS_Q("%s") "): %d:#%d",
18435 + p, token, option);
18438 + strcpy(string, s);
18443 +#ifdef CONFIG_PROPAGATE
18445 +void __dx_propagate_tag(struct nameidata *nd, struct inode *inode)
18447 + vtag_t new_tag = 0;
18448 + struct vfsmount *mnt;
18453 + mnt = nd->path.mnt;
18457 + propagate = (mnt->mnt_flags & MNT_TAGID);
18459 + new_tag = mnt->mnt_tag;
18461 + vxdprintk(VXD_CBIT(tag, 7),
18462 + "dx_propagate_tag(%p[#%lu.%d]): %d,%d",
18463 + inode, inode->i_ino, inode->i_tag,
18464 + new_tag, (propagate) ? 1 : 0);
18467 + i_tag_write(inode, new_tag);
18470 +#include <linux/module.h>
18472 +EXPORT_SYMBOL_GPL(__dx_propagate_tag);
18474 +#endif /* CONFIG_PROPAGATE */
18476 diff -NurpP --minimal linux-4.9.82/kernel/vserver/limit.c linux-4.9.82-vs2.3.9.7/kernel/vserver/limit.c
18477 --- linux-4.9.82/kernel/vserver/limit.c 1970-01-01 00:00:00.000000000 +0000
18478 +++ linux-4.9.82-vs2.3.9.7/kernel/vserver/limit.c 2018-01-25 00:07:15.000000000 +0000
18481 + * linux/kernel/vserver/limit.c
18483 + * Virtual Server: Context Limits
18485 + * Copyright (C) 2004-2010 Herbert P?tzl
18487 + * V0.01 broken out from vcontext V0.05
18488 + * V0.02 changed vcmds to vxi arg
18489 + * V0.03 added memory cgroup support
18493 +#include <linux/sched.h>
18494 +#include <linux/module.h>
18495 +#include <linux/memcontrol.h>
18496 +#include <linux/page_counter.h>
18497 +#include <linux/vs_limit.h>
18498 +#include <linux/vserver/limit.h>
18499 +#include <linux/vserver/limit_cmd.h>
18501 +#include <asm/uaccess.h>
18504 +const char *vlimit_name[NUM_LIMITS] = {
18505 + [RLIMIT_CPU] = "CPU",
18506 + [RLIMIT_NPROC] = "NPROC",
18507 + [RLIMIT_NOFILE] = "NOFILE",
18508 + [RLIMIT_LOCKS] = "LOCKS",
18509 + [RLIMIT_SIGPENDING] = "SIGP",
18510 + [RLIMIT_MSGQUEUE] = "MSGQ",
18512 + [VLIMIT_NSOCK] = "NSOCK",
18513 + [VLIMIT_OPENFD] = "OPENFD",
18514 + [VLIMIT_SHMEM] = "SHMEM",
18515 + [VLIMIT_DENTRY] = "DENTRY",
18518 +EXPORT_SYMBOL_GPL(vlimit_name);
18520 +#define MASK_ENTRY(x) (1 << (x))
18522 +const struct vcmd_ctx_rlimit_mask_v0 vlimit_mask = {
18525 + , /* softlimit */
18528 + MASK_ENTRY( RLIMIT_NPROC ) |
18529 + MASK_ENTRY( RLIMIT_NOFILE ) |
18530 + MASK_ENTRY( RLIMIT_LOCKS ) |
18531 + MASK_ENTRY( RLIMIT_MSGQUEUE ) |
18533 + MASK_ENTRY( VLIMIT_NSOCK ) |
18534 + MASK_ENTRY( VLIMIT_OPENFD ) |
18535 + MASK_ENTRY( VLIMIT_SHMEM ) |
18536 + MASK_ENTRY( VLIMIT_DENTRY ) |
18539 + /* accounting only */
18540 +uint32_t account_mask =
18541 + MASK_ENTRY( VLIMIT_SEMARY ) |
18542 + MASK_ENTRY( VLIMIT_NSEMS ) |
18543 + MASK_ENTRY( VLIMIT_MAPPED ) |
18547 +static int is_valid_vlimit(int id)
18549 + uint32_t mask = vlimit_mask.minimum |
18550 + vlimit_mask.softlimit | vlimit_mask.maximum;
18551 + return mask & (1 << id);
18554 +static int is_accounted_vlimit(int id)
18556 + if (is_valid_vlimit(id))
18558 + return account_mask & (1 << id);
18562 +static inline uint64_t vc_get_soft(struct vx_info *vxi, int id)
18564 + rlim_t limit = __rlim_soft(&vxi->limit, id);
18565 + return VX_VLIM(limit);
18568 +static inline uint64_t vc_get_hard(struct vx_info *vxi, int id)
18570 + rlim_t limit = __rlim_hard(&vxi->limit, id);
18571 + return VX_VLIM(limit);
18574 +static int do_get_rlimit(struct vx_info *vxi, uint32_t id,
18575 + uint64_t *minimum, uint64_t *softlimit, uint64_t *maximum)
18577 + if (!is_valid_vlimit(id))
18581 + *minimum = CRLIM_UNSET;
18583 + *softlimit = vc_get_soft(vxi, id);
18585 + *maximum = vc_get_hard(vxi, id);
18589 +int vc_get_rlimit(struct vx_info *vxi, void __user *data)
18591 + struct vcmd_ctx_rlimit_v0 vc_data;
18594 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
18597 + ret = do_get_rlimit(vxi, vc_data.id,
18598 + &vc_data.minimum, &vc_data.softlimit, &vc_data.maximum);
18602 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
18607 +static int do_set_rlimit(struct vx_info *vxi, uint32_t id,
18608 + uint64_t minimum, uint64_t softlimit, uint64_t maximum)
18610 + if (!is_valid_vlimit(id))
18613 + if (maximum != CRLIM_KEEP)
18614 + __rlim_hard(&vxi->limit, id) = VX_RLIM(maximum);
18615 + if (softlimit != CRLIM_KEEP)
18616 + __rlim_soft(&vxi->limit, id) = VX_RLIM(softlimit);
18618 + /* clamp soft limit */
18619 + if (__rlim_soft(&vxi->limit, id) > __rlim_hard(&vxi->limit, id))
18620 + __rlim_soft(&vxi->limit, id) = __rlim_hard(&vxi->limit, id);
18625 +int vc_set_rlimit(struct vx_info *vxi, void __user *data)
18627 + struct vcmd_ctx_rlimit_v0 vc_data;
18629 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
18632 + return do_set_rlimit(vxi, vc_data.id,
18633 + vc_data.minimum, vc_data.softlimit, vc_data.maximum);
18636 +#ifdef CONFIG_IA32_EMULATION
18638 +int vc_set_rlimit_x32(struct vx_info *vxi, void __user *data)
18640 + struct vcmd_ctx_rlimit_v0_x32 vc_data;
18642 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
18645 + return do_set_rlimit(vxi, vc_data.id,
18646 + vc_data.minimum, vc_data.softlimit, vc_data.maximum);
18649 +int vc_get_rlimit_x32(struct vx_info *vxi, void __user *data)
18651 + struct vcmd_ctx_rlimit_v0_x32 vc_data;
18654 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
18657 + ret = do_get_rlimit(vxi, vc_data.id,
18658 + &vc_data.minimum, &vc_data.softlimit, &vc_data.maximum);
18662 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
18667 +#endif /* CONFIG_IA32_EMULATION */
18670 +int vc_get_rlimit_mask(uint32_t id, void __user *data)
18672 + if (copy_to_user(data, &vlimit_mask, sizeof(vlimit_mask)))
18678 +static inline void vx_reset_hits(struct _vx_limit *limit)
18682 + for (lim = 0; lim < NUM_LIMITS; lim++) {
18683 + atomic_set(&__rlim_lhit(limit, lim), 0);
18687 +int vc_reset_hits(struct vx_info *vxi, void __user *data)
18689 + vx_reset_hits(&vxi->limit);
18693 +static inline void vx_reset_minmax(struct _vx_limit *limit)
18698 + for (lim = 0; lim < NUM_LIMITS; lim++) {
18699 + value = __rlim_get(limit, lim);
18700 + __rlim_rmax(limit, lim) = value;
18701 + __rlim_rmin(limit, lim) = value;
18705 +int vc_reset_minmax(struct vx_info *vxi, void __user *data)
18707 + vx_reset_minmax(&vxi->limit);
18712 +int vc_rlimit_stat(struct vx_info *vxi, void __user *data)
18714 + struct vcmd_rlimit_stat_v0 vc_data;
18715 + struct _vx_limit *limit = &vxi->limit;
18718 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
18722 + if (!is_accounted_vlimit(id))
18725 + vx_limit_fixup(limit, id);
18726 + vc_data.hits = atomic_read(&__rlim_lhit(limit, id));
18727 + vc_data.value = __rlim_get(limit, id);
18728 + vc_data.minimum = __rlim_rmin(limit, id);
18729 + vc_data.maximum = __rlim_rmax(limit, id);
18731 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
18737 +#ifdef CONFIG_MEMCG
18739 +void dump_sysinfo(struct sysinfo *si)
18741 + printk(KERN_INFO "sysinfo: memunit=%u\n"
18742 + "\ttotalram:\t%lu\n"
18743 + "\tfreeram:\t%lu\n"
18744 + "\tsharedram:\t%lu\n"
18745 + "\tbufferram:\t%lu\n"
18746 + "\ttotalswap:\t%lu\n"
18747 + "\tfreeswap:\t%lu\n"
18748 + "\ttotalhigh:\t%lu\n"
18749 + "\tfreehigh:\t%lu\n",
18761 +void vx_vsi_meminfo(struct sysinfo *val)
18763 + struct mem_cgroup *mcg;
18764 + unsigned long res_limit, res_usage;
18767 + if (VXD_CBIT(cvirt, 4))
18768 + dump_sysinfo(val);
18771 + mcg = mem_cgroup_from_task(current);
18772 + if (VXD_CBIT(cvirt, 5))
18773 + dump_mem_cgroup(mcg);
18774 + rcu_read_unlock();
18778 + res_limit = mem_cgroup_mem_limit_pages(mcg);
18779 + res_usage = mem_cgroup_mem_usage_pages(mcg);
18780 + shift = val->mem_unit == 1 ? PAGE_SHIFT : 0;
18782 + if (res_limit != PAGE_COUNTER_MAX)
18783 + val->totalram = res_limit << shift;
18784 + val->freeram = val->totalram - (res_usage << shift);
18785 + val->bufferram = 0;
18786 + val->totalhigh = 0;
18787 + val->freehigh = 0;
18792 +void vx_vsi_swapinfo(struct sysinfo *val)
18794 +#ifdef CONFIG_MEMCG_SWAP
18795 + struct mem_cgroup *mcg;
18796 + unsigned long res_limit, res_usage, memsw_limit, memsw_usage;
18797 + signed long swap_limit, swap_usage;
18800 + if (VXD_CBIT(cvirt, 6))
18801 + dump_sysinfo(val);
18804 + mcg = mem_cgroup_from_task(current);
18805 + if (VXD_CBIT(cvirt, 7))
18806 + dump_mem_cgroup(mcg);
18807 + rcu_read_unlock();
18811 + res_limit = mem_cgroup_mem_limit_pages(mcg);
18813 + /* memory unlimited */
18814 + if (res_limit == PAGE_COUNTER_MAX)
18817 + res_usage = mem_cgroup_mem_usage_pages(mcg);
18818 + memsw_limit = mem_cgroup_memsw_limit_pages(mcg);
18819 + memsw_usage = mem_cgroup_memsw_usage_pages(mcg);
18820 + shift = val->mem_unit == 1 ? PAGE_SHIFT : 0;
18822 + swap_limit = memsw_limit - res_limit;
18823 + /* we have a swap limit? */
18824 + if (memsw_limit != PAGE_COUNTER_MAX)
18825 + val->totalswap = swap_limit << shift;
18827 + /* calculate swap part */
18828 + swap_usage = (memsw_usage > res_usage) ?
18829 + memsw_usage - res_usage : 0;
18831 + /* total shown minus usage gives free swap */
18832 + val->freeswap = (swap_usage < swap_limit) ?
18833 + val->totalswap - (swap_usage << shift) : 0;
18835 +#else /* !CONFIG_MEMCG_SWAP */
18836 + val->totalswap = 0;
18837 + val->freeswap = 0;
18838 +#endif /* !CONFIG_MEMCG_SWAP */
18842 +long vx_vsi_cached(struct sysinfo *val)
18845 +#ifdef CONFIG_MEMCG_BROKEN
18846 + struct mem_cgroup *mcg;
18848 + if (VXD_CBIT(cvirt, 8))
18849 + dump_sysinfo(val);
18852 + mcg = mem_cgroup_from_task(current);
18853 + if (VXD_CBIT(cvirt, 9))
18854 + dump_mem_cgroup(mcg);
18855 + rcu_read_unlock();
18859 + // cache = mem_cgroup_stat_read_cache(mcg);
18864 +#endif /* !CONFIG_MEMCG */
18866 diff -NurpP --minimal linux-4.9.82/kernel/vserver/limit_init.h linux-4.9.82-vs2.3.9.7/kernel/vserver/limit_init.h
18867 --- linux-4.9.82/kernel/vserver/limit_init.h 1970-01-01 00:00:00.000000000 +0000
18868 +++ linux-4.9.82-vs2.3.9.7/kernel/vserver/limit_init.h 2018-01-10 02:50:49.000000000 +0000
18872 +static inline void vx_info_init_limit(struct _vx_limit *limit)
18876 + for (lim = 0; lim < NUM_LIMITS; lim++) {
18877 + __rlim_soft(limit, lim) = RLIM_INFINITY;
18878 + __rlim_hard(limit, lim) = RLIM_INFINITY;
18879 + __rlim_set(limit, lim, 0);
18880 + atomic_set(&__rlim_lhit(limit, lim), 0);
18881 + __rlim_rmin(limit, lim) = 0;
18882 + __rlim_rmax(limit, lim) = 0;
18886 +static inline void vx_info_exit_limit(struct _vx_limit *limit)
18891 + for (lim = 0; lim < NUM_LIMITS; lim++) {
18892 + if ((1 << lim) & VLIM_NOCHECK)
18894 + value = __rlim_get(limit, lim);
18895 + vxwprintk_xid(value,
18896 + "!!! limit: %p[%s,%d] = %ld on exit.",
18897 + limit, vlimit_name[lim], lim, (long)value);
18901 diff -NurpP --minimal linux-4.9.82/kernel/vserver/limit_proc.h linux-4.9.82-vs2.3.9.7/kernel/vserver/limit_proc.h
18902 --- linux-4.9.82/kernel/vserver/limit_proc.h 1970-01-01 00:00:00.000000000 +0000
18903 +++ linux-4.9.82-vs2.3.9.7/kernel/vserver/limit_proc.h 2018-01-10 02:50:49.000000000 +0000
18905 +#ifndef _VX_LIMIT_PROC_H
18906 +#define _VX_LIMIT_PROC_H
18908 +#include <linux/vserver/limit_int.h>
18911 +#define VX_LIMIT_FMT ":\t%8ld\t%8ld/%8ld\t%8lld/%8lld\t%6d\n"
18912 +#define VX_LIMIT_TOP \
18913 + "Limit\t current\t min/max\t\t soft/hard\t\thits\n"
18915 +#define VX_LIMIT_ARG(r) \
18916 + (unsigned long)__rlim_get(limit, r), \
18917 + (unsigned long)__rlim_rmin(limit, r), \
18918 + (unsigned long)__rlim_rmax(limit, r), \
18919 + VX_VLIM(__rlim_soft(limit, r)), \
18920 + VX_VLIM(__rlim_hard(limit, r)), \
18921 + atomic_read(&__rlim_lhit(limit, r))
18923 +static inline int vx_info_proc_limit(struct _vx_limit *limit, char *buffer)
18925 + vx_limit_fixup(limit, -1);
18926 + return sprintf(buffer, VX_LIMIT_TOP
18927 + "PROC" VX_LIMIT_FMT
18928 + "VM" VX_LIMIT_FMT
18929 + "VML" VX_LIMIT_FMT
18930 + "RSS" VX_LIMIT_FMT
18931 + "ANON" VX_LIMIT_FMT
18932 + "RMAP" VX_LIMIT_FMT
18933 + "FILES" VX_LIMIT_FMT
18934 + "OFD" VX_LIMIT_FMT
18935 + "LOCKS" VX_LIMIT_FMT
18936 + "SOCK" VX_LIMIT_FMT
18937 + "MSGQ" VX_LIMIT_FMT
18938 + "SHM" VX_LIMIT_FMT
18939 + "SEMA" VX_LIMIT_FMT
18940 + "SEMS" VX_LIMIT_FMT
18941 + "DENT" VX_LIMIT_FMT,
18942 + VX_LIMIT_ARG(RLIMIT_NPROC),
18943 + VX_LIMIT_ARG(RLIMIT_AS),
18944 + VX_LIMIT_ARG(RLIMIT_MEMLOCK),
18945 + VX_LIMIT_ARG(RLIMIT_RSS),
18946 + VX_LIMIT_ARG(VLIMIT_ANON),
18947 + VX_LIMIT_ARG(VLIMIT_MAPPED),
18948 + VX_LIMIT_ARG(RLIMIT_NOFILE),
18949 + VX_LIMIT_ARG(VLIMIT_OPENFD),
18950 + VX_LIMIT_ARG(RLIMIT_LOCKS),
18951 + VX_LIMIT_ARG(VLIMIT_NSOCK),
18952 + VX_LIMIT_ARG(RLIMIT_MSGQUEUE),
18953 + VX_LIMIT_ARG(VLIMIT_SHMEM),
18954 + VX_LIMIT_ARG(VLIMIT_SEMARY),
18955 + VX_LIMIT_ARG(VLIMIT_NSEMS),
18956 + VX_LIMIT_ARG(VLIMIT_DENTRY));
18959 +#endif /* _VX_LIMIT_PROC_H */
18962 diff -NurpP --minimal linux-4.9.82/kernel/vserver/network.c linux-4.9.82-vs2.3.9.7/kernel/vserver/network.c
18963 --- linux-4.9.82/kernel/vserver/network.c 1970-01-01 00:00:00.000000000 +0000
18964 +++ linux-4.9.82-vs2.3.9.7/kernel/vserver/network.c 2018-01-10 02:50:49.000000000 +0000
18967 + * linux/kernel/vserver/network.c
18969 + * Virtual Server: Network Support
18971 + * Copyright (C) 2003-2007 Herbert P?tzl
18973 + * V0.01 broken out from vcontext V0.05
18974 + * V0.02 cleaned up implementation
18975 + * V0.03 added equiv nx commands
18976 + * V0.04 switch to RCU based hash
18977 + * V0.05 and back to locking again
18978 + * V0.06 changed vcmds to nxi arg
18979 + * V0.07 have __create claim() the nxi
18983 +#include <linux/err.h>
18984 +#include <linux/slab.h>
18985 +#include <linux/rcupdate.h>
18986 +#include <net/ipv6.h>
18988 +#include <linux/vs_network.h>
18989 +#include <linux/vs_pid.h>
18990 +#include <linux/vserver/network_cmd.h>
18993 +atomic_t nx_global_ctotal = ATOMIC_INIT(0);
18994 +atomic_t nx_global_cactive = ATOMIC_INIT(0);
18996 +static struct kmem_cache *nx_addr_v4_cachep = NULL;
18997 +static struct kmem_cache *nx_addr_v6_cachep = NULL;
19000 +static int __init init_network(void)
19002 + nx_addr_v4_cachep = kmem_cache_create("nx_v4_addr_cache",
19003 + sizeof(struct nx_addr_v4), 0,
19004 + SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
19005 + nx_addr_v6_cachep = kmem_cache_create("nx_v6_addr_cache",
19006 + sizeof(struct nx_addr_v6), 0,
19007 + SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
19012 +/* __alloc_nx_addr_v4() */
19014 +static inline struct nx_addr_v4 *__alloc_nx_addr_v4(void)
19016 + struct nx_addr_v4 *nxa = kmem_cache_alloc(
19017 + nx_addr_v4_cachep, GFP_KERNEL);
19019 + if (!IS_ERR(nxa))
19020 + memset(nxa, 0, sizeof(*nxa));
19024 +/* __dealloc_nx_addr_v4() */
19026 +static inline void __dealloc_nx_addr_v4(struct nx_addr_v4 *nxa)
19028 + kmem_cache_free(nx_addr_v4_cachep, nxa);
19031 +/* __dealloc_nx_addr_v4_all() */
19033 +static inline void __dealloc_nx_addr_v4_all(struct nx_addr_v4 *nxa)
19036 + struct nx_addr_v4 *next = nxa->next;
19038 + __dealloc_nx_addr_v4(nxa);
19044 +#ifdef CONFIG_IPV6
19046 +/* __alloc_nx_addr_v6() */
19048 +static inline struct nx_addr_v6 *__alloc_nx_addr_v6(void)
19050 + struct nx_addr_v6 *nxa = kmem_cache_alloc(
19051 + nx_addr_v6_cachep, GFP_KERNEL);
19053 + if (!IS_ERR(nxa))
19054 + memset(nxa, 0, sizeof(*nxa));
19058 +/* __dealloc_nx_addr_v6() */
19060 +static inline void __dealloc_nx_addr_v6(struct nx_addr_v6 *nxa)
19062 + kmem_cache_free(nx_addr_v6_cachep, nxa);
19065 +/* __dealloc_nx_addr_v6_all() */
19067 +static inline void __dealloc_nx_addr_v6_all(struct nx_addr_v6 *nxa)
19070 + struct nx_addr_v6 *next = nxa->next;
19072 + __dealloc_nx_addr_v6(nxa);
19077 +#endif /* CONFIG_IPV6 */
19079 +/* __alloc_nx_info()
19081 + * allocate an initialized nx_info struct
19082 + * doesn't make it visible (hash) */
19084 +static struct nx_info *__alloc_nx_info(vnid_t nid)
19086 + struct nx_info *new = NULL;
19088 + vxdprintk(VXD_CBIT(nid, 1), "alloc_nx_info(%d)*", nid);
19090 + /* would this benefit from a slab cache? */
19091 + new = kmalloc(sizeof(struct nx_info), GFP_KERNEL);
19095 + memset(new, 0, sizeof(struct nx_info));
19096 + new->nx_id = nid;
19097 + INIT_HLIST_NODE(&new->nx_hlist);
19098 + atomic_set(&new->nx_usecnt, 0);
19099 + atomic_set(&new->nx_tasks, 0);
19100 + spin_lock_init(&new->addr_lock);
19101 + new->nx_state = 0;
19103 + new->nx_flags = NXF_INIT_SET;
19105 + /* rest of init goes here */
19107 + new->v4_lback.s_addr = htonl(INADDR_LOOPBACK);
19108 + new->v4_bcast.s_addr = htonl(INADDR_BROADCAST);
19110 + vxdprintk(VXD_CBIT(nid, 0),
19111 + "alloc_nx_info(%d) = %p", nid, new);
19112 + atomic_inc(&nx_global_ctotal);
19116 +/* __dealloc_nx_info()
19118 + * final disposal of nx_info */
19120 +static void __dealloc_nx_info(struct nx_info *nxi)
19122 + vxdprintk(VXD_CBIT(nid, 0),
19123 + "dealloc_nx_info(%p)", nxi);
19125 + nxi->nx_hlist.next = LIST_POISON1;
19128 + BUG_ON(atomic_read(&nxi->nx_usecnt));
19129 + BUG_ON(atomic_read(&nxi->nx_tasks));
19131 + __dealloc_nx_addr_v4_all(nxi->v4.next);
19132 +#ifdef CONFIG_IPV6
19133 + __dealloc_nx_addr_v6_all(nxi->v6.next);
19136 + nxi->nx_state |= NXS_RELEASED;
19138 + atomic_dec(&nx_global_ctotal);
19141 +static void __shutdown_nx_info(struct nx_info *nxi)
19143 + nxi->nx_state |= NXS_SHUTDOWN;
19144 + vs_net_change(nxi, VSC_NETDOWN);
19147 +/* exported stuff */
19149 +void free_nx_info(struct nx_info *nxi)
19151 + /* context shutdown is mandatory */
19152 + BUG_ON(nxi->nx_state != NXS_SHUTDOWN);
19154 + /* context must not be hashed */
19155 + BUG_ON(nxi->nx_state & NXS_HASHED);
19157 + BUG_ON(atomic_read(&nxi->nx_usecnt));
19158 + BUG_ON(atomic_read(&nxi->nx_tasks));
19160 + __dealloc_nx_info(nxi);
19164 +void __nx_set_lback(struct nx_info *nxi)
19166 + int nid = nxi->nx_id;
19167 + __be32 lback = htonl(INADDR_LOOPBACK ^ ((nid & 0xFFFF) << 8));
19169 + nxi->v4_lback.s_addr = lback;
19172 +extern int __nx_inet_add_lback(__be32 addr);
19173 +extern int __nx_inet_del_lback(__be32 addr);
19176 +/* hash table for nx_info hash */
19178 +#define NX_HASH_SIZE 13
19180 +struct hlist_head nx_info_hash[NX_HASH_SIZE];
19182 +static DEFINE_SPINLOCK(nx_info_hash_lock);
19185 +static inline unsigned int __hashval(vnid_t nid)
19187 + return (nid % NX_HASH_SIZE);
19192 +/* __hash_nx_info()
19194 + * add the nxi to the global hash table
19195 + * requires the hash_lock to be held */
19197 +static inline void __hash_nx_info(struct nx_info *nxi)
19199 + struct hlist_head *head;
19201 + vxd_assert_lock(&nx_info_hash_lock);
19202 + vxdprintk(VXD_CBIT(nid, 4),
19203 + "__hash_nx_info: %p[#%d]", nxi, nxi->nx_id);
19205 + /* context must not be hashed */
19206 + BUG_ON(nx_info_state(nxi, NXS_HASHED));
19208 + nxi->nx_state |= NXS_HASHED;
19209 + head = &nx_info_hash[__hashval(nxi->nx_id)];
19210 + hlist_add_head(&nxi->nx_hlist, head);
19211 + atomic_inc(&nx_global_cactive);
19214 +/* __unhash_nx_info()
19216 + * remove the nxi from the global hash table
19217 + * requires the hash_lock to be held */
19219 +static inline void __unhash_nx_info(struct nx_info *nxi)
19221 + vxd_assert_lock(&nx_info_hash_lock);
19222 + vxdprintk(VXD_CBIT(nid, 4),
19223 + "__unhash_nx_info: %p[#%d.%d.%d]", nxi, nxi->nx_id,
19224 + atomic_read(&nxi->nx_usecnt), atomic_read(&nxi->nx_tasks));
19226 + /* context must be hashed */
19227 + BUG_ON(!nx_info_state(nxi, NXS_HASHED));
19228 + /* but without tasks */
19229 + BUG_ON(atomic_read(&nxi->nx_tasks));
19231 + nxi->nx_state &= ~NXS_HASHED;
19232 + hlist_del(&nxi->nx_hlist);
19233 + atomic_dec(&nx_global_cactive);
19237 +/* __lookup_nx_info()
19239 + * requires the hash_lock to be held
19240 + * doesn't increment the nx_refcnt */
19242 +static inline struct nx_info *__lookup_nx_info(vnid_t nid)
19244 + struct hlist_head *head = &nx_info_hash[__hashval(nid)];
19245 + struct hlist_node *pos;
19246 + struct nx_info *nxi;
19248 + vxd_assert_lock(&nx_info_hash_lock);
19249 + hlist_for_each(pos, head) {
19250 + nxi = hlist_entry(pos, struct nx_info, nx_hlist);
19252 + if (nxi->nx_id == nid)
19257 + vxdprintk(VXD_CBIT(nid, 0),
19258 + "__lookup_nx_info(#%u): %p[#%u]",
19259 + nid, nxi, nxi ? nxi->nx_id : 0);
19264 +/* __create_nx_info()
19266 + * create the requested context
19267 + * get(), claim() and hash it */
19269 +static struct nx_info *__create_nx_info(int id)
19271 + struct nx_info *new, *nxi = NULL;
19273 + vxdprintk(VXD_CBIT(nid, 1), "create_nx_info(%d)*", id);
19275 + if (!(new = __alloc_nx_info(id)))
19276 + return ERR_PTR(-ENOMEM);
19278 + /* required to make dynamic xids unique */
19279 + spin_lock(&nx_info_hash_lock);
19281 + /* static context requested */
19282 + if ((nxi = __lookup_nx_info(id))) {
19283 + vxdprintk(VXD_CBIT(nid, 0),
19284 + "create_nx_info(%d) = %p (already there)", id, nxi);
19285 + if (nx_info_flags(nxi, NXF_STATE_SETUP, 0))
19286 + nxi = ERR_PTR(-EBUSY);
19288 + nxi = ERR_PTR(-EEXIST);
19291 + /* new context */
19292 + vxdprintk(VXD_CBIT(nid, 0),
19293 + "create_nx_info(%d) = %p (new)", id, new);
19294 + claim_nx_info(new, NULL);
19295 + __nx_set_lback(new);
19296 + __hash_nx_info(get_nx_info(new));
19297 + nxi = new, new = NULL;
19300 + spin_unlock(&nx_info_hash_lock);
19302 + __dealloc_nx_info(new);
19308 +/* exported stuff */
19311 +void unhash_nx_info(struct nx_info *nxi)
19313 + __shutdown_nx_info(nxi);
19314 + spin_lock(&nx_info_hash_lock);
19315 + __unhash_nx_info(nxi);
19316 + spin_unlock(&nx_info_hash_lock);
19319 +/* lookup_nx_info()
19321 + * search for a nx_info and get() it
19322 + * negative id means current */
19324 +struct nx_info *lookup_nx_info(int id)
19326 + struct nx_info *nxi = NULL;
19329 + nxi = get_nx_info(current_nx_info());
19330 + } else if (id > 1) {
19331 + spin_lock(&nx_info_hash_lock);
19332 + nxi = get_nx_info(__lookup_nx_info(id));
19333 + spin_unlock(&nx_info_hash_lock);
19338 +/* nid_is_hashed()
19340 + * verify that nid is still hashed */
19342 +int nid_is_hashed(vnid_t nid)
19346 + spin_lock(&nx_info_hash_lock);
19347 + hashed = (__lookup_nx_info(nid) != NULL);
19348 + spin_unlock(&nx_info_hash_lock);
19353 +#ifdef CONFIG_PROC_FS
19357 + * get a subset of hashed nids for proc
19358 + * assumes size is at least one */
19360 +int get_nid_list(int index, unsigned int *nids, int size)
19362 + int hindex, nr_nids = 0;
19364 + /* only show current and children */
19365 + if (!nx_check(0, VS_ADMIN | VS_WATCH)) {
19368 + nids[nr_nids] = nx_current_nid();
19372 + for (hindex = 0; hindex < NX_HASH_SIZE; hindex++) {
19373 + struct hlist_head *head = &nx_info_hash[hindex];
19374 + struct hlist_node *pos;
19376 + spin_lock(&nx_info_hash_lock);
19377 + hlist_for_each(pos, head) {
19378 + struct nx_info *nxi;
19383 + nxi = hlist_entry(pos, struct nx_info, nx_hlist);
19384 + nids[nr_nids] = nxi->nx_id;
19385 + if (++nr_nids >= size) {
19386 + spin_unlock(&nx_info_hash_lock);
19390 + /* keep the lock time short */
19391 + spin_unlock(&nx_info_hash_lock);
19400 + * migrate task to new network
19401 + * gets nxi, puts old_nxi on change
19404 +int nx_migrate_task(struct task_struct *p, struct nx_info *nxi)
19406 + struct nx_info *old_nxi;
19412 + vxdprintk(VXD_CBIT(nid, 5),
19413 + "nx_migrate_task(%p,%p[#%d.%d.%d])",
19414 + p, nxi, nxi->nx_id,
19415 + atomic_read(&nxi->nx_usecnt),
19416 + atomic_read(&nxi->nx_tasks));
19418 + if (nx_info_flags(nxi, NXF_INFO_PRIVATE, 0) &&
19419 + !nx_info_flags(nxi, NXF_STATE_SETUP, 0))
19422 + if (nx_info_state(nxi, NXS_SHUTDOWN))
19425 + /* maybe disallow this completely? */
19426 + old_nxi = task_get_nx_info(p);
19427 + if (old_nxi == nxi)
19432 + clr_nx_info(&p->nx_info);
19433 + claim_nx_info(nxi, p);
19434 + set_nx_info(&p->nx_info, nxi);
19435 + p->nid = nxi->nx_id;
19438 + vxdprintk(VXD_CBIT(nid, 5),
19439 + "moved task %p into nxi:%p[#%d]",
19440 + p, nxi, nxi->nx_id);
19443 + release_nx_info(old_nxi, p);
19446 + put_nx_info(old_nxi);
19451 +void nx_set_persistent(struct nx_info *nxi)
19453 + vxdprintk(VXD_CBIT(nid, 6),
19454 + "nx_set_persistent(%p[#%d])", nxi, nxi->nx_id);
19456 + get_nx_info(nxi);
19457 + claim_nx_info(nxi, NULL);
19460 +void nx_clear_persistent(struct nx_info *nxi)
19462 + vxdprintk(VXD_CBIT(nid, 6),
19463 + "nx_clear_persistent(%p[#%d])", nxi, nxi->nx_id);
19465 + release_nx_info(nxi, NULL);
19466 + put_nx_info(nxi);
19469 +void nx_update_persistent(struct nx_info *nxi)
19471 + if (nx_info_flags(nxi, NXF_PERSISTENT, 0))
19472 + nx_set_persistent(nxi);
19474 + nx_clear_persistent(nxi);
19477 +/* vserver syscall commands below here */
19479 +/* taks nid and nx_info functions */
19481 +#include <asm/uaccess.h>
19484 +int vc_task_nid(uint32_t id)
19489 + struct task_struct *tsk;
19492 + tsk = find_task_by_real_pid(id);
19493 + nid = (tsk) ? tsk->nid : -ESRCH;
19494 + rcu_read_unlock();
19496 + nid = nx_current_nid();
19501 +int vc_nx_info(struct nx_info *nxi, void __user *data)
19503 + struct vcmd_nx_info_v0 vc_data;
19505 + vc_data.nid = nxi->nx_id;
19507 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
19513 +/* network functions */
19515 +int vc_net_create(uint32_t nid, void __user *data)
19517 + struct vcmd_net_create vc_data = { .flagword = NXF_INIT_SET };
19518 + struct nx_info *new_nxi;
19521 + if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
19524 + if ((nid > MAX_S_CONTEXT) || (nid < 2))
19527 + new_nxi = __create_nx_info(nid);
19528 + if (IS_ERR(new_nxi))
19529 + return PTR_ERR(new_nxi);
19531 + /* initial flags */
19532 + new_nxi->nx_flags = vc_data.flagword;
19535 + if (vs_net_change(new_nxi, VSC_NETUP))
19538 + ret = nx_migrate_task(current, new_nxi);
19542 + /* return context id on success */
19543 + ret = new_nxi->nx_id;
19545 + /* get a reference for persistent contexts */
19546 + if ((vc_data.flagword & NXF_PERSISTENT))
19547 + nx_set_persistent(new_nxi);
19549 + release_nx_info(new_nxi, NULL);
19550 + put_nx_info(new_nxi);
19555 +int vc_net_migrate(struct nx_info *nxi, void __user *data)
19557 + return nx_migrate_task(current, nxi);
19562 +struct nx_addr_v4 *__find_v4_addr(struct nx_info *nxi,
19563 + __be32 ip, __be32 ip2, __be32 mask, uint16_t type, uint16_t flags,
19564 + struct nx_addr_v4 **prev)
19566 + struct nx_addr_v4 *nxa = &nxi->v4;
19568 + for (; nxa; nxa = nxa->next) {
19569 + if ((nxa->ip[0].s_addr == ip) &&
19570 + (nxa->ip[1].s_addr == ip2) &&
19571 + (nxa->mask.s_addr == mask) &&
19572 + (nxa->type == type) &&
19573 + (nxa->flags == flags))
19576 + /* save previous entry */
19583 +int do_add_v4_addr(struct nx_info *nxi, __be32 ip, __be32 ip2, __be32 mask,
19584 + uint16_t type, uint16_t flags)
19586 + struct nx_addr_v4 *nxa = NULL;
19587 + struct nx_addr_v4 *new = __alloc_nx_addr_v4();
19588 + unsigned long irqflags;
19589 + int ret = -EEXIST;
19592 + return PTR_ERR(new);
19594 + spin_lock_irqsave(&nxi->addr_lock, irqflags);
19595 + if (__find_v4_addr(nxi, ip, ip2, mask, type, flags, &nxa))
19598 + if (NX_IPV4(nxi)) {
19603 + /* remove single ip for ip list */
19604 + nxi->nx_flags &= ~NXF_SINGLE_IP;
19607 + nxa->ip[0].s_addr = ip;
19608 + nxa->ip[1].s_addr = ip2;
19609 + nxa->mask.s_addr = mask;
19610 + nxa->type = type;
19611 + nxa->flags = flags;
19614 + spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
19616 + __dealloc_nx_addr_v4(new);
19620 +int do_remove_v4_addr(struct nx_info *nxi, __be32 ip, __be32 ip2, __be32 mask,
19621 + uint16_t type, uint16_t flags)
19623 + struct nx_addr_v4 *nxa = NULL;
19624 + struct nx_addr_v4 *old = NULL;
19625 + unsigned long irqflags;
19628 + spin_lock_irqsave(&nxi->addr_lock, irqflags);
19630 + case NXA_TYPE_ADDR:
19631 + old = __find_v4_addr(nxi, ip, ip2, mask, type, flags, &nxa);
19634 + nxa->next = old->next;
19635 + old->next = NULL;
19641 + old->next = NULL;
19643 + memset(old, 0, sizeof(*old));
19651 + case NXA_TYPE_ANY:
19654 + memset(nxa, 0, sizeof(*nxa));
19660 + spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
19661 + __dealloc_nx_addr_v4_all(old);
19666 +int vc_net_add(struct nx_info *nxi, void __user *data)
19668 + struct vcmd_net_addr_v0 vc_data;
19669 + int index, ret = 0;
19671 + if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
19674 + switch (vc_data.type) {
19675 + case NXA_TYPE_IPV4:
19676 + if ((vc_data.count < 1) || (vc_data.count > 4))
19680 + while (index < vc_data.count) {
19681 + ret = do_add_v4_addr(nxi, vc_data.ip[index].s_addr, 0,
19682 + vc_data.mask[index].s_addr, NXA_TYPE_ADDR, 0);
19690 + case NXA_TYPE_IPV4|NXA_MOD_BCAST:
19691 + nxi->v4_bcast = vc_data.ip[0];
19695 + case NXA_TYPE_IPV4|NXA_MOD_LBACK:
19696 + nxi->v4_lback = vc_data.ip[0];
19707 +int vc_net_remove(struct nx_info *nxi, void __user *data)
19709 + struct vcmd_net_addr_v0 vc_data;
19711 + if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
19714 + switch (vc_data.type) {
19715 + case NXA_TYPE_ANY:
19716 + return do_remove_v4_addr(nxi, 0, 0, 0, vc_data.type, 0);
19724 +int vc_net_add_ipv4_v1(struct nx_info *nxi, void __user *data)
19726 + struct vcmd_net_addr_ipv4_v1 vc_data;
19728 + if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
19731 + switch (vc_data.type) {
19732 + case NXA_TYPE_ADDR:
19733 + case NXA_TYPE_MASK:
19734 + return do_add_v4_addr(nxi, vc_data.ip.s_addr, 0,
19735 + vc_data.mask.s_addr, vc_data.type, vc_data.flags);
19737 + case NXA_TYPE_ADDR | NXA_MOD_BCAST:
19738 + nxi->v4_bcast = vc_data.ip;
19741 + case NXA_TYPE_ADDR | NXA_MOD_LBACK:
19742 + nxi->v4_lback = vc_data.ip;
19751 +int vc_net_add_ipv4(struct nx_info *nxi, void __user *data)
19753 + struct vcmd_net_addr_ipv4_v2 vc_data;
19755 + if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
19758 + switch (vc_data.type) {
19759 + case NXA_TYPE_ADDR:
19760 + case NXA_TYPE_MASK:
19761 + case NXA_TYPE_RANGE:
19762 + return do_add_v4_addr(nxi, vc_data.ip.s_addr, vc_data.ip2.s_addr,
19763 + vc_data.mask.s_addr, vc_data.type, vc_data.flags);
19765 + case NXA_TYPE_ADDR | NXA_MOD_BCAST:
19766 + nxi->v4_bcast = vc_data.ip;
19769 + case NXA_TYPE_ADDR | NXA_MOD_LBACK:
19770 + nxi->v4_lback = vc_data.ip;
19779 +int vc_net_rem_ipv4_v1(struct nx_info *nxi, void __user *data)
19781 + struct vcmd_net_addr_ipv4_v1 vc_data;
19783 + if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
19786 + return do_remove_v4_addr(nxi, vc_data.ip.s_addr, 0,
19787 + vc_data.mask.s_addr, vc_data.type, vc_data.flags);
19790 +int vc_net_rem_ipv4(struct nx_info *nxi, void __user *data)
19792 + struct vcmd_net_addr_ipv4_v2 vc_data;
19794 + if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
19797 + return do_remove_v4_addr(nxi, vc_data.ip.s_addr, vc_data.ip2.s_addr,
19798 + vc_data.mask.s_addr, vc_data.type, vc_data.flags);
19801 +#ifdef CONFIG_IPV6
19804 +struct nx_addr_v6 *__find_v6_addr(struct nx_info *nxi,
19805 + struct in6_addr *ip, struct in6_addr *mask,
19806 + uint32_t prefix, uint16_t type, uint16_t flags,
19807 + struct nx_addr_v6 **prev)
19809 + struct nx_addr_v6 *nxa = &nxi->v6;
19811 + for (; nxa; nxa = nxa->next) {
19812 + if (ipv6_addr_equal(&nxa->ip, ip) &&
19813 + ipv6_addr_equal(&nxa->mask, mask) &&
19814 + (nxa->prefix == prefix) &&
19815 + (nxa->type == type) &&
19816 + (nxa->flags == flags))
19819 + /* save previous entry */
19827 +int do_add_v6_addr(struct nx_info *nxi,
19828 + struct in6_addr *ip, struct in6_addr *mask,
19829 + uint32_t prefix, uint16_t type, uint16_t flags)
19831 + struct nx_addr_v6 *nxa = NULL;
19832 + struct nx_addr_v6 *new = __alloc_nx_addr_v6();
19833 + unsigned long irqflags;
19834 + int ret = -EEXIST;
19837 + return PTR_ERR(new);
19839 + spin_lock_irqsave(&nxi->addr_lock, irqflags);
19840 + if (__find_v6_addr(nxi, ip, mask, prefix, type, flags, &nxa))
19843 + if (NX_IPV6(nxi)) {
19850 + nxa->mask = *mask;
19851 + nxa->prefix = prefix;
19852 + nxa->type = type;
19853 + nxa->flags = flags;
19856 + spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
19858 + __dealloc_nx_addr_v6(new);
19862 +int do_remove_v6_addr(struct nx_info *nxi,
19863 + struct in6_addr *ip, struct in6_addr *mask,
19864 + uint32_t prefix, uint16_t type, uint16_t flags)
19866 + struct nx_addr_v6 *nxa = NULL;
19867 + struct nx_addr_v6 *old = NULL;
19868 + unsigned long irqflags;
19871 + spin_lock_irqsave(&nxi->addr_lock, irqflags);
19873 + case NXA_TYPE_ADDR:
19874 + old = __find_v6_addr(nxi, ip, mask, prefix, type, flags, &nxa);
19877 + nxa->next = old->next;
19878 + old->next = NULL;
19884 + old->next = NULL;
19886 + memset(old, 0, sizeof(*old));
19894 + case NXA_TYPE_ANY:
19897 + memset(nxa, 0, sizeof(*nxa));
19903 + spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
19904 + __dealloc_nx_addr_v6_all(old);
19908 +int vc_net_add_ipv6(struct nx_info *nxi, void __user *data)
19910 + struct vcmd_net_addr_ipv6_v1 vc_data;
19912 + if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
19915 + switch (vc_data.type) {
19916 + case NXA_TYPE_ADDR:
19917 + memset(&vc_data.mask, ~0, sizeof(vc_data.mask));
19918 + /* fallthrough */
19919 + case NXA_TYPE_MASK:
19920 + return do_add_v6_addr(nxi, &vc_data.ip, &vc_data.mask,
19921 + vc_data.prefix, vc_data.type, vc_data.flags);
19928 +int vc_net_remove_ipv6(struct nx_info *nxi, void __user *data)
19930 + struct vcmd_net_addr_ipv6_v1 vc_data;
19932 + if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
19935 + switch (vc_data.type) {
19936 + case NXA_TYPE_ADDR:
19937 + memset(&vc_data.mask, ~0, sizeof(vc_data.mask));
19938 + /* fallthrough */
19939 + case NXA_TYPE_MASK:
19940 + return do_remove_v6_addr(nxi, &vc_data.ip, &vc_data.mask,
19941 + vc_data.prefix, vc_data.type, vc_data.flags);
19942 + case NXA_TYPE_ANY:
19943 + return do_remove_v6_addr(nxi, NULL, NULL, 0, vc_data.type, 0);
19950 +#endif /* CONFIG_IPV6 */
19953 +int vc_get_nflags(struct nx_info *nxi, void __user *data)
19955 + struct vcmd_net_flags_v0 vc_data;
19957 + vc_data.flagword = nxi->nx_flags;
19959 + /* special STATE flag handling */
19960 + vc_data.mask = vs_mask_flags(~0ULL, nxi->nx_flags, NXF_ONE_TIME);
19962 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
19967 +int vc_set_nflags(struct nx_info *nxi, void __user *data)
19969 + struct vcmd_net_flags_v0 vc_data;
19970 + uint64_t mask, trigger;
19972 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
19975 + /* special STATE flag handling */
19976 + mask = vs_mask_mask(vc_data.mask, nxi->nx_flags, NXF_ONE_TIME);
19977 + trigger = (mask & nxi->nx_flags) ^ (mask & vc_data.flagword);
19979 + nxi->nx_flags = vs_mask_flags(nxi->nx_flags,
19980 + vc_data.flagword, mask);
19981 + if (trigger & NXF_PERSISTENT)
19982 + nx_update_persistent(nxi);
19987 +int vc_get_ncaps(struct nx_info *nxi, void __user *data)
19989 + struct vcmd_net_caps_v0 vc_data;
19991 + vc_data.ncaps = nxi->nx_ncaps;
19992 + vc_data.cmask = ~0ULL;
19994 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
19999 +int vc_set_ncaps(struct nx_info *nxi, void __user *data)
20001 + struct vcmd_net_caps_v0 vc_data;
20003 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
20006 + nxi->nx_ncaps = vs_mask_flags(nxi->nx_ncaps,
20007 + vc_data.ncaps, vc_data.cmask);
20012 +#include <linux/module.h>
20014 +module_init(init_network);
20016 +EXPORT_SYMBOL_GPL(free_nx_info);
20017 +EXPORT_SYMBOL_GPL(unhash_nx_info);
20019 diff -NurpP --minimal linux-4.9.82/kernel/vserver/proc.c linux-4.9.82-vs2.3.9.7/kernel/vserver/proc.c
20020 --- linux-4.9.82/kernel/vserver/proc.c 1970-01-01 00:00:00.000000000 +0000
20021 +++ linux-4.9.82-vs2.3.9.7/kernel/vserver/proc.c 2018-01-13 04:17:12.000000000 +0000
20024 + * linux/kernel/vserver/proc.c
20026 + * Virtual Context Support
20028 + * Copyright (C) 2003-2011 Herbert P?tzl
20030 + * V0.01 basic structure
20031 + * V0.02 adaptation vs1.3.0
20032 + * V0.03 proc permissions
20033 + * V0.04 locking/generic
20034 + * V0.05 next generation procfs
20035 + * V0.06 inode validation
20036 + * V0.07 generic rewrite vid
20037 + * V0.08 remove inode type
20038 + * V0.09 added u/wmask info
20042 +#include <linux/proc_fs.h>
20043 +#include <linux/fs_struct.h>
20044 +#include <linux/mount.h>
20045 +#include <linux/namei.h>
20046 +#include <asm/unistd.h>
20048 +#include <linux/vs_context.h>
20049 +#include <linux/vs_network.h>
20050 +#include <linux/vs_cvirt.h>
20052 +#include <linux/in.h>
20053 +#include <linux/inetdevice.h>
20054 +#include <linux/vs_inet.h>
20055 +#include <linux/vs_inet6.h>
20057 +#include <linux/vserver/global.h>
20059 +#include "cvirt_proc.h"
20060 +#include "cacct_proc.h"
20061 +#include "limit_proc.h"
20062 +#include "sched_proc.h"
20063 +#include "vci_config.h"
20065 +#include <../../fs/proc/internal.h>
20068 +static inline char *print_cap_t(char *buffer, kernel_cap_t *c)
20072 + CAP_FOR_EACH_U32(__capi) {
20073 + buffer += sprintf(buffer, "%08x",
20074 + c->cap[(_KERNEL_CAPABILITY_U32S-1) - __capi]);
20080 +static struct proc_dir_entry *proc_virtual;
20082 +static struct proc_dir_entry *proc_virtnet;
20085 +/* first the actual feeds */
20088 +static int proc_vci(char *buffer)
20090 + return sprintf(buffer,
20091 + "VCIVersion:\t%04x:%04x\n"
20092 + "VCISyscall:\t%d\n"
20093 + "VCIKernel:\t%08x\n",
20094 + VCI_VERSION >> 16,
20095 + VCI_VERSION & 0xFFFF,
20097 + vci_kernel_config());
20100 +static int proc_virtual_info(char *buffer)
20102 + return proc_vci(buffer);
20105 +static int proc_virtual_status(char *buffer)
20107 + return sprintf(buffer,
20109 + "#CActive:\t%d\n"
20110 + "#NSProxy:\t%d\t%d %d %d %d %d %d\n"
20111 + "#InitTask:\t%d\t%d %d\n",
20112 + atomic_read(&vx_global_ctotal),
20113 + atomic_read(&vx_global_cactive),
20114 + atomic_read(&vs_global_nsproxy),
20115 + atomic_read(&vs_global_fs),
20116 + atomic_read(&vs_global_mnt_ns),
20117 + atomic_read(&vs_global_uts_ns),
20118 + atomic_read(&vs_global_ipc_ns),
20119 + atomic_read(&vs_global_user_ns),
20120 + atomic_read(&vs_global_pid_ns),
20121 + atomic_read(&init_task.usage),
20122 + atomic_read(&init_task.nsproxy->count),
20123 + init_task.fs->users);
20127 +int proc_vxi_info(struct vx_info *vxi, char *buffer)
20131 + length = sprintf(buffer,
20139 + vxi->vx_badness_bias);
20143 +int proc_vxi_status(struct vx_info *vxi, char *buffer)
20145 + char *orig = buffer;
20147 + buffer += sprintf(buffer,
20150 + "Flags:\t%016llx\n",
20151 + atomic_read(&vxi->vx_usecnt),
20152 + atomic_read(&vxi->vx_tasks),
20153 + (unsigned long long)vxi->vx_flags);
20155 + buffer += sprintf(buffer, "BCaps:\t");
20156 + buffer = print_cap_t(buffer, &vxi->vx_bcaps);
20157 + buffer += sprintf(buffer, "\n");
20159 + buffer += sprintf(buffer,
20160 + "CCaps:\t%016llx\n"
20161 + "Umask:\t%16llx\n"
20162 + "Wmask:\t%16llx\n"
20163 + "Spaces:\t%08lx %08lx\n",
20164 + (unsigned long long)vxi->vx_ccaps,
20165 + (unsigned long long)vxi->vx_umask,
20166 + (unsigned long long)vxi->vx_wmask,
20167 + vxi->space[0].vx_nsmask, vxi->space[1].vx_nsmask);
20168 + return buffer - orig;
20171 +int proc_vxi_limit(struct vx_info *vxi, char *buffer)
20173 + return vx_info_proc_limit(&vxi->limit, buffer);
20176 +int proc_vxi_sched(struct vx_info *vxi, char *buffer)
20180 + length = vx_info_proc_sched(&vxi->sched, buffer);
20181 + for_each_online_cpu(cpu) {
20182 + length += vx_info_proc_sched_pc(
20183 + &vx_per_cpu(vxi, sched_pc, cpu),
20184 + buffer + length, cpu);
20189 +int proc_vxi_nsproxy0(struct vx_info *vxi, char *buffer)
20191 + return vx_info_proc_nsproxy(vxi->space[0].vx_nsproxy, buffer);
20194 +int proc_vxi_nsproxy1(struct vx_info *vxi, char *buffer)
20196 + return vx_info_proc_nsproxy(vxi->space[1].vx_nsproxy, buffer);
20199 +int proc_vxi_cvirt(struct vx_info *vxi, char *buffer)
20203 + vx_update_load(vxi);
20204 + length = vx_info_proc_cvirt(&vxi->cvirt, buffer);
20205 + for_each_online_cpu(cpu) {
20206 + length += vx_info_proc_cvirt_pc(
20207 + &vx_per_cpu(vxi, cvirt_pc, cpu),
20208 + buffer + length, cpu);
20213 +int proc_vxi_cacct(struct vx_info *vxi, char *buffer)
20215 + return vx_info_proc_cacct(&vxi->cacct, buffer);
20219 +static int proc_virtnet_info(char *buffer)
20221 + return proc_vci(buffer);
20224 +static int proc_virtnet_status(char *buffer)
20226 + return sprintf(buffer,
20228 + "#CActive:\t%d\n",
20229 + atomic_read(&nx_global_ctotal),
20230 + atomic_read(&nx_global_cactive));
20233 +int proc_nxi_info(struct nx_info *nxi, char *buffer)
20235 + struct nx_addr_v4 *v4a;
20236 +#ifdef CONFIG_IPV6
20237 + struct nx_addr_v6 *v6a;
20241 + length = sprintf(buffer,
20244 + "Bcast:\t" NIPQUAD_FMT "\n"
20245 + "Lback:\t" NIPQUAD_FMT "\n",
20248 + NIPQUAD(nxi->v4_bcast.s_addr),
20249 + NIPQUAD(nxi->v4_lback.s_addr));
20251 + if (!NX_IPV4(nxi))
20253 + for (i = 0, v4a = &nxi->v4; v4a; i++, v4a = v4a->next)
20254 + length += sprintf(buffer + length, "%d:\t" NXAV4_FMT "\n",
20257 +#ifdef CONFIG_IPV6
20258 + if (!NX_IPV6(nxi))
20260 + for (i = 0, v6a = &nxi->v6; v6a; i++, v6a = v6a->next)
20261 + length += sprintf(buffer + length, "%d:\t" NXAV6_FMT "\n",
20268 +int proc_nxi_status(struct nx_info *nxi, char *buffer)
20272 + length = sprintf(buffer,
20275 + "Flags:\t%016llx\n"
20276 + "NCaps:\t%016llx\n",
20277 + atomic_read(&nxi->nx_usecnt),
20278 + atomic_read(&nxi->nx_tasks),
20279 + (unsigned long long)nxi->nx_flags,
20280 + (unsigned long long)nxi->nx_ncaps);
20286 +/* here the inode helpers */
20292 + struct inode_operations *iop;
20293 + struct file_operations *fop;
20294 + union proc_op op;
20297 +static struct inode *vs_proc_make_inode(struct super_block *sb, struct vs_entry *p)
20299 + struct inode *inode = new_inode(sb);
20304 + inode->i_mode = p->mode;
20306 + inode->i_op = p->iop;
20308 + inode->i_fop = p->fop;
20310 + set_nlink(inode, (p->mode & S_IFDIR) ? 2 : 1);
20311 + inode->i_flags |= S_IMMUTABLE;
20313 + inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
20315 + i_uid_write(inode, 0);
20316 + i_gid_write(inode, 0);
20317 + i_tag_write(inode, 0);
20322 +static struct dentry *vs_proc_instantiate(struct inode *dir,
20323 + struct dentry *dentry, int id, void *ptr)
20325 + struct vs_entry *p = ptr;
20326 + struct inode *inode = vs_proc_make_inode(dir->i_sb, p);
20327 + struct dentry *error = ERR_PTR(-EINVAL);
20332 + PROC_I(inode)->op = p->op;
20333 + PROC_I(inode)->fd = id;
20334 + d_add(dentry, inode);
20342 +typedef struct dentry *vx_instantiate_t(struct inode *, struct dentry *, int, void *);
20346 + * Fill a directory entry.
20348 + * If possible create the dcache entry and derive our inode number and
20349 + * file type from dcache entry.
20351 + * Since all of the proc inode numbers are dynamically generated, the inode
20352 + * numbers do not exist until the inode is cache. This means creating the
20353 + * the dcache entry in iterate is necessary to keep the inode numbers
20354 + * reported by iterate in sync with the inode numbers reported
20357 +static int vx_proc_fill_cache(struct file *filp, struct dir_context *ctx,
20358 + char *name, int len, vx_instantiate_t instantiate, int id, void *ptr)
20360 + struct dentry *child, *dir = filp->f_path.dentry;
20361 + struct inode *inode;
20362 + struct qstr qname;
20364 + unsigned type = DT_UNKNOWN;
20366 + qname.name = name;
20368 + qname.hash = full_name_hash(NULL, name, len);
20370 + child = d_lookup(dir, &qname);
20372 + struct dentry *new;
20373 + new = d_alloc(dir, &qname);
20375 + child = instantiate(dir->d_inode, new, id, ptr);
20382 + if (!child || IS_ERR(child) || !child->d_inode)
20383 + goto end_instantiate;
20384 + inode = child->d_inode;
20386 + ino = inode->i_ino;
20387 + type = inode->i_mode >> 12;
20393 + return !dir_emit(ctx, name, len, ino, type);
20398 +/* get and revalidate vx_info/xid */
20401 +struct vx_info *get_proc_vx_info(struct inode *inode)
20403 + return lookup_vx_info(PROC_I(inode)->fd);
20406 +static int proc_xid_revalidate(struct dentry *dentry, unsigned int flags)
20408 + struct inode *inode = dentry->d_inode;
20409 + vxid_t xid = PROC_I(inode)->fd;
20411 + if (flags & LOOKUP_RCU) /* FIXME: can be dropped? */
20414 + if (!xid || xid_is_hashed(xid))
20421 +/* get and revalidate nx_info/nid */
20423 +static int proc_nid_revalidate(struct dentry *dentry, unsigned int flags)
20425 + struct inode *inode = dentry->d_inode;
20426 + vnid_t nid = PROC_I(inode)->fd;
20428 + if (flags & LOOKUP_RCU) /* FIXME: can be dropped? */
20431 + if (!nid || nid_is_hashed(nid))
20439 +#define PROC_BLOCK_SIZE (PAGE_SIZE - 1024)
20441 +static ssize_t proc_vs_info_read(struct file *file, char __user *buf,
20442 + size_t count, loff_t *ppos)
20444 + struct inode *inode = file->f_path.dentry->d_inode;
20445 + unsigned long page;
20446 + ssize_t length = 0;
20448 + if (count > PROC_BLOCK_SIZE)
20449 + count = PROC_BLOCK_SIZE;
20451 + /* fade that out as soon as stable */
20452 + WARN_ON(PROC_I(inode)->fd);
20454 + if (!(page = __get_free_page(GFP_KERNEL)))
20457 + BUG_ON(!PROC_I(inode)->op.proc_vs_read);
20458 + length = PROC_I(inode)->op.proc_vs_read((char *)page);
20461 + length = simple_read_from_buffer(buf, count, ppos,
20462 + (char *)page, length);
20468 +static ssize_t proc_vx_info_read(struct file *file, char __user *buf,
20469 + size_t count, loff_t *ppos)
20471 + struct inode *inode = file->f_path.dentry->d_inode;
20472 + struct vx_info *vxi = NULL;
20473 + vxid_t xid = PROC_I(inode)->fd;
20474 + unsigned long page;
20475 + ssize_t length = 0;
20477 + if (count > PROC_BLOCK_SIZE)
20478 + count = PROC_BLOCK_SIZE;
20480 + /* fade that out as soon as stable */
20482 + vxi = lookup_vx_info(xid);
20486 + length = -ENOMEM;
20487 + if (!(page = __get_free_page(GFP_KERNEL)))
20490 + BUG_ON(!PROC_I(inode)->op.proc_vxi_read);
20491 + length = PROC_I(inode)->op.proc_vxi_read(vxi, (char *)page);
20494 + length = simple_read_from_buffer(buf, count, ppos,
20495 + (char *)page, length);
20499 + put_vx_info(vxi);
20504 +static ssize_t proc_nx_info_read(struct file *file, char __user *buf,
20505 + size_t count, loff_t *ppos)
20507 + struct inode *inode = file->f_path.dentry->d_inode;
20508 + struct nx_info *nxi = NULL;
20509 + vnid_t nid = PROC_I(inode)->fd;
20510 + unsigned long page;
20511 + ssize_t length = 0;
20513 + if (count > PROC_BLOCK_SIZE)
20514 + count = PROC_BLOCK_SIZE;
20516 + /* fade that out as soon as stable */
20518 + nxi = lookup_nx_info(nid);
20522 + length = -ENOMEM;
20523 + if (!(page = __get_free_page(GFP_KERNEL)))
20526 + BUG_ON(!PROC_I(inode)->op.proc_nxi_read);
20527 + length = PROC_I(inode)->op.proc_nxi_read(nxi, (char *)page);
20530 + length = simple_read_from_buffer(buf, count, ppos,
20531 + (char *)page, length);
20535 + put_nx_info(nxi);
20542 +/* here comes the lower level */
20545 +#define NOD(NAME, MODE, IOP, FOP, OP) { \
20546 + .len = sizeof(NAME) - 1, \
20547 + .name = (NAME), \
20555 +#define DIR(NAME, MODE, OTYPE) \
20556 + NOD(NAME, (S_IFDIR | (MODE)), \
20557 + &proc_ ## OTYPE ## _inode_operations, \
20558 + &proc_ ## OTYPE ## _file_operations, { } )
20560 +#define INF(NAME, MODE, OTYPE) \
20561 + NOD(NAME, (S_IFREG | (MODE)), NULL, \
20562 + &proc_vs_info_file_operations, \
20563 + { .proc_vs_read = &proc_##OTYPE } )
20565 +#define VINF(NAME, MODE, OTYPE) \
20566 + NOD(NAME, (S_IFREG | (MODE)), NULL, \
20567 + &proc_vx_info_file_operations, \
20568 + { .proc_vxi_read = &proc_##OTYPE } )
20570 +#define NINF(NAME, MODE, OTYPE) \
20571 + NOD(NAME, (S_IFREG | (MODE)), NULL, \
20572 + &proc_nx_info_file_operations, \
20573 + { .proc_nxi_read = &proc_##OTYPE } )
20576 +static struct file_operations proc_vs_info_file_operations = {
20577 + .read = proc_vs_info_read,
20580 +static struct file_operations proc_vx_info_file_operations = {
20581 + .read = proc_vx_info_read,
20584 +static struct dentry_operations proc_xid_dentry_operations = {
20585 + .d_revalidate = proc_xid_revalidate,
20588 +static struct vs_entry vx_base_stuff[] = {
20589 + VINF("info", S_IRUGO, vxi_info),
20590 + VINF("status", S_IRUGO, vxi_status),
20591 + VINF("limit", S_IRUGO, vxi_limit),
20592 + VINF("sched", S_IRUGO, vxi_sched),
20593 + VINF("nsproxy", S_IRUGO, vxi_nsproxy0),
20594 + VINF("nsproxy1",S_IRUGO, vxi_nsproxy1),
20595 + VINF("cvirt", S_IRUGO, vxi_cvirt),
20596 + VINF("cacct", S_IRUGO, vxi_cacct),
20603 +static struct dentry *proc_xid_instantiate(struct inode *dir,
20604 + struct dentry *dentry, int id, void *ptr)
20606 + dentry->d_op = &proc_xid_dentry_operations;
20607 + return vs_proc_instantiate(dir, dentry, id, ptr);
20610 +static struct dentry *proc_xid_lookup(struct inode *dir,
20611 + struct dentry *dentry, unsigned int flags)
20613 + struct vs_entry *p = vx_base_stuff;
20614 + struct dentry *error = ERR_PTR(-ENOENT);
20616 + for (; p->name; p++) {
20617 + if (p->len != dentry->d_name.len)
20619 + if (!memcmp(dentry->d_name.name, p->name, p->len))
20625 + error = proc_xid_instantiate(dir, dentry, PROC_I(dir)->fd, p);
20630 +static int proc_xid_iterate(struct file *filp, struct dir_context *ctx)
20632 + struct dentry *dentry = filp->f_path.dentry;
20633 + struct inode *inode = dentry->d_inode;
20634 + struct vs_entry *p = vx_base_stuff;
20635 + int size = sizeof(vx_base_stuff) / sizeof(struct vs_entry);
20638 + if (!dir_emit_dots(filp, ctx))
20641 + index = ctx->pos - 2;
20642 + if (index < size) {
20643 + for (p += index; p->name; p++) {
20644 + if (vx_proc_fill_cache(filp, ctx, p->name, p->len,
20645 + vs_proc_instantiate, PROC_I(inode)->fd, p))
20655 +static struct file_operations proc_nx_info_file_operations = {
20656 + .read = proc_nx_info_read,
20659 +static struct dentry_operations proc_nid_dentry_operations = {
20660 + .d_revalidate = proc_nid_revalidate,
20663 +static struct vs_entry nx_base_stuff[] = {
20664 + NINF("info", S_IRUGO, nxi_info),
20665 + NINF("status", S_IRUGO, nxi_status),
20670 +static struct dentry *proc_nid_instantiate(struct inode *dir,
20671 + struct dentry *dentry, int id, void *ptr)
20673 + dentry->d_op = &proc_nid_dentry_operations;
20674 + return vs_proc_instantiate(dir, dentry, id, ptr);
20677 +static struct dentry *proc_nid_lookup(struct inode *dir,
20678 + struct dentry *dentry, unsigned int flags)
20680 + struct vs_entry *p = nx_base_stuff;
20681 + struct dentry *error = ERR_PTR(-ENOENT);
20683 + for (; p->name; p++) {
20684 + if (p->len != dentry->d_name.len)
20686 + if (!memcmp(dentry->d_name.name, p->name, p->len))
20692 + error = proc_nid_instantiate(dir, dentry, PROC_I(dir)->fd, p);
20697 +static int proc_nid_iterate(struct file *filp, struct dir_context *ctx)
20699 + struct dentry *dentry = filp->f_path.dentry;
20700 + struct inode *inode = dentry->d_inode;
20701 + struct vs_entry *p = nx_base_stuff;
20702 + int size = sizeof(nx_base_stuff) / sizeof(struct vs_entry);
20705 + if (!dir_emit_dots(filp, ctx))
20708 + index = ctx->pos - 2;
20709 + if (index < size) {
20710 + for (p += index; p->name; p++) {
20711 + if (vx_proc_fill_cache(filp, ctx, p->name, p->len,
20712 + vs_proc_instantiate, PROC_I(inode)->fd, p))
20721 +#define MAX_MULBY10 ((~0U - 9) / 10)
20723 +static inline int atovid(const char *str, int len)
20728 + while (len-- > 0) {
20733 + if (vid >= MAX_MULBY10)
20743 +/* now the upper level (virtual) */
20746 +static struct file_operations proc_xid_file_operations = {
20747 + .read = generic_read_dir,
20748 + .iterate = proc_xid_iterate,
20751 +static struct inode_operations proc_xid_inode_operations = {
20752 + .lookup = proc_xid_lookup,
20755 +static struct vs_entry vx_virtual_stuff[] = {
20756 + INF("info", S_IRUGO, virtual_info),
20757 + INF("status", S_IRUGO, virtual_status),
20758 + DIR(NULL, S_IRUGO | S_IXUGO, xid),
20762 +static struct dentry *proc_virtual_lookup(struct inode *dir,
20763 + struct dentry *dentry, unsigned int flags)
20765 + struct vs_entry *p = vx_virtual_stuff;
20766 + struct dentry *error = ERR_PTR(-ENOENT);
20769 + for (; p->name; p++) {
20770 + if (p->len != dentry->d_name.len)
20772 + if (!memcmp(dentry->d_name.name, p->name, p->len))
20776 + goto instantiate;
20778 + id = atovid(dentry->d_name.name, dentry->d_name.len);
20779 + if ((id < 0) || !xid_is_hashed(id))
20783 + error = proc_xid_instantiate(dir, dentry, id, p);
20788 +static struct file_operations proc_nid_file_operations = {
20789 + .read = generic_read_dir,
20790 + .iterate = proc_nid_iterate,
20793 +static struct inode_operations proc_nid_inode_operations = {
20794 + .lookup = proc_nid_lookup,
20797 +static struct vs_entry nx_virtnet_stuff[] = {
20798 + INF("info", S_IRUGO, virtnet_info),
20799 + INF("status", S_IRUGO, virtnet_status),
20800 + DIR(NULL, S_IRUGO | S_IXUGO, nid),
20804 +static struct dentry *proc_virtnet_lookup(struct inode *dir,
20805 + struct dentry *dentry, unsigned int flags)
20807 + struct vs_entry *p = nx_virtnet_stuff;
20808 + struct dentry *error = ERR_PTR(-ENOENT);
20811 + for (; p->name; p++) {
20812 + if (p->len != dentry->d_name.len)
20814 + if (!memcmp(dentry->d_name.name, p->name, p->len))
20818 + goto instantiate;
20820 + id = atovid(dentry->d_name.name, dentry->d_name.len);
20821 + if ((id < 0) || !nid_is_hashed(id))
20825 + error = proc_nid_instantiate(dir, dentry, id, p);
20831 +#define PROC_MAXVIDS 32
20833 +int proc_virtual_iterate(struct file *filp, struct dir_context *ctx)
20835 + struct vs_entry *p = vx_virtual_stuff;
20836 + int size = sizeof(vx_virtual_stuff) / sizeof(struct vs_entry);
20838 + unsigned int xid_array[PROC_MAXVIDS];
20839 + char buf[PROC_NUMBUF];
20840 + unsigned int nr_xids, i;
20842 + if (!dir_emit_dots(filp, ctx))
20845 + index = ctx->pos - 2;
20846 + if (index < size) {
20847 + for (p += index; p->name; p++) {
20848 + if (vx_proc_fill_cache(filp, ctx, p->name, p->len,
20849 + vs_proc_instantiate, 0, p))
20855 + index = ctx->pos - size;
20856 + p = &vx_virtual_stuff[size - 1];
20857 + nr_xids = get_xid_list(index, xid_array, PROC_MAXVIDS);
20858 + for (i = 0; i < nr_xids; i++) {
20859 + int n, xid = xid_array[i];
20860 + unsigned int j = PROC_NUMBUF;
20864 + buf[--j] = '0' + (n % 10);
20867 + if (vx_proc_fill_cache(filp, ctx,
20868 + buf + j, PROC_NUMBUF - j,
20869 + vs_proc_instantiate, xid, p))
20876 +static int proc_virtual_getattr(struct vfsmount *mnt,
20877 + struct dentry *dentry, struct kstat *stat)
20879 + struct inode *inode = dentry->d_inode;
20881 + generic_fillattr(inode, stat);
20882 + stat->nlink = 2 + atomic_read(&vx_global_cactive);
20886 +static struct file_operations proc_virtual_dir_operations = {
20887 + .read = generic_read_dir,
20888 + .iterate = proc_virtual_iterate,
20891 +static struct inode_operations proc_virtual_dir_inode_operations = {
20892 + .getattr = proc_virtual_getattr,
20893 + .lookup = proc_virtual_lookup,
20898 +int proc_virtnet_iterate(struct file *filp, struct dir_context *ctx)
20900 + struct vs_entry *p = nx_virtnet_stuff;
20901 + int size = sizeof(nx_virtnet_stuff) / sizeof(struct vs_entry);
20903 + unsigned int nid_array[PROC_MAXVIDS];
20904 + char buf[PROC_NUMBUF];
20905 + unsigned int nr_nids, i;
20907 + if (!dir_emit_dots(filp, ctx))
20910 + index = ctx->pos - 2;
20911 + if (index < size) {
20912 + for (p += index; p->name; p++) {
20913 + if (vx_proc_fill_cache(filp, ctx, p->name, p->len,
20914 + vs_proc_instantiate, 0, p))
20920 + index = ctx->pos - size;
20921 + p = &nx_virtnet_stuff[size - 1];
20922 + nr_nids = get_nid_list(index, nid_array, PROC_MAXVIDS);
20923 + for (i = 0; i < nr_nids; i++) {
20924 + int n, nid = nid_array[i];
20925 + unsigned int j = PROC_NUMBUF;
20929 + buf[--j] = '0' + (n % 10);
20932 + if (vx_proc_fill_cache(filp, ctx,
20933 + buf + j, PROC_NUMBUF - j,
20934 + vs_proc_instantiate, nid, p))
20941 +static int proc_virtnet_getattr(struct vfsmount *mnt,
20942 + struct dentry *dentry, struct kstat *stat)
20944 + struct inode *inode = dentry->d_inode;
20946 + generic_fillattr(inode, stat);
20947 + stat->nlink = 2 + atomic_read(&nx_global_cactive);
20951 +static struct file_operations proc_virtnet_dir_operations = {
20952 + .read = generic_read_dir,
20953 + .iterate = proc_virtnet_iterate,
20956 +static struct inode_operations proc_virtnet_dir_inode_operations = {
20957 + .getattr = proc_virtnet_getattr,
20958 + .lookup = proc_virtnet_lookup,
20963 +void proc_vx_init(void)
20965 + struct proc_dir_entry *ent;
20967 + ent = proc_mkdir("virtual", 0);
20969 + ent->proc_fops = &proc_virtual_dir_operations;
20970 + ent->proc_iops = &proc_virtual_dir_inode_operations;
20972 + proc_virtual = ent;
20974 + ent = proc_mkdir("virtnet", 0);
20976 + ent->proc_fops = &proc_virtnet_dir_operations;
20977 + ent->proc_iops = &proc_virtnet_dir_inode_operations;
20979 + proc_virtnet = ent;
20985 +/* per pid info */
20987 +void render_cap_t(struct seq_file *, const char *,
20988 + struct vx_info *, kernel_cap_t *);
20991 +int proc_pid_vx_info(
20992 + struct seq_file *m,
20993 + struct pid_namespace *ns,
20995 + struct task_struct *p)
20997 + struct vx_info *vxi;
20999 + seq_printf(m, "XID:\t%d\n", vx_task_xid(p));
21001 + vxi = task_get_vx_info(p);
21005 + render_cap_t(m, "BCaps:\t", vxi, &vxi->vx_bcaps);
21006 + seq_printf(m, "CCaps:\t%016llx\n",
21007 + (unsigned long long)vxi->vx_ccaps);
21008 + seq_printf(m, "CFlags:\t%016llx\n",
21009 + (unsigned long long)vxi->vx_flags);
21010 + seq_printf(m, "CIPid:\t%d\n", vxi->vx_initpid);
21012 + put_vx_info(vxi);
21017 +int proc_pid_nx_info(
21018 + struct seq_file *m,
21019 + struct pid_namespace *ns,
21021 + struct task_struct *p)
21023 + struct nx_info *nxi;
21024 + struct nx_addr_v4 *v4a;
21025 +#ifdef CONFIG_IPV6
21026 + struct nx_addr_v6 *v6a;
21030 + seq_printf(m, "NID:\t%d\n", nx_task_nid(p));
21032 + nxi = task_get_nx_info(p);
21036 + seq_printf(m, "NCaps:\t%016llx\n",
21037 + (unsigned long long)nxi->nx_ncaps);
21038 + seq_printf(m, "NFlags:\t%016llx\n",
21039 + (unsigned long long)nxi->nx_flags);
21041 + seq_printf(m, "V4Root[bcast]:\t" NIPQUAD_FMT "\n",
21042 + NIPQUAD(nxi->v4_bcast.s_addr));
21043 + seq_printf(m, "V4Root[lback]:\t" NIPQUAD_FMT "\n",
21044 + NIPQUAD(nxi->v4_lback.s_addr));
21045 + if (!NX_IPV4(nxi))
21047 + for (i = 0, v4a = &nxi->v4; v4a; i++, v4a = v4a->next)
21048 + seq_printf(m, "V4Root[%d]:\t" NXAV4_FMT "\n",
21051 +#ifdef CONFIG_IPV6
21052 + if (!NX_IPV6(nxi))
21054 + for (i = 0, v6a = &nxi->v6; v6a; i++, v6a = v6a->next)
21055 + seq_printf(m, "V6Root[%d]:\t" NXAV6_FMT "\n",
21059 + put_nx_info(nxi);
21063 diff -NurpP --minimal linux-4.9.82/kernel/vserver/sched.c linux-4.9.82-vs2.3.9.7/kernel/vserver/sched.c
21064 --- linux-4.9.82/kernel/vserver/sched.c 1970-01-01 00:00:00.000000000 +0000
21065 +++ linux-4.9.82-vs2.3.9.7/kernel/vserver/sched.c 2018-01-10 02:50:49.000000000 +0000
21068 + * linux/kernel/vserver/sched.c
21070 + * Virtual Server: Scheduler Support
21072 + * Copyright (C) 2004-2010 Herbert P?tzl
21074 + * V0.01 adapted Sam Vilains version to 2.6.3
21075 + * V0.02 removed legacy interface
21076 + * V0.03 changed vcmds to vxi arg
21077 + * V0.04 removed older and legacy interfaces
21078 + * V0.05 removed scheduler code/commands
21082 +#include <linux/vs_context.h>
21083 +#include <linux/vs_sched.h>
21084 +#include <linux/cpumask.h>
21085 +#include <linux/vserver/sched_cmd.h>
21087 +#include <asm/uaccess.h>
21090 +void vx_update_sched_param(struct _vx_sched *sched,
21091 + struct _vx_sched_pc *sched_pc)
21093 + sched_pc->prio_bias = sched->prio_bias;
21096 +static int do_set_prio_bias(struct vx_info *vxi, struct vcmd_prio_bias *data)
21100 + if (data->prio_bias > MAX_PRIO_BIAS)
21101 + data->prio_bias = MAX_PRIO_BIAS;
21102 + if (data->prio_bias < MIN_PRIO_BIAS)
21103 + data->prio_bias = MIN_PRIO_BIAS;
21105 + if (data->cpu_id != ~0) {
21106 + vxi->sched.update = *get_cpu_mask(data->cpu_id);
21107 + cpumask_and(&vxi->sched.update, &vxi->sched.update,
21108 + cpu_online_mask);
21110 + cpumask_copy(&vxi->sched.update, cpu_online_mask);
21112 + for ((cpu) = 0; (cpu) < 1; (cpu)++, (void)vxi->sched.update)
21113 + vx_update_sched_param(&vxi->sched,
21114 + &vx_per_cpu(vxi, sched_pc, cpu));
21118 +int vc_set_prio_bias(struct vx_info *vxi, void __user *data)
21120 + struct vcmd_prio_bias vc_data;
21122 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
21125 + return do_set_prio_bias(vxi, &vc_data);
21128 +int vc_get_prio_bias(struct vx_info *vxi, void __user *data)
21130 + struct vcmd_prio_bias vc_data;
21131 + struct _vx_sched_pc *pcd;
21134 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
21137 + cpu = vc_data.cpu_id;
21139 + if (!cpu_possible(cpu))
21142 + pcd = &vx_per_cpu(vxi, sched_pc, cpu);
21143 + vc_data.prio_bias = pcd->prio_bias;
21145 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
21150 diff -NurpP --minimal linux-4.9.82/kernel/vserver/sched_init.h linux-4.9.82-vs2.3.9.7/kernel/vserver/sched_init.h
21151 --- linux-4.9.82/kernel/vserver/sched_init.h 1970-01-01 00:00:00.000000000 +0000
21152 +++ linux-4.9.82-vs2.3.9.7/kernel/vserver/sched_init.h 2018-01-10 02:50:49.000000000 +0000
21155 +static inline void vx_info_init_sched(struct _vx_sched *sched)
21157 + /* scheduling; hard code starting values as constants */
21158 + sched->prio_bias = 0;
21162 +void vx_info_init_sched_pc(struct _vx_sched_pc *sched_pc, int cpu)
21164 + sched_pc->prio_bias = 0;
21166 + sched_pc->user_ticks = 0;
21167 + sched_pc->sys_ticks = 0;
21168 + sched_pc->hold_ticks = 0;
21171 +static inline void vx_info_exit_sched(struct _vx_sched *sched)
21177 +void vx_info_exit_sched_pc(struct _vx_sched_pc *sched_pc, int cpu)
21181 diff -NurpP --minimal linux-4.9.82/kernel/vserver/sched_proc.h linux-4.9.82-vs2.3.9.7/kernel/vserver/sched_proc.h
21182 --- linux-4.9.82/kernel/vserver/sched_proc.h 1970-01-01 00:00:00.000000000 +0000
21183 +++ linux-4.9.82-vs2.3.9.7/kernel/vserver/sched_proc.h 2018-01-10 02:50:49.000000000 +0000
21185 +#ifndef _VX_SCHED_PROC_H
21186 +#define _VX_SCHED_PROC_H
21190 +int vx_info_proc_sched(struct _vx_sched *sched, char *buffer)
21194 + length += sprintf(buffer,
21195 + "PrioBias:\t%8d\n",
21196 + sched->prio_bias);
21201 +int vx_info_proc_sched_pc(struct _vx_sched_pc *sched_pc,
21202 + char *buffer, int cpu)
21206 + length += sprintf(buffer + length,
21207 + "cpu %d: %lld %lld %lld", cpu,
21208 + (unsigned long long)sched_pc->user_ticks,
21209 + (unsigned long long)sched_pc->sys_ticks,
21210 + (unsigned long long)sched_pc->hold_ticks);
21211 + length += sprintf(buffer + length,
21212 + " %d\n", sched_pc->prio_bias);
21216 +#endif /* _VX_SCHED_PROC_H */
21217 diff -NurpP --minimal linux-4.9.82/kernel/vserver/signal.c linux-4.9.82-vs2.3.9.7/kernel/vserver/signal.c
21218 --- linux-4.9.82/kernel/vserver/signal.c 1970-01-01 00:00:00.000000000 +0000
21219 +++ linux-4.9.82-vs2.3.9.7/kernel/vserver/signal.c 2018-01-10 02:50:49.000000000 +0000
21222 + * linux/kernel/vserver/signal.c
21224 + * Virtual Server: Signal Support
21226 + * Copyright (C) 2003-2007 Herbert P?tzl
21228 + * V0.01 broken out from vcontext V0.05
21229 + * V0.02 changed vcmds to vxi arg
21230 + * V0.03 adjusted siginfo for kill
21234 +#include <asm/uaccess.h>
21236 +#include <linux/vs_context.h>
21237 +#include <linux/vs_pid.h>
21238 +#include <linux/vserver/signal_cmd.h>
21241 +int vx_info_kill(struct vx_info *vxi, int pid, int sig)
21243 + int retval, count = 0;
21244 + struct task_struct *p;
21245 + struct siginfo *sip = SEND_SIG_PRIV;
21248 + vxdprintk(VXD_CBIT(misc, 4),
21249 + "vx_info_kill(%p[#%d],%d,%d)*",
21250 + vxi, vxi->vx_id, pid, sig);
21251 + read_lock(&tasklist_lock);
21255 + for_each_process(p) {
21258 + if (vx_task_xid(p) != vxi->vx_id || p->pid <= 1 ||
21259 + (pid && vxi->vx_initpid == p->pid))
21262 + err = group_send_sig_info(sig, sip, p);
21264 + if (err != -EPERM)
21270 + if (vxi->vx_initpid) {
21271 + pid = vxi->vx_initpid;
21272 + /* for now, only SIGINT to private init ... */
21273 + if (!vx_info_flags(vxi, VXF_STATE_ADMIN, 0) &&
21274 + /* ... as long as there are tasks left */
21275 + (atomic_read(&vxi->vx_tasks) > 1))
21278 + /* fallthrough */
21281 + p = find_task_by_real_pid(pid);
21282 + rcu_read_unlock();
21284 + if (vx_task_xid(p) == vxi->vx_id)
21285 + retval = group_send_sig_info(sig, sip, p);
21289 + read_unlock(&tasklist_lock);
21290 + vxdprintk(VXD_CBIT(misc, 4),
21291 + "vx_info_kill(%p[#%d],%d,%d,%ld) = %d",
21292 + vxi, vxi->vx_id, pid, sig, (long)sip, retval);
21296 +int vc_ctx_kill(struct vx_info *vxi, void __user *data)
21298 + struct vcmd_ctx_kill_v0 vc_data;
21300 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
21303 + /* special check to allow guest shutdown */
21304 + if (!vx_info_flags(vxi, VXF_STATE_ADMIN, 0) &&
21305 + /* forbid killall pid=0 when init is present */
21306 + (((vc_data.pid < 1) && vxi->vx_initpid) ||
21307 + (vc_data.pid > 1)))
21310 + return vx_info_kill(vxi, vc_data.pid, vc_data.sig);
21314 +static int __wait_exit(struct vx_info *vxi)
21316 + DECLARE_WAITQUEUE(wait, current);
21319 + add_wait_queue(&vxi->vx_wait, &wait);
21320 + set_current_state(TASK_INTERRUPTIBLE);
21323 + if (vx_info_state(vxi,
21324 + VXS_SHUTDOWN | VXS_HASHED | VXS_HELPER) == VXS_SHUTDOWN)
21326 + if (signal_pending(current)) {
21327 + ret = -ERESTARTSYS;
21334 + set_current_state(TASK_RUNNING);
21335 + remove_wait_queue(&vxi->vx_wait, &wait);
21341 +int vc_wait_exit(struct vx_info *vxi, void __user *data)
21343 + struct vcmd_wait_exit_v0 vc_data;
21346 + ret = __wait_exit(vxi);
21347 + vc_data.reboot_cmd = vxi->reboot_cmd;
21348 + vc_data.exit_code = vxi->exit_code;
21350 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
21355 diff -NurpP --minimal linux-4.9.82/kernel/vserver/space.c linux-4.9.82-vs2.3.9.7/kernel/vserver/space.c
21356 --- linux-4.9.82/kernel/vserver/space.c 1970-01-01 00:00:00.000000000 +0000
21357 +++ linux-4.9.82-vs2.3.9.7/kernel/vserver/space.c 2018-01-13 03:42:01.000000000 +0000
21360 + * linux/kernel/vserver/space.c
21362 + * Virtual Server: Context Space Support
21364 + * Copyright (C) 2003-2010 Herbert P?tzl
21366 + * V0.01 broken out from context.c 0.07
21367 + * V0.02 added task locking for namespace
21368 + * V0.03 broken out vx_enter_namespace
21369 + * V0.04 added *space support and commands
21370 + * V0.05 added credential support
21374 +#include <linux/utsname.h>
21375 +#include <linux/nsproxy.h>
21376 +#include <linux/err.h>
21377 +#include <linux/fs_struct.h>
21378 +#include <linux/cred.h>
21379 +#include <asm/uaccess.h>
21381 +#include <linux/vs_context.h>
21382 +#include <linux/vserver/space.h>
21383 +#include <linux/vserver/space_cmd.h>
21385 +atomic_t vs_global_nsproxy = ATOMIC_INIT(0);
21386 +atomic_t vs_global_fs = ATOMIC_INIT(0);
21387 +atomic_t vs_global_mnt_ns = ATOMIC_INIT(0);
21388 +atomic_t vs_global_uts_ns = ATOMIC_INIT(0);
21389 +atomic_t vs_global_ipc_ns = ATOMIC_INIT(0);
21390 +atomic_t vs_global_user_ns = ATOMIC_INIT(0);
21391 +atomic_t vs_global_pid_ns = ATOMIC_INIT(0);
21394 +/* namespace functions */
21396 +#include <linux/mnt_namespace.h>
21397 +#include <linux/user_namespace.h>
21398 +#include <linux/pid_namespace.h>
21399 +#include <linux/ipc_namespace.h>
21400 +#include <net/net_namespace.h>
21401 +#include "../fs/mount.h"
21404 +static const struct vcmd_space_mask_v1 space_mask_v0 = {
21405 + .mask = CLONE_FS |
21407 +#ifdef CONFIG_UTS_NS
21410 +#ifdef CONFIG_IPC_NS
21413 +#ifdef CONFIG_USER_NS
21419 +static const struct vcmd_space_mask_v1 space_mask = {
21420 + .mask = CLONE_FS |
21422 +#ifdef CONFIG_UTS_NS
21425 +#ifdef CONFIG_IPC_NS
21428 +#ifdef CONFIG_USER_NS
21431 +#ifdef CONFIG_PID_NS
21434 +#ifdef CONFIG_NET_NS
21440 +static const struct vcmd_space_mask_v1 default_space_mask = {
21441 + .mask = CLONE_FS |
21443 +#ifdef CONFIG_UTS_NS
21446 +#ifdef CONFIG_IPC_NS
21449 +#ifdef CONFIG_USER_NS
21450 +// CLONE_NEWUSER |
21452 +#ifdef CONFIG_PID_NS
21459 + * build a new nsproxy mix
21460 + * assumes that both proxies are 'const'
21461 + * does not touch nsproxy refcounts
21462 + * will hold a reference on the result.
21465 +struct nsproxy *vs_mix_nsproxy(struct nsproxy *old_nsproxy,
21466 + struct nsproxy *new_nsproxy, unsigned long mask)
21468 + struct mnt_namespace *old_ns;
21469 + struct uts_namespace *old_uts;
21470 + struct ipc_namespace *old_ipc;
21471 +#ifdef CONFIG_PID_NS
21472 + struct pid_namespace *old_pid;
21474 +#ifdef CONFIG_NET_NS
21475 + struct net *old_net;
21477 + struct nsproxy *nsproxy;
21479 + nsproxy = copy_nsproxy(old_nsproxy);
21483 + if (mask & CLONE_NEWNS) {
21484 + old_ns = nsproxy->mnt_ns;
21485 + nsproxy->mnt_ns = new_nsproxy->mnt_ns;
21486 + if (nsproxy->mnt_ns)
21487 + get_mnt_ns(nsproxy->mnt_ns);
21491 + if (mask & CLONE_NEWUTS) {
21492 + old_uts = nsproxy->uts_ns;
21493 + nsproxy->uts_ns = new_nsproxy->uts_ns;
21494 + if (nsproxy->uts_ns)
21495 + get_uts_ns(nsproxy->uts_ns);
21499 + if (mask & CLONE_NEWIPC) {
21500 + old_ipc = nsproxy->ipc_ns;
21501 + nsproxy->ipc_ns = new_nsproxy->ipc_ns;
21502 + if (nsproxy->ipc_ns)
21503 + get_ipc_ns(nsproxy->ipc_ns);
21507 +#ifdef CONFIG_PID_NS
21508 + if (mask & CLONE_NEWPID) {
21509 + old_pid = nsproxy->pid_ns_for_children;
21510 + nsproxy->pid_ns_for_children = new_nsproxy->pid_ns_for_children;
21511 + if (nsproxy->pid_ns_for_children)
21512 + get_pid_ns(nsproxy->pid_ns_for_children);
21516 +#ifdef CONFIG_NET_NS
21517 + if (mask & CLONE_NEWNET) {
21518 + old_net = nsproxy->net_ns;
21519 + nsproxy->net_ns = new_nsproxy->net_ns;
21520 + if (nsproxy->net_ns)
21521 + get_net(nsproxy->net_ns);
21526 + put_mnt_ns(old_ns);
21528 + put_uts_ns(old_uts);
21530 + put_ipc_ns(old_ipc);
21531 +#ifdef CONFIG_PID_NS
21533 + put_pid_ns(old_pid);
21535 +#ifdef CONFIG_NET_NS
21537 + put_net(old_net);
21545 + * merge two nsproxy structs into a new one.
21546 + * will hold a reference on the result.
21550 +struct nsproxy *__vs_merge_nsproxy(struct nsproxy *old,
21551 + struct nsproxy *proxy, unsigned long mask)
21553 + struct nsproxy null_proxy = { .mnt_ns = NULL };
21559 + /* vs_mix_nsproxy returns with reference */
21560 + return vs_mix_nsproxy(old ? old : &null_proxy,
21563 + get_nsproxy(proxy);
21568 +int vx_enter_space(struct vx_info *vxi, unsigned long mask, unsigned index)
21570 + struct nsproxy *proxy, *proxy_cur, *proxy_new;
21571 + struct fs_struct *fs_cur, *fs = NULL;
21572 + struct _vx_space *space;
21573 + int ret, kill = 0;
21575 + vxdprintk(VXD_CBIT(space, 8), "vx_enter_space(%p[#%u],0x%08lx,%d)",
21576 + vxi, vxi->vx_id, mask, index);
21578 + if (vx_info_flags(vxi, VXF_INFO_PRIVATE, 0))
21581 + if (index >= VX_SPACES)
21584 + space = &vxi->space[index];
21587 + mask = space->vx_nsmask;
21589 + if ((mask & space->vx_nsmask) != mask)
21592 + if (mask & CLONE_FS) {
21593 + fs = copy_fs_struct(space->vx_fs);
21597 + proxy = space->vx_nsproxy;
21599 + vxdprintk(VXD_CBIT(space, 9),
21600 + "vx_enter_space(%p[#%u],0x%08lx,%d) -> (%p,%p)",
21601 + vxi, vxi->vx_id, mask, index, proxy, fs);
21603 + task_lock(current);
21604 + fs_cur = current->fs;
21606 + if (mask & CLONE_FS) {
21607 + spin_lock(&fs_cur->lock);
21608 + current->fs = fs;
21609 + kill = !--fs_cur->users;
21610 + spin_unlock(&fs_cur->lock);
21613 + proxy_cur = current->nsproxy;
21614 + get_nsproxy(proxy_cur);
21615 + task_unlock(current);
21618 + free_fs_struct(fs_cur);
21620 + proxy_new = __vs_merge_nsproxy(proxy_cur, proxy, mask);
21621 + if (IS_ERR(proxy_new)) {
21622 + ret = PTR_ERR(proxy_new);
21626 + proxy_new = xchg(¤t->nsproxy, proxy_new);
21628 + if (mask & CLONE_NEWUSER) {
21629 + struct cred *cred;
21631 + vxdprintk(VXD_CBIT(space, 10),
21632 + "vx_enter_space(%p[#%u],%p) cred (%p,%p)",
21633 + vxi, vxi->vx_id, space->vx_cred,
21634 + current->real_cred, current->cred);
21636 + if (space->vx_cred) {
21637 + cred = __prepare_creds(space->vx_cred);
21639 + commit_creds(cred);
21646 + put_nsproxy(proxy_new);
21649 + put_nsproxy(proxy_cur);
21654 +int vx_set_space(struct vx_info *vxi, unsigned long mask, unsigned index)
21656 + struct nsproxy *proxy_vxi, *proxy_cur, *proxy_new;
21657 + struct fs_struct *fs_vxi, *fs = NULL;
21658 + struct _vx_space *space;
21659 + int ret, kill = 0;
21661 + vxdprintk(VXD_CBIT(space, 8), "vx_set_space(%p[#%u],0x%08lx,%d)",
21662 + vxi, vxi->vx_id, mask, index);
21664 + if ((mask & space_mask.mask) != mask)
21667 + if (index >= VX_SPACES)
21670 + space = &vxi->space[index];
21672 + proxy_vxi = space->vx_nsproxy;
21673 + fs_vxi = space->vx_fs;
21675 + if (mask & CLONE_FS) {
21676 + fs = copy_fs_struct(current->fs);
21681 + task_lock(current);
21683 + if (mask & CLONE_FS) {
21684 + spin_lock(&fs_vxi->lock);
21685 + space->vx_fs = fs;
21686 + kill = !--fs_vxi->users;
21687 + spin_unlock(&fs_vxi->lock);
21690 + proxy_cur = current->nsproxy;
21691 + get_nsproxy(proxy_cur);
21692 + task_unlock(current);
21695 + free_fs_struct(fs_vxi);
21697 + proxy_new = __vs_merge_nsproxy(proxy_vxi, proxy_cur, mask);
21698 + if (IS_ERR(proxy_new)) {
21699 + ret = PTR_ERR(proxy_new);
21703 + proxy_new = xchg(&space->vx_nsproxy, proxy_new);
21704 + space->vx_nsmask |= mask;
21706 + if (mask & CLONE_NEWUSER) {
21707 + struct cred *cred;
21709 + vxdprintk(VXD_CBIT(space, 10),
21710 + "vx_set_space(%p[#%u],%p) cred (%p,%p)",
21711 + vxi, vxi->vx_id, space->vx_cred,
21712 + current->real_cred, current->cred);
21714 + cred = prepare_creds();
21715 + cred = (struct cred *)xchg(&space->vx_cred, cred);
21717 + abort_creds(cred);
21723 + put_nsproxy(proxy_new);
21726 + put_nsproxy(proxy_cur);
21731 +int vc_enter_space_v1(struct vx_info *vxi, void __user *data)
21733 + struct vcmd_space_mask_v1 vc_data = { .mask = 0 };
21735 + if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
21738 + return vx_enter_space(vxi, vc_data.mask, 0);
21741 +int vc_enter_space(struct vx_info *vxi, void __user *data)
21743 + struct vcmd_space_mask_v2 vc_data = { .mask = 0 };
21745 + if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
21748 + if (vc_data.index >= VX_SPACES)
21751 + return vx_enter_space(vxi, vc_data.mask, vc_data.index);
21754 +int vc_set_space_v1(struct vx_info *vxi, void __user *data)
21756 + struct vcmd_space_mask_v1 vc_data = { .mask = 0 };
21758 + if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
21761 + return vx_set_space(vxi, vc_data.mask, 0);
21764 +int vc_set_space(struct vx_info *vxi, void __user *data)
21766 + struct vcmd_space_mask_v2 vc_data = { .mask = 0 };
21768 + if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
21771 + if (vc_data.index >= VX_SPACES)
21774 + return vx_set_space(vxi, vc_data.mask, vc_data.index);
21777 +int vc_get_space_mask(void __user *data, int type)
21779 + const struct vcmd_space_mask_v1 *mask;
21782 + mask = &space_mask_v0;
21783 + else if (type == 1)
21784 + mask = &space_mask;
21786 + mask = &default_space_mask;
21788 + vxdprintk(VXD_CBIT(space, 10),
21789 + "vc_get_space_mask(%d) = %08llx", type, mask->mask);
21791 + if (copy_to_user(data, mask, sizeof(*mask)))
21796 diff -NurpP --minimal linux-4.9.82/kernel/vserver/switch.c linux-4.9.82-vs2.3.9.7/kernel/vserver/switch.c
21797 --- linux-4.9.82/kernel/vserver/switch.c 1970-01-01 00:00:00.000000000 +0000
21798 +++ linux-4.9.82-vs2.3.9.7/kernel/vserver/switch.c 2018-01-10 02:50:49.000000000 +0000
21801 + * linux/kernel/vserver/switch.c
21803 + * Virtual Server: Syscall Switch
21805 + * Copyright (C) 2003-2011 Herbert P?tzl
21807 + * V0.01 syscall switch
21808 + * V0.02 added signal to context
21809 + * V0.03 added rlimit functions
21810 + * V0.04 added iattr, task/xid functions
21811 + * V0.05 added debug/history stuff
21812 + * V0.06 added compat32 layer
21813 + * V0.07 vcmd args and perms
21814 + * V0.08 added status commands
21815 + * V0.09 added tag commands
21816 + * V0.10 added oom bias
21817 + * V0.11 added device commands
21818 + * V0.12 added warn mask
21822 +#include <linux/vs_context.h>
21823 +#include <linux/vs_network.h>
21824 +#include <linux/vserver/switch.h>
21826 +#include "vci_config.h"
21830 +int vc_get_version(uint32_t id)
21832 + return VCI_VERSION;
21836 +int vc_get_vci(uint32_t id)
21838 + return vci_kernel_config();
21841 +#include <linux/vserver/context_cmd.h>
21842 +#include <linux/vserver/cvirt_cmd.h>
21843 +#include <linux/vserver/cacct_cmd.h>
21844 +#include <linux/vserver/limit_cmd.h>
21845 +#include <linux/vserver/network_cmd.h>
21846 +#include <linux/vserver/sched_cmd.h>
21847 +#include <linux/vserver/debug_cmd.h>
21848 +#include <linux/vserver/inode_cmd.h>
21849 +#include <linux/vserver/dlimit_cmd.h>
21850 +#include <linux/vserver/signal_cmd.h>
21851 +#include <linux/vserver/space_cmd.h>
21852 +#include <linux/vserver/tag_cmd.h>
21853 +#include <linux/vserver/device_cmd.h>
21855 +#include <linux/vserver/inode.h>
21856 +#include <linux/vserver/dlimit.h>
21859 +#ifdef CONFIG_COMPAT
21860 +#define __COMPAT(name, id, data, compat) \
21861 + (compat) ? name ## _x32(id, data) : name(id, data)
21862 +#define __COMPAT_NO_ID(name, data, compat) \
21863 + (compat) ? name ## _x32(data) : name(data)
21865 +#define __COMPAT(name, id, data, compat) \
21867 +#define __COMPAT_NO_ID(name, data, compat) \
21873 +long do_vcmd(uint32_t cmd, uint32_t id,
21874 + struct vx_info *vxi, struct nx_info *nxi,
21875 + void __user *data, int compat)
21879 + case VCMD_get_version:
21880 + return vc_get_version(id);
21881 + case VCMD_get_vci:
21882 + return vc_get_vci(id);
21884 + case VCMD_task_xid:
21885 + return vc_task_xid(id);
21886 + case VCMD_vx_info:
21887 + return vc_vx_info(vxi, data);
21889 + case VCMD_task_nid:
21890 + return vc_task_nid(id);
21891 + case VCMD_nx_info:
21892 + return vc_nx_info(nxi, data);
21894 + case VCMD_task_tag:
21895 + return vc_task_tag(id);
21897 + case VCMD_set_space_v1:
21898 + return vc_set_space_v1(vxi, data);
21899 + /* this is version 2 */
21900 + case VCMD_set_space:
21901 + return vc_set_space(vxi, data);
21903 + case VCMD_get_space_mask_v0:
21904 + return vc_get_space_mask(data, 0);
21905 + /* this is version 1 */
21906 + case VCMD_get_space_mask:
21907 + return vc_get_space_mask(data, 1);
21909 + case VCMD_get_space_default:
21910 + return vc_get_space_mask(data, -1);
21912 + case VCMD_set_umask:
21913 + return vc_set_umask(vxi, data);
21915 + case VCMD_get_umask:
21916 + return vc_get_umask(vxi, data);
21918 + case VCMD_set_wmask:
21919 + return vc_set_wmask(vxi, data);
21921 + case VCMD_get_wmask:
21922 + return vc_get_wmask(vxi, data);
21923 +#ifdef CONFIG_IA32_EMULATION
21924 + case VCMD_get_rlimit:
21925 + return __COMPAT(vc_get_rlimit, vxi, data, compat);
21926 + case VCMD_set_rlimit:
21927 + return __COMPAT(vc_set_rlimit, vxi, data, compat);
21929 + case VCMD_get_rlimit:
21930 + return vc_get_rlimit(vxi, data);
21931 + case VCMD_set_rlimit:
21932 + return vc_set_rlimit(vxi, data);
21934 + case VCMD_get_rlimit_mask:
21935 + return vc_get_rlimit_mask(id, data);
21936 + case VCMD_reset_hits:
21937 + return vc_reset_hits(vxi, data);
21938 + case VCMD_reset_minmax:
21939 + return vc_reset_minmax(vxi, data);
21941 + case VCMD_get_vhi_name:
21942 + return vc_get_vhi_name(vxi, data);
21943 + case VCMD_set_vhi_name:
21944 + return vc_set_vhi_name(vxi, data);
21946 + case VCMD_ctx_stat:
21947 + return vc_ctx_stat(vxi, data);
21948 + case VCMD_virt_stat:
21949 + return vc_virt_stat(vxi, data);
21950 + case VCMD_sock_stat:
21951 + return vc_sock_stat(vxi, data);
21952 + case VCMD_rlimit_stat:
21953 + return vc_rlimit_stat(vxi, data);
21955 + case VCMD_set_cflags:
21956 + return vc_set_cflags(vxi, data);
21957 + case VCMD_get_cflags:
21958 + return vc_get_cflags(vxi, data);
21960 + /* this is version 1 */
21961 + case VCMD_set_ccaps:
21962 + return vc_set_ccaps(vxi, data);
21963 + /* this is version 1 */
21964 + case VCMD_get_ccaps:
21965 + return vc_get_ccaps(vxi, data);
21966 + case VCMD_set_bcaps:
21967 + return vc_set_bcaps(vxi, data);
21968 + case VCMD_get_bcaps:
21969 + return vc_get_bcaps(vxi, data);
21971 + case VCMD_set_badness:
21972 + return vc_set_badness(vxi, data);
21973 + case VCMD_get_badness:
21974 + return vc_get_badness(vxi, data);
21976 + case VCMD_set_nflags:
21977 + return vc_set_nflags(nxi, data);
21978 + case VCMD_get_nflags:
21979 + return vc_get_nflags(nxi, data);
21981 + case VCMD_set_ncaps:
21982 + return vc_set_ncaps(nxi, data);
21983 + case VCMD_get_ncaps:
21984 + return vc_get_ncaps(nxi, data);
21986 + case VCMD_set_prio_bias:
21987 + return vc_set_prio_bias(vxi, data);
21988 + case VCMD_get_prio_bias:
21989 + return vc_get_prio_bias(vxi, data);
21990 + case VCMD_add_dlimit:
21991 + return __COMPAT(vc_add_dlimit, id, data, compat);
21992 + case VCMD_rem_dlimit:
21993 + return __COMPAT(vc_rem_dlimit, id, data, compat);
21994 + case VCMD_set_dlimit:
21995 + return __COMPAT(vc_set_dlimit, id, data, compat);
21996 + case VCMD_get_dlimit:
21997 + return __COMPAT(vc_get_dlimit, id, data, compat);
21999 + case VCMD_ctx_kill:
22000 + return vc_ctx_kill(vxi, data);
22002 + case VCMD_wait_exit:
22003 + return vc_wait_exit(vxi, data);
22005 + case VCMD_get_iattr:
22006 + return __COMPAT_NO_ID(vc_get_iattr, data, compat);
22007 + case VCMD_set_iattr:
22008 + return __COMPAT_NO_ID(vc_set_iattr, data, compat);
22010 + case VCMD_fget_iattr:
22011 + return vc_fget_iattr(id, data);
22012 + case VCMD_fset_iattr:
22013 + return vc_fset_iattr(id, data);
22015 + case VCMD_enter_space_v0:
22016 + return vc_enter_space_v1(vxi, NULL);
22017 + case VCMD_enter_space_v1:
22018 + return vc_enter_space_v1(vxi, data);
22019 + /* this is version 2 */
22020 + case VCMD_enter_space:
22021 + return vc_enter_space(vxi, data);
22023 + case VCMD_ctx_create_v0:
22024 + return vc_ctx_create(id, NULL);
22025 + case VCMD_ctx_create:
22026 + return vc_ctx_create(id, data);
22027 + case VCMD_ctx_migrate_v0:
22028 + return vc_ctx_migrate(vxi, NULL);
22029 + case VCMD_ctx_migrate:
22030 + return vc_ctx_migrate(vxi, data);
22032 + case VCMD_net_create_v0:
22033 + return vc_net_create(id, NULL);
22034 + case VCMD_net_create:
22035 + return vc_net_create(id, data);
22036 + case VCMD_net_migrate:
22037 + return vc_net_migrate(nxi, data);
22039 + case VCMD_tag_migrate:
22040 + return vc_tag_migrate(id);
22042 + case VCMD_net_add:
22043 + return vc_net_add(nxi, data);
22044 + case VCMD_net_remove:
22045 + return vc_net_remove(nxi, data);
22047 + case VCMD_net_add_ipv4_v1:
22048 + return vc_net_add_ipv4_v1(nxi, data);
22049 + /* this is version 2 */
22050 + case VCMD_net_add_ipv4:
22051 + return vc_net_add_ipv4(nxi, data);
22053 + case VCMD_net_rem_ipv4_v1:
22054 + return vc_net_rem_ipv4_v1(nxi, data);
22055 + /* this is version 2 */
22056 + case VCMD_net_rem_ipv4:
22057 + return vc_net_rem_ipv4(nxi, data);
22058 +#ifdef CONFIG_IPV6
22059 + case VCMD_net_add_ipv6:
22060 + return vc_net_add_ipv6(nxi, data);
22061 + case VCMD_net_remove_ipv6:
22062 + return vc_net_remove_ipv6(nxi, data);
22064 +/* case VCMD_add_match_ipv4:
22065 + return vc_add_match_ipv4(nxi, data);
22066 + case VCMD_get_match_ipv4:
22067 + return vc_get_match_ipv4(nxi, data);
22068 +#ifdef CONFIG_IPV6
22069 + case VCMD_add_match_ipv6:
22070 + return vc_add_match_ipv6(nxi, data);
22071 + case VCMD_get_match_ipv6:
22072 + return vc_get_match_ipv6(nxi, data);
22075 +#ifdef CONFIG_VSERVER_DEVICE
22076 + case VCMD_set_mapping:
22077 + return __COMPAT(vc_set_mapping, vxi, data, compat);
22078 + case VCMD_unset_mapping:
22079 + return __COMPAT(vc_unset_mapping, vxi, data, compat);
22081 +#ifdef CONFIG_VSERVER_HISTORY
22082 + case VCMD_dump_history:
22083 + return vc_dump_history(id);
22084 + case VCMD_read_history:
22085 + return __COMPAT(vc_read_history, id, data, compat);
22088 + vxwprintk_task(1, "unimplemented VCMD_%02d_%d[%d]",
22089 + VC_CATEGORY(cmd), VC_COMMAND(cmd), VC_VERSION(cmd));
22095 +#define __VCMD(vcmd, _perm, _args, _flags) \
22096 + case VCMD_ ## vcmd: perm = _perm; \
22097 + args = _args; flags = _flags; break
22100 +#define VCA_NONE 0x00
22101 +#define VCA_VXI 0x01
22102 +#define VCA_NXI 0x02
22104 +#define VCF_NONE 0x00
22105 +#define VCF_INFO 0x01
22106 +#define VCF_ADMIN 0x02
22107 +#define VCF_ARES 0x06 /* includes admin */
22108 +#define VCF_SETUP 0x08
22110 +#define VCF_ZIDOK 0x10 /* zero id okay */
22114 +long do_vserver(uint32_t cmd, uint32_t id, void __user *data, int compat)
22117 + int permit = -1, state = 0;
22118 + int perm = -1, args = 0, flags = 0;
22119 + struct vx_info *vxi = NULL;
22120 + struct nx_info *nxi = NULL;
22123 + /* unpriviledged commands */
22124 + __VCMD(get_version, 0, VCA_NONE, 0);
22125 + __VCMD(get_vci, 0, VCA_NONE, 0);
22126 + __VCMD(get_rlimit_mask, 0, VCA_NONE, 0);
22127 + __VCMD(get_space_mask_v0,0, VCA_NONE, 0);
22128 + __VCMD(get_space_mask, 0, VCA_NONE, 0);
22129 + __VCMD(get_space_default,0, VCA_NONE, 0);
22131 + /* info commands */
22132 + __VCMD(task_xid, 2, VCA_NONE, 0);
22133 + __VCMD(reset_hits, 2, VCA_VXI, 0);
22134 + __VCMD(reset_minmax, 2, VCA_VXI, 0);
22135 + __VCMD(vx_info, 3, VCA_VXI, VCF_INFO);
22136 + __VCMD(get_bcaps, 3, VCA_VXI, VCF_INFO);
22137 + __VCMD(get_ccaps, 3, VCA_VXI, VCF_INFO);
22138 + __VCMD(get_cflags, 3, VCA_VXI, VCF_INFO);
22139 + __VCMD(get_umask, 3, VCA_VXI, VCF_INFO);
22140 + __VCMD(get_wmask, 3, VCA_VXI, VCF_INFO);
22141 + __VCMD(get_badness, 3, VCA_VXI, VCF_INFO);
22142 + __VCMD(get_vhi_name, 3, VCA_VXI, VCF_INFO);
22143 + __VCMD(get_rlimit, 3, VCA_VXI, VCF_INFO);
22145 + __VCMD(ctx_stat, 3, VCA_VXI, VCF_INFO);
22146 + __VCMD(virt_stat, 3, VCA_VXI, VCF_INFO);
22147 + __VCMD(sock_stat, 3, VCA_VXI, VCF_INFO);
22148 + __VCMD(rlimit_stat, 3, VCA_VXI, VCF_INFO);
22150 + __VCMD(task_nid, 2, VCA_NONE, 0);
22151 + __VCMD(nx_info, 3, VCA_NXI, VCF_INFO);
22152 + __VCMD(get_ncaps, 3, VCA_NXI, VCF_INFO);
22153 + __VCMD(get_nflags, 3, VCA_NXI, VCF_INFO);
22155 + __VCMD(task_tag, 2, VCA_NONE, 0);
22157 + __VCMD(get_iattr, 2, VCA_NONE, 0);
22158 + __VCMD(fget_iattr, 2, VCA_NONE, 0);
22159 + __VCMD(get_dlimit, 3, VCA_NONE, VCF_INFO);
22160 + __VCMD(get_prio_bias, 3, VCA_VXI, VCF_INFO);
22162 + /* lower admin commands */
22163 + __VCMD(wait_exit, 4, VCA_VXI, VCF_INFO);
22164 + __VCMD(ctx_create_v0, 5, VCA_NONE, 0);
22165 + __VCMD(ctx_create, 5, VCA_NONE, 0);
22166 + __VCMD(ctx_migrate_v0, 5, VCA_VXI, VCF_ADMIN);
22167 + __VCMD(ctx_migrate, 5, VCA_VXI, VCF_ADMIN);
22168 + __VCMD(enter_space_v0, 5, VCA_VXI, VCF_ADMIN);
22169 + __VCMD(enter_space_v1, 5, VCA_VXI, VCF_ADMIN);
22170 + __VCMD(enter_space, 5, VCA_VXI, VCF_ADMIN);
22172 + __VCMD(net_create_v0, 5, VCA_NONE, 0);
22173 + __VCMD(net_create, 5, VCA_NONE, 0);
22174 + __VCMD(net_migrate, 5, VCA_NXI, VCF_ADMIN);
22176 + __VCMD(tag_migrate, 5, VCA_NONE, VCF_ADMIN);
22178 + /* higher admin commands */
22179 + __VCMD(ctx_kill, 6, VCA_VXI, VCF_ARES);
22180 + __VCMD(set_space_v1, 7, VCA_VXI, VCF_ARES | VCF_SETUP);
22181 + __VCMD(set_space, 7, VCA_VXI, VCF_ARES | VCF_SETUP);
22183 + __VCMD(set_ccaps, 7, VCA_VXI, VCF_ARES | VCF_SETUP);
22184 + __VCMD(set_bcaps, 7, VCA_VXI, VCF_ARES | VCF_SETUP);
22185 + __VCMD(set_cflags, 7, VCA_VXI, VCF_ARES | VCF_SETUP);
22186 + __VCMD(set_umask, 7, VCA_VXI, VCF_ARES | VCF_SETUP);
22187 + __VCMD(set_wmask, 7, VCA_VXI, VCF_ARES | VCF_SETUP);
22188 + __VCMD(set_badness, 7, VCA_VXI, VCF_ARES | VCF_SETUP);
22190 + __VCMD(set_vhi_name, 7, VCA_VXI, VCF_ARES | VCF_SETUP);
22191 + __VCMD(set_rlimit, 7, VCA_VXI, VCF_ARES | VCF_SETUP);
22192 + __VCMD(set_prio_bias, 7, VCA_VXI, VCF_ARES | VCF_SETUP);
22194 + __VCMD(set_ncaps, 7, VCA_NXI, VCF_ARES | VCF_SETUP);
22195 + __VCMD(set_nflags, 7, VCA_NXI, VCF_ARES | VCF_SETUP);
22196 + __VCMD(net_add, 8, VCA_NXI, VCF_ARES | VCF_SETUP);
22197 + __VCMD(net_remove, 8, VCA_NXI, VCF_ARES | VCF_SETUP);
22198 + __VCMD(net_add_ipv4_v1, 8, VCA_NXI, VCF_ARES | VCF_SETUP);
22199 + __VCMD(net_rem_ipv4_v1, 8, VCA_NXI, VCF_ARES | VCF_SETUP);
22200 + __VCMD(net_add_ipv4, 8, VCA_NXI, VCF_ARES | VCF_SETUP);
22201 + __VCMD(net_rem_ipv4, 8, VCA_NXI, VCF_ARES | VCF_SETUP);
22202 +#ifdef CONFIG_IPV6
22203 + __VCMD(net_add_ipv6, 8, VCA_NXI, VCF_ARES | VCF_SETUP);
22204 + __VCMD(net_remove_ipv6, 8, VCA_NXI, VCF_ARES | VCF_SETUP);
22206 + __VCMD(set_iattr, 7, VCA_NONE, 0);
22207 + __VCMD(fset_iattr, 7, VCA_NONE, 0);
22208 + __VCMD(set_dlimit, 7, VCA_NONE, VCF_ARES);
22209 + __VCMD(add_dlimit, 8, VCA_NONE, VCF_ARES);
22210 + __VCMD(rem_dlimit, 8, VCA_NONE, VCF_ARES);
22212 +#ifdef CONFIG_VSERVER_DEVICE
22213 + __VCMD(set_mapping, 8, VCA_VXI, VCF_ARES|VCF_ZIDOK);
22214 + __VCMD(unset_mapping, 8, VCA_VXI, VCF_ARES|VCF_ZIDOK);
22216 + /* debug level admin commands */
22217 +#ifdef CONFIG_VSERVER_HISTORY
22218 + __VCMD(dump_history, 9, VCA_NONE, 0);
22219 + __VCMD(read_history, 9, VCA_NONE, 0);
22226 + vxdprintk(VXD_CBIT(switch, 0),
22227 + "vc: VCMD_%02d_%d[%d], %d,%p [%d,%d,%x,%x]",
22228 + VC_CATEGORY(cmd), VC_COMMAND(cmd),
22229 + VC_VERSION(cmd), id, data, compat,
22230 + perm, args, flags);
22237 + if (!capable(CAP_CONTEXT))
22241 + /* moved here from the individual commands */
22243 + if ((perm > 1) && !capable(CAP_SYS_ADMIN))
22247 + /* vcmd involves resource management */
22249 + if ((flags & VCF_ARES) && !capable(CAP_SYS_RESOURCE))
22253 + /* various legacy exceptions */
22255 + /* will go away when spectator is a cap */
22256 + case VCMD_ctx_migrate_v0:
22257 + case VCMD_ctx_migrate:
22259 + current->xid = 1;
22265 + /* will go away when spectator is a cap */
22266 + case VCMD_net_migrate:
22268 + current->nid = 1;
22275 + /* vcmds are fine by default */
22278 + /* admin type vcmds require admin ... */
22279 + if (flags & VCF_ADMIN)
22280 + permit = vx_check(0, VS_ADMIN) ? 1 : 0;
22282 + /* ... but setup type vcmds override that */
22283 + if (!permit && (flags & VCF_SETUP))
22284 + permit = vx_flags(VXF_STATE_SETUP, 0) ? 2 : 0;
22292 + if (!id && (flags & VCF_ZIDOK))
22296 + if (args & VCA_VXI) {
22297 + vxi = lookup_vx_info(id);
22301 + if ((flags & VCF_ADMIN) &&
22302 + /* special case kill for shutdown */
22303 + (cmd != VCMD_ctx_kill) &&
22304 + /* can context be administrated? */
22305 + !vx_info_flags(vxi, VXF_STATE_ADMIN, 0)) {
22311 + if (args & VCA_NXI) {
22312 + nxi = lookup_nx_info(id);
22316 + if ((flags & VCF_ADMIN) &&
22317 + /* can context be administrated? */
22318 + !nx_info_flags(nxi, NXF_STATE_ADMIN, 0)) {
22325 + ret = do_vcmd(cmd, id, vxi, nxi, data, compat);
22328 + if ((args & VCA_NXI) && nxi)
22329 + put_nx_info(nxi);
22331 + if ((args & VCA_VXI) && vxi)
22332 + put_vx_info(vxi);
22334 + vxdprintk(VXD_CBIT(switch, 1),
22335 + "vc: VCMD_%02d_%d[%d] = %08lx(%ld) [%d,%d]",
22336 + VC_CATEGORY(cmd), VC_COMMAND(cmd),
22337 + VC_VERSION(cmd), ret, ret, state, permit);
22342 +sys_vserver(uint32_t cmd, uint32_t id, void __user *data)
22344 + return do_vserver(cmd, id, data, 0);
22347 +#ifdef CONFIG_COMPAT
22350 +sys32_vserver(uint32_t cmd, uint32_t id, void __user *data)
22352 + return do_vserver(cmd, id, data, 1);
22355 +#endif /* CONFIG_COMPAT */
22356 diff -NurpP --minimal linux-4.9.82/kernel/vserver/sysctl.c linux-4.9.82-vs2.3.9.7/kernel/vserver/sysctl.c
22357 --- linux-4.9.82/kernel/vserver/sysctl.c 1970-01-01 00:00:00.000000000 +0000
22358 +++ linux-4.9.82-vs2.3.9.7/kernel/vserver/sysctl.c 2018-01-13 05:37:59.000000000 +0000
22361 + * kernel/vserver/sysctl.c
22363 + * Virtual Context Support
22365 + * Copyright (C) 2004-2007 Herbert P?tzl
22367 + * V0.01 basic structure
22371 +#include <linux/module.h>
22372 +#include <linux/ctype.h>
22373 +#include <linux/sysctl.h>
22374 +#include <linux/parser.h>
22375 +#include <linux/utsname.h>
22377 +#include <asm/uaccess.h>
22378 +#include <asm/sections.h>
22381 + CTL_DEBUG_ERROR = 0,
22382 + CTL_DEBUG_SWITCH = 1,
22398 +unsigned int vs_debug_switch = 0;
22399 +unsigned int vs_debug_xid = 0;
22400 +unsigned int vs_debug_nid = 0;
22401 +unsigned int vs_debug_tag = 0;
22402 +unsigned int vs_debug_net = 0;
22403 +unsigned int vs_debug_limit = 0;
22404 +unsigned int vs_debug_cres = 0;
22405 +unsigned int vs_debug_dlim = 0;
22406 +unsigned int vs_debug_quota = 0;
22407 +unsigned int vs_debug_cvirt = 0;
22408 +unsigned int vs_debug_space = 0;
22409 +unsigned int vs_debug_perm = 0;
22410 +unsigned int vs_debug_misc = 0;
22413 +static struct ctl_table_header *vserver_table_header;
22414 +static struct ctl_table vserver_root_table[];
22417 +void vserver_register_sysctl(void)
22419 + if (!vserver_table_header) {
22420 + vserver_table_header = register_sysctl_table(vserver_root_table);
22425 +void vserver_unregister_sysctl(void)
22427 + if (vserver_table_header) {
22428 + unregister_sysctl_table(vserver_table_header);
22429 + vserver_table_header = NULL;
22433 +static int proc_dodebug(struct ctl_table *table, int write,
22434 + void __user *buffer, size_t *lenp, loff_t *ppos)
22436 + char tmpbuf[20], *p, c;
22437 + unsigned int value;
22438 + size_t left, len;
22440 + if ((*ppos && !write) || !*lenp) {
22448 + if (!access_ok(VERIFY_READ, buffer, left))
22450 + p = (char *)buffer;
22451 + while (left && __get_user(c, p) >= 0 && isspace(c))
22456 + if (left > sizeof(tmpbuf) - 1)
22458 + if (copy_from_user(tmpbuf, p, left))
22460 + tmpbuf[left] = '\0';
22462 + for (p = tmpbuf, value = 0; '0' <= *p && *p <= '9'; p++, left--)
22463 + value = 10 * value + (*p - '0');
22464 + if (*p && !isspace(*p))
22466 + while (left && isspace(*p))
22468 + *(unsigned int *)table->data = value;
22470 + if (!access_ok(VERIFY_WRITE, buffer, left))
22472 + len = sprintf(tmpbuf, "%d", *(unsigned int *)table->data);
22475 + if (__copy_to_user(buffer, tmpbuf, len))
22477 + if ((left -= len) > 0) {
22478 + if (put_user('\n', (char *)buffer + len))
22492 +#define CTL_ENTRY(ctl, name) \
22494 + .procname = #name, \
22495 + .data = &vs_ ## name, \
22496 + .maxlen = sizeof(int), \
22498 + .proc_handler = &proc_dodebug, \
22499 + .extra1 = &zero, \
22500 + .extra2 = &zero, \
22503 +static struct ctl_table vserver_debug_table[] = {
22504 + CTL_ENTRY(CTL_DEBUG_SWITCH, debug_switch),
22505 + CTL_ENTRY(CTL_DEBUG_XID, debug_xid),
22506 + CTL_ENTRY(CTL_DEBUG_NID, debug_nid),
22507 + CTL_ENTRY(CTL_DEBUG_TAG, debug_tag),
22508 + CTL_ENTRY(CTL_DEBUG_NET, debug_net),
22509 + CTL_ENTRY(CTL_DEBUG_LIMIT, debug_limit),
22510 + CTL_ENTRY(CTL_DEBUG_CRES, debug_cres),
22511 + CTL_ENTRY(CTL_DEBUG_DLIM, debug_dlim),
22512 + CTL_ENTRY(CTL_DEBUG_QUOTA, debug_quota),
22513 + CTL_ENTRY(CTL_DEBUG_CVIRT, debug_cvirt),
22514 + CTL_ENTRY(CTL_DEBUG_SPACE, debug_space),
22515 + CTL_ENTRY(CTL_DEBUG_PERM, debug_perm),
22516 + CTL_ENTRY(CTL_DEBUG_MISC, debug_misc),
22520 +static struct ctl_table vserver_root_table[] = {
22522 + .procname = "vserver",
22524 + .child = vserver_debug_table
22530 +static match_table_t tokens = {
22531 + { CTL_DEBUG_SWITCH, "switch=%x" },
22532 + { CTL_DEBUG_XID, "xid=%x" },
22533 + { CTL_DEBUG_NID, "nid=%x" },
22534 + { CTL_DEBUG_TAG, "tag=%x" },
22535 + { CTL_DEBUG_NET, "net=%x" },
22536 + { CTL_DEBUG_LIMIT, "limit=%x" },
22537 + { CTL_DEBUG_CRES, "cres=%x" },
22538 + { CTL_DEBUG_DLIM, "dlim=%x" },
22539 + { CTL_DEBUG_QUOTA, "quota=%x" },
22540 + { CTL_DEBUG_CVIRT, "cvirt=%x" },
22541 + { CTL_DEBUG_SPACE, "space=%x" },
22542 + { CTL_DEBUG_PERM, "perm=%x" },
22543 + { CTL_DEBUG_MISC, "misc=%x" },
22544 + { CTL_DEBUG_ERROR, NULL }
22547 +#define HANDLE_CASE(id, name, val) \
22548 + case CTL_DEBUG_ ## id: \
22549 + vs_debug_ ## name = val; \
22550 + printk("vs_debug_" #name "=0x%x\n", val); \
22554 +static int __init vs_debug_setup(char *str)
22559 + printk("vs_debug_setup(%s)\n", str);
22560 + while ((p = strsep(&str, ",")) != NULL) {
22561 + substring_t args[MAX_OPT_ARGS];
22562 + unsigned int value;
22567 + token = match_token(p, tokens, args);
22568 + value = (token > 0) ? simple_strtoul(args[0].from, NULL, 0) : 0;
22571 + HANDLE_CASE(SWITCH, switch, value);
22572 + HANDLE_CASE(XID, xid, value);
22573 + HANDLE_CASE(NID, nid, value);
22574 + HANDLE_CASE(TAG, tag, value);
22575 + HANDLE_CASE(NET, net, value);
22576 + HANDLE_CASE(LIMIT, limit, value);
22577 + HANDLE_CASE(CRES, cres, value);
22578 + HANDLE_CASE(DLIM, dlim, value);
22579 + HANDLE_CASE(QUOTA, quota, value);
22580 + HANDLE_CASE(CVIRT, cvirt, value);
22581 + HANDLE_CASE(SPACE, space, value);
22582 + HANDLE_CASE(PERM, perm, value);
22583 + HANDLE_CASE(MISC, misc, value);
22592 +__setup("vsdebug=", vs_debug_setup);
22596 +EXPORT_SYMBOL_GPL(vs_debug_switch);
22597 +EXPORT_SYMBOL_GPL(vs_debug_xid);
22598 +EXPORT_SYMBOL_GPL(vs_debug_nid);
22599 +EXPORT_SYMBOL_GPL(vs_debug_net);
22600 +EXPORT_SYMBOL_GPL(vs_debug_limit);
22601 +EXPORT_SYMBOL_GPL(vs_debug_cres);
22602 +EXPORT_SYMBOL_GPL(vs_debug_dlim);
22603 +EXPORT_SYMBOL_GPL(vs_debug_quota);
22604 +EXPORT_SYMBOL_GPL(vs_debug_cvirt);
22605 +EXPORT_SYMBOL_GPL(vs_debug_space);
22606 +EXPORT_SYMBOL_GPL(vs_debug_perm);
22607 +EXPORT_SYMBOL_GPL(vs_debug_misc);
22609 diff -NurpP --minimal linux-4.9.82/kernel/vserver/tag.c linux-4.9.82-vs2.3.9.7/kernel/vserver/tag.c
22610 --- linux-4.9.82/kernel/vserver/tag.c 1970-01-01 00:00:00.000000000 +0000
22611 +++ linux-4.9.82-vs2.3.9.7/kernel/vserver/tag.c 2018-01-10 02:50:49.000000000 +0000
22614 + * linux/kernel/vserver/tag.c
22616 + * Virtual Server: Shallow Tag Space
22618 + * Copyright (C) 2007 Herbert P?tzl
22620 + * V0.01 basic implementation
22624 +#include <linux/sched.h>
22625 +#include <linux/vserver/debug.h>
22626 +#include <linux/vs_pid.h>
22627 +#include <linux/vs_tag.h>
22629 +#include <linux/vserver/tag_cmd.h>
22632 +int dx_migrate_task(struct task_struct *p, vtag_t tag)
22637 + vxdprintk(VXD_CBIT(tag, 5),
22638 + "dx_migrate_task(%p[#%d],#%d)", p, p->tag, tag);
22644 + vxdprintk(VXD_CBIT(tag, 5),
22645 + "moved task %p into [#%d]", p, tag);
22649 +/* vserver syscall commands below here */
22651 +/* taks xid and vx_info functions */
22654 +int vc_task_tag(uint32_t id)
22659 + struct task_struct *tsk;
22661 + tsk = find_task_by_real_pid(id);
22662 + tag = (tsk) ? tsk->tag : -ESRCH;
22663 + rcu_read_unlock();
22665 + tag = dx_current_tag();
22670 +int vc_tag_migrate(uint32_t tag)
22672 + return dx_migrate_task(current, tag & 0xFFFF);
22676 diff -NurpP --minimal linux-4.9.82/kernel/vserver/vci_config.h linux-4.9.82-vs2.3.9.7/kernel/vserver/vci_config.h
22677 --- linux-4.9.82/kernel/vserver/vci_config.h 1970-01-01 00:00:00.000000000 +0000
22678 +++ linux-4.9.82-vs2.3.9.7/kernel/vserver/vci_config.h 2018-01-10 02:50:49.000000000 +0000
22681 +/* interface version */
22683 +#define VCI_VERSION 0x00020308
22687 + VCI_KCBIT_NO_DYNAMIC = 0,
22689 + VCI_KCBIT_PROC_SECURE = 4,
22690 + /* VCI_KCBIT_HARDCPU = 5, */
22691 + /* VCI_KCBIT_IDLELIMIT = 6, */
22692 + /* VCI_KCBIT_IDLETIME = 7, */
22694 + VCI_KCBIT_COWBL = 8,
22695 + VCI_KCBIT_FULLCOWBL = 9,
22696 + VCI_KCBIT_SPACES = 10,
22697 + VCI_KCBIT_NETV2 = 11,
22698 + VCI_KCBIT_MEMCG = 12,
22699 + VCI_KCBIT_MEMCG_SWAP = 13,
22701 + VCI_KCBIT_DEBUG = 16,
22702 + VCI_KCBIT_HISTORY = 20,
22703 + VCI_KCBIT_TAGGED = 24,
22704 + VCI_KCBIT_PPTAG = 28,
22706 + VCI_KCBIT_MORE = 31,
22710 +static inline uint32_t vci_kernel_config(void)
22713 + (1 << VCI_KCBIT_NO_DYNAMIC) |
22715 + /* configured features */
22716 +#ifdef CONFIG_VSERVER_PROC_SECURE
22717 + (1 << VCI_KCBIT_PROC_SECURE) |
22719 +#ifdef CONFIG_VSERVER_COWBL
22720 + (1 << VCI_KCBIT_COWBL) |
22721 + (1 << VCI_KCBIT_FULLCOWBL) |
22723 + (1 << VCI_KCBIT_SPACES) |
22724 + (1 << VCI_KCBIT_NETV2) |
22725 +#ifdef CONFIG_MEMCG
22726 + (1 << VCI_KCBIT_MEMCG) |
22728 +#ifdef CONFIG_MEMCG_SWAP
22729 + (1 << VCI_KCBIT_MEMCG_SWAP) |
22732 + /* debug options */
22733 +#ifdef CONFIG_VSERVER_DEBUG
22734 + (1 << VCI_KCBIT_DEBUG) |
22736 +#ifdef CONFIG_VSERVER_HISTORY
22737 + (1 << VCI_KCBIT_HISTORY) |
22740 + /* inode context tagging */
22741 +#if defined(CONFIG_TAGGING_NONE)
22742 + (0 << VCI_KCBIT_TAGGED) |
22743 +#elif defined(CONFIG_TAGGING_UID16)
22744 + (1 << VCI_KCBIT_TAGGED) |
22745 +#elif defined(CONFIG_TAGGING_GID16)
22746 + (2 << VCI_KCBIT_TAGGED) |
22747 +#elif defined(CONFIG_TAGGING_ID24)
22748 + (3 << VCI_KCBIT_TAGGED) |
22749 +#elif defined(CONFIG_TAGGING_INTERN)
22750 + (4 << VCI_KCBIT_TAGGED) |
22751 +#elif defined(CONFIG_TAGGING_RUNTIME)
22752 + (5 << VCI_KCBIT_TAGGED) |
22754 + (7 << VCI_KCBIT_TAGGED) |
22756 + (1 << VCI_KCBIT_PPTAG) |
22760 diff -NurpP --minimal linux-4.9.82/mm/memcontrol.c linux-4.9.82-vs2.3.9.7/mm/memcontrol.c
22761 --- linux-4.9.82/mm/memcontrol.c 2018-02-22 21:18:58.000000000 +0000
22762 +++ linux-4.9.82-vs2.3.9.7/mm/memcontrol.c 2018-02-10 15:15:43.000000000 +0000
22763 @@ -2825,6 +2825,41 @@ static u64 mem_cgroup_read_u64(struct cg
22767 +unsigned long mem_cgroup_mem_usage_pages(struct mem_cgroup *memcg)
22769 + return mem_cgroup_usage(memcg, false);
22772 +unsigned long mem_cgroup_mem_limit_pages(struct mem_cgroup *memcg)
22774 + return memcg->memory.limit;
22777 +unsigned long mem_cgroup_memsw_usage_pages(struct mem_cgroup *memcg)
22779 + return mem_cgroup_usage(memcg, true);
22782 +unsigned long mem_cgroup_memsw_limit_pages(struct mem_cgroup *memcg)
22784 + return memcg->memsw.limit;
22787 +void dump_mem_cgroup(struct mem_cgroup *memcg)
22789 + printk(KERN_INFO "memcg: %p/%d:\n"
22790 + "\tmemory:\t%lu/%lu %lu/%lu\n"
22791 + "\tmemsw:\t%lu/%lu %lu/%lu\n"
22792 + "\tkmem:\t%lu/%lu %lu/%lu\n",
22793 + memcg, memcg->id.id,
22794 + page_counter_read(&memcg->memory), memcg->memory.limit,
22795 + memcg->memory.watermark, memcg->memory.failcnt,
22796 + page_counter_read(&memcg->memsw), memcg->memsw.limit,
22797 + memcg->memsw.watermark, memcg->memsw.failcnt,
22798 + page_counter_read(&memcg->kmem), memcg->kmem.limit,
22799 + memcg->kmem.watermark, memcg->kmem.failcnt);
22802 #ifndef CONFIG_SLOB
22803 static int memcg_online_kmem(struct mem_cgroup *memcg)
22805 diff -NurpP --minimal linux-4.9.82/mm/oom_kill.c linux-4.9.82-vs2.3.9.7/mm/oom_kill.c
22806 --- linux-4.9.82/mm/oom_kill.c 2018-02-22 21:18:58.000000000 +0000
22807 +++ linux-4.9.82-vs2.3.9.7/mm/oom_kill.c 2018-01-10 08:54:40.000000000 +0000
22809 #include <linux/kthread.h>
22810 #include <linux/init.h>
22811 #include <linux/mmu_notifier.h>
22812 +#include <linux/reboot.h>
22813 +#include <linux/vs_context.h>
22815 #include <asm/tlb.h>
22816 #include "internal.h"
22817 @@ -142,11 +144,18 @@ static inline bool is_memcg_oom(struct o
22818 static bool oom_unkillable_task(struct task_struct *p,
22819 struct mem_cgroup *memcg, const nodemask_t *nodemask)
22821 - if (is_global_init(p))
22822 + unsigned xid = vx_current_xid();
22824 + /* skip the init task, global and per guest */
22825 + if (task_is_init(p))
22827 if (p->flags & PF_KTHREAD)
22830 + /* skip other guest and host processes if oom in guest */
22831 + if (xid && vx_task_xid(p) != xid)
22834 /* When mem_cgroup_out_of_memory() and p is not member of the group */
22835 if (memcg && !task_in_mem_cgroup(p, memcg))
22837 @@ -851,8 +860,8 @@ static void oom_kill_process(struct oom_
22838 if (__ratelimit(&oom_rs))
22839 dump_header(oc, p);
22841 - pr_err("%s: Kill process %d (%s) score %u or sacrifice child\n",
22842 - message, task_pid_nr(p), p->comm, points);
22843 + pr_err("%s: Kill process %d:#%u (%s) score %d or sacrifice child\n",
22844 + message, task_pid_nr(p), p->xid, p->comm, points);
22847 * If any of p's children has a different mm and is eligible for kill,
22848 @@ -902,8 +911,8 @@ static void oom_kill_process(struct oom_
22850 do_send_sig_info(SIGKILL, SEND_SIG_FORCED, victim, true);
22851 mark_oom_victim(victim);
22852 - pr_err("Killed process %d (%s) total-vm:%lukB, anon-rss:%lukB, file-rss:%lukB, shmem-rss:%lukB\n",
22853 - task_pid_nr(victim), victim->comm, K(victim->mm->total_vm),
22854 + pr_err("Killed process %d:%u (%s) total-vm:%lukB, anon-rss:%lukB, file-rss:%lukB, shmem-rss:%lukB\n",
22855 + task_pid_nr(victim), victim->xid, victim->comm, K(victim->mm->total_vm),
22856 K(get_mm_counter(victim->mm, MM_ANONPAGES)),
22857 K(get_mm_counter(victim->mm, MM_FILEPAGES)),
22858 K(get_mm_counter(victim->mm, MM_SHMEMPAGES)));
22859 @@ -950,6 +959,8 @@ static void oom_kill_process(struct oom_
22863 +long vs_oom_action(unsigned int);
22866 * Determines whether the kernel must panic because of the panic_on_oom sysctl.
22868 @@ -1055,7 +1066,12 @@ bool out_of_memory(struct oom_control *o
22869 /* Found nothing?!?! Either we hang forever, or we panic. */
22870 if (!oc->chosen && !is_sysrq_oom(oc) && !is_memcg_oom(oc)) {
22871 dump_header(oc, NULL);
22872 - panic("Out of memory and no killable processes...\n");
22874 + /* avoid panic for guest OOM */
22875 + if (vx_current_xid())
22876 + vs_oom_action(LINUX_REBOOT_CMD_OOM);
22878 + panic("Out of memory and no killable processes...\n");
22880 if (oc->chosen && oc->chosen != (void *)-1UL) {
22881 oom_kill_process(oc, !is_memcg_oom(oc) ? "Out of memory" :
22882 diff -NurpP --minimal linux-4.9.82/mm/page_alloc.c linux-4.9.82-vs2.3.9.7/mm/page_alloc.c
22883 --- linux-4.9.82/mm/page_alloc.c 2018-02-22 21:18:58.000000000 +0000
22884 +++ linux-4.9.82-vs2.3.9.7/mm/page_alloc.c 2018-02-10 15:15:43.000000000 +0000
22886 #include <linux/page_owner.h>
22887 #include <linux/kthread.h>
22888 #include <linux/memcontrol.h>
22889 +#include <linux/vs_base.h>
22890 +#include <linux/vs_limit.h>
22892 #include <asm/sections.h>
22893 #include <asm/tlbflush.h>
22894 @@ -4199,6 +4201,9 @@ void si_meminfo(struct sysinfo *val)
22895 val->totalhigh = totalhigh_pages;
22896 val->freehigh = nr_free_highpages();
22897 val->mem_unit = PAGE_SIZE;
22899 + if (vx_flags(VXF_VIRT_MEM, 0))
22900 + vx_vsi_meminfo(val);
22903 EXPORT_SYMBOL(si_meminfo);
22904 @@ -4233,6 +4238,9 @@ void si_meminfo_node(struct sysinfo *val
22905 val->freehigh = free_highpages;
22907 val->mem_unit = PAGE_SIZE;
22909 + if (vx_flags(VXF_VIRT_MEM, 0))
22910 + vx_vsi_meminfo(val);
22914 diff -NurpP --minimal linux-4.9.82/mm/pgtable-generic.c linux-4.9.82-vs2.3.9.7/mm/pgtable-generic.c
22915 --- linux-4.9.82/mm/pgtable-generic.c 2016-12-11 19:17:54.000000000 +0000
22916 +++ linux-4.9.82-vs2.3.9.7/mm/pgtable-generic.c 2018-01-10 02:50:49.000000000 +0000
22918 * Copyright (C) 2010 Linus Torvalds
22921 +#include <linux/mm.h>
22923 #include <linux/pagemap.h>
22924 #include <asm/tlb.h>
22925 #include <asm-generic/pgtable.h>
22926 diff -NurpP --minimal linux-4.9.82/mm/shmem.c linux-4.9.82-vs2.3.9.7/mm/shmem.c
22927 --- linux-4.9.82/mm/shmem.c 2018-02-22 21:18:58.000000000 +0000
22928 +++ linux-4.9.82-vs2.3.9.7/mm/shmem.c 2018-01-10 08:36:49.000000000 +0000
22929 @@ -2785,7 +2785,7 @@ static int shmem_statfs(struct dentry *d
22931 struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb);
22933 - buf->f_type = TMPFS_MAGIC;
22934 + buf->f_type = TMPFS_SUPER_MAGIC;
22935 buf->f_bsize = PAGE_SIZE;
22936 buf->f_namelen = NAME_MAX;
22937 if (sbinfo->max_blocks) {
22938 @@ -3606,7 +3606,7 @@ int shmem_fill_super(struct super_block
22939 sb->s_maxbytes = MAX_LFS_FILESIZE;
22940 sb->s_blocksize = PAGE_SIZE;
22941 sb->s_blocksize_bits = PAGE_SHIFT;
22942 - sb->s_magic = TMPFS_MAGIC;
22943 + sb->s_magic = TMPFS_SUPER_MAGIC;
22944 sb->s_op = &shmem_ops;
22945 sb->s_time_gran = 1;
22946 #ifdef CONFIG_TMPFS_XATTR
22947 diff -NurpP --minimal linux-4.9.82/mm/slab.c linux-4.9.82-vs2.3.9.7/mm/slab.c
22948 --- linux-4.9.82/mm/slab.c 2018-02-22 21:18:58.000000000 +0000
22949 +++ linux-4.9.82-vs2.3.9.7/mm/slab.c 2018-01-10 02:50:49.000000000 +0000
22950 @@ -307,6 +307,8 @@ static void kmem_cache_node_init(struct
22951 #define STATS_INC_FREEMISS(x) do { } while (0)
22954 +#include "slab_vs.h"
22959 @@ -3341,6 +3343,7 @@ slab_alloc_node(struct kmem_cache *cache
22960 /* ___cache_alloc_node can fall back to other nodes */
22961 ptr = ____cache_alloc_node(cachep, flags, nodeid);
22963 + vx_slab_alloc(cachep, flags);
22964 local_irq_restore(save_flags);
22965 ptr = cache_alloc_debugcheck_after(cachep, flags, ptr, caller);
22967 @@ -3522,6 +3525,7 @@ void ___cache_free(struct kmem_cache *ca
22969 kmemleak_free_recursive(objp, cachep->flags);
22970 objp = cache_free_debugcheck(cachep, objp, caller);
22971 + vx_slab_free(cachep);
22973 kmemcheck_slab_free(cachep, objp, cachep->object_size);
22975 diff -NurpP --minimal linux-4.9.82/mm/slab_vs.h linux-4.9.82-vs2.3.9.7/mm/slab_vs.h
22976 --- linux-4.9.82/mm/slab_vs.h 1970-01-01 00:00:00.000000000 +0000
22977 +++ linux-4.9.82-vs2.3.9.7/mm/slab_vs.h 2018-01-10 02:50:49.000000000 +0000
22980 +#include <linux/vserver/context.h>
22982 +#include <linux/vs_context.h>
22985 +void vx_slab_alloc(struct kmem_cache *cachep, gfp_t flags)
22987 + int what = gfp_zone(cachep->allocflags);
22988 + struct vx_info *vxi = current_vx_info();
22993 + atomic_add(cachep->size, &vxi->cacct.slab[what]);
22997 +void vx_slab_free(struct kmem_cache *cachep)
22999 + int what = gfp_zone(cachep->allocflags);
23000 + struct vx_info *vxi = current_vx_info();
23005 + atomic_sub(cachep->size, &vxi->cacct.slab[what]);
23008 diff -NurpP --minimal linux-4.9.82/mm/swapfile.c linux-4.9.82-vs2.3.9.7/mm/swapfile.c
23009 --- linux-4.9.82/mm/swapfile.c 2018-02-22 21:18:58.000000000 +0000
23010 +++ linux-4.9.82-vs2.3.9.7/mm/swapfile.c 2018-01-10 02:50:49.000000000 +0000
23012 #include <asm/tlbflush.h>
23013 #include <linux/swapops.h>
23014 #include <linux/swap_cgroup.h>
23015 +#include <linux/vs_base.h>
23017 static bool swap_count_continued(struct swap_info_struct *, pgoff_t,
23019 @@ -2083,6 +2084,16 @@ static int swap_show(struct seq_file *sw
23021 if (si == SEQ_START_TOKEN) {
23022 seq_puts(swap,"Filename\t\t\t\tType\t\tSize\tUsed\tPriority\n");
23023 + if (vx_flags(VXF_VIRT_MEM, 0)) {
23024 + struct sysinfo si = { 0 };
23026 + vx_vsi_swapinfo(&si);
23027 + if (si.totalswap < (1 << 10))
23029 + seq_printf(swap, "%s\t\t\t\t\t%s\t%lu\t%lu\t%d\n",
23030 + "hdv0", "partition", si.totalswap >> 10,
23031 + (si.totalswap - si.freeswap) >> 10, -1);
23036 @@ -2612,6 +2623,8 @@ void si_swapinfo(struct sysinfo *val)
23037 val->freeswap = atomic_long_read(&nr_swap_pages) + nr_to_be_unused;
23038 val->totalswap = total_swap_pages + nr_to_be_unused;
23039 spin_unlock(&swap_lock);
23040 + if (vx_flags(VXF_VIRT_MEM, 0))
23041 + vx_vsi_swapinfo(val);
23045 diff -NurpP --minimal linux-4.9.82/net/bridge/br_multicast.c linux-4.9.82-vs2.3.9.7/net/bridge/br_multicast.c
23046 --- linux-4.9.82/net/bridge/br_multicast.c 2016-12-11 19:17:54.000000000 +0000
23047 +++ linux-4.9.82-vs2.3.9.7/net/bridge/br_multicast.c 2018-01-10 02:50:49.000000000 +0000
23048 @@ -465,7 +465,7 @@ static struct sk_buff *br_ip6_multicast_
23049 ip6h->hop_limit = 1;
23050 ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1));
23051 if (ipv6_dev_get_saddr(dev_net(br->dev), br->dev, &ip6h->daddr, 0,
23053 + &ip6h->saddr, NULL)) {
23055 br->has_ipv6_addr = 0;
23057 diff -NurpP --minimal linux-4.9.82/net/core/dev.c linux-4.9.82-vs2.3.9.7/net/core/dev.c
23058 --- linux-4.9.82/net/core/dev.c 2018-02-22 21:19:01.000000000 +0000
23059 +++ linux-4.9.82-vs2.3.9.7/net/core/dev.c 2018-02-10 15:15:43.000000000 +0000
23060 @@ -126,6 +126,7 @@
23061 #include <linux/in.h>
23062 #include <linux/jhash.h>
23063 #include <linux/random.h>
23064 +#include <linux/vs_inet.h>
23065 #include <trace/events/napi.h>
23066 #include <trace/events/net.h>
23067 #include <trace/events/skb.h>
23068 @@ -730,7 +731,8 @@ struct net_device *__dev_get_by_name(str
23069 struct hlist_head *head = dev_name_hash(net, name);
23071 hlist_for_each_entry(dev, head, name_hlist)
23072 - if (!strncmp(dev->name, name, IFNAMSIZ))
23073 + if (!strncmp(dev->name, name, IFNAMSIZ) &&
23074 + nx_dev_visible(current_nx_info(), dev))
23078 @@ -755,7 +757,8 @@ struct net_device *dev_get_by_name_rcu(s
23079 struct hlist_head *head = dev_name_hash(net, name);
23081 hlist_for_each_entry_rcu(dev, head, name_hlist)
23082 - if (!strncmp(dev->name, name, IFNAMSIZ))
23083 + if (!strncmp(dev->name, name, IFNAMSIZ) &&
23084 + nx_dev_visible(current_nx_info(), dev))
23088 @@ -805,7 +808,8 @@ struct net_device *__dev_get_by_index(st
23089 struct hlist_head *head = dev_index_hash(net, ifindex);
23091 hlist_for_each_entry(dev, head, index_hlist)
23092 - if (dev->ifindex == ifindex)
23093 + if ((dev->ifindex == ifindex) &&
23094 + nx_dev_visible(current_nx_info(), dev))
23098 @@ -823,7 +827,7 @@ EXPORT_SYMBOL(__dev_get_by_index);
23099 * about locking. The caller must hold RCU lock.
23102 -struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex)
23103 +struct net_device *dev_get_by_index_real_rcu(struct net *net, int ifindex)
23105 struct net_device *dev;
23106 struct hlist_head *head = dev_index_hash(net, ifindex);
23107 @@ -834,6 +838,16 @@ struct net_device *dev_get_by_index_rcu(
23111 +EXPORT_SYMBOL(dev_get_by_index_real_rcu);
23113 +struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex)
23115 + struct net_device *dev = dev_get_by_index_real_rcu(net, ifindex);
23117 + if (nx_dev_visible(current_nx_info(), dev))
23121 EXPORT_SYMBOL(dev_get_by_index_rcu);
23124 @@ -916,7 +930,8 @@ struct net_device *dev_getbyhwaddr_rcu(s
23126 for_each_netdev_rcu(net, dev)
23127 if (dev->type == type &&
23128 - !memcmp(dev->dev_addr, ha, dev->addr_len))
23129 + !memcmp(dev->dev_addr, ha, dev->addr_len) &&
23130 + nx_dev_visible(current_nx_info(), dev))
23134 @@ -928,9 +943,11 @@ struct net_device *__dev_getfirstbyhwtyp
23135 struct net_device *dev;
23138 - for_each_netdev(net, dev)
23139 - if (dev->type == type)
23140 + for_each_netdev(net, dev) {
23141 + if ((dev->type == type) &&
23142 + nx_dev_visible(current_nx_info(), dev))
23148 @@ -942,7 +959,8 @@ struct net_device *dev_getfirstbyhwtype(
23151 for_each_netdev_rcu(net, dev)
23152 - if (dev->type == type) {
23153 + if ((dev->type == type) &&
23154 + nx_dev_visible(current_nx_info(), dev)) {
23158 @@ -972,7 +990,8 @@ struct net_device *__dev_get_by_flags(st
23161 for_each_netdev(net, dev) {
23162 - if (((dev->flags ^ if_flags) & mask) == 0) {
23163 + if ((((dev->flags ^ if_flags) & mask) == 0) &&
23164 + nx_dev_visible(current_nx_info(), dev)) {
23168 @@ -1050,6 +1069,8 @@ static int __dev_alloc_name(struct net *
23170 if (i < 0 || i >= max_netdevices)
23172 + if (!nx_dev_visible(current_nx_info(), d))
23175 /* avoid cases where sscanf is not exact inverse of printf */
23176 snprintf(buf, IFNAMSIZ, name, i);
23177 diff -NurpP --minimal linux-4.9.82/net/core/net-procfs.c linux-4.9.82-vs2.3.9.7/net/core/net-procfs.c
23178 --- linux-4.9.82/net/core/net-procfs.c 2016-12-11 19:17:54.000000000 +0000
23179 +++ linux-4.9.82-vs2.3.9.7/net/core/net-procfs.c 2018-01-10 02:50:49.000000000 +0000
23181 #include <linux/netdevice.h>
23182 #include <linux/proc_fs.h>
23183 #include <linux/seq_file.h>
23184 +#include <linux/vs_inet.h>
23185 #include <net/wext.h>
23187 #define BUCKET_SPACE (32 - NETDEV_HASHBITS - 1)
23188 @@ -77,8 +78,13 @@ static void dev_seq_stop(struct seq_file
23189 static void dev_seq_printf_stats(struct seq_file *seq, struct net_device *dev)
23191 struct rtnl_link_stats64 temp;
23192 - const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp);
23193 + const struct rtnl_link_stats64 *stats;
23195 + /* device visible inside network context? */
23196 + if (!nx_dev_visible(current_nx_info(), dev))
23199 + stats = dev_get_stats(dev, &temp);
23200 seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
23201 "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
23202 dev->name, stats->rx_bytes, stats->rx_packets,
23203 diff -NurpP --minimal linux-4.9.82/net/core/rtnetlink.c linux-4.9.82-vs2.3.9.7/net/core/rtnetlink.c
23204 --- linux-4.9.82/net/core/rtnetlink.c 2018-02-22 21:19:01.000000000 +0000
23205 +++ linux-4.9.82-vs2.3.9.7/net/core/rtnetlink.c 2018-01-10 02:50:49.000000000 +0000
23206 @@ -1615,6 +1615,8 @@ static int rtnl_dump_ifinfo(struct sk_bu
23210 + if (!nx_dev_visible(skb->sk->sk_nx_info, dev))
23212 err = rtnl_fill_ifinfo(skb, dev, RTM_NEWLINK,
23213 NETLINK_CB(cb->skb).portid,
23214 cb->nlh->nlmsg_seq, 0,
23215 @@ -2811,6 +2813,9 @@ void rtmsg_ifinfo(int type, struct net_d
23217 struct sk_buff *skb;
23219 + if (!nx_dev_visible(current_nx_info(), dev))
23222 if (dev->reg_state != NETREG_REGISTERED)
23225 diff -NurpP --minimal linux-4.9.82/net/core/sock.c linux-4.9.82-vs2.3.9.7/net/core/sock.c
23226 --- linux-4.9.82/net/core/sock.c 2018-02-22 21:19:01.000000000 +0000
23227 +++ linux-4.9.82-vs2.3.9.7/net/core/sock.c 2018-01-13 00:48:01.000000000 +0000
23228 @@ -135,6 +135,10 @@
23230 #include <linux/filter.h>
23231 #include <net/sock_reuseport.h>
23232 +#include <linux/vs_socket.h>
23233 +#include <linux/vs_limit.h>
23234 +#include <linux/vs_context.h>
23235 +#include <linux/vs_network.h>
23237 #include <trace/events/sock.h>
23239 @@ -1339,6 +1343,8 @@ static struct sock *sk_prot_alloc(struct
23241 sk_tx_queue_clear(sk);
23243 + sock_vx_init(sk);
23244 + sock_nx_init(sk);
23248 @@ -1444,6 +1450,11 @@ static void __sk_destruct(struct rcu_hea
23249 put_pid(sk->sk_peer_pid);
23250 if (likely(sk->sk_net_refcnt))
23251 put_net(sock_net(sk));
23253 + clr_vx_info(&sk->sk_vx_info);
23255 + clr_nx_info(&sk->sk_nx_info);
23257 sk_prot_free(sk->sk_prot_creator, sk);
23260 @@ -1498,6 +1509,8 @@ struct sock *sk_clone_lock(const struct
23262 if (likely(newsk->sk_net_refcnt))
23263 get_net(sock_net(newsk));
23264 + sock_vx_init(newsk);
23265 + sock_nx_init(newsk);
23266 sk_node_init(&newsk->sk_node);
23267 sock_lock_init(newsk);
23268 bh_lock_sock(newsk);
23269 @@ -1568,6 +1581,12 @@ struct sock *sk_clone_lock(const struct
23271 atomic_set(&newsk->sk_refcnt, 2);
23273 + set_vx_info(&newsk->sk_vx_info, sk->sk_vx_info);
23274 + newsk->sk_xid = sk->sk_xid;
23275 + vx_sock_inc(newsk);
23276 + set_nx_info(&newsk->sk_nx_info, sk->sk_nx_info);
23277 + newsk->sk_nid = sk->sk_nid;
23280 * Increment the counter in the same struct proto as the master
23281 * sock (sk_refcnt_debug_inc uses newsk->sk_prot->socks, that
23282 @@ -2468,6 +2487,12 @@ void sock_init_data(struct socket *sock,
23284 sk->sk_stamp = ktime_set(-1L, 0);
23286 + set_vx_info(&sk->sk_vx_info, current_vx_info());
23287 + sk->sk_xid = vx_current_xid();
23289 + set_nx_info(&sk->sk_nx_info, current_nx_info());
23290 + sk->sk_nid = nx_current_nid();
23292 #ifdef CONFIG_NET_RX_BUSY_POLL
23293 sk->sk_napi_id = 0;
23294 sk->sk_ll_usec = sysctl_net_busy_read;
23295 diff -NurpP --minimal linux-4.9.82/net/ipv4/af_inet.c linux-4.9.82-vs2.3.9.7/net/ipv4/af_inet.c
23296 --- linux-4.9.82/net/ipv4/af_inet.c 2018-02-22 21:19:01.000000000 +0000
23297 +++ linux-4.9.82-vs2.3.9.7/net/ipv4/af_inet.c 2018-01-10 02:50:49.000000000 +0000
23298 @@ -303,10 +303,15 @@ lookup_protocol:
23302 + if ((protocol == IPPROTO_ICMP) &&
23303 + nx_capable(CAP_NET_RAW, NXC_RAW_ICMP))
23306 if (sock->type == SOCK_RAW && !kern &&
23307 !ns_capable(net->user_ns, CAP_NET_RAW))
23308 goto out_rcu_unlock;
23311 sock->ops = answer->ops;
23312 answer_prot = answer->prot;
23313 answer_flags = answer->flags;
23314 @@ -424,6 +429,7 @@ int inet_bind(struct socket *sock, struc
23315 struct sock *sk = sock->sk;
23316 struct inet_sock *inet = inet_sk(sk);
23317 struct net *net = sock_net(sk);
23318 + struct nx_v4_sock_addr nsa;
23319 unsigned short snum;
23321 u32 tb_id = RT_TABLE_LOCAL;
23322 @@ -449,7 +455,11 @@ int inet_bind(struct socket *sock, struc
23325 tb_id = l3mdev_fib_table_by_index(net, sk->sk_bound_dev_if) ? : tb_id;
23326 - chk_addr_ret = inet_addr_type_table(net, addr->sin_addr.s_addr, tb_id);
23327 + err = v4_map_sock_addr(inet, addr, &nsa);
23331 + chk_addr_ret = inet_addr_type_table(net, nsa.saddr, tb_id);
23333 /* Not specified by any standard per-se, however it breaks too
23334 * many applications when removed. It is unfortunate since
23335 @@ -461,7 +471,7 @@ int inet_bind(struct socket *sock, struc
23336 err = -EADDRNOTAVAIL;
23337 if (!net->ipv4.sysctl_ip_nonlocal_bind &&
23338 !(inet->freebind || inet->transparent) &&
23339 - addr->sin_addr.s_addr != htonl(INADDR_ANY) &&
23340 + nsa.saddr != htonl(INADDR_ANY) &&
23341 chk_addr_ret != RTN_LOCAL &&
23342 chk_addr_ret != RTN_MULTICAST &&
23343 chk_addr_ret != RTN_BROADCAST)
23344 @@ -487,7 +497,7 @@ int inet_bind(struct socket *sock, struc
23345 if (sk->sk_state != TCP_CLOSE || inet->inet_num)
23346 goto out_release_sock;
23348 - inet->inet_rcv_saddr = inet->inet_saddr = addr->sin_addr.s_addr;
23349 + v4_set_sock_addr(inet, &nsa);
23350 if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)
23351 inet->inet_saddr = 0; /* Use device */
23353 @@ -706,11 +716,13 @@ int inet_getname(struct socket *sock, st
23356 sin->sin_port = inet->inet_dport;
23357 - sin->sin_addr.s_addr = inet->inet_daddr;
23358 + sin->sin_addr.s_addr =
23359 + nx_map_sock_lback(sk->sk_nx_info, inet->inet_daddr);
23361 __be32 addr = inet->inet_rcv_saddr;
23363 addr = inet->inet_saddr;
23364 + addr = nx_map_sock_lback(sk->sk_nx_info, addr);
23365 sin->sin_port = inet->inet_sport;
23366 sin->sin_addr.s_addr = addr;
23368 @@ -894,6 +906,7 @@ static int inet_compat_ioctl(struct sock
23372 +#include <linux/vs_limit.h>
23374 const struct proto_ops inet_stream_ops = {
23376 diff -NurpP --minimal linux-4.9.82/net/ipv4/arp.c linux-4.9.82-vs2.3.9.7/net/ipv4/arp.c
23377 --- linux-4.9.82/net/ipv4/arp.c 2018-02-22 21:19:01.000000000 +0000
23378 +++ linux-4.9.82-vs2.3.9.7/net/ipv4/arp.c 2018-02-10 15:15:43.000000000 +0000
23379 @@ -1308,6 +1308,7 @@ static void arp_format_neigh_entry(struc
23380 struct net_device *dev = n->dev;
23381 int hatype = dev->type;
23383 + /* FIXME: check for network context */
23384 read_lock(&n->lock);
23385 /* Convert hardware address to XX:XX:XX:XX ... form. */
23386 #if IS_ENABLED(CONFIG_AX25)
23387 @@ -1339,6 +1340,7 @@ static void arp_format_pneigh_entry(stru
23388 int hatype = dev ? dev->type : 0;
23391 + /* FIXME: check for network context */
23392 sprintf(tbuf, "%pI4", n->key);
23393 seq_printf(seq, "%-16s 0x%-10x0x%-10x%s * %s\n",
23394 tbuf, hatype, ATF_PUBL | ATF_PERM, "00:00:00:00:00:00",
23395 diff -NurpP --minimal linux-4.9.82/net/ipv4/devinet.c linux-4.9.82-vs2.3.9.7/net/ipv4/devinet.c
23396 --- linux-4.9.82/net/ipv4/devinet.c 2018-02-22 21:19:01.000000000 +0000
23397 +++ linux-4.9.82-vs2.3.9.7/net/ipv4/devinet.c 2018-01-10 02:50:49.000000000 +0000
23398 @@ -538,6 +538,7 @@ struct in_device *inetdev_by_index(struc
23400 EXPORT_SYMBOL(inetdev_by_index);
23403 /* Called only from RTNL semaphored context. No locks. */
23405 struct in_ifaddr *inet_ifa_byprefix(struct in_device *in_dev, __be32 prefix,
23406 @@ -992,6 +993,8 @@ int devinet_ioctl(struct net *net, unsig
23408 in_dev = __in_dev_get_rtnl(dev);
23410 + struct nx_info *nxi = current_nx_info();
23412 if (tryaddrmatch) {
23413 /* Matthias Andree */
23414 /* compare label and address (4.4BSD style) */
23415 @@ -1000,6 +1003,8 @@ int devinet_ioctl(struct net *net, unsig
23416 This is checked above. */
23417 for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL;
23418 ifap = &ifa->ifa_next) {
23419 + if (!nx_v4_ifa_visible(nxi, ifa))
23421 if (!strcmp(ifr.ifr_name, ifa->ifa_label) &&
23422 sin_orig.sin_addr.s_addr ==
23424 @@ -1012,9 +1017,12 @@ int devinet_ioctl(struct net *net, unsig
23425 comparing just the label */
23427 for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL;
23428 - ifap = &ifa->ifa_next)
23429 + ifap = &ifa->ifa_next) {
23430 + if (!nx_v4_ifa_visible(nxi, ifa))
23432 if (!strcmp(ifr.ifr_name, ifa->ifa_label))
23438 @@ -1168,6 +1176,8 @@ static int inet_gifconf(struct net_devic
23441 for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) {
23442 + if (!nx_v4_ifa_visible(current_nx_info(), ifa))
23445 done += sizeof(ifr);
23447 @@ -1595,6 +1605,7 @@ static int inet_dump_ifaddr(struct sk_bu
23448 struct net_device *dev;
23449 struct in_device *in_dev;
23450 struct in_ifaddr *ifa;
23451 + struct sock *sk = skb->sk;
23452 struct hlist_head *head;
23455 @@ -1618,6 +1629,8 @@ static int inet_dump_ifaddr(struct sk_bu
23457 for (ifa = in_dev->ifa_list, ip_idx = 0; ifa;
23458 ifa = ifa->ifa_next, ip_idx++) {
23459 + if (sk && !nx_v4_ifa_visible(sk->sk_nx_info, ifa))
23461 if (ip_idx < s_ip_idx)
23463 if (inet_fill_ifaddr(skb, ifa,
23464 diff -NurpP --minimal linux-4.9.82/net/ipv4/fib_trie.c linux-4.9.82-vs2.3.9.7/net/ipv4/fib_trie.c
23465 --- linux-4.9.82/net/ipv4/fib_trie.c 2018-02-22 21:19:01.000000000 +0000
23466 +++ linux-4.9.82-vs2.3.9.7/net/ipv4/fib_trie.c 2018-01-10 02:50:49.000000000 +0000
23467 @@ -2617,6 +2617,7 @@ static int fib_route_seq_show(struct seq
23469 seq_setwidth(seq, 127);
23471 + /* FIXME: check for network context? */
23474 "%s\t%08X\t%08X\t%04X\t%d\t%u\t"
23475 diff -NurpP --minimal linux-4.9.82/net/ipv4/inet_connection_sock.c linux-4.9.82-vs2.3.9.7/net/ipv4/inet_connection_sock.c
23476 --- linux-4.9.82/net/ipv4/inet_connection_sock.c 2018-02-22 21:19:01.000000000 +0000
23477 +++ linux-4.9.82-vs2.3.9.7/net/ipv4/inet_connection_sock.c 2018-01-13 20:20:30.000000000 +0000
23479 #include <linux/module.h>
23480 #include <linux/jhash.h>
23482 +#include <net/addrconf.h>
23483 #include <net/inet_connection_sock.h>
23484 #include <net/inet_hashtables.h>
23485 #include <net/inet_timewait_sock.h>
23486 @@ -44,6 +45,7 @@ void inet_get_local_port_range(struct ne
23488 EXPORT_SYMBOL(inet_get_local_port_range);
23491 int inet_csk_bind_conflict(const struct sock *sk,
23492 const struct inet_bind_bucket *tb, bool relax)
23494 @@ -72,15 +74,13 @@ int inet_csk_bind_conflict(const struct
23495 (sk2->sk_state != TCP_TIME_WAIT &&
23496 !uid_eq(uid, sock_i_uid(sk2))))) {
23498 - if (!sk2->sk_rcv_saddr || !sk->sk_rcv_saddr ||
23499 - sk2->sk_rcv_saddr == sk->sk_rcv_saddr)
23500 + if (ipv4_rcv_saddr_equal(sk, sk2, true))
23503 if (!relax && reuse && sk2->sk_reuse &&
23504 sk2->sk_state != TCP_LISTEN) {
23506 - if (!sk2->sk_rcv_saddr || !sk->sk_rcv_saddr ||
23507 - sk2->sk_rcv_saddr == sk->sk_rcv_saddr)
23508 + if (ipv4_rcv_saddr_equal(sk, sk2, true))
23512 diff -NurpP --minimal linux-4.9.82/net/ipv4/inet_diag.c linux-4.9.82-vs2.3.9.7/net/ipv4/inet_diag.c
23513 --- linux-4.9.82/net/ipv4/inet_diag.c 2016-12-11 19:17:54.000000000 +0000
23514 +++ linux-4.9.82-vs2.3.9.7/net/ipv4/inet_diag.c 2018-01-10 02:50:49.000000000 +0000
23517 #include <linux/inet.h>
23518 #include <linux/stddef.h>
23519 +#include <linux/vs_network.h>
23520 +#include <linux/vs_inet.h>
23522 #include <linux/inet_diag.h>
23523 #include <linux/sock_diag.h>
23524 @@ -879,6 +881,8 @@ void inet_diag_dump_icsk(struct inet_has
23525 if (!net_eq(sock_net(sk), net))
23528 + if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
23533 @@ -941,6 +945,8 @@ skip_listen_ht:
23535 if (!net_eq(sock_net(sk), net))
23537 + if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
23541 state = (sk->sk_state == TCP_TIME_WAIT) ?
23542 diff -NurpP --minimal linux-4.9.82/net/ipv4/inet_hashtables.c linux-4.9.82-vs2.3.9.7/net/ipv4/inet_hashtables.c
23543 --- linux-4.9.82/net/ipv4/inet_hashtables.c 2018-02-22 21:19:01.000000000 +0000
23544 +++ linux-4.9.82-vs2.3.9.7/net/ipv4/inet_hashtables.c 2018-01-10 02:50:49.000000000 +0000
23546 #include <net/inet_connection_sock.h>
23547 #include <net/inet_hashtables.h>
23548 #include <net/secure_seq.h>
23549 +#include <net/route.h>
23550 #include <net/ip.h>
23551 #include <net/tcp.h>
23552 #include <net/sock_reuseport.h>
23553 @@ -186,6 +187,11 @@ static inline int compute_score(struct s
23554 if (rcv_saddr != daddr)
23558 + /* block non nx_info ips */
23559 + if (!v4_addr_in_nx_info(sk->sk_nx_info,
23560 + daddr, NXA_MASK_BIND))
23563 if (sk->sk_bound_dev_if || exact_dif) {
23564 if (sk->sk_bound_dev_if != dif)
23565 @@ -300,6 +306,7 @@ begin:
23571 * if the nulls value we got at the end of this lookup is
23572 * not the expected one, we must restart lookup.
23573 diff -NurpP --minimal linux-4.9.82/net/ipv4/netfilter.c linux-4.9.82-vs2.3.9.7/net/ipv4/netfilter.c
23574 --- linux-4.9.82/net/ipv4/netfilter.c 2018-02-22 21:19:02.000000000 +0000
23575 +++ linux-4.9.82-vs2.3.9.7/net/ipv4/netfilter.c 2018-01-10 02:50:49.000000000 +0000
23577 #include <linux/skbuff.h>
23578 #include <linux/gfp.h>
23579 #include <linux/export.h>
23580 -#include <net/route.h>
23581 +// #include <net/route.h>
23582 #include <net/xfrm.h>
23583 #include <net/ip.h>
23584 #include <net/netfilter/nf_queue.h>
23585 diff -NurpP --minimal linux-4.9.82/net/ipv4/raw.c linux-4.9.82-vs2.3.9.7/net/ipv4/raw.c
23586 --- linux-4.9.82/net/ipv4/raw.c 2018-02-22 21:19:02.000000000 +0000
23587 +++ linux-4.9.82-vs2.3.9.7/net/ipv4/raw.c 2018-01-10 02:50:49.000000000 +0000
23588 @@ -128,7 +128,7 @@ static struct sock *__raw_v4_lookup(stru
23590 if (net_eq(sock_net(sk), net) && inet->inet_num == num &&
23591 !(inet->inet_daddr && inet->inet_daddr != raddr) &&
23592 - !(inet->inet_rcv_saddr && inet->inet_rcv_saddr != laddr) &&
23593 + v4_sock_addr_match(sk->sk_nx_info, inet, laddr) &&
23594 !(sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif))
23595 goto found; /* gotcha */
23597 @@ -418,6 +418,12 @@ static int raw_send_hdrinc(struct sock *
23598 skb_transport_header(skb))->type);
23602 + if (!nx_check(0, VS_ADMIN) && !capable(CAP_NET_RAW) &&
23603 + sk->sk_nx_info &&
23604 + !v4_addr_in_nx_info(sk->sk_nx_info, iph->saddr, NXA_MASK_BIND))
23607 err = NF_HOOK(NFPROTO_IPV4, NF_INET_LOCAL_OUT,
23608 net, sk, skb, NULL, rt->dst.dev,
23610 @@ -623,6 +629,16 @@ static int raw_sendmsg(struct sock *sk,
23614 + if (sk->sk_nx_info) {
23615 + rt = ip_v4_find_src(sock_net(sk), sk->sk_nx_info, &fl4);
23616 + if (IS_ERR(rt)) {
23617 + err = PTR_ERR(rt);
23624 security_sk_classify_flow(sk, flowi4_to_flowi(&fl4));
23625 rt = ip_route_output_flow(net, &fl4, sk);
23627 @@ -701,17 +717,19 @@ static int raw_bind(struct sock *sk, str
23629 struct inet_sock *inet = inet_sk(sk);
23630 struct sockaddr_in *addr = (struct sockaddr_in *) uaddr;
23631 + struct nx_v4_sock_addr nsa = { 0 };
23635 if (sk->sk_state != TCP_CLOSE || addr_len < sizeof(struct sockaddr_in))
23637 - chk_addr_ret = inet_addr_type(sock_net(sk), addr->sin_addr.s_addr);
23638 + v4_map_sock_addr(inet, addr, &nsa);
23639 + chk_addr_ret = inet_addr_type(sock_net(sk), nsa.saddr);
23640 ret = -EADDRNOTAVAIL;
23641 - if (addr->sin_addr.s_addr && chk_addr_ret != RTN_LOCAL &&
23642 + if (nsa.saddr && chk_addr_ret != RTN_LOCAL &&
23643 chk_addr_ret != RTN_MULTICAST && chk_addr_ret != RTN_BROADCAST)
23645 - inet->inet_rcv_saddr = inet->inet_saddr = addr->sin_addr.s_addr;
23646 + v4_set_sock_addr(inet, &nsa);
23647 if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)
23648 inet->inet_saddr = 0; /* Use device */
23650 @@ -760,7 +778,8 @@ static int raw_recvmsg(struct sock *sk,
23651 /* Copy the address. */
23653 sin->sin_family = AF_INET;
23654 - sin->sin_addr.s_addr = ip_hdr(skb)->saddr;
23655 + sin->sin_addr.s_addr =
23656 + nx_map_sock_lback(sk->sk_nx_info, ip_hdr(skb)->saddr);
23658 memset(&sin->sin_zero, 0, sizeof(sin->sin_zero));
23659 *addr_len = sizeof(*sin);
23660 @@ -956,7 +975,8 @@ static struct sock *raw_get_first(struct
23661 for (state->bucket = 0; state->bucket < RAW_HTABLE_SIZE;
23663 sk_for_each(sk, &state->h->ht[state->bucket])
23664 - if (sock_net(sk) == seq_file_net(seq))
23665 + if ((sock_net(sk) == seq_file_net(seq)) &&
23666 + nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
23670 @@ -972,7 +992,8 @@ static struct sock *raw_get_next(struct
23674 - } while (sk && sock_net(sk) != seq_file_net(seq));
23675 + } while (sk && ((sock_net(sk) != seq_file_net(seq)) ||
23676 + !nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)));
23678 if (!sk && ++state->bucket < RAW_HTABLE_SIZE) {
23679 sk = sk_head(&state->h->ht[state->bucket]);
23680 diff -NurpP --minimal linux-4.9.82/net/ipv4/route.c linux-4.9.82-vs2.3.9.7/net/ipv4/route.c
23681 --- linux-4.9.82/net/ipv4/route.c 2018-02-22 21:19:02.000000000 +0000
23682 +++ linux-4.9.82-vs2.3.9.7/net/ipv4/route.c 2018-01-10 02:50:49.000000000 +0000
23683 @@ -2238,7 +2238,7 @@ struct rtable *__ip_route_output_key_has
23686 if (fl4->flowi4_oif) {
23687 - dev_out = dev_get_by_index_rcu(net, fl4->flowi4_oif);
23688 + dev_out = dev_get_by_index_real_rcu(net, fl4->flowi4_oif);
23689 rth = ERR_PTR(-ENODEV);
23692 diff -NurpP --minimal linux-4.9.82/net/ipv4/tcp.c linux-4.9.82-vs2.3.9.7/net/ipv4/tcp.c
23693 --- linux-4.9.82/net/ipv4/tcp.c 2018-02-22 21:19:02.000000000 +0000
23694 +++ linux-4.9.82-vs2.3.9.7/net/ipv4/tcp.c 2018-02-22 21:31:40.000000000 +0000
23695 @@ -269,6 +269,7 @@
23696 #include <linux/err.h>
23697 #include <linux/time.h>
23698 #include <linux/slab.h>
23699 +#include <linux/in.h>
23701 #include <net/icmp.h>
23702 #include <net/inet_common.h>
23703 diff -NurpP --minimal linux-4.9.82/net/ipv4/tcp_ipv4.c linux-4.9.82-vs2.3.9.7/net/ipv4/tcp_ipv4.c
23704 --- linux-4.9.82/net/ipv4/tcp_ipv4.c 2018-02-22 21:19:02.000000000 +0000
23705 +++ linux-4.9.82-vs2.3.9.7/net/ipv4/tcp_ipv4.c 2018-02-09 17:48:59.000000000 +0000
23706 @@ -1927,8 +1927,12 @@ get_head:
23709 sk_for_each_from(sk) {
23710 + vxdprintk(VXD_CBIT(net, 6), "sk: %p [#%d] (from %d)",
23711 + sk, sk->sk_nid, nx_current_nid());
23712 if (!net_eq(sock_net(sk), net))
23714 + if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
23716 if (sk->sk_family == st->family)
23719 @@ -1982,6 +1986,11 @@ static void *established_get_first(struc
23721 spin_lock_bh(lock);
23722 sk_nulls_for_each(sk, node, &tcp_hashinfo.ehash[st->bucket].chain) {
23723 + vxdprintk(VXD_CBIT(net, 6),
23724 + "sk,egf: %p [#%d] (from %d)",
23725 + sk, sk->sk_nid, nx_current_nid());
23726 + if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
23728 if (sk->sk_family != st->family ||
23729 !net_eq(sock_net(sk), net)) {
23731 @@ -2008,6 +2017,11 @@ static void *established_get_next(struct
23732 sk = sk_nulls_next(sk);
23734 sk_nulls_for_each_from(sk, node) {
23735 + vxdprintk(VXD_CBIT(net, 6),
23736 + "sk,egn: %p [#%d] (from %d)",
23737 + sk, sk->sk_nid, nx_current_nid());
23738 + if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
23740 if (sk->sk_family == st->family && net_eq(sock_net(sk), net))
23743 @@ -2199,9 +2213,9 @@ static void get_openreq4(const struct re
23744 seq_printf(f, "%4d: %08X:%04X %08X:%04X"
23745 " %02X %08X:%08X %02X:%08lX %08X %5u %8d %u %d %pK",
23747 - ireq->ir_loc_addr,
23748 + nx_map_sock_lback(current_nx_info(), ireq->ir_loc_addr),
23750 - ireq->ir_rmt_addr,
23751 + nx_map_sock_lback(current_nx_info(), ireq->ir_rmt_addr),
23752 ntohs(ireq->ir_rmt_port),
23754 0, 0, /* could print option size, but that is af dependent. */
23755 @@ -2224,8 +2238,8 @@ static void get_tcp4_sock(struct sock *s
23756 const struct inet_connection_sock *icsk = inet_csk(sk);
23757 const struct inet_sock *inet = inet_sk(sk);
23758 const struct fastopen_queue *fastopenq = &icsk->icsk_accept_queue.fastopenq;
23759 - __be32 dest = inet->inet_daddr;
23760 - __be32 src = inet->inet_rcv_saddr;
23761 + __be32 dest = nx_map_sock_lback(current_nx_info(), inet->inet_daddr);
23762 + __be32 src = nx_map_sock_lback(current_nx_info(), inet->inet_rcv_saddr);
23763 __u16 destp = ntohs(inet->inet_dport);
23764 __u16 srcp = ntohs(inet->inet_sport);
23766 @@ -2284,8 +2298,8 @@ static void get_timewait4_sock(const str
23770 - dest = tw->tw_daddr;
23771 - src = tw->tw_rcv_saddr;
23772 + dest = nx_map_sock_lback(current_nx_info(), tw->tw_daddr);
23773 + src = nx_map_sock_lback(current_nx_info(), tw->tw_rcv_saddr);
23774 destp = ntohs(tw->tw_dport);
23775 srcp = ntohs(tw->tw_sport);
23777 diff -NurpP --minimal linux-4.9.82/net/ipv4/tcp_minisocks.c linux-4.9.82-vs2.3.9.7/net/ipv4/tcp_minisocks.c
23778 --- linux-4.9.82/net/ipv4/tcp_minisocks.c 2018-02-22 21:19:02.000000000 +0000
23779 +++ linux-4.9.82-vs2.3.9.7/net/ipv4/tcp_minisocks.c 2018-01-10 02:50:49.000000000 +0000
23781 #include <linux/slab.h>
23782 #include <linux/sysctl.h>
23783 #include <linux/workqueue.h>
23784 +#include <linux/vs_limit.h>
23785 +#include <linux/vs_socket.h>
23786 +#include <linux/vs_context.h>
23787 #include <net/tcp.h>
23788 #include <net/inet_common.h>
23789 #include <net/xfrm.h>
23790 @@ -285,6 +288,11 @@ void tcp_time_wait(struct sock *sk, int
23791 tcptw->tw_ts_offset = tp->tsoffset;
23792 tcptw->tw_last_oow_ack_time = 0;
23794 + tw->tw_xid = sk->sk_xid;
23795 + tw->tw_vx_info = NULL;
23796 + tw->tw_nid = sk->sk_nid;
23797 + tw->tw_nx_info = NULL;
23799 #if IS_ENABLED(CONFIG_IPV6)
23800 if (tw->tw_family == PF_INET6) {
23801 struct ipv6_pinfo *np = inet6_sk(sk);
23802 diff -NurpP --minimal linux-4.9.82/net/ipv4/udp.c linux-4.9.82-vs2.3.9.7/net/ipv4/udp.c
23803 --- linux-4.9.82/net/ipv4/udp.c 2018-02-22 21:19:02.000000000 +0000
23804 +++ linux-4.9.82-vs2.3.9.7/net/ipv4/udp.c 2018-01-13 20:43:44.000000000 +0000
23805 @@ -361,13 +361,27 @@ int ipv4_rcv_saddr_equal(const struct so
23806 bool match_wildcard)
23808 struct inet_sock *inet1 = inet_sk(sk1), *inet2 = inet_sk(sk2);
23809 + __be32 sk1_rcv_saddr = inet1->inet_rcv_saddr,
23810 + sk2_rcv_saddr = inet2->inet_rcv_saddr;
23812 - if (!ipv6_only_sock(sk2)) {
23813 - if (inet1->inet_rcv_saddr == inet2->inet_rcv_saddr)
23815 - if (!inet1->inet_rcv_saddr || !inet2->inet_rcv_saddr)
23816 - return match_wildcard;
23818 + if (ipv6_only_sock(sk2))
23821 + if (sk1_rcv_saddr && sk2_rcv_saddr && sk1_rcv_saddr == sk2_rcv_saddr)
23824 + if (match_wildcard) {
23825 + if (!sk2_rcv_saddr && !sk1_rcv_saddr)
23826 + return nx_v4_addr_conflict(sk1->sk_nx_info, sk2->sk_nx_info);
23828 + if (!sk2_rcv_saddr && sk1_rcv_saddr)
23829 + return v4_addr_in_nx_info(sk2->sk_nx_info,
23830 + sk1_rcv_saddr, NXA_MASK_BIND);
23832 + if (!sk1_rcv_saddr && sk2_rcv_saddr)
23833 + return v4_addr_in_nx_info(sk1->sk_nx_info,
23834 + sk2_rcv_saddr, NXA_MASK_BIND);
23839 @@ -408,6 +422,11 @@ static int compute_score(struct sock *sk
23840 if (inet->inet_rcv_saddr != daddr)
23844 + /* block non nx_info ips */
23845 + if (!v4_addr_in_nx_info(sk->sk_nx_info,
23846 + daddr, NXA_MASK_BIND))
23850 if (inet->inet_daddr) {
23851 @@ -483,6 +502,7 @@ static struct sock *udp4_lib_lookup2(str
23856 /* UDP is nearly always wildcards out the wazoo, it makes no sense to try
23857 * harder than this. -DaveM
23859 @@ -603,7 +623,7 @@ static inline bool __udp_is_mcast_sock(s
23860 udp_sk(sk)->udp_port_hash != hnum ||
23861 (inet->inet_daddr && inet->inet_daddr != rmt_addr) ||
23862 (inet->inet_dport != rmt_port && inet->inet_dport) ||
23863 - (inet->inet_rcv_saddr && inet->inet_rcv_saddr != loc_addr) ||
23864 + !v4_sock_addr_match(sk->sk_nx_info, inet, loc_addr) ||
23865 ipv6_only_sock(sk) ||
23866 (sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif))
23868 @@ -1018,6 +1038,16 @@ int udp_sendmsg(struct sock *sk, struct
23870 faddr, saddr, dport, inet->inet_sport);
23872 + if (sk->sk_nx_info) {
23873 + rt = ip_v4_find_src(net, sk->sk_nx_info, fl4);
23874 + if (IS_ERR(rt)) {
23875 + err = PTR_ERR(rt);
23882 security_sk_classify_flow(sk, flowi4_to_flowi(fl4));
23883 rt = ip_route_output_flow(net, fl4, sk);
23885 @@ -1314,7 +1344,8 @@ try_again:
23887 sin->sin_family = AF_INET;
23888 sin->sin_port = udp_hdr(skb)->source;
23889 - sin->sin_addr.s_addr = ip_hdr(skb)->saddr;
23890 + sin->sin_addr.s_addr = nx_map_sock_lback(
23891 + skb->sk->sk_nx_info, ip_hdr(skb)->saddr);
23892 memset(sin->sin_zero, 0, sizeof(sin->sin_zero));
23893 *addr_len = sizeof(*sin);
23895 @@ -2260,6 +2291,8 @@ static struct sock *udp_get_first(struct
23896 sk_for_each(sk, &hslot->head) {
23897 if (!net_eq(sock_net(sk), net))
23899 + if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
23901 if (sk->sk_family == state->family)
23904 @@ -2277,7 +2310,9 @@ static struct sock *udp_get_next(struct
23908 - } while (sk && (!net_eq(sock_net(sk), net) || sk->sk_family != state->family));
23909 + } while (sk && (!net_eq(sock_net(sk), net) ||
23910 + sk->sk_family != state->family ||
23911 + !nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)));
23914 if (state->bucket <= state->udp_table->mask)
23915 @@ -2373,8 +2408,8 @@ static void udp4_format_sock(struct sock
23918 struct inet_sock *inet = inet_sk(sp);
23919 - __be32 dest = inet->inet_daddr;
23920 - __be32 src = inet->inet_rcv_saddr;
23921 + __be32 dest = nx_map_sock_lback(current_nx_info(), inet->inet_daddr);
23922 + __be32 src = nx_map_sock_lback(current_nx_info(), inet->inet_rcv_saddr);
23923 __u16 destp = ntohs(inet->inet_dport);
23924 __u16 srcp = ntohs(inet->inet_sport);
23926 diff -NurpP --minimal linux-4.9.82/net/ipv6/addrconf.c linux-4.9.82-vs2.3.9.7/net/ipv6/addrconf.c
23927 --- linux-4.9.82/net/ipv6/addrconf.c 2018-02-22 21:19:02.000000000 +0000
23928 +++ linux-4.9.82-vs2.3.9.7/net/ipv6/addrconf.c 2018-01-13 22:09:44.000000000 +0000
23930 #include <linux/proc_fs.h>
23931 #include <linux/seq_file.h>
23932 #include <linux/export.h>
23933 +#include <linux/vs_network.h>
23935 /* Set to 3 to get tracing... */
23936 #define ACONF_DEBUG 2
23937 @@ -1494,7 +1495,8 @@ static int __ipv6_dev_get_saddr(struct n
23938 struct ipv6_saddr_dst *dst,
23939 struct inet6_dev *idev,
23940 struct ipv6_saddr_score *scores,
23943 + struct nx_info *nxi)
23945 struct ipv6_saddr_score *score = &scores[1 - hiscore_idx], *hiscore = &scores[hiscore_idx];
23947 @@ -1524,6 +1526,8 @@ static int __ipv6_dev_get_saddr(struct n
23951 + if (!v6_addr_in_nx_info(nxi, &score->ifa->addr, -1))
23955 bitmap_zero(score->scorebits, IPV6_SADDR_RULE_MAX);
23956 @@ -1574,26 +1578,27 @@ static int ipv6_get_saddr_master(struct
23957 const struct net_device *master,
23958 struct ipv6_saddr_dst *dst,
23959 struct ipv6_saddr_score *scores,
23962 + struct nx_info *nxi)
23964 struct inet6_dev *idev;
23966 idev = __in6_dev_get(dst_dev);
23968 - hiscore_idx = __ipv6_dev_get_saddr(net, dst, idev,
23969 - scores, hiscore_idx);
23970 + hiscore_idx = __ipv6_dev_get_saddr(net, dst,
23971 + idev, scores, hiscore_idx, nxi);
23973 idev = __in6_dev_get(master);
23975 - hiscore_idx = __ipv6_dev_get_saddr(net, dst, idev,
23976 - scores, hiscore_idx);
23977 + hiscore_idx = __ipv6_dev_get_saddr(net, dst,
23978 + idev, scores, hiscore_idx, nxi);
23980 return hiscore_idx;
23983 int ipv6_dev_get_saddr(struct net *net, const struct net_device *dst_dev,
23984 const struct in6_addr *daddr, unsigned int prefs,
23985 - struct in6_addr *saddr)
23986 + struct in6_addr *saddr, struct nx_info *nxi)
23988 struct ipv6_saddr_score scores[2], *hiscore;
23989 struct ipv6_saddr_dst dst;
23990 @@ -1642,7 +1647,8 @@ int ipv6_dev_get_saddr(struct net *net,
23992 if (use_oif_addr) {
23994 - hiscore_idx = __ipv6_dev_get_saddr(net, &dst, idev, scores, hiscore_idx);
23995 + hiscore_idx = __ipv6_dev_get_saddr(net,
23996 + &dst, idev, scores, hiscore_idx, nxi);
23998 const struct net_device *master;
23999 int master_idx = 0;
24000 @@ -1656,8 +1662,8 @@ int ipv6_dev_get_saddr(struct net *net,
24001 master_idx = master->ifindex;
24003 hiscore_idx = ipv6_get_saddr_master(net, dst_dev,
24005 - scores, hiscore_idx);
24006 + master, &dst, scores,
24007 + hiscore_idx, nxi);
24009 if (scores[hiscore_idx].ifa)
24011 @@ -1672,7 +1678,8 @@ int ipv6_dev_get_saddr(struct net *net,
24012 idev = __in6_dev_get(dev);
24015 - hiscore_idx = __ipv6_dev_get_saddr(net, &dst, idev, scores, hiscore_idx);
24016 + hiscore_idx = __ipv6_dev_get_saddr(net,
24017 + &dst, idev, scores, hiscore_idx, nxi);
24021 @@ -4128,7 +4135,10 @@ static void if6_seq_stop(struct seq_file
24022 static int if6_seq_show(struct seq_file *seq, void *v)
24024 struct inet6_ifaddr *ifp = (struct inet6_ifaddr *)v;
24025 - seq_printf(seq, "%pi6 %02x %02x %02x %02x %8s\n",
24027 + if (nx_check(0, VS_ADMIN|VS_WATCH) ||
24028 + v6_addr_in_nx_info(current_nx_info(), &ifp->addr, -1))
24029 + seq_printf(seq, "%pi6 %02x %02x %02x %02x %8s\n",
24031 ifp->idev->dev->ifindex,
24033 @@ -4712,6 +4722,11 @@ static int in6_dump_addrs(struct inet6_d
24034 struct ifacaddr6 *ifaca;
24036 int ip_idx = *p_ip_idx;
24037 + struct nx_info *nxi = skb->sk ? skb->sk->sk_nx_info : NULL;
24039 + /* disable ipv6 on non v6 guests */
24040 + if (nxi && !nx_info_has_v6(nxi))
24043 read_lock_bh(&idev->lock);
24045 @@ -4722,6 +4737,8 @@ static int in6_dump_addrs(struct inet6_d
24046 list_for_each_entry(ifa, &idev->addr_list, if_list) {
24047 if (++ip_idx < s_ip_idx)
24049 + if (!v6_addr_in_nx_info(nxi, &ifa->addr, -1))
24051 err = inet6_fill_ifaddr(skb, ifa,
24052 NETLINK_CB(cb->skb).portid,
24053 cb->nlh->nlmsg_seq,
24054 @@ -4739,6 +4756,8 @@ static int in6_dump_addrs(struct inet6_d
24055 ifmca = ifmca->next, ip_idx++) {
24056 if (ip_idx < s_ip_idx)
24058 + if (!v6_addr_in_nx_info(nxi, &ifmca->mca_addr, -1))
24060 err = inet6_fill_ifmcaddr(skb, ifmca,
24061 NETLINK_CB(cb->skb).portid,
24062 cb->nlh->nlmsg_seq,
24063 @@ -4754,6 +4773,8 @@ static int in6_dump_addrs(struct inet6_d
24064 ifaca = ifaca->aca_next, ip_idx++) {
24065 if (ip_idx < s_ip_idx)
24067 + if (!v6_addr_in_nx_info(nxi, &ifaca->aca_addr, -1))
24069 err = inet6_fill_ifacaddr(skb, ifaca,
24070 NETLINK_CB(cb->skb).portid,
24071 cb->nlh->nlmsg_seq,
24072 @@ -4782,6 +4803,10 @@ static int inet6_dump_addr(struct sk_buf
24073 struct inet6_dev *idev;
24074 struct hlist_head *head;
24076 + /* FIXME: maybe disable ipv6 on non v6 guests?
24077 + if (skb->sk && skb->sk->sk_vx_info)
24078 + return skb->len; */
24081 s_idx = idx = cb->args[1];
24082 s_ip_idx = ip_idx = cb->args[2];
24083 @@ -5300,6 +5325,7 @@ static int inet6_dump_ifinfo(struct sk_b
24084 struct net_device *dev;
24085 struct inet6_dev *idev;
24086 struct hlist_head *head;
24087 + struct nx_info *nxi = skb->sk ? skb->sk->sk_nx_info : NULL;
24090 s_idx = cb->args[1];
24091 @@ -5311,6 +5337,8 @@ static int inet6_dump_ifinfo(struct sk_b
24092 hlist_for_each_entry_rcu(dev, head, index_hlist) {
24095 + if (!v6_dev_in_nx_info(dev, nxi))
24097 idev = __in6_dev_get(dev);
24100 diff -NurpP --minimal linux-4.9.82/net/ipv6/af_inet6.c linux-4.9.82-vs2.3.9.7/net/ipv6/af_inet6.c
24101 --- linux-4.9.82/net/ipv6/af_inet6.c 2018-02-22 21:19:02.000000000 +0000
24102 +++ linux-4.9.82-vs2.3.9.7/net/ipv6/af_inet6.c 2018-02-22 21:31:40.000000000 +0000
24104 #include <linux/netdevice.h>
24105 #include <linux/icmpv6.h>
24106 #include <linux/netfilter_ipv6.h>
24107 +#include <linux/vs_inet.h>
24109 #include <net/ip.h>
24110 #include <net/ipv6.h>
24111 @@ -167,10 +168,13 @@ lookup_protocol:
24115 + if ((protocol == IPPROTO_ICMPV6) &&
24116 + nx_capable(CAP_NET_RAW, NXC_RAW_ICMP))
24118 if (sock->type == SOCK_RAW && !kern &&
24119 !ns_capable(net->user_ns, CAP_NET_RAW))
24120 goto out_rcu_unlock;
24123 sock->ops = answer->ops;
24124 answer_prot = answer->prot;
24125 answer_flags = answer->flags;
24126 @@ -272,6 +276,7 @@ int inet6_bind(struct socket *sock, stru
24127 struct inet_sock *inet = inet_sk(sk);
24128 struct ipv6_pinfo *np = inet6_sk(sk);
24129 struct net *net = sock_net(sk);
24130 + struct nx_v6_sock_addr nsa;
24132 unsigned short snum;
24133 bool saved_ipv6only;
24134 @@ -288,6 +293,10 @@ int inet6_bind(struct socket *sock, stru
24135 if (addr->sin6_family != AF_INET6)
24136 return -EAFNOSUPPORT;
24138 + err = v6_map_sock_addr(inet, addr, &nsa);
24142 addr_type = ipv6_addr_type(&addr->sin6_addr);
24143 if ((addr_type & IPV6_ADDR_MULTICAST) && sock->type == SOCK_STREAM)
24145 @@ -328,6 +337,10 @@ int inet6_bind(struct socket *sock, stru
24146 err = -EADDRNOTAVAIL;
24149 + if (!v4_addr_in_nx_info(sk->sk_nx_info, v4addr, NXA_MASK_BIND)) {
24150 + err = -EADDRNOTAVAIL;
24154 if (addr_type != IPV6_ADDR_ANY) {
24155 struct net_device *dev = NULL;
24156 @@ -354,6 +367,11 @@ int inet6_bind(struct socket *sock, stru
24160 + if (!v6_addr_in_nx_info(sk->sk_nx_info, &addr->sin6_addr, -1)) {
24161 + err = -EADDRNOTAVAIL;
24165 /* ipv4 addr of the socket is invalid. Only the
24166 * unspecified and mapped address have a v4 equivalent.
24168 @@ -371,6 +389,9 @@ int inet6_bind(struct socket *sock, stru
24172 + /* what's that for? */
24173 + v6_set_sock_addr(inet, &nsa);
24175 inet->inet_rcv_saddr = v4addr;
24176 inet->inet_saddr = v4addr;
24178 @@ -477,9 +498,11 @@ int inet6_getname(struct socket *sock, s
24180 sin->sin6_port = inet->inet_dport;
24181 sin->sin6_addr = sk->sk_v6_daddr;
24182 + /* FIXME: remap lback? */
24184 sin->sin6_flowinfo = np->flow_label;
24186 + /* FIXME: remap lback? */
24187 if (ipv6_addr_any(&sk->sk_v6_rcv_saddr))
24188 sin->sin6_addr = np->saddr;
24190 diff -NurpP --minimal linux-4.9.82/net/ipv6/datagram.c linux-4.9.82-vs2.3.9.7/net/ipv6/datagram.c
24191 --- linux-4.9.82/net/ipv6/datagram.c 2018-02-22 21:19:02.000000000 +0000
24192 +++ linux-4.9.82-vs2.3.9.7/net/ipv6/datagram.c 2018-01-10 02:50:49.000000000 +0000
24193 @@ -777,7 +777,7 @@ int ip6_datagram_send_ctl(struct net *ne
24196 if (fl6->flowi6_oif) {
24197 - dev = dev_get_by_index_rcu(net, fl6->flowi6_oif);
24198 + dev = dev_get_by_index_real_rcu(net, fl6->flowi6_oif);
24202 diff -NurpP --minimal linux-4.9.82/net/ipv6/fib6_rules.c linux-4.9.82-vs2.3.9.7/net/ipv6/fib6_rules.c
24203 --- linux-4.9.82/net/ipv6/fib6_rules.c 2018-02-22 21:19:02.000000000 +0000
24204 +++ linux-4.9.82-vs2.3.9.7/net/ipv6/fib6_rules.c 2018-01-10 02:50:49.000000000 +0000
24205 @@ -102,7 +102,7 @@ static int fib6_rule_action(struct fib_r
24206 ip6_dst_idev(&rt->dst)->dev,
24208 rt6_flags2srcprefs(flags),
24212 if (!ipv6_prefix_equal(&saddr, &r->src.addr,
24214 diff -NurpP --minimal linux-4.9.82/net/ipv6/inet6_hashtables.c linux-4.9.82-vs2.3.9.7/net/ipv6/inet6_hashtables.c
24215 --- linux-4.9.82/net/ipv6/inet6_hashtables.c 2016-12-11 19:17:54.000000000 +0000
24216 +++ linux-4.9.82-vs2.3.9.7/net/ipv6/inet6_hashtables.c 2018-01-13 00:26:28.000000000 +0000
24219 #include <linux/module.h>
24220 #include <linux/random.h>
24221 +#include <linux/vs_inet6.h>
24223 #include <net/addrconf.h>
24224 #include <net/inet_connection_sock.h>
24225 @@ -108,6 +109,9 @@ static inline int compute_score(struct s
24226 if (!ipv6_addr_equal(&sk->sk_v6_rcv_saddr, daddr))
24230 + if (!v6_addr_in_nx_info(sk->sk_nx_info, daddr, -1))
24233 if (sk->sk_bound_dev_if || exact_dif) {
24234 if (sk->sk_bound_dev_if != dif)
24235 @@ -282,39 +286,71 @@ EXPORT_SYMBOL_GPL(inet6_hash);
24236 * IPV6_ADDR_ANY only equals to IPV6_ADDR_ANY,
24237 * and 0.0.0.0 equals to 0.0.0.0 only
24239 -int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2,
24240 +int ipv6_rcv_saddr_equal(const struct sock *sk1, const struct sock *sk2,
24241 bool match_wildcard)
24243 + const struct in6_addr *sk1_rcv_saddr6 = inet6_rcv_saddr(sk1);
24244 const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2);
24245 + __be32 sk1_rcv_saddr = sk1->sk_rcv_saddr;
24246 + __be32 sk2_rcv_saddr = sk2->sk_rcv_saddr;
24247 + int sk1_ipv6only = inet_v6_ipv6only(sk1);
24248 int sk2_ipv6only = inet_v6_ipv6only(sk2);
24249 - int addr_type = ipv6_addr_type(&sk->sk_v6_rcv_saddr);
24250 + int addr_type1 = ipv6_addr_type(sk1_rcv_saddr6);
24251 int addr_type2 = sk2_rcv_saddr6 ? ipv6_addr_type(sk2_rcv_saddr6) : IPV6_ADDR_MAPPED;
24254 + /* if one is mapped and the other is ipv6only exit early */
24255 + if (addr_type1 == IPV6_ADDR_MAPPED && sk2_ipv6only)
24258 + if (addr_type2 == IPV6_ADDR_MAPPED && sk1_ipv6only)
24261 /* if both are mapped, treat as IPv4 */
24262 - if (addr_type == IPV6_ADDR_MAPPED && addr_type2 == IPV6_ADDR_MAPPED) {
24263 - if (!sk2_ipv6only) {
24264 - if (sk->sk_rcv_saddr == sk2->sk_rcv_saddr)
24266 - if (!sk->sk_rcv_saddr || !sk2->sk_rcv_saddr)
24267 - return match_wildcard;
24269 + if (addr_type1 == IPV6_ADDR_MAPPED && addr_type2 == IPV6_ADDR_MAPPED) {
24270 + if (sk1_rcv_saddr == sk2_rcv_saddr)
24272 + if ((!sk1_rcv_saddr || !sk2_rcv_saddr) && match_wildcard)
24277 - if (addr_type == IPV6_ADDR_ANY && addr_type2 == IPV6_ADDR_ANY)
24279 + /* if both are wildcards, check for overlap */
24280 + if (addr_type1 == IPV6_ADDR_ANY && addr_type2 == IPV6_ADDR_ANY)
24281 + return nx_v6_addr_conflict(sk1->sk_nx_info, sk2->sk_nx_info);
24283 - if (addr_type2 == IPV6_ADDR_ANY && match_wildcard &&
24284 - !(sk2_ipv6only && addr_type == IPV6_ADDR_MAPPED))
24285 + /* if both are valid ipv6 addresses, mapped handled above */
24286 + if (addr_type1 != IPV6_ADDR_ANY && addr_type2 != IPV6_ADDR_ANY &&
24287 + sk2_rcv_saddr6 && ipv6_addr_equal(sk1_rcv_saddr6, sk2_rcv_saddr6))
24290 - if (addr_type == IPV6_ADDR_ANY && match_wildcard &&
24291 - !(ipv6_only_sock(sk) && addr_type2 == IPV6_ADDR_MAPPED))
24293 + if (addr_type1 == IPV6_ADDR_ANY && match_wildcard) {
24294 + /* ipv6only case handled above */
24295 + if (addr_type2 == IPV6_ADDR_MAPPED)
24296 + return v4_addr_in_nx_info(sk1->sk_nx_info, sk2_rcv_saddr, -1);
24298 + return v6_addr_in_nx_info(sk1->sk_nx_info, sk2_rcv_saddr6, -1);
24301 - if (sk2_rcv_saddr6 &&
24302 - ipv6_addr_equal(&sk->sk_v6_rcv_saddr, sk2_rcv_saddr6))
24304 + if (addr_type2 == IPV6_ADDR_ANY && match_wildcard) {
24305 + /* ipv6only case handled above */
24306 + if (addr_type1 == IPV6_ADDR_MAPPED)
24307 + return v4_addr_in_nx_info(sk2->sk_nx_info, sk1_rcv_saddr, -1);
24309 + return v6_addr_in_nx_info(sk2->sk_nx_info, sk1_rcv_saddr6, -1);
24315 + if (!sk1_rcv_saddr && !sk2_rcv_saddr)
24316 + return nx_v4_addr_conflict(sk1->sk_nx_info, sk2->sk_nx_info);
24318 + if (!sk2_rcv_saddr)
24319 + return v4_addr_in_nx_info(sk1->sk_nx_info, sk2_rcv_saddr, -1);
24321 + if (!sk1_rcv_saddr)
24322 + return v4_addr_in_nx_info(sk2->sk_nx_info, sk1_rcv_saddr, -1);
24326 diff -NurpP --minimal linux-4.9.82/net/ipv6/ip6_fib.c linux-4.9.82-vs2.3.9.7/net/ipv6/ip6_fib.c
24327 --- linux-4.9.82/net/ipv6/ip6_fib.c 2018-02-22 21:19:02.000000000 +0000
24328 +++ linux-4.9.82-vs2.3.9.7/net/ipv6/ip6_fib.c 2018-01-10 02:50:49.000000000 +0000
24329 @@ -1976,6 +1976,7 @@ static int ipv6_route_seq_show(struct se
24330 struct rt6_info *rt = v;
24331 struct ipv6_route_iter *iter = seq->private;
24333 + /* FIXME: check for network context? */
24334 seq_printf(seq, "%pi6 %02x ", &rt->rt6i_dst.addr, rt->rt6i_dst.plen);
24336 #ifdef CONFIG_IPV6_SUBTREES
24337 diff -NurpP --minimal linux-4.9.82/net/ipv6/ip6_output.c linux-4.9.82-vs2.3.9.7/net/ipv6/ip6_output.c
24338 --- linux-4.9.82/net/ipv6/ip6_output.c 2018-02-22 21:19:02.000000000 +0000
24339 +++ linux-4.9.82-vs2.3.9.7/net/ipv6/ip6_output.c 2018-02-10 15:15:43.000000000 +0000
24340 @@ -956,7 +956,8 @@ static int ip6_dst_lookup_tail(struct ne
24341 rt = (*dst)->error ? NULL : (struct rt6_info *)*dst;
24342 err = ip6_route_get_saddr(net, rt, &fl6->daddr,
24343 sk ? inet6_sk(sk)->srcprefs : 0,
24346 + sk ? sk->sk_nx_info : NULL);
24348 goto out_err_release;
24350 diff -NurpP --minimal linux-4.9.82/net/ipv6/ip6_tunnel.c linux-4.9.82-vs2.3.9.7/net/ipv6/ip6_tunnel.c
24351 --- linux-4.9.82/net/ipv6/ip6_tunnel.c 2018-02-22 21:19:02.000000000 +0000
24352 +++ linux-4.9.82-vs2.3.9.7/net/ipv6/ip6_tunnel.c 2018-01-25 00:21:32.000000000 +0000
24353 @@ -1109,7 +1109,7 @@ route_lookup:
24355 if (t->parms.collect_md &&
24356 ipv6_dev_get_saddr(net, ip6_dst_idev(dst)->dev,
24357 - &fl6->daddr, 0, &fl6->saddr))
24358 + &fl6->daddr, 0, &fl6->saddr, NULL))
24359 goto tx_err_link_failure;
24362 diff -NurpP --minimal linux-4.9.82/net/ipv6/ndisc.c linux-4.9.82-vs2.3.9.7/net/ipv6/ndisc.c
24363 --- linux-4.9.82/net/ipv6/ndisc.c 2016-12-11 19:17:54.000000000 +0000
24364 +++ linux-4.9.82-vs2.3.9.7/net/ipv6/ndisc.c 2018-01-10 02:50:49.000000000 +0000
24365 @@ -512,7 +512,7 @@ void ndisc_send_na(struct net_device *de
24367 if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr,
24368 inet6_sk(dev_net(dev)->ipv6.ndisc_sk)->srcprefs,
24372 src_addr = &tmpaddr;
24374 diff -NurpP --minimal linux-4.9.82/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c linux-4.9.82-vs2.3.9.7/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c
24375 --- linux-4.9.82/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c 2016-12-11 19:17:54.000000000 +0000
24376 +++ linux-4.9.82-vs2.3.9.7/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c 2018-01-10 02:50:49.000000000 +0000
24377 @@ -39,7 +39,7 @@ nf_nat_masquerade_ipv6(struct sk_buff *s
24378 ctinfo == IP_CT_RELATED_REPLY));
24380 if (ipv6_dev_get_saddr(nf_ct_net(ct), out,
24381 - &ipv6_hdr(skb)->daddr, 0, &src) < 0)
24382 + &ipv6_hdr(skb)->daddr, 0, &src, NULL) < 0)
24385 nfct_nat(ct)->masq_index = out->ifindex;
24386 diff -NurpP --minimal linux-4.9.82/net/ipv6/raw.c linux-4.9.82-vs2.3.9.7/net/ipv6/raw.c
24387 --- linux-4.9.82/net/ipv6/raw.c 2018-02-22 21:19:02.000000000 +0000
24388 +++ linux-4.9.82-vs2.3.9.7/net/ipv6/raw.c 2018-01-13 22:10:35.000000000 +0000
24389 @@ -291,6 +291,13 @@ static int rawv6_bind(struct sock *sk, s
24393 + if (!v6_addr_in_nx_info(sk->sk_nx_info, &addr->sin6_addr, -1)) {
24394 + err = -EADDRNOTAVAIL;
24400 /* ipv4 addr of the socket is invalid. Only the
24401 * unspecified and mapped address have a v4 equivalent.
24403 diff -NurpP --minimal linux-4.9.82/net/ipv6/route.c linux-4.9.82-vs2.3.9.7/net/ipv6/route.c
24404 --- linux-4.9.82/net/ipv6/route.c 2018-02-22 21:19:02.000000000 +0000
24405 +++ linux-4.9.82-vs2.3.9.7/net/ipv6/route.c 2018-01-13 22:10:45.000000000 +0000
24406 @@ -3288,7 +3288,8 @@ static int rt6_fill_node(struct net *net
24407 goto nla_put_failure;
24409 struct in6_addr saddr_buf;
24410 - if (ip6_route_get_saddr(net, rt, dst, 0, &saddr_buf) == 0 &&
24411 + if (ip6_route_get_saddr(net, rt, dst, 0, &saddr_buf,
24412 + (skb->sk ? skb->sk->sk_nx_info : NULL)) == 0 &&
24413 nla_put_in6_addr(skb, RTA_PREFSRC, &saddr_buf))
24414 goto nla_put_failure;
24416 diff -NurpP --minimal linux-4.9.82/net/ipv6/tcp_ipv6.c linux-4.9.82-vs2.3.9.7/net/ipv6/tcp_ipv6.c
24417 --- linux-4.9.82/net/ipv6/tcp_ipv6.c 2018-02-22 21:19:02.000000000 +0000
24418 +++ linux-4.9.82-vs2.3.9.7/net/ipv6/tcp_ipv6.c 2018-01-13 22:10:53.000000000 +0000
24419 @@ -149,11 +149,18 @@ static int tcp_v6_connect(struct sock *s
24422 if (ipv6_addr_any(&usin->sin6_addr)) {
24423 - if (ipv6_addr_v4mapped(&sk->sk_v6_rcv_saddr))
24424 - ipv6_addr_set_v4mapped(htonl(INADDR_LOOPBACK),
24425 - &usin->sin6_addr);
24427 - usin->sin6_addr = in6addr_loopback;
24428 + struct nx_info *nxi = sk->sk_nx_info;
24430 + if (nxi && nx_info_has_v6(nxi))
24431 + /* FIXME: remap lback? */
24432 + usin->sin6_addr = nxi->v6.ip;
24434 + if (ipv6_addr_v4mapped(&sk->sk_v6_rcv_saddr))
24435 + ipv6_addr_set_v4mapped(htonl(INADDR_LOOPBACK),
24436 + &usin->sin6_addr);
24438 + usin->sin6_addr = in6addr_loopback;
24442 addr_type = ipv6_addr_type(&usin->sin6_addr);
24443 diff -NurpP --minimal linux-4.9.82/net/ipv6/udp.c linux-4.9.82-vs2.3.9.7/net/ipv6/udp.c
24444 --- linux-4.9.82/net/ipv6/udp.c 2018-02-22 21:19:02.000000000 +0000
24445 +++ linux-4.9.82-vs2.3.9.7/net/ipv6/udp.c 2018-01-13 22:11:04.000000000 +0000
24446 @@ -135,6 +135,10 @@ static int compute_score(struct sock *sk
24447 if (inet->inet_dport != sport)
24451 + /* block non nx_info ips */
24452 + if (!v6_addr_in_nx_info(sk->sk_nx_info, daddr, -1))
24456 if (!ipv6_addr_any(&sk->sk_v6_rcv_saddr)) {
24457 diff -NurpP --minimal linux-4.9.82/net/ipv6/xfrm6_policy.c linux-4.9.82-vs2.3.9.7/net/ipv6/xfrm6_policy.c
24458 --- linux-4.9.82/net/ipv6/xfrm6_policy.c 2016-12-11 19:17:54.000000000 +0000
24459 +++ linux-4.9.82-vs2.3.9.7/net/ipv6/xfrm6_policy.c 2018-01-10 02:50:49.000000000 +0000
24460 @@ -64,7 +64,8 @@ static int xfrm6_get_saddr(struct net *n
24461 return -EHOSTUNREACH;
24463 dev = ip6_dst_idev(dst)->dev;
24464 - ipv6_dev_get_saddr(dev_net(dev), dev, &daddr->in6, 0, &saddr->in6);
24465 + ipv6_dev_get_saddr(dev_net(dev), dev, &daddr->in6,
24466 + 0, &saddr->in6, NULL);
24470 diff -NurpP --minimal linux-4.9.82/net/netfilter/ipvs/ip_vs_xmit.c linux-4.9.82-vs2.3.9.7/net/netfilter/ipvs/ip_vs_xmit.c
24471 --- linux-4.9.82/net/netfilter/ipvs/ip_vs_xmit.c 2016-12-11 19:17:54.000000000 +0000
24472 +++ linux-4.9.82-vs2.3.9.7/net/netfilter/ipvs/ip_vs_xmit.c 2018-01-10 02:50:49.000000000 +0000
24473 @@ -381,7 +381,7 @@ __ip_vs_route_output_v6(struct net *net,
24475 if (ipv6_addr_any(&fl6.saddr) &&
24476 ipv6_dev_get_saddr(net, ip6_dst_idev(dst)->dev,
24477 - &fl6.daddr, 0, &fl6.saddr) < 0)
24478 + &fl6.daddr, 0, &fl6.saddr, NULL) < 0)
24481 dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), NULL, 0);
24482 diff -NurpP --minimal linux-4.9.82/net/netlink/af_netlink.c linux-4.9.82-vs2.3.9.7/net/netlink/af_netlink.c
24483 --- linux-4.9.82/net/netlink/af_netlink.c 2018-02-22 21:19:04.000000000 +0000
24484 +++ linux-4.9.82-vs2.3.9.7/net/netlink/af_netlink.c 2018-01-10 02:50:49.000000000 +0000
24486 #include <linux/hash.h>
24487 #include <linux/genetlink.h>
24488 #include <linux/nospec.h>
24489 +#include <linux/vs_context.h>
24490 +#include <linux/vs_network.h>
24492 #include <net/net_namespace.h>
24493 #include <net/sock.h>
24494 @@ -2463,7 +2465,8 @@ static void *__netlink_seq_next(struct s
24496 return ERR_PTR(err);
24498 - } while (sock_net(&nlk->sk) != seq_file_net(seq));
24499 + } while ((sock_net(&nlk->sk) != seq_file_net(seq)) ||
24500 + !nx_check(nlk->sk.sk_nid, VS_WATCH_P | VS_IDENT));
24504 diff -NurpP --minimal linux-4.9.82/net/socket.c linux-4.9.82-vs2.3.9.7/net/socket.c
24505 --- linux-4.9.82/net/socket.c 2018-02-22 21:19:05.000000000 +0000
24506 +++ linux-4.9.82-vs2.3.9.7/net/socket.c 2018-02-10 15:15:43.000000000 +0000
24507 @@ -99,10 +99,12 @@
24509 #include <net/sock.h>
24510 #include <linux/netfilter.h>
24511 +#include <linux/vs_socket.h>
24512 +#include <linux/vs_inet.h>
24513 +#include <linux/vs_inet6.h>
24515 #include <linux/if_tun.h>
24516 #include <linux/ipv6_route.h>
24517 -#include <linux/route.h>
24518 #include <linux/sockios.h>
24519 #include <linux/atalk.h>
24520 #include <net/busy_poll.h>
24521 @@ -618,8 +620,24 @@ EXPORT_SYMBOL(__sock_tx_timestamp);
24523 static inline int sock_sendmsg_nosec(struct socket *sock, struct msghdr *msg)
24525 - int ret = sock->ops->sendmsg(sock, msg, msg_data_left(msg));
24526 - BUG_ON(ret == -EIOCBQUEUED);
24527 + size_t size = msg_data_left(msg);
24528 + int ret = sock->ops->sendmsg(sock, msg, size);
24532 + vx_sock_fail(sock->sk, size);
24534 + vx_sock_send(sock->sk, size);
24537 + vxdprintk(VXD_CBIT(net, 7),
24538 + "sock_sendmsg_nosec: %p[%p,%p,%p;%d/%d]:%zu/%zu",
24540 + (sock->sk)?sock->sk->sk_nx_info:0,
24541 + (sock->sk)?sock->sk->sk_vx_info:0,
24542 + (sock->sk)?sock->sk->sk_xid:0,
24543 + (sock->sk)?sock->sk->sk_nid:0,
24544 + size, msg_data_left(msg));
24548 @@ -1109,6 +1127,13 @@ int __sock_create(struct net *net, int f
24549 if (type < 0 || type >= SOCK_MAX)
24552 + if (!nx_check(0, VS_ADMIN)) {
24553 + if (family == PF_INET && !current_nx_info_has_v4())
24554 + return -EAFNOSUPPORT;
24555 + if (family == PF_INET6 && !current_nx_info_has_v6())
24556 + return -EAFNOSUPPORT;
24561 This uglymoron is moved from INET layer to here to avoid
24562 @@ -1239,6 +1264,7 @@ SYSCALL_DEFINE3(socket, int, family, int
24566 + set_bit(SOCK_USER_SOCKET, &sock->flags);
24567 retval = sock_map_fd(sock, flags & (O_CLOEXEC | O_NONBLOCK));
24570 @@ -1280,10 +1306,12 @@ SYSCALL_DEFINE4(socketpair, int, family,
24571 err = sock_create(family, type, protocol, &sock1);
24574 + set_bit(SOCK_USER_SOCKET, &sock1->flags);
24576 err = sock_create(family, type, protocol, &sock2);
24578 goto out_release_1;
24579 + set_bit(SOCK_USER_SOCKET, &sock2->flags);
24581 err = sock1->ops->socketpair(sock1, sock2);
24583 diff -NurpP --minimal linux-4.9.82/net/sunrpc/auth.c linux-4.9.82-vs2.3.9.7/net/sunrpc/auth.c
24584 --- linux-4.9.82/net/sunrpc/auth.c 2016-12-11 19:17:54.000000000 +0000
24585 +++ linux-4.9.82-vs2.3.9.7/net/sunrpc/auth.c 2018-01-10 02:50:49.000000000 +0000
24587 #include <linux/sunrpc/clnt.h>
24588 #include <linux/sunrpc/gss_api.h>
24589 #include <linux/spinlock.h>
24590 +#include <linux/vs_tag.h>
24592 #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
24593 # define RPCDBG_FACILITY RPCDBG_AUTH
24594 @@ -630,6 +631,7 @@ rpcauth_lookupcred(struct rpc_auth *auth
24595 memset(&acred, 0, sizeof(acred));
24596 acred.uid = cred->fsuid;
24597 acred.gid = cred->fsgid;
24598 + acred.tag = make_ktag(&init_user_ns, dx_current_tag());
24599 acred.group_info = cred->group_info;
24600 ret = auth->au_ops->lookup_cred(auth, &acred, flags);
24602 @@ -669,6 +671,7 @@ rpcauth_bind_root_cred(struct rpc_task *
24603 struct auth_cred acred = {
24604 .uid = GLOBAL_ROOT_UID,
24605 .gid = GLOBAL_ROOT_GID,
24606 + .tag = KTAGT_INIT(dx_current_tag()),
24609 dprintk("RPC: %5u looking up %s cred\n",
24610 diff -NurpP --minimal linux-4.9.82/net/sunrpc/auth_unix.c linux-4.9.82-vs2.3.9.7/net/sunrpc/auth_unix.c
24611 --- linux-4.9.82/net/sunrpc/auth_unix.c 2016-12-11 19:17:54.000000000 +0000
24612 +++ linux-4.9.82-vs2.3.9.7/net/sunrpc/auth_unix.c 2018-01-10 02:50:49.000000000 +0000
24613 @@ -13,11 +13,13 @@
24614 #include <linux/sunrpc/clnt.h>
24615 #include <linux/sunrpc/auth.h>
24616 #include <linux/user_namespace.h>
24617 +#include <linux/vs_tag.h>
24619 #define NFS_NGROUPS 16
24622 struct rpc_cred uc_base;
24625 kgid_t uc_gids[NFS_NGROUPS];
24627 @@ -86,6 +88,7 @@ unx_create_cred(struct rpc_auth *auth, s
24628 groups = NFS_NGROUPS;
24630 cred->uc_gid = acred->gid;
24631 + cred->uc_tag = acred->tag;
24632 for (i = 0; i < groups; i++)
24633 cred->uc_gids[i] = acred->group_info->gid[i];
24634 if (i < NFS_NGROUPS)
24635 @@ -127,7 +130,9 @@ unx_match(struct auth_cred *acred, struc
24639 - if (!uid_eq(cred->uc_uid, acred->uid) || !gid_eq(cred->uc_gid, acred->gid))
24640 + if (!uid_eq(cred->uc_uid, acred->uid) ||
24641 + !gid_eq(cred->uc_gid, acred->gid) ||
24642 + !tag_eq(cred->uc_tag, acred->tag))
24645 if (acred->group_info != NULL)
24646 @@ -152,7 +157,7 @@ unx_marshal(struct rpc_task *task, __be3
24647 struct rpc_clnt *clnt = task->tk_client;
24648 struct unx_cred *cred = container_of(task->tk_rqstp->rq_cred, struct unx_cred, uc_base);
24649 __be32 *base, *hold;
24653 *p++ = htonl(RPC_AUTH_UNIX);
24655 @@ -163,8 +168,11 @@ unx_marshal(struct rpc_task *task, __be3
24657 p = xdr_encode_array(p, clnt->cl_nodename, clnt->cl_nodelen);
24659 - *p++ = htonl((u32) from_kuid(&init_user_ns, cred->uc_uid));
24660 - *p++ = htonl((u32) from_kgid(&init_user_ns, cred->uc_gid));
24661 + tag = task->tk_client->cl_tag;
24662 + *p++ = htonl((u32) from_kuid(&init_user_ns,
24663 + TAGINO_KUID(tag, cred->uc_uid, cred->uc_tag)));
24664 + *p++ = htonl((u32) from_kgid(&init_user_ns,
24665 + TAGINO_KGID(tag, cred->uc_gid, cred->uc_tag)));
24667 for (i = 0; i < 16 && gid_valid(cred->uc_gids[i]); i++)
24668 *p++ = htonl((u32) from_kgid(&init_user_ns, cred->uc_gids[i]));
24669 diff -NurpP --minimal linux-4.9.82/net/sunrpc/clnt.c linux-4.9.82-vs2.3.9.7/net/sunrpc/clnt.c
24670 --- linux-4.9.82/net/sunrpc/clnt.c 2018-02-22 21:19:05.000000000 +0000
24671 +++ linux-4.9.82-vs2.3.9.7/net/sunrpc/clnt.c 2018-01-10 02:50:49.000000000 +0000
24673 #include <linux/in.h>
24674 #include <linux/in6.h>
24675 #include <linux/un.h>
24676 +#include <linux/vs_cvirt.h>
24678 #include <linux/sunrpc/clnt.h>
24679 #include <linux/sunrpc/addr.h>
24680 @@ -496,6 +497,9 @@ static struct rpc_clnt *rpc_create_xprt(
24681 if (!(args->flags & RPC_CLNT_CREATE_QUIET))
24682 clnt->cl_chatty = 1;
24684 + /* TODO: handle RPC_CLNT_CREATE_TAGGED
24685 + if (args->flags & RPC_CLNT_CREATE_TAGGED)
24686 + clnt->cl_tag = 1; */
24690 diff -NurpP --minimal linux-4.9.82/net/unix/af_unix.c linux-4.9.82-vs2.3.9.7/net/unix/af_unix.c
24691 --- linux-4.9.82/net/unix/af_unix.c 2018-02-22 21:19:05.000000000 +0000
24692 +++ linux-4.9.82-vs2.3.9.7/net/unix/af_unix.c 2018-01-10 02:50:49.000000000 +0000
24693 @@ -117,6 +117,8 @@
24694 #include <net/checksum.h>
24695 #include <linux/security.h>
24696 #include <linux/freezer.h>
24697 +#include <linux/vs_context.h>
24698 +#include <linux/vs_limit.h>
24700 struct hlist_head unix_socket_table[2 * UNIX_HASH_SIZE];
24701 EXPORT_SYMBOL_GPL(unix_socket_table);
24702 @@ -282,6 +284,8 @@ static struct sock *__unix_find_socket_b
24703 if (!net_eq(sock_net(s), net))
24706 + if (!nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT))
24708 if (u->addr->len == len &&
24709 !memcmp(u->addr->name, sunname, len))
24711 @@ -2732,6 +2736,8 @@ static struct sock *unix_from_bucket(str
24712 for (sk = sk_head(&unix_socket_table[bucket]); sk; sk = sk_next(sk)) {
24713 if (sock_net(sk) != seq_file_net(seq))
24715 + if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
24717 if (++count == offset)
24720 @@ -2749,6 +2755,8 @@ static struct sock *unix_next_socket(str
24724 + if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
24726 if (sock_net(sk) == seq_file_net(seq))
24729 diff -NurpP --minimal linux-4.9.82/scripts/checksyscalls.sh linux-4.9.82-vs2.3.9.7/scripts/checksyscalls.sh
24730 --- linux-4.9.82/scripts/checksyscalls.sh 2016-12-11 19:17:54.000000000 +0000
24731 +++ linux-4.9.82-vs2.3.9.7/scripts/checksyscalls.sh 2018-01-10 02:50:49.000000000 +0000
24732 @@ -196,7 +196,6 @@ cat << EOF
24733 #define __IGNORE_afs_syscall
24734 #define __IGNORE_getpmsg
24735 #define __IGNORE_putpmsg
24736 -#define __IGNORE_vserver
24740 diff -NurpP --minimal linux-4.9.82/security/commoncap.c linux-4.9.82-vs2.3.9.7/security/commoncap.c
24741 --- linux-4.9.82/security/commoncap.c 2016-12-11 19:17:54.000000000 +0000
24742 +++ linux-4.9.82-vs2.3.9.7/security/commoncap.c 2018-01-10 02:50:49.000000000 +0000
24743 @@ -71,6 +71,7 @@ static void warn_setuid_and_fcaps_mixed(
24744 int cap_capable(const struct cred *cred, struct user_namespace *targ_ns,
24745 int cap, int audit)
24747 + struct vx_info *vxi = current_vx_info(); /* FIXME: get vxi from cred? */
24748 struct user_namespace *ns = targ_ns;
24750 /* See if cred has the capability in the target user namespace
24751 @@ -79,8 +80,12 @@ int cap_capable(const struct cred *cred,
24754 /* Do we have the necessary capabilities? */
24755 - if (ns == cred->user_ns)
24756 - return cap_raised(cred->cap_effective, cap) ? 0 : -EPERM;
24757 + if (ns == cred->user_ns) {
24758 + if (vx_info_flags(vxi, VXF_STATE_SETUP, 0) &&
24759 + cap_raised(cred->cap_effective, cap))
24761 + return vx_cap_raised(vxi, cred->cap_effective, cap) ? 0 : -EPERM;
24764 /* Have we tried all of the parent namespaces? */
24765 if (ns == &init_user_ns)
24766 @@ -667,7 +672,7 @@ int cap_inode_setxattr(struct dentry *de
24768 if (!strncmp(name, XATTR_SECURITY_PREFIX,
24769 sizeof(XATTR_SECURITY_PREFIX) - 1) &&
24770 - !capable(CAP_SYS_ADMIN))
24771 + !vx_capable(CAP_SYS_ADMIN, VXC_FS_SECURITY))
24775 @@ -693,7 +698,7 @@ int cap_inode_removexattr(struct dentry
24777 if (!strncmp(name, XATTR_SECURITY_PREFIX,
24778 sizeof(XATTR_SECURITY_PREFIX) - 1) &&
24779 - !capable(CAP_SYS_ADMIN))
24780 + !vx_capable(CAP_SYS_ADMIN, VXC_FS_SECURITY))
24784 diff -NurpP --minimal linux-4.9.82/security/selinux/hooks.c linux-4.9.82-vs2.3.9.7/security/selinux/hooks.c
24785 --- linux-4.9.82/security/selinux/hooks.c 2018-02-22 21:19:06.000000000 +0000
24786 +++ linux-4.9.82-vs2.3.9.7/security/selinux/hooks.c 2018-01-10 02:50:49.000000000 +0000
24788 #include <linux/dccp.h>
24789 #include <linux/quota.h>
24790 #include <linux/un.h> /* for Unix socket types */
24791 -#include <net/af_unix.h> /* for Unix socket types */
24792 #include <linux/parser.h>
24793 #include <linux/nfs_mount.h>
24794 #include <net/ipv6.h>