Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[1.1] cgroups: cpuset: fix byte order while parsing cpuset range to bits #3808

Merged
merged 2 commits into from
Apr 7, 2023
Merged

[1.1] cgroups: cpuset: fix byte order while parsing cpuset range to bits #3808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26a58fd
cgroups: cpuset: fix byte order while parsing cpuset range to bits
yukariatlas Sep 26, 2022
165d232
tests/int: add a "update cpuset cpus range via v2 unified map" test
yukariatlas Oct 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions libcontainer/cgroups/systemd/cpuset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,10 @@ func RangeToBits(str string) ([]byte, error) {
// do not allow empty values
return nil, errors.New("empty value")
}

// fit cpuset parsing order in systemd
for l, r := 0, len(ret)-1; l < r; l, r = l+1, r-1 {
ret[l], ret[r] = ret[r], ret[l]
}
return ret, nil
}
6 changes: 3 additions & 3 deletions libcontainer/cgroups/systemd/cpuset_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ func TestRangeToBits(t *testing.T) {
{in: "4-7", out: []byte{0xf0}},
{in: "0-7", out: []byte{0xff}},
{in: "0-15", out: []byte{0xff, 0xff}},
{in: "16", out: []byte{1, 0, 0}},
{in: "0-3,32-33", out: []byte{3, 0, 0, 0, 0x0f}},
{in: "16", out: []byte{0, 0, 1}},
{in: "0-3,32-33", out: []byte{0x0f, 0, 0, 0, 3}},
// extra spaces and tabs are ok
{in: "1, 2, 1-2", out: []byte{6}},
{in: " , 1 , 3 , 5-7, ", out: []byte{0xea}},
// somewhat large values
{in: "128-130,1", out: []byte{7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2}},
{in: "128-130,1", out: []byte{2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7}},

{in: "-", isErr: true},
{in: "1-", isErr: true},
Expand Down
7 changes: 7 additions & 0 deletions tests/integration/helpers.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,13 @@ function requires() {
skip_me=1
fi
;;
more_than_8_core)
local cpus
cpus=$(grep -c '^processor' /proc/cpuinfo)
if [ "$cpus" -le 8 ]; then
skip_me=1
fi
;;
*)
fail "BUG: Invalid requires $var."
;;
Expand Down
27 changes: 27 additions & 0 deletions tests/integration/update.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,6 +559,33 @@ EOF
check_systemd_value "AllowedMemoryNodes" 1
}

@test "update cpuset cpus range via v2 unified map" {
# This test assumes systemd >= v244
[ $EUID -ne 0 ] && requires rootless_cgroup
requires systemd cgroups_v2 more_than_8_core cgroups_cpuset

update_config ' .linux.resources.unified |= {
"cpuset.cpus": "0-5",
}'
runc run -d --console-socket "$CONSOLE_SOCKET" test_update
[ "$status" -eq 0 ]

# check that the initial value was properly set
check_systemd_value "AllowedCPUs" "0-5"

runc update -r - test_update <<EOF
{
"unified": {
"cpuset.cpus": "5-8"
}
}
EOF
[ "$status" -eq 0 ]

# check the updated systemd unit property, the value should not be affected by byte order
check_systemd_value "AllowedCPUs" "5-8"
}

@test "update rt period and runtime" {
[[ "$ROOTLESS" -ne 0 ]] && requires rootless_cgroup
requires cgroups_v1 cgroups_rt no_systemd
Expand Down