lkml.org 
[lkml]   [2015]   [Sep]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.4 099/146] KVM: MMU: fix CR4.SMEP=1, CR0.WP=0 with shadow pages
    Date
    From: Paolo Bonzini <pbonzini@redhat.com>

    3.4.109-rc1 review patch. If anyone has any objections, please let me know.

    ------------------


    commit 898761158be7682082955e3efa4ad24725305fc7 upstream.

    smep_andnot_wp is initialized in kvm_init_shadow_mmu and shadow pages
    should not be reused for different values of it. Thus, it has to be
    added to the mask in kvm_mmu_pte_write.

    Reviewed-by: Xiao Guangrong <guangrong.xiao@linux.intel.com>
    Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
    [lizf: Backported to 3.4: adjust context]
    Signed-off-by: Zefan Li <lizefan@huawei.com>
    ---
    arch/x86/kvm/mmu.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
    index 84f4bca..2da1a8c 100644
    --- a/arch/x86/kvm/mmu.c
    +++ b/arch/x86/kvm/mmu.c
    @@ -3658,7 +3658,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,
    ++vcpu->kvm->stat.mmu_pte_write;
    kvm_mmu_audit(vcpu, AUDIT_PRE_PTE_WRITE);

    - mask.cr0_wp = mask.cr4_pae = mask.nxe = 1;
    + mask.cr0_wp = mask.cr4_pae = mask.nxe = mask.smep_andnot_wp = 1;
    for_each_gfn_indirect_valid_sp(vcpu->kvm, sp, gfn, node) {
    if (detect_write_misaligned(sp, gpa, bytes) ||
    detect_write_flooding(sp)) {
    --
    1.9.1


    \
     
     \ /
      Last update: 2015-09-15 11:21    [W:2.590 / U:0.216 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site