From patchwork Mon Apr 26 08:48:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avi Kivity X-Patchwork-Id: 95019 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 o3Q8mrQS027845 for ; Mon, 26 Apr 2010 08:48:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751649Ab0DZIss (ORCPT ); Mon, 26 Apr 2010 04:48:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46111 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751239Ab0DZIsp (ORCPT ); Mon, 26 Apr 2010 04:48:45 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o3Q8mi0o010307 (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-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o3Q8mht1027582 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 7EF0C250AD8; Mon, 26 Apr 2010 11:48:43 +0300 (IDT) From: Avi Kivity To: Marcelo Tosatti Cc: kvm@vger.kernel.org Subject: [PATCH 4/5] KVM: MMU: Use correct root gfn for direct maps Date: Mon, 26 Apr 2010 11:48:42 +0300 Message-Id: <1272271723-9070-5-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.16 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 4da4ff1..6e925b3 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -2070,16 +2070,17 @@ static int mmu_alloc_roots(struct kvm_vcpu *vcpu) for (i = 0; i < nr_roots; ++i) { root = rootp[i]; ASSERT(!VALID_PAGE(root)); - if (vcpu->arch.mmu.root_level == PT32E_ROOT_LEVEL) { + + if (direct) + root_gfn = 0; + else if (vcpu->arch.mmu.root_level == PT32E_ROOT_LEVEL) { pdptr = kvm_pdptr_read(vcpu, i); if (!is_present_gpte(pdptr)) { rootp[i] = 0; continue; } root_gfn = pdptr >> PAGE_SHIFT; - } else if (vcpu->arch.mmu.root_level == 0) - root_gfn = 0; - else + } else root_gfn = vcpu->arch.cr3 >> PAGE_SHIFT; if (mmu_check_root(vcpu, root_gfn))