aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2007-10-16 04:26:47 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-16 12:43:05 -0400
commit42daba316557e597a90a730f61c762602b7f0e0c (patch)
tree9b7e9da84cef7d2547c577f1cf94b408cf308619 /arch/um
parent5c8aaceab88ac787c0a4038b29143c954c2a45e0 (diff)
uml: stop saving process FP state
Throw out a lot of code dealing with saving and restoring floating-point state. In skas mode, where processes run in a restoring floating-point state on kernel entry and exit is pointless. This eliminates most of arch/um/os-Linux/sys-{i386,x86_64}/registers.c. Most of what remained is now arch-indpendent, and can be moved up to arch/um/os-Linux/registers.c. Both arches need the jmp_buf accessor get_thread_reg, and i386 needs {save,restore}_fp_regs because it cheats during sigreturn by getting the fp state using ptrace rather than copying it out of the process sigcontext. After this, it turns out that arch/um/include/skas/mode-skas.h is almost completely unneeded. The declarations in it are variables which either don't exist or which don't have global scope. The one exception is kill_off_processes_skas. If that's removed, this header can be deleted. This uncovered a bug in user.h, which wasn't correctly making sure that a size_t definition was available to both userspace and kernelspace files. Signed-off-by: Jeff Dike <jdike@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/include/os.h2
-rw-r--r--arch/um/include/registers.h2
-rw-r--r--arch/um/include/skas/mode-skas.h9
-rw-r--r--arch/um/include/sysdep-i386/ptrace.h11
-rw-r--r--arch/um/include/user.h8
-rw-r--r--arch/um/os-Linux/Makefile8
-rw-r--r--arch/um/os-Linux/registers.c54
-rw-r--r--arch/um/os-Linux/skas/mem.c2
-rw-r--r--arch/um/os-Linux/skas/process.c8
-rw-r--r--arch/um/os-Linux/sys-i386/registers.c108
-rw-r--r--arch/um/os-Linux/sys-x86_64/Makefile2
-rw-r--r--arch/um/os-Linux/sys-x86_64/registers.c75
12 files changed, 74 insertions, 215 deletions
diff --git a/arch/um/include/os.h b/arch/um/include/os.h
index bb6b7d9e188..c0803e67fc6 100644
--- a/arch/um/include/os.h
+++ b/arch/um/include/os.h
@@ -307,6 +307,8 @@ extern int protect(struct mm_id * mm_idp, unsigned long addr,
307extern int is_skas_winch(int pid, int fd, void *data); 307extern int is_skas_winch(int pid, int fd, void *data);
308extern int start_userspace(unsigned long stub_stack); 308extern int start_userspace(unsigned long stub_stack);
309extern int copy_context_skas0(unsigned long stack, int pid); 309extern int copy_context_skas0(unsigned long stack, int pid);
310extern void save_registers(int pid, union uml_pt_regs *regs);
311extern void restore_registers(int pid, union uml_pt_regs *regs);
310extern void userspace(union uml_pt_regs *regs); 312extern void userspace(union uml_pt_regs *regs);
311extern void map_stub_pages(int fd, unsigned long code, 313extern void map_stub_pages(int fd, unsigned long code,
312 unsigned long data, unsigned long stack); 314 unsigned long data, unsigned long stack);
diff --git a/arch/um/include/registers.h b/arch/um/include/registers.h
index f845b3629a6..b7d2c4e2c61 100644
--- a/arch/um/include/registers.h
+++ b/arch/um/include/registers.h
@@ -15,7 +15,7 @@ extern int restore_fp_registers(int pid, unsigned long *fp_regs);
15extern void save_registers(int pid, union uml_pt_regs *regs); 15extern void save_registers(int pid, union uml_pt_regs *regs);
16extern void restore_registers(int pid, union uml_pt_regs *regs); 16extern void restore_registers(int pid, union uml_pt_regs *regs);
17extern void init_registers(int pid); 17extern void init_registers(int pid);
18extern void get_safe_registers(unsigned long * regs, unsigned long * fp_regs); 18extern void get_safe_registers(unsigned long *regs);
19extern unsigned long get_thread_reg(int reg, jmp_buf *buf); 19extern unsigned long get_thread_reg(int reg, jmp_buf *buf);
20 20
21#endif 21#endif
diff --git a/arch/um/include/skas/mode-skas.h b/arch/um/include/skas/mode-skas.h
index 8bc6916bbbb..e065feb000d 100644
--- a/arch/um/include/skas/mode-skas.h
+++ b/arch/um/include/skas/mode-skas.h
@@ -1,18 +1,11 @@
1/* 1/*
2 * Copyright (C) 2002 Jeff Dike (jdike@karaya.com) 2 * Copyright (C) 2002 - 2007 Jeff Dike (jdike@{linux.intel,addtoit}.com)
3 * Licensed under the GPL 3 * Licensed under the GPL
4 */ 4 */
5 5
6#ifndef __MODE_SKAS_H__ 6#ifndef __MODE_SKAS_H__
7#define __MODE_SKAS_H__ 7#define __MODE_SKAS_H__
8 8
9#include <sysdep/ptrace.h>
10
11extern unsigned long exec_regs[];
12extern unsigned long exec_fp_regs[];
13extern unsigned long exec_fpx_regs[];
14extern int have_fpx_regs;
15
16extern void kill_off_processes_skas(void); 9extern void kill_off_processes_skas(void);
17 10
18#endif 11#endif
diff --git a/arch/um/include/sysdep-i386/ptrace.h b/arch/um/include/sysdep-i386/ptrace.h
index 52b398bcafc..b45a72feb08 100644
--- a/arch/um/include/sysdep-i386/ptrace.h
+++ b/arch/um/include/sysdep-i386/ptrace.h
@@ -219,14 +219,3 @@ struct syscall_args {
219 CHOOSE_MODE((&(r)->tt.faultinfo), (&(r)->skas.faultinfo)) 219 CHOOSE_MODE((&(r)->tt.faultinfo), (&(r)->skas.faultinfo))
220 220
221#endif 221#endif
222
223/*
224 * Overrides for Emacs so that we follow Linus's tabbing style.
225 * Emacs will notice this stuff at the end of the file and automatically
226 * adjust the settings for this buffer only. This must remain at the end
227 * of the file.
228 * ---------------------------------------------------------------------------
229 * Local variables:
230 * c-file-style: "linux"
231 * End:
232 */
diff --git a/arch/um/include/user.h b/arch/um/include/user.h
index d380e6d91a9..99033ff28a7 100644
--- a/arch/um/include/user.h
+++ b/arch/um/include/user.h
@@ -14,10 +14,12 @@
14 */ 14 */
15#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) 15#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
16 16
17/* 17/* This is to get size_t */
18 * This will provide the size_t definition in both kernel and userspace builds 18#ifdef __KERNEL__
19 */
20#include <linux/types.h> 19#include <linux/types.h>
20#else
21#include <stddef.h>
22#endif
21 23
22extern void panic(const char *fmt, ...) 24extern void panic(const char *fmt, ...)
23 __attribute__ ((format (printf, 1, 2))); 25 __attribute__ ((format (printf, 1, 2)));
diff --git a/arch/um/os-Linux/Makefile b/arch/um/os-Linux/Makefile
index 2f8c7946401..f1bb58fe320 100644
--- a/arch/um/os-Linux/Makefile
+++ b/arch/um/os-Linux/Makefile
@@ -4,8 +4,8 @@
4# 4#
5 5
6obj-y = aio.o elf_aux.o execvp.o file.o helper.o irq.o main.o mem.o process.o \ 6obj-y = aio.o elf_aux.o execvp.o file.o helper.o irq.o main.o mem.o process.o \
7 sigio.o signal.o start_up.o time.o trap.o tty.o uaccess.o umid.o tls.o \ 7 registers.o sigio.o signal.o start_up.o time.o trap.o tty.o uaccess.o \
8 user_syms.o util.o drivers/ sys-$(SUBARCH)/ 8 umid.o tls.o user_syms.o util.o drivers/ sys-$(SUBARCH)/
9 9
10obj-$(CONFIG_MODE_SKAS) += skas/ 10obj-$(CONFIG_MODE_SKAS) += skas/
11 11
@@ -16,8 +16,8 @@ obj-$(CONFIG_TTY_LOG) += tty_log.o
16user-objs-$(CONFIG_TTY_LOG) += tty_log.o 16user-objs-$(CONFIG_TTY_LOG) += tty_log.o
17 17
18USER_OBJS := $(user-objs-y) aio.o elf_aux.o execvp.o file.o helper.o irq.o \ 18USER_OBJS := $(user-objs-y) aio.o elf_aux.o execvp.o file.o helper.o irq.o \
19 main.o mem.o process.o sigio.o signal.o start_up.o time.o trap.o tty.o \ 19 main.o mem.o process.o registers.o sigio.o signal.o start_up.o time.o \
20 tls.o uaccess.o umid.o util.o 20 trap.o tty.o tls.o uaccess.o umid.o util.o
21 21
22CFLAGS_user_syms.o += -DSUBARCH_$(SUBARCH) 22CFLAGS_user_syms.o += -DSUBARCH_$(SUBARCH)
23 23
diff --git a/arch/um/os-Linux/registers.c b/arch/um/os-Linux/registers.c
new file mode 100644
index 00000000000..9dc3fad9ea2
--- /dev/null
+++ b/arch/um/os-Linux/registers.c
@@ -0,0 +1,54 @@
1/*
2 * Copyright (C) 2004 PathScale, Inc
3 * Licensed under the GPL
4 */
5
6#include <errno.h>
7#include <string.h>
8#include <sys/ptrace.h>
9#include "user.h"
10#include "sysdep/ptrace.h"
11
12/* This is set once at boot time and not changed thereafter */
13
14static unsigned long exec_regs[MAX_REG_NR];
15
16void init_thread_registers(union uml_pt_regs *to)
17{
18 memcpy(to->skas.regs, exec_regs, sizeof(to->skas.regs));
19}
20
21void save_registers(int pid, union uml_pt_regs *regs)
22{
23 int err;
24
25 err = ptrace(PTRACE_GETREGS, pid, 0, regs->skas.regs);
26 if(err < 0)
27 panic("save_registers - saving registers failed, errno = %d\n",
28 errno);
29}
30
31void restore_registers(int pid, union uml_pt_regs *regs)
32{
33 int err;
34
35 err = ptrace(PTRACE_SETREGS, pid, 0, regs->skas.regs);
36 if(err < 0)
37 panic("restore_registers - saving registers failed, "
38 "errno = %d\n", errno);
39}
40
41void init_registers(int pid)
42{
43 int err;
44
45 err = ptrace(PTRACE_GETREGS, pid, 0, exec_regs);
46 if(err)
47 panic("check_ptrace : PTRACE_GETREGS failed, errno = %d",
48 errno);
49}
50
51void get_safe_registers(unsigned long *regs)
52{
53 memcpy(regs, exec_regs, sizeof(exec_regs));
54}
diff --git a/arch/um/os-Linux/skas/mem.c b/arch/um/os-Linux/skas/mem.c
index 9fbf210ebfb..383052baa16 100644
--- a/arch/um/os-Linux/skas/mem.c
+++ b/arch/um/os-Linux/skas/mem.c
@@ -44,7 +44,7 @@ static unsigned long syscall_regs[MAX_REG_NR];
44 44
45static int __init init_syscall_regs(void) 45static int __init init_syscall_regs(void)
46{ 46{
47 get_safe_registers(syscall_regs, NULL); 47 get_safe_registers(syscall_regs);
48 syscall_regs[REGS_IP_INDEX] = UML_CONFIG_STUB_CODE + 48 syscall_regs[REGS_IP_INDEX] = UML_CONFIG_STUB_CODE +
49 ((unsigned long) &batch_syscall_stub - 49 ((unsigned long) &batch_syscall_stub -
50 (unsigned long) &__syscall_stub_start); 50 (unsigned long) &__syscall_stub_start);
diff --git a/arch/um/os-Linux/skas/process.c b/arch/um/os-Linux/skas/process.c
index ba9af8d6205..db020d21f13 100644
--- a/arch/um/os-Linux/skas/process.c
+++ b/arch/um/os-Linux/skas/process.c
@@ -357,11 +357,10 @@ void userspace(union uml_pt_regs *regs)
357} 357}
358 358
359static unsigned long thread_regs[MAX_REG_NR]; 359static unsigned long thread_regs[MAX_REG_NR];
360static unsigned long thread_fp_regs[HOST_FP_SIZE];
361 360
362static int __init init_thread_regs(void) 361static int __init init_thread_regs(void)
363{ 362{
364 get_safe_registers(thread_regs, thread_fp_regs); 363 get_safe_registers(thread_regs);
365 /* Set parent's instruction pointer to start of clone-stub */ 364 /* Set parent's instruction pointer to start of clone-stub */
366 thread_regs[REGS_IP_INDEX] = UML_CONFIG_STUB_CODE + 365 thread_regs[REGS_IP_INDEX] = UML_CONFIG_STUB_CODE +
367 (unsigned long) stub_clone_handler - 366 (unsigned long) stub_clone_handler -
@@ -398,11 +397,6 @@ int copy_context_skas0(unsigned long new_stack, int pid)
398 panic("copy_context_skas0 : PTRACE_SETREGS failed, " 397 panic("copy_context_skas0 : PTRACE_SETREGS failed, "
399 "pid = %d, errno = %d\n", pid, -err); 398 "pid = %d, errno = %d\n", pid, -err);
400 399
401 err = ptrace_setfpregs(pid, thread_fp_regs);
402 if(err < 0)
403 panic("copy_context_skas0 : PTRACE_SETFPREGS failed, "
404 "pid = %d, errno = %d\n", pid, -err);
405
406 /* set a well known return code for detection of child write failure */ 400 /* set a well known return code for detection of child write failure */
407 child_data->err = 12345678; 401 child_data->err = 12345678;
408 402
diff --git a/arch/um/os-Linux/sys-i386/registers.c b/arch/um/os-Linux/sys-i386/registers.c
index 84b44f9cd42..f171204caa4 100644
--- a/arch/um/os-Linux/sys-i386/registers.c
+++ b/arch/um/os-Linux/sys-i386/registers.c
@@ -4,30 +4,10 @@
4 */ 4 */
5 5
6#include <errno.h> 6#include <errno.h>
7#include <string.h> 7#include <sysdep/ptrace_user.h>
8#include "sysdep/ptrace_user.h"
9#include "sysdep/ptrace.h"
10#include "uml-config.h"
11#include "skas_ptregs.h"
12#include "registers.h"
13#include "longjmp.h" 8#include "longjmp.h"
14#include "user.h" 9#include "user.h"
15 10
16/* These are set once at boot time and not changed thereafter */
17
18static unsigned long exec_regs[MAX_REG_NR];
19static unsigned long exec_fp_regs[HOST_FP_SIZE];
20static unsigned long exec_fpx_regs[HOST_XFP_SIZE];
21static int have_fpx_regs = 1;
22
23void init_thread_registers(union uml_pt_regs *to)
24{
25 memcpy(to->skas.regs, exec_regs, sizeof(to->skas.regs));
26 memcpy(to->skas.fp, exec_fp_regs, sizeof(to->skas.fp));
27 if(have_fpx_regs)
28 memcpy(to->skas.xfp, exec_fpx_regs, sizeof(to->skas.xfp));
29}
30
31/* XXX These need to use [GS]ETFPXREGS and copy_sc_{to,from}_user_skas needs 11/* XXX These need to use [GS]ETFPXREGS and copy_sc_{to,from}_user_skas needs
32 * to pass in a sufficiently large buffer 12 * to pass in a sufficiently large buffer
33 */ 13 */
@@ -45,92 +25,6 @@ int restore_fp_registers(int pid, unsigned long *fp_regs)
45 return 0; 25 return 0;
46} 26}
47 27
48static int move_registers(int pid, int int_op, union uml_pt_regs *regs,
49 int fp_op, unsigned long *fp_regs)
50{
51 if(ptrace(int_op, pid, 0, regs->skas.regs) < 0)
52 return -errno;
53
54 if(ptrace(fp_op, pid, 0, fp_regs) < 0)
55 return -errno;
56
57 return 0;
58}
59
60void save_registers(int pid, union uml_pt_regs *regs)
61{
62 unsigned long *fp_regs;
63 int err, fp_op;
64
65 if(have_fpx_regs){
66 fp_op = PTRACE_GETFPXREGS;
67 fp_regs = regs->skas.xfp;
68 }
69 else {
70 fp_op = PTRACE_GETFPREGS;
71 fp_regs = regs->skas.fp;
72 }
73
74 err = move_registers(pid, PTRACE_GETREGS, regs, fp_op, fp_regs);
75 if(err)
76 panic("save_registers - saving registers failed, errno = %d\n",
77 -err);
78}
79
80void restore_registers(int pid, union uml_pt_regs *regs)
81{
82 unsigned long *fp_regs;
83 int err, fp_op;
84
85 if(have_fpx_regs){
86 fp_op = PTRACE_SETFPXREGS;
87 fp_regs = regs->skas.xfp;
88 }
89 else {
90 fp_op = PTRACE_SETFPREGS;
91 fp_regs = regs->skas.fp;
92 }
93
94 err = move_registers(pid, PTRACE_SETREGS, regs, fp_op, fp_regs);
95 if(err)
96 panic("restore_registers - saving registers failed, "
97 "errno = %d\n", -err);
98}
99
100void init_registers(int pid)
101{
102 int err;
103
104 memset(exec_regs, 0, sizeof(exec_regs));
105 err = ptrace(PTRACE_GETREGS, pid, 0, exec_regs);
106 if(err)
107 panic("check_ptrace : PTRACE_GETREGS failed, errno = %d",
108 errno);
109
110 errno = 0;
111 err = ptrace(PTRACE_GETFPXREGS, pid, 0, exec_fpx_regs);
112 if(!err)
113 return;
114 if(errno != EIO)
115 panic("check_ptrace : PTRACE_GETFPXREGS failed, errno = %d",
116 errno);
117
118 have_fpx_regs = 0;
119
120 err = ptrace(PTRACE_GETFPREGS, pid, 0, exec_fp_regs);
121 if(err)
122 panic("check_ptrace : PTRACE_GETFPREGS failed, errno = %d",
123 errno);
124}
125
126void get_safe_registers(unsigned long *regs, unsigned long *fp_regs)
127{
128 memcpy(regs, exec_regs, sizeof(exec_regs));
129 if(fp_regs != NULL)
130 memcpy(fp_regs, exec_fp_regs,
131 HOST_FP_SIZE * sizeof(unsigned long));
132}
133
134unsigned long get_thread_reg(int reg, jmp_buf *buf) 28unsigned long get_thread_reg(int reg, jmp_buf *buf)
135{ 29{
136 switch(reg){ 30 switch(reg){
diff --git a/arch/um/os-Linux/sys-x86_64/Makefile b/arch/um/os-Linux/sys-x86_64/Makefile
index 7955e061a67..eac8c0db300 100644
--- a/arch/um/os-Linux/sys-x86_64/Makefile
+++ b/arch/um/os-Linux/sys-x86_64/Makefile
@@ -1,5 +1,5 @@
1# 1#
2# Copyright (C) 2000 Jeff Dike (jdike@karaya.com) 2# Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
3# Licensed under the GPL 3# Licensed under the GPL
4# 4#
5 5
diff --git a/arch/um/os-Linux/sys-x86_64/registers.c b/arch/um/os-Linux/sys-x86_64/registers.c
index 9467315b805..9bfa789992d 100644
--- a/arch/um/os-Linux/sys-x86_64/registers.c
+++ b/arch/um/os-Linux/sys-x86_64/registers.c
@@ -1,23 +1,15 @@
1/* 1/*
2 * Copyright (C) 2004 PathScale, Inc 2 * Copyright (C) 2006-2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
3 * Licensed under the GPL 3 * Licensed under the GPL
4 */ 4 */
5 5
6#include <errno.h> 6#include <errno.h>
7#include <sys/ptrace.h> 7#include <sys/ptrace.h>
8#include <string.h> 8#define __FRAME_OFFSETS
9#include "ptrace_user.h" 9#include <asm/ptrace.h>
10#include "uml-config.h"
11#include "skas_ptregs.h"
12#include "registers.h"
13#include "longjmp.h" 10#include "longjmp.h"
14#include "user.h" 11#include "user.h"
15 12
16/* These are set once at boot time and not changed thereafter */
17
18static unsigned long exec_regs[MAX_REG_NR];
19static unsigned long exec_fp_regs[HOST_FP_SIZE];
20
21int save_fp_registers(int pid, unsigned long *fp_regs) 13int save_fp_registers(int pid, unsigned long *fp_regs)
22{ 14{
23 if(ptrace(PTRACE_GETFPREGS, pid, 0, fp_regs) < 0) 15 if(ptrace(PTRACE_GETFPREGS, pid, 0, fp_regs) < 0)
@@ -32,67 +24,6 @@ int restore_fp_registers(int pid, unsigned long *fp_regs)
32 return 0; 24 return 0;
33} 25}
34 26
35void init_thread_registers(union uml_pt_regs *to)
36{
37 memcpy(to->skas.regs, exec_regs, sizeof(to->skas.regs));
38 memcpy(to->skas.fp, exec_fp_regs, sizeof(to->skas.fp));
39}
40
41static int move_registers(int pid, int int_op, int fp_op,
42 union uml_pt_regs *regs)
43{
44 if(ptrace(int_op, pid, 0, regs->skas.regs) < 0)
45 return -errno;
46
47 if(ptrace(fp_op, pid, 0, regs->skas.fp) < 0)
48 return -errno;
49
50 return 0;
51}
52
53void save_registers(int pid, union uml_pt_regs *regs)
54{
55 int err;
56
57 err = move_registers(pid, PTRACE_GETREGS, PTRACE_GETFPREGS, regs);
58 if(err)
59 panic("save_registers - saving registers failed, errno = %d\n",
60 -err);
61}
62
63void restore_registers(int pid, union uml_pt_regs *regs)
64{
65 int err;
66
67 err = move_registers(pid, PTRACE_SETREGS, PTRACE_SETFPREGS, regs);
68 if(err)
69 panic("restore_registers - saving registers failed, "
70 "errno = %d\n", -err);
71}
72
73void init_registers(int pid)
74{
75 int err;
76
77 err = ptrace(PTRACE_GETREGS, pid, 0, exec_regs);
78 if(err)
79 panic("check_ptrace : PTRACE_GETREGS failed, errno = %d",
80 errno);
81
82 err = ptrace(PTRACE_GETFPREGS, pid, 0, exec_fp_regs);
83 if(err)
84 panic("check_ptrace : PTRACE_GETFPREGS failed, errno = %d",
85 errno);
86}
87
88void get_safe_registers(unsigned long *regs, unsigned long *fp_regs)
89{
90 memcpy(regs, exec_regs, sizeof(exec_regs));
91 if(fp_regs != NULL)
92 memcpy(fp_regs, exec_fp_regs,
93 HOST_FP_SIZE * sizeof(unsigned long));
94}
95
96unsigned long get_thread_reg(int reg, jmp_buf *buf) 27unsigned long get_thread_reg(int reg, jmp_buf *buf)
97{ 28{
98 switch(reg){ 29 switch(reg){