From patchwork Mon Dec 4 10:23:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juri Lelli X-Patchwork-Id: 120503 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp4245108qgn; Mon, 4 Dec 2017 02:24:42 -0800 (PST) X-Google-Smtp-Source: AGs4zMZGBxV+PPweFVSHXECjCejcAAgsyDgXbqJ0Ne8SsYAkviuAdYpAnkVV2sMZmbsQc23EJDkt X-Received: by 10.84.244.139 with SMTP id h11mr14272199pll.127.1512383082683; Mon, 04 Dec 2017 02:24:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512383082; cv=none; d=google.com; s=arc-20160816; b=s3RutoWNlMe4kNkDPOfY/Yzgj1U+ydugq/geLK68iiJs0jp/7w0Lr519cYK1Bi1CL+ SdwxjV2u1dvDMxxj1B0PcS+nIi5fZDt52nNzFmnCCmGJd4RghIJx/BksrcebxfwMT6Lk Kd7AKr21W0PFj4ywbibEGx01Wp4w1/u2MPEexHdszRivPR/TPFjEMj2LjzDdZF8Rcjat /jg0+ThgoIqS5RaN4HGfTjBMhMW4QBAmR+ne1TewcQlG6jVTvLD0KOfEqH9y7O/N5r10 LMsOC7bwX+DusQz040/zazmwWzmhj6cGGUQxHBlcLkBRCLtl/ZsC62s9katn1KlU3mrF AZlg== 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:arc-authentication-results; bh=K72fsJ+PJZNJBPaMK2x9IH+/HBd820m0CcThAZhsxsA=; b=fa2o5zIeq9nv3yuRzBlfW8utAAx5Ue/0FfI5p6aU3yL9sQaHKBu68gq016RApF2yIU IZbp0n9PEOiO3TUzatf8k1qufJM7z/IRrNtj/ZAsn7QcmavCy4BqZu3CjV2lLNz/m5AF 1p+pg1OyVZMR7z20gX7R0rrKiR6kr0sylG/hBbPHnHxultRI1MtIj30dOEtpRbZ6m/aR UDR0KDIkvU+540D1JNCvhySraZ6wLMJGgy7TJM3WdO9Xnql4OmfiueTBDdtvVD2/ZLGn YuvWqQkOZcKmU8Fl+G0h8c/8tnJnw5Nhp5byD53aW8XNaG0w3hK96gVudgHdFdi7/DbR kMhA== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b62si9951345pfe.291.2017.12.04.02.24.42; Mon, 04 Dec 2017 02:24:42 -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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753781AbdLDKYj (ORCPT + 28 others); Mon, 4 Dec 2017 05:24:39 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:41379 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753724AbdLDKYe (ORCPT ); Mon, 4 Dec 2017 05:24:34 -0500 Received: by mail-wm0-f68.google.com with SMTP id g75so4821899wme.0 for ; Mon, 04 Dec 2017 02:24:33 -0800 (PST) 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=K72fsJ+PJZNJBPaMK2x9IH+/HBd820m0CcThAZhsxsA=; b=P6RDOIfQpx6swSTazd6WD9ZE87aniFYpSTdKD94RHXpFgH216Naj341Wbf7RnpvP48 8gKmaKIX9hFPKbPXl+8mfaY3stjKP7u5TzMBbUh3wFMfyoL4B4yapPZnJBtV6H40Z2Yy bZepZ+9gscBnLcw/49LDqk7mDRvxTikmuZbR98ZUiuiHipVCXrHjm0Q9xjPThn8Ai8mX JO//UQQhqCr4G/98rJ904x+RYRQLKGS3uoMzTzbr+0HUGbYJnPnVuFwS2/+KfkPK8yLG ATeVCtPlTKQEr2TI6+FAS0N6o/xk/aap+XLoEJyrfj3hjd9SB290HJGTG5ryOgbYWGHe MBDA== X-Gm-Message-State: AKGB3mL01vObGGacTuKQ+UIg+47UFc0bwlYMps0Y/1o2AX4hffaq/Q0k VDvFjyxCMuErtkrr+gXpiRl6xg== X-Received: by 10.28.209.141 with SMTP id i135mr2428979wmg.153.1512383072469; Mon, 04 Dec 2017 02:24:32 -0800 (PST) Received: from localhost.localdomain.com ([151.68.92.1]) by smtp.gmail.com with ESMTPSA id y2sm13542473wra.18.2017.12.04.02.24.29 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 04 Dec 2017 02:24:32 -0800 (PST) From: Juri Lelli To: peterz@infradead.org, mingo@redhat.com, rjw@rjwysocki.net, viresh.kumar@linaro.org Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, tglx@linutronix.de, vincent.guittot@linaro.org, rostedt@goodmis.org, luca.abeni@santannapisa.it, claudio@evidence.eu.com, tommaso.cucinotta@santannapisa.it, bristot@redhat.com, mathieu.poirier@linaro.org, tkjos@android.com, joelaf@google.com, morten.rasmussen@arm.com, dietmar.eggemann@arm.com, patrick.bellasi@arm.com, alessio.balsini@arm.com, juri.lelli@redhat.com, Juri Lelli , Ingo Molnar , "Rafael J . Wysocki" Subject: [RFC PATCH v2 8/8] sched/deadline: make bandwidth enforcement scale-invariant Date: Mon, 4 Dec 2017 11:23:25 +0100 Message-Id: <20171204102325.5110-9-juri.lelli@redhat.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171204102325.5110-1-juri.lelli@redhat.com> References: <20171204102325.5110-1-juri.lelli@redhat.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Juri Lelli Apply frequency and cpu scale-invariance correction factor to bandwidth enforcement (similar to what we already do to fair utilization tracking). Each delta_exec gets scaled considering current frequency and maximum cpu capacity; which means that the reservation runtime parameter (that need to be specified profiling the task execution at max frequency on biggest capacity core) gets thus scaled accordingly. Signed-off-by: Juri Lelli Cc: Peter Zijlstra Cc: Ingo Molnar Cc: Rafael J. Wysocki Cc: Viresh Kumar Cc: Luca Abeni Cc: Claudio Scordino --- kernel/sched/deadline.c | 26 ++++++++++++++++++++++---- kernel/sched/fair.c | 2 -- kernel/sched/sched.h | 2 ++ 3 files changed, 24 insertions(+), 6 deletions(-) -- 2.14.3 diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c index 40f12aab9250..741d2fe26f88 100644 --- a/kernel/sched/deadline.c +++ b/kernel/sched/deadline.c @@ -1151,7 +1151,8 @@ static void update_curr_dl(struct rq *rq) { struct task_struct *curr = rq->curr; struct sched_dl_entity *dl_se = &curr->dl; - u64 delta_exec; + u64 delta_exec, scaled_delta_exec; + int cpu = cpu_of(rq); if (!dl_task(curr) || !on_dl_rq(dl_se)) return; @@ -1185,9 +1186,26 @@ static void update_curr_dl(struct rq *rq) if (unlikely(dl_entity_is_special(dl_se))) return; - if (unlikely(dl_se->flags & SCHED_FLAG_RECLAIM)) - delta_exec = grub_reclaim(delta_exec, rq, &curr->dl); - dl_se->runtime -= delta_exec; + /* + * For tasks that participate in GRUB, we implement GRUB-PA: the + * spare reclaimed bandwidth is used to clock down frequency. + * + * For the others, we still need to scale reservation parameters + * according to current frequency and CPU maximum capacity. + */ + if (unlikely(dl_se->flags & SCHED_FLAG_RECLAIM)) { + scaled_delta_exec = grub_reclaim(delta_exec, + rq, + &curr->dl); + } else { + unsigned long scale_freq = arch_scale_freq_capacity(cpu); + unsigned long scale_cpu = arch_scale_cpu_capacity(NULL, cpu); + + scaled_delta_exec = cap_scale(delta_exec, scale_freq); + scaled_delta_exec = cap_scale(scaled_delta_exec, scale_cpu); + } + + dl_se->runtime -= scaled_delta_exec; throttle: if (dl_runtime_exceeded(dl_se) || dl_se->dl_yielded) { diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 535d9409f4af..5bc3273a5c1c 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -3091,8 +3091,6 @@ static u32 __accumulate_pelt_segments(u64 periods, u32 d1, u32 d3) return c1 + c2 + c3; } -#define cap_scale(v, s) ((v)*(s) >> SCHED_CAPACITY_SHIFT) - /* * Accumulate the three separate parts of the sum; d1 the remainder * of the last (incomplete) period, d2 the span of full periods and d3 diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 0022c649fabb..6d9d55e764fa 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -156,6 +156,8 @@ static inline int task_has_dl_policy(struct task_struct *p) return dl_policy(p->policy); } +#define cap_scale(v, s) ((v)*(s) >> SCHED_CAPACITY_SHIFT) + /* * !! For sched_setattr_nocheck() (kernel) only !! *