GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-03-30 10:55:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kprobes: Skip preparing optprobe if the probe is ftrace-based

Browse source 
Skip preparing optprobe if the probe is ftrace-based, since anyway, it
must not be optimized (or already optimized by ftrace).

Tested-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Masami Hiramatsu 2017-04-19 18:22:25 +05:30 • committed by Michael Ellerman
parent 97da3854c5
commit a460246c70
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
kernel/kprobes.c
View file

@ -746,13 +746,20 @@ static void kill_optimized_kprobe(struct kprobe *p)
arch_remove_optimized_kprobe(op); arch_remove_optimized_kprobe(op);
} }
static inline
void __prepare_optimized_kprobe(struct optimized_kprobe *op, struct kprobe *p)
{
if (!kprobe_ftrace(p))
arch_prepare_optimized_kprobe(op, p);
}
/* Try to prepare optimized instructions */ /* Try to prepare optimized instructions */
static void prepare_optimized_kprobe(struct kprobe *p) static void prepare_optimized_kprobe(struct kprobe *p)
{ {
struct optimized_kprobe *op; struct optimized_kprobe *op;
op = container_of(p, struct optimized_kprobe, kp); op = container_of(p, struct optimized_kprobe, kp);
arch_prepare_optimized_kprobe(op, p); __prepare_optimized_kprobe(op, p);
} }
/* Allocate new optimized_kprobe and try to prepare optimized instructions */ /* Allocate new optimized_kprobe and try to prepare optimized instructions */
@ -766,7 +773,7 @@ static struct kprobe *alloc_aggr_kprobe(struct kprobe *p)
INIT_LIST_HEAD(&op->list); INIT_LIST_HEAD(&op->list);
op->kp.addr = p->addr; op->kp.addr = p->addr;
arch_prepare_optimized_kprobe(op, p); __prepare_optimized_kprobe(op, p);
return &op->kp; return &op->kp;
} }