From patchwork Wed Jun 25 00:36:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuyang Du X-Patchwork-Id: 4417371 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5E9879F1D6 for ; Wed, 25 Jun 2014 08:41:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9D7AC20394 for ; Wed, 25 Jun 2014 08:41:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C33F22038D for ; Wed, 25 Jun 2014 08:41:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755811AbaFYIki (ORCPT ); Wed, 25 Jun 2014 04:40:38 -0400 Received: from mga03.intel.com ([143.182.124.21]:15882 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755947AbaFYIkf (ORCPT ); Wed, 25 Jun 2014 04:40:35 -0400 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga101.ch.intel.com with ESMTP; 25 Jun 2014 01:40:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.01,544,1400050800"; d="scan'208";a="449717598" Received: from dalvikqa005-desktop.bj.intel.com ([10.238.151.105]) by azsmga001.ch.intel.com with ESMTP; 25 Jun 2014 01:40:21 -0700 From: Yuyang Du To: mingo@redhat.com, peterz@infradead.org, rafael.j.wysocki@intel.com, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org Cc: arjan.van.de.ven@intel.com, len.brown@intel.com, alan.cox@intel.com, mark.gross@intel.com, morten.rasmussen@arm.com, vincent.guittot@linaro.org, dietmar.eggemann@arm.com, rajeev.d.muralidhar@intel.com, vishwesh.m.rudramuni@intel.com, nicole.chalhoub@intel.com, ajaya.durg@intel.com, harinarayanan.seshadri@intel.com, jacob.jun.pan@linux.intel.com, Yuyang Du Subject: [RFC PATCH 9/9 v4] Implement Workload Consolidation in periodic load balance Date: Wed, 25 Jun 2014 08:36:08 +0800 Message-Id: <1403656568-32445-10-git-send-email-yuyang.du@intel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1403656568-32445-1-git-send-email-yuyang.du@intel.com> References: <1403656568-32445-1-git-send-email-yuyang.du@intel.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-5.4 required=5.0 tests=BAYES_00, DATE_IN_PAST_06_12, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 1) Skip pulling task to the non-consolidated CPUs. 2) In addition, for consolidated Idle CPU, we aggressively pull tasks from non-consolidated CPUs. Signed-off-by: Yuyang Du --- kernel/sched/fair.c | 50 +++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 43 insertions(+), 7 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 549f6e0..7fcd2d0 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -7371,17 +7371,53 @@ static void nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle, struc static void run_rebalance_domains(struct softirq_action *h) { struct rq *this_rq = this_rq(); + int this_cpu = cpu_of(this_rq); + struct sched_domain *sd; enum cpu_idle_type idle = this_rq->idle_balance ? CPU_IDLE : CPU_NOT_IDLE; - rebalance_domains(this_rq, idle); + sd = per_cpu(sd_wc, this_cpu); + if (sd) { + struct cpumask *nonshielded_cpus = __get_cpu_var(load_balance_mask); - /* - * If this cpu has a pending nohz_balance_kick, then do the - * balancing on behalf of the other idle cpus whose ticks are - * stopped. - */ - nohz_idle_balance(this_rq, idle); + /* + * if we encounter shielded cpus here, don't do balance on them + */ + cpumask_copy(nonshielded_cpus, cpu_active_mask); + + rcu_read_lock(); + wc_nonshielded_mask(this_cpu, sd, nonshielded_cpus); + rcu_read_unlock(); + + /* + * aggressively unload the shielded cpus to unshielded cpus + */ + wc_unload(nonshielded_cpus, sd); + + if (cpumask_test_cpu(this_cpu, nonshielded_cpus)) { + struct cpumask *idle_cpus = __get_cpu_var(local_cpu_mask); + cpumask_and(idle_cpus, nonshielded_cpus, nohz.idle_cpus_mask); + + rebalance_domains(this_rq, idle); + + /* + * If this cpu has a pending nohz_balance_kick, then do the + * balancing on behalf of the other idle cpus whose ticks are + * stopped. + */ + nohz_idle_balance(this_rq, idle, idle_cpus); + } + } + else { + rebalance_domains(this_rq, idle); + + /* + * If this cpu has a pending nohz_balance_kick, then do the + * balancing on behalf of the other idle cpus whose ticks are + * stopped. + */ + nohz_idle_balance(this_rq, idle, nohz.idle_cpus_mask); + } } /*