[PATCH] KVM: Avoid oom on cr3 switch

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Avi Kivity <avi@qumranet.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 2 insertions, 0 deletions

diff --git a/drivers/kvm/mmu.c b/drivers/kvm/mmu.c
index 6e7381bc2218..4118e504e647 100644
--- a/drivers/kvm/mmu.c
+++ b/drivers/kvm/mmu.c
@@ -905,6 +905,8 @@ static void paging_new_cr3(struct kvm_vcpu *vcpu)
 {
         pgprintk("%s: cr3 %lx\n", __FUNCTION__, vcpu->cr3);
         mmu_free_roots(vcpu);
+        if (unlikely(vcpu->kvm->n_free_mmu_pages < KVM_MIN_FREE_MMU_PAGES))
+                kvm_mmu_free_some_pages(vcpu);
         mmu_alloc_roots(vcpu);
         kvm_mmu_flush_tlb(vcpu);
         kvm_arch_ops->set_cr3(vcpu, vcpu->mmu.root_hpa);