[PATCH 1/6] KVM: MMU: fix gfn got in kvm_mmu_page_get_gfn()
in [Kernel]
|
Prev: [PATCH 0/6] KVM: MMU: support pte prefetch when intercepted guest #PF
Next: [PATCH 2/6] KVM: MMU: fix conflict access permissions in direct sp
From: Xiao Guangrong on 14 Jun 2010 23:00 kvm_mmu_page_get_gfn() should return the unalias gfn not mapping gfn Signed-off-by: Xiao Guangrong <xiaoguangrong(a)cn.fujitsu.com> --- arch/x86/kvm/mmu.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index 56cbe45..734b106 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -397,18 +397,23 @@ static void mmu_free_rmap_desc(struct kvm_rmap_desc *rd) kmem_cache_free(rmap_desc_cache, rd); } -static gfn_t kvm_mmu_page_get_gfn(struct kvm_mmu_page *sp, int index) +static gfn_t kvm_mmu_page_get_gfn(struct kvm *kvm, struct kvm_mmu_page *sp, + int index) { + gfn_t gfn; + if (!sp->role.direct) return sp->gfns[index]; + gfn = sp->gfn + (index << ((sp->role.level - 1) * PT64_LEVEL_BITS)); - return sp->gfn + (index << ((sp->role.level - 1) * PT64_LEVEL_BITS)); + return unalias_gfn(kvm, gfn); } -static void kvm_mmu_page_set_gfn(struct kvm_mmu_page *sp, int index, gfn_t gfn) +static void kvm_mmu_page_set_gfn(struct kvm *kvm, struct kvm_mmu_page *sp, + int index, gfn_t gfn) { if (sp->role.direct) - BUG_ON(gfn != kvm_mmu_page_get_gfn(sp, index)); + BUG_ON(gfn != kvm_mmu_page_get_gfn(kvm, sp, index)); else sp->gfns[index] = gfn; } @@ -563,7 +568,7 @@ static int rmap_add(struct kvm_vcpu *vcpu, u64 *spte, gfn_t gfn) return count; gfn = unalias_gfn(vcpu->kvm, gfn); sp = page_header(__pa(spte)); - kvm_mmu_page_set_gfn(sp, spte - sp->spt, gfn); + kvm_mmu_page_set_gfn(vcpu->kvm, sp, spte - sp->spt, gfn); rmapp = gfn_to_rmap(vcpu->kvm, gfn, sp->role.level); if (!*rmapp) { rmap_printk("rmap_add: %p %llx 0->1\n", spte, *spte); @@ -633,7 +638,7 @@ static void rmap_remove(struct kvm *kvm, u64 *spte) kvm_set_pfn_accessed(pfn); if (is_writable_pte(*spte)) kvm_set_pfn_dirty(pfn); - gfn = kvm_mmu_page_get_gfn(sp, spte - sp->spt); + gfn = kvm_mmu_page_get_gfn(kvm, sp, spte - sp->spt); rmapp = gfn_to_rmap(kvm, gfn, sp->role.level); if (!*rmapp) { printk(KERN_ERR "rmap_remove: %p %llx 0->BUG\n", spte, *spte); @@ -3460,7 +3465,7 @@ void inspect_spte_has_rmap(struct kvm *kvm, u64 *sptep) if (is_writable_pte(*sptep)) { rev_sp = page_header(__pa(sptep)); - gfn = kvm_mmu_page_get_gfn(rev_sp, sptep - rev_sp->spt); + gfn = kvm_mmu_page_get_gfn(kvm, rev_sp, sptep - rev_sp->spt); if (!gfn_to_memslot(kvm, gfn)) { if (!printk_ratelimit()) -- 1.6.1.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |