From patchwork Mon Dec 18 13:14:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 180389 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp1233784dyi; Mon, 18 Dec 2023 05:20:47 -0800 (PST) X-Google-Smtp-Source: AGHT+IEYt0OpPj0ZMFLGriipu1PKNxXr7QoCIiHbt3L1aFREvzhO7Ym2nMRjk+q9UfEVRFGf4zmp X-Received: by 2002:a17:907:cb1d:b0:a23:3aff:2a05 with SMTP id um29-20020a170907cb1d00b00a233aff2a05mr445426ejc.112.1702905646857; Mon, 18 Dec 2023 05:20:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702905646; cv=none; d=google.com; s=arc-20160816; b=lOpd38w4OOhukdmFvj/vJNZVUopE9sl0H48nEtvdrEv/gOGqiy2lYxuD5soXFla15u 9Hkp1FDtMLD/u7kkC6SC9CKOWLwNC3xrBwGPzE1G+APY9qF1s0s61WQbYcjHN3q7nLBK mP/Keu21ougn3/YtjJVctFLSQxHwfTwxEhyxc6fNhmwojGNE303/6dNaydhw7gIge0oR mlMb/QxF+P0c+n1HmEwQS0cE3s9arU041xj/iV9JmkOAIymZVr00Oq298yjDU7EBxvWZ eBVa/DU/ahvDhQOMdKAodvItKRqdztGs9sAjme3fqbfoY8hbgxMVVa/VUAo/jkH1TQll lWSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:user-agent:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=OYBJw1NfeATJxeGscVzw9H+t8LsucyyBedZ6vHChRco=; fh=SIgps5XdV0XNwjZfT2uAI7g3mrspDldK9Qs8qQAfoa4=; b=DThhgFb1z0msu5+5raC1ITYlZj0zHteZ9col4D99qgPUTbxvfFb6fVNu+V4qSZjokR /3atztrETx2kEDXYsgRP/7i5YOwHPSIW0iJWhjzNGWgoI2DrWdEL9sVlJYyFiLEkvYED I1ItUwcNjdrDajVL5mO/KE3FIooQeVVqVqaNH1D4WyZBO2ARJ8YBwzZOC/9MKbrC8tyg wsSVaoUqKILqciSi2EjTcMIWVNC2g8mVpp/LD1Q5n9Shoe3BTnk76/p5R6dpswrME/gU XBzCqaGPnTJOhKP/RnOdKHM3RizKGzZ482vi2kLcKjcXWlXVOS8n5D1nRrImV8FXIKtt /6KQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="pu6Qd+y/"; spf=pass (google.com: domain of linux-kernel+bounces-3721-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-3721-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id p22-20020a170906b21600b00a2340d8392dsi1431424ejz.106.2023.12.18.05.20.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Dec 2023 05:20:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-3721-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="pu6Qd+y/"; spf=pass (google.com: domain of linux-kernel+bounces-3721-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-3721-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 76E141F2766A for ; Mon, 18 Dec 2023 13:20:46 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8E7E672076; Mon, 18 Dec 2023 13:14:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="pu6Qd+y/" X-Original-To: linux-kernel@vger.kernel.org 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 781B11D15D; Mon, 18 Dec 2023 13:14:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9753BC433C8; Mon, 18 Dec 2023 13:14:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1702905294; bh=x44g32Pd9O3zsRrhngWEUNn/+TG68nwVi1AhDspvG5g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pu6Qd+y/HUWogALSg125BbhFgAD0phJfg142nmNl8Fwn+C97mvsaeRtawoq2jRGJn PPjrIojrlu6O2enV6aYpzaZWmtWvrtSX0pAJTs/CYai9VnUleIfWfYwM1OuSULWmYT UGtuOjd1l725ysLbhYAl/6N+uCOi5gbY4377zzZyX4Ct4517D51RWiZtCihAnVdqUk ihk6zS9S/BHS2o9t7ISCwZvuWjRPjcR7sLkstIZ5IqwrdLNarkBtGtC7e4eR+pgkO/ yE7tVFcD4aL3KKEJQ2mg7xawnRnebxkiyeTtsh+EspIvSzA+1jH8IC14p44ub6RQ/m tdCrIDw9QJdQA== From: "Masami Hiramatsu (Google)" To: Alexei Starovoitov , Steven Rostedt , Florent Revest Cc: linux-trace-kernel@vger.kernel.org, LKML , Martin KaFai Lau , bpf , Sven Schnelle , Alexei Starovoitov , Jiri Olsa , Arnaldo Carvalho de Melo , Daniel Borkmann , Alan Maguire , Mark Rutland , Peter Zijlstra , Thomas Gleixner , Guo Ren Subject: [PATCH v5 16/34] function_graph: Move graph notrace bit to shadow stack global var Date: Mon, 18 Dec 2023 22:14:48 +0900 Message-Id: <170290528771.220107.12363722026023139378.stgit@devnote2> X-Mailer: git-send-email 2.34.1 In-Reply-To: <170290509018.220107.1347127510564358608.stgit@devnote2> References: <170290509018.220107.1347127510564358608.stgit@devnote2> User-Agent: StGit/0.19 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785625991597931079 X-GMAIL-MSGID: 1785625991597931079 From: Steven Rostedt (VMware) The use of the task->trace_recursion for the logic used for the function graph no-trace was a bit of an abuse of that variable. Now that there exists global vars that are per stack for registered graph traces, use that instead. Signed-off-by: Steven Rostedt (VMware) Signed-off-by: Masami Hiramatsu (Google) --- Changes in v2: - Make description lines shorter than 76 chars. --- include/linux/trace_recursion.h | 7 ------- kernel/trace/trace.h | 9 +++++++++ kernel/trace/trace_functions_graph.c | 10 ++++++---- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/include/linux/trace_recursion.h b/include/linux/trace_recursion.h index 00e792bf148d..cc11b0e9d220 100644 --- a/include/linux/trace_recursion.h +++ b/include/linux/trace_recursion.h @@ -44,13 +44,6 @@ enum { */ TRACE_IRQ_BIT, - /* - * To implement set_graph_notrace, if this bit is set, we ignore - * function graph tracing of called functions, until the return - * function is called to clear it. - */ - TRACE_GRAPH_NOTRACE_BIT, - /* Used to prevent recursion recording from recursing. */ TRACE_RECORD_RECURSION_BIT, }; diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index e3f452eda0e3..fac29f08d5d8 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -915,8 +915,17 @@ enum { TRACE_GRAPH_DEPTH_START_BIT, TRACE_GRAPH_DEPTH_END_BIT, + + /* + * To implement set_graph_notrace, if this bit is set, we ignore + * function graph tracing of called functions, until the return + * function is called to clear it. + */ + TRACE_GRAPH_NOTRACE_BIT, }; +#define TRACE_GRAPH_NOTRACE (1 << TRACE_GRAPH_NOTRACE_BIT) + static inline unsigned long ftrace_graph_depth(unsigned long *task_var) { return (*task_var >> TRACE_GRAPH_DEPTH_START_BIT) & 3; diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c index 66cce73e94f8..13d0387ac6a6 100644 --- a/kernel/trace/trace_functions_graph.c +++ b/kernel/trace/trace_functions_graph.c @@ -130,6 +130,7 @@ static inline int ftrace_graph_ignore_irqs(void) int trace_graph_entry(struct ftrace_graph_ent *trace, struct fgraph_ops *gops) { + unsigned long *task_var = fgraph_get_task_var(gops); struct trace_array *tr = gops->private; struct trace_array_cpu *data; unsigned long flags; @@ -138,7 +139,7 @@ int trace_graph_entry(struct ftrace_graph_ent *trace, int ret; int cpu; - if (trace_recursion_test(TRACE_GRAPH_NOTRACE_BIT)) + if (*task_var & TRACE_GRAPH_NOTRACE) return 0; /* @@ -149,7 +150,7 @@ int trace_graph_entry(struct ftrace_graph_ent *trace, * returning from the function. */ if (ftrace_graph_notrace_addr(trace->func)) { - trace_recursion_set(TRACE_GRAPH_NOTRACE_BIT); + *task_var |= TRACE_GRAPH_NOTRACE_BIT; /* * Need to return 1 to have the return called * that will clear the NOTRACE bit. @@ -240,6 +241,7 @@ void __trace_graph_return(struct trace_array *tr, void trace_graph_return(struct ftrace_graph_ret *trace, struct fgraph_ops *gops) { + unsigned long *task_var = fgraph_get_task_var(gops); struct trace_array *tr = gops->private; struct trace_array_cpu *data; unsigned long flags; @@ -249,8 +251,8 @@ void trace_graph_return(struct ftrace_graph_ret *trace, 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; }