leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86/entry: Define 'cpu_current_top_of_stack' for 64-bit code

Browse Source 
32-bit code has PER_CPU_VAR(cpu_current_top_of_stack).
64-bit code uses somewhat more obscure: PER_CPU_VAR(cpu_tss + TSS_sp0).

Define the 'cpu_current_top_of_stack' macro on CONFIG_X86_64
as well so that the PER_CPU_VAR(cpu_current_top_of_stack)
expression can be used in both 32-bit and 64-bit code.

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Cc: Alexei Starovoitov <ast@plumgrid.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Drewry <wad@chromium.org>
Link: http://lkml.kernel.org/r/1429889495-27850-3-git-send-email-dvlasenk@redhat.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Denys Vlasenko 2015-04-24 17:31:35 +02:00 committed by Ingo Molnar
parent fed7c3f0f7
commit 3a23208e69
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/ia32/ia32entry.S
View File

@ -113,7 +113,7 @@ ENTRY(ia32_sysenter_target)
* it is too small to ever cause noticeable irq latency. * it is too small to ever cause noticeable irq latency.
*/ */
SWAPGS_UNSAFE_STACK SWAPGS_UNSAFE_STACK
movq PER_CPU_VAR(cpu_tss + TSS_sp0), %rsp movq PER_CPU_VAR(cpu_current_top_of_stack), %rsp
ENABLE_INTERRUPTS(CLBR_NONE) ENABLE_INTERRUPTS(CLBR_NONE)
/* Zero-extending 32-bit regs, do not remove */ /* Zero-extending 32-bit regs, do not remove */
@ -346,7 +346,7 @@ ENTRY(ia32_cstar_target)
SWAPGS_UNSAFE_STACK SWAPGS_UNSAFE_STACK
movl %esp,%r8d movl %esp,%r8d
CFI_REGISTER rsp,r8 CFI_REGISTER rsp,r8
movq PER_CPU_VAR(cpu_tss + TSS_sp0),%rsp movq PER_CPU_VAR(cpu_current_top_of_stack),%rsp
ENABLE_INTERRUPTS(CLBR_NONE) ENABLE_INTERRUPTS(CLBR_NONE)
/* Zero-extending 32-bit regs, do not remove */ /* Zero-extending 32-bit regs, do not remove */

10
arch/x86/include/asm/thread_info.h
View File

@ -195,16 +195,14 @@ static inline unsigned long current_stack_pointer(void)
#else /* !__ASSEMBLY__ */ #else /* !__ASSEMBLY__ */
#ifdef CONFIG_X86_64
# define cpu_current_top_of_stack (cpu_tss + TSS_sp0)
#endif
/* Load thread_info address into "reg" */ /* Load thread_info address into "reg" */
#ifdef CONFIG_X86_32
#define GET_THREAD_INFO(reg) \ #define GET_THREAD_INFO(reg) \
_ASM_MOV PER_CPU_VAR(cpu_current_top_of_stack),reg ; \ _ASM_MOV PER_CPU_VAR(cpu_current_top_of_stack),reg ; \
_ASM_SUB $(THREAD_SIZE),reg ; _ASM_SUB $(THREAD_SIZE),reg ;
#else
#define GET_THREAD_INFO(reg) \
_ASM_MOV PER_CPU_VAR(cpu_tss + TSS_sp0),reg ; \
_ASM_SUB $(THREAD_SIZE),reg ;
#endif
/* /*
* ASM operand which evaluates to a 'thread_info' address of * ASM operand which evaluates to a 'thread_info' address of

2
arch/x86/kernel/entry_64.S
View File

@ -216,7 +216,7 @@ ENTRY(system_call)
GLOBAL(system_call_after_swapgs) GLOBAL(system_call_after_swapgs)
movq %rsp,PER_CPU_VAR(rsp_scratch) movq %rsp,PER_CPU_VAR(rsp_scratch)
movq PER_CPU_VAR(cpu_tss + TSS_sp0),%rsp movq PER_CPU_VAR(cpu_current_top_of_stack),%rsp
/* Construct struct pt_regs on stack */ /* Construct struct pt_regs on stack */
pushq_cfi $__USER_DS /* pt_regs->ss */ pushq_cfi $__USER_DS /* pt_regs->ss */

5
arch/x86/xen/xen-asm_64.S
View File

@ -16,6 +16,7 @@
#include <asm/processor-flags.h> #include <asm/processor-flags.h>
#include <asm/segment.h> #include <asm/segment.h>
#include <asm/asm-offsets.h> #include <asm/asm-offsets.h>
#include <asm/thread_info.h>
#include <xen/interface/xen.h> #include <xen/interface/xen.h>
@ -54,7 +55,7 @@ ENTRY(xen_sysret64)
* still with the kernel gs, so we can easily switch back * still with the kernel gs, so we can easily switch back
*/ */
movq %rsp, PER_CPU_VAR(rsp_scratch) movq %rsp, PER_CPU_VAR(rsp_scratch)
movq PER_CPU_VAR(cpu_tss + TSS_sp0), %rsp movq PER_CPU_VAR(cpu_current_top_of_stack), %rsp
pushq $__USER_DS pushq $__USER_DS
pushq PER_CPU_VAR(rsp_scratch) pushq PER_CPU_VAR(rsp_scratch)
@ -73,7 +74,7 @@ ENTRY(xen_sysret32)
* still with the kernel gs, so we can easily switch back * still with the kernel gs, so we can easily switch back
*/ */
movq %rsp, PER_CPU_VAR(rsp_scratch) movq %rsp, PER_CPU_VAR(rsp_scratch)
movq PER_CPU_VAR(cpu_tss + TSS_sp0), %rsp movq PER_CPU_VAR(cpu_current_top_of_stack), %rsp
pushq $__USER32_DS pushq $__USER32_DS
pushq PER_CPU_VAR(rsp_scratch) pushq PER_CPU_VAR(rsp_scratch)