Commit 60c89718 authored by Florent Revest's avatar Florent Revest Committed by Steven Rostedt (Google)
Browse files

ftrace: Make DIRECT_CALLS work WITH_ARGS and !WITH_REGS 

Direct called trampolines can be called in two ways:
- either from the ftrace callsite. In this case, they do not access any
  struct ftrace_regs nor pt_regs
- Or, if a ftrace ops is also attached, from the end of a ftrace
  trampoline. In this case, the call_direct_funcs ops is in charge of
  setting the direct call trampoline's address in a struct ftrace_regs

Since:

commit 9705bc70 ("ftrace: pass fregs to arch_ftrace_set_direct_caller()")

The later case no longer requires a full pt_regs. It only needs a struct
ftrace_regs so DIRECT_CALLS can work with both WITH_ARGS or WITH_REGS.
With architectures like arm64 already abandoning WITH_REGS in favor of
WITH_ARGS, it's important to have DIRECT_CALLS work WITH_ARGS only.

Link: https://lkml.kernel.org/r/20230321140424.345218-7-revest@chromium.org



Signed-off-by: default avatarFlorent Revest <revest@chromium.org>
Co-developed-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parent dbaccb61

include/linux/ftrace.h

+6 −0
Original line number Diff line number Diff line
@@ -241,6 +241,12 @@ enum { 
	FTRACE_OPS_FL_DIRECT			= BIT(17),

};



#ifndef CONFIG_DYNAMIC_FTRACE_WITH_ARGS

#define FTRACE_OPS_FL_SAVE_ARGS                        FTRACE_OPS_FL_SAVE_REGS

#else

#define FTRACE_OPS_FL_SAVE_ARGS                        0

#endif



/*

 * FTRACE_OPS_CMD_* commands allow the ftrace core logic to request changes

 * to a ftrace_ops. Note, the requests may fail.

kernel/trace/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ config DYNAMIC_FTRACE_WITH_REGS 


config DYNAMIC_FTRACE_WITH_DIRECT_CALLS

	def_bool y

	depends on DYNAMIC_FTRACE_WITH_REGS

	depends on DYNAMIC_FTRACE_WITH_REGS || DYNAMIC_FTRACE_WITH_ARGS

	depends on HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS



config DYNAMIC_FTRACE_WITH_CALL_OPS

kernel/trace/ftrace.c

+1 −1
Original line number Diff line number Diff line
@@ -5288,7 +5288,7 @@ static LIST_HEAD(ftrace_direct_funcs); 


static int register_ftrace_function_nolock(struct ftrace_ops *ops);



#define MULTI_FLAGS (FTRACE_OPS_FL_DIRECT | FTRACE_OPS_FL_SAVE_REGS)

#define MULTI_FLAGS (FTRACE_OPS_FL_DIRECT | FTRACE_OPS_FL_SAVE_ARGS)



static int check_direct_multi(struct ftrace_ops *ops)

{