From nobody Sun Feb 8 23:25:07 2026 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 65B36212FA4 for ; Tue, 24 Dec 2024 19:38:06 +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=1735069087; cv=none; b=Ow2adNsO4POSNoTRBwfc+Rp8g01EFqQF53ARKVhFKK2PL4xXfB7leAR562TTM/47meNlQB9PzcH/F155GiGN2P64waBF6v/jgVFCg6bqqEOoTZw70NOAH0rQ7KDneqklhNszi1S0C9tLgJnikYpyeGZ3Zhob9Nq0df81IzTunHg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735069087; c=relaxed/simple; bh=0EwiTg1sUDlnrCbY6YCSfjgsadkDIVbxbngTcPFU+aU=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=pwsyr6xip5mppjRY5gyxoSOZFQYNDOz22eBahLcqVrw0rdoDndj1qdrmoULNQGtrD/DHfK9uZmmlvqw5KxDGaKgEhhZz1hT/yFQyMvccfhQOBAf4x5L2cXMii7j8Nm1VN/R27IooIxi5YTnIPFLg7gOVY+1eDcCEUiWlR447N38= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id D3813C4CED7; Tue, 24 Dec 2024 19:38:06 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.98) (envelope-from ) id 1tQAk9-0000000EVGf-0pbn; Tue, 24 Dec 2024 14:39:01 -0500 Message-ID: <20241224193901.048765107@goodmis.org> User-Agent: quilt/0.68 Date: Tue, 24 Dec 2024 14:38:39 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton Subject: [for-next][PATCH 3/5] ftrace: Remove unneeded goto jumps References: <20241224193836.812390655@goodmis.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 There are some goto jumps to exit a program to just return a value. The code after the label doesn't free anything nor does it do any unlocks. It simply returns the variable that was set before the jump. Remove these unneeded goto jumps. Cc: Masami Hiramatsu Cc: Mark Rutland Cc: Mathieu Desnoyers Cc: Andrew Morton Link: https://lore.kernel.org/20241223184941.544855549@goodmis.org Signed-off-by: Steven Rostedt (Google) --- kernel/trace/ftrace.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 63a9ffa65e17..2c1691aa1d2f 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -1669,14 +1669,12 @@ unsigned long ftrace_location(unsigned long ip) loc =3D ftrace_location_range(ip, ip); if (!loc) { if (!kallsyms_lookup_size_offset(ip, &size, &offset)) - goto out; + return 0; =20 /* map sym+0 to __fentry__ */ if (!offset) loc =3D ftrace_location_range(ip, ip + size - 1); } - -out: return loc; } =20 @@ -2071,7 +2069,7 @@ static int __ftrace_hash_update_ipmodify(struct ftrac= e_ops *ops, continue; =20 if (rec =3D=3D end) - goto err_out; + return -EBUSY; =20 in_old =3D !!ftrace_lookup_ip(old_hash, rec->ip); in_new =3D !!ftrace_lookup_ip(new_hash, rec->ip); @@ -2084,7 +2082,6 @@ static int __ftrace_hash_update_ipmodify(struct ftrac= e_ops *ops, rec->flags |=3D FTRACE_FL_IPMODIFY; } while_for_each_ftrace_rec(); =20 -err_out: return -EBUSY; } =20 @@ -5720,12 +5717,10 @@ ftrace_regex_write(struct file *file, const char __= user *ubuf, parser->idx, enable); trace_parser_clear(parser); if (ret < 0) - goto out; + return ret; } =20 - ret =3D read; - out: - return ret; + return read; } =20 ssize_t --=20 2.45.2