lkml.org 
[lkml]   [2009]   [Oct]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[001/136] KVM: VMX: Fix EPT with WP bit change during paging

    2.6.31-stable review patch. If anyone has any objections, please let us know.

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

    commit 95eb84a7588d7d7afd3096807efc052adc7479e1 upstream

    QNX update WP bit when paging enabled, which is not covered yet. This one
    fix QNX boot with EPT.

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

    --- a/arch/x86/kvm/vmx.c
    +++ b/arch/x86/kvm/vmx.c
    @@ -1572,7 +1572,6 @@ static void ept_update_paging_mode_cr0(unsigned long *hw_cr0,
    vcpu->arch.cr0 = cr0;
    vmx_set_cr4(vcpu, vcpu->arch.cr4);
    *hw_cr0 |= X86_CR0_PE | X86_CR0_PG;
    - *hw_cr0 &= ~X86_CR0_WP;
    } else if (!is_paging(vcpu)) {
    /* From nonpaging to paging */
    vmcs_write32(CPU_BASED_VM_EXEC_CONTROL,
    @@ -1581,9 +1580,10 @@ static void ept_update_paging_mode_cr0(unsigned long *hw_cr0,
    CPU_BASED_CR3_STORE_EXITING));
    vcpu->arch.cr0 = cr0;
    vmx_set_cr4(vcpu, vcpu->arch.cr4);
    - if (!(vcpu->arch.cr0 & X86_CR0_WP))
    - *hw_cr0 &= ~X86_CR0_WP;
    }
    +
    + if (!(cr0 & X86_CR0_WP))
    + *hw_cr0 &= ~X86_CR0_WP;
    }

    static void ept_update_paging_mode_cr4(unsigned long *hw_cr4,
    --
    1.5.4.5




    \
     
     \ /
      Last update: 2009-10-02 03:35    [W:0.022 / U:2.104 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site