From: Avi Kivity <avi@redhat.com>
To: Marcelo Tosatti <mtosatti@redhat.com>
Cc: kvm@vger.kernel.org
Subject: [PATCH 5/5] KVM: MMU: Fix check for cr3 outside guest memory
Date: Mon, 26 Apr 2010 11:48:43 +0300 [thread overview]
Message-ID: <1272271723-9070-6-git-send-email-avi@redhat.com> (raw)
In-Reply-To: <1272271723-9070-1-git-send-email-avi@redhat.com>
Fir direct maps, root_gfn or cr3 are meaningless. This hasn't bitten us
because no sane guest sets cr3 outside its own memory even in real mode.
Signed-off-by: Avi Kivity <avi@redhat.com>
---
arch/x86/kvm/mmu.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 6e925b3..e3acc9e 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -2083,7 +2083,7 @@ static int mmu_alloc_roots(struct kvm_vcpu *vcpu)
} else
root_gfn = vcpu->arch.cr3 >> PAGE_SHIFT;
- if (mmu_check_root(vcpu, root_gfn))
+ if (!direct && mmu_check_root(vcpu, root_gfn))
return 1;
sp = kvm_mmu_get_page(vcpu, root_gfn, i << 30,
PT32_ROOT_LEVEL, direct,
--
1.7.0.4
next prev parent reply other threads:[~2010-04-26 8:48 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-26 8:48 [PATCH 0/5] mmu root page cleanups Avi Kivity
2010-04-26 8:48 ` [PATCH 1/5] KVM: MMU: Rearrange struct kvm_mmu_page Avi Kivity
2010-04-26 8:48 ` [PATCH 2/5] KVM: MMU: use 16 bits for root_count Avi Kivity
2010-04-26 8:48 ` [PATCH 3/5] KVM: MMU: Unify 32-pae and single-root mmu setup Avi Kivity
2010-04-26 8:48 ` [PATCH 4/5] KVM: MMU: Use correct root gfn for direct maps Avi Kivity
2010-04-26 8:48 ` Avi Kivity [this message]
2010-04-26 9:23 ` [PATCH 0/5] mmu root page cleanups Avi Kivity
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1272271723-9070-6-git-send-email-avi@redhat.com \
--to=avi@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=mtosatti@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox