Merge branch 'core/kprobes' into perf/core, to pick up a completed branch (46f5cfc1) · Commits · 戴 / test

arch/arm/kernel/Makefile

+2 −2

Original line number	Diff line number	Diff line
		@@ -53,8 +53,8 @@ obj-$(CONFIG_HAVE_ARM_SCU) += smp_scu.o
		obj-$(CONFIG_HAVE_ARM_TWD) += smp_twd.o
		obj-$(CONFIG_ARM_ARCH_TIMER) += arch_timer.o
		obj-$(CONFIG_FUNCTION_TRACER) += entry-ftrace.o
		obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o insn.o
		obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o insn.o
		obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o insn.o patch.o
		obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o insn.o patch.o
		obj-$(CONFIG_JUMP_LABEL) += jump_label.o insn.o patch.o
		obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o
		# Main staffs in KPROBES are in arch/arm/probes/ .

arch/arm/kernel/ftrace.c

+2 −8

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@
		#include <asm/ftrace.h>
		#include <asm/insn.h>
		#include <asm/set_memory.h>
		#include <asm/patch.h>

		#ifdef CONFIG_THUMB2_KERNEL
		#define NOP 0xf85deb04 /* pop.w {lr} */
		@@ -35,9 +36,7 @@ static int __ftrace_modify_code(void *data)
		{
		int *command = data;

		set_kernel_text_rw();
		ftrace_modify_all_code(*command);
		set_kernel_text_ro();

		return 0;
		}
		@@ -59,13 +58,11 @@ static unsigned long adjust_address(struct dyn_ftrace *rec, unsigned long addr)

		int ftrace_arch_code_modify_prepare(void)
		{
		set_all_modules_text_rw();
		return 0;
		}

		int ftrace_arch_code_modify_post_process(void)
		{
		set_all_modules_text_ro();
		/* Make sure any TLB misses during machine stop are cleared. */
		flush_tlb_all();
		return 0;
		@@ -97,10 +94,7 @@ static int ftrace_modify_code(unsigned long pc, unsigned long old,
		return -EINVAL;
		}

		if (probe_kernel_write((void *)pc, &new, MCOUNT_INSN_SIZE))
		return -EPERM;

		flush_icache_range(pc, pc + MCOUNT_INSN_SIZE);
		__patch_text((void *)pc, new);

		return 0;
		}

arch/nds32/kernel/ftrace.c

+0 −12

Original line number	Diff line number	Diff line
		@@ -89,18 +89,6 @@ int __init ftrace_dyn_arch_init(void)
		return 0;
		}

		int ftrace_arch_code_modify_prepare(void)
		{
		set_all_modules_text_rw();
		return 0;
		}

		int ftrace_arch_code_modify_post_process(void)
		{
		set_all_modules_text_ro();
		return 0;
		}

		static unsigned long gen_sethi_insn(unsigned long addr)
		{
		unsigned long opcode = 0x46000000;

arch/x86/include/asm/ftrace.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -47,8 +47,6 @@ struct dyn_arch_ftrace {
		/* No extra data needed for x86 */
		};

		int ftrace_int3_handler(struct pt_regs *regs);

		#define FTRACE_GRAPH_TRAMP_ADDR FTRACE_GRAPH_ADDR

		#endif /* CONFIG_DYNAMIC_FTRACE */

arch/x86/include/asm/kprobes.h

+5 −9

Original line number	Diff line number	Diff line
		@@ -11,12 +11,11 @@

		#include <asm-generic/kprobes.h>

		#define BREAKPOINT_INSTRUCTION 0xcc

		#ifdef CONFIG_KPROBES
		#include <linux/types.h>
		#include <linux/ptrace.h>
		#include <linux/percpu.h>
		#include <asm/text-patching.h>
		#include <asm/insn.h>

		#define __ARCH_WANT_KPROBES_INSN_SLOT
		@@ -25,10 +24,7 @@ struct pt_regs;
		struct kprobe;

		typedef u8 kprobe_opcode_t;
		#define RELATIVEJUMP_OPCODE 0xe9
		#define RELATIVEJUMP_SIZE 5
		#define RELATIVECALL_OPCODE 0xe8
		#define RELATIVE_ADDR_SIZE 4

		#define MAX_STACK_SIZE 64
		#define CUR_STACK_SIZE(ADDR) \
		(current_top_of_stack() - (unsigned long)(ADDR))
		@@ -43,11 +39,11 @@ extern __visible kprobe_opcode_t optprobe_template_entry[];
		extern __visible kprobe_opcode_t optprobe_template_val[];
		extern __visible kprobe_opcode_t optprobe_template_call[];
		extern __visible kprobe_opcode_t optprobe_template_end[];
		#define MAX_OPTIMIZED_LENGTH (MAX_INSN_SIZE + RELATIVE_ADDR_SIZE)
		#define MAX_OPTIMIZED_LENGTH (MAX_INSN_SIZE + DISP32_SIZE)
		#define MAX_OPTINSN_SIZE \
		(((unsigned long)optprobe_template_end - \
		(unsigned long)optprobe_template_entry) + \
		MAX_OPTIMIZED_LENGTH + RELATIVEJUMP_SIZE)
		MAX_OPTIMIZED_LENGTH + JMP32_INSN_SIZE)

		extern const int kretprobe_blacklist_size;

		@@ -73,7 +69,7 @@ struct arch_specific_insn {

		struct arch_optimized_insn {
		/* copy of the original instructions */
		kprobe_opcode_t copied_insn[RELATIVE_ADDR_SIZE];
		kprobe_opcode_t copied_insn[DISP32_SIZE];
		/* detour code buffer */
		kprobe_opcode_t *insn;
		/* the size of instructions copied to detour code buffer */

Admin message