From patchwork Tue Oct 2 07:26:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Guittot X-Patchwork-Id: 147957 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp4826967lji; Tue, 2 Oct 2018 00:27:04 -0700 (PDT) X-Google-Smtp-Source: ACcGV63SwGo1x6lWYjatz7Vju8i7JfWYOvPFnJNMoFufrwjPkYGr07+GmI5/b7iG+DAmBD03nnUh X-Received: by 2002:a65:53c9:: with SMTP id z9-v6mr13180500pgr.203.1538465224718; Tue, 02 Oct 2018 00:27:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538465224; cv=none; d=google.com; s=arc-20160816; b=bQ5Ly5DsbPziUDjHNndTryvI2veDBEU7T9x7LFiXqRoac8dHcI60fH4lPT+ZAN2f2t M4Y1I/cz4r9ZRmPQ11bDg9GujXR7K5XPrP+anxTlZZLDwTV9zGpN4FcLDYeGqtG35dpG jzFtqDhosCLSya6AejhNsmmnqaRY7FAHAhJiv205lHfWM0EGOYdsKJobMAynxaUfBMTW qmmzqGFGplpneeyUtXpTzoudnCUfJDln5sq8CqxAUoum0ifxjDwUiBBKCJlmZzQbp98e OcJxnuBM1BfeapbyBg2PKSpYUnBik93Mo1fIVST2EAxunEnxxSwtw/IFC/DbgJeHrSvu 95iQ== 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=Wf4RyXux5B5jeDxtYeqhctDhaaK9OERZSccFy0gfof0=; b=LUEoOJLYGp+mOug9L6pv/vttk3ANTDzKe0Bp9/3Cc8ASw+WPG57llUMXnHT2oYGKr3 6PKRq43hxGpbPu8o8tGNSMtV0CaI4rftY8Mm9n8Sw2n8IVUr8kanwVUie1HxHway4Q3W HGMs7m1R9BMWSSntlZOb8hagRVu9WdSz/RV45i3iTwymGX/Wc8NAPbUMX9DdtLEsVKlc LWOhLjLwRUk292aW59zqi0V3PEdXoFq0hKsMxVoGW4KNA6/21nSvHxRcs7AorGDNYDYV R4B+Y1RBBV0pGN8X0kaXpBZik61Ef07VyKq/KcVqeyk9h7gefoDR3q5VGDKaXojk6m0n ypaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Xjbel8BM; 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 y34-v6si2896489pgk.479.2018.10.02.00.27.04; Tue, 02 Oct 2018 00:27:04 -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=Xjbel8BM; 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 S1727195AbeJBOIw (ORCPT + 32 others); Tue, 2 Oct 2018 10:08:52 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:36981 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726909AbeJBOIu (ORCPT ); Tue, 2 Oct 2018 10:08:50 -0400 Received: by mail-wr1-f68.google.com with SMTP id u12-v6so926864wrr.4 for ; Tue, 02 Oct 2018 00:26:59 -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=Wf4RyXux5B5jeDxtYeqhctDhaaK9OERZSccFy0gfof0=; b=Xjbel8BM8yKMlqC/42AYs0S3sd5yMDO5sSmyMzEeONlYHqTDQtk/jkEn89AcXcRI3O 4X6rkLSaW2AYio6FEnDeFqNLmywzNadVBP59R+drzsmv5opi9Qmkn3BE/ycXoQAfVre3 9Zhr+Im2eyVM4gkDbxxrudxmtLmocIDPygpq0= 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=Wf4RyXux5B5jeDxtYeqhctDhaaK9OERZSccFy0gfof0=; b=BQ6Z/cM7U20Tdst00HIuVXaH6baK2g9Plg5biDYhu1Vgqtb/wlR0XZy+9aLVCMXRvy jjYvDf49wcUQbZNCWck0IFk/4tPKCOveTcmGH+CgIynHQUI10KHSOLTxZmCoFVew07c+ NHljZCfO/BUpuBRHdAdEeg/OlL3SPZUnNLERCy6T5FoeWu4/B1++KK+8F/u44QOD1X5Y 61xFQi2HKaiD8OCBlJa6jLo7/PmfgO2ct4d54iOvKNxcT7fTlndgeDmeXXFvAquEBOcR fegLBHxbWKVNMwT/IWpxc78HD+nc25Jgyofsra76nACZOjdykyuqlejcTvwl5M2QSIqU nqWQ== X-Gm-Message-State: ABuFfohhl0Kd6ug14gp7NsRbT8s6zFH2q43byp0z+rnUWC/QhILLZevz h2R1Kz7YNI6HjQYStaA4VvTJqA== X-Received: by 2002:adf:9244:: with SMTP id 62-v6mr9302961wrj.130.1538465218673; Tue, 02 Oct 2018 00:26:58 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:f:6020:99b3:4272:8254:6430]) by smtp.gmail.com with ESMTPSA id t24-v6sm3550552wra.5.2018.10.02.00.26.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 02 Oct 2018 00:26:57 -0700 (PDT) From: Vincent Guittot To: peterz@infradead.org, mingo@kernel.org, linux-kernel@vger.kernel.org Cc: valentin.schneider@arm.com, Morten.Rasmussen@arm.com, Vincent Guittot Subject: [RESEND PATCH 3/3] sched/fair: fix unnecessary increase of balance interval Date: Tue, 2 Oct 2018 09:26:39 +0200 Message-Id: <1538465199-20176-4-git-send-email-vincent.guittot@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1538465199-20176-1-git-send-email-vincent.guittot@linaro.org> References: <1538465199-20176-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 In case of active balance, we increase the balance interval to cover pinned tasks cases not covered by all_pinned logic. Neverthless, the active migration triggered by asym packing should be treated as the normal unbalanced case and reset the interval to default value otherwise active migration for asym_packing can be easily delayed for hundreds of ms because of this all_pinned detection mecanism. Signed-off-by: Vincent Guittot --- kernel/sched/fair.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) -- 2.7.4 diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 00f2171..4b6a226 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -8456,22 +8456,32 @@ static struct rq *find_busiest_queue(struct lb_env *env, */ #define MAX_PINNED_INTERVAL 512 -static int need_active_balance(struct lb_env *env) +static inline bool +asym_active_balance(enum cpu_idle_type idle, unsigned int flags, int dst, int src) { - struct sched_domain *sd = env->sd; - - if (env->idle != CPU_NOT_IDLE) { + if (idle != CPU_NOT_IDLE) { /* * ASYM_PACKING needs to force migrate tasks from busy but * lower priority CPUs in order to pack all tasks in the * highest priority CPUs. */ - if ((sd->flags & SD_ASYM_PACKING) && - sched_asym_prefer(env->dst_cpu, env->src_cpu)) - return 1; + if ((flags & SD_ASYM_PACKING) && + sched_asym_prefer(dst, src)) + return true; } + return false; +} + +static int need_active_balance(struct lb_env *env) +{ + struct sched_domain *sd = env->sd; + + + if (asym_active_balance(env->idle, sd->flags, env->dst_cpu, env->src_cpu)) + return 1; + /* * The dst_cpu is idle and the src_cpu CPU has only 1 CFS task. * It's worth migrating the task if the src_cpu's capacity is reduced @@ -8749,7 +8759,8 @@ static int load_balance(int this_cpu, struct rq *this_rq, } else sd->nr_balance_failed = 0; - if (likely(!active_balance)) { + if (likely(!active_balance) || + asym_active_balance(env.idle, sd->flags, env.dst_cpu, env.src_cpu)) { /* We were unbalanced, so reset the balancing interval */ sd->balance_interval = sd->min_interval; } else {