KVM: x86: Make Hyper-V emulation optional
Vitaly Kuznetsov
maintainerv2 cover KVM: x86: Make Hyper-V emulation optional
v1:
https://lore.kernel.org/kvm/[email protected]/
Changes since RFC:
- "KVM: x86: hyper-v: Split off nested_evmcs_handle_vmclear()" patch added [Sean]
- "KVM: nVMX: Move guest_cpuid_has_evmcs() to hyperv.h" patch added [Sean]
- Use evmptr_is_set()/nested_vmx_is_evmptr12_set() helpers instead of nested_vmx_evmptr12() [Sean]
- Move "#ifdef CONFIG_KVM_HYPERV" inside certain functions instead of adding stubs for !CONFIG_KVM_HYPERV case [Sean]
- Minor code re-shuffling [Sean]
- Collect R-b tags [Max]
KVM supports emulating Microsoft Hyper-V as well as running as a nested (L1) hypervisor on top of Hyper-V whileusing Hyper-V specific PV features. Support for the later is only compiled in when CONFIG_HYPERV is set. This series makes it possible to disable the former with a newly introduced CONFIG_KVM_HYPERV option. This helps to reduce sized of KVM modules as well as the attack surface for some specific deployments when no Windows/Hyper-V guests are expected. The size gain is significant:
# CONFIG_KVM_HYPERV is not set
# CONFIG_HYPERV is not set
-rw-r--r--. 1 user user 3612632 Oct 10 16:53 arch/x86/kvm/kvm-amd.ko
-rw-r--r--. 1 user user 5343968 Oct 10 16:53 arch/x86/kvm/kvm-intel.ko
CONFIG_KVM_HYPERV=y
# CONFIG_HYPERV is not set
-rw-r--r--. 1 user user 3925704 Oct 10 16:51 arch/x86/kvm/kvm-amd.ko
-rw-r--r--. 1 user user 5819192 Oct 10 16:51 arch/x86/kvm/kvm-intel.ko
# CONFIG_KVM_HYPERV is not set
CONFIG_HYPERV=m
-rw-r--r--. 1 user user 3928440 Oct 10 16:40 arch/x86/kvm/kvm-amd.ko
-rw-r--r--. 1 user user 8156464 Oct 10 16:40 arch/x86/kvm/kvm-intel.ko
CONFIG_KVM_HYPERV=y
CONFIG_HYPERV=m
-rw-r--r--. 1 user user 4245440 Oct 10 16:37 arch/x86/kvm/kvm-amd.ko
-rw-r--r--. 1 user user 8583872 Oct 10 16:37 arch/x86/kvm/kvm-intel.koThe series is not supposed to introduce any functional change for the "CONFIG_KVM_HYPERV=y && CONFIG_HYPERV=m/y" case. Tested with KVM selftests, kvm-unit-tests and real Windows guests on VMX and SVM. Note, kvm-unit-tests have to be updated to not fail miserably when CONFIG_KVM_HYPERV is not set:
https://lore.kernel.org/kvm/[email protected]/
Vitaly Kuznetsov (16):
KVM: x86: xen: Remove unneeded xen context from struct kvm_arch when
!CONFIG_KVM_XEN
KVM: x86: hyper-v: Move Hyper-V partition assist page out of Hyper-V
emulation context
KVM: VMX: Split off vmx_onhyperv.{ch} from hyperv.{ch}
KVM: x86: hyper-v: Introduce kvm_hv_synic_auto_eoi_set()
KVM: x86: hyper-v: Introduce kvm_hv_synic_has_vector()
KVM: VMX: Split off hyperv_evmcs.{ch}
KVM: x86: hyper-v: Introduce kvm_hv_nested_transtion_tlb_flush()
helper
KVM: x86: hyper-v: Split off nested_evmcs_handle_vmclear()
KVM: selftests: Make all Hyper-V tests explicitly dependent on Hyper-V
emulation support in KVM
KVM: selftests: Fix vmxon_pa == vmcs12_pa == -1ull
vmx_set_nested_state_test for !eVMCS case
KVM: nVMX: Move guest_cpuid_has_evmcs() to hyperv.h
KVM: x86: Make Hyper-V emulation optional
KVM: nVMX: hyper-v: Introduce nested_vmx_is_evmptr12_{valid,set}()
helpers
KVM: nVMX: hyper-v: Introduce nested_vmx_evmcs() accessor
KVM: nVMX: hyper-v: Hide more stuff under CONFIG_KVM_HYPERV
KVM: nSVM: hyper-v: Hide more stuff under
CONFIG_KVM_HYPERV/CONFIG_HYPERV
arch/x86/include/asm/kvm_host.h | 13 +- arch/x86/kvm/Kconfig | 14 + arch/x86/kvm/Makefile | 16 +- arch/x86/kvm/cpuid.c | 6 + arch/x86/kvm/hyperv.h | 83 +++- arch/x86/kvm/irq.c | 2 + arch/x86/kvm/irq_comm.c | 9 +- arch/x86/kvm/kvm_onhyperv.h | 20 + arch/x86/kvm/lapic.c | 5 +- arch/x86/kvm/svm/hyperv.h | 9 + arch/x86/kvm/svm/nested.c | 30 +- arch/x86/kvm/svm/svm.h | 2 + arch/x86/kvm/svm/svm_onhyperv.c | 10 +- arch/x86/kvm/vmx/hyperv.c | 447 ------------------ arch/x86/kvm/vmx/hyperv.h | 204 ++------ arch/x86/kvm/vmx/hyperv_evmcs.c | 315 ++++++++++++ arch/x86/kvm/vmx/hyperv_evmcs.h | 166 +++++++ arch/x86/kvm/vmx/nested.c | 149 +++--- arch/x86/kvm/vmx/nested.h | 3 +- arch/x86/kvm/vmx/vmx.c | 20 +- arch/x86/kvm/vmx/vmx.h | 12 +- arch/x86/kvm/vmx/vmx_onhyperv.c | 36 ++ arch/x86/kvm/vmx/vmx_onhyperv.h | 125 +++++ arch/x86/kvm/vmx/vmx_ops.h | 2 +- arch/x86/kvm/x86.c | 66 ++- .../selftests/kvm/x86_64/hyperv_clock.c | 2 + .../selftests/kvm/x86_64/hyperv_evmcs.c | 5 +- .../kvm/x86_64/hyperv_extended_hypercalls.c | 2 + .../selftests/kvm/x86_64/hyperv_features.c | 2 + .../testing/selftests/kvm/x86_64/hyperv_ipi.c | 2 + .../selftests/kvm/x86_64/hyperv_svm_test.c | 1 + .../selftests/kvm/x86_64/hyperv_tlb_flush.c | 2 + .../kvm/x86_64/vmx_set_nested_state_test.c | 16 +- 33 files changed, 1054 insertions(+), 742 deletions(-) create mode 100644 arch/x86/kvm/vmx/hyperv_evmcs.c create mode 100644 arch/x86/kvm/vmx/hyperv_evmcs.h create mode 100644 arch/x86/kvm/vmx/vmx_onhyperv.c create mode 100644 arch/x86/kvm/vmx/vmx_onhyperv.h
Signature · 1 line
2.43.0
Vitaly Kuznetsov
maintainerPATCH v2 1/16 KVM: x86: xen: Remove unneeded xen context from struct kvm_arch when !CONFIG_KVM_XEN
Saving a few bytes of memory per KVM VM is certainly great but what's more important is the ability to see where the code accesses Xen emulation context while CONFIG_KVM_XEN is not enabled. Currently, kvm_cpu_get_extint() is the only such place and it is harmless: kvm_xen_has_interrupt() always returns '0' when !CONFIG_KVM_XEN.
No functional change intended.
--- arch/x86/include/asm/kvm_host.h | 5 +++++ arch/x86/kvm/irq.c | 2 ++ 2 files changed, 7 insertions(+)
arch/x86/include/asm/kvm_host.h +5 -0
@@ -1136,6 +1136,7 @@ struct msr_bitmap_range {unsigned long *bitmap; }; +#ifdef CONFIG_KVM_XEN /* Xen emulation context */ struct kvm_xen { struct mutex xen_lock;
@@ -1147,6 +1148,7 @@ struct kvm_xen {struct idr evtchn_ports;unsigned long poll_mask[BITS_TO_LONGS (KVM_MAX_VCPUS )]; }; +#endif enum kvm_irqchip_mode {KVM_IRQCHIP_NONE ,
@@ -1349,7 +1351,10 @@ struct kvm_arch {struct hlist_head mask_notifier_list;struct kvm_hv hyperv; + +#ifdef CONFIG_KVM_XEN struct kvm_xen xen; +#endif bool backwards_tsc_observed;bool boot_vcpu_runs_old_kvmclock;
arch/x86/kvm/irq.c +2 -0
@@ -118,8 +118,10 @@ static int kvm_cpu_get_extint(struct kvm_vcpu *v)if (!lapic_in_kernel (v))return v->arch.interrupt.nr; +#ifdef CONFIG_KVM_XEN if (kvm_xen_has_interrupt (v))return v->kvm->arch.xen.upcall_vector; +#endif if (irqchip_split (v->kvm)) {int vector = v->arch.pending_external_vector;
Signature · 1 line
2.43.0
Vitaly Kuznetsov
maintainerPATCH v2 2/16 KVM: x86: hyper-v: Move Hyper-V partition assist page out of Hyper-V emulation context
In reply to Vitaly KuznetsovHyper-V partition assist page is used when KVM runs on top of Hyper-V and is not used for Windows/Hyper-V guests on KVM, this means that 'hv_pa_pg' placement in 'struct kvm_hv' is unfortunate. As a preparation to making Hyper-V emulation optional, move 'hv_pa_pg' to 'struct kvm_arch' and put it under CONFIG_HYPERV.
While on it, introduce hv_get_partition_assist_page() helper to allocate partition assist page. Move the comment explaining why we use a single page for all vCPUs from VMX and expand it a bit.
No functional change intended.
--- arch/x86/include/asm/kvm_host.h | 2 +- arch/x86/kvm/kvm_onhyperv.h | 20 ++++++++++++++++++++ arch/x86/kvm/svm/svm_onhyperv.c | 10 +++------- arch/x86/kvm/vmx/vmx.c | 14 +++----------- arch/x86/kvm/x86.c | 4 +++- 5 files changed, 30 insertions(+), 20 deletions(-)
arch/x86/include/asm/kvm_host.h +1 -1
@@ -1125,7 +1125,6 @@ struct kvm_hv {*/ unsigned int synic_auto_eoi_used; -struct hv_partition_assist_pg *hv_pa_pg;struct kvm_hv_syndbg hv_syndbg; };
@@ -1447,6 +1446,7 @@ struct kvm_arch {#if IS_ENABLED (CONFIG_HYPERV )hpa_t hv_root_tdp;spinlock_t hv_root_tdp_lock; +struct hv_partition_assist_pg *hv_pa_pg;#endif /* * VM-scope maximum vCPU ID. Used to determine the size of structures
arch/x86/kvm/kvm_onhyperv.h +20 -0
@@ -10,6 +10,26 @@int hv_flush_remote_tlbs_range (struct kvm *kvm,gfn_t gfn,gfn_t nr_pages);int hv_flush_remote_tlbs (struct kvm *kvm);void hv_track_root_tdp (struct kvm_vcpu *vcpu,hpa_t root_tdp); +static inline hpa_t hv_get_partition_assist_page (struct kvm_vcpu *vcpu) +{ +/* +* Partition assist page is something which Hyper-V running in L0 +* requires from KVM running in L1 before direct TLB flush for L2 +* guests can be enabled. KVM doesn't currently use the page but to +* comply with TLFS it still needs to be allocated. For now, this +* is a single page shared among all vCPUs. +*/ +struct hv_partition_assist_pg **p_hv_pa_pg = + &vcpu->kvm->arch.hv_pa_pg; + +if (!*p_hv_pa_pg) + *p_hv_pa_pg =kzalloc (PAGE_SIZE ,GFP_KERNEL_ACCOUNT ); + +if (!*p_hv_pa_pg) +return INVALID_PAGE ; + +return __pa (*p_hv_pa_pg); +}#else /* !CONFIG_HYPERV */ static inline int hv_flush_remote_tlbs (struct kvm *kvm) {
arch/x86/kvm/svm/svm_onhyperv.c +3 -7
@@ -18,18 +18,14 @@int svm_hv_enable_l2_tlb_flush (struct kvm_vcpu *vcpu) {struct hv_vmcb_enlightenments *hve; -struct hv_partition_assist_pg **p_hv_pa_pg = - &to_kvm_hv (vcpu->kvm)->hv_pa_pg; +hpa_t partition_assist_page =hv_get_partition_assist_page (vcpu); -if (!*p_hv_pa_pg) - *p_hv_pa_pg =kzalloc (PAGE_SIZE ,GFP_KERNEL ); - -if (!*p_hv_pa_pg) +if (partition_assist_page ==INVALID_PAGE )return -ENOMEM ; hve = &to_svm (vcpu)->vmcb->control.hv_enlightenments; - hve->partition_assist_page =__pa (*p_hv_pa_pg); + hve->partition_assist_page = partition_assist_page; hve->hv_vm_id = (unsigned long )vcpu->kvm;if (!hve->hv_enlightenments_control.nested_flush_hypercall) { hve->hv_enlightenments_control.nested_flush_hypercall =1 ;
arch/x86/kvm/vmx/vmx.c +3 -11
@@ -523,22 +523,14 @@ module_param(enlightened_vmcs, bool, 0444);static int hv_enable_l2_tlb_flush (struct kvm_vcpu *vcpu) {struct hv_enlightened_vmcs *evmcs; -struct hv_partition_assist_pg **p_hv_pa_pg = - &to_kvm_hv (vcpu->kvm)->hv_pa_pg; -/* -* Synthetic VM-Exit is not enabled in current code and so All -* evmcs in singe VM shares same assist page. -*/ -if (!*p_hv_pa_pg) - *p_hv_pa_pg =kzalloc (PAGE_SIZE ,GFP_KERNEL_ACCOUNT ); +hpa_t partition_assist_page =hv_get_partition_assist_page (vcpu); -if (!*p_hv_pa_pg) +if (partition_assist_page ==INVALID_PAGE )return -ENOMEM ; evmcs = (struct hv_enlightened_vmcs *)to_vmx (vcpu)->loaded_vmcs->vmcs; - evmcs->partition_assist_page = -__pa (*p_hv_pa_pg); + evmcs->partition_assist_page = partition_assist_page; evmcs->hv_vm_id = (unsigned long )vcpu->kvm; evmcs->hv_enlightenments_control.nested_flush_hypercall =1 ;
arch/x86/kvm/x86.c +3 -1
@@ -12438,7 +12438,9 @@ void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu)void kvm_arch_free_vm (struct kvm *kvm) { -kfree (to_kvm_hv (kvm)->hv_pa_pg); +#if IS_ENABLED (CONFIG_HYPERV ) +kfree (kvm->arch.hv_pa_pg); +#endif __kvm_arch_free_vm (kvm); }
Signature · 1 line
2.43.0
Vitaly Kuznetsov
maintainerPATCH v2 3/16 KVM: VMX: Split off vmx_onhyperv.{ch} from hyperv.{ch}
In reply to Vitaly Kuznetsovhyperv.{ch} is currently a mix of stuff which is needed by both Hyper-V on KVM and KVM on Hyper-V. As a preparation to making Hyper-V emulation optional, put KVM-on-Hyper-V specific code into dedicated files.
No functional change intended.
--- arch/x86/kvm/Makefile | 4 + arch/x86/kvm/vmx/hyperv.c | 139 -------------------- arch/x86/kvm/vmx/hyperv.h | 217 ++++++++++++++++---------------- arch/x86/kvm/vmx/vmx.c | 1 + arch/x86/kvm/vmx/vmx_onhyperv.c | 36 ++++++ arch/x86/kvm/vmx/vmx_onhyperv.h | 124 ++++++++++++++++++ arch/x86/kvm/vmx/vmx_ops.h | 2 +- 7 files changed, 271 insertions(+), 252 deletions(-) create mode 100644 arch/x86/kvm/vmx/vmx_onhyperv.c create mode 100644 arch/x86/kvm/vmx/vmx_onhyperv.h
arch/x86/kvm/Makefile +4 -0
@@ -26,6 +26,10 @@ kvm-intel-y += vmx/vmx.o vmx/vmenter.o vmx/pmu_intel.o vmx/vmcs12.o \ vmx/hyperv.o vmx/nested.o vmx/posted_intr.o kvm-intel-$(CONFIG_X86_SGX_KVM) += vmx/sgx.o +ifdef CONFIG_HYPERV +kvm-intel-y += vmx/vmx_onhyperv.o +endif + kvm-amd-y += svm/svm.o svm/vmenter.o svm/pmu.o svm/nested.o svm/avic.o \ svm/sev.o svm/hyperv.o
arch/x86/kvm/vmx/hyperv.c +0 -139
151 lines not on this page · raw message
arch/x86/kvm/vmx/hyperv.h +105 -112
231 lines not on this page · raw message
arch/x86/kvm/vmx/vmx.c +1 -0
@@ -66,6 +66,7 @@#include "vmx.h" #include "x86.h" #include "smm.h" +#include "vmx_onhyperv.h" MODULE_AUTHOR ("Qumranet" );MODULE_LICENSE ("GPL" );
arch/x86/kvm/vmx/vmx_onhyperv.c new file +36 -0
@@ -0,0 +1,36 @@ +// SPDX-License-Identifier: GPL-2.0-only + +#include "capabilities.h" +#include "vmx_onhyperv.h" + +DEFINE_STATIC_KEY_FALSE (__kvm_is_using_evmcs); + +/* +* KVM on Hyper-V always uses the latest known eVMCSv1 revision, the assumption +* is: in case a feature has corresponding fields in eVMCS described and it was +* exposed in VMX feature MSRs, KVM is free to use it. Warn if KVM meets a +* feature which has no corresponding eVMCS field, this likely means that KVM +* needs to be updated. +*/ +#define evmcs_check_vmcs_conf (field, ctrl) \ + do { \ + typeof(vmcs_conf->field) unsupported; \ + \ + unsupported = vmcs_conf->field & ~EVMCS1_SUPPORTED_ ## ctrl; \ + if (unsupported) { \ + pr_warn_once(#field " unsupported with eVMCS: 0x%llx\n",\ + (u64)unsupported); \ + vmcs_conf->field &= EVMCS1_SUPPORTED_ ## ctrl; \ + } \ + } \ + while (0) + +void evmcs_sanitize_exec_ctrls (struct vmcs_config *vmcs_conf) +{ +evmcs_check_vmcs_conf (cpu_based_exec_ctrl,EXEC_CTRL ); +evmcs_check_vmcs_conf (pin_based_exec_ctrl,PINCTRL ); + evmcs_check_vmcs_conf(cpu_based_2nd_exec_ctrl, 2NDEXEC); + evmcs_check_vmcs_conf(cpu_based_3rd_exec_ctrl, 3RDEXEC); +evmcs_check_vmcs_conf (vmentry_ctrl,VMENTRY_CTRL ); +evmcs_check_vmcs_conf (vmexit_ctrl,VMEXIT_CTRL ); +}
arch/x86/kvm/vmx/vmx_onhyperv.h new file +124 -0
124 lines not on this page · raw message
arch/x86/kvm/vmx/vmx_ops.h +1 -1
@@ -6,7 +6,7 @@#include <asm/vmx.h> -#include "hyperv.h" +#include "vmx_onhyperv.h" #include "vmcs.h" #include "../x86.h"
Signature · 1 line
2.43.0
Vitaly Kuznetsov
maintainerPATCH v2 4/16 KVM: x86: hyper-v: Introduce kvm_hv_synic_auto_eoi_set()
In reply to Vitaly KuznetsovAs a preparation to making Hyper-V emulation optional, create a dedicated kvm_hv_synic_auto_eoi_set() helper to avoid extra ifdefs in lapic.c
No functional change intended.
--- arch/x86/kvm/hyperv.h | 5 +++++ arch/x86/kvm/lapic.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)
arch/x86/kvm/hyperv.h +5 -0
@@ -105,6 +105,11 @@ int kvm_hv_synic_set_irq(struct kvm *kvm, u32 vcpu_id, u32 sint);void kvm_hv_synic_send_eoi (struct kvm_vcpu *vcpu,int vector);int kvm_hv_activate_synic (struct kvm_vcpu *vcpu,bool dont_zero_synic_pages); +static inline bool kvm_hv_synic_auto_eoi_set (struct kvm_vcpu *vcpu,int vector) +{ +return to_hv_vcpu (vcpu) &&test_bit (vector,to_hv_synic (vcpu)->auto_eoi_bitmap); +} +void kvm_hv_vcpu_uninit (struct kvm_vcpu *vcpu);bool kvm_hv_assist_page_enabled (struct kvm_vcpu *vcpu);
arch/x86/kvm/lapic.c +1 -1
@@ -2905,7 +2905,7 @@ int kvm_get_apic_interrupt(struct kvm_vcpu *vcpu)*/ apic_clear_irr (vector, apic); -if (to_hv_vcpu (vcpu) &&test_bit (vector,to_hv_synic (vcpu)->auto_eoi_bitmap)) { +if (kvm_hv_synic_auto_eoi_set (vcpu, vector)) {/* * For auto-EOI interrupts, there might be another pending * interrupt above PPR, so check whether to raise another
Signature · 1 line
2.43.0
Vitaly Kuznetsov
maintainerPATCH v2 5/16 KVM: x86: hyper-v: Introduce kvm_hv_synic_has_vector()
In reply to Vitaly KuznetsovAs a preparation to making Hyper-V emulation optional, create a dedicated kvm_hv_synic_has_vector() helper to avoid extra ifdefs in lapic.c.
No functional change intended.
--- arch/x86/kvm/hyperv.h | 5 +++++ arch/x86/kvm/lapic.c | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-)
arch/x86/kvm/hyperv.h +5 -0
@@ -105,6 +105,11 @@ int kvm_hv_synic_set_irq(struct kvm *kvm, u32 vcpu_id, u32 sint);void kvm_hv_synic_send_eoi (struct kvm_vcpu *vcpu,int vector);int kvm_hv_activate_synic (struct kvm_vcpu *vcpu,bool dont_zero_synic_pages); +static inline bool kvm_hv_synic_has_vector (struct kvm_vcpu *vcpu,int vector) +{ +return to_hv_vcpu (vcpu) &&test_bit (vector,to_hv_synic (vcpu)->vec_bitmap); +} +static inline bool kvm_hv_synic_auto_eoi_set (struct kvm_vcpu *vcpu,int vector) {return to_hv_vcpu (vcpu) &&test_bit (vector,to_hv_synic (vcpu)->auto_eoi_bitmap);
arch/x86/kvm/lapic.c +1 -2
@@ -1475,8 +1475,7 @@ static int apic_set_eoi(struct kvm_lapic *apic)apic_clear_isr (vector, apic);apic_update_ppr (apic); -if (to_hv_vcpu (apic->vcpu) && -test_bit (vector,to_hv_synic (apic->vcpu)->vec_bitmap)) +if (kvm_hv_synic_has_vector (apic->vcpu, vector))kvm_hv_synic_send_eoi (apic->vcpu, vector);kvm_ioapic_send_eoi (apic, vector);
Signature · 1 line
2.43.0
Vitaly Kuznetsov
maintainerPATCH v2 6/16 KVM: VMX: Split off hyperv_evmcs.{ch}
In reply to Vitaly KuznetsovSome Enlightened VMCS related code is needed both by Hyper-V on KVM and KVM on Hyper-V. As a preparation to making Hyper-V emulation optional, create dedicated 'hyperv_evmcs.{ch}' files which are used by both.
No functional change intended.
--- arch/x86/kvm/Makefile | 2 +- arch/x86/kvm/vmx/hyperv.c | 308 ------------------------------- arch/x86/kvm/vmx/hyperv.h | 163 +---------------- arch/x86/kvm/vmx/hyperv_evmcs.c | 315 ++++++++++++++++++++++++++++++++ arch/x86/kvm/vmx/hyperv_evmcs.h | 166 +++++++++++++++++ arch/x86/kvm/vmx/nested.h | 1 + arch/x86/kvm/vmx/vmx_onhyperv.h | 3 +- 7 files changed, 486 insertions(+), 472 deletions(-) create mode 100644 arch/x86/kvm/vmx/hyperv_evmcs.c create mode 100644 arch/x86/kvm/vmx/hyperv_evmcs.h
arch/x86/kvm/Makefile +1 -1
@@ -23,7 +23,7 @@ kvm-$(CONFIG_KVM_XEN) += xen.o kvm-$(CONFIG_KVM_SMM) += smm.o kvm-intel-y += vmx/vmx.o vmx/vmenter.o vmx/pmu_intel.o vmx/vmcs12.o \ - vmx/hyperv.o vmx/nested.o vmx/posted_intr.o + vmx/hyperv.o vmx/hyperv_evmcs.o vmx/nested.o vmx/posted_intr.o kvm-intel-$(CONFIG_X86_SGX_KVM) += vmx/sgx.o ifdef CONFIG_HYPERV
arch/x86/kvm/vmx/hyperv.c +0 -308
314 lines not on this page · raw message
arch/x86/kvm/vmx/hyperv.h +1 -162
171 lines not on this page · raw message
arch/x86/kvm/vmx/hyperv_evmcs.c new file +315 -0
315 lines not on this page · raw message
arch/x86/kvm/vmx/hyperv_evmcs.h new file +166 -0
166 lines not on this page · raw message
arch/x86/kvm/vmx/nested.h +1 -0
@@ -3,6 +3,7 @@#define __KVM_X86_VMX_NESTED_H#include "kvm_cache_regs.h" +#include "hyperv.h" #include "vmcs12.h" #include "vmx.h"
arch/x86/kvm/vmx/vmx_onhyperv.h +2 -1
@@ -4,11 +4,12 @@#define __ARCH_X86_KVM_VMX_ONHYPERV_H__#include <asm/hyperv-tlfs.h> +#include <asm/mshyperv.h> #include <linux/jump_label.h> #include "capabilities.h" -#include "hyperv.h" +#include "hyperv_evmcs.h" #include "vmcs12.h" #define current_evmcs ((struct hv_enlightened_vmcs *)this_cpu_read(current_vmcs))
Signature · 1 line
2.43.0
Vitaly Kuznetsov
maintainerPATCH v2 7/16 KVM: x86: hyper-v: Introduce kvm_hv_nested_transtion_tlb_flush() helper
In reply to Vitaly KuznetsovAs a preparation to making Hyper-V emulation optional, introduce a helper to handle pending KVM_REQ_HV_TLB_FLUSH requests.
No functional change intended.
--- arch/x86/kvm/hyperv.h | 12 ++++++++++++ arch/x86/kvm/svm/nested.c | 10 ++-------- arch/x86/kvm/vmx/nested.c | 10 ++-------- 3 files changed, 16 insertions(+), 16 deletions(-)
arch/x86/kvm/hyperv.h +12 -0
@@ -246,6 +246,18 @@ static inline int kvm_hv_verify_vp_assist(struct kvm_vcpu *vcpu) return kvm_hv_get_assist_page(vcpu); } +static inline void kvm_hv_nested_transtion_tlb_flush (struct kvm_vcpu *vcpu,bool tdp_enabled) +{ +/* +* KVM_REQ_HV_TLB_FLUSH flushes entries from either L1's VP_ID or +* L2's VP_ID upon request from the guest. Make sure we check for +* pending entries in the right FIFO upon L1/L2 transition as these +* requests are put by other vCPUs asynchronously. +*/ +if (to_hv_vcpu (vcpu) && tdp_enabled) +kvm_make_request (KVM_REQ_HV_TLB_FLUSH , vcpu); +} +int kvm_hv_vcpu_flush_tlb (struct kvm_vcpu *vcpu);#endif
arch/x86/kvm/svm/nested.c +2 -8
@@ -487,14 +487,8 @@ static void nested_save_pending_event_to_vmcb12(struct vcpu_svm *svm,static void nested_svm_transition_tlb_flush (struct kvm_vcpu *vcpu) { -/* -* KVM_REQ_HV_TLB_FLUSH flushes entries from either L1's VP_ID or -* L2's VP_ID upon request from the guest. Make sure we check for -* pending entries in the right FIFO upon L1/L2 transition as these -* requests are put by other vCPUs asynchronously. -*/ -if (to_hv_vcpu (vcpu) && npt_enabled) -kvm_make_request (KVM_REQ_HV_TLB_FLUSH , vcpu); +/* Handle pending Hyper-V TLB flush requests */ +kvm_hv_nested_transtion_tlb_flush (vcpu, npt_enabled);/* * TODO: optimize unconditional TLB flush/MMU sync. A partial list of
arch/x86/kvm/vmx/nested.c +2 -8
@@ -1139,14 +1139,8 @@ static void nested_vmx_transition_tlb_flush(struct kvm_vcpu *vcpu, {struct vcpu_vmx *vmx =to_vmx (vcpu); -/* -* KVM_REQ_HV_TLB_FLUSH flushes entries from either L1's VP_ID or -* L2's VP_ID upon request from the guest. Make sure we check for -* pending entries in the right FIFO upon L1/L2 transition as these -* requests are put by other vCPUs asynchronously. -*/ -if (to_hv_vcpu (vcpu) && enable_ept) -kvm_make_request (KVM_REQ_HV_TLB_FLUSH , vcpu); +/* Handle pending Hyper-V TLB flush requests */ +kvm_hv_nested_transtion_tlb_flush (vcpu, enable_ept);/* * If vmcs12 doesn't use VPID, L1 expects linear and combined mappings
Signature · 1 line
2.43.0
Vitaly Kuznetsov
maintainerPATCH v2 8/16 KVM: x86: hyper-v: Split off nested_evmcs_handle_vmclear()
In reply to Vitaly KuznetsovTo avoid overloading handle_vmclear() with Hyper-V specific details and to prepare the code to making Hyper-V emulation optional, create a dedicated nested_evmcs_handle_vmclear() helper.
No functional change intended.
--- arch/x86/kvm/vmx/nested.c | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-)
arch/x86/kvm/vmx/nested.c +24 -14
@@ -243,6 +243,29 @@ static inline void nested_release_evmcs(struct kvm_vcpu *vcpu) } } +static bool nested_evmcs_handle_vmclear (struct kvm_vcpu *vcpu,gpa_t vmptr) +{ +struct vcpu_vmx *vmx =to_vmx (vcpu); +/* +* When Enlightened VMEntry is enabled on the calling CPU we treat +* memory area pointer by vmptr as Enlightened VMCS (as there's no good +* way to distinguish it from VMCS12) and we must not corrupt it by +* writing to the non-existent 'launch_state' field. The area doesn't +* have to be the currently active EVMCS on the calling CPU and there's +* nothing KVM has to do to transition it from 'active' to 'non-active' +* state. It is possible that the area will stay mapped as +* vmx->nested.hv_evmcs but this shouldn't be a problem. +*/ +if (!guest_cpuid_has_evmcs (vcpu) || + !evmptr_is_valid (nested_get_evmptr (vcpu))) +return false; + +if (vmx->nested.hv_evmcs && vmptr == vmx->nested.hv_evmcs_vmptr) +nested_release_evmcs (vcpu); + +return true; +} +static void vmx_sync_vmcs_host_state (struct vcpu_vmx *vmx,struct loaded_vmcs *prev) {
@@ -5286,18 +5309,7 @@ static int handle_vmclear(struct kvm_vcpu *vcpu)if (vmptr == vmx->nested.vmxon_ptr)return nested_vmx_fail (vcpu,VMXERR_VMCLEAR_VMXON_POINTER ); -/* -* When Enlightened VMEntry is enabled on the calling CPU we treat -* memory area pointer by vmptr as Enlightened VMCS (as there's no good -* way to distinguish it from VMCS12) and we must not corrupt it by -* writing to the non-existent 'launch_state' field. The area doesn't -* have to be the currently active EVMCS on the calling CPU and there's -* nothing KVM has to do to transition it from 'active' to 'non-active' -* state. It is possible that the area will stay mapped as -* vmx->nested.hv_evmcs but this shouldn't be a problem. -*/ -if (likely (!guest_cpuid_has_evmcs (vcpu) || - !evmptr_is_valid (nested_get_evmptr (vcpu)))) { +if (likely (!nested_evmcs_handle_vmclear (vcpu, vmptr))) {if (vmptr == vmx->nested.current_vmptr)nested_release_vmcs12 (vcpu);
@@ -5314,8 +5326,6 @@ static int handle_vmclear(struct kvm_vcpu *vcpu) vmptr + offsetof(struct vmcs12 , launch_state), &zero, sizeof(zero)); - }else if (vmx->nested.hv_evmcs && vmptr == vmx->nested.hv_evmcs_vmptr) { -nested_release_evmcs (vcpu); }return nested_vmx_succeed (vcpu);
Signature · 1 line
2.43.0
Re: [PATCH v2 08/16] KVM: x86: hyper-v: Split off nested_evmcs_handle_vmclear()
Quoted 67 lines · Vitaly Kuznetsov
To avoid overloading
handle_vmclear()with Hyper-V specific details and to prepare the code to making Hyper-V emulation optional, create a dedicatednested_evmcs_handle_vmclear()helper.No functional change intended.
Suggested-by Sean Christopherson <[email protected]>Signed-off-by Vitaly Kuznetsov <[email protected]>--- arch/x86/kvm/vmx/nested.c | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-)arch/x86/kvm/vmx/nested.c +24
-12@@ -243,6 +243,29 @@ static inline void nested_release_evmcs(struct kvm_vcpu *vcpu) } } +static bool nested_evmcs_handle_vmclear (struct kvm_vcpu *vcpu,gpa_t vmptr) +{ +struct vcpu_vmx *vmx =to_vmx (vcpu); +/* +* When Enlightened VMEntry is enabled on the calling CPU we treat +* memory area pointer by vmptr as Enlightened VMCS (as there's no good +* way to distinguish it from VMCS12) and we must not corrupt it by +* writing to the non-existent 'launch_state' field. The area doesn't +* have to be the currently active EVMCS on the calling CPU and there's +* nothing KVM has to do to transition it from 'active' to 'non-active' +* state. It is possible that the area will stay mapped as +* vmx->nested.hv_evmcs but this shouldn't be a problem. +*/ +if (!guest_cpuid_has_evmcs (vcpu) || + !evmptr_is_valid (nested_get_evmptr (vcpu))) +return false; + +if (vmx->nested.hv_evmcs && vmptr == vmx->nested.hv_evmcs_vmptr) +nested_release_evmcs (vcpu); + +return true; +} +static void vmx_sync_vmcs_host_state (struct vcpu_vmx *vmx,struct loaded_vmcs *prev) {@@ -5286,18 +5309,7 @@ static int handle_vmclear(struct kvm_vcpu *vcpu)if (vmptr == vmx->nested.vmxon_ptr)return nested_vmx_fail (vcpu,VMXERR_VMCLEAR_VMXON_POINTER ); -/* -* When Enlightened VMEntry is enabled on the calling CPU we treat -* memory area pointer by vmptr as Enlightened VMCS (as there's no good -* way to distinguish it from VMCS12) and we must not corrupt it by -* writing to the non-existent 'launch_state' field. The area doesn't -* have to be the currently active EVMCS on the calling CPU and there's -* nothing KVM has to do to transition it from 'active' to 'non-active' -* state. It is possible that the area will stay mapped as -* vmx->nested.hv_evmcs but this shouldn't be a problem. -*/ -if (likely (!guest_cpuid_has_evmcs (vcpu) || - !evmptr_is_valid (nested_get_evmptr (vcpu)))) { +if (likely (!nested_evmcs_handle_vmclear (vcpu, vmptr))) {if (vmptr == vmx->nested.current_vmptr)nested_release_vmcs12 (vcpu);
arch/x86/kvm/vmx/nested.c static int handle_vmclear(struct kvm_vcpu *vcpu) · line 5331
Quoted 8 lines
arch/x86/kvm/vmx/nested.c +0
-2@@ -5314,8 +5326,6 @@ static int handle_vmclear(struct kvm_vcpu *vcpu) vmptr + offsetof(struct vmcs12 , launch_state), &zero, sizeof(zero)); - }else if (vmx->nested.hv_evmcs && vmptr == vmx->nested.hv_evmcs_vmptr) { -nested_release_evmcs (vcpu); }return nested_vmx_succeed (vcpu);
Best regards,
Maxim Levitsky
Vitaly Kuznetsov
maintainerPATCH v2 9/16 KVM: selftests: Make all Hyper-V tests explicitly dependent on Hyper-V emulation support in KVM
In reply to Vitaly KuznetsovIn preparation for conditional Hyper-V emulation enablement in KVM, make Hyper-V specific tests check skip gracefully instead of failing when the support is not there.
--- tools/testing/selftests/kvm/x86_64/hyperv_clock.c | 2 ++ tools/testing/selftests/kvm/x86_64/hyperv_evmcs.c | 5 +++-- .../selftests/kvm/x86_64/hyperv_extended_hypercalls.c | 2 ++ tools/testing/selftests/kvm/x86_64/hyperv_features.c | 2 ++ tools/testing/selftests/kvm/x86_64/hyperv_ipi.c | 2 ++ tools/testing/selftests/kvm/x86_64/hyperv_svm_test.c | 1 + tools/testing/selftests/kvm/x86_64/hyperv_tlb_flush.c | 2 ++ 7 files changed, 14 insertions(+), 2 deletions(-)
tools/testing/selftests/kvm/x86_64/hyperv_clock.c +2 -0
@@ -211,6 +211,8 @@ int main(void)vm_vaddr_t tsc_page_gva;int stage; +TEST_REQUIRE (kvm_has_cap (KVM_CAP_HYPERV_TIME )); + vm =vm_create_with_one_vcpu (&vcpu, guest_main);vcpu_set_hv_cpuid (vcpu);
tools/testing/selftests/kvm/x86_64/hyperv_evmcs.c +3 -2
@@ -240,11 +240,12 @@ int main(int argc, char *argv[])struct ucall uc;int stage; - vm =vm_create_with_one_vcpu (&vcpu, guest_code); -TEST_REQUIRE (kvm_cpu_has (X86_FEATURE_VMX ));TEST_REQUIRE (kvm_has_cap (KVM_CAP_NESTED_STATE ));TEST_REQUIRE (kvm_has_cap (KVM_CAP_HYPERV_ENLIGHTENED_VMCS )); +TEST_REQUIRE (kvm_has_cap (KVM_CAP_HYPERV_DIRECT_TLBFLUSH )); + + vm =vm_create_with_one_vcpu (&vcpu, guest_code); hcall_page =vm_vaddr_alloc_pages (vm,1 );memset (addr_gva2hva (vm, hcall_page),0x0 ,getpagesize ());
tools/testing/selftests/kvm/x86_64/hyperv_extended_hypercalls.c +2 -0
@@ -43,6 +43,8 @@ int main(void)uint64_t *outval;struct ucall uc; +TEST_REQUIRE (kvm_has_cap (KVM_CAP_HYPERV_CPUID )); +/* Verify if extended hypercalls are supported */ if (!kvm_cpuid_has (kvm_get_supported_hv_cpuid (),HV_ENABLE_EXTENDED_HYPERCALLS )) {
tools/testing/selftests/kvm/x86_64/hyperv_features.c +2 -0
@@ -690,6 +690,8 @@ static void guest_test_hcalls_access(void)int main (void ) { +TEST_REQUIRE (kvm_has_cap (KVM_CAP_HYPERV_ENFORCE_CPUID )); +pr_info ("Testing access to Hyper-V specific MSRs\n" );guest_test_msrs_access ();
tools/testing/selftests/kvm/x86_64/hyperv_ipi.c +2 -0
@@ -248,6 +248,8 @@ int main(int argc, char *argv[])int stage =1 , r;struct ucall uc; +TEST_REQUIRE (kvm_has_cap (KVM_CAP_HYPERV_SEND_IPI )); + vm =vm_create_with_one_vcpu (&vcpu[0 ], sender_guest_code);/* Hypercall input/output */
tools/testing/selftests/kvm/x86_64/hyperv_svm_test.c +1 -0
@@ -158,6 +158,7 @@ int main(int argc, char *argv[])int stage;TEST_REQUIRE (kvm_cpu_has (X86_FEATURE_SVM )); +TEST_REQUIRE (kvm_has_cap (KVM_CAP_HYPERV_DIRECT_TLBFLUSH ));/* Create VM */ vm =vm_create_with_one_vcpu (&vcpu, guest_code);
tools/testing/selftests/kvm/x86_64/hyperv_tlb_flush.c +2 -0
@@ -590,6 +590,8 @@ int main(int argc, char *argv[])struct ucall uc;int stage =1 , r, i; +TEST_REQUIRE (kvm_has_cap (KVM_CAP_HYPERV_TLBFLUSH )); + vm =vm_create_with_one_vcpu (&vcpu[0 ], sender_guest_code);/* Test data page */
Signature · 1 line
2.43.0
Vitaly Kuznetsov
maintainerPATCH v2 10/16 KVM: selftests: Fix vmxon_pa == vmcs12_pa == -1ull vmx_set_nested_state_test for !eVMCS case
In reply to Vitaly KuznetsovThe "vmxon_pa == vmcs12_pa == -1ull" test happens to work by accident: as Enlightened VMCS is always supported, set_default_vmx_state() adds 'KVM_STATE_NESTED_EVMCS' to 'flags' and the following branch of vmx_set_nested_state() is executed:
if ((kvm_state->flags & KVM_STATE_NESTED_EVMCS) &&
(!guest_can_use(vcpu, X86_FEATURE_VMX) ||
!vmx->nested.enlightened_vmcs_enabled))
return -EINVAL;as 'enlightened_vmcs_enabled' is false. In fact, "vmxon_pa == vmcs12_pa == -1ull" is a valid state when not tainted by wrong flags so the test should aim for this branch:
if (kvm_state->hdr.vmx.vmxon_pa == INVALID_GPA)
return 0;Test all this properly:
- Without KVM_STATE_NESTED_EVMCS in the flags, the expected return value is '0'.
- With KVM_STATE_NESTED_EVMCS flag (when supported) set, the expected return value is '-EINVAL' prior to enabling eVMCS and '0' after.
--- .../kvm/x86_64/vmx_set_nested_state_test.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
tools/testing/selftests/kvm/x86_64/vmx_set_nested_state_test.c +10 -6
@@ -125,21 +125,25 @@ void test_vmx_nested_state(struct kvm_vcpu *vcpu)/* * Setting vmxon_pa == -1ull and vmcs_pa == -1ull exits early without -* setting the nested state but flags other than eVMCS must be clear. -* The eVMCS flag can be set if the enlightened VMCS capability has -* been enabled. +* setting the nested state. When the eVMCS flag is not set, the +* expected return value is '0'. */ set_default_vmx_state (state, state_sz); + state->flags =0 ; state->hdr.vmx.vmxon_pa =-1ull ; state->hdr.vmx.vmcs12_pa =-1ull ; -test_nested_state_expect_einval (vcpu, state); +test_nested_state (vcpu, state); - state->flags &=KVM_STATE_NESTED_EVMCS ; +/* +* When eVMCS is supported, the eVMCS flag can only be set if the +* enlightened VMCS capability has been enabled. +*/ if (have_evmcs) { + state->flags =KVM_STATE_NESTED_EVMCS ;test_nested_state_expect_einval (vcpu, state);vcpu_enable_evmcs (vcpu); +test_nested_state (vcpu, state); } -test_nested_state (vcpu, state);/* It is invalid to have vmxon_pa == -1ull and SMM flags non-zero. */ state->hdr.vmx.smm.flags =1 ;
Signature · 1 line
2.43.0
Vitaly Kuznetsov
maintainerPATCH v2 11/16 KVM: nVMX: Move guest_cpuid_has_evmcs() to hyperv.h
In reply to Vitaly KuznetsovIn preparation for making Hyper-V emulation optional, move Hyper-V specific guest_cpuid_has_evmcs() to hyperv.h.
No functional change intended.
--- arch/x86/kvm/vmx/hyperv.h | 11 +++++++++++ arch/x86/kvm/vmx/vmx.h | 10 ---------- 2 files changed, 11 insertions(+), 10 deletions(-)
arch/x86/kvm/vmx/hyperv.h +11 -0
@@ -4,6 +4,7 @@#include <linux/kvm_host.h> #include "vmcs12.h" +#include "vmx.h" #define EVMPTR_INVALID (-1ULL)#define EVMPTR_MAP_PENDING (-2ULL)
@@ -20,6 +21,16 @@ enum nested_evmptrld_status { EVMPTRLD_ERROR, }; +static inline bool guest_cpuid_has_evmcs (struct kvm_vcpu *vcpu) +{ +/* +* eVMCS is exposed to the guest if Hyper-V is enabled in CPUID and +* eVMCS has been explicitly enabled by userspace. +*/ +return vcpu->arch.hyperv_enabled && +to_vmx (vcpu)->nested.enlightened_vmcs_enabled; +} +u64 nested_get_evmptr (struct kvm_vcpu *vcpu);uint16_t nested_get_evmcs_version (struct kvm_vcpu *vcpu); int nested_enable_evmcs(struct kvm_vcpu *vcpu,
arch/x86/kvm/vmx/vmx.h +0 -10
@@ -745,14 +745,4 @@ static inline bool vmx_can_use_ipiv(struct kvm_vcpu *vcpu) return lapic_in_kernel(vcpu) && enable_ipiv; } -static inline bool guest_cpuid_has_evmcs (struct kvm_vcpu *vcpu) -{ -/* -* eVMCS is exposed to the guest if Hyper-V is enabled in CPUID and -* eVMCS has been explicitly enabled by userspace. -*/ -return vcpu->arch.hyperv_enabled && -to_vmx (vcpu)->nested.enlightened_vmcs_enabled; -} -#endif /* __KVM_X86_VMX_H */
Signature · 1 line
2.43.0
Re: [PATCH v2 11/16] KVM: nVMX: Move guest_cpuid_has_evmcs() to hyperv.h
Quoted 50 lines · Vitaly Kuznetsov
In preparation for making Hyper-V emulation optional, move Hyper-V specific
guest_cpuid_has_evmcs()tohyperv.h.No functional change intended.
Suggested-by Sean Christopherson <[email protected]>Signed-off-by Vitaly Kuznetsov <[email protected]>--- arch/x86/kvm/vmx/hyperv.h | 11 +++++++++++ arch/x86/kvm/vmx/vmx.h | 10 ---------- 2 files changed, 11 insertions(+), 10 deletions(-)arch/x86/kvm/vmx/hyperv.h +11
-0@@ -4,6 +4,7 @@#include <linux/kvm_host.h> #include "vmcs12.h" +#include "vmx.h" #define EVMPTR_INVALID (-1ULL)#define EVMPTR_MAP_PENDING (-2ULL)@@ -20,6 +21,16 @@ enum nested_evmptrld_status { EVMPTRLD_ERROR, }; +static inline bool guest_cpuid_has_evmcs (struct kvm_vcpu *vcpu) +{ +/* +* eVMCS is exposed to the guest if Hyper-V is enabled in CPUID and +* eVMCS has been explicitly enabled by userspace. +*/ +return vcpu->arch.hyperv_enabled && +to_vmx (vcpu)->nested.enlightened_vmcs_enabled; +} +u64 nested_get_evmptr (struct kvm_vcpu *vcpu);uint16_t nested_get_evmcs_version (struct kvm_vcpu *vcpu); int nested_enable_evmcs(struct kvm_vcpu *vcpu,arch/x86/kvm/vmx/vmx.h +0
-1@@ -745,14 +745,4 @@ static inline bool vmx_can_use_ipiv(struct kvm_vcpu *vcpu)return lapic_in_kernel (vcpu) && enable_ipiv; } -static inline bool guest_cpuid_has_evmcs (struct kvm_vcpu *vcpu)
arch/x86/kvm/vmx/vmx.h static inline bool vmx_can_use_ipiv(struct kvm_vcpu *vcpu) · line 748
Quoted 10 lines
arch/x86/kvm/vmx/vmx.h +0
-9-{ -/* -* eVMCS is exposed to the guest if Hyper-V is enabled in CPUID and -* eVMCS has been explicitly enabled by userspace. -*/ -return vcpu->arch.hyperv_enabled && -to_vmx (vcpu)->nested.enlightened_vmcs_enabled; -} -#endif /* __KVM_X86_VMX_H */
Best regards,
Maxim Levitsky
Vitaly Kuznetsov
maintainerPATCH v2 12/16 KVM: x86: Make Hyper-V emulation optional
In reply to Vitaly KuznetsovHyper-V emulation in KVM is a fairly big chunk and in some cases it may be desirable to not compile it in to reduce module sizes as well as the attack surface. Introduce CONFIG_KVM_HYPERV option to make it possible.
Note, there's room for further nVMX/nSVM code optimizations when !CONFIG_KVM_HYPERV, this will be done in follow-up patches.
Reorganize Makefile a bit so all CONFIG_HYPERV and CONFIG_KVM_HYPERV files are grouped together.
--- arch/x86/include/asm/kvm_host.h | 6 ++++ arch/x86/kvm/Kconfig | 14 ++++++++ arch/x86/kvm/Makefile | 20 +++++------ arch/x86/kvm/cpuid.c | 6 ++++ arch/x86/kvm/hyperv.h | 61 +++++++++++++++++++++++++++++++- arch/x86/kvm/irq_comm.c | 9 ++++- arch/x86/kvm/svm/hyperv.h | 9 +++++ arch/x86/kvm/vmx/hyperv.h | 17 ++++++--- arch/x86/kvm/vmx/nested.c | 30 ++++++++++++++++ arch/x86/kvm/vmx/vmx.c | 2 ++ arch/x86/kvm/x86.c | 62 ++++++++++++++++++++++++--------- 11 files changed, 201 insertions(+), 35 deletions(-)
arch/x86/include/asm/kvm_host.h +6 -0
@@ -937,8 +937,10 @@ struct kvm_vcpu_arch {/* used for guest single stepping over the given code position */ unsigned long singlestep_rip; +#ifdef CONFIG_KVM_HYPERV bool hyperv_enabled;struct kvm_vcpu_hv *hyperv; +#endif #ifdef CONFIG_KVM_XEN struct kvm_vcpu_xen xen;#endif
@@ -1095,6 +1097,7 @@ enum hv_tsc_page_status { HV_TSC_PAGE_BROKEN, }; +#ifdef CONFIG_KVM_HYPERV /* Hyper-V emulation context */ struct kvm_hv { struct mutex hv_lock;
@@ -1127,6 +1130,7 @@ struct kvm_hv {struct kvm_hv_syndbg hv_syndbg; }; +#endif struct msr_bitmap_range {u32 flags;
@@ -1349,7 +1353,9 @@ struct kvm_arch {/* reads protected by irq_srcu, writes by irq_lock */ struct hlist_head mask_notifier_list; +#ifdef CONFIG_KVM_HYPERV struct kvm_hv hyperv; +#endif #ifdef CONFIG_KVM_XEN struct kvm_xen xen;
arch/x86/kvm/Kconfig +14 -0
@@ -141,6 +141,20 @@ config KVM_SMM If unsure, say Y. +config KVM_HYPERV + bool "Support for Microsoft Hyper-V emulation" + depends on KVM + default y + help + Provides KVM support for emulating Microsoft Hyper-V. This allows KVM + to expose a subset of the paravirtualized interfaces defined in the + Hyper-V Hypervisor Top-Level Functional Specification (TLFS): + https://docs.microsoft.com/en-us/virtualization/hyper-v-on-windows/reference/tlfs + These interfaces are required for the correct and performant functioning + of Windows and Hyper-V guests on KVM. + + If unsure, say "Y". + config KVM_XEN bool "Support for Xen hypercall interface" depends on KVM
arch/x86/kvm/Makefile +9 -11
@@ -11,29 +11,27 @@ include $(srctree)/virt/kvm/Makefile.kvm kvm-y += x86.o emulate.o i8259.o irq.o lapic.o \ i8254.o ioapic.o irq_comm.o cpuid.o pmu.o mtrr.o \ - hyperv.o debugfs.o mmu/mmu.o mmu/page_track.o \ + debugfs.o mmu/mmu.o mmu/page_track.o \ mmu/spte.o -ifdef CONFIG_HYPERV -kvm-y += kvm_onhyperv.o -endif - kvm-$(CONFIG_X86_64) += mmu/tdp_iter.o mmu/tdp_mmu.o +kvm-$(CONFIG_KVM_HYPERV) += hyperv.o kvm-$(CONFIG_KVM_XEN) += xen.o kvm-$(CONFIG_KVM_SMM) += smm.o kvm-intel-y += vmx/vmx.o vmx/vmenter.o vmx/pmu_intel.o vmx/vmcs12.o \ - vmx/hyperv.o vmx/hyperv_evmcs.o vmx/nested.o vmx/posted_intr.o -kvm-intel-$(CONFIG_X86_SGX_KVM) += vmx/sgx.o + vmx/nested.o vmx/posted_intr.o -ifdef CONFIG_HYPERV -kvm-intel-y += vmx/vmx_onhyperv.o -endif +kvm-intel-$(CONFIG_X86_SGX_KVM) += vmx/sgx.o +kvm-intel-$(CONFIG_KVM_HYPERV) += vmx/hyperv.o vmx/hyperv_evmcs.o kvm-amd-y += svm/svm.o svm/vmenter.o svm/pmu.o svm/nested.o svm/avic.o \ - svm/sev.o svm/hyperv.o + svm/sev.o +kvm-amd-$(CONFIG_KVM_HYPERV) += svm/hyperv.o ifdef CONFIG_HYPERV +kvm-y += kvm_onhyperv.o +kvm-intel-y += vmx/vmx_onhyperv.o vmx/hyperv_evmcs.o kvm-amd-y += svm/svm_onhyperv.o endif
arch/x86/kvm/cpuid.c +6 -0
@@ -314,11 +314,15 @@ EXPORT_SYMBOL_GPL(kvm_update_cpuid_runtime);static bool kvm_cpuid_has_hyperv (struct kvm_cpuid_entry2 *entries,int nent) { +#ifdef CONFIG_KVM_HYPERV struct kvm_cpuid_entry2 *entry; entry =cpuid_entry2_find (entries, nent,HYPERV_CPUID_INTERFACE ,KVM_CPUID_INDEX_NOT_SIGNIFICANT );return entry && entry->eax ==HYPERV_CPUID_SIGNATURE_EAX ; +#else +return false; +#endif }static void kvm_vcpu_after_set_cpuid (struct kvm_vcpu *vcpu)
@@ -433,11 +437,13 @@ static int kvm_set_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid_entry2 *e2,return 0 ; } +#ifdef CONFIG_KVM_HYPERV if (kvm_cpuid_has_hyperv (e2, nent)) { r =kvm_hv_vcpu_init (vcpu);if (r)return r; } +#endif r =kvm_check_cpuid (vcpu, e2, nent);if (r)
arch/x86/kvm/hyperv.h +60 -1
71 lines not on this page · raw message
arch/x86/kvm/irq_comm.c +8 -1
@@ -144,7 +144,7 @@ int kvm_set_msi(struct kvm_kernel_irq_routing_entry *e,return kvm_irq_delivery_to_apic (kvm,NULL , &irq,NULL ); } - +#ifdef CONFIG_KVM_HYPERV static int kvm_hv_set_sint (struct kvm_kernel_irq_routing_entry *e,struct kvm *kvm,int irq_source_id,int level,bool line_status)
@@ -154,6 +154,7 @@ static int kvm_hv_set_sint(struct kvm_kernel_irq_routing_entry *e,return kvm_hv_synic_set_irq (kvm, e->hv_sint.vcpu, e->hv_sint.sint); } +#endif int kvm_arch_set_irq_inatomic(struct kvm_kernel_irq_routing_entry *e, struct kvm *kvm, int irq_source_id, int level,
@@ -163,9 +164,11 @@ int kvm_arch_set_irq_inatomic(struct kvm_kernel_irq_routing_entry *e,int r;switch (e->type) { +#ifdef CONFIG_KVM_HYPERV case KVM_IRQ_ROUTING_HV_SINT :return kvm_hv_set_sint (e, kvm, irq_source_id, level, line_status); +#endif case KVM_IRQ_ROUTING_MSI :if (kvm_msi_route_invalid (kvm, e))
@@ -314,11 +317,13 @@ int kvm_set_routing_entry(struct kvm *kvm,if (kvm_msi_route_invalid (kvm, e))return -EINVAL ;break ; +#ifdef CONFIG_KVM_HYPERV case KVM_IRQ_ROUTING_HV_SINT : e->set = kvm_hv_set_sint; e->hv_sint.vcpu = ue->u.hv_sint.vcpu; e->hv_sint.sint = ue->u.hv_sint.sint;break ; +#endif #ifdef CONFIG_KVM_XEN case KVM_IRQ_ROUTING_XEN_EVTCHN :return kvm_xen_setup_evtchn (kvm, e, ue);
@@ -438,5 +443,7 @@ void kvm_scan_ioapic_routes(struct kvm_vcpu *vcpu,void kvm_arch_irq_routing_update (struct kvm *kvm) { +#ifdef CONFIG_KVM_HYPERV kvm_hv_irq_routing_update (kvm); +#endif }
arch/x86/kvm/svm/hyperv.h +9 -0
@@ -11,6 +11,7 @@#include "../hyperv.h" #include "svm.h" +#ifdef CONFIG_KVM_HYPERV static inline void nested_svm_hv_update_vm_vp_ids (struct kvm_vcpu *vcpu) {struct vcpu_svm *svm =to_svm (vcpu);
@@ -41,5 +42,13 @@ static inline bool nested_svm_l2_tlb_flush_enabled(struct kvm_vcpu *vcpu) }void svm_hv_inject_synthetic_vmexit_post_tlb_flush (struct kvm_vcpu *vcpu); +#else /* CONFIG_KVM_HYPERV */ +static inline void nested_svm_hv_update_vm_vp_ids (struct kvm_vcpu *vcpu) {} +static inline bool nested_svm_l2_tlb_flush_enabled (struct kvm_vcpu *vcpu) +{ +return false; +} +static inline void svm_hv_inject_synthetic_vmexit_post_tlb_flush (struct kvm_vcpu *vcpu) {} +#endif /* CONFIG_KVM_HYPERV */ #endif /* __ARCH_X86_KVM_SVM_HYPERV_H__ */
arch/x86/kvm/vmx/hyperv.h +12 -5
@@ -9,11 +9,6 @@#define EVMPTR_INVALID (-1ULL)#define EVMPTR_MAP_PENDING (-2ULL) -static inline bool evmptr_is_valid (u64 evmptr) -{ -return evmptr !=EVMPTR_INVALID && evmptr !=EVMPTR_MAP_PENDING ; -} -enum nested_evmptrld_status {EVMPTRLD_DISABLED ,EVMPTRLD_SUCCEEDED ,
@@ -21,6 +16,12 @@ enum nested_evmptrld_status { EVMPTRLD_ERROR, }; +#ifdef CONFIG_KVM_HYPERV +static inline bool evmptr_is_valid (u64 evmptr) +{ +return evmptr !=EVMPTR_INVALID && evmptr !=EVMPTR_MAP_PENDING ; +} +static inline bool guest_cpuid_has_evmcs (struct kvm_vcpu *vcpu) {/*
@@ -39,5 +40,11 @@ void nested_evmcs_filter_control_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 *int nested_evmcs_check_controls (struct vmcs12 *vmcs12);bool nested_evmcs_l2_tlb_flush_enabled (struct kvm_vcpu *vcpu);void vmx_hv_inject_synthetic_vmexit_post_tlb_flush (struct kvm_vcpu *vcpu); +#else +static inline bool evmptr_is_valid (u64 evmptr) +{ +return false; +} +#endif #endif /* __KVM_X86_VMX_HYPERV_H */
arch/x86/kvm/vmx/nested.c +30 -0
@@ -226,6 +226,7 @@ static void vmx_disable_shadow_vmcs(struct vcpu_vmx *vmx)static inline void nested_release_evmcs (struct kvm_vcpu *vcpu) { +#ifdef CONFIG_KVM_HYPERV struct kvm_vcpu_hv *hv_vcpu =to_hv_vcpu (vcpu);struct vcpu_vmx *vmx =to_vmx (vcpu);
@@ -241,10 +242,12 @@ static inline void nested_release_evmcs(struct kvm_vcpu *vcpu) hv_vcpu->nested.vm_id =0 ; hv_vcpu->nested.vp_id = 0; } +#endif }static bool nested_evmcs_handle_vmclear (struct kvm_vcpu *vcpu,gpa_t vmptr) { +#ifdef CONFIG_KVM_HYPERV struct vcpu_vmx *vmx =to_vmx (vcpu);/* * When Enlightened VMEntry is enabled on the calling CPU we treat
@@ -264,6 +267,9 @@ static bool nested_evmcs_handle_vmclear(struct kvm_vcpu *vcpu, gpa_t vmptr)nested_release_evmcs (vcpu);return true; +#else +return false; +#endif } static void vmx_sync_vmcs_host_state(struct vcpu_vmx *vmx,
@@ -1595,6 +1601,7 @@ static void copy_vmcs12_to_shadow(struct vcpu_vmx *vmx)static void copy_enlightened_to_vmcs12 (struct vcpu_vmx *vmx,u32 hv_clean_fields) { +#ifdef CONFIG_KVM_HYPERV struct vmcs12 *vmcs12 = vmx->nested.cached_vmcs12;struct hv_enlightened_vmcs *evmcs = vmx->nested.hv_evmcs;struct kvm_vcpu_hv *hv_vcpu =to_hv_vcpu (&vmx->vcpu);
@@ -1835,10 +1842,14 @@ static void copy_enlightened_to_vmcs12(struct vcpu_vmx *vmx, u32 hv_clean_fields*/ return ; +#else /* CONFIG_KVM_HYPERV */ +KVM_BUG_ON (1 , vmx->vcpu.kvm); +#endif /* CONFIG_KVM_HYPERV */ }static void copy_vmcs12_to_enlightened (struct vcpu_vmx *vmx) { +#ifdef CONFIG_KVM_HYPERV struct vmcs12 *vmcs12 = vmx->nested.cached_vmcs12;struct hv_enlightened_vmcs *evmcs = vmx->nested.hv_evmcs;
@@ -2009,6 +2020,9 @@ static void copy_vmcs12_to_enlightened(struct vcpu_vmx *vmx) evmcs->guest_bndcfgs = vmcs12->guest_bndcfgs;return ; +#else /* CONFIG_KVM_HYPERV */ +KVM_BUG_ON (1 , vmx->vcpu.kvm); +#endif /* CONFIG_KVM_HYPERV */ }/*
@@ -2018,6 +2032,7 @@ static void copy_vmcs12_to_enlightened(struct vcpu_vmx *vmx)static enum nested_evmptrld_status nested_vmx_handle_enlightened_vmptrld (struct kvm_vcpu *vcpu,bool from_launch) { +#ifdef CONFIG_KVM_HYPERV struct vcpu_vmx *vmx =to_vmx (vcpu);bool evmcs_gpa_changed = false;u64 evmcs_gpa;
@@ -2099,6 +2114,9 @@ static enum nested_evmptrld_status nested_vmx_handle_enlightened_vmptrld( }return EVMPTRLD_SUCCEEDED ; +#else +return EVMPTRLD_DISABLED ; +#endif }void nested_sync_vmcs12_to_shadow (struct kvm_vcpu *vcpu)
@@ -2905,8 +2923,10 @@ static int nested_vmx_check_controls(struct kvm_vcpu *vcpu, nested_check_vm_entry_controls(vcpu, vmcs12)) return -EINVAL; +#ifdef CONFIG_KVM_HYPERV if (guest_cpuid_has_evmcs (vcpu))return nested_evmcs_check_controls (vmcs12); +#endif return 0 ; }
@@ -3178,6 +3198,7 @@ static int nested_vmx_check_vmentry_hw(struct kvm_vcpu *vcpu)return 0 ; } +#ifdef CONFIG_KVM_HYPERV static bool nested_get_evmcs_page (struct kvm_vcpu *vcpu) {struct vcpu_vmx *vmx =to_vmx (vcpu);
@@ -3205,6 +3226,7 @@ static bool nested_get_evmcs_page(struct kvm_vcpu *vcpu) return true; } +#endif static bool nested_get_vmcs12_pages (struct kvm_vcpu *vcpu) {
@@ -3296,6 +3318,7 @@ static bool nested_get_vmcs12_pages(struct kvm_vcpu *vcpu)static bool vmx_get_nested_state_pages (struct kvm_vcpu *vcpu) { +#ifdef CONFIG_KVM_HYPERV /* * Note: nested_get_evmcs_page() also updates 'vp_assist_page' copy * in 'struct kvm_vcpu_hv' in case eVMCS is in use, this is mandatory
@@ -3312,6 +3335,7 @@ static bool vmx_get_nested_state_pages(struct kvm_vcpu *vcpu) return false; } +#endif if (is_guest_mode (vcpu) && !nested_get_vmcs12_pages (vcpu))return false;
@@ -4749,6 +4773,7 @@ void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 vm_exit_reason,/* trying to cancel vmlaunch/vmresume is a bug */ WARN_ON_ONCE (vmx->nested.nested_run_pending); +#ifdef CONFIG_KVM_HYPERV if (kvm_check_request (KVM_REQ_GET_NESTED_STATE_PAGES , vcpu)) {/* * KVM_REQ_GET_NESTED_STATE_PAGES is also used to map
@@ -4758,6 +4783,7 @@ void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 vm_exit_reason,*/ (void)nested_get_evmcs_page(vcpu); } +#endif /* Service pending TLB flush requests for L2 before switching to L1. */ kvm_service_local_tlb_flush_requests (vcpu);
@@ -6212,11 +6238,13 @@ static bool nested_vmx_l0_wants_exit(struct kvm_vcpu *vcpu,* Handle L2's bus locks in L0 directly. */ return true; +#ifdef CONFIG_KVM_HYPERV case EXIT_REASON_VMCALL :/* Hyper-V L2 TLB flush hypercall is handled by L0 */ return guest_hv_cpuid_has_l2_tlb_flush (vcpu) &&nested_evmcs_l2_tlb_flush_enabled (vcpu) &&kvm_hv_is_tlb_flush_hcall (vcpu); +#endif default :break ; }
@@ -7100,7 +7128,9 @@ struct kvm_x86_nested_ops vmx_nested_ops = { .set_state = vmx_set_nested_state, .get_nested_state_pages = vmx_get_nested_state_pages, .write_log_dirty = nested_vmx_write_pml_buffer, +#ifdef CONFIG_KVM_HYPERV .enable_evmcs = nested_enable_evmcs, .get_evmcs_version = nested_get_evmcs_version, .hv_inject_synthetic_vmexit_post_tlb_flush = vmx_hv_inject_synthetic_vmexit_post_tlb_flush, +#endif };
arch/x86/kvm/vmx/vmx.c +2 -0
@@ -2048,6 +2048,7 @@ static int vmx_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)if (vmx_get_vmx_msr (&vmx->nested.msrs, msr_info->index, &msr_info->data))return 1 ; +#ifdef CONFIG_KVM_HYPERV /* * Enlightened VMCS v1 doesn't have certain VMCS fields but * instead of just ignoring the features, different Hyper-V
@@ -2058,6 +2059,7 @@ static int vmx_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)if (!msr_info->host_initiated &&guest_cpuid_has_evmcs (vcpu))nested_evmcs_filter_control_msr (vcpu, msr_info->index, &msr_info->data); +#endif break ;case MSR_IA32_RTIT_CTL :if (!vmx_pt_mode_is_host_guest ())
arch/x86/kvm/x86.c +45 -17
233 lines not on this page · raw message
Signature · 1 line
2.43.0
Quoted 809 lines · Vitaly Kuznetsov
Hyper-V emulation in KVM is a fairly big chunk and in some cases it may be desirable to not compile it in to reduce module sizes as well as the attack surface. Introduce
CONFIG_KVM_HYPERVoption to make it possible.Note, there's room for further nVMX/nSVM code optimizations when !CONFIG_KVM_HYPERV, this will be done in follow-up patches.
Reorganize
Makefilea bit so allCONFIG_HYPERVandCONFIG_KVM_HYPERVfiles are grouped together.Signed-off-by Vitaly Kuznetsov <[email protected]>--- arch/x86/include/asm/kvm_host.h | 6 ++++ arch/x86/kvm/Kconfig | 14 ++++++++ arch/x86/kvm/Makefile | 20 +++++------ arch/x86/kvm/cpuid.c | 6 ++++ arch/x86/kvm/hyperv.h | 61 +++++++++++++++++++++++++++++++- arch/x86/kvm/irq_comm.c | 9 ++++- arch/x86/kvm/svm/hyperv.h | 9 +++++ arch/x86/kvm/vmx/hyperv.h | 17 ++++++--- arch/x86/kvm/vmx/nested.c | 30 ++++++++++++++++ arch/x86/kvm/vmx/vmx.c | 2 ++ arch/x86/kvm/x86.c | 62 ++++++++++++++++++++++++--------- 11 files changed, 201 insertions(+), 35 deletions(-)arch/x86/include/asm/kvm_host.h +6
-0@@ -937,8 +937,10 @@ struct kvm_vcpu_arch {/* used for guest single stepping over the given code position */ unsigned long singlestep_rip; +#ifdef CONFIG_KVM_HYPERV bool hyperv_enabled;struct kvm_vcpu_hv *hyperv; +#endif #ifdef CONFIG_KVM_XEN struct kvm_vcpu_xen xen;#endif @@ -1095,6 +1097,7 @@ enum hv_tsc_page_status { HV_TSC_PAGE_BROKEN, }; +#ifdef CONFIG_KVM_HYPERV /* Hyper-V emulation context */ struct kvm_hv { struct mutex hv_lock;@@ -1127,6 +1130,7 @@ struct kvm_hv {struct kvm_hv_syndbg hv_syndbg; }; +#endif struct msr_bitmap_range {u32 flags;@@ -1349,7 +1353,9 @@ struct kvm_arch {/* reads protected by irq_srcu, writes by irq_lock */ struct hlist_head mask_notifier_list; +#ifdef CONFIG_KVM_HYPERV struct kvm_hv hyperv; +#endif #ifdef CONFIG_KVM_XEN struct kvm_xen xen;arch/x86/kvm/Kconfig +14
-0@@ -141,6 +141,20 @@ config KVM_SMM If unsure, say Y. +config KVM_HYPERV + bool "Support for Microsoft Hyper-V emulation" + depends on KVM + default y + help + Provides KVM support for emulating Microsoft Hyper-V. This allows KVM + to expose a subset of the paravirtualized interfaces defined in the + Hyper-V Hypervisor Top-Level Functional Specification (TLFS): + https://docs.microsoft.com/en-us/virtualization/hyper-v-on-windows/reference/tlfs + These interfaces are required for the correct and performant functioning + of Windows and Hyper-V guests on KVM. + + If unsure, say "Y". + config KVM_XEN bool "Support for Xen hypercall interface" depends on KVMarch/x86/kvm/Makefile +9
-11@@ -11,29 +11,27 @@ include $(srctree)/virt/kvm/Makefile.kvm kvm-y += x86.o emulate.o i8259.o irq.o lapic.o \ i8254.o ioapic.o irq_comm.o cpuid.o pmu.o mtrr.o \ - hyperv.o debugfs.o mmu/mmu.o mmu/page_track.o \ + debugfs.o mmu/mmu.o mmu/page_track.o \ mmu/spte.o -ifdef CONFIG_HYPERV -kvm-y += kvm_onhyperv.o -endif - kvm-$(CONFIG_X86_64) += mmu/tdp_iter.o mmu/tdp_mmu.o +kvm-$(CONFIG_KVM_HYPERV) += hyperv.o kvm-$(CONFIG_KVM_XEN) += xen.o kvm-$(CONFIG_KVM_SMM) += smm.o kvm-intel-y += vmx/vmx.o vmx/vmenter.o vmx/pmu_intel.o vmx/vmcs12.o \ - vmx/hyperv.o vmx/hyperv_evmcs.o vmx/nested.o vmx/posted_intr.o -kvm-intel-$(CONFIG_X86_SGX_KVM) += vmx/sgx.o + vmx/nested.o vmx/posted_intr.o -ifdef CONFIG_HYPERV -kvm-intel-y += vmx/vmx_onhyperv.o -endif +kvm-intel-$(CONFIG_X86_SGX_KVM) += vmx/sgx.o +kvm-intel-$(CONFIG_KVM_HYPERV) += vmx/hyperv.o vmx/hyperv_evmcs.o kvm-amd-y += svm/svm.o svm/vmenter.o svm/pmu.o svm/nested.o svm/avic.o \ - svm/sev.o svm/hyperv.o + svm/sev.o +kvm-amd-$(CONFIG_KVM_HYPERV) += svm/hyperv.o ifdef CONFIG_HYPERV +kvm-y += kvm_onhyperv.o +kvm-intel-y += vmx/vmx_onhyperv.o vmx/hyperv_evmcs.o kvm-amd-y += svm/svm_onhyperv.o endifarch/x86/kvm/cpuid.c +6
-0@@ -314,11 +314,15 @@ EXPORT_SYMBOL_GPL(kvm_update_cpuid_runtime);static bool kvm_cpuid_has_hyperv (struct kvm_cpuid_entry2 *entries,int nent) { +#ifdef CONFIG_KVM_HYPERV struct kvm_cpuid_entry2 *entry; entry =cpuid_entry2_find (entries, nent,HYPERV_CPUID_INTERFACE ,KVM_CPUID_INDEX_NOT_SIGNIFICANT );return entry && entry->eax ==HYPERV_CPUID_SIGNATURE_EAX ; +#else +return false; +#endif }static void kvm_vcpu_after_set_cpuid (struct kvm_vcpu *vcpu)@@ -433,11 +437,13 @@ static int kvm_set_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid_entry2 *e2,return 0 ; } +#ifdef CONFIG_KVM_HYPERV if (kvm_cpuid_has_hyperv (e2, nent)) { r =kvm_hv_vcpu_init (vcpu);if (r)return r; } +#endif r =kvm_check_cpuid (vcpu, e2, nent);if (r)arch/x86/kvm/hyperv.h +60
-1@@ -24,6 +24,8 @@#include <linux/kvm_host.h> #include "x86.h" +#ifdef CONFIG_KVM_HYPERV +/* "Hv#1" signature */ #define HYPERV_CPUID_SIGNATURE_EAX 0x31237648@@ -259,5 +261,62 @@ static inline void kvm_hv_nested_transtion_tlb_flush(struct kvm_vcpu *vcpu, bool }int kvm_hv_vcpu_flush_tlb (struct kvm_vcpu *vcpu); +#else /* CONFIG_KVM_HYPERV */ +static inline void kvm_hv_setup_tsc_page (struct kvm *kvm, +struct pvclock_vcpu_time_info *hv_clock) {} +static inline void kvm_hv_request_tsc_page_update (struct kvm *kvm) {} +static inline void kvm_hv_init_vm (struct kvm *kvm) {} +static inline void kvm_hv_destroy_vm (struct kvm *kvm) {} +static inline int kvm_hv_vcpu_init (struct kvm_vcpu *vcpu) +{ +return 0 ; +} +static inline void kvm_hv_vcpu_uninit (struct kvm_vcpu *vcpu) {} +static inline bool kvm_hv_hypercall_enabled (struct kvm_vcpu *vcpu) +{ +return false; +} +static inline int kvm_hv_hypercall (struct kvm_vcpu *vcpu) +{ +return HV_STATUS_ACCESS_DENIED ; +} +static inline void kvm_hv_vcpu_purge_flush_tlb (struct kvm_vcpu *vcpu) {} +static inline void kvm_hv_free_pa_page (struct kvm *kvm) {} +static inline bool kvm_hv_synic_has_vector (struct kvm_vcpu *vcpu,int vector) +{ +return false; +} +static inline bool kvm_hv_synic_auto_eoi_set (struct kvm_vcpu *vcpu,int vector) +{ +return false; +} +static inline void kvm_hv_synic_send_eoi (struct kvm_vcpu *vcpu,int vector) {} +static inline bool kvm_hv_invtsc_suppressed (struct kvm_vcpu *vcpu) +{ +return false; +} +static inline void kvm_hv_set_cpuid (struct kvm_vcpu *vcpu,bool hyperv_enabled) {} +static inline bool kvm_hv_has_stimer_pending (struct kvm_vcpu *vcpu) +{ +return false; +} +static inline bool kvm_hv_is_tlb_flush_hcall (struct kvm_vcpu *vcpu) +{ +return false; +} +static inline bool guest_hv_cpuid_has_l2_tlb_flush (struct kvm_vcpu *vcpu) +{ +return false; +} +static inline int kvm_hv_verify_vp_assist (struct kvm_vcpu *vcpu) +{ +return 0 ; +} +static inline u32 kvm_hv_get_vpindex (struct kvm_vcpu *vcpu) +{ +return vcpu->vcpu_idx; +} +static inline void kvm_hv_nested_transtion_tlb_flush (struct kvm_vcpu *vcpu,bool tdp_enabled) {} +#endif /* CONFIG_KVM_HYPERV */ -#endif +#endif /* __ARCH_X86_KVM_HYPERV_H__ */ arch/x86/kvm/irq_comm.c +8
-1@@ -144,7 +144,7 @@ int kvm_set_msi(struct kvm_kernel_irq_routing_entry *e,return kvm_irq_delivery_to_apic (kvm,NULL , &irq,NULL ); } - +#ifdef CONFIG_KVM_HYPERV static int kvm_hv_set_sint (struct kvm_kernel_irq_routing_entry *e,struct kvm *kvm,int irq_source_id,int level,bool line_status)@@ -154,6 +154,7 @@ static int kvm_hv_set_sint(struct kvm_kernel_irq_routing_entry *e,return kvm_hv_synic_set_irq (kvm, e->hv_sint.vcpu, e->hv_sint.sint); } +#endif int kvm_arch_set_irq_inatomic(struct kvm_kernel_irq_routing_entry *e, struct kvm *kvm, int irq_source_id, int level,@@ -163,9 +164,11 @@ int kvm_arch_set_irq_inatomic(struct kvm_kernel_irq_routing_entry *e,int r;switch (e->type) { +#ifdef CONFIG_KVM_HYPERV case KVM_IRQ_ROUTING_HV_SINT :return kvm_hv_set_sint (e, kvm, irq_source_id, level, line_status); +#endif case KVM_IRQ_ROUTING_MSI :if (kvm_msi_route_invalid (kvm, e))@@ -314,11 +317,13 @@ int kvm_set_routing_entry(struct kvm *kvm,if (kvm_msi_route_invalid (kvm, e))return -EINVAL ;break ; +#ifdef CONFIG_KVM_HYPERV case KVM_IRQ_ROUTING_HV_SINT : e->set = kvm_hv_set_sint; e->hv_sint.vcpu = ue->u.hv_sint.vcpu; e->hv_sint.sint = ue->u.hv_sint.sint;break ; +#endif #ifdef CONFIG_KVM_XEN case KVM_IRQ_ROUTING_XEN_EVTCHN :return kvm_xen_setup_evtchn (kvm, e, ue);@@ -438,5 +443,7 @@ void kvm_scan_ioapic_routes(struct kvm_vcpu *vcpu,void kvm_arch_irq_routing_update (struct kvm *kvm) { +#ifdef CONFIG_KVM_HYPERV kvm_hv_irq_routing_update (kvm); +#endif }arch/x86/kvm/svm/hyperv.h +9
-0@@ -11,6 +11,7 @@#include "../hyperv.h" #include "svm.h" +#ifdef CONFIG_KVM_HYPERV static inline void nested_svm_hv_update_vm_vp_ids (struct kvm_vcpu *vcpu) {struct vcpu_svm *svm =to_svm (vcpu);@@ -41,5 +42,13 @@ static inline bool nested_svm_l2_tlb_flush_enabled(struct kvm_vcpu *vcpu) }void svm_hv_inject_synthetic_vmexit_post_tlb_flush (struct kvm_vcpu *vcpu); +#else /* CONFIG_KVM_HYPERV */ +static inline void nested_svm_hv_update_vm_vp_ids (struct kvm_vcpu *vcpu) {} +static inline bool nested_svm_l2_tlb_flush_enabled (struct kvm_vcpu *vcpu) +{ +return false; +} +static inline void svm_hv_inject_synthetic_vmexit_post_tlb_flush (struct kvm_vcpu *vcpu) {} +#endif /* CONFIG_KVM_HYPERV */ #endif /* __ARCH_X86_KVM_SVM_HYPERV_H__ */ arch/x86/kvm/vmx/hyperv.h +12
-5@@ -9,11 +9,6 @@#define EVMPTR_INVALID (-1ULL)#define EVMPTR_MAP_PENDING (-2ULL) -static inline bool evmptr_is_valid (u64 evmptr) -{ -return evmptr !=EVMPTR_INVALID && evmptr !=EVMPTR_MAP_PENDING ; -} -enum nested_evmptrld_status {EVMPTRLD_DISABLED ,EVMPTRLD_SUCCEEDED ,@@ -21,6 +16,12 @@ enum nested_evmptrld_status { EVMPTRLD_ERROR, }; +#ifdef CONFIG_KVM_HYPERV +static inline bool evmptr_is_valid (u64 evmptr) +{ +return evmptr !=EVMPTR_INVALID && evmptr !=EVMPTR_MAP_PENDING ; +} +static inline bool guest_cpuid_has_evmcs (struct kvm_vcpu *vcpu) {/* @@ -39,5 +40,11 @@ void nested_evmcs_filter_control_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 *int nested_evmcs_check_controls (struct vmcs12 *vmcs12);bool nested_evmcs_l2_tlb_flush_enabled (struct kvm_vcpu *vcpu);void vmx_hv_inject_synthetic_vmexit_post_tlb_flush (struct kvm_vcpu *vcpu); +#else +static inline bool evmptr_is_valid (u64 evmptr) +{ +return false; +} +#endif #endif /* __KVM_X86_VMX_HYPERV_H */ arch/x86/kvm/vmx/nested.c +30
-0@@ -226,6 +226,7 @@ static void vmx_disable_shadow_vmcs(struct vcpu_vmx *vmx)static inline void nested_release_evmcs (struct kvm_vcpu *vcpu) { +#ifdef CONFIG_KVM_HYPERV struct kvm_vcpu_hv *hv_vcpu =to_hv_vcpu (vcpu);struct vcpu_vmx *vmx =to_vmx (vcpu);@@ -241,10 +242,12 @@ static inline void nested_release_evmcs(struct kvm_vcpu *vcpu) hv_vcpu->nested.vm_id =0 ; hv_vcpu->nested.vp_id = 0; } +#endif }static bool nested_evmcs_handle_vmclear (struct kvm_vcpu *vcpu,gpa_t vmptr) { +#ifdef CONFIG_KVM_HYPERV struct vcpu_vmx *vmx =to_vmx (vcpu);/* * When Enlightened VMEntry is enabled on the calling CPU we treat @@ -264,6 +267,9 @@ static bool nested_evmcs_handle_vmclear(struct kvm_vcpu *vcpu, gpa_t vmptr)nested_release_evmcs (vcpu);return true; +#else +return false; +#endif } static void vmx_sync_vmcs_host_state(struct vcpu_vmx *vmx,@@ -1595,6 +1601,7 @@ static void copy_vmcs12_to_shadow(struct vcpu_vmx *vmx)static void copy_enlightened_to_vmcs12 (struct vcpu_vmx *vmx,u32 hv_clean_fields) { +#ifdef CONFIG_KVM_HYPERV struct vmcs12 *vmcs12 = vmx->nested.cached_vmcs12;struct hv_enlightened_vmcs *evmcs = vmx->nested.hv_evmcs;struct kvm_vcpu_hv *hv_vcpu =to_hv_vcpu (&vmx->vcpu);@@ -1835,10 +1842,14 @@ static void copy_enlightened_to_vmcs12(struct vcpu_vmx *vmx, u32 hv_clean_fields*/ return ; +#else /* CONFIG_KVM_HYPERV */ +KVM_BUG_ON (1 , vmx->vcpu.kvm); +#endif /* CONFIG_KVM_HYPERV */ }static void copy_vmcs12_to_enlightened (struct vcpu_vmx *vmx) { +#ifdef CONFIG_KVM_HYPERV struct vmcs12 *vmcs12 = vmx->nested.cached_vmcs12;struct hv_enlightened_vmcs *evmcs = vmx->nested.hv_evmcs;@@ -2009,6 +2020,9 @@ static void copy_vmcs12_to_enlightened(struct vcpu_vmx *vmx) evmcs->guest_bndcfgs = vmcs12->guest_bndcfgs;return ; +#else /* CONFIG_KVM_HYPERV */ +KVM_BUG_ON (1 , vmx->vcpu.kvm); +#endif /* CONFIG_KVM_HYPERV */ }/* @@ -2018,6 +2032,7 @@ static void copy_vmcs12_to_enlightened(struct vcpu_vmx *vmx)static enum nested_evmptrld_status nested_vmx_handle_enlightened_vmptrld (struct kvm_vcpu *vcpu,bool from_launch) { +#ifdef CONFIG_KVM_HYPERV struct vcpu_vmx *vmx =to_vmx (vcpu);bool evmcs_gpa_changed = false;u64 evmcs_gpa;@@ -2099,6 +2114,9 @@ static enum nested_evmptrld_status nested_vmx_handle_enlightened_vmptrld( }return EVMPTRLD_SUCCEEDED ; +#else +return EVMPTRLD_DISABLED ; +#endif }void nested_sync_vmcs12_to_shadow (struct kvm_vcpu *vcpu)@@ -2905,8 +2923,10 @@ static int nested_vmx_check_controls(struct kvm_vcpu *vcpu, nested_check_vm_entry_controls(vcpu, vmcs12)) return -EINVAL; +#ifdef CONFIG_KVM_HYPERV if (guest_cpuid_has_evmcs (vcpu))return nested_evmcs_check_controls (vmcs12); +#endif return 0 ; }@@ -3178,6 +3198,7 @@ static int nested_vmx_check_vmentry_hw(struct kvm_vcpu *vcpu)return 0 ; } +#ifdef CONFIG_KVM_HYPERV static bool nested_get_evmcs_page (struct kvm_vcpu *vcpu) {struct vcpu_vmx *vmx =to_vmx (vcpu);@@ -3205,6 +3226,7 @@ static bool nested_get_evmcs_page(struct kvm_vcpu *vcpu) return true; } +#endif static bool nested_get_vmcs12_pages (struct kvm_vcpu *vcpu) {@@ -3296,6 +3318,7 @@ static bool nested_get_vmcs12_pages(struct kvm_vcpu *vcpu)static bool vmx_get_nested_state_pages (struct kvm_vcpu *vcpu) { +#ifdef CONFIG_KVM_HYPERV /* * Note: nested_get_evmcs_page() also updates 'vp_assist_page' copy * in 'struct kvm_vcpu_hv' in case eVMCS is in use, this is mandatory @@ -3312,6 +3335,7 @@ static bool vmx_get_nested_state_pages(struct kvm_vcpu *vcpu) return false; } +#endif if (is_guest_mode (vcpu) && !nested_get_vmcs12_pages (vcpu))return false;@@ -4749,6 +4773,7 @@ void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 vm_exit_reason,/* trying to cancel vmlaunch/vmresume is a bug */ WARN_ON_ONCE (vmx->nested.nested_run_pending); +#ifdef CONFIG_KVM_HYPERV if (kvm_check_request (KVM_REQ_GET_NESTED_STATE_PAGES , vcpu)) {/* * KVM_REQ_GET_NESTED_STATE_PAGES is also used to map @@ -4758,6 +4783,7 @@ void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 vm_exit_reason,*/ (void)nested_get_evmcs_page(vcpu); } +#endif /* Service pending TLB flush requests for L2 before switching to L1. */ kvm_service_local_tlb_flush_requests (vcpu);@@ -6212,11 +6238,13 @@ static bool nested_vmx_l0_wants_exit(struct kvm_vcpu *vcpu,* Handle L2's bus locks in L0 directly. */ return true; +#ifdef CONFIG_KVM_HYPERV case EXIT_REASON_VMCALL :/* Hyper-V L2 TLB flush hypercall is handled by L0 */ return guest_hv_cpuid_has_l2_tlb_flush (vcpu) &&nested_evmcs_l2_tlb_flush_enabled (vcpu) &&kvm_hv_is_tlb_flush_hcall (vcpu); +#endif default :break ; }@@ -7100,7 +7128,9 @@ struct kvm_x86_nested_ops vmx_nested_ops = { .set_state = vmx_set_nested_state, .get_nested_state_pages = vmx_get_nested_state_pages, .write_log_dirty = nested_vmx_write_pml_buffer, +#ifdef CONFIG_KVM_HYPERV .enable_evmcs = nested_enable_evmcs, .get_evmcs_version = nested_get_evmcs_version, .hv_inject_synthetic_vmexit_post_tlb_flush = vmx_hv_inject_synthetic_vmexit_post_tlb_flush, +#endif };arch/x86/kvm/vmx/vmx.c +2
-0@@ -2048,6 +2048,7 @@ static int vmx_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)if (vmx_get_vmx_msr (&vmx->nested.msrs, msr_info->index, &msr_info->data))return 1 ; +#ifdef CONFIG_KVM_HYPERV /* * Enlightened VMCS v1 doesn't have certain VMCS fields but * instead of just ignoring the features, different Hyper-V @@ -2058,6 +2059,7 @@ static int vmx_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)if (!msr_info->host_initiated &&guest_cpuid_has_evmcs (vcpu))nested_evmcs_filter_control_msr (vcpu, msr_info->index, &msr_info->data); +#endif break ;case MSR_IA32_RTIT_CTL :if (!vmx_pt_mode_is_host_guest ())arch/x86/kvm/x86.c +44
-17@@ -1504,6 +1504,8 @@ static unsigned num_msrs_to_save;static const u32 emulated_msrs_all[] = {MSR_KVM_SYSTEM_TIME ,MSR_KVM_WALL_CLOCK ,MSR_KVM_SYSTEM_TIME_NEW ,MSR_KVM_WALL_CLOCK_NEW , + +#ifdef CONFIG_KVM_HYPERVHV_X64_MSR_GUEST_OS_ID ,HV_X64_MSR_HYPERCALL ,HV_X64_MSR_TIME_REF_COUNT ,HV_X64_MSR_REFERENCE_TSC , HV_X64_MSR_TSC_FREQUENCY, HV_X64_MSR_APIC_FREQUENCY,@@ -1521,6 +1523,7 @@ static const u32 emulated_msrs_all[] = {HV_X64_MSR_SYNDBG_CONTROL ,HV_X64_MSR_SYNDBG_STATUS ,HV_X64_MSR_SYNDBG_SEND_BUFFER ,HV_X64_MSR_SYNDBG_RECV_BUFFER ,HV_X64_MSR_SYNDBG_PENDING_BUFFER , +#endifMSR_KVM_ASYNC_PF_EN ,MSR_KVM_STEAL_TIME , MSR_KVM_PV_EOI_EN, MSR_KVM_ASYNC_PF_INT, MSR_KVM_ASYNC_PF_ACK,@@ -4020,6 +4023,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)* the need to ignore the workaround. */ break ; +#ifdef CONFIG_KVM_HYPERV case HV_X64_MSR_GUEST_OS_ID ... HV_X64_MSR_SINT15: case HV_X64_MSR_SYNDBG_CONTROL ... HV_X64_MSR_SYNDBG_PENDING_BUFFER:case HV_X64_MSR_SYNDBG_OPTIONS :@@ -4032,6 +4036,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)case HV_X64_MSR_TSC_INVARIANT_CONTROL :return kvm_hv_set_msr_common (vcpu, msr, data, msr_info->host_initiated); +#endif case MSR_IA32_BBL_CR_CTL3 :/* Drop writes to this legacy MSR -- see rdmsr * counterpart for further detail. @@ -4377,6 +4382,7 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)*/ msr_info->data =0x20000000 ;break ; +#ifdef CONFIG_KVM_HYPERV case HV_X64_MSR_GUEST_OS_ID ... HV_X64_MSR_SINT15: case HV_X64_MSR_SYNDBG_CONTROL ... HV_X64_MSR_SYNDBG_PENDING_BUFFER:case HV_X64_MSR_SYNDBG_OPTIONS :@@ -4390,6 +4396,7 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)return kvm_hv_get_msr_common (vcpu, msr_info->index, &msr_info->data, msr_info->host_initiated); +#endif case MSR_IA32_BBL_CR_CTL3 :/* This legacy MSR exists but isn't fully documented in current * silicon. It is however accessed by winxp in very narrow @@ -4527,6 +4534,7 @@ static inline bool kvm_can_mwait_in_guest(void)boot_cpu_has (X86_FEATURE_ARAT ); } +#ifdef CONFIG_KVM_HYPERV static int kvm_ioctl_get_supported_hv_cpuid (struct kvm_vcpu *vcpu,struct kvm_cpuid2 __user *cpuid_arg) {@@ -4547,6 +4555,7 @@ static int kvm_ioctl_get_supported_hv_cpuid(struct kvm_vcpu *vcpu, return 0; } +#endif static bool kvm_is_vm_type_supported (unsigned long type) {@@ -4580,9 +4589,11 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)case KVM_CAP_PIT_STATE2 :case KVM_CAP_SET_IDENTITY_MAP_ADDR :case KVM_CAP_VCPU_EVENTS : +#ifdef CONFIG_KVM_HYPERV case KVM_CAP_HYPERV :case KVM_CAP_HYPERV_VAPIC :case KVM_CAP_HYPERV_SPIN : +case KVM_CAP_HYPERV_TIME :case KVM_CAP_HYPERV_SYNIC :case KVM_CAP_HYPERV_SYNIC2 :case KVM_CAP_HYPERV_VP_INDEX :@@ -4592,6 +4603,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)case KVM_CAP_HYPERV_CPUID :case KVM_CAP_HYPERV_ENFORCE_CPUID :case KVM_CAP_SYS_HYPERV_CPUID : +#endif case KVM_CAP_PCI_SEGMENT :case KVM_CAP_DEBUGREGS :case KVM_CAP_X86_ROBUST_SINGLESTEP :@@ -4601,7 +4613,6 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)case KVM_CAP_GET_TSC_KHZ :case KVM_CAP_KVMCLOCK_CTRL :case KVM_CAP_READONLY_MEM : -case KVM_CAP_HYPERV_TIME :case KVM_CAP_IOAPIC_POLARITY_IGNORED :case KVM_CAP_TSC_DEADLINE_TIMER :case KVM_CAP_DISABLE_QUIRKS :@@ -4712,12 +4723,14 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) r = kvm_x86_ops.nested_ops->get_state ? kvm_x86_ops.nested_ops->get_state (NULL ,NULL ,0 ) :0 ;break ; +#ifdef CONFIG_KVM_HYPERV case KVM_CAP_HYPERV_DIRECT_TLBFLUSH : r = kvm_x86_ops.enable_l2_tlb_flush !=NULL ;break ;case KVM_CAP_HYPERV_ENLIGHTENED_VMCS : r = kvm_x86_ops.nested_ops->enable_evmcs !=NULL ;break ; +#endif case KVM_CAP_SMALLER_MAXPHYADDR : r = (int ) allow_smaller_maxphyaddr;break ;@@ -4884,9 +4897,11 @@ long kvm_arch_dev_ioctl(struct file *filp,case KVM_GET_MSRS : r =msr_io (NULL , argp, do_get_msr_feature,1 );break ; +#ifdef CONFIG_KVM_HYPERV case KVM_GET_SUPPORTED_HV_CPUID : r =kvm_ioctl_get_supported_hv_cpuid (NULL , argp);break ; +#endif case KVM_GET_DEVICE_ATTR : {struct kvm_device_attr attr; r = -EFAULT ;@@ -5712,14 +5727,11 @@ static int kvm_vcpu_ioctl_device_attr(struct kvm_vcpu *vcpu,static int kvm_vcpu_ioctl_enable_cap (struct kvm_vcpu *vcpu,struct kvm_enable_cap *cap) { -int r; -uint16_t vmcs_version; -void __user *user_ptr; -if (cap->flags)return -EINVAL ;switch (cap->cap) { +#ifdef CONFIG_KVM_HYPERV case KVM_CAP_HYPERV_SYNIC2 :if (cap->args[0 ])return -EINVAL ;@@ -5731,16 +5743,22 @@ static int kvm_vcpu_ioctl_enable_cap(struct kvm_vcpu *vcpu,return kvm_hv_activate_synic (vcpu, cap->cap ==KVM_CAP_HYPERV_SYNIC2 );case KVM_CAP_HYPERV_ENLIGHTENED_VMCS : -if (!kvm_x86_ops.nested_ops->enable_evmcs) -return -ENOTTY ; - r = kvm_x86_ops.nested_ops->enable_evmcs (vcpu, &vmcs_version); -if (!r) { - user_ptr = (void __user *)(uintptr_t )cap->args[0 ]; -if (copy_to_user (user_ptr, &vmcs_version, -sizeof (vmcs_version))) - r = -EFAULT ; + { +int r; +uint16_t vmcs_version; +void __user *user_ptr; + +if (!kvm_x86_ops.nested_ops->enable_evmcs) +return -ENOTTY ; + r = kvm_x86_ops.nested_ops->enable_evmcs (vcpu, &vmcs_version); +if (!r) { + user_ptr = (void __user *)(uintptr_t )cap->args[0 ]; +if (copy_to_user (user_ptr, &vmcs_version, +sizeof (vmcs_version))) + r = -EFAULT ; + } +return r; } -return r;case KVM_CAP_HYPERV_DIRECT_TLBFLUSH :if (!kvm_x86_ops.enable_l2_tlb_flush)return -ENOTTY ;@@ -5749,6 +5767,7 @@ static int kvm_vcpu_ioctl_enable_cap(struct kvm_vcpu *vcpu,case KVM_CAP_HYPERV_ENFORCE_CPUID :return kvm_hv_set_enforce_cpuid (vcpu, cap->args[0 ]); +#endif case KVM_CAP_ENFORCE_PV_FEATURE_CPUID : vcpu->arch.pv_cpuid.enforce = cap->args[0 ];@@ -6141,9 +6160,11 @@ long kvm_arch_vcpu_ioctl(struct file *filp,srcu_read_unlock (&vcpu->kvm->srcu, idx);break ; } +#ifdef CONFIG_KVM_HYPERV case KVM_GET_SUPPORTED_HV_CPUID : r =kvm_ioctl_get_supported_hv_cpuid (vcpu, argp);break ; +#endif #ifdef CONFIG_KVM_XEN case KVM_XEN_VCPU_GET_ATTR : {struct kvm_xen_vcpu_attr xva;@@ -7201,6 +7222,7 @@ int kvm_arch_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg) r =static_call (kvm_x86_mem_enc_unregister_region)(kvm, ®ion);break ; } +#ifdef CONFIG_KVM_HYPERV case KVM_HYPERV_EVENTFD : {struct kvm_hyperv_eventfd hvevfd;@@ -7210,6 +7232,7 @@ int kvm_arch_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg) r =kvm_vm_ioctl_hv_eventfd (kvm, &hvevfd); break; } +#endif case KVM_SET_PMU_EVENT_FILTER : r =kvm_vm_ioctl_set_pmu_event_filter (kvm, argp);break ;@@ -10588,19 +10611,20 @@ static void vcpu_scan_ioapic(struct kvm_vcpu *vcpu)static void vcpu_load_eoi_exitmap (struct kvm_vcpu *vcpu) { -u64 eoi_exit_bitmap[4 ]; -if (!kvm_apic_hw_enabled (vcpu->arch.apic))return ; +#ifdef CONFIG_KVM_HYPERV if (to_hv_vcpu (vcpu)) { +u64 eoi_exit_bitmap[4 ]; +bitmap_or ((ulong *)eoi_exit_bitmap, vcpu->arch.ioapic_handled_vectors,to_hv_synic (vcpu)->vec_bitmap,256 );static_call_cond (kvm_x86_load_eoi_exitmap)(vcpu, eoi_exit_bitmap);return ; } - +#endif static_call_cond (kvm_x86_load_eoi_exitmap)( vcpu, (u64 *)vcpu->arch.ioapic_handled_vectors); }@@ -10691,9 +10715,11 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)* the flushes are considered "remote" and not "local" because * the requests can be initiated from other vCPUs. */ +#ifdef CONFIG_KVM_HYPERV if (kvm_check_request (KVM_REQ_HV_TLB_FLUSH , vcpu) &&kvm_hv_vcpu_flush_tlb (vcpu))kvm_vcpu_flush_tlb_guest (vcpu); +#endif if (kvm_check_request (KVM_REQ_REPORT_TPR_ACCESS , vcpu)) { vcpu->run->exit_reason =KVM_EXIT_TPR_ACCESS ;@@ -10746,6 +10772,7 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)vcpu_load_eoi_exitmap (vcpu);if (kvm_check_request (KVM_REQ_APIC_PAGE_RELOAD , vcpu))kvm_vcpu_reload_apic_access_page (vcpu); +#ifdef CONFIG_KVM_HYPERV if (kvm_check_request (KVM_REQ_HV_CRASH , vcpu)) { vcpu->run->exit_reason =KVM_EXIT_SYSTEM_EVENT ; vcpu->run->system_event.type =KVM_SYSTEM_EVENT_CRASH ;
arch/x86/kvm/x86.c static int vcpu_enter_guest(struct kvm_vcpu *vcpu) · line 10809
Quoted 7 lines
arch/x86/kvm/x86.c +1
-0@@ -10776,6 +10803,7 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)*/ if (kvm_check_request (KVM_REQ_HV_STIMER , vcpu))kvm_hv_process_stimers (vcpu); +#endif if (kvm_check_request (KVM_REQ_APICV_UPDATE , vcpu))kvm_vcpu_update_apicv (vcpu);if (kvm_check_request (KVM_REQ_APF_READY , vcpu))
Best regards,
Maxim Levitsky
Quoted 10 lines · Vitaly Kuznetsov
Hyper-V emulation in KVM is a fairly big chunk and in some cases it may be desirable to not compile it in to reduce module sizes as well as the attack surface. Introduce
CONFIG_KVM_HYPERVoption to make it possible.Note, there's room for further nVMX/nSVM code optimizations when !CONFIG_KVM_HYPERV, this will be done in follow-up patches.
Reorganize
Makefilea bit so allCONFIG_HYPERVandCONFIG_KVM_HYPERVfiles are grouped together.
Wanted to test this for the case where KVM is running as a nested hypervisor on Hyper-V but it doesn't apply cleanly - what base did you use? Tried v6.6, v6.7-rc1, and v6.7-rc4.
Jeremi
Quoted 809 lines
Signed-off-by Vitaly Kuznetsov <[email protected]>--- arch/x86/include/asm/kvm_host.h | 6 ++++ arch/x86/kvm/Kconfig | 14 ++++++++ arch/x86/kvm/Makefile | 20 +++++------ arch/x86/kvm/cpuid.c | 6 ++++ arch/x86/kvm/hyperv.h | 61 +++++++++++++++++++++++++++++++- arch/x86/kvm/irq_comm.c | 9 ++++- arch/x86/kvm/svm/hyperv.h | 9 +++++ arch/x86/kvm/vmx/hyperv.h | 17 ++++++--- arch/x86/kvm/vmx/nested.c | 30 ++++++++++++++++ arch/x86/kvm/vmx/vmx.c | 2 ++ arch/x86/kvm/x86.c | 62 ++++++++++++++++++++++++--------- 11 files changed, 201 insertions(+), 35 deletions(-)arch/x86/include/asm/kvm_host.h +6
-0@@ -937,8 +937,10 @@ struct kvm_vcpu_arch {/* used for guest single stepping over the given code position */ unsigned long singlestep_rip; +#ifdef CONFIG_KVM_HYPERV bool hyperv_enabled;struct kvm_vcpu_hv *hyperv; +#endif #ifdef CONFIG_KVM_XEN struct kvm_vcpu_xen xen;#endif @@ -1095,6 +1097,7 @@ enum hv_tsc_page_status { HV_TSC_PAGE_BROKEN, }; +#ifdef CONFIG_KVM_HYPERV /* Hyper-V emulation context */ struct kvm_hv { struct mutex hv_lock;@@ -1127,6 +1130,7 @@ struct kvm_hv {struct kvm_hv_syndbg hv_syndbg; }; +#endif struct msr_bitmap_range {u32 flags;@@ -1349,7 +1353,9 @@ struct kvm_arch {/* reads protected by irq_srcu, writes by irq_lock */ struct hlist_head mask_notifier_list; +#ifdef CONFIG_KVM_HYPERV struct kvm_hv hyperv; +#endif #ifdef CONFIG_KVM_XEN struct kvm_xen xen;arch/x86/kvm/Kconfig +14
-0@@ -141,6 +141,20 @@ config KVM_SMM If unsure, say Y. +config KVM_HYPERV + bool "Support for Microsoft Hyper-V emulation" + depends on KVM + default y + help + Provides KVM support for emulating Microsoft Hyper-V. This allows KVM + to expose a subset of the paravirtualized interfaces defined in the + Hyper-V Hypervisor Top-Level Functional Specification (TLFS): + https://docs.microsoft.com/en-us/virtualization/hyper-v-on-windows/reference/tlfs + These interfaces are required for the correct and performant functioning + of Windows and Hyper-V guests on KVM. + + If unsure, say "Y". + config KVM_XEN bool "Support for Xen hypercall interface" depends on KVMarch/x86/kvm/Makefile +9
-11@@ -11,29 +11,27 @@ include $(srctree)/virt/kvm/Makefile.kvm kvm-y += x86.o emulate.o i8259.o irq.o lapic.o \ i8254.o ioapic.o irq_comm.o cpuid.o pmu.o mtrr.o \ - hyperv.o debugfs.o mmu/mmu.o mmu/page_track.o \ + debugfs.o mmu/mmu.o mmu/page_track.o \ mmu/spte.o -ifdef CONFIG_HYPERV -kvm-y += kvm_onhyperv.o -endif - kvm-$(CONFIG_X86_64) += mmu/tdp_iter.o mmu/tdp_mmu.o +kvm-$(CONFIG_KVM_HYPERV) += hyperv.o kvm-$(CONFIG_KVM_XEN) += xen.o kvm-$(CONFIG_KVM_SMM) += smm.o kvm-intel-y += vmx/vmx.o vmx/vmenter.o vmx/pmu_intel.o vmx/vmcs12.o \ - vmx/hyperv.o vmx/hyperv_evmcs.o vmx/nested.o vmx/posted_intr.o -kvm-intel-$(CONFIG_X86_SGX_KVM) += vmx/sgx.o + vmx/nested.o vmx/posted_intr.o -ifdef CONFIG_HYPERV -kvm-intel-y += vmx/vmx_onhyperv.o -endif +kvm-intel-$(CONFIG_X86_SGX_KVM) += vmx/sgx.o +kvm-intel-$(CONFIG_KVM_HYPERV) += vmx/hyperv.o vmx/hyperv_evmcs.o kvm-amd-y += svm/svm.o svm/vmenter.o svm/pmu.o svm/nested.o svm/avic.o \ - svm/sev.o svm/hyperv.o + svm/sev.o +kvm-amd-$(CONFIG_KVM_HYPERV) += svm/hyperv.o ifdef CONFIG_HYPERV +kvm-y += kvm_onhyperv.o +kvm-intel-y += vmx/vmx_onhyperv.o vmx/hyperv_evmcs.o kvm-amd-y += svm/svm_onhyperv.o endifarch/x86/kvm/cpuid.c +6
-0@@ -314,11 +314,15 @@ EXPORT_SYMBOL_GPL(kvm_update_cpuid_runtime);static bool kvm_cpuid_has_hyperv (struct kvm_cpuid_entry2 *entries,int nent) { +#ifdef CONFIG_KVM_HYPERV struct kvm_cpuid_entry2 *entry; entry =cpuid_entry2_find (entries, nent,HYPERV_CPUID_INTERFACE ,KVM_CPUID_INDEX_NOT_SIGNIFICANT );return entry && entry->eax ==HYPERV_CPUID_SIGNATURE_EAX ; +#else +return false; +#endif }static void kvm_vcpu_after_set_cpuid (struct kvm_vcpu *vcpu)@@ -433,11 +437,13 @@ static int kvm_set_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid_entry2 *e2,return 0 ; } +#ifdef CONFIG_KVM_HYPERV if (kvm_cpuid_has_hyperv (e2, nent)) { r =kvm_hv_vcpu_init (vcpu);if (r)return r; } +#endif r =kvm_check_cpuid (vcpu, e2, nent);if (r)arch/x86/kvm/hyperv.h +60
-1@@ -24,6 +24,8 @@#include <linux/kvm_host.h> #include "x86.h" +#ifdef CONFIG_KVM_HYPERV +/* "Hv#1" signature */ #define HYPERV_CPUID_SIGNATURE_EAX 0x31237648@@ -259,5 +261,62 @@ static inline void kvm_hv_nested_transtion_tlb_flush(struct kvm_vcpu *vcpu, bool }int kvm_hv_vcpu_flush_tlb (struct kvm_vcpu *vcpu); +#else /* CONFIG_KVM_HYPERV */ +static inline void kvm_hv_setup_tsc_page (struct kvm *kvm, +struct pvclock_vcpu_time_info *hv_clock) {} +static inline void kvm_hv_request_tsc_page_update (struct kvm *kvm) {} +static inline void kvm_hv_init_vm (struct kvm *kvm) {} +static inline void kvm_hv_destroy_vm (struct kvm *kvm) {} +static inline int kvm_hv_vcpu_init (struct kvm_vcpu *vcpu) +{ +return 0 ; +} +static inline void kvm_hv_vcpu_uninit (struct kvm_vcpu *vcpu) {} +static inline bool kvm_hv_hypercall_enabled (struct kvm_vcpu *vcpu) +{ +return false; +} +static inline int kvm_hv_hypercall (struct kvm_vcpu *vcpu) +{ +return HV_STATUS_ACCESS_DENIED ; +} +static inline void kvm_hv_vcpu_purge_flush_tlb (struct kvm_vcpu *vcpu) {} +static inline void kvm_hv_free_pa_page (struct kvm *kvm) {} +static inline bool kvm_hv_synic_has_vector (struct kvm_vcpu *vcpu,int vector) +{ +return false; +} +static inline bool kvm_hv_synic_auto_eoi_set (struct kvm_vcpu *vcpu,int vector) +{ +return false; +} +static inline void kvm_hv_synic_send_eoi (struct kvm_vcpu *vcpu,int vector) {} +static inline bool kvm_hv_invtsc_suppressed (struct kvm_vcpu *vcpu) +{ +return false; +} +static inline void kvm_hv_set_cpuid (struct kvm_vcpu *vcpu,bool hyperv_enabled) {} +static inline bool kvm_hv_has_stimer_pending (struct kvm_vcpu *vcpu) +{ +return false; +} +static inline bool kvm_hv_is_tlb_flush_hcall (struct kvm_vcpu *vcpu) +{ +return false; +} +static inline bool guest_hv_cpuid_has_l2_tlb_flush (struct kvm_vcpu *vcpu) +{ +return false; +} +static inline int kvm_hv_verify_vp_assist (struct kvm_vcpu *vcpu) +{ +return 0 ; +} +static inline u32 kvm_hv_get_vpindex (struct kvm_vcpu *vcpu) +{ +return vcpu->vcpu_idx; +} +static inline void kvm_hv_nested_transtion_tlb_flush (struct kvm_vcpu *vcpu,bool tdp_enabled) {} +#endif /* CONFIG_KVM_HYPERV */ -#endif +#endif /* __ARCH_X86_KVM_HYPERV_H__ */ arch/x86/kvm/irq_comm.c +8
-1@@ -144,7 +144,7 @@ int kvm_set_msi(struct kvm_kernel_irq_routing_entry *e,return kvm_irq_delivery_to_apic (kvm,NULL , &irq,NULL ); } - +#ifdef CONFIG_KVM_HYPERV static int kvm_hv_set_sint (struct kvm_kernel_irq_routing_entry *e,struct kvm *kvm,int irq_source_id,int level,bool line_status)@@ -154,6 +154,7 @@ static int kvm_hv_set_sint(struct kvm_kernel_irq_routing_entry *e,return kvm_hv_synic_set_irq (kvm, e->hv_sint.vcpu, e->hv_sint.sint); } +#endif int kvm_arch_set_irq_inatomic(struct kvm_kernel_irq_routing_entry *e, struct kvm *kvm, int irq_source_id, int level,@@ -163,9 +164,11 @@ int kvm_arch_set_irq_inatomic(struct kvm_kernel_irq_routing_entry *e,int r;switch (e->type) { +#ifdef CONFIG_KVM_HYPERV case KVM_IRQ_ROUTING_HV_SINT :return kvm_hv_set_sint (e, kvm, irq_source_id, level, line_status); +#endif case KVM_IRQ_ROUTING_MSI :if (kvm_msi_route_invalid (kvm, e))@@ -314,11 +317,13 @@ int kvm_set_routing_entry(struct kvm *kvm,if (kvm_msi_route_invalid (kvm, e))return -EINVAL ;break ; +#ifdef CONFIG_KVM_HYPERV case KVM_IRQ_ROUTING_HV_SINT : e->set = kvm_hv_set_sint; e->hv_sint.vcpu = ue->u.hv_sint.vcpu; e->hv_sint.sint = ue->u.hv_sint.sint;break ; +#endif #ifdef CONFIG_KVM_XEN case KVM_IRQ_ROUTING_XEN_EVTCHN :return kvm_xen_setup_evtchn (kvm, e, ue);@@ -438,5 +443,7 @@ void kvm_scan_ioapic_routes(struct kvm_vcpu *vcpu,void kvm_arch_irq_routing_update (struct kvm *kvm) { +#ifdef CONFIG_KVM_HYPERV kvm_hv_irq_routing_update (kvm); +#endif }arch/x86/kvm/svm/hyperv.h +9
-0@@ -11,6 +11,7 @@#include "../hyperv.h" #include "svm.h" +#ifdef CONFIG_KVM_HYPERV static inline void nested_svm_hv_update_vm_vp_ids (struct kvm_vcpu *vcpu) {struct vcpu_svm *svm =to_svm (vcpu);@@ -41,5 +42,13 @@ static inline bool nested_svm_l2_tlb_flush_enabled(struct kvm_vcpu *vcpu) }void svm_hv_inject_synthetic_vmexit_post_tlb_flush (struct kvm_vcpu *vcpu); +#else /* CONFIG_KVM_HYPERV */ +static inline void nested_svm_hv_update_vm_vp_ids (struct kvm_vcpu *vcpu) {} +static inline bool nested_svm_l2_tlb_flush_enabled (struct kvm_vcpu *vcpu) +{ +return false; +} +static inline void svm_hv_inject_synthetic_vmexit_post_tlb_flush (struct kvm_vcpu *vcpu) {} +#endif /* CONFIG_KVM_HYPERV */ #endif /* __ARCH_X86_KVM_SVM_HYPERV_H__ */ arch/x86/kvm/vmx/hyperv.h +12
-5@@ -9,11 +9,6 @@#define EVMPTR_INVALID (-1ULL)#define EVMPTR_MAP_PENDING (-2ULL) -static inline bool evmptr_is_valid (u64 evmptr) -{ -return evmptr !=EVMPTR_INVALID && evmptr !=EVMPTR_MAP_PENDING ; -} -enum nested_evmptrld_status {EVMPTRLD_DISABLED ,EVMPTRLD_SUCCEEDED ,@@ -21,6 +16,12 @@ enum nested_evmptrld_status { EVMPTRLD_ERROR, }; +#ifdef CONFIG_KVM_HYPERV +static inline bool evmptr_is_valid (u64 evmptr) +{ +return evmptr !=EVMPTR_INVALID && evmptr !=EVMPTR_MAP_PENDING ; +} +static inline bool guest_cpuid_has_evmcs (struct kvm_vcpu *vcpu) {/* @@ -39,5 +40,11 @@ void nested_evmcs_filter_control_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 *int nested_evmcs_check_controls (struct vmcs12 *vmcs12);bool nested_evmcs_l2_tlb_flush_enabled (struct kvm_vcpu *vcpu);void vmx_hv_inject_synthetic_vmexit_post_tlb_flush (struct kvm_vcpu *vcpu); +#else +static inline bool evmptr_is_valid (u64 evmptr) +{ +return false; +} +#endif #endif /* __KVM_X86_VMX_HYPERV_H */ arch/x86/kvm/vmx/nested.c +30
-0@@ -226,6 +226,7 @@ static void vmx_disable_shadow_vmcs(struct vcpu_vmx *vmx)static inline void nested_release_evmcs (struct kvm_vcpu *vcpu) { +#ifdef CONFIG_KVM_HYPERV struct kvm_vcpu_hv *hv_vcpu =to_hv_vcpu (vcpu);struct vcpu_vmx *vmx =to_vmx (vcpu);@@ -241,10 +242,12 @@ static inline void nested_release_evmcs(struct kvm_vcpu *vcpu) hv_vcpu->nested.vm_id =0 ; hv_vcpu->nested.vp_id = 0; } +#endif }static bool nested_evmcs_handle_vmclear (struct kvm_vcpu *vcpu,gpa_t vmptr) { +#ifdef CONFIG_KVM_HYPERV struct vcpu_vmx *vmx =to_vmx (vcpu);/* * When Enlightened VMEntry is enabled on the calling CPU we treat @@ -264,6 +267,9 @@ static bool nested_evmcs_handle_vmclear(struct kvm_vcpu *vcpu, gpa_t vmptr)nested_release_evmcs (vcpu);return true; +#else +return false; +#endif } static void vmx_sync_vmcs_host_state(struct vcpu_vmx *vmx,@@ -1595,6 +1601,7 @@ static void copy_vmcs12_to_shadow(struct vcpu_vmx *vmx)static void copy_enlightened_to_vmcs12 (struct vcpu_vmx *vmx,u32 hv_clean_fields) { +#ifdef CONFIG_KVM_HYPERV struct vmcs12 *vmcs12 = vmx->nested.cached_vmcs12;struct hv_enlightened_vmcs *evmcs = vmx->nested.hv_evmcs;struct kvm_vcpu_hv *hv_vcpu =to_hv_vcpu (&vmx->vcpu);@@ -1835,10 +1842,14 @@ static void copy_enlightened_to_vmcs12(struct vcpu_vmx *vmx, u32 hv_clean_fields*/ return ; +#else /* CONFIG_KVM_HYPERV */ +KVM_BUG_ON (1 , vmx->vcpu.kvm); +#endif /* CONFIG_KVM_HYPERV */ }static void copy_vmcs12_to_enlightened (struct vcpu_vmx *vmx) { +#ifdef CONFIG_KVM_HYPERV struct vmcs12 *vmcs12 = vmx->nested.cached_vmcs12;struct hv_enlightened_vmcs *evmcs = vmx->nested.hv_evmcs;@@ -2009,6 +2020,9 @@ static void copy_vmcs12_to_enlightened(struct vcpu_vmx *vmx) evmcs->guest_bndcfgs = vmcs12->guest_bndcfgs;return ; +#else /* CONFIG_KVM_HYPERV */ +KVM_BUG_ON (1 , vmx->vcpu.kvm); +#endif /* CONFIG_KVM_HYPERV */ }/* @@ -2018,6 +2032,7 @@ static void copy_vmcs12_to_enlightened(struct vcpu_vmx *vmx)static enum nested_evmptrld_status nested_vmx_handle_enlightened_vmptrld (struct kvm_vcpu *vcpu,bool from_launch) { +#ifdef CONFIG_KVM_HYPERV struct vcpu_vmx *vmx =to_vmx (vcpu);bool evmcs_gpa_changed = false;u64 evmcs_gpa;@@ -2099,6 +2114,9 @@ static enum nested_evmptrld_status nested_vmx_handle_enlightened_vmptrld( }return EVMPTRLD_SUCCEEDED ; +#else +return EVMPTRLD_DISABLED ; +#endif }void nested_sync_vmcs12_to_shadow (struct kvm_vcpu *vcpu)@@ -2905,8 +2923,10 @@ static int nested_vmx_check_controls(struct kvm_vcpu *vcpu, nested_check_vm_entry_controls(vcpu, vmcs12)) return -EINVAL; +#ifdef CONFIG_KVM_HYPERV if (guest_cpuid_has_evmcs (vcpu))return nested_evmcs_check_controls (vmcs12); +#endif return 0 ; }@@ -3178,6 +3198,7 @@ static int nested_vmx_check_vmentry_hw(struct kvm_vcpu *vcpu)return 0 ; } +#ifdef CONFIG_KVM_HYPERV static bool nested_get_evmcs_page (struct kvm_vcpu *vcpu) {struct vcpu_vmx *vmx =to_vmx (vcpu);@@ -3205,6 +3226,7 @@ static bool nested_get_evmcs_page(struct kvm_vcpu *vcpu) return true; } +#endif static bool nested_get_vmcs12_pages (struct kvm_vcpu *vcpu) {@@ -3296,6 +3318,7 @@ static bool nested_get_vmcs12_pages(struct kvm_vcpu *vcpu)static bool vmx_get_nested_state_pages (struct kvm_vcpu *vcpu) { +#ifdef CONFIG_KVM_HYPERV /* * Note: nested_get_evmcs_page() also updates 'vp_assist_page' copy * in 'struct kvm_vcpu_hv' in case eVMCS is in use, this is mandatory @@ -3312,6 +3335,7 @@ static bool vmx_get_nested_state_pages(struct kvm_vcpu *vcpu) return false; } +#endif if (is_guest_mode (vcpu) && !nested_get_vmcs12_pages (vcpu))return false;@@ -4749,6 +4773,7 @@ void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 vm_exit_reason,/* trying to cancel vmlaunch/vmresume is a bug */ WARN_ON_ONCE (vmx->nested.nested_run_pending); +#ifdef CONFIG_KVM_HYPERV if (kvm_check_request (KVM_REQ_GET_NESTED_STATE_PAGES , vcpu)) {/* * KVM_REQ_GET_NESTED_STATE_PAGES is also used to map @@ -4758,6 +4783,7 @@ void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 vm_exit_reason,*/ (void)nested_get_evmcs_page(vcpu); } +#endif /* Service pending TLB flush requests for L2 before switching to L1. */ kvm_service_local_tlb_flush_requests (vcpu);@@ -6212,11 +6238,13 @@ static bool nested_vmx_l0_wants_exit(struct kvm_vcpu *vcpu,* Handle L2's bus locks in L0 directly. */ return true; +#ifdef CONFIG_KVM_HYPERV case EXIT_REASON_VMCALL :/* Hyper-V L2 TLB flush hypercall is handled by L0 */ return guest_hv_cpuid_has_l2_tlb_flush (vcpu) &&nested_evmcs_l2_tlb_flush_enabled (vcpu) &&kvm_hv_is_tlb_flush_hcall (vcpu); +#endif default :break ; }@@ -7100,7 +7128,9 @@ struct kvm_x86_nested_ops vmx_nested_ops = { .set_state = vmx_set_nested_state, .get_nested_state_pages = vmx_get_nested_state_pages, .write_log_dirty = nested_vmx_write_pml_buffer, +#ifdef CONFIG_KVM_HYPERV .enable_evmcs = nested_enable_evmcs, .get_evmcs_version = nested_get_evmcs_version, .hv_inject_synthetic_vmexit_post_tlb_flush = vmx_hv_inject_synthetic_vmexit_post_tlb_flush, +#endif };arch/x86/kvm/vmx/vmx.c +2
-0@@ -2048,6 +2048,7 @@ static int vmx_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)if (vmx_get_vmx_msr (&vmx->nested.msrs, msr_info->index, &msr_info->data))return 1 ; +#ifdef CONFIG_KVM_HYPERV /* * Enlightened VMCS v1 doesn't have certain VMCS fields but * instead of just ignoring the features, different Hyper-V @@ -2058,6 +2059,7 @@ static int vmx_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)if (!msr_info->host_initiated &&guest_cpuid_has_evmcs (vcpu))nested_evmcs_filter_control_msr (vcpu, msr_info->index, &msr_info->data); +#endif break ;case MSR_IA32_RTIT_CTL :if (!vmx_pt_mode_is_host_guest ())arch/x86/kvm/x86.c +45
-17@@ -1504,6 +1504,8 @@ static unsigned num_msrs_to_save;static const u32 emulated_msrs_all[] = {MSR_KVM_SYSTEM_TIME ,MSR_KVM_WALL_CLOCK ,MSR_KVM_SYSTEM_TIME_NEW ,MSR_KVM_WALL_CLOCK_NEW , + +#ifdef CONFIG_KVM_HYPERVHV_X64_MSR_GUEST_OS_ID ,HV_X64_MSR_HYPERCALL ,HV_X64_MSR_TIME_REF_COUNT ,HV_X64_MSR_REFERENCE_TSC , HV_X64_MSR_TSC_FREQUENCY, HV_X64_MSR_APIC_FREQUENCY,@@ -1521,6 +1523,7 @@ static const u32 emulated_msrs_all[] = {HV_X64_MSR_SYNDBG_CONTROL ,HV_X64_MSR_SYNDBG_STATUS ,HV_X64_MSR_SYNDBG_SEND_BUFFER ,HV_X64_MSR_SYNDBG_RECV_BUFFER ,HV_X64_MSR_SYNDBG_PENDING_BUFFER , +#endifMSR_KVM_ASYNC_PF_EN ,MSR_KVM_STEAL_TIME , MSR_KVM_PV_EOI_EN, MSR_KVM_ASYNC_PF_INT, MSR_KVM_ASYNC_PF_ACK,@@ -4020,6 +4023,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)* the need to ignore the workaround. */ break ; +#ifdef CONFIG_KVM_HYPERV case HV_X64_MSR_GUEST_OS_ID ... HV_X64_MSR_SINT15: case HV_X64_MSR_SYNDBG_CONTROL ... HV_X64_MSR_SYNDBG_PENDING_BUFFER:case HV_X64_MSR_SYNDBG_OPTIONS :@@ -4032,6 +4036,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)case HV_X64_MSR_TSC_INVARIANT_CONTROL :return kvm_hv_set_msr_common (vcpu, msr, data, msr_info->host_initiated); +#endif case MSR_IA32_BBL_CR_CTL3 :/* Drop writes to this legacy MSR -- see rdmsr * counterpart for further detail. @@ -4377,6 +4382,7 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)*/ msr_info->data =0x20000000 ;break ; +#ifdef CONFIG_KVM_HYPERV case HV_X64_MSR_GUEST_OS_ID ... HV_X64_MSR_SINT15: case HV_X64_MSR_SYNDBG_CONTROL ... HV_X64_MSR_SYNDBG_PENDING_BUFFER:case HV_X64_MSR_SYNDBG_OPTIONS :@@ -4390,6 +4396,7 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)return kvm_hv_get_msr_common (vcpu, msr_info->index, &msr_info->data, msr_info->host_initiated); +#endif case MSR_IA32_BBL_CR_CTL3 :/* This legacy MSR exists but isn't fully documented in current * silicon. It is however accessed by winxp in very narrow @@ -4527,6 +4534,7 @@ static inline bool kvm_can_mwait_in_guest(void)boot_cpu_has (X86_FEATURE_ARAT ); } +#ifdef CONFIG_KVM_HYPERV static int kvm_ioctl_get_supported_hv_cpuid (struct kvm_vcpu *vcpu,struct kvm_cpuid2 __user *cpuid_arg) {@@ -4547,6 +4555,7 @@ static int kvm_ioctl_get_supported_hv_cpuid(struct kvm_vcpu *vcpu, return 0; } +#endif static bool kvm_is_vm_type_supported (unsigned long type) {@@ -4580,9 +4589,11 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)case KVM_CAP_PIT_STATE2 :case KVM_CAP_SET_IDENTITY_MAP_ADDR :case KVM_CAP_VCPU_EVENTS : +#ifdef CONFIG_KVM_HYPERV case KVM_CAP_HYPERV :case KVM_CAP_HYPERV_VAPIC :case KVM_CAP_HYPERV_SPIN : +case KVM_CAP_HYPERV_TIME :case KVM_CAP_HYPERV_SYNIC :case KVM_CAP_HYPERV_SYNIC2 :case KVM_CAP_HYPERV_VP_INDEX :@@ -4592,6 +4603,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)case KVM_CAP_HYPERV_CPUID :case KVM_CAP_HYPERV_ENFORCE_CPUID :case KVM_CAP_SYS_HYPERV_CPUID : +#endif case KVM_CAP_PCI_SEGMENT :case KVM_CAP_DEBUGREGS :case KVM_CAP_X86_ROBUST_SINGLESTEP :@@ -4601,7 +4613,6 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)case KVM_CAP_GET_TSC_KHZ :case KVM_CAP_KVMCLOCK_CTRL :case KVM_CAP_READONLY_MEM : -case KVM_CAP_HYPERV_TIME :case KVM_CAP_IOAPIC_POLARITY_IGNORED :case KVM_CAP_TSC_DEADLINE_TIMER :case KVM_CAP_DISABLE_QUIRKS :@@ -4712,12 +4723,14 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) r = kvm_x86_ops.nested_ops->get_state ? kvm_x86_ops.nested_ops->get_state (NULL ,NULL ,0 ) :0 ;break ; +#ifdef CONFIG_KVM_HYPERV case KVM_CAP_HYPERV_DIRECT_TLBFLUSH : r = kvm_x86_ops.enable_l2_tlb_flush !=NULL ;break ;case KVM_CAP_HYPERV_ENLIGHTENED_VMCS : r = kvm_x86_ops.nested_ops->enable_evmcs !=NULL ;break ; +#endif case KVM_CAP_SMALLER_MAXPHYADDR : r = (int ) allow_smaller_maxphyaddr;break ;@@ -4884,9 +4897,11 @@ long kvm_arch_dev_ioctl(struct file *filp,case KVM_GET_MSRS : r =msr_io (NULL , argp, do_get_msr_feature,1 );break ; +#ifdef CONFIG_KVM_HYPERV case KVM_GET_SUPPORTED_HV_CPUID : r =kvm_ioctl_get_supported_hv_cpuid (NULL , argp);break ; +#endif case KVM_GET_DEVICE_ATTR : {struct kvm_device_attr attr; r = -EFAULT ;@@ -5712,14 +5727,11 @@ static int kvm_vcpu_ioctl_device_attr(struct kvm_vcpu *vcpu,static int kvm_vcpu_ioctl_enable_cap (struct kvm_vcpu *vcpu,struct kvm_enable_cap *cap) { -int r; -uint16_t vmcs_version; -void __user *user_ptr; -if (cap->flags)return -EINVAL ;switch (cap->cap) { +#ifdef CONFIG_KVM_HYPERV case KVM_CAP_HYPERV_SYNIC2 :if (cap->args[0 ])return -EINVAL ;@@ -5731,16 +5743,22 @@ static int kvm_vcpu_ioctl_enable_cap(struct kvm_vcpu *vcpu,return kvm_hv_activate_synic (vcpu, cap->cap ==KVM_CAP_HYPERV_SYNIC2 );case KVM_CAP_HYPERV_ENLIGHTENED_VMCS : -if (!kvm_x86_ops.nested_ops->enable_evmcs) -return -ENOTTY ; - r = kvm_x86_ops.nested_ops->enable_evmcs (vcpu, &vmcs_version); -if (!r) { - user_ptr = (void __user *)(uintptr_t )cap->args[0 ]; -if (copy_to_user (user_ptr, &vmcs_version, -sizeof (vmcs_version))) - r = -EFAULT ; + { +int r; +uint16_t vmcs_version; +void __user *user_ptr; + +if (!kvm_x86_ops.nested_ops->enable_evmcs) +return -ENOTTY ; + r = kvm_x86_ops.nested_ops->enable_evmcs (vcpu, &vmcs_version); +if (!r) { + user_ptr = (void __user *)(uintptr_t )cap->args[0 ]; +if (copy_to_user (user_ptr, &vmcs_version, +sizeof (vmcs_version))) + r = -EFAULT ; + } +return r; } -return r;case KVM_CAP_HYPERV_DIRECT_TLBFLUSH :if (!kvm_x86_ops.enable_l2_tlb_flush)return -ENOTTY ;@@ -5749,6 +5767,7 @@ static int kvm_vcpu_ioctl_enable_cap(struct kvm_vcpu *vcpu,case KVM_CAP_HYPERV_ENFORCE_CPUID :return kvm_hv_set_enforce_cpuid (vcpu, cap->args[0 ]); +#endif case KVM_CAP_ENFORCE_PV_FEATURE_CPUID : vcpu->arch.pv_cpuid.enforce = cap->args[0 ];@@ -6141,9 +6160,11 @@ long kvm_arch_vcpu_ioctl(struct file *filp,srcu_read_unlock (&vcpu->kvm->srcu, idx);break ; } +#ifdef CONFIG_KVM_HYPERV case KVM_GET_SUPPORTED_HV_CPUID : r =kvm_ioctl_get_supported_hv_cpuid (vcpu, argp);break ; +#endif #ifdef CONFIG_KVM_XEN case KVM_XEN_VCPU_GET_ATTR : {struct kvm_xen_vcpu_attr xva;@@ -7201,6 +7222,7 @@ int kvm_arch_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg) r =static_call (kvm_x86_mem_enc_unregister_region)(kvm, ®ion);break ; } +#ifdef CONFIG_KVM_HYPERV case KVM_HYPERV_EVENTFD : {struct kvm_hyperv_eventfd hvevfd;@@ -7210,6 +7232,7 @@ int kvm_arch_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg) r =kvm_vm_ioctl_hv_eventfd (kvm, &hvevfd); break; } +#endif case KVM_SET_PMU_EVENT_FILTER : r =kvm_vm_ioctl_set_pmu_event_filter (kvm, argp);break ;@@ -10588,19 +10611,20 @@ static void vcpu_scan_ioapic(struct kvm_vcpu *vcpu)static void vcpu_load_eoi_exitmap (struct kvm_vcpu *vcpu) { -u64 eoi_exit_bitmap[4 ]; -if (!kvm_apic_hw_enabled (vcpu->arch.apic))return ; +#ifdef CONFIG_KVM_HYPERV if (to_hv_vcpu (vcpu)) { +u64 eoi_exit_bitmap[4 ]; +bitmap_or ((ulong *)eoi_exit_bitmap, vcpu->arch.ioapic_handled_vectors,to_hv_synic (vcpu)->vec_bitmap,256 );static_call_cond (kvm_x86_load_eoi_exitmap)(vcpu, eoi_exit_bitmap);return ; } - +#endif static_call_cond (kvm_x86_load_eoi_exitmap)( vcpu, (u64 *)vcpu->arch.ioapic_handled_vectors); }@@ -10691,9 +10715,11 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)* the flushes are considered "remote" and not "local" because * the requests can be initiated from other vCPUs. */ +#ifdef CONFIG_KVM_HYPERV if (kvm_check_request (KVM_REQ_HV_TLB_FLUSH , vcpu) &&kvm_hv_vcpu_flush_tlb (vcpu))kvm_vcpu_flush_tlb_guest (vcpu); +#endif if (kvm_check_request (KVM_REQ_REPORT_TPR_ACCESS , vcpu)) { vcpu->run->exit_reason =KVM_EXIT_TPR_ACCESS ;@@ -10746,6 +10772,7 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)vcpu_load_eoi_exitmap (vcpu);if (kvm_check_request (KVM_REQ_APIC_PAGE_RELOAD , vcpu))kvm_vcpu_reload_apic_access_page (vcpu); +#ifdef CONFIG_KVM_HYPERV if (kvm_check_request (KVM_REQ_HV_CRASH , vcpu)) { vcpu->run->exit_reason =KVM_EXIT_SYSTEM_EVENT ; vcpu->run->system_event.type =KVM_SYSTEM_EVENT_CRASH ;@@ -10776,6 +10803,7 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)*/ if (kvm_check_request (KVM_REQ_HV_STIMER , vcpu))kvm_hv_process_stimers (vcpu); +#endif if (kvm_check_request (KVM_REQ_APICV_UPDATE , vcpu))kvm_vcpu_update_apicv (vcpu);if (kvm_check_request (KVM_REQ_APF_READY , vcpu))Signature · 1 line
2.43.0
A message that is not in the archive (sent off-list or not yet received): [email protected]
Vitaly Kuznetsov
maintainerQuoted 8 lines · Jeremi Piotrowski
Quoted 7 lines · Vitaly Kuznetsov
Hyper-V emulation in KVM is a fairly big chunk and in some cases it may be desirable to not compile it in to reduce module sizes as well as the attack surface. Introduce
CONFIG_KVM_HYPERVoption to make it possible.Note, there's room for further nVMX/nSVM code optimizations when !CONFIG_KVM_HYPERV, this will be done in follow-up patches.
Quoted 7 lines
Quoted 3 lines
Reorganize
Makefilea bit so allCONFIG_HYPERVandCONFIG_KVM_HYPERVfiles are grouped together.Wanted to test this for the case where KVM is running as a nested hypervisor on Hyper-V but it doesn't apply cleanly - what base did you use? Tried v6.6, v6.7-rc1, and v6.7-rc4.
Hi Jeremi,
the base was 'kvm/next' (git://git.kernel.org/pub/scm/virt/kvm/kvm.git,
'next' branch):
commit e9e60c82fe391d04db55a91c733df4a017c28b2f (kvm/next)
Author: Paolo Bonzini <[email protected]> Date: Tue Nov 21 11:24:08 2023 -0500
selftests/kvm: fix compilation on non-x86_64 platforms
Signature · 1 line
Vitaly
Jeremi Piotrowski
Tested-byQuoted 20 lines · Vitaly Kuznetsov
Quoted 8 lines · Jeremi Piotrowski
Quoted 7 lines · Vitaly Kuznetsov
Hyper-V emulation in KVM is a fairly big chunk and in some cases it may be desirable to not compile it in to reduce module sizes as well as the attack surface. Introduce
CONFIG_KVM_HYPERVoption to make it possible.Note, there's room for further nVMX/nSVM code optimizations when !CONFIG_KVM_HYPERV, this will be done in follow-up patches.
Quoted 7 lines
Quoted 3 lines
Reorganize
Makefilea bit so allCONFIG_HYPERVandCONFIG_KVM_HYPERVfiles are grouped together.Wanted to test this for the case where KVM is running as a nested hypervisor on Hyper-V but it doesn't apply cleanly - what base did you use? Tried v6.6, v6.7-rc1, and v6.7-rc4.
Hi Jeremi,
Quoted 9 lines
the base was 'kvm/next' (
git://git.kernel.org/pub/scm/virt/kvm/kvm.git,
'next' branch):commit
e9e60c82fe391d04db55a91c733df4a017c28b2f(kvm/next)Author: Paolo Bonzini <[email protected]> Date: Tue Nov 21 11:24:08 2023 -0500selftests/kvm: fix compilation on non-x86_64 platforms
Hi Vitaly,
Thanks. Just tested this running in an AMD Hyper-V guest with CONFIG_KVM_HYPERV unset, and tested nested virtualization - no regressions. You can have my tag:
Jeremi
Vitaly Kuznetsov
maintainerPATCH v2 13/16 KVM: nVMX: hyper-v: Introduce nested_vmx_is_evmptr12_{valid,set}() helpers
In reply to Vitaly KuznetsovIn order to get rid of raw 'vmx->nested.hv_evmcs_vmptr' accesses when !CONFIG_KVM_HYPERV, introduce a pair of helpers:
nested_vmx_is_evmptr12_valid() to check that eVMPTR points to a valid address.
nested_vmx_is_evmptr12_valid() to check that eVMPTR either points to a valid address or is in 'pending' port-migration state (meaning it is supposed to be valid but the exact address wasn't acquired from guest's memory yet).
No functional change intended.
--- arch/x86/kvm/vmx/hyperv.h | 30 ++++++++++++++++++++++++++++++ arch/x86/kvm/vmx/nested.c | 38 +++++++++++++++++++------------------- arch/x86/kvm/vmx/nested.h | 2 +- 3 files changed, 50 insertions(+), 20 deletions(-)
arch/x86/kvm/vmx/hyperv.h +30 -0
@@ -22,6 +22,21 @@ static inline bool evmptr_is_valid(u64 evmptr)return evmptr !=EVMPTR_INVALID && evmptr !=EVMPTR_MAP_PENDING ; } +static inline bool nested_vmx_is_evmptr12_valid (struct vcpu_vmx *vmx) +{ +return evmptr_is_valid (vmx->nested.hv_evmcs_vmptr); +} + +static inline bool evmptr_is_set (u64 evmptr) +{ +return evmptr !=EVMPTR_INVALID ; +} + +static inline bool nested_vmx_is_evmptr12_set (struct vcpu_vmx *vmx) +{ +return evmptr_is_set (vmx->nested.hv_evmcs_vmptr); +} +static inline bool guest_cpuid_has_evmcs (struct kvm_vcpu *vcpu) {/*
@@ -45,6 +60,21 @@ static inline bool evmptr_is_valid(u64 evmptr) {return false; } + +static inline bool nested_vmx_is_evmptr12_valid (struct vcpu_vmx *vmx) +{ +return false; +} + +static inline bool evmptr_is_set (u64 evmptr) +{ +return false; +} + +static inline bool nested_vmx_is_evmptr12_set (struct vcpu_vmx *vmx) +{ +return false; +}#endif #endif /* __KVM_X86_VMX_HYPERV_H */
arch/x86/kvm/vmx/nested.c +19 -19
@@ -179,7 +179,7 @@ static int nested_vmx_failValid(struct kvm_vcpu *vcpu,* VM_INSTRUCTION_ERROR is not shadowed. Enlightened VMCS 'shadows' all * fields and thus must be synced. */ -if (to_vmx (vcpu)->nested.hv_evmcs_vmptr !=EVMPTR_INVALID ) +if (nested_vmx_is_evmptr12_set (to_vmx (vcpu)))to_vmx (vcpu)->nested.need_vmcs12_to_shadow_sync = true;return kvm_skip_emulated_instruction (vcpu);
@@ -194,7 +194,7 @@ static int nested_vmx_fail(struct kvm_vcpu *vcpu, u32 vm_instruction_error)* can't be done if there isn't a current VMCS. */ if (vmx->nested.current_vmptr ==INVALID_GPA && - !evmptr_is_valid (vmx->nested.hv_evmcs_vmptr)) + !nested_vmx_is_evmptr12_valid (vmx))return nested_vmx_failInvalid (vcpu);return nested_vmx_failValid (vcpu, vm_instruction_error);
@@ -230,7 +230,7 @@ static inline void nested_release_evmcs(struct kvm_vcpu *vcpu)struct kvm_vcpu_hv *hv_vcpu =to_hv_vcpu (vcpu);struct vcpu_vmx *vmx =to_vmx (vcpu); -if (evmptr_is_valid (vmx->nested.hv_evmcs_vmptr)) { +if (nested_vmx_is_evmptr12_valid (vmx)) {kvm_vcpu_unmap (vcpu, &vmx->nested.hv_evmcs_map, true); vmx->nested.hv_evmcs =NULL ; }
@@ -2123,7 +2123,7 @@ void nested_sync_vmcs12_to_shadow(struct kvm_vcpu *vcpu) {struct vcpu_vmx *vmx =to_vmx (vcpu); -if (evmptr_is_valid (vmx->nested.hv_evmcs_vmptr)) +if (nested_vmx_is_evmptr12_valid (vmx))copy_vmcs12_to_enlightened (vmx);else copy_vmcs12_to_shadow (vmx);
@@ -2277,7 +2277,7 @@ static void prepare_vmcs02_early(struct vcpu_vmx *vmx, struct loaded_vmcs *vmcs0u32 exec_control;u64 guest_efer =nested_vmx_calc_efer (vmx, vmcs12); -if (vmx->nested.dirty_vmcs12 ||evmptr_is_valid (vmx->nested.hv_evmcs_vmptr)) +if (vmx->nested.dirty_vmcs12 ||nested_vmx_is_evmptr12_valid (vmx))prepare_vmcs02_early_rare (vmx, vmcs12);/*
@@ -2572,11 +2572,11 @@ static int prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12,struct vcpu_vmx *vmx =to_vmx (vcpu);bool load_guest_pdptrs_vmcs12 = false; -if (vmx->nested.dirty_vmcs12 ||evmptr_is_valid (vmx->nested.hv_evmcs_vmptr)) { +if (vmx->nested.dirty_vmcs12 ||nested_vmx_is_evmptr12_valid (vmx)) {prepare_vmcs02_rare (vmx, vmcs12); vmx->nested.dirty_vmcs12 = false; - load_guest_pdptrs_vmcs12 = !evmptr_is_valid (vmx->nested.hv_evmcs_vmptr) || + load_guest_pdptrs_vmcs12 = !nested_vmx_is_evmptr12_valid (vmx) || !(vmx->nested.hv_evmcs->hv_clean_fields &HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1 ); }
@@ -2699,7 +2699,7 @@ static int prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12,* bits when it changes a field in eVMCS. Mark all fields as clean * here. */ -if (evmptr_is_valid (vmx->nested.hv_evmcs_vmptr)) +if (nested_vmx_is_evmptr12_valid (vmx)) vmx->nested.hv_evmcs->hv_clean_fields |=HV_VMX_ENLIGHTENED_CLEAN_FIELD_ALL ;
@@ -3579,7 +3579,7 @@ enum nvmx_vmentry_status nested_vmx_enter_non_root_mode(struct kvm_vcpu *vcpu,load_vmcs12_host_state (vcpu, vmcs12); vmcs12->vm_exit_reason = exit_reason.full; -if (enable_shadow_vmcs ||evmptr_is_valid (vmx->nested.hv_evmcs_vmptr)) +if (enable_shadow_vmcs ||nested_vmx_is_evmptr12_valid (vmx)) vmx->nested.need_vmcs12_to_shadow_sync = true;return NVMX_VMENTRY_VMEXIT ; }
@@ -3610,7 +3610,7 @@ static int nested_vmx_run(struct kvm_vcpu *vcpu, bool launch)if (CC (evmptrld_status ==EVMPTRLD_VMFAIL ))return nested_vmx_failInvalid (vcpu); -if (CC (!evmptr_is_valid (vmx->nested.hv_evmcs_vmptr) && +if (CC (!nested_vmx_is_evmptr12_valid (vmx) && vmx->nested.current_vmptr ==INVALID_GPA ))return nested_vmx_failInvalid (vcpu);
@@ -3625,7 +3625,7 @@ static int nested_vmx_run(struct kvm_vcpu *vcpu, bool launch)if (CC (vmcs12->hdr.shadow_vmcs))return nested_vmx_failInvalid (vcpu); -if (evmptr_is_valid (vmx->nested.hv_evmcs_vmptr)) { +if (nested_vmx_is_evmptr12_valid (vmx)) {copy_enlightened_to_vmcs12 (vmx, vmx->nested.hv_evmcs->hv_clean_fields);/* Enlightened VMCS doesn't have launch state */ vmcs12->launch_state = !launch;
@@ -4370,11 +4370,11 @@ static void sync_vmcs02_to_vmcs12(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) {struct vcpu_vmx *vmx =to_vmx (vcpu); -if (evmptr_is_valid (vmx->nested.hv_evmcs_vmptr)) +if (nested_vmx_is_evmptr12_valid (vmx))sync_vmcs02_to_vmcs12_rare (vcpu, vmcs12); vmx->nested.need_sync_vmcs02_to_vmcs12_rare = - !evmptr_is_valid (vmx->nested.hv_evmcs_vmptr); + !nested_vmx_is_evmptr12_valid (vmx); vmcs12->guest_cr0 =vmcs12_guest_cr0 (vcpu, vmcs12); vmcs12->guest_cr4 =vmcs12_guest_cr4 (vcpu, vmcs12);
@@ -4897,7 +4897,7 @@ void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 vm_exit_reason, }if ((vm_exit_reason !=-1 ) && - (enable_shadow_vmcs ||evmptr_is_valid (vmx->nested.hv_evmcs_vmptr))) + (enable_shadow_vmcs ||nested_vmx_is_evmptr12_valid (vmx))) vmx->nested.need_vmcs12_to_shadow_sync = true;/* in case we halted in L2 */
@@ -5390,7 +5390,7 @@ static int handle_vmread(struct kvm_vcpu *vcpu)/* Decode instruction info and find the field to read */ field =kvm_register_read (vcpu, (((instr_info) >>28 ) &0xf )); -if (!evmptr_is_valid (vmx->nested.hv_evmcs_vmptr)) { +if (!nested_vmx_is_evmptr12_valid (vmx)) {/* * In VMX non-root operation, when the VMCS-link pointer is INVALID_GPA, * any VMREAD sets the ALU flags for VMfailInvalid.
@@ -5616,7 +5616,7 @@ static int handle_vmptrld(struct kvm_vcpu *vcpu)return nested_vmx_fail (vcpu,VMXERR_VMPTRLD_VMXON_POINTER );/* Forbid normal VMPTRLD if Enlightened version was used */ -if (evmptr_is_valid (vmx->nested.hv_evmcs_vmptr)) +if (nested_vmx_is_evmptr12_valid (vmx))return 1 ;if (vmx->nested.current_vmptr != vmptr) {
@@ -5679,7 +5679,7 @@ static int handle_vmptrst(struct kvm_vcpu *vcpu)if (!nested_vmx_check_permission (vcpu))return 1 ; -if (unlikely (evmptr_is_valid (to_vmx (vcpu)->nested.hv_evmcs_vmptr))) +if (unlikely (nested_vmx_is_evmptr12_valid (to_vmx (vcpu))))return 1 ; if (get_vmx_mem_address(vcpu, exit_qual, instr_info,
@@ -6467,7 +6467,7 @@ static int vmx_get_nested_state(struct kvm_vcpu *vcpu, kvm_state.size +=sizeof (user_vmx_nested_state->vmcs12);/* 'hv_evmcs_vmptr' can also be EVMPTR_MAP_PENDING here */ -if (vmx->nested.hv_evmcs_vmptr !=EVMPTR_INVALID ) +if (nested_vmx_is_evmptr12_set (vmx)) kvm_state.flags |=KVM_STATE_NESTED_EVMCS ; if (is_guest_mode(vcpu) &&
@@ -6523,7 +6523,7 @@ static int vmx_get_nested_state(struct kvm_vcpu *vcpu, }else {copy_vmcs02_to_vmcs12_rare (vcpu,get_vmcs12 (vcpu));if (!vmx->nested.need_vmcs12_to_shadow_sync) { -if (evmptr_is_valid (vmx->nested.hv_evmcs_vmptr)) +if (nested_vmx_is_evmptr12_valid (vmx))/* * L1 hypervisor is not obliged to keep eVMCS * clean fields data always up-to-date while
arch/x86/kvm/vmx/nested.h +1 -1
@@ -58,7 +58,7 @@ static inline int vmx_has_valid_vmcs12(struct kvm_vcpu *vcpu)/* 'hv_evmcs_vmptr' can also be EVMPTR_MAP_PENDING here */ return vmx->nested.current_vmptr !=-1ull || - vmx->nested.hv_evmcs_vmptr !=EVMPTR_INVALID ; +nested_vmx_is_evmptr12_set (vmx); }static inline u16 nested_get_vpid02 (struct kvm_vcpu *vcpu)
Signature · 1 line
2.43.0
Re: [PATCH v2 13/16] KVM: nVMX: hyper-v: Introduce nested_vmx_is_evmptr12_{valid,set}() helpers
Quoted 32 lines · Vitaly Kuznetsov
In order to get rid of raw '
vmx->nested.hv_evmcs_vmptr' accesses when !CONFIG_KVM_HYPERV, introduce a pair of helpers:
nested_vmx_is_evmptr12_valid()to check that eVMPTR points to a valid address.
nested_vmx_is_evmptr12_valid()to check that eVMPTR either points to a valid address or is in 'pending' port-migration state (meaning it is supposed to be valid but the exact address wasn't acquired from guest's memory yet).No functional change intended.
Signed-off-by Vitaly Kuznetsov <[email protected]>--- arch/x86/kvm/vmx/hyperv.h | 30 ++++++++++++++++++++++++++++++ arch/x86/kvm/vmx/nested.c | 38 +++++++++++++++++++------------------- arch/x86/kvm/vmx/nested.h | 2 +- 3 files changed, 50 insertions(+), 20 deletions(-)arch/x86/kvm/vmx/hyperv.h +4
-0@@ -22,6 +22,21 @@ static inline bool evmptr_is_valid(u64 evmptr)return evmptr !=EVMPTR_INVALID && evmptr !=EVMPTR_MAP_PENDING ; } +static inline bool nested_vmx_is_evmptr12_valid (struct vcpu_vmx *vmx) +{ +return evmptr_is_valid (vmx->nested.hv_evmcs_vmptr); +}
arch/x86/kvm/vmx/hyperv.h static inline bool evmptr_is_valid(u64 evmptr) · line 38
Quoted 10 lines
arch/x86/kvm/vmx/hyperv.h +10
-0+ +static inline bool evmptr_is_set (u64 evmptr) +{ +return evmptr !=EVMPTR_INVALID ; +} + +static inline bool nested_vmx_is_evmptr12_set (struct vcpu_vmx *vmx) +{ +return evmptr_is_set (vmx->nested.hv_evmcs_vmptr); +}
Looks very good.
Quoted 198 lines
arch/x86/kvm/vmx/hyperv.h +16
-0+static inline bool guest_cpuid_has_evmcs (struct kvm_vcpu *vcpu) {/* @@ -45,6 +60,21 @@ static inline bool evmptr_is_valid(u64 evmptr) {return false; } + +static inline bool nested_vmx_is_evmptr12_valid (struct vcpu_vmx *vmx) +{ +return false; +} + +static inline bool evmptr_is_set (u64 evmptr) +{ +return false; +} + +static inline bool nested_vmx_is_evmptr12_set (struct vcpu_vmx *vmx) +{ +return false; +}#endif #endif /* __KVM_X86_VMX_HYPERV_H */ arch/x86/kvm/vmx/nested.c +19
-19@@ -179,7 +179,7 @@ static int nested_vmx_failValid(struct kvm_vcpu *vcpu,* VM_INSTRUCTION_ERROR is not shadowed. Enlightened VMCS 'shadows' all * fields and thus must be synced. */ -if (to_vmx (vcpu)->nested.hv_evmcs_vmptr !=EVMPTR_INVALID ) +if (nested_vmx_is_evmptr12_set (to_vmx (vcpu)))to_vmx (vcpu)->nested.need_vmcs12_to_shadow_sync = true;return kvm_skip_emulated_instruction (vcpu);@@ -194,7 +194,7 @@ static int nested_vmx_fail(struct kvm_vcpu *vcpu, u32 vm_instruction_error)* can't be done if there isn't a current VMCS. */ if (vmx->nested.current_vmptr ==INVALID_GPA && - !evmptr_is_valid (vmx->nested.hv_evmcs_vmptr)) + !nested_vmx_is_evmptr12_valid (vmx))return nested_vmx_failInvalid (vcpu);return nested_vmx_failValid (vcpu, vm_instruction_error);@@ -230,7 +230,7 @@ static inline void nested_release_evmcs(struct kvm_vcpu *vcpu)struct kvm_vcpu_hv *hv_vcpu =to_hv_vcpu (vcpu);struct vcpu_vmx *vmx =to_vmx (vcpu); -if (evmptr_is_valid (vmx->nested.hv_evmcs_vmptr)) { +if (nested_vmx_is_evmptr12_valid (vmx)) {kvm_vcpu_unmap (vcpu, &vmx->nested.hv_evmcs_map, true); vmx->nested.hv_evmcs =NULL ; }@@ -2123,7 +2123,7 @@ void nested_sync_vmcs12_to_shadow(struct kvm_vcpu *vcpu) {struct vcpu_vmx *vmx =to_vmx (vcpu); -if (evmptr_is_valid (vmx->nested.hv_evmcs_vmptr)) +if (nested_vmx_is_evmptr12_valid (vmx))copy_vmcs12_to_enlightened (vmx);else copy_vmcs12_to_shadow (vmx);@@ -2277,7 +2277,7 @@ static void prepare_vmcs02_early(struct vcpu_vmx *vmx, struct loaded_vmcs *vmcs0u32 exec_control;u64 guest_efer =nested_vmx_calc_efer (vmx, vmcs12); -if (vmx->nested.dirty_vmcs12 ||evmptr_is_valid (vmx->nested.hv_evmcs_vmptr)) +if (vmx->nested.dirty_vmcs12 ||nested_vmx_is_evmptr12_valid (vmx))prepare_vmcs02_early_rare (vmx, vmcs12);/* @@ -2572,11 +2572,11 @@ static int prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12,struct vcpu_vmx *vmx =to_vmx (vcpu);bool load_guest_pdptrs_vmcs12 = false; -if (vmx->nested.dirty_vmcs12 ||evmptr_is_valid (vmx->nested.hv_evmcs_vmptr)) { +if (vmx->nested.dirty_vmcs12 ||nested_vmx_is_evmptr12_valid (vmx)) {prepare_vmcs02_rare (vmx, vmcs12); vmx->nested.dirty_vmcs12 = false; - load_guest_pdptrs_vmcs12 = !evmptr_is_valid (vmx->nested.hv_evmcs_vmptr) || + load_guest_pdptrs_vmcs12 = !nested_vmx_is_evmptr12_valid (vmx) || !(vmx->nested.hv_evmcs->hv_clean_fields &HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1 ); }@@ -2699,7 +2699,7 @@ static int prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12,* bits when it changes a field in eVMCS. Mark all fields as clean * here. */ -if (evmptr_is_valid (vmx->nested.hv_evmcs_vmptr)) +if (nested_vmx_is_evmptr12_valid (vmx)) vmx->nested.hv_evmcs->hv_clean_fields |=HV_VMX_ENLIGHTENED_CLEAN_FIELD_ALL ;@@ -3579,7 +3579,7 @@ enum nvmx_vmentry_status nested_vmx_enter_non_root_mode(struct kvm_vcpu *vcpu,load_vmcs12_host_state (vcpu, vmcs12); vmcs12->vm_exit_reason = exit_reason.full; -if (enable_shadow_vmcs ||evmptr_is_valid (vmx->nested.hv_evmcs_vmptr)) +if (enable_shadow_vmcs ||nested_vmx_is_evmptr12_valid (vmx)) vmx->nested.need_vmcs12_to_shadow_sync = true;return NVMX_VMENTRY_VMEXIT ; }@@ -3610,7 +3610,7 @@ static int nested_vmx_run(struct kvm_vcpu *vcpu, bool launch)if (CC (evmptrld_status ==EVMPTRLD_VMFAIL ))return nested_vmx_failInvalid (vcpu); -if (CC (!evmptr_is_valid (vmx->nested.hv_evmcs_vmptr) && +if (CC (!nested_vmx_is_evmptr12_valid (vmx) && vmx->nested.current_vmptr ==INVALID_GPA ))return nested_vmx_failInvalid (vcpu);@@ -3625,7 +3625,7 @@ static int nested_vmx_run(struct kvm_vcpu *vcpu, bool launch)if (CC (vmcs12->hdr.shadow_vmcs))return nested_vmx_failInvalid (vcpu); -if (evmptr_is_valid (vmx->nested.hv_evmcs_vmptr)) { +if (nested_vmx_is_evmptr12_valid (vmx)) {copy_enlightened_to_vmcs12 (vmx, vmx->nested.hv_evmcs->hv_clean_fields);/* Enlightened VMCS doesn't have launch state */ vmcs12->launch_state = !launch;@@ -4370,11 +4370,11 @@ static void sync_vmcs02_to_vmcs12(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) {struct vcpu_vmx *vmx =to_vmx (vcpu); -if (evmptr_is_valid (vmx->nested.hv_evmcs_vmptr)) +if (nested_vmx_is_evmptr12_valid (vmx))sync_vmcs02_to_vmcs12_rare (vcpu, vmcs12); vmx->nested.need_sync_vmcs02_to_vmcs12_rare = - !evmptr_is_valid (vmx->nested.hv_evmcs_vmptr); + !nested_vmx_is_evmptr12_valid (vmx); vmcs12->guest_cr0 =vmcs12_guest_cr0 (vcpu, vmcs12); vmcs12->guest_cr4 =vmcs12_guest_cr4 (vcpu, vmcs12);@@ -4897,7 +4897,7 @@ void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 vm_exit_reason, }if ((vm_exit_reason !=-1 ) && - (enable_shadow_vmcs ||evmptr_is_valid (vmx->nested.hv_evmcs_vmptr))) + (enable_shadow_vmcs ||nested_vmx_is_evmptr12_valid (vmx))) vmx->nested.need_vmcs12_to_shadow_sync = true;/* in case we halted in L2 */ @@ -5390,7 +5390,7 @@ static int handle_vmread(struct kvm_vcpu *vcpu)/* Decode instruction info and find the field to read */ field =kvm_register_read (vcpu, (((instr_info) >>28 ) &0xf )); -if (!evmptr_is_valid (vmx->nested.hv_evmcs_vmptr)) { +if (!nested_vmx_is_evmptr12_valid (vmx)) {/* * In VMX non-root operation, when the VMCS-link pointer is INVALID_GPA, * any VMREAD sets the ALU flags for VMfailInvalid. @@ -5616,7 +5616,7 @@ static int handle_vmptrld(struct kvm_vcpu *vcpu)return nested_vmx_fail (vcpu,VMXERR_VMPTRLD_VMXON_POINTER );/* Forbid normal VMPTRLD if Enlightened version was used */ -if (evmptr_is_valid (vmx->nested.hv_evmcs_vmptr)) +if (nested_vmx_is_evmptr12_valid (vmx))return 1 ;if (vmx->nested.current_vmptr != vmptr) {@@ -5679,7 +5679,7 @@ static int handle_vmptrst(struct kvm_vcpu *vcpu)if (!nested_vmx_check_permission (vcpu))return 1 ; -if (unlikely (evmptr_is_valid (to_vmx (vcpu)->nested.hv_evmcs_vmptr))) +if (unlikely (nested_vmx_is_evmptr12_valid (to_vmx (vcpu))))return 1 ; if (get_vmx_mem_address(vcpu, exit_qual, instr_info,@@ -6467,7 +6467,7 @@ static int vmx_get_nested_state(struct kvm_vcpu *vcpu, kvm_state.size +=sizeof (user_vmx_nested_state->vmcs12);/* 'hv_evmcs_vmptr' can also be EVMPTR_MAP_PENDING here */ -if (vmx->nested.hv_evmcs_vmptr !=EVMPTR_INVALID ) +if (nested_vmx_is_evmptr12_set (vmx)) kvm_state.flags |=KVM_STATE_NESTED_EVMCS ; if (is_guest_mode(vcpu) &&@@ -6523,7 +6523,7 @@ static int vmx_get_nested_state(struct kvm_vcpu *vcpu, }else {copy_vmcs02_to_vmcs12_rare (vcpu,get_vmcs12 (vcpu));if (!vmx->nested.need_vmcs12_to_shadow_sync) { -if (evmptr_is_valid (vmx->nested.hv_evmcs_vmptr)) +if (nested_vmx_is_evmptr12_valid (vmx))/* * L1 hypervisor is not obliged to keep eVMCS * clean fields data always up-to-date while arch/x86/kvm/vmx/nested.h +0
-0
arch/x86/kvm/vmx/nested.h static inline int vmx_has_valid_vmcs12(struct kvm_vcpu *vcpu) · line 64
Quoted 8 lines
arch/x86/kvm/vmx/nested.h +1
-1@@ -58,7 +58,7 @@ static inline int vmx_has_valid_vmcs12(struct kvm_vcpu *vcpu)/* 'hv_evmcs_vmptr' can also be EVMPTR_MAP_PENDING here */ return vmx->nested.current_vmptr !=-1ull || - vmx->nested.hv_evmcs_vmptr !=EVMPTR_INVALID ; +nested_vmx_is_evmptr12_set (vmx); }static inline u16 nested_get_vpid02 (struct kvm_vcpu *vcpu)
Looks even better that previous version,
Best regards,
Maxim Levitsky
Vitaly Kuznetsov
maintainerPATCH v2 14/16 KVM: nVMX: hyper-v: Introduce nested_vmx_evmcs() accessor
In reply to Vitaly KuznetsovThere's a number of 'vmx->nested.hv_evmcs' accesses in nested.c, introduce 'nested_vmx_evmcs()' accessor to hide them all in !CONFIG_KVM_HYPERV case.
No functional change intended.
--- arch/x86/kvm/vmx/hyperv.h | 10 ++++++++++ arch/x86/kvm/vmx/nested.c | 33 ++++++++++++++++++--------------- 2 files changed, 28 insertions(+), 15 deletions(-)
arch/x86/kvm/vmx/hyperv.h +10 -0
@@ -37,6 +37,11 @@ static inline bool nested_vmx_is_evmptr12_set(struct vcpu_vmx *vmx)return evmptr_is_set (vmx->nested.hv_evmcs_vmptr); } +static inline struct hv_enlightened_vmcs *nested_vmx_evmcs (struct vcpu_vmx *vmx) +{ +return vmx->nested.hv_evmcs; +} +static inline bool guest_cpuid_has_evmcs (struct kvm_vcpu *vcpu) {/*
@@ -75,6 +80,11 @@ static inline bool nested_vmx_is_evmptr12_set(struct vcpu_vmx *vmx) {return false; } + +static inline struct hv_enlightened_vmcs *nested_vmx_evmcs (struct vcpu_vmx *vmx) +{ +return NULL ; +}#endif #endif /* __KVM_X86_VMX_HYPERV_H */
arch/x86/kvm/vmx/nested.c +18 -15
@@ -263,7 +263,7 @@ static bool nested_evmcs_handle_vmclear(struct kvm_vcpu *vcpu, gpa_t vmptr) !evmptr_is_valid(nested_get_evmptr(vcpu)))return false; -if (vmx->nested.hv_evmcs && vmptr == vmx->nested.hv_evmcs_vmptr) +if (nested_vmx_evmcs (vmx) && vmptr == vmx->nested.hv_evmcs_vmptr)nested_release_evmcs (vcpu);return true;
@@ -601,7 +601,6 @@ static inline bool nested_vmx_prepare_msr_bitmap(struct kvm_vcpu *vcpu,int msr;unsigned long *msr_bitmap_l1;unsigned long *msr_bitmap_l0 = vmx->nested.vmcs02.msr_bitmap; -struct hv_enlightened_vmcs *evmcs = vmx->nested.hv_evmcs;struct kvm_host_map *map = &vmx->nested.msr_bitmap_map;/* Nothing to do if the MSR bitmap is not in use. */
@@ -617,10 +616,13 @@ static inline bool nested_vmx_prepare_msr_bitmap(struct kvm_vcpu *vcpu,* - Nested hypervisor (L1) has enabled 'Enlightened MSR Bitmap' feature * and tells KVM (L0) there were no changes in MSR bitmap for L2. */ -if (!vmx->nested.force_msr_bitmap_recalc && evmcs && - evmcs->hv_enlightenments_control.msr_bitmap && - evmcs->hv_clean_fields &HV_VMX_ENLIGHTENED_CLEAN_FIELD_MSR_BITMAP ) -return true; +if (!vmx->nested.force_msr_bitmap_recalc) { +struct hv_enlightened_vmcs *evmcs =nested_vmx_evmcs (vmx); + +if (evmcs && evmcs->hv_enlightenments_control.msr_bitmap && + evmcs->hv_clean_fields &HV_VMX_ENLIGHTENED_CLEAN_FIELD_MSR_BITMAP ) +return true; + }if (kvm_vcpu_map (vcpu,gpa_to_gfn (vmcs12->msr_bitmap), map))return false;
@@ -1603,7 +1605,7 @@ static void copy_enlightened_to_vmcs12(struct vcpu_vmx *vmx, u32 hv_clean_fields {#ifdef CONFIG_KVM_HYPERV struct vmcs12 *vmcs12 = vmx->nested.cached_vmcs12; -struct hv_enlightened_vmcs *evmcs = vmx->nested.hv_evmcs; +struct hv_enlightened_vmcs *evmcs =nested_vmx_evmcs (vmx);struct kvm_vcpu_hv *hv_vcpu =to_hv_vcpu (&vmx->vcpu);/* HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE */
@@ -1851,7 +1853,7 @@ static void copy_vmcs12_to_enlightened(struct vcpu_vmx *vmx) {#ifdef CONFIG_KVM_HYPERV struct vmcs12 *vmcs12 = vmx->nested.cached_vmcs12; -struct hv_enlightened_vmcs *evmcs = vmx->nested.hv_evmcs; +struct hv_enlightened_vmcs *evmcs =nested_vmx_evmcs (vmx);/* * Should not be changed by KVM:
@@ -2438,7 +2440,7 @@ static void prepare_vmcs02_early(struct vcpu_vmx *vmx, struct loaded_vmcs *vmcs0static void prepare_vmcs02_rare (struct vcpu_vmx *vmx,struct vmcs12 *vmcs12) { -struct hv_enlightened_vmcs *hv_evmcs = vmx->nested.hv_evmcs; +struct hv_enlightened_vmcs *hv_evmcs =nested_vmx_evmcs (vmx);if (!hv_evmcs || !(hv_evmcs->hv_clean_fields &HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2 )) {
@@ -2570,6 +2572,7 @@ static int prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12, enum vm_entry_failure_code *entry_failure_code) {struct vcpu_vmx *vmx =to_vmx (vcpu); +struct hv_enlightened_vmcs *evmcs =nested_vmx_evmcs (vmx);bool load_guest_pdptrs_vmcs12 = false;if (vmx->nested.dirty_vmcs12 ||nested_vmx_is_evmptr12_valid (vmx)) {
@@ -2577,8 +2580,7 @@ static int prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12, vmx->nested.dirty_vmcs12 = false; load_guest_pdptrs_vmcs12 = !nested_vmx_is_evmptr12_valid (vmx) || - !(vmx->nested.hv_evmcs->hv_clean_fields & -HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1 ); + !(evmcs->hv_clean_fields &HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1 ); } if (vmx->nested.nested_run_pending &&
@@ -2700,8 +2702,7 @@ static int prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12,* here. */ if (nested_vmx_is_evmptr12_valid (vmx)) - vmx->nested.hv_evmcs->hv_clean_fields |= -HV_VMX_ENLIGHTENED_CLEAN_FIELD_ALL ; + evmcs->hv_clean_fields |=HV_VMX_ENLIGHTENED_CLEAN_FIELD_ALL ;return 0 ; }
@@ -3626,7 +3627,9 @@ static int nested_vmx_run(struct kvm_vcpu *vcpu, bool launch)return nested_vmx_failInvalid (vcpu);if (nested_vmx_is_evmptr12_valid (vmx)) { -copy_enlightened_to_vmcs12 (vmx, vmx->nested.hv_evmcs->hv_clean_fields); +struct hv_enlightened_vmcs *evmcs =nested_vmx_evmcs (vmx); + +copy_enlightened_to_vmcs12 (vmx, evmcs->hv_clean_fields);/* Enlightened VMCS doesn't have launch state */ vmcs12->launch_state = !launch; }else if (enable_shadow_vmcs) {
@@ -5428,7 +5431,7 @@ static int handle_vmread(struct kvm_vcpu *vcpu)return nested_vmx_fail (vcpu,VMXERR_UNSUPPORTED_VMCS_COMPONENT );/* Read the field, zero-extended to a u64 value */ - value =evmcs_read_any (vmx->nested.hv_evmcs, field, offset); + value =evmcs_read_any (nested_vmx_evmcs (vmx), field, offset); }/*
Signature · 1 line
2.43.0
Vitaly Kuznetsov
maintainerPATCH v2 15/16 KVM: nVMX: hyper-v: Hide more stuff under CONFIG_KVM_HYPERV
In reply to Vitaly Kuznetsov'hv_evmcs_vmptr'/'hv_evmcs_map'/'hv_evmcs' fields in 'struct nested_vmx' should not be used when !CONFIG_KVM_HYPERV, hide them when !CONFIG_KVM_HYPERV.
No functional change intended.
--- arch/x86/kvm/vmx/nested.c | 2 ++ arch/x86/kvm/vmx/vmx.c | 3 +++ arch/x86/kvm/vmx/vmx.h | 2 ++ 3 files changed, 7 insertions(+)
arch/x86/kvm/vmx/nested.c +2 -0
@@ -6667,6 +6667,7 @@ static int vmx_set_nested_state(struct kvm_vcpu *vcpu,return -EINVAL ;set_current_vmptr (vmx, kvm_state->hdr.vmx.vmcs12_pa); +#ifdef CONFIG_KVM_HYPERV }else if (kvm_state->flags &KVM_STATE_NESTED_EVMCS ) {/* * nested_vmx_handle_enlightened_vmptrld() cannot be called
@@ -6676,6 +6677,7 @@ static int vmx_set_nested_state(struct kvm_vcpu *vcpu,*/ vmx->nested.hv_evmcs_vmptr =EVMPTR_MAP_PENDING ;kvm_make_request (KVM_REQ_GET_NESTED_STATE_PAGES , vcpu); +#endif }else {return -EINVAL ; }
arch/x86/kvm/vmx/vmx.c +3 -0
@@ -4828,7 +4828,10 @@ static void __vmx_vcpu_reset(struct kvm_vcpu *vcpu) vmx->nested.posted_intr_nv =-1 ; vmx->nested.vmxon_ptr =INVALID_GPA ; vmx->nested.current_vmptr =INVALID_GPA ; + +#ifdef CONFIG_KVM_HYPERV vmx->nested.hv_evmcs_vmptr =EVMPTR_INVALID ; +#endif vcpu->arch.microcode_version =0x100000000ULL ; vmx->msr_ia32_feature_control_valid_bits =FEAT_CTL_LOCKED ;
arch/x86/kvm/vmx/vmx.h +2 -0
@@ -241,9 +241,11 @@ struct nested_vmx {bool guest_mode; } smm; +#ifdef CONFIG_KVM_HYPERV gpa_t hv_evmcs_vmptr;struct kvm_host_map hv_evmcs_map;struct hv_enlightened_vmcs *hv_evmcs; +#endif };struct vcpu_vmx {
Signature · 1 line
2.43.0
Vitaly Kuznetsov
maintainerPATCH v2 16/16 KVM: nSVM: hyper-v: Hide more stuff under CONFIG_KVM_HYPERV/CONFIG_HYPERV
In reply to Vitaly Kuznetsov'struct hv_vmcb_enlightenments' in VMCB only make sense when either CONFIG_KVM_HYPERV or CONFIG_HYPERV is enabled.
No functional change intended.
--- arch/x86/kvm/svm/nested.c | 20 ++++++++++++++------ arch/x86/kvm/svm/svm.h | 2 ++ 2 files changed, 16 insertions(+), 6 deletions(-)
arch/x86/kvm/svm/nested.c +14 -6
@@ -187,7 +187,6 @@ void recalc_intercepts(struct vcpu_svm *svm)*/ static bool nested_svm_vmrun_msrpm (struct vcpu_svm *svm) { -struct hv_vmcb_enlightenments *hve = &svm->nested.ctl.hv_enlightenments;int i;/*
@@ -198,11 +197,16 @@ static bool nested_svm_vmrun_msrpm(struct vcpu_svm *svm)* - Nested hypervisor (L1) is using Hyper-V emulation interface and * tells KVM (L0) there were no changes in MSR bitmap for L2. */ -if (!svm->nested.force_msr_bitmap_recalc && -kvm_hv_hypercall_enabled (&svm->vcpu) && - hve->hv_enlightenments_control.msr_bitmap && - (svm->nested.ctl.clean &BIT (HV_VMCB_NESTED_ENLIGHTENMENTS ))) - goto set_msrpm_base_pa; +#ifdef CONFIG_KVM_HYPERV +if (!svm->nested.force_msr_bitmap_recalc) { +struct hv_vmcb_enlightenments *hve = &svm->nested.ctl.hv_enlightenments; + +if (kvm_hv_hypercall_enabled (&svm->vcpu) && + hve->hv_enlightenments_control.msr_bitmap && + (svm->nested.ctl.clean &BIT (HV_VMCB_NESTED_ENLIGHTENMENTS ))) + goto set_msrpm_base_pa; + } +#endif if (!(vmcb12_is_intercept (&svm->nested.ctl,INTERCEPT_MSR_PROT )))return true;
@@ -230,7 +234,9 @@ static bool nested_svm_vmrun_msrpm(struct vcpu_svm *svm) svm->nested.force_msr_bitmap_recalc = false; +#ifdef CONFIG_KVM_HYPERV set_msrpm_base_pa: +#endif svm->vmcb->control.msrpm_base_pa =__sme_set (__pa (svm->nested.msrpm));return true;
@@ -378,12 +384,14 @@ void __nested_copy_vmcb_control_to_cache(struct kvm_vcpu *vcpu, to->msrpm_base_pa &= ~0x0fffULL ; to->iopm_base_pa &= ~0x0fffULL ; +#ifdef CONFIG_KVM_HYPERV /* Hyper-V extensions (Enlightened VMCB) */ if (kvm_hv_hypercall_enabled (vcpu)) { to->clean = from->clean;memcpy (&to->hv_enlightenments, &from->hv_enlightenments,sizeof (to->hv_enlightenments)); } +#endif } void nested_copy_vmcb_control_to_cache(struct vcpu_svm *svm,
arch/x86/kvm/svm/svm.h +2 -0
@@ -148,7 +148,9 @@ struct vmcb_ctrl_area_cached {u64 virt_ext;u32 clean;union { +#if IS_ENABLED (CONFIG_HYPERV ) ||IS_ENABLED (CONFIG_KVM_HYPERV )struct hv_vmcb_enlightenments hv_enlightenments; +#endif u8 reserved_sw[32 ]; }; };
Signature · 1 line
2.43.0
Quoted 14 lines · Vitaly Kuznetsov
v1:
https://lore.kernel.org/kvm/[email protected]/Changes since RFC:
- "KVM: x86: hyper-v: Split offnested_evmcs_handle_vmclear()" patch added [Sean]
- "KVM: nVMX: Moveguest_cpuid_has_evmcs()tohyperv.h" patch added [Sean]
- Use evmptr_is_set()/nested_vmx_is_evmptr12_set() helpers instead ofnested_vmx_evmptr12()[Sean]
- Move "#ifdefCONFIG_KVM_HYPERV" inside certain functions instead of adding stubs for !CONFIG_KVM_HYPERV case [Sean]
- Minor code re-shuffling [Sean]
- Collect R-b tags [Max]
Quoted 1 line
[...]
Applied to kvm-x86 hyperv. I massaged a lot of the shortlogs to adjust the scope, shorten line lengths, and rephrase things using more conversational language.
Re: the scopes, while I like the idea of "KVM: x86/hyper-v:", e.g. to pair with "KVM: x86/xen:", I think we should forego it for now. The Xen code is fairly well contained and doesn't have VMX or SVM code, let alone nVMX and nSVM code.
Hyper-V... not so much. It has its greedy little hands in everything :-) That makes it rather difficult to have consistency and correctness, e.g. these three are all nVMX+hyper-v specific, yet managed to end up with three different scopes.
KVM: nVMX: Move guest_cpuid_has_evmcs() to hyperv.h
KVM: nVMX: hyper-v: Introduce nested_vmx_evmcs() accessor
KVM: x86: hyper-v: Split off nested_evmcs_handle_vmclear()
And things only get more confusing when KVM-on-Hyper-V comes into play. So kinda like we do with the TDP MMU, which is too intertwined with the regular/common MMU code to get its own scope, I think we should use existing scopes and then explicitly talk about Hyper-V in the shortlog to make up for the lack of precision.
Please speak up if you disagree! I don't expect to apply any other patches to this branch, i.e. further massaging the shortlogs isn't a problem.
[1/16] KVM: x86/xen: Remove unneeded xen context from kvm_arch when !CONFIG_KVM_XEN
https://github.com/kvm-x86/linux/commit/87562052c965 [2/16] KVM: x86: Move Hyper-V partition assist page out of Hyper-V emulation context https://github.com/kvm-x86/linux/commit/cfef5af3cb0e [3/16] KVM: VMX: Split off vmx_onhyperv.{ch} from hyperv.{ch} https://github.com/kvm-x86/linux/commit/50a82b0eb88c [4/16] KVM: x86: Introduce helper to check if auto-EOI is set in Hyper-V SynIC https://github.com/kvm-x86/linux/commit/16e880bfa637 [5/16] KVM: x86: Introduce helper to check if vector is set in Hyper-V SynIC https://github.com/kvm-x86/linux/commit/0659262a2625 [6/16] KVM: VMX: Split off hyperv_evmcs.{ch} https://github.com/kvm-x86/linux/commit/e7ad84db4d71 [7/16] KVM: x86: Introduce helper to handle Hyper-V paravirt TLB flush requests https://github.com/kvm-x86/linux/commit/af9d544a4521 [8/16] KVM: nVMX: Split off helper for emulating VMCLEAR on Hyper-V eVMCS https://github.com/kvm-x86/linux/commit/b2e02f82b7f7 [9/16] KVM: selftests: Make Hyper-V tests explicitly require KVM Hyper-V support https://github.com/kvm-x86/linux/commit/6dac1195181c [10/16] KVM: selftests: Fix vmxon_pa == vmcs12_pa == -1ull nVMX testcase for !eVMCS https://github.com/kvm-x86/linux/commit/225b7c1117b2 [11/16] KVM: nVMX: Move guest_cpuid_has_evmcs() to hyperv.h https://github.com/kvm-x86/linux/commit/f97314626734 [12/16] KVM: x86: Make Hyper-V emulation optional https://github.com/kvm-x86/linux/commit/b4f69df0f65e [13/16] KVM: nVMX: Introduce helpers to check if Hyper-V evmptr12 is valid/set https://github.com/kvm-x86/linux/commit/453e42b05571 [14/16] KVM: nVMX: Introduce accessor to get Hyper-V eVMCS pointer https://github.com/kvm-x86/linux/commit/c98842b26c23 [15/16] KVM: nVMX: Hide more stuff under CONFIG_KVM_HYPERV https://github.com/kvm-x86/linux/commit/5a30f97683af [16/16] KVM: nSVM: Hide more stuff under CONFIG_KVM_HYPERV/CONFIG_HYPERV https://github.com/kvm-x86/linux/commit/017a99a966f1