From patchwork Mon Jul 19 14:53:03 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: 479976 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4253072jao; Mon, 19 Jul 2021 08:51:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxKpwqv+Xmv4qa+q7gbztsdDOQnLZHTHNavLo1eZ+kCXtfEatlizF6nuvq5cai3D/3qXlbp X-Received: by 2002:a17:906:2541:: with SMTP id j1mr2725363ejb.128.1626709890918; Mon, 19 Jul 2021 08:51:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626709890; cv=none; d=google.com; s=arc-20160816; b=jaEZTh4buutl3SZTCQwhPQeqMFbmtLZMHJhH7C13qIKIGTd1rNNVpea5Ict/5lDUUa epEcn76aawu9TgnkmbtC17Jgwqv1OR9cjA4mVuD22b8yrymdMREYWnqdEW90Y7lYy3oo jBLrufhYuTEv8smIcXQStxcLqn2YbYLNZZ4qHT4RLhbQkdyRxxmGOMY8QHE8+Z1BDsvD EVjT8UgmLg90NLogkqxVph0ZNc9FZAeOnAL9mPokvKwZImyVCs4tnvZCUhsnT+/7Y3AQ SxfsLIeCkiDO6qHYN+DaKo8gH8QXdivwQ/b55ukDLf0XTEOGXhhwJY/zYrnzMXkO4rx8 KJbw== 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=zX2bNYBBI+HWRUBmez1ksf6U2qYz0iVYZ+ZBFfcXHhY0bAmd8ACYeRklWX70u3vY4V GHXPfhGj5WTotZ0xe41GfXLtxJcC72W88NFCusD7J0MZ202cWYCgHCQIhqfUcia4QkzO YnJN2IDEqmzJxvJchmoYJ6Nf75/JCXQc+tyoLJYICbb+DHk23Mxpe0rkv90YJpK8A6EZ uVANsjW473DaIOHN0modmw705CX1ZC7UV+9+sFZpPpBlzvQL7c/Zt8fiXaJWvr/3yjUY D8/EHZTNkSUnr63Ht6aGrtmWT1L8rCB8sZ2DAW5e235u8YODo4ss7sawkpCPGR+jziRx GyFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=sYWQ2rBU; 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 nc28si19869443ejc.235.2021.07.19.08.51.30; Mon, 19 Jul 2021 08:51:30 -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=sYWQ2rBU; 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 S1345427AbhGSPKl (ORCPT + 12 others); Mon, 19 Jul 2021 11:10:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:39054 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345465AbhGSPJX (ORCPT ); Mon, 19 Jul 2021 11:09:23 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2A155608FC; Mon, 19 Jul 2021 15:48:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626709731; bh=NVlw8FdD1InjhL9vfc52dDxWF+C4FWMDMsiClR8WO7w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sYWQ2rBUxJPkswnSwRMF+shqpszEY4rDjO1MBpF6v5rWL8layrDyK95urtFkkSk4m 2iUtcTrNCv7HnA1Q8NiqVSpanCibT5aVYAVzffjTURMEXZ4OuMMJfDnBkBAqc/MiPJ QbKe589hvK1KgL4qfb7X2/E4a72B6Ks8PZunSmXQ= 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.4 075/149] ARM: 9087/1: kprobes: test-thumb: fix for LLVM_IAS=1 Date: Mon, 19 Jul 2021 16:53:03 +0200 Message-Id: <20210719144919.033297424@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144901.370365147@linuxfoundation.org> References: <20210719144901.370365147@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)")