Commit 990e798d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sched-urgent-2022-05-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull scheduler fix from Thomas Gleixner:
 "The recent expansion of the sched switch tracepoint inserted a new
  argument in the middle of the arguments. This reordering broke BPF
  programs which relied on the old argument list.

  While tracepoints are not considered stable ABI, it's not trivial to
  make BPF cope with such a change, but it's being worked on. For now
  restore the original argument order and move the new argument to the
  end of the argument list"

* tag 'sched-urgent-2022-05-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/tracing: Append prev_state to tp args instead
parents fb756280 9c2136be

include/trace/events/sched.h

+3 −3
Original line number Diff line number Diff line
@@ -222,11 +222,11 @@ static inline long __trace_sched_switch_state(bool preempt, 
TRACE_EVENT(sched_switch,



	TP_PROTO(bool preempt,

		 unsigned int prev_state,

		 struct task_struct *prev,

		 struct task_struct *next),

		 struct task_struct *next,

		 unsigned int prev_state),



	TP_ARGS(preempt, prev_state, prev, next),

	TP_ARGS(preempt, prev, next, prev_state),



	TP_STRUCT__entry(

		__array(	char,	prev_comm,	TASK_COMM_LEN	)

kernel/sched/core.c

+1 −1
Original line number Diff line number Diff line
@@ -6382,7 +6382,7 @@ static void __sched notrace __schedule(unsigned int sched_mode) 
		migrate_disable_switch(rq, prev);

		psi_sched_switch(prev, next, !task_on_rq_queued(prev));



		trace_sched_switch(sched_mode & SM_MASK_PREEMPT, prev_state, prev, next);

		trace_sched_switch(sched_mode & SM_MASK_PREEMPT, prev, next, prev_state);



		/* Also unlocks the rq: */

		rq = context_switch(rq, prev, next, &rf);

kernel/trace/fgraph.c

+2 −2
Original line number Diff line number Diff line
@@ -404,9 +404,9 @@ static int alloc_retstack_tasklist(struct ftrace_ret_stack **ret_stack_list) 


static void

ftrace_graph_probe_sched_switch(void *ignore, bool preempt,

				unsigned int prev_state,

				struct task_struct *prev,

				struct task_struct *next)

				struct task_struct *next,

				unsigned int prev_state)

{

	unsigned long long timestamp;

	int index;

kernel/trace/ftrace.c

+2 −2
Original line number Diff line number Diff line
@@ -7420,9 +7420,9 @@ ftrace_func_t ftrace_ops_get_func(struct ftrace_ops *ops) 


static void

ftrace_filter_pid_sched_switch_probe(void *data, bool preempt,

				     unsigned int prev_state,

				     struct task_struct *prev,

				     struct task_struct *next)

				     struct task_struct *next,

				     unsigned int prev_state)

{

	struct trace_array *tr = data;

	struct trace_pid_list *pid_list;

kernel/trace/trace_events.c

+4 −4
Original line number Diff line number Diff line
@@ -773,9 +773,9 @@ void trace_event_follow_fork(struct trace_array *tr, bool enable) 


static void

event_filter_pid_sched_switch_probe_pre(void *data, bool preempt,

					unsigned int prev_state,

					struct task_struct *prev,

					struct task_struct *next)

					struct task_struct *next,

					unsigned int prev_state)

{

	struct trace_array *tr = data;

	struct trace_pid_list *no_pid_list;
@@ -799,9 +799,9 @@ event_filter_pid_sched_switch_probe_pre(void *data, bool preempt, 


static void

event_filter_pid_sched_switch_probe_post(void *data, bool preempt,

					 unsigned int prev_state,

					 struct task_struct *prev,

					 struct task_struct *next)

					 struct task_struct *next,

					 unsigned int prev_state)

{

	struct trace_array *tr = data;

	struct trace_pid_list *no_pid_list;