lkml.org 
[lkml]   [2019]   [Sep]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH] KVM: nVMX: cleanup and fix host 64-bit mode checks
From
Date
On 26/09/19 01:55, Krish Sadhukhan wrote:
>
>
> On 09/25/2019 09:47 AM, Jim Mattson wrote:
>> On Wed, Sep 25, 2019 at 9:34 AM Paolo Bonzini <pbonzini@redhat.com>
>> wrote:
>>> KVM was incorrectly checking vmcs12->host_ia32_efer even if the "load
>>> IA32_EFER" exit control was reset.  Also, some checks were not using
>>> the new CC macro for tracing.
>>>
>>> Cleanup everything so that the vCPU's 64-bit mode is determined
>>> directly from EFER_LMA and the VMCS checks are based on that, which
>>> matches section 26.2.4 of the SDM.
>>>
>>> Cc: Sean Christopherson <sean.j.christopherson@intel.com>
>>> Cc: Jim Mattson <jmattson@google.com>
>>> Cc: Krish Sadhukhan <krish.sadhukhan@oracle.com>
>>> Fixes: 5845038c111db27902bc220a4f70070fe945871c
>>> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>>> ---
>>>   arch/x86/kvm/vmx/nested.c | 53
>>> ++++++++++++++++++++---------------------------
>>>   1 file changed, 22 insertions(+), 31 deletions(-)
>>>
>>> diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c
>>> index 70d59d9304f2..e108847f6cf8 100644
>>> --- a/arch/x86/kvm/vmx/nested.c
>>> +++ b/arch/x86/kvm/vmx/nested.c
>>> @@ -2664,8 +2664,26 @@ static int nested_vmx_check_host_state(struct
>>> kvm_vcpu *vcpu,
>>>              CC(!kvm_pat_valid(vmcs12->host_ia32_pat)))
>>>                  return -EINVAL;
>>>
>>> -       ia32e = (vmcs12->vm_exit_controls &
>>> -                VM_EXIT_HOST_ADDR_SPACE_SIZE) != 0;
>>> +#ifdef CONFIG_X86_64
>>> +       ia32e = !!(vcpu->arch.efer & EFER_LMA);
>>> +#else
>>> +       if (CC(vmcs12->vm_entry_controls & VM_ENTRY_IA32E_MODE))
>>> +               return -EINVAL;
>> This check is redundant, since it is checked in the else block below.
>
> Should we be re-using is_long_mode() instead of duplicating the code ?

Of course! I have already pushed the patch, but I will send a follow up.

Paolo

\
 
 \ /
  Last update: 2019-09-26 10:43    [W:0.053 / U:36.424 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site