Commit 70c71149 authored by Michal Berger's avatar Michal Berger Committed by Tomasz Zawadzki
Browse files

test/vhost: Fix SPDK cpumask for distribute_cores 



Signed-off-by: default avatarMichal Berger <michalx.berger@intel.com>
Change-Id: I474b6c9ac755626958bc51f491f0ce2dc63a0475
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6731


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent a4e1d715

test/vhost/lvol/lvol_test.sh

+13 −5
Original line number Diff line number Diff line
@@ -74,9 +74,20 @@ done 


vhosttestinit



spdk_mask=$vhost_0_reactor_mask

if $distribute_cores; then

	# FIXME: this need to be handled entirely in common.sh

	source $testdir/autotest.config

	# Adjust the mask so vhost runs on separate cpus than qemu instances.

	# We know that .config sets qemus to run on single cpu so simply take

	# the next cpu and add some extra.

	# FIXME: Rewrite this so the config is more aware of what cpu topology

	# is actually available on the host system.

	spdk_mask=$((1 << vm_count))

	((spdk_mask |= 1 << (vm_count + 1)))

	((spdk_mask |= 1 << (vm_count + 2)))

	((spdk_mask |= 1 << (vm_count + 3)))

	spdk_mask=$(printf '0x%x' "$spdk_mask")

fi



trap 'error_exit "${FUNCNAME}" "${LINENO}"' SIGTERM SIGABRT ERR
@@ -84,7 +95,7 @@ trap 'error_exit "${FUNCNAME}" "${LINENO}"' SIGTERM SIGABRT ERR 
vm_kill_all



notice "running SPDK vhost"

vhost_run 0

vhost_run 0 --cpumask $spdk_mask

notice "..."



trap 'clean_lvol_cfg; error_exit "${FUNCNAME}" "${LINENO}"' SIGTERM SIGABRT ERR
@@ -123,10 +134,7 @@ for ((i = 0; i < vm_count; i++)); do 
	setup_cmd+=" --os=$VM_IMAGE"



	# Create single SCSI controller or multiple BLK controllers for this VM

	if $distribute_cores; then

		mask="VM_${i}_qemu_mask"

		mask_arg="--cpumask ${!mask}"

	fi

	mask_arg="--cpumask $spdk_mask"



	if [[ "$ctrl_type" == "spdk_vhost_scsi" ]]; then

		$rpc_py vhost_create_scsi_controller naa.0.$i $mask_arg