External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-12-22 13:45:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

aarch64: Optimize cpu-map creating code in FDT

Browse Source 
The logic of determining VCPU index in creating `cpu-map` node of FDT
can be optimized.

The code is invoked when VCPU topology is specified.

Signed-off-by: Michael Zhao <michael.zhao@arm.com>
This commit is contained in:
Michael Zhao 2022-02-19 22:17:27 +08:00 committed by Xin Wang
parent 28d6bff340
commit bf6920f774
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arch/src/aarch64/fdt.rs
View File

@ -192,18 +192,6 @@ fn create_cpu_nodes(
if let Some(topology) = vcpu_topology { if let Some(topology) = vcpu_topology {
let (threads_per_core, cores_per_package, packages) = topology; let (threads_per_core, cores_per_package, packages) = topology;
let cpu_map_node = fdt.begin_node("cpu-map")?; let cpu_map_node = fdt.begin_node("cpu-map")?;
// Create mappings between CPU index and cluster,core, and thread.
let mut cluster_core_thread_to_cpuidx = HashMap::new();
for cpu_idx in 0..num_cpus as u8 {
cluster_core_thread_to_cpuidx.insert(
(
cpu_idx / (cores_per_package * threads_per_core),
(cpu_idx / threads_per_core) % cores_per_package,
cpu_idx % threads_per_core,
),
cpu_idx,
);
}
// Create device tree nodes with regard of above mapping. // Create device tree nodes with regard of above mapping.
for cluster_idx in 0..packages { for cluster_idx in 0..packages {
@ -217,10 +205,10 @@ fn create_cpu_nodes(
for thread_idx in 0..threads_per_core { for thread_idx in 0..threads_per_core {
let thread_name = format!("thread{:x}", thread_idx); let thread_name = format!("thread{:x}", thread_idx);
let thread_node = fdt.begin_node(&thread_name)?; let thread_node = fdt.begin_node(&thread_name)?;
let cpu_idx = cluster_core_thread_to_cpuidx let cpu_idx = threads_per_core * cores_per_package * cluster_idx
.get(&(cluster_idx, core_idx, thread_idx)) + threads_per_core * core_idx
.unwrap(); + thread_idx;
fdt.property_u32("cpu", *cpu_idx as u32 + FIRST_VCPU_PHANDLE)?; fdt.property_u32("cpu", cpu_idx as u32 + FIRST_VCPU_PHANDLE)?;
fdt.end_node(thread_node)?; fdt.end_node(thread_node)?;
} }