Commit 92895216 authored by Jim Harris's avatar Jim Harris Committed by Tomasz Zawadzki
Browse files

test/vhost: replace master_core with main_core 



Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: Ibdf9612a27266ef739d9d10db3fd1d353729644a
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5353


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 87b21afd

scripts/perf/vhost/run_vhost_test.py

+2 −2
Original line number Diff line number Diff line
@@ -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()

test/vhost/common/autotest.config

+1 −1
Original line number Diff line number Diff line 
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

test/vhost/initiator/autotest.config

+1 −1
Original line number Diff line number Diff line 
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

test/vhost/lvol/autotest.config

+1 −1
Original line number Diff line number Diff line 
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

test/vhost/perf_bench/vhost_perf.sh

+3 −3
Original line number Diff line number Diff line
@@ -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