Commit 70045bfc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ftrace-v6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace 

Pull ftrace updates from Steven Rostedt:
 "Rewrite of function graph tracer to allow multiple users

  Up until now, the function graph tracer could only have a single user
  attached to it. If another user tried to attach to the function graph
  tracer while one was already attached, it would fail. Allowing
  function graph tracer to have more than one user has been asked for
  since 2009, but it required a rewrite to the logic to pull it off so
  it never happened. Until now!

  There's three systems that trace the return of a function. That is
  kretprobes, function graph tracer, and BPF. kretprobes and function
  graph tracing both do it similarly. The difference is that kretprobes
  uses a shadow stack per callback and function graph tracer creates a
  shadow stack for all tasks. The function graph tracer method makes it
  possible to trace the return of all functions. As kretprobes now needs
  that feature too, allowing it to use function graph tracer was needed.
  BPF also wants to trace the return of many probes and its method
  doesn't scale either. Having it use function graph tracer would
  improve that.

  By allowing function graph tracer to have multiple users allows both
  kretprobes and BPF to use function graph tracer in these cases. This
  will allow kretprobes code to be removed in the future as it's version
  will no longer be needed.

  Note, function graph tracer is only limited to 16 simultaneous users,
  due to shadow stack size and allocated slots"

* tag 'ftrace-v6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace: (49 commits)
  fgraph: Use str_plural() in test_graph_storage_single()
  function_graph: Add READ_ONCE() when accessing fgraph_array[]
  ftrace: Add missing kerneldoc parameters to unregister_ftrace_direct()
  function_graph: Everyone uses HAVE_FUNCTION_GRAPH_RET_ADDR_PTR, remove it
  function_graph: Fix up ftrace_graph_ret_addr()
  function_graph: Make fgraph_update_pid_func() a stub for !DYNAMIC_FTRACE
  function_graph: Rename BYTE_NUMBER to CHAR_NUMBER in selftests
  fgraph: Remove some unused functions
  ftrace: Hide one more entry in stack trace when ftrace_pid is enabled
  function_graph: Do not update pid func if CONFIG_DYNAMIC_FTRACE not enabled
  function_graph: Make fgraph_do_direct static key static
  ftrace: Fix prototypes for ftrace_startup/shutdown_subops()
  ftrace: Assign RCU list variable with rcu_assign_ptr()
  ftrace: Assign ftrace_list_end to ftrace_ops_list type cast to RCU
  ftrace: Declare function_trace_op in header to quiet sparse warning
  ftrace: Add comments to ftrace_hash_move() and friends
  ftrace: Convert "inc" parameter to bool in ftrace_hash_rec_update_modify()
  ftrace: Add comments to ftrace_hash_rec_disable/enable()
  ftrace: Remove "filter_hash" parameter from __ftrace_hash_rec_update()
  ftrace: Rename dup_hash() and comment it
  ...
parents 2fd4130e b576d375

Documentation/trace/ftrace-design.rst

+0 −12
Original line number Diff line number Diff line
@@ -217,18 +217,6 @@ along to ftrace_push_return_trace() instead of a stub value of 0. 


Similarly, when you call ftrace_return_to_handler(), pass it the frame pointer.



HAVE_FUNCTION_GRAPH_RET_ADDR_PTR

--------------------------------



An arch may pass in a pointer to the return address on the stack.  This

prevents potential stack unwinding issues where the unwinder gets out of

sync with ret_stack and the wrong addresses are reported by

ftrace_graph_ret_addr().



Adding support for it is easy: just define the macro in asm/ftrace.h and

pass the return address pointer as the 'retp' argument to

ftrace_push_return_trace().



HAVE_SYSCALL_TRACEPOINTS

------------------------

arch/arm64/include/asm/ftrace.h

+0 −11
Original line number Diff line number Diff line
@@ -12,17 +12,6 @@ 


#define HAVE_FUNCTION_GRAPH_FP_TEST



/*

 * HAVE_FUNCTION_GRAPH_RET_ADDR_PTR means that the architecture can provide a

 * "return address pointer" which can be used to uniquely identify a return

 * address which has been overwritten.

 *

 * On arm64 we use the address of the caller's frame record, which remains the

 * same for the lifetime of the instrumented function, unlike the return

 * address in the LR.

 */

#define HAVE_FUNCTION_GRAPH_RET_ADDR_PTR



#ifdef CONFIG_DYNAMIC_FTRACE_WITH_ARGS

#define ARCH_SUPPORTS_FTRACE_OPS 1

#else

arch/csky/include/asm/ftrace.h

+0 −2
Original line number Diff line number Diff line
@@ -7,8 +7,6 @@ 


#define HAVE_FUNCTION_GRAPH_FP_TEST



#define HAVE_FUNCTION_GRAPH_RET_ADDR_PTR



#define ARCH_SUPPORTS_FTRACE_OPS 1



#define MCOUNT_ADDR	((unsigned long)_mcount)

arch/loongarch/include/asm/ftrace.h

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ struct dyn_ftrace; 
struct dyn_arch_ftrace { };



#define ARCH_SUPPORTS_FTRACE_OPS 1

#define HAVE_FUNCTION_GRAPH_RET_ADDR_PTR



#define ftrace_init_nop ftrace_init_nop

int ftrace_init_nop(struct module *mod, struct dyn_ftrace *rec);

arch/powerpc/include/asm/ftrace.h

+0 −2
Original line number Diff line number Diff line
@@ -8,8 +8,6 @@ 
#define MCOUNT_ADDR		((unsigned long)(_mcount))

#define MCOUNT_INSN_SIZE	4 /* sizeof mcount call */



#define HAVE_FUNCTION_GRAPH_RET_ADDR_PTR



/* Ignore unused weak functions which will have larger offsets */

#if defined(CONFIG_MPROFILE_KERNEL) || defined(CONFIG_ARCH_USING_PATCHABLE_FUNCTION_ENTRY)

#define FTRACE_MCOUNT_MAX_OFFSET	16