143 lines
3.6 KiB
Diff
143 lines
3.6 KiB
Diff
From f7a227320aab53c99656f21d40481af89dfb8923 Mon Sep 17 00:00:00 2001
|
|
From: Steven Rostedt <rostedt@goodmis.org>
|
|
Date: Fri, 1 Aug 2025 16:37:23 -0400
|
|
Subject: tracing: Remove unneeded goto out logic
|
|
|
|
Several places in the trace.c file there's a goto out where the out is
|
|
simply a return. There's no reason to jump to the out label if it's not
|
|
doing any more logic but simply returning from the function.
|
|
|
|
Replace the goto outs with a return and remove the out labels.
|
|
|
|
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>
|
|
Link: https://lore.kernel.org/20250801203857.538726745@kernel.org
|
|
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
|
|
---
|
|
kernel/trace/trace.c | 38 +++++++++++++++-----------------------
|
|
1 file changed, 15 insertions(+), 23 deletions(-)
|
|
|
|
--- a/kernel/trace/trace.c
|
|
+++ b/kernel/trace/trace.c
|
|
@@ -1846,7 +1846,7 @@ int trace_get_user(struct trace_parser *
|
|
|
|
ret = get_user(ch, ubuf++);
|
|
if (ret)
|
|
- goto out;
|
|
+ return ret;
|
|
|
|
read++;
|
|
cnt--;
|
|
@@ -1860,7 +1860,7 @@ int trace_get_user(struct trace_parser *
|
|
while (cnt && isspace(ch)) {
|
|
ret = get_user(ch, ubuf++);
|
|
if (ret)
|
|
- goto out;
|
|
+ return ret;
|
|
read++;
|
|
cnt--;
|
|
}
|
|
@@ -1870,8 +1870,7 @@ int trace_get_user(struct trace_parser *
|
|
/* only spaces were written */
|
|
if (isspace(ch) || !ch) {
|
|
*ppos += read;
|
|
- ret = read;
|
|
- goto out;
|
|
+ return read;
|
|
}
|
|
}
|
|
|
|
@@ -1879,13 +1878,12 @@ int trace_get_user(struct trace_parser *
|
|
while (cnt && !isspace(ch) && ch) {
|
|
if (parser->idx < parser->size - 1)
|
|
parser->buffer[parser->idx++] = ch;
|
|
- else {
|
|
- ret = -EINVAL;
|
|
- goto out;
|
|
- }
|
|
+ else
|
|
+ return -EINVAL;
|
|
+
|
|
ret = get_user(ch, ubuf++);
|
|
if (ret)
|
|
- goto out;
|
|
+ return ret;
|
|
read++;
|
|
cnt--;
|
|
}
|
|
@@ -1900,15 +1898,11 @@ int trace_get_user(struct trace_parser *
|
|
/* Make sure the parsed string always terminates with '\0'. */
|
|
parser->buffer[parser->idx] = 0;
|
|
} else {
|
|
- ret = -EINVAL;
|
|
- goto out;
|
|
+ return -EINVAL;
|
|
}
|
|
|
|
*ppos += read;
|
|
- ret = read;
|
|
-
|
|
-out:
|
|
- return ret;
|
|
+ return read;
|
|
}
|
|
|
|
/* TODO add a seq_buf_to_buffer() */
|
|
@@ -2410,10 +2404,10 @@ int __init register_tracer(struct tracer
|
|
mutex_unlock(&trace_types_lock);
|
|
|
|
if (ret || !default_bootup_tracer)
|
|
- goto out_unlock;
|
|
+ return ret;
|
|
|
|
if (strncmp(default_bootup_tracer, type->name, MAX_TRACER_SIZE))
|
|
- goto out_unlock;
|
|
+ return 0;
|
|
|
|
printk(KERN_INFO "Starting tracer '%s'\n", type->name);
|
|
/* Do we want this tracer to start on bootup? */
|
|
@@ -2425,8 +2419,7 @@ int __init register_tracer(struct tracer
|
|
/* disable other selftests, since this will break it. */
|
|
disable_tracing_selftest("running a tracer");
|
|
|
|
- out_unlock:
|
|
- return ret;
|
|
+ return 0;
|
|
}
|
|
|
|
static void tracing_reset_cpu(struct array_buffer *buf, int cpu)
|
|
@@ -8954,12 +8947,12 @@ ftrace_trace_snapshot_callback(struct tr
|
|
out_reg:
|
|
ret = tracing_arm_snapshot(tr);
|
|
if (ret < 0)
|
|
- goto out;
|
|
+ return ret;
|
|
|
|
ret = register_ftrace_function_probe(glob, tr, ops, count);
|
|
if (ret < 0)
|
|
tracing_disarm_snapshot(tr);
|
|
- out:
|
|
+
|
|
return ret < 0 ? ret : 0;
|
|
}
|
|
|
|
@@ -11057,7 +11050,7 @@ __init static int tracer_alloc_buffers(v
|
|
BUILD_BUG_ON(TRACE_ITER_LAST_BIT > TRACE_FLAGS_MAX_SIZE);
|
|
|
|
if (!alloc_cpumask_var(&tracing_buffer_mask, GFP_KERNEL))
|
|
- goto out;
|
|
+ return -ENOMEM;
|
|
|
|
if (!alloc_cpumask_var(&global_trace.tracing_cpumask, GFP_KERNEL))
|
|
goto out_free_buffer_mask;
|
|
@@ -11175,7 +11168,6 @@ out_free_cpumask:
|
|
free_cpumask_var(global_trace.tracing_cpumask);
|
|
out_free_buffer_mask:
|
|
free_cpumask_var(tracing_buffer_mask);
|
|
-out:
|
|
return ret;
|
|
}
|
|
|