Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4fe2d8b1 authored by Dave Hansen's avatar Dave Hansen Committed by Ingo Molnar
Browse files

x86/entry: Rename SYSENTER_stack to CPU_ENTRY_AREA_entry_stack 



If the kernel oopses while on the trampoline stack, it will print
"<SYSENTER>" even if SYSENTER is not involved.  That is rather confusing.

The "SYSENTER" stack is used for a lot more than SYSENTER now.  Give it a
better string to display in stack dumps, and rename the kernel code to
match.

Also move the 32-bit code over to the new naming even though it still uses
the entry stack only for SYSENTER.

Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Borislav Petkov <bp@suse.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent e8ffe96e

arch/x86/entry/entry_32.S

+6 −6
Original line number Diff line number Diff line
@@ -942,9 +942,9 @@ ENTRY(debug) 


	/* Are we currently on the SYSENTER stack? */

	movl	PER_CPU_VAR(cpu_entry_area), %ecx

	addl	$CPU_ENTRY_AREA_SYSENTER_stack + SIZEOF_SYSENTER_stack, %ecx

	subl	%eax, %ecx	/* ecx = (end of SYSENTER_stack) - esp */

	cmpl	$SIZEOF_SYSENTER_stack, %ecx

	addl	$CPU_ENTRY_AREA_entry_stack + SIZEOF_entry_stack, %ecx

	subl	%eax, %ecx	/* ecx = (end of entry_stack) - esp */

	cmpl	$SIZEOF_entry_stack, %ecx

	jb	.Ldebug_from_sysenter_stack



	TRACE_IRQS_OFF
@@ -986,9 +986,9 @@ ENTRY(nmi) 


	/* Are we currently on the SYSENTER stack? */

	movl	PER_CPU_VAR(cpu_entry_area), %ecx

	addl	$CPU_ENTRY_AREA_SYSENTER_stack + SIZEOF_SYSENTER_stack, %ecx

	subl	%eax, %ecx	/* ecx = (end of SYSENTER_stack) - esp */

	cmpl	$SIZEOF_SYSENTER_stack, %ecx

	addl	$CPU_ENTRY_AREA_entry_stack + SIZEOF_entry_stack, %ecx

	subl	%eax, %ecx	/* ecx = (end of entry_stack) - esp */

	cmpl	$SIZEOF_entry_stack, %ecx

	jb	.Lnmi_from_sysenter_stack



	/* Not on SYSENTER stack. */

arch/x86/entry/entry_64.S

+2 −2
Original line number Diff line number Diff line
@@ -154,8 +154,8 @@ END(native_usergs_sysret64) 
	_entry_trampoline - CPU_ENTRY_AREA_entry_trampoline(%rip)



/* The top word of the SYSENTER stack is hot and is usable as scratch space. */

#define RSP_SCRATCH	CPU_ENTRY_AREA_SYSENTER_stack + \

			SIZEOF_SYSENTER_stack - 8 + CPU_ENTRY_AREA

#define RSP_SCRATCH	CPU_ENTRY_AREA_entry_stack + \

			SIZEOF_entry_stack - 8 + CPU_ENTRY_AREA



ENTRY(entry_SYSCALL_64_trampoline)

	UNWIND_HINT_EMPTY

arch/x86/include/asm/fixmap.h

+4 −4
Original line number Diff line number Diff line
@@ -56,10 +56,10 @@ struct cpu_entry_area { 
	char gdt[PAGE_SIZE];



	/*

	 * The GDT is just below SYSENTER_stack and thus serves (on x86_64) as

	 * The GDT is just below entry_stack and thus serves (on x86_64) as

	 * a a read-only guard page.

	 */

	struct SYSENTER_stack_page SYSENTER_stack_page;

	struct entry_stack_page entry_stack_page;



	/*

	 * On x86_64, the TSS is mapped RO.  On x86_32, it's mapped RW because
@@ -250,9 +250,9 @@ static inline struct cpu_entry_area *get_cpu_entry_area(int cpu) 
	return (struct cpu_entry_area *)__fix_to_virt(__get_cpu_entry_area_page_index(cpu, 0));

}



static inline struct SYSENTER_stack *cpu_SYSENTER_stack(int cpu)

static inline struct entry_stack *cpu_entry_stack(int cpu)

{

	return &get_cpu_entry_area(cpu)->SYSENTER_stack_page.stack;

	return &get_cpu_entry_area(cpu)->entry_stack_page.stack;

}



#endif /* !__ASSEMBLY__ */

arch/x86/include/asm/processor.h

+3 −3
Original line number Diff line number Diff line
@@ -336,12 +336,12 @@ struct x86_hw_tss { 
#define IO_BITMAP_OFFSET		(offsetof(struct tss_struct, io_bitmap) - offsetof(struct tss_struct, x86_tss))

#define INVALID_IO_BITMAP_OFFSET	0x8000



struct SYSENTER_stack {

struct entry_stack {

	unsigned long		words[64];

};



struct SYSENTER_stack_page {

	struct SYSENTER_stack stack;

struct entry_stack_page {

	struct entry_stack stack;

} __aligned(PAGE_SIZE);



struct tss_struct {

arch/x86/include/asm/stacktrace.h

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ enum stack_type { 
	STACK_TYPE_TASK,

	STACK_TYPE_IRQ,

	STACK_TYPE_SOFTIRQ,

	STACK_TYPE_SYSENTER,

	STACK_TYPE_ENTRY,

	STACK_TYPE_EXCEPTION,

	STACK_TYPE_EXCEPTION_LAST = STACK_TYPE_EXCEPTION + N_EXCEPTION_STACKS-1,

};
@@ -29,7 +29,7 @@ struct stack_info { 
bool in_task_stack(unsigned long *stack, struct task_struct *task,

		   struct stack_info *info);



bool in_sysenter_stack(unsigned long *stack, struct stack_info *info);

bool in_entry_stack(unsigned long *stack, struct stack_info *info);



int get_stack_info(unsigned long *stack, struct task_struct *task,

		   struct stack_info *info, unsigned long *visit_mask);