lkml.org 
[lkml]   [2010]   [Sep]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 08/27] KVM: MMU: Let is_rsvd_bits_set take mmu context instead of vcpu
    Date
    This patch changes is_rsvd_bits_set() function prototype to
    take only a kvm_mmu context instead of a full vcpu.

    Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
    ---
    arch/x86/kvm/mmu.c | 6 +++---
    arch/x86/kvm/paging_tmpl.h | 7 ++++---
    2 files changed, 7 insertions(+), 6 deletions(-)

    diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
    index 787540d..9668f91 100644
    --- a/arch/x86/kvm/mmu.c
    +++ b/arch/x86/kvm/mmu.c
    @@ -2577,12 +2577,12 @@ static void paging_free(struct kvm_vcpu *vcpu)
    nonpaging_free(vcpu);
    }

    -static bool is_rsvd_bits_set(struct kvm_vcpu *vcpu, u64 gpte, int level)
    +static bool is_rsvd_bits_set(struct kvm_mmu *mmu, u64 gpte, int level)
    {
    int bit7;

    bit7 = (gpte >> 7) & 1;
    - return (gpte & vcpu->arch.mmu.rsvd_bits_mask[bit7][level-1]) != 0;
    + return (gpte & mmu->rsvd_bits_mask[bit7][level-1]) != 0;
    }

    #define PTTYPE 64
    @@ -2857,7 +2857,7 @@ static void mmu_pte_write_new_pte(struct kvm_vcpu *vcpu,
    return;
    }

    - if (is_rsvd_bits_set(vcpu, *(u64 *)new, PT_PAGE_TABLE_LEVEL))
    + if (is_rsvd_bits_set(&vcpu->arch.mmu, *(u64 *)new, PT_PAGE_TABLE_LEVEL))
    return;

    ++vcpu->kvm->stat.mmu_pte_updated;
    diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
    index 13d0c06..68ee1b7 100644
    --- a/arch/x86/kvm/paging_tmpl.h
    +++ b/arch/x86/kvm/paging_tmpl.h
    @@ -168,7 +168,7 @@ walk:
    break;
    }

    - if (is_rsvd_bits_set(vcpu, pte, walker->level)) {
    + if (is_rsvd_bits_set(&vcpu->arch.mmu, pte, walker->level)) {
    rsvd_fault = true;
    break;
    }
    @@ -327,6 +327,7 @@ static void FNAME(pte_prefetch)(struct kvm_vcpu *vcpu, struct guest_walker *gw,
    u64 *sptep)
    {
    struct kvm_mmu_page *sp;
    + struct kvm_mmu *mmu = &vcpu->arch.mmu;
    pt_element_t *gptep = gw->prefetch_ptes;
    u64 *spte;
    int i;
    @@ -358,7 +359,7 @@ static void FNAME(pte_prefetch)(struct kvm_vcpu *vcpu, struct guest_walker *gw,
    gpte = gptep[i];

    if (!is_present_gpte(gpte) ||
    - is_rsvd_bits_set(vcpu, gpte, PT_PAGE_TABLE_LEVEL)) {
    + is_rsvd_bits_set(mmu, gpte, PT_PAGE_TABLE_LEVEL)) {
    if (!sp->unsync)
    __set_spte(spte, shadow_notrap_nonpresent_pte);
    continue;
    @@ -713,7 +714,7 @@ static int FNAME(sync_page)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp,
    return -EINVAL;

    gfn = gpte_to_gfn(gpte);
    - if (is_rsvd_bits_set(vcpu, gpte, PT_PAGE_TABLE_LEVEL)
    + if (is_rsvd_bits_set(&vcpu->arch.mmu, gpte, PT_PAGE_TABLE_LEVEL)
    || gfn != sp->gfns[i] || !is_present_gpte(gpte)
    || !(gpte & PT_ACCESSED_MASK)) {
    u64 nonpresent;
    --
    1.7.0.4



    \
     
     \ /
      Last update: 2010-09-06 18:05    [W:0.027 / U:33.220 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site