| Subject: sched-rt-mutex-wakeup.patch |
| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Sat, 25 Jun 2011 09:21:04 +0200 |
| |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| --- |
| include/linux/sched.h | 3 +++ |
| kernel/sched/core.c | 31 ++++++++++++++++++++++++++++++- |
| 2 files changed, 33 insertions(+), 1 deletion(-) |
| |
| --- a/include/linux/sched.h |
| +++ b/include/linux/sched.h |
| @@ -1063,6 +1063,7 @@ struct sched_domain; |
| #define WF_SYNC 0x01 /* waker goes to sleep after wakup */ |
| #define WF_FORK 0x02 /* child wakeup after fork */ |
| #define WF_MIGRATED 0x04 /* internal use, task got migrated */ |
| +#define WF_LOCK_SLEEPER 0x08 /* wakeup spinlock "sleeper" */ |
| |
| #define ENQUEUE_WAKEUP 1 |
| #define ENQUEUE_HEAD 2 |
| @@ -1239,6 +1240,7 @@ enum perf_event_task_context { |
| |
| struct task_struct { |
| volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */ |
| + volatile long saved_state; /* saved state for "spinlock sleepers" */ |
| void *stack; |
| atomic_t usage; |
| unsigned int flags; /* per process flags, defined below */ |
| @@ -2251,6 +2253,7 @@ extern void xtime_update(unsigned long t |
| |
| extern int wake_up_state(struct task_struct *tsk, unsigned int state); |
| extern int wake_up_process(struct task_struct *tsk); |
| +extern int wake_up_lock_sleeper(struct task_struct * tsk); |
| extern void wake_up_new_task(struct task_struct *tsk); |
| #ifdef CONFIG_SMP |
| extern void kick_process(struct task_struct *tsk); |
| --- a/kernel/sched/core.c |
| +++ b/kernel/sched/core.c |
| @@ -1438,8 +1438,25 @@ try_to_wake_up(struct task_struct *p, un |
| |
| smp_wmb(); |
| raw_spin_lock_irqsave(&p->pi_lock, flags); |
| - if (!(p->state & state)) |
| + if (!(p->state & state)) { |
| + /* |
| + * The task might be running due to a spinlock sleeper |
| + * wakeup. Check the saved state and set it to running |
| + * if the wakeup condition is true. |
| + */ |
| + if (!(wake_flags & WF_LOCK_SLEEPER)) { |
| + if (p->saved_state & state) |
| + p->saved_state = TASK_RUNNING; |
| + } |
| goto out; |
| + } |
| + |
| + /* |
| + * If this is a regular wakeup, then we can unconditionally |
| + * clear the saved state of a "lock sleeper". |
| + */ |
| + if (!(wake_flags & WF_LOCK_SLEEPER)) |
| + p->saved_state = TASK_RUNNING; |
| |
| success = 1; /* we're going to change ->state */ |
| cpu = task_cpu(p); |
| @@ -1535,6 +1552,18 @@ int wake_up_process(struct task_struct * |
| } |
| EXPORT_SYMBOL(wake_up_process); |
| |
| +/** |
| + * wake_up_lock_sleeper - Wake up a specific process blocked on a "sleeping lock" |
| + * @p: The process to be woken up. |
| + * |
| + * Same as wake_up_process() above, but wake_flags=WF_LOCK_SLEEPER to indicate |
| + * the nature of the wakeup. |
| + */ |
| +int wake_up_lock_sleeper(struct task_struct *p) |
| +{ |
| + return try_to_wake_up(p, TASK_ALL, WF_LOCK_SLEEPER); |
| +} |
| + |
| int wake_up_state(struct task_struct *p, unsigned int state) |
| { |
| return try_to_wake_up(p, state, 0); |