Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc4529ef authored by Avi Kivity's avatar Avi Kivity Committed by Linus Torvalds
Browse files

[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: default avatarAvi Kivity <avi@qumranet.com>
Acked-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 697fe2e2

drivers/kvm/mmu.c

+4 −4
Original line number Diff line number Diff line
@@ -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)