1 diff -NurpP --minimal linux-3.5/Documentation/vserver/debug.txt linux-3.5-vs2.3.4/Documentation/vserver/debug.txt
2 --- linux-3.5/Documentation/vserver/debug.txt 1970-01-01 01:00:00.000000000 +0100
3 +++ linux-3.5-vs2.3.4/Documentation/vserver/debug.txt 2012-07-23 01:45:55.000000000 +0200
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-3.5/arch/alpha/Kconfig linux-3.5-vs2.3.4/arch/alpha/Kconfig
160 --- linux-3.5/arch/alpha/Kconfig 2012-07-22 23:38:45.000000000 +0200
161 +++ linux-3.5-vs2.3.4/arch/alpha/Kconfig 2012-07-23 01:45:55.000000000 +0200
162 @@ -661,6 +661,8 @@ config DUMMY_CONSOLE
166 +source "kernel/vserver/Kconfig"
168 source "security/Kconfig"
170 source "crypto/Kconfig"
171 diff -NurpP --minimal linux-3.5/arch/alpha/kernel/entry.S linux-3.5-vs2.3.4/arch/alpha/kernel/entry.S
172 --- linux-3.5/arch/alpha/kernel/entry.S 2010-10-21 13:06:45.000000000 +0200
173 +++ linux-3.5-vs2.3.4/arch/alpha/kernel/entry.S 2012-07-23 01:45:55.000000000 +0200
174 @@ -860,24 +860,15 @@ sys_getxgid:
181 - ldq $2, TI_TASK($8)
183 - /* See linux/kernel/timer.c sys_getppid for discussion
184 - about this loop. */
185 - ldq $3, TASK_GROUP_LEADER($2)
186 - ldq $4, TASK_REAL_PARENT($3)
187 - ldl $0, TASK_TGID($2)
188 -1: ldl $1, TASK_TGID($4)
192 - ldq $3, TASK_GROUP_LEADER($2)
193 - ldq $4, TASK_REAL_PARENT($3)
199 + jsr $26, do_getxpid
206 diff -NurpP --minimal linux-3.5/arch/alpha/kernel/ptrace.c linux-3.5-vs2.3.4/arch/alpha/kernel/ptrace.c
207 --- linux-3.5/arch/alpha/kernel/ptrace.c 2012-05-21 18:06:12.000000000 +0200
208 +++ linux-3.5-vs2.3.4/arch/alpha/kernel/ptrace.c 2012-07-23 01:45:55.000000000 +0200
210 #include <linux/user.h>
211 #include <linux/security.h>
212 #include <linux/signal.h>
213 +#include <linux/vs_base.h>
215 #include <asm/uaccess.h>
216 #include <asm/pgtable.h>
217 diff -NurpP --minimal linux-3.5/arch/alpha/kernel/systbls.S linux-3.5-vs2.3.4/arch/alpha/kernel/systbls.S
218 --- linux-3.5/arch/alpha/kernel/systbls.S 2012-07-22 23:38:45.000000000 +0200
219 +++ linux-3.5-vs2.3.4/arch/alpha/kernel/systbls.S 2012-07-23 01:45:55.000000000 +0200
220 @@ -446,7 +446,7 @@ sys_call_table:
221 .quad sys_stat64 /* 425 */
224 - .quad sys_ni_syscall /* sys_vserver */
225 + .quad sys_vserver /* sys_vserver */
226 .quad sys_ni_syscall /* sys_mbind */
227 .quad sys_ni_syscall /* sys_get_mempolicy */
228 .quad sys_ni_syscall /* sys_set_mempolicy */
229 diff -NurpP --minimal linux-3.5/arch/alpha/kernel/traps.c linux-3.5-vs2.3.4/arch/alpha/kernel/traps.c
230 --- linux-3.5/arch/alpha/kernel/traps.c 2012-05-21 18:06:12.000000000 +0200
231 +++ linux-3.5-vs2.3.4/arch/alpha/kernel/traps.c 2012-07-23 01:45:55.000000000 +0200
232 @@ -184,7 +184,8 @@ die_if_kernel(char * str, struct pt_regs
234 printk("CPU %d ", hard_smp_processor_id());
236 - printk("%s(%d): %s %ld\n", current->comm, task_pid_nr(current), str, err);
237 + printk("%s(%d[#%u]): %s %ld\n", current->comm,
238 + task_pid_nr(current), current->xid, str, err);
239 dik_show_regs(regs, r9_15);
240 add_taint(TAINT_DIE);
241 dik_show_trace((unsigned long *)(regs+1));
242 diff -NurpP --minimal linux-3.5/arch/arm/Kconfig linux-3.5-vs2.3.4/arch/arm/Kconfig
243 --- linux-3.5/arch/arm/Kconfig 2012-07-22 23:38:45.000000000 +0200
244 +++ linux-3.5-vs2.3.4/arch/arm/Kconfig 2012-07-23 01:45:55.000000000 +0200
245 @@ -2269,6 +2269,8 @@ source "fs/Kconfig"
247 source "arch/arm/Kconfig.debug"
249 +source "kernel/vserver/Kconfig"
251 source "security/Kconfig"
253 source "crypto/Kconfig"
254 diff -NurpP --minimal linux-3.5/arch/arm/kernel/calls.S linux-3.5-vs2.3.4/arch/arm/kernel/calls.S
255 --- linux-3.5/arch/arm/kernel/calls.S 2012-01-09 16:13:54.000000000 +0100
256 +++ linux-3.5-vs2.3.4/arch/arm/kernel/calls.S 2012-07-23 01:45:55.000000000 +0200
258 /* 310 */ CALL(sys_request_key)
260 CALL(ABI(sys_semtimedop, sys_oabi_semtimedop))
261 -/* vserver */ CALL(sys_ni_syscall)
264 /* 315 */ CALL(sys_ioprio_get)
265 CALL(sys_inotify_init)
266 diff -NurpP --minimal linux-3.5/arch/arm/kernel/process.c linux-3.5-vs2.3.4/arch/arm/kernel/process.c
267 --- linux-3.5/arch/arm/kernel/process.c 2012-07-22 23:38:45.000000000 +0200
268 +++ linux-3.5-vs2.3.4/arch/arm/kernel/process.c 2012-07-23 01:45:55.000000000 +0200
269 @@ -335,7 +335,8 @@ void __show_regs(struct pt_regs *regs)
270 void show_regs(struct pt_regs * regs)
273 - printk("Pid: %d, comm: %20s\n", task_pid_nr(current), current->comm);
274 + printk("Pid: %d[#%u], comm: %20s\n",
275 + task_pid_nr(current), current->xid, current->comm);
279 diff -NurpP --minimal linux-3.5/arch/arm/kernel/traps.c linux-3.5-vs2.3.4/arch/arm/kernel/traps.c
280 --- linux-3.5/arch/arm/kernel/traps.c 2012-07-22 23:38:45.000000000 +0200
281 +++ linux-3.5-vs2.3.4/arch/arm/kernel/traps.c 2012-07-23 01:45:55.000000000 +0200
282 @@ -249,8 +249,8 @@ static int __die(const char *str, int er
286 - printk(KERN_EMERG "Process %.*s (pid: %d, stack limit = 0x%p)\n",
287 - TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), thread + 1);
288 + printk(KERN_EMERG "Process %.*s (pid: %d:#%u, stack limit = 0x%p)\n",
289 + TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), tsk->xid, thread + 1);
291 if (!user_mode(regs) || in_interrupt()) {
292 dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
293 diff -NurpP --minimal linux-3.5/arch/cris/Kconfig linux-3.5-vs2.3.4/arch/cris/Kconfig
294 --- linux-3.5/arch/cris/Kconfig 2012-07-22 23:38:50.000000000 +0200
295 +++ linux-3.5-vs2.3.4/arch/cris/Kconfig 2012-07-23 01:45:55.000000000 +0200
296 @@ -672,6 +672,8 @@ source "drivers/staging/Kconfig"
298 source "arch/cris/Kconfig.debug"
300 +source "kernel/vserver/Kconfig"
302 source "security/Kconfig"
304 source "crypto/Kconfig"
305 diff -NurpP --minimal linux-3.5/arch/frv/kernel/kernel_thread.S linux-3.5-vs2.3.4/arch/frv/kernel/kernel_thread.S
306 --- linux-3.5/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100
307 +++ linux-3.5-vs2.3.4/arch/frv/kernel/kernel_thread.S 2012-07-23 01:45:55.000000000 +0200
308 @@ -37,7 +37,7 @@ kernel_thread:
310 # start by forking the current process, but with shared VM
311 setlos.p #__NR_clone,gr7 ; syscall number
312 - ori gr10,#CLONE_VM,gr8 ; first syscall arg [clone_flags]
313 + ori gr10,#CLONE_KT,gr8 ; first syscall arg [clone_flags]
314 sethi.p #0xe4e4,gr9 ; second syscall arg [newsp]
316 setlos.p #0,gr10 ; third syscall arg [parent_tidptr]
317 diff -NurpP --minimal linux-3.5/arch/h8300/Kconfig linux-3.5-vs2.3.4/arch/h8300/Kconfig
318 --- linux-3.5/arch/h8300/Kconfig 2012-03-19 19:46:39.000000000 +0100
319 +++ linux-3.5-vs2.3.4/arch/h8300/Kconfig 2012-07-23 01:45:55.000000000 +0200
320 @@ -214,6 +214,8 @@ source "fs/Kconfig"
322 source "arch/h8300/Kconfig.debug"
324 +source "kernel/vserver/Kconfig"
326 source "security/Kconfig"
328 source "crypto/Kconfig"
329 diff -NurpP --minimal linux-3.5/arch/ia64/Kconfig linux-3.5-vs2.3.4/arch/ia64/Kconfig
330 --- linux-3.5/arch/ia64/Kconfig 2012-07-22 23:38:50.000000000 +0200
331 +++ linux-3.5-vs2.3.4/arch/ia64/Kconfig 2012-07-23 01:45:55.000000000 +0200
332 @@ -653,6 +653,8 @@ source "fs/Kconfig"
334 source "arch/ia64/Kconfig.debug"
336 +source "kernel/vserver/Kconfig"
338 source "security/Kconfig"
340 source "crypto/Kconfig"
341 diff -NurpP --minimal linux-3.5/arch/ia64/kernel/entry.S linux-3.5-vs2.3.4/arch/ia64/kernel/entry.S
342 --- linux-3.5/arch/ia64/kernel/entry.S 2012-03-19 19:46:40.000000000 +0100
343 +++ linux-3.5-vs2.3.4/arch/ia64/kernel/entry.S 2012-07-23 01:45:55.000000000 +0200
344 @@ -1714,7 +1714,7 @@ sys_call_table:
346 data8 sys_mq_getsetattr
348 - data8 sys_ni_syscall // reserved for vserver
350 data8 sys_waitid // 1270
352 data8 sys_request_key
353 diff -NurpP --minimal linux-3.5/arch/ia64/kernel/process.c linux-3.5-vs2.3.4/arch/ia64/kernel/process.c
354 --- linux-3.5/arch/ia64/kernel/process.c 2012-07-22 23:38:51.000000000 +0200
355 +++ linux-3.5-vs2.3.4/arch/ia64/kernel/process.c 2012-07-23 01:45:55.000000000 +0200
356 @@ -110,8 +110,8 @@ show_regs (struct pt_regs *regs)
357 unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
360 - printk("\nPid: %d, CPU %d, comm: %20s\n", task_pid_nr(current),
361 - smp_processor_id(), current->comm);
362 + printk("\nPid: %d[#%u], CPU %d, comm: %20s\n", task_pid_nr(current),
363 + current->xid, smp_processor_id(), current->comm);
364 printk("psr : %016lx ifs : %016lx ip : [<%016lx>] %s (%s)\n",
365 regs->cr_ipsr, regs->cr_ifs, ip, print_tainted(),
366 init_utsname()->release);
367 diff -NurpP --minimal linux-3.5/arch/ia64/kernel/ptrace.c linux-3.5-vs2.3.4/arch/ia64/kernel/ptrace.c
368 --- linux-3.5/arch/ia64/kernel/ptrace.c 2012-05-21 18:06:26.000000000 +0200
369 +++ linux-3.5-vs2.3.4/arch/ia64/kernel/ptrace.c 2012-07-23 01:45:55.000000000 +0200
371 #include <linux/regset.h>
372 #include <linux/elf.h>
373 #include <linux/tracehook.h>
374 +#include <linux/vs_base.h>
376 #include <asm/pgtable.h>
377 #include <asm/processor.h>
378 diff -NurpP --minimal linux-3.5/arch/ia64/kernel/traps.c linux-3.5-vs2.3.4/arch/ia64/kernel/traps.c
379 --- linux-3.5/arch/ia64/kernel/traps.c 2012-05-21 18:06:26.000000000 +0200
380 +++ linux-3.5-vs2.3.4/arch/ia64/kernel/traps.c 2012-07-23 01:45:55.000000000 +0200
381 @@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re
384 if (++die.lock_owner_depth < 3) {
385 - printk("%s[%d]: %s %ld [%d]\n",
386 - current->comm, task_pid_nr(current), str, err, ++die_counter);
387 + printk("%s[%d[#%u]]: %s %ld [%d]\n",
388 + current->comm, task_pid_nr(current), current->xid,
389 + str, err, ++die_counter);
390 if (notify_die(DIE_OOPS, str, regs, err, 255, SIGSEGV)
393 @@ -324,8 +325,9 @@ handle_fpu_swa (int fp_fault, struct pt_
394 if ((last.count & 15) < 5 && (ia64_fetchadd(1, &last.count, acq) & 15) < 5) {
395 last.time = current_jiffies + 5 * HZ;
397 - "%s(%d): floating-point assist fault at ip %016lx, isr %016lx\n",
398 - current->comm, task_pid_nr(current), regs->cr_iip + ia64_psr(regs)->ri, isr);
399 + "%s(%d[#%u]): floating-point assist fault at ip %016lx, isr %016lx\n",
400 + current->comm, task_pid_nr(current), current->xid,
401 + regs->cr_iip + ia64_psr(regs)->ri, isr);
405 diff -NurpP --minimal linux-3.5/arch/m32r/kernel/traps.c linux-3.5-vs2.3.4/arch/m32r/kernel/traps.c
406 --- linux-3.5/arch/m32r/kernel/traps.c 2012-05-21 18:06:26.000000000 +0200
407 +++ linux-3.5-vs2.3.4/arch/m32r/kernel/traps.c 2012-07-23 01:45:55.000000000 +0200
408 @@ -195,8 +195,9 @@ static void show_registers(struct pt_reg
410 printk("SPI: %08lx\n", sp);
412 - printk("Process %s (pid: %d, process nr: %d, stackpage=%08lx)",
413 - current->comm, task_pid_nr(current), 0xffff & i, 4096+(unsigned long)current);
414 + printk("Process %s (pid: %d[#%u], process nr: %d, stackpage=%08lx)",
415 + current->comm, task_pid_nr(current), current->xid,
416 + 0xffff & i, 4096+(unsigned long)current);
419 * When in-kernel, we also print out the stack and code at the
420 diff -NurpP --minimal linux-3.5/arch/m68k/Kconfig linux-3.5-vs2.3.4/arch/m68k/Kconfig
421 --- linux-3.5/arch/m68k/Kconfig 2012-07-22 23:38:51.000000000 +0200
422 +++ linux-3.5-vs2.3.4/arch/m68k/Kconfig 2012-07-23 01:45:55.000000000 +0200
423 @@ -139,6 +139,8 @@ source "fs/Kconfig"
425 source "arch/m68k/Kconfig.debug"
427 +source "kernel/vserver/Kconfig"
429 source "security/Kconfig"
431 source "crypto/Kconfig"
432 diff -NurpP --minimal linux-3.5/arch/mips/Kconfig linux-3.5-vs2.3.4/arch/mips/Kconfig
433 --- linux-3.5/arch/mips/Kconfig 2012-07-22 23:38:51.000000000 +0200
434 +++ linux-3.5-vs2.3.4/arch/mips/Kconfig 2012-07-23 01:45:55.000000000 +0200
435 @@ -2513,6 +2513,8 @@ source "fs/Kconfig"
437 source "arch/mips/Kconfig.debug"
439 +source "kernel/vserver/Kconfig"
441 source "security/Kconfig"
443 source "crypto/Kconfig"
444 diff -NurpP --minimal linux-3.5/arch/mips/kernel/ptrace.c linux-3.5-vs2.3.4/arch/mips/kernel/ptrace.c
445 --- linux-3.5/arch/mips/kernel/ptrace.c 2012-07-22 23:38:52.000000000 +0200
446 +++ linux-3.5-vs2.3.4/arch/mips/kernel/ptrace.c 2012-07-23 01:45:55.000000000 +0200
448 #include <linux/security.h>
449 #include <linux/audit.h>
450 #include <linux/seccomp.h>
451 +#include <linux/vs_base.h>
453 #include <asm/byteorder.h>
455 @@ -262,6 +263,9 @@ long arch_ptrace(struct task_struct *chi
456 void __user *datavp = (void __user *) data;
457 unsigned long __user *datalp = (void __user *) data;
459 + if (!vx_check(vx_task_xid(child), VS_WATCH_P | VS_IDENT))
463 /* when I and D space are separate, these will need to be fixed. */
464 case PTRACE_PEEKTEXT: /* read word at location addr. */
465 diff -NurpP --minimal linux-3.5/arch/mips/kernel/scall32-o32.S linux-3.5-vs2.3.4/arch/mips/kernel/scall32-o32.S
466 --- linux-3.5/arch/mips/kernel/scall32-o32.S 2012-01-09 16:14:05.000000000 +0100
467 +++ linux-3.5-vs2.3.4/arch/mips/kernel/scall32-o32.S 2012-07-23 01:45:55.000000000 +0200
468 @@ -523,7 +523,7 @@ einval: li v0, -ENOSYS
469 sys sys_mq_timedreceive 5
470 sys sys_mq_notify 2 /* 4275 */
471 sys sys_mq_getsetattr 3
472 - sys sys_ni_syscall 0 /* sys_vserver */
475 sys sys_ni_syscall 0 /* available, was setaltroot */
476 sys sys_add_key 5 /* 4280 */
477 diff -NurpP --minimal linux-3.5/arch/mips/kernel/scall64-64.S linux-3.5-vs2.3.4/arch/mips/kernel/scall64-64.S
478 --- linux-3.5/arch/mips/kernel/scall64-64.S 2012-01-09 16:14:05.000000000 +0100
479 +++ linux-3.5-vs2.3.4/arch/mips/kernel/scall64-64.S 2012-07-23 01:45:55.000000000 +0200
480 @@ -362,7 +362,7 @@ sys_call_table:
481 PTR sys_mq_timedreceive
483 PTR sys_mq_getsetattr /* 5235 */
484 - PTR sys_ni_syscall /* sys_vserver */
487 PTR sys_ni_syscall /* available, was setaltroot */
489 diff -NurpP --minimal linux-3.5/arch/mips/kernel/scall64-n32.S linux-3.5-vs2.3.4/arch/mips/kernel/scall64-n32.S
490 --- linux-3.5/arch/mips/kernel/scall64-n32.S 2012-01-09 16:14:05.000000000 +0100
491 +++ linux-3.5-vs2.3.4/arch/mips/kernel/scall64-n32.S 2012-07-23 01:45:55.000000000 +0200
492 @@ -361,7 +361,7 @@ EXPORT(sysn32_call_table)
493 PTR compat_sys_mq_timedreceive
494 PTR compat_sys_mq_notify
495 PTR compat_sys_mq_getsetattr
496 - PTR sys_ni_syscall /* 6240, sys_vserver */
497 + PTR sys32_vserver /* 6240 */
498 PTR compat_sys_waitid
499 PTR sys_ni_syscall /* available, was setaltroot */
501 diff -NurpP --minimal linux-3.5/arch/mips/kernel/scall64-o32.S linux-3.5-vs2.3.4/arch/mips/kernel/scall64-o32.S
502 --- linux-3.5/arch/mips/kernel/scall64-o32.S 2012-01-09 16:14:05.000000000 +0100
503 +++ linux-3.5-vs2.3.4/arch/mips/kernel/scall64-o32.S 2012-07-23 01:45:55.000000000 +0200
504 @@ -480,7 +480,7 @@ sys_call_table:
505 PTR compat_sys_mq_timedreceive
506 PTR compat_sys_mq_notify /* 4275 */
507 PTR compat_sys_mq_getsetattr
508 - PTR sys_ni_syscall /* sys_vserver */
511 PTR sys_ni_syscall /* available, was setaltroot */
512 PTR sys_add_key /* 4280 */
513 diff -NurpP --minimal linux-3.5/arch/mips/kernel/traps.c linux-3.5-vs2.3.4/arch/mips/kernel/traps.c
514 --- linux-3.5/arch/mips/kernel/traps.c 2012-07-22 23:38:52.000000000 +0200
515 +++ linux-3.5-vs2.3.4/arch/mips/kernel/traps.c 2012-07-23 01:45:55.000000000 +0200
516 @@ -347,9 +347,10 @@ void show_registers(struct pt_regs *regs
520 - printk("Process %s (pid: %d, threadinfo=%p, task=%p, tls=%0*lx)\n",
521 - current->comm, current->pid, current_thread_info(), current,
522 - field, current_thread_info()->tp_value);
523 + printk("Process %s (pid: %d:#%u, threadinfo=%p, task=%p, tls=%0*lx)\n",
524 + current->comm, task_pid_nr(current), current->xid,
525 + current_thread_info(), current,
526 + field, current_thread_info()->tp_value);
527 if (cpu_has_userlocal) {
530 diff -NurpP --minimal linux-3.5/arch/parisc/Kconfig linux-3.5-vs2.3.4/arch/parisc/Kconfig
531 --- linux-3.5/arch/parisc/Kconfig 2012-07-22 23:38:52.000000000 +0200
532 +++ linux-3.5-vs2.3.4/arch/parisc/Kconfig 2012-07-23 01:45:55.000000000 +0200
533 @@ -281,6 +281,8 @@ source "fs/Kconfig"
535 source "arch/parisc/Kconfig.debug"
537 +source "kernel/vserver/Kconfig"
539 source "security/Kconfig"
541 source "crypto/Kconfig"
542 diff -NurpP --minimal linux-3.5/arch/parisc/kernel/syscall_table.S linux-3.5-vs2.3.4/arch/parisc/kernel/syscall_table.S
543 --- linux-3.5/arch/parisc/kernel/syscall_table.S 2011-10-24 18:45:00.000000000 +0200
544 +++ linux-3.5-vs2.3.4/arch/parisc/kernel/syscall_table.S 2012-07-23 01:45:55.000000000 +0200
546 ENTRY_COMP(mbind) /* 260 */
547 ENTRY_COMP(get_mempolicy)
548 ENTRY_COMP(set_mempolicy)
549 - ENTRY_SAME(ni_syscall) /* 263: reserved for vserver */
550 + ENTRY_DIFF(vserver)
552 ENTRY_SAME(request_key) /* 265 */
554 diff -NurpP --minimal linux-3.5/arch/parisc/kernel/traps.c linux-3.5-vs2.3.4/arch/parisc/kernel/traps.c
555 --- linux-3.5/arch/parisc/kernel/traps.c 2012-05-21 18:06:28.000000000 +0200
556 +++ linux-3.5-vs2.3.4/arch/parisc/kernel/traps.c 2012-07-23 01:45:55.000000000 +0200
557 @@ -235,8 +235,9 @@ void die_if_kernel(char *str, struct pt_
561 - printk(KERN_CRIT "%s (pid %d): %s (code %ld) at " RFMT "\n",
562 - current->comm, task_pid_nr(current), str, err, regs->iaoq[0]);
563 + printk(KERN_CRIT "%s (pid %d:#%u): %s (code %ld) at " RFMT "\n",
564 + current->comm, task_pid_nr(current), current->xid,
565 + str, err, regs->iaoq[0]);
566 #ifdef PRINT_USER_FAULTS
567 /* XXX for debugging only */
569 @@ -269,8 +270,8 @@ void die_if_kernel(char *str, struct pt_
570 pdc_console_restart();
573 - printk(KERN_CRIT "%s (pid %d): %s (code %ld)\n",
574 - current->comm, task_pid_nr(current), str, err);
575 + printk(KERN_CRIT "%s (pid %d:#%u): %s (code %ld)\n",
576 + current->comm, task_pid_nr(current), current->xid, str, err);
578 /* Wot's wrong wif bein' racy? */
579 if (current->thread.flags & PARISC_KERNEL_DEATH) {
580 diff -NurpP --minimal linux-3.5/arch/parisc/mm/fault.c linux-3.5-vs2.3.4/arch/parisc/mm/fault.c
581 --- linux-3.5/arch/parisc/mm/fault.c 2010-08-02 16:52:06.000000000 +0200
582 +++ linux-3.5-vs2.3.4/arch/parisc/mm/fault.c 2012-07-23 01:45:55.000000000 +0200
583 @@ -237,8 +237,9 @@ bad_area:
585 #ifdef PRINT_USER_FAULTS
586 printk(KERN_DEBUG "\n");
587 - printk(KERN_DEBUG "do_page_fault() pid=%d command='%s' type=%lu address=0x%08lx\n",
588 - task_pid_nr(tsk), tsk->comm, code, address);
589 + printk(KERN_DEBUG "do_page_fault() pid=%d:#%u "
590 + "command='%s' type=%lu address=0x%08lx\n",
591 + task_pid_nr(tsk), tsk->xid, tsk->comm, code, address);
593 printk(KERN_DEBUG "vm_start = 0x%08lx, vm_end = 0x%08lx\n",
594 vma->vm_start, vma->vm_end);
595 diff -NurpP --minimal linux-3.5/arch/powerpc/Kconfig linux-3.5-vs2.3.4/arch/powerpc/Kconfig
596 --- linux-3.5/arch/powerpc/Kconfig 2012-07-22 23:38:53.000000000 +0200
597 +++ linux-3.5-vs2.3.4/arch/powerpc/Kconfig 2012-07-23 01:45:55.000000000 +0200
598 @@ -994,6 +994,8 @@ source "lib/Kconfig"
600 source "arch/powerpc/Kconfig.debug"
602 +source "kernel/vserver/Kconfig"
604 source "security/Kconfig"
607 diff -NurpP --minimal linux-3.5/arch/powerpc/include/asm/unistd.h linux-3.5-vs2.3.4/arch/powerpc/include/asm/unistd.h
608 --- linux-3.5/arch/powerpc/include/asm/unistd.h 2012-01-09 16:14:05.000000000 +0100
609 +++ linux-3.5-vs2.3.4/arch/powerpc/include/asm/unistd.h 2012-07-23 01:45:55.000000000 +0200
612 #define __NR_rtas 255
613 #define __NR_sys_debug_setcontext 256
614 -/* Number 257 is reserved for vserver */
615 +#define __NR_vserver 257
616 #define __NR_migrate_pages 258
617 #define __NR_mbind 259
618 #define __NR_get_mempolicy 260
619 diff -NurpP --minimal linux-3.5/arch/powerpc/kernel/process.c linux-3.5-vs2.3.4/arch/powerpc/kernel/process.c
620 --- linux-3.5/arch/powerpc/kernel/process.c 2012-07-22 23:38:58.000000000 +0200
621 +++ linux-3.5-vs2.3.4/arch/powerpc/kernel/process.c 2012-07-23 01:45:55.000000000 +0200
622 @@ -661,8 +661,9 @@ void show_regs(struct pt_regs * regs)
624 printk("DAR: "REG", DSISR: %08lx\n", regs->dar, regs->dsisr);
626 - printk("TASK = %p[%d] '%s' THREAD: %p",
627 - current, task_pid_nr(current), current->comm, task_thread_info(current));
628 + printk("TASK = %p[%d,#%u] '%s' THREAD: %p",
629 + current, task_pid_nr(current), current->xid,
630 + current->comm, task_thread_info(current));
633 printk(" CPU: %d", raw_smp_processor_id());
634 diff -NurpP --minimal linux-3.5/arch/powerpc/kernel/traps.c linux-3.5-vs2.3.4/arch/powerpc/kernel/traps.c
635 --- linux-3.5/arch/powerpc/kernel/traps.c 2012-05-21 18:06:30.000000000 +0200
636 +++ linux-3.5-vs2.3.4/arch/powerpc/kernel/traps.c 2012-07-23 01:45:55.000000000 +0200
637 @@ -1118,8 +1118,9 @@ void nonrecoverable_exception(struct pt_
639 void trace_syscall(struct pt_regs *regs)
641 - printk("Task: %p(%d), PC: %08lX/%08lX, Syscall: %3ld, Result: %s%ld %s\n",
642 - current, task_pid_nr(current), regs->nip, regs->link, regs->gpr[0],
643 + printk("Task: %p(%d[#%u]), PC: %08lX/%08lX, Syscall: %3ld, Result: %s%ld %s\n",
644 + current, task_pid_nr(current), current->xid,
645 + regs->nip, regs->link, regs->gpr[0],
646 regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
649 diff -NurpP --minimal linux-3.5/arch/s390/Kconfig linux-3.5-vs2.3.4/arch/s390/Kconfig
650 --- linux-3.5/arch/s390/Kconfig 2012-07-22 23:38:58.000000000 +0200
651 +++ linux-3.5-vs2.3.4/arch/s390/Kconfig 2012-07-23 01:45:55.000000000 +0200
652 @@ -630,6 +630,8 @@ source "fs/Kconfig"
654 source "arch/s390/Kconfig.debug"
656 +source "kernel/vserver/Kconfig"
658 source "security/Kconfig"
660 source "crypto/Kconfig"
661 diff -NurpP --minimal linux-3.5/arch/s390/include/asm/tlb.h linux-3.5-vs2.3.4/arch/s390/include/asm/tlb.h
662 --- linux-3.5/arch/s390/include/asm/tlb.h 2012-07-22 23:38:59.000000000 +0200
663 +++ linux-3.5-vs2.3.4/arch/s390/include/asm/tlb.h 2012-07-23 01:45:55.000000000 +0200
665 #include <linux/mm.h>
666 #include <linux/pagemap.h>
667 #include <linux/swap.h>
669 #include <asm/processor.h>
670 #include <asm/pgalloc.h>
671 #include <asm/tlbflush.h>
672 diff -NurpP --minimal linux-3.5/arch/s390/include/asm/unistd.h linux-3.5-vs2.3.4/arch/s390/include/asm/unistd.h
673 --- linux-3.5/arch/s390/include/asm/unistd.h 2012-03-19 19:46:48.000000000 +0100
674 +++ linux-3.5-vs2.3.4/arch/s390/include/asm/unistd.h 2012-07-23 01:45:55.000000000 +0200
676 #define __NR_clock_gettime (__NR_timer_create+6)
677 #define __NR_clock_getres (__NR_timer_create+7)
678 #define __NR_clock_nanosleep (__NR_timer_create+8)
679 -/* Number 263 is reserved for vserver */
680 +#define __NR_vserver 263
681 #define __NR_statfs64 265
682 #define __NR_fstatfs64 266
683 #define __NR_remap_file_pages 267
684 diff -NurpP --minimal linux-3.5/arch/s390/kernel/ptrace.c linux-3.5-vs2.3.4/arch/s390/kernel/ptrace.c
685 --- linux-3.5/arch/s390/kernel/ptrace.c 2012-07-22 23:38:59.000000000 +0200
686 +++ linux-3.5-vs2.3.4/arch/s390/kernel/ptrace.c 2012-07-23 01:45:55.000000000 +0200
688 #include <linux/tracehook.h>
689 #include <linux/seccomp.h>
690 #include <linux/compat.h>
691 +#include <linux/vs_base.h>
692 #include <trace/syscall.h>
693 #include <asm/segment.h>
694 #include <asm/page.h>
695 diff -NurpP --minimal linux-3.5/arch/s390/kernel/syscalls.S linux-3.5-vs2.3.4/arch/s390/kernel/syscalls.S
696 --- linux-3.5/arch/s390/kernel/syscalls.S 2012-01-09 16:14:06.000000000 +0100
697 +++ linux-3.5-vs2.3.4/arch/s390/kernel/syscalls.S 2012-07-23 01:45:55.000000000 +0200
698 @@ -271,7 +271,7 @@ SYSCALL(sys_clock_settime,sys_clock_sett
699 SYSCALL(sys_clock_gettime,sys_clock_gettime,sys32_clock_gettime_wrapper) /* 260 */
700 SYSCALL(sys_clock_getres,sys_clock_getres,sys32_clock_getres_wrapper)
701 SYSCALL(sys_clock_nanosleep,sys_clock_nanosleep,sys32_clock_nanosleep_wrapper)
702 -NI_SYSCALL /* reserved for vserver */
703 +SYSCALL(sys_vserver,sys_vserver,sys32_vserver)
704 SYSCALL(sys_s390_fadvise64_64,sys_ni_syscall,sys32_fadvise64_64_wrapper)
705 SYSCALL(sys_statfs64,sys_statfs64,compat_sys_statfs64_wrapper)
706 SYSCALL(sys_fstatfs64,sys_fstatfs64,compat_sys_fstatfs64_wrapper)
707 diff -NurpP --minimal linux-3.5/arch/sh/Kconfig linux-3.5-vs2.3.4/arch/sh/Kconfig
708 --- linux-3.5/arch/sh/Kconfig 2012-07-22 23:38:59.000000000 +0200
709 +++ linux-3.5-vs2.3.4/arch/sh/Kconfig 2012-07-23 01:45:55.000000000 +0200
710 @@ -937,6 +937,8 @@ source "fs/Kconfig"
712 source "arch/sh/Kconfig.debug"
714 +source "kernel/vserver/Kconfig"
716 source "security/Kconfig"
718 source "crypto/Kconfig"
719 diff -NurpP --minimal linux-3.5/arch/sh/kernel/irq.c linux-3.5-vs2.3.4/arch/sh/kernel/irq.c
720 --- linux-3.5/arch/sh/kernel/irq.c 2012-07-22 23:38:59.000000000 +0200
721 +++ linux-3.5-vs2.3.4/arch/sh/kernel/irq.c 2012-07-23 01:45:55.000000000 +0200
723 #include <linux/ftrace.h>
724 #include <linux/delay.h>
725 #include <linux/ratelimit.h>
726 +// #include <linux/vs_context.h>
727 #include <asm/processor.h>
728 #include <asm/machvec.h>
729 #include <asm/uaccess.h>
730 diff -NurpP --minimal linux-3.5/arch/sparc/Kconfig linux-3.5-vs2.3.4/arch/sparc/Kconfig
731 --- linux-3.5/arch/sparc/Kconfig 2012-07-22 23:38:59.000000000 +0200
732 +++ linux-3.5-vs2.3.4/arch/sparc/Kconfig 2012-07-23 01:45:55.000000000 +0200
733 @@ -592,6 +592,8 @@ source "fs/Kconfig"
735 source "arch/sparc/Kconfig.debug"
737 +source "kernel/vserver/Kconfig"
739 source "security/Kconfig"
741 source "crypto/Kconfig"
742 diff -NurpP --minimal linux-3.5/arch/sparc/include/asm/unistd.h linux-3.5-vs2.3.4/arch/sparc/include/asm/unistd.h
743 --- linux-3.5/arch/sparc/include/asm/unistd.h 2012-01-09 16:14:07.000000000 +0100
744 +++ linux-3.5-vs2.3.4/arch/sparc/include/asm/unistd.h 2012-07-23 01:45:55.000000000 +0200
746 #define __NR_timer_getoverrun 264
747 #define __NR_timer_delete 265
748 #define __NR_timer_create 266
749 -/* #define __NR_vserver 267 Reserved for VSERVER */
750 +#define __NR_vserver 267
751 #define __NR_io_setup 268
752 #define __NR_io_destroy 269
753 #define __NR_io_submit 270
754 diff -NurpP --minimal linux-3.5/arch/sparc/kernel/systbls_32.S linux-3.5-vs2.3.4/arch/sparc/kernel/systbls_32.S
755 --- linux-3.5/arch/sparc/kernel/systbls_32.S 2012-01-09 16:14:09.000000000 +0100
756 +++ linux-3.5-vs2.3.4/arch/sparc/kernel/systbls_32.S 2012-07-23 01:45:55.000000000 +0200
757 @@ -70,7 +70,7 @@ sys_call_table:
758 /*250*/ .long sys_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_ni_syscall
759 /*255*/ .long sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep
760 /*260*/ .long sys_sched_getaffinity, sys_sched_setaffinity, sys_timer_settime, sys_timer_gettime, sys_timer_getoverrun
761 -/*265*/ .long sys_timer_delete, sys_timer_create, sys_nis_syscall, sys_io_setup, sys_io_destroy
762 +/*265*/ .long sys_timer_delete, sys_timer_create, sys_vserver, sys_io_setup, sys_io_destroy
763 /*270*/ .long sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink
764 /*275*/ .long sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid
765 /*280*/ .long sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat
766 diff -NurpP --minimal linux-3.5/arch/sparc/kernel/systbls_64.S linux-3.5-vs2.3.4/arch/sparc/kernel/systbls_64.S
767 --- linux-3.5/arch/sparc/kernel/systbls_64.S 2012-07-22 23:39:00.000000000 +0200
768 +++ linux-3.5-vs2.3.4/arch/sparc/kernel/systbls_64.S 2012-07-23 01:45:55.000000000 +0200
769 @@ -71,7 +71,7 @@ sys_call_table32:
770 /*250*/ .word sys_mremap, compat_sys_sysctl, sys32_getsid, sys_fdatasync, sys_nis_syscall
771 .word sys32_sync_file_range, compat_sys_clock_settime, compat_sys_clock_gettime, compat_sys_clock_getres, sys32_clock_nanosleep
772 /*260*/ .word compat_sys_sched_getaffinity, compat_sys_sched_setaffinity, sys32_timer_settime, compat_sys_timer_gettime, sys_timer_getoverrun
773 - .word sys_timer_delete, compat_sys_timer_create, sys_ni_syscall, compat_sys_io_setup, sys_io_destroy
774 + .word sys_timer_delete, compat_sys_timer_create, sys32_vserver, compat_sys_io_setup, sys_io_destroy
775 /*270*/ .word sys32_io_submit, sys_io_cancel, compat_sys_io_getevents, sys32_mq_open, sys_mq_unlink
776 .word compat_sys_mq_timedsend, compat_sys_mq_timedreceive, compat_sys_mq_notify, compat_sys_mq_getsetattr, compat_sys_waitid
777 /*280*/ .word sys32_tee, sys_add_key, sys_request_key, compat_sys_keyctl, compat_sys_openat
778 @@ -148,7 +148,7 @@ sys_call_table:
779 /*250*/ .word sys_64_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nis_syscall
780 .word sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep
781 /*260*/ .word sys_sched_getaffinity, sys_sched_setaffinity, sys_timer_settime, sys_timer_gettime, sys_timer_getoverrun
782 - .word sys_timer_delete, sys_timer_create, sys_ni_syscall, sys_io_setup, sys_io_destroy
783 + .word sys_timer_delete, sys_timer_create, sys_vserver, sys_io_setup, sys_io_destroy
784 /*270*/ .word sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink
785 .word sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid
786 /*280*/ .word sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat
787 diff -NurpP --minimal linux-3.5/arch/um/Kconfig.rest linux-3.5-vs2.3.4/arch/um/Kconfig.rest
788 --- linux-3.5/arch/um/Kconfig.rest 2012-01-09 16:14:09.000000000 +0100
789 +++ linux-3.5-vs2.3.4/arch/um/Kconfig.rest 2012-07-23 01:45:55.000000000 +0200
790 @@ -12,6 +12,8 @@ source "arch/um/Kconfig.net"
794 +source "kernel/vserver/Kconfig"
796 source "security/Kconfig"
798 source "crypto/Kconfig"
799 diff -NurpP --minimal linux-3.5/arch/um/include/shared/kern_constants.h linux-3.5-vs2.3.4/arch/um/include/shared/kern_constants.h
800 --- linux-3.5/arch/um/include/shared/kern_constants.h 1970-01-01 01:00:00.000000000 +0100
801 +++ linux-3.5-vs2.3.4/arch/um/include/shared/kern_constants.h 2012-07-23 01:45:55.000000000 +0200
803 +#include "../../../../include/generated/asm-offsets.h"
804 diff -NurpP --minimal linux-3.5/arch/um/include/shared/user_constants.h linux-3.5-vs2.3.4/arch/um/include/shared/user_constants.h
805 --- linux-3.5/arch/um/include/shared/user_constants.h 1970-01-01 01:00:00.000000000 +0100
806 +++ linux-3.5-vs2.3.4/arch/um/include/shared/user_constants.h 2012-07-23 01:45:55.000000000 +0200
811 + * This file was generated by arch/um/Makefile
815 +#define HOST_SC_CR2 176 /* offsetof(struct sigcontext, cr2) # */
816 +#define HOST_SC_ERR 152 /* offsetof(struct sigcontext, err) # */
817 +#define HOST_SC_TRAPNO 160 /* offsetof(struct sigcontext, trapno) # */
818 +#define HOST_FP_SIZE 64 /* sizeof(struct _fpstate) / sizeof(unsigned long) # */
819 +#define HOST_RBX 5 /* RBX # */
820 +#define HOST_RCX 11 /* RCX # */
821 +#define HOST_RDI 14 /* RDI # */
822 +#define HOST_RSI 13 /* RSI # */
823 +#define HOST_RDX 12 /* RDX # */
824 +#define HOST_RBP 4 /* RBP # */
825 +#define HOST_RAX 10 /* RAX # */
826 +#define HOST_R8 9 /* R8 # */
827 +#define HOST_R9 8 /* R9 # */
828 +#define HOST_R10 7 /* R10 # */
829 +#define HOST_R11 6 /* R11 # */
830 +#define HOST_R12 3 /* R12 # */
831 +#define HOST_R13 2 /* R13 # */
832 +#define HOST_R14 1 /* R14 # */
833 +#define HOST_R15 0 /* R15 # */
834 +#define HOST_ORIG_RAX 15 /* ORIG_RAX # */
835 +#define HOST_CS 17 /* CS # */
836 +#define HOST_SS 20 /* SS # */
837 +#define HOST_EFLAGS 18 /* EFLAGS # */
838 +#define HOST_IP 16 /* RIP # */
839 +#define HOST_SP 19 /* RSP # */
840 +#define UM_FRAME_SIZE 216 /* sizeof(struct user_regs_struct) # */
841 +#define UM_POLLIN 1 /* POLLIN # */
842 +#define UM_POLLPRI 2 /* POLLPRI # */
843 +#define UM_POLLOUT 4 /* POLLOUT # */
844 +#define UM_PROT_READ 1 /* PROT_READ # */
845 +#define UM_PROT_WRITE 2 /* PROT_WRITE # */
846 +#define UM_PROT_EXEC 4 /* PROT_EXEC # */
848 diff -NurpP --minimal linux-3.5/arch/x86/Kconfig linux-3.5-vs2.3.4/arch/x86/Kconfig
849 --- linux-3.5/arch/x86/Kconfig 2012-07-22 23:39:01.000000000 +0200
850 +++ linux-3.5-vs2.3.4/arch/x86/Kconfig 2012-07-23 01:45:55.000000000 +0200
851 @@ -2226,6 +2226,8 @@ source "fs/Kconfig"
853 source "arch/x86/Kconfig.debug"
855 +source "kernel/vserver/Kconfig"
857 source "security/Kconfig"
859 source "crypto/Kconfig"
860 diff -NurpP --minimal linux-3.5/arch/x86/syscalls/syscall_32.tbl linux-3.5-vs2.3.4/arch/x86/syscalls/syscall_32.tbl
861 --- linux-3.5/arch/x86/syscalls/syscall_32.tbl 2012-07-22 23:39:02.000000000 +0200
862 +++ linux-3.5-vs2.3.4/arch/x86/syscalls/syscall_32.tbl 2012-07-23 01:45:55.000000000 +0200
864 270 i386 tgkill sys_tgkill
865 271 i386 utimes sys_utimes compat_sys_utimes
866 272 i386 fadvise64_64 sys_fadvise64_64 sys32_fadvise64_64
868 +273 i386 vserver sys_vserver sys32_vserver
869 274 i386 mbind sys_mbind
870 275 i386 get_mempolicy sys_get_mempolicy compat_sys_get_mempolicy
871 276 i386 set_mempolicy sys_set_mempolicy
872 diff -NurpP --minimal linux-3.5/arch/x86/syscalls/syscall_64.tbl linux-3.5-vs2.3.4/arch/x86/syscalls/syscall_64.tbl
873 --- linux-3.5/arch/x86/syscalls/syscall_64.tbl 2012-07-22 23:39:02.000000000 +0200
874 +++ linux-3.5-vs2.3.4/arch/x86/syscalls/syscall_64.tbl 2012-07-23 01:45:55.000000000 +0200
876 233 common epoll_ctl sys_epoll_ctl
877 234 common tgkill sys_tgkill
878 235 common utimes sys_utimes
880 +236 64 vserver sys_vserver
881 237 common mbind sys_mbind
882 238 common set_mempolicy sys_set_mempolicy
883 239 common get_mempolicy sys_get_mempolicy
884 diff -NurpP --minimal linux-3.5/drivers/block/Kconfig linux-3.5-vs2.3.4/drivers/block/Kconfig
885 --- linux-3.5/drivers/block/Kconfig 2012-05-21 18:06:43.000000000 +0200
886 +++ linux-3.5-vs2.3.4/drivers/block/Kconfig 2012-07-23 01:45:55.000000000 +0200
887 @@ -290,6 +290,13 @@ config BLK_DEV_CRYPTOLOOP
889 source "drivers/block/drbd/Kconfig"
891 +config BLK_DEV_VROOT
892 + tristate "Virtual Root device support"
893 + depends on QUOTACTL
895 + Saying Y here will allow you to use quota/fs ioctls on a shared
896 + partition within a virtual server without compromising security.
899 tristate "Network block device support"
901 diff -NurpP --minimal linux-3.5/drivers/block/Makefile linux-3.5-vs2.3.4/drivers/block/Makefile
902 --- linux-3.5/drivers/block/Makefile 2012-03-19 19:46:52.000000000 +0100
903 +++ linux-3.5-vs2.3.4/drivers/block/Makefile 2012-07-23 01:45:55.000000000 +0200
904 @@ -35,6 +35,7 @@ obj-$(CONFIG_VIODASD) += viodasd.o
905 obj-$(CONFIG_BLK_DEV_SX8) += sx8.o
906 obj-$(CONFIG_BLK_DEV_UB) += ub.o
907 obj-$(CONFIG_BLK_DEV_HD) += hd.o
908 +obj-$(CONFIG_BLK_DEV_VROOT) += vroot.o
910 obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o
911 obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/
912 diff -NurpP --minimal linux-3.5/drivers/block/loop.c linux-3.5-vs2.3.4/drivers/block/loop.c
913 --- linux-3.5/drivers/block/loop.c 2012-07-22 23:39:02.000000000 +0200
914 +++ linux-3.5-vs2.3.4/drivers/block/loop.c 2012-07-23 01:45:55.000000000 +0200
916 #include <linux/sysfs.h>
917 #include <linux/miscdevice.h>
918 #include <linux/falloc.h>
919 +#include <linux/vs_context.h>
921 #include <asm/uaccess.h>
923 @@ -869,6 +870,7 @@ static int loop_set_fd(struct loop_devic
924 lo->lo_blocksize = lo_blocksize;
925 lo->lo_device = bdev;
926 lo->lo_flags = lo_flags;
927 + lo->lo_xid = vx_current_xid();
928 lo->lo_backing_file = file;
929 lo->transfer = transfer_none;
931 @@ -1001,6 +1003,7 @@ static int loop_clr_fd(struct loop_devic
932 lo->lo_sizelimit = 0;
933 lo->lo_encrypt_key_size = 0;
934 lo->lo_thread = NULL;
936 memset(lo->lo_encrypt_key, 0, LO_KEY_SIZE);
937 memset(lo->lo_crypt_name, 0, LO_NAME_SIZE);
938 memset(lo->lo_file_name, 0, LO_NAME_SIZE);
939 @@ -1042,7 +1045,7 @@ loop_set_status(struct loop_device *lo,
941 if (lo->lo_encrypt_key_size &&
942 lo->lo_key_owner != uid &&
943 - !capable(CAP_SYS_ADMIN))
944 + !vx_capable(CAP_SYS_ADMIN, VXC_ADMIN_CLOOP))
946 if (lo->lo_state != Lo_bound)
948 @@ -1132,7 +1135,8 @@ loop_get_status(struct loop_device *lo,
949 memcpy(info->lo_crypt_name, lo->lo_crypt_name, LO_NAME_SIZE);
950 info->lo_encrypt_type =
951 lo->lo_encryption ? lo->lo_encryption->number : 0;
952 - if (lo->lo_encrypt_key_size && capable(CAP_SYS_ADMIN)) {
953 + if (lo->lo_encrypt_key_size &&
954 + vx_capable(CAP_SYS_ADMIN, VXC_ADMIN_CLOOP)) {
955 info->lo_encrypt_key_size = lo->lo_encrypt_key_size;
956 memcpy(info->lo_encrypt_key, lo->lo_encrypt_key,
957 lo->lo_encrypt_key_size);
958 @@ -1492,6 +1496,11 @@ static int lo_open(struct block_device *
962 + if (!vx_check(lo->lo_xid, VS_IDENT|VS_HOSTID|VS_ADMIN_P)) {
967 mutex_lock(&lo->lo_ctl_mutex);
969 mutex_unlock(&lo->lo_ctl_mutex);
970 diff -NurpP --minimal linux-3.5/drivers/block/vroot.c linux-3.5-vs2.3.4/drivers/block/vroot.c
971 --- linux-3.5/drivers/block/vroot.c 1970-01-01 01:00:00.000000000 +0100
972 +++ linux-3.5-vs2.3.4/drivers/block/vroot.c 2012-07-23 01:45:55.000000000 +0200
975 + * linux/drivers/block/vroot.c
977 + * written by Herbert Pötzl, 9/11/2002
978 + * ported to 2.6.10 by Herbert Pötzl, 30/12/2004
980 + * based on the loop.c code by Theodore Ts'o.
982 + * Copyright (C) 2002-2007 by Herbert Pötzl.
983 + * Redistribution of this file is permitted under the
984 + * GNU General Public License.
988 +#include <linux/module.h>
989 +#include <linux/moduleparam.h>
990 +#include <linux/file.h>
991 +#include <linux/major.h>
992 +#include <linux/blkdev.h>
993 +#include <linux/slab.h>
995 +#include <linux/vroot.h>
996 +#include <linux/vs_context.h>
999 +static int max_vroot = 8;
1001 +static struct vroot_device *vroot_dev;
1002 +static struct gendisk **disks;
1005 +static int vroot_set_dev(
1006 + struct vroot_device *vr,
1007 + struct block_device *bdev,
1010 + struct block_device *real_bdev;
1011 + struct file *file;
1012 + struct inode *inode;
1016 + if (vr->vr_state != Vr_unbound)
1025 + inode = file->f_dentry->d_inode;
1028 + if (S_ISBLK(inode->i_mode)) {
1029 + real_bdev = inode->i_bdev;
1030 + vr->vr_device = real_bdev;
1031 + __iget(real_bdev->bd_inode);
1035 + vxdprintk(VXD_CBIT(misc, 0),
1036 + "vroot[%d]_set_dev: dev=" VXF_DEV,
1037 + vr->vr_number, VXD_DEV(real_bdev));
1039 + vr->vr_state = Vr_bound;
1048 +static int vroot_clr_dev(
1049 + struct vroot_device *vr,
1050 + struct block_device *bdev)
1052 + struct block_device *real_bdev;
1054 + if (vr->vr_state != Vr_bound)
1056 + if (vr->vr_refcnt > 1) /* we needed one fd for the ioctl */
1059 + real_bdev = vr->vr_device;
1061 + vxdprintk(VXD_CBIT(misc, 0),
1062 + "vroot[%d]_clr_dev: dev=" VXF_DEV,
1063 + vr->vr_number, VXD_DEV(real_bdev));
1066 + vr->vr_state = Vr_unbound;
1067 + vr->vr_device = NULL;
1072 +static int vr_ioctl(struct block_device *bdev, fmode_t mode,
1073 + unsigned int cmd, unsigned long arg)
1075 + struct vroot_device *vr = bdev->bd_disk->private_data;
1078 + down(&vr->vr_ctl_mutex);
1080 + case VROOT_SET_DEV:
1081 + err = vroot_set_dev(vr, bdev, arg);
1083 + case VROOT_CLR_DEV:
1084 + err = vroot_clr_dev(vr, bdev);
1090 + up(&vr->vr_ctl_mutex);
1094 +static int vr_open(struct block_device *bdev, fmode_t mode)
1096 + struct vroot_device *vr = bdev->bd_disk->private_data;
1098 + down(&vr->vr_ctl_mutex);
1100 + up(&vr->vr_ctl_mutex);
1104 +static int vr_release(struct gendisk *disk, fmode_t mode)
1106 + struct vroot_device *vr = disk->private_data;
1108 + down(&vr->vr_ctl_mutex);
1110 + up(&vr->vr_ctl_mutex);
1114 +static struct block_device_operations vr_fops = {
1115 + .owner = THIS_MODULE,
1117 + .release = vr_release,
1118 + .ioctl = vr_ioctl,
1121 +static void vroot_make_request(struct request_queue *q, struct bio *bio)
1123 + printk("vroot_make_request %p, %p\n", q, bio);
1124 + bio_io_error(bio);
1127 +struct block_device *__vroot_get_real_bdev(struct block_device *bdev)
1129 + struct inode *inode = bdev->bd_inode;
1130 + struct vroot_device *vr;
1131 + struct block_device *real_bdev;
1132 + int minor = iminor(inode);
1134 + vr = &vroot_dev[minor];
1135 + real_bdev = vr->vr_device;
1137 + vxdprintk(VXD_CBIT(misc, 0),
1138 + "vroot[%d]_get_real_bdev: dev=" VXF_DEV,
1139 + vr->vr_number, VXD_DEV(real_bdev));
1141 + if (vr->vr_state != Vr_bound)
1142 + return ERR_PTR(-ENXIO);
1144 + __iget(real_bdev->bd_inode);
1151 + * And now the modules code and kernel interface.
1154 +module_param(max_vroot, int, 0);
1156 +MODULE_PARM_DESC(max_vroot, "Maximum number of vroot devices (1-256)");
1157 +MODULE_LICENSE("GPL");
1158 +MODULE_ALIAS_BLOCKDEV_MAJOR(VROOT_MAJOR);
1160 +MODULE_AUTHOR ("Herbert Pötzl");
1161 +MODULE_DESCRIPTION ("Virtual Root Device Mapper");
1164 +int __init vroot_init(void)
1168 + if (max_vroot < 1 || max_vroot > 256) {
1169 + max_vroot = MAX_VROOT_DEFAULT;
1170 + printk(KERN_WARNING "vroot: invalid max_vroot "
1171 + "(must be between 1 and 256), "
1172 + "using default (%d)\n", max_vroot);
1175 + if (register_blkdev(VROOT_MAJOR, "vroot"))
1179 + vroot_dev = kmalloc(max_vroot * sizeof(struct vroot_device), GFP_KERNEL);
1182 + memset(vroot_dev, 0, max_vroot * sizeof(struct vroot_device));
1184 + disks = kmalloc(max_vroot * sizeof(struct gendisk *), GFP_KERNEL);
1188 + for (i = 0; i < max_vroot; i++) {
1189 + disks[i] = alloc_disk(1);
1192 + disks[i]->queue = blk_alloc_queue(GFP_KERNEL);
1193 + if (!disks[i]->queue)
1195 + blk_queue_make_request(disks[i]->queue, vroot_make_request);
1198 + for (i = 0; i < max_vroot; i++) {
1199 + struct vroot_device *vr = &vroot_dev[i];
1200 + struct gendisk *disk = disks[i];
1202 + memset(vr, 0, sizeof(*vr));
1203 + sema_init(&vr->vr_ctl_mutex, 1);
1204 + vr->vr_number = i;
1205 + disk->major = VROOT_MAJOR;
1206 + disk->first_minor = i;
1207 + disk->fops = &vr_fops;
1208 + sprintf(disk->disk_name, "vroot%d", i);
1209 + disk->private_data = vr;
1212 + err = register_vroot_grb(&__vroot_get_real_bdev);
1216 + for (i = 0; i < max_vroot; i++)
1217 + add_disk(disks[i]);
1218 + printk(KERN_INFO "vroot: loaded (max %d devices)\n", max_vroot);
1223 + put_disk(disks[i]);
1228 + unregister_blkdev(VROOT_MAJOR, "vroot");
1229 + printk(KERN_ERR "vroot: ran out of memory\n");
1233 +void vroot_exit(void)
1237 + if (unregister_vroot_grb(&__vroot_get_real_bdev))
1238 + printk(KERN_WARNING "vroot: cannot unregister grb\n");
1240 + for (i = 0; i < max_vroot; i++) {
1241 + del_gendisk(disks[i]);
1242 + put_disk(disks[i]);
1244 + unregister_blkdev(VROOT_MAJOR, "vroot");
1250 +module_init(vroot_init);
1251 +module_exit(vroot_exit);
1255 +static int __init max_vroot_setup(char *str)
1257 + max_vroot = simple_strtol(str, NULL, 0);
1261 +__setup("max_vroot=", max_vroot_setup);
1265 diff -NurpP --minimal linux-3.5/drivers/infiniband/Kconfig linux-3.5-vs2.3.4/drivers/infiniband/Kconfig
1266 --- linux-3.5/drivers/infiniband/Kconfig 2012-07-22 23:39:06.000000000 +0200
1267 +++ linux-3.5-vs2.3.4/drivers/infiniband/Kconfig 2012-07-23 01:45:55.000000000 +0200
1268 @@ -39,7 +39,7 @@ config INFINIBAND_USER_MEM
1269 config INFINIBAND_ADDR_TRANS
1272 - depends on !(INFINIBAND = y && IPV6 = m)
1273 + depends on !(INFINIBAND = y && IPV6 = y)
1276 source "drivers/infiniband/hw/mthca/Kconfig"
1277 diff -NurpP --minimal linux-3.5/drivers/infiniband/core/addr.c linux-3.5-vs2.3.4/drivers/infiniband/core/addr.c
1278 --- linux-3.5/drivers/infiniband/core/addr.c 2012-05-21 18:06:46.000000000 +0200
1279 +++ linux-3.5-vs2.3.4/drivers/infiniband/core/addr.c 2012-07-23 01:45:55.000000000 +0200
1280 @@ -263,7 +263,7 @@ static int addr6_resolve(struct sockaddr
1282 if (ipv6_addr_any(&fl6.saddr)) {
1283 ret = ipv6_dev_get_saddr(&init_net, ip6_dst_idev(dst)->dev,
1284 - &fl6.daddr, 0, &fl6.saddr);
1285 + &fl6.daddr, 0, &fl6.saddr, NULL);
1289 diff -NurpP --minimal linux-3.5/drivers/md/dm-ioctl.c linux-3.5-vs2.3.4/drivers/md/dm-ioctl.c
1290 --- linux-3.5/drivers/md/dm-ioctl.c 2012-05-21 18:06:49.000000000 +0200
1291 +++ linux-3.5-vs2.3.4/drivers/md/dm-ioctl.c 2012-07-23 01:45:55.000000000 +0200
1293 #include <linux/dm-ioctl.h>
1294 #include <linux/hdreg.h>
1295 #include <linux/compat.h>
1296 +#include <linux/vs_context.h>
1298 #include <asm/uaccess.h>
1300 @@ -106,7 +107,8 @@ static struct hash_cell *__get_name_cell
1301 unsigned int h = hash_str(str);
1303 list_for_each_entry (hc, _name_buckets + h, name_list)
1304 - if (!strcmp(hc->name, str)) {
1305 + if (vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT) &&
1306 + !strcmp(hc->name, str)) {
1310 @@ -120,7 +122,8 @@ static struct hash_cell *__get_uuid_cell
1311 unsigned int h = hash_str(str);
1313 list_for_each_entry (hc, _uuid_buckets + h, uuid_list)
1314 - if (!strcmp(hc->uuid, str)) {
1315 + if (vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT) &&
1316 + !strcmp(hc->uuid, str)) {
1320 @@ -131,13 +134,15 @@ static struct hash_cell *__get_uuid_cell
1321 static struct hash_cell *__get_dev_cell(uint64_t dev)
1323 struct mapped_device *md;
1324 - struct hash_cell *hc;
1325 + struct hash_cell *hc = NULL;
1327 md = dm_get_md(huge_decode_dev(dev));
1331 - hc = dm_get_mdptr(md);
1332 + if (vx_check(dm_get_xid(md), VS_WATCH_P | VS_IDENT))
1333 + hc = dm_get_mdptr(md);
1338 @@ -445,6 +450,9 @@ typedef int (*ioctl_fn)(struct dm_ioctl
1340 static int remove_all(struct dm_ioctl *param, size_t param_size)
1342 + if (!vx_check(0, VS_ADMIN))
1345 dm_hash_remove_all(1);
1346 param->data_size = 0;
1348 @@ -492,6 +500,8 @@ static int list_devices(struct dm_ioctl
1350 for (i = 0; i < NUM_BUCKETS; i++) {
1351 list_for_each_entry (hc, _name_buckets + i, name_list) {
1352 + if (!vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT))
1354 needed += sizeof(struct dm_name_list);
1355 needed += strlen(hc->name) + 1;
1356 needed += ALIGN_MASK;
1357 @@ -515,6 +525,8 @@ static int list_devices(struct dm_ioctl
1359 for (i = 0; i < NUM_BUCKETS; i++) {
1360 list_for_each_entry (hc, _name_buckets + i, name_list) {
1361 + if (!vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT))
1364 old_nl->next = (uint32_t) ((void *) nl -
1366 @@ -1616,8 +1628,8 @@ static int ctl_ioctl(uint command, struc
1368 size_t input_param_size;
1370 - /* only root can play with this */
1371 - if (!capable(CAP_SYS_ADMIN))
1372 + /* only root and certain contexts can play with this */
1373 + if (!vx_capable(CAP_SYS_ADMIN, VXC_ADMIN_MAPPER))
1376 if (_IOC_TYPE(command) != DM_IOCTL)
1377 diff -NurpP --minimal linux-3.5/drivers/md/dm.c linux-3.5-vs2.3.4/drivers/md/dm.c
1378 --- linux-3.5/drivers/md/dm.c 2012-05-21 18:06:49.000000000 +0200
1379 +++ linux-3.5-vs2.3.4/drivers/md/dm.c 2012-07-23 01:45:55.000000000 +0200
1381 #include <linux/idr.h>
1382 #include <linux/hdreg.h>
1383 #include <linux/delay.h>
1384 +#include <linux/vs_base.h>
1386 #include <trace/events/block.h>
1388 @@ -131,6 +132,7 @@ struct mapped_device {
1391 atomic_t open_count;
1394 unsigned long flags;
1396 @@ -343,6 +345,7 @@ int dm_deleting_md(struct mapped_device
1397 static int dm_blk_open(struct block_device *bdev, fmode_t mode)
1399 struct mapped_device *md;
1402 spin_lock(&_minor_lock);
1404 @@ -351,18 +354,19 @@ static int dm_blk_open(struct block_devi
1407 if (test_bit(DMF_FREEING, &md->flags) ||
1408 - dm_deleting_md(md)) {
1410 + dm_deleting_md(md))
1414 + if (!vx_check(md->xid, VS_IDENT|VS_HOSTID))
1419 atomic_inc(&md->open_count);
1423 spin_unlock(&_minor_lock);
1425 - return md ? 0 : -ENXIO;
1429 static int dm_blk_close(struct gendisk *disk, fmode_t mode)
1430 @@ -583,6 +587,14 @@ int dm_set_geometry(struct mapped_device
1435 + * Get the xid associated with a dm device
1437 +xid_t dm_get_xid(struct mapped_device *md)
1442 /*-----------------------------------------------------------------
1444 * A more elegant soln is in the works that uses the queue
1445 @@ -1850,6 +1862,7 @@ static struct mapped_device *alloc_dev(i
1446 INIT_LIST_HEAD(&md->uevent_list);
1447 spin_lock_init(&md->uevent_lock);
1449 + md->xid = vx_current_xid();
1450 md->queue = blk_alloc_queue(GFP_KERNEL);
1453 diff -NurpP --minimal linux-3.5/drivers/md/dm.h linux-3.5-vs2.3.4/drivers/md/dm.h
1454 --- linux-3.5/drivers/md/dm.h 2012-01-09 16:14:21.000000000 +0100
1455 +++ linux-3.5-vs2.3.4/drivers/md/dm.h 2012-07-23 01:45:55.000000000 +0200
1456 @@ -41,6 +41,8 @@ struct dm_dev_internal {
1458 struct dm_md_mempools;
1460 +xid_t dm_get_xid(struct mapped_device *md);
1462 /*-----------------------------------------------------------------
1463 * Internal table functions.
1464 *---------------------------------------------------------------*/
1465 diff -NurpP --minimal linux-3.5/drivers/net/tun.c linux-3.5-vs2.3.4/drivers/net/tun.c
1466 --- linux-3.5/drivers/net/tun.c 2012-07-22 23:39:17.000000000 +0200
1467 +++ linux-3.5-vs2.3.4/drivers/net/tun.c 2012-07-23 01:45:55.000000000 +0200
1469 #include <linux/nsproxy.h>
1470 #include <linux/virtio_net.h>
1471 #include <linux/rcupdate.h>
1472 +#include <linux/vs_network.h>
1473 #include <net/net_namespace.h>
1474 #include <net/netns/generic.h>
1475 #include <net/rtnetlink.h>
1476 @@ -120,6 +121,7 @@ struct tun_struct {
1482 struct net_device *dev;
1483 netdev_features_t set_features;
1484 @@ -909,6 +911,7 @@ static void tun_setup(struct net_device
1488 + tun->nid = current->nid;
1490 dev->ethtool_ops = &tun_ethtool_ops;
1491 dev->destructor = tun_free_netdev;
1492 @@ -1067,7 +1070,7 @@ static int tun_set_iff(struct net *net,
1494 if (((tun->owner != -1 && cred->euid != tun->owner) ||
1495 (tun->group != -1 && !in_egroup_p(tun->group))) &&
1496 - !capable(CAP_NET_ADMIN))
1497 + !cap_raised(current_cap(), CAP_NET_ADMIN))
1499 err = security_tun_dev_attach(tun->socket.sk);
1501 @@ -1081,7 +1084,7 @@ static int tun_set_iff(struct net *net,
1503 unsigned long flags = 0;
1505 - if (!capable(CAP_NET_ADMIN))
1506 + if (!nx_capable(CAP_NET_ADMIN, NXC_TUN_CREATE))
1508 err = security_tun_dev_create();
1510 @@ -1150,6 +1153,9 @@ static int tun_set_iff(struct net *net,
1512 sk->sk_destruct = tun_sock_destruct;
1514 + if (!nx_check(tun->nid, VS_IDENT | VS_HOSTID | VS_ADMIN_P))
1517 err = tun_attach(tun, file);
1520 @@ -1331,6 +1337,16 @@ static long __tun_chr_ioctl(struct file
1521 tun_debug(KERN_INFO, tun, "group set to %d\n", tun->group);
1525 + if (!capable(CAP_CONTEXT))
1528 + /* Set nid owner of the device */
1529 + tun->nid = (nid_t) arg;
1531 + tun_debug(KERN_INFO, tun, "nid owner set to %u\n", tun->nid);
1535 /* Only allow setting the type when the interface is down */
1536 if (tun->dev->flags & IFF_UP) {
1537 diff -NurpP --minimal linux-3.5/drivers/tty/sysrq.c linux-3.5-vs2.3.4/drivers/tty/sysrq.c
1538 --- linux-3.5/drivers/tty/sysrq.c 2012-05-21 18:07:16.000000000 +0200
1539 +++ linux-3.5-vs2.3.4/drivers/tty/sysrq.c 2012-07-23 01:45:55.000000000 +0200
1541 #include <linux/slab.h>
1542 #include <linux/input.h>
1543 #include <linux/uaccess.h>
1544 +#include <linux/vserver/debug.h>
1546 #include <asm/ptrace.h>
1547 #include <asm/irq_regs.h>
1548 @@ -398,6 +399,21 @@ static struct sysrq_key_op sysrq_unrt_op
1549 .enable_mask = SYSRQ_ENABLE_RTNICE,
1553 +#ifdef CONFIG_VSERVER_DEBUG
1554 +static void sysrq_handle_vxinfo(int key)
1556 + dump_vx_info_inactive((key == 'x') ? 0 : 1);
1559 +static struct sysrq_key_op sysrq_showvxinfo_op = {
1560 + .handler = sysrq_handle_vxinfo,
1561 + .help_msg = "conteXt",
1562 + .action_msg = "Show Context Info",
1563 + .enable_mask = SYSRQ_ENABLE_DUMP,
1567 /* Key Operations table and lock */
1568 static DEFINE_SPINLOCK(sysrq_key_table_lock);
1570 @@ -452,7 +468,11 @@ static struct sysrq_key_op *sysrq_key_ta
1572 &sysrq_showstate_blocked_op, /* w */
1573 /* x: May be registered on ppc/powerpc for xmon */
1574 +#ifdef CONFIG_VSERVER_DEBUG
1575 + &sysrq_showvxinfo_op, /* x */
1579 /* y: May be registered on sparc64 for global register dump */
1581 &sysrq_ftrace_dump_op, /* z */
1582 @@ -467,6 +487,8 @@ static int sysrq_key_table_key2index(int
1584 else if ((key >= 'a') && (key <= 'z'))
1585 retval = key + 10 - 'a';
1586 + else if ((key >= 'A') && (key <= 'Z'))
1587 + retval = key + 10 - 'A';
1591 diff -NurpP --minimal linux-3.5/drivers/tty/tty_io.c linux-3.5-vs2.3.4/drivers/tty/tty_io.c
1592 --- linux-3.5/drivers/tty/tty_io.c 2012-07-22 23:39:32.000000000 +0200
1593 +++ linux-3.5-vs2.3.4/drivers/tty/tty_io.c 2012-07-23 01:45:55.000000000 +0200
1596 #include <linux/kmod.h>
1597 #include <linux/nsproxy.h>
1598 +#include <linux/vs_pid.h>
1600 #undef TTY_DEBUG_HANGUP
1602 @@ -2123,7 +2124,8 @@ static int tiocsti(struct tty_struct *tt
1604 struct tty_ldisc *ld;
1606 - if ((current->signal->tty != tty) && !capable(CAP_SYS_ADMIN))
1607 + if (((current->signal->tty != tty) &&
1608 + !vx_capable(CAP_SYS_ADMIN, VXC_TIOCSTI)))
1610 if (get_user(ch, p))
1612 @@ -2411,6 +2413,7 @@ static int tiocspgrp(struct tty_struct *
1614 if (get_user(pgrp_nr, p))
1616 + pgrp_nr = vx_rmap_pid(pgrp_nr);
1620 diff -NurpP --minimal linux-3.5/fs/attr.c linux-3.5-vs2.3.4/fs/attr.c
1621 --- linux-3.5/fs/attr.c 2012-07-22 23:39:35.000000000 +0200
1622 +++ linux-3.5-vs2.3.4/fs/attr.c 2012-07-23 01:45:55.000000000 +0200
1624 #include <linux/fcntl.h>
1625 #include <linux/security.h>
1626 #include <linux/evm.h>
1627 +#include <linux/proc_fs.h>
1628 +#include <linux/devpts_fs.h>
1629 +#include <linux/vs_tag.h>
1632 * inode_change_ok - check if attribute changes to an inode are allowed
1633 @@ -74,6 +77,10 @@ int inode_change_ok(const struct inode *
1637 + /* check for inode tag permission */
1638 + if (dx_permission(inode, MAY_WRITE))
1643 EXPORT_SYMBOL(inode_change_ok);
1644 @@ -144,6 +151,8 @@ void setattr_copy(struct inode *inode, c
1645 inode->i_uid = attr->ia_uid;
1646 if (ia_valid & ATTR_GID)
1647 inode->i_gid = attr->ia_gid;
1648 + if ((ia_valid & ATTR_TAG) && IS_TAGGED(inode))
1649 + inode->i_tag = attr->ia_tag;
1650 if (ia_valid & ATTR_ATIME)
1651 inode->i_atime = timespec_trunc(attr->ia_atime,
1652 inode->i_sb->s_time_gran);
1653 @@ -171,7 +180,8 @@ int notify_change(struct dentry * dentry
1654 struct timespec now;
1655 unsigned int ia_valid = attr->ia_valid;
1657 - if (ia_valid & (ATTR_MODE | ATTR_UID | ATTR_GID | ATTR_TIMES_SET)) {
1658 + if (ia_valid & (ATTR_MODE | ATTR_UID | ATTR_GID |
1659 + ATTR_TAG | ATTR_TIMES_SET)) {
1660 if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
1663 diff -NurpP --minimal linux-3.5/fs/block_dev.c linux-3.5-vs2.3.4/fs/block_dev.c
1664 --- linux-3.5/fs/block_dev.c 2012-07-22 23:39:35.000000000 +0200
1665 +++ linux-3.5-vs2.3.4/fs/block_dev.c 2012-07-23 01:45:55.000000000 +0200
1667 #include <linux/namei.h>
1668 #include <linux/log2.h>
1669 #include <linux/cleancache.h>
1670 +#include <linux/vs_device.h>
1671 #include <asm/uaccess.h>
1672 #include "internal.h"
1674 @@ -581,6 +582,7 @@ struct block_device *bdget(dev_t dev)
1675 bdev->bd_invalidated = 0;
1676 inode->i_mode = S_IFBLK;
1677 inode->i_rdev = dev;
1678 + inode->i_mdev = dev;
1679 inode->i_bdev = bdev;
1680 inode->i_data.a_ops = &def_blk_aops;
1681 mapping_set_gfp_mask(&inode->i_data, GFP_USER);
1682 @@ -627,6 +629,11 @@ EXPORT_SYMBOL(bdput);
1683 static struct block_device *bd_acquire(struct inode *inode)
1685 struct block_device *bdev;
1688 + if (!vs_map_blkdev(inode->i_rdev, &mdev, DATTR_OPEN))
1690 + inode->i_mdev = mdev;
1692 spin_lock(&bdev_lock);
1693 bdev = inode->i_bdev;
1694 @@ -637,7 +644,7 @@ static struct block_device *bd_acquire(s
1696 spin_unlock(&bdev_lock);
1698 - bdev = bdget(inode->i_rdev);
1699 + bdev = bdget(mdev);
1701 spin_lock(&bdev_lock);
1702 if (!inode->i_bdev) {
1703 diff -NurpP --minimal linux-3.5/fs/btrfs/ctree.h linux-3.5-vs2.3.4/fs/btrfs/ctree.h
1704 --- linux-3.5/fs/btrfs/ctree.h 2012-07-22 23:39:35.000000000 +0200
1705 +++ linux-3.5-vs2.3.4/fs/btrfs/ctree.h 2012-07-23 01:45:55.000000000 +0200
1706 @@ -671,11 +671,14 @@ struct btrfs_inode_item {
1707 /* modification sequence number for NFS */
1712 * a little future expansion, for more than this we can
1713 * just grow the inode item and version it
1715 - __le64 reserved[4];
1716 + __le16 reserved16;
1717 + __le32 reserved32;
1718 + __le64 reserved[3];
1719 struct btrfs_timespec atime;
1720 struct btrfs_timespec ctime;
1721 struct btrfs_timespec mtime;
1722 @@ -1568,6 +1571,8 @@ struct btrfs_ioctl_defrag_range_args {
1723 #define BTRFS_MOUNT_CHECK_INTEGRITY_INCLUDING_EXTENT_DATA (1 << 21)
1724 #define BTRFS_MOUNT_PANIC_ON_FATAL_ERROR (1 << 22)
1726 +#define BTRFS_MOUNT_TAGGED (1 << 24)
1728 #define btrfs_clear_opt(o, opt) ((o) &= ~BTRFS_MOUNT_##opt)
1729 #define btrfs_set_opt(o, opt) ((o) |= BTRFS_MOUNT_##opt)
1730 #define btrfs_test_opt(root, opt) ((root)->fs_info->mount_opt & \
1731 @@ -1788,6 +1793,7 @@ BTRFS_SETGET_FUNCS(inode_block_group, st
1732 BTRFS_SETGET_FUNCS(inode_nlink, struct btrfs_inode_item, nlink, 32);
1733 BTRFS_SETGET_FUNCS(inode_uid, struct btrfs_inode_item, uid, 32);
1734 BTRFS_SETGET_FUNCS(inode_gid, struct btrfs_inode_item, gid, 32);
1735 +BTRFS_SETGET_FUNCS(inode_tag, struct btrfs_inode_item, tag, 16);
1736 BTRFS_SETGET_FUNCS(inode_mode, struct btrfs_inode_item, mode, 32);
1737 BTRFS_SETGET_FUNCS(inode_rdev, struct btrfs_inode_item, rdev, 64);
1738 BTRFS_SETGET_FUNCS(inode_flags, struct btrfs_inode_item, flags, 64);
1739 @@ -1841,6 +1847,10 @@ BTRFS_SETGET_FUNCS(extent_flags, struct
1741 BTRFS_SETGET_FUNCS(extent_refs_v0, struct btrfs_extent_item_v0, refs, 32);
1743 +#define BTRFS_INODE_IXUNLINK (1 << 24)
1744 +#define BTRFS_INODE_BARRIER (1 << 25)
1745 +#define BTRFS_INODE_COW (1 << 26)
1748 BTRFS_SETGET_FUNCS(tree_block_level, struct btrfs_tree_block_info, level, 8);
1750 @@ -3017,6 +3027,7 @@ extern const struct dentry_operations bt
1751 long btrfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
1752 void btrfs_update_iflags(struct inode *inode);
1753 void btrfs_inherit_iflags(struct inode *inode, struct inode *dir);
1754 +int btrfs_sync_flags(struct inode *inode, int, int);
1755 int btrfs_defrag_file(struct inode *inode, struct file *file,
1756 struct btrfs_ioctl_defrag_range_args *range,
1757 u64 newer_than, unsigned long max_pages);
1758 diff -NurpP --minimal linux-3.5/fs/btrfs/disk-io.c linux-3.5-vs2.3.4/fs/btrfs/disk-io.c
1759 --- linux-3.5/fs/btrfs/disk-io.c 2012-07-22 23:39:35.000000000 +0200
1760 +++ linux-3.5-vs2.3.4/fs/btrfs/disk-io.c 2012-07-23 01:45:55.000000000 +0200
1761 @@ -2090,6 +2090,9 @@ int open_ctree(struct super_block *sb,
1765 + if (btrfs_test_opt(tree_root, TAGGED))
1766 + sb->s_flags |= MS_TAGGED;
1768 features = btrfs_super_incompat_flags(disk_super) &
1769 ~BTRFS_FEATURE_INCOMPAT_SUPP;
1771 diff -NurpP --minimal linux-3.5/fs/btrfs/inode.c linux-3.5-vs2.3.4/fs/btrfs/inode.c
1772 --- linux-3.5/fs/btrfs/inode.c 2012-07-22 23:39:35.000000000 +0200
1773 +++ linux-3.5-vs2.3.4/fs/btrfs/inode.c 2012-07-23 01:45:55.000000000 +0200
1775 #include <linux/slab.h>
1776 #include <linux/ratelimit.h>
1777 #include <linux/mount.h>
1778 +#include <linux/vs_tag.h>
1781 #include "disk-io.h"
1782 @@ -2543,6 +2544,8 @@ static void btrfs_read_locked_inode(stru
1783 struct btrfs_key location;
1789 bool filled = false;
1791 @@ -2570,8 +2573,13 @@ static void btrfs_read_locked_inode(stru
1792 struct btrfs_inode_item);
1793 inode->i_mode = btrfs_inode_mode(leaf, inode_item);
1794 set_nlink(inode, btrfs_inode_nlink(leaf, inode_item));
1795 - inode->i_uid = btrfs_inode_uid(leaf, inode_item);
1796 - inode->i_gid = btrfs_inode_gid(leaf, inode_item);
1798 + uid = btrfs_inode_uid(leaf, inode_item);
1799 + gid = btrfs_inode_gid(leaf, inode_item);
1800 + inode->i_uid = INOTAG_UID(DX_TAG(inode), uid, gid);
1801 + inode->i_gid = INOTAG_GID(DX_TAG(inode), uid, gid);
1802 + inode->i_tag = INOTAG_TAG(DX_TAG(inode), uid, gid,
1803 + btrfs_inode_tag(leaf, inode_item));
1804 btrfs_i_size_write(inode, btrfs_inode_size(leaf, inode_item));
1806 tspec = btrfs_inode_atime(inode_item);
1807 @@ -2649,8 +2657,14 @@ static void fill_inode_item(struct btrfs
1808 struct btrfs_inode_item *item,
1809 struct inode *inode)
1811 - btrfs_set_inode_uid(leaf, item, inode->i_uid);
1812 - btrfs_set_inode_gid(leaf, item, inode->i_gid);
1813 + uid_t uid = TAGINO_UID(DX_TAG(inode), inode->i_uid, inode->i_tag);
1814 + gid_t gid = TAGINO_GID(DX_TAG(inode), inode->i_gid, inode->i_tag);
1816 + btrfs_set_inode_uid(leaf, item, uid);
1817 + btrfs_set_inode_gid(leaf, item, gid);
1818 +#ifdef CONFIG_TAGGING_INTERN
1819 + btrfs_set_inode_tag(leaf, item, inode->i_tag);
1821 btrfs_set_inode_size(leaf, item, BTRFS_I(inode)->disk_i_size);
1822 btrfs_set_inode_mode(leaf, item, inode->i_mode);
1823 btrfs_set_inode_nlink(leaf, item, inode->i_nlink);
1824 @@ -7621,11 +7635,13 @@ static const struct inode_operations btr
1825 .listxattr = btrfs_listxattr,
1826 .removexattr = btrfs_removexattr,
1827 .permission = btrfs_permission,
1828 + .sync_flags = btrfs_sync_flags,
1829 .get_acl = btrfs_get_acl,
1831 static const struct inode_operations btrfs_dir_ro_inode_operations = {
1832 .lookup = btrfs_lookup,
1833 .permission = btrfs_permission,
1834 + .sync_flags = btrfs_sync_flags,
1835 .get_acl = btrfs_get_acl,
1838 diff -NurpP --minimal linux-3.5/fs/btrfs/ioctl.c linux-3.5-vs2.3.4/fs/btrfs/ioctl.c
1839 --- linux-3.5/fs/btrfs/ioctl.c 2012-07-22 23:39:35.000000000 +0200
1840 +++ linux-3.5-vs2.3.4/fs/btrfs/ioctl.c 2012-07-23 01:45:55.000000000 +0200
1841 @@ -72,10 +72,13 @@ static unsigned int btrfs_flags_to_ioctl
1843 unsigned int iflags = 0;
1845 - if (flags & BTRFS_INODE_SYNC)
1846 - iflags |= FS_SYNC_FL;
1847 if (flags & BTRFS_INODE_IMMUTABLE)
1848 iflags |= FS_IMMUTABLE_FL;
1849 + if (flags & BTRFS_INODE_IXUNLINK)
1850 + iflags |= FS_IXUNLINK_FL;
1852 + if (flags & BTRFS_INODE_SYNC)
1853 + iflags |= FS_SYNC_FL;
1854 if (flags & BTRFS_INODE_APPEND)
1855 iflags |= FS_APPEND_FL;
1856 if (flags & BTRFS_INODE_NODUMP)
1857 @@ -92,28 +95,78 @@ static unsigned int btrfs_flags_to_ioctl
1858 else if (flags & BTRFS_INODE_NOCOMPRESS)
1859 iflags |= FS_NOCOMP_FL;
1861 + if (flags & BTRFS_INODE_BARRIER)
1862 + iflags |= FS_BARRIER_FL;
1863 + if (flags & BTRFS_INODE_COW)
1864 + iflags |= FS_COW_FL;
1869 - * Update inode->i_flags based on the btrfs internal flags.
1870 + * Update inode->i_(v)flags based on the btrfs internal flags.
1872 void btrfs_update_iflags(struct inode *inode)
1874 struct btrfs_inode *ip = BTRFS_I(inode);
1876 - inode->i_flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC);
1877 + inode->i_flags &= ~(S_IMMUTABLE | S_IXUNLINK |
1878 + S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
1880 - if (ip->flags & BTRFS_INODE_SYNC)
1881 - inode->i_flags |= S_SYNC;
1882 if (ip->flags & BTRFS_INODE_IMMUTABLE)
1883 inode->i_flags |= S_IMMUTABLE;
1884 + if (ip->flags & BTRFS_INODE_IXUNLINK)
1885 + inode->i_flags |= S_IXUNLINK;
1887 + if (ip->flags & BTRFS_INODE_SYNC)
1888 + inode->i_flags |= S_SYNC;
1889 if (ip->flags & BTRFS_INODE_APPEND)
1890 inode->i_flags |= S_APPEND;
1891 if (ip->flags & BTRFS_INODE_NOATIME)
1892 inode->i_flags |= S_NOATIME;
1893 if (ip->flags & BTRFS_INODE_DIRSYNC)
1894 inode->i_flags |= S_DIRSYNC;
1896 + inode->i_vflags &= ~(V_BARRIER | V_COW);
1898 + if (ip->flags & BTRFS_INODE_BARRIER)
1899 + inode->i_vflags |= V_BARRIER;
1900 + if (ip->flags & BTRFS_INODE_COW)
1901 + inode->i_vflags |= V_COW;
1905 + * Update btrfs internal flags from inode->i_(v)flags.
1907 +void btrfs_update_flags(struct inode *inode)
1909 + struct btrfs_inode *ip = BTRFS_I(inode);
1911 + unsigned int flags = inode->i_flags;
1912 + unsigned int vflags = inode->i_vflags;
1914 + ip->flags &= ~(BTRFS_INODE_SYNC | BTRFS_INODE_APPEND |
1915 + BTRFS_INODE_IMMUTABLE | BTRFS_INODE_IXUNLINK |
1916 + BTRFS_INODE_NOATIME | BTRFS_INODE_DIRSYNC |
1917 + BTRFS_INODE_BARRIER | BTRFS_INODE_COW);
1919 + if (flags & S_IMMUTABLE)
1920 + ip->flags |= BTRFS_INODE_IMMUTABLE;
1921 + if (flags & S_IXUNLINK)
1922 + ip->flags |= BTRFS_INODE_IXUNLINK;
1924 + if (flags & S_SYNC)
1925 + ip->flags |= BTRFS_INODE_SYNC;
1926 + if (flags & S_APPEND)
1927 + ip->flags |= BTRFS_INODE_APPEND;
1928 + if (flags & S_NOATIME)
1929 + ip->flags |= BTRFS_INODE_NOATIME;
1930 + if (flags & S_DIRSYNC)
1931 + ip->flags |= BTRFS_INODE_DIRSYNC;
1933 + if (vflags & V_BARRIER)
1934 + ip->flags |= BTRFS_INODE_BARRIER;
1935 + if (vflags & V_COW)
1936 + ip->flags |= BTRFS_INODE_COW;
1940 @@ -129,6 +182,7 @@ void btrfs_inherit_iflags(struct inode *
1943 flags = BTRFS_I(dir)->flags;
1944 + flags &= ~BTRFS_INODE_BARRIER;
1946 if (flags & BTRFS_INODE_NOCOMPRESS) {
1947 BTRFS_I(inode)->flags &= ~BTRFS_INODE_COMPRESS;
1948 @@ -144,6 +198,30 @@ void btrfs_inherit_iflags(struct inode *
1949 btrfs_update_iflags(inode);
1952 +int btrfs_sync_flags(struct inode *inode, int flags, int vflags)
1954 + struct btrfs_inode *ip = BTRFS_I(inode);
1955 + struct btrfs_root *root = ip->root;
1956 + struct btrfs_trans_handle *trans;
1959 + trans = btrfs_join_transaction(root);
1962 + inode->i_flags = flags;
1963 + inode->i_vflags = vflags;
1964 + btrfs_update_flags(inode);
1966 + ret = btrfs_update_inode(trans, root, inode);
1969 + btrfs_update_iflags(inode);
1970 + inode->i_ctime = CURRENT_TIME;
1971 + btrfs_end_transaction(trans, root);
1976 static int btrfs_ioctl_getflags(struct file *file, void __user *arg)
1978 struct btrfs_inode *ip = BTRFS_I(file->f_path.dentry->d_inode);
1979 @@ -200,7 +278,8 @@ static int btrfs_ioctl_setflags(struct f
1981 flags = btrfs_mask_flags(inode->i_mode, flags);
1982 oldflags = btrfs_flags_to_ioctl(ip->flags);
1983 - if ((flags ^ oldflags) & (FS_APPEND_FL | FS_IMMUTABLE_FL)) {
1984 + if ((flags ^ oldflags) & (FS_APPEND_FL |
1985 + FS_IMMUTABLE_FL | FS_IXUNLINK_FL)) {
1986 if (!capable(CAP_LINUX_IMMUTABLE)) {
1989 @@ -211,14 +290,19 @@ static int btrfs_ioctl_setflags(struct f
1993 - if (flags & FS_SYNC_FL)
1994 - ip->flags |= BTRFS_INODE_SYNC;
1996 - ip->flags &= ~BTRFS_INODE_SYNC;
1997 if (flags & FS_IMMUTABLE_FL)
1998 ip->flags |= BTRFS_INODE_IMMUTABLE;
2000 ip->flags &= ~BTRFS_INODE_IMMUTABLE;
2001 + if (flags & FS_IXUNLINK_FL)
2002 + ip->flags |= BTRFS_INODE_IXUNLINK;
2004 + ip->flags &= ~BTRFS_INODE_IXUNLINK;
2006 + if (flags & FS_SYNC_FL)
2007 + ip->flags |= BTRFS_INODE_SYNC;
2009 + ip->flags &= ~BTRFS_INODE_SYNC;
2010 if (flags & FS_APPEND_FL)
2011 ip->flags |= BTRFS_INODE_APPEND;
2013 diff -NurpP --minimal linux-3.5/fs/btrfs/super.c linux-3.5-vs2.3.4/fs/btrfs/super.c
2014 --- linux-3.5/fs/btrfs/super.c 2012-07-22 23:39:35.000000000 +0200
2015 +++ linux-3.5-vs2.3.4/fs/btrfs/super.c 2012-07-23 01:45:55.000000000 +0200
2016 @@ -281,7 +281,7 @@ enum {
2017 Opt_no_space_cache, Opt_recovery, Opt_skip_balance,
2018 Opt_check_integrity, Opt_check_integrity_including_extent_data,
2019 Opt_check_integrity_print_mask, Opt_fatal_errors,
2021 + Opt_tag, Opt_notag, Opt_tagid, Opt_err,
2024 static match_table_t tokens = {
2025 @@ -321,6 +321,9 @@ static match_table_t tokens = {
2026 {Opt_check_integrity_including_extent_data, "check_int_data"},
2027 {Opt_check_integrity_print_mask, "check_int_print_mask=%d"},
2028 {Opt_fatal_errors, "fatal_errors=%s"},
2030 + {Opt_notag, "notag"},
2031 + {Opt_tagid, "tagid=%u"},
2035 @@ -563,6 +566,22 @@ int btrfs_parse_options(struct btrfs_roo
2039 +#ifndef CONFIG_TAGGING_NONE
2041 + printk(KERN_INFO "btrfs: use tagging\n");
2042 + btrfs_set_opt(info->mount_opt, TAGGED);
2045 + printk(KERN_INFO "btrfs: disabled tagging\n");
2046 + btrfs_clear_opt(info->mount_opt, TAGGED);
2049 +#ifdef CONFIG_PROPAGATE
2052 + btrfs_set_opt(info->mount_opt, TAGGED);
2056 printk(KERN_INFO "btrfs: unrecognized mount option "
2058 @@ -1158,6 +1177,12 @@ static int btrfs_remount(struct super_bl
2059 btrfs_resize_thread_pool(fs_info,
2060 fs_info->thread_pool_size, old_thread_pool_size);
2062 + if (btrfs_test_opt(root, TAGGED) && !(sb->s_flags & MS_TAGGED)) {
2063 + printk("btrfs: %s: tagging not permitted on remount.\n",
2068 if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
2071 diff -NurpP --minimal linux-3.5/fs/char_dev.c linux-3.5-vs2.3.4/fs/char_dev.c
2072 --- linux-3.5/fs/char_dev.c 2012-03-19 19:47:25.000000000 +0100
2073 +++ linux-3.5-vs2.3.4/fs/char_dev.c 2012-07-23 01:45:55.000000000 +0200
2075 #include <linux/mutex.h>
2076 #include <linux/backing-dev.h>
2077 #include <linux/tty.h>
2078 +#include <linux/vs_context.h>
2079 +#include <linux/vs_device.h>
2081 #include "internal.h"
2083 @@ -371,14 +373,21 @@ static int chrdev_open(struct inode *ino
2085 struct cdev *new = NULL;
2089 + if (!vs_map_chrdev(inode->i_rdev, &mdev, DATTR_OPEN))
2091 + inode->i_mdev = mdev;
2093 spin_lock(&cdev_lock);
2096 struct kobject *kobj;
2099 spin_unlock(&cdev_lock);
2100 - kobj = kobj_lookup(cdev_map, inode->i_rdev, &idx);
2102 + kobj = kobj_lookup(cdev_map, mdev, &idx);
2105 new = container_of(kobj, struct cdev, kobj);
2106 diff -NurpP --minimal linux-3.5/fs/dcache.c linux-3.5-vs2.3.4/fs/dcache.c
2107 --- linux-3.5/fs/dcache.c 2012-07-22 23:39:36.000000000 +0200
2108 +++ linux-3.5-vs2.3.4/fs/dcache.c 2012-07-23 01:45:55.000000000 +0200
2110 #include <linux/rculist_bl.h>
2111 #include <linux/prefetch.h>
2112 #include <linux/ratelimit.h>
2113 +#include <linux/vs_limit.h>
2114 #include "internal.h"
2117 @@ -617,6 +618,8 @@ int d_invalidate(struct dentry * dentry)
2118 spin_lock(&dentry->d_lock);
2121 + vx_dentry_dec(dentry);
2124 * Somebody else still using it?
2126 @@ -646,6 +649,7 @@ EXPORT_SYMBOL(d_invalidate);
2127 static inline void __dget_dlock(struct dentry *dentry)
2130 + vx_dentry_inc(dentry);
2133 static inline void __dget(struct dentry *dentry)
2134 @@ -1270,6 +1274,9 @@ struct dentry *__d_alloc(struct super_bl
2135 struct dentry *dentry;
2138 + if (!vx_dentry_avail(1))
2141 dentry = kmem_cache_alloc(dentry_cache, GFP_KERNEL);
2144 @@ -1302,6 +1309,7 @@ struct dentry *__d_alloc(struct super_bl
2146 dentry->d_count = 1;
2147 dentry->d_flags = 0;
2148 + vx_dentry_inc(dentry);
2149 spin_lock_init(&dentry->d_lock);
2150 seqcount_init(&dentry->d_seq);
2151 dentry->d_inode = NULL;
2152 @@ -2005,6 +2013,7 @@ struct dentry *__d_lookup(struct dentry
2156 + vx_dentry_inc(dentry);
2158 spin_unlock(&dentry->d_lock);
2160 diff -NurpP --minimal linux-3.5/fs/devpts/inode.c linux-3.5-vs2.3.4/fs/devpts/inode.c
2161 --- linux-3.5/fs/devpts/inode.c 2012-07-22 23:39:38.000000000 +0200
2162 +++ linux-3.5-vs2.3.4/fs/devpts/inode.c 2012-07-23 01:45:55.000000000 +0200
2164 #include <linux/parser.h>
2165 #include <linux/fsnotify.h>
2166 #include <linux/seq_file.h>
2167 +#include <linux/vs_base.h>
2169 #define DEVPTS_DEFAULT_MODE 0600
2172 #define DEVPTS_DEFAULT_PTMX_MODE 0000
2173 #define PTMX_MINOR 2
2175 +static int devpts_permission(struct inode *inode, int mask)
2177 + int ret = -EACCES;
2179 + /* devpts is xid tagged */
2180 + if (vx_check((xid_t)inode->i_tag, VS_WATCH_P | VS_IDENT))
2181 + ret = generic_permission(inode, mask);
2185 +static struct inode_operations devpts_file_inode_operations = {
2186 + .permission = devpts_permission,
2191 * sysctl support for setting limits on the number of Unix98 ptys allocated.
2192 * Otherwise one can eat up all kernel memory by opening /dev/ptmx repeatedly.
2193 @@ -336,6 +352,34 @@ static int devpts_show_options(struct se
2197 +static int devpts_filter(struct dentry *de)
2201 + /* devpts is xid tagged */
2202 + if (de && de->d_inode)
2203 + xid = (xid_t)de->d_inode->i_tag;
2204 +#ifdef CONFIG_VSERVER_WARN_DEVPTS
2206 + vxwprintk_task(1, "devpts " VS_Q("%.*s") " without inode.",
2207 + de->d_name.len, de->d_name.name);
2209 + return vx_check(xid, VS_WATCH_P | VS_IDENT);
2212 +static int devpts_readdir(struct file * filp, void * dirent, filldir_t filldir)
2214 + return dcache_readdir_filter(filp, dirent, filldir, devpts_filter);
2217 +static struct file_operations devpts_dir_operations = {
2218 + .open = dcache_dir_open,
2219 + .release = dcache_dir_close,
2220 + .llseek = dcache_dir_lseek,
2221 + .read = generic_read_dir,
2222 + .readdir = devpts_readdir,
2225 static const struct super_operations devpts_sops = {
2226 .statfs = simple_statfs,
2227 .remount_fs = devpts_remount,
2228 @@ -379,8 +423,10 @@ devpts_fill_super(struct super_block *s,
2229 inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
2230 inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO | S_IWUSR;
2231 inode->i_op = &simple_dir_inode_operations;
2232 - inode->i_fop = &simple_dir_operations;
2233 + inode->i_fop = &devpts_dir_operations;
2234 set_nlink(inode, 2);
2235 + /* devpts is xid tagged */
2236 + inode->i_tag = (tag_t)vx_current_xid();
2238 s->s_root = d_make_root(inode);
2240 @@ -572,6 +618,9 @@ int devpts_pty_new(struct inode *ptmx_in
2241 inode->i_gid = opts->setgid ? opts->gid : current_fsgid();
2242 inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
2243 init_special_inode(inode, S_IFCHR|opts->mode, device);
2244 + /* devpts is xid tagged */
2245 + inode->i_tag = (tag_t)vx_current_xid();
2246 + inode->i_op = &devpts_file_inode_operations;
2247 inode->i_private = tty;
2248 tty->driver_data = inode;
2250 diff -NurpP --minimal linux-3.5/fs/ext2/balloc.c linux-3.5-vs2.3.4/fs/ext2/balloc.c
2251 --- linux-3.5/fs/ext2/balloc.c 2012-07-22 23:39:39.000000000 +0200
2252 +++ linux-3.5-vs2.3.4/fs/ext2/balloc.c 2012-07-23 01:45:55.000000000 +0200
2253 @@ -699,7 +699,6 @@ ext2_try_to_allocate(struct super_block
2255 end = EXT2_BLOCKS_PER_GROUP(sb);
2258 BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb));
2261 diff -NurpP --minimal linux-3.5/fs/ext2/ext2.h linux-3.5-vs2.3.4/fs/ext2/ext2.h
2262 --- linux-3.5/fs/ext2/ext2.h 2012-07-22 23:39:39.000000000 +0200
2263 +++ linux-3.5-vs2.3.4/fs/ext2/ext2.h 2012-07-23 01:45:55.000000000 +0200
2264 @@ -244,8 +244,12 @@ struct ext2_group_desc
2265 #define EXT2_NOTAIL_FL FS_NOTAIL_FL /* file tail should not be merged */
2266 #define EXT2_DIRSYNC_FL FS_DIRSYNC_FL /* dirsync behaviour (directories only) */
2267 #define EXT2_TOPDIR_FL FS_TOPDIR_FL /* Top of directory hierarchies*/
2268 +#define EXT2_IXUNLINK_FL FS_IXUNLINK_FL /* Immutable invert on unlink */
2269 #define EXT2_RESERVED_FL FS_RESERVED_FL /* reserved for ext2 lib */
2271 +#define EXT2_BARRIER_FL FS_BARRIER_FL /* Barrier for chroot() */
2272 +#define EXT2_COW_FL FS_COW_FL /* Copy on Write marker */
2274 #define EXT2_FL_USER_VISIBLE FS_FL_USER_VISIBLE /* User visible flags */
2275 #define EXT2_FL_USER_MODIFIABLE FS_FL_USER_MODIFIABLE /* User modifiable flags */
2277 @@ -329,7 +333,8 @@ struct ext2_inode {
2279 __le16 l_i_uid_high; /* these 2 fields */
2280 __le16 l_i_gid_high; /* were reserved2[0] */
2281 - __u32 l_i_reserved2;
2282 + __le16 l_i_tag; /* Context Tag */
2283 + __u16 l_i_reserved2;
2286 __u8 h_i_frag; /* Fragment number */
2287 @@ -357,6 +362,7 @@ struct ext2_inode {
2288 #define i_gid_low i_gid
2289 #define i_uid_high osd2.linux2.l_i_uid_high
2290 #define i_gid_high osd2.linux2.l_i_gid_high
2291 +#define i_raw_tag osd2.linux2.l_i_tag
2292 #define i_reserved2 osd2.linux2.l_i_reserved2
2295 @@ -384,6 +390,7 @@ struct ext2_inode {
2296 #define EXT2_MOUNT_USRQUOTA 0x020000 /* user quota */
2297 #define EXT2_MOUNT_GRPQUOTA 0x040000 /* group quota */
2298 #define EXT2_MOUNT_RESERVATION 0x080000 /* Preallocation */
2299 +#define EXT2_MOUNT_TAGGED (1<<24) /* Enable Context Tags */
2302 #define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt
2303 @@ -757,6 +764,7 @@ extern void ext2_set_inode_flags(struct
2304 extern void ext2_get_inode_flags(struct ext2_inode_info *);
2305 extern int ext2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
2306 u64 start, u64 len);
2307 +extern int ext2_sync_flags(struct inode *, int, int);
2310 extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
2311 diff -NurpP --minimal linux-3.5/fs/ext2/file.c linux-3.5-vs2.3.4/fs/ext2/file.c
2312 --- linux-3.5/fs/ext2/file.c 2011-10-24 18:45:27.000000000 +0200
2313 +++ linux-3.5-vs2.3.4/fs/ext2/file.c 2012-07-23 01:45:55.000000000 +0200
2314 @@ -104,4 +104,5 @@ const struct inode_operations ext2_file_
2315 .setattr = ext2_setattr,
2316 .get_acl = ext2_get_acl,
2317 .fiemap = ext2_fiemap,
2318 + .sync_flags = ext2_sync_flags,
2320 diff -NurpP --minimal linux-3.5/fs/ext2/ialloc.c linux-3.5-vs2.3.4/fs/ext2/ialloc.c
2321 --- linux-3.5/fs/ext2/ialloc.c 2012-07-22 23:39:39.000000000 +0200
2322 +++ linux-3.5-vs2.3.4/fs/ext2/ialloc.c 2012-07-23 01:45:55.000000000 +0200
2324 #include <linux/backing-dev.h>
2325 #include <linux/buffer_head.h>
2326 #include <linux/random.h>
2327 +#include <linux/vs_tag.h>
2331 @@ -547,6 +548,7 @@ got:
2332 inode->i_mode = mode;
2333 inode->i_uid = current_fsuid();
2334 inode->i_gid = dir->i_gid;
2335 + inode->i_tag = dx_current_fstag(sb);
2337 inode_init_owner(inode, dir, mode);
2339 diff -NurpP --minimal linux-3.5/fs/ext2/inode.c linux-3.5-vs2.3.4/fs/ext2/inode.c
2340 --- linux-3.5/fs/ext2/inode.c 2012-07-22 23:39:39.000000000 +0200
2341 +++ linux-3.5-vs2.3.4/fs/ext2/inode.c 2012-07-23 11:01:46.000000000 +0200
2343 #include <linux/mpage.h>
2344 #include <linux/fiemap.h>
2345 #include <linux/namei.h>
2346 +#include <linux/vs_tag.h>
2350 @@ -1162,7 +1163,7 @@ static void ext2_truncate_blocks(struct
2352 if (ext2_inode_is_fast_symlink(inode))
2354 - if (IS_APPEND(inode) || IS_IMMUTABLE(inode))
2355 + if (IS_APPEND(inode) || IS_IXORUNLINK(inode))
2357 __ext2_truncate_blocks(inode, offset);
2359 @@ -1253,36 +1254,61 @@ void ext2_set_inode_flags(struct inode *
2361 unsigned int flags = EXT2_I(inode)->i_flags;
2363 - inode->i_flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC);
2364 + inode->i_flags &= ~(S_IMMUTABLE | S_IXUNLINK |
2365 + S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
2368 + if (flags & EXT2_IMMUTABLE_FL)
2369 + inode->i_flags |= S_IMMUTABLE;
2370 + if (flags & EXT2_IXUNLINK_FL)
2371 + inode->i_flags |= S_IXUNLINK;
2373 if (flags & EXT2_SYNC_FL)
2374 inode->i_flags |= S_SYNC;
2375 if (flags & EXT2_APPEND_FL)
2376 inode->i_flags |= S_APPEND;
2377 - if (flags & EXT2_IMMUTABLE_FL)
2378 - inode->i_flags |= S_IMMUTABLE;
2379 if (flags & EXT2_NOATIME_FL)
2380 inode->i_flags |= S_NOATIME;
2381 if (flags & EXT2_DIRSYNC_FL)
2382 inode->i_flags |= S_DIRSYNC;
2384 + inode->i_vflags &= ~(V_BARRIER | V_COW);
2386 + if (flags & EXT2_BARRIER_FL)
2387 + inode->i_vflags |= V_BARRIER;
2388 + if (flags & EXT2_COW_FL)
2389 + inode->i_vflags |= V_COW;
2392 /* Propagate flags from i_flags to EXT2_I(inode)->i_flags */
2393 void ext2_get_inode_flags(struct ext2_inode_info *ei)
2395 unsigned int flags = ei->vfs_inode.i_flags;
2396 + unsigned int vflags = ei->vfs_inode.i_vflags;
2398 + ei->i_flags &= ~(EXT2_SYNC_FL | EXT2_APPEND_FL |
2399 + EXT2_IMMUTABLE_FL | EXT2_IXUNLINK_FL |
2400 + EXT2_NOATIME_FL | EXT2_DIRSYNC_FL |
2401 + EXT2_BARRIER_FL | EXT2_COW_FL);
2403 + if (flags & S_IMMUTABLE)
2404 + ei->i_flags |= EXT2_IMMUTABLE_FL;
2405 + if (flags & S_IXUNLINK)
2406 + ei->i_flags |= EXT2_IXUNLINK_FL;
2408 - ei->i_flags &= ~(EXT2_SYNC_FL|EXT2_APPEND_FL|
2409 - EXT2_IMMUTABLE_FL|EXT2_NOATIME_FL|EXT2_DIRSYNC_FL);
2411 ei->i_flags |= EXT2_SYNC_FL;
2412 if (flags & S_APPEND)
2413 ei->i_flags |= EXT2_APPEND_FL;
2414 - if (flags & S_IMMUTABLE)
2415 - ei->i_flags |= EXT2_IMMUTABLE_FL;
2416 if (flags & S_NOATIME)
2417 ei->i_flags |= EXT2_NOATIME_FL;
2418 if (flags & S_DIRSYNC)
2419 ei->i_flags |= EXT2_DIRSYNC_FL;
2421 + if (vflags & V_BARRIER)
2422 + ei->i_flags |= EXT2_BARRIER_FL;
2423 + if (vflags & V_COW)
2424 + ei->i_flags |= EXT2_COW_FL;
2427 struct inode *ext2_iget (struct super_block *sb, unsigned long ino)
2428 @@ -1318,8 +1344,10 @@ struct inode *ext2_iget (struct super_bl
2429 i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
2430 i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
2432 - i_uid_write(inode, i_uid);
2433 - i_gid_write(inode, i_gid);
2434 + i_uid_write(inode, INOTAG_UID(DX_TAG(inode), i_uid, i_gid));
2435 + i_gid_write(inode, INOTAG_GID(DX_TAG(inode), i_uid, i_gid));
2436 + inode->i_tag = INOTAG_TAG(DX_TAG(inode), i_uid, i_gid,
2437 + le16_to_cpu(raw_inode->i_raw_tag));
2438 set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
2439 inode->i_size = le32_to_cpu(raw_inode->i_size);
2440 inode->i_atime.tv_sec = (signed)le32_to_cpu(raw_inode->i_atime);
2441 @@ -1417,8 +1445,8 @@ static int __ext2_write_inode(struct ino
2442 struct ext2_inode_info *ei = EXT2_I(inode);
2443 struct super_block *sb = inode->i_sb;
2444 ino_t ino = inode->i_ino;
2445 - uid_t uid = i_uid_read(inode);
2446 - gid_t gid = i_gid_read(inode);
2447 + uid_t uid = TAGINO_UID(DX_TAG(inode), i_uid_read(inode), inode->i_tag);
2448 + gid_t gid = TAGINO_GID(DX_TAG(inode), i_gid_read(inode), inode->i_tag);
2449 struct buffer_head * bh;
2450 struct ext2_inode * raw_inode = ext2_get_inode(sb, ino, &bh);
2452 @@ -1454,6 +1482,9 @@ static int __ext2_write_inode(struct ino
2453 raw_inode->i_uid_high = 0;
2454 raw_inode->i_gid_high = 0;
2456 +#ifdef CONFIG_TAGGING_INTERN
2457 + raw_inode->i_raw_tag = cpu_to_le16(inode->i_tag);
2459 raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
2460 raw_inode->i_size = cpu_to_le32(inode->i_size);
2461 raw_inode->i_atime = cpu_to_le32(inode->i_atime.tv_sec);
2462 @@ -1534,7 +1565,8 @@ int ext2_setattr(struct dentry *dentry,
2463 if (is_quota_modification(inode, iattr))
2464 dquot_initialize(inode);
2465 if ((iattr->ia_valid & ATTR_UID && !uid_eq(iattr->ia_uid, inode->i_uid)) ||
2466 - (iattr->ia_valid & ATTR_GID && !gid_eq(iattr->ia_gid, inode->i_gid))) {
2467 + (iattr->ia_valid & ATTR_GID && !gid_eq(iattr->ia_gid, inode->i_gid)) ||
2468 + (iattr->ia_valid & ATTR_TAG && iattr->ia_tag != inode->i_tag)) {
2469 error = dquot_transfer(inode, iattr);
2472 diff -NurpP --minimal linux-3.5/fs/ext2/ioctl.c linux-3.5-vs2.3.4/fs/ext2/ioctl.c
2473 --- linux-3.5/fs/ext2/ioctl.c 2012-03-19 19:47:25.000000000 +0100
2474 +++ linux-3.5-vs2.3.4/fs/ext2/ioctl.c 2012-07-23 01:45:55.000000000 +0200
2476 #include <asm/uaccess.h>
2479 +int ext2_sync_flags(struct inode *inode, int flags, int vflags)
2481 + inode->i_flags = flags;
2482 + inode->i_vflags = vflags;
2483 + ext2_get_inode_flags(EXT2_I(inode));
2484 + inode->i_ctime = CURRENT_TIME_SEC;
2485 + mark_inode_dirty(inode);
2489 long ext2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
2491 struct inode *inode = filp->f_dentry->d_inode;
2492 @@ -51,6 +61,11 @@ long ext2_ioctl(struct file *filp, unsig
2494 flags = ext2_mask_flags(inode->i_mode, flags);
2496 + if (IS_BARRIER(inode)) {
2497 + vxwprintk_task(1, "messing with the barrier.");
2501 mutex_lock(&inode->i_mutex);
2502 /* Is it quota file? Do not allow user to mess with it */
2503 if (IS_NOQUOTA(inode)) {
2504 @@ -66,7 +81,9 @@ long ext2_ioctl(struct file *filp, unsig
2506 * This test looks nicer. Thanks to Pauline Middelink
2508 - if ((flags ^ oldflags) & (EXT2_APPEND_FL | EXT2_IMMUTABLE_FL)) {
2509 + if ((oldflags & EXT2_IMMUTABLE_FL) ||
2510 + ((flags ^ oldflags) & (EXT2_APPEND_FL |
2511 + EXT2_IMMUTABLE_FL | EXT2_IXUNLINK_FL))) {
2512 if (!capable(CAP_LINUX_IMMUTABLE)) {
2513 mutex_unlock(&inode->i_mutex);
2515 @@ -74,7 +91,7 @@ long ext2_ioctl(struct file *filp, unsig
2519 - flags = flags & EXT2_FL_USER_MODIFIABLE;
2520 + flags &= EXT2_FL_USER_MODIFIABLE;
2521 flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
2522 ei->i_flags = flags;
2524 diff -NurpP --minimal linux-3.5/fs/ext2/namei.c linux-3.5-vs2.3.4/fs/ext2/namei.c
2525 --- linux-3.5/fs/ext2/namei.c 2012-07-22 23:39:39.000000000 +0200
2526 +++ linux-3.5-vs2.3.4/fs/ext2/namei.c 2012-07-23 01:45:55.000000000 +0200
2529 #include <linux/pagemap.h>
2530 #include <linux/quotaops.h>
2531 +#include <linux/vs_tag.h>
2535 @@ -73,6 +74,7 @@ static struct dentry *ext2_lookup(struct
2536 (unsigned long) ino);
2537 return ERR_PTR(-EIO);
2539 + dx_propagate_tag(nd, inode);
2541 return d_splice_alias(inode, dentry);
2543 @@ -397,6 +399,7 @@ const struct inode_operations ext2_dir_i
2544 .removexattr = generic_removexattr,
2546 .setattr = ext2_setattr,
2547 + .sync_flags = ext2_sync_flags,
2548 .get_acl = ext2_get_acl,
2551 diff -NurpP --minimal linux-3.5/fs/ext2/super.c linux-3.5-vs2.3.4/fs/ext2/super.c
2552 --- linux-3.5/fs/ext2/super.c 2012-07-22 23:39:39.000000000 +0200
2553 +++ linux-3.5-vs2.3.4/fs/ext2/super.c 2012-07-23 01:45:55.000000000 +0200
2554 @@ -386,7 +386,8 @@ enum {
2555 Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug,
2556 Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr,
2557 Opt_acl, Opt_noacl, Opt_xip, Opt_ignore, Opt_err, Opt_quota,
2558 - Opt_usrquota, Opt_grpquota, Opt_reservation, Opt_noreservation
2559 + Opt_usrquota, Opt_grpquota, Opt_reservation, Opt_noreservation,
2560 + Opt_tag, Opt_notag, Opt_tagid
2563 static const match_table_t tokens = {
2564 @@ -414,6 +415,9 @@ static const match_table_t tokens = {
2566 {Opt_noacl, "noacl"},
2569 + {Opt_notag, "notag"},
2570 + {Opt_tagid, "tagid=%u"},
2571 {Opt_grpquota, "grpquota"},
2572 {Opt_ignore, "noquota"},
2573 {Opt_quota, "quota"},
2574 @@ -497,6 +501,20 @@ static int parse_options(char *options,
2576 set_opt (sbi->s_mount_opt, NO_UID32);
2578 +#ifndef CONFIG_TAGGING_NONE
2580 + set_opt (sbi->s_mount_opt, TAGGED);
2583 + clear_opt (sbi->s_mount_opt, TAGGED);
2586 +#ifdef CONFIG_PROPAGATE
2589 + set_opt (sbi->s_mount_opt, TAGGED);
2593 clear_opt (sbi->s_mount_opt, CHECK);
2595 @@ -855,6 +873,8 @@ static int ext2_fill_super(struct super_
2596 if (!parse_options((char *) data, sb))
2599 + if (EXT2_SB(sb)->s_mount_opt & EXT2_MOUNT_TAGGED)
2600 + sb->s_flags |= MS_TAGGED;
2601 sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
2602 ((EXT2_SB(sb)->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ?
2604 @@ -1226,6 +1246,14 @@ static int ext2_remount (struct super_bl
2608 + if ((sbi->s_mount_opt & EXT2_MOUNT_TAGGED) &&
2609 + !(sb->s_flags & MS_TAGGED)) {
2610 + printk("EXT2-fs: %s: tagging not permitted on remount.\n",
2613 + goto restore_opts;
2616 sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
2617 ((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
2619 diff -NurpP --minimal linux-3.5/fs/ext3/ext3.h linux-3.5-vs2.3.4/fs/ext3/ext3.h
2620 --- linux-3.5/fs/ext3/ext3.h 2012-07-22 23:39:39.000000000 +0200
2621 +++ linux-3.5-vs2.3.4/fs/ext3/ext3.h 2012-07-23 01:45:55.000000000 +0200
2622 @@ -151,10 +151,14 @@ struct ext3_group_desc
2623 #define EXT3_NOTAIL_FL 0x00008000 /* file tail should not be merged */
2624 #define EXT3_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */
2625 #define EXT3_TOPDIR_FL 0x00020000 /* Top of directory hierarchies*/
2626 +#define EXT3_IXUNLINK_FL 0x08000000 /* Immutable invert on unlink */
2627 #define EXT3_RESERVED_FL 0x80000000 /* reserved for ext3 lib */
2629 -#define EXT3_FL_USER_VISIBLE 0x0003DFFF /* User visible flags */
2630 -#define EXT3_FL_USER_MODIFIABLE 0x000380FF /* User modifiable flags */
2631 +#define EXT3_BARRIER_FL 0x04000000 /* Barrier for chroot() */
2632 +#define EXT3_COW_FL 0x20000000 /* Copy on Write marker */
2634 +#define EXT3_FL_USER_VISIBLE 0x0103DFFF /* User visible flags */
2635 +#define EXT3_FL_USER_MODIFIABLE 0x010380FF /* User modifiable flags */
2637 /* Flags that should be inherited by new inodes from their parent. */
2638 #define EXT3_FL_INHERITED (EXT3_SECRM_FL | EXT3_UNRM_FL | EXT3_COMPR_FL |\
2639 @@ -290,7 +294,8 @@ struct ext3_inode {
2641 __le16 l_i_uid_high; /* these 2 fields */
2642 __le16 l_i_gid_high; /* were reserved2[0] */
2643 - __u32 l_i_reserved2;
2644 + __le16 l_i_tag; /* Context Tag */
2645 + __u16 l_i_reserved2;
2648 __u8 h_i_frag; /* Fragment number */
2649 @@ -320,6 +325,7 @@ struct ext3_inode {
2650 #define i_gid_low i_gid
2651 #define i_uid_high osd2.linux2.l_i_uid_high
2652 #define i_gid_high osd2.linux2.l_i_gid_high
2653 +#define i_raw_tag osd2.linux2.l_i_tag
2654 #define i_reserved2 osd2.linux2.l_i_reserved2
2657 @@ -364,6 +370,7 @@ struct ext3_inode {
2658 #define EXT3_MOUNT_GRPQUOTA 0x200000 /* "old" group quota */
2659 #define EXT3_MOUNT_DATA_ERR_ABORT 0x400000 /* Abort on file data write
2660 * error in ordered mode */
2661 +#define EXT3_MOUNT_TAGGED (1<<24) /* Enable Context Tags */
2663 /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */
2664 #ifndef _LINUX_EXT2_FS_H
2665 @@ -1061,6 +1068,7 @@ extern void ext3_get_inode_flags(struct
2666 extern void ext3_set_aops(struct inode *inode);
2667 extern int ext3_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
2668 u64 start, u64 len);
2669 +extern int ext3_sync_flags(struct inode *, int, int);
2672 extern long ext3_ioctl(struct file *, unsigned int, unsigned long);
2673 diff -NurpP --minimal linux-3.5/fs/ext3/file.c linux-3.5-vs2.3.4/fs/ext3/file.c
2674 --- linux-3.5/fs/ext3/file.c 2012-05-21 18:07:20.000000000 +0200
2675 +++ linux-3.5-vs2.3.4/fs/ext3/file.c 2012-07-23 01:45:55.000000000 +0200
2676 @@ -76,5 +76,6 @@ const struct inode_operations ext3_file_
2678 .get_acl = ext3_get_acl,
2679 .fiemap = ext3_fiemap,
2680 + .sync_flags = ext3_sync_flags,
2683 diff -NurpP --minimal linux-3.5/fs/ext3/ialloc.c linux-3.5-vs2.3.4/fs/ext3/ialloc.c
2684 --- linux-3.5/fs/ext3/ialloc.c 2012-07-22 23:39:39.000000000 +0200
2685 +++ linux-3.5-vs2.3.4/fs/ext3/ialloc.c 2012-07-23 01:45:55.000000000 +0200
2688 #include <linux/quotaops.h>
2689 #include <linux/random.h>
2690 +#include <linux/vs_tag.h>
2694 @@ -469,6 +470,7 @@ got:
2695 inode->i_mode = mode;
2696 inode->i_uid = current_fsuid();
2697 inode->i_gid = dir->i_gid;
2698 + inode->i_tag = dx_current_fstag(sb);
2700 inode_init_owner(inode, dir, mode);
2702 diff -NurpP --minimal linux-3.5/fs/ext3/inode.c linux-3.5-vs2.3.4/fs/ext3/inode.c
2703 --- linux-3.5/fs/ext3/inode.c 2012-07-22 23:39:39.000000000 +0200
2704 +++ linux-3.5-vs2.3.4/fs/ext3/inode.c 2012-07-23 10:35:58.000000000 +0200
2706 #include <linux/writeback.h>
2707 #include <linux/mpage.h>
2708 #include <linux/namei.h>
2709 +#include <linux/vs_tag.h>
2714 @@ -2848,36 +2850,60 @@ void ext3_set_inode_flags(struct inode *
2716 unsigned int flags = EXT3_I(inode)->i_flags;
2718 - inode->i_flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC);
2719 + inode->i_flags &= ~(S_IMMUTABLE | S_IXUNLINK |
2720 + S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
2722 + if (flags & EXT3_IMMUTABLE_FL)
2723 + inode->i_flags |= S_IMMUTABLE;
2724 + if (flags & EXT3_IXUNLINK_FL)
2725 + inode->i_flags |= S_IXUNLINK;
2727 if (flags & EXT3_SYNC_FL)
2728 inode->i_flags |= S_SYNC;
2729 if (flags & EXT3_APPEND_FL)
2730 inode->i_flags |= S_APPEND;
2731 - if (flags & EXT3_IMMUTABLE_FL)
2732 - inode->i_flags |= S_IMMUTABLE;
2733 if (flags & EXT3_NOATIME_FL)
2734 inode->i_flags |= S_NOATIME;
2735 if (flags & EXT3_DIRSYNC_FL)
2736 inode->i_flags |= S_DIRSYNC;
2738 + inode->i_vflags &= ~(V_BARRIER | V_COW);
2740 + if (flags & EXT3_BARRIER_FL)
2741 + inode->i_vflags |= V_BARRIER;
2742 + if (flags & EXT3_COW_FL)
2743 + inode->i_vflags |= V_COW;
2746 /* Propagate flags from i_flags to EXT3_I(inode)->i_flags */
2747 void ext3_get_inode_flags(struct ext3_inode_info *ei)
2749 unsigned int flags = ei->vfs_inode.i_flags;
2750 + unsigned int vflags = ei->vfs_inode.i_vflags;
2752 + ei->i_flags &= ~(EXT3_SYNC_FL | EXT3_APPEND_FL |
2753 + EXT3_IMMUTABLE_FL | EXT3_IXUNLINK_FL |
2754 + EXT3_NOATIME_FL | EXT3_DIRSYNC_FL |
2755 + EXT3_BARRIER_FL | EXT3_COW_FL);
2757 + if (flags & S_IMMUTABLE)
2758 + ei->i_flags |= EXT3_IMMUTABLE_FL;
2759 + if (flags & S_IXUNLINK)
2760 + ei->i_flags |= EXT3_IXUNLINK_FL;
2762 - ei->i_flags &= ~(EXT3_SYNC_FL|EXT3_APPEND_FL|
2763 - EXT3_IMMUTABLE_FL|EXT3_NOATIME_FL|EXT3_DIRSYNC_FL);
2765 ei->i_flags |= EXT3_SYNC_FL;
2766 if (flags & S_APPEND)
2767 ei->i_flags |= EXT3_APPEND_FL;
2768 - if (flags & S_IMMUTABLE)
2769 - ei->i_flags |= EXT3_IMMUTABLE_FL;
2770 if (flags & S_NOATIME)
2771 ei->i_flags |= EXT3_NOATIME_FL;
2772 if (flags & S_DIRSYNC)
2773 ei->i_flags |= EXT3_DIRSYNC_FL;
2775 + if (vflags & V_BARRIER)
2776 + ei->i_flags |= EXT3_BARRIER_FL;
2777 + if (vflags & V_COW)
2778 + ei->i_flags |= EXT3_COW_FL;
2781 struct inode *ext3_iget(struct super_block *sb, unsigned long ino)
2782 @@ -2915,8 +2941,10 @@ struct inode *ext3_iget(struct super_blo
2783 i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
2784 i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
2786 - i_uid_write(inode, i_uid);
2787 - i_gid_write(inode, i_gid);
2788 + i_uid_write(inode, INOTAG_UID(DX_TAG(inode), i_uid, i_gid));
2789 + i_gid_write(inode, INOTAG_GID(DX_TAG(inode), i_uid, i_gid));
2790 + inode->i_tag = INOTAG_TAG(DX_TAG(inode), i_uid, i_gid,
2791 + le16_to_cpu(raw_inode->i_raw_tag));
2792 set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
2793 inode->i_size = le32_to_cpu(raw_inode->i_size);
2794 inode->i_atime.tv_sec = (signed)le32_to_cpu(raw_inode->i_atime);
2795 @@ -3086,8 +3114,8 @@ again:
2797 ext3_get_inode_flags(ei);
2798 raw_inode->i_mode = cpu_to_le16(inode->i_mode);
2799 - i_uid = i_uid_read(inode);
2800 - i_gid = i_gid_read(inode);
2801 + i_uid = TAGINO_UID(DX_TAG(inode), i_uid_read(inode), inode->i_tag);
2802 + i_gid = TAGINO_GID(DX_TAG(inode), i_gid_read(inode), inode->i_tag);
2803 if(!(test_opt(inode->i_sb, NO_UID32))) {
2804 raw_inode->i_uid_low = cpu_to_le16(low_16_bits(i_uid));
2805 raw_inode->i_gid_low = cpu_to_le16(low_16_bits(i_gid));
2806 @@ -3112,6 +3140,9 @@ again:
2807 raw_inode->i_uid_high = 0;
2808 raw_inode->i_gid_high = 0;
2810 +#ifdef CONFIG_TAGGING_INTERN
2811 + raw_inode->i_raw_tag = cpu_to_le16(inode->i_tag);
2813 raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
2814 raw_inode->i_size = cpu_to_le32(ei->i_disksize);
2815 raw_inode->i_atime = cpu_to_le32(inode->i_atime.tv_sec);
2816 @@ -3271,7 +3302,8 @@ int ext3_setattr(struct dentry *dentry,
2817 if (is_quota_modification(inode, attr))
2818 dquot_initialize(inode);
2819 if ((ia_valid & ATTR_UID && !uid_eq(attr->ia_uid, inode->i_uid)) ||
2820 - (ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, inode->i_gid))) {
2821 + (ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, inode->i_gid)) ||
2822 + (ia_valid & ATTR_TAG && attr->ia_tag != inode->i_tag)) {
2825 /* (user+group)*(old+new) structure, inode write (sb,
2826 @@ -3293,6 +3325,8 @@ int ext3_setattr(struct dentry *dentry,
2827 inode->i_uid = attr->ia_uid;
2828 if (attr->ia_valid & ATTR_GID)
2829 inode->i_gid = attr->ia_gid;
2830 + if ((attr->ia_valid & ATTR_TAG) && IS_TAGGED(inode))
2831 + inode->i_tag = attr->ia_tag;
2832 error = ext3_mark_inode_dirty(handle, inode);
2833 ext3_journal_stop(handle);
2835 diff -NurpP --minimal linux-3.5/fs/ext3/ioctl.c linux-3.5-vs2.3.4/fs/ext3/ioctl.c
2836 --- linux-3.5/fs/ext3/ioctl.c 2012-05-21 18:07:20.000000000 +0200
2837 +++ linux-3.5-vs2.3.4/fs/ext3/ioctl.c 2012-07-23 01:45:55.000000000 +0200
2839 #include <asm/uaccess.h>
2843 +int ext3_sync_flags(struct inode *inode, int flags, int vflags)
2845 + handle_t *handle = NULL;
2846 + struct ext3_iloc iloc;
2849 + handle = ext3_journal_start(inode, 1);
2850 + if (IS_ERR(handle))
2851 + return PTR_ERR(handle);
2853 + if (IS_SYNC(inode))
2854 + handle->h_sync = 1;
2855 + err = ext3_reserve_inode_write(handle, inode, &iloc);
2859 + inode->i_flags = flags;
2860 + inode->i_vflags = vflags;
2861 + ext3_get_inode_flags(EXT3_I(inode));
2862 + inode->i_ctime = CURRENT_TIME_SEC;
2864 + err = ext3_mark_iloc_dirty(handle, inode, &iloc);
2866 + ext3_journal_stop(handle);
2870 long ext3_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
2872 struct inode *inode = filp->f_dentry->d_inode;
2873 @@ -45,6 +73,11 @@ long ext3_ioctl(struct file *filp, unsig
2875 flags = ext3_mask_flags(inode->i_mode, flags);
2877 + if (IS_BARRIER(inode)) {
2878 + vxwprintk_task(1, "messing with the barrier.");
2882 mutex_lock(&inode->i_mutex);
2884 /* Is it quota file? Do not allow user to mess with it */
2885 @@ -63,7 +96,9 @@ long ext3_ioctl(struct file *filp, unsig
2887 * This test looks nicer. Thanks to Pauline Middelink
2889 - if ((flags ^ oldflags) & (EXT3_APPEND_FL | EXT3_IMMUTABLE_FL)) {
2890 + if ((oldflags & EXT3_IMMUTABLE_FL) ||
2891 + ((flags ^ oldflags) & (EXT3_APPEND_FL |
2892 + EXT3_IMMUTABLE_FL | EXT3_IXUNLINK_FL))) {
2893 if (!capable(CAP_LINUX_IMMUTABLE))
2896 @@ -88,7 +123,7 @@ long ext3_ioctl(struct file *filp, unsig
2900 - flags = flags & EXT3_FL_USER_MODIFIABLE;
2901 + flags &= EXT3_FL_USER_MODIFIABLE;
2902 flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE;
2903 ei->i_flags = flags;
2905 diff -NurpP --minimal linux-3.5/fs/ext3/namei.c linux-3.5-vs2.3.4/fs/ext3/namei.c
2906 --- linux-3.5/fs/ext3/namei.c 2012-07-22 23:39:39.000000000 +0200
2907 +++ linux-3.5-vs2.3.4/fs/ext3/namei.c 2012-07-23 01:45:55.000000000 +0200
2911 #include <linux/quotaops.h>
2912 +#include <linux/vs_tag.h>
2917 @@ -915,6 +917,7 @@ restart:
2918 submit_bh(READ | REQ_META | REQ_PRIO,
2921 + dx_propagate_tag(nd, inode);
2924 if ((bh = bh_use[ra_ptr++]) == NULL)
2925 @@ -2526,6 +2529,7 @@ const struct inode_operations ext3_dir_i
2926 .listxattr = ext3_listxattr,
2927 .removexattr = generic_removexattr,
2929 + .sync_flags = ext3_sync_flags,
2930 .get_acl = ext3_get_acl,
2933 diff -NurpP --minimal linux-3.5/fs/ext3/super.c linux-3.5-vs2.3.4/fs/ext3/super.c
2934 --- linux-3.5/fs/ext3/super.c 2012-07-22 23:39:39.000000000 +0200
2935 +++ linux-3.5-vs2.3.4/fs/ext3/super.c 2012-07-23 01:45:55.000000000 +0200
2936 @@ -822,7 +822,8 @@ enum {
2937 Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
2938 Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota,
2939 Opt_noquota, Opt_ignore, Opt_barrier, Opt_nobarrier, Opt_err,
2940 - Opt_resize, Opt_usrquota, Opt_grpquota
2941 + Opt_resize, Opt_usrquota, Opt_grpquota,
2942 + Opt_tag, Opt_notag, Opt_tagid
2945 static const match_table_t tokens = {
2946 @@ -879,6 +880,9 @@ static const match_table_t tokens = {
2947 {Opt_barrier, "barrier"},
2948 {Opt_nobarrier, "nobarrier"},
2949 {Opt_resize, "resize"},
2951 + {Opt_notag, "notag"},
2952 + {Opt_tagid, "tagid=%u"},
2956 @@ -1044,6 +1048,20 @@ static int parse_options (char *options,
2958 set_opt (sbi->s_mount_opt, NO_UID32);
2960 +#ifndef CONFIG_TAGGING_NONE
2962 + set_opt (sbi->s_mount_opt, TAGGED);
2965 + clear_opt (sbi->s_mount_opt, TAGGED);
2968 +#ifdef CONFIG_PROPAGATE
2971 + set_opt (sbi->s_mount_opt, TAGGED);
2975 clear_opt (sbi->s_mount_opt, CHECK);
2977 @@ -1742,6 +1760,9 @@ static int ext3_fill_super (struct super
2981 + if (EXT3_SB(sb)->s_mount_opt & EXT3_MOUNT_TAGGED)
2982 + sb->s_flags |= MS_TAGGED;
2984 sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
2985 (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
2987 @@ -2623,6 +2644,14 @@ static int ext3_remount (struct super_bl
2988 if (test_opt(sb, ABORT))
2989 ext3_abort(sb, __func__, "Abort forced by user");
2991 + if ((sbi->s_mount_opt & EXT3_MOUNT_TAGGED) &&
2992 + !(sb->s_flags & MS_TAGGED)) {
2993 + printk("EXT3-fs: %s: tagging not permitted on remount.\n",
2996 + goto restore_opts;
2999 sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
3000 (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
3002 diff -NurpP --minimal linux-3.5/fs/ext4/ext4.h linux-3.5-vs2.3.4/fs/ext4/ext4.h
3003 --- linux-3.5/fs/ext4/ext4.h 2012-07-22 23:39:39.000000000 +0200
3004 +++ linux-3.5-vs2.3.4/fs/ext4/ext4.h 2012-07-23 10:43:43.000000000 +0200
3005 @@ -393,8 +393,12 @@ struct flex_groups {
3006 #define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */
3007 #define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */
3008 #define EXT4_EOFBLOCKS_FL 0x00400000 /* Blocks allocated beyond EOF */
3009 +#define EXT4_IXUNLINK_FL 0x08000000 /* Immutable invert on unlink */
3010 #define EXT4_RESERVED_FL 0x80000000 /* reserved for ext4 lib */
3012 +#define EXT4_BARRIER_FL 0x04000000 /* Barrier for chroot() */
3013 +#define EXT4_COW_FL 0x20000000 /* Copy on Write marker */
3015 #define EXT4_FL_USER_VISIBLE 0x004BDFFF /* User visible flags */
3016 #define EXT4_FL_USER_MODIFIABLE 0x004B80FF /* User modifiable flags */
3018 @@ -664,7 +668,7 @@ struct ext4_inode {
3019 __le16 l_i_uid_high; /* these 2 fields */
3020 __le16 l_i_gid_high; /* were reserved2[0] */
3021 __le16 l_i_checksum_lo;/* crc32c(uuid+inum+inode) LE */
3022 - __le16 l_i_reserved;
3023 + __le16 l_i_tag; /* Context Tag */
3026 __le16 h_i_reserved1; /* Obsoleted fragment number/size which are removed in ext4 */
3027 @@ -782,6 +786,7 @@ do { \
3028 #define i_gid_low i_gid
3029 #define i_uid_high osd2.linux2.l_i_uid_high
3030 #define i_gid_high osd2.linux2.l_i_gid_high
3031 +#define i_raw_tag osd2.linux2.l_i_tag
3032 #define i_checksum_lo osd2.linux2.l_i_checksum_lo
3034 #elif defined(__GNU__)
3035 @@ -962,6 +967,7 @@ struct ext4_inode_info {
3036 #define EXT4_MOUNT_POSIX_ACL 0x08000 /* POSIX Access Control Lists */
3037 #define EXT4_MOUNT_NO_AUTO_DA_ALLOC 0x10000 /* No auto delalloc mapping */
3038 #define EXT4_MOUNT_BARRIER 0x20000 /* Use block barriers */
3039 +#define EXT4_MOUNT_TAGGED 0x40000 /* Enable Context Tags */
3040 #define EXT4_MOUNT_QUOTA 0x80000 /* Some quota option set */
3041 #define EXT4_MOUNT_USRQUOTA 0x100000 /* "old" user quota */
3042 #define EXT4_MOUNT_GRPQUOTA 0x200000 /* "old" group quota */
3043 @@ -2395,6 +2401,7 @@ extern int ext4_map_blocks(handle_t *han
3044 struct ext4_map_blocks *map, int flags);
3045 extern int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
3046 __u64 start, __u64 len);
3047 +extern int ext4_sync_flags(struct inode *, int, int);
3049 extern int ext4_move_extents(struct file *o_filp, struct file *d_filp,
3050 __u64 start_orig, __u64 start_donor,
3051 diff -NurpP --minimal linux-3.5/fs/ext4/file.c linux-3.5-vs2.3.4/fs/ext4/file.c
3052 --- linux-3.5/fs/ext4/file.c 2012-07-22 23:39:40.000000000 +0200
3053 +++ linux-3.5-vs2.3.4/fs/ext4/file.c 2012-07-23 01:45:55.000000000 +0200
3054 @@ -258,5 +258,6 @@ const struct inode_operations ext4_file_
3056 .get_acl = ext4_get_acl,
3057 .fiemap = ext4_fiemap,
3058 + .sync_flags = ext4_sync_flags,
3061 diff -NurpP --minimal linux-3.5/fs/ext4/ialloc.c linux-3.5-vs2.3.4/fs/ext4/ialloc.c
3062 --- linux-3.5/fs/ext4/ialloc.c 2012-07-22 23:39:40.000000000 +0200
3063 +++ linux-3.5-vs2.3.4/fs/ext4/ialloc.c 2012-07-23 01:45:55.000000000 +0200
3065 #include <linux/random.h>
3066 #include <linux/bitops.h>
3067 #include <linux/blkdev.h>
3068 +#include <linux/vs_tag.h>
3069 #include <asm/byteorder.h>
3072 @@ -844,6 +845,7 @@ got:
3073 inode->i_mode = mode;
3074 inode->i_uid = current_fsuid();
3075 inode->i_gid = dir->i_gid;
3076 + inode->i_tag = dx_current_fstag(sb);
3078 inode_init_owner(inode, dir, mode);
3080 diff -NurpP --minimal linux-3.5/fs/ext4/inode.c linux-3.5-vs2.3.4/fs/ext4/inode.c
3081 --- linux-3.5/fs/ext4/inode.c 2012-07-22 23:39:40.000000000 +0200
3082 +++ linux-3.5-vs2.3.4/fs/ext4/inode.c 2012-07-23 10:42:05.000000000 +0200
3084 #include <linux/printk.h>
3085 #include <linux/slab.h>
3086 #include <linux/ratelimit.h>
3087 +#include <linux/vs_tag.h>
3089 #include "ext4_jbd2.h"
3091 @@ -3626,41 +3627,64 @@ void ext4_set_inode_flags(struct inode *
3093 unsigned int flags = EXT4_I(inode)->i_flags;
3095 - inode->i_flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC);
3096 + inode->i_flags &= ~(S_IMMUTABLE | S_IXUNLINK |
3097 + S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
3099 + if (flags & EXT4_IMMUTABLE_FL)
3100 + inode->i_flags |= S_IMMUTABLE;
3101 + if (flags & EXT4_IXUNLINK_FL)
3102 + inode->i_flags |= S_IXUNLINK;
3104 if (flags & EXT4_SYNC_FL)
3105 inode->i_flags |= S_SYNC;
3106 if (flags & EXT4_APPEND_FL)
3107 inode->i_flags |= S_APPEND;
3108 - if (flags & EXT4_IMMUTABLE_FL)
3109 - inode->i_flags |= S_IMMUTABLE;
3110 if (flags & EXT4_NOATIME_FL)
3111 inode->i_flags |= S_NOATIME;
3112 if (flags & EXT4_DIRSYNC_FL)
3113 inode->i_flags |= S_DIRSYNC;
3115 + inode->i_vflags &= ~(V_BARRIER | V_COW);
3117 + if (flags & EXT4_BARRIER_FL)
3118 + inode->i_vflags |= V_BARRIER;
3119 + if (flags & EXT4_COW_FL)
3120 + inode->i_vflags |= V_COW;
3123 /* Propagate flags from i_flags to EXT4_I(inode)->i_flags */
3124 void ext4_get_inode_flags(struct ext4_inode_info *ei)
3126 - unsigned int vfs_fl;
3127 + unsigned int vfs_fl, vfs_vf;
3128 unsigned long old_fl, new_fl;
3131 vfs_fl = ei->vfs_inode.i_flags;
3132 + vfs_vf = ei->vfs_inode.i_vflags;
3133 old_fl = ei->i_flags;
3134 new_fl = old_fl & ~(EXT4_SYNC_FL|EXT4_APPEND_FL|
3135 EXT4_IMMUTABLE_FL|EXT4_NOATIME_FL|
3137 + EXT4_DIRSYNC_FL|EXT4_BARRIER_FL|
3140 + if (vfs_fl & S_IMMUTABLE)
3141 + new_fl |= EXT4_IMMUTABLE_FL;
3142 + if (vfs_fl & S_IXUNLINK)
3143 + new_fl |= EXT4_IXUNLINK_FL;
3145 if (vfs_fl & S_SYNC)
3146 new_fl |= EXT4_SYNC_FL;
3147 if (vfs_fl & S_APPEND)
3148 new_fl |= EXT4_APPEND_FL;
3149 - if (vfs_fl & S_IMMUTABLE)
3150 - new_fl |= EXT4_IMMUTABLE_FL;
3151 if (vfs_fl & S_NOATIME)
3152 new_fl |= EXT4_NOATIME_FL;
3153 if (vfs_fl & S_DIRSYNC)
3154 new_fl |= EXT4_DIRSYNC_FL;
3156 + if (vfs_vf & V_BARRIER)
3157 + new_fl |= EXT4_BARRIER_FL;
3158 + if (vfs_vf & V_COW)
3159 + new_fl |= EXT4_COW_FL;
3160 } while (cmpxchg(&ei->i_flags, old_fl, new_fl) != old_fl);
3163 @@ -3752,8 +3776,10 @@ struct inode *ext4_iget(struct super_blo
3164 i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
3165 i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
3167 - i_uid_write(inode, i_uid);
3168 - i_gid_write(inode, i_gid);
3169 + i_uid_write(inode, INOTAG_UID(DX_TAG(inode), i_uid, i_gid));
3170 + i_gid_write(inode, INOTAG_GID(DX_TAG(inode), i_uid, i_gid));
3171 + inode->i_tag = INOTAG_TAG(DX_TAG(inode), i_uid, i_gid,
3172 + le16_to_cpu(raw_inode->i_raw_tag));
3173 set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
3175 ext4_clear_state_flags(ei); /* Only relevant on 32-bit archs */
3176 @@ -3976,8 +4002,8 @@ static int ext4_do_update_inode(handle_t
3178 ext4_get_inode_flags(ei);
3179 raw_inode->i_mode = cpu_to_le16(inode->i_mode);
3180 - i_uid = i_uid_read(inode);
3181 - i_gid = i_gid_read(inode);
3182 + i_uid = TAGINO_UID(DX_TAG(inode), i_uid_read(inode), inode->i_tag);
3183 + i_gid = TAGINO_GID(DX_TAG(inode), i_gid_read(inode), inode->i_tag);
3184 if (!(test_opt(inode->i_sb, NO_UID32))) {
3185 raw_inode->i_uid_low = cpu_to_le16(low_16_bits(i_uid));
3186 raw_inode->i_gid_low = cpu_to_le16(low_16_bits(i_gid));
3187 @@ -4000,6 +4026,9 @@ static int ext4_do_update_inode(handle_t
3188 raw_inode->i_uid_high = 0;
3189 raw_inode->i_gid_high = 0;
3191 +#ifdef CONFIG_TAGGING_INTERN
3192 + raw_inode->i_raw_tag = cpu_to_le16(inode->i_tag);
3194 raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
3196 EXT4_INODE_SET_XTIME(i_ctime, inode, raw_inode);
3197 @@ -4185,7 +4214,8 @@ int ext4_setattr(struct dentry *dentry,
3198 if (is_quota_modification(inode, attr))
3199 dquot_initialize(inode);
3200 if ((ia_valid & ATTR_UID && !uid_eq(attr->ia_uid, inode->i_uid)) ||
3201 - (ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, inode->i_gid))) {
3202 + (ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, inode->i_gid)) ||
3203 + (ia_valid & ATTR_TAG && attr->ia_tag != inode->i_tag)) {
3206 /* (user+group)*(old+new) structure, inode write (sb,
3207 @@ -4207,6 +4237,8 @@ int ext4_setattr(struct dentry *dentry,
3208 inode->i_uid = attr->ia_uid;
3209 if (attr->ia_valid & ATTR_GID)
3210 inode->i_gid = attr->ia_gid;
3211 + if ((attr->ia_valid & ATTR_TAG) && IS_TAGGED(inode))
3212 + inode->i_tag = attr->ia_tag;
3213 error = ext4_mark_inode_dirty(handle, inode);
3214 ext4_journal_stop(handle);
3216 diff -NurpP --minimal linux-3.5/fs/ext4/ioctl.c linux-3.5-vs2.3.4/fs/ext4/ioctl.c
3217 --- linux-3.5/fs/ext4/ioctl.c 2012-07-22 23:39:40.000000000 +0200
3218 +++ linux-3.5-vs2.3.4/fs/ext4/ioctl.c 2012-07-23 01:45:55.000000000 +0200
3220 #include <linux/compat.h>
3221 #include <linux/mount.h>
3222 #include <linux/file.h>
3223 +#include <linux/vs_tag.h>
3224 #include <asm/uaccess.h>
3225 #include "ext4_jbd2.h"
3228 #define MAX_32_NUM ((((unsigned long long) 1) << 32) - 1)
3230 +int ext4_sync_flags(struct inode *inode, int flags, int vflags)
3232 + handle_t *handle = NULL;
3233 + struct ext4_iloc iloc;
3236 + handle = ext4_journal_start(inode, 1);
3237 + if (IS_ERR(handle))
3238 + return PTR_ERR(handle);
3240 + if (IS_SYNC(inode))
3241 + ext4_handle_sync(handle);
3242 + err = ext4_reserve_inode_write(handle, inode, &iloc);
3246 + inode->i_flags = flags;
3247 + inode->i_vflags = vflags;
3248 + ext4_get_inode_flags(EXT4_I(inode));
3249 + inode->i_ctime = ext4_current_time(inode);
3251 + err = ext4_mark_iloc_dirty(handle, inode, &iloc);
3253 + ext4_journal_stop(handle);
3257 long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
3259 struct inode *inode = filp->f_dentry->d_inode;
3260 @@ -53,6 +81,11 @@ long ext4_ioctl(struct file *filp, unsig
3262 flags = ext4_mask_flags(inode->i_mode, flags);
3264 + if (IS_BARRIER(inode)) {
3265 + vxwprintk_task(1, "messing with the barrier.");
3270 mutex_lock(&inode->i_mutex);
3271 /* Is it quota file? Do not allow user to mess with it */
3272 @@ -70,7 +103,9 @@ long ext4_ioctl(struct file *filp, unsig
3274 * This test looks nicer. Thanks to Pauline Middelink
3276 - if ((flags ^ oldflags) & (EXT4_APPEND_FL | EXT4_IMMUTABLE_FL)) {
3277 + if ((oldflags & EXT4_IMMUTABLE_FL) ||
3278 + ((flags ^ oldflags) & (EXT4_APPEND_FL |
3279 + EXT4_IMMUTABLE_FL | EXT4_IXUNLINK_FL))) {
3280 if (!capable(CAP_LINUX_IMMUTABLE))
3283 diff -NurpP --minimal linux-3.5/fs/ext4/namei.c linux-3.5-vs2.3.4/fs/ext4/namei.c
3284 --- linux-3.5/fs/ext4/namei.c 2012-07-22 23:39:40.000000000 +0200
3285 +++ linux-3.5-vs2.3.4/fs/ext4/namei.c 2012-07-23 01:45:55.000000000 +0200
3287 #include <linux/quotaops.h>
3288 #include <linux/buffer_head.h>
3289 #include <linux/bio.h>
3290 +#include <linux/vs_tag.h>
3292 #include "ext4_jbd2.h"
3294 @@ -1199,6 +1200,7 @@ restart:
3295 ll_rw_block(READ | REQ_META | REQ_PRIO,
3298 + dx_propagate_tag(nd, inode);
3300 if ((bh = bh_use[ra_ptr++]) == NULL)
3302 @@ -2977,6 +2979,7 @@ const struct inode_operations ext4_dir_i
3304 .get_acl = ext4_get_acl,
3305 .fiemap = ext4_fiemap,
3306 + .sync_flags = ext4_sync_flags,
3309 const struct inode_operations ext4_special_inode_operations = {
3310 diff -NurpP --minimal linux-3.5/fs/ext4/super.c linux-3.5-vs2.3.4/fs/ext4/super.c
3311 --- linux-3.5/fs/ext4/super.c 2012-07-22 23:39:40.000000000 +0200
3312 +++ linux-3.5-vs2.3.4/fs/ext4/super.c 2012-07-23 01:45:55.000000000 +0200
3313 @@ -1231,6 +1231,7 @@ enum {
3314 Opt_inode_readahead_blks, Opt_journal_ioprio,
3315 Opt_dioread_nolock, Opt_dioread_lock,
3316 Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable,
3317 + Opt_tag, Opt_notag, Opt_tagid
3320 static const match_table_t tokens = {
3321 @@ -1309,6 +1310,9 @@ static const match_table_t tokens = {
3322 {Opt_removed, "reservation"}, /* mount option from ext2/3 */
3323 {Opt_removed, "noreservation"}, /* mount option from ext2/3 */
3324 {Opt_removed, "journal=%u"}, /* mount option from ext2/3 */
3326 + {Opt_notag, "notag"},
3327 + {Opt_tagid, "tagid=%u"},
3331 @@ -1555,6 +1559,20 @@ static int handle_mount_opt(struct super
3333 *journal_ioprio = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, arg);
3335 +#ifndef CONFIG_TAGGING_NONE
3337 + set_opt(sb, TAGGED);
3340 + clear_opt(sb, TAGGED);
3343 +#ifdef CONFIG_PROPAGATE
3346 + set_opt(sb, TAGGED);
3351 for (m = ext4_mount_opts; m->token != Opt_err; m++) {
3352 @@ -3305,6 +3323,9 @@ static int ext4_fill_super(struct super_
3356 + if (EXT4_SB(sb)->s_mount_opt & EXT4_MOUNT_TAGGED)
3357 + sb->s_flags |= MS_TAGGED;
3359 sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
3360 (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
3362 @@ -4448,6 +4469,14 @@ static int ext4_remount(struct super_blo
3363 if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED)
3364 ext4_abort(sb, "Abort forced by user");
3366 + if ((sbi->s_mount_opt & EXT4_MOUNT_TAGGED) &&
3367 + !(sb->s_flags & MS_TAGGED)) {
3368 + printk("EXT4-fs: %s: tagging not permitted on remount.\n",
3371 + goto restore_opts;
3374 sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
3375 (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
3377 diff -NurpP --minimal linux-3.5/fs/fcntl.c linux-3.5-vs2.3.4/fs/fcntl.c
3378 --- linux-3.5/fs/fcntl.c 2012-07-22 23:39:40.000000000 +0200
3379 +++ linux-3.5-vs2.3.4/fs/fcntl.c 2012-07-23 01:45:55.000000000 +0200
3381 #include <linux/signal.h>
3382 #include <linux/rcupdate.h>
3383 #include <linux/pid_namespace.h>
3384 +#include <linux/vs_limit.h>
3386 #include <asm/poll.h>
3387 #include <asm/siginfo.h>
3388 @@ -103,6 +104,8 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldf
3391 filp_close(tofree, files);
3393 + vx_openfd_inc(newfd); /* fd was unused */
3397 @@ -448,6 +451,8 @@ SYSCALL_DEFINE3(fcntl, unsigned int, fd,
3398 filp = fget_raw_light(fd, &fput_needed);
3401 + if (!vx_files_avail(1))
3404 if (unlikely(filp->f_mode & FMODE_PATH)) {
3405 if (!check_fcntl_cmd(cmd))
3406 diff -NurpP --minimal linux-3.5/fs/file.c linux-3.5-vs2.3.4/fs/file.c
3407 --- linux-3.5/fs/file.c 2012-05-21 18:07:20.000000000 +0200
3408 +++ linux-3.5-vs2.3.4/fs/file.c 2012-07-23 01:45:55.000000000 +0200
3410 #include <linux/spinlock.h>
3411 #include <linux/rcupdate.h>
3412 #include <linux/workqueue.h>
3413 +#include <linux/vs_limit.h>
3415 struct fdtable_defer {
3417 @@ -358,6 +359,8 @@ struct files_struct *dup_fd(struct files
3418 struct file *f = *old_fds++;
3421 + /* TODO: sum it first for check and performance */
3422 + vx_openfd_inc(open_files - i);
3425 * The fd may be claimed in the fd bitmap but not yet
3426 @@ -464,6 +467,7 @@ repeat:
3428 __clear_close_on_exec(fd, fdt);
3430 + vx_openfd_inc(fd);
3433 if (rcu_dereference_raw(fdt->fd[fd]) != NULL) {
3434 diff -NurpP --minimal linux-3.5/fs/file_table.c linux-3.5-vs2.3.4/fs/file_table.c
3435 --- linux-3.5/fs/file_table.c 2012-07-22 23:39:40.000000000 +0200
3436 +++ linux-3.5-vs2.3.4/fs/file_table.c 2012-07-23 01:45:55.000000000 +0200
3438 #include <linux/percpu_counter.h>
3439 #include <linux/percpu.h>
3440 #include <linux/ima.h>
3441 +#include <linux/vs_limit.h>
3442 +#include <linux/vs_context.h>
3444 #include <linux/atomic.h>
3446 @@ -134,6 +136,8 @@ struct file *get_empty_filp(void)
3447 spin_lock_init(&f->f_lock);
3448 eventpoll_init_file(f);
3449 /* f->f_version: 0 */
3450 + f->f_xid = vx_current_xid();
3455 @@ -251,6 +255,8 @@ static void __fput(struct file *file)
3457 fops_put(file->f_op);
3458 put_pid(file->f_owner.pid);
3459 + vx_files_dec(file);
3461 file_sb_list_del(file);
3462 if ((file->f_mode & (FMODE_READ | FMODE_WRITE)) == FMODE_READ)
3463 i_readcount_dec(inode);
3464 @@ -381,6 +387,8 @@ void put_filp(struct file *file)
3466 if (atomic_long_dec_and_test(&file->f_count)) {
3467 security_file_free(file);
3468 + vx_files_dec(file);
3470 file_sb_list_del(file);
3473 diff -NurpP --minimal linux-3.5/fs/fs_struct.c linux-3.5-vs2.3.4/fs/fs_struct.c
3474 --- linux-3.5/fs/fs_struct.c 2012-05-21 18:07:20.000000000 +0200
3475 +++ linux-3.5-vs2.3.4/fs/fs_struct.c 2012-07-23 01:45:55.000000000 +0200
3477 #include <linux/path.h>
3478 #include <linux/slab.h>
3479 #include <linux/fs_struct.h>
3480 +#include <linux/vserver/global.h>
3481 #include "internal.h"
3483 static inline void path_get_longterm(struct path *path)
3484 @@ -99,6 +100,7 @@ void free_fs_struct(struct fs_struct *fs
3486 path_put_longterm(&fs->root);
3487 path_put_longterm(&fs->pwd);
3488 + atomic_dec(&vs_global_fs);
3489 kmem_cache_free(fs_cachep, fs);
3492 @@ -136,6 +138,7 @@ struct fs_struct *copy_fs_struct(struct
3494 path_get_longterm(&fs->pwd);
3495 spin_unlock(&old->lock);
3496 + atomic_inc(&vs_global_fs);
3500 diff -NurpP --minimal linux-3.5/fs/gfs2/file.c linux-3.5-vs2.3.4/fs/gfs2/file.c
3501 --- linux-3.5/fs/gfs2/file.c 2012-07-22 23:39:40.000000000 +0200
3502 +++ linux-3.5-vs2.3.4/fs/gfs2/file.c 2012-07-23 01:45:55.000000000 +0200
3503 @@ -142,6 +142,9 @@ static const u32 fsflags_to_gfs2[32] = {
3504 [7] = GFS2_DIF_NOATIME,
3505 [12] = GFS2_DIF_EXHASH,
3506 [14] = GFS2_DIF_INHERIT_JDATA,
3507 + [27] = GFS2_DIF_IXUNLINK,
3508 + [26] = GFS2_DIF_BARRIER,
3509 + [29] = GFS2_DIF_COW,
3512 static const u32 gfs2_to_fsflags[32] = {
3513 @@ -151,6 +154,9 @@ static const u32 gfs2_to_fsflags[32] = {
3514 [gfs2fl_NoAtime] = FS_NOATIME_FL,
3515 [gfs2fl_ExHash] = FS_INDEX_FL,
3516 [gfs2fl_InheritJdata] = FS_JOURNAL_DATA_FL,
3517 + [gfs2fl_IXUnlink] = FS_IXUNLINK_FL,
3518 + [gfs2fl_Barrier] = FS_BARRIER_FL,
3519 + [gfs2fl_Cow] = FS_COW_FL,
3522 static int gfs2_get_flags(struct file *filp, u32 __user *ptr)
3523 @@ -181,12 +187,18 @@ void gfs2_set_inode_flags(struct inode *
3525 struct gfs2_inode *ip = GFS2_I(inode);
3526 unsigned int flags = inode->i_flags;
3527 + unsigned int vflags = inode->i_vflags;
3529 + flags &= ~(S_IMMUTABLE | S_IXUNLINK |
3530 + S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC | S_NOSEC);
3532 - flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC|S_NOSEC);
3533 if ((ip->i_eattr == 0) && !is_sxid(inode->i_mode))
3534 inode->i_flags |= S_NOSEC;
3535 if (ip->i_diskflags & GFS2_DIF_IMMUTABLE)
3536 flags |= S_IMMUTABLE;
3537 + if (ip->i_diskflags & GFS2_DIF_IXUNLINK)
3538 + flags |= S_IXUNLINK;
3540 if (ip->i_diskflags & GFS2_DIF_APPENDONLY)
3542 if (ip->i_diskflags & GFS2_DIF_NOATIME)
3543 @@ -194,6 +206,43 @@ void gfs2_set_inode_flags(struct inode *
3544 if (ip->i_diskflags & GFS2_DIF_SYNC)
3546 inode->i_flags = flags;
3548 + vflags &= ~(V_BARRIER | V_COW);
3550 + if (ip->i_diskflags & GFS2_DIF_BARRIER)
3551 + vflags |= V_BARRIER;
3552 + if (ip->i_diskflags & GFS2_DIF_COW)
3554 + inode->i_vflags = vflags;
3557 +void gfs2_get_inode_flags(struct inode *inode)
3559 + struct gfs2_inode *ip = GFS2_I(inode);
3560 + unsigned int flags = inode->i_flags;
3561 + unsigned int vflags = inode->i_vflags;
3563 + ip->i_diskflags &= ~(GFS2_DIF_APPENDONLY |
3564 + GFS2_DIF_NOATIME | GFS2_DIF_SYNC |
3565 + GFS2_DIF_IMMUTABLE | GFS2_DIF_IXUNLINK |
3566 + GFS2_DIF_BARRIER | GFS2_DIF_COW);
3568 + if (flags & S_IMMUTABLE)
3569 + ip->i_diskflags |= GFS2_DIF_IMMUTABLE;
3570 + if (flags & S_IXUNLINK)
3571 + ip->i_diskflags |= GFS2_DIF_IXUNLINK;
3573 + if (flags & S_APPEND)
3574 + ip->i_diskflags |= GFS2_DIF_APPENDONLY;
3575 + if (flags & S_NOATIME)
3576 + ip->i_diskflags |= GFS2_DIF_NOATIME;
3577 + if (flags & S_SYNC)
3578 + ip->i_diskflags |= GFS2_DIF_SYNC;
3580 + if (vflags & V_BARRIER)
3581 + ip->i_diskflags |= GFS2_DIF_BARRIER;
3582 + if (vflags & V_COW)
3583 + ip->i_diskflags |= GFS2_DIF_COW;
3586 /* Flags that can be set by user space */
3587 @@ -305,6 +354,37 @@ static int gfs2_set_flags(struct file *f
3588 return do_gfs2_set_flags(filp, gfsflags, ~GFS2_DIF_JDATA);
3591 +int gfs2_sync_flags(struct inode *inode, int flags, int vflags)
3593 + struct gfs2_inode *ip = GFS2_I(inode);
3594 + struct gfs2_sbd *sdp = GFS2_SB(inode);
3595 + struct buffer_head *bh;
3596 + struct gfs2_holder gh;
3599 + error = gfs2_glock_nq_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, &gh);
3602 + error = gfs2_trans_begin(sdp, RES_DINODE, 0);
3605 + error = gfs2_meta_inode_buffer(ip, &bh);
3607 + goto out_trans_end;
3608 + gfs2_trans_add_bh(ip->i_gl, bh, 1);
3609 + inode->i_flags = flags;
3610 + inode->i_vflags = vflags;
3611 + gfs2_get_inode_flags(inode);
3612 + gfs2_dinode_out(ip, bh->b_data);
3614 + gfs2_set_aops(inode);
3616 + gfs2_trans_end(sdp);
3618 + gfs2_glock_dq_uninit(&gh);
3622 static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
3625 diff -NurpP --minimal linux-3.5/fs/gfs2/inode.h linux-3.5-vs2.3.4/fs/gfs2/inode.h
3626 --- linux-3.5/fs/gfs2/inode.h 2012-07-22 23:39:40.000000000 +0200
3627 +++ linux-3.5-vs2.3.4/fs/gfs2/inode.h 2012-07-23 01:45:55.000000000 +0200
3628 @@ -117,6 +117,7 @@ extern const struct file_operations gfs2
3629 extern const struct file_operations gfs2_dir_fops_nolock;
3631 extern void gfs2_set_inode_flags(struct inode *inode);
3632 +extern int gfs2_sync_flags(struct inode *inode, int flags, int vflags);
3634 #ifdef CONFIG_GFS2_FS_LOCKING_DLM
3635 extern const struct file_operations gfs2_file_fops;
3636 diff -NurpP --minimal linux-3.5/fs/inode.c linux-3.5-vs2.3.4/fs/inode.c
3637 --- linux-3.5/fs/inode.c 2012-07-22 23:39:40.000000000 +0200
3638 +++ linux-3.5-vs2.3.4/fs/inode.c 2012-07-23 01:45:55.000000000 +0200
3640 #include <linux/prefetch.h>
3641 #include <linux/buffer_head.h> /* for inode_has_buffers */
3642 #include <linux/ratelimit.h>
3643 +#include <linux/vs_tag.h>
3644 #include "internal.h"
3647 @@ -128,6 +129,9 @@ int inode_init_always(struct super_block
3648 struct address_space *const mapping = &inode->i_data;
3652 + /* essential because of inode slab reuse */
3654 inode->i_blkbits = sb->s_blocksize_bits;
3656 atomic_set(&inode->i_count, 1);
3657 @@ -149,6 +153,7 @@ int inode_init_always(struct super_block
3658 inode->i_bdev = NULL;
3659 inode->i_cdev = NULL;
3661 + inode->i_mdev = 0;
3662 inode->dirtied_when = 0;
3664 if (security_inode_alloc(inode))
3665 @@ -470,6 +475,8 @@ void __insert_inode_hash(struct inode *i
3667 EXPORT_SYMBOL(__insert_inode_hash);
3669 +EXPORT_SYMBOL_GPL(__iget);
3672 * __remove_inode_hash - remove an inode from the hash
3673 * @inode: inode to unhash
3674 @@ -1786,9 +1793,11 @@ void init_special_inode(struct inode *in
3675 if (S_ISCHR(mode)) {
3676 inode->i_fop = &def_chr_fops;
3677 inode->i_rdev = rdev;
3678 + inode->i_mdev = rdev;
3679 } else if (S_ISBLK(mode)) {
3680 inode->i_fop = &def_blk_fops;
3681 inode->i_rdev = rdev;
3682 + inode->i_mdev = rdev;
3683 } else if (S_ISFIFO(mode))
3684 inode->i_fop = &def_fifo_fops;
3685 else if (S_ISSOCK(mode))
3686 @@ -1817,6 +1826,7 @@ void inode_init_owner(struct inode *inod
3688 inode->i_gid = current_fsgid();
3689 inode->i_mode = mode;
3690 + inode->i_tag = dx_current_fstag(inode->i_sb);
3692 EXPORT_SYMBOL(inode_init_owner);
3694 diff -NurpP --minimal linux-3.5/fs/ioctl.c linux-3.5-vs2.3.4/fs/ioctl.c
3695 --- linux-3.5/fs/ioctl.c 2012-05-21 18:07:24.000000000 +0200
3696 +++ linux-3.5-vs2.3.4/fs/ioctl.c 2012-07-23 01:45:55.000000000 +0200
3698 #include <linux/writeback.h>
3699 #include <linux/buffer_head.h>
3700 #include <linux/falloc.h>
3701 +#include <linux/proc_fs.h>
3702 +#include <linux/vserver/inode.h>
3703 +#include <linux/vs_tag.h>
3705 #include <asm/ioctls.h>
3707 diff -NurpP --minimal linux-3.5/fs/ioprio.c linux-3.5-vs2.3.4/fs/ioprio.c
3708 --- linux-3.5/fs/ioprio.c 2012-07-22 23:39:40.000000000 +0200
3709 +++ linux-3.5-vs2.3.4/fs/ioprio.c 2012-07-23 01:45:55.000000000 +0200
3711 #include <linux/syscalls.h>
3712 #include <linux/security.h>
3713 #include <linux/pid_namespace.h>
3714 +#include <linux/vs_base.h>
3716 int set_task_ioprio(struct task_struct *task, int ioprio)
3718 @@ -105,6 +106,8 @@ SYSCALL_DEFINE3(ioprio_set, int, which,
3720 pgrp = find_vpid(who);
3721 do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
3722 + if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT))
3724 ret = set_task_ioprio(p, ioprio);
3727 @@ -198,6 +201,8 @@ SYSCALL_DEFINE2(ioprio_get, int, which,
3729 pgrp = find_vpid(who);
3730 do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
3731 + if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT))
3733 tmpio = get_task_ioprio(p);
3736 diff -NurpP --minimal linux-3.5/fs/jfs/file.c linux-3.5-vs2.3.4/fs/jfs/file.c
3737 --- linux-3.5/fs/jfs/file.c 2011-10-24 18:45:27.000000000 +0200
3738 +++ linux-3.5-vs2.3.4/fs/jfs/file.c 2012-07-23 01:45:55.000000000 +0200
3739 @@ -109,7 +109,8 @@ int jfs_setattr(struct dentry *dentry, s
3740 if (is_quota_modification(inode, iattr))
3741 dquot_initialize(inode);
3742 if ((iattr->ia_valid & ATTR_UID && iattr->ia_uid != inode->i_uid) ||
3743 - (iattr->ia_valid & ATTR_GID && iattr->ia_gid != inode->i_gid)) {
3744 + (iattr->ia_valid & ATTR_GID && iattr->ia_gid != inode->i_gid) ||
3745 + (iattr->ia_valid & ATTR_TAG && iattr->ia_tag != inode->i_tag)) {
3746 rc = dquot_transfer(inode, iattr);
3749 @@ -142,6 +143,7 @@ const struct inode_operations jfs_file_i
3750 #ifdef CONFIG_JFS_POSIX_ACL
3751 .get_acl = jfs_get_acl,
3753 + .sync_flags = jfs_sync_flags,
3756 const struct file_operations jfs_file_operations = {
3757 diff -NurpP --minimal linux-3.5/fs/jfs/ioctl.c linux-3.5-vs2.3.4/fs/jfs/ioctl.c
3758 --- linux-3.5/fs/jfs/ioctl.c 2012-03-19 19:47:25.000000000 +0100
3759 +++ linux-3.5-vs2.3.4/fs/jfs/ioctl.c 2012-07-23 01:45:55.000000000 +0200
3761 #include <linux/mount.h>
3762 #include <linux/time.h>
3763 #include <linux/sched.h>
3764 +#include <linux/mount.h>
3765 #include <asm/current.h>
3766 #include <asm/uaccess.h>
3768 @@ -52,6 +53,16 @@ static long jfs_map_ext2(unsigned long f
3772 +int jfs_sync_flags(struct inode *inode, int flags, int vflags)
3774 + inode->i_flags = flags;
3775 + inode->i_vflags = vflags;
3776 + jfs_get_inode_flags(JFS_IP(inode));
3777 + inode->i_ctime = CURRENT_TIME_SEC;
3778 + mark_inode_dirty(inode);
3782 long jfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
3784 struct inode *inode = filp->f_dentry->d_inode;
3785 @@ -85,6 +96,11 @@ long jfs_ioctl(struct file *filp, unsign
3786 if (!S_ISDIR(inode->i_mode))
3787 flags &= ~JFS_DIRSYNC_FL;
3789 + if (IS_BARRIER(inode)) {
3790 + vxwprintk_task(1, "messing with the barrier.");
3794 /* Is it quota file? Do not allow user to mess with it */
3795 if (IS_NOQUOTA(inode)) {
3797 @@ -102,8 +118,8 @@ long jfs_ioctl(struct file *filp, unsign
3798 * the relevant capability.
3800 if ((oldflags & JFS_IMMUTABLE_FL) ||
3801 - ((flags ^ oldflags) &
3802 - (JFS_APPEND_FL | JFS_IMMUTABLE_FL))) {
3803 + ((flags ^ oldflags) & (JFS_APPEND_FL |
3804 + JFS_IMMUTABLE_FL | JFS_IXUNLINK_FL))) {
3805 if (!capable(CAP_LINUX_IMMUTABLE)) {
3806 mutex_unlock(&inode->i_mutex);
3808 @@ -111,7 +127,7 @@ long jfs_ioctl(struct file *filp, unsign
3812 - flags = flags & JFS_FL_USER_MODIFIABLE;
3813 + flags &= JFS_FL_USER_MODIFIABLE;
3814 flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;
3815 jfs_inode->mode2 = flags;
3817 diff -NurpP --minimal linux-3.5/fs/jfs/jfs_dinode.h linux-3.5-vs2.3.4/fs/jfs/jfs_dinode.h
3818 --- linux-3.5/fs/jfs/jfs_dinode.h 2008-12-25 00:26:37.000000000 +0100
3819 +++ linux-3.5-vs2.3.4/fs/jfs/jfs_dinode.h 2012-07-23 01:45:55.000000000 +0200
3820 @@ -161,9 +161,13 @@ struct dinode {
3822 #define JFS_APPEND_FL 0x01000000 /* writes to file may only append */
3823 #define JFS_IMMUTABLE_FL 0x02000000 /* Immutable file */
3824 +#define JFS_IXUNLINK_FL 0x08000000 /* Immutable invert on unlink */
3826 -#define JFS_FL_USER_VISIBLE 0x03F80000
3827 -#define JFS_FL_USER_MODIFIABLE 0x03F80000
3828 +#define JFS_BARRIER_FL 0x04000000 /* Barrier for chroot() */
3829 +#define JFS_COW_FL 0x20000000 /* Copy on Write marker */
3831 +#define JFS_FL_USER_VISIBLE 0x07F80000
3832 +#define JFS_FL_USER_MODIFIABLE 0x07F80000
3833 #define JFS_FL_INHERIT 0x03C80000
3835 /* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
3836 diff -NurpP --minimal linux-3.5/fs/jfs/jfs_filsys.h linux-3.5-vs2.3.4/fs/jfs/jfs_filsys.h
3837 --- linux-3.5/fs/jfs/jfs_filsys.h 2008-12-25 00:26:37.000000000 +0100
3838 +++ linux-3.5-vs2.3.4/fs/jfs/jfs_filsys.h 2012-07-23 01:45:55.000000000 +0200
3840 #define JFS_NAME_MAX 255
3841 #define JFS_PATH_MAX BPSIZE
3843 +#define JFS_TAGGED 0x00800000 /* Context Tagging */
3846 * file system state (superblock state)
3847 diff -NurpP --minimal linux-3.5/fs/jfs/jfs_imap.c linux-3.5-vs2.3.4/fs/jfs/jfs_imap.c
3848 --- linux-3.5/fs/jfs/jfs_imap.c 2012-01-09 16:14:54.000000000 +0100
3849 +++ linux-3.5-vs2.3.4/fs/jfs/jfs_imap.c 2012-07-23 01:45:55.000000000 +0200
3851 #include <linux/pagemap.h>
3852 #include <linux/quotaops.h>
3853 #include <linux/slab.h>
3854 +#include <linux/vs_tag.h>
3856 #include "jfs_incore.h"
3857 #include "jfs_inode.h"
3858 @@ -3058,6 +3059,8 @@ static int copy_from_dinode(struct dinod
3860 struct jfs_inode_info *jfs_ip = JFS_IP(ip);
3861 struct jfs_sb_info *sbi = JFS_SBI(ip->i_sb);
3865 jfs_ip->fileset = le32_to_cpu(dip->di_fileset);
3866 jfs_ip->mode2 = le32_to_cpu(dip->di_mode);
3867 @@ -3078,14 +3081,18 @@ static int copy_from_dinode(struct dinod
3869 set_nlink(ip, le32_to_cpu(dip->di_nlink));
3871 - jfs_ip->saved_uid = le32_to_cpu(dip->di_uid);
3872 + uid = le32_to_cpu(dip->di_uid);
3873 + gid = le32_to_cpu(dip->di_gid);
3874 + ip->i_tag = INOTAG_TAG(DX_TAG(ip), uid, gid, 0);
3876 + jfs_ip->saved_uid = INOTAG_UID(DX_TAG(ip), uid, gid);
3878 ip->i_uid = jfs_ip->saved_uid;
3880 ip->i_uid = sbi->uid;
3883 - jfs_ip->saved_gid = le32_to_cpu(dip->di_gid);
3884 + jfs_ip->saved_gid = INOTAG_GID(DX_TAG(ip), uid, gid);
3886 ip->i_gid = jfs_ip->saved_gid;
3888 @@ -3150,14 +3157,12 @@ static void copy_to_dinode(struct dinode
3889 dip->di_size = cpu_to_le64(ip->i_size);
3890 dip->di_nblocks = cpu_to_le64(PBLK2LBLK(ip->i_sb, ip->i_blocks));
3891 dip->di_nlink = cpu_to_le32(ip->i_nlink);
3892 - if (sbi->uid == -1)
3893 - dip->di_uid = cpu_to_le32(ip->i_uid);
3895 - dip->di_uid = cpu_to_le32(jfs_ip->saved_uid);
3896 - if (sbi->gid == -1)
3897 - dip->di_gid = cpu_to_le32(ip->i_gid);
3899 - dip->di_gid = cpu_to_le32(jfs_ip->saved_gid);
3901 + dip->di_uid = cpu_to_le32(TAGINO_UID(DX_TAG(ip),
3902 + (sbi->uid == -1) ? ip->i_uid : jfs_ip->saved_uid, ip->i_tag));
3903 + dip->di_gid = cpu_to_le32(TAGINO_GID(DX_TAG(ip),
3904 + (sbi->gid == -1) ? ip->i_gid : jfs_ip->saved_gid, ip->i_tag));
3906 jfs_get_inode_flags(jfs_ip);
3908 * mode2 is only needed for storing the higher order bits.
3909 diff -NurpP --minimal linux-3.5/fs/jfs/jfs_inode.c linux-3.5-vs2.3.4/fs/jfs/jfs_inode.c
3910 --- linux-3.5/fs/jfs/jfs_inode.c 2012-01-09 16:14:54.000000000 +0100
3911 +++ linux-3.5-vs2.3.4/fs/jfs/jfs_inode.c 2012-07-23 01:45:55.000000000 +0200
3914 #include <linux/fs.h>
3915 #include <linux/quotaops.h>
3916 +#include <linux/vs_tag.h>
3917 #include "jfs_incore.h"
3918 #include "jfs_inode.h"
3919 #include "jfs_filsys.h"
3920 @@ -30,29 +31,46 @@ void jfs_set_inode_flags(struct inode *i
3922 unsigned int flags = JFS_IP(inode)->mode2;
3924 - inode->i_flags &= ~(S_IMMUTABLE | S_APPEND |
3925 - S_NOATIME | S_DIRSYNC | S_SYNC);
3926 + inode->i_flags &= ~(S_IMMUTABLE | S_IXUNLINK |
3927 + S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
3929 if (flags & JFS_IMMUTABLE_FL)
3930 inode->i_flags |= S_IMMUTABLE;
3931 + if (flags & JFS_IXUNLINK_FL)
3932 + inode->i_flags |= S_IXUNLINK;
3934 + if (flags & JFS_SYNC_FL)
3935 + inode->i_flags |= S_SYNC;
3936 if (flags & JFS_APPEND_FL)
3937 inode->i_flags |= S_APPEND;
3938 if (flags & JFS_NOATIME_FL)
3939 inode->i_flags |= S_NOATIME;
3940 if (flags & JFS_DIRSYNC_FL)
3941 inode->i_flags |= S_DIRSYNC;
3942 - if (flags & JFS_SYNC_FL)
3943 - inode->i_flags |= S_SYNC;
3945 + inode->i_vflags &= ~(V_BARRIER | V_COW);
3947 + if (flags & JFS_BARRIER_FL)
3948 + inode->i_vflags |= V_BARRIER;
3949 + if (flags & JFS_COW_FL)
3950 + inode->i_vflags |= V_COW;
3953 void jfs_get_inode_flags(struct jfs_inode_info *jfs_ip)
3955 unsigned int flags = jfs_ip->vfs_inode.i_flags;
3956 + unsigned int vflags = jfs_ip->vfs_inode.i_vflags;
3958 + jfs_ip->mode2 &= ~(JFS_IMMUTABLE_FL | JFS_IXUNLINK_FL |
3959 + JFS_APPEND_FL | JFS_NOATIME_FL |
3960 + JFS_DIRSYNC_FL | JFS_SYNC_FL |
3961 + JFS_BARRIER_FL | JFS_COW_FL);
3963 - jfs_ip->mode2 &= ~(JFS_IMMUTABLE_FL | JFS_APPEND_FL | JFS_NOATIME_FL |
3964 - JFS_DIRSYNC_FL | JFS_SYNC_FL);
3965 if (flags & S_IMMUTABLE)
3966 jfs_ip->mode2 |= JFS_IMMUTABLE_FL;
3967 + if (flags & S_IXUNLINK)
3968 + jfs_ip->mode2 |= JFS_IXUNLINK_FL;
3970 if (flags & S_APPEND)
3971 jfs_ip->mode2 |= JFS_APPEND_FL;
3972 if (flags & S_NOATIME)
3973 @@ -61,6 +79,11 @@ void jfs_get_inode_flags(struct jfs_inod
3974 jfs_ip->mode2 |= JFS_DIRSYNC_FL;
3976 jfs_ip->mode2 |= JFS_SYNC_FL;
3978 + if (vflags & V_BARRIER)
3979 + jfs_ip->mode2 |= JFS_BARRIER_FL;
3980 + if (vflags & V_COW)
3981 + jfs_ip->mode2 |= JFS_COW_FL;
3985 diff -NurpP --minimal linux-3.5/fs/jfs/jfs_inode.h linux-3.5-vs2.3.4/fs/jfs/jfs_inode.h
3986 --- linux-3.5/fs/jfs/jfs_inode.h 2011-10-24 18:45:27.000000000 +0200
3987 +++ linux-3.5-vs2.3.4/fs/jfs/jfs_inode.h 2012-07-23 01:45:55.000000000 +0200
3988 @@ -39,6 +39,7 @@ extern struct dentry *jfs_fh_to_dentry(s
3989 extern struct dentry *jfs_fh_to_parent(struct super_block *sb, struct fid *fid,
3990 int fh_len, int fh_type);
3991 extern void jfs_set_inode_flags(struct inode *);
3992 +extern int jfs_sync_flags(struct inode *, int, int);
3993 extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int);
3994 extern int jfs_setattr(struct dentry *, struct iattr *);
3996 diff -NurpP --minimal linux-3.5/fs/jfs/namei.c linux-3.5-vs2.3.4/fs/jfs/namei.c
3997 --- linux-3.5/fs/jfs/namei.c 2012-05-21 18:07:25.000000000 +0200
3998 +++ linux-3.5-vs2.3.4/fs/jfs/namei.c 2012-07-23 01:45:55.000000000 +0200
4000 #include <linux/ctype.h>
4001 #include <linux/quotaops.h>
4002 #include <linux/exportfs.h>
4003 +#include <linux/vs_tag.h>
4004 #include "jfs_incore.h"
4005 #include "jfs_superblock.h"
4006 #include "jfs_inode.h"
4007 @@ -1461,6 +1462,7 @@ static struct dentry *jfs_lookup(struct
4008 jfs_err("jfs_lookup: iget failed on inum %d", (uint)inum);
4011 + dx_propagate_tag(nd, ip);
4012 return d_splice_alias(ip, dentry);
4015 @@ -1525,6 +1527,7 @@ const struct inode_operations jfs_dir_in
4016 #ifdef CONFIG_JFS_POSIX_ACL
4017 .get_acl = jfs_get_acl,
4019 + .sync_flags = jfs_sync_flags,
4022 const struct file_operations jfs_dir_operations = {
4023 diff -NurpP --minimal linux-3.5/fs/jfs/super.c linux-3.5-vs2.3.4/fs/jfs/super.c
4024 --- linux-3.5/fs/jfs/super.c 2012-05-21 18:07:25.000000000 +0200
4025 +++ linux-3.5-vs2.3.4/fs/jfs/super.c 2012-07-23 01:45:55.000000000 +0200
4026 @@ -197,7 +197,8 @@ static void jfs_put_super(struct super_b
4028 Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize,
4029 Opt_resize_nosize, Opt_errors, Opt_ignore, Opt_err, Opt_quota,
4030 - Opt_usrquota, Opt_grpquota, Opt_uid, Opt_gid, Opt_umask
4031 + Opt_usrquota, Opt_grpquota, Opt_uid, Opt_gid, Opt_umask,
4032 + Opt_tag, Opt_notag, Opt_tagid
4035 static const match_table_t tokens = {
4036 @@ -207,6 +208,10 @@ static const match_table_t tokens = {
4037 {Opt_resize, "resize=%u"},
4038 {Opt_resize_nosize, "resize"},
4039 {Opt_errors, "errors=%s"},
4041 + {Opt_notag, "notag"},
4042 + {Opt_tagid, "tagid=%u"},
4043 + {Opt_tag, "tagxid"},
4044 {Opt_ignore, "noquota"},
4045 {Opt_ignore, "quota"},
4046 {Opt_usrquota, "usrquota"},
4047 @@ -341,6 +346,20 @@ static int parse_options(char *options,
4051 +#ifndef CONFIG_TAGGING_NONE
4053 + *flag |= JFS_TAGGED;
4056 + *flag &= JFS_TAGGED;
4059 +#ifdef CONFIG_PROPAGATE
4062 + *flag |= JFS_TAGGED;
4066 printk("jfs: Unrecognized mount option \"%s\" "
4067 " or missing value\n", p);
4068 @@ -372,6 +391,12 @@ static int jfs_remount(struct super_bloc
4072 + if ((flag & JFS_TAGGED) && !(sb->s_flags & MS_TAGGED)) {
4073 + printk(KERN_ERR "JFS: %s: tagging not permitted on remount.\n",
4079 if (sb->s_flags & MS_RDONLY) {
4081 @@ -455,6 +480,9 @@ static int jfs_fill_super(struct super_b
4082 #ifdef CONFIG_JFS_POSIX_ACL
4083 sb->s_flags |= MS_POSIXACL;
4085 + /* map mount option tagxid */
4086 + if (sbi->flag & JFS_TAGGED)
4087 + sb->s_flags |= MS_TAGGED;
4090 printk(KERN_ERR "resize option for remount only\n");
4091 diff -NurpP --minimal linux-3.5/fs/libfs.c linux-3.5-vs2.3.4/fs/libfs.c
4092 --- linux-3.5/fs/libfs.c 2012-07-22 23:39:40.000000000 +0200
4093 +++ linux-3.5-vs2.3.4/fs/libfs.c 2012-07-23 01:45:55.000000000 +0200
4094 @@ -135,7 +135,8 @@ static inline unsigned char dt_type(stru
4095 * both impossible due to the lock on directory.
4098 -int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir)
4099 +static inline int do_dcache_readdir_filter(struct file *filp,
4100 + void *dirent, filldir_t filldir, int (*filter)(struct dentry *dentry))
4102 struct dentry *dentry = filp->f_path.dentry;
4103 struct dentry *cursor = filp->private_data;
4104 @@ -166,6 +167,8 @@ int dcache_readdir(struct file * filp, v
4105 for (p=q->next; p != &dentry->d_subdirs; p=p->next) {
4106 struct dentry *next;
4107 next = list_entry(p, struct dentry, d_u.d_child);
4108 + if (filter && !filter(next))
4110 spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
4111 if (!simple_positive(next)) {
4112 spin_unlock(&next->d_lock);
4113 @@ -192,6 +195,17 @@ int dcache_readdir(struct file * filp, v
4117 +int dcache_readdir(struct file *filp, void *dirent, filldir_t filldir)
4119 + return do_dcache_readdir_filter(filp, dirent, filldir, NULL);
4122 +int dcache_readdir_filter(struct file *filp, void *dirent, filldir_t filldir,
4123 + int (*filter)(struct dentry *))
4125 + return do_dcache_readdir_filter(filp, dirent, filldir, filter);
4128 ssize_t generic_read_dir(struct file *filp, char __user *buf, size_t siz, loff_t *ppos)
4131 @@ -983,6 +997,7 @@ EXPORT_SYMBOL(dcache_dir_close);
4132 EXPORT_SYMBOL(dcache_dir_lseek);
4133 EXPORT_SYMBOL(dcache_dir_open);
4134 EXPORT_SYMBOL(dcache_readdir);
4135 +EXPORT_SYMBOL(dcache_readdir_filter);
4136 EXPORT_SYMBOL(generic_read_dir);
4137 EXPORT_SYMBOL(mount_pseudo);
4138 EXPORT_SYMBOL(simple_write_begin);
4139 diff -NurpP --minimal linux-3.5/fs/locks.c linux-3.5-vs2.3.4/fs/locks.c
4140 --- linux-3.5/fs/locks.c 2012-07-22 23:39:41.000000000 +0200
4141 +++ linux-3.5-vs2.3.4/fs/locks.c 2012-07-23 01:45:55.000000000 +0200
4143 #include <linux/time.h>
4144 #include <linux/rcupdate.h>
4145 #include <linux/pid_namespace.h>
4146 +#include <linux/vs_base.h>
4147 +#include <linux/vs_limit.h>
4149 #include <asm/uaccess.h>
4151 @@ -184,11 +186,17 @@ static void locks_init_lock_heads(struct
4152 /* Allocate an empty lock structure. */
4153 struct file_lock *locks_alloc_lock(void)
4155 - struct file_lock *fl = kmem_cache_zalloc(filelock_cache, GFP_KERNEL);
4156 + struct file_lock *fl;
4159 - locks_init_lock_heads(fl);
4160 + if (!vx_locks_avail(1))
4163 + fl = kmem_cache_zalloc(filelock_cache, GFP_KERNEL);
4166 + locks_init_lock_heads(fl);
4171 EXPORT_SYMBOL_GPL(locks_alloc_lock);
4172 @@ -216,6 +224,7 @@ void locks_free_lock(struct file_lock *f
4173 BUG_ON(!list_empty(&fl->fl_block));
4174 BUG_ON(!list_empty(&fl->fl_link));
4177 locks_release_private(fl);
4178 kmem_cache_free(filelock_cache, fl);
4180 @@ -225,6 +234,7 @@ void locks_init_lock(struct file_lock *f
4182 memset(fl, 0, sizeof(struct file_lock));
4183 locks_init_lock_heads(fl);
4187 EXPORT_SYMBOL(locks_init_lock);
4188 @@ -265,6 +275,7 @@ void locks_copy_lock(struct file_lock *n
4189 new->fl_file = fl->fl_file;
4190 new->fl_ops = fl->fl_ops;
4191 new->fl_lmops = fl->fl_lmops;
4192 + new->fl_xid = fl->fl_xid;
4194 locks_copy_private(new, fl);
4196 @@ -303,6 +314,11 @@ static int flock_make_lock(struct file *
4197 fl->fl_flags = FL_FLOCK;
4199 fl->fl_end = OFFSET_MAX;
4201 + vxd_assert(filp->f_xid == vx_current_xid(),
4202 + "f_xid(%d) == current(%d)", filp->f_xid, vx_current_xid());
4203 + fl->fl_xid = filp->f_xid;
4208 @@ -452,6 +468,7 @@ static int lease_init(struct file *filp,
4210 fl->fl_owner = current->files;
4211 fl->fl_pid = current->tgid;
4212 + fl->fl_xid = vx_current_xid();
4215 fl->fl_flags = FL_LEASE;
4216 @@ -471,6 +488,11 @@ static struct file_lock *lease_alloc(str
4218 return ERR_PTR(error);
4220 + fl->fl_xid = vx_current_xid();
4222 + vxd_assert(filp->f_xid == fl->fl_xid,
4223 + "f_xid(%d) == fl_xid(%d)", filp->f_xid, fl->fl_xid);
4225 error = lease_init(filp, type, fl);
4227 locks_free_lock(fl);
4228 @@ -773,6 +795,7 @@ static int flock_lock_file(struct file *
4232 + new_fl->fl_xid = -1;
4234 for_each_lock(inode, before) {
4235 struct file_lock *fl = *before;
4236 @@ -793,6 +816,7 @@ find_conflict:
4238 locks_copy_lock(new_fl, request);
4239 locks_insert_lock(before, new_fl);
4240 + vx_locks_inc(new_fl);
4244 @@ -803,7 +827,8 @@ out:
4248 -static int __posix_lock_file(struct inode *inode, struct file_lock *request, struct file_lock *conflock)
4249 +static int __posix_lock_file(struct inode *inode, struct file_lock *request,
4250 + struct file_lock *conflock, xid_t xid)
4252 struct file_lock *fl;
4253 struct file_lock *new_fl = NULL;
4254 @@ -813,6 +838,8 @@ static int __posix_lock_file(struct inod
4255 struct file_lock **before;
4256 int error, added = 0;
4258 + vxd_assert(xid == vx_current_xid(),
4259 + "xid(%d) == current(%d)", xid, vx_current_xid());
4261 * We may need two file_lock structures for this operation,
4262 * so we get them in advance to avoid races.
4263 @@ -823,7 +850,11 @@ static int __posix_lock_file(struct inod
4264 (request->fl_type != F_UNLCK ||
4265 request->fl_start != 0 || request->fl_end != OFFSET_MAX)) {
4266 new_fl = locks_alloc_lock();
4267 + new_fl->fl_xid = xid;
4268 + vx_locks_inc(new_fl);
4269 new_fl2 = locks_alloc_lock();
4270 + new_fl2->fl_xid = xid;
4271 + vx_locks_inc(new_fl2);
4275 @@ -1022,7 +1053,8 @@ static int __posix_lock_file(struct inod
4276 int posix_lock_file(struct file *filp, struct file_lock *fl,
4277 struct file_lock *conflock)
4279 - return __posix_lock_file(filp->f_path.dentry->d_inode, fl, conflock);
4280 + return __posix_lock_file(filp->f_path.dentry->d_inode,
4281 + fl, conflock, filp->f_xid);
4283 EXPORT_SYMBOL(posix_lock_file);
4285 @@ -1112,7 +1144,7 @@ int locks_mandatory_area(int read_write,
4286 fl.fl_end = offset + count - 1;
4289 - error = __posix_lock_file(inode, &fl, NULL);
4290 + error = __posix_lock_file(inode, &fl, NULL, filp->f_xid);
4291 if (error != FILE_LOCK_DEFERRED)
4293 error = wait_event_interruptible(fl.fl_wait, !fl.fl_next);
4294 @@ -1407,6 +1439,7 @@ int generic_add_lease(struct file *filp,
4297 locks_insert_lock(before, lease);
4298 + vx_locks_inc(lease);
4302 @@ -1848,6 +1881,11 @@ int fcntl_setlk(unsigned int fd, struct
4303 if (file_lock == NULL)
4306 + vxd_assert(filp->f_xid == vx_current_xid(),
4307 + "f_xid(%d) == current(%d)", filp->f_xid, vx_current_xid());
4308 + file_lock->fl_xid = filp->f_xid;
4309 + vx_locks_inc(file_lock);
4312 * This might block, so we do it before checking the inode.
4314 @@ -1966,6 +2004,11 @@ int fcntl_setlk64(unsigned int fd, struc
4315 if (file_lock == NULL)
4318 + vxd_assert(filp->f_xid == vx_current_xid(),
4319 + "f_xid(%d) == current(%d)", filp->f_xid, vx_current_xid());
4320 + file_lock->fl_xid = filp->f_xid;
4321 + vx_locks_inc(file_lock);
4324 * This might block, so we do it before checking the inode.
4326 @@ -2231,8 +2274,11 @@ static int locks_show(struct seq_file *f
4328 lock_get_status(f, fl, *((loff_t *)f->private), "");
4330 - list_for_each_entry(bfl, &fl->fl_block, fl_block)
4331 + list_for_each_entry(bfl, &fl->fl_block, fl_block) {
4332 + if (!vx_check(fl->fl_xid, VS_WATCH_P | VS_IDENT))
4334 lock_get_status(f, bfl, *((loff_t *)f->private), " ->");
4339 diff -NurpP --minimal linux-3.5/fs/mount.h linux-3.5-vs2.3.4/fs/mount.h
4340 --- linux-3.5/fs/mount.h 2012-03-19 19:47:26.000000000 +0100
4341 +++ linux-3.5-vs2.3.4/fs/mount.h 2012-07-23 01:45:55.000000000 +0200
4342 @@ -47,6 +47,7 @@ struct mount {
4343 int mnt_expiry_mark; /* true if marked for expiry */
4346 + tag_t mnt_tag; /* tagging used for vfsmount */
4349 static inline struct mount *real_mount(struct vfsmount *mnt)
4350 diff -NurpP --minimal linux-3.5/fs/namei.c linux-3.5-vs2.3.4/fs/namei.c
4351 --- linux-3.5/fs/namei.c 2012-07-22 23:39:41.000000000 +0200
4352 +++ linux-3.5-vs2.3.4/fs/namei.c 2012-07-23 10:46:40.000000000 +0200
4354 #include <linux/device_cgroup.h>
4355 #include <linux/fs_struct.h>
4356 #include <linux/posix_acl.h>
4357 +#include <linux/proc_fs.h>
4358 +#include <linux/vserver/inode.h>
4359 +#include <linux/vs_base.h>
4360 +#include <linux/vs_tag.h>
4361 +#include <linux/vs_cowbl.h>
4362 +#include <linux/vs_device.h>
4363 +#include <linux/vs_context.h>
4364 +#include <linux/pid_namespace.h>
4365 #include <asm/uaccess.h>
4367 #include "internal.h"
4368 @@ -212,6 +220,89 @@ static int check_acl(struct inode *inode
4372 +static inline int dx_barrier(const struct inode *inode)
4374 + if (IS_BARRIER(inode) && !vx_check(0, VS_ADMIN | VS_WATCH)) {
4375 + vxwprintk_task(1, "did hit the barrier.");
4381 +static int __dx_permission(const struct inode *inode, int mask)
4383 + if (dx_barrier(inode))
4386 + if (inode->i_sb->s_magic == DEVPTS_SUPER_MAGIC) {
4387 + /* devpts is xid tagged */
4388 + if (S_ISDIR(inode->i_mode) ||
4389 + vx_check((xid_t)inode->i_tag, VS_IDENT | VS_WATCH_P))
4392 + /* just pretend we didn't find anything */
4395 + else if (inode->i_sb->s_magic == PROC_SUPER_MAGIC) {
4396 + struct proc_dir_entry *de = PDE(inode);
4398 + if (de && !vx_hide_check(0, de->vx_flags))
4401 + if ((mask & (MAY_WRITE | MAY_APPEND))) {
4403 + struct task_struct *tsk;
4405 + if (vx_check(0, VS_ADMIN | VS_WATCH_P) ||
4406 + vx_flags(VXF_STATE_SETUP, 0))
4409 + pid = PROC_I(inode)->pid;
4414 + tsk = pid_task(pid, PIDTYPE_PID);
4415 + vxdprintk(VXD_CBIT(tag, 0), "accessing %p[#%u]",
4416 + tsk, (tsk ? vx_task_xid(tsk) : 0));
4418 + vx_check(vx_task_xid(tsk), VS_IDENT | VS_WATCH_P)) {
4419 + rcu_read_unlock();
4422 + rcu_read_unlock();
4425 + /* FIXME: Should we block some entries here? */
4430 + if (dx_notagcheck(inode->i_sb) ||
4431 + dx_check(inode->i_tag, DX_HOSTID | DX_ADMIN | DX_WATCH |
4440 +int dx_permission(const struct inode *inode, int mask)
4442 + int ret = __dx_permission(inode, mask);
4443 + if (unlikely(ret)) {
4444 +#ifndef CONFIG_VSERVER_WARN_DEVPTS
4445 + if (inode->i_sb->s_magic != DEVPTS_SUPER_MAGIC)
4448 + "denied [0x%x] access to inode %s:%p[#%d,%lu]",
4449 + mask, inode->i_sb->s_id, inode, inode->i_tag,
4456 * This does the basic permission checking
4458 @@ -343,10 +434,14 @@ int inode_permission(struct inode *inode
4460 * Nobody gets write access to an immutable file.
4462 - if (IS_IMMUTABLE(inode))
4463 + if (IS_IMMUTABLE(inode) && !IS_COW(inode))
4467 + retval = dx_permission(inode, mask);
4471 retval = do_inode_permission(inode, mask);
4474 @@ -1025,7 +1120,8 @@ static void follow_dotdot(struct nameida
4476 if (nd->path.dentry == nd->root.dentry &&
4477 nd->path.mnt == nd->root.mnt) {
4479 + /* for sane '/' avoid follow_mount() */
4482 if (nd->path.dentry != nd->path.mnt->mnt_root) {
4483 /* rare case of legitimate dget_parent()... */
4484 @@ -1174,6 +1270,9 @@ static int lookup_fast(struct nameidata
4489 + /* FIXME: check dx permission */
4492 path->dentry = dentry;
4493 if (unlikely(!__follow_mount_rcu(nd, path, inode)))
4494 @@ -1209,6 +1308,8 @@ unlazy:
4498 + /* FIXME: check dx permission */
4501 path->dentry = dentry;
4502 err = follow_managed(path, nd->flags);
4503 @@ -2010,7 +2111,7 @@ static int may_delete(struct inode *dir,
4506 if (check_sticky(dir, victim->d_inode)||IS_APPEND(victim->d_inode)||
4507 - IS_IMMUTABLE(victim->d_inode) || IS_SWAPFILE(victim->d_inode))
4508 + IS_IXORUNLINK(victim->d_inode) || IS_SWAPFILE(victim->d_inode))
4511 if (!S_ISDIR(victim->d_inode->i_mode))
4512 @@ -2090,19 +2191,25 @@ int vfs_create(struct inode *dir, struct
4514 int error = may_create(dir, dentry);
4518 + vxdprintk(VXD_CBIT(misc, 3), "may_create failed with %d", error);
4522 if (!dir->i_op->create)
4523 return -EACCES; /* shouldn't it be ENOSYS? */
4526 error = security_inode_create(dir, dentry, mode);
4529 + vxdprintk(VXD_CBIT(misc, 3), "security_inode_create failed with %d", error);
4532 error = dir->i_op->create(dir, dentry, mode, nd);
4534 fsnotify_create(dir, dentry);
4536 + vxdprintk(VXD_CBIT(misc, 3), "i_op->create failed with %d", error);
4540 @@ -2137,6 +2244,15 @@ static int may_open(struct path *path, i
4544 +#ifdef CONFIG_VSERVER_COWBL
4545 + if (IS_COW(inode) &&
4546 + ((flag & O_ACCMODE) != O_RDONLY)) {
4547 + if (IS_COW_LINK(inode))
4549 + inode->i_flags &= ~(S_IXUNLINK|S_IMMUTABLE);
4550 + mark_inode_dirty(inode);
4553 error = inode_permission(inode, acc_mode);
4556 @@ -2386,6 +2502,16 @@ ok:
4559 error = may_open(&nd->path, acc_mode, open_flag);
4560 +#ifdef CONFIG_VSERVER_COWBL
4561 + if (error == -EMLINK) {
4562 + struct dentry *dentry;
4563 + dentry = cow_break_link(pathname);
4564 + if (IS_ERR(dentry))
4565 + error = PTR_ERR(dentry);
4572 filp = nameidata_to_filp(nd);
4573 @@ -2443,6 +2569,7 @@ static struct file *path_openat(int dfd,
4578 filp = get_empty_filp();
4580 return ERR_PTR(-ENFILE);
4581 @@ -2480,6 +2607,17 @@ static struct file *path_openat(int dfd,
4582 filp = do_last(nd, &path, op, pathname);
4583 put_link(nd, &link, cookie);
4586 +#ifdef CONFIG_VSERVER_COWBL
4587 + if (filp == ERR_PTR(-EMLINK)) {
4588 + if (nd->root.mnt && !(nd->flags & LOOKUP_ROOT))
4589 + path_put(&nd->root);
4592 + release_open_intent(nd);
4597 if (nd->root.mnt && !(nd->flags & LOOKUP_ROOT))
4598 path_put(&nd->root);
4599 @@ -2575,6 +2713,11 @@ struct dentry *kern_path_create(int dfd,
4603 + vxdprintk(VXD_CBIT(misc, 3), "kern_path_create path.dentry = %p (%.*s), dentry = %p (%.*s), d_inode = %p",
4604 + path->dentry, path->dentry->d_name.len,
4605 + path->dentry->d_name.name, dentry,
4606 + dentry->d_name.len, dentry->d_name.name,
4607 + path->dentry->d_inode);
4611 @@ -3060,7 +3203,7 @@ int vfs_link(struct dentry *old_dentry,
4613 * A link to an append-only or immutable file cannot be created.
4615 - if (IS_APPEND(inode) || IS_IMMUTABLE(inode))
4616 + if (IS_APPEND(inode) || IS_IXORUNLINK(inode))
4618 if (!dir->i_op->link)
4620 @@ -3449,6 +3592,253 @@ int vfs_follow_link(struct nameidata *nd
4621 return __vfs_follow_link(nd, link);
4625 +#ifdef CONFIG_VSERVER_COWBL
4628 +long do_cow_splice(struct file *in, struct file *out, size_t len)
4632 + return do_splice_direct(in, &ppos, out, len, 0);
4635 +extern unsigned int mnt_get_count(struct mount *mnt);
4637 +struct dentry *cow_break_link(const char *pathname)
4639 + int ret, mode, pathlen, redo = 0;
4640 + struct nameidata old_nd, dir_nd;
4641 + struct path old_path, dir_path;
4642 + struct dentry *dir, *old_dentry, *new_dentry = NULL;
4643 + struct file *old_file;
4644 + struct file *new_file;
4645 + char *to, *path, pad='\251';
4648 + vxdprintk(VXD_CBIT(misc, 1),
4649 + "cow_break_link(" VS_Q("%s") ")", pathname);
4650 + path = kmalloc(PATH_MAX, GFP_KERNEL);
4655 + /* old_nd will have refs to dentry and mnt */
4656 + ret = do_path_lookup(AT_FDCWD, pathname, LOOKUP_FOLLOW, &old_nd);
4657 + vxdprintk(VXD_CBIT(misc, 2),
4658 + "do_path_lookup(old): %d [r=%d]",
4659 + ret, mnt_get_count(real_mount(old_nd.path.mnt)));
4661 + goto out_free_path;
4663 + old_path = old_nd.path;
4664 + old_dentry = old_path.dentry;
4665 + mode = old_dentry->d_inode->i_mode;
4667 + to = d_path(&old_path, path, PATH_MAX-2);
4668 + pathlen = strlen(to);
4669 + vxdprintk(VXD_CBIT(misc, 2),
4670 + "old path " VS_Q("%s") " [%p:" VS_Q("%.*s") ":%d]", to,
4672 + old_dentry->d_name.len, old_dentry->d_name.name,
4673 + old_dentry->d_name.len);
4675 + to[pathlen + 1] = 0;
4677 + new_dentry = NULL;
4678 + to[pathlen] = pad--;
4680 + if (pad <= '\240')
4683 + vxdprintk(VXD_CBIT(misc, 1), "temp copy " VS_Q("%s"), to);
4684 + /* dir_nd will have refs to dentry and mnt */
4685 + ret = do_path_lookup(AT_FDCWD, to,
4686 + LOOKUP_PARENT | LOOKUP_OPEN | LOOKUP_CREATE, &dir_nd);
4687 + vxdprintk(VXD_CBIT(misc, 2), "do_path_lookup(new): %d", ret);
4691 + /* this puppy downs the dir inode mutex if successful */
4692 + new_dentry = kern_path_create(AT_FDCWD, to, &dir_path, 0);
4693 + if (!new_dentry || IS_ERR(new_dentry)) {
4694 + path_put(&dir_nd.path);
4695 + vxdprintk(VXD_CBIT(misc, 2),
4696 + "kern_path_create(new) failed with %ld",
4697 + PTR_ERR(new_dentry));
4700 + path_put(&dir_path);
4701 + vxdprintk(VXD_CBIT(misc, 2),
4702 + "kern_path_create(new): %p [" VS_Q("%.*s") ":%d]",
4704 + new_dentry->d_name.len, new_dentry->d_name.name,
4705 + new_dentry->d_name.len);
4707 + dir = dir_nd.path.dentry;
4709 + ret = vfs_create(dir->d_inode, new_dentry, mode, &dir_nd);
4710 + vxdprintk(VXD_CBIT(misc, 2),
4711 + "vfs_create(new): %d", ret);
4712 + if (ret == -EEXIST) {
4713 + mutex_unlock(&dir->d_inode->i_mutex);
4714 + path_put(&dir_nd.path);
4719 + goto out_unlock_new;
4721 + /* drop out early, ret passes ENOENT */
4723 + if ((redo = d_unhashed(old_dentry)))
4724 + goto out_unlock_new;
4726 + path_get(&old_path);
4727 + /* this one cleans up the dentry/mnt in case of failure */
4728 + old_file = dentry_open(old_dentry, old_path.mnt,
4729 + O_RDONLY, current_cred());
4730 + vxdprintk(VXD_CBIT(misc, 2),
4731 + "dentry_open(old): %p", old_file);
4732 + if (IS_ERR(old_file)) {
4733 + ret = PTR_ERR(old_file);
4734 + goto out_unlock_new;
4738 + mntget(old_path.mnt);
4739 + /* this one cleans up the dentry/mnt in case of failure */
4740 + new_file = dentry_open(new_dentry, old_path.mnt,
4741 + O_WRONLY, current_cred());
4742 + vxdprintk(VXD_CBIT(misc, 2),
4743 + "dentry_open(new): %p", new_file);
4744 + if (IS_ERR(new_file)) {
4745 + ret = PTR_ERR(new_file);
4746 + goto out_fput_old;
4749 + size = i_size_read(old_file->f_dentry->d_inode);
4750 + ret = do_cow_splice(old_file, new_file, size);
4751 + vxdprintk(VXD_CBIT(misc, 2), "do_splice_direct: %d", ret);
4753 + goto out_fput_both;
4754 + } else if (ret < size) {
4756 + goto out_fput_both;
4758 + struct inode *old_inode = old_dentry->d_inode;
4759 + struct inode *new_inode = new_dentry->d_inode;
4760 + struct iattr attr = {
4761 + .ia_uid = old_inode->i_uid,
4762 + .ia_gid = old_inode->i_gid,
4763 + .ia_valid = ATTR_UID | ATTR_GID
4766 + setattr_copy(new_inode, &attr);
4767 + mark_inode_dirty(new_inode);
4770 + mutex_lock(&old_dentry->d_inode->i_sb->s_vfs_rename_mutex);
4772 + /* drop out late */
4774 + if ((redo = d_unhashed(old_dentry)))
4777 + vxdprintk(VXD_CBIT(misc, 2),
4778 + "vfs_rename: [" VS_Q("%*s") ":%d] -> [" VS_Q("%*s") ":%d]",
4779 + new_dentry->d_name.len, new_dentry->d_name.name,
4780 + new_dentry->d_name.len,
4781 + old_dentry->d_name.len, old_dentry->d_name.name,
4782 + old_dentry->d_name.len);
4783 + ret = vfs_rename(dir_nd.path.dentry->d_inode, new_dentry,
4784 + old_dentry->d_parent->d_inode, old_dentry);
4785 + vxdprintk(VXD_CBIT(misc, 2), "vfs_rename: %d", ret);
4788 + mutex_unlock(&old_dentry->d_inode->i_sb->s_vfs_rename_mutex);
4791 + vxdprintk(VXD_CBIT(misc, 3),
4792 + "fput(new_file=%p[#%ld])", new_file,
4793 + atomic_long_read(&new_file->f_count));
4797 + vxdprintk(VXD_CBIT(misc, 3),
4798 + "fput(old_file=%p[#%ld])", old_file,
4799 + atomic_long_read(&old_file->f_count));
4803 + mutex_unlock(&dir->d_inode->i_mutex);
4807 + /* error path cleanup */
4808 + vfs_unlink(dir->d_inode, new_dentry);
4812 + goto out_rel_both;
4813 + /* lookup dentry once again */
4814 + /* old_nd.path is freed as old_path in out_rel_old */
4815 + ret = do_path_lookup(AT_FDCWD, pathname, LOOKUP_FOLLOW, &old_nd);
4817 + goto out_rel_both;
4820 + new_dentry = old_nd.path.dentry;
4821 + vxdprintk(VXD_CBIT(misc, 2),
4822 + "do_path_lookup(redo): %p [" VS_Q("%.*s") ":%d]",
4824 + new_dentry->d_name.len, new_dentry->d_name.name,
4825 + new_dentry->d_name.len);
4829 + path_put(&dir_nd.path);
4831 + path_put(&old_path);
4837 + new_dentry = ERR_PTR(ret);
4839 + vxdprintk(VXD_CBIT(misc, 3),
4840 + "cow_break_link returning with %p [r=%d]",
4841 + new_dentry, mnt_get_count(real_mount(old_nd.path.mnt)));
4842 + return new_dentry;
4847 +int vx_info_mnt_namespace(struct mnt_namespace *ns, char *buffer)
4850 + struct vfsmount *vmnt;
4851 + char *pstr, *root;
4854 + pstr = kmalloc(PATH_MAX, GFP_KERNEL);
4858 + vmnt = &ns->root->mnt;
4860 + path.dentry = vmnt->mnt_root;
4861 + root = d_path(&path, pstr, PATH_MAX - 2);
4862 + length = sprintf(buffer + length,
4863 + "Namespace:\t%p [#%u]\n"
4864 + "RootPath:\t%s\n",
4865 + ns, atomic_read(&ns->count),
4871 /* get the link contents into pagecache */
4872 static char *page_getlink(struct dentry * dentry, struct page **ppage)
4874 @@ -3573,3 +3963,4 @@ EXPORT_SYMBOL(vfs_symlink);
4875 EXPORT_SYMBOL(vfs_unlink);
4876 EXPORT_SYMBOL(dentry_unhash);
4877 EXPORT_SYMBOL(generic_readlink);
4878 +EXPORT_SYMBOL(vx_info_mnt_namespace);
4879 diff -NurpP --minimal linux-3.5/fs/namespace.c linux-3.5-vs2.3.4/fs/namespace.c
4880 --- linux-3.5/fs/namespace.c 2012-07-22 23:39:41.000000000 +0200
4881 +++ linux-3.5-vs2.3.4/fs/namespace.c 2012-07-23 10:44:12.000000000 +0200
4883 #include <linux/fs_struct.h> /* get_fs_root et.al. */
4884 #include <linux/fsnotify.h> /* fsnotify_vfsmount_delete */
4885 #include <linux/uaccess.h>
4886 +#include <linux/vs_base.h>
4887 +#include <linux/vs_context.h>
4888 +#include <linux/vs_tag.h>
4889 +#include <linux/vserver/space.h>
4890 +#include <linux/vserver/global.h>
4892 #include "internal.h"
4894 @@ -697,6 +702,10 @@ vfs_kern_mount(struct file_system_type *
4896 return ERR_PTR(-ENODEV);
4898 + if ((type->fs_flags & FS_BINARY_MOUNTDATA) &&
4899 + !vx_capable(CAP_SYS_ADMIN, VXC_BINARY_MOUNT))
4900 + return ERR_PTR(-EPERM);
4902 mnt = alloc_vfsmnt(name);
4904 return ERR_PTR(-ENOMEM);
4905 @@ -745,6 +754,7 @@ static struct mount *clone_mnt(struct mo
4906 mnt->mnt.mnt_root = dget(root);
4907 mnt->mnt_mountpoint = mnt->mnt.mnt_root;
4908 mnt->mnt_parent = mnt;
4909 + mnt->mnt_tag = old->mnt_tag;
4910 br_write_lock(&vfsmount_lock);
4911 list_add_tail(&mnt->mnt_instance, &sb->s_mounts);
4912 br_write_unlock(&vfsmount_lock);
4913 @@ -1211,7 +1221,7 @@ SYSCALL_DEFINE2(umount, char __user *, n
4917 - if (!capable(CAP_SYS_ADMIN))
4918 + if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT))
4921 retval = do_umount(mnt, flags);
4922 @@ -1237,7 +1247,7 @@ SYSCALL_DEFINE1(oldumount, char __user *
4924 static int mount_is_safe(struct path *path)
4926 - if (capable(CAP_SYS_ADMIN))
4927 + if (vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT))
4931 @@ -1550,7 +1560,7 @@ static int do_change_type(struct path *p
4935 - if (!capable(CAP_SYS_ADMIN))
4936 + if (!vx_capable(CAP_SYS_ADMIN, VXC_NAMESPACE))
4939 if (path->dentry != path->mnt->mnt_root)
4940 @@ -1566,6 +1576,7 @@ static int do_change_type(struct path *p
4944 + // mnt->mnt_flags = mnt_flags;
4946 br_write_lock(&vfsmount_lock);
4947 for (m = mnt; m; m = (recurse ? next_mnt(m, mnt) : NULL))
4948 @@ -1581,12 +1592,14 @@ static int do_change_type(struct path *p
4949 * do loopback mount.
4951 static int do_loopback(struct path *path, char *old_name,
4953 + tag_t tag, unsigned long flags, int mnt_flags)
4955 LIST_HEAD(umount_list);
4956 struct path old_path;
4957 struct mount *mnt = NULL, *old;
4958 int err = mount_is_safe(path);
4959 + int recurse = flags & MS_REC;
4963 if (!old_name || !*old_name)
4964 @@ -1654,13 +1667,13 @@ static int change_mount_flags(struct vfs
4965 * on it - tough luck.
4967 static int do_remount(struct path *path, int flags, int mnt_flags,
4969 + void *data, xid_t xid)
4972 struct super_block *sb = path->mnt->mnt_sb;
4973 struct mount *mnt = real_mount(path->mnt);
4975 - if (!capable(CAP_SYS_ADMIN))
4976 + if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_REMOUNT))
4979 if (!check_mnt(mnt))
4980 @@ -1709,7 +1722,7 @@ static int do_move_mount(struct path *pa
4984 - if (!capable(CAP_SYS_ADMIN))
4985 + if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT))
4987 if (!old_name || !*old_name)
4989 @@ -1860,7 +1873,7 @@ static int do_new_mount(struct path *pat
4992 /* we need capabilities... */
4993 - if (!capable(CAP_SYS_ADMIN))
4994 + if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT))
4997 mnt = do_kern_mount(type, flags, name, data);
4998 @@ -2130,6 +2143,7 @@ long do_mount(char *dev_name, char *dir_
5005 if ((flags & MS_MGC_MSK) == MS_MGC_VAL)
5006 @@ -2157,6 +2171,12 @@ long do_mount(char *dev_name, char *dir_
5007 if (!(flags & MS_NOATIME))
5008 mnt_flags |= MNT_RELATIME;
5010 + if (dx_parse_tag(data_page, &tag, 1, &mnt_flags, &flags)) {
5011 + /* FIXME: bind and re-mounts get the tag flag? */
5012 + if (flags & (MS_BIND|MS_REMOUNT))
5013 + flags |= MS_TAGID;
5016 /* Separate the per-mountpoint flags */
5017 if (flags & MS_NOSUID)
5018 mnt_flags |= MNT_NOSUID;
5019 @@ -2173,15 +2193,17 @@ long do_mount(char *dev_name, char *dir_
5020 if (flags & MS_RDONLY)
5021 mnt_flags |= MNT_READONLY;
5023 + if (!capable(CAP_SYS_ADMIN))
5024 + mnt_flags |= MNT_NODEV;
5025 flags &= ~(MS_NOSUID | MS_NOEXEC | MS_NODEV | MS_ACTIVE | MS_BORN |
5026 MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
5029 if (flags & MS_REMOUNT)
5030 retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
5033 else if (flags & MS_BIND)
5034 - retval = do_loopback(&path, dev_name, flags & MS_REC);
5035 + retval = do_loopback(&path, dev_name, tag, flags, mnt_flags);
5036 else if (flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE))
5037 retval = do_change_type(&path, flags);
5038 else if (flags & MS_MOVE)
5039 @@ -2284,6 +2306,7 @@ static struct mnt_namespace *dup_mnt_ns(
5040 q = next_mnt(q, new);
5042 up_write(&namespace_sem);
5043 + atomic_inc(&vs_global_mnt_ns);
5047 @@ -2480,9 +2503,10 @@ SYSCALL_DEFINE2(pivot_root, const char _
5049 new_mnt = real_mount(new.mnt);
5050 root_mnt = real_mount(root.mnt);
5051 - if (IS_MNT_SHARED(real_mount(old.mnt)) ||
5052 + if ((IS_MNT_SHARED(real_mount(old.mnt)) ||
5053 IS_MNT_SHARED(new_mnt->mnt_parent) ||
5054 - IS_MNT_SHARED(root_mnt->mnt_parent))
5055 + IS_MNT_SHARED(root_mnt->mnt_parent)) &&
5056 + !vx_flags(VXF_STATE_SETUP, 0))
5058 if (!check_mnt(root_mnt) || !check_mnt(new_mnt))
5060 @@ -2603,6 +2627,7 @@ void put_mnt_ns(struct mnt_namespace *ns
5061 br_write_unlock(&vfsmount_lock);
5062 up_write(&namespace_sem);
5063 release_mounts(&umount_list);
5064 + atomic_dec(&vs_global_mnt_ns);
5068 diff -NurpP --minimal linux-3.5/fs/nfs/client.c linux-3.5-vs2.3.4/fs/nfs/client.c
5069 --- linux-3.5/fs/nfs/client.c 2012-07-22 23:39:41.000000000 +0200
5070 +++ linux-3.5-vs2.3.4/fs/nfs/client.c 2012-07-23 01:45:55.000000000 +0200
5071 @@ -797,6 +797,9 @@ static int nfs_init_server_rpcclient(str
5072 if (server->flags & NFS_MOUNT_SOFT)
5073 server->client->cl_softrtry = 1;
5075 + server->client->cl_tag = 0;
5076 + if (server->flags & NFS_MOUNT_TAGGED)
5077 + server->client->cl_tag = 1;
5081 @@ -990,6 +993,10 @@ static void nfs_server_set_fsinfo(struct
5082 server->acdirmin = server->acdirmax = 0;
5085 + /* FIXME: needs fsinfo
5086 + if (server->flags & NFS_MOUNT_TAGGED)
5087 + sb->s_flags |= MS_TAGGED; */
5089 server->maxfilesize = fsinfo->maxfilesize;
5091 server->time_delta = fsinfo->time_delta;
5092 diff -NurpP --minimal linux-3.5/fs/nfs/dir.c linux-3.5-vs2.3.4/fs/nfs/dir.c
5093 --- linux-3.5/fs/nfs/dir.c 2012-07-22 23:39:41.000000000 +0200
5094 +++ linux-3.5-vs2.3.4/fs/nfs/dir.c 2012-07-23 01:45:55.000000000 +0200
5096 #include <linux/sched.h>
5097 #include <linux/kmemleak.h>
5098 #include <linux/xattr.h>
5099 +#include <linux/vs_tag.h>
5101 #include "delegation.h"
5103 @@ -1337,6 +1338,7 @@ static struct dentry *nfs_lookup(struct
5104 /* Success: notify readdir to use READDIRPLUS */
5105 nfs_advise_use_readdirplus(dir);
5107 + dx_propagate_tag(nd, inode);
5109 res = d_materialise_unique(dentry, inode);
5111 diff -NurpP --minimal linux-3.5/fs/nfs/inode.c linux-3.5-vs2.3.4/fs/nfs/inode.c
5112 --- linux-3.5/fs/nfs/inode.c 2012-07-22 23:39:41.000000000 +0200
5113 +++ linux-3.5-vs2.3.4/fs/nfs/inode.c 2012-07-23 10:48:04.000000000 +0200
5115 #include <linux/compat.h>
5116 #include <linux/freezer.h>
5117 #include <linux/crc32.h>
5118 +#include <linux/vs_tag.h>
5120 #include <asm/uaccess.h>
5122 @@ -275,6 +276,8 @@ nfs_fhget(struct super_block *sb, struct
5123 if (inode->i_state & I_NEW) {
5124 struct nfs_inode *nfsi = NFS_I(inode);
5125 unsigned long now = jiffies;
5129 /* We set i_ino for the few things that still rely on it,
5130 * such as stat(2) */
5131 @@ -319,8 +322,8 @@ nfs_fhget(struct super_block *sb, struct
5132 inode->i_version = 0;
5135 - inode->i_uid = -2;
5136 - inode->i_gid = -2;
5139 inode->i_blocks = 0;
5140 memset(nfsi->cookieverf, 0, sizeof(nfsi->cookieverf));
5142 @@ -354,11 +357,11 @@ nfs_fhget(struct super_block *sb, struct
5143 else if (nfs_server_capable(inode, NFS_CAP_NLINK))
5144 nfsi->cache_validity |= NFS_INO_INVALID_ATTR;
5145 if (fattr->valid & NFS_ATTR_FATTR_OWNER)
5146 - inode->i_uid = fattr->uid;
5148 else if (nfs_server_capable(inode, NFS_CAP_OWNER))
5149 nfsi->cache_validity |= NFS_INO_INVALID_ATTR;
5150 if (fattr->valid & NFS_ATTR_FATTR_GROUP)
5151 - inode->i_gid = fattr->gid;
5153 else if (nfs_server_capable(inode, NFS_CAP_OWNER_GROUP))
5154 nfsi->cache_validity |= NFS_INO_INVALID_ATTR;
5155 if (fattr->valid & NFS_ATTR_FATTR_BLOCKS_USED)
5156 @@ -369,6 +372,11 @@ nfs_fhget(struct super_block *sb, struct
5158 inode->i_blocks = nfs_calc_block_size(fattr->du.nfs3.used);
5160 + inode->i_uid = INOTAG_UID(DX_TAG(inode), uid, gid);
5161 + inode->i_gid = INOTAG_GID(DX_TAG(inode), uid, gid);
5162 + inode->i_tag = INOTAG_TAG(DX_TAG(inode), uid, gid, 0);
5163 + /* maybe fattr->xid someday */
5165 nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);
5166 nfsi->attrtimeo_timestamp = now;
5167 nfsi->access_cache = RB_ROOT;
5168 @@ -488,6 +496,8 @@ void nfs_setattr_update_inode(struct ino
5169 inode->i_uid = attr->ia_uid;
5170 if ((attr->ia_valid & ATTR_GID) != 0)
5171 inode->i_gid = attr->ia_gid;
5172 + if ((attr->ia_valid & ATTR_TAG) && IS_TAGGED(inode))
5173 + inode->i_tag = attr->ia_tag;
5174 NFS_I(inode)->cache_validity |= NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;
5175 spin_unlock(&inode->i_lock);
5177 @@ -947,6 +957,9 @@ static int nfs_check_inode_attributes(st
5178 struct nfs_inode *nfsi = NFS_I(inode);
5179 loff_t cur_size, new_isize;
5180 unsigned long invalid = 0;
5186 if (nfs_have_delegated_attributes(inode))
5187 @@ -972,13 +985,18 @@ static int nfs_check_inode_attributes(st
5188 invalid |= NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE;
5191 + uid = INOTAG_UID(DX_TAG(inode), fattr->uid, fattr->gid);
5192 + gid = INOTAG_GID(DX_TAG(inode), fattr->uid, fattr->gid);
5193 + tag = INOTAG_TAG(DX_TAG(inode), fattr->uid, fattr->gid, 0);
5195 /* Have any file permissions changed? */
5196 if ((fattr->valid & NFS_ATTR_FATTR_MODE) && (inode->i_mode & S_IALLUGO) != (fattr->mode & S_IALLUGO))
5197 invalid |= NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ACCESS | NFS_INO_INVALID_ACL;
5198 - if ((fattr->valid & NFS_ATTR_FATTR_OWNER) && inode->i_uid != fattr->uid)
5199 + if ((fattr->valid & NFS_ATTR_FATTR_OWNER) && uid != fattr->uid)
5200 invalid |= NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ACCESS | NFS_INO_INVALID_ACL;
5201 - if ((fattr->valid & NFS_ATTR_FATTR_GROUP) && inode->i_gid != fattr->gid)
5202 + if ((fattr->valid & NFS_ATTR_FATTR_GROUP) && gid != fattr->gid)
5203 invalid |= NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ACCESS | NFS_INO_INVALID_ACL;
5204 + /* maybe check for tag too? */
5206 /* Has the link count changed? */
5207 if ((fattr->valid & NFS_ATTR_FATTR_NLINK) && inode->i_nlink != fattr->nlink)
5208 @@ -1276,6 +1294,9 @@ static int nfs_update_inode(struct inode
5209 unsigned long invalid = 0;
5210 unsigned long now = jiffies;
5211 unsigned long save_cache_validity;
5216 dfprintk(VFS, "NFS: %s(%s/%ld fh_crc=0x%08x ct=%d info=0x%x)\n",
5217 __func__, inode->i_sb->s_id, inode->i_ino,
5218 @@ -1377,6 +1398,9 @@ static int nfs_update_inode(struct inode
5219 | NFS_INO_REVAL_PAGECACHE
5220 | NFS_INO_REVAL_FORCED);
5222 + uid = TAGINO_UID(DX_TAG(inode), inode->i_uid, inode->i_tag);
5223 + gid = TAGINO_GID(DX_TAG(inode), inode->i_gid, inode->i_tag);
5224 + tag = inode->i_tag;
5226 if (fattr->valid & NFS_ATTR_FATTR_ATIME)
5227 memcpy(&inode->i_atime, &fattr->atime, sizeof(inode->i_atime));
5228 @@ -1398,9 +1422,9 @@ static int nfs_update_inode(struct inode
5229 | NFS_INO_REVAL_FORCED);
5231 if (fattr->valid & NFS_ATTR_FATTR_OWNER) {
5232 - if (inode->i_uid != fattr->uid) {
5233 + if (uid != fattr->uid) {
5234 invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;
5235 - inode->i_uid = fattr->uid;
5238 } else if (server->caps & NFS_CAP_OWNER)
5239 invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR
5240 @@ -1409,9 +1433,9 @@ static int nfs_update_inode(struct inode
5241 | NFS_INO_REVAL_FORCED);
5243 if (fattr->valid & NFS_ATTR_FATTR_GROUP) {
5244 - if (inode->i_gid != fattr->gid) {
5245 + if (gid != fattr->gid) {
5246 invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;
5247 - inode->i_gid = fattr->gid;
5250 } else if (server->caps & NFS_CAP_OWNER_GROUP)
5251 invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR
5252 @@ -1419,6 +1443,10 @@ static int nfs_update_inode(struct inode
5253 | NFS_INO_INVALID_ACL
5254 | NFS_INO_REVAL_FORCED);
5256 + inode->i_uid = INOTAG_UID(DX_TAG(inode), uid, gid);
5257 + inode->i_gid = INOTAG_GID(DX_TAG(inode), uid, gid);
5258 + inode->i_tag = INOTAG_TAG(DX_TAG(inode), uid, gid, tag);
5260 if (fattr->valid & NFS_ATTR_FATTR_NLINK) {
5261 if (inode->i_nlink != fattr->nlink) {
5262 invalid |= NFS_INO_INVALID_ATTR;
5263 diff -NurpP --minimal linux-3.5/fs/nfs/nfs3xdr.c linux-3.5-vs2.3.4/fs/nfs/nfs3xdr.c
5264 --- linux-3.5/fs/nfs/nfs3xdr.c 2012-07-22 23:39:41.000000000 +0200
5265 +++ linux-3.5-vs2.3.4/fs/nfs/nfs3xdr.c 2012-07-23 01:45:55.000000000 +0200
5267 #include <linux/nfs3.h>
5268 #include <linux/nfs_fs.h>
5269 #include <linux/nfsacl.h>
5270 +#include <linux/vs_tag.h>
5271 #include "internal.h"
5273 #define NFSDBG_FACILITY NFSDBG_XDR
5274 @@ -564,7 +565,8 @@ static __be32 *xdr_decode_nfstime3(__be3
5278 -static void encode_sattr3(struct xdr_stream *xdr, const struct iattr *attr)
5279 +static void encode_sattr3(struct xdr_stream *xdr,
5280 + const struct iattr *attr, int tag)
5284 @@ -596,15 +598,19 @@ static void encode_sattr3(struct xdr_str
5288 - if (attr->ia_valid & ATTR_UID) {
5289 + if (attr->ia_valid & ATTR_UID ||
5290 + (tag && (attr->ia_valid & ATTR_TAG))) {
5292 - *p++ = cpu_to_be32(attr->ia_uid);
5293 + *p++ = cpu_to_be32(TAGINO_UID(tag,
5294 + attr->ia_uid, attr->ia_tag));
5298 - if (attr->ia_valid & ATTR_GID) {
5299 + if (attr->ia_valid & ATTR_GID ||
5300 + (tag && (attr->ia_valid & ATTR_TAG))) {
5302 - *p++ = cpu_to_be32(attr->ia_gid);
5303 + *p++ = cpu_to_be32(TAGINO_GID(tag,
5304 + attr->ia_gid, attr->ia_tag));
5308 @@ -883,7 +889,7 @@ static void nfs3_xdr_enc_setattr3args(st
5309 const struct nfs3_sattrargs *args)
5311 encode_nfs_fh3(xdr, args->fh);
5312 - encode_sattr3(xdr, args->sattr);
5313 + encode_sattr3(xdr, args->sattr, req->rq_task->tk_client->cl_tag);
5314 encode_sattrguard3(xdr, args);
5317 @@ -1033,13 +1039,13 @@ static void nfs3_xdr_enc_write3args(stru
5320 static void encode_createhow3(struct xdr_stream *xdr,
5321 - const struct nfs3_createargs *args)
5322 + const struct nfs3_createargs *args, int tag)
5324 encode_uint32(xdr, args->createmode);
5325 switch (args->createmode) {
5326 case NFS3_CREATE_UNCHECKED:
5327 case NFS3_CREATE_GUARDED:
5328 - encode_sattr3(xdr, args->sattr);
5329 + encode_sattr3(xdr, args->sattr, tag);
5331 case NFS3_CREATE_EXCLUSIVE:
5332 encode_createverf3(xdr, args->verifier);
5333 @@ -1054,7 +1060,7 @@ static void nfs3_xdr_enc_create3args(str
5334 const struct nfs3_createargs *args)
5336 encode_diropargs3(xdr, args->fh, args->name, args->len);
5337 - encode_createhow3(xdr, args);
5338 + encode_createhow3(xdr, args, req->rq_task->tk_client->cl_tag);
5342 @@ -1070,7 +1076,7 @@ static void nfs3_xdr_enc_mkdir3args(stru
5343 const struct nfs3_mkdirargs *args)
5345 encode_diropargs3(xdr, args->fh, args->name, args->len);
5346 - encode_sattr3(xdr, args->sattr);
5347 + encode_sattr3(xdr, args->sattr, req->rq_task->tk_client->cl_tag);
5351 @@ -1087,9 +1093,9 @@ static void nfs3_xdr_enc_mkdir3args(stru
5354 static void encode_symlinkdata3(struct xdr_stream *xdr,
5355 - const struct nfs3_symlinkargs *args)
5356 + const struct nfs3_symlinkargs *args, int tag)
5358 - encode_sattr3(xdr, args->sattr);
5359 + encode_sattr3(xdr, args->sattr, tag);
5360 encode_nfspath3(xdr, args->pages, args->pathlen);
5363 @@ -1098,7 +1104,7 @@ static void nfs3_xdr_enc_symlink3args(st
5364 const struct nfs3_symlinkargs *args)
5366 encode_diropargs3(xdr, args->fromfh, args->fromname, args->fromlen);
5367 - encode_symlinkdata3(xdr, args);
5368 + encode_symlinkdata3(xdr, args, req->rq_task->tk_client->cl_tag);
5372 @@ -1126,24 +1132,24 @@ static void nfs3_xdr_enc_symlink3args(st
5375 static void encode_devicedata3(struct xdr_stream *xdr,
5376 - const struct nfs3_mknodargs *args)
5377 + const struct nfs3_mknodargs *args, int tag)
5379 - encode_sattr3(xdr, args->sattr);
5380 + encode_sattr3(xdr, args->sattr, tag);
5381 encode_specdata3(xdr, args->rdev);
5384 static void encode_mknoddata3(struct xdr_stream *xdr,
5385 - const struct nfs3_mknodargs *args)
5386 + const struct nfs3_mknodargs *args, int tag)
5388 encode_ftype3(xdr, args->type);
5389 switch (args->type) {
5392 - encode_devicedata3(xdr, args);
5393 + encode_devicedata3(xdr, args, tag);
5397 - encode_sattr3(xdr, args->sattr);
5398 + encode_sattr3(xdr, args->sattr, tag);
5402 @@ -1158,7 +1164,7 @@ static void nfs3_xdr_enc_mknod3args(stru
5403 const struct nfs3_mknodargs *args)
5405 encode_diropargs3(xdr, args->fh, args->name, args->len);
5406 - encode_mknoddata3(xdr, args);
5407 + encode_mknoddata3(xdr, args, req->rq_task->tk_client->cl_tag);
5411 diff -NurpP --minimal linux-3.5/fs/nfs/super.c linux-3.5-vs2.3.4/fs/nfs/super.c
5412 --- linux-3.5/fs/nfs/super.c 2012-07-22 23:39:41.000000000 +0200
5413 +++ linux-3.5-vs2.3.4/fs/nfs/super.c 2012-07-23 01:45:55.000000000 +0200
5415 #include <linux/parser.h>
5416 #include <linux/nsproxy.h>
5417 #include <linux/rcupdate.h>
5418 +#include <linux/vs_tag.h>
5420 #include <asm/uaccess.h>
5422 @@ -87,6 +88,7 @@ enum {
5423 Opt_sharecache, Opt_nosharecache,
5424 Opt_resvport, Opt_noresvport,
5425 Opt_fscache, Opt_nofscache,
5426 + Opt_tag, Opt_notag,
5428 /* Mount options that take integer arguments */
5430 @@ -99,6 +101,7 @@ enum {
5436 /* Mount options that take string arguments */
5438 @@ -181,6 +184,10 @@ static const match_table_t nfs_mount_opt
5439 /* The following needs to be listed after all other options */
5440 { Opt_nfsvers, "v%s" },
5442 + { Opt_tag, "tag" },
5443 + { Opt_notag, "notag" },
5444 + { Opt_tagid, "tagid=%u" },
5449 @@ -684,6 +691,7 @@ static void nfs_show_mount_options(struc
5450 { NFS_MOUNT_NORDIRPLUS, ",nordirplus", "" },
5451 { NFS_MOUNT_UNSHARED, ",nosharecache", "" },
5452 { NFS_MOUNT_NORESVPORT, ",noresvport", "" },
5453 + { NFS_MOUNT_TAGGED, ",tag", "" },
5456 const struct proc_nfs_info *nfs_infop;
5457 @@ -1296,6 +1304,14 @@ static int nfs_parse_mount_options(char
5458 kfree(mnt->fscache_uniq);
5459 mnt->fscache_uniq = NULL;
5461 +#ifndef CONFIG_TAGGING_NONE
5463 + mnt->flags |= NFS_MOUNT_TAGGED;
5466 + mnt->flags &= ~NFS_MOUNT_TAGGED;
5471 * options that take numeric values
5472 @@ -1382,6 +1398,12 @@ static int nfs_parse_mount_options(char
5473 goto out_invalid_value;
5474 mnt->minorversion = option;
5476 +#ifdef CONFIG_PROPAGATE
5479 + nfs_data.flags |= NFS_MOUNT_TAGGED;
5484 * options that take text values
5485 diff -NurpP --minimal linux-3.5/fs/nfsd/auth.c linux-3.5-vs2.3.4/fs/nfsd/auth.c
5486 --- linux-3.5/fs/nfsd/auth.c 2012-07-22 23:39:41.000000000 +0200
5487 +++ linux-3.5-vs2.3.4/fs/nfsd/auth.c 2012-07-23 10:47:00.000000000 +0200
5490 #include <linux/sched.h>
5491 #include <linux/user_namespace.h>
5492 +#include <linux/vs_tag.h>
5496 @@ -37,6 +38,9 @@ int nfsd_setuser(struct svc_rqst *rqstp,
5498 new->fsuid = rqstp->rq_cred.cr_uid;
5499 new->fsgid = rqstp->rq_cred.cr_gid;
5500 + /* FIXME: this desperately needs a tag :)
5501 + new->xid = (xid_t)INOTAG_TAG(DX_TAG_NFSD, cred.cr_uid, cred.cr_gid, 0);
5504 rqgi = rqstp->rq_cred.cr_group_info;
5506 diff -NurpP --minimal linux-3.5/fs/nfsd/nfs3xdr.c linux-3.5-vs2.3.4/fs/nfsd/nfs3xdr.c
5507 --- linux-3.5/fs/nfsd/nfs3xdr.c 2012-05-21 18:07:26.000000000 +0200
5508 +++ linux-3.5-vs2.3.4/fs/nfsd/nfs3xdr.c 2012-07-23 01:45:55.000000000 +0200
5512 #include <linux/namei.h>
5513 +#include <linux/vs_tag.h>
5517 @@ -95,6 +96,8 @@ static __be32 *
5518 decode_sattr3(__be32 *p, struct iattr *iap)
5526 @@ -104,12 +107,15 @@ decode_sattr3(__be32 *p, struct iattr *i
5529 iap->ia_valid |= ATTR_UID;
5530 - iap->ia_uid = ntohl(*p++);
5531 + uid = ntohl(*p++);
5534 iap->ia_valid |= ATTR_GID;
5535 - iap->ia_gid = ntohl(*p++);
5536 + gid = ntohl(*p++);
5538 + iap->ia_uid = INOTAG_UID(DX_TAG_NFSD, uid, gid);
5539 + iap->ia_gid = INOTAG_GID(DX_TAG_NFSD, uid, gid);
5540 + iap->ia_tag = INOTAG_TAG(DX_TAG_NFSD, uid, gid, 0);
5544 @@ -165,8 +171,12 @@ encode_fattr3(struct svc_rqst *rqstp, __
5545 *p++ = htonl(nfs3_ftypes[(stat->mode & S_IFMT) >> 12]);
5546 *p++ = htonl((u32) stat->mode);
5547 *p++ = htonl((u32) stat->nlink);
5548 - *p++ = htonl((u32) nfsd_ruid(rqstp, stat->uid));
5549 - *p++ = htonl((u32) nfsd_rgid(rqstp, stat->gid));
5550 + *p++ = htonl((u32) nfsd_ruid(rqstp,
5551 + TAGINO_UID(0 /* FIXME: DX_TAG(dentry->d_inode) */,
5552 + stat->uid, stat->tag)));
5553 + *p++ = htonl((u32) nfsd_rgid(rqstp,
5554 + TAGINO_GID(0 /* FIXME: DX_TAG(dentry->d_inode) */,
5555 + stat->gid, stat->tag)));
5556 if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
5557 p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
5559 diff -NurpP --minimal linux-3.5/fs/nfsd/nfs4xdr.c linux-3.5-vs2.3.4/fs/nfsd/nfs4xdr.c
5560 --- linux-3.5/fs/nfsd/nfs4xdr.c 2012-07-22 23:39:41.000000000 +0200
5561 +++ linux-3.5-vs2.3.4/fs/nfsd/nfs4xdr.c 2012-07-23 01:45:55.000000000 +0200
5563 #include <linux/utsname.h>
5564 #include <linux/pagemap.h>
5565 #include <linux/sunrpc/svcauth_gss.h>
5566 +#include <linux/vs_tag.h>
5570 @@ -2351,14 +2352,18 @@ out_acl:
5571 WRITE32(stat.nlink);
5573 if (bmval1 & FATTR4_WORD1_OWNER) {
5574 - status = nfsd4_encode_user(rqstp, stat.uid, &p, &buflen);
5575 + status = nfsd4_encode_user(rqstp,
5576 + TAGINO_UID(DX_TAG(dentry->d_inode),
5577 + stat.uid, stat.tag), &p, &buflen);
5578 if (status == nfserr_resource)
5583 if (bmval1 & FATTR4_WORD1_OWNER_GROUP) {
5584 - status = nfsd4_encode_group(rqstp, stat.gid, &p, &buflen);
5585 + status = nfsd4_encode_group(rqstp,
5586 + TAGINO_GID(DX_TAG(dentry->d_inode),
5587 + stat.gid, stat.tag), &p, &buflen);
5588 if (status == nfserr_resource)
5591 diff -NurpP --minimal linux-3.5/fs/nfsd/nfsxdr.c linux-3.5-vs2.3.4/fs/nfsd/nfsxdr.c
5592 --- linux-3.5/fs/nfsd/nfsxdr.c 2011-05-22 16:17:53.000000000 +0200
5593 +++ linux-3.5-vs2.3.4/fs/nfsd/nfsxdr.c 2012-07-23 01:45:55.000000000 +0200
5598 +#include <linux/vs_tag.h>
5600 #define NFSDDBG_FACILITY NFSDDBG_XDR
5602 @@ -88,6 +89,8 @@ static __be32 *
5603 decode_sattr(__be32 *p, struct iattr *iap)
5611 @@ -101,12 +104,15 @@ decode_sattr(__be32 *p, struct iattr *ia
5613 if ((tmp = ntohl(*p++)) != (u32)-1) {
5614 iap->ia_valid |= ATTR_UID;
5615 - iap->ia_uid = tmp;
5618 if ((tmp = ntohl(*p++)) != (u32)-1) {
5619 iap->ia_valid |= ATTR_GID;
5620 - iap->ia_gid = tmp;
5623 + iap->ia_uid = INOTAG_UID(DX_TAG_NFSD, uid, gid);
5624 + iap->ia_gid = INOTAG_GID(DX_TAG_NFSD, uid, gid);
5625 + iap->ia_tag = INOTAG_TAG(DX_TAG_NFSD, uid, gid, 0);
5626 if ((tmp = ntohl(*p++)) != (u32)-1) {
5627 iap->ia_valid |= ATTR_SIZE;
5629 @@ -151,8 +157,10 @@ encode_fattr(struct svc_rqst *rqstp, __b
5630 *p++ = htonl(nfs_ftypes[type >> 12]);
5631 *p++ = htonl((u32) stat->mode);
5632 *p++ = htonl((u32) stat->nlink);
5633 - *p++ = htonl((u32) nfsd_ruid(rqstp, stat->uid));
5634 - *p++ = htonl((u32) nfsd_rgid(rqstp, stat->gid));
5635 + *p++ = htonl((u32) nfsd_ruid(rqstp,
5636 + TAGINO_UID(DX_TAG(dentry->d_inode), stat->uid, stat->tag)));
5637 + *p++ = htonl((u32) nfsd_rgid(rqstp,
5638 + TAGINO_GID(DX_TAG(dentry->d_inode), stat->gid, stat->tag)));
5640 if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
5641 *p++ = htonl(NFS_MAXPATHLEN);
5642 diff -NurpP --minimal linux-3.5/fs/ocfs2/dlmglue.c linux-3.5-vs2.3.4/fs/ocfs2/dlmglue.c
5643 --- linux-3.5/fs/ocfs2/dlmglue.c 2012-07-22 23:39:41.000000000 +0200
5644 +++ linux-3.5-vs2.3.4/fs/ocfs2/dlmglue.c 2012-07-23 01:45:55.000000000 +0200
5645 @@ -2047,6 +2047,7 @@ static void __ocfs2_stuff_meta_lvb(struc
5646 lvb->lvb_iclusters = cpu_to_be32(oi->ip_clusters);
5647 lvb->lvb_iuid = cpu_to_be32(inode->i_uid);
5648 lvb->lvb_igid = cpu_to_be32(inode->i_gid);
5649 + lvb->lvb_itag = cpu_to_be16(inode->i_tag);
5650 lvb->lvb_imode = cpu_to_be16(inode->i_mode);
5651 lvb->lvb_inlink = cpu_to_be16(inode->i_nlink);
5652 lvb->lvb_iatime_packed =
5653 @@ -2097,6 +2098,7 @@ static void ocfs2_refresh_inode_from_lvb
5655 inode->i_uid = be32_to_cpu(lvb->lvb_iuid);
5656 inode->i_gid = be32_to_cpu(lvb->lvb_igid);
5657 + inode->i_tag = be16_to_cpu(lvb->lvb_itag);
5658 inode->i_mode = be16_to_cpu(lvb->lvb_imode);
5659 set_nlink(inode, be16_to_cpu(lvb->lvb_inlink));
5660 ocfs2_unpack_timespec(&inode->i_atime,
5661 diff -NurpP --minimal linux-3.5/fs/ocfs2/dlmglue.h linux-3.5-vs2.3.4/fs/ocfs2/dlmglue.h
5662 --- linux-3.5/fs/ocfs2/dlmglue.h 2010-10-21 13:07:50.000000000 +0200
5663 +++ linux-3.5-vs2.3.4/fs/ocfs2/dlmglue.h 2012-07-23 01:45:55.000000000 +0200
5664 @@ -46,7 +46,8 @@ struct ocfs2_meta_lvb {
5667 __be32 lvb_igeneration;
5668 - __be32 lvb_reserved2;
5670 + __be16 lvb_reserved2;
5673 #define OCFS2_QINFO_LVB_VERSION 1
5674 diff -NurpP --minimal linux-3.5/fs/ocfs2/file.c linux-3.5-vs2.3.4/fs/ocfs2/file.c
5675 --- linux-3.5/fs/ocfs2/file.c 2012-07-22 23:39:41.000000000 +0200
5676 +++ linux-3.5-vs2.3.4/fs/ocfs2/file.c 2012-07-23 01:45:55.000000000 +0200
5677 @@ -1123,7 +1123,7 @@ int ocfs2_setattr(struct dentry *dentry,
5678 attr->ia_valid &= ~ATTR_SIZE;
5680 #define OCFS2_VALID_ATTRS (ATTR_ATIME | ATTR_MTIME | ATTR_CTIME | ATTR_SIZE \
5681 - | ATTR_GID | ATTR_UID | ATTR_MODE)
5682 + | ATTR_GID | ATTR_UID | ATTR_TAG | ATTR_MODE)
5683 if (!(attr->ia_valid & OCFS2_VALID_ATTRS))
5686 diff -NurpP --minimal linux-3.5/fs/ocfs2/inode.c linux-3.5-vs2.3.4/fs/ocfs2/inode.c
5687 --- linux-3.5/fs/ocfs2/inode.c 2012-07-22 23:39:41.000000000 +0200
5688 +++ linux-3.5-vs2.3.4/fs/ocfs2/inode.c 2012-07-23 01:45:55.000000000 +0200
5690 #include <linux/highmem.h>
5691 #include <linux/pagemap.h>
5692 #include <linux/quotaops.h>
5693 +#include <linux/vs_tag.h>
5695 #include <asm/byteorder.h>
5697 @@ -78,11 +79,13 @@ void ocfs2_set_inode_flags(struct inode
5699 unsigned int flags = OCFS2_I(inode)->ip_attr;
5701 - inode->i_flags &= ~(S_IMMUTABLE |
5702 + inode->i_flags &= ~(S_IMMUTABLE | S_IXUNLINK |
5703 S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
5705 if (flags & OCFS2_IMMUTABLE_FL)
5706 inode->i_flags |= S_IMMUTABLE;
5707 + if (flags & OCFS2_IXUNLINK_FL)
5708 + inode->i_flags |= S_IXUNLINK;
5710 if (flags & OCFS2_SYNC_FL)
5711 inode->i_flags |= S_SYNC;
5712 @@ -92,25 +95,44 @@ void ocfs2_set_inode_flags(struct inode
5713 inode->i_flags |= S_NOATIME;
5714 if (flags & OCFS2_DIRSYNC_FL)
5715 inode->i_flags |= S_DIRSYNC;
5717 + inode->i_vflags &= ~(V_BARRIER | V_COW);
5719 + if (flags & OCFS2_BARRIER_FL)
5720 + inode->i_vflags |= V_BARRIER;
5721 + if (flags & OCFS2_COW_FL)
5722 + inode->i_vflags |= V_COW;
5725 /* Propagate flags from i_flags to OCFS2_I(inode)->ip_attr */
5726 void ocfs2_get_inode_flags(struct ocfs2_inode_info *oi)
5728 unsigned int flags = oi->vfs_inode.i_flags;
5729 + unsigned int vflags = oi->vfs_inode.i_vflags;
5731 + oi->ip_attr &= ~(OCFS2_SYNC_FL | OCFS2_APPEND_FL |
5732 + OCFS2_IMMUTABLE_FL | OCFS2_IXUNLINK_FL |
5733 + OCFS2_NOATIME_FL | OCFS2_DIRSYNC_FL |
5734 + OCFS2_BARRIER_FL | OCFS2_COW_FL);
5736 + if (flags & S_IMMUTABLE)
5737 + oi->ip_attr |= OCFS2_IMMUTABLE_FL;
5738 + if (flags & S_IXUNLINK)
5739 + oi->ip_attr |= OCFS2_IXUNLINK_FL;
5741 - oi->ip_attr &= ~(OCFS2_SYNC_FL|OCFS2_APPEND_FL|
5742 - OCFS2_IMMUTABLE_FL|OCFS2_NOATIME_FL|OCFS2_DIRSYNC_FL);
5744 oi->ip_attr |= OCFS2_SYNC_FL;
5745 if (flags & S_APPEND)
5746 oi->ip_attr |= OCFS2_APPEND_FL;
5747 - if (flags & S_IMMUTABLE)
5748 - oi->ip_attr |= OCFS2_IMMUTABLE_FL;
5749 if (flags & S_NOATIME)
5750 oi->ip_attr |= OCFS2_NOATIME_FL;
5751 if (flags & S_DIRSYNC)
5752 oi->ip_attr |= OCFS2_DIRSYNC_FL;
5754 + if (vflags & V_BARRIER)
5755 + oi->ip_attr |= OCFS2_BARRIER_FL;
5756 + if (vflags & V_COW)
5757 + oi->ip_attr |= OCFS2_COW_FL;
5760 struct inode *ocfs2_ilookup(struct super_block *sb, u64 blkno)
5761 @@ -241,6 +263,8 @@ void ocfs2_populate_inode(struct inode *
5762 struct super_block *sb;
5763 struct ocfs2_super *osb;
5770 @@ -269,8 +293,12 @@ void ocfs2_populate_inode(struct inode *
5771 inode->i_generation = le32_to_cpu(fe->i_generation);
5772 inode->i_rdev = huge_decode_dev(le64_to_cpu(fe->id1.dev1.i_rdev));
5773 inode->i_mode = le16_to_cpu(fe->i_mode);
5774 - inode->i_uid = le32_to_cpu(fe->i_uid);
5775 - inode->i_gid = le32_to_cpu(fe->i_gid);
5776 + uid = le32_to_cpu(fe->i_uid);
5777 + gid = le32_to_cpu(fe->i_gid);
5778 + inode->i_uid = INOTAG_UID(DX_TAG(inode), uid, gid);
5779 + inode->i_gid = INOTAG_GID(DX_TAG(inode), uid, gid);
5780 + inode->i_tag = INOTAG_TAG(DX_TAG(inode), uid, gid,
5781 + /* le16_to_cpu(raw_inode->i_raw_tag)i */ 0);
5783 /* Fast symlinks will have i_size but no allocated clusters. */
5784 if (S_ISLNK(inode->i_mode) && !fe->i_clusters) {
5785 diff -NurpP --minimal linux-3.5/fs/ocfs2/inode.h linux-3.5-vs2.3.4/fs/ocfs2/inode.h
5786 --- linux-3.5/fs/ocfs2/inode.h 2012-01-09 16:14:55.000000000 +0100
5787 +++ linux-3.5-vs2.3.4/fs/ocfs2/inode.h 2012-07-23 01:45:55.000000000 +0200
5788 @@ -154,6 +154,7 @@ struct buffer_head *ocfs2_bread(struct i
5790 void ocfs2_set_inode_flags(struct inode *inode);
5791 void ocfs2_get_inode_flags(struct ocfs2_inode_info *oi);
5792 +int ocfs2_sync_flags(struct inode *inode, int, int);
5794 static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
5796 diff -NurpP --minimal linux-3.5/fs/ocfs2/ioctl.c linux-3.5-vs2.3.4/fs/ocfs2/ioctl.c
5797 --- linux-3.5/fs/ocfs2/ioctl.c 2012-07-22 23:39:41.000000000 +0200
5798 +++ linux-3.5-vs2.3.4/fs/ocfs2/ioctl.c 2012-07-23 01:45:55.000000000 +0200
5799 @@ -76,7 +76,41 @@ static int ocfs2_get_inode_attr(struct i
5803 -static int ocfs2_set_inode_attr(struct inode *inode, unsigned flags,
5804 +int ocfs2_sync_flags(struct inode *inode, int flags, int vflags)
5806 + struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
5807 + struct buffer_head *bh = NULL;
5808 + handle_t *handle = NULL;
5811 + status = ocfs2_inode_lock(inode, &bh, 1);
5813 + mlog_errno(status);
5816 + handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);
5817 + if (IS_ERR(handle)) {
5818 + status = PTR_ERR(handle);
5819 + mlog_errno(status);
5823 + inode->i_flags = flags;
5824 + inode->i_vflags = vflags;
5825 + ocfs2_get_inode_flags(OCFS2_I(inode));
5827 + status = ocfs2_mark_inode_dirty(handle, inode, bh);
5829 + mlog_errno(status);
5831 + ocfs2_commit_trans(osb, handle);
5833 + ocfs2_inode_unlock(inode, 1);
5838 +int ocfs2_set_inode_attr(struct inode *inode, unsigned flags,
5841 struct ocfs2_inode_info *ocfs2_inode = OCFS2_I(inode);
5842 @@ -101,6 +135,11 @@ static int ocfs2_set_inode_attr(struct i
5843 if (!S_ISDIR(inode->i_mode))
5844 flags &= ~OCFS2_DIRSYNC_FL;
5846 + if (IS_BARRIER(inode)) {
5847 + vxwprintk_task(1, "messing with the barrier.");
5851 handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);
5852 if (IS_ERR(handle)) {
5853 status = PTR_ERR(handle);
5854 @@ -879,6 +918,7 @@ bail:
5859 long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
5861 struct inode *inode = filp->f_path.dentry->d_inode;
5862 diff -NurpP --minimal linux-3.5/fs/ocfs2/namei.c linux-3.5-vs2.3.4/fs/ocfs2/namei.c
5863 --- linux-3.5/fs/ocfs2/namei.c 2012-07-22 23:39:41.000000000 +0200
5864 +++ linux-3.5-vs2.3.4/fs/ocfs2/namei.c 2012-07-23 01:45:55.000000000 +0200
5866 #include <linux/slab.h>
5867 #include <linux/highmem.h>
5868 #include <linux/quotaops.h>
5869 +#include <linux/vs_tag.h>
5871 #include <cluster/masklog.h>
5873 @@ -475,6 +476,7 @@ static int __ocfs2_mknod_locked(struct i
5874 struct ocfs2_dinode *fe = NULL;
5875 struct ocfs2_extent_list *fel;
5881 @@ -512,8 +514,11 @@ static int __ocfs2_mknod_locked(struct i
5882 fe->i_suballoc_loc = cpu_to_le64(suballoc_loc);
5883 fe->i_suballoc_bit = cpu_to_le16(suballoc_bit);
5884 fe->i_suballoc_slot = cpu_to_le16(inode_ac->ac_alloc_slot);
5885 - fe->i_uid = cpu_to_le32(inode->i_uid);
5886 - fe->i_gid = cpu_to_le32(inode->i_gid);
5888 + tag = dx_current_fstag(osb->sb);
5889 + fe->i_uid = cpu_to_le32(TAGINO_UID(DX_TAG(inode), inode->i_uid, tag));
5890 + fe->i_gid = cpu_to_le32(TAGINO_GID(DX_TAG(inode), inode->i_gid, tag));
5891 + inode->i_tag = tag;
5892 fe->i_mode = cpu_to_le16(inode->i_mode);
5893 if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))
5894 fe->id1.dev1.i_rdev = cpu_to_le64(huge_encode_dev(dev));
5895 diff -NurpP --minimal linux-3.5/fs/ocfs2/ocfs2.h linux-3.5-vs2.3.4/fs/ocfs2/ocfs2.h
5896 --- linux-3.5/fs/ocfs2/ocfs2.h 2012-01-09 16:14:55.000000000 +0100
5897 +++ linux-3.5-vs2.3.4/fs/ocfs2/ocfs2.h 2012-07-23 01:45:55.000000000 +0200
5898 @@ -272,6 +272,7 @@ enum ocfs2_mount_options
5900 OCFS2_MOUNT_HB_NONE = 1 << 13, /* No heartbeat */
5901 OCFS2_MOUNT_HB_GLOBAL = 1 << 14, /* Global heartbeat */
5902 + OCFS2_MOUNT_TAGGED = 1 << 15, /* use tagging */
5905 #define OCFS2_OSB_SOFT_RO 0x0001
5906 diff -NurpP --minimal linux-3.5/fs/ocfs2/ocfs2_fs.h linux-3.5-vs2.3.4/fs/ocfs2/ocfs2_fs.h
5907 --- linux-3.5/fs/ocfs2/ocfs2_fs.h 2011-05-22 16:17:53.000000000 +0200
5908 +++ linux-3.5-vs2.3.4/fs/ocfs2/ocfs2_fs.h 2012-07-23 01:45:55.000000000 +0200
5909 @@ -266,6 +266,11 @@
5910 #define OCFS2_TOPDIR_FL FS_TOPDIR_FL /* Top of directory hierarchies*/
5911 #define OCFS2_RESERVED_FL FS_RESERVED_FL /* reserved for ext2 lib */
5913 +#define OCFS2_IXUNLINK_FL FS_IXUNLINK_FL /* Immutable invert on unlink */
5915 +#define OCFS2_BARRIER_FL FS_BARRIER_FL /* Barrier for chroot() */
5916 +#define OCFS2_COW_FL FS_COW_FL /* Copy on Write marker */
5918 #define OCFS2_FL_VISIBLE FS_FL_USER_VISIBLE /* User visible flags */
5919 #define OCFS2_FL_MODIFIABLE FS_FL_USER_MODIFIABLE /* User modifiable flags */
5921 diff -NurpP --minimal linux-3.5/fs/ocfs2/super.c linux-3.5-vs2.3.4/fs/ocfs2/super.c
5922 --- linux-3.5/fs/ocfs2/super.c 2012-05-21 18:07:26.000000000 +0200
5923 +++ linux-3.5-vs2.3.4/fs/ocfs2/super.c 2012-07-23 01:45:55.000000000 +0200
5924 @@ -185,6 +185,7 @@ enum {
5928 + Opt_tag, Opt_notag, Opt_tagid,
5932 @@ -216,6 +217,9 @@ static const match_table_t tokens = {
5933 {Opt_coherency_full, "coherency=full"},
5934 {Opt_resv_level, "resv_level=%u"},
5935 {Opt_dir_resv_level, "dir_resv_level=%u"},
5937 + {Opt_notag, "notag"},
5938 + {Opt_tagid, "tagid=%u"},
5942 @@ -662,6 +666,13 @@ static int ocfs2_remount(struct super_bl
5946 + if ((osb->s_mount_opt & OCFS2_MOUNT_TAGGED) !=
5947 + (parsed_options.mount_opt & OCFS2_MOUNT_TAGGED)) {
5949 + mlog(ML_ERROR, "Cannot change tagging on remount\n");
5953 /* We're going to/from readonly mode. */
5954 if ((*flags & MS_RDONLY) != (sb->s_flags & MS_RDONLY)) {
5955 /* Disable quota accounting before remounting RO */
5956 @@ -1177,6 +1188,9 @@ static int ocfs2_fill_super(struct super
5958 ocfs2_complete_mount_recovery(osb);
5960 + if (osb->s_mount_opt & OCFS2_MOUNT_TAGGED)
5961 + sb->s_flags |= MS_TAGGED;
5963 if (ocfs2_mount_local(osb))
5964 snprintf(nodestr, sizeof(nodestr), "local");
5966 @@ -1503,6 +1517,20 @@ static int ocfs2_parse_options(struct su
5967 option < OCFS2_MAX_RESV_LEVEL)
5968 mopt->dir_resv_level = option;
5970 +#ifndef CONFIG_TAGGING_NONE
5972 + mopt->mount_opt |= OCFS2_MOUNT_TAGGED;
5975 + mopt->mount_opt &= ~OCFS2_MOUNT_TAGGED;
5978 +#ifdef CONFIG_PROPAGATE
5981 + mopt->mount_opt |= OCFS2_MOUNT_TAGGED;
5986 "Unrecognized mount option \"%s\" "
5987 diff -NurpP --minimal linux-3.5/fs/open.c linux-3.5-vs2.3.4/fs/open.c
5988 --- linux-3.5/fs/open.c 2012-07-22 23:39:41.000000000 +0200
5989 +++ linux-3.5-vs2.3.4/fs/open.c 2012-07-23 10:53:28.000000000 +0200
5991 #include <linux/fs_struct.h>
5992 #include <linux/ima.h>
5993 #include <linux/dnotify.h>
5994 +#include <linux/vs_base.h>
5995 +#include <linux/vs_limit.h>
5996 +#include <linux/vs_tag.h>
5997 +#include <linux/vs_cowbl.h>
5998 +#include <linux/vserver/dlimit.h>
6000 #include "internal.h"
6002 @@ -74,6 +79,12 @@ static long do_sys_truncate(const char _
6003 error = user_path(pathname, &path);
6007 +#ifdef CONFIG_VSERVER_COWBL
6008 + error = cow_check_and_break(&path);
6010 + goto dput_and_out;
6012 inode = path.dentry->d_inode;
6014 /* For directories it's -EISDIR, for other non-regulars - -EINVAL */
6015 @@ -490,6 +501,10 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons
6017 error = user_path_at(dfd, filename, LOOKUP_FOLLOW, &path);
6019 +#ifdef CONFIG_VSERVER_COWBL
6020 + error = cow_check_and_break(&path);
6023 error = chmod_common(&path, mode);
6026 @@ -517,13 +532,13 @@ static int chown_common(struct path *pat
6027 if (!uid_valid(uid))
6029 newattrs.ia_valid |= ATTR_UID;
6030 - newattrs.ia_uid = uid;
6031 + newattrs.ia_uid = dx_map_uid(user);
6033 if (group != (gid_t) -1) {
6034 if (!gid_valid(gid))
6036 newattrs.ia_valid |= ATTR_GID;
6037 - newattrs.ia_gid = gid;
6038 + newattrs.ia_gid = dx_map_gid(group);
6040 if (!S_ISDIR(inode->i_mode))
6041 newattrs.ia_valid |=
6042 @@ -548,6 +563,10 @@ SYSCALL_DEFINE3(chown, const char __user
6043 error = mnt_want_write(path.mnt);
6046 +#ifdef CONFIG_VSERVER_COWBL
6047 + error = cow_check_and_break(&path);
6050 error = chown_common(&path, user, group);
6051 mnt_drop_write(path.mnt);
6053 @@ -575,6 +594,10 @@ SYSCALL_DEFINE5(fchownat, int, dfd, cons
6054 error = mnt_want_write(path.mnt);
6057 +#ifdef CONFIG_VSERVER_COWBL
6058 + error = cow_check_and_break(&path);
6061 error = chown_common(&path, user, group);
6062 mnt_drop_write(path.mnt);
6064 @@ -594,6 +617,10 @@ SYSCALL_DEFINE3(lchown, const char __use
6065 error = mnt_want_write(path.mnt);
6068 +#ifdef CONFIG_VSERVER_COWBL
6069 + error = cow_check_and_break(&path);
6072 error = chown_common(&path, user, group);
6073 mnt_drop_write(path.mnt);
6075 @@ -887,6 +914,7 @@ static void __put_unused_fd(struct files
6076 __clear_open_fd(fd, fdt);
6077 if (fd < files->next_fd)
6078 files->next_fd = fd;
6079 + vx_openfd_dec(fd);
6082 void put_unused_fd(unsigned int fd)
6083 diff -NurpP --minimal linux-3.5/fs/proc/array.c linux-3.5-vs2.3.4/fs/proc/array.c
6084 --- linux-3.5/fs/proc/array.c 2012-07-22 23:39:42.000000000 +0200
6085 +++ linux-3.5-vs2.3.4/fs/proc/array.c 2012-07-23 10:51:47.000000000 +0200
6087 #include <linux/ptrace.h>
6088 #include <linux/tracehook.h>
6089 #include <linux/user_namespace.h>
6090 +#include <linux/vs_context.h>
6091 +#include <linux/vs_network.h>
6093 #include <asm/pgtable.h>
6094 #include <asm/processor.h>
6095 @@ -172,6 +174,9 @@ static inline void task_state(struct seq
6097 ppid = pid_alive(p) ?
6098 task_tgid_nr_ns(rcu_dereference(p->real_parent), ns) : 0;
6099 + if (unlikely(vx_current_initpid(p->pid)))
6104 struct task_struct *tracer = ptrace_parent(p);
6105 @@ -296,7 +301,7 @@ static inline void task_sig(struct seq_f
6108 static void render_cap_t(struct seq_file *m, const char *header,
6110 + struct vx_info *vxi, kernel_cap_t *a)
6114 @@ -321,10 +326,11 @@ static inline void task_cap(struct seq_f
6115 cap_bset = cred->cap_bset;
6118 - render_cap_t(m, "CapInh:\t", &cap_inheritable);
6119 - render_cap_t(m, "CapPrm:\t", &cap_permitted);
6120 - render_cap_t(m, "CapEff:\t", &cap_effective);
6121 - render_cap_t(m, "CapBnd:\t", &cap_bset);
6122 + /* FIXME: maybe move the p->vx_info masking to __task_cred() ? */
6123 + render_cap_t(m, "CapInh:\t", p->vx_info, &cap_inheritable);
6124 + render_cap_t(m, "CapPrm:\t", p->vx_info, &cap_permitted);
6125 + render_cap_t(m, "CapEff:\t", p->vx_info, &cap_effective);
6126 + render_cap_t(m, "CapBnd:\t", p->vx_info, &cap_bset);
6129 static inline void task_context_switch_counts(struct seq_file *m,
6130 @@ -346,6 +352,42 @@ static void task_cpus_allowed(struct seq
6134 +int proc_pid_nsproxy(struct seq_file *m, struct pid_namespace *ns,
6135 + struct pid *pid, struct task_struct *task)
6137 + seq_printf(m, "Proxy:\t%p(%c)\n"
6145 + (task->nsproxy == init_task.nsproxy ? 'I' : '-'),
6146 + atomic_read(&task->nsproxy->count),
6147 + task->nsproxy->uts_ns,
6148 + (task->nsproxy->uts_ns == init_task.nsproxy->uts_ns ? 'I' : '-'),
6149 + task->nsproxy->ipc_ns,
6150 + (task->nsproxy->ipc_ns == init_task.nsproxy->ipc_ns ? 'I' : '-'),
6151 + task->nsproxy->mnt_ns,
6152 + (task->nsproxy->mnt_ns == init_task.nsproxy->mnt_ns ? 'I' : '-'),
6153 + task->nsproxy->pid_ns,
6154 + (task->nsproxy->pid_ns == init_task.nsproxy->pid_ns ? 'I' : '-'),
6155 + task->nsproxy->net_ns,
6156 + (task->nsproxy->net_ns == init_task.nsproxy->net_ns ? 'I' : '-'));
6160 +void task_vs_id(struct seq_file *m, struct task_struct *task)
6162 + if (task_vx_flags(task, VXF_HIDE_VINFO, 0))
6165 + seq_printf(m, "VxID: %d\n", vx_task_xid(task));
6166 + seq_printf(m, "NxID: %d\n", nx_task_nid(task));
6170 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
6171 struct pid *pid, struct task_struct *task)
6173 @@ -362,6 +404,7 @@ int proc_pid_status(struct seq_file *m,
6175 task_cpus_allowed(m, task);
6176 cpuset_task_status_allowed(m, task);
6177 + task_vs_id(m, task);
6178 task_context_switch_counts(m, task);
6181 @@ -471,6 +514,17 @@ static int do_task_stat(struct seq_file
6182 /* convert nsec -> ticks */
6183 start_time = nsec_to_clock_t(start_time);
6185 + /* fixup start time for virt uptime */
6186 + if (vx_flags(VXF_VIRT_UPTIME, 0)) {
6187 + unsigned long long bias =
6188 + current->vx_info->cvirt.bias_clock;
6190 + if (start_time > bias)
6191 + start_time -= bias;
6196 seq_printf(m, "%d (%s) %c", pid_nr_ns(pid, ns), tcomm, state);
6197 seq_put_decimal_ll(m, ' ', ppid);
6198 seq_put_decimal_ll(m, ' ', pgid);
6199 diff -NurpP --minimal linux-3.5/fs/proc/base.c linux-3.5-vs2.3.4/fs/proc/base.c
6200 --- linux-3.5/fs/proc/base.c 2012-07-22 23:39:42.000000000 +0200
6201 +++ linux-3.5-vs2.3.4/fs/proc/base.c 2012-07-23 01:45:55.000000000 +0200
6203 #include <linux/fs_struct.h>
6204 #include <linux/slab.h>
6205 #include <linux/flex_array.h>
6206 +#include <linux/vs_context.h>
6207 +#include <linux/vs_network.h>
6208 #ifdef CONFIG_HARDWALL
6209 #include <asm/hardwall.h>
6211 @@ -937,11 +939,16 @@ static ssize_t oom_adjust_write(struct f
6215 - if (oom_adjust < task->signal->oom_adj && !capable(CAP_SYS_RESOURCE)) {
6216 + if (oom_adjust < task->signal->oom_adj &&
6217 + !vx_capable(CAP_SYS_RESOURCE, VXC_OOM_ADJUST)) {
6222 + /* prevent guest processes from circumventing the oom killer */
6223 + if (vx_current_xid() && (oom_adjust == OOM_DISABLE))
6224 + oom_adjust = OOM_ADJUST_MIN;
6227 * Warn that /proc/pid/oom_adj is deprecated, see
6228 * Documentation/feature-removal-schedule.txt.
6229 @@ -1541,6 +1548,8 @@ struct inode *proc_pid_make_inode(struct
6230 inode->i_gid = cred->egid;
6233 + /* procfs is xid tagged */
6234 + inode->i_tag = (tag_t)vx_task_xid(task);
6235 security_task_to_inode(task, inode);
6238 @@ -1586,6 +1595,8 @@ int pid_getattr(struct vfsmount *mnt, st
6242 +static unsigned name_to_int(struct dentry *dentry);
6245 * Exceptional case: normally we are not allowed to unhash a busy
6246 * directory. In this case, however, we can do it - no aliasing problems
6247 @@ -1614,6 +1625,12 @@ int pid_revalidate(struct dentry *dentry
6248 task = get_proc_task(inode);
6251 + unsigned pid = name_to_int(dentry);
6253 + if (pid != ~0U && pid != vx_map_pid(task->pid)) {
6254 + put_task_struct(task);
6257 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
6258 task_dumpable(task)) {
6260 @@ -1630,6 +1647,7 @@ int pid_revalidate(struct dentry *dentry
6261 put_task_struct(task);
6268 @@ -2450,6 +2468,13 @@ static struct dentry *proc_pident_lookup
6272 + /* TODO: maybe we can come up with a generic approach? */
6273 + if (task_vx_flags(task, VXF_HIDE_VINFO, 0) &&
6274 + (dentry->d_name.len == 5) &&
6275 + (!memcmp(dentry->d_name.name, "vinfo", 5) ||
6276 + !memcmp(dentry->d_name.name, "ninfo", 5)))
6280 * Yes, it does not scale. And it should not. Don't add
6281 * new entries into /proc/<tgid>/ without very good reasons.
6282 @@ -2835,7 +2860,7 @@ out_iput:
6283 static struct dentry *proc_base_lookup(struct inode *dir, struct dentry *dentry)
6285 struct dentry *error;
6286 - struct task_struct *task = get_proc_task(dir);
6287 + struct task_struct *task = get_proc_task_real(dir);
6288 const struct pid_entry *p, *last;
6290 error = ERR_PTR(-ENOENT);
6291 @@ -3010,6 +3035,9 @@ static int proc_pid_personality(struct s
6292 static const struct file_operations proc_task_operations;
6293 static const struct inode_operations proc_task_inode_operations;
6295 +extern int proc_pid_vx_info(struct task_struct *, char *);
6296 +extern int proc_pid_nx_info(struct task_struct *, char *);
6298 static const struct pid_entry tgid_base_stuff[] = {
6299 DIR("task", S_IRUGO|S_IXUGO, proc_task_inode_operations, proc_task_operations),
6300 DIR("fd", S_IRUSR|S_IXUSR, proc_fd_inode_operations, proc_fd_operations),
6301 @@ -3076,6 +3104,8 @@ static const struct pid_entry tgid_base_
6302 #ifdef CONFIG_CGROUPS
6303 REG("cgroup", S_IRUGO, proc_cgroup_operations),
6305 + INF("vinfo", S_IRUGO, proc_pid_vx_info),
6306 + INF("ninfo", S_IRUGO, proc_pid_nx_info),
6307 INF("oom_score", S_IRUGO, proc_oom_score),
6308 REG("oom_adj", S_IRUGO|S_IWUSR, proc_oom_adjust_operations),
6309 REG("oom_score_adj", S_IRUGO|S_IWUSR, proc_oom_score_adj_operations),
6310 @@ -3099,6 +3129,7 @@ static const struct pid_entry tgid_base_
6311 REG("uid_map", S_IRUGO|S_IWUSR, proc_uid_map_operations),
6312 REG("gid_map", S_IRUGO|S_IWUSR, proc_gid_map_operations),
6314 + ONE("nsproxy", S_IRUGO, proc_pid_nsproxy),
6317 static int proc_tgid_base_readdir(struct file * filp,
6318 @@ -3292,7 +3323,7 @@ retry:
6320 pid = find_ge_pid(iter.tgid, ns);
6322 - iter.tgid = pid_nr_ns(pid, ns);
6323 + iter.tgid = pid_unmapped_nr_ns(pid, ns);
6324 iter.task = pid_task(pid, PIDTYPE_PID);
6325 /* What we to know is if the pid we have find is the
6326 * pid of a thread_group_leader. Testing for task
6327 @@ -3322,7 +3353,7 @@ static int proc_pid_fill_cache(struct fi
6328 struct tgid_iter iter)
6330 char name[PROC_NUMBUF];
6331 - int len = snprintf(name, sizeof(name), "%d", iter.tgid);
6332 + int len = snprintf(name, sizeof(name), "%d", vx_map_tgid(iter.tgid));
6333 return proc_fill_cache(filp, dirent, filldir, name, len,
6334 proc_pid_instantiate, iter.task, NULL);
6336 @@ -3346,7 +3377,7 @@ int proc_pid_readdir(struct file * filp,
6338 nr = filp->f_pos - FIRST_PROCESS_ENTRY;
6340 - reaper = get_proc_task(filp->f_path.dentry->d_inode);
6341 + reaper = get_proc_task_real(filp->f_path.dentry->d_inode);
6345 @@ -3368,6 +3399,8 @@ int proc_pid_readdir(struct file * filp,
6346 __filldir = fake_filldir;
6348 filp->f_pos = iter.tgid + TGID_OFFSET;
6349 + if (!vx_proc_task_visible(iter.task))
6351 if (proc_pid_fill_cache(filp, dirent, __filldir, iter) < 0) {
6352 put_task_struct(iter.task);
6354 @@ -3528,6 +3561,8 @@ static struct dentry *proc_task_lookup(s
6355 tid = name_to_int(dentry);
6358 + if (vx_current_initpid(tid))
6361 ns = dentry->d_sb->s_fs_info;
6363 diff -NurpP --minimal linux-3.5/fs/proc/generic.c linux-3.5-vs2.3.4/fs/proc/generic.c
6364 --- linux-3.5/fs/proc/generic.c 2012-03-19 19:47:26.000000000 +0100
6365 +++ linux-3.5-vs2.3.4/fs/proc/generic.c 2012-07-23 01:45:55.000000000 +0200
6367 #include <linux/bitops.h>
6368 #include <linux/spinlock.h>
6369 #include <linux/completion.h>
6370 +#include <linux/vserver/inode.h>
6371 #include <asm/uaccess.h>
6373 #include "internal.h"
6374 @@ -424,11 +425,15 @@ struct dentry *proc_lookup_de(struct pro
6375 for (de = de->subdir; de ; de = de->next) {
6376 if (de->namelen != dentry->d_name.len)
6378 + if (!vx_hide_check(0, de->vx_flags))
6380 if (!memcmp(dentry->d_name.name, de->name, de->namelen)) {
6382 spin_unlock(&proc_subdir_lock);
6384 inode = proc_get_inode(dir->i_sb, de);
6385 + /* generic proc entries belong to the host */
6390 @@ -506,6 +511,8 @@ int proc_readdir_de(struct proc_dir_entr
6392 /* filldir passes info to user space */
6394 + if (!vx_hide_check(0, de->vx_flags))
6396 spin_unlock(&proc_subdir_lock);
6397 if (filldir(dirent, de->name, de->namelen, filp->f_pos,
6398 de->low_ino, de->mode >> 12) < 0) {
6399 @@ -513,6 +520,7 @@ int proc_readdir_de(struct proc_dir_entr
6402 spin_lock(&proc_subdir_lock);
6407 @@ -626,6 +634,7 @@ static struct proc_dir_entry *__proc_cre
6409 atomic_set(&ent->count, 1);
6411 + ent->vx_flags = IATTR_PROC_DEFAULT;
6412 spin_lock_init(&ent->pde_unload_lock);
6413 ent->pde_unload_completion = NULL;
6414 INIT_LIST_HEAD(&ent->pde_openers);
6415 @@ -649,7 +658,8 @@ struct proc_dir_entry *proc_symlink(cons
6421 + ent->vx_flags = IATTR_PROC_SYMLINK;
6425 diff -NurpP --minimal linux-3.5/fs/proc/inode.c linux-3.5-vs2.3.4/fs/proc/inode.c
6426 --- linux-3.5/fs/proc/inode.c 2012-07-22 23:39:42.000000000 +0200
6427 +++ linux-3.5-vs2.3.4/fs/proc/inode.c 2012-07-23 01:45:55.000000000 +0200
6428 @@ -458,6 +458,8 @@ struct inode *proc_get_inode(struct supe
6429 inode->i_uid = de->uid;
6430 inode->i_gid = de->gid;
6433 + PROC_I(inode)->vx_flags = de->vx_flags;
6435 inode->i_size = de->size;
6437 diff -NurpP --minimal linux-3.5/fs/proc/internal.h linux-3.5-vs2.3.4/fs/proc/internal.h
6438 --- linux-3.5/fs/proc/internal.h 2012-07-22 23:39:42.000000000 +0200
6439 +++ linux-3.5-vs2.3.4/fs/proc/internal.h 2012-07-23 01:45:55.000000000 +0200
6443 #include <linux/proc_fs.h>
6444 +#include <linux/vs_pid.h>
6446 struct ctl_table_header;
6448 extern struct proc_dir_entry proc_root;
6449 @@ -52,6 +54,9 @@ extern int proc_pid_status(struct seq_fi
6450 struct pid *pid, struct task_struct *task);
6451 extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
6452 struct pid *pid, struct task_struct *task);
6453 +extern int proc_pid_nsproxy(struct seq_file *m, struct pid_namespace *ns,
6454 + struct pid *pid, struct task_struct *task);
6456 extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
6458 extern const struct file_operations proc_tid_children_operations;
6459 @@ -81,11 +86,16 @@ static inline struct pid *proc_pid(struc
6460 return PROC_I(inode)->pid;
6463 -static inline struct task_struct *get_proc_task(struct inode *inode)
6464 +static inline struct task_struct *get_proc_task_real(struct inode *inode)
6466 return get_pid_task(proc_pid(inode), PIDTYPE_PID);
6469 +static inline struct task_struct *get_proc_task(struct inode *inode)
6471 + return vx_get_proc_task(inode, proc_pid(inode));
6474 static inline int proc_fd(struct inode *inode)
6476 return PROC_I(inode)->fd;
6477 diff -NurpP --minimal linux-3.5/fs/proc/loadavg.c linux-3.5-vs2.3.4/fs/proc/loadavg.c
6478 --- linux-3.5/fs/proc/loadavg.c 2009-09-10 15:26:23.000000000 +0200
6479 +++ linux-3.5-vs2.3.4/fs/proc/loadavg.c 2012-07-23 01:45:55.000000000 +0200
6482 static int loadavg_proc_show(struct seq_file *m, void *v)
6484 + unsigned long running;
6485 + unsigned int threads;
6486 unsigned long avnrun[3];
6488 get_avenrun(avnrun, FIXED_1/200, 0);
6490 + if (vx_flags(VXF_VIRT_LOAD, 0)) {
6491 + struct vx_info *vxi = current_vx_info();
6493 + running = atomic_read(&vxi->cvirt.nr_running);
6494 + threads = atomic_read(&vxi->cvirt.nr_threads);
6496 + running = nr_running();
6497 + threads = nr_threads;
6500 seq_printf(m, "%lu.%02lu %lu.%02lu %lu.%02lu %ld/%d %d\n",
6501 LOAD_INT(avnrun[0]), LOAD_FRAC(avnrun[0]),
6502 LOAD_INT(avnrun[1]), LOAD_FRAC(avnrun[1]),
6503 LOAD_INT(avnrun[2]), LOAD_FRAC(avnrun[2]),
6504 - nr_running(), nr_threads,
6506 task_active_pid_ns(current)->last_pid);
6509 diff -NurpP --minimal linux-3.5/fs/proc/meminfo.c linux-3.5-vs2.3.4/fs/proc/meminfo.c
6510 --- linux-3.5/fs/proc/meminfo.c 2012-01-09 16:14:55.000000000 +0100
6511 +++ linux-3.5-vs2.3.4/fs/proc/meminfo.c 2012-07-23 01:45:55.000000000 +0200
6512 @@ -39,7 +39,8 @@ static int meminfo_proc_show(struct seq_
6513 allowed = ((totalram_pages - hugetlb_total_pages())
6514 * sysctl_overcommit_ratio / 100) + total_swap_pages;
6516 - cached = global_page_state(NR_FILE_PAGES) -
6517 + cached = vx_flags(VXF_VIRT_MEM, 0) ?
6518 + vx_vsi_cached(&i) : global_page_state(NR_FILE_PAGES) -
6519 total_swapcache_pages - i.bufferram;
6522 diff -NurpP --minimal linux-3.5/fs/proc/root.c linux-3.5-vs2.3.4/fs/proc/root.c
6523 --- linux-3.5/fs/proc/root.c 2012-07-22 23:39:42.000000000 +0200
6524 +++ linux-3.5-vs2.3.4/fs/proc/root.c 2012-07-23 01:45:55.000000000 +0200
6526 #include <linux/mount.h>
6527 #include <linux/pid_namespace.h>
6528 #include <linux/parser.h>
6529 +#include <linux/vserver/inode.h>
6531 #include "internal.h"
6533 +struct proc_dir_entry *proc_virtual;
6535 +extern void proc_vx_init(void);
6537 static int proc_test_super(struct super_block *sb, void *data)
6539 return sb->s_fs_info == data;
6540 @@ -190,6 +195,7 @@ void __init proc_root_init(void)
6542 proc_mkdir("bus", NULL);
6547 static int proc_root_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat
6548 @@ -257,6 +263,7 @@ struct proc_dir_entry proc_root = {
6549 .proc_iops = &proc_root_inode_operations,
6550 .proc_fops = &proc_root_operations,
6551 .parent = &proc_root,
6552 + .vx_flags = IATTR_ADMIN | IATTR_WATCH,
6556 diff -NurpP --minimal linux-3.5/fs/proc/stat.c linux-3.5-vs2.3.4/fs/proc/stat.c
6557 --- linux-3.5/fs/proc/stat.c 2012-05-21 18:07:26.000000000 +0200
6558 +++ linux-3.5-vs2.3.4/fs/proc/stat.c 2012-07-23 01:45:55.000000000 +0200
6560 #include <linux/slab.h>
6561 #include <linux/time.h>
6562 #include <linux/irqnr.h>
6563 +#include <linux/vserver/cvirt.h>
6564 #include <asm/cputime.h>
6565 #include <linux/tick.h>
6567 @@ -86,6 +87,10 @@ static int show_stat(struct seq_file *p,
6568 irq = softirq = steal = 0;
6569 guest = guest_nice = 0;
6570 getboottime(&boottime);
6572 + if (vx_flags(VXF_VIRT_UPTIME, 0))
6573 + vx_vsi_boottime(&boottime);
6575 jif = boottime.tv_sec;
6577 for_each_possible_cpu(i) {
6578 diff -NurpP --minimal linux-3.5/fs/proc/uptime.c linux-3.5-vs2.3.4/fs/proc/uptime.c
6579 --- linux-3.5/fs/proc/uptime.c 2012-03-19 19:47:26.000000000 +0100
6580 +++ linux-3.5-vs2.3.4/fs/proc/uptime.c 2012-07-23 01:45:55.000000000 +0200
6582 #include <linux/seq_file.h>
6583 #include <linux/time.h>
6584 #include <linux/kernel_stat.h>
6585 +#include <linux/vserver/cvirt.h>
6586 #include <asm/cputime.h>
6588 static int uptime_proc_show(struct seq_file *m, void *v)
6589 @@ -25,6 +26,10 @@ static int uptime_proc_show(struct seq_f
6590 nsec = cputime64_to_jiffies64(idletime) * TICK_NSEC;
6591 idle.tv_sec = div_u64_rem(nsec, NSEC_PER_SEC, &rem);
6594 + if (vx_flags(VXF_VIRT_UPTIME, 0))
6595 + vx_vsi_uptime(&uptime, &idle);
6597 seq_printf(m, "%lu.%02lu %lu.%02lu\n",
6598 (unsigned long) uptime.tv_sec,
6599 (uptime.tv_nsec / (NSEC_PER_SEC / 100)),
6600 diff -NurpP --minimal linux-3.5/fs/proc_namespace.c linux-3.5-vs2.3.4/fs/proc_namespace.c
6601 --- linux-3.5/fs/proc_namespace.c 2012-07-22 23:39:42.000000000 +0200
6602 +++ linux-3.5-vs2.3.4/fs/proc_namespace.c 2012-07-23 11:01:00.000000000 +0200
6603 @@ -44,6 +44,8 @@ static int show_sb_opts(struct seq_file
6604 { MS_SYNCHRONOUS, ",sync" },
6605 { MS_DIRSYNC, ",dirsync" },
6606 { MS_MANDLOCK, ",mand" },
6607 + { MS_TAGGED, ",tag" },
6608 + { MS_NOTAGCHECK, ",notagcheck" },
6611 const struct proc_fs_info *fs_infop;
6612 @@ -80,6 +82,34 @@ static inline void mangle(struct seq_fil
6613 seq_escape(m, s, " \t\n\\");
6616 +static int mnt_is_reachable(struct vfsmount *vfsmnt)
6619 + struct dentry *point;
6620 + struct mount *mnt = real_mount(vfsmnt);
6621 + struct mount *root_mnt;
6624 + if (mnt == mnt->mnt_ns->root)
6627 + br_read_lock(&vfsmount_lock);
6628 + root = current->fs->root;
6629 + root_mnt = real_mount(root.mnt);
6630 + point = root.dentry;
6632 + while ((mnt != mnt->mnt_parent) && (mnt != root_mnt)) {
6633 + point = mnt->mnt_mountpoint;
6634 + mnt = mnt->mnt_parent;
6637 + ret = (mnt == root_mnt) && is_subdir(point, root.dentry);
6639 + br_read_unlock(&vfsmount_lock);
6644 static void show_type(struct seq_file *m, struct super_block *sb)
6646 mangle(m, sb->s_type->name);
6647 @@ -96,6 +126,17 @@ static int show_vfsmnt(struct seq_file *
6648 struct path mnt_path = { .dentry = mnt->mnt_root, .mnt = mnt };
6649 struct super_block *sb = mnt_path.dentry->d_sb;
6651 + if (vx_flags(VXF_HIDE_MOUNT, 0))
6653 + if (!mnt_is_reachable(mnt) && !vx_check(0, VS_WATCH_P))
6656 + if (!vx_check(0, VS_ADMIN|VS_WATCH) &&
6657 + mnt == current->fs->root.mnt) {
6658 + seq_puts(m, "/dev/root / ");
6662 if (sb->s_op->show_devname) {
6663 err = sb->s_op->show_devname(m, mnt_path.dentry);
6665 @@ -106,6 +147,7 @@ static int show_vfsmnt(struct seq_file *
6667 seq_path(m, &mnt_path, " \t\n\\");
6671 seq_puts(m, __mnt_is_readonly(mnt) ? " ro" : " rw");
6672 err = show_sb_opts(m, sb);
6673 @@ -128,6 +170,11 @@ static int show_mountinfo(struct seq_fil
6674 struct path root = p->root;
6677 + if (vx_flags(VXF_HIDE_MOUNT, 0))
6679 + if (!mnt_is_reachable(mnt) && !vx_check(0, VS_WATCH_P))
6682 seq_printf(m, "%i %i %u:%u ", r->mnt_id, r->mnt_parent->mnt_id,
6683 MAJOR(sb->s_dev), MINOR(sb->s_dev));
6684 if (sb->s_op->show_path)
6685 @@ -187,6 +234,17 @@ static int show_vfsstat(struct seq_file
6686 struct super_block *sb = mnt_path.dentry->d_sb;
6689 + if (vx_flags(VXF_HIDE_MOUNT, 0))
6691 + if (!mnt_is_reachable(mnt) && !vx_check(0, VS_WATCH_P))
6694 + if (!vx_check(0, VS_ADMIN|VS_WATCH) &&
6695 + mnt == current->fs->root.mnt) {
6696 + seq_puts(m, "device /dev/root mounted on / ");
6701 if (sb->s_op->show_devname) {
6702 seq_puts(m, "device ");
6703 @@ -203,7 +261,7 @@ static int show_vfsstat(struct seq_file
6704 seq_puts(m, " mounted on ");
6705 seq_path(m, &mnt_path, " \t\n\\");
6709 /* file system type */
6710 seq_puts(m, "with fstype ");
6712 diff -NurpP --minimal linux-3.5/fs/quota/dquot.c linux-3.5-vs2.3.4/fs/quota/dquot.c
6713 --- linux-3.5/fs/quota/dquot.c 2012-07-22 23:39:42.000000000 +0200
6714 +++ linux-3.5-vs2.3.4/fs/quota/dquot.c 2012-07-23 01:45:55.000000000 +0200
6715 @@ -1562,6 +1562,9 @@ int __dquot_alloc_space(struct inode *in
6716 struct dquot **dquots = inode->i_dquot;
6717 int reserve = flags & DQUOT_SPACE_RESERVE;
6719 + if ((ret = dl_alloc_space(inode, number)))
6723 * First test before acquiring mutex - solves deadlocks when we
6724 * re-enter the quota code and are already holding the mutex
6725 @@ -1617,6 +1620,9 @@ int dquot_alloc_inode(const struct inode
6726 struct dquot_warn warn[MAXQUOTAS];
6727 struct dquot * const *dquots = inode->i_dquot;
6729 + if ((ret = dl_alloc_inode(inode)))
6732 /* First test before acquiring mutex - solves deadlocks when we
6733 * re-enter the quota code and are already holding the mutex */
6734 if (!dquot_active(inode))
6735 @@ -1688,6 +1694,8 @@ void __dquot_free_space(struct inode *in
6736 struct dquot **dquots = inode->i_dquot;
6737 int reserve = flags & DQUOT_SPACE_RESERVE;
6739 + dl_free_space(inode, number);
6741 /* First test before acquiring mutex - solves deadlocks when we
6742 * re-enter the quota code and are already holding the mutex */
6743 if (!dquot_active(inode)) {
6744 @@ -1732,6 +1740,8 @@ void dquot_free_inode(const struct inode
6745 struct dquot_warn warn[MAXQUOTAS];
6746 struct dquot * const *dquots = inode->i_dquot;
6748 + dl_free_inode(inode);
6750 /* First test before acquiring mutex - solves deadlocks when we
6751 * re-enter the quota code and are already holding the mutex */
6752 if (!dquot_active(inode))
6753 diff -NurpP --minimal linux-3.5/fs/quota/quota.c linux-3.5-vs2.3.4/fs/quota/quota.c
6754 --- linux-3.5/fs/quota/quota.c 2012-05-21 18:07:26.000000000 +0200
6755 +++ linux-3.5-vs2.3.4/fs/quota/quota.c 2012-07-23 01:45:55.000000000 +0200
6757 #include <linux/fs.h>
6758 #include <linux/namei.h>
6759 #include <linux/slab.h>
6760 +#include <linux/vs_context.h>
6761 #include <asm/current.h>
6762 #include <asm/uaccess.h>
6763 #include <linux/kernel.h>
6764 @@ -37,7 +38,7 @@ static int check_quotactl_permission(str
6768 - if (!capable(CAP_SYS_ADMIN))
6769 + if (!vx_capable(CAP_SYS_ADMIN, VXC_QUOTA_CTL))
6773 @@ -291,6 +292,46 @@ static int do_quotactl(struct super_bloc
6777 +#if defined(CONFIG_BLK_DEV_VROOT) || defined(CONFIG_BLK_DEV_VROOT_MODULE)
6779 +#include <linux/vroot.h>
6780 +#include <linux/major.h>
6781 +#include <linux/module.h>
6782 +#include <linux/kallsyms.h>
6783 +#include <linux/vserver/debug.h>
6785 +static vroot_grb_func *vroot_get_real_bdev = NULL;
6787 +static DEFINE_SPINLOCK(vroot_grb_lock);
6789 +int register_vroot_grb(vroot_grb_func *func) {
6792 + spin_lock(&vroot_grb_lock);
6793 + if (!vroot_get_real_bdev) {
6794 + vroot_get_real_bdev = func;
6797 + spin_unlock(&vroot_grb_lock);
6800 +EXPORT_SYMBOL(register_vroot_grb);
6802 +int unregister_vroot_grb(vroot_grb_func *func) {
6803 + int ret = -EINVAL;
6805 + spin_lock(&vroot_grb_lock);
6806 + if (vroot_get_real_bdev) {
6807 + vroot_get_real_bdev = NULL;
6810 + spin_unlock(&vroot_grb_lock);
6813 +EXPORT_SYMBOL(unregister_vroot_grb);
6817 /* Return 1 if 'cmd' will block on frozen filesystem */
6818 static int quotactl_cmd_write(int cmd)
6820 @@ -323,6 +364,22 @@ static struct super_block *quotactl_bloc
6823 return ERR_CAST(bdev);
6824 +#if defined(CONFIG_BLK_DEV_VROOT) || defined(CONFIG_BLK_DEV_VROOT_MODULE)
6825 + if (bdev && bdev->bd_inode &&
6826 + imajor(bdev->bd_inode) == VROOT_MAJOR) {
6827 + struct block_device *bdnew = (void *)-EINVAL;
6829 + if (vroot_get_real_bdev)
6830 + bdnew = vroot_get_real_bdev(bdev);
6832 + vxdprintk(VXD_CBIT(misc, 0),
6833 + "vroot_get_real_bdev not set");
6835 + if (IS_ERR(bdnew))
6836 + return ERR_PTR(PTR_ERR(bdnew));
6840 if (quotactl_cmd_write(cmd))
6841 sb = get_super_thawed(bdev);
6843 diff -NurpP --minimal linux-3.5/fs/reiserfs/file.c linux-3.5-vs2.3.4/fs/reiserfs/file.c
6844 --- linux-3.5/fs/reiserfs/file.c 2012-05-21 18:07:26.000000000 +0200
6845 +++ linux-3.5-vs2.3.4/fs/reiserfs/file.c 2012-07-23 01:45:55.000000000 +0200
6846 @@ -319,5 +319,6 @@ const struct inode_operations reiserfs_f
6847 .listxattr = reiserfs_listxattr,
6848 .removexattr = reiserfs_removexattr,
6849 .permission = reiserfs_permission,
6850 + .sync_flags = reiserfs_sync_flags,
6851 .get_acl = reiserfs_get_acl,
6853 diff -NurpP --minimal linux-3.5/fs/reiserfs/inode.c linux-3.5-vs2.3.4/fs/reiserfs/inode.c
6854 --- linux-3.5/fs/reiserfs/inode.c 2012-07-22 23:39:42.000000000 +0200
6855 +++ linux-3.5-vs2.3.4/fs/reiserfs/inode.c 2012-07-23 01:45:55.000000000 +0200
6857 #include <linux/writeback.h>
6858 #include <linux/quotaops.h>
6859 #include <linux/swap.h>
6860 +#include <linux/vs_tag.h>
6862 int reiserfs_commit_write(struct file *f, struct page *page,
6863 unsigned from, unsigned to);
6864 @@ -1131,6 +1132,8 @@ static void init_inode(struct inode *ino
6865 struct buffer_head *bh;
6866 struct item_head *ih;
6870 //int version = ITEM_VERSION_1;
6872 bh = PATH_PLAST_BUFFER(path);
6873 @@ -1151,12 +1154,13 @@ static void init_inode(struct inode *ino
6874 (struct stat_data_v1 *)B_I_PITEM(bh, ih);
6875 unsigned long blocks;
6877 + uid = sd_v1_uid(sd);
6878 + gid = sd_v1_gid(sd);
6880 set_inode_item_key_version(inode, KEY_FORMAT_3_5);
6881 set_inode_sd_version(inode, STAT_DATA_V1);
6882 inode->i_mode = sd_v1_mode(sd);
6883 set_nlink(inode, sd_v1_nlink(sd));
6884 - inode->i_uid = sd_v1_uid(sd);
6885 - inode->i_gid = sd_v1_gid(sd);
6886 inode->i_size = sd_v1_size(sd);
6887 inode->i_atime.tv_sec = sd_v1_atime(sd);
6888 inode->i_mtime.tv_sec = sd_v1_mtime(sd);
6889 @@ -1198,11 +1202,12 @@ static void init_inode(struct inode *ino
6890 // (directories and symlinks)
6891 struct stat_data *sd = (struct stat_data *)B_I_PITEM(bh, ih);
6893 + uid = sd_v2_uid(sd);
6894 + gid = sd_v2_gid(sd);
6896 inode->i_mode = sd_v2_mode(sd);
6897 set_nlink(inode, sd_v2_nlink(sd));
6898 - inode->i_uid = sd_v2_uid(sd);
6899 inode->i_size = sd_v2_size(sd);
6900 - inode->i_gid = sd_v2_gid(sd);
6901 inode->i_mtime.tv_sec = sd_v2_mtime(sd);
6902 inode->i_atime.tv_sec = sd_v2_atime(sd);
6903 inode->i_ctime.tv_sec = sd_v2_ctime(sd);
6904 @@ -1232,6 +1237,10 @@ static void init_inode(struct inode *ino
6905 sd_attrs_to_i_attrs(sd_v2_attrs(sd), inode);
6908 + inode->i_uid = INOTAG_UID(DX_TAG(inode), uid, gid);
6909 + inode->i_gid = INOTAG_GID(DX_TAG(inode), uid, gid);
6910 + inode->i_tag = INOTAG_TAG(DX_TAG(inode), uid, gid, 0);
6913 if (S_ISREG(inode->i_mode)) {
6914 inode->i_op = &reiserfs_file_inode_operations;
6915 @@ -1254,13 +1263,15 @@ static void init_inode(struct inode *ino
6916 static void inode2sd(void *sd, struct inode *inode, loff_t size)
6918 struct stat_data *sd_v2 = (struct stat_data *)sd;
6919 + uid_t uid = TAGINO_UID(DX_TAG(inode), inode->i_uid, inode->i_tag);
6920 + gid_t gid = TAGINO_GID(DX_TAG(inode), inode->i_gid, inode->i_tag);
6923 + set_sd_v2_uid(sd_v2, uid);
6924 + set_sd_v2_gid(sd_v2, gid);
6925 set_sd_v2_mode(sd_v2, inode->i_mode);
6926 set_sd_v2_nlink(sd_v2, inode->i_nlink);
6927 - set_sd_v2_uid(sd_v2, inode->i_uid);
6928 set_sd_v2_size(sd_v2, size);
6929 - set_sd_v2_gid(sd_v2, inode->i_gid);
6930 set_sd_v2_mtime(sd_v2, inode->i_mtime.tv_sec);
6931 set_sd_v2_atime(sd_v2, inode->i_atime.tv_sec);
6932 set_sd_v2_ctime(sd_v2, inode->i_ctime.tv_sec);
6933 @@ -2862,14 +2873,19 @@ int reiserfs_commit_write(struct file *f
6934 void sd_attrs_to_i_attrs(__u16 sd_attrs, struct inode *inode)
6936 if (reiserfs_attrs(inode->i_sb)) {
6937 - if (sd_attrs & REISERFS_SYNC_FL)
6938 - inode->i_flags |= S_SYNC;
6940 - inode->i_flags &= ~S_SYNC;
6941 if (sd_attrs & REISERFS_IMMUTABLE_FL)
6942 inode->i_flags |= S_IMMUTABLE;
6944 inode->i_flags &= ~S_IMMUTABLE;
6945 + if (sd_attrs & REISERFS_IXUNLINK_FL)
6946 + inode->i_flags |= S_IXUNLINK;
6948 + inode->i_flags &= ~S_IXUNLINK;
6950 + if (sd_attrs & REISERFS_SYNC_FL)
6951 + inode->i_flags |= S_SYNC;
6953 + inode->i_flags &= ~S_SYNC;
6954 if (sd_attrs & REISERFS_APPEND_FL)
6955 inode->i_flags |= S_APPEND;
6957 @@ -2882,6 +2898,15 @@ void sd_attrs_to_i_attrs(__u16 sd_attrs,
6958 REISERFS_I(inode)->i_flags |= i_nopack_mask;
6960 REISERFS_I(inode)->i_flags &= ~i_nopack_mask;
6962 + if (sd_attrs & REISERFS_BARRIER_FL)
6963 + inode->i_vflags |= V_BARRIER;
6965 + inode->i_vflags &= ~V_BARRIER;
6966 + if (sd_attrs & REISERFS_COW_FL)
6967 + inode->i_vflags |= V_COW;
6969 + inode->i_vflags &= ~V_COW;
6973 @@ -2892,6 +2917,11 @@ void i_attrs_to_sd_attrs(struct inode *i
6974 *sd_attrs |= REISERFS_IMMUTABLE_FL;
6976 *sd_attrs &= ~REISERFS_IMMUTABLE_FL;
6977 + if (inode->i_flags & S_IXUNLINK)
6978 + *sd_attrs |= REISERFS_IXUNLINK_FL;
6980 + *sd_attrs &= ~REISERFS_IXUNLINK_FL;
6982 if (inode->i_flags & S_SYNC)
6983 *sd_attrs |= REISERFS_SYNC_FL;
6985 @@ -2904,6 +2934,15 @@ void i_attrs_to_sd_attrs(struct inode *i
6986 *sd_attrs |= REISERFS_NOTAIL_FL;
6988 *sd_attrs &= ~REISERFS_NOTAIL_FL;
6990 + if (inode->i_vflags & V_BARRIER)
6991 + *sd_attrs |= REISERFS_BARRIER_FL;
6993 + *sd_attrs &= ~REISERFS_BARRIER_FL;
6994 + if (inode->i_vflags & V_COW)
6995 + *sd_attrs |= REISERFS_COW_FL;
6997 + *sd_attrs &= ~REISERFS_COW_FL;
7001 @@ -3149,7 +3188,8 @@ int reiserfs_setattr(struct dentry *dent
7004 if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
7005 - (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid)) {
7006 + (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid) ||
7007 + (ia_valid & ATTR_TAG && attr->ia_tag != inode->i_tag)) {
7008 struct reiserfs_transaction_handle th;
7011 @@ -3178,6 +3218,9 @@ int reiserfs_setattr(struct dentry *dent
7012 inode->i_uid = attr->ia_uid;
7013 if (attr->ia_valid & ATTR_GID)
7014 inode->i_gid = attr->ia_gid;
7015 + if ((attr->ia_valid & ATTR_TAG) &&
7017 + inode->i_tag = attr->ia_tag;
7018 mark_inode_dirty(inode);
7019 error = journal_end(&th, inode->i_sb, jbegin_count);
7021 diff -NurpP --minimal linux-3.5/fs/reiserfs/ioctl.c linux-3.5-vs2.3.4/fs/reiserfs/ioctl.c
7022 --- linux-3.5/fs/reiserfs/ioctl.c 2012-05-21 18:07:27.000000000 +0200
7023 +++ linux-3.5-vs2.3.4/fs/reiserfs/ioctl.c 2012-07-23 01:45:55.000000000 +0200
7025 #include <linux/pagemap.h>
7026 #include <linux/compat.h>
7029 +int reiserfs_sync_flags(struct inode *inode, int flags, int vflags)
7031 + __u16 sd_attrs = 0;
7033 + inode->i_flags = flags;
7034 + inode->i_vflags = vflags;
7036 + i_attrs_to_sd_attrs(inode, &sd_attrs);
7037 + REISERFS_I(inode)->i_attrs = sd_attrs;
7038 + inode->i_ctime = CURRENT_TIME_SEC;
7039 + mark_inode_dirty(inode);
7044 * reiserfs_ioctl - handler for ioctl for inode
7045 * supported commands:
7047 long reiserfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
7049 struct inode *inode = filp->f_path.dentry->d_inode;
7050 - unsigned int flags;
7051 + unsigned int flags, oldflags;
7054 reiserfs_write_lock(inode->i_sb);
7055 @@ -47,6 +62,7 @@ long reiserfs_ioctl(struct file *filp, u
7057 flags = REISERFS_I(inode)->i_attrs;
7058 i_attrs_to_sd_attrs(inode, (__u16 *) & flags);
7059 + flags &= REISERFS_FL_USER_VISIBLE;
7060 err = put_user(flags, (int __user *)arg);
7062 case REISERFS_IOC_SETFLAGS:{
7063 @@ -67,6 +83,10 @@ long reiserfs_ioctl(struct file *filp, u
7067 + if (IS_BARRIER(inode)) {
7068 + vxwprintk_task(1, "messing with the barrier.");
7072 * Is it quota file? Do not allow user to mess with it
7074 @@ -91,6 +111,10 @@ long reiserfs_ioctl(struct file *filp, u
7079 + oldflags = REISERFS_I(inode)->i_attrs;
7080 + flags &= REISERFS_FL_USER_MODIFIABLE;
7081 + flags |= oldflags & ~REISERFS_FL_USER_MODIFIABLE;
7082 sd_attrs_to_i_attrs(flags, inode);
7083 REISERFS_I(inode)->i_attrs = flags;
7084 inode->i_ctime = CURRENT_TIME_SEC;
7085 diff -NurpP --minimal linux-3.5/fs/reiserfs/namei.c linux-3.5-vs2.3.4/fs/reiserfs/namei.c
7086 --- linux-3.5/fs/reiserfs/namei.c 2012-05-21 18:07:27.000000000 +0200
7087 +++ linux-3.5-vs2.3.4/fs/reiserfs/namei.c 2012-07-23 01:45:55.000000000 +0200
7091 #include <linux/quotaops.h>
7092 +#include <linux/vs_tag.h>
7094 #define INC_DIR_INODE_NLINK(i) if (i->i_nlink != 1) { inc_nlink(i); if (i->i_nlink >= REISERFS_LINK_MAX) set_nlink(i, 1); }
7095 #define DEC_DIR_INODE_NLINK(i) if (i->i_nlink != 1) drop_nlink(i);
7096 @@ -362,6 +363,7 @@ static struct dentry *reiserfs_lookup(st
7097 if (retval == IO_ERROR) {
7098 return ERR_PTR(-EIO);
7100 + dx_propagate_tag(nd, inode);
7102 return d_splice_alias(inode, dentry);
7104 diff -NurpP --minimal linux-3.5/fs/reiserfs/reiserfs.h linux-3.5-vs2.3.4/fs/reiserfs/reiserfs.h
7105 --- linux-3.5/fs/reiserfs/reiserfs.h 2012-07-22 23:39:42.000000000 +0200
7106 +++ linux-3.5-vs2.3.4/fs/reiserfs/reiserfs.h 2012-07-23 01:45:55.000000000 +0200
7107 @@ -549,6 +549,7 @@ enum reiserfs_mount_options {
7108 REISERFS_EXPOSE_PRIVROOT,
7109 REISERFS_BARRIER_NONE,
7110 REISERFS_BARRIER_FLUSH,
7113 /* Actions on error */
7114 REISERFS_ERROR_PANIC,
7115 @@ -1548,6 +1549,11 @@ struct stat_data_v1 {
7116 #define REISERFS_COMPR_FL FS_COMPR_FL
7117 #define REISERFS_NOTAIL_FL FS_NOTAIL_FL
7119 +/* unfortunately reiserfs sdattr is only 16 bit */
7120 +#define REISERFS_IXUNLINK_FL (FS_IXUNLINK_FL >> 16)
7121 +#define REISERFS_BARRIER_FL (FS_BARRIER_FL >> 16)
7122 +#define REISERFS_COW_FL (FS_COW_FL >> 16)
7124 /* persistent flags that file inherits from the parent directory */
7125 #define REISERFS_INHERIT_MASK ( REISERFS_IMMUTABLE_FL | \
7126 REISERFS_SYNC_FL | \
7127 @@ -1557,6 +1563,9 @@ struct stat_data_v1 {
7128 REISERFS_COMPR_FL | \
7129 REISERFS_NOTAIL_FL )
7131 +#define REISERFS_FL_USER_VISIBLE 0x80FF
7132 +#define REISERFS_FL_USER_MODIFIABLE 0x80FF
7134 /* Stat Data on disk (reiserfs version of UFS disk inode minus the
7137 @@ -2647,6 +2656,7 @@ static inline void reiserfs_update_sd(st
7138 void sd_attrs_to_i_attrs(__u16 sd_attrs, struct inode *inode);
7139 void i_attrs_to_sd_attrs(struct inode *inode, __u16 * sd_attrs);
7140 int reiserfs_setattr(struct dentry *dentry, struct iattr *attr);
7141 +int reiserfs_sync_flags(struct inode *inode, int, int);
7143 int __reiserfs_write_begin(struct page *page, unsigned from, unsigned len);
7145 diff -NurpP --minimal linux-3.5/fs/reiserfs/super.c linux-3.5-vs2.3.4/fs/reiserfs/super.c
7146 --- linux-3.5/fs/reiserfs/super.c 2012-07-22 23:39:42.000000000 +0200
7147 +++ linux-3.5-vs2.3.4/fs/reiserfs/super.c 2012-07-23 01:45:55.000000000 +0200
7148 @@ -1013,6 +1013,14 @@ static int reiserfs_parse_options(struct
7149 {"user_xattr",.setmask = 1 << REISERFS_UNSUPPORTED_OPT},
7150 {"nouser_xattr",.clrmask = 1 << REISERFS_UNSUPPORTED_OPT},
7152 +#ifndef CONFIG_TAGGING_NONE
7153 + {"tagxid",.setmask = 1 << REISERFS_TAGGED},
7154 + {"tag",.setmask = 1 << REISERFS_TAGGED},
7155 + {"notag",.clrmask = 1 << REISERFS_TAGGED},
7157 +#ifdef CONFIG_PROPAGATE
7158 + {"tag",.arg_required = 'T',.values = NULL},
7160 #ifdef CONFIG_REISERFS_FS_POSIX_ACL
7161 {"acl",.setmask = 1 << REISERFS_POSIXACL},
7162 {"noacl",.clrmask = 1 << REISERFS_POSIXACL},
7163 @@ -1331,6 +1339,14 @@ static int reiserfs_remount(struct super
7164 handle_quota_files(s, qf_names, &qfmt);
7167 + if ((mount_options & (1 << REISERFS_TAGGED)) &&
7168 + !(s->s_flags & MS_TAGGED)) {
7169 + reiserfs_warning(s, "super-vs01",
7170 + "reiserfs: tagging not permitted on remount.");
7177 /* Add options that are safe here */
7178 @@ -1811,6 +1827,10 @@ static int reiserfs_fill_super(struct su
7179 goto error_unlocked;
7182 + /* map mount option tagxid */
7183 + if (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_TAGGED))
7184 + s->s_flags |= MS_TAGGED;
7186 rs = SB_DISK_SUPER_BLOCK(s);
7187 /* Let's do basic sanity check to verify that underlying device is not
7188 smaller than the filesystem. If the check fails then abort and scream,
7189 diff -NurpP --minimal linux-3.5/fs/reiserfs/xattr.c linux-3.5-vs2.3.4/fs/reiserfs/xattr.c
7190 --- linux-3.5/fs/reiserfs/xattr.c 2012-05-21 18:07:27.000000000 +0200
7191 +++ linux-3.5-vs2.3.4/fs/reiserfs/xattr.c 2012-07-23 01:45:55.000000000 +0200
7193 #include <linux/errno.h>
7194 #include <linux/gfp.h>
7195 #include <linux/fs.h>
7196 +#include <linux/mount.h>
7197 #include <linux/file.h>
7198 #include <linux/pagemap.h>
7199 #include <linux/xattr.h>
7200 diff -NurpP --minimal linux-3.5/fs/stat.c linux-3.5-vs2.3.4/fs/stat.c
7201 --- linux-3.5/fs/stat.c 2012-07-22 23:39:42.000000000 +0200
7202 +++ linux-3.5-vs2.3.4/fs/stat.c 2012-07-23 01:45:55.000000000 +0200
7203 @@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod
7204 stat->nlink = inode->i_nlink;
7205 stat->uid = inode->i_uid;
7206 stat->gid = inode->i_gid;
7207 + stat->tag = inode->i_tag;
7208 stat->rdev = inode->i_rdev;
7209 stat->size = i_size_read(inode);
7210 stat->atime = inode->i_atime;
7211 diff -NurpP --minimal linux-3.5/fs/statfs.c linux-3.5-vs2.3.4/fs/statfs.c
7212 --- linux-3.5/fs/statfs.c 2012-07-22 23:39:42.000000000 +0200
7213 +++ linux-3.5-vs2.3.4/fs/statfs.c 2012-07-23 01:45:55.000000000 +0200
7215 #include <linux/statfs.h>
7216 #include <linux/security.h>
7217 #include <linux/uaccess.h>
7218 +#include <linux/vs_base.h>
7219 +#include <linux/vs_dlimit.h>
7220 #include "internal.h"
7222 static int flags_by_mnt(int mnt_flags)
7223 @@ -60,6 +62,8 @@ static int statfs_by_dentry(struct dentr
7224 retval = dentry->d_sb->s_op->statfs(dentry, buf);
7225 if (retval == 0 && buf->f_frsize == 0)
7226 buf->f_frsize = buf->f_bsize;
7227 + if (!vx_check(0, VS_ADMIN|VS_WATCH))
7228 + vx_vsi_statfs(dentry->d_sb, buf);
7232 diff -NurpP --minimal linux-3.5/fs/super.c linux-3.5-vs2.3.4/fs/super.c
7233 --- linux-3.5/fs/super.c 2012-05-21 18:07:27.000000000 +0200
7234 +++ linux-3.5-vs2.3.4/fs/super.c 2012-07-23 01:45:55.000000000 +0200
7236 #include <linux/rculist_bl.h>
7237 #include <linux/cleancache.h>
7238 #include <linux/fsnotify.h>
7239 +#include <linux/magic.h>
7240 +#include <linux/vs_context.h>
7241 #include "internal.h"
7244 @@ -1138,6 +1140,13 @@ mount_fs(struct file_system_type *type,
7245 WARN_ON(sb->s_bdi == &default_backing_dev_info);
7246 sb->s_flags |= MS_BORN;
7249 + if (!vx_capable(CAP_SYS_ADMIN, VXC_BINARY_MOUNT) &&
7251 + (sb->s_magic != PROC_SUPER_MAGIC) &&
7252 + (sb->s_magic != DEVPTS_SUPER_MAGIC))
7255 error = security_sb_kern_mount(sb, flags, secdata);
7258 diff -NurpP --minimal linux-3.5/fs/sysfs/mount.c linux-3.5-vs2.3.4/fs/sysfs/mount.c
7259 --- linux-3.5/fs/sysfs/mount.c 2012-05-21 18:07:27.000000000 +0200
7260 +++ linux-3.5-vs2.3.4/fs/sysfs/mount.c 2012-07-23 01:45:55.000000000 +0200
7261 @@ -47,7 +47,7 @@ static int sysfs_fill_super(struct super
7263 sb->s_blocksize = PAGE_CACHE_SIZE;
7264 sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
7265 - sb->s_magic = SYSFS_MAGIC;
7266 + sb->s_magic = SYSFS_SUPER_MAGIC;
7267 sb->s_op = &sysfs_ops;
7268 sb->s_time_gran = 1;
7270 diff -NurpP --minimal linux-3.5/fs/utimes.c linux-3.5-vs2.3.4/fs/utimes.c
7271 --- linux-3.5/fs/utimes.c 2012-07-22 23:39:42.000000000 +0200
7272 +++ linux-3.5-vs2.3.4/fs/utimes.c 2012-07-23 01:45:55.000000000 +0200
7274 #include <linux/stat.h>
7275 #include <linux/utime.h>
7276 #include <linux/syscalls.h>
7277 +#include <linux/mount.h>
7278 +#include <linux/vs_cowbl.h>
7279 #include <asm/uaccess.h>
7280 #include <asm/unistd.h>
7282 @@ -52,12 +54,18 @@ static int utimes_common(struct path *pa
7285 struct iattr newattrs;
7286 - struct inode *inode = path->dentry->d_inode;
7287 + struct inode *inode;
7289 error = mnt_want_write(path->mnt);
7293 + error = cow_check_and_break(path);
7295 + goto mnt_drop_write_and_out;
7297 + inode = path->dentry->d_inode;
7299 if (times && times[0].tv_nsec == UTIME_NOW &&
7300 times[1].tv_nsec == UTIME_NOW)
7302 diff -NurpP --minimal linux-3.5/fs/xattr.c linux-3.5-vs2.3.4/fs/xattr.c
7303 --- linux-3.5/fs/xattr.c 2012-07-22 23:39:42.000000000 +0200
7304 +++ linux-3.5-vs2.3.4/fs/xattr.c 2012-07-23 01:45:55.000000000 +0200
7306 #include <linux/fsnotify.h>
7307 #include <linux/audit.h>
7308 #include <linux/vmalloc.h>
7309 +#include <linux/mount.h>
7311 #include <asm/uaccess.h>
7313 @@ -51,7 +52,7 @@ xattr_permission(struct inode *inode, co
7314 * The trusted.* namespace can only be accessed by privileged users.
7316 if (!strncmp(name, XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN)) {
7317 - if (!capable(CAP_SYS_ADMIN))
7318 + if (!vx_capable(CAP_SYS_ADMIN, VXC_FS_TRUSTED))
7319 return (mask & MAY_WRITE) ? -EPERM : -ENODATA;
7322 diff -NurpP --minimal linux-3.5/fs/xfs/xfs_dinode.h linux-3.5-vs2.3.4/fs/xfs/xfs_dinode.h
7323 --- linux-3.5/fs/xfs/xfs_dinode.h 2011-10-24 18:45:31.000000000 +0200
7324 +++ linux-3.5-vs2.3.4/fs/xfs/xfs_dinode.h 2012-07-23 01:45:55.000000000 +0200
7325 @@ -51,7 +51,9 @@ typedef struct xfs_dinode {
7326 __be32 di_nlink; /* number of links to file */
7327 __be16 di_projid_lo; /* lower part of owner's project id */
7328 __be16 di_projid_hi; /* higher part owner's project id */
7329 - __u8 di_pad[6]; /* unused, zeroed space */
7330 + __u8 di_pad[2]; /* unused, zeroed space */
7331 + __be16 di_tag; /* context tagging */
7332 + __be16 di_vflags; /* vserver specific flags */
7333 __be16 di_flushiter; /* incremented on flush */
7334 xfs_timestamp_t di_atime; /* time last accessed */
7335 xfs_timestamp_t di_mtime; /* time last modified */
7336 @@ -184,6 +186,8 @@ static inline void xfs_dinode_put_rdev(s
7337 #define XFS_DIFLAG_EXTSZINHERIT_BIT 12 /* inherit inode extent size */
7338 #define XFS_DIFLAG_NODEFRAG_BIT 13 /* do not reorganize/defragment */
7339 #define XFS_DIFLAG_FILESTREAM_BIT 14 /* use filestream allocator */
7340 +#define XFS_DIFLAG_IXUNLINK_BIT 15 /* Immutable inver on unlink */
7342 #define XFS_DIFLAG_REALTIME (1 << XFS_DIFLAG_REALTIME_BIT)
7343 #define XFS_DIFLAG_PREALLOC (1 << XFS_DIFLAG_PREALLOC_BIT)
7344 #define XFS_DIFLAG_NEWRTBM (1 << XFS_DIFLAG_NEWRTBM_BIT)
7345 @@ -199,6 +203,7 @@ static inline void xfs_dinode_put_rdev(s
7346 #define XFS_DIFLAG_EXTSZINHERIT (1 << XFS_DIFLAG_EXTSZINHERIT_BIT)
7347 #define XFS_DIFLAG_NODEFRAG (1 << XFS_DIFLAG_NODEFRAG_BIT)
7348 #define XFS_DIFLAG_FILESTREAM (1 << XFS_DIFLAG_FILESTREAM_BIT)
7349 +#define XFS_DIFLAG_IXUNLINK (1 << XFS_DIFLAG_IXUNLINK_BIT)
7351 #ifdef CONFIG_XFS_RT
7352 #define XFS_IS_REALTIME_INODE(ip) ((ip)->i_d.di_flags & XFS_DIFLAG_REALTIME)
7353 @@ -211,6 +216,10 @@ static inline void xfs_dinode_put_rdev(s
7354 XFS_DIFLAG_IMMUTABLE | XFS_DIFLAG_APPEND | XFS_DIFLAG_SYNC | \
7355 XFS_DIFLAG_NOATIME | XFS_DIFLAG_NODUMP | XFS_DIFLAG_RTINHERIT | \
7356 XFS_DIFLAG_PROJINHERIT | XFS_DIFLAG_NOSYMLINKS | XFS_DIFLAG_EXTSIZE | \
7357 - XFS_DIFLAG_EXTSZINHERIT | XFS_DIFLAG_NODEFRAG | XFS_DIFLAG_FILESTREAM)
7358 + XFS_DIFLAG_EXTSZINHERIT | XFS_DIFLAG_NODEFRAG | XFS_DIFLAG_FILESTREAM | \
7359 + XFS_DIFLAG_IXUNLINK)
7361 +#define XFS_DIVFLAG_BARRIER 0x01
7362 +#define XFS_DIVFLAG_COW 0x02
7364 #endif /* __XFS_DINODE_H__ */
7365 diff -NurpP --minimal linux-3.5/fs/xfs/xfs_fs.h linux-3.5-vs2.3.4/fs/xfs/xfs_fs.h
7366 --- linux-3.5/fs/xfs/xfs_fs.h 2011-10-24 18:45:31.000000000 +0200
7367 +++ linux-3.5-vs2.3.4/fs/xfs/xfs_fs.h 2012-07-23 01:45:55.000000000 +0200
7368 @@ -67,6 +67,9 @@ struct fsxattr {
7369 #define XFS_XFLAG_EXTSZINHERIT 0x00001000 /* inherit inode extent size */
7370 #define XFS_XFLAG_NODEFRAG 0x00002000 /* do not defragment */
7371 #define XFS_XFLAG_FILESTREAM 0x00004000 /* use filestream allocator */
7372 +#define XFS_XFLAG_IXUNLINK 0x00008000 /* immutable invert on unlink */
7373 +#define XFS_XFLAG_BARRIER 0x10000000 /* chroot() barrier */
7374 +#define XFS_XFLAG_COW 0x20000000 /* copy on write mark */
7375 #define XFS_XFLAG_HASATTR 0x80000000 /* no DIFLAG for this */
7378 @@ -302,7 +305,8 @@ typedef struct xfs_bstat {
7379 #define bs_projid bs_projid_lo /* (previously just bs_projid) */
7380 __u16 bs_forkoff; /* inode fork offset in bytes */
7381 __u16 bs_projid_hi; /* higher part of project id */
7382 - unsigned char bs_pad[10]; /* pad space, unused */
7383 + unsigned char bs_pad[8]; /* pad space, unused */
7384 + __u16 bs_tag; /* context tagging */
7385 __u32 bs_dmevmask; /* DMIG event mask */
7386 __u16 bs_dmstate; /* DMIG state info */
7387 __u16 bs_aextents; /* attribute number of extents */
7388 diff -NurpP --minimal linux-3.5/fs/xfs/xfs_ialloc.c linux-3.5-vs2.3.4/fs/xfs/xfs_ialloc.c
7389 --- linux-3.5/fs/xfs/xfs_ialloc.c 2012-07-22 23:39:42.000000000 +0200
7390 +++ linux-3.5-vs2.3.4/fs/xfs/xfs_ialloc.c 2012-07-23 01:45:55.000000000 +0200
7392 #include "xfs_error.h"
7393 #include "xfs_bmap.h"
7397 * Allocation group level functions.
7399 diff -NurpP --minimal linux-3.5/fs/xfs/xfs_inode.c linux-3.5-vs2.3.4/fs/xfs/xfs_inode.c
7400 --- linux-3.5/fs/xfs/xfs_inode.c 2012-07-22 23:39:42.000000000 +0200
7401 +++ linux-3.5-vs2.3.4/fs/xfs/xfs_inode.c 2012-07-23 01:45:55.000000000 +0200
7402 @@ -250,6 +250,7 @@ xfs_inotobp(
7406 +#include <linux/vs_tag.h>
7409 * This routine is called to map an inode to the buffer containing
7410 @@ -645,15 +646,25 @@ xfs_iformat_btree(
7412 xfs_dinode_from_disk(
7414 - xfs_dinode_t *from)
7415 + xfs_dinode_t *from,
7418 + uint32_t uid, gid, tag;
7420 to->di_magic = be16_to_cpu(from->di_magic);
7421 to->di_mode = be16_to_cpu(from->di_mode);
7422 to->di_version = from ->di_version;
7423 to->di_format = from->di_format;
7424 to->di_onlink = be16_to_cpu(from->di_onlink);
7425 - to->di_uid = be32_to_cpu(from->di_uid);
7426 - to->di_gid = be32_to_cpu(from->di_gid);
7428 + uid = be32_to_cpu(from->di_uid);
7429 + gid = be32_to_cpu(from->di_gid);
7430 + tag = be16_to_cpu(from->di_tag);
7432 + to->di_uid = INOTAG_UID(tagged, uid, gid);
7433 + to->di_gid = INOTAG_GID(tagged, uid, gid);
7434 + to->di_tag = INOTAG_TAG(tagged, uid, gid, tag);
7436 to->di_nlink = be32_to_cpu(from->di_nlink);
7437 to->di_projid_lo = be16_to_cpu(from->di_projid_lo);
7438 to->di_projid_hi = be16_to_cpu(from->di_projid_hi);
7439 @@ -675,21 +686,26 @@ xfs_dinode_from_disk(
7440 to->di_dmevmask = be32_to_cpu(from->di_dmevmask);
7441 to->di_dmstate = be16_to_cpu(from->di_dmstate);
7442 to->di_flags = be16_to_cpu(from->di_flags);
7443 + to->di_vflags = be16_to_cpu(from->di_vflags);
7444 to->di_gen = be32_to_cpu(from->di_gen);
7450 - xfs_icdinode_t *from)
7451 + xfs_icdinode_t *from,
7454 to->di_magic = cpu_to_be16(from->di_magic);
7455 to->di_mode = cpu_to_be16(from->di_mode);
7456 to->di_version = from ->di_version;
7457 to->di_format = from->di_format;
7458 to->di_onlink = cpu_to_be16(from->di_onlink);
7459 - to->di_uid = cpu_to_be32(from->di_uid);
7460 - to->di_gid = cpu_to_be32(from->di_gid);
7462 + to->di_uid = cpu_to_be32(TAGINO_UID(tagged, from->di_uid, from->di_tag));
7463 + to->di_gid = cpu_to_be32(TAGINO_GID(tagged, from->di_gid, from->di_tag));
7464 + to->di_tag = cpu_to_be16(TAGINO_TAG(tagged, from->di_tag));
7466 to->di_nlink = cpu_to_be32(from->di_nlink);
7467 to->di_projid_lo = cpu_to_be16(from->di_projid_lo);
7468 to->di_projid_hi = cpu_to_be16(from->di_projid_hi);
7469 @@ -711,12 +727,14 @@ xfs_dinode_to_disk(
7470 to->di_dmevmask = cpu_to_be32(from->di_dmevmask);
7471 to->di_dmstate = cpu_to_be16(from->di_dmstate);
7472 to->di_flags = cpu_to_be16(from->di_flags);
7473 + to->di_vflags = cpu_to_be16(from->di_vflags);
7474 to->di_gen = cpu_to_be32(from->di_gen);
7479 - __uint16_t di_flags)
7480 + __uint16_t di_flags,
7481 + __uint16_t di_vflags)
7485 @@ -727,6 +745,8 @@ _xfs_dic2xflags(
7486 flags |= XFS_XFLAG_PREALLOC;
7487 if (di_flags & XFS_DIFLAG_IMMUTABLE)
7488 flags |= XFS_XFLAG_IMMUTABLE;
7489 + if (di_flags & XFS_DIFLAG_IXUNLINK)
7490 + flags |= XFS_XFLAG_IXUNLINK;
7491 if (di_flags & XFS_DIFLAG_APPEND)
7492 flags |= XFS_XFLAG_APPEND;
7493 if (di_flags & XFS_DIFLAG_SYNC)
7494 @@ -751,6 +771,10 @@ _xfs_dic2xflags(
7495 flags |= XFS_XFLAG_FILESTREAM;
7498 + if (di_vflags & XFS_DIVFLAG_BARRIER)
7499 + flags |= FS_BARRIER_FL;
7500 + if (di_vflags & XFS_DIVFLAG_COW)
7501 + flags |= FS_COW_FL;
7505 @@ -760,7 +784,7 @@ xfs_ip2xflags(
7507 xfs_icdinode_t *dic = &ip->i_d;
7509 - return _xfs_dic2xflags(dic->di_flags) |
7510 + return _xfs_dic2xflags(dic->di_flags, dic->di_vflags) |
7511 (XFS_IFORK_Q(ip) ? XFS_XFLAG_HASATTR : 0);
7514 @@ -768,7 +792,8 @@ uint
7518 - return _xfs_dic2xflags(be16_to_cpu(dip->di_flags)) |
7519 + return _xfs_dic2xflags(be16_to_cpu(dip->di_flags),
7520 + be16_to_cpu(dip->di_vflags)) |
7521 (XFS_DFORK_Q(dip) ? XFS_XFLAG_HASATTR : 0);
7524 @@ -800,7 +825,6 @@ xfs_iread(
7527 dip = (xfs_dinode_t *)xfs_buf_offset(bp, ip->i_imap.im_boffset);
7530 * If we got something that isn't an inode it means someone
7531 * (nfs or dmi) has a stale handle.
7532 @@ -823,7 +847,8 @@ xfs_iread(
7533 * Otherwise, just get the truly permanent information.
7536 - xfs_dinode_from_disk(&ip->i_d, dip);
7537 + xfs_dinode_from_disk(&ip->i_d, dip,
7538 + mp->m_flags & XFS_MOUNT_TAGGED);
7539 error = xfs_iformat(ip, dip);
7542 @@ -1011,6 +1036,7 @@ xfs_ialloc(
7543 ASSERT(ip->i_d.di_nlink == nlink);
7544 ip->i_d.di_uid = current_fsuid();
7545 ip->i_d.di_gid = current_fsgid();
7546 + ip->i_d.di_tag = current_fstag(&ip->i_vnode);
7547 xfs_set_projid(ip, prid);
7548 memset(&(ip->i_d.di_pad[0]), 0, sizeof(ip->i_d.di_pad));
7550 @@ -1070,6 +1096,7 @@ xfs_ialloc(
7551 ip->i_d.di_dmevmask = 0;
7552 ip->i_d.di_dmstate = 0;
7553 ip->i_d.di_flags = 0;
7554 + ip->i_d.di_vflags = 0;
7555 flags = XFS_ILOG_CORE;
7556 switch (mode & S_IFMT) {
7558 @@ -1737,6 +1764,7 @@ xfs_ifree(
7560 ip->i_d.di_mode = 0; /* mark incore inode as free */
7561 ip->i_d.di_flags = 0;
7562 + ip->i_d.di_vflags = 0;
7563 ip->i_d.di_dmevmask = 0;
7564 ip->i_d.di_forkoff = 0; /* mark the attr fork not in use */
7565 ip->i_d.di_format = XFS_DINODE_FMT_EXTENTS;
7566 @@ -2589,7 +2617,8 @@ xfs_iflush_int(
7567 * because if the inode is dirty at all the core must
7570 - xfs_dinode_to_disk(dip, &ip->i_d);
7571 + xfs_dinode_to_disk(dip, &ip->i_d,
7572 + mp->m_flags & XFS_MOUNT_TAGGED);
7574 /* Wrap, we never let the log put out DI_MAX_FLUSH */
7575 if (ip->i_d.di_flushiter == DI_MAX_FLUSH)
7576 diff -NurpP --minimal linux-3.5/fs/xfs/xfs_inode.h linux-3.5-vs2.3.4/fs/xfs/xfs_inode.h
7577 --- linux-3.5/fs/xfs/xfs_inode.h 2012-07-22 23:39:42.000000000 +0200
7578 +++ linux-3.5-vs2.3.4/fs/xfs/xfs_inode.h 2012-07-23 01:45:55.000000000 +0200
7579 @@ -134,7 +134,9 @@ typedef struct xfs_icdinode {
7580 __uint32_t di_nlink; /* number of links to file */
7581 __uint16_t di_projid_lo; /* lower part of owner's project id */
7582 __uint16_t di_projid_hi; /* higher part of owner's project id */
7583 - __uint8_t di_pad[6]; /* unused, zeroed space */
7584 + __uint8_t di_pad[2]; /* unused, zeroed space */
7585 + __uint16_t di_tag; /* context tagging */
7586 + __uint16_t di_vflags; /* vserver specific flags */
7587 __uint16_t di_flushiter; /* incremented on flush */
7588 xfs_ictimestamp_t di_atime; /* time last accessed */
7589 xfs_ictimestamp_t di_mtime; /* time last modified */
7590 @@ -566,7 +568,7 @@ int xfs_itobp(struct xfs_mount *, struc
7591 int xfs_iread(struct xfs_mount *, struct xfs_trans *,
7592 struct xfs_inode *, uint);
7593 void xfs_dinode_to_disk(struct xfs_dinode *,
7594 - struct xfs_icdinode *);
7595 + struct xfs_icdinode *, int);
7596 void xfs_idestroy_fork(struct xfs_inode *, int);
7597 void xfs_idata_realloc(struct xfs_inode *, int, int);
7598 void xfs_iroot_realloc(struct xfs_inode *, int, int);
7599 diff -NurpP --minimal linux-3.5/fs/xfs/xfs_ioctl.c linux-3.5-vs2.3.4/fs/xfs/xfs_ioctl.c
7600 --- linux-3.5/fs/xfs/xfs_ioctl.c 2012-07-22 23:39:42.000000000 +0200
7601 +++ linux-3.5-vs2.3.4/fs/xfs/xfs_ioctl.c 2012-07-23 01:45:55.000000000 +0200
7603 #include "xfs_bmap_btree.h"
7604 #include "xfs_dinode.h"
7605 #include "xfs_inode.h"
7606 -#include "xfs_ioctl.h"
7607 +// #include "xfs_ioctl.h"
7608 #include "xfs_rtalloc.h"
7609 #include "xfs_itable.h"
7610 #include "xfs_error.h"
7611 @@ -748,6 +748,10 @@ xfs_merge_ioc_xflags(
7612 xflags |= XFS_XFLAG_IMMUTABLE;
7614 xflags &= ~XFS_XFLAG_IMMUTABLE;
7615 + if (flags & FS_IXUNLINK_FL)
7616 + xflags |= XFS_XFLAG_IXUNLINK;
7618 + xflags &= ~XFS_XFLAG_IXUNLINK;
7619 if (flags & FS_APPEND_FL)
7620 xflags |= XFS_XFLAG_APPEND;
7622 @@ -776,6 +780,8 @@ xfs_di2lxflags(
7624 if (di_flags & XFS_DIFLAG_IMMUTABLE)
7625 flags |= FS_IMMUTABLE_FL;
7626 + if (di_flags & XFS_DIFLAG_IXUNLINK)
7627 + flags |= FS_IXUNLINK_FL;
7628 if (di_flags & XFS_DIFLAG_APPEND)
7629 flags |= FS_APPEND_FL;
7630 if (di_flags & XFS_DIFLAG_SYNC)
7631 @@ -836,6 +842,8 @@ xfs_set_diflags(
7632 di_flags = (ip->i_d.di_flags & XFS_DIFLAG_PREALLOC);
7633 if (xflags & XFS_XFLAG_IMMUTABLE)
7634 di_flags |= XFS_DIFLAG_IMMUTABLE;
7635 + if (xflags & XFS_XFLAG_IXUNLINK)
7636 + di_flags |= XFS_DIFLAG_IXUNLINK;
7637 if (xflags & XFS_XFLAG_APPEND)
7638 di_flags |= XFS_DIFLAG_APPEND;
7639 if (xflags & XFS_XFLAG_SYNC)
7640 @@ -878,6 +886,10 @@ xfs_diflags_to_linux(
7641 inode->i_flags |= S_IMMUTABLE;
7643 inode->i_flags &= ~S_IMMUTABLE;
7644 + if (xflags & XFS_XFLAG_IXUNLINK)
7645 + inode->i_flags |= S_IXUNLINK;
7647 + inode->i_flags &= ~S_IXUNLINK;
7648 if (xflags & XFS_XFLAG_APPEND)
7649 inode->i_flags |= S_APPEND;
7651 @@ -1370,10 +1382,18 @@ xfs_file_ioctl(
7652 case XFS_IOC_FSGETXATTRA:
7653 return xfs_ioc_fsgetxattr(ip, 1, arg);
7654 case XFS_IOC_FSSETXATTR:
7655 + if (IS_BARRIER(inode)) {
7656 + vxwprintk_task(1, "messing with the barrier.");
7657 + return -XFS_ERROR(EACCES);
7659 return xfs_ioc_fssetxattr(ip, filp, arg);
7660 case XFS_IOC_GETXFLAGS:
7661 return xfs_ioc_getxflags(ip, arg);
7662 case XFS_IOC_SETXFLAGS:
7663 + if (IS_BARRIER(inode)) {
7664 + vxwprintk_task(1, "messing with the barrier.");
7665 + return -XFS_ERROR(EACCES);
7667 return xfs_ioc_setxflags(ip, filp, arg);
7669 case XFS_IOC_FSSETDM: {
7670 diff -NurpP --minimal linux-3.5/fs/xfs/xfs_ioctl.h linux-3.5-vs2.3.4/fs/xfs/xfs_ioctl.h
7671 --- linux-3.5/fs/xfs/xfs_ioctl.h 2011-10-24 18:45:31.000000000 +0200
7672 +++ linux-3.5-vs2.3.4/fs/xfs/xfs_ioctl.h 2012-07-23 01:45:55.000000000 +0200
7673 @@ -70,6 +70,12 @@ xfs_handle_to_dentry(
7674 void __user *uhandle,
7679 + struct inode *inode,
7686 diff -NurpP --minimal linux-3.5/fs/xfs/xfs_iops.c linux-3.5-vs2.3.4/fs/xfs/xfs_iops.c
7687 --- linux-3.5/fs/xfs/xfs_iops.c 2012-07-22 23:39:42.000000000 +0200
7688 +++ linux-3.5-vs2.3.4/fs/xfs/xfs_iops.c 2012-07-23 01:45:55.000000000 +0200
7690 #include "xfs_bmap_btree.h"
7691 #include "xfs_dinode.h"
7692 #include "xfs_inode.h"
7693 +#include "xfs_ioctl.h"
7694 #include "xfs_bmap.h"
7695 #include "xfs_rtalloc.h"
7696 #include "xfs_error.h"
7698 #include <linux/security.h>
7699 #include <linux/fiemap.h>
7700 #include <linux/slab.h>
7701 +#include <linux/vs_tag.h>
7705 @@ -421,6 +423,7 @@ xfs_vn_getattr(
7706 stat->nlink = ip->i_d.di_nlink;
7707 stat->uid = ip->i_d.di_uid;
7708 stat->gid = ip->i_d.di_gid;
7709 + stat->tag = ip->i_d.di_tag;
7710 stat->ino = ip->i_ino;
7711 stat->atime = inode->i_atime;
7712 stat->mtime = inode->i_mtime;
7713 @@ -991,6 +994,7 @@ static const struct inode_operations xfs
7714 .removexattr = generic_removexattr,
7715 .listxattr = xfs_vn_listxattr,
7716 .fiemap = xfs_vn_fiemap,
7717 + .sync_flags = xfs_sync_flags,
7720 static const struct inode_operations xfs_dir_inode_operations = {
7721 @@ -1016,6 +1020,7 @@ static const struct inode_operations xfs
7722 .getxattr = generic_getxattr,
7723 .removexattr = generic_removexattr,
7724 .listxattr = xfs_vn_listxattr,
7725 + .sync_flags = xfs_sync_flags,
7728 static const struct inode_operations xfs_dir_ci_inode_operations = {
7729 @@ -1065,6 +1070,10 @@ xfs_diflags_to_iflags(
7730 inode->i_flags |= S_IMMUTABLE;
7732 inode->i_flags &= ~S_IMMUTABLE;
7733 + if (ip->i_d.di_flags & XFS_DIFLAG_IXUNLINK)
7734 + inode->i_flags |= S_IXUNLINK;
7736 + inode->i_flags &= ~S_IXUNLINK;
7737 if (ip->i_d.di_flags & XFS_DIFLAG_APPEND)
7738 inode->i_flags |= S_APPEND;
7740 @@ -1077,6 +1086,15 @@ xfs_diflags_to_iflags(
7741 inode->i_flags |= S_NOATIME;
7743 inode->i_flags &= ~S_NOATIME;
7745 + if (ip->i_d.di_vflags & XFS_DIVFLAG_BARRIER)
7746 + inode->i_vflags |= V_BARRIER;
7748 + inode->i_vflags &= ~V_BARRIER;
7749 + if (ip->i_d.di_vflags & XFS_DIVFLAG_COW)
7750 + inode->i_vflags |= V_COW;
7752 + inode->i_vflags &= ~V_COW;
7756 @@ -1108,6 +1126,7 @@ xfs_setup_inode(
7757 set_nlink(inode, ip->i_d.di_nlink);
7758 inode->i_uid = ip->i_d.di_uid;
7759 inode->i_gid = ip->i_d.di_gid;
7760 + inode->i_tag = ip->i_d.di_tag;
7762 switch (inode->i_mode & S_IFMT) {
7764 diff -NurpP --minimal linux-3.5/fs/xfs/xfs_itable.c linux-3.5-vs2.3.4/fs/xfs/xfs_itable.c
7765 --- linux-3.5/fs/xfs/xfs_itable.c 2012-07-22 23:39:42.000000000 +0200
7766 +++ linux-3.5-vs2.3.4/fs/xfs/xfs_itable.c 2012-07-23 01:45:55.000000000 +0200
7767 @@ -96,6 +96,7 @@ xfs_bulkstat_one_int(
7768 buf->bs_mode = dic->di_mode;
7769 buf->bs_uid = dic->di_uid;
7770 buf->bs_gid = dic->di_gid;
7771 + buf->bs_tag = dic->di_tag;
7772 buf->bs_size = dic->di_size;
7773 buf->bs_atime.tv_sec = dic->di_atime.t_sec;
7774 buf->bs_atime.tv_nsec = dic->di_atime.t_nsec;
7775 diff -NurpP --minimal linux-3.5/fs/xfs/xfs_linux.h linux-3.5-vs2.3.4/fs/xfs/xfs_linux.h
7776 --- linux-3.5/fs/xfs/xfs_linux.h 2011-10-24 18:45:31.000000000 +0200
7777 +++ linux-3.5-vs2.3.4/fs/xfs/xfs_linux.h 2012-07-23 01:45:55.000000000 +0200
7780 #define current_cpu() (raw_smp_processor_id())
7781 #define current_pid() (current->pid)
7782 +#define current_fstag(vp) (dx_current_fstag((vp)->i_sb))
7783 #define current_test_flags(f) (current->flags & (f))
7784 #define current_set_flags_nested(sp, f) \
7785 (*(sp) = current->flags, current->flags |= (f))
7786 diff -NurpP --minimal linux-3.5/fs/xfs/xfs_log_recover.c linux-3.5-vs2.3.4/fs/xfs/xfs_log_recover.c
7787 --- linux-3.5/fs/xfs/xfs_log_recover.c 2012-07-22 23:39:42.000000000 +0200
7788 +++ linux-3.5-vs2.3.4/fs/xfs/xfs_log_recover.c 2012-07-23 01:45:55.000000000 +0200
7789 @@ -2351,7 +2351,8 @@ xlog_recover_inode_pass2(
7792 /* The core is in in-core format */
7793 - xfs_dinode_to_disk(dip, item->ri_buf[1].i_addr);
7794 + xfs_dinode_to_disk(dip, item->ri_buf[1].i_addr,
7795 + mp->m_flags & XFS_MOUNT_TAGGED);
7797 /* the rest is in on-disk format */
7798 if (item->ri_buf[1].i_len > sizeof(struct xfs_icdinode)) {
7799 diff -NurpP --minimal linux-3.5/fs/xfs/xfs_mount.h linux-3.5-vs2.3.4/fs/xfs/xfs_mount.h
7800 --- linux-3.5/fs/xfs/xfs_mount.h 2012-07-22 23:39:42.000000000 +0200
7801 +++ linux-3.5-vs2.3.4/fs/xfs/xfs_mount.h 2012-07-23 01:45:55.000000000 +0200
7802 @@ -252,6 +252,7 @@ typedef struct xfs_mount {
7804 #define XFS_MOUNT_NOATTR2 (1ULL << 25) /* disable use of attr2 format */
7806 +#define XFS_MOUNT_TAGGED (1ULL << 31) /* context tagging */
7809 * Default minimum read and write sizes.
7810 diff -NurpP --minimal linux-3.5/fs/xfs/xfs_super.c linux-3.5-vs2.3.4/fs/xfs/xfs_super.c
7811 --- linux-3.5/fs/xfs/xfs_super.c 2012-07-22 23:39:42.000000000 +0200
7812 +++ linux-3.5-vs2.3.4/fs/xfs/xfs_super.c 2012-07-23 01:45:55.000000000 +0200
7813 @@ -112,6 +112,9 @@ mempool_t *xfs_ioend_pool;
7814 #define MNTOPT_NODELAYLOG "nodelaylog" /* Delayed logging disabled */
7815 #define MNTOPT_DISCARD "discard" /* Discard unused blocks */
7816 #define MNTOPT_NODISCARD "nodiscard" /* Do not discard unused blocks */
7817 +#define MNTOPT_TAGXID "tagxid" /* context tagging for inodes */
7818 +#define MNTOPT_TAGGED "tag" /* context tagging for inodes */
7819 +#define MNTOPT_NOTAGTAG "notag" /* do not use context tagging */
7822 * Table driven mount option parser.
7823 @@ -120,10 +123,14 @@ mempool_t *xfs_ioend_pool;
7824 * in the future, too.
7827 + Opt_tag, Opt_notag,
7828 Opt_barrier, Opt_nobarrier, Opt_err
7831 static const match_table_t tokens = {
7832 + {Opt_tag, "tagxid"},
7834 + {Opt_notag, "notag"},
7835 {Opt_barrier, "barrier"},
7836 {Opt_nobarrier, "nobarrier"},
7838 @@ -371,6 +378,19 @@ xfs_parseargs(
7839 } else if (!strcmp(this_char, "irixsgid")) {
7841 "irixsgid is now a sysctl(2) variable, option is deprecated.");
7842 +#ifndef CONFIG_TAGGING_NONE
7843 + } else if (!strcmp(this_char, MNTOPT_TAGGED)) {
7844 + mp->m_flags |= XFS_MOUNT_TAGGED;
7845 + } else if (!strcmp(this_char, MNTOPT_NOTAGTAG)) {
7846 + mp->m_flags &= ~XFS_MOUNT_TAGGED;
7847 + } else if (!strcmp(this_char, MNTOPT_TAGXID)) {
7848 + mp->m_flags |= XFS_MOUNT_TAGGED;
7850 +#ifdef CONFIG_PROPAGATE
7851 + } else if (!strcmp(this_char, MNTOPT_TAGGED)) {
7853 + mp->m_flags |= XFS_MOUNT_TAGGED;
7856 xfs_warn(mp, "unknown mount option [%s].", this_char);
7858 @@ -1124,6 +1144,16 @@ xfs_fs_remount(
7860 mp->m_flags &= ~XFS_MOUNT_BARRIER;
7863 + if (!(sb->s_flags & MS_TAGGED)) {
7865 + "XFS: %s: tagging not permitted on remount.\n",
7874 * Logically we would return an error here to prevent
7875 @@ -1343,6 +1373,9 @@ xfs_fs_fill_super(
7879 + if (mp->m_flags & XFS_MOUNT_TAGGED)
7880 + sb->s_flags |= MS_TAGGED;
7883 * we must configure the block size in the superblock before we run the
7884 * full mount process as the mount process can lookup and cache inodes.
7885 diff -NurpP --minimal linux-3.5/fs/xfs/xfs_vnodeops.c linux-3.5-vs2.3.4/fs/xfs/xfs_vnodeops.c
7886 --- linux-3.5/fs/xfs/xfs_vnodeops.c 2012-07-22 23:39:42.000000000 +0200
7887 +++ linux-3.5-vs2.3.4/fs/xfs/xfs_vnodeops.c 2012-07-23 01:45:55.000000000 +0200
7888 @@ -103,6 +103,77 @@ xfs_readlink_bmap(
7894 +xfs_get_inode_flags(
7897 + struct inode *inode = VFS_I(ip);
7898 + unsigned int flags = inode->i_flags;
7899 + unsigned int vflags = inode->i_vflags;
7901 + if (flags & S_IMMUTABLE)
7902 + ip->i_d.di_flags |= XFS_DIFLAG_IMMUTABLE;
7904 + ip->i_d.di_flags &= ~XFS_DIFLAG_IMMUTABLE;
7905 + if (flags & S_IXUNLINK)
7906 + ip->i_d.di_flags |= XFS_DIFLAG_IXUNLINK;
7908 + ip->i_d.di_flags &= ~XFS_DIFLAG_IXUNLINK;
7910 + if (vflags & V_BARRIER)
7911 + ip->i_d.di_vflags |= XFS_DIVFLAG_BARRIER;
7913 + ip->i_d.di_vflags &= ~XFS_DIVFLAG_BARRIER;
7914 + if (vflags & V_COW)
7915 + ip->i_d.di_vflags |= XFS_DIVFLAG_COW;
7917 + ip->i_d.di_vflags &= ~XFS_DIVFLAG_COW;
7922 + struct inode *inode,
7926 + struct xfs_inode *ip = XFS_I(inode);
7927 + struct xfs_mount *mp = ip->i_mount;
7928 + struct xfs_trans *tp;
7929 + unsigned int lock_flags = 0;
7932 + tp = xfs_trans_alloc(mp, XFS_TRANS_SETATTR_NOT_SIZE);
7933 + code = xfs_trans_reserve(tp, 0, XFS_ICHANGE_LOG_RES(mp), 0, 0, 0);
7937 + xfs_ilock(ip, XFS_ILOCK_EXCL);
7938 + xfs_trans_ijoin(tp, ip, 0);
7940 + inode->i_flags = flags;
7941 + inode->i_vflags = vflags;
7942 + xfs_get_inode_flags(ip);
7944 + xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
7945 + xfs_trans_ichgtime(tp, ip, XFS_ICHGTIME_CHG);
7947 + XFS_STATS_INC(xs_ig_attrchg);
7949 + if (mp->m_flags & XFS_MOUNT_WSYNC)
7950 + xfs_trans_set_sync(tp);
7951 + code = xfs_trans_commit(tp, 0);
7952 + xfs_iunlock(ip, XFS_ILOCK_EXCL);
7956 + xfs_trans_cancel(tp, 0);
7958 + xfs_iunlock(ip, XFS_ILOCK_EXCL);
7966 diff -NurpP --minimal linux-3.5/include/linux/Kbuild linux-3.5-vs2.3.4/include/linux/Kbuild
7967 --- linux-3.5/include/linux/Kbuild 2012-07-22 23:39:43.000000000 +0200
7968 +++ linux-3.5-vs2.3.4/include/linux/Kbuild 2012-07-23 01:45:55.000000000 +0200
7969 @@ -18,6 +18,7 @@ header-y += netfilter_bridge/
7970 header-y += netfilter_ipv4/
7971 header-y += netfilter_ipv6/
7973 +header-y += vserver/
7976 objhdr-y += version.h
7977 diff -NurpP --minimal linux-3.5/include/linux/capability.h linux-3.5-vs2.3.4/include/linux/capability.h
7978 --- linux-3.5/include/linux/capability.h 2012-07-22 23:39:43.000000000 +0200
7979 +++ linux-3.5-vs2.3.4/include/linux/capability.h 2012-07-23 01:45:55.000000000 +0200
7980 @@ -280,6 +280,7 @@ struct cpu_vfs_cap_data {
7981 arbitrary SCSI commands */
7982 /* Allow setting encryption key on loopback filesystem */
7983 /* Allow setting zone reclaim policy */
7984 +/* Allow the selection of a security context */
7986 #define CAP_SYS_ADMIN 21
7988 @@ -366,7 +367,12 @@ struct cpu_vfs_cap_data {
7990 #define CAP_LAST_CAP CAP_BLOCK_SUSPEND
7992 -#define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP)
7993 +/* Allow context manipulations */
7994 +/* Allow changing context info on files */
7996 +#define CAP_CONTEXT 63
7998 +#define cap_valid(x) ((x) >= 0 && ((x) <= CAP_LAST_CAP || (x) == CAP_CONTEXT))
8001 * Bit location of each capability (used by user-space library and kernel)
8002 diff -NurpP --minimal linux-3.5/include/linux/cred.h linux-3.5-vs2.3.4/include/linux/cred.h
8003 --- linux-3.5/include/linux/cred.h 2012-07-22 23:39:43.000000000 +0200
8004 +++ linux-3.5-vs2.3.4/include/linux/cred.h 2012-07-23 01:45:55.000000000 +0200
8005 @@ -157,6 +157,7 @@ extern void exit_creds(struct task_struc
8006 extern int copy_creds(struct task_struct *, unsigned long);
8007 extern const struct cred *get_task_cred(struct task_struct *);
8008 extern struct cred *cred_alloc_blank(void);
8009 +extern struct cred *__prepare_creds(const struct cred *);
8010 extern struct cred *prepare_creds(void);
8011 extern struct cred *prepare_exec_creds(void);
8012 extern int commit_creds(struct cred *);
8013 @@ -210,6 +211,31 @@ static inline void validate_process_cred
8017 +static inline void set_cred_subscribers(struct cred *cred, int n)
8019 +#ifdef CONFIG_DEBUG_CREDENTIALS
8020 + atomic_set(&cred->subscribers, n);
8024 +static inline int read_cred_subscribers(const struct cred *cred)
8026 +#ifdef CONFIG_DEBUG_CREDENTIALS
8027 + return atomic_read(&cred->subscribers);
8033 +static inline void alter_cred_subscribers(const struct cred *_cred, int n)
8035 +#ifdef CONFIG_DEBUG_CREDENTIALS
8036 + struct cred *cred = (struct cred *) _cred;
8038 + atomic_add(n, &cred->subscribers);
8043 * get_new_cred - Get a reference on a new set of credentials
8044 * @cred: The new credentials to reference
8045 diff -NurpP --minimal linux-3.5/include/linux/devpts_fs.h linux-3.5-vs2.3.4/include/linux/devpts_fs.h
8046 --- linux-3.5/include/linux/devpts_fs.h 2008-12-25 00:26:37.000000000 +0100
8047 +++ linux-3.5-vs2.3.4/include/linux/devpts_fs.h 2012-07-23 01:45:55.000000000 +0200
8048 @@ -45,5 +45,4 @@ static inline void devpts_pty_kill(struc
8053 #endif /* _LINUX_DEVPTS_FS_H */
8054 diff -NurpP --minimal linux-3.5/include/linux/fs.h linux-3.5-vs2.3.4/include/linux/fs.h
8055 --- linux-3.5/include/linux/fs.h 2012-07-22 23:39:43.000000000 +0200
8056 +++ linux-3.5-vs2.3.4/include/linux/fs.h 2012-07-23 10:22:46.000000000 +0200
8057 @@ -223,6 +223,9 @@ struct inodes_stat_t {
8058 #define MS_KERNMOUNT (1<<22) /* this is a kern_mount call */
8059 #define MS_I_VERSION (1<<23) /* Update inode I_version field */
8060 #define MS_STRICTATIME (1<<24) /* Always perform atime updates */
8061 +#define MS_TAGGED (1<<25) /* use generic inode tagging */
8062 +#define MS_TAGID (1<<26) /* use specific tag for this mount */
8063 +#define MS_NOTAGCHECK (1<<27) /* don't check tags */
8064 #define MS_NOSEC (1<<28)
8065 #define MS_BORN (1<<29)
8066 #define MS_ACTIVE (1<<30)
8067 @@ -254,6 +257,14 @@ struct inodes_stat_t {
8068 #define S_IMA 1024 /* Inode has an associated IMA struct */
8069 #define S_AUTOMOUNT 2048 /* Automount/referral quasi-directory */
8070 #define S_NOSEC 4096 /* no suid or xattr security attributes */
8071 +#define S_IXUNLINK 8192 /* Immutable Invert on unlink */
8073 +/* Linux-VServer related Inode flags */
8077 +#define V_BARRIER 4 /* Barrier for chroot() */
8078 +#define V_COW 8 /* Copy on Write */
8081 * Note that nosuid etc flags are inode-specific: setting some file-system
8082 @@ -276,12 +287,15 @@ struct inodes_stat_t {
8083 #define IS_DIRSYNC(inode) (__IS_FLG(inode, MS_SYNCHRONOUS|MS_DIRSYNC) || \
8084 ((inode)->i_flags & (S_SYNC|S_DIRSYNC)))
8085 #define IS_MANDLOCK(inode) __IS_FLG(inode, MS_MANDLOCK)
8086 -#define IS_NOATIME(inode) __IS_FLG(inode, MS_RDONLY|MS_NOATIME)
8087 -#define IS_I_VERSION(inode) __IS_FLG(inode, MS_I_VERSION)
8088 +#define IS_NOATIME(inode) __IS_FLG(inode, MS_RDONLY|MS_NOATIME)
8089 +#define IS_I_VERSION(inode) __IS_FLG(inode, MS_I_VERSION)
8090 +#define IS_TAGGED(inode) __IS_FLG(inode, MS_TAGGED)
8092 #define IS_NOQUOTA(inode) ((inode)->i_flags & S_NOQUOTA)
8093 #define IS_APPEND(inode) ((inode)->i_flags & S_APPEND)
8094 #define IS_IMMUTABLE(inode) ((inode)->i_flags & S_IMMUTABLE)
8095 +#define IS_IXUNLINK(inode) ((inode)->i_flags & S_IXUNLINK)
8096 +#define IS_IXORUNLINK(inode) ((IS_IXUNLINK(inode) ? S_IMMUTABLE : 0) ^ IS_IMMUTABLE(inode))
8097 #define IS_POSIXACL(inode) __IS_FLG(inode, MS_POSIXACL)
8099 #define IS_DEADDIR(inode) ((inode)->i_flags & S_DEAD)
8100 @@ -292,6 +306,16 @@ struct inodes_stat_t {
8101 #define IS_AUTOMOUNT(inode) ((inode)->i_flags & S_AUTOMOUNT)
8102 #define IS_NOSEC(inode) ((inode)->i_flags & S_NOSEC)
8104 +#define IS_BARRIER(inode) (S_ISDIR((inode)->i_mode) && ((inode)->i_vflags & V_BARRIER))
8106 +#ifdef CONFIG_VSERVER_COWBL
8107 +# define IS_COW(inode) (IS_IXUNLINK(inode) && IS_IMMUTABLE(inode))
8108 +# define IS_COW_LINK(inode) (S_ISREG((inode)->i_mode) && ((inode)->i_nlink > 1))
8110 +# define IS_COW(inode) (0)
8111 +# define IS_COW_LINK(inode) (0)
8114 /* the read-only stuff doesn't really belong here, but any other place is
8115 probably as bad and I don't want to create yet another include file. */
8117 @@ -378,11 +402,14 @@ struct inodes_stat_t {
8118 #define FS_EXTENT_FL 0x00080000 /* Extents */
8119 #define FS_DIRECTIO_FL 0x00100000 /* Use direct i/o */
8120 #define FS_NOCOW_FL 0x00800000 /* Do not cow file */
8121 +#define FS_IXUNLINK_FL 0x08000000 /* Immutable invert on unlink */
8122 #define FS_RESERVED_FL 0x80000000 /* reserved for ext2 lib */
8124 -#define FS_FL_USER_VISIBLE 0x0003DFFF /* User visible flags */
8125 -#define FS_FL_USER_MODIFIABLE 0x000380FF /* User modifiable flags */
8126 +#define FS_BARRIER_FL 0x04000000 /* Barrier for chroot() */
8127 +#define FS_COW_FL 0x20000000 /* Copy on Write marker */
8129 +#define FS_FL_USER_VISIBLE 0x0103DFFF /* User visible flags */
8130 +#define FS_FL_USER_MODIFIABLE 0x010380FF /* User modifiable flags */
8132 #define SYNC_FILE_RANGE_WAIT_BEFORE 1
8133 #define SYNC_FILE_RANGE_WRITE 2
8134 @@ -466,6 +493,7 @@ typedef void (dio_iodone_t)(struct kiocb
8135 #define ATTR_KILL_PRIV (1 << 14)
8136 #define ATTR_OPEN (1 << 15) /* Truncating from open(O_TRUNC) */
8137 #define ATTR_TIMES_SET (1 << 16)
8138 +#define ATTR_TAG (1 << 17)
8141 * This is the Inode Attributes structure, used for notify_change(). It
8142 @@ -481,6 +509,7 @@ struct iattr {
8148 struct timespec ia_atime;
8149 struct timespec ia_mtime;
8150 @@ -494,6 +523,9 @@ struct iattr {
8151 struct file *ia_file;
8154 +#define ATTR_FLAG_BARRIER 512 /* Barrier for chroot() */
8155 +#define ATTR_FLAG_IXUNLINK 1024 /* Immutable invert on unlink */
8158 * Includes for diskquotas.
8160 @@ -773,7 +805,9 @@ struct inode {
8161 unsigned short i_opflags;
8164 - unsigned int i_flags;
8166 + unsigned short i_flags;
8167 + unsigned short i_vflags;
8169 #ifdef CONFIG_FS_POSIX_ACL
8170 struct posix_acl *i_acl;
8171 @@ -802,6 +836,7 @@ struct inode {
8172 unsigned int __i_nlink;
8177 struct timespec i_atime;
8178 struct timespec i_mtime;
8179 @@ -964,12 +999,12 @@ static inline void i_gid_write(struct in
8181 static inline unsigned iminor(const struct inode *inode)
8183 - return MINOR(inode->i_rdev);
8184 + return MINOR(inode->i_mdev);
8187 static inline unsigned imajor(const struct inode *inode)
8189 - return MAJOR(inode->i_rdev);
8190 + return MAJOR(inode->i_mdev);
8193 extern struct block_device *I_BDEV(struct inode *inode);
8194 @@ -1036,6 +1071,7 @@ struct file {
8196 struct fown_struct f_owner;
8197 const struct cred *f_cred;
8199 struct file_ra_state f_ra;
8202 @@ -1183,6 +1219,7 @@ struct file_lock {
8203 struct file *fl_file;
8208 struct fasync_struct * fl_fasync; /* for lease break notifications */
8209 /* for lease breaks: */
8210 @@ -1690,6 +1727,7 @@ struct inode_operations {
8211 ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t);
8212 ssize_t (*listxattr) (struct dentry *, char *, size_t);
8213 int (*removexattr) (struct dentry *, const char *);
8214 + int (*sync_flags) (struct inode *, int, int);
8215 int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start,
8217 int (*update_time)(struct inode *, struct timespec *, int);
8218 @@ -1708,6 +1746,7 @@ extern ssize_t vfs_readv(struct file *,
8219 unsigned long, loff_t *);
8220 extern ssize_t vfs_writev(struct file *, const struct iovec __user *,
8221 unsigned long, loff_t *);
8222 +ssize_t vfs_sendfile(struct file *, struct file *, loff_t *, size_t, loff_t);
8224 struct super_operations {
8225 struct inode *(*alloc_inode)(struct super_block *sb);
8226 @@ -2542,6 +2581,7 @@ extern int dcache_dir_open(struct inode
8227 extern int dcache_dir_close(struct inode *, struct file *);
8228 extern loff_t dcache_dir_lseek(struct file *, loff_t, int);
8229 extern int dcache_readdir(struct file *, void *, filldir_t);
8230 +extern int dcache_readdir_filter(struct file *, void *, filldir_t, int (*)(struct dentry *));
8231 extern int simple_setattr(struct dentry *, struct iattr *);
8232 extern int simple_getattr(struct vfsmount *, struct dentry *, struct kstat *);
8233 extern int simple_statfs(struct dentry *, struct kstatfs *);
8234 diff -NurpP --minimal linux-3.5/include/linux/gfs2_ondisk.h linux-3.5-vs2.3.4/include/linux/gfs2_ondisk.h
8235 --- linux-3.5/include/linux/gfs2_ondisk.h 2012-05-21 18:07:29.000000000 +0200
8236 +++ linux-3.5-vs2.3.4/include/linux/gfs2_ondisk.h 2012-07-23 01:45:55.000000000 +0200
8237 @@ -214,6 +214,9 @@ enum {
8241 + gfs2fl_IXUnlink = 16,
8242 + gfs2fl_Barrier = 17,
8244 gfs2fl_TruncInProg = 29,
8245 gfs2fl_InheritDirectio = 30,
8246 gfs2fl_InheritJdata = 31,
8247 @@ -230,6 +233,9 @@ enum {
8248 #define GFS2_DIF_NOATIME 0x00000080
8249 #define GFS2_DIF_SYNC 0x00000100
8250 #define GFS2_DIF_SYSTEM 0x00000200 /* New in gfs2 */
8251 +#define GFS2_DIF_IXUNLINK 0x00010000
8252 +#define GFS2_DIF_BARRIER 0x00020000
8253 +#define GFS2_DIF_COW 0x00040000
8254 #define GFS2_DIF_TRUNC_IN_PROG 0x20000000 /* New in gfs2 */
8255 #define GFS2_DIF_INHERIT_DIRECTIO 0x40000000
8256 #define GFS2_DIF_INHERIT_JDATA 0x80000000
8257 diff -NurpP --minimal linux-3.5/include/linux/if_tun.h linux-3.5-vs2.3.4/include/linux/if_tun.h
8258 --- linux-3.5/include/linux/if_tun.h 2010-08-02 16:52:54.000000000 +0200
8259 +++ linux-3.5-vs2.3.4/include/linux/if_tun.h 2012-07-23 01:45:55.000000000 +0200
8261 #define TUNDETACHFILTER _IOW('T', 214, struct sock_fprog)
8262 #define TUNGETVNETHDRSZ _IOR('T', 215, int)
8263 #define TUNSETVNETHDRSZ _IOW('T', 216, int)
8264 +#define TUNSETNID _IOW('T', 217, int)
8266 /* TUNSETIFF ifr flags */
8267 #define IFF_TUN 0x0001
8268 diff -NurpP --minimal linux-3.5/include/linux/init_task.h linux-3.5-vs2.3.4/include/linux/init_task.h
8269 --- linux-3.5/include/linux/init_task.h 2012-07-22 23:39:43.000000000 +0200
8270 +++ linux-3.5-vs2.3.4/include/linux/init_task.h 2012-07-23 01:45:55.000000000 +0200
8271 @@ -200,6 +200,10 @@ extern struct cred init_cred;
8272 INIT_TRACE_RECURSION \
8273 INIT_TASK_RCU_PREEMPT(tsk) \
8276 + .vx_info = NULL, \
8278 + .nx_info = NULL, \
8282 diff -NurpP --minimal linux-3.5/include/linux/ipc.h linux-3.5-vs2.3.4/include/linux/ipc.h
8283 --- linux-3.5/include/linux/ipc.h 2012-03-19 19:47:28.000000000 +0100
8284 +++ linux-3.5-vs2.3.4/include/linux/ipc.h 2012-07-23 01:45:55.000000000 +0200
8285 @@ -91,6 +91,7 @@ struct kern_ipc_perm
8293 diff -NurpP --minimal linux-3.5/include/linux/ipc_namespace.h linux-3.5-vs2.3.4/include/linux/ipc_namespace.h
8294 --- linux-3.5/include/linux/ipc_namespace.h 2012-07-22 23:39:43.000000000 +0200
8295 +++ linux-3.5-vs2.3.4/include/linux/ipc_namespace.h 2012-07-23 01:45:55.000000000 +0200
8296 @@ -133,7 +133,8 @@ static inline int mq_init_ns(struct ipc_
8298 #if defined(CONFIG_IPC_NS)
8299 extern struct ipc_namespace *copy_ipcs(unsigned long flags,
8300 - struct task_struct *tsk);
8301 + struct ipc_namespace *old_ns,
8302 + struct user_namespace *user_ns);
8303 static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns)
8306 @@ -144,12 +145,13 @@ static inline struct ipc_namespace *get_
8307 extern void put_ipc_ns(struct ipc_namespace *ns);
8309 static inline struct ipc_namespace *copy_ipcs(unsigned long flags,
8310 - struct task_struct *tsk)
8311 + struct ipc_namespace *old_ns,
8312 + struct user_namespace *user_ns)
8314 if (flags & CLONE_NEWIPC)
8315 return ERR_PTR(-EINVAL);
8317 - return tsk->nsproxy->ipc_ns;
8321 static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns)
8322 diff -NurpP --minimal linux-3.5/include/linux/loop.h linux-3.5-vs2.3.4/include/linux/loop.h
8323 --- linux-3.5/include/linux/loop.h 2012-01-09 16:14:58.000000000 +0100
8324 +++ linux-3.5-vs2.3.4/include/linux/loop.h 2012-07-23 01:45:55.000000000 +0200
8325 @@ -45,6 +45,7 @@ struct loop_device {
8326 struct loop_func_table *lo_encryption;
8328 uid_t lo_key_owner; /* Who set the key */
8330 int (*ioctl)(struct loop_device *, int cmd,
8333 diff -NurpP --minimal linux-3.5/include/linux/magic.h linux-3.5-vs2.3.4/include/linux/magic.h
8334 --- linux-3.5/include/linux/magic.h 2012-05-21 18:07:31.000000000 +0200
8335 +++ linux-3.5-vs2.3.4/include/linux/magic.h 2012-07-23 01:45:55.000000000 +0200
8338 #define ADFS_SUPER_MAGIC 0xadf5
8339 #define AFFS_SUPER_MAGIC 0xadff
8340 -#define AFS_SUPER_MAGIC 0x5346414F
8341 +#define AFS_SUPER_MAGIC 0x5346414F
8342 #define AUTOFS_SUPER_MAGIC 0x0187
8343 #define CODA_SUPER_MAGIC 0x73757245
8344 #define CRAMFS_MAGIC 0x28cd3d45 /* some random number */
8345 diff -NurpP --minimal linux-3.5/include/linux/major.h linux-3.5-vs2.3.4/include/linux/major.h
8346 --- linux-3.5/include/linux/major.h 2009-09-10 15:26:25.000000000 +0200
8347 +++ linux-3.5-vs2.3.4/include/linux/major.h 2012-07-23 01:45:55.000000000 +0200
8349 #define HD_MAJOR IDE0_MAJOR
8350 #define PTY_SLAVE_MAJOR 3
8352 +#define VROOT_MAJOR 4
8353 #define TTYAUX_MAJOR 5
8356 diff -NurpP --minimal linux-3.5/include/linux/memcontrol.h linux-3.5-vs2.3.4/include/linux/memcontrol.h
8357 --- linux-3.5/include/linux/memcontrol.h 2012-07-22 23:39:43.000000000 +0200
8358 +++ linux-3.5-vs2.3.4/include/linux/memcontrol.h 2012-07-23 01:45:55.000000000 +0200
8359 @@ -85,6 +85,13 @@ extern struct mem_cgroup *try_get_mem_cg
8360 extern struct mem_cgroup *parent_mem_cgroup(struct mem_cgroup *memcg);
8361 extern struct mem_cgroup *mem_cgroup_from_cont(struct cgroup *cont);
8363 +extern u64 mem_cgroup_res_read_u64(struct mem_cgroup *mem, int member);
8364 +extern u64 mem_cgroup_memsw_read_u64(struct mem_cgroup *mem, int member);
8366 +extern s64 mem_cgroup_stat_read_cache(struct mem_cgroup *mem);
8367 +extern s64 mem_cgroup_stat_read_anon(struct mem_cgroup *mem);
8368 +extern s64 mem_cgroup_stat_read_mapped(struct mem_cgroup *mem);
8371 int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup)
8373 diff -NurpP --minimal linux-3.5/include/linux/mm_types.h linux-3.5-vs2.3.4/include/linux/mm_types.h
8374 --- linux-3.5/include/linux/mm_types.h 2012-07-22 23:39:44.000000000 +0200
8375 +++ linux-3.5-vs2.3.4/include/linux/mm_types.h 2012-07-23 01:45:55.000000000 +0200
8376 @@ -354,6 +354,7 @@ struct mm_struct {
8378 /* Architecture-specific MM context */
8379 mm_context_t context;
8380 + struct vx_info *mm_vx_info;
8382 unsigned long flags; /* Must use atomic bitops to access the bits */
8384 diff -NurpP --minimal linux-3.5/include/linux/mmzone.h linux-3.5-vs2.3.4/include/linux/mmzone.h
8385 --- linux-3.5/include/linux/mmzone.h 2012-07-22 23:39:44.000000000 +0200
8386 +++ linux-3.5-vs2.3.4/include/linux/mmzone.h 2012-07-23 01:45:55.000000000 +0200
8387 @@ -715,6 +715,13 @@ typedef struct pglist_data {
8388 __pgdat->node_start_pfn + __pgdat->node_spanned_pages;\
8391 +#define node_start_pfn(nid) (NODE_DATA(nid)->node_start_pfn)
8393 +#define node_end_pfn(nid) ({\
8394 + pg_data_t *__pgdat = NODE_DATA(nid);\
8395 + __pgdat->node_start_pfn + __pgdat->node_spanned_pages;\
8398 #include <linux/memory_hotplug.h>
8400 extern struct mutex zonelists_mutex;
8401 diff -NurpP --minimal linux-3.5/include/linux/mount.h linux-3.5-vs2.3.4/include/linux/mount.h
8402 --- linux-3.5/include/linux/mount.h 2012-03-19 19:47:28.000000000 +0100
8403 +++ linux-3.5-vs2.3.4/include/linux/mount.h 2012-07-23 01:45:55.000000000 +0200
8404 @@ -47,6 +47,9 @@ struct mnt_namespace;
8406 #define MNT_INTERNAL 0x4000
8408 +#define MNT_TAGID 0x10000
8409 +#define MNT_NOTAG 0x20000
8412 struct dentry *mnt_root; /* root of the mounted tree */
8413 struct super_block *mnt_sb; /* pointer to superblock */
8414 diff -NurpP --minimal linux-3.5/include/linux/net.h linux-3.5-vs2.3.4/include/linux/net.h
8415 --- linux-3.5/include/linux/net.h 2012-07-22 23:39:44.000000000 +0200
8416 +++ linux-3.5-vs2.3.4/include/linux/net.h 2012-07-23 01:45:55.000000000 +0200
8417 @@ -72,6 +72,7 @@ struct net;
8418 #define SOCK_NOSPACE 2
8419 #define SOCK_PASSCRED 3
8420 #define SOCK_PASSSEC 4
8421 +#define SOCK_USER_SOCKET 5
8423 #ifndef ARCH_HAS_SOCKET_TYPES
8425 diff -NurpP --minimal linux-3.5/include/linux/netdevice.h linux-3.5-vs2.3.4/include/linux/netdevice.h
8426 --- linux-3.5/include/linux/netdevice.h 2012-07-22 23:39:44.000000000 +0200
8427 +++ linux-3.5-vs2.3.4/include/linux/netdevice.h 2012-07-23 01:45:55.000000000 +0200
8428 @@ -1644,6 +1644,7 @@ extern void netdev_resync_ops(struct ne
8430 extern struct net_device *dev_get_by_index(struct net *net, int ifindex);
8431 extern struct net_device *__dev_get_by_index(struct net *net, int ifindex);
8432 +extern struct net_device *dev_get_by_index_real_rcu(struct net *net, int ifindex);
8433 extern struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex);
8434 extern int dev_restart(struct net_device *dev);
8435 #ifdef CONFIG_NETPOLL_TRAP
8436 diff -NurpP --minimal linux-3.5/include/linux/nfs_mount.h linux-3.5-vs2.3.4/include/linux/nfs_mount.h
8437 --- linux-3.5/include/linux/nfs_mount.h 2011-01-05 21:50:31.000000000 +0100
8438 +++ linux-3.5-vs2.3.4/include/linux/nfs_mount.h 2012-07-23 01:45:55.000000000 +0200
8439 @@ -63,7 +63,8 @@ struct nfs_mount_data {
8440 #define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 */
8441 #define NFS_MOUNT_NORDIRPLUS 0x4000 /* 5 */
8442 #define NFS_MOUNT_UNSHARED 0x8000 /* 5 */
8443 -#define NFS_MOUNT_FLAGMASK 0xFFFF
8444 +#define NFS_MOUNT_TAGGED 0x10000 /* context tagging */
8445 +#define NFS_MOUNT_FLAGMASK 0x1FFFF
8447 /* The following are for internal use only */
8448 #define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000
8449 diff -NurpP --minimal linux-3.5/include/linux/nsproxy.h linux-3.5-vs2.3.4/include/linux/nsproxy.h
8450 --- linux-3.5/include/linux/nsproxy.h 2011-10-24 18:45:32.000000000 +0200
8451 +++ linux-3.5-vs2.3.4/include/linux/nsproxy.h 2012-07-23 01:45:55.000000000 +0200
8454 #include <linux/spinlock.h>
8455 #include <linux/sched.h>
8456 +#include <linux/vserver/debug.h>
8458 struct mnt_namespace;
8459 struct uts_namespace;
8460 @@ -63,6 +64,7 @@ static inline struct nsproxy *task_nspro
8463 int copy_namespaces(unsigned long flags, struct task_struct *tsk);
8464 +struct nsproxy *copy_nsproxy(struct nsproxy *orig);
8465 void exit_task_namespaces(struct task_struct *tsk);
8466 void switch_task_namespaces(struct task_struct *tsk, struct nsproxy *new);
8467 void free_nsproxy(struct nsproxy *ns);
8468 @@ -70,16 +72,26 @@ int unshare_nsproxy_namespaces(unsigned
8469 struct fs_struct *);
8470 int __init nsproxy_cache_init(void);
8472 -static inline void put_nsproxy(struct nsproxy *ns)
8473 +#define get_nsproxy(n) __get_nsproxy(n, __FILE__, __LINE__)
8475 +static inline void __get_nsproxy(struct nsproxy *ns,
8476 + const char *_file, int _line)
8478 - if (atomic_dec_and_test(&ns->count)) {
8481 + vxlprintk(VXD_CBIT(space, 0), "get_nsproxy(%p[%u])",
8482 + ns, atomic_read(&ns->count), _file, _line);
8483 + atomic_inc(&ns->count);
8486 -static inline void get_nsproxy(struct nsproxy *ns)
8487 +#define put_nsproxy(n) __put_nsproxy(n, __FILE__, __LINE__)
8489 +static inline void __put_nsproxy(struct nsproxy *ns,
8490 + const char *_file, int _line)
8492 - atomic_inc(&ns->count);
8493 + vxlprintk(VXD_CBIT(space, 0), "put_nsproxy(%p[%u])",
8494 + ns, atomic_read(&ns->count), _file, _line);
8495 + if (atomic_dec_and_test(&ns->count)) {
8501 diff -NurpP --minimal linux-3.5/include/linux/pid.h linux-3.5-vs2.3.4/include/linux/pid.h
8502 --- linux-3.5/include/linux/pid.h 2011-07-22 11:18:11.000000000 +0200
8503 +++ linux-3.5-vs2.3.4/include/linux/pid.h 2012-07-23 01:45:55.000000000 +0200
8504 @@ -8,7 +8,8 @@ enum pid_type
8514 @@ -171,6 +172,7 @@ static inline pid_t pid_nr(struct pid *p
8517 pid_t pid_nr_ns(struct pid *pid, struct pid_namespace *ns);
8518 +pid_t pid_unmapped_nr_ns(struct pid *pid, struct pid_namespace *ns);
8519 pid_t pid_vnr(struct pid *pid);
8521 #define do_each_pid_task(pid, type, task) \
8522 diff -NurpP --minimal linux-3.5/include/linux/proc_fs.h linux-3.5-vs2.3.4/include/linux/proc_fs.h
8523 --- linux-3.5/include/linux/proc_fs.h 2012-07-22 23:39:44.000000000 +0200
8524 +++ linux-3.5-vs2.3.4/include/linux/proc_fs.h 2012-07-23 10:20:57.000000000 +0200
8525 @@ -54,6 +54,7 @@ struct proc_dir_entry {
8531 const struct inode_operations *proc_iops;
8533 @@ -252,12 +253,18 @@ extern const struct proc_ns_operations n
8534 extern const struct proc_ns_operations utsns_operations;
8535 extern const struct proc_ns_operations ipcns_operations;
8541 int (*proc_get_link)(struct dentry *, struct path *);
8542 int (*proc_read)(struct task_struct *task, char *page);
8543 int (*proc_show)(struct seq_file *m,
8544 struct pid_namespace *ns, struct pid *pid,
8545 struct task_struct *task);
8546 + int (*proc_vs_read)(char *page);
8547 + int (*proc_vxi_read)(struct vx_info *vxi, char *page);
8548 + int (*proc_nxi_read)(struct nx_info *nxi, char *page);
8551 struct ctl_table_header;
8552 @@ -265,6 +272,7 @@ struct ctl_table;
8559 struct proc_dir_entry *pde;
8560 diff -NurpP --minimal linux-3.5/include/linux/quotaops.h linux-3.5-vs2.3.4/include/linux/quotaops.h
8561 --- linux-3.5/include/linux/quotaops.h 2012-07-22 23:39:44.000000000 +0200
8562 +++ linux-3.5-vs2.3.4/include/linux/quotaops.h 2012-07-23 01:45:55.000000000 +0200
8564 #define _LINUX_QUOTAOPS_
8566 #include <linux/fs.h>
8567 +#include <linux/vs_dlimit.h>
8569 #define DQUOT_SPACE_WARN 0x1
8570 #define DQUOT_SPACE_RESERVE 0x2
8571 @@ -204,11 +205,12 @@ static inline void dquot_drop(struct ino
8573 static inline int dquot_alloc_inode(const struct inode *inode)
8576 + return dl_alloc_inode(inode);
8579 static inline void dquot_free_inode(const struct inode *inode)
8581 + dl_free_inode(inode);
8584 static inline int dquot_transfer(struct inode *inode, struct iattr *iattr)
8585 @@ -219,6 +221,10 @@ static inline int dquot_transfer(struct
8586 static inline int __dquot_alloc_space(struct inode *inode, qsize_t number,
8591 + if ((ret = dl_alloc_space(inode, number)))
8593 if (!(flags & DQUOT_SPACE_RESERVE))
8594 inode_add_bytes(inode, number);
8596 @@ -229,6 +235,7 @@ static inline void __dquot_free_space(st
8598 if (!(flags & DQUOT_SPACE_RESERVE))
8599 inode_sub_bytes(inode, number);
8600 + dl_free_space(inode, number);
8603 static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
8604 diff -NurpP --minimal linux-3.5/include/linux/reboot.h linux-3.5-vs2.3.4/include/linux/reboot.h
8605 --- linux-3.5/include/linux/reboot.h 2011-10-24 18:45:32.000000000 +0200
8606 +++ linux-3.5-vs2.3.4/include/linux/reboot.h 2012-07-23 01:45:55.000000000 +0200
8608 #define LINUX_REBOOT_CMD_RESTART2 0xA1B2C3D4
8609 #define LINUX_REBOOT_CMD_SW_SUSPEND 0xD000FCE2
8610 #define LINUX_REBOOT_CMD_KEXEC 0x45584543
8611 +#define LINUX_REBOOT_CMD_OOM 0xDEADBEEF
8615 diff -NurpP --minimal linux-3.5/include/linux/sched.h linux-3.5-vs2.3.4/include/linux/sched.h
8616 --- linux-3.5/include/linux/sched.h 2012-07-22 23:39:44.000000000 +0200
8617 +++ linux-3.5-vs2.3.4/include/linux/sched.h 2012-07-23 01:45:55.000000000 +0200
8618 @@ -1414,6 +1414,14 @@ struct task_struct {
8620 struct seccomp seccomp;
8622 +/* vserver context data */
8623 + struct vx_info *vx_info;
8624 + struct nx_info *nx_info;
8630 /* Thread group tracking */
8633 @@ -1662,6 +1670,11 @@ struct pid_namespace;
8634 pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
8635 struct pid_namespace *ns);
8637 +#include <linux/vserver/base.h>
8638 +#include <linux/vserver/context.h>
8639 +#include <linux/vserver/debug.h>
8640 +#include <linux/vserver/pid.h>
8642 static inline pid_t task_pid_nr(struct task_struct *tsk)
8645 @@ -1675,7 +1688,8 @@ static inline pid_t task_pid_nr_ns(struc
8647 static inline pid_t task_pid_vnr(struct task_struct *tsk)
8649 - return __task_pid_nr_ns(tsk, PIDTYPE_PID, NULL);
8650 + // return __task_pid_nr_ns(tsk, PIDTYPE_PID, NULL);
8651 + return vx_map_pid(__task_pid_nr_ns(tsk, PIDTYPE_PID, NULL));
8655 @@ -1688,7 +1702,7 @@ pid_t task_tgid_nr_ns(struct task_struct
8657 static inline pid_t task_tgid_vnr(struct task_struct *tsk)
8659 - return pid_vnr(task_tgid(tsk));
8660 + return vx_map_tgid(pid_vnr(task_tgid(tsk)));
8664 diff -NurpP --minimal linux-3.5/include/linux/shmem_fs.h linux-3.5-vs2.3.4/include/linux/shmem_fs.h
8665 --- linux-3.5/include/linux/shmem_fs.h 2012-07-22 23:39:44.000000000 +0200
8666 +++ linux-3.5-vs2.3.4/include/linux/shmem_fs.h 2012-07-23 01:45:55.000000000 +0200
8669 /* inode in-kernel data */
8671 +#define TMPFS_SUPER_MAGIC 0x01021994
8674 struct shmem_inode_info {
8676 unsigned long flags;
8677 diff -NurpP --minimal linux-3.5/include/linux/stat.h linux-3.5-vs2.3.4/include/linux/stat.h
8678 --- linux-3.5/include/linux/stat.h 2012-07-22 23:39:44.000000000 +0200
8679 +++ linux-3.5-vs2.3.4/include/linux/stat.h 2012-07-23 10:23:18.000000000 +0200
8680 @@ -67,6 +67,7 @@ struct kstat {
8687 struct timespec atime;
8688 diff -NurpP --minimal linux-3.5/include/linux/sunrpc/auth.h linux-3.5-vs2.3.4/include/linux/sunrpc/auth.h
8689 --- linux-3.5/include/linux/sunrpc/auth.h 2012-05-21 18:07:32.000000000 +0200
8690 +++ linux-3.5-vs2.3.4/include/linux/sunrpc/auth.h 2012-07-23 01:45:55.000000000 +0200
8696 struct group_info *group_info;
8697 const char *principal;
8698 unsigned char machine_cred : 1;
8699 diff -NurpP --minimal linux-3.5/include/linux/sunrpc/clnt.h linux-3.5-vs2.3.4/include/linux/sunrpc/clnt.h
8700 --- linux-3.5/include/linux/sunrpc/clnt.h 2012-05-21 18:07:32.000000000 +0200
8701 +++ linux-3.5-vs2.3.4/include/linux/sunrpc/clnt.h 2012-07-23 01:45:55.000000000 +0200
8702 @@ -49,7 +49,8 @@ struct rpc_clnt {
8703 unsigned int cl_softrtry : 1,/* soft timeouts */
8704 cl_discrtry : 1,/* disconnect before retry */
8705 cl_autobind : 1,/* use getport() */
8706 - cl_chatty : 1;/* be verbose */
8707 + cl_chatty : 1,/* be verbose */
8708 + cl_tag : 1;/* context tagging */
8710 struct rpc_rtt * cl_rtt; /* RTO estimator data */
8711 const struct rpc_timeout *cl_timeout; /* Timeout strategy */
8712 diff -NurpP --minimal linux-3.5/include/linux/sysctl.h linux-3.5-vs2.3.4/include/linux/sysctl.h
8713 --- linux-3.5/include/linux/sysctl.h 2012-05-21 18:07:32.000000000 +0200
8714 +++ linux-3.5-vs2.3.4/include/linux/sysctl.h 2012-07-23 01:45:55.000000000 +0200
8715 @@ -60,6 +60,7 @@ enum
8716 CTL_ABI=9, /* Binary emulation */
8717 CTL_CPU=10, /* CPU stuff (speed scaling, etc) */
8718 CTL_ARLAN=254, /* arlan wireless driver */
8719 + CTL_VSERVER=4242, /* Linux-VServer debug */
8720 CTL_S390DBF=5677, /* s390 debug */
8721 CTL_SUNRPC=7249, /* sunrpc debug */
8722 CTL_PM=9899, /* frv power management */
8723 @@ -94,6 +95,7 @@ enum
8725 KERN_PANIC=15, /* int: panic timeout */
8726 KERN_REALROOTDEV=16, /* real root device to mount after initrd */
8727 + KERN_VSHELPER=17, /* string: path to vshelper policy agent */
8729 KERN_SPARC_REBOOT=21, /* reboot command on Sparc */
8730 KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */
8731 diff -NurpP --minimal linux-3.5/include/linux/sysfs.h linux-3.5-vs2.3.4/include/linux/sysfs.h
8732 --- linux-3.5/include/linux/sysfs.h 2012-07-22 23:39:44.000000000 +0200
8733 +++ linux-3.5-vs2.3.4/include/linux/sysfs.h 2012-07-23 01:45:55.000000000 +0200
8735 #include <linux/kobject_ns.h>
8736 #include <linux/atomic.h>
8738 +#define SYSFS_SUPER_MAGIC 0x62656572
8743 diff -NurpP --minimal linux-3.5/include/linux/time.h linux-3.5-vs2.3.4/include/linux/time.h
8744 --- linux-3.5/include/linux/time.h 2012-07-22 23:39:45.000000000 +0200
8745 +++ linux-3.5-vs2.3.4/include/linux/time.h 2012-07-23 01:45:55.000000000 +0200
8746 @@ -255,6 +255,8 @@ static __always_inline void timespec_add
8750 +#include <linux/vs_time.h>
8752 #endif /* __KERNEL__ */
8754 #define NFDBITS __NFDBITS
8755 diff -NurpP --minimal linux-3.5/include/linux/types.h linux-3.5-vs2.3.4/include/linux/types.h
8756 --- linux-3.5/include/linux/types.h 2012-07-22 23:39:45.000000000 +0200
8757 +++ linux-3.5-vs2.3.4/include/linux/types.h 2012-07-23 01:45:55.000000000 +0200
8758 @@ -41,6 +41,9 @@ typedef __kernel_uid32_t uid_t;
8759 typedef __kernel_gid32_t gid_t;
8760 typedef __kernel_uid16_t uid16_t;
8761 typedef __kernel_gid16_t gid16_t;
8762 +typedef unsigned int xid_t;
8763 +typedef unsigned int nid_t;
8764 +typedef unsigned int tag_t;
8766 typedef unsigned long uintptr_t;
8768 diff -NurpP --minimal linux-3.5/include/linux/utsname.h linux-3.5-vs2.3.4/include/linux/utsname.h
8769 --- linux-3.5/include/linux/utsname.h 2012-01-09 16:14:59.000000000 +0100
8770 +++ linux-3.5-vs2.3.4/include/linux/utsname.h 2012-07-23 01:45:55.000000000 +0200
8771 @@ -62,7 +62,8 @@ static inline void get_uts_ns(struct uts
8774 extern struct uts_namespace *copy_utsname(unsigned long flags,
8775 - struct task_struct *tsk);
8776 + struct uts_namespace *old_ns,
8777 + struct user_namespace *user_ns);
8778 extern void free_uts_ns(struct kref *kref);
8780 static inline void put_uts_ns(struct uts_namespace *ns)
8781 @@ -79,12 +80,13 @@ static inline void put_uts_ns(struct uts
8784 static inline struct uts_namespace *copy_utsname(unsigned long flags,
8785 - struct task_struct *tsk)
8786 + struct uts_namespace *old_ns,
8787 + struct user_namespace *user_ns)
8789 if (flags & CLONE_NEWUTS)
8790 return ERR_PTR(-EINVAL);
8792 - return tsk->nsproxy->uts_ns;
8797 diff -NurpP --minimal linux-3.5/include/linux/vroot.h linux-3.5-vs2.3.4/include/linux/vroot.h
8798 --- linux-3.5/include/linux/vroot.h 1970-01-01 01:00:00.000000000 +0100
8799 +++ linux-3.5-vs2.3.4/include/linux/vroot.h 2012-07-23 01:45:55.000000000 +0200
8803 + * include/linux/vroot.h
8805 + * written by Herbert Pötzl, 9/11/2002
8806 + * ported to 2.6 by Herbert Pötzl, 30/12/2004
8808 + * Copyright (C) 2002-2007 by Herbert Pötzl.
8809 + * Redistribution of this file is permitted under the
8810 + * GNU General Public License.
8813 +#ifndef _LINUX_VROOT_H
8814 +#define _LINUX_VROOT_H
8819 +/* Possible states of device */
8825 +struct vroot_device {
8829 + struct semaphore vr_ctl_mutex;
8830 + struct block_device *vr_device;
8835 +typedef struct block_device *(vroot_grb_func)(struct block_device *);
8837 +extern int register_vroot_grb(vroot_grb_func *);
8838 +extern int unregister_vroot_grb(vroot_grb_func *);
8840 +#endif /* __KERNEL__ */
8842 +#define MAX_VROOT_DEFAULT 8
8845 + * IOCTL commands --- we will commandeer 0x56 ('V')
8848 +#define VROOT_SET_DEV 0x5600
8849 +#define VROOT_CLR_DEV 0x5601
8851 +#endif /* _LINUX_VROOT_H */
8852 diff -NurpP --minimal linux-3.5/include/linux/vs_base.h linux-3.5-vs2.3.4/include/linux/vs_base.h
8853 --- linux-3.5/include/linux/vs_base.h 1970-01-01 01:00:00.000000000 +0100
8854 +++ linux-3.5-vs2.3.4/include/linux/vs_base.h 2012-07-23 01:45:55.000000000 +0200
8859 +#include "vserver/base.h"
8860 +#include "vserver/check.h"
8861 +#include "vserver/debug.h"
8864 +#warning duplicate inclusion
8866 diff -NurpP --minimal linux-3.5/include/linux/vs_context.h linux-3.5-vs2.3.4/include/linux/vs_context.h
8867 --- linux-3.5/include/linux/vs_context.h 1970-01-01 01:00:00.000000000 +0100
8868 +++ linux-3.5-vs2.3.4/include/linux/vs_context.h 2012-07-23 01:45:55.000000000 +0200
8870 +#ifndef _VS_CONTEXT_H
8871 +#define _VS_CONTEXT_H
8873 +#include "vserver/base.h"
8874 +#include "vserver/check.h"
8875 +#include "vserver/context.h"
8876 +#include "vserver/history.h"
8877 +#include "vserver/debug.h"
8879 +#include <linux/sched.h>
8882 +#define get_vx_info(i) __get_vx_info(i, __FILE__, __LINE__, __HERE__)
8884 +static inline struct vx_info *__get_vx_info(struct vx_info *vxi,
8885 + const char *_file, int _line, void *_here)
8890 + vxlprintk(VXD_CBIT(xid, 2), "get_vx_info(%p[#%d.%d])",
8891 + vxi, vxi ? vxi->vx_id : 0,
8892 + vxi ? atomic_read(&vxi->vx_usecnt) : 0,
8894 + __vxh_get_vx_info(vxi, _here);
8896 + atomic_inc(&vxi->vx_usecnt);
8901 +extern void free_vx_info(struct vx_info *);
8903 +#define put_vx_info(i) __put_vx_info(i, __FILE__, __LINE__, __HERE__)
8905 +static inline void __put_vx_info(struct vx_info *vxi,
8906 + const char *_file, int _line, void *_here)
8911 + vxlprintk(VXD_CBIT(xid, 2), "put_vx_info(%p[#%d.%d])",
8912 + vxi, vxi ? vxi->vx_id : 0,
8913 + vxi ? atomic_read(&vxi->vx_usecnt) : 0,
8915 + __vxh_put_vx_info(vxi, _here);
8917 + if (atomic_dec_and_test(&vxi->vx_usecnt))
8918 + free_vx_info(vxi);
8922 +#define init_vx_info(p, i) \
8923 + __init_vx_info(p, i, __FILE__, __LINE__, __HERE__)
8925 +static inline void __init_vx_info(struct vx_info **vxp, struct vx_info *vxi,
8926 + const char *_file, int _line, void *_here)
8929 + vxlprintk(VXD_CBIT(xid, 3),
8930 + "init_vx_info(%p[#%d.%d])",
8931 + vxi, vxi ? vxi->vx_id : 0,
8932 + vxi ? atomic_read(&vxi->vx_usecnt) : 0,
8934 + __vxh_init_vx_info(vxi, vxp, _here);
8936 + atomic_inc(&vxi->vx_usecnt);
8942 +#define set_vx_info(p, i) \
8943 + __set_vx_info(p, i, __FILE__, __LINE__, __HERE__)
8945 +static inline void __set_vx_info(struct vx_info **vxp, struct vx_info *vxi,
8946 + const char *_file, int _line, void *_here)
8948 + struct vx_info *vxo;
8953 + vxlprintk(VXD_CBIT(xid, 3), "set_vx_info(%p[#%d.%d])",
8954 + vxi, vxi ? vxi->vx_id : 0,
8955 + vxi ? atomic_read(&vxi->vx_usecnt) : 0,
8957 + __vxh_set_vx_info(vxi, vxp, _here);
8959 + atomic_inc(&vxi->vx_usecnt);
8960 + vxo = xchg(vxp, vxi);
8965 +#define clr_vx_info(p) __clr_vx_info(p, __FILE__, __LINE__, __HERE__)
8967 +static inline void __clr_vx_info(struct vx_info **vxp,
8968 + const char *_file, int _line, void *_here)
8970 + struct vx_info *vxo;
8972 + vxo = xchg(vxp, NULL);
8976 + vxlprintk(VXD_CBIT(xid, 3), "clr_vx_info(%p[#%d.%d])",
8977 + vxo, vxo ? vxo->vx_id : 0,
8978 + vxo ? atomic_read(&vxo->vx_usecnt) : 0,
8980 + __vxh_clr_vx_info(vxo, vxp, _here);
8982 + if (atomic_dec_and_test(&vxo->vx_usecnt))
8983 + free_vx_info(vxo);
8987 +#define claim_vx_info(v, p) \
8988 + __claim_vx_info(v, p, __FILE__, __LINE__, __HERE__)
8990 +static inline void __claim_vx_info(struct vx_info *vxi,
8991 + struct task_struct *task,
8992 + const char *_file, int _line, void *_here)
8994 + vxlprintk(VXD_CBIT(xid, 3), "claim_vx_info(%p[#%d.%d.%d]) %p",
8995 + vxi, vxi ? vxi->vx_id : 0,
8996 + vxi ? atomic_read(&vxi->vx_usecnt) : 0,
8997 + vxi ? atomic_read(&vxi->vx_tasks) : 0,
8998 + task, _file, _line);
8999 + __vxh_claim_vx_info(vxi, task, _here);
9001 + atomic_inc(&vxi->vx_tasks);
9005 +extern void unhash_vx_info(struct vx_info *);
9007 +#define release_vx_info(v, p) \
9008 + __release_vx_info(v, p, __FILE__, __LINE__, __HERE__)
9010 +static inline void __release_vx_info(struct vx_info *vxi,
9011 + struct task_struct *task,
9012 + const char *_file, int _line, void *_here)
9014 + vxlprintk(VXD_CBIT(xid, 3), "release_vx_info(%p[#%d.%d.%d]) %p",
9015 + vxi, vxi ? vxi->vx_id : 0,
9016 + vxi ? atomic_read(&vxi->vx_usecnt) : 0,
9017 + vxi ? atomic_read(&vxi->vx_tasks) : 0,
9018 + task, _file, _line);
9019 + __vxh_release_vx_info(vxi, task, _here);
9023 + if (atomic_dec_and_test(&vxi->vx_tasks))
9024 + unhash_vx_info(vxi);
9028 +#define task_get_vx_info(p) \
9029 + __task_get_vx_info(p, __FILE__, __LINE__, __HERE__)
9031 +static inline struct vx_info *__task_get_vx_info(struct task_struct *p,
9032 + const char *_file, int _line, void *_here)
9034 + struct vx_info *vxi;
9037 + vxlprintk(VXD_CBIT(xid, 5), "task_get_vx_info(%p)",
9039 + vxi = __get_vx_info(p->vx_info, _file, _line, _here);
9045 +static inline void __wakeup_vx_info(struct vx_info *vxi)
9047 + if (waitqueue_active(&vxi->vx_wait))
9048 + wake_up_interruptible(&vxi->vx_wait);
9052 +#define enter_vx_info(v, s) __enter_vx_info(v, s, __FILE__, __LINE__)
9054 +static inline void __enter_vx_info(struct vx_info *vxi,
9055 + struct vx_info_save *vxis, const char *_file, int _line)
9057 + vxlprintk(VXD_CBIT(xid, 5), "enter_vx_info(%p[#%d],%p) %p[#%d,%p]",
9058 + vxi, vxi ? vxi->vx_id : 0, vxis, current,
9059 + current->xid, current->vx_info, _file, _line);
9060 + vxis->vxi = xchg(¤t->vx_info, vxi);
9061 + vxis->xid = current->xid;
9062 + current->xid = vxi ? vxi->vx_id : 0;
9065 +#define leave_vx_info(s) __leave_vx_info(s, __FILE__, __LINE__)
9067 +static inline void __leave_vx_info(struct vx_info_save *vxis,
9068 + const char *_file, int _line)
9070 + vxlprintk(VXD_CBIT(xid, 5), "leave_vx_info(%p[#%d,%p]) %p[#%d,%p]",
9071 + vxis, vxis->xid, vxis->vxi, current,
9072 + current->xid, current->vx_info, _file, _line);
9073 + (void)xchg(¤t->vx_info, vxis->vxi);
9074 + current->xid = vxis->xid;
9078 +static inline void __enter_vx_admin(struct vx_info_save *vxis)
9080 + vxis->vxi = xchg(¤t->vx_info, NULL);
9081 + vxis->xid = xchg(¤t->xid, (xid_t)0);
9084 +static inline void __leave_vx_admin(struct vx_info_save *vxis)
9086 + (void)xchg(¤t->xid, vxis->xid);
9087 + (void)xchg(¤t->vx_info, vxis->vxi);
9090 +#define task_is_init(p) \
9091 + __task_is_init(p, __FILE__, __LINE__, __HERE__)
9093 +static inline int __task_is_init(struct task_struct *p,
9094 + const char *_file, int _line, void *_here)
9096 + int is_init = is_global_init(p);
9100 + is_init = p->vx_info->vx_initpid == p->pid;
9105 +extern void exit_vx_info(struct task_struct *, int);
9106 +extern void exit_vx_info_early(struct task_struct *, int);
9110 +#warning duplicate inclusion
9112 diff -NurpP --minimal linux-3.5/include/linux/vs_cowbl.h linux-3.5-vs2.3.4/include/linux/vs_cowbl.h
9113 --- linux-3.5/include/linux/vs_cowbl.h 1970-01-01 01:00:00.000000000 +0100
9114 +++ linux-3.5-vs2.3.4/include/linux/vs_cowbl.h 2012-07-23 01:45:55.000000000 +0200
9116 +#ifndef _VS_COWBL_H
9117 +#define _VS_COWBL_H
9119 +#include <linux/fs.h>
9120 +#include <linux/dcache.h>
9121 +#include <linux/namei.h>
9122 +#include <linux/slab.h>
9124 +extern struct dentry *cow_break_link(const char *pathname);
9126 +static inline int cow_check_and_break(struct path *path)
9128 + struct inode *inode = path->dentry->d_inode;
9131 + /* do we need this check? */
9132 + if (IS_RDONLY(inode))
9135 + if (IS_COW(inode)) {
9136 + if (IS_COW_LINK(inode)) {
9137 + struct dentry *new_dentry, *old_dentry = path->dentry;
9140 + buf = kmalloc(PATH_MAX, GFP_KERNEL);
9144 + pp = d_path(path, buf, PATH_MAX);
9145 + new_dentry = cow_break_link(pp);
9147 + if (!IS_ERR(new_dentry)) {
9148 + path->dentry = new_dentry;
9151 + error = PTR_ERR(new_dentry);
9153 + inode->i_flags &= ~(S_IXUNLINK | S_IMMUTABLE);
9154 + inode->i_ctime = CURRENT_TIME;
9155 + mark_inode_dirty(inode);
9162 +#warning duplicate inclusion
9164 diff -NurpP --minimal linux-3.5/include/linux/vs_cvirt.h linux-3.5-vs2.3.4/include/linux/vs_cvirt.h
9165 --- linux-3.5/include/linux/vs_cvirt.h 1970-01-01 01:00:00.000000000 +0100
9166 +++ linux-3.5-vs2.3.4/include/linux/vs_cvirt.h 2012-07-23 01:45:55.000000000 +0200
9168 +#ifndef _VS_CVIRT_H
9169 +#define _VS_CVIRT_H
9171 +#include "vserver/cvirt.h"
9172 +#include "vserver/context.h"
9173 +#include "vserver/base.h"
9174 +#include "vserver/check.h"
9175 +#include "vserver/debug.h"
9178 +static inline void vx_activate_task(struct task_struct *p)
9180 + struct vx_info *vxi;
9182 + if ((vxi = p->vx_info)) {
9183 + vx_update_load(vxi);
9184 + atomic_inc(&vxi->cvirt.nr_running);
9188 +static inline void vx_deactivate_task(struct task_struct *p)
9190 + struct vx_info *vxi;
9192 + if ((vxi = p->vx_info)) {
9193 + vx_update_load(vxi);
9194 + atomic_dec(&vxi->cvirt.nr_running);
9198 +static inline void vx_uninterruptible_inc(struct task_struct *p)
9200 + struct vx_info *vxi;
9202 + if ((vxi = p->vx_info))
9203 + atomic_inc(&vxi->cvirt.nr_uninterruptible);
9206 +static inline void vx_uninterruptible_dec(struct task_struct *p)
9208 + struct vx_info *vxi;
9210 + if ((vxi = p->vx_info))
9211 + atomic_dec(&vxi->cvirt.nr_uninterruptible);
9216 +#warning duplicate inclusion
9218 diff -NurpP --minimal linux-3.5/include/linux/vs_device.h linux-3.5-vs2.3.4/include/linux/vs_device.h
9219 --- linux-3.5/include/linux/vs_device.h 1970-01-01 01:00:00.000000000 +0100
9220 +++ linux-3.5-vs2.3.4/include/linux/vs_device.h 2012-07-23 01:45:55.000000000 +0200
9222 +#ifndef _VS_DEVICE_H
9223 +#define _VS_DEVICE_H
9225 +#include "vserver/base.h"
9226 +#include "vserver/device.h"
9227 +#include "vserver/debug.h"
9230 +#ifdef CONFIG_VSERVER_DEVICE
9232 +int vs_map_device(struct vx_info *, dev_t, dev_t *, umode_t);
9234 +#define vs_device_perm(v, d, m, p) \
9235 + ((vs_map_device(current_vx_info(), d, NULL, m) & (p)) == (p))
9240 +int vs_map_device(struct vx_info *vxi,
9241 + dev_t device, dev_t *target, umode_t mode)
9248 +#define vs_device_perm(v, d, m, p) ((p) == (p))
9253 +#define vs_map_chrdev(d, t, p) \
9254 + ((vs_map_device(current_vx_info(), d, t, S_IFCHR) & (p)) == (p))
9255 +#define vs_map_blkdev(d, t, p) \
9256 + ((vs_map_device(current_vx_info(), d, t, S_IFBLK) & (p)) == (p))
9258 +#define vs_chrdev_perm(d, p) \
9259 + vs_device_perm(current_vx_info(), d, S_IFCHR, p)
9260 +#define vs_blkdev_perm(d, p) \
9261 + vs_device_perm(current_vx_info(), d, S_IFBLK, p)
9265 +#warning duplicate inclusion
9267 diff -NurpP --minimal linux-3.5/include/linux/vs_dlimit.h linux-3.5-vs2.3.4/include/linux/vs_dlimit.h
9268 --- linux-3.5/include/linux/vs_dlimit.h 1970-01-01 01:00:00.000000000 +0100
9269 +++ linux-3.5-vs2.3.4/include/linux/vs_dlimit.h 2012-07-23 01:45:55.000000000 +0200
9271 +#ifndef _VS_DLIMIT_H
9272 +#define _VS_DLIMIT_H
9274 +#include <linux/fs.h>
9276 +#include "vserver/dlimit.h"
9277 +#include "vserver/base.h"
9278 +#include "vserver/debug.h"
9281 +#define get_dl_info(i) __get_dl_info(i, __FILE__, __LINE__)
9283 +static inline struct dl_info *__get_dl_info(struct dl_info *dli,
9284 + const char *_file, int _line)
9288 + vxlprintk(VXD_CBIT(dlim, 4), "get_dl_info(%p[#%d.%d])",
9289 + dli, dli ? dli->dl_tag : 0,
9290 + dli ? atomic_read(&dli->dl_usecnt) : 0,
9292 + atomic_inc(&dli->dl_usecnt);
9297 +#define free_dl_info(i) \
9298 + call_rcu(&(i)->dl_rcu, rcu_free_dl_info)
9300 +#define put_dl_info(i) __put_dl_info(i, __FILE__, __LINE__)
9302 +static inline void __put_dl_info(struct dl_info *dli,
9303 + const char *_file, int _line)
9307 + vxlprintk(VXD_CBIT(dlim, 4), "put_dl_info(%p[#%d.%d])",
9308 + dli, dli ? dli->dl_tag : 0,
9309 + dli ? atomic_read(&dli->dl_usecnt) : 0,
9311 + if (atomic_dec_and_test(&dli->dl_usecnt))
9312 + free_dl_info(dli);
9316 +#define __dlimit_char(d) ((d) ? '*' : ' ')
9318 +static inline int __dl_alloc_space(struct super_block *sb,
9319 + tag_t tag, dlsize_t nr, const char *file, int line)
9321 + struct dl_info *dli = NULL;
9326 + dli = locate_dl_info(sb, tag);
9330 + spin_lock(&dli->dl_lock);
9331 + ret = (dli->dl_space_used + nr > dli->dl_space_total);
9333 + dli->dl_space_used += nr;
9334 + spin_unlock(&dli->dl_lock);
9337 + vxlprintk(VXD_CBIT(dlim, 1),
9338 + "ALLOC (%p,#%d)%c %lld bytes (%d)",
9339 + sb, tag, __dlimit_char(dli), (long long)nr,
9341 + return ret ? -ENOSPC : 0;
9344 +static inline void __dl_free_space(struct super_block *sb,
9345 + tag_t tag, dlsize_t nr, const char *_file, int _line)
9347 + struct dl_info *dli = NULL;
9351 + dli = locate_dl_info(sb, tag);
9355 + spin_lock(&dli->dl_lock);
9356 + if (dli->dl_space_used > nr)
9357 + dli->dl_space_used -= nr;
9359 + dli->dl_space_used = 0;
9360 + spin_unlock(&dli->dl_lock);
9363 + vxlprintk(VXD_CBIT(dlim, 1),
9364 + "FREE (%p,#%d)%c %lld bytes",
9365 + sb, tag, __dlimit_char(dli), (long long)nr,
9369 +static inline int __dl_alloc_inode(struct super_block *sb,
9370 + tag_t tag, const char *_file, int _line)
9372 + struct dl_info *dli;
9375 + dli = locate_dl_info(sb, tag);
9379 + spin_lock(&dli->dl_lock);
9380 + dli->dl_inodes_used++;
9381 + ret = (dli->dl_inodes_used > dli->dl_inodes_total);
9382 + spin_unlock(&dli->dl_lock);
9385 + vxlprintk(VXD_CBIT(dlim, 0),
9386 + "ALLOC (%p,#%d)%c inode (%d)",
9387 + sb, tag, __dlimit_char(dli), ret, _file, _line);
9388 + return ret ? -ENOSPC : 0;
9391 +static inline void __dl_free_inode(struct super_block *sb,
9392 + tag_t tag, const char *_file, int _line)
9394 + struct dl_info *dli;
9396 + dli = locate_dl_info(sb, tag);
9400 + spin_lock(&dli->dl_lock);
9401 + if (dli->dl_inodes_used > 1)
9402 + dli->dl_inodes_used--;
9404 + dli->dl_inodes_used = 0;
9405 + spin_unlock(&dli->dl_lock);
9408 + vxlprintk(VXD_CBIT(dlim, 0),
9409 + "FREE (%p,#%d)%c inode",
9410 + sb, tag, __dlimit_char(dli), _file, _line);
9413 +static inline void __dl_adjust_block(struct super_block *sb, tag_t tag,
9414 + unsigned long long *free_blocks, unsigned long long *root_blocks,
9415 + const char *_file, int _line)
9417 + struct dl_info *dli;
9418 + uint64_t broot, bfree;
9420 + dli = locate_dl_info(sb, tag);
9424 + spin_lock(&dli->dl_lock);
9425 + broot = (dli->dl_space_total -
9426 + (dli->dl_space_total >> 10) * dli->dl_nrlmult)
9427 + >> sb->s_blocksize_bits;
9428 + bfree = (dli->dl_space_total - dli->dl_space_used)
9429 + >> sb->s_blocksize_bits;
9430 + spin_unlock(&dli->dl_lock);
9432 + vxlprintk(VXD_CBIT(dlim, 2),
9433 + "ADJUST: %lld,%lld on %lld,%lld [mult=%d]",
9434 + (long long)bfree, (long long)broot,
9435 + *free_blocks, *root_blocks, dli->dl_nrlmult,
9437 + if (free_blocks) {
9438 + if (*free_blocks > bfree)
9439 + *free_blocks = bfree;
9441 + if (root_blocks) {
9442 + if (*root_blocks > broot)
9443 + *root_blocks = broot;
9448 +#define dl_prealloc_space(in, bytes) \
9449 + __dl_alloc_space((in)->i_sb, (in)->i_tag, (dlsize_t)(bytes), \
9450 + __FILE__, __LINE__ )
9452 +#define dl_alloc_space(in, bytes) \
9453 + __dl_alloc_space((in)->i_sb, (in)->i_tag, (dlsize_t)(bytes), \
9454 + __FILE__, __LINE__ )
9456 +#define dl_reserve_space(in, bytes) \
9457 + __dl_alloc_space((in)->i_sb, (in)->i_tag, (dlsize_t)(bytes), \
9458 + __FILE__, __LINE__ )
9460 +#define dl_claim_space(in, bytes) (0)
9462 +#define dl_release_space(in, bytes) \
9463 + __dl_free_space((in)->i_sb, (in)->i_tag, (dlsize_t)(bytes), \
9464 + __FILE__, __LINE__ )
9466 +#define dl_free_space(in, bytes) \
9467 + __dl_free_space((in)->i_sb, (in)->i_tag, (dlsize_t)(bytes), \
9468 + __FILE__, __LINE__ )
9472 +#define dl_alloc_inode(in) \
9473 + __dl_alloc_inode((in)->i_sb, (in)->i_tag, __FILE__, __LINE__ )
9475 +#define dl_free_inode(in) \
9476 + __dl_free_inode((in)->i_sb, (in)->i_tag, __FILE__, __LINE__ )
9479 +#define dl_adjust_block(sb, tag, fb, rb) \
9480 + __dl_adjust_block(sb, tag, fb, rb, __FILE__, __LINE__ )
9484 +#warning duplicate inclusion
9486 diff -NurpP --minimal linux-3.5/include/linux/vs_inet.h linux-3.5-vs2.3.4/include/linux/vs_inet.h
9487 --- linux-3.5/include/linux/vs_inet.h 1970-01-01 01:00:00.000000000 +0100
9488 +++ linux-3.5-vs2.3.4/include/linux/vs_inet.h 2012-07-23 01:45:55.000000000 +0200
9493 +#include "vserver/base.h"
9494 +#include "vserver/network.h"
9495 +#include "vserver/debug.h"
9497 +#define IPI_LOOPBACK htonl(INADDR_LOOPBACK)
9499 +#define NXAV4(a) NIPQUAD((a)->ip[0]), NIPQUAD((a)->ip[1]), \
9500 + NIPQUAD((a)->mask), (a)->type
9501 +#define NXAV4_FMT "[" NIPQUAD_FMT "-" NIPQUAD_FMT "/" NIPQUAD_FMT ":%04x]"
9503 +#define NIPQUAD(addr) \
9504 + ((unsigned char *)&addr)[0], \
9505 + ((unsigned char *)&addr)[1], \
9506 + ((unsigned char *)&addr)[2], \
9507 + ((unsigned char *)&addr)[3]
9509 +#define NIPQUAD_FMT "%u.%u.%u.%u"
9513 +int v4_addr_match(struct nx_addr_v4 *nxa, __be32 addr, uint16_t tmask)
9515 + __be32 ip = nxa->ip[0].s_addr;
9516 + __be32 mask = nxa->mask.s_addr;
9517 + __be32 bcast = ip | ~mask;
9520 + switch (nxa->type & tmask) {
9521 + case NXA_TYPE_MASK:
9522 + ret = (ip == (addr & mask));
9524 + case NXA_TYPE_ADDR:
9528 + /* fall through to broadcast */
9529 + case NXA_MOD_BCAST:
9530 + ret = ((tmask & NXA_MOD_BCAST) && (addr == bcast));
9532 + case NXA_TYPE_RANGE:
9533 + ret = ((nxa->ip[0].s_addr <= addr) &&
9534 + (nxa->ip[1].s_addr > addr));
9536 + case NXA_TYPE_ANY:
9541 + vxdprintk(VXD_CBIT(net, 0),
9542 + "v4_addr_match(%p" NXAV4_FMT "," NIPQUAD_FMT ",%04x) = %d",
9543 + nxa, NXAV4(nxa), NIPQUAD(addr), tmask, ret);
9548 +int v4_addr_in_nx_info(struct nx_info *nxi, __be32 addr, uint16_t tmask)
9550 + struct nx_addr_v4 *nxa;
9557 + /* allow 127.0.0.1 when remapping lback */
9558 + if ((tmask & NXA_LOOPBACK) &&
9559 + (addr == IPI_LOOPBACK) &&
9560 + nx_info_flags(nxi, NXF_LBACK_REMAP, 0))
9563 + /* check for lback address */
9564 + if ((tmask & NXA_MOD_LBACK) &&
9565 + (nxi->v4_lback.s_addr == addr))
9568 + /* check for broadcast address */
9569 + if ((tmask & NXA_MOD_BCAST) &&
9570 + (nxi->v4_bcast.s_addr == addr))
9573 + /* check for v4 addresses */
9574 + for (nxa = &nxi->v4; nxa; nxa = nxa->next)
9575 + if (v4_addr_match(nxa, addr, tmask))
9579 + vxdprintk(VXD_CBIT(net, 0),
9580 + "v4_addr_in_nx_info(%p[#%u]," NIPQUAD_FMT ",%04x) = %d",
9581 + nxi, nxi ? nxi->nx_id : 0, NIPQUAD(addr), tmask, ret);
9586 +int v4_nx_addr_match(struct nx_addr_v4 *nxa, struct nx_addr_v4 *addr, uint16_t mask)
9588 + /* FIXME: needs full range checks */
9589 + return v4_addr_match(nxa, addr->ip[0].s_addr, mask);
9593 +int v4_nx_addr_in_nx_info(struct nx_info *nxi, struct nx_addr_v4 *nxa, uint16_t mask)
9595 + struct nx_addr_v4 *ptr;
9597 + for (ptr = &nxi->v4; ptr; ptr = ptr->next)
9598 + if (v4_nx_addr_match(ptr, nxa, mask))
9603 +#include <net/inet_sock.h>
9606 + * Check if a given address matches for a socket
9608 + * nxi: the socket's nx_info if any
9609 + * addr: to be verified address
9612 +int v4_sock_addr_match (
9613 + struct nx_info *nxi,
9614 + struct inet_sock *inet,
9617 + __be32 saddr = inet->inet_rcv_saddr;
9618 + __be32 bcast = nxi ? nxi->v4_bcast.s_addr : INADDR_BROADCAST;
9620 + if (addr && (saddr == addr || bcast == addr))
9623 + return v4_addr_in_nx_info(nxi, addr, NXA_MASK_BIND);
9628 +/* inet related checks and helpers */
9637 +#include <linux/netdevice.h>
9638 +#include <linux/inetdevice.h>
9639 +#include <net/inet_sock.h>
9640 +#include <net/inet_timewait_sock.h>
9643 +int dev_in_nx_info(struct net_device *, struct nx_info *);
9644 +int v4_dev_in_nx_info(struct net_device *, struct nx_info *);
9645 +int nx_v4_addr_conflict(struct nx_info *, struct nx_info *);
9649 + * check if address is covered by socket
9651 + * sk: the socket to check against
9652 + * addr: the address in question (must be != 0)
9656 +int __v4_addr_match_socket(const struct sock *sk, struct nx_addr_v4 *nxa)
9658 + struct nx_info *nxi = sk->sk_nx_info;
9659 + __be32 saddr = sk_rcv_saddr(sk);
9661 + vxdprintk(VXD_CBIT(net, 5),
9662 + "__v4_addr_in_socket(%p," NXAV4_FMT ") %p:" NIPQUAD_FMT " %p;%lx",
9663 + sk, NXAV4(nxa), nxi, NIPQUAD(saddr), sk->sk_socket,
9664 + (sk->sk_socket?sk->sk_socket->flags:0));
9666 + if (saddr) { /* direct address match */
9667 + return v4_addr_match(nxa, saddr, -1);
9668 + } else if (nxi) { /* match against nx_info */
9669 + return v4_nx_addr_in_nx_info(nxi, nxa, -1);
9670 + } else { /* unrestricted any socket */
9678 +int nx_dev_visible(struct nx_info *nxi, struct net_device *dev)
9680 + vxdprintk(VXD_CBIT(net, 1),
9681 + "nx_dev_visible(%p[#%u],%p " VS_Q("%s") ") %d",
9682 + nxi, nxi ? nxi->nx_id : 0, dev, dev->name,
9683 + nxi ? dev_in_nx_info(dev, nxi) : 0);
9685 + if (!nx_info_flags(nxi, NXF_HIDE_NETIF, 0))
9687 + if (dev_in_nx_info(dev, nxi))
9694 +int v4_ifa_in_nx_info(struct in_ifaddr *ifa, struct nx_info *nxi)
9700 + return v4_addr_in_nx_info(nxi, ifa->ifa_local, NXA_MASK_SHOW);
9704 +int nx_v4_ifa_visible(struct nx_info *nxi, struct in_ifaddr *ifa)
9706 + vxdprintk(VXD_CBIT(net, 1), "nx_v4_ifa_visible(%p[#%u],%p) %d",
9707 + nxi, nxi ? nxi->nx_id : 0, ifa,
9708 + nxi ? v4_ifa_in_nx_info(ifa, nxi) : 0);
9710 + if (!nx_info_flags(nxi, NXF_HIDE_NETIF, 0))
9712 + if (v4_ifa_in_nx_info(ifa, nxi))
9718 +struct nx_v4_sock_addr {
9719 + __be32 saddr; /* Address used for validation */
9720 + __be32 baddr; /* Address used for socket bind */
9724 +int v4_map_sock_addr(struct inet_sock *inet, struct sockaddr_in *addr,
9725 + struct nx_v4_sock_addr *nsa)
9727 + struct sock *sk = &inet->sk;
9728 + struct nx_info *nxi = sk->sk_nx_info;
9729 + __be32 saddr = addr->sin_addr.s_addr;
9730 + __be32 baddr = saddr;
9732 + vxdprintk(VXD_CBIT(net, 3),
9733 + "inet_bind(%p)* %p,%p;%lx " NIPQUAD_FMT,
9734 + sk, sk->sk_nx_info, sk->sk_socket,
9735 + (sk->sk_socket ? sk->sk_socket->flags : 0),
9739 + if (saddr == INADDR_ANY) {
9740 + if (nx_info_flags(nxi, NXF_SINGLE_IP, 0))
9741 + baddr = nxi->v4.ip[0].s_addr;
9742 + } else if (saddr == IPI_LOOPBACK) {
9743 + if (nx_info_flags(nxi, NXF_LBACK_REMAP, 0))
9744 + baddr = nxi->v4_lback.s_addr;
9745 + } else if (!ipv4_is_multicast(saddr) ||
9746 + !nx_info_ncaps(nxi, NXC_MULTICAST)) {
9747 + /* normal address bind */
9748 + if (!v4_addr_in_nx_info(nxi, saddr, NXA_MASK_BIND))
9749 + return -EADDRNOTAVAIL;
9753 + vxdprintk(VXD_CBIT(net, 3),
9754 + "inet_bind(%p) " NIPQUAD_FMT ", " NIPQUAD_FMT,
9755 + sk, NIPQUAD(saddr), NIPQUAD(baddr));
9757 + nsa->saddr = saddr;
9758 + nsa->baddr = baddr;
9763 +void v4_set_sock_addr(struct inet_sock *inet, struct nx_v4_sock_addr *nsa)
9765 + inet->inet_saddr = nsa->baddr;
9766 + inet->inet_rcv_saddr = nsa->baddr;
9771 + * helper to simplify inet_lookup_listener
9773 + * nxi: the socket's nx_info if any
9774 + * addr: to be verified address
9775 + * saddr: socket address
9777 +static inline int v4_inet_addr_match (
9778 + struct nx_info *nxi,
9782 + if (addr && (saddr == addr))
9785 + return nxi ? v4_addr_in_nx_info(nxi, addr, NXA_MASK_BIND) : 1;
9789 +static inline __be32 nx_map_sock_lback(struct nx_info *nxi, __be32 addr)
9791 + if (nx_info_flags(nxi, NXF_HIDE_LBACK, 0) &&
9792 + (addr == nxi->v4_lback.s_addr))
9793 + return IPI_LOOPBACK;
9798 +int nx_info_has_v4(struct nx_info *nxi)
9804 + if (nx_info_flags(nxi, NXF_LBACK_REMAP, 0))
9809 +#else /* CONFIG_INET */
9812 +int nx_dev_visible(struct nx_info *n, struct net_device *d)
9818 +int nx_v4_addr_conflict(struct nx_info *n, uint32_t a, const struct sock *s)
9824 +int v4_ifa_in_nx_info(struct in_ifaddr *a, struct nx_info *n)
9830 +int nx_info_has_v4(struct nx_info *nxi)
9835 +#endif /* CONFIG_INET */
9837 +#define current_nx_info_has_v4() \
9838 + nx_info_has_v4(current_nx_info())
9841 +// #warning duplicate inclusion
9843 diff -NurpP --minimal linux-3.5/include/linux/vs_inet6.h linux-3.5-vs2.3.4/include/linux/vs_inet6.h
9844 --- linux-3.5/include/linux/vs_inet6.h 1970-01-01 01:00:00.000000000 +0100
9845 +++ linux-3.5-vs2.3.4/include/linux/vs_inet6.h 2012-07-23 01:45:55.000000000 +0200
9847 +#ifndef _VS_INET6_H
9848 +#define _VS_INET6_H
9850 +#include "vserver/base.h"
9851 +#include "vserver/network.h"
9852 +#include "vserver/debug.h"
9854 +#include <net/ipv6.h>
9856 +#define NXAV6(a) &(a)->ip, &(a)->mask, (a)->prefix, (a)->type
9857 +#define NXAV6_FMT "[%pI6/%pI6/%d:%04x]"
9863 +int v6_addr_match(struct nx_addr_v6 *nxa,
9864 + const struct in6_addr *addr, uint16_t mask)
9868 + switch (nxa->type & mask) {
9869 + case NXA_TYPE_MASK:
9870 + ret = ipv6_masked_addr_cmp(&nxa->ip, &nxa->mask, addr);
9872 + case NXA_TYPE_ADDR:
9873 + ret = ipv6_addr_equal(&nxa->ip, addr);
9875 + case NXA_TYPE_ANY:
9879 + vxdprintk(VXD_CBIT(net, 0),
9880 + "v6_addr_match(%p" NXAV6_FMT ",%pI6,%04x) = %d",
9881 + nxa, NXAV6(nxa), addr, mask, ret);
9886 +int v6_addr_in_nx_info(struct nx_info *nxi,
9887 + const struct in6_addr *addr, uint16_t mask)
9889 + struct nx_addr_v6 *nxa;
9894 + for (nxa = &nxi->v6; nxa; nxa = nxa->next)
9895 + if (v6_addr_match(nxa, addr, mask))
9899 + vxdprintk(VXD_CBIT(net, 0),
9900 + "v6_addr_in_nx_info(%p[#%u],%pI6,%04x) = %d",
9901 + nxi, nxi ? nxi->nx_id : 0, addr, mask, ret);
9906 +int v6_nx_addr_match(struct nx_addr_v6 *nxa, struct nx_addr_v6 *addr, uint16_t mask)
9908 + /* FIXME: needs full range checks */
9909 + return v6_addr_match(nxa, &addr->ip, mask);
9913 +int v6_nx_addr_in_nx_info(struct nx_info *nxi, struct nx_addr_v6 *nxa, uint16_t mask)
9915 + struct nx_addr_v6 *ptr;
9917 + for (ptr = &nxi->v6; ptr; ptr = ptr->next)
9918 + if (v6_nx_addr_match(ptr, nxa, mask))
9925 + * Check if a given address matches for a socket
9927 + * nxi: the socket's nx_info if any
9928 + * addr: to be verified address
9931 +int v6_sock_addr_match (
9932 + struct nx_info *nxi,
9933 + struct inet_sock *inet,
9934 + struct in6_addr *addr)
9936 + struct sock *sk = &inet->sk;
9937 + struct in6_addr *saddr = inet6_rcv_saddr(sk);
9939 + if (!ipv6_addr_any(addr) &&
9940 + ipv6_addr_equal(saddr, addr))
9942 + if (ipv6_addr_any(saddr))
9943 + return v6_addr_in_nx_info(nxi, addr, -1);
9948 + * check if address is covered by socket
9950 + * sk: the socket to check against
9951 + * addr: the address in question (must be != 0)
9955 +int __v6_addr_match_socket(const struct sock *sk, struct nx_addr_v6 *nxa)
9957 + struct nx_info *nxi = sk->sk_nx_info;
9958 + struct in6_addr *saddr = inet6_rcv_saddr(sk);
9960 + vxdprintk(VXD_CBIT(net, 5),
9961 + "__v6_addr_in_socket(%p," NXAV6_FMT ") %p:%pI6 %p;%lx",
9962 + sk, NXAV6(nxa), nxi, saddr, sk->sk_socket,
9963 + (sk->sk_socket?sk->sk_socket->flags:0));
9965 + if (!ipv6_addr_any(saddr)) { /* direct address match */
9966 + return v6_addr_match(nxa, saddr, -1);
9967 + } else if (nxi) { /* match against nx_info */
9968 + return v6_nx_addr_in_nx_info(nxi, nxa, -1);
9969 + } else { /* unrestricted any socket */
9975 +/* inet related checks and helpers */
9983 +#include <linux/netdevice.h>
9984 +#include <linux/inetdevice.h>
9985 +#include <net/inet_timewait_sock.h>
9988 +int dev_in_nx_info(struct net_device *, struct nx_info *);
9989 +int v6_dev_in_nx_info(struct net_device *, struct nx_info *);
9990 +int nx_v6_addr_conflict(struct nx_info *, struct nx_info *);
9995 +int v6_ifa_in_nx_info(struct inet6_ifaddr *ifa, struct nx_info *nxi)
10001 + return v6_addr_in_nx_info(nxi, &ifa->addr, -1);
10005 +int nx_v6_ifa_visible(struct nx_info *nxi, struct inet6_ifaddr *ifa)
10007 + vxdprintk(VXD_CBIT(net, 1), "nx_v6_ifa_visible(%p[#%u],%p) %d",
10008 + nxi, nxi ? nxi->nx_id : 0, ifa,
10009 + nxi ? v6_ifa_in_nx_info(ifa, nxi) : 0);
10011 + if (!nx_info_flags(nxi, NXF_HIDE_NETIF, 0))
10013 + if (v6_ifa_in_nx_info(ifa, nxi))
10019 +struct nx_v6_sock_addr {
10020 + struct in6_addr saddr; /* Address used for validation */
10021 + struct in6_addr baddr; /* Address used for socket bind */
10025 +int v6_map_sock_addr(struct inet_sock *inet, struct sockaddr_in6 *addr,
10026 + struct nx_v6_sock_addr *nsa)
10028 + // struct sock *sk = &inet->sk;
10029 + // struct nx_info *nxi = sk->sk_nx_info;
10030 + struct in6_addr saddr = addr->sin6_addr;
10031 + struct in6_addr baddr = saddr;
10033 + nsa->saddr = saddr;
10034 + nsa->baddr = baddr;
10039 +void v6_set_sock_addr(struct inet_sock *inet, struct nx_v6_sock_addr *nsa)
10041 + // struct sock *sk = &inet->sk;
10042 + // struct in6_addr *saddr = inet6_rcv_saddr(sk);
10044 + // *saddr = nsa->baddr;
10045 + // inet->inet_saddr = nsa->baddr;
10049 +int nx_info_has_v6(struct nx_info *nxi)
10053 + if (NX_IPV6(nxi))
10058 +#else /* CONFIG_IPV6 */
10061 +int nx_v6_dev_visible(struct nx_info *n, struct net_device *d)
10068 +int nx_v6_addr_conflict(struct nx_info *n, uint32_t a, const struct sock *s)
10074 +int v6_ifa_in_nx_info(struct in_ifaddr *a, struct nx_info *n)
10080 +int nx_info_has_v6(struct nx_info *nxi)
10085 +#endif /* CONFIG_IPV6 */
10087 +#define current_nx_info_has_v6() \
10088 + nx_info_has_v6(current_nx_info())
10091 +#warning duplicate inclusion
10093 diff -NurpP --minimal linux-3.5/include/linux/vs_limit.h linux-3.5-vs2.3.4/include/linux/vs_limit.h
10094 --- linux-3.5/include/linux/vs_limit.h 1970-01-01 01:00:00.000000000 +0100
10095 +++ linux-3.5-vs2.3.4/include/linux/vs_limit.h 2012-07-23 01:45:55.000000000 +0200
10097 +#ifndef _VS_LIMIT_H
10098 +#define _VS_LIMIT_H
10100 +#include "vserver/limit.h"
10101 +#include "vserver/base.h"
10102 +#include "vserver/context.h"
10103 +#include "vserver/debug.h"
10104 +#include "vserver/context.h"
10105 +#include "vserver/limit_int.h"
10108 +#define vx_acc_cres(v, d, p, r) \
10109 + __vx_acc_cres(v, r, d, p, __FILE__, __LINE__)
10111 +#define vx_acc_cres_cond(x, d, p, r) \
10112 + __vx_acc_cres(((x) == vx_current_xid()) ? current_vx_info() : 0, \
10113 + r, d, p, __FILE__, __LINE__)
10116 +#define vx_add_cres(v, a, p, r) \
10117 + __vx_add_cres(v, r, a, p, __FILE__, __LINE__)
10118 +#define vx_sub_cres(v, a, p, r) vx_add_cres(v, -(a), p, r)
10120 +#define vx_add_cres_cond(x, a, p, r) \
10121 + __vx_add_cres(((x) == vx_current_xid()) ? current_vx_info() : 0, \
10122 + r, a, p, __FILE__, __LINE__)
10123 +#define vx_sub_cres_cond(x, a, p, r) vx_add_cres_cond(x, -(a), p, r)
10126 +/* process and file limits */
10128 +#define vx_nproc_inc(p) \
10129 + vx_acc_cres((p)->vx_info, 1, p, RLIMIT_NPROC)
10131 +#define vx_nproc_dec(p) \
10132 + vx_acc_cres((p)->vx_info,-1, p, RLIMIT_NPROC)
10134 +#define vx_files_inc(f) \
10135 + vx_acc_cres_cond((f)->f_xid, 1, f, RLIMIT_NOFILE)
10137 +#define vx_files_dec(f) \
10138 + vx_acc_cres_cond((f)->f_xid,-1, f, RLIMIT_NOFILE)
10140 +#define vx_locks_inc(l) \
10141 + vx_acc_cres_cond((l)->fl_xid, 1, l, RLIMIT_LOCKS)
10143 +#define vx_locks_dec(l) \
10144 + vx_acc_cres_cond((l)->fl_xid,-1, l, RLIMIT_LOCKS)
10146 +#define vx_openfd_inc(f) \
10147 + vx_acc_cres(current_vx_info(), 1, (void *)(long)(f), VLIMIT_OPENFD)
10149 +#define vx_openfd_dec(f) \
10150 + vx_acc_cres(current_vx_info(),-1, (void *)(long)(f), VLIMIT_OPENFD)
10153 +#define vx_cres_avail(v, n, r) \
10154 + __vx_cres_avail(v, r, n, __FILE__, __LINE__)
10157 +#define vx_nproc_avail(n) \
10158 + vx_cres_avail(current_vx_info(), n, RLIMIT_NPROC)
10160 +#define vx_files_avail(n) \
10161 + vx_cres_avail(current_vx_info(), n, RLIMIT_NOFILE)
10163 +#define vx_locks_avail(n) \
10164 + vx_cres_avail(current_vx_info(), n, RLIMIT_LOCKS)
10166 +#define vx_openfd_avail(n) \
10167 + vx_cres_avail(current_vx_info(), n, VLIMIT_OPENFD)
10170 +/* dentry limits */
10172 +#define vx_dentry_inc(d) do { \
10173 + if ((d)->d_count == 1) \
10174 + vx_acc_cres(current_vx_info(), 1, d, VLIMIT_DENTRY); \
10177 +#define vx_dentry_dec(d) do { \
10178 + if ((d)->d_count == 0) \
10179 + vx_acc_cres(current_vx_info(),-1, d, VLIMIT_DENTRY); \
10182 +#define vx_dentry_avail(n) \
10183 + vx_cres_avail(current_vx_info(), n, VLIMIT_DENTRY)
10186 +/* socket limits */
10188 +#define vx_sock_inc(s) \
10189 + vx_acc_cres((s)->sk_vx_info, 1, s, VLIMIT_NSOCK)
10191 +#define vx_sock_dec(s) \
10192 + vx_acc_cres((s)->sk_vx_info,-1, s, VLIMIT_NSOCK)
10194 +#define vx_sock_avail(n) \
10195 + vx_cres_avail(current_vx_info(), n, VLIMIT_NSOCK)
10198 +/* ipc resource limits */
10200 +#define vx_ipcmsg_add(v, u, a) \
10201 + vx_add_cres(v, a, u, RLIMIT_MSGQUEUE)
10203 +#define vx_ipcmsg_sub(v, u, a) \
10204 + vx_sub_cres(v, a, u, RLIMIT_MSGQUEUE)
10206 +#define vx_ipcmsg_avail(v, a) \
10207 + vx_cres_avail(v, a, RLIMIT_MSGQUEUE)
10210 +#define vx_ipcshm_add(v, k, a) \
10211 + vx_add_cres(v, a, (void *)(long)(k), VLIMIT_SHMEM)
10213 +#define vx_ipcshm_sub(v, k, a) \
10214 + vx_sub_cres(v, a, (void *)(long)(k), VLIMIT_SHMEM)
10216 +#define vx_ipcshm_avail(v, a) \
10217 + vx_cres_avail(v, a, VLIMIT_SHMEM)
10220 +#define vx_semary_inc(a) \
10221 + vx_acc_cres(current_vx_info(), 1, a, VLIMIT_SEMARY)
10223 +#define vx_semary_dec(a) \
10224 + vx_acc_cres(current_vx_info(), -1, a, VLIMIT_SEMARY)
10227 +#define vx_nsems_add(a,n) \
10228 + vx_add_cres(current_vx_info(), n, a, VLIMIT_NSEMS)
10230 +#define vx_nsems_sub(a,n) \
10231 + vx_sub_cres(current_vx_info(), n, a, VLIMIT_NSEMS)
10235 +#warning duplicate inclusion
10237 diff -NurpP --minimal linux-3.5/include/linux/vs_network.h linux-3.5-vs2.3.4/include/linux/vs_network.h
10238 --- linux-3.5/include/linux/vs_network.h 1970-01-01 01:00:00.000000000 +0100
10239 +++ linux-3.5-vs2.3.4/include/linux/vs_network.h 2012-07-23 01:45:55.000000000 +0200
10241 +#ifndef _NX_VS_NETWORK_H
10242 +#define _NX_VS_NETWORK_H
10244 +#include "vserver/context.h"
10245 +#include "vserver/network.h"
10246 +#include "vserver/base.h"
10247 +#include "vserver/check.h"
10248 +#include "vserver/debug.h"
10250 +#include <linux/sched.h>
10253 +#define get_nx_info(i) __get_nx_info(i, __FILE__, __LINE__)
10255 +static inline struct nx_info *__get_nx_info(struct nx_info *nxi,
10256 + const char *_file, int _line)
10261 + vxlprintk(VXD_CBIT(nid, 2), "get_nx_info(%p[#%d.%d])",
10262 + nxi, nxi ? nxi->nx_id : 0,
10263 + nxi ? atomic_read(&nxi->nx_usecnt) : 0,
10266 + atomic_inc(&nxi->nx_usecnt);
10271 +extern void free_nx_info(struct nx_info *);
10273 +#define put_nx_info(i) __put_nx_info(i, __FILE__, __LINE__)
10275 +static inline void __put_nx_info(struct nx_info *nxi, const char *_file, int _line)
10280 + vxlprintk(VXD_CBIT(nid, 2), "put_nx_info(%p[#%d.%d])",
10281 + nxi, nxi ? nxi->nx_id : 0,
10282 + nxi ? atomic_read(&nxi->nx_usecnt) : 0,
10285 + if (atomic_dec_and_test(&nxi->nx_usecnt))
10286 + free_nx_info(nxi);
10290 +#define init_nx_info(p, i) __init_nx_info(p, i, __FILE__, __LINE__)
10292 +static inline void __init_nx_info(struct nx_info **nxp, struct nx_info *nxi,
10293 + const char *_file, int _line)
10296 + vxlprintk(VXD_CBIT(nid, 3),
10297 + "init_nx_info(%p[#%d.%d])",
10298 + nxi, nxi ? nxi->nx_id : 0,
10299 + nxi ? atomic_read(&nxi->nx_usecnt) : 0,
10302 + atomic_inc(&nxi->nx_usecnt);
10308 +#define set_nx_info(p, i) __set_nx_info(p, i, __FILE__, __LINE__)
10310 +static inline void __set_nx_info(struct nx_info **nxp, struct nx_info *nxi,
10311 + const char *_file, int _line)
10313 + struct nx_info *nxo;
10318 + vxlprintk(VXD_CBIT(nid, 3), "set_nx_info(%p[#%d.%d])",
10319 + nxi, nxi ? nxi->nx_id : 0,
10320 + nxi ? atomic_read(&nxi->nx_usecnt) : 0,
10323 + atomic_inc(&nxi->nx_usecnt);
10324 + nxo = xchg(nxp, nxi);
10328 +#define clr_nx_info(p) __clr_nx_info(p, __FILE__, __LINE__)
10330 +static inline void __clr_nx_info(struct nx_info **nxp,
10331 + const char *_file, int _line)
10333 + struct nx_info *nxo;
10335 + nxo = xchg(nxp, NULL);
10339 + vxlprintk(VXD_CBIT(nid, 3), "clr_nx_info(%p[#%d.%d])",
10340 + nxo, nxo ? nxo->nx_id : 0,
10341 + nxo ? atomic_read(&nxo->nx_usecnt) : 0,
10344 + if (atomic_dec_and_test(&nxo->nx_usecnt))
10345 + free_nx_info(nxo);
10349 +#define claim_nx_info(v, p) __claim_nx_info(v, p, __FILE__, __LINE__)
10351 +static inline void __claim_nx_info(struct nx_info *nxi,
10352 + struct task_struct *task, const char *_file, int _line)
10354 + vxlprintk(VXD_CBIT(nid, 3), "claim_nx_info(%p[#%d.%d.%d]) %p",
10355 + nxi, nxi ? nxi->nx_id : 0,
10356 + nxi?atomic_read(&nxi->nx_usecnt):0,
10357 + nxi?atomic_read(&nxi->nx_tasks):0,
10358 + task, _file, _line);
10360 + atomic_inc(&nxi->nx_tasks);
10364 +extern void unhash_nx_info(struct nx_info *);
10366 +#define release_nx_info(v, p) __release_nx_info(v, p, __FILE__, __LINE__)
10368 +static inline void __release_nx_info(struct nx_info *nxi,
10369 + struct task_struct *task, const char *_file, int _line)
10371 + vxlprintk(VXD_CBIT(nid, 3), "release_nx_info(%p[#%d.%d.%d]) %p",
10372 + nxi, nxi ? nxi->nx_id : 0,
10373 + nxi ? atomic_read(&nxi->nx_usecnt) : 0,
10374 + nxi ? atomic_read(&nxi->nx_tasks) : 0,
10375 + task, _file, _line);
10379 + if (atomic_dec_and_test(&nxi->nx_tasks))
10380 + unhash_nx_info(nxi);
10384 +#define task_get_nx_info(i) __task_get_nx_info(i, __FILE__, __LINE__)
10386 +static __inline__ struct nx_info *__task_get_nx_info(struct task_struct *p,
10387 + const char *_file, int _line)
10389 + struct nx_info *nxi;
10392 + vxlprintk(VXD_CBIT(nid, 5), "task_get_nx_info(%p)",
10393 + p, _file, _line);
10394 + nxi = __get_nx_info(p->nx_info, _file, _line);
10400 +static inline void exit_nx_info(struct task_struct *p)
10403 + release_nx_info(p->nx_info, p);
10408 +#warning duplicate inclusion
10410 diff -NurpP --minimal linux-3.5/include/linux/vs_pid.h linux-3.5-vs2.3.4/include/linux/vs_pid.h
10411 --- linux-3.5/include/linux/vs_pid.h 1970-01-01 01:00:00.000000000 +0100
10412 +++ linux-3.5-vs2.3.4/include/linux/vs_pid.h 2012-07-23 01:45:55.000000000 +0200
10417 +#include "vserver/base.h"
10418 +#include "vserver/check.h"
10419 +#include "vserver/context.h"
10420 +#include "vserver/debug.h"
10421 +#include "vserver/pid.h"
10422 +#include <linux/pid_namespace.h>
10425 +#define VXF_FAKE_INIT (VXF_INFO_INIT | VXF_STATE_INIT)
10428 +int vx_proc_task_visible(struct task_struct *task)
10430 + if ((task->pid == 1) &&
10431 + !vx_flags(VXF_FAKE_INIT, VXF_FAKE_INIT))
10432 + /* show a blend through init */
10434 + if (vx_check(vx_task_xid(task), VS_WATCH | VS_IDENT))
10441 +#define find_task_by_real_pid(pid) find_task_by_pid_ns(pid, &init_pid_ns)
10445 +struct task_struct *vx_get_proc_task(struct inode *inode, struct pid *pid)
10447 + struct task_struct *task = get_pid_task(pid, PIDTYPE_PID);
10449 + if (task && !vx_proc_task_visible(task)) {
10450 + vxdprintk(VXD_CBIT(misc, 6),
10451 + "dropping task (get) %p[#%u,%u] for %p[#%u,%u]",
10452 + task, task->xid, task->pid,
10453 + current, current->xid, current->pid);
10454 + put_task_struct(task);
10462 +#warning duplicate inclusion
10464 diff -NurpP --minimal linux-3.5/include/linux/vs_sched.h linux-3.5-vs2.3.4/include/linux/vs_sched.h
10465 --- linux-3.5/include/linux/vs_sched.h 1970-01-01 01:00:00.000000000 +0100
10466 +++ linux-3.5-vs2.3.4/include/linux/vs_sched.h 2012-07-23 01:45:55.000000000 +0200
10468 +#ifndef _VS_SCHED_H
10469 +#define _VS_SCHED_H
10471 +#include "vserver/base.h"
10472 +#include "vserver/context.h"
10473 +#include "vserver/sched.h"
10476 +#define MAX_PRIO_BIAS 20
10477 +#define MIN_PRIO_BIAS -20
10480 +int vx_adjust_prio(struct task_struct *p, int prio, int max_user)
10482 + struct vx_info *vxi = p->vx_info;
10485 + prio += vx_cpu(vxi, sched_pc).prio_bias;
10489 +static inline void vx_account_user(struct vx_info *vxi,
10490 + cputime_t cputime, int nice)
10494 + vx_cpu(vxi, sched_pc).user_ticks += cputime;
10497 +static inline void vx_account_system(struct vx_info *vxi,
10498 + cputime_t cputime, int idle)
10502 + vx_cpu(vxi, sched_pc).sys_ticks += cputime;
10506 +#warning duplicate inclusion
10508 diff -NurpP --minimal linux-3.5/include/linux/vs_socket.h linux-3.5-vs2.3.4/include/linux/vs_socket.h
10509 --- linux-3.5/include/linux/vs_socket.h 1970-01-01 01:00:00.000000000 +0100
10510 +++ linux-3.5-vs2.3.4/include/linux/vs_socket.h 2012-07-23 01:45:55.000000000 +0200
10512 +#ifndef _VS_SOCKET_H
10513 +#define _VS_SOCKET_H
10515 +#include "vserver/debug.h"
10516 +#include "vserver/base.h"
10517 +#include "vserver/cacct.h"
10518 +#include "vserver/context.h"
10519 +#include "vserver/tag.h"
10522 +/* socket accounting */
10524 +#include <linux/socket.h>
10526 +static inline int vx_sock_type(int family)
10528 + switch (family) {
10530 + return VXA_SOCK_UNSPEC;
10532 + return VXA_SOCK_UNIX;
10534 + return VXA_SOCK_INET;
10536 + return VXA_SOCK_INET6;
10538 + return VXA_SOCK_PACKET;
10540 + return VXA_SOCK_OTHER;
10544 +#define vx_acc_sock(v, f, p, s) \
10545 + __vx_acc_sock(v, f, p, s, __FILE__, __LINE__)
10547 +static inline void __vx_acc_sock(struct vx_info *vxi,
10548 + int family, int pos, int size, char *file, int line)
10551 + int type = vx_sock_type(family);
10553 + atomic_long_inc(&vxi->cacct.sock[type][pos].count);
10554 + atomic_long_add(size, &vxi->cacct.sock[type][pos].total);
10558 +#define vx_sock_recv(sk, s) \
10559 + vx_acc_sock((sk)->sk_vx_info, (sk)->sk_family, 0, s)
10560 +#define vx_sock_send(sk, s) \
10561 + vx_acc_sock((sk)->sk_vx_info, (sk)->sk_family, 1, s)
10562 +#define vx_sock_fail(sk, s) \
10563 + vx_acc_sock((sk)->sk_vx_info, (sk)->sk_family, 2, s)
10566 +#define sock_vx_init(s) do { \
10567 + (s)->sk_xid = 0; \
10568 + (s)->sk_vx_info = NULL; \
10571 +#define sock_nx_init(s) do { \
10572 + (s)->sk_nid = 0; \
10573 + (s)->sk_nx_info = NULL; \
10577 +#warning duplicate inclusion
10579 diff -NurpP --minimal linux-3.5/include/linux/vs_tag.h linux-3.5-vs2.3.4/include/linux/vs_tag.h
10580 --- linux-3.5/include/linux/vs_tag.h 1970-01-01 01:00:00.000000000 +0100
10581 +++ linux-3.5-vs2.3.4/include/linux/vs_tag.h 2012-07-23 01:45:55.000000000 +0200
10586 +#include <linux/vserver/tag.h>
10588 +/* check conditions */
10590 +#define DX_ADMIN 0x0001
10591 +#define DX_WATCH 0x0002
10592 +#define DX_HOSTID 0x0008
10594 +#define DX_IDENT 0x0010
10596 +#define DX_ARG_MASK 0x0010
10599 +#define dx_task_tag(t) ((t)->tag)
10601 +#define dx_current_tag() dx_task_tag(current)
10603 +#define dx_check(c, m) __dx_check(dx_current_tag(), c, m)
10605 +#define dx_weak_check(c, m) ((m) ? dx_check(c, m) : 1)
10609 + * check current context for ADMIN/WATCH and
10610 + * optionally against supplied argument
10612 +static inline int __dx_check(tag_t cid, tag_t id, unsigned int mode)
10614 + if (mode & DX_ARG_MASK) {
10615 + if ((mode & DX_IDENT) && (id == cid))
10618 + return (((mode & DX_ADMIN) && (cid == 0)) ||
10619 + ((mode & DX_WATCH) && (cid == 1)) ||
10620 + ((mode & DX_HOSTID) && (id == 0)));
10624 +int dx_permission(const struct inode *inode, int mask);
10628 +#warning duplicate inclusion
10630 diff -NurpP --minimal linux-3.5/include/linux/vs_time.h linux-3.5-vs2.3.4/include/linux/vs_time.h
10631 --- linux-3.5/include/linux/vs_time.h 1970-01-01 01:00:00.000000000 +0100
10632 +++ linux-3.5-vs2.3.4/include/linux/vs_time.h 2012-07-23 01:45:55.000000000 +0200
10634 +#ifndef _VS_TIME_H
10635 +#define _VS_TIME_H
10638 +/* time faking stuff */
10640 +#ifdef CONFIG_VSERVER_VTIME
10642 +extern void vx_adjust_timespec(struct timespec *ts);
10643 +extern int vx_settimeofday(const struct timespec *ts);
10646 +#define vx_adjust_timespec(t) do { } while (0)
10647 +#define vx_settimeofday(t) do_settimeofday(t)
10651 +#warning duplicate inclusion
10653 diff -NurpP --minimal linux-3.5/include/linux/vserver/Kbuild linux-3.5-vs2.3.4/include/linux/vserver/Kbuild
10654 --- linux-3.5/include/linux/vserver/Kbuild 1970-01-01 01:00:00.000000000 +0100
10655 +++ linux-3.5-vs2.3.4/include/linux/vserver/Kbuild 2012-07-23 01:45:55.000000000 +0200
10658 +header-y += context_cmd.h network_cmd.h space_cmd.h \
10659 + cacct_cmd.h cvirt_cmd.h limit_cmd.h dlimit_cmd.h \
10660 + inode_cmd.h tag_cmd.h sched_cmd.h signal_cmd.h \
10661 + debug_cmd.h device_cmd.h
10663 +header-y += switch.h network.h monitor.h inode.h device.h
10665 diff -NurpP --minimal linux-3.5/include/linux/vserver/base.h linux-3.5-vs2.3.4/include/linux/vserver/base.h
10666 --- linux-3.5/include/linux/vserver/base.h 1970-01-01 01:00:00.000000000 +0100
10667 +++ linux-3.5-vs2.3.4/include/linux/vserver/base.h 2012-07-23 01:45:55.000000000 +0200
10669 +#ifndef _VX_BASE_H
10670 +#define _VX_BASE_H
10673 +/* context state changes */
10685 +#define vx_task_xid(t) ((t)->xid)
10687 +#define vx_current_xid() vx_task_xid(current)
10689 +#define current_vx_info() (current->vx_info)
10692 +#define nx_task_nid(t) ((t)->nid)
10694 +#define nx_current_nid() nx_task_nid(current)
10696 +#define current_nx_info() (current->nx_info)
10699 +/* generic flag merging */
10701 +#define vs_check_flags(v, m, f) (((v) & (m)) ^ (f))
10703 +#define vs_mask_flags(v, f, m) (((v) & ~(m)) | ((f) & (m)))
10705 +#define vs_mask_mask(v, f, m) (((v) & ~(m)) | ((v) & (f) & (m)))
10707 +#define vs_check_bit(v, n) ((v) & (1LL << (n)))
10710 +/* context flags */
10712 +#define __vx_flags(v) ((v) ? (v)->vx_flags : 0)
10714 +#define vx_current_flags() __vx_flags(current_vx_info())
10716 +#define vx_info_flags(v, m, f) \
10717 + vs_check_flags(__vx_flags(v), m, f)
10719 +#define task_vx_flags(t, m, f) \
10720 + ((t) && vx_info_flags((t)->vx_info, m, f))
10722 +#define vx_flags(m, f) vx_info_flags(current_vx_info(), m, f)
10725 +/* context caps */
10727 +#define __vx_ccaps(v) ((v) ? (v)->vx_ccaps : 0)
10729 +#define vx_current_ccaps() __vx_ccaps(current_vx_info())
10731 +#define vx_info_ccaps(v, c) (__vx_ccaps(v) & (c))
10733 +#define vx_ccaps(c) vx_info_ccaps(current_vx_info(), (c))
10737 +/* network flags */
10739 +#define __nx_flags(n) ((n) ? (n)->nx_flags : 0)
10741 +#define nx_current_flags() __nx_flags(current_nx_info())
10743 +#define nx_info_flags(n, m, f) \
10744 + vs_check_flags(__nx_flags(n), m, f)
10746 +#define task_nx_flags(t, m, f) \
10747 + ((t) && nx_info_flags((t)->nx_info, m, f))
10749 +#define nx_flags(m, f) nx_info_flags(current_nx_info(), m, f)
10752 +/* network caps */
10754 +#define __nx_ncaps(n) ((n) ? (n)->nx_ncaps : 0)
10756 +#define nx_current_ncaps() __nx_ncaps(current_nx_info())
10758 +#define nx_info_ncaps(n, c) (__nx_ncaps(n) & (c))
10760 +#define nx_ncaps(c) nx_info_ncaps(current_nx_info(), c)
10763 +/* context mask capabilities */
10765 +#define __vx_mcaps(v) ((v) ? (v)->vx_ccaps >> 32UL : ~0 )
10767 +#define vx_info_mcaps(v, c) (__vx_mcaps(v) & (c))
10769 +#define vx_mcaps(c) vx_info_mcaps(current_vx_info(), c)
10772 +/* context bcap mask */
10774 +#define __vx_bcaps(v) ((v)->vx_bcaps)
10776 +#define vx_current_bcaps() __vx_bcaps(current_vx_info())
10779 +/* mask given bcaps */
10781 +#define vx_info_mbcaps(v, c) ((v) ? cap_intersect(__vx_bcaps(v), c) : c)
10783 +#define vx_mbcaps(c) vx_info_mbcaps(current_vx_info(), c)
10786 +/* masked cap_bset */
10788 +#define vx_info_cap_bset(v) vx_info_mbcaps(v, current->cap_bset)
10790 +#define vx_current_cap_bset() vx_info_cap_bset(current_vx_info())
10793 +#define vx_info_mbcap(v, b) \
10794 + (!vx_info_flags(v, VXF_STATE_SETUP, 0) ? \
10795 + vx_info_bcaps(v, b) : (b))
10797 +#define task_vx_mbcap(t, b) \
10798 + vx_info_mbcap((t)->vx_info, (t)->b)
10800 +#define vx_mbcap(b) task_vx_mbcap(current, b)
10803 +#define vx_cap_raised(v, c, f) cap_raised(vx_info_mbcaps(v, c), f)
10805 +#define vx_capable(b, c) (capable(b) || \
10806 + (cap_raised(current_cap(), b) && vx_ccaps(c)))
10808 +#define vx_ns_capable(n, b, c) (ns_capable(n, b) || \
10809 + (cap_raised(current_cap(), b) && vx_ccaps(c)))
10811 +#define nx_capable(b, c) (capable(b) || \
10812 + (cap_raised(current_cap(), b) && nx_ncaps(c)))
10814 +#define vx_task_initpid(t, n) \
10815 + ((t)->vx_info && \
10816 + ((t)->vx_info->vx_initpid == (n)))
10818 +#define vx_current_initpid(n) vx_task_initpid(current, n)
10821 +/* context unshare mask */
10823 +#define __vx_umask(v) ((v)->vx_umask)
10825 +#define vx_current_umask() __vx_umask(current_vx_info())
10827 +#define vx_can_unshare(b, f) (capable(b) || \
10828 + (cap_raised(current_cap(), b) && \
10829 + !((f) & ~vx_current_umask())))
10832 +#define __vx_wmask(v) ((v)->vx_wmask)
10834 +#define vx_current_wmask() __vx_wmask(current_vx_info())
10837 +#define __vx_state(v) ((v) ? ((v)->vx_state) : 0)
10839 +#define vx_info_state(v, m) (__vx_state(v) & (m))
10842 +#define __nx_state(n) ((n) ? ((n)->nx_state) : 0)
10844 +#define nx_info_state(n, m) (__nx_state(n) & (m))
10847 diff -NurpP --minimal linux-3.5/include/linux/vserver/cacct.h linux-3.5-vs2.3.4/include/linux/vserver/cacct.h
10848 --- linux-3.5/include/linux/vserver/cacct.h 1970-01-01 01:00:00.000000000 +0100
10849 +++ linux-3.5-vs2.3.4/include/linux/vserver/cacct.h 2012-07-23 01:45:55.000000000 +0200
10851 +#ifndef _VX_CACCT_H
10852 +#define _VX_CACCT_H
10855 +enum sock_acc_field {
10856 + VXA_SOCK_UNSPEC = 0,
10862 + VXA_SOCK_SIZE /* array size */
10865 +#endif /* _VX_CACCT_H */
10866 diff -NurpP --minimal linux-3.5/include/linux/vserver/cacct_cmd.h linux-3.5-vs2.3.4/include/linux/vserver/cacct_cmd.h
10867 --- linux-3.5/include/linux/vserver/cacct_cmd.h 1970-01-01 01:00:00.000000000 +0100
10868 +++ linux-3.5-vs2.3.4/include/linux/vserver/cacct_cmd.h 2012-07-23 01:45:55.000000000 +0200
10870 +#ifndef _VX_CACCT_CMD_H
10871 +#define _VX_CACCT_CMD_H
10874 +/* virtual host info name commands */
10876 +#define VCMD_sock_stat VC_CMD(VSTAT, 5, 0)
10878 +struct vcmd_sock_stat_v0 {
10880 + uint32_t count[3];
10881 + uint64_t total[3];
10887 +#include <linux/compiler.h>
10889 +extern int vc_sock_stat(struct vx_info *, void __user *);
10891 +#endif /* __KERNEL__ */
10892 +#endif /* _VX_CACCT_CMD_H */
10893 diff -NurpP --minimal linux-3.5/include/linux/vserver/cacct_def.h linux-3.5-vs2.3.4/include/linux/vserver/cacct_def.h
10894 --- linux-3.5/include/linux/vserver/cacct_def.h 1970-01-01 01:00:00.000000000 +0100
10895 +++ linux-3.5-vs2.3.4/include/linux/vserver/cacct_def.h 2012-07-23 01:45:55.000000000 +0200
10897 +#ifndef _VX_CACCT_DEF_H
10898 +#define _VX_CACCT_DEF_H
10900 +#include <asm/atomic.h>
10901 +#include <linux/vserver/cacct.h>
10904 +struct _vx_sock_acc {
10905 + atomic_long_t count;
10906 + atomic_long_t total;
10909 +/* context sub struct */
10911 +struct _vx_cacct {
10912 + struct _vx_sock_acc sock[VXA_SOCK_SIZE][3];
10913 + atomic_t slab[8];
10914 + atomic_t page[6][8];
10917 +#ifdef CONFIG_VSERVER_DEBUG
10919 +static inline void __dump_vx_cacct(struct _vx_cacct *cacct)
10923 + printk("\t_vx_cacct:");
10924 + for (i = 0; i < 6; i++) {
10925 + struct _vx_sock_acc *ptr = cacct->sock[i];
10927 + printk("\t [%d] =", i);
10928 + for (j = 0; j < 3; j++) {
10929 + printk(" [%d] = %8lu, %8lu", j,
10930 + atomic_long_read(&ptr[j].count),
10931 + atomic_long_read(&ptr[j].total));
10939 +#endif /* _VX_CACCT_DEF_H */
10940 diff -NurpP --minimal linux-3.5/include/linux/vserver/cacct_int.h linux-3.5-vs2.3.4/include/linux/vserver/cacct_int.h
10941 --- linux-3.5/include/linux/vserver/cacct_int.h 1970-01-01 01:00:00.000000000 +0100
10942 +++ linux-3.5-vs2.3.4/include/linux/vserver/cacct_int.h 2012-07-23 01:45:55.000000000 +0200
10944 +#ifndef _VX_CACCT_INT_H
10945 +#define _VX_CACCT_INT_H
10951 +unsigned long vx_sock_count(struct _vx_cacct *cacct, int type, int pos)
10953 + return atomic_long_read(&cacct->sock[type][pos].count);
10958 +unsigned long vx_sock_total(struct _vx_cacct *cacct, int type, int pos)
10960 + return atomic_long_read(&cacct->sock[type][pos].total);
10963 +#endif /* __KERNEL__ */
10964 +#endif /* _VX_CACCT_INT_H */
10965 diff -NurpP --minimal linux-3.5/include/linux/vserver/check.h linux-3.5-vs2.3.4/include/linux/vserver/check.h
10966 --- linux-3.5/include/linux/vserver/check.h 1970-01-01 01:00:00.000000000 +0100
10967 +++ linux-3.5-vs2.3.4/include/linux/vserver/check.h 2012-07-23 01:45:55.000000000 +0200
10969 +#ifndef _VS_CHECK_H
10970 +#define _VS_CHECK_H
10973 +#define MAX_S_CONTEXT 65535 /* Arbitrary limit */
10975 +#ifdef CONFIG_VSERVER_DYNAMIC_IDS
10976 +#define MIN_D_CONTEXT 49152 /* dynamic contexts start here */
10978 +#define MIN_D_CONTEXT 65536
10981 +/* check conditions */
10983 +#define VS_ADMIN 0x0001
10984 +#define VS_WATCH 0x0002
10985 +#define VS_HIDE 0x0004
10986 +#define VS_HOSTID 0x0008
10988 +#define VS_IDENT 0x0010
10989 +#define VS_EQUIV 0x0020
10990 +#define VS_PARENT 0x0040
10991 +#define VS_CHILD 0x0080
10993 +#define VS_ARG_MASK 0x00F0
10995 +#define VS_DYNAMIC 0x0100
10996 +#define VS_STATIC 0x0200
10998 +#define VS_ATR_MASK 0x0F00
11000 +#ifdef CONFIG_VSERVER_PRIVACY
11001 +#define VS_ADMIN_P (0)
11002 +#define VS_WATCH_P (0)
11004 +#define VS_ADMIN_P VS_ADMIN
11005 +#define VS_WATCH_P VS_WATCH
11008 +#define VS_HARDIRQ 0x1000
11009 +#define VS_SOFTIRQ 0x2000
11010 +#define VS_IRQ 0x4000
11012 +#define VS_IRQ_MASK 0xF000
11014 +#include <linux/hardirq.h>
11017 + * check current context for ADMIN/WATCH and
11018 + * optionally against supplied argument
11020 +static inline int __vs_check(int cid, int id, unsigned int mode)
11022 + if (mode & VS_ARG_MASK) {
11023 + if ((mode & VS_IDENT) && (id == cid))
11026 + if (mode & VS_ATR_MASK) {
11027 + if ((mode & VS_DYNAMIC) &&
11028 + (id >= MIN_D_CONTEXT) &&
11029 + (id <= MAX_S_CONTEXT))
11031 + if ((mode & VS_STATIC) &&
11032 + (id > 1) && (id < MIN_D_CONTEXT))
11035 + if (mode & VS_IRQ_MASK) {
11036 + if ((mode & VS_IRQ) && unlikely(in_interrupt()))
11038 + if ((mode & VS_HARDIRQ) && unlikely(in_irq()))
11040 + if ((mode & VS_SOFTIRQ) && unlikely(in_softirq()))
11043 + return (((mode & VS_ADMIN) && (cid == 0)) ||
11044 + ((mode & VS_WATCH) && (cid == 1)) ||
11045 + ((mode & VS_HOSTID) && (id == 0)));
11048 +#define vx_check(c, m) __vs_check(vx_current_xid(), c, (m) | VS_IRQ)
11050 +#define vx_weak_check(c, m) ((m) ? vx_check(c, m) : 1)
11053 +#define nx_check(c, m) __vs_check(nx_current_nid(), c, m)
11055 +#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1)
11058 diff -NurpP --minimal linux-3.5/include/linux/vserver/context.h linux-3.5-vs2.3.4/include/linux/vserver/context.h
11059 --- linux-3.5/include/linux/vserver/context.h 1970-01-01 01:00:00.000000000 +0100
11060 +++ linux-3.5-vs2.3.4/include/linux/vserver/context.h 2012-07-23 01:45:55.000000000 +0200
11062 +#ifndef _VX_CONTEXT_H
11063 +#define _VX_CONTEXT_H
11065 +#include <linux/types.h>
11066 +#include <linux/capability.h>
11069 +/* context flags */
11071 +#define VXF_INFO_SCHED 0x00000002
11072 +#define VXF_INFO_NPROC 0x00000004
11073 +#define VXF_INFO_PRIVATE 0x00000008
11075 +#define VXF_INFO_INIT 0x00000010
11076 +#define VXF_INFO_HIDE 0x00000020
11077 +#define VXF_INFO_ULIMIT 0x00000040
11078 +#define VXF_INFO_NSPACE 0x00000080
11080 +#define VXF_SCHED_HARD 0x00000100
11081 +#define VXF_SCHED_PRIO 0x00000200
11082 +#define VXF_SCHED_PAUSE 0x00000400
11084 +#define VXF_VIRT_MEM 0x00010000
11085 +#define VXF_VIRT_UPTIME 0x00020000
11086 +#define VXF_VIRT_CPU 0x00040000
11087 +#define VXF_VIRT_LOAD 0x00080000
11088 +#define VXF_VIRT_TIME 0x00100000
11090 +#define VXF_HIDE_MOUNT 0x01000000
11091 +/* was VXF_HIDE_NETIF 0x02000000 */
11092 +#define VXF_HIDE_VINFO 0x04000000
11094 +#define VXF_STATE_SETUP (1ULL << 32)
11095 +#define VXF_STATE_INIT (1ULL << 33)
11096 +#define VXF_STATE_ADMIN (1ULL << 34)
11098 +#define VXF_SC_HELPER (1ULL << 36)
11099 +#define VXF_REBOOT_KILL (1ULL << 37)
11100 +#define VXF_PERSISTENT (1ULL << 38)
11102 +#define VXF_FORK_RSS (1ULL << 48)
11103 +#define VXF_PROLIFIC (1ULL << 49)
11105 +#define VXF_IGNEG_NICE (1ULL << 52)
11107 +#define VXF_ONE_TIME (0x0007ULL << 32)
11109 +#define VXF_INIT_SET (VXF_STATE_SETUP | VXF_STATE_INIT | VXF_STATE_ADMIN)
11112 +/* context migration */
11114 +#define VXM_SET_INIT 0x00000001
11115 +#define VXM_SET_REAPER 0x00000002
11117 +/* context caps */
11119 +#define VXC_SET_UTSNAME 0x00000001
11120 +#define VXC_SET_RLIMIT 0x00000002
11121 +#define VXC_FS_SECURITY 0x00000004
11122 +#define VXC_FS_TRUSTED 0x00000008
11123 +#define VXC_TIOCSTI 0x00000010
11125 +/* was VXC_RAW_ICMP 0x00000100 */
11126 +#define VXC_SYSLOG 0x00001000
11127 +#define VXC_OOM_ADJUST 0x00002000
11128 +#define VXC_AUDIT_CONTROL 0x00004000
11130 +#define VXC_SECURE_MOUNT 0x00010000
11131 +#define VXC_SECURE_REMOUNT 0x00020000
11132 +#define VXC_BINARY_MOUNT 0x00040000
11134 +#define VXC_QUOTA_CTL 0x00100000
11135 +#define VXC_ADMIN_MAPPER 0x00200000
11136 +#define VXC_ADMIN_CLOOP 0x00400000
11138 +#define VXC_KTHREAD 0x01000000
11139 +#define VXC_NAMESPACE 0x02000000
11144 +#include <linux/list.h>
11145 +#include <linux/spinlock.h>
11146 +#include <linux/rcupdate.h>
11148 +#include "limit_def.h"
11149 +#include "sched_def.h"
11150 +#include "cvirt_def.h"
11151 +#include "cacct_def.h"
11152 +#include "device_def.h"
11154 +#define VX_SPACES 2
11156 +struct _vx_info_pc {
11157 + struct _vx_sched_pc sched_pc;
11158 + struct _vx_cvirt_pc cvirt_pc;
11161 +struct _vx_space {
11162 + unsigned long vx_nsmask; /* assignment mask */
11163 + struct nsproxy *vx_nsproxy; /* private namespaces */
11164 + struct fs_struct *vx_fs; /* private namespace fs */
11165 + const struct cred *vx_cred; /* task credentials */
11169 + struct hlist_node vx_hlist; /* linked list of contexts */
11170 + xid_t vx_id; /* context id */
11171 + atomic_t vx_usecnt; /* usage count */
11172 + atomic_t vx_tasks; /* tasks count */
11173 + struct vx_info *vx_parent; /* parent context */
11174 + int vx_state; /* context state */
11176 + struct _vx_space space[VX_SPACES]; /* namespace store */
11178 + uint64_t vx_flags; /* context flags */
11179 + uint64_t vx_ccaps; /* context caps (vserver) */
11180 + uint64_t vx_umask; /* unshare mask (guest) */
11181 + uint64_t vx_wmask; /* warn mask (guest) */
11182 + kernel_cap_t vx_bcaps; /* bounding caps (system) */
11184 + struct task_struct *vx_reaper; /* guest reaper process */
11185 + pid_t vx_initpid; /* PID of guest init */
11186 + int64_t vx_badness_bias; /* OOM points bias */
11188 + struct _vx_limit limit; /* vserver limits */
11189 + struct _vx_sched sched; /* vserver scheduler */
11190 + struct _vx_cvirt cvirt; /* virtual/bias stuff */
11191 + struct _vx_cacct cacct; /* context accounting */
11193 + struct _vx_device dmap; /* default device map targets */
11195 +#ifndef CONFIG_SMP
11196 + struct _vx_info_pc info_pc; /* per cpu data */
11198 + struct _vx_info_pc *ptr_pc; /* per cpu array */
11201 + wait_queue_head_t vx_wait; /* context exit waitqueue */
11202 + int reboot_cmd; /* last sys_reboot() cmd */
11203 + int exit_code; /* last process exit code */
11205 + char vx_name[65]; /* vserver name */
11208 +#ifndef CONFIG_SMP
11209 +#define vx_ptr_pc(vxi) (&(vxi)->info_pc)
11210 +#define vx_per_cpu(vxi, v, id) vx_ptr_pc(vxi)->v
11212 +#define vx_ptr_pc(vxi) ((vxi)->ptr_pc)
11213 +#define vx_per_cpu(vxi, v, id) per_cpu_ptr(vx_ptr_pc(vxi), id)->v
11216 +#define vx_cpu(vxi, v) vx_per_cpu(vxi, v, smp_processor_id())
11219 +struct vx_info_save {
11220 + struct vx_info *vxi;
11225 +/* status flags */
11227 +#define VXS_HASHED 0x0001
11228 +#define VXS_PAUSED 0x0010
11229 +#define VXS_SHUTDOWN 0x0100
11230 +#define VXS_HELPER 0x1000
11231 +#define VXS_RELEASED 0x8000
11234 +extern void claim_vx_info(struct vx_info *, struct task_struct *);
11235 +extern void release_vx_info(struct vx_info *, struct task_struct *);
11237 +extern struct vx_info *lookup_vx_info(int);
11238 +extern struct vx_info *lookup_or_create_vx_info(int);
11240 +extern int get_xid_list(int, unsigned int *, int);
11241 +extern int xid_is_hashed(xid_t);
11243 +extern int vx_migrate_task(struct task_struct *, struct vx_info *, int);
11245 +extern long vs_state_change(struct vx_info *, unsigned int);
11248 +#endif /* __KERNEL__ */
11249 +#endif /* _VX_CONTEXT_H */
11250 diff -NurpP --minimal linux-3.5/include/linux/vserver/context_cmd.h linux-3.5-vs2.3.4/include/linux/vserver/context_cmd.h
11251 --- linux-3.5/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00.000000000 +0100
11252 +++ linux-3.5-vs2.3.4/include/linux/vserver/context_cmd.h 2012-07-23 01:45:55.000000000 +0200
11254 +#ifndef _VX_CONTEXT_CMD_H
11255 +#define _VX_CONTEXT_CMD_H
11258 +/* vinfo commands */
11260 +#define VCMD_task_xid VC_CMD(VINFO, 1, 0)
11263 +extern int vc_task_xid(uint32_t);
11265 +#endif /* __KERNEL__ */
11267 +#define VCMD_vx_info VC_CMD(VINFO, 5, 0)
11269 +struct vcmd_vx_info_v0 {
11271 + uint32_t initpid;
11272 + /* more to come */
11276 +extern int vc_vx_info(struct vx_info *, void __user *);
11278 +#endif /* __KERNEL__ */
11280 +#define VCMD_ctx_stat VC_CMD(VSTAT, 0, 0)
11282 +struct vcmd_ctx_stat_v0 {
11285 + /* more to come */
11289 +extern int vc_ctx_stat(struct vx_info *, void __user *);
11291 +#endif /* __KERNEL__ */
11293 +/* context commands */
11295 +#define VCMD_ctx_create_v0 VC_CMD(VPROC, 1, 0)
11296 +#define VCMD_ctx_create VC_CMD(VPROC, 1, 1)
11298 +struct vcmd_ctx_create {
11299 + uint64_t flagword;
11302 +#define VCMD_ctx_migrate_v0 VC_CMD(PROCMIG, 1, 0)
11303 +#define VCMD_ctx_migrate VC_CMD(PROCMIG, 1, 1)
11305 +struct vcmd_ctx_migrate {
11306 + uint64_t flagword;
11310 +extern int vc_ctx_create(uint32_t, void __user *);
11311 +extern int vc_ctx_migrate(struct vx_info *, void __user *);
11313 +#endif /* __KERNEL__ */
11316 +/* flag commands */
11318 +#define VCMD_get_cflags VC_CMD(FLAGS, 1, 0)
11319 +#define VCMD_set_cflags VC_CMD(FLAGS, 2, 0)
11321 +struct vcmd_ctx_flags_v0 {
11322 + uint64_t flagword;
11327 +extern int vc_get_cflags(struct vx_info *, void __user *);
11328 +extern int vc_set_cflags(struct vx_info *, void __user *);
11330 +#endif /* __KERNEL__ */
11333 +/* context caps commands */
11335 +#define VCMD_get_ccaps VC_CMD(FLAGS, 3, 1)
11336 +#define VCMD_set_ccaps VC_CMD(FLAGS, 4, 1)
11338 +struct vcmd_ctx_caps_v1 {
11344 +extern int vc_get_ccaps(struct vx_info *, void __user *);
11345 +extern int vc_set_ccaps(struct vx_info *, void __user *);
11347 +#endif /* __KERNEL__ */
11350 +/* bcaps commands */
11352 +#define VCMD_get_bcaps VC_CMD(FLAGS, 9, 0)
11353 +#define VCMD_set_bcaps VC_CMD(FLAGS, 10, 0)
11355 +struct vcmd_bcaps {
11361 +extern int vc_get_bcaps(struct vx_info *, void __user *);
11362 +extern int vc_set_bcaps(struct vx_info *, void __user *);
11364 +#endif /* __KERNEL__ */
11367 +/* umask commands */
11369 +#define VCMD_get_umask VC_CMD(FLAGS, 13, 0)
11370 +#define VCMD_set_umask VC_CMD(FLAGS, 14, 0)
11372 +struct vcmd_umask {
11378 +extern int vc_get_umask(struct vx_info *, void __user *);
11379 +extern int vc_set_umask(struct vx_info *, void __user *);
11381 +#endif /* __KERNEL__ */
11384 +/* wmask commands */
11386 +#define VCMD_get_wmask VC_CMD(FLAGS, 15, 0)
11387 +#define VCMD_set_wmask VC_CMD(FLAGS, 16, 0)
11389 +struct vcmd_wmask {
11395 +extern int vc_get_wmask(struct vx_info *, void __user *);
11396 +extern int vc_set_wmask(struct vx_info *, void __user *);
11398 +#endif /* __KERNEL__ */
11403 +#define VCMD_get_badness VC_CMD(MEMCTRL, 5, 0)
11404 +#define VCMD_set_badness VC_CMD(MEMCTRL, 6, 0)
11406 +struct vcmd_badness_v0 {
11411 +extern int vc_get_badness(struct vx_info *, void __user *);
11412 +extern int vc_set_badness(struct vx_info *, void __user *);
11414 +#endif /* __KERNEL__ */
11415 +#endif /* _VX_CONTEXT_CMD_H */
11416 diff -NurpP --minimal linux-3.5/include/linux/vserver/cvirt.h linux-3.5-vs2.3.4/include/linux/vserver/cvirt.h
11417 --- linux-3.5/include/linux/vserver/cvirt.h 1970-01-01 01:00:00.000000000 +0100
11418 +++ linux-3.5-vs2.3.4/include/linux/vserver/cvirt.h 2012-07-23 01:45:55.000000000 +0200
11420 +#ifndef _VX_CVIRT_H
11421 +#define _VX_CVIRT_H
11428 +void vx_vsi_boottime(struct timespec *);
11430 +void vx_vsi_uptime(struct timespec *, struct timespec *);
11435 +void vx_update_load(struct vx_info *);
11438 +int vx_do_syslog(int, char __user *, int);
11440 +#endif /* __KERNEL__ */
11441 +#endif /* _VX_CVIRT_H */
11442 diff -NurpP --minimal linux-3.5/include/linux/vserver/cvirt_cmd.h linux-3.5-vs2.3.4/include/linux/vserver/cvirt_cmd.h
11443 --- linux-3.5/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00.000000000 +0100
11444 +++ linux-3.5-vs2.3.4/include/linux/vserver/cvirt_cmd.h 2012-07-23 01:45:55.000000000 +0200
11446 +#ifndef _VX_CVIRT_CMD_H
11447 +#define _VX_CVIRT_CMD_H
11450 +/* virtual host info name commands */
11452 +#define VCMD_set_vhi_name VC_CMD(VHOST, 1, 0)
11453 +#define VCMD_get_vhi_name VC_CMD(VHOST, 2, 0)
11455 +struct vcmd_vhi_name_v0 {
11461 +enum vhi_name_field {
11462 + VHIN_CONTEXT = 0,
11474 +#include <linux/compiler.h>
11476 +extern int vc_set_vhi_name(struct vx_info *, void __user *);
11477 +extern int vc_get_vhi_name(struct vx_info *, void __user *);
11479 +#endif /* __KERNEL__ */
11481 +#define VCMD_virt_stat VC_CMD(VSTAT, 3, 0)
11483 +struct vcmd_virt_stat_v0 {
11486 + uint32_t nr_threads;
11487 + uint32_t nr_running;
11488 + uint32_t nr_uninterruptible;
11489 + uint32_t nr_onhold;
11490 + uint32_t nr_forks;
11491 + uint32_t load[3];
11495 +extern int vc_virt_stat(struct vx_info *, void __user *);
11497 +#endif /* __KERNEL__ */
11498 +#endif /* _VX_CVIRT_CMD_H */
11499 diff -NurpP --minimal linux-3.5/include/linux/vserver/cvirt_def.h linux-3.5-vs2.3.4/include/linux/vserver/cvirt_def.h
11500 --- linux-3.5/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00.000000000 +0100
11501 +++ linux-3.5-vs2.3.4/include/linux/vserver/cvirt_def.h 2012-07-23 01:45:55.000000000 +0200
11503 +#ifndef _VX_CVIRT_DEF_H
11504 +#define _VX_CVIRT_DEF_H
11506 +#include <linux/jiffies.h>
11507 +#include <linux/spinlock.h>
11508 +#include <linux/wait.h>
11509 +#include <linux/time.h>
11510 +#include <asm/atomic.h>
11513 +struct _vx_usage_stat {
11517 + uint64_t softirq;
11523 +struct _vx_syslog {
11524 + wait_queue_head_t log_wait;
11525 + spinlock_t logbuf_lock; /* lock for the log buffer */
11527 + unsigned long log_start; /* next char to be read by syslog() */
11528 + unsigned long con_start; /* next char to be sent to consoles */
11529 + unsigned long log_end; /* most-recently-written-char + 1 */
11530 + unsigned long logged_chars; /* #chars since last read+clear operation */
11532 + char log_buf[1024];
11536 +/* context sub struct */
11538 +struct _vx_cvirt {
11539 + atomic_t nr_threads; /* number of current threads */
11540 + atomic_t nr_running; /* number of running threads */
11541 + atomic_t nr_uninterruptible; /* number of uninterruptible threads */
11543 + atomic_t nr_onhold; /* processes on hold */
11544 + uint32_t onhold_last; /* jiffies when put on hold */
11546 + struct timespec bias_ts; /* time offset to the host */
11547 + struct timespec bias_idle;
11548 + struct timespec bias_uptime; /* context creation point */
11549 + uint64_t bias_clock; /* offset in clock_t */
11551 + spinlock_t load_lock; /* lock for the load averages */
11552 + atomic_t load_updates; /* nr of load updates done so far */
11553 + uint32_t load_last; /* last time load was calculated */
11554 + uint32_t load[3]; /* load averages 1,5,15 */
11556 + atomic_t total_forks; /* number of forks so far */
11558 + struct _vx_syslog syslog;
11561 +struct _vx_cvirt_pc {
11562 + struct _vx_usage_stat cpustat;
11566 +#ifdef CONFIG_VSERVER_DEBUG
11568 +static inline void __dump_vx_cvirt(struct _vx_cvirt *cvirt)
11570 + printk("\t_vx_cvirt:\n");
11571 + printk("\t threads: %4d, %4d, %4d, %4d\n",
11572 + atomic_read(&cvirt->nr_threads),
11573 + atomic_read(&cvirt->nr_running),
11574 + atomic_read(&cvirt->nr_uninterruptible),
11575 + atomic_read(&cvirt->nr_onhold));
11576 + /* add rest here */
11577 + printk("\t total_forks = %d\n", atomic_read(&cvirt->total_forks));
11582 +#endif /* _VX_CVIRT_DEF_H */
11583 diff -NurpP --minimal linux-3.5/include/linux/vserver/debug.h linux-3.5-vs2.3.4/include/linux/vserver/debug.h
11584 --- linux-3.5/include/linux/vserver/debug.h 1970-01-01 01:00:00.000000000 +0100
11585 +++ linux-3.5-vs2.3.4/include/linux/vserver/debug.h 2012-07-23 01:45:55.000000000 +0200
11587 +#ifndef _VX_DEBUG_H
11588 +#define _VX_DEBUG_H
11591 +#define VXD_CBIT(n, m) (vs_debug_ ## n & (1 << (m)))
11592 +#define VXD_CMIN(n, m) (vs_debug_ ## n > (m))
11593 +#define VXD_MASK(n, m) (vs_debug_ ## n & (m))
11595 +#define VXD_DEV(d) (d), (d)->bd_inode->i_ino, \
11596 + imajor((d)->bd_inode), iminor((d)->bd_inode)
11597 +#define VXF_DEV "%p[%lu,%d:%d]"
11599 +#if defined(CONFIG_QUOTES_UTF8)
11600 +#define VS_Q_LQM "\xc2\xbb"
11601 +#define VS_Q_RQM "\xc2\xab"
11602 +#elif defined(CONFIG_QUOTES_ASCII)
11603 +#define VS_Q_LQM "\x27"
11604 +#define VS_Q_RQM "\x27"
11606 +#define VS_Q_LQM "\xbb"
11607 +#define VS_Q_RQM "\xab"
11610 +#define VS_Q(f) VS_Q_LQM f VS_Q_RQM
11613 +#define vxd_path(p) \
11614 + ({ static char _buffer[PATH_MAX]; \
11615 + d_path(p, _buffer, sizeof(_buffer)); })
11617 +#define vxd_cond_path(n) \
11618 + ((n) ? vxd_path(&(n)->path) : "<null>" )
11621 +#ifdef CONFIG_VSERVER_DEBUG
11623 +extern unsigned int vs_debug_switch;
11624 +extern unsigned int vs_debug_xid;
11625 +extern unsigned int vs_debug_nid;
11626 +extern unsigned int vs_debug_tag;
11627 +extern unsigned int vs_debug_net;
11628 +extern unsigned int vs_debug_limit;
11629 +extern unsigned int vs_debug_cres;
11630 +extern unsigned int vs_debug_dlim;
11631 +extern unsigned int vs_debug_quota;
11632 +extern unsigned int vs_debug_cvirt;
11633 +extern unsigned int vs_debug_space;
11634 +extern unsigned int vs_debug_perm;
11635 +extern unsigned int vs_debug_misc;
11638 +#define VX_LOGLEVEL "vxD: "
11639 +#define VX_PROC_FMT "%p: "
11640 +#define VX_PROCESS current
11642 +#define vxdprintk(c, f, x...) \
11645 + printk(VX_LOGLEVEL VX_PROC_FMT f "\n", \
11646 + VX_PROCESS , ##x); \
11649 +#define vxlprintk(c, f, x...) \
11652 + printk(VX_LOGLEVEL f " @%s:%d\n", x); \
11655 +#define vxfprintk(c, f, x...) \
11658 + printk(VX_LOGLEVEL f " %s@%s:%d\n", x); \
11664 +void dump_vx_info(struct vx_info *, int);
11665 +void dump_vx_info_inactive(int);
11667 +#else /* CONFIG_VSERVER_DEBUG */
11669 +#define vs_debug_switch 0
11670 +#define vs_debug_xid 0
11671 +#define vs_debug_nid 0
11672 +#define vs_debug_tag 0
11673 +#define vs_debug_net 0
11674 +#define vs_debug_limit 0
11675 +#define vs_debug_cres 0
11676 +#define vs_debug_dlim 0
11677 +#define vs_debug_quota 0
11678 +#define vs_debug_cvirt 0
11679 +#define vs_debug_space 0
11680 +#define vs_debug_perm 0
11681 +#define vs_debug_misc 0
11683 +#define vxdprintk(x...) do { } while (0)
11684 +#define vxlprintk(x...) do { } while (0)
11685 +#define vxfprintk(x...) do { } while (0)
11687 +#endif /* CONFIG_VSERVER_DEBUG */
11690 +#ifdef CONFIG_VSERVER_WARN
11692 +#define VX_WARNLEVEL KERN_WARNING "vxW: "
11693 +#define VX_WARN_TASK "[" VS_Q("%s") ",%u:#%u|%u|%u] "
11694 +#define VX_WARN_XID "[xid #%u] "
11695 +#define VX_WARN_NID "[nid #%u] "
11696 +#define VX_WARN_TAG "[tag #%u] "
11698 +#define vxwprintk(c, f, x...) \
11701 + printk(VX_WARNLEVEL f "\n", ##x); \
11704 +#else /* CONFIG_VSERVER_WARN */
11706 +#define vxwprintk(x...) do { } while (0)
11708 +#endif /* CONFIG_VSERVER_WARN */
11710 +#define vxwprintk_task(c, f, x...) \
11711 + vxwprintk(c, VX_WARN_TASK f, \
11712 + current->comm, current->pid, \
11713 + current->xid, current->nid, current->tag, ##x)
11714 +#define vxwprintk_xid(c, f, x...) \
11715 + vxwprintk(c, VX_WARN_XID f, current->xid, x)
11716 +#define vxwprintk_nid(c, f, x...) \
11717 + vxwprintk(c, VX_WARN_NID f, current->nid, x)
11718 +#define vxwprintk_tag(c, f, x...) \
11719 + vxwprintk(c, VX_WARN_TAG f, current->tag, x)
11721 +#ifdef CONFIG_VSERVER_DEBUG
11722 +#define vxd_assert_lock(l) assert_spin_locked(l)
11723 +#define vxd_assert(c, f, x...) vxlprintk(!(c), \
11724 + "assertion [" f "] failed.", ##x, __FILE__, __LINE__)
11726 +#define vxd_assert_lock(l) do { } while (0)
11727 +#define vxd_assert(c, f, x...) do { } while (0)
11731 +#endif /* _VX_DEBUG_H */
11732 diff -NurpP --minimal linux-3.5/include/linux/vserver/debug_cmd.h linux-3.5-vs2.3.4/include/linux/vserver/debug_cmd.h
11733 --- linux-3.5/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00.000000000 +0100
11734 +++ linux-3.5-vs2.3.4/include/linux/vserver/debug_cmd.h 2012-07-23 01:45:55.000000000 +0200
11736 +#ifndef _VX_DEBUG_CMD_H
11737 +#define _VX_DEBUG_CMD_H
11740 +/* debug commands */
11742 +#define VCMD_dump_history VC_CMD(DEBUG, 1, 0)
11744 +#define VCMD_read_history VC_CMD(DEBUG, 5, 0)
11745 +#define VCMD_read_monitor VC_CMD(DEBUG, 6, 0)
11747 +struct vcmd_read_history_v0 {
11750 + char __user *data;
11753 +struct vcmd_read_monitor_v0 {
11756 + char __user *data;
11762 +#ifdef CONFIG_COMPAT
11764 +#include <asm/compat.h>
11766 +struct vcmd_read_history_v0_x32 {
11769 + compat_uptr_t data_ptr;
11772 +struct vcmd_read_monitor_v0_x32 {
11775 + compat_uptr_t data_ptr;
11778 +#endif /* CONFIG_COMPAT */
11780 +extern int vc_dump_history(uint32_t);
11782 +extern int vc_read_history(uint32_t, void __user *);
11783 +extern int vc_read_monitor(uint32_t, void __user *);
11785 +#ifdef CONFIG_COMPAT
11787 +extern int vc_read_history_x32(uint32_t, void __user *);
11788 +extern int vc_read_monitor_x32(uint32_t, void __user *);
11790 +#endif /* CONFIG_COMPAT */
11792 +#endif /* __KERNEL__ */
11793 +#endif /* _VX_DEBUG_CMD_H */
11794 diff -NurpP --minimal linux-3.5/include/linux/vserver/device.h linux-3.5-vs2.3.4/include/linux/vserver/device.h
11795 --- linux-3.5/include/linux/vserver/device.h 1970-01-01 01:00:00.000000000 +0100
11796 +++ linux-3.5-vs2.3.4/include/linux/vserver/device.h 2012-07-23 01:45:55.000000000 +0200
11798 +#ifndef _VX_DEVICE_H
11799 +#define _VX_DEVICE_H
11802 +#define DATTR_CREATE 0x00000001
11803 +#define DATTR_OPEN 0x00000002
11805 +#define DATTR_REMAP 0x00000010
11807 +#define DATTR_MASK 0x00000013
11810 +#else /* _VX_DEVICE_H */
11811 +#warning duplicate inclusion
11812 +#endif /* _VX_DEVICE_H */
11813 diff -NurpP --minimal linux-3.5/include/linux/vserver/device_cmd.h linux-3.5-vs2.3.4/include/linux/vserver/device_cmd.h
11814 --- linux-3.5/include/linux/vserver/device_cmd.h 1970-01-01 01:00:00.000000000 +0100
11815 +++ linux-3.5-vs2.3.4/include/linux/vserver/device_cmd.h 2012-07-23 01:45:55.000000000 +0200
11817 +#ifndef _VX_DEVICE_CMD_H
11818 +#define _VX_DEVICE_CMD_H
11821 +/* device vserver commands */
11823 +#define VCMD_set_mapping VC_CMD(DEVICE, 1, 0)
11824 +#define VCMD_unset_mapping VC_CMD(DEVICE, 2, 0)
11826 +struct vcmd_set_mapping_v0 {
11827 + const char __user *device;
11828 + const char __user *target;
11835 +#ifdef CONFIG_COMPAT
11837 +#include <asm/compat.h>
11839 +struct vcmd_set_mapping_v0_x32 {
11840 + compat_uptr_t device_ptr;
11841 + compat_uptr_t target_ptr;
11845 +#endif /* CONFIG_COMPAT */
11847 +#include <linux/compiler.h>
11849 +extern int vc_set_mapping(struct vx_info *, void __user *);
11850 +extern int vc_unset_mapping(struct vx_info *, void __user *);
11852 +#ifdef CONFIG_COMPAT
11854 +extern int vc_set_mapping_x32(struct vx_info *, void __user *);
11855 +extern int vc_unset_mapping_x32(struct vx_info *, void __user *);
11857 +#endif /* CONFIG_COMPAT */
11859 +#endif /* __KERNEL__ */
11860 +#endif /* _VX_DEVICE_CMD_H */
11861 diff -NurpP --minimal linux-3.5/include/linux/vserver/device_def.h linux-3.5-vs2.3.4/include/linux/vserver/device_def.h
11862 --- linux-3.5/include/linux/vserver/device_def.h 1970-01-01 01:00:00.000000000 +0100
11863 +++ linux-3.5-vs2.3.4/include/linux/vserver/device_def.h 2012-07-23 01:45:55.000000000 +0200
11865 +#ifndef _VX_DEVICE_DEF_H
11866 +#define _VX_DEVICE_DEF_H
11868 +#include <linux/types.h>
11870 +struct vx_dmap_target {
11875 +struct _vx_device {
11876 +#ifdef CONFIG_VSERVER_DEVICE
11877 + struct vx_dmap_target targets[2];
11881 +#endif /* _VX_DEVICE_DEF_H */
11882 diff -NurpP --minimal linux-3.5/include/linux/vserver/dlimit.h linux-3.5-vs2.3.4/include/linux/vserver/dlimit.h
11883 --- linux-3.5/include/linux/vserver/dlimit.h 1970-01-01 01:00:00.000000000 +0100
11884 +++ linux-3.5-vs2.3.4/include/linux/vserver/dlimit.h 2012-07-23 01:45:55.000000000 +0200
11886 +#ifndef _VX_DLIMIT_H
11887 +#define _VX_DLIMIT_H
11889 +#include "switch.h"
11894 +/* keep in sync with CDLIM_INFINITY */
11896 +#define DLIM_INFINITY (~0ULL)
11898 +#include <linux/spinlock.h>
11899 +#include <linux/rcupdate.h>
11901 +struct super_block;
11904 + struct hlist_node dl_hlist; /* linked list of contexts */
11905 + struct rcu_head dl_rcu; /* the rcu head */
11906 + tag_t dl_tag; /* context tag */
11907 + atomic_t dl_usecnt; /* usage count */
11908 + atomic_t dl_refcnt; /* reference count */
11910 + struct super_block *dl_sb; /* associated superblock */
11912 + spinlock_t dl_lock; /* protect the values */
11914 + unsigned long long dl_space_used; /* used space in bytes */
11915 + unsigned long long dl_space_total; /* maximum space in bytes */
11916 + unsigned long dl_inodes_used; /* used inodes */
11917 + unsigned long dl_inodes_total; /* maximum inodes */
11919 + unsigned int dl_nrlmult; /* non root limit mult */
11924 +extern void rcu_free_dl_info(struct rcu_head *);
11925 +extern void unhash_dl_info(struct dl_info *);
11927 +extern struct dl_info *locate_dl_info(struct super_block *, tag_t);
11932 +extern void vx_vsi_statfs(struct super_block *, struct kstatfs *);
11934 +typedef uint64_t dlsize_t;
11936 +#endif /* __KERNEL__ */
11937 +#else /* _VX_DLIMIT_H */
11938 +#warning duplicate inclusion
11939 +#endif /* _VX_DLIMIT_H */
11940 diff -NurpP --minimal linux-3.5/include/linux/vserver/dlimit_cmd.h linux-3.5-vs2.3.4/include/linux/vserver/dlimit_cmd.h
11941 --- linux-3.5/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00.000000000 +0100
11942 +++ linux-3.5-vs2.3.4/include/linux/vserver/dlimit_cmd.h 2012-07-23 01:45:55.000000000 +0200
11944 +#ifndef _VX_DLIMIT_CMD_H
11945 +#define _VX_DLIMIT_CMD_H
11948 +/* dlimit vserver commands */
11950 +#define VCMD_add_dlimit VC_CMD(DLIMIT, 1, 0)
11951 +#define VCMD_rem_dlimit VC_CMD(DLIMIT, 2, 0)
11953 +#define VCMD_set_dlimit VC_CMD(DLIMIT, 5, 0)
11954 +#define VCMD_get_dlimit VC_CMD(DLIMIT, 6, 0)
11956 +struct vcmd_ctx_dlimit_base_v0 {
11957 + const char __user *name;
11961 +struct vcmd_ctx_dlimit_v0 {
11962 + const char __user *name;
11963 + uint32_t space_used; /* used space in kbytes */
11964 + uint32_t space_total; /* maximum space in kbytes */
11965 + uint32_t inodes_used; /* used inodes */
11966 + uint32_t inodes_total; /* maximum inodes */
11967 + uint32_t reserved; /* reserved for root in % */
11971 +#define CDLIM_UNSET ((uint32_t)0UL)
11972 +#define CDLIM_INFINITY ((uint32_t)~0UL)
11973 +#define CDLIM_KEEP ((uint32_t)~1UL)
11975 +#define DLIME_UNIT 0
11976 +#define DLIME_KILO 1
11977 +#define DLIME_MEGA 2
11978 +#define DLIME_GIGA 3
11980 +#define DLIMF_SHIFT 0x10
11982 +#define DLIMS_USED 0
11983 +#define DLIMS_TOTAL 2
11986 +uint64_t dlimit_space_32to64(uint32_t val, uint32_t flags, int shift)
11988 + int exp = (flags & DLIMF_SHIFT) ?
11989 + (flags >> shift) & DLIME_GIGA : DLIME_KILO;
11990 + return ((uint64_t)val) << (10 * exp);
11994 +uint32_t dlimit_space_64to32(uint64_t val, uint32_t *flags, int shift)
11998 + if (*flags & DLIMF_SHIFT) {
11999 + while (val > (1LL << 32) && (exp < 3)) {
12003 + *flags &= ~(DLIME_GIGA << shift);
12004 + *flags |= exp << shift;
12012 +#ifdef CONFIG_COMPAT
12014 +#include <asm/compat.h>
12016 +struct vcmd_ctx_dlimit_base_v0_x32 {
12017 + compat_uptr_t name_ptr;
12021 +struct vcmd_ctx_dlimit_v0_x32 {
12022 + compat_uptr_t name_ptr;
12023 + uint32_t space_used; /* used space in kbytes */
12024 + uint32_t space_total; /* maximum space in kbytes */
12025 + uint32_t inodes_used; /* used inodes */
12026 + uint32_t inodes_total; /* maximum inodes */
12027 + uint32_t reserved; /* reserved for root in % */
12031 +#endif /* CONFIG_COMPAT */
12033 +#include <linux/compiler.h>
12035 +extern int vc_add_dlimit(uint32_t, void __user *);
12036 +extern int vc_rem_dlimit(uint32_t, void __user *);
12038 +extern int vc_set_dlimit(uint32_t, void __user *);
12039 +extern int vc_get_dlimit(uint32_t, void __user *);
12041 +#ifdef CONFIG_COMPAT
12043 +extern int vc_add_dlimit_x32(uint32_t, void __user *);
12044 +extern int vc_rem_dlimit_x32(uint32_t, void __user *);
12046 +extern int vc_set_dlimit_x32(uint32_t, void __user *);
12047 +extern int vc_get_dlimit_x32(uint32_t, void __user *);
12049 +#endif /* CONFIG_COMPAT */
12051 +#endif /* __KERNEL__ */
12052 +#endif /* _VX_DLIMIT_CMD_H */
12053 diff -NurpP --minimal linux-3.5/include/linux/vserver/global.h linux-3.5-vs2.3.4/include/linux/vserver/global.h
12054 --- linux-3.5/include/linux/vserver/global.h 1970-01-01 01:00:00.000000000 +0100
12055 +++ linux-3.5-vs2.3.4/include/linux/vserver/global.h 2012-07-23 01:45:55.000000000 +0200
12057 +#ifndef _VX_GLOBAL_H
12058 +#define _VX_GLOBAL_H
12061 +extern atomic_t vx_global_ctotal;
12062 +extern atomic_t vx_global_cactive;
12064 +extern atomic_t nx_global_ctotal;
12065 +extern atomic_t nx_global_cactive;
12067 +extern atomic_t vs_global_nsproxy;
12068 +extern atomic_t vs_global_fs;
12069 +extern atomic_t vs_global_mnt_ns;
12070 +extern atomic_t vs_global_uts_ns;
12071 +extern atomic_t vs_global_user_ns;
12072 +extern atomic_t vs_global_pid_ns;
12075 +#endif /* _VX_GLOBAL_H */
12076 diff -NurpP --minimal linux-3.5/include/linux/vserver/history.h linux-3.5-vs2.3.4/include/linux/vserver/history.h
12077 --- linux-3.5/include/linux/vserver/history.h 1970-01-01 01:00:00.000000000 +0100
12078 +++ linux-3.5-vs2.3.4/include/linux/vserver/history.h 2012-07-23 01:45:55.000000000 +0200
12080 +#ifndef _VX_HISTORY_H
12081 +#define _VX_HISTORY_H
12086 + VXH_THROW_OOPS = 1,
12090 + VXH_INIT_VX_INFO,
12093 + VXH_CLAIM_VX_INFO,
12094 + VXH_RELEASE_VX_INFO,
12095 + VXH_ALLOC_VX_INFO,
12096 + VXH_DEALLOC_VX_INFO,
12097 + VXH_HASH_VX_INFO,
12098 + VXH_UNHASH_VX_INFO,
12100 + VXH_LOOKUP_VX_INFO,
12101 + VXH_CREATE_VX_INFO,
12104 +struct _vxhe_vxi {
12105 + struct vx_info *ptr;
12111 +struct _vxhe_set_clr {
12115 +struct _vxhe_loc_lookup {
12119 +struct _vx_hist_entry {
12121 + unsigned short seq;
12122 + unsigned short type;
12123 + struct _vxhe_vxi vxi;
12125 + struct _vxhe_set_clr sc;
12126 + struct _vxhe_loc_lookup ll;
12130 +#ifdef CONFIG_VSERVER_HISTORY
12132 +extern unsigned volatile int vxh_active;
12134 +struct _vx_hist_entry *vxh_advance(void *loc);
12138 +void __vxh_copy_vxi(struct _vx_hist_entry *entry, struct vx_info *vxi)
12140 + entry->vxi.ptr = vxi;
12142 + entry->vxi.usecnt = atomic_read(&vxi->vx_usecnt);
12143 + entry->vxi.tasks = atomic_read(&vxi->vx_tasks);
12144 + entry->vxi.xid = vxi->vx_id;
12149 +#define __HERE__ current_text_addr()
12151 +#define __VXH_BODY(__type, __data, __here) \
12152 + struct _vx_hist_entry *entry; \
12154 + preempt_disable(); \
12155 + entry = vxh_advance(__here); \
12157 + entry->type = __type; \
12158 + preempt_enable();
12161 + /* pass vxi only */
12163 +#define __VXH_SMPL \
12164 + __vxh_copy_vxi(entry, vxi)
12167 +void __vxh_smpl(struct vx_info *vxi, int __type, void *__here)
12169 + __VXH_BODY(__type, __VXH_SMPL, __here)
12172 + /* pass vxi and data (void *) */
12174 +#define __VXH_DATA \
12175 + __vxh_copy_vxi(entry, vxi); \
12176 + entry->sc.data = data
12179 +void __vxh_data(struct vx_info *vxi, void *data,
12180 + int __type, void *__here)
12182 + __VXH_BODY(__type, __VXH_DATA, __here)
12185 + /* pass vxi and arg (long) */
12187 +#define __VXH_LONG \
12188 + __vxh_copy_vxi(entry, vxi); \
12189 + entry->ll.arg = arg
12192 +void __vxh_long(struct vx_info *vxi, long arg,
12193 + int __type, void *__here)
12195 + __VXH_BODY(__type, __VXH_LONG, __here)
12200 +void __vxh_throw_oops(void *__here)
12202 + __VXH_BODY(VXH_THROW_OOPS, {}, __here);
12203 + /* prevent further acquisition */
12208 +#define vxh_throw_oops() __vxh_throw_oops(__HERE__);
12210 +#define __vxh_get_vx_info(v, h) __vxh_smpl(v, VXH_GET_VX_INFO, h);
12211 +#define __vxh_put_vx_info(v, h) __vxh_smpl(v, VXH_PUT_VX_INFO, h);
12213 +#define __vxh_init_vx_info(v, d, h) \
12214 + __vxh_data(v, d, VXH_INIT_VX_INFO, h);
12215 +#define __vxh_set_vx_info(v, d, h) \
12216 + __vxh_data(v, d, VXH_SET_VX_INFO, h);
12217 +#define __vxh_clr_vx_info(v, d, h) \
12218 + __vxh_data(v, d, VXH_CLR_VX_INFO, h);
12220 +#define __vxh_claim_vx_info(v, d, h) \
12221 + __vxh_data(v, d, VXH_CLAIM_VX_INFO, h);
12222 +#define __vxh_release_vx_info(v, d, h) \
12223 + __vxh_data(v, d, VXH_RELEASE_VX_INFO, h);
12225 +#define vxh_alloc_vx_info(v) \
12226 + __vxh_smpl(v, VXH_ALLOC_VX_INFO, __HERE__);
12227 +#define vxh_dealloc_vx_info(v) \
12228 + __vxh_smpl(v, VXH_DEALLOC_VX_INFO, __HERE__);
12230 +#define vxh_hash_vx_info(v) \
12231 + __vxh_smpl(v, VXH_HASH_VX_INFO, __HERE__);
12232 +#define vxh_unhash_vx_info(v) \
12233 + __vxh_smpl(v, VXH_UNHASH_VX_INFO, __HERE__);
12235 +#define vxh_loc_vx_info(v, l) \
12236 + __vxh_long(v, l, VXH_LOC_VX_INFO, __HERE__);
12237 +#define vxh_lookup_vx_info(v, l) \
12238 + __vxh_long(v, l, VXH_LOOKUP_VX_INFO, __HERE__);
12239 +#define vxh_create_vx_info(v, l) \
12240 + __vxh_long(v, l, VXH_CREATE_VX_INFO, __HERE__);
12242 +extern void vxh_dump_history(void);
12245 +#else /* CONFIG_VSERVER_HISTORY */
12247 +#define __HERE__ 0
12249 +#define vxh_throw_oops() do { } while (0)
12251 +#define __vxh_get_vx_info(v, h) do { } while (0)
12252 +#define __vxh_put_vx_info(v, h) do { } while (0)
12254 +#define __vxh_init_vx_info(v, d, h) do { } while (0)
12255 +#define __vxh_set_vx_info(v, d, h) do { } while (0)
12256 +#define __vxh_clr_vx_info(v, d, h) do { } while (0)
12258 +#define __vxh_claim_vx_info(v, d, h) do { } while (0)
12259 +#define __vxh_release_vx_info(v, d, h) do { } while (0)
12261 +#define vxh_alloc_vx_info(v) do { } while (0)
12262 +#define vxh_dealloc_vx_info(v) do { } while (0)
12264 +#define vxh_hash_vx_info(v) do { } while (0)
12265 +#define vxh_unhash_vx_info(v) do { } while (0)
12267 +#define vxh_loc_vx_info(v, l) do { } while (0)
12268 +#define vxh_lookup_vx_info(v, l) do { } while (0)
12269 +#define vxh_create_vx_info(v, l) do { } while (0)
12271 +#define vxh_dump_history() do { } while (0)
12274 +#endif /* CONFIG_VSERVER_HISTORY */
12276 +#endif /* _VX_HISTORY_H */
12277 diff -NurpP --minimal linux-3.5/include/linux/vserver/inode.h linux-3.5-vs2.3.4/include/linux/vserver/inode.h
12278 --- linux-3.5/include/linux/vserver/inode.h 1970-01-01 01:00:00.000000000 +0100
12279 +++ linux-3.5-vs2.3.4/include/linux/vserver/inode.h 2012-07-23 01:45:55.000000000 +0200
12281 +#ifndef _VX_INODE_H
12282 +#define _VX_INODE_H
12285 +#define IATTR_TAG 0x01000000
12287 +#define IATTR_ADMIN 0x00000001
12288 +#define IATTR_WATCH 0x00000002
12289 +#define IATTR_HIDE 0x00000004
12290 +#define IATTR_FLAGS 0x00000007
12292 +#define IATTR_BARRIER 0x00010000
12293 +#define IATTR_IXUNLINK 0x00020000
12294 +#define IATTR_IMMUTABLE 0x00040000
12295 +#define IATTR_COW 0x00080000
12300 +#ifdef CONFIG_VSERVER_PROC_SECURE
12301 +#define IATTR_PROC_DEFAULT ( IATTR_ADMIN | IATTR_HIDE )
12302 +#define IATTR_PROC_SYMLINK ( IATTR_ADMIN )
12304 +#define IATTR_PROC_DEFAULT ( IATTR_ADMIN )
12305 +#define IATTR_PROC_SYMLINK ( IATTR_ADMIN )
12308 +#define vx_hide_check(c, m) (((m) & IATTR_HIDE) ? vx_check(c, m) : 1)
12310 +#endif /* __KERNEL__ */
12312 +/* inode ioctls */
12314 +#define FIOC_GETXFLG _IOR('x', 5, long)
12315 +#define FIOC_SETXFLG _IOW('x', 6, long)
12317 +#else /* _VX_INODE_H */
12318 +#warning duplicate inclusion
12319 +#endif /* _VX_INODE_H */
12320 diff -NurpP --minimal linux-3.5/include/linux/vserver/inode_cmd.h linux-3.5-vs2.3.4/include/linux/vserver/inode_cmd.h
12321 --- linux-3.5/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00.000000000 +0100
12322 +++ linux-3.5-vs2.3.4/include/linux/vserver/inode_cmd.h 2012-07-23 01:45:55.000000000 +0200
12324 +#ifndef _VX_INODE_CMD_H
12325 +#define _VX_INODE_CMD_H
12328 +/* inode vserver commands */
12330 +#define VCMD_get_iattr VC_CMD(INODE, 1, 1)
12331 +#define VCMD_set_iattr VC_CMD(INODE, 2, 1)
12333 +#define VCMD_fget_iattr VC_CMD(INODE, 3, 0)
12334 +#define VCMD_fset_iattr VC_CMD(INODE, 4, 0)
12336 +struct vcmd_ctx_iattr_v1 {
12337 + const char __user *name;
12343 +struct vcmd_ctx_fiattr_v0 {
12353 +#ifdef CONFIG_COMPAT
12355 +#include <asm/compat.h>
12357 +struct vcmd_ctx_iattr_v1_x32 {
12358 + compat_uptr_t name_ptr;
12364 +#endif /* CONFIG_COMPAT */
12366 +#include <linux/compiler.h>
12368 +extern int vc_get_iattr(void __user *);
12369 +extern int vc_set_iattr(void __user *);
12371 +extern int vc_fget_iattr(uint32_t, void __user *);
12372 +extern int vc_fset_iattr(uint32_t, void __user *);
12374 +#ifdef CONFIG_COMPAT
12376 +extern int vc_get_iattr_x32(void __user *);
12377 +extern int vc_set_iattr_x32(void __user *);
12379 +#endif /* CONFIG_COMPAT */
12381 +#endif /* __KERNEL__ */
12382 +#endif /* _VX_INODE_CMD_H */
12383 diff -NurpP --minimal linux-3.5/include/linux/vserver/limit.h linux-3.5-vs2.3.4/include/linux/vserver/limit.h
12384 --- linux-3.5/include/linux/vserver/limit.h 1970-01-01 01:00:00.000000000 +0100
12385 +++ linux-3.5-vs2.3.4/include/linux/vserver/limit.h 2012-07-23 01:45:55.000000000 +0200
12387 +#ifndef _VX_LIMIT_H
12388 +#define _VX_LIMIT_H
12390 +#define VLIMIT_NSOCK 16
12391 +#define VLIMIT_OPENFD 17
12392 +#define VLIMIT_ANON 18
12393 +#define VLIMIT_SHMEM 19
12394 +#define VLIMIT_SEMARY 20
12395 +#define VLIMIT_NSEMS 21
12396 +#define VLIMIT_DENTRY 22
12397 +#define VLIMIT_MAPPED 23
12402 +#define VLIM_NOCHECK ((1L << VLIMIT_DENTRY) | (1L << RLIMIT_RSS))
12404 +/* keep in sync with CRLIM_INFINITY */
12406 +#define VLIM_INFINITY (~0ULL)
12408 +#include <asm/atomic.h>
12409 +#include <asm/resource.h>
12411 +#ifndef RLIM_INFINITY
12412 +#warning RLIM_INFINITY is undefined
12415 +#define __rlim_val(l, r, v) ((l)->res[r].v)
12417 +#define __rlim_soft(l, r) __rlim_val(l, r, soft)
12418 +#define __rlim_hard(l, r) __rlim_val(l, r, hard)
12420 +#define __rlim_rcur(l, r) __rlim_val(l, r, rcur)
12421 +#define __rlim_rmin(l, r) __rlim_val(l, r, rmin)
12422 +#define __rlim_rmax(l, r) __rlim_val(l, r, rmax)
12424 +#define __rlim_lhit(l, r) __rlim_val(l, r, lhit)
12425 +#define __rlim_hit(l, r) atomic_inc(&__rlim_lhit(l, r))
12427 +typedef atomic_long_t rlim_atomic_t;
12428 +typedef unsigned long rlim_t;
12430 +#define __rlim_get(l, r) atomic_long_read(&__rlim_rcur(l, r))
12431 +#define __rlim_set(l, r, v) atomic_long_set(&__rlim_rcur(l, r), v)
12432 +#define __rlim_inc(l, r) atomic_long_inc(&__rlim_rcur(l, r))
12433 +#define __rlim_dec(l, r) atomic_long_dec(&__rlim_rcur(l, r))
12434 +#define __rlim_add(l, r, v) atomic_long_add(v, &__rlim_rcur(l, r))
12435 +#define __rlim_sub(l, r, v) atomic_long_sub(v, &__rlim_rcur(l, r))
12438 +#if (RLIM_INFINITY == VLIM_INFINITY)
12439 +#define VX_VLIM(r) ((long long)(long)(r))
12440 +#define VX_RLIM(v) ((rlim_t)(v))
12442 +#define VX_VLIM(r) (((r) == RLIM_INFINITY) \
12443 + ? VLIM_INFINITY : (long long)(r))
12444 +#define VX_RLIM(v) (((v) == VLIM_INFINITY) \
12445 + ? RLIM_INFINITY : (rlim_t)(v))
12450 +void vx_vsi_meminfo(struct sysinfo *);
12451 +void vx_vsi_swapinfo(struct sysinfo *);
12452 +long vx_vsi_cached(struct sysinfo *);
12454 +#define NUM_LIMITS 24
12456 +#endif /* __KERNEL__ */
12457 +#endif /* _VX_LIMIT_H */
12458 diff -NurpP --minimal linux-3.5/include/linux/vserver/limit_cmd.h linux-3.5-vs2.3.4/include/linux/vserver/limit_cmd.h
12459 --- linux-3.5/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00.000000000 +0100
12460 +++ linux-3.5-vs2.3.4/include/linux/vserver/limit_cmd.h 2012-07-23 01:45:55.000000000 +0200
12462 +#ifndef _VX_LIMIT_CMD_H
12463 +#define _VX_LIMIT_CMD_H
12466 +/* rlimit vserver commands */
12468 +#define VCMD_get_rlimit VC_CMD(RLIMIT, 1, 0)
12469 +#define VCMD_set_rlimit VC_CMD(RLIMIT, 2, 0)
12470 +#define VCMD_get_rlimit_mask VC_CMD(RLIMIT, 3, 0)
12471 +#define VCMD_reset_hits VC_CMD(RLIMIT, 7, 0)
12472 +#define VCMD_reset_minmax VC_CMD(RLIMIT, 9, 0)
12474 +struct vcmd_ctx_rlimit_v0 {
12476 + uint64_t minimum;
12477 + uint64_t softlimit;
12478 + uint64_t maximum;
12481 +struct vcmd_ctx_rlimit_mask_v0 {
12482 + uint32_t minimum;
12483 + uint32_t softlimit;
12484 + uint32_t maximum;
12487 +#define VCMD_rlimit_stat VC_CMD(VSTAT, 1, 0)
12489 +struct vcmd_rlimit_stat_v0 {
12493 + uint64_t minimum;
12494 + uint64_t maximum;
12497 +#define CRLIM_UNSET (0ULL)
12498 +#define CRLIM_INFINITY (~0ULL)
12499 +#define CRLIM_KEEP (~1ULL)
12503 +#ifdef CONFIG_IA32_EMULATION
12505 +struct vcmd_ctx_rlimit_v0_x32 {
12507 + uint64_t minimum;
12508 + uint64_t softlimit;
12509 + uint64_t maximum;
12510 +} __attribute__ ((packed));
12512 +#endif /* CONFIG_IA32_EMULATION */
12514 +#include <linux/compiler.h>
12516 +extern int vc_get_rlimit_mask(uint32_t, void __user *);
12517 +extern int vc_get_rlimit(struct vx_info *, void __user *);
12518 +extern int vc_set_rlimit(struct vx_info *, void __user *);
12519 +extern int vc_reset_hits(struct vx_info *, void __user *);
12520 +extern int vc_reset_minmax(struct vx_info *, void __user *);
12522 +extern int vc_rlimit_stat(struct vx_info *, void __user *);
12524 +#ifdef CONFIG_IA32_EMULATION
12526 +extern int vc_get_rlimit_x32(struct vx_info *, void __user *);
12527 +extern int vc_set_rlimit_x32(struct vx_info *, void __user *);
12529 +#endif /* CONFIG_IA32_EMULATION */
12531 +#endif /* __KERNEL__ */
12532 +#endif /* _VX_LIMIT_CMD_H */
12533 diff -NurpP --minimal linux-3.5/include/linux/vserver/limit_def.h linux-3.5-vs2.3.4/include/linux/vserver/limit_def.h
12534 --- linux-3.5/include/linux/vserver/limit_def.h 1970-01-01 01:00:00.000000000 +0100
12535 +++ linux-3.5-vs2.3.4/include/linux/vserver/limit_def.h 2012-07-23 01:45:55.000000000 +0200
12537 +#ifndef _VX_LIMIT_DEF_H
12538 +#define _VX_LIMIT_DEF_H
12540 +#include <asm/atomic.h>
12541 +#include <asm/resource.h>
12543 +#include "limit.h"
12546 +struct _vx_res_limit {
12547 + rlim_t soft; /* Context soft limit */
12548 + rlim_t hard; /* Context hard limit */
12550 + rlim_atomic_t rcur; /* Current value */
12551 + rlim_t rmin; /* Context minimum */
12552 + rlim_t rmax; /* Context maximum */
12554 + atomic_t lhit; /* Limit hits */
12557 +/* context sub struct */
12559 +struct _vx_limit {
12560 + struct _vx_res_limit res[NUM_LIMITS];
12563 +#ifdef CONFIG_VSERVER_DEBUG
12565 +static inline void __dump_vx_limit(struct _vx_limit *limit)
12569 + printk("\t_vx_limit:");
12570 + for (i = 0; i < NUM_LIMITS; i++) {
12571 + printk("\t [%2d] = %8lu %8lu/%8lu, %8ld/%8ld, %8d\n",
12572 + i, (unsigned long)__rlim_get(limit, i),
12573 + (unsigned long)__rlim_rmin(limit, i),
12574 + (unsigned long)__rlim_rmax(limit, i),
12575 + (long)__rlim_soft(limit, i),
12576 + (long)__rlim_hard(limit, i),
12577 + atomic_read(&__rlim_lhit(limit, i)));
12583 +#endif /* _VX_LIMIT_DEF_H */
12584 diff -NurpP --minimal linux-3.5/include/linux/vserver/limit_int.h linux-3.5-vs2.3.4/include/linux/vserver/limit_int.h
12585 --- linux-3.5/include/linux/vserver/limit_int.h 1970-01-01 01:00:00.000000000 +0100
12586 +++ linux-3.5-vs2.3.4/include/linux/vserver/limit_int.h 2012-07-23 01:45:55.000000000 +0200
12588 +#ifndef _VX_LIMIT_INT_H
12589 +#define _VX_LIMIT_INT_H
12591 +#include "context.h"
12595 +#define VXD_RCRES_COND(r) VXD_CBIT(cres, r)
12596 +#define VXD_RLIMIT_COND(r) VXD_CBIT(limit, r)
12598 +extern const char *vlimit_name[NUM_LIMITS];
12600 +static inline void __vx_acc_cres(struct vx_info *vxi,
12601 + int res, int dir, void *_data, char *_file, int _line)
12603 + if (VXD_RCRES_COND(res))
12604 + vxlprintk(1, "vx_acc_cres[%5d,%s,%2d]: %5ld%s (%p)",
12605 + (vxi ? vxi->vx_id : -1), vlimit_name[res], res,
12606 + (vxi ? (long)__rlim_get(&vxi->limit, res) : 0),
12607 + (dir > 0) ? "++" : "--", _data, _file, _line);
12612 + __rlim_inc(&vxi->limit, res);
12614 + __rlim_dec(&vxi->limit, res);
12617 +static inline void __vx_add_cres(struct vx_info *vxi,
12618 + int res, int amount, void *_data, char *_file, int _line)
12620 + if (VXD_RCRES_COND(res))
12621 + vxlprintk(1, "vx_add_cres[%5d,%s,%2d]: %5ld += %5d (%p)",
12622 + (vxi ? vxi->vx_id : -1), vlimit_name[res], res,
12623 + (vxi ? (long)__rlim_get(&vxi->limit, res) : 0),
12624 + amount, _data, _file, _line);
12629 + __rlim_add(&vxi->limit, res, amount);
12633 +int __vx_cres_adjust_max(struct _vx_limit *limit, int res, rlim_t value)
12635 + int cond = (value > __rlim_rmax(limit, res));
12638 + __rlim_rmax(limit, res) = value;
12643 +int __vx_cres_adjust_min(struct _vx_limit *limit, int res, rlim_t value)
12645 + int cond = (value < __rlim_rmin(limit, res));
12648 + __rlim_rmin(limit, res) = value;
12653 +void __vx_cres_fixup(struct _vx_limit *limit, int res, rlim_t value)
12655 + if (!__vx_cres_adjust_max(limit, res, value))
12656 + __vx_cres_adjust_min(limit, res, value);
12661 + +1 ... no limit hit
12662 + -1 ... over soft limit
12663 + 0 ... over hard limit */
12665 +static inline int __vx_cres_avail(struct vx_info *vxi,
12666 + int res, int num, char *_file, int _line)
12668 + struct _vx_limit *limit;
12671 + if (VXD_RLIMIT_COND(res))
12672 + vxlprintk(1, "vx_cres_avail[%5d,%s,%2d]: %5ld/%5ld > %5ld + %5d",
12673 + (vxi ? vxi->vx_id : -1), vlimit_name[res], res,
12674 + (vxi ? (long)__rlim_soft(&vxi->limit, res) : -1),
12675 + (vxi ? (long)__rlim_hard(&vxi->limit, res) : -1),
12676 + (vxi ? (long)__rlim_get(&vxi->limit, res) : 0),
12677 + num, _file, _line);
12681 + limit = &vxi->limit;
12682 + value = __rlim_get(limit, res);
12684 + if (!__vx_cres_adjust_max(limit, res, value))
12685 + __vx_cres_adjust_min(limit, res, value);
12690 + if (__rlim_soft(limit, res) == RLIM_INFINITY)
12692 + if (value + num <= __rlim_soft(limit, res))
12695 + if (__rlim_hard(limit, res) == RLIM_INFINITY)
12697 + if (value + num <= __rlim_hard(limit, res))
12700 + __rlim_hit(limit, res);
12705 +static const int VLA_RSS[] = { RLIMIT_RSS, VLIMIT_ANON, VLIMIT_MAPPED, 0 };
12708 +rlim_t __vx_cres_array_sum(struct _vx_limit *limit, const int *array)
12710 + rlim_t value, sum = 0;
12713 + while ((res = *array++)) {
12714 + value = __rlim_get(limit, res);
12715 + __vx_cres_fixup(limit, res, value);
12722 +rlim_t __vx_cres_array_fixup(struct _vx_limit *limit, const int *array)
12724 + rlim_t value = __vx_cres_array_sum(limit, array + 1);
12725 + int res = *array;
12727 + if (value == __rlim_get(limit, res))
12730 + __rlim_set(limit, res, value);
12731 + /* now adjust min/max */
12732 + if (!__vx_cres_adjust_max(limit, res, value))
12733 + __vx_cres_adjust_min(limit, res, value);
12738 +static inline int __vx_cres_array_avail(struct vx_info *vxi,
12739 + const int *array, int num, char *_file, int _line)
12741 + struct _vx_limit *limit;
12742 + rlim_t value = 0;
12750 + limit = &vxi->limit;
12752 + value = __vx_cres_array_sum(limit, array + 1);
12754 + __rlim_set(limit, res, value);
12755 + __vx_cres_fixup(limit, res, value);
12757 + return __vx_cres_avail(vxi, res, num, _file, _line);
12761 +static inline void vx_limit_fixup(struct _vx_limit *limit, int id)
12766 + /* complex resources first */
12767 + if ((id < 0) || (id == RLIMIT_RSS))
12768 + __vx_cres_array_fixup(limit, VLA_RSS);
12770 + for (res = 0; res < NUM_LIMITS; res++) {
12771 + if ((id > 0) && (res != id))
12774 + value = __rlim_get(limit, res);
12775 + __vx_cres_fixup(limit, res, value);
12777 + /* not supposed to happen, maybe warn? */
12778 + if (__rlim_rmax(limit, res) > __rlim_hard(limit, res))
12779 + __rlim_rmax(limit, res) = __rlim_hard(limit, res);
12784 +#endif /* __KERNEL__ */
12785 +#endif /* _VX_LIMIT_INT_H */
12786 diff -NurpP --minimal linux-3.5/include/linux/vserver/monitor.h linux-3.5-vs2.3.4/include/linux/vserver/monitor.h
12787 --- linux-3.5/include/linux/vserver/monitor.h 1970-01-01 01:00:00.000000000 +0100
12788 +++ linux-3.5-vs2.3.4/include/linux/vserver/monitor.h 2012-07-23 01:45:55.000000000 +0200
12790 +#ifndef _VX_MONITOR_H
12791 +#define _VX_MONITOR_H
12793 +#include <linux/types.h>
12800 + VXM_UPDATE = 0x20,
12804 + VXM_RQINFO_1 = 0x24,
12807 + VXM_ACTIVATE = 0x40,
12814 + VXM_MIGRATE = 0x48,
12817 + /* all other bits are flags */
12818 + VXM_SCHED = 0x80,
12821 +struct _vxm_update_1 {
12822 + uint32_t tokens_max;
12823 + uint32_t fill_rate;
12824 + uint32_t interval;
12827 +struct _vxm_update_2 {
12828 + uint32_t tokens_min;
12829 + uint32_t fill_rate;
12830 + uint32_t interval;
12833 +struct _vxm_rqinfo_1 {
12834 + uint16_t running;
12838 + uint32_t idle_tokens;
12841 +struct _vxm_rqinfo_2 {
12842 + uint32_t norm_time;
12843 + uint32_t idle_time;
12844 + uint32_t idle_skip;
12847 +struct _vxm_sched {
12849 + uint32_t norm_time;
12850 + uint32_t idle_time;
12853 +struct _vxm_task {
12858 +struct _vxm_event {
12867 + struct _vxm_task tsk;
12871 +struct _vx_mon_entry {
12875 + struct _vxm_event ev;
12876 + struct _vxm_sched sd;
12877 + struct _vxm_update_1 u1;
12878 + struct _vxm_update_2 u2;
12879 + struct _vxm_rqinfo_1 q1;
12880 + struct _vxm_rqinfo_2 q2;
12885 +#endif /* _VX_MONITOR_H */
12886 diff -NurpP --minimal linux-3.5/include/linux/vserver/network.h linux-3.5-vs2.3.4/include/linux/vserver/network.h
12887 --- linux-3.5/include/linux/vserver/network.h 1970-01-01 01:00:00.000000000 +0100
12888 +++ linux-3.5-vs2.3.4/include/linux/vserver/network.h 2012-07-23 01:45:55.000000000 +0200
12890 +#ifndef _VX_NETWORK_H
12891 +#define _VX_NETWORK_H
12893 +#include <linux/types.h>
12896 +#define MAX_N_CONTEXT 65535 /* Arbitrary limit */
12899 +/* network flags */
12901 +#define NXF_INFO_PRIVATE 0x00000008
12903 +#define NXF_SINGLE_IP 0x00000100
12904 +#define NXF_LBACK_REMAP 0x00000200
12905 +#define NXF_LBACK_ALLOW 0x00000400
12907 +#define NXF_HIDE_NETIF 0x02000000
12908 +#define NXF_HIDE_LBACK 0x04000000
12910 +#define NXF_STATE_SETUP (1ULL << 32)
12911 +#define NXF_STATE_ADMIN (1ULL << 34)
12913 +#define NXF_SC_HELPER (1ULL << 36)
12914 +#define NXF_PERSISTENT (1ULL << 38)
12916 +#define NXF_ONE_TIME (0x0005ULL << 32)
12919 +#define NXF_INIT_SET (__nxf_init_set())
12921 +static inline uint64_t __nxf_init_set(void) {
12922 + return NXF_STATE_ADMIN
12923 +#ifdef CONFIG_VSERVER_AUTO_LBACK
12924 + | NXF_LBACK_REMAP
12927 +#ifdef CONFIG_VSERVER_AUTO_SINGLE
12930 + | NXF_HIDE_NETIF;
12934 +/* network caps */
12936 +#define NXC_TUN_CREATE 0x00000001
12938 +#define NXC_RAW_ICMP 0x00000100
12940 +#define NXC_MULTICAST 0x00001000
12943 +/* address types */
12945 +#define NXA_TYPE_IPV4 0x0001
12946 +#define NXA_TYPE_IPV6 0x0002
12948 +#define NXA_TYPE_NONE 0x0000
12949 +#define NXA_TYPE_ANY 0x00FF
12951 +#define NXA_TYPE_ADDR 0x0010
12952 +#define NXA_TYPE_MASK 0x0020
12953 +#define NXA_TYPE_RANGE 0x0040
12955 +#define NXA_MASK_ALL (NXA_TYPE_ADDR | NXA_TYPE_MASK | NXA_TYPE_RANGE)
12957 +#define NXA_MOD_BCAST 0x0100
12958 +#define NXA_MOD_LBACK 0x0200
12960 +#define NXA_LOOPBACK 0x1000
12962 +#define NXA_MASK_BIND (NXA_MASK_ALL | NXA_MOD_BCAST | NXA_MOD_LBACK)
12963 +#define NXA_MASK_SHOW (NXA_MASK_ALL | NXA_LOOPBACK)
12967 +#include <linux/list.h>
12968 +#include <linux/spinlock.h>
12969 +#include <linux/rcupdate.h>
12970 +#include <linux/in.h>
12971 +#include <linux/in6.h>
12972 +#include <asm/atomic.h>
12974 +struct nx_addr_v4 {
12975 + struct nx_addr_v4 *next;
12976 + struct in_addr ip[2];
12977 + struct in_addr mask;
12982 +struct nx_addr_v6 {
12983 + struct nx_addr_v6 *next;
12984 + struct in6_addr ip;
12985 + struct in6_addr mask;
12992 + struct hlist_node nx_hlist; /* linked list of nxinfos */
12993 + nid_t nx_id; /* vnet id */
12994 + atomic_t nx_usecnt; /* usage count */
12995 + atomic_t nx_tasks; /* tasks count */
12996 + int nx_state; /* context state */
12998 + uint64_t nx_flags; /* network flag word */
12999 + uint64_t nx_ncaps; /* network capabilities */
13001 + struct in_addr v4_lback; /* Loopback address */
13002 + struct in_addr v4_bcast; /* Broadcast address */
13003 + struct nx_addr_v4 v4; /* First/Single ipv4 address */
13004 +#ifdef CONFIG_IPV6
13005 + struct nx_addr_v6 v6; /* First/Single ipv6 address */
13007 + char nx_name[65]; /* network context name */
13011 +/* status flags */
13013 +#define NXS_HASHED 0x0001
13014 +#define NXS_SHUTDOWN 0x0100
13015 +#define NXS_RELEASED 0x8000
13017 +extern struct nx_info *lookup_nx_info(int);
13019 +extern int get_nid_list(int, unsigned int *, int);
13020 +extern int nid_is_hashed(nid_t);
13022 +extern int nx_migrate_task(struct task_struct *, struct nx_info *);
13024 +extern long vs_net_change(struct nx_info *, unsigned int);
13029 +#define NX_IPV4(n) ((n)->v4.type != NXA_TYPE_NONE)
13030 +#ifdef CONFIG_IPV6
13031 +#define NX_IPV6(n) ((n)->v6.type != NXA_TYPE_NONE)
13033 +#define NX_IPV6(n) (0)
13036 +#endif /* __KERNEL__ */
13037 +#endif /* _VX_NETWORK_H */
13038 diff -NurpP --minimal linux-3.5/include/linux/vserver/network_cmd.h linux-3.5-vs2.3.4/include/linux/vserver/network_cmd.h
13039 --- linux-3.5/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00.000000000 +0100
13040 +++ linux-3.5-vs2.3.4/include/linux/vserver/network_cmd.h 2012-07-23 01:45:55.000000000 +0200
13042 +#ifndef _VX_NETWORK_CMD_H
13043 +#define _VX_NETWORK_CMD_H
13046 +/* vinfo commands */
13048 +#define VCMD_task_nid VC_CMD(VINFO, 2, 0)
13051 +extern int vc_task_nid(uint32_t);
13053 +#endif /* __KERNEL__ */
13055 +#define VCMD_nx_info VC_CMD(VINFO, 6, 0)
13057 +struct vcmd_nx_info_v0 {
13059 + /* more to come */
13063 +extern int vc_nx_info(struct nx_info *, void __user *);
13065 +#endif /* __KERNEL__ */
13067 +#include <linux/in.h>
13068 +#include <linux/in6.h>
13070 +#define VCMD_net_create_v0 VC_CMD(VNET, 1, 0)
13071 +#define VCMD_net_create VC_CMD(VNET, 1, 1)
13073 +struct vcmd_net_create {
13074 + uint64_t flagword;
13077 +#define VCMD_net_migrate VC_CMD(NETMIG, 1, 0)
13079 +#define VCMD_net_add VC_CMD(NETALT, 1, 0)
13080 +#define VCMD_net_remove VC_CMD(NETALT, 2, 0)
13082 +struct vcmd_net_addr_v0 {
13085 + struct in_addr ip[4];
13086 + struct in_addr mask[4];
13089 +#define VCMD_net_add_ipv4_v1 VC_CMD(NETALT, 1, 1)
13090 +#define VCMD_net_rem_ipv4_v1 VC_CMD(NETALT, 2, 1)
13092 +struct vcmd_net_addr_ipv4_v1 {
13095 + struct in_addr ip;
13096 + struct in_addr mask;
13099 +#define VCMD_net_add_ipv4 VC_CMD(NETALT, 1, 2)
13100 +#define VCMD_net_rem_ipv4 VC_CMD(NETALT, 2, 2)
13102 +struct vcmd_net_addr_ipv4_v2 {
13105 + struct in_addr ip;
13106 + struct in_addr ip2;
13107 + struct in_addr mask;
13110 +#define VCMD_net_add_ipv6 VC_CMD(NETALT, 3, 1)
13111 +#define VCMD_net_remove_ipv6 VC_CMD(NETALT, 4, 1)
13113 +struct vcmd_net_addr_ipv6_v1 {
13117 + struct in6_addr ip;
13118 + struct in6_addr mask;
13121 +#define VCMD_add_match_ipv4 VC_CMD(NETALT, 5, 0)
13122 +#define VCMD_get_match_ipv4 VC_CMD(NETALT, 6, 0)
13124 +struct vcmd_match_ipv4_v0 {
13129 + struct in_addr ip;
13130 + struct in_addr ip2;
13131 + struct in_addr mask;
13134 +#define VCMD_add_match_ipv6 VC_CMD(NETALT, 7, 0)
13135 +#define VCMD_get_match_ipv6 VC_CMD(NETALT, 8, 0)
13137 +struct vcmd_match_ipv6_v0 {
13142 + struct in6_addr ip;
13143 + struct in6_addr ip2;
13144 + struct in6_addr mask;
13149 +extern int vc_net_create(uint32_t, void __user *);
13150 +extern int vc_net_migrate(struct nx_info *, void __user *);
13152 +extern int vc_net_add(struct nx_info *, void __user *);
13153 +extern int vc_net_remove(struct nx_info *, void __user *);
13155 +extern int vc_net_add_ipv4_v1(struct nx_info *, void __user *);
13156 +extern int vc_net_add_ipv4(struct nx_info *, void __user *);
13158 +extern int vc_net_rem_ipv4_v1(struct nx_info *, void __user *);
13159 +extern int vc_net_rem_ipv4(struct nx_info *, void __user *);
13161 +extern int vc_net_add_ipv6(struct nx_info *, void __user *);
13162 +extern int vc_net_remove_ipv6(struct nx_info *, void __user *);
13164 +extern int vc_add_match_ipv4(struct nx_info *, void __user *);
13165 +extern int vc_get_match_ipv4(struct nx_info *, void __user *);
13167 +extern int vc_add_match_ipv6(struct nx_info *, void __user *);
13168 +extern int vc_get_match_ipv6(struct nx_info *, void __user *);
13170 +#endif /* __KERNEL__ */
13173 +/* flag commands */
13175 +#define VCMD_get_nflags VC_CMD(FLAGS, 5, 0)
13176 +#define VCMD_set_nflags VC_CMD(FLAGS, 6, 0)
13178 +struct vcmd_net_flags_v0 {
13179 + uint64_t flagword;
13184 +extern int vc_get_nflags(struct nx_info *, void __user *);
13185 +extern int vc_set_nflags(struct nx_info *, void __user *);
13187 +#endif /* __KERNEL__ */
13190 +/* network caps commands */
13192 +#define VCMD_get_ncaps VC_CMD(FLAGS, 7, 0)
13193 +#define VCMD_set_ncaps VC_CMD(FLAGS, 8, 0)
13195 +struct vcmd_net_caps_v0 {
13201 +extern int vc_get_ncaps(struct nx_info *, void __user *);
13202 +extern int vc_set_ncaps(struct nx_info *, void __user *);
13204 +#endif /* __KERNEL__ */
13205 +#endif /* _VX_CONTEXT_CMD_H */
13206 diff -NurpP --minimal linux-3.5/include/linux/vserver/percpu.h linux-3.5-vs2.3.4/include/linux/vserver/percpu.h
13207 --- linux-3.5/include/linux/vserver/percpu.h 1970-01-01 01:00:00.000000000 +0100
13208 +++ linux-3.5-vs2.3.4/include/linux/vserver/percpu.h 2012-07-23 01:45:55.000000000 +0200
13210 +#ifndef _VX_PERCPU_H
13211 +#define _VX_PERCPU_H
13213 +#include "cvirt_def.h"
13214 +#include "sched_def.h"
13216 +struct _vx_percpu {
13217 + struct _vx_cvirt_pc cvirt;
13218 + struct _vx_sched_pc sched;
13221 +#define PERCPU_PERCTX (sizeof(struct _vx_percpu))
13223 +#endif /* _VX_PERCPU_H */
13224 diff -NurpP --minimal linux-3.5/include/linux/vserver/pid.h linux-3.5-vs2.3.4/include/linux/vserver/pid.h
13225 --- linux-3.5/include/linux/vserver/pid.h 1970-01-01 01:00:00.000000000 +0100
13226 +++ linux-3.5-vs2.3.4/include/linux/vserver/pid.h 2012-07-23 01:45:55.000000000 +0200
13228 +#ifndef _VSERVER_PID_H
13229 +#define _VSERVER_PID_H
13231 +/* pid faking stuff */
13233 +#define vx_info_map_pid(v, p) \
13234 + __vx_info_map_pid((v), (p), __func__, __FILE__, __LINE__)
13235 +#define vx_info_map_tgid(v,p) vx_info_map_pid(v,p)
13236 +#define vx_map_pid(p) vx_info_map_pid(current_vx_info(), p)
13237 +#define vx_map_tgid(p) vx_map_pid(p)
13239 +static inline int __vx_info_map_pid(struct vx_info *vxi, int pid,
13240 + const char *func, const char *file, int line)
13242 + if (vx_info_flags(vxi, VXF_INFO_INIT, 0)) {
13243 + vxfprintk(VXD_CBIT(cvirt, 2),
13244 + "vx_map_tgid: %p/%llx: %d -> %d",
13245 + vxi, (long long)vxi->vx_flags, pid,
13246 + (pid && pid == vxi->vx_initpid) ? 1 : pid,
13247 + func, file, line);
13250 + if (pid == vxi->vx_initpid)
13256 +#define vx_info_rmap_pid(v, p) \
13257 + __vx_info_rmap_pid((v), (p), __func__, __FILE__, __LINE__)
13258 +#define vx_rmap_pid(p) vx_info_rmap_pid(current_vx_info(), p)
13259 +#define vx_rmap_tgid(p) vx_rmap_pid(p)
13261 +static inline int __vx_info_rmap_pid(struct vx_info *vxi, int pid,
13262 + const char *func, const char *file, int line)
13264 + if (vx_info_flags(vxi, VXF_INFO_INIT, 0)) {
13265 + vxfprintk(VXD_CBIT(cvirt, 2),
13266 + "vx_rmap_tgid: %p/%llx: %d -> %d",
13267 + vxi, (long long)vxi->vx_flags, pid,
13268 + (pid == 1) ? vxi->vx_initpid : pid,
13269 + func, file, line);
13270 + if ((pid == 1) && vxi->vx_initpid)
13271 + return vxi->vx_initpid;
13272 + if (pid == vxi->vx_initpid)
13279 diff -NurpP --minimal linux-3.5/include/linux/vserver/sched.h linux-3.5-vs2.3.4/include/linux/vserver/sched.h
13280 --- linux-3.5/include/linux/vserver/sched.h 1970-01-01 01:00:00.000000000 +0100
13281 +++ linux-3.5-vs2.3.4/include/linux/vserver/sched.h 2012-07-23 01:45:55.000000000 +0200
13283 +#ifndef _VX_SCHED_H
13284 +#define _VX_SCHED_H
13291 +void vx_vsi_uptime(struct timespec *, struct timespec *);
13296 +void vx_update_load(struct vx_info *);
13299 +void vx_update_sched_param(struct _vx_sched *sched,
13300 + struct _vx_sched_pc *sched_pc);
13302 +#endif /* __KERNEL__ */
13303 +#else /* _VX_SCHED_H */
13304 +#warning duplicate inclusion
13305 +#endif /* _VX_SCHED_H */
13306 diff -NurpP --minimal linux-3.5/include/linux/vserver/sched_cmd.h linux-3.5-vs2.3.4/include/linux/vserver/sched_cmd.h
13307 --- linux-3.5/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00.000000000 +0100
13308 +++ linux-3.5-vs2.3.4/include/linux/vserver/sched_cmd.h 2012-07-23 01:45:55.000000000 +0200
13310 +#ifndef _VX_SCHED_CMD_H
13311 +#define _VX_SCHED_CMD_H
13314 +struct vcmd_prio_bias {
13316 + int32_t prio_bias;
13319 +#define VCMD_set_prio_bias VC_CMD(SCHED, 4, 0)
13320 +#define VCMD_get_prio_bias VC_CMD(SCHED, 5, 0)
13324 +#include <linux/compiler.h>
13326 +extern int vc_set_prio_bias(struct vx_info *, void __user *);
13327 +extern int vc_get_prio_bias(struct vx_info *, void __user *);
13329 +#endif /* __KERNEL__ */
13330 +#endif /* _VX_SCHED_CMD_H */
13331 diff -NurpP --minimal linux-3.5/include/linux/vserver/sched_def.h linux-3.5-vs2.3.4/include/linux/vserver/sched_def.h
13332 --- linux-3.5/include/linux/vserver/sched_def.h 1970-01-01 01:00:00.000000000 +0100
13333 +++ linux-3.5-vs2.3.4/include/linux/vserver/sched_def.h 2012-07-23 01:45:55.000000000 +0200
13335 +#ifndef _VX_SCHED_DEF_H
13336 +#define _VX_SCHED_DEF_H
13338 +#include <linux/spinlock.h>
13339 +#include <linux/jiffies.h>
13340 +#include <linux/cpumask.h>
13341 +#include <asm/atomic.h>
13342 +#include <asm/param.h>
13345 +/* context sub struct */
13347 +struct _vx_sched {
13348 + int prio_bias; /* bias offset for priority */
13350 + cpumask_t update; /* CPUs which should update */
13353 +struct _vx_sched_pc {
13354 + int prio_bias; /* bias offset for priority */
13356 + uint64_t user_ticks; /* token tick events */
13357 + uint64_t sys_ticks; /* token tick events */
13358 + uint64_t hold_ticks; /* token ticks paused */
13362 +#ifdef CONFIG_VSERVER_DEBUG
13364 +static inline void __dump_vx_sched(struct _vx_sched *sched)
13366 + printk("\t_vx_sched:\n");
13367 + printk("\t priority = %4d\n", sched->prio_bias);
13372 +#endif /* _VX_SCHED_DEF_H */
13373 diff -NurpP --minimal linux-3.5/include/linux/vserver/signal.h linux-3.5-vs2.3.4/include/linux/vserver/signal.h
13374 --- linux-3.5/include/linux/vserver/signal.h 1970-01-01 01:00:00.000000000 +0100
13375 +++ linux-3.5-vs2.3.4/include/linux/vserver/signal.h 2012-07-23 01:45:55.000000000 +0200
13377 +#ifndef _VX_SIGNAL_H
13378 +#define _VX_SIGNAL_H
13385 +int vx_info_kill(struct vx_info *, int, int);
13387 +#endif /* __KERNEL__ */
13388 +#else /* _VX_SIGNAL_H */
13389 +#warning duplicate inclusion
13390 +#endif /* _VX_SIGNAL_H */
13391 diff -NurpP --minimal linux-3.5/include/linux/vserver/signal_cmd.h linux-3.5-vs2.3.4/include/linux/vserver/signal_cmd.h
13392 --- linux-3.5/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00.000000000 +0100
13393 +++ linux-3.5-vs2.3.4/include/linux/vserver/signal_cmd.h 2012-07-23 01:45:55.000000000 +0200
13395 +#ifndef _VX_SIGNAL_CMD_H
13396 +#define _VX_SIGNAL_CMD_H
13399 +/* signalling vserver commands */
13401 +#define VCMD_ctx_kill VC_CMD(PROCTRL, 1, 0)
13402 +#define VCMD_wait_exit VC_CMD(EVENT, 99, 0)
13404 +struct vcmd_ctx_kill_v0 {
13409 +struct vcmd_wait_exit_v0 {
13410 + int32_t reboot_cmd;
13411 + int32_t exit_code;
13416 +extern int vc_ctx_kill(struct vx_info *, void __user *);
13417 +extern int vc_wait_exit(struct vx_info *, void __user *);
13419 +#endif /* __KERNEL__ */
13421 +/* process alteration commands */
13423 +#define VCMD_get_pflags VC_CMD(PROCALT, 5, 0)
13424 +#define VCMD_set_pflags VC_CMD(PROCALT, 6, 0)
13426 +struct vcmd_pflags_v0 {
13427 + uint32_t flagword;
13433 +extern int vc_get_pflags(uint32_t pid, void __user *);
13434 +extern int vc_set_pflags(uint32_t pid, void __user *);
13436 +#endif /* __KERNEL__ */
13437 +#endif /* _VX_SIGNAL_CMD_H */
13438 diff -NurpP --minimal linux-3.5/include/linux/vserver/space.h linux-3.5-vs2.3.4/include/linux/vserver/space.h
13439 --- linux-3.5/include/linux/vserver/space.h 1970-01-01 01:00:00.000000000 +0100
13440 +++ linux-3.5-vs2.3.4/include/linux/vserver/space.h 2012-07-23 01:45:55.000000000 +0200
13442 +#ifndef _VX_SPACE_H
13443 +#define _VX_SPACE_H
13445 +#include <linux/types.h>
13449 +int vx_set_space(struct vx_info *vxi, unsigned long mask, unsigned index);
13451 +#else /* _VX_SPACE_H */
13452 +#warning duplicate inclusion
13453 +#endif /* _VX_SPACE_H */
13454 diff -NurpP --minimal linux-3.5/include/linux/vserver/space_cmd.h linux-3.5-vs2.3.4/include/linux/vserver/space_cmd.h
13455 --- linux-3.5/include/linux/vserver/space_cmd.h 1970-01-01 01:00:00.000000000 +0100
13456 +++ linux-3.5-vs2.3.4/include/linux/vserver/space_cmd.h 2012-07-23 01:45:55.000000000 +0200
13458 +#ifndef _VX_SPACE_CMD_H
13459 +#define _VX_SPACE_CMD_H
13462 +#define VCMD_enter_space_v0 VC_CMD(PROCALT, 1, 0)
13463 +#define VCMD_enter_space_v1 VC_CMD(PROCALT, 1, 1)
13464 +#define VCMD_enter_space VC_CMD(PROCALT, 1, 2)
13466 +#define VCMD_set_space_v0 VC_CMD(PROCALT, 3, 0)
13467 +#define VCMD_set_space_v1 VC_CMD(PROCALT, 3, 1)
13468 +#define VCMD_set_space VC_CMD(PROCALT, 3, 2)
13470 +#define VCMD_get_space_mask_v0 VC_CMD(PROCALT, 4, 0)
13472 +#define VCMD_get_space_mask VC_CMD(VSPACE, 0, 1)
13473 +#define VCMD_get_space_default VC_CMD(VSPACE, 1, 0)
13476 +struct vcmd_space_mask_v1 {
13480 +struct vcmd_space_mask_v2 {
13488 +extern int vc_enter_space_v1(struct vx_info *, void __user *);
13489 +extern int vc_set_space_v1(struct vx_info *, void __user *);
13490 +extern int vc_enter_space(struct vx_info *, void __user *);
13491 +extern int vc_set_space(struct vx_info *, void __user *);
13492 +extern int vc_get_space_mask(void __user *, int);
13494 +#endif /* __KERNEL__ */
13495 +#endif /* _VX_SPACE_CMD_H */
13496 diff -NurpP --minimal linux-3.5/include/linux/vserver/switch.h linux-3.5-vs2.3.4/include/linux/vserver/switch.h
13497 --- linux-3.5/include/linux/vserver/switch.h 1970-01-01 01:00:00.000000000 +0100
13498 +++ linux-3.5-vs2.3.4/include/linux/vserver/switch.h 2012-07-23 01:45:55.000000000 +0200
13500 +#ifndef _VX_SWITCH_H
13501 +#define _VX_SWITCH_H
13503 +#include <linux/types.h>
13506 +#define VC_CATEGORY(c) (((c) >> 24) & 0x3F)
13507 +#define VC_COMMAND(c) (((c) >> 16) & 0xFF)
13508 +#define VC_VERSION(c) ((c) & 0xFFF)
13510 +#define VC_CMD(c, i, v) ((((VC_CAT_ ## c) & 0x3F) << 24) \
13511 + | (((i) & 0xFF) << 16) | ((v) & 0xFFF))
13515 + Syscall Matrix V2.8
13517 + |VERSION|CREATE |MODIFY |MIGRATE|CONTROL|EXPERIM| |SPECIAL|SPECIAL|
13518 + |STATS |DESTROY|ALTER |CHANGE |LIMIT |TEST | | | |
13519 + |INFO |SETUP | |MOVE | | | | | |
13520 + -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
13521 + SYSTEM |VERSION|VSETUP |VHOST | | | | |DEVICE | |
13522 + HOST | 00| 01| 02| 03| 04| 05| | 06| 07|
13523 + -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
13524 + CPU | |VPROC |PROCALT|PROCMIG|PROCTRL| | |SCHED. | |
13525 + PROCESS| 08| 09| 10| 11| 12| 13| | 14| 15|
13526 + -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
13527 + MEMORY | | | | |MEMCTRL| | |SWAP | |
13528 + | 16| 17| 18| 19| 20| 21| | 22| 23|
13529 + -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
13530 + NETWORK| |VNET |NETALT |NETMIG |NETCTL | | |SERIAL | |
13531 + | 24| 25| 26| 27| 28| 29| | 30| 31|
13532 + -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
13533 + DISK | | | |TAGMIG |DLIMIT | | |INODE | |
13534 + VFS | 32| 33| 34| 35| 36| 37| | 38| 39|
13535 + -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
13536 + OTHER |VSTAT | | | | | | |VINFO | |
13537 + | 40| 41| 42| 43| 44| 45| | 46| 47|
13538 + =======+=======+=======+=======+=======+=======+=======+ +=======+=======+
13539 + SPECIAL|EVENT | | | |FLAGS | | |VSPACE | |
13540 + | 48| 49| 50| 51| 52| 53| | 54| 55|
13541 + -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
13542 + SPECIAL|DEBUG | | | |RLIMIT |SYSCALL| | |COMPAT |
13543 + | 56| 57| 58| 59| 60|TEST 61| | 62| 63|
13544 + -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
13548 +#define VC_CAT_VERSION 0
13550 +#define VC_CAT_VSETUP 1
13551 +#define VC_CAT_VHOST 2
13553 +#define VC_CAT_DEVICE 6
13555 +#define VC_CAT_VPROC 9
13556 +#define VC_CAT_PROCALT 10
13557 +#define VC_CAT_PROCMIG 11
13558 +#define VC_CAT_PROCTRL 12
13560 +#define VC_CAT_SCHED 14
13561 +#define VC_CAT_MEMCTRL 20
13563 +#define VC_CAT_VNET 25
13564 +#define VC_CAT_NETALT 26
13565 +#define VC_CAT_NETMIG 27
13566 +#define VC_CAT_NETCTRL 28
13568 +#define VC_CAT_TAGMIG 35
13569 +#define VC_CAT_DLIMIT 36
13570 +#define VC_CAT_INODE 38
13572 +#define VC_CAT_VSTAT 40
13573 +#define VC_CAT_VINFO 46
13574 +#define VC_CAT_EVENT 48
13576 +#define VC_CAT_FLAGS 52
13577 +#define VC_CAT_VSPACE 54
13578 +#define VC_CAT_DEBUG 56
13579 +#define VC_CAT_RLIMIT 60
13581 +#define VC_CAT_SYSTEST 61
13582 +#define VC_CAT_COMPAT 63
13584 +/* query version */
13586 +#define VCMD_get_version VC_CMD(VERSION, 0, 0)
13587 +#define VCMD_get_vci VC_CMD(VERSION, 1, 0)
13592 +#include <linux/errno.h>
13594 +#endif /* __KERNEL__ */
13596 +#endif /* _VX_SWITCH_H */
13598 diff -NurpP --minimal linux-3.5/include/linux/vserver/tag.h linux-3.5-vs2.3.4/include/linux/vserver/tag.h
13599 --- linux-3.5/include/linux/vserver/tag.h 1970-01-01 01:00:00.000000000 +0100
13600 +++ linux-3.5-vs2.3.4/include/linux/vserver/tag.h 2012-07-23 01:45:55.000000000 +0200
13605 +#include <linux/types.h>
13608 +#define DX_TAG(in) (IS_TAGGED(in))
13611 +#ifdef CONFIG_TAG_NFSD
13612 +#define DX_TAG_NFSD 1
13614 +#define DX_TAG_NFSD 0
13618 +#ifdef CONFIG_TAGGING_NONE
13620 +#define MAX_UID 0xFFFFFFFF
13621 +#define MAX_GID 0xFFFFFFFF
13623 +#define INOTAG_TAG(cond, uid, gid, tag) (0)
13625 +#define TAGINO_UID(cond, uid, tag) (uid)
13626 +#define TAGINO_GID(cond, gid, tag) (gid)
13631 +#ifdef CONFIG_TAGGING_GID16
13633 +#define MAX_UID 0xFFFFFFFF
13634 +#define MAX_GID 0x0000FFFF
13636 +#define INOTAG_TAG(cond, uid, gid, tag) \
13637 + ((cond) ? (((gid) >> 16) & 0xFFFF) : 0)
13639 +#define TAGINO_UID(cond, uid, tag) (uid)
13640 +#define TAGINO_GID(cond, gid, tag) \
13641 + ((cond) ? (((gid) & 0xFFFF) | ((tag) << 16)) : (gid))
13646 +#ifdef CONFIG_TAGGING_ID24
13648 +#define MAX_UID 0x00FFFFFF
13649 +#define MAX_GID 0x00FFFFFF
13651 +#define INOTAG_TAG(cond, uid, gid, tag) \
13652 + ((cond) ? ((((uid) >> 16) & 0xFF00) | (((gid) >> 24) & 0xFF)) : 0)
13654 +#define TAGINO_UID(cond, uid, tag) \
13655 + ((cond) ? (((uid) & 0xFFFFFF) | (((tag) & 0xFF00) << 16)) : (uid))
13656 +#define TAGINO_GID(cond, gid, tag) \
13657 + ((cond) ? (((gid) & 0xFFFFFF) | (((tag) & 0x00FF) << 24)) : (gid))
13662 +#ifdef CONFIG_TAGGING_UID16
13664 +#define MAX_UID 0x0000FFFF
13665 +#define MAX_GID 0xFFFFFFFF
13667 +#define INOTAG_TAG(cond, uid, gid, tag) \
13668 + ((cond) ? (((uid) >> 16) & 0xFFFF) : 0)
13670 +#define TAGINO_UID(cond, uid, tag) \
13671 + ((cond) ? (((uid) & 0xFFFF) | ((tag) << 16)) : (uid))
13672 +#define TAGINO_GID(cond, gid, tag) (gid)
13677 +#ifdef CONFIG_TAGGING_INTERN
13679 +#define MAX_UID 0xFFFFFFFF
13680 +#define MAX_GID 0xFFFFFFFF
13682 +#define INOTAG_TAG(cond, uid, gid, tag) \
13683 + ((cond) ? (tag) : 0)
13685 +#define TAGINO_UID(cond, uid, tag) (uid)
13686 +#define TAGINO_GID(cond, gid, tag) (gid)
13691 +#ifndef CONFIG_TAGGING_NONE
13692 +#define dx_current_fstag(sb) \
13693 + ((sb)->s_flags & MS_TAGGED ? dx_current_tag() : 0)
13695 +#define dx_current_fstag(sb) (0)
13698 +#ifndef CONFIG_TAGGING_INTERN
13699 +#define TAGINO_TAG(cond, tag) (0)
13701 +#define TAGINO_TAG(cond, tag) ((cond) ? (tag) : 0)
13704 +#define INOTAG_UID(cond, uid, gid) \
13705 + ((cond) ? ((uid) & MAX_UID) : (uid))
13706 +#define INOTAG_GID(cond, uid, gid) \
13707 + ((cond) ? ((gid) & MAX_GID) : (gid))
13710 +static inline uid_t dx_map_uid(uid_t uid)
13712 + if ((uid > MAX_UID) && (uid != -1))
13714 + return (uid & MAX_UID);
13717 +static inline gid_t dx_map_gid(gid_t gid)
13719 + if ((gid > MAX_GID) && (gid != -1))
13721 + return (gid & MAX_GID);
13729 +#define dx_notagcheck(sb) ((sb) && ((sb)->s_flags & MS_NOTAGCHECK))
13731 +int dx_parse_tag(char *string, tag_t *tag, int remove, int *mnt_flags,
13732 + unsigned long *flags);
13734 +#ifdef CONFIG_PROPAGATE
13736 +void __dx_propagate_tag(struct nameidata *nd, struct inode *inode);
13738 +#define dx_propagate_tag(n, i) __dx_propagate_tag(n, i)
13741 +#define dx_propagate_tag(n, i) do { } while (0)
13744 +#endif /* _DX_TAG_H */
13745 diff -NurpP --minimal linux-3.5/include/linux/vserver/tag_cmd.h linux-3.5-vs2.3.4/include/linux/vserver/tag_cmd.h
13746 --- linux-3.5/include/linux/vserver/tag_cmd.h 1970-01-01 01:00:00.000000000 +0100
13747 +++ linux-3.5-vs2.3.4/include/linux/vserver/tag_cmd.h 2012-07-23 01:45:55.000000000 +0200
13749 +#ifndef _VX_TAG_CMD_H
13750 +#define _VX_TAG_CMD_H
13753 +/* vinfo commands */
13755 +#define VCMD_task_tag VC_CMD(VINFO, 3, 0)
13758 +extern int vc_task_tag(uint32_t);
13760 +#endif /* __KERNEL__ */
13762 +/* context commands */
13764 +#define VCMD_tag_migrate VC_CMD(TAGMIG, 1, 0)
13767 +extern int vc_tag_migrate(uint32_t);
13769 +#endif /* __KERNEL__ */
13770 +#endif /* _VX_TAG_CMD_H */
13771 diff -NurpP --minimal linux-3.5/include/net/addrconf.h linux-3.5-vs2.3.4/include/net/addrconf.h
13772 --- linux-3.5/include/net/addrconf.h 2012-07-22 23:39:46.000000000 +0200
13773 +++ linux-3.5-vs2.3.4/include/net/addrconf.h 2012-07-23 01:45:55.000000000 +0200
13774 @@ -80,7 +80,8 @@ extern int ipv6_dev_get_saddr(struct n
13775 struct net_device *dev,
13776 const struct in6_addr *daddr,
13777 unsigned int srcprefs,
13778 - struct in6_addr *saddr);
13779 + struct in6_addr *saddr,
13780 + struct nx_info *nxi);
13781 extern int ipv6_get_lladdr(struct net_device *dev,
13782 struct in6_addr *addr,
13783 unsigned char banned_flags);
13784 diff -NurpP --minimal linux-3.5/include/net/af_unix.h linux-3.5-vs2.3.4/include/net/af_unix.h
13785 --- linux-3.5/include/net/af_unix.h 2012-07-22 23:39:46.000000000 +0200
13786 +++ linux-3.5-vs2.3.4/include/net/af_unix.h 2012-07-23 01:45:55.000000000 +0200
13788 #include <linux/socket.h>
13789 #include <linux/un.h>
13790 #include <linux/mutex.h>
13791 +#include <linux/vs_base.h>
13792 #include <net/sock.h>
13794 extern void unix_inflight(struct file *fp);
13795 diff -NurpP --minimal linux-3.5/include/net/inet_timewait_sock.h linux-3.5-vs2.3.4/include/net/inet_timewait_sock.h
13796 --- linux-3.5/include/net/inet_timewait_sock.h 2012-03-19 19:47:29.000000000 +0100
13797 +++ linux-3.5-vs2.3.4/include/net/inet_timewait_sock.h 2012-07-23 01:45:55.000000000 +0200
13798 @@ -112,6 +112,10 @@ struct inet_timewait_sock {
13799 #define tw_net __tw_common.skc_net
13800 #define tw_daddr __tw_common.skc_daddr
13801 #define tw_rcv_saddr __tw_common.skc_rcv_saddr
13802 +#define tw_xid __tw_common.skc_xid
13803 +#define tw_vx_info __tw_common.skc_vx_info
13804 +#define tw_nid __tw_common.skc_nid
13805 +#define tw_nx_info __tw_common.skc_nx_info
13807 volatile unsigned char tw_substate;
13808 unsigned char tw_rcv_wscale;
13809 diff -NurpP --minimal linux-3.5/include/net/ip6_route.h linux-3.5-vs2.3.4/include/net/ip6_route.h
13810 --- linux-3.5/include/net/ip6_route.h 2012-07-22 23:39:46.000000000 +0200
13811 +++ linux-3.5-vs2.3.4/include/net/ip6_route.h 2012-07-23 01:45:55.000000000 +0200
13812 @@ -88,7 +88,8 @@ extern int ip6_route_get_saddr(struct
13813 struct rt6_info *rt,
13814 const struct in6_addr *daddr,
13815 unsigned int prefs,
13816 - struct in6_addr *saddr);
13817 + struct in6_addr *saddr,
13818 + struct nx_info *nxi);
13820 extern struct rt6_info *rt6_lookup(struct net *net,
13821 const struct in6_addr *daddr,
13822 diff -NurpP --minimal linux-3.5/include/net/route.h linux-3.5-vs2.3.4/include/net/route.h
13823 --- linux-3.5/include/net/route.h 2012-07-22 23:39:46.000000000 +0200
13824 +++ linux-3.5-vs2.3.4/include/net/route.h 2012-07-23 01:45:55.000000000 +0200
13825 @@ -202,6 +202,9 @@ static inline void ip_rt_put(struct rtab
13826 dst_release(&rt->dst);
13829 +#include <linux/vs_base.h>
13830 +#include <linux/vs_inet.h>
13832 #define IPTOS_RT_MASK (IPTOS_TOS_MASK & ~3)
13834 extern const __u8 ip_tos2prio[16];
13835 @@ -253,6 +256,9 @@ static inline void ip_route_connect_init
13836 protocol, flow_flags, dst, src, dport, sport);
13839 +extern struct rtable *ip_v4_find_src(struct net *net, struct nx_info *,
13840 + struct flowi4 *);
13842 static inline struct rtable *ip_route_connect(struct flowi4 *fl4,
13843 __be32 dst, __be32 src, u32 tos,
13844 int oif, u8 protocol,
13845 @@ -261,11 +267,25 @@ static inline struct rtable *ip_route_co
13847 struct net *net = sock_net(sk);
13849 + struct nx_info *nx_info = current_nx_info();
13851 ip_route_connect_init(fl4, dst, src, tos, oif, protocol,
13852 sport, dport, sk, can_sleep);
13854 - if (!dst || !src) {
13856 + nx_info = sk->sk_nx_info;
13858 + vxdprintk(VXD_CBIT(net, 4),
13859 + "ip_route_connect(%p) %p,%p;%lx",
13860 + sk, nx_info, sk->sk_socket,
13861 + (sk->sk_socket?sk->sk_socket->flags:0));
13863 + rt = ip_v4_find_src(net, nx_info, fl4);
13868 + if (!fl4->daddr || !fl4->saddr) {
13869 rt = __ip_route_output_key(net, fl4);
13872 diff -NurpP --minimal linux-3.5/include/net/sock.h linux-3.5-vs2.3.4/include/net/sock.h
13873 --- linux-3.5/include/net/sock.h 2012-07-22 23:39:46.000000000 +0200
13874 +++ linux-3.5-vs2.3.4/include/net/sock.h 2012-07-23 01:45:55.000000000 +0200
13875 @@ -171,6 +171,10 @@ struct sock_common {
13876 #ifdef CONFIG_NET_NS
13877 struct net *skc_net;
13880 + struct vx_info *skc_vx_info;
13882 + struct nx_info *skc_nx_info;
13884 * fields between dontcopy_begin/dontcopy_end
13885 * are not copied in sock_copy()
13886 @@ -282,6 +286,10 @@ struct sock {
13887 #define sk_bind_node __sk_common.skc_bind_node
13888 #define sk_prot __sk_common.skc_prot
13889 #define sk_net __sk_common.skc_net
13890 +#define sk_xid __sk_common.skc_xid
13891 +#define sk_vx_info __sk_common.skc_vx_info
13892 +#define sk_nid __sk_common.skc_nid
13893 +#define sk_nx_info __sk_common.skc_nx_info
13894 socket_lock_t sk_lock;
13895 struct sk_buff_head sk_receive_queue;
13897 diff -NurpP --minimal linux-3.5/init/Kconfig linux-3.5-vs2.3.4/init/Kconfig
13898 --- linux-3.5/init/Kconfig 2012-07-22 23:39:46.000000000 +0200
13899 +++ linux-3.5-vs2.3.4/init/Kconfig 2012-07-23 01:54:21.000000000 +0200
13900 @@ -624,6 +624,7 @@ config HAVE_UNSTABLE_SCHED_CLOCK
13902 boolean "Control Group support"
13906 This option adds support for grouping sets of processes together, for
13907 use with process control subsystems such as Cpusets, CFS, memory
13908 @@ -874,6 +875,7 @@ config USER_NS
13909 bool "User namespace (EXPERIMENTAL)"
13910 depends on EXPERIMENTAL
13911 depends on UIDGID_CONVERTED
13912 + depends on VSERVER_DISABLED
13913 select UIDGID_STRICT_TYPE_CHECKS
13916 diff -NurpP --minimal linux-3.5/init/main.c linux-3.5-vs2.3.4/init/main.c
13917 --- linux-3.5/init/main.c 2012-07-22 23:39:46.000000000 +0200
13918 +++ linux-3.5-vs2.3.4/init/main.c 2012-07-23 01:45:55.000000000 +0200
13920 #include <linux/shmem_fs.h>
13921 #include <linux/slab.h>
13922 #include <linux/perf_event.h>
13923 +#include <linux/vserver/percpu.h>
13925 #include <asm/io.h>
13926 #include <asm/bugs.h>
13927 diff -NurpP --minimal linux-3.5/ipc/mqueue.c linux-3.5-vs2.3.4/ipc/mqueue.c
13928 --- linux-3.5/ipc/mqueue.c 2012-07-22 23:39:46.000000000 +0200
13929 +++ linux-3.5-vs2.3.4/ipc/mqueue.c 2012-07-23 01:56:45.000000000 +0200
13931 #include <linux/ipc_namespace.h>
13932 #include <linux/user_namespace.h>
13933 #include <linux/slab.h>
13934 +#include <linux/vs_context.h>
13935 +#include <linux/vs_limit.h>
13937 #include <net/sock.h>
13939 @@ -76,6 +78,7 @@ struct mqueue_inode_info {
13940 struct pid* notify_owner;
13941 struct user_namespace *notify_user_ns;
13942 struct user_struct *user; /* user who created, for accounting */
13943 + struct vx_info *vxi;
13944 struct sock *notify_sock;
13945 struct sk_buff *notify_cookie;
13947 @@ -235,6 +238,7 @@ static struct inode *mqueue_get_inode(st
13948 if (S_ISREG(mode)) {
13949 struct mqueue_inode_info *info;
13950 unsigned long mq_bytes, mq_treesize;
13951 + struct vx_info *vxi = current_vx_info();
13953 inode->i_fop = &mqueue_file_operations;
13954 inode->i_size = FILENT_SIZE;
13955 @@ -248,6 +252,7 @@ static struct inode *mqueue_get_inode(st
13956 info->notify_user_ns = NULL;
13958 info->user = NULL; /* set when all is ok */
13959 + info->vxi = NULL;
13960 info->msg_tree = RB_ROOT;
13961 info->node_cache = NULL;
13962 memset(&info->attr, 0, sizeof(info->attr));
13963 @@ -281,17 +286,20 @@ static struct inode *mqueue_get_inode(st
13965 spin_lock(&mq_lock);
13966 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
13967 - u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE)) {
13968 + u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE) ||
13969 + !vx_ipcmsg_avail(vxi, mq_bytes)) {
13970 spin_unlock(&mq_lock);
13971 /* mqueue_evict_inode() releases info->messages */
13975 u->mq_bytes += mq_bytes;
13976 + vx_ipcmsg_add(vxi, u, mq_bytes);
13977 spin_unlock(&mq_lock);
13980 info->user = get_uid(u);
13981 + info->vxi = get_vx_info(vxi);
13982 } else if (S_ISDIR(mode)) {
13984 /* Some things misbehave if size == 0 on a directory */
13985 @@ -395,8 +403,11 @@ static void mqueue_evict_inode(struct in
13989 + struct vx_info *vxi = info->vxi;
13991 spin_lock(&mq_lock);
13992 user->mq_bytes -= mq_bytes;
13993 + vx_ipcmsg_sub(vxi, user, mq_bytes);
13995 * get_ns_from_inode() ensures that the
13996 * (ipc_ns = sb->s_fs_info) is either a valid ipc_ns
13997 @@ -406,6 +417,7 @@ static void mqueue_evict_inode(struct in
13999 ipc_ns->mq_queues_count--;
14000 spin_unlock(&mq_lock);
14001 + put_vx_info(vxi);
14005 diff -NurpP --minimal linux-3.5/ipc/msg.c linux-3.5-vs2.3.4/ipc/msg.c
14006 --- linux-3.5/ipc/msg.c 2011-05-22 16:17:59.000000000 +0200
14007 +++ linux-3.5-vs2.3.4/ipc/msg.c 2012-07-23 01:45:55.000000000 +0200
14009 #include <linux/rwsem.h>
14010 #include <linux/nsproxy.h>
14011 #include <linux/ipc_namespace.h>
14012 +#include <linux/vs_base.h>
14014 #include <asm/current.h>
14015 #include <asm/uaccess.h>
14016 @@ -190,6 +191,7 @@ static int newque(struct ipc_namespace *
14018 msq->q_perm.mode = msgflg & S_IRWXUGO;
14019 msq->q_perm.key = key;
14020 + msq->q_perm.xid = vx_current_xid();
14022 msq->q_perm.security = NULL;
14023 retval = security_msg_queue_alloc(msq);
14024 diff -NurpP --minimal linux-3.5/ipc/namespace.c linux-3.5-vs2.3.4/ipc/namespace.c
14025 --- linux-3.5/ipc/namespace.c 2012-07-22 23:39:46.000000000 +0200
14026 +++ linux-3.5-vs2.3.4/ipc/namespace.c 2012-07-23 03:31:37.000000000 +0200
14027 @@ -13,11 +13,12 @@
14028 #include <linux/mount.h>
14029 #include <linux/user_namespace.h>
14030 #include <linux/proc_fs.h>
14031 +#include <linux/vs_base.h>
14032 +#include <linux/vserver/global.h>
14036 -static struct ipc_namespace *create_ipc_ns(struct task_struct *tsk,
14037 - struct ipc_namespace *old_ns)
14038 +static struct ipc_namespace *create_ipc_ns(struct user_namespace *user_ns)
14040 struct ipc_namespace *ns;
14042 @@ -46,19 +47,19 @@ static struct ipc_namespace *create_ipc_
14043 ipcns_notify(IPCNS_CREATED);
14044 register_ipcns_notifier(ns);
14046 - ns->user_ns = get_user_ns(task_cred_xxx(tsk, user_ns));
14047 + // ns->user_ns = get_user_ns(task_cred_xxx(tsk, user_ns));
14048 + ns->user_ns = get_user_ns(user_ns);
14053 struct ipc_namespace *copy_ipcs(unsigned long flags,
14054 - struct task_struct *tsk)
14055 + struct ipc_namespace *old_ns,
14056 + struct user_namespace *user_ns)
14058 - struct ipc_namespace *ns = tsk->nsproxy->ipc_ns;
14060 if (!(flags & CLONE_NEWIPC))
14061 - return get_ipc_ns(ns);
14062 - return create_ipc_ns(tsk, ns);
14063 + return get_ipc_ns(old_ns);
14064 + return create_ipc_ns(user_ns);
14068 diff -NurpP --minimal linux-3.5/ipc/sem.c linux-3.5-vs2.3.4/ipc/sem.c
14069 --- linux-3.5/ipc/sem.c 2012-01-09 16:14:59.000000000 +0100
14070 +++ linux-3.5-vs2.3.4/ipc/sem.c 2012-07-23 01:45:55.000000000 +0200
14072 #include <linux/rwsem.h>
14073 #include <linux/nsproxy.h>
14074 #include <linux/ipc_namespace.h>
14075 +#include <linux/vs_base.h>
14076 +#include <linux/vs_limit.h>
14078 #include <asm/uaccess.h>
14080 @@ -306,6 +308,7 @@ static int newary(struct ipc_namespace *
14082 sma->sem_perm.mode = (semflg & S_IRWXUGO);
14083 sma->sem_perm.key = key;
14084 + sma->sem_perm.xid = vx_current_xid();
14086 sma->sem_perm.security = NULL;
14087 retval = security_sem_alloc(sma);
14088 @@ -321,6 +324,9 @@ static int newary(struct ipc_namespace *
14091 ns->used_sems += nsems;
14092 + /* FIXME: obsoleted? */
14093 + vx_semary_inc(sma);
14094 + vx_nsems_add(sma, nsems);
14096 sma->sem_base = (struct sem *) &sma[1];
14098 @@ -770,6 +776,9 @@ static void freeary(struct ipc_namespace
14100 wake_up_sem_queue_do(&tasks);
14101 ns->used_sems -= sma->sem_nsems;
14102 + /* FIXME: obsoleted? */
14103 + vx_nsems_sub(sma, sma->sem_nsems);
14104 + vx_semary_dec(sma);
14105 security_sem_free(sma);
14106 ipc_rcu_putref(sma);
14108 diff -NurpP --minimal linux-3.5/ipc/shm.c linux-3.5-vs2.3.4/ipc/shm.c
14109 --- linux-3.5/ipc/shm.c 2012-07-22 23:39:46.000000000 +0200
14110 +++ linux-3.5-vs2.3.4/ipc/shm.c 2012-07-23 01:45:55.000000000 +0200
14112 #include <linux/nsproxy.h>
14113 #include <linux/mount.h>
14114 #include <linux/ipc_namespace.h>
14115 +#include <linux/vs_context.h>
14116 +#include <linux/vs_limit.h>
14118 #include <asm/uaccess.h>
14120 @@ -187,7 +189,12 @@ static void shm_open(struct vm_area_stru
14122 static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp)
14124 - ns->shm_tot -= (shp->shm_segsz + PAGE_SIZE - 1) >> PAGE_SHIFT;
14125 + struct vx_info *vxi = lookup_vx_info(shp->shm_perm.xid);
14126 + int numpages = (shp->shm_segsz + PAGE_SIZE - 1) >> PAGE_SHIFT;
14128 + vx_ipcshm_sub(vxi, shp, numpages);
14129 + ns->shm_tot -= numpages;
14133 if (!is_file_hugepages(shp->shm_file))
14134 @@ -197,6 +204,7 @@ static void shm_destroy(struct ipc_names
14136 fput (shp->shm_file);
14137 security_shm_free(shp);
14138 + put_vx_info(vxi);
14139 ipc_rcu_putref(shp);
14142 @@ -474,11 +482,15 @@ static int newseg(struct ipc_namespace *
14143 if (ns->shm_tot + numpages > ns->shm_ctlall)
14146 + if (!vx_ipcshm_avail(current_vx_info(), numpages))
14149 shp = ipc_rcu_alloc(sizeof(*shp));
14153 shp->shm_perm.key = key;
14154 + shp->shm_perm.xid = vx_current_xid();
14155 shp->shm_perm.mode = (shmflg & S_IRWXUGO);
14156 shp->mlock_user = NULL;
14158 @@ -533,6 +545,7 @@ static int newseg(struct ipc_namespace *
14159 ns->shm_tot += numpages;
14160 error = shp->shm_perm.id;
14162 + vx_ipcshm_add(current_vx_info(), key, numpages);
14166 diff -NurpP --minimal linux-3.5/kernel/Makefile linux-3.5-vs2.3.4/kernel/Makefile
14167 --- linux-3.5/kernel/Makefile 2012-07-22 23:39:46.000000000 +0200
14168 +++ linux-3.5-vs2.3.4/kernel/Makefile 2012-07-23 10:20:32.000000000 +0200
14169 @@ -24,6 +24,7 @@ endif
14175 ifeq ($(CONFIG_CHECKPOINT_RESTORE),y)
14176 obj-$(CONFIG_X86) += kcmp.o
14177 diff -NurpP --minimal linux-3.5/kernel/auditsc.c linux-3.5-vs2.3.4/kernel/auditsc.c
14178 --- linux-3.5/kernel/auditsc.c 2012-07-22 23:39:46.000000000 +0200
14179 +++ linux-3.5-vs2.3.4/kernel/auditsc.c 2012-07-23 01:45:55.000000000 +0200
14180 @@ -2309,7 +2309,7 @@ int audit_set_loginuid(uid_t loginuid)
14181 if (task->loginuid != -1)
14183 #else /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */
14184 - if (!capable(CAP_AUDIT_CONTROL))
14185 + if (!vx_capable(CAP_AUDIT_CONTROL, VXC_AUDIT_CONTROL))
14187 #endif /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */
14189 diff -NurpP --minimal linux-3.5/kernel/capability.c linux-3.5-vs2.3.4/kernel/capability.c
14190 --- linux-3.5/kernel/capability.c 2012-07-22 23:39:46.000000000 +0200
14191 +++ linux-3.5-vs2.3.4/kernel/capability.c 2012-07-23 01:45:55.000000000 +0200
14193 #include <linux/syscalls.h>
14194 #include <linux/pid_namespace.h>
14195 #include <linux/user_namespace.h>
14196 +#include <linux/vs_context.h>
14197 #include <asm/uaccess.h>
14200 @@ -116,6 +117,7 @@ static int cap_validate_magic(cap_user_h
14206 * The only thing that can change the capabilities of the current
14207 * process is the current process. As such, we can't be in this code
14208 @@ -349,6 +351,8 @@ bool has_ns_capability_noaudit(struct ta
14212 +#include <linux/vserver/base.h>
14215 * has_capability_noaudit - Does a task have a capability (unaudited) in the
14217 diff -NurpP --minimal linux-3.5/kernel/compat.c linux-3.5-vs2.3.4/kernel/compat.c
14218 --- linux-3.5/kernel/compat.c 2012-07-22 23:39:46.000000000 +0200
14219 +++ linux-3.5-vs2.3.4/kernel/compat.c 2012-07-23 01:45:55.000000000 +0200
14220 @@ -1054,7 +1054,7 @@ asmlinkage long compat_sys_stime(compat_
14224 - do_settimeofday(&tv);
14225 + vx_settimeofday(&tv);
14229 diff -NurpP --minimal linux-3.5/kernel/cred.c linux-3.5-vs2.3.4/kernel/cred.c
14230 --- linux-3.5/kernel/cred.c 2012-07-22 23:39:46.000000000 +0200
14231 +++ linux-3.5-vs2.3.4/kernel/cred.c 2012-07-23 01:45:55.000000000 +0200
14232 @@ -70,31 +70,6 @@ struct cred init_cred = {
14236 -static inline void set_cred_subscribers(struct cred *cred, int n)
14238 -#ifdef CONFIG_DEBUG_CREDENTIALS
14239 - atomic_set(&cred->subscribers, n);
14243 -static inline int read_cred_subscribers(const struct cred *cred)
14245 -#ifdef CONFIG_DEBUG_CREDENTIALS
14246 - return atomic_read(&cred->subscribers);
14252 -static inline void alter_cred_subscribers(const struct cred *_cred, int n)
14254 -#ifdef CONFIG_DEBUG_CREDENTIALS
14255 - struct cred *cred = (struct cred *) _cred;
14257 - atomic_add(n, &cred->subscribers);
14262 * Dispose of the shared task group credentials
14264 @@ -284,21 +259,16 @@ error:
14266 * Call commit_creds() or abort_creds() to clean up.
14268 -struct cred *prepare_creds(void)
14269 +struct cred *__prepare_creds(const struct cred *old)
14271 - struct task_struct *task = current;
14272 - const struct cred *old;
14275 - validate_process_creds();
14277 new = kmem_cache_alloc(cred_jar, GFP_KERNEL);
14281 kdebug("prepare_creds() alloc %p", new);
14283 - old = task->cred;
14284 memcpy(new, old, sizeof(struct cred));
14286 atomic_set(&new->usage, 1);
14287 @@ -326,6 +296,13 @@ error:
14292 +struct cred *prepare_creds(void)
14294 + validate_process_creds();
14296 + return __prepare_creds(current->cred);
14298 EXPORT_SYMBOL(prepare_creds);
14301 diff -NurpP --minimal linux-3.5/kernel/exit.c linux-3.5-vs2.3.4/kernel/exit.c
14302 --- linux-3.5/kernel/exit.c 2012-07-22 23:39:46.000000000 +0200
14303 +++ linux-3.5-vs2.3.4/kernel/exit.c 2012-07-23 01:45:55.000000000 +0200
14305 #include <linux/fs_struct.h>
14306 #include <linux/init_task.h>
14307 #include <linux/perf_event.h>
14308 +#include <linux/vs_limit.h>
14309 +#include <linux/vs_context.h>
14310 +#include <linux/vs_network.h>
14311 +#include <linux/vs_pid.h>
14312 #include <trace/events/sched.h>
14313 #include <linux/hw_breakpoint.h>
14314 #include <linux/oom.h>
14315 @@ -494,9 +498,11 @@ static void close_files(struct files_str
14316 filp_close(file, files);
14319 + vx_openfd_dec(i);
14327 @@ -1020,6 +1026,9 @@ void do_exit(long code)
14329 ptrace_put_breakpoints(tsk);
14331 + /* needs to stay before exit_notify() */
14332 + exit_vx_info_early(tsk, code);
14334 exit_notify(tsk, group_dead);
14337 @@ -1070,10 +1079,15 @@ void do_exit(long code)
14339 raw_spin_unlock_wait(&tsk->pi_lock);
14341 + /* needs to stay after exit_notify() */
14342 + exit_vx_info(tsk, code);
14343 + exit_nx_info(tsk);
14345 /* causes final put_task_struct in finish_task_switch(). */
14346 tsk->state = TASK_DEAD;
14347 tsk->flags |= PF_NOFREEZE; /* tell freezer to ignore us */
14349 + printk("bad task: %p [%lx]\n", current, current->state);
14351 /* Avoid "noreturn function does return". */
14353 diff -NurpP --minimal linux-3.5/kernel/fork.c linux-3.5-vs2.3.4/kernel/fork.c
14354 --- linux-3.5/kernel/fork.c 2012-07-22 23:39:46.000000000 +0200
14355 +++ linux-3.5-vs2.3.4/kernel/fork.c 2012-07-23 03:32:15.000000000 +0200
14357 #include <linux/khugepaged.h>
14358 #include <linux/signalfd.h>
14359 #include <linux/uprobes.h>
14360 +#include <linux/vs_context.h>
14361 +#include <linux/vs_network.h>
14362 +#include <linux/vs_limit.h>
14364 #include <asm/pgtable.h>
14365 #include <asm/pgalloc.h>
14366 @@ -207,6 +210,8 @@ void free_task(struct task_struct *tsk)
14367 account_kernel_stack(tsk->stack, -1);
14368 free_thread_info(tsk->stack);
14369 rt_mutex_debug_task_free(tsk);
14370 + clr_vx_info(&tsk->vx_info);
14371 + clr_nx_info(&tsk->nx_info);
14372 ftrace_graph_exit_task(tsk);
14373 put_seccomp_filter(tsk);
14374 free_task_struct(tsk);
14375 @@ -545,6 +550,7 @@ static struct mm_struct *mm_init(struct
14376 if (likely(!mm_alloc_pgd(mm))) {
14378 mmu_notifier_mm_init(mm);
14379 + set_vx_info(&mm->mm_vx_info, p->vx_info);
14383 @@ -597,6 +603,7 @@ void __mmdrop(struct mm_struct *mm)
14384 destroy_context(mm);
14385 mmu_notifier_mm_destroy(mm);
14387 + clr_vx_info(&mm->mm_vx_info);
14390 EXPORT_SYMBOL_GPL(__mmdrop);
14391 @@ -838,6 +845,7 @@ struct mm_struct *dup_mm(struct task_str
14394 memcpy(mm, oldmm, sizeof(*mm));
14395 + mm->mm_vx_info = NULL;
14396 mm_init_cpumask(mm);
14398 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
14399 @@ -878,6 +886,7 @@ fail_nocontext:
14400 * If init_new_context() failed, we cannot use mmput() to free the mm
14401 * because it calls destroy_context()
14403 + clr_vx_info(&mm->mm_vx_info);
14407 @@ -1161,6 +1170,8 @@ static struct task_struct *copy_process(
14409 struct task_struct *p;
14410 int cgroup_callbacks_done = 0;
14411 + struct vx_info *vxi;
14412 + struct nx_info *nxi;
14414 if ((clone_flags & (CLONE_NEWNS|CLONE_FS)) == (CLONE_NEWNS|CLONE_FS))
14415 return ERR_PTR(-EINVAL);
14416 @@ -1208,7 +1219,12 @@ static struct task_struct *copy_process(
14417 DEBUG_LOCKS_WARN_ON(!p->hardirqs_enabled);
14418 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
14420 + init_vx_info(&p->vx_info, current_vx_info());
14421 + init_nx_info(&p->nx_info, current_nx_info());
14424 + if (!vx_nproc_avail(1))
14425 + goto bad_fork_free;
14426 if (atomic_read(&p->real_cred->user->processes) >=
14427 task_rlimit(p, RLIMIT_NPROC)) {
14428 if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) &&
14429 @@ -1487,6 +1503,18 @@ static struct task_struct *copy_process(
14432 spin_unlock(¤t->sighand->siglock);
14434 + /* p is copy of current */
14435 + vxi = p->vx_info;
14437 + claim_vx_info(vxi, p);
14438 + atomic_inc(&vxi->cvirt.nr_threads);
14439 + atomic_inc(&vxi->cvirt.total_forks);
14442 + nxi = p->nx_info;
14444 + claim_nx_info(nxi, p);
14445 write_unlock_irq(&tasklist_lock);
14446 proc_fork_connector(p);
14447 cgroup_post_fork(p);
14448 diff -NurpP --minimal linux-3.5/kernel/kthread.c linux-3.5-vs2.3.4/kernel/kthread.c
14449 --- linux-3.5/kernel/kthread.c 2012-03-19 19:47:30.000000000 +0100
14450 +++ linux-3.5-vs2.3.4/kernel/kthread.c 2012-07-23 01:45:55.000000000 +0200
14452 #include <linux/mutex.h>
14453 #include <linux/slab.h>
14454 #include <linux/freezer.h>
14455 +#include <linux/vs_pid.h>
14456 #include <trace/events/sched.h>
14458 static DEFINE_SPINLOCK(kthread_create_lock);
14459 diff -NurpP --minimal linux-3.5/kernel/nsproxy.c linux-3.5-vs2.3.4/kernel/nsproxy.c
14460 --- linux-3.5/kernel/nsproxy.c 2012-01-09 16:15:00.000000000 +0100
14461 +++ linux-3.5-vs2.3.4/kernel/nsproxy.c 2012-07-23 10:58:02.000000000 +0200
14462 @@ -20,11 +20,14 @@
14463 #include <linux/mnt_namespace.h>
14464 #include <linux/utsname.h>
14465 #include <linux/pid_namespace.h>
14466 +#include <linux/vserver/global.h>
14467 +#include <linux/vserver/debug.h>
14468 #include <net/net_namespace.h>
14469 #include <linux/ipc_namespace.h>
14470 #include <linux/proc_fs.h>
14471 #include <linux/file.h>
14472 #include <linux/syscalls.h>
14473 +#include "../fs/mount.h"
14475 static struct kmem_cache *nsproxy_cachep;
14477 @@ -46,8 +49,11 @@ static inline struct nsproxy *create_nsp
14478 struct nsproxy *nsproxy;
14480 nsproxy = kmem_cache_alloc(nsproxy_cachep, GFP_KERNEL);
14483 atomic_set(&nsproxy->count, 1);
14484 + atomic_inc(&vs_global_nsproxy);
14486 + vxdprintk(VXD_CBIT(space, 2), "create_nsproxy = %p[1]", nsproxy);
14490 @@ -56,8 +62,11 @@ static inline struct nsproxy *create_nsp
14491 * Return the newly created nsproxy. Do not attach this to the task,
14492 * leave it to the caller to do proper locking and attach it to task.
14494 -static struct nsproxy *create_new_namespaces(unsigned long flags,
14495 - struct task_struct *tsk, struct fs_struct *new_fs)
14496 +static struct nsproxy *unshare_namespaces(unsigned long flags,
14497 + struct nsproxy *orig,
14498 + struct fs_struct *new_fs,
14499 + struct user_namespace *new_user,
14500 + struct pid_namespace *new_pid)
14502 struct nsproxy *new_nsp;
14504 @@ -66,31 +75,31 @@ static struct nsproxy *create_new_namesp
14506 return ERR_PTR(-ENOMEM);
14508 - new_nsp->mnt_ns = copy_mnt_ns(flags, tsk->nsproxy->mnt_ns, new_fs);
14509 + new_nsp->mnt_ns = copy_mnt_ns(flags, orig->mnt_ns, new_fs);
14510 if (IS_ERR(new_nsp->mnt_ns)) {
14511 err = PTR_ERR(new_nsp->mnt_ns);
14515 - new_nsp->uts_ns = copy_utsname(flags, tsk);
14516 + new_nsp->uts_ns = copy_utsname(flags, orig->uts_ns, new_user);
14517 if (IS_ERR(new_nsp->uts_ns)) {
14518 err = PTR_ERR(new_nsp->uts_ns);
14522 - new_nsp->ipc_ns = copy_ipcs(flags, tsk);
14523 + new_nsp->ipc_ns = copy_ipcs(flags, orig->ipc_ns, new_user);
14524 if (IS_ERR(new_nsp->ipc_ns)) {
14525 err = PTR_ERR(new_nsp->ipc_ns);
14529 - new_nsp->pid_ns = copy_pid_ns(flags, task_active_pid_ns(tsk));
14530 + new_nsp->pid_ns = copy_pid_ns(flags, new_pid);
14531 if (IS_ERR(new_nsp->pid_ns)) {
14532 err = PTR_ERR(new_nsp->pid_ns);
14536 - new_nsp->net_ns = copy_net_ns(flags, tsk->nsproxy->net_ns);
14537 + new_nsp->net_ns = copy_net_ns(flags, orig->net_ns);
14538 if (IS_ERR(new_nsp->net_ns)) {
14539 err = PTR_ERR(new_nsp->net_ns);
14541 @@ -115,6 +124,40 @@ out_ns:
14542 return ERR_PTR(err);
14545 +static struct nsproxy *create_new_namespaces(unsigned long flags,
14546 + struct task_struct *tsk, struct fs_struct *new_fs)
14548 + return unshare_namespaces(flags, tsk->nsproxy,
14549 + new_fs, task_cred_xxx(tsk, user_ns),
14550 + task_active_pid_ns(tsk));
14554 + * copies the nsproxy, setting refcount to 1, and grabbing a
14555 + * reference to all contained namespaces.
14557 +struct nsproxy *copy_nsproxy(struct nsproxy *orig)
14559 + struct nsproxy *ns = create_nsproxy();
14562 + memcpy(ns, orig, sizeof(struct nsproxy));
14563 + atomic_set(&ns->count, 1);
14566 + get_mnt_ns(ns->mnt_ns);
14568 + get_uts_ns(ns->uts_ns);
14570 + get_ipc_ns(ns->ipc_ns);
14572 + get_pid_ns(ns->pid_ns);
14574 + get_net(ns->net_ns);
14580 * called from clone. This now handles copy for nsproxy and all
14581 * namespaces therein.
14582 @@ -122,9 +165,12 @@ out_ns:
14583 int copy_namespaces(unsigned long flags, struct task_struct *tsk)
14585 struct nsproxy *old_ns = tsk->nsproxy;
14586 - struct nsproxy *new_ns;
14587 + struct nsproxy *new_ns = NULL;
14590 + vxdprintk(VXD_CBIT(space, 7), "copy_namespaces(0x%08lx,%p[%p])",
14591 + flags, tsk, old_ns);
14596 @@ -134,7 +180,7 @@ int copy_namespaces(unsigned long flags,
14597 CLONE_NEWPID | CLONE_NEWNET)))
14600 - if (!capable(CAP_SYS_ADMIN)) {
14601 + if (!vx_can_unshare(CAP_SYS_ADMIN, flags)) {
14605 @@ -161,6 +207,9 @@ int copy_namespaces(unsigned long flags,
14608 put_nsproxy(old_ns);
14609 + vxdprintk(VXD_CBIT(space, 3),
14610 + "copy_namespaces(0x%08lx,%p[%p]) = %d [%p]",
14611 + flags, tsk, old_ns, err, new_ns);
14615 @@ -174,7 +223,9 @@ void free_nsproxy(struct nsproxy *ns)
14616 put_ipc_ns(ns->ipc_ns);
14618 put_pid_ns(ns->pid_ns);
14619 - put_net(ns->net_ns);
14621 + put_net(ns->net_ns);
14622 + atomic_dec(&vs_global_nsproxy);
14623 kmem_cache_free(nsproxy_cachep, ns);
14626 @@ -187,11 +238,15 @@ int unshare_nsproxy_namespaces(unsigned
14630 + vxdprintk(VXD_CBIT(space, 4),
14631 + "unshare_nsproxy_namespaces(0x%08lx,[%p])",
14632 + unshare_flags, current->nsproxy);
14634 if (!(unshare_flags & (CLONE_NEWNS | CLONE_NEWUTS | CLONE_NEWIPC |
14638 - if (!capable(CAP_SYS_ADMIN))
14639 + if (!vx_can_unshare(CAP_SYS_ADMIN, unshare_flags))
14642 *new_nsp = create_new_namespaces(unshare_flags, current,
14643 diff -NurpP --minimal linux-3.5/kernel/pid.c linux-3.5-vs2.3.4/kernel/pid.c
14644 --- linux-3.5/kernel/pid.c 2012-07-22 23:39:46.000000000 +0200
14645 +++ linux-3.5-vs2.3.4/kernel/pid.c 2012-07-23 01:45:55.000000000 +0200
14647 #include <linux/pid_namespace.h>
14648 #include <linux/init_task.h>
14649 #include <linux/syscalls.h>
14650 +#include <linux/vs_pid.h>
14652 #define pid_hashfn(nr, ns) \
14653 hash_long((unsigned long)nr + (unsigned long)ns, pidhash_shift)
14654 @@ -344,7 +345,7 @@ EXPORT_SYMBOL_GPL(find_pid_ns);
14656 struct pid *find_vpid(int nr)
14658 - return find_pid_ns(nr, current->nsproxy->pid_ns);
14659 + return find_pid_ns(vx_rmap_pid(nr), current->nsproxy->pid_ns);
14661 EXPORT_SYMBOL_GPL(find_vpid);
14663 @@ -404,6 +405,9 @@ void transfer_pid(struct task_struct *ol
14664 struct task_struct *pid_task(struct pid *pid, enum pid_type type)
14666 struct task_struct *result = NULL;
14668 + if (type == PIDTYPE_REALPID)
14669 + type = PIDTYPE_PID;
14671 struct hlist_node *first;
14672 first = rcu_dereference_check(hlist_first_rcu(&pid->tasks[type]),
14673 @@ -423,7 +427,7 @@ struct task_struct *find_task_by_pid_ns(
14674 rcu_lockdep_assert(rcu_read_lock_held(),
14675 "find_task_by_pid_ns() needs rcu_read_lock()"
14677 - return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
14678 + return pid_task(find_pid_ns(vx_rmap_pid(nr), ns), PIDTYPE_PID);
14681 struct task_struct *find_task_by_vpid(pid_t vnr)
14682 @@ -467,7 +471,7 @@ struct pid *find_get_pid(pid_t nr)
14684 EXPORT_SYMBOL_GPL(find_get_pid);
14686 -pid_t pid_nr_ns(struct pid *pid, struct pid_namespace *ns)
14687 +pid_t pid_unmapped_nr_ns(struct pid *pid, struct pid_namespace *ns)
14691 @@ -480,6 +484,11 @@ pid_t pid_nr_ns(struct pid *pid, struct
14695 +pid_t pid_nr_ns(struct pid *pid, struct pid_namespace *ns)
14697 + return vx_map_pid(pid_unmapped_nr_ns(pid, ns));
14700 pid_t pid_vnr(struct pid *pid)
14702 return pid_nr_ns(pid, current->nsproxy->pid_ns);
14703 diff -NurpP --minimal linux-3.5/kernel/pid_namespace.c linux-3.5-vs2.3.4/kernel/pid_namespace.c
14704 --- linux-3.5/kernel/pid_namespace.c 2012-07-22 23:39:46.000000000 +0200
14705 +++ linux-3.5-vs2.3.4/kernel/pid_namespace.c 2012-07-23 01:45:55.000000000 +0200
14707 #include <linux/slab.h>
14708 #include <linux/proc_fs.h>
14709 #include <linux/reboot.h>
14710 +#include <linux/vserver/global.h>
14712 #define BITS_PER_PAGE (PAGE_SIZE*8)
14714 @@ -89,6 +90,7 @@ static struct pid_namespace *create_pid_
14717 kref_init(&ns->kref);
14718 + atomic_inc(&vs_global_pid_ns);
14720 ns->parent = get_pid_ns(parent_pid_ns);
14722 @@ -120,6 +122,7 @@ static void destroy_pid_namespace(struct
14724 for (i = 0; i < PIDMAP_ENTRIES; i++)
14725 kfree(ns->pidmap[i].page);
14726 + atomic_dec(&vs_global_pid_ns);
14727 kmem_cache_free(pid_ns_cachep, ns);
14730 diff -NurpP --minimal linux-3.5/kernel/posix-timers.c linux-3.5-vs2.3.4/kernel/posix-timers.c
14731 --- linux-3.5/kernel/posix-timers.c 2012-01-09 16:15:00.000000000 +0100
14732 +++ linux-3.5-vs2.3.4/kernel/posix-timers.c 2012-07-23 01:45:55.000000000 +0200
14734 #include <linux/wait.h>
14735 #include <linux/workqueue.h>
14736 #include <linux/export.h>
14737 +#include <linux/vs_context.h>
14740 * Management arrays for POSIX timers. Timers are kept in slab memory
14741 @@ -340,6 +341,7 @@ int posix_timer_event(struct k_itimer *t
14743 struct task_struct *task;
14744 int shared, ret = -1;
14747 * FIXME: if ->sigq is queued we can race with
14748 * dequeue_signal()->do_schedule_next_timer().
14749 @@ -356,10 +358,18 @@ int posix_timer_event(struct k_itimer *t
14751 task = pid_task(timr->it_pid, PIDTYPE_PID);
14753 + struct vx_info_save vxis;
14754 + struct vx_info *vxi;
14756 + vxi = get_vx_info(task->vx_info);
14757 + enter_vx_info(vxi, &vxis);
14758 shared = !(timr->it_sigev_notify & SIGEV_THREAD_ID);
14759 ret = send_sigqueue(timr->sigq, task, shared);
14760 + leave_vx_info(&vxis);
14761 + put_vx_info(vxi);
14765 /* If we failed to send the signal the timer stops. */
14768 diff -NurpP --minimal linux-3.5/kernel/printk.c linux-3.5-vs2.3.4/kernel/printk.c
14769 --- linux-3.5/kernel/printk.c 2012-07-22 23:39:46.000000000 +0200
14770 +++ linux-3.5-vs2.3.4/kernel/printk.c 2012-07-23 03:35:09.000000000 +0200
14772 #include <linux/notifier.h>
14773 #include <linux/rculist.h>
14774 #include <linux/poll.h>
14775 +#include <linux/vs_cvirt.h>
14777 #include <asm/uaccess.h>
14779 @@ -782,7 +783,7 @@ static int check_syslog_permissions(int
14782 if (syslog_action_restricted(type)) {
14783 - if (capable(CAP_SYSLOG))
14784 + if (vx_capable(CAP_SYSLOG, VXC_SYSLOG))
14786 /* For historical reasons, accept CAP_SYS_ADMIN too, with a warning */
14787 if (capable(CAP_SYS_ADMIN)) {
14788 @@ -1071,12 +1072,9 @@ int do_syslog(int type, char __user *buf
14793 - case SYSLOG_ACTION_CLOSE: /* Close log */
14795 - case SYSLOG_ACTION_OPEN: /* Open log */
14797 - case SYSLOG_ACTION_READ: /* Read from log */
14798 + if ((type == SYSLOG_ACTION_READ) ||
14799 + (type == SYSLOG_ACTION_READ_ALL) ||
14800 + (type == SYSLOG_ACTION_READ_CLEAR)) {
14802 if (!buf || len < 0)
14804 @@ -1087,6 +1085,16 @@ int do_syslog(int type, char __user *buf
14809 + if (!vx_check(0, VS_ADMIN|VS_WATCH))
14810 + return vx_do_syslog(type, buf, len);
14813 + case SYSLOG_ACTION_CLOSE: /* Close log */
14815 + case SYSLOG_ACTION_OPEN: /* Open log */
14817 + case SYSLOG_ACTION_READ: /* Read from log */
14818 error = wait_event_interruptible(log_wait,
14819 syslog_seq != log_next_seq);
14821 @@ -1099,16 +1107,6 @@ int do_syslog(int type, char __user *buf
14823 /* Read last kernel messages */
14824 case SYSLOG_ACTION_READ_ALL:
14826 - if (!buf || len < 0)
14831 - if (!access_ok(VERIFY_WRITE, buf, len)) {
14835 error = syslog_print_all(buf, len, clear);
14837 /* Clear ring buffer */
14838 diff -NurpP --minimal linux-3.5/kernel/ptrace.c linux-3.5-vs2.3.4/kernel/ptrace.c
14839 --- linux-3.5/kernel/ptrace.c 2012-07-22 23:39:46.000000000 +0200
14840 +++ linux-3.5-vs2.3.4/kernel/ptrace.c 2012-07-23 01:45:55.000000000 +0200
14842 #include <linux/syscalls.h>
14843 #include <linux/uaccess.h>
14844 #include <linux/regset.h>
14845 +#include <linux/vs_context.h>
14846 #include <linux/hw_breakpoint.h>
14847 #include <linux/cn_proc.h>
14849 @@ -216,6 +217,11 @@ ok:
14850 dumpable = get_dumpable(task->mm);
14851 if (!dumpable && !ptrace_has_cap(task_user_ns(task), mode))
14853 + if (!vx_check(task->xid, VS_ADMIN_P|VS_WATCH_P|VS_IDENT))
14855 + if (!vx_check(task->xid, VS_IDENT) &&
14856 + !task_vx_flags(task, VXF_STATE_ADMIN, 0))
14859 return security_ptrace_access_check(task, mode);
14861 diff -NurpP --minimal linux-3.5/kernel/sched/core.c linux-3.5-vs2.3.4/kernel/sched/core.c
14862 --- linux-3.5/kernel/sched/core.c 2012-07-22 23:39:47.000000000 +0200
14863 +++ linux-3.5-vs2.3.4/kernel/sched/core.c 2012-07-23 01:45:55.000000000 +0200
14865 #include <linux/slab.h>
14866 #include <linux/init_task.h>
14867 #include <linux/binfmts.h>
14868 +#include <linux/vs_sched.h>
14869 +#include <linux/vs_cvirt.h>
14871 #include <asm/switch_to.h>
14872 #include <asm/tlb.h>
14873 @@ -2223,9 +2225,17 @@ EXPORT_SYMBOL(avenrun); /* should be rem
14875 void get_avenrun(unsigned long *loads, unsigned long offset, int shift)
14877 - loads[0] = (avenrun[0] + offset) << shift;
14878 - loads[1] = (avenrun[1] + offset) << shift;
14879 - loads[2] = (avenrun[2] + offset) << shift;
14880 + if (vx_flags(VXF_VIRT_LOAD, 0)) {
14881 + struct vx_info *vxi = current_vx_info();
14883 + loads[0] = (vxi->cvirt.load[0] + offset) << shift;
14884 + loads[1] = (vxi->cvirt.load[1] + offset) << shift;
14885 + loads[2] = (vxi->cvirt.load[2] + offset) << shift;
14887 + loads[0] = (avenrun[0] + offset) << shift;
14888 + loads[1] = (avenrun[1] + offset) << shift;
14889 + loads[2] = (avenrun[2] + offset) << shift;
14893 static long calc_load_fold_active(struct rq *this_rq)
14894 @@ -2854,14 +2864,17 @@ static inline void task_group_account_fi
14895 void account_user_time(struct task_struct *p, cputime_t cputime,
14896 cputime_t cputime_scaled)
14898 + struct vx_info *vxi = p->vx_info; /* p is _always_ current */
14899 + int nice = (TASK_NICE(p) > 0);
14902 /* Add user time to process. */
14903 p->utime += cputime;
14904 p->utimescaled += cputime_scaled;
14905 + vx_account_user(vxi, cputime, nice);
14906 account_group_user_time(p, cputime);
14908 - index = (TASK_NICE(p) > 0) ? CPUTIME_NICE : CPUTIME_USER;
14909 + index = (nice) ? CPUTIME_NICE : CPUTIME_USER;
14911 /* Add user time to cpustat. */
14912 task_group_account_field(p, index, (__force u64) cputime);
14913 @@ -2908,9 +2921,12 @@ static inline
14914 void __account_system_time(struct task_struct *p, cputime_t cputime,
14915 cputime_t cputime_scaled, int index)
14917 + struct vx_info *vxi = p->vx_info; /* p is _always_ current */
14919 /* Add system time to process. */
14920 p->stime += cputime;
14921 p->stimescaled += cputime_scaled;
14922 + vx_account_system(vxi, cputime, 0 /* do we have idle time? */);
14923 account_group_system_time(p, cputime);
14925 /* Add system time to cpustat. */
14926 @@ -4131,7 +4147,7 @@ SYSCALL_DEFINE1(nice, int, increment)
14929 if (increment < 0 && !can_nice(current, nice))
14931 + return vx_flags(VXF_IGNEG_NICE, 0) ? 0 : -EPERM;
14933 retval = security_task_setnice(current, nice);
14935 diff -NurpP --minimal linux-3.5/kernel/sched/fair.c linux-3.5-vs2.3.4/kernel/sched/fair.c
14936 --- linux-3.5/kernel/sched/fair.c 2012-07-22 23:39:47.000000000 +0200
14937 +++ linux-3.5-vs2.3.4/kernel/sched/fair.c 2012-07-23 01:45:55.000000000 +0200
14939 #include <linux/slab.h>
14940 #include <linux/profile.h>
14941 #include <linux/interrupt.h>
14942 +#include <linux/vs_cvirt.h>
14944 #include <trace/events/sched.h>
14946 @@ -1111,6 +1112,8 @@ enqueue_entity(struct cfs_rq *cfs_rq, st
14947 __enqueue_entity(cfs_rq, se);
14950 + if (entity_is_task(se))
14951 + vx_activate_task(task_of(se));
14952 if (cfs_rq->nr_running == 1) {
14953 list_add_leaf_cfs_rq(cfs_rq);
14954 check_enqueue_throttle(cfs_rq);
14955 @@ -1191,6 +1194,8 @@ dequeue_entity(struct cfs_rq *cfs_rq, st
14956 if (se != cfs_rq->curr)
14957 __dequeue_entity(cfs_rq, se);
14959 + if (entity_is_task(se))
14960 + vx_deactivate_task(task_of(se));
14961 update_cfs_load(cfs_rq, 0);
14962 account_entity_dequeue(cfs_rq, se);
14964 diff -NurpP --minimal linux-3.5/kernel/signal.c linux-3.5-vs2.3.4/kernel/signal.c
14965 --- linux-3.5/kernel/signal.c 2012-07-22 23:39:47.000000000 +0200
14966 +++ linux-3.5-vs2.3.4/kernel/signal.c 2012-07-23 03:53:00.000000000 +0200
14968 #include <linux/nsproxy.h>
14969 #include <linux/user_namespace.h>
14970 #include <linux/uprobes.h>
14971 +#include <linux/vs_context.h>
14972 +#include <linux/vs_pid.h>
14973 #define CREATE_TRACE_POINTS
14974 #include <trace/events/signal.h>
14976 @@ -790,9 +792,18 @@ static int check_kill_permission(int sig
14980 + vxdprintk(VXD_CBIT(misc, 7),
14981 + "check_kill_permission(%d,%p,%p[#%u,%u])",
14982 + sig, info, t, vx_task_xid(t), t->pid);
14984 if (!valid_signal(sig))
14987 +/* FIXME: needed? if so, why?
14988 + if ((info != SEND_SIG_NOINFO) &&
14989 + (is_si_special(info) || !si_fromuser(info)))
14992 if (!si_fromuser(info))
14995 @@ -816,6 +827,20 @@ static int check_kill_permission(int sig
15000 + if (t->pid == 1 && current->xid)
15004 + /* FIXME: we shouldn't return ESRCH ever, to avoid
15005 + loops, maybe ENOENT or EACCES? */
15006 + if (!vx_check(vx_task_xid(t), VS_WATCH_P | VS_IDENT)) {
15007 + vxdprintk(current->xid || VXD_CBIT(misc, 7),
15008 + "signal %d[%p] xid mismatch %p[#%u,%u] xid=#%u",
15009 + sig, info, t, vx_task_xid(t), t->pid, current->xid);
15013 return security_task_kill(t, info, sig, 0);
15016 @@ -1351,7 +1376,7 @@ int kill_pid_info(int sig, struct siginf
15019 p = pid_task(pid, PIDTYPE_PID);
15021 + if (p && vx_check(vx_task_xid(p), VS_IDENT)) {
15022 error = group_send_sig_info(sig, info, p);
15023 if (unlikely(error == -ESRCH))
15025 @@ -1399,7 +1424,7 @@ int kill_pid_info_as_cred(int sig, struc
15028 p = pid_task(pid, PIDTYPE_PID);
15030 + if (!p || !vx_check(vx_task_xid(p), VS_IDENT)) {
15034 @@ -1451,8 +1476,10 @@ static int kill_something_info(int sig,
15035 struct task_struct * p;
15037 for_each_process(p) {
15038 - if (task_pid_vnr(p) > 1 &&
15039 - !same_thread_group(p, current)) {
15040 + if (vx_check(vx_task_xid(p), VS_ADMIN|VS_IDENT) &&
15041 + task_pid_vnr(p) > 1 &&
15042 + !same_thread_group(p, current) &&
15043 + !vx_current_initpid(p->pid)) {
15044 int err = group_send_sig_info(sig, info, p);
15047 @@ -2302,6 +2329,11 @@ relock:
15048 !sig_kernel_only(signr))
15051 + /* virtual init is protected against user signals */
15052 + if ((info->si_code == SI_USER) &&
15053 + vx_current_initpid(current->pid))
15056 if (sig_kernel_stop(signr)) {
15058 * The default action is to stop all threads in
15059 diff -NurpP --minimal linux-3.5/kernel/softirq.c linux-3.5-vs2.3.4/kernel/softirq.c
15060 --- linux-3.5/kernel/softirq.c 2012-05-21 18:07:34.000000000 +0200
15061 +++ linux-3.5-vs2.3.4/kernel/softirq.c 2012-07-23 01:45:55.000000000 +0200
15063 #include <linux/ftrace.h>
15064 #include <linux/smp.h>
15065 #include <linux/tick.h>
15066 +#include <linux/vs_context.h>
15068 #define CREATE_TRACE_POINTS
15069 #include <trace/events/irq.h>
15070 diff -NurpP --minimal linux-3.5/kernel/sys.c linux-3.5-vs2.3.4/kernel/sys.c
15071 --- linux-3.5/kernel/sys.c 2012-07-22 23:39:47.000000000 +0200
15072 +++ linux-3.5-vs2.3.4/kernel/sys.c 2012-07-23 03:33:13.000000000 +0200
15074 #include <linux/syscalls.h>
15075 #include <linux/kprobes.h>
15076 #include <linux/user_namespace.h>
15077 +#include <linux/vs_pid.h>
15079 #include <linux/kmsg_dump.h>
15080 /* Move somewhere else to avoid recompiling? */
15081 @@ -154,7 +155,10 @@ static int set_one_prio(struct task_stru
15084 if (niceval < task_nice(p) && !can_nice(p, niceval)) {
15086 + if (vx_flags(VXF_IGNEG_NICE, 0))
15092 no_nice = security_task_setnice(p, niceval);
15093 @@ -205,6 +209,8 @@ SYSCALL_DEFINE3(setpriority, int, which,
15095 pgrp = task_pgrp(current);
15096 do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
15097 + if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT))
15099 error = set_one_prio(p, niceval, error);
15100 } while_each_pid_thread(pgrp, PIDTYPE_PGID, p);
15102 @@ -270,6 +276,8 @@ SYSCALL_DEFINE2(getpriority, int, which,
15104 pgrp = task_pgrp(current);
15105 do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
15106 + if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT))
15108 niceval = 20 - task_nice(p);
15109 if (niceval > retval)
15111 @@ -421,6 +429,8 @@ EXPORT_SYMBOL_GPL(kernel_power_off);
15113 static DEFINE_MUTEX(reboot_mutex);
15115 +long vs_reboot(unsigned int, void __user *);
15118 * Reboot system call: for obvious reasons only root may call it,
15119 * and even root needs to set up some magic numbers in the registers
15120 @@ -462,6 +472,9 @@ SYSCALL_DEFINE4(reboot, int, magic1, int
15121 if ((cmd == LINUX_REBOOT_CMD_POWER_OFF) && !pm_power_off)
15122 cmd = LINUX_REBOOT_CMD_HALT;
15124 + if (!vx_check(0, VS_ADMIN|VS_WATCH))
15125 + return vs_reboot(cmd, arg);
15127 mutex_lock(&reboot_mutex);
15129 case LINUX_REBOOT_CMD_RESTART:
15130 @@ -1367,7 +1380,8 @@ SYSCALL_DEFINE2(sethostname, char __user
15132 char tmp[__NEW_UTS_LEN];
15134 - if (!ns_capable(current->nsproxy->uts_ns->user_ns, CAP_SYS_ADMIN))
15135 + if (!vx_ns_capable(current->nsproxy->uts_ns->user_ns,
15136 + CAP_SYS_ADMIN, VXC_SET_UTSNAME))
15139 if (len < 0 || len > __NEW_UTS_LEN)
15140 @@ -1418,7 +1432,8 @@ SYSCALL_DEFINE2(setdomainname, char __us
15142 char tmp[__NEW_UTS_LEN];
15144 - if (!ns_capable(current->nsproxy->uts_ns->user_ns, CAP_SYS_ADMIN))
15145 + if (!vx_ns_capable(current->nsproxy->uts_ns->user_ns,
15146 + CAP_SYS_ADMIN, VXC_SET_UTSNAME))
15148 if (len < 0 || len > __NEW_UTS_LEN)
15150 @@ -1537,7 +1552,7 @@ int do_prlimit(struct task_struct *tsk,
15151 /* Keep the capable check against init_user_ns until
15152 cgroups can contain all limits */
15153 if (new_rlim->rlim_max > rlim->rlim_max &&
15154 - !capable(CAP_SYS_RESOURCE))
15155 + !vx_capable(CAP_SYS_RESOURCE, VXC_SET_RLIMIT))
15158 retval = security_task_setrlimit(tsk->group_leader,
15159 @@ -1590,7 +1605,8 @@ static int check_prlimit_permission(stru
15160 gid_eq(cred->gid, tcred->sgid) &&
15161 gid_eq(cred->gid, tcred->gid))
15163 - if (ns_capable(tcred->user_ns, CAP_SYS_RESOURCE))
15164 + if (vx_ns_capable(tcred->user_ns,
15165 + CAP_SYS_RESOURCE, VXC_SET_RLIMIT))
15169 diff -NurpP --minimal linux-3.5/kernel/sysctl.c linux-3.5-vs2.3.4/kernel/sysctl.c
15170 --- linux-3.5/kernel/sysctl.c 2012-05-21 18:07:34.000000000 +0200
15171 +++ linux-3.5-vs2.3.4/kernel/sysctl.c 2012-07-23 01:45:55.000000000 +0200
15173 #if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT)
15174 #include <linux/lockdep.h>
15176 +extern char vshelper_path[];
15177 #ifdef CONFIG_CHR_DEV_SG
15178 #include <scsi/sg.h>
15180 @@ -562,6 +563,13 @@ static struct ctl_table kern_table[] = {
15181 .proc_handler = proc_dostring,
15185 + .procname = "vshelper",
15186 + .data = &vshelper_path,
15189 + .proc_handler = &proc_dostring,
15191 #ifdef CONFIG_CHR_DEV_SG
15193 .procname = "sg-big-buff",
15194 diff -NurpP --minimal linux-3.5/kernel/sysctl_binary.c linux-3.5-vs2.3.4/kernel/sysctl_binary.c
15195 --- linux-3.5/kernel/sysctl_binary.c 2012-01-09 16:15:00.000000000 +0100
15196 +++ linux-3.5-vs2.3.4/kernel/sysctl_binary.c 2012-07-23 01:45:55.000000000 +0200
15197 @@ -73,6 +73,7 @@ static const struct bin_table bin_kern_t
15199 { CTL_INT, KERN_PANIC, "panic" },
15200 { CTL_INT, KERN_REALROOTDEV, "real-root-dev" },
15201 + { CTL_STR, KERN_VSHELPER, "vshelper" },
15203 { CTL_STR, KERN_SPARC_REBOOT, "reboot-cmd" },
15204 { CTL_INT, KERN_CTLALTDEL, "ctrl-alt-del" },
15205 diff -NurpP --minimal linux-3.5/kernel/time/timekeeping.c linux-3.5-vs2.3.4/kernel/time/timekeeping.c
15206 --- linux-3.5/kernel/time/timekeeping.c 2012-07-22 23:39:47.000000000 +0200
15207 +++ linux-3.5-vs2.3.4/kernel/time/timekeeping.c 2012-07-23 01:45:55.000000000 +0200
15208 @@ -254,6 +254,7 @@ void getnstimeofday(struct timespec *ts)
15209 } while (read_seqretry(&timekeeper.lock, seq));
15211 timespec_add_ns(ts, nsecs);
15212 + vx_adjust_timespec(ts);
15214 EXPORT_SYMBOL(getnstimeofday);
15216 diff -NurpP --minimal linux-3.5/kernel/time.c linux-3.5-vs2.3.4/kernel/time.c
15217 --- linux-3.5/kernel/time.c 2012-05-21 18:07:34.000000000 +0200
15218 +++ linux-3.5-vs2.3.4/kernel/time.c 2012-07-23 01:45:55.000000000 +0200
15219 @@ -92,7 +92,7 @@ SYSCALL_DEFINE1(stime, time_t __user *,
15223 - do_settimeofday(&tv);
15224 + vx_settimeofday(&tv);
15228 @@ -172,7 +172,7 @@ int do_sys_settimeofday(const struct tim
15232 - return do_settimeofday(tv);
15233 + return vx_settimeofday(tv);
15237 diff -NurpP --minimal linux-3.5/kernel/timer.c linux-3.5-vs2.3.4/kernel/timer.c
15238 --- linux-3.5/kernel/timer.c 2012-07-22 23:39:47.000000000 +0200
15239 +++ linux-3.5-vs2.3.4/kernel/timer.c 2012-07-23 01:45:55.000000000 +0200
15241 #include <linux/irq_work.h>
15242 #include <linux/sched.h>
15243 #include <linux/slab.h>
15244 +#include <linux/vs_base.h>
15245 +#include <linux/vs_cvirt.h>
15246 +#include <linux/vs_pid.h>
15247 +#include <linux/vserver/sched.h>
15249 #include <asm/uaccess.h>
15250 #include <asm/unistd.h>
15251 @@ -1394,12 +1398,6 @@ SYSCALL_DEFINE1(alarm, unsigned int, sec
15258 - * The Alpha uses getxpid, getxuid, and getxgid instead. Maybe this
15259 - * should be moved into arch/i386 instead?
15263 * sys_getpid - return the thread group id of the current process
15264 @@ -1428,10 +1426,23 @@ SYSCALL_DEFINE0(getppid)
15266 pid = task_tgid_vnr(rcu_dereference(current->real_parent));
15268 + return vx_map_pid(pid);
15275 + * The Alpha uses getxpid, getxuid, and getxgid instead.
15278 +asmlinkage long do_getxpid(long *ppid)
15280 + *ppid = sys_getppid();
15281 + return sys_getpid();
15284 +#else /* _alpha_ */
15286 SYSCALL_DEFINE0(getuid)
15288 /* Only we change this so SMP safe */
15289 diff -NurpP --minimal linux-3.5/kernel/user_namespace.c linux-3.5-vs2.3.4/kernel/user_namespace.c
15290 --- linux-3.5/kernel/user_namespace.c 2012-07-22 23:39:47.000000000 +0200
15291 +++ linux-3.5-vs2.3.4/kernel/user_namespace.c 2012-07-23 03:38:28.000000000 +0200
15293 #include <linux/fs.h>
15294 #include <linux/uaccess.h>
15295 #include <linux/ctype.h>
15296 +#include <linux/vserver/global.h>
15298 static struct kmem_cache *user_ns_cachep __read_mostly;
15300 @@ -52,6 +53,7 @@ int create_user_ns(struct cred *new)
15303 kref_init(&ns->kref);
15304 + atomic_inc(&vs_global_user_ns);
15305 ns->parent = parent_ns;
15308 @@ -84,6 +86,9 @@ void free_user_ns(struct kref *kref)
15310 parent = ns->parent;
15311 kmem_cache_free(user_ns_cachep, ns);
15313 + /* FIXME: maybe move into destroyer? */
15314 + atomic_dec(&vs_global_user_ns);
15315 put_user_ns(parent);
15317 EXPORT_SYMBOL(free_user_ns);
15318 diff -NurpP --minimal linux-3.5/kernel/utsname.c linux-3.5-vs2.3.4/kernel/utsname.c
15319 --- linux-3.5/kernel/utsname.c 2012-07-22 23:39:47.000000000 +0200
15320 +++ linux-3.5-vs2.3.4/kernel/utsname.c 2012-07-23 03:52:22.000000000 +0200
15321 @@ -16,14 +16,17 @@
15322 #include <linux/slab.h>
15323 #include <linux/user_namespace.h>
15324 #include <linux/proc_fs.h>
15325 +#include <linux/vserver/global.h>
15327 static struct uts_namespace *create_uts_ns(void)
15329 struct uts_namespace *uts_ns;
15331 uts_ns = kmalloc(sizeof(struct uts_namespace), GFP_KERNEL);
15334 kref_init(&uts_ns->kref);
15335 + atomic_inc(&vs_global_uts_ns);
15340 @@ -32,8 +35,8 @@ static struct uts_namespace *create_uts_
15341 * @old_ns: namespace to clone
15342 * Return NULL on error (failure to kmalloc), new ns otherwise
15344 -static struct uts_namespace *clone_uts_ns(struct task_struct *tsk,
15345 - struct uts_namespace *old_ns)
15346 +static struct uts_namespace *clone_uts_ns(struct uts_namespace *old_ns,
15347 + struct user_namespace *old_user)
15349 struct uts_namespace *ns;
15351 @@ -43,7 +46,7 @@ static struct uts_namespace *clone_uts_n
15353 down_read(&uts_sem);
15354 memcpy(&ns->name, &old_ns->name, sizeof(ns->name));
15355 - ns->user_ns = get_user_ns(task_cred_xxx(tsk, user_ns));
15356 + ns->user_ns = get_user_ns(old_user);
15360 @@ -55,9 +58,9 @@ static struct uts_namespace *clone_uts_n
15363 struct uts_namespace *copy_utsname(unsigned long flags,
15364 - struct task_struct *tsk)
15365 + struct uts_namespace *old_ns,
15366 + struct user_namespace *user_ns)
15368 - struct uts_namespace *old_ns = tsk->nsproxy->uts_ns;
15369 struct uts_namespace *new_ns;
15372 @@ -66,7 +69,7 @@ struct uts_namespace *copy_utsname(unsig
15373 if (!(flags & CLONE_NEWUTS))
15376 - new_ns = clone_uts_ns(tsk, old_ns);
15377 + new_ns = clone_uts_ns(old_ns, user_ns);
15379 put_uts_ns(old_ns);
15381 @@ -78,6 +81,7 @@ void free_uts_ns(struct kref *kref)
15383 ns = container_of(kref, struct uts_namespace, kref);
15384 put_user_ns(ns->user_ns);
15385 + atomic_dec(&vs_global_uts_ns);
15389 diff -NurpP --minimal linux-3.5/kernel/vserver/Kconfig linux-3.5-vs2.3.4/kernel/vserver/Kconfig
15390 --- linux-3.5/kernel/vserver/Kconfig 1970-01-01 01:00:00.000000000 +0100
15391 +++ linux-3.5-vs2.3.4/kernel/vserver/Kconfig 2012-07-23 01:45:55.000000000 +0200
15394 +# Linux VServer configuration
15397 +menu "Linux VServer"
15399 +config VSERVER_AUTO_LBACK
15400 + bool "Automatically Assign Loopback IP"
15403 + Automatically assign a guest specific loopback
15404 + IP and add it to the kernel network stack on
15407 +config VSERVER_AUTO_SINGLE
15408 + bool "Automatic Single IP Special Casing"
15409 + depends on EXPERIMENTAL
15412 + This allows network contexts with a single IP to
15413 + automatically remap 0.0.0.0 bindings to that IP,
15414 + avoiding further network checks and improving
15417 + (note: such guests do not allow to change the ip
15418 + on the fly and do not show loopback addresses)
15420 +config VSERVER_COWBL
15421 + bool "Enable COW Immutable Link Breaking"
15424 + This enables the COW (Copy-On-Write) link break code.
15425 + It allows you to treat unified files like normal files
15426 + when writing to them (which will implicitely break the
15427 + link and create a copy of the unified file)
15429 +config VSERVER_VTIME
15430 + bool "Enable Virtualized Guest Time"
15431 + depends on EXPERIMENTAL
15434 + This enables per guest time offsets to allow for
15435 + adjusting the system clock individually per guest.
15436 + this adds some overhead to the time functions and
15437 + therefore should not be enabled without good reason.
15439 +config VSERVER_DEVICE
15440 + bool "Enable Guest Device Mapping"
15441 + depends on EXPERIMENTAL
15444 + This enables generic device remapping.
15446 +config VSERVER_PROC_SECURE
15447 + bool "Enable Proc Security"
15448 + depends on PROC_FS
15451 + This configures ProcFS security to initially hide
15452 + non-process entries for all contexts except the main and
15453 + spectator context (i.e. for all guests), which is a secure
15456 + (note: on 1.2x the entries were visible by default)
15459 + prompt "Persistent Inode Tagging"
15460 + default TAGGING_ID24
15462 + This adds persistent context information to filesystems
15463 + mounted with the tagxid option. Tagging is a requirement
15464 + for per-context disk limits and per-context quota.
15467 +config TAGGING_NONE
15470 + do not store per-context information in inodes.
15472 +config TAGGING_UID16
15473 + bool "UID16/GID32"
15475 + reduces UID to 16 bit, but leaves GID at 32 bit.
15477 +config TAGGING_GID16
15478 + bool "UID32/GID16"
15480 + reduces GID to 16 bit, but leaves UID at 32 bit.
15482 +config TAGGING_ID24
15483 + bool "UID24/GID24"
15485 + uses the upper 8bit from UID and GID for XID tagging
15486 + which leaves 24bit for UID/GID each, which should be
15487 + more than sufficient for normal use.
15489 +config TAGGING_INTERN
15490 + bool "UID32/GID32"
15492 + this uses otherwise reserved inode fields in the on
15493 + disk representation, which limits the use to a few
15494 + filesystems (currently ext2 and ext3)
15499 + bool "Tag NFSD User Auth and Files"
15502 + Enable this if you do want the in-kernel NFS
15503 + Server to use the tagging specified above.
15504 + (will require patched clients too)
15506 +config VSERVER_PRIVACY
15507 + bool "Honor Privacy Aspects of Guests"
15510 + When enabled, most context checks will disallow
15511 + access to structures assigned to a specific context,
15512 + like ptys or loop devices.
15514 +config VSERVER_CONTEXTS
15515 + int "Maximum number of Contexts (1-65533)" if EMBEDDED
15517 + default "768" if 64BIT
15520 + This setting will optimize certain data structures
15521 + and memory allocations according to the expected
15524 + note: this is not a strict upper limit.
15526 +config VSERVER_WARN
15527 + bool "VServer Warnings"
15530 + This enables various runtime warnings, which will
15531 + notify about potential manipulation attempts or
15532 + resource shortage. It is generally considered to
15533 + be a good idea to have that enabled.
15535 +config VSERVER_WARN_DEVPTS
15536 + bool "VServer DevPTS Warnings"
15537 + depends on VSERVER_WARN
15540 + This enables DevPTS related warnings, issued when a
15541 + process inside a context tries to lookup or access
15542 + a dynamic pts from the host or a different context.
15544 +config VSERVER_DEBUG
15545 + bool "VServer Debugging Code"
15548 + Set this to yes if you want to be able to activate
15549 + debugging output at runtime. It adds a very small
15550 + overhead to all vserver related functions and
15551 + increases the kernel size by about 20k.
15553 +config VSERVER_HISTORY
15554 + bool "VServer History Tracing"
15555 + depends on VSERVER_DEBUG
15558 + Set this to yes if you want to record the history of
15559 + linux-vserver activities, so they can be replayed in
15560 + the event of a kernel panic or oops.
15562 +config VSERVER_HISTORY_SIZE
15563 + int "Per-CPU History Size (32-65536)"
15564 + depends on VSERVER_HISTORY
15568 + This allows you to specify the number of entries in
15569 + the per-CPU history buffer.
15572 + prompt "Quotes used in debug and warn messages"
15573 + default QUOTES_ISO8859
15575 +config QUOTES_ISO8859
15576 + bool "Extended ASCII (ISO 8859) angle quotes"
15578 + This uses the extended ASCII characters \xbb
15579 + and \xab for quoting file and process names.
15581 +config QUOTES_UTF8
15582 + bool "UTF-8 angle quotes"
15584 + This uses the the UTF-8 sequences for angle
15585 + quotes to quote file and process names.
15587 +config QUOTES_ASCII
15588 + bool "ASCII single quotes"
15590 + This uses the ASCII single quote character
15591 + (\x27) to quote file and process names.
15601 + select NAMESPACES
15607 +config VSERVER_SECURITY
15609 + depends on SECURITY
15611 + select SECURITY_CAPABILITIES
15613 +config VSERVER_DISABLED
15617 diff -NurpP --minimal linux-3.5/kernel/vserver/Makefile linux-3.5-vs2.3.4/kernel/vserver/Makefile
15618 --- linux-3.5/kernel/vserver/Makefile 1970-01-01 01:00:00.000000000 +0100
15619 +++ linux-3.5-vs2.3.4/kernel/vserver/Makefile 2012-07-23 01:45:55.000000000 +0200
15622 +# Makefile for the Linux vserver routines.
15626 +obj-y += vserver.o
15628 +vserver-y := switch.o context.o space.o sched.o network.o inode.o \
15629 + limit.o cvirt.o cacct.o signal.o helper.o init.o \
15632 +vserver-$(CONFIG_INET) += inet.o
15633 +vserver-$(CONFIG_PROC_FS) += proc.o
15634 +vserver-$(CONFIG_VSERVER_DEBUG) += sysctl.o debug.o
15635 +vserver-$(CONFIG_VSERVER_HISTORY) += history.o
15636 +vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o
15637 +vserver-$(CONFIG_VSERVER_DEVICE) += device.o
15639 diff -NurpP --minimal linux-3.5/kernel/vserver/cacct.c linux-3.5-vs2.3.4/kernel/vserver/cacct.c
15640 --- linux-3.5/kernel/vserver/cacct.c 1970-01-01 01:00:00.000000000 +0100
15641 +++ linux-3.5-vs2.3.4/kernel/vserver/cacct.c 2012-07-23 01:45:55.000000000 +0200
15644 + * linux/kernel/vserver/cacct.c
15646 + * Virtual Server: Context Accounting
15648 + * Copyright (C) 2006-2007 Herbert Pötzl
15650 + * V0.01 added accounting stats
15654 +#include <linux/types.h>
15655 +#include <linux/vs_context.h>
15656 +#include <linux/vserver/cacct_cmd.h>
15657 +#include <linux/vserver/cacct_int.h>
15659 +#include <asm/errno.h>
15660 +#include <asm/uaccess.h>
15663 +int vc_sock_stat(struct vx_info *vxi, void __user *data)
15665 + struct vcmd_sock_stat_v0 vc_data;
15668 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
15671 + field = vc_data.field;
15672 + if ((field < 0) || (field >= VXA_SOCK_SIZE))
15675 + for (j = 0; j < 3; j++) {
15676 + vc_data.count[j] = vx_sock_count(&vxi->cacct, field, j);
15677 + vc_data.total[j] = vx_sock_total(&vxi->cacct, field, j);
15680 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
15685 diff -NurpP --minimal linux-3.5/kernel/vserver/cacct_init.h linux-3.5-vs2.3.4/kernel/vserver/cacct_init.h
15686 --- linux-3.5/kernel/vserver/cacct_init.h 1970-01-01 01:00:00.000000000 +0100
15687 +++ linux-3.5-vs2.3.4/kernel/vserver/cacct_init.h 2012-07-23 01:45:55.000000000 +0200
15691 +static inline void vx_info_init_cacct(struct _vx_cacct *cacct)
15696 + for (i = 0; i < VXA_SOCK_SIZE; i++) {
15697 + for (j = 0; j < 3; j++) {
15698 + atomic_long_set(&cacct->sock[i][j].count, 0);
15699 + atomic_long_set(&cacct->sock[i][j].total, 0);
15702 + for (i = 0; i < 8; i++)
15703 + atomic_set(&cacct->slab[i], 0);
15704 + for (i = 0; i < 5; i++)
15705 + for (j = 0; j < 4; j++)
15706 + atomic_set(&cacct->page[i][j], 0);
15709 +static inline void vx_info_exit_cacct(struct _vx_cacct *cacct)
15714 diff -NurpP --minimal linux-3.5/kernel/vserver/cacct_proc.h linux-3.5-vs2.3.4/kernel/vserver/cacct_proc.h
15715 --- linux-3.5/kernel/vserver/cacct_proc.h 1970-01-01 01:00:00.000000000 +0100
15716 +++ linux-3.5-vs2.3.4/kernel/vserver/cacct_proc.h 2012-07-23 01:45:55.000000000 +0200
15718 +#ifndef _VX_CACCT_PROC_H
15719 +#define _VX_CACCT_PROC_H
15721 +#include <linux/vserver/cacct_int.h>
15724 +#define VX_SOCKA_TOP \
15725 + "Type\t recv #/bytes\t\t send #/bytes\t\t fail #/bytes\n"
15727 +static inline int vx_info_proc_cacct(struct _vx_cacct *cacct, char *buffer)
15729 + int i, j, length = 0;
15730 + static char *type[VXA_SOCK_SIZE] = {
15731 + "UNSPEC", "UNIX", "INET", "INET6", "PACKET", "OTHER"
15734 + length += sprintf(buffer + length, VX_SOCKA_TOP);
15735 + for (i = 0; i < VXA_SOCK_SIZE; i++) {
15736 + length += sprintf(buffer + length, "%s:", type[i]);
15737 + for (j = 0; j < 3; j++) {
15738 + length += sprintf(buffer + length,
15739 + "\t%10lu/%-10lu",
15740 + vx_sock_count(cacct, i, j),
15741 + vx_sock_total(cacct, i, j));
15743 + buffer[length++] = '\n';
15746 + length += sprintf(buffer + length, "\n");
15747 + length += sprintf(buffer + length,
15748 + "slab:\t %8u %8u %8u %8u\n",
15749 + atomic_read(&cacct->slab[1]),
15750 + atomic_read(&cacct->slab[4]),
15751 + atomic_read(&cacct->slab[0]),
15752 + atomic_read(&cacct->slab[2]));
15754 + length += sprintf(buffer + length, "\n");
15755 + for (i = 0; i < 5; i++) {
15756 + length += sprintf(buffer + length,
15757 + "page[%d]: %8u %8u %8u %8u\t %8u %8u %8u %8u\n", i,
15758 + atomic_read(&cacct->page[i][0]),
15759 + atomic_read(&cacct->page[i][1]),
15760 + atomic_read(&cacct->page[i][2]),
15761 + atomic_read(&cacct->page[i][3]),
15762 + atomic_read(&cacct->page[i][4]),
15763 + atomic_read(&cacct->page[i][5]),
15764 + atomic_read(&cacct->page[i][6]),
15765 + atomic_read(&cacct->page[i][7]));
15770 +#endif /* _VX_CACCT_PROC_H */
15771 diff -NurpP --minimal linux-3.5/kernel/vserver/context.c linux-3.5-vs2.3.4/kernel/vserver/context.c
15772 --- linux-3.5/kernel/vserver/context.c 1970-01-01 01:00:00.000000000 +0100
15773 +++ linux-3.5-vs2.3.4/kernel/vserver/context.c 2012-07-23 01:45:55.000000000 +0200
15776 + * linux/kernel/vserver/context.c
15778 + * Virtual Server: Context Support
15780 + * Copyright (C) 2003-2011 Herbert Pötzl
15782 + * V0.01 context helper
15783 + * V0.02 vx_ctx_kill syscall command
15784 + * V0.03 replaced context_info calls
15785 + * V0.04 redesign of struct (de)alloc
15786 + * V0.05 rlimit basic implementation
15787 + * V0.06 task_xid and info commands
15788 + * V0.07 context flags and caps
15789 + * V0.08 switch to RCU based hash
15790 + * V0.09 revert to non RCU for now
15791 + * V0.10 and back to working RCU hash
15792 + * V0.11 and back to locking again
15793 + * V0.12 referenced context store
15794 + * V0.13 separate per cpu data
15795 + * V0.14 changed vcmds to vxi arg
15796 + * V0.15 added context stat
15797 + * V0.16 have __create claim() the vxi
15798 + * V0.17 removed older and legacy stuff
15799 + * V0.18 added user credentials
15800 + * V0.19 added warn mask
15804 +#include <linux/slab.h>
15805 +#include <linux/types.h>
15806 +#include <linux/security.h>
15807 +#include <linux/pid_namespace.h>
15808 +#include <linux/capability.h>
15810 +#include <linux/vserver/context.h>
15811 +#include <linux/vserver/network.h>
15812 +#include <linux/vserver/debug.h>
15813 +#include <linux/vserver/limit.h>
15814 +#include <linux/vserver/limit_int.h>
15815 +#include <linux/vserver/space.h>
15816 +#include <linux/init_task.h>
15817 +#include <linux/fs_struct.h>
15818 +#include <linux/cred.h>
15820 +#include <linux/vs_context.h>
15821 +#include <linux/vs_limit.h>
15822 +#include <linux/vs_pid.h>
15823 +#include <linux/vserver/context_cmd.h>
15825 +#include "cvirt_init.h"
15826 +#include "cacct_init.h"
15827 +#include "limit_init.h"
15828 +#include "sched_init.h"
15831 +atomic_t vx_global_ctotal = ATOMIC_INIT(0);
15832 +atomic_t vx_global_cactive = ATOMIC_INIT(0);
15835 +/* now inactive context structures */
15837 +static struct hlist_head vx_info_inactive = HLIST_HEAD_INIT;
15839 +static DEFINE_SPINLOCK(vx_info_inactive_lock);
15842 +/* __alloc_vx_info()
15844 + * allocate an initialized vx_info struct
15845 + * doesn't make it visible (hash) */
15847 +static struct vx_info *__alloc_vx_info(xid_t xid)
15849 + struct vx_info *new = NULL;
15852 + vxdprintk(VXD_CBIT(xid, 0), "alloc_vx_info(%d)*", xid);
15854 + /* would this benefit from a slab cache? */
15855 + new = kmalloc(sizeof(struct vx_info), GFP_KERNEL);
15859 + memset(new, 0, sizeof(struct vx_info));
15861 + new->ptr_pc = alloc_percpu(struct _vx_info_pc);
15862 + if (!new->ptr_pc)
15865 + new->vx_id = xid;
15866 + INIT_HLIST_NODE(&new->vx_hlist);
15867 + atomic_set(&new->vx_usecnt, 0);
15868 + atomic_set(&new->vx_tasks, 0);
15869 + new->vx_parent = NULL;
15870 + new->vx_state = 0;
15871 + init_waitqueue_head(&new->vx_wait);
15873 + /* prepare reaper */
15874 + get_task_struct(init_pid_ns.child_reaper);
15875 + new->vx_reaper = init_pid_ns.child_reaper;
15876 + new->vx_badness_bias = 0;
15878 + /* rest of init goes here */
15879 + vx_info_init_limit(&new->limit);
15880 + vx_info_init_sched(&new->sched);
15881 + vx_info_init_cvirt(&new->cvirt);
15882 + vx_info_init_cacct(&new->cacct);
15884 + /* per cpu data structures */
15885 + for_each_possible_cpu(cpu) {
15886 + vx_info_init_sched_pc(
15887 + &vx_per_cpu(new, sched_pc, cpu), cpu);
15888 + vx_info_init_cvirt_pc(
15889 + &vx_per_cpu(new, cvirt_pc, cpu), cpu);
15892 + new->vx_flags = VXF_INIT_SET;
15893 + new->vx_bcaps = CAP_FULL_SET; // maybe ~CAP_SETPCAP
15894 + new->vx_ccaps = 0;
15895 + new->vx_umask = 0;
15896 + new->vx_wmask = 0;
15898 + new->reboot_cmd = 0;
15899 + new->exit_code = 0;
15901 + // preconfig spaces
15902 + for (index = 0; index < VX_SPACES; index++) {
15903 + struct _vx_space *space = &new->space[index];
15906 + spin_lock(&init_fs.lock);
15908 + spin_unlock(&init_fs.lock);
15909 + space->vx_fs = &init_fs;
15911 + /* FIXME: do we want defaults? */
15912 + // space->vx_real_cred = 0;
15913 + // space->vx_cred = 0;
15917 + vxdprintk(VXD_CBIT(xid, 0),
15918 + "alloc_vx_info(%d) = %p", xid, new);
15919 + vxh_alloc_vx_info(new);
15920 + atomic_inc(&vx_global_ctotal);
15929 +/* __dealloc_vx_info()
15931 + * final disposal of vx_info */
15933 +static void __dealloc_vx_info(struct vx_info *vxi)
15935 +#ifdef CONFIG_VSERVER_WARN
15936 + struct vx_info_save vxis;
15939 + vxdprintk(VXD_CBIT(xid, 0),
15940 + "dealloc_vx_info(%p)", vxi);
15941 + vxh_dealloc_vx_info(vxi);
15943 +#ifdef CONFIG_VSERVER_WARN
15944 + enter_vx_info(vxi, &vxis);
15945 + vx_info_exit_limit(&vxi->limit);
15946 + vx_info_exit_sched(&vxi->sched);
15947 + vx_info_exit_cvirt(&vxi->cvirt);
15948 + vx_info_exit_cacct(&vxi->cacct);
15950 + for_each_possible_cpu(cpu) {
15951 + vx_info_exit_sched_pc(
15952 + &vx_per_cpu(vxi, sched_pc, cpu), cpu);
15953 + vx_info_exit_cvirt_pc(
15954 + &vx_per_cpu(vxi, cvirt_pc, cpu), cpu);
15956 + leave_vx_info(&vxis);
15960 + vxi->vx_state |= VXS_RELEASED;
15963 + free_percpu(vxi->ptr_pc);
15966 + atomic_dec(&vx_global_ctotal);
15969 +static void __shutdown_vx_info(struct vx_info *vxi)
15971 + struct nsproxy *nsproxy;
15972 + struct fs_struct *fs;
15973 + struct cred *cred;
15978 + vxi->vx_state |= VXS_SHUTDOWN;
15979 + vs_state_change(vxi, VSC_SHUTDOWN);
15981 + for (index = 0; index < VX_SPACES; index++) {
15982 + struct _vx_space *space = &vxi->space[index];
15984 + nsproxy = xchg(&space->vx_nsproxy, NULL);
15986 + put_nsproxy(nsproxy);
15988 + fs = xchg(&space->vx_fs, NULL);
15989 + spin_lock(&fs->lock);
15990 + kill = !--fs->users;
15991 + spin_unlock(&fs->lock);
15993 + free_fs_struct(fs);
15995 + cred = (struct cred *)xchg(&space->vx_cred, NULL);
15997 + abort_creds(cred);
16001 +/* exported stuff */
16003 +void free_vx_info(struct vx_info *vxi)
16005 + unsigned long flags;
16008 + /* check for reference counts first */
16009 + BUG_ON(atomic_read(&vxi->vx_usecnt));
16010 + BUG_ON(atomic_read(&vxi->vx_tasks));
16012 + /* context must not be hashed */
16013 + BUG_ON(vx_info_state(vxi, VXS_HASHED));
16015 + /* context shutdown is mandatory */
16016 + BUG_ON(!vx_info_state(vxi, VXS_SHUTDOWN));
16018 + /* spaces check */
16019 + for (index = 0; index < VX_SPACES; index++) {
16020 + struct _vx_space *space = &vxi->space[index];
16022 + BUG_ON(space->vx_nsproxy);
16023 + BUG_ON(space->vx_fs);
16024 + // BUG_ON(space->vx_real_cred);
16025 + // BUG_ON(space->vx_cred);
16028 + spin_lock_irqsave(&vx_info_inactive_lock, flags);
16029 + hlist_del(&vxi->vx_hlist);
16030 + spin_unlock_irqrestore(&vx_info_inactive_lock, flags);
16032 + __dealloc_vx_info(vxi);
16036 +/* hash table for vx_info hash */
16038 +#define VX_HASH_SIZE 13
16040 +static struct hlist_head vx_info_hash[VX_HASH_SIZE] =
16041 + { [0 ... VX_HASH_SIZE-1] = HLIST_HEAD_INIT };
16043 +static DEFINE_SPINLOCK(vx_info_hash_lock);
16046 +static inline unsigned int __hashval(xid_t xid)
16048 + return (xid % VX_HASH_SIZE);
16053 +/* __hash_vx_info()
16055 + * add the vxi to the global hash table
16056 + * requires the hash_lock to be held */
16058 +static inline void __hash_vx_info(struct vx_info *vxi)
16060 + struct hlist_head *head;
16062 + vxd_assert_lock(&vx_info_hash_lock);
16063 + vxdprintk(VXD_CBIT(xid, 4),
16064 + "__hash_vx_info: %p[#%d]", vxi, vxi->vx_id);
16065 + vxh_hash_vx_info(vxi);
16067 + /* context must not be hashed */
16068 + BUG_ON(vx_info_state(vxi, VXS_HASHED));
16070 + vxi->vx_state |= VXS_HASHED;
16071 + head = &vx_info_hash[__hashval(vxi->vx_id)];
16072 + hlist_add_head(&vxi->vx_hlist, head);
16073 + atomic_inc(&vx_global_cactive);
16076 +/* __unhash_vx_info()
16078 + * remove the vxi from the global hash table
16079 + * requires the hash_lock to be held */
16081 +static inline void __unhash_vx_info(struct vx_info *vxi)
16083 + unsigned long flags;
16085 + vxd_assert_lock(&vx_info_hash_lock);
16086 + vxdprintk(VXD_CBIT(xid, 4),
16087 + "__unhash_vx_info: %p[#%d.%d.%d]", vxi, vxi->vx_id,
16088 + atomic_read(&vxi->vx_usecnt), atomic_read(&vxi->vx_tasks));
16089 + vxh_unhash_vx_info(vxi);
16091 + /* context must be hashed */
16092 + BUG_ON(!vx_info_state(vxi, VXS_HASHED));
16093 + /* but without tasks */
16094 + BUG_ON(atomic_read(&vxi->vx_tasks));
16096 + vxi->vx_state &= ~VXS_HASHED;
16097 + hlist_del_init(&vxi->vx_hlist);
16098 + spin_lock_irqsave(&vx_info_inactive_lock, flags);
16099 + hlist_add_head(&vxi->vx_hlist, &vx_info_inactive);
16100 + spin_unlock_irqrestore(&vx_info_inactive_lock, flags);
16101 + atomic_dec(&vx_global_cactive);
16105 +/* __lookup_vx_info()
16107 + * requires the hash_lock to be held
16108 + * doesn't increment the vx_refcnt */
16110 +static inline struct vx_info *__lookup_vx_info(xid_t xid)
16112 + struct hlist_head *head = &vx_info_hash[__hashval(xid)];
16113 + struct hlist_node *pos;
16114 + struct vx_info *vxi;
16116 + vxd_assert_lock(&vx_info_hash_lock);
16117 + hlist_for_each(pos, head) {
16118 + vxi = hlist_entry(pos, struct vx_info, vx_hlist);
16120 + if (vxi->vx_id == xid)
16125 + vxdprintk(VXD_CBIT(xid, 0),
16126 + "__lookup_vx_info(#%u): %p[#%u]",
16127 + xid, vxi, vxi ? vxi->vx_id : 0);
16128 + vxh_lookup_vx_info(vxi, xid);
16133 +/* __create_vx_info()
16135 + * create the requested context
16136 + * get(), claim() and hash it */
16138 +static struct vx_info *__create_vx_info(int id)
16140 + struct vx_info *new, *vxi = NULL;
16142 + vxdprintk(VXD_CBIT(xid, 1), "create_vx_info(%d)*", id);
16144 + if (!(new = __alloc_vx_info(id)))
16145 + return ERR_PTR(-ENOMEM);
16147 + /* required to make dynamic xids unique */
16148 + spin_lock(&vx_info_hash_lock);
16150 + /* static context requested */
16151 + if ((vxi = __lookup_vx_info(id))) {
16152 + vxdprintk(VXD_CBIT(xid, 0),
16153 + "create_vx_info(%d) = %p (already there)", id, vxi);
16154 + if (vx_info_flags(vxi, VXF_STATE_SETUP, 0))
16155 + vxi = ERR_PTR(-EBUSY);
16157 + vxi = ERR_PTR(-EEXIST);
16160 + /* new context */
16161 + vxdprintk(VXD_CBIT(xid, 0),
16162 + "create_vx_info(%d) = %p (new)", id, new);
16163 + claim_vx_info(new, NULL);
16164 + __hash_vx_info(get_vx_info(new));
16165 + vxi = new, new = NULL;
16168 + spin_unlock(&vx_info_hash_lock);
16169 + vxh_create_vx_info(IS_ERR(vxi) ? NULL : vxi, id);
16171 + __dealloc_vx_info(new);
16176 +/* exported stuff */
16179 +void unhash_vx_info(struct vx_info *vxi)
16181 + spin_lock(&vx_info_hash_lock);
16182 + __unhash_vx_info(vxi);
16183 + spin_unlock(&vx_info_hash_lock);
16184 + __shutdown_vx_info(vxi);
16185 + __wakeup_vx_info(vxi);
16189 +/* lookup_vx_info()
16191 + * search for a vx_info and get() it
16192 + * negative id means current */
16194 +struct vx_info *lookup_vx_info(int id)
16196 + struct vx_info *vxi = NULL;
16199 + vxi = get_vx_info(current_vx_info());
16200 + } else if (id > 1) {
16201 + spin_lock(&vx_info_hash_lock);
16202 + vxi = get_vx_info(__lookup_vx_info(id));
16203 + spin_unlock(&vx_info_hash_lock);
16208 +/* xid_is_hashed()
16210 + * verify that xid is still hashed */
16212 +int xid_is_hashed(xid_t xid)
16216 + spin_lock(&vx_info_hash_lock);
16217 + hashed = (__lookup_vx_info(xid) != NULL);
16218 + spin_unlock(&vx_info_hash_lock);
16222 +#ifdef CONFIG_PROC_FS
16226 + * get a subset of hashed xids for proc
16227 + * assumes size is at least one */
16229 +int get_xid_list(int index, unsigned int *xids, int size)
16231 + int hindex, nr_xids = 0;
16233 + /* only show current and children */
16234 + if (!vx_check(0, VS_ADMIN | VS_WATCH)) {
16237 + xids[nr_xids] = vx_current_xid();
16241 + for (hindex = 0; hindex < VX_HASH_SIZE; hindex++) {
16242 + struct hlist_head *head = &vx_info_hash[hindex];
16243 + struct hlist_node *pos;
16245 + spin_lock(&vx_info_hash_lock);
16246 + hlist_for_each(pos, head) {
16247 + struct vx_info *vxi;
16252 + vxi = hlist_entry(pos, struct vx_info, vx_hlist);
16253 + xids[nr_xids] = vxi->vx_id;
16254 + if (++nr_xids >= size) {
16255 + spin_unlock(&vx_info_hash_lock);
16259 + /* keep the lock time short */
16260 + spin_unlock(&vx_info_hash_lock);
16267 +#ifdef CONFIG_VSERVER_DEBUG
16269 +void dump_vx_info_inactive(int level)
16271 + struct hlist_node *entry, *next;
16273 + hlist_for_each_safe(entry, next, &vx_info_inactive) {
16274 + struct vx_info *vxi =
16275 + list_entry(entry, struct vx_info, vx_hlist);
16277 + dump_vx_info(vxi, level);
16284 +int vx_migrate_user(struct task_struct *p, struct vx_info *vxi)
16286 + struct user_struct *new_user, *old_user;
16291 + if (vx_info_flags(vxi, VXF_INFO_PRIVATE, 0))
16294 + new_user = alloc_uid(vxi->vx_id, p->uid);
16298 + old_user = p->user;
16299 + if (new_user != old_user) {
16300 + atomic_inc(&new_user->processes);
16301 + atomic_dec(&old_user->processes);
16302 + p->user = new_user;
16304 + free_uid(old_user);
16310 +void vx_mask_cap_bset(struct vx_info *vxi, struct task_struct *p)
16312 + // p->cap_effective &= vxi->vx_cap_bset;
16313 + p->cap_effective =
16314 + cap_intersect(p->cap_effective, vxi->cap_bset);
16315 + // p->cap_inheritable &= vxi->vx_cap_bset;
16316 + p->cap_inheritable =
16317 + cap_intersect(p->cap_inheritable, vxi->cap_bset);
16318 + // p->cap_permitted &= vxi->vx_cap_bset;
16319 + p->cap_permitted =
16320 + cap_intersect(p->cap_permitted, vxi->cap_bset);
16325 +#include <linux/file.h>
16326 +#include <linux/fdtable.h>
16328 +static int vx_openfd_task(struct task_struct *tsk)
16330 + struct files_struct *files = tsk->files;
16331 + struct fdtable *fdt;
16332 + const unsigned long *bptr;
16333 + int count, total;
16335 + /* no rcu_read_lock() because of spin_lock() */
16336 + spin_lock(&files->file_lock);
16337 + fdt = files_fdtable(files);
16338 + bptr = fdt->open_fds;
16339 + count = fdt->max_fds / (sizeof(unsigned long) * 8);
16340 + for (total = 0; count > 0; count--) {
16342 + total += hweight_long(*bptr);
16345 + spin_unlock(&files->file_lock);
16350 +/* for *space compatibility */
16352 +asmlinkage long sys_unshare(unsigned long);
16355 + * migrate task to new context
16356 + * gets vxi, puts old_vxi on change
16357 + * optionally unshares namespaces (hack)
16360 +int vx_migrate_task(struct task_struct *p, struct vx_info *vxi, int unshare)
16362 + struct vx_info *old_vxi;
16368 + vxdprintk(VXD_CBIT(xid, 5),
16369 + "vx_migrate_task(%p,%p[#%d.%d])", p, vxi,
16370 + vxi->vx_id, atomic_read(&vxi->vx_usecnt));
16372 + if (vx_info_flags(vxi, VXF_INFO_PRIVATE, 0) &&
16373 + !vx_info_flags(vxi, VXF_STATE_SETUP, 0))
16376 + if (vx_info_state(vxi, VXS_SHUTDOWN))
16379 + old_vxi = task_get_vx_info(p);
16380 + if (old_vxi == vxi)
16383 +// if (!(ret = vx_migrate_user(p, vxi))) {
16388 + openfd = vx_openfd_task(p);
16391 + atomic_dec(&old_vxi->cvirt.nr_threads);
16392 + atomic_dec(&old_vxi->cvirt.nr_running);
16393 + __rlim_dec(&old_vxi->limit, RLIMIT_NPROC);
16394 + /* FIXME: what about the struct files here? */
16395 + __rlim_sub(&old_vxi->limit, VLIMIT_OPENFD, openfd);
16396 + /* account for the executable */
16397 + __rlim_dec(&old_vxi->limit, VLIMIT_DENTRY);
16399 + atomic_inc(&vxi->cvirt.nr_threads);
16400 + atomic_inc(&vxi->cvirt.nr_running);
16401 + __rlim_inc(&vxi->limit, RLIMIT_NPROC);
16402 + /* FIXME: what about the struct files here? */
16403 + __rlim_add(&vxi->limit, VLIMIT_OPENFD, openfd);
16404 + /* account for the executable */
16405 + __rlim_inc(&vxi->limit, VLIMIT_DENTRY);
16408 + release_vx_info(old_vxi, p);
16409 + clr_vx_info(&p->vx_info);
16411 + claim_vx_info(vxi, p);
16412 + set_vx_info(&p->vx_info, vxi);
16413 + p->xid = vxi->vx_id;
16415 + vxdprintk(VXD_CBIT(xid, 5),
16416 + "moved task %p into vxi:%p[#%d]",
16417 + p, vxi, vxi->vx_id);
16419 + // vx_mask_cap_bset(vxi, p);
16422 + /* hack for *spaces to provide compatibility */
16424 + struct nsproxy *old_nsp, *new_nsp;
16426 + ret = unshare_nsproxy_namespaces(
16427 + CLONE_NEWUTS | CLONE_NEWIPC | CLONE_NEWUSER,
16432 + old_nsp = xchg(&p->nsproxy, new_nsp);
16433 + vx_set_space(vxi,
16434 + CLONE_NEWUTS | CLONE_NEWIPC | CLONE_NEWUSER, 0);
16435 + put_nsproxy(old_nsp);
16439 + put_vx_info(old_vxi);
16443 +int vx_set_reaper(struct vx_info *vxi, struct task_struct *p)
16445 + struct task_struct *old_reaper;
16446 + struct vx_info *reaper_vxi;
16451 + vxdprintk(VXD_CBIT(xid, 6),
16452 + "vx_set_reaper(%p[#%d],%p[#%d,%d])",
16453 + vxi, vxi->vx_id, p, p->xid, p->pid);
16455 + old_reaper = vxi->vx_reaper;
16456 + if (old_reaper == p)
16459 + reaper_vxi = task_get_vx_info(p);
16460 + if (reaper_vxi && reaper_vxi != vxi) {
16462 + "Unsuitable reaper [" VS_Q("%s") ",%u:#%u] "
16464 + p->comm, p->pid, p->xid, vx_current_xid());
16468 + /* set new child reaper */
16469 + get_task_struct(p);
16470 + vxi->vx_reaper = p;
16471 + put_task_struct(old_reaper);
16473 + put_vx_info(reaper_vxi);
16477 +int vx_set_init(struct vx_info *vxi, struct task_struct *p)
16482 + vxdprintk(VXD_CBIT(xid, 6),
16483 + "vx_set_init(%p[#%d],%p[#%d,%d,%d])",
16484 + vxi, vxi->vx_id, p, p->xid, p->pid, p->tgid);
16486 + vxi->vx_flags &= ~VXF_STATE_INIT;
16487 + // vxi->vx_initpid = p->tgid;
16488 + vxi->vx_initpid = p->pid;
16492 +void vx_exit_init(struct vx_info *vxi, struct task_struct *p, int code)
16494 + vxdprintk(VXD_CBIT(xid, 6),
16495 + "vx_exit_init(%p[#%d],%p[#%d,%d,%d])",
16496 + vxi, vxi->vx_id, p, p->xid, p->pid, p->tgid);
16498 + vxi->exit_code = code;
16499 + vxi->vx_initpid = 0;
16503 +void vx_set_persistent(struct vx_info *vxi)
16505 + vxdprintk(VXD_CBIT(xid, 6),
16506 + "vx_set_persistent(%p[#%d])", vxi, vxi->vx_id);
16508 + get_vx_info(vxi);
16509 + claim_vx_info(vxi, NULL);
16512 +void vx_clear_persistent(struct vx_info *vxi)
16514 + vxdprintk(VXD_CBIT(xid, 6),
16515 + "vx_clear_persistent(%p[#%d])", vxi, vxi->vx_id);
16517 + release_vx_info(vxi, NULL);
16518 + put_vx_info(vxi);
16521 +void vx_update_persistent(struct vx_info *vxi)
16523 + if (vx_info_flags(vxi, VXF_PERSISTENT, 0))
16524 + vx_set_persistent(vxi);
16526 + vx_clear_persistent(vxi);
16530 +/* task must be current or locked */
16532 +void exit_vx_info(struct task_struct *p, int code)
16534 + struct vx_info *vxi = p->vx_info;
16537 + atomic_dec(&vxi->cvirt.nr_threads);
16540 + vxi->exit_code = code;
16541 + release_vx_info(vxi, p);
16545 +void exit_vx_info_early(struct task_struct *p, int code)
16547 + struct vx_info *vxi = p->vx_info;
16550 + if (vxi->vx_initpid == p->pid)
16551 + vx_exit_init(vxi, p, code);
16552 + if (vxi->vx_reaper == p)
16553 + vx_set_reaper(vxi, init_pid_ns.child_reaper);
16558 +/* vserver syscall commands below here */
16560 +/* taks xid and vx_info functions */
16562 +#include <asm/uaccess.h>
16565 +int vc_task_xid(uint32_t id)
16570 + struct task_struct *tsk;
16573 + tsk = find_task_by_real_pid(id);
16574 + xid = (tsk) ? tsk->xid : -ESRCH;
16575 + rcu_read_unlock();
16577 + xid = vx_current_xid();
16582 +int vc_vx_info(struct vx_info *vxi, void __user *data)
16584 + struct vcmd_vx_info_v0 vc_data;
16586 + vc_data.xid = vxi->vx_id;
16587 + vc_data.initpid = vxi->vx_initpid;
16589 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
16595 +int vc_ctx_stat(struct vx_info *vxi, void __user *data)
16597 + struct vcmd_ctx_stat_v0 vc_data;
16599 + vc_data.usecnt = atomic_read(&vxi->vx_usecnt);
16600 + vc_data.tasks = atomic_read(&vxi->vx_tasks);
16602 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
16608 +/* context functions */
16610 +int vc_ctx_create(uint32_t xid, void __user *data)
16612 + struct vcmd_ctx_create vc_data = { .flagword = VXF_INIT_SET };
16613 + struct vx_info *new_vxi;
16616 + if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
16619 + if ((xid > MAX_S_CONTEXT) || (xid < 2))
16622 + new_vxi = __create_vx_info(xid);
16623 + if (IS_ERR(new_vxi))
16624 + return PTR_ERR(new_vxi);
16626 + /* initial flags */
16627 + new_vxi->vx_flags = vc_data.flagword;
16630 + if (vs_state_change(new_vxi, VSC_STARTUP))
16633 + ret = vx_migrate_task(current, new_vxi, (!data));
16637 + /* return context id on success */
16638 + ret = new_vxi->vx_id;
16640 + /* get a reference for persistent contexts */
16641 + if ((vc_data.flagword & VXF_PERSISTENT))
16642 + vx_set_persistent(new_vxi);
16644 + release_vx_info(new_vxi, NULL);
16645 + put_vx_info(new_vxi);
16650 +int vc_ctx_migrate(struct vx_info *vxi, void __user *data)
16652 + struct vcmd_ctx_migrate vc_data = { .flagword = 0 };
16655 + if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
16658 + ret = vx_migrate_task(current, vxi, 0);
16661 + if (vc_data.flagword & VXM_SET_INIT)
16662 + ret = vx_set_init(vxi, current);
16665 + if (vc_data.flagword & VXM_SET_REAPER)
16666 + ret = vx_set_reaper(vxi, current);
16671 +int vc_get_cflags(struct vx_info *vxi, void __user *data)
16673 + struct vcmd_ctx_flags_v0 vc_data;
16675 + vc_data.flagword = vxi->vx_flags;
16677 + /* special STATE flag handling */
16678 + vc_data.mask = vs_mask_flags(~0ULL, vxi->vx_flags, VXF_ONE_TIME);
16680 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
16685 +int vc_set_cflags(struct vx_info *vxi, void __user *data)
16687 + struct vcmd_ctx_flags_v0 vc_data;
16688 + uint64_t mask, trigger;
16690 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
16693 + /* special STATE flag handling */
16694 + mask = vs_mask_mask(vc_data.mask, vxi->vx_flags, VXF_ONE_TIME);
16695 + trigger = (mask & vxi->vx_flags) ^ (mask & vc_data.flagword);
16697 + if (vxi == current_vx_info()) {
16698 + /* if (trigger & VXF_STATE_SETUP)
16699 + vx_mask_cap_bset(vxi, current); */
16700 + if (trigger & VXF_STATE_INIT) {
16703 + ret = vx_set_init(vxi, current);
16706 + ret = vx_set_reaper(vxi, current);
16712 + vxi->vx_flags = vs_mask_flags(vxi->vx_flags,
16713 + vc_data.flagword, mask);
16714 + if (trigger & VXF_PERSISTENT)
16715 + vx_update_persistent(vxi);
16721 +static inline uint64_t caps_from_cap_t(kernel_cap_t c)
16723 + uint64_t v = c.cap[0] | ((uint64_t)c.cap[1] << 32);
16725 + // printk("caps_from_cap_t(%08x:%08x) = %016llx\n", c.cap[1], c.cap[0], v);
16729 +static inline kernel_cap_t cap_t_from_caps(uint64_t v)
16731 + kernel_cap_t c = __cap_empty_set;
16733 + c.cap[0] = v & 0xFFFFFFFF;
16734 + c.cap[1] = (v >> 32) & 0xFFFFFFFF;
16736 + // printk("cap_t_from_caps(%016llx) = %08x:%08x\n", v, c.cap[1], c.cap[0]);
16741 +static int do_get_caps(struct vx_info *vxi, uint64_t *bcaps, uint64_t *ccaps)
16744 + *bcaps = caps_from_cap_t(vxi->vx_bcaps);
16746 + *ccaps = vxi->vx_ccaps;
16751 +int vc_get_ccaps(struct vx_info *vxi, void __user *data)
16753 + struct vcmd_ctx_caps_v1 vc_data;
16756 + ret = do_get_caps(vxi, NULL, &vc_data.ccaps);
16759 + vc_data.cmask = ~0ULL;
16761 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
16766 +static int do_set_caps(struct vx_info *vxi,
16767 + uint64_t bcaps, uint64_t bmask, uint64_t ccaps, uint64_t cmask)
16769 + uint64_t bcold = caps_from_cap_t(vxi->vx_bcaps);
16772 + printk("do_set_caps(%16llx, %16llx, %16llx, %16llx)\n",
16773 + bcaps, bmask, ccaps, cmask);
16775 + vxi->vx_bcaps = cap_t_from_caps(
16776 + vs_mask_flags(bcold, bcaps, bmask));
16777 + vxi->vx_ccaps = vs_mask_flags(vxi->vx_ccaps, ccaps, cmask);
16782 +int vc_set_ccaps(struct vx_info *vxi, void __user *data)
16784 + struct vcmd_ctx_caps_v1 vc_data;
16786 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
16789 + return do_set_caps(vxi, 0, 0, vc_data.ccaps, vc_data.cmask);
16792 +int vc_get_bcaps(struct vx_info *vxi, void __user *data)
16794 + struct vcmd_bcaps vc_data;
16797 + ret = do_get_caps(vxi, &vc_data.bcaps, NULL);
16800 + vc_data.bmask = ~0ULL;
16802 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
16807 +int vc_set_bcaps(struct vx_info *vxi, void __user *data)
16809 + struct vcmd_bcaps vc_data;
16811 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
16814 + return do_set_caps(vxi, vc_data.bcaps, vc_data.bmask, 0, 0);
16818 +int vc_get_umask(struct vx_info *vxi, void __user *data)
16820 + struct vcmd_umask vc_data;
16822 + vc_data.umask = vxi->vx_umask;
16823 + vc_data.mask = ~0ULL;
16825 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
16830 +int vc_set_umask(struct vx_info *vxi, void __user *data)
16832 + struct vcmd_umask vc_data;
16834 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
16837 + vxi->vx_umask = vs_mask_flags(vxi->vx_umask,
16838 + vc_data.umask, vc_data.mask);
16843 +int vc_get_wmask(struct vx_info *vxi, void __user *data)
16845 + struct vcmd_wmask vc_data;
16847 + vc_data.wmask = vxi->vx_wmask;
16848 + vc_data.mask = ~0ULL;
16850 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
16855 +int vc_set_wmask(struct vx_info *vxi, void __user *data)
16857 + struct vcmd_wmask vc_data;
16859 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
16862 + vxi->vx_wmask = vs_mask_flags(vxi->vx_wmask,
16863 + vc_data.wmask, vc_data.mask);
16868 +int vc_get_badness(struct vx_info *vxi, void __user *data)
16870 + struct vcmd_badness_v0 vc_data;
16872 + vc_data.bias = vxi->vx_badness_bias;
16874 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
16879 +int vc_set_badness(struct vx_info *vxi, void __user *data)
16881 + struct vcmd_badness_v0 vc_data;
16883 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
16886 + vxi->vx_badness_bias = vc_data.bias;
16890 +#include <linux/module.h>
16892 +EXPORT_SYMBOL_GPL(free_vx_info);
16894 diff -NurpP --minimal linux-3.5/kernel/vserver/cvirt.c linux-3.5-vs2.3.4/kernel/vserver/cvirt.c
16895 --- linux-3.5/kernel/vserver/cvirt.c 1970-01-01 01:00:00.000000000 +0100
16896 +++ linux-3.5-vs2.3.4/kernel/vserver/cvirt.c 2012-07-23 01:45:55.000000000 +0200
16899 + * linux/kernel/vserver/cvirt.c
16901 + * Virtual Server: Context Virtualization
16903 + * Copyright (C) 2004-2007 Herbert Pötzl
16905 + * V0.01 broken out from limit.c
16906 + * V0.02 added utsname stuff
16907 + * V0.03 changed vcmds to vxi arg
16911 +#include <linux/types.h>
16912 +#include <linux/utsname.h>
16913 +#include <linux/vs_cvirt.h>
16914 +#include <linux/vserver/switch.h>
16915 +#include <linux/vserver/cvirt_cmd.h>
16917 +#include <asm/uaccess.h>
16920 +void vx_vsi_boottime(struct timespec *boottime)
16922 + struct vx_info *vxi = current_vx_info();
16924 + set_normalized_timespec(boottime,
16925 + boottime->tv_sec + vxi->cvirt.bias_uptime.tv_sec,
16926 + boottime->tv_nsec + vxi->cvirt.bias_uptime.tv_nsec);
16930 +void vx_vsi_uptime(struct timespec *uptime, struct timespec *idle)
16932 + struct vx_info *vxi = current_vx_info();
16934 + set_normalized_timespec(uptime,
16935 + uptime->tv_sec - vxi->cvirt.bias_uptime.tv_sec,
16936 + uptime->tv_nsec - vxi->cvirt.bias_uptime.tv_nsec);
16939 + set_normalized_timespec(idle,
16940 + idle->tv_sec - vxi->cvirt.bias_idle.tv_sec,
16941 + idle->tv_nsec - vxi->cvirt.bias_idle.tv_nsec);
16945 +uint64_t vx_idle_jiffies(void)
16947 + return init_task.utime + init_task.stime;
16952 +static inline uint32_t __update_loadavg(uint32_t load,
16953 + int wsize, int delta, int n)
16955 + unsigned long long calc, prev;
16957 + /* just set it to n */
16958 + if (unlikely(delta >= wsize))
16959 + return (n << FSHIFT);
16961 + calc = delta * n;
16963 + prev = (wsize - delta);
16966 + do_div(calc, wsize);
16971 +void vx_update_load(struct vx_info *vxi)
16973 + uint32_t now, last, delta;
16974 + unsigned int nr_running, nr_uninterruptible;
16975 + unsigned int total;
16976 + unsigned long flags;
16978 + spin_lock_irqsave(&vxi->cvirt.load_lock, flags);
16981 + last = vxi->cvirt.load_last;
16982 + delta = now - last;
16984 + if (delta < 5*HZ)
16987 + nr_running = atomic_read(&vxi->cvirt.nr_running);
16988 + nr_uninterruptible = atomic_read(&vxi->cvirt.nr_uninterruptible);
16989 + total = nr_running + nr_uninterruptible;
16991 + vxi->cvirt.load[0] = __update_loadavg(vxi->cvirt.load[0],
16992 + 60*HZ, delta, total);
16993 + vxi->cvirt.load[1] = __update_loadavg(vxi->cvirt.load[1],
16994 + 5*60*HZ, delta, total);
16995 + vxi->cvirt.load[2] = __update_loadavg(vxi->cvirt.load[2],
16996 + 15*60*HZ, delta, total);
16998 + vxi->cvirt.load_last = now;
17000 + atomic_inc(&vxi->cvirt.load_updates);
17001 + spin_unlock_irqrestore(&vxi->cvirt.load_lock, flags);
17006 + * Commands to do_syslog:
17008 + * 0 -- Close the log. Currently a NOP.
17009 + * 1 -- Open the log. Currently a NOP.
17010 + * 2 -- Read from the log.
17011 + * 3 -- Read all messages remaining in the ring buffer.
17012 + * 4 -- Read and clear all messages remaining in the ring buffer
17013 + * 5 -- Clear ring buffer.
17014 + * 6 -- Disable printk's to console
17015 + * 7 -- Enable printk's to console
17016 + * 8 -- Set level of messages printed to console
17017 + * 9 -- Return number of unread characters in the log buffer
17018 + * 10 -- Return size of the log buffer
17020 +int vx_do_syslog(int type, char __user *buf, int len)
17023 + int do_clear = 0;
17024 + struct vx_info *vxi = current_vx_info();
17025 + struct _vx_syslog *log;
17029 + log = &vxi->cvirt.syslog;
17032 + case 0: /* Close log */
17033 + case 1: /* Open log */
17035 + case 2: /* Read from log */
17036 + error = wait_event_interruptible(log->log_wait,
17037 + (log->log_start - log->log_end));
17040 + spin_lock_irq(&log->logbuf_lock);
17041 + spin_unlock_irq(&log->logbuf_lock);
17043 + case 4: /* Read/clear last kernel messages */
17045 + /* fall through */
17046 + case 3: /* Read last kernel messages */
17049 + case 5: /* Clear ring buffer */
17052 + case 6: /* Disable logging to console */
17053 + case 7: /* Enable logging to console */
17054 + case 8: /* Set level of messages printed to console */
17057 + case 9: /* Number of chars in the log buffer */
17059 + case 10: /* Size of the log buffer */
17069 +/* virtual host info names */
17071 +static char *vx_vhi_name(struct vx_info *vxi, int id)
17073 + struct nsproxy *nsproxy;
17074 + struct uts_namespace *uts;
17076 + if (id == VHIN_CONTEXT)
17077 + return vxi->vx_name;
17079 + nsproxy = vxi->space[0].vx_nsproxy;
17083 + uts = nsproxy->uts_ns;
17088 + case VHIN_SYSNAME:
17089 + return uts->name.sysname;
17090 + case VHIN_NODENAME:
17091 + return uts->name.nodename;
17092 + case VHIN_RELEASE:
17093 + return uts->name.release;
17094 + case VHIN_VERSION:
17095 + return uts->name.version;
17096 + case VHIN_MACHINE:
17097 + return uts->name.machine;
17098 + case VHIN_DOMAINNAME:
17099 + return uts->name.domainname;
17106 +int vc_set_vhi_name(struct vx_info *vxi, void __user *data)
17108 + struct vcmd_vhi_name_v0 vc_data;
17111 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
17114 + name = vx_vhi_name(vxi, vc_data.field);
17118 + memcpy(name, vc_data.name, 65);
17122 +int vc_get_vhi_name(struct vx_info *vxi, void __user *data)
17124 + struct vcmd_vhi_name_v0 vc_data;
17127 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
17130 + name = vx_vhi_name(vxi, vc_data.field);
17134 + memcpy(vc_data.name, name, 65);
17135 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
17141 +int vc_virt_stat(struct vx_info *vxi, void __user *data)
17143 + struct vcmd_virt_stat_v0 vc_data;
17144 + struct _vx_cvirt *cvirt = &vxi->cvirt;
17145 + struct timespec uptime;
17147 + do_posix_clock_monotonic_gettime(&uptime);
17148 + set_normalized_timespec(&uptime,
17149 + uptime.tv_sec - cvirt->bias_uptime.tv_sec,
17150 + uptime.tv_nsec - cvirt->bias_uptime.tv_nsec);
17152 + vc_data.offset = timespec_to_ns(&cvirt->bias_ts);
17153 + vc_data.uptime = timespec_to_ns(&uptime);
17154 + vc_data.nr_threads = atomic_read(&cvirt->nr_threads);
17155 + vc_data.nr_running = atomic_read(&cvirt->nr_running);
17156 + vc_data.nr_uninterruptible = atomic_read(&cvirt->nr_uninterruptible);
17157 + vc_data.nr_onhold = atomic_read(&cvirt->nr_onhold);
17158 + vc_data.nr_forks = atomic_read(&cvirt->total_forks);
17159 + vc_data.load[0] = cvirt->load[0];
17160 + vc_data.load[1] = cvirt->load[1];
17161 + vc_data.load[2] = cvirt->load[2];
17163 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
17169 +#ifdef CONFIG_VSERVER_VTIME
17171 +/* virtualized time base */
17173 +void vx_adjust_timespec(struct timespec *ts)
17175 + struct vx_info *vxi;
17177 + if (!vx_flags(VXF_VIRT_TIME, 0))
17180 + vxi = current_vx_info();
17181 + ts->tv_sec += vxi->cvirt.bias_ts.tv_sec;
17182 + ts->tv_nsec += vxi->cvirt.bias_ts.tv_nsec;
17184 + if (ts->tv_nsec >= NSEC_PER_SEC) {
17186 + ts->tv_nsec -= NSEC_PER_SEC;
17187 + } else if (ts->tv_nsec < 0) {
17189 + ts->tv_nsec += NSEC_PER_SEC;
17193 +int vx_settimeofday(const struct timespec *ts)
17195 + struct timespec ats, delta;
17196 + struct vx_info *vxi;
17198 + if (!vx_flags(VXF_VIRT_TIME, 0))
17199 + return do_settimeofday(ts);
17201 + getnstimeofday(&ats);
17202 + delta = timespec_sub(*ts, ats);
17204 + vxi = current_vx_info();
17205 + vxi->cvirt.bias_ts = timespec_add(vxi->cvirt.bias_ts, delta);
17211 diff -NurpP --minimal linux-3.5/kernel/vserver/cvirt_init.h linux-3.5-vs2.3.4/kernel/vserver/cvirt_init.h
17212 --- linux-3.5/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00.000000000 +0100
17213 +++ linux-3.5-vs2.3.4/kernel/vserver/cvirt_init.h 2012-07-23 01:45:55.000000000 +0200
17217 +extern uint64_t vx_idle_jiffies(void);
17219 +static inline void vx_info_init_cvirt(struct _vx_cvirt *cvirt)
17221 + uint64_t idle_jiffies = vx_idle_jiffies();
17222 + uint64_t nsuptime;
17224 + do_posix_clock_monotonic_gettime(&cvirt->bias_uptime);
17225 + nsuptime = (unsigned long long)cvirt->bias_uptime.tv_sec
17226 + * NSEC_PER_SEC + cvirt->bias_uptime.tv_nsec;
17227 + cvirt->bias_clock = nsec_to_clock_t(nsuptime);
17228 + cvirt->bias_ts.tv_sec = 0;
17229 + cvirt->bias_ts.tv_nsec = 0;
17231 + jiffies_to_timespec(idle_jiffies, &cvirt->bias_idle);
17232 + atomic_set(&cvirt->nr_threads, 0);
17233 + atomic_set(&cvirt->nr_running, 0);
17234 + atomic_set(&cvirt->nr_uninterruptible, 0);
17235 + atomic_set(&cvirt->nr_onhold, 0);
17237 + spin_lock_init(&cvirt->load_lock);
17238 + cvirt->load_last = jiffies;
17239 + atomic_set(&cvirt->load_updates, 0);
17240 + cvirt->load[0] = 0;
17241 + cvirt->load[1] = 0;
17242 + cvirt->load[2] = 0;
17243 + atomic_set(&cvirt->total_forks, 0);
17245 + spin_lock_init(&cvirt->syslog.logbuf_lock);
17246 + init_waitqueue_head(&cvirt->syslog.log_wait);
17247 + cvirt->syslog.log_start = 0;
17248 + cvirt->syslog.log_end = 0;
17249 + cvirt->syslog.con_start = 0;
17250 + cvirt->syslog.logged_chars = 0;
17254 +void vx_info_init_cvirt_pc(struct _vx_cvirt_pc *cvirt_pc, int cpu)
17256 + // cvirt_pc->cpustat = { 0 };
17259 +static inline void vx_info_exit_cvirt(struct _vx_cvirt *cvirt)
17261 +#ifdef CONFIG_VSERVER_WARN
17264 + vxwprintk_xid((value = atomic_read(&cvirt->nr_threads)),
17265 + "!!! cvirt: %p[nr_threads] = %d on exit.",
17267 + vxwprintk_xid((value = atomic_read(&cvirt->nr_running)),
17268 + "!!! cvirt: %p[nr_running] = %d on exit.",
17270 + vxwprintk_xid((value = atomic_read(&cvirt->nr_uninterruptible)),
17271 + "!!! cvirt: %p[nr_uninterruptible] = %d on exit.",
17273 + vxwprintk_xid((value = atomic_read(&cvirt->nr_onhold)),
17274 + "!!! cvirt: %p[nr_onhold] = %d on exit.",
17280 +void vx_info_exit_cvirt_pc(struct _vx_cvirt_pc *cvirt_pc, int cpu)
17285 diff -NurpP --minimal linux-3.5/kernel/vserver/cvirt_proc.h linux-3.5-vs2.3.4/kernel/vserver/cvirt_proc.h
17286 --- linux-3.5/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00.000000000 +0100
17287 +++ linux-3.5-vs2.3.4/kernel/vserver/cvirt_proc.h 2012-07-23 01:45:55.000000000 +0200
17289 +#ifndef _VX_CVIRT_PROC_H
17290 +#define _VX_CVIRT_PROC_H
17292 +#include <linux/nsproxy.h>
17293 +#include <linux/mnt_namespace.h>
17294 +#include <linux/ipc_namespace.h>
17295 +#include <linux/utsname.h>
17296 +#include <linux/ipc.h>
17298 +extern int vx_info_mnt_namespace(struct mnt_namespace *, char *);
17301 +int vx_info_proc_nsproxy(struct nsproxy *nsproxy, char *buffer)
17303 + struct mnt_namespace *ns;
17304 + struct uts_namespace *uts;
17305 + struct ipc_namespace *ipc;
17311 + length += sprintf(buffer + length,
17312 + "NSProxy:\t%p [%p,%p,%p]\n",
17313 + nsproxy, nsproxy->mnt_ns,
17314 + nsproxy->uts_ns, nsproxy->ipc_ns);
17316 + ns = nsproxy->mnt_ns;
17320 + length += vx_info_mnt_namespace(ns, buffer + length);
17324 + uts = nsproxy->uts_ns;
17328 + length += sprintf(buffer + length,
17329 + "SysName:\t%.*s\n"
17330 + "NodeName:\t%.*s\n"
17331 + "Release:\t%.*s\n"
17332 + "Version:\t%.*s\n"
17333 + "Machine:\t%.*s\n"
17334 + "DomainName:\t%.*s\n",
17335 + __NEW_UTS_LEN, uts->name.sysname,
17336 + __NEW_UTS_LEN, uts->name.nodename,
17337 + __NEW_UTS_LEN, uts->name.release,
17338 + __NEW_UTS_LEN, uts->name.version,
17339 + __NEW_UTS_LEN, uts->name.machine,
17340 + __NEW_UTS_LEN, uts->name.domainname);
17343 + ipc = nsproxy->ipc_ns;
17347 + length += sprintf(buffer + length,
17348 + "SEMS:\t\t%d %d %d %d %d\n"
17349 + "MSG:\t\t%d %d %d\n"
17350 + "SHM:\t\t%lu %lu %d %d\n",
17351 + ipc->sem_ctls[0], ipc->sem_ctls[1],
17352 + ipc->sem_ctls[2], ipc->sem_ctls[3],
17354 + ipc->msg_ctlmax, ipc->msg_ctlmnb, ipc->msg_ctlmni,
17355 + (unsigned long)ipc->shm_ctlmax,
17356 + (unsigned long)ipc->shm_ctlall,
17357 + ipc->shm_ctlmni, ipc->shm_tot);
17364 +#include <linux/sched.h>
17366 +#define LOAD_INT(x) ((x) >> FSHIFT)
17367 +#define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1 - 1)) * 100)
17370 +int vx_info_proc_cvirt(struct _vx_cvirt *cvirt, char *buffer)
17375 + length += sprintf(buffer + length,
17376 + "BiasUptime:\t%lu.%02lu\n",
17377 + (unsigned long)cvirt->bias_uptime.tv_sec,
17378 + (cvirt->bias_uptime.tv_nsec / (NSEC_PER_SEC / 100)));
17380 + a = cvirt->load[0] + (FIXED_1 / 200);
17381 + b = cvirt->load[1] + (FIXED_1 / 200);
17382 + c = cvirt->load[2] + (FIXED_1 / 200);
17383 + length += sprintf(buffer + length,
17384 + "nr_threads:\t%d\n"
17385 + "nr_running:\t%d\n"
17386 + "nr_unintr:\t%d\n"
17387 + "nr_onhold:\t%d\n"
17388 + "load_updates:\t%d\n"
17389 + "loadavg:\t%d.%02d %d.%02d %d.%02d\n"
17390 + "total_forks:\t%d\n",
17391 + atomic_read(&cvirt->nr_threads),
17392 + atomic_read(&cvirt->nr_running),
17393 + atomic_read(&cvirt->nr_uninterruptible),
17394 + atomic_read(&cvirt->nr_onhold),
17395 + atomic_read(&cvirt->load_updates),
17396 + LOAD_INT(a), LOAD_FRAC(a),
17397 + LOAD_INT(b), LOAD_FRAC(b),
17398 + LOAD_INT(c), LOAD_FRAC(c),
17399 + atomic_read(&cvirt->total_forks));
17404 +int vx_info_proc_cvirt_pc(struct _vx_cvirt_pc *cvirt_pc,
17405 + char *buffer, int cpu)
17411 +#endif /* _VX_CVIRT_PROC_H */
17412 diff -NurpP --minimal linux-3.5/kernel/vserver/debug.c linux-3.5-vs2.3.4/kernel/vserver/debug.c
17413 --- linux-3.5/kernel/vserver/debug.c 1970-01-01 01:00:00.000000000 +0100
17414 +++ linux-3.5-vs2.3.4/kernel/vserver/debug.c 2012-07-23 01:45:55.000000000 +0200
17417 + * kernel/vserver/debug.c
17419 + * Copyright (C) 2005-2007 Herbert Pötzl
17421 + * V0.01 vx_info dump support
17425 +#include <linux/module.h>
17427 +#include <linux/vserver/context.h>
17430 +void dump_vx_info(struct vx_info *vxi, int level)
17432 + printk("vx_info %p[#%d, %d.%d, %4x]\n", vxi, vxi->vx_id,
17433 + atomic_read(&vxi->vx_usecnt),
17434 + atomic_read(&vxi->vx_tasks),
17437 + __dump_vx_limit(&vxi->limit);
17438 + __dump_vx_sched(&vxi->sched);
17439 + __dump_vx_cvirt(&vxi->cvirt);
17440 + __dump_vx_cacct(&vxi->cacct);
17446 +EXPORT_SYMBOL_GPL(dump_vx_info);
17448 diff -NurpP --minimal linux-3.5/kernel/vserver/device.c linux-3.5-vs2.3.4/kernel/vserver/device.c
17449 --- linux-3.5/kernel/vserver/device.c 1970-01-01 01:00:00.000000000 +0100
17450 +++ linux-3.5-vs2.3.4/kernel/vserver/device.c 2012-07-23 01:45:55.000000000 +0200
17453 + * linux/kernel/vserver/device.c
17455 + * Linux-VServer: Device Support
17457 + * Copyright (C) 2006 Herbert Pötzl
17458 + * Copyright (C) 2007 Daniel Hokka Zakrisson
17460 + * V0.01 device mapping basics
17461 + * V0.02 added defaults
17465 +#include <linux/slab.h>
17466 +#include <linux/rcupdate.h>
17467 +#include <linux/fs.h>
17468 +#include <linux/namei.h>
17469 +#include <linux/hash.h>
17471 +#include <asm/errno.h>
17472 +#include <asm/uaccess.h>
17473 +#include <linux/vserver/base.h>
17474 +#include <linux/vserver/debug.h>
17475 +#include <linux/vserver/context.h>
17476 +#include <linux/vserver/device.h>
17477 +#include <linux/vserver/device_cmd.h>
17480 +#define DMAP_HASH_BITS 4
17483 +struct vs_mapping {
17485 + struct hlist_node hlist;
17486 + struct list_head list;
17488 +#define dm_hlist u.hlist
17489 +#define dm_list u.list
17492 + struct vx_dmap_target target;
17496 +static struct hlist_head dmap_main_hash[1 << DMAP_HASH_BITS];
17498 +static DEFINE_SPINLOCK(dmap_main_hash_lock);
17500 +static struct vx_dmap_target dmap_defaults[2] = {
17501 + { .flags = DATTR_OPEN },
17502 + { .flags = DATTR_OPEN },
17506 +struct kmem_cache *dmap_cachep __read_mostly;
17508 +int __init dmap_cache_init(void)
17510 + dmap_cachep = kmem_cache_create("dmap_cache",
17511 + sizeof(struct vs_mapping), 0,
17512 + SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
17516 +__initcall(dmap_cache_init);
17519 +static inline unsigned int __hashval(dev_t dev, int bits)
17521 + return hash_long((unsigned long)dev, bits);
17525 +/* __hash_mapping()
17526 + * add the mapping to the hash table
17528 +static inline void __hash_mapping(struct vx_info *vxi, struct vs_mapping *vdm)
17530 + spinlock_t *hash_lock = &dmap_main_hash_lock;
17531 + struct hlist_head *head, *hash = dmap_main_hash;
17532 + int device = vdm->device;
17534 + spin_lock(hash_lock);
17535 + vxdprintk(VXD_CBIT(misc, 8), "__hash_mapping: %p[#%d] %08x:%08x",
17536 + vxi, vxi ? vxi->vx_id : 0, device, vdm->target.target);
17538 + head = &hash[__hashval(device, DMAP_HASH_BITS)];
17539 + hlist_add_head(&vdm->dm_hlist, head);
17540 + spin_unlock(hash_lock);
17544 +static inline int __mode_to_default(umode_t mode)
17557 +/* __set_default()
17560 +static inline void __set_default(struct vx_info *vxi, umode_t mode,
17561 + struct vx_dmap_target *vdmt)
17563 + spinlock_t *hash_lock = &dmap_main_hash_lock;
17564 + spin_lock(hash_lock);
17567 + vxi->dmap.targets[__mode_to_default(mode)] = *vdmt;
17569 + dmap_defaults[__mode_to_default(mode)] = *vdmt;
17572 + spin_unlock(hash_lock);
17574 + vxdprintk(VXD_CBIT(misc, 8), "__set_default: %p[#%u] %08x %04x",
17575 + vxi, vxi ? vxi->vx_id : 0, vdmt->target, vdmt->flags);
17579 +/* __remove_default()
17580 + * remove a default
17582 +static inline int __remove_default(struct vx_info *vxi, umode_t mode)
17584 + spinlock_t *hash_lock = &dmap_main_hash_lock;
17585 + spin_lock(hash_lock);
17588 + vxi->dmap.targets[__mode_to_default(mode)].flags = 0;
17589 + else /* remove == reset */
17590 + dmap_defaults[__mode_to_default(mode)].flags = DATTR_OPEN | mode;
17592 + spin_unlock(hash_lock);
17597 +/* __find_mapping()
17598 + * find a mapping in the hash table
17600 + * caller must hold hash_lock
17602 +static inline int __find_mapping(xid_t xid, dev_t device, umode_t mode,
17603 + struct vs_mapping **local, struct vs_mapping **global)
17605 + struct hlist_head *hash = dmap_main_hash;
17606 + struct hlist_head *head = &hash[__hashval(device, DMAP_HASH_BITS)];
17607 + struct hlist_node *pos;
17608 + struct vs_mapping *vdm;
17614 + hlist_for_each(pos, head) {
17615 + vdm = hlist_entry(pos, struct vs_mapping, dm_hlist);
17617 + if ((vdm->device == device) &&
17618 + !((vdm->target.flags ^ mode) & S_IFMT)) {
17619 + if (vdm->xid == xid) {
17622 + } else if (global && vdm->xid == 0)
17627 + if (global && *global)
17634 +/* __lookup_mapping()
17635 + * find a mapping and store the result in target and flags
17637 +static inline int __lookup_mapping(struct vx_info *vxi,
17638 + dev_t device, dev_t *target, int *flags, umode_t mode)
17640 + spinlock_t *hash_lock = &dmap_main_hash_lock;
17641 + struct vs_mapping *vdm, *global;
17642 + struct vx_dmap_target *vdmt;
17644 + xid_t xid = vxi->vx_id;
17647 + spin_lock(hash_lock);
17648 + if (__find_mapping(xid, device, mode, &vdm, &global) > 0) {
17650 + vdmt = &vdm->target;
17654 + index = __mode_to_default(mode);
17655 + if (vxi && vxi->dmap.targets[index].flags) {
17657 + vdmt = &vxi->dmap.targets[index];
17658 + } else if (global) {
17660 + vdmt = &global->target;
17664 + vdmt = &dmap_defaults[index];
17668 + if (target && (vdmt->flags & DATTR_REMAP))
17669 + *target = vdmt->target;
17671 + *target = device;
17673 + *flags = vdmt->flags;
17675 + spin_unlock(hash_lock);
17681 +/* __remove_mapping()
17682 + * remove a mapping from the hash table
17684 +static inline int __remove_mapping(struct vx_info *vxi, dev_t device,
17687 + spinlock_t *hash_lock = &dmap_main_hash_lock;
17688 + struct vs_mapping *vdm = NULL;
17691 + spin_lock(hash_lock);
17693 + ret = __find_mapping((vxi ? vxi->vx_id : 0), device, mode, &vdm,
17695 + vxdprintk(VXD_CBIT(misc, 8), "__remove_mapping: %p[#%d] %08x %04x",
17696 + vxi, vxi ? vxi->vx_id : 0, device, mode);
17699 + hlist_del(&vdm->dm_hlist);
17702 + spin_unlock(hash_lock);
17704 + kmem_cache_free(dmap_cachep, vdm);
17710 +int vs_map_device(struct vx_info *vxi,
17711 + dev_t device, dev_t *target, umode_t mode)
17713 + int ret, flags = DATTR_MASK;
17717 + *target = device;
17720 + ret = __lookup_mapping(vxi, device, target, &flags, mode);
17721 + vxdprintk(VXD_CBIT(misc, 8), "vs_map_device: %08x target: %08x flags: %04x mode: %04x mapped=%d",
17722 + device, target ? *target : 0, flags, mode, ret);
17724 + return (flags & DATTR_MASK);
17729 +static int do_set_mapping(struct vx_info *vxi,
17730 + dev_t device, dev_t target, int flags, umode_t mode)
17733 + struct vs_mapping *new;
17735 + new = kmem_cache_alloc(dmap_cachep, GFP_KERNEL);
17739 + INIT_HLIST_NODE(&new->dm_hlist);
17740 + new->device = device;
17741 + new->target.target = target;
17742 + new->target.flags = flags | mode;
17743 + new->xid = (vxi ? vxi->vx_id : 0);
17745 + vxdprintk(VXD_CBIT(misc, 8), "do_set_mapping: %08x target: %08x flags: %04x", device, target, flags);
17746 + __hash_mapping(vxi, new);
17748 + struct vx_dmap_target new = {
17749 + .target = target,
17750 + .flags = flags | mode,
17752 + __set_default(vxi, mode, &new);
17758 +static int do_unset_mapping(struct vx_info *vxi,
17759 + dev_t device, dev_t target, int flags, umode_t mode)
17761 + int ret = -EINVAL;
17764 + ret = __remove_mapping(vxi, device, mode);
17768 + ret = __remove_default(vxi, mode);
17778 +static inline int __user_device(const char __user *name, dev_t *dev,
17781 + struct nameidata nd;
17788 + ret = user_lpath(name, &nd.path);
17791 + if (nd.path.dentry->d_inode) {
17792 + *dev = nd.path.dentry->d_inode->i_rdev;
17793 + *mode = nd.path.dentry->d_inode->i_mode;
17795 + path_put(&nd.path);
17799 +static inline int __mapping_mode(dev_t device, dev_t target,
17800 + umode_t device_mode, umode_t target_mode, umode_t *mode)
17803 + *mode = device_mode & S_IFMT;
17805 + *mode = target_mode & S_IFMT;
17809 + /* if both given, device and target mode have to match */
17810 + if (device && target &&
17811 + ((device_mode ^ target_mode) & S_IFMT))
17817 +static inline int do_mapping(struct vx_info *vxi, const char __user *device_path,
17818 + const char __user *target_path, int flags, int set)
17820 + dev_t device = ~0, target = ~0;
17821 + umode_t device_mode = 0, target_mode = 0, mode;
17824 + ret = __user_device(device_path, &device, &device_mode);
17827 + ret = __user_device(target_path, &target, &target_mode);
17831 + ret = __mapping_mode(device, target,
17832 + device_mode, target_mode, &mode);
17837 + return do_set_mapping(vxi, device, target,
17840 + return do_unset_mapping(vxi, device, target,
17845 +int vc_set_mapping(struct vx_info *vxi, void __user *data)
17847 + struct vcmd_set_mapping_v0 vc_data;
17849 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
17852 + return do_mapping(vxi, vc_data.device, vc_data.target,
17853 + vc_data.flags, 1);
17856 +int vc_unset_mapping(struct vx_info *vxi, void __user *data)
17858 + struct vcmd_set_mapping_v0 vc_data;
17860 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
17863 + return do_mapping(vxi, vc_data.device, vc_data.target,
17864 + vc_data.flags, 0);
17868 +#ifdef CONFIG_COMPAT
17870 +int vc_set_mapping_x32(struct vx_info *vxi, void __user *data)
17872 + struct vcmd_set_mapping_v0_x32 vc_data;
17874 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
17877 + return do_mapping(vxi, compat_ptr(vc_data.device_ptr),
17878 + compat_ptr(vc_data.target_ptr), vc_data.flags, 1);
17881 +int vc_unset_mapping_x32(struct vx_info *vxi, void __user *data)
17883 + struct vcmd_set_mapping_v0_x32 vc_data;
17885 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
17888 + return do_mapping(vxi, compat_ptr(vc_data.device_ptr),
17889 + compat_ptr(vc_data.target_ptr), vc_data.flags, 0);
17892 +#endif /* CONFIG_COMPAT */
17895 diff -NurpP --minimal linux-3.5/kernel/vserver/dlimit.c linux-3.5-vs2.3.4/kernel/vserver/dlimit.c
17896 --- linux-3.5/kernel/vserver/dlimit.c 1970-01-01 01:00:00.000000000 +0100
17897 +++ linux-3.5-vs2.3.4/kernel/vserver/dlimit.c 2012-07-23 01:45:55.000000000 +0200
17900 + * linux/kernel/vserver/dlimit.c
17902 + * Virtual Server: Context Disk Limits
17904 + * Copyright (C) 2004-2009 Herbert Pötzl
17906 + * V0.01 initial version
17907 + * V0.02 compat32 splitup
17908 + * V0.03 extended interface
17912 +#include <linux/statfs.h>
17913 +#include <linux/sched.h>
17914 +#include <linux/namei.h>
17915 +#include <linux/vs_tag.h>
17916 +#include <linux/vs_dlimit.h>
17917 +#include <linux/vserver/dlimit_cmd.h>
17918 +#include <linux/slab.h>
17919 +// #include <linux/gfp.h>
17921 +#include <asm/uaccess.h>
17923 +/* __alloc_dl_info()
17925 + * allocate an initialized dl_info struct
17926 + * doesn't make it visible (hash) */
17928 +static struct dl_info *__alloc_dl_info(struct super_block *sb, tag_t tag)
17930 + struct dl_info *new = NULL;
17932 + vxdprintk(VXD_CBIT(dlim, 5),
17933 + "alloc_dl_info(%p,%d)*", sb, tag);
17935 + /* would this benefit from a slab cache? */
17936 + new = kmalloc(sizeof(struct dl_info), GFP_KERNEL);
17940 + memset(new, 0, sizeof(struct dl_info));
17941 + new->dl_tag = tag;
17943 + // INIT_RCU_HEAD(&new->dl_rcu);
17944 + INIT_HLIST_NODE(&new->dl_hlist);
17945 + spin_lock_init(&new->dl_lock);
17946 + atomic_set(&new->dl_refcnt, 0);
17947 + atomic_set(&new->dl_usecnt, 0);
17949 + /* rest of init goes here */
17951 + vxdprintk(VXD_CBIT(dlim, 4),
17952 + "alloc_dl_info(%p,%d) = %p", sb, tag, new);
17956 +/* __dealloc_dl_info()
17958 + * final disposal of dl_info */
17960 +static void __dealloc_dl_info(struct dl_info *dli)
17962 + vxdprintk(VXD_CBIT(dlim, 4),
17963 + "dealloc_dl_info(%p)", dli);
17965 + dli->dl_hlist.next = LIST_POISON1;
17966 + dli->dl_tag = -1;
17969 + BUG_ON(atomic_read(&dli->dl_usecnt));
17970 + BUG_ON(atomic_read(&dli->dl_refcnt));
17976 +/* hash table for dl_info hash */
17978 +#define DL_HASH_SIZE 13
17980 +struct hlist_head dl_info_hash[DL_HASH_SIZE];
17982 +static DEFINE_SPINLOCK(dl_info_hash_lock);
17985 +static inline unsigned int __hashval(struct super_block *sb, tag_t tag)
17987 + return ((tag ^ (unsigned long)sb) % DL_HASH_SIZE);
17992 +/* __hash_dl_info()
17994 + * add the dli to the global hash table
17995 + * requires the hash_lock to be held */
17997 +static inline void __hash_dl_info(struct dl_info *dli)
17999 + struct hlist_head *head;
18001 + vxdprintk(VXD_CBIT(dlim, 6),
18002 + "__hash_dl_info: %p[#%d]", dli, dli->dl_tag);
18003 + get_dl_info(dli);
18004 + head = &dl_info_hash[__hashval(dli->dl_sb, dli->dl_tag)];
18005 + hlist_add_head_rcu(&dli->dl_hlist, head);
18008 +/* __unhash_dl_info()
18010 + * remove the dli from the global hash table
18011 + * requires the hash_lock to be held */
18013 +static inline void __unhash_dl_info(struct dl_info *dli)
18015 + vxdprintk(VXD_CBIT(dlim, 6),
18016 + "__unhash_dl_info: %p[#%d]", dli, dli->dl_tag);
18017 + hlist_del_rcu(&dli->dl_hlist);
18018 + put_dl_info(dli);
18022 +/* __lookup_dl_info()
18024 + * requires the rcu_read_lock()
18025 + * doesn't increment the dl_refcnt */
18027 +static inline struct dl_info *__lookup_dl_info(struct super_block *sb, tag_t tag)
18029 + struct hlist_head *head = &dl_info_hash[__hashval(sb, tag)];
18030 + struct hlist_node *pos;
18031 + struct dl_info *dli;
18033 + hlist_for_each_entry_rcu(dli, pos, head, dl_hlist) {
18035 + if (dli->dl_tag == tag && dli->dl_sb == sb) {
18043 +struct dl_info *locate_dl_info(struct super_block *sb, tag_t tag)
18045 + struct dl_info *dli;
18048 + dli = get_dl_info(__lookup_dl_info(sb, tag));
18049 + vxdprintk(VXD_CBIT(dlim, 7),
18050 + "locate_dl_info(%p,#%d) = %p", sb, tag, dli);
18051 + rcu_read_unlock();
18055 +void rcu_free_dl_info(struct rcu_head *head)
18057 + struct dl_info *dli = container_of(head, struct dl_info, dl_rcu);
18058 + int usecnt, refcnt;
18060 + BUG_ON(!dli || !head);
18062 + usecnt = atomic_read(&dli->dl_usecnt);
18063 + BUG_ON(usecnt < 0);
18065 + refcnt = atomic_read(&dli->dl_refcnt);
18066 + BUG_ON(refcnt < 0);
18068 + vxdprintk(VXD_CBIT(dlim, 3),
18069 + "rcu_free_dl_info(%p)", dli);
18071 + __dealloc_dl_info(dli);
18073 + printk("!!! rcu didn't free\n");
18079 +static int do_addrem_dlimit(uint32_t id, const char __user *name,
18080 + uint32_t flags, int add)
18082 + struct path path;
18085 + ret = user_lpath(name, &path);
18087 + struct super_block *sb;
18088 + struct dl_info *dli;
18091 + if (!path.dentry->d_inode)
18092 + goto out_release;
18093 + if (!(sb = path.dentry->d_inode->i_sb))
18094 + goto out_release;
18097 + dli = __alloc_dl_info(sb, id);
18098 + spin_lock(&dl_info_hash_lock);
18101 + if (__lookup_dl_info(sb, id))
18103 + __hash_dl_info(dli);
18106 + spin_lock(&dl_info_hash_lock);
18107 + dli = __lookup_dl_info(sb, id);
18112 + __unhash_dl_info(dli);
18116 + spin_unlock(&dl_info_hash_lock);
18118 + __dealloc_dl_info(dli);
18125 +int vc_add_dlimit(uint32_t id, void __user *data)
18127 + struct vcmd_ctx_dlimit_base_v0 vc_data;
18129 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
18132 + return do_addrem_dlimit(id, vc_data.name, vc_data.flags, 1);
18135 +int vc_rem_dlimit(uint32_t id, void __user *data)
18137 + struct vcmd_ctx_dlimit_base_v0 vc_data;
18139 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
18142 + return do_addrem_dlimit(id, vc_data.name, vc_data.flags, 0);
18145 +#ifdef CONFIG_COMPAT
18147 +int vc_add_dlimit_x32(uint32_t id, void __user *data)
18149 + struct vcmd_ctx_dlimit_base_v0_x32 vc_data;
18151 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
18154 + return do_addrem_dlimit(id,
18155 + compat_ptr(vc_data.name_ptr), vc_data.flags, 1);
18158 +int vc_rem_dlimit_x32(uint32_t id, void __user *data)
18160 + struct vcmd_ctx_dlimit_base_v0_x32 vc_data;
18162 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
18165 + return do_addrem_dlimit(id,
18166 + compat_ptr(vc_data.name_ptr), vc_data.flags, 0);
18169 +#endif /* CONFIG_COMPAT */
18173 +int do_set_dlimit(uint32_t id, const char __user *name,
18174 + uint32_t space_used, uint32_t space_total,
18175 + uint32_t inodes_used, uint32_t inodes_total,
18176 + uint32_t reserved, uint32_t flags)
18178 + struct path path;
18181 + ret = user_lpath(name, &path);
18183 + struct super_block *sb;
18184 + struct dl_info *dli;
18187 + if (!path.dentry->d_inode)
18188 + goto out_release;
18189 + if (!(sb = path.dentry->d_inode->i_sb))
18190 + goto out_release;
18192 + /* sanity checks */
18193 + if ((reserved != CDLIM_KEEP &&
18194 + reserved > 100) ||
18195 + (inodes_used != CDLIM_KEEP &&
18196 + inodes_used > inodes_total) ||
18197 + (space_used != CDLIM_KEEP &&
18198 + space_used > space_total))
18199 + goto out_release;
18202 + dli = locate_dl_info(sb, id);
18204 + goto out_release;
18206 + spin_lock(&dli->dl_lock);
18208 + if (inodes_used != CDLIM_KEEP)
18209 + dli->dl_inodes_used = inodes_used;
18210 + if (inodes_total != CDLIM_KEEP)
18211 + dli->dl_inodes_total = inodes_total;
18212 + if (space_used != CDLIM_KEEP)
18213 + dli->dl_space_used = dlimit_space_32to64(
18214 + space_used, flags, DLIMS_USED);
18216 + if (space_total == CDLIM_INFINITY)
18217 + dli->dl_space_total = DLIM_INFINITY;
18218 + else if (space_total != CDLIM_KEEP)
18219 + dli->dl_space_total = dlimit_space_32to64(
18220 + space_total, flags, DLIMS_TOTAL);
18222 + if (reserved != CDLIM_KEEP)
18223 + dli->dl_nrlmult = (1 << 10) * (100 - reserved) / 100;
18225 + spin_unlock(&dli->dl_lock);
18227 + put_dl_info(dli);
18236 +int vc_set_dlimit(uint32_t id, void __user *data)
18238 + struct vcmd_ctx_dlimit_v0 vc_data;
18240 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
18243 + return do_set_dlimit(id, vc_data.name,
18244 + vc_data.space_used, vc_data.space_total,
18245 + vc_data.inodes_used, vc_data.inodes_total,
18246 + vc_data.reserved, vc_data.flags);
18249 +#ifdef CONFIG_COMPAT
18251 +int vc_set_dlimit_x32(uint32_t id, void __user *data)
18253 + struct vcmd_ctx_dlimit_v0_x32 vc_data;
18255 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
18258 + return do_set_dlimit(id, compat_ptr(vc_data.name_ptr),
18259 + vc_data.space_used, vc_data.space_total,
18260 + vc_data.inodes_used, vc_data.inodes_total,
18261 + vc_data.reserved, vc_data.flags);
18264 +#endif /* CONFIG_COMPAT */
18268 +int do_get_dlimit(uint32_t id, const char __user *name,
18269 + uint32_t *space_used, uint32_t *space_total,
18270 + uint32_t *inodes_used, uint32_t *inodes_total,
18271 + uint32_t *reserved, uint32_t *flags)
18273 + struct path path;
18276 + ret = user_lpath(name, &path);
18278 + struct super_block *sb;
18279 + struct dl_info *dli;
18282 + if (!path.dentry->d_inode)
18283 + goto out_release;
18284 + if (!(sb = path.dentry->d_inode->i_sb))
18285 + goto out_release;
18288 + dli = locate_dl_info(sb, id);
18290 + goto out_release;
18292 + spin_lock(&dli->dl_lock);
18293 + *inodes_used = dli->dl_inodes_used;
18294 + *inodes_total = dli->dl_inodes_total;
18296 + *space_used = dlimit_space_64to32(
18297 + dli->dl_space_used, flags, DLIMS_USED);
18299 + if (dli->dl_space_total == DLIM_INFINITY)
18300 + *space_total = CDLIM_INFINITY;
18302 + *space_total = dlimit_space_64to32(
18303 + dli->dl_space_total, flags, DLIMS_TOTAL);
18305 + *reserved = 100 - ((dli->dl_nrlmult * 100 + 512) >> 10);
18306 + spin_unlock(&dli->dl_lock);
18308 + put_dl_info(dli);
18319 +int vc_get_dlimit(uint32_t id, void __user *data)
18321 + struct vcmd_ctx_dlimit_v0 vc_data;
18324 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
18327 + ret = do_get_dlimit(id, vc_data.name,
18328 + &vc_data.space_used, &vc_data.space_total,
18329 + &vc_data.inodes_used, &vc_data.inodes_total,
18330 + &vc_data.reserved, &vc_data.flags);
18334 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
18339 +#ifdef CONFIG_COMPAT
18341 +int vc_get_dlimit_x32(uint32_t id, void __user *data)
18343 + struct vcmd_ctx_dlimit_v0_x32 vc_data;
18346 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
18349 + ret = do_get_dlimit(id, compat_ptr(vc_data.name_ptr),
18350 + &vc_data.space_used, &vc_data.space_total,
18351 + &vc_data.inodes_used, &vc_data.inodes_total,
18352 + &vc_data.reserved, &vc_data.flags);
18356 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
18361 +#endif /* CONFIG_COMPAT */
18364 +void vx_vsi_statfs(struct super_block *sb, struct kstatfs *buf)
18366 + struct dl_info *dli;
18367 + __u64 blimit, bfree, bavail;
18370 + dli = locate_dl_info(sb, dx_current_tag());
18374 + spin_lock(&dli->dl_lock);
18375 + if (dli->dl_inodes_total == (unsigned long)DLIM_INFINITY)
18378 + /* reduce max inodes available to limit */
18379 + if (buf->f_files > dli->dl_inodes_total)
18380 + buf->f_files = dli->dl_inodes_total;
18382 + ifree = dli->dl_inodes_total - dli->dl_inodes_used;
18383 + /* reduce free inodes to min */
18384 + if (ifree < buf->f_ffree)
18385 + buf->f_ffree = ifree;
18388 + if (dli->dl_space_total == DLIM_INFINITY)
18391 + blimit = dli->dl_space_total >> sb->s_blocksize_bits;
18393 + if (dli->dl_space_total < dli->dl_space_used)
18396 + bfree = (dli->dl_space_total - dli->dl_space_used)
18397 + >> sb->s_blocksize_bits;
18399 + bavail = ((dli->dl_space_total >> 10) * dli->dl_nrlmult);
18400 + if (bavail < dli->dl_space_used)
18403 + bavail = (bavail - dli->dl_space_used)
18404 + >> sb->s_blocksize_bits;
18406 + /* reduce max space available to limit */
18407 + if (buf->f_blocks > blimit)
18408 + buf->f_blocks = blimit;
18410 + /* reduce free space to min */
18411 + if (bfree < buf->f_bfree)
18412 + buf->f_bfree = bfree;
18414 + /* reduce avail space to min */
18415 + if (bavail < buf->f_bavail)
18416 + buf->f_bavail = bavail;
18419 + spin_unlock(&dli->dl_lock);
18420 + put_dl_info(dli);
18425 +#include <linux/module.h>
18427 +EXPORT_SYMBOL_GPL(locate_dl_info);
18428 +EXPORT_SYMBOL_GPL(rcu_free_dl_info);
18430 diff -NurpP --minimal linux-3.5/kernel/vserver/helper.c linux-3.5-vs2.3.4/kernel/vserver/helper.c
18431 --- linux-3.5/kernel/vserver/helper.c 1970-01-01 01:00:00.000000000 +0100
18432 +++ linux-3.5-vs2.3.4/kernel/vserver/helper.c 2012-07-23 01:45:55.000000000 +0200
18435 + * linux/kernel/vserver/helper.c
18437 + * Virtual Context Support
18439 + * Copyright (C) 2004-2007 Herbert Pötzl
18441 + * V0.01 basic helper
18445 +#include <linux/kmod.h>
18446 +#include <linux/reboot.h>
18447 +#include <linux/vs_context.h>
18448 +#include <linux/vs_network.h>
18449 +#include <linux/vserver/signal.h>
18452 +char vshelper_path[255] = "/sbin/vshelper";
18454 +static int vshelper_init(struct subprocess_info *info, struct cred *new_cred)
18456 + current->flags &= ~PF_THREAD_BOUND;
18460 +static int do_vshelper(char *name, char *argv[], char *envp[], int sync)
18464 + if ((ret = call_usermodehelper_fns(name, argv, envp, sync,
18465 + vshelper_init, NULL, NULL))) {
18466 + printk(KERN_WARNING "%s: (%s %s) returned %s with %d\n",
18467 + name, argv[1], argv[2],
18468 + sync ? "sync" : "async", ret);
18470 + vxdprintk(VXD_CBIT(switch, 4),
18471 + "%s: (%s %s) returned %s with %d",
18472 + name, argv[1], argv[2], sync ? "sync" : "async", ret);
18477 + * vshelper path is set via /proc/sys
18478 + * invoked by vserver sys_reboot(), with
18479 + * the following arguments
18481 + * argv [0] = vshelper_path;
18482 + * argv [1] = action: "restart", "halt", "poweroff", ...
18483 + * argv [2] = context identifier
18485 + * envp [*] = type-specific parameters
18488 +long vs_reboot_helper(struct vx_info *vxi, int cmd, void __user *arg)
18490 + char id_buf[8], cmd_buf[16];
18491 + char uid_buf[16], pid_buf[16];
18494 + char *argv[] = {vshelper_path, NULL, id_buf, 0};
18495 + char *envp[] = {"HOME=/", "TERM=linux",
18496 + "PATH=/sbin:/usr/sbin:/bin:/usr/bin",
18497 + uid_buf, pid_buf, cmd_buf, 0};
18499 + if (vx_info_state(vxi, VXS_HELPER))
18501 + vxi->vx_state |= VXS_HELPER;
18503 + snprintf(id_buf, sizeof(id_buf)-1, "%d", vxi->vx_id);
18505 + snprintf(cmd_buf, sizeof(cmd_buf)-1, "VS_CMD=%08x", cmd);
18506 + snprintf(uid_buf, sizeof(uid_buf)-1, "VS_UID=%d", current_uid());
18507 + snprintf(pid_buf, sizeof(pid_buf)-1, "VS_PID=%d", current->pid);
18510 + case LINUX_REBOOT_CMD_RESTART:
18511 + argv[1] = "restart";
18514 + case LINUX_REBOOT_CMD_HALT:
18515 + argv[1] = "halt";
18518 + case LINUX_REBOOT_CMD_POWER_OFF:
18519 + argv[1] = "poweroff";
18522 + case LINUX_REBOOT_CMD_SW_SUSPEND:
18523 + argv[1] = "swsusp";
18526 + case LINUX_REBOOT_CMD_OOM:
18531 + vxi->vx_state &= ~VXS_HELPER;
18535 + ret = do_vshelper(vshelper_path, argv, envp, 0);
18536 + vxi->vx_state &= ~VXS_HELPER;
18537 + __wakeup_vx_info(vxi);
18538 + return (ret) ? -EPERM : 0;
18542 +long vs_reboot(unsigned int cmd, void __user *arg)
18544 + struct vx_info *vxi = current_vx_info();
18547 + vxdprintk(VXD_CBIT(misc, 5),
18548 + "vs_reboot(%p[#%d],%u)",
18549 + vxi, vxi ? vxi->vx_id : 0, cmd);
18551 + ret = vs_reboot_helper(vxi, cmd, arg);
18555 + vxi->reboot_cmd = cmd;
18556 + if (vx_info_flags(vxi, VXF_REBOOT_KILL, 0)) {
18558 + case LINUX_REBOOT_CMD_RESTART:
18559 + case LINUX_REBOOT_CMD_HALT:
18560 + case LINUX_REBOOT_CMD_POWER_OFF:
18561 + vx_info_kill(vxi, 0, SIGKILL);
18562 + vx_info_kill(vxi, 1, SIGKILL);
18570 +long vs_oom_action(unsigned int cmd)
18572 + struct vx_info *vxi = current_vx_info();
18575 + vxdprintk(VXD_CBIT(misc, 5),
18576 + "vs_oom_action(%p[#%d],%u)",
18577 + vxi, vxi ? vxi->vx_id : 0, cmd);
18579 + ret = vs_reboot_helper(vxi, cmd, NULL);
18583 + vxi->reboot_cmd = cmd;
18584 + if (vx_info_flags(vxi, VXF_REBOOT_KILL, 0)) {
18585 + vx_info_kill(vxi, 0, SIGKILL);
18586 + vx_info_kill(vxi, 1, SIGKILL);
18592 + * argv [0] = vshelper_path;
18593 + * argv [1] = action: "startup", "shutdown"
18594 + * argv [2] = context identifier
18596 + * envp [*] = type-specific parameters
18599 +long vs_state_change(struct vx_info *vxi, unsigned int cmd)
18601 + char id_buf[8], cmd_buf[16];
18602 + char *argv[] = {vshelper_path, NULL, id_buf, 0};
18603 + char *envp[] = {"HOME=/", "TERM=linux",
18604 + "PATH=/sbin:/usr/sbin:/bin:/usr/bin", cmd_buf, 0};
18606 + if (!vx_info_flags(vxi, VXF_SC_HELPER, 0))
18609 + snprintf(id_buf, sizeof(id_buf)-1, "%d", vxi->vx_id);
18610 + snprintf(cmd_buf, sizeof(cmd_buf)-1, "VS_CMD=%08x", cmd);
18613 + case VSC_STARTUP:
18614 + argv[1] = "startup";
18616 + case VSC_SHUTDOWN:
18617 + argv[1] = "shutdown";
18623 + return do_vshelper(vshelper_path, argv, envp, 1);
18628 + * argv [0] = vshelper_path;
18629 + * argv [1] = action: "netup", "netdown"
18630 + * argv [2] = context identifier
18632 + * envp [*] = type-specific parameters
18635 +long vs_net_change(struct nx_info *nxi, unsigned int cmd)
18637 + char id_buf[8], cmd_buf[16];
18638 + char *argv[] = {vshelper_path, NULL, id_buf, 0};
18639 + char *envp[] = {"HOME=/", "TERM=linux",
18640 + "PATH=/sbin:/usr/sbin:/bin:/usr/bin", cmd_buf, 0};
18642 + if (!nx_info_flags(nxi, NXF_SC_HELPER, 0))
18645 + snprintf(id_buf, sizeof(id_buf)-1, "%d", nxi->nx_id);
18646 + snprintf(cmd_buf, sizeof(cmd_buf)-1, "VS_CMD=%08x", cmd);
18650 + argv[1] = "netup";
18652 + case VSC_NETDOWN:
18653 + argv[1] = "netdown";
18659 + return do_vshelper(vshelper_path, argv, envp, 1);
18662 diff -NurpP --minimal linux-3.5/kernel/vserver/history.c linux-3.5-vs2.3.4/kernel/vserver/history.c
18663 --- linux-3.5/kernel/vserver/history.c 1970-01-01 01:00:00.000000000 +0100
18664 +++ linux-3.5-vs2.3.4/kernel/vserver/history.c 2012-07-23 01:45:55.000000000 +0200
18667 + * kernel/vserver/history.c
18669 + * Virtual Context History Backtrace
18671 + * Copyright (C) 2004-2007 Herbert Pötzl
18673 + * V0.01 basic structure
18674 + * V0.02 hash/unhash and trace
18675 + * V0.03 preemption fixes
18679 +#include <linux/module.h>
18680 +#include <asm/uaccess.h>
18682 +#include <linux/vserver/context.h>
18683 +#include <linux/vserver/debug.h>
18684 +#include <linux/vserver/debug_cmd.h>
18685 +#include <linux/vserver/history.h>
18688 +#ifdef CONFIG_VSERVER_HISTORY
18689 +#define VXH_SIZE CONFIG_VSERVER_HISTORY_SIZE
18691 +#define VXH_SIZE 64
18694 +struct _vx_history {
18695 + unsigned int counter;
18697 + struct _vx_hist_entry entry[VXH_SIZE + 1];
18701 +DEFINE_PER_CPU(struct _vx_history, vx_history_buffer);
18703 +unsigned volatile int vxh_active = 1;
18705 +static atomic_t sequence = ATOMIC_INIT(0);
18710 + * requires disabled preemption */
18712 +struct _vx_hist_entry *vxh_advance(void *loc)
18714 + unsigned int cpu = smp_processor_id();
18715 + struct _vx_history *hist = &per_cpu(vx_history_buffer, cpu);
18716 + struct _vx_hist_entry *entry;
18717 + unsigned int index;
18719 + index = vxh_active ? (hist->counter++ % VXH_SIZE) : VXH_SIZE;
18720 + entry = &hist->entry[index];
18722 + entry->seq = atomic_inc_return(&sequence);
18723 + entry->loc = loc;
18727 +EXPORT_SYMBOL_GPL(vxh_advance);
18730 +#define VXH_LOC_FMTS "(#%04x,*%d):%p"
18732 +#define VXH_LOC_ARGS(e) (e)->seq, cpu, (e)->loc
18735 +#define VXH_VXI_FMTS "%p[#%d,%d.%d]"
18737 +#define VXH_VXI_ARGS(e) (e)->vxi.ptr, \
18738 + (e)->vxi.ptr ? (e)->vxi.xid : 0, \
18739 + (e)->vxi.ptr ? (e)->vxi.usecnt : 0, \
18740 + (e)->vxi.ptr ? (e)->vxi.tasks : 0
18742 +void vxh_dump_entry(struct _vx_hist_entry *e, unsigned cpu)
18744 + switch (e->type) {
18745 + case VXH_THROW_OOPS:
18746 + printk( VXH_LOC_FMTS " oops \n", VXH_LOC_ARGS(e));
18749 + case VXH_GET_VX_INFO:
18750 + case VXH_PUT_VX_INFO:
18751 + printk( VXH_LOC_FMTS " %s_vx_info " VXH_VXI_FMTS "\n",
18753 + (e->type == VXH_GET_VX_INFO) ? "get" : "put",
18754 + VXH_VXI_ARGS(e));
18757 + case VXH_INIT_VX_INFO:
18758 + case VXH_SET_VX_INFO:
18759 + case VXH_CLR_VX_INFO:
18760 + printk( VXH_LOC_FMTS " %s_vx_info " VXH_VXI_FMTS " @%p\n",
18762 + (e->type == VXH_INIT_VX_INFO) ? "init" :
18763 + ((e->type == VXH_SET_VX_INFO) ? "set" : "clr"),
18764 + VXH_VXI_ARGS(e), e->sc.data);
18767 + case VXH_CLAIM_VX_INFO:
18768 + case VXH_RELEASE_VX_INFO:
18769 + printk( VXH_LOC_FMTS " %s_vx_info " VXH_VXI_FMTS " @%p\n",
18771 + (e->type == VXH_CLAIM_VX_INFO) ? "claim" : "release",
18772 + VXH_VXI_ARGS(e), e->sc.data);
18775 + case VXH_ALLOC_VX_INFO:
18776 + case VXH_DEALLOC_VX_INFO:
18777 + printk( VXH_LOC_FMTS " %s_vx_info " VXH_VXI_FMTS "\n",
18779 + (e->type == VXH_ALLOC_VX_INFO) ? "alloc" : "dealloc",
18780 + VXH_VXI_ARGS(e));
18783 + case VXH_HASH_VX_INFO:
18784 + case VXH_UNHASH_VX_INFO:
18785 + printk( VXH_LOC_FMTS " __%s_vx_info " VXH_VXI_FMTS "\n",
18787 + (e->type == VXH_HASH_VX_INFO) ? "hash" : "unhash",
18788 + VXH_VXI_ARGS(e));
18791 + case VXH_LOC_VX_INFO:
18792 + case VXH_LOOKUP_VX_INFO:
18793 + case VXH_CREATE_VX_INFO:
18794 + printk( VXH_LOC_FMTS " __%s_vx_info [#%d] -> " VXH_VXI_FMTS "\n",
18796 + (e->type == VXH_CREATE_VX_INFO) ? "create" :
18797 + ((e->type == VXH_LOC_VX_INFO) ? "loc" : "lookup"),
18798 + e->ll.arg, VXH_VXI_ARGS(e));
18803 +static void __vxh_dump_history(void)
18805 + unsigned int i, cpu;
18807 + printk("History:\tSEQ: %8x\tNR_CPUS: %d\n",
18808 + atomic_read(&sequence), NR_CPUS);
18810 + for (i = 0; i < VXH_SIZE; i++) {
18811 + for_each_online_cpu(cpu) {
18812 + struct _vx_history *hist =
18813 + &per_cpu(vx_history_buffer, cpu);
18814 + unsigned int index = (hist->counter - i) % VXH_SIZE;
18815 + struct _vx_hist_entry *entry = &hist->entry[index];
18817 + vxh_dump_entry(entry, cpu);
18822 +void vxh_dump_history(void)
18826 + local_irq_enable();
18828 + local_irq_disable();
18830 + __vxh_dump_history();
18834 +/* vserver syscall commands below here */
18837 +int vc_dump_history(uint32_t id)
18840 + __vxh_dump_history();
18847 +int do_read_history(struct __user _vx_hist_entry *data,
18848 + int cpu, uint32_t *index, uint32_t *count)
18850 + int pos, ret = 0;
18851 + struct _vx_history *hist = &per_cpu(vx_history_buffer, cpu);
18852 + int end = hist->counter;
18853 + int start = end - VXH_SIZE + 2;
18854 + int idx = *index;
18856 + /* special case: get current pos */
18862 + /* have we lost some data? */
18866 + for (pos = 0; (pos < *count) && (idx < end); pos++, idx++) {
18867 + struct _vx_hist_entry *entry =
18868 + &hist->entry[idx % VXH_SIZE];
18870 + /* send entry to userspace */
18871 + ret = copy_to_user(&data[pos], entry, sizeof(*entry));
18875 + /* save new index and count */
18878 + return ret ? ret : (*index < end);
18881 +int vc_read_history(uint32_t id, void __user *data)
18883 + struct vcmd_read_history_v0 vc_data;
18886 + if (id >= NR_CPUS)
18889 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
18892 + ret = do_read_history((struct __user _vx_hist_entry *)vc_data.data,
18893 + id, &vc_data.index, &vc_data.count);
18895 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
18900 +#ifdef CONFIG_COMPAT
18902 +int vc_read_history_x32(uint32_t id, void __user *data)
18904 + struct vcmd_read_history_v0_x32 vc_data;
18907 + if (id >= NR_CPUS)
18910 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
18913 + ret = do_read_history((struct __user _vx_hist_entry *)
18914 + compat_ptr(vc_data.data_ptr),
18915 + id, &vc_data.index, &vc_data.count);
18917 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
18922 +#endif /* CONFIG_COMPAT */
18924 diff -NurpP --minimal linux-3.5/kernel/vserver/inet.c linux-3.5-vs2.3.4/kernel/vserver/inet.c
18925 --- linux-3.5/kernel/vserver/inet.c 1970-01-01 01:00:00.000000000 +0100
18926 +++ linux-3.5-vs2.3.4/kernel/vserver/inet.c 2012-07-23 01:45:55.000000000 +0200
18929 +#include <linux/in.h>
18930 +#include <linux/inetdevice.h>
18931 +#include <linux/export.h>
18932 +#include <linux/vs_inet.h>
18933 +#include <linux/vs_inet6.h>
18934 +#include <linux/vserver/debug.h>
18935 +#include <net/route.h>
18936 +#include <net/addrconf.h>
18939 +int nx_v4_addr_conflict(struct nx_info *nxi1, struct nx_info *nxi2)
18943 + if (!nxi1 || !nxi2 || nxi1 == nxi2)
18946 + struct nx_addr_v4 *ptr;
18948 + for (ptr = &nxi1->v4; ptr; ptr = ptr->next) {
18949 + if (v4_nx_addr_in_nx_info(nxi2, ptr, -1)) {
18956 + vxdprintk(VXD_CBIT(net, 2),
18957 + "nx_v4_addr_conflict(%p,%p): %d",
18958 + nxi1, nxi2, ret);
18964 +#ifdef CONFIG_IPV6
18966 +int nx_v6_addr_conflict(struct nx_info *nxi1, struct nx_info *nxi2)
18970 + if (!nxi1 || !nxi2 || nxi1 == nxi2)
18973 + struct nx_addr_v6 *ptr;
18975 + for (ptr = &nxi1->v6; ptr; ptr = ptr->next) {
18976 + if (v6_nx_addr_in_nx_info(nxi2, ptr, -1)) {
18983 + vxdprintk(VXD_CBIT(net, 2),
18984 + "nx_v6_addr_conflict(%p,%p): %d",
18985 + nxi1, nxi2, ret);
18992 +int v4_dev_in_nx_info(struct net_device *dev, struct nx_info *nxi)
18994 + struct in_device *in_dev;
18995 + struct in_ifaddr **ifap;
18996 + struct in_ifaddr *ifa;
19001 + in_dev = in_dev_get(dev);
19005 + for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL;
19006 + ifap = &ifa->ifa_next) {
19007 + if (v4_addr_in_nx_info(nxi, ifa->ifa_local, NXA_MASK_SHOW)) {
19012 + in_dev_put(in_dev);
19018 +#ifdef CONFIG_IPV6
19020 +int v6_dev_in_nx_info(struct net_device *dev, struct nx_info *nxi)
19022 + struct inet6_dev *in_dev;
19023 + struct inet6_ifaddr *ifa;
19028 + in_dev = in6_dev_get(dev);
19032 + // for (ifap = &in_dev->addr_list; (ifa = *ifap) != NULL;
19033 + list_for_each_entry(ifa, &in_dev->addr_list, if_list) {
19034 + if (v6_addr_in_nx_info(nxi, &ifa->addr, -1)) {
19039 + in6_dev_put(in_dev);
19046 +int dev_in_nx_info(struct net_device *dev, struct nx_info *nxi)
19052 + if (nxi->v4.type && v4_dev_in_nx_info(dev, nxi))
19054 +#ifdef CONFIG_IPV6
19056 + if (nxi->v6.type && v6_dev_in_nx_info(dev, nxi))
19061 + vxdprintk(VXD_CBIT(net, 3),
19062 + "dev_in_nx_info(%p,%p[#%d]) = %d",
19063 + dev, nxi, nxi ? nxi->nx_id : 0, ret);
19067 +struct rtable *ip_v4_find_src(struct net *net, struct nx_info *nxi,
19068 + struct flowi4 *fl4)
19070 + struct rtable *rt;
19075 + /* FIXME: handle lback only case */
19076 + if (!NX_IPV4(nxi))
19077 + return ERR_PTR(-EPERM);
19079 + vxdprintk(VXD_CBIT(net, 4),
19080 + "ip_v4_find_src(%p[#%u]) " NIPQUAD_FMT " -> " NIPQUAD_FMT,
19081 + nxi, nxi ? nxi->nx_id : 0,
19082 + NIPQUAD(fl4->saddr), NIPQUAD(fl4->daddr));
19084 + /* single IP is unconditional */
19085 + if (nx_info_flags(nxi, NXF_SINGLE_IP, 0) &&
19086 + (fl4->saddr == INADDR_ANY))
19087 + fl4->saddr = nxi->v4.ip[0].s_addr;
19089 + if (fl4->saddr == INADDR_ANY) {
19090 + struct nx_addr_v4 *ptr;
19091 + __be32 found = 0;
19093 + rt = __ip_route_output_key(net, fl4);
19094 + if (!IS_ERR(rt)) {
19095 + found = fl4->saddr;
19097 + vxdprintk(VXD_CBIT(net, 4),
19098 + "ip_v4_find_src(%p[#%u]) rok[%u]: " NIPQUAD_FMT,
19099 + nxi, nxi ? nxi->nx_id : 0, fl4->flowi4_oif, NIPQUAD(found));
19100 + if (v4_addr_in_nx_info(nxi, found, NXA_MASK_BIND))
19104 + for (ptr = &nxi->v4; ptr; ptr = ptr->next) {
19105 + __be32 primary = ptr->ip[0].s_addr;
19106 + __be32 mask = ptr->mask.s_addr;
19107 + __be32 neta = primary & mask;
19109 + vxdprintk(VXD_CBIT(net, 4), "ip_v4_find_src(%p[#%u]) chk: "
19110 + NIPQUAD_FMT "/" NIPQUAD_FMT "/" NIPQUAD_FMT,
19111 + nxi, nxi ? nxi->nx_id : 0, NIPQUAD(primary),
19112 + NIPQUAD(mask), NIPQUAD(neta));
19113 + if ((found & mask) != neta)
19116 + fl4->saddr = primary;
19117 + rt = __ip_route_output_key(net, fl4);
19118 + vxdprintk(VXD_CBIT(net, 4),
19119 + "ip_v4_find_src(%p[#%u]) rok[%u]: " NIPQUAD_FMT,
19120 + nxi, nxi ? nxi->nx_id : 0, fl4->flowi4_oif, NIPQUAD(primary));
19121 + if (!IS_ERR(rt)) {
19122 + found = fl4->saddr;
19124 + if (found == primary)
19128 + /* still no source ip? */
19129 + found = ipv4_is_loopback(fl4->daddr)
19130 + ? IPI_LOOPBACK : nxi->v4.ip[0].s_addr;
19132 + /* assign src ip to flow */
19133 + fl4->saddr = found;
19136 + if (!v4_addr_in_nx_info(nxi, fl4->saddr, NXA_MASK_BIND))
19137 + return ERR_PTR(-EPERM);
19140 + if (nx_info_flags(nxi, NXF_LBACK_REMAP, 0)) {
19141 + if (ipv4_is_loopback(fl4->daddr))
19142 + fl4->daddr = nxi->v4_lback.s_addr;
19143 + if (ipv4_is_loopback(fl4->saddr))
19144 + fl4->saddr = nxi->v4_lback.s_addr;
19145 + } else if (ipv4_is_loopback(fl4->daddr) &&
19146 + !nx_info_flags(nxi, NXF_LBACK_ALLOW, 0))
19147 + return ERR_PTR(-EPERM);
19152 +EXPORT_SYMBOL_GPL(ip_v4_find_src);
19154 diff -NurpP --minimal linux-3.5/kernel/vserver/init.c linux-3.5-vs2.3.4/kernel/vserver/init.c
19155 --- linux-3.5/kernel/vserver/init.c 1970-01-01 01:00:00.000000000 +0100
19156 +++ linux-3.5-vs2.3.4/kernel/vserver/init.c 2012-07-23 01:45:55.000000000 +0200
19159 + * linux/kernel/init.c
19161 + * Virtual Server Init
19163 + * Copyright (C) 2004-2007 Herbert Pötzl
19165 + * V0.01 basic structure
19169 +#include <linux/init.h>
19171 +int vserver_register_sysctl(void);
19172 +void vserver_unregister_sysctl(void);
19175 +static int __init init_vserver(void)
19179 +#ifdef CONFIG_VSERVER_DEBUG
19180 + vserver_register_sysctl();
19186 +static void __exit exit_vserver(void)
19189 +#ifdef CONFIG_VSERVER_DEBUG
19190 + vserver_unregister_sysctl();
19195 +/* FIXME: GFP_ZONETYPES gone
19196 +long vx_slab[GFP_ZONETYPES]; */
19200 +module_init(init_vserver);
19201 +module_exit(exit_vserver);
19203 diff -NurpP --minimal linux-3.5/kernel/vserver/inode.c linux-3.5-vs2.3.4/kernel/vserver/inode.c
19204 --- linux-3.5/kernel/vserver/inode.c 1970-01-01 01:00:00.000000000 +0100
19205 +++ linux-3.5-vs2.3.4/kernel/vserver/inode.c 2012-07-23 01:45:55.000000000 +0200
19208 + * linux/kernel/vserver/inode.c
19210 + * Virtual Server: File System Support
19212 + * Copyright (C) 2004-2007 Herbert Pötzl
19214 + * V0.01 separated from vcontext V0.05
19215 + * V0.02 moved to tag (instead of xid)
19219 +#include <linux/tty.h>
19220 +#include <linux/proc_fs.h>
19221 +#include <linux/devpts_fs.h>
19222 +#include <linux/fs.h>
19223 +#include <linux/file.h>
19224 +#include <linux/mount.h>
19225 +#include <linux/parser.h>
19226 +#include <linux/namei.h>
19227 +#include <linux/vserver/inode.h>
19228 +#include <linux/vserver/inode_cmd.h>
19229 +#include <linux/vs_base.h>
19230 +#include <linux/vs_tag.h>
19232 +#include <asm/uaccess.h>
19235 +static int __vc_get_iattr(struct inode *in, uint32_t *tag, uint32_t *flags, uint32_t *mask)
19237 + struct proc_dir_entry *entry;
19239 + if (!in || !in->i_sb)
19242 + *flags = IATTR_TAG
19243 + | (IS_IMMUTABLE(in) ? IATTR_IMMUTABLE : 0)
19244 + | (IS_IXUNLINK(in) ? IATTR_IXUNLINK : 0)
19245 + | (IS_BARRIER(in) ? IATTR_BARRIER : 0)
19246 + | (IS_COW(in) ? IATTR_COW : 0);
19247 + *mask = IATTR_IXUNLINK | IATTR_IMMUTABLE | IATTR_COW;
19249 + if (S_ISDIR(in->i_mode))
19250 + *mask |= IATTR_BARRIER;
19252 + if (IS_TAGGED(in)) {
19253 + *tag = in->i_tag;
19254 + *mask |= IATTR_TAG;
19257 + switch (in->i_sb->s_magic) {
19258 + case PROC_SUPER_MAGIC:
19259 + entry = PROC_I(in)->pde;
19261 + /* check for specific inodes? */
19263 + *mask |= IATTR_FLAGS;
19265 + *flags |= (entry->vx_flags & IATTR_FLAGS);
19267 + *flags |= (PROC_I(in)->vx_flags & IATTR_FLAGS);
19270 + case DEVPTS_SUPER_MAGIC:
19271 + *tag = in->i_tag;
19272 + *mask |= IATTR_TAG;
19281 +int vc_get_iattr(void __user *data)
19283 + struct path path;
19284 + struct vcmd_ctx_iattr_v1 vc_data = { .tag = -1 };
19287 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
19290 + ret = user_lpath(vc_data.name, &path);
19292 + ret = __vc_get_iattr(path.dentry->d_inode,
19293 + &vc_data.tag, &vc_data.flags, &vc_data.mask);
19299 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
19304 +#ifdef CONFIG_COMPAT
19306 +int vc_get_iattr_x32(void __user *data)
19308 + struct path path;
19309 + struct vcmd_ctx_iattr_v1_x32 vc_data = { .tag = -1 };
19312 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
19315 + ret = user_lpath(compat_ptr(vc_data.name_ptr), &path);
19317 + ret = __vc_get_iattr(path.dentry->d_inode,
19318 + &vc_data.tag, &vc_data.flags, &vc_data.mask);
19324 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
19329 +#endif /* CONFIG_COMPAT */
19332 +int vc_fget_iattr(uint32_t fd, void __user *data)
19334 + struct file *filp;
19335 + struct vcmd_ctx_fiattr_v0 vc_data = { .tag = -1 };
19338 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
19342 + if (!filp || !filp->f_dentry || !filp->f_dentry->d_inode)
19345 + ret = __vc_get_iattr(filp->f_dentry->d_inode,
19346 + &vc_data.tag, &vc_data.flags, &vc_data.mask);
19350 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
19356 +static int __vc_set_iattr(struct dentry *de, uint32_t *tag, uint32_t *flags, uint32_t *mask)
19358 + struct inode *in = de->d_inode;
19359 + int error = 0, is_proc = 0, has_tag = 0;
19360 + struct iattr attr = { 0 };
19362 + if (!in || !in->i_sb)
19365 + is_proc = (in->i_sb->s_magic == PROC_SUPER_MAGIC);
19366 + if ((*mask & IATTR_FLAGS) && !is_proc)
19369 + has_tag = IS_TAGGED(in) ||
19370 + (in->i_sb->s_magic == DEVPTS_SUPER_MAGIC);
19371 + if ((*mask & IATTR_TAG) && !has_tag)
19374 + mutex_lock(&in->i_mutex);
19375 + if (*mask & IATTR_TAG) {
19376 + attr.ia_tag = *tag;
19377 + attr.ia_valid |= ATTR_TAG;
19380 + if (*mask & IATTR_FLAGS) {
19381 + struct proc_dir_entry *entry = PROC_I(in)->pde;
19382 + unsigned int iflags = PROC_I(in)->vx_flags;
19384 + iflags = (iflags & ~(*mask & IATTR_FLAGS))
19385 + | (*flags & IATTR_FLAGS);
19386 + PROC_I(in)->vx_flags = iflags;
19388 + entry->vx_flags = iflags;
19391 + if (*mask & (IATTR_IMMUTABLE | IATTR_IXUNLINK |
19392 + IATTR_BARRIER | IATTR_COW)) {
19393 + int iflags = in->i_flags;
19394 + int vflags = in->i_vflags;
19396 + if (*mask & IATTR_IMMUTABLE) {
19397 + if (*flags & IATTR_IMMUTABLE)
19398 + iflags |= S_IMMUTABLE;
19400 + iflags &= ~S_IMMUTABLE;
19402 + if (*mask & IATTR_IXUNLINK) {
19403 + if (*flags & IATTR_IXUNLINK)
19404 + iflags |= S_IXUNLINK;
19406 + iflags &= ~S_IXUNLINK;
19408 + if (S_ISDIR(in->i_mode) && (*mask & IATTR_BARRIER)) {
19409 + if (*flags & IATTR_BARRIER)
19410 + vflags |= V_BARRIER;
19412 + vflags &= ~V_BARRIER;
19414 + if (S_ISREG(in->i_mode) && (*mask & IATTR_COW)) {
19415 + if (*flags & IATTR_COW)
19418 + vflags &= ~V_COW;
19420 + if (in->i_op && in->i_op->sync_flags) {
19421 + error = in->i_op->sync_flags(in, iflags, vflags);
19427 + if (attr.ia_valid) {
19428 + if (in->i_op && in->i_op->setattr)
19429 + error = in->i_op->setattr(de, &attr);
19431 + error = inode_change_ok(in, &attr);
19433 + setattr_copy(in, &attr);
19434 + mark_inode_dirty(in);
19440 + mutex_unlock(&in->i_mutex);
19444 +int vc_set_iattr(void __user *data)
19446 + struct path path;
19447 + struct vcmd_ctx_iattr_v1 vc_data;
19450 + if (!capable(CAP_LINUX_IMMUTABLE))
19452 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
19455 + ret = user_lpath(vc_data.name, &path);
19457 + ret = __vc_set_iattr(path.dentry,
19458 + &vc_data.tag, &vc_data.flags, &vc_data.mask);
19462 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
19467 +#ifdef CONFIG_COMPAT
19469 +int vc_set_iattr_x32(void __user *data)
19471 + struct path path;
19472 + struct vcmd_ctx_iattr_v1_x32 vc_data;
19475 + if (!capable(CAP_LINUX_IMMUTABLE))
19477 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
19480 + ret = user_lpath(compat_ptr(vc_data.name_ptr), &path);
19482 + ret = __vc_set_iattr(path.dentry,
19483 + &vc_data.tag, &vc_data.flags, &vc_data.mask);
19487 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
19492 +#endif /* CONFIG_COMPAT */
19494 +int vc_fset_iattr(uint32_t fd, void __user *data)
19496 + struct file *filp;
19497 + struct vcmd_ctx_fiattr_v0 vc_data;
19500 + if (!capable(CAP_LINUX_IMMUTABLE))
19502 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
19506 + if (!filp || !filp->f_dentry || !filp->f_dentry->d_inode)
19509 + ret = __vc_set_iattr(filp->f_dentry, &vc_data.tag,
19510 + &vc_data.flags, &vc_data.mask);
19514 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
19520 +enum { Opt_notagcheck, Opt_tag, Opt_notag, Opt_tagid, Opt_err };
19522 +static match_table_t tokens = {
19523 + {Opt_notagcheck, "notagcheck"},
19524 +#ifdef CONFIG_PROPAGATE
19525 + {Opt_notag, "notag"},
19526 + {Opt_tag, "tag"},
19527 + {Opt_tagid, "tagid=%u"},
19533 +static void __dx_parse_remove(char *string, char *opt)
19535 + char *p = strstr(string, opt);
19539 + while (*q != '\0' && *q != ',')
19548 +int dx_parse_tag(char *string, tag_t *tag, int remove, int *mnt_flags,
19549 + unsigned long *flags)
19552 + substring_t args[MAX_OPT_ARGS];
19554 + char *s, *p, *opts;
19555 +#if defined(CONFIG_PROPAGATE) || defined(CONFIG_VSERVER_DEBUG)
19561 + s = kstrdup(string, GFP_KERNEL | GFP_ATOMIC);
19566 + while ((p = strsep(&opts, ",")) != NULL) {
19567 + token = match_token(p, tokens, args);
19570 +#ifdef CONFIG_PROPAGATE
19575 + __dx_parse_remove(s, "tag");
19576 + *mnt_flags |= MNT_TAGID;
19577 + set |= MNT_TAGID;
19581 + __dx_parse_remove(s, "notag");
19582 + *mnt_flags |= MNT_NOTAG;
19583 + set |= MNT_NOTAG;
19586 + if (tag && !match_int(args, &option))
19589 + __dx_parse_remove(s, "tagid");
19590 + *mnt_flags |= MNT_TAGID;
19591 + set |= MNT_TAGID;
19593 +#endif /* CONFIG_PROPAGATE */
19594 + case Opt_notagcheck:
19596 + __dx_parse_remove(s, "notagcheck");
19597 + *flags |= MS_NOTAGCHECK;
19598 + set |= MS_NOTAGCHECK;
19601 + vxdprintk(VXD_CBIT(tag, 7),
19602 + "dx_parse_tag(" VS_Q("%s") "): %d:#%d",
19603 + p, token, option);
19606 + strcpy(string, s);
19611 +#ifdef CONFIG_PROPAGATE
19613 +void __dx_propagate_tag(struct nameidata *nd, struct inode *inode)
19615 + tag_t new_tag = 0;
19616 + struct vfsmount *mnt;
19621 + mnt = nd->path.mnt;
19625 + propagate = (mnt->mnt_flags & MNT_TAGID);
19627 + new_tag = mnt->mnt_tag;
19629 + vxdprintk(VXD_CBIT(tag, 7),
19630 + "dx_propagate_tag(%p[#%lu.%d]): %d,%d",
19631 + inode, inode->i_ino, inode->i_tag,
19632 + new_tag, (propagate) ? 1 : 0);
19635 + inode->i_tag = new_tag;
19638 +#include <linux/module.h>
19640 +EXPORT_SYMBOL_GPL(__dx_propagate_tag);
19642 +#endif /* CONFIG_PROPAGATE */
19644 diff -NurpP --minimal linux-3.5/kernel/vserver/limit.c linux-3.5-vs2.3.4/kernel/vserver/limit.c
19645 --- linux-3.5/kernel/vserver/limit.c 1970-01-01 01:00:00.000000000 +0100
19646 +++ linux-3.5-vs2.3.4/kernel/vserver/limit.c 2012-07-23 01:45:55.000000000 +0200
19649 + * linux/kernel/vserver/limit.c
19651 + * Virtual Server: Context Limits
19653 + * Copyright (C) 2004-2010 Herbert Pötzl
19655 + * V0.01 broken out from vcontext V0.05
19656 + * V0.02 changed vcmds to vxi arg
19657 + * V0.03 added memory cgroup support
19661 +#include <linux/sched.h>
19662 +#include <linux/module.h>
19663 +#include <linux/memcontrol.h>
19664 +#include <linux/res_counter.h>
19665 +#include <linux/vs_limit.h>
19666 +#include <linux/vserver/limit.h>
19667 +#include <linux/vserver/limit_cmd.h>
19669 +#include <asm/uaccess.h>
19672 +const char *vlimit_name[NUM_LIMITS] = {
19673 + [RLIMIT_CPU] = "CPU",
19674 + [RLIMIT_NPROC] = "NPROC",
19675 + [RLIMIT_NOFILE] = "NOFILE",
19676 + [RLIMIT_LOCKS] = "LOCKS",
19677 + [RLIMIT_SIGPENDING] = "SIGP",
19678 + [RLIMIT_MSGQUEUE] = "MSGQ",
19680 + [VLIMIT_NSOCK] = "NSOCK",
19681 + [VLIMIT_OPENFD] = "OPENFD",
19682 + [VLIMIT_SHMEM] = "SHMEM",
19683 + [VLIMIT_DENTRY] = "DENTRY",
19686 +EXPORT_SYMBOL_GPL(vlimit_name);
19688 +#define MASK_ENTRY(x) (1 << (x))
19690 +const struct vcmd_ctx_rlimit_mask_v0 vlimit_mask = {
19693 + , /* softlimit */
19696 + MASK_ENTRY( RLIMIT_NPROC ) |
19697 + MASK_ENTRY( RLIMIT_NOFILE ) |
19698 + MASK_ENTRY( RLIMIT_LOCKS ) |
19699 + MASK_ENTRY( RLIMIT_MSGQUEUE ) |
19701 + MASK_ENTRY( VLIMIT_NSOCK ) |
19702 + MASK_ENTRY( VLIMIT_OPENFD ) |
19703 + MASK_ENTRY( VLIMIT_SHMEM ) |
19704 + MASK_ENTRY( VLIMIT_DENTRY ) |
19707 + /* accounting only */
19708 +uint32_t account_mask =
19709 + MASK_ENTRY( VLIMIT_SEMARY ) |
19710 + MASK_ENTRY( VLIMIT_NSEMS ) |
19711 + MASK_ENTRY( VLIMIT_MAPPED ) |
19715 +static int is_valid_vlimit(int id)
19717 + uint32_t mask = vlimit_mask.minimum |
19718 + vlimit_mask.softlimit | vlimit_mask.maximum;
19719 + return mask & (1 << id);
19722 +static int is_accounted_vlimit(int id)
19724 + if (is_valid_vlimit(id))
19726 + return account_mask & (1 << id);
19730 +static inline uint64_t vc_get_soft(struct vx_info *vxi, int id)
19732 + rlim_t limit = __rlim_soft(&vxi->limit, id);
19733 + return VX_VLIM(limit);
19736 +static inline uint64_t vc_get_hard(struct vx_info *vxi, int id)
19738 + rlim_t limit = __rlim_hard(&vxi->limit, id);
19739 + return VX_VLIM(limit);
19742 +static int do_get_rlimit(struct vx_info *vxi, uint32_t id,
19743 + uint64_t *minimum, uint64_t *softlimit, uint64_t *maximum)
19745 + if (!is_valid_vlimit(id))
19749 + *minimum = CRLIM_UNSET;
19751 + *softlimit = vc_get_soft(vxi, id);
19753 + *maximum = vc_get_hard(vxi, id);
19757 +int vc_get_rlimit(struct vx_info *vxi, void __user *data)
19759 + struct vcmd_ctx_rlimit_v0 vc_data;
19762 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
19765 + ret = do_get_rlimit(vxi, vc_data.id,
19766 + &vc_data.minimum, &vc_data.softlimit, &vc_data.maximum);
19770 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
19775 +static int do_set_rlimit(struct vx_info *vxi, uint32_t id,
19776 + uint64_t minimum, uint64_t softlimit, uint64_t maximum)
19778 + if (!is_valid_vlimit(id))
19781 + if (maximum != CRLIM_KEEP)
19782 + __rlim_hard(&vxi->limit, id) = VX_RLIM(maximum);
19783 + if (softlimit != CRLIM_KEEP)
19784 + __rlim_soft(&vxi->limit, id) = VX_RLIM(softlimit);
19786 + /* clamp soft limit */
19787 + if (__rlim_soft(&vxi->limit, id) > __rlim_hard(&vxi->limit, id))
19788 + __rlim_soft(&vxi->limit, id) = __rlim_hard(&vxi->limit, id);
19793 +int vc_set_rlimit(struct vx_info *vxi, void __user *data)
19795 + struct vcmd_ctx_rlimit_v0 vc_data;
19797 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
19800 + return do_set_rlimit(vxi, vc_data.id,
19801 + vc_data.minimum, vc_data.softlimit, vc_data.maximum);
19804 +#ifdef CONFIG_IA32_EMULATION
19806 +int vc_set_rlimit_x32(struct vx_info *vxi, void __user *data)
19808 + struct vcmd_ctx_rlimit_v0_x32 vc_data;
19810 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
19813 + return do_set_rlimit(vxi, vc_data.id,
19814 + vc_data.minimum, vc_data.softlimit, vc_data.maximum);
19817 +int vc_get_rlimit_x32(struct vx_info *vxi, void __user *data)
19819 + struct vcmd_ctx_rlimit_v0_x32 vc_data;
19822 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
19825 + ret = do_get_rlimit(vxi, vc_data.id,
19826 + &vc_data.minimum, &vc_data.softlimit, &vc_data.maximum);
19830 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
19835 +#endif /* CONFIG_IA32_EMULATION */
19838 +int vc_get_rlimit_mask(uint32_t id, void __user *data)
19840 + if (copy_to_user(data, &vlimit_mask, sizeof(vlimit_mask)))
19846 +static inline void vx_reset_hits(struct _vx_limit *limit)
19850 + for (lim = 0; lim < NUM_LIMITS; lim++) {
19851 + atomic_set(&__rlim_lhit(limit, lim), 0);
19855 +int vc_reset_hits(struct vx_info *vxi, void __user *data)
19857 + vx_reset_hits(&vxi->limit);
19861 +static inline void vx_reset_minmax(struct _vx_limit *limit)
19866 + for (lim = 0; lim < NUM_LIMITS; lim++) {
19867 + value = __rlim_get(limit, lim);
19868 + __rlim_rmax(limit, lim) = value;
19869 + __rlim_rmin(limit, lim) = value;
19873 +int vc_reset_minmax(struct vx_info *vxi, void __user *data)
19875 + vx_reset_minmax(&vxi->limit);
19880 +int vc_rlimit_stat(struct vx_info *vxi, void __user *data)
19882 + struct vcmd_rlimit_stat_v0 vc_data;
19883 + struct _vx_limit *limit = &vxi->limit;
19886 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
19890 + if (!is_accounted_vlimit(id))
19893 + vx_limit_fixup(limit, id);
19894 + vc_data.hits = atomic_read(&__rlim_lhit(limit, id));
19895 + vc_data.value = __rlim_get(limit, id);
19896 + vc_data.minimum = __rlim_rmin(limit, id);
19897 + vc_data.maximum = __rlim_rmax(limit, id);
19899 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
19905 +void vx_vsi_meminfo(struct sysinfo *val)
19907 +#ifdef CONFIG_CGROUP_MEM_RES_CTLR
19908 + struct mem_cgroup *mcg = mem_cgroup_from_task(current);
19909 + u64 res_limit, res_usage;
19914 + res_limit = mem_cgroup_res_read_u64(mcg, RES_LIMIT);
19915 + res_usage = mem_cgroup_res_read_u64(mcg, RES_USAGE);
19917 + if (res_limit != RESOURCE_MAX)
19918 + val->totalram = (res_limit >> PAGE_SHIFT);
19919 + val->freeram = val->totalram - (res_usage >> PAGE_SHIFT);
19920 + val->bufferram = 0;
19921 + val->totalhigh = 0;
19922 + val->freehigh = 0;
19923 +#endif /* CONFIG_CGROUP_MEM_RES_CTLR */
19927 +void vx_vsi_swapinfo(struct sysinfo *val)
19929 +#ifdef CONFIG_CGROUP_MEM_RES_CTLR
19930 +#ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP
19931 + struct mem_cgroup *mcg = mem_cgroup_from_task(current);
19932 + u64 res_limit, res_usage, memsw_limit, memsw_usage;
19933 + s64 swap_limit, swap_usage;
19938 + res_limit = mem_cgroup_res_read_u64(mcg, RES_LIMIT);
19939 + res_usage = mem_cgroup_res_read_u64(mcg, RES_USAGE);
19940 + memsw_limit = mem_cgroup_memsw_read_u64(mcg, RES_LIMIT);
19941 + memsw_usage = mem_cgroup_memsw_read_u64(mcg, RES_USAGE);
19943 + /* memory unlimited */
19944 + if (res_limit == RESOURCE_MAX)
19947 + swap_limit = memsw_limit - res_limit;
19948 + /* we have a swap limit? */
19949 + if (memsw_limit != RESOURCE_MAX)
19950 + val->totalswap = swap_limit >> PAGE_SHIFT;
19952 + /* calculate swap part */
19953 + swap_usage = (memsw_usage > res_usage) ?
19954 + memsw_usage - res_usage : 0;
19956 + /* total shown minus usage gives free swap */
19957 + val->freeswap = (swap_usage < swap_limit) ?
19958 + val->totalswap - (swap_usage >> PAGE_SHIFT) : 0;
19959 +#else /* !CONFIG_CGROUP_MEM_RES_CTLR_SWAP */
19960 + val->totalswap = 0;
19961 + val->freeswap = 0;
19962 +#endif /* !CONFIG_CGROUP_MEM_RES_CTLR_SWAP */
19963 +#endif /* CONFIG_CGROUP_MEM_RES_CTLR */
19967 +long vx_vsi_cached(struct sysinfo *val)
19969 +#ifdef CONFIG_CGROUP_MEM_RES_CTLR
19970 + struct mem_cgroup *mcg = mem_cgroup_from_task(current);
19972 + return mem_cgroup_stat_read_cache(mcg);
19978 diff -NurpP --minimal linux-3.5/kernel/vserver/limit_init.h linux-3.5-vs2.3.4/kernel/vserver/limit_init.h
19979 --- linux-3.5/kernel/vserver/limit_init.h 1970-01-01 01:00:00.000000000 +0100
19980 +++ linux-3.5-vs2.3.4/kernel/vserver/limit_init.h 2012-07-23 01:45:55.000000000 +0200
19984 +static inline void vx_info_init_limit(struct _vx_limit *limit)
19988 + for (lim = 0; lim < NUM_LIMITS; lim++) {
19989 + __rlim_soft(limit, lim) = RLIM_INFINITY;
19990 + __rlim_hard(limit, lim) = RLIM_INFINITY;
19991 + __rlim_set(limit, lim, 0);
19992 + atomic_set(&__rlim_lhit(limit, lim), 0);
19993 + __rlim_rmin(limit, lim) = 0;
19994 + __rlim_rmax(limit, lim) = 0;
19998 +static inline void vx_info_exit_limit(struct _vx_limit *limit)
20003 + for (lim = 0; lim < NUM_LIMITS; lim++) {
20004 + if ((1 << lim) & VLIM_NOCHECK)
20006 + value = __rlim_get(limit, lim);
20007 + vxwprintk_xid(value,
20008 + "!!! limit: %p[%s,%d] = %ld on exit.",
20009 + limit, vlimit_name[lim], lim, (long)value);
20013 diff -NurpP --minimal linux-3.5/kernel/vserver/limit_proc.h linux-3.5-vs2.3.4/kernel/vserver/limit_proc.h
20014 --- linux-3.5/kernel/vserver/limit_proc.h 1970-01-01 01:00:00.000000000 +0100
20015 +++ linux-3.5-vs2.3.4/kernel/vserver/limit_proc.h 2012-07-23 01:45:55.000000000 +0200
20017 +#ifndef _VX_LIMIT_PROC_H
20018 +#define _VX_LIMIT_PROC_H
20020 +#include <linux/vserver/limit_int.h>
20023 +#define VX_LIMIT_FMT ":\t%8ld\t%8ld/%8ld\t%8lld/%8lld\t%6d\n"
20024 +#define VX_LIMIT_TOP \
20025 + "Limit\t current\t min/max\t\t soft/hard\t\thits\n"
20027 +#define VX_LIMIT_ARG(r) \
20028 + (unsigned long)__rlim_get(limit, r), \
20029 + (unsigned long)__rlim_rmin(limit, r), \
20030 + (unsigned long)__rlim_rmax(limit, r), \
20031 + VX_VLIM(__rlim_soft(limit, r)), \
20032 + VX_VLIM(__rlim_hard(limit, r)), \
20033 + atomic_read(&__rlim_lhit(limit, r))
20035 +static inline int vx_info_proc_limit(struct _vx_limit *limit, char *buffer)
20037 + vx_limit_fixup(limit, -1);
20038 + return sprintf(buffer, VX_LIMIT_TOP
20039 + "PROC" VX_LIMIT_FMT
20040 + "VM" VX_LIMIT_FMT
20041 + "VML" VX_LIMIT_FMT
20042 + "RSS" VX_LIMIT_FMT
20043 + "ANON" VX_LIMIT_FMT
20044 + "RMAP" VX_LIMIT_FMT
20045 + "FILES" VX_LIMIT_FMT
20046 + "OFD" VX_LIMIT_FMT
20047 + "LOCKS" VX_LIMIT_FMT
20048 + "SOCK" VX_LIMIT_FMT
20049 + "MSGQ" VX_LIMIT_FMT
20050 + "SHM" VX_LIMIT_FMT
20051 + "SEMA" VX_LIMIT_FMT
20052 + "SEMS" VX_LIMIT_FMT
20053 + "DENT" VX_LIMIT_FMT,
20054 + VX_LIMIT_ARG(RLIMIT_NPROC),
20055 + VX_LIMIT_ARG(RLIMIT_AS),
20056 + VX_LIMIT_ARG(RLIMIT_MEMLOCK),
20057 + VX_LIMIT_ARG(RLIMIT_RSS),
20058 + VX_LIMIT_ARG(VLIMIT_ANON),
20059 + VX_LIMIT_ARG(VLIMIT_MAPPED),
20060 + VX_LIMIT_ARG(RLIMIT_NOFILE),
20061 + VX_LIMIT_ARG(VLIMIT_OPENFD),
20062 + VX_LIMIT_ARG(RLIMIT_LOCKS),
20063 + VX_LIMIT_ARG(VLIMIT_NSOCK),
20064 + VX_LIMIT_ARG(RLIMIT_MSGQUEUE),
20065 + VX_LIMIT_ARG(VLIMIT_SHMEM),
20066 + VX_LIMIT_ARG(VLIMIT_SEMARY),
20067 + VX_LIMIT_ARG(VLIMIT_NSEMS),
20068 + VX_LIMIT_ARG(VLIMIT_DENTRY));
20071 +#endif /* _VX_LIMIT_PROC_H */
20074 diff -NurpP --minimal linux-3.5/kernel/vserver/network.c linux-3.5-vs2.3.4/kernel/vserver/network.c
20075 --- linux-3.5/kernel/vserver/network.c 1970-01-01 01:00:00.000000000 +0100
20076 +++ linux-3.5-vs2.3.4/kernel/vserver/network.c 2012-07-23 01:45:55.000000000 +0200
20079 + * linux/kernel/vserver/network.c
20081 + * Virtual Server: Network Support
20083 + * Copyright (C) 2003-2007 Herbert Pötzl
20085 + * V0.01 broken out from vcontext V0.05
20086 + * V0.02 cleaned up implementation
20087 + * V0.03 added equiv nx commands
20088 + * V0.04 switch to RCU based hash
20089 + * V0.05 and back to locking again
20090 + * V0.06 changed vcmds to nxi arg
20091 + * V0.07 have __create claim() the nxi
20095 +#include <linux/err.h>
20096 +#include <linux/slab.h>
20097 +#include <linux/rcupdate.h>
20099 +#include <linux/vs_network.h>
20100 +#include <linux/vs_pid.h>
20101 +#include <linux/vserver/network_cmd.h>
20104 +atomic_t nx_global_ctotal = ATOMIC_INIT(0);
20105 +atomic_t nx_global_cactive = ATOMIC_INIT(0);
20107 +static struct kmem_cache *nx_addr_v4_cachep = NULL;
20108 +static struct kmem_cache *nx_addr_v6_cachep = NULL;
20111 +static int __init init_network(void)
20113 + nx_addr_v4_cachep = kmem_cache_create("nx_v4_addr_cache",
20114 + sizeof(struct nx_addr_v4), 0,
20115 + SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
20116 + nx_addr_v6_cachep = kmem_cache_create("nx_v6_addr_cache",
20117 + sizeof(struct nx_addr_v6), 0,
20118 + SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
20123 +/* __alloc_nx_addr_v4() */
20125 +static inline struct nx_addr_v4 *__alloc_nx_addr_v4(void)
20127 + struct nx_addr_v4 *nxa = kmem_cache_alloc(
20128 + nx_addr_v4_cachep, GFP_KERNEL);
20130 + if (!IS_ERR(nxa))
20131 + memset(nxa, 0, sizeof(*nxa));
20135 +/* __dealloc_nx_addr_v4() */
20137 +static inline void __dealloc_nx_addr_v4(struct nx_addr_v4 *nxa)
20139 + kmem_cache_free(nx_addr_v4_cachep, nxa);
20142 +/* __dealloc_nx_addr_v4_all() */
20144 +static inline void __dealloc_nx_addr_v4_all(struct nx_addr_v4 *nxa)
20147 + struct nx_addr_v4 *next = nxa->next;
20149 + __dealloc_nx_addr_v4(nxa);
20155 +#ifdef CONFIG_IPV6
20157 +/* __alloc_nx_addr_v6() */
20159 +static inline struct nx_addr_v6 *__alloc_nx_addr_v6(void)
20161 + struct nx_addr_v6 *nxa = kmem_cache_alloc(
20162 + nx_addr_v6_cachep, GFP_KERNEL);
20164 + if (!IS_ERR(nxa))
20165 + memset(nxa, 0, sizeof(*nxa));
20169 +/* __dealloc_nx_addr_v6() */
20171 +static inline void __dealloc_nx_addr_v6(struct nx_addr_v6 *nxa)
20173 + kmem_cache_free(nx_addr_v6_cachep, nxa);
20176 +/* __dealloc_nx_addr_v6_all() */
20178 +static inline void __dealloc_nx_addr_v6_all(struct nx_addr_v6 *nxa)
20181 + struct nx_addr_v6 *next = nxa->next;
20183 + __dealloc_nx_addr_v6(nxa);
20188 +#endif /* CONFIG_IPV6 */
20190 +/* __alloc_nx_info()
20192 + * allocate an initialized nx_info struct
20193 + * doesn't make it visible (hash) */
20195 +static struct nx_info *__alloc_nx_info(nid_t nid)
20197 + struct nx_info *new = NULL;
20199 + vxdprintk(VXD_CBIT(nid, 1), "alloc_nx_info(%d)*", nid);
20201 + /* would this benefit from a slab cache? */
20202 + new = kmalloc(sizeof(struct nx_info), GFP_KERNEL);
20206 + memset(new, 0, sizeof(struct nx_info));
20207 + new->nx_id = nid;
20208 + INIT_HLIST_NODE(&new->nx_hlist);
20209 + atomic_set(&new->nx_usecnt, 0);
20210 + atomic_set(&new->nx_tasks, 0);
20211 + new->nx_state = 0;
20213 + new->nx_flags = NXF_INIT_SET;
20215 + /* rest of init goes here */
20217 + new->v4_lback.s_addr = htonl(INADDR_LOOPBACK);
20218 + new->v4_bcast.s_addr = htonl(INADDR_BROADCAST);
20220 + vxdprintk(VXD_CBIT(nid, 0),
20221 + "alloc_nx_info(%d) = %p", nid, new);
20222 + atomic_inc(&nx_global_ctotal);
20226 +/* __dealloc_nx_info()
20228 + * final disposal of nx_info */
20230 +static void __dealloc_nx_info(struct nx_info *nxi)
20232 + vxdprintk(VXD_CBIT(nid, 0),
20233 + "dealloc_nx_info(%p)", nxi);
20235 + nxi->nx_hlist.next = LIST_POISON1;
20238 + BUG_ON(atomic_read(&nxi->nx_usecnt));
20239 + BUG_ON(atomic_read(&nxi->nx_tasks));
20241 + __dealloc_nx_addr_v4_all(nxi->v4.next);
20243 + nxi->nx_state |= NXS_RELEASED;
20245 + atomic_dec(&nx_global_ctotal);
20248 +static void __shutdown_nx_info(struct nx_info *nxi)
20250 + nxi->nx_state |= NXS_SHUTDOWN;
20251 + vs_net_change(nxi, VSC_NETDOWN);
20254 +/* exported stuff */
20256 +void free_nx_info(struct nx_info *nxi)
20258 + /* context shutdown is mandatory */
20259 + BUG_ON(nxi->nx_state != NXS_SHUTDOWN);
20261 + /* context must not be hashed */
20262 + BUG_ON(nxi->nx_state & NXS_HASHED);
20264 + BUG_ON(atomic_read(&nxi->nx_usecnt));
20265 + BUG_ON(atomic_read(&nxi->nx_tasks));
20267 + __dealloc_nx_info(nxi);
20271 +void __nx_set_lback(struct nx_info *nxi)
20273 + int nid = nxi->nx_id;
20274 + __be32 lback = htonl(INADDR_LOOPBACK ^ ((nid & 0xFFFF) << 8));
20276 + nxi->v4_lback.s_addr = lback;
20279 +extern int __nx_inet_add_lback(__be32 addr);
20280 +extern int __nx_inet_del_lback(__be32 addr);
20283 +/* hash table for nx_info hash */
20285 +#define NX_HASH_SIZE 13
20287 +struct hlist_head nx_info_hash[NX_HASH_SIZE];
20289 +static DEFINE_SPINLOCK(nx_info_hash_lock);
20292 +static inline unsigned int __hashval(nid_t nid)
20294 + return (nid % NX_HASH_SIZE);
20299 +/* __hash_nx_info()
20301 + * add the nxi to the global hash table
20302 + * requires the hash_lock to be held */
20304 +static inline void __hash_nx_info(struct nx_info *nxi)
20306 + struct hlist_head *head;
20308 + vxd_assert_lock(&nx_info_hash_lock);
20309 + vxdprintk(VXD_CBIT(nid, 4),
20310 + "__hash_nx_info: %p[#%d]", nxi, nxi->nx_id);
20312 + /* context must not be hashed */
20313 + BUG_ON(nx_info_state(nxi, NXS_HASHED));
20315 + nxi->nx_state |= NXS_HASHED;
20316 + head = &nx_info_hash[__hashval(nxi->nx_id)];
20317 + hlist_add_head(&nxi->nx_hlist, head);
20318 + atomic_inc(&nx_global_cactive);
20321 +/* __unhash_nx_info()
20323 + * remove the nxi from the global hash table
20324 + * requires the hash_lock to be held */
20326 +static inline void __unhash_nx_info(struct nx_info *nxi)
20328 + vxd_assert_lock(&nx_info_hash_lock);
20329 + vxdprintk(VXD_CBIT(nid, 4),
20330 + "__unhash_nx_info: %p[#%d.%d.%d]", nxi, nxi->nx_id,
20331 + atomic_read(&nxi->nx_usecnt), atomic_read(&nxi->nx_tasks));
20333 + /* context must be hashed */
20334 + BUG_ON(!nx_info_state(nxi, NXS_HASHED));
20335 + /* but without tasks */
20336 + BUG_ON(atomic_read(&nxi->nx_tasks));
20338 + nxi->nx_state &= ~NXS_HASHED;
20339 + hlist_del(&nxi->nx_hlist);
20340 + atomic_dec(&nx_global_cactive);
20344 +/* __lookup_nx_info()
20346 + * requires the hash_lock to be held
20347 + * doesn't increment the nx_refcnt */
20349 +static inline struct nx_info *__lookup_nx_info(nid_t nid)
20351 + struct hlist_head *head = &nx_info_hash[__hashval(nid)];
20352 + struct hlist_node *pos;
20353 + struct nx_info *nxi;
20355 + vxd_assert_lock(&nx_info_hash_lock);
20356 + hlist_for_each(pos, head) {
20357 + nxi = hlist_entry(pos, struct nx_info, nx_hlist);
20359 + if (nxi->nx_id == nid)
20364 + vxdprintk(VXD_CBIT(nid, 0),
20365 + "__lookup_nx_info(#%u): %p[#%u]",
20366 + nid, nxi, nxi ? nxi->nx_id : 0);
20371 +/* __create_nx_info()
20373 + * create the requested context
20374 + * get(), claim() and hash it */
20376 +static struct nx_info *__create_nx_info(int id)
20378 + struct nx_info *new, *nxi = NULL;
20380 + vxdprintk(VXD_CBIT(nid, 1), "create_nx_info(%d)*", id);
20382 + if (!(new = __alloc_nx_info(id)))
20383 + return ERR_PTR(-ENOMEM);
20385 + /* required to make dynamic xids unique */
20386 + spin_lock(&nx_info_hash_lock);
20388 + /* static context requested */
20389 + if ((nxi = __lookup_nx_info(id))) {
20390 + vxdprintk(VXD_CBIT(nid, 0),
20391 + "create_nx_info(%d) = %p (already there)", id, nxi);
20392 + if (nx_info_flags(nxi, NXF_STATE_SETUP, 0))
20393 + nxi = ERR_PTR(-EBUSY);
20395 + nxi = ERR_PTR(-EEXIST);
20398 + /* new context */
20399 + vxdprintk(VXD_CBIT(nid, 0),
20400 + "create_nx_info(%d) = %p (new)", id, new);
20401 + claim_nx_info(new, NULL);
20402 + __nx_set_lback(new);
20403 + __hash_nx_info(get_nx_info(new));
20404 + nxi = new, new = NULL;
20407 + spin_unlock(&nx_info_hash_lock);
20409 + __dealloc_nx_info(new);
20415 +/* exported stuff */
20418 +void unhash_nx_info(struct nx_info *nxi)
20420 + __shutdown_nx_info(nxi);
20421 + spin_lock(&nx_info_hash_lock);
20422 + __unhash_nx_info(nxi);
20423 + spin_unlock(&nx_info_hash_lock);
20426 +/* lookup_nx_info()
20428 + * search for a nx_info and get() it
20429 + * negative id means current */
20431 +struct nx_info *lookup_nx_info(int id)
20433 + struct nx_info *nxi = NULL;
20436 + nxi = get_nx_info(current_nx_info());
20437 + } else if (id > 1) {
20438 + spin_lock(&nx_info_hash_lock);
20439 + nxi = get_nx_info(__lookup_nx_info(id));
20440 + spin_unlock(&nx_info_hash_lock);
20445 +/* nid_is_hashed()
20447 + * verify that nid is still hashed */
20449 +int nid_is_hashed(nid_t nid)
20453 + spin_lock(&nx_info_hash_lock);
20454 + hashed = (__lookup_nx_info(nid) != NULL);
20455 + spin_unlock(&nx_info_hash_lock);
20460 +#ifdef CONFIG_PROC_FS
20464 + * get a subset of hashed nids for proc
20465 + * assumes size is at least one */
20467 +int get_nid_list(int index, unsigned int *nids, int size)
20469 + int hindex, nr_nids = 0;
20471 + /* only show current and children */
20472 + if (!nx_check(0, VS_ADMIN | VS_WATCH)) {
20475 + nids[nr_nids] = nx_current_nid();
20479 + for (hindex = 0; hindex < NX_HASH_SIZE; hindex++) {
20480 + struct hlist_head *head = &nx_info_hash[hindex];
20481 + struct hlist_node *pos;
20483 + spin_lock(&nx_info_hash_lock);
20484 + hlist_for_each(pos, head) {
20485 + struct nx_info *nxi;
20490 + nxi = hlist_entry(pos, struct nx_info, nx_hlist);
20491 + nids[nr_nids] = nxi->nx_id;
20492 + if (++nr_nids >= size) {
20493 + spin_unlock(&nx_info_hash_lock);
20497 + /* keep the lock time short */
20498 + spin_unlock(&nx_info_hash_lock);
20507 + * migrate task to new network
20508 + * gets nxi, puts old_nxi on change
20511 +int nx_migrate_task(struct task_struct *p, struct nx_info *nxi)
20513 + struct nx_info *old_nxi;
20519 + vxdprintk(VXD_CBIT(nid, 5),
20520 + "nx_migrate_task(%p,%p[#%d.%d.%d])",
20521 + p, nxi, nxi->nx_id,
20522 + atomic_read(&nxi->nx_usecnt),
20523 + atomic_read(&nxi->nx_tasks));
20525 + if (nx_info_flags(nxi, NXF_INFO_PRIVATE, 0) &&
20526 + !nx_info_flags(nxi, NXF_STATE_SETUP, 0))
20529 + if (nx_info_state(nxi, NXS_SHUTDOWN))
20532 + /* maybe disallow this completely? */
20533 + old_nxi = task_get_nx_info(p);
20534 + if (old_nxi == nxi)
20539 + clr_nx_info(&p->nx_info);
20540 + claim_nx_info(nxi, p);
20541 + set_nx_info(&p->nx_info, nxi);
20542 + p->nid = nxi->nx_id;
20545 + vxdprintk(VXD_CBIT(nid, 5),
20546 + "moved task %p into nxi:%p[#%d]",
20547 + p, nxi, nxi->nx_id);
20550 + release_nx_info(old_nxi, p);
20553 + put_nx_info(old_nxi);
20558 +void nx_set_persistent(struct nx_info *nxi)
20560 + vxdprintk(VXD_CBIT(nid, 6),
20561 + "nx_set_persistent(%p[#%d])", nxi, nxi->nx_id);
20563 + get_nx_info(nxi);
20564 + claim_nx_info(nxi, NULL);
20567 +void nx_clear_persistent(struct nx_info *nxi)
20569 + vxdprintk(VXD_CBIT(nid, 6),
20570 + "nx_clear_persistent(%p[#%d])", nxi, nxi->nx_id);
20572 + release_nx_info(nxi, NULL);
20573 + put_nx_info(nxi);
20576 +void nx_update_persistent(struct nx_info *nxi)
20578 + if (nx_info_flags(nxi, NXF_PERSISTENT, 0))
20579 + nx_set_persistent(nxi);
20581 + nx_clear_persistent(nxi);
20584 +/* vserver syscall commands below here */
20586 +/* taks nid and nx_info functions */
20588 +#include <asm/uaccess.h>
20591 +int vc_task_nid(uint32_t id)
20596 + struct task_struct *tsk;
20599 + tsk = find_task_by_real_pid(id);
20600 + nid = (tsk) ? tsk->nid : -ESRCH;
20601 + rcu_read_unlock();
20603 + nid = nx_current_nid();
20608 +int vc_nx_info(struct nx_info *nxi, void __user *data)
20610 + struct vcmd_nx_info_v0 vc_data;
20612 + vc_data.nid = nxi->nx_id;
20614 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
20620 +/* network functions */
20622 +int vc_net_create(uint32_t nid, void __user *data)
20624 + struct vcmd_net_create vc_data = { .flagword = NXF_INIT_SET };
20625 + struct nx_info *new_nxi;
20628 + if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
20631 + if ((nid > MAX_S_CONTEXT) || (nid < 2))
20634 + new_nxi = __create_nx_info(nid);
20635 + if (IS_ERR(new_nxi))
20636 + return PTR_ERR(new_nxi);
20638 + /* initial flags */
20639 + new_nxi->nx_flags = vc_data.flagword;
20642 + if (vs_net_change(new_nxi, VSC_NETUP))
20645 + ret = nx_migrate_task(current, new_nxi);
20649 + /* return context id on success */
20650 + ret = new_nxi->nx_id;
20652 + /* get a reference for persistent contexts */
20653 + if ((vc_data.flagword & NXF_PERSISTENT))
20654 + nx_set_persistent(new_nxi);
20656 + release_nx_info(new_nxi, NULL);
20657 + put_nx_info(new_nxi);
20662 +int vc_net_migrate(struct nx_info *nxi, void __user *data)
20664 + return nx_migrate_task(current, nxi);
20669 +int do_add_v4_addr(struct nx_info *nxi, __be32 ip, __be32 ip2, __be32 mask,
20670 + uint16_t type, uint16_t flags)
20672 + struct nx_addr_v4 *nxa = &nxi->v4;
20674 + if (NX_IPV4(nxi)) {
20675 + /* locate last entry */
20676 + for (; nxa->next; nxa = nxa->next);
20677 + nxa->next = __alloc_nx_addr_v4();
20681 + return PTR_ERR(nxa);
20684 + if (nxi->v4.next)
20685 + /* remove single ip for ip list */
20686 + nxi->nx_flags &= ~NXF_SINGLE_IP;
20688 + nxa->ip[0].s_addr = ip;
20689 + nxa->ip[1].s_addr = ip2;
20690 + nxa->mask.s_addr = mask;
20691 + nxa->type = type;
20692 + nxa->flags = flags;
20696 +int do_remove_v4_addr(struct nx_info *nxi, __be32 ip, __be32 ip2, __be32 mask,
20697 + uint16_t type, uint16_t flags)
20699 + struct nx_addr_v4 *nxa = &nxi->v4;
20702 +/* case NXA_TYPE_ADDR:
20705 + case NXA_TYPE_ANY:
20706 + __dealloc_nx_addr_v4_all(xchg(&nxa->next, NULL));
20707 + memset(nxa, 0, sizeof(*nxa));
20717 +int vc_net_add(struct nx_info *nxi, void __user *data)
20719 + struct vcmd_net_addr_v0 vc_data;
20720 + int index, ret = 0;
20722 + if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
20725 + switch (vc_data.type) {
20726 + case NXA_TYPE_IPV4:
20727 + if ((vc_data.count < 1) || (vc_data.count > 4))
20731 + while (index < vc_data.count) {
20732 + ret = do_add_v4_addr(nxi, vc_data.ip[index].s_addr, 0,
20733 + vc_data.mask[index].s_addr, NXA_TYPE_ADDR, 0);
20741 + case NXA_TYPE_IPV4|NXA_MOD_BCAST:
20742 + nxi->v4_bcast = vc_data.ip[0];
20746 + case NXA_TYPE_IPV4|NXA_MOD_LBACK:
20747 + nxi->v4_lback = vc_data.ip[0];
20758 +int vc_net_remove(struct nx_info *nxi, void __user *data)
20760 + struct vcmd_net_addr_v0 vc_data;
20762 + if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
20765 + switch (vc_data.type) {
20766 + case NXA_TYPE_ANY:
20767 + __dealloc_nx_addr_v4_all(xchg(&nxi->v4.next, NULL));
20768 + memset(&nxi->v4, 0, sizeof(nxi->v4));
20778 +int vc_net_add_ipv4_v1(struct nx_info *nxi, void __user *data)
20780 + struct vcmd_net_addr_ipv4_v1 vc_data;
20782 + if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
20785 + switch (vc_data.type) {
20786 + case NXA_TYPE_ADDR:
20787 + case NXA_TYPE_MASK:
20788 + return do_add_v4_addr(nxi, vc_data.ip.s_addr, 0,
20789 + vc_data.mask.s_addr, vc_data.type, vc_data.flags);
20791 + case NXA_TYPE_ADDR | NXA_MOD_BCAST:
20792 + nxi->v4_bcast = vc_data.ip;
20795 + case NXA_TYPE_ADDR | NXA_MOD_LBACK:
20796 + nxi->v4_lback = vc_data.ip;
20805 +int vc_net_add_ipv4(struct nx_info *nxi, void __user *data)
20807 + struct vcmd_net_addr_ipv4_v2 vc_data;
20809 + if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
20812 + switch (vc_data.type) {
20813 + case NXA_TYPE_ADDR:
20814 + case NXA_TYPE_MASK:
20815 + case NXA_TYPE_RANGE:
20816 + return do_add_v4_addr(nxi, vc_data.ip.s_addr, vc_data.ip2.s_addr,
20817 + vc_data.mask.s_addr, vc_data.type, vc_data.flags);
20819 + case NXA_TYPE_ADDR | NXA_MOD_BCAST:
20820 + nxi->v4_bcast = vc_data.ip;
20823 + case NXA_TYPE_ADDR | NXA_MOD_LBACK:
20824 + nxi->v4_lback = vc_data.ip;
20833 +int vc_net_rem_ipv4_v1(struct nx_info *nxi, void __user *data)
20835 + struct vcmd_net_addr_ipv4_v1 vc_data;
20837 + if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
20840 + return do_remove_v4_addr(nxi, vc_data.ip.s_addr, 0,
20841 + vc_data.mask.s_addr, vc_data.type, vc_data.flags);
20844 +int vc_net_rem_ipv4(struct nx_info *nxi, void __user *data)
20846 + struct vcmd_net_addr_ipv4_v2 vc_data;
20848 + if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
20851 + return do_remove_v4_addr(nxi, vc_data.ip.s_addr, vc_data.ip2.s_addr,
20852 + vc_data.mask.s_addr, vc_data.type, vc_data.flags);
20855 +#ifdef CONFIG_IPV6
20857 +int do_add_v6_addr(struct nx_info *nxi,
20858 + struct in6_addr *ip, struct in6_addr *mask,
20859 + uint32_t prefix, uint16_t type, uint16_t flags)
20861 + struct nx_addr_v6 *nxa = &nxi->v6;
20863 + if (NX_IPV6(nxi)) {
20864 + /* locate last entry */
20865 + for (; nxa->next; nxa = nxa->next);
20866 + nxa->next = __alloc_nx_addr_v6();
20870 + return PTR_ERR(nxa);
20874 + nxa->mask = *mask;
20875 + nxa->prefix = prefix;
20876 + nxa->type = type;
20877 + nxa->flags = flags;
20882 +int vc_net_add_ipv6(struct nx_info *nxi, void __user *data)
20884 + struct vcmd_net_addr_ipv6_v1 vc_data;
20886 + if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
20889 + switch (vc_data.type) {
20890 + case NXA_TYPE_ADDR:
20891 + memset(&vc_data.mask, ~0, sizeof(vc_data.mask));
20892 + /* fallthrough */
20893 + case NXA_TYPE_MASK:
20894 + return do_add_v6_addr(nxi, &vc_data.ip, &vc_data.mask,
20895 + vc_data.prefix, vc_data.type, vc_data.flags);
20902 +int vc_net_remove_ipv6(struct nx_info *nxi, void __user *data)
20904 + struct vcmd_net_addr_ipv6_v1 vc_data;
20906 + if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
20909 + switch (vc_data.type) {
20910 + case NXA_TYPE_ANY:
20911 + __dealloc_nx_addr_v6_all(xchg(&nxi->v6.next, NULL));
20912 + memset(&nxi->v6, 0, sizeof(nxi->v6));
20921 +#endif /* CONFIG_IPV6 */
20924 +int vc_get_nflags(struct nx_info *nxi, void __user *data)
20926 + struct vcmd_net_flags_v0 vc_data;
20928 + vc_data.flagword = nxi->nx_flags;
20930 + /* special STATE flag handling */
20931 + vc_data.mask = vs_mask_flags(~0ULL, nxi->nx_flags, NXF_ONE_TIME);
20933 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
20938 +int vc_set_nflags(struct nx_info *nxi, void __user *data)
20940 + struct vcmd_net_flags_v0 vc_data;
20941 + uint64_t mask, trigger;
20943 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
20946 + /* special STATE flag handling */
20947 + mask = vs_mask_mask(vc_data.mask, nxi->nx_flags, NXF_ONE_TIME);
20948 + trigger = (mask & nxi->nx_flags) ^ (mask & vc_data.flagword);
20950 + nxi->nx_flags = vs_mask_flags(nxi->nx_flags,
20951 + vc_data.flagword, mask);
20952 + if (trigger & NXF_PERSISTENT)
20953 + nx_update_persistent(nxi);
20958 +int vc_get_ncaps(struct nx_info *nxi, void __user *data)
20960 + struct vcmd_net_caps_v0 vc_data;
20962 + vc_data.ncaps = nxi->nx_ncaps;
20963 + vc_data.cmask = ~0ULL;
20965 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
20970 +int vc_set_ncaps(struct nx_info *nxi, void __user *data)
20972 + struct vcmd_net_caps_v0 vc_data;
20974 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
20977 + nxi->nx_ncaps = vs_mask_flags(nxi->nx_ncaps,
20978 + vc_data.ncaps, vc_data.cmask);
20983 +#include <linux/module.h>
20985 +module_init(init_network);
20987 +EXPORT_SYMBOL_GPL(free_nx_info);
20988 +EXPORT_SYMBOL_GPL(unhash_nx_info);
20990 diff -NurpP --minimal linux-3.5/kernel/vserver/proc.c linux-3.5-vs2.3.4/kernel/vserver/proc.c
20991 --- linux-3.5/kernel/vserver/proc.c 1970-01-01 01:00:00.000000000 +0100
20992 +++ linux-3.5-vs2.3.4/kernel/vserver/proc.c 2012-07-23 01:45:55.000000000 +0200
20995 + * linux/kernel/vserver/proc.c
20997 + * Virtual Context Support
20999 + * Copyright (C) 2003-2011 Herbert Pötzl
21001 + * V0.01 basic structure
21002 + * V0.02 adaptation vs1.3.0
21003 + * V0.03 proc permissions
21004 + * V0.04 locking/generic
21005 + * V0.05 next generation procfs
21006 + * V0.06 inode validation
21007 + * V0.07 generic rewrite vid
21008 + * V0.08 remove inode type
21009 + * V0.09 added u/wmask info
21013 +#include <linux/proc_fs.h>
21014 +#include <linux/fs_struct.h>
21015 +#include <linux/mount.h>
21016 +#include <asm/unistd.h>
21018 +#include <linux/vs_context.h>
21019 +#include <linux/vs_network.h>
21020 +#include <linux/vs_cvirt.h>
21022 +#include <linux/in.h>
21023 +#include <linux/inetdevice.h>
21024 +#include <linux/vs_inet.h>
21025 +#include <linux/vs_inet6.h>
21027 +#include <linux/vserver/global.h>
21029 +#include "cvirt_proc.h"
21030 +#include "cacct_proc.h"
21031 +#include "limit_proc.h"
21032 +#include "sched_proc.h"
21033 +#include "vci_config.h"
21036 +static inline char *print_cap_t(char *buffer, kernel_cap_t *c)
21040 + CAP_FOR_EACH_U32(__capi) {
21041 + buffer += sprintf(buffer, "%08x",
21042 + c->cap[(_KERNEL_CAPABILITY_U32S-1) - __capi]);
21048 +static struct proc_dir_entry *proc_virtual;
21050 +static struct proc_dir_entry *proc_virtnet;
21053 +/* first the actual feeds */
21056 +static int proc_vci(char *buffer)
21058 + return sprintf(buffer,
21059 + "VCIVersion:\t%04x:%04x\n"
21060 + "VCISyscall:\t%d\n"
21061 + "VCIKernel:\t%08x\n",
21062 + VCI_VERSION >> 16,
21063 + VCI_VERSION & 0xFFFF,
21065 + vci_kernel_config());
21068 +static int proc_virtual_info(char *buffer)
21070 + return proc_vci(buffer);
21073 +static int proc_virtual_status(char *buffer)
21075 + return sprintf(buffer,
21077 + "#CActive:\t%d\n"
21078 + "#NSProxy:\t%d\t%d %d %d %d %d %d\n"
21079 + "#InitTask:\t%d\t%d %d\n",
21080 + atomic_read(&vx_global_ctotal),
21081 + atomic_read(&vx_global_cactive),
21082 + atomic_read(&vs_global_nsproxy),
21083 + atomic_read(&vs_global_fs),
21084 + atomic_read(&vs_global_mnt_ns),
21085 + atomic_read(&vs_global_uts_ns),
21086 + atomic_read(&nr_ipc_ns),
21087 + atomic_read(&vs_global_user_ns),
21088 + atomic_read(&vs_global_pid_ns),
21089 + atomic_read(&init_task.usage),
21090 + atomic_read(&init_task.nsproxy->count),
21091 + init_task.fs->users);
21095 +int proc_vxi_info(struct vx_info *vxi, char *buffer)
21099 + length = sprintf(buffer,
21107 + vxi->vx_badness_bias);
21111 +int proc_vxi_status(struct vx_info *vxi, char *buffer)
21113 + char *orig = buffer;
21115 + buffer += sprintf(buffer,
21118 + "Flags:\t%016llx\n",
21119 + atomic_read(&vxi->vx_usecnt),
21120 + atomic_read(&vxi->vx_tasks),
21121 + (unsigned long long)vxi->vx_flags);
21123 + buffer += sprintf(buffer, "BCaps:\t");
21124 + buffer = print_cap_t(buffer, &vxi->vx_bcaps);
21125 + buffer += sprintf(buffer, "\n");
21127 + buffer += sprintf(buffer,
21128 + "CCaps:\t%016llx\n"
21129 + "Umask:\t%16llx\n"
21130 + "Wmask:\t%16llx\n"
21131 + "Spaces:\t%08lx %08lx\n",
21132 + (unsigned long long)vxi->vx_ccaps,
21133 + (unsigned long long)vxi->vx_umask,
21134 + (unsigned long long)vxi->vx_wmask,
21135 + vxi->space[0].vx_nsmask, vxi->space[1].vx_nsmask);
21136 + return buffer - orig;
21139 +int proc_vxi_limit(struct vx_info *vxi, char *buffer)
21141 + return vx_info_proc_limit(&vxi->limit, buffer);
21144 +int proc_vxi_sched(struct vx_info *vxi, char *buffer)
21148 + length = vx_info_proc_sched(&vxi->sched, buffer);
21149 + for_each_online_cpu(cpu) {
21150 + length += vx_info_proc_sched_pc(
21151 + &vx_per_cpu(vxi, sched_pc, cpu),
21152 + buffer + length, cpu);
21157 +int proc_vxi_nsproxy0(struct vx_info *vxi, char *buffer)
21159 + return vx_info_proc_nsproxy(vxi->space[0].vx_nsproxy, buffer);
21162 +int proc_vxi_nsproxy1(struct vx_info *vxi, char *buffer)
21164 + return vx_info_proc_nsproxy(vxi->space[1].vx_nsproxy, buffer);
21167 +int proc_vxi_cvirt(struct vx_info *vxi, char *buffer)
21171 + vx_update_load(vxi);
21172 + length = vx_info_proc_cvirt(&vxi->cvirt, buffer);
21173 + for_each_online_cpu(cpu) {
21174 + length += vx_info_proc_cvirt_pc(
21175 + &vx_per_cpu(vxi, cvirt_pc, cpu),
21176 + buffer + length, cpu);
21181 +int proc_vxi_cacct(struct vx_info *vxi, char *buffer)
21183 + return vx_info_proc_cacct(&vxi->cacct, buffer);
21187 +static int proc_virtnet_info(char *buffer)
21189 + return proc_vci(buffer);
21192 +static int proc_virtnet_status(char *buffer)
21194 + return sprintf(buffer,
21196 + "#CActive:\t%d\n",
21197 + atomic_read(&nx_global_ctotal),
21198 + atomic_read(&nx_global_cactive));
21201 +int proc_nxi_info(struct nx_info *nxi, char *buffer)
21203 + struct nx_addr_v4 *v4a;
21204 +#ifdef CONFIG_IPV6
21205 + struct nx_addr_v6 *v6a;
21209 + length = sprintf(buffer,
21212 + "Bcast:\t" NIPQUAD_FMT "\n"
21213 + "Lback:\t" NIPQUAD_FMT "\n",
21216 + NIPQUAD(nxi->v4_bcast.s_addr),
21217 + NIPQUAD(nxi->v4_lback.s_addr));
21219 + if (!NX_IPV4(nxi))
21221 + for (i = 0, v4a = &nxi->v4; v4a; i++, v4a = v4a->next)
21222 + length += sprintf(buffer + length, "%d:\t" NXAV4_FMT "\n",
21225 +#ifdef CONFIG_IPV6
21226 + if (!NX_IPV6(nxi))
21228 + for (i = 0, v6a = &nxi->v6; v6a; i++, v6a = v6a->next)
21229 + length += sprintf(buffer + length, "%d:\t" NXAV6_FMT "\n",
21236 +int proc_nxi_status(struct nx_info *nxi, char *buffer)
21240 + length = sprintf(buffer,
21243 + "Flags:\t%016llx\n"
21244 + "NCaps:\t%016llx\n",
21245 + atomic_read(&nxi->nx_usecnt),
21246 + atomic_read(&nxi->nx_tasks),
21247 + (unsigned long long)nxi->nx_flags,
21248 + (unsigned long long)nxi->nx_ncaps);
21254 +/* here the inode helpers */
21260 + struct inode_operations *iop;
21261 + struct file_operations *fop;
21262 + union proc_op op;
21265 +static struct inode *vs_proc_make_inode(struct super_block *sb, struct vs_entry *p)
21267 + struct inode *inode = new_inode(sb);
21272 + inode->i_mode = p->mode;
21274 + inode->i_op = p->iop;
21276 + inode->i_fop = p->fop;
21278 + set_nlink(inode, (p->mode & S_IFDIR) ? 2 : 1);
21279 + inode->i_flags |= S_IMMUTABLE;
21281 + inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
21283 + inode->i_uid = 0;
21284 + inode->i_gid = 0;
21285 + inode->i_tag = 0;
21290 +static struct dentry *vs_proc_instantiate(struct inode *dir,
21291 + struct dentry *dentry, int id, void *ptr)
21293 + struct vs_entry *p = ptr;
21294 + struct inode *inode = vs_proc_make_inode(dir->i_sb, p);
21295 + struct dentry *error = ERR_PTR(-EINVAL);
21300 + PROC_I(inode)->op = p->op;
21301 + PROC_I(inode)->fd = id;
21302 + d_add(dentry, inode);
21310 +typedef struct dentry *instantiate_t(struct inode *, struct dentry *, int, void *);
21313 + * Fill a directory entry.
21315 + * If possible create the dcache entry and derive our inode number and
21316 + * file type from dcache entry.
21318 + * Since all of the proc inode numbers are dynamically generated, the inode
21319 + * numbers do not exist until the inode is cache. This means creating the
21320 + * the dcache entry in readdir is necessary to keep the inode numbers
21321 + * reported by readdir in sync with the inode numbers reported
21324 +static int proc_fill_cache(struct file *filp, void *dirent, filldir_t filldir,
21325 + char *name, int len, instantiate_t instantiate, int id, void *ptr)
21327 + struct dentry *child, *dir = filp->f_dentry;
21328 + struct inode *inode;
21329 + struct qstr qname;
21331 + unsigned type = DT_UNKNOWN;
21333 + qname.name = name;
21335 + qname.hash = full_name_hash(name, len);
21337 + child = d_lookup(dir, &qname);
21339 + struct dentry *new;
21340 + new = d_alloc(dir, &qname);
21342 + child = instantiate(dir->d_inode, new, id, ptr);
21349 + if (!child || IS_ERR(child) || !child->d_inode)
21350 + goto end_instantiate;
21351 + inode = child->d_inode;
21353 + ino = inode->i_ino;
21354 + type = inode->i_mode >> 12;
21359 + ino = find_inode_number(dir, &qname);
21362 + return filldir(dirent, name, len, filp->f_pos, ino, type);
21367 +/* get and revalidate vx_info/xid */
21370 +struct vx_info *get_proc_vx_info(struct inode *inode)
21372 + return lookup_vx_info(PROC_I(inode)->fd);
21375 +static int proc_xid_revalidate(struct dentry *dentry, struct nameidata *nd)
21377 + struct inode *inode = dentry->d_inode;
21378 + xid_t xid = PROC_I(inode)->fd;
21380 + if (!xid || xid_is_hashed(xid))
21387 +/* get and revalidate nx_info/nid */
21389 +static int proc_nid_revalidate(struct dentry *dentry, struct nameidata *nd)
21391 + struct inode *inode = dentry->d_inode;
21392 + nid_t nid = PROC_I(inode)->fd;
21394 + if (!nid || nid_is_hashed(nid))
21402 +#define PROC_BLOCK_SIZE (PAGE_SIZE - 1024)
21404 +static ssize_t proc_vs_info_read(struct file *file, char __user *buf,
21405 + size_t count, loff_t *ppos)
21407 + struct inode *inode = file->f_dentry->d_inode;
21408 + unsigned long page;
21409 + ssize_t length = 0;
21411 + if (count > PROC_BLOCK_SIZE)
21412 + count = PROC_BLOCK_SIZE;
21414 + /* fade that out as soon as stable */
21415 + WARN_ON(PROC_I(inode)->fd);
21417 + if (!(page = __get_free_page(GFP_KERNEL)))
21420 + BUG_ON(!PROC_I(inode)->op.proc_vs_read);
21421 + length = PROC_I(inode)->op.proc_vs_read((char *)page);
21424 + length = simple_read_from_buffer(buf, count, ppos,
21425 + (char *)page, length);
21431 +static ssize_t proc_vx_info_read(struct file *file, char __user *buf,
21432 + size_t count, loff_t *ppos)
21434 + struct inode *inode = file->f_dentry->d_inode;
21435 + struct vx_info *vxi = NULL;
21436 + xid_t xid = PROC_I(inode)->fd;
21437 + unsigned long page;
21438 + ssize_t length = 0;
21440 + if (count > PROC_BLOCK_SIZE)
21441 + count = PROC_BLOCK_SIZE;
21443 + /* fade that out as soon as stable */
21445 + vxi = lookup_vx_info(xid);
21449 + length = -ENOMEM;
21450 + if (!(page = __get_free_page(GFP_KERNEL)))
21453 + BUG_ON(!PROC_I(inode)->op.proc_vxi_read);
21454 + length = PROC_I(inode)->op.proc_vxi_read(vxi, (char *)page);
21457 + length = simple_read_from_buffer(buf, count, ppos,
21458 + (char *)page, length);
21462 + put_vx_info(vxi);
21467 +static ssize_t proc_nx_info_read(struct file *file, char __user *buf,
21468 + size_t count, loff_t *ppos)
21470 + struct inode *inode = file->f_dentry->d_inode;
21471 + struct nx_info *nxi = NULL;
21472 + nid_t nid = PROC_I(inode)->fd;
21473 + unsigned long page;
21474 + ssize_t length = 0;
21476 + if (count > PROC_BLOCK_SIZE)
21477 + count = PROC_BLOCK_SIZE;
21479 + /* fade that out as soon as stable */
21481 + nxi = lookup_nx_info(nid);
21485 + length = -ENOMEM;
21486 + if (!(page = __get_free_page(GFP_KERNEL)))
21489 + BUG_ON(!PROC_I(inode)->op.proc_nxi_read);
21490 + length = PROC_I(inode)->op.proc_nxi_read(nxi, (char *)page);
21493 + length = simple_read_from_buffer(buf, count, ppos,
21494 + (char *)page, length);
21498 + put_nx_info(nxi);
21505 +/* here comes the lower level */
21508 +#define NOD(NAME, MODE, IOP, FOP, OP) { \
21509 + .len = sizeof(NAME) - 1, \
21510 + .name = (NAME), \
21518 +#define DIR(NAME, MODE, OTYPE) \
21519 + NOD(NAME, (S_IFDIR | (MODE)), \
21520 + &proc_ ## OTYPE ## _inode_operations, \
21521 + &proc_ ## OTYPE ## _file_operations, { } )
21523 +#define INF(NAME, MODE, OTYPE) \
21524 + NOD(NAME, (S_IFREG | (MODE)), NULL, \
21525 + &proc_vs_info_file_operations, \
21526 + { .proc_vs_read = &proc_##OTYPE } )
21528 +#define VINF(NAME, MODE, OTYPE) \
21529 + NOD(NAME, (S_IFREG | (MODE)), NULL, \
21530 + &proc_vx_info_file_operations, \
21531 + { .proc_vxi_read = &proc_##OTYPE } )
21533 +#define NINF(NAME, MODE, OTYPE) \
21534 + NOD(NAME, (S_IFREG | (MODE)), NULL, \
21535 + &proc_nx_info_file_operations, \
21536 + { .proc_nxi_read = &proc_##OTYPE } )
21539 +static struct file_operations proc_vs_info_file_operations = {
21540 + .read = proc_vs_info_read,
21543 +static struct file_operations proc_vx_info_file_operations = {
21544 + .read = proc_vx_info_read,
21547 +static struct dentry_operations proc_xid_dentry_operations = {
21548 + .d_revalidate = proc_xid_revalidate,
21551 +static struct vs_entry vx_base_stuff[] = {
21552 + VINF("info", S_IRUGO, vxi_info),
21553 + VINF("status", S_IRUGO, vxi_status),
21554 + VINF("limit", S_IRUGO, vxi_limit),
21555 + VINF("sched", S_IRUGO, vxi_sched),
21556 + VINF("nsproxy", S_IRUGO, vxi_nsproxy0),
21557 + VINF("nsproxy1",S_IRUGO, vxi_nsproxy1),
21558 + VINF("cvirt", S_IRUGO, vxi_cvirt),
21559 + VINF("cacct", S_IRUGO, vxi_cacct),
21566 +static struct dentry *proc_xid_instantiate(struct inode *dir,
21567 + struct dentry *dentry, int id, void *ptr)
21569 + dentry->d_op = &proc_xid_dentry_operations;
21570 + return vs_proc_instantiate(dir, dentry, id, ptr);
21573 +static struct dentry *proc_xid_lookup(struct inode *dir,
21574 + struct dentry *dentry, struct nameidata *nd)
21576 + struct vs_entry *p = vx_base_stuff;
21577 + struct dentry *error = ERR_PTR(-ENOENT);
21579 + for (; p->name; p++) {
21580 + if (p->len != dentry->d_name.len)
21582 + if (!memcmp(dentry->d_name.name, p->name, p->len))
21588 + error = proc_xid_instantiate(dir, dentry, PROC_I(dir)->fd, p);
21593 +static int proc_xid_readdir(struct file *filp,
21594 + void *dirent, filldir_t filldir)
21596 + struct dentry *dentry = filp->f_dentry;
21597 + struct inode *inode = dentry->d_inode;
21598 + struct vs_entry *p = vx_base_stuff;
21599 + int size = sizeof(vx_base_stuff) / sizeof(struct vs_entry);
21603 + pos = filp->f_pos;
21606 + ino = inode->i_ino;
21607 + if (filldir(dirent, ".", 1, pos, ino, DT_DIR) < 0)
21610 + /* fall through */
21612 + ino = parent_ino(dentry);
21613 + if (filldir(dirent, "..", 2, pos, ino, DT_DIR) < 0)
21616 + /* fall through */
21619 + if (index >= size)
21621 + for (p += index; p->name; p++) {
21622 + if (proc_fill_cache(filp, dirent, filldir, p->name, p->len,
21623 + vs_proc_instantiate, PROC_I(inode)->fd, p))
21629 + filp->f_pos = pos;
21635 +static struct file_operations proc_nx_info_file_operations = {
21636 + .read = proc_nx_info_read,
21639 +static struct dentry_operations proc_nid_dentry_operations = {
21640 + .d_revalidate = proc_nid_revalidate,
21643 +static struct vs_entry nx_base_stuff[] = {
21644 + NINF("info", S_IRUGO, nxi_info),
21645 + NINF("status", S_IRUGO, nxi_status),
21650 +static struct dentry *proc_nid_instantiate(struct inode *dir,
21651 + struct dentry *dentry, int id, void *ptr)
21653 + dentry->d_op = &proc_nid_dentry_operations;
21654 + return vs_proc_instantiate(dir, dentry, id, ptr);
21657 +static struct dentry *proc_nid_lookup(struct inode *dir,
21658 + struct dentry *dentry, struct nameidata *nd)
21660 + struct vs_entry *p = nx_base_stuff;
21661 + struct dentry *error = ERR_PTR(-ENOENT);
21663 + for (; p->name; p++) {
21664 + if (p->len != dentry->d_name.len)
21666 + if (!memcmp(dentry->d_name.name, p->name, p->len))
21672 + error = proc_nid_instantiate(dir, dentry, PROC_I(dir)->fd, p);
21677 +static int proc_nid_readdir(struct file *filp,
21678 + void *dirent, filldir_t filldir)
21680 + struct dentry *dentry = filp->f_dentry;
21681 + struct inode *inode = dentry->d_inode;
21682 + struct vs_entry *p = nx_base_stuff;
21683 + int size = sizeof(nx_base_stuff) / sizeof(struct vs_entry);
21687 + pos = filp->f_pos;
21690 + ino = inode->i_ino;
21691 + if (filldir(dirent, ".", 1, pos, ino, DT_DIR) < 0)
21694 + /* fall through */
21696 + ino = parent_ino(dentry);
21697 + if (filldir(dirent, "..", 2, pos, ino, DT_DIR) < 0)
21700 + /* fall through */
21703 + if (index >= size)
21705 + for (p += index; p->name; p++) {
21706 + if (proc_fill_cache(filp, dirent, filldir, p->name, p->len,
21707 + vs_proc_instantiate, PROC_I(inode)->fd, p))
21713 + filp->f_pos = pos;
21718 +#define MAX_MULBY10 ((~0U - 9) / 10)
21720 +static inline int atovid(const char *str, int len)
21725 + while (len-- > 0) {
21730 + if (vid >= MAX_MULBY10)
21740 +/* now the upper level (virtual) */
21743 +static struct file_operations proc_xid_file_operations = {
21744 + .read = generic_read_dir,
21745 + .readdir = proc_xid_readdir,
21748 +static struct inode_operations proc_xid_inode_operations = {
21749 + .lookup = proc_xid_lookup,
21752 +static struct vs_entry vx_virtual_stuff[] = {
21753 + INF("info", S_IRUGO, virtual_info),
21754 + INF("status", S_IRUGO, virtual_status),
21755 + DIR(NULL, S_IRUGO | S_IXUGO, xid),
21759 +static struct dentry *proc_virtual_lookup(struct inode *dir,
21760 + struct dentry *dentry, struct nameidata *nd)
21762 + struct vs_entry *p = vx_virtual_stuff;
21763 + struct dentry *error = ERR_PTR(-ENOENT);
21766 + for (; p->name; p++) {
21767 + if (p->len != dentry->d_name.len)
21769 + if (!memcmp(dentry->d_name.name, p->name, p->len))
21773 + goto instantiate;
21775 + id = atovid(dentry->d_name.name, dentry->d_name.len);
21776 + if ((id < 0) || !xid_is_hashed(id))
21780 + error = proc_xid_instantiate(dir, dentry, id, p);
21785 +static struct file_operations proc_nid_file_operations = {
21786 + .read = generic_read_dir,
21787 + .readdir = proc_nid_readdir,
21790 +static struct inode_operations proc_nid_inode_operations = {
21791 + .lookup = proc_nid_lookup,
21794 +static struct vs_entry nx_virtnet_stuff[] = {
21795 + INF("info", S_IRUGO, virtnet_info),
21796 + INF("status", S_IRUGO, virtnet_status),
21797 + DIR(NULL, S_IRUGO | S_IXUGO, nid),
21801 +static struct dentry *proc_virtnet_lookup(struct inode *dir,
21802 + struct dentry *dentry, struct nameidata *nd)
21804 + struct vs_entry *p = nx_virtnet_stuff;
21805 + struct dentry *error = ERR_PTR(-ENOENT);
21808 + for (; p->name; p++) {
21809 + if (p->len != dentry->d_name.len)
21811 + if (!memcmp(dentry->d_name.name, p->name, p->len))
21815 + goto instantiate;
21817 + id = atovid(dentry->d_name.name, dentry->d_name.len);
21818 + if ((id < 0) || !nid_is_hashed(id))
21822 + error = proc_nid_instantiate(dir, dentry, id, p);
21828 +#define PROC_MAXVIDS 32
21830 +int proc_virtual_readdir(struct file *filp,
21831 + void *dirent, filldir_t filldir)
21833 + struct dentry *dentry = filp->f_dentry;
21834 + struct inode *inode = dentry->d_inode;
21835 + struct vs_entry *p = vx_virtual_stuff;
21836 + int size = sizeof(vx_virtual_stuff) / sizeof(struct vs_entry);
21838 + unsigned int xid_array[PROC_MAXVIDS];
21839 + char buf[PROC_NUMBUF];
21840 + unsigned int nr_xids, i;
21843 + pos = filp->f_pos;
21846 + ino = inode->i_ino;
21847 + if (filldir(dirent, ".", 1, pos, ino, DT_DIR) < 0)
21850 + /* fall through */
21852 + ino = parent_ino(dentry);
21853 + if (filldir(dirent, "..", 2, pos, ino, DT_DIR) < 0)
21856 + /* fall through */
21859 + if (index >= size)
21861 + for (p += index; p->name; p++) {
21862 + if (proc_fill_cache(filp, dirent, filldir, p->name, p->len,
21863 + vs_proc_instantiate, 0, p))
21868 + index = pos - size;
21869 + p = &vx_virtual_stuff[size - 1];
21870 + nr_xids = get_xid_list(index, xid_array, PROC_MAXVIDS);
21871 + for (i = 0; i < nr_xids; i++) {
21872 + int n, xid = xid_array[i];
21873 + unsigned int j = PROC_NUMBUF;
21877 + buf[--j] = '0' + (n % 10);
21880 + if (proc_fill_cache(filp, dirent, filldir,
21881 + buf + j, PROC_NUMBUF - j,
21882 + vs_proc_instantiate, xid, p))
21888 + filp->f_pos = pos;
21892 +static int proc_virtual_getattr(struct vfsmount *mnt,
21893 + struct dentry *dentry, struct kstat *stat)
21895 + struct inode *inode = dentry->d_inode;
21897 + generic_fillattr(inode, stat);
21898 + stat->nlink = 2 + atomic_read(&vx_global_cactive);
21902 +static struct file_operations proc_virtual_dir_operations = {
21903 + .read = generic_read_dir,
21904 + .readdir = proc_virtual_readdir,
21907 +static struct inode_operations proc_virtual_dir_inode_operations = {
21908 + .getattr = proc_virtual_getattr,
21909 + .lookup = proc_virtual_lookup,
21916 +int proc_virtnet_readdir(struct file *filp,
21917 + void *dirent, filldir_t filldir)
21919 + struct dentry *dentry = filp->f_dentry;
21920 + struct inode *inode = dentry->d_inode;
21921 + struct vs_entry *p = nx_virtnet_stuff;
21922 + int size = sizeof(nx_virtnet_stuff) / sizeof(struct vs_entry);
21924 + unsigned int nid_array[PROC_MAXVIDS];
21925 + char buf[PROC_NUMBUF];
21926 + unsigned int nr_nids, i;
21929 + pos = filp->f_pos;
21932 + ino = inode->i_ino;
21933 + if (filldir(dirent, ".", 1, pos, ino, DT_DIR) < 0)
21936 + /* fall through */
21938 + ino = parent_ino(dentry);
21939 + if (filldir(dirent, "..", 2, pos, ino, DT_DIR) < 0)
21942 + /* fall through */
21945 + if (index >= size)
21947 + for (p += index; p->name; p++) {
21948 + if (proc_fill_cache(filp, dirent, filldir, p->name, p->len,
21949 + vs_proc_instantiate, 0, p))
21954 + index = pos - size;
21955 + p = &nx_virtnet_stuff[size - 1];
21956 + nr_nids = get_nid_list(index, nid_array, PROC_MAXVIDS);
21957 + for (i = 0; i < nr_nids; i++) {
21958 + int n, nid = nid_array[i];
21959 + unsigned int j = PROC_NUMBUF;
21963 + buf[--j] = '0' + (n % 10);
21966 + if (proc_fill_cache(filp, dirent, filldir,
21967 + buf + j, PROC_NUMBUF - j,
21968 + vs_proc_instantiate, nid, p))
21974 + filp->f_pos = pos;
21978 +static int proc_virtnet_getattr(struct vfsmount *mnt,
21979 + struct dentry *dentry, struct kstat *stat)
21981 + struct inode *inode = dentry->d_inode;
21983 + generic_fillattr(inode, stat);
21984 + stat->nlink = 2 + atomic_read(&nx_global_cactive);
21988 +static struct file_operations proc_virtnet_dir_operations = {
21989 + .read = generic_read_dir,
21990 + .readdir = proc_virtnet_readdir,
21993 +static struct inode_operations proc_virtnet_dir_inode_operations = {
21994 + .getattr = proc_virtnet_getattr,
21995 + .lookup = proc_virtnet_lookup,
22000 +void proc_vx_init(void)
22002 + struct proc_dir_entry *ent;
22004 + ent = proc_mkdir("virtual", 0);
22006 + ent->proc_fops = &proc_virtual_dir_operations;
22007 + ent->proc_iops = &proc_virtual_dir_inode_operations;
22009 + proc_virtual = ent;
22011 + ent = proc_mkdir("virtnet", 0);
22013 + ent->proc_fops = &proc_virtnet_dir_operations;
22014 + ent->proc_iops = &proc_virtnet_dir_inode_operations;
22016 + proc_virtnet = ent;
22022 +/* per pid info */
22025 +int proc_pid_vx_info(struct task_struct *p, char *buffer)
22027 + struct vx_info *vxi;
22028 + char *orig = buffer;
22030 + buffer += sprintf(buffer, "XID:\t%d\n", vx_task_xid(p));
22032 + vxi = task_get_vx_info(p);
22036 + buffer += sprintf(buffer, "BCaps:\t");
22037 + buffer = print_cap_t(buffer, &vxi->vx_bcaps);
22038 + buffer += sprintf(buffer, "\n");
22039 + buffer += sprintf(buffer, "CCaps:\t%016llx\n",
22040 + (unsigned long long)vxi->vx_ccaps);
22041 + buffer += sprintf(buffer, "CFlags:\t%016llx\n",
22042 + (unsigned long long)vxi->vx_flags);
22043 + buffer += sprintf(buffer, "CIPid:\t%d\n", vxi->vx_initpid);
22045 + put_vx_info(vxi);
22047 + return buffer - orig;
22051 +int proc_pid_nx_info(struct task_struct *p, char *buffer)
22053 + struct nx_info *nxi;
22054 + struct nx_addr_v4 *v4a;
22055 +#ifdef CONFIG_IPV6
22056 + struct nx_addr_v6 *v6a;
22058 + char *orig = buffer;
22061 + buffer += sprintf(buffer, "NID:\t%d\n", nx_task_nid(p));
22063 + nxi = task_get_nx_info(p);
22067 + buffer += sprintf(buffer, "NCaps:\t%016llx\n",
22068 + (unsigned long long)nxi->nx_ncaps);
22069 + buffer += sprintf(buffer, "NFlags:\t%016llx\n",
22070 + (unsigned long long)nxi->nx_flags);
22072 + buffer += sprintf(buffer,
22073 + "V4Root[bcast]:\t" NIPQUAD_FMT "\n",
22074 + NIPQUAD(nxi->v4_bcast.s_addr));
22075 + buffer += sprintf (buffer,
22076 + "V4Root[lback]:\t" NIPQUAD_FMT "\n",
22077 + NIPQUAD(nxi->v4_lback.s_addr));
22078 + if (!NX_IPV4(nxi))
22080 + for (i = 0, v4a = &nxi->v4; v4a; i++, v4a = v4a->next)
22081 + buffer += sprintf(buffer, "V4Root[%d]:\t" NXAV4_FMT "\n",
22084 +#ifdef CONFIG_IPV6
22085 + if (!NX_IPV6(nxi))
22087 + for (i = 0, v6a = &nxi->v6; v6a; i++, v6a = v6a->next)
22088 + buffer += sprintf(buffer, "V6Root[%d]:\t" NXAV6_FMT "\n",
22092 + put_nx_info(nxi);
22094 + return buffer - orig;
22097 diff -NurpP --minimal linux-3.5/kernel/vserver/sched.c linux-3.5-vs2.3.4/kernel/vserver/sched.c
22098 --- linux-3.5/kernel/vserver/sched.c 1970-01-01 01:00:00.000000000 +0100
22099 +++ linux-3.5-vs2.3.4/kernel/vserver/sched.c 2012-07-23 01:45:55.000000000 +0200
22102 + * linux/kernel/vserver/sched.c
22104 + * Virtual Server: Scheduler Support
22106 + * Copyright (C) 2004-2010 Herbert Pötzl
22108 + * V0.01 adapted Sam Vilains version to 2.6.3
22109 + * V0.02 removed legacy interface
22110 + * V0.03 changed vcmds to vxi arg
22111 + * V0.04 removed older and legacy interfaces
22112 + * V0.05 removed scheduler code/commands
22116 +#include <linux/vs_context.h>
22117 +#include <linux/vs_sched.h>
22118 +#include <linux/cpumask.h>
22119 +#include <linux/vserver/sched_cmd.h>
22121 +#include <asm/uaccess.h>
22124 +void vx_update_sched_param(struct _vx_sched *sched,
22125 + struct _vx_sched_pc *sched_pc)
22127 + sched_pc->prio_bias = sched->prio_bias;
22130 +static int do_set_prio_bias(struct vx_info *vxi, struct vcmd_prio_bias *data)
22134 + if (data->prio_bias > MAX_PRIO_BIAS)
22135 + data->prio_bias = MAX_PRIO_BIAS;
22136 + if (data->prio_bias < MIN_PRIO_BIAS)
22137 + data->prio_bias = MIN_PRIO_BIAS;
22139 + if (data->cpu_id != ~0) {
22140 + vxi->sched.update = cpumask_of_cpu(data->cpu_id);
22141 + cpumask_and(&vxi->sched.update, &vxi->sched.update,
22142 + cpu_online_mask);
22144 + cpumask_copy(&vxi->sched.update, cpu_online_mask);
22146 + for_each_cpu_mask(cpu, vxi->sched.update)
22147 + vx_update_sched_param(&vxi->sched,
22148 + &vx_per_cpu(vxi, sched_pc, cpu));
22152 +int vc_set_prio_bias(struct vx_info *vxi, void __user *data)
22154 + struct vcmd_prio_bias vc_data;
22156 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
22159 + return do_set_prio_bias(vxi, &vc_data);
22162 +int vc_get_prio_bias(struct vx_info *vxi, void __user *data)
22164 + struct vcmd_prio_bias vc_data;
22165 + struct _vx_sched_pc *pcd;
22168 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
22171 + cpu = vc_data.cpu_id;
22173 + if (!cpu_possible(cpu))
22176 + pcd = &vx_per_cpu(vxi, sched_pc, cpu);
22177 + vc_data.prio_bias = pcd->prio_bias;
22179 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
22184 diff -NurpP --minimal linux-3.5/kernel/vserver/sched_init.h linux-3.5-vs2.3.4/kernel/vserver/sched_init.h
22185 --- linux-3.5/kernel/vserver/sched_init.h 1970-01-01 01:00:00.000000000 +0100
22186 +++ linux-3.5-vs2.3.4/kernel/vserver/sched_init.h 2012-07-23 01:45:55.000000000 +0200
22189 +static inline void vx_info_init_sched(struct _vx_sched *sched)
22191 + /* scheduling; hard code starting values as constants */
22192 + sched->prio_bias = 0;
22196 +void vx_info_init_sched_pc(struct _vx_sched_pc *sched_pc, int cpu)
22198 + sched_pc->prio_bias = 0;
22200 + sched_pc->user_ticks = 0;
22201 + sched_pc->sys_ticks = 0;
22202 + sched_pc->hold_ticks = 0;
22205 +static inline void vx_info_exit_sched(struct _vx_sched *sched)
22211 +void vx_info_exit_sched_pc(struct _vx_sched_pc *sched_pc, int cpu)
22215 diff -NurpP --minimal linux-3.5/kernel/vserver/sched_proc.h linux-3.5-vs2.3.4/kernel/vserver/sched_proc.h
22216 --- linux-3.5/kernel/vserver/sched_proc.h 1970-01-01 01:00:00.000000000 +0100
22217 +++ linux-3.5-vs2.3.4/kernel/vserver/sched_proc.h 2012-07-23 01:45:55.000000000 +0200
22219 +#ifndef _VX_SCHED_PROC_H
22220 +#define _VX_SCHED_PROC_H
22224 +int vx_info_proc_sched(struct _vx_sched *sched, char *buffer)
22228 + length += sprintf(buffer,
22229 + "PrioBias:\t%8d\n",
22230 + sched->prio_bias);
22235 +int vx_info_proc_sched_pc(struct _vx_sched_pc *sched_pc,
22236 + char *buffer, int cpu)
22240 + length += sprintf(buffer + length,
22241 + "cpu %d: %lld %lld %lld", cpu,
22242 + (unsigned long long)sched_pc->user_ticks,
22243 + (unsigned long long)sched_pc->sys_ticks,
22244 + (unsigned long long)sched_pc->hold_ticks);
22245 + length += sprintf(buffer + length,
22246 + " %d\n", sched_pc->prio_bias);
22250 +#endif /* _VX_SCHED_PROC_H */
22251 diff -NurpP --minimal linux-3.5/kernel/vserver/signal.c linux-3.5-vs2.3.4/kernel/vserver/signal.c
22252 --- linux-3.5/kernel/vserver/signal.c 1970-01-01 01:00:00.000000000 +0100
22253 +++ linux-3.5-vs2.3.4/kernel/vserver/signal.c 2012-07-23 01:45:55.000000000 +0200
22256 + * linux/kernel/vserver/signal.c
22258 + * Virtual Server: Signal Support
22260 + * Copyright (C) 2003-2007 Herbert Pötzl
22262 + * V0.01 broken out from vcontext V0.05
22263 + * V0.02 changed vcmds to vxi arg
22264 + * V0.03 adjusted siginfo for kill
22268 +#include <asm/uaccess.h>
22270 +#include <linux/vs_context.h>
22271 +#include <linux/vs_pid.h>
22272 +#include <linux/vserver/signal_cmd.h>
22275 +int vx_info_kill(struct vx_info *vxi, int pid, int sig)
22277 + int retval, count = 0;
22278 + struct task_struct *p;
22279 + struct siginfo *sip = SEND_SIG_PRIV;
22282 + vxdprintk(VXD_CBIT(misc, 4),
22283 + "vx_info_kill(%p[#%d],%d,%d)*",
22284 + vxi, vxi->vx_id, pid, sig);
22285 + read_lock(&tasklist_lock);
22289 + for_each_process(p) {
22292 + if (vx_task_xid(p) != vxi->vx_id || p->pid <= 1 ||
22293 + (pid && vxi->vx_initpid == p->pid))
22296 + err = group_send_sig_info(sig, sip, p);
22298 + if (err != -EPERM)
22304 + if (vxi->vx_initpid) {
22305 + pid = vxi->vx_initpid;
22306 + /* for now, only SIGINT to private init ... */
22307 + if (!vx_info_flags(vxi, VXF_STATE_ADMIN, 0) &&
22308 + /* ... as long as there are tasks left */
22309 + (atomic_read(&vxi->vx_tasks) > 1))
22312 + /* fallthrough */
22315 + p = find_task_by_real_pid(pid);
22316 + rcu_read_unlock();
22318 + if (vx_task_xid(p) == vxi->vx_id)
22319 + retval = group_send_sig_info(sig, sip, p);
22323 + read_unlock(&tasklist_lock);
22324 + vxdprintk(VXD_CBIT(misc, 4),
22325 + "vx_info_kill(%p[#%d],%d,%d,%ld) = %d",
22326 + vxi, vxi->vx_id, pid, sig, (long)sip, retval);
22330 +int vc_ctx_kill(struct vx_info *vxi, void __user *data)
22332 + struct vcmd_ctx_kill_v0 vc_data;
22334 + if (copy_from_user(&vc_data, data, sizeof(vc_data)))
22337 + /* special check to allow guest shutdown */
22338 + if (!vx_info_flags(vxi, VXF_STATE_ADMIN, 0) &&
22339 + /* forbid killall pid=0 when init is present */
22340 + (((vc_data.pid < 1) && vxi->vx_initpid) ||
22341 + (vc_data.pid > 1)))
22344 + return vx_info_kill(vxi, vc_data.pid, vc_data.sig);
22348 +static int __wait_exit(struct vx_info *vxi)
22350 + DECLARE_WAITQUEUE(wait, current);
22353 + add_wait_queue(&vxi->vx_wait, &wait);
22354 + set_current_state(TASK_INTERRUPTIBLE);
22357 + if (vx_info_state(vxi,
22358 + VXS_SHUTDOWN | VXS_HASHED | VXS_HELPER) == VXS_SHUTDOWN)
22360 + if (signal_pending(current)) {
22361 + ret = -ERESTARTSYS;
22368 + set_current_state(TASK_RUNNING);
22369 + remove_wait_queue(&vxi->vx_wait, &wait);
22375 +int vc_wait_exit(struct vx_info *vxi, void __user *data)
22377 + struct vcmd_wait_exit_v0 vc_data;
22380 + ret = __wait_exit(vxi);
22381 + vc_data.reboot_cmd = vxi->reboot_cmd;
22382 + vc_data.exit_code = vxi->exit_code;
22384 + if (copy_to_user(data, &vc_data, sizeof(vc_data)))
22389 diff -NurpP --minimal linux-3.5/kernel/vserver/space.c linux-3.5-vs2.3.4/kernel/vserver/space.c
22390 --- linux-3.5/kernel/vserver/space.c 1970-01-01 01:00:00.000000000 +0100
22391 +++ linux-3.5-vs2.3.4/kernel/vserver/space.c 2012-07-23 01:45:55.000000000 +0200
22394 + * linux/kernel/vserver/space.c
22396 + * Virtual Server: Context Space Support
22398 + * Copyright (C) 2003-2010 Herbert Pötzl
22400 + * V0.01 broken out from context.c 0.07
22401 + * V0.02 added task locking for namespace
22402 + * V0.03 broken out vx_enter_namespace
22403 + * V0.04 added *space support and commands
22404 + * V0.05 added credential support
22408 +#include <linux/utsname.h>
22409 +#include <linux/nsproxy.h>
22410 +#include <linux/err.h>
22411 +#include <linux/fs_struct.h>
22412 +#include <linux/cred.h>
22413 +#include <asm/uaccess.h>
22415 +#include <linux/vs_context.h>
22416 +#include <linux/vserver/space.h>
22417 +#include <linux/vserver/space_cmd.h>
22419 +atomic_t vs_global_nsproxy = ATOMIC_INIT(0);
22420 +atomic_t vs_global_fs = ATOMIC_INIT(0);
22421 +atomic_t vs_global_mnt_ns = ATOMIC_INIT(0);
22422 +atomic_t vs_global_uts_ns = ATOMIC_INIT(0);
22423 +atomic_t vs_global_user_ns = ATOMIC_INIT(0);
22424 +atomic_t vs_global_pid_ns = ATOMIC_INIT(0);
22427 +/* namespace functions */
22429 +#include <linux/mnt_namespace.h>
22430 +#include <linux/user_namespace.h>
22431 +#include <linux/pid_namespace.h>
22432 +#include <linux/ipc_namespace.h>
22433 +#include <net/net_namespace.h>
22434 +#include "../fs/mount.h"
22437 +static const struct vcmd_space_mask_v1 space_mask_v0 = {
22438 + .mask = CLONE_FS |
22440 +#ifdef CONFIG_UTS_NS
22443 +#ifdef CONFIG_IPC_NS
22446 +#ifdef CONFIG_USER_NS
22452 +static const struct vcmd_space_mask_v1 space_mask = {
22453 + .mask = CLONE_FS |
22455 +#ifdef CONFIG_UTS_NS
22458 +#ifdef CONFIG_IPC_NS
22461 +#ifdef CONFIG_USER_NS
22464 +#ifdef CONFIG_PID_NS
22467 +#ifdef CONFIG_NET_NS
22473 +static const struct vcmd_space_mask_v1 default_space_mask = {
22474 + .mask = CLONE_FS |
22476 +#ifdef CONFIG_UTS_NS
22479 +#ifdef CONFIG_IPC_NS
22482 +#ifdef CONFIG_USER_NS
22485 +#ifdef CONFIG_PID_NS
22492 + * build a new nsproxy mix
22493 + * assumes that both proxies are 'const'
22494 + * does not touch nsproxy refcounts
22495 + * will hold a reference on the result.
22498 +struct nsproxy *vs_mix_nsproxy(struct nsproxy *old_nsproxy,
22499 + struct nsproxy *new_nsproxy, unsigned long mask)
22501 + struct mnt_namespace *old_ns;
22502 + struct uts_namespace *old_uts;
22503 + struct ipc_namespace *old_ipc;
22504 +#ifdef CONFIG_PID_NS
22505 + struct pid_namespace *old_pid;
22507 +#ifdef CONFIG_NET_NS
22508 + struct net *old_net;
22510 + struct nsproxy *nsproxy;
22512 + nsproxy = copy_nsproxy(old_nsproxy);
22516 + if (mask & CLONE_NEWNS) {
22517 + old_ns = nsproxy->mnt_ns;
22518 + nsproxy->mnt_ns = new_nsproxy->mnt_ns;
22519 + if (nsproxy->mnt_ns)
22520 + get_mnt_ns(nsproxy->mnt_ns);
22524 + if (mask & CLONE_NEWUTS) {
22525 + old_uts = nsproxy->uts_ns;
22526 + nsproxy->uts_ns = new_nsproxy->uts_ns;
22527 + if (nsproxy->uts_ns)
22528 + get_uts_ns(nsproxy->uts_ns);
22532 + if (mask & CLONE_NEWIPC) {
22533 + old_ipc = nsproxy->ipc_ns;
22534 + nsproxy->ipc_ns = new_nsproxy->ipc_ns;
22535 + if (nsproxy->ipc_ns)
22536 + get_ipc_ns(nsproxy->ipc_ns);
22540 +#ifdef CONFIG_PID_NS
22541 + if (mask & CLONE_NEWPID) {
22542 + old_pid = nsproxy->pid_ns;
22543 + nsproxy->pid_ns = new_nsproxy->pid_ns;
22544 + if (nsproxy->pid_ns)
22545 + get_pid_ns(nsproxy->pid_ns);
22549 +#ifdef CONFIG_NET_NS
22550 + if (mask & CLONE_NEWNET) {
22551 + old_net = nsproxy->net_ns;
22552 + nsproxy->net_ns = new_nsproxy->net_ns;
22553 + if (nsproxy->net_ns)
22554 + get_net(nsproxy->net_ns);
22559 + put_mnt_ns(old_ns);
22561 + put_uts_ns(old_uts);
22563 + put_ipc_ns(old_ipc);
22564 +#ifdef CONFIG_PID_NS
22566 + put_pid_ns(old_pid);
22568 +#ifdef CONFIG_NET_NS
22570 + put_net(old_net);
22578 + * merge two nsproxy structs into a new one.
22579 + * will hold a reference on the result.
22583 +struct nsproxy *__vs_merge_nsproxy(struct nsproxy *old,
22584 + struct nsproxy *proxy, unsigned long mask)
22586 + struct nsproxy null_proxy = { .mnt_ns = NULL };
22592 + /* vs_mix_nsproxy returns with reference */
22593 + return vs_mix_nsproxy(old ? old : &null_proxy,
22596 + get_nsproxy(proxy);
22601 +int vx_enter_space(struct vx_info *vxi, unsigned long mask, unsigned index)
22603 + struct nsproxy *proxy, *proxy_cur, *proxy_new;
22604 + struct fs_struct *fs_cur, *fs = NULL;
22605 + struct _vx_space *space;
22606 + int ret, kill = 0;
22608 + vxdprintk(VXD_CBIT(space, 8), "vx_enter_space(%p[#%u],0x%08lx,%d)",
22609 + vxi, vxi->vx_id, mask, index);
22611 + if (vx_info_flags(vxi, VXF_INFO_PRIVATE, 0))
22614 + if (index >= VX_SPACES)
22617 + space = &vxi->space[index];
22620 + mask = space->vx_nsmask;
22622 + if ((mask & space->vx_nsmask) != mask)
22625 + if (mask & CLONE_FS) {
22626 + fs = copy_fs_struct(space->vx_fs);
22630 + proxy = space->vx_nsproxy;
22632 + vxdprintk(VXD_CBIT(space, 9),
22633 + "vx_enter_space(%p[#%u],0x%08lx,%d) -> (%p,%p)",
22634 + vxi, vxi->vx_id, mask, index, proxy, fs);
22636 + task_lock(current);
22637 + fs_cur = current->fs;
22639 + if (mask & CLONE_FS) {
22640 + spin_lock(&fs_cur->lock);
22641 + current->fs = fs;
22642 + kill = !--fs_cur->users;
22643 + spin_unlock(&fs_cur->lock);
22646 + proxy_cur = current->nsproxy;
22647 + get_nsproxy(proxy_cur);
22648 + task_unlock(current);
22651 + free_fs_struct(fs_cur);
22653 + proxy_new = __vs_merge_nsproxy(proxy_cur, proxy, mask);
22654 + if (IS_ERR(proxy_new)) {
22655 + ret = PTR_ERR(proxy_new);
22659 + proxy_new = xchg(¤t->nsproxy, proxy_new);
22661 + if (mask & CLONE_NEWUSER) {
22662 + struct cred *cred;
22664 + vxdprintk(VXD_CBIT(space, 10),
22665 + "vx_enter_space(%p[#%u],%p) cred (%p,%p)",
22666 + vxi, vxi->vx_id, space->vx_cred,
22667 + current->real_cred, current->cred);
22669 + if (space->vx_cred) {
22670 + cred = __prepare_creds(space->vx_cred);
22672 + commit_creds(cred);
22679 + put_nsproxy(proxy_new);
22682 + put_nsproxy(proxy_cur);
22687 +int vx_set_space(struct vx_info *vxi, unsigned long mask, unsigned index)
22689 + struct nsproxy *proxy_vxi, *proxy_cur, *proxy_new;
22690 + struct fs_struct *fs_vxi, *fs;
22691 + struct _vx_space *space;
22692 + int ret, kill = 0;
22694 + vxdprintk(VXD_CBIT(space, 8), "vx_set_space(%p[#%u],0x%08lx,%d)",
22695 + vxi, vxi->vx_id, mask, index);
22697 + if ((mask & space_mask.mask) != mask)
22700 + if (index >= VX_SPACES)
22703 + space = &vxi->space[index];
22705 + proxy_vxi = space->vx_nsproxy;
22706 + fs_vxi = space->vx_fs;
22708 + if (mask & CLONE_FS) {
22709 + fs = copy_fs_struct(current->fs);
22714 + task_lock(current);
22716 + if (mask & CLONE_FS) {
22717 + spin_lock(&fs_vxi->lock);
22718 + space->vx_fs = fs;
22719 + kill = !--fs_vxi->users;
22720 + spin_unlock(&fs_vxi->lock);
22723 + proxy_cur = current->nsproxy;
22724 + get_nsproxy(proxy_cur);
22725 + task_unlock(current);
22728 + free_fs_struct(fs_vxi);
22730 + proxy_new = __vs_merge_nsproxy(proxy_vxi, proxy_cur, mask);
22731 + if (IS_ERR(proxy_new)) {
22732 + ret = PTR_ERR(proxy_new);
22736 + proxy_new = xchg(&space->vx_nsproxy, proxy_new);
22737 + space->vx_nsmask |= mask;
22739 + if (mask & CLONE_NEWUSER) {
22740 + struct cred *cred;
22742 + vxdprintk(VXD_CBIT(space, 10),
22743 + "vx_set_space(%p[#%u],%p) cred (%p,%p)",
22744 + vxi, vxi->vx_id, space->vx_cred,
22745 + current->real_cred, current->cred);
22747 + cred = prepare_creds();
22748 + cred = (struct cred *)xchg(&space->vx_cred, cred);
22750 + abort_creds(cred);
22756 + put_nsproxy(proxy_new);
22759 + put_nsproxy(proxy_cur);
22764 +int vc_enter_space_v1(struct vx_info *vxi, void __user *data)
22766 + struct vcmd_space_mask_v1 vc_data = { .mask = 0 };
22768 + if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
22771 + return vx_enter_space(vxi, vc_data.mask, 0);
22774 +int vc_enter_space(struct vx_info *vxi, void __user *data)
22776 + struct vcmd_space_mask_v2 vc_data = { .mask = 0 };
22778 + if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
22781 + if (vc_data.index >= VX_SPACES)
22784 + return vx_enter_space(vxi, vc_data.mask, vc_data.index);
22787 +int vc_set_space_v1(struct vx_info *vxi, void __user *data)
22789 + struct vcmd_space_mask_v1 vc_data = { .mask = 0 };
22791 + if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
22794 + return vx_set_space(vxi, vc_data.mask, 0);
22797 +int vc_set_space(struct vx_info *vxi, void __user *data)
22799 + struct vcmd_space_mask_v2 vc_data = { .mask = 0 };
22801 + if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
22804 + if (vc_data.index >= VX_SPACES)
22807 + return vx_set_space(vxi, vc_data.mask, vc_data.index);
22810 +int vc_get_space_mask(void __user *data, int type)
22812 + const struct vcmd_space_mask_v1 *mask;
22815 + mask = &space_mask_v0;
22816 + else if (type == 1)
22817 + mask = &space_mask;
22819 + mask = &default_space_mask;
22821 + vxdprintk(VXD_CBIT(space, 10),
22822 + "vc_get_space_mask(%d) = %08llx", type, mask->mask);
22824 + if (copy_to_user(data, mask, sizeof(*mask)))
22829 diff -NurpP --minimal linux-3.5/kernel/vserver/switch.c linux-3.5-vs2.3.4/kernel/vserver/switch.c
22830 --- linux-3.5/kernel/vserver/switch.c 1970-01-01 01:00:00.000000000 +0100
22831 +++ linux-3.5-vs2.3.4/kernel/vserver/switch.c 2012-07-23 01:45:55.000000000 +0200
22834 + * linux/kernel/vserver/switch.c
22836 + * Virtual Server: Syscall Switch
22838 + * Copyright (C) 2003-2011 Herbert Pötzl
22840 + * V0.01 syscall switch
22841 + * V0.02 added signal to context
22842 + * V0.03 added rlimit functions
22843 + * V0.04 added iattr, task/xid functions
22844 + * V0.05 added debug/history stuff
22845 + * V0.06 added compat32 layer
22846 + * V0.07 vcmd args and perms
22847 + * V0.08 added status commands
22848 + * V0.09 added tag commands
22849 + * V0.10 added oom bias
22850 + * V0.11 added device commands
22851 + * V0.12 added warn mask
22855 +#include <linux/vs_context.h>
22856 +#include <linux/vs_network.h>
22857 +#include <linux/vserver/switch.h>
22859 +#include "vci_config.h"
22863 +int vc_get_version(uint32_t id)
22865 + return VCI_VERSION;
22869 +int vc_get_vci(uint32_t id)
22871 + return vci_kernel_config();
22874 +#include <linux/vserver/context_cmd.h>
22875 +#include <linux/vserver/cvirt_cmd.h>
22876 +#include <linux/vserver/cacct_cmd.h>
22877 +#include <linux/vserver/limit_cmd.h>
22878 +#include <linux/vserver/network_cmd.h>
22879 +#include <linux/vserver/sched_cmd.h>
22880 +#include <linux/vserver/debug_cmd.h>
22881 +#include <linux/vserver/inode_cmd.h>
22882 +#include <linux/vserver/dlimit_cmd.h>
22883 +#include <linux/vserver/signal_cmd.h>
22884 +#include <linux/vserver/space_cmd.h>
22885 +#include <linux/vserver/tag_cmd.h>
22886 +#include <linux/vserver/device_cmd.h>
22888 +#include <linux/vserver/inode.h>
22889 +#include <linux/vserver/dlimit.h>
22892 +#ifdef CONFIG_COMPAT
22893 +#define __COMPAT(name, id, data, compat) \
22894 + (compat) ? name ## _x32(id, data) : name(id, data)
22895 +#define __COMPAT_NO_ID(name, data, compat) \
22896 + (compat) ? name ## _x32(data) : name(data)
22898 +#define __COMPAT(name, id, data, compat) \
22900 +#define __COMPAT_NO_ID(name, data, compat) \
22906 +long do_vcmd(uint32_t cmd, uint32_t id,
22907 + struct vx_info *vxi, struct nx_info *nxi,
22908 + void __user *data, int compat)
22912 + case VCMD_get_version:
22913 + return vc_get_version(id);
22914 + case VCMD_get_vci:
22915 + return vc_get_vci(id);
22917 + case VCMD_task_xid:
22918 + return vc_task_xid(id);
22919 + case VCMD_vx_info:
22920 + return vc_vx_info(vxi, data);
22922 + case VCMD_task_nid:
22923 + return vc_task_nid(id);
22924 + case VCMD_nx_info:
22925 + return vc_nx_info(nxi, data);
22927 + case VCMD_task_tag:
22928 + return vc_task_tag(id);
22930 + case VCMD_set_space_v1:
22931 + return vc_set_space_v1(vxi, data);
22932 + /* this is version 2 */
22933 + case VCMD_set_space:
22934 + return vc_set_space(vxi, data);
22936 + case VCMD_get_space_mask_v0:
22937 + return vc_get_space_mask(data, 0);
22938 + /* this is version 1 */
22939 + case VCMD_get_space_mask:
22940 + return vc_get_space_mask(data, 1);
22942 + case VCMD_get_space_default:
22943 + return vc_get_space_mask(data, -1);
22945 + case VCMD_set_umask:
22946 + return vc_set_umask(vxi, data);
22948 + case VCMD_get_umask:
22949 + return vc_get_umask(vxi, data);
22951 + case VCMD_set_wmask:
22952 + return vc_set_wmask(vxi, data);
22954 + case VCMD_get_wmask:
22955 + return vc_get_wmask(vxi, data);
22956 +#ifdef CONFIG_IA32_EMULATION
22957 + case VCMD_get_rlimit:
22958 + return __COMPAT(vc_get_rlimit, vxi, data, compat);
22959 + case VCMD_set_rlimit:
22960 + return __COMPAT(vc_set_rlimit, vxi, data, compat);
22962 + case VCMD_get_rlimit:
22963 + return vc_get_rlimit(vxi, data);
22964 + case VCMD_set_rlimit:
22965 + return vc_set_rlimit(vxi, data);
22967 + case VCMD_get_rlimit_mask:
22968 + return vc_get_rlimit_mask(id, data);
22969 + case VCMD_reset_hits:
22970 + return vc_reset_hits(vxi, data);
22971 + case VCMD_reset_minmax:
22972 + return vc_reset_minmax(vxi, data);
22974 + case VCMD_get_vhi_name:
22975 + return vc_get_vhi_name(vxi, data);
22976 + case VCMD_set_vhi_name:
22977 + return vc_set_vhi_name(vxi, data);
22979 + case VCMD_ctx_stat:
22980 + return vc_ctx_stat(vxi, data);
22981 + case VCMD_virt_stat:
22982 + return vc_virt_stat(vxi, data);
22983 + case VCMD_sock_stat:
22984 + return vc_sock_stat(vxi, data);
22985 + case VCMD_rlimit_stat:
22986 + return vc_rlimit_stat(vxi, data);
22988 + case VCMD_set_cflags:
22989 + return vc_set_cflags(vxi, data);
22990 + case VCMD_get_cflags:
22991 + return vc_get_cflags(vxi, data);
22993 + /* this is version 1 */
22994 + case VCMD_set_ccaps:
22995 + return vc_set_ccaps(vxi, data);
22996 + /* this is version 1 */
22997 + case VCMD_get_ccaps:
22998 + return vc_get_ccaps(vxi, data);
22999 + case VCMD_set_bcaps:
23000 + return vc_set_bcaps(vxi, data);
23001 + case VCMD_get_bcaps:
23002 + return vc_get_bcaps(vxi, data);
23004 + case VCMD_set_badness:
23005 + return vc_set_badness(vxi, data);
23006 + case VCMD_get_badness:
23007 + return vc_get_badness(vxi, data);
23009 + case VCMD_set_nflags:
23010 + return vc_set_nflags(nxi, data);
23011 + case VCMD_get_nflags:
23012 + return vc_get_nflags(nxi, data);
23014 + case VCMD_set_ncaps:
23015 + return vc_set_ncaps(nxi, data);
23016 + case VCMD_get_ncaps:
23017 + return vc_get_ncaps(nxi, data);
23019 + case VCMD_set_prio_bias:
23020 + return vc_set_prio_bias(vxi, data);
23021 + case VCMD_get_prio_bias:
23022 + return vc_get_prio_bias(vxi, data);
23023 + case VCMD_add_dlimit:
23024 + return __COMPAT(vc_add_dlimit, id, data, compat);
23025 + case VCMD_rem_dlimit:
23026 + return __COMPAT(vc_rem_dlimit, id, data, compat);
23027 + case VCMD_set_dlimit:
23028 + return __COMPAT(vc_set_dlimit, id, data, compat);
23029 + case VCMD_get_dlimit:
23030 + return __COMPAT(vc_get_dlimit, id, data, compat);
23032 + case VCMD_ctx_kill:
23033 + return vc_ctx_kill(vxi, data);
23035 + case VCMD_wait_exit:
23036 + return vc_wait_exit(vxi, data);
23038 + case VCMD_get_iattr:
23039 + return __COMPAT_NO_ID(vc_get_iattr, data, compat);
23040 + case VCMD_set_iattr:
23041 + return __COMPAT_NO_ID(vc_set_iattr, data, compat);
23043 + case VCMD_fget_iattr:
23044 + return vc_fget_iattr(id, data);
23045 + case VCMD_fset_iattr:
23046 + return vc_fset_iattr(id, data);
23048 + case VCMD_enter_space_v0:
23049 + return vc_enter_space_v1(vxi, NULL);
23050 + case VCMD_enter_space_v1:
23051 + return vc_enter_space_v1(vxi, data);
23052 + /* this is version 2 */
23053 + case VCMD_enter_space:
23054 + return vc_enter_space(vxi, data);
23056 + case VCMD_ctx_create_v0:
23057 + return vc_ctx_create(id, NULL);
23058 + case VCMD_ctx_create:
23059 + return vc_ctx_create(id, data);
23060 + case VCMD_ctx_migrate_v0:
23061 + return vc_ctx_migrate(vxi, NULL);
23062 + case VCMD_ctx_migrate:
23063 + return vc_ctx_migrate(vxi, data);
23065 + case VCMD_net_create_v0:
23066 + return vc_net_create(id, NULL);
23067 + case VCMD_net_create:
23068 + return vc_net_create(id, data);
23069 + case VCMD_net_migrate:
23070 + return vc_net_migrate(nxi, data);
23072 + case VCMD_tag_migrate:
23073 + return vc_tag_migrate(id);
23075 + case VCMD_net_add:
23076 + return vc_net_add(nxi, data);
23077 + case VCMD_net_remove:
23078 + return vc_net_remove(nxi, data);
23080 + case VCMD_net_add_ipv4_v1:
23081 + return vc_net_add_ipv4_v1(nxi, data);
23082 + /* this is version 2 */
23083 + case VCMD_net_add_ipv4:
23084 + return vc_net_add_ipv4(nxi, data);
23086 + case VCMD_net_rem_ipv4_v1:
23087 + return vc_net_rem_ipv4_v1(nxi, data);
23088 + /* this is version 2 */
23089 + case VCMD_net_rem_ipv4:
23090 + return vc_net_rem_ipv4(nxi, data);
23091 +#ifdef CONFIG_IPV6
23092 + case VCMD_net_add_ipv6:
23093 + return vc_net_add_ipv6(nxi, data);
23094 + case VCMD_net_remove_ipv6:
23095 + return vc_net_remove_ipv6(nxi, data);
23097 +/* case VCMD_add_match_ipv4:
23098 + return vc_add_match_ipv4(nxi, data);
23099 + case VCMD_get_match_ipv4:
23100 + return vc_get_match_ipv4(nxi, data);
23101 +#ifdef CONFIG_IPV6
23102 + case VCMD_add_match_ipv6:
23103 + return vc_add_match_ipv6(nxi, data);
23104 + case VCMD_get_match_ipv6:
23105 + return vc_get_match_ipv6(nxi, data);
23108 +#ifdef CONFIG_VSERVER_DEVICE
23109 + case VCMD_set_mapping:
23110 + return __COMPAT(vc_set_mapping, vxi, data, compat);
23111 + case VCMD_unset_mapping:
23112 + return __COMPAT(vc_unset_mapping, vxi, data, compat);
23114 +#ifdef CONFIG_VSERVER_HISTORY
23115 + case VCMD_dump_history:
23116 + return vc_dump_history(id);
23117 + case VCMD_read_history:
23118 + return __COMPAT(vc_read_history, id, data, compat);
23121 + vxwprintk_task(1, "unimplemented VCMD_%02d_%d[%d]",
23122 + VC_CATEGORY(cmd), VC_COMMAND(cmd), VC_VERSION(cmd));
23128 +#define __VCMD(vcmd, _perm, _args, _flags) \
23129 + case VCMD_ ## vcmd: perm = _perm; \
23130 + args = _args; flags = _flags; break
23133 +#define VCA_NONE 0x00
23134 +#define VCA_VXI 0x01
23135 +#define VCA_NXI 0x02
23137 +#define VCF_NONE 0x00
23138 +#define VCF_INFO 0x01
23139 +#define VCF_ADMIN 0x02
23140 +#define VCF_ARES 0x06 /* includes admin */
23141 +#define VCF_SETUP 0x08
23143 +#define VCF_ZIDOK 0x10 /* zero id okay */
23147 +long do_vserver(uint32_t cmd, uint32_t id, void __user *data, int compat)
23150 + int permit = -1, state = 0;
23151 + int perm = -1, args = 0, flags = 0;
23152 + struct vx_info *vxi = NULL;
23153 + struct nx_info *nxi = NULL;
23156 + /* unpriviledged commands */
23157 + __VCMD(get_version, 0, VCA_NONE, 0);
23158 + __VCMD(get_vci, 0, VCA_NONE, 0);
23159 + __VCMD(get_rlimit_mask, 0, VCA_NONE, 0);
23160 + __VCMD(get_space_mask_v0,0, VCA_NONE, 0);
23161 + __VCMD(get_space_mask, 0, VCA_NONE, 0);
23162 + __VCMD(get_space_default,0, VCA_NONE, 0);
23164 + /* info commands */
23165 + __VCMD(task_xid, 2, VCA_NONE, 0);
23166 + __VCMD(reset_hits, 2, VCA_VXI, 0);
23167 + __VCMD(reset_minmax, 2, VCA_VXI, 0);
23168 + __VCMD(vx_info, 3, VCA_VXI, VCF_INFO);
23169 + __VCMD(get_bcaps, 3, VCA_VXI, VCF_INFO);
23170 + __VCMD(get_ccaps, 3, VCA_VXI, VCF_INFO);
23171 + __VCMD(get_cflags, 3, VCA_VXI, VCF_INFO);
23172 + __VCMD(get_umask, 3, VCA_VXI, VCF_INFO);
23173 + __VCMD(get_wmask, 3, VCA_VXI, VCF_INFO);
23174 + __VCMD(get_badness, 3, VCA_VXI, VCF_INFO);
23175 + __VCMD(get_vhi_name, 3, VCA_VXI, VCF_INFO);
23176 + __VCMD(get_rlimit, 3, VCA_VXI, VCF_INFO);
23178 + __VCMD(ctx_stat, 3, VCA_VXI, VCF_INFO);
23179 + __VCMD(virt_stat, 3, VCA_VXI, VCF_INFO);
23180 + __VCMD(sock_stat, 3, VCA_VXI, VCF_INFO);
23181 + __VCMD(rlimit_stat, 3, VCA_VXI, VCF_INFO);
23183 + __VCMD(task_nid, 2, VCA_NONE, 0);
23184 + __VCMD(nx_info, 3, VCA_NXI, VCF_INFO);
23185 + __VCMD(get_ncaps, 3, VCA_NXI, VCF_INFO);
23186 + __VCMD(get_nflags, 3, VCA_NXI, VCF_INFO);
23188 + __VCMD(task_tag, 2, VCA_NONE, 0);
23190 + __VCMD(get_iattr, 2, VCA_NONE, 0);
23191 + __VCMD(fget_iattr, 2, VCA_NONE, 0);
23192 + __VCMD(get_dlimit, 3, VCA_NONE, VCF_INFO);
23193 + __VCMD(get_prio_bias, 3, VCA_VXI, VCF_INFO);
23195 + /* lower admin commands */
23196 + __VCMD(wait_exit, 4, VCA_VXI, VCF_INFO);
23197 + __VCMD(ctx_create_v0, 5, VCA_NONE, 0);
23198 + __VCMD(ctx_create, 5, VCA_NONE, 0);
23199 + __VCMD(ctx_migrate_v0, 5, VCA_VXI, VCF_ADMIN);
23200 + __VCMD(ctx_migrate, 5, VCA_VXI, VCF_ADMIN);
23201 + __VCMD(enter_space_v0, 5, VCA_VXI, VCF_ADMIN);
23202 + __VCMD(enter_space_v1, 5, VCA_VXI, VCF_ADMIN);
23203 + __VCMD(enter_space, 5, VCA_VXI, VCF_ADMIN);
23205 + __VCMD(net_create_v0, 5, VCA_NONE, 0);
23206 + __VCMD(net_create, 5, VCA_NONE, 0);
23207 + __VCMD(net_migrate, 5, VCA_NXI, VCF_ADMIN);
23209 + __VCMD(tag_migrate, 5, VCA_NONE, VCF_ADMIN);
23211 + /* higher admin commands */
23212 + __VCMD(ctx_kill, 6, VCA_VXI, VCF_ARES);
23213 + __VCMD(set_space_v1, 7, VCA_VXI, VCF_ARES | VCF_SETUP);
23214 + __VCMD(set_space, 7, VCA_VXI, VCF_ARES | VCF_SETUP);
23216 + __VCMD(set_ccaps, 7, VCA_VXI, VCF_ARES | VCF_SETUP);
23217 + __VCMD(set_bcaps, 7, VCA_VXI, VCF_ARES | VCF_SETUP);
23218 + __VCMD(set_cflags, 7, VCA_VXI, VCF_ARES | VCF_SETUP);
23219 + __VCMD(set_umask, 7, VCA_VXI, VCF_ARES | VCF_SETUP);
23220 + __VCMD(set_wmask, 7, VCA_VXI, VCF_ARES | VCF_SETUP);
23221 + __VCMD(set_badness, 7, VCA_VXI, VCF_ARES | VCF_SETUP);
23223 + __VCMD(set_vhi_name, 7, VCA_VXI, VCF_ARES | VCF_SETUP);
23224 + __VCMD(set_rlimit, 7, VCA_VXI, VCF_ARES | VCF_SETUP);
23225 + __VCMD(set_prio_bias, 7, VCA_VXI, VCF_ARES | VCF_SETUP);
23227 + __VCMD(set_ncaps, 7, VCA_NXI, VCF_ARES | VCF_SETUP);
23228 + __VCMD(set_nflags, 7, VCA_NXI, VCF_ARES | VCF_SETUP);
23229 + __VCMD(net_add, 8, VCA_NXI, VCF_ARES | VCF_SETUP);
23230 + __VCMD(net_remove, 8, VCA_NXI, VCF_ARES | VCF_SETUP);
23231 + __VCMD(net_add_ipv4_v1, 8, VCA_NXI, VCF_ARES | VCF_SETUP);
23232 + __VCMD(net_rem_ipv4_v1, 8, VCA_NXI, VCF_ARES | VCF_SETUP);
23233 + __VCMD(net_add_ipv4, 8, VCA_NXI, VCF_ARES | VCF_SETUP);
23234 + __VCMD(net_rem_ipv4, 8, VCA_NXI, VCF_ARES | VCF_SETUP);
23235 +#ifdef CONFIG_IPV6
23236 + __VCMD(net_add_ipv6, 8, VCA_NXI, VCF_ARES | VCF_SETUP);
23237 + __VCMD(net_remove_ipv6, 8, VCA_NXI, VCF_ARES | VCF_SETUP);
23239 + __VCMD(set_iattr, 7, VCA_NONE, 0);
23240 + __VCMD(fset_iattr, 7, VCA_NONE, 0);
23241 + __VCMD(set_dlimit, 7, VCA_NONE, VCF_ARES);
23242 + __VCMD(add_dlimit, 8, VCA_NONE, VCF_ARES);
23243 + __VCMD(rem_dlimit, 8, VCA_NONE, VCF_ARES);
23245 +#ifdef CONFIG_VSERVER_DEVICE
23246 + __VCMD(set_mapping, 8, VCA_VXI, VCF_ARES|VCF_ZIDOK);
23247 + __VCMD(unset_mapping, 8, VCA_VXI, VCF_ARES|VCF_ZIDOK);
23249 + /* debug level admin commands */
23250 +#ifdef CONFIG_VSERVER_HISTORY
23251 + __VCMD(dump_history, 9, VCA_NONE, 0);
23252 + __VCMD(read_history, 9, VCA_NONE, 0);
23259 + vxdprintk(VXD_CBIT(switch, 0),
23260 + "vc: VCMD_%02d_%d[%d], %d,%p [%d,%d,%x,%x]",
23261 + VC_CATEGORY(cmd), VC_COMMAND(cmd),
23262 + VC_VERSION(cmd), id, data, compat,
23263 + perm, args, flags);
23270 + if (!capable(CAP_CONTEXT))
23274 + /* moved here from the individual commands */
23276 + if ((perm > 1) && !capable(CAP_SYS_ADMIN))
23280 + /* vcmd involves resource management */
23282 + if ((flags & VCF_ARES) && !capable(CAP_SYS_RESOURCE))
23286 + /* various legacy exceptions */
23288 + /* will go away when spectator is a cap */
23289 + case VCMD_ctx_migrate_v0:
23290 + case VCMD_ctx_migrate:
23292 + current->xid = 1;
23298 + /* will go away when spectator is a cap */
23299 + case VCMD_net_migrate:
23301 + current->nid = 1;
23308 + /* vcmds are fine by default */
23311 + /* admin type vcmds require admin ... */
23312 + if (flags & VCF_ADMIN)
23313 + permit = vx_check(0, VS_ADMIN) ? 1 : 0;
23315 + /* ... but setup type vcmds override that */
23316 + if (!permit && (flags & VCF_SETUP))
23317 + permit = vx_flags(VXF_STATE_SETUP, 0) ? 2 : 0;
23325 + if (!id && (flags & VCF_ZIDOK))
23329 + if (args & VCA_VXI) {
23330 + vxi = lookup_vx_info(id);
23334 + if ((flags & VCF_ADMIN) &&
23335 + /* special case kill for shutdown */
23336 + (cmd != VCMD_ctx_kill) &&
23337 + /* can context be administrated? */
23338 + !vx_info_flags(vxi, VXF_STATE_ADMIN, 0)) {
23344 + if (args & VCA_NXI) {
23345 + nxi = lookup_nx_info(id);
23349 + if ((flags & VCF_ADMIN) &&
23350 + /* can context be administrated? */
23351 + !nx_info_flags(nxi, NXF_STATE_ADMIN, 0)) {
23358 + ret = do_vcmd(cmd, id, vxi, nxi, data, compat);
23361 + if ((args & VCA_NXI) && nxi)
23362 + put_nx_info(nxi);
23364 + if ((args & VCA_VXI) && vxi)
23365 + put_vx_info(vxi);
23367 + vxdprintk(VXD_CBIT(switch, 1),
23368 + "vc: VCMD_%02d_%d[%d] = %08lx(%ld) [%d,%d]",
23369 + VC_CATEGORY(cmd), VC_COMMAND(cmd),
23370 + VC_VERSION(cmd), ret, ret, state, permit);
23375 +sys_vserver(uint32_t cmd, uint32_t id, void __user *data)
23377 + return do_vserver(cmd, id, data, 0);
23380 +#ifdef CONFIG_COMPAT
23383 +sys32_vserver(uint32_t cmd, uint32_t id, void __user *data)
23385 + return do_vserver(cmd, id, data, 1);
23388 +#endif /* CONFIG_COMPAT */
23389 diff -NurpP --minimal linux-3.5/kernel/vserver/sysctl.c linux-3.5-vs2.3.4/kernel/vserver/sysctl.c
23390 --- linux-3.5/kernel/vserver/sysctl.c 1970-01-01 01:00:00.000000000 +0100
23391 +++ linux-3.5-vs2.3.4/kernel/vserver/sysctl.c 2012-07-23 01:45:55.000000000 +0200
23394 + * kernel/vserver/sysctl.c
23396 + * Virtual Context Support
23398 + * Copyright (C) 2004-2007 Herbert Pötzl
23400 + * V0.01 basic structure
23404 +#include <linux/module.h>
23405 +#include <linux/ctype.h>
23406 +#include <linux/sysctl.h>
23407 +#include <linux/parser.h>
23408 +#include <asm/uaccess.h>
23411 + CTL_DEBUG_ERROR = 0,
23412 + CTL_DEBUG_SWITCH = 1,
23428 +unsigned int vs_debug_switch = 0;
23429 +unsigned int vs_debug_xid = 0;
23430 +unsigned int vs_debug_nid = 0;
23431 +unsigned int vs_debug_tag = 0;
23432 +unsigned int vs_debug_net = 0;
23433 +unsigned int vs_debug_limit = 0;
23434 +unsigned int vs_debug_cres = 0;
23435 +unsigned int vs_debug_dlim = 0;
23436 +unsigned int vs_debug_quota = 0;
23437 +unsigned int vs_debug_cvirt = 0;
23438 +unsigned int vs_debug_space = 0;
23439 +unsigned int vs_debug_perm = 0;
23440 +unsigned int vs_debug_misc = 0;
23443 +static struct ctl_table_header *vserver_table_header;
23444 +static ctl_table vserver_root_table[];
23447 +void vserver_register_sysctl(void)
23449 + if (!vserver_table_header) {
23450 + vserver_table_header = register_sysctl_table(vserver_root_table);
23455 +void vserver_unregister_sysctl(void)
23457 + if (vserver_table_header) {
23458 + unregister_sysctl_table(vserver_table_header);
23459 + vserver_table_header = NULL;
23464 +static int proc_dodebug(ctl_table *table, int write,
23465 + void __user *buffer, size_t *lenp, loff_t *ppos)
23467 + char tmpbuf[20], *p, c;
23468 + unsigned int value;
23469 + size_t left, len;
23471 + if ((*ppos && !write) || !*lenp) {
23479 + if (!access_ok(VERIFY_READ, buffer, left))
23481 + p = (char *)buffer;
23482 + while (left && __get_user(c, p) >= 0 && isspace(c))
23487 + if (left > sizeof(tmpbuf) - 1)
23489 + if (copy_from_user(tmpbuf, p, left))
23491 + tmpbuf[left] = '\0';
23493 + for (p = tmpbuf, value = 0; '0' <= *p && *p <= '9'; p++, left--)
23494 + value = 10 * value + (*p - '0');
23495 + if (*p && !isspace(*p))
23497 + while (left && isspace(*p))
23499 + *(unsigned int *)table->data = value;
23501 + if (!access_ok(VERIFY_WRITE, buffer, left))
23503 + len = sprintf(tmpbuf, "%d", *(unsigned int *)table->data);
23506 + if (__copy_to_user(buffer, tmpbuf, len))
23508 + if ((left -= len) > 0) {
23509 + if (put_user('\n', (char *)buffer + len))
23523 +#define CTL_ENTRY(ctl, name) \
23525 + .procname = #name, \
23526 + .data = &vs_ ## name, \
23527 + .maxlen = sizeof(int), \
23529 + .proc_handler = &proc_dodebug, \
23530 + .extra1 = &zero, \
23531 + .extra2 = &zero, \
23534 +static ctl_table vserver_debug_table[] = {
23535 + CTL_ENTRY(CTL_DEBUG_SWITCH, debug_switch),
23536 + CTL_ENTRY(CTL_DEBUG_XID, debug_xid),
23537 + CTL_ENTRY(CTL_DEBUG_NID, debug_nid),
23538 + CTL_ENTRY(CTL_DEBUG_TAG, debug_tag),
23539 + CTL_ENTRY(CTL_DEBUG_NET, debug_net),
23540 + CTL_ENTRY(CTL_DEBUG_LIMIT, debug_limit),
23541 + CTL_ENTRY(CTL_DEBUG_CRES, debug_cres),
23542 + CTL_ENTRY(CTL_DEBUG_DLIM, debug_dlim),
23543 + CTL_ENTRY(CTL_DEBUG_QUOTA, debug_quota),
23544 + CTL_ENTRY(CTL_DEBUG_CVIRT, debug_cvirt),
23545 + CTL_ENTRY(CTL_DEBUG_SPACE, debug_space),
23546 + CTL_ENTRY(CTL_DEBUG_PERM, debug_perm),
23547 + CTL_ENTRY(CTL_DEBUG_MISC, debug_misc),
23551 +static ctl_table vserver_root_table[] = {
23553 + .procname = "vserver",
23555 + .child = vserver_debug_table
23561 +static match_table_t tokens = {
23562 + { CTL_DEBUG_SWITCH, "switch=%x" },
23563 + { CTL_DEBUG_XID, "xid=%x" },
23564 + { CTL_DEBUG_NID, "nid=%x" },
23565 + { CTL_DEBUG_TAG, "tag=%x" },
23566 + { CTL_DEBUG_NET, "net=%x" },
23567 + { CTL_DEBUG_LIMIT, "limit=%x" },
23568 + { CTL_DEBUG_CRES, "cres=%x" },
23569 + { CTL_DEBUG_DLIM, "dlim=%x" },
23570 + { CTL_DEBUG_QUOTA, "quota=%x" },
23571 + { CTL_DEBUG_CVIRT, "cvirt=%x" },
23572 + { CTL_DEBUG_SPACE, "space=%x" },
23573 + { CTL_DEBUG_PERM, "perm=%x" },
23574 + { CTL_DEBUG_MISC, "misc=%x" },
23575 + { CTL_DEBUG_ERROR, NULL }
23578 +#define HANDLE_CASE(id, name, val) \
23579 + case CTL_DEBUG_ ## id: \
23580 + vs_debug_ ## name = val; \
23581 + printk("vs_debug_" #name "=0x%x\n", val); \
23585 +static int __init vs_debug_setup(char *str)
23590 + printk("vs_debug_setup(%s)\n", str);
23591 + while ((p = strsep(&str, ",")) != NULL) {
23592 + substring_t args[MAX_OPT_ARGS];
23593 + unsigned int value;
23598 + token = match_token(p, tokens, args);
23599 + value = (token > 0) ? simple_strtoul(args[0].from, NULL, 0) : 0;
23602 + HANDLE_CASE(SWITCH, switch, value);
23603 + HANDLE_CASE(XID, xid, value);
23604 + HANDLE_CASE(NID, nid, value);
23605 + HANDLE_CASE(TAG, tag, value);
23606 + HANDLE_CASE(NET, net, value);
23607 + HANDLE_CASE(LIMIT, limit, value);
23608 + HANDLE_CASE(CRES, cres, value);
23609 + HANDLE_CASE(DLIM, dlim, value);
23610 + HANDLE_CASE(QUOTA, quota, value);
23611 + HANDLE_CASE(CVIRT, cvirt, value);
23612 + HANDLE_CASE(SPACE, space, value);
23613 + HANDLE_CASE(PERM, perm, value);
23614 + HANDLE_CASE(MISC, misc, value);
23623 +__setup("vsdebug=", vs_debug_setup);
23627 +EXPORT_SYMBOL_GPL(vs_debug_switch);
23628 +EXPORT_SYMBOL_GPL(vs_debug_xid);
23629 +EXPORT_SYMBOL_GPL(vs_debug_nid);
23630 +EXPORT_SYMBOL_GPL(vs_debug_net);
23631 +EXPORT_SYMBOL_GPL(vs_debug_limit);
23632 +EXPORT_SYMBOL_GPL(vs_debug_cres);
23633 +EXPORT_SYMBOL_GPL(vs_debug_dlim);
23634 +EXPORT_SYMBOL_GPL(vs_debug_quota);
23635 +EXPORT_SYMBOL_GPL(vs_debug_cvirt);
23636 +EXPORT_SYMBOL_GPL(vs_debug_space);
23637 +EXPORT_SYMBOL_GPL(vs_debug_perm);
23638 +EXPORT_SYMBOL_GPL(vs_debug_misc);
23640 diff -NurpP --minimal linux-3.5/kernel/vserver/tag.c linux-3.5-vs2.3.4/kernel/vserver/tag.c
23641 --- linux-3.5/kernel/vserver/tag.c 1970-01-01 01:00:00.000000000 +0100
23642 +++ linux-3.5-vs2.3.4/kernel/vserver/tag.c 2012-07-23 01:45:55.000000000 +0200
23645 + * linux/kernel/vserver/tag.c
23647 + * Virtual Server: Shallow Tag Space
23649 + * Copyright (C) 2007 Herbert Pötzl
23651 + * V0.01 basic implementation
23655 +#include <linux/sched.h>
23656 +#include <linux/vserver/debug.h>
23657 +#include <linux/vs_pid.h>
23658 +#include <linux/vs_tag.h>
23660 +#include <linux/vserver/tag_cmd.h>
23663 +int dx_migrate_task(struct task_struct *p, tag_t tag)
23668 + vxdprintk(VXD_CBIT(tag, 5),
23669 + "dx_migrate_task(%p[#%d],#%d)", p, p->tag, tag);
23675 + vxdprintk(VXD_CBIT(tag, 5),
23676 + "moved task %p into [#%d]", p, tag);
23680 +/* vserver syscall commands below here */
23682 +/* taks xid and vx_info functions */
23685 +int vc_task_tag(uint32_t id)
23690 + struct task_struct *tsk;
23692 + tsk = find_task_by_real_pid(id);
23693 + tag = (tsk) ? tsk->tag : -ESRCH;
23694 + rcu_read_unlock();
23696 + tag = dx_current_tag();
23701 +int vc_tag_migrate(uint32_t tag)
23703 + return dx_migrate_task(current, tag & 0xFFFF);
23707 diff -NurpP --minimal linux-3.5/kernel/vserver/vci_config.h linux-3.5-vs2.3.4/kernel/vserver/vci_config.h
23708 --- linux-3.5/kernel/vserver/vci_config.h 1970-01-01 01:00:00.000000000 +0100
23709 +++ linux-3.5-vs2.3.4/kernel/vserver/vci_config.h 2012-07-23 01:45:55.000000000 +0200
23712 +/* interface version */
23714 +#define VCI_VERSION 0x00020308
23718 + VCI_KCBIT_NO_DYNAMIC = 0,
23720 + VCI_KCBIT_PROC_SECURE = 4,
23721 + /* VCI_KCBIT_HARDCPU = 5, */
23722 + /* VCI_KCBIT_IDLELIMIT = 6, */
23723 + /* VCI_KCBIT_IDLETIME = 7, */
23725 + VCI_KCBIT_COWBL = 8,
23726 + VCI_KCBIT_FULLCOWBL = 9,
23727 + VCI_KCBIT_SPACES = 10,
23728 + VCI_KCBIT_NETV2 = 11,
23729 + VCI_KCBIT_MEMCG = 12,
23731 + VCI_KCBIT_DEBUG = 16,
23732 + VCI_KCBIT_HISTORY = 20,
23733 + VCI_KCBIT_TAGGED = 24,
23734 + VCI_KCBIT_PPTAG = 28,
23736 + VCI_KCBIT_MORE = 31,
23740 +static inline uint32_t vci_kernel_config(void)
23743 + (1 << VCI_KCBIT_NO_DYNAMIC) |
23745 + /* configured features */
23746 +#ifdef CONFIG_VSERVER_PROC_SECURE
23747 + (1 << VCI_KCBIT_PROC_SECURE) |
23749 +#ifdef CONFIG_VSERVER_COWBL
23750 + (1 << VCI_KCBIT_COWBL) |
23751 + (1 << VCI_KCBIT_FULLCOWBL) |
23753 + (1 << VCI_KCBIT_SPACES) |
23754 + (1 << VCI_KCBIT_NETV2) |
23755 +#ifdef CONFIG_CGROUP_MEM_RES_CTLR
23756 + (1 << VCI_KCBIT_MEMCG) |
23759 + /* debug options */
23760 +#ifdef CONFIG_VSERVER_DEBUG
23761 + (1 << VCI_KCBIT_DEBUG) |
23763 +#ifdef CONFIG_VSERVER_HISTORY
23764 + (1 << VCI_KCBIT_HISTORY) |
23767 + /* inode context tagging */
23768 +#if defined(CONFIG_TAGGING_NONE)
23769 + (0 << VCI_KCBIT_TAGGED) |
23770 +#elif defined(CONFIG_TAGGING_UID16)
23771 + (1 << VCI_KCBIT_TAGGED) |
23772 +#elif defined(CONFIG_TAGGING_GID16)
23773 + (2 << VCI_KCBIT_TAGGED) |
23774 +#elif defined(CONFIG_TAGGING_ID24)
23775 + (3 << VCI_KCBIT_TAGGED) |
23776 +#elif defined(CONFIG_TAGGING_INTERN)
23777 + (4 << VCI_KCBIT_TAGGED) |
23778 +#elif defined(CONFIG_TAGGING_RUNTIME)
23779 + (5 << VCI_KCBIT_TAGGED) |
23781 + (7 << VCI_KCBIT_TAGGED) |
23783 + (1 << VCI_KCBIT_PPTAG) |
23787 diff -NurpP --minimal linux-3.5/mm/memcontrol.c linux-3.5-vs2.3.4/mm/memcontrol.c
23788 --- linux-3.5/mm/memcontrol.c 2012-07-22 23:39:47.000000000 +0200
23789 +++ linux-3.5-vs2.3.4/mm/memcontrol.c 2012-07-23 01:45:55.000000000 +0200
23790 @@ -883,6 +883,31 @@ struct mem_cgroup *mem_cgroup_from_task(
23791 struct mem_cgroup, css);
23794 +u64 mem_cgroup_res_read_u64(struct mem_cgroup *mem, int member)
23796 + return res_counter_read_u64(&mem->res, member);
23799 +u64 mem_cgroup_memsw_read_u64(struct mem_cgroup *mem, int member)
23801 + return res_counter_read_u64(&mem->memsw, member);
23804 +s64 mem_cgroup_stat_read_cache(struct mem_cgroup *mem)
23806 + return mem_cgroup_read_stat(mem, MEM_CGROUP_STAT_CACHE);
23809 +s64 mem_cgroup_stat_read_anon(struct mem_cgroup *mem)
23811 + return mem_cgroup_read_stat(mem, MEM_CGROUP_STAT_RSS);
23814 +s64 mem_cgroup_stat_read_mapped(struct mem_cgroup *mem)
23816 + return mem_cgroup_read_stat(mem, MEM_CGROUP_STAT_FILE_MAPPED);
23819 struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm)
23821 struct mem_cgroup *memcg = NULL;
23822 diff -NurpP --minimal linux-3.5/mm/oom_kill.c linux-3.5-vs2.3.4/mm/oom_kill.c
23823 --- linux-3.5/mm/oom_kill.c 2012-07-22 23:39:47.000000000 +0200
23824 +++ linux-3.5-vs2.3.4/mm/oom_kill.c 2012-07-23 01:45:55.000000000 +0200
23826 #include <linux/freezer.h>
23827 #include <linux/ftrace.h>
23828 #include <linux/ratelimit.h>
23829 +#include <linux/reboot.h>
23830 +#include <linux/vs_context.h>
23832 #define CREATE_TRACE_POINTS
23833 #include <trace/events/oom.h>
23834 @@ -155,11 +157,18 @@ struct task_struct *find_lock_task_mm(st
23835 static bool oom_unkillable_task(struct task_struct *p,
23836 const struct mem_cgroup *memcg, const nodemask_t *nodemask)
23838 - if (is_global_init(p))
23839 + unsigned xid = vx_current_xid();
23841 + /* skip the init task, global and per guest */
23842 + if (task_is_init(p))
23844 if (p->flags & PF_KTHREAD)
23847 + /* skip other guest and host processes if oom in guest */
23848 + if (xid && vx_task_xid(p) != xid)
23851 /* When mem_cgroup_out_of_memory() and p is not member of the group */
23852 if (memcg && !task_in_mem_cgroup(p, memcg))
23854 @@ -449,8 +458,8 @@ static void oom_kill_process(struct task
23855 dump_header(p, gfp_mask, order, memcg, nodemask);
23858 - pr_err("%s: Kill process %d (%s) score %d or sacrifice child\n",
23859 - message, task_pid_nr(p), p->comm, points);
23860 + pr_err("%s: Kill process %d:#%u (%s) score %d or sacrifice child\n",
23861 + message, task_pid_nr(p), p->xid, p->comm, points);
23865 @@ -483,8 +492,8 @@ static void oom_kill_process(struct task
23867 /* mm cannot safely be dereferenced after task_unlock(victim) */
23869 - pr_err("Killed process %d (%s) total-vm:%lukB, anon-rss:%lukB, file-rss:%lukB\n",
23870 - task_pid_nr(victim), victim->comm, K(victim->mm->total_vm),
23871 + pr_err("Killed process %d:#%u (%s) total-vm:%lukB, anon-rss:%lukB, file-rss:%lukB\n",
23872 + task_pid_nr(victim), victim->xid, victim->comm, K(victim->mm->total_vm),
23873 K(get_mm_counter(victim->mm, MM_ANONPAGES)),
23874 K(get_mm_counter(victim->mm, MM_FILEPAGES)));
23875 task_unlock(victim);
23876 @@ -583,6 +592,8 @@ int unregister_oom_notifier(struct notif
23878 EXPORT_SYMBOL_GPL(unregister_oom_notifier);
23880 +long vs_oom_action(unsigned int);
23883 * Try to acquire the OOM killer lock for the zones in zonelist. Returns zero
23884 * if a parallel OOM killing is already taking place that includes a zone in
23885 @@ -734,7 +745,12 @@ void out_of_memory(struct zonelist *zone
23887 dump_header(NULL, gfp_mask, order, NULL, mpol_mask);
23888 read_unlock(&tasklist_lock);
23889 - panic("Out of memory and no killable processes...\n");
23891 + /* avoid panic for guest OOM */
23892 + if (current->xid)
23893 + vs_oom_action(LINUX_REBOOT_CMD_OOM);
23895 + panic("Out of memory and no killable processes...\n");
23897 if (PTR_ERR(p) != -1UL) {
23898 oom_kill_process(p, gfp_mask, order, points, totalpages, NULL,
23899 diff -NurpP --minimal linux-3.5/mm/page_alloc.c linux-3.5-vs2.3.4/mm/page_alloc.c
23900 --- linux-3.5/mm/page_alloc.c 2012-07-22 23:39:47.000000000 +0200
23901 +++ linux-3.5-vs2.3.4/mm/page_alloc.c 2012-07-23 01:45:55.000000000 +0200
23903 #include <linux/prefetch.h>
23904 #include <linux/migrate.h>
23905 #include <linux/page-debug-flags.h>
23906 +#include <linux/vs_base.h>
23907 +#include <linux/vs_limit.h>
23909 #include <asm/tlbflush.h>
23910 #include <asm/div64.h>
23911 @@ -2711,6 +2713,9 @@ void si_meminfo(struct sysinfo *val)
23912 val->totalhigh = totalhigh_pages;
23913 val->freehigh = nr_free_highpages();
23914 val->mem_unit = PAGE_SIZE;
23916 + if (vx_flags(VXF_VIRT_MEM, 0))
23917 + vx_vsi_meminfo(val);
23920 EXPORT_SYMBOL(si_meminfo);
23921 @@ -2731,6 +2736,9 @@ void si_meminfo_node(struct sysinfo *val
23924 val->mem_unit = PAGE_SIZE;
23926 + if (vx_flags(VXF_VIRT_MEM, 0))
23927 + vx_vsi_meminfo(val);
23931 diff -NurpP --minimal linux-3.5/mm/pgtable-generic.c linux-3.5-vs2.3.4/mm/pgtable-generic.c
23932 --- linux-3.5/mm/pgtable-generic.c 2012-07-22 23:39:47.000000000 +0200
23933 +++ linux-3.5-vs2.3.4/mm/pgtable-generic.c 2012-07-23 01:45:55.000000000 +0200
23935 * Copyright (C) 2010 Linus Torvalds
23938 +#include <linux/mm.h>
23940 #include <linux/pagemap.h>
23941 #include <asm/tlb.h>
23942 #include <asm-generic/pgtable.h>
23943 diff -NurpP --minimal linux-3.5/mm/shmem.c linux-3.5-vs2.3.4/mm/shmem.c
23944 --- linux-3.5/mm/shmem.c 2012-07-22 23:39:47.000000000 +0200
23945 +++ linux-3.5-vs2.3.4/mm/shmem.c 2012-07-23 01:45:55.000000000 +0200
23946 @@ -1812,7 +1812,7 @@ static int shmem_statfs(struct dentry *d
23948 struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb);
23950 - buf->f_type = TMPFS_MAGIC;
23951 + buf->f_type = TMPFS_SUPER_MAGIC;
23952 buf->f_bsize = PAGE_CACHE_SIZE;
23953 buf->f_namelen = NAME_MAX;
23954 if (sbinfo->max_blocks) {
23955 @@ -2628,7 +2628,7 @@ int shmem_fill_super(struct super_block
23956 sb->s_maxbytes = MAX_LFS_FILESIZE;
23957 sb->s_blocksize = PAGE_CACHE_SIZE;
23958 sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
23959 - sb->s_magic = TMPFS_MAGIC;
23960 + sb->s_magic = TMPFS_SUPER_MAGIC;
23961 sb->s_op = &shmem_ops;
23962 sb->s_time_gran = 1;
23963 #ifdef CONFIG_TMPFS_XATTR
23964 diff -NurpP --minimal linux-3.5/mm/slab.c linux-3.5-vs2.3.4/mm/slab.c
23965 --- linux-3.5/mm/slab.c 2012-05-21 18:07:35.000000000 +0200
23966 +++ linux-3.5-vs2.3.4/mm/slab.c 2012-07-23 01:45:55.000000000 +0200
23967 @@ -413,6 +413,8 @@ static void kmem_list3_init(struct kmem_
23968 #define STATS_INC_FREEMISS(x) do { } while (0)
23971 +#include "slab_vs.h"
23976 @@ -3466,6 +3468,7 @@ retry:
23978 obj = slab_get_obj(cachep, slabp, nodeid);
23979 check_slabp(cachep, slabp);
23980 + vx_slab_alloc(cachep, flags);
23981 l3->free_objects--;
23982 /* move slabp to correct slabp list: */
23983 list_del(&slabp->list);
23984 @@ -3543,6 +3546,7 @@ __cache_alloc_node(struct kmem_cache *ca
23985 /* ___cache_alloc_node can fall back to other nodes */
23986 ptr = ____cache_alloc_node(cachep, flags, nodeid);
23988 + vx_slab_alloc(cachep, flags);
23989 local_irq_restore(save_flags);
23990 ptr = cache_alloc_debugcheck_after(cachep, flags, ptr, caller);
23991 kmemleak_alloc_recursive(ptr, obj_size(cachep), 1, cachep->flags,
23992 @@ -3730,6 +3734,7 @@ static inline void __cache_free(struct k
23994 kmemleak_free_recursive(objp, cachep->flags);
23995 objp = cache_free_debugcheck(cachep, objp, caller);
23996 + vx_slab_free(cachep);
23998 kmemcheck_slab_free(cachep, objp, obj_size(cachep));
24000 diff -NurpP --minimal linux-3.5/mm/slab_vs.h linux-3.5-vs2.3.4/mm/slab_vs.h
24001 --- linux-3.5/mm/slab_vs.h 1970-01-01 01:00:00.000000000 +0100
24002 +++ linux-3.5-vs2.3.4/mm/slab_vs.h 2012-07-23 01:45:55.000000000 +0200
24005 +#include <linux/vserver/context.h>
24007 +#include <linux/vs_context.h>
24010 +void vx_slab_alloc(struct kmem_cache *cachep, gfp_t flags)
24012 + int what = gfp_zone(cachep->gfpflags);
24013 + struct vx_info *vxi = current_vx_info();
24018 + atomic_add(cachep->buffer_size, &vxi->cacct.slab[what]);
24022 +void vx_slab_free(struct kmem_cache *cachep)
24024 + int what = gfp_zone(cachep->gfpflags);
24025 + struct vx_info *vxi = current_vx_info();
24030 + atomic_sub(cachep->buffer_size, &vxi->cacct.slab[what]);
24033 diff -NurpP --minimal linux-3.5/mm/swapfile.c linux-3.5-vs2.3.4/mm/swapfile.c
24034 --- linux-3.5/mm/swapfile.c 2012-07-22 23:39:47.000000000 +0200
24035 +++ linux-3.5-vs2.3.4/mm/swapfile.c 2012-07-23 01:45:55.000000000 +0200
24037 #include <asm/tlbflush.h>
24038 #include <linux/swapops.h>
24039 #include <linux/page_cgroup.h>
24040 +#include <linux/vs_base.h>
24042 static bool swap_count_continued(struct swap_info_struct *, pgoff_t,
24044 @@ -1746,6 +1747,16 @@ static int swap_show(struct seq_file *sw
24046 if (si == SEQ_START_TOKEN) {
24047 seq_puts(swap,"Filename\t\t\t\tType\t\tSize\tUsed\tPriority\n");
24048 + if (vx_flags(VXF_VIRT_MEM, 0)) {
24049 + struct sysinfo si;
24051 + vx_vsi_swapinfo(&si);
24052 + if (si.totalswap < (1 << 10))
24054 + seq_printf(swap, "%s\t\t\t\t\t%s\t%lu\t%lu\t%d\n",
24055 + "hdv0", "partition", si.totalswap >> 10,
24056 + (si.totalswap - si.freeswap) >> 10, -1);
24061 @@ -2173,6 +2184,8 @@ void si_swapinfo(struct sysinfo *val)
24062 val->freeswap = nr_swap_pages + nr_to_be_unused;
24063 val->totalswap = total_swap_pages + nr_to_be_unused;
24064 spin_unlock(&swap_lock);
24065 + if (vx_flags(VXF_VIRT_MEM, 0))
24066 + vx_vsi_swapinfo(val);
24070 diff -NurpP --minimal linux-3.5/net/bridge/br_multicast.c linux-3.5-vs2.3.4/net/bridge/br_multicast.c
24071 --- linux-3.5/net/bridge/br_multicast.c 2012-07-22 23:39:47.000000000 +0200
24072 +++ linux-3.5-vs2.3.4/net/bridge/br_multicast.c 2012-07-23 01:45:55.000000000 +0200
24073 @@ -447,7 +447,7 @@ static struct sk_buff *br_ip6_multicast_
24074 ip6h->hop_limit = 1;
24075 ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1));
24076 if (ipv6_dev_get_saddr(dev_net(br->dev), br->dev, &ip6h->daddr, 0,
24078 + &ip6h->saddr, NULL)) {
24082 diff -NurpP --minimal linux-3.5/net/core/dev.c linux-3.5-vs2.3.4/net/core/dev.c
24083 --- linux-3.5/net/core/dev.c 2012-07-22 23:39:48.000000000 +0200
24084 +++ linux-3.5-vs2.3.4/net/core/dev.c 2012-07-23 01:45:55.000000000 +0200
24085 @@ -126,6 +126,7 @@
24086 #include <linux/in.h>
24087 #include <linux/jhash.h>
24088 #include <linux/random.h>
24089 +#include <linux/vs_inet.h>
24090 #include <trace/events/napi.h>
24091 #include <trace/events/net.h>
24092 #include <trace/events/skb.h>
24093 @@ -620,7 +621,8 @@ struct net_device *__dev_get_by_name(str
24094 struct hlist_head *head = dev_name_hash(net, name);
24096 hlist_for_each_entry(dev, p, head, name_hlist)
24097 - if (!strncmp(dev->name, name, IFNAMSIZ))
24098 + if (!strncmp(dev->name, name, IFNAMSIZ) &&
24099 + nx_dev_visible(current_nx_info(), dev))
24103 @@ -646,7 +648,8 @@ struct net_device *dev_get_by_name_rcu(s
24104 struct hlist_head *head = dev_name_hash(net, name);
24106 hlist_for_each_entry_rcu(dev, p, head, name_hlist)
24107 - if (!strncmp(dev->name, name, IFNAMSIZ))
24108 + if (!strncmp(dev->name, name, IFNAMSIZ) &&
24109 + nx_dev_visible(current_nx_info(), dev))
24113 @@ -697,7 +700,8 @@ struct net_device *__dev_get_by_index(st
24114 struct hlist_head *head = dev_index_hash(net, ifindex);
24116 hlist_for_each_entry(dev, p, head, index_hlist)
24117 - if (dev->ifindex == ifindex)
24118 + if ((dev->ifindex == ifindex) &&
24119 + nx_dev_visible(current_nx_info(), dev))
24123 @@ -715,7 +719,7 @@ EXPORT_SYMBOL(__dev_get_by_index);
24124 * about locking. The caller must hold RCU lock.
24127 -struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex)
24128 +struct net_device *dev_get_by_index_real_rcu(struct net *net, int ifindex)
24130 struct hlist_node *p;
24131 struct net_device *dev;
24132 @@ -727,6 +731,16 @@ struct net_device *dev_get_by_index_rcu(
24136 +EXPORT_SYMBOL(dev_get_by_index_real_rcu);
24138 +struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex)
24140 + struct net_device *dev = dev_get_by_index_real_rcu(net, ifindex);
24142 + if (nx_dev_visible(current_nx_info(), dev))
24146 EXPORT_SYMBOL(dev_get_by_index_rcu);
24149 @@ -775,7 +789,8 @@ struct net_device *dev_getbyhwaddr_rcu(s
24151 for_each_netdev_rcu(net, dev)
24152 if (dev->type == type &&
24153 - !memcmp(dev->dev_addr, ha, dev->addr_len))
24154 + !memcmp(dev->dev_addr, ha, dev->addr_len) &&
24155 + nx_dev_visible(current_nx_info(), dev))
24159 @@ -787,9 +802,11 @@ struct net_device *__dev_getfirstbyhwtyp
24160 struct net_device *dev;
24163 - for_each_netdev(net, dev)
24164 - if (dev->type == type)
24165 + for_each_netdev(net, dev) {
24166 + if ((dev->type == type) &&
24167 + nx_dev_visible(current_nx_info(), dev))
24173 @@ -907,6 +924,8 @@ static int __dev_alloc_name(struct net *
24175 if (i < 0 || i >= max_netdevices)
24177 + if (!nx_dev_visible(current_nx_info(), d))
24180 /* avoid cases where sscanf is not exact inverse of printf */
24181 snprintf(buf, IFNAMSIZ, name, i);
24182 @@ -3975,6 +3994,8 @@ static int dev_ifconf(struct net *net, c
24185 for_each_netdev(net, dev) {
24186 + if (!nx_dev_visible(current_nx_info(), dev))
24188 for (i = 0; i < NPROTO; i++) {
24189 if (gifconf_list[i]) {
24191 @@ -4077,6 +4098,10 @@ static void dev_seq_printf_stats(struct
24192 struct rtnl_link_stats64 temp;
24193 const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp);
24195 + /* device visible inside network context? */
24196 + if (!nx_dev_visible(current_nx_info(), dev))
24199 seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
24200 "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
24201 dev->name, stats->rx_bytes, stats->rx_packets,
24202 diff -NurpP --minimal linux-3.5/net/core/rtnetlink.c linux-3.5-vs2.3.4/net/core/rtnetlink.c
24203 --- linux-3.5/net/core/rtnetlink.c 2012-07-22 23:39:48.000000000 +0200
24204 +++ linux-3.5-vs2.3.4/net/core/rtnetlink.c 2012-07-23 01:45:55.000000000 +0200
24205 @@ -1079,6 +1079,8 @@ static int rtnl_dump_ifinfo(struct sk_bu
24206 hlist_for_each_entry_rcu(dev, node, head, index_hlist) {
24209 + if (!nx_dev_visible(skb->sk->sk_nx_info, dev))
24211 if (rtnl_fill_ifinfo(skb, dev, RTM_NEWLINK,
24212 NETLINK_CB(cb->skb).pid,
24213 cb->nlh->nlmsg_seq, 0,
24214 @@ -1960,6 +1962,9 @@ void rtmsg_ifinfo(int type, struct net_d
24215 int err = -ENOBUFS;
24216 size_t if_info_size;
24218 + if (!nx_dev_visible(current_nx_info(), dev))
24221 skb = nlmsg_new((if_info_size = if_nlmsg_size(dev, 0)), GFP_KERNEL);
24224 diff -NurpP --minimal linux-3.5/net/core/sock.c linux-3.5-vs2.3.4/net/core/sock.c
24225 --- linux-3.5/net/core/sock.c 2012-07-22 23:39:48.000000000 +0200
24226 +++ linux-3.5-vs2.3.4/net/core/sock.c 2012-07-23 01:45:55.000000000 +0200
24227 @@ -132,6 +132,10 @@
24228 #include <net/netprio_cgroup.h>
24230 #include <linux/filter.h>
24231 +#include <linux/vs_socket.h>
24232 +#include <linux/vs_limit.h>
24233 +#include <linux/vs_context.h>
24234 +#include <linux/vs_network.h>
24236 #include <trace/events/sock.h>
24238 @@ -1138,6 +1142,8 @@ static struct sock *sk_prot_alloc(struct
24240 sk_tx_queue_clear(sk);
24242 + sock_vx_init(sk);
24243 + sock_nx_init(sk);
24247 @@ -1246,6 +1252,11 @@ static void __sk_free(struct sock *sk)
24248 put_cred(sk->sk_peer_cred);
24249 put_pid(sk->sk_peer_pid);
24250 put_net(sock_net(sk));
24252 + clr_vx_info(&sk->sk_vx_info);
24254 + clr_nx_info(&sk->sk_nx_info);
24256 sk_prot_free(sk->sk_prot_creator, sk);
24259 @@ -1306,6 +1317,8 @@ struct sock *sk_clone_lock(const struct
24262 get_net(sock_net(newsk));
24263 + sock_vx_init(newsk);
24264 + sock_nx_init(newsk);
24265 sk_node_init(&newsk->sk_node);
24266 sock_lock_init(newsk);
24267 bh_lock_sock(newsk);
24268 @@ -1362,6 +1375,12 @@ struct sock *sk_clone_lock(const struct
24270 atomic_set(&newsk->sk_refcnt, 2);
24272 + set_vx_info(&newsk->sk_vx_info, sk->sk_vx_info);
24273 + newsk->sk_xid = sk->sk_xid;
24274 + vx_sock_inc(newsk);
24275 + set_nx_info(&newsk->sk_nx_info, sk->sk_nx_info);
24276 + newsk->sk_nid = sk->sk_nid;
24279 * Increment the counter in the same struct proto as the master
24280 * sock (sk_refcnt_debug_inc uses newsk->sk_prot->socks, that
24281 @@ -2118,6 +2137,12 @@ void sock_init_data(struct socket *sock,
24283 sk->sk_stamp = ktime_set(-1L, 0);
24285 + set_vx_info(&sk->sk_vx_info, current_vx_info());
24286 + sk->sk_xid = vx_current_xid();
24288 + set_nx_info(&sk->sk_nx_info, current_nx_info());
24289 + sk->sk_nid = nx_current_nid();
24292 * Before updating sk_refcnt, we must commit prior changes to memory
24293 * (Documentation/RCU/rculist_nulls.txt for details)
24294 diff -NurpP --minimal linux-3.5/net/ipv4/af_inet.c linux-3.5-vs2.3.4/net/ipv4/af_inet.c
24295 --- linux-3.5/net/ipv4/af_inet.c 2012-07-22 23:39:48.000000000 +0200
24296 +++ linux-3.5-vs2.3.4/net/ipv4/af_inet.c 2012-07-23 01:45:55.000000000 +0200
24297 @@ -118,6 +118,7 @@
24298 #ifdef CONFIG_IP_MROUTE
24299 #include <linux/mroute.h>
24301 +#include <linux/vs_limit.h>
24304 /* The inetsw table contains everything that inet_create needs to
24305 @@ -327,9 +328,13 @@ lookup_protocol:
24309 + if ((protocol == IPPROTO_ICMP) &&
24310 + nx_capable(CAP_NET_RAW, NXC_RAW_ICMP))
24313 if (sock->type == SOCK_RAW && !kern && !capable(CAP_NET_RAW))
24314 goto out_rcu_unlock;
24317 err = -EAFNOSUPPORT;
24318 if (!inet_netns_ok(net, protocol))
24319 goto out_rcu_unlock;
24320 @@ -454,6 +459,7 @@ int inet_bind(struct socket *sock, struc
24321 struct sockaddr_in *addr = (struct sockaddr_in *)uaddr;
24322 struct sock *sk = sock->sk;
24323 struct inet_sock *inet = inet_sk(sk);
24324 + struct nx_v4_sock_addr nsa;
24325 unsigned short snum;
24328 @@ -477,7 +483,11 @@ int inet_bind(struct socket *sock, struc
24332 - chk_addr_ret = inet_addr_type(sock_net(sk), addr->sin_addr.s_addr);
24333 + err = v4_map_sock_addr(inet, addr, &nsa);
24337 + chk_addr_ret = inet_addr_type(sock_net(sk), nsa.saddr);
24339 /* Not specified by any standard per-se, however it breaks too
24340 * many applications when removed. It is unfortunate since
24341 @@ -489,7 +499,7 @@ int inet_bind(struct socket *sock, struc
24342 err = -EADDRNOTAVAIL;
24343 if (!sysctl_ip_nonlocal_bind &&
24344 !(inet->freebind || inet->transparent) &&
24345 - addr->sin_addr.s_addr != htonl(INADDR_ANY) &&
24346 + nsa.saddr != htonl(INADDR_ANY) &&
24347 chk_addr_ret != RTN_LOCAL &&
24348 chk_addr_ret != RTN_MULTICAST &&
24349 chk_addr_ret != RTN_BROADCAST)
24350 @@ -514,7 +524,7 @@ int inet_bind(struct socket *sock, struc
24351 if (sk->sk_state != TCP_CLOSE || inet->inet_num)
24352 goto out_release_sock;
24354 - inet->inet_rcv_saddr = inet->inet_saddr = addr->sin_addr.s_addr;
24355 + v4_set_sock_addr(inet, &nsa);
24356 if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)
24357 inet->inet_saddr = 0; /* Use device */
24359 @@ -717,11 +727,13 @@ int inet_getname(struct socket *sock, st
24362 sin->sin_port = inet->inet_dport;
24363 - sin->sin_addr.s_addr = inet->inet_daddr;
24364 + sin->sin_addr.s_addr =
24365 + nx_map_sock_lback(sk->sk_nx_info, inet->inet_daddr);
24367 __be32 addr = inet->inet_rcv_saddr;
24369 addr = inet->inet_saddr;
24370 + addr = nx_map_sock_lback(sk->sk_nx_info, addr);
24371 sin->sin_port = inet->inet_sport;
24372 sin->sin_addr.s_addr = addr;
24374 diff -NurpP --minimal linux-3.5/net/ipv4/arp.c linux-3.5-vs2.3.4/net/ipv4/arp.c
24375 --- linux-3.5/net/ipv4/arp.c 2012-07-22 23:39:48.000000000 +0200
24376 +++ linux-3.5-vs2.3.4/net/ipv4/arp.c 2012-07-23 01:45:55.000000000 +0200
24377 @@ -1318,6 +1318,7 @@ static void arp_format_neigh_entry(struc
24378 struct net_device *dev = n->dev;
24379 int hatype = dev->type;
24381 + /* FIXME: check for network context */
24382 read_lock(&n->lock);
24383 /* Convert hardware address to XX:XX:XX:XX ... form. */
24384 #if IS_ENABLED(CONFIG_AX25)
24385 @@ -1349,6 +1350,7 @@ static void arp_format_pneigh_entry(stru
24386 int hatype = dev ? dev->type : 0;
24389 + /* FIXME: check for network context */
24390 sprintf(tbuf, "%pI4", n->key);
24391 seq_printf(seq, "%-16s 0x%-10x0x%-10x%s * %s\n",
24392 tbuf, hatype, ATF_PUBL | ATF_PERM, "00:00:00:00:00:00",
24393 diff -NurpP --minimal linux-3.5/net/ipv4/devinet.c linux-3.5-vs2.3.4/net/ipv4/devinet.c
24394 --- linux-3.5/net/ipv4/devinet.c 2012-07-22 23:39:48.000000000 +0200
24395 +++ linux-3.5-vs2.3.4/net/ipv4/devinet.c 2012-07-23 01:45:55.000000000 +0200
24396 @@ -516,6 +516,7 @@ struct in_device *inetdev_by_index(struc
24398 EXPORT_SYMBOL(inetdev_by_index);
24401 /* Called only from RTNL semaphored context. No locks. */
24403 struct in_ifaddr *inet_ifa_byprefix(struct in_device *in_dev, __be32 prefix,
24404 @@ -757,6 +758,8 @@ int devinet_ioctl(struct net *net, unsig
24406 in_dev = __in_dev_get_rtnl(dev);
24408 + struct nx_info *nxi = current_nx_info();
24410 if (tryaddrmatch) {
24411 /* Matthias Andree */
24412 /* compare label and address (4.4BSD style) */
24413 @@ -765,6 +768,8 @@ int devinet_ioctl(struct net *net, unsig
24414 This is checked above. */
24415 for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL;
24416 ifap = &ifa->ifa_next) {
24417 + if (!nx_v4_ifa_visible(nxi, ifa))
24419 if (!strcmp(ifr.ifr_name, ifa->ifa_label) &&
24420 sin_orig.sin_addr.s_addr ==
24422 @@ -777,9 +782,12 @@ int devinet_ioctl(struct net *net, unsig
24423 comparing just the label */
24425 for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL;
24426 - ifap = &ifa->ifa_next)
24427 + ifap = &ifa->ifa_next) {
24428 + if (!nx_v4_ifa_visible(nxi, ifa))
24430 if (!strcmp(ifr.ifr_name, ifa->ifa_label))
24436 @@ -932,6 +940,8 @@ static int inet_gifconf(struct net_devic
24439 for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) {
24440 + if (!nx_v4_ifa_visible(current_nx_info(), ifa))
24443 done += sizeof(ifr);
24445 @@ -1291,6 +1301,7 @@ static int inet_dump_ifaddr(struct sk_bu
24446 struct net_device *dev;
24447 struct in_device *in_dev;
24448 struct in_ifaddr *ifa;
24449 + struct sock *sk = skb->sk;
24450 struct hlist_head *head;
24451 struct hlist_node *node;
24453 @@ -1313,6 +1324,8 @@ static int inet_dump_ifaddr(struct sk_bu
24455 for (ifa = in_dev->ifa_list, ip_idx = 0; ifa;
24456 ifa = ifa->ifa_next, ip_idx++) {
24457 + if (sk && !nx_v4_ifa_visible(sk->sk_nx_info, ifa))
24459 if (ip_idx < s_ip_idx)
24461 if (inet_fill_ifaddr(skb, ifa,
24462 diff -NurpP --minimal linux-3.5/net/ipv4/fib_trie.c linux-3.5-vs2.3.4/net/ipv4/fib_trie.c
24463 --- linux-3.5/net/ipv4/fib_trie.c 2012-05-21 18:07:40.000000000 +0200
24464 +++ linux-3.5-vs2.3.4/net/ipv4/fib_trie.c 2012-07-23 01:45:55.000000000 +0200
24465 @@ -2556,6 +2556,7 @@ static int fib_route_seq_show(struct seq
24466 || fa->fa_type == RTN_MULTICAST)
24469 + /* FIXME: check for network context? */
24472 "%s\t%08X\t%08X\t%04X\t%d\t%u\t"
24473 diff -NurpP --minimal linux-3.5/net/ipv4/inet_connection_sock.c linux-3.5-vs2.3.4/net/ipv4/inet_connection_sock.c
24474 --- linux-3.5/net/ipv4/inet_connection_sock.c 2012-07-22 23:39:48.000000000 +0200
24475 +++ linux-3.5-vs2.3.4/net/ipv4/inet_connection_sock.c 2012-07-23 01:45:55.000000000 +0200
24476 @@ -53,6 +53,37 @@ void inet_get_local_port_range(int *low,
24478 EXPORT_SYMBOL(inet_get_local_port_range);
24480 +int ipv4_rcv_saddr_equal(const struct sock *sk1, const struct sock *sk2)
24482 + __be32 sk1_rcv_saddr = sk_rcv_saddr(sk1),
24483 + sk2_rcv_saddr = sk_rcv_saddr(sk2);
24485 + if (inet_v6_ipv6only(sk2))
24488 + if (sk1_rcv_saddr &&
24490 + sk1_rcv_saddr == sk2_rcv_saddr)
24493 + if (sk1_rcv_saddr &&
24494 + !sk2_rcv_saddr &&
24495 + v4_addr_in_nx_info(sk2->sk_nx_info, sk1_rcv_saddr, NXA_MASK_BIND))
24498 + if (sk2_rcv_saddr &&
24499 + !sk1_rcv_saddr &&
24500 + v4_addr_in_nx_info(sk1->sk_nx_info, sk2_rcv_saddr, NXA_MASK_BIND))
24503 + if (!sk1_rcv_saddr &&
24504 + !sk2_rcv_saddr &&
24505 + nx_v4_addr_conflict(sk1->sk_nx_info, sk2->sk_nx_info))
24511 int inet_csk_bind_conflict(const struct sock *sk,
24512 const struct inet_bind_bucket *tb, bool relax)
24514 @@ -75,9 +106,7 @@ int inet_csk_bind_conflict(const struct
24515 sk->sk_bound_dev_if == sk2->sk_bound_dev_if)) {
24516 if (!reuse || !sk2->sk_reuse ||
24517 sk2->sk_state == TCP_LISTEN) {
24518 - const __be32 sk2_rcv_saddr = sk_rcv_saddr(sk2);
24519 - if (!sk2_rcv_saddr || !sk_rcv_saddr(sk) ||
24520 - sk2_rcv_saddr == sk_rcv_saddr(sk))
24521 + if (ipv4_rcv_saddr_equal(sk, sk2))
24524 if (!relax && reuse && sk2->sk_reuse &&
24525 diff -NurpP --minimal linux-3.5/net/ipv4/inet_diag.c linux-3.5-vs2.3.4/net/ipv4/inet_diag.c
24526 --- linux-3.5/net/ipv4/inet_diag.c 2012-07-22 23:39:48.000000000 +0200
24527 +++ linux-3.5-vs2.3.4/net/ipv4/inet_diag.c 2012-07-23 01:45:55.000000000 +0200
24530 #include <linux/inet.h>
24531 #include <linux/stddef.h>
24532 +#include <linux/vs_network.h>
24533 +#include <linux/vs_inet.h>
24535 #include <linux/inet_diag.h>
24536 #include <linux/sock_diag.h>
24537 @@ -106,8 +108,10 @@ int inet_sk_diag_fill(struct sock *sk, s
24539 r->id.idiag_sport = inet->inet_sport;
24540 r->id.idiag_dport = inet->inet_dport;
24541 - r->id.idiag_src[0] = inet->inet_rcv_saddr;
24542 - r->id.idiag_dst[0] = inet->inet_daddr;
24543 + r->id.idiag_src[0] = nx_map_sock_lback(sk->sk_nx_info,
24544 + inet->inet_rcv_saddr);
24545 + r->id.idiag_dst[0] = nx_map_sock_lback(sk->sk_nx_info,
24546 + inet->inet_daddr);
24548 /* IPv6 dual-stack sockets use inet->tos for IPv4 connections,
24549 * hence this needs to be included regardless of socket family.
24550 @@ -227,8 +231,8 @@ static int inet_twsk_diag_fill(struct in
24551 sock_diag_save_cookie(tw, r->id.idiag_cookie);
24552 r->id.idiag_sport = tw->tw_sport;
24553 r->id.idiag_dport = tw->tw_dport;
24554 - r->id.idiag_src[0] = tw->tw_rcv_saddr;
24555 - r->id.idiag_dst[0] = tw->tw_daddr;
24556 + r->id.idiag_src[0] = nx_map_sock_lback(tw->tw_nx_info, tw->tw_rcv_saddr);
24557 + r->id.idiag_dst[0] = nx_map_sock_lback(tw->tw_nx_info, tw->tw_daddr);
24558 r->idiag_state = tw->tw_substate;
24559 r->idiag_timer = 3;
24560 r->idiag_expires = DIV_ROUND_UP(tmo * 1000, HZ);
24561 @@ -272,12 +276,14 @@ int inet_diag_dump_one_icsk(struct inet_
24564 if (req->sdiag_family == AF_INET) {
24565 + /* TODO: lback */
24566 sk = inet_lookup(&init_net, hashinfo, req->id.idiag_dst[0],
24567 req->id.idiag_dport, req->id.idiag_src[0],
24568 req->id.idiag_sport, req->id.idiag_if);
24570 #if IS_ENABLED(CONFIG_IPV6)
24571 else if (req->sdiag_family == AF_INET6) {
24572 + /* TODO: lback */
24573 sk = inet6_lookup(&init_net, hashinfo,
24574 (struct in6_addr *)req->id.idiag_dst,
24575 req->id.idiag_dport,
24576 @@ -472,6 +478,7 @@ int inet_diag_bc_sk(const struct nlattr
24580 + /* TODO: lback */
24581 entry.saddr = &inet->inet_rcv_saddr;
24582 entry.daddr = &inet->inet_daddr;
24584 @@ -570,6 +577,7 @@ static int inet_twsk_diag_dump(struct in
24588 + /* TODO: lback */
24589 entry.saddr = &tw->tw_rcv_saddr;
24590 entry.daddr = &tw->tw_daddr;
24592 @@ -615,8 +623,8 @@ static int inet_diag_fill_req(struct sk_
24594 r->id.idiag_sport = inet->inet_sport;
24595 r->id.idiag_dport = ireq->rmt_port;
24596 - r->id.idiag_src[0] = ireq->loc_addr;
24597 - r->id.idiag_dst[0] = ireq->rmt_addr;
24598 + r->id.idiag_src[0] = nx_map_sock_lback(sk->sk_nx_info, ireq->loc_addr);
24599 + r->id.idiag_dst[0] = nx_map_sock_lback(sk->sk_nx_info, ireq->rmt_addr);
24600 r->idiag_expires = jiffies_to_msecs(tmo);
24601 r->idiag_rqueue = 0;
24602 r->idiag_wqueue = 0;
24603 @@ -683,6 +691,7 @@ static int inet_diag_dump_reqs(struct sk
24607 + /* TODO: lback */
24609 #if IS_ENABLED(CONFIG_IPV6)
24610 (entry.family == AF_INET6) ?
24611 @@ -744,6 +753,8 @@ void inet_diag_dump_icsk(struct inet_has
24612 sk_nulls_for_each(sk, node, &ilb->head) {
24613 struct inet_sock *inet = inet_sk(sk);
24615 + if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
24620 @@ -814,6 +825,8 @@ skip_listen_ht:
24621 sk_nulls_for_each(sk, node, &head->chain) {
24622 struct inet_sock *inet = inet_sk(sk);
24624 + if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
24628 if (!(r->idiag_states & (1 << sk->sk_state)))
24629 @@ -841,6 +854,8 @@ next_normal:
24630 inet_twsk_for_each(tw, node,
24633 + if (!nx_check(tw->tw_nid, VS_WATCH_P | VS_IDENT))
24637 if (r->sdiag_family != AF_UNSPEC &&
24638 diff -NurpP --minimal linux-3.5/net/ipv4/inet_hashtables.c linux-3.5-vs2.3.4/net/ipv4/inet_hashtables.c
24639 --- linux-3.5/net/ipv4/inet_hashtables.c 2012-07-22 23:39:48.000000000 +0200
24640 +++ linux-3.5-vs2.3.4/net/ipv4/inet_hashtables.c 2012-07-23 01:45:55.000000000 +0200
24642 #include <net/inet_connection_sock.h>
24643 #include <net/inet_hashtables.h>
24644 #include <net/secure_seq.h>
24645 +#include <net/route.h>
24646 #include <net/ip.h>
24649 @@ -156,6 +157,11 @@ static inline int compute_score(struct s
24650 if (rcv_saddr != daddr)
24654 + /* block non nx_info ips */
24655 + if (!v4_addr_in_nx_info(sk->sk_nx_info,
24656 + daddr, NXA_MASK_BIND))
24659 if (sk->sk_bound_dev_if) {
24660 if (sk->sk_bound_dev_if != dif)
24661 @@ -173,7 +179,6 @@ static inline int compute_score(struct s
24662 * wildcarded during the search since they can never be otherwise.
24666 struct sock *__inet_lookup_listener(struct net *net,
24667 struct inet_hashinfo *hashinfo,
24668 const __be32 daddr, const unsigned short hnum,
24669 @@ -196,6 +201,7 @@ begin:
24675 * if the nulls value we got at the end of this lookup is
24676 * not the expected one, we must restart lookup.
24677 diff -NurpP --minimal linux-3.5/net/ipv4/netfilter/nf_nat_helper.c linux-3.5-vs2.3.4/net/ipv4/netfilter/nf_nat_helper.c
24678 --- linux-3.5/net/ipv4/netfilter/nf_nat_helper.c 2012-03-19 19:47:33.000000000 +0100
24679 +++ linux-3.5-vs2.3.4/net/ipv4/netfilter/nf_nat_helper.c 2012-07-23 01:45:55.000000000 +0200
24681 #include <net/route.h>
24683 #include <linux/netfilter_ipv4.h>
24684 +#include <net/route.h>
24685 #include <net/netfilter/nf_conntrack.h>
24686 #include <net/netfilter/nf_conntrack_helper.h>
24687 #include <net/netfilter/nf_conntrack_ecache.h>
24688 diff -NurpP --minimal linux-3.5/net/ipv4/netfilter.c linux-3.5-vs2.3.4/net/ipv4/netfilter.c
24689 --- linux-3.5/net/ipv4/netfilter.c 2012-07-22 23:39:48.000000000 +0200
24690 +++ linux-3.5-vs2.3.4/net/ipv4/netfilter.c 2012-07-23 01:45:55.000000000 +0200
24692 #include <linux/skbuff.h>
24693 #include <linux/gfp.h>
24694 #include <linux/export.h>
24695 -#include <net/route.h>
24696 +// #include <net/route.h>
24697 #include <net/xfrm.h>
24698 #include <net/ip.h>
24699 #include <net/netfilter/nf_queue.h>
24700 diff -NurpP --minimal linux-3.5/net/ipv4/raw.c linux-3.5-vs2.3.4/net/ipv4/raw.c
24701 --- linux-3.5/net/ipv4/raw.c 2012-07-22 23:39:48.000000000 +0200
24702 +++ linux-3.5-vs2.3.4/net/ipv4/raw.c 2012-07-23 01:45:55.000000000 +0200
24703 @@ -118,7 +118,7 @@ static struct sock *__raw_v4_lookup(stru
24705 if (net_eq(sock_net(sk), net) && inet->inet_num == num &&
24706 !(inet->inet_daddr && inet->inet_daddr != raddr) &&
24707 - !(inet->inet_rcv_saddr && inet->inet_rcv_saddr != laddr) &&
24708 + v4_sock_addr_match(sk->sk_nx_info, inet, laddr) &&
24709 !(sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif))
24710 goto found; /* gotcha */
24712 @@ -390,6 +390,12 @@ static int raw_send_hdrinc(struct sock *
24713 icmp_out_count(net, ((struct icmphdr *)
24714 skb_transport_header(skb))->type);
24717 + if (!nx_check(0, VS_ADMIN) && !capable(CAP_NET_RAW) &&
24718 + sk->sk_nx_info &&
24719 + !v4_addr_in_nx_info(sk->sk_nx_info, iph->saddr, NXA_MASK_BIND))
24722 err = NF_HOOK(NFPROTO_IPV4, NF_INET_LOCAL_OUT, skb, NULL,
24723 rt->dst.dev, dst_output);
24725 @@ -575,6 +581,16 @@ static int raw_sendmsg(struct kiocb *ioc
24729 + if (sk->sk_nx_info) {
24730 + rt = ip_v4_find_src(sock_net(sk), sk->sk_nx_info, &fl4);
24731 + if (IS_ERR(rt)) {
24732 + err = PTR_ERR(rt);
24739 security_sk_classify_flow(sk, flowi4_to_flowi(&fl4));
24740 rt = ip_route_output_flow(sock_net(sk), &fl4, sk);
24742 @@ -651,17 +667,19 @@ static int raw_bind(struct sock *sk, str
24744 struct inet_sock *inet = inet_sk(sk);
24745 struct sockaddr_in *addr = (struct sockaddr_in *) uaddr;
24746 + struct nx_v4_sock_addr nsa = { 0 };
24750 if (sk->sk_state != TCP_CLOSE || addr_len < sizeof(struct sockaddr_in))
24752 - chk_addr_ret = inet_addr_type(sock_net(sk), addr->sin_addr.s_addr);
24753 + v4_map_sock_addr(inet, addr, &nsa);
24754 + chk_addr_ret = inet_addr_type(sock_net(sk), nsa.saddr);
24755 ret = -EADDRNOTAVAIL;
24756 - if (addr->sin_addr.s_addr && chk_addr_ret != RTN_LOCAL &&
24757 + if (nsa.saddr && chk_addr_ret != RTN_LOCAL &&
24758 chk_addr_ret != RTN_MULTICAST && chk_addr_ret != RTN_BROADCAST)
24760 - inet->inet_rcv_saddr = inet->inet_saddr = addr->sin_addr.s_addr;
24761 + v4_set_sock_addr(inet, &nsa);
24762 if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)
24763 inet->inet_saddr = 0; /* Use device */
24765 @@ -713,7 +731,8 @@ static int raw_recvmsg(struct kiocb *ioc
24766 /* Copy the address. */
24768 sin->sin_family = AF_INET;
24769 - sin->sin_addr.s_addr = ip_hdr(skb)->saddr;
24770 + sin->sin_addr.s_addr =
24771 + nx_map_sock_lback(sk->sk_nx_info, ip_hdr(skb)->saddr);
24773 memset(&sin->sin_zero, 0, sizeof(sin->sin_zero));
24775 @@ -909,7 +928,8 @@ static struct sock *raw_get_first(struct
24776 struct hlist_node *node;
24778 sk_for_each(sk, node, &state->h->ht[state->bucket])
24779 - if (sock_net(sk) == seq_file_net(seq))
24780 + if ((sock_net(sk) == seq_file_net(seq)) &&
24781 + nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
24785 @@ -925,7 +945,8 @@ static struct sock *raw_get_next(struct
24789 - } while (sk && sock_net(sk) != seq_file_net(seq));
24790 + } while (sk && ((sock_net(sk) != seq_file_net(seq)) ||
24791 + !nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)));
24793 if (!sk && ++state->bucket < RAW_HTABLE_SIZE) {
24794 sk = sk_head(&state->h->ht[state->bucket]);
24795 diff -NurpP --minimal linux-3.5/net/ipv4/route.c linux-3.5-vs2.3.4/net/ipv4/route.c
24796 --- linux-3.5/net/ipv4/route.c 2012-07-22 23:39:48.000000000 +0200
24797 +++ linux-3.5-vs2.3.4/net/ipv4/route.c 2012-07-23 01:45:55.000000000 +0200
24798 @@ -2690,7 +2690,7 @@ static struct rtable *ip_route_output_sl
24801 if (fl4->flowi4_oif) {
24802 - dev_out = dev_get_by_index_rcu(net, fl4->flowi4_oif);
24803 + dev_out = dev_get_by_index_real_rcu(net, fl4->flowi4_oif);
24804 rth = ERR_PTR(-ENODEV);
24805 if (dev_out == NULL)
24807 diff -NurpP --minimal linux-3.5/net/ipv4/tcp.c linux-3.5-vs2.3.4/net/ipv4/tcp.c
24808 --- linux-3.5/net/ipv4/tcp.c 2012-07-22 23:39:48.000000000 +0200
24809 +++ linux-3.5-vs2.3.4/net/ipv4/tcp.c 2012-07-23 01:45:55.000000000 +0200
24810 @@ -268,6 +268,7 @@
24811 #include <linux/crypto.h>
24812 #include <linux/time.h>
24813 #include <linux/slab.h>
24814 +#include <linux/in.h>
24816 #include <net/icmp.h>
24817 #include <net/tcp.h>
24818 diff -NurpP --minimal linux-3.5/net/ipv4/tcp_ipv4.c linux-3.5-vs2.3.4/net/ipv4/tcp_ipv4.c
24819 --- linux-3.5/net/ipv4/tcp_ipv4.c 2012-07-22 23:39:48.000000000 +0200
24820 +++ linux-3.5-vs2.3.4/net/ipv4/tcp_ipv4.c 2012-07-23 01:45:55.000000000 +0200
24821 @@ -2005,6 +2005,12 @@ static void *listening_get_next(struct s
24822 req = req->dl_next;
24825 + vxdprintk(VXD_CBIT(net, 6),
24826 + "sk,req: %p [#%d] (from %d)", req->sk,
24827 + (req->sk)?req->sk->sk_nid:0, nx_current_nid());
24829 + !nx_check(req->sk->sk_nid, VS_WATCH_P | VS_IDENT))
24831 if (req->rsk_ops->family == st->family) {
24834 @@ -2029,6 +2035,10 @@ get_req:
24837 sk_nulls_for_each_from(sk, node) {
24838 + vxdprintk(VXD_CBIT(net, 6), "sk: %p [#%d] (from %d)",
24839 + sk, sk->sk_nid, nx_current_nid());
24840 + if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
24842 if (!net_eq(sock_net(sk), net))
24844 if (sk->sk_family == st->family) {
24845 @@ -2105,6 +2115,11 @@ static void *established_get_first(struc
24847 spin_lock_bh(lock);
24848 sk_nulls_for_each(sk, node, &tcp_hashinfo.ehash[st->bucket].chain) {
24849 + vxdprintk(VXD_CBIT(net, 6),
24850 + "sk,egf: %p [#%d] (from %d)",
24851 + sk, sk->sk_nid, nx_current_nid());
24852 + if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
24854 if (sk->sk_family != st->family ||
24855 !net_eq(sock_net(sk), net)) {
24857 @@ -2115,6 +2130,11 @@ static void *established_get_first(struc
24858 st->state = TCP_SEQ_STATE_TIME_WAIT;
24859 inet_twsk_for_each(tw, node,
24860 &tcp_hashinfo.ehash[st->bucket].twchain) {
24861 + vxdprintk(VXD_CBIT(net, 6),
24862 + "tw: %p [#%d] (from %d)",
24863 + tw, tw->tw_nid, nx_current_nid());
24864 + if (!nx_check(tw->tw_nid, VS_WATCH_P | VS_IDENT))
24866 if (tw->tw_family != st->family ||
24867 !net_eq(twsk_net(tw), net)) {
24869 @@ -2144,7 +2164,9 @@ static void *established_get_next(struct
24873 - while (tw && (tw->tw_family != st->family || !net_eq(twsk_net(tw), net))) {
24874 + while (tw && (tw->tw_family != st->family ||
24875 + !net_eq(twsk_net(tw), net) ||
24876 + !nx_check(tw->tw_nid, VS_WATCH_P | VS_IDENT))) {
24880 @@ -2168,6 +2190,11 @@ get_tw:
24881 sk = sk_nulls_next(sk);
24883 sk_nulls_for_each_from(sk, node) {
24884 + vxdprintk(VXD_CBIT(net, 6),
24885 + "sk,egn: %p [#%d] (from %d)",
24886 + sk, sk->sk_nid, nx_current_nid());
24887 + if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
24889 if (sk->sk_family == st->family && net_eq(sock_net(sk), net))
24892 @@ -2373,9 +2400,9 @@ static void get_openreq4(const struct so
24893 seq_printf(f, "%4d: %08X:%04X %08X:%04X"
24894 " %02X %08X:%08X %02X:%08lX %08X %5d %8d %u %d %pK%n",
24897 + nx_map_sock_lback(current_nx_info(), ireq->loc_addr),
24898 ntohs(inet_sk(sk)->inet_sport),
24900 + nx_map_sock_lback(current_nx_info(), ireq->rmt_addr),
24901 ntohs(ireq->rmt_port),
24903 0, 0, /* could print option size, but that is af dependent. */
24904 @@ -2397,8 +2424,8 @@ static void get_tcp4_sock(struct sock *s
24905 const struct tcp_sock *tp = tcp_sk(sk);
24906 const struct inet_connection_sock *icsk = inet_csk(sk);
24907 const struct inet_sock *inet = inet_sk(sk);
24908 - __be32 dest = inet->inet_daddr;
24909 - __be32 src = inet->inet_rcv_saddr;
24910 + __be32 dest = nx_map_sock_lback(current_nx_info(), inet->inet_daddr);
24911 + __be32 src = nx_map_sock_lback(current_nx_info(), inet->inet_rcv_saddr);
24912 __u16 destp = ntohs(inet->inet_dport);
24913 __u16 srcp = ntohs(inet->inet_sport);
24915 @@ -2455,8 +2482,8 @@ static void get_timewait4_sock(const str
24919 - dest = tw->tw_daddr;
24920 - src = tw->tw_rcv_saddr;
24921 + dest = nx_map_sock_lback(current_nx_info(), tw->tw_daddr);
24922 + src = nx_map_sock_lback(current_nx_info(), tw->tw_rcv_saddr);
24923 destp = ntohs(tw->tw_dport);
24924 srcp = ntohs(tw->tw_sport);
24926 diff -NurpP --minimal linux-3.5/net/ipv4/tcp_minisocks.c linux-3.5-vs2.3.4/net/ipv4/tcp_minisocks.c
24927 --- linux-3.5/net/ipv4/tcp_minisocks.c 2012-07-22 23:39:48.000000000 +0200
24928 +++ linux-3.5-vs2.3.4/net/ipv4/tcp_minisocks.c 2012-07-23 01:45:55.000000000 +0200
24930 #include <linux/slab.h>
24931 #include <linux/sysctl.h>
24932 #include <linux/workqueue.h>
24933 +#include <linux/vs_limit.h>
24934 +#include <linux/vs_socket.h>
24935 +#include <linux/vs_context.h>
24936 #include <net/tcp.h>
24937 #include <net/inet_common.h>
24938 #include <net/xfrm.h>
24939 @@ -336,6 +339,11 @@ void tcp_time_wait(struct sock *sk, int
24940 tcptw->tw_ts_recent = tp->rx_opt.ts_recent;
24941 tcptw->tw_ts_recent_stamp = tp->rx_opt.ts_recent_stamp;
24943 + tw->tw_xid = sk->sk_xid;
24944 + tw->tw_vx_info = NULL;
24945 + tw->tw_nid = sk->sk_nid;
24946 + tw->tw_nx_info = NULL;
24948 #if IS_ENABLED(CONFIG_IPV6)
24949 if (tw->tw_family == PF_INET6) {
24950 struct ipv6_pinfo *np = inet6_sk(sk);
24951 diff -NurpP --minimal linux-3.5/net/ipv4/udp.c linux-3.5-vs2.3.4/net/ipv4/udp.c
24952 --- linux-3.5/net/ipv4/udp.c 2012-07-22 23:39:48.000000000 +0200
24953 +++ linux-3.5-vs2.3.4/net/ipv4/udp.c 2012-07-23 01:45:55.000000000 +0200
24954 @@ -299,14 +299,7 @@ fail:
24956 EXPORT_SYMBOL(udp_lib_get_port);
24958 -static int ipv4_rcv_saddr_equal(const struct sock *sk1, const struct sock *sk2)
24960 - struct inet_sock *inet1 = inet_sk(sk1), *inet2 = inet_sk(sk2);
24962 - return (!ipv6_only_sock(sk2) &&
24963 - (!inet1->inet_rcv_saddr || !inet2->inet_rcv_saddr ||
24964 - inet1->inet_rcv_saddr == inet2->inet_rcv_saddr));
24966 +extern int ipv4_rcv_saddr_equal(const struct sock *, const struct sock *);
24968 static unsigned int udp4_portaddr_hash(struct net *net, __be32 saddr,
24970 @@ -341,6 +334,11 @@ static inline int compute_score(struct s
24971 if (inet->inet_rcv_saddr != daddr)
24975 + /* block non nx_info ips */
24976 + if (!v4_addr_in_nx_info(sk->sk_nx_info,
24977 + daddr, NXA_MASK_BIND))
24980 if (inet->inet_daddr) {
24981 if (inet->inet_daddr != saddr)
24982 @@ -444,6 +442,7 @@ exact_match:
24987 /* UDP is nearly always wildcards out the wazoo, it makes no sense to try
24988 * harder than this. -DaveM
24990 @@ -489,6 +488,11 @@ begin:
24991 sk_nulls_for_each_rcu(sk, node, &hslot->head) {
24992 score = compute_score(sk, net, saddr, hnum, sport,
24993 daddr, dport, dif);
24994 + /* FIXME: disabled?
24995 + if (score == 9) {
24999 if (score > badness) {
25002 @@ -502,6 +506,7 @@ begin:
25003 if (get_nulls_value(node) != slot)
25008 if (unlikely(!atomic_inc_not_zero_hint(&result->sk_refcnt, 2)))
25010 @@ -511,6 +516,7 @@ begin:
25018 @@ -554,8 +560,7 @@ static inline struct sock *udp_v4_mcast_
25019 udp_sk(s)->udp_port_hash != hnum ||
25020 (inet->inet_daddr && inet->inet_daddr != rmt_addr) ||
25021 (inet->inet_dport != rmt_port && inet->inet_dport) ||
25022 - (inet->inet_rcv_saddr &&
25023 - inet->inet_rcv_saddr != loc_addr) ||
25024 + !v4_sock_addr_match(sk->sk_nx_info, inet, loc_addr) ||
25025 ipv6_only_sock(s) ||
25026 (s->sk_bound_dev_if && s->sk_bound_dev_if != dif))
25028 @@ -934,6 +939,16 @@ int udp_sendmsg(struct kiocb *iocb, stru
25029 inet_sk_flowi_flags(sk)|FLOWI_FLAG_CAN_SLEEP,
25030 faddr, saddr, dport, inet->inet_sport);
25032 + if (sk->sk_nx_info) {
25033 + rt = ip_v4_find_src(net, sk->sk_nx_info, fl4);
25034 + if (IS_ERR(rt)) {
25035 + err = PTR_ERR(rt);
25042 security_sk_classify_flow(sk, flowi4_to_flowi(fl4));
25043 rt = ip_route_output_flow(net, fl4, sk);
25045 @@ -1232,7 +1247,8 @@ try_again:
25047 sin->sin_family = AF_INET;
25048 sin->sin_port = udp_hdr(skb)->source;
25049 - sin->sin_addr.s_addr = ip_hdr(skb)->saddr;
25050 + sin->sin_addr.s_addr = nx_map_sock_lback(
25051 + skb->sk->sk_nx_info, ip_hdr(skb)->saddr);
25052 memset(sin->sin_zero, 0, sizeof(sin->sin_zero));
25054 if (inet->cmsg_flags)
25055 @@ -1980,6 +1996,8 @@ static struct sock *udp_get_first(struct
25056 sk_nulls_for_each(sk, node, &hslot->head) {
25057 if (!net_eq(sock_net(sk), net))
25059 + if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
25061 if (sk->sk_family == state->family)
25064 @@ -1997,7 +2015,9 @@ static struct sock *udp_get_next(struct
25067 sk = sk_nulls_next(sk);
25068 - } while (sk && (!net_eq(sock_net(sk), net) || sk->sk_family != state->family));
25069 + } while (sk && (!net_eq(sock_net(sk), net) ||
25070 + sk->sk_family != state->family ||
25071 + !nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)));
25074 if (state->bucket <= state->udp_table->mask)
25075 @@ -2093,8 +2113,8 @@ static void udp4_format_sock(struct sock
25076 int bucket, int *len)
25078 struct inet_sock *inet = inet_sk(sp);
25079 - __be32 dest = inet->inet_daddr;
25080 - __be32 src = inet->inet_rcv_saddr;
25081 + __be32 dest = nx_map_sock_lback(current_nx_info(), inet->inet_daddr);
25082 + __be32 src = nx_map_sock_lback(current_nx_info(), inet->inet_rcv_saddr);
25083 __u16 destp = ntohs(inet->inet_dport);
25084 __u16 srcp = ntohs(inet->inet_sport);
25086 diff -NurpP --minimal linux-3.5/net/ipv6/Kconfig linux-3.5-vs2.3.4/net/ipv6/Kconfig
25087 --- linux-3.5/net/ipv6/Kconfig 2012-07-22 23:39:48.000000000 +0200
25088 +++ linux-3.5-vs2.3.4/net/ipv6/Kconfig 2012-07-23 01:45:55.000000000 +0200
25091 # IPv6 as module will cause a CRASH if you try to unload it
25093 - tristate "The IPv6 protocol"
25095 + bool "The IPv6 protocol"
25098 This is complemental support for the IP version 6.
25099 You will still be able to do traditional IPv4 networking as well.
25100 diff -NurpP --minimal linux-3.5/net/ipv6/addrconf.c linux-3.5-vs2.3.4/net/ipv6/addrconf.c
25101 --- linux-3.5/net/ipv6/addrconf.c 2012-07-22 23:39:48.000000000 +0200
25102 +++ linux-3.5-vs2.3.4/net/ipv6/addrconf.c 2012-07-23 01:45:56.000000000 +0200
25104 #include <linux/proc_fs.h>
25105 #include <linux/seq_file.h>
25106 #include <linux/export.h>
25107 +#include <linux/vs_network.h>
25108 +#include <linux/vs_inet6.h>
25110 /* Set to 3 to get tracing... */
25111 #define ACONF_DEBUG 2
25112 @@ -1102,7 +1104,7 @@ out:
25114 int ipv6_dev_get_saddr(struct net *net, struct net_device *dst_dev,
25115 const struct in6_addr *daddr, unsigned int prefs,
25116 - struct in6_addr *saddr)
25117 + struct in6_addr *saddr, struct nx_info *nxi)
25119 struct ipv6_saddr_score scores[2],
25120 *score = &scores[0], *hiscore = &scores[1];
25121 @@ -1174,6 +1176,8 @@ int ipv6_dev_get_saddr(struct net *net,
25125 + if (!v6_addr_in_nx_info(nxi, &score->ifa->addr, -1))
25129 bitmap_zero(score->scorebits, IPV6_SADDR_RULE_MAX);
25130 @@ -3157,7 +3161,10 @@ static void if6_seq_stop(struct seq_file
25131 static int if6_seq_show(struct seq_file *seq, void *v)
25133 struct inet6_ifaddr *ifp = (struct inet6_ifaddr *)v;
25134 - seq_printf(seq, "%pi6 %02x %02x %02x %02x %8s\n",
25136 + if (nx_check(0, VS_ADMIN|VS_WATCH) ||
25137 + v6_addr_in_nx_info(current_nx_info(), &ifp->addr, -1))
25138 + seq_printf(seq, "%pi6 %02x %02x %02x %02x %8s\n",
25140 ifp->idev->dev->ifindex,
25142 @@ -3663,6 +3670,11 @@ static int in6_dump_addrs(struct inet6_d
25143 struct ifacaddr6 *ifaca;
25145 int ip_idx = *p_ip_idx;
25146 + struct nx_info *nxi = skb->sk ? skb->sk->sk_nx_info : NULL;
25148 + /* disable ipv6 on non v6 guests */
25149 + if (nxi && !nx_info_has_v6(nxi))
25152 read_lock_bh(&idev->lock);
25154 @@ -3673,6 +3685,8 @@ static int in6_dump_addrs(struct inet6_d
25155 list_for_each_entry(ifa, &idev->addr_list, if_list) {
25156 if (++ip_idx < s_ip_idx)
25158 + if (!v6_addr_in_nx_info(nxi, &ifa->addr, -1))
25160 err = inet6_fill_ifaddr(skb, ifa,
25161 NETLINK_CB(cb->skb).pid,
25162 cb->nlh->nlmsg_seq,
25163 @@ -3689,6 +3703,8 @@ static int in6_dump_addrs(struct inet6_d
25164 ifmca = ifmca->next, ip_idx++) {
25165 if (ip_idx < s_ip_idx)
25167 + if (!v6_addr_in_nx_info(nxi, &ifmca->mca_addr, -1))
25169 err = inet6_fill_ifmcaddr(skb, ifmca,
25170 NETLINK_CB(cb->skb).pid,
25171 cb->nlh->nlmsg_seq,
25172 @@ -3704,6 +3720,8 @@ static int in6_dump_addrs(struct inet6_d
25173 ifaca = ifaca->aca_next, ip_idx++) {
25174 if (ip_idx < s_ip_idx)
25176 + if (!v6_addr_in_nx_info(nxi, &ifaca->aca_addr, -1))
25178 err = inet6_fill_ifacaddr(skb, ifaca,
25179 NETLINK_CB(cb->skb).pid,
25180 cb->nlh->nlmsg_seq,
25181 @@ -4087,6 +4105,11 @@ static int inet6_dump_ifinfo(struct sk_b
25182 struct inet6_dev *idev;
25183 struct hlist_head *head;
25184 struct hlist_node *node;
25185 + struct nx_info *nxi = skb->sk ? skb->sk->sk_nx_info : NULL;
25187 + /* FIXME: maybe disable ipv6 on non v6 guests?
25188 + if (skb->sk && skb->sk->sk_vx_info)
25189 + return skb->len; */
25192 s_idx = cb->args[1];
25193 @@ -4098,6 +4121,8 @@ static int inet6_dump_ifinfo(struct sk_b
25194 hlist_for_each_entry_rcu(dev, node, head, index_hlist) {
25197 + if (!v6_dev_in_nx_info(dev, nxi))
25199 idev = __in6_dev_get(dev);
25202 diff -NurpP --minimal linux-3.5/net/ipv6/af_inet6.c linux-3.5-vs2.3.4/net/ipv6/af_inet6.c
25203 --- linux-3.5/net/ipv6/af_inet6.c 2012-07-22 23:39:48.000000000 +0200
25204 +++ linux-3.5-vs2.3.4/net/ipv6/af_inet6.c 2012-07-23 01:45:56.000000000 +0200
25206 #include <linux/netdevice.h>
25207 #include <linux/icmpv6.h>
25208 #include <linux/netfilter_ipv6.h>
25209 +#include <linux/vs_inet.h>
25210 +#include <linux/vs_inet6.h>
25212 #include <net/ip.h>
25213 #include <net/ipv6.h>
25214 @@ -160,9 +162,12 @@ lookup_protocol:
25218 + if ((protocol == IPPROTO_ICMPV6) &&
25219 + nx_capable(CAP_NET_RAW, NXC_RAW_ICMP))
25221 if (sock->type == SOCK_RAW && !kern && !capable(CAP_NET_RAW))
25222 goto out_rcu_unlock;
25225 sock->ops = answer->ops;
25226 answer_prot = answer->prot;
25227 answer_no_check = answer->no_check;
25228 @@ -262,6 +267,7 @@ int inet6_bind(struct socket *sock, stru
25229 struct inet_sock *inet = inet_sk(sk);
25230 struct ipv6_pinfo *np = inet6_sk(sk);
25231 struct net *net = sock_net(sk);
25232 + struct nx_v6_sock_addr nsa;
25234 unsigned short snum;
25236 @@ -277,6 +283,10 @@ int inet6_bind(struct socket *sock, stru
25237 if (addr->sin6_family != AF_INET6)
25238 return -EAFNOSUPPORT;
25240 + err = v6_map_sock_addr(inet, addr, &nsa);
25244 addr_type = ipv6_addr_type(&addr->sin6_addr);
25245 if ((addr_type & IPV6_ADDR_MULTICAST) && sock->type == SOCK_STREAM)
25247 @@ -308,6 +318,7 @@ int inet6_bind(struct socket *sock, stru
25248 /* Reproduce AF_INET checks to make the bindings consistent */
25249 v4addr = addr->sin6_addr.s6_addr32[3];
25250 chk_addr_ret = inet_addr_type(net, v4addr);
25252 if (!sysctl_ip_nonlocal_bind &&
25253 !(inet->freebind || inet->transparent) &&
25254 v4addr != htonl(INADDR_ANY) &&
25255 @@ -317,6 +328,10 @@ int inet6_bind(struct socket *sock, stru
25256 err = -EADDRNOTAVAIL;
25259 + if (!v4_addr_in_nx_info(sk->sk_nx_info, v4addr, NXA_MASK_BIND)) {
25260 + err = -EADDRNOTAVAIL;
25264 if (addr_type != IPV6_ADDR_ANY) {
25265 struct net_device *dev = NULL;
25266 @@ -343,6 +358,11 @@ int inet6_bind(struct socket *sock, stru
25270 + if (!v6_addr_in_nx_info(sk->sk_nx_info, &addr->sin6_addr, -1)) {
25271 + err = -EADDRNOTAVAIL;
25275 /* ipv4 addr of the socket is invalid. Only the
25276 * unspecified and mapped address have a v4 equivalent.
25278 @@ -359,6 +379,9 @@ int inet6_bind(struct socket *sock, stru
25282 + /* what's that for? */
25283 + v6_set_sock_addr(inet, &nsa);
25285 inet->inet_rcv_saddr = v4addr;
25286 inet->inet_saddr = v4addr;
25288 @@ -460,9 +483,11 @@ int inet6_getname(struct socket *sock, s
25290 sin->sin6_port = inet->inet_dport;
25291 sin->sin6_addr = np->daddr;
25292 + /* FIXME: remap lback? */
25294 sin->sin6_flowinfo = np->flow_label;
25296 + /* FIXME: remap lback? */
25297 if (ipv6_addr_any(&np->rcv_saddr))
25298 sin->sin6_addr = np->saddr;
25300 diff -NurpP --minimal linux-3.5/net/ipv6/datagram.c linux-3.5-vs2.3.4/net/ipv6/datagram.c
25301 --- linux-3.5/net/ipv6/datagram.c 2012-07-22 23:39:48.000000000 +0200
25302 +++ linux-3.5-vs2.3.4/net/ipv6/datagram.c 2012-07-23 01:45:56.000000000 +0200
25303 @@ -645,7 +645,7 @@ int datagram_send_ctl(struct net *net, s
25306 if (fl6->flowi6_oif) {
25307 - dev = dev_get_by_index_rcu(net, fl6->flowi6_oif);
25308 + dev = dev_get_by_index_real_rcu(net, fl6->flowi6_oif);
25312 diff -NurpP --minimal linux-3.5/net/ipv6/fib6_rules.c linux-3.5-vs2.3.4/net/ipv6/fib6_rules.c
25313 --- linux-3.5/net/ipv6/fib6_rules.c 2012-07-22 23:39:48.000000000 +0200
25314 +++ linux-3.5-vs2.3.4/net/ipv6/fib6_rules.c 2012-07-23 01:45:56.000000000 +0200
25315 @@ -90,7 +90,7 @@ static int fib6_rule_action(struct fib_r
25316 ip6_dst_idev(&rt->dst)->dev,
25318 rt6_flags2srcprefs(flags),
25322 if (!ipv6_prefix_equal(&saddr, &r->src.addr,
25324 diff -NurpP --minimal linux-3.5/net/ipv6/inet6_hashtables.c linux-3.5-vs2.3.4/net/ipv6/inet6_hashtables.c
25325 --- linux-3.5/net/ipv6/inet6_hashtables.c 2011-10-24 18:45:34.000000000 +0200
25326 +++ linux-3.5-vs2.3.4/net/ipv6/inet6_hashtables.c 2012-07-23 01:45:56.000000000 +0200
25329 #include <linux/module.h>
25330 #include <linux/random.h>
25331 +#include <linux/vs_inet6.h>
25333 #include <net/inet_connection_sock.h>
25334 #include <net/inet_hashtables.h>
25335 @@ -83,7 +84,6 @@ struct sock *__inet6_lookup_established(
25336 unsigned int slot = hash & hashinfo->ehash_mask;
25337 struct inet_ehash_bucket *head = &hashinfo->ehash[slot];
25342 sk_nulls_for_each_rcu(sk, node, &head->chain) {
25343 @@ -95,7 +95,7 @@ begin:
25351 if (get_nulls_value(node) != slot)
25352 @@ -141,6 +141,9 @@ static inline int compute_score(struct s
25353 if (!ipv6_addr_equal(&np->rcv_saddr, daddr))
25357 + if (!v6_addr_in_nx_info(sk->sk_nx_info, daddr, -1))
25360 if (sk->sk_bound_dev_if) {
25361 if (sk->sk_bound_dev_if != dif)
25362 diff -NurpP --minimal linux-3.5/net/ipv6/ip6_output.c linux-3.5-vs2.3.4/net/ipv6/ip6_output.c
25363 --- linux-3.5/net/ipv6/ip6_output.c 2012-07-22 23:39:48.000000000 +0200
25364 +++ linux-3.5-vs2.3.4/net/ipv6/ip6_output.c 2012-07-23 01:45:56.000000000 +0200
25365 @@ -973,7 +973,8 @@ static int ip6_dst_lookup_tail(struct so
25366 struct rt6_info *rt = (struct rt6_info *) *dst;
25367 err = ip6_route_get_saddr(net, rt, &fl6->daddr,
25368 sk ? inet6_sk(sk)->srcprefs : 0,
25371 + sk ? sk->sk_nx_info : NULL);
25373 goto out_err_release;
25375 diff -NurpP --minimal linux-3.5/net/ipv6/ndisc.c linux-3.5-vs2.3.4/net/ipv6/ndisc.c
25376 --- linux-3.5/net/ipv6/ndisc.c 2012-07-22 23:39:48.000000000 +0200
25377 +++ linux-3.5-vs2.3.4/net/ipv6/ndisc.c 2012-07-23 01:45:56.000000000 +0200
25378 @@ -562,7 +562,7 @@ static void ndisc_send_na(struct net_dev
25380 if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr,
25381 inet6_sk(dev_net(dev)->ipv6.ndisc_sk)->srcprefs,
25385 src_addr = &tmpaddr;
25387 diff -NurpP --minimal linux-3.5/net/ipv6/raw.c linux-3.5-vs2.3.4/net/ipv6/raw.c
25388 --- linux-3.5/net/ipv6/raw.c 2012-07-22 23:39:48.000000000 +0200
25389 +++ linux-3.5-vs2.3.4/net/ipv6/raw.c 2012-07-23 01:45:56.000000000 +0200
25391 #include <linux/icmpv6.h>
25392 #include <linux/netfilter.h>
25393 #include <linux/netfilter_ipv6.h>
25394 +#include <linux/vs_inet6.h>
25395 #include <linux/skbuff.h>
25396 #include <linux/compat.h>
25397 #include <asm/uaccess.h>
25398 @@ -285,6 +286,13 @@ static int rawv6_bind(struct sock *sk, s
25402 + if (!v6_addr_in_nx_info(sk->sk_nx_info, &addr->sin6_addr, -1)) {
25403 + err = -EADDRNOTAVAIL;
25409 /* ipv4 addr of the socket is invalid. Only the
25410 * unspecified and mapped address have a v4 equivalent.
25412 diff -NurpP --minimal linux-3.5/net/ipv6/route.c linux-3.5-vs2.3.4/net/ipv6/route.c
25413 --- linux-3.5/net/ipv6/route.c 2012-07-22 23:39:48.000000000 +0200
25414 +++ linux-3.5-vs2.3.4/net/ipv6/route.c 2012-07-23 10:25:43.000000000 +0200
25416 #include <net/xfrm.h>
25417 #include <net/netevent.h>
25418 #include <net/netlink.h>
25419 +#include <linux/vs_inet6.h>
25421 #include <asm/uaccess.h>
25423 @@ -2140,15 +2141,17 @@ int ip6_route_get_saddr(struct net *net,
25424 struct rt6_info *rt,
25425 const struct in6_addr *daddr,
25426 unsigned int prefs,
25427 - struct in6_addr *saddr)
25428 + struct in6_addr *saddr,
25429 + struct nx_info *nxi)
25431 struct inet6_dev *idev = ip6_dst_idev((struct dst_entry*)rt);
25433 - if (rt->rt6i_prefsrc.plen)
25434 + if (rt->rt6i_prefsrc.plen && (!nxi ||
25435 + v6_addr_in_nx_info(nxi, &rt->rt6i_prefsrc.addr, NXA_TYPE_ADDR)))
25436 *saddr = rt->rt6i_prefsrc.addr;
25438 err = ipv6_dev_get_saddr(net, idev ? idev->dev : NULL,
25439 - daddr, prefs, saddr);
25440 + daddr, prefs, saddr, nxi);
25444 @@ -2484,7 +2487,8 @@ static int rt6_fill_node(struct net *net
25445 goto nla_put_failure;
25447 struct in6_addr saddr_buf;
25448 - if (ip6_route_get_saddr(net, rt, dst, 0, &saddr_buf) == 0 &&
25449 + if (ip6_route_get_saddr(net, rt, dst, 0, &saddr_buf,
25450 + (skb->sk ? skb->sk->sk_nx_info : NULL)) == 0 &&
25451 nla_put(skb, RTA_PREFSRC, 16, &saddr_buf))
25452 goto nla_put_failure;
25454 @@ -2714,6 +2718,7 @@ static int rt6_info_route(struct rt6_inf
25455 struct seq_file *m = p_arg;
25456 struct neighbour *n;
25458 + /* FIXME: check for network context? */
25459 seq_printf(m, "%pi6 %02x ", &rt->rt6i_dst.addr, rt->rt6i_dst.plen);
25461 #ifdef CONFIG_IPV6_SUBTREES
25462 diff -NurpP --minimal linux-3.5/net/ipv6/tcp_ipv6.c linux-3.5-vs2.3.4/net/ipv6/tcp_ipv6.c
25463 --- linux-3.5/net/ipv6/tcp_ipv6.c 2012-07-22 23:39:48.000000000 +0200
25464 +++ linux-3.5-vs2.3.4/net/ipv6/tcp_ipv6.c 2012-07-23 01:45:56.000000000 +0200
25467 #include <linux/crypto.h>
25468 #include <linux/scatterlist.h>
25469 +#include <linux/vs_inet6.h>
25471 static void tcp_v6_send_reset(struct sock *sk, struct sk_buff *skb);
25472 static void tcp_v6_reqsk_send_ack(struct sock *sk, struct sk_buff *skb,
25473 @@ -163,8 +164,15 @@ static int tcp_v6_connect(struct sock *s
25474 * connect() to INADDR_ANY means loopback (BSD'ism).
25477 - if(ipv6_addr_any(&usin->sin6_addr))
25478 - usin->sin6_addr.s6_addr[15] = 0x1;
25479 + if(ipv6_addr_any(&usin->sin6_addr)) {
25480 + struct nx_info *nxi = sk->sk_nx_info;
25482 + if (nxi && nx_info_has_v6(nxi))
25483 + /* FIXME: remap lback? */
25484 + usin->sin6_addr = nxi->v6.ip;
25486 + usin->sin6_addr.s6_addr[15] = 0x1;
25489 addr_type = ipv6_addr_type(&usin->sin6_addr);
25491 diff -NurpP --minimal linux-3.5/net/ipv6/udp.c linux-3.5-vs2.3.4/net/ipv6/udp.c
25492 --- linux-3.5/net/ipv6/udp.c 2012-07-22 23:39:48.000000000 +0200
25493 +++ linux-3.5-vs2.3.4/net/ipv6/udp.c 2012-07-23 01:45:56.000000000 +0200
25494 @@ -45,41 +45,67 @@
25495 #include <net/tcp_states.h>
25496 #include <net/ip6_checksum.h>
25497 #include <net/xfrm.h>
25498 +#include <linux/vs_inet6.h>
25500 #include <linux/proc_fs.h>
25501 #include <linux/seq_file.h>
25502 #include "udp_impl.h"
25504 -int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
25505 +int ipv6_rcv_saddr_equal(const struct sock *sk1, const struct sock *sk2)
25507 - const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr;
25508 + const struct in6_addr *sk1_rcv_saddr6 = &inet6_sk(sk1)->rcv_saddr;
25509 const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2);
25510 - __be32 sk1_rcv_saddr = sk_rcv_saddr(sk);
25511 + __be32 sk1_rcv_saddr = sk_rcv_saddr(sk1);
25512 __be32 sk2_rcv_saddr = sk_rcv_saddr(sk2);
25513 - int sk_ipv6only = ipv6_only_sock(sk);
25514 + int sk1_ipv6only = ipv6_only_sock(sk1);
25515 int sk2_ipv6only = inet_v6_ipv6only(sk2);
25516 - int addr_type = ipv6_addr_type(sk_rcv_saddr6);
25517 + int addr_type = ipv6_addr_type(sk1_rcv_saddr6);
25518 int addr_type2 = sk2_rcv_saddr6 ? ipv6_addr_type(sk2_rcv_saddr6) : IPV6_ADDR_MAPPED;
25520 /* if both are mapped, treat as IPv4 */
25521 - if (addr_type == IPV6_ADDR_MAPPED && addr_type2 == IPV6_ADDR_MAPPED)
25522 - return (!sk2_ipv6only &&
25523 + if (addr_type == IPV6_ADDR_MAPPED && addr_type2 == IPV6_ADDR_MAPPED) {
25524 + if (!sk2_ipv6only &&
25525 (!sk1_rcv_saddr || !sk2_rcv_saddr ||
25526 - sk1_rcv_saddr == sk2_rcv_saddr));
25527 + sk1_rcv_saddr == sk2_rcv_saddr))
25533 if (addr_type2 == IPV6_ADDR_ANY &&
25534 !(sk2_ipv6only && addr_type == IPV6_ADDR_MAPPED))
25538 if (addr_type == IPV6_ADDR_ANY &&
25539 - !(sk_ipv6only && addr_type2 == IPV6_ADDR_MAPPED))
25541 + !(sk1_ipv6only && addr_type2 == IPV6_ADDR_MAPPED))
25544 if (sk2_rcv_saddr6 &&
25545 - ipv6_addr_equal(sk_rcv_saddr6, sk2_rcv_saddr6))
25547 + ipv6_addr_equal(sk1_rcv_saddr6, sk2_rcv_saddr6))
25553 + if (!sk1_rcv_saddr && !sk2_rcv_saddr)
25554 + return nx_v4_addr_conflict(sk1->sk_nx_info, sk2->sk_nx_info);
25555 + if (!sk2_rcv_saddr)
25556 + return v4_addr_in_nx_info(sk1->sk_nx_info, sk2_rcv_saddr, -1);
25557 + if (!sk1_rcv_saddr)
25558 + return v4_addr_in_nx_info(sk2->sk_nx_info, sk1_rcv_saddr, -1);
25561 + if (addr_type2 == IPV6_ADDR_ANY && addr_type == IPV6_ADDR_ANY)
25562 + return nx_v6_addr_conflict(sk1->sk_nx_info, sk2->sk_nx_info);
25563 + else if (addr_type2 == IPV6_ADDR_ANY)
25564 + return v6_addr_in_nx_info(sk2->sk_nx_info, sk1_rcv_saddr6, -1);
25565 + else if (addr_type == IPV6_ADDR_ANY) {
25566 + if (addr_type2 == IPV6_ADDR_MAPPED)
25567 + return nx_v4_addr_conflict(sk1->sk_nx_info, sk2->sk_nx_info);
25569 + return v6_addr_in_nx_info(sk1->sk_nx_info, sk2_rcv_saddr6, -1);
25574 static unsigned int udp6_portaddr_hash(struct net *net,
25575 @@ -143,6 +169,10 @@ static inline int compute_score(struct s
25576 if (!ipv6_addr_equal(&np->rcv_saddr, daddr))
25580 + /* block non nx_info ips */
25581 + if (!v6_addr_in_nx_info(sk->sk_nx_info, daddr, -1))
25584 if (!ipv6_addr_any(&np->daddr)) {
25585 if (!ipv6_addr_equal(&np->daddr, saddr))
25586 diff -NurpP --minimal linux-3.5/net/ipv6/xfrm6_policy.c linux-3.5-vs2.3.4/net/ipv6/xfrm6_policy.c
25587 --- linux-3.5/net/ipv6/xfrm6_policy.c 2012-07-22 23:39:48.000000000 +0200
25588 +++ linux-3.5-vs2.3.4/net/ipv6/xfrm6_policy.c 2012-07-23 01:45:56.000000000 +0200
25589 @@ -63,7 +63,7 @@ static int xfrm6_get_saddr(struct net *n
25590 dev = ip6_dst_idev(dst)->dev;
25591 ipv6_dev_get_saddr(dev_net(dev), dev,
25592 (struct in6_addr *)&daddr->a6, 0,
25593 - (struct in6_addr *)&saddr->a6);
25594 + (struct in6_addr *)&saddr->a6, NULL);
25598 diff -NurpP --minimal linux-3.5/net/netfilter/ipvs/ip_vs_xmit.c linux-3.5-vs2.3.4/net/netfilter/ipvs/ip_vs_xmit.c
25599 --- linux-3.5/net/netfilter/ipvs/ip_vs_xmit.c 2012-03-19 19:47:33.000000000 +0100
25600 +++ linux-3.5-vs2.3.4/net/netfilter/ipvs/ip_vs_xmit.c 2012-07-23 01:45:56.000000000 +0200
25601 @@ -226,7 +226,7 @@ __ip_vs_route_output_v6(struct net *net,
25603 if (ipv6_addr_any(&fl6.saddr) &&
25604 ipv6_dev_get_saddr(net, ip6_dst_idev(dst)->dev,
25605 - &fl6.daddr, 0, &fl6.saddr) < 0)
25606 + &fl6.daddr, 0, &fl6.saddr, NULL) < 0)
25609 dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), NULL, 0);
25610 diff -NurpP --minimal linux-3.5/net/netlink/af_netlink.c linux-3.5-vs2.3.4/net/netlink/af_netlink.c
25611 --- linux-3.5/net/netlink/af_netlink.c 2012-07-22 23:39:48.000000000 +0200
25612 +++ linux-3.5-vs2.3.4/net/netlink/af_netlink.c 2012-07-23 01:45:56.000000000 +0200
25614 #include <linux/types.h>
25615 #include <linux/audit.h>
25616 #include <linux/mutex.h>
25617 +#include <linux/vs_context.h>
25618 +#include <linux/vs_network.h>
25619 +#include <linux/vs_limit.h>
25621 #include <net/net_namespace.h>
25622 #include <net/sock.h>
25623 @@ -1935,6 +1938,8 @@ static struct sock *netlink_seq_socket_i
25624 sk_for_each(s, node, &hash->table[j]) {
25625 if (sock_net(s) != seq_file_net(seq))
25627 + if (!nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT))
25631 iter->hash_idx = j;
25632 @@ -1969,7 +1974,8 @@ static void *netlink_seq_next(struct seq
25636 - } while (s && sock_net(s) != seq_file_net(seq));
25637 + } while (s && (sock_net(s) != seq_file_net(seq) ||
25638 + !nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT)));
25642 @@ -1981,7 +1987,8 @@ static void *netlink_seq_next(struct seq
25644 for (; j <= hash->mask; j++) {
25645 s = sk_head(&hash->table[j]);
25646 - while (s && sock_net(s) != seq_file_net(seq))
25647 + while (s && (sock_net(s) != seq_file_net(seq) ||
25648 + !nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT)))
25652 diff -NurpP --minimal linux-3.5/net/socket.c linux-3.5-vs2.3.4/net/socket.c
25653 --- linux-3.5/net/socket.c 2012-07-22 23:39:49.000000000 +0200
25654 +++ linux-3.5-vs2.3.4/net/socket.c 2012-07-23 01:45:56.000000000 +0200
25657 #include <net/sock.h>
25658 #include <linux/netfilter.h>
25659 +#include <linux/vs_base.h>
25660 +#include <linux/vs_socket.h>
25661 +#include <linux/vs_inet.h>
25662 +#include <linux/vs_inet6.h>
25664 #include <linux/if_tun.h>
25665 #include <linux/ipv6_route.h>
25666 @@ -548,6 +552,7 @@ static inline int __sock_sendmsg_nosec(s
25667 struct msghdr *msg, size_t size)
25669 struct sock_iocb *si = kiocb_to_siocb(iocb);
25672 sock_update_classid(sock->sk);
25674 @@ -558,7 +563,22 @@ static inline int __sock_sendmsg_nosec(s
25678 - return sock->ops->sendmsg(iocb, sock, msg, size);
25679 + len = sock->ops->sendmsg(iocb, sock, msg, size);
25682 + vx_sock_send(sock->sk, size);
25684 + vx_sock_fail(sock->sk, size);
25686 + vxdprintk(VXD_CBIT(net, 7),
25687 + "__sock_sendmsg: %p[%p,%p,%p;%d/%d]:%d/%zu",
25689 + (sock->sk)?sock->sk->sk_nx_info:0,
25690 + (sock->sk)?sock->sk->sk_vx_info:0,
25691 + (sock->sk)?sock->sk->sk_xid:0,
25692 + (sock->sk)?sock->sk->sk_nid:0,
25693 + (unsigned int)size, len);
25697 static inline int __sock_sendmsg(struct kiocb *iocb, struct socket *sock,
25698 @@ -714,6 +734,7 @@ static inline int __sock_recvmsg_nosec(s
25699 struct msghdr *msg, size_t size, int flags)
25701 struct sock_iocb *si = kiocb_to_siocb(iocb);
25704 sock_update_classid(sock->sk);
25706 @@ -723,7 +744,18 @@ static inline int __sock_recvmsg_nosec(s
25710 - return sock->ops->recvmsg(iocb, sock, msg, size, flags);
25711 + len = sock->ops->recvmsg(iocb, sock, msg, size, flags);
25712 + if ((len >= 0) && sock->sk)
25713 + vx_sock_recv(sock->sk, len);
25714 + vxdprintk(VXD_CBIT(net, 7),
25715 + "__sock_recvmsg: %p[%p,%p,%p;%d/%d]:%d/%d",
25717 + (sock->sk)?sock->sk->sk_nx_info:0,
25718 + (sock->sk)?sock->sk->sk_vx_info:0,
25719 + (sock->sk)?sock->sk->sk_xid:0,
25720 + (sock->sk)?sock->sk->sk_nid:0,
25721 + (unsigned int)size, len);
25725 static inline int __sock_recvmsg(struct kiocb *iocb, struct socket *sock,
25726 @@ -1208,6 +1240,13 @@ int __sock_create(struct net *net, int f
25727 if (type < 0 || type >= SOCK_MAX)
25730 + if (!nx_check(0, VS_ADMIN)) {
25731 + if (family == PF_INET && !current_nx_info_has_v4())
25732 + return -EAFNOSUPPORT;
25733 + if (family == PF_INET6 && !current_nx_info_has_v6())
25734 + return -EAFNOSUPPORT;
25739 This uglymoron is moved from INET layer to here to avoid
25740 @@ -1342,6 +1381,7 @@ SYSCALL_DEFINE3(socket, int, family, int
25744 + set_bit(SOCK_USER_SOCKET, &sock->flags);
25745 retval = sock_map_fd(sock, flags & (O_CLOEXEC | O_NONBLOCK));
25748 @@ -1383,10 +1423,12 @@ SYSCALL_DEFINE4(socketpair, int, family,
25749 err = sock_create(family, type, protocol, &sock1);
25752 + set_bit(SOCK_USER_SOCKET, &sock1->flags);
25754 err = sock_create(family, type, protocol, &sock2);
25756 goto out_release_1;
25757 + set_bit(SOCK_USER_SOCKET, &sock2->flags);
25759 err = sock1->ops->socketpair(sock1, sock2);
25761 diff -NurpP --minimal linux-3.5/net/sunrpc/auth.c linux-3.5-vs2.3.4/net/sunrpc/auth.c
25762 --- linux-3.5/net/sunrpc/auth.c 2011-10-24 18:45:34.000000000 +0200
25763 +++ linux-3.5-vs2.3.4/net/sunrpc/auth.c 2012-07-23 01:45:56.000000000 +0200
25765 #include <linux/hash.h>
25766 #include <linux/sunrpc/clnt.h>
25767 #include <linux/spinlock.h>
25768 +#include <linux/vs_tag.h>
25771 # define RPCDBG_FACILITY RPCDBG_AUTH
25772 @@ -427,6 +428,7 @@ rpcauth_lookupcred(struct rpc_auth *auth
25773 memset(&acred, 0, sizeof(acred));
25774 acred.uid = cred->fsuid;
25775 acred.gid = cred->fsgid;
25776 + acred.tag = dx_current_tag();
25777 acred.group_info = get_group_info(((struct cred *)cred)->group_info);
25779 ret = auth->au_ops->lookup_cred(auth, &acred, flags);
25780 @@ -467,6 +469,7 @@ rpcauth_bind_root_cred(struct rpc_task *
25781 struct auth_cred acred = {
25784 + .tag = dx_current_tag(),
25787 dprintk("RPC: %5u looking up %s cred\n",
25788 diff -NurpP --minimal linux-3.5/net/sunrpc/auth_unix.c linux-3.5-vs2.3.4/net/sunrpc/auth_unix.c
25789 --- linux-3.5/net/sunrpc/auth_unix.c 2012-07-22 23:39:49.000000000 +0200
25790 +++ linux-3.5-vs2.3.4/net/sunrpc/auth_unix.c 2012-07-23 10:26:39.000000000 +0200
25791 @@ -13,11 +13,13 @@
25792 #include <linux/sunrpc/clnt.h>
25793 #include <linux/sunrpc/auth.h>
25794 #include <linux/user_namespace.h>
25795 +#include <linux/vs_tag.h>
25797 #define NFS_NGROUPS 16
25800 struct rpc_cred uc_base;
25803 gid_t uc_gids[NFS_NGROUPS];
25805 @@ -79,6 +81,7 @@ unx_create_cred(struct rpc_auth *auth, s
25806 groups = NFS_NGROUPS;
25808 cred->uc_gid = acred->gid;
25809 + cred->uc_tag = acred->tag;
25810 for (i = 0; i < groups; i++) {
25812 gid = from_kgid(&init_user_ns, GROUP_AT(acred->group_info, i));
25813 @@ -123,7 +126,9 @@ unx_match(struct auth_cred *acred, struc
25817 - if (cred->uc_uid != acred->uid || cred->uc_gid != acred->gid)
25818 + if (cred->uc_uid != acred->uid ||
25819 + cred->uc_gid != acred->gid ||
25820 + cred->uc_tag != acred->tag)
25823 if (acred->group_info != NULL)
25824 @@ -152,7 +157,7 @@ unx_marshal(struct rpc_task *task, __be3
25825 struct rpc_clnt *clnt = task->tk_client;
25826 struct unx_cred *cred = container_of(task->tk_rqstp->rq_cred, struct unx_cred, uc_base);
25827 __be32 *base, *hold;
25831 *p++ = htonl(RPC_AUTH_UNIX);
25833 @@ -162,9 +167,12 @@ unx_marshal(struct rpc_task *task, __be3
25834 * Copy the UTS nodename captured when the client was created.
25836 p = xdr_encode_array(p, clnt->cl_nodename, clnt->cl_nodelen);
25837 + tag = task->tk_client->cl_tag;
25839 - *p++ = htonl((u32) cred->uc_uid);
25840 - *p++ = htonl((u32) cred->uc_gid);
25841 + *p++ = htonl((u32) TAGINO_UID(tag,
25842 + cred->uc_uid, cred->uc_tag));
25843 + *p++ = htonl((u32) TAGINO_GID(tag,
25844 + cred->uc_gid, cred->uc_tag));
25846 for (i = 0; i < 16 && cred->uc_gids[i] != (gid_t) NOGROUP; i++)
25847 *p++ = htonl((u32) cred->uc_gids[i]);
25848 diff -NurpP --minimal linux-3.5/net/sunrpc/clnt.c linux-3.5-vs2.3.4/net/sunrpc/clnt.c
25849 --- linux-3.5/net/sunrpc/clnt.c 2012-07-22 23:39:49.000000000 +0200
25850 +++ linux-3.5-vs2.3.4/net/sunrpc/clnt.c 2012-07-23 01:45:56.000000000 +0200
25852 #include <linux/in6.h>
25853 #include <linux/un.h>
25854 #include <linux/rcupdate.h>
25855 +#include <linux/vs_cvirt.h>
25857 #include <linux/sunrpc/clnt.h>
25858 #include <linux/sunrpc/rpc_pipe_fs.h>
25859 @@ -481,6 +482,9 @@ struct rpc_clnt *rpc_create(struct rpc_c
25860 if (!(args->flags & RPC_CLNT_CREATE_QUIET))
25861 clnt->cl_chatty = 1;
25863 + /* TODO: handle RPC_CLNT_CREATE_TAGGED
25864 + if (args->flags & RPC_CLNT_CREATE_TAGGED)
25865 + clnt->cl_tag = 1; */
25868 EXPORT_SYMBOL_GPL(rpc_create);
25869 diff -NurpP --minimal linux-3.5/net/unix/af_unix.c linux-3.5-vs2.3.4/net/unix/af_unix.c
25870 --- linux-3.5/net/unix/af_unix.c 2012-07-22 23:39:49.000000000 +0200
25871 +++ linux-3.5-vs2.3.4/net/unix/af_unix.c 2012-07-23 01:45:56.000000000 +0200
25872 @@ -114,6 +114,8 @@
25873 #include <linux/mount.h>
25874 #include <net/checksum.h>
25875 #include <linux/security.h>
25876 +#include <linux/vs_context.h>
25877 +#include <linux/vs_limit.h>
25879 struct hlist_head unix_socket_table[UNIX_HASH_SIZE + 1];
25880 EXPORT_SYMBOL_GPL(unix_socket_table);
25881 @@ -262,6 +264,8 @@ static struct sock *__unix_find_socket_b
25882 if (!net_eq(sock_net(s), net))
25885 + if (!nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT))
25887 if (u->addr->len == len &&
25888 !memcmp(u->addr->name, sunname, len))
25890 @@ -2276,6 +2280,8 @@ static struct sock *unix_seq_idx(struct
25891 for (s = first_unix_socket(&iter->i); s; s = next_unix_socket(&iter->i, s)) {
25892 if (sock_net(s) != seq_file_net(seq))
25894 + if (!nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT))
25899 @@ -2300,7 +2306,8 @@ static void *unix_seq_next(struct seq_fi
25900 sk = first_unix_socket(&iter->i);
25902 sk = next_unix_socket(&iter->i, sk);
25903 - while (sk && (sock_net(sk) != seq_file_net(seq)))
25904 + while (sk && (sock_net(sk) != seq_file_net(seq) ||
25905 + !nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)))
25906 sk = next_unix_socket(&iter->i, sk);
25909 diff -NurpP --minimal linux-3.5/scripts/checksyscalls.sh linux-3.5-vs2.3.4/scripts/checksyscalls.sh
25910 --- linux-3.5/scripts/checksyscalls.sh 2012-03-19 19:47:34.000000000 +0100
25911 +++ linux-3.5-vs2.3.4/scripts/checksyscalls.sh 2012-07-23 01:45:56.000000000 +0200
25912 @@ -193,7 +193,6 @@ cat << EOF
25913 #define __IGNORE_afs_syscall
25914 #define __IGNORE_getpmsg
25915 #define __IGNORE_putpmsg
25916 -#define __IGNORE_vserver
25920 diff -NurpP --minimal linux-3.5/security/commoncap.c linux-3.5-vs2.3.4/security/commoncap.c
25921 --- linux-3.5/security/commoncap.c 2012-07-22 23:39:51.000000000 +0200
25922 +++ linux-3.5-vs2.3.4/security/commoncap.c 2012-07-23 11:05:45.000000000 +0200
25923 @@ -76,14 +76,20 @@ int cap_netlink_send(struct sock *sk, st
25924 int cap_capable(const struct cred *cred, struct user_namespace *targ_ns,
25925 int cap, int audit)
25927 + struct vx_info *vxi = current_vx_info(); /* FIXME: get vxi from cred? */
25930 /* The owner of the user namespace has all caps. */
25931 if (targ_ns != &init_user_ns && uid_eq(targ_ns->owner, cred->euid))
25934 /* Do we have the necessary capabilities? */
25935 - if (targ_ns == cred->user_ns)
25936 - return cap_raised(cred->cap_effective, cap) ? 0 : -EPERM;
25937 + if (targ_ns == cred->user_ns) {
25938 + if (vx_info_flags(vxi, VXF_STATE_SETUP, 0) &&
25939 + cap_raised(cred->cap_effective, cap))
25941 + return vx_cap_raised(vxi, cred->cap_effective, cap) ? 0 : -EPERM;
25944 /* Have we tried all of the parent namespaces? */
25945 if (targ_ns == &init_user_ns)
25946 @@ -619,7 +625,7 @@ int cap_inode_setxattr(struct dentry *de
25948 if (!strncmp(name, XATTR_SECURITY_PREFIX,
25949 sizeof(XATTR_SECURITY_PREFIX) - 1) &&
25950 - !capable(CAP_SYS_ADMIN))
25951 + !vx_capable(CAP_SYS_ADMIN, VXC_FS_SECURITY))
25955 @@ -645,7 +651,7 @@ int cap_inode_removexattr(struct dentry
25957 if (!strncmp(name, XATTR_SECURITY_PREFIX,
25958 sizeof(XATTR_SECURITY_PREFIX) - 1) &&
25959 - !capable(CAP_SYS_ADMIN))
25960 + !vx_capable(CAP_SYS_ADMIN, VXC_FS_SECURITY))
25964 diff -NurpP --minimal linux-3.5/security/selinux/hooks.c linux-3.5-vs2.3.4/security/selinux/hooks.c
25965 --- linux-3.5/security/selinux/hooks.c 2012-07-22 23:39:52.000000000 +0200
25966 +++ linux-3.5-vs2.3.4/security/selinux/hooks.c 2012-07-23 01:45:56.000000000 +0200
25968 #include <linux/dccp.h>
25969 #include <linux/quota.h>
25970 #include <linux/un.h> /* for Unix socket types */
25971 -#include <net/af_unix.h> /* for Unix socket types */
25972 #include <linux/parser.h>
25973 #include <linux/nfs_mount.h>
25974 #include <net/ipv6.h>