提交 b6a68b97 编写于 作者: M Marc Zyngier

KVM: arm64: Allow KVM to be disabled from the command line

Although KVM can be compiled out of the kernel, it cannot be disabled
at runtime. Allow this possibility by introducing a new mode that
will prevent KVM from initialising.

This is useful in the (limited) circumstances where you don't want
KVM to be available (what is wrong with you?), or when you want
to install another hypervisor instead (good luck with that).
Reviewed-by: NDavid Brazdil <dbrazdil@google.com>
Acked-by: NWill Deacon <will@kernel.org>
Acked-by: NSuzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: NMarc Zyngier <maz@kernel.org>
Reviewed-by: NAndrew Scull <ascull@google.com>
Link: https://lore.kernel.org/r/20211001170553.3062988-1-maz@kernel.org
上级 9e1ff307
...@@ -2365,6 +2365,8 @@ ...@@ -2365,6 +2365,8 @@
kvm-arm.mode= kvm-arm.mode=
[KVM,ARM] Select one of KVM/arm64's modes of operation. [KVM,ARM] Select one of KVM/arm64's modes of operation.
none: Forcefully disable KVM.
nvhe: Standard nVHE-based mode, without support for nvhe: Standard nVHE-based mode, without support for
protected guests. protected guests.
......
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
enum kvm_mode { enum kvm_mode {
KVM_MODE_DEFAULT, KVM_MODE_DEFAULT,
KVM_MODE_PROTECTED, KVM_MODE_PROTECTED,
KVM_MODE_NONE,
}; };
enum kvm_mode kvm_get_mode(void); enum kvm_mode kvm_get_mode(void);
......
...@@ -2064,6 +2064,11 @@ int kvm_arch_init(void *opaque) ...@@ -2064,6 +2064,11 @@ int kvm_arch_init(void *opaque)
return -ENODEV; return -ENODEV;
} }
if (kvm_get_mode() == KVM_MODE_NONE) {
kvm_info("KVM disabled from command line\n");
return -ENODEV;
}
in_hyp_mode = is_kernel_in_hyp_mode(); in_hyp_mode = is_kernel_in_hyp_mode();
if (cpus_have_final_cap(ARM64_WORKAROUND_DEVICE_LOAD_ACQUIRE) || if (cpus_have_final_cap(ARM64_WORKAROUND_DEVICE_LOAD_ACQUIRE) ||
...@@ -2137,8 +2142,15 @@ static int __init early_kvm_mode_cfg(char *arg) ...@@ -2137,8 +2142,15 @@ static int __init early_kvm_mode_cfg(char *arg)
return 0; return 0;
} }
if (strcmp(arg, "nvhe") == 0 && !WARN_ON(is_kernel_in_hyp_mode())) if (strcmp(arg, "nvhe") == 0 && !WARN_ON(is_kernel_in_hyp_mode())) {
kvm_mode = KVM_MODE_DEFAULT;
return 0; return 0;
}
if (strcmp(arg, "none") == 0) {
kvm_mode = KVM_MODE_NONE;
return 0;
}
return -EINVAL; return -EINVAL;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册