Commit 1195d58f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull scheduler fixes from Ingo Molnar:
 "Two fixes: fix a new tracepoint's output value, and fix the formatting
  of show-state syslog printouts"

* tag 'sched-urgent-2020-08-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/debug: Fix the alignment of the show-state debug output
  sched: Fix use of count for nr_running tracepoint
parents 7f5faaaa cc172ff3

kernel/sched/core.c

+4 −11
Original line number Diff line number Diff line
@@ -6431,10 +6431,10 @@ void sched_show_task(struct task_struct *p) 
	if (!try_get_task_stack(p))

		return;



	printk(KERN_INFO "%-15.15s %c", p->comm, task_state_to_char(p));

	pr_info("task:%-15.15s state:%c", p->comm, task_state_to_char(p));



	if (p->state == TASK_RUNNING)

		printk(KERN_CONT "  running task    ");

		pr_cont("  running task    ");

#ifdef CONFIG_DEBUG_STACK_USAGE

	free = stack_not_used(p);

#endif
@@ -6443,8 +6443,8 @@ void sched_show_task(struct task_struct *p) 
	if (pid_alive(p))

		ppid = task_pid_nr(rcu_dereference(p->real_parent));

	rcu_read_unlock();

	printk(KERN_CONT "%5lu %5d %6d 0x%08lx\n", free,

		task_pid_nr(p), ppid,

	pr_cont(" stack:%5lu pid:%5d ppid:%6d flags:0x%08lx\n",

		free, task_pid_nr(p), ppid,

		(unsigned long)task_thread_info(p)->flags);



	print_worker_info(KERN_INFO, p);
@@ -6479,13 +6479,6 @@ void show_state_filter(unsigned long state_filter) 
{

	struct task_struct *g, *p;



#if BITS_PER_LONG == 32

	printk(KERN_INFO

		"  task                PC stack   pid father\n");

#else

	printk(KERN_INFO

		"  task                        PC stack   pid father\n");

#endif

	rcu_read_lock();

	for_each_process_thread(g, p) {

		/*

kernel/sched/sched.h

+1 −1
Original line number Diff line number Diff line
@@ -1999,7 +1999,7 @@ static inline void sub_nr_running(struct rq *rq, unsigned count) 
{

	rq->nr_running -= count;

	if (trace_sched_update_nr_running_tp_enabled()) {

		call_trace_sched_update_nr_running(rq, count);

		call_trace_sched_update_nr_running(rq, -count);

	}



	/* Check if we still need preemption */

CRA Git | Maintained and supported by SUSTech CRA and CCSE