linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Josh Poimboeuf <jpoimboe@redhat.com>
To: Borislav Petkov <bp@alien8.de>
Cc: Steven Rostedt <rostedt@goodmis.org>, x86-ml <x86@kernel.org>,
	lkml <linux-kernel@vger.kernel.org>,
	Linus Torvalds <torvalds@linux-foundation.org>
Subject: Re: arch/x86/kernel/ftrace_64.o: warning: objtool: .entry.text+0x0: unreachable instruction
Date: Sat, 27 Jan 2018 20:21:50 -0600	[thread overview]
Message-ID: <20180128022150.dqierscqmt3uwwsr@treble> (raw)
In-Reply-To: <20180127161304.l3vzyb2fph57mphe@pd.tnic>

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 <jpoimboe@redhat.com>
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 <rostedt@goodmis.org>
Reported-by: Borislav Petkov <bp@alien8.de>
Fixes: e2ac83d74a4d ("x86/ftrace: Fix ORC unwinding from ftrace handlers")
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
---
 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

  reply	other threads:[~2018-01-28  2:21 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-27 16:13 arch/x86/kernel/ftrace_64.o: warning: objtool: .entry.text+0x0: unreachable instruction Borislav Petkov
2018-01-28  2:21 ` Josh Poimboeuf [this message]
2018-01-28  8:22   ` [tip:x86/urgent] x86/ftrace: Add one more ENDPROC annotation tip-bot for Josh Poimboeuf
2018-01-28  8:50   ` arch/x86/kernel/ftrace_64.o: warning: objtool: .entry.text+0x0: unreachable instruction Borislav Petkov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180128022150.dqierscqmt3uwwsr@treble \
    --to=jpoimboe@redhat.com \
    --cc=bp@alien8.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rostedt@goodmis.org \
    --cc=torvalds@linux-foundation.org \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).