lkml.org 
[lkml]   [2010]   [Mar]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 02/18] KVM: MMU: Make tdp_enabled a mmu-context parameter
    Date
    This patch changes the tdp_enabled flag from its global
    meaning to the mmu-context. This is necessary for Nested SVM
    with emulation of Nested Paging where we need an extra MMU
    context to shadow the Nested Nested Page Table.

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

    diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
    index ec891a2..e7bef19 100644
    --- a/arch/x86/include/asm/kvm_host.h
    +++ b/arch/x86/include/asm/kvm_host.h
    @@ -254,6 +254,7 @@ struct kvm_mmu {
    int root_level;
    int shadow_root_level;
    union kvm_mmu_page_role base_role;
    + bool tdp_enabled;

    u64 *pae_root;
    u64 rsvd_bits_mask[2][4];
    diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
    index 741373e..5c66c99 100644
    --- a/arch/x86/kvm/mmu.c
    +++ b/arch/x86/kvm/mmu.c
    @@ -1812,7 +1812,7 @@ static int set_spte(struct kvm_vcpu *vcpu, u64 *sptep,
    spte |= shadow_user_mask;
    if (level > PT_PAGE_TABLE_LEVEL)
    spte |= PT_PAGE_SIZE_MASK;
    - if (tdp_enabled)
    + if (vcpu->arch.mmu.tdp_enabled)
    spte |= kvm_x86_ops->get_mt_mask(vcpu, gfn,
    kvm_is_mmio_pfn(pfn));

    @@ -2077,7 +2077,7 @@ static int mmu_alloc_roots(struct kvm_vcpu *vcpu)
    hpa_t root = vcpu->arch.mmu.root_hpa;

    ASSERT(!VALID_PAGE(root));
    - if (tdp_enabled)
    + if (vcpu->arch.mmu.tdp_enabled)
    direct = 1;
    if (mmu_check_root(vcpu, root_gfn))
    return 1;
    @@ -2090,7 +2090,7 @@ static int mmu_alloc_roots(struct kvm_vcpu *vcpu)
    return 0;
    }
    direct = !is_paging(vcpu);
    - if (tdp_enabled)
    + if (vcpu->arch.mmu.tdp_enabled)
    direct = 1;
    for (i = 0; i < 4; ++i) {
    hpa_t root = vcpu->arch.mmu.pae_root[i];
    @@ -2397,6 +2397,7 @@ static int init_kvm_tdp_mmu(struct kvm_vcpu *vcpu)
    context->invlpg = nonpaging_invlpg;
    context->shadow_root_level = kvm_x86_ops->get_tdp_level();
    context->root_hpa = INVALID_PAGE;
    + vcpu->arch.mmu.tdp_enabled = true;

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

    vcpu->arch.mmu.base_role.glevels = vcpu->arch.mmu.root_level;
    + vcpu->arch.mmu.tdp_enabled = false;

    return r;
    }
    --
    1.7.0



    \
     
     \ /
      Last update: 2010-03-03 20:19    [W:0.024 / U:32.332 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site