From: Avi Kivity Date: Sat, 6 Jan 2007 00:36:47 +0000 (-0800) Subject: [PATCH] KVM: MMU: kvm_mmu_put_page() only removes one link to the page X-Git-Tag: v2.6.20-rc4~41 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=cc4529efc7b730b596d9c7d5a917c00a357e92aa;p=linux-2.6-omap-h63xx.git [PATCH] KVM: MMU: kvm_mmu_put_page() only removes one link to the page ... and so must not free it unconditionally. Move the freeing to kvm_mmu_zap_page(). Signed-off-by: Avi Kivity Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/kvm/mmu.c b/drivers/kvm/mmu.c index 7e20dbf4f84..d788866d5a6 100644 --- a/drivers/kvm/mmu.c +++ b/drivers/kvm/mmu.c @@ -521,10 +521,6 @@ static void kvm_mmu_put_page(struct kvm_vcpu *vcpu, u64 *parent_pte) { mmu_page_remove_parent_pte(page, parent_pte); - kvm_mmu_page_unlink_children(vcpu, page); - hlist_del(&page->hash_link); - list_del(&page->link); - list_add(&page->link, &vcpu->free_pages); } static void kvm_mmu_zap_page(struct kvm_vcpu *vcpu, @@ -546,6 +542,10 @@ static void kvm_mmu_zap_page(struct kvm_vcpu *vcpu, kvm_mmu_put_page(vcpu, page, parent_pte); *parent_pte = 0; } + kvm_mmu_page_unlink_children(vcpu, page); + hlist_del(&page->hash_link); + list_del(&page->link); + list_add(&page->link, &vcpu->free_pages); } static int kvm_mmu_unprotect_page(struct kvm_vcpu *vcpu, gfn_t gfn)