KVM: arm64: Keep nVHE EL2 vector installed

KVM by default keeps the stub vector installed and installs the nVHE
vector only briefly for init and later on demand. Change this policy
to install the vector at init and then never uninstall it if the kernel
was given the protected KVM command line parameter.

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

diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
index aa40bef..7d162a2 100644 (file)
--- a/arch/arm64/kvm/arm.c
+++ b/arch/arm64/kvm/arm.c
@@ -1453,7 +1453,8 @@ static void _kvm_arch_hardware_disable(void *discard)
 
 void kvm_arch_hardware_disable(void)
 {
-       _kvm_arch_hardware_disable(NULL);
+       if (!is_protected_kvm_enabled())
+               _kvm_arch_hardware_disable(NULL);
 }
 
 #ifdef CONFIG_CPU_PM
@@ -1496,11 +1497,13 @@ static struct notifier_block hyp_init_cpu_pm_nb = {
 
 static void __init hyp_cpu_pm_init(void)
 {
-       cpu_pm_register_notifier(&hyp_init_cpu_pm_nb);
+       if (!is_protected_kvm_enabled())
+               cpu_pm_register_notifier(&hyp_init_cpu_pm_nb);
 }
 static void __init hyp_cpu_pm_exit(void)
 {
-       cpu_pm_unregister_notifier(&hyp_init_cpu_pm_nb);
+       if (!is_protected_kvm_enabled())
+               cpu_pm_unregister_notifier(&hyp_init_cpu_pm_nb);
 }
 #else
 static inline void hyp_cpu_pm_init(void)
@@ -1588,7 +1591,8 @@ static int init_subsystems(void)
        kvm_coproc_table_init();
 
 out:
-       on_each_cpu(_kvm_arch_hardware_disable, NULL, 1);
+       if (err || !is_protected_kvm_enabled())
+               on_each_cpu(_kvm_arch_hardware_disable, NULL, 1);
 
        return err;
 }