From patchwork Thu Apr 25 17:23:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Guittot X-Patchwork-Id: 16408 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-we0-f200.google.com (mail-we0-f200.google.com [74.125.82.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 982D023979 for ; Thu, 25 Apr 2013 17:26:11 +0000 (UTC) Received: by mail-we0-f200.google.com with SMTP id s43sf4033191wey.7 for ; Thu, 25 Apr 2013 10:25:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:mime-version:x-beenthere:x-received:received-spf :x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=NhRCzLEgv/2ctcqrJKrE/k6AWr/d6LnlB+IPcauZK74=; b=DLlLX5nM+xDVkYRXrZ40xxCA25sjtXwMywqSmZQLkdhUF3gPUOjYXFZ86S+0N0bd3Y Uf0Z+cB5CqiXVmsldzx0x5qzB0BBX51Ch9ZGtbyWTNNyTS6abo7qHQWS1pS4cwJY1LZX sqoQBvhq5pTO75vZmXUYBBnHmZvrNCsx/iiT9p5lqclScGknSSrymcHLWhCKLPUbKjfP HrK5UKQvwyV+HYqMDi3lER8TXdTGsbNhpRxjZ3/K81MSvfu9gV2pbrGRMB5QyX5VSKiC PgfOsWQ9PFoyi0Q7QA7durHjXoSOxOKvMHmAK6W+zEZ4DtJpXpyJ3OnZMNgzYr7BE6mn Nx7g== X-Received: by 10.180.72.40 with SMTP id a8mr464374wiv.3.1366910717095; Thu, 25 Apr 2013 10:25:17 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.180.210.235 with SMTP id mx11ls2111175wic.52.canary; Thu, 25 Apr 2013 10:25:16 -0700 (PDT) X-Received: by 10.194.108.165 with SMTP id hl5mr26965512wjb.22.1366910716826; Thu, 25 Apr 2013 10:25:16 -0700 (PDT) Received: from mail-ve0-x234.google.com (mail-ve0-x234.google.com [2607:f8b0:400c:c01::234]) by mx.google.com with ESMTPS id m8si2726194wjz.189.2013.04.25.10.25.16 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 25 Apr 2013 10:25:16 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c01::234 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c01::234; Received: by mail-ve0-f180.google.com with SMTP id pb11so1379427veb.25 for ; Thu, 25 Apr 2013 10:25:15 -0700 (PDT) X-Received: by 10.220.169.78 with SMTP id x14mr12516565vcy.41.1366910715679; Thu, 25 Apr 2013 10:25:15 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.127.98 with SMTP id nf2csp32673veb; Thu, 25 Apr 2013 10:25:15 -0700 (PDT) X-Received: by 10.194.71.241 with SMTP id y17mr55256522wju.31.1366910714779; Thu, 25 Apr 2013 10:25:14 -0700 (PDT) Received: from mail-wi0-x22b.google.com (mail-wi0-x22b.google.com [2a00:1450:400c:c05::22b]) by mx.google.com with ESMTPS id db10si9550869wib.53.2013.04.25.10.25.14 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 25 Apr 2013 10:25:14 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:400c:c05::22b is neither permitted nor denied by best guess record for domain of vincent.guittot@linaro.org) client-ip=2a00:1450:400c:c05::22b; Received: by mail-wi0-f171.google.com with SMTP id l13so8970560wie.4 for ; Thu, 25 Apr 2013 10:25:14 -0700 (PDT) X-Received: by 10.180.78.194 with SMTP id d2mr2228118wix.33.1366910714248; Thu, 25 Apr 2013 10:25:14 -0700 (PDT) Received: from localhost.localdomain (LPuteaux-156-14-44-212.w82-127.abo.wanadoo.fr. [82.127.83.212]) by mx.google.com with ESMTPSA id q13sm12311485wie.8.2013.04.25.10.25.12 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 25 Apr 2013 10:25:13 -0700 (PDT) From: Vincent Guittot To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linaro-kernel@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, alex.shi@intel.com, preeti@linux.vnet.ibm.com Cc: paulmck@linux.vnet.ibm.com, tglx@linutronix.de, len.brown@intel.com, arjan@linux.intel.com, amit.kucheria@linaro.org, corbet@lwn.net, l.majewski@samsung.com, Vincent Guittot Subject: [PATCH 12/14] sched: create a new field with available capacity Date: Thu, 25 Apr 2013 19:23:28 +0200 Message-Id: <1366910611-20048-13-git-send-email-vincent.guittot@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1366910611-20048-1-git-send-email-vincent.guittot@linaro.org> References: <1366910611-20048-1-git-send-email-vincent.guittot@linaro.org> X-Gm-Message-State: ALoCoQkn4HJiMZfxmvh3X57mpNvXoiQLDdnDWONC3Oqg0DZhopnTAC9zdLD6nKVAJ45da2SXCkCp X-Original-Sender: vincent.guittot@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c01::234 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This new field power_available reflects the available capacity of a CPU unlike the cpu_power which reflects the current capacity. Signed-off-by: Vincent Guittot --- include/linux/sched.h | 2 +- kernel/sched/fair.c | 18 +++++++++++++++--- kernel/sched/sched.h | 1 + 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/include/linux/sched.h b/include/linux/sched.h index a82cdeb..03a5143 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -824,7 +824,7 @@ struct sched_group_power { * CPU power of this group, SCHED_LOAD_SCALE being max power for a * single CPU. */ - unsigned int power, power_orig; + unsigned int power, power_orig, power_available; unsigned long next_update; /* * Number of busy cpus in this group. diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 6f63fb9..756b1e3 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -179,6 +179,11 @@ static unsigned long power_of(int cpu) return cpu_rq(cpu)->cpu_power; } +static unsigned long available_of(int cpu) +{ + return cpu_rq(cpu)->cpu_available; +} + /* * Save the id of the optimal CPU that should be used to pack small tasks * The value -1 is used when no buddy has been found @@ -4588,6 +4593,9 @@ static void update_cpu_power(struct sched_domain *sd, int cpu) if (!power) power = 1; + cpu_rq(cpu)->cpu_available = power; + sdg->sgp->power_available = power; + cpu_rq(cpu)->cpu_power = power; sdg->sgp->power = power; } @@ -4596,7 +4604,7 @@ void update_group_power(struct sched_domain *sd, int cpu) { struct sched_domain *child = sd->child; struct sched_group *group, *sdg = sd->groups; - unsigned long power; + unsigned long power, available; unsigned long interval; interval = msecs_to_jiffies(sd->balance_interval); @@ -4608,7 +4616,7 @@ void update_group_power(struct sched_domain *sd, int cpu) return; } - power = 0; + power = available = 0; if (child->flags & SD_OVERLAP) { /* @@ -4618,6 +4626,8 @@ void update_group_power(struct sched_domain *sd, int cpu) for_each_cpu(cpu, sched_group_cpus(sdg)) power += power_of(cpu); + available += available_of(cpu); + } else { /* * !SD_OVERLAP domains can assume that child groups @@ -4627,11 +4637,13 @@ void update_group_power(struct sched_domain *sd, int cpu) group = child->groups; do { power += group->sgp->power; + available += group->sgp->power_available; group = group->next; } while (group != child->groups); } - sdg->sgp->power_orig = sdg->sgp->power = power; + sdg->sgp->power_orig = sdg->sgp->power_available = available; + sdg->sgp->power = power; } /* diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 96b164d..2b6eaf9 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -413,6 +413,7 @@ struct rq { struct sched_domain *sd; unsigned long cpu_power; + unsigned long cpu_available; unsigned char idle_balance; /* For active balancing */