From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754808AbbCBO0z (ORCPT ); Mon, 2 Mar 2015 09:26:55 -0500 Received: from szxga03-in.huawei.com ([119.145.14.66]:4464 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754695AbbCBO0I (ORCPT ); Mon, 2 Mar 2015 09:26:08 -0500 From: Wang Nan To: , , , , CC: , , , Subject: [RFC PATCH v4 34/34] early kprobes: enable optimization of kprobes on ftrace before ftrace is ready. Date: Mon, 2 Mar 2015 22:25:12 +0800 Message-ID: <1425306312-3437-35-git-send-email-wangnan0@huawei.com> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1425306312-3437-1-git-send-email-wangnan0@huawei.com> References: <1425306312-3437-1-git-send-email-wangnan0@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.107.197.247] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020205.54F472FE.0299,ss=1,re=0.001,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 46a0922b5913386d016f539733f343c4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: wangnan0@huawei.com (Wang Nan) Date: Mon, 2 Mar 2015 22:25:12 +0800 Subject: [RFC PATCH v4 34/34] early kprobes: enable optimization of kprobes on ftrace before ftrace is ready. In-Reply-To: <1425306312-3437-1-git-send-email-wangnan0@huawei.com> References: <1425306312-3437-1-git-send-email-wangnan0@huawei.com> Message-ID: <1425306312-3437-35-git-send-email-wangnan0@huawei.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 --- 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