mirror of
https://github.com/opencontainers/runc.git
synced 2026-07-11 06:03:57 +08:00
Kir Kolyshkin
10ca66bff5
As per - https://github.com/opencontainers/runtime-spec/pull/1253 - https://github.com/opencontainers/runtime-spec/pull/1261 CPU affinity can be set in two ways: 1. When creating/starting a container, in config.json's Process.ExecCPUAffinity, which is when applied to all execs. 2. When running an exec, in process.json's CPUAffinity, which applied to a given exec and overrides the value from (1). Add some basic tests. Note that older kernels (RHEL8, Ubuntu 20.04) change CPU affinity of a process to that of a container's cgroup, as soon as it is moved to that cgroup, while newer kernels (Ubuntu 24.04, Fedora 41) don't do that. Because of the above, - it's impossible to really test initial CPU affinity without adding debug logging to libcontainer/nsenter; - for older kernels, there can be a brief moment when exec's affinity is different than either initial or final affinity being set; - exec's final CPU affinity, if not specified, can be different depending on the kernel, therefore we don't test it. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
102 lines
2.7 KiB
Bash
102 lines
2.7 KiB
Bash
#!/usr/bin/env bats
|
|
# Exec CPU affinity tests. For more details, see:
|
|
# - https://github.com/opencontainers/runtime-spec/pull/1253
|
|
|
|
load helpers
|
|
|
|
function setup() {
|
|
requires smp cgroups_cpuset
|
|
setup_busybox
|
|
}
|
|
|
|
function teardown() {
|
|
teardown_bundle
|
|
}
|
|
|
|
function first_cpu() {
|
|
sed 's/[-,].*//g' </sys/devices/system/cpu/online
|
|
}
|
|
|
|
# Convert list of cpus ("0,1" or "0-1") to mask as printed by nsexec.
|
|
# NOTE the range conversion is not proper, merely sufficient for tests here.
|
|
function cpus_to_mask() {
|
|
local cpus=$* mask=0
|
|
|
|
cpus=${cpus//,/-} # 1. "," --> "-".
|
|
cpus=${cpus//-/ } # 2. "-" --> " ".
|
|
|
|
for c in $cpus; do
|
|
mask=$((mask | 1 << c))
|
|
done
|
|
|
|
printf "0x%x" $mask
|
|
}
|
|
|
|
@test "runc exec [CPU affinity, only initial set from process.json]" {
|
|
first="$(first_cpu)"
|
|
second=$((first + 1)) # Hacky; might not work in all environments.
|
|
|
|
runc run -d --console-socket "$CONSOLE_SOCKET" ct1
|
|
[ "$status" -eq 0 ]
|
|
|
|
for cpus in "$second" "$first-$second" "$first,$second" "$first"; do
|
|
proc='
|
|
{
|
|
"terminal": false,
|
|
"execCPUAffinity": {
|
|
"initial": "'$cpus'"
|
|
},
|
|
"args": [ "/bin/true" ],
|
|
"cwd": "/"
|
|
}'
|
|
mask=$(cpus_to_mask "$cpus")
|
|
echo "CPUS: $cpus, mask: $mask"
|
|
runc --debug exec --process <(echo "$proc") ct1
|
|
[[ "$output" == *"nsexec"*": affinity: $mask"* ]]
|
|
done
|
|
}
|
|
|
|
@test "runc exec [CPU affinity, initial and final set from process.json]" {
|
|
first="$(first_cpu)"
|
|
second=$((first + 1)) # Hacky; might not work in all environments.
|
|
|
|
runc run -d --console-socket "$CONSOLE_SOCKET" ct1
|
|
[ "$status" -eq 0 ]
|
|
|
|
for cpus in "$second" "$first-$second" "$first,$second" "$first"; do
|
|
proc='
|
|
{
|
|
"terminal": false,
|
|
"execCPUAffinity": {
|
|
"initial": "'$cpus'",
|
|
"final": "'$cpus'"
|
|
},
|
|
"args": [ "/bin/grep", "-F", "Cpus_allowed_list:", "/proc/self/status" ],
|
|
"cwd": "/"
|
|
}'
|
|
mask=$(cpus_to_mask "$cpus")
|
|
exp=${cpus//,/-} # "," --> "-".
|
|
echo "CPUS: $cpus, mask: $mask, final: $exp"
|
|
runc --debug exec --process <(echo "$proc") ct1
|
|
[[ "$output" == *"nsexec"*": affinity: $mask"* ]]
|
|
[[ "$output" == *"Cpus_allowed_list: $exp"* ]] # Mind the literal tab.
|
|
done
|
|
}
|
|
|
|
@test "runc exec [CPU affinity, initial and final set from config.json]" {
|
|
initial="$(first_cpu)"
|
|
final=$((initial + 1)) # Hacky; might not work in all environments.
|
|
|
|
update_config " .process.execCPUAffinity.initial = \"$initial\"
|
|
| .process.execCPUAffinity.final = \"$final\""
|
|
|
|
runc run -d --console-socket "$CONSOLE_SOCKET" ct1
|
|
[ "$status" -eq 0 ]
|
|
|
|
runc --debug exec ct1 grep "Cpus_allowed_list:" /proc/self/status
|
|
[ "$status" -eq 0 ]
|
|
mask=$(cpus_to_mask "$initial")
|
|
[[ "$output" == *"nsexec"*": affinity: $mask"* ]]
|
|
[[ "$output" == *"Cpus_allowed_list: $final"* ]] # Mind the literal tab.
|
|
}
|