Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932569AbeAKX3s (ORCPT + 1 other); Thu, 11 Jan 2018 18:29:48 -0500 Received: from terminus.zytor.com ([65.50.211.136]:44729 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932074AbeAKX3r (ORCPT ); Thu, 11 Jan 2018 18:29:47 -0500 Date: Thu, 11 Jan 2018 15:25:09 -0800 From: tip-bot for David Woodhouse Message-ID: Cc: tglx@linutronix.de, linux-kernel@vger.kernel.org, hpa@zytor.com, jpoimboe@redhat.com, keescook@google.com, gregkh@linux-foundation.org, ak@linux.intel.com, jikos@kernel.org, peterz@infradead.org, riel@redhat.com, dwmw@amazon.co.uk, luto@amacapital.net, arjan@linux.intel.com, dave.hansen@intel.com, tim.c.chen@linux.intel.com, pjt@google.com, mingo@kernel.org, torvalds@linux-foundation.org Reply-To: keescook@google.com, gregkh@linux-foundation.org, ak@linux.intel.com, hpa@zytor.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, jpoimboe@redhat.com, luto@amacapital.net, arjan@linux.intel.com, dave.hansen@intel.com, tim.c.chen@linux.intel.com, pjt@google.com, mingo@kernel.org, torvalds@linux-foundation.org, jikos@kernel.org, peterz@infradead.org, riel@redhat.com, dwmw@amazon.co.uk In-Reply-To: <1515707194-20531-8-git-send-email-dwmw@amazon.co.uk> References: <1515707194-20531-8-git-send-email-dwmw@amazon.co.uk> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/pti] x86/retpoline/ftrace: Convert ftrace assembler indirect jumps Git-Commit-ID: 9351803bd803cdbeb9b5a7850b7b6f464806e3db X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: Commit-ID: 9351803bd803cdbeb9b5a7850b7b6f464806e3db Gitweb: https://git.kernel.org/tip/9351803bd803cdbeb9b5a7850b7b6f464806e3db Author: David Woodhouse AuthorDate: Thu, 11 Jan 2018 21:46:29 +0000 Committer: Thomas Gleixner CommitDate: Fri, 12 Jan 2018 00:14:30 +0100 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: David Woodhouse Signed-off-by: Thomas Gleixner Acked-by: Arjan van de Ven Acked-by: Ingo Molnar Cc: gnomes@lxorguk.ukuu.org.uk Cc: Rik van Riel Cc: Andi Kleen Cc: Josh Poimboeuf Cc: thomas.lendacky@amd.com Cc: Peter Zijlstra Cc: Linus Torvalds Cc: Jiri Kosina Cc: Andy Lutomirski Cc: Dave Hansen Cc: Kees Cook Cc: Tim Chen Cc: Greg Kroah-Hartman Cc: Paul Turner Link: https://lkml.kernel.org/r/1515707194-20531-8-git-send-email-dwmw@amazon.co.uk --- arch/x86/kernel/ftrace_32.S | 6 ++++-- arch/x86/kernel/ftrace_64.S | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/ftrace_32.S b/arch/x86/kernel/ftrace_32.S index b6c6468..4c8440d 100644 --- a/arch/x86/kernel/ftrace_32.S +++ b/arch/x86/kernel/ftrace_32.S @@ -8,6 +8,7 @@ #include #include #include +#include #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 diff --git a/arch/x86/kernel/ftrace_64.S b/arch/x86/kernel/ftrace_64.S index c832291..7cb8ba0 100644 --- a/arch/x86/kernel/ftrace_64.S +++ b/arch/x86/kernel/ftrace_64.S @@ -7,7 +7,7 @@ #include #include #include - +#include .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