Commit ef0d4186 authored by Mathieu Desnoyers's avatar Mathieu Desnoyers Committed by Steven Rostedt (Google)
Browse files

tracing: Remove cond argument from __DECLARE_TRACE_SYSCALL 

Syscall tracepoints do not require a "cond" argument, because they are
meant to be used only for sys_enter and sys_exit instrumentation, which
don't require condition evaluation.

Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Michael Jeanson <mjeanson@efficios.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Yonghong Song <yhs@fb.com>
Cc: Paul E. McKenney <paulmck@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Andrii Nakryiko <andrii.nakryiko@gmail.com>
Cc: bpf@vger.kernel.org
Cc: Joel Fernandes <joel@joelfernandes.org>
Cc: Jordan Rife <jrife@google.com>
Cc: linux-trace-kernel@vger.kernel.org
Link: https://lore.kernel.org/20241123153031.2884933-6-mathieu.desnoyers@efficios.com


Signed-off-by: default avatarMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parent 98bf0fbb

include/linux/tracepoint.h

+13 −12
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p) 
 * site if it is not watching, as it will need to be active when the

 * tracepoint is enabled.

 */

#define __DECLARE_TRACE_COMMON(name, proto, args, cond, data_proto)	\

#define __DECLARE_TRACE_COMMON(name, proto, args, data_proto)		\

	extern int __traceiter_##name(data_proto);			\

	DECLARE_STATIC_CALL(tp_func_##name, __traceiter_##name);	\

	extern struct tracepoint __tracepoint_##name;			\
@@ -254,7 +254,7 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p) 
	}



#define __DECLARE_TRACE(name, proto, args, cond, data_proto)		\

	__DECLARE_TRACE_COMMON(name, PARAMS(proto), PARAMS(args), cond, PARAMS(data_proto)) \

	__DECLARE_TRACE_COMMON(name, PARAMS(proto), PARAMS(args), PARAMS(data_proto)) \

	static inline void trace_##name(proto)				\

	{								\

		if (static_branch_unlikely(&__tracepoint_##name.key)) { \
@@ -269,18 +269,16 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p) 
		}							\

	}



#define __DECLARE_TRACE_SYSCALL(name, proto, args, cond, data_proto)	\

	__DECLARE_TRACE_COMMON(name, PARAMS(proto), PARAMS(args), cond, PARAMS(data_proto)) \

#define __DECLARE_TRACE_SYSCALL(name, proto, args, data_proto)		\

	__DECLARE_TRACE_COMMON(name, PARAMS(proto), PARAMS(args), PARAMS(data_proto)) \

	static inline void trace_##name(proto)				\

	{								\

		might_fault();						\

		if (static_branch_unlikely(&__tracepoint_##name.key)) {	\

			if (cond) {					\

			scoped_guard(rcu_tasks_trace)			\

				__DO_TRACE_CALL(name, TP_ARGS(args));	\

		}							\

		}							\

		if (IS_ENABLED(CONFIG_LOCKDEP) && (cond)) {		\

		if (IS_ENABLED(CONFIG_LOCKDEP)) {			\

			WARN_ONCE(!rcu_is_watching(),			\

				  "RCU not watching for tracepoint");	\

		}							\
@@ -363,7 +361,7 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p) 




#else /* !TRACEPOINTS_ENABLED */

#define __DECLARE_TRACE(name, proto, args, cond, data_proto)		\

#define __DECLARE_TRACE_COMMON(name, proto, args, data_proto)		\

	static inline void trace_##name(proto)				\

	{ }								\

	static inline int						\
@@ -387,7 +385,11 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p) 
		return false;						\

	}



#define __DECLARE_TRACE_SYSCALL	__DECLARE_TRACE

#define __DECLARE_TRACE(name, proto, args, cond, data_proto)		\

	__DECLARE_TRACE_COMMON(name, PARAMS(proto), PARAMS(args), PARAMS(data_proto))



#define __DECLARE_TRACE_SYSCALL(name, proto, args, data_proto)		\

	__DECLARE_TRACE_COMMON(name, PARAMS(proto), PARAMS(args), PARAMS(data_proto))



#define DEFINE_TRACE_FN(name, reg, unreg, proto, args)

#define DEFINE_TRACE_SYSCALL(name, reg, unreg, proto, args)
@@ -453,7 +455,6 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p) 


#define DECLARE_TRACE_SYSCALL(name, proto, args)			\

	__DECLARE_TRACE_SYSCALL(name, PARAMS(proto), PARAMS(args),	\

				cpu_online(raw_smp_processor_id()),	\

				PARAMS(void *__data, proto))



#define TRACE_EVENT_FLAGS(event, flag)