Use MMU read lock to recover NX huge pages belonging to TDP MMU. Iterate
through kvm->arch.possible_nx_huge_pages while holding
kvm->arch.tdp_mmu_pages_lock. Rename kvm_tdp_mmu_zap_sp() to
tdp_mmu_zap_sp() and make it static as there are no callers outside of
TDP MMU.
Ignore the zapping if any of the following is true for parent pte:
- Pointing to some other page table.
- Pointing to a huge page.
- Not present.
These scenarios can happen as recovering is running under MMU read lock.
Zapping under MMU read lock unblock vCPUs which are waiting for MMU read
lock too.
This optimizaion was created to solve a guest jitter issue on Windows VM
which was observing an increase in network latency. The test workload sets
up two Windows VM and use latte.exe[1] binary to run network latency
benchmark. Running NX huge page recovery under MMU lock was causing
latency to increase up to 30 ms because vCPUs were waiting for MMU lock.
Running the tool on VMs using MMU read lock NX huge page recovery
removed the jitter issue completely and MMU lock wait time by vCPUs was
also reduced.
Command used for testing:
Server:
latte.exe -udp -a 192.168.100.1:9000 -i 10000000
Client:
latte.exe -c -udp -a 192.168.100.1:9000 -i 10000000 -hist -hl 1000 -hc 30
Output from the latency tool on client:
Before
------
Protocol UDP
SendMethod Blocking
ReceiveMethod Blocking
SO_SNDBUF Default
SO_RCVBUF Default
MsgSize(byte) 4
Iterations 10000000
Latency(usec) 70.41
CPU(%) 1.7
CtxSwitch/sec 31125 (2.19/iteration)
SysCall/sec 62184 (4.38/iteration)
Interrupt/sec 48319 (3.40/iteration)
Interval(usec) Frequency
0 9999964
1000 12
2000 3
3000 0
4000 0
5000 0
6000 0
7000 1
8000 1
9000 1
10000 2
11000 1
12000 0
13000 4
14000 1
15000 1
16000 4
17000 1
18000 2
19000 0
20000 0
21000 1
22000 0
23000 0
24000 1
After
-----
Protocol UDP
SendMethod Blocking
ReceiveMethod Blocking
SO_SNDBUF Default
SO_RCVBUF Default
MsgSize(byte) 4
Iterations 10000000
Latency(usec) 70.98
CPU(%) 1.3
CtxSwitch/sec 28967 (2.06/iteration)
SysCall/sec 48988 (3.48/iteration)
Interrupt/sec 47280 (3.36/iteration)
Interval(usec) Frequency
0 9999996
1000 4
[1] https://github.com/microsoft/latte
Signed-off-by: Vipin Sharma <vipinsh@xxxxxxxxxx>
---
arch/x86/kvm/mmu/mmu.c | 10 +++++---
arch/x86/kvm/mmu/tdp_mmu.c | 48 ++++++++++++++++++++++++++------------
arch/x86/kvm/mmu/tdp_mmu.h | 1 -
3 files changed, 40 insertions(+), 19 deletions(-)
diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
index 5534fcc9d1b5..d95770d5303a 100644
--- a/arch/x86/kvm/mmu/mmu.c
+++ b/arch/x86/kvm/mmu/mmu.c
@@ -7321,6 +7321,7 @@ struct kvm_mmu_page *kvm_mmu_possible_nx_huge_page(struct kvm *kvm, bool tdp_mmu
struct kvm_mmu_page *sp = NULL;
ulong i = 0;
+ spin_lock(&kvm->arch.tdp_mmu_pages_lock);
/*
* We use a separate list instead of just using active_mmu_pages because
* the number of shadow pages that be replaced with an NX huge page is
@@ -7330,10 +7331,13 @@ struct kvm_mmu_page *kvm_mmu_possible_nx_huge_page(struct kvm *kvm, bool tdp_mmu
list_for_each_entry(sp, &kvm->arch.possible_nx_huge_pages, possible_nx_huge_page_link) {
if (i++ >= max)
break;
- if (is_tdp_mmu_page(sp) == tdp_mmu)
+ if (is_tdp_mmu_page(sp) == tdp_mmu) {
+ spin_unlock(&kvm->arch.tdp_mmu_pages_lock);
return sp;
+ }
}
+ spin_unlock(&kvm->arch.tdp_mmu_pages_lock);
return NULL;
}
@@ -7422,9 +7426,9 @@ static void kvm_recover_nx_huge_pages(struct kvm *kvm)
rcu_idx = srcu_read_lock(&kvm->srcu);
if (to_zap && tdp_mmu_enabled) {
- write_lock(&kvm->mmu_lock);
+ read_lock(&kvm->mmu_lock);
to_zap = kvm_tdp_mmu_recover_nx_huge_pages(kvm, to_zap);
- write_unlock(&kvm->mmu_lock);
+ read_unlock(&kvm->mmu_lock);
}
if (to_zap && kvm_memslots_have_rmaps(kvm)) {
diff --git a/arch/x86/kvm/mmu/tdp_mmu.c b/arch/x86/kvm/mmu/tdp_mmu.c
index 933bb8b11c9f..7c7d207ee590 100644
--- a/arch/x86/kvm/mmu/tdp_mmu.c
+++ b/arch/x86/kvm/mmu/tdp_mmu.c
@@ -817,9 +817,11 @@ static void tdp_mmu_zap_root(struct kvm *kvm, struct kvm_mmu_page *root,
rcu_read_unlock();
}
-bool kvm_tdp_mmu_zap_sp(struct kvm *kvm, struct kvm_mmu_page *sp)
+static bool tdp_mmu_zap_sp(struct kvm *kvm, struct kvm_mmu_page *sp)
{
- u64 old_spte;
+ struct tdp_iter iter = {};
+
+ lockdep_assert_held_read(&kvm->mmu_lock);
/*
* This helper intentionally doesn't allow zapping a root shadow page,
@@ -828,12 +830,25 @@ bool kvm_tdp_mmu_zap_sp(struct kvm *kvm, struct kvm_mmu_page *sp)
if (WARN_ON_ONCE(!sp->ptep))
return false;
- old_spte = kvm_tdp_mmu_read_spte(sp->ptep);
- if (WARN_ON_ONCE(!is_shadow_present_pte(old_spte)))
+ iter.old_spte = kvm_tdp_mmu_read_spte(sp->ptep);
+ iter.sptep = sp->ptep;
+ iter.level = sp->role.level + 1;
+ iter.gfn = sp->gfn;
+ iter.as_id = kvm_mmu_page_as_id(sp);
+
+retry:
+ /*
+ * Since mmu_lock is held in read mode, it's possible to race with
+ * another CPU which can remove sp from the page table hierarchy.
+ *
+ * No need to re-read iter.old_spte as tdp_mmu_set_spte_atomic() will
+ * update it in the case of failure.
+ */
+ if (sp->spt != spte_to_child_pt(iter.old_spte, iter.level))
return false;
- tdp_mmu_set_spte(kvm, kvm_mmu_page_as_id(sp), sp->ptep, old_spte,
- SHADOW_NONPRESENT_VALUE, sp->gfn, sp->role.level + 1);
+ if (tdp_mmu_set_spte_atomic(kvm, &iter, SHADOW_NONPRESENT_VALUE))
+ goto retry;
return true;
}
@@ -1807,7 +1822,7 @@ ulong kvm_tdp_mmu_recover_nx_huge_pages(struct kvm *kvm, ulong to_zap)
struct kvm_mmu_page *sp;
bool flush = false;
- lockdep_assert_held_write(&kvm->mmu_lock);
+ lockdep_assert_held_read(&kvm->mmu_lock);
/*
* Zapping TDP MMU shadow pages, including the remote TLB flush, must
* be done under RCU protection, because the pages are freed via RCU
@@ -1821,7 +1836,6 @@ ulong kvm_tdp_mmu_recover_nx_huge_pages(struct kvm *kvm, ulong to_zap)
if (!sp)
break;
- WARN_ON_ONCE(!sp->nx_huge_page_disallowed);
WARN_ON_ONCE(!sp->role.direct);
/*
@@ -1831,12 +1845,17 @@ ulong kvm_tdp_mmu_recover_nx_huge_pages(struct kvm *kvm, ulong to_zap)
* recovered, along with all the other huge pages in the slot,
* when dirty logging is disabled.
*/
- if (kvm_mmu_sp_dirty_logging_enabled(kvm, sp))
+ if (kvm_mmu_sp_dirty_logging_enabled(kvm, sp)) {
+ spin_lock(&kvm->arch.tdp_mmu_pages_lock);
unaccount_nx_huge_page(kvm, sp);
- else
- flush |= kvm_tdp_mmu_zap_sp(kvm, sp);
-
- WARN_ON_ONCE(sp->nx_huge_page_disallowed);
+ spin_unlock(&kvm->arch.tdp_mmu_pages_lock);
+ to_zap--;
+ WARN_ON_ONCE(sp->nx_huge_page_disallowed);
+ } else if (tdp_mmu_zap_sp(kvm, sp)) {
+ flush = true;
+ to_zap--;
+ WARN_ON_ONCE(sp->nx_huge_page_disallowed);
+ }
if (need_resched() || rwlock_needbreak(&kvm->mmu_lock)) {
if (flush) {
@@ -1844,10 +1863,9 @@ ulong kvm_tdp_mmu_recover_nx_huge_pages(struct kvm *kvm, ulong to_zap)
flush = false;
}
rcu_read_unlock();
- cond_resched_rwlock_write(&kvm->mmu_lock);
+ cond_resched_rwlock_read(&kvm->mmu_lock);
rcu_read_lock();
}
- to_zap--;
}
if (flush)
diff --git a/arch/x86/kvm/mmu/tdp_mmu.h b/arch/x86/kvm/mmu/tdp_mmu.h
index 7d68c2ddf78c..e0315cce6798 100644
--- a/arch/x86/kvm/mmu/tdp_mmu.h
+++ b/arch/x86/kvm/mmu/tdp_mmu.h
@@ -20,7 +20,6 @@ __must_check static inline bool kvm_tdp_mmu_get_root(struct kvm_mmu_page *root)
void kvm_tdp_mmu_put_root(struct kvm *kvm, struct kvm_mmu_page *root);
bool kvm_tdp_mmu_zap_leafs(struct kvm *kvm, gfn_t start, gfn_t end, bool flush);
-bool kvm_tdp_mmu_zap_sp(struct kvm *kvm, struct kvm_mmu_page *sp);
void kvm_tdp_mmu_zap_all(struct kvm *kvm);
void kvm_tdp_mmu_invalidate_all_roots(struct kvm *kvm);
void kvm_tdp_mmu_zap_invalidated_roots(struct kvm *kvm);
--
2.46.0.76.ge559c4bf1a-goog
