d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

test/scheduler: Commonize collect_cpu_idle()

Browse Source 
Signed-off-by: Michal Berger <michalx.berger@intel.com>
Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/7564 (master)

(cherry picked from commit 330e9f779c)
Change-Id: I72da312e0d7fe71ae40b582501b52be615de4b63
Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9992
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Krzysztof Karas <krzysztof.karas@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Michal Berger 2021-04-22 18:03:00 +02:00 committed by Tomasz Zawadzki
parent 64b08f6ea3
commit 10807f35f9
2 changed files with 32 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
test/scheduler/common.sh
View File

@ -485,3 +485,35 @@ get_cpu_time() {
xtrace_restore
}
collect_cpu_idle() {
((${#cpus_to_collect[@]} > 0)) || return 1
local time=${1:-5}
local cpu
local samples
local -g is_idle=()
printf 'Collecting cpu idle stats (cpus: %s) for %u seconds...\n' \
"${cpus_to_collect[*]}" "$time"
get_cpu_time "$time" idle "${cpus_to_collect[@]}"
for cpu in "${cpus_to_collect[@]}"; do
samples=(${cpu_times[cpu]})
printf '* cpu%u idle samples: %s (avg: %u%%)\n' \
"$cpu" "${samples[*]}" "${avg_cpu_time[cpu]}"
# Cores with polling reactors have 0% idle time,
# while the ones in interrupt mode won't have 100% idle.
# Work can be potentially be scheduled to the core by kernel,
# to prevent that affecting tests set reasonably high idle limit.
# Consider last sample
if ((samples[-1] >= 70)); then
printf '* cpu%u is idle\n' "$cpu"
is_idle[cpu]=1
else
printf '*cpu%u is not idle\n' "$cpu"
is_idle[cpu]=0
fi
done
}

56
test/scheduler/interrupt.sh
View File

@ -15,62 +15,6 @@ fold_list_onto_array cpus $(parse_cpu_list <(echo "$spdk_cpus_csv"))
# Normalize the indexes
cpus=("${cpus[@]}")
collect_cpu_stat() {
local list=$1
local stat=$2
for cpu in "${cpus_to_collect[@]}"; do
eval "${list}[cpu]=\$(get_cpu_stat $cpu $stat)"
done
}
collect_cpu_idle() {
xtrace_disable
local sample_time=${1:-5} samples=0
local cpu bool inc user_hz
# idle scales to USER_HZ so we use that in order to determine the expected
# value it should have been increased to (more or less).
user_hz=100
# Expected increase of the idle stat
inc=$((user_hz * sample_time))
bool[0]="not" bool[1]="is"
init_idle_samples=() idle_samples=() is_idle=()
collect_cpu_stat init_idle_samples idle
printf 'Collecting cpu idle stats (cpus: %s) for %u seconds...\n' \
"${cpus_to_collect[*]}" "$sample_time"
while ((++samples <= sample_time)) && sleep 1s; do
collect_cpu_stat idle_samples idle
done
for cpu in "${!idle_samples[@]}"; do
# We start to collect after the spdk app is initialized hence if the interrupt
# mode is not working as expected, the idle time of given cpu will not have a
# chance to increase. If it does work correctly, then it should change even for
# a fraction, depending on how much time we spent on collecting this data.
# If idle time is over 70% of expected increase then we consider this cpu as
# idle. This is done in order to take into consideration time window the app
# needs to actually spin up|down the cpu. It's also taken for granted that
# there is no extra load on the target cpus which may be coming from other
# processes.
if ((idle_samples[cpu] > init_idle_samples[cpu] + (inc * 70 / 100))); then
is_idle[cpu]=1
else
is_idle[cpu]=0
fi
printf 'cpu%u %s idle (%u %u)\n' \
"$cpu" "${bool[is_idle[cpu]]}" "${init_idle_samples[cpu]}" "${idle_samples[cpu]}"
done
xtrace_restore
}
interrupt() {
local busy_cpus
local cpu thread