From patchwork Tue Aug 26 11:06:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Guittot X-Patchwork-Id: 35990 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oi0-f69.google.com (mail-oi0-f69.google.com [209.85.218.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2AD0B20551 for ; Tue, 26 Aug 2014 11:09:37 +0000 (UTC) Received: by mail-oi0-f69.google.com with SMTP id i138sf10472533oig.8 for ; Tue, 26 Aug 2014 04:09:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=C52PK4FLmlzCrsQuUQt9fs1bRZ/FLaBr/Vp0/EMKlhk=; b=TDysFWDKR0Va9HguyfBhixvSeBwtxifHVfTnPloLZYFxP5Q6ZE8ouDnfxn3MsEGcP4 7KrOFUhQcF9ZmOSzvjAJLIbfsPmMfy+U/dymCxwkOc9YgqPdoFRF4KNwrQViIs2x+pYL NtFaEsjSyxu/QFW7bCqeu4rnuTePrJKjnm7hIG/Y7y7KSIqVyTs3q69u5D7+xywuQSEq 4qXzhM91WitGLZ7XiJCtOUXkdBRcwkw2sPnSc6SHk+CHK5Z8ciLNUE6sjSm3NXgNwepA e/LH4z4ZrwVgKAoWginOBeh5yB+fPsfj0QQi5lH1xfGGqoLa7HGyAi1sOyNNaxTyxBNM VGjA== X-Gm-Message-State: ALoCoQk23jaPZDEWMojAfGxwtVxTYwnPYxeHNv6EZZKy8ahRypLtQpjWo5+Gb4hgKPMmxNjz+s3c X-Received: by 10.182.186.4 with SMTP id fg4mr18536399obc.9.1409051376798; Tue, 26 Aug 2014 04:09:36 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.88.203 with SMTP id t69ls2508365qgd.30.gmail; Tue, 26 Aug 2014 04:09:36 -0700 (PDT) X-Received: by 10.220.168.210 with SMTP id v18mr23251466vcy.3.1409051376671; Tue, 26 Aug 2014 04:09:36 -0700 (PDT) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by mx.google.com with ESMTPS id gx1si1226795vcb.61.2014.08.26.04.09.36 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 26 Aug 2014 04:09:36 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.169 as permitted sender) client-ip=209.85.220.169; Received: by mail-vc0-f169.google.com with SMTP id le20so16687511vcb.14 for ; Tue, 26 Aug 2014 04:09:36 -0700 (PDT) X-Received: by 10.221.21.201 with SMTP id qt9mr10558665vcb.39.1409051376562; Tue, 26 Aug 2014 04:09:36 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.45.67 with SMTP id uj3csp189155vcb; Tue, 26 Aug 2014 04:09:36 -0700 (PDT) X-Received: by 10.68.222.136 with SMTP id qm8mr36858006pbc.92.1409051375612; Tue, 26 Aug 2014 04:09:35 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o4si3922464pdl.67.2014.08.26.04.09.34 for ; Tue, 26 Aug 2014 04:09:35 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757826AbaHZLJL (ORCPT + 26 others); Tue, 26 Aug 2014 07:09:11 -0400 Received: from mail-wi0-f172.google.com ([209.85.212.172]:59318 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757673AbaHZLID (ORCPT ); Tue, 26 Aug 2014 07:08:03 -0400 Received: by mail-wi0-f172.google.com with SMTP id n3so3978920wiv.17 for ; Tue, 26 Aug 2014 04:08:02 -0700 (PDT) X-Received: by 10.194.60.240 with SMTP id k16mr2069701wjr.109.1409051282721; Tue, 26 Aug 2014 04:08:02 -0700 (PDT) Received: from lmenx30s.lme.st.com (LPuteaux-656-01-48-212.w82-127.abo.wanadoo.fr. [82.127.83.212]) by mx.google.com with ESMTPSA id q6sm2494891wjy.47.2014.08.26.04.08.00 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 26 Aug 2014 04:08:01 -0700 (PDT) From: Vincent Guittot To: peterz@infradead.org, mingo@kernel.org, linux-kernel@vger.kernel.org, preeti@linux.vnet.ibm.com, linux@arm.linux.org.uk, linux-arm-kernel@lists.infradead.org Cc: riel@redhat.com, Morten.Rasmussen@arm.com, efault@gmx.de, nicolas.pitre@linaro.org, linaro-kernel@lists.linaro.org, daniel.lezcano@linaro.org, dietmar.eggemann@arm.com, Vincent Guittot Subject: [PATCH v5 10/12] sched: get CPU's utilization statistic Date: Tue, 26 Aug 2014 13:06:53 +0200 Message-Id: <1409051215-16788-11-git-send-email-vincent.guittot@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1409051215-16788-1-git-send-email-vincent.guittot@linaro.org> References: <1409051215-16788-1-git-send-email-vincent.guittot@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: vincent.guittot@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.169 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Monitor the utilization level of each group of each sched_domain level. The utilization is the amount of cpu_capacity that is currently used on a CPU or group of CPUs. We use the usage_load_avg to evaluate this utilization level. In the special use case where the CPU is fully loaded by more than 1 task, the activity level is set above the cpu_capacity in order to reflect the overload of the CPU Signed-off-by: Vincent Guittot --- kernel/sched/fair.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 1fd2131..2f95d1c 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -4126,6 +4126,11 @@ static unsigned long capacity_of(int cpu) return cpu_rq(cpu)->cpu_capacity; } +static unsigned long capacity_orig_of(int cpu) +{ + return cpu_rq(cpu)->cpu_capacity_orig; +} + static unsigned long cpu_avg_load_per_task(int cpu) { struct rq *rq = cpu_rq(cpu); @@ -4514,6 +4519,17 @@ static int select_idle_sibling(struct task_struct *p, int target) return target; } +static int get_cpu_utilization(int cpu) +{ + unsigned long usage = cpu_rq(cpu)->cfs.usage_load_avg; + unsigned long capacity = capacity_of(cpu); + + if (usage >= SCHED_LOAD_SCALE) + return capacity + 1; + + return (usage * capacity) >> SCHED_LOAD_SHIFT; +} + /* * select_task_rq_fair: Select target runqueue for the waking task in domains * that have the 'sd_flag' flag set. In practice, this is SD_BALANCE_WAKE, @@ -5657,6 +5673,7 @@ struct sg_lb_stats { unsigned long sum_weighted_load; /* Weighted load of group's tasks */ unsigned long load_per_task; unsigned long group_capacity; + unsigned long group_utilization; /* Total utilization of the group */ unsigned int sum_nr_running; /* Nr tasks running in the group */ unsigned int group_capacity_factor; unsigned int idle_cpus; @@ -6011,6 +6028,7 @@ static inline void update_sg_lb_stats(struct lb_env *env, load = source_load(i, load_idx); sgs->group_load += load; + sgs->group_utilization += get_cpu_utilization(i); sgs->sum_nr_running += rq->cfs.h_nr_running; if (rq->nr_running > 1) @@ -6188,7 +6206,6 @@ static inline void update_sd_lb_stats(struct lb_env *env, struct sd_lb_stats *sd /* Now, start updating sd_lb_stats */ sds->total_load += sgs->group_load; sds->total_capacity += sgs->group_capacity; - sg = sg->next; } while (sg != env->sd->groups);