Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c58f010b authored by Vitaly Kuznetsov's avatar Vitaly Kuznetsov Committed by Greg Kroah-Hartman
Browse files

x86/kvm/nVMX: read from MSR_IA32_VMX_PROCBASED_CTLS2 only when it is available 



commit 6b1971c694975e49af302229202c0043568b1791 upstream.

SDM says MSR_IA32_VMX_PROCBASED_CTLS2 is only available "If
(CPUID.01H:ECX.[5] && IA32_VMX_PROCBASED_CTLS[63])". It was found that
some old cpus (namely "Intel(R) Core(TM)2 CPU 6600 @ 2.40GHz (family: 0x6,
model: 0xf, stepping: 0x6") don't have it. Add the missing check.

Reported-by: default avatarZdenek Kaspar <zkaspar82@gmail.com>
Tested-by: default avatarZdenek Kaspar <zkaspar82@gmail.com>
Signed-off-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Reviewed-by: default avatarJim Mattson <jmattson@google.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2ab14838

arch/x86/kvm/vmx.c

+5 −3
Original line number Diff line number Diff line
@@ -3601,9 +3601,11 @@ static void nested_vmx_setup_ctls_msrs(struct nested_vmx_msrs *msrs, bool apicv) 
	 * secondary cpu-based controls.  Do not include those that

	 * depend on CPUID bits, they are added later by vmx_cpuid_update.

	 */

	if (msrs->procbased_ctls_high & CPU_BASED_ACTIVATE_SECONDARY_CONTROLS)

		rdmsr(MSR_IA32_VMX_PROCBASED_CTLS2,

		      msrs->secondary_ctls_low,

		      msrs->secondary_ctls_high);



	msrs->secondary_ctls_low = 0;

	msrs->secondary_ctls_high &=

		SECONDARY_EXEC_DESC |