KVM: x86/mmu: Refactor yield safe root iterator

Refactor the yield safe TDP MMU root iterator to be more amenable to
changes in future commits which will allow it to be used under the MMU
lock in read mode. Currently the iterator requires a complicated dance
between the helper functions and different parts of the for loop which
makes it hard to reason about. Moving all the logic into a single function
simplifies the iterator substantially.

Signed-off-by: Ben Gardon <bgardon@google.com>
Message-Id: <20210401233736.638171-6-bgardon@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch/x86/kvm/mmu/tdp_mmu.c b/arch/x86/kvm/mmu/tdp_mmu.c
index 1d3fe4c595700da7d66020ff4d158310ed9e1c37..81688b41ef5b3ea87c1249d7ba6b0f7c49c591cc 100644 (file)
--- a/arch/x86/kvm/mmu/tdp_mmu.c
+++ b/arch/x86/kvm/mmu/tdp_mmu.c
@@ -68,26 +68,34 @@ void kvm_tdp_mmu_put_root(struct kvm *kvm, struct kvm_mmu_page *root)
        tdp_mmu_free_sp(root);
 }
 
-static inline bool tdp_mmu_next_root_valid(struct kvm *kvm,
-                                          struct kvm_mmu_page *root)
+/*
+ * Finds the next valid root after root (or the first valid root if root
+ * is NULL), takes a reference on it, and returns that next root. If root
+ * is not NULL, this thread should have already taken a reference on it, and
+ * that reference will be dropped. If no valid root is found, this
+ * function will return NULL.
+ */
+static struct kvm_mmu_page *tdp_mmu_next_root(struct kvm *kvm,
+                                             struct kvm_mmu_page *prev_root)
 {
-       lockdep_assert_held_write(&kvm->mmu_lock);
+       struct kvm_mmu_page *next_root;
 
-       if (list_entry_is_head(root, &kvm->arch.tdp_mmu_roots, link))
-               return false;
+       lockdep_assert_held_write(&kvm->mmu_lock);
 
-       kvm_tdp_mmu_get_root(kvm, root);
-       return true;
+       if (prev_root)
+               next_root = list_next_entry(prev_root, link);
+       else
+               next_root = list_first_entry(&kvm->arch.tdp_mmu_roots,
+                                            typeof(*next_root), link);
 
-}
+       if (list_entry_is_head(next_root, &kvm->arch.tdp_mmu_roots, link))
+               next_root = NULL;
+       else
+               kvm_tdp_mmu_get_root(kvm, next_root);
 
-static inline struct kvm_mmu_page *tdp_mmu_next_root(struct kvm *kvm,
-                                                    struct kvm_mmu_page *root)
-{
-       struct kvm_mmu_page *next_root;
+       if (prev_root)
+               kvm_tdp_mmu_put_root(kvm, prev_root);
 
-       next_root = list_next_entry(root, link);
-       kvm_tdp_mmu_put_root(kvm, root);
        return next_root;
 }
 
@@ -98,11 +106,10 @@ static inline struct kvm_mmu_page *tdp_mmu_next_root(struct kvm *kvm,
  * recent root. (Unless keeping a live reference is desirable.)
  */
 #define for_each_tdp_mmu_root_yield_safe(_kvm, _root, _as_id)          \
-       for (_root = list_first_entry(&_kvm->arch.tdp_mmu_roots,        \
-                                     typeof(*_root), link);            \
-            tdp_mmu_next_root_valid(_kvm, _root);                      \
-            _root = tdp_mmu_next_root(_kvm, _root))                    \
-               if (kvm_mmu_page_as_id(_root) != _as_id) {              \
+       for (_root = tdp_mmu_next_root(_kvm, NULL);             \
+            _root;                                             \
+            _root = tdp_mmu_next_root(_kvm, _root))            \
+               if (kvm_mmu_page_as_id(_root) != _as_id) {      \
                } else
 
 #define for_each_tdp_mmu_root(_kvm, _root, _as_id)                     \