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

performance-metrics: Be consistent with num_queues

Browse Source 
Don't treat it as the number of pairs. Instead calculate the number of
pairs later when necessary.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2022-02-25 10:46:10 +00:00
parent 70a3564a5e
commit 18d51d3bd1
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
performance-metrics/src/main.rs
View File

@ -228,7 +228,7 @@ const TEST_LIST: [PerformanceTest; 15] = [
name: "performance_virtio_net_throughput_bps_single_queue_rx_bps",
func_ptr: performance_net_throughput,
control: PerformanceTestControl {
num_queues: Some(1), // used as 'queue_pairs'
num_queues: Some(2),
queue_size: Some(256),
net_rx: Some(true),
..PerformanceTestControl::default()
@ -238,7 +238,7 @@ const TEST_LIST: [PerformanceTest; 15] = [
name: "performance_virtio_net_throughput_single_queue_tx_bps",
func_ptr: performance_net_throughput,
control: PerformanceTestControl {
num_queues: Some(1), // used as 'queue_pairs'
num_queues: Some(2),
queue_size: Some(256),
net_rx: Some(false),
..PerformanceTestControl::default()
@ -248,7 +248,7 @@ const TEST_LIST: [PerformanceTest; 15] = [
name: "performance_virtio_net_throughput_multi_queue_rx_bps",
func_ptr: performance_net_throughput,
control: PerformanceTestControl {
num_queues: Some(2), // used as 'queue_pairs'
num_queues: Some(4),
queue_size: Some(1024),
net_rx: Some(true),
..PerformanceTestControl::default()
@ -258,7 +258,7 @@ const TEST_LIST: [PerformanceTest; 15] = [
name: "performance_virtio_net_throughput_multi_queue_tx_bps",
func_ptr: performance_net_throughput,
control: PerformanceTestControl {
num_queues: Some(2), // used as 'queue_pairs'
num_queues: Some(4),
queue_size: Some(1024),
net_rx: Some(false),
..PerformanceTestControl::default()

11
performance-metrics/src/performance_tests.rs
View File

@ -215,7 +215,7 @@ fn measure_virtio_net_throughput(
pub fn performance_net_throughput(control: &PerformanceTestControl) -> f64 {
let test_time = control.test_timeout;
let queue_pairs = control.num_queues.unwrap();
let num_queues = control.num_queues.unwrap();
let queue_size = control.queue_size.unwrap();
let rx = control.net_rx.unwrap();
@ -224,14 +224,11 @@ pub fn performance_net_throughput(control: &PerformanceTestControl) -> f64 {
let net_params = format!(
"tap=,mac={},ip={},mask=255.255.255.0,num_queues={},queue_size={}",
guest.network.guest_mac,
guest.network.host_ip,
queue_pairs * 2,
queue_size,
guest.network.guest_mac, guest.network.host_ip, num_queues, queue_size,
);
let mut child = GuestCommand::new(&guest)
.args(&["--cpus", &format!("boot={}", queue_pairs * 2)])
.args(&["--cpus", &format!("boot={}", num_queues)])
.args(&["--memory", "size=4G"])
.args(&["--kernel", direct_kernel_boot_path().to_str().unwrap()])
.args(&["--cmdline", DIRECT_KERNEL_BOOT_CMDLINE])
@ -244,7 +241,7 @@ pub fn performance_net_throughput(control: &PerformanceTestControl) -> f64 {
let r = std::panic::catch_unwind(|| {
guest.wait_vm_boot(None).unwrap();
measure_virtio_net_throughput(test_time, queue_pairs, &guest, rx).unwrap()
measure_virtio_net_throughput(test_time, num_queues / 2, &guest, rx).unwrap()
});
let _ = child.kill();