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 21/58] objtool/klp: Add test for rejecting module-owned static call keys
Date: Wed, 16 Sep 2026 11:43:14 -0700 [thread overview]
Message-ID: <20260916184351.2720310-22-song@kernel.org> (raw)
In-Reply-To: <20260916184351.2720310-1-song@kernel.org>
From: Puranjay Mohan <puranjay@kernel.org>
Static calls carry the same constraint as static branches. Check that a
vmlinux-owned key is accepted and a module-owned one is refused.
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/static_call.c | 59 +++++++++++++++++++
.../generic/test-static-call-module-key.sh | 36 +++++++++++
2 files changed, 95 insertions(+)
create mode 100644 tools/objtool/tests/generic/fixtures/static_call.c
create mode 100755 tools/objtool/tests/generic/test-static-call-module-key.sh
diff --git a/tools/objtool/tests/generic/fixtures/static_call.c b/tools/objtool/tests/generic/fixtures/static_call.c
new file mode 100644
index 000000000000..4a0c4c25321e
--- /dev/null
+++ b/tools/objtool/tests/generic/fixtures/static_call.c
@@ -0,0 +1,59 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Static call site in a patched function, laid out by hand as for
+ * jump_label.c. MODNAME selects whether the key belongs to vmlinux or a
+ * module.
+ *
+ * objtool's check pass would emit the site, and klp-write-tests.txt says to
+ * let it. Not here: it does not emit the ANNOTATE_DATA_SPECIAL describing
+ * the entry boundaries -- in the kernel that comes from the static_call
+ * macros -- and NO_ANNOTATE below has to be able to take it away. A fixture
+ * which varies the annotation has to write the entry that goes with it.
+ *
+ * NO_ANNOTATE drops the ANNOTATE_DATA_SPECIAL block from the patched build,
+ * leaving .static_call_sites with no annotation to describe its entry
+ * boundaries. The section carries no entsize either, so klp diff has to fall
+ * back on the annotations it can still see -- and when the patched object is
+ * the only one that lost them, the two sides disagree about how the section is
+ * divided up.
+ *
+ * NEW_CALL puts the call site behind PATCHED, so the patch introduces one
+ * where the original had none. The .static_call_sites entry is then new, with
+ * nothing in the original to correlate it against.
+ */
+
+#ifndef MODNAME
+#define MODNAME "vmlinux"
+#endif
+
+static const char __modinfo[]
+ __attribute__((section(".modinfo"), used, aligned(1))) = "\0name=" MODNAME;
+
+long __SCK__klp_test_call;
+
+int target(int x)
+{
+#if defined(NEW_CALL) && !defined(PATCHED)
+ /* The original has no static call at all. */
+ return x + 1;
+#else
+ __asm__ volatile(
+ "1: nop\n\t"
+ ".pushsection .static_call_sites, \"aw\"\n\t"
+ ".balign 8\n\t"
+ "912:\n\t"
+#if !(defined(PATCHED) && defined(NO_ANNOTATE))
+ ".pushsection .discard.annotate_data, \"M\", @progbits, 8\n\t"
+ ".long 912b - ., 1\n\t"
+ ".popsection\n\t"
+#endif
+ ".long 1b - ., %c0 - .\n\t"
+ ".popsection\n\t"
+ :: "i" (&__SCK__klp_test_call));
+#endif
+#ifdef PATCHED
+ return x + 2;
+#else
+ return x + 1;
+#endif
+}
diff --git a/tools/objtool/tests/generic/test-static-call-module-key.sh b/tools/objtool/tests/generic/test-static-call-module-key.sh
new file mode 100755
index 000000000000..260c4af72e05
--- /dev/null
+++ b/tools/objtool/tests/generic/test-static-call-module-key.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
+#
+# As for static branches, a static call key owned by a module must be rejected
+# while a vmlinux-owned one is accepted.
+
+. "$(dirname "$0")/../lib.sh"
+
+setup
+build_pair static_call.c
+
+has_input_section orig.o .static_call_sites ||
+ probe_skip "fixture produced no .static_call_sites on this arch"
+
+run_diff
+assert_patched target
+
+# The accepted half has to show the entry was carried, not just that the
+# function was: dropping the section silently would leave the patched call
+# unregistered, and "target was cloned" cannot tell the two apart.
+assert_section .static_call_sites
+assert_reloc_sym .static_call_sites target
+
+rm -f "$workdir/out.o"
+build_pair static_call.c -DMODNAME='"klp_testmod"'
+run_diff 255
+
+diff_log | grep -q 'unsupported static call key __SCK__klp_test_call' ||
+ fail "expected rejection, got: $(diff_log | tail -1)"
+
+# A rejection has to leave nothing behind. out.o was removed above, so
+# anything here was written by the run which was supposed to refuse.
+[ -e "$workdir/out.o" ] &&
+ fail "output object produced for a rejected input"
+
+pass "module-owned static call key rejected, vmlinux-owned accepted"
--
2.53.0-Meta
next prev 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 ` Song Liu [this message]
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 ` [PATCH v5 24/58] objtool/klp: Add test for correlation across ThinLTO name mangling Song Liu
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-22-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.