From patchwork Thu Dec 10 16:29:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 11965529 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 A7F7DC4361B for ; Thu, 10 Dec 2020 16:31:28 +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 6213223158 for ; Thu, 10 Dec 2020 16:31:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6213223158 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=nOenhdExtp7J0u+wo23tGXJ8XKw8o2GApssboM1zYlQ=; b=M6ltb0NR+LX/dTqGfoKpPjOu7 uIyuYYIXh7CS2oQkryzUWqSWRqOBV7n1Y5+w7LGHxPBlicPCRwxeUn6l/qheHoOLGTBX9itXNZhDr mLi+l87pbiOw/N8O+UuHqFqayoPVt2mYQWyr3gMbTRkaM84rGGidCHINa2z0CHfZJZwFbLAfQV3Wd 3a5PZQ6WzZDVYKyPr+LoBzlE9WsjFCpTQJsTsSwDZNTA0Vqv5m5JEHoFFhDF/hsLrFoAlTX49XDni Tly/tc8t+jzUUyaCdXuYHRUz2Scl+RzHpgd7Lgddnv63INIxiLCR9qOmyMzTEaUHN8L0FdrujSeUU leSOlG+VQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1knOpZ-0000gy-TG; Thu, 10 Dec 2020 16:30:13 +0000 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1knOp0-0000T3-Ub for linux-arm-kernel@lists.infradead.org; Thu, 10 Dec 2020 16:30:04 +0000 Received: by mail-pg1-x541.google.com with SMTP id n1so1958756pge.8 for ; Thu, 10 Dec 2020 08:29:38 -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=gv4YPjz2g4HSduKeRhW9TiUO1Jvr8v2DzdEJIoyTN5Y=; b=gSeFsdVVpQp+bz1eXdJhj5qFWrMbHhW2RW2z/sNL0f2/SbSoRHT4T2RyMc0eCWqDej 08ve8H0J/geDYo2CHvOn70cv3ixK2rJvcZQSAGelyDGRKQEuYjGxFwDPYowrXkHRJGAY 3C1zyUuw4kgnFdI9jdCZ+Cv8YBdk10w8ovoM8rB+QLKCqSnFYzpz9vt6OREe5zIlhMsq ThetTsU/o7JVh6O7G3gE0SPbfec7+JhlnWT9ly7rDPKxZnzKOV5uP78d8dgWRu+DEwAE hvJnP+m9YWQzOeEbZpVDCrDs5BwpDCONyGBwC8WVsb+0b9wji50d5/esIzfIlCIbX2Q/ FXyQ== 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=gv4YPjz2g4HSduKeRhW9TiUO1Jvr8v2DzdEJIoyTN5Y=; b=c18PdKDD2vUricXi2Y4PY6LmeVPjPIeoYq+TiJ/0Mhftw2rSNX1Ts+Da3s/jkKaPGQ HIv4r5LADOZDMP9xDw/kdOj+1SiCMkJM4FPYquJ0vDRcHVDP6C6Sh+yFGgO7OtYo2MG7 bAuYE1JuYQzNfeLFj8ADdkGqgDmh1LPJaFB0+S2W0z0y4GtX1z7k1hirSTtsDKFsGMly iJ8/2wQ4GadEGKM0QjSs2uX0a7sz2U57x8c4GRonTc9gRZZBZO/Zs5X5jnkNlAAAJRo3 rJ3UDcEFbaGlThgqzcPYS2YJLDn5RH/59swYLn8mdAf/kTCjmp7EdIUxXm+3X7uz0OG/ B5Vg== X-Gm-Message-State: AOAM530y3R78t/UtLsSaQUeC91W1sUrF9Gu5wBcvivH384BvsvnmxvdE xMT4Kh/pwS8/eHYZ/oAqofTPdg== X-Google-Smtp-Source: ABdhPJxSqm5Mc0cj/FdswgJ2J75MSczz7gOD2cn9HTmBKGRMclhzv/c3n0IlwqI6qLR8Vs5PawbL4A== X-Received: by 2002:a63:a62:: with SMTP id z34mr7397468pgk.193.1607617777096; Thu, 10 Dec 2020 08:29:37 -0800 (PST) Received: from localhost ([122.172.20.109]) by smtp.gmail.com with ESMTPSA id s13sm7181323pfd.99.2020.12.10.08.29.34 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Dec 2020 08:29:35 -0800 (PST) From: Viresh Kumar To: Ionela Voinescu , Catalin Marinas , Will Deacon Subject: [PATCH V2 2/2] arm64: topology: Reorder init_amu_fie() a bit Date: Thu, 10 Dec 2020 21:59:23 +0530 Message-Id: <202f775d57bd143602f9100ba3d9619d15d43409.1607617625.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.25.0.rc1.19.g042ed3e048af In-Reply-To: <5f85c2ddf7aa094d7d2ebebe8426f84fad0a99b7.1607617625.git.viresh.kumar@linaro.org> References: <5f85c2ddf7aa094d7d2ebebe8426f84fad0a99b7.1607617625.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-20201210_112939_098986_96BA83A7 X-CRM114-Status: GOOD ( 18.96 ) 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, 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 --- V2: - The enable/disable dance is actually required, just made a bunch of other optimizations to make it look better. arch/arm64/kernel/topology.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/arch/arm64/kernel/topology.c b/arch/arm64/kernel/topology.c index ebadc73449f9..1ebdb667f0d1 100644 --- a/arch/arm64/kernel/topology.c +++ b/arch/arm64/kernel/topology.c @@ -221,7 +221,7 @@ static DEFINE_STATIC_KEY_FALSE(amu_fie_key); static int __init init_amu_fie(void) { - bool invariance_status = topology_scale_freq_invariant(); + bool prev, now; cpumask_var_t valid_cpus; int ret = 0; int cpu; @@ -249,18 +249,24 @@ 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; + + prev = topology_scale_freq_invariant(); + static_branch_enable(&amu_fie_key); + now = topology_scale_freq_invariant(); /* * If the system is not fully invariant after AMU init, disable * partial use of counters for frequency invariance. */ - if (!topology_scale_freq_invariant()) + if (!now) { static_branch_disable(&amu_fie_key); + goto free_valid_mask; + } + + 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 +274,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 (prev != now) rebuild_sched_domains_energy(); free_valid_mask: