Skip to content

Commit e84b8e4

Browse files
yamahatabonzini
authored andcommitted
KVM: x86/tdp_mmu: Extract root invalid check from tdx_mmu_next_root()
Extract tdp_mmu_root_match() to check if the root has given types and use it for the root page table iterator. It checks only_invalid now. TDX KVM operates on a shared page table only (Shared-EPT), a mirrored page table only (Secure-EPT), or both based on the operation. KVM MMU notifier operations only on shared page table. KVM guest_memfd invalidation operations only on mirrored page table, and so on. Introduce a centralized matching function instead of open coding matching logic in the iterator. The next step is to extend the function to check whether the page is shared or private Link: https://lore.kernel.org/kvm/ZivazWQw1oCU8VBC@google.com/ Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com> Signed-off-by: Rick Edgecombe <rick.p.edgecombe@intel.com> Message-ID: <20240718211230.1492011-10-rick.p.edgecombe@intel.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
1 parent 3fc3f71 commit e84b8e4

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

arch/x86/kvm/mmu/tdp_mmu.c

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,14 @@ void kvm_tdp_mmu_put_root(struct kvm *kvm, struct kvm_mmu_page *root)
9292
call_rcu(&root->rcu_head, tdp_mmu_free_sp_rcu_callback);
9393
}
9494

95+
static bool tdp_mmu_root_match(struct kvm_mmu_page *root, bool only_valid)
96+
{
97+
if (only_valid && root->role.invalid)
98+
return false;
99+
100+
return true;
101+
}
102+
95103
/*
96104
* Returns the next root after @prev_root (or the first root if @prev_root is
97105
* NULL). A reference to the returned root is acquired, and the reference to
@@ -125,7 +133,7 @@ static struct kvm_mmu_page *tdp_mmu_next_root(struct kvm *kvm,
125133
typeof(*next_root), link);
126134

127135
while (next_root) {
128-
if ((!only_valid || !next_root->role.invalid) &&
136+
if (tdp_mmu_root_match(next_root, only_valid) &&
129137
kvm_tdp_mmu_get_root(next_root))
130138
break;
131139

@@ -176,7 +184,7 @@ static struct kvm_mmu_page *tdp_mmu_next_root(struct kvm *kvm,
176184
list_for_each_entry(_root, &_kvm->arch.tdp_mmu_roots, link) \
177185
if (kvm_lockdep_assert_mmu_lock_held(_kvm, false) && \
178186
((_as_id >= 0 && kvm_mmu_page_as_id(_root) != _as_id) || \
179-
((_only_valid) && (_root)->role.invalid))) { \
187+
!tdp_mmu_root_match((_root), (_only_valid)))) { \
180188
} else
181189

182190
#define for_each_tdp_mmu_root(_kvm, _root, _as_id) \

0 commit comments

Comments
 (0)