Skip to contentSkip to conversation

objtool: xxhash dependency improvements

PATCH Applied Josh Poimboeuf 3 participants 7 messages Nov 12, 2025 – Nov 18, 2025

Subsystems (4)
lore
Share & tools
lore

Josh Poimboeuf

author maintainer
#0 lore raw

cover objtool: xxhash dependency improvements

Set the minimum xxhash version to 0.8, and soften the xxhash dependency a bit so that it's only needed when running klp-build rather than doing a normal kernel build.

For tip/objtool/core.

Josh Poimboeuf (2):
objtool: Set minimum xxhash version to 0.8
objtool/klp: Only enable --checksum when needed

 arch/x86/boot/startup/Makefile | 2 +-
 scripts/Makefile.lib           | 1 -
 scripts/livepatch/klp-build    | 4 ++++
 tools/objtool/Makefile         | 2 +-
 tools/objtool/builtin-check.c  | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)
Signature · 1 line
2.51.1
author maintainer
#1 lore raw

PATCH 1/2 objtool: Set minimum xxhash version to 0.8

XXH3 is only supported starting with xxhash 0.8. Enforce that.

Fixes 0d83da43b1e1 ("objtool/klp: Add --checksum option to generate per-function checksums")
---
 tools/objtool/Makefile        | 2 +-
 tools/objtool/builtin-check.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
tools/objtool/Makefile +1 -1
index 48928c9bebef..021f55b7bd87 100644
@@ -12,7 +12,7 @@ ifeq ($(SRCARCH),loongarch)
 endif
 
 ifeq ($(ARCH_HAS_KLP),y)
-	HAVE_XXHASH = $(shell echo "int main() {}" | \
+	HAVE_XXHASH = $(shell printf "$(pound)include <xxhash.h>\nXXH3_state_t *state;int main() {}" | \
 		      $(HOSTCC) -xc - -o /dev/null -lxxhash 2> /dev/null && echo y || echo n)
 	ifeq ($(HAVE_XXHASH),y)
 		BUILD_KLP	 := y
tools/objtool/builtin-check.c +1 -1
index 1e1ea8396eb3..aab7fa9c7e00 100644
@@ -164,7 +164,7 @@ static bool opts_valid(void)
 
 #ifndef BUILD_KLP
 	if (opts.checksum) {
-		ERROR("--checksum not supported; install xxhash-devel/libxxhash-dev and recompile");
+		ERROR("--checksum not supported; install xxhash-devel/libxxhash-dev (version >= 0.8) and recompile");
 		return false;
 	}
 #endif
Signature · 1 line
2.51.1
author maintainer
#4 lore raw

PATCH 2/2 objtool/klp: Only enable --checksum when needed

In reply to Josh Poimboeuf

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.

---
 arch/x86/boot/startup/Makefile | 2 +-
 scripts/Makefile.lib           | 1 -
 scripts/livepatch/klp-build    | 4 ++++
 3 files changed, 5 insertions(+), 2 deletions(-)
arch/x86/boot/startup/Makefile +1 -1
index e8fdf020b422..5e499cfb29b5 100644
@@ -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
index f4b33919ec37..28a1c08e3b22 100644
@@ -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
index 881e052e7fae..882272120c9e 100755
@@ -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")
 
Signature · 1 line
2.51.1
Reviewed-by Tested-by on v1 1/2
#2 lore raw

RE: [PATCH 1/2] objtool: Set minimum xxhash version to 0.8

In reply to Josh Poimboeuf

From: Josh Poimboeuf <[email protected]> Sent: Wednesday, November 12, 2025 3:33 PM

Quoted 39 lines

XXH3 is only supported starting with xxhash 0.8. Enforce that.

Fixes 0d83da43b1e1 ("objtool/klp: Add --checksum option to generate per-function checksums")
---
 tools/objtool/Makefile        | 2 +-
 tools/objtool/builtin-check.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
tools/objtool/Makefile +1 -1
index 48928c9bebef..021f55b7bd87 100644
@@ -12,7 +12,7 @@ ifeq ($(SRCARCH),loongarch)
 endif
 
 ifeq ($(ARCH_HAS_KLP),y)
-	HAVE_XXHASH = $(shell echo "int main() {}" | \
+	HAVE_XXHASH = $(shell printf "$(pound)include <xxhash.h>\nXXH3_state_t *state;int main() {}" | \
 		      $(HOSTCC) -xc - -o /dev/null -lxxhash 2> /dev/null && echo y || echo n)
 	ifeq ($(HAVE_XXHASH),y)
 		BUILD_KLP	 := y
tools/objtool/builtin-check.c +1 -2
index 1e1ea8396eb3..aab7fa9c7e00 100644
@@ -164,7 +164,7 @@ static bool opts_valid(void)
 
 #ifndef BUILD_KLP
 	if (opts.checksum) {
-		ERROR("--checksum not supported; install xxhash-devel/libxxhash-dev and recompile");
+		ERROR("--checksum not supported; install xxhash-devel/libxxhash-dev (version >= 0.8) and recompile");
 		return false;
 	}
 #endif
--
Quoted 1 line

2.51.1

Tested-by on v1 2/2
#5 lore raw

RE: [PATCH 2/2] objtool/klp: Only enable --checksum when needed

In reply to Josh Poimboeuf

From: Josh Poimboeuf <[email protected]> Sent: Wednesday, November 12, 2025 3:33 PM

Quoted 64 lines

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.

---
 arch/x86/boot/startup/Makefile | 2 +-
 scripts/Makefile.lib           | 1 -
 scripts/livepatch/klp-build    | 4 ++++
 3 files changed, 5 insertions(+), 2 deletions(-)
arch/x86/boot/startup/Makefile +0 -0
index e8fdf020b422..5e499cfb29b5 100644
@@ -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
index f4b33919ec37..28a1c08e3b22 100644
@@ -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 -1
index 881e052e7fae..882272120c9e 100755
@@ -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")
 
--
Quoted 1 line

2.51.1

Did a normal linux-next kernel build on an Ubuntu 20.04 system, which by default does not have xxhash installed. Previous error about needing to install libxxhash-dev is no longer generated. Have not tested a klp-build.

merge bot Applied
#6 lore raw

[tip: objtool/core] objtool/klp: Only enable --checksum when needed

In reply to Josh Poimboeuf
The following commit has been merged into the objtool/core branch of tip:

The following commit has been merged into the objtool/core branch of tip:

Commit-ID:     2092007aa32f8dd968c38751bd1b7cac9b1f738d
Gitweb:        https://git.kernel.org/tip/2092007aa32f8dd968c38751bd1b7cac9b1f738d
Author:        Josh Poimboeuf <[email protected]>
AuthorDate:    Wed, 12 Nov 2025 15:32:34 -08:00
Committer:     Peter Zijlstra <[email protected]>
CommitterDate: Tue, 18 Nov 2025 09:59:26 +01:00

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.

---
 arch/x86/boot/startup/Makefile | 2 +-
 scripts/Makefile.lib           | 1 -
 scripts/livepatch/klp-build    | 4 ++++
 3 files changed, 5 insertions(+), 2 deletions(-)
arch/x86/boot/startup/Makefile +1 -1
index e8fdf02..5e499cf 100644
@@ -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
index f4b3391..28a1c08 100644
@@ -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
index 881e052..8822721 100755
@@ -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")
 
merge bot Applied
#3 lore raw

[tip: objtool/core] objtool: Set minimum xxhash version to 0.8

In reply to Josh Poimboeuf
The following commit has been merged into the objtool/core branch of tip:

The following commit has been merged into the objtool/core branch of tip:

Commit-ID:     ee0b48fabadf9b073b24f761ac09da7293eee7b7
Gitweb:        https://git.kernel.org/tip/ee0b48fabadf9b073b24f761ac09da7293eee7b7
Author:        Josh Poimboeuf <[email protected]>
AuthorDate:    Wed, 12 Nov 2025 15:32:33 -08:00
Committer:     Peter Zijlstra <[email protected]>
CommitterDate: Tue, 18 Nov 2025 09:59:25 +01:00

objtool: Set minimum xxhash version to 0.8

XXH3 is only supported starting with xxhash 0.8. Enforce that.

---
 tools/objtool/Makefile        | 2 +-
 tools/objtool/builtin-check.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
tools/objtool/Makefile +1 -1
index 48928c9..021f55b 100644
@@ -12,7 +12,7 @@ ifeq ($(SRCARCH),loongarch)
 endif
 
 ifeq ($(ARCH_HAS_KLP),y)
-	HAVE_XXHASH = $(shell echo "int main() {}" | \
+	HAVE_XXHASH = $(shell printf "$(pound)include <xxhash.h>\nXXH3_state_t *state;int main() {}" | \
 		      $(HOSTCC) -xc - -o /dev/null -lxxhash 2> /dev/null && echo y || echo n)
 	ifeq ($(HAVE_XXHASH),y)
 		BUILD_KLP	 := y
tools/objtool/builtin-check.c +1 -1
index 1e1ea83..aab7fa9 100644
@@ -164,7 +164,7 @@ static bool opts_valid(void)
 
 #ifndef BUILD_KLP
 	if (opts.checksum) {
-		ERROR("--checksum not supported; install xxhash-devel/libxxhash-dev and recompile");
+		ERROR("--checksum not supported; install xxhash-devel/libxxhash-dev (version >= 0.8) and recompile");
 		return false;
 	}
 #endif