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 v2 1/10] KVM MMU: fix for calculating gpa in invlpg code
Date: Sun, 25 Apr 2010 15:00:00 +0800 [thread overview]
Message-ID: <4BD3E870.60000@cn.fujitsu.com> (raw)
In-Reply-To: <4BD3E306.4020202@cn.fujitsu.com>
If the guest is 32-bit, we should use 'quadrant' to adjust gpa
offset
Changlog 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 | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
index d0cc07e..83cc72f 100644
--- a/arch/x86/kvm/paging_tmpl.h
+++ b/arch/x86/kvm/paging_tmpl.h
@@ -478,9 +478,18 @@ 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 = 0;
+
+ if (PTTYPE == 32) {
+ if (level == PT_DIRECTORY_LEVEL)
+ offset = PAGE_SHIFT - 4;
+ else
+ offset = PT64_LEVEL_BITS;
+ offset = sp->role.quadrant << offset;
+ }
pte_gpa = (sp->gfn << PAGE_SHIFT);
- pte_gpa += (sptep - sp->spt) * sizeof(pt_element_t);
+ pte_gpa += (sptep - sp->spt + offset) *
+ sizeof(pt_element_t);
if (is_shadow_present_pte(*sptep)) {
rmap_remove(vcpu->kvm, sptep);
--
1.6.1.2
next parent reply other threads:[~2010-04-25 7:03 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <4BD3E306.4020202@cn.fujitsu.com>
2010-04-25 7:00 ` Xiao Guangrong [this message]
2010-04-25 9:46 ` [PATCH v2 1/10] KVM MMU: fix for calculating gpa in invlpg code Avi Kivity
2010-04-26 3:10 ` Xiao Guangrong
2010-04-26 7:39 ` Avi Kivity
2010-04-25 7:00 ` [PATCH v2 2/10] KVM MMU: convert mmu tracepoints Xiao Guangrong
2010-04-25 7:00 ` [PATCH v2 3/10] KVM MMU: move unsync/sync tracpoints to proper place Xiao Guangrong
2010-04-25 7:00 ` [PATCH v2 4/10] KVM MMU: cleanup invlpg code Xiao Guangrong
2010-04-25 7:00 ` [PATCH v2 5/10] KVM MMU: split kvm_sync_page() function Xiao Guangrong
2010-04-25 9:50 ` Avi Kivity
2010-04-26 3:11 ` Xiao Guangrong
2010-04-25 7:00 ` [PATCH v2 6/10] KVM MMU: don't write-protect if have new mapping to unsync page Xiao Guangrong
2010-04-25 10:00 ` Avi Kivity
2010-04-26 3:58 ` Xiao Guangrong
2010-04-26 6:07 ` Avi Kivity
2010-04-25 7:01 ` [PATCH v2 7/10] KVM MMU: allow more page become unsync at gfn mapping time Xiao Guangrong
2010-04-25 7:01 ` [PATCH v2 8/10] KVM MMU: allow more page become unsync at getting sp time Xiao Guangrong
2010-04-25 7:02 ` [PATCH v2 9/10] KVM MMU: separate invlpg code form kvm_mmu_pte_write() Xiao Guangrong
2010-04-25 9:57 ` Avi Kivity
2010-04-26 3:13 ` Xiao Guangrong
2010-04-25 7:02 ` [PATCH v2 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=4BD3E870.60000@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