samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "tracing: Switch trace_events_hist.c code over to use guard()"

Browse Source 
This reverts commit 77b7dbd342 which is
commit 2b36a97aeeb71b1e4a48bfedc7f21f44aeb1e6fb upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: I854ce99a0681c2643d2fec777968dc4549dd19f5
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2025-04-16 13:10:18 +00:00
parent ef68e40e85
commit 87e6b94674
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
kernel/trace/trace_events_hist.c
View File

@@ -5605,19 +5605,25 @@ static int hist_show(struct seq_file *m, void *v)
{
struct event_trigger_data *data;
struct trace_event_file *event_file;
int n = 0;
int n = 0, ret = 0;
guard(mutex)(&event_mutex);
mutex_lock(&event_mutex);
event_file = event_file_file(m->private);
if (unlikely(!event_file))
return -ENODEV;
if (unlikely(!event_file)) {
ret = -ENODEV;
goto out_unlock;
}
list_for_each_entry(data, &event_file->triggers, list) {
if (data->cmd_ops->trigger_type == ETT_EVENT_HIST)
hist_trigger_show(m, data, n++);
}
return 0;
out_unlock:
mutex_unlock(&event_mutex);
return ret;
}
static int event_hist_open(struct inode *inode, struct file *file)
@@ -5878,19 +5884,25 @@ static int hist_debug_show(struct seq_file *m, void *v)
{
struct event_trigger_data *data;
struct trace_event_file *event_file;
int n = 0;
int n = 0, ret = 0;
guard(mutex)(&event_mutex);
mutex_lock(&event_mutex);
event_file = event_file_file(m->private);
if (unlikely(!event_file))
return -ENODEV;
if (unlikely(!event_file)) {
ret = -ENODEV;
goto out_unlock;
}
list_for_each_entry(data, &event_file->triggers, list) {
if (data->cmd_ops->trigger_type == ETT_EVENT_HIST)
hist_trigger_debug_show(m, data, n++);
}
return 0;
out_unlock:
mutex_unlock(&event_mutex);
return ret;
}
static int event_hist_debug_open(struct inode *inode, struct file *file)