From: Ard Biesheuvel <ardb@kernel.org>
To: linux-arm-kernel@lists.infradead.org, linux@armlinux.org.uk
Cc: arnd@arndb.de, linus.walleij@linaro.org,
Ard Biesheuvel <ardb@kernel.org>
Subject: [PATCH 5/6] ARM: spectre-bhb: avoid cross-subsection jump using a numbered label
Date: Mon, 28 Mar 2022 15:47:13 +0200 [thread overview]
Message-ID: <20220328134714.205342-6-ardb@kernel.org> (raw)
In-Reply-To: <20220328134714.205342-1-ardb@kernel.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 <ardb@kernel.org>
---
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_<exception> (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
next prev parent reply other threads:[~2022-03-28 13:54 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-28 13:47 [PATCH 0/6] ARM: spectre-bhb fixes and tweaks Ard Biesheuvel
2022-03-28 13:47 ` [PATCH 1/6] ARM: spectre-bhb: enable for Cortex-A15 Ard Biesheuvel
2022-05-24 14:50 ` Jon Hunter
2022-05-24 15:21 ` Ard Biesheuvel
2022-05-24 16:06 ` Jon Hunter
2022-05-24 17:03 ` Russell King (Oracle)
2022-05-24 17:49 ` Jon Hunter
2022-05-25 7:09 ` Ard Biesheuvel
2022-05-25 10:48 ` Jon Hunter
2022-05-25 10:52 ` Ard Biesheuvel
2022-06-07 14:30 ` Jon Hunter
2022-06-07 14:32 ` Ard Biesheuvel
2022-06-07 14:35 ` Jon Hunter
2022-06-07 14:39 ` Ard Biesheuvel
2022-03-28 13:47 ` [PATCH 2/6] ARM: spectre-bhb: fix loop8 sequence for Thumb2 Ard Biesheuvel
2022-03-28 13:47 ` [PATCH 3/6] ARM: spectre-bhb: simplify BPIALL vector macro Ard Biesheuvel
2022-03-28 13:47 ` [PATCH 4/6] ARM: spectre-bhb: use local DSB and elide ISB in loop8 sequence Ard Biesheuvel
2022-03-28 13:47 ` Ard Biesheuvel [this message]
2022-03-31 14:07 ` [PATCH 5/6] ARM: spectre-bhb: avoid cross-subsection jump using a numbered label Russell King (Oracle)
2022-03-31 16:22 ` Ard Biesheuvel
2022-03-28 13:47 ` [PATCH 6/6] ARM: spectre-bhb: rely on linker to emit cross-section literal loads Ard Biesheuvel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220328134714.205342-6-ardb@kernel.org \
--to=ardb@kernel.org \
--cc=arnd@arndb.de \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux@armlinux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).