Commit cc71efda authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull scheduler fixes from Thomas Gleixner:
 "Three fixes for scheduler and kthread code:

   - allow calling kthread_park() on an already parked thread

   - restore the sched_pi_setprio() tracepoint behaviour

   - clarify the unclear string for the scheduling domain debug output"

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched, tracing: Fix trace_sched_pi_setprio() for deboosting
  kthread: Allow kthread_park() on a parked kthread
  sched/topology: Clarify root domain(s) debug string
parents ec30dcf7 4ff648de

include/trace/events/sched.h

+3 −1
Original line number Diff line number Diff line
@@ -435,7 +435,9 @@ TRACE_EVENT(sched_pi_setprio, 
		memcpy(__entry->comm, tsk->comm, TASK_COMM_LEN);

		__entry->pid		= tsk->pid;

		__entry->oldprio	= tsk->prio;

		__entry->newprio	= pi_task ? pi_task->prio : tsk->prio;

		__entry->newprio	= pi_task ?

				min(tsk->normal_prio, pi_task->prio) :

				tsk->normal_prio;

		/* XXX SCHED_DEADLINE bits missing */

	),

kernel/kthread.c

+2 −4
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ EXPORT_SYMBOL_GPL(kthread_parkme); 


void kthread_park_complete(struct task_struct *k)

{

	complete(&to_kthread(k)->parked);

	complete_all(&to_kthread(k)->parked);

}



static int kthread(void *_create)
@@ -459,6 +459,7 @@ void kthread_unpark(struct task_struct *k) 
	if (test_bit(KTHREAD_IS_PER_CPU, &kthread->flags))

		__kthread_bind(k, kthread->cpu, TASK_PARKED);



	reinit_completion(&kthread->parked);

	clear_bit(KTHREAD_SHOULD_PARK, &kthread->flags);

	wake_up_state(k, TASK_PARKED);

}
@@ -483,9 +484,6 @@ int kthread_park(struct task_struct *k) 
	if (WARN_ON(k->flags & PF_EXITING))

		return -ENOSYS;



	if (WARN_ON_ONCE(test_bit(KTHREAD_SHOULD_PARK, &kthread->flags)))

		return -EBUSY;



	set_bit(KTHREAD_SHOULD_PARK, &kthread->flags);

	if (k != current) {

		wake_up_process(k);

kernel/sched/topology.c

+1 −1
Original line number Diff line number Diff line
@@ -1708,7 +1708,7 @@ build_sched_domains(const struct cpumask *cpu_map, struct sched_domain_attr *att 
	rcu_read_unlock();



	if (rq && sched_debug_enabled) {

		pr_info("span: %*pbl (max cpu_capacity = %lu)\n",

		pr_info("root domain span: %*pbl (max cpu_capacity = %lu)\n",

			cpumask_pr_args(cpu_map), rq->rd->max_cpu_capacity);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE