Skip to content

Commit d02c357

Browse files
committed
KVM: x86/mmu: Retry fault before acquiring mmu_lock if mapping is changing
Retry page faults without acquiring mmu_lock, and without even faulting the page into the primary MMU, if the resolved gfn is covered by an active invalidation. Contending for mmu_lock is especially problematic on preemptible kernels as the mmu_notifier invalidation task will yield mmu_lock (see rwlock_needbreak()), delay the in-progress invalidation, and ultimately increase the latency of resolving the page fault. And in the worst case scenario, yielding will be accompanied by a remote TLB flush, e.g. if the invalidation covers a large range of memory and vCPUs are accessing addresses that were already zapped. Faulting the page into the primary MMU is similarly problematic, as doing so may acquire locks that need to be taken for the invalidation to complete (the primary MMU has finer grained locks than KVM's MMU), and/or may cause unnecessary churn (getting/putting pages, marking them accessed, etc). Alternatively, the yielding issue could be mitigated by teaching KVM's MMU iterators to perform more work before yielding, but that wouldn't solve the lock contention and would negatively affect scenarios where a vCPU is trying to fault in an address that is NOT covered by the in-progress invalidation. Add a dedicated lockess version of the range-based retry check to avoid false positives on the sanity check on start+end WARN, and so that it's super obvious that checking for a racing invalidation without holding mmu_lock is unsafe (though obviously useful). Wrap mmu_invalidate_in_progress in READ_ONCE() to ensure that pre-checking invalidation in a loop won't put KVM into an infinite loop, e.g. due to caching the in-progress flag and never seeing it go to '0'. Force a load of mmu_invalidate_seq as well, even though it isn't strictly necessary to avoid an infinite loop, as doing so improves the probability that KVM will detect an invalidation that already completed before acquiring mmu_lock and bailing anyways. Do the pre-check even for non-preemptible kernels, as waiting to detect the invalidation until mmu_lock is held guarantees the vCPU will observe the worst case latency in terms of handling the fault, and can generate even more mmu_lock contention. E.g. the vCPU will acquire mmu_lock, detect retry, drop mmu_lock, re-enter the guest, retake the fault, and eventually re-acquire mmu_lock. This behavior is also why there are no new starvation issues due to losing the fairness guarantees provided by rwlocks: if the vCPU needs to retry, it _must_ drop mmu_lock, i.e. waiting on mmu_lock doesn't guarantee forward progress in the face of _another_ mmu_notifier invalidation event. Note, adding READ_ONCE() isn't entirely free, e.g. on x86, the READ_ONCE() may generate a load into a register instead of doing a direct comparison (MOV+TEST+Jcc instead of CMP+Jcc), but practically speaking the added cost is a few bytes of code and maaaaybe a cycle or three. Reported-by: Yan Zhao <yan.y.zhao@intel.com> Closes: https://lore.kernel.org/all/ZNnPF4W26ZbAyGto@yzhao56-desk.sh.intel.com Reported-by: Friedrich Weber <f.weber@proxmox.com> Cc: Kai Huang <kai.huang@intel.com> Cc: Yan Zhao <yan.y.zhao@intel.com> Cc: Yuan Yao <yuan.yao@linux.intel.com> Cc: Xu Yilun <yilun.xu@linux.intel.com> Acked-by: Kai Huang <kai.huang@intel.com> Reviewed-by: Yan Zhao <yan.y.zhao@intel.com> Link: https://lore.kernel.org/r/20240222012640.2820927-1-seanjc@google.com Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent 910c57d commit d02c357

File tree

2 files changed

+68
-0
lines changed

2 files changed

+68
-0
lines changed

arch/x86/kvm/mmu/mmu.c

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4405,6 +4405,31 @@ static int kvm_faultin_pfn(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault,
44054405
fault->mmu_seq = vcpu->kvm->mmu_invalidate_seq;
44064406
smp_rmb();
44074407

4408+
/*
4409+
* Check for a relevant mmu_notifier invalidation event before getting
4410+
* the pfn from the primary MMU, and before acquiring mmu_lock.
4411+
*
4412+
* For mmu_lock, if there is an in-progress invalidation and the kernel
4413+
* allows preemption, the invalidation task may drop mmu_lock and yield
4414+
* in response to mmu_lock being contended, which is *very* counter-
4415+
* productive as this vCPU can't actually make forward progress until
4416+
* the invalidation completes.
4417+
*
4418+
* Retrying now can also avoid unnessary lock contention in the primary
4419+
* MMU, as the primary MMU doesn't necessarily hold a single lock for
4420+
* the duration of the invalidation, i.e. faulting in a conflicting pfn
4421+
* can cause the invalidation to take longer by holding locks that are
4422+
* needed to complete the invalidation.
4423+
*
4424+
* Do the pre-check even for non-preemtible kernels, i.e. even if KVM
4425+
* will never yield mmu_lock in response to contention, as this vCPU is
4426+
* *guaranteed* to need to retry, i.e. waiting until mmu_lock is held
4427+
* to detect retry guarantees the worst case latency for the vCPU.
4428+
*/
4429+
if (fault->slot &&
4430+
mmu_invalidate_retry_gfn_unsafe(vcpu->kvm, fault->mmu_seq, fault->gfn))
4431+
return RET_PF_RETRY;
4432+
44084433
ret = __kvm_faultin_pfn(vcpu, fault);
44094434
if (ret != RET_PF_CONTINUE)
44104435
return ret;
@@ -4415,6 +4440,18 @@ static int kvm_faultin_pfn(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault,
44154440
if (unlikely(!fault->slot))
44164441
return kvm_handle_noslot_fault(vcpu, fault, access);
44174442

4443+
/*
4444+
* Check again for a relevant mmu_notifier invalidation event purely to
4445+
* avoid contending mmu_lock. Most invalidations will be detected by
4446+
* the previous check, but checking is extremely cheap relative to the
4447+
* overall cost of failing to detect the invalidation until after
4448+
* mmu_lock is acquired.
4449+
*/
4450+
if (mmu_invalidate_retry_gfn_unsafe(vcpu->kvm, fault->mmu_seq, fault->gfn)) {
4451+
kvm_release_pfn_clean(fault->pfn);
4452+
return RET_PF_RETRY;
4453+
}
4454+
44184455
return RET_PF_CONTINUE;
44194456
}
44204457

@@ -4442,6 +4479,11 @@ static bool is_page_fault_stale(struct kvm_vcpu *vcpu,
44424479
if (!sp && kvm_test_request(KVM_REQ_MMU_FREE_OBSOLETE_ROOTS, vcpu))
44434480
return true;
44444481

4482+
/*
4483+
* Check for a relevant mmu_notifier invalidation event one last time
4484+
* now that mmu_lock is held, as the "unsafe" checks performed without
4485+
* holding mmu_lock can get false negatives.
4486+
*/
44454487
return fault->slot &&
44464488
mmu_invalidate_retry_gfn(vcpu->kvm, fault->mmu_seq, fault->gfn);
44474489
}

include/linux/kvm_host.h

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2031,6 +2031,32 @@ static inline int mmu_invalidate_retry_gfn(struct kvm *kvm,
20312031
return 1;
20322032
return 0;
20332033
}
2034+
2035+
/*
2036+
* This lockless version of the range-based retry check *must* be paired with a
2037+
* call to the locked version after acquiring mmu_lock, i.e. this is safe to
2038+
* use only as a pre-check to avoid contending mmu_lock. This version *will*
2039+
* get false negatives and false positives.
2040+
*/
2041+
static inline bool mmu_invalidate_retry_gfn_unsafe(struct kvm *kvm,
2042+
unsigned long mmu_seq,
2043+
gfn_t gfn)
2044+
{
2045+
/*
2046+
* Use READ_ONCE() to ensure the in-progress flag and sequence counter
2047+
* are always read from memory, e.g. so that checking for retry in a
2048+
* loop won't result in an infinite retry loop. Don't force loads for
2049+
* start+end, as the key to avoiding infinite retry loops is observing
2050+
* the 1=>0 transition of in-progress, i.e. getting false negatives
2051+
* due to stale start+end values is acceptable.
2052+
*/
2053+
if (unlikely(READ_ONCE(kvm->mmu_invalidate_in_progress)) &&
2054+
gfn >= kvm->mmu_invalidate_range_start &&
2055+
gfn < kvm->mmu_invalidate_range_end)
2056+
return true;
2057+
2058+
return READ_ONCE(kvm->mmu_invalidate_seq) != mmu_seq;
2059+
}
20342060
#endif
20352061

20362062
#ifdef CONFIG_HAVE_KVM_IRQ_ROUTING

0 commit comments

Comments
 (0)