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 v3 16/58] objtool/klp: Add test for cold function halves
Date: Mon, 14 Sep 2026 16:03:13 -0700	[thread overview]
Message-ID: <20260914230355.3422996-17-song@kernel.org> (raw)
In-Reply-To: <20260914230355.3422996-1-song@kernel.org>

From: Puranjay Mohan <puranjay@kernel.org>

The compiler splits unlikely code into a separate foo.cold symbol.  Both
halves are the same function and both belong in the livepatch: carrying
only the hot part leaves the cold path branching into unpatched code.

GCC needs -freorder-blocks-and-partition to split reliably.  The flag is
probed rather than assumed, and the test skips when the compiler declines
to split at all.

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/cold_function.c    | 21 ++++++++++
 .../tests/generic/test-cold-function.sh       | 39 +++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 tools/objtool/tests/generic/fixtures/cold_function.c
 create mode 100755 tools/objtool/tests/generic/test-cold-function.sh

diff --git a/tools/objtool/tests/generic/fixtures/cold_function.c b/tools/objtool/tests/generic/fixtures/cold_function.c
new file mode 100644
index 000000000000..f6d410983ce2
--- /dev/null
+++ b/tools/objtool/tests/generic/fixtures/cold_function.c
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Function the compiler may split into a hot part and a foo.cold part. */
+
+static const char __modinfo[]
+	__attribute__((section(".modinfo"), used, aligned(1))) = "\0name=vmlinux";
+
+static void __attribute__((cold, noinline)) slow_path(int x)
+{
+	__asm__ volatile("" :: "r"(x));
+}
+
+int target(int x)
+{
+	if (__builtin_expect(x < 0, 0))
+		slow_path(x);
+#ifdef PATCHED
+	return x + 2;
+#else
+	return x + 1;
+#endif
+}
diff --git a/tools/objtool/tests/generic/test-cold-function.sh b/tools/objtool/tests/generic/test-cold-function.sh
new file mode 100755
index 000000000000..a02652fe5341
--- /dev/null
+++ b/tools/objtool/tests/generic/test-cold-function.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
+#
+# Both halves of a split function belong to the patch; carrying only the hot
+# part leaves the cold path branching into unpatched code.
+
+. "$(dirname "$0")/../lib.sh"
+
+# Clang does not split functions into a cold part at all, so there is nothing
+# for this test to look at there.  A given gcc may or may not split, which is a
+# version property rather than a compiler choice -- that stays a probe below.
+gcc_only "clang does not split functions into a cold part"
+
+setup
+
+split_flag=-freorder-blocks-and-partition
+cc_supports "$split_flag" || split_flag=
+
+build_pair cold_function.c $split_flag
+
+# Find what the compiler called the cold half -- target.cold, target.cold.0,
+# depending on version -- and name it exactly from here on.
+cold_sym="$(in_symbols orig.o | awk '$NF ~ /^target\.cold/ { print $NF; exit }')"
+[ -n "$cold_sym" ] ||
+	probe_skip "compiler did not split the function into a cold part"
+
+run_diff
+
+assert_patched target
+# Match the name field exactly, and require it to be defined.  Had the cold
+# half been left behind, the branch to it would appear as an undefined
+# .klp.sym.vmlinux.target.cold,0 -- a different name, which happens to contain
+# this one.  Asking about a column instead of the name would not tell them
+# apart: readelf prints SHN_LIVEPATCH as "OS [0xff20]" and llvm-readelf as
+# "OS[0xff20]", so the fields either side of the name shift between the two.
+out_symbols | awk -v n="$cold_sym" '$NF == n && $(NF - 1) != "UND"' | grep -q . ||
+	fail "cold half ($cold_sym) was not carried into the patch"
+
+pass "cold half carried into the patch with its parent"
-- 
2.53.0-Meta


  parent reply	other threads:[~2026-09-14 23:05 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 ` Song Liu [this message]
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 ` [PATCH v3 40/58] objtool/klp: Add test for __bug_table, __ex_table and __mcount_loc extraction Song Liu
2026-09-15  0:26   ` 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-17-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