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

Commit 9351803b authored by David Woodhouse's avatar David Woodhouse Committed by Thomas Gleixner
Browse files

x86/retpoline/ftrace: Convert ftrace assembler indirect jumps 



Convert all indirect jumps in ftrace assembler code to use non-speculative
sequences when CONFIG_RETPOLINE is enabled.

Signed-off-by: default avatarDavid Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarArjan van de Ven <arjan@linux.intel.com>
Acked-by: default avatarIngo Molnar <mingo@kernel.org>
Cc: gnomes@lxorguk.ukuu.org.uk
Cc: Rik van Riel <riel@redhat.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: thomas.lendacky@amd.com
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Jiri Kosina <jikos@kernel.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Kees Cook <keescook@google.com>
Cc: Tim Chen <tim.c.chen@linux.intel.com>
Cc: Greg Kroah-Hartman <gregkh@linux-foundation.org>
Cc: Paul Turner <pjt@google.com>
Link: https://lkml.kernel.org/r/1515707194-20531-8-git-send-email-dwmw@amazon.co.uk
parent 2641f08b

arch/x86/kernel/ftrace_32.S

+4 −2
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include <asm/segment.h>

#include <asm/export.h>

#include <asm/ftrace.h>

#include <asm/nospec-branch.h>



#ifdef CC_USING_FENTRY

# define function_hook	__fentry__
@@ -197,7 +198,8 @@ ftrace_stub: 
	movl	0x4(%ebp), %edx

	subl	$MCOUNT_INSN_SIZE, %eax



	call	*ftrace_trace_function

	movl	ftrace_trace_function, %ecx

	CALL_NOSPEC %ecx



	popl	%edx

	popl	%ecx
@@ -241,5 +243,5 @@ return_to_handler: 
	movl	%eax, %ecx

	popl	%edx

	popl	%eax

	jmp	*%ecx

	JMP_NOSPEC %ecx

#endif

arch/x86/kernel/ftrace_64.S

+4 −4
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#include <asm/ptrace.h>

#include <asm/ftrace.h>

#include <asm/export.h>



#include <asm/nospec-branch.h>



	.code64

	.section .entry.text, "ax"
@@ -286,8 +286,8 @@ trace: 
	 * ip and parent ip are used and the list function is called when

	 * function tracing is enabled.

	 */

	call   *ftrace_trace_function



	movq ftrace_trace_function, %r8

	CALL_NOSPEC %r8

	restore_mcount_regs



	jmp fgraph_trace
@@ -329,5 +329,5 @@ GLOBAL(return_to_handler) 
	movq 8(%rsp), %rdx

	movq (%rsp), %rax

	addq $24, %rsp

	jmp *%rdi

	JMP_NOSPEC %rdi

#endif