lkml.org 
[lkml]   [2008]   [Jul]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 08/62] KVM: VMX: Fix a wrong usage of vmcs_config
    2.6.26 -stable review patch.  If anyone has any objections, please let
    us know.

    ------------------
    From: Sheng Yang <sheng.yang@intel.com>

    Original-Commit-Hash: 406046a9638a455876b030853862e576a4378d29

    The function ept_update_paging_mode_cr0() write to
    CPU_BASED_VM_EXEC_CONTROL based on vmcs_config.cpu_based_exec_ctrl. That's
    wrong because the variable may not consistent with the content in the
    CPU_BASE_VM_EXEC_CONTROL MSR.

    Signed-off-by: Sheng Yang <sheng.yang@intel.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    arch/x86/kvm/vmx.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/arch/x86/kvm/vmx.c
    +++ b/arch/x86/kvm/vmx.c
    @@ -1420,7 +1420,7 @@ static void ept_update_paging_mode_cr0(u
    if (!(cr0 & X86_CR0_PG)) {
    /* From paging/starting to nonpaging */
    vmcs_write32(CPU_BASED_VM_EXEC_CONTROL,
    - vmcs_config.cpu_based_exec_ctrl |
    + vmcs_read32(CPU_BASED_VM_EXEC_CONTROL) |
    (CPU_BASED_CR3_LOAD_EXITING |
    CPU_BASED_CR3_STORE_EXITING));
    vcpu->arch.cr0 = cr0;
    @@ -1430,7 +1430,7 @@ static void ept_update_paging_mode_cr0(u
    } else if (!is_paging(vcpu)) {
    /* From nonpaging to paging */
    vmcs_write32(CPU_BASED_VM_EXEC_CONTROL,
    - vmcs_config.cpu_based_exec_ctrl &
    + vmcs_read32(CPU_BASED_VM_EXEC_CONTROL) &
    ~(CPU_BASED_CR3_LOAD_EXITING |
    CPU_BASED_CR3_STORE_EXITING));
    vcpu->arch.cr0 = cr0;
    --


    \
     
     \ /
      Last update: 2008-07-31 02:09    [W:0.023 / U:30.628 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site