ARM: 9200/1: spectre-bhb: avoid cross-subsection jump using a numbered label

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>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>

diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
index 43ab77553e8407e2823aa05143dd8d079efc1838..df02044e1d6ce7f56f9c3f604157afcc0a4e52fd 100644 (file)
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -1094,7 +1094,8 @@ vector_\name:
        stmia   sp, {r0, lr}            @ save r0, lr
 
        @ Save spsr_<exception> (parent CPSR)
-2:     mrs     lr, spsr
+.Lvec_\name:
+       mrs     lr, spsr
        str     lr, [sp, #8]            @ save spsr
 
        @
@@ -1134,7 +1135,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       .Lvec_\name
 ENDPROC(vector_bhb_loop8_\name)
        .previous
 #endif