]> git.ipfire.org Git - thirdparty/linux.git/commit
KVM: arm64: Sync SPSR_EL1 when injecting an exception into a pVM
authorFuad Tabba <tabba@google.com>
Fri, 12 Jun 2026 11:34:14 +0000 (12:34 +0100)
committerMarc Zyngier <maz@kernel.org>
Wed, 17 Jun 2026 12:40:18 +0000 (13:40 +0100)
commitec40342aaca8162bc8ab2607076535ebab1838b8
treecb6f6153cbee4e6a62d7d25db50a0b366631e655
parente2cb1f4578625e71f461d5c1ce70984193389cbb
KVM: arm64: Sync SPSR_EL1 when injecting an exception into a pVM

When pKVM injects a synchronous exception into a protected guest, it
re-enters without restoring the guest's EL1 sysregs and writes the EL1
exception registers to hardware by hand: ESR_EL1 and ELR_EL1, but not
SPSR_EL1. enter_exception64() sets SPSR_EL1 (the interrupted PSTATE)
only in memory, so the guest's handler reads a stale SPSR_EL1 and
restores the wrong PSTATE on eret.

Write SPSR_EL1 alongside the other exception registers.

Fixes: 6c30bfb18d0b ("KVM: arm64: Add handlers for protected VM System Registers")
Reported-by: sashiko <sashiko@sashiko.dev>
Signed-off-by: Fuad Tabba <tabba@google.com>
Acked-by: Will Deacon <will@kernel.org>
Link: https://patch.msgid.link/20260612113414.1022901-1-tabba@google.com
Signed-off-by: Marc Zyngier <maz@kernel.org>
arch/arm64/kvm/hyp/nvhe/sys_regs.c