Commit bf8179a0 authored by Nadav Har'El's avatar Nadav Har'El Committed by Avi Kivity
Browse files

KVM: nVMX: Move control field setup to functions 



Move some of the control field setup to common functions. These functions will
also be needed for running L2 guests - L0's desires (expressed in these
functions) will be appropriately merged with L1's desires.

Signed-off-by: default avatarNadav Har'El <nyh@il.ibm.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent a3a8ff8e

arch/x86/kvm/vmx.c

+47 −33
Original line number Diff line number Diff line
@@ -3433,29 +3433,17 @@ static void vmx_set_constant_host_state(void) 
	}

}



/*

 * Sets up the vmcs for emulated real mode.

 */

static int vmx_vcpu_setup(struct vcpu_vmx *vmx)

static void set_cr4_guest_host_mask(struct vcpu_vmx *vmx)

{

	unsigned long a;

	int i;

	u32 exec_control;



	/* I/O */

	vmcs_write64(IO_BITMAP_A, __pa(vmx_io_bitmap_a));

	vmcs_write64(IO_BITMAP_B, __pa(vmx_io_bitmap_b));



	if (cpu_has_vmx_msr_bitmap())

		vmcs_write64(MSR_BITMAP, __pa(vmx_msr_bitmap_legacy));



	vmcs_write64(VMCS_LINK_POINTER, -1ull); /* 22.3.1.5 */



	/* Control */

	vmcs_write32(PIN_BASED_VM_EXEC_CONTROL,

		vmcs_config.pin_based_exec_ctrl);

	vmx->vcpu.arch.cr4_guest_owned_bits = KVM_CR4_GUEST_OWNED_BITS;

	if (enable_ept)

		vmx->vcpu.arch.cr4_guest_owned_bits |= X86_CR4_PGE;

	vmcs_writel(CR4_GUEST_HOST_MASK, ~vmx->vcpu.arch.cr4_guest_owned_bits);

}



	exec_control = vmcs_config.cpu_based_exec_ctrl;

static u32 vmx_exec_control(struct vcpu_vmx *vmx)

{

	u32 exec_control = vmcs_config.cpu_based_exec_ctrl;

	if (!vm_need_tpr_shadow(vmx->vcpu.kvm)) {

		exec_control &= ~CPU_BASED_TPR_SHADOW;

#ifdef CONFIG_X86_64
@@ -3467,13 +3455,14 @@ static int vmx_vcpu_setup(struct vcpu_vmx *vmx) 
		exec_control |= CPU_BASED_CR3_STORE_EXITING |

				CPU_BASED_CR3_LOAD_EXITING  |

				CPU_BASED_INVLPG_EXITING;

	vmcs_write32(CPU_BASED_VM_EXEC_CONTROL, exec_control);

	return exec_control;

}



	if (cpu_has_secondary_exec_ctrls()) {

		exec_control = vmcs_config.cpu_based_2nd_exec_ctrl;

static u32 vmx_secondary_exec_control(struct vcpu_vmx *vmx)

{

	u32 exec_control = vmcs_config.cpu_based_2nd_exec_ctrl;

	if (!vm_need_virtualize_apic_accesses(vmx->vcpu.kvm))

			exec_control &=

				~SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES;

		exec_control &= ~SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES;

	if (vmx->vpid == 0)

		exec_control &= ~SECONDARY_EXEC_ENABLE_VPID;

	if (!enable_ept) {
@@ -3484,7 +3473,35 @@ static int vmx_vcpu_setup(struct vcpu_vmx *vmx) 
		exec_control &= ~SECONDARY_EXEC_UNRESTRICTED_GUEST;

	if (!ple_gap)

		exec_control &= ~SECONDARY_EXEC_PAUSE_LOOP_EXITING;

		vmcs_write32(SECONDARY_VM_EXEC_CONTROL, exec_control);

	return exec_control;

}



/*

 * Sets up the vmcs for emulated real mode.

 */

static int vmx_vcpu_setup(struct vcpu_vmx *vmx)

{

	unsigned long a;

	int i;



	/* I/O */

	vmcs_write64(IO_BITMAP_A, __pa(vmx_io_bitmap_a));

	vmcs_write64(IO_BITMAP_B, __pa(vmx_io_bitmap_b));



	if (cpu_has_vmx_msr_bitmap())

		vmcs_write64(MSR_BITMAP, __pa(vmx_msr_bitmap_legacy));



	vmcs_write64(VMCS_LINK_POINTER, -1ull); /* 22.3.1.5 */



	/* Control */

	vmcs_write32(PIN_BASED_VM_EXEC_CONTROL,

		vmcs_config.pin_based_exec_ctrl);



	vmcs_write32(CPU_BASED_VM_EXEC_CONTROL, vmx_exec_control(vmx));



	if (cpu_has_secondary_exec_ctrls()) {

		vmcs_write32(SECONDARY_VM_EXEC_CONTROL,

				vmx_secondary_exec_control(vmx));

	}



	if (ple_gap) {
@@ -3547,10 +3564,7 @@ static int vmx_vcpu_setup(struct vcpu_vmx *vmx) 
	vmcs_write32(VM_ENTRY_CONTROLS, vmcs_config.vmentry_ctrl);



	vmcs_writel(CR0_GUEST_HOST_MASK, ~0UL);

	vmx->vcpu.arch.cr4_guest_owned_bits = KVM_CR4_GUEST_OWNED_BITS;

	if (enable_ept)

		vmx->vcpu.arch.cr4_guest_owned_bits |= X86_CR4_PGE;

	vmcs_writel(CR4_GUEST_HOST_MASK, ~vmx->vcpu.arch.cr4_guest_owned_bits);

	set_cr4_guest_host_mask(vmx);



	kvm_write_tsc(&vmx->vcpu, 0);