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 05/27] KVM: MMU: Introduce get_cr3 function pointer
    Date
    This function pointer in the MMU context is required to
    implement Nested Nested Paging.

    Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
    ---
    arch/x86/include/asm/kvm_host.h | 1 +
    arch/x86/kvm/mmu.c | 9 ++++++++-
    arch/x86/kvm/paging_tmpl.h | 4 ++--
    3 files changed, 11 insertions(+), 3 deletions(-)
    diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
    index aeeea9c..ab708ee 100644
    --- a/arch/x86/include/asm/kvm_host.h
    +++ b/arch/x86/include/asm/kvm_host.h
    @@ -237,6 +237,7 @@ struct kvm_pio_request {
    struct kvm_mmu {
    void (*new_cr3)(struct kvm_vcpu *vcpu);
    void (*set_cr3)(struct kvm_vcpu *vcpu, unsigned long root);
    + unsigned long (*get_cr3)(struct kvm_vcpu *vcpu);
    int (*page_fault)(struct kvm_vcpu *vcpu, gva_t gva, u32 err);
    void (*free)(struct kvm_vcpu *vcpu);
    gpa_t (*gva_to_gpa)(struct kvm_vcpu *vcpu, gva_t gva, u32 access,
    diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
    index 543ec74..d2213fa 100644
    --- a/arch/x86/kvm/mmu.c
    +++ b/arch/x86/kvm/mmu.c
    @@ -2365,7 +2365,7 @@ static int mmu_alloc_roots(struct kvm_vcpu *vcpu)
    int direct = 0;
    u64 pdptr;

    - root_gfn = vcpu->arch.cr3 >> PAGE_SHIFT;
    + root_gfn = vcpu->arch.mmu.get_cr3(vcpu) >> PAGE_SHIFT;

    if (vcpu->arch.mmu.shadow_root_level == PT64_ROOT_LEVEL) {
    hpa_t root = vcpu->arch.mmu.root_hpa;
    @@ -2561,6 +2561,11 @@ static void paging_new_cr3(struct kvm_vcpu *vcpu)
    mmu_free_roots(vcpu);
    }

    +static unsigned long get_cr3(struct kvm_vcpu *vcpu)
    +{
    + return vcpu->arch.cr3;
    +}
    +
    static void inject_page_fault(struct kvm_vcpu *vcpu,
    u64 addr,
    u32 err_code)
    @@ -2712,6 +2717,7 @@ static int init_kvm_tdp_mmu(struct kvm_vcpu *vcpu)
    context->root_hpa = INVALID_PAGE;
    context->direct_map = true;
    context->set_cr3 = kvm_x86_ops->set_tdp_cr3;
    + context->get_cr3 = get_cr3;

    if (!is_paging(vcpu)) {
    context->gva_to_gpa = nonpaging_gva_to_gpa;
    @@ -2753,6 +2759,7 @@ static int init_kvm_softmmu(struct kvm_vcpu *vcpu)
    vcpu->arch.mmu.base_role.cr0_wp = is_write_protection(vcpu);
    vcpu->arch.mmu.direct_map = false;
    vcpu->arch.mmu.set_cr3 = kvm_x86_ops->set_cr3;
    + vcpu->arch.mmu.get_cr3 = get_cr3;

    return r;
    }
    diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
    index e4ad3dc..13d0c06 100644
    --- a/arch/x86/kvm/paging_tmpl.h
    +++ b/arch/x86/kvm/paging_tmpl.h
    @@ -130,7 +130,7 @@ walk:
    present = true;
    eperm = rsvd_fault = false;
    walker->level = vcpu->arch.mmu.root_level;
    - pte = vcpu->arch.cr3;
    + pte = vcpu->arch.mmu.get_cr3(vcpu);
    #if PTTYPE == 64
    if (vcpu->arch.mmu.root_level == PT32E_ROOT_LEVEL) {
    pte = kvm_pdptr_read(vcpu, (addr >> 30) & 3);
    @@ -143,7 +143,7 @@ walk:
    }
    #endif
    ASSERT((!is_long_mode(vcpu) && is_pae(vcpu)) ||
    - (vcpu->arch.cr3 & CR3_NONPAE_RESERVED_BITS) == 0);
    + (vcpu->arch.mmu.get_cr3(vcpu) & CR3_NONPAE_RESERVED_BITS) == 0);

    pt_access = ACC_ALL;

    --
    1.7.0.4



    \
     
     \ /
      Last update: 2010-09-06 18:05    [from the cache]
    ©2003-2014 Jasper Spaans. hosted at Digital Ocean