From patchwork Mon Jul 19 14:52:28 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: 479990 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4267564jao; Mon, 19 Jul 2021 09:08:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx//DLvhs66yFG+vHbKw3pJGMCcexxjDtFcT4H5iYyrMrJGfFgdsm8Q5NDiBvNisLE6e8wE X-Received: by 2002:a17:906:8683:: with SMTP id g3mr28841340ejx.126.1626710883866; Mon, 19 Jul 2021 09:08:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626710883; cv=none; d=google.com; s=arc-20160816; b=Z5wpODK2FIXg0YHL+zTpNbq0I2W8Q7ACHtMpbZpp5XVzxEH9LLvk/KxcNmSsnK4ctv b/kbNSvQuIyNbblMUMJryJ1e1yi3hsO04U+WDK3hbA0WnvzzKH6HgtBbjAyPnfnGTc5y AU0E6NAvm1x4az5k6kX6u7Ppi0QcTEqqJUq+r0xixM999HNT/nrAyv6CLAKpn+Xh+AWt 3d2HhqIZ+NqTdMrPXO3x10dX0fqTX3qRm6FyCmjX9JfVYRtx92it8V1y4lV2B260pF0U M7sEW45RBeaanNDl1Q82kN93MTr5DNBuJR+1OqLASzaXIE/lkSx70TR+d+BlSQjirqql Ik+A== 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=083mBPceFLvczIxsrREP/5a7b+JLoEulMr/FMvDN5HM=; b=Ixsp8EZ2JjxJuon7AJZ3gwQ2rlJ829JRtmSmdyG0p6HmqysgTYjjZp3JY8dDYMb6Dn 19WaskARLHZZdzwQ/C0uEPIQ9W4Gjll9PzWPJInQM/t40f1Qrjim55qL05CLhdIF6RKP eDrYxzoItgY7dcKoTXgc4gr3K8hlqebJbEu0Amv1Oe5InBYQaZbN+oEYXNdqULcH1zG7 XzvZTo+AyvfPeCNrwoRtH50t0MspBRRHDvEPSyd9cW8KHmdKuCkfmt7Wd4D6vf9SUnNy R/JAJWEoYC7YEy4wmima4uz90BalKLGOc/1oVZiQpT8Q6ar0AZ+wWc1PgeLzlLBZsqVn PvJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=cCdTlfJL; 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 la14si22045543ejc.142.2021.07.19.09.08.03; Mon, 19 Jul 2021 09:08:03 -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=cCdTlfJL; 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 S1347493AbhGSPTQ (ORCPT + 12 others); Mon, 19 Jul 2021 11:19:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:56322 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344030AbhGSPQC (ORCPT ); Mon, 19 Jul 2021 11:16:02 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B5395600EF; Mon, 19 Jul 2021 15:56:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626710202; bh=NVlw8FdD1InjhL9vfc52dDxWF+C4FWMDMsiClR8WO7w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cCdTlfJLlZfSP2VnKPU6uqGOxRuRKBHgeyGtqWS41LWeKAbLReFKlSxKB2g3GdEdP 9N8tc43tCtldlDEzfVuoQPp6oR3UDUHNUVio3zqj8rBb0+T6KPCl9b5TvUcR0GQKMJ YdCZuvkdCPSh3UXzwXBvLJEuLVjac7kOPwM/GOY0= 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 5.10 119/243] ARM: 9087/1: kprobes: test-thumb: fix for LLVM_IAS=1 Date: Mon, 19 Jul 2021 16:52:28 +0200 Message-Id: <20210719144944.758853891@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144940.904087935@linuxfoundation.org> References: <20210719144940.904087935@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 456c181a7bfe..4e11f0b760f8 100644 --- a/arch/arm/probes/kprobes/test-thumb.c +++ b/arch/arm/probes/kprobes/test-thumb.c @@ -441,21 +441,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" @@ -468,10 +468,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)")