From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932959Ab2HVPT1 (ORCPT ); Wed, 22 Aug 2012 11:19:27 -0400 Received: from moutng.kundenserver.de ([212.227.126.186]:51753 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932663Ab2HVPTX convert rfc822-to-8bit (ORCPT ); Wed, 22 Aug 2012 11:19:23 -0400 From: Arnd Bergmann To: Nicolas Pitre Subject: Re: [PATCH 4/4] ARM: kprobes: make more tests conditional Date: Wed, 22 Aug 2012 15:19:11 +0000 User-Agent: KMail/1.12.2 (Linux/3.5.0; KDE/4.3.2; x86_64; ; ) Cc: Russell King , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Jon Medhurst , Leif Lindholm References: <1345645780-2749-1-git-send-email-arnd@arndb.de> <1345645780-2749-5-git-send-email-arnd@arndb.de> In-Reply-To: MIME-Version: 1.0 Content-Type: Text/Plain; charset=US-ASCII Content-Transfer-Encoding: 7BIT Message-Id: <201208221519.12056.arnd@arndb.de> X-Provags-ID: V02:K0:rGHplbfSHwMLSXnqV3cFblfHeCqy3ePDS+l8mkl8sB4 NDlkHo5B7KewIp4pPwXuVQ0y2GfPkck8r03ZMqv06Pj9eGRUm1 QMlSOYU0Z3Gr4hanEg4PKcpyHhD5SlryqlMnxMmsmkPfoNoxki yTRlz26i9UJfduVEh/+d0xDmuWs8eWOTJpJhajbjYAD0aggZzE +wTACDsGFoJyhPl54bS4PWdQasfo2L2phhnV8S7oB81TLbT6JF 964KpaIGglrCaTRtHuQMYiWw22UEQRZ3ntTtpKIgRgf6/PcF2P suFlcz1yFuJxifU7/DnFYqR4adglq4roCe2ZTz0tMmQ7H0LxQp ym9zTl2mICXmTn3zywE0= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wednesday 22 August 2012, Nicolas Pitre wrote: > On Wed, 22 Aug 2012, Arnd Bergmann wrote: > > > The mls instruction is not available in ARMv6K or below, so we > > should make the test conditional on at least ARMv7. ldrex/strex > > are available in ARMv6K or ARMv7, which we can test by checking > > the CONFIG_CPU_32v6K symbol. Just testing for ARMv6 is not enough. > > The ldrex/strex instructions are available on ARMv6. It's only the d > variants (strexd/ldrexd) which are only available from ARMv6k. Ok. How is the version below then? I haven't tested this one yet. Arnd 8<--- >>From d878ab212cf0ac1957be83ad80dc734ace2b476c Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Thu, 16 Aug 2012 07:49:31 +0000 Subject: [PATCH] ARM: kprobes: make more tests conditional The mls instruction is not available in ARMv6K or below, so we should make the test conditional on at least ARMv7. ldrexd/strexd are available in ARMv6K or ARMv7, which we can test by checking the CONFIG_CPU_32v6K symbol. Just testing for ARMv6 is not enough. /tmp/ccuMTZ8D.s: Assembler messages: /tmp/ccuMTZ8D.s:22188: Error: selected processor does not support ARM mode `mls r0,r1,r2,r3' /tmp/ccuMTZ8D.s:22222: Error: selected processor does not support ARM mode `mlshi r7,r8,r9,r10' /tmp/ccuMTZ8D.s:22252: Error: selected processor does not support ARM mode `mls lr,r1,r2,r13' Signed-off-by: Arnd Bergmann Cc: Jon Medhurst Cc: Russell King Cc: Nicolas Pitre Cc: Leif Lindholm --- arch/arm/kernel/kprobes-test-arm.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/kernel/kprobes-test-arm.c b/arch/arm/kernel/kprobes-test-arm.c index 38c1a3b..fc9f6e0 100644 --- a/arch/arm/kernel/kprobes-test-arm.c +++ b/arch/arm/kernel/kprobes-test-arm.c @@ -367,9 +367,11 @@ void kprobe_arm_test_cases(void) TEST_UNSUPPORTED(".word 0xe0500090 @ undef") TEST_UNSUPPORTED(".word 0xe05fff9f @ undef") +#if __LINUX_ARM_ARCH__ >= 7 TEST_RRR( "mls r0, r",1, VAL1,", r",2, VAL2,", r",3, VAL3,"") TEST_RRR( "mlshi r7, r",8, VAL3,", r",9, VAL1,", r",10, VAL2,"") TEST_RR( "mls lr, r",1, VAL2,", r",2, VAL3,", r13") +#endif TEST_UNSUPPORTED(".word 0xe06f3291 @ mls pc, r1, r2, r3") TEST_UNSUPPORTED(".word 0xe060329f @ mls r0, pc, r2, r3") TEST_UNSUPPORTED(".word 0xe0603f91 @ mls r0, r1, pc, r3") @@ -456,8 +458,10 @@ void kprobe_arm_test_cases(void) TEST_UNSUPPORTED(".word 0xe1700090") /* Unallocated space */ #if __LINUX_ARM_ARCH__ >= 6 TEST_UNSUPPORTED("ldrex r2, [sp]") +#ifdef CONFIG_CPU_32v6K TEST_UNSUPPORTED("strexd r0, r2, r3, [sp]") TEST_UNSUPPORTED("ldrexd r2, r3, [sp]") +#endif TEST_UNSUPPORTED("strexb r0, r2, [sp]") TEST_UNSUPPORTED("ldrexb r2, [sp]") TEST_UNSUPPORTED("strexh r0, r2, [sp]") -- 1.7.10