Skip to content

Commit

Permalink
cgroup: make sure that cpuset is supported on cgroup v2 and disabled …
Browse files Browse the repository at this point in the history
…with v1

Resolves: #1808940

(rhel-only)
  • Loading branch information
msekletar authored and systemd-rhel-bot committed Mar 9, 2020
1 parent e809564 commit 5fc2d94
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions src/basic/cgroup-util.c
Original file line number Diff line number Diff line change
Expand Up @@ -2353,10 +2353,10 @@ int cg_mask_supported(CGroupMask *ret) {
if (r < 0)
return r;

/* Currently, we support the cpu, memory, io and pids
/* Currently, we support the cpu, memory, io, pids and cpuset
* controller in the unified hierarchy, mask
* everything else off. */
mask &= CGROUP_MASK_CPU | CGROUP_MASK_MEMORY | CGROUP_MASK_IO | CGROUP_MASK_PIDS;
mask &= CGROUP_MASK_CPU | CGROUP_MASK_MEMORY | CGROUP_MASK_IO | CGROUP_MASK_PIDS | CGROUP_MASK_CPUSET;

} else {
CGroupController c;
Expand All @@ -2367,6 +2367,9 @@ int cg_mask_supported(CGroupMask *ret) {
for (c = 0; c < _CGROUP_CONTROLLER_MAX; c++) {
const char *n;

if (c == CGROUP_CONTROLLER_CPUSET)
continue;

n = cgroup_controller_to_string(c);
if (controller_is_accessible(n) >= 0)
mask |= CGROUP_CONTROLLER_TO_MASK(c);
Expand Down

0 comments on commit 5fc2d94

Please sign in to comment.