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: