leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kprobes/x86: Remove addressof() operators

Browse Source 
The following commit:

  54a7d50b92 ("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: Masami 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: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Masami Hiramatsu 2017-08-18 17:25:08 +09:00 committed by Ingo Molnar
parent 63fef14fc9
commit a8976fc84b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/include/asm/kprobes.h
View File

@ -58,8 +58,8 @@ extern __visible kprobe_opcode_t optprobe_template_call[];
extern __visible kprobe_opcode_t optprobe_template_end[]; 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 + RELATIVE_ADDR_SIZE)
#define MAX_OPTINSN_SIZE \ #define MAX_OPTINSN_SIZE \
(((unsigned long)&optprobe_template_end - \ (((unsigned long)optprobe_template_end - \
(unsigned long)&optprobe_template_entry) + \ (unsigned long)optprobe_template_entry) + \
MAX_OPTIMIZED_LENGTH + RELATIVEJUMP_SIZE) MAX_OPTIMIZED_LENGTH + RELATIVEJUMP_SIZE)
extern const int kretprobe_blacklist_size; extern const int kretprobe_blacklist_size;

8
arch/x86/kernel/kprobes/opt.c
View File

@ -142,11 +142,11 @@ void optprobe_template_func(void);
STACK_FRAME_NON_STANDARD(optprobe_template_func); STACK_FRAME_NON_STANDARD(optprobe_template_func);
#define TMPL_MOVE_IDX \ #define TMPL_MOVE_IDX \
((long)&optprobe_template_val - (long)&optprobe_template_entry) ((long)optprobe_template_val - (long)optprobe_template_entry)
#define TMPL_CALL_IDX \ #define TMPL_CALL_IDX \
((long)&optprobe_template_call - (long)&optprobe_template_entry) ((long)optprobe_template_call - (long)optprobe_template_entry)
#define TMPL_END_IDX \ #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) #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 */ /* 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 */ /* Copy instructions into the out-of-line buffer */
ret = copy_optimized_instructions(buf + TMPL_END_IDX, op->kp.addr, ret = copy_optimized_instructions(buf + TMPL_END_IDX, op->kp.addr,