From patchwork Tue Jul 14 06:36:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 235505 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp3477085ilg; Mon, 13 Jul 2020 23:37:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzsTo4iKToncEX4xLz98gD2YAr1MnjuBdClSlm0VvceZILZ7s9PkctjVDrhb5aIxDf3hl7G X-Received: by 2002:a17:906:dce:: with SMTP id p14mr3063366eji.442.1594708628662; Mon, 13 Jul 2020 23:37:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594708628; cv=none; d=google.com; s=arc-20160816; b=fBQFqnMNPsbhVLn4dESyplwMytEpUHPGGlm3nVbYqntOTJPeuavELJcL1TCWS4/c9p v2QPaV2M7/kvdK7xwAnpH+i+pJZIQgGVBwwHVTXBZZLuiRwzYOErWXSmVpuKW0FFnVNg INYT1fL4E6ALUMEPez9XNX1dspUJTrjSKhHH9F24ywW7VlLCzqdrKNgZk5Kl0XQt+g7U ZD/DLaZkGo1vpAKvAnaFLHMwFZpMeW4j78yowL/5y+1GJHGgP8WUFHIcRPKHtDkrl5s4 kfak40yVPYcRL3T/Mbrso07AaiIz3/b+U6QTGQXV+DJS5/zGatLnHaXy8E90jgkQrWhl 4bTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=vW6KQNy5+oCCRnnC1Q8VPuviXyfCEPdbUReZkc1RE18=; b=OK+sfKMie+Kj4zGUfKP+dF/YCZP8FoIM4aQPEU59pR2HEN1YeMq0BSDQgfv3V437I+ Q1o+5DSrQMoSchmqd+SSsC6YfA11TFMX2Jlt0skkKBmDFREb0KhS11PQCc1rJo8YPckd sBemCjTUMvtIEg/zRx/pQ9bl2+nZJn46OXRdXA/eyLCz8HyUkCAPBQK6DTiLGLQReZD7 jyt3lmkfj6c57rsDq7CLvaKSwxm4n6PeHEIA5TScucM55PVEASVBSzFQLF7iv1PPdjtp 4CxwlUSRJPNIc2ERboZQ/eQq04+drPchXuWVznOzj5RX3riNz4syi1JBPMKjXcmF8zwA oLaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sLBXfe3t; 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 c102si12582697edf.216.2020.07.13.23.37.08; Mon, 13 Jul 2020 23:37:08 -0700 (PDT) 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=sLBXfe3t; 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 S1727055AbgGNGhH (ORCPT + 10 others); Tue, 14 Jul 2020 02:37:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37382 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727104AbgGNGhH (ORCPT ); Tue, 14 Jul 2020 02:37:07 -0400 Received: from mail-pj1-x1042.google.com (mail-pj1-x1042.google.com [IPv6:2607:f8b0:4864:20::1042]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 08F86C061755 for ; Mon, 13 Jul 2020 23:37:07 -0700 (PDT) Received: by mail-pj1-x1042.google.com with SMTP id ls15so1109117pjb.1 for ; Mon, 13 Jul 2020 23:37:07 -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 :mime-version:content-transfer-encoding; bh=vW6KQNy5+oCCRnnC1Q8VPuviXyfCEPdbUReZkc1RE18=; b=sLBXfe3ttAMfTz75e+ERY2AsS9FIU/c552V9ylpEOSE595ixwhhjeZhxlfNesV9IpO zd1NGnpeih9vKO0Ey8fZYmRTyORhlacRU/MgWpoRfzpGqYElumOD7eSFPh59pYLuGEK3 gZfMOMDdFRSyiieGMIN3sCqenjPsCuZZlpENJSzJxTEJ705jrtNUjYGrjdL1dUxsoJCA 0tprF+BFztmbNPUljlXaGezagsiaXi+fFroI3A2f29TfxwEBXXZ5C7DnyOj2avvbU1qY ALmw1/oaZbDi0TwM+vg/OfRM5A9Lfck0pVdeneS1Z7q4cdRwt5K+A2Uxz2fnaJ8OWLKX lVUA== 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:mime-version:content-transfer-encoding; bh=vW6KQNy5+oCCRnnC1Q8VPuviXyfCEPdbUReZkc1RE18=; b=nguptquUtxm4v85ABrSFvRW54NJ5N/F65NdeulrF67Fx7pwoeruMIKhuIevgHgB1WT UZ1pt5yc9NwslR4VMsf2DNZQ+V2A+pBx0gJwcgEF8MVOvHdO534I+IQIsDCIwRolkO/I dmNm9SjwRV+9p34R12akDT9U/V4zBwQzuG/qdbWZ86zJAoLhNlhjmDL1zE0wHYL9/eA9 DY/Q9uHnsVYOKSplYiil+2RhQsvGkRRWtSgNFmwhfUvbaD2MsPTDGfa2O9cwHhjqAz+J Jd6oEjE+oB9x8xOdQ+9K+fRhVOyadHbFlLMIbl0PYb7IzMi6Sh5l3a/KYicRPZRmUCaq fEiQ== X-Gm-Message-State: AOAM531IRiLE8NUJoElUpGQ1lcwp1sTwa3sFAImj3DUXNvHL59sPE4mC Gp9G+Hkb9+pMxwdN6itKEXHRcA== X-Received: by 2002:a17:902:e901:: with SMTP id k1mr2847764pld.130.1594708626463; Mon, 13 Jul 2020 23:37:06 -0700 (PDT) Received: from localhost ([122.172.34.142]) by smtp.gmail.com with ESMTPSA id hg13sm1331299pjb.21.2020.07.13.23.37.05 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Jul 2020 23:37:05 -0700 (PDT) From: Viresh Kumar To: Ingo Molnar , Peter Zijlstra , Vincent Guittot , Zhang Rui , Daniel Lezcano , Amit Daniel Kachhap , Viresh Kumar , Javi Merino , Amit Kucheria Cc: linux-kernel@vger.kernel.org, Quentin Perret , Rafael Wysocki , linux-pm@vger.kernel.org Subject: [PATCH 2/2] thermal: cpufreq_cooling: Reuse effective_cpu_util() Date: Tue, 14 Jul 2020 12:06:53 +0530 Message-Id: X-Mailer: git-send-email 2.25.0.rc1.19.g042ed3e048af In-Reply-To: References: MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Several parts of the kernel are already using the effective CPU utilization to get the current load on the CPU, do the same here instead of depending on the idle time of the CPU, which isn't that accurate comparatively. Note that, this (and CPU frequency scaling in general) doesn't work that well with idle injection as that is done from rt threads and is counted as load while it tries to do quite the opposite. That should be solved separately though. Signed-off-by: Viresh Kumar --- drivers/thermal/cpufreq_cooling.c | 65 +++++++------------------------ 1 file changed, 15 insertions(+), 50 deletions(-) -- 2.25.0.rc1.19.g042ed3e048af diff --git a/drivers/thermal/cpufreq_cooling.c b/drivers/thermal/cpufreq_cooling.c index 6c0e1b053126..74340b2b0da7 100644 --- a/drivers/thermal/cpufreq_cooling.c +++ b/drivers/thermal/cpufreq_cooling.c @@ -23,6 +23,7 @@ #include #include +#include "../../kernel/sched/sched.h" /* * Cooling state <-> CPUFreq frequency @@ -38,16 +39,6 @@ * ... */ -/** - * struct time_in_idle - Idle time stats - * @time: previous reading of the absolute time that this cpu was idle - * @timestamp: wall time of the last invocation of get_cpu_idle_time_us() - */ -struct time_in_idle { - u64 time; - u64 timestamp; -}; - /** * struct cpufreq_cooling_device - data for cooling device with cpufreq * @id: unique integer value corresponding to each cpufreq_cooling_device @@ -62,7 +53,6 @@ struct time_in_idle { * registered cooling device. * @policy: cpufreq policy. * @node: list_head to link all cpufreq_cooling_device together. - * @idle_time: idle time stats * @qos_req: PM QoS contraint to apply * * This structure is required for keeping information of each registered @@ -76,7 +66,6 @@ struct cpufreq_cooling_device { struct em_perf_domain *em; struct cpufreq_policy *policy; struct list_head node; - struct time_in_idle *idle_time; struct freq_qos_request qos_req; }; @@ -132,34 +121,21 @@ static u32 cpu_power_to_freq(struct cpufreq_cooling_device *cpufreq_cdev, } /** - * get_load() - get load for a cpu since last updated + * get_load() - get current load for a cpu * @cpufreq_cdev: &struct cpufreq_cooling_device for this cpu * @cpu: cpu number - * @cpu_idx: index of the cpu in time_in_idle* + * @cpu_idx: index of the cpu * - * Return: The average load of cpu @cpu in percentage since this - * function was last called. + * Return: The current load of cpu @cpu in percentage. */ static u32 get_load(struct cpufreq_cooling_device *cpufreq_cdev, int cpu, int cpu_idx) { - u32 load; - u64 now, now_idle, delta_time, delta_idle; - struct time_in_idle *idle_time = &cpufreq_cdev->idle_time[cpu_idx]; - - now_idle = get_cpu_idle_time(cpu, &now, 0); - delta_idle = now_idle - idle_time->time; - delta_time = now - idle_time->timestamp; + unsigned long util = cpu_util_cfs(cpu_rq(cpu)); + unsigned long max = arch_scale_cpu_capacity(cpu); - if (delta_time <= delta_idle) - load = 0; - else - load = div64_u64(100 * (delta_time - delta_idle), delta_time); - - idle_time->time = now_idle; - idle_time->timestamp = now; - - return load; + util = effective_cpu_util(cpu, util, max, ENERGY_UTIL, NULL); + return (util * 100) / max; } /** @@ -192,13 +168,12 @@ static u32 get_dynamic_power(struct cpufreq_cooling_device *cpufreq_cdev, * Instead, we calculate the current power on the assumption that the * immediate future will look like the immediate past. * - * We use the current frequency and the average load since this - * function was last called. In reality, there could have been - * multiple opps since this function was last called and that affects - * the load calculation. While it's not perfectly accurate, this - * simplification is good enough and works. REVISIT this, as more - * complex code may be needed if experiments show that it's not - * accurate enough. + * We use the current frequency and the current load. In reality, + * there could have been multiple opps since this function was last + * called and that affects the load calculation. While it's not + * perfectly accurate, this simplification is good enough and works. + * REVISIT this, as more complex code may be needed if experiments show + * that it's not accurate enough. * * Return: 0 on success, -E* if getting the static power failed. */ @@ -523,13 +498,6 @@ __cpufreq_cooling_register(struct device_node *np, cpufreq_cdev->policy = policy; num_cpus = cpumask_weight(policy->related_cpus); - cpufreq_cdev->idle_time = kcalloc(num_cpus, - sizeof(*cpufreq_cdev->idle_time), - GFP_KERNEL); - if (!cpufreq_cdev->idle_time) { - cdev = ERR_PTR(-ENOMEM); - goto free_cdev; - } /* max_level is an index, not a counter */ cpufreq_cdev->max_level = i - 1; @@ -537,7 +505,7 @@ __cpufreq_cooling_register(struct device_node *np, ret = ida_simple_get(&cpufreq_ida, 0, 0, GFP_KERNEL); if (ret < 0) { cdev = ERR_PTR(ret); - goto free_idle_time; + goto free_cdev; } cpufreq_cdev->id = ret; @@ -586,8 +554,6 @@ __cpufreq_cooling_register(struct device_node *np, freq_qos_remove_request(&cpufreq_cdev->qos_req); remove_ida: ida_simple_remove(&cpufreq_ida, cpufreq_cdev->id); -free_idle_time: - kfree(cpufreq_cdev->idle_time); free_cdev: kfree(cpufreq_cdev); return cdev; @@ -680,7 +646,6 @@ void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev) thermal_cooling_device_unregister(cdev); freq_qos_remove_request(&cpufreq_cdev->qos_req); ida_simple_remove(&cpufreq_ida, cpufreq_cdev->id); - kfree(cpufreq_cdev->idle_time); kfree(cpufreq_cdev); } EXPORT_SYMBOL_GPL(cpufreq_cooling_unregister);