From patchwork Fri Jan 8 11:16:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 12006371 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3874AC433E0 for ; Fri, 8 Jan 2021 11:19:35 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CE2B6235FC for ; Fri, 8 Jan 2021 11:19:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CE2B6235FC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=cVTl9GtEi9z+LwyEE4bZSPxE7ztmpVF49aaPwvq4XHw=; b=02ApgrZJQ1m4N+E03DQ4+d54k TSccqIGtnhTWwm+CgM6c3khEJmCgLfWM25XonBJ6lPVrfi5XmqpjADEUOT7zFNhX9lTYBkD/x9YVt jwpj3ovqygsaaUBgeKRA8e7JQGHfbLXcZrntA00+Rdt0kySlC+CgmcvITyRWEoy8Prfpm6S9CX44v wF3WgB+/W8haXTdxT3wwTZZaHsqbc0Mg97oNCCnNcBoGq8JLRn6OnctR6PaiL68lcTxVlZUbMO+h9 zZhDTCY7ZkDfwfnb14xbjh1LTzI4WvRh25X0GeiUWfhqCdSOrkvlWNMG3+3O7rZVjS7iAorWPAWRd v0nE0ncSw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kxpm6-0003Mr-5e; Fri, 08 Jan 2021 11:17:46 +0000 Received: from mail-pj1-x102c.google.com ([2607:f8b0:4864:20::102c]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kxplO-0003KR-WC for linux-arm-kernel@lists.infradead.org; Fri, 08 Jan 2021 11:17:04 +0000 Received: by mail-pj1-x102c.google.com with SMTP id l23so5980215pjg.1 for ; Fri, 08 Jan 2021 03:17:02 -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 :mime-version:content-transfer-encoding; bh=4nUNli654LtMfzP23uxOB/jn47gcZbp/cG1xs2NHv6k=; b=mNKEHbJlA6HRZVBSDNcDnB25syiwYDVv+zutOUNgGEzwmw25OpYs+JYD9XcNnhxOsm T02YJZ+7xtWfMLv+WicnpvPIssv9/SGPr9I77QkqRSzieEkp342eRkoHBv/Ro193j8Uz JojtJLAohak7pHxe6CItU8KS5CY3hLgQU1fd0fElqaVSTe7RaI+gg48gQV6dEgujDPre c/qeu3DmrEP73b2xBIG5Q50gnDE/e/W0Allh+irgKCBtm/8c/tdDjdO41pwt681dRiSd e1kGnQTbOJnj7pxulEWtDyFpOjEVXhUDr5IT+QktCKYf6nfrcJ5IS9DFdm6azGu+JxxH LOgw== 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=4nUNli654LtMfzP23uxOB/jn47gcZbp/cG1xs2NHv6k=; b=UJEBbMa46oQ5/65U7YX9q0Yt5ljEwp2PA+8SjGbJGZeXTIeICKAom5iI1aMWrytxtq DYcJPxK27ElV/SAks6A/7JJJKJBsVXl8BT5OVqflWbollT5HCaPJ2kkSm6ZulLeTBlBr /z5Sv3MAq1iHbBZuj2bddWmzsbG5iwaDh4gZTKFhsgOB0dKX7YDKbYJ7My0EWbQ7zLxe RBKZz7/9egLW8w8ZQlrMVpJC//Pz8FsCaZig3njFJpZ89feqR5FtGZGx47cjO44TPere FhuP9JckLf3ZQghfTdT1fqveUGC5+mH6XLSAso9ogfyxAgUNYqzrXjGX40lblAYtgOHv sWiA== X-Gm-Message-State: AOAM531WHP3Rd2/kcqlGKGOR+42C+5f4b5UCtiMqZgZySWsUs+tbyOJ5 AOQnSZXaue8R/LpOfGv3Q8McWQ== X-Google-Smtp-Source: ABdhPJwA52onY6PEwKGeVt3wn3g0aGel8Nb0QidDMBVRFfrnnId1jGiQ9xvq4jyACWlBAvymi13kRQ== X-Received: by 2002:a17:90b:1249:: with SMTP id gx9mr3263125pjb.146.1610104620576; Fri, 08 Jan 2021 03:17:00 -0800 (PST) Received: from localhost ([122.172.20.109]) by smtp.gmail.com with ESMTPSA id g202sm8383292pfb.196.2021.01.08.03.16.59 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Jan 2021 03:16:59 -0800 (PST) From: Viresh Kumar To: Catalin Marinas , Will Deacon Subject: [PATCH V4 1/3] arm64: topology: Avoid the have_policy check Date: Fri, 8 Jan 2021 16:46:51 +0530 Message-Id: X-Mailer: git-send-email 2.25.0.rc1.19.g042ed3e048af In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210108_061703_188793_454D3819 X-CRM114-Status: GOOD ( 19.71 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Viresh Kumar , Ionela Voinescu , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Vincent Guittot Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Every time I have stumbled upon this routine, I get confused with the way 'have_policy' is used and I have to dig in to understand why is it so. Here is an attempt to make it easier to understand, and hopefully it is an improvement. The 'have_policy' check was just an optimization to avoid writing to amu_fie_cpus in case we don't have to, but that optimization itself is creating more confusion than the real work. Lets just do that if all the CPUs support AMUs. It is much cleaner that way. Reviewed-by: Ionela Voinescu Signed-off-by: Viresh Kumar --- arch/arm64/kernel/topology.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/arch/arm64/kernel/topology.c b/arch/arm64/kernel/topology.c index f6faa697e83e..ebadc73449f9 100644 --- a/arch/arm64/kernel/topology.c +++ b/arch/arm64/kernel/topology.c @@ -199,14 +199,14 @@ static int freq_inv_set_max_ratio(int cpu, u64 max_rate, u64 ref_rate) return 0; } -static inline bool +static inline void enable_policy_freq_counters(int cpu, cpumask_var_t valid_cpus) { struct cpufreq_policy *policy = cpufreq_cpu_get(cpu); if (!policy) { pr_debug("CPU%d: No cpufreq policy found.\n", cpu); - return false; + return; } if (cpumask_subset(policy->related_cpus, valid_cpus)) @@ -214,8 +214,6 @@ enable_policy_freq_counters(int cpu, cpumask_var_t valid_cpus) amu_fie_cpus); cpufreq_cpu_put(policy); - - return true; } static DEFINE_STATIC_KEY_FALSE(amu_fie_key); @@ -225,7 +223,6 @@ static int __init init_amu_fie(void) { bool invariance_status = topology_scale_freq_invariant(); cpumask_var_t valid_cpus; - bool have_policy = false; int ret = 0; int cpu; @@ -245,17 +242,12 @@ static int __init init_amu_fie(void) continue; cpumask_set_cpu(cpu, valid_cpus); - have_policy |= enable_policy_freq_counters(cpu, valid_cpus); + enable_policy_freq_counters(cpu, valid_cpus); } - /* - * If we are not restricted by cpufreq policies, we only enable - * the use of the AMU feature for FIE if all CPUs support AMU. - * Otherwise, enable_policy_freq_counters has already enabled - * policy cpus. - */ - if (!have_policy && cpumask_equal(valid_cpus, cpu_present_mask)) - cpumask_or(amu_fie_cpus, amu_fie_cpus, valid_cpus); + /* Overwrite amu_fie_cpus if all CPUs support AMU */ + if (cpumask_equal(valid_cpus, cpu_present_mask)) + cpumask_copy(amu_fie_cpus, cpu_present_mask); if (!cpumask_empty(amu_fie_cpus)) { pr_info("CPUs[%*pbl]: counters will be used for FIE.", From patchwork Fri Jan 8 11:16:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 12006373 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 97C79C433DB for ; Fri, 8 Jan 2021 11:20:07 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 21FDE235FC for ; Fri, 8 Jan 2021 11:20:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 21FDE235FC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=2ZbLPOIDKUxGJOlf008/2d/ouB254WN6O9MxAEE8I4M=; b=ohAu4O6V/qGKvT7MUzzM5mJut ku4SczkftGsTeUxv4WevtDQmE31mRzhKiqjH4voDFwvpMpG2gu5E93BeZz8B+X+p5g6hRpFEiA1vI sCX4fyliRgn1Kn3hFem5wgyMCb95v9qdDLf4w95totl17k9TG3gPtBaGX7dwZ2Bfgg6jWmwGZm8VD J4oeR6wnVuFy9rGRQuhONCildW0obJ7EmhOe1VrpOTdUe0TrVlsKRJvflACgvvi/WnjQU4som9dIW 1MZmFiEW9acM/hxoey4fhn3DvTplBejG1TV6/kJ3HCjWOKZVWeEUViPUSaNJdQGTPMj4RtAfqpslC ZMB189bwA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kxpmV-0003PS-5N; Fri, 08 Jan 2021 11:18:11 +0000 Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kxplS-0003Kq-5V for linux-arm-kernel@lists.infradead.org; Fri, 08 Jan 2021 11:17:07 +0000 Received: by mail-pj1-x1033.google.com with SMTP id j13so5972829pjz.3 for ; Fri, 08 Jan 2021 03:17:05 -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 :mime-version:content-transfer-encoding; bh=qCcDgh0i+zZIwuGlOkZqwb7cDfW6szxmER5g+Fox0OI=; b=jQtweiu0EQCwa0n5N0MACj6E5NeMoogNmlyAu8mr4PeTcuFEzgGnHmLImfS/GtjYTG FpOrFJ2Dl+r78QU2DSfjYnFG8cuAUtLiGlqjZ6FUCCOsSSrPhJD1dI1uFw93vcrPRaU7 PjTdx8Iqu2Kolp+hnogqb/dVm58fIwSNB+7ps/29ZhPYOg+AUF1H1RAo01qgnDLOUcWq W8YZIFyOwpBFCXHdTop6lUCmVfzy/Y+4Td/ouCoQQzqvM84aXXMfFSOwt+uDqCDmAWrT HLoPLV4h58tZZw0YeIm1EZ2FrYlb3X+CQt9cBjvZMpBHd4ohsgPvYMALxpiqz4TqWCvS K0wQ== 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=qCcDgh0i+zZIwuGlOkZqwb7cDfW6szxmER5g+Fox0OI=; b=IzWEzkeRegfAZ8/ycKXr1ucCupqgIG7Swp2K/+6fnh7Z9ElHRTd6CUh43uteRTzizD eXp5ujcZQisfYAT1F4rKPVlNIvvlPm+WY22RooV79WDHrGwuHZnno/32FJ3sTMu/qFqL K3E3labOfHRsgOcah6hmU3n85aGKJKCgMrdBBSeg8M2TYadhqn6pAvo9GQrjMSl+WV5P FznOX4C6dQB6a52QBSuEtW3ny8eQha2dg/Fu1FIEwlXfvv4y9tCKlmnaHVvRrPU/yp8e RML8gKKx8quueDAoXanIpOlsOe0y5Ii/7hJRUx04y1tI/ICJQj2/e/zZ/cmJnRJlhf9W 8wFQ== X-Gm-Message-State: AOAM531gE6Ax4cdg1EOLhJ+CEg1o3qiORx7LIJahck04xtVQliZ7HHIZ YZRcn8VtcijCq459APi3LMue2Q== X-Google-Smtp-Source: ABdhPJws2pZSQnc5mQxgob96ELDVgdGdbSDdBRBZPtFpc9ANSIcXIXOQymUYsfknlPJ/K7etNjbc1Q== X-Received: by 2002:a17:902:aa07:b029:dc:240a:8a71 with SMTP id be7-20020a170902aa07b02900dc240a8a71mr3316203plb.32.1610104623938; Fri, 08 Jan 2021 03:17:03 -0800 (PST) Received: from localhost ([122.172.20.109]) by smtp.gmail.com with ESMTPSA id t1sm4791974pju.43.2021.01.08.03.17.02 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Jan 2021 03:17:03 -0800 (PST) From: Viresh Kumar To: Catalin Marinas , Will Deacon Subject: [PATCH V4 2/3] arm64: topology: Reorder init_amu_fie() a bit Date: Fri, 8 Jan 2021 16:46:52 +0530 Message-Id: X-Mailer: git-send-email 2.25.0.rc1.19.g042ed3e048af In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210108_061706_844635_318DF264 X-CRM114-Status: GOOD ( 17.27 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Viresh Kumar , Ionela Voinescu , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Vincent Guittot Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This patch does a couple of optimizations in init_amu_fie(), like early exits from paths where we don't need to continue any further, avoid the enable/disable dance, moving the calls to topology_scale_freq_invariant() just when we need them, instead of at the top of the routine, and avoiding calling it for the third time. Reviewed-by: Ionela Voinescu Signed-off-by: Viresh Kumar --- arch/arm64/kernel/topology.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/arch/arm64/kernel/topology.c b/arch/arm64/kernel/topology.c index ebadc73449f9..57267d694495 100644 --- a/arch/arm64/kernel/topology.c +++ b/arch/arm64/kernel/topology.c @@ -221,8 +221,8 @@ static DEFINE_STATIC_KEY_FALSE(amu_fie_key); static int __init init_amu_fie(void) { - bool invariance_status = topology_scale_freq_invariant(); cpumask_var_t valid_cpus; + bool invariant; int ret = 0; int cpu; @@ -249,18 +249,19 @@ static int __init init_amu_fie(void) if (cpumask_equal(valid_cpus, cpu_present_mask)) cpumask_copy(amu_fie_cpus, cpu_present_mask); - if (!cpumask_empty(amu_fie_cpus)) { - pr_info("CPUs[%*pbl]: counters will be used for FIE.", - cpumask_pr_args(amu_fie_cpus)); - static_branch_enable(&amu_fie_key); - } + if (cpumask_empty(amu_fie_cpus)) + goto free_valid_mask; - /* - * If the system is not fully invariant after AMU init, disable - * partial use of counters for frequency invariance. - */ - if (!topology_scale_freq_invariant()) - static_branch_disable(&amu_fie_key); + invariant = topology_scale_freq_invariant(); + + /* We aren't fully invariant yet */ + if (!invariant && !cpumask_equal(amu_fie_cpus, cpu_present_mask)) + goto free_valid_mask; + + static_branch_enable(&amu_fie_key); + + pr_info("CPUs[%*pbl]: counters will be used for FIE.", + cpumask_pr_args(amu_fie_cpus)); /* * Task scheduler behavior depends on frequency invariance support, @@ -268,7 +269,7 @@ static int __init init_amu_fie(void) * a result of counter initialisation and use, retrigger the build of * scheduling domains to ensure the information is propagated properly. */ - if (invariance_status != topology_scale_freq_invariant()) + if (!invariant) rebuild_sched_domains_energy(); free_valid_mask: From patchwork Fri Jan 8 11:16:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 12006375 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7C662C433E0 for ; Fri, 8 Jan 2021 11:20:39 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1EBB0235FC for ; Fri, 8 Jan 2021 11:20:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1EBB0235FC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=tCDnEmzY/Sxl5KQFecpBJy6MViVu4MUAHsQwOB/zWVM=; b=HJDR7QhfNSTh5mWzBvedUjbU8 Q16NBTzpImy+5LYeLoN/e8k1bgv259evBPyZ8eqVTCUPyxJ+C4tpyJ7tInppz5pcnQIqiVCUXEB1d GjHCcOCkBRPjllJIYGdlWg4fM85pODKyStVcgmlAHy0vd4Da6RslRwUXVyEuMEeOAsweYtgMis6kh A35e0YKG+VRp2QDf6ANij5la+NuoqNKxRjZhaWIq/ZOKQpbUn00dqJ8P23xtb3x16iruqZ5Cnbawb 4x3jAyj7dtCZpflFk+SjfEUOMRFvO+u11vNhACQVY8unc5L65tZlGDoo/2+dDmUIPdEi+d3S0LkRw RjpphdQpw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kxpmu-0003Ti-Jc; Fri, 08 Jan 2021 11:18:36 +0000 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kxplV-0003L7-AO for linux-arm-kernel@lists.infradead.org; Fri, 08 Jan 2021 11:17:10 +0000 Received: by mail-pl1-x630.google.com with SMTP id s15so5483089plr.9 for ; Fri, 08 Jan 2021 03:17:08 -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 :mime-version:content-transfer-encoding; bh=aQSpo9wPGFWd6ND2Dx/PvXRhV79s0OllfFs8qsmLEds=; b=T7BQnDakWGV4h7fCNx86iyaVp7/Nq3EbsmJDTpTr3xWVSsIcdZiNSE01n3qylOeHub AtyoC888q1UKe1Z738WG3YS9o3fDSvTRyN0Q8R5VSYJ0ZgB8P0GAnUFqlTseDprThW6B CKVz3/qs/S6oZ2GwQ2ldVYPLF7pedlyTNBpNsCumGNJM0MFguGYV/7KMVWCXk7upv6PU MfRZhIFUXUex+wNPtMs77hH1CHb99iPcHlZ2b1g7aETXjttUgv2EHHIpp0w3ZvLVaHBd hnnEt+F0E8WpXaxMHemtYGJ3k2he8sxuBOQ58EIDvEw46Z7pAWRH/VVMcTFzLL0FEX/R 7snw== 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=aQSpo9wPGFWd6ND2Dx/PvXRhV79s0OllfFs8qsmLEds=; b=uK6CCc54K8eSQ+WevCke9CrduMtqxD0qJrgrJeIS2X8eNUmBOue4n2FIFxvpO66i7H g1dHVhaU1KJH0/2Qooxl5zKZGegw002dv/FxTdIawjLY77yUKjUKpAki/FQ9+FyoXkFF /4Xgh7M+zbURCq/mwroqkV5u8uADFvLel8mblhMwaw1HwxVtgRqak+4KTpay9NM0/hav k9JHv64Vr+X5ZP+bms7ifSs4YUY1OPV3GvrI/B522QVPQxomBevx8Uv7+pk7dVt7zQC/ 04QhPfszfCpLkor3T/09fk3/b9pVzj1uQftrPTjEBTjycnnpVsE0MFhwpTGMYGQ32udk STaA== X-Gm-Message-State: AOAM531GJI+lcsas8PsHPWfVIGw3jqOULC8Vt891LPHocNfJPgdlaTvo z9JyuW9/sg+mbJhlgBsQhvxoWV9cYcctiw== X-Google-Smtp-Source: ABdhPJwUtt8daot/gexutLZfaIc49DNONUydWkf19B4RHEwJTZIFLz91Y60h4LEYWN6XAzdnk2nSfw== X-Received: by 2002:a17:902:bd85:b029:dc:1875:b7d7 with SMTP id q5-20020a170902bd85b02900dc1875b7d7mr3304252pls.0.1610104626929; Fri, 08 Jan 2021 03:17:06 -0800 (PST) Received: from localhost ([122.172.20.109]) by smtp.gmail.com with ESMTPSA id c24sm10212678pgi.71.2021.01.08.03.17.06 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Jan 2021 03:17:06 -0800 (PST) From: Viresh Kumar To: Catalin Marinas , Will Deacon Subject: [PATCH V4 3/3] arm64: topology: Make AMUs work with modular cpufreq drivers Date: Fri, 8 Jan 2021 16:46:53 +0530 Message-Id: <89c1921334443e133c9c8791b4693607d65ed9f5.1610104461.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.25.0.rc1.19.g042ed3e048af In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210108_061709_450311_1A4AC99C X-CRM114-Status: GOOD ( 25.86 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Viresh Kumar , Ionela Voinescu , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Vincent Guittot Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The AMU counters won't get used today if the cpufreq driver is built as a module as the amu core requires everything to be ready by late init. Fix that properly by registering for cpufreq policy notifier. Note that the amu core don't have any cpufreq dependency after the first time CPUFREQ_CREATE_POLICY notifier is called for all the CPUs. And so we don't need to do anything on the CPUFREQ_REMOVE_POLICY notifier. And for the same reason we check if the CPUs are already parsed in the beginning of amu_fie_setup() and skip if that is true. Alternatively we can shoot a work from there to unregister the notifier instead, but that seemed too much instead of this simple check. While at it, convert the print message to pr_debug instead of pr_info. Signed-off-by: Viresh Kumar Reviewed-by: Ionela Voinescu --- arch/arm64/kernel/topology.c | 92 +++++++++++++++++++----------------- 1 file changed, 48 insertions(+), 44 deletions(-) diff --git a/arch/arm64/kernel/topology.c b/arch/arm64/kernel/topology.c index 57267d694495..e08a4126453a 100644 --- a/arch/arm64/kernel/topology.c +++ b/arch/arm64/kernel/topology.c @@ -199,69 +199,38 @@ static int freq_inv_set_max_ratio(int cpu, u64 max_rate, u64 ref_rate) return 0; } -static inline void -enable_policy_freq_counters(int cpu, cpumask_var_t valid_cpus) -{ - struct cpufreq_policy *policy = cpufreq_cpu_get(cpu); - - if (!policy) { - pr_debug("CPU%d: No cpufreq policy found.\n", cpu); - return; - } - - if (cpumask_subset(policy->related_cpus, valid_cpus)) - cpumask_or(amu_fie_cpus, policy->related_cpus, - amu_fie_cpus); - - cpufreq_cpu_put(policy); -} - static DEFINE_STATIC_KEY_FALSE(amu_fie_key); #define amu_freq_invariant() static_branch_unlikely(&amu_fie_key) -static int __init init_amu_fie(void) +static void amu_fie_setup(const struct cpumask *cpus) { - cpumask_var_t valid_cpus; bool invariant; - int ret = 0; int cpu; - if (!zalloc_cpumask_var(&valid_cpus, GFP_KERNEL)) - return -ENOMEM; - - if (!zalloc_cpumask_var(&amu_fie_cpus, GFP_KERNEL)) { - ret = -ENOMEM; - goto free_valid_mask; - } + /* We are already set since the last insmod of cpufreq driver */ + if (unlikely(cpumask_subset(cpus, amu_fie_cpus))) + return; - for_each_present_cpu(cpu) { + for_each_cpu(cpu, cpus) { if (!freq_counters_valid(cpu) || freq_inv_set_max_ratio(cpu, cpufreq_get_hw_max_freq(cpu) * 1000, arch_timer_get_rate())) - continue; - - cpumask_set_cpu(cpu, valid_cpus); - enable_policy_freq_counters(cpu, valid_cpus); + return; } - /* Overwrite amu_fie_cpus if all CPUs support AMU */ - if (cpumask_equal(valid_cpus, cpu_present_mask)) - cpumask_copy(amu_fie_cpus, cpu_present_mask); - - if (cpumask_empty(amu_fie_cpus)) - goto free_valid_mask; + cpumask_or(amu_fie_cpus, amu_fie_cpus, cpus); invariant = topology_scale_freq_invariant(); /* We aren't fully invariant yet */ if (!invariant && !cpumask_equal(amu_fie_cpus, cpu_present_mask)) - goto free_valid_mask; + return; static_branch_enable(&amu_fie_key); - pr_info("CPUs[%*pbl]: counters will be used for FIE.", - cpumask_pr_args(amu_fie_cpus)); + pr_debug("CPUs[%*pbl]: counters will be used for FIE.", + cpumask_pr_args(cpus)); /* * Task scheduler behavior depends on frequency invariance support, @@ -271,13 +240,48 @@ static int __init init_amu_fie(void) */ if (!invariant) rebuild_sched_domains_energy(); +} + +static int init_amu_fie_callback(struct notifier_block *nb, unsigned long val, + void *data) +{ + struct cpufreq_policy *policy = data; + + if (val == CPUFREQ_CREATE_POLICY) + amu_fie_setup(policy->related_cpus); + + /* + * We don't need to handle CPUFREQ_REMOVE_POLICY event as the AMU + * counters don't have any dependency on cpufreq driver once we have + * initialized AMU support and enabled invariance. The AMU counters will + * keep on working just fine in the absence of the cpufreq driver, and + * for the CPUs for which there are no counters available, the last set + * value of freq_scale will remain valid as that is the frequency those + * CPUs are running at. + */ + + return 0; +} + +static struct notifier_block init_amu_fie_notifier = { + .notifier_call = init_amu_fie_callback, +}; + +static int __init init_amu_fie(void) +{ + int ret; + + if (!zalloc_cpumask_var(&amu_fie_cpus, GFP_KERNEL)) + return -ENOMEM; -free_valid_mask: - free_cpumask_var(valid_cpus); + ret = cpufreq_register_notifier(&init_amu_fie_notifier, + CPUFREQ_POLICY_NOTIFIER); + if (ret) + free_cpumask_var(amu_fie_cpus); return ret; } -late_initcall_sync(init_amu_fie); +core_initcall(init_amu_fie); bool arch_freq_counters_available(const struct cpumask *cpus) {