From nobody Sun Oct 5 16:14:48 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 242EC24678D for ; Sat, 2 Aug 2025 16:28:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754152086; cv=none; b=gP0CqZSppR6gMfd4z9q7sGMpBBw9+lZI3jRF5y9/aKoQSvLINVqloU0m2ZfYR2vDLx4Uiv6l2DqENn+3bzQwURiBReL8ah3DuuuTrFB8i1GPOauoVpmAvxsP8a2myKgW4o3LuOTTEMzAx/Le6sEU8ai3KruSyV3xEOTTSYjoKUE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754152086; c=relaxed/simple; bh=d6zCVUfJaDGVqc+4GbmEQMcZiZelLR5EeqAbnbDeC3g=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=sdKgfYEViXQGVfyzaAQi6BGX25QYsTa6uUyo/CHkEuyCbjby8XxQQ2v5XRZTUYMe+t58GzPgoafXcerdYx5cdMY491L1NtkxzETDhYir99w3s8tRMbFh/yGj1+CO6dwkcdDJCHPqL98tq2XgE4hcmD9Sfyfos8UZ3Zt0p7FnjG8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=B2eE/QqN; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="B2eE/QqN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A6A8AC4CEF8; Sat, 2 Aug 2025 16:28:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1754152085; bh=d6zCVUfJaDGVqc+4GbmEQMcZiZelLR5EeqAbnbDeC3g=; h=Date:From:To:Cc:Subject:References:From; b=B2eE/QqNzBSgG/c09pPcG9i/j7xU/b5TJfeOoZm67ksawb8L9iHept+TViyDtqjuk zgWKDUtUDbyKUvbrzodZfH4cgLCuxJFvXPDnovYgzZY+wS8rYpbh79EyFwiP9ZVx94 DrpUlr19phNcgcGUJQxhQh/lc5klAo77hy6UtoWGnqHHAwLXg3agb/T6OnOqatSquH ciypdqniffXMGxO6SlW004xyVUow5nUK++RZ4qCnpvUYG2P3gpcKBJbvCahAxkHPQD FHGVG7ybRu0GVI6JtGt3VR1USQYghb/+gROpZTnwIGUPF/4K4kKZkZbofeKdwxC+1+ FDbg1MnfOan8g== Received: from rostedt by gandalf with local (Exim 4.98.2) (envelope-from ) id 1uiF5x-00000008SWb-0k8Y; Sat, 02 Aug 2025 12:28:29 -0400 Message-ID: <20250802162829.026774840@kernel.org> User-Agent: quilt/0.68 Date: Sat, 02 Aug 2025 12:27:35 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Tomas Glozar , John Kacur , Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton Subject: [for-next][PATCH 1/6] tracing: Remove unneeded goto out logic References: <20250802162734.529626660@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Steven Rostedt 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 Cc: Mark Rutland Cc: Mathieu Desnoyers Cc: Andrew Morton Link: https://lore.kernel.org/20250801203857.538726745@kernel.org Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace.c | 38 +++++++++++++++----------------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 945a8ecf2c62..0ec9cab9a812 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -1841,7 +1841,7 @@ int trace_get_user(struct trace_parser *parser, const= char __user *ubuf, =20 ret =3D get_user(ch, ubuf++); if (ret) - goto out; + return ret; =20 read++; cnt--; @@ -1855,7 +1855,7 @@ int trace_get_user(struct trace_parser *parser, const= char __user *ubuf, while (cnt && isspace(ch)) { ret =3D get_user(ch, ubuf++); if (ret) - goto out; + return ret; read++; cnt--; } @@ -1865,8 +1865,7 @@ int trace_get_user(struct trace_parser *parser, const= char __user *ubuf, /* only spaces were written */ if (isspace(ch) || !ch) { *ppos +=3D read; - ret =3D read; - goto out; + return read; } } =20 @@ -1874,13 +1873,12 @@ int trace_get_user(struct trace_parser *parser, con= st char __user *ubuf, while (cnt && !isspace(ch) && ch) { if (parser->idx < parser->size - 1) parser->buffer[parser->idx++] =3D ch; - else { - ret =3D -EINVAL; - goto out; - } + else + return -EINVAL; + ret =3D get_user(ch, ubuf++); if (ret) - goto out; + return ret; read++; cnt--; } @@ -1895,15 +1893,11 @@ int trace_get_user(struct trace_parser *parser, con= st char __user *ubuf, /* Make sure the parsed string always terminates with '\0'. */ parser->buffer[parser->idx] =3D 0; } else { - ret =3D -EINVAL; - goto out; + return -EINVAL; } =20 *ppos +=3D read; - ret =3D read; - -out: - return ret; + return read; } =20 /* TODO add a seq_buf_to_buffer() */ @@ -2405,10 +2399,10 @@ int __init register_tracer(struct tracer *type) mutex_unlock(&trace_types_lock); =20 if (ret || !default_bootup_tracer) - goto out_unlock; + return ret; =20 if (strncmp(default_bootup_tracer, type->name, MAX_TRACER_SIZE)) - goto out_unlock; + return 0; =20 printk(KERN_INFO "Starting tracer '%s'\n", type->name); /* Do we want this tracer to start on bootup? */ @@ -2420,8 +2414,7 @@ int __init register_tracer(struct tracer *type) /* disable other selftests, since this will break it. */ disable_tracing_selftest("running a tracer"); =20 - out_unlock: - return ret; + return 0; } =20 static void tracing_reset_cpu(struct array_buffer *buf, int cpu) @@ -8963,12 +8956,12 @@ ftrace_trace_snapshot_callback(struct trace_array *= tr, struct ftrace_hash *hash, out_reg: ret =3D tracing_arm_snapshot(tr); if (ret < 0) - goto out; + return ret; =20 ret =3D register_ftrace_function_probe(glob, tr, ops, count); if (ret < 0) tracing_disarm_snapshot(tr); - out: + return ret < 0 ? ret : 0; } =20 @@ -11070,7 +11063,7 @@ __init static int tracer_alloc_buffers(void) BUILD_BUG_ON(TRACE_ITER_LAST_BIT > TRACE_FLAGS_MAX_SIZE); =20 if (!alloc_cpumask_var(&tracing_buffer_mask, GFP_KERNEL)) - goto out; + return -ENOMEM; =20 if (!alloc_cpumask_var(&global_trace.tracing_cpumask, GFP_KERNEL)) goto out_free_buffer_mask; @@ -11188,7 +11181,6 @@ __init static int tracer_alloc_buffers(void) free_cpumask_var(global_trace.tracing_cpumask); out_free_buffer_mask: free_cpumask_var(tracing_buffer_mask); -out: return ret; } =20 --=20 2.47.2