KVM: VMX: Support TscScaling and EnclsExitingBitmap whith eVMCS
Subsystems (9)
Vitaly Kuznetsov
maintainercover KVM: VMX: Support TscScaling and EnclsExitingBitmap whith eVMCS
Enlightened VMCS v1 definition was updates to include fields for the following features:
- PerfGlobalCtrl
- EnclsExitingBitmap
- TSC scaling
- GuestLbrCtl
- CET
- SSP
Add support for EnclsExitingBitmap and TSC scaling to KVM. PerfGlobalCtrl doesn't work correctly with Win11, don't enable it yet. SSP, CET and GuestLbrCtl are not currently supported by KVM.
Note: adding new field for KVM on Hyper-V case is easy but adding them to Hyper-V on KVM requires some work to not break live migration as we never expected this to happen without eVMCS version update. The series introduces new KVM_CAP_HYPERV_ENLIGHTENED_VMCS2 capability and a notion of KVM internal 'Enlightened VMCS revision'.
Example QEMU enablement patch for the new capability will be sent as a follow-up to the series.
Vitaly Kuznetsov (11):
KVM: x86: hyper-v: Expose access to debug MSRs in the partition
privilege flags
x86/hyperv: Fix 'struct hv_enlightened_vmcs' definition x86/hyperv: Update 'struct hv_enlightened_vmcs' definition
KVM: VMX: Define VMCS-to-EVMCS conversion for the new fields
KVM: nVMX: Support several new fields in eVMCSv1
KVM: nVMX: Introduce KVM_CAP_HYPERV_ENLIGHTENED_VMCS2
KVM: selftests: Switch to KVM_CAP_HYPERV_ENLIGHTENED_VMCS2
KVM: VMX: Support TSC scaling with enlightened VMCS
KVM: selftests: Add ENCLS_EXITING_BITMAP{,HIGH} VMCS fields
KVM: selftests: Switch to updated eVMCSv1 definition
KVM: selftests: Enable TSC scaling in evmcs selftest
Documentation/virt/kvm/api.rst | 42 ++++++- arch/x86/include/asm/hyperv-tlfs.h | 19 ++- arch/x86/include/asm/kvm_host.h | 2 +- arch/x86/kvm/hyperv.c | 1 + arch/x86/kvm/vmx/evmcs.c | 116 ++++++++++++++---- arch/x86/kvm/vmx/evmcs.h | 28 +++-- arch/x86/kvm/vmx/nested.c | 43 ++++++- arch/x86/kvm/vmx/vmx.c | 4 +- arch/x86/kvm/vmx/vmx.h | 15 +-- arch/x86/kvm/x86.c | 15 ++- include/asm-generic/hyperv-tlfs.h | 2 + include/uapi/linux/kvm.h | 3 +- .../selftests/kvm/include/kvm_util_base.h | 8 ++ .../selftests/kvm/include/x86_64/evmcs.h | 46 ++++++- .../selftests/kvm/include/x86_64/vmx.h | 2 + tools/testing/selftests/kvm/lib/x86_64/vmx.c | 5 +- .../testing/selftests/kvm/x86_64/evmcs_test.c | 33 ++++- .../selftests/kvm/x86_64/hyperv_cpuid.c | 2 +- .../kvm/x86_64/vmx_set_nested_state_test.c | 2 +- 19 files changed, 321 insertions(+), 67 deletions(-)
Signature · 1 line
2.35.3
Vitaly Kuznetsov
maintainerPATCH 1/11 KVM: x86: hyper-v: Expose access to debug MSRs in the partition privilege flags
For some features, Hyper-V spec defines two separate CPUID bits: one listing whether the feature is supported or not and another one showing whether guest partition was granted access to the feature ("partition privilege mask"). 'Debug MSRs available' is one of such features. Add the missing 'access' bit.
--- arch/x86/kvm/hyperv.c | 1 + include/asm-generic/hyperv-tlfs.h | 2 ++ 2 files changed, 3 insertions(+)
arch/x86/kvm/hyperv.c +1 -0
@@ -2496,6 +2496,7 @@ int kvm_get_hv_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid2 *cpuid, ent->eax |=HV_MSR_RESET_AVAILABLE ; ent->eax |=HV_MSR_REFERENCE_TSC_AVAILABLE ; ent->eax |=HV_ACCESS_FREQUENCY_MSRS ; + ent->eax |=HV_ACCESS_DEBUG_MSRS ; ent->eax |=HV_ACCESS_REENLIGHTENMENT ; ent->ebx |=HV_POST_MESSAGES ;
include/asm-generic/hyperv-tlfs.h +2 -0
@@ -70,6 +70,8 @@#define HV_MSR_GUEST_IDLE_AVAILABLE BIT(10)/* Partition local APIC and TSC frequency registers available */ #define HV_ACCESS_FREQUENCY_MSRS BIT(11) +/* Debug MSRs available */ +#define HV_ACCESS_DEBUG_MSRS BIT(12)/* AccessReenlightenmentControls privilege */ #define HV_ACCESS_REENLIGHTENMENT BIT(13)/* AccessTscInvariantControls privilege */
Signature · 1 line
2.35.3
Vitaly Kuznetsov
maintainerPATCH 2/11 x86/hyperv: Fix 'struct hv_enlightened_vmcs' definition
In reply to Vitaly KuznetsovSection 1.9 of TLFS v6.0b says:
"All structures are padded in such a way that fields are aligned naturally (that is, an 8-byte field is aligned to an offset of 8 bytes and so on)".
'struct enlightened_vmcs' has a glitch:
...
struct {
u32 nested_flush_hypercall:1; /* 836: 0 4 */
u32 msr_bitmap:1; /* 836: 1 4 */
u32 reserved:30; /* 836: 2 4 */
} hv_enlightenments_control; /* 836 4 */
u32 hv_vp_id; /* 840 4 */
u64 hv_vm_id; /* 844 8 */
u64 partition_assist_page; /* 852 8 */...
And the observed values in 'partition_assist_page' make no sense at all. Fix the layout by padding the structure properly.
--- arch/x86/include/asm/hyperv-tlfs.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/include/asm/hyperv-tlfs.h +2 -2
@@ -546,7 +546,7 @@ struct hv_enlightened_vmcs {u64 guest_rip;u32 hv_clean_fields; -u32 hv_padding_32; +u32 padding32_1;u32 hv_synthetic_controls;struct {u32 nested_flush_hypercall:1 ;
@@ -554,7 +554,7 @@ struct hv_enlightened_vmcs { u32 reserved:30; }__packed hv_enlightenments_control;u32 hv_vp_id; - +u32 padding32_2;u64 hv_vm_id;u64 partition_assist_page;u64 padding64_4[4 ];
Signature · 1 line
2.35.3
Vitaly Kuznetsov
maintainerPATCH 3/11 x86/hyperv: Update 'struct hv_enlightened_vmcs' definition
In reply to Vitaly KuznetsovUpdated Hyper-V Enlightened VMCS specification lists several new fields for the following features:
- PerfGlobalCtrl
- EnclsExitingBitmap
- Tsc Scaling
- GuestLbrCtl
- CET
- SSP
Update the definition.
Note: The latest TLFS is available at
https://docs.microsoft.com/en-us/virtualization/hyper-v-on-windows/tlfs/tlfs
--- arch/x86/include/asm/hyperv-tlfs.h | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
arch/x86/include/asm/hyperv-tlfs.h +13 -2
@@ -559,9 +559,20 @@ struct hv_enlightened_vmcs {u64 partition_assist_page;u64 padding64_4[4 ];u64 guest_bndcfgs; -u64 padding64_5[7 ]; +u64 guest_ia32_perf_global_ctrl; +u64 guest_ia32_s_cet; +u64 guest_ssp; +u64 guest_ia32_int_ssp_table_addr; +u64 guest_ia32_lbr_ctl; +u64 padding64_5[2 ];u64 xss_exit_bitmap; -u64 padding64_6[7 ]; +u64 host_ia32_perf_global_ctrl; +u64 encls_exiting_bitmap; +u64 tsc_multiplier; +u64 host_ia32_s_cet; +u64 host_ssp; +u64 host_ia32_int_ssp_table_addr; +u64 padding64_6; } __packed;#define HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE 0
Signature · 1 line
2.35.3
Vitaly Kuznetsov
maintainerPATCH 4/11 KVM: VMX: Define VMCS-to-EVMCS conversion for the new fields
In reply to Vitaly KuznetsovEnlightened VMCS v1 definition was updated with new fields, support them in KVM by defining VMCS-to-EVMCS conversion.
Note: SSP, CET and Guest LBR features are not supported by KVM yet and the corresponding fields are not defined in 'enum vmcs_field', leave them commented out for now.
--- arch/x86/kvm/vmx/evmcs.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
arch/x86/kvm/vmx/evmcs.c +26 -0
@@ -28,6 +28,8 @@ const struct evmcs_field vmcs_field_to_evmcs_1[] = { HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),EVMCS1_FIELD (HOST_IA32_EFER , host_ia32_efer,HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1 ), +EVMCS1_FIELD (HOST_IA32_PERF_GLOBAL_CTRL , host_ia32_perf_global_ctrl, +HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1 ),EVMCS1_FIELD (HOST_CR0 , host_cr0,HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1 ), EVMCS1_FIELD(HOST_CR3, host_cr3,
@@ -78,6 +80,8 @@ const struct evmcs_field vmcs_field_to_evmcs_1[] = { HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1),EVMCS1_FIELD (GUEST_IA32_EFER , guest_ia32_efer,HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1 ), +EVMCS1_FIELD (GUEST_IA32_PERF_GLOBAL_CTRL , guest_ia32_perf_global_ctrl, +HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1 ),EVMCS1_FIELD (GUEST_PDPTR0 , guest_pdptr0,HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1 ), EVMCS1_FIELD(GUEST_PDPTR1, guest_pdptr1,
@@ -126,6 +130,28 @@ const struct evmcs_field vmcs_field_to_evmcs_1[] = { HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1),EVMCS1_FIELD (XSS_EXIT_BITMAP , xss_exit_bitmap,HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_GRP2 ), +EVMCS1_FIELD (ENCLS_EXITING_BITMAP , encls_exiting_bitmap, +HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_GRP2 ), +EVMCS1_FIELD (TSC_MULTIPLIER , tsc_multiplier, +HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_GRP2 ), +/* +* Not used by KVM: +* +* EVMCS1_FIELD(0x00006828, guest_ia32_s_cet, +* HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1), +* EVMCS1_FIELD(0x0000682A, guest_ssp, +* HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_BASIC), +* EVMCS1_FIELD(0x0000682C, guest_ia32_int_ssp_table_addr, +* HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1), +* EVMCS1_FIELD(0x00002816, guest_ia32_lbr_ctl, +* HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1), +* EVMCS1_FIELD(0x00006C18, host_ia32_s_cet, +* HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1), +* EVMCS1_FIELD(0x00006C1A, host_ssp, +* HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1), +* EVMCS1_FIELD(0x00006C1C, host_ia32_int_ssp_table_addr, +* HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1), +*/ /* 64 bit read only */ EVMCS1_FIELD(GUEST_PHYSICAL_ADDRESS, guest_physical_address,
Signature · 1 line
2.35.3
Vitaly Kuznetsov
maintainerPATCH 5/11 KVM: nVMX: Support several new fields in eVMCSv1
In reply to Vitaly KuznetsovEnlightened VMCS v1 definition was updated with new fields, add support for them for Hyper-V on KVM.
Note: SSP, CET and Guest LBR features are not supported by KVM yet and 'struct vmcs12' has no corresponding fields.
--- arch/x86/kvm/vmx/nested.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)
arch/x86/kvm/vmx/nested.c +31 -0
@@ -1602,6 +1602,10 @@ static void copy_enlightened_to_vmcs12(struct vcpu_vmx *vmx, u32 hv_clean_fields vmcs12->guest_rflags = evmcs->guest_rflags; vmcs12->guest_interruptibility_info = evmcs->guest_interruptibility_info; +/* +* Not present in struct vmcs12: +* vmcs12->guest_ssp = evmcs->guest_ssp; +*/ } if (unlikely(!(hv_clean_fields &
@@ -1648,6 +1652,13 @@ static void copy_enlightened_to_vmcs12(struct vcpu_vmx *vmx, u32 hv_clean_fields vmcs12->host_fs_selector = evmcs->host_fs_selector; vmcs12->host_gs_selector = evmcs->host_gs_selector; vmcs12->host_tr_selector = evmcs->host_tr_selector; + vmcs12->host_ia32_perf_global_ctrl = evmcs->host_ia32_perf_global_ctrl; +/* +* Not present in struct vmcs12: +* vmcs12->host_ia32_s_cet = evmcs->host_ia32_s_cet; +* vmcs12->host_ssp = evmcs->host_ssp; +* vmcs12->host_ia32_int_ssp_table_addr = evmcs->host_ia32_int_ssp_table_addr; +*/ } if (unlikely(!(hv_clean_fields &
@@ -1715,6 +1726,8 @@ static void copy_enlightened_to_vmcs12(struct vcpu_vmx *vmx, u32 hv_clean_fields vmcs12->tsc_offset = evmcs->tsc_offset; vmcs12->virtual_apic_page_addr = evmcs->virtual_apic_page_addr; vmcs12->xss_exit_bitmap = evmcs->xss_exit_bitmap; + vmcs12->encls_exiting_bitmap = evmcs->encls_exiting_bitmap; + vmcs12->tsc_multiplier = evmcs->tsc_multiplier; } if (unlikely(!(hv_clean_fields &
@@ -1762,6 +1775,13 @@ static void copy_enlightened_to_vmcs12(struct vcpu_vmx *vmx, u32 hv_clean_fields vmcs12->guest_bndcfgs = evmcs->guest_bndcfgs; vmcs12->guest_activity_state = evmcs->guest_activity_state; vmcs12->guest_sysenter_cs = evmcs->guest_sysenter_cs; + vmcs12->guest_ia32_perf_global_ctrl = evmcs->guest_ia32_perf_global_ctrl; +/* +* Not present in struct vmcs12: +* vmcs12->guest_ia32_s_cet = evmcs->guest_ia32_s_cet; +* vmcs12->guest_ia32_lbr_ctl = evmcs->guest_ia32_lbr_ctl; +* vmcs12->guest_ia32_int_ssp_table_addr = evmcs->guest_ia32_int_ssp_table_addr; +*/ }/*
@@ -1864,12 +1884,23 @@ static void copy_vmcs12_to_enlightened(struct vcpu_vmx *vmx)* evmcs->vm_exit_msr_store_count = vmcs12->vm_exit_msr_store_count; * evmcs->vm_exit_msr_load_count = vmcs12->vm_exit_msr_load_count; * evmcs->vm_entry_msr_load_count = vmcs12->vm_entry_msr_load_count; +* evmcs->guest_ia32_perf_global_ctrl = vmcs12->guest_ia32_perf_global_ctrl; +* evmcs->host_ia32_perf_global_ctrl = vmcs12->host_ia32_perf_global_ctrl; +* evmcs->encls_exiting_bitmap = vmcs12->encls_exiting_bitmap; +* evmcs->tsc_multiplier = vmcs12->tsc_multiplier; * * Not present in struct vmcs12: * evmcs->exit_io_instruction_ecx = vmcs12->exit_io_instruction_ecx; * evmcs->exit_io_instruction_esi = vmcs12->exit_io_instruction_esi; * evmcs->exit_io_instruction_edi = vmcs12->exit_io_instruction_edi; * evmcs->exit_io_instruction_eip = vmcs12->exit_io_instruction_eip; +* evmcs->host_ia32_s_cet = vmcs12->host_ia32_s_cet; +* evmcs->host_ssp = vmcs12->host_ssp; +* evmcs->host_ia32_int_ssp_table_addr = vmcs12->host_ia32_int_ssp_table_addr; +* evmcs->guest_ia32_s_cet = vmcs12->guest_ia32_s_cet; +* evmcs->guest_ia32_lbr_ctl = vmcs12->guest_ia32_lbr_ctl; +* evmcs->guest_ia32_int_ssp_table_addr = vmcs12->guest_ia32_int_ssp_table_addr; +* evmcs->guest_ssp = vmcs12->guest_ssp; */ evmcs->guest_es_selector = vmcs12->guest_es_selector;
Signature · 1 line
2.35.3
Vitaly Kuznetsov
maintainerPATCH 6/11 KVM: nVMX: Introduce KVM_CAP_HYPERV_ENLIGHTENED_VMCS2
In reply to Vitaly KuznetsovTurns out Enlightened VMCS can gain new fields without version change and KVM_CAP_HYPERV_ENLIGHTENED_VMCS which KVM currently has cant's handle this reliably. In particular, just updating the current definition of eVMCSv1 with the new fields and adjusting the VMX MSR filtering will inevitably break live migration to older KVMs. Note: enabling eVMCS and setting VMX feature MSR can happen in any order.
Introduce a notion of KVM internal "Enlightened VMCS revision" and add a new capability allowing to add fields to Enlightened VMCS while keeping its version.
--- Documentation/virt/kvm/api.rst | 42 ++++++++++++++++++++++++++++++++- arch/x86/include/asm/kvm_host.h | 2 +- arch/x86/kvm/vmx/evmcs.c | 20 +++++++++++----- arch/x86/kvm/vmx/evmcs.h | 13 ++++++++-- arch/x86/kvm/vmx/nested.c | 10 ++++---- arch/x86/kvm/vmx/vmx.c | 2 +- arch/x86/kvm/vmx/vmx.h | 15 ++++++------ arch/x86/kvm/x86.c | 15 +++++++++++- include/uapi/linux/kvm.h | 3 ++- 9 files changed, 97 insertions(+), 25 deletions(-)
Documentation/virt/kvm/api.rst +41 -1
@@ -4974,7 +4974,7 @@ version has the following quirks: - HYPERV_CPUID_NESTED_FEATURES leaf and HV_X64_ENLIGHTENED_VMCS_RECOMMENDED feature bit are only exposed when Enlightened VMCS was previously enabled - on the corresponding vCPU (KVM_CAP_HYPERV_ENLIGHTENED_VMCS). + on the corresponding vCPU (KVM_CAP_HYPERV_ENLIGHTENED_VMCS2). - HV_STIMER_DIRECT_MODE_AVAILABLE bit is only exposed with in-kernel LAPIC. (presumes KVM_CREATE_IRQCHIP has already been called).
@@ -8193,6 +8193,46 @@ PV guests. The `KVM_PV_DUMP` command is available for the dump related UV data. Also the vcpu ioctl `KVM_S390_PV_CPU_COMMAND` is available and supports the `KVM_PV_DUMP_CPU` subcommand. +8.38 KVM_CAP_HYPERV_ENLIGHTENED_VMCS +------------------------------------ + +:Capability: KVM_CAP_HYPERV_ENLIGHTENED_VMCS +:Architectures: x86 +:Type: vcpu +:Parameters: arg[0] is a pointer to uint16_t where the supported Enlightened +VMCS version range will be stored by KVM. +:Returns: 0 on success, -EINVAL when Enlightened VMCS is already enabled, +-EFAULT when write to arg[0] fails. + +This capability enables Enlightened VMCS interface. Obsolete, use +KVM_CAP_HYPERV_ENLIGHTENED_VMCS2 instead. + +8.39 KVM_CAP_HYPERV_ENLIGHTENED_VMCS2 +------------------------------------- + +:Capability: KVM_CAP_HYPERV_ENLIGHTENED_VMCS2 +:Architectures: x86 +:Type: vcpu +:Parameters: arg[0] is the desired Enlightened VMCS revision (uint32_t). Special +value 'U32_MAX' indicates the latest supported revision. (Optional) arg[1] is a +pointer to 'uint16_t' where the supported Enlightened VMCS version range will be +stored by KVM. +:Returns: 0 on success, -ENOTTY on SVM, -EINVAL when Enlightened VMCS is already +enabled or the requested revision is not supported, -EFAULT when write to arg[1] +fails. + +This capability enables Hyper-V Enlightened VMCS interface as described in +Hyper-V Top Level Functional Specification (TLFS). Note: when the interface is +enabled, L1 guest doesn't necessarily have to use it, however, the exposed VMX +features will be limited to what the particular revision of the Enlightened VMCS +supports. + +Enlightened VMCS version range (optionally written to arg[1]) is encoded in the +following way: + ((uint8_t)HIGHEST_SUPPORTED_VERSION << 8) | (uint8_t)LOWEST_SUPPORTED_VERSION + +The interface is only available on VMX. Once set, changing the supported +Enlightened VMCS revision not supported. 9. Known KVM API problems =========================
arch/x86/include/asm/kvm_host.h +1 -1
@@ -1629,7 +1629,7 @@ struct kvm_x86_nested_ops {bool (*get_nested_state_pages)(struct kvm_vcpu *vcpu);int (*write_log_dirty)(struct kvm_vcpu *vcpu,gpa_t l2_gpa); -int (*enable_evmcs)(struct kvm_vcpu *vcpu, +int (*enable_evmcs)(struct kvm_vcpu *vcpu,u32 evmcs_revision,uint16_t *vmcs_version);uint16_t (*get_evmcs_version)(struct kvm_vcpu *vcpu); };
arch/x86/kvm/vmx/evmcs.c +14 -6
@@ -362,7 +362,7 @@ uint16_t nested_get_evmcs_version(struct kvm_vcpu *vcpu)* KVM_EVMCS_VERSION. */ if (kvm_cpu_cap_get (X86_FEATURE_VMX ) && - (!vcpu ||to_vmx (vcpu)->nested.enlightened_vmcs_enabled)) + (!vcpu ||to_vmx (vcpu)->nested.active_evmcs_revision))return (KVM_EVMCS_VERSION <<8 ) |1 ;return 0 ;
@@ -453,15 +453,23 @@ int nested_evmcs_check_controls(struct vmcs12 *vmcs12)return ret; } -int nested_enable_evmcs (struct kvm_vcpu *vcpu, -uint16_t *vmcs_version) +int nested_enable_evmcs (struct kvm_vcpu *vcpu,u32 evmcs_revision,uint16_t *evmcs_version) {struct vcpu_vmx *vmx =to_vmx (vcpu); - vmx->nested.enlightened_vmcs_enabled = true; +if (evmcs_revision >KVM_EVMCS_REVISION && evmcs_revision !=U32_MAX ) +return -EINVAL ; -if (vmcs_version) - *vmcs_version =nested_get_evmcs_version (vcpu); +/* Disabling or changing active eVMCS version is not supported */ +if (vmx->nested.active_evmcs_revision) +return -EINVAL ; + +if (evmcs_revision !=U32_MAX ) + vmx->nested.active_evmcs_revision = evmcs_revision; +else + vmx->nested.active_evmcs_revision =KVM_EVMCS_REVISION ; + + *evmcs_version =nested_get_evmcs_version (vcpu);return 0 ; }
arch/x86/kvm/vmx/evmcs.h +11 -2
@@ -18,8 +18,18 @@ DECLARE_STATIC_KEY_FALSE(enable_evmcs);#define current_evmcs ((struct hv_enlightened_vmcs *)this_cpu_read(current_vmcs)) +/* +* Maximum supported eVMCS version as described in TLFS, gets reported to the +* guest. +*/ #define KVM_EVMCS_VERSION 1 +/* +* Internal KVM eVMCS revision number, gets bumped when eVMCS needs to be +* updated but its version remain intact. +*/ +#define KVM_EVMCS_REVISION 1 +/* * Enlightened VMCSv1 doesn't support these: *
@@ -241,8 +251,7 @@ enum nested_evmptrld_status {bool nested_enlightened_vmentry (struct kvm_vcpu *vcpu,u64 *evmcs_gpa);uint16_t nested_get_evmcs_version (struct kvm_vcpu *vcpu); -int nested_enable_evmcs (struct kvm_vcpu *vcpu, -uint16_t *vmcs_version); +int nested_enable_evmcs (struct kvm_vcpu *vcpu,u32 evmcs_revision,uint16_t *vmcs_version);void nested_evmcs_filter_control_msr (u32 msr_index,u64 *pdata);int nested_evmcs_check_controls (struct vmcs12 *vmcs12);
arch/x86/kvm/vmx/nested.c +5 -5
@@ -2008,7 +2008,7 @@ static enum nested_evmptrld_status nested_vmx_handle_enlightened_vmptrld(bool evmcs_gpa_changed = false;u64 evmcs_gpa; -if (likely (!vmx->nested.enlightened_vmcs_enabled)) +if (likely (!vmx->nested.active_evmcs_revision))return EVMPTRLD_DISABLED ;if (!nested_enlightened_vmentry (vcpu, &evmcs_gpa)) {
@@ -2889,7 +2889,7 @@ static int nested_vmx_check_controls(struct kvm_vcpu *vcpu, nested_check_vm_entry_controls(vcpu, vmcs12))return -EINVAL ; -if (to_vmx (vcpu)->nested.enlightened_vmcs_enabled) +if (to_vmx (vcpu)->nested.active_evmcs_revision)return nested_evmcs_check_controls (vmcs12);return 0 ;
@@ -3171,7 +3171,7 @@ static bool nested_get_evmcs_page(struct kvm_vcpu *vcpu)* L2 was running), map it here to make sure vmcs12 changes are * properly reflected. */ -if (vmx->nested.enlightened_vmcs_enabled && +if (vmx->nested.active_evmcs_revision && vmx->nested.hv_evmcs_vmptr ==EVMPTR_MAP_PENDING ) {enum nested_evmptrld_status evmptrld_status =nested_vmx_handle_enlightened_vmptrld (vcpu, false);
@@ -5125,7 +5125,7 @@ static int handle_vmclear(struct kvm_vcpu *vcpu)* state. It is possible that the area will stay mapped as * vmx->nested.hv_evmcs but this shouldn't be a problem. */ -if (likely (!vmx->nested.enlightened_vmcs_enabled || +if (likely (!vmx->nested.active_evmcs_revision || !nested_enlightened_vmentry (vcpu, &evmcs_gpa))) {if (vmptr == vmx->nested.current_vmptr)nested_release_vmcs12 (vcpu);
@@ -6414,7 +6414,7 @@ static int vmx_set_nested_state(struct kvm_vcpu *vcpu,return -EINVAL ;if ((kvm_state->flags &KVM_STATE_NESTED_EVMCS ) && - (!nested_vmx_allowed (vcpu) || !vmx->nested.enlightened_vmcs_enabled)) + (!nested_vmx_allowed (vcpu) || !vmx->nested.active_evmcs_revision))return -EINVAL ;vmx_leave_nested (vcpu);
arch/x86/kvm/vmx/vmx.c +1 -1
@@ -1857,7 +1857,7 @@ static int vmx_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)* features out. */ if (!msr_info->host_initiated && - vmx->nested.enlightened_vmcs_enabled) + vmx->nested.active_evmcs_revision)nested_evmcs_filter_control_msr (msr_info->index, &msr_info->data);break ;
arch/x86/kvm/vmx/vmx.h +8 -7
@@ -185,13 +185,6 @@ struct nested_vmx {bool update_vmcs01_cpu_dirty_logging;bool update_vmcs01_apicv_status; -/* -* Enlightened VMCS has been enabled. It does not mean that L1 has to -* use it. However, VMX features available to L1 will be limited based -* on what the enlightened VMCS supports. -*/ -bool enlightened_vmcs_enabled; -/* L2 must run next, and mustn't decide to exit to L1. */ bool nested_run_pending;
@@ -239,6 +232,14 @@ struct nested_vmx {bool guest_mode; } smm; +/* +* Enlightened VMCS revision enabled (1..KVM_EVMCS_REVISION) on the vCPU. +* When, enabled, L1 doesn't necessarily have to use eVMCS interface, +* however, the exposed VMX features will be limited to what the particular +* revision of eVMCS supports. +*/ +u32 active_evmcs_revision; +gpa_t hv_evmcs_vmptr;struct kvm_host_map hv_evmcs_map;struct hv_enlightened_vmcs *hv_evmcs;
arch/x86/kvm/x86.c +14 -1
@@ -4376,6 +4376,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) r = kvm_x86_ops.enable_direct_tlbflush !=NULL ;break ;case KVM_CAP_HYPERV_ENLIGHTENED_VMCS : +case KVM_CAP_HYPERV_ENLIGHTENED_VMCS2 : r = kvm_x86_ops.nested_ops->enable_evmcs !=NULL ;break ;case KVM_CAP_SMALLER_MAXPHYADDR :
@@ -5307,7 +5308,8 @@ static int kvm_vcpu_ioctl_enable_cap(struct kvm_vcpu *vcpu,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); +/* Legacy: enable rev.1 */ + r = kvm_x86_ops.nested_ops->enable_evmcs (vcpu,1 , &vmcs_version);if (!r) { user_ptr = (void __user *)(uintptr_t )cap->args[0 ]; if (copy_to_user(user_ptr, &vmcs_version,
@@ -5315,6 +5317,17 @@ static int kvm_vcpu_ioctl_enable_cap(struct kvm_vcpu *vcpu, r = -EFAULT ; }return r; +case KVM_CAP_HYPERV_ENLIGHTENED_VMCS2 : +if (!kvm_x86_ops.nested_ops->enable_evmcs) +return -ENOTTY ; + r = kvm_x86_ops.nested_ops->enable_evmcs (vcpu, cap->args[0 ], &vmcs_version); +if (!r && cap->args[1 ]) { + user_ptr = (void __user *)(uintptr_t )cap->args[1 ]; +if (copy_to_user (user_ptr, &vmcs_version, +sizeof (vmcs_version))) + r = -EFAULT ; + } +return r;case KVM_CAP_HYPERV_DIRECT_TLBFLUSH :if (!kvm_x86_ops.enable_direct_tlbflush)return -ENOTTY ;
include/uapi/linux/kvm.h +2 -1
@@ -1109,7 +1109,7 @@ struct kvm_ppc_resize_hpt {#define KVM_CAP_PPC_NESTED_HV 160#define KVM_CAP_HYPERV_SEND_IPI 161#define KVM_CAP_COALESCED_PIO 162 -#define KVM_CAP_HYPERV_ENLIGHTENED_VMCS 163 +#define KVM_CAP_HYPERV_ENLIGHTENED_VMCS 163/* Obsolete */ #define KVM_CAP_EXCEPTION_PAYLOAD 164#define KVM_CAP_ARM_VM_IPA_SIZE 165#define KVM_CAP_MANUAL_DIRTY_LOG_PROTECT 166/* Obsolete */
@@ -1166,6 +1166,7 @@ struct kvm_ppc_resize_hpt {#define KVM_CAP_S390_PROTECTED_DUMP 217#define KVM_CAP_X86_TRIPLE_FAULT_EVENT 218#define KVM_CAP_X86_NOTIFY_VMEXIT 219 +#define KVM_CAP_HYPERV_ENLIGHTENED_VMCS2 220#ifdef KVM_CAP_IRQ_ROUTING
Signature · 1 line
2.35.3
Vitaly Kuznetsov
maintainerPATCH 7/11 KVM: selftests: Switch to KVM_CAP_HYPERV_ENLIGHTENED_VMCS2
In reply to Vitaly KuznetsovKVM_CAP_HYPERV_ENLIGHTENED_VMCS was obsoleted by KVM_CAP_HYPERV_ENLIGHTENED_VMCS2, use it in selftests.
--- tools/testing/selftests/kvm/include/kvm_util_base.h | 8 ++++++++ tools/testing/selftests/kvm/include/x86_64/evmcs.h | 1 + tools/testing/selftests/kvm/lib/x86_64/vmx.c | 5 +++-- tools/testing/selftests/kvm/x86_64/evmcs_test.c | 2 +- tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c | 2 +- .../selftests/kvm/x86_64/vmx_set_nested_state_test.c | 2 +- 6 files changed, 15 insertions(+), 5 deletions(-)
tools/testing/selftests/kvm/include/kvm_util_base.h +8 -0
@@ -348,6 +348,14 @@ static inline void vcpu_enable_cap(struct kvm_vcpu *vcpu, uint32_t cap,vcpu_ioctl (vcpu,KVM_ENABLE_CAP , &enable_cap); } +static inline void vcpu_enable_cap2 (struct kvm_vcpu *vcpu,uint32_t cap, +uint64_t arg0,uint64_t arg1) +{ +struct kvm_enable_cap enable_cap = { .cap = cap, .args = { arg0, arg1 } }; + +vcpu_ioctl (vcpu,KVM_ENABLE_CAP , &enable_cap); +} +static inline void vcpu_guest_debug_set (struct kvm_vcpu *vcpu,struct kvm_guest_debug *debug) {
tools/testing/selftests/kvm/include/x86_64/evmcs.h +1 -0
@@ -17,6 +17,7 @@#define u64 uint64_t#define EVMCS_VERSION 1 +#define EVMCS_REVISION 1extern bool enable_evmcs;
tools/testing/selftests/kvm/lib/x86_64/vmx.c +3 -2
@@ -42,12 +42,13 @@ struct eptPageTablePointer { uint64_t address:40; uint64_t reserved_63_52:12; }; +int vcpu_enable_evmcs (struct kvm_vcpu *vcpu) {uint16_t evmcs_ver; -vcpu_enable_cap (vcpu,KVM_CAP_HYPERV_ENLIGHTENED_VMCS , - (unsigned long )&evmcs_ver); +vcpu_enable_cap2 (vcpu,KVM_CAP_HYPERV_ENLIGHTENED_VMCS2 , +EVMCS_REVISION , (unsigned long )&evmcs_ver);/* KVM should return supported EVMCS version range */ TEST_ASSERT(((evmcs_ver >> 8) >= (evmcs_ver & 0xff)) &&
tools/testing/selftests/kvm/x86_64/evmcs_test.c +1 -1
@@ -210,7 +210,7 @@ int main(int argc, char *argv[])TEST_REQUIRE (nested_vmx_supported ());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_ENLIGHTENED_VMCS2 ));vcpu_set_hv_cpuid (vcpu);vcpu_enable_evmcs (vcpu);
tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c +1 -1
@@ -149,7 +149,7 @@ int main(int argc, char *argv[])free (hv_cpuid_entries);if (!nested_vmx_supported () || - !kvm_has_cap (KVM_CAP_HYPERV_ENLIGHTENED_VMCS )) { + !kvm_has_cap (KVM_CAP_HYPERV_ENLIGHTENED_VMCS2 )) {print_skip ("Enlightened VMCS is unsupported" ); goto do_sys; }
tools/testing/selftests/kvm/x86_64/vmx_set_nested_state_test.c +1 -1
@@ -265,7 +265,7 @@ int main(int argc, char *argv[])struct kvm_nested_state state;struct kvm_vcpu *vcpu; - have_evmcs =kvm_check_cap (KVM_CAP_HYPERV_ENLIGHTENED_VMCS ); + have_evmcs =kvm_check_cap (KVM_CAP_HYPERV_ENLIGHTENED_VMCS2 );TEST_REQUIRE (kvm_has_cap (KVM_CAP_NESTED_STATE ));
Signature · 1 line
2.35.3
Vitaly Kuznetsov
maintainerPATCH 8/11 KVM: VMX: Support TSC scaling with enlightened VMCS
In reply to Vitaly KuznetsovEnlightened VMCS v1 now includes the required field for TSC scaling feature so SECONDARY_EXEC_TSC_SCALING doesn't need to be filtered out, both for KVM on Hyper-V and Hyper-V on KVM cases.
Note: Hyper-V on KVM case requires bumping KVM_EVMCS_REVISION revision so VMMs can specify if SECONDARY_EXEC_TSC_SCALING needs to be filtered out or not, this is required to support live migration.
While on it, update the comment why VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL/ VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL are kept filtered out and add missing spaces in trace_kvm_nested_vmenter_failed() strings making the output ugly.
--- arch/x86/kvm/vmx/evmcs.c | 70 +++++++++++++++++++++++++++++---------- arch/x86/kvm/vmx/evmcs.h | 17 ++++------ arch/x86/kvm/vmx/nested.c | 2 +- arch/x86/kvm/vmx/vmx.c | 2 +- 4 files changed, 62 insertions(+), 29 deletions(-)
arch/x86/kvm/vmx/evmcs.c +53 -17
@@ -368,7 +368,42 @@ uint16_t nested_get_evmcs_version(struct kvm_vcpu *vcpu)return 0 ; } -void nested_evmcs_filter_control_msr (u32 msr_index,u64 *pdata) +enum evmcs_unsupported_ctrl_type { +EVMCS_EXIT_CTLS , +EVMCS_ENTRY_CTLS , +EVMCS_2NDEXEC , +EVMCS_PINCTRL , +EVMCS_VMFUNC , +}; + +static u32 evmcs_get_unsupported_ctls (struct kvm_vcpu *vcpu, +enum evmcs_unsupported_ctrl_type ctrl_type) +{ +u32 evmcs_rev =to_vmx (vcpu)->nested.active_evmcs_revision; + +if (!evmcs_rev) +return 0 ; + +switch (ctrl_type) { +case EVMCS_EXIT_CTLS : +return EVMCS1_UNSUPPORTED_VMEXIT_CTRL ; +case EVMCS_ENTRY_CTLS : +return EVMCS1_UNSUPPORTED_VMENTRY_CTRL ; +case EVMCS_2NDEXEC : +if (evmcs_rev ==1 ) +return EVMCS1_UNSUPPORTED_2NDEXEC |SECONDARY_EXEC_TSC_SCALING ; +else +return EVMCS1_UNSUPPORTED_2NDEXEC ; +case EVMCS_PINCTRL : +return EVMCS1_UNSUPPORTED_PINCTRL ; +case EVMCS_VMFUNC : +return EVMCS1_UNSUPPORTED_VMFUNC ; + } + +return 0 ; +} + +void nested_evmcs_filter_control_msr (struct kvm_vcpu *vcpu,u32 msr_index,u64 *pdata) {u32 ctl_low = (u32)*pdata;u32 ctl_high = (u32)(*pdata >>32 );
@@ -380,72 +415,73 @@ void nested_evmcs_filter_control_msr(u32 msr_index, u64 *pdata)switch (msr_index) {case MSR_IA32_VMX_EXIT_CTLS :case MSR_IA32_VMX_TRUE_EXIT_CTLS : - ctl_high &= ~EVMCS1_UNSUPPORTED_VMEXIT_CTRL ; + ctl_high &= ~evmcs_get_unsupported_ctls (vcpu,EVMCS_EXIT_CTLS );break ;case MSR_IA32_VMX_ENTRY_CTLS :case MSR_IA32_VMX_TRUE_ENTRY_CTLS : - ctl_high &= ~EVMCS1_UNSUPPORTED_VMENTRY_CTRL ; + ctl_high &= ~evmcs_get_unsupported_ctls (vcpu,EVMCS_ENTRY_CTLS );break ;case MSR_IA32_VMX_PROCBASED_CTLS2 : - ctl_high &= ~EVMCS1_UNSUPPORTED_2NDEXEC ; + ctl_high &= ~evmcs_get_unsupported_ctls (vcpu,EVMCS_2NDEXEC );break ;case MSR_IA32_VMX_TRUE_PINBASED_CTLS :case MSR_IA32_VMX_PINBASED_CTLS : - ctl_high &= ~EVMCS1_UNSUPPORTED_PINCTRL ; + ctl_high &= ~evmcs_get_unsupported_ctls (vcpu,EVMCS_PINCTRL );break ;case MSR_IA32_VMX_VMFUNC : - ctl_low &= ~EVMCS1_UNSUPPORTED_VMFUNC ; + ctl_low &= ~evmcs_get_unsupported_ctls (vcpu,EVMCS_VMFUNC );break ; } *pdata = ctl_low | ((u64 )ctl_high <<32 ); } -int nested_evmcs_check_controls (struct vmcs12 *vmcs12) +int nested_evmcs_check_controls (struct kvm_vcpu *vcpu,struct vmcs12 *vmcs12) {int ret =0 ;u32 unsupp_ctl; unsupp_ctl = vmcs12->pin_based_vm_exec_control & -EVMCS1_UNSUPPORTED_PINCTRL ; +evmcs_get_unsupported_ctls (vcpu,EVMCS_PINCTRL );if (unsupp_ctl) {trace_kvm_nested_vmenter_failed ( -"eVMCS: unsupported pin-based VM-execution controls" , +"eVMCS: unsupported pin-based VM-execution controls: " , unsupp_ctl); ret = -EINVAL ; } unsupp_ctl = vmcs12->secondary_vm_exec_control & -EVMCS1_UNSUPPORTED_2NDEXEC ; +evmcs_get_unsupported_ctls (vcpu,EVMCS_2NDEXEC );if (unsupp_ctl) {trace_kvm_nested_vmenter_failed ( -"eVMCS: unsupported secondary VM-execution controls" , +"eVMCS: unsupported secondary VM-execution controls: " , unsupp_ctl); ret = -EINVAL ; } unsupp_ctl = vmcs12->vm_exit_controls & -EVMCS1_UNSUPPORTED_VMEXIT_CTRL ; +evmcs_get_unsupported_ctls (vcpu,EVMCS_EXIT_CTLS );if (unsupp_ctl) {trace_kvm_nested_vmenter_failed ( -"eVMCS: unsupported VM-exit controls" , +"eVMCS: unsupported VM-exit controls: " , unsupp_ctl); ret = -EINVAL ; } unsupp_ctl = vmcs12->vm_entry_controls & -EVMCS1_UNSUPPORTED_VMENTRY_CTRL ; +evmcs_get_unsupported_ctls (vcpu,EVMCS_ENTRY_CTLS );if (unsupp_ctl) {trace_kvm_nested_vmenter_failed ( -"eVMCS: unsupported VM-entry controls" , +"eVMCS: unsupported VM-entry controls: " , unsupp_ctl); ret = -EINVAL ; } - unsupp_ctl = vmcs12->vm_function_control &EVMCS1_UNSUPPORTED_VMFUNC ; + unsupp_ctl = vmcs12->vm_function_control & +evmcs_get_unsupported_ctls (vcpu,EVMCS_VMFUNC );if (unsupp_ctl) {trace_kvm_nested_vmenter_failed ( -"eVMCS: unsupported VM-function controls" , +"eVMCS: unsupported VM-function controls: " , unsupp_ctl); ret = -EINVAL ; }
arch/x86/kvm/vmx/evmcs.h +7 -10
@@ -28,7 +28,7 @@ DECLARE_STATIC_KEY_FALSE(enable_evmcs);* Internal KVM eVMCS revision number, gets bumped when eVMCS needs to be * updated but its version remain intact. */ -#define KVM_EVMCS_REVISION 1 +#define KVM_EVMCS_REVISION 2/* * Enlightened VMCSv1 doesn't support these:
@@ -47,16 +47,14 @@ DECLARE_STATIC_KEY_FALSE(enable_evmcs);* EPTP_LIST_ADDRESS = 0x00002024, * VMREAD_BITMAP = 0x00002026, * VMWRITE_BITMAP = 0x00002028, -* -* TSC_MULTIPLIER = 0x00002032, * PLE_GAP = 0x00004020, * PLE_WINDOW = 0x00004022, * VMX_PREEMPTION_TIMER_VALUE = 0x0000482E, -* GUEST_IA32_PERF_GLOBAL_CTRL = 0x00002808, -* HOST_IA32_PERF_GLOBAL_CTRL = 0x00002c04, * -* Currently unsupported in KVM: -* GUEST_IA32_RTIT_CTL = 0x00002814, +* While GUEST_IA32_PERF_GLOBAL_CTRL and HOST_IA32_PERF_GLOBAL_CTRL +* are present in eVMCSv1, Windows 11 still has issues booting when +* VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL/VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL +* are exposed to it, keep them filtered out. */ #define EVMCS1_UNSUPPORTED_PINCTRL (PIN_BASED_POSTED_INTR | \ PIN_BASED_VMX_PREEMPTION_TIMER)
@@ -68,7 +66,6 @@ DECLARE_STATIC_KEY_FALSE(enable_evmcs); SECONDARY_EXEC_ENABLE_PML | \ SECONDARY_EXEC_ENABLE_VMFUNC | \ SECONDARY_EXEC_SHADOW_VMCS | \ - SECONDARY_EXEC_TSC_SCALING | \ SECONDARY_EXEC_PAUSE_LOOP_EXITING)#define EVMCS1_UNSUPPORTED_VMEXIT_CTRL \ (VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL | \
@@ -252,7 +249,7 @@ enum nested_evmptrld_status {bool nested_enlightened_vmentry (struct kvm_vcpu *vcpu,u64 *evmcs_gpa);uint16_t nested_get_evmcs_version (struct kvm_vcpu *vcpu);int nested_enable_evmcs (struct kvm_vcpu *vcpu,u32 evmcs_revision,uint16_t *vmcs_version); -void nested_evmcs_filter_control_msr (u32 msr_index,u64 *pdata); -int nested_evmcs_check_controls (struct vmcs12 *vmcs12); +void nested_evmcs_filter_control_msr (struct kvm_vcpu *vcpu,u32 msr_index,u64 *pdata); +int nested_evmcs_check_controls (struct kvm_vcpu *vcpu,struct vmcs12 *vmcs12);#endif /* __KVM_X86_VMX_EVMCS_H */
arch/x86/kvm/vmx/nested.c +1 -1
@@ -2890,7 +2890,7 @@ static int nested_vmx_check_controls(struct kvm_vcpu *vcpu,return -EINVAL ;if (to_vmx (vcpu)->nested.active_evmcs_revision) -return nested_evmcs_check_controls (vmcs12); +return nested_evmcs_check_controls (vcpu, vmcs12);return 0 ; }
arch/x86/kvm/vmx/vmx.c +1 -1
@@ -1858,7 +1858,7 @@ static int vmx_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)*/ if (!msr_info->host_initiated && vmx->nested.active_evmcs_revision) -nested_evmcs_filter_control_msr (msr_info->index, +nested_evmcs_filter_control_msr (vcpu, msr_info->index, &msr_info->data);break ;case MSR_IA32_RTIT_CTL :
Signature · 1 line
2.35.3
Vitaly Kuznetsov
maintainerPATCH 9/11 KVM: selftests: Add ENCLS_EXITING_BITMAP{,HIGH} VMCS fields
In reply to Vitaly KuznetsovThe updated Enlightened VMCS definition has 'encls_exiting_bitmap' field which needs mapping to VMCS, add the missing encoding.
--- tools/testing/selftests/kvm/include/x86_64/vmx.h | 2 ++ 1 file changed, 2 insertions(+)
tools/testing/selftests/kvm/include/x86_64/vmx.h +2 -0
@@ -208,6 +208,8 @@ enum vmcs_field {VMWRITE_BITMAP_HIGH =0x00002029 ,XSS_EXIT_BITMAP =0x0000202C ,XSS_EXIT_BITMAP_HIGH =0x0000202D , +ENCLS_EXITING_BITMAP =0x0000202E , +ENCLS_EXITING_BITMAP_HIGH =0x0000202F ,TSC_MULTIPLIER =0x00002032 ,TSC_MULTIPLIER_HIGH =0x00002033 , GUEST_PHYSICAL_ADDRESS = 0x00002400,
Signature · 1 line
2.35.3
Vitaly Kuznetsov
maintainerPATCH 10/11 KVM: selftests: Switch to updated eVMCSv1 definition
In reply to Vitaly KuznetsovUpdate Enlightened VMCS definition in selftests from KVM and switch to using EVMCS_REVISION 2 which supports these new fields.
--- .../selftests/kvm/include/x86_64/evmcs.h | 47 +++++++++++++++++-- 1 file changed, 43 insertions(+), 4 deletions(-)
tools/testing/selftests/kvm/include/x86_64/evmcs.h +43 -4
@@ -17,7 +17,7 @@#define u64 uint64_t#define EVMCS_VERSION 1 -#define EVMCS_REVISION 1 +#define EVMCS_REVISION 2extern bool enable_evmcs;
@@ -204,14 +204,25 @@ struct hv_enlightened_vmcs { u32 reserved:30; } hv_enlightenments_control;u32 hv_vp_id; - +u32 padding32_2;u64 hv_vm_id;u64 partition_assist_page;u64 padding64_4[4 ];u64 guest_bndcfgs; -u64 padding64_5[7 ]; +u64 guest_ia32_perf_global_ctrl; +u64 guest_ia32_s_cet; +u64 guest_ssp; +u64 guest_ia32_int_ssp_table_addr; +u64 guest_ia32_lbr_ctl; +u64 padding64_5[2 ];u64 xss_exit_bitmap; -u64 padding64_6[7 ]; +u64 host_ia32_perf_global_ctrl; +u64 encls_exiting_bitmap; +u64 tsc_multiplier; +u64 host_ia32_s_cet; +u64 host_ssp; +u64 host_ia32_int_ssp_table_addr; +u64 padding64_6; };#define HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE 0
@@ -657,6 +668,18 @@ static inline int evmcs_vmread(uint64_t encoding, uint64_t *value)case VIRTUAL_PROCESSOR_ID : *value = current_evmcs->virtual_processor_id;break ; +case HOST_IA32_PERF_GLOBAL_CTRL : + *value = current_evmcs->host_ia32_perf_global_ctrl; +break ; +case GUEST_IA32_PERF_GLOBAL_CTRL : + *value = current_evmcs->guest_ia32_perf_global_ctrl; +break ; +case ENCLS_EXITING_BITMAP : + *value = current_evmcs->encls_exiting_bitmap; +break ; +case TSC_MULTIPLIER : + *value = current_evmcs->tsc_multiplier; +break ;default :return 1 ; }
@@ -1170,6 +1193,22 @@ static inline int evmcs_vmwrite(uint64_t encoding, uint64_t value) current_evmcs->virtual_processor_id = value; current_evmcs->hv_clean_fields &= ~HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_XLAT ;break ; +case HOST_IA32_PERF_GLOBAL_CTRL : + current_evmcs->host_ia32_perf_global_ctrl = value; + current_evmcs->hv_clean_fields &= ~HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1 ; +break ; +case GUEST_IA32_PERF_GLOBAL_CTRL : + current_evmcs->guest_ia32_perf_global_ctrl = value; + current_evmcs->hv_clean_fields &= ~HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1 ; +break ; +case ENCLS_EXITING_BITMAP : + current_evmcs->encls_exiting_bitmap = value; + current_evmcs->hv_clean_fields &= ~HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_GRP2 ; +break ; +case TSC_MULTIPLIER : + current_evmcs->tsc_multiplier = value; + current_evmcs->hv_clean_fields &= ~HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_GRP2 ; +break ;default :return 1 ; }
Signature · 1 line
2.35.3
Vitaly Kuznetsov
maintainerPATCH 11/11 KVM: selftests: Enable TSC scaling in evmcs selftest
In reply to Vitaly KuznetsovThe updated Enlightened VMCS v1 definition enables TSC scaling, test that SECONDARY_EXEC_TSC_SCALING can now be enabled.
--- .../testing/selftests/kvm/x86_64/evmcs_test.c | 31 +++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-)
tools/testing/selftests/kvm/x86_64/evmcs_test.c +29 -2
@@ -18,6 +18,9 @@#include "vmx.h" +/* Test flags */ +#define HOST_HAS_TSC_SCALING BIT(0) +static int ud_count;static void guest_ud_handler (struct ex_regs *regs)
@@ -64,11 +67,14 @@ void l2_guest_code(void)vmcall ();rdmsr_gs_base ();/* intercepted */ +/* TSC scaling */ +vmcall (); +/* Done, exit to L1 and never come back. */ vmcall (); } -void guest_code (struct vmx_pages *vmx_pages) +void guest_code (struct vmx_pages *vmx_pages,u64 test_flags) {#define L2_GUEST_STACK_SIZE 64unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE ];
@@ -150,6 +156,18 @@ void guest_code(struct vmx_pages *vmx_pages)GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL );GUEST_SYNC (11 ); +if (test_flags &HOST_HAS_TSC_SCALING ) { +GUEST_ASSERT ((rdmsr (MSR_IA32_VMX_PROCBASED_CTLS2 ) >>32 ) & +SECONDARY_EXEC_TSC_SCALING ); +/* Try enabling TSC scaling */ +vmwrite (SECONDARY_VM_EXEC_CONTROL ,vmreadz (SECONDARY_VM_EXEC_CONTROL ) | +SECONDARY_EXEC_TSC_SCALING ); +vmwrite (TSC_MULTIPLIER ,1 ); + } +GUEST_ASSERT (!vmresume ()); +GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL ); +GUEST_SYNC (12 ); +/* Try enlightened vmptrld with an incorrect GPA */ evmcs_vmptrld (0xdeadbeef , vmx_pages->enlightened_vmcs);GUEST_ASSERT (vmlaunch ());
@@ -204,6 +222,7 @@ int main(int argc, char *argv[])struct kvm_vm *vm;struct kvm_run *run;struct ucall uc; +u64 test_flags =0 ;int stage; vm =vm_create_with_one_vcpu (&vcpu, guest_code);
@@ -212,11 +231,19 @@ int main(int argc, char *argv[])TEST_REQUIRE (kvm_has_cap (KVM_CAP_NESTED_STATE ));TEST_REQUIRE (kvm_has_cap (KVM_CAP_HYPERV_ENLIGHTENED_VMCS2 )); +if ((kvm_get_feature_msr (MSR_IA32_VMX_PROCBASED_CTLS2 ) >>32 ) & +SECONDARY_EXEC_TSC_SCALING ) { + test_flags |=HOST_HAS_TSC_SCALING ; +pr_info ("TSC scaling is supported, adding to test\n" ); + }else { +pr_info ("TSC scaling is not supported\n" ); + } +vcpu_set_hv_cpuid (vcpu);vcpu_enable_evmcs (vcpu);vcpu_alloc_vmx (vm, &vmx_pages_gva); -vcpu_args_set (vcpu,1 , vmx_pages_gva); +vcpu_args_set (vcpu,2 , vmx_pages_gva, test_flags);vm_init_descriptor_tables (vm);vcpu_init_descriptor_tables (vcpu);
Signature · 1 line
2.35.3
Vitaly Kuznetsov
maintainerPATCH 1/1 i386: Support Enlightened VMCS revisions
In reply to Vitaly Kuznetsov--- docs/system/i386/hyperv.rst | 4 ++++ linux-headers/linux/kvm.h | 3 ++- target/i386/cpu.c | 1 + target/i386/cpu.h | 1 + target/i386/kvm/kvm.c | 17 ++++++++++++++--- 5 files changed, 22 insertions(+), 4 deletions(-)
docs/system/i386/hyperv.rst +4 -0
@@ -278,6 +278,10 @@ Supplementary features feature alters this behavior and only allows the guest to use exposed Hyper-V enlightenments. +``hv-evmcs-rev={revision}`` + When Enlightened VMCS definitinon changes, KVM increases the supported + 'revision' to make live migration to older hosts possible. Note: + ``hv-passthrough`` mode enables the latest supported revision. Useful links ------------
linux-headers/linux/kvm.h +2 -1
@@ -1097,7 +1097,7 @@ struct kvm_ppc_resize_hpt {#define KVM_CAP_PPC_NESTED_HV 160#define KVM_CAP_HYPERV_SEND_IPI 161#define KVM_CAP_COALESCED_PIO 162 -#define KVM_CAP_HYPERV_ENLIGHTENED_VMCS 163 +#define KVM_CAP_HYPERV_ENLIGHTENED_VMCS 163/* Obsolete */ #define KVM_CAP_EXCEPTION_PAYLOAD 164#define KVM_CAP_ARM_VM_IPA_SIZE 165#define KVM_CAP_MANUAL_DIRTY_LOG_PROTECT 166/* Obsolete */
@@ -1150,6 +1150,7 @@ struct kvm_ppc_resize_hpt {#define KVM_CAP_DISABLE_QUIRKS2 213/* #define KVM_CAP_VM_TSC_CONTROL 214 */ #define KVM_CAP_SYSTEM_EVENT_DATA 215 +#define KVM_CAP_HYPERV_ENLIGHTENED_VMCS2 220#ifdef KVM_CAP_IRQ_ROUTING
target/i386/cpu.c +1 -0
@@ -6994,6 +6994,7 @@ static Property x86_cpu_properties[] = { HYPERV_FEAT_SYNDBG, 0),DEFINE_PROP_BOOL ("hv-passthrough" ,X86CPU , hyperv_passthrough, false),DEFINE_PROP_BOOL ("hv-enforce-cpuid" ,X86CPU , hyperv_enforce_cpuid, false), +DEFINE_PROP_UINT32 ("hv-evmcs-rev" ,X86CPU , hyperv_evmcs_rev,1 ),/* WS2008R2 identify by default */ DEFINE_PROP_UINT32("hv-version-id-build", X86CPU, hyperv_ver_id_build,
target/i386/cpu.h +1 -0
@@ -1805,6 +1805,7 @@ struct ArchCPU {uint64_t hyperv_features;bool hyperv_passthrough;OnOffAuto hyperv_no_nonarch_cs; +uint32_t hyperv_evmcs_rev;uint32_t hyperv_vendor_id[3 ];uint32_t hyperv_interface_id[4 ];uint32_t hyperv_limits[3 ];
target/i386/kvm/kvm.c +14 -3
@@ -1635,9 +1635,20 @@ static int hyperv_init_vcpu(X86CPU *cpu)if (hyperv_feat_enabled (cpu,HYPERV_FEAT_EVMCS )) {uint16_t evmcs_version =DEFAULT_EVMCS_VERSION ;uint16_t supported_evmcs_version; - - ret =kvm_vcpu_enable_cap (cs,KVM_CAP_HYPERV_ENLIGHTENED_VMCS ,0 , - (uintptr_t )&supported_evmcs_version); +uint32_t evmcs_revision = + cpu->hyperv_passthrough ?UINT32_MAX : cpu->hyperv_evmcs_rev; + +if (kvm_check_extension (cs->kvm_state, +KVM_CAP_HYPERV_ENLIGHTENED_VMCS2 )) { + ret =kvm_vcpu_enable_cap (cs,KVM_CAP_HYPERV_ENLIGHTENED_VMCS2 ,0 , + evmcs_revision, + (uintptr_t )&supported_evmcs_version); + }else if (cpu->hyperv_evmcs_rev ==1 ) { + ret =kvm_vcpu_enable_cap (cs,KVM_CAP_HYPERV_ENLIGHTENED_VMCS ,0 , + (uintptr_t )&supported_evmcs_version); + }else { + ret = -ENOTSUP ; + }/* * KVM is required to support EVMCS ver.1. as that's what 'hv-evmcs'
Signature · 1 line
2.35.3