linux-kernel - [for-next][PATCH] tracing: Use guard() rather than scoped

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20241126083614.29ae8296@gandalf.local.home>
Date: Tue, 26 Nov 2024 08:36:14 -0500
From: Steven Rostedt <rostedt@...dmis.org>
To: LKML <linux-kernel@...r.kernel.org>
Cc: Masami Hiramatsu <mhiramat@...nel.org>, Mathieu Desnoyers
 <mathieu.desnoyers@...icios.com>
Subject: [for-next][PATCH] tracing: Use guard() rather than scoped_guard()


  git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
trace/for-next

Head SHA1: 2bd9b57d04df417f31ef54448477c212fcdd14fc


Mathieu Desnoyers (1):
      tracing: Use guard() rather than scoped_guard()

----
 include/linux/tracepoint.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
---------------------------
commit 2bd9b57d04df417f31ef54448477c212fcdd14fc
Author: Mathieu Desnoyers <mathieu.desnoyers@...icios.com>
Date:   Mon Nov 25 09:25:14 2024 -0500

    tracing: Use guard() rather than scoped_guard()
    
    Using scoped_guard() in the implementation of trace_##name() adds an
    unnecessary level of indentation.
    
    Cc: Steven Rostedt <rostedt@...dmis.org>
    Cc: Linus Torvalds <torvalds@...ux-foundation.org>
    Cc: Thomas Gleixner <tglx@...utronix.de>
    Cc: Michael Jeanson <mjeanson@...icios.com>
    Cc: Masami Hiramatsu <mhiramat@...nel.org>
    Cc: Peter Zijlstra <peterz@...radead.org>
    Cc: Alexei Starovoitov <ast@...nel.org>
    Cc: Yonghong Song <yhs@...com>
    Cc: Paul E. McKenney <paulmck@...nel.org>
    Cc: Ingo Molnar <mingo@...hat.com>
    Cc: Arnaldo Carvalho de Melo <acme@...nel.org>
    Cc: Mark Rutland <mark.rutland@....com>
    Cc: Alexander Shishkin <alexander.shishkin@...ux.intel.com>
    Cc: Namhyung Kim <namhyung@...nel.org>
    Cc: Andrii Nakryiko <andrii.nakryiko@...il.com>
    Cc: bpf@...r.kernel.org
    Cc: Joel Fernandes <joel@...lfernandes.org>
    Cc: Jordan Rife <jrife@...gle.com>
    Link: https://lore.kernel.org/20241125142514.2897143-1-mathieu.desnoyers@efficios.com
    Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@...icios.com>
    Signed-off-by: Steven Rostedt (Google) <rostedt@...dmis.org>

diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h
index b2633a72e871..e398f6e43f61 100644
--- a/include/linux/tracepoint.h
+++ b/include/linux/tracepoint.h
@@ -259,8 +259,8 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p)
 	{								\
 		if (static_branch_unlikely(&__tracepoint_##name.key)) { \
 			if (cond) {					\
-				scoped_guard(preempt_notrace)		\
-					__DO_TRACE_CALL(name, TP_ARGS(args)); \
+				guard(preempt_notrace)();		\
+				__DO_TRACE_CALL(name, TP_ARGS(args));	\
 			}						\
 		}							\
 		if (IS_ENABLED(CONFIG_LOCKDEP) && (cond)) {		\
@@ -275,8 +275,8 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p)
 	{								\
 		might_fault();						\
 		if (static_branch_unlikely(&__tracepoint_##name.key)) {	\
-			scoped_guard(rcu_tasks_trace)			\
-				__DO_TRACE_CALL(name, TP_ARGS(args));	\
+			guard(rcu_tasks_trace)();			\
+			__DO_TRACE_CALL(name, TP_ARGS(args));		\
 		}							\
 		if (IS_ENABLED(CONFIG_LOCKDEP)) {			\
 			WARN_ONCE(!rcu_is_watching(),			\