]>
Commit | Line | Data |
---|---|---|
8dd97e6f | 1 | diff -NurpP --minimal linux-2.6.29/arch/alpha/Kconfig linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/Kconfig |
2380c486 | 2 | --- linux-2.6.29/arch/alpha/Kconfig 2009-03-24 14:18:07.000000000 +0100 |
8dd97e6f | 3 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/Kconfig 2009-03-24 14:48:16.000000000 +0100 |
2380c486 JR |
4 | @@ -666,6 +666,8 @@ config DUMMY_CONSOLE |
5 | depends on VGA_HOSE | |
6 | default y | |
d337f35e JR |
7 | |
8 | +source "kernel/vserver/Kconfig" | |
9 | + | |
10 | source "security/Kconfig" | |
11 | ||
12 | source "crypto/Kconfig" | |
8dd97e6f | 13 | diff -NurpP --minimal linux-2.6.29/arch/alpha/kernel/entry.S linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/kernel/entry.S |
2380c486 | 14 | --- linux-2.6.29/arch/alpha/kernel/entry.S 2009-03-24 14:18:07.000000000 +0100 |
8dd97e6f | 15 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/kernel/entry.S 2009-03-24 14:48:16.000000000 +0100 |
2380c486 | 16 | @@ -874,24 +874,15 @@ sys_getxgid: |
d337f35e JR |
17 | .globl sys_getxpid |
18 | .ent sys_getxpid | |
19 | sys_getxpid: | |
20 | + lda $sp, -16($sp) | |
21 | + stq $26, 0($sp) | |
22 | .prologue 0 | |
23 | - ldq $2, TI_TASK($8) | |
24 | ||
25 | - /* See linux/kernel/timer.c sys_getppid for discussion | |
26 | - about this loop. */ | |
27 | - ldq $3, TASK_GROUP_LEADER($2) | |
28 | - ldq $4, TASK_REAL_PARENT($3) | |
29 | - ldl $0, TASK_TGID($2) | |
30 | -1: ldl $1, TASK_TGID($4) | |
31 | -#ifdef CONFIG_SMP | |
32 | - mov $4, $5 | |
33 | - mb | |
34 | - ldq $3, TASK_GROUP_LEADER($2) | |
35 | - ldq $4, TASK_REAL_PARENT($3) | |
36 | - cmpeq $4, $5, $5 | |
37 | - beq $5, 1b | |
38 | -#endif | |
39 | - stq $1, 80($sp) | |
40 | + lda $16, 96($sp) | |
41 | + jsr $26, do_getxpid | |
42 | + ldq $26, 0($sp) | |
43 | + | |
44 | + lda $sp, 16($sp) | |
45 | ret | |
46 | .end sys_getxpid | |
47 | ||
8dd97e6f | 48 | diff -NurpP --minimal linux-2.6.29/arch/alpha/kernel/osf_sys.c linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/kernel/osf_sys.c |
2380c486 | 49 | --- linux-2.6.29/arch/alpha/kernel/osf_sys.c 2009-03-24 14:18:07.000000000 +0100 |
8dd97e6f | 50 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/kernel/osf_sys.c 2009-03-24 14:48:16.000000000 +0100 |
2380c486 | 51 | @@ -877,7 +877,7 @@ SYSCALL_DEFINE2(osf_gettimeofday, struct |
d337f35e JR |
52 | { |
53 | if (tv) { | |
54 | struct timeval ktv; | |
55 | - do_gettimeofday(&ktv); | |
56 | + vx_gettimeofday(&ktv); | |
57 | if (put_tv32(tv, &ktv)) | |
58 | return -EFAULT; | |
59 | } | |
8dd97e6f | 60 | diff -NurpP --minimal linux-2.6.29/arch/alpha/kernel/ptrace.c linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/kernel/ptrace.c |
2380c486 | 61 | --- linux-2.6.29/arch/alpha/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100 |
8dd97e6f | 62 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/kernel/ptrace.c 2009-02-22 22:54:24.000000000 +0100 |
d337f35e JR |
63 | @@ -15,6 +15,7 @@ |
64 | #include <linux/slab.h> | |
65 | #include <linux/security.h> | |
66 | #include <linux/signal.h> | |
67 | +#include <linux/vs_base.h> | |
68 | ||
69 | #include <asm/uaccess.h> | |
70 | #include <asm/pgtable.h> | |
8dd97e6f | 71 | diff -NurpP --minimal linux-2.6.29/arch/alpha/kernel/systbls.S linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/kernel/systbls.S |
2380c486 | 72 | --- linux-2.6.29/arch/alpha/kernel/systbls.S 2009-03-24 14:18:08.000000000 +0100 |
8dd97e6f | 73 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/kernel/systbls.S 2009-03-24 14:48:16.000000000 +0100 |
d337f35e JR |
74 | @@ -446,7 +446,7 @@ sys_call_table: |
75 | .quad sys_stat64 /* 425 */ | |
76 | .quad sys_lstat64 | |
77 | .quad sys_fstat64 | |
78 | - .quad sys_ni_syscall /* sys_vserver */ | |
79 | + .quad sys_vserver /* sys_vserver */ | |
80 | .quad sys_ni_syscall /* sys_mbind */ | |
81 | .quad sys_ni_syscall /* sys_get_mempolicy */ | |
82 | .quad sys_ni_syscall /* sys_set_mempolicy */ | |
8dd97e6f | 83 | diff -NurpP --minimal linux-2.6.29/arch/alpha/kernel/traps.c linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/kernel/traps.c |
2380c486 | 84 | --- linux-2.6.29/arch/alpha/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100 |
8dd97e6f | 85 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/kernel/traps.c 2009-02-22 22:54:24.000000000 +0100 |
2380c486 | 86 | @@ -183,7 +183,8 @@ die_if_kernel(char * str, struct pt_regs |
d337f35e JR |
87 | #ifdef CONFIG_SMP |
88 | printk("CPU %d ", hard_smp_processor_id()); | |
89 | #endif | |
2380c486 | 90 | - printk("%s(%d): %s %ld\n", current->comm, task_pid_nr(current), str, err); |
d337f35e | 91 | + printk("%s(%d[#%u]): %s %ld\n", current->comm, |
2380c486 | 92 | + task_pid_nr(current), current->xid, str, err); |
d337f35e | 93 | dik_show_regs(regs, r9_15); |
2380c486 | 94 | add_taint(TAINT_DIE); |
d337f35e | 95 | dik_show_trace((unsigned long *)(regs+1)); |
8dd97e6f | 96 | diff -NurpP --minimal linux-2.6.29/arch/alpha/mm/fault.c linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/mm/fault.c |
2380c486 | 97 | --- linux-2.6.29/arch/alpha/mm/fault.c 2008-12-25 00:26:37.000000000 +0100 |
8dd97e6f | 98 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/mm/fault.c 2009-02-22 22:54:24.000000000 +0100 |
2380c486 JR |
99 | @@ -193,8 +193,8 @@ do_page_fault(unsigned long address, uns |
100 | down_read(&mm->mmap_sem); | |
101 | goto survive; | |
102 | } | |
103 | - printk(KERN_ALERT "VM: killing process %s(%d)\n", | |
104 | - current->comm, task_pid_nr(current)); | |
105 | + printk(KERN_ALERT "VM: killing process %s(%d:#%u)\n", | |
106 | + current->comm, task_pid_nr(current), current->xid); | |
107 | if (!user_mode(regs)) | |
108 | goto no_context; | |
109 | do_group_exit(SIGKILL); | |
8dd97e6f | 110 | diff -NurpP --minimal linux-2.6.29/arch/arm/Kconfig linux-2.6.29-vs2.3.0.36.9-pre3/arch/arm/Kconfig |
2380c486 | 111 | --- linux-2.6.29/arch/arm/Kconfig 2009-03-24 14:18:08.000000000 +0100 |
8dd97e6f | 112 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/arm/Kconfig 2009-03-24 14:48:16.000000000 +0100 |
2380c486 | 113 | @@ -1333,6 +1333,8 @@ source "fs/Kconfig" |
d337f35e JR |
114 | |
115 | source "arch/arm/Kconfig.debug" | |
116 | ||
117 | +source "kernel/vserver/Kconfig" | |
118 | + | |
119 | source "security/Kconfig" | |
120 | ||
121 | source "crypto/Kconfig" | |
8dd97e6f | 122 | diff -NurpP --minimal linux-2.6.29/arch/arm/kernel/calls.S linux-2.6.29-vs2.3.0.36.9-pre3/arch/arm/kernel/calls.S |
2380c486 | 123 | --- linux-2.6.29/arch/arm/kernel/calls.S 2009-03-24 14:18:09.000000000 +0100 |
8dd97e6f | 124 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/arm/kernel/calls.S 2009-02-22 22:54:24.000000000 +0100 |
d337f35e JR |
125 | @@ -322,7 +322,7 @@ |
126 | /* 310 */ CALL(sys_request_key) | |
127 | CALL(sys_keyctl) | |
128 | CALL(ABI(sys_semtimedop, sys_oabi_semtimedop)) | |
129 | -/* vserver */ CALL(sys_ni_syscall) | |
130 | + CALL(sys_vserver) | |
131 | CALL(sys_ioprio_set) | |
132 | /* 315 */ CALL(sys_ioprio_get) | |
133 | CALL(sys_inotify_init) | |
8dd97e6f | 134 | diff -NurpP --minimal linux-2.6.29/arch/arm/kernel/process.c linux-2.6.29-vs2.3.0.36.9-pre3/arch/arm/kernel/process.c |
2380c486 | 135 | --- linux-2.6.29/arch/arm/kernel/process.c 2008-12-25 00:26:37.000000000 +0100 |
8dd97e6f | 136 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/arm/kernel/process.c 2009-02-22 22:54:24.000000000 +0100 |
2380c486 | 137 | @@ -262,7 +262,8 @@ void __show_regs(struct pt_regs *regs) |
d337f35e JR |
138 | void show_regs(struct pt_regs * regs) |
139 | { | |
140 | printk("\n"); | |
2380c486 | 141 | - printk("Pid: %d, comm: %20s\n", task_pid_nr(current), current->comm); |
d337f35e | 142 | + printk("Pid: %d[#%u], comm: %20s\n", |
2380c486 | 143 | + task_pid_nr(current), current->xid, current->comm); |
d337f35e JR |
144 | __show_regs(regs); |
145 | __backtrace(); | |
146 | } | |
8dd97e6f | 147 | diff -NurpP --minimal linux-2.6.29/arch/arm/kernel/traps.c linux-2.6.29-vs2.3.0.36.9-pre3/arch/arm/kernel/traps.c |
2380c486 | 148 | --- linux-2.6.29/arch/arm/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100 |
8dd97e6f | 149 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/arm/kernel/traps.c 2009-02-22 22:54:24.000000000 +0100 |
2380c486 JR |
150 | @@ -214,8 +214,8 @@ static void __die(const char *str, int e |
151 | str, err, ++die_counter); | |
d337f35e JR |
152 | print_modules(); |
153 | __show_regs(regs); | |
154 | - printk("Process %s (pid: %d, stack limit = 0x%p)\n", | |
2380c486 | 155 | - tsk->comm, task_pid_nr(tsk), thread + 1); |
d337f35e | 156 | + printk("Process %s (pid: %d:#%u, stack limit = 0x%p)\n", |
2380c486 | 157 | + tsk->comm, task_pid_nr(tsk), tsk->xid, thread + 1); |
d337f35e JR |
158 | |
159 | if (!user_mode(regs) || in_interrupt()) { | |
160 | dump_mem("Stack: ", regs->ARM_sp, | |
8dd97e6f | 161 | diff -NurpP --minimal linux-2.6.29/arch/arm/mm/fault.c linux-2.6.29-vs2.3.0.36.9-pre3/arch/arm/mm/fault.c |
2380c486 | 162 | --- linux-2.6.29/arch/arm/mm/fault.c 2009-03-24 14:18:17.000000000 +0100 |
8dd97e6f | 163 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/arm/mm/fault.c 2009-03-24 14:48:17.000000000 +0100 |
2380c486 JR |
164 | @@ -294,7 +294,8 @@ do_page_fault(unsigned long addr, unsign |
165 | * happened to us that made us unable to handle | |
166 | * the page fault gracefully. | |
167 | */ | |
168 | - printk("VM: killing process %s\n", tsk->comm); | |
169 | + printk("VM: killing process %s(%d:#%u)\n", | |
170 | + tsk->comm, task_pid_nr(tsk), tsk->xid); | |
171 | do_group_exit(SIGKILL); | |
172 | return 0; | |
173 | } | |
8dd97e6f | 174 | diff -NurpP --minimal linux-2.6.29/arch/cris/Kconfig linux-2.6.29-vs2.3.0.36.9-pre3/arch/cris/Kconfig |
2380c486 | 175 | --- linux-2.6.29/arch/cris/Kconfig 2009-03-24 14:18:23.000000000 +0100 |
8dd97e6f | 176 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/cris/Kconfig 2009-03-24 14:48:19.000000000 +0100 |
2380c486 | 177 | @@ -685,6 +685,8 @@ source "drivers/staging/Kconfig" |
d337f35e JR |
178 | |
179 | source "arch/cris/Kconfig.debug" | |
180 | ||
181 | +source "kernel/vserver/Kconfig" | |
182 | + | |
183 | source "security/Kconfig" | |
184 | ||
185 | source "crypto/Kconfig" | |
8dd97e6f | 186 | diff -NurpP --minimal linux-2.6.29/arch/frv/kernel/kernel_thread.S linux-2.6.29-vs2.3.0.36.9-pre3/arch/frv/kernel/kernel_thread.S |
2380c486 | 187 | --- linux-2.6.29/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100 |
8dd97e6f | 188 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/frv/kernel/kernel_thread.S 2009-02-22 22:54:24.000000000 +0100 |
2380c486 | 189 | @@ -37,7 +37,7 @@ kernel_thread: |
d337f35e JR |
190 | |
191 | # start by forking the current process, but with shared VM | |
192 | setlos.p #__NR_clone,gr7 ; syscall number | |
193 | - ori gr10,#CLONE_VM,gr8 ; first syscall arg [clone_flags] | |
194 | + ori gr10,#CLONE_KT,gr8 ; first syscall arg [clone_flags] | |
195 | sethi.p #0xe4e4,gr9 ; second syscall arg [newsp] | |
196 | setlo #0xe4e4,gr9 | |
197 | setlos.p #0,gr10 ; third syscall arg [parent_tidptr] | |
8dd97e6f | 198 | diff -NurpP --minimal linux-2.6.29/arch/h8300/Kconfig linux-2.6.29-vs2.3.0.36.9-pre3/arch/h8300/Kconfig |
2380c486 | 199 | --- linux-2.6.29/arch/h8300/Kconfig 2009-03-24 14:18:24.000000000 +0100 |
8dd97e6f | 200 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/h8300/Kconfig 2009-03-24 14:48:19.000000000 +0100 |
2380c486 | 201 | @@ -226,6 +226,8 @@ source "fs/Kconfig" |
d337f35e JR |
202 | |
203 | source "arch/h8300/Kconfig.debug" | |
204 | ||
205 | +source "kernel/vserver/Kconfig" | |
206 | + | |
207 | source "security/Kconfig" | |
208 | ||
209 | source "crypto/Kconfig" | |
8dd97e6f | 210 | diff -NurpP --minimal linux-2.6.29/arch/ia64/ia32/ia32_entry.S linux-2.6.29-vs2.3.0.36.9-pre3/arch/ia64/ia32/ia32_entry.S |
2380c486 | 211 | --- linux-2.6.29/arch/ia64/ia32/ia32_entry.S 2009-03-24 14:18:24.000000000 +0100 |
8dd97e6f | 212 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/ia64/ia32/ia32_entry.S 2009-02-22 22:54:24.000000000 +0100 |
2380c486 JR |
213 | @@ -451,7 +451,7 @@ ia32_syscall_table: |
214 | data8 sys_tgkill /* 270 */ | |
215 | data8 compat_sys_utimes | |
216 | data8 sys32_fadvise64_64 | |
217 | - data8 sys_ni_syscall | |
218 | + data8 sys32_vserver | |
219 | data8 sys_ni_syscall | |
220 | data8 sys_ni_syscall /* 275 */ | |
221 | data8 sys_ni_syscall | |
8dd97e6f | 222 | diff -NurpP --minimal linux-2.6.29/arch/ia64/Kconfig linux-2.6.29-vs2.3.0.36.9-pre3/arch/ia64/Kconfig |
2380c486 | 223 | --- linux-2.6.29/arch/ia64/Kconfig 2009-03-24 14:18:24.000000000 +0100 |
8dd97e6f | 224 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/ia64/Kconfig 2009-03-24 14:48:19.000000000 +0100 |
2380c486 JR |
225 | @@ -672,6 +672,8 @@ source "fs/Kconfig" |
226 | ||
227 | source "arch/ia64/Kconfig.debug" | |
d337f35e JR |
228 | |
229 | +source "kernel/vserver/Kconfig" | |
230 | + | |
231 | source "security/Kconfig" | |
232 | ||
233 | source "crypto/Kconfig" | |
8dd97e6f | 234 | diff -NurpP --minimal linux-2.6.29/arch/ia64/kernel/entry.S linux-2.6.29-vs2.3.0.36.9-pre3/arch/ia64/kernel/entry.S |
2380c486 | 235 | --- linux-2.6.29/arch/ia64/kernel/entry.S 2009-03-24 14:18:25.000000000 +0100 |
8dd97e6f | 236 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/ia64/kernel/entry.S 2009-02-22 22:54:24.000000000 +0100 |
2380c486 JR |
237 | @@ -1653,7 +1653,7 @@ sys_call_table: |
238 | data8 sys_mq_notify | |
239 | data8 sys_mq_getsetattr | |
240 | data8 sys_kexec_load | |
241 | - data8 sys_ni_syscall // reserved for vserver | |
242 | + data8 sys_vserver | |
243 | data8 sys_waitid // 1270 | |
244 | data8 sys_add_key | |
245 | data8 sys_request_key | |
8dd97e6f | 246 | diff -NurpP --minimal linux-2.6.29/arch/ia64/kernel/perfmon.c linux-2.6.29-vs2.3.0.36.9-pre3/arch/ia64/kernel/perfmon.c |
2380c486 | 247 | --- linux-2.6.29/arch/ia64/kernel/perfmon.c 2009-03-24 14:18:25.000000000 +0100 |
8dd97e6f | 248 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/ia64/kernel/perfmon.c 2009-03-24 14:48:19.000000000 +0100 |
2380c486 JR |
249 | @@ -41,6 +41,7 @@ |
250 | #include <linux/rcupdate.h> | |
251 | #include <linux/completion.h> | |
252 | #include <linux/tracehook.h> | |
253 | +#include <linux/vs_memory.h> | |
d337f35e | 254 | |
2380c486 JR |
255 | #include <asm/errno.h> |
256 | #include <asm/intrinsics.h> | |
257 | @@ -2372,7 +2373,7 @@ pfm_smpl_buffer_alloc(struct task_struct | |
258 | */ | |
259 | insert_vm_struct(mm, vma); | |
d337f35e | 260 | |
2380c486 JR |
261 | - mm->total_vm += size >> PAGE_SHIFT; |
262 | + vx_vmpages_add(mm, size >> PAGE_SHIFT); | |
263 | vm_stat_account(vma->vm_mm, vma->vm_flags, vma->vm_file, | |
264 | vma_pages(vma)); | |
265 | up_write(&task->mm->mmap_sem); | |
8dd97e6f | 266 | diff -NurpP --minimal linux-2.6.29/arch/ia64/kernel/process.c linux-2.6.29-vs2.3.0.36.9-pre3/arch/ia64/kernel/process.c |
2380c486 | 267 | --- linux-2.6.29/arch/ia64/kernel/process.c 2008-12-25 00:26:37.000000000 +0100 |
8dd97e6f | 268 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/ia64/kernel/process.c 2009-02-22 22:54:24.000000000 +0100 |
2380c486 JR |
269 | @@ -110,8 +110,8 @@ show_regs (struct pt_regs *regs) |
270 | unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri; | |
d337f35e | 271 | |
2380c486 JR |
272 | print_modules(); |
273 | - printk("\nPid: %d, CPU %d, comm: %20s\n", task_pid_nr(current), | |
274 | - smp_processor_id(), current->comm); | |
275 | + printk("\nPid: %d[#%u], CPU %d, comm: %20s\n", task_pid_nr(current), | |
276 | + current->xid, smp_processor_id(), current->comm); | |
277 | printk("psr : %016lx ifs : %016lx ip : [<%016lx>] %s (%s)\n", | |
278 | regs->cr_ipsr, regs->cr_ifs, ip, print_tainted(), | |
279 | init_utsname()->release); | |
8dd97e6f | 280 | diff -NurpP --minimal linux-2.6.29/arch/ia64/kernel/ptrace.c linux-2.6.29-vs2.3.0.36.9-pre3/arch/ia64/kernel/ptrace.c |
2380c486 | 281 | --- linux-2.6.29/arch/ia64/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100 |
8dd97e6f | 282 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/ia64/kernel/ptrace.c 2009-02-22 22:54:24.000000000 +0100 |
2380c486 JR |
283 | @@ -23,6 +23,7 @@ |
284 | #include <linux/regset.h> | |
d337f35e | 285 | #include <linux/elf.h> |
2380c486 | 286 | #include <linux/tracehook.h> |
d337f35e JR |
287 | +#include <linux/vs_base.h> |
288 | ||
289 | #include <asm/pgtable.h> | |
290 | #include <asm/processor.h> | |
8dd97e6f | 291 | diff -NurpP --minimal linux-2.6.29/arch/ia64/kernel/traps.c linux-2.6.29-vs2.3.0.36.9-pre3/arch/ia64/kernel/traps.c |
2380c486 | 292 | --- linux-2.6.29/arch/ia64/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100 |
8dd97e6f | 293 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/ia64/kernel/traps.c 2009-02-22 22:54:24.000000000 +0100 |
2380c486 | 294 | @@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re |
d337f35e JR |
295 | put_cpu(); |
296 | ||
297 | if (++die.lock_owner_depth < 3) { | |
298 | - printk("%s[%d]: %s %ld [%d]\n", | |
2380c486 | 299 | - current->comm, task_pid_nr(current), str, err, ++die_counter); |
d337f35e | 300 | + printk("%s[%d[#%u]]: %s %ld [%d]\n", |
2380c486 | 301 | + current->comm, task_pid_nr(current), current->xid, |
d337f35e | 302 | + str, err, ++die_counter); |
2380c486 JR |
303 | if (notify_die(DIE_OOPS, str, regs, err, 255, SIGSEGV) |
304 | != NOTIFY_STOP) | |
305 | show_regs(regs); | |
306 | @@ -324,8 +325,9 @@ handle_fpu_swa (int fp_fault, struct pt_ | |
307 | if ((last.count & 15) < 5 && (ia64_fetchadd(1, &last.count, acq) & 15) < 5) { | |
308 | last.time = current_jiffies + 5 * HZ; | |
309 | printk(KERN_WARNING | |
310 | - "%s(%d): floating-point assist fault at ip %016lx, isr %016lx\n", | |
311 | - current->comm, task_pid_nr(current), regs->cr_iip + ia64_psr(regs)->ri, isr); | |
312 | + "%s(%d[#%u]): floating-point assist fault at ip %016lx, isr %016lx\n", | |
313 | + current->comm, task_pid_nr(current), current->xid, | |
314 | + regs->cr_iip + ia64_psr(regs)->ri, isr); | |
315 | } | |
316 | } | |
d337f35e | 317 | } |
8dd97e6f | 318 | diff -NurpP --minimal linux-2.6.29/arch/ia64/mm/fault.c linux-2.6.29-vs2.3.0.36.9-pre3/arch/ia64/mm/fault.c |
2380c486 | 319 | --- linux-2.6.29/arch/ia64/mm/fault.c 2008-12-25 00:26:37.000000000 +0100 |
8dd97e6f | 320 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/ia64/mm/fault.c 2009-02-22 22:54:24.000000000 +0100 |
d337f35e | 321 | @@ -10,6 +10,7 @@ |
d337f35e JR |
322 | #include <linux/interrupt.h> |
323 | #include <linux/kprobes.h> | |
2380c486 | 324 | #include <linux/kdebug.h> |
d337f35e JR |
325 | +#include <linux/vs_memory.h> |
326 | ||
327 | #include <asm/pgtable.h> | |
328 | #include <asm/processor.h> | |
8dd97e6f | 329 | diff -NurpP --minimal linux-2.6.29/arch/m32r/kernel/traps.c linux-2.6.29-vs2.3.0.36.9-pre3/arch/m32r/kernel/traps.c |
2380c486 | 330 | --- linux-2.6.29/arch/m32r/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100 |
8dd97e6f | 331 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/m32r/kernel/traps.c 2009-02-22 22:54:24.000000000 +0100 |
2380c486 | 332 | @@ -196,8 +196,9 @@ static void show_registers(struct pt_reg |
d337f35e JR |
333 | } else { |
334 | printk("SPI: %08lx\n", sp); | |
335 | } | |
336 | - printk("Process %s (pid: %d, process nr: %d, stackpage=%08lx)", | |
2380c486 | 337 | - current->comm, task_pid_nr(current), 0xffff & i, 4096+(unsigned long)current); |
d337f35e | 338 | + printk("Process %s (pid: %d[#%u], process nr: %d, stackpage=%08lx)", |
2380c486 | 339 | + current->comm, task_pid_nr(current), current->xid, |
d337f35e JR |
340 | + 0xffff & i, 4096+(unsigned long)current); |
341 | ||
342 | /* | |
343 | * When in-kernel, we also print out the stack and code at the | |
8dd97e6f | 344 | diff -NurpP --minimal linux-2.6.29/arch/m68k/Kconfig linux-2.6.29-vs2.3.0.36.9-pre3/arch/m68k/Kconfig |
2380c486 | 345 | --- linux-2.6.29/arch/m68k/Kconfig 2009-03-24 14:18:26.000000000 +0100 |
8dd97e6f | 346 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/m68k/Kconfig 2009-03-24 14:48:20.000000000 +0100 |
2380c486 | 347 | @@ -616,6 +616,8 @@ source "fs/Kconfig" |
d337f35e JR |
348 | |
349 | source "arch/m68k/Kconfig.debug" | |
350 | ||
351 | +source "kernel/vserver/Kconfig" | |
352 | + | |
353 | source "security/Kconfig" | |
354 | ||
355 | source "crypto/Kconfig" | |
8dd97e6f | 356 | diff -NurpP --minimal linux-2.6.29/arch/m68k/kernel/ptrace.c linux-2.6.29-vs2.3.0.36.9-pre3/arch/m68k/kernel/ptrace.c |
2380c486 | 357 | --- linux-2.6.29/arch/m68k/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100 |
8dd97e6f | 358 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/m68k/kernel/ptrace.c 2009-02-22 22:54:24.000000000 +0100 |
2380c486 | 359 | @@ -18,6 +18,7 @@ |
d337f35e JR |
360 | #include <linux/ptrace.h> |
361 | #include <linux/user.h> | |
362 | #include <linux/signal.h> | |
363 | +#include <linux/vs_base.h> | |
364 | ||
365 | #include <asm/uaccess.h> | |
366 | #include <asm/page.h> | |
2380c486 | 367 | @@ -269,6 +270,8 @@ long arch_ptrace(struct task_struct *chi |
d337f35e JR |
368 | ret = ptrace_request(child, request, addr, data); |
369 | break; | |
370 | } | |
2380c486 | 371 | + if (!vx_check(vx_task_xid(child), VS_WATCH_P | VS_IDENT)) |
d337f35e JR |
372 | + goto out_tsk; |
373 | ||
374 | return ret; | |
375 | out_eio: | |
8dd97e6f | 376 | diff -NurpP --minimal linux-2.6.29/arch/m68k/kernel/traps.c linux-2.6.29-vs2.3.0.36.9-pre3/arch/m68k/kernel/traps.c |
2380c486 | 377 | --- linux-2.6.29/arch/m68k/kernel/traps.c 2009-03-24 14:18:26.000000000 +0100 |
8dd97e6f | 378 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/m68k/kernel/traps.c 2009-03-24 14:48:20.000000000 +0100 |
2380c486 | 379 | @@ -906,8 +906,8 @@ void show_registers(struct pt_regs *regs |
d337f35e JR |
380 | printk("d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n", |
381 | regs->d4, regs->d5, regs->a0, regs->a1); | |
382 | ||
383 | - printk("Process %s (pid: %d, task=%p)\n", | |
2380c486 | 384 | - current->comm, task_pid_nr(current), current); |
d337f35e | 385 | + printk("Process %s (pid: %d[#%u], task=%p)\n", |
2380c486 | 386 | + current->comm, task_pid_nr(current), current->xid, current); |
d337f35e JR |
387 | addr = (unsigned long)&fp->un; |
388 | printk("Frame format=%X ", regs->format); | |
389 | switch (regs->format) { | |
8dd97e6f | 390 | diff -NurpP --minimal linux-2.6.29/arch/m68knommu/Kconfig linux-2.6.29-vs2.3.0.36.9-pre3/arch/m68knommu/Kconfig |
2380c486 | 391 | --- linux-2.6.29/arch/m68knommu/Kconfig 2009-03-24 14:18:27.000000000 +0100 |
8dd97e6f | 392 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/m68knommu/Kconfig 2009-03-24 14:48:20.000000000 +0100 |
2380c486 | 393 | @@ -720,6 +720,8 @@ source "fs/Kconfig" |
d337f35e JR |
394 | |
395 | source "arch/m68knommu/Kconfig.debug" | |
396 | ||
397 | +source "kernel/vserver/Kconfig" | |
398 | + | |
399 | source "security/Kconfig" | |
400 | ||
401 | source "crypto/Kconfig" | |
8dd97e6f | 402 | diff -NurpP --minimal linux-2.6.29/arch/m68knommu/kernel/traps.c linux-2.6.29-vs2.3.0.36.9-pre3/arch/m68knommu/kernel/traps.c |
2380c486 | 403 | --- linux-2.6.29/arch/m68knommu/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100 |
8dd97e6f | 404 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/m68knommu/kernel/traps.c 2009-02-22 22:54:24.000000000 +0100 |
2380c486 | 405 | @@ -78,8 +78,9 @@ void die_if_kernel(char *str, struct pt_ |
d337f35e JR |
406 | printk(KERN_EMERG "d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n", |
407 | fp->d4, fp->d5, fp->a0, fp->a1); | |
408 | ||
409 | - printk(KERN_EMERG "Process %s (pid: %d, stackpage=%08lx)\n", | |
410 | - current->comm, current->pid, PAGE_SIZE+(unsigned long)current); | |
411 | + printk(KERN_EMERG "Process %s (pid: %d[#%u], stackpage=%08lx)\n", | |
2380c486 | 412 | + current->comm, task_pid_nr(current), current->xid, |
d337f35e | 413 | + PAGE_SIZE+(unsigned long)current); |
2380c486 JR |
414 | show_stack(NULL, (unsigned long *)(fp + 1)); |
415 | add_taint(TAINT_DIE); | |
d337f35e | 416 | do_exit(SIGSEGV); |
8dd97e6f | 417 | diff -NurpP --minimal linux-2.6.29/arch/mips/Kconfig linux-2.6.29-vs2.3.0.36.9-pre3/arch/mips/Kconfig |
2380c486 | 418 | --- linux-2.6.29/arch/mips/Kconfig 2009-03-24 14:18:29.000000000 +0100 |
8dd97e6f | 419 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/mips/Kconfig 2009-03-24 14:48:21.000000000 +0100 |
2380c486 | 420 | @@ -2142,6 +2142,8 @@ source "fs/Kconfig" |
d337f35e JR |
421 | |
422 | source "arch/mips/Kconfig.debug" | |
423 | ||
424 | +source "kernel/vserver/Kconfig" | |
425 | + | |
426 | source "security/Kconfig" | |
427 | ||
428 | source "crypto/Kconfig" | |
8dd97e6f | 429 | diff -NurpP --minimal linux-2.6.29/arch/mips/kernel/ptrace.c linux-2.6.29-vs2.3.0.36.9-pre3/arch/mips/kernel/ptrace.c |
2380c486 | 430 | --- linux-2.6.29/arch/mips/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100 |
8dd97e6f | 431 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/mips/kernel/ptrace.c 2009-02-22 22:54:24.000000000 +0100 |
2380c486 | 432 | @@ -25,6 +25,7 @@ |
d337f35e | 433 | #include <linux/security.h> |
2380c486 JR |
434 | #include <linux/audit.h> |
435 | #include <linux/seccomp.h> | |
d337f35e JR |
436 | +#include <linux/vs_base.h> |
437 | ||
438 | #include <asm/byteorder.h> | |
439 | #include <asm/cpu.h> | |
2380c486 | 440 | @@ -259,6 +260,9 @@ long arch_ptrace(struct task_struct *chi |
d337f35e JR |
441 | { |
442 | int ret; | |
443 | ||
2380c486 | 444 | + if (!vx_check(vx_task_xid(child), VS_WATCH_P | VS_IDENT)) |
d337f35e JR |
445 | + goto out; |
446 | + | |
447 | switch (request) { | |
448 | /* when I and D space are separate, these will need to be fixed. */ | |
449 | case PTRACE_PEEKTEXT: /* read word at location addr. */ | |
8dd97e6f | 450 | diff -NurpP --minimal linux-2.6.29/arch/mips/kernel/scall32-o32.S linux-2.6.29-vs2.3.0.36.9-pre3/arch/mips/kernel/scall32-o32.S |
2380c486 | 451 | --- linux-2.6.29/arch/mips/kernel/scall32-o32.S 2009-03-24 14:18:31.000000000 +0100 |
8dd97e6f | 452 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/mips/kernel/scall32-o32.S 2009-03-24 14:48:21.000000000 +0100 |
2380c486 | 453 | @@ -597,7 +597,7 @@ einval: li v0, -ENOSYS |
d337f35e JR |
454 | sys sys_mq_timedreceive 5 |
455 | sys sys_mq_notify 2 /* 4275 */ | |
456 | sys sys_mq_getsetattr 3 | |
457 | - sys sys_ni_syscall 0 /* sys_vserver */ | |
458 | + sys sys_vserver 3 | |
459 | sys sys_waitid 5 | |
460 | sys sys_ni_syscall 0 /* available, was setaltroot */ | |
461 | sys sys_add_key 5 /* 4280 */ | |
8dd97e6f | 462 | diff -NurpP --minimal linux-2.6.29/arch/mips/kernel/scall64-64.S linux-2.6.29-vs2.3.0.36.9-pre3/arch/mips/kernel/scall64-64.S |
2380c486 | 463 | --- linux-2.6.29/arch/mips/kernel/scall64-64.S 2009-03-24 14:18:31.000000000 +0100 |
8dd97e6f | 464 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/mips/kernel/scall64-64.S 2009-03-24 14:48:21.000000000 +0100 |
d337f35e JR |
465 | @@ -434,7 +434,7 @@ sys_call_table: |
466 | PTR sys_mq_timedreceive | |
467 | PTR sys_mq_notify | |
468 | PTR sys_mq_getsetattr /* 5235 */ | |
469 | - PTR sys_ni_syscall /* sys_vserver */ | |
470 | + PTR sys_vserver | |
471 | PTR sys_waitid | |
472 | PTR sys_ni_syscall /* available, was setaltroot */ | |
473 | PTR sys_add_key | |
8dd97e6f | 474 | diff -NurpP --minimal linux-2.6.29/arch/mips/kernel/scall64-n32.S linux-2.6.29-vs2.3.0.36.9-pre3/arch/mips/kernel/scall64-n32.S |
2380c486 | 475 | --- linux-2.6.29/arch/mips/kernel/scall64-n32.S 2009-03-24 14:18:31.000000000 +0100 |
8dd97e6f | 476 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/mips/kernel/scall64-n32.S 2009-03-24 14:48:21.000000000 +0100 |
d337f35e JR |
477 | @@ -360,7 +360,7 @@ EXPORT(sysn32_call_table) |
478 | PTR compat_sys_mq_timedreceive | |
479 | PTR compat_sys_mq_notify | |
480 | PTR compat_sys_mq_getsetattr | |
481 | - PTR sys_ni_syscall /* 6240, sys_vserver */ | |
482 | + PTR sys32_vserver /* 6240 */ | |
2380c486 | 483 | PTR compat_sys_waitid |
d337f35e JR |
484 | PTR sys_ni_syscall /* available, was setaltroot */ |
485 | PTR sys_add_key | |
8dd97e6f | 486 | diff -NurpP --minimal linux-2.6.29/arch/mips/kernel/scall64-o32.S linux-2.6.29-vs2.3.0.36.9-pre3/arch/mips/kernel/scall64-o32.S |
2380c486 | 487 | --- linux-2.6.29/arch/mips/kernel/scall64-o32.S 2009-03-24 14:18:31.000000000 +0100 |
8dd97e6f | 488 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/mips/kernel/scall64-o32.S 2009-03-24 14:59:48.000000000 +0100 |
2380c486 | 489 | @@ -480,7 +480,7 @@ sys_call_table: |
d337f35e JR |
490 | PTR compat_sys_mq_timedreceive |
491 | PTR compat_sys_mq_notify /* 4275 */ | |
492 | PTR compat_sys_mq_getsetattr | |
493 | - PTR sys_ni_syscall /* sys_vserver */ | |
494 | + PTR sys32_vserver | |
2380c486 | 495 | PTR sys_32_waitid |
d337f35e JR |
496 | PTR sys_ni_syscall /* available, was setaltroot */ |
497 | PTR sys_add_key /* 4280 */ | |
8dd97e6f | 498 | diff -NurpP --minimal linux-2.6.29/arch/mips/kernel/traps.c linux-2.6.29-vs2.3.0.36.9-pre3/arch/mips/kernel/traps.c |
2380c486 | 499 | --- linux-2.6.29/arch/mips/kernel/traps.c 2009-03-24 14:18:31.000000000 +0100 |
8dd97e6f | 500 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/mips/kernel/traps.c 2009-03-24 14:48:21.000000000 +0100 |
2380c486 JR |
501 | @@ -335,9 +335,10 @@ void show_registers(const struct pt_regs |
502 | ||
503 | __show_regs(regs); | |
d337f35e | 504 | print_modules(); |
2380c486 JR |
505 | - printk("Process %s (pid: %d, threadinfo=%p, task=%p, tls=%0*lx)\n", |
506 | - current->comm, current->pid, current_thread_info(), current, | |
507 | - field, current_thread_info()->tp_value); | |
508 | + printk("Process %s (pid: %d:#%u, threadinfo=%p, task=%p, tls=%0*lx)\n", | |
509 | + current->comm, task_pid_nr(current), current->xid, | |
510 | + current_thread_info(), current, | |
511 | + field, current_thread_info()->tp_value); | |
512 | if (cpu_has_userlocal) { | |
513 | unsigned long tls; | |
514 | ||
8dd97e6f | 515 | diff -NurpP --minimal linux-2.6.29/arch/parisc/Kconfig linux-2.6.29-vs2.3.0.36.9-pre3/arch/parisc/Kconfig |
2380c486 | 516 | --- linux-2.6.29/arch/parisc/Kconfig 2009-03-24 14:18:32.000000000 +0100 |
8dd97e6f | 517 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/parisc/Kconfig 2009-03-24 14:48:21.000000000 +0100 |
2380c486 | 518 | @@ -281,6 +281,8 @@ source "fs/Kconfig" |
d337f35e JR |
519 | |
520 | source "arch/parisc/Kconfig.debug" | |
521 | ||
522 | +source "kernel/vserver/Kconfig" | |
523 | + | |
524 | source "security/Kconfig" | |
525 | ||
526 | source "crypto/Kconfig" | |
8dd97e6f | 527 | diff -NurpP --minimal linux-2.6.29/arch/parisc/kernel/syscall_table.S linux-2.6.29-vs2.3.0.36.9-pre3/arch/parisc/kernel/syscall_table.S |
2380c486 | 528 | --- linux-2.6.29/arch/parisc/kernel/syscall_table.S 2008-12-25 00:26:37.000000000 +0100 |
8dd97e6f | 529 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/parisc/kernel/syscall_table.S 2009-02-22 22:54:24.000000000 +0100 |
2380c486 | 530 | @@ -361,7 +361,7 @@ |
d337f35e JR |
531 | ENTRY_COMP(mbind) /* 260 */ |
532 | ENTRY_COMP(get_mempolicy) | |
533 | ENTRY_COMP(set_mempolicy) | |
534 | - ENTRY_SAME(ni_syscall) /* 263: reserved for vserver */ | |
535 | + ENTRY_DIFF(vserver) | |
536 | ENTRY_SAME(add_key) | |
537 | ENTRY_SAME(request_key) /* 265 */ | |
538 | ENTRY_SAME(keyctl) | |
8dd97e6f | 539 | diff -NurpP --minimal linux-2.6.29/arch/parisc/kernel/traps.c linux-2.6.29-vs2.3.0.36.9-pre3/arch/parisc/kernel/traps.c |
2380c486 | 540 | --- linux-2.6.29/arch/parisc/kernel/traps.c 2009-03-24 14:18:32.000000000 +0100 |
8dd97e6f | 541 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/parisc/kernel/traps.c 2009-03-24 14:48:21.000000000 +0100 |
2380c486 | 542 | @@ -236,8 +236,9 @@ void die_if_kernel(char *str, struct pt_ |
d337f35e JR |
543 | if (err == 0) |
544 | return; /* STFU */ | |
545 | ||
546 | - printk(KERN_CRIT "%s (pid %d): %s (code %ld) at " RFMT "\n", | |
2380c486 | 547 | - current->comm, task_pid_nr(current), str, err, regs->iaoq[0]); |
d337f35e | 548 | + printk(KERN_CRIT "%s (pid %d:#%u): %s (code %ld) at " RFMT "\n", |
2380c486 | 549 | + current->comm, task_pid_nr(current), current->xid, |
d337f35e JR |
550 | + str, err, regs->iaoq[0]); |
551 | #ifdef PRINT_USER_FAULTS | |
552 | /* XXX for debugging only */ | |
553 | show_regs(regs); | |
2380c486 | 554 | @@ -269,8 +270,8 @@ KERN_CRIT " || | |
d337f35e JR |
555 | pdc_console_restart(); |
556 | ||
2380c486 JR |
557 | if (err) |
558 | - printk(KERN_CRIT "%s (pid %d): %s (code %ld)\n", | |
559 | - current->comm, task_pid_nr(current), str, err); | |
560 | + printk(KERN_CRIT "%s (pid %d:#%u): %s (code %ld)\n", | |
561 | + current->comm, task_pid_nr(current), current->xid, str, err); | |
562 | ||
563 | /* Wot's wrong wif bein' racy? */ | |
564 | if (current->thread.flags & PARISC_KERNEL_DEATH) { | |
8dd97e6f | 565 | diff -NurpP --minimal linux-2.6.29/arch/parisc/mm/fault.c linux-2.6.29-vs2.3.0.36.9-pre3/arch/parisc/mm/fault.c |
2380c486 | 566 | --- linux-2.6.29/arch/parisc/mm/fault.c 2009-03-24 14:18:33.000000000 +0100 |
8dd97e6f | 567 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/parisc/mm/fault.c 2009-03-24 14:48:21.000000000 +0100 |
2380c486 | 568 | @@ -238,8 +238,9 @@ bad_area: |
d337f35e JR |
569 | |
570 | #ifdef PRINT_USER_FAULTS | |
571 | printk(KERN_DEBUG "\n"); | |
572 | - printk(KERN_DEBUG "do_page_fault() pid=%d command='%s' type=%lu address=0x%08lx\n", | |
2380c486 | 573 | - task_pid_nr(tsk), tsk->comm, code, address); |
d337f35e JR |
574 | + printk(KERN_DEBUG "do_page_fault() pid=%d:#%u " |
575 | + "command='%s' type=%lu address=0x%08lx\n", | |
2380c486 | 576 | + task_pid_nr(tsk), tsk->xid, tsk->comm, code, address); |
d337f35e JR |
577 | if (vma) { |
578 | printk(KERN_DEBUG "vm_start = 0x%08lx, vm_end = 0x%08lx\n", | |
579 | vma->vm_start, vma->vm_end); | |
2380c486 JR |
580 | @@ -265,7 +266,8 @@ no_context: |
581 | ||
582 | out_of_memory: | |
583 | up_read(&mm->mmap_sem); | |
584 | - printk(KERN_CRIT "VM: killing process %s\n", current->comm); | |
585 | + printk(KERN_CRIT "VM: killing process %s(%d:#%u)\n", | |
586 | + current->comm, current->pid, current->xid); | |
587 | if (user_mode(regs)) | |
588 | do_group_exit(SIGKILL); | |
589 | goto no_context; | |
8dd97e6f | 590 | diff -NurpP --minimal linux-2.6.29/arch/powerpc/Kconfig linux-2.6.29-vs2.3.0.36.9-pre3/arch/powerpc/Kconfig |
2380c486 | 591 | --- linux-2.6.29/arch/powerpc/Kconfig 2009-03-24 14:18:33.000000000 +0100 |
8dd97e6f | 592 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/powerpc/Kconfig 2009-03-24 14:48:22.000000000 +0100 |
2380c486 | 593 | @@ -882,6 +882,8 @@ source "lib/Kconfig" |
d337f35e JR |
594 | |
595 | source "arch/powerpc/Kconfig.debug" | |
596 | ||
597 | +source "kernel/vserver/Kconfig" | |
598 | + | |
599 | source "security/Kconfig" | |
600 | ||
601 | config KEYS_COMPAT | |
8dd97e6f | 602 | diff -NurpP --minimal linux-2.6.29/arch/powerpc/kernel/irq.c linux-2.6.29-vs2.3.0.36.9-pre3/arch/powerpc/kernel/irq.c |
2380c486 | 603 | --- linux-2.6.29/arch/powerpc/kernel/irq.c 2009-03-24 14:18:35.000000000 +0100 |
8dd97e6f | 604 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/powerpc/kernel/irq.c 2009-03-24 14:48:22.000000000 +0100 |
d337f35e | 605 | @@ -53,6 +53,7 @@ |
d337f35e JR |
606 | #include <linux/bootmem.h> |
607 | #include <linux/pci.h> | |
2380c486 | 608 | #include <linux/debugfs.h> |
d337f35e JR |
609 | +#include <linux/vs_context.h> |
610 | ||
611 | #include <asm/uaccess.h> | |
612 | #include <asm/system.h> | |
8dd97e6f | 613 | diff -NurpP --minimal linux-2.6.29/arch/powerpc/kernel/process.c linux-2.6.29-vs2.3.0.36.9-pre3/arch/powerpc/kernel/process.c |
2380c486 | 614 | --- linux-2.6.29/arch/powerpc/kernel/process.c 2009-03-24 14:18:35.000000000 +0100 |
8dd97e6f | 615 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/powerpc/kernel/process.c 2009-03-24 14:48:22.000000000 +0100 |
2380c486 JR |
616 | @@ -516,8 +516,9 @@ void show_regs(struct pt_regs * regs) |
617 | #else | |
d337f35e | 618 | printk("DAR: "REG", DSISR: "REG"\n", regs->dar, regs->dsisr); |
2380c486 | 619 | #endif |
d337f35e | 620 | - printk("TASK = %p[%d] '%s' THREAD: %p", |
2380c486 | 621 | - current, task_pid_nr(current), current->comm, task_thread_info(current)); |
d337f35e | 622 | + printk("TASK = %p[%d,#%u] '%s' THREAD: %p", |
2380c486 | 623 | + current, task_pid_nr(current), current->xid, |
d337f35e JR |
624 | + current->comm, task_thread_info(current)); |
625 | ||
626 | #ifdef CONFIG_SMP | |
2380c486 | 627 | printk(" CPU: %d", raw_smp_processor_id()); |
8dd97e6f | 628 | diff -NurpP --minimal linux-2.6.29/arch/powerpc/kernel/traps.c linux-2.6.29-vs2.3.0.36.9-pre3/arch/powerpc/kernel/traps.c |
2380c486 | 629 | --- linux-2.6.29/arch/powerpc/kernel/traps.c 2009-03-24 14:18:35.000000000 +0100 |
8dd97e6f | 630 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/powerpc/kernel/traps.c 2009-03-24 14:48:22.000000000 +0100 |
2380c486 | 631 | @@ -940,8 +940,9 @@ void nonrecoverable_exception(struct pt_ |
d337f35e JR |
632 | |
633 | void trace_syscall(struct pt_regs *regs) | |
634 | { | |
635 | - printk("Task: %p(%d), PC: %08lX/%08lX, Syscall: %3ld, Result: %s%ld %s\n", | |
2380c486 | 636 | - current, task_pid_nr(current), regs->nip, regs->link, regs->gpr[0], |
d337f35e | 637 | + printk("Task: %p(%d[#%u]), PC: %08lX/%08lX, Syscall: %3ld, Result: %s%ld %s\n", |
2380c486 | 638 | + current, task_pid_nr(current), current->xid, |
d337f35e JR |
639 | + regs->nip, regs->link, regs->gpr[0], |
640 | regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted()); | |
641 | } | |
642 | ||
8dd97e6f | 643 | diff -NurpP --minimal linux-2.6.29/arch/powerpc/kernel/vdso.c linux-2.6.29-vs2.3.0.36.9-pre3/arch/powerpc/kernel/vdso.c |
2380c486 | 644 | --- linux-2.6.29/arch/powerpc/kernel/vdso.c 2009-03-24 14:18:35.000000000 +0100 |
8dd97e6f | 645 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/powerpc/kernel/vdso.c 2009-03-24 14:48:22.000000000 +0100 |
d337f35e | 646 | @@ -22,6 +22,7 @@ |
d337f35e JR |
647 | #include <linux/security.h> |
648 | #include <linux/bootmem.h> | |
2380c486 | 649 | #include <linux/lmb.h> |
d337f35e JR |
650 | +#include <linux/vs_memory.h> |
651 | ||
652 | #include <asm/pgtable.h> | |
653 | #include <asm/system.h> | |
8dd97e6f | 654 | diff -NurpP --minimal linux-2.6.29/arch/powerpc/mm/fault.c linux-2.6.29-vs2.3.0.36.9-pre3/arch/powerpc/mm/fault.c |
2380c486 | 655 | --- linux-2.6.29/arch/powerpc/mm/fault.c 2009-03-24 14:18:36.000000000 +0100 |
8dd97e6f | 656 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/powerpc/mm/fault.c 2009-03-24 14:48:22.000000000 +0100 |
2380c486 JR |
657 | @@ -362,7 +362,8 @@ out_of_memory: |
658 | down_read(&mm->mmap_sem); | |
659 | goto survive; | |
660 | } | |
661 | - printk("VM: killing process %s\n", current->comm); | |
662 | + printk("VM: killing process %s(%d:#%u)\n", | |
663 | + current->comm, current->pid, current->xid); | |
664 | if (user_mode(regs)) | |
665 | do_group_exit(SIGKILL); | |
666 | return SIGKILL; | |
8dd97e6f | 667 | diff -NurpP --minimal linux-2.6.29/arch/s390/Kconfig linux-2.6.29-vs2.3.0.36.9-pre3/arch/s390/Kconfig |
2380c486 | 668 | --- linux-2.6.29/arch/s390/Kconfig 2009-03-24 14:18:38.000000000 +0100 |
8dd97e6f | 669 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/s390/Kconfig 2009-03-24 14:48:22.000000000 +0100 |
2380c486 | 670 | @@ -586,6 +586,8 @@ source "fs/Kconfig" |
d337f35e JR |
671 | |
672 | source "arch/s390/Kconfig.debug" | |
673 | ||
674 | +source "kernel/vserver/Kconfig" | |
675 | + | |
676 | source "security/Kconfig" | |
677 | ||
678 | source "crypto/Kconfig" | |
8dd97e6f | 679 | diff -NurpP --minimal linux-2.6.29/arch/s390/kernel/ptrace.c linux-2.6.29-vs2.3.0.36.9-pre3/arch/s390/kernel/ptrace.c |
2380c486 | 680 | --- linux-2.6.29/arch/s390/kernel/ptrace.c 2009-03-24 14:18:40.000000000 +0100 |
8dd97e6f | 681 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/s390/kernel/ptrace.c 2009-03-24 14:48:22.000000000 +0100 |
2380c486 JR |
682 | @@ -36,6 +36,7 @@ |
683 | #include <linux/elf.h> | |
684 | #include <linux/regset.h> | |
685 | #include <linux/tracehook.h> | |
d337f35e JR |
686 | +#include <linux/vs_base.h> |
687 | ||
688 | #include <asm/segment.h> | |
689 | #include <asm/page.h> | |
8dd97e6f | 690 | diff -NurpP --minimal linux-2.6.29/arch/s390/kernel/syscalls.S linux-2.6.29-vs2.3.0.36.9-pre3/arch/s390/kernel/syscalls.S |
2380c486 | 691 | --- linux-2.6.29/arch/s390/kernel/syscalls.S 2009-03-24 14:18:40.000000000 +0100 |
8dd97e6f | 692 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/s390/kernel/syscalls.S 2009-03-24 14:48:22.000000000 +0100 |
d337f35e JR |
693 | @@ -271,7 +271,7 @@ SYSCALL(sys_clock_settime,sys_clock_sett |
694 | SYSCALL(sys_clock_gettime,sys_clock_gettime,sys32_clock_gettime_wrapper) /* 260 */ | |
695 | SYSCALL(sys_clock_getres,sys_clock_getres,sys32_clock_getres_wrapper) | |
696 | SYSCALL(sys_clock_nanosleep,sys_clock_nanosleep,sys32_clock_nanosleep_wrapper) | |
697 | -NI_SYSCALL /* reserved for vserver */ | |
698 | +SYSCALL(sys_vserver,sys_vserver,sys32_vserver) | |
2380c486 | 699 | SYSCALL(sys_s390_fadvise64_64,sys_ni_syscall,sys32_fadvise64_64_wrapper) |
d337f35e JR |
700 | SYSCALL(sys_statfs64,sys_statfs64,compat_sys_statfs64_wrapper) |
701 | SYSCALL(sys_fstatfs64,sys_fstatfs64,compat_sys_fstatfs64_wrapper) | |
8dd97e6f | 702 | diff -NurpP --minimal linux-2.6.29/arch/s390/mm/fault.c linux-2.6.29-vs2.3.0.36.9-pre3/arch/s390/mm/fault.c |
2380c486 | 703 | --- linux-2.6.29/arch/s390/mm/fault.c 2008-12-25 00:26:37.000000000 +0100 |
8dd97e6f | 704 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/s390/mm/fault.c 2009-02-22 22:54:24.000000000 +0100 |
2380c486 JR |
705 | @@ -216,7 +216,8 @@ static int do_out_of_memory(struct pt_re |
706 | down_read(&mm->mmap_sem); | |
707 | return 1; | |
708 | } | |
709 | - printk("VM: killing process %s\n", tsk->comm); | |
710 | + printk("VM: killing process %s(%d:#%u)\n", | |
711 | + tsk->comm, tsk->pid, tsk->xid); | |
712 | if (regs->psw.mask & PSW_MASK_PSTATE) | |
713 | do_group_exit(SIGKILL); | |
714 | do_no_context(regs, error_code, address); | |
8dd97e6f | 715 | diff -NurpP --minimal linux-2.6.29/arch/sh/Kconfig linux-2.6.29-vs2.3.0.36.9-pre3/arch/sh/Kconfig |
2380c486 | 716 | --- linux-2.6.29/arch/sh/Kconfig 2009-03-24 14:18:40.000000000 +0100 |
8dd97e6f | 717 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/sh/Kconfig 2009-03-24 14:48:22.000000000 +0100 |
2380c486 | 718 | @@ -694,6 +694,8 @@ source "fs/Kconfig" |
d337f35e JR |
719 | |
720 | source "arch/sh/Kconfig.debug" | |
721 | ||
722 | +source "kernel/vserver/Kconfig" | |
723 | + | |
724 | source "security/Kconfig" | |
725 | ||
726 | source "crypto/Kconfig" | |
8dd97e6f | 727 | diff -NurpP --minimal linux-2.6.29/arch/sh/kernel/irq.c linux-2.6.29-vs2.3.0.36.9-pre3/arch/sh/kernel/irq.c |
2380c486 | 728 | --- linux-2.6.29/arch/sh/kernel/irq.c 2008-12-25 00:26:37.000000000 +0100 |
8dd97e6f | 729 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/sh/kernel/irq.c 2009-02-22 22:54:24.000000000 +0100 |
2380c486 JR |
730 | @@ -11,6 +11,7 @@ |
731 | #include <linux/module.h> | |
d337f35e JR |
732 | #include <linux/kernel_stat.h> |
733 | #include <linux/seq_file.h> | |
d337f35e | 734 | +#include <linux/vs_context.h> |
d337f35e | 735 | #include <asm/processor.h> |
2380c486 | 736 | #include <asm/machvec.h> |
d337f35e | 737 | #include <asm/uaccess.h> |
8dd97e6f | 738 | diff -NurpP --minimal linux-2.6.29/arch/sh/kernel/vsyscall/vsyscall.c linux-2.6.29-vs2.3.0.36.9-pre3/arch/sh/kernel/vsyscall/vsyscall.c |
2380c486 | 739 | --- linux-2.6.29/arch/sh/kernel/vsyscall/vsyscall.c 2009-03-24 14:18:42.000000000 +0100 |
8dd97e6f | 740 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/sh/kernel/vsyscall/vsyscall.c 2009-03-24 14:48:22.000000000 +0100 |
2380c486 | 741 | @@ -19,6 +19,7 @@ |
d337f35e | 742 | #include <linux/elf.h> |
2380c486 JR |
743 | #include <linux/sched.h> |
744 | #include <linux/err.h> | |
d337f35e JR |
745 | +#include <linux/vs_memory.h> |
746 | ||
747 | /* | |
748 | * Should the kernel map a VDSO page into processes and pass its | |
8dd97e6f | 749 | diff -NurpP --minimal linux-2.6.29/arch/sparc/Kconfig linux-2.6.29-vs2.3.0.36.9-pre3/arch/sparc/Kconfig |
2380c486 | 750 | --- linux-2.6.29/arch/sparc/Kconfig 2009-03-24 14:18:43.000000000 +0100 |
8dd97e6f | 751 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/sparc/Kconfig 2009-03-24 14:48:22.000000000 +0100 |
2380c486 | 752 | @@ -522,6 +522,8 @@ source "fs/Kconfig" |
d337f35e JR |
753 | |
754 | source "arch/sparc/Kconfig.debug" | |
755 | ||
756 | +source "kernel/vserver/Kconfig" | |
757 | + | |
758 | source "security/Kconfig" | |
759 | ||
760 | source "crypto/Kconfig" | |
8dd97e6f | 761 | diff -NurpP --minimal linux-2.6.29/arch/x86/ia32/ia32entry.S linux-2.6.29-vs2.3.0.36.9-pre3/arch/x86/ia32/ia32entry.S |
2380c486 | 762 | --- linux-2.6.29/arch/x86/ia32/ia32entry.S 2009-03-24 14:18:48.000000000 +0100 |
8dd97e6f | 763 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/x86/ia32/ia32entry.S 2009-03-22 23:29:11.000000000 +0100 |
2380c486 JR |
764 | @@ -768,7 +768,7 @@ ia32_sys_call_table: |
765 | .quad sys_tgkill /* 270 */ | |
766 | .quad compat_sys_utimes | |
767 | .quad sys32_fadvise64_64 | |
768 | - .quad quiet_ni_syscall /* sys_vserver */ | |
769 | + .quad sys32_vserver | |
770 | .quad sys_mbind | |
771 | .quad compat_sys_get_mempolicy /* 275 */ | |
772 | .quad sys_set_mempolicy | |
8dd97e6f | 773 | diff -NurpP --minimal linux-2.6.29/arch/x86/include/asm/unistd_64.h linux-2.6.29-vs2.3.0.36.9-pre3/arch/x86/include/asm/unistd_64.h |
2380c486 | 774 | --- linux-2.6.29/arch/x86/include/asm/unistd_64.h 2008-12-25 00:26:37.000000000 +0100 |
8dd97e6f | 775 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/x86/include/asm/unistd_64.h 2009-02-22 22:54:24.000000000 +0100 |
2380c486 JR |
776 | @@ -535,7 +535,7 @@ __SYSCALL(__NR_tgkill, sys_tgkill) |
777 | #define __NR_utimes 235 | |
778 | __SYSCALL(__NR_utimes, sys_utimes) | |
779 | #define __NR_vserver 236 | |
780 | -__SYSCALL(__NR_vserver, sys_ni_syscall) | |
781 | +__SYSCALL(__NR_vserver, sys_vserver) | |
782 | #define __NR_mbind 237 | |
783 | __SYSCALL(__NR_mbind, sys_mbind) | |
784 | #define __NR_set_mempolicy 238 | |
8dd97e6f | 785 | diff -NurpP --minimal linux-2.6.29/arch/x86/Kconfig linux-2.6.29-vs2.3.0.36.9-pre3/arch/x86/Kconfig |
2380c486 | 786 | --- linux-2.6.29/arch/x86/Kconfig 2009-03-24 14:18:47.000000000 +0100 |
8dd97e6f | 787 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/x86/Kconfig 2009-03-24 14:48:23.000000000 +0100 |
2380c486 | 788 | @@ -1990,6 +1990,8 @@ source "fs/Kconfig" |
d337f35e | 789 | |
2380c486 | 790 | source "arch/x86/Kconfig.debug" |
d337f35e JR |
791 | |
792 | +source "kernel/vserver/Kconfig" | |
793 | + | |
794 | source "security/Kconfig" | |
795 | ||
796 | source "crypto/Kconfig" | |
8dd97e6f | 797 | diff -NurpP --minimal linux-2.6.29/arch/x86/kernel/syscall_table_32.S linux-2.6.29-vs2.3.0.36.9-pre3/arch/x86/kernel/syscall_table_32.S |
2380c486 | 798 | --- linux-2.6.29/arch/x86/kernel/syscall_table_32.S 2009-03-24 14:18:51.000000000 +0100 |
8dd97e6f | 799 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/x86/kernel/syscall_table_32.S 2009-02-22 22:54:24.000000000 +0100 |
2380c486 JR |
800 | @@ -272,7 +272,7 @@ ENTRY(sys_call_table) |
801 | .long sys_tgkill /* 270 */ | |
802 | .long sys_utimes | |
803 | .long sys_fadvise64_64 | |
804 | - .long sys_ni_syscall /* sys_vserver */ | |
805 | + .long sys_vserver | |
806 | .long sys_mbind | |
807 | .long sys_get_mempolicy | |
808 | .long sys_set_mempolicy | |
8dd97e6f | 809 | diff -NurpP --minimal linux-2.6.29/Documentation/vserver/debug.txt linux-2.6.29-vs2.3.0.36.9-pre3/Documentation/vserver/debug.txt |
2380c486 | 810 | --- linux-2.6.29/Documentation/vserver/debug.txt 1970-01-01 01:00:00.000000000 +0100 |
8dd97e6f | 811 | +++ linux-2.6.29-vs2.3.0.36.9-pre3/Documentation/vserver/debug.txt 2009-02-22 22:54:24.000000000 +0100 |
2380c486 | 812 | @@ -0,0 +1,154 @@ |
d337f35e | 813 | + |
2380c486 | 814 | +debug_cvirt: |
d337f35e | 815 | + |
2380c486 JR |
816 | + 2 4 "vx_map_tgid: %p/%llx: %d -> %d" |
817 | + "vx_rmap_tgid: %p/%llx: %d -> %d" | |
d337f35e | 818 | + |
2380c486 | 819 | +debug_dlim: |
d337f35e | 820 | + |
2380c486 JR |
821 | + 0 1 "ALLOC (%p,#%d)%c inode (%d)" |
822 | + "FREE (%p,#%d)%c inode" | |
823 | + 1 2 "ALLOC (%p,#%d)%c %lld bytes (%d)" | |
824 | + "FREE (%p,#%d)%c %lld bytes" | |
825 | + 2 4 "ADJUST: %lld,%lld on %ld,%ld [mult=%d]" | |
826 | + 3 8 "ext3_has_free_blocks(%p): %lu<%lu+1, %c, %u!=%u r=%d" | |
827 | + "ext3_has_free_blocks(%p): free=%lu, root=%lu" | |
828 | + "rcu_free_dl_info(%p)" | |
829 | + 4 10 "alloc_dl_info(%p,%d) = %p" | |
830 | + "dealloc_dl_info(%p)" | |
831 | + "get_dl_info(%p[#%d.%d])" | |
832 | + "put_dl_info(%p[#%d.%d])" | |
833 | + 5 20 "alloc_dl_info(%p,%d)*" | |
834 | + 6 40 "__hash_dl_info: %p[#%d]" | |
835 | + "__unhash_dl_info: %p[#%d]" | |
836 | + 7 80 "locate_dl_info(%p,#%d) = %p" | |
837 | + | |
838 | +debug_misc: | |
839 | + | |
840 | + 0 1 "destroy_dqhash: %p [#0x%08x] c=%d" | |
841 | + "new_dqhash: %p [#0x%08x]" | |
842 | + "vroot[%d]_clr_dev: dev=%p[%lu,%d:%d]" | |
843 | + "vroot[%d]_get_real_bdev: dev=%p[%lu,%d:%d]" | |
844 | + "vroot[%d]_set_dev: dev=%p[%lu,%d:%d]" | |
845 | + "vroot_get_real_bdev not set" | |
846 |