From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A1AB9C433F5 for ; Fri, 11 Mar 2022 17:09:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Date:Message-Id:MIME-Version:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=ZAFJP9jbkT6rWztogpqlllS54Uz84FGbI/FoNRI70dQ=; b=QQ1eW4caDYYGud QEmrIBXAFam5jzLsUfwlqcLE0v1WGv2gp5i8EKB3BBrEUx+QdJO1G25+274k/DsPoKXDuH9OoaByf RrCgO5iCyklvXEW8HyNpPWQ4GpQPKox2/si7QOcz5iVYXe9zNF0wNhxm+oIluFgwiwiEgkwadlfMI h2j4wk1qAuYHVkaquAc1WkbF+qDZ9opFk2tfeZAxDd2vix2neY6UR47NiuOYCyTWVCH0Th1I9FxZv Mpj6Uw+V6QpbiPQmNUhai0fXWr68nqPyVEZleD8z0lFco14zjoWqXU5rannusd4159eK75WGfmQlL 2fYfWCAOnKwSOAGaNd8A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nSikU-00HRuM-E9; Fri, 11 Mar 2022 17:08:18 +0000 Received: from pandora.armlinux.org.uk ([2001:4d48:ad52:32c8:5054:ff:fe00:142]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nSikP-00HRqt-M2 for linux-arm-kernel@lists.infradead.org; Fri, 11 Mar 2022 17:08:15 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2019; h=Date:Sender:Message-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:Subject:Cc:To:From:Reply-To:Content-ID :Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To: Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=GkSJkKgeWrIKD8qrW0VlK81pjf995LhSuPZpbPOK6zc=; b=A0puMji/BqAfj6E8safboU6gDD At/XJUakbzvQBW+mpthXOlLl6MtZaYAK5c3tFEoigdGx1sCwD76FZmXC5ZIkG5SA42lmuFS5MVl8l 4Nc/2rZIORHHSU+IYSnb2/O28HzgC3B6npbBp1JdDLsT+0+ZfZLQmceom87EHWogzOGDtZXZDApM9 yACRuh604o5pxhw806+W6u2TTFbTmR+Mr9PJEjI829zTUxXuZxDOlgmkR1KfQe2N7dCef3GMtpKI0 +wH0lb705HIkSdqhxE1Q713cipXYDxM8vOJN0jHD8P0B9uztEBel4D4UnbA/p/qPLjwvo58J0uGjS QzZ2R7OA==; Received: from e0022681537dd.dyn.armlinux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:56250 helo=rmk-PC.armlinux.org.uk) by pandora.armlinux.org.uk with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nSikK-0000TT-Qr; Fri, 11 Mar 2022 17:08:08 +0000 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.94.2) (envelope-from ) id 1nSikJ-0016PS-RU; Fri, 11 Mar 2022 17:08:07 +0000 From: "Russell King (Oracle)" To: Linus Torvalds Cc: linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: fix Thumb2 regression with Spectre BHB MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Fri, 11 Mar 2022 17:08:07 +0000 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220311_090813_748087_4C2845BF X-CRM114-Status: GOOD ( 10.71 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org When building for Thumb2, the vectors make use of a local label. Sadly, the Spectre BHB code also uses a local label with the same number which results in the Thumb2 reference pointing at the wrong place. Fix this by changing the number used for the Spectre BHB local label. Tested-by: Nathan Chancellor Signed-off-by: Russell King (Oracle) --- arch/arm/kernel/entry-armv.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index faa0ca2ba576..63a9d59478fa 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -962,9 +962,9 @@ ENDPROC(vector_\name) @ bhb workaround mov r0, #8 -1: b . + 4 +3: b . + 4 subs r0, r0, #1 - bne 1b + bne 3b dsb isb b 2b -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel