Messages in this thread Patch in this message | | | From | Qing Wang <> | Subject | [PATCH V3] arch_topology: support parsing cluster_id from DT | Date | Thu, 12 May 2022 06:21:32 -0700 |
| |
From: Wang Qing <wangqing@vivo.com>
Use nested cluster structures in DT to support describing multi-level cluster topologies and increase the parsing of nested cluster.
Notice: the clusters describing in DT currently are not physical boundaries, since changing "cluster" to "socket" is too involved and error prone, this patch will not have any effect on one-level cluster topo, but can support the mutil-level cluster topo to support CLUSTER_SCHED.
e.g.: cpu-map { cluster0 { cluster0 { core0 { cpu = <&cpu0>; }; core1 { cpu = <&cpu1>; }; }; cluster1 { core0 { cpu = <&cpu2>; }; core1 { cpu = <&cpu3>; }; }; }; cluster1 { core0 { cpu = <&cpu4>; }; core1 { cpu = <&cpu5>; }; core2 { cpu = <&cpu6>; }; }; cluster2 { core0 { cpu = <&cpu7>; }; }; };
sched_domain will be parsed as: CLS: [0,1] [2,3] MC: [0,1,2,3] [4,5,6] DIE: [0,1,2,3,4,5,6,7]
Signed-off-by: Wang Qing <wangqing@vivo.com> --- v3: - After the change, there may be the same core_id under the same packet_id - Add the handling of the above case --- drivers/base/arch_topology.c | 38 ++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 13 deletions(-)
diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c index 1d6636ebaac5..5329c7a20afd 100644 --- a/drivers/base/arch_topology.c +++ b/drivers/base/arch_topology.c @@ -491,7 +491,7 @@ static int __init get_cpu_for_node(struct device_node *node) } static int __init parse_core(struct device_node *core, int package_id, - int core_id) + int cluster_id, int core_id) { char name[20]; bool leaf = true; @@ -507,6 +507,7 @@ static int __init parse_core(struct device_node *core, int package_id, cpu = get_cpu_for_node(t); if (cpu >= 0) { cpu_topology[cpu].package_id = package_id; + cpu_topology[cpu].cluster_id = cluster_id; cpu_topology[cpu].core_id = core_id; cpu_topology[cpu].thread_id = i; } else if (cpu != -ENODEV) { @@ -528,6 +529,7 @@ static int __init parse_core(struct device_node *core, int package_id, } cpu_topology[cpu].package_id = package_id; + cpu_topology[cpu].cluster_id = cluster_id; cpu_topology[cpu].core_id = core_id; } else if (leaf && cpu != -ENODEV) { pr_err("%pOF: Can't get CPU for leaf core\n", core); @@ -544,13 +546,15 @@ static int __init parse_cluster(struct device_node *cluster, int depth) bool has_cores = false; struct device_node *c; static int package_id __initdata; + static int cluster_id __initdata; int core_id = 0; int i, ret; /* - * First check for child clusters; we currently ignore any - * information about the nesting of clusters and present the - * scheduler with a flat list of them. + * nesting of clusters : + * level 1: package_id + * level 2: cluster_id + * level 3+: ignore */ i = 0; do { @@ -559,6 +563,14 @@ static int __init parse_cluster(struct device_node *cluster, int depth) if (c) { leaf = false; ret = parse_cluster(c, depth + 1); + if (depth == 0) { + package_id++; + cluster_id = 0; + } else if (depth == 1) + cluster_id++; + else + pr_err("Ignore nested clusters with more than two levels!\n"); + of_node_put(c); if (ret != 0) return ret; @@ -582,7 +594,8 @@ static int __init parse_cluster(struct device_node *cluster, int depth) } if (leaf) { - ret = parse_core(c, package_id, core_id++); + ret = parse_core(c, package_id, (depth == 2)?cluster_id : -1, + core_id++); } else { pr_err("%pOF: Non-leaf cluster with core %s\n", cluster, name); @@ -599,9 +612,6 @@ static int __init parse_cluster(struct device_node *cluster, int depth) if (leaf && !has_cores) pr_warn("%pOF: empty cluster\n", cluster); - if (leaf) - package_id++; - return 0; } @@ -692,15 +702,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 != -1 && cpu_topo->cluster_id != -1) { + if (cpuid_topo->cluster_id != cpu_topo->cluster_id) + continue; + 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.7.4
| |