diff options
author | Roland McGrath <roland@redhat.com> | 2008-01-30 07:30:45 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:30:45 -0500 |
commit | 13abd0e50433092c41551bc13c32268028b6d663 (patch) | |
tree | 25637d680966f6f021cf469614e5838963ead20c /arch/x86/ia32 | |
parent | 12c3cbbb7e3218b1c3ed4c97b3496fc3f94ea967 (diff) |
x86: tls32 moved
This renames arch/x86/ia32/tls32.c to arch/x86/kernel/tls.c, which does
nothing now but paves the way to consolidate this code for 32-bit too.
Signed-off-by: Roland McGrath <roland@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Zachary Amsden <zach@vmware.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/ia32')
-rw-r--r-- | arch/x86/ia32/Makefile | 2 | ||||
-rw-r--r-- | arch/x86/ia32/tls32.c | 158 |
2 files changed, 1 insertions, 159 deletions
diff --git a/arch/x86/ia32/Makefile b/arch/x86/ia32/Makefile index 8c19b763b2fb..ea6088640847 100644 --- a/arch/x86/ia32/Makefile +++ b/arch/x86/ia32/Makefile | |||
@@ -2,7 +2,7 @@ | |||
2 | # Makefile for the ia32 kernel emulation subsystem. | 2 | # Makefile for the ia32 kernel emulation subsystem. |
3 | # | 3 | # |
4 | 4 | ||
5 | obj-$(CONFIG_IA32_EMULATION) := ia32entry.o sys_ia32.o ia32_signal.o tls32.o \ | 5 | obj-$(CONFIG_IA32_EMULATION) := ia32entry.o sys_ia32.o ia32_signal.o \ |
6 | ia32_binfmt.o fpu32.o ptrace32.o | 6 | ia32_binfmt.o fpu32.o ptrace32.o |
7 | 7 | ||
8 | sysv-$(CONFIG_SYSVIPC) := ipc32.o | 8 | sysv-$(CONFIG_SYSVIPC) := ipc32.o |
diff --git a/arch/x86/ia32/tls32.c b/arch/x86/ia32/tls32.c deleted file mode 100644 index cac4b26b5895..000000000000 --- a/arch/x86/ia32/tls32.c +++ /dev/null | |||
@@ -1,158 +0,0 @@ | |||
1 | #include <linux/kernel.h> | ||
2 | #include <linux/errno.h> | ||
3 | #include <linux/sched.h> | ||
4 | #include <linux/user.h> | ||
5 | |||
6 | #include <asm/uaccess.h> | ||
7 | #include <asm/desc.h> | ||
8 | #include <asm/system.h> | ||
9 | #include <asm/ldt.h> | ||
10 | #include <asm/processor.h> | ||
11 | #include <asm/proto.h> | ||
12 | |||
13 | /* | ||
14 | * sys_alloc_thread_area: get a yet unused TLS descriptor index. | ||
15 | */ | ||
16 | static int get_free_idx(void) | ||
17 | { | ||
18 | struct thread_struct *t = ¤t->thread; | ||
19 | int idx; | ||
20 | |||
21 | for (idx = 0; idx < GDT_ENTRY_TLS_ENTRIES; idx++) | ||
22 | if (desc_empty((struct n_desc_struct *)(t->tls_array) + idx)) | ||
23 | return idx + GDT_ENTRY_TLS_MIN; | ||
24 | return -ESRCH; | ||
25 | } | ||
26 | |||
27 | /* | ||
28 | * Set a given TLS descriptor: | ||
29 | * When you want addresses > 32bit use arch_prctl() | ||
30 | */ | ||
31 | int do_set_thread_area(struct thread_struct *t, struct user_desc __user *u_info) | ||
32 | { | ||
33 | struct user_desc info; | ||
34 | struct n_desc_struct *desc; | ||
35 | int cpu, idx; | ||
36 | |||
37 | if (copy_from_user(&info, u_info, sizeof(info))) | ||
38 | return -EFAULT; | ||
39 | |||
40 | idx = info.entry_number; | ||
41 | |||
42 | /* | ||
43 | * index -1 means the kernel should try to find and | ||
44 | * allocate an empty descriptor: | ||
45 | */ | ||
46 | if (idx == -1) { | ||
47 | idx = get_free_idx(); | ||
48 | if (idx < 0) | ||
49 | return idx; | ||
50 | if (put_user(idx, &u_info->entry_number)) | ||
51 | return -EFAULT; | ||
52 | } | ||
53 | |||
54 | if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX) | ||
55 | return -EINVAL; | ||
56 | |||
57 | desc = ((struct n_desc_struct *)t->tls_array) + idx - GDT_ENTRY_TLS_MIN; | ||
58 | |||
59 | /* | ||
60 | * We must not get preempted while modifying the TLS. | ||
61 | */ | ||
62 | cpu = get_cpu(); | ||
63 | |||
64 | if (LDT_empty(&info)) { | ||
65 | desc->a = 0; | ||
66 | desc->b = 0; | ||
67 | } else { | ||
68 | desc->a = LDT_entry_a(&info); | ||
69 | desc->b = LDT_entry_b(&info); | ||
70 | } | ||
71 | if (t == ¤t->thread) | ||
72 | load_TLS(t, cpu); | ||
73 | |||
74 | put_cpu(); | ||
75 | return 0; | ||
76 | } | ||
77 | |||
78 | asmlinkage long sys32_set_thread_area(struct user_desc __user *u_info) | ||
79 | { | ||
80 | return do_set_thread_area(¤t->thread, u_info); | ||
81 | } | ||
82 | |||
83 | |||
84 | /* | ||
85 | * Get the current Thread-Local Storage area: | ||
86 | */ | ||
87 | |||
88 | #define GET_LIMIT(desc) ( \ | ||
89 | ((desc)->a & 0x0ffff) | \ | ||
90 | ((desc)->b & 0xf0000) ) | ||
91 | |||
92 | #define GET_32BIT(desc) (((desc)->b >> 22) & 1) | ||
93 | #define GET_CONTENTS(desc) (((desc)->b >> 10) & 3) | ||
94 | #define GET_WRITABLE(desc) (((desc)->b >> 9) & 1) | ||
95 | #define GET_LIMIT_PAGES(desc) (((desc)->b >> 23) & 1) | ||
96 | #define GET_PRESENT(desc) (((desc)->b >> 15) & 1) | ||
97 | #define GET_USEABLE(desc) (((desc)->b >> 20) & 1) | ||
98 | #define GET_LONGMODE(desc) (((desc)->b >> 21) & 1) | ||
99 | |||
100 | int do_get_thread_area(struct thread_struct *t, struct user_desc __user *u_info) | ||
101 | { | ||
102 | struct user_desc info; | ||
103 | struct n_desc_struct *desc; | ||
104 | int idx; | ||
105 | |||
106 | if (get_user(idx, &u_info->entry_number)) | ||
107 | return -EFAULT; | ||
108 | if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX) | ||
109 | return -EINVAL; | ||
110 | |||
111 | desc = ((struct n_desc_struct *)t->tls_array) + idx - GDT_ENTRY_TLS_MIN; | ||
112 | |||
113 | memset(&info, 0, sizeof(struct user_desc)); | ||
114 | info.entry_number = idx; | ||
115 | info.base_addr = get_desc_base(desc); | ||
116 | info.limit = GET_LIMIT(desc); | ||
117 | info.seg_32bit = GET_32BIT(desc); | ||
118 | info.contents = GET_CONTENTS(desc); | ||
119 | info.read_exec_only = !GET_WRITABLE(desc); | ||
120 | info.limit_in_pages = GET_LIMIT_PAGES(desc); | ||
121 | info.seg_not_present = !GET_PRESENT(desc); | ||
122 | info.useable = GET_USEABLE(desc); | ||
123 | info.lm = GET_LONGMODE(desc); | ||
124 | |||
125 | if (copy_to_user(u_info, &info, sizeof(info))) | ||
126 | return -EFAULT; | ||
127 | return 0; | ||
128 | } | ||
129 | |||
130 | asmlinkage long sys32_get_thread_area(struct user_desc __user *u_info) | ||
131 | { | ||
132 | return do_get_thread_area(¤t->thread, u_info); | ||
133 | } | ||
134 | |||
135 | |||
136 | int ia32_child_tls(struct task_struct *p, struct pt_regs *childregs) | ||
137 | { | ||
138 | struct n_desc_struct *desc; | ||
139 | struct user_desc info; | ||
140 | struct user_desc __user *cp; | ||
141 | int idx; | ||
142 | |||
143 | cp = (void __user *)childregs->rsi; | ||
144 | if (copy_from_user(&info, cp, sizeof(info))) | ||
145 | return -EFAULT; | ||
146 | if (LDT_empty(&info)) | ||
147 | return -EINVAL; | ||
148 | |||
149 | idx = info.entry_number; | ||
150 | if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX) | ||
151 | return -EINVAL; | ||
152 | |||
153 | desc = (struct n_desc_struct *)(p->thread.tls_array) + idx - GDT_ENTRY_TLS_MIN; | ||
154 | desc->a = LDT_entry_a(&info); | ||
155 | desc->b = LDT_entry_b(&info); | ||
156 | |||
157 | return 0; | ||
158 | } | ||