From mboxrd@z Thu Jan 1 00:00:00 1970 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=-10.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 8C2FFC433B4 for ; Fri, 14 May 2021 16:17:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 62E6261264 for ; Fri, 14 May 2021 16:17:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232816AbhENQSK (ORCPT ); Fri, 14 May 2021 12:18:10 -0400 Received: from foss.arm.com ([217.140.110.172]:52036 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229958AbhENQSK (ORCPT ); Fri, 14 May 2021 12:18:10 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 7AC651713; Fri, 14 May 2021 09:16:58 -0700 (PDT) Received: from [192.168.178.6] (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 4AB033F73B; Fri, 14 May 2021 09:16:56 -0700 (PDT) Subject: Re: [PATCH 2/3] arch_topology: obtain cpu capacity using information from CPPC To: Ionela Voinescu , Sudeep Holla , "Rafael J . Wysocki" , Thomas Gleixner , Ingo Molnar , Giovanni Gherdovich , Catalin Marinas , Will Deacon , Valentin Schneider Cc: linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org References: <20210514095339.12979-1-ionela.voinescu@arm.com> <20210514095339.12979-3-ionela.voinescu@arm.com> From: Dietmar Eggemann Message-ID: <3c3f6d32-3560-2c54-beae-36f53d2572e7@arm.com> Date: Fri, 14 May 2021 18:16:50 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: <20210514095339.12979-3-ionela.voinescu@arm.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org On 14/05/2021 11:53, Ionela Voinescu wrote: [...] > diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c > index c1179edc0f3b..f710d64f125b 100644 > --- a/drivers/base/arch_topology.c > +++ b/drivers/base/arch_topology.c > @@ -291,6 +291,45 @@ bool __init topology_parse_cpu_capacity(struct device_node *cpu_node, int cpu) > return !ret; > } > > +#ifdef CONFIG_ACPI_CPPC_LIB > +#include init_cpu_capacity_cppc() shares a lot of functionality with the existing DT/CPUfreq-based approach (topology_parse_cpu_capacity(), register_cpufreq_notifier(), init_cpu_capacity_callback()). It looks like that the different ways of invocation (two steps per cpu vs. one step for all cpus) makes it hard to restructure the code to create more common bits. > +void init_cpu_capacity_cppc(void) > +{ > + struct cppc_perf_caps perf_caps; > + int cpu; > + > + if (likely(acpi_disabled || !acpi_cpc_valid())) likely(acpi_disabled) ? > + return; > + > + raw_capacity = kcalloc(num_possible_cpus(), sizeof(*raw_capacity), > + GFP_KERNEL); > + if (!raw_capacity) > + return; > + > + for_each_possible_cpu(cpu) { > + if (!cppc_get_perf_caps(cpu, &perf_caps)) { > + raw_capacity[cpu] = perf_caps.highest_perf; > + pr_debug("%s: CPU%d cpu_capacity=%u (raw).\n", > + __func__, cpu, raw_capacity[cpu]); There is quite a variety in the layout of the pr_xxx() log messages in this file. Originally the 'cpu_capacity:' was used to indicate that this log is from drivers/base/arch_topology.c. Now the GCC __func__ identifier is used. Maybe this can be aligned better? Especially since the functionality used in the existing DT-driven and now in the new CPPC-driven functionality is quite similar. Debugging is so much easier with consistent log strings. > + } else { > + pr_err("%s: CPU%d missing highest performance.\n", > + __func__, cpu); > + pr_err("%s: fallback to 1024 for all CPUs\n", > + __func__); > + goto exit; > + } > + } > + > + topology_normalize_cpu_scale(); > + schedule_work(&update_topology_flags_work); > + pr_debug("%s: cpu_capacity initialization done\n", __func__); > + > +exit: > + free_raw_capacity(); > +} > +#endif In case a system has CONFIG_ACPI_CPPC_LIB what does this mean for the DT-based approach via `register_cpufreq_notifier()`? Looks like we rely on: 376 static int __init register_cpufreq_notifier(void) ... 385 if (!acpi_disabled || ...) 386 return -EINVAL; to disable the CPUfreq part of the DT/CPUfreq-based approach on an ACPI system. [...] From mboxrd@z Thu Jan 1 00:00:00 1970 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=-11.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 6DC94C433ED for ; Fri, 14 May 2021 16:18:45 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 DA5C961444 for ; Fri, 14 May 2021 16:18:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DA5C961444 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com 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=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:Cc:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=16REP6Kvs87rqHrvWdjT9m/SkdPD94TyKEpE6PbWRO8=; b=WP+ScZajdQbTvJce67/oR99P9 H3cSNdN2i7TGFj8i6zhXgDVEkZ55O1HL1kIrgwRIYHA2+3e6+z6sRkHd1+4pgXNtTNjDFp3tEw+RO 7YPhexwq3vVQqRaJAoKVOOuud5Gnae/+1yjcO9RzROWC9dfJ40CDR4QFeyZ3A7FopBMssl7j5CQp/ mLP2o0/mS3bzBPzuajVcVHNTc7ofsfJbJlsN/R+1o+RqzzesCAuIE4Nu/NAi3ghu9LshJb9ic9omy XSioPA5UHC+V51zl/uuJCRi5mcy1wQiB/vn43d6YY+cENnE9Estp0dU7j6n81kTkpU18yx3D3c2sj cqIL5mzIA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lhaUz-008Sds-Kh; Fri, 14 May 2021 16:17:13 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lhaUu-008SdU-Mc for linux-arm-kernel@desiato.infradead.org; Fri, 14 May 2021 16:17:08 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: Content-Type:In-Reply-To:MIME-Version:Date:Message-ID:From:References:Cc:To: Subject:Sender:Reply-To:Content-ID:Content-Description; bh=2shd4qId9p+/VMCxi4CCBEXKe6wxa1PNGtjbIkLRndQ=; b=XLx3zA+92RNNlRvNpzBLmf572w SEfO576sVoyLgKQ0uOSN00qXT3DiBnKeWHzO5K+92hJ0XdAqy8rup3zpafafUV/0p7c/w5OXw2sy+ KaRK+usvuCb28DuRQ64YBIq7fkbT4p48Azr1xy25/zALM2VselA1uNZsefAT5jTHPmFoFyEpvlhPZ yAWCuagPv4ig7SeM5vXRMm2js1/YcONMomxeDhGt+VENWFbnKeRWRVLav++JBSuUPA5ccY+8UWvHB ogxaTuX3fG/Oc6Sp6sLvXXLVT3tdywGw9j0VRVKFPyQs6XZaQD66okQ5Vc+b67b6ziKE9IoIDrr4f MKWP4Xmg==; Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lhaUr-00C6fE-Vr for linux-arm-kernel@lists.infradead.org; Fri, 14 May 2021 16:17:07 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 7AC651713; Fri, 14 May 2021 09:16:58 -0700 (PDT) Received: from [192.168.178.6] (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 4AB033F73B; Fri, 14 May 2021 09:16:56 -0700 (PDT) Subject: Re: [PATCH 2/3] arch_topology: obtain cpu capacity using information from CPPC To: Ionela Voinescu , Sudeep Holla , "Rafael J . Wysocki" , Thomas Gleixner , Ingo Molnar , Giovanni Gherdovich , Catalin Marinas , Will Deacon , Valentin Schneider Cc: linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org References: <20210514095339.12979-1-ionela.voinescu@arm.com> <20210514095339.12979-3-ionela.voinescu@arm.com> From: Dietmar Eggemann Message-ID: <3c3f6d32-3560-2c54-beae-36f53d2572e7@arm.com> Date: Fri, 14 May 2021 18:16:50 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: <20210514095339.12979-3-ionela.voinescu@arm.com> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210514_091706_151159_D4DF69C2 X-CRM114-Status: GOOD ( 19.93 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 14/05/2021 11:53, Ionela Voinescu wrote: [...] > diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c > index c1179edc0f3b..f710d64f125b 100644 > --- a/drivers/base/arch_topology.c > +++ b/drivers/base/arch_topology.c > @@ -291,6 +291,45 @@ bool __init topology_parse_cpu_capacity(struct device_node *cpu_node, int cpu) > return !ret; > } > > +#ifdef CONFIG_ACPI_CPPC_LIB > +#include init_cpu_capacity_cppc() shares a lot of functionality with the existing DT/CPUfreq-based approach (topology_parse_cpu_capacity(), register_cpufreq_notifier(), init_cpu_capacity_callback()). It looks like that the different ways of invocation (two steps per cpu vs. one step for all cpus) makes it hard to restructure the code to create more common bits. > +void init_cpu_capacity_cppc(void) > +{ > + struct cppc_perf_caps perf_caps; > + int cpu; > + > + if (likely(acpi_disabled || !acpi_cpc_valid())) likely(acpi_disabled) ? > + return; > + > + raw_capacity = kcalloc(num_possible_cpus(), sizeof(*raw_capacity), > + GFP_KERNEL); > + if (!raw_capacity) > + return; > + > + for_each_possible_cpu(cpu) { > + if (!cppc_get_perf_caps(cpu, &perf_caps)) { > + raw_capacity[cpu] = perf_caps.highest_perf; > + pr_debug("%s: CPU%d cpu_capacity=%u (raw).\n", > + __func__, cpu, raw_capacity[cpu]); There is quite a variety in the layout of the pr_xxx() log messages in this file. Originally the 'cpu_capacity:' was used to indicate that this log is from drivers/base/arch_topology.c. Now the GCC __func__ identifier is used. Maybe this can be aligned better? Especially since the functionality used in the existing DT-driven and now in the new CPPC-driven functionality is quite similar. Debugging is so much easier with consistent log strings. > + } else { > + pr_err("%s: CPU%d missing highest performance.\n", > + __func__, cpu); > + pr_err("%s: fallback to 1024 for all CPUs\n", > + __func__); > + goto exit; > + } > + } > + > + topology_normalize_cpu_scale(); > + schedule_work(&update_topology_flags_work); > + pr_debug("%s: cpu_capacity initialization done\n", __func__); > + > +exit: > + free_raw_capacity(); > +} > +#endif In case a system has CONFIG_ACPI_CPPC_LIB what does this mean for the DT-based approach via `register_cpufreq_notifier()`? Looks like we rely on: 376 static int __init register_cpufreq_notifier(void) ... 385 if (!acpi_disabled || ...) 386 return -EINVAL; to disable the CPUfreq part of the DT/CPUfreq-based approach on an ACPI system. [...] _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel