tracing: trigger: Replace unneeded RCU-list traversals
Masami Hiramatsu
maintainerPATCH 1/1 tracing: trigger: Replace unneeded RCU-list traversals
With CONFIG_PROVE_RCU_LIST, I had many suspicious RCU warnings when I ran ftracetest trigger testcases.
-----
# dmesg -c > /dev/null # ./ftracetest test.d/trigger ... # dmesg | grep "RCU-list traversed" | cut -f 2 -d ] | cut -f 2 -d " " kernel/trace/trace_events_hist.c:6070 kernel/trace/trace_events_hist.c:1760 kernel/trace/trace_events_hist.c:5911 kernel/trace/trace_events_trigger.c:504 kernel/trace/trace_events_hist.c:1810 kernel/trace/trace_events_hist.c:3158 kernel/trace/trace_events_hist.c:3105 kernel/trace/trace_events_hist.c:5518 kernel/trace/trace_events_hist.c:5998 kernel/trace/trace_events_hist.c:6019 kernel/trace/trace_events_hist.c:6044 kernel/trace/trace_events_trigger.c:1500 kernel/trace/trace_events_trigger.c:1540 kernel/trace/trace_events_trigger.c:539 kernel/trace/trace_events_trigger.c:584 -----
I investigated those warnings and found that the RCU-list traversals in event trigger and hist didn't need to use RCU version because those were called only under event_mutex.
I also checked other RCU-list traversals related to event trigger list, and found that most of them were called from event_hist_trigger_func() or hist_unregister_trigger() or register/unregister functions except for a few cases.
Replace these unneeded RCU-list traversals with normal list traversal macro and lockdep_assert_held() to check the event_mutex is held.
--- kernel/trace/trace_events_hist.c | 41 ++++++++++++++++++++++++++--------- kernel/trace/trace_events_trigger.c | 20 +++++++++++++---- 2 files changed, 45 insertions(+), 16 deletions(-)
kernel/trace/trace_events_hist.c +30 -11
@@ -1753,11 +1753,13 @@ static struct hist_field *find_var(struct hist_trigger_data *hist_data,struct event_trigger_data *test;struct hist_field *hist_field; +lockdep_assert_held (&event_mutex); + hist_field =find_var_field (hist_data, var_name);if (hist_field)return hist_field; -list_for_each_entry_rcu (test, &file->triggers, list) { +list_for_each_entry (test, &file->triggers, list) {if (test->cmd_ops->trigger_type ==ETT_EVENT_HIST ) { test_data = test->private_data; hist_field =find_var_field (test_data, var_name);
@@ -1807,7 +1809,9 @@ static struct hist_field *find_file_var(struct trace_event_file *file,struct event_trigger_data *test;struct hist_field *hist_field; -list_for_each_entry_rcu (test, &file->triggers, list) { +lockdep_assert_held (&event_mutex); + +list_for_each_entry (test, &file->triggers, list) {if (test->cmd_ops->trigger_type ==ETT_EVENT_HIST ) { test_data = test->private_data; hist_field =find_var_field (test_data, var_name);
@@ -3102,7 +3106,9 @@ static char *find_trigger_filter(struct hist_trigger_data *hist_data, {struct event_trigger_data *test; -list_for_each_entry_rcu (test, &file->triggers, list) { +lockdep_assert_held (&event_mutex); + +list_for_each_entry (test, &file->triggers, list) {if (test->cmd_ops->trigger_type ==ETT_EVENT_HIST ) {if (test->private_data == hist_data)return test->filter_str;
@@ -3153,9 +3159,11 @@ find_compatible_hist(struct hist_trigger_data *target_hist_data,struct event_trigger_data *test;unsigned int n_keys; +lockdep_assert_held (&event_mutex); + n_keys = target_hist_data->n_fields - target_hist_data->n_vals; -list_for_each_entry_rcu (test, &file->triggers, list) { +list_for_each_entry (test, &file->triggers, list) {if (test->cmd_ops->trigger_type ==ETT_EVENT_HIST ) { hist_data = test->private_data;
@@ -5515,7 +5523,7 @@ static int hist_show(struct seq_file *m, void *v) goto out_unlock; } -list_for_each_entry_rcu (data, &event_file->triggers, list) { +list_for_each_entry (data, &event_file->triggers, list) {if (data->cmd_ops->trigger_type ==ETT_EVENT_HIST )hist_trigger_show (m, data, n++); }
@@ -5908,7 +5916,9 @@ static int hist_register_trigger(char *glob, struct event_trigger_ops *ops,if (hist_data->attrs->name && !named_data) goto new; -list_for_each_entry_rcu (test, &file->triggers, list) { +lockdep_assert_held (&event_mutex); + +list_for_each_entry (test, &file->triggers, list) {if (test->cmd_ops->trigger_type ==ETT_EVENT_HIST ) {if (!hist_trigger_match (data, test, named_data, false))continue ;
@@ -5992,10 +6002,12 @@ static bool have_hist_trigger_match(struct event_trigger_data *data,struct event_trigger_data *test, *named_data =NULL ;bool match = false; +lockdep_assert_held (&event_mutex); +if (hist_data->attrs->name) named_data =find_named_trigger (hist_data->attrs->name); -list_for_each_entry_rcu (test, &file->triggers, list) { +list_for_each_entry (test, &file->triggers, list) {if (test->cmd_ops->trigger_type ==ETT_EVENT_HIST ) {if (hist_trigger_match (data, test, named_data, false)) { match = true;
@@ -6013,10 +6025,12 @@ static bool hist_trigger_check_refs(struct event_trigger_data *data,struct hist_trigger_data *hist_data = data->private_data;struct event_trigger_data *test, *named_data =NULL ; +lockdep_assert_held (&event_mutex); +if (hist_data->attrs->name) named_data =find_named_trigger (hist_data->attrs->name); -list_for_each_entry_rcu (test, &file->triggers, list) { +list_for_each_entry (test, &file->triggers, list) {if (test->cmd_ops->trigger_type ==ETT_EVENT_HIST ) {if (!hist_trigger_match (data, test, named_data, false))continue ;
@@ -6038,10 +6052,12 @@ static void hist_unregister_trigger(char *glob, struct event_trigger_ops *ops,struct event_trigger_data *test, *named_data =NULL ;bool unregistered = false; +lockdep_assert_held (&event_mutex); +if (hist_data->attrs->name) named_data =find_named_trigger (hist_data->attrs->name); -list_for_each_entry_rcu (test, &file->triggers, list) { +list_for_each_entry (test, &file->triggers, list) {if (test->cmd_ops->trigger_type ==ETT_EVENT_HIST ) {if (!hist_trigger_match (data, test, named_data, false))continue ;
@@ -6067,7 +6083,9 @@ static bool hist_file_check_refs(struct trace_event_file *file)struct hist_trigger_data *hist_data;struct event_trigger_data *test; -list_for_each_entry_rcu (test, &file->triggers, list) { +lockdep_assert_held (&event_mutex); + +list_for_each_entry (test, &file->triggers, list) {if (test->cmd_ops->trigger_type ==ETT_EVENT_HIST ) { hist_data = test->private_data;if (check_var_refs (hist_data))
@@ -6310,7 +6328,8 @@ hist_enable_trigger(struct event_trigger_data *data, void *rec,struct enable_trigger_data *enable_data = data->private_data;struct event_trigger_data *test; -list_for_each_entry_rcu (test, &enable_data->file->triggers, list) { +list_for_each_entry_rcu (test, &enable_data->file->triggers, list, +lockdep_is_held (&event_mutex)) {if (test->cmd_ops->trigger_type ==ETT_EVENT_HIST ) {if (enable_data->enable) test->paused = false;
kernel/trace/trace_events_trigger.c +15 -5
@@ -501,7 +501,9 @@ void update_cond_flag(struct trace_event_file *file)struct event_trigger_data *data;bool set_cond = false; -list_for_each_entry_rcu (data, &file->triggers, list) { +lockdep_assert_held (&event_mutex); + +list_for_each_entry (data, &file->triggers, list) {if (data->filter ||event_command_post_trigger (data->cmd_ops) ||event_command_needs_rec (data->cmd_ops)) { set_cond = true;
@@ -536,7 +538,9 @@ static int register_trigger(char *glob, struct event_trigger_ops *ops,struct event_trigger_data *test;int ret =0 ; -list_for_each_entry_rcu (test, &file->triggers, list) { +lockdep_assert_held (&event_mutex); + +list_for_each_entry (test, &file->triggers, list) {if (test->cmd_ops->trigger_type == data->cmd_ops->trigger_type) { ret = -EEXIST ; goto out;
@@ -581,7 +585,9 @@ static void unregister_trigger(char *glob, struct event_trigger_ops *ops,struct event_trigger_data *data;bool unregistered = false; -list_for_each_entry_rcu (data, &file->triggers, list) { +lockdep_assert_held (&event_mutex); + +list_for_each_entry (data, &file->triggers, list) {if (data->cmd_ops->trigger_type == test->cmd_ops->trigger_type) { unregistered = true;list_del_rcu (&data->list);
@@ -1497,7 +1503,9 @@ int event_enable_register_trigger(char *glob,struct event_trigger_data *test;int ret =0 ; -list_for_each_entry_rcu (test, &file->triggers, list) { +lockdep_assert_held (&event_mutex); + +list_for_each_entry (test, &file->triggers, list) { test_enable_data = test->private_data; if (test_enable_data && (test->cmd_ops->trigger_type ==
@@ -1537,7 +1545,9 @@ void event_enable_unregister_trigger(char *glob,struct event_trigger_data *data;bool unregistered = false; -list_for_each_entry_rcu (data, &file->triggers, list) { +lockdep_assert_held (&event_mutex); + +list_for_each_entry (data, &file->triggers, list) { enable_data = data->private_data; if (enable_data && (data->cmd_ops->trigger_type ==
Masami Hiramatsu
maintainerHi Tom,
Could you review this fix?
Quoted 241 lines · On Fri, 20 Dec 2019 11:31:43 +0900 Masami Hiramatsu <[email protected]> wrote:
With
CONFIG_PROVE_RCU_LIST, I had many suspicious RCU warnings when I ran ftracetest trigger testcases.-----
# dmesg -c > /dev/null # ./ftracetest test.d/trigger ... # dmesg | grep "RCU-list traversed" | cut -f 2 -d ] | cut -f 2 -d " " kernel/trace/trace_events_hist.c:6070 kernel/trace/trace_events_hist.c:1760 kernel/trace/trace_events_hist.c:5911 kernel/trace/trace_events_trigger.c:504 kernel/trace/trace_events_hist.c:1810 kernel/trace/trace_events_hist.c:3158 kernel/trace/trace_events_hist.c:3105 kernel/trace/trace_events_hist.c:5518 kernel/trace/trace_events_hist.c:5998 kernel/trace/trace_events_hist.c:6019 kernel/trace/trace_events_hist.c:6044 kernel/trace/trace_events_trigger.c:1500 kernel/trace/trace_events_trigger.c:1540 kernel/trace/trace_events_trigger.c:539 kernel/trace/trace_events_trigger.c:584 -----I investigated those warnings and found that the RCU-list traversals in event trigger and hist didn't need to use RCU version because those were called only under
event_mutex.I also checked other RCU-list traversals related to event trigger list, and found that most of them were called from
event_hist_trigger_func()orhist_unregister_trigger()or register/unregister functions except for a few cases.Replace these unneeded RCU-list traversals with normal list traversal macro and
lockdep_assert_held()to check theevent_mutexis held.Signed-off-by Masami Hiramatsu <[email protected]>--- kernel/trace/trace_events_hist.c | 41 ++++++++++++++++++++++++++--------- kernel/trace/trace_events_trigger.c | 20 +++++++++++++---- 2 files changed, 45 insertions(+), 16 deletions(-)kernel/trace/trace_events_hist.c +30
-11@@ -1753,11 +1753,13 @@ static struct hist_field *find_var(struct hist_trigger_data *hist_data,struct event_trigger_data *test;struct hist_field *hist_field; +lockdep_assert_held (&event_mutex); + hist_field =find_var_field (hist_data, var_name);if (hist_field)return hist_field; -list_for_each_entry_rcu (test, &file->triggers, list) { +list_for_each_entry (test, &file->triggers, list) {if (test->cmd_ops->trigger_type ==ETT_EVENT_HIST ) { test_data = test->private_data; hist_field =find_var_field (test_data, var_name);@@ -1807,7 +1809,9 @@ static struct hist_field *find_file_var(struct trace_event_file *file,struct event_trigger_data *test;struct hist_field *hist_field; -list_for_each_entry_rcu (test, &file->triggers, list) { +lockdep_assert_held (&event_mutex); + +list_for_each_entry (test, &file->triggers, list) {if (test->cmd_ops->trigger_type ==ETT_EVENT_HIST ) { test_data = test->private_data; hist_field =find_var_field (test_data, var_name);@@ -3102,7 +3106,9 @@ static char *find_trigger_filter(struct hist_trigger_data *hist_data, {struct event_trigger_data *test; -list_for_each_entry_rcu (test, &file->triggers, list) { +lockdep_assert_held (&event_mutex); + +list_for_each_entry (test, &file->triggers, list) {if (test->cmd_ops->trigger_type ==ETT_EVENT_HIST ) {if (test->private_data == hist_data)return test->filter_str;@@ -3153,9 +3159,11 @@ find_compatible_hist(struct hist_trigger_data *target_hist_data,struct event_trigger_data *test;unsigned int n_keys; +lockdep_assert_held (&event_mutex); + n_keys = target_hist_data->n_fields - target_hist_data->n_vals; -list_for_each_entry_rcu (test, &file->triggers, list) { +list_for_each_entry (test, &file->triggers, list) {if (test->cmd_ops->trigger_type ==ETT_EVENT_HIST ) { hist_data = test->private_data;@@ -5515,7 +5523,7 @@ static int hist_show(struct seq_file *m, void *v) goto out_unlock; } -list_for_each_entry_rcu (data, &event_file->triggers, list) { +list_for_each_entry (data, &event_file->triggers, list) {if (data->cmd_ops->trigger_type ==ETT_EVENT_HIST )hist_trigger_show (m, data, n++); }@@ -5908,7 +5916,9 @@ static int hist_register_trigger(char *glob, struct event_trigger_ops *ops,if (hist_data->attrs->name && !named_data) goto new; -list_for_each_entry_rcu (test, &file->triggers, list) { +lockdep_assert_held (&event_mutex); + +list_for_each_entry (test, &file->triggers, list) {if (test->cmd_ops->trigger_type ==ETT_EVENT_HIST ) {if (!hist_trigger_match (data, test, named_data, false))continue ;@@ -5992,10 +6002,12 @@ static bool have_hist_trigger_match(struct event_trigger_data *data,struct event_trigger_data *test, *named_data =NULL ;bool match = false; +lockdep_assert_held (&event_mutex); +if (hist_data->attrs->name) named_data =find_named_trigger (hist_data->attrs->name); -list_for_each_entry_rcu (test, &file->triggers, list) { +list_for_each_entry (test, &file->triggers, list) {if (test->cmd_ops->trigger_type ==ETT_EVENT_HIST ) {if (hist_trigger_match (data, test, named_data, false)) { match = true;@@ -6013,10 +6025,12 @@ static bool hist_trigger_check_refs(struct event_trigger_data *data,struct hist_trigger_data *hist_data = data->private_data;struct event_trigger_data *test, *named_data =NULL ; +lockdep_assert_held (&event_mutex); +if (hist_data->attrs->name) named_data =find_named_trigger (hist_data->attrs->name); -list_for_each_entry_rcu (test, &file->triggers, list) { +list_for_each_entry (test, &file->triggers, list) {if (test->cmd_ops->trigger_type ==ETT_EVENT_HIST ) {if (!hist_trigger_match (data, test, named_data, false))continue ;@@ -6038,10 +6052,12 @@ static void hist_unregister_trigger(char *glob, struct event_trigger_ops *ops,struct event_trigger_data *test, *named_data =NULL ;bool unregistered = false; +lockdep_assert_held (&event_mutex); +if (hist_data->attrs->name) named_data =find_named_trigger (hist_data->attrs->name); -list_for_each_entry_rcu (test, &file->triggers, list) { +list_for_each_entry (test, &file->triggers, list) {if (test->cmd_ops->trigger_type ==ETT_EVENT_HIST ) {if (!hist_trigger_match (data, test, named_data, false))continue ;@@ -6067,7 +6083,9 @@ static bool hist_file_check_refs(struct trace_event_file *file)struct hist_trigger_data *hist_data;struct event_trigger_data *test; -list_for_each_entry_rcu (test, &file->triggers, list) { +lockdep_assert_held (&event_mutex); + +list_for_each_entry (test, &file->triggers, list) {if (test->cmd_ops->trigger_type ==ETT_EVENT_HIST ) { hist_data = test->private_data;if (check_var_refs (hist_data))@@ -6310,7 +6328,8 @@ hist_enable_trigger(struct event_trigger_data *data, void *rec,struct enable_trigger_data *enable_data = data->private_data;struct event_trigger_data *test; -list_for_each_entry_rcu (test, &enable_data->file->triggers, list) { +list_for_each_entry_rcu (test, &enable_data->file->triggers, list, +lockdep_is_held (&event_mutex)) {if (test->cmd_ops->trigger_type ==ETT_EVENT_HIST ) {if (enable_data->enable) test->paused = false;kernel/trace/trace_events_trigger.c +15
-5@@ -501,7 +501,9 @@ void update_cond_flag(struct trace_event_file *file)struct event_trigger_data *data;bool set_cond = false; -list_for_each_entry_rcu (data, &file->triggers, list) { +lockdep_assert_held (&event_mutex); + +list_for_each_entry (data, &file->triggers, list) {if (data->filter ||event_command_post_trigger (data->cmd_ops) ||event_command_needs_rec (data->cmd_ops)) { set_cond = true;@@ -536,7 +538,9 @@ static int register_trigger(char *glob, struct event_trigger_ops *ops,struct event_trigger_data *test;int ret =0 ; -list_for_each_entry_rcu (test, &file->triggers, list) { +lockdep_assert_held (&event_mutex); + +list_for_each_entry (test, &file->triggers, list) {if (test->cmd_ops->trigger_type == data->cmd_ops->trigger_type) { ret = -EEXIST ; goto out;@@ -581,7 +585,9 @@ static void unregister_trigger(char *glob, struct event_trigger_ops *ops,struct event_trigger_data *data;bool unregistered = false; -list_for_each_entry_rcu (data, &file->triggers, list) { +lockdep_assert_held (&event_mutex); + +list_for_each_entry (data, &file->triggers, list) {if (data->cmd_ops->trigger_type == test->cmd_ops->trigger_type) { unregistered = true;list_del_rcu (&data->list);@@ -1497,7 +1503,9 @@ int event_enable_register_trigger(char *glob,struct event_trigger_data *test;int ret =0 ; -list_for_each_entry_rcu (test, &file->triggers, list) { +lockdep_assert_held (&event_mutex); + +list_for_each_entry (test, &file->triggers, list) { test_enable_data = test->private_data; if (test_enable_data && (test->cmd_ops->trigger_type ==@@ -1537,7 +1545,9 @@ void event_enable_unregister_trigger(char *glob,struct event_trigger_data *data;bool unregistered = false; -list_for_each_entry_rcu (data, &file->triggers, list) { +lockdep_assert_held (&event_mutex); + +list_for_each_entry (data, &file->triggers, list) { enable_data = data->private_data; if (enable_data && (data->cmd_ops->trigger_type ==
Signature · 1 line
Masami Hiramatsu <[email protected]>
Hi Masami,
Quoted 35 lines · Masami Hiramatsu
With
CONFIG_PROVE_RCU_LIST, I had many suspicious RCU warnings when I ran ftracetest trigger testcases.-----
# dmesg -c > /dev/null # ./ftracetest test.d/trigger ... # dmesg | grep "RCU-list traversed" | cut -f 2 -d ] | cut -f 2 -d " " kernel/trace/trace_events_hist.c:6070 kernel/trace/trace_events_hist.c:1760 kernel/trace/trace_events_hist.c:5911 kernel/trace/trace_events_trigger.c:504 kernel/trace/trace_events_hist.c:1810 kernel/trace/trace_events_hist.c:3158 kernel/trace/trace_events_hist.c:3105 kernel/trace/trace_events_hist.c:5518 kernel/trace/trace_events_hist.c:5998 kernel/trace/trace_events_hist.c:6019 kernel/trace/trace_events_hist.c:6044 kernel/trace/trace_events_trigger.c:1500 kernel/trace/trace_events_trigger.c:1540 kernel/trace/trace_events_trigger.c:539 kernel/trace/trace_events_trigger.c:584 -----I investigated those warnings and found that the RCU-list traversals in event trigger and hist didn't need to use RCU version because those were called only under
event_mutex.I also checked other RCU-list traversals related to event trigger list, and found that most of them were called from
event_hist_trigger_func()orhist_unregister_trigger()or register/unregister functions except for a few cases.
Quoted 5 lines
Replace these unneeded RCU-list traversals with normal list traversal macro and
lockdep_assert_held()to check theevent_mutexis held.Signed-off-by Masami Hiramatsu <[email protected]>
This patch looks fine to me, thanks for the fixes.
Quoted 236 lines
--- kernel/trace/trace_events_hist.c | 41 ++++++++++++++++++++++++++--------- kernel/trace/trace_events_trigger.c | 20 +++++++++++++---- 2 files changed, 45 insertions(+), 16 deletions(-)kernel/trace/trace_events_hist.c +3
-1@@ -1753,11 +1753,13 @@ static struct hist_field *find_var(structhist_trigger_data *hist_data, struct event_trigger_data *test;struct hist_field *hist_field; +lockdep_assert_held (&event_mutex); + hist_field =find_var_field (hist_data, var_name);if (hist_field)return hist_field; -list_for_each_entry_rcu (test, &file->triggers, list) { +list_for_each_entry (test, &file->triggers, list) {if (test->cmd_ops->trigger_type ==ETT_EVENT_HIST ) { test_data = test->private_data;
hist_field= find_var_field(test_data,var_name);kernel/trace/trace_events_hist.c +3
-1@@ -1807,7 +1809,9 @@ static struct hist_field *find_file_var(structtrace_event_file *file, struct event_trigger_data *test;struct hist_field *hist_field; -list_for_each_entry_rcu (test, &file->triggers, list) { +lockdep_assert_held (&event_mutex); + +list_for_each_entry (test, &file->triggers, list) {if (test->cmd_ops->trigger_type ==ETT_EVENT_HIST ) { test_data = test->private_data;
hist_field= find_var_field(test_data,var_name);kernel/trace/trace_events_hist.c +3
-1@@ -3102,7 +3106,9 @@ static char *find_trigger_filter(struct hist_trigger_data *hist_data, {struct event_trigger_data *test; -list_for_each_entry_rcu (test, &file->triggers, list) { +lockdep_assert_held (&event_mutex); + +list_for_each_entry (test, &file->triggers, list) {if (test->cmd_ops->trigger_type ==ETT_EVENT_HIST ) {if (test->private_data == hist_data)kernel/trace/trace_events_hist.c +3
-1return test->filter_str;@@ -3153,9 +3159,11 @@ find_compatible_hist(struct hist_trigger_data *target_hist_data, struct event_trigger_data *test;unsigned int n_keys; +lockdep_assert_held (&event_mutex); + n_keys = target_hist_data->n_fields - target_hist_data- >n_vals; -list_for_each_entry_rcu (test, &file->triggers, list) { +list_for_each_entry (test, &file->triggers, list) {if (test->cmd_ops->trigger_type ==ETT_EVENT_HIST ) {kernel/trace/trace_events_hist.c +1
-1hist_data = test->private_data;@@ -5515,7 +5523,7 @@ static int hist_show(struct seq_file *m, void *v) goto out_unlock; } -list_for_each_entry_rcu (data, &event_file->triggers, list) { +list_for_each_entry (data, &event_file->triggers, list) {if (data->cmd_ops->trigger_type ==ETT_EVENT_HIST )hist_trigger_show (m, data, n++);kernel/trace/trace_events_hist.c +3
-1}@@ -5908,7 +5916,9 @@ static int hist_register_trigger(char *glob, struct event_trigger_ops *ops, if (hist_data->attrs->name && !named_data) goto new; - list_for_each_entry_rcu(test, &file->triggers, list) { +lockdep_assert_held (&event_mutex); + + list_for_each_entry(test, &file->triggers, list) { if (test->cmd_ops->trigger_type == ETT_EVENT_HIST) { if (!hist_trigger_match(data, test,
named_data, false))kernel/trace/trace_events_hist.c +3
-1continue ;@@ -5992,10 +6002,12 @@ static bool have_hist_trigger_match(structevent_trigger_data *data, struct event_trigger_data *test, *named_data = NULL;bool match = false; +lockdep_assert_held (&event_mutex); +if (hist_data->attrs->name) named_data =find_named_trigger (hist_data->attrs- >name); -list_for_each_entry_rcu (test, &file->triggers, list) { +list_for_each_entry (test, &file->triggers, list) {if (test->cmd_ops->trigger_type ==ETT_EVENT_HIST ) {if (hist_trigger_match(data, test,
named_data, false)) {kernel/trace/trace_events_hist.c +3
-1match = true;@@ -6013,10 +6025,12 @@ static bool hist_trigger_check_refs(structevent_trigger_data *data, struct hist_trigger_data *hist_data = data->private_data;struct event_trigger_data *test, *named_data =NULL ; +lockdep_assert_held (&event_mutex); +if (hist_data->attrs->name) named_data =find_named_trigger (hist_data->attrs- >name); -list_for_each_entry_rcu (test, &file->triggers, list) { +list_for_each_entry (test, &file->triggers, list) {if (test->cmd_ops->trigger_type ==ETT_EVENT_HIST ) {if (!hist_trigger_match(data, test,
named_data, false))kernel/trace/trace_events_hist.c +3
-1continue ;@@ -6038,10 +6052,12 @@ static void hist_unregister_trigger(char *glob, struct event_trigger_ops *ops, struct event_trigger_data *test, *named_data = NULL;bool unregistered = false; +lockdep_assert_held (&event_mutex); +if (hist_data->attrs->name) named_data =find_named_trigger (hist_data->attrs- >name); -list_for_each_entry_rcu (test, &file->triggers, list) { +list_for_each_entry (test, &file->triggers, list) {if (test->cmd_ops->trigger_type ==ETT_EVENT_HIST ) {if (!hist_trigger_match(data, test,
named_data, false))kernel/trace/trace_events_hist.c +3
-1continue ;@@ -6067,7 +6083,9 @@ static bool hist_file_check_refs(struct trace_event_file *file)struct hist_trigger_data *hist_data;struct event_trigger_data *test; -list_for_each_entry_rcu (test, &file->triggers, list) { +lockdep_assert_held (&event_mutex); + +list_for_each_entry (test, &file->triggers, list) {if (test->cmd_ops->trigger_type ==ETT_EVENT_HIST ) { hist_data = test->private_data;kernel/trace/trace_events_hist.c +1
-1if (check_var_refs (hist_data))@@ -6310,7 +6328,8 @@ hist_enable_trigger(struct event_trigger_data *data, void *rec, struct enable_trigger_data *enable_data = data- >private_data;struct event_trigger_data *test; -list_for_each_entry_rcu (test, &enable_data->file->triggers, list) { + list_for_each_entry_rcu(test, &enable_data->file->triggers,list,
kernel/trace/trace_events_hist.c +1
-0+ lockdep_is_held(&event_mutex)) {if (test->cmd_ops->trigger_type ==ETT_EVENT_HIST ) {if (enable_data->enable) test->paused = false;kernel/trace/trace_events_trigger.c +3
-1@@ -501,7 +501,9 @@ void update_cond_flag(struct trace_event_file *file)struct event_trigger_data *data;bool set_cond = false; - list_for_each_entry_rcu(data, &file->triggers, list) { +lockdep_assert_held (&event_mutex); + + list_for_each_entry(data, &file->triggers, list) { if (data->filter || event_command_post_trigger(data-Quoted 1 line
cmd_ops) ||kernel/trace/trace_events_trigger.c +3
-1event_command_needs_rec(data->cmd_ops)) { set_cond = true;@@ -536,7 +538,9 @@ static int register_trigger(char *glob, structevent_trigger_ops *ops, struct event_trigger_data *test;int ret =0 ; -list_for_each_entry_rcu (test, &file->triggers, list) { +lockdep_assert_held (&event_mutex); + +list_for_each_entry (test, &file->triggers, list) {if (test->cmd_ops->trigger_type == data->cmd_ops- >trigger_type) {kernel/trace/trace_events_trigger.c +3
-1ret = -EEXIST ; goto out;@@ -581,7 +585,9 @@ static void unregister_trigger(char *glob, structevent_trigger_ops *ops, struct event_trigger_data *data;bool unregistered = false; -list_for_each_entry_rcu (data, &file->triggers, list) { +lockdep_assert_held (&event_mutex); + +list_for_each_entry (data, &file->triggers, list) {if (data->cmd_ops->trigger_type == test->cmd_ops- >trigger_type) {kernel/trace/trace_events_trigger.c +6
-2unregistered = true;list_del_rcu (&data->list);@@ -1497,7 +1503,9 @@ int event_enable_register_trigger(char *glob,struct event_trigger_data *test;int ret =0 ; -list_for_each_entry_rcu (test, &file->triggers, list) { +lockdep_assert_held (&event_mutex); + +list_for_each_entry (test, &file->triggers, list) { test_enable_data = test->private_data; if (test_enable_data && (test->cmd_ops->trigger_type ==@@ -1537,7 +1545,9 @@ void event_enable_unregister_trigger(char *glob, struct event_trigger_data *data;bool unregistered = false; -list_for_each_entry_rcu (data, &file->triggers, list) { +lockdep_assert_held (&event_mutex); + +list_for_each_entry (data, &file->triggers, list) { enable_data = data->private_data; if (enable_data &&(
data->cmd_ops->trigger_type==