diff mbox series

[v2,23/29] KVM: VMX: Create a stack frame in vCPU-run

Message ID	20190124175845.15926-24-sean.j.christopherson@intel.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <kvm-owner@kernel.org> From: Sean Christopherson <sean.j.christopherson@intel.com> To: Paolo Bonzini <pbonzini@redhat.com>, =?utf-8?b?UmFkaW0gS3LEjW3DocWZ?= <rkrcmar@redhat.com> Cc: kvm@vger.kernel.org, Jim Mattson <jmattson@google.com>, Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Subject: [PATCH v2 23/29] KVM: VMX: Create a stack frame in vCPU-run Date: Thu, 24 Jan 2019 09:58:40 -0800 Message-Id: <20190124175845.15926-24-sean.j.christopherson@intel.com> In-Reply-To: <20190124175845.15926-1-sean.j.christopherson@intel.com> References: <20190124175845.15926-1-sean.j.christopherson@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: kvm-owner@vger.kernel.org Precedence: bulk
Series	KVM: VMX: Move vCPU-run to proper asm sub-routine \| expand [v2,00/29] KVM: VMX: Move vCPU-run to proper asm sub-routine [v2,01/29] KVM: VMX: Compare only a single byte for VMCS' "launched" in vCPU-run [v2,02/29] KVM: nVMX: Check a single byte for VMCS "launched" in nested early checks [v2,03/29] KVM: VMX: Modify only RSP when creating a placeholder for guest's RCX [v2,04/29] KVM: VMX: Save RSI to an unused output in the vCPU-run asm blob [v2,05/29] KVM: VMX: Manually load RDX in vCPU-run asm blob [v2,06/29] KVM: VMX: Let the compiler save/load RDX during vCPU-run [v2,07/29] KVM: nVMX: Remove a rogue "rax" clobber from nested_vmx_check_vmentry_hw() [v2,08/29] KVM: nVMX: Drop STACK_FRAME_NON_STANDARD from nested_vmx_check_vmentry_hw() [v2,09/29] KVM: nVMX: Explicitly reference the scratch reg in nested early checks [v2,10/29] KVM: nVMX: Capture VM-Fail to a local var in nested_vmx_check_vmentry_hw() [v2,11/29] KVM: nVMX: Capture VM-Fail via CC_{SET,OUT} in nested early checks [v2,12/29] KVM: nVMX: Reference vmx->loaded_vmcs->launched directly [v2,13/29] KVM: nVMX: Let the compiler select the reg for holding HOST_RSP [v2,14/29] KVM: nVMX: Cache host_rsp on a per-VMCS basis [v2,15/29] KVM: VMX: Load/save guest CR2 via C code in __vmx_vcpu_run() [v2,16/29] KVM: VMX: Update VMCS.HOST_RSP via helper C function [v2,17/29] KVM: VMX: Pass "launched" directly to the vCPU-run asm blob [v2,18/29] KVM: VMX: Invert the ordering of saving guest/host scratch reg at VM-Enter [v2,19/29] KVM: VMX: Don't save guest registers after VM-Fail [v2,20/29] KVM: VMX: Use vcpu->arch.regs directly when saving/loading guest state [v2,21/29] KVM: x86: Explicitly #define the VCPU_REGS_* indices [v2,22/29] KVM: VMX: Use #defines in place of immediates in VM-Enter inline asm [v2,23/29] KVM: VMX: Create a stack frame in vCPU-run [v2,24/29] KVM: VMX: Move vCPU-run code to a proper assembly routine [v2,25/29] KVM: VMX: Fold __vmx_vcpu_run() back into vmx_vcpu_run() [v2,26/29] KVM: VMX: Rename ____vmx_vcpu_run() to __vmx_vcpu_run() [v2,27/29] KVM: VMX: Use RAX as the scratch register during vCPU-run [v2,28/29] KVM: VMX: Make the vCPU-run asm routine callable from C [v2,29/29] KVM: VMX: Reorder clearing of registers in the vCPU-run assembly flow

Commit Message

Sean Christopherson Jan. 24, 2019, 5:58 p.m. UTC

...in preparation for moving to a proper assembly sub-routnine.
vCPU-run isn't a leaf function since it calls vmx_update_host_rsp()
and vmx_vmenter().  And since we need to save/restore RBP anyways,
unconditionally creating the frame costs a single MOV, i.e. don't
bother keying off CONFIG_FRAME_POINTER or using FRAME_BEGIN, etc...

Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
---
 arch/x86/kvm/vmx/vmx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index 2c9a596bca74..49fe2ca548be 100644
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -6406,8 +6406,8 @@  static void __vmx_vcpu_run(struct kvm_vcpu *vcpu, struct vcpu_vmx *vmx)
 		write_cr2(vcpu->arch.cr2);
 
 	asm(
-		/* Store host registers */
 		"push %%" _ASM_BP " \n\t"
+		"mov %%" _ASM_SP ", %%" _ASM_BP " \n\t"
 		"push %%" _ASM_ARG2 " \n\t"
 
 		/* Adjust RSP to account for the CALL to vmx_vmenter(). */