Commit 8a04c2ee authored Aug 25, 2019 by Linus Torvalds

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

Pull scheduler fix from Thomas Gleixner:
 "Handle the worker management in situations where a task is scheduled
  out on a PI lock contention correctly and schedule a new worker if
  possible"

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/core: Schedule new worker even if PI-blocked

parents 05bbb936 b0fdc013

kernel/sched/core.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -3904,7 +3904,7 @@ void __noreturn do_task_dead(void)

		static inline void sched_submit_work(struct task_struct *tsk)
		{
		if (!tsk->state \|\| tsk_is_pi_blocked(tsk))
		if (!tsk->state)
		return;

		/*
		@@ -3920,6 +3920,9 @@ static inline void sched_submit_work(struct task_struct *tsk)
		preempt_enable_no_resched();
		}

		if (tsk_is_pi_blocked(tsk))
		return;

		/*
		* If we are going to sleep and we have plugged IO queued,
		* make sure to submit it to avoid deadlocks.