From: Jinchao Wang <wangjinchao600@gmail.com>
To: Andrew Morton <akpm@linux-foundation.org>,
Masami Hiramatsu <mhiramat@kernel.org>,
"Naveen N . Rao" <naveen@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
Dave Hansen <dave.hansen@linux.intel.com>,
x86@kernel.org, "H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@kernel.org>, Ian Rogers <irogers@google.com>,
Adrian Hunter <adrian.hunter@intel.com>,
"Liang, Kan" <kan.liang@linux.intel.com>,
David Hildenbrand <david@redhat.com>,
Lorenzo Stoakes <lorenzo.stoakes@oracle.com>,
"Liam R. Howlett" <Liam.Howlett@oracle.com>,
Vlastimil Babka <vbabka@suse.cz>, Mike Rapoport <rppt@kernel.org>,
Suren Baghdasaryan <surenb@google.com>,
Michal Hocko <mhocko@suse.com>,
linux-perf-users@vger.kernel.org, linux-mm@kvack.org,
linux-trace-kernel@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Jinchao Wang <wangjinchao600@gmail.com>
Subject: [PATCH v2 10/18] mm/ksw: add per-task recursion depth tracking
Date: Thu, 4 Sep 2025 08:21:07 +0800 [thread overview]
Message-ID: <20250904002126.1514566-11-wangjinchao600@gmail.com> (raw)
In-Reply-To: <20250904002126.1514566-1-wangjinchao600@gmail.com>
Implement depth tracking for KStackWatch to support stack-level filtering.
Each task's recursive entry depth is stored in a global hash table keyed by
pid:
- get_recursive_depth()/set_recursive_depth() manage per-task depth
- reset_recursive_depth() clears all tracked entries
- entry/exit handlers increment or decrement depth and skip if the
current depth does not match the configured depth.
This works even across task scheduling or in interrupt context, since depth
is tracked per-task, ensuring KStackWatch can selectively monitor a
specific recursion level without redundant triggers.
Signed-off-by: Jinchao Wang <wangjinchao600@gmail.com>
---
mm/kstackwatch/stack.c | 105 ++++++++++++++++++++++++++++++++++++++++-
1 file changed, 103 insertions(+), 2 deletions(-)
diff --git a/mm/kstackwatch/stack.c b/mm/kstackwatch/stack.c
index 00cb38085a9f..8758b8b94f7f 100644
--- a/mm/kstackwatch/stack.c
+++ b/mm/kstackwatch/stack.c
@@ -1,6 +1,8 @@
// SPDX-License-Identifier: GPL-2.0
#include <linux/fprobe.h>
+#include <linux/hashtable.h>
+#include <linux/hash.h>
#include <linux/interrupt.h>
#include <linux/kprobes.h>
#include <linux/percpu.h>
@@ -12,6 +14,81 @@
struct ksw_config *probe_config;
+#define DEPTH_HASH_BITS 8
+#define DEPTH_HASH_SIZE BIT(DEPTH_HASH_BITS)
+
+struct depth_entry {
+ pid_t pid;
+ int depth; /* starts from 0 */
+ struct hlist_node node;
+};
+
+static DEFINE_HASHTABLE(depth_hash, DEPTH_HASH_BITS);
+static DEFINE_SPINLOCK(depth_hash_lock);
+
+static int get_recursive_depth(void)
+{
+ struct depth_entry *entry;
+ pid_t pid = current->pid;
+ int depth = 0;
+
+ spin_lock(&depth_hash_lock);
+ hash_for_each_possible(depth_hash, entry, node,
+ hash_32(pid, DEPTH_HASH_BITS)) {
+ if (entry->pid == pid) {
+ depth = entry->depth;
+ break;
+ }
+ }
+ spin_unlock(&depth_hash_lock);
+ return depth;
+}
+
+static void set_recursive_depth(int depth)
+{
+ struct depth_entry *entry;
+ pid_t pid = current->pid;
+ bool found = false;
+
+ spin_lock(&depth_hash_lock);
+ hash_for_each_possible(depth_hash, entry, node,
+ hash_32(pid, DEPTH_HASH_BITS)) {
+ if (entry->pid == pid) {
+ entry->depth = depth;
+ found = true;
+ break;
+ }
+ }
+
+ if (!found && depth > 0) {
+ entry = kmalloc(sizeof(*entry), GFP_ATOMIC);
+ if (entry) {
+ entry->pid = pid;
+ entry->depth = depth;
+ hash_add(depth_hash, &entry->node,
+ hash_32(pid, DEPTH_HASH_BITS));
+ }
+ } else if (found && depth == 0) {
+ hash_del(&entry->node);
+ kfree(entry);
+ }
+ spin_unlock(&depth_hash_lock);
+}
+
+static void reset_recursive_depth(void)
+{
+ struct depth_entry *entry;
+ struct hlist_node *tmp;
+ int bkt;
+
+ spin_lock(&depth_hash_lock);
+ hash_for_each_safe(depth_hash, bkt, tmp, entry, node) {
+ hash_del(&entry->node);
+ kfree(entry);
+ }
+ spin_unlock(&depth_hash_lock);
+}
+
/* Find canary address in current stack frame */
static unsigned long ksw_stack_find_canary(struct pt_regs *regs)
{
@@ -119,10 +196,21 @@ static struct fprobe exit_probe_fprobe;
static void ksw_stack_entry_handler(struct kprobe *p, struct pt_regs *regs,
unsigned long flags)
{
+ int cur_depth;
int ret;
u64 watch_addr;
u64 watch_len;
+ cur_depth = get_recursive_depth();
+ set_recursive_depth(cur_depth + 1);
+
+ /* depth start from 0 */
+ if (cur_depth != probe_config->depth) {
+ pr_info("KSW: config_depth:%u cur_depth:%d entry skipping\n",
+ probe_config->depth, cur_depth);
+ return;
+ }
+
ret = ksw_stack_prepare_watch(regs, probe_config, &watch_addr,
&watch_len);
if (ret) {
@@ -132,8 +220,8 @@ static void ksw_stack_entry_handler(struct kprobe *p, struct pt_regs *regs,
ret = ksw_watch_on(watch_addr, watch_len);
if (ret) {
- pr_err("KSW: failed to watch on addr:0x%llx len:%llx %d\n",
- watch_addr, watch_len, ret);
+ pr_err("KSW: failed to watch on depth:%d addr:0x%llx len:%llx %d\n",
+ cur_depth, watch_addr, watch_len, ret);
return;
}
}
@@ -142,6 +230,17 @@ static void ksw_stack_exit_handler(struct fprobe *fp, unsigned long ip,
unsigned long ret_ip,
struct ftrace_regs *regs, void *data)
{
+ int cur_depth;
+
+ cur_depth = get_recursive_depth() - 1;
+ set_recursive_depth(cur_depth);
+
+ if (cur_depth != probe_config->depth) {
+ pr_info("KSW: config_depth:%u cur_depth:%d exit skipping\n",
+ probe_config->depth, cur_depth);
+ return;
+ }
+
ksw_watch_off();
}
@@ -150,6 +249,8 @@ int ksw_stack_init(struct ksw_config *config)
int ret;
char *symbuf = NULL;
+ reset_recursive_depth();
+
/* Setup entry probe */
memset(&entry_probe, 0, sizeof(entry_probe));
entry_probe.symbol_name = config->function;
--
2.43.0
next prev parent reply other threads:[~2025-09-04 0:23 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-04 0:20 [PATCH v2 00/18] mm/ksw: Introduce real-time Kernel Stack Watch debugging tool Jinchao Wang
2025-09-04 0:20 ` [PATCH v2 01/18] mm/ksw: add build system support Jinchao Wang
2025-09-04 7:46 ` Mike Rapoport
2025-09-04 0:20 ` [PATCH v2 02/18] mm/ksw: add ksw_config struct and parser Jinchao Wang
2025-09-04 7:47 ` Mike Rapoport
2025-09-04 0:21 ` [PATCH v2 03/18] mm/ksw: add /proc/kstackwatch interface Jinchao Wang
2025-09-04 7:51 ` Mike Rapoport
2025-09-04 0:21 ` [PATCH v2 04/18] mm/ksw: add HWBP pre-allocation support Jinchao Wang
2025-09-04 0:21 ` [PATCH v2 05/18] x86/hw_breakpoint: introduce arch_reinstall_hw_breakpoint() for atomic context Jinchao Wang
2025-09-04 6:38 ` Peter Zijlstra
2025-09-04 0:21 ` [PATCH v2 06/18] perf/hw_breakpoint: add arch-independent hw_breakpoint_modify_local() Jinchao Wang
2025-09-04 6:44 ` Peter Zijlstra
2025-09-05 16:18 ` kernel test robot
2025-09-05 17:31 ` kernel test robot
2025-09-04 0:21 ` [PATCH v2 07/18] mm/ksw: add atomic watch on/off operations Jinchao Wang
2025-09-04 6:46 ` Peter Zijlstra
2025-09-04 0:21 ` [PATCH v2 08/18] mm/ksw: add stack probe support Jinchao Wang
2025-09-04 0:21 ` [PATCH v2 09/18] mm/ksw: implement stack canary and local var resolution logic Jinchao Wang
2025-09-04 0:21 ` Jinchao Wang [this message]
2025-09-04 0:21 ` [PATCH v2 11/18] mm/ksw: coordinate watch and stack for full functionality Jinchao Wang
2025-09-04 0:21 ` [PATCH v2 12/18] mm/ksw: add self-debug functions for kstackwatch watch Jinchao Wang
2025-09-04 0:21 ` [PATCH v2 13/18] mm/ksw: add test module Jinchao Wang
2025-09-04 0:21 ` [PATCH v2 14/18] mm/ksw: add stack overflow test Jinchao Wang
2025-09-04 0:21 ` [PATCH v2 15/18] mm/ksw: add simplified silent corruption test Jinchao Wang
2025-09-04 0:21 ` [PATCH v2 16/18] mm/ksw: add recursive " Jinchao Wang
2025-09-04 0:21 ` [PATCH v2 17/18] tools/kstackwatch: add interactive test script for KStackWatch Jinchao Wang
2025-09-04 0:21 ` [PATCH v2 18/18] MAINTAINERS: add entry for KStackWatch (Kernel Stack Watch) 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=20250904002126.1514566-11-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=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=david@redhat.com \
--cc=hpa@zytor.com \
--cc=irogers@google.com \
--cc=jolsa@kernel.org \
--cc=kan.liang@linux.intel.com \
--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=lorenzo.stoakes@oracle.com \
--cc=mark.rutland@arm.com \
--cc=mhiramat@kernel.org \
--cc=mhocko@suse.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=naveen@kernel.org \
--cc=peterz@infradead.org \
--cc=rppt@kernel.org \
--cc=surenb@google.com \
--cc=tglx@linutronix.de \
--cc=vbabka@suse.cz \
--cc=x86@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;
as well as URLs for NNTP newsgroup(s).