Commit cb1d474b authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: VMX: Move VMCS definitions to dedicated file 



This isn't intended to be a pure reflection of hardware, e.g. struct
loaded_vmcs and struct vmcs_host_state are KVM-defined constructs.
Similar to capabilities.h, this is a standalone file to avoid circular
dependencies between yet-to-be-created vmx.h and nested.h files.

Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 2c4fd91d

arch/x86/kvm/vmx/vmcs.h

0 → 100644
+132 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef __KVM_X86_VMX_VMCS_H

#define __KVM_X86_VMX_VMCS_H



#include <linux/list.h>

#include <linux/ktime.h>



#include <asm/vmx.h>



#include "capabilities.h"



struct vmcs_hdr {

	u32 revision_id:31;

	u32 shadow_vmcs:1;

};



struct vmcs {

	struct vmcs_hdr hdr;

	u32 abort;

	char data[0];

};



/*

 * vmcs_host_state tracks registers that are loaded from the VMCS on VMEXIT

 * and whose values change infrequently, but are not constant.  I.e. this is

 * used as a write-through cache of the corresponding VMCS fields.

 */

struct vmcs_host_state {

	unsigned long cr3;	/* May not match real cr3 */

	unsigned long cr4;	/* May not match real cr4 */

	unsigned long gs_base;

	unsigned long fs_base;



	u16           fs_sel, gs_sel, ldt_sel;

#ifdef CONFIG_X86_64

	u16           ds_sel, es_sel;

#endif

};



/*

 * Track a VMCS that may be loaded on a certain CPU. If it is (cpu!=-1), also

 * remember whether it was VMLAUNCHed, and maintain a linked list of all VMCSs

 * loaded on this CPU (so we can clear them if the CPU goes down).

 */

struct loaded_vmcs {

	struct vmcs *vmcs;

	struct vmcs *shadow_vmcs;

	int cpu;

	bool launched;

	bool nmi_known_unmasked;

	bool hv_timer_armed;

	/* Support for vnmi-less CPUs */

	int soft_vnmi_blocked;

	ktime_t entry_time;

	s64 vnmi_blocked_time;

	unsigned long *msr_bitmap;

	struct list_head loaded_vmcss_on_cpu_link;

	struct vmcs_host_state host_state;

};



static inline bool is_exception_n(u32 intr_info, u8 vector)

{

	return (intr_info & (INTR_INFO_INTR_TYPE_MASK | INTR_INFO_VECTOR_MASK |

			     INTR_INFO_VALID_MASK)) ==

		(INTR_TYPE_HARD_EXCEPTION | vector | INTR_INFO_VALID_MASK);

}



static inline bool is_debug(u32 intr_info)

{

	return is_exception_n(intr_info, DB_VECTOR);

}



static inline bool is_breakpoint(u32 intr_info)

{

	return is_exception_n(intr_info, BP_VECTOR);

}



static inline bool is_page_fault(u32 intr_info)

{

	return is_exception_n(intr_info, PF_VECTOR);

}



static inline bool is_invalid_opcode(u32 intr_info)

{

	return is_exception_n(intr_info, UD_VECTOR);

}



static inline bool is_gp_fault(u32 intr_info)

{

	return is_exception_n(intr_info, GP_VECTOR);

}



static inline bool is_machine_check(u32 intr_info)

{

	return (intr_info & (INTR_INFO_INTR_TYPE_MASK | INTR_INFO_VECTOR_MASK |

			     INTR_INFO_VALID_MASK)) ==

		(INTR_TYPE_HARD_EXCEPTION | MC_VECTOR | INTR_INFO_VALID_MASK);

}



/* Undocumented: icebp/int1 */

static inline bool is_icebp(u32 intr_info)

{

	return (intr_info & (INTR_INFO_INTR_TYPE_MASK | INTR_INFO_VALID_MASK))

		== (INTR_TYPE_PRIV_SW_EXCEPTION | INTR_INFO_VALID_MASK);

}



static inline bool is_nmi(u32 intr_info)

{

	return (intr_info & (INTR_INFO_INTR_TYPE_MASK | INTR_INFO_VALID_MASK))

		== (INTR_TYPE_NMI_INTR | INTR_INFO_VALID_MASK);

}



enum vmcs_field_width {

	VMCS_FIELD_WIDTH_U16 = 0,

	VMCS_FIELD_WIDTH_U64 = 1,

	VMCS_FIELD_WIDTH_U32 = 2,

	VMCS_FIELD_WIDTH_NATURAL_WIDTH = 3

};



static inline int vmcs_field_width(unsigned long field)

{

	if (0x1 & field)	/* the *_HIGH fields are all 32 bit */

		return VMCS_FIELD_WIDTH_U32;

	return (field >> 13) & 0x3;

}



static inline int vmcs_field_readonly(unsigned long field)

{

	return (((field >> 10) & 0x3) == 1);

}



#endif /* __KVM_X86_VMX_VMCS_H */

arch/x86/kvm/vmx/vmx.c

+3 −122
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ 
#include "mmu.h"

#include "pmu.h"

#include "trace.h"

#include "vmcs.h"

#include "x86.h"



#define __ex(x) __kvm_handle_fault_on_reboot(x)
@@ -361,57 +362,6 @@ struct kvm_vmx { 
	spinlock_t ept_pointer_lock;

};



#define NR_AUTOLOAD_MSRS 8



struct vmcs_hdr {

	u32 revision_id:31;

	u32 shadow_vmcs:1;

};



struct vmcs {

	struct vmcs_hdr hdr;

	u32 abort;

	char data[0];

};



/*

 * vmcs_host_state tracks registers that are loaded from the VMCS on VMEXIT

 * and whose values change infrequently, but are not constant.  I.e. this is

 * used as a write-through cache of the corresponding VMCS fields.

 */

struct vmcs_host_state {

	unsigned long cr3;	/* May not match real cr3 */

	unsigned long cr4;	/* May not match real cr4 */

	unsigned long gs_base;

	unsigned long fs_base;



	u16           fs_sel, gs_sel, ldt_sel;

#ifdef CONFIG_X86_64

	u16           ds_sel, es_sel;

#endif

};



/*

 * Track a VMCS that may be loaded on a certain CPU. If it is (cpu!=-1), also

 * remember whether it was VMLAUNCHed, and maintain a linked list of all VMCSs

 * loaded on this CPU (so we can clear them if the CPU goes down).

 */

struct loaded_vmcs {

	struct vmcs *vmcs;

	struct vmcs *shadow_vmcs;

	int cpu;

	bool launched;

	bool nmi_known_unmasked;

	bool hv_timer_armed;

	/* Support for vnmi-less CPUs */

	int soft_vnmi_blocked;

	ktime_t entry_time;

	s64 vnmi_blocked_time;

	unsigned long *msr_bitmap;

	struct list_head loaded_vmcss_on_cpu_link;

	struct vmcs_host_state host_state;

};



struct shared_msr_entry {

	unsigned index;

	u64 data;
@@ -940,6 +890,8 @@ static inline int pi_test_sn(struct pi_desc *pi_desc) 
			(unsigned long *)&pi_desc->control);

}



#define NR_AUTOLOAD_MSRS 8



struct vmx_msrs {

	unsigned int		nr;

	struct vmx_msr_entry	val[NR_AUTOLOAD_MSRS];
@@ -1588,52 +1540,6 @@ static int nested_enable_evmcs(struct kvm_vcpu *vcpu, 
	return 0;

}



static inline bool is_exception_n(u32 intr_info, u8 vector)

{

	return (intr_info & (INTR_INFO_INTR_TYPE_MASK | INTR_INFO_VECTOR_MASK |

			     INTR_INFO_VALID_MASK)) ==

		(INTR_TYPE_HARD_EXCEPTION | vector | INTR_INFO_VALID_MASK);

}



static inline bool is_debug(u32 intr_info)

{

	return is_exception_n(intr_info, DB_VECTOR);

}



static inline bool is_breakpoint(u32 intr_info)

{

	return is_exception_n(intr_info, BP_VECTOR);

}



static inline bool is_page_fault(u32 intr_info)

{

	return is_exception_n(intr_info, PF_VECTOR);

}



static inline bool is_invalid_opcode(u32 intr_info)

{

	return is_exception_n(intr_info, UD_VECTOR);

}



static inline bool is_gp_fault(u32 intr_info)

{

	return is_exception_n(intr_info, GP_VECTOR);

}



static inline bool is_machine_check(u32 intr_info)

{

	return (intr_info & (INTR_INFO_INTR_TYPE_MASK | INTR_INFO_VECTOR_MASK |

			     INTR_INFO_VALID_MASK)) ==

		(INTR_TYPE_HARD_EXCEPTION | MC_VECTOR | INTR_INFO_VALID_MASK);

}



/* Undocumented: icebp/int1 */

static inline bool is_icebp(u32 intr_info)

{

	return (intr_info & (INTR_INFO_INTR_TYPE_MASK | INTR_INFO_VALID_MASK))

		== (INTR_TYPE_PRIV_SW_EXCEPTION | INTR_INFO_VALID_MASK);

}



/*

 * Comment's format: document - errata name - stepping - processor name.

 * Refer from
@@ -1814,12 +1720,6 @@ static inline bool nested_cpu_has_save_preemption_timer(struct vmcs12 *vmcs12) 
	    VM_EXIT_SAVE_VMX_PREEMPTION_TIMER;

}



static inline bool is_nmi(u32 intr_info)

{

	return (intr_info & (INTR_INFO_INTR_TYPE_MASK | INTR_INFO_VALID_MASK))

		== (INTR_TYPE_NMI_INTR | INTR_INFO_VALID_MASK);

}



static void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 exit_reason,

			      u32 exit_intr_info,

			      unsigned long exit_qualification);
@@ -4542,25 +4442,6 @@ static void free_kvm_area(void) 
	}

}



enum vmcs_field_width {

	VMCS_FIELD_WIDTH_U16 = 0,

	VMCS_FIELD_WIDTH_U64 = 1,

	VMCS_FIELD_WIDTH_U32 = 2,

	VMCS_FIELD_WIDTH_NATURAL_WIDTH = 3

};



static inline int vmcs_field_width(unsigned long field)

{

	if (0x1 & field)	/* the *_HIGH fields are all 32 bit */

		return VMCS_FIELD_WIDTH_U32;

	return (field >> 13) & 0x3 ;

}



static inline int vmcs_field_readonly(unsigned long field)

{

	return (((field >> 10) & 0x3) == 1);

}



static void init_vmcs_shadow_fields(void)

{

	int i, j;

CRA Git | Maintained and supported by SUSTech CRA and CCSE