Sleepable tracepoints

[kernel-patches-bot]

Pull request for series with
subject: Sleepable tracepoints
version: 1
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=369725

[kernel-patches-bot]

Master branch: 18ded91
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=369725
version: 1

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/netdevbpf/list/?series=369725
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am -3
  stdout: 'Applying: tracing: introduce sleepable tracepoints
Using index info to reconstruct a base tree...
M	include/linux/tracepoint-defs.h
M	include/linux/tracepoint.h
M	include/trace/define_trace.h
M	init/Kconfig
M	kernel/tracepoint.c
Falling back to patching base and 3-way merge...
Auto-merging kernel/tracepoint.c
Auto-merging init/Kconfig
Auto-merging include/trace/define_trace.h
Auto-merging include/linux/tracepoint.h
CONFLICT (content): Merge conflict in include/linux/tracepoint.h
Auto-merging include/linux/tracepoint-defs.h
Patch failed at 0001 tracing: introduce sleepable tracepoints
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch'

conflict:

diff --cc include/linux/tracepoint.h
index 81fa0b2f271e,0386b54cbcbb..000000000000
--- a/include/linux/tracepoint.h
+++ b/include/linux/tracepoint.h
@@@ -18,8 -18,8 +18,9 @@@
  #include <linux/types.h>
  #include <linux/cpumask.h>
  #include <linux/rcupdate.h>
+ #include <linux/rcupdate_trace.h>
  #include <linux/tracepoint-defs.h>
 +#include <linux/static_call.h>
  
  struct module;
  struct tracepoint;
@@@ -166,11 -164,13 +173,19 @@@ static inline struct tracepoint *tracep
   * has a "void" prototype, then it is invalid to declare a function
   * as "(void *, void)".
   */
++<<<<<<< HEAD
 +#define __DO_TRACE(name, proto, args, cond, rcuidle)			\
++=======
+ #define __DO_TRACE(tp, proto, args, cond, rcuidle, tp_flags)		\
++>>>>>>> tracing: introduce sleepable tracepoints
  	do {								\
  		struct tracepoint_func *it_func_ptr;			\
 -		void *it_func;						\
 -		void *__data;						\
  		int __maybe_unused __idx = 0;				\
++<<<<<<< HEAD
 +		void *__data;						\
++=======
+ 		bool maysleep = (tp_flags) & TRACEPOINT_MAYSLEEP;	\
++>>>>>>> tracing: introduce sleepable tracepoints
  									\
  		if (!(cond))						\
  			return;						\
@@@ -210,13 -221,13 +233,13 @@@
  	static inline void trace_##name##_rcuidle(proto)		\
  	{								\
  		if (static_key_false(&__tracepoint_##name.key))		\
 -			__DO_TRACE(&__tracepoint_##name,		\
 +			__DO_TRACE(name,				\
  				TP_PROTO(data_proto),			\
  				TP_ARGS(data_args),			\
- 				TP_CONDITION(cond), 1);			\
+ 				TP_CONDITION(cond), 1, tp_flags);	\
  	}
  #else
- #define __DECLARE_TRACE_RCU(name, proto, args, cond, data_proto, data_args)
+ #define __DECLARE_TRACE_RCU(name, proto, args, cond, data_proto, data_args, tp_flags)
  #endif
  
  /*
@@@ -231,17 -242,15 +254,21 @@@
   * even when this tracepoint is off. This code has no purpose other than
   * poking RCU a bit.
   */
++<<<<<<< HEAD
 +#define __DECLARE_TRACE(name, proto, args, cond, data_proto, data_args) \
 +	extern int __traceiter_##name(data_proto);			\
 +	DECLARE_STATIC_CALL(tp_func_##name, __traceiter_##name);	\
++=======
+ #define __DECLARE_TRACE(name, proto, args, cond, data_proto, data_args, tp_flags) \
++>>>>>>> tracing: introduce sleepable tracepoints
  	extern struct tracepoint __tracepoint_##name;			\
  	static inline void trace_##name(proto)				\
  	{								\
  		if (static_key_false(&__tracepoint_##name.key))		\
 -			__DO_TRACE(&__tracepoint_##name,		\
 +			__DO_TRACE(name,				\
  				TP_PROTO(data_proto),			\
  				TP_ARGS(data_args),			\
- 				TP_CONDITION(cond), 0);			\
+ 				TP_CONDITION(cond), 0, tp_flags);	\
  		if (IS_ENABLED(CONFIG_LOCKDEP) && (cond)) {		\
  			rcu_read_lock_sched_notrace();			\
  			rcu_dereference_sched(__tracepoint_##name.funcs);\
@@@ -284,53 -306,27 +324,69 @@@
   * structures, so we create an array of pointers that will be used for iteration
   * on the tracepoints.
   */
++<<<<<<< HEAD
 +#define DEFINE_TRACE_FN(_name, _reg, _unreg, proto, args)		\
 +	static const char __tpstrtab_##_name[]				\
 +	__section(__tracepoints_strings) = #_name;			\
 +	extern struct static_call_key STATIC_CALL_KEY(tp_func_##_name);	\
 +	int __traceiter_##_name(void *__data, proto);			\
 +	struct tracepoint __tracepoint_##_name	__used			\
 +	__section(__tracepoints) = {					\
 +		.name = __tpstrtab_##_name,				\
 +		.key = STATIC_KEY_INIT_FALSE,				\
 +		.static_call_key = &STATIC_CALL_KEY(tp_func_##_name),	\
 +		.static_call_tramp = STATIC_CALL_TRAMP_ADDR(tp_func_##_name), \
 +		.iterator = &__traceiter_##_name,			\
 +		.regfunc = _reg,					\
 +		.unregfunc = _unreg,					\
 +		.funcs = NULL };					\
 +	__TRACEPOINT_ENTRY(_name);					\
 +	int __traceiter_##_name(void *__data, proto)			\
 +	{								\
 +		struct tracepoint_func *it_func_ptr;			\
 +		void *it_func;						\
 +									\
 +		it_func_ptr =						\
 +			rcu_dereference_raw((&__tracepoint_##_name)->funcs); \
 +		do {							\
 +			it_func = (it_func_ptr)->func;			\
 +			__data = (it_func_ptr)->data;			\
 +			((void(*)(void *, proto))(it_func))(__data, args); \
 +		} while ((++it_func_ptr)->func);			\
 +		return 0;						\
 +	}								\
 +	DEFINE_STATIC_CALL(tp_func_##_name, __traceiter_##_name);
 +
 +#define DEFINE_TRACE(name, proto, args)		\
 +	DEFINE_TRACE_FN(name, NULL, NULL, PARAMS(proto), PARAMS(args));
++=======
+ #define DEFINE_TRACE_FN_FLAGS(name, reg, unreg, tp_flags)		 \
+ 	static const char __tpstrtab_##name[]				 \
+ 	__section(__tracepoints_strings) = #name;			 \
+ 	struct tracepoint __tracepoint_##name __used			 \
+ 	__section(__tracepoints) =					 \
+ 		{ __tpstrtab_##name, STATIC_KEY_INIT_FALSE, reg, unreg, NULL, tp_flags };\
+ 	__TRACEPOINT_ENTRY(name);
+ 
+ #define DEFINE_TRACE_FN(name, reg, unreg)				\
+ 	DEFINE_TRACE_FN_FLAGS(name, reg, unreg, 0)
+ 
+ #define DEFINE_TRACE(name)						\
+ 	DEFINE_TRACE_FN(name, NULL, NULL);
++>>>>>>> tracing: introduce sleepable tracepoints
  
  #define EXPORT_TRACEPOINT_SYMBOL_GPL(name)				\
 -	EXPORT_SYMBOL_GPL(__tracepoint_##name)
 +	EXPORT_SYMBOL_GPL(__tracepoint_##name);				\
 +	EXPORT_SYMBOL_GPL(__traceiter_##name);				\
 +	EXPORT_STATIC_CALL_GPL(tp_func_##name)
  #define EXPORT_TRACEPOINT_SYMBOL(name)					\
 -	EXPORT_SYMBOL(__tracepoint_##name)
 +	EXPORT_SYMBOL(__tracepoint_##name);				\
 +	EXPORT_SYMBOL(__traceiter_##name);				\
 +	EXPORT_STATIC_CALL(tp_func_##name)
 +
  
  #else /* !TRACEPOINTS_ENABLED */
- #define __DECLARE_TRACE(name, proto, args, cond, data_proto, data_args) \
+ #define __DECLARE_TRACE(name, proto, args, cond, data_proto, data_args, tp_flags) \
  	static inline void trace_##name(proto)				\
  	{ }								\
  	static inline void trace_##name##_rcuidle(proto)		\
@@@ -356,8 -364,9 +424,14 @@@
  		return false;						\
  	}
  
++<<<<<<< HEAD
 +#define DEFINE_TRACE_FN(name, reg, unreg, proto, args)
 +#define DEFINE_TRACE(name, proto, args)
++=======
+ #define DEFINE_TRACE_FN_FLAGS(name, reg, unreg, tp_flags)
+ #define DEFINE_TRACE_FN(name, reg, unreg)
+ #define DEFINE_TRACE(name)
++>>>>>>> tracing: introduce sleepable tracepoints
  #define EXPORT_TRACEPOINT_SYMBOL_GPL(name)
  #define EXPORT_TRACEPOINT_SYMBOL(name)
  

[kernel-patches-bot]

At least one diff in series https://patchwork.kernel.org/project/netdevbpf/list/?series=369725 expired. Closing PR.