Re: [PATCH] sched/tracing: append prev_state to tp args instead

[Peter Zijlstra <peterz@infradead.org>]

On Tue, May 10, 2022 at 09:01:22AM +0200, Peter Zijlstra wrote:
> On Mon, May 09, 2022 at 12:32:31PM -0700, Andrii Nakryiko wrote:
> > So can this patch be applied, please, or it's a hard no?
> 
> Sorry; I got distracted with other work. I'll grudingly apply the patch.

  gcc-11-i386-allmodconfig [15:35]  FAILED
  | In file included from ../include/trace/define_custom_trace.h:55,
  |                  from ../samples/trace_events/trace_custom_sched.h:96,
  |                  from ../samples/trace_events/trace_custom_sched.c:24:
  | ../samples/trace_events/./trace_custom_sched.h: In function ‘ftrace_test_custom_probe_sched_switch’:
  | ../include/trace/trace_custom_events.h:178:42: error: passing argument 1 of ‘check_trace_callback_type_sched_switch’ from incompatible pointer type [-Werror=incompatible-pointer-types]
  |   178 |         check_trace_callback_type_##call(trace_custom_event_raw_event_##template); \
  |       |                                          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  |       |                                          |
  |       |                                          void (*)(void *, bool,  unsigned int,  struct task_struct *, struct task_struct *) {aka void (*)(void *, _Bool,  unsigned int,  struct task_struct *, struct task_struct *)}
  | ../include/trace/trace_custom_events.h:34:9: note: in expansion of macro ‘DEFINE_CUSTOM_EVENT’
  |    34 |         DEFINE_CUSTOM_EVENT(name, name, PARAMS(proto), PARAMS(args));
  |       |         ^~~~~~~~~~~~~~~~~~~
  | ../samples/trace_events/./trace_custom_sched.h:21:1: note: in expansion of macro ‘TRACE_CUSTOM_EVENT’
  |    21 | TRACE_CUSTOM_EVENT(sched_switch,
  |       | ^~~~~~~~~~~~~~~~~~
  | In file included from ../include/linux/trace_events.h:11,
  |                  from ../samples/trace_events/trace_custom_sched.c:10:
  | ../include/linux/tracepoint.h:279:49: note: expected ‘void (*)(void *, bool,  struct task_struct *, struct task_struct *, unsigned int)’ {aka ‘void (*)(void *, _Bool,  struct task_struct *, struct task_struct *, unsigned int)’} but argument is of type ‘void (*)(void *, bool,  unsigned int,  struct task_struct *, struct task_struct *)’ {aka ‘void (*)(void *, _Bool,  unsigned int,  struct task_struct *, struct task_struct *)’}
  |   279 |         check_trace_callback_type_##name(void (*cb)(data_proto))        \
  |       |                                          ~~~~~~~^~~~~~~~~~~~~~~
  | ../include/linux/tracepoint.h:419:9: note: in expansion of macro ‘__DECLARE_TRACE’
  |   419 |         __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args),              \
  |       |         ^~~~~~~~~~~~~~~
  | ../include/linux/tracepoint.h:553:9: note: in expansion of macro ‘DECLARE_TRACE’
  |   553 |         DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
  |       |         ^~~~~~~~~~~~~
  | ../include/trace/events/sched.h:222:1: note: in expansion of macro ‘TRACE_EVENT’
  |   222 | TRACE_EVENT(sched_switch,
  |       | ^~~~~~~~~~~
  | cc1: some warnings being treated as errors
  | make[3]: *** [../scripts/Makefile.build:292: samples/trace_events/trace_custom_sched.o] Error 1
  | make[3]: *** Waiting for unfinished jobs....
  | make[2]: *** [../scripts/Makefile.build:555: samples/trace_events] Error 2
  | make[1]: *** [/opt/buildbot/linux-2.6/Makefile:1834: samples] Error 2
  | make[1]: *** Waiting for unfinished jobs....
  | make: *** [Makefile:219: __sub-make] Error 2
  `----