tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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: 86599dbe2c527 ("tracing: Add helper functions to simplify event_command.parse() callback handling")
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>

Steven Rostedt f2947c4b 73207746

+12 -14
+3 -5
kernel/trace/trace.h
··· 1788 1788 extern void event_enable_unregister_trigger(char *glob, 1789 1789 struct event_trigger_data *test, 1790 1790 struct trace_event_file *file); 1791 + extern struct event_trigger_data * 1792 + trigger_data_alloc(struct event_command *cmd_ops, char *cmd, char *param, 1793 + void *private_data); 1791 1794 extern void trigger_data_free(struct event_trigger_data *data); 1792 1795 extern int event_trigger_init(struct event_trigger_data *data); 1793 1796 extern int trace_event_trigger_enable_disable(struct trace_event_file *file, ··· 1817 1814 extern bool event_trigger_empty_param(const char *param); 1818 1815 extern int event_trigger_separate_filter(char *param_and_filter, char **param, 1819 1816 char **filter, bool param_required); 1820 - extern struct event_trigger_data * 1821 - event_trigger_alloc(struct event_command *cmd_ops, 1822 - char *cmd, 1823 - char *param, 1824 - void *private_data); 1825 1817 extern int event_trigger_parse_num(char *trigger, 1826 1818 struct event_trigger_data *trigger_data); 1827 1819 extern int event_trigger_set_filter(struct event_command *cmd_ops,
+1 -1
kernel/trace/trace_events_hist.c
··· 6826 6826 return PTR_ERR(hist_data); 6827 6827 } 6828 6828 6829 - trigger_data = event_trigger_alloc(cmd_ops, cmd, param, hist_data); 6829 + trigger_data = trigger_data_alloc(cmd_ops, cmd, param, hist_data); 6830 6830 if (!trigger_data) { 6831 6831 ret = -ENOMEM; 6832 6832 goto out_free;
+8 -8
kernel/trace/trace_events_trigger.c
··· 804 804 } 805 805 806 806 /** 807 - * event_trigger_alloc - allocate and init event_trigger_data for a trigger 807 + * trigger_data_alloc - allocate and init event_trigger_data for a trigger 808 808 * @cmd_ops: The event_command operations for the trigger 809 809 * @cmd: The cmd string 810 810 * @param: The param string ··· 815 815 * trigger_ops to assign to the event_trigger_data. @private_data can 816 816 * also be passed in and associated with the event_trigger_data. 817 817 * 818 - * Use event_trigger_free() to free an event_trigger_data object. 818 + * Use trigger_data_free() to free an event_trigger_data object. 819 819 * 820 820 * Return: The trigger_data object success, NULL otherwise 821 821 */ 822 - struct event_trigger_data *event_trigger_alloc(struct event_command *cmd_ops, 823 - char *cmd, 824 - char *param, 825 - void *private_data) 822 + struct event_trigger_data *trigger_data_alloc(struct event_command *cmd_ops, 823 + char *cmd, 824 + char *param, 825 + void *private_data) 826 826 { 827 827 struct event_trigger_data *trigger_data; 828 828 const struct event_trigger_ops *trigger_ops; ··· 989 989 return ret; 990 990 991 991 ret = -ENOMEM; 992 - trigger_data = event_trigger_alloc(cmd_ops, cmd, param, file); 992 + trigger_data = trigger_data_alloc(cmd_ops, cmd, param, file); 993 993 if (!trigger_data) 994 994 goto out; 995 995 ··· 1793 1793 enable_data->enable = enable; 1794 1794 enable_data->file = event_enable_file; 1795 1795 1796 - trigger_data = event_trigger_alloc(cmd_ops, cmd, param, enable_data); 1796 + trigger_data = trigger_data_alloc(cmd_ops, cmd, param, enable_data); 1797 1797 if (!trigger_data) { 1798 1798 kfree(enable_data); 1799 1799 goto out;