Skip to content

Commit 95a05bf

Browse files
mhiramatAlexander Gordeev
authored andcommitted
s390/fgraph: Fix to remove ftrace_test_recursion_trylock()
Fix to remove ftrace_test_recursion_trylock() from ftrace_graph_func() because commit d576aec ("fgraph: Get ftrace recursion lock in function_graph_enter") has been moved it to function_graph_enter_regs() already. Reported-by: Jiri Olsa <[email protected]> Closes: https://lore.kernel.org/all/Z5O0shrdgeExZ2kF@krava/ Fixes: d576aec ("fgraph: Get ftrace recursion lock in function_graph_enter") Signed-off-by: Masami Hiramatsu (Google) <[email protected]> Tested-by: Jiri Olsa <[email protected]> Tested-by: Ihor Solodrai <[email protected]> Reviewed-by: Heiko Carstens <[email protected]> Link: https://lore.kernel.org/r/173807817692.1854334.2985776940754607459.stgit@devnote2 Signed-off-by: Alexander Gordeev <[email protected]>
1 parent 2e04247 commit 95a05bf

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

arch/s390/kernel/ftrace.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -266,18 +266,13 @@ void ftrace_graph_func(unsigned long ip, unsigned long parent_ip,
266266
struct ftrace_ops *op, struct ftrace_regs *fregs)
267267
{
268268
unsigned long *parent = &arch_ftrace_regs(fregs)->regs.gprs[14];
269-
int bit;
270269

271270
if (unlikely(ftrace_graph_is_dead()))
272271
return;
273272
if (unlikely(atomic_read(&current->tracing_graph_pause)))
274273
return;
275-
bit = ftrace_test_recursion_trylock(ip, *parent);
276-
if (bit < 0)
277-
return;
278274
if (!function_graph_enter_regs(*parent, ip, 0, parent, fregs))
279275
*parent = (unsigned long)&return_to_handler;
280-
ftrace_test_recursion_unlock(bit);
281276
}
282277

283278
#endif /* CONFIG_FUNCTION_GRAPH_TRACER */

0 commit comments

Comments
 (0)