From: Steven Rostedt <rostedt@goodmis.org>
To: Qian Cai <cai@lca.pw>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Michael Ellerman <mpe@ellerman.id.au>,
linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org
Subject: Re: powerpc ftrace broken due to "manual merge of the ftrace tree with the arm64 tree"
Date: Fri, 15 Nov 2019 16:02:30 -0500 [thread overview]
Message-ID: <20191115160230.78871d8f@gandalf.local.home> (raw)
In-Reply-To: <1573849732.5937.136.camel@lca.pw>
On Fri, 15 Nov 2019 15:28:52 -0500
Qian Cai <cai@lca.pw> wrote:
> # echo function >/sys/kernel/debug/tracing/current_tracer
>
> It hangs forever with today's linux-next on powerpc. Reverted the conflict fix
> [1] as below fixes the issue.
>
> [1] https://lore.kernel.org/linux-next/20191115135357.10386fac@canb.auug.org.au/
What's your config file.
And can you test the two conflicting commits to see which one caused
your error?
Test this commit please: b83b43ffc6e4b514ca034a0fbdee01322e2f7022
And see if the issue is with that one, and not with the one without it.
-- Steve
>
> diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-
> generic/vmlinux.lds.h
> index 7d0d03a03d4d..a92222f79b53 100644
> --- a/include/asm-generic/vmlinux.lds.h
> +++ b/include/asm-generic/vmlinux.lds.h
> @@ -136,29 +136,20 @@
> #endif
>
> #ifdef CONFIG_FTRACE_MCOUNT_RECORD
> -/*
> - * The ftrace call sites are logged to a section whose name depends on the
> - * compiler option used. A given kernel image will only use one, AKA
> - * FTRACE_CALLSITE_SECTION. We capture all of them here to avoid header
> - * dependencies for FTRACE_CALLSITE_SECTION's definition.
> - */
> -/*
> - * Need to also make ftrace_graph_stub point to ftrace_stub
> - * so that the same stub location may have different protocols
> - * and not mess up with C verifiers.
> - */
> -#define MCOUNT_REC() . = ALIGN(8); \
> +#ifdef CC_USING_PATCHABLE_FUNCTION_ENTRY
> +#define MCOUNT_REC() . = ALIGN(8) \
> __start_mcount_loc = .; \
> - KEEP(*(__mcount_loc)) \
> KEEP(*(__patchable_function_entries)) \
> __stop_mcount_loc = .; \
> ftrace_graph_stub = ftrace_stub;
> #else
> -# ifdef CONFIG_FUNCTION_TRACER
> -# define MCOUNT_REC() ftrace_graph_stub = ftrace_stub;
> -# else
> -# define MCOUNT_REC()
> -# endif
> +#define MCOUNT_REC() . = ALIGN(8); \
> + __start_mcount_loc = .; \
> + KEEP(*(__mcount_loc)) \
> + __stop_mcount_loc = .;
> +#endif
> +#else
> +#define MCOUNT_REC()
> #endif
>
> #ifdef CONFIG_TRACE_BRANCH_PROFILING
next prev parent reply other threads:[~2019-11-15 21:02 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-15 20:28 powerpc ftrace broken due to "manual merge of the ftrace tree with the arm64 tree" Qian Cai
2019-11-15 21:02 ` Steven Rostedt [this message]
2019-11-15 21:06 ` Qian Cai
2019-11-18 14:51 ` Steven Rostedt
2019-11-18 14:58 ` Steven Rostedt
2019-11-18 15:16 ` Steven Rostedt
2019-11-18 17:11 ` Qian Cai
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=20191115160230.78871d8f@gandalf.local.home \
--to=rostedt@goodmis.org \
--cc=cai@lca.pw \
--cc=catalin.marinas@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mark.rutland@arm.com \
--cc=mpe@ellerman.id.au \
--cc=sfr@canb.auug.org.au \
--cc=will@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).