[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20190115064459.70513-1-cai@lca.pw>
Date: Tue, 15 Jan 2019 01:44:59 -0500
From: Qian Cai <cai@....pw>
To: pbonzini@...hat.com, rkrcmar@...hat.com
Cc: sean.j.christopherson@...el.com, tglx@...utronix.de,
mingo@...hat.com, bp@...en8.de, hpa@...or.com, x86@...nel.org,
kvm@...r.kernel.org, linux-kernel@...r.kernel.org,
Qian Cai <cai@....pw>
Subject: [PATCH] kvm: add proper frame pointer logic for vmx
compilation warning since v5.0-rc1,
arch/x86/kvm/vmx/vmx.o: warning: objtool: vmx_vcpu_run.part.17()+0x3171:
call without frame pointer save/setup
Fixes: 453eafbe65f (KVM: VMX: Move VM-Enter + VM-Exit handling to
non-inline sub-routines)
Signed-off-by: Qian Cai <cai@....pw>
---
arch/x86/kvm/vmx/vmenter.S | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kvm/vmx/vmenter.S b/arch/x86/kvm/vmx/vmenter.S
index bcef2c7e9bc4..874dd3030dee 100644
--- a/arch/x86/kvm/vmx/vmenter.S
+++ b/arch/x86/kvm/vmx/vmenter.S
@@ -1,6 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0 */
#include <linux/linkage.h>
#include <asm/asm.h>
+#include <asm/frame.h>
.text
@@ -20,18 +21,22 @@
*/
ENTRY(vmx_vmenter)
/* EFLAGS.ZF is set if VMCS.LAUNCHED == 0 */
+ FRAME_BEGIN
je 2f
1: vmresume
+ FRAME_END
ret
2: vmlaunch
+ FRAME_END
ret
3: cmpb $0, kvm_rebooting
jne 4f
call kvm_spurious_fault
-4: ret
+4: FRAME_END
+ ret
.pushsection .fixup, "ax"
5: jmp 3b
--
2.17.2 (Apple Git-113)
Powered by blists - more mailing lists