KVM: Fix vcpu freeing for guest smp

A vcpu can pin up to four mmu shadow pages, which means the freeing
loop will never terminate.  Fix by first unpinning shadow pages on
all vcpus, then freeing shadow pages.

Signed-off-by: Avi Kivity <avi@qumranet.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/kvm/mmu.c b/drivers/kvm/mmu.c
index 5915d7a1c4f7..d4de988d1828 100644
--- a/drivers/kvm/mmu.c
+++ b/drivers/kvm/mmu.c
@@ -838,11 +838,12 @@ static void mmu_free_roots(struct kvm_vcpu *vcpu)
         int i;
         struct kvm_mmu_page *page;
 
+        if (!VALID_PAGE(vcpu->mmu.root_hpa))
+                return;
 #ifdef CONFIG_X86_64
         if (vcpu->mmu.shadow_root_level == PT64_ROOT_LEVEL) {
                 hpa_t root = vcpu->mmu.root_hpa;
 
-                ASSERT(VALID_PAGE(root));
                 page = page_header(root);
                 --page->root_count;
                 vcpu->mmu.root_hpa = INVALID_PAGE;
@@ -853,7 +854,6 @@ static void mmu_free_roots(struct kvm_vcpu *vcpu)
                 hpa_t root = vcpu->mmu.pae_root[i];
 
                 if (root) {
-                        ASSERT(VALID_PAGE(root));
                         root &= PT64_BASE_ADDR_MASK;
                         page = page_header(root);
                         --page->root_count;