Skip to content

Commit 3f5fe9f

Browse files
KAGA-KOKOIngo Molnar
authored andcommitted
sched/debug: Fix task state recording/printout
The recent conversion of the task state recording to use task_state_index() broke the sched_switch tracepoint task state output. task_state_index() returns surprisingly an index (0-7) which is then printed with __print_flags() applying bitmasks. Not really working and resulting in weird states like 'prev_state=t' instead of 'prev_state=I'. Use TASK_REPORT_MAX instead of TASK_STATE_MAX to report preemption. Build a bitmask from the return value of task_state_index() and store it in entry->prev_state, which makes __print_flags() work as expected. Signed-off-by: Thomas Gleixner <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Paul E. McKenney <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Steven Rostedt <[email protected]> Cc: [email protected] Fixes: efb40f5 ("sched/tracing: Fix trace_sched_switch task-state printing") Link: http://lkml.kernel.org/r/alpine.DEB.2.20.1711221304180.1751@nanos Signed-off-by: Ingo Molnar <[email protected]>
1 parent aa5222e commit 3f5fe9f

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

include/trace/events/sched.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@ static inline long __trace_sched_switch_state(bool preempt, struct task_struct *
116116
* RUNNING (we will not have dequeued if state != RUNNING).
117117
*/
118118
if (preempt)
119-
return TASK_STATE_MAX;
119+
return TASK_REPORT_MAX;
120120

121-
return task_state_index(p);
121+
return 1 << task_state_index(p);
122122
}
123123
#endif /* CREATE_TRACE_POINTS */
124124

@@ -164,7 +164,7 @@ TRACE_EVENT(sched_switch,
164164
{ 0x40, "P" }, { 0x80, "I" }) :
165165
"R",
166166

167-
__entry->prev_state & TASK_STATE_MAX ? "+" : "",
167+
__entry->prev_state & TASK_REPORT_MAX ? "+" : "",
168168
__entry->next_comm, __entry->next_pid, __entry->next_prio)
169169
);
170170

0 commit comments

Comments
 (0)