From nobody Sun Feb 8 21:27:18 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 0EB81824A0 for ; Thu, 26 Dec 2024 14:38:38 +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=1735223918; cv=none; b=Dwantve0+tIQ6zzvtpTXWG9a1HN/47kWZTJ5SUO1HPLtQMSDLZJ7BIGX5IwtVvbu7f0J3DLSrAxjkRe7OEDiKR1OFsNhfN9Lez8lyl/AiQ0YxDATvjWttTZMyRTGkuSHyETDZzIUGuNAJK7qGAw2an29g/rteNWVNevPr4aKJYE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735223918; c=relaxed/simple; bh=svxd3o7KCoMoe77S+DwYlpSFyWneMl9IM36M7P3Hjmk=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=DPCjuTZMUNqf7OBrDZ3aVf8fNlZBzdUmQ8QIOOx9MBOGnJiLlCvsQIO0l3sBttQPYcNALGo+4qxxd/FZrpBjeu6Foqd8Q6M6o69mBOXwrbAokdz6yfEQx6cQHAAdolmn8DZ0csvDjEIaeqKNnsGaCm3PXXLievJLXmwQeZu3R2o= 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 C9AC0C4CED1; Thu, 26 Dec 2024 14:38:37 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.98) (envelope-from ) id 1tQp1U-0000000G1uJ-2mMc; Thu, 26 Dec 2024 09:39:36 -0500 Message-ID: <20241226143936.513295476@goodmis.org> User-Agent: quilt/0.68 Date: Thu, 26 Dec 2024 09:39:25 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Peter Zijlstra Subject: [for-next][PATCH 11/15] tracing: Switch trace_osnoise.c code over to use guard() and __free() References: <20241226143914.397394975@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 The osnoise_hotplug_workfn() grabs two mutexes and cpu_read_lock(). It has various gotos to handle unlocking them. Switch them over to guard() and let the compiler worry about it. The osnoise_cpus_read() has a temporary mask_str allocated and there's some gotos to make sure it gets freed on error paths. Switch that over to __free() to let the compiler worry about it. Cc: Masami Hiramatsu Cc: Mark Rutland Cc: Mathieu Desnoyers Cc: Andrew Morton Cc: Peter Zijlstra Link: https://lore.kernel.org/20241225222931.517329690@goodmis.org Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_osnoise.c | 40 ++++++++++++------------------------ 1 file changed, 13 insertions(+), 27 deletions(-) diff --git a/kernel/trace/trace_osnoise.c b/kernel/trace/trace_osnoise.c index b9f96c77527d..b25c30b05dd0 100644 --- a/kernel/trace/trace_osnoise.c +++ b/kernel/trace/trace_osnoise.c @@ -2083,26 +2083,21 @@ static void osnoise_hotplug_workfn(struct work_stru= ct *dummy) { unsigned int cpu =3D smp_processor_id(); =20 - mutex_lock(&trace_types_lock); + guard(mutex)(&trace_types_lock); =20 if (!osnoise_has_registered_instances()) - goto out_unlock_trace; + return; =20 - mutex_lock(&interface_lock); - cpus_read_lock(); + guard(mutex)(&interface_lock); + guard(cpus_read_lock)(); =20 if (!cpu_online(cpu)) - goto out_unlock; + return; + if (!cpumask_test_cpu(cpu, &osnoise_cpumask)) - goto out_unlock; + return; =20 start_kthread(cpu); - -out_unlock: - cpus_read_unlock(); - mutex_unlock(&interface_lock); -out_unlock_trace: - mutex_unlock(&trace_types_lock); } =20 static DECLARE_WORK(osnoise_hotplug_work, osnoise_hotplug_workfn); @@ -2300,31 +2295,22 @@ static ssize_t osnoise_cpus_read(struct file *filp, char __user *ubuf, size_t count, loff_t *ppos) { - char *mask_str; + char *mask_str __free(kfree) =3D NULL; int len; =20 - mutex_lock(&interface_lock); + guard(mutex)(&interface_lock); =20 len =3D snprintf(NULL, 0, "%*pbl\n", cpumask_pr_args(&osnoise_cpumask)) += 1; mask_str =3D kmalloc(len, GFP_KERNEL); - if (!mask_str) { - count =3D -ENOMEM; - goto out_unlock; - } + if (!mask_str) + return -ENOMEM; =20 len =3D snprintf(mask_str, len, "%*pbl\n", cpumask_pr_args(&osnoise_cpuma= sk)); - if (len >=3D count) { - count =3D -EINVAL; - goto out_free; - } + if (len >=3D count) + return -EINVAL; =20 count =3D simple_read_from_buffer(ubuf, count, ppos, mask_str, len); =20 -out_free: - kfree(mask_str); -out_unlock: - mutex_unlock(&interface_lock); - return count; } =20 --=20 2.45.2