Skip to content

Commit

Permalink
sched: Change the ttwu() success details
Browse files Browse the repository at this point in the history
try_to_wake_up() would only return a success when it would have to
place a task on a rq, change that to every time we change p->state to
TASK_RUNNING, because that's the real measure of wakeups.

This results in that success is always true for the tracepoints.

Reviewed-by: Frank Rowand <frank.rowand@am.sony.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Nick Piggin <npiggin@kernel.dk>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/20110405152728.866866929@chello.nl
  • Loading branch information
Peter Zijlstra authored and Ingo Molnar committed Apr 14, 2011
1 parent c2f7115 commit 8936338
Showing 1 changed file with 7 additions and 9 deletions.
16 changes: 7 additions & 9 deletions kernel/sched.c
Original file line number Diff line number Diff line change
Expand Up @@ -2427,10 +2427,10 @@ static inline void ttwu_activate(struct task_struct *p, struct rq *rq,
wq_worker_waking_up(p, cpu_of(rq));
}

static inline void ttwu_post_activation(struct task_struct *p, struct rq *rq,
int wake_flags, bool success)
static void
ttwu_post_activation(struct task_struct *p, struct rq *rq, int wake_flags)
{
trace_sched_wakeup(p, success);
trace_sched_wakeup(p, true);
check_preempt_curr(rq, p, wake_flags);

p->state = TASK_RUNNING;
Expand Down Expand Up @@ -2546,9 +2546,9 @@ static int try_to_wake_up(struct task_struct *p, unsigned int state,
#endif /* CONFIG_SMP */
ttwu_activate(p, rq, wake_flags & WF_SYNC, orig_cpu != cpu,
cpu == this_cpu, en_flags);
success = 1;
out_running:
ttwu_post_activation(p, rq, wake_flags, success);
ttwu_post_activation(p, rq, wake_flags);
success = 1;
out:
task_rq_unlock(rq, &flags);
put_cpu();
Expand All @@ -2567,7 +2567,6 @@ static int try_to_wake_up(struct task_struct *p, unsigned int state,
static void try_to_wake_up_local(struct task_struct *p)
{
struct rq *rq = task_rq(p);
bool success = false;

BUG_ON(rq != this_rq());
BUG_ON(p == current);
Expand All @@ -2582,9 +2581,8 @@ static void try_to_wake_up_local(struct task_struct *p)
schedstat_inc(rq, ttwu_local);
}
ttwu_activate(p, rq, false, false, true, ENQUEUE_WAKEUP);
success = true;
}
ttwu_post_activation(p, rq, 0, success);
ttwu_post_activation(p, rq, 0);
}

/**
Expand Down Expand Up @@ -2747,7 +2745,7 @@ void wake_up_new_task(struct task_struct *p, unsigned long clone_flags)

rq = task_rq_lock(p, &flags);
activate_task(rq, p, 0);
trace_sched_wakeup_new(p, 1);
trace_sched_wakeup_new(p, true);
check_preempt_curr(rq, p, WF_FORK);
#ifdef CONFIG_SMP
if (p->sched_class->task_woken)
Expand Down

0 comments on commit 8936338

Please sign in to comment.