From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Masami Hiramatsu <mhiramat@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
Andrew Morton <akpm@linux-foundation.org>
Subject: [for-next][PATCH 03/15] ftrace: Rename dup_hash() and comment it
Date: Thu, 06 Jun 2024 08:10:07 -0400 [thread overview]
Message-ID: <20240606121104.879342374@goodmis.org> (raw)
In-Reply-To: 20240606121004.857581251@goodmis.org
From: "Steven Rostedt (Google)" <rostedt@goodmis.org>
The name "dup_hash()" is a misnomer as it does not duplicate the hash that
is passed in, but instead moves its entities from that hash to a newly
allocated one. Rename it to "__move_hash()" (using starting underscores as
it is an internal function), and add some comments about what it does.
Link: https://lore.kernel.org/linux-trace-kernel/20240605180408.537723591@goodmis.org
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
---
kernel/trace/ftrace.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 897d7541041c..f4b253d20df8 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -1392,7 +1392,11 @@ ftrace_hash_rec_enable_modify(struct ftrace_ops *ops, int filter_hash);
static int ftrace_hash_ipmodify_update(struct ftrace_ops *ops,
struct ftrace_hash *new_hash);
-static struct ftrace_hash *dup_hash(struct ftrace_hash *src, int size)
+/*
+ * Allocate a new hash and remove entries from @src and move them to the new hash.
+ * On success, the @src hash will be empty and should be freed.
+ */
+static struct ftrace_hash *__move_hash(struct ftrace_hash *src, int size)
{
struct ftrace_func_entry *entry;
struct ftrace_hash *new_hash;
@@ -1439,7 +1443,7 @@ __ftrace_hash_move(struct ftrace_hash *src)
if (ftrace_hash_empty(src))
return EMPTY_HASH;
- return dup_hash(src, size);
+ return __move_hash(src, size);
}
static int
--
2.43.0
next prev parent reply other threads:[~2024-06-06 12:11 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-06 12:10 [for-next][PATCH 00/15] ftrace: Updates for 6.11 Steven Rostedt
2024-06-06 12:10 ` [for-next][PATCH 01/15] ftrace: Add back ftrace_update_trampoline() to ftrace_update_pid_func() Steven Rostedt
2024-06-06 12:10 ` [for-next][PATCH 02/15] ftrace/selftests: Fix pid test with function graph not showing pids Steven Rostedt
2024-06-06 12:10 ` Steven Rostedt [this message]
2024-06-06 12:10 ` [for-next][PATCH 04/15] ftrace: Remove "ftrace_hash" parameter from __ftrace_hash_rec_update() Steven Rostedt
2024-06-06 12:10 ` [for-next][PATCH 05/15] ftrace: Add comments to ftrace_hash_rec_disable/enable() Steven Rostedt
2024-06-06 12:10 ` [for-next][PATCH 06/15] ftrace: Convert "inc" parameter to bool in ftrace_hash_rec_update_modify() Steven Rostedt
2024-06-06 12:10 ` [for-next][PATCH 07/15] ftrace: Add comments to ftrace_hash_move() and friends Steven Rostedt
2024-06-06 12:10 ` [for-next][PATCH 08/15] ftrace: Declare function_trace_op in header to quiet sparse warning Steven Rostedt
2024-06-06 12:10 ` [for-next][PATCH 09/15] ftrace: Assign ftrace_list_end to ftrace_ops_list type cast to RCU Steven Rostedt
2024-06-06 12:10 ` [for-next][PATCH 10/15] ftrace: Assign RCU list variable with rcu_assign_ptr() Steven Rostedt
2024-06-06 12:10 ` [for-next][PATCH 11/15] ftrace: Fix prototypes for ftrace_startup/shutdown_subops() Steven Rostedt
2024-06-06 12:10 ` [for-next][PATCH 12/15] function_graph: Make fgraph_do_direct static key static Steven Rostedt
2024-06-06 12:10 ` [for-next][PATCH 13/15] function_graph: Do not update pid func if CONFIG_DYNAMIC_FTRACE not enabled Steven Rostedt
2024-06-06 12:10 ` [for-next][PATCH 14/15] ftrace: Hide one more entry in stack trace when ftrace_pid is enabled Steven Rostedt
2024-06-06 12:10 ` [for-next][PATCH 15/15] fgraph: Remove some unused functions Steven Rostedt
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=20240606121104.879342374@goodmis.org \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mathieu.desnoyers@efficios.com \
--cc=mhiramat@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