From: Sean Christopherson Add an exported API to split huge pages in mirror roots for a given gfn range. TDX will use the API to split huge pages in preparation for partially zapping a private huge page, e.g., for converting a huge page from private to shared, or for splitting a huge page to match the guest's ACCEPT level. For all intents and purposes, no functional change intended. Signed-off-by: Sean Christopherson Signed-off-by: Yan Zhao --- v4: - new patch. --- arch/x86/kvm/mmu/tdp_mmu.c | 40 ++++++++++++++++++++++++++++---------- arch/x86/kvm/mmu/tdp_mmu.h | 2 ++ 2 files changed, 32 insertions(+), 10 deletions(-) diff --git a/arch/x86/kvm/mmu/tdp_mmu.c b/arch/x86/kvm/mmu/tdp_mmu.c index 472419963a19..9c783accb9ed 100644 --- a/arch/x86/kvm/mmu/tdp_mmu.c +++ b/arch/x86/kvm/mmu/tdp_mmu.c @@ -1616,6 +1616,26 @@ static int tdp_mmu_split_huge_pages_root(struct kvm *kvm, return 0; } +static int tdp_mmu_split_huge_pages(struct kvm *kvm, int as_id, + enum kvm_tdp_mmu_root_types type, + gfn_t start, gfn_t end, + int target_level, bool shared) +{ + struct kvm_mmu_page *root; + int r; + + kvm_lockdep_assert_mmu_lock_held(kvm, shared); + + __for_each_tdp_mmu_root_yield_safe(kvm, root, as_id, type) { + r = tdp_mmu_split_huge_pages_root(kvm, root, start, end, + target_level, shared); + if (r) { + kvm_tdp_mmu_put_root(kvm, root); + return r; + } + } + return 0; +} /* * Try to split all huge pages mapped by the TDP MMU down to the target level. @@ -1625,18 +1645,18 @@ void kvm_tdp_mmu_try_split_huge_pages(struct kvm *kvm, gfn_t start, gfn_t end, int target_level, bool shared) { - struct kvm_mmu_page *root; - int r = 0; + tdp_mmu_split_huge_pages(kvm, slot->as_id, KVM_VALID_ROOTS, start, end, + target_level, shared); +} - kvm_lockdep_assert_mmu_lock_held(kvm, shared); - for_each_valid_tdp_mmu_root_yield_safe(kvm, root, slot->as_id) { - r = tdp_mmu_split_huge_pages_root(kvm, root, start, end, target_level, shared); - if (r) { - kvm_tdp_mmu_put_root(kvm, root); - break; - } - } +int kvm_tdp_mmu_mirrors_split_huge_pages(struct kvm *kvm, gfn_t start, + gfn_t end, int target_level) +{ + /* The as_id for mirror roots can only be 0 */ + return tdp_mmu_split_huge_pages(kvm, 0, KVM_MIRROR_ROOTS, start, end, + target_level, false); } +EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_tdp_mmu_mirrors_split_huge_pages); static bool tdp_mmu_need_write_protect(struct kvm *kvm, struct kvm_mmu_page *sp) { diff --git a/arch/x86/kvm/mmu/tdp_mmu.h b/arch/x86/kvm/mmu/tdp_mmu.h index bd62977c9199..a6919de10ca2 100644 --- a/arch/x86/kvm/mmu/tdp_mmu.h +++ b/arch/x86/kvm/mmu/tdp_mmu.h @@ -97,6 +97,8 @@ void kvm_tdp_mmu_try_split_huge_pages(struct kvm *kvm, const struct kvm_memory_slot *slot, gfn_t start, gfn_t end, int target_level, bool shared); +int kvm_tdp_mmu_mirrors_split_huge_pages(struct kvm *kvm, gfn_t start, + gfn_t end, int target_level); static inline void kvm_tdp_mmu_walk_lockless_begin(void) { -- 2.43.2