aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/include
diff options
context:
space:
mode:
authorAndy Lutomirski <luto@amacapital.net>2015-03-05 22:19:03 -0500
committerIngo Molnar <mingo@kernel.org>2015-03-06 02:32:57 -0500
commit75182b1632a89f12540baa1806a7c5c180db620c (patch)
tree1e3f5d0c4a34c4ca2de42c25657f395ab6ad6e76 /arch/x86/include
parent8ef46a672a7d852709561d10672b6eaa8a4acd82 (diff)
x86/asm/entry: Switch all C consumers of kernel_stack to this_cpu_sp0()
This will make modifying the semantics of kernel_stack easier. The change to ist_begin_non_atomic() is necessary because sp0 no longer points to the same THREAD_SIZE-aligned region as RSP; it's one byte too high for that. At Denys' suggestion, rather than offsetting it, just check explicitly that we're in the correct range ending at sp0. This has the added benefit that we no longer assume that the thread stack is aligned to THREAD_SIZE. Suggested-by: Denys Vlasenko <dvlasenk@redhat.com> Signed-off-by: Andy Lutomirski <luto@amacapital.net> Cc: Borislav Petkov <bp@alien8.de> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Oleg Nesterov <oleg@redhat.com> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/ef8254ad414cbb8034c9a56396eeb24f5dd5b0de.1425611534.git.luto@amacapital.net Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include')
-rw-r--r--arch/x86/include/asm/thread_info.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
index 1d4e4f279a32..a2fa1899494e 100644
--- a/arch/x86/include/asm/thread_info.h
+++ b/arch/x86/include/asm/thread_info.h
@@ -159,8 +159,7 @@ DECLARE_PER_CPU(unsigned long, kernel_stack);
159static inline struct thread_info *current_thread_info(void) 159static inline struct thread_info *current_thread_info(void)
160{ 160{
161 struct thread_info *ti; 161 struct thread_info *ti;
162 ti = (void *)(this_cpu_read_stable(kernel_stack) + 162 ti = (void *)(this_cpu_sp0() - THREAD_SIZE);
163 KERNEL_STACK_OFFSET - THREAD_SIZE);
164 return ti; 163 return ti;
165} 164}
166 165