KVM: VMX: Rename "vmx/evmcs.{ch}" to "vmx/hyperv.{ch}"
authorVitaly Kuznetsov <vkuznets@redhat.com>
Tue, 1 Nov 2022 14:53:44 +0000 (15:53 +0100)
committerPaolo Bonzini <pbonzini@redhat.com>
Fri, 18 Nov 2022 17:59:01 +0000 (12:59 -0500)
To conform with SVM, rename VMX specific Hyper-V files from "evmcs.{ch}"
to "hyperv.{ch}". While Enlightened VMCS is a lion's share of these
files, some stuff (e.g. enlightened MSR bitmap, the upcoming Hyper-V
L2 TLB flush, ...) goes beyond that.

Reviewed-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20221101145426.251680-7-vkuznets@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
arch/x86/kvm/Makefile
arch/x86/kvm/vmx/evmcs.c [deleted file]
arch/x86/kvm/vmx/evmcs.h [deleted file]
arch/x86/kvm/vmx/hyperv.c [new file with mode: 0644]
arch/x86/kvm/vmx/hyperv.h [new file with mode: 0644]
arch/x86/kvm/vmx/nested.c
arch/x86/kvm/vmx/vmx.c
arch/x86/kvm/vmx/vmx_ops.h

index b8a494b6a5ec9b77254b62ed435f8cd563921c6b..4cf407563feeaa02f86142483be89f8669d16ff9 100644 (file)
@@ -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/evmcs.o vmx/nested.o vmx/posted_intr.o
+                          vmx/hyperv.o vmx/nested.o vmx/posted_intr.o
 kvm-intel-$(CONFIG_X86_SGX_KVM)        += vmx/sgx.o
 
 kvm-amd-y              += svm/svm.o svm/vmenter.o svm/pmu.o svm/nested.o svm/avic.o svm/sev.o
diff --git a/arch/x86/kvm/vmx/evmcs.c b/arch/x86/kvm/vmx/evmcs.c
deleted file mode 100644 (file)
index d8b23c9..0000000
+++ /dev/null
@@ -1,509 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-
-#include <linux/errno.h>
-#include <linux/smp.h>
-
-#include "../hyperv.h"
-#include "../cpuid.h"
-#include "evmcs.h"
-#include "vmcs.h"
-#include "vmx.h"
-#include "trace.h"
-
-#define CC KVM_NESTED_VMENTER_CONSISTENCY_CHECK
-
-DEFINE_STATIC_KEY_FALSE(enable_evmcs);
-
-#define EVMCS1_OFFSET(x) offsetof(struct hv_enlightened_vmcs, x)
-#define EVMCS1_FIELD(number, name, clean_field)[ROL16(number, 6)] = \
-               {EVMCS1_OFFSET(name), clean_field}
-
-const struct evmcs_field vmcs_field_to_evmcs_1[] = {
-       /* 64 bit rw */
-       EVMCS1_FIELD(GUEST_RIP, guest_rip,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE),
-       EVMCS1_FIELD(GUEST_RSP, guest_rsp,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_BASIC),
-       EVMCS1_FIELD(GUEST_RFLAGS, guest_rflags,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_BASIC),
-       EVMCS1_FIELD(HOST_IA32_PAT, host_ia32_pat,
-                    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,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
-       EVMCS1_FIELD(HOST_CR4, host_cr4,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
-       EVMCS1_FIELD(HOST_IA32_SYSENTER_ESP, host_ia32_sysenter_esp,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
-       EVMCS1_FIELD(HOST_IA32_SYSENTER_EIP, host_ia32_sysenter_eip,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
-       EVMCS1_FIELD(HOST_RIP, host_rip,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
-       EVMCS1_FIELD(IO_BITMAP_A, io_bitmap_a,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_IO_BITMAP),
-       EVMCS1_FIELD(IO_BITMAP_B, io_bitmap_b,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_IO_BITMAP),
-       EVMCS1_FIELD(MSR_BITMAP, msr_bitmap,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_MSR_BITMAP),
-       EVMCS1_FIELD(GUEST_ES_BASE, guest_es_base,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
-       EVMCS1_FIELD(GUEST_CS_BASE, guest_cs_base,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
-       EVMCS1_FIELD(GUEST_SS_BASE, guest_ss_base,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
-       EVMCS1_FIELD(GUEST_DS_BASE, guest_ds_base,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
-       EVMCS1_FIELD(GUEST_FS_BASE, guest_fs_base,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
-       EVMCS1_FIELD(GUEST_GS_BASE, guest_gs_base,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
-       EVMCS1_FIELD(GUEST_LDTR_BASE, guest_ldtr_base,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
-       EVMCS1_FIELD(GUEST_TR_BASE, guest_tr_base,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
-       EVMCS1_FIELD(GUEST_GDTR_BASE, guest_gdtr_base,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
-       EVMCS1_FIELD(GUEST_IDTR_BASE, guest_idtr_base,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
-       EVMCS1_FIELD(TSC_OFFSET, tsc_offset,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_GRP2),
-       EVMCS1_FIELD(VIRTUAL_APIC_PAGE_ADDR, virtual_apic_page_addr,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_GRP2),
-       EVMCS1_FIELD(VMCS_LINK_POINTER, vmcs_link_pointer,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1),
-       EVMCS1_FIELD(GUEST_IA32_DEBUGCTL, guest_ia32_debugctl,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1),
-       EVMCS1_FIELD(GUEST_IA32_PAT, guest_ia32_pat,
-                    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,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1),
-       EVMCS1_FIELD(GUEST_PDPTR2, guest_pdptr2,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1),
-       EVMCS1_FIELD(GUEST_PDPTR3, guest_pdptr3,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1),
-       EVMCS1_FIELD(GUEST_PENDING_DBG_EXCEPTIONS, guest_pending_dbg_exceptions,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1),
-       EVMCS1_FIELD(GUEST_SYSENTER_ESP, guest_sysenter_esp,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1),
-       EVMCS1_FIELD(GUEST_SYSENTER_EIP, guest_sysenter_eip,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1),
-       EVMCS1_FIELD(CR0_GUEST_HOST_MASK, cr0_guest_host_mask,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_CRDR),
-       EVMCS1_FIELD(CR4_GUEST_HOST_MASK, cr4_guest_host_mask,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_CRDR),
-       EVMCS1_FIELD(CR0_READ_SHADOW, cr0_read_shadow,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_CRDR),
-       EVMCS1_FIELD(CR4_READ_SHADOW, cr4_read_shadow,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_CRDR),
-       EVMCS1_FIELD(GUEST_CR0, guest_cr0,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_CRDR),
-       EVMCS1_FIELD(GUEST_CR3, guest_cr3,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_CRDR),
-       EVMCS1_FIELD(GUEST_CR4, guest_cr4,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_CRDR),
-       EVMCS1_FIELD(GUEST_DR7, guest_dr7,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_CRDR),
-       EVMCS1_FIELD(HOST_FS_BASE, host_fs_base,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_POINTER),
-       EVMCS1_FIELD(HOST_GS_BASE, host_gs_base,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_POINTER),
-       EVMCS1_FIELD(HOST_TR_BASE, host_tr_base,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_POINTER),
-       EVMCS1_FIELD(HOST_GDTR_BASE, host_gdtr_base,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_POINTER),
-       EVMCS1_FIELD(HOST_IDTR_BASE, host_idtr_base,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_POINTER),
-       EVMCS1_FIELD(HOST_RSP, host_rsp,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_POINTER),
-       EVMCS1_FIELD(EPT_POINTER, ept_pointer,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_XLAT),
-       EVMCS1_FIELD(GUEST_BNDCFGS, guest_bndcfgs,
-                    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,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE),
-       EVMCS1_FIELD(EXIT_QUALIFICATION, exit_qualification,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE),
-       /*
-        * Not defined in KVM:
-        *
-        * EVMCS1_FIELD(0x00006402, exit_io_instruction_ecx,
-        *              HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE);
-        * EVMCS1_FIELD(0x00006404, exit_io_instruction_esi,
-        *              HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE);
-        * EVMCS1_FIELD(0x00006406, exit_io_instruction_esi,
-        *              HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE);
-        * EVMCS1_FIELD(0x00006408, exit_io_instruction_eip,
-        *              HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE);
-        */
-       EVMCS1_FIELD(GUEST_LINEAR_ADDRESS, guest_linear_address,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE),
-
-       /*
-        * No mask defined in the spec as Hyper-V doesn't currently support
-        * these. Future proof by resetting the whole clean field mask on
-        * access.
-        */
-       EVMCS1_FIELD(VM_EXIT_MSR_STORE_ADDR, vm_exit_msr_store_addr,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_ALL),
-       EVMCS1_FIELD(VM_EXIT_MSR_LOAD_ADDR, vm_exit_msr_load_addr,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_ALL),
-       EVMCS1_FIELD(VM_ENTRY_MSR_LOAD_ADDR, vm_entry_msr_load_addr,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_ALL),
-
-       /* 32 bit rw */
-       EVMCS1_FIELD(TPR_THRESHOLD, tpr_threshold,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE),
-       EVMCS1_FIELD(GUEST_INTERRUPTIBILITY_INFO, guest_interruptibility_info,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_BASIC),
-       EVMCS1_FIELD(CPU_BASED_VM_EXEC_CONTROL, cpu_based_vm_exec_control,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_PROC),
-       EVMCS1_FIELD(EXCEPTION_BITMAP, exception_bitmap,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_EXCPN),
-       EVMCS1_FIELD(VM_ENTRY_CONTROLS, vm_entry_controls,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_ENTRY),
-       EVMCS1_FIELD(VM_ENTRY_INTR_INFO_FIELD, vm_entry_intr_info_field,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_EVENT),
-       EVMCS1_FIELD(VM_ENTRY_EXCEPTION_ERROR_CODE,
-                    vm_entry_exception_error_code,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_EVENT),
-       EVMCS1_FIELD(VM_ENTRY_INSTRUCTION_LEN, vm_entry_instruction_len,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_EVENT),
-       EVMCS1_FIELD(HOST_IA32_SYSENTER_CS, host_ia32_sysenter_cs,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
-       EVMCS1_FIELD(PIN_BASED_VM_EXEC_CONTROL, pin_based_vm_exec_control,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_GRP1),
-       EVMCS1_FIELD(VM_EXIT_CONTROLS, vm_exit_controls,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_GRP1),
-       EVMCS1_FIELD(SECONDARY_VM_EXEC_CONTROL, secondary_vm_exec_control,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_GRP1),
-       EVMCS1_FIELD(GUEST_ES_LIMIT, guest_es_limit,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
-       EVMCS1_FIELD(GUEST_CS_LIMIT, guest_cs_limit,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
-       EVMCS1_FIELD(GUEST_SS_LIMIT, guest_ss_limit,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
-       EVMCS1_FIELD(GUEST_DS_LIMIT, guest_ds_limit,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
-       EVMCS1_FIELD(GUEST_FS_LIMIT, guest_fs_limit,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
-       EVMCS1_FIELD(GUEST_GS_LIMIT, guest_gs_limit,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
-       EVMCS1_FIELD(GUEST_LDTR_LIMIT, guest_ldtr_limit,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
-       EVMCS1_FIELD(GUEST_TR_LIMIT, guest_tr_limit,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
-       EVMCS1_FIELD(GUEST_GDTR_LIMIT, guest_gdtr_limit,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
-       EVMCS1_FIELD(GUEST_IDTR_LIMIT, guest_idtr_limit,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
-       EVMCS1_FIELD(GUEST_ES_AR_BYTES, guest_es_ar_bytes,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
-       EVMCS1_FIELD(GUEST_CS_AR_BYTES, guest_cs_ar_bytes,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
-       EVMCS1_FIELD(GUEST_SS_AR_BYTES, guest_ss_ar_bytes,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
-       EVMCS1_FIELD(GUEST_DS_AR_BYTES, guest_ds_ar_bytes,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
-       EVMCS1_FIELD(GUEST_FS_AR_BYTES, guest_fs_ar_bytes,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
-       EVMCS1_FIELD(GUEST_GS_AR_BYTES, guest_gs_ar_bytes,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
-       EVMCS1_FIELD(GUEST_LDTR_AR_BYTES, guest_ldtr_ar_bytes,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
-       EVMCS1_FIELD(GUEST_TR_AR_BYTES, guest_tr_ar_bytes,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
-       EVMCS1_FIELD(GUEST_ACTIVITY_STATE, guest_activity_state,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1),
-       EVMCS1_FIELD(GUEST_SYSENTER_CS, guest_sysenter_cs,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1),
-
-       /* 32 bit read only */
-       EVMCS1_FIELD(VM_INSTRUCTION_ERROR, vm_instruction_error,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE),
-       EVMCS1_FIELD(VM_EXIT_REASON, vm_exit_reason,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE),
-       EVMCS1_FIELD(VM_EXIT_INTR_INFO, vm_exit_intr_info,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE),
-       EVMCS1_FIELD(VM_EXIT_INTR_ERROR_CODE, vm_exit_intr_error_code,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE),
-       EVMCS1_FIELD(IDT_VECTORING_INFO_FIELD, idt_vectoring_info_field,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE),
-       EVMCS1_FIELD(IDT_VECTORING_ERROR_CODE, idt_vectoring_error_code,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE),
-       EVMCS1_FIELD(VM_EXIT_INSTRUCTION_LEN, vm_exit_instruction_len,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE),
-       EVMCS1_FIELD(VMX_INSTRUCTION_INFO, vmx_instruction_info,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE),
-
-       /* No mask defined in the spec (not used) */
-       EVMCS1_FIELD(PAGE_FAULT_ERROR_CODE_MASK, page_fault_error_code_mask,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_ALL),
-       EVMCS1_FIELD(PAGE_FAULT_ERROR_CODE_MATCH, page_fault_error_code_match,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_ALL),
-       EVMCS1_FIELD(CR3_TARGET_COUNT, cr3_target_count,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_ALL),
-       EVMCS1_FIELD(VM_EXIT_MSR_STORE_COUNT, vm_exit_msr_store_count,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_ALL),
-       EVMCS1_FIELD(VM_EXIT_MSR_LOAD_COUNT, vm_exit_msr_load_count,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_ALL),
-       EVMCS1_FIELD(VM_ENTRY_MSR_LOAD_COUNT, vm_entry_msr_load_count,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_ALL),
-
-       /* 16 bit rw */
-       EVMCS1_FIELD(HOST_ES_SELECTOR, host_es_selector,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
-       EVMCS1_FIELD(HOST_CS_SELECTOR, host_cs_selector,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
-       EVMCS1_FIELD(HOST_SS_SELECTOR, host_ss_selector,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
-       EVMCS1_FIELD(HOST_DS_SELECTOR, host_ds_selector,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
-       EVMCS1_FIELD(HOST_FS_SELECTOR, host_fs_selector,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
-       EVMCS1_FIELD(HOST_GS_SELECTOR, host_gs_selector,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
-       EVMCS1_FIELD(HOST_TR_SELECTOR, host_tr_selector,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
-       EVMCS1_FIELD(GUEST_ES_SELECTOR, guest_es_selector,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
-       EVMCS1_FIELD(GUEST_CS_SELECTOR, guest_cs_selector,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
-       EVMCS1_FIELD(GUEST_SS_SELECTOR, guest_ss_selector,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
-       EVMCS1_FIELD(GUEST_DS_SELECTOR, guest_ds_selector,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
-       EVMCS1_FIELD(GUEST_FS_SELECTOR, guest_fs_selector,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
-       EVMCS1_FIELD(GUEST_GS_SELECTOR, guest_gs_selector,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
-       EVMCS1_FIELD(GUEST_LDTR_SELECTOR, guest_ldtr_selector,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
-       EVMCS1_FIELD(GUEST_TR_SELECTOR, guest_tr_selector,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
-       EVMCS1_FIELD(VIRTUAL_PROCESSOR_ID, virtual_processor_id,
-                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_XLAT),
-};
-const unsigned int nr_evmcs_1_fields = ARRAY_SIZE(vmcs_field_to_evmcs_1);
-
-bool nested_enlightened_vmentry(struct kvm_vcpu *vcpu, u64 *evmcs_gpa)
-{
-       struct hv_vp_assist_page assist_page;
-
-       *evmcs_gpa = -1ull;
-
-       if (unlikely(!kvm_hv_get_assist_page(vcpu, &assist_page)))
-               return false;
-
-       if (unlikely(!assist_page.enlighten_vmentry))
-               return false;
-
-       if (unlikely(!evmptr_is_valid(assist_page.current_nested_vmcs)))
-               return false;
-
-       *evmcs_gpa = assist_page.current_nested_vmcs;
-
-       return true;
-}
-
-uint16_t nested_get_evmcs_version(struct kvm_vcpu *vcpu)
-{
-       /*
-        * vmcs_version represents the range of supported Enlightened VMCS
-        * versions: lower 8 bits is the minimal version, higher 8 bits is the
-        * maximum supported version. KVM supports versions from 1 to
-        * KVM_EVMCS_VERSION.
-        *
-        * Note, do not check the Hyper-V is fully enabled in guest CPUID, this
-        * helper is used to _get_ the vCPU's supported CPUID.
-        */
-       if (kvm_cpu_cap_get(X86_FEATURE_VMX) &&
-           (!vcpu || to_vmx(vcpu)->nested.enlightened_vmcs_enabled))
-               return (KVM_EVMCS_VERSION << 8) | 1;
-
-       return 0;
-}
-
-enum evmcs_revision {
-       EVMCSv1_LEGACY,
-       NR_EVMCS_REVISIONS,
-};
-
-enum evmcs_ctrl_type {
-       EVMCS_EXIT_CTRLS,
-       EVMCS_ENTRY_CTRLS,
-       EVMCS_2NDEXEC,
-       EVMCS_PINCTRL,
-       EVMCS_VMFUNC,
-       NR_EVMCS_CTRLS,
-};
-
-static const u32 evmcs_unsupported_ctrls[NR_EVMCS_CTRLS][NR_EVMCS_REVISIONS] = {
-       [EVMCS_EXIT_CTRLS] = {
-               [EVMCSv1_LEGACY] = EVMCS1_UNSUPPORTED_VMEXIT_CTRL,
-       },
-       [EVMCS_ENTRY_CTRLS] = {
-               [EVMCSv1_LEGACY] = EVMCS1_UNSUPPORTED_VMENTRY_CTRL,
-       },
-       [EVMCS_2NDEXEC] = {
-               [EVMCSv1_LEGACY] = EVMCS1_UNSUPPORTED_2NDEXEC,
-       },
-       [EVMCS_PINCTRL] = {
-               [EVMCSv1_LEGACY] = EVMCS1_UNSUPPORTED_PINCTRL,
-       },
-       [EVMCS_VMFUNC] = {
-               [EVMCSv1_LEGACY] = EVMCS1_UNSUPPORTED_VMFUNC,
-       },
-};
-
-static u32 evmcs_get_unsupported_ctls(enum evmcs_ctrl_type ctrl_type)
-{
-       enum evmcs_revision evmcs_rev = EVMCSv1_LEGACY;
-
-       return evmcs_unsupported_ctrls[ctrl_type][evmcs_rev];
-}
-
-static bool evmcs_has_perf_global_ctrl(struct kvm_vcpu *vcpu)
-{
-       struct kvm_vcpu_hv *hv_vcpu = to_hv_vcpu(vcpu);
-
-       /*
-        * PERF_GLOBAL_CTRL has a quirk where some Windows guests may fail to
-        * boot if a PV CPUID feature flag is not also set.  Treat the fields
-        * as unsupported if the flag is not set in guest CPUID.  This should
-        * be called only for guest accesses, and all guest accesses should be
-        * gated on Hyper-V being enabled and initialized.
-        */
-       if (WARN_ON_ONCE(!hv_vcpu))
-               return false;
-
-       return hv_vcpu->cpuid_cache.nested_ebx & HV_X64_NESTED_EVMCS1_PERF_GLOBAL_CTRL;
-}
-
-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);
-       u32 unsupported_ctrls;
-
-       /*
-        * Hyper-V 2016 and 2019 try using these features even when eVMCS
-        * is enabled but there are no corresponding fields.
-        */
-       switch (msr_index) {
-       case MSR_IA32_VMX_EXIT_CTLS:
-       case MSR_IA32_VMX_TRUE_EXIT_CTLS:
-               unsupported_ctrls = evmcs_get_unsupported_ctls(EVMCS_EXIT_CTRLS);
-               if (!evmcs_has_perf_global_ctrl(vcpu))
-                       unsupported_ctrls |= VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL;
-               ctl_high &= ~unsupported_ctrls;
-               break;
-       case MSR_IA32_VMX_ENTRY_CTLS:
-       case MSR_IA32_VMX_TRUE_ENTRY_CTLS:
-               unsupported_ctrls = evmcs_get_unsupported_ctls(EVMCS_ENTRY_CTRLS);
-               if (!evmcs_has_perf_global_ctrl(vcpu))
-                       unsupported_ctrls |= VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL;
-               ctl_high &= ~unsupported_ctrls;
-               break;
-       case MSR_IA32_VMX_PROCBASED_CTLS2:
-               ctl_high &= ~evmcs_get_unsupported_ctls(EVMCS_2NDEXEC);
-               break;
-       case MSR_IA32_VMX_TRUE_PINBASED_CTLS:
-       case MSR_IA32_VMX_PINBASED_CTLS:
-               ctl_high &= ~evmcs_get_unsupported_ctls(EVMCS_PINCTRL);
-               break;
-       case MSR_IA32_VMX_VMFUNC:
-               ctl_low &= ~evmcs_get_unsupported_ctls(EVMCS_VMFUNC);
-               break;
-       }
-
-       *pdata = ctl_low | ((u64)ctl_high << 32);
-}
-
-static bool nested_evmcs_is_valid_controls(enum evmcs_ctrl_type ctrl_type,
-                                          u32 val)
-{
-       return !(val & evmcs_get_unsupported_ctls(ctrl_type));
-}
-
-int nested_evmcs_check_controls(struct vmcs12 *vmcs12)
-{
-       if (CC(!nested_evmcs_is_valid_controls(EVMCS_PINCTRL,
-                                              vmcs12->pin_based_vm_exec_control)))
-               return -EINVAL;
-
-       if (CC(!nested_evmcs_is_valid_controls(EVMCS_2NDEXEC,
-                                              vmcs12->secondary_vm_exec_control)))
-               return -EINVAL;
-
-       if (CC(!nested_evmcs_is_valid_controls(EVMCS_EXIT_CTRLS,
-                                              vmcs12->vm_exit_controls)))
-               return -EINVAL;
-
-       if (CC(!nested_evmcs_is_valid_controls(EVMCS_ENTRY_CTRLS,
-                                              vmcs12->vm_entry_controls)))
-               return -EINVAL;
-
-       /*
-        * VM-Func controls are 64-bit, but KVM currently doesn't support any
-        * controls in bits 63:32, i.e. dropping those bits on the consistency
-        * check is intentional.
-        */
-       if (WARN_ON_ONCE(vmcs12->vm_function_control >> 32))
-               return -EINVAL;
-
-       if (CC(!nested_evmcs_is_valid_controls(EVMCS_VMFUNC,
-                                              vmcs12->vm_function_control)))
-               return -EINVAL;
-
-       return 0;
-}
-
-int nested_enable_evmcs(struct kvm_vcpu *vcpu,
-                       uint16_t *vmcs_version)
-{
-       struct vcpu_vmx *vmx = to_vmx(vcpu);
-
-       vmx->nested.enlightened_vmcs_enabled = true;
-
-       if (vmcs_version)
-               *vmcs_version = nested_get_evmcs_version(vcpu);
-
-       return 0;
-}
diff --git a/arch/x86/kvm/vmx/evmcs.h b/arch/x86/kvm/vmx/evmcs.h
deleted file mode 100644 (file)
index 6f746ef..0000000
+++ /dev/null
@@ -1,245 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef __KVM_X86_VMX_EVMCS_H
-#define __KVM_X86_VMX_EVMCS_H
-
-#include <linux/jump_label.h>
-
-#include <asm/hyperv-tlfs.h>
-#include <asm/mshyperv.h>
-#include <asm/vmx.h>
-
-#include "capabilities.h"
-#include "vmcs.h"
-#include "vmcs12.h"
-
-struct vmcs_config;
-
-DECLARE_STATIC_KEY_FALSE(enable_evmcs);
-
-#define current_evmcs ((struct hv_enlightened_vmcs *)this_cpu_read(current_vmcs))
-
-#define KVM_EVMCS_VERSION 1
-
-/*
- * Enlightened VMCSv1 doesn't support these:
- *
- *     POSTED_INTR_NV                  = 0x00000002,
- *     GUEST_INTR_STATUS               = 0x00000810,
- *     APIC_ACCESS_ADDR                = 0x00002014,
- *     POSTED_INTR_DESC_ADDR           = 0x00002016,
- *     EOI_EXIT_BITMAP0                = 0x0000201c,
- *     EOI_EXIT_BITMAP1                = 0x0000201e,
- *     EOI_EXIT_BITMAP2                = 0x00002020,
- *     EOI_EXIT_BITMAP3                = 0x00002022,
- *     GUEST_PML_INDEX                 = 0x00000812,
- *     PML_ADDRESS                     = 0x0000200e,
- *     VM_FUNCTION_CONTROL             = 0x00002018,
- *     EPTP_LIST_ADDRESS               = 0x00002024,
- *     VMREAD_BITMAP                   = 0x00002026,
- *     VMWRITE_BITMAP                  = 0x00002028,
- *
- *     TSC_MULTIPLIER                  = 0x00002032,
- *     PLE_GAP                         = 0x00004020,
- *     PLE_WINDOW                      = 0x00004022,
- *     VMX_PREEMPTION_TIMER_VALUE      = 0x0000482E,
- *
- * Currently unsupported in KVM:
- *     GUEST_IA32_RTIT_CTL             = 0x00002814,
- */
-#define EVMCS1_UNSUPPORTED_PINCTRL (PIN_BASED_POSTED_INTR | \
-                                   PIN_BASED_VMX_PREEMPTION_TIMER)
-#define EVMCS1_UNSUPPORTED_EXEC_CTRL (CPU_BASED_ACTIVATE_TERTIARY_CONTROLS)
-#define EVMCS1_UNSUPPORTED_2NDEXEC                                     \
-       (SECONDARY_EXEC_VIRTUAL_INTR_DELIVERY |                         \
-        SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES |                      \
-        SECONDARY_EXEC_APIC_REGISTER_VIRT |                            \
-        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_SAVE_VMX_PREEMPTION_TIMER)
-#define EVMCS1_UNSUPPORTED_VMENTRY_CTRL (0)
-#define EVMCS1_UNSUPPORTED_VMFUNC (VMX_VMFUNC_EPTP_SWITCHING)
-
-struct evmcs_field {
-       u16 offset;
-       u16 clean_field;
-};
-
-extern const struct evmcs_field vmcs_field_to_evmcs_1[];
-extern const unsigned int nr_evmcs_1_fields;
-
-static __always_inline int evmcs_field_offset(unsigned long field,
-                                             u16 *clean_field)
-{
-       unsigned int index = ROL16(field, 6);
-       const struct evmcs_field *evmcs_field;
-
-       if (unlikely(index >= nr_evmcs_1_fields))
-               return -ENOENT;
-
-       evmcs_field = &vmcs_field_to_evmcs_1[index];
-
-       /*
-        * Use offset=0 to detect holes in eVMCS. This offset belongs to
-        * 'revision_id' but this field has no encoding and is supposed to
-        * be accessed directly.
-        */
-       if (unlikely(!evmcs_field->offset))
-               return -ENOENT;
-
-       if (clean_field)
-               *clean_field = evmcs_field->clean_field;
-
-       return evmcs_field->offset;
-}
-
-static inline u64 evmcs_read_any(struct hv_enlightened_vmcs *evmcs,
-                                unsigned long field, u16 offset)
-{
-       /*
-        * vmcs12_read_any() doesn't care whether the supplied structure
-        * is 'struct vmcs12' or 'struct hv_enlightened_vmcs' as it takes
-        * the exact offset of the required field, use it for convenience
-        * here.
-        */
-       return vmcs12_read_any((void *)evmcs, field, offset);
-}
-
-#if IS_ENABLED(CONFIG_HYPERV)
-
-static __always_inline int get_evmcs_offset(unsigned long field,
-                                           u16 *clean_field)
-{
-       int offset = evmcs_field_offset(field, clean_field);
-
-       WARN_ONCE(offset < 0, "KVM: accessing unsupported EVMCS field %lx\n",
-                 field);
-
-       return offset;
-}
-
-static __always_inline void evmcs_write64(unsigned long field, u64 value)
-{
-       u16 clean_field;
-       int offset = get_evmcs_offset(field, &clean_field);
-
-       if (offset < 0)
-               return;
-
-       *(u64 *)((char *)current_evmcs + offset) = value;
-
-       current_evmcs->hv_clean_fields &= ~clean_field;
-}
-
-static inline void evmcs_write32(unsigned long field, u32 value)
-{
-       u16 clean_field;
-       int offset = get_evmcs_offset(field, &clean_field);
-
-       if (offset < 0)
-               return;
-
-       *(u32 *)((char *)current_evmcs + offset) = value;
-       current_evmcs->hv_clean_fields &= ~clean_field;
-}
-
-static inline void evmcs_write16(unsigned long field, u16 value)
-{
-       u16 clean_field;
-       int offset = get_evmcs_offset(field, &clean_field);
-
-       if (offset < 0)
-               return;
-
-       *(u16 *)((char *)current_evmcs + offset) = value;
-       current_evmcs->hv_clean_fields &= ~clean_field;
-}
-
-static inline u64 evmcs_read64(unsigned long field)
-{
-       int offset = get_evmcs_offset(field, NULL);
-
-       if (offset < 0)
-               return 0;
-
-       return *(u64 *)((char *)current_evmcs + offset);
-}
-
-static inline u32 evmcs_read32(unsigned long field)
-{
-       int offset = get_evmcs_offset(field, NULL);
-
-       if (offset < 0)
-               return 0;
-
-       return *(u32 *)((char *)current_evmcs + offset);
-}
-
-static inline u16 evmcs_read16(unsigned long field)
-{
-       int offset = get_evmcs_offset(field, NULL);
-
-       if (offset < 0)
-               return 0;
-
-       return *(u16 *)((char *)current_evmcs + offset);
-}
-
-static inline void evmcs_touch_msr_bitmap(void)
-{
-       if (unlikely(!current_evmcs))
-               return;
-
-       if (current_evmcs->hv_enlightenments_control.msr_bitmap)
-               current_evmcs->hv_clean_fields &=
-                       ~HV_VMX_ENLIGHTENED_CLEAN_FIELD_MSR_BITMAP;
-}
-
-static inline void evmcs_load(u64 phys_addr)
-{
-       struct hv_vp_assist_page *vp_ap =
-               hv_get_vp_assist_page(smp_processor_id());
-
-       if (current_evmcs->hv_enlightenments_control.nested_flush_hypercall)
-               vp_ap->nested_control.features.directhypercall = 1;
-       vp_ap->current_nested_vmcs = phys_addr;
-       vp_ap->enlighten_vmentry = 1;
-}
-
-#else /* !IS_ENABLED(CONFIG_HYPERV) */
-static __always_inline void evmcs_write64(unsigned long field, u64 value) {}
-static inline void evmcs_write32(unsigned long field, u32 value) {}
-static inline void evmcs_write16(unsigned long field, u16 value) {}
-static inline u64 evmcs_read64(unsigned long field) { return 0; }
-static inline u32 evmcs_read32(unsigned long field) { return 0; }
-static inline u16 evmcs_read16(unsigned long field) { return 0; }
-static inline void evmcs_load(u64 phys_addr) {}
-static inline void evmcs_touch_msr_bitmap(void) {}
-#endif /* IS_ENABLED(CONFIG_HYPERV) */
-
-#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,
-       EVMPTRLD_VMFAIL,
-       EVMPTRLD_ERROR,
-};
-
-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);
-void nested_evmcs_filter_control_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 *pdata);
-int nested_evmcs_check_controls(struct vmcs12 *vmcs12);
-
-#endif /* __KVM_X86_VMX_EVMCS_H */
diff --git a/arch/x86/kvm/vmx/hyperv.c b/arch/x86/kvm/vmx/hyperv.c
new file mode 100644 (file)
index 0000000..5e23915
--- /dev/null
@@ -0,0 +1,508 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include <linux/errno.h>
+#include <linux/smp.h>
+
+#include "../cpuid.h"
+#include "hyperv.h"
+#include "vmcs.h"
+#include "vmx.h"
+#include "trace.h"
+
+#define CC KVM_NESTED_VMENTER_CONSISTENCY_CHECK
+
+DEFINE_STATIC_KEY_FALSE(enable_evmcs);
+
+#define EVMCS1_OFFSET(x) offsetof(struct hv_enlightened_vmcs, x)
+#define EVMCS1_FIELD(number, name, clean_field)[ROL16(number, 6)] = \
+               {EVMCS1_OFFSET(name), clean_field}
+
+const struct evmcs_field vmcs_field_to_evmcs_1[] = {
+       /* 64 bit rw */
+       EVMCS1_FIELD(GUEST_RIP, guest_rip,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE),
+       EVMCS1_FIELD(GUEST_RSP, guest_rsp,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_BASIC),
+       EVMCS1_FIELD(GUEST_RFLAGS, guest_rflags,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_BASIC),
+       EVMCS1_FIELD(HOST_IA32_PAT, host_ia32_pat,
+                    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,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
+       EVMCS1_FIELD(HOST_CR4, host_cr4,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
+       EVMCS1_FIELD(HOST_IA32_SYSENTER_ESP, host_ia32_sysenter_esp,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
+       EVMCS1_FIELD(HOST_IA32_SYSENTER_EIP, host_ia32_sysenter_eip,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
+       EVMCS1_FIELD(HOST_RIP, host_rip,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
+       EVMCS1_FIELD(IO_BITMAP_A, io_bitmap_a,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_IO_BITMAP),
+       EVMCS1_FIELD(IO_BITMAP_B, io_bitmap_b,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_IO_BITMAP),
+       EVMCS1_FIELD(MSR_BITMAP, msr_bitmap,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_MSR_BITMAP),
+       EVMCS1_FIELD(GUEST_ES_BASE, guest_es_base,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
+       EVMCS1_FIELD(GUEST_CS_BASE, guest_cs_base,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
+       EVMCS1_FIELD(GUEST_SS_BASE, guest_ss_base,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
+       EVMCS1_FIELD(GUEST_DS_BASE, guest_ds_base,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
+       EVMCS1_FIELD(GUEST_FS_BASE, guest_fs_base,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
+       EVMCS1_FIELD(GUEST_GS_BASE, guest_gs_base,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
+       EVMCS1_FIELD(GUEST_LDTR_BASE, guest_ldtr_base,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
+       EVMCS1_FIELD(GUEST_TR_BASE, guest_tr_base,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
+       EVMCS1_FIELD(GUEST_GDTR_BASE, guest_gdtr_base,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
+       EVMCS1_FIELD(GUEST_IDTR_BASE, guest_idtr_base,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
+       EVMCS1_FIELD(TSC_OFFSET, tsc_offset,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_GRP2),
+       EVMCS1_FIELD(VIRTUAL_APIC_PAGE_ADDR, virtual_apic_page_addr,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_GRP2),
+       EVMCS1_FIELD(VMCS_LINK_POINTER, vmcs_link_pointer,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1),
+       EVMCS1_FIELD(GUEST_IA32_DEBUGCTL, guest_ia32_debugctl,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1),
+       EVMCS1_FIELD(GUEST_IA32_PAT, guest_ia32_pat,
+                    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,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1),
+       EVMCS1_FIELD(GUEST_PDPTR2, guest_pdptr2,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1),
+       EVMCS1_FIELD(GUEST_PDPTR3, guest_pdptr3,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1),
+       EVMCS1_FIELD(GUEST_PENDING_DBG_EXCEPTIONS, guest_pending_dbg_exceptions,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1),
+       EVMCS1_FIELD(GUEST_SYSENTER_ESP, guest_sysenter_esp,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1),
+       EVMCS1_FIELD(GUEST_SYSENTER_EIP, guest_sysenter_eip,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1),
+       EVMCS1_FIELD(CR0_GUEST_HOST_MASK, cr0_guest_host_mask,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_CRDR),
+       EVMCS1_FIELD(CR4_GUEST_HOST_MASK, cr4_guest_host_mask,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_CRDR),
+       EVMCS1_FIELD(CR0_READ_SHADOW, cr0_read_shadow,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_CRDR),
+       EVMCS1_FIELD(CR4_READ_SHADOW, cr4_read_shadow,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_CRDR),
+       EVMCS1_FIELD(GUEST_CR0, guest_cr0,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_CRDR),
+       EVMCS1_FIELD(GUEST_CR3, guest_cr3,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_CRDR),
+       EVMCS1_FIELD(GUEST_CR4, guest_cr4,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_CRDR),
+       EVMCS1_FIELD(GUEST_DR7, guest_dr7,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_CRDR),
+       EVMCS1_FIELD(HOST_FS_BASE, host_fs_base,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_POINTER),
+       EVMCS1_FIELD(HOST_GS_BASE, host_gs_base,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_POINTER),
+       EVMCS1_FIELD(HOST_TR_BASE, host_tr_base,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_POINTER),
+       EVMCS1_FIELD(HOST_GDTR_BASE, host_gdtr_base,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_POINTER),
+       EVMCS1_FIELD(HOST_IDTR_BASE, host_idtr_base,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_POINTER),
+       EVMCS1_FIELD(HOST_RSP, host_rsp,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_POINTER),
+       EVMCS1_FIELD(EPT_POINTER, ept_pointer,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_XLAT),
+       EVMCS1_FIELD(GUEST_BNDCFGS, guest_bndcfgs,
+                    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,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE),
+       EVMCS1_FIELD(EXIT_QUALIFICATION, exit_qualification,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE),
+       /*
+        * Not defined in KVM:
+        *
+        * EVMCS1_FIELD(0x00006402, exit_io_instruction_ecx,
+        *              HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE);
+        * EVMCS1_FIELD(0x00006404, exit_io_instruction_esi,
+        *              HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE);
+        * EVMCS1_FIELD(0x00006406, exit_io_instruction_esi,
+        *              HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE);
+        * EVMCS1_FIELD(0x00006408, exit_io_instruction_eip,
+        *              HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE);
+        */
+       EVMCS1_FIELD(GUEST_LINEAR_ADDRESS, guest_linear_address,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE),
+
+       /*
+        * No mask defined in the spec as Hyper-V doesn't currently support
+        * these. Future proof by resetting the whole clean field mask on
+        * access.
+        */
+       EVMCS1_FIELD(VM_EXIT_MSR_STORE_ADDR, vm_exit_msr_store_addr,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_ALL),
+       EVMCS1_FIELD(VM_EXIT_MSR_LOAD_ADDR, vm_exit_msr_load_addr,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_ALL),
+       EVMCS1_FIELD(VM_ENTRY_MSR_LOAD_ADDR, vm_entry_msr_load_addr,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_ALL),
+
+       /* 32 bit rw */
+       EVMCS1_FIELD(TPR_THRESHOLD, tpr_threshold,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE),
+       EVMCS1_FIELD(GUEST_INTERRUPTIBILITY_INFO, guest_interruptibility_info,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_BASIC),
+       EVMCS1_FIELD(CPU_BASED_VM_EXEC_CONTROL, cpu_based_vm_exec_control,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_PROC),
+       EVMCS1_FIELD(EXCEPTION_BITMAP, exception_bitmap,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_EXCPN),
+       EVMCS1_FIELD(VM_ENTRY_CONTROLS, vm_entry_controls,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_ENTRY),
+       EVMCS1_FIELD(VM_ENTRY_INTR_INFO_FIELD, vm_entry_intr_info_field,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_EVENT),
+       EVMCS1_FIELD(VM_ENTRY_EXCEPTION_ERROR_CODE,
+                    vm_entry_exception_error_code,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_EVENT),
+       EVMCS1_FIELD(VM_ENTRY_INSTRUCTION_LEN, vm_entry_instruction_len,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_EVENT),
+       EVMCS1_FIELD(HOST_IA32_SYSENTER_CS, host_ia32_sysenter_cs,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
+       EVMCS1_FIELD(PIN_BASED_VM_EXEC_CONTROL, pin_based_vm_exec_control,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_GRP1),
+       EVMCS1_FIELD(VM_EXIT_CONTROLS, vm_exit_controls,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_GRP1),
+       EVMCS1_FIELD(SECONDARY_VM_EXEC_CONTROL, secondary_vm_exec_control,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_GRP1),
+       EVMCS1_FIELD(GUEST_ES_LIMIT, guest_es_limit,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
+       EVMCS1_FIELD(GUEST_CS_LIMIT, guest_cs_limit,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
+       EVMCS1_FIELD(GUEST_SS_LIMIT, guest_ss_limit,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
+       EVMCS1_FIELD(GUEST_DS_LIMIT, guest_ds_limit,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
+       EVMCS1_FIELD(GUEST_FS_LIMIT, guest_fs_limit,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
+       EVMCS1_FIELD(GUEST_GS_LIMIT, guest_gs_limit,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
+       EVMCS1_FIELD(GUEST_LDTR_LIMIT, guest_ldtr_limit,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
+       EVMCS1_FIELD(GUEST_TR_LIMIT, guest_tr_limit,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
+       EVMCS1_FIELD(GUEST_GDTR_LIMIT, guest_gdtr_limit,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
+       EVMCS1_FIELD(GUEST_IDTR_LIMIT, guest_idtr_limit,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
+       EVMCS1_FIELD(GUEST_ES_AR_BYTES, guest_es_ar_bytes,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
+       EVMCS1_FIELD(GUEST_CS_AR_BYTES, guest_cs_ar_bytes,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
+       EVMCS1_FIELD(GUEST_SS_AR_BYTES, guest_ss_ar_bytes,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
+       EVMCS1_FIELD(GUEST_DS_AR_BYTES, guest_ds_ar_bytes,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
+       EVMCS1_FIELD(GUEST_FS_AR_BYTES, guest_fs_ar_bytes,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
+       EVMCS1_FIELD(GUEST_GS_AR_BYTES, guest_gs_ar_bytes,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
+       EVMCS1_FIELD(GUEST_LDTR_AR_BYTES, guest_ldtr_ar_bytes,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
+       EVMCS1_FIELD(GUEST_TR_AR_BYTES, guest_tr_ar_bytes,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
+       EVMCS1_FIELD(GUEST_ACTIVITY_STATE, guest_activity_state,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1),
+       EVMCS1_FIELD(GUEST_SYSENTER_CS, guest_sysenter_cs,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1),
+
+       /* 32 bit read only */
+       EVMCS1_FIELD(VM_INSTRUCTION_ERROR, vm_instruction_error,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE),
+       EVMCS1_FIELD(VM_EXIT_REASON, vm_exit_reason,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE),
+       EVMCS1_FIELD(VM_EXIT_INTR_INFO, vm_exit_intr_info,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE),
+       EVMCS1_FIELD(VM_EXIT_INTR_ERROR_CODE, vm_exit_intr_error_code,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE),
+       EVMCS1_FIELD(IDT_VECTORING_INFO_FIELD, idt_vectoring_info_field,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE),
+       EVMCS1_FIELD(IDT_VECTORING_ERROR_CODE, idt_vectoring_error_code,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE),
+       EVMCS1_FIELD(VM_EXIT_INSTRUCTION_LEN, vm_exit_instruction_len,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE),
+       EVMCS1_FIELD(VMX_INSTRUCTION_INFO, vmx_instruction_info,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE),
+
+       /* No mask defined in the spec (not used) */
+       EVMCS1_FIELD(PAGE_FAULT_ERROR_CODE_MASK, page_fault_error_code_mask,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_ALL),
+       EVMCS1_FIELD(PAGE_FAULT_ERROR_CODE_MATCH, page_fault_error_code_match,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_ALL),
+       EVMCS1_FIELD(CR3_TARGET_COUNT, cr3_target_count,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_ALL),
+       EVMCS1_FIELD(VM_EXIT_MSR_STORE_COUNT, vm_exit_msr_store_count,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_ALL),
+       EVMCS1_FIELD(VM_EXIT_MSR_LOAD_COUNT, vm_exit_msr_load_count,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_ALL),
+       EVMCS1_FIELD(VM_ENTRY_MSR_LOAD_COUNT, vm_entry_msr_load_count,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_ALL),
+
+       /* 16 bit rw */
+       EVMCS1_FIELD(HOST_ES_SELECTOR, host_es_selector,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
+       EVMCS1_FIELD(HOST_CS_SELECTOR, host_cs_selector,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
+       EVMCS1_FIELD(HOST_SS_SELECTOR, host_ss_selector,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
+       EVMCS1_FIELD(HOST_DS_SELECTOR, host_ds_selector,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
+       EVMCS1_FIELD(HOST_FS_SELECTOR, host_fs_selector,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
+       EVMCS1_FIELD(HOST_GS_SELECTOR, host_gs_selector,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
+       EVMCS1_FIELD(HOST_TR_SELECTOR, host_tr_selector,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
+       EVMCS1_FIELD(GUEST_ES_SELECTOR, guest_es_selector,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
+       EVMCS1_FIELD(GUEST_CS_SELECTOR, guest_cs_selector,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
+       EVMCS1_FIELD(GUEST_SS_SELECTOR, guest_ss_selector,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
+       EVMCS1_FIELD(GUEST_DS_SELECTOR, guest_ds_selector,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
+       EVMCS1_FIELD(GUEST_FS_SELECTOR, guest_fs_selector,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
+       EVMCS1_FIELD(GUEST_GS_SELECTOR, guest_gs_selector,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
+       EVMCS1_FIELD(GUEST_LDTR_SELECTOR, guest_ldtr_selector,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
+       EVMCS1_FIELD(GUEST_TR_SELECTOR, guest_tr_selector,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
+       EVMCS1_FIELD(VIRTUAL_PROCESSOR_ID, virtual_processor_id,
+                    HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_XLAT),
+};
+const unsigned int nr_evmcs_1_fields = ARRAY_SIZE(vmcs_field_to_evmcs_1);
+
+bool nested_enlightened_vmentry(struct kvm_vcpu *vcpu, u64 *evmcs_gpa)
+{
+       struct hv_vp_assist_page assist_page;
+
+       *evmcs_gpa = -1ull;
+
+       if (unlikely(!kvm_hv_get_assist_page(vcpu, &assist_page)))
+               return false;
+
+       if (unlikely(!assist_page.enlighten_vmentry))
+               return false;
+
+       if (unlikely(!evmptr_is_valid(assist_page.current_nested_vmcs)))
+               return false;
+
+       *evmcs_gpa = assist_page.current_nested_vmcs;
+
+       return true;
+}
+
+uint16_t nested_get_evmcs_version(struct kvm_vcpu *vcpu)
+{
+       /*
+        * vmcs_version represents the range of supported Enlightened VMCS
+        * versions: lower 8 bits is the minimal version, higher 8 bits is the
+        * maximum supported version. KVM supports versions from 1 to
+        * KVM_EVMCS_VERSION.
+        *
+        * Note, do not check the Hyper-V is fully enabled in guest CPUID, this
+        * helper is used to _get_ the vCPU's supported CPUID.
+        */
+       if (kvm_cpu_cap_get(X86_FEATURE_VMX) &&
+           (!vcpu || to_vmx(vcpu)->nested.enlightened_vmcs_enabled))
+               return (KVM_EVMCS_VERSION << 8) | 1;
+
+       return 0;
+}
+
+enum evmcs_revision {
+       EVMCSv1_LEGACY,
+       NR_EVMCS_REVISIONS,
+};
+
+enum evmcs_ctrl_type {
+       EVMCS_EXIT_CTRLS,
+       EVMCS_ENTRY_CTRLS,
+       EVMCS_2NDEXEC,
+       EVMCS_PINCTRL,
+       EVMCS_VMFUNC,
+       NR_EVMCS_CTRLS,
+};
+
+static const u32 evmcs_unsupported_ctrls[NR_EVMCS_CTRLS][NR_EVMCS_REVISIONS] = {
+       [EVMCS_EXIT_CTRLS] = {
+               [EVMCSv1_LEGACY] = EVMCS1_UNSUPPORTED_VMEXIT_CTRL,
+       },
+       [EVMCS_ENTRY_CTRLS] = {
+               [EVMCSv1_LEGACY] = EVMCS1_UNSUPPORTED_VMENTRY_CTRL,
+       },
+       [EVMCS_2NDEXEC] = {
+               [EVMCSv1_LEGACY] = EVMCS1_UNSUPPORTED_2NDEXEC,
+       },
+       [EVMCS_PINCTRL] = {
+               [EVMCSv1_LEGACY] = EVMCS1_UNSUPPORTED_PINCTRL,
+       },
+       [EVMCS_VMFUNC] = {
+               [EVMCSv1_LEGACY] = EVMCS1_UNSUPPORTED_VMFUNC,
+       },
+};
+
+static u32 evmcs_get_unsupported_ctls(enum evmcs_ctrl_type ctrl_type)
+{
+       enum evmcs_revision evmcs_rev = EVMCSv1_LEGACY;
+
+       return evmcs_unsupported_ctrls[ctrl_type][evmcs_rev];
+}
+
+static bool evmcs_has_perf_global_ctrl(struct kvm_vcpu *vcpu)
+{
+       struct kvm_vcpu_hv *hv_vcpu = to_hv_vcpu(vcpu);
+
+       /*
+        * PERF_GLOBAL_CTRL has a quirk where some Windows guests may fail to
+        * boot if a PV CPUID feature flag is not also set.  Treat the fields
+        * as unsupported if the flag is not set in guest CPUID.  This should
+        * be called only for guest accesses, and all guest accesses should be
+        * gated on Hyper-V being enabled and initialized.
+        */
+       if (WARN_ON_ONCE(!hv_vcpu))
+               return false;
+
+       return hv_vcpu->cpuid_cache.nested_ebx & HV_X64_NESTED_EVMCS1_PERF_GLOBAL_CTRL;
+}
+
+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);
+       u32 unsupported_ctrls;
+
+       /*
+        * Hyper-V 2016 and 2019 try using these features even when eVMCS
+        * is enabled but there are no corresponding fields.
+        */
+       switch (msr_index) {
+       case MSR_IA32_VMX_EXIT_CTLS:
+       case MSR_IA32_VMX_TRUE_EXIT_CTLS:
+               unsupported_ctrls = evmcs_get_unsupported_ctls(EVMCS_EXIT_CTRLS);
+               if (!evmcs_has_perf_global_ctrl(vcpu))
+                       unsupported_ctrls |= VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL;
+               ctl_high &= ~unsupported_ctrls;
+               break;
+       case MSR_IA32_VMX_ENTRY_CTLS:
+       case MSR_IA32_VMX_TRUE_ENTRY_CTLS:
+               unsupported_ctrls = evmcs_get_unsupported_ctls(EVMCS_ENTRY_CTRLS);
+               if (!evmcs_has_perf_global_ctrl(vcpu))
+                       unsupported_ctrls |= VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL;
+               ctl_high &= ~unsupported_ctrls;
+               break;
+       case MSR_IA32_VMX_PROCBASED_CTLS2:
+               ctl_high &= ~evmcs_get_unsupported_ctls(EVMCS_2NDEXEC);
+               break;
+       case MSR_IA32_VMX_TRUE_PINBASED_CTLS:
+       case MSR_IA32_VMX_PINBASED_CTLS:
+               ctl_high &= ~evmcs_get_unsupported_ctls(EVMCS_PINCTRL);
+               break;
+       case MSR_IA32_VMX_VMFUNC:
+               ctl_low &= ~evmcs_get_unsupported_ctls(EVMCS_VMFUNC);
+               break;
+       }
+
+       *pdata = ctl_low | ((u64)ctl_high << 32);
+}
+
+static bool nested_evmcs_is_valid_controls(enum evmcs_ctrl_type ctrl_type,
+                                          u32 val)
+{
+       return !(val & evmcs_get_unsupported_ctls(ctrl_type));
+}
+
+int nested_evmcs_check_controls(struct vmcs12 *vmcs12)
+{
+       if (CC(!nested_evmcs_is_valid_controls(EVMCS_PINCTRL,
+                                              vmcs12->pin_based_vm_exec_control)))
+               return -EINVAL;
+
+       if (CC(!nested_evmcs_is_valid_controls(EVMCS_2NDEXEC,
+                                              vmcs12->secondary_vm_exec_control)))
+               return -EINVAL;
+
+       if (CC(!nested_evmcs_is_valid_controls(EVMCS_EXIT_CTRLS,
+                                              vmcs12->vm_exit_controls)))
+               return -EINVAL;
+
+       if (CC(!nested_evmcs_is_valid_controls(EVMCS_ENTRY_CTRLS,
+                                              vmcs12->vm_entry_controls)))
+               return -EINVAL;
+
+       /*
+        * VM-Func controls are 64-bit, but KVM currently doesn't support any
+        * controls in bits 63:32, i.e. dropping those bits on the consistency
+        * check is intentional.
+        */
+       if (WARN_ON_ONCE(vmcs12->vm_function_control >> 32))
+               return -EINVAL;
+
+       if (CC(!nested_evmcs_is_valid_controls(EVMCS_VMFUNC,
+                                              vmcs12->vm_function_control)))
+               return -EINVAL;
+
+       return 0;
+}
+
+int nested_enable_evmcs(struct kvm_vcpu *vcpu,
+                       uint16_t *vmcs_version)
+{
+       struct vcpu_vmx *vmx = to_vmx(vcpu);
+
+       vmx->nested.enlightened_vmcs_enabled = true;
+
+       if (vmcs_version)
+               *vmcs_version = nested_get_evmcs_version(vcpu);
+
+       return 0;
+}
diff --git a/arch/x86/kvm/vmx/hyperv.h b/arch/x86/kvm/vmx/hyperv.h
new file mode 100644 (file)
index 0000000..99a151a
--- /dev/null
@@ -0,0 +1,247 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef __KVM_X86_VMX_HYPERV_H
+#define __KVM_X86_VMX_HYPERV_H
+
+#include <linux/jump_label.h>
+
+#include <asm/hyperv-tlfs.h>
+#include <asm/mshyperv.h>
+#include <asm/vmx.h>
+
+#include "../hyperv.h"
+
+#include "capabilities.h"
+#include "vmcs.h"
+#include "vmcs12.h"
+
+struct vmcs_config;
+
+DECLARE_STATIC_KEY_FALSE(enable_evmcs);
+
+#define current_evmcs ((struct hv_enlightened_vmcs *)this_cpu_read(current_vmcs))
+
+#define KVM_EVMCS_VERSION 1
+
+/*
+ * Enlightened VMCSv1 doesn't support these:
+ *
+ *     POSTED_INTR_NV                  = 0x00000002,
+ *     GUEST_INTR_STATUS               = 0x00000810,
+ *     APIC_ACCESS_ADDR                = 0x00002014,
+ *     POSTED_INTR_DESC_ADDR           = 0x00002016,
+ *     EOI_EXIT_BITMAP0                = 0x0000201c,
+ *     EOI_EXIT_BITMAP1                = 0x0000201e,
+ *     EOI_EXIT_BITMAP2                = 0x00002020,
+ *     EOI_EXIT_BITMAP3                = 0x00002022,
+ *     GUEST_PML_INDEX                 = 0x00000812,
+ *     PML_ADDRESS                     = 0x0000200e,
+ *     VM_FUNCTION_CONTROL             = 0x00002018,
+ *     EPTP_LIST_ADDRESS               = 0x00002024,
+ *     VMREAD_BITMAP                   = 0x00002026,
+ *     VMWRITE_BITMAP                  = 0x00002028,
+ *
+ *     TSC_MULTIPLIER                  = 0x00002032,
+ *     PLE_GAP                         = 0x00004020,
+ *     PLE_WINDOW                      = 0x00004022,
+ *     VMX_PREEMPTION_TIMER_VALUE      = 0x0000482E,
+ *
+ * Currently unsupported in KVM:
+ *     GUEST_IA32_RTIT_CTL             = 0x00002814,
+ */
+#define EVMCS1_UNSUPPORTED_PINCTRL (PIN_BASED_POSTED_INTR | \
+                                   PIN_BASED_VMX_PREEMPTION_TIMER)
+#define EVMCS1_UNSUPPORTED_EXEC_CTRL (CPU_BASED_ACTIVATE_TERTIARY_CONTROLS)
+#define EVMCS1_UNSUPPORTED_2NDEXEC                                     \
+       (SECONDARY_EXEC_VIRTUAL_INTR_DELIVERY |                         \
+        SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES |                      \
+        SECONDARY_EXEC_APIC_REGISTER_VIRT |                            \
+        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_SAVE_VMX_PREEMPTION_TIMER)
+#define EVMCS1_UNSUPPORTED_VMENTRY_CTRL (0)
+#define EVMCS1_UNSUPPORTED_VMFUNC (VMX_VMFUNC_EPTP_SWITCHING)
+
+struct evmcs_field {
+       u16 offset;
+       u16 clean_field;
+};
+
+extern const struct evmcs_field vmcs_field_to_evmcs_1[];
+extern const unsigned int nr_evmcs_1_fields;
+
+static __always_inline int evmcs_field_offset(unsigned long field,
+                                             u16 *clean_field)
+{
+       unsigned int index = ROL16(field, 6);
+       const struct evmcs_field *evmcs_field;
+
+       if (unlikely(index >= nr_evmcs_1_fields))
+               return -ENOENT;
+
+       evmcs_field = &vmcs_field_to_evmcs_1[index];
+
+       /*
+        * Use offset=0 to detect holes in eVMCS. This offset belongs to
+        * 'revision_id' but this field has no encoding and is supposed to
+        * be accessed directly.
+        */
+       if (unlikely(!evmcs_field->offset))
+               return -ENOENT;
+
+       if (clean_field)
+               *clean_field = evmcs_field->clean_field;
+
+       return evmcs_field->offset;
+}
+
+static inline u64 evmcs_read_any(struct hv_enlightened_vmcs *evmcs,
+                                unsigned long field, u16 offset)
+{
+       /*
+        * vmcs12_read_any() doesn't care whether the supplied structure
+        * is 'struct vmcs12' or 'struct hv_enlightened_vmcs' as it takes
+        * the exact offset of the required field, use it for convenience
+        * here.
+        */
+       return vmcs12_read_any((void *)evmcs, field, offset);
+}
+
+#if IS_ENABLED(CONFIG_HYPERV)
+
+static __always_inline int get_evmcs_offset(unsigned long field,
+                                           u16 *clean_field)
+{
+       int offset = evmcs_field_offset(field, clean_field);
+
+       WARN_ONCE(offset < 0, "KVM: accessing unsupported EVMCS field %lx\n",
+                 field);
+
+       return offset;
+}
+
+static __always_inline void evmcs_write64(unsigned long field, u64 value)
+{
+       u16 clean_field;
+       int offset = get_evmcs_offset(field, &clean_field);
+
+       if (offset < 0)
+               return;
+
+       *(u64 *)((char *)current_evmcs + offset) = value;
+
+       current_evmcs->hv_clean_fields &= ~clean_field;
+}
+
+static inline void evmcs_write32(unsigned long field, u32 value)
+{
+       u16 clean_field;
+       int offset = get_evmcs_offset(field, &clean_field);
+
+       if (offset < 0)
+               return;
+
+       *(u32 *)((char *)current_evmcs + offset) = value;
+       current_evmcs->hv_clean_fields &= ~clean_field;
+}
+
+static inline void evmcs_write16(unsigned long field, u16 value)
+{
+       u16 clean_field;
+       int offset = get_evmcs_offset(field, &clean_field);
+
+       if (offset < 0)
+               return;
+
+       *(u16 *)((char *)current_evmcs + offset) = value;
+       current_evmcs->hv_clean_fields &= ~clean_field;
+}
+
+static inline u64 evmcs_read64(unsigned long field)
+{
+       int offset = get_evmcs_offset(field, NULL);
+
+       if (offset < 0)
+               return 0;
+
+       return *(u64 *)((char *)current_evmcs + offset);
+}
+
+static inline u32 evmcs_read32(unsigned long field)
+{
+       int offset = get_evmcs_offset(field, NULL);
+
+       if (offset < 0)
+               return 0;
+
+       return *(u32 *)((char *)current_evmcs + offset);
+}
+
+static inline u16 evmcs_read16(unsigned long field)
+{
+       int offset = get_evmcs_offset(field, NULL);
+
+       if (offset < 0)
+               return 0;
+
+       return *(u16 *)((char *)current_evmcs + offset);
+}
+
+static inline void evmcs_touch_msr_bitmap(void)
+{
+       if (unlikely(!current_evmcs))
+               return;
+
+       if (current_evmcs->hv_enlightenments_control.msr_bitmap)
+               current_evmcs->hv_clean_fields &=
+                       ~HV_VMX_ENLIGHTENED_CLEAN_FIELD_MSR_BITMAP;
+}
+
+static inline void evmcs_load(u64 phys_addr)
+{
+       struct hv_vp_assist_page *vp_ap =
+               hv_get_vp_assist_page(smp_processor_id());
+
+       if (current_evmcs->hv_enlightenments_control.nested_flush_hypercall)
+               vp_ap->nested_control.features.directhypercall = 1;
+       vp_ap->current_nested_vmcs = phys_addr;
+       vp_ap->enlighten_vmentry = 1;
+}
+
+#else /* !IS_ENABLED(CONFIG_HYPERV) */
+static __always_inline void evmcs_write64(unsigned long field, u64 value) {}
+static inline void evmcs_write32(unsigned long field, u32 value) {}
+static inline void evmcs_write16(unsigned long field, u16 value) {}
+static inline u64 evmcs_read64(unsigned long field) { return 0; }
+static inline u32 evmcs_read32(unsigned long field) { return 0; }
+static inline u16 evmcs_read16(unsigned long field) { return 0; }
+static inline void evmcs_load(u64 phys_addr) {}
+static inline void evmcs_touch_msr_bitmap(void) {}
+#endif /* IS_ENABLED(CONFIG_HYPERV) */
+
+#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,
+       EVMPTRLD_VMFAIL,
+       EVMPTRLD_ERROR,
+};
+
+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);
+void nested_evmcs_filter_control_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 *pdata);
+int nested_evmcs_check_controls(struct vmcs12 *vmcs12);
+
+#endif /* __KVM_X86_VMX_HYPERV_H */
index 7924dea9367813a79edc287676b2304a5f78144b..048b2c3e3b3fc93f4c9c6c97ef9b11d85460a568 100644 (file)
@@ -7,7 +7,6 @@
 #include <asm/mmu_context.h>
 
 #include "cpuid.h"
-#include "evmcs.h"
 #include "hyperv.h"
 #include "mmu.h"
 #include "nested.h"
index 5806ab88851e45b99368611b50f074eed1a231df..cea8c07f5229869146659954817d432a88daa645 100644 (file)
@@ -51,7 +51,6 @@
 
 #include "capabilities.h"
 #include "cpuid.h"
-#include "evmcs.h"
 #include "hyperv.h"
 #include "kvm_onhyperv.h"
 #include "irq.h"
index ec268df83ed67988f76a007ad65e9d77aa5d7a3f..f6f23c7397dc54d03c9c76e1f0bd2d0afff92795 100644 (file)
@@ -6,7 +6,7 @@
 
 #include <asm/vmx.h>
 
-#include "evmcs.h"
+#include "hyperv.h"
 #include "vmcs.h"
 #include "../x86.h"