From patchwork Fri Oct 9 06:35:03 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Galbraith X-Patchwork-Id: 52661 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n996d3Q9032319 for ; Fri, 9 Oct 2009 06:39:03 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756565AbZJIGfy (ORCPT ); Fri, 9 Oct 2009 02:35:54 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756520AbZJIGfx (ORCPT ); Fri, 9 Oct 2009 02:35:53 -0400 Received: from mail.gmx.net ([213.165.64.20]:57352 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1755889AbZJIGfx (ORCPT ); Fri, 9 Oct 2009 02:35:53 -0400 Received: (qmail invoked by alias); 09 Oct 2009 06:35:05 -0000 Received: from p4FE1A0EC.dip0.t-ipconnect.de (EHLO [192.168.178.27]) [79.225.160.236] by mail.gmx.net (mp034) with SMTP; 09 Oct 2009 08:35:05 +0200 X-Authenticated: #14349625 X-Provags-ID: V01U2FsdGVkX1/FrllbDF3FMoRfB3OIWWyvdG9fa3exEmgpknOzY8 xIv/0RSKNPK42L Subject: Re: [.32-rc3] scheduler: iwlagn consistently high in "waiting for CPU" From: Mike Galbraith To: Frans Pop Cc: Arjan van de Ven , Linux Kernel Mailing List , Ingo Molnar , Peter Zijlstra , linux-wireless@vger.kernel.org In-Reply-To: <200910082259.35204.elendil@planet.nl> References: <200910051500.55875.elendil@planet.nl> <200910081655.37485.elendil@planet.nl> <1255026217.6643.12.camel@marge.simson.net> <200910082259.35204.elendil@planet.nl> Date: Fri, 09 Oct 2009 08:35:03 +0200 Message-Id: <1255070103.7639.30.camel@marge.simson.net> Mime-Version: 1.0 X-Mailer: Evolution 2.24.1.1 X-Y-GMX-Trusted: 0 X-FuHaFi: 0.48 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Index: linux-2.6/kernel/sched.c =================================================================== --- linux-2.6.orig/kernel/sched.c +++ linux-2.6/kernel/sched.c @@ -2311,7 +2311,7 @@ static int try_to_wake_up(struct task_st { int cpu, orig_cpu, this_cpu, success = 0; unsigned long flags; - struct rq *rq; + struct rq *rq, *orig_rq; if (!sched_feat(SYNC_WAKEUPS)) wake_flags &= ~WF_SYNC; @@ -2319,7 +2319,7 @@ static int try_to_wake_up(struct task_st this_cpu = get_cpu(); smp_wmb(); - rq = task_rq_lock(p, &flags); + rq = orig_rq = task_rq_lock(p, &flags); update_rq_clock(rq); if (!(p->state & state)) goto out; @@ -2350,6 +2350,10 @@ static int try_to_wake_up(struct task_st set_task_cpu(p, cpu); rq = task_rq_lock(p, &flags); + + if (rq != orig_rq) + update_rq_clock(rq); + WARN_ON(p->state != TASK_WAKING); cpu = task_cpu(p);