Commit 2092007a authored by Josh Poimboeuf's avatar Josh Poimboeuf Committed by Peter Zijlstra
Browse files

objtool/klp: Only enable --checksum when needed 



With CONFIG_KLP_BUILD enabled, checksums are only needed during a
klp-build run.  There's no need to enable them for normal kernel builds.

This also has the benefit of softening the xxhash dependency.

Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@kernel.org>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: default avatarMichael Kelley <mhklinux@outlook.com>
Link: https://patch.msgid.link/edbb1ca215e4926e02edb493b68b9d6d063e902f.1762990139.git.jpoimboe@kernel.org
parent ee0b48fa

arch/x86/boot/startup/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ $(patsubst %.o,$(obj)/%.o,$(lib-y)): OBJECT_FILES_NON_STANDARD := y 
# relocations, even if other objtool actions are being deferred.

#

$(pi-objs): objtool-enabled	= 1

$(pi-objs): objtool-args	= $(if $(delay-objtool),,$(objtool-args-y)) --noabs

$(pi-objs): objtool-args	= $(if $(delay-objtool),--dry-run,$(objtool-args-y)) --noabs



#

# Confine the startup code by prefixing all symbols with __pi_ (for position

scripts/Makefile.lib

+0 −1
Original line number Diff line number Diff line
@@ -173,7 +173,6 @@ ifdef CONFIG_OBJTOOL 


objtool := $(objtree)/tools/objtool/objtool



objtool-args-$(CONFIG_KLP_BUILD)			+= --checksum

objtool-args-$(CONFIG_HAVE_JUMP_LABEL_HACK)		+= --hacks=jump_label

objtool-args-$(CONFIG_HAVE_NOINSTR_HACK)		+= --hacks=noinstr

objtool-args-$(CONFIG_MITIGATION_CALL_DEPTH_TRACKING)	+= --hacks=skylake

scripts/livepatch/klp-build

+4 −0
Original line number Diff line number Diff line
@@ -489,8 +489,11 @@ clean_kernel() { 


build_kernel() {

	local log="$TMP_DIR/build.log"

	local objtool_args=()

	local cmd=()



	objtool_args=("--checksum")



	cmd=("make")



	# When a patch to a kernel module references a newly created unexported
@@ -513,6 +516,7 @@ build_kernel() { 
	cmd+=("$VERBOSE")

	cmd+=("-j$JOBS")

	cmd+=("KCFLAGS=-ffunction-sections -fdata-sections")

	cmd+=("OBJTOOL_ARGS=${objtool_args[*]}")

	cmd+=("vmlinux")

	cmd+=("modules")