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 16/27] KVM: MMU: Introduce init_kvm_nested_mmu()
    Date
    This patch introduces the init_kvm_nested_mmu() function
    which is used to re-initialize the nested mmu when the l2
    guest changes its paging mode.

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

    diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
    index 38dc82e..a338235 100644
    --- a/arch/x86/include/asm/kvm_host.h
    +++ b/arch/x86/include/asm/kvm_host.h
    @@ -805,3 +805,4 @@ void kvm_set_shared_msr(unsigned index, u64 val, u64 mask);
    bool kvm_is_linear_rip(struct kvm_vcpu *vcpu, unsigned long linear_rip);

    #endif /* _ASM_X86_KVM_HOST_H */
    +
    diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
    index 1f425f3..7bc8d67 100644
    --- a/arch/x86/kvm/mmu.c
    +++ b/arch/x86/kvm/mmu.c
    @@ -2784,11 +2784,43 @@ static int init_kvm_softmmu(struct kvm_vcpu *vcpu)
    return r;
    }

    +static int init_kvm_nested_mmu(struct kvm_vcpu *vcpu)
    +{
    + struct kvm_mmu *g_context = &vcpu->arch.nested_mmu;
    +
    + g_context->get_cr3 = get_cr3;
    + g_context->inject_page_fault = kvm_inject_page_fault;
    +
    + /*
    + * Note that arch.mmu.gva_to_gpa translates l2_gva to l1_gpa. The
    + * translation of l2_gpa to l1_gpa addresses is done using the
    + * arch.nested_mmu.gva_to_gpa function. Basically the gva_to_gpa
    + * functions between mmu and nested_mmu are swapped.
    + */
    + if (!is_paging(vcpu)) {
    + g_context->root_level = 0;
    + g_context->gva_to_gpa = nonpaging_gva_to_gpa_nested;
    + } else if (is_long_mode(vcpu)) {
    + g_context->root_level = PT64_ROOT_LEVEL;
    + g_context->gva_to_gpa = paging64_gva_to_gpa_nested;
    + } else if (is_pae(vcpu)) {
    + g_context->root_level = PT32E_ROOT_LEVEL;
    + g_context->gva_to_gpa = paging64_gva_to_gpa_nested;
    + } else {
    + g_context->root_level = PT32_ROOT_LEVEL;
    + g_context->gva_to_gpa = paging32_gva_to_gpa_nested;
    + }
    +
    + return 0;
    +}
    +
    static int init_kvm_mmu(struct kvm_vcpu *vcpu)
    {
    vcpu->arch.update_pte.pfn = bad_pfn;

    - if (tdp_enabled)
    + if (mmu_is_nested(vcpu))
    + return init_kvm_nested_mmu(vcpu);
    + else if (tdp_enabled)
    return init_kvm_tdp_mmu(vcpu);
    else
    return init_kvm_softmmu(vcpu);
    diff --git a/arch/x86/kvm/mmu.h b/arch/x86/kvm/mmu.h
    index 7086ca8..513abbb 100644
    --- a/arch/x86/kvm/mmu.h
    +++ b/arch/x86/kvm/mmu.h
    @@ -47,6 +47,7 @@
    #define PFERR_USER_MASK (1U << 2)
    #define PFERR_RSVD_MASK (1U << 3)
    #define PFERR_FETCH_MASK (1U << 4)
    +#define PFERR_NESTED_MASK (1U << 31)

    int kvm_mmu_get_spte_hierarchy(struct kvm_vcpu *vcpu, u64 addr, u64 sptes[4]);
    int kvm_init_shadow_mmu(struct kvm_vcpu *vcpu, struct kvm_mmu *context);
    diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
    index 1f5db75..b2fe9e7 100644
    --- a/arch/x86/kvm/x86.c
    +++ b/arch/x86/kvm/x86.c
    @@ -3476,6 +3476,25 @@ static gpa_t translate_gpa(struct kvm_vcpu *vcpu, gpa_t gpa, u32 *error)
    return gpa;
    }

    +static gpa_t translate_nested_gpa(struct kvm_vcpu *vcpu, gpa_t gpa, u32 *error)
    +{
    + gpa_t t_gpa;
    + u32 access;
    + u32 err;
    +
    + BUG_ON(!mmu_is_nested(vcpu));
    +
    + /* NPT walks are treated as user writes */
    + access = PFERR_WRITE_MASK | PFERR_USER_MASK;
    + t_gpa = vcpu->arch.mmu.gva_to_gpa(vcpu, gpa, access, &err);
    + if (t_gpa == UNMAPPED_GVA) {
    + vcpu->arch.fault.address = gpa;
    + vcpu->arch.fault.error_code = err | PFERR_NESTED_MASK;
    + }
    +
    + return t_gpa;
    +}
    +
    gpa_t kvm_mmu_gva_to_gpa_read(struct kvm_vcpu *vcpu, gva_t gva, u32 *error)
    {
    u32 access = (kvm_x86_ops->get_cpl(vcpu) == 3) ? PFERR_USER_MASK : 0;
    @@ -5691,6 +5710,7 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)
    vcpu->arch.walk_mmu = &vcpu->arch.mmu;
    vcpu->arch.mmu.root_hpa = INVALID_PAGE;
    vcpu->arch.mmu.translate_gpa = translate_gpa;
    + vcpu->arch.nested_mmu.translate_gpa = translate_nested_gpa;
    if (!irqchip_in_kernel(kvm) || kvm_vcpu_is_bsp(vcpu))
    vcpu->arch.mp_state = KVM_MP_STATE_RUNNABLE;
    else
    --
    1.7.0.4



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