Commit 8ad8182e authored Oct 09, 2017 by Wanpeng Li Committed by Paolo Bonzini Oct 12, 2017

KVM: VMX: Don't expose unrestricted_guest is enabled if ept is disabled



SDM mentioned:

 "If either the â€œunrestricted guestâ€ VM-execution control or the â€œmode-based
  execute control for EPTâ€ VM- execution control is 1, the â€œenable EPTâ€
  VM-execution control must also be 1."

However, we can still observe unrestricted_guest is Y after inserting the kvm-intel.ko
w/ ept=N. It depends on later starts a guest in order that the function
vmx_compute_secondary_exec_control() can be executed, then both the module parameter
and exec control fields will be amended.

This patch fixes it by amending module parameter immediately during vmcs data setup.

Reviewed-by: Jim Mattson <jmattson@google.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Radim Krčmář <rkrcmar@redhat.com>
Cc: Jim Mattson <jmattson@google.com>
Signed-off-by: Wanpeng Li <wanpeng.li@hotmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent a554d207

arch/x86/kvm/vmx.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -6730,16 +6730,13 @@ static __init int hardware_setup(void)
		if (!cpu_has_vmx_ept() \|\|
		!cpu_has_vmx_ept_4levels() \|\|
		!cpu_has_vmx_ept_mt_wb() \|\|
		!cpu_has_vmx_invept_global()) {
		!cpu_has_vmx_invept_global())
		enable_ept = 0;
		enable_unrestricted_guest = 0;
		enable_ept_ad_bits = 0;
		}

		if (!cpu_has_vmx_ept_ad_bits() \|\| !enable_ept)
		enable_ept_ad_bits = 0;

		if (!cpu_has_vmx_unrestricted_guest())
		if (!cpu_has_vmx_unrestricted_guest() \|\| !enable_ept)
		enable_unrestricted_guest = 0;

		if (!cpu_has_vmx_flexpriority())

Admin message