KVM: MMU: cleanup for __mmu_unsync_walk()

Decrease sp->unsync_children after clear unsync_child_bitmap bit

Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 8bfcb32a06e75ac6173315f521d67918d64b1940..6230c386374e50257586f0ccd3a5b474a7f04115 100644 (file)
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -1160,9 +1160,11 @@ static int __mmu_unsync_walk(struct kvm_mmu_page *sp,
                                        return -ENOSPC;
 
                                ret = __mmu_unsync_walk(child, pvec);
-                               if (!ret)
+                               if (!ret) {
                                        __clear_bit(i, sp->unsync_child_bitmap);
-                               else if (ret > 0)
+                                       sp->unsync_children--;
+                                       WARN_ON((int)sp->unsync_children < 0);
+                               } else if (ret > 0)
                                        nr_unsync_leaf += ret;
                                else
                                        return ret;
@@ -1176,8 +1178,6 @@ static int __mmu_unsync_walk(struct kvm_mmu_page *sp,
                }
        }
 
-       if (find_first_bit(sp->unsync_child_bitmap, 512) == 512)
-               sp->unsync_children = 0;
 
        return nr_unsync_leaf;
 }