SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cgroup: don't generate BPF firewall unsupported warning on wrong unit

Browse Source 
Let's generate the warning on a unit that actually needs the BPF
firewall, and not confusingly already for a sibling of one.
This commit is contained in:
Lennart Poettering
2021-02-25 16:31:46 +09:00
committed by Yu Watanabe
parent 249a967f62
commit a437c5e4da
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/cgroup.c
+8 -8
View File
@@ -1623,20 +1623,20 @@ CGroupMask unit_get_ancestor_disable_mask(Unit *u) {
}
CGroupMask unit_get_target_mask(Unit *u) {
CGroupMask mask;
CGroupMask own_mask, mask;
/* This returns the cgroup mask of all controllers to enable
* for a specific cgroup, i.e. everything it needs itself,
* plus all that its children need, plus all that its siblings
* need. This is primarily useful on the legacy cgroup
* hierarchy, where we need to duplicate each cgroup in each
/* This returns the cgroup mask of all controllers to enable for a specific cgroup, i.e. everything
* it needs itself, plus all that its children need, plus all that its siblings need. This is
* primarily useful on the legacy cgroup hierarchy, where we need to duplicate each cgroup in each
* hierarchy that shall be enabled for it. */
mask = unit_get_own_mask(u) | unit_get_members_mask(u) | unit_get_siblings_mask(u);
own_mask = unit_get_own_mask(u);
if (mask & CGROUP_MASK_BPF_FIREWALL & ~u->manager->cgroup_supported)
if (own_mask & CGROUP_MASK_BPF_FIREWALL & ~u->manager->cgroup_supported)
emit_bpf_firewall_warning(u);
mask = own_mask | unit_get_members_mask(u) | unit_get_siblings_mask(u);
mask &= u->manager->cgroup_supported;
mask &= ~unit_get_ancestor_disable_mask(u);