From patchwork Thu Sep 19 07:33:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Guittot X-Patchwork-Id: 174047 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp664521ill; Thu, 19 Sep 2019 00:34:38 -0700 (PDT) X-Google-Smtp-Source: APXvYqxa9jH1Ykq32CoEwapmaqHqIUzWnv75CkW40XZ7eMC6+aZjqdSrjFHVnPrwWXJ5nfTYeEpR X-Received: by 2002:a50:d55e:: with SMTP id f30mr14812006edj.35.1568878477997; Thu, 19 Sep 2019 00:34:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568878477; cv=none; d=google.com; s=arc-20160816; b=AUG5ElKokVNZUFn5AcA+Mkmnv+WTjM9gxRuOQgHx0HnMuDe8aVinF9lUZ7WmanIIkv LLJGZErytbtoaatRrK9jblw1wrOta/XTYaAfNWGZFquhMk881rAdr5VqAQHLz9vHoLF1 CYXjrj40n/jHUb0hZ60PdqU3hKqbzU7a+YqQEppJWkxXv8y9nWmMA2ngtoHQwBPKtXvQ qcafkeL3glFAHjZddz89NoSvxIQetnVS1ay+pk0WQrzcyeO7tUrarzJgtrMsJux7K4/r G2pUn71asZ5vtaPg2J8vRPXCTS5YDmgxhIdHHLnOk9ywARXUEttGjmZg+FBJI3nI6OMF 3UcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=A/SFuEruliHoJKYfECKgXFMMbQHFq3dwW+v5uybTb84=; b=qxMRoMhZK+C7j2hIFuS5YVUgxGqq/P94NuZ7+3i8Nmxuheri55mCC2Yx8KwKR4JgdV B3PMHmuFKisia8j18+cx4hre1aDIajBDNrU7DJLQVXZ/wsqe2X/fcZM2Hw3Www0yPWNC cWukGcwK77We5+rqcDIEK0CvoHMFRtjE8GJQJkXzJa6QU3F5mgfRr2H3n0MpAR3PTnZu 6DAaTNm1vq6KIDL3liO2jjbtB/GZXuSAdOKmd83cYu1DDrgu/zJV86lFj/+0DSi89mRs 8zn/Xp2e21WGWRvbbazOr20Ymqd+4lAHcnJG/MhY1eCZlxW/zxTFdshK2Bm4ldNLwFCZ gfgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fJDYCYjY; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f15si4936223edm.414.2019.09.19.00.34.37; Thu, 19 Sep 2019 00:34:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fJDYCYjY; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388742AbfISHee (ORCPT + 26 others); Thu, 19 Sep 2019 03:34:34 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:36468 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388613AbfISHeB (ORCPT ); Thu, 19 Sep 2019 03:34:01 -0400 Received: by mail-wm1-f67.google.com with SMTP id m18so239372wmc.1 for ; Thu, 19 Sep 2019 00:34:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=A/SFuEruliHoJKYfECKgXFMMbQHFq3dwW+v5uybTb84=; b=fJDYCYjYKy8EiIblYLJyhEy/vfUWklDTbcUJLIG2CYH6z/PA3AjGQgQ1ETjX65zb1j CZTQr7YBcUiwmvpnfcJjpdiuQ61mYOC03pAPXsTX7FW7CzzrnDpY21pWxBhB2g/t3JM/ euCwsBU5ogNi1SPeFgu0N5cubN3XIbHD9q3bsg6pb+Btqx3dHQxMGj1oFILTDZGuZNG5 6w+yVrCv9NrxI2fcs7eCv5nu513rGx1/NNQQa+XEWYWLiZH789GdugXeXwiPcYwmjQbN Qkctnv2hIvZEJkDcCTTKVFm9j1bxlueo4uBzzQb03DiUiPCXaAWDDaelJWmfYNfRLASP BHlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=A/SFuEruliHoJKYfECKgXFMMbQHFq3dwW+v5uybTb84=; b=CucA+VTEzWIRnkgx2hdwgPO+E/l9bCYVVV2RnaJPeaVplTsUJf/weGkwRSTxXjlBJd IETLAv4DLiWcyueYhTC51q/SxwZuNLKttaZa68u/Vf7Ng13k9DJ9ZcUBHUg7122hVyQ4 1/9iGVtHabSpSzWgkI6VJOD+IuT9NX3lTAP16sbqobitafczkgPapzXQlUrz1xHFm9qN pDzykI2F8VrgX2zB0oLa4/CGAseRE02/X4voR34uPjdPEo+ovLq29zgOuUDtt6w5p9bP AABVgJ4R6nu/4U54Pf3wuW0nfYezbiV/5DgoJpRIZfec2PuJ09Bh5ZDC5kPa6xmiuI+L StHA== X-Gm-Message-State: APjAAAWF8tH0n02b0cq3T8z3+4NWcqIwESRJ1TO7LciZeIJmYEjF7PpD JIBPdLXvS/X95dg25JtlBwGERjUc28M= X-Received: by 2002:a05:600c:230d:: with SMTP id 13mr1622467wmo.114.1568878439717; Thu, 19 Sep 2019 00:33:59 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:f:6020:d555:8fca:a19c:222c]) by smtp.gmail.com with ESMTPSA id s12sm13300250wra.82.2019.09.19.00.33.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 19 Sep 2019 00:33:58 -0700 (PDT) From: Vincent Guittot To: linux-kernel@vger.kernel.org, mingo@redhat.com, peterz@infradead.org Cc: pauld@redhat.com, valentin.schneider@arm.com, srikar@linux.vnet.ibm.com, quentin.perret@arm.com, dietmar.eggemann@arm.com, Morten.Rasmussen@arm.com, hdanton@sina.com, Vincent Guittot Subject: [PATCH v3 02/10] sched/fair: rename sum_nr_running to sum_h_nr_running Date: Thu, 19 Sep 2019 09:33:33 +0200 Message-Id: <1568878421-12301-3-git-send-email-vincent.guittot@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1568878421-12301-1-git-send-email-vincent.guittot@linaro.org> References: <1568878421-12301-1-git-send-email-vincent.guittot@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Rename sum_nr_running to sum_h_nr_running because it effectively tracks cfs->h_nr_running so we can use sum_nr_running to track rq->nr_running when needed. There is no functional changes. Signed-off-by: Vincent Guittot --- kernel/sched/fair.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) -- 2.7.4 Acked-by: Rik van Riel Reviewed-by: Valentin Schneider diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 3175fea..02ab6b5 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -7680,7 +7680,7 @@ struct sg_lb_stats { unsigned long load_per_task; unsigned long group_capacity; unsigned long group_util; /* Total utilization of the group */ - unsigned int sum_nr_running; /* Nr tasks running in the group */ + unsigned int sum_h_nr_running; /* Nr of CFS tasks running in the group */ unsigned int idle_cpus; unsigned int group_weight; enum group_type group_type; @@ -7725,7 +7725,7 @@ static inline void init_sd_lb_stats(struct sd_lb_stats *sds) .total_capacity = 0UL, .busiest_stat = { .avg_load = 0UL, - .sum_nr_running = 0, + .sum_h_nr_running = 0, .group_type = group_other, }, }; @@ -7916,7 +7916,7 @@ static inline int sg_imbalanced(struct sched_group *group) static inline bool group_has_capacity(struct lb_env *env, struct sg_lb_stats *sgs) { - if (sgs->sum_nr_running < sgs->group_weight) + if (sgs->sum_h_nr_running < sgs->group_weight) return true; if ((sgs->group_capacity * 100) > @@ -7937,7 +7937,7 @@ group_has_capacity(struct lb_env *env, struct sg_lb_stats *sgs) static inline bool group_is_overloaded(struct lb_env *env, struct sg_lb_stats *sgs) { - if (sgs->sum_nr_running <= sgs->group_weight) + if (sgs->sum_h_nr_running <= sgs->group_weight) return false; if ((sgs->group_capacity * 100) < @@ -8029,7 +8029,7 @@ static inline void update_sg_lb_stats(struct lb_env *env, sgs->group_load += cpu_runnable_load(rq); sgs->group_util += cpu_util(i); - sgs->sum_nr_running += rq->cfs.h_nr_running; + sgs->sum_h_nr_running += rq->cfs.h_nr_running; nr_running = rq->nr_running; if (nr_running > 1) @@ -8059,8 +8059,8 @@ static inline void update_sg_lb_stats(struct lb_env *env, sgs->group_capacity = group->sgc->capacity; sgs->avg_load = (sgs->group_load*SCHED_CAPACITY_SCALE) / sgs->group_capacity; - if (sgs->sum_nr_running) - sgs->load_per_task = sgs->group_load / sgs->sum_nr_running; + if (sgs->sum_h_nr_running) + sgs->load_per_task = sgs->group_load / sgs->sum_h_nr_running; sgs->group_weight = group->group_weight; @@ -8117,7 +8117,7 @@ static bool update_sd_pick_busiest(struct lb_env *env, * capable CPUs may harm throughput. Maximize throughput, * power/energy consequences are not considered. */ - if (sgs->sum_nr_running <= sgs->group_weight && + if (sgs->sum_h_nr_running <= sgs->group_weight && group_smaller_min_cpu_capacity(sds->local, sg)) return false; @@ -8148,7 +8148,7 @@ static bool update_sd_pick_busiest(struct lb_env *env, * perform better since they share less core resources. Hence when we * have idle threads, we want them to be the higher ones. */ - if (sgs->sum_nr_running && + if (sgs->sum_h_nr_running && sched_asym_prefer(env->dst_cpu, sg->asym_prefer_cpu)) { sgs->group_asym_packing = 1; if (!sds->busiest) @@ -8166,9 +8166,9 @@ static bool update_sd_pick_busiest(struct lb_env *env, #ifdef CONFIG_NUMA_BALANCING static inline enum fbq_type fbq_classify_group(struct sg_lb_stats *sgs) { - if (sgs->sum_nr_running > sgs->nr_numa_running) + if (sgs->sum_h_nr_running > sgs->nr_numa_running) return regular; - if (sgs->sum_nr_running > sgs->nr_preferred_running) + if (sgs->sum_h_nr_running > sgs->nr_preferred_running) return remote; return all; } @@ -8243,7 +8243,7 @@ static inline void update_sd_lb_stats(struct lb_env *env, struct sd_lb_stats *sd */ if (prefer_sibling && sds->local && group_has_capacity(env, local) && - (sgs->sum_nr_running > local->sum_nr_running + 1)) { + (sgs->sum_h_nr_running > local->sum_h_nr_running + 1)) { sgs->group_no_capacity = 1; sgs->group_type = group_classify(sg, sgs); } @@ -8255,7 +8255,7 @@ static inline void update_sd_lb_stats(struct lb_env *env, struct sd_lb_stats *sd next_group: /* Now, start updating sd_lb_stats */ - sds->total_running += sgs->sum_nr_running; + sds->total_running += sgs->sum_h_nr_running; sds->total_load += sgs->group_load; sds->total_capacity += sgs->group_capacity; @@ -8309,7 +8309,7 @@ void fix_small_imbalance(struct lb_env *env, struct sd_lb_stats *sds) local = &sds->local_stat; busiest = &sds->busiest_stat; - if (!local->sum_nr_running) + if (!local->sum_h_nr_running) local->load_per_task = cpu_avg_load_per_task(env->dst_cpu); else if (busiest->load_per_task > local->load_per_task) imbn = 1; @@ -8407,7 +8407,7 @@ static inline void calculate_imbalance(struct lb_env *env, struct sd_lb_stats *s */ if (busiest->group_type == group_overloaded && local->group_type == group_overloaded) { - load_above_capacity = busiest->sum_nr_running * SCHED_CAPACITY_SCALE; + load_above_capacity = busiest->sum_h_nr_running * SCHED_CAPACITY_SCALE; if (load_above_capacity > busiest->group_capacity) { load_above_capacity -= busiest->group_capacity; load_above_capacity *= scale_load_down(NICE_0_LOAD); @@ -8488,7 +8488,7 @@ static struct sched_group *find_busiest_group(struct lb_env *env) goto force_balance; /* There is no busy sibling group to pull tasks from */ - if (!sds.busiest || busiest->sum_nr_running == 0) + if (!sds.busiest || busiest->sum_h_nr_running == 0) goto out_balanced; /* XXX broken for overlapping NUMA groups */