diff options
| author |   Xiao Guangrong <xiaoguangrong@cn.fujitsu.com> | 2010-04-28 11:54:44 +0800 |
|---|---|---|
| committer |   Avi Kivity <avi@redhat.com> | 2010-05-19 11:36:25 +0300 |
| commit | 22c9b2d166a88573a933e8d355833d36579d83be (patch) | |
| tree | 76542ec35aa15097ee0a2e2acee1bf9a7454694c | |
| parent | KVM: powerpc: use of kzalloc/kfree requires including slab.h (diff) | |
| download | linux-dev-22c9b2d166a88573a933e8d355833d36579d83be.tar.xz linux-dev-22c9b2d166a88573a933e8d355833d36579d83be.zip | |
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>
| -rw-r--r-- | 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 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) ((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)) { |