From patchwork Tue Mar 9 22:42:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 396098 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp2976835jai; Tue, 9 Mar 2021 14:43:34 -0800 (PST) X-Google-Smtp-Source: ABdhPJy5APjKL0J2htjgpXA+m0OXSzdTuaRng9XSlGiVxW1I1dtXlef3W9/jLlj+trKgI5YcR/kd X-Received: by 2002:a17:906:3685:: with SMTP id a5mr363677ejc.352.1615329814583; Tue, 09 Mar 2021 14:43:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615329814; cv=none; d=google.com; s=arc-20160816; b=TV4zMMPU7d+0uii32aylYP3jiN8HDgewnn5WsbikeUyaL4GWzHMD09sNQBurYdezle o+AnLG9S2cxN7xmLEHQATOAWFBVSInEfV3fRnz4AexqM/ANT+HGO+cmO3Pn649p8e7pb 0yhW+5AJZ9UkEO0RAY4KrGNSnB4Tv4tCiCmWr66IGSbFhjkJEvGcCDxTjlK55AfH4AKX BjllxFZh7QXCO7b/C65PEugc+K8Ccx0Pssu6taF3F8dgmKBT3bdhDcIbzrUGQuZb9JSY Kl+K8/9rn9jbvLP1H3CSNF4NgoSiBZGaoYMG9GQcZkHBfQhCB+vnAusmt080Uh/8x7i+ BUkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=0x5NnmCRCiyNY9UYzDiRv/bqTSntYaFcl6ygf/f/TM4=; b=XWr05C5DNWS/dNCZ8dYzI9YrBQ23JmL9zZqHoBRCrtNZu/h74Xqr92UEVLWGaLDRr1 U4kaInpNRgJxpBtuinEo5p0Q7f+FGNxQgO8hLBTdzIDmYSOi4NEd03s61bFKw9tVnU2s 9LNWB+oV7c4xhaGJyT6tN4eWAaN5mMiczFMIdNOQKKqLHBUveiICoD4Bzt3ypOg601jm YStgH0ctd+LOk+QNFavwPH6vjpjwoFDgauY3+F0qUivpMxVtqdiQToQyjAd8u1h2nNAY 8aBESmquETHygMjqPrEPXQsMUVUWcwsfZrqEo5ipbx7aQyO/QzWc920OdWL8Sxt74jFz eeyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="TVJ/xwG9"; spf=pass (google.com: domain of linux-pm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-pm-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. [23.128.96.18]) by mx.google.com with ESMTP id c11si7915222edr.72.2021.03.09.14.43.34; Tue, 09 Mar 2021 14:43:34 -0800 (PST) Received-SPF: pass (google.com: domain of linux-pm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="TVJ/xwG9"; spf=pass (google.com: domain of linux-pm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-pm-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 S232173AbhCIWnD (ORCPT + 7 others); Tue, 9 Mar 2021 17:43:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53064 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232184AbhCIWm6 (ORCPT ); Tue, 9 Mar 2021 17:42:58 -0500 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4BD89C06174A for ; Tue, 9 Mar 2021 14:42:58 -0800 (PST) Received: by mail-wm1-x334.google.com with SMTP id m20-20020a7bcb940000b029010cab7e5a9fso8481919wmi.3 for ; Tue, 09 Mar 2021 14:42:58 -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=0x5NnmCRCiyNY9UYzDiRv/bqTSntYaFcl6ygf/f/TM4=; b=TVJ/xwG9NZy1JuEErmWA2lk3anjcw77r9ar/9MXO85bVVZClKnUpfOLrecGYrfDv5l /YesT30aCQGc3x6m0mgHmAFewX1DVs0esR0lb43JB1C5JyCwrbgjsX10ptt9bpNDD3m2 Z76mEtgNOuF1jxy36AgcwKWjVD03+6caSv14BGA8Tt9x+LM8So5yaKsjgi2iHVPpcGSZ v8kElDJs8gTKD2JzYwe1vSAmH5tK/ET5TLGWVd8oBLArB5Us8WgK3c4ld3k3KLRZC0PF 3rLLxBW3qAh5iMM9+/GUw/cb7pkP/ceOlriZLbDsn8sZufhAhiw6guu+tHBvLbeLOfk8 4w/A== 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=0x5NnmCRCiyNY9UYzDiRv/bqTSntYaFcl6ygf/f/TM4=; b=cacwja8ehof2vxsjhFnBiJqk3P+q+9UF+xsU3b+Lk222vvz/qMltwS/8nMQq+zposn G+t+oHADpmJrMuRElJ++6FEblZw5AMKjzQVbdtJeCZDASjm5dCr1TXg7XzlvA+BH5Ocq HC5r26orv0vRMtOoaaX84edhW9WJJQRIyN3GS+JNw9t4j311G0X+ahEe9YaS5BuzD+8+ ciFsOQDre50cgXiVVb/gAkplDPSQ3BZucT2oU1cT/sGwF+9b6g7TefLYPELWa97RTpqP 7yN8lbucWJ/0voD8iC1GAkgFqeBtQOjuaNsoiBmHvuVTZJKOx2UqtP4x2LgFP95lxDz2 NXqw== X-Gm-Message-State: AOAM533dPfW45BtZsWrtFZrw+fi7qn1G97gyz99/9G8fUoejc0etfZZx o+8fqdb8pLgVzr/x5XwxjakMpA== X-Received: by 2002:a1c:cc14:: with SMTP id h20mr172799wmb.14.1615329776988; Tue, 09 Mar 2021 14:42:56 -0800 (PST) Received: from localhost.localdomain ([82.142.0.212]) by smtp.gmail.com with ESMTPSA id p16sm30352179wrt.54.2021.03.09.14.42.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Mar 2021 14:42:56 -0800 (PST) From: Daniel Lezcano To: daniel.lezcano@linaro.org, rafael@kernel.org Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, lukasz.luba@arm.com Subject: [PATCH v2 5/5] powercap/drivers/dtpm: Scale the power with the load Date: Tue, 9 Mar 2021 23:42:44 +0100 Message-Id: <20210309224244.27225-5-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210309224244.27225-1-daniel.lezcano@linaro.org> References: <20210309224244.27225-1-daniel.lezcano@linaro.org> Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Currently the power consumption is based on the current OPP power assuming the entire performance domain is fully loaded. That gives very gross power estimation and we can do much better by using the load to scale the power consumption. Use the utilization to normalize and scale the power usage over the max possible power. Tested on a rock960 with 2 big CPUS, the power consumption estimation conforms with the expected one. Before this change: ~$ ~/dhrystone -t 1 -l 10000& ~$ cat /sys/devices/virtual/powercap/dtpm/dtpm:0/dtpm:0:1/constraint_0_max_power_uw 2260000 After this change: ~$ ~/dhrystone -t 1 -l 10000& ~$ cat /sys/devices/virtual/powercap/dtpm/dtpm:0/dtpm:0:1/constraint_0_max_power_uw 1130000 ~$ ~/dhrystone -t 2 -l 10000& ~$ cat /sys/devices/virtual/powercap/dtpm/dtpm:0/dtpm:0:1/constraint_0_max_power_uw 2260000 Signed-off-by: Daniel Lezcano --- V2: - Replaced cpumask by em_span_cpus - Changed 'util' metrics variable types - Optimized utilization scaling power computation - Renamed parameter name for scale_pd_power_uw() --- drivers/powercap/dtpm_cpu.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) -- 2.17.1 Reported-by: kernel test robot diff --git a/drivers/powercap/dtpm_cpu.c b/drivers/powercap/dtpm_cpu.c index ac7f2e7e262f..6a1537e6da0d 100644 --- a/drivers/powercap/dtpm_cpu.c +++ b/drivers/powercap/dtpm_cpu.c @@ -68,27 +68,40 @@ static u64 set_pd_power_limit(struct dtpm *dtpm, u64 power_limit) return power_limit; } +static u64 scale_pd_power_uw(struct cpumask *pd_mask, u64 power) +{ + unsigned long max, sum_util = 0; + int cpu; + + max = arch_scale_cpu_capacity(cpu); + + for_each_cpu_and(cpu, pd_mask, cpu_online_mask) + sum_util += sched_cpu_util(cpu, max); + + return (power * ((sum_util << 10) / max)) >> 10; +} + static u64 get_pd_power_uw(struct dtpm *dtpm) { struct dtpm_cpu *dtpm_cpu = to_dtpm_cpu(dtpm); struct em_perf_domain *pd; - struct cpumask cpus; + struct cpumask *pd_mask; unsigned long freq; - int i, nr_cpus; + int i; pd = em_cpu_get(dtpm_cpu->cpu); - freq = cpufreq_quick_get(dtpm_cpu->cpu); - cpumask_and(&cpus, cpu_online_mask, to_cpumask(pd->cpus)); - nr_cpus = cpumask_weight(&cpus); + pd_mask = em_span_cpus(pd); + + freq = cpufreq_quick_get(dtpm_cpu->cpu); for (i = 0; i < pd->nr_perf_states; i++) { if (pd->table[i].frequency < freq) continue; - return pd->table[i].power * - MICROWATT_PER_MILLIWATT * nr_cpus; + return scale_pd_power_uw(pd_mask, pd->table[i].power * + MICROWATT_PER_MILLIWATT); } return 0;