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

Commit 2cdef3b4 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Greg Kroah-Hartman
Browse files

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



commit ea1ed38dba64b64a245ab8ca1406269d17b99485 upstream.

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>
[4.19 backport; added user-visible changelog]
Signed-off-by: default avatarDmitry Safonov <dima@arista.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 510cd446

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>



#ifdef CC_USING_FENTRY

# define function_hook	__fentry__
@@ -131,6 +132,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 */

#ifdef CC_USING_FENTRY

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"
@@ -222,6 +223,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