From patchwork Tue Dec 15 05:34:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 11974033 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=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 EFB21C4361B for ; Tue, 15 Dec 2020 05:36:00 +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 A88D72229C for ; Tue, 15 Dec 2020 05:36:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A88D72229C 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: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:In-Reply-To:References:List-Owner; bh=bYJtBAM7XFqiviQC21Cc7ID1W7a9tlMVhfX7nzo7MPM=; b=wjdFBEssLWAQ9JNLumwQfRi9wl Hd8JYDWJ3ruEQ4EWet2W7R+kS550QNaYVN9uXflebjkHkdvJNjUtG5fLhZeGDYgCmdwfWnEz4VKr+ kr6tOaSuZNm3s9ljSx6UjQrcsoJ62Drc70MCXosDkIlIFtUn1F8+ya4pEWBADVFpejksuwB62eLf5 h1kK9mJgfX/bwnlxr1Y/UjYGjHXHLNOFDel+ZE64PV0dEPZf6HBN7bkDV+bftM7ghNU/1mFwoPyIJ yJ3cB6rszlkQf/EBCU1np6EcqVwixICOu5HAl3+QVC14HewZr8pOW4YrHZxsUlVIWrCSB+rHoYb5i SIsAQ8/w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kp2yl-0005rt-S0; Tue, 15 Dec 2020 05:34:31 +0000 Received: from mail-pl1-x644.google.com ([2607:f8b0:4864:20::644]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kp2yi-0005rE-1a for linux-arm-kernel@lists.infradead.org; Tue, 15 Dec 2020 05:34:29 +0000 Received: by mail-pl1-x644.google.com with SMTP id r4so10359102pls.11 for ; Mon, 14 Dec 2020 21:34:27 -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:mime-version :content-transfer-encoding; bh=wcFcGYpvBy6tnBdPjWwdyiQjWcBUe6C5DCH1A2Cba4E=; b=NBE0rtLi/ltbqXo56JM6EWTuLmeSbxa4lmf8EspxvTDjPj9NIzdDjd+2I9OJJRKdFU svttQRs/nH84xvWccKeKVAqpzF1G96MyoH6HQ7/Oj8md2llvsIMI+wYDMPPGcgL3QuAF wu9RtWN6ghHA2IBIostWyvOPTzmlF04OaAodzYhbwpDexfk/Hw6ve9z+UiXdUDm5Ope9 cDGP4kwpDWniu1GY9hf4QXVHTw81K68TgUr/rKuf1g4ThCsnipeS6AsIHhqCJhUjh6BA uv1lp591T8OIPxvlyGhRTMwZHG0zS/KREq5S/IQxXN78UsdU3YvNaOrEEL8XwAYzLwzJ Wj+w== 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:mime-version :content-transfer-encoding; bh=wcFcGYpvBy6tnBdPjWwdyiQjWcBUe6C5DCH1A2Cba4E=; b=lx7O2mZRIya4FEXOlcwV9GMfzovDatFUTBKDR2CtRZbK0DHP+KuF1fo2JnKypTeiNF xIKTq/TRE6njhUBGXY6Pt+b5lL841ItQCeeLmV2+AcOPoZEqYIMXrEvjZbULUxC7q6pZ 0R1nmJIqMUYv/L32r5u3clTl7WuQUDm5QXvjDXy7R8L+vv1bnO0wU8+papfLC0f+NA08 AWWx6SUZzAR2kkFAXaVJWitW1T3jVfAboiGi4ryMYpCgi3ijbCNmOsw3M3i/OoT4ho9K VyNCzjdsBRKpRRsBQNEXhtjuDPqRM91oJUeK03lTyeU1DDaqnLam1FjcSO0KftIGPx6m 5myw== X-Gm-Message-State: AOAM53057ysg8wPg06mOzRAO4favlQ/5i4mmkOSqU+JeU6MybxL3xKza sZsdFPX0ILrHINOnanRlnNeQkw== X-Google-Smtp-Source: ABdhPJx4r4T2MdTwUyAXuYYXxheqGSt/gbNyj9qbwtRertqW0XA/0EJb0C5m9Kg6dsXyVn7SiLAbwA== X-Received: by 2002:a17:902:b90b:b029:da:97e2:722d with SMTP id bf11-20020a170902b90bb02900da97e2722dmr16686967plb.3.1608010465421; Mon, 14 Dec 2020 21:34:25 -0800 (PST) Received: from localhost ([122.172.20.109]) by smtp.gmail.com with ESMTPSA id d6sm21177494pfo.199.2020.12.14.21.34.23 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Dec 2020 21:34:24 -0800 (PST) From: Viresh Kumar To: Ionela Voinescu , Catalin Marinas , Will Deacon Subject: [PATCH V3 1/3] arm64: topology: Avoid the have_policy check Date: Tue, 15 Dec 2020 11:04:14 +0530 Message-Id: <5ffc7b9ed03c6301ac2f710f609282959491b526.1608010334.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.25.0.rc1.19.g042ed3e048af MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201215_003428_395524_D92414EF X-CRM114-Status: GOOD ( 19.56 ) 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 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 --- V3: - Added Reviewed by tag. 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.",