From patchwork Mon Aug 29 12:34:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tixy X-Patchwork-Id: 1107692 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p7TCZtJ2017442 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 29 Aug 2011 12:36:16 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qy13z-0004Y6-El; Mon, 29 Aug 2011 12:35:40 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Qy13y-0000oI-WF; Mon, 29 Aug 2011 12:35:39 +0000 Received: from smarthost02.mail.zen.net.uk ([212.23.3.141]) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Qy12h-0000fR-89 for linux-arm-kernel@lists.infradead.org; Mon, 29 Aug 2011 12:34:22 +0000 Received: from [82.69.122.217] (helo=plug1) by smarthost02.mail.zen.net.uk with esmtpsa (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.63) (envelope-from ) id 1Qy12f-0004id-G1 for linux-arm-kernel@lists.infradead.org; Mon, 29 Aug 2011 12:34:17 +0000 Received: from [192.168.2.20] (helo=computer2) by plug1 with esmtp (Exim 4.72) (envelope-from ) id 1Qy12e-0002pU-9g for linux-arm-kernel@lists.infradead.org; Mon, 29 Aug 2011 13:34:16 +0100 Received: from tixy by computer2 with local (Exim 4.72) (envelope-from ) id 1Qy12e-0000GM-6z for linux-arm-kernel@lists.infradead.org; Mon, 29 Aug 2011 13:34:16 +0100 From: Tixy To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 06/10] ARM: kprobes: Add exports for test code Date: Mon, 29 Aug 2011 13:34:05 +0100 Message-Id: <1314621249-958-7-git-send-email-tixy@yxit.co.uk> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1314621249-958-1-git-send-email-tixy@yxit.co.uk> References: <1314621249-958-1-git-send-email-tixy@yxit.co.uk> X-Originating-Smarthost02-IP: [82.69.122.217] X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110829_083419_605415_698EFDD3 X-CRM114-Status: GOOD ( 17.00 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.23.3.141 listed in list.dnswl.org] X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Mon, 29 Aug 2011 12:36:16 +0000 (UTC) From: Jon Medhurst The test code will be using kprobes' internal decoding tables so we need to export these for when then the tests are compiled as a module. Signed-off-by: Jon Medhurst --- arch/arm/kernel/kprobes.h | 21 +++++++++++++++++++++ arch/arm/kernel/kprobes-arm.c | 2 ++ arch/arm/kernel/kprobes-thumb.c | 3 +++ 3 files changed, 26 insertions(+), 0 deletions(-) diff --git a/arch/arm/kernel/kprobes.h b/arch/arm/kernel/kprobes.h index a6aeda0..957c447 100644 --- a/arch/arm/kernel/kprobes.h +++ b/arch/arm/kernel/kprobes.h @@ -417,4 +417,25 @@ int kprobe_decode_insn(kprobe_opcode_t insn, struct arch_specific_insn *asi, const union decode_item *table, bool thumb16); + +#ifdef CONFIG_ARM_KPROBES_TESTS + +/* Declare decoding tables for access by test code */ +#ifdef CONFIG_THUMB2_KERNEL +extern const union decode_item kprobe_decode_thumb16_table[]; +extern const union decode_item kprobe_decode_thumb32_table[]; +#else +extern const union decode_item kprobe_decode_arm_table[]; +#endif + +#define EXPORT_KPROBES_TEST_SYMBOL(sym) EXPORT_SYMBOL_GPL(sym) + +#else /* !CONFIG_ARM_KPROBES_TESTS */ + +/* No test exports required */ +#define EXPORT_KPROBES_TEST_SYMBOL(sym) + +#endif + + #endif /* _ARM_KERNEL_KPROBES_H */ diff --git a/arch/arm/kernel/kprobes-arm.c b/arch/arm/kernel/kprobes-arm.c index 79203ee..7192f21 100644 --- a/arch/arm/kernel/kprobes-arm.c +++ b/arch/arm/kernel/kprobes-arm.c @@ -60,6 +60,7 @@ #include #include +#include #include "kprobes.h" @@ -971,6 +972,7 @@ const union decode_item kprobe_decode_arm_table[] = { DECODE_END }; +EXPORT_KPROBES_TEST_SYMBOL(kprobe_decode_arm_table); static void __kprobes arm_singlestep(struct kprobe *p, struct pt_regs *regs) { diff --git a/arch/arm/kernel/kprobes-thumb.c b/arch/arm/kernel/kprobes-thumb.c index 902ca59..ab6be05 100644 --- a/arch/arm/kernel/kprobes-thumb.c +++ b/arch/arm/kernel/kprobes-thumb.c @@ -10,6 +10,7 @@ #include #include +#include #include "kprobes.h" @@ -943,6 +944,7 @@ const union decode_item kprobe_decode_thumb32_table[] = { */ DECODE_END }; +EXPORT_KPROBES_TEST_SYMBOL(kprobe_decode_thumb32_table); static void __kprobes t16_simulate_bxblx(struct kprobe *p, struct pt_regs *regs) @@ -1423,6 +1425,7 @@ const union decode_item kprobe_decode_thumb16_table[] = { DECODE_END }; +EXPORT_KPROBES_TEST_SYMBOL(kprobe_decode_thumb16_table); static unsigned long __kprobes thumb_check_cc(unsigned long cpsr) {