x86/KVM: Warn user if KVM is loaded SMT and L1TF CPU bug being present
commit26acfb666a
upstream If the L1TF CPU bug is present we allow the KVM module to be loaded as the major of users that use Linux and KVM have trusted guests and do not want a broken setup. Cloud vendors are the ones that are uncomfortable with CVE 2018-3620 and as such they are the ones that should set nosmt to one. Setting 'nosmt' means that the system administrator also needs to disable SMT (Hyper-threading) in the BIOS, or via the 'nosmt' command line parameter, or via the /sys/devices/system/cpu/smt/control. See commit05736e4ac1
("cpu/hotplug: Provide knobs to control SMT"). Other mitigations are to use task affinity, cpu sets, interrupt binding, etc - anything to make sure that _only_ the same guests vCPUs are running on sibling threads. Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
7f2229c92b
Коммит
c2fdbbb47c
|
@ -1867,6 +1867,12 @@
|
|||
[KVM,ARM] Trap guest accesses to GICv3 common
|
||||
system registers
|
||||
|
||||
kvm-intel.nosmt=[KVM,Intel] If the L1TF CPU bug is present (CVE-2018-3620)
|
||||
and the system has SMT (aka Hyper-Threading) enabled then
|
||||
don't allow guests to be created.
|
||||
|
||||
Default is 0 (allow guests to be created).
|
||||
|
||||
kvm-intel.ept= [KVM,Intel] Disable extended page tables
|
||||
(virtualized MMU) support on capable Intel chips.
|
||||
Default is 1 (enabled)
|
||||
|
|
|
@ -70,6 +70,9 @@ static const struct x86_cpu_id vmx_cpu_id[] = {
|
|||
};
|
||||
MODULE_DEVICE_TABLE(x86cpu, vmx_cpu_id);
|
||||
|
||||
static bool __read_mostly nosmt;
|
||||
module_param(nosmt, bool, S_IRUGO);
|
||||
|
||||
static bool __read_mostly enable_vpid = 1;
|
||||
module_param_named(vpid, enable_vpid, bool, 0444);
|
||||
|
||||
|
@ -9835,6 +9838,20 @@ free_vcpu:
|
|||
return ERR_PTR(err);
|
||||
}
|
||||
|
||||
#define L1TF_MSG "SMT enabled with L1TF CPU bug present. Refer to CVE-2018-3620 for details.\n"
|
||||
|
||||
static int vmx_vm_init(struct kvm *kvm)
|
||||
{
|
||||
if (boot_cpu_has(X86_BUG_L1TF) && cpu_smt_control == CPU_SMT_ENABLED) {
|
||||
if (nosmt) {
|
||||
pr_err(L1TF_MSG);
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
pr_warn(L1TF_MSG);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void __init vmx_check_processor_compat(void *rtn)
|
||||
{
|
||||
struct vmcs_config vmcs_conf;
|
||||
|
@ -12225,6 +12242,8 @@ static struct kvm_x86_ops vmx_x86_ops __ro_after_init = {
|
|||
.cpu_has_accelerated_tpr = report_flexpriority,
|
||||
.has_emulated_msr = vmx_has_emulated_msr,
|
||||
|
||||
.vm_init = vmx_vm_init,
|
||||
|
||||
.vcpu_create = vmx_create_vcpu,
|
||||
.vcpu_free = vmx_free_vcpu,
|
||||
.vcpu_reset = vmx_vcpu_reset,
|
||||
|
|
|
@ -349,6 +349,7 @@ EXPORT_SYMBOL_GPL(cpu_hotplug_enable);
|
|||
|
||||
#ifdef CONFIG_HOTPLUG_SMT
|
||||
enum cpuhp_smt_control cpu_smt_control __read_mostly = CPU_SMT_ENABLED;
|
||||
EXPORT_SYMBOL_GPL(cpu_smt_control);
|
||||
|
||||
static int __init smt_cmdline_disable(char *str)
|
||||
{
|
||||
|
|
Загрузка…
Ссылка в новой задаче