OSDN Git Service

sched/tracing: Append prev_state to tp args instead
authorDelyan Kratunov <delyank@fb.com>
Wed, 11 May 2022 18:28:36 +0000 (18:28 +0000)
committerPeter Zijlstra <peterz@infradead.org>
Wed, 11 May 2022 22:37:11 +0000 (00:37 +0200)
commit9c2136be0878c88c53dea26943ce40bb03ad8d8d
tree63ea6e07f82cc650db9a4d14d87f4b82df34a9c6
parentc5eb0a61238dd6faf37f58c9ce61c9980aaffd7a
sched/tracing: Append prev_state to tp args instead

Commit fa2c3254d7cf (sched/tracing: Don't re-read p->state when emitting
sched_switch event, 2022-01-20) added a new prev_state argument to the
sched_switch tracepoint, before the prev task_struct pointer.

This reordering of arguments broke BPF programs that use the raw
tracepoint (e.g. tp_btf programs). The type of the second argument has
changed and existing programs that assume a task_struct* argument
(e.g. for bpf_task_storage access) will now fail to verify.

If we instead append the new argument to the end, all existing programs
would continue to work and can conditionally extract the prev_state
argument on supported kernel versions.

Fixes: fa2c3254d7cf (sched/tracing: Don't re-read p->state when emitting sched_switch event, 2022-01-20)
Signed-off-by: Delyan Kratunov <delyank@fb.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Link: https://lkml.kernel.org/r/c8a6930dfdd58a4a5755fc01732675472979732b.camel@fb.com
include/trace/events/sched.h
kernel/sched/core.c
kernel/trace/fgraph.c
kernel/trace/ftrace.c
kernel/trace/trace_events.c
kernel/trace/trace_osnoise.c
kernel/trace/trace_sched_switch.c
kernel/trace/trace_sched_wakeup.c
samples/trace_events/trace_custom_sched.h