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

KVM: VMX: Hide VMCS control calculators in vmx.c 



Now that nested VMX pulls KVM's desired VMCS controls from vmcs01 instead
of re-calculating on the fly, bury the helpers that do the calcluations
in vmx.c.

No functional change intended.

Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Message-Id: <20210810171952.2758100-5-seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent b6247686

arch/x86/kvm/vmx/vmx.c

+27 −3
Original line number Diff line number Diff line
@@ -4095,7 +4095,7 @@ void set_cr4_guest_host_mask(struct vcpu_vmx *vmx) 
	vmcs_writel(CR4_GUEST_HOST_MASK, ~vcpu->arch.cr4_guest_owned_bits);

}



u32 vmx_pin_based_exec_ctrl(struct vcpu_vmx *vmx)

static u32 vmx_pin_based_exec_ctrl(struct vcpu_vmx *vmx)

{

	u32 pin_based_exec_ctrl = vmcs_config.pin_based_exec_ctrl;
@@ -4111,6 +4111,30 @@ u32 vmx_pin_based_exec_ctrl(struct vcpu_vmx *vmx) 
	return pin_based_exec_ctrl;

}



static u32 vmx_vmentry_ctrl(void)

{

	u32 vmentry_ctrl = vmcs_config.vmentry_ctrl;



	if (vmx_pt_mode_is_system())

		vmentry_ctrl &= ~(VM_ENTRY_PT_CONCEAL_PIP |

				  VM_ENTRY_LOAD_IA32_RTIT_CTL);

	/* Loading of EFER and PERF_GLOBAL_CTRL are toggled dynamically */

	return vmentry_ctrl &

		~(VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL | VM_ENTRY_LOAD_IA32_EFER);

}



static u32 vmx_vmexit_ctrl(void)

{

	u32 vmexit_ctrl = vmcs_config.vmexit_ctrl;



	if (vmx_pt_mode_is_system())

		vmexit_ctrl &= ~(VM_EXIT_PT_CONCEAL_PIP |

				 VM_EXIT_CLEAR_IA32_RTIT_CTL);

	/* Loading of EFER and PERF_GLOBAL_CTRL are toggled dynamically */

	return vmexit_ctrl &

		~(VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL | VM_EXIT_LOAD_IA32_EFER);

}



static void vmx_refresh_apicv_exec_ctrl(struct kvm_vcpu *vcpu)

{

	struct vcpu_vmx *vmx = to_vmx(vcpu);
@@ -4130,7 +4154,7 @@ static void vmx_refresh_apicv_exec_ctrl(struct kvm_vcpu *vcpu) 
	vmx_update_msr_bitmap_x2apic(vcpu);

}



u32 vmx_exec_control(struct vcpu_vmx *vmx)

static u32 vmx_exec_control(struct vcpu_vmx *vmx)

{

	u32 exec_control = vmcs_config.cpu_based_exec_ctrl;
@@ -4212,7 +4236,7 @@ vmx_adjust_secondary_exec_control(struct vcpu_vmx *vmx, u32 *exec_control, 
#define vmx_adjust_sec_exec_exiting(vmx, exec_control, lname, uname) \

	vmx_adjust_sec_exec_control(vmx, exec_control, lname, uname, uname##_EXITING, true)



u32 vmx_secondary_exec_control(struct vcpu_vmx *vmx)

static u32 vmx_secondary_exec_control(struct vcpu_vmx *vmx)

{

	struct kvm_vcpu *vcpu = &vmx->vcpu;

arch/x86/kvm/vmx/vmx.h

+0 −26
Original line number Diff line number Diff line
@@ -452,32 +452,6 @@ static inline void vmx_register_cache_reset(struct kvm_vcpu *vcpu) 
	vcpu->arch.regs_dirty = 0;

}



static inline u32 vmx_vmentry_ctrl(void)

{

	u32 vmentry_ctrl = vmcs_config.vmentry_ctrl;

	if (vmx_pt_mode_is_system())

		vmentry_ctrl &= ~(VM_ENTRY_PT_CONCEAL_PIP |

				  VM_ENTRY_LOAD_IA32_RTIT_CTL);

	/* Loading of EFER and PERF_GLOBAL_CTRL are toggled dynamically */

	return vmentry_ctrl &

		~(VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL | VM_ENTRY_LOAD_IA32_EFER);

}



static inline u32 vmx_vmexit_ctrl(void)

{

	u32 vmexit_ctrl = vmcs_config.vmexit_ctrl;

	if (vmx_pt_mode_is_system())

		vmexit_ctrl &= ~(VM_EXIT_PT_CONCEAL_PIP |

				 VM_EXIT_CLEAR_IA32_RTIT_CTL);

	/* Loading of EFER and PERF_GLOBAL_CTRL are toggled dynamically */

	return vmexit_ctrl &

		~(VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL | VM_EXIT_LOAD_IA32_EFER);

}



u32 vmx_exec_control(struct vcpu_vmx *vmx);

u32 vmx_secondary_exec_control(struct vcpu_vmx *vmx);

u32 vmx_pin_based_exec_ctrl(struct vcpu_vmx *vmx);



static inline struct kvm_vmx *to_kvm_vmx(struct kvm *kvm)

{

	return container_of(kvm, struct kvm_vmx, kvm);