From patchwork Mon Jul 19 14:53:22 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: 480029 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4285494jao; Mon, 19 Jul 2021 09:28:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxHwsqQys4FUF/SLsNCMIy5KUYi/LUxNYQ+5Y3ZX0FjE3DyNUyMC2CWH3V5lYUdTc1R6kD0 X-Received: by 2002:a17:906:715b:: with SMTP id z27mr28391428ejj.523.1626712115411; Mon, 19 Jul 2021 09:28:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626712115; cv=none; d=google.com; s=arc-20160816; b=Q3KC6N8pKBJht9g9PgeCrX6AhJqYNGn/a659Okm01A379AT/lbJ9HuOjLaMtrVtSEX q8hj+QJT7iP5HgJx+V9psHLWI9Xnz8aIkFoGUOZADTIoUIVXs4abseNJZvJQ4vTiTBOV 7Bb3lT7ix4Z7YziErBzkyLtt/XJrq/5ThgToFLGaeTKZY0685JxRW7dewjWiVNNwo7a+ 0BDrvHQ/i7j3Cq6ttnROA6G52ayphasVUaiglgVjuuirkASoWllN4Wlqi7jR2RWFdbRu Ryfgzf0y5yfU7wV7eqOtzxSK7vq8CnjfTXtUlhuqMAE0VJTuzyz4MEoJO6cIgKSv5ZWa iQcA== 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=IAZqQof8RCz2o3qaqD4zeRLLyUmKza+HsBNWRQITqFHgRh/zQmO+NrVGYsQdkz5egm 9lKQbzo7mHgGQXxFn62xL6BElSiun26Ooin76T6gFtjboH64W7tzTwMJOHcBPYbAMpYa lzkekU671TiZILecR2AGsBf4qzqayOdRC6LuOR9bAgRFVWEHABUEUGGDdn3fhS6pSK6k NEyU/M2M+nekr3u1xWnn2mSVXirIrr9pWl2V8pffasYKik8NDXe0+FZmc0K0A4JFPa5b 48NBQOmoaAL8x4iQNMT1jkgWh4X7lW4sk1YRt51iAqkrN5nN18M72cBIA3OsLy8WXycj Xsmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=I6v2momc; 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.28.34; Mon, 19 Jul 2021 09:28:35 -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=I6v2momc; 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 S241169AbhGSPqj (ORCPT + 12 others); Mon, 19 Jul 2021 11:46:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:42206 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348950AbhGSPok (ORCPT ); Mon, 19 Jul 2021 11:44:40 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id F186F61580; Mon, 19 Jul 2021 16:23:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626711809; bh=NVlw8FdD1InjhL9vfc52dDxWF+C4FWMDMsiClR8WO7w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I6v2momcofytcQoa8dDS7kGJsm4gaVTxYtLEaivTMlwT48is7PR702JAsDcY5ypKp VTpNi1xjQUQ334F3krAF5hxJOK2NMUP5hoAAKoZGRh0/fXL7aKS4mX3qvR7VbCwbvF 6bkZZbm1lR3DgaitSW59wHbCF+oiKf+ieimx57Gs= 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.12 140/292] ARM: 9087/1: kprobes: test-thumb: fix for LLVM_IAS=1 Date: Mon, 19 Jul 2021 16:53:22 +0200 Message-Id: <20210719144947.089662289@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144942.514164272@linuxfoundation.org> References: <20210719144942.514164272@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)")