KVM: arm64: Fix EL2 mode availability checks

With protected nVHE hyp code interception host's PSCI SMCs, the host
starts seeing new CPUs boot in EL1 instead of EL2. The kernel logic
that keeps track of the boot mode needs to be adjusted.

Add a static key enabled if KVM protected mode initialization is
successful.

When the key is enabled, is_hyp_mode_available continues to report
`true` because its users either treat it as a check whether KVM will be
/ was initialized, or whether stub HVCs can be made (eg. hibernate).

is_hyp_mode_mismatched is changed to report `false` when the key is
enabled. That's because all cores' modes matched at the point of KVM
init and KVM will not allow cores not present at init to boot. That
said, the function is never used after KVM is initialized.

Signed-off-by: David Brazdil <dbrazdil@google.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20201202184122.26046-27-dbrazdil@google.com

diff --git a/arch/arm64/include/asm/virt.h b/arch/arm64/include/asm/virt.h
index eb81dcc220b65ecd0d8a90746bdc05c6dee66876..ee6a48df89d9c21084f5fff18659a29e1268f688 100644 (file)
--- a/arch/arm64/include/asm/virt.h
+++ b/arch/arm64/include/asm/virt.h
@@ -65,9 +65,19 @@ extern u32 __boot_cpu_mode[2];
 void __hyp_set_vectors(phys_addr_t phys_vector_base);
 void __hyp_reset_vectors(void);
 
+DECLARE_STATIC_KEY_FALSE(kvm_protected_mode_initialized);
+
 /* Reports the availability of HYP mode */
 static inline bool is_hyp_mode_available(void)
 {
+       /*
+        * If KVM protected mode is initialized, all CPUs must have been booted
+        * in EL2. Avoid checking __boot_cpu_mode as CPUs now come up in EL1.
+        */
+       if (IS_ENABLED(CONFIG_KVM) &&
+           static_branch_likely(&kvm_protected_mode_initialized))
+               return true;
+
        return (__boot_cpu_mode[0] == BOOT_CPU_MODE_EL2 &&
                __boot_cpu_mode[1] == BOOT_CPU_MODE_EL2);
 }
@@ -75,6 +85,14 @@ static inline bool is_hyp_mode_available(void)
 /* Check if the bootloader has booted CPUs in different modes */
 static inline bool is_hyp_mode_mismatched(void)
 {
+       /*
+        * If KVM protected mode is initialized, all CPUs must have been booted
+        * in EL2. Avoid checking __boot_cpu_mode as CPUs now come up in EL1.
+        */
+       if (IS_ENABLED(CONFIG_KVM) &&
+           static_branch_likely(&kvm_protected_mode_initialized))
+               return false;
+
        return __boot_cpu_mode[0] != __boot_cpu_mode[1];
 }
 

diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
index 7d162a2961417a4616918ad04e413fcc447eba21..fadcc94931f99ffecf078396ab527ea6e8635183 100644 (file)
--- a/arch/arm64/kvm/arm.c
+++ b/arch/arm64/kvm/arm.c
@@ -48,6 +48,7 @@ __asm__(".arch_extension      virt");
 #endif
 
 static enum kvm_mode kvm_mode = KVM_MODE_DEFAULT;
+DEFINE_STATIC_KEY_FALSE(kvm_protected_mode_initialized);
 
 DECLARE_KVM_HYP_PER_CPU(unsigned long, kvm_hyp_vector);
 
@@ -1848,12 +1849,14 @@ int kvm_arch_init(void *opaque)
        if (err)
                goto out_hyp;
 
-       if (is_protected_kvm_enabled())
+       if (is_protected_kvm_enabled()) {
+               static_branch_enable(&kvm_protected_mode_initialized);
                kvm_info("Protected nVHE mode initialized successfully\n");
-       else if (in_hyp_mode)
+       } else if (in_hyp_mode) {
                kvm_info("VHE mode initialized successfully\n");
-       else
+       } else {
                kvm_info("Hyp mode initialized successfully\n");
+       }
 
        return 0;