From: Steven Rostedt <rostedt@goodmis.org>
To: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: linux-kernel@vger.kernel.org, Ingo Molnar <mingo@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
X86 ML <x86@kernel.org>, Nadav Amit <nadav.amit@gmail.com>,
Andy Lutomirski <luto@kernel.org>,
Dave Hansen <dave.hansen@linux.intel.com>,
Song Liu <songliubraving@fb.com>,
Masami Hiramatsu <mhiramat@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Daniel Bristot de Oliveira <bristot@redhat.com>,
Alexei Starovoitov <alexei.starovoitov@gmail.com>
Subject: Re: [PATCH 00/10] ftrace: Add register_ftrace_direct()
Date: Fri, 8 Nov 2019 20:00:37 -0500 [thread overview]
Message-ID: <20191108200037.5ee30af8@gandalf.local.home> (raw)
In-Reply-To: <20191108225100.ea3bhsbdf6oerj6g@treble>
On Fri, 8 Nov 2019 16:51:00 -0600
Josh Poimboeuf <jpoimboe@redhat.com> wrote:
> Here's the fix for the objtool warning:
Thanks, I applied it (will push it soon).
-- Steve
>
> From: Josh Poimboeuf <jpoimboe@redhat.com>
> Subject: [PATCH] ftrace/x86: Tell objtool to ignore nondeterministic ftrace stack layout
>
> Objtool complains about the new ftrace direct trampoline code:
>
> arch/x86/kernel/ftrace_64.o: warning: objtool: ftrace_regs_caller()+0x190: stack state mismatch: cfa1=7+16 cfa2=7+24
>
> Typically, code has a deterministic stack layout, such that at a given
> instruction address, the stack frame size is always the same.
>
> That's not the case for the new ftrace_regs_caller() code after it
> adjusts the stack for the direct case. Just plead ignorance and assume
> it's always the non-direct path. Note this creates a tiny window for
> ORC to get confused.
>
> Reported-by: Steven Rostedt <rostedt@goodmis.org>
> Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
> ---
> arch/x86/include/asm/unwind_hints.h | 8 ++++++++
> arch/x86/kernel/ftrace_64.S | 12 +++++++++++-
> 2 files changed, 19 insertions(+), 1 deletion(-)
>
> diff --git a/arch/x86/include/asm/unwind_hints.h b/arch/x86/include/asm/unwind_hints.h
> index 0bcdb1279361..f5e2eb12cb71 100644
> --- a/arch/x86/include/asm/unwind_hints.h
> +++ b/arch/x86/include/asm/unwind_hints.h
> @@ -86,6 +86,14 @@
> UNWIND_HINT sp_offset=\sp_offset
> .endm
>
> +.macro UNWIND_HINT_SAVE
> + UNWIND_HINT type=UNWIND_HINT_TYPE_SAVE
> +.endm
> +
> +.macro UNWIND_HINT_RESTORE
> + UNWIND_HINT type=UNWIND_HINT_TYPE_RESTORE
> +.endm
> +
> #else /* !__ASSEMBLY__ */
>
> #define UNWIND_HINT(sp_reg, sp_offset, type, end) \
> diff --git a/arch/x86/kernel/ftrace_64.S b/arch/x86/kernel/ftrace_64.S
> index 5d946ab40b52..1c79624a36b2 100644
> --- a/arch/x86/kernel/ftrace_64.S
> +++ b/arch/x86/kernel/ftrace_64.S
> @@ -175,6 +175,8 @@ ENTRY(ftrace_regs_caller)
> /* Save the current flags before any operations that can change them */
> pushfq
>
> + UNWIND_HINT_SAVE
> +
> /* added 8 bytes to save flags */
> save_mcount_regs 8
> /* save_mcount_regs fills in first two parameters */
> @@ -249,8 +251,16 @@ GLOBAL(ftrace_regs_call)
> 1: restore_mcount_regs
>
>
> +2:
> + /*
> + * The stack layout is nondetermistic here, depending on which path was
> + * taken. This confuses objtool and ORC, rightfully so. For now,
> + * pretend the stack always looks like the non-direct case.
> + */
> + UNWIND_HINT_RESTORE
> +
> /* Restore flags */
> -2: popfq
> + popfq
>
> /*
> * As this jmp to ftrace_epilogue can be a short jump
next prev parent reply other threads:[~2019-11-09 1:00 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-08 21:28 [PATCH 00/10] ftrace: Add register_ftrace_direct() Steven Rostedt
2019-11-08 21:28 ` [PATCH 01/10] ftrace: Separate out the copying of a ftrace_hash from __ftrace_hash_move() Steven Rostedt
2019-11-08 21:28 ` [PATCH 02/10] ftrace: Separate out functionality from ftrace_location_range() Steven Rostedt
2019-11-08 21:28 ` [PATCH 03/10] ftrace: Add register_ftrace_direct() Steven Rostedt
2019-11-09 2:29 ` Alexei Starovoitov
2019-11-09 12:33 ` Steven Rostedt
2019-11-14 18:29 ` Steven Rostedt
2019-11-14 18:34 ` Alexei Starovoitov
2019-11-14 18:48 ` Steven Rostedt
2019-11-14 19:05 ` Steven Rostedt
2019-11-13 14:13 ` Miroslav Benes
2019-11-13 14:34 ` Steven Rostedt
2019-11-08 21:28 ` [PATCH 04/10] ftrace: Add ftrace_find_direct_func() Steven Rostedt
2019-11-08 21:28 ` [PATCH 05/10] ftrace: Add sample module that uses register_ftrace_direct() Steven Rostedt
2019-11-08 21:28 ` [PATCH 06/10] ftrace/selftest: Add tests to test register_ftrace_direct() Steven Rostedt
2019-11-08 21:28 ` [PATCH 07/10] ftrace: Add another example of register_ftrace_direct() use case Steven Rostedt
2019-11-08 21:28 ` [PATCH 08/10] ftrace/selftests: Update the direct call selftests to test two direct calls Steven Rostedt
2019-11-08 21:28 ` [PATCH 09/10] ftrace/x86: Add register_ftrace_direct() for custom trampolines Steven Rostedt
2019-11-14 15:34 ` Miroslav Benes
2019-11-14 16:19 ` Steven Rostedt
2019-11-15 9:32 ` Miroslav Benes
2019-11-08 21:28 ` [PATCH 10/10] ftrace/x86: Add a counter to test function_graph with direct Steven Rostedt
2019-11-08 22:51 ` [PATCH 00/10] ftrace: Add register_ftrace_direct() Josh Poimboeuf
2019-11-09 1:00 ` Steven Rostedt [this message]
2019-11-11 8:47 ` Peter Zijlstra
2019-11-11 14:15 ` Josh Poimboeuf
2019-11-13 15:10 ` Miroslav Benes
2019-11-13 16:31 ` Steven Rostedt
2019-11-14 9:05 ` Miroslav Benes
2019-11-14 14:36 ` Steven Rostedt
2019-11-14 15:42 ` Miroslav Benes
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=20191108200037.5ee30af8@gandalf.local.home \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=alexei.starovoitov@gmail.com \
--cc=bristot@redhat.com \
--cc=dave.hansen@linux.intel.com \
--cc=jpoimboe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mhiramat@kernel.org \
--cc=mingo@kernel.org \
--cc=nadav.amit@gmail.com \
--cc=peterz@infradead.org \
--cc=songliubraving@fb.com \
--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).