aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-08-25 17:06:12 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2019-08-25 17:06:12 (GMT)
commit8a04c2ee62a4020cf1b7818c300626819d62ff5e (patch)
tree8f644de52e9f31cc01f3022fa168d6f61e3d51a2
parent05bbb9360a000f509537a84554d69fb891fa7332 (diff)
parentb0fdc01354f45d43f082025636ef808968a27b36 (diff)
downloadkernel_replicant_linux-8a04c2ee62a4020cf1b7818c300626819d62ff5e.zip
kernel_replicant_linux-8a04c2ee62a4020cf1b7818c300626819d62ff5e.tar.gz
kernel_replicant_linux-8a04c2ee62a4020cf1b7818c300626819d62ff5e.tar.bz2
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
-rw-r--r--kernel/sched/core.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 2b037f1..010d578 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -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.