ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test/vhost: replace master_core with main_core

Browse Source 
Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: Ibdf9612a27266ef739d9d10db3fd1d353729644a
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5353
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Jim Harris 2020-11-30 20:20:12 +00:00 committed by Tomasz Zawadzki
parent 87b21afd65
commit 9289521630
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/perf/vhost/run_vhost_test.py
View File

@ -40,7 +40,7 @@ def gen_spdk_cpu_mask_config(spdk_cpu_list):
cpu_indexes.sort() cpu_indexes.sort()
print(cpu_indexes) 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"]) 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") test/vhost/common/autotest.config")
cpu_cfg_load.add_argument('custom_mask_file', default=None, cpu_cfg_load.add_argument('custom_mask_file', default=None,
help="Path to file with custom values for vhost's\ 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") and qemu numa node")
args = parser.parse_args() args = parser.parse_args()

2
test/vhost/common/autotest.config
View File

@ -1,5 +1,5 @@
vhost_0_reactor_mask="[0]" vhost_0_reactor_mask="[0]"
vhost_0_master_core=0 vhost_0_main_core=0
VM_0_qemu_mask=1-2 VM_0_qemu_mask=1-2
VM_0_qemu_numa_node=0 VM_0_qemu_numa_node=0

2
test/vhost/initiator/autotest.config
View File

@ -1,5 +1,5 @@
vhost_0_reactor_mask=["0"] vhost_0_reactor_mask=["0"]
vhost_0_master_core=0 vhost_0_main_core=0
VM_0_qemu_mask=1-10 VM_0_qemu_mask=1-10
VM_0_qemu_numa_node=0 VM_0_qemu_numa_node=0

2
test/vhost/lvol/autotest.config
View File

@ -1,5 +1,5 @@
vhost_0_reactor_mask="[0-31]" vhost_0_reactor_mask="[0-31]"
vhost_0_master_core=0 vhost_0_main_core=0
VM_0_qemu_mask=1 VM_0_qemu_mask=1
VM_0_qemu_numa_node=0 VM_0_qemu_numa_node=0

6
test/vhost/perf_bench/vhost_perf.sh
View File

@ -198,8 +198,8 @@ if [[ -n $custom_cpu_cfg ]]; then
source $custom_cpu_cfg source $custom_cpu_cfg
vhost_reactor_mask="vhost_${vhost_num}_reactor_mask" vhost_reactor_mask="vhost_${vhost_num}_reactor_mask"
vhost_reactor_mask="${!vhost_reactor_mask}" vhost_reactor_mask="${!vhost_reactor_mask}"
vhost_master_core="vhost_${vhost_num}_master_core" vhost_main_core="vhost_${vhost_num}_main_core"
vhost_master_core="${!vhost_master_core}" vhost_main_core="${!vhost_main_core}"
fi fi
if [[ -z $fio_jobs ]]; then if [[ -z $fio_jobs ]]; then
@ -301,7 +301,7 @@ if [[ "$ctrl_type" == "kernel_vhost" ]]; then
targetcli ls targetcli ls
else else
notice "Configuring SPDK vhost..." 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 "..." notice "..."
if [[ $use_split == true ]]; then if [[ $use_split == true ]]; then