From patchwork Mon Jul 19 14:52:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 479916 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4233806jao; Mon, 19 Jul 2021 08:31:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJySeRcieNvPKiA/NiPR583kVoyF1+Vu4ccpweqBFp6LKJQZnbu1XkxpNZwLiBwnAnACX8Wq X-Received: by 2002:a02:628b:: with SMTP id d133mr22342013jac.27.1626708677569; Mon, 19 Jul 2021 08:31:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626708677; cv=none; d=google.com; s=arc-20160816; b=vFtIXCAGwevSaEqwA4bLF9y1btZXlPu6zA/Koya0vj5kgJPE8a0iX9V0wQS+PhGsC7 VxY6+4ddUHD9V8cOPUpbJFskOV1BTLI13pxaQCmpsgBvzCXyNi4quwATmYVSw2w81KPH Lsv2fK3EqcGMEPxZPiheaQwPZHSAyLGjAogYORXCa/bL47NA/DptGgfVjUKeEUxmo/2e fw8wb7HIcQ7zDY6tWXFyNt/iqfBCj+Ns01W7mQezCGif3Dgeop60Ns6G6kat8sUGHLfK kZBJgQ9rGw4XVKxuMdHFj8/saFgP70dE+oUE6BCPhIZJ5Y+X8qVYPBbluggCuLVYQcE4 zuWw== 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=ddzDejFQtdVDsomywZh9efexG5nnKzJE1szHExEM7gwq12PVmHe/78vW7i+6K+jGqs b0E0tMRueqlJxONonOYpqQx+dkdhMP5iccxmyC0EV0Y5c6tvATO7YfsK7ZB3VgJ905EE uc6D5V01RbEbIY8uIh5KzbEADwb9PaTcd65QNxmlbp4PW9t5nlCE9+uNVFLw9bN8pZkE HIPEurw5Y5cpTBPPCJjAQ5MvJp+t8938JdC2NYavw/vBjhDiPIaPklqyFsb7/NEPz5ig PQ0k1YNzP84ftdPIdMQVDFf+x51BvYPNK/pdY+SW1CUp5HkwzZt3P3JaBXsFdj+UC0Zl u9mw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=loPWwSis; 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 g5si10245056ilk.74.2021.07.19.08.31.17; Mon, 19 Jul 2021 08:31:17 -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=loPWwSis; 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 S238433AbhGSOtm (ORCPT + 12 others); Mon, 19 Jul 2021 10:49:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:41944 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343929AbhGSOsg (ORCPT ); Mon, 19 Jul 2021 10:48:36 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 84A0661249; Mon, 19 Jul 2021 15:25:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626708331; bh=ofUSPjF/yzLP/MLlyjcF+HuRo4cIJ3w1XQeSscxrtvo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=loPWwSis47EBvjxTtxpJpj+GJtbHfOf+7IP7OpTN4xcgON8+K/zNUzD4xYcVRAwCn rDqP2i687epqRsijZwbwUoshULpnUvmkKAKkd+ygKbRXFF1jJ0I05rSuD0oq3bvm2j qKxgMenDhZpEFpK/+yqerZLor2+gEZQDRodkRxxU= 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.14 270/315] ARM: 9087/1: kprobes: test-thumb: fix for LLVM_IAS=1 Date: Mon, 19 Jul 2021 16:52:39 +0200 Message-Id: <20210719144952.300199182@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144942.861561397@linuxfoundation.org> References: <20210719144942.861561397@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)")