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

Commit cbf6ab52 authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Jon Medhurst
Browse files

kprobes: Pass the original kprobe for preparing optimized kprobe 



Pass the original kprobe for preparing an optimized kprobe arch-dep
part, since for some architecture (e.g. ARM32) requires the information
in original kprobe.

Signed-off-by: default avatarMasami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Signed-off-by: default avatarWang Nan <wangnan0@huawei.com>
Signed-off-by: default avatarJon Medhurst <tixy@linaro.org>
parent 8d257e95

arch/x86/kernel/kprobes/opt.c

+2 −1
Original line number Diff line number Diff line
@@ -322,7 +322,8 @@ void arch_remove_optimized_kprobe(struct optimized_kprobe *op) 
 * Target instructions MUST be relocatable (checked inside)

 * This is called when new aggr(opt)probe is allocated or reused.

 */

int arch_prepare_optimized_kprobe(struct optimized_kprobe *op)

int arch_prepare_optimized_kprobe(struct optimized_kprobe *op,

				  struct kprobe *__unused)

{

	u8 *buf;

	int ret;

include/linux/kprobes.h

+2 −1
Original line number Diff line number Diff line
@@ -308,7 +308,8 @@ struct optimized_kprobe { 
/* Architecture dependent functions for direct jump optimization */

extern int arch_prepared_optinsn(struct arch_optimized_insn *optinsn);

extern int arch_check_optimized_kprobe(struct optimized_kprobe *op);

extern int arch_prepare_optimized_kprobe(struct optimized_kprobe *op);

extern int arch_prepare_optimized_kprobe(struct optimized_kprobe *op,

					 struct kprobe *orig);

extern void arch_remove_optimized_kprobe(struct optimized_kprobe *op);

extern void arch_optimize_kprobes(struct list_head *oplist);

extern void arch_unoptimize_kprobes(struct list_head *oplist,

kernel/kprobes.c

+2 −2
Original line number Diff line number Diff line
@@ -717,7 +717,7 @@ static void prepare_optimized_kprobe(struct kprobe *p) 
	struct optimized_kprobe *op;



	op = container_of(p, struct optimized_kprobe, kp);

	arch_prepare_optimized_kprobe(op);

	arch_prepare_optimized_kprobe(op, p);

}



/* Allocate new optimized_kprobe and try to prepare optimized instructions */
@@ -731,7 +731,7 @@ static struct kprobe *alloc_aggr_kprobe(struct kprobe *p) 


	INIT_LIST_HEAD(&op->list);

	op->kp.addr = p->addr;

	arch_prepare_optimized_kprobe(op);

	arch_prepare_optimized_kprobe(op, p);



	return &op->kp;

}