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

x86/stackframe, x86/ftrace: Add pt_regs frame annotations 



When CONFIG_FRAME_POINTER, we should mark pt_regs frames.

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
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 4201311d

arch/x86/kernel/ftrace_32.S

+3 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <asm/export.h>

#include <asm/ftrace.h>

#include <asm/nospec-branch.h>

#include <asm/frame.h>



# define function_hook	__fentry__

EXPORT_SYMBOL(__fentry__)
@@ -116,6 +117,8 @@ ENTRY(ftrace_regs_caller) 
	pushl	%ecx

	pushl	%ebx



	ENCODE_FRAME_POINTER



	movl	12*4(%esp), %eax		/* Load ip (1st parameter) */

	subl	$MCOUNT_INSN_SIZE, %eax		/* Adjust ip */

	movl	15*4(%esp), %edx		/* Load parent ip (2nd parameter) */

arch/x86/kernel/ftrace_64.S

+3 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <asm/export.h>

#include <asm/nospec-branch.h>

#include <asm/unwind_hints.h>

#include <asm/frame.h>



	.code64

	.section .entry.text, "ax"
@@ -203,6 +204,8 @@ GLOBAL(ftrace_regs_caller_op_ptr) 
	leaq MCOUNT_REG_SIZE+8*2(%rsp), %rcx

	movq %rcx, RSP(%rsp)



	ENCODE_FRAME_POINTER



	/* regs go into 4th parameter */

	leaq (%rsp), %rcx

CRA Git | Maintained and supported by SUSTech CRA and CCSE