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 F3B901A2C11 for ; Sun, 24 Aug 2025 13:49:40 +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=1756043382; cv=none; b=aBrVb5Dq3SpiJ6fpUuxRvJiX3kr0nV/5aeEq9irKOwZEzxctmTbq4nLAr9vpZBIZng/cIKLzyj3GiEqclMikT21qp7Jzg55AObJIgrneHpg62OohddHuNZ45KxCDGt9AgEFKO2Uix6AcGk7k1eAKhVpb2N5x4W4dofVxpp4Cu2I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756043382; c=relaxed/simple; bh=XWNe3rCPwef9jnC3C5ixuust//BWDk7H8WAt1ixsluM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uiJfkXtA/V3nUs3FGkudmyT3T0Q34cq95NlRs7suhY5KV9Y3csPyfytcK/h5QSxcC+5NvKybtwBOSY41vEs8mawfPl3KbRsiJXoGUlMncbxxkBHzSaPm2BqZiCrk0B81LyilDEHM4iM3sTE0fjvMc6KdzwO2lJMnTaNjRXpTGls= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=tNDapp5c; 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="tNDapp5c" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C963CC4CEEB; Sun, 24 Aug 2025 13:49:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1756043380; bh=XWNe3rCPwef9jnC3C5ixuust//BWDk7H8WAt1ixsluM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tNDapp5cngV+7bXHTntdwc7mN2EzjQUCOJih7PQCGkX5SN8wc9nsmsBtO0QJCUumR mHFRJo19tNaY7drunU1irulQFhVH8XELLlX65xEkW0GifrgbU9g89991/T4P7LJYLT i/cwjVKMDg6x/WbtTVQH4zQ8H1mYoDYwkVxp+kw+AXrtrErekrKpSxVScL2USXNpvP Rqp7dKoVOmDHDjjnUzhkOzZU3T0xYCd7VG28OpDLTYub83ZS963fcDQ96t+Ximdb2t AhDEEbqnqdTFRUHtCKwGZQCF2pt4DBYDtmS/gmpI5ToB7w94zLfYf7Tqd8qftydbEy BzqxihK7KePgA== From: Sasha Levin To: stable@vger.kernel.org Cc: Steven Rostedt , Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Sasha Levin Subject: [PATCH 6.1.y 1/2] tracing: Remove unneeded goto out logic Date: Sun, 24 Aug 2025 09:49:35 -0400 Message-ID: <20250824134936.2918494-1-sashal@kernel.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <2025082331-axis-politely-d9d3@gregkh> References: <2025082331-axis-politely-d9d3@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Steven Rostedt [ Upstream commit c89504a703fb779052213add0e8ed642f4a4f1c8 ] 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) Signed-off-by: Sasha Levin --- kernel/trace/trace.c | 37 ++++++++++++++----------------------- 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 09fbeae53ba4..f08f2f98df2e 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -1618,7 +1618,7 @@ int trace_get_user(struct trace_parser *parser, const char __user *ubuf, ret = get_user(ch, ubuf++); if (ret) - goto out; + return ret; read++; cnt--; @@ -1632,7 +1632,7 @@ int trace_get_user(struct trace_parser *parser, const char __user *ubuf, while (cnt && isspace(ch)) { ret = get_user(ch, ubuf++); if (ret) - goto out; + return ret; read++; cnt--; } @@ -1642,8 +1642,7 @@ int trace_get_user(struct trace_parser *parser, const char __user *ubuf, /* only spaces were written */ if (isspace(ch) || !ch) { *ppos += read; - ret = read; - goto out; + return read; } } @@ -1651,13 +1650,12 @@ int trace_get_user(struct trace_parser *parser, const char __user *ubuf, 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--; } @@ -1672,15 +1670,11 @@ int trace_get_user(struct trace_parser *parser, const char __user *ubuf, /* 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() */ @@ -2149,10 +2143,10 @@ int __init register_tracer(struct tracer *type) 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? */ @@ -2164,8 +2158,7 @@ int __init register_tracer(struct tracer *type) /* 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) @@ -8761,11 +8754,10 @@ ftrace_trace_snapshot_callback(struct trace_array *tr, struct ftrace_hash *hash, out_reg: ret = tracing_alloc_snapshot_instance(tr); if (ret < 0) - goto out; + return ret; ret = register_ftrace_function_probe(glob, tr, ops, count); - out: return ret < 0 ? ret : 0; } @@ -10292,7 +10284,7 @@ __init static int tracer_alloc_buffers(void) 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; @@ -10405,7 +10397,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; } -- 2.50.1