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 v2 37/58] objtool/klp: Add test for sympos in module objects
Date: Sun, 13 Sep 2026 23:24:53 -0700	[thread overview]
Message-ID: <20260914062514.926997-38-song@kernel.org> (raw)
In-Reply-To: <20260914062514.926997-1-song@kernel.org>

klp-sympos.c had no coverage at all.  sympos disambiguates same-named
symbols for livepatch, counting from 1, with 0 meaning the name is unique.
Resolving to the wrong one is not a load failure -- it is a patch quietly
wired to the wrong object.

Covers the module path, where the position is a count in symbol table order
and klp diff can work it out from the object alone.

Assisted-by: Claude:claude-opus-4
Based-on-test-by: Joe Lawrence <joe.lawrence@redhat.com>
Assisted-by: Claude:claude-opus-5
Signed-off-by: Song Liu <song@kernel.org>
---
 .../tests/generic/fixtures/sympos_dup.c       | 32 ++++++++++++
 tools/objtool/tests/generic/test-sympos.sh    | 51 +++++++++++++++++++
 2 files changed, 83 insertions(+)
 create mode 100644 tools/objtool/tests/generic/fixtures/sympos_dup.c
 create mode 100755 tools/objtool/tests/generic/test-sympos.sh

diff --git a/tools/objtool/tests/generic/fixtures/sympos_dup.c b/tools/objtool/tests/generic/fixtures/sympos_dup.c
new file mode 100644
index 000000000000..7eded9b12cfc
--- /dev/null
+++ b/tools/objtool/tests/generic/fixtures/sympos_dup.c
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * A static whose name recurs in every translation unit that includes it.
+ * Compiled once for a single-copy object and twice, partially linked, for one
+ * with duplicates -- which is the only case where sympos is non-zero.
+ *
+ * FUNC_NAME keeps the referencing functions distinct so both get patched.
+ * Only the first copy carries .modinfo; two would be a second thing to
+ * disambiguate and is not what this fixture is about.
+ */
+
+#ifndef FUNC_NAME
+#define FUNC_NAME use_a
+#endif
+
+#ifndef NO_MODINFO
+static const char __modinfo[]
+	__attribute__((section(".modinfo"), used, aligned(1))) = "\0name=vmlinux";
+#endif
+
+/* volatile so it survives as an STT_OBJECT rather than being folded away */
+static volatile int dup_counter = 1;
+
+int FUNC_NAME(int x)
+{
+	dup_counter += x;
+#ifdef PATCHED
+	return dup_counter + 1;
+#else
+	return dup_counter;
+#endif
+}
diff --git a/tools/objtool/tests/generic/test-sympos.sh b/tools/objtool/tests/generic/test-sympos.sh
new file mode 100755
index 000000000000..b71d4930a22a
--- /dev/null
+++ b/tools/objtool/tests/generic/test-sympos.sh
@@ -0,0 +1,51 @@
+#!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
+#
+# sympos is what livepatch uses to tell duplicate symbol names apart in the
+# patched object: which "dup_counter" of several the relocation means.  Get it
+# wrong and the patch resolves to the wrong object at load time, silently.
+#
+# klp_find_sympos() reports 0 when a name is unique and a 1-based position when
+# it is not, so both need checking -- always reporting a position, or never,
+# each looks right in one of the two cases.
+#
+# This is the module path, counting symbol table order.  vmlinux is reordered
+# by the final link and goes through .klp.symid instead; that needs a linked
+# vmlinux next to vmlinux.o and is not covered here.
+
+. "$(dirname "$0")/../lib.sh"
+
+setup
+
+# One copy: the name is unique, so there is nothing to disambiguate.
+build_one sympos_dup.c orig.o    -DFUNC_NAME=use_a
+build_one sympos_dup.c patched.o -DFUNC_NAME=use_a -DPATCHED
+run_diff
+
+assert_klp_sympos dup_counter 0
+
+# Two copies: positions, in symbol table order.
+for p in "" "-DPATCHED"; do
+	# shellcheck disable=SC2086
+	build_one sympos_dup.c "a$p.o" -DFUNC_NAME=use_a $p
+	# shellcheck disable=SC2086
+	build_one sympos_dup.c "b$p.o" -DFUNC_NAME=use_b -DNO_MODINFO $p
+done
+partial_link "$workdir/orig.o"    "$workdir/a.o"         "$workdir/b.o" ||
+	probe_skip "partial link unavailable"
+partial_link "$workdir/patched.o" "$workdir/a-DPATCHED.o" "$workdir/b-DPATCHED.o" ||
+	probe_skip "partial link unavailable"
+
+# Without duplicates in the input there is nothing for sympos to number.
+[ "$(count_input_symbols orig.o dup_counter)" = 2 ] ||
+	fail "fixture did not produce two dup_counter symbols"
+
+run_diff
+
+assert_klp_sympos dup_counter 1
+assert_klp_sympos dup_counter 2
+# ... and nothing still claiming the name is unique
+out_symbols | grep -qE '\.klp\.sym\.[^.]+\.dup_counter,0([[:space:]]|$)' &&
+	fail "sympos 0 emitted for a duplicated symbol"
+
+pass "sympos numbers duplicate symbols and stays 0 for unique ones"
-- 
2.53.0-Meta


  parent reply	other threads:[~2026-09-14  6:28 UTC|newest]

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