Uses ftrace_process_loc_early() introduced by previous patch to convert ftrace entries to nops before ftrace_init(). For x86, original kprobe entries are 'call' and are optimizable only after this conversion.
Signed-off-by: Wang Nan <wangn...@huawei.com> --- kernel/kprobes.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kernel/kprobes.c b/kernel/kprobes.c index 56fb8c8..1ec8e6e 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -1602,6 +1602,9 @@ int register_kprobe(struct kprobe *p) goto out; } + if (p->flags & KPROBE_FLAG_FTRACE_EARLY) + ftrace_process_loc_early((unsigned long)p->addr); + mutex_lock(&text_mutex); /* Avoiding text modification */ ret = prepare_kprobe(p); mutex_unlock(&text_mutex); -- 1.8.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/