lkml.org 
[lkml]   [2022]   [Jul]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 12/25] KVM: VMX: Check VM_ENTRY_IA32E_MODE in setup_vmcs_config()
    Date
    VM_ENTRY_IA32E_MODE control is toggled dynamically by vmx_set_efer()
    and setup_vmcs_config() doesn't check its existence. On the contrary,
    nested_vmx_setup_ctls_msrs() doesn set it on x86_64. Add the missing
    check and filter the bit out in vmx_vmentry_ctrl().

    No (real) functional change intended as all existing CPUs supporting
    long mode and VMX are supposed to have it.

    Reviewed-by: Jim Mattson <jmattson@google.com>
    Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
    ---
    arch/x86/kvm/vmx/vmx.c | 14 +++++++++++---
    1 file changed, 11 insertions(+), 3 deletions(-)

    diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
    index dd905ad72637..1aaec4d19e1b 100644
    --- a/arch/x86/kvm/vmx/vmx.c
    +++ b/arch/x86/kvm/vmx/vmx.c
    @@ -2610,6 +2610,9 @@ static __init int setup_vmcs_config(struct vmcs_config *vmcs_conf,
    _pin_based_exec_control &= ~PIN_BASED_POSTED_INTR;

    min = VM_ENTRY_LOAD_DEBUG_CONTROLS;
    +#ifdef CONFIG_X86_64
    + min |= VM_ENTRY_IA32E_MODE;
    +#endif
    opt = VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL |
    VM_ENTRY_LOAD_IA32_PAT |
    VM_ENTRY_LOAD_IA32_EFER |
    @@ -4242,9 +4245,14 @@ static u32 vmx_vmentry_ctrl(void)
    if (vmx_pt_mode_is_system())
    vmentry_ctrl &= ~(VM_ENTRY_PT_CONCEAL_PIP |
    VM_ENTRY_LOAD_IA32_RTIT_CTL);
    - /* Loading of EFER and PERF_GLOBAL_CTRL are toggled dynamically */
    - return vmentry_ctrl &
    - ~(VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL | VM_ENTRY_LOAD_IA32_EFER);
    + /*
    + * IA32e mode, and loading of EFER and PERF_GLOBAL_CTRL are toggled dynamically.
    + */
    + vmentry_ctrl &= ~(VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL |
    + VM_ENTRY_LOAD_IA32_EFER |
    + VM_ENTRY_IA32E_MODE);
    +
    + return vmentry_ctrl;
    }

    static u32 vmx_vmexit_ctrl(void)
    --
    2.35.3
    \
     
     \ /
      Last update: 2022-07-08 16:43    [W:2.790 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site