diff options
author | Roland McGrath <roland@redhat.com> | 2008-01-30 07:31:52 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:31:52 -0500 |
commit | 4c79a2d8e5b7e0a2f987ace9b6af9e7a1655447b (patch) | |
tree | 6f29726cabe888dcd1b6865c4e995eb5718f84b7 /arch | |
parent | 1bd5718ce58fb49ac158653380fa200f4759daad (diff) |
x86: x86 user_regset TLS
This adds accessor functions in the user_regset style for the TLS data.
Signed-off-by: Roland McGrath <roland@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/tls.c | 89 | ||||
-rw-r--r-- | arch/x86/kernel/tls.h | 21 |
2 files changed, 104 insertions, 6 deletions
diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c index f11c92a3faac..6dfd4e76661a 100644 --- a/arch/x86/kernel/tls.c +++ b/arch/x86/kernel/tls.c | |||
@@ -2,6 +2,7 @@ | |||
2 | #include <linux/errno.h> | 2 | #include <linux/errno.h> |
3 | #include <linux/sched.h> | 3 | #include <linux/sched.h> |
4 | #include <linux/user.h> | 4 | #include <linux/user.h> |
5 | #include <linux/regset.h> | ||
5 | 6 | ||
6 | #include <asm/uaccess.h> | 7 | #include <asm/uaccess.h> |
7 | #include <asm/desc.h> | 8 | #include <asm/desc.h> |
@@ -10,6 +11,8 @@ | |||
10 | #include <asm/processor.h> | 11 | #include <asm/processor.h> |
11 | #include <asm/proto.h> | 12 | #include <asm/proto.h> |
12 | 13 | ||
14 | #include "tls.h" | ||
15 | |||
13 | /* | 16 | /* |
14 | * sys_alloc_thread_area: get a yet unused TLS descriptor index. | 17 | * sys_alloc_thread_area: get a yet unused TLS descriptor index. |
15 | */ | 18 | */ |
@@ -25,7 +28,7 @@ static int get_free_idx(void) | |||
25 | } | 28 | } |
26 | 29 | ||
27 | static void set_tls_desc(struct task_struct *p, int idx, | 30 | static void set_tls_desc(struct task_struct *p, int idx, |
28 | const struct user_desc *info) | 31 | const struct user_desc *info, int n) |
29 | { | 32 | { |
30 | struct thread_struct *t = &p->thread; | 33 | struct thread_struct *t = &p->thread; |
31 | struct desc_struct *desc = &t->tls_array[idx - GDT_ENTRY_TLS_MIN]; | 34 | struct desc_struct *desc = &t->tls_array[idx - GDT_ENTRY_TLS_MIN]; |
@@ -36,10 +39,14 @@ static void set_tls_desc(struct task_struct *p, int idx, | |||
36 | */ | 39 | */ |
37 | cpu = get_cpu(); | 40 | cpu = get_cpu(); |
38 | 41 | ||
39 | if (LDT_empty(info)) | 42 | while (n-- > 0) { |
40 | desc->a = desc->b = 0; | 43 | if (LDT_empty(info)) |
41 | else | 44 | desc->a = desc->b = 0; |
42 | fill_ldt(desc, info); | 45 | else |
46 | fill_ldt(desc, info); | ||
47 | ++info; | ||
48 | ++desc; | ||
49 | } | ||
43 | 50 | ||
44 | if (t == ¤t->thread) | 51 | if (t == ¤t->thread) |
45 | load_TLS(t, cpu); | 52 | load_TLS(t, cpu); |
@@ -77,7 +84,7 @@ int do_set_thread_area(struct task_struct *p, int idx, | |||
77 | if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX) | 84 | if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX) |
78 | return -EINVAL; | 85 | return -EINVAL; |
79 | 86 | ||
80 | set_tls_desc(p, idx, &info); | 87 | set_tls_desc(p, idx, &info, 1); |
81 | 88 | ||
82 | return 0; | 89 | return 0; |
83 | } | 90 | } |
@@ -134,3 +141,73 @@ asmlinkage int sys_get_thread_area(struct user_desc __user *u_info) | |||
134 | { | 141 | { |
135 | return do_get_thread_area(current, -1, u_info); | 142 | return do_get_thread_area(current, -1, u_info); |
136 | } | 143 | } |
144 | |||
145 | int regset_tls_active(struct task_struct *target, | ||
146 | const struct user_regset *regset) | ||
147 | { | ||
148 | struct thread_struct *t = &target->thread; | ||
149 | int n = GDT_ENTRY_TLS_ENTRIES; | ||
150 | while (n > 0 && desc_empty(&t->tls_array[n - 1])) | ||
151 | --n; | ||
152 | return n; | ||
153 | } | ||
154 | |||
155 | int regset_tls_get(struct task_struct *target, const struct user_regset *regset, | ||
156 | unsigned int pos, unsigned int count, | ||
157 | void *kbuf, void __user *ubuf) | ||
158 | { | ||
159 | const struct desc_struct *tls; | ||
160 | |||
161 | if (pos > GDT_ENTRY_TLS_ENTRIES * sizeof(struct user_desc) || | ||
162 | (pos % sizeof(struct user_desc)) != 0 || | ||
163 | (count % sizeof(struct user_desc)) != 0) | ||
164 | return -EINVAL; | ||
165 | |||
166 | pos /= sizeof(struct user_desc); | ||
167 | count /= sizeof(struct user_desc); | ||
168 | |||
169 | tls = &target->thread.tls_array[pos]; | ||
170 | |||
171 | if (kbuf) { | ||
172 | struct user_desc *info = kbuf; | ||
173 | while (count-- > 0) | ||
174 | fill_user_desc(info++, GDT_ENTRY_TLS_MIN + pos++, | ||
175 | tls++); | ||
176 | } else { | ||
177 | struct user_desc __user *u_info = ubuf; | ||
178 | while (count-- > 0) { | ||
179 | struct user_desc info; | ||
180 | fill_user_desc(&info, GDT_ENTRY_TLS_MIN + pos++, tls++); | ||
181 | if (__copy_to_user(u_info++, &info, sizeof(info))) | ||
182 | return -EFAULT; | ||
183 | } | ||
184 | } | ||
185 | |||
186 | return 0; | ||
187 | } | ||
188 | |||
189 | int regset_tls_set(struct task_struct *target, const struct user_regset *regset, | ||
190 | unsigned int pos, unsigned int count, | ||
191 | const void *kbuf, const void __user *ubuf) | ||
192 | { | ||
193 | struct user_desc infobuf[GDT_ENTRY_TLS_ENTRIES]; | ||
194 | const struct user_desc *info; | ||
195 | |||
196 | if (pos > GDT_ENTRY_TLS_ENTRIES * sizeof(struct user_desc) || | ||
197 | (pos % sizeof(struct user_desc)) != 0 || | ||
198 | (count % sizeof(struct user_desc)) != 0) | ||
199 | return -EINVAL; | ||
200 | |||
201 | if (kbuf) | ||
202 | info = kbuf; | ||
203 | else if (__copy_from_user(infobuf, ubuf, count)) | ||
204 | return -EFAULT; | ||
205 | else | ||
206 | info = infobuf; | ||
207 | |||
208 | set_tls_desc(target, | ||
209 | GDT_ENTRY_TLS_MIN + (pos / sizeof(struct user_desc)), | ||
210 | info, count / sizeof(struct user_desc)); | ||
211 | |||
212 | return 0; | ||
213 | } | ||
diff --git a/arch/x86/kernel/tls.h b/arch/x86/kernel/tls.h new file mode 100644 index 000000000000..2f083a2fe216 --- /dev/null +++ b/arch/x86/kernel/tls.h | |||
@@ -0,0 +1,21 @@ | |||
1 | /* | ||
2 | * Internal declarations for x86 TLS implementation functions. | ||
3 | * | ||
4 | * Copyright (C) 2007 Red Hat, Inc. All rights reserved. | ||
5 | * | ||
6 | * This copyrighted material is made available to anyone wishing to use, | ||
7 | * modify, copy, or redistribute it subject to the terms and conditions | ||
8 | * of the GNU General Public License v.2. | ||
9 | * | ||
10 | * Red Hat Author: Roland McGrath. | ||
11 | */ | ||
12 | |||
13 | #ifndef _ARCH_X86_KERNEL_TLS_H | ||
14 | |||
15 | #include <linux/regset.h> | ||
16 | |||
17 | extern user_regset_active_fn regset_tls_active; | ||
18 | extern user_regset_get_fn regset_tls_get; | ||
19 | extern user_regset_set_fn regset_tls_set; | ||
20 | |||
21 | #endif /* _ARCH_X86_KERNEL_TLS_H */ | ||