Live Patching
 help / color / mirror / Atom feed
From: Song Liu <song@kernel.org>
To: live-patching@vger.kernel.org
Cc: jpoimboe@kernel.org, peterz@infradead.org, jikos@kernel.org,
	mbenes@suse.cz, pmladek@suse.com, joe.lawrence@redhat.com,
	puranjay@kernel.org, kernel-team@meta.com,
	Song Liu <song@kernel.org>
Subject: [PATCH v5 24/58] objtool/klp: Add test for correlation across ThinLTO name mangling
Date: Wed, 16 Sep 2026 11:43:17 -0700	[thread overview]
Message-ID: <20260916184351.2720310-25-song@kernel.org> (raw)
In-Reply-To: <20260916184351.2720310-1-song@kernel.org>

From: Puranjay Mohan <puranjay@kernel.org>

ThinLTO promotes the file-local symbols an imported function touches,
renaming them name.llvm.<hash>.  The hash is content derived, so it changes
whenever the module does:

  original: counter.llvm.13663304415433785070
  patched:  counter.llvm.10543383937958011340

Correlating the two objects therefore requires demangling the suffix;
matching raw names would see two unrelated symbols and treat the variable
as new.

The resulting klp relocation also has to name the original symbol, since
that is the one in the running kernel's kallsyms.  Naming the patched
build's symbol produces a relocation which can never be resolved.

ThinLTO is a clang feature, so the test declares itself clang-only.  It
also needs an lld from the same LLVM release as $CC; a mismatched pair
fails with "Invalid summary version", which reads like a broken test rather
than a broken environment, so probe for a working lld and skip if there is
none.

Signed-off-by: Puranjay Mohan <puranjay@kernel.org>
Assisted-by: Claude:claude-opus-5
Signed-off-by: Song Liu <song@kernel.org>
---
 .../tests/generic/fixtures/thinlto_local.c    | 39 +++++++++++++++
 .../tests/generic/test-thinlto-local.sh       | 48 +++++++++++++++++++
 2 files changed, 87 insertions(+)
 create mode 100644 tools/objtool/tests/generic/fixtures/thinlto_local.c
 create mode 100755 tools/objtool/tests/generic/test-thinlto-local.sh

diff --git a/tools/objtool/tests/generic/fixtures/thinlto_local.c b/tools/objtool/tests/generic/fixtures/thinlto_local.c
new file mode 100644
index 000000000000..fe9f9e6bf44f
--- /dev/null
+++ b/tools/objtool/tests/generic/fixtures/thinlto_local.c
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Two translation units (TU_B selects the second) linked with ThinLTO.
+ * Importing bump() promotes the file-local counter, renaming it
+ * counter.llvm.<hash>.  The hash is content derived, so it differs between the
+ * original and patched builds.
+ */
+
+#ifdef TU_B
+
+extern int bump(void);
+
+int other_entry(void)
+{
+	return bump() + bump();
+}
+
+#else
+
+static const char __modinfo[]
+	__attribute__((section(".modinfo"), used, aligned(1))) = "\0name=vmlinux";
+
+static int counter;
+
+int bump(void)
+{
+	return ++counter;
+}
+
+int target(void)
+{
+#ifdef PATCHED
+	return counter + 1;
+#else
+	return counter;
+#endif
+}
+
+#endif
diff --git a/tools/objtool/tests/generic/test-thinlto-local.sh b/tools/objtool/tests/generic/test-thinlto-local.sh
new file mode 100755
index 000000000000..a266263676ed
--- /dev/null
+++ b/tools/objtool/tests/generic/test-thinlto-local.sh
@@ -0,0 +1,48 @@
+#!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
+#
+# Correlating ThinLTO-promoted locals requires demangling the .llvm.<hash>
+# suffix, and the resulting klp relocation must name the original symbol: that
+# is the one in the running kernel's kallsyms.
+
+. "$(dirname "$0")/../lib.sh"
+
+setup
+clang_only "ThinLTO requires clang"
+
+find_thinlto_toolchain ||
+	probe_skip "no matching clang/lld pair for a ThinLTO link; set THIN_LD to one"
+
+build_thinlto()		# $1 output object, $2 extra flags
+{
+	$THIN_CC -flto=thin -O2 -ffunction-sections -fdata-sections $2 \
+		-c "$FIXTURES_DIR/thinlto_local.c" -o "$workdir/tu_a.o" 2>/dev/null || return 1
+	$THIN_CC -flto=thin -O2 -ffunction-sections -fdata-sections $2 -DTU_B \
+		-c "$FIXTURES_DIR/thinlto_local.c" -o "$workdir/tu_b.o" 2>/dev/null || return 1
+	"$THIN_LD" -r "$workdir/tu_a.o" "$workdir/tu_b.o" -o "$1" 2>/dev/null || return 1
+}
+
+build_thinlto "$workdir/orig.o" "" ||
+	probe_skip "ThinLTO build failed ($THIN_CC, $THIN_LD)"
+build_thinlto "$workdir/patched.o" -DPATCHED ||
+	probe_skip "ThinLTO build failed ($THIN_CC, $THIN_LD)"
+
+orig_sym="$(in_symbols orig.o    | grep -o 'counter\.llvm\.[0-9]*' | head -1)"
+new_sym="$( in_symbols patched.o | grep -o 'counter\.llvm\.[0-9]*' | head -1)"
+
+[ -n "$orig_sym" ] && [ -n "$new_sym" ] ||
+	probe_skip "$THIN_CC did not promote the local symbol"
+
+# Equal hashes would make plain name matching work, testing nothing.
+[ "$orig_sym" != "$new_sym" ] ||
+	probe_skip "$THIN_CC gave the same ThinLTO hash for both builds"
+
+run_diff
+assert_patched target
+
+out_symbols | grep -q "\.klp\.sym\.vmlinux\.$orig_sym," ||
+	fail "expected a klp relocation naming $orig_sym"
+out_symbols | grep -q "\.klp\.sym\.vmlinux\.$new_sym," &&
+	fail "klp relocation names $new_sym, which the running kernel does not have"
+
+pass "ThinLTO-mangled local correlated across differing hashes ($THIN_CC, $THIN_LD)"
-- 
2.53.0-Meta


  parent reply	other threads:[~2026-09-16 18:45 UTC|newest]

Thread overview: 64+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-09-16 18:42 [PATCH v5 00/58] Unit test framework for klp-build toolchain Song Liu
2026-09-16 18:42 ` [PATCH v5 01/58] objtool: Add test harness for the klp subcommands Song Liu
2026-09-16 18:42 ` [PATCH v5 02/58] objtool/klp: Check the klp test environment once, before any test Song Liu
2026-09-16 18:42 ` [PATCH v5 03/58] objtool/klp: Group the klp tests by architecture Song Liu
2026-09-16 18:42 ` [PATCH v5 04/58] objtool/klp: Classify klp test outcomes Song Liu
2026-09-16 18:42 ` [PATCH v5 05/58] objtool/klp: Build klp test fixtures through the harness Song Liu
2026-09-16 18:42 ` [PATCH v5 06/58] objtool/klp: Grow the klp test harness vocabulary Song Liu
2026-09-16 18:43 ` [PATCH v5 07/58] objtool/klp: Give each run one working directory, one per test inside it Song Liu
2026-09-16 18:43 ` [PATCH v5 08/58] objtool/klp: Run the klp tests under set -u Song Liu
2026-09-16 18:43 ` [PATCH v5 09/58] objtool/klp: Document the klp test harness Song Liu
2026-09-16 18:43 ` [PATCH v5 10/58] objtool: Keep failing test workdirs by default Song Liu
2026-09-16 18:43 ` [PATCH v5 11/58] objtool: Forward toolchain variables to the klp test runner Song Liu
2026-09-16 18:43 ` [PATCH v5 12/58] objtool/klp: Add test for rejecting changed data Song Liu
2026-09-16 18:43 ` [PATCH v5 13/58] objtool/klp: Add test for newly introduced data Song Liu
2026-09-16 18:43 ` [PATCH v5 14/58] objtool/klp: Add test for newly introduced functions Song Liu
2026-09-16 18:43 ` [PATCH v5 15/58] objtool/klp: Add test for static local correlation Song Liu
2026-09-16 18:43 ` [PATCH v5 16/58] objtool/klp: Add test for cold function halves Song Liu
2026-09-16 18:43 ` [PATCH v5 17/58] objtool/klp: Add test for special section extraction Song Liu
2026-09-16 18:43 ` [PATCH v5 18/58] objtool/klp: Add test for selective " Song Liu
2026-09-16 18:43 ` [PATCH v5 19/58] objtool/klp: Add test for jump table key relocations Song Liu
2026-09-16 18:43 ` [PATCH v5 20/58] objtool/klp: Add test for rejecting module-owned static branch keys Song Liu
2026-09-16 18:43 ` [PATCH v5 21/58] objtool/klp: Add test for rejecting module-owned static call keys Song Liu
2026-09-16 18:43 ` [PATCH v5 22/58] objtool/klp: Add test for symids in discarded sections Song Liu
2026-09-16 18:43 ` [PATCH v5 23/58] objtool/klp: Add test for rejecting references to init code/data Song Liu
2026-09-16 18:43 ` Song Liu [this message]
2026-09-16 18:43 ` [PATCH v5 25/58] objtool/klp: Add test for objects without .modinfo Song Liu
2026-09-16 18:43 ` [PATCH v5 26/58] objtool/klp: Add test for unchecksummed input Song Liu
2026-09-16 18:43 ` [PATCH v5 27/58] objtool/klp: Add klp diff and post-link regression tests Song Liu
2026-09-16 18:43 ` [PATCH v5 28/58] objtool/klp: Add test for klp reloc section naming in module objects Song Liu
2026-09-16 18:43 ` [PATCH v5 29/58] objtool/klp: Add test for vmlinux relocs in a patched module Song Liu
2026-09-16 18:43 ` [PATCH v5 30/58] objtool/klp: Add test for Module.symvers path normalization Song Liu
2026-09-16 18:43 ` [PATCH v5 31/58] objtool/klp: Add test for the contents of the klp_funcs list Song Liu
2026-09-16 18:43 ` [PATCH v5 32/58] objtool/klp: Add test for EXPORT_SYMBOL_FOR_MODULES references Song Liu
2026-09-16 18:43 ` [PATCH v5 33/58] objtool/klp: Add test for new references to exported symbols Song Liu
2026-09-16 18:43 ` [PATCH v5 34/58] objtool/klp: Add test for empty x86 alternative replacements Song Liu
2026-09-16 18:43 ` [PATCH v5 35/58] objtool/klp: Add test for recorded checksum values Song Liu
2026-09-16 18:43 ` [PATCH v5 36/58] objtool/klp: Add test for position-independent checksums Song Liu
2026-09-16 19:01   ` sashiko-bot
2026-09-16 21:43     ` Song Liu
2026-09-17  0:22       ` Josh Poimboeuf
2026-09-16 18:43 ` [PATCH v5 37/58] objtool/klp: Add test for sympos in module objects Song Liu
2026-09-16 18:43 ` [PATCH v5 38/58] objtool/klp: Add test for sympos resolved against a linked vmlinux Song Liu
2026-09-16 18:43 ` [PATCH v5 39/58] objtool/klp: Add test for static locals which must not be correlated Song Liu
2026-09-16 18:43 ` [PATCH v5 40/58] objtool/klp: Add test for __bug_table, __ex_table and __mcount_loc extraction Song Liu
2026-09-16 18:43 ` [PATCH v5 41/58] objtool/klp: Add test for kCFI prefix symbols and traps Song Liu
2026-09-16 18:43 ` [PATCH v5 42/58] objtool/klp: Add test for symbols whose linkage the patch changes Song Liu
2026-09-16 18:43 ` [PATCH v5 43/58] objtool/klp: Test rejection of a file-local static branch key Song Liu
2026-09-16 19:00   ` sashiko-bot
2026-09-16 21:39     ` Song Liu
2026-09-16 18:43 ` [PATCH v5 44/58] objtool/klp: Test a hand-built livepatch module's static call keys Song Liu
2026-09-16 18:43 ` [PATCH v5 45/58] objtool/klp: Test text annotations on alternative replacements Song Liu
2026-09-16 18:43 ` [PATCH v5 46/58] objtool/klp: Add test for data object checksums Song Liu
2026-09-16 18:43 ` [PATCH v5 47/58] objtool/klp: Add test for symbols with no checksum entry of their own Song Liu
2026-09-16 18:43 ` [PATCH v5 48/58] objtool/klp: Add test for a static branch introduced by the patch Song Liu
2026-09-16 18:43 ` [PATCH v5 49/58] objtool/klp: Add test for tracepoint and pr_debug static branch keys Song Liu
2026-09-16 18:43 ` [PATCH v5 50/58] objtool/klp: Add test for a static call introduced by the patch Song Liu
2026-09-16 18:43 ` [PATCH v5 51/58] objtool/klp: Add test for instruction operand checksums Song Liu
2026-09-16 18:43 ` [PATCH v5 52/58] objtool/klp: Add test for alternative replacement code in checksums Song Liu
2026-09-16 18:43 ` [PATCH v5 53/58] objtool/klp: Add test for the alignment of cloned data sections Song Liu
2026-09-16 18:43 ` [PATCH v5 54/58] objtool/klp: Add test for a patch which strips a data annotation Song Liu
2026-09-16 18:43 ` [PATCH v5 55/58] objtool/klp: Add test for absolute and __ADDRESSABLE symbols Song Liu
2026-09-16 18:43 ` [PATCH v5 56/58] objtool/klp: Add test for UBSAN metadata in an unchanged function Song Liu
2026-09-16 18:43 ` [PATCH v5 57/58] objtool/klp: Add test for Clang switch jump tables Song Liu
2026-09-16 18:43 ` [PATCH v5 58/58] objtool/klp: Add test for ThinLTO symbols sharing a demangled name Song Liu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260916184351.2720310-25-song@kernel.org \
    --to=song@kernel.org \
    --cc=jikos@kernel.org \
    --cc=joe.lawrence@redhat.com \
    --cc=jpoimboe@kernel.org \
    --cc=kernel-team@meta.com \
    --cc=live-patching@vger.kernel.org \
    --cc=mbenes@suse.cz \
    --cc=peterz@infradead.org \
    --cc=pmladek@suse.com \
    --cc=puranjay@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox