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

test/scheduler: Use CPU list rather than cpumask 



When we select CPUs for the scheduler tests we pick up all siblings
from given core. On some nodes in the CI these threads may have IDs
in ranges that simply overflow during the shift operation ( > 62).

To avoid this, use a list instead of a mask. Also, deny all threads
with IDs > 127 as DPDK doesn't support them anyway.

cherry-pick: 5ad2877d
Signed-off-by: default avatarMichal Berger <michal.berger@intel.com>
Change-Id: Ib83649a762cb31a460184d1e0b594c112aea2bab
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17027


Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent c022702e

test/scheduler/common.sh

+2 −8
Original line number Diff line number Diff line
@@ -143,13 +143,7 @@ offline_cpu() { 
}



mask_cpus() {

	local cpu

	local mask=0



	for cpu; do

		((mask |= 1 << cpu))

	done

	printf '0x%x\n' "$mask"

	printf '[%s]\n' "$(fold_array_onto_string "$@")"

}



denied_list() {
@@ -162,7 +156,7 @@ filter_allowed_list() { 
	local cpu



	for cpu in "${!allowed[@]}"; do

		if [[ -n ${denied[cpu]} ]]; then

		if [[ -n ${denied[cpu]} ]] || ((cpu > 127)); then

			unset -v "allowed[cpu]"

		fi

	done

test/scheduler/idle.sh

+2 −3
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ thread_stats() { 
idle() {

	local reactor_framework

	local reactors thread

	local cpumask thread_cpumask

	local thread_cpumask

	local threads



	exec_under_dynamic_scheduler "${SPDK_APP[@]}" -m "$spdk_cpumask" --main-core "$spdk_main_core"
@@ -53,10 +53,9 @@ idle() { 


		for thread in "${threads[@]}"; do

			thread_cpumask=0x$(jq -r "select(.lcore == $spdk_main_core) | .lw_threads[] | select(.name == \"$thread\") | .cpumask" <<< "$reactor_framework")

			((cpumask |= thread_cpumask))

			printf 'SPDK cpumask: %s Thread %s cpumask: %s\n' "$spdk_cpumask" "$thread" "$thread_cpumask"

		done



		printf 'SPDK cpumask: %x Threads cpumask: %x\n' "$spdk_cpumask" "$cpumask"

		thread_stats

	done