From 60c728adf7e716ca23e2d300d3955c60265a28c6 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 24 Nov 2017 19:51:36 +0100 Subject: [PATCH] unit: initialize bpf cgroup realization state properly Before this patch, the bpf cgroup realization state was implicitly set to "NO", meaning that the bpf configuration was realized but was turned off. That means invalidation requests for the bpf stuff (which we issue in blanket fashion when doing a daemon reload) would actually later result in a us re-realizing the unit, under the assumption it was already realized once, even though in reality it never was realized before. This had the effect that after each daemon-reload we'd end up realizing *all* defined units, even the unloaded ones, populating cgroupfs with lots of unneeded empty cgroups. With this fix we properly set the realiazation state to "INVALIDATED", i.e. indicating the bpf stuff was never set up for the unit, and hence when we try to invalidate it later we won't do anything. --- src/core/cgroup.c | 4 ++-- src/core/unit.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/core/cgroup.c b/src/core/cgroup.c index 51c52cc..4208d1d 100644 --- a/src/core/cgroup.c +++ b/src/core/cgroup.c @@ -2436,7 +2436,7 @@ void unit_invalidate_cgroup(Unit *u, CGroupMask m) { if (m & (CGROUP_MASK_CPU | CGROUP_MASK_CPUACCT)) m |= CGROUP_MASK_CPU | CGROUP_MASK_CPUACCT; - if ((u->cgroup_realized_mask & m) == 0) + if ((u->cgroup_realized_mask & m) == 0) /* NOP? */ return; u->cgroup_realized_mask &= ~m; @@ -2449,7 +2449,7 @@ void unit_invalidate_cgroup_bpf(Unit *u) { if (!UNIT_HAS_CGROUP_CONTEXT(u)) return; - if (u->cgroup_bpf_state == UNIT_CGROUP_BPF_INVALIDATED) + if (u->cgroup_bpf_state == UNIT_CGROUP_BPF_INVALIDATED) /* NOP? */ return; u->cgroup_bpf_state = UNIT_CGROUP_BPF_INVALIDATED; diff --git a/src/core/unit.c b/src/core/unit.c index c419cae..a5feb11 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -108,6 +108,7 @@ Unit *unit_new(Manager *m, size_t size) { u->ref_uid = UID_INVALID; u->ref_gid = GID_INVALID; u->cpu_usage_last = NSEC_INFINITY; + u->cgroup_bpf_state = UNIT_CGROUP_BPF_INVALIDATED; u->ip_accounting_ingress_map_fd = -1; u->ip_accounting_egress_map_fd = -1; -- 2.7.4