Linux-RISC-V Archive on lore.kernel.org
 help / color / mirror / Atom feed
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 13/21] arch_topology: Set thread sibling cpumask only within the cluster
Date: Mon,  4 Jul 2022 11:15:57 +0100	[thread overview]
Message-ID: <20220704101605.1318280-14-sudeep.holla@arm.com> (raw)
In-Reply-To: <20220704101605.1318280-1-sudeep.holla@arm.com>

Currently the cluster identifier is not set on the DT based platforms.
The reset or default value is -1 for all the CPUs. Once we assign the
cluster identifier values correctly that may result in getting the thread
siblings wrong as the core identifiers can be same for 2 different CPUs
belonging to 2 different cluster.

So, in order to get the thread sibling cpumasks correct, we need to
update them only if the cores they belong are in the same cluster within
the socket. Let us skip updation of the thread sibling cpumaks if the
cluster identifier doesn't match.

This change won't affect even if the cluster identifiers are not set
currently but will avoid any breakage once we set the same correctly.

Tested-by: Gavin Shan <gshan@redhat.com>
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/arch_topology.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c
index 8206990c679f..6ab173caf1dc 100644
--- a/drivers/base/arch_topology.c
+++ b/drivers/base/arch_topology.c
@@ -708,15 +708,17 @@ void update_siblings_masks(unsigned int cpuid)
 		if (cpuid_topo->package_id != cpu_topo->package_id)
 			continue;
 
-		if (cpuid_topo->cluster_id == cpu_topo->cluster_id &&
-		    cpuid_topo->cluster_id != -1) {
+		cpumask_set_cpu(cpuid, &cpu_topo->core_sibling);
+		cpumask_set_cpu(cpu, &cpuid_topo->core_sibling);
+
+		if (cpuid_topo->cluster_id != cpu_topo->cluster_id)
+			continue;
+
+		if (cpuid_topo->cluster_id != -1) {
 			cpumask_set_cpu(cpu, &cpuid_topo->cluster_sibling);
 			cpumask_set_cpu(cpuid, &cpu_topo->cluster_sibling);
 		}
 
-		cpumask_set_cpu(cpuid, &cpu_topo->core_sibling);
-		cpumask_set_cpu(cpu, &cpuid_topo->core_sibling);
-
 		if (cpuid_topo->core_id != cpu_topo->core_id)
 			continue;
 
-- 
2.37.0


_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv

  parent reply	other threads:[~2022-07-04 10:34 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 ` [PATCH v6 06/21] cacheinfo: Allow early detection and population of cache attributes Sudeep Holla
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 ` Sudeep Holla [this message]
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-14-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