From patchwork Fri Jun 8 12:09:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Guittot X-Patchwork-Id: 137953 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp791198lji; Fri, 8 Jun 2018 05:10:42 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKYTGflPlK9HsvxikvOlho4aLGcjkuHmVc6z0FQGT3Orbf3jZuvDYTLNE/2pqKovAj/2wFO X-Received: by 2002:a63:79c9:: with SMTP id u192-v6mr5082861pgc.6.1528459842431; Fri, 08 Jun 2018 05:10:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528459842; cv=none; d=google.com; s=arc-20160816; b=VE4p003t233w3y9cNfHQF18DGfLtTrBoZ7WD+COE5yN6jtkFGxR+hzytP/muRxGoP7 m2Q0LKOdvBVVteIB2Z4X+J8MAcK8287Y0Ti4+9TDsgBIoihEQrifMKqZCub1Tcfmkb5Z FMQ1HHLqvM7mLFvJp923YDztfi7ISKVtIcH9Us49nHExF8L6leWp+rYHyGXhYeGRvFE5 dhsVNzDu3WlVe4vNpshIYOiVs4jtepTANxTBs3ArnSkxCrzAqdkA55nuETUDFNHBtRWF Wg7YbJ4rJ+vdfcS4hT6aWUkF6PTPLgyxfv0KP6lsmPae08lFHDcWkMz8Ro4k5BgH97+l hacw== 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=HwoWBjC6wKOoRZe0zFWtP5iX3jFqmWoF+0Wz0wG8mrA=; b=ZeuzcWcp1qQY+bfo7v9MFngAnZTXycV9qHAVXBty8jIIV+tCuXHqZcc/nEqBAicInQ Hgn2jNjmOcVT1Zjx48hk2++cTsenwLRTLJ+bgbBkZSCsqqidqsAOCfyDv4RJCN6NdgDn lV7nhnmlUP1/EtzKmHJ1elIGQqW9eHBQvDPW9e4M0k7/ummHPcllVzb3c8nXa3tGq4nw NdXO3RcqBo7ijF/nLvBTJhVC5SWVWd+JQdC8LJLpMZgmNiK2zI1mU2PUxU51dYrxUl/3 bJestQ6BW+X2/r0IK7W3j8efonuZ3Vgw66UG+62d5zHyS1LoQIaY2CQr4/Iky/+kT9SA 01YQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BGcXzz8+; 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 e2-v6si35109018pls.575.2018.06.08.05.10.42; Fri, 08 Jun 2018 05:10:42 -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=BGcXzz8+; 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 S1753015AbeFHMKk (ORCPT + 30 others); Fri, 8 Jun 2018 08:10:40 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:42985 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752957AbeFHMKf (ORCPT ); Fri, 8 Jun 2018 08:10:35 -0400 Received: by mail-wr0-f196.google.com with SMTP id w10-v6so13151965wrk.9 for ; Fri, 08 Jun 2018 05:10:34 -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=HwoWBjC6wKOoRZe0zFWtP5iX3jFqmWoF+0Wz0wG8mrA=; b=BGcXzz8+TlqcQkjoQdCEtUV1YfujY8fKZo9uS+xfo0uPDncMZfEOcp+ywO0BdkV6+j nb58WAYAtMVv6JwQZ6ZIJv/8c9BL5P/F+9vmPUS33zRndfiwRAB1W2tPkrCcdvC5Ydzp lv9j/yk9ZaCd4phqGjDaftohNuODiYInQIJmE= 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=HwoWBjC6wKOoRZe0zFWtP5iX3jFqmWoF+0Wz0wG8mrA=; b=rIwpWz4CQDKUw6t7HojBUONBxOv485LvsVdFshKOYZ/YYtsJqhV62GiOlnrTXDZqyn xYzjKLaE4l2yN9m5csFQUpPlw/GaGMxhUZVABsZlIR+r+fiIB/yBlP0xDSaHk7vd4sN3 x/Q44SlJ/39wYYqOoGDjZQdgNj63GpoyQDD/vscrW4DVreq3rjCPqPkE+m1kIUnvx011 acAVw/QcDX6tzLMS+V+szrebe/M+VUDcW+hcrsAZd8v/5Do1b+61TZ9nc9U0UckdyfDt /10vzScvfrc1mRnTNS5r6TlQ65XKdN/hTLx07SbMc016rra3p+KSD1dFzJukD9uOa2GQ peVQ== X-Gm-Message-State: APt69E34fzR+GH+T4plpMIaCyj5Cv9L0Do1GiK3O8rByEcKc3EeJ6I7m LH86L47Xwno8ccc9oILIVRp6Yg== X-Received: by 2002:adf:a851:: with SMTP id l75-v6mr4699300wrc.140.1528459834084; Fri, 08 Jun 2018 05:10:34 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:f:6020:6c67:7ea:9f4d:8968]) by smtp.gmail.com with ESMTPSA id b204-v6sm1546003wmh.22.2018.06.08.05.10.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 08 Jun 2018 05:10:33 -0700 (PDT) From: Vincent Guittot To: peterz@infradead.org, mingo@kernel.org, linux-kernel@vger.kernel.org Cc: rjw@rjwysocki.net, juri.lelli@redhat.com, dietmar.eggemann@arm.com, Morten.Rasmussen@arm.com, viresh.kumar@linaro.org, valentin.schneider@arm.com, patrick.bellasi@arm.com, joel@joelfernandes.org, daniel.lezcano@linaro.org, quentin.perret@arm.com, Vincent Guittot , Ingo Molnar Subject: [PATCH v6 08/11] cpufreq/schedutil: take into account interrupt Date: Fri, 8 Jun 2018 14:09:51 +0200 Message-Id: <1528459794-13066-9-git-send-email-vincent.guittot@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1528459794-13066-1-git-send-email-vincent.guittot@linaro.org> References: <1528459794-13066-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 The time spent under interrupt can be significant but it is not reflected in the utilization of CPU when deciding to choose an OPP. Now that we have access to this metric, schedutil can take it into account when selecting the OPP for a CPU. rqs utilization don't see the time spend under interrupt context and report their value in the normal context time window. We need to compensate this when adding interrupt utilization The CPU utilization is : irq util_avg + (1 - irq util_avg / max capacity ) * /Sum rq util_avg A test with iperf on hikey (octo arm64) gives: iperf -c server_address -r -t 5 w/o patch w/ patch Tx 276 Mbits/sec 304 Mbits/sec +10% Rx 299 Mbits/sec 328 Mbits/sec +09% 8 iterations stdev is lower than 1% Only WFI idle state is enable (shallowest diel state) Cc: Ingo Molnar Cc: Peter Zijlstra Signed-off-by: Vincent Guittot --- kernel/sched/cpufreq_schedutil.c | 25 +++++++++++++++++++++---- kernel/sched/sched.h | 13 +++++++++++++ 2 files changed, 34 insertions(+), 4 deletions(-) -- 2.7.4 diff --git a/kernel/sched/cpufreq_schedutil.c b/kernel/sched/cpufreq_schedutil.c index 25cee59..092c310 100644 --- a/kernel/sched/cpufreq_schedutil.c +++ b/kernel/sched/cpufreq_schedutil.c @@ -58,6 +58,7 @@ struct sugov_cpu { unsigned long util_dl; unsigned long bw_dl; unsigned long util_rt; + unsigned long util_irq; unsigned long max; /* The field below is for single-CPU policies only: */ @@ -182,21 +183,30 @@ static void sugov_get_util(struct sugov_cpu *sg_cpu) sg_cpu->util_dl = cpu_util_dl(rq); sg_cpu->bw_dl = cpu_bw_dl(rq); sg_cpu->util_rt = cpu_util_rt(rq); + sg_cpu->util_irq = cpu_util_irq(rq); } static unsigned long sugov_aggregate_util(struct sugov_cpu *sg_cpu) { struct rq *rq = cpu_rq(sg_cpu->cpu); - unsigned long util; + unsigned long util, max = sg_cpu->max; if (rq->rt.rt_nr_running) return sg_cpu->max; + if (unlikely(sg_cpu->util_irq >= max)) + return max; + + /* Sum rq utilization */ util = sg_cpu->util_cfs; util += sg_cpu->util_rt; - if ((util + sg_cpu->util_dl) >= sg_cpu->max) - return sg_cpu->max; :confirm b9 + /* + * Interrupt time is not seen by rqs utilization so we can compare + * them with the CPU capacity + */ + if ((util + sg_cpu->util_dl) >= max) + return max; /* * As there is still idle time on the CPU, we need to compute the @@ -207,10 +217,17 @@ static unsigned long sugov_aggregate_util(struct sugov_cpu *sg_cpu) * periods of time. */ + /* Weight rqs utilization to normal context window */ + util *= (max - sg_cpu->util_irq); + util /= max; + + /* Add interrupt utilization */ + util += sg_cpu->util_irq; + /* Add DL bandwidth requirement */ util += sg_cpu->bw_dl; - return min(sg_cpu->max, util); + return min(max, util); } static void sugov_set_iowait_boost(struct sugov_cpu *sg_cpu, u64 time, unsigned int flags) diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index b534a43..873b567 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -2221,4 +2221,17 @@ static inline unsigned long cpu_util_rt(struct rq *rq) { return rq->avg_rt.util_avg; } + +#if defined(CONFIG_IRQ_TIME_ACCOUNTING) || defined(CONFIG_PARAVIRT_TIME_ACCOUNTING) +static inline unsigned long cpu_util_irq(struct rq *rq) +{ + return rq->avg_irq.util_avg; +} +#else +static inline unsigned long cpu_util_irq(struct rq *rq) +{ + return 0; +} + +#endif #endif