From: "Steven Rostedt (Red Hat)" <[email protected]>
Nothing sets function_trace_stop to disable function tracing anymore.
Remove the check for it in the arch code.
[ Please test this on your arch ]
Cc: Michal Simek <[email protected]>
Signed-off-by: Steven Rostedt <[email protected]>
---
arch/microblaze/Kconfig | 1 -
arch/microblaze/kernel/mcount.S | 5 -----
2 files changed, 6 deletions(-)
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 9ae08541e30d..40e1c1dd0e24 100644
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -22,7 +22,6 @@ config MICROBLAZE
select HAVE_DYNAMIC_FTRACE
select HAVE_FTRACE_MCOUNT_RECORD
select HAVE_FUNCTION_GRAPH_TRACER
- select HAVE_FUNCTION_TRACE_MCOUNT_TEST
select HAVE_FUNCTION_TRACER
select HAVE_MEMBLOCK
select HAVE_MEMBLOCK_NODE_MAP
diff --git a/arch/microblaze/kernel/mcount.S b/arch/microblaze/kernel/mcount.S
index fc1e1322ce4c..fed9da5de8c4 100644
--- a/arch/microblaze/kernel/mcount.S
+++ b/arch/microblaze/kernel/mcount.S
@@ -91,11 +91,6 @@ ENTRY(ftrace_caller)
#endif /* CONFIG_DYNAMIC_FTRACE */
SAVE_REGS
swi r15, r1, 0;
- /* MS: HAVE_FUNCTION_TRACE_MCOUNT_TEST begin of checking */
- lwi r5, r0, function_trace_stop;
- bneid r5, end;
- nop;
- /* MS: HAVE_FUNCTION_TRACE_MCOUNT_TEST end of checking */
#ifdef CONFIG_FUNCTION_GRAPH_TRACER
#ifndef CONFIG_DYNAMIC_FTRACE
lwi r5, r0, ftrace_graph_return;
--
2.0.0
On Thu, 26 Jun 2014 12:52:43 -0400
Steven Rostedt <[email protected]> wrote:
> From: "Steven Rostedt (Red Hat)" <[email protected]>
>
> Nothing sets function_trace_stop to disable function tracing anymore.
> Remove the check for it in the arch code.
>
> [ Please test this on your arch ]
>From the cover letter, you were not Cc'd on.
Anyway, as there is no more reason to set function_trace_stop it is time
to remove it. Unfortunately it's in several archs in assembly. Most of
the assembly looks rather straight forward and I removed them myself.
But I was only able to compile test them (for archs: arm64, metag, and
microblaze I do not have my cross tools set up for them and did not
even compile test it). But I would really love it if people can
download their patch and test it out. You only need the patches that go
against your arch and to really test it, also include the patch titled:
ftrace: Remove check for HAVE_FUNCTION_TRACE_MCOUNT_TEST
Otherwise your arch patch will call the list op that still does the
check. That is, if you want to test suspend and resume on your arch.
As you may see, there are patches to the ftrace infrastructure that
depend on the arch patches being implemented. I removed the
functionality from the infrastructure, then removed it from the archs,
and then finally removed the existence of the function_trace_stop
variable, which would cause the archs to fail to compile if that were
to go first.
If you can test your arch and give me your acked-by, I would appreciate
it. Otherwise, if you need this to go through your tree, I would ask you
to set up a dedicated branch that I can pull from to keep this order
intact.
-- Steve
>
> Cc: Michal Simek <[email protected]>
> Signed-off-by: Steven Rostedt <[email protected]>
> ---
> arch/microblaze/Kconfig | 1 -
> arch/microblaze/kernel/mcount.S | 5 -----
> 2 files changed, 6 deletions(-)
>
> diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
> index 9ae08541e30d..40e1c1dd0e24 100644
> --- a/arch/microblaze/Kconfig
> +++ b/arch/microblaze/Kconfig
> @@ -22,7 +22,6 @@ config MICROBLAZE
> select HAVE_DYNAMIC_FTRACE
> select HAVE_FTRACE_MCOUNT_RECORD
> select HAVE_FUNCTION_GRAPH_TRACER
> - select HAVE_FUNCTION_TRACE_MCOUNT_TEST
> select HAVE_FUNCTION_TRACER
> select HAVE_MEMBLOCK
> select HAVE_MEMBLOCK_NODE_MAP
> diff --git a/arch/microblaze/kernel/mcount.S b/arch/microblaze/kernel/mcount.S
> index fc1e1322ce4c..fed9da5de8c4 100644
> --- a/arch/microblaze/kernel/mcount.S
> +++ b/arch/microblaze/kernel/mcount.S
> @@ -91,11 +91,6 @@ ENTRY(ftrace_caller)
> #endif /* CONFIG_DYNAMIC_FTRACE */
> SAVE_REGS
> swi r15, r1, 0;
> - /* MS: HAVE_FUNCTION_TRACE_MCOUNT_TEST begin of checking */
> - lwi r5, r0, function_trace_stop;
> - bneid r5, end;
> - nop;
> - /* MS: HAVE_FUNCTION_TRACE_MCOUNT_TEST end of checking */
> #ifdef CONFIG_FUNCTION_GRAPH_TRACER
> #ifndef CONFIG_DYNAMIC_FTRACE
> lwi r5, r0, ftrace_graph_return;
Michal,
Can you please ack this patch.
Thanks!
-- Steve
On Thu, 26 Jun 2014 12:52:43 -0400
Steven Rostedt <[email protected]> wrote:
> From: "Steven Rostedt (Red Hat)" <[email protected]>
>
> Nothing sets function_trace_stop to disable function tracing anymore.
> Remove the check for it in the arch code.
>
> [ Please test this on your arch ]
>
> Cc: Michal Simek <[email protected]>
> Signed-off-by: Steven Rostedt <[email protected]>
> ---
> arch/microblaze/Kconfig | 1 -
> arch/microblaze/kernel/mcount.S | 5 -----
> 2 files changed, 6 deletions(-)
>
> diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
> index 9ae08541e30d..40e1c1dd0e24 100644
> --- a/arch/microblaze/Kconfig
> +++ b/arch/microblaze/Kconfig
> @@ -22,7 +22,6 @@ config MICROBLAZE
> select HAVE_DYNAMIC_FTRACE
> select HAVE_FTRACE_MCOUNT_RECORD
> select HAVE_FUNCTION_GRAPH_TRACER
> - select HAVE_FUNCTION_TRACE_MCOUNT_TEST
> select HAVE_FUNCTION_TRACER
> select HAVE_MEMBLOCK
> select HAVE_MEMBLOCK_NODE_MAP
> diff --git a/arch/microblaze/kernel/mcount.S b/arch/microblaze/kernel/mcount.S
> index fc1e1322ce4c..fed9da5de8c4 100644
> --- a/arch/microblaze/kernel/mcount.S
> +++ b/arch/microblaze/kernel/mcount.S
> @@ -91,11 +91,6 @@ ENTRY(ftrace_caller)
> #endif /* CONFIG_DYNAMIC_FTRACE */
> SAVE_REGS
> swi r15, r1, 0;
> - /* MS: HAVE_FUNCTION_TRACE_MCOUNT_TEST begin of checking */
> - lwi r5, r0, function_trace_stop;
> - bneid r5, end;
> - nop;
> - /* MS: HAVE_FUNCTION_TRACE_MCOUNT_TEST end of checking */
> #ifdef CONFIG_FUNCTION_GRAPH_TRACER
> #ifndef CONFIG_DYNAMIC_FTRACE
> lwi r5, r0, ftrace_graph_return;
Michal,
Can you please test and ack this and patch 6 of this series. Otherwise I
may have to stip it out of the series which will break the build on
microblaze.
You can test my branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
rfc/remove-function-trace-stop
-- Steve
On Thu, 26 Jun 2014 12:52:43 -0400
Steven Rostedt <[email protected]> wrote:
> From: "Steven Rostedt (Red Hat)" <[email protected]>
>
> Nothing sets function_trace_stop to disable function tracing anymore.
> Remove the check for it in the arch code.
>
> [ Please test this on your arch ]
>
> Cc: Michal Simek <[email protected]>
> Signed-off-by: Steven Rostedt <[email protected]>
> ---
> arch/microblaze/Kconfig | 1 -
> arch/microblaze/kernel/mcount.S | 5 -----
> 2 files changed, 6 deletions(-)
>
> diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
> index 9ae08541e30d..40e1c1dd0e24 100644
> --- a/arch/microblaze/Kconfig
> +++ b/arch/microblaze/Kconfig
> @@ -22,7 +22,6 @@ config MICROBLAZE
> select HAVE_DYNAMIC_FTRACE
> select HAVE_FTRACE_MCOUNT_RECORD
> select HAVE_FUNCTION_GRAPH_TRACER
> - select HAVE_FUNCTION_TRACE_MCOUNT_TEST
> select HAVE_FUNCTION_TRACER
> select HAVE_MEMBLOCK
> select HAVE_MEMBLOCK_NODE_MAP
> diff --git a/arch/microblaze/kernel/mcount.S b/arch/microblaze/kernel/mcount.S
> index fc1e1322ce4c..fed9da5de8c4 100644
> --- a/arch/microblaze/kernel/mcount.S
> +++ b/arch/microblaze/kernel/mcount.S
> @@ -91,11 +91,6 @@ ENTRY(ftrace_caller)
> #endif /* CONFIG_DYNAMIC_FTRACE */
> SAVE_REGS
> swi r15, r1, 0;
> - /* MS: HAVE_FUNCTION_TRACE_MCOUNT_TEST begin of checking */
> - lwi r5, r0, function_trace_stop;
> - bneid r5, end;
> - nop;
> - /* MS: HAVE_FUNCTION_TRACE_MCOUNT_TEST end of checking */
> #ifdef CONFIG_FUNCTION_GRAPH_TRACER
> #ifndef CONFIG_DYNAMIC_FTRACE
> lwi r5, r0, ftrace_graph_return;
Hi Steve,
On 07/15/2014 11:51 PM, Steven Rostedt wrote:
> Michal,
>
> Can you please test and ack this and patch 6 of this series. Otherwise I
> may have to stip it out of the series which will break the build on
> microblaze.
>
> You can test my branch at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
> rfc/remove-function-trace-stop
I have tested this full branch and there is no issue on Microblaze that's why
here is:
Tested-by: Michal Simek <[email protected]>
Thanks,
Michal