lkml.org 
[lkml]   [2007]   [Apr]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 04/18] KVM: Handle partial pae pdptr
    Date
    Some guests (Solaris) do not set up all four pdptrs, but leave some invalid.
    kvm incorrectly treated these as valid page directories, pinning the
    wrong pages and causing general confusion.

    Fix by checking the valid bit of a pae pdpte. This closes sourceforge bug
    1698922.

    Signed-off-by: Avi Kivity <avi@qumranet.com>
    ---
    drivers/kvm/mmu.c | 18 ++++++++++++------
    1 files changed, 12 insertions(+), 6 deletions(-)

    diff --git a/drivers/kvm/mmu.c b/drivers/kvm/mmu.c
    index 8bdb9ca..9ff7480 100644
    --- a/drivers/kvm/mmu.c
    +++ b/drivers/kvm/mmu.c
    @@ -806,10 +806,12 @@ static void mmu_free_roots(struct kvm_vcpu *vcpu)
    for (i = 0; i < 4; ++i) {
    hpa_t root = vcpu->mmu.pae_root[i];

    - ASSERT(VALID_PAGE(root));
    - root &= PT64_BASE_ADDR_MASK;
    - page = page_header(root);
    - --page->root_count;
    + if (root) {
    + ASSERT(VALID_PAGE(root));
    + root &= PT64_BASE_ADDR_MASK;
    + page = page_header(root);
    + --page->root_count;
    + }
    vcpu->mmu.pae_root[i] = INVALID_PAGE;
    }
    vcpu->mmu.root_hpa = INVALID_PAGE;
    @@ -840,9 +842,13 @@ static void mmu_alloc_roots(struct kvm_vcpu *vcpu)
    hpa_t root = vcpu->mmu.pae_root[i];

    ASSERT(!VALID_PAGE(root));
    - if (vcpu->mmu.root_level == PT32E_ROOT_LEVEL)
    + if (vcpu->mmu.root_level == PT32E_ROOT_LEVEL) {
    + if (!is_present_pte(vcpu->pdptrs[i])) {
    + vcpu->mmu.pae_root[i] = 0;
    + continue;
    + }
    root_gfn = vcpu->pdptrs[i] >> PAGE_SHIFT;
    - else if (vcpu->mmu.root_level == 0)
    + } else if (vcpu->mmu.root_level == 0)
    root_gfn = 0;
    page = kvm_mmu_get_page(vcpu, root_gfn, i << 30,
    PT32_ROOT_LEVEL, !is_paging(vcpu),
    --
    1.5.0.6
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-04-26 11:25    [W:4.700 / U:0.244 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site