From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932257AbcELKcb (ORCPT ); Thu, 12 May 2016 06:32:31 -0400 Received: from terminus.zytor.com ([198.137.202.10]:38432 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932076AbcELKca (ORCPT ); Thu, 12 May 2016 06:32:30 -0400 Date: Thu, 12 May 2016 03:31:51 -0700 From: tip-bot for Morten Rasmussen Message-ID: Cc: efault@gmx.de, peterz@infradead.org, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, dietmar.eggemann@arm.com, mingo@kernel.org, hpa@zytor.com, morten.rasmussen@arm.com, tglx@linutronix.de Reply-To: peterz@infradead.org, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, efault@gmx.de, mingo@kernel.org, hpa@zytor.com, morten.rasmussen@arm.com, tglx@linutronix.de, dietmar.eggemann@arm.com In-Reply-To: <1461958364-675-4-git-send-email-dietmar.eggemann@arm.com> References: <1461958364-675-4-git-send-email-dietmar.eggemann@arm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] sched/fair: Correct unit of load_above_capacity Git-Commit-ID: cfa10334318d8212d007da8c771187643c9cef35 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: cfa10334318d8212d007da8c771187643c9cef35 Gitweb: http://git.kernel.org/tip/cfa10334318d8212d007da8c771187643c9cef35 Author: Morten Rasmussen AuthorDate: Fri, 29 Apr 2016 20:32:40 +0100 Committer: Ingo Molnar CommitDate: Thu, 12 May 2016 09:55:33 +0200 sched/fair: Correct unit of load_above_capacity In calculate_imbalance() load_above_capacity currently has the unit [capacity] while it is used as being [load/capacity]. Not only is it wrong it also makes it unlikely that load_above_capacity is ever used as the subsequent code picks the smaller of load_above_capacity and the avg_load This patch ensures that load_above_capacity has the right unit [load/capacity]. Signed-off-by: Morten Rasmussen [ Changed changelog to note it was in capacity unit; +rebase. ] Signed-off-by: Peter Zijlstra (Intel) Cc: Dietmar Eggemann Cc: Linus Torvalds Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-kernel@vger.kernel.org Link: http://lkml.kernel.org/r/1461958364-675-4-git-send-email-dietmar.eggemann@arm.com Signed-off-by: Ingo Molnar --- kernel/sched/fair.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 2338105..218f8e8 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -7067,9 +7067,11 @@ 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; - if (load_above_capacity > busiest->group_capacity) + if (load_above_capacity > busiest->group_capacity) { load_above_capacity -= busiest->group_capacity; - else + load_above_capacity *= NICE_0_LOAD; + load_above_capacity /= busiest->group_capacity; + } else load_above_capacity = ~0UL; }