From: Jinchao Wang <wangjinchao600@gmail.com>
To: "Andrew Morton" <akpm@linux-foundation.org>,
"Masami Hiramatsu (Google)" <mhiramat@kernel.org>,
"Peter Zijlstra" <peterz@infradead.org>,
"Randy Dunlap" <rdunlap@infradead.org>,
"Marco Elver" <elver@google.com>,
"Mike Rapoport" <rppt@kernel.org>,
"Alexander Potapenko" <glider@google.com>,
"Adrian Hunter" <adrian.hunter@intel.com>,
"Alexander Shishkin" <alexander.shishkin@linux.intel.com>,
"Alice Ryhl" <aliceryhl@google.com>,
"Andrey Konovalov" <andreyknvl@gmail.com>,
"Andrey Ryabinin" <ryabinin.a.a@gmail.com>,
"Andrii Nakryiko" <andrii@kernel.org>,
"Ard Biesheuvel" <ardb@kernel.org>,
"Arnaldo Carvalho de Melo" <acme@kernel.org>,
"Ben Segall" <bsegall@google.com>,
"Bill Wendling" <morbo@google.com>,
"Borislav Petkov" <bp@alien8.de>,
"Catalin Marinas" <catalin.marinas@arm.com>,
"Dave Hansen" <dave.hansen@linux.intel.com>,
"David Hildenbrand" <david@redhat.com>,
"David Kaplan" <david.kaplan@amd.com>,
"David S. Miller" <davem@davemloft.net>,
"Dietmar Eggemann" <dietmar.eggemann@arm.com>,
"Dmitry Vyukov" <dvyukov@google.com>,
"H. Peter Anvin" <hpa@zytor.com>,
"Ian Rogers" <irogers@google.com>,
"Ingo Molnar" <mingo@redhat.com>,
"James Clark" <james.clark@linaro.org>,
"Jinchao Wang" <wangjinchao600@gmail.com>,
"Jinjie Ruan" <ruanjinjie@huawei.com>,
"Jiri Olsa" <jolsa@kernel.org>,
"Jonathan Corbet" <corbet@lwn.net>,
"Juri Lelli" <juri.lelli@redhat.com>,
"Justin Stitt" <justinstitt@google.com>,
kasan-dev@googlegroups.com, "Kees Cook" <kees@kernel.org>,
"Liam R. Howlett" <Liam.Howlett@oracle.com>,
"Liang Kan" <kan.liang@linux.intel.com>,
"Linus Walleij" <linus.walleij@linaro.org>,
linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-mm@kvack.org,
linux-perf-users@vger.kernel.org,
linux-trace-kernel@vger.kernel.org, llvm@lists.linux.dev,
"Lorenzo Stoakes" <lorenzo.stoakes@oracle.com>,
"Mark Rutland" <mark.rutland@arm.com>,
"Masahiro Yamada" <masahiroy@kernel.org>,
"Mathieu Desnoyers" <mathieu.desnoyers@efficios.com>,
"Mel Gorman" <mgorman@suse.de>, "Michal Hocko" <mhocko@suse.com>,
"Miguel Ojeda" <ojeda@kernel.org>,
"Nam Cao" <namcao@linutronix.de>,
"Namhyung Kim" <namhyung@kernel.org>,
"Nathan Chancellor" <nathan@kernel.org>,
"Naveen N Rao" <naveen@kernel.org>,
"Nick Desaulniers" <nick.desaulniers+lkml@gmail.com>,
"Rong Xu" <xur@google.com>,
"Sami Tolvanen" <samitolvanen@google.com>,
"Steven Rostedt" <rostedt@goodmis.org>,
"Suren Baghdasaryan" <surenb@google.com>,
"Thomas Gleixner" <tglx@linutronix.de>,
"Thomas Weißschuh" <thomas.weissschuh@linutronix.de>,
"Valentin Schneider" <vschneid@redhat.com>,
"Vincent Guittot" <vincent.guittot@linaro.org>,
"Vincenzo Frascino" <vincenzo.frascino@arm.com>,
"Vlastimil Babka" <vbabka@suse.cz>,
"Will Deacon" <will@kernel.org>,
workflows@vger.kernel.org, x86@kernel.org
Subject: [PATCH v8 14/27] mm/ksw: resolve stack watch addr and len
Date: Tue, 11 Nov 2025 00:36:09 +0800 [thread overview]
Message-ID: <20251110163634.3686676-15-wangjinchao600@gmail.com> (raw)
In-Reply-To: <20251110163634.3686676-1-wangjinchao600@gmail.com>
Add helpers to find the stack canary or a local variable addr and len
for the probed function based on ksw_get_config(). For canary search,
limits search to a fixed number of steps to avoid scanning the entire
stack. Validates that the computed address and length are within the
kernel stack.
Signed-off-by: Jinchao Wang <wangjinchao600@gmail.com>
---
mm/kstackwatch/stack.c | 80 ++++++++++++++++++++++++++++++++++++++++--
1 file changed, 77 insertions(+), 3 deletions(-)
diff --git a/mm/kstackwatch/stack.c b/mm/kstackwatch/stack.c
index 96014eb4cb12..60371b292915 100644
--- a/mm/kstackwatch/stack.c
+++ b/mm/kstackwatch/stack.c
@@ -8,6 +8,7 @@
#include <linux/kstackwatch_types.h>
#include <linux/printk.h>
+#define MAX_CANARY_SEARCH_STEPS 128
static struct kprobe entry_probe;
static struct fprobe exit_probe;
@@ -58,13 +59,86 @@ static bool ksw_stack_check_ctx(bool entry)
return false;
}
+static unsigned long ksw_find_stack_canary_addr(struct pt_regs *regs)
+{
+ unsigned long *stack_ptr, *stack_end, *stack_base;
+ unsigned long expected_canary;
+ unsigned int i;
+
+ stack_ptr = (unsigned long *)kernel_stack_pointer(regs);
+
+ stack_base = (unsigned long *)(current->stack);
+
+ // TODO: limit it to the current frame
+ stack_end = (unsigned long *)((char *)current->stack + THREAD_SIZE);
+
+ expected_canary = current->stack_canary;
+
+ if (stack_ptr < stack_base || stack_ptr >= stack_end) {
+ pr_err("Stack pointer 0x%lx out of bounds [0x%lx, 0x%lx)\n",
+ (unsigned long)stack_ptr, (unsigned long)stack_base,
+ (unsigned long)stack_end);
+ return 0;
+ }
+
+ for (i = 0; i < MAX_CANARY_SEARCH_STEPS; i++) {
+ if (&stack_ptr[i] >= stack_end)
+ break;
+
+ if (stack_ptr[i] == expected_canary) {
+ pr_debug("canary found i:%d 0x%lx\n", i,
+ (unsigned long)&stack_ptr[i]);
+ return (unsigned long)&stack_ptr[i];
+ }
+ }
+
+ pr_debug("canary not found in first %d steps\n",
+ MAX_CANARY_SEARCH_STEPS);
+ return 0;
+}
+
+static int ksw_stack_validate_addr(unsigned long addr, size_t size)
+{
+ unsigned long stack_start, stack_end;
+
+ if (!addr || !size)
+ return -EINVAL;
+
+ stack_start = (unsigned long)current->stack;
+ stack_end = stack_start + THREAD_SIZE;
+
+ if (addr < stack_start || (addr + size) > stack_end)
+ return -ERANGE;
+
+ return 0;
+}
+
static int ksw_stack_prepare_watch(struct pt_regs *regs,
const struct ksw_config *config,
ulong *watch_addr, u16 *watch_len)
{
- /* implement logic will be added in following patches */
- *watch_addr = 0;
- *watch_len = 0;
+ ulong addr;
+ u16 len;
+
+ if (ksw_get_config()->auto_canary) {
+ addr = ksw_find_stack_canary_addr(regs);
+ if (!addr)
+ return -EINVAL;
+ len = sizeof(ulong);
+ } else {
+ addr = kernel_stack_pointer(regs) + ksw_get_config()->sp_offset;
+ len = ksw_get_config()->watch_len;
+ if (!len)
+ len = sizeof(ulong);
+ }
+
+ if (ksw_stack_validate_addr(addr, len)) {
+ pr_err("invalid stack addr:0x%lx len :%u\n", addr, len);
+ return -EINVAL;
+ }
+
+ *watch_addr = addr;
+ *watch_len = len;
return 0;
}
--
2.43.0
next prev parent reply other threads:[~2025-11-10 16:37 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-10 16:35 [PATCH v8 00/27] mm/ksw: Introduce KStackWatch debugging tool Jinchao Wang
2025-11-10 16:35 ` [PATCH v8 01/27] x86/hw_breakpoint: Unify breakpoint install/uninstall Jinchao Wang
2025-11-10 16:35 ` [PATCH v8 02/27] x86/hw_breakpoint: Add arch_reinstall_hw_breakpoint Jinchao Wang
2025-11-10 16:35 ` [PATCH v8 03/27] HWBP: Add modify_wide_hw_breakpoint_local() API Jinchao Wang
2025-11-10 16:35 ` [PATCH v8 04/27] mm/ksw: add build system support Jinchao Wang
2025-11-10 16:36 ` [PATCH v8 05/27] mm/ksw: add ksw_config struct and parser Jinchao Wang
2025-11-10 16:36 ` [PATCH v8 06/27] mm/ksw: add singleton debugfs interface Jinchao Wang
2025-11-10 16:36 ` [PATCH v8 07/27] mm/ksw: add HWBP pre-allocation Jinchao Wang
2025-11-10 16:36 ` [PATCH v8 08/27] mm/ksw: Add atomic watchpoint management api Jinchao Wang
2025-11-10 16:36 ` [PATCH v8 09/27] mm/ksw: ignore false positives from exit trampolines Jinchao Wang
2025-11-10 16:36 ` [PATCH v8 10/27] mm/ksw: support CPU hotplug Jinchao Wang
2025-11-10 16:36 ` [PATCH v8 11/27] sched/ksw: add per-task context Jinchao Wang
2025-11-10 16:36 ` [PATCH v8 12/27] mm/ksw: add entry kprobe and exit fprobe management Jinchao Wang
2025-11-10 16:36 ` [PATCH v8 13/27] mm/ksw: add per-task ctx tracking Jinchao Wang
2025-11-10 16:36 ` Jinchao Wang [this message]
2025-11-10 16:36 ` [PATCH v8 15/27] mm/ksw: limit canary search to current stack frame Jinchao Wang
2025-11-10 16:36 ` [PATCH v8 16/27] mm/ksw: manage probe and HWBP lifecycle via procfs Jinchao Wang
2025-11-10 16:36 ` [PATCH v8 17/27] mm/ksw: add KSTACKWATCH_PROFILING to measure probe cost Jinchao Wang
2025-11-10 16:36 ` [PATCH v8 18/27] arm64/hw_breakpoint: Add arch_reinstall_hw_breakpoint Jinchao Wang
2025-11-10 16:36 ` [PATCH v8 19/27] arm64/hwbp/ksw: integrate KStackWatch handler support Jinchao Wang
2025-11-10 16:36 ` [PATCH v8 20/27] mm/ksw: add self-debug helpers Jinchao Wang
2025-11-10 16:36 ` [PATCH v8 21/27] mm/ksw: add test module Jinchao Wang
2025-11-10 16:36 ` [PATCH v8 22/27] mm/ksw: add stack overflow test Jinchao Wang
2025-11-10 16:36 ` [PATCH v8 23/27] mm/ksw: add recursive depth test Jinchao Wang
2025-11-10 16:36 ` [PATCH v8 24/27] mm/ksw: add multi-thread corruption test cases Jinchao Wang
2025-11-10 16:36 ` [PATCH v8 25/27] tools/ksw: add arch-specific test script Jinchao Wang
2025-11-10 16:36 ` [PATCH v8 26/27] docs: add KStackWatch document Jinchao Wang
2025-11-10 16:36 ` [PATCH v8 27/27] MAINTAINERS: add entry for KStackWatch Jinchao Wang
2025-11-10 17:33 ` [PATCH v8 00/27] mm/ksw: Introduce KStackWatch debugging tool Matthew Wilcox
2025-11-12 2:14 ` Jinchao Wang
2025-11-12 20:36 ` Matthew Wilcox
2025-11-13 4:40 ` Jinchao Wang
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=20251110163634.3686676-15-wangjinchao600@gmail.com \
--to=wangjinchao600@gmail.com \
--cc=Liam.Howlett@oracle.com \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=akpm@linux-foundation.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=aliceryhl@google.com \
--cc=andreyknvl@gmail.com \
--cc=andrii@kernel.org \
--cc=ardb@kernel.org \
--cc=bp@alien8.de \
--cc=bsegall@google.com \
--cc=catalin.marinas@arm.com \
--cc=corbet@lwn.net \
--cc=dave.hansen@linux.intel.com \
--cc=davem@davemloft.net \
--cc=david.kaplan@amd.com \
--cc=david@redhat.com \
--cc=dietmar.eggemann@arm.com \
--cc=dvyukov@google.com \
--cc=elver@google.com \
--cc=glider@google.com \
--cc=hpa@zytor.com \
--cc=irogers@google.com \
--cc=james.clark@linaro.org \
--cc=jolsa@kernel.org \
--cc=juri.lelli@redhat.com \
--cc=justinstitt@google.com \
--cc=kan.liang@linux.intel.com \
--cc=kasan-dev@googlegroups.com \
--cc=kees@kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=llvm@lists.linux.dev \
--cc=lorenzo.stoakes@oracle.com \
--cc=mark.rutland@arm.com \
--cc=masahiroy@kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=mgorman@suse.de \
--cc=mhiramat@kernel.org \
--cc=mhocko@suse.com \
--cc=mingo@redhat.com \
--cc=morbo@google.com \
--cc=namcao@linutronix.de \
--cc=namhyung@kernel.org \
--cc=nathan@kernel.org \
--cc=naveen@kernel.org \
--cc=nick.desaulniers+lkml@gmail.com \
--cc=ojeda@kernel.org \
--cc=peterz@infradead.org \
--cc=rdunlap@infradead.org \
--cc=rostedt@goodmis.org \
--cc=rppt@kernel.org \
--cc=ruanjinjie@huawei.com \
--cc=ryabinin.a.a@gmail.com \
--cc=samitolvanen@google.com \
--cc=surenb@google.com \
--cc=tglx@linutronix.de \
--cc=thomas.weissschuh@linutronix.de \
--cc=vbabka@suse.cz \
--cc=vincent.guittot@linaro.org \
--cc=vincenzo.frascino@arm.com \
--cc=vschneid@redhat.com \
--cc=will@kernel.org \
--cc=workflows@vger.kernel.org \
--cc=x86@kernel.org \
--cc=xur@google.com \
/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;
as well as URLs for NNTP newsgroup(s).