Commit 4201311d authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

x86/stackframe, x86/kprobes: Fix frame pointer annotations 



The kprobe trampolines have a FRAME_POINTER annotation that makes no
sense. It marks the frame in the middle of pt_regs, at the place of
saving BP.

Change it to mark the pt_regs frame as per the ENCODE_FRAME_POINTER
from the respective entry_*.S.

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
Acked-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent a9b3c699

arch/x86/kernel/kprobes/common.h

+12 −12
Original line number Diff line number Diff line
@@ -5,15 +5,10 @@ 
/* Kprobes and Optprobes common header */



#include <asm/asm.h>



#ifdef CONFIG_FRAME_POINTER

# define SAVE_RBP_STRING "	push %" _ASM_BP "\n" \

			 "	mov  %" _ASM_SP ", %" _ASM_BP "\n"

#else

# define SAVE_RBP_STRING "	push %" _ASM_BP "\n"

#endif

#include <asm/frame.h>



#ifdef CONFIG_X86_64



#define SAVE_REGS_STRING			\

	/* Skip cs, ip, orig_ax. */		\

	"	subq $24, %rsp\n"		\
@@ -27,11 +22,13 @@ 
	"	pushq %r10\n"			\

	"	pushq %r11\n"			\

	"	pushq %rbx\n"			\

	SAVE_RBP_STRING				\

	"	pushq %rbp\n"			\

	"	pushq %r12\n"			\

	"	pushq %r13\n"			\

	"	pushq %r14\n"			\

	"	pushq %r15\n"

	"	pushq %r15\n"			\

	ENCODE_FRAME_POINTER



#define RESTORE_REGS_STRING			\

	"	popq %r15\n"			\

	"	popq %r14\n"			\
@@ -51,19 +48,22 @@ 
	/* Skip orig_ax, ip, cs */		\

	"	addq $24, %rsp\n"

#else



#define SAVE_REGS_STRING			\

	/* Skip cs, ip, orig_ax and gs. */	\

	"	subl $16, %esp\n"		\

	"	subl $4*4, %esp\n"		\

	"	pushl %fs\n"			\

	"	pushl %es\n"			\

	"	pushl %ds\n"			\

	"	pushl %eax\n"			\

	SAVE_RBP_STRING				\

	"	pushl %ebp\n"			\

	"	pushl %edi\n"			\

	"	pushl %esi\n"			\

	"	pushl %edx\n"			\

	"	pushl %ecx\n"			\

	"	pushl %ebx\n"

	"	pushl %ebx\n"			\

	ENCODE_FRAME_POINTER



#define RESTORE_REGS_STRING			\

	"	popl %ebx\n"			\

	"	popl %ecx\n"			\

CRA Git | Maintained and supported by SUSTech CRA and CCSE