FAILED: patch "[PATCH] s390/function_graph: Simplify with function_graph_enter()" failed to apply to 4.4-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 4.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From
18588e1487b19e45bd90bd55ec8d3a1d44f3257fMon Sep 17 00:00:00 2001
From: "Steven Rostedt (VMware)" <[email protected]>
Date: Sun, 18 Nov 2018 17:33:17 -0500
Subject: [PATCH] s390/function_graph: Simplify with function_graph_enter()
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 s390 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.
arch/s390/kernel/ftrace.c +2 -11
@@ -203,22 +203,13 @@ device_initcall(ftrace_plt_init);*/ unsigned long prepare_ftrace_return (unsigned long parent,unsigned long ip) { -struct ftrace_graph_ent trace; -if (unlikely (ftrace_graph_is_dead ())) goto out;if (unlikely (atomic_read (¤t->tracing_graph_pause))) goto out; ip -=MCOUNT_INSN_SIZE ; - trace.func = ip; - trace.depth = current->curr_ret_stack +1 ; -/* Only trace if the calling function expects to. */ -if (!ftrace_graph_entry (&trace)) - goto out; -if (ftrace_push_return_trace (parent, ip, &trace.depth,0 , -NULL ) == -EBUSY ) - goto out; - parent = (unsigned long ) return_to_handler; +if (!function_graph_enter (parent, ip,0 ,NULL )) + parent = (unsigned long ) return_to_handler; out:return parent; }