KVM: VMX: Explicitly check for hv_remote_flush_tlb when loading pgd()
PATCH 1/1 KVM: VMX: Explicitly check for hv_remote_flush_tlb when loading pgd()
Explicitly check that kvm_x86_ops.tlb_remote_flush() points at Hyper-V's implementation for PV flushing instead of assuming that a non-NULL implementation means running on Hyper-V. Wrap the related logic in ifdeffery as hv_remote_flush_tlb() is defined iff CONFIG_HYPERV!=n.
Short term, the explicit check makes it more obvious why a non-NULL tlb_remote_flush() triggers EPTP shenanigans. Long term, this will allow TDX to define its own implementation of tlb_remote_flush() without running afoul of Hyper-V.
--- arch/x86/kvm/vmx/vmx.c | 7 +++++-- arch/x86/kvm/vmx/vmx.h | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-)
arch/x86/kvm/vmx/vmx.c +5 -2
@@ -3073,14 +3073,15 @@ static void vmx_load_mmu_pgd(struct kvm_vcpu *vcpu, unsigned long pgd, eptp =construct_eptp (vcpu, pgd, pgd_level);vmcs_write64 (EPT_POINTER , eptp); -if (kvm_x86_ops.tlb_remote_flush) { +#if IS_ENABLED (CONFIG_HYPERV ) +if (kvm_x86_ops.tlb_remote_flush == hv_remote_flush_tlb) {spin_lock (&to_kvm_vmx (kvm)->ept_pointer_lock);to_vmx (vcpu)->ept_pointer = eptp;to_kvm_vmx (kvm)->ept_pointers_match =EPT_POINTERS_CHECK ;spin_unlock (&to_kvm_vmx (kvm)->ept_pointer_lock); } - +#endif if (!enable_unrestricted_guest && !is_paging (vcpu)) guest_cr3 =to_kvm_vmx (kvm)->ept_identity_map_addr;else if (test_bit (VCPU_EXREG_CR3 , (ulong *)&vcpu->arch.regs_avail))
@@ -6956,7 +6957,9 @@ static int vmx_create_vcpu(struct kvm_vcpu *vcpu)static int vmx_vm_init (struct kvm *kvm) { +#if IS_ENABLED (CONFIG_HYPERV )spin_lock_init (&to_kvm_vmx (kvm)->ept_pointer_lock); +#endif if (!ple_gap) kvm->arch.pause_in_guest = true;
arch/x86/kvm/vmx/vmx.h +2 -0
@@ -316,8 +316,10 @@ struct kvm_vmx {bool ept_identity_pagetable_done;gpa_t ept_identity_map_addr; +#if IS_ENABLED (CONFIG_HYPERV )enum ept_pointers_status ept_pointers_match;spinlock_t ept_pointer_lock; +#endif };bool nested_vmx_allowed (struct kvm_vcpu *vcpu);
Signature · 1 line
2.28.0
Quoted 54 lines · Sean Christopherson
Explicitly check that
kvm_x86_ops.tlb_remote_flush()points at Hyper-V's implementation for PV flushing instead of assuming that a non-NULL implementation means running on Hyper-V. Wrap the related logic in ifdeffery ashv_remote_flush_tlb()is defined iff CONFIG_HYPERV!=n.Short term, the explicit check makes it more obvious why a non-NULL
tlb_remote_flush()triggers EPTP shenanigans. Long term, this will allow TDX to define its own implementation oftlb_remote_flush()without running afoul of Hyper-V.Cc Vitaly Kuznetsov <[email protected]>Signed-off-by Sean Christopherson <[email protected]>--- arch/x86/kvm/vmx/vmx.c | 7 +++++-- arch/x86/kvm/vmx/vmx.h | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-)arch/x86/kvm/vmx/vmx.c +5
-2@@ -3073,14 +3073,15 @@ static void vmx_load_mmu_pgd(struct kvm_vcpu *vcpu, unsigned long pgd, eptp =construct_eptp (vcpu, pgd, pgd_level);vmcs_write64 (EPT_POINTER , eptp); -if (kvm_x86_ops.tlb_remote_flush) { +#if IS_ENABLED (CONFIG_HYPERV ) +if (kvm_x86_ops.tlb_remote_flush == hv_remote_flush_tlb) {spin_lock (&to_kvm_vmx (kvm)->ept_pointer_lock);to_vmx (vcpu)->ept_pointer = eptp;to_kvm_vmx (kvm)->ept_pointers_match =EPT_POINTERS_CHECK ;spin_unlock (&to_kvm_vmx (kvm)->ept_pointer_lock); } - +#endif if (!enable_unrestricted_guest && !is_paging (vcpu)) guest_cr3 =to_kvm_vmx (kvm)->ept_identity_map_addr;else if (test_bit (VCPU_EXREG_CR3 , (ulong *)&vcpu->arch.regs_avail))@@ -6956,7 +6957,9 @@ static int vmx_create_vcpu(struct kvm_vcpu *vcpu)static int vmx_vm_init (struct kvm *kvm) { +#if IS_ENABLED (CONFIG_HYPERV )spin_lock_init (&to_kvm_vmx (kvm)->ept_pointer_lock); +#endif if (!ple_gap) kvm->arch.pause_in_guest = true;arch/x86/kvm/vmx/vmx.h +0
-0
arch/x86/kvm/vmx/vmx.h struct kvm_vmx { · line 322
Quoted 7 lines
arch/x86/kvm/vmx/vmx.h +2
-0@@ -316,8 +316,10 @@ struct kvm_vmx {bool ept_identity_pagetable_done;gpa_t ept_identity_map_addr; +#if IS_ENABLED (CONFIG_HYPERV )enum ept_pointers_status ept_pointers_match;spinlock_t ept_pointer_lock; +#endif
In case ept_pointers_match/ept_pointer_lock are useless for TDX we may want to find better names for them to make it clear this is a Hyper-V thingy (e.g. something like hv_tlb_ept_match/hv_tlb_ept_lock).
Quoted 3 lines
arch/x86/kvm/vmx/vmx.h +0
-0};bool nested_vmx_allowed (struct kvm_vcpu *vcpu);
Signature · 1 line
Vitaly
Quoted 11 lines · Vitaly Kuznetsov
arch/x86/kvm/vmx/vmx.h struct kvm_vmx { · line 322
Quoted 4 lines · Sean Christopherson
arch/x86/kvm/vmx/vmx.h +2
-0+#if IS_ENABLED (CONFIG_HYPERV )enum ept_pointers_status ept_pointers_match;spinlock_t ept_pointer_lock; +#endif Reviewed-by Vitaly Kuznetsov <[email protected]>In case ept_pointers_match/ept_pointer_lock are useless for TDX we may want to find better names for them to make it clear this is a Hyper-V thingy (e.g. something like hv_tlb_ept_match/hv_tlb_ept_lock).
Good call. I'll send a v2, looking at hv_remote_flush_tlb_with_range(), I think there are additional cleanups/optimizations that can be done, e.g. do the extra flushes only on vCPUs with a mistmatching EPTP instead of flushing all vCPUs' EPTPs if _any_ vCPU has a mismatched EPTP.
Quoted 8 lines
Quoted 4 lines
};
bool
nested_vmx_allowed(struct kvm_vcpu *vcpu);Signature · 1 line
Vitaly