Skip to content

Commit 2935d6f

Browse files
tracing: Rename event_trigger_alloc() to trigger_data_alloc()
JIRA: https://issues.redhat.com/browse/RHEL-115358 commit f2947c4 Author: Steven Rostedt <rostedt@goodmis.org> Date: Wed May 7 10:53:06 2025 -0400 tracing: Rename event_trigger_alloc() to trigger_data_alloc() The function event_trigger_alloc() creates an event_trigger_data descriptor and states that it needs to be freed via event_trigger_free(). This is incorrect, it needs to be freed by trigger_data_free() as event_trigger_free() adds ref counting. Rename event_trigger_alloc() to trigger_data_alloc() and state that it needs to be freed via trigger_data_free(). This naming convention was introducing bugs. Cc: Masami Hiramatsu <mhiramat@kernel.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Tom Zanussi <zanussi@kernel.org> Link: https://lore.kernel.org/20250507145455.776436410@goodmis.org Fixes: 86599db ("tracing: Add helper functions to simplify event_command.parse() callback handling") Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org> Signed-off-by: Jerome Marchand <jmarchan@redhat.com>
1 parent 152a063 commit 2935d6f

File tree

3 files changed

+12
-14
lines changed

3 files changed

+12
-14
lines changed

kernel/trace/trace.h

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1729,6 +1729,9 @@ extern int event_enable_register_trigger(char *glob,
17291729
extern void event_enable_unregister_trigger(char *glob,
17301730
struct event_trigger_data *test,
17311731
struct trace_event_file *file);
1732+
extern struct event_trigger_data *
1733+
trigger_data_alloc(struct event_command *cmd_ops, char *cmd, char *param,
1734+
void *private_data);
17321735
extern void trigger_data_free(struct event_trigger_data *data);
17331736
extern int event_trigger_init(struct event_trigger_data *data);
17341737
extern int trace_event_trigger_enable_disable(struct trace_event_file *file,
@@ -1755,11 +1758,6 @@ extern bool event_trigger_check_remove(const char *glob);
17551758
extern bool event_trigger_empty_param(const char *param);
17561759
extern int event_trigger_separate_filter(char *param_and_filter, char **param,
17571760
char **filter, bool param_required);
1758-
extern struct event_trigger_data *
1759-
event_trigger_alloc(struct event_command *cmd_ops,
1760-
char *cmd,
1761-
char *param,
1762-
void *private_data);
17631761
extern int event_trigger_parse_num(char *trigger,
17641762
struct event_trigger_data *trigger_data);
17651763
extern int event_trigger_set_filter(struct event_command *cmd_ops,

kernel/trace/trace_events_hist.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6798,7 +6798,7 @@ static int event_hist_trigger_parse(struct event_command *cmd_ops,
67986798
return PTR_ERR(hist_data);
67996799
}
68006800

6801-
trigger_data = event_trigger_alloc(cmd_ops, cmd, param, hist_data);
6801+
trigger_data = trigger_data_alloc(cmd_ops, cmd, param, hist_data);
68026802
if (!trigger_data) {
68036803
ret = -ENOMEM;
68046804
goto out_free;

kernel/trace/trace_events_trigger.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -825,7 +825,7 @@ int event_trigger_separate_filter(char *param_and_filter, char **param,
825825
}
826826

827827
/**
828-
* event_trigger_alloc - allocate and init event_trigger_data for a trigger
828+
* trigger_data_alloc - allocate and init event_trigger_data for a trigger
829829
* @cmd_ops: The event_command operations for the trigger
830830
* @cmd: The cmd string
831831
* @param: The param string
@@ -836,14 +836,14 @@ int event_trigger_separate_filter(char *param_and_filter, char **param,
836836
* trigger_ops to assign to the event_trigger_data. @private_data can
837837
* also be passed in and associated with the event_trigger_data.
838838
*
839-
* Use event_trigger_free() to free an event_trigger_data object.
839+
* Use trigger_data_free() to free an event_trigger_data object.
840840
*
841841
* Return: The trigger_data object success, NULL otherwise
842842
*/
843-
struct event_trigger_data *event_trigger_alloc(struct event_command *cmd_ops,
844-
char *cmd,
845-
char *param,
846-
void *private_data)
843+
struct event_trigger_data *trigger_data_alloc(struct event_command *cmd_ops,
844+
char *cmd,
845+
char *param,
846+
void *private_data)
847847
{
848848
struct event_trigger_data *trigger_data;
849849
const struct event_trigger_ops *trigger_ops;
@@ -1010,7 +1010,7 @@ event_trigger_parse(struct event_command *cmd_ops,
10101010
return ret;
10111011

10121012
ret = -ENOMEM;
1013-
trigger_data = event_trigger_alloc(cmd_ops, cmd, param, file);
1013+
trigger_data = trigger_data_alloc(cmd_ops, cmd, param, file);
10141014
if (!trigger_data)
10151015
goto out;
10161016

@@ -1814,7 +1814,7 @@ int event_enable_trigger_parse(struct event_command *cmd_ops,
18141814
enable_data->enable = enable;
18151815
enable_data->file = event_enable_file;
18161816

1817-
trigger_data = event_trigger_alloc(cmd_ops, cmd, param, enable_data);
1817+
trigger_data = trigger_data_alloc(cmd_ops, cmd, param, enable_data);
18181818
if (!trigger_data) {
18191819
kfree(enable_data);
18201820
goto out;

0 commit comments

Comments
 (0)