| From 88e1db0c6eb5f5d5f64525d1b667452022474afd Mon Sep 17 00:00:00 2001 |
| From: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com> |
| Date: Fri, 16 Apr 2010 16:34:42 +0800 |
| Subject: KVM: MMU: fix kvm_mmu_zap_page() and its calling path |
| |
| From: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com> |
| |
| (Cherry-picked from commit 77662e0028c7c63e34257fda03ff9625c59d939d) |
| |
| This patch fix: |
| |
| - calculate zapped page number properly in mmu_zap_unsync_children() |
| - calculate freeed page number properly kvm_mmu_change_mmu_pages() |
| - if zapped children page it shoud restart hlist walking |
| |
| KVM-Stable-Tag. |
| Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com> |
| Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| arch/x86/kvm/mmu.c | 11 +++++++---- |
| 1 file changed, 7 insertions(+), 4 deletions(-) |
| |
| --- a/arch/x86/kvm/mmu.c |
| +++ b/arch/x86/kvm/mmu.c |
| @@ -1496,8 +1496,8 @@ static int mmu_zap_unsync_children(struc |
| for_each_sp(pages, sp, parents, i) { |
| kvm_mmu_zap_page(kvm, sp); |
| mmu_pages_clear_parents(&parents); |
| + zapped++; |
| } |
| - zapped += pages.nr; |
| kvm_mmu_pages_init(parent, &parents, &pages); |
| } |
| |
| @@ -1548,14 +1548,16 @@ void kvm_mmu_change_mmu_pages(struct kvm |
| */ |
| |
| if (used_pages > kvm_nr_mmu_pages) { |
| - while (used_pages > kvm_nr_mmu_pages) { |
| + while (used_pages > kvm_nr_mmu_pages && |
| + !list_empty(&kvm->arch.active_mmu_pages)) { |
| struct kvm_mmu_page *page; |
| |
| page = container_of(kvm->arch.active_mmu_pages.prev, |
| struct kvm_mmu_page, link); |
| - kvm_mmu_zap_page(kvm, page); |
| + used_pages -= kvm_mmu_zap_page(kvm, page); |
| used_pages--; |
| } |
| + kvm_nr_mmu_pages = used_pages; |
| kvm->arch.n_free_mmu_pages = 0; |
| } |
| else |
| @@ -1602,7 +1604,8 @@ static void mmu_unshadow(struct kvm *kvm |
| && !sp->role.invalid) { |
| pgprintk("%s: zap %lx %x\n", |
| __func__, gfn, sp->role.word); |
| - kvm_mmu_zap_page(kvm, sp); |
| + if (kvm_mmu_zap_page(kvm, sp)) |
| + nn = bucket->first; |
| } |
| } |
| } |