From patchwork Wed Oct 18 16:25:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Guittot X-Patchwork-Id: 13427406 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6E87BCDB482 for ; Wed, 18 Oct 2023 16:26:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=BmiFyc05JMZgA2ftzxQDpxFd1AoQisdVwKvu7pW8RhQ=; b=F+rZTjVtv8Z0vq q5oApJOUjhvKXvSAJkEVWUOsxqf36OPopeBAxLy+ZfrTkLlWJ4pXgo738GXf4oB8i+qeVrvmFUk/2 FHj3UaCxHzZkIjpThXBbDtEfhVCcuHMeGoNSboMAj0FrXjsg9Ry55jAA31aMii4JS0hgf3NaTizi+ vkKXu3Grhja0BCcknSHpLleb4YxMU8z6c+l3+QfHSJw9Rf5GHJPWJksA3i/mZsLAa2RJQR/GzaNg0 e6/rfO6HdueQp3dy3uPuGLjnQrmIvuslzkzezKQd62TyqSO8bf2zTi3A1uDWsEzmdLScB8RjWi+2c QtoSW+p+iLducXilRhCw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qt9N5-00FBCS-2x; Wed, 18 Oct 2023 16:26:11 +0000 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qt9Mm-00FB1M-2v for linux-arm-kernel@lists.infradead.org; Wed, 18 Oct 2023 16:25:54 +0000 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-40776b1ff73so43955035e9.2 for ; Wed, 18 Oct 2023 09:25:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697646351; x=1698251151; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=AJGK5igWbxtubSqzoTGM9jKmH8+puDO7RkLEZPwgeRY=; b=M+yHlrzgIPR2XHAauDk5Smr4wk+AYAGDy1ZggLiOMTxJsUsgUCSNSRbFlt8WsUaKsd eGKzdnygfDHGlkzFHW9CGBmxvs0awUOA/LLSlrIT2fLZjpc7Ay4ncFuALljII96qprDx 44mx4O7t/rfmZ8ZyHHGp8alSO8UHkUl53v0x2rV3VBT1xQgKQABNQHjQmMGhyciWvXOt WTaxCyouPLMiOAN9lkJsL5a2ftXiov9hpeq363LRByLQnhE++b/UA4ler0n6vuxPR12c b0FKc8Boe59lWKJVlOQLPhtVNpRW8B67TVSFmMZz+rocdpDw2PAPCDlmTqpIxlk2e9yv yZDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697646351; x=1698251151; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AJGK5igWbxtubSqzoTGM9jKmH8+puDO7RkLEZPwgeRY=; b=Qs6t3CynHTOqimzOoD+u0Nk2USeptUd8zZN1TDLBddJuNboLK+/h7nRh0fRVucAw0i e2G8dUnY5eaMmHzbOAkhpzJ3yhwkA4ch5VEBV5mqH/3BPPxcXLaPuEKnlX/mQX6kas0z uNBWzDLv4tBmx/WhQB7ysTtIoPMAoBElMCTRlOHA5wYcIOFGrYudFDjR3V6G5YY2aFji 4eS6+YRPnLIzAUDujIBYygBdUjqb4NDHsrSlzk3xCK4S8xBkOxkuKMHzsoE8dHIuPAXb DuZPcB9N6MH/fQFa0o9MdrLJw0mbyYoyO5uehsEOvQtd7lVmFxgURHevws08TouFQgad YWxA== X-Gm-Message-State: AOJu0YwBpkUh+Jpa9nxKUoWcHPm7ytZ6nZnuf+4Qr6/tWsyisdfn0ntd +OAoqO6ShoyRgDqEdA2LlDu+yQ== X-Google-Smtp-Source: AGHT+IHYlQlllSzGIl49fmmvqkbqBsfX3H+TIccAXRAZTQ4ajZmIPAej3ymW2wvezI36j85ulHfqBg== X-Received: by 2002:a05:600c:154e:b0:404:757e:c5ba with SMTP id f14-20020a05600c154e00b00404757ec5bamr4337407wmg.26.1697646351671; Wed, 18 Oct 2023 09:25:51 -0700 (PDT) Received: from vingu-book.. ([2a01:e0a:f:6020:fcf4:9d83:8d0d:39aa]) by smtp.gmail.com with ESMTPSA id q12-20020a05600c2e4c00b0040648217f4fsm2033503wmf.39.2023.10.18.09.25.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 09:25:50 -0700 (PDT) From: Vincent Guittot To: linux@armlinux.org.uk, catalin.marinas@arm.com, will@kernel.org, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, sudeep.holla@arm.com, gregkh@linuxfoundation.org, rafael@kernel.org, mingo@redhat.com, peterz@infradead.org, juri.lelli@redhat.com, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, mgorman@suse.de, bristot@redhat.com, vschneid@redhat.com, viresh.kumar@linaro.org, lenb@kernel.org, robert.moore@intel.com, lukasz.luba@arm.com, ionela.voinescu@arm.com, pierre.gondois@arm.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, linux-pm@vger.kernel.org, linux-acpi@vger.kernel.org, acpica-devel@lists.linuxfoundation.org Cc: conor.dooley@microchip.com, suagrfillet@gmail.com, ajones@ventanamicro.com, lftan@kernel.org, Vincent Guittot Subject: [PATCH v3 4/6] energy_model: use a fixed reference frequency Date: Wed, 18 Oct 2023 18:25:38 +0200 Message-Id: <20231018162540.667646-5-vincent.guittot@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231018162540.667646-1-vincent.guittot@linaro.org> References: <20231018162540.667646-1-vincent.guittot@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231018_092552_968609_0BEC5EBC X-CRM114-Status: GOOD ( 15.08 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The last item of a performance domain is not always the performance point that has been used to compute CPU's capacity. This can lead to different target frequency compared with other part of the system like schedutil and would result in wrong energy estimation. A new arch_scale_freq_ref() is available to return a fixed and coherent frequency reference that can be used when computing the CPU's frequency for an level of utilization. Use this function to get this reference frequency. Energy model is never used without defining arch_scale_freq_ref() but can be compiled. Define a default arch_scale_freq_ref() returning 0 in such case. Signed-off-by: Vincent Guittot Reviewed-by: Lukasz Luba Tested-by: Lukasz Luba --- include/linux/energy_model.h | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/include/linux/energy_model.h b/include/linux/energy_model.h index b9caa01dfac4..1b0c8490d4bd 100644 --- a/include/linux/energy_model.h +++ b/include/linux/energy_model.h @@ -204,6 +204,14 @@ struct em_perf_state *em_pd_get_efficient_state(struct em_perf_domain *pd, return ps; } +#ifndef arch_scale_freq_ref +static __always_inline +unsigned int arch_scale_freq_ref(int cpu) +{ + return 0; +} +#endif + /** * em_cpu_energy() - Estimates the energy consumed by the CPUs of a * performance domain @@ -224,7 +232,7 @@ static inline unsigned long em_cpu_energy(struct em_perf_domain *pd, unsigned long max_util, unsigned long sum_util, unsigned long allowed_cpu_cap) { - unsigned long freq, scale_cpu; + unsigned long freq, ref_freq, scale_cpu; struct em_perf_state *ps; int cpu; @@ -241,11 +249,11 @@ static inline unsigned long em_cpu_energy(struct em_perf_domain *pd, */ cpu = cpumask_first(to_cpumask(pd->cpus)); scale_cpu = arch_scale_cpu_capacity(cpu); - ps = &pd->table[pd->nr_perf_states - 1]; + ref_freq = arch_scale_freq_ref(cpu); max_util = map_util_perf(max_util); max_util = min(max_util, allowed_cpu_cap); - freq = map_util_freq(max_util, ps->frequency, scale_cpu); + freq = map_util_freq(max_util, ref_freq, scale_cpu); /* * Find the lowest performance state of the Energy Model above the