Skip to content

Commit e7ad84d

Browse files
vittyvksean-jc
vittyvk
authored and
sean-jc
committed
KVM: VMX: Split off hyperv_evmcs.{ch}
Some Enlightened VMCS related code is needed both by Hyper-V on KVM and KVM on Hyper-V. As a preparation to making Hyper-V emulation optional, create dedicated 'hyperv_evmcs.{ch}' files which are used by both. No functional change intended. Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com> Tested-by: Jeremi Piotrowski <jpiotrowski@linux.microsoft.com> Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com> Link: https://lore.kernel.org/r/20231205103630.1391318-7-vkuznets@redhat.com Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent 0659262 commit e7ad84d

7 files changed

Lines changed: 486 additions & 472 deletions

File tree

‎arch/x86/kvm/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ kvm-$(CONFIG_KVM_XEN) += xen.o
2323
kvm-$(CONFIG_KVM_SMM) += smm.o
2424

2525
kvm-intel-y += vmx/vmx.o vmx/vmenter.o vmx/pmu_intel.o vmx/vmcs12.o \
26-
vmx/hyperv.o vmx/nested.o vmx/posted_intr.o
26+
vmx/hyperv.o vmx/hyperv_evmcs.o vmx/nested.o vmx/posted_intr.o
2727
kvm-intel-$(CONFIG_X86_SGX_KVM) += vmx/sgx.o
2828

2929
ifdef CONFIG_HYPERV

‎arch/x86/kvm/vmx/hyperv.c‎

Lines changed: 0 additions & 308 deletions
Original file line numberDiff line numberDiff line change
@@ -13,314 +13,6 @@
1313

1414
#define CC KVM_NESTED_VMENTER_CONSISTENCY_CHECK
1515

16-
#define EVMCS1_OFFSET(x) offsetof(struct hv_enlightened_vmcs, x)
17-
#define EVMCS1_FIELD(number, name, clean_field)[ROL16(number, 6)] = \
18-
{EVMCS1_OFFSET(name), clean_field}
19-
20-
const struct evmcs_field vmcs_field_to_evmcs_1[] = {
21-
/* 64 bit rw */
22-
EVMCS1_FIELD(GUEST_RIP, guest_rip,
23-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE),
24-
EVMCS1_FIELD(GUEST_RSP, guest_rsp,
25-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_BASIC),
26-
EVMCS1_FIELD(GUEST_RFLAGS, guest_rflags,
27-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_BASIC),
28-
EVMCS1_FIELD(HOST_IA32_PAT, host_ia32_pat,
29-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
30-
EVMCS1_FIELD(HOST_IA32_EFER, host_ia32_efer,
31-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
32-
EVMCS1_FIELD(HOST_IA32_PERF_GLOBAL_CTRL, host_ia32_perf_global_ctrl,
33-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
34-
EVMCS1_FIELD(HOST_CR0, host_cr0,
35-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
36-
EVMCS1_FIELD(HOST_CR3, host_cr3,
37-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
38-
EVMCS1_FIELD(HOST_CR4, host_cr4,
39-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
40-
EVMCS1_FIELD(HOST_IA32_SYSENTER_ESP, host_ia32_sysenter_esp,
41-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
42-
EVMCS1_FIELD(HOST_IA32_SYSENTER_EIP, host_ia32_sysenter_eip,
43-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
44-
EVMCS1_FIELD(HOST_RIP, host_rip,
45-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
46-
EVMCS1_FIELD(IO_BITMAP_A, io_bitmap_a,
47-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_IO_BITMAP),
48-
EVMCS1_FIELD(IO_BITMAP_B, io_bitmap_b,
49-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_IO_BITMAP),
50-
EVMCS1_FIELD(MSR_BITMAP, msr_bitmap,
51-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_MSR_BITMAP),
52-
EVMCS1_FIELD(GUEST_ES_BASE, guest_es_base,
53-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
54-
EVMCS1_FIELD(GUEST_CS_BASE, guest_cs_base,
55-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
56-
EVMCS1_FIELD(GUEST_SS_BASE, guest_ss_base,
57-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
58-
EVMCS1_FIELD(GUEST_DS_BASE, guest_ds_base,
59-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
60-
EVMCS1_FIELD(GUEST_FS_BASE, guest_fs_base,
61-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
62-
EVMCS1_FIELD(GUEST_GS_BASE, guest_gs_base,
63-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
64-
EVMCS1_FIELD(GUEST_LDTR_BASE, guest_ldtr_base,
65-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
66-
EVMCS1_FIELD(GUEST_TR_BASE, guest_tr_base,
67-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
68-
EVMCS1_FIELD(GUEST_GDTR_BASE, guest_gdtr_base,
69-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
70-
EVMCS1_FIELD(GUEST_IDTR_BASE, guest_idtr_base,
71-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
72-
EVMCS1_FIELD(TSC_OFFSET, tsc_offset,
73-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_GRP2),
74-
EVMCS1_FIELD(VIRTUAL_APIC_PAGE_ADDR, virtual_apic_page_addr,
75-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_GRP2),
76-
EVMCS1_FIELD(VMCS_LINK_POINTER, vmcs_link_pointer,
77-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1),
78-
EVMCS1_FIELD(GUEST_IA32_DEBUGCTL, guest_ia32_debugctl,
79-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1),
80-
EVMCS1_FIELD(GUEST_IA32_PAT, guest_ia32_pat,
81-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1),
82-
EVMCS1_FIELD(GUEST_IA32_EFER, guest_ia32_efer,
83-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1),
84-
EVMCS1_FIELD(GUEST_IA32_PERF_GLOBAL_CTRL, guest_ia32_perf_global_ctrl,
85-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1),
86-
EVMCS1_FIELD(GUEST_PDPTR0, guest_pdptr0,
87-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1),
88-
EVMCS1_FIELD(GUEST_PDPTR1, guest_pdptr1,
89-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1),
90-
EVMCS1_FIELD(GUEST_PDPTR2, guest_pdptr2,
91-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1),
92-
EVMCS1_FIELD(GUEST_PDPTR3, guest_pdptr3,
93-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1),
94-
EVMCS1_FIELD(GUEST_PENDING_DBG_EXCEPTIONS, guest_pending_dbg_exceptions,
95-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1),
96-
EVMCS1_FIELD(GUEST_SYSENTER_ESP, guest_sysenter_esp,
97-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1),
98-
EVMCS1_FIELD(GUEST_SYSENTER_EIP, guest_sysenter_eip,
99-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1),
100-
EVMCS1_FIELD(CR0_GUEST_HOST_MASK, cr0_guest_host_mask,
101-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_CRDR),
102-
EVMCS1_FIELD(CR4_GUEST_HOST_MASK, cr4_guest_host_mask,
103-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_CRDR),
104-
EVMCS1_FIELD(CR0_READ_SHADOW, cr0_read_shadow,
105-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_CRDR),
106-
EVMCS1_FIELD(CR4_READ_SHADOW, cr4_read_shadow,
107-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_CRDR),
108-
EVMCS1_FIELD(GUEST_CR0, guest_cr0,
109-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_CRDR),
110-
EVMCS1_FIELD(GUEST_CR3, guest_cr3,
111-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_CRDR),
112-
EVMCS1_FIELD(GUEST_CR4, guest_cr4,
113-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_CRDR),
114-
EVMCS1_FIELD(GUEST_DR7, guest_dr7,
115-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_CRDR),
116-
EVMCS1_FIELD(HOST_FS_BASE, host_fs_base,
117-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_POINTER),
118-
EVMCS1_FIELD(HOST_GS_BASE, host_gs_base,
119-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_POINTER),
120-
EVMCS1_FIELD(HOST_TR_BASE, host_tr_base,
121-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_POINTER),
122-
EVMCS1_FIELD(HOST_GDTR_BASE, host_gdtr_base,
123-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_POINTER),
124-
EVMCS1_FIELD(HOST_IDTR_BASE, host_idtr_base,
125-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_POINTER),
126-
EVMCS1_FIELD(HOST_RSP, host_rsp,
127-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_POINTER),
128-
EVMCS1_FIELD(EPT_POINTER, ept_pointer,
129-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_XLAT),
130-
EVMCS1_FIELD(GUEST_BNDCFGS, guest_bndcfgs,
131-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1),
132-
EVMCS1_FIELD(XSS_EXIT_BITMAP, xss_exit_bitmap,
133-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_GRP2),
134-
EVMCS1_FIELD(ENCLS_EXITING_BITMAP, encls_exiting_bitmap,
135-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_GRP2),
136-
EVMCS1_FIELD(TSC_MULTIPLIER, tsc_multiplier,
137-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_GRP2),
138-
/*
139-
* Not used by KVM:
140-
*
141-
* EVMCS1_FIELD(0x00006828, guest_ia32_s_cet,
142-
* HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1),
143-
* EVMCS1_FIELD(0x0000682A, guest_ssp,
144-
* HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_BASIC),
145-
* EVMCS1_FIELD(0x0000682C, guest_ia32_int_ssp_table_addr,
146-
* HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1),
147-
* EVMCS1_FIELD(0x00002816, guest_ia32_lbr_ctl,
148-
* HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1),
149-
* EVMCS1_FIELD(0x00006C18, host_ia32_s_cet,
150-
* HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
151-
* EVMCS1_FIELD(0x00006C1A, host_ssp,
152-
* HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
153-
* EVMCS1_FIELD(0x00006C1C, host_ia32_int_ssp_table_addr,
154-
* HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
155-
*/
156-
157-
/* 64 bit read only */
158-
EVMCS1_FIELD(GUEST_PHYSICAL_ADDRESS, guest_physical_address,
159-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE),
160-
EVMCS1_FIELD(EXIT_QUALIFICATION, exit_qualification,
161-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE),
162-
/*
163-
* Not defined in KVM:
164-
*
165-
* EVMCS1_FIELD(0x00006402, exit_io_instruction_ecx,
166-
* HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE);
167-
* EVMCS1_FIELD(0x00006404, exit_io_instruction_esi,
168-
* HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE);
169-
* EVMCS1_FIELD(0x00006406, exit_io_instruction_esi,
170-
* HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE);
171-
* EVMCS1_FIELD(0x00006408, exit_io_instruction_eip,
172-
* HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE);
173-
*/
174-
EVMCS1_FIELD(GUEST_LINEAR_ADDRESS, guest_linear_address,
175-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE),
176-
177-
/*
178-
* No mask defined in the spec as Hyper-V doesn't currently support
179-
* these. Future proof by resetting the whole clean field mask on
180-
* access.
181-
*/
182-
EVMCS1_FIELD(VM_EXIT_MSR_STORE_ADDR, vm_exit_msr_store_addr,
183-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_ALL),
184-
EVMCS1_FIELD(VM_EXIT_MSR_LOAD_ADDR, vm_exit_msr_load_addr,
185-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_ALL),
186-
EVMCS1_FIELD(VM_ENTRY_MSR_LOAD_ADDR, vm_entry_msr_load_addr,
187-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_ALL),
188-
189-
/* 32 bit rw */
190-
EVMCS1_FIELD(TPR_THRESHOLD, tpr_threshold,
191-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE),
192-
EVMCS1_FIELD(GUEST_INTERRUPTIBILITY_INFO, guest_interruptibility_info,
193-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_BASIC),
194-
EVMCS1_FIELD(CPU_BASED_VM_EXEC_CONTROL, cpu_based_vm_exec_control,
195-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_PROC),
196-
EVMCS1_FIELD(EXCEPTION_BITMAP, exception_bitmap,
197-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_EXCPN),
198-
EVMCS1_FIELD(VM_ENTRY_CONTROLS, vm_entry_controls,
199-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_ENTRY),
200-
EVMCS1_FIELD(VM_ENTRY_INTR_INFO_FIELD, vm_entry_intr_info_field,
201-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_EVENT),
202-
EVMCS1_FIELD(VM_ENTRY_EXCEPTION_ERROR_CODE,
203-
vm_entry_exception_error_code,
204-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_EVENT),
205-
EVMCS1_FIELD(VM_ENTRY_INSTRUCTION_LEN, vm_entry_instruction_len,
206-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_EVENT),
207-
EVMCS1_FIELD(HOST_IA32_SYSENTER_CS, host_ia32_sysenter_cs,
208-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
209-
EVMCS1_FIELD(PIN_BASED_VM_EXEC_CONTROL, pin_based_vm_exec_control,
210-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_GRP1),
211-
EVMCS1_FIELD(VM_EXIT_CONTROLS, vm_exit_controls,
212-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_GRP1),
213-
EVMCS1_FIELD(SECONDARY_VM_EXEC_CONTROL, secondary_vm_exec_control,
214-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_GRP1),
215-
EVMCS1_FIELD(GUEST_ES_LIMIT, guest_es_limit,
216-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
217-
EVMCS1_FIELD(GUEST_CS_LIMIT, guest_cs_limit,
218-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
219-
EVMCS1_FIELD(GUEST_SS_LIMIT, guest_ss_limit,
220-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
221-
EVMCS1_FIELD(GUEST_DS_LIMIT, guest_ds_limit,
222-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
223-
EVMCS1_FIELD(GUEST_FS_LIMIT, guest_fs_limit,
224-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
225-
EVMCS1_FIELD(GUEST_GS_LIMIT, guest_gs_limit,
226-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
227-
EVMCS1_FIELD(GUEST_LDTR_LIMIT, guest_ldtr_limit,
228-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
229-
EVMCS1_FIELD(GUEST_TR_LIMIT, guest_tr_limit,
230-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
231-
EVMCS1_FIELD(GUEST_GDTR_LIMIT, guest_gdtr_limit,
232-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
233-
EVMCS1_FIELD(GUEST_IDTR_LIMIT, guest_idtr_limit,
234-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
235-
EVMCS1_FIELD(GUEST_ES_AR_BYTES, guest_es_ar_bytes,
236-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
237-
EVMCS1_FIELD(GUEST_CS_AR_BYTES, guest_cs_ar_bytes,
238-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
239-
EVMCS1_FIELD(GUEST_SS_AR_BYTES, guest_ss_ar_bytes,
240-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
241-
EVMCS1_FIELD(GUEST_DS_AR_BYTES, guest_ds_ar_bytes,
242-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
243-
EVMCS1_FIELD(GUEST_FS_AR_BYTES, guest_fs_ar_bytes,
244-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
245-
EVMCS1_FIELD(GUEST_GS_AR_BYTES, guest_gs_ar_bytes,
246-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
247-
EVMCS1_FIELD(GUEST_LDTR_AR_BYTES, guest_ldtr_ar_bytes,
248-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
249-
EVMCS1_FIELD(GUEST_TR_AR_BYTES, guest_tr_ar_bytes,
250-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
251-
EVMCS1_FIELD(GUEST_ACTIVITY_STATE, guest_activity_state,
252-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1),
253-
EVMCS1_FIELD(GUEST_SYSENTER_CS, guest_sysenter_cs,
254-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1),
255-
256-
/* 32 bit read only */
257-
EVMCS1_FIELD(VM_INSTRUCTION_ERROR, vm_instruction_error,
258-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE),
259-
EVMCS1_FIELD(VM_EXIT_REASON, vm_exit_reason,
260-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE),
261-
EVMCS1_FIELD(VM_EXIT_INTR_INFO, vm_exit_intr_info,
262-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE),
263-
EVMCS1_FIELD(VM_EXIT_INTR_ERROR_CODE, vm_exit_intr_error_code,
264-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE),
265-
EVMCS1_FIELD(IDT_VECTORING_INFO_FIELD, idt_vectoring_info_field,
266-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE),
267-
EVMCS1_FIELD(IDT_VECTORING_ERROR_CODE, idt_vectoring_error_code,
268-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE),
269-
EVMCS1_FIELD(VM_EXIT_INSTRUCTION_LEN, vm_exit_instruction_len,
270-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE),
271-
EVMCS1_FIELD(VMX_INSTRUCTION_INFO, vmx_instruction_info,
272-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE),
273-
274-
/* No mask defined in the spec (not used) */
275-
EVMCS1_FIELD(PAGE_FAULT_ERROR_CODE_MASK, page_fault_error_code_mask,
276-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_ALL),
277-
EVMCS1_FIELD(PAGE_FAULT_ERROR_CODE_MATCH, page_fault_error_code_match,
278-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_ALL),
279-
EVMCS1_FIELD(CR3_TARGET_COUNT, cr3_target_count,
280-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_ALL),
281-
EVMCS1_FIELD(VM_EXIT_MSR_STORE_COUNT, vm_exit_msr_store_count,
282-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_ALL),
283-
EVMCS1_FIELD(VM_EXIT_MSR_LOAD_COUNT, vm_exit_msr_load_count,
284-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_ALL),
285-
EVMCS1_FIELD(VM_ENTRY_MSR_LOAD_COUNT, vm_entry_msr_load_count,
286-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_ALL),
287-
288-
/* 16 bit rw */
289-
EVMCS1_FIELD(HOST_ES_SELECTOR, host_es_selector,
290-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
291-
EVMCS1_FIELD(HOST_CS_SELECTOR, host_cs_selector,
292-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
293-
EVMCS1_FIELD(HOST_SS_SELECTOR, host_ss_selector,
294-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
295-
EVMCS1_FIELD(HOST_DS_SELECTOR, host_ds_selector,
296-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
297-
EVMCS1_FIELD(HOST_FS_SELECTOR, host_fs_selector,
298-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
299-
EVMCS1_FIELD(HOST_GS_SELECTOR, host_gs_selector,
300-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
301-
EVMCS1_FIELD(HOST_TR_SELECTOR, host_tr_selector,
302-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1),
303-
EVMCS1_FIELD(GUEST_ES_SELECTOR, guest_es_selector,
304-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
305-
EVMCS1_FIELD(GUEST_CS_SELECTOR, guest_cs_selector,
306-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
307-
EVMCS1_FIELD(GUEST_SS_SELECTOR, guest_ss_selector,
308-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
309-
EVMCS1_FIELD(GUEST_DS_SELECTOR, guest_ds_selector,
310-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
311-
EVMCS1_FIELD(GUEST_FS_SELECTOR, guest_fs_selector,
312-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
313-
EVMCS1_FIELD(GUEST_GS_SELECTOR, guest_gs_selector,
314-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
315-
EVMCS1_FIELD(GUEST_LDTR_SELECTOR, guest_ldtr_selector,
316-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
317-
EVMCS1_FIELD(GUEST_TR_SELECTOR, guest_tr_selector,
318-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2),
319-
EVMCS1_FIELD(VIRTUAL_PROCESSOR_ID, virtual_processor_id,
320-
HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_XLAT),
321-
};
322-
const unsigned int nr_evmcs_1_fields = ARRAY_SIZE(vmcs_field_to_evmcs_1);
323-
32416
u64 nested_get_evmptr(struct kvm_vcpu *vcpu)
32517
{
32618
struct kvm_vcpu_hv *hv_vcpu = to_hv_vcpu(vcpu);

0 commit comments

Comments
 (0)