From patchwork Tue Feb 6 15:09:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 197488 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp1606102dyb; Tue, 6 Feb 2024 07:12:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IFi1v5GQxf4WmVuIZ72b/X73WRnVqx6ReCdSe+5nc1bFD+pa8OrTSteHGzv/mjgb9bxy4KY X-Received: by 2002:a05:6a20:1e9f:b0:19e:959a:a0d8 with SMTP id dl31-20020a056a201e9f00b0019e959aa0d8mr1599742pzb.21.1707232334683; Tue, 06 Feb 2024 07:12:14 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707232334; cv=pass; d=google.com; s=arc-20160816; b=pUgC1KY6/fbUpOWOvkAZfchqcbUp6dbwpXoJNNTUlhBlYNh9Msdm4mOd7IqerQ9qDF vjTUukq1RfL7c66GK9DVxaMTiaCg1ABItTKw+bgM/aBqDJ8n8uGoWXESAVIQOf+QPMU2 f2csK+Q0dNJbe65hUPNXFs0JTbPoNyBR1EhcKXrjH09cDmIbF0Wog1dQ5SadIz0iR5wk /47HQkMxV3y7qAzWIvjaLu5t7Mtxe/jwa2Gqi2CZW8F7Alr5hzoa2GmacJXw4sOyTxGA uv9q4hA5iNZoZinJunqYS5cyPUR11T+RSWhxbqN10Ysls3it5rMCczNZ65yaa9S7A+Y0 URYA== ARC-Message-Signature: i=2; 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=HGl8TQvYeyvgNyH0iA+AU5U9eKg8DRlnKydX0SoRpIk=; fh=1cxqcQRHGVIsRCZu8gm0oxmTLaE9lu7HFqpHsRa21N0=; b=VnYE8ZSROvKgsJWc33DOjilMxciOAF2mNFCYlPWn4ToCyRFSyJivRyI7OlzcjiUnnW M0qBWOwW/2vnIB69hvncQThRRmNJC5pPDvrfotkFoBulupqkIcy7Vp1T0CU5MxR7CEQS T11F/iq8vUpDvDzoqBw0ucyjdk833khuxt1rSr910e0I8aaoy4xzXJS9+wCI9IclTSOx bMotP6NT8ZX60clJ5O/XH7+QeMoB9wOB2Lj56LsmvbDHpt4xKfAw6OMAuTlNpFyZF99V kovmkfP4ezr3igd2DAFAmlN1Yr6YSoYK2/gU/0MK6vGcIYpKHI7NWTBExDsUz28lX4wh /jJA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=VxqVnfez; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-55185-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-55185-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org X-Forwarded-Encrypted: i=1; AJvYcCVwr0r8uakqebR1B15z9agp0ciD2x4MocS/ny354XMC7ZuRg+8/J0ym+epknJM2kAVsAzmXhY5B06vPTAkpRD9y18uR2A== Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id p15-20020a056a000b4f00b006e05b7bfcffsi1080011pfo.52.2024.02.06.07.12.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Feb 2024 07:12:14 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-55185-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=VxqVnfez; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-55185-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-55185-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id D92E928D307 for ; Tue, 6 Feb 2024 15:11:45 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8B46F1353E7; Tue, 6 Feb 2024 15:09:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="VxqVnfez" 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 5F360133434; Tue, 6 Feb 2024 15:09:16 +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=1707232156; cv=none; b=Q4lSSxuoV+yf4FAHXtXbDeC5s+tLW4EnV7vnkogafZTGNRDhjgZDSt3rXlf6NMJ/TTeYR2GCh3AZ/h8N7PhI6+Ayf9mwp4sqsULsTiePqEz0+Nk1imOdSGjr2ZrcQl1ajmWM8ItQq8tAtyeHnxdDrDv2oJDiWPnTADi/clOvlMo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707232156; c=relaxed/simple; bh=WWUXf+6wuLAeTB0u+5WPCf6XUJQtEct3UDtGyxF5nGA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=qPlWAjoqBfV3SUfX8KkyTN4sqR6PyjNMTg3cA/odAUTRdu0YI0fQZZPO0WQ2u6SU6ZdvKT4THOv03ZMu6VvUb8HtIXSjAOzUP/wXB9chiX+54DBSJdOXII+vhe2ka0Ms7n7IoItuPmxV7CVDxqDUTILt/1+UM7mdANAbkBmJtl4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=VxqVnfez; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 91469C433C7; Tue, 6 Feb 2024 15:09:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707232155; bh=WWUXf+6wuLAeTB0u+5WPCf6XUJQtEct3UDtGyxF5nGA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VxqVnfezvE1mGVD67gSrJmn+Vz8tbustPz1KfZhWslztyqdAewrAJGzyQuyPaQ8U/ 3HK3ZLYvCLQFNPXj82mH4uWSMf/0oIIjhxdiRekN0B5dVGSakYHyICv8rA69c3H5iD zDECywSWW98RnVXAjftuTniqK86DGZUQUcn7NP0TRwG8pRkSbjzwYbEjXPf/0YJEnj TO7I5d3Y53W4Nsg58rSaLF5PEs8AqjXmZO6qyTQN+v96A3Uwe81msJ/50qwXPTO4f2 o9elIV7ppsSS+UY7o+yfQfug+whBWyKl/vGhOLQitzhQMGih/BoZUr33t79K5Afbjb PHaBhHSNZk1NA== 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 v7 09/36] function_graph: Remove logic around ftrace_graph_entry and return Date: Wed, 7 Feb 2024 00:09:10 +0900 Message-Id: <170723215032.502590.2568906077275996700.stgit@devnote2> X-Mailer: git-send-email 2.34.1 In-Reply-To: <170723204881.502590.11906735097521170661.stgit@devnote2> References: <170723204881.502590.11906735097521170661.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: 1790162852286035240 X-GMAIL-MSGID: 1790162852286035240 From: Steven Rostedt (VMware) The function pointers ftrace_graph_entry and ftrace_graph_return are no longer called via the function_graph tracer. Instead, an array structure is now used that will allow for multiple users of the function_graph infrastructure. The variables are still used by the architecture code for non dynamic ftrace configs, where a test is made against them to see if they point to the default stub function or not. This is how the static function tracing knows to call into the function graph tracer infrastructure or not. Two new stub functions are made. entry_run() and return_run(). The ftrace_graph_entry and ftrace_graph_return are set to them respectively when the function graph tracer is enabled, and this will trigger the architecture specific function graph code to be executed. This also requires checking the global_ops hash for all calls into the function_graph tracer. Signed-off-by: Steven Rostedt (VMware) Signed-off-by: Masami Hiramatsu (Google) --- Changes in v2: - Fix typo and make lines shorter than 76 chars in the description. - Remove unneeded return from return_run() function. --- kernel/trace/fgraph.c | 67 +++++++++------------------------------- kernel/trace/ftrace.c | 2 - kernel/trace/ftrace_internal.h | 2 - 3 files changed, 15 insertions(+), 56 deletions(-) diff --git a/kernel/trace/fgraph.c b/kernel/trace/fgraph.c index b9a2399b75ee..6f3ba8e113c1 100644 --- a/kernel/trace/fgraph.c +++ b/kernel/trace/fgraph.c @@ -145,6 +145,17 @@ add_fgraph_index_bitmap(struct task_struct *t, int offset, unsigned long bitmap) t->ret_stack[offset] |= (bitmap << FGRAPH_INDEX_SHIFT); } +/* ftrace_graph_entry set to this to tell some archs to run function graph */ +static int entry_run(struct ftrace_graph_ent *trace) +{ + return 0; +} + +/* ftrace_graph_return set to this to tell some archs to run function graph */ +static void return_run(struct ftrace_graph_ret *trace) +{ +} + /* * @offset: The index into @t->ret_stack to find the ret_stack entry * @index: Where to place the index into @t->ret_stack of that entry @@ -675,7 +686,6 @@ extern void ftrace_stub_graph(struct ftrace_graph_ret *); /* The callbacks that hook a function */ trace_func_graph_ret_t ftrace_graph_return = ftrace_stub_graph; trace_func_graph_ent_t ftrace_graph_entry = ftrace_graph_entry_stub; -static trace_func_graph_ent_t __ftrace_graph_entry = ftrace_graph_entry_stub; /* Try to assign a return stack array on FTRACE_RETSTACK_ALLOC_SIZE tasks. */ static int alloc_retstack_tasklist(unsigned long **ret_stack_list) @@ -758,46 +768,6 @@ ftrace_graph_probe_sched_switch(void *ignore, bool preempt, } } -static int ftrace_graph_entry_test(struct ftrace_graph_ent *trace) -{ - if (!ftrace_ops_test(&global_ops, trace->func, NULL)) - return 0; - return __ftrace_graph_entry(trace); -} - -/* - * The function graph tracer should only trace the functions defined - * by set_ftrace_filter and set_ftrace_notrace. If another function - * tracer ops is registered, the graph tracer requires testing the - * function against the global ops, and not just trace any function - * that any ftrace_ops registered. - */ -void update_function_graph_func(void) -{ - struct ftrace_ops *op; - bool do_test = false; - - /* - * The graph and global ops share the same set of functions - * to test. If any other ops is on the list, then - * the graph tracing needs to test if its the function - * it should call. - */ - do_for_each_ftrace_op(op, ftrace_ops_list) { - if (op != &global_ops && op != &graph_ops && - op != &ftrace_list_end) { - do_test = true; - /* in double loop, break out with goto */ - goto out; - } - } while_for_each_ftrace_op(op); - out: - if (do_test) - ftrace_graph_entry = ftrace_graph_entry_test; - else - ftrace_graph_entry = __ftrace_graph_entry; -} - static DEFINE_PER_CPU(unsigned long *, idle_ret_stack); static void @@ -939,18 +909,12 @@ int register_ftrace_graph(struct fgraph_ops *gops) ftrace_graph_active--; goto out; } - - ftrace_graph_return = gops->retfunc; - /* - * Update the indirect function to the entryfunc, and the - * function that gets called to the entry_test first. Then - * call the update fgraph entry function to determine if - * the entryfunc should be called directly or not. + * Some archs just test to see if these are not + * the default function */ - __ftrace_graph_entry = gops->entryfunc; - ftrace_graph_entry = ftrace_graph_entry_test; - update_function_graph_func(); + ftrace_graph_return = return_run; + ftrace_graph_entry = entry_run; ret = ftrace_startup(&graph_ops, FTRACE_START_FUNC_RET); } @@ -986,7 +950,6 @@ void unregister_ftrace_graph(struct fgraph_ops *gops) if (!ftrace_graph_active) { ftrace_graph_return = ftrace_stub_graph; ftrace_graph_entry = ftrace_graph_entry_stub; - __ftrace_graph_entry = ftrace_graph_entry_stub; ftrace_shutdown(&graph_ops, FTRACE_STOP_FUNC_RET); unregister_pm_notifier(&ftrace_suspend_notifier); unregister_trace_sched_switch(ftrace_graph_probe_sched_switch, NULL); diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index c060d5b47910..11aac697d40f 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -235,8 +235,6 @@ static void update_ftrace_function(void) func = ftrace_ops_list_func; } - update_function_graph_func(); - /* If there's no change, then do nothing more here */ if (ftrace_trace_function == func) return; diff --git a/kernel/trace/ftrace_internal.h b/kernel/trace/ftrace_internal.h index 5012c04f92c0..19eddcb91584 100644 --- a/kernel/trace/ftrace_internal.h +++ b/kernel/trace/ftrace_internal.h @@ -42,10 +42,8 @@ ftrace_ops_test(struct ftrace_ops *ops, unsigned long ip, void *regs) #ifdef CONFIG_FUNCTION_GRAPH_TRACER extern int ftrace_graph_active; -void update_function_graph_func(void); #else /* !CONFIG_FUNCTION_GRAPH_TRACER */ # define ftrace_graph_active 0 -static inline void update_function_graph_func(void) { } #endif /* CONFIG_FUNCTION_GRAPH_TRACER */ #else /* !CONFIG_FUNCTION_TRACER */