From mboxrd@z Thu Jan 1 00:00:00 1970 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 9883936F41F for ; Wed, 18 Mar 2026 11:39:15 +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=1773833955; cv=none; b=dvCVL52GuY/mV/4BdluedC32ilFtYu74gPA2zYsupmaEFsEtGycnNrsUbAuY17CSJZFnkjPxzK5QwRIJH37aZHqj3Iet0tRV9Fuk62xMzk44Ym5DMmFGsoOtoyLQFxBqX0Uj4uFQzvw4ZGxKeyCzMo5h2CWm5DHAW1D6QMg8ZPk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773833955; c=relaxed/simple; bh=UvSMwqcpukM/Ibk+Ft3J3rVQhYOXTh62lwMI9e0mC8U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lxkgY/uIpkHBmSPxZuyznCkXGUJGOYPMKv1PsCbomS9JMYiCrVW8pByUHlmfxWKEFIeUaFRgLUq2//2IGvtwMSLib1Yvkdz0ybDCJG1dIXBJEMFWiJgv721C7LWUjD7gJeqvgeQZbVjIvWP5jpZN2zafAMWyrUSFGwqOFC2qi/0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=DNudknZH; 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="DNudknZH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9A64EC19424; Wed, 18 Mar 2026 11:39:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773833955; bh=UvSMwqcpukM/Ibk+Ft3J3rVQhYOXTh62lwMI9e0mC8U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DNudknZHCGZIvBvYCNLlqTEBZxJ5UOqXXAw+c3R/rrNswI3lwtltHbyrmu6yHsD6O TUSLcCMD9i++z7r5KI78bwXiLNHjD8qV4nJN9Cp2w0SYzndjgODoJteD4FWKmkDYDD ffb7g2cLeYMt8a3SQITGG709XS4gOYiqK83bQ055Xnw+YAVjZnLHNVN1WzlROM94EW vnuWXYCt8pxxsJyZ8WCXbJrICfqg4c2BUGJq3TyzdPhgjhlfllWsc+p1uymXZvnCY9 aymwKN9VkrYB963/j2jpYG3A59KHnXz+t66Pj9FNabeb+eGQfTQ6sWirbO/Jw2MWdb p8AIKpvbCUqXw== From: Sasha Levin To: stable@vger.kernel.org Cc: Shengming Hu , "Masami Hiramatsu (Google)" , "Steven Rostedt (Google)" , Sasha Levin Subject: [PATCH 6.12.y] fgraph: Fix thresh_return clear per-task notrace Date: Wed, 18 Mar 2026 07:39:12 -0400 Message-ID: <20260318113912.631601-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <2026031702-deduct-voucher-50a9@gregkh> References: <2026031702-deduct-voucher-50a9@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Shengming Hu [ Upstream commit 6ca8379b5d36e22b04e6315c3e49a6083377c862 ] When tracing_thresh is enabled, function graph tracing uses trace_graph_thresh_return() as the return handler. Unlike trace_graph_return(), it did not clear the per-task TRACE_GRAPH_NOTRACE flag set by the entry handler for set_graph_notrace addresses. This could leave the task permanently in "notrace" state and effectively disable function graph tracing for that task. Mirror trace_graph_return()'s per-task notrace handling by clearing TRACE_GRAPH_NOTRACE and returning early when set. Cc: stable@vger.kernel.org Link: https://patch.msgid.link/20260221113007819YgrZsMGABff4Rc-O_fZxL@zte.com.cn Fixes: b84214890a9bc ("function_graph: Move graph notrace bit to shadow stack global var") Acked-by: Masami Hiramatsu (Google) Signed-off-by: Shengming Hu Signed-off-by: Steven Rostedt (Google) Signed-off-by: Sasha Levin --- kernel/trace/trace_functions_graph.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c index 655246a9bec34..47ea114ca9f46 100644 --- a/kernel/trace/trace_functions_graph.c +++ b/kernel/trace/trace_functions_graph.c @@ -271,10 +271,12 @@ void trace_graph_return(struct ftrace_graph_ret *trace, static void trace_graph_thresh_return(struct ftrace_graph_ret *trace, struct fgraph_ops *gops) { + unsigned long *task_var = fgraph_get_task_var(gops); + ftrace_graph_addr_finish(gops, trace); - if (trace_recursion_test(TRACE_GRAPH_NOTRACE_BIT)) { - trace_recursion_clear(TRACE_GRAPH_NOTRACE_BIT); + if (*task_var & TRACE_GRAPH_NOTRACE) { + *task_var &= ~TRACE_GRAPH_NOTRACE; return; } -- 2.51.0