[PATCH 1/3] arm64: entry: sdei: always set VBAR_EL1 on SDEI entry

From: Ada Couprie Diaz

Date: Tue Nov 17 2026 - 12:48:48 EST


SDEI can interrupt at any time, so we cannot guarantee that VBAR_EL1
points to the kernel vectors.
Unconditionally set VBAR_EL1 to the kernel vectors on SDEI entry so
the SDEI handler always runs on the correct vectors.

Commit 9bf6ee7952c7 ("arm64: sdei: Run the event handler on the kernel
vectors") sets VBAR_EL1 to the kernel vectors when KPTI is on
and it still points to the trampoline vectors.

This is only covers the KPTI case, as any other VBAR_EL1 value would
not be changed, while pointing to the wrong exception vectors.
KVM in VHE mode would be such a case as, in VHE, VBAR_EL1 is an alias for
VBAR_EL2, which KVM uses for the hypervisor vectors when running guests.

Fixes: 79e9aa59dc29 ("arm64: sdei: Add trampoline code for remapping the kernel")
Cc: stable@xxxxxxxxxxxxxxx
Cc: Kiryl Shutsemau (Meta) <kas@xxxxxxxxxx>
Cc: Breno Leitao <leitao@xxxxxxxxxx>
Signed-off-by: Ada Couprie Diaz <ada.coupriediaz@xxxxxxx>
---
arch/arm64/kernel/entry-common.c | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/arch/arm64/kernel/entry-common.c b/arch/arm64/kernel/entry-common.c
index beb56891fc4f..cb122163a68d 100644
--- a/arch/arm64/kernel/entry-common.c
+++ b/arch/arm64/kernel/entry-common.c
@@ -1079,19 +1079,22 @@ __sdei_handler(struct pt_regs *regs, struct sdei_registered_event *arg)
far = read_sysreg(far_el1);

/*
- * With KPTI, VBAR_EL1 holds the trampoline vectors from the return to
- * EL0 until the next exception from EL0 maps the kernel. They only
- * handle exceptions from EL0: an exception taken here would run their
- * empty current-EL half and never come back. Switch to the kernel
- * vectors. The IRQ-like resume keeps using the interrupted VBAR, so it
- * still goes through the trampoline.
+ * As an SDEI event can take over at any point, VBAR_EL1 might not allow
+ * us to take an exception safely :
+ * - With KPTI, VBAR_EL1 holds the trampoline vectors from the return to
+ * EL0 until the next exception from EL0 maps the kernel. They only
+ * handle exceptions from EL0: an exception taken here would run their
+ * empty current-EL half and never come back ;
+ * - With VHE, the kernel runs at EL2 and VBAR_EL1 accesses VBAR_EL2.
+ * KVM might be running a guest and switched VBAR_EL2 to the
+ * hypervisor vectors.
+ *
+ * Switch to the kernel vectors unconditionally and restore
+ * the interrupted VBAR_EL1 before returning.
*/
vbar = read_sysreg(vbar_el1);
- if (arm64_kernel_unmapped_at_el0() &&
- vbar == (unsigned long)raw_cpu_read(this_cpu_vector)) {
- write_sysreg((unsigned long)vectors, vbar_el1);
- isb();
- }
+ write_sysreg((unsigned long)vectors, vbar_el1);
+ isb();

state = irqentry_nmi_enter(regs);
ret = do_sdei_event(regs, arg, vbar);
--
2.43.0