From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752169AbZLCGNI (ORCPT ); Thu, 3 Dec 2009 01:13:08 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751432AbZLCGNH (ORCPT ); Thu, 3 Dec 2009 01:13:07 -0500 Received: from hera.kernel.org ([140.211.167.34]:35368 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751341AbZLCGNG (ORCPT ); Thu, 3 Dec 2009 01:13:06 -0500 Message-ID: <4B1756F2.4070504@kernel.org> Date: Thu, 03 Dec 2009 15:13:06 +0900 From: Tejun Heo User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.4pre) Gecko/20090915 SUSE/3.0b4-3.6 Thunderbird/3.0b4 MIME-Version: 1.0 To: Tejun Heo CC: tglx@linutronix.de, mingo@elte.hu, avi@redhat.com, peterz@infradead.org, efault@gmx.de, rusty@rustcorp.com.au, linux-kernel@vger.kernel.org Subject: [PATCH UPDATED 7/7] sched: implement try_to_wake_up_local() References: <1259726212-30259-1-git-send-email-tj@kernel.org> <1259726212-30259-8-git-send-email-tj@kernel.org> In-Reply-To: <1259726212-30259-8-git-send-email-tj@kernel.org> X-Enigmail-Version: 0.97a Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Implement try_to_wake_up_local(). try_to_wake_up_local() is similar to try_to_wake_up() but it assumes the caller has this_rq() locked and the target task is bound to this_rq(). try_to_wake_up_local() can be called from wakeup and sleep scheduler notifiers. Signed-off-by: Tejun Heo Cc: Peter Zijlstra Cc: Mike Galbraith Cc: Ingo Molnar --- The only change is to accomodate function name change of earlier patch. Updated tree available on top of current sched/core available in the following git trees. git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git sched-core-for-ingo git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git sched-wq-for-ingo Thanks. include/linux/sched.h | 2 + kernel/sched.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) Index: work3/include/linux/sched.h =================================================================== --- work3.orig/include/linux/sched.h +++ work3/include/linux/sched.h @@ -2067,6 +2067,8 @@ extern void release_uids(struct user_nam extern void do_timer(unsigned long ticks); +extern bool try_to_wake_up_local(struct task_struct *p, unsigned int state, + int wake_flags); extern int wake_up_state(struct task_struct *tsk, unsigned int state); extern int wake_up_process(struct task_struct *tsk); extern void wake_up_new_task(struct task_struct *tsk, Index: work3/kernel/sched.c =================================================================== --- work3.orig/kernel/sched.c +++ work3/kernel/sched.c @@ -2410,6 +2410,10 @@ static inline void ttwu_post_activation( rq->idle_stamp = 0; } #endif + /* + * Wake up is complete, fire wake up notifier. This allows + * try_to_wake_up_local() to be called from wake up notifiers. + */ if (success) fire_sched_notifiers(p, wakeup); } @@ -2511,6 +2515,53 @@ out: } /** + * try_to_wake_up_local - try to wake up a local task with rq lock held + * @p: the thread to be awakened + * @state: the mask of task states that can be woken + * @wake_flags: wake modifier flags (WF_*) + * + * Put @p on the run-queue if it's not alredy there. The caller must + * ensure that this_rq() is locked, @p is bound to this_rq() and @p is + * not the current task. this_rq() stays locked over invocation. + * + * This function can be called from wakeup and sleep scheduler + * notifiers. Be careful not to create deep recursion by chaining + * wakeup notifiers. + * + * Returns %true if @p was woken up, %false if it was already running + * or @state didn't match @p's state. + */ +bool try_to_wake_up_local(struct task_struct *p, unsigned int state, + int wake_flags) +{ + struct rq *rq = task_rq(p); + bool success = false; + + BUG_ON(rq != this_rq()); + BUG_ON(p == current); + lockdep_assert_held(&rq->lock); + + if (!sched_feat(SYNC_WAKEUPS)) + wake_flags &= ~WF_SYNC; + + if (!(p->state & state)) + return false; + + if (!p->se.on_rq) { + if (likely(!task_running(rq, p))) { + schedstat_inc(rq, ttwu_count); + schedstat_inc(rq, ttwu_local); + } + ttwu_activate(p, rq, wake_flags & WF_SYNC, false, true); + success = true; + } + + ttwu_post_activation(p, rq, wake_flags, success); + + return success; +} + +/** * wake_up_process - Wake up a specific process * @p: The process to be woken up. * @@ -5437,6 +5488,11 @@ need_resched_nonpreemptible: if (unlikely(signal_pending_state(prev->state, prev))) { prev->state = TASK_RUNNING; } else { + /* + * Fire sleep notifier before changing any scheduler + * state. This allows try_to_wake_up_local() to be + * called from sleep notifiers. + */ fire_sched_notifiers(prev, sleep); deactivate_task(rq, prev, 1); }