From patchwork Tue Dec 15 05:34:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 11974037 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=-16.8 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=ham 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 10067C4361B for ; Tue, 15 Dec 2020 05:36:04 +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 BCFFF2229C for ; Tue, 15 Dec 2020 05:36:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BCFFF2229C 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=gj8DweAkdD3lglN5QmnOtUHAUyN3mQPqL9CPduAc+0k=; b=UdbssTLz9IWsDXymOgOfTgRXQ kLiM+OlHpl7toTUmt5Su/IDc+6yLuUHgb0TVC+GZu7nEwI0rAI/VIE/kDq0RqnKpPbUg5dQrTbj63 ujfJ0dHHRZzVZ9G8XEYLDK4VUZiXTmU2ynQpRjHBzItZGQANXBqxXGKupw/Ruf4OMcZTI0FYrdbBJ gbiWOkgz0yPRzD2O6NQij2D1yhnSDV6liOlGKhg1wVyKK6i2ab1/6UaO5TIlAD9VFQtTerlxjnfoC 61MPu2jAHZRyCrTx4LvDLqq55lONovv1BBltByZ5fvagw4DvcvFVCPuCVuo+Hrb4l1sM2zGD1Olpv 0CvH6ShSA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kp2yt-0005sx-NM; Tue, 15 Dec 2020 05:34:40 +0000 Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kp2yo-0005s2-03 for linux-arm-kernel@lists.infradead.org; Tue, 15 Dec 2020 05:34:35 +0000 Received: by mail-pl1-x629.google.com with SMTP id v3so10349121plz.13 for ; Mon, 14 Dec 2020 21:34:33 -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=Inc8dinYQAlGT5BgcNFExipWp8kF8aKZc4Rc2pdmTFE=; b=F3W+30NrFnYS6OxRVpnS+92LFlMqyuIbh9uJUupi+IxFLS2veW9RdhalGL98lqI6ra 1X/KaQFt/n6vWSx+jA4aq3UDPQyAl4u1lbX2qQ5kdIjKqYFlbDilQ8yPbaiFkPtQCYO4 r0fwng4GMd0TIizdbGRB4y9UoC1noNoxbtnn3OkO9J+YuqZBXrsjtyZqo91mHaN6+HQ/ YVCp0YYpOTAPaLiy5Ypwa3EBhz9MwqqJPP+P5mNJX2VB2y2Tfzjj65MbYNSLcGS/4ByG Pd8V9R2Jzkuc56Jo3XaVOgZeeyH1i6uusBr5pQ3BKmAZchk8SPfI7o8o3t/pj8QaCwyh DP/g== 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=Inc8dinYQAlGT5BgcNFExipWp8kF8aKZc4Rc2pdmTFE=; b=dte5vtr9PmQvl9wlWKhItjYJBy4q+A90TaqCQAllGjrEVlKgs1ZwtB8Xwa+Z8Bfu4L uSacDPcvvxRNxmyA/3hcS4NxxHO80vv9VSUA74oI0oDXC5BAYmxFVWBFNWXZyHHNYmkw Snh+zRQhNq+AR1/M5hnwXoIaFmT1lDaA8xErx8QBwxLZoXBrHpOjIOBx3eSRyzcZz2gX t4Wnfq/knwAcE0yCs3hu2EhuGIz30kenIr7Z3cG3yHiK4WmRjXnnUpAym8XpJmkvpAtW zZYXw4poXDlOtXhEthBP8EAMB3tlyogD3jmqYDZU5JfAxRYKfgZsiyPVeYvC1Fs20DQO 5L0w== X-Gm-Message-State: AOAM531XfqB2UHZ+FbwhElkN3g5qRmXMXFN7QMvqNrnUuspZ5Mxa7M7t qrdj2Qbyi/Ec6RSyLgH7Wu9X2A== X-Google-Smtp-Source: ABdhPJwVjo6+JEYhHW0Dd+3SfomSsbXagYooBEySexBFGqYOe+ZXGwmoVAvstSesdzKx8PaRD0XAow== X-Received: by 2002:a17:90a:a394:: with SMTP id x20mr27698233pjp.24.1608010472084; Mon, 14 Dec 2020 21:34:32 -0800 (PST) Received: from localhost ([122.172.20.109]) by smtp.gmail.com with ESMTPSA id l141sm23656776pfd.124.2020.12.14.21.34.31 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Dec 2020 21:34:31 -0800 (PST) From: Viresh Kumar To: Ionela Voinescu , Catalin Marinas , Will Deacon Subject: [PATCH V3 3/3] arm64: topology: Make AMUs work with modular cpufreq drivers Date: Tue, 15 Dec 2020 11:04:16 +0530 Message-Id: <8f0fe23d1c9effed71d5660c939472d43726a61b.1608010334.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.25.0.rc1.19.g042ed3e048af In-Reply-To: <5ffc7b9ed03c6301ac2f710f609282959491b526.1608010334.git.viresh.kumar@linaro.org> References: <5ffc7b9ed03c6301ac2f710f609282959491b526.1608010334.git.viresh.kumar@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201215_003434_075912_992ECC4C X-CRM114-Status: GOOD ( 26.19 ) 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 , Vincent Guittot , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org 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. Signed-off-by: Viresh Kumar --- V3: - This is a new patch. Ionela, I don't have a way to test the AMU stuff, will it be possible for you to give it a try ? arch/arm64/kernel/topology.c | 88 +++++++++++++++++++----------------- 1 file changed, 46 insertions(+), 42 deletions(-) diff --git a/arch/arm64/kernel/topology.c b/arch/arm64/kernel/topology.c index 57267d694495..0fc2b32ddb45 100644 --- a/arch/arm64/kernel/topology.c +++ b/arch/arm64/kernel/topology.c @@ -199,64 +199,33 @@ 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); @@ -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 availalbe, 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) {