]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
KVM: arm64: Fix CONFIG_PKVM_DISABLE_STAGE2_ON_PANIC
authorVincent Donnefort <vdonnefort@google.com>
Wed, 20 May 2026 22:08:30 +0000 (23:08 +0100)
committerMarc Zyngier <maz@kernel.org>
Thu, 21 May 2026 15:02:46 +0000 (16:02 +0100)
A typo in the config guard in __hyp_do_panic broke the stage-2 disabling
and made backtraces for pKVM quite unreliable.

Fix that typo.

Fixes: 9019e82c7e46 ("KVM: arm64: Add PKVM_DISABLE_STAGE2_ON_PANIC")
Signed-off-by: Vincent Donnefort <vdonnefort@google.com>
Link: https://patch.msgid.link/20260520220830.273289-1-vdonnefort@google.com
Signed-off-by: Marc Zyngier <maz@kernel.org>
arch/arm64/kvm/hyp/nvhe/host.S

index f337770ec459c227c926834703047c99316cc188..9393fe3ea6a18171c7c98b5a55b5a2a06c7ef370 100644 (file)
@@ -120,7 +120,7 @@ SYM_FUNC_START(__hyp_do_panic)
 
        mov     x29, x0
 
-#ifdef PKVM_DISABLE_STAGE2_ON_PANIC
+#ifdef CONFIG_PKVM_DISABLE_STAGE2_ON_PANIC
        /* Ensure host stage-2 is disabled */
        mrs     x0, hcr_el2
        bic     x0, x0, #HCR_VM