Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8976fc8 authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Ingo Molnar
Browse files

kprobes/x86: Remove addressof() operators 



The following commit:

  54a7d50b ("x86: mark kprobe templates as character arrays, not single characters")

changed optprobe_template_* to arrays, so we can remove the addressof()
operators from those symbols.

Signed-off-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
Cc: David S . Miller <davem@davemloft.net>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/150304469798.17009.15886717935027472863.stgit@devbox


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 63fef14f

arch/x86/include/asm/kprobes.h

+2 −2
Original line number Diff line number Diff line
@@ -58,8 +58,8 @@ 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_OPTINSN_SIZE 				\

	(((unsigned long)&optprobe_template_end -	\

	  (unsigned long)&optprobe_template_entry) +	\

	(((unsigned long)optprobe_template_end -	\

	  (unsigned long)optprobe_template_entry) +	\

	 MAX_OPTIMIZED_LENGTH + RELATIVEJUMP_SIZE)



extern const int kretprobe_blacklist_size;

arch/x86/kernel/kprobes/opt.c

+4 −4
Original line number Diff line number Diff line
@@ -142,11 +142,11 @@ void optprobe_template_func(void); 
STACK_FRAME_NON_STANDARD(optprobe_template_func);



#define TMPL_MOVE_IDX \

	((long)&optprobe_template_val - (long)&optprobe_template_entry)

	((long)optprobe_template_val - (long)optprobe_template_entry)

#define TMPL_CALL_IDX \

	((long)&optprobe_template_call - (long)&optprobe_template_entry)

	((long)optprobe_template_call - (long)optprobe_template_entry)

#define TMPL_END_IDX \

	((long)&optprobe_template_end - (long)&optprobe_template_entry)

	((long)optprobe_template_end - (long)optprobe_template_entry)



#define INT3_SIZE sizeof(kprobe_opcode_t)
@@ -371,7 +371,7 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op, 
	}



	/* Copy arch-dep-instance from template */

	memcpy(buf, &optprobe_template_entry, TMPL_END_IDX);

	memcpy(buf, optprobe_template_entry, TMPL_END_IDX);



	/* Copy instructions into the out-of-line buffer */

	ret = copy_optimized_instructions(buf + TMPL_END_IDX, op->kp.addr,