The patch titled
KVM: MMU: kvm_mmu_put_page() only removes one link to the page
has been removed from the -mm tree. Its filename was
kvm-mmu-kvm_mmu_put_page-only-removes-one-link-to-the-page.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: KVM: MMU: kvm_mmu_put_page() only removes one link to the page
From: Avi Kivity <avi@xxxxxxxxxxxx>
... and so must not free it unconditionally.
Move the freeing to kvm_mmu_zap_page().
Signed-off-by: Avi Kivity <avi@xxxxxxxxxxxx>
Acked-by: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/kvm/mmu.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff -puN drivers/kvm/mmu.c~kvm-mmu-kvm_mmu_put_page-only-removes-one-link-to-the-page drivers/kvm/mmu.c
--- a/drivers/kvm/mmu.c~kvm-mmu-kvm_mmu_put_page-only-removes-one-link-to-the-page
+++ a/drivers/kvm/mmu.c
@@ -521,10 +521,6 @@ static void kvm_mmu_put_page(struct kvm_
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_
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)
_
Patches currently in -mm which might be from avi@xxxxxxxxxxxx are
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
