From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753288AbeA1CVw (ORCPT ); Sat, 27 Jan 2018 21:21:52 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38364 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751588AbeA1CVv (ORCPT ); Sat, 27 Jan 2018 21:21:51 -0500 Date: Sat, 27 Jan 2018 20:21:50 -0600 From: Josh Poimboeuf To: Borislav Petkov Cc: Steven Rostedt , x86-ml , lkml , Linus Torvalds Subject: Re: arch/x86/kernel/ftrace_64.o: warning: objtool: .entry.text+0x0: unreachable instruction Message-ID: <20180128022150.dqierscqmt3uwwsr@treble> References: <20180127161304.l3vzyb2fph57mphe@pd.tnic> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20180127161304.l3vzyb2fph57mphe@pd.tnic> User-Agent: Mutt/1.6.0.1 (2016-04-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, Jan 27, 2018 at 05:13:04PM +0100, Borislav Petkov wrote: > Hey, > > seen this already? > > This is Linus' tree from now + tip/master also from now. Yeah, Steven reported it a few days ago but I was in backport lala land. It's a simple fix: From: Josh Poimboeuf Subject: [PATCH] x86/ftrace: Add one more ENDPROC annotation When I added ORC support for the ftrace_64.S code, I missed an ENDPROC for function_hook(). This fixes the following warning: arch/x86/kernel/ftrace_64.o: warning: objtool: .entry.text+0x0: unreachable instruction Reported-by: Steven Rostedt Reported-by: Borislav Petkov Fixes: e2ac83d74a4d ("x86/ftrace: Fix ORC unwinding from ftrace handlers") Signed-off-by: Josh Poimboeuf --- arch/x86/kernel/ftrace_64.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/ftrace_64.S b/arch/x86/kernel/ftrace_64.S index ef61f540cf0a..91b2cff4b79a 100644 --- a/arch/x86/kernel/ftrace_64.S +++ b/arch/x86/kernel/ftrace_64.S @@ -295,7 +295,7 @@ trace: restore_mcount_regs jmp fgraph_trace -END(function_hook) +ENDPROC(function_hook) #endif /* CONFIG_DYNAMIC_FTRACE */ #ifdef CONFIG_FUNCTION_GRAPH_TRACER -- 2.14.3