From patchwork Tue Feb 6 08:32:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Guittot X-Patchwork-Id: 126959 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp2706043ljc; Tue, 6 Feb 2018 00:33:18 -0800 (PST) X-Google-Smtp-Source: AH8x227zObMnlon7eW0JVSjD+f5vKO+Y4oTS3W3DdX5s90ZqLVsLqjQpjIRJdoEr8YUuMKGea70b X-Received: by 10.99.179.77 with SMTP id x13mr1341452pgt.135.1517905997888; Tue, 06 Feb 2018 00:33:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517905997; cv=none; d=google.com; s=arc-20160816; b=mClhniAYExUMMQKZf5Ob+tuJOXacT7oM+buZlmtTGTdP0by0qSDNPU5wv4adTQ8tnt Uk1VXhqEP9IjGYhKnt8OF0eQbYJO2zp4+W8Z30KlP3DFQAA1En/nSvG1iPYi3iXSapMg M2E4Vf0WV00xXD8drJBvUK67JP4yLnQph76q+a0q3GmQMTcEyLSQ6IJBKuPnIRubeohI qkVqN3Nz5TiuPnmAcXafoidUr0ByIhOUUmumWI5wk9MbPLeoTpoOu1eWus/akaiPmhFh yZg9GkGZQQhyZnqtNsCjokYn9IybhE9FGMFHKLSuu98mUqicoy1uDt1sRlIVGrD/xM89 GFCw== 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:arc-authentication-results; bh=3rrmFAcQlv8dGe8ebZAkyqO+k8Dacnif2O7VRQKqdww=; b=py6ltTugnk0vgjUKIK9DkQ0UkLtW6NsS2Bt14SSH8deVZugNcD7wpuIge2wfb8w1NC L+u4Odqhj4p+OeydRleJkoub+bhEDJ77gLn2/cnFP8U9Yz5lbn0hS9O0ym4ZH+wfYgJv L4g/pqPphhKTGL3RkPlwnBqFlCDpGWqmA3uvDngQLRuxX/a3LRjAUtR0l/3Q71J91n10 s+jaozZ54t3ZGb4+LpyUy0Oj8fq4/ObdOPi5DJPOt6I+YCAFxlz1sdAKK02MKzMzMGtQ 80Mft6JO/GbG2RD+6+MoO0Pi5NuK6lNRAqFwWnn9AR3NJFiIdbzMAWufFKzTrKPaXwHO +jZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=M+g7uGwG; 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 m23si1647716pgc.438.2018.02.06.00.33.17; Tue, 06 Feb 2018 00:33:17 -0800 (PST) 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=M+g7uGwG; 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 S1752589AbeBFIdQ (ORCPT + 22 others); Tue, 6 Feb 2018 03:33:16 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:32871 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752246AbeBFIcn (ORCPT ); Tue, 6 Feb 2018 03:32:43 -0500 Received: by mail-wm0-f67.google.com with SMTP id x4-v6so16678295wmc.0 for ; Tue, 06 Feb 2018 00:32:42 -0800 (PST) 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=3rrmFAcQlv8dGe8ebZAkyqO+k8Dacnif2O7VRQKqdww=; b=M+g7uGwGNga9ImsF38/np3ZPpo3QCB21dya9JnW8I22xKWmcSz4GEmU/te1A6UKXfy ybSkWo5kHzLZGZgH4jZcM/1wK04Wr5JZW82smuQ3dAd94GEs2vNbp8F3SamT8AnTpC2O JJlfu2CcUWahMbkF3B/nkLv9LNtfQndBRcOPQ= 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=3rrmFAcQlv8dGe8ebZAkyqO+k8Dacnif2O7VRQKqdww=; b=cxC774PKAe7xFMlWlv/Y33ADLHhvuExJoTBLGass/DjmzUSBmoNnj6DwkIJu6ZGqwN 8PThGMyPdsp/7lyKrA39hfMP24FTTL24ACgTuUPIIY9d2nzch1sqwEQRU7FdplXwfRw8 bYYGd6jJ+kA0Kmr63AgZUY1Egaq0kzVcMEDwUrVEQGv4zhKsx7Vj2+j3xWbGS0hnZ5Nf L9YIXGOeZVzvcA5CSSf+znSXPw4d91zwOn101aDOzOxrLUW+Y4qWYcKy0urzTrgAQJ5L a9/QSwVcRxuReYC3OfPz22/meIzYmtpEOERTn0AY7qoMDmcgQFF9SY/Cc9pL2sPoRPAi plHw== X-Gm-Message-State: APf1xPDvZnUQ3fWXfb/oCVLuFfyOY7i3wtiMIJQb8P77SpdZpqzsJi1m gHvihtDpMJ/mBLQrl4fkuIcIcg== X-Received: by 10.80.163.185 with SMTP id s54mr2651755edb.228.1517905962058; Tue, 06 Feb 2018 00:32:42 -0800 (PST) Received: from localhost.localdomain ([2a01:e0a:f:6020:e179:d82f:e215:d936]) by smtp.gmail.com with ESMTPSA id k42sm9119601edb.44.2018.02.06.00.32.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 06 Feb 2018 00:32:41 -0800 (PST) From: Vincent Guittot To: peterz@infradead.org, mingo@kernel.org, linux-kernel@vger.kernel.org, valentin.schneider@arm.com Cc: morten.rasmussen@foss.arm.com, brendan.jackman@arm.com, dietmar.eggemann@arm.com, Vincent Guittot Subject: [PATCH 3/3] sched: update blocked load when newly idle Date: Tue, 6 Feb 2018 09:32:23 +0100 Message-Id: <1517905943-24528-3-git-send-email-vincent.guittot@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1517905943-24528-1-git-send-email-vincent.guittot@linaro.org> References: <20180201181041.GF2269@hirez.programming.kicks-ass.net> <1517905943-24528-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 When NEWLY_IDLE load balance is not triggered, we might need to update the blocked load anyway. We can kick an ilb so an idle CPU will take care of updating blocked load or we can try to update them locally before entering idle. In the latter case, we reuse part of the nohz_idle_balance. Signed-off-by: Vincent Guittot --- kernel/sched/fair.c | 102 ++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 84 insertions(+), 18 deletions(-) -- 2.7.4 diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 6998528..256defe 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -8829,6 +8829,9 @@ update_next_balance(struct sched_domain *sd, unsigned long *next_balance) *next_balance = next; } +static bool _nohz_idle_balance(struct rq *this_rq, unsigned int flags, enum cpu_idle_type idle); +static void kick_ilb(unsigned int flags); + /* * idle_balance is called by schedule() if this_cpu is about to become * idle. Attempts to pull tasks from other CPUs. @@ -8863,12 +8866,26 @@ static int idle_balance(struct rq *this_rq, struct rq_flags *rf) if (this_rq->avg_idle < sysctl_sched_migration_cost || !this_rq->rd->overload) { + unsigned long has_blocked = READ_ONCE(nohz.has_blocked); + unsigned long next = READ_ONCE(nohz.next_blocked); + rcu_read_lock(); sd = rcu_dereference_check_sched_domain(this_rq->sd); if (sd) update_next_balance(sd, &next_balance); rcu_read_unlock(); + /* + * Update blocked idle load if it has not been done for a + * while. Try to do it locally before entering idle but kick a + * ilb if it takes too much time and/or might delay next local + * wake up + */ + if (has_blocked && time_after_eq(jiffies, next) && + (this_rq->avg_idle < sysctl_sched_migration_cost || + !_nohz_idle_balance(this_rq, NOHZ_STATS_KICK, CPU_NEWLY_IDLE))) + kick_ilb(NOHZ_STATS_KICK); + goto out; } @@ -9393,30 +9410,24 @@ static void rebalance_domains(struct rq *rq, enum cpu_idle_type idle) #ifdef CONFIG_NO_HZ_COMMON /* - * In CONFIG_NO_HZ_COMMON case, the idle balance kickee will do the - * rebalancing for all the cpus for whom scheduler ticks are stopped. + * Internal function that runs load balance for all idle cpus. The load balance + * can be a simple update of blocked load or a complete load balance with + * tasks movement depending of flags. + * For newly idle mode, we abort the loop if it takes too much time and return + * false to notify that the loop has not be completed and a ilb should be kick. */ -static bool nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle) +static bool _nohz_idle_balance(struct rq *this_rq, unsigned int flags, enum cpu_idle_type idle) { /* Earliest time when we have to do rebalance again */ unsigned long now = jiffies; unsigned long next_balance = now + 60*HZ; - unsigned long next_stats = now + msecs_to_jiffies(LOAD_AVG_PERIOD); + bool has_blocked_load = false; int update_next_balance = 0; int this_cpu = this_rq->cpu; - unsigned int flags; int balance_cpu; + int ret = false; struct rq *rq; - - if (!(atomic_read(nohz_flags(this_cpu)) & NOHZ_KICK_MASK)) - return false; - - if (idle != CPU_IDLE) { - atomic_andnot(NOHZ_KICK_MASK, nohz_flags(this_cpu)); - return false; - } - - flags = atomic_fetch_andnot(NOHZ_KICK_MASK, nohz_flags(this_cpu)); + u64 curr_cost = 0; SCHED_WARN_ON((flags & NOHZ_KICK_MASK) == NOHZ_BALANCE_KICK); @@ -9431,6 +9442,10 @@ static bool nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle) WRITE_ONCE(nohz.has_blocked, 0); for_each_cpu(balance_cpu, nohz.idle_cpus_mask) { + u64 t0, domain_cost; + + t0 = sched_clock_cpu(this_cpu); + if (balance_cpu == this_cpu || !idle_cpu(balance_cpu)) continue; @@ -9444,6 +9459,16 @@ static bool nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle) goto abort; } + /* + * If the update is done while CPU becomes idle, we abort + * the update when its cost is higher than the average idle + * time in orde to not delay a possible wake up. + */ + if (idle == CPU_NEWLY_IDLE && this_rq->avg_idle < curr_cost) { + has_blocked_load = true; + goto abort; + } + rq = cpu_rq(balance_cpu); update_blocked_averages(rq->cpu); @@ -9456,10 +9481,10 @@ static bool nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle) if (time_after_eq(jiffies, rq->next_balance)) { struct rq_flags rf; - rq_lock_irq(rq, &rf); + rq_lock_irqsave(rq, &rf); update_rq_clock(rq); cpu_load_update_idle(rq); - rq_unlock_irq(rq, &rf); + rq_unlock_irqrestore(rq, &rf); if (flags & NOHZ_BALANCE_KICK) rebalance_domains(rq, CPU_IDLE); @@ -9469,15 +9494,27 @@ static bool nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle) next_balance = rq->next_balance; update_next_balance = 1; } + + domain_cost = sched_clock_cpu(this_cpu) - t0; + curr_cost += domain_cost; + + } + + /* Newly idle CPU doesn't need an update */ + if (idle != CPU_NEWLY_IDLE) { + update_blocked_averages(this_cpu); + has_blocked_load |= this_rq->has_blocked_load; } - update_blocked_averages(this_cpu); if (flags & NOHZ_BALANCE_KICK) rebalance_domains(this_rq, CPU_IDLE); WRITE_ONCE(nohz.next_blocked, now + msecs_to_jiffies(LOAD_AVG_PERIOD)); + /* The full idle balance loop has been done */ + ret = true; + abort: /* There is still blocked load, enable periodic update */ if (has_blocked_load) @@ -9491,6 +9528,35 @@ static bool nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle) if (likely(update_next_balance)) nohz.next_balance = next_balance; + return ret; +} + +/* + * In CONFIG_NO_HZ_COMMON case, the idle balance kickee will do the + * rebalancing for all the cpus for whom scheduler ticks are stopped. + */ +static bool nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle) +{ + int this_cpu = this_rq->cpu; + unsigned int flags; + + if (!(atomic_read(nohz_flags(this_cpu)) & NOHZ_KICK_MASK)) + return false; + + if (idle != CPU_IDLE) { + atomic_andnot(NOHZ_KICK_MASK, nohz_flags(this_cpu)); + return false; + } + + /* + * barrier, pairs with nohz_balance_enter_idle(), ensures ... + */ + flags = atomic_fetch_andnot(NOHZ_KICK_MASK, nohz_flags(this_cpu)); + if (!(flags & NOHZ_KICK_MASK)) + return false; + + _nohz_idle_balance(this_rq, flags, idle); + return true; } #else