Skip to content

Commit 0103098

Browse files
sean-jcbonzini
authored andcommitted
KVM: x86/mmu: Don't step down in the TDP iterator when zapping all SPTEs
Set the min_level for the TDP iterator at the root level when zapping all SPTEs to optimize the iterator's try_step_down(). Zapping a non-leaf SPTE will recursively zap all its children, thus there is no need for the iterator to attempt to step down. This avoids rereading the top-level SPTEs after they are zapped by causing try_step_down() to short-circuit. In most cases, optimizing try_step_down() will be in the noise as the cost of zapping SPTEs completely dominates the overall time. The optimization is however helpful if the zap occurs with relatively few SPTEs, e.g. if KVM is zapping in response to multiple memslot updates when userspace is adding and removing read-only memslots for option ROMs. In that case, the task doing the zapping likely isn't a vCPU thread, but it still holds mmu_lock for read and thus can be a noisy neighbor of sorts. Reviewed-by: Ben Gardon <[email protected]> Signed-off-by: Sean Christopherson <[email protected]> Message-Id: <[email protected]> Signed-off-by: Paolo Bonzini <[email protected]>
1 parent 524a1e4 commit 0103098

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

arch/x86/kvm/mmu/tdp_mmu.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -727,6 +727,12 @@ static bool zap_gfn_range(struct kvm *kvm, struct kvm_mmu_page *root,
727727
bool zap_all = (start == 0 && end >= max_gfn_host);
728728
struct tdp_iter iter;
729729

730+
/*
731+
* No need to try to step down in the iterator when zapping all SPTEs,
732+
* zapping the top-level non-leaf SPTEs will recurse on their children.
733+
*/
734+
int min_level = zap_all ? root->role.level : PG_LEVEL_4K;
735+
730736
/*
731737
* Bound the walk at host.MAXPHYADDR, guest accesses beyond that will
732738
* hit a #PF(RSVD) and never get to an EPT Violation/Misconfig / #NPF,
@@ -738,7 +744,8 @@ static bool zap_gfn_range(struct kvm *kvm, struct kvm_mmu_page *root,
738744

739745
rcu_read_lock();
740746

741-
tdp_root_for_each_pte(iter, root, start, end) {
747+
for_each_tdp_pte_min_level(iter, root->spt, root->role.level,
748+
min_level, start, end) {
742749
retry:
743750
if (can_yield &&
744751
tdp_mmu_iter_cond_resched(kvm, &iter, flush, shared)) {

0 commit comments

Comments
 (0)