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 E7F25C433F5 for ; Fri, 11 Mar 2022 17:14:27 +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=9AZ2Cc3wY7DZ6m8qb/Nw73GsG9uAeV3rzMFimZT84Uk=; b=ts+EiEfbYELJ6h /GzH1e/qgaUo6Xoayiabg1SV6XyBt/e5y6OauNuJyPsCXxOyFV/JD+zsTydx6MCNAgtUzEzrpZZd/ X7GRl9C8HpYzoksp2tnT3ZWVuveZMPk+GyuyO0F5n9YlybyksNaxa2ZTVLo4/qwEaGiYCF5hXEa2g QNdO1/OYSSh5v9GJiCg7eeBHd01wPfMhdFr30vF11eLgY+2583dbN2HyBkrQv5cvW6jJPDsNjHA20 sYhbt3Fd02+dfye9/MTzSan6WNF7zt10urTSb/LvrvFx7PGN4MRHrozthF0LfmO/925zaOFG991NV vAwSzcLCMvx/SpkH5W/g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nSipQ-00HSfK-OP; Fri, 11 Mar 2022 17:13:24 +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 1nSipM-00HSeI-Hf for linux-arm-kernel@lists.infradead.org; Fri, 11 Mar 2022 17:13:21 +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=/KIH54iyBLwBO9aIK5Ct/mzqtd34XRnrCR0UCFaofsg=; b=v2HL0IPfM1iMvM7efw8VwUH04V bF57ciCSCXhzYVNT5hML2yhK23Xum9R7NhoDKlwfJu3Rwau3xhjZI2OPqLfE4Cf06I5+G972a1twb jUqhg7o/Tar8WVo015vtJqc/f3QBTWqPkV8JrTIob1OCFVIobWiF/H8Z1iCUFSa1OXG32lnjkIzso lxZVVg9Zb9CC6PZRDAApUz5oYF+iD9M9n5nuD83GD84yOctR6fn0qSVoBMZn0ymZuTaJHZYxoSAjJ +gUgB+wiGTnRZcufK+8/Gmjko5DetYqAtaJmM3UB/YAQdHJXy4LfETXo3ixb2W3vRY8mcoOGKrhVH GHbW2h+w==; Received: from e0022681537dd.dyn.armlinux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:56256 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 1nSipK-0000Tu-HB; Fri, 11 Mar 2022 17:13:18 +0000 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.94.2) (envelope-from ) id 1nSipJ-0016Ss-Lu; Fri, 11 Mar 2022 17:13:17 +0000 From: "Russell King (Oracle)" To: Linus Torvalds Cc: , Catalin Marinas , linux-arm-kernel@lists.infradead.org Subject: [PATCH v2] ARM: fix Thumb2 regression with Spectre BHB MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Fri, 11 Mar 2022 17:13:17 +0000 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220311_091320_613029_9AE58DB3 X-CRM114-Status: GOOD ( 10.51 ) 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. Fixes: b9baf5c8c5c3 ("ARM: Spectre-BHB workaround") 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