From patchwork Mon Jul 19 14:51:46 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: 480005 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4276404jao; Mon, 19 Jul 2021 09:17:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwbSNNZCdwuWkOi/8oBig4WmzEqdCeOjxqzskST6gxm7FW1tXPCODOxe3S5tAb335b1XnWB X-Received: by 2002:aa7:c2c4:: with SMTP id m4mr35958731edp.173.1626711451460; Mon, 19 Jul 2021 09:17:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626711451; cv=none; d=google.com; s=arc-20160816; b=DfBrKOsk/aq5oD2uJOVuSahxIxeUahsr8kk31MM7gWwAyjceGkl1Fkz7yWxaTQk6y+ db6QjCnYCn0569nynQ3mt5HKWXSOhjyQbaST53A8D4DgP8pv4dJ5Rsp8fMW5M59cmGtO apVQ/EYZHl0XZKNVomuz4jMqIlz23lwuWXUOgP3eF6p/fwOlOcW6O+bEOLFZPPcpM0CS ynk3sXI8JBsxJjx8x1upe9n+S+R2V0kHw0Q1zP3KzwC9DbxKPScDa7p2jpSBzzZC6adI aTubNkV9Uf3f6DQ4YUVIyeH2SnS9sMn+1Ys2uarE/fIgr5IloLAQM4MgQZk6pbXqD7x1 eaEA== 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=b1fD84LZQ9yf3JBffMFEYYSC/NG55o1vIT82EyFMPcWqDL524Ct5EhmIi4kydZBox1 JVmZidpHFLBybSgHUQzPLqlYNTrDN8OeW9XXsE2QyuwITM/zwDzGcju0lj6nSyL2mXmt i2/geiqacrlO4XPZ7RHFGWtC17brXh1GgelcGXU11UPtKlTtpp2TimKnpjsy1LxmvX6X lmukWp/LyWf3GRpuEDojIq+eOhtoNltmQGHIdtaVhsS5O1UA94DP81esLmYeY+33dQbA Z2YtftdaHzDZH0UPOEe7GF39FapW+1O+czaY2zWtW5ZWvHwR5jQ8lssmsTvkBegs1ifN wgfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=KLQqsV0x; 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.17.31; Mon, 19 Jul 2021 09:17:31 -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=KLQqsV0x; 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 S229916AbhGSPcd (ORCPT + 12 others); Mon, 19 Jul 2021 11:32:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:46396 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347180AbhGSP2O (ORCPT ); Mon, 19 Jul 2021 11:28:14 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3E496613E9; Mon, 19 Jul 2021 16:08:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626710926; bh=NVlw8FdD1InjhL9vfc52dDxWF+C4FWMDMsiClR8WO7w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KLQqsV0x4+rD92uP8PrkBCl5yr4z8sXGlWdrhi9GUjiEue3wgb59WFGH0WUKuB4+K 7hRbBZaJ+H9ueZ1yegqSFMDLNwYncAqz8VK8ZKVXw6GdQAr87f1HAVy+2CgU0Dl3lu B5vgvYZFAHYkrS+RAA61TTNAArTr/dvTrKVS8Rmo= 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.13 160/351] ARM: 9087/1: kprobes: test-thumb: fix for LLVM_IAS=1 Date: Mon, 19 Jul 2021 16:51:46 +0200 Message-Id: <20210719144950.264511432@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144944.537151528@linuxfoundation.org> References: <20210719144944.537151528@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)")