From patchwork Wed Dec 12 13:31:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Guittot X-Patchwork-Id: 13505 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id D0E4023E2A for ; Wed, 12 Dec 2012 13:32:29 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 63BDEA199A4 for ; Wed, 12 Dec 2012 13:32:29 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id c10so1812145ieb.11 for ; Wed, 12 Dec 2012 05:32:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=+UP0ije/iAc83RIclOWbEgBTu3plH2jwHXQw2rJkask=; b=hOfsI8mK05pe7yH6ZxdrbxhMUt0neufYiivlFO13Th0eHsHBHK1vkBB/3mwFgk2K1o rbALTcKVu4/e3LAizSLMVcr0LeEitwBobTA9yq0f4CnFIX2d2tWGzwoOrMhC3vkk8RsN cWe/15mhq6xzP1pkalV350VZ8IXjCS6zdPwPDc7lhiEXh/w8x92qK0QVFlJC4zIUWSwV aRW2MyHEkPZib0hX8ZLgXrIiKCrTPgKGB8kkwXCKvnaUFDzbe19UMONex7v2XpTm+Ybu ZWsqc7ulwFCvmz9JlTU1hdgCHPqCjcm3uVbXwo7EzN0ay1aDsNZkSd5oqZuERMeR9fg0 D64A== Received: by 10.50.36.164 with SMTP id r4mr823380igj.57.1355319148871; Wed, 12 Dec 2012 05:32:28 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp199586igt; Wed, 12 Dec 2012 05:32:28 -0800 (PST) Received: by 10.180.20.109 with SMTP id m13mr22932022wie.16.1355319147755; Wed, 12 Dec 2012 05:32:27 -0800 (PST) Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by mx.google.com with ESMTPS id wo1si6216204wjb.23.2012.12.12.05.32.27 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 12 Dec 2012 05:32:27 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.171 is neither permitted nor denied by best guess record for domain of vincent.guittot@linaro.org) client-ip=209.85.212.171; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.171 is neither permitted nor denied by best guess record for domain of vincent.guittot@linaro.org) smtp.mail=vincent.guittot@linaro.org Received: by mail-wi0-f171.google.com with SMTP id hn14so2595495wib.16 for ; Wed, 12 Dec 2012 05:32:27 -0800 (PST) Received: by 10.180.104.69 with SMTP id gc5mr22916653wib.13.1355319147217; Wed, 12 Dec 2012 05:32:27 -0800 (PST) Received: from localhost.localdomain (LPuteaux-156-14-44-212.w82-127.abo.wanadoo.fr. [82.127.83.212]) by mx.google.com with ESMTPS id t17sm21269650wiv.6.2012.12.12.05.32.25 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 12 Dec 2012 05:32:26 -0800 (PST) From: Vincent Guittot To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linaro-dev@lists.linaro.org, peterz@infradead.org, mingo@kernel.org, linux@arm.linux.org.uk, pjt@google.com, santosh.shilimkar@ti.com, Morten.Rasmussen@arm.com, chander.kashyap@linaro.org, cmetcalf@tilera.com, tony.luck@intel.com Cc: alex.shi@intel.com, preeti@linux.vnet.ibm.com, paulmck@linux.vnet.ibm.com, tglx@linutronix.de, len.brown@intel.com, arjan@linux.intel.com, amit.kucheria@linaro.org, viresh.kumar@linaro.org, Vincent Guittot Subject: RFC PATCH v2 1/6] Revert "sched: introduce temporary FAIR_GROUP_SCHED dependency for load-tracking" Date: Wed, 12 Dec 2012 14:31:27 +0100 Message-Id: <1355319092-30980-2-git-send-email-vincent.guittot@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1355319092-30980-1-git-send-email-vincent.guittot@linaro.org> References: <1355319092-30980-1-git-send-email-vincent.guittot@linaro.org> X-Gm-Message-State: ALoCoQlqP8BFlxeFTD9E3bV2b24Fg4BdMwKMDBWpv4MeZQt7tN9v8dRhGD0J6Pg28zIsTRmkzFmt This reverts commit f4e26b120b9de84cb627bc7361ba43cfdc51341f Signed-off-by: Vincent Guittot --- include/linux/sched.h | 8 +------- kernel/sched/core.c | 7 +------ kernel/sched/fair.c | 3 +-- kernel/sched/sched.h | 9 +-------- 4 files changed, 4 insertions(+), 23 deletions(-) diff --git a/include/linux/sched.h b/include/linux/sched.h index fd17ca3..046e39a 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1195,13 +1195,7 @@ struct sched_entity { /* rq "owned" by this entity/group: */ struct cfs_rq *my_q; #endif -/* - * Load-tracking only depends on SMP, FAIR_GROUP_SCHED dependency below may be - * removed when useful for applications beyond shares distribution (e.g. - * load-balance). - */ -#if defined(CONFIG_SMP) && defined(CONFIG_FAIR_GROUP_SCHED) - /* Per-entity load-tracking */ +#ifdef CONFIG_SMP struct sched_avg avg; #endif }; diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 8482628..c25c75d 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -1544,12 +1544,7 @@ static void __sched_fork(struct task_struct *p) p->se.vruntime = 0; INIT_LIST_HEAD(&p->se.group_node); -/* - * Load-tracking only depends on SMP, FAIR_GROUP_SCHED dependency below may be - * removed when useful for applications beyond shares distribution (e.g. - * load-balance). - */ -#if defined(CONFIG_SMP) && defined(CONFIG_FAIR_GROUP_SCHED) +#ifdef CONFIG_SMP p->se.avg.runnable_avg_period = 0; p->se.avg.runnable_avg_sum = 0; #endif diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 61c7a10..9916d41 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -2820,8 +2820,7 @@ static inline void update_cfs_shares(struct cfs_rq *cfs_rq) } #endif /* CONFIG_FAIR_GROUP_SCHED */ -/* Only depends on SMP, FAIR_GROUP_SCHED may be removed when useful in lb */ -#if defined(CONFIG_SMP) && defined(CONFIG_FAIR_GROUP_SCHED) +#ifdef CONFIG_SMP /* * We choose a half-life close to 1 scheduling period. * Note: The tables below are dependent on this value. diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index f00eb80..92ba891 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -226,12 +226,6 @@ struct cfs_rq { #endif #ifdef CONFIG_SMP -/* - * Load-tracking only depends on SMP, FAIR_GROUP_SCHED dependency below may be - * removed when useful for applications beyond shares distribution (e.g. - * load-balance). - */ -#ifdef CONFIG_FAIR_GROUP_SCHED /* * CFS Load tracking * Under CFS, load is tracked on a per-entity basis and aggregated up. @@ -241,8 +235,7 @@ struct cfs_rq { u64 runnable_load_avg, blocked_load_avg; atomic64_t decay_counter, removed_load; u64 last_decay; -#endif /* CONFIG_FAIR_GROUP_SCHED */ -/* These always depend on CONFIG_FAIR_GROUP_SCHED */ + #ifdef CONFIG_FAIR_GROUP_SCHED u32 tg_runnable_contrib; u64 tg_load_contrib;