lkml.org 
[lkml]   [2010]   [Apr]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 03/22] KVM: MMU: Make set_cr3 a function pointer in kvm_mmu
    Date
    This is necessary to implement Nested Nested Paging. As a
    side effect this allows some cleanups in the SVM nested
    paging code.

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

    diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
    index 44eda9b..04834b0 100644
    --- a/arch/x86/include/asm/kvm_host.h
    +++ b/arch/x86/include/asm/kvm_host.h
    @@ -233,6 +233,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);
    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 618d25f..6eedcdd 100644
    --- a/arch/x86/kvm/mmu.c
    +++ b/arch/x86/kvm/mmu.c
    @@ -2386,6 +2386,7 @@ static int init_kvm_tdp_mmu(struct kvm_vcpu *vcpu)
    context->shadow_root_level = kvm_x86_ops->get_tdp_level();
    context->root_hpa = INVALID_PAGE;
    vcpu->arch.mmu.direct_map = true;
    + vcpu->arch.mmu.set_cr3 = kvm_x86_ops->set_cr3;

    if (!is_paging(vcpu)) {
    context->gva_to_gpa = nonpaging_gva_to_gpa;
    @@ -2425,6 +2426,7 @@ static int init_kvm_softmmu(struct kvm_vcpu *vcpu)

    vcpu->arch.mmu.base_role.cr4_pae = !!is_pae(vcpu);
    vcpu->arch.mmu.direct_map = false;
    + vcpu->arch.mmu.set_cr3 = kvm_x86_ops->set_cr3;

    return r;
    }
    @@ -2470,7 +2472,7 @@ int kvm_mmu_load(struct kvm_vcpu *vcpu)
    if (r)
    goto out;
    /* set_cr3() should ensure TLB has been flushed */
    - kvm_x86_ops->set_cr3(vcpu, vcpu->arch.mmu.root_hpa);
    + vcpu->arch.mmu.set_cr3(vcpu, vcpu->arch.mmu.root_hpa);
    out:
    return r;
    }
    --
    1.7.0.4



    \
     
     \ /
      Last update: 2010-04-27 12:47    [W:0.042 / U:30.584 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site