From patchwork Mon May 5 00:02:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuyang Du X-Patchwork-Id: 4112251 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 480899F1E1 for ; Mon, 5 May 2014 08:10:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 89BAA203E6 for ; Mon, 5 May 2014 08:10:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A17462037A for ; Mon, 5 May 2014 08:10:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754897AbaEEIJ7 (ORCPT ); Mon, 5 May 2014 04:09:59 -0400 Received: from mga01.intel.com ([192.55.52.88]:46110 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755380AbaEEIJL (ORCPT ); Mon, 5 May 2014 04:09:11 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 05 May 2014 01:09:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,986,1389772800"; d="scan'208";a="526078766" Received: from dalvikqa005-desktop.bj.intel.com ([10.238.151.105]) by fmsmga001.fm.intel.com with ESMTP; 05 May 2014 01:09:07 -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, rajeev.d.muralidhar@intel.com, vishwesh.m.rudramuni@intel.com, nicole.chalhoub@intel.com, ajaya.durg@intel.com, harinarayanan.seshadri@intel.com, yuyang.du@intel.com Subject: [RFC PATCH 11/12 v1] Intercept periodic load balance Date: Mon, 5 May 2014 08:02:51 +0800 Message-Id: <1399248172-13871-12-git-send-email-yuyang.du@intel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1399248172-13871-1-git-send-email-yuyang.du@intel.com> References: <1399248172-13871-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=-6.0 required=5.0 tests=BAYES_00, DATE_IN_PAST_06_12, RCVD_IN_DNSWL_HI, 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 Signed-off-by: Yuyang Du --- kernel/sched/fair.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 374c86b..6cbf6c5 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -7260,6 +7260,36 @@ static void run_rebalance_domains(struct softirq_action *h) enum cpu_idle_type idle = this_rq->idle_balance ? CPU_IDLE : CPU_NOT_IDLE; +#ifdef CONFIG_WORKLOAD_CONSOLIDATION + struct cpumask *nonshielded = __get_cpu_var(local_cpu_mask); + int this_cpu = cpu_of(this_rq); + + /* + * if we encounter shadowded cpus here, don't do balance on them + */ + cpumask_copy(nonshielded, cpu_active_mask); + + rcu_read_lock(); + workload_consolidation_nonshielded_mask(this_cpu, nonshielded); + rcu_read_unlock(); + + /* + * aggressively unload the shielded cpus to unshielded cpus + */ + workload_consolidation_unload(nonshielded); + + if (cpumask_test_cpu(this_cpu, nonshielded)) { + 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. + */ + cpumask_and(nonshielded, nonshielded, nohz.idle_cpus_mask); + nohz_idle_balance(this_rq, idle, nonshielded); + } +#else rebalance_domains(this_rq, idle); /* @@ -7267,7 +7297,8 @@ static void run_rebalance_domains(struct softirq_action *h) * balancing on behalf of the other idle cpus whose ticks are * stopped. */ - nohz_idle_balance(this_rq, idle); + nohz_idle_balance(this_rq, idle, nohz.idle_cpus_mask); +#endif } /*