lkml.org 
[lkml]   [2010]   [Sep]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 10/29] KVM: MMU: Introduce generic walk_addr function
    Date
    This is the first patch in the series towards a generic
    walk_addr implementation which could walk two-dimensional
    page tables in the end. In this first step the walk_addr
    function is renamed into walk_addr_generic which takes a
    mmu context as an additional parameter.

    Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
    ---
    arch/x86/kvm/paging_tmpl.h | 26 ++++++++++++++++++--------
    1 files changed, 18 insertions(+), 8 deletions(-)

    diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
    index d07f48a..a704a81 100644
    --- a/arch/x86/kvm/paging_tmpl.h
    +++ b/arch/x86/kvm/paging_tmpl.h
    @@ -114,9 +114,10 @@ static unsigned FNAME(gpte_access)(struct kvm_vcpu *vcpu, pt_element_t gpte)
    /*
    * Fetch a guest pte for a guest virtual address
    */
    -static int FNAME(walk_addr)(struct guest_walker *walker,
    - struct kvm_vcpu *vcpu, gva_t addr,
    - int write_fault, int user_fault, int fetch_fault)
    +static int FNAME(walk_addr_generic)(struct guest_walker *walker,
    + struct kvm_vcpu *vcpu, struct kvm_mmu *mmu,
    + gva_t addr, int write_fault,
    + int user_fault, int fetch_fault)
    {
    pt_element_t pte;
    gfn_t table_gfn;
    @@ -129,10 +130,11 @@ static int FNAME(walk_addr)(struct guest_walker *walker,
    walk:
    present = true;
    eperm = rsvd_fault = false;
    - walker->level = vcpu->arch.mmu.root_level;
    - pte = vcpu->arch.mmu.get_cr3(vcpu);
    + walker->level = mmu->root_level;
    + pte = mmu->get_cr3(vcpu);
    +
    #if PTTYPE == 64
    - if (vcpu->arch.mmu.root_level == PT32E_ROOT_LEVEL) {
    + if (walker->level == PT32E_ROOT_LEVEL) {
    pte = kvm_pdptr_read(vcpu, (addr >> 30) & 3);
    trace_kvm_mmu_paging_element(pte, walker->level);
    if (!is_present_gpte(pte)) {
    @@ -143,7 +145,7 @@ walk:
    }
    #endif
    ASSERT((!is_long_mode(vcpu) && is_pae(vcpu)) ||
    - (vcpu->arch.mmu.get_cr3(vcpu) & CR3_NONPAE_RESERVED_BITS) == 0);
    + (mmu->get_cr3(vcpu) & CR3_NONPAE_RESERVED_BITS) == 0);

    pt_access = ACC_ALL;

    @@ -205,7 +207,7 @@ walk:
    (PTTYPE == 64 || is_pse(vcpu))) ||
    ((walker->level == PT_PDPE_LEVEL) &&
    is_large_pte(pte) &&
    - vcpu->arch.mmu.root_level == PT64_ROOT_LEVEL)) {
    + mmu->root_level == PT64_ROOT_LEVEL)) {
    int lvl = walker->level;

    walker->gfn = gpte_to_gfn_lvl(pte, lvl);
    @@ -266,6 +268,14 @@ error:
    return 0;
    }

    +static int FNAME(walk_addr)(struct guest_walker *walker,
    + struct kvm_vcpu *vcpu, gva_t addr,
    + int write_fault, int user_fault, int fetch_fault)
    +{
    + return FNAME(walk_addr_generic)(walker, vcpu, &vcpu->arch.mmu, addr,
    + write_fault, user_fault, fetch_fault);
    +}
    +
    static void FNAME(update_pte)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp,
    u64 *spte, const void *pte)
    {
    --
    1.7.0.4



    \
     
     \ /
      Last update: 2010-09-10 17:41    [W:0.034 / U:30.968 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site