From patchwork Mon Apr 26 08:48:41 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avi Kivity X-Patchwork-Id: 95018 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3Q8mrQR027845 for ; Mon, 26 Apr 2010 08:48:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751828Ab0DZIss (ORCPT ); Mon, 26 Apr 2010 04:48:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:62486 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751281Ab0DZIsp (ORCPT ); Mon, 26 Apr 2010 04:48:45 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o3Q8mipT010005 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 26 Apr 2010 04:48:44 -0400 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o3Q8mhMc026832 for ; Mon, 26 Apr 2010 04:48:44 -0400 Received: from localhost.localdomain (file.tlv.redhat.com [10.35.255.8]) by cleopatra.tlv.redhat.com (Postfix) with ESMTP id 7419E250AD7; Mon, 26 Apr 2010 11:48:43 +0300 (IDT) From: Avi Kivity To: Marcelo Tosatti Cc: kvm@vger.kernel.org Subject: [PATCH 3/5] KVM: MMU: Unify 32-pae and single-root mmu setup Date: Mon, 26 Apr 2010 11:48:41 +0300 Message-Id: <1272271723-9070-4-git-send-email-avi@redhat.com> In-Reply-To: <1272271723-9070-1-git-send-email-avi@redhat.com> References: <1272271723-9070-1-git-send-email-avi@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Mon, 26 Apr 2010 08:48:54 +0000 (UTC) diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index ddfa865..4da4ff1 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -2052,41 +2052,36 @@ static int mmu_alloc_roots(struct kvm_vcpu *vcpu) struct kvm_mmu_page *sp; int direct = 0; u64 pdptr; + hpa_t *rootp, root, root_flags; + int nr_roots; - root_gfn = vcpu->arch.cr3 >> PAGE_SHIFT; + direct = tdp_enabled || !is_paging(vcpu); if (vcpu->arch.mmu.shadow_root_level == PT64_ROOT_LEVEL) { - hpa_t root = vcpu->arch.mmu.root_hpa; - - ASSERT(!VALID_PAGE(root)); - if (tdp_enabled) - direct = 1; - if (mmu_check_root(vcpu, root_gfn)) - return 1; - sp = kvm_mmu_get_page(vcpu, root_gfn, 0, - PT64_ROOT_LEVEL, direct, - ACC_ALL, NULL); - root = __pa(sp->spt); - ++sp->root_count; - vcpu->arch.mmu.root_hpa = root; - return 0; + rootp = &vcpu->arch.mmu.root_hpa; + nr_roots = 1; + root_flags = 0; + } else { + rootp = vcpu->arch.mmu.pae_root; + nr_roots = 4; + root_flags = PT_PRESENT_MASK; } - direct = !is_paging(vcpu); - if (tdp_enabled) - direct = 1; - for (i = 0; i < 4; ++i) { - hpa_t root = vcpu->arch.mmu.pae_root[i]; + for (i = 0; i < nr_roots; ++i) { + root = rootp[i]; ASSERT(!VALID_PAGE(root)); if (vcpu->arch.mmu.root_level == PT32E_ROOT_LEVEL) { pdptr = kvm_pdptr_read(vcpu, i); if (!is_present_gpte(pdptr)) { - vcpu->arch.mmu.pae_root[i] = 0; + rootp[i] = 0; continue; } root_gfn = pdptr >> PAGE_SHIFT; } else if (vcpu->arch.mmu.root_level == 0) root_gfn = 0; + else + root_gfn = vcpu->arch.cr3 >> PAGE_SHIFT; + if (mmu_check_root(vcpu, root_gfn)) return 1; sp = kvm_mmu_get_page(vcpu, root_gfn, i << 30, @@ -2094,9 +2089,12 @@ static int mmu_alloc_roots(struct kvm_vcpu *vcpu) ACC_ALL, NULL); root = __pa(sp->spt); ++sp->root_count; - vcpu->arch.mmu.pae_root[i] = root | PT_PRESENT_MASK; + rootp[i] = root | root_flags; } - vcpu->arch.mmu.root_hpa = __pa(vcpu->arch.mmu.pae_root); + + if (nr_roots == 4) + vcpu->arch.mmu.root_hpa = __pa(rootp); + return 0; }