diff mbox series

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

Message ID 20190207104214.8142-1-vkuznets@redhat.com (mailing list archive)
State New, archived
Headers show
Series x86/kvm/nVMX: read from MSR_IA32_VMX_PROCBASED_CTLS2 only when it is available | expand

Commit Message

Vitaly Kuznetsov Feb. 7, 2019, 10:42 a.m. UTC 
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: Zdenek Kaspar <zkaspar82@gmail.com>
Tested-by: Zdenek Kaspar <zkaspar82@gmail.com>
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
---
 arch/x86/kvm/vmx/nested.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Comments

Jim Mattson Feb. 7, 2019, 9:17 p.m. UTC | #1 
On Thu, Feb 7, 2019 at 2:42 AM Vitaly Kuznetsov <vkuznets@redhat.com> wrote:
>
> 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: Zdenek Kaspar <zkaspar82@gmail.com>
> Tested-by: Zdenek Kaspar <zkaspar82@gmail.com>
> Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Reviewed-by: Jim Mattson <jmattson@google.com>
Paolo Bonzini Feb. 12, 2019, 2:16 p.m. UTC | #2 
On 07/02/19 22:17, Jim Mattson wrote:
>> 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: Zdenek Kaspar <zkaspar82@gmail.com>
>> Tested-by: Zdenek Kaspar <zkaspar82@gmail.com>
>> Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
>
> Reviewed-by: Jim Mattson <jmattson@google.com>

Queued, thanks.

Paolo
Jim Mattson Feb. 12, 2019, 6 p.m. UTC | #3 
On Tue, Feb 12, 2019 at 6:16 AM Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> On 07/02/19 22:17, Jim Mattson wrote:
> >> 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: Zdenek Kaspar <zkaspar82@gmail.com>
> >> Tested-by: Zdenek Kaspar <zkaspar82@gmail.com>
> >> Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
> >
> > Reviewed-by: Jim Mattson <jmattson@google.com>
>
> Queued, thanks.
>
> Paolo

Alternatively, rdmsr could be changed to rdmsr_safe.
diff mbox series

Patch

diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c
index 653830d0f3da..4bd0902bfd8c 100644
--- a/arch/x86/kvm/vmx/nested.c
+++ b/arch/x86/kvm/vmx/nested.c
@@ -5557,9 +5557,11 @@  void nested_vmx_setup_ctls_msrs(struct nested_vmx_msrs *msrs, u32 ept_caps,
 	 * secondary cpu-based controls.  Do not include those that
 	 * depend on CPUID bits, they are added later by vmx_cpuid_update.
 	 */
-	rdmsr(MSR_IA32_VMX_PROCBASED_CTLS2,
-		msrs->secondary_ctls_low,
-		msrs->secondary_ctls_high);
+	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 |