diff options
Diffstat (limited to 'src/core/cgroup.c')
| -rw-r--r-- | src/core/cgroup.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/core/cgroup.c b/src/core/cgroup.c index a7ce3fceaa..7b817dc225 100644 --- a/src/core/cgroup.c +++ b/src/core/cgroup.c @@ -881,7 +881,7 @@ static void cgroup_context_apply( /* In fully unified mode these attributes don't exist on the host cgroup root. On legacy the weights exist, but * setting the weight makes very little sense on the host root cgroup, as there are no other cgroups at this * level. The quota exists there too, but any attempt to write to it is refused with EINVAL. Inside of - * containers we want to leave control of these to the container manager (and if cgroupsv2 delegation is used + * containers we want to leave control of these to the container manager (and if cgroup v2 delegation is used * we couldn't even write to them if we wanted to). */ if ((apply_mask & CGROUP_MASK_CPU) && !is_local_root) { @@ -925,7 +925,7 @@ static void cgroup_context_apply( } } - /* The 'io' controller attributes are not exported on the host's root cgroup (being a pure cgroupsv2 + /* The 'io' controller attributes are not exported on the host's root cgroup (being a pure cgroup v2 * controller), and in case of containers we want to leave control of these attributes to the container manager * (and we couldn't access that stuff anyway, even if we tried if proper delegation is used). */ if ((apply_mask & CGROUP_MASK_IO) && !is_local_root) { @@ -1067,7 +1067,7 @@ static void cgroup_context_apply( /* In unified mode 'memory' attributes do not exist on the root cgroup. In legacy mode 'memory.limit_in_bytes' * exists on the root cgroup, but any writes to it are refused with EINVAL. And if we run in a container we - * want to leave control to the container manager (and if proper cgroupsv2 delegation is used we couldn't even + * want to leave control to the container manager (and if proper cgroup v2 delegation is used we couldn't even * write to this if we wanted to.) */ if ((apply_mask & CGROUP_MASK_MEMORY) && !is_local_root) { @@ -1109,7 +1109,7 @@ static void cgroup_context_apply( } } - /* On cgroupsv2 we can apply BPF everywhere. On cgroupsv1 we apply it everywhere except for the root of + /* On cgroup v2 we can apply BPF everywhere. On cgroup v1 we apply it everywhere except for the root of * containers, where we leave this to the manager */ if ((apply_mask & (CGROUP_MASK_DEVICES | CGROUP_MASK_BPF_DEVICES)) && (is_host_root || cg_all_unified() > 0 || !is_local_root)) { @@ -1841,14 +1841,14 @@ static bool unit_has_mask_realized( /* Returns true if this unit is fully realized. We check four things: * * 1. Whether the cgroup was created at all - * 2. Whether the cgroup was created in all the hierarchies we need it to be created in (in case of cgroupsv1) - * 3. Whether the cgroup has all the right controllers enabled (in case of cgroupsv2) + * 2. Whether the cgroup was created in all the hierarchies we need it to be created in (in case of cgroup v1) + * 3. Whether the cgroup has all the right controllers enabled (in case of cgroup v2) * 4. Whether the invalidation mask is currently zero * * If you wonder why we mask the target realization and enable mask with CGROUP_MASK_V1/CGROUP_MASK_V2: note - * that there are three sets of bitmasks: CGROUP_MASK_V1 (for real cgroupv1 controllers), CGROUP_MASK_V2 (for - * real cgroupv2 controllers) and CGROUP_MASK_BPF (for BPF-based pseudo-controllers). Now, cgroup_realized_mask - * is only matters for cgroupsv1 controllers, and cgroup_enabled_mask only used for cgroupsv2, and if they + * that there are three sets of bitmasks: CGROUP_MASK_V1 (for real cgroup v1 controllers), CGROUP_MASK_V2 (for + * real cgroup v2 controllers) and CGROUP_MASK_BPF (for BPF-based pseudo-controllers). Now, cgroup_realized_mask + * is only matters for cgroup v1 controllers, and cgroup_enabled_mask only used for cgroup v2, and if they * differ in the others, we don't really care. (After all, the cgroup_enabled_mask tracks with controllers are * enabled through cgroup.subtree_control, and since the BPF pseudo-controllers don't show up there, they * simply don't matter. */ |