aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorXiao Guangrong <xiaoguangrong@cn.fujitsu.com>2010-04-27 23:54:44 -0400
committerAvi Kivity <avi@redhat.com>2010-05-19 04:36:25 -0400
commit22c9b2d166a88573a933e8d355833d36579d83be (patch)
tree76542ec35aa15097ee0a2e2acee1bf9a7454694c /arch/x86
parent329d20ba451b5a9fd17a4ce9471e4d335b3b8c74 (diff)
KVM: MMU: fix for calculating gpa in invlpg code
If the guest is 32-bit, we should use 'quadrant' to adjust gpa offset Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kvm/paging_tmpl.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
index d0cc07eb6eda..3464fdbdb98f 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)
478 ((level == PT_DIRECTORY_LEVEL && is_large_pte(*sptep))) || 478 ((level == PT_DIRECTORY_LEVEL && is_large_pte(*sptep))) ||
479 ((level == PT_PDPE_LEVEL && is_large_pte(*sptep)))) { 479 ((level == PT_PDPE_LEVEL && is_large_pte(*sptep)))) {
480 struct kvm_mmu_page *sp = page_header(__pa(sptep)); 480 struct kvm_mmu_page *sp = page_header(__pa(sptep));
481 int offset, shift;
481 482
482 pte_gpa = (sp->gfn << PAGE_SHIFT); 483 shift = PAGE_SHIFT -
484 (PT_LEVEL_BITS - PT64_LEVEL_BITS) * level;
485 offset = sp->role.quadrant << shift;
486
487 pte_gpa = (sp->gfn << PAGE_SHIFT) + offset;
483 pte_gpa += (sptep - sp->spt) * sizeof(pt_element_t); 488 pte_gpa += (sptep - sp->spt) * sizeof(pt_element_t);
484 489
485 if (is_shadow_present_pte(*sptep)) { 490 if (is_shadow_present_pte(*sptep)) {