From: Sean Christopherson Date: Thu, 31 Oct 2024 00:00:23 +0000 (-0700) Subject: KVM: x86/mmu: Refactor TDP MMU iter need resched check X-Git-Tag: v6.13-rc1~97^2~13^2~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dd2e7dbc4ae2497cd6eea2d7003fe60039ebae50;p=thirdparty%2Fkernel%2Flinux.git KVM: x86/mmu: Refactor TDP MMU iter need resched check Refactor the TDP MMU iterator "need resched" checks into a helper function so they can be called from a different code path in a subsequent commit. No functional change intended. Signed-off-by: David Matlack Link: https://lore.kernel.org/r/20240823235648.3236880-4-dmatlack@google.com [sean: rebase on a swapped order of checks] Signed-off-by: Sean Christopherson --- diff --git a/arch/x86/kvm/mmu/tdp_mmu.c b/arch/x86/kvm/mmu/tdp_mmu.c index ef44dcba1ecbc..3bc486537b39c 100644 --- a/arch/x86/kvm/mmu/tdp_mmu.c +++ b/arch/x86/kvm/mmu/tdp_mmu.c @@ -638,6 +638,16 @@ static inline void tdp_mmu_iter_set_spte(struct kvm *kvm, struct tdp_iter *iter, #define tdp_mmu_for_each_pte(_iter, _mmu, _start, _end) \ for_each_tdp_pte(_iter, root_to_sp(_mmu->root.hpa), _start, _end) +static inline bool __must_check tdp_mmu_iter_need_resched(struct kvm *kvm, + struct tdp_iter *iter) +{ + if (!need_resched() && !rwlock_needbreak(&kvm->mmu_lock)) + return false; + + /* Ensure forward progress has been made before yielding. */ + return iter->next_last_level_gfn != iter->yielded_gfn; +} + /* * Yield if the MMU lock is contended or this thread needs to return control * to the scheduler. @@ -658,11 +668,7 @@ static inline bool __must_check tdp_mmu_iter_cond_resched(struct kvm *kvm, { KVM_MMU_WARN_ON(iter->yielded); - if (!need_resched() && !rwlock_needbreak(&kvm->mmu_lock)) - return false; - - /* Ensure forward progress has been made before yielding. */ - if (iter->next_last_level_gfn == iter->yielded_gfn) + if (!tdp_mmu_iter_need_resched(kvm, iter)) return false; if (flush)