From patchwork Tue Dec 15 05:34:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 11974035 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 C4CCDC19425 for ; Tue, 15 Dec 2020 05:36:01 +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 85FC32229C for ; Tue, 15 Dec 2020 05:36:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 85FC32229C 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=x3uXDVUmHuaRC4OPX1Mv8249WHzdsgiaKRjsA2OQack=; b=vcra/30lwgBOPn7iNA4GSPJGF kPFLYDyqiW+WnSB4mMmcNB6NQxyf5xXYcJxVzKPJfK1+cWyJHfRlANLSxRcnqwjP2hrUUB6o5sBDv ar39InZB9cnFCBm0vgPTNQJacN8GNIsmDDIdNubiHabzl/lblUkLAtbWjbu6apTN8Tsi5FDICiDo9 JTweIRaRv2KxDU0PfSKW8nD1Yaebuo2bfj6ArI6rbRlGbDNDpPtWvNNQDielnd66xL4+2QDjZtYOs 1Ur/sEsLbEQkl0mn8nVhNtByox6LJI/AmnpHqTwybfRfxT28ITCODDR2fXJfzVAiLks5cV+BCjX5q 6BEFReB7g==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kp2yq-0005sc-4p; Tue, 15 Dec 2020 05:34:36 +0000 Received: from mail-pj1-x1043.google.com ([2607:f8b0:4864:20::1043]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kp2yk-0005rV-JL for linux-arm-kernel@lists.infradead.org; Tue, 15 Dec 2020 05:34:31 +0000 Received: by mail-pj1-x1043.google.com with SMTP id n3so1496112pjm.1 for ; Mon, 14 Dec 2020 21:34:30 -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=lgJQB0DZGeyzhCL0iUrGx8mWydeXs5tsx4bv2Z8klnQ=; b=MycjyOgezkR8Zbn91/11XWPtpVKZlNKSu0I3+WAXAIKiVYVnH+6n1Wcdz5BAXn6ovI GWYiThlTjt2dkewgfYxLm1gArJXGb+Il69Bx1brJZQVrJhisHmzo/EiYvDfgCmW6gHkT lc3ux9NZiDS91AInrbBzpNjj6DuiuCqCZgvOnn4xE90ZCZam/EckgdG5vqvbC79rdy+Y iYdTPRHF2w+Xd+yqZfHDmbzi1O0PmRlxvRJCjffM3df5S4rPyqklQzE25+Iy9nFlgDpT qHd7xfO8XKt09vGuYh4YeJE7lwnRkg7sq9PVl8nMXQe+af4vl0BR1lPOvCy0lrzrzHVN zW6w== 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=lgJQB0DZGeyzhCL0iUrGx8mWydeXs5tsx4bv2Z8klnQ=; b=ppNRVLLN1YaWAoLvlJaVWUlC+J7moabGvMdOoPWJO9M4FH07T6pCB843W9jCvLrWeH ad8CxIJaSYVBDpU7+KbEi9WBOKWJvBAw27SPBOxltn5bNrIS+g0TdFnwrjDp4vML3vjG XPZwtGyOpZdTVCDmgjmr1pwQvz0RW/IQ5nSn9+cZymT5nIVM2MYe4psvaEcO10J0GOjy mJwOceDF+xCtLOZ6tW3J0/mjcQ6S+rVCRaYYEgJrMciJdPXhBOmjAbPeqY3bVkovpe+e u3SkU/I91N+HbrCEAbSjEC1SR5Z5Rw/i8nZ/SfFiQ9lDEg551ecM/iICR1qbAxOL4KiF j8tA== X-Gm-Message-State: AOAM530FCiqcdVl+dtd1hDPKjgKknb1vgeEU8q7Ru+NIBQFbp6ljlLtN 64bw0o1LPoqtcTYPvAJKxHXVOA== X-Google-Smtp-Source: ABdhPJyn0xBCA0AwIHZzUhyyaq89Ym+SBCQknUnzclvYEEjNa/dnV3CD8q9Jf5M/SaBY26gjy7Ksig== X-Received: by 2002:a17:90b:1886:: with SMTP id mn6mr28569544pjb.31.1608010468750; Mon, 14 Dec 2020 21:34:28 -0800 (PST) Received: from localhost ([122.172.20.109]) by smtp.gmail.com with ESMTPSA id u12sm21037339pfn.88.2020.12.14.21.34.27 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Dec 2020 21:34:28 -0800 (PST) From: Viresh Kumar To: Ionela Voinescu , Catalin Marinas , Will Deacon Subject: [PATCH V3 2/3] arm64: topology: Reorder init_amu_fie() a bit Date: Tue, 15 Dec 2020 11:04:15 +0530 Message-Id: <87d517c24630494afd9ba5769c2e2b10ee1d3f5d.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_003430_670114_D7B6C628 X-CRM114-Status: GOOD ( 18.25 ) 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 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. Signed-off-by: Viresh Kumar Reviewed-by: Ionela Voinescu --- V3: - Skipped the enable/disable dance. - No need to call topology_scale_freq_invariant() multiple times. 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: