Commit 7d8b31b7 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Steven Rostedt (Google)
Browse files

tracing: arm64: Avoid missing-prototype warnings 

These are all tracing W=1 warnings in arm64 allmodconfig about missing
prototypes:

kernel/trace/trace_kprobe_selftest.c:7:5: error: no previous prototype for 'kprobe_trace_selftest_target' [-Werror=missing-pro
totypes]
kernel/trace/ftrace.c:329:5: error: no previous prototype for '__register_ftrace_function' [-Werror=missing-prototypes]
kernel/trace/ftrace.c:372:5: error: no previous prototype for '__unregister_ftrace_function' [-Werror=missing-prototypes]
kernel/trace/ftrace.c:4130:15: error: no previous prototype for 'arch_ftrace_match_adjust' [-Werror=missing-prototypes]
kernel/trace/fgraph.c:243:15: error: no previous prototype for 'ftrace_return_to_handler' [-Werror=missing-prototypes]
kernel/trace/fgraph.c:358:6: error: no previous prototype for 'ftrace_graph_sleep_time_control' [-Werror=missing-prototypes]
arch/arm64/kernel/ftrace.c:460:6: error: no previous prototype for 'prepare_ftrace_return' [-Werror=missing-prototypes]
arch/arm64/kernel/ptrace.c:2172:5: error: no previous prototype for 'syscall_trace_enter' [-Werror=missing-prototypes]
arch/arm64/kernel/ptrace.c:2195:6: error: no previous prototype for 'syscall_trace_exit' [-Werror=missing-prototypes]

Move the declarations to an appropriate header where they can be seen
by the caller and callee, and make sure the headers are included where
needed.

Link: https://lore.kernel.org/linux-trace-kernel/20230517125215.930689-1-arnd@kernel.org



Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: Florent Revest <revest@chromium.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
[ Fixed ftrace_return_to_handler() to handle CONFIG_HAVE_FUNCTION_GRAPH_RETVAL case ]
Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parent 769e6372

arch/arm64/include/asm/ftrace.h

+4 −0
Original line number Diff line number Diff line
@@ -211,6 +211,10 @@ static inline unsigned long fgraph_ret_regs_frame_pointer(struct fgraph_ret_regs 
{

	return ret_regs->fp;

}



void prepare_ftrace_return(unsigned long self_addr, unsigned long *parent,

			   unsigned long frame_pointer);



#endif /* ifdef CONFIG_FUNCTION_GRAPH_TRACER  */

#endif

arch/arm64/include/asm/syscall.h

+3 −0
Original line number Diff line number Diff line
@@ -85,4 +85,7 @@ static inline int syscall_get_arch(struct task_struct *task) 
	return AUDIT_ARCH_AARCH64;

}



int syscall_trace_enter(struct pt_regs *regs);

void syscall_trace_exit(struct pt_regs *regs);



#endif	/* __ASM_SYSCALL_H */

arch/arm64/kernel/syscall.c

+0 −3
Original line number Diff line number Diff line
@@ -75,9 +75,6 @@ static inline bool has_syscall_work(unsigned long flags) 
	return unlikely(flags & _TIF_SYSCALL_WORK);

}



int syscall_trace_enter(struct pt_regs *regs);

void syscall_trace_exit(struct pt_regs *regs);



static void el0_svc_common(struct pt_regs *regs, int scno, int sc_nr,

			   const syscall_fn_t syscall_table[])

{

include/linux/ftrace.h

+9 −0
Original line number Diff line number Diff line
@@ -41,6 +41,15 @@ struct ftrace_ops; 
struct ftrace_regs;

struct dyn_ftrace;



char *arch_ftrace_match_adjust(char *str, const char *search);



#ifdef CONFIG_HAVE_FUNCTION_GRAPH_RETVAL

struct fgraph_ret_regs;

unsigned long ftrace_return_to_handler(struct fgraph_ret_regs *ret_regs);

#else

unsigned long ftrace_return_to_handler(unsigned long frame_pointer);

#endif



#ifdef CONFIG_FUNCTION_TRACER

/*

 * If the arch's mcount caller does not support all of ftrace's

kernel/trace/fgraph.c

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <trace/events/sched.h>



#include "ftrace_internal.h"

#include "trace.h"



#ifdef CONFIG_DYNAMIC_FTRACE

#define ASSIGN_OPS_HASH(opsname, val) \