Commit 762abbc0 authored by Masami Hiramatsu (Google)'s avatar Masami Hiramatsu (Google) Committed by Steven Rostedt (Google)
Browse files

fprobe: Use ftrace_regs in fprobe exit handler 



Change the fprobe exit handler to use ftrace_regs structure instead of
pt_regs. This also introduce HAVE_FTRACE_REGS_HAVING_PT_REGS which
means the ftrace_regs is including the pt_regs so that ftrace_regs
can provide pt_regs without memory allocation.
Fprobe introduces a new dependency with that.

Signed-off-by: default avatarMasami Hiramatsu (Google) <mhiramat@kernel.org>
Acked-by: Heiko Carstens <hca@linux.ibm.com> # s390
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Alexei Starovoitov <alexei.starovoitov@gmail.com>
Cc: Florent Revest <revest@chromium.org>
Cc: bpf <bpf@vger.kernel.org>
Cc: Alan Maguire <alan.maguire@oracle.com>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: WANG Xuerui <kernel@xen0n.name>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
Cc: Sven Schnelle <svens@linux.ibm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: x86@kernel.org
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Song Liu <song@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: KP Singh <kpsingh@kernel.org>
Cc: Matt Bobrowski <mattbobrowski@google.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Andrii Nakryiko <andrii@kernel.org>
Cc: Martin KaFai Lau <martin.lau@linux.dev>
Cc: Eduard Zingerman <eddyz87@gmail.com>
Cc: Yonghong Song <yonghong.song@linux.dev>
Cc: John Fastabend <john.fastabend@gmail.com>
Cc: Stanislav Fomichev <sdf@fomichev.me>
Cc: Hao Luo <haoluo@google.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Link: https://lore.kernel.org/173518995092.391279.6765116450352977627.stgit@devnote2


Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parent 46bc0823

arch/loongarch/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ config LOONGARCH 
	select HAVE_DMA_CONTIGUOUS

	select HAVE_DYNAMIC_FTRACE

	select HAVE_DYNAMIC_FTRACE_WITH_ARGS

	select HAVE_FTRACE_REGS_HAVING_PT_REGS

	select HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS

	select HAVE_DYNAMIC_FTRACE_WITH_REGS

	select HAVE_EBPF_JIT

arch/s390/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ config S390 
	select HAVE_DMA_CONTIGUOUS

	select HAVE_DYNAMIC_FTRACE

	select HAVE_DYNAMIC_FTRACE_WITH_ARGS

	select HAVE_FTRACE_REGS_HAVING_PT_REGS

	select HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS

	select HAVE_DYNAMIC_FTRACE_WITH_REGS

	select HAVE_EBPF_JIT if HAVE_MARCH_Z196_FEATURES

arch/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -225,6 +225,7 @@ config X86 
	select HAVE_DYNAMIC_FTRACE

	select HAVE_DYNAMIC_FTRACE_WITH_REGS

	select HAVE_DYNAMIC_FTRACE_WITH_ARGS	if X86_64

	select HAVE_FTRACE_REGS_HAVING_PT_REGS	if X86_64

	select HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS

	select HAVE_SAMPLE_FTRACE_DIRECT	if X86_64

	select HAVE_SAMPLE_FTRACE_DIRECT_MULTI	if X86_64

include/linux/fprobe.h

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ typedef int (*fprobe_entry_cb)(struct fprobe *fp, unsigned long entry_ip, 
			       void *entry_data);



typedef void (*fprobe_exit_cb)(struct fprobe *fp, unsigned long entry_ip,

			       unsigned long ret_ip, struct pt_regs *regs,

			       unsigned long ret_ip, struct ftrace_regs *regs,

			       void *entry_data);



/**

include/linux/ftrace.h

+6 −0
Original line number Diff line number Diff line
@@ -176,6 +176,12 @@ static inline struct pt_regs *arch_ftrace_get_regs(struct ftrace_regs *fregs) 
#define ftrace_regs_set_instruction_pointer(fregs, ip) do { } while (0)

#endif /* CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS */



#ifdef CONFIG_HAVE_FTRACE_REGS_HAVING_PT_REGS



static_assert(sizeof(struct pt_regs) == ftrace_regs_size());



#endif /* CONFIG_HAVE_FTRACE_REGS_HAVING_PT_REGS */



static __always_inline struct pt_regs *ftrace_get_regs(struct ftrace_regs *fregs)

{

	if (!fregs)