From nobody Wed Feb 11 07:48:31 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7BCF049659 for ; Thu, 8 Jan 2026 15:51:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767887468; cv=none; b=CyMRYRoj6YJ8QsBE39dqHMkG+cX22UPJ2sTWca1WNzWeWhAbiG56HXcURxx8KF9I8eREuHMH92BjnTXM2oZLb42BbjTiKy825qM2X75gFmqWcRBRJCxVknjuZWJNQD2HZdZPLIi15eINmtN0f6/pM52fDWDJNUjAxWOTf7LKv2g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767887468; c=relaxed/simple; bh=EWd/cudZFJrHXDRAIHPCSbLpS7jIgEqZwfpgPDAwTYY=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=LUGjwiizZQldbq72uQm7j1qwgwZPYN1zXXfcxc2HN7njQdvizz3sTnGDBo6k9heSwhkCXpV2nwBvX7zJQcvYSLbQFh65Tcb6m6M39oGNFEK4Cqu7GimBgXLLEPnjskKzG2ZkTklL8aUhWwWA4hMUyyhpTrnE5EmmMZdM2zdukhE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=k67orgsU; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="k67orgsU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 32B14C16AAE; Thu, 8 Jan 2026 15:51:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767887468; bh=EWd/cudZFJrHXDRAIHPCSbLpS7jIgEqZwfpgPDAwTYY=; h=Date:From:To:Cc:Subject:References:From; b=k67orgsULLPiLgY1hi5H39n/YH6mtnLozaQqe4zcUZ25tB1qeWCXoKOS1d9WmcjG2 Z7TsrXpXWK0mZ72xzznc5IesMJAK0q01VpFv7iAzIsRGUWvr3ASde4hllAnkgkGaU0 +GO8Q/o0a2clf1jE6vZKTKJlouPcLaEyBHGGJbMF0acwEv0f+fJ/fzKxXxkd8kPYMX 5b41uAdtTz6kvspipR6vmd9XB0gihf2+S0swiiX8O1iqZB1cI++Iw3LCgWN/BjoJAm ss5FvGltYITfKpzpi7SgdTeIa0/RnXKFccooTRjdJf27E9+HzWgDGiDz8zDuczD0qD 5THALXqg8ycVg== Received: from rostedt by gandalf with local (Exim 4.99.1) (envelope-from ) id 1vdsIT-00000004aUa-3kxP; Thu, 08 Jan 2026 10:51:37 -0500 Message-ID: <20260108155137.693994829@kernel.org> User-Agent: quilt/0.68 Date: Thu, 08 Jan 2026 10:51:21 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , "Paul E . McKenney" , Gabriele Paoloni , Julia Lawall Subject: [for-linus][PATCH 1/5] tracing: Drop unneeded assignment to soft_mode References: <20260108155120.023038025@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Julia Lawall soft_mode is not read in the enable case, so drop the assignment. Drop also the comment text that refers to the assignment and realign the comment. Cc: "Paul E . McKenney" Cc: Gabriele Paoloni Cc: Masami Hiramatsu Cc: Mathieu Desnoyers Link: https://patch.msgid.link/20251226110531.4129794-1-Julia.Lawall@inria.= fr Signed-off-by: Julia Lawall Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_events.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index 76067529db61..137b4d9bb116 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -826,16 +826,15 @@ static int __ftrace_event_enable_disable(struct trace= _event_file *file, * When soft_disable is set and enable is set, we want to * register the tracepoint for the event, but leave the event * as is. That means, if the event was already enabled, we do - * nothing (but set soft_mode). If the event is disabled, we - * set SOFT_DISABLED before enabling the event tracepoint, so - * it still seems to be disabled. + * nothing. If the event is disabled, we set SOFT_DISABLED + * before enabling the event tracepoint, so it still seems + * to be disabled. */ if (!soft_disable) clear_bit(EVENT_FILE_FL_SOFT_DISABLED_BIT, &file->flags); else { if (atomic_inc_return(&file->sm_ref) > 1) break; - soft_mode =3D true; /* Enable use of trace_buffered_event */ trace_buffered_event_enable(); } --=20 2.51.0 From nobody Wed Feb 11 07:48:31 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C46B518A956 for ; Thu, 8 Jan 2026 15:51:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767887468; cv=none; b=g0S2nX4tvBM7PhZAAGveCC0h1eDoSU/HC2sI3iYV+NNx1g8lI7gb0e/8uk+3QqN9HHnS99JM43pTqsE84frm1cuUZ0lkdMHKeOEu+QTAALfuZYN8NbQdFLweMxOLbJwhVe+EaMQ4OSqKAKVp74QPtAe0D9UVONHHZZG9iYM+Ip4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767887468; c=relaxed/simple; bh=OoUyWpXzKoQEQQAFFRkKYxrBz6OqXOu3Z50W7ndNmZU=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=iZf7hmH5Hf0k8lD5RVdcC2VPILg9ZPMPiATqw/RTUf3eDelc1evF1+kNDudzezdKm+voU4clkk2Dexli19vgXE4i7WfxSX2OB6nrGITK6dAH8Q+d4FEQ9wFJZLv0VGLr7nHSD1jTo7PoTCgSsVm4Jb6B78YpnR2n5XJmnV8vXOg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=A7SDxV37; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="A7SDxV37" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A2B4BC116C6; Thu, 8 Jan 2026 15:51:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767887468; bh=OoUyWpXzKoQEQQAFFRkKYxrBz6OqXOu3Z50W7ndNmZU=; h=Date:From:To:Cc:Subject:References:From; b=A7SDxV378BfRWYrWUf5w33mZApn9UOV+EMnjIiXjW7ywVvfRrxqSKHk2YvhFJIy9g VmaRwP2Ff8yGO60HKwYcf91eluGdjIRmQPNtKOK1K/k62hPJc+SibrqQZJ9U/HLF9s CivpvGMNQzn37vlic7eJA/TC7G6M1dxyUip5/IYINWssqxlh8cBX+X+rVoe8lZDhkr V7OB1iKRj33wyZ6MtYxHEd4C3xlpDj8NWi+86ZimhDfu4g8On8grA8jZ4RV+Eu4JPO uN/ri2dWkL/W7SZ0Ve8D4uluaNUYbonj/Rd7zac/fVBITxvPN+zV6VZAc+wRn9ET+O QV4kEGi/AyI7w== Received: from rostedt by gandalf with local (Exim 4.99.1) (envelope-from ) id 1vdsIU-00000004aV4-0cLx; Thu, 08 Jan 2026 10:51:38 -0500 Message-ID: <20260108155137.956642850@kernel.org> User-Agent: quilt/0.68 Date: Thu, 08 Jan 2026 10:51:22 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Wupeng Ma Subject: [for-linus][PATCH 2/5] ring-buffer: Avoid softlockup in ring_buffer_resize() during memory free References: <20260108155120.023038025@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Wupeng Ma When user resize all trace ring buffer through file 'buffer_size_kb', then in ring_buffer_resize(), kernel allocates buffer pages for each cpu in a loop. If the kernel preemption model is PREEMPT_NONE and there are many cpus and there are many buffer pages to be freed, it may not give up cpu for a long time and finally cause a softlockup. To avoid it, call cond_resched() after each cpu buffer free as Commit f6bd2c92488c ("ring-buffer: Avoid softlockup in ring_buffer_resize()") does. Detailed call trace as follow: rcu: INFO: rcu_sched self-detected stall on CPU rcu: 24-....: (14837 ticks this GP) idle=3D521c/1/0x4000000000000000 sof= tirq=3D230597/230597 fqs=3D5329 rcu: (t=3D15004 jiffies g=3D26003221 q=3D211022 ncpus=3D96) CPU: 24 UID: 0 PID: 11253 Comm: bash Kdump: loaded Tainted: G = EL 6.18.2+ #278 NONE pc : arch_local_irq_restore+0x8/0x20 arch_local_irq_restore+0x8/0x20 (P) free_frozen_page_commit+0x28c/0x3b0 __free_frozen_pages+0x1c0/0x678 ___free_pages+0xc0/0xe0 free_pages+0x3c/0x50 ring_buffer_resize.part.0+0x6a8/0x880 ring_buffer_resize+0x3c/0x58 __tracing_resize_ring_buffer.part.0+0x34/0xd8 tracing_resize_ring_buffer+0x8c/0xd0 tracing_entries_write+0x74/0xd8 vfs_write+0xcc/0x288 ksys_write+0x74/0x118 __arm64_sys_write+0x24/0x38 Cc: Link: https://patch.msgid.link/20251228065008.2396573-1-mawupeng1@huawei.com Signed-off-by: Wupeng Ma Acked-by: Masami Hiramatsu (Google) Signed-off-by: Steven Rostedt (Google) --- kernel/trace/ring_buffer.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 41c9f5d079be..630221b00838 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -3137,6 +3137,8 @@ int ring_buffer_resize(struct trace_buffer *buffer, u= nsigned long size, list) { list_del_init(&bpage->list); free_buffer_page(bpage); + + cond_resched(); } } out_err_unlock: --=20 2.51.0 From nobody Wed Feb 11 07:48:31 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CBA2419C542; Thu, 8 Jan 2026 15:51:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767887468; cv=none; b=C5ASM8W2rVKeM1EX4Bh43bN/XxnoR0kCtm40Gb1PJS2Tzy4gdyUJr5L2YmsctsLgcDsOWqGmtiOn50qBZD/XZWslq6r1Sn6s9lOaSTgEQjapFbp+qPCgvt62EY8DcB+uQY6biYaI9x5Inh1r39o9Iqt/xTbF/YrR5V0O2OJNrMA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767887468; c=relaxed/simple; bh=GqxfLbnQfCeCQ5wwG5VD+VZ0mhegohzl1/3768Fqus4=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=YNx2nNDJYLg8YjnPpD3Zdaei8D7gM6bDBTBir8MyojGxY+HkTn2MMJPKZIanLtorlBp7WIK8tB2EY/NMK86+aIO+WlTYXs0ZpgoIF7CxmcQ199l/ZD6Ug1Uft7jtRSt+4EzNqQg9NA5aRPHrlDrXeX2vKxV7gFG094U3xW+inT8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mX0agM4Q; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="mX0agM4Q" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AF166C116D0; Thu, 8 Jan 2026 15:51:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767887468; bh=GqxfLbnQfCeCQ5wwG5VD+VZ0mhegohzl1/3768Fqus4=; h=Date:From:To:Cc:Subject:References:From; b=mX0agM4Q7i9ZzHqJC3HVKZwA8N6iF0/a7qYzyep0quYoJL9qd2DAQDMeMtSPM1QZ7 MCPqtdmJTIr+7IuXSvSnoAqUssTO68UG8k03h3mxQhPcFSNxzAVW1CUWEV2kQUpo7P B/NhpR0uzD2vG3gbaUUWktBsaHj03ufqs+bOckm71nmb5cOGbGOm+LuTlP+mRXDbV8 ADVDhX749aEu3z0wYuDBUyFxfAXXTz3PbD4QmAlI40r8C4DDoHWb59FqyyfdLGc11G oOZzpqm7rvBcXRJ4YzZs/brIHEQwgwF9qBJunleIJYmwfuk1Wl6Ky6SfvBynIZqoBp G4pOJ+DlZwMWQ== Received: from rostedt by gandalf with local (Exim 4.99.1) (envelope-from ) id 1vdsIU-00000004aVY-1kAc; Thu, 08 Jan 2026 10:51:38 -0500 Message-ID: <20260108155138.210174240@kernel.org> User-Agent: quilt/0.68 Date: Thu, 08 Jan 2026 10:51:23 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , stable@vger.kernel.org, pengdonglin , Dan Carpenter Subject: [for-linus][PATCH 3/5] ftrace: Make ftrace_graph_ent depth field signed References: <20260108155120.023038025@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Steven Rostedt The code has integrity checks to make sure that depth never goes below zero. But the depth field has recently been converted to unsigned long from "int" (for alignment reasons). As unsigned long can never be less than zero, the integrity checks no longer work. Convert depth to long from unsigned long to allow the integrity checks to work again. Cc: stable@vger.kernel.org Cc: Mathieu Desnoyers Cc: pengdonglin Link: https://patch.msgid.link/20260102143148.251c2e16@gandalf.local.home Reported-by: Dan Carpenter Closes: https://lore.kernel.org/all/aS6kGi0maWBl-MjZ@stanley.mountain/ Fixes: f83ac7544fbf7 ("function_graph: Enable funcgraph-args and funcgraph-= retaddr to work simultaneously") Signed-off-by: Steven Rostedt (Google) Acked-by: Masami Hiramatsu (Google) --- include/linux/ftrace.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index 770f0dc993cc..a3a8989e3268 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h @@ -1167,7 +1167,7 @@ static inline void ftrace_init(void) { } */ struct ftrace_graph_ent { unsigned long func; /* Current function */ - unsigned long depth; + long depth; /* signed to check for less than zero */ } __packed; =20 /* --=20 2.51.0 From nobody Wed Feb 11 07:48:31 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3D35D1CEAB2; Thu, 8 Jan 2026 15:51:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767887469; cv=none; b=uxdWOEBhgLDSVaAFub/oRld93nZMoeOqBOGuizvAQHbupze+YkW3jzjqKEg2yD0sm0sj9d/QMeo7596WtIJz80hDxyIZp6NeeQisQ1apQqJhTqiaZLmkV8GFJ6bQU+l8UWYldrzhXSS0DAFOvhJ/94brhnUegx+Is91xkkC5mjA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767887469; c=relaxed/simple; bh=JnAQNxKo3/kFpTWk7ALS9nsKn6/ADJVmJ4apj2OWGX4=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=enoc2I09Wf55mwplZwmcWtIe/uih+cMd2X/3vAbLv4H5YovP28t5BW+3gaY5qfMsmpijnSg5LOhgG4HFzYyDsukA+3gO360mQiuTJSxDWWfU6dqHKA0S0Y4IsqdydpozxJzsXGGscuFYbZK7VlSenc1dQlj3Xm74gnyQYS7G3XU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Co0aASMi; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Co0aASMi" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EF788C19423; Thu, 8 Jan 2026 15:51:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767887469; bh=JnAQNxKo3/kFpTWk7ALS9nsKn6/ADJVmJ4apj2OWGX4=; h=Date:From:To:Cc:Subject:References:From; b=Co0aASMi2dAGOZUFk0hKLB8fymAXgpOAiLhN1Q6cdzfBX4KhOm983MMCqjeVMPmCw +92w9L0b0nQfBDXP7Qt+iMFt7o5pzrs+VVqRsQKcWs8iR8OCBtcv1yNBHEBM/uxvuH YGR3qZjXknZocXTpkZYzZPbgI8XYrXJXpB1z3vApr84KK82LbxNGAFg81QjW+UGfwJ C8EvVlRqeUwemOxd/DjBKO/okj5N+aULxXV11CCtX1oHzkZZLgwE8sOzxE4Icbeq3T X7pcllQKoH0xH2S2y7X/7W+C6TD6wbBQywkde3w00LIj6tz2//c8EBkMqca9v0sxEP 1Lj+eaC7Ji6Qw== Received: from rostedt by gandalf with local (Exim 4.99.1) (envelope-from ) id 1vdsIU-00000004aW2-2vV2; Thu, 08 Jan 2026 10:51:38 -0500 Message-ID: <20260108155138.481872797@kernel.org> User-Agent: quilt/0.68 Date: Thu, 08 Jan 2026 10:51:24 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , stable@vger.kernel.org, Joel Fernandes , "Paul E. McKenney" , Boqun Feng , Yao Kai Subject: [for-linus][PATCH 4/5] tracing: Add recursion protection in kernel stack trace recording References: <20260108155120.023038025@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Steven Rostedt A bug was reported about an infinite recursion caused by tracing the rcu events with the kernel stack trace trigger enabled. The stack trace code called back into RCU which then called the stack trace again. Expand the ftrace recursion protection to add a set of bits to protect events from recursion. Each bit represents the context that the event is in (normal, softirq, interrupt and NMI). Have the stack trace code use the interrupt context to protect against recursion. Note, the bug showed an issue in both the RCU code as well as the tracing stacktrace code. This only handles the tracing stack trace side of the bug. The RCU fix will be handled separately. Link: https://lore.kernel.org/all/20260102122807.7025fc87@gandalf.local.hom= e/ Cc: stable@vger.kernel.org Cc: Masami Hiramatsu Cc: Mathieu Desnoyers Cc: Joel Fernandes Cc: "Paul E. McKenney" Cc: Boqun Feng Link: https://patch.msgid.link/20260105203141.515cd49f@gandalf.local.home Reported-by: Yao Kai Tested-by: Yao Kai Fixes: 5f5fa7ea89dc ("rcu: Don't use negative nesting depth in __rcu_read_u= nlock()") Signed-off-by: Steven Rostedt (Google) --- include/linux/trace_recursion.h | 9 +++++++++ kernel/trace/trace.c | 6 ++++++ 2 files changed, 15 insertions(+) diff --git a/include/linux/trace_recursion.h b/include/linux/trace_recursio= n.h index ae04054a1be3..e6ca052b2a85 100644 --- a/include/linux/trace_recursion.h +++ b/include/linux/trace_recursion.h @@ -34,6 +34,13 @@ enum { TRACE_INTERNAL_SIRQ_BIT, TRACE_INTERNAL_TRANSITION_BIT, =20 + /* Internal event use recursion bits */ + TRACE_INTERNAL_EVENT_BIT, + TRACE_INTERNAL_EVENT_NMI_BIT, + TRACE_INTERNAL_EVENT_IRQ_BIT, + TRACE_INTERNAL_EVENT_SIRQ_BIT, + TRACE_INTERNAL_EVENT_TRANSITION_BIT, + TRACE_BRANCH_BIT, /* * Abuse of the trace_recursion. @@ -58,6 +65,8 @@ enum { =20 #define TRACE_LIST_START TRACE_INTERNAL_BIT =20 +#define TRACE_EVENT_START TRACE_INTERNAL_EVENT_BIT + #define TRACE_CONTEXT_MASK ((1 << (TRACE_LIST_START + TRACE_CONTEXT_BITS))= - 1) =20 /* diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 6f2148df14d9..aef9058537d5 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -3012,6 +3012,11 @@ static void __ftrace_trace_stack(struct trace_array = *tr, struct ftrace_stack *fstack; struct stack_entry *entry; int stackidx; + int bit; + + bit =3D trace_test_and_set_recursion(_THIS_IP_, _RET_IP_, TRACE_EVENT_STA= RT); + if (bit < 0) + return; =20 /* * Add one, for this function and the call to save_stack_trace() @@ -3080,6 +3085,7 @@ static void __ftrace_trace_stack(struct trace_array *= tr, /* Again, don't let gcc optimize things here */ barrier(); __this_cpu_dec(ftrace_stack_reserve); + trace_clear_recursion(bit); } =20 static inline void ftrace_trace_stack(struct trace_array *tr, --=20 2.51.0 From nobody Wed Feb 11 07:48:31 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 542101DF97C for ; Thu, 8 Jan 2026 15:51:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767887469; cv=none; b=erLeIOnP/j3MKQt/RyHdmqzqQr/7fmPObO5idFrXi04FPeXTKk1j92gmChWc1x2AsojwiXehwzeC0gdQGfs9os7dcW2s2hMPE/DoOcFYxlLe+gWI6U9V93sIdhSwr6Lw9Nmy8YVHxVF0BzpDIqYaL+RbbfoTZ9e/SG3duGNXOCw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767887469; c=relaxed/simple; bh=Q88zzbcgYP4/6mI0pn9yYiFpRz2rCPe714ST5AyNvpQ=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=Vt60h3buqWm3Qbj0LnauMR5Ngo38mry24gHyzfyT58WXtjekPDCp/dguLTT7YDeiiaCzu3XOIJRt5zST9jCcw7L6NzK/PPz29ZzDNXFnSleIIGYJrE2MGxWfIaIuqFvEes5xkFw01Ui6lB/EtmresASrKtwS4ctc3veYJg2I/Q4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=AN/Nyv/y; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="AN/Nyv/y" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 304E7C16AAE; Thu, 8 Jan 2026 15:51:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767887469; bh=Q88zzbcgYP4/6mI0pn9yYiFpRz2rCPe714ST5AyNvpQ=; h=Date:From:To:Cc:Subject:References:From; b=AN/Nyv/yk35zTkZ/S22r9E7Vrx8p5HLhSTAZ0U4g7bt+ynbjF5Y1mY0Zut7Xv6qSB Efhzvr4sSPAclbiXR9yIZ6xY/ByzzYeRS0e+oi8IVPSx1MVzfA//wda8POkfhIfGhN X4TmkNRBWqL4h2lAMD/N8icPElSItcJcUp7xhGtceIajQB50zOWODoqRK/tqkRFnWO GdE/RYMCUlenlJ1zFO4hIRDtVgqL0HXUeVvfC4SZOUF/y8dnRv0rNsk2QT4n8vSbgU EDXTa0EHOwnTfBUjKPnRYkw/4RvgCj9wBZ24G3orNn5tcOsmpHOougxzUpLjHgodLy kz+swEQNkiGtw== Received: from rostedt by gandalf with local (Exim 4.99.1) (envelope-from ) id 1vdsIU-00000004aWX-43Xc; Thu, 08 Jan 2026 10:51:38 -0500 Message-ID: <20260108155138.759845745@kernel.org> User-Agent: quilt/0.68 Date: Thu, 08 Jan 2026 10:51:25 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Ben Dooks Subject: [for-linus][PATCH 5/5] trace: ftrace_dump_on_oops[] is not exported, make it static References: <20260108155120.023038025@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Ben Dooks The ftrace_dump_on_oops string is not used outside of trace.c so make it static to avoid the export warning from sparse: kernel/trace/trace.c:141:6: warning: symbol 'ftrace_dump_on_oops' was not d= eclared. Should it be static? Fixes: dd293df6395a2 ("tracing: Move trace sysctls into trace.c") Link: https://patch.msgid.link/20260106231054.84270-1-ben.dooks@codethink.c= o.uk Signed-off-by: Ben Dooks Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index aef9058537d5..baec63134ab6 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -138,7 +138,7 @@ cpumask_var_t __read_mostly tracing_buffer_mask; * by commas. */ /* Set to string format zero to disable by default */ -char ftrace_dump_on_oops[MAX_TRACER_SIZE] =3D "0"; +static char ftrace_dump_on_oops[MAX_TRACER_SIZE] =3D "0"; =20 /* When set, tracing will stop when a WARN*() is hit */ static int __disable_trace_on_warning; --=20 2.51.0