diff options
Diffstat (limited to 'arch/um')
-rw-r--r-- | arch/um/drivers/chan_user.c | 15 | ||||
-rw-r--r-- | arch/um/drivers/net_kern.c | 29 | ||||
-rw-r--r-- | arch/um/include/registers.h | 2 | ||||
-rw-r--r-- | arch/um/kernel/skas/process.c | 569 | ||||
-rw-r--r-- | arch/um/kernel/um_arch.c | 18 | ||||
-rw-r--r-- | arch/um/os-Linux/drivers/tuntap_user.c | 4 | ||||
-rw-r--r-- | arch/um/os-Linux/skas/mem.c | 2 | ||||
-rw-r--r-- | arch/um/os-Linux/skas/process.c | 21 | ||||
-rw-r--r-- | arch/um/os-Linux/start_up.c | 1 | ||||
-rw-r--r-- | arch/um/os-Linux/sys-i386/registers.c | 5 | ||||
-rw-r--r-- | arch/um/os-Linux/sys-x86_64/registers.c | 5 | ||||
-rw-r--r-- | arch/um/sys-x86_64/ptrace_user.c | 7 | ||||
-rw-r--r-- | arch/um/sys-x86_64/user-offsets.c | 2 |
13 files changed, 80 insertions, 600 deletions
diff --git a/arch/um/drivers/chan_user.c b/arch/um/drivers/chan_user.c index 5d50d4a44abf..2f880cb167a5 100644 --- a/arch/um/drivers/chan_user.c +++ b/arch/um/drivers/chan_user.c | |||
@@ -9,6 +9,7 @@ | |||
9 | #include <termios.h> | 9 | #include <termios.h> |
10 | #include <string.h> | 10 | #include <string.h> |
11 | #include <signal.h> | 11 | #include <signal.h> |
12 | #include <sched.h> | ||
12 | #include <sys/stat.h> | 13 | #include <sys/stat.h> |
13 | #include <sys/ioctl.h> | 14 | #include <sys/ioctl.h> |
14 | #include <sys/socket.h> | 15 | #include <sys/socket.h> |
@@ -73,7 +74,6 @@ static void winch_handler(int sig) | |||
73 | struct winch_data { | 74 | struct winch_data { |
74 | int pty_fd; | 75 | int pty_fd; |
75 | int pipe_fd; | 76 | int pipe_fd; |
76 | int close_me; | ||
77 | }; | 77 | }; |
78 | 78 | ||
79 | static int winch_thread(void *arg) | 79 | static int winch_thread(void *arg) |
@@ -84,7 +84,6 @@ static int winch_thread(void *arg) | |||
84 | int count, err; | 84 | int count, err; |
85 | char c = 1; | 85 | char c = 1; |
86 | 86 | ||
87 | os_close_file(data->close_me); | ||
88 | pty_fd = data->pty_fd; | 87 | pty_fd = data->pty_fd; |
89 | pipe_fd = data->pipe_fd; | 88 | pipe_fd = data->pipe_fd; |
90 | count = os_write_file(pipe_fd, &c, sizeof(c)); | 89 | count = os_write_file(pipe_fd, &c, sizeof(c)); |
@@ -153,15 +152,16 @@ static int winch_tramp(int fd, struct tty_struct *tty, int *fd_out) | |||
153 | } | 152 | } |
154 | 153 | ||
155 | data = ((struct winch_data) { .pty_fd = fd, | 154 | data = ((struct winch_data) { .pty_fd = fd, |
156 | .pipe_fd = fds[1], | 155 | .pipe_fd = fds[1] } ); |
157 | .close_me = fds[0] } ); | 156 | /* CLONE_FILES so this thread doesn't hold open files which are open |
158 | err = run_helper_thread(winch_thread, &data, 0, &stack, 0); | 157 | * now, but later closed. This is a problem with /dev/net/tun. |
158 | */ | ||
159 | err = run_helper_thread(winch_thread, &data, CLONE_FILES, &stack, 0); | ||
159 | if(err < 0){ | 160 | if(err < 0){ |
160 | printk("fork of winch_thread failed - errno = %d\n", errno); | 161 | printk("fork of winch_thread failed - errno = %d\n", errno); |
161 | goto out_close; | 162 | goto out_close; |
162 | } | 163 | } |
163 | 164 | ||
164 | os_close_file(fds[1]); | ||
165 | *fd_out = fds[0]; | 165 | *fd_out = fds[0]; |
166 | n = os_read_file(fds[0], &c, sizeof(c)); | 166 | n = os_read_file(fds[0], &c, sizeof(c)); |
167 | if(n != sizeof(c)){ | 167 | if(n != sizeof(c)){ |
@@ -169,13 +169,12 @@ static int winch_tramp(int fd, struct tty_struct *tty, int *fd_out) | |||
169 | printk("read failed, err = %d\n", -n); | 169 | printk("read failed, err = %d\n", -n); |
170 | printk("fd %d will not support SIGWINCH\n", fd); | 170 | printk("fd %d will not support SIGWINCH\n", fd); |
171 | err = -EINVAL; | 171 | err = -EINVAL; |
172 | goto out_close1; | 172 | goto out_close; |
173 | } | 173 | } |
174 | return err ; | 174 | return err ; |
175 | 175 | ||
176 | out_close: | 176 | out_close: |
177 | os_close_file(fds[1]); | 177 | os_close_file(fds[1]); |
178 | out_close1: | ||
179 | os_close_file(fds[0]); | 178 | os_close_file(fds[0]); |
180 | out: | 179 | out: |
181 | return err; | 180 | return err; |
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c index 8ebb2241ad42..8c7279bb353b 100644 --- a/arch/um/drivers/net_kern.c +++ b/arch/um/drivers/net_kern.c | |||
@@ -131,9 +131,8 @@ static int uml_net_open(struct net_device *dev) | |||
131 | SA_INTERRUPT | SA_SHIRQ, dev->name, dev); | 131 | SA_INTERRUPT | SA_SHIRQ, dev->name, dev); |
132 | if(err != 0){ | 132 | if(err != 0){ |
133 | printk(KERN_ERR "uml_net_open: failed to get irq(%d)\n", err); | 133 | printk(KERN_ERR "uml_net_open: failed to get irq(%d)\n", err); |
134 | if(lp->close != NULL) (*lp->close)(lp->fd, &lp->user); | ||
135 | lp->fd = -1; | ||
136 | err = -ENETUNREACH; | 134 | err = -ENETUNREACH; |
135 | goto out_close; | ||
137 | } | 136 | } |
138 | 137 | ||
139 | lp->tl.data = (unsigned long) &lp->user; | 138 | lp->tl.data = (unsigned long) &lp->user; |
@@ -145,9 +144,19 @@ static int uml_net_open(struct net_device *dev) | |||
145 | */ | 144 | */ |
146 | while((err = uml_net_rx(dev)) > 0) ; | 145 | while((err = uml_net_rx(dev)) > 0) ; |
147 | 146 | ||
148 | out: | ||
149 | spin_unlock(&lp->lock); | 147 | spin_unlock(&lp->lock); |
150 | return(err); | 148 | |
149 | spin_lock(&opened_lock); | ||
150 | list_add(&lp->list, &opened); | ||
151 | spin_unlock(&opened_lock); | ||
152 | |||
153 | return 0; | ||
154 | out_close: | ||
155 | if(lp->close != NULL) (*lp->close)(lp->fd, &lp->user); | ||
156 | lp->fd = -1; | ||
157 | out: | ||
158 | spin_unlock(&lp->lock); | ||
159 | return err; | ||
151 | } | 160 | } |
152 | 161 | ||
153 | static int uml_net_close(struct net_device *dev) | 162 | static int uml_net_close(struct net_device *dev) |
@@ -161,9 +170,13 @@ static int uml_net_close(struct net_device *dev) | |||
161 | if(lp->close != NULL) | 170 | if(lp->close != NULL) |
162 | (*lp->close)(lp->fd, &lp->user); | 171 | (*lp->close)(lp->fd, &lp->user); |
163 | lp->fd = -1; | 172 | lp->fd = -1; |
164 | list_del(&lp->list); | ||
165 | 173 | ||
166 | spin_unlock(&lp->lock); | 174 | spin_unlock(&lp->lock); |
175 | |||
176 | spin_lock(&opened_lock); | ||
177 | list_del(&lp->list); | ||
178 | spin_unlock(&opened_lock); | ||
179 | |||
167 | return 0; | 180 | return 0; |
168 | } | 181 | } |
169 | 182 | ||
@@ -410,11 +423,7 @@ static int eth_configure(int n, void *init, char *mac, | |||
410 | if (device->have_mac) | 423 | if (device->have_mac) |
411 | set_ether_mac(dev, device->mac); | 424 | set_ether_mac(dev, device->mac); |
412 | 425 | ||
413 | spin_lock(&opened_lock); | 426 | return 0; |
414 | list_add(&lp->list, &opened); | ||
415 | spin_unlock(&opened_lock); | ||
416 | |||
417 | return(0); | ||
418 | } | 427 | } |
419 | 428 | ||
420 | static struct uml_net *find_device(int n) | 429 | static struct uml_net *find_device(int n) |
diff --git a/arch/um/include/registers.h b/arch/um/include/registers.h index 4892e5fcef07..83b688ca198f 100644 --- a/arch/um/include/registers.h +++ b/arch/um/include/registers.h | |||
@@ -14,7 +14,7 @@ extern int restore_fp_registers(int pid, unsigned long *fp_regs); | |||
14 | extern void save_registers(int pid, union uml_pt_regs *regs); | 14 | extern void save_registers(int pid, union uml_pt_regs *regs); |
15 | extern void restore_registers(int pid, union uml_pt_regs *regs); | 15 | extern void restore_registers(int pid, union uml_pt_regs *regs); |
16 | extern void init_registers(int pid); | 16 | extern void init_registers(int pid); |
17 | extern void get_safe_registers(unsigned long * regs); | 17 | extern void get_safe_registers(unsigned long * regs, unsigned long * fp_regs); |
18 | extern void get_thread_regs(union uml_pt_regs *uml_regs, void *buffer); | 18 | extern void get_thread_regs(union uml_pt_regs *uml_regs, void *buffer); |
19 | 19 | ||
20 | #endif | 20 | #endif |
diff --git a/arch/um/kernel/skas/process.c b/arch/um/kernel/skas/process.c deleted file mode 100644 index eea1c9c4bb0f..000000000000 --- a/arch/um/kernel/skas/process.c +++ /dev/null | |||
@@ -1,569 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2002- 2004 Jeff Dike (jdike@addtoit.com) | ||
3 | * Licensed under the GPL | ||
4 | */ | ||
5 | |||
6 | #include <stdlib.h> | ||
7 | #include <string.h> | ||
8 | #include <unistd.h> | ||
9 | #include <errno.h> | ||
10 | #include <signal.h> | ||
11 | #include <setjmp.h> | ||
12 | #include <sched.h> | ||
13 | #include <sys/wait.h> | ||
14 | #include <sys/mman.h> | ||
15 | #include <sys/user.h> | ||
16 | #include <sys/time.h> | ||
17 | #include <asm/unistd.h> | ||
18 | #include <asm/types.h> | ||
19 | #include "user.h" | ||
20 | #include "ptrace_user.h" | ||
21 | #include "sysdep/ptrace.h" | ||
22 | #include "user_util.h" | ||
23 | #include "kern_util.h" | ||
24 | #include "skas.h" | ||
25 | #include "stub-data.h" | ||
26 | #include "mm_id.h" | ||
27 | #include "sysdep/sigcontext.h" | ||
28 | #include "sysdep/stub.h" | ||
29 | #include "os.h" | ||
30 | #include "proc_mm.h" | ||
31 | #include "skas_ptrace.h" | ||
32 | #include "chan_user.h" | ||
33 | #include "registers.h" | ||
34 | #include "mem.h" | ||
35 | #include "uml-config.h" | ||
36 | #include "process.h" | ||
37 | |||
38 | int is_skas_winch(int pid, int fd, void *data) | ||
39 | { | ||
40 | if(pid != os_getpgrp()) | ||
41 | return(0); | ||
42 | |||
43 | register_winch_irq(-1, fd, -1, data); | ||
44 | return(1); | ||
45 | } | ||
46 | |||
47 | void wait_stub_done(int pid, int sig, char * fname) | ||
48 | { | ||
49 | int n, status, err; | ||
50 | |||
51 | do { | ||
52 | if ( sig != -1 ) { | ||
53 | err = ptrace(PTRACE_CONT, pid, 0, sig); | ||
54 | if(err) | ||
55 | panic("%s : continue failed, errno = %d\n", | ||
56 | fname, errno); | ||
57 | } | ||
58 | sig = 0; | ||
59 | |||
60 | CATCH_EINTR(n = waitpid(pid, &status, WUNTRACED)); | ||
61 | } while((n >= 0) && WIFSTOPPED(status) && | ||
62 | ((WSTOPSIG(status) == SIGVTALRM) || | ||
63 | /* running UML inside a detached screen can cause | ||
64 | * SIGWINCHes | ||
65 | */ | ||
66 | (WSTOPSIG(status) == SIGWINCH))); | ||
67 | |||
68 | if((n < 0) || !WIFSTOPPED(status) || | ||
69 | (WSTOPSIG(status) != SIGUSR1 && WSTOPSIG(status) != SIGTRAP)){ | ||
70 | unsigned long regs[HOST_FRAME_SIZE]; | ||
71 | if(ptrace(PTRACE_GETREGS, pid, 0, regs) < 0) | ||
72 | printk("Failed to get registers from stub, " | ||
73 | "errno = %d\n", errno); | ||
74 | else { | ||
75 | int i; | ||
76 | |||
77 | printk("Stub registers -\n"); | ||
78 | for(i = 0; i < HOST_FRAME_SIZE; i++) | ||
79 | printk("\t%d - %lx\n", i, regs[i]); | ||
80 | } | ||
81 | panic("%s : failed to wait for SIGUSR1/SIGTRAP, " | ||
82 | "pid = %d, n = %d, errno = %d, status = 0x%x\n", | ||
83 | fname, pid, n, errno, status); | ||
84 | } | ||
85 | } | ||
86 | |||
87 | void get_skas_faultinfo(int pid, struct faultinfo * fi) | ||
88 | { | ||
89 | int err; | ||
90 | |||
91 | if(ptrace_faultinfo){ | ||
92 | err = ptrace(PTRACE_FAULTINFO, pid, 0, fi); | ||
93 | if(err) | ||
94 | panic("get_skas_faultinfo - PTRACE_FAULTINFO failed, " | ||
95 | "errno = %d\n", errno); | ||
96 | |||
97 | /* Special handling for i386, which has different structs */ | ||
98 | if (sizeof(struct ptrace_faultinfo) < sizeof(struct faultinfo)) | ||
99 | memset((char *)fi + sizeof(struct ptrace_faultinfo), 0, | ||
100 | sizeof(struct faultinfo) - | ||
101 | sizeof(struct ptrace_faultinfo)); | ||
102 | } | ||
103 | else { | ||
104 | wait_stub_done(pid, SIGSEGV, "get_skas_faultinfo"); | ||
105 | |||
106 | /* faultinfo is prepared by the stub-segv-handler at start of | ||
107 | * the stub stack page. We just have to copy it. | ||
108 | */ | ||
109 | memcpy(fi, (void *)current_stub_stack(), sizeof(*fi)); | ||
110 | } | ||
111 | } | ||
112 | |||
113 | static void handle_segv(int pid, union uml_pt_regs * regs) | ||
114 | { | ||
115 | get_skas_faultinfo(pid, ®s->skas.faultinfo); | ||
116 | segv(regs->skas.faultinfo, 0, 1, NULL); | ||
117 | } | ||
118 | |||
119 | /*To use the same value of using_sysemu as the caller, ask it that value (in local_using_sysemu)*/ | ||
120 | static void handle_trap(int pid, union uml_pt_regs *regs, int local_using_sysemu) | ||
121 | { | ||
122 | int err, status; | ||
123 | |||
124 | /* Mark this as a syscall */ | ||
125 | UPT_SYSCALL_NR(regs) = PT_SYSCALL_NR(regs->skas.regs); | ||
126 | |||
127 | if (!local_using_sysemu) | ||
128 | { | ||
129 | err = ptrace(PTRACE_POKEUSR, pid, PT_SYSCALL_NR_OFFSET, __NR_getpid); | ||
130 | if(err < 0) | ||
131 | panic("handle_trap - nullifying syscall failed errno = %d\n", | ||
132 | errno); | ||
133 | |||
134 | err = ptrace(PTRACE_SYSCALL, pid, 0, 0); | ||
135 | if(err < 0) | ||
136 | panic("handle_trap - continuing to end of syscall failed, " | ||
137 | "errno = %d\n", errno); | ||
138 | |||
139 | CATCH_EINTR(err = waitpid(pid, &status, WUNTRACED)); | ||
140 | if((err < 0) || !WIFSTOPPED(status) || | ||
141 | (WSTOPSIG(status) != SIGTRAP + 0x80)) | ||
142 | panic("handle_trap - failed to wait at end of syscall, " | ||
143 | "errno = %d, status = %d\n", errno, status); | ||
144 | } | ||
145 | |||
146 | handle_syscall(regs); | ||
147 | } | ||
148 | |||
149 | extern int __syscall_stub_start; | ||
150 | int stub_code_fd = -1; | ||
151 | __u64 stub_code_offset; | ||
152 | |||
153 | static int userspace_tramp(void *stack) | ||
154 | { | ||
155 | void *addr; | ||
156 | |||
157 | ptrace(PTRACE_TRACEME, 0, 0, 0); | ||
158 | |||
159 | init_new_thread_signals(1); | ||
160 | enable_timer(); | ||
161 | |||
162 | if(!proc_mm){ | ||
163 | /* This has a pte, but it can't be mapped in with the usual | ||
164 | * tlb_flush mechanism because this is part of that mechanism | ||
165 | */ | ||
166 | addr = mmap64((void *) UML_CONFIG_STUB_CODE, page_size(), | ||
167 | PROT_EXEC, MAP_FIXED | MAP_PRIVATE, | ||
168 | stub_code_fd, stub_code_offset); | ||
169 | if(addr == MAP_FAILED){ | ||
170 | printk("mapping stub code failed, errno = %d\n", | ||
171 | errno); | ||
172 | exit(1); | ||
173 | } | ||
174 | |||
175 | if(stack != NULL){ | ||
176 | int fd; | ||
177 | __u64 offset; | ||
178 | |||
179 | fd = phys_mapping(to_phys(stack), &offset); | ||
180 | addr = mmap((void *) UML_CONFIG_STUB_DATA, page_size(), | ||
181 | PROT_READ | PROT_WRITE, | ||
182 | MAP_FIXED | MAP_SHARED, fd, offset); | ||
183 | if(addr == MAP_FAILED){ | ||
184 | printk("mapping stub stack failed, " | ||
185 | "errno = %d\n", errno); | ||
186 | exit(1); | ||
187 | } | ||
188 | } | ||
189 | } | ||
190 | if(!ptrace_faultinfo){ | ||
191 | unsigned long v = UML_CONFIG_STUB_CODE + | ||
192 | (unsigned long) stub_segv_handler - | ||
193 | (unsigned long) &__syscall_stub_start; | ||
194 | |||
195 | set_sigstack((void *) UML_CONFIG_STUB_DATA, page_size()); | ||
196 | set_handler(SIGSEGV, (void *) v, SA_ONSTACK, | ||
197 | SIGIO, SIGWINCH, SIGALRM, SIGVTALRM, | ||
198 | SIGUSR1, -1); | ||
199 | } | ||
200 | |||
201 | os_stop_process(os_getpid()); | ||
202 | return(0); | ||
203 | } | ||
204 | |||
205 | /* Each element set once, and only accessed by a single processor anyway */ | ||
206 | #undef NR_CPUS | ||
207 | #define NR_CPUS 1 | ||
208 | int userspace_pid[NR_CPUS]; | ||
209 | |||
210 | int start_userspace(unsigned long stub_stack) | ||
211 | { | ||
212 | void *stack; | ||
213 | unsigned long sp; | ||
214 | int pid, status, n, flags; | ||
215 | |||
216 | if ( stub_code_fd == -1 ) | ||
217 | stub_code_fd = phys_mapping(to_phys(&__syscall_stub_start), | ||
218 | &stub_code_offset); | ||
219 | |||
220 | stack = mmap(NULL, PAGE_SIZE, PROT_READ | PROT_WRITE | PROT_EXEC, | ||
221 | MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); | ||
222 | if(stack == MAP_FAILED) | ||
223 | panic("start_userspace : mmap failed, errno = %d", errno); | ||
224 | sp = (unsigned long) stack + PAGE_SIZE - sizeof(void *); | ||
225 | |||
226 | flags = CLONE_FILES | SIGCHLD; | ||
227 | if(proc_mm) flags |= CLONE_VM; | ||
228 | pid = clone(userspace_tramp, (void *) sp, flags, (void *) stub_stack); | ||
229 | if(pid < 0) | ||
230 | panic("start_userspace : clone failed, errno = %d", errno); | ||
231 | |||
232 | do { | ||
233 | CATCH_EINTR(n = waitpid(pid, &status, WUNTRACED)); | ||
234 | if(n < 0) | ||
235 | panic("start_userspace : wait failed, errno = %d", | ||
236 | errno); | ||
237 | } while(WIFSTOPPED(status) && (WSTOPSIG(status) == SIGVTALRM)); | ||
238 | |||
239 | if(!WIFSTOPPED(status) || (WSTOPSIG(status) != SIGSTOP)) | ||
240 | panic("start_userspace : expected SIGSTOP, got status = %d", | ||
241 | status); | ||
242 | |||
243 | if (ptrace(PTRACE_OLDSETOPTIONS, pid, NULL, (void *)PTRACE_O_TRACESYSGOOD) < 0) | ||
244 | panic("start_userspace : PTRACE_SETOPTIONS failed, errno=%d\n", | ||
245 | errno); | ||
246 | |||
247 | if(munmap(stack, PAGE_SIZE) < 0) | ||
248 | panic("start_userspace : munmap failed, errno = %d\n", errno); | ||
249 | |||
250 | return(pid); | ||
251 | } | ||
252 | |||
253 | void userspace(union uml_pt_regs *regs) | ||
254 | { | ||
255 | int err, status, op, pid = userspace_pid[0]; | ||
256 | int local_using_sysemu; /*To prevent races if using_sysemu changes under us.*/ | ||
257 | |||
258 | while(1){ | ||
259 | restore_registers(pid, regs); | ||
260 | |||
261 | /* Now we set local_using_sysemu to be used for one loop */ | ||
262 | local_using_sysemu = get_using_sysemu(); | ||
263 | |||
264 | op = SELECT_PTRACE_OPERATION(local_using_sysemu, singlestepping(NULL)); | ||
265 | |||
266 | err = ptrace(op, pid, 0, 0); | ||
267 | if(err) | ||
268 | panic("userspace - could not resume userspace process, " | ||
269 | "pid=%d, ptrace operation = %d, errno = %d\n", | ||
270 | op, errno); | ||
271 | |||
272 | CATCH_EINTR(err = waitpid(pid, &status, WUNTRACED)); | ||
273 | if(err < 0) | ||
274 | panic("userspace - waitpid failed, errno = %d\n", | ||
275 | errno); | ||
276 | |||
277 | regs->skas.is_user = 1; | ||
278 | save_registers(pid, regs); | ||
279 | UPT_SYSCALL_NR(regs) = -1; /* Assume: It's not a syscall */ | ||
280 | |||
281 | if(WIFSTOPPED(status)){ | ||
282 | switch(WSTOPSIG(status)){ | ||
283 | case SIGSEGV: | ||
284 | if(PTRACE_FULL_FAULTINFO || !ptrace_faultinfo) | ||
285 | user_signal(SIGSEGV, regs, pid); | ||
286 | else handle_segv(pid, regs); | ||
287 | break; | ||
288 | case SIGTRAP + 0x80: | ||
289 | handle_trap(pid, regs, local_using_sysemu); | ||
290 | break; | ||
291 | case SIGTRAP: | ||
292 | relay_signal(SIGTRAP, regs); | ||
293 | break; | ||
294 | case SIGIO: | ||
295 | case SIGVTALRM: | ||
296 | case SIGILL: | ||
297 | case SIGBUS: | ||
298 | case SIGFPE: | ||
299 | case SIGWINCH: | ||
300 | user_signal(WSTOPSIG(status), regs, pid); | ||
301 | break; | ||
302 | default: | ||
303 | printk("userspace - child stopped with signal " | ||
304 | "%d\n", WSTOPSIG(status)); | ||
305 | } | ||
306 | pid = userspace_pid[0]; | ||
307 | interrupt_end(); | ||
308 | |||
309 | /* Avoid -ERESTARTSYS handling in host */ | ||
310 | PT_SYSCALL_NR(regs->skas.regs) = -1; | ||
311 | } | ||
312 | } | ||
313 | } | ||
314 | #define INIT_JMP_NEW_THREAD 0 | ||
315 | #define INIT_JMP_REMOVE_SIGSTACK 1 | ||
316 | #define INIT_JMP_CALLBACK 2 | ||
317 | #define INIT_JMP_HALT 3 | ||
318 | #define INIT_JMP_REBOOT 4 | ||
319 | |||
320 | |||
321 | int copy_context_skas0(unsigned long new_stack, int pid) | ||
322 | { | ||
323 | int err; | ||
324 | unsigned long regs[MAX_REG_NR]; | ||
325 | unsigned long current_stack = current_stub_stack(); | ||
326 | struct stub_data *data = (struct stub_data *) current_stack; | ||
327 | struct stub_data *child_data = (struct stub_data *) new_stack; | ||
328 | __u64 new_offset; | ||
329 | int new_fd = phys_mapping(to_phys((void *)new_stack), &new_offset); | ||
330 | |||
331 | /* prepare offset and fd of child's stack as argument for parent's | ||
332 | * and child's mmap2 calls | ||
333 | */ | ||
334 | *data = ((struct stub_data) { .offset = MMAP_OFFSET(new_offset), | ||
335 | .fd = new_fd, | ||
336 | .timer = ((struct itimerval) | ||
337 | { { 0, 1000000 / hz() }, | ||
338 | { 0, 1000000 / hz() }})}); | ||
339 | get_safe_registers(regs); | ||
340 | |||
341 | /* Set parent's instruction pointer to start of clone-stub */ | ||
342 | regs[REGS_IP_INDEX] = UML_CONFIG_STUB_CODE + | ||
343 | (unsigned long) stub_clone_handler - | ||
344 | (unsigned long) &__syscall_stub_start; | ||
345 | regs[REGS_SP_INDEX] = UML_CONFIG_STUB_DATA + PAGE_SIZE - | ||
346 | sizeof(void *); | ||
347 | err = ptrace_setregs(pid, regs); | ||
348 | if(err < 0) | ||
349 | panic("copy_context_skas0 : PTRACE_SETREGS failed, " | ||
350 | "pid = %d, errno = %d\n", pid, errno); | ||
351 | |||
352 | /* set a well known return code for detection of child write failure */ | ||
353 | child_data->err = 12345678; | ||
354 | |||
355 | /* Wait, until parent has finished its work: read child's pid from | ||
356 | * parent's stack, and check, if bad result. | ||
357 | */ | ||
358 | wait_stub_done(pid, 0, "copy_context_skas0"); | ||
359 | |||
360 | pid = data->err; | ||
361 | if(pid < 0) | ||
362 | panic("copy_context_skas0 - stub-parent reports error %d\n", | ||
363 | pid); | ||
364 | |||
365 | /* Wait, until child has finished too: read child's result from | ||
366 | * child's stack and check it. | ||
367 | */ | ||
368 | wait_stub_done(pid, -1, "copy_context_skas0"); | ||
369 | if (child_data->err != UML_CONFIG_STUB_DATA) | ||
370 | panic("copy_context_skas0 - stub-child reports error %d\n", | ||
371 | child_data->err); | ||
372 | |||
373 | if (ptrace(PTRACE_OLDSETOPTIONS, pid, NULL, | ||
374 | (void *)PTRACE_O_TRACESYSGOOD) < 0) | ||
375 | panic("copy_context_skas0 : PTRACE_SETOPTIONS failed, " | ||
376 | "errno = %d\n", errno); | ||
377 | |||
378 | return pid; | ||
379 | } | ||
380 | |||
381 | /* | ||
382 | * This is used only, if stub pages are needed, while proc_mm is | ||
383 | * availabl. Opening /proc/mm creates a new mm_context, which lacks | ||
384 | * the stub-pages. Thus, we map them using /proc/mm-fd | ||
385 | */ | ||
386 | void map_stub_pages(int fd, unsigned long code, | ||
387 | unsigned long data, unsigned long stack) | ||
388 | { | ||
389 | struct proc_mm_op mmop; | ||
390 | int n; | ||
391 | |||
392 | mmop = ((struct proc_mm_op) { .op = MM_MMAP, | ||
393 | .u = | ||
394 | { .mmap = | ||
395 | { .addr = code, | ||
396 | .len = PAGE_SIZE, | ||
397 | .prot = PROT_EXEC, | ||
398 | .flags = MAP_FIXED | MAP_PRIVATE, | ||
399 | .fd = stub_code_fd, | ||
400 | .offset = stub_code_offset | ||
401 | } } }); | ||
402 | n = os_write_file(fd, &mmop, sizeof(mmop)); | ||
403 | if(n != sizeof(mmop)) | ||
404 | panic("map_stub_pages : /proc/mm map for code failed, " | ||
405 | "err = %d\n", -n); | ||
406 | |||
407 | if ( stack ) { | ||
408 | __u64 map_offset; | ||
409 | int map_fd = phys_mapping(to_phys((void *)stack), &map_offset); | ||
410 | mmop = ((struct proc_mm_op) | ||
411 | { .op = MM_MMAP, | ||
412 | .u = | ||
413 | { .mmap = | ||
414 | { .addr = data, | ||
415 | .len = PAGE_SIZE, | ||
416 | .prot = PROT_READ | PROT_WRITE, | ||
417 | .flags = MAP_FIXED | MAP_SHARED, | ||
418 | .fd = map_fd, | ||
419 | .offset = map_offset | ||
420 | } } }); | ||
421 | n = os_write_file(fd, &mmop, sizeof(mmop)); | ||
422 | if(n != sizeof(mmop)) | ||
423 | panic("map_stub_pages : /proc/mm map for data failed, " | ||
424 | "err = %d\n", -n); | ||
425 | } | ||
426 | } | ||
427 | |||
428 | void new_thread(void *stack, void **switch_buf_ptr, void **fork_buf_ptr, | ||
429 | void (*handler)(int)) | ||
430 | { | ||
431 | unsigned long flags; | ||
432 | sigjmp_buf switch_buf, fork_buf; | ||
433 | |||
434 | *switch_buf_ptr = &switch_buf; | ||
435 | *fork_buf_ptr = &fork_buf; | ||
436 | |||
437 | /* Somewhat subtle - siglongjmp restores the signal mask before doing | ||
438 | * the longjmp. This means that when jumping from one stack to another | ||
439 | * when the target stack has interrupts enabled, an interrupt may occur | ||
440 | * on the source stack. This is bad when starting up a process because | ||
441 | * it's not supposed to get timer ticks until it has been scheduled. | ||
442 | * So, we disable interrupts around the sigsetjmp to ensure that | ||
443 | * they can't happen until we get back here where they are safe. | ||
444 | */ | ||
445 | flags = get_signals(); | ||
446 | block_signals(); | ||
447 | if(sigsetjmp(fork_buf, 1) == 0) | ||
448 | new_thread_proc(stack, handler); | ||
449 | |||
450 | remove_sigstack(); | ||
451 | |||
452 | set_signals(flags); | ||
453 | } | ||
454 | |||
455 | void thread_wait(void *sw, void *fb) | ||
456 | { | ||
457 | sigjmp_buf buf, **switch_buf = sw, *fork_buf; | ||
458 | |||
459 | *switch_buf = &buf; | ||
460 | fork_buf = fb; | ||
461 | if(sigsetjmp(buf, 1) == 0) | ||
462 | siglongjmp(*fork_buf, INIT_JMP_REMOVE_SIGSTACK); | ||
463 | } | ||
464 | |||
465 | void switch_threads(void *me, void *next) | ||
466 | { | ||
467 | sigjmp_buf my_buf, **me_ptr = me, *next_buf = next; | ||
468 | |||
469 | *me_ptr = &my_buf; | ||
470 | if(sigsetjmp(my_buf, 1) == 0) | ||
471 | siglongjmp(*next_buf, 1); | ||
472 | } | ||
473 | |||
474 | static sigjmp_buf initial_jmpbuf; | ||
475 | |||
476 | /* XXX Make these percpu */ | ||
477 | static void (*cb_proc)(void *arg); | ||
478 | static void *cb_arg; | ||
479 | static sigjmp_buf *cb_back; | ||
480 | |||
481 | int start_idle_thread(void *stack, void *switch_buf_ptr, void **fork_buf_ptr) | ||
482 | { | ||
483 | sigjmp_buf **switch_buf = switch_buf_ptr; | ||
484 | int n; | ||
485 | |||
486 | set_handler(SIGWINCH, (__sighandler_t) sig_handler, | ||
487 | SA_ONSTACK | SA_RESTART, SIGUSR1, SIGIO, SIGALRM, | ||
488 | SIGVTALRM, -1); | ||
489 | |||
490 | *fork_buf_ptr = &initial_jmpbuf; | ||
491 | n = sigsetjmp(initial_jmpbuf, 1); | ||
492 | switch(n){ | ||
493 | case INIT_JMP_NEW_THREAD: | ||
494 | new_thread_proc((void *) stack, new_thread_handler); | ||
495 | break; | ||
496 | case INIT_JMP_REMOVE_SIGSTACK: | ||
497 | remove_sigstack(); | ||
498 | break; | ||
499 | case INIT_JMP_CALLBACK: | ||
500 | (*cb_proc)(cb_arg); | ||
501 | siglongjmp(*cb_back, 1); | ||
502 | break; | ||
503 | case INIT_JMP_HALT: | ||
504 | kmalloc_ok = 0; | ||
505 | return(0); | ||
506 | case INIT_JMP_REBOOT: | ||
507 | kmalloc_ok = 0; | ||
508 | return(1); | ||
509 | default: | ||
510 | panic("Bad sigsetjmp return in start_idle_thread - %d\n", n); | ||
511 | } | ||
512 | siglongjmp(**switch_buf, 1); | ||
513 | } | ||
514 | |||
515 | void initial_thread_cb_skas(void (*proc)(void *), void *arg) | ||
516 | { | ||
517 | sigjmp_buf here; | ||
518 | |||
519 | cb_proc = proc; | ||
520 | cb_arg = arg; | ||
521 | cb_back = &here; | ||
522 | |||
523 | block_signals(); | ||
524 | if(sigsetjmp(here, 1) == 0) | ||
525 | siglongjmp(initial_jmpbuf, INIT_JMP_CALLBACK); | ||
526 | unblock_signals(); | ||
527 | |||
528 | cb_proc = NULL; | ||
529 | cb_arg = NULL; | ||
530 | cb_back = NULL; | ||
531 | } | ||
532 | |||
533 | void halt_skas(void) | ||
534 | { | ||
535 | block_signals(); | ||
536 | siglongjmp(initial_jmpbuf, INIT_JMP_HALT); | ||
537 | } | ||
538 | |||
539 | void reboot_skas(void) | ||
540 | { | ||
541 | block_signals(); | ||
542 | siglongjmp(initial_jmpbuf, INIT_JMP_REBOOT); | ||
543 | } | ||
544 | |||
545 | void switch_mm_skas(struct mm_id *mm_idp) | ||
546 | { | ||
547 | int err; | ||
548 | |||
549 | #warning need cpu pid in switch_mm_skas | ||
550 | if(proc_mm){ | ||
551 | err = ptrace(PTRACE_SWITCH_MM, userspace_pid[0], 0, | ||
552 | mm_idp->u.mm_fd); | ||
553 | if(err) | ||
554 | panic("switch_mm_skas - PTRACE_SWITCH_MM failed, " | ||
555 | "errno = %d\n", errno); | ||
556 | } | ||
557 | else userspace_pid[0] = mm_idp->u.pid; | ||
558 | } | ||
559 | |||
560 | /* | ||
561 | * Overrides for Emacs so that we follow Linus's tabbing style. | ||
562 | * Emacs will notice this stuff at the end of the file and automatically | ||
563 | * adjust the settings for this buffer only. This must remain at the end | ||
564 | * of the file. | ||
565 | * --------------------------------------------------------------------------- | ||
566 | * Local variables: | ||
567 | * c-file-style: "linux" | ||
568 | * End: | ||
569 | */ | ||
diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c index e2d3ca445ef5..27cdf9164422 100644 --- a/arch/um/kernel/um_arch.c +++ b/arch/um/kernel/um_arch.c | |||
@@ -193,6 +193,24 @@ __uml_setup("root=", uml_root_setup, | |||
193 | " root=/dev/ubd5\n\n" | 193 | " root=/dev/ubd5\n\n" |
194 | ); | 194 | ); |
195 | 195 | ||
196 | #ifndef CONFIG_MODE_TT | ||
197 | |||
198 | static int __init no_skas_debug_setup(char *line, int *add) | ||
199 | { | ||
200 | printf("'debug' is not necessary to gdb UML in skas mode - run \n"); | ||
201 | printf("'gdb linux' and disable CONFIG_CMDLINE_ON_HOST if gdb \n"); | ||
202 | printf("doesn't work as expected\n"); | ||
203 | |||
204 | return 0; | ||
205 | } | ||
206 | |||
207 | __uml_setup("debug", no_skas_debug_setup, | ||
208 | "debug\n" | ||
209 | " this flag is not needed to run gdb on UML in skas mode\n\n" | ||
210 | ); | ||
211 | |||
212 | #endif | ||
213 | |||
196 | #ifdef CONFIG_SMP | 214 | #ifdef CONFIG_SMP |
197 | static int __init uml_ncpus_setup(char *line, int *add) | 215 | static int __init uml_ncpus_setup(char *line, int *add) |
198 | { | 216 | { |
diff --git a/arch/um/os-Linux/drivers/tuntap_user.c b/arch/um/os-Linux/drivers/tuntap_user.c index 52945338b64d..87c3aa0252db 100644 --- a/arch/um/os-Linux/drivers/tuntap_user.c +++ b/arch/um/os-Linux/drivers/tuntap_user.c | |||
@@ -122,6 +122,7 @@ static int tuntap_open_tramp(char *gate, int *fd_out, int me, int remote, | |||
122 | return(-EINVAL); | 122 | return(-EINVAL); |
123 | } | 123 | } |
124 | *fd_out = ((int *) CMSG_DATA(cmsg))[0]; | 124 | *fd_out = ((int *) CMSG_DATA(cmsg))[0]; |
125 | os_set_exec_close(*fd_out, 1); | ||
125 | return(0); | 126 | return(0); |
126 | } | 127 | } |
127 | 128 | ||
@@ -137,7 +138,8 @@ static int tuntap_open(void *data) | |||
137 | return(err); | 138 | return(err); |
138 | 139 | ||
139 | if(pri->fixed_config){ | 140 | if(pri->fixed_config){ |
140 | pri->fd = os_open_file("/dev/net/tun", of_rdwr(OPENFLAGS()), 0); | 141 | pri->fd = os_open_file("/dev/net/tun", |
142 | of_cloexec(of_rdwr(OPENFLAGS())), 0); | ||
141 | if(pri->fd < 0){ | 143 | if(pri->fd < 0){ |
142 | printk("Failed to open /dev/net/tun, err = %d\n", | 144 | printk("Failed to open /dev/net/tun, err = %d\n", |
143 | -pri->fd); | 145 | -pri->fd); |
diff --git a/arch/um/os-Linux/skas/mem.c b/arch/um/os-Linux/skas/mem.c index 9890e9090f58..fbb080c2fc26 100644 --- a/arch/um/os-Linux/skas/mem.c +++ b/arch/um/os-Linux/skas/mem.c | |||
@@ -60,7 +60,7 @@ static inline long do_syscall_stub(struct mm_id * mm_idp, void **addr) | |||
60 | 60 | ||
61 | multi_count++; | 61 | multi_count++; |
62 | 62 | ||
63 | get_safe_registers(regs); | 63 | get_safe_registers(regs, NULL); |
64 | regs[REGS_IP_INDEX] = UML_CONFIG_STUB_CODE + | 64 | regs[REGS_IP_INDEX] = UML_CONFIG_STUB_CODE + |
65 | ((unsigned long) &batch_syscall_stub - | 65 | ((unsigned long) &batch_syscall_stub - |
66 | (unsigned long) &__syscall_stub_start); | 66 | (unsigned long) &__syscall_stub_start); |
diff --git a/arch/um/os-Linux/skas/process.c b/arch/um/os-Linux/skas/process.c index 120a21c5883f..bbf34cb91ce1 100644 --- a/arch/um/os-Linux/skas/process.c +++ b/arch/um/os-Linux/skas/process.c | |||
@@ -310,16 +310,12 @@ void userspace(union uml_pt_regs *regs) | |||
310 | } | 310 | } |
311 | } | 311 | } |
312 | } | 312 | } |
313 | #define INIT_JMP_NEW_THREAD 0 | ||
314 | #define INIT_JMP_REMOVE_SIGSTACK 1 | ||
315 | #define INIT_JMP_CALLBACK 2 | ||
316 | #define INIT_JMP_HALT 3 | ||
317 | #define INIT_JMP_REBOOT 4 | ||
318 | 313 | ||
319 | int copy_context_skas0(unsigned long new_stack, int pid) | 314 | int copy_context_skas0(unsigned long new_stack, int pid) |
320 | { | 315 | { |
321 | int err; | 316 | int err; |
322 | unsigned long regs[MAX_REG_NR]; | 317 | unsigned long regs[HOST_FRAME_SIZE]; |
318 | unsigned long fp_regs[HOST_FP_SIZE]; | ||
323 | unsigned long current_stack = current_stub_stack(); | 319 | unsigned long current_stack = current_stub_stack(); |
324 | struct stub_data *data = (struct stub_data *) current_stack; | 320 | struct stub_data *data = (struct stub_data *) current_stack; |
325 | struct stub_data *child_data = (struct stub_data *) new_stack; | 321 | struct stub_data *child_data = (struct stub_data *) new_stack; |
@@ -334,7 +330,7 @@ int copy_context_skas0(unsigned long new_stack, int pid) | |||
334 | .timer = ((struct itimerval) | 330 | .timer = ((struct itimerval) |
335 | { { 0, 1000000 / hz() }, | 331 | { { 0, 1000000 / hz() }, |
336 | { 0, 1000000 / hz() }})}); | 332 | { 0, 1000000 / hz() }})}); |
337 | get_safe_registers(regs); | 333 | get_safe_registers(regs, fp_regs); |
338 | 334 | ||
339 | /* Set parent's instruction pointer to start of clone-stub */ | 335 | /* Set parent's instruction pointer to start of clone-stub */ |
340 | regs[REGS_IP_INDEX] = UML_CONFIG_STUB_CODE + | 336 | regs[REGS_IP_INDEX] = UML_CONFIG_STUB_CODE + |
@@ -350,6 +346,11 @@ int copy_context_skas0(unsigned long new_stack, int pid) | |||
350 | panic("copy_context_skas0 : PTRACE_SETREGS failed, " | 346 | panic("copy_context_skas0 : PTRACE_SETREGS failed, " |
351 | "pid = %d, errno = %d\n", pid, errno); | 347 | "pid = %d, errno = %d\n", pid, errno); |
352 | 348 | ||
349 | err = ptrace_setfpregs(pid, fp_regs); | ||
350 | if(err < 0) | ||
351 | panic("copy_context_skas0 : PTRACE_SETFPREGS failed, " | ||
352 | "pid = %d, errno = %d\n", pid, errno); | ||
353 | |||
353 | /* set a well known return code for detection of child write failure */ | 354 | /* set a well known return code for detection of child write failure */ |
354 | child_data->err = 12345678; | 355 | child_data->err = 12345678; |
355 | 356 | ||
@@ -457,6 +458,12 @@ void new_thread(void *stack, void **switch_buf_ptr, void **fork_buf_ptr, | |||
457 | set_signals(flags); | 458 | set_signals(flags); |
458 | } | 459 | } |
459 | 460 | ||
461 | #define INIT_JMP_NEW_THREAD 0 | ||
462 | #define INIT_JMP_REMOVE_SIGSTACK 1 | ||
463 | #define INIT_JMP_CALLBACK 2 | ||
464 | #define INIT_JMP_HALT 3 | ||
465 | #define INIT_JMP_REBOOT 4 | ||
466 | |||
460 | void thread_wait(void *sw, void *fb) | 467 | void thread_wait(void *sw, void *fb) |
461 | { | 468 | { |
462 | sigjmp_buf buf, **switch_buf = sw, *fork_buf; | 469 | sigjmp_buf buf, **switch_buf = sw, *fork_buf; |
diff --git a/arch/um/os-Linux/start_up.c b/arch/um/os-Linux/start_up.c index 6c5b17ed59e1..829d6b0d8b02 100644 --- a/arch/um/os-Linux/start_up.c +++ b/arch/um/os-Linux/start_up.c | |||
@@ -49,6 +49,7 @@ static int ptrace_child(void *arg) | |||
49 | int pid = os_getpid(), ppid = getppid(); | 49 | int pid = os_getpid(), ppid = getppid(); |
50 | int sc_result; | 50 | int sc_result; |
51 | 51 | ||
52 | change_sig(SIGWINCH, 0); | ||
52 | if(ptrace(PTRACE_TRACEME, 0, 0, 0) < 0){ | 53 | if(ptrace(PTRACE_TRACEME, 0, 0, 0) < 0){ |
53 | perror("ptrace"); | 54 | perror("ptrace"); |
54 | os_kill_process(pid, 0); | 55 | os_kill_process(pid, 0); |
diff --git a/arch/um/os-Linux/sys-i386/registers.c b/arch/um/os-Linux/sys-i386/registers.c index aee4812333c6..7a6f6b99ceff 100644 --- a/arch/um/os-Linux/sys-i386/registers.c +++ b/arch/um/os-Linux/sys-i386/registers.c | |||
@@ -122,9 +122,12 @@ void init_registers(int pid) | |||
122 | err); | 122 | err); |
123 | } | 123 | } |
124 | 124 | ||
125 | void get_safe_registers(unsigned long *regs) | 125 | void get_safe_registers(unsigned long *regs, unsigned long *fp_regs) |
126 | { | 126 | { |
127 | memcpy(regs, exec_regs, HOST_FRAME_SIZE * sizeof(unsigned long)); | 127 | memcpy(regs, exec_regs, HOST_FRAME_SIZE * sizeof(unsigned long)); |
128 | if(fp_regs != NULL) | ||
129 | memcpy(fp_regs, exec_fp_regs, | ||
130 | HOST_FP_SIZE * sizeof(unsigned long)); | ||
128 | } | 131 | } |
129 | 132 | ||
130 | void get_thread_regs(union uml_pt_regs *uml_regs, void *buffer) | 133 | void get_thread_regs(union uml_pt_regs *uml_regs, void *buffer) |
diff --git a/arch/um/os-Linux/sys-x86_64/registers.c b/arch/um/os-Linux/sys-x86_64/registers.c index 4b638dfb52b0..001941fa1a1e 100644 --- a/arch/um/os-Linux/sys-x86_64/registers.c +++ b/arch/um/os-Linux/sys-x86_64/registers.c | |||
@@ -70,9 +70,12 @@ void init_registers(int pid) | |||
70 | err); | 70 | err); |
71 | } | 71 | } |
72 | 72 | ||
73 | void get_safe_registers(unsigned long *regs) | 73 | void get_safe_registers(unsigned long *regs, unsigned long *fp_regs) |
74 | { | 74 | { |
75 | memcpy(regs, exec_regs, HOST_FRAME_SIZE * sizeof(unsigned long)); | 75 | memcpy(regs, exec_regs, HOST_FRAME_SIZE * sizeof(unsigned long)); |
76 | if(fp_regs != NULL) | ||
77 | memcpy(fp_regs, exec_fp_regs, | ||
78 | HOST_FP_SIZE * sizeof(unsigned long)); | ||
76 | } | 79 | } |
77 | 80 | ||
78 | void get_thread_regs(union uml_pt_regs *uml_regs, void *buffer) | 81 | void get_thread_regs(union uml_pt_regs *uml_regs, void *buffer) |
diff --git a/arch/um/sys-x86_64/ptrace_user.c b/arch/um/sys-x86_64/ptrace_user.c index 12e404c6fa46..b5f9c33e311e 100644 --- a/arch/um/sys-x86_64/ptrace_user.c +++ b/arch/um/sys-x86_64/ptrace_user.c | |||
@@ -24,6 +24,13 @@ int ptrace_setregs(long pid, unsigned long *regs) | |||
24 | return(0); | 24 | return(0); |
25 | } | 25 | } |
26 | 26 | ||
27 | int ptrace_setfpregs(long pid, unsigned long *regs) | ||
28 | { | ||
29 | if (ptrace(PTRACE_SETFPREGS, pid, 0, regs) < 0) | ||
30 | return -errno; | ||
31 | return 0; | ||
32 | } | ||
33 | |||
27 | void ptrace_pokeuser(unsigned long addr, unsigned long data) | 34 | void ptrace_pokeuser(unsigned long addr, unsigned long data) |
28 | { | 35 | { |
29 | panic("ptrace_pokeuser"); | 36 | panic("ptrace_pokeuser"); |
diff --git a/arch/um/sys-x86_64/user-offsets.c b/arch/um/sys-x86_64/user-offsets.c index 5a585bfbb8c2..7bd54a921cf7 100644 --- a/arch/um/sys-x86_64/user-offsets.c +++ b/arch/um/sys-x86_64/user-offsets.c | |||
@@ -57,7 +57,7 @@ void foo(void) | |||
57 | #endif | 57 | #endif |
58 | 58 | ||
59 | DEFINE_LONGS(HOST_FRAME_SIZE, FRAME_SIZE); | 59 | DEFINE_LONGS(HOST_FRAME_SIZE, FRAME_SIZE); |
60 | DEFINE(HOST_FP_SIZE, 0); | 60 | DEFINE(HOST_FP_SIZE, sizeof(struct _fpstate) / sizeof(unsigned long)); |
61 | DEFINE(HOST_XFP_SIZE, 0); | 61 | DEFINE(HOST_XFP_SIZE, 0); |
62 | DEFINE_LONGS(HOST_RBX, RBX); | 62 | DEFINE_LONGS(HOST_RBX, RBX); |
63 | DEFINE_LONGS(HOST_RCX, RCX); | 63 | DEFINE_LONGS(HOST_RCX, RCX); |