From: Sudeep Holla <sudeep.holla@arm.com>
To: linux-kernel@vger.kernel.org,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Sudeep Holla <sudeep.holla@arm.com>,
conor.dooley@microchip.com,
valentina.fernandezalanis@microchip.com,
Vincent Guittot <vincent.guittot@linaro.org>,
Dietmar Eggemann <dietmar.eggemann@arm.com>,
Qing Wang <wangqing@vivo.com>, Rob Herring <robh+dt@kernel.org>,
"Rafael J . Wysocki" <rafael@kernel.org>,
Ionela Voinescu <ionela.voinescu@arm.com>,
Pierre Gondois <pierre.gondois@arm.com>,
linux-arm-kernel@lists.infradead.org,
linux-riscv@lists.infradead.org, Gavin Shan <gshan@redhat.com>
Subject: [PATCH v6 06/21] cacheinfo: Allow early detection and population of cache attributes
Date: Mon, 4 Jul 2022 11:15:50 +0100 [thread overview]
Message-ID: <20220704101605.1318280-7-sudeep.holla@arm.com> (raw)
In-Reply-To: <20220704101605.1318280-1-sudeep.holla@arm.com>
Some architecture/platforms may need to setup cache properties very
early in the boot along with other cpu topologies so that all these
information can be used to build sched_domains which is used by the
scheduler.
Allow detect_cache_attributes to be called quite early during the boot.
Tested-by: Ionela Voinescu <ionela.voinescu@arm.com>
Reviewed-by: Gavin Shan <gshan@redhat.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
---
drivers/base/cacheinfo.c | 55 ++++++++++++++++++++++++++-------------
include/linux/cacheinfo.h | 1 +
2 files changed, 38 insertions(+), 18 deletions(-)
diff --git a/drivers/base/cacheinfo.c b/drivers/base/cacheinfo.c
index fdc1baa342f1..4d21a1022fa9 100644
--- a/drivers/base/cacheinfo.c
+++ b/drivers/base/cacheinfo.c
@@ -193,14 +193,8 @@ static int cache_setup_of_node(unsigned int cpu)
{
struct device_node *np;
struct cacheinfo *this_leaf;
- struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu);
unsigned int index = 0;
- /* skip if fw_token is already populated */
- if (this_cpu_ci->info_list->fw_token) {
- return 0;
- }
-
np = of_cpu_device_node_get(cpu);
if (!np) {
pr_err("Failed to find cpu%d device node\n", cpu);
@@ -236,6 +230,18 @@ int __weak cache_setup_acpi(unsigned int cpu)
unsigned int coherency_max_size;
+static int cache_setup_properties(unsigned int cpu)
+{
+ int ret = 0;
+
+ if (of_have_populated_dt())
+ ret = cache_setup_of_node(cpu);
+ else if (!acpi_disabled)
+ ret = cache_setup_acpi(cpu);
+
+ return ret;
+}
+
static int cache_shared_cpu_map_setup(unsigned int cpu)
{
struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu);
@@ -246,21 +252,21 @@ static int cache_shared_cpu_map_setup(unsigned int cpu)
if (this_cpu_ci->cpu_map_populated)
return 0;
- if (of_have_populated_dt())
- ret = cache_setup_of_node(cpu);
- else if (!acpi_disabled)
- ret = cache_setup_acpi(cpu);
-
- if (ret)
- return ret;
+ /*
+ * skip setting up cache properties if LLC is valid, just need
+ * to update the shared cpu_map if the cache attributes were
+ * populated early before all the cpus are brought online
+ */
+ if (!last_level_cache_is_valid(cpu)) {
+ ret = cache_setup_properties(cpu);
+ if (ret)
+ return ret;
+ }
for (index = 0; index < cache_leaves(cpu); index++) {
unsigned int i;
this_leaf = per_cpu_cacheinfo_idx(cpu, index);
- /* skip if shared_cpu_map is already populated */
- if (!cpumask_empty(&this_leaf->shared_cpu_map))
- continue;
cpumask_set_cpu(cpu, &this_leaf->shared_cpu_map);
for_each_online_cpu(i) {
@@ -330,17 +336,28 @@ int __weak populate_cache_leaves(unsigned int cpu)
return -ENOENT;
}
-static int detect_cache_attributes(unsigned int cpu)
+int detect_cache_attributes(unsigned int cpu)
{
int ret;
+ /* Since early detection of the cacheinfo is allowed via this
+ * function and this also gets called as CPU hotplug callbacks via
+ * cacheinfo_cpu_online, the initialisation can be skipped and only
+ * CPU maps can be updated as the CPU online status would be update
+ * if called via cacheinfo_cpu_online path.
+ */
+ if (per_cpu_cacheinfo(cpu))
+ goto update_cpu_map;
+
if (init_cache_level(cpu) || !cache_leaves(cpu))
return -ENOENT;
per_cpu_cacheinfo(cpu) = kcalloc(cache_leaves(cpu),
sizeof(struct cacheinfo), GFP_KERNEL);
- if (per_cpu_cacheinfo(cpu) == NULL)
+ if (per_cpu_cacheinfo(cpu) == NULL) {
+ cache_leaves(cpu) = 0;
return -ENOMEM;
+ }
/*
* populate_cache_leaves() may completely setup the cache leaves and
@@ -349,6 +366,8 @@ static int detect_cache_attributes(unsigned int cpu)
ret = populate_cache_leaves(cpu);
if (ret)
goto free_ci;
+
+update_cpu_map:
/*
* For systems using DT for cache hierarchy, fw_token
* and shared_cpu_map will be set up here only if they are
diff --git a/include/linux/cacheinfo.h b/include/linux/cacheinfo.h
index 7e429bc5c1a4..00b7a6ae8617 100644
--- a/include/linux/cacheinfo.h
+++ b/include/linux/cacheinfo.h
@@ -84,6 +84,7 @@ int populate_cache_leaves(unsigned int cpu);
int cache_setup_acpi(unsigned int cpu);
bool last_level_cache_is_valid(unsigned int cpu);
bool last_level_cache_is_shared(unsigned int cpu_x, unsigned int cpu_y);
+int detect_cache_attributes(unsigned int cpu);
#ifndef CONFIG_ACPI_PPTT
/*
* acpi_find_last_cache_level is only called on ACPI enabled
--
2.37.0
next prev parent reply other threads:[~2022-07-04 10:17 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-04 10:15 [PATCH v6 00/21] arch_topology: Updates to add socket support and fix cluster ids Sudeep Holla
2022-07-04 10:15 ` [PATCH v6 01/21] ACPI: PPTT: Use table offset as fw_token instead of virtual address Sudeep Holla
2022-07-04 10:15 ` [PATCH v6 02/21] cacheinfo: Use of_cpu_device_node_get instead cpu_dev->of_node Sudeep Holla
2022-07-04 10:15 ` [PATCH v6 03/21] cacheinfo: Add helper to access any cache index for a given CPU Sudeep Holla
2022-07-04 10:15 ` [PATCH v6 04/21] cacheinfo: Move cache_leaves_are_shared out of CONFIG_OF Sudeep Holla
2022-07-04 10:15 ` [PATCH v6 05/21] cacheinfo: Add support to check if last level cache(LLC) is valid or shared Sudeep Holla
2022-07-04 10:15 ` Sudeep Holla [this message]
2022-07-04 10:15 ` [PATCH v6 07/21] cacheinfo: Use cache identifiers to check if the caches are shared if available Sudeep Holla
2022-07-04 10:15 ` [PATCH v6 08/21] cacheinfo: Align checks in cache_shared_cpu_map_{setup,remove} for readability Sudeep Holla
2022-07-04 10:15 ` [PATCH v6 09/21] arch_topology: Add support to parse and detect cache attributes Sudeep Holla
2022-07-19 14:22 ` Geert Uytterhoeven
2022-07-19 14:37 ` Conor Dooley
2022-07-19 15:05 ` Sudeep Holla
2022-07-04 10:15 ` [PATCH v6 10/21] arch_topology: Use the last level cache information from the cacheinfo Sudeep Holla
2022-07-04 10:15 ` [PATCH v6 11/21] arm64: topology: Remove redundant setting of llc_id in CPU topology Sudeep Holla
2022-07-04 10:15 ` [PATCH v6 12/21] arch_topology: Drop LLC identifier stash from the " Sudeep Holla
2022-07-04 10:15 ` [PATCH v6 13/21] arch_topology: Set thread sibling cpumask only within the cluster Sudeep Holla
2022-07-04 10:15 ` [PATCH v6 14/21] arch_topology: Check for non-negative value rather than -1 for IDs validity Sudeep Holla
2022-07-04 10:15 ` [PATCH v6 15/21] arch_topology: Avoid parsing through all the CPUs once a outlier CPU is found Sudeep Holla
2022-07-04 10:16 ` [PATCH v6 16/21] arch_topology: Don't set cluster identifier as physical package identifier Sudeep Holla
2022-07-04 10:16 ` [PATCH v6 17/21] arch_topology: Limit span of cpu_clustergroup_mask() Sudeep Holla
2022-07-08 0:10 ` Darren Hart
2022-07-08 8:04 ` Sudeep Holla
2022-07-08 16:27 ` Darren Hart
2022-07-08 9:05 ` Ionela Voinescu
2022-07-08 16:14 ` Darren Hart
2022-07-04 10:16 ` [PATCH v6 18/21] arch_topology: Set cluster identifier in each core/thread from /cpu-map Sudeep Holla
2022-07-04 10:16 ` [PATCH v6 19/21] arch_topology: Add support for parsing sockets in /cpu-map Sudeep Holla
2022-07-04 10:16 ` [PATCH v6 20/21] arch_topology: Warn that topology for nested clusters is not supported Sudeep Holla
2022-07-04 10:16 ` [PATCH v6 21/21] ACPI: Remove the unused find_acpi_cpu_cache_topology() Sudeep Holla
2022-07-04 15:10 ` [PATCH v6 00/21] arch_topology: Updates to add socket support and fix cluster ids Conor.Dooley
2022-07-04 15:20 ` Sudeep Holla
[not found] ` <507c6b64-fc23-3eea-e4c1-4d426025d658@inria.fr>
2022-07-05 19:06 ` Conor.Dooley
2022-07-05 20:07 ` Sudeep Holla
2022-07-05 20:14 ` Conor.Dooley
2022-07-05 20:22 ` Sudeep Holla
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220704101605.1318280-7-sudeep.holla@arm.com \
--to=sudeep.holla@arm.com \
--cc=conor.dooley@microchip.com \
--cc=dietmar.eggemann@arm.com \
--cc=gregkh@linuxfoundation.org \
--cc=gshan@redhat.com \
--cc=ionela.voinescu@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=pierre.gondois@arm.com \
--cc=rafael@kernel.org \
--cc=robh+dt@kernel.org \
--cc=valentina.fernandezalanis@microchip.com \
--cc=vincent.guittot@linaro.org \
--cc=wangqing@vivo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).