From: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
To: Avi Kivity <avi@redhat.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>,
KVM list <kvm@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH v3 1/10] KVM MMU: fix for calculating gpa in invlpg code
Date: Wed, 28 Apr 2010 11:54:44 +0800 [thread overview]
Message-ID: <4BD7B184.1080808@cn.fujitsu.com> (raw)
In-Reply-To: <4BD7AE34.5000408@cn.fujitsu.com>
If the guest is 32-bit, we should use 'quadrant' to adjust gpa
offset
Changelog v3:
- use smart way to fix this bug address Avi's suggestion
Changelog v2:
- when level is PT_DIRECTORY_LEVEL, the 'offset' should be
'role.quadrant << 8', thanks Avi for point it out
Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
---
arch/x86/kvm/paging_tmpl.h | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
index d0cc07e..3464fdb 100644
--- a/arch/x86/kvm/paging_tmpl.h
+++ b/arch/x86/kvm/paging_tmpl.h
@@ -478,8 +478,13 @@ static void FNAME(invlpg)(struct kvm_vcpu *vcpu, gva_t gva)
((level == PT_DIRECTORY_LEVEL && is_large_pte(*sptep))) ||
((level == PT_PDPE_LEVEL && is_large_pte(*sptep)))) {
struct kvm_mmu_page *sp = page_header(__pa(sptep));
+ int offset, shift;
- pte_gpa = (sp->gfn << PAGE_SHIFT);
+ shift = PAGE_SHIFT -
+ (PT_LEVEL_BITS - PT64_LEVEL_BITS) * level;
+ offset = sp->role.quadrant << shift;
+
+ pte_gpa = (sp->gfn << PAGE_SHIFT) + offset;
pte_gpa += (sptep - sp->spt) * sizeof(pt_element_t);
if (is_shadow_present_pte(*sptep)) {
--
1.6.1.2
next parent reply other threads:[~2010-04-28 3:57 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <4BD7AE34.5000408@cn.fujitsu.com>
2010-04-28 3:54 ` Xiao Guangrong [this message]
2010-04-28 3:54 ` [PATCH v3 2/10] KVM MMU: convert mmu tracepoints Xiao Guangrong
2010-04-28 3:55 ` [PATCH v3 3/10] KVM MMU: move unsync/sync tracpoints to proper place Xiao Guangrong
2010-04-28 3:55 ` [PATCH v3 4/10] KVM MMU: cleanup invlpg code Xiao Guangrong
2010-04-28 3:55 ` [PATCH v3 5/10] KVM MMU: split kvm_sync_page() function Xiao Guangrong
2010-04-28 3:55 ` [PATCH v3 6/10] KVM MMU: don't write-protect if have new mapping to unsync page Xiao Guangrong
2010-04-28 3:55 ` [PATCH v3 7/10] KVM MMU: allow more page become unsync at gfn mapping time Xiao Guangrong
2010-04-30 19:33 ` Marcelo Tosatti
2010-05-05 12:16 ` Xiao Guangrong
2010-04-28 3:55 ` [PATCH v3 8/10] KVM MMU: allow more page become unsync at getting sp time Xiao Guangrong
2010-04-28 3:56 ` [PATCH v3 9/10] KVM MMU: separate invlpg code form kvm_mmu_pte_write() Xiao Guangrong
2010-04-28 3:56 ` [PATCH v3 10/10] KVM MMU: optimize sync/update unsync-page Xiao Guangrong
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=4BD7B184.1080808@cn.fujitsu.com \
--to=xiaoguangrong@cn.fujitsu.com \
--cc=avi@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@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