lkml.org 
[lkml]   [2009]   [May]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 10/46] KVM: Use rsvd_bits_mask in load_pdptrs()
    Date
    From: Dong, Eddie <eddie.dong@intel.com>

    Also remove bit 5-6 from rsvd_bits_mask per latest SDM.

    Signed-off-by: Eddie Dong <Eddie.Dong@intel.com>
    Signed-off-by: Avi Kivity <avi@redhat.com>
    ---
    arch/x86/kvm/mmu.c | 8 +++-----
    arch/x86/kvm/mmu.h | 5 +++++
    arch/x86/kvm/x86.c | 3 ++-
    3 files changed, 10 insertions(+), 6 deletions(-)

    diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
    index 24f5a57..5baf539 100644
    --- a/arch/x86/kvm/mmu.c
    +++ b/arch/x86/kvm/mmu.c
    @@ -225,11 +225,6 @@ static int is_nx(struct kvm_vcpu *vcpu)
    return vcpu->arch.shadow_efer & EFER_NX;
    }

    -static int is_present_pte(unsigned long pte)
    -{
    - return pte & PT_PRESENT_MASK;
    -}
    -
    static int is_shadow_present_pte(u64 pte)
    {
    return pte != shadow_trap_nonpresent_pte
    @@ -2195,6 +2190,9 @@ static void reset_rsvds_bits_mask(struct kvm_vcpu *vcpu, int level)
    context->rsvd_bits_mask[1][0] = ~0ull;
    break;
    case PT32E_ROOT_LEVEL:
    + context->rsvd_bits_mask[0][2] =
    + rsvd_bits(maxphyaddr, 63) |
    + rsvd_bits(7, 8) | rsvd_bits(1, 2); /* PDPTE */
    context->rsvd_bits_mask[0][1] = exb_bit_rsvd |
    rsvd_bits(maxphyaddr, 62); /* PDE */
    context->rsvd_bits_mask[0][0] = exb_bit_rsvd |
    diff --git a/arch/x86/kvm/mmu.h b/arch/x86/kvm/mmu.h
    index eaab214..3494a2f 100644
    --- a/arch/x86/kvm/mmu.h
    +++ b/arch/x86/kvm/mmu.h
    @@ -75,4 +75,9 @@ static inline int is_paging(struct kvm_vcpu *vcpu)
    return vcpu->arch.cr0 & X86_CR0_PG;
    }

    +static inline int is_present_pte(unsigned long pte)
    +{
    + return pte & PT_PRESENT_MASK;
    +}
    +
    #endif
    diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
    index 34516bf..7be18d4 100644
    --- a/arch/x86/kvm/x86.c
    +++ b/arch/x86/kvm/x86.c
    @@ -234,7 +234,8 @@ int load_pdptrs(struct kvm_vcpu *vcpu, unsigned long cr3)
    goto out;
    }
    for (i = 0; i < ARRAY_SIZE(pdpte); ++i) {
    - if ((pdpte[i] & 1) && (pdpte[i] & 0xfffffff0000001e6ull)) {
    + if (is_present_pte(pdpte[i]) &&
    + (pdpte[i] & vcpu->arch.mmu.rsvd_bits_mask[0][2])) {
    ret = 0;
    goto out;
    }
    --
    1.6.0.6


    \
     
     \ /
      Last update: 2009-05-20 13:39    [W:6.151 / U:1.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site