diff --git a/scripts/perf/vhost/run_vhost_test.py b/scripts/perf/vhost/run_vhost_test.py index 8ee235504..1abb0bc4b 100644 --- a/scripts/perf/vhost/run_vhost_test.py +++ b/scripts/perf/vhost/run_vhost_test.py @@ -40,7 +40,7 @@ def gen_spdk_cpu_mask_config(spdk_cpu_list): cpu_indexes.sort() print(cpu_indexes) - pr_core = "vhost_0_master_core=%s" % (cpu_indexes[0]) + pr_core = "vhost_0_main_core=%s" % (cpu_indexes[0]) return "\n".join([cpus, pr_core, "\n"]) @@ -177,7 +177,7 @@ cpu_cfg_load = subparsers.add_parser('load_cpu_cfg', test/vhost/common/autotest.config") cpu_cfg_load.add_argument('custom_mask_file', default=None, help="Path to file with custom values for vhost's\ - reactor mask and master core, and each VM's qemu mask\ + reactor mask and main core, and each VM's qemu mask\ and qemu numa node") args = parser.parse_args() diff --git a/test/vhost/common/autotest.config b/test/vhost/common/autotest.config index 96b0d08be..0b0b8c340 100644 --- a/test/vhost/common/autotest.config +++ b/test/vhost/common/autotest.config @@ -1,5 +1,5 @@ vhost_0_reactor_mask="[0]" -vhost_0_master_core=0 +vhost_0_main_core=0 VM_0_qemu_mask=1-2 VM_0_qemu_numa_node=0 diff --git a/test/vhost/initiator/autotest.config b/test/vhost/initiator/autotest.config index 61a1a2424..41d5d4d04 100644 --- a/test/vhost/initiator/autotest.config +++ b/test/vhost/initiator/autotest.config @@ -1,5 +1,5 @@ vhost_0_reactor_mask=["0"] -vhost_0_master_core=0 +vhost_0_main_core=0 VM_0_qemu_mask=1-10 VM_0_qemu_numa_node=0 diff --git a/test/vhost/lvol/autotest.config b/test/vhost/lvol/autotest.config index 9b653cd7f..4e17b5383 100644 --- a/test/vhost/lvol/autotest.config +++ b/test/vhost/lvol/autotest.config @@ -1,5 +1,5 @@ vhost_0_reactor_mask="[0-31]" -vhost_0_master_core=0 +vhost_0_main_core=0 VM_0_qemu_mask=1 VM_0_qemu_numa_node=0 diff --git a/test/vhost/perf_bench/vhost_perf.sh b/test/vhost/perf_bench/vhost_perf.sh index 83edfab87..e6e879894 100755 --- a/test/vhost/perf_bench/vhost_perf.sh +++ b/test/vhost/perf_bench/vhost_perf.sh @@ -198,8 +198,8 @@ if [[ -n $custom_cpu_cfg ]]; then source $custom_cpu_cfg vhost_reactor_mask="vhost_${vhost_num}_reactor_mask" vhost_reactor_mask="${!vhost_reactor_mask}" - vhost_master_core="vhost_${vhost_num}_master_core" - vhost_master_core="${!vhost_master_core}" + vhost_main_core="vhost_${vhost_num}_main_core" + vhost_main_core="${!vhost_main_core}" fi if [[ -z $fio_jobs ]]; then @@ -301,7 +301,7 @@ if [[ "$ctrl_type" == "kernel_vhost" ]]; then targetcli ls else notice "Configuring SPDK vhost..." - vhost_run "${vhost_num}" "--no-gen-nvme" "-p ${vhost_master_core}" "-m ${vhost_reactor_mask}" + vhost_run "${vhost_num}" "--no-gen-nvme" "-p ${vhost_main_core}" "-m ${vhost_reactor_mask}" notice "..." if [[ $use_split == true ]]; then