From patchwork Mon Jul 19 14:52:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 479888 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4221292jao; Mon, 19 Jul 2021 08:16:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwFFtL4V3lgvFdrls0dh/2sqtAYYSD8RgjIV49f5zU5toLdDo7SRAs6ULaarJL6TVGISrqg X-Received: by 2002:a05:6e02:1154:: with SMTP id o20mr17334940ill.168.1626707787861; Mon, 19 Jul 2021 08:16:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626707787; cv=none; d=google.com; s=arc-20160816; b=VPMUrDP2ir6cuufzwctJuFO7MeUJ2jofS2b/7y3Ep+m1SYtI3VyhG6MQvw7YvycBSu a+wAgxhZfuU3EfPC7ujGppTgaCNVARxpK8xfgFgOKTBhdawm7L9HuqoevdmzwMWJoymt 470O4jiqa81XfTRUvwB7lwYQkASAfnNpC0MXAzWPiKOJt+YAZ6Lnbe1E7oHKWKt+Z4rp 1exoUz8MIS2leqKEzBEHGOAKKhyFhuhznmMQcq3wri+JPy6K1tIY1RHSZ8zuw92djSPi wyiApDSSej9aKHbOh/iDwNdQnTl0X8wehpZBQFKe5RBf2d8rPcXjkaobemWXjwXC88tL 7NAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=IKDK2gTiTYuU0ijfpzdwYPO6mzENNmaXDnJo6e5jwD4=; b=vXfogEF2KurfWUceELFzmfUOFIrWwTtgz8Q8V0piM53GC0ispsBb0iYAw6vT6+WrtV Kuz4jXSW7OzadQJeZFHgVwGsTHTJPd5ENxPiFqKHygB3DMAOPDI1362GkYKTMYJmFeXB pMoUAiRvrTk3/qFf9Zbl58fBKedHS2i6G+WdwQQqW3iev1Arzw7FsFjZCy0K9NkSJi/0 0pymxh502so5dN7LfQTfAUOomWurVNHRdOeg7gNF5qBHbLzULlbxIT/6aj7xpAKeWwI6 AbQzrPq2BP3+pob1OzuMG59ee6Qpfjj8QD9Q6kfibg06ONt4qmfih4VlDO+zc55cATYE QA3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=MQGC2tdW; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t25si10528964ios.38.2021.07.19.08.16.27; Mon, 19 Jul 2021 08:16:27 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=MQGC2tdW; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242341AbhGSOfp (ORCPT + 12 others); Mon, 19 Jul 2021 10:35:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:46936 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243636AbhGSOd6 (ORCPT ); Mon, 19 Jul 2021 10:33:58 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 19A1E61186; Mon, 19 Jul 2021 15:13:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626707599; bh=ofUSPjF/yzLP/MLlyjcF+HuRo4cIJ3w1XQeSscxrtvo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MQGC2tdWSCRGaSWbeYm4Dk54cyg8k6lyyr/MuAzCr3V7Hxb77zVsospfIdAOsaCEN APbzhuTnDEupX1xXMyZR0W4kFJeIqGRLmOLrjtPXpCbIXRa5VYl/PbxmUf7gfxJGnh wQE1OKerSQGedmik52opAoQnh3Qml4A8vpJP1qec= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nick Desaulniers , Jian Cai , Russell King , Sasha Levin Subject: [PATCH 4.9 211/245] ARM: 9087/1: kprobes: test-thumb: fix for LLVM_IAS=1 Date: Mon, 19 Jul 2021 16:52:33 +0200 Message-Id: <20210719144947.218914741@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144940.288257948@linuxfoundation.org> References: <20210719144940.288257948@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Nick Desaulniers [ Upstream commit 8b95a7d90ce8160ac5cffd5bace6e2eba01a871e ] There's a few instructions that GAS infers operands but Clang doesn't; from what I can tell the Arm ARM doesn't say these are optional. F5.1.257 TBB, TBH T1 Halfword variant F5.1.238 STREXD T1 variant F5.1.84 LDREXD T1 variant Link: https://github.com/ClangBuiltLinux/linux/issues/1309 Signed-off-by: Nick Desaulniers Reviewed-by: Jian Cai Signed-off-by: Russell King Signed-off-by: Sasha Levin --- arch/arm/probes/kprobes/test-thumb.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -- 2.30.2 diff --git a/arch/arm/probes/kprobes/test-thumb.c b/arch/arm/probes/kprobes/test-thumb.c index b683b4517458..4254391f3906 100644 --- a/arch/arm/probes/kprobes/test-thumb.c +++ b/arch/arm/probes/kprobes/test-thumb.c @@ -444,21 +444,21 @@ void kprobe_thumb32_test_cases(void) "3: mvn r0, r0 \n\t" "2: nop \n\t") - TEST_RX("tbh [pc, r",7, (9f-(1f+4))>>1,"]", + TEST_RX("tbh [pc, r",7, (9f-(1f+4))>>1,", lsl #1]", "9: \n\t" ".short (2f-1b-4)>>1 \n\t" ".short (3f-1b-4)>>1 \n\t" "3: mvn r0, r0 \n\t" "2: nop \n\t") - TEST_RX("tbh [pc, r",12, ((9f-(1f+4))>>1)+1,"]", + TEST_RX("tbh [pc, r",12, ((9f-(1f+4))>>1)+1,", lsl #1]", "9: \n\t" ".short (2f-1b-4)>>1 \n\t" ".short (3f-1b-4)>>1 \n\t" "3: mvn r0, r0 \n\t" "2: nop \n\t") - TEST_RRX("tbh [r",1,9f, ", r",14,1,"]", + TEST_RRX("tbh [r",1,9f, ", r",14,1,", lsl #1]", "9: \n\t" ".short (2f-1b-4)>>1 \n\t" ".short (3f-1b-4)>>1 \n\t" @@ -471,10 +471,10 @@ void kprobe_thumb32_test_cases(void) TEST_UNSUPPORTED("strexb r0, r1, [r2]") TEST_UNSUPPORTED("strexh r0, r1, [r2]") - TEST_UNSUPPORTED("strexd r0, r1, [r2]") + TEST_UNSUPPORTED("strexd r0, r1, r2, [r2]") TEST_UNSUPPORTED("ldrexb r0, [r1]") TEST_UNSUPPORTED("ldrexh r0, [r1]") - TEST_UNSUPPORTED("ldrexd r0, [r1]") + TEST_UNSUPPORTED("ldrexd r0, r1, [r1]") TEST_GROUP("Data-processing (shifted register) and (modified immediate)")