From patchwork Mon Jul 19 14:52:54 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: 479965 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4249602jao; Mon, 19 Jul 2021 08:47:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwGRAk52EDicTLnxY/zNTrZx8oIU6kpPT2lj2/KPTMnmR5NdhWjp4Z27GCeFk21vGv/Glst X-Received: by 2002:a50:fb18:: with SMTP id d24mr34117971edq.311.1626709645021; Mon, 19 Jul 2021 08:47:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626709645; cv=none; d=google.com; s=arc-20160816; b=qwhJKC8zKCz1sMdYyn4UVi7Zjd8tESmDadgWKzx7UaHoEmoym+6Zr2mdXJW4PWc1Rs i2UBHFOA5qf92c/rxUSbe4zBLckc84vtMz7wndBXwAk+pzQPziXY4QNzxM3Wg+pxV7vo wWoRrlQLFpvZ3W4wpaaw2e6XcrNTlwMroSDUGgeOfipes3Ri97YjYi3l/1r/iSWyeU96 ghWappnVUIQpdxINULjj5ggaUniRew+z2xWp1Tm8S0tVB5lQFQWNl/qf35zU8FrrcnhU hQegw2PiAbYDX2C92VfNZGyZJf1iy/Vx6100P2xuebr0spKVKDfMBn8lw9+bMBfuqI5w 36EA== 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=ny7E11miJgn3wIzEO0leQ2mmSf1aUSTLqFDWPl+Nm8NEzQKyBqqJ+OY3Gm9EATbHLa zNzkp5mopv/obTkKMBWAFbQ1R90B9qHoUW9hrjRp/oL2RXJyE4meyE2CIKC1SsXVj/gN TCxjeC6eXsomZ2PGrzZIf870J+3lmIZFnFgquZqhAFNI15g/PUnYL2Y+2vgGsuNjHxbX ekhswF6bSsN45UWWdvUpYqGpUBj/CtiUO0qhTMxV2v++s5yW7RffxlLRulLXQzZYrilj /f2PbMrMdDsBL4AT2HV1Va1zjyucFoqF37j0eaFdjOBUc3DQU/Od55SK2y5+yqGpJB1v QeAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=wq6zxlpY; 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 z11si402714edb.95.2021.07.19.08.47.24; Mon, 19 Jul 2021 08:47:25 -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=wq6zxlpY; 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 S1344357AbhGSPGg (ORCPT + 12 others); Mon, 19 Jul 2021 11:06:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:32768 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345423AbhGSPEX (ORCPT ); Mon, 19 Jul 2021 11:04:23 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 09D7C61357; Mon, 19 Jul 2021 15:43:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626709429; bh=ofUSPjF/yzLP/MLlyjcF+HuRo4cIJ3w1XQeSscxrtvo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wq6zxlpYPqmIH0AUpZkgJEV3sTTGtPTW9Rxu7seIMXJLXcau29MYNrUF1J4rYwnI6 gwlI92a8doceBc/cJieL7nE/KJmQWoPZRTCPyvsJScoMbgGBGZrnb0fyRr2emUKt5F ivHC6OhgaydMg2xo/mQroDAHZPqDXoutQFE0WUEk= 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.19 363/421] ARM: 9087/1: kprobes: test-thumb: fix for LLVM_IAS=1 Date: Mon, 19 Jul 2021 16:52:54 +0200 Message-Id: <20210719144958.831663650@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144946.310399455@linuxfoundation.org> References: <20210719144946.310399455@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)")