Patch "arm64: function_graph: Simplify with function_graph_enter()" has been added to the 4.9-stable tree
From: <gregkh@linuxfoundation.org>
Date: 2018-12-03 11:04:22
This is a note to let you know that I've just added the patch titled
arm64: function_graph: Simplify with function_graph_enter()
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
arm64-function_graph-simplify-with-function_graph_enter.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let [off-list ref] know about it.
From 01e0ab2c4ff12358f15a856fd1a7bbea0670972b Mon Sep 17 00:00:00 2001
From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
Date: Sun, 18 Nov 2018 17:21:51 -0500
Subject: arm64: function_graph: Simplify with function_graph_enter()
From: Steven Rostedt (VMware) <rostedt@goodmis.org>
commit 01e0ab2c4ff12358f15a856fd1a7bbea0670972b upstream.
The function_graph_enter() function does the work of calling the function
graph hook function and the management of the shadow stack, simplifying the
work done in the architecture dependent prepare_ftrace_return().
Have arm64 use the new code, and remove the shadow stack management as well as
having to set up the trace structure.
This is needed to prepare for a fix of a design bug on how the curr_ret_stack
is used.
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: stable@kernel.org
Fixes: 03274a3ffb449 ("tracing/fgraph: Adjust fgraph depth before calling trace return callback")
Acked-by: Will Deacon <redacted>
Reviewed-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
arch/arm64/kernel/ftrace.c | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
--- a/arch/arm64/kernel/ftrace.c
+++ b/arch/arm64/kernel/ftrace.c@@ -117,8 +117,6 @@ void prepare_ftrace_return(unsigned long { unsigned long return_hooker = (unsigned long)&return_to_handler; unsigned long old; - struct ftrace_graph_ent trace; - int err; if (unlikely(atomic_read(¤t->tracing_graph_pause))) return;
@@ -130,18 +128,7 @@ void prepare_ftrace_return(unsigned long */ old = *parent; - trace.func = self_addr; - trace.depth = current->curr_ret_stack + 1; - - /* Only trace if the calling function expects to */ - if (!ftrace_graph_entry(&trace)) - return; - - err = ftrace_push_return_trace(old, self_addr, &trace.depth, - frame_pointer, NULL); - if (err == -EBUSY) - return; - else + if (!function_graph_enter(old, self_addr, frame_pointer, NULL)) *parent = return_hooker; }
Patches currently in stable-queue which might be from rostedt@goodmis.org are queue-4.9/function_graph-create-function_graph_enter-to-consolidate-architecture-code.patch queue-4.9/sh-function_graph-simplify-with-function_graph_enter.patch queue-4.9/function_graph-move-return-callback-before-update-of-curr_ret_stack.patch queue-4.9/function_graph-use-new-curr_ret_depth-to-manage-depth-instead-of-curr_ret_stack.patch queue-4.9/sparc-function_graph-simplify-with-function_graph_enter.patch queue-4.9/parisc-function_graph-simplify-with-function_graph_enter.patch queue-4.9/x86-function_graph-simplify-with-function_graph_enter.patch queue-4.9/function_graph-reverse-the-order-of-pushing-the-ret_stack-and-the-callback.patch queue-4.9/arm-function_graph-simplify-with-function_graph_enter.patch queue-4.9/function_graph-make-ftrace_push_return_trace-static.patch queue-4.9/arm64-function_graph-simplify-with-function_graph_enter.patch queue-4.9/s390-function_graph-simplify-with-function_graph_enter.patch queue-4.9/microblaze-function_graph-simplify-with-function_graph_enter.patch queue-4.9/function_graph-have-profiler-use-curr_ret_stack-and-not-depth.patch _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel