From patchwork Mon Nov 26 20:20:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Mattson X-Patchwork-Id: 10699121 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6789313AD for ; Mon, 26 Nov 2018 20:20:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 578BA2A0C2 for ; Mon, 26 Nov 2018 20:20:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 559E92A178; Mon, 26 Nov 2018 20:20:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 22B7E2A350 for ; Mon, 26 Nov 2018 20:20:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726926AbeK0HPv (ORCPT ); Tue, 27 Nov 2018 02:15:51 -0500 Received: from mail-pf1-f202.google.com ([209.85.210.202]:52791 "EHLO mail-pf1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726888AbeK0HPv (ORCPT ); Tue, 27 Nov 2018 02:15:51 -0500 Received: by mail-pf1-f202.google.com with SMTP id d6-v6so12182111pfn.19 for ; Mon, 26 Nov 2018 12:20:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=4aDiTO5IvwsZQ8xJt97OZ1+7/reXqVX4fSNPFW09i/w=; b=LKNR7OVEru2ZNMIebatCBXCUnZMNxYEehw6PI72CabWPMnMX5bea90gPI4Z3EI4kvA MV3sOOW3u4HOI5AQMTw5fKlpP30W3+A9AbrLyf3aYPdBrKUL72pRln4pQFeN4rzEJRpv ry5daUAMmyh+Z19PgNHM51Fm0rkD0W5N3cYxyka/jBkBh6Me/4EE/h2ut5J++OAsxdK4 YmHpREle7IHa5M0Vl1vQKnSsKbhZxG/Qq4OQ404AbZSYq3CvVjdcbFo1aWOolreuMw21 aCAD0/l+Eo/PVNjJHjUydHqr8tmy8bL9IqEYkua8oPynScPcggpV9x2Q5ML6eUvcXh62 fc1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=4aDiTO5IvwsZQ8xJt97OZ1+7/reXqVX4fSNPFW09i/w=; b=Rr+Usraj4cQFzMd3GAQ9+XD69Bm64v3fJbWL3IuwTVMYOKuwuMuvCDPxVPqFEG1wBH iV5Y71yQH8TeeXgH61zAIQAb6bioVHDAby+jpPzFDyLSmEKYM/1U5+PJpKQS+oNXV87A RCVU3ISLEkg6IY8jgOOzhmaFAfYIotabsTrORkEGUtv4ievCdAfPbVP6WIY5mMatYFKb 4jDtMrFrWBA9CnEjjpvoSj50tgHlzPhQS/bzbgbaDTieiHof7W6CWue9lKS3R2kLqrr6 uDSwJkIKB6tzSXyQSnytIFTdWcWm4mDst5nxGaUUhSmSxbiQMptUSfH0Zs/bAzGNzXs0 KQRw== X-Gm-Message-State: AA+aEWZrBdoDk3rN+IKoy5SjLj8ecghKC94kjoF7N1jCUjKXl7pdSk0o RHMthDcOlAv+qjDbYI3gnvbUdBE4tjtBlS64sr1IF1y4gFCcyHGx1GaVpXhvIqcg4QsLPYpDTu0 wQdUL6o08VcNzWlpsVKT7aXCdnfAgXuasiXe3FABfrBV5QwVdUsg2GFPTcZAk/z0= X-Google-Smtp-Source: AFSGD/VVzl1sUwv0N4nRu5VT/y0UdTiizPM4XE5gAk+SXAAXGbWNznXMwwmv2beTFtFCDMoxs/hVGx7294y2Ew== X-Received: by 2002:a17:902:70c9:: with SMTP id l9mr10153588plt.86.1543263634618; Mon, 26 Nov 2018 12:20:34 -0800 (PST) Date: Mon, 26 Nov 2018 12:20:23 -0800 In-Reply-To: <20181126190310.GH25719@linux.intel.com> Message-Id: <20181126202023.14652-1-jmattson@google.com> Mime-Version: 1.0 References: <20181126190310.GH25719@linux.intel.com> X-Mailer: git-send-email 2.20.0.rc0.387.gc7a69e6b6c-goog Subject: [PATCH v2] kvm: vmx: Rename vmx_instruction_info to vm_exit_instruction_info From: Jim Mattson To: kvm@vger.kernel.org Cc: Sean Christopherson , Jim Mattson , Peter Shier Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Many years ago, Intel documented field 440EH of the VMCS as the "VMX instruction-information field" (e.g. Intel document C97063-002 from April 2005), and kvm followed suit. However, this field is no longer applicable only to VMX instruction intercepts. It now provides instruction-information for string PIO VM-exits, descriptor table VM-exits, RDRAND VM-exits, and RDSEED VM-exits. At some point, the SDM began referring to this field as the "VM-exit instruction-information field." Since this field name is not yet exposed as part of a userspace API, let's rename it to match the current SDM. Signed-off-by: Jim Mattson Reviewed-by: Peter Shier --- arch/x86/include/asm/hyperv-tlfs.h | 2 +- arch/x86/include/asm/vmx.h | 2 +- arch/x86/kvm/vmx.c | 105 +++++++++++++++-------------- arch/x86/kvm/vmx_evmcs.h | 2 +- 4 files changed, 57 insertions(+), 54 deletions(-) diff --git a/arch/x86/include/asm/hyperv-tlfs.h b/arch/x86/include/asm/hyperv-tlfs.h index ebfed56976d2..65ac1c570b6f 100644 --- a/arch/x86/include/asm/hyperv-tlfs.h +++ b/arch/x86/include/asm/hyperv-tlfs.h @@ -663,7 +663,7 @@ struct hv_enlightened_vmcs { u32 idt_vectoring_info_field; u32 idt_vectoring_error_code; u32 vm_exit_instruction_len; - u32 vmx_instruction_info; + u32 vm_exit_instruction_info; u64 exit_qualification; u64 exit_io_instruction_ecx; diff --git a/arch/x86/include/asm/vmx.h b/arch/x86/include/asm/vmx.h index 898c443eeed1..c146ccc07b81 100644 --- a/arch/x86/include/asm/vmx.h +++ b/arch/x86/include/asm/vmx.h @@ -272,7 +272,7 @@ enum vmcs_field { IDT_VECTORING_INFO_FIELD = 0x00004408, IDT_VECTORING_ERROR_CODE = 0x0000440a, VM_EXIT_INSTRUCTION_LEN = 0x0000440c, - VMX_INSTRUCTION_INFO = 0x0000440e, + VM_EXIT_INSTRUCTION_INFO = 0x0000440e, GUEST_ES_LIMIT = 0x00004800, GUEST_CS_LIMIT = 0x00004802, GUEST_SS_LIMIT = 0x00004804, diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index d78fe0abf9ac..465ed1a9617e 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -554,7 +554,7 @@ struct __packed vmcs12 { u32 idt_vectoring_info_field; u32 idt_vectoring_error_code; u32 vm_exit_instruction_len; - u32 vmx_instruction_info; + u32 vm_exit_instruction_info; u32 guest_es_limit; u32 guest_cs_limit; u32 guest_ss_limit; @@ -711,7 +711,7 @@ static inline void vmx_check_vmcs12_offsets(void) { CHECK_OFFSET(idt_vectoring_info_field, 824); CHECK_OFFSET(idt_vectoring_error_code, 828); CHECK_OFFSET(vm_exit_instruction_len, 832); - CHECK_OFFSET(vmx_instruction_info, 836); + CHECK_OFFSET(vm_exit_instruction_info, 836); CHECK_OFFSET(guest_es_limit, 840); CHECK_OFFSET(guest_cs_limit, 844); CHECK_OFFSET(guest_ss_limit, 848); @@ -1194,7 +1194,7 @@ static const unsigned short vmcs_field_to_offset_table[] = { FIELD(IDT_VECTORING_INFO_FIELD, idt_vectoring_info_field), FIELD(IDT_VECTORING_ERROR_CODE, idt_vectoring_error_code), FIELD(VM_EXIT_INSTRUCTION_LEN, vm_exit_instruction_len), - FIELD(VMX_INSTRUCTION_INFO, vmx_instruction_info), + FIELD(VM_EXIT_INSTRUCTION_INFO, vm_exit_instruction_info), FIELD(GUEST_ES_LIMIT, guest_es_limit), FIELD(GUEST_CS_LIMIT, guest_cs_limit), FIELD(GUEST_SS_LIMIT, guest_ss_limit), @@ -8176,29 +8176,31 @@ static enum hrtimer_restart vmx_preemption_timer_fn(struct hrtimer *timer) * #UD or #GP. */ static int get_vmx_mem_address(struct kvm_vcpu *vcpu, - unsigned long exit_qualification, - u32 vmx_instruction_info, bool wr, gva_t *ret) + unsigned long exit_qualification, + u32 instr_info, bool wr, gva_t *ret) { gva_t off; bool exn; struct kvm_segment s; /* - * According to Vol. 3B, "Information for VM Exits Due to Instruction - * Execution", on an exit, vmx_instruction_info holds most of the - * addressing components of the operand. Only the displacement part - * is put in exit_qualification (see 3B, "Basic VM-Exit Information"). - * For how an actual address is calculated from all these components, - * refer to Vol. 1, "Operand Addressing". - */ - int scaling = vmx_instruction_info & 3; - int addr_size = (vmx_instruction_info >> 7) & 7; - bool is_reg = vmx_instruction_info & (1u << 10); - int seg_reg = (vmx_instruction_info >> 15) & 7; - int index_reg = (vmx_instruction_info >> 18) & 0xf; - bool index_is_valid = !(vmx_instruction_info & (1u << 22)); - int base_reg = (vmx_instruction_info >> 23) & 0xf; - bool base_is_valid = !(vmx_instruction_info & (1u << 27)); + * According to Vol. 3B, "Information for VM Exits Due to + * Instruction Execution", on an exit, the VM-exit + * instruction-information field holds most of the addressing + * components of the operand. Only the displacement part is + * put in the exit qualification field (see 3B, "Basic VM-Exit + * Information"). For how an actual address is calculated + * from all these components, refer to Vol. 1, "Operand + * Addressing". + */ + int scaling = instr_info & 3; + int addr_size = (instr_info >> 7) & 7; + bool is_reg = instr_info & (1u << 10); + int seg_reg = (instr_info >> 15) & 7; + int index_reg = (instr_info >> 18) & 0xf; + bool index_is_valid = !(instr_info & (1u << 22)); + int base_reg = (instr_info >> 23) & 0xf; + bool base_is_valid = !(instr_info & (1u << 27)); if (is_reg) { kvm_queue_exception(vcpu, UD_VECTOR); @@ -8272,7 +8274,7 @@ static int nested_vmx_get_vmptr(struct kvm_vcpu *vcpu, gpa_t *vmpointer) struct x86_exception e; if (get_vmx_mem_address(vcpu, vmcs_readl(EXIT_QUALIFICATION), - vmcs_read32(VMX_INSTRUCTION_INFO), false, &gva)) + vmcs_read32(VM_EXIT_INSTRUCTION_INFO), false, &gva)) return 1; if (kvm_read_guest_virt(vcpu, gva, vmpointer, sizeof(*vmpointer), &e)) { @@ -8880,7 +8882,7 @@ static int copy_enlightened_to_vmcs12(struct vcpu_vmx *vmx) * vmcs12->idt_vectoring_info_field = evmcs->idt_vectoring_info_field; * vmcs12->idt_vectoring_error_code = evmcs->idt_vectoring_error_code; * vmcs12->vm_exit_instruction_len = evmcs->vm_exit_instruction_len; - * vmcs12->vmx_instruction_info = evmcs->vmx_instruction_info; + * vmcs12->vm_exit_instruction_info = evmcs->vm_exit_instruction_info; * vmcs12->exit_qualification = evmcs->exit_qualification; * vmcs12->guest_linear_address = evmcs->guest_linear_address; * @@ -9037,7 +9039,7 @@ static int copy_vmcs12_to_enlightened(struct vcpu_vmx *vmx) evmcs->idt_vectoring_info_field = vmcs12->idt_vectoring_info_field; evmcs->idt_vectoring_error_code = vmcs12->idt_vectoring_error_code; evmcs->vm_exit_instruction_len = vmcs12->vm_exit_instruction_len; - evmcs->vmx_instruction_info = vmcs12->vmx_instruction_info; + evmcs->vm_exit_instruction_info = vmcs12->vm_exit_instruction_info; evmcs->exit_qualification = vmcs12->exit_qualification; @@ -9139,7 +9141,7 @@ static int handle_vmread(struct kvm_vcpu *vcpu) unsigned long field; u64 field_value; unsigned long exit_qualification = vmcs_readl(EXIT_QUALIFICATION); - u32 vmx_instruction_info = vmcs_read32(VMX_INSTRUCTION_INFO); + u32 instr_info = vmcs_read32(VM_EXIT_INSTRUCTION_INFO); gva_t gva = 0; struct vmcs12 *vmcs12; @@ -9162,7 +9164,7 @@ static int handle_vmread(struct kvm_vcpu *vcpu) } /* Decode instruction info and find the field to read */ - field = kvm_register_readl(vcpu, (((vmx_instruction_info) >> 28) & 0xf)); + field = kvm_register_readl(vcpu, (((instr_info) >> 28) & 0xf)); /* Read the field, zero-extended to a u64 field_value */ if (vmcs12_read_any(vmcs12, field, &field_value) < 0) return nested_vmx_failValid(vcpu, @@ -9173,12 +9175,12 @@ static int handle_vmread(struct kvm_vcpu *vcpu) * Note that the number of bits actually copied is 32 or 64 depending * on the guest's mode (32 or 64 bit), not on the given field's length. */ - if (vmx_instruction_info & (1u << 10)) { - kvm_register_writel(vcpu, (((vmx_instruction_info) >> 3) & 0xf), - field_value); + if (instr_info & (1u << 10)) { + kvm_register_writel(vcpu, (((instr_info) >> 3) & 0xf), + field_value); } else { if (get_vmx_mem_address(vcpu, exit_qualification, - vmx_instruction_info, true, &gva)) + instr_info, true, &gva)) return 1; /* _system ok, nested_vmx_check_permission has verified cpl=0 */ kvm_write_guest_virt_system(vcpu, gva, &field_value, @@ -9195,7 +9197,7 @@ static int handle_vmwrite(struct kvm_vcpu *vcpu) gva_t gva; struct vcpu_vmx *vmx = to_vmx(vcpu); unsigned long exit_qualification = vmcs_readl(EXIT_QUALIFICATION); - u32 vmx_instruction_info = vmcs_read32(VMX_INSTRUCTION_INFO); + u32 instr_info = vmcs_read32(VM_EXIT_INSTRUCTION_INFO); /* The value to write might be 32 or 64 bits, depending on L1's long * mode, and eventually we need to write that into a field of several @@ -9213,12 +9215,12 @@ static int handle_vmwrite(struct kvm_vcpu *vcpu) if (vmx->nested.current_vmptr == -1ull) return nested_vmx_failInvalid(vcpu); - if (vmx_instruction_info & (1u << 10)) + if (instr_info & (1u << 10)) field_value = kvm_register_readl(vcpu, - (((vmx_instruction_info) >> 3) & 0xf)); + (((instr_info) >> 3) & 0xf)); else { if (get_vmx_mem_address(vcpu, exit_qualification, - vmx_instruction_info, false, &gva)) + instr_info, false, &gva)) return 1; if (kvm_read_guest_virt(vcpu, gva, &field_value, (is_64_bit_mode(vcpu) ? 8 : 4), &e)) { @@ -9228,7 +9230,7 @@ static int handle_vmwrite(struct kvm_vcpu *vcpu) } - field = kvm_register_readl(vcpu, (((vmx_instruction_info) >> 28) & 0xf)); + field = kvm_register_readl(vcpu, (((instr_info) >> 28) & 0xf)); /* * If the vCPU supports "VMWRITE to any supported field in the * VMCS," then the "read-only" fields are actually read/write. @@ -9440,7 +9442,7 @@ static int nested_vmx_handle_enlightened_vmptrld(struct kvm_vcpu *vcpu, static int handle_vmptrst(struct kvm_vcpu *vcpu) { unsigned long exit_qual = vmcs_readl(EXIT_QUALIFICATION); - u32 instr_info = vmcs_read32(VMX_INSTRUCTION_INFO); + u32 instr_info = vmcs_read32(VM_EXIT_INSTRUCTION_INFO); gpa_t current_vmptr = to_vmx(vcpu)->nested.current_vmptr; struct x86_exception e; gva_t gva; @@ -9466,7 +9468,7 @@ static int handle_vmptrst(struct kvm_vcpu *vcpu) static int handle_invept(struct kvm_vcpu *vcpu) { struct vcpu_vmx *vmx = to_vmx(vcpu); - u32 vmx_instruction_info, types; + u32 instr_info, types; unsigned long type; gva_t gva; struct x86_exception e; @@ -9484,8 +9486,8 @@ static int handle_invept(struct kvm_vcpu *vcpu) if (!nested_vmx_check_permission(vcpu)) return 1; - vmx_instruction_info = vmcs_read32(VMX_INSTRUCTION_INFO); - type = kvm_register_readl(vcpu, (vmx_instruction_info >> 28) & 0xf); + instr_info = vmcs_read32(VM_EXIT_INSTRUCTION_INFO); + type = kvm_register_readl(vcpu, (instr_info >> 28) & 0xf); types = (vmx->nested.msrs.ept_caps >> VMX_EPT_EXTENT_SHIFT) & 6; @@ -9497,7 +9499,7 @@ static int handle_invept(struct kvm_vcpu *vcpu) * operand is read even if it isn't needed (e.g., for type==global) */ if (get_vmx_mem_address(vcpu, vmcs_readl(EXIT_QUALIFICATION), - vmx_instruction_info, false, &gva)) + instr_info, false, &gva)) return 1; if (kvm_read_guest_virt(vcpu, gva, &operand, sizeof(operand), &e)) { kvm_inject_page_fault(vcpu, &e); @@ -9532,7 +9534,7 @@ static u16 nested_get_vpid02(struct kvm_vcpu *vcpu) static int handle_invvpid(struct kvm_vcpu *vcpu) { struct vcpu_vmx *vmx = to_vmx(vcpu); - u32 vmx_instruction_info; + u32 instr_info; unsigned long type, types; gva_t gva; struct x86_exception e; @@ -9552,8 +9554,8 @@ static int handle_invvpid(struct kvm_vcpu *vcpu) if (!nested_vmx_check_permission(vcpu)) return 1; - vmx_instruction_info = vmcs_read32(VMX_INSTRUCTION_INFO); - type = kvm_register_readl(vcpu, (vmx_instruction_info >> 28) & 0xf); + instr_info = vmcs_read32(VM_EXIT_INSTRUCTION_INFO); + type = kvm_register_readl(vcpu, (instr_info >> 28) & 0xf); types = (vmx->nested.msrs.vpid_caps & VMX_VPID_EXTENT_SUPPORTED_MASK) >> 8; @@ -9566,7 +9568,7 @@ static int handle_invvpid(struct kvm_vcpu *vcpu) * operand is read even if it isn't needed (e.g., for type==global) */ if (get_vmx_mem_address(vcpu, vmcs_readl(EXIT_QUALIFICATION), - vmx_instruction_info, false, &gva)) + instr_info, false, &gva)) return 1; if (kvm_read_guest_virt(vcpu, gva, &operand, sizeof(operand), &e)) { kvm_inject_page_fault(vcpu, &e); @@ -9609,7 +9611,7 @@ static int handle_invvpid(struct kvm_vcpu *vcpu) static int handle_invpcid(struct kvm_vcpu *vcpu) { - u32 vmx_instruction_info; + u32 instr_info; unsigned long type; bool pcid_enabled; gva_t gva; @@ -9626,8 +9628,8 @@ static int handle_invpcid(struct kvm_vcpu *vcpu) return 1; } - vmx_instruction_info = vmcs_read32(VMX_INSTRUCTION_INFO); - type = kvm_register_readl(vcpu, (vmx_instruction_info >> 28) & 0xf); + instr_info = vmcs_read32(VM_EXIT_INSTRUCTION_INFO); + type = kvm_register_readl(vcpu, (instr_info >> 28) & 0xf); if (type > 3) { kvm_inject_gp(vcpu, 0); @@ -9638,7 +9640,7 @@ static int handle_invpcid(struct kvm_vcpu *vcpu) * is read even if it isn't needed (e.g., for type==all) */ if (get_vmx_mem_address(vcpu, vmcs_readl(EXIT_QUALIFICATION), - vmx_instruction_info, false, &gva)) + instr_info, false, &gva)) return 1; if (kvm_read_guest_virt(vcpu, gva, &operand, sizeof(operand), &e)) { @@ -10098,7 +10100,7 @@ static bool nested_vmx_exit_handled_cr(struct kvm_vcpu *vcpu, static bool nested_vmx_exit_handled_vmcs_access(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12, gpa_t bitmap) { - u32 vmx_instruction_info; + u32 instr_info; unsigned long field; u8 b; @@ -10106,8 +10108,8 @@ static bool nested_vmx_exit_handled_vmcs_access(struct kvm_vcpu *vcpu, return true; /* Decode instruction info and find the field to access */ - vmx_instruction_info = vmcs_read32(VMX_INSTRUCTION_INFO); - field = kvm_register_read(vcpu, (((vmx_instruction_info) >> 28) & 0xf)); + instr_info = vmcs_read32(VM_EXIT_INSTRUCTION_INFO); + field = kvm_register_read(vcpu, (((instr_info) >> 28) & 0xf)); /* Out-of-range fields always cause a VM exit from L2 to L1 */ if (field >> 15) @@ -13877,7 +13879,8 @@ static void prepare_vmcs12(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12, vmcs12->idt_vectoring_info_field = 0; vmcs12->vm_exit_instruction_len = vmcs_read32(VM_EXIT_INSTRUCTION_LEN); - vmcs12->vmx_instruction_info = vmcs_read32(VMX_INSTRUCTION_INFO); + vmcs12->vm_exit_instruction_info = + vmcs_read32(VM_EXIT_INSTRUCTION_INFO); if (!(vmcs12->vm_exit_reason & VMX_EXIT_REASONS_FAILED_VMENTRY)) { vmcs12->launch_state = 1; diff --git a/arch/x86/kvm/vmx_evmcs.h b/arch/x86/kvm/vmx_evmcs.h index 210a884090ad..cf5d8cb22df4 100644 --- a/arch/x86/kvm/vmx_evmcs.h +++ b/arch/x86/kvm/vmx_evmcs.h @@ -247,7 +247,7 @@ static const struct evmcs_field vmcs_field_to_evmcs_1[] = { 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, + EVMCS1_FIELD(VM_EXIT_INSTRUCTION_INFO, vm_exit_instruction_info, HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE), /* No mask defined in the spec (not used) */