Merge branch 'arm64/ftrace-with-regs' of... (c1c9ea63) · Commits · 戴 / test

arch/arm64/Kconfig

+2 −0

Original line number	Diff line number	Diff line
		@@ -143,6 +143,8 @@ config ARM64
		select HAVE_DEBUG_KMEMLEAK
		select HAVE_DMA_CONTIGUOUS
		select HAVE_DYNAMIC_FTRACE
		select HAVE_DYNAMIC_FTRACE_WITH_REGS \
		if $(cc-option,-fpatchable-function-entry=2)
		select HAVE_EFFICIENT_UNALIGNED_ACCESS
		select HAVE_FAST_GUP
		select HAVE_FTRACE_MCOUNT_RECORD

+5 −0

Original line number	Diff line number	Diff line
		@@ -95,6 +95,11 @@ ifeq ($(CONFIG_ARM64_MODULE_PLTS),y)
		KBUILD_LDS_MODULE += $(srctree)/arch/arm64/kernel/module.lds
		endif

		ifeq ($(CONFIG_DYNAMIC_FTRACE_WITH_REGS),y)
		KBUILD_CPPFLAGS += -DCC_USING_PATCHABLE_FUNCTION_ENTRY
		CC_FLAGS_FTRACE := -fpatchable-function-entry=2
		endif

		# Default value
		head-y := arch/arm64/kernel/head.o

+23 −0

Original line number	Diff line number	Diff line
		@@ -11,9 +11,20 @@
		#include <asm/insn.h>

		#define HAVE_FUNCTION_GRAPH_FP_TEST

		#ifdef CONFIG_DYNAMIC_FTRACE_WITH_REGS
		#define ARCH_SUPPORTS_FTRACE_OPS 1
		#else
		#define MCOUNT_ADDR ((unsigned long)_mcount)
		#endif

		/* The BL at the callsite's adjusted rec->ip */
		#define MCOUNT_INSN_SIZE AARCH64_INSN_SIZE

		#define FTRACE_PLT_IDX 0
		#define FTRACE_REGS_PLT_IDX 1
		#define NR_FTRACE_PLTS 2

		/*
		* Currently, gcc tends to save the link register after the local variables
		* on the stack. This causes the max stack tracer to report the function
		@@ -43,6 +54,12 @@ extern void return_to_handler(void);

		static inline unsigned long ftrace_call_adjust(unsigned long addr)
		{
		/*
		* Adjust addr to point at the BL in the callsite.
		* See ftrace_init_nop() for the callsite sequence.
		*/
		if (IS_ENABLED(CONFIG_DYNAMIC_FTRACE_WITH_REGS))
		return addr + AARCH64_INSN_SIZE;
		/*
		* addr is the address of the mcount call instruction.
		* recordmcount does the necessary offset calculation.
		@@ -50,6 +67,12 @@ static inline unsigned long ftrace_call_adjust(unsigned long addr)
		return addr;
		}

		#ifdef CONFIG_DYNAMIC_FTRACE_WITH_REGS
		struct dyn_ftrace;
		int ftrace_init_nop(struct module mod, struct dyn_ftrace rec);
		#define ftrace_init_nop ftrace_init_nop
		#endif

		#define ftrace_return_address(n) return_address(n)

		/*

+3 −0

Original line number	Diff line number	Diff line
		@@ -440,6 +440,9 @@ u32 aarch64_insn_gen_logical_shifted_reg(enum aarch64_insn_register dst,
		int shift,
		enum aarch64_insn_variant variant,
		enum aarch64_insn_logic_type type);
		u32 aarch64_insn_gen_move_reg(enum aarch64_insn_register dst,
		enum aarch64_insn_register src,
		enum aarch64_insn_variant variant);
		u32 aarch64_insn_gen_logical_immediate(enum aarch64_insn_logic_type type,
		enum aarch64_insn_variant variant,
		enum aarch64_insn_register Rn,

+1 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@ struct mod_arch_specific {
		struct mod_plt_sec init;

		/* for CONFIG_DYNAMIC_FTRACE */
		struct plt_entry *ftrace_trampoline;
		struct plt_entry *ftrace_trampolines;
		};
		#endif