Skip to content

Commit 27ca867

Browse files
committed
KVM: x86: Stop compiling vmenter.S with OBJECT_FILES_NON_STANDARD
Stop compiling vmenter.S with OBJECT_FILES_NON_STANDARD to skip objtool's stack validation now that __svm_vcpu_run() and __svm_sev_es_vcpu_run() create stack frames (though the former's effectiveness is dubious). Note, due to a quirk in how OBJECT_FILES_NON_STANDARD was handled by the build system prior to commit bf48d9b ("kbuild: change tool coverage variables to take the path relative to $(obj)"), vmx/vmenter.S got lumped in with svm/vmenter.S. __vmx_vcpu_run() already plays nice with frame pointers, i.e. it was collateral damage when commit 7f4b5cd ("kvm: Disable objtool frame pointer checking for vmenter.S") added the OBJECT_FILES_NON_STANDARD hack-a-fix. Link: https://lore.kernel.org/all/20240217055504.2059803-1-masahiroy@kernel.org Reviewed-by: Tom Lendacky <thomas.lendacky@amd.com> Link: https://lore.kernel.org/r/20240223204233.3337324-9-seanjc@google.com Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent 4367a75 commit 27ca867

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

arch/x86/kvm/Makefile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@
33
ccflags-y += -I $(srctree)/arch/x86/kvm
44
ccflags-$(CONFIG_KVM_WERROR) += -Werror
55

6-
ifeq ($(CONFIG_FRAME_POINTER),y)
7-
OBJECT_FILES_NON_STANDARD_vmx/vmenter.o := y
8-
OBJECT_FILES_NON_STANDARD_svm/vmenter.o := y
9-
endif
10-
116
include $(srctree)/virt/kvm/Makefile.kvm
127

138
kvm-y += x86.o emulate.o i8259.o irq.o lapic.o \

0 commit comments

Comments
 (0)