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 59320C433F5 for ; Mon, 28 Mar 2022 13:54:53 +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:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=UjN8OKCOM7SoBmFl3oP5IXVc9K4mjPcbAG7Y+VxE2QQ=; b=WxwCFpO6n5Hj6P X96d2STIGIZjEyQUts+rEp7d/KJazikns4PY3x0y7am6BOsF1U2B9gsgmjS7Dlfpj3604reRH/Kwq V6p7nZgoBwUpyzGBewA59oBVNJ4ICsb4u/f17ZVjp7IDojwx4goxIVcnl+Y0hCBAvmEUO7qfskUvN dvErnSFqaIZrKqIVHrURHsQkjw4yKYdT1X5XdQtsAqzQ4C6smPA7Khm+v0PZOP4azSNmj58phkWNr sAII7cxIo95UImYC09Xp/42AMDctbr7P91ol/DJ9D07YMclNMMAiE4BhGEXAEM/rYVZMl3l2eJts3 lpOvXpeAHv7h1uySxGsA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nYpoG-008vpM-LZ; Mon, 28 Mar 2022 13:53:28 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nYpiY-008tYW-JN for linux-arm-kernel@lists.infradead.org; Mon, 28 Mar 2022 13:47:39 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id BAB396118B; Mon, 28 Mar 2022 13:47:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 01833C34100; Mon, 28 Mar 2022 13:47:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648475253; bh=uRwjesyUFoE02KNN2FWoM2lztojvHbYBVAXaPv2ujL8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TX1YnQdQADiJBQxOF/yF6rMcKFHQepsIYNS9jYIHjVTRsMera8YW9OfMDYamSAK/b qwyv876UOZcGIS2T8tYeugfx//inHn0bihdudYK+RgoecNQjN71ImzFnTZoFgsPxr6 Fb+dV35zLzxUMyZM1eiEbKxD9GvLbWqO4TWSO2Gx7dlPOJD+KVAr48Wr/zplF3YRrr Mu8lmtLOdxOX/7vbVd4ivfzDBStr0wbQuaIxiM/SFxYTT+eVc/AK9HzNdpl5007zU0 3KNSMGf42ynrWdumpvVpcto/MSZHSGTuOCB8j3gfnSjJHa05vv8NrOj35P6MBNk48E rkrN7O+9Y0r5g== From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org, linux@armlinux.org.uk Cc: arnd@arndb.de, linus.walleij@linaro.org, Ard Biesheuvel Subject: [PATCH 5/6] ARM: spectre-bhb: avoid cross-subsection jump using a numbered label Date: Mon, 28 Mar 2022 15:47:13 +0200 Message-Id: <20220328134714.205342-6-ardb@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220328134714.205342-1-ardb@kernel.org> References: <20220328134714.205342-1-ardb@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1068; h=from:subject; bh=uRwjesyUFoE02KNN2FWoM2lztojvHbYBVAXaPv2ujL8=; b=owEB7QES/pANAwAKAcNPIjmS2Y8kAcsmYgBiQbxf5WdJN5+yZeulLZ+N14M3CkEdRb4V7wCYkBa1 loZw1kCJAbMEAAEKAB0WIQT72WJ8QGnJQhU3VynDTyI5ktmPJAUCYkG8XwAKCRDDTyI5ktmPJK9mDA DEj42GYJdHrrWY0MykaM2FVt7vwpm+2r6cWDhmmvOmGLDzUxGj1UcACp2ypDiJpbuxNS4/BRIHmg72 n1VVoH0/DSfPM9jXME8oeKcKbx/ikUy2SLRHXUALAepLhBsKEuJx6P8yZki0Ir+5GoEmlwpMjMCJ0W drV7DvcxPReXPKzhMNRpzwiC/OGmwdxO3YhqfxSNb+iGwjxQZKT4+YsAJBoDdJPUGfwmjaXnwDFGf7 SMpz5dZUwcbY1f+jFjAUuxqd4nBoycCdpw8EO7wE/1g9XBvL9vmWjt4rtKOG3ndB4nW/gABZ072dRN /cgj+TgzVIaM4547VGKVig4+JCfUwVZEK26g1fk4fEo9wbQUb6tc7084U8FMwsA/YTcd0bZFpgtXfM hAGJOmwCtwd8YfNzKCAz7XX2GgH2mGo8rnBQDXsLbzjg+9GkZxp8K3fK4+DH8tbAvlyIPIRUrE2+Xr 59JTr5jFT31w3vdgmdiMykAFEZ3yt2DguvjpDofjCOrMY= X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220328_064734_729668_D202D9D8 X-CRM114-Status: GOOD ( 10.61 ) 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 In order to minimize potential confusion regarding numbered labels appearing in a different order in the assembler output due to the use of subsections, use a named local label to jump back into the vector handler code from the associated loop8 mitigation sequence. Signed-off-by: Ard Biesheuvel --- arch/arm/kernel/entry-armv.S | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 3a62ee790b5e..d08e7f62ae57 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -1012,7 +1012,8 @@ vector_\name: stmia sp, {r0, lr} @ save r0, lr @ Save spsr_ (parent CPSR) -2: mrs lr, spsr +.L\name\@: + mrs lr, spsr str lr, [sp, #8] @ save spsr @ @@ -1052,7 +1053,7 @@ vector_bhb_loop8_\name: dsb nsh @ isb not needed due to "movs pc, lr" in the vector stub @ which gives a "context synchronisation". - b 2b + b .L\name\@ ENDPROC(vector_bhb_loop8_\name) .previous #endif -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel