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

test/vhost: Fix SPDK cpumask for distribute_cores

Browse Source 
Signed-off-by: Michal Berger <michalx.berger@intel.com>
Change-Id: I474b6c9ac755626958bc51f491f0ce2dc63a0475
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6731
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Michal Berger 2021-03-05 09:36:20 +01:00 committed by Tomasz Zawadzki
parent a4e1d715f7
commit 70c7114958
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/vhost/lvol/lvol_test.sh
View File

@ -74,9 +74,20 @@ done
vhosttestinit vhosttestinit
spdk_mask=$vhost_0_reactor_mask
if $distribute_cores; then if $distribute_cores; then
# FIXME: this need to be handled entirely in common.sh # FIXME: this need to be handled entirely in common.sh
source $testdir/autotest.config 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 fi
trap 'error_exit "${FUNCNAME}" "${LINENO}"' SIGTERM SIGABRT ERR trap 'error_exit "${FUNCNAME}" "${LINENO}"' SIGTERM SIGABRT ERR
@ -84,7 +95,7 @@ trap 'error_exit "${FUNCNAME}" "${LINENO}"' SIGTERM SIGABRT ERR
vm_kill_all vm_kill_all
notice "running SPDK vhost" notice "running SPDK vhost"
vhost_run 0 vhost_run 0 --cpumask $spdk_mask
notice "..." notice "..."
trap 'clean_lvol_cfg; error_exit "${FUNCNAME}" "${LINENO}"' SIGTERM SIGABRT ERR 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" setup_cmd+=" --os=$VM_IMAGE"
# Create single SCSI controller or multiple BLK controllers for this VM # Create single SCSI controller or multiple BLK controllers for this VM
if $distribute_cores; then mask_arg="--cpumask $spdk_mask"
mask="VM_${i}_qemu_mask"
mask_arg="--cpumask ${!mask}"
fi
if [[ "$ctrl_type" == "spdk_vhost_scsi" ]]; then if [[ "$ctrl_type" == "spdk_vhost_scsi" ]]; then
$rpc_py vhost_create_scsi_controller naa.0.$i $mask_arg $rpc_py vhost_create_scsi_controller naa.0.$i $mask_arg