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 v3 40/58] objtool/klp: Add test for __bug_table, __ex_table and __mcount_loc extraction
Date: Mon, 14 Sep 2026 16:03:37 -0700 [thread overview]
Message-ID: <20260914230355.3422996-41-song@kernel.org> (raw)
In-Reply-To: <20260914230355.3422996-1-song@kernel.org>
Three special sections with no coverage. An entry that is not carried into
the patch is not a build failure: the patched function simply loses its
WARN_ON location, its exception fixup, or its ftrace callsite, and nobody
finds out until one of them is needed.
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/x86/fixtures/special_sections.c | 77 +++++++++++++++++++
.../tests/x86/test-special-sections.sh | 42 ++++++++++
2 files changed, 119 insertions(+)
create mode 100644 tools/objtool/tests/x86/fixtures/special_sections.c
create mode 100755 tools/objtool/tests/x86/test-special-sections.sh
diff --git a/tools/objtool/tests/x86/fixtures/special_sections.c b/tools/objtool/tests/x86/fixtures/special_sections.c
new file mode 100644
index 000000000000..d42798848fda
--- /dev/null
+++ b/tools/objtool/tests/x86/fixtures/special_sections.c
@@ -0,0 +1,77 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * A special section entry belonging to a patched function. SPECIAL_SEC picks
+ * which section, since klp diff treats eight of them alike and each needs
+ * extracting for the patched function and no other.
+ *
+ * The entry is written out by hand so the fixture builds without kernel
+ * headers. Only the leading relocation matters to klp diff; the rest is
+ * padded to the section's real entry size, because the entries have to be the
+ * right length for the boundaries between them to fall in the right places.
+ *
+ * SPECIAL_RELOCS covers __ex_table, whose entries relocate both the faulting
+ * instruction and its fixup; objtool rejects one with only the first.
+ */
+
+#ifndef SPECIAL_SEC
+#define SPECIAL_SEC "__bug_table"
+#endif
+#ifndef SPECIAL_ENTSIZE
+#define SPECIAL_ENTSIZE 12
+#endif
+#ifndef SPECIAL_RELOCS
+#define SPECIAL_RELOCS 1
+#endif
+
+#define STR_(x) #x
+#define STR(x) STR_(x)
+
+static const char __modinfo[]
+ __attribute__((section(".modinfo"), used, aligned(1))) = "\0name=vmlinux";
+
+/*
+ * other() gets an entry of its own, so that "the untouched function's entry
+ * was not dragged in" is a question the section can actually answer. With
+ * only target() contributing, there is nothing for klp diff to leave behind
+ * and the negative assertion holds however the extraction behaves.
+ */
+int other(int x)
+{
+ asm volatile(
+ "3: nop\n\t"
+ "4:\n\t"
+ ".pushsection " SPECIAL_SEC ", \"aM\", @progbits, "
+ STR(SPECIAL_ENTSIZE) "\n\t"
+ ".long 3b - .\n\t"
+#if SPECIAL_RELOCS > 1
+ ".long 4b - .\n\t"
+ ".fill " STR(SPECIAL_ENTSIZE) " - 8, 1, 0\n\t"
+#else
+ ".fill " STR(SPECIAL_ENTSIZE) " - 4, 1, 0\n\t"
+#endif
+ ".popsection\n\t");
+
+ return x + 9;
+}
+
+int target(int x)
+{
+ asm volatile(
+ "1: nop\n\t"
+ "2:\n\t"
+ ".pushsection " SPECIAL_SEC ", \"aM\", @progbits, "
+ STR(SPECIAL_ENTSIZE) "\n\t"
+ ".long 1b - .\n\t"
+#if SPECIAL_RELOCS > 1
+ ".long 2b - .\n\t"
+ ".fill " STR(SPECIAL_ENTSIZE) " - 8, 1, 0\n\t"
+#else
+ ".fill " STR(SPECIAL_ENTSIZE) " - 4, 1, 0\n\t"
+#endif
+ ".popsection\n\t");
+#ifdef PATCHED
+ return x + 2;
+#else
+ return x + 1;
+#endif
+}
diff --git a/tools/objtool/tests/x86/test-special-sections.sh b/tools/objtool/tests/x86/test-special-sections.sh
new file mode 100755
index 000000000000..8dfaa4fc9a36
--- /dev/null
+++ b/tools/objtool/tests/x86/test-special-sections.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
+#
+# klp diff extracts entries from eight special sections. Between them the
+# existing tests reach .kcfi_traps, __jump_table, .static_call_sites and
+# .altinstructions; __bug_table, __ex_table and __mcount_loc are covered by
+# nothing, though the same extraction code serves all of them.
+#
+# Losing an entry is quiet in every case and wrong in a different way for each:
+# a WARN() in patched code that no longer reports where it came from, an
+# exception fixup that is simply not there when the faulting instruction traps,
+# a function ftrace can no longer see.
+
+. "$(dirname "$0")/../lib.sh"
+
+
+# section, entry size, relocations per entry
+for spec in "__bug_table 12 1" "__ex_table 12 2" "__mcount_loc 8 1"; do
+ set -- $spec
+ sec=$1
+
+ # A fresh workdir per section: run_diff caches its checksums.
+ setup
+ build_pair special_sections.c \
+ -DSPECIAL_SEC="\"$1\"" -DSPECIAL_ENTSIZE="$2" -DSPECIAL_RELOCS="$3"
+
+ assert_input_section "$sec"
+ run_diff
+
+ # Extracted, and pointing at the function that was patched.
+ assert_section "$sec"
+ assert_reloc_sym "$sec" target
+ assert_patched target
+
+ # Nothing belonging to the function that was not.
+ assert_not_patched other
+ assert_no_reloc_sym "$sec" other
+
+ cleanup
+done
+
+pass "__bug_table, __ex_table and __mcount_loc entries extracted"
--
2.53.0-Meta
next prev parent reply other threads:[~2026-09-14 23:07 UTC|newest]
Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-14 23:02 [PATCH v3 00/58] Unit test framework for klp-build toolchain Song Liu
2026-09-14 23:02 ` [PATCH v3 01/58] objtool: Add test harness for the klp subcommands Song Liu
2026-09-14 23:28 ` sashiko-bot
2026-09-15 18:26 ` Song Liu
2026-09-14 23:02 ` [PATCH v3 02/58] objtool/klp: Check the klp test environment once, before any test Song Liu
2026-09-14 23:03 ` [PATCH v3 03/58] objtool/klp: Group the klp tests by architecture Song Liu
2026-09-14 23:03 ` [PATCH v3 04/58] objtool/klp: Classify klp test outcomes Song Liu
2026-09-14 23:03 ` [PATCH v3 05/58] objtool/klp: Build klp test fixtures through the harness Song Liu
2026-09-14 23:34 ` sashiko-bot
2026-09-15 19:26 ` Song Liu
2026-09-14 23:03 ` [PATCH v3 06/58] objtool/klp: Grow the klp test harness vocabulary Song Liu
2026-09-14 23:35 ` sashiko-bot
2026-09-15 20:30 ` Song Liu
2026-09-14 23:03 ` [PATCH v3 07/58] objtool/klp: Give each run one working directory, one per test inside it Song Liu
2026-09-14 23:34 ` sashiko-bot
2026-09-15 20:51 ` Song Liu
2026-09-14 23:03 ` [PATCH v3 08/58] objtool/klp: Run the klp tests under set -u Song Liu
2026-09-14 23:03 ` [PATCH v3 09/58] objtool/klp: Document the klp test harness Song Liu
2026-09-14 23:03 ` [PATCH v3 10/58] objtool: Keep failing test workdirs by default Song Liu
2026-09-14 23:41 ` sashiko-bot
2026-09-15 20:56 ` Song Liu
2026-09-14 23:03 ` [PATCH v3 11/58] objtool: Forward toolchain variables to the klp test runner Song Liu
2026-09-14 23:45 ` sashiko-bot
2026-09-15 21:04 ` Song Liu
2026-09-14 23:03 ` [PATCH v3 12/58] objtool/klp: Add test for rejecting changed data Song Liu
2026-09-14 23:03 ` [PATCH v3 13/58] objtool/klp: Add test for newly introduced data Song Liu
2026-09-14 23:03 ` [PATCH v3 14/58] objtool/klp: Add test for newly introduced functions Song Liu
2026-09-14 23:46 ` sashiko-bot
2026-09-15 21:56 ` Song Liu
2026-09-14 23:03 ` [PATCH v3 15/58] objtool/klp: Add test for static local correlation Song Liu
2026-09-14 23:03 ` [PATCH v3 16/58] objtool/klp: Add test for cold function halves Song Liu
2026-09-14 23:03 ` [PATCH v3 17/58] objtool/klp: Add test for special section extraction Song Liu
2026-09-14 23:03 ` [PATCH v3 18/58] objtool/klp: Add test for selective " Song Liu
2026-09-14 23:03 ` [PATCH v3 19/58] objtool/klp: Add test for jump table key relocations Song Liu
2026-09-14 23:03 ` [PATCH v3 20/58] objtool/klp: Add test for rejecting module-owned static branch keys Song Liu
2026-09-14 23:03 ` [PATCH v3 21/58] objtool/klp: Add test for rejecting module-owned static call keys Song Liu
2026-09-15 0:05 ` sashiko-bot
2026-09-15 21:51 ` Song Liu
2026-09-14 23:03 ` [PATCH v3 22/58] objtool/klp: Add test for symids in discarded sections Song Liu
2026-09-14 23:03 ` [PATCH v3 23/58] objtool/klp: Add test for rejecting references to init code/data Song Liu
2026-09-15 0:07 ` sashiko-bot
2026-09-15 23:11 ` Song Liu
2026-09-14 23:03 ` [PATCH v3 24/58] objtool/klp: Add test for correlation across ThinLTO name mangling Song Liu
2026-09-14 23:03 ` [PATCH v3 25/58] objtool/klp: Add test for objects without .modinfo Song Liu
2026-09-14 23:03 ` [PATCH v3 26/58] objtool/klp: Add test for unchecksummed input Song Liu
2026-09-14 23:03 ` [PATCH v3 27/58] objtool/klp: Add klp diff and post-link regression tests Song Liu
2026-09-14 23:03 ` [PATCH v3 28/58] objtool/klp: Add test for klp reloc section naming in module objects Song Liu
2026-09-14 23:03 ` [PATCH v3 29/58] objtool/klp: Add test for vmlinux relocs in a patched module Song Liu
2026-09-14 23:03 ` [PATCH v3 30/58] objtool/klp: Add test for Module.symvers path normalization Song Liu
2026-09-14 23:03 ` [PATCH v3 31/58] objtool/klp: Add test for the contents of the klp_funcs list Song Liu
2026-09-14 23:03 ` [PATCH v3 32/58] objtool/klp: Add test for EXPORT_SYMBOL_FOR_MODULES references Song Liu
2026-09-14 23:03 ` [PATCH v3 33/58] objtool/klp: Add test for new references to exported symbols Song Liu
2026-09-14 23:03 ` [PATCH v3 34/58] objtool/klp: Add test for empty x86 alternative replacements Song Liu
2026-09-14 23:03 ` [PATCH v3 35/58] objtool/klp: Add test for recorded checksum values Song Liu
2026-09-14 23:03 ` [PATCH v3 36/58] objtool/klp: Add test for position-independent checksums Song Liu
2026-09-14 23:03 ` [PATCH v3 37/58] objtool/klp: Add test for sympos in module objects Song Liu
2026-09-14 23:03 ` [PATCH v3 38/58] objtool/klp: Add test for sympos resolved against a linked vmlinux Song Liu
2026-09-14 23:03 ` [PATCH v3 39/58] objtool/klp: Add test for static locals which must not be correlated Song Liu
2026-09-14 23:03 ` Song Liu [this message]
2026-09-15 0:26 ` [PATCH v3 40/58] objtool/klp: Add test for __bug_table, __ex_table and __mcount_loc extraction sashiko-bot
2026-09-15 23:27 ` Song Liu
2026-09-14 23:03 ` [PATCH v3 41/58] objtool/klp: Add test for kCFI prefix symbols and traps Song Liu
2026-09-14 23:03 ` [PATCH v3 42/58] objtool/klp: Add test for symbols whose linkage the patch changes Song Liu
2026-09-14 23:03 ` [PATCH v3 43/58] objtool/klp: Test rejection of a file-local static branch key Song Liu
2026-09-14 23:03 ` [PATCH v3 44/58] objtool/klp: Test a hand-built livepatch module's static call keys Song Liu
2026-09-14 23:03 ` [PATCH v3 45/58] objtool/klp: Test text annotations on alternative replacements Song Liu
2026-09-14 23:03 ` [PATCH v3 46/58] objtool/klp: Add test for data object checksums Song Liu
2026-09-14 23:03 ` [PATCH v3 47/58] objtool/klp: Add test for symbols with no checksum entry of their own Song Liu
2026-09-14 23:03 ` [PATCH v3 48/58] objtool/klp: Add test for a static branch introduced by the patch Song Liu
2026-09-14 23:03 ` [PATCH v3 49/58] objtool/klp: Add test for tracepoint and pr_debug static branch keys Song Liu
2026-09-15 0:32 ` sashiko-bot
2026-09-14 23:03 ` [PATCH v3 50/58] objtool/klp: Add test for a static call introduced by the patch Song Liu
2026-09-14 23:03 ` [PATCH v3 51/58] objtool/klp: Add test for instruction operand checksums Song Liu
2026-09-14 23:03 ` [PATCH v3 52/58] objtool/klp: Add test for alternative replacement code in checksums Song Liu
2026-09-14 23:03 ` [PATCH v3 53/58] objtool/klp: Add test for the alignment of cloned data sections Song Liu
2026-09-14 23:03 ` [PATCH v3 54/58] objtool/klp: Add test for a patch which strips a data annotation Song Liu
2026-09-14 23:03 ` [PATCH v3 55/58] objtool/klp: Add test for absolute and __ADDRESSABLE symbols Song Liu
2026-09-15 0:53 ` sashiko-bot
2026-09-15 23:29 ` Song Liu
2026-09-14 23:03 ` [PATCH v3 56/58] objtool/klp: Add test for UBSAN metadata in an unchanged function Song Liu
2026-09-14 23:03 ` [PATCH v3 57/58] objtool/klp: Add test for Clang switch jump tables Song Liu
2026-09-14 23:03 ` [PATCH v3 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=20260914230355.3422996-41-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