Skip to content

KVM: VMX: Clean up Hyper-V PV TLB flush

Sean Christopherson kvm lkml 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v4 Latest11 patches 5 repliesIn review

Changes in v4 from the cover letter

- Rebased to kvm/queue, commit fe5f0041c026 ("KVM/SVM: Move vmenter.S exception fixups out of line"), plus the aforementioned series.
- Don't grab PCID for nested_cr3 (NPT). [Paolo]
- Collect reviews. [Vitaly]

Patches in v4 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/11KVM: x86: Get active PCID only when writing a CR3 valuearch/x86/include/asm/kvm_host.h arch/x86/kvm/mmu.h arch/x86/kvm/svm/svm.c +2 more+17 -171 reply
2/11KVM: VMX: Track common EPTP for Hyper-V's paravirt TLB flusharch/x86/kvm/vmx/vmx.c arch/x86/kvm/vmx/vmx.h+10 -110 replies
3/11KVM: VMX: Stash kvm_vmx in a local variable for Hyper-V paravirt TLB flusharch/x86/kvm/vmx/vmx.c+7 -60 replies
4/11KVM: VMX: Fold Hyper-V EPTP checking into it's only callerarch/x86/kvm/vmx/vmx.c+20 -240 replies
5/11KVM: VMX: Do Hyper-V TLB flush iff vCPU's EPTP hasn't been flushedarch/x86/kvm/vmx/vmx.c+8 -150 replies
6/11KVM: VMX: Invalidate hv_tlb_eptp to denote an EPTP mismatcharch/x86/kvm/vmx/vmx.c arch/x86/kvm/vmx/vmx.h+23 -190 replies
7/11KVM: VMX: Don't invalidate hv_tlb_eptp if the new EPTP matchesarch/x86/kvm/vmx/vmx.c+2 -10 replies
8/11KVM: VMX: Explicitly check for hv_remote_flush_tlb when loading pgdarch/x86/kvm/vmx/vmx.c+16 -70 replies
9/11KVM: VMX: Define Hyper-V paravirt TLB flush fields iff Hyper-V is enabledarch/x86/kvm/vmx/vmx.c arch/x86/kvm/vmx/vmx.h+8 -10 replies
10/11KVM: VMX: Skip additional Hyper-V TLB EPTP flushes if one failsarch/x86/kvm/vmx/vmx.c+9 -10 replies
11/11KVM: VMX: Track root HPA instead of EPTP for paravirt Hyper-V TLB flusharch/x86/kvm/vmx/vmx.c arch/x86/kvm/vmx/vmx.h+42 -470 replies

Reviews trailers per patch

All 11 patches have a Reviewed-by or Acked-by.

PatchVitaly Kuznetsov
1/11R-b
2/11R-b
3/11R-b
4/11R-b
5/11R-b
6/11R-b
7/11R-b
8/11R-b
9/11R-b
10/11R-b
11/11R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v4 thread

Cover letter [PATCH v4 00/11] KVM: VMX: Clean up Hyper-V PV TLB flush

Clean up KVM's PV TLB flushing when running with EPT on Hyper-V, i.e. as a nested VMM. No real goal in mind other than the sole patch in v1, which is a minor change to avoid a future mixup when TDX also wants to define .remote_flush_tlb. Everything else is opportunistic clean up.

NOTE: Based on my NPT+SME bug fix series[*] due to multiple conflicts with
non-trivial resolutions.

[*] https://lkml.kernel.org/r/[email protected]

Patch 1 legitimately tested on VMX and SVM (including i386). Patches 2+ smoke tested by hacking usage of the relevant flows without actually routing to the Hyper-V hypercalls (partial hack-a-patch below).

-static inline int hv_remote_flush_root_ept(hpa_t root_ept, +static inline int hv_remote_flush_root_ept(struct kvm *kvm, hpa_t root_ept,
struct kvm_tlb_range *range)
{
- if (range)
- return hyperv_flush_guest_mapping_range(root_ept,
- kvm_fill_hv_flush_list_func, (void *)range);
- else
- return hyperv_flush_guest_mapping(root_ept);
+ if (range) {
+ kvm_make_all_cpus_request(kvm, KVM_REQ_TLB_FLUSH);
+ return 0;
+ }
+
+ return -ENOMEM;
}

static int hv_remote_flush_tlb_with_range(struct kvm *kvm,
@@ -7753,8 +7754,7 @@ static __init int hardware_setup(void)

                vmx_x86_ops.update_cr8_intercept = NULL;

#if IS_ENABLED(CONFIG_HYPERV)
- if (ms_hyperv.nested_features & HV_X64_NESTED_GUEST_MAPPING_FLUSH
- && enable_ept) {

+       if (enable_ept) {
                vmx_x86_ops.tlb_remote_flush = hv_remote_flush_tlb;
                vmx_x86_ops.tlb_remote_flush_with_range =
                                hv_remote_flush_tlb_with_range;

v4:
- Rebased to kvm/queue, commit fe5f0041c026 ("KVM/SVM: Move vmenter.S exception fixups out of line"), plus the aforementioned series.
- Don't grab PCID for nested_cr3 (NPT). [Paolo]
- Collect reviews. [Vitaly]

v3:
- https://lkml.kernel.org/r/[email protected]
- Add a patch to pass the root_hpa instead of pgd to vmx_load_mmu_pgd() and retrieve the active PCID only when necessary. [Vitaly]
- Selectively collects reviews (skipped a few due to changes). [Vitaly]
- Explicitly invalidate hv_tlb_eptp instead of leaving it valid when the mismatch tracker "knows" it's invalid. [Vitaly]
- Change the last patch to use "hv_root_ept" instead of "hv_tlb_pgd" to better reflect what is actually being tracked.

v2:
- Rewrite everything.
- https://lkml.kernel.org/r/[email protected]

v1: ???

Sean Christopherson (11):
KVM: x86: Get active PCID only when writing a CR3 value
KVM: VMX: Track common EPTP for Hyper-V's paravirt TLB flush
KVM: VMX: Stash kvm_vmx in a local variable for Hyper-V paravirt TLB
flush
KVM: VMX: Fold Hyper-V EPTP checking into it's only caller
KVM: VMX: Do Hyper-V TLB flush iff vCPU's EPTP hasn't been flushed
KVM: VMX: Invalidate hv_tlb_eptp to denote an EPTP mismatch
KVM: VMX: Don't invalidate hv_tlb_eptp if the new EPTP matches
KVM: VMX: Explicitly check for hv_remote_flush_tlb when loading pgd
KVM: VMX: Define Hyper-V paravirt TLB flush fields iff Hyper-V is
enabled
KVM: VMX: Skip additional Hyper-V TLB EPTP flushes if one fails
KVM: VMX: Track root HPA instead of EPTP for paravirt Hyper-V TLB
flush

 arch/x86/include/asm/kvm_host.h |   4 +-
 arch/x86/kvm/mmu.h              |   4 +-
 arch/x86/kvm/svm/svm.c          |  10 ++-
 arch/x86/kvm/vmx/vmx.c          | 134 ++++++++++++++++++--------------
 arch/x86/kvm/vmx/vmx.h          |  19 ++---
 5 files changed, 92 insertions(+), 79 deletions(-)
Signature · 1 line
2.30.1.766.gb4fecdf3b7-goog