From patchwork Tue Mar 3 05:09:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Nan X-Patchwork-Id: 5919991 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0A7429FB2D for ; Tue, 3 Mar 2015 05:13:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 40EB8202B8 for ; Tue, 3 Mar 2015 05:13:46 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 29C8E20295 for ; Tue, 3 Mar 2015 05:13:45 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YSf75-0006eV-K7; Tue, 03 Mar 2015 05:11:23 +0000 Received: from szxga02-in.huawei.com ([119.145.14.65]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YSf6Q-00057u-TK for linux-arm-kernel@lists.infradead.org; Tue, 03 Mar 2015 05:10:45 +0000 Received: from 172.24.2.119 (EHLO lggeml425-hub.china.huawei.com) ([172.24.2.119]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CHX55549; Tue, 03 Mar 2015 13:09:42 +0800 (CST) Received: from kernel-host.huawei (10.107.197.247) by lggeml425-hub.china.huawei.com (10.72.61.35) with Microsoft SMTP Server id 14.3.158.1; Tue, 3 Mar 2015 13:09:31 +0800 From: Wang Nan To: , , , , Subject: [PATCH 1/3] early kprobes: make kprobes_on_ftrace_initialized public available. Date: Tue, 3 Mar 2015 13:09:03 +0800 Message-ID: <1425359345-38714-2-git-send-email-wangnan0@huawei.com> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1425359345-38714-1-git-send-email-wangnan0@huawei.com> References: <1425306312-3437-1-git-send-email-wangnan0@huawei.com> <1425359345-38714-1-git-send-email-wangnan0@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.107.197.247] X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150302_211043_580817_5AA2006D X-CRM114-Status: UNSURE ( 8.48 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.3 (--) Cc: x86@kernel.org, lizefan@huawei.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP That var is useful for x86 recover_probed_instruction() for recovering ftraced instructions, to make it possible to determine whether the instruction has been converted to nop by ftrace. I will merge this patch into next version of early kprobe series. Signed-off-by: Wang Nan --- include/linux/kprobes.h | 3 +++ kernel/kprobes.c | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h index 2d78bbb..24eac73 100644 --- a/include/linux/kprobes.h +++ b/include/linux/kprobes.h @@ -288,6 +288,8 @@ extern const unsigned char *arch_kprobe_on_ftrace_get_old_insn(struct kprobe *kp const unsigned char *ftrace_nop, unsigned char *dest, size_t insn_size); extern void init_kprobes_on_ftrace(void); +extern bool kprobes_on_ftrace_initialized __read_mostly; + extern bool kprobe_fix_ftrace_make_nop(struct dyn_ftrace *rec); extern const unsigned char *kprobe_on_ftrace_get_old_insn(struct dyn_ftrace *rec, const unsigned char *ftrace_nop, unsigned char *dest, size_t insn_size); @@ -295,6 +297,7 @@ extern const unsigned char *kprobe_on_ftrace_get_old_insn(struct dyn_ftrace *rec static inline void init_kprobes_on_ftrace(void) { } +#define kprobes_on_ftrace_initialized true static inline bool kprobe_fix_ftrace_make_nop(struct dyn_ftrace *_unused) { diff --git a/kernel/kprobes.c b/kernel/kprobes.c index 1ec8e6e..2d4e671 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -70,9 +70,7 @@ static int kprobes_initialized; static int kprobes_blacklist_initialized; #if defined(CONFIG_KPROBES_ON_FTRACE) && defined(CONFIG_EARLY_KPROBES) -static bool kprobes_on_ftrace_initialized __read_mostly = false; -#else -# define kprobes_on_ftrace_initialized false +bool kprobes_on_ftrace_initialized __read_mostly = false; #endif bool kprobes_is_early(void)