summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorKarl Mehltretter <kmehltretter@gmail.com>2026-10-02 20:13:57 +0200
committerAndrew Morton <akpm@linux-foundation.org>2026-10-13 21:25:48 -0700
commit5d9f31ed855fa89e533b222d0365da81ad3b10cc (patch)
treecf172829f6269be598672512da047d7ac3617293 /kernel
parentf541906e89f9d08ef29f058b6cef1db071cd8163 (diff)
downloadlinux-5d9f31ed855fa89e533b222d0365da81ad3b10cc.tar.gz
linux-5d9f31ed855fa89e533b222d0365da81ad3b10cc.zip
kcov: report spurious PCs in the interrupt selftest
The KCOV interrupt selftest enables KCOV_MODE_TRACE_PC without a coverage area so that spurious coverage causes a fault. If the fault path is instrumented, the coverage callback faults recursively. Observed failure modes include a stack overflow on x86_64 and arm32 getting stuck in abort handling, neither of which identifies the original coverage event. The recursive failure is not new, but commit 9a79524d1420 ("kcov: use WRITE_ONCE() for selftest mode stores") made the selftest effective on configurations where the compiler had previously removed the mode store, exposing it more broadly. Replace the open-coded kcov_mode stores with kcov_start() and kcov_stop(), passing a 16-word buffer that records up to 15 spurious PCs, with the first word holding the count. Keep KCOV enabled for the original 300 ms window, then disable it, print all recorded PCs and panic if any were recorded. Once the buffer fills, further PCs are discarded by the existing coverage callback. This preserves the selftest's hard failure while avoiding the recursive fault path. Add decanonicalize_ip() as the inverse of canonicalize_ip(), which subtracts kaslr_offset() from recorded PCs. Restore that offset before printing the PCs with %pB, since KCOV records return addresses. Link: https://lore.kernel.org/20261002181357.14293-1-kmehltretter@gmail.com Fixes: 6cd0dd934b03 ("kcov: Add interrupt handling self test") Signed-off-by: Karl Mehltretter <kmehltretter@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Tested-by: Alexander Potapenko <glider@google.com> Reviewed-by: Alexander Potapenko <glider@google.com> Tested-by: Bradley Morgan <brads@mainlining.org> # Power10 Reviewed-by: Bradley Morgan <brads@mainlining.org> Assisted-by: LLM Cc: Andrey Konovalov <andreyknvl@gmail.com> Cc: Dmitry Vyukov <dvyukov@google.com> Cc: Marco Elver <elver@google.com> Cc: Bradley Morgan <include@grrlz.net> Cc: Thomas Gleixner <tglx@kernel.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/kcov.c35
1 files changed, 29 insertions, 6 deletions
diff --git a/kernel/kcov.c b/kernel/kcov.c
index 54eaae97bfd6..9402227bd7ba 100644
--- a/kernel/kcov.c
+++ b/kernel/kcov.c
@@ -198,6 +198,16 @@ static notrace unsigned long canonicalize_ip(unsigned long ip)
return ip;
}
+#ifdef CONFIG_KCOV_SELFTEST
+static unsigned long __init decanonicalize_ip(unsigned long ip)
+{
+#ifdef CONFIG_RANDOMIZE_BASE
+ ip += kaslr_offset();
+#endif
+ return ip;
+}
+#endif
+
/*
* Entry point from instrumented code.
* This is called once per basic-block/edge.
@@ -1107,9 +1117,11 @@ struct kcov_common_handle_id kcov_common_handle(void)
EXPORT_SYMBOL(kcov_common_handle);
#ifdef CONFIG_KCOV_SELFTEST
+static unsigned long selftest_area[16] __initdata;
+
static void __init selftest(void)
{
- unsigned long start;
+ unsigned long start, i, ip, count;
pr_err("running self test\n");
/*
@@ -1119,15 +1131,26 @@ static void __init selftest(void)
* leaks out of that section and leads to spurious coverage.
* It's hard to call the actual interrupt handler directly,
* so we just loop here for a bit waiting for a timer interrupt.
- * We set kcov_mode to enable tracing, but don't setup the area,
- * so any attempt to trace will crash. Note: we must not call any
+ * A small coverage area records the PCs of any leaks. The first word
+ * holds the count, leaving room for 15 PCs. Note: we must not call any
* potentially traced functions in this region.
*/
+ kcov_start(current, NULL, ARRAY_SIZE(selftest_area),
+ selftest_area, KCOV_MODE_TRACE_PC, 0);
start = jiffies;
- WRITE_ONCE(current->kcov_mode, KCOV_MODE_TRACE_PC);
while ((jiffies - start) * MSEC_PER_SEC / HZ < 300)
- ;
- WRITE_ONCE(current->kcov_mode, 0);
+ cpu_relax();
+ kcov_stop(current);
+
+ count = READ_ONCE(selftest_area[0]);
+ if (count) {
+ pr_err("spurious coverage detected during interrupt selftest:\n");
+ for (i = 1; i <= count; i++) {
+ ip = decanonicalize_ip(selftest_area[i]);
+ pr_err(" %pB\n", (void *)ip);
+ }
+ panic("kcov: interrupt selftest detected spurious coverage");
+ }
pr_err("done running self test\n");
}
#endif