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

tests: Enable test_numa_nodes() on AArch64

Browse Source 
Signed-off-by: Henry Wang <Henry.Wang@arm.com>
This commit is contained in:
Henry Wang 2021-06-25 12:04:57 +08:00 committed by Rob Bradford
parent 054c036e81
commit 48326ce731
1 changed files with 38 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tests/integration.rs
View File

@ -218,6 +218,16 @@ mod tests {
kernel_path kernel_path
} }
#[cfg(target_arch = "aarch64")]
fn edk2_path() -> PathBuf {
let mut workload_path = dirs::home_dir().unwrap();
workload_path.push("workloads");
let mut edk2_path = workload_path;
edk2_path.push("CLOUDHV_EFI.fd");
edk2_path
}
fn prepare_vhost_user_net_daemon( fn prepare_vhost_user_net_daemon(
tmp_dir: &TempDir, tmp_dir: &TempDir,
ip: &str, ip: &str,
@ -1920,10 +1930,6 @@ mod tests {
#[cfg(all(target_arch = "aarch64", feature = "acpi"))] #[cfg(all(target_arch = "aarch64", feature = "acpi"))]
fn test_edk2_acpi_launch() { fn test_edk2_acpi_launch() {
let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string()); let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string());
let mut workload_path = dirs::home_dir().unwrap();
workload_path.push("workloads");
let mut edk2_path = workload_path;
edk2_path.push("CLOUDHV_EFI.fd");
vec![Box::new(focal)].drain(..).for_each(|disk_config| { vec![Box::new(focal)].drain(..).for_each(|disk_config| {
let guest = Guest::new(disk_config); let guest = Guest::new(disk_config);
@ -1931,7 +1937,7 @@ mod tests {
let mut child = GuestCommand::new(&guest) let mut child = GuestCommand::new(&guest)
.args(&["--cpus", "boot=1"]) .args(&["--cpus", "boot=1"])
.args(&["--memory", "size=512M"]) .args(&["--memory", "size=512M"])
.args(&["--kernel", edk2_path.to_str().unwrap()]) .args(&["--kernel", edk2_path().to_str().unwrap()])
.default_disks() .default_disks()
.default_net() .default_net()
.args(&["--serial", "tty", "--console", "off"]) .args(&["--serial", "tty", "--console", "off"])
@ -2221,13 +2227,16 @@ mod tests {
} }
#[test] #[test]
#[cfg(target_arch = "x86_64")] #[cfg(feature = "acpi")]
fn test_guest_numa_nodes() { fn test_guest_numa_nodes() {
let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string()); let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string());
let guest = Guest::new(Box::new(focal)); let guest = Guest::new(Box::new(focal));
let api_socket = temp_api_path(&guest.tmp_dir); let api_socket = temp_api_path(&guest.tmp_dir);
#[cfg(target_arch = "x86_64")]
let kernel_path = direct_kernel_boot_path(); let kernel_path = direct_kernel_boot_path();
#[cfg(target_arch = "aarch64")]
let kernel_path = edk2_path();
let mut child = GuestCommand::new(&guest) let mut child = GuestCommand::new(&guest)
.args(&["--cpus", "boot=6,max=12"]) .args(&["--cpus", "boot=6,max=12"])
@ -2272,6 +2281,10 @@ mod tests {
assert!(guest.check_numa_node_distances(1, "20 10 25").unwrap()); assert!(guest.check_numa_node_distances(1, "20 10 25").unwrap());
assert!(guest.check_numa_node_distances(2, "25 30 10").unwrap()); assert!(guest.check_numa_node_distances(2, "25 30 10").unwrap());
// AArch64 currently does not support hotplug, and therefore we only
// test hotplug-related function on x86_64 here.
#[cfg(target_arch = "x86_64")]
{
guest.enable_memory_hotplug(); guest.enable_memory_hotplug();
// Resize every memory zone and check each associated NUMA node // Resize every memory zone and check each associated NUMA node
@ -2292,6 +2305,7 @@ mod tests {
guest.check_numa_node_cpus(0, vec![0, 1, 2, 9]).unwrap(); guest.check_numa_node_cpus(0, vec![0, 1, 2, 9]).unwrap();
guest.check_numa_node_cpus(1, vec![3, 4, 6, 7, 8]).unwrap(); guest.check_numa_node_cpus(1, vec![3, 4, 6, 7, 8]).unwrap();
guest.check_numa_node_cpus(2, vec![5, 10, 11]).unwrap(); guest.check_numa_node_cpus(2, vec![5, 10, 11]).unwrap();
}
}); });
let _ = child.kill(); let _ = child.kill();