.github/workflows/build-test.sh

@@ -47,7 +47,6 @@ PACKAGES=(
     libxkbcommon-dev
     libxtables-dev
     libzstd-dev
-    linux-tools-generic
     mold
     mount
     net-tools
@@ -144,12 +143,6 @@ sudo apt-get -y install "${PACKAGES[@]}"
 pip3 install --user -r .github/workflows/requirements.txt --require-hashes --break-system-packages
 export PATH="$HOME/.local/bin:$PATH"
 
-# TODO: drop after we switch to ubuntu 26.04
-bpftool_dir=$(dirname "$(find /usr/lib/linux-tools/ /usr/lib/linux-tools-* -name 'bpftool' -perm /u=x 2>/dev/null | sort -r | head -n1)")
-if [ -n "$bpftool_dir" ]; then
-    export PATH="$bpftool_dir:$PATH"
-fi
-
 if [[ -n "$CUSTOM_PYTHON" ]]; then
     # If CUSTOM_PYTHON is set we need to pull jinja2 from pip, as a local interpreter is used
     pip3 install --user --break-system-packages jinja2

.github/workflows/codeql.yml

@@ -50,14 +50,7 @@ jobs:
         languages: ${{ matrix.language }}
         config-file: ./.github/codeql-config.yml
 
-    - run: |
+    - run: sudo -E .github/workflows/unit-tests.sh SETUP
-        sudo -E .github/workflows/unit-tests.sh SETUP
-        # TODO: drop after we switch to ubuntu 26.04
-        bpftool_binary=$(find /usr/lib/linux-tools/ /usr/lib/linux-tools-* -name 'bpftool' -perm /u=x 2>/dev/null | sort -r | head -n1)
-        if [ -n "$bpftool_binary" ]; then
-          sudo rm -f /usr/{bin,sbin}/bpftool
-          sudo ln -s "$bpftool_binary" /usr/bin/
-        fi
 
     - name: Autobuild
       uses: github/codeql-action/autobuild@51f77329afa6477de8c49fc9c7046c15b9a4e79d

.github/workflows/coverity.yml

@@ -25,13 +25,6 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       # Reuse the setup phase of the unit test script to avoid code duplication
       - name: Install build dependencies
-        run: |
+        run: sudo -E .github/workflows/unit-tests.sh SETUP
-          sudo -E .github/workflows/unit-tests.sh SETUP
-          # TODO: drop after we switch to ubuntu 26.04
-          bpftool_binary=$(find /usr/lib/linux-tools/ /usr/lib/linux-tools-* -name 'bpftool' -perm /u=x 2>/dev/null | sort -r | head -n1)
-          if [ -n "$bpftool_binary" ]; then
-            sudo rm -f /usr/{bin,sbin}/bpftool
-            sudo ln -s "$bpftool_binary" /usr/bin/
-          fi
       - name: Build & upload the results
         run: tools/coverity.sh

.github/workflows/unit-tests.sh

@@ -18,7 +18,6 @@ ADDITIONAL_DEPS=(
     libtss2-dev
     libxkbcommon-dev
     libzstd-dev
-    linux-tools-generic
     python3-libevdev
     python3-pip
     python3-pyelftools
@@ -75,12 +74,6 @@ for phase in "${PHASES[@]}"; do
             capsh --drop=all -- -c "stat $PWD/meson.build"
             ;;
         RUN|RUN_GCC|RUN_CLANG|RUN_CLANG_RELEASE)
-            # TODO: drop after we switch to ubuntu 26.04
-            bpftool_dir=$(dirname "$(find /usr/lib/linux-tools/ /usr/lib/linux-tools-* -name 'bpftool' -perm /u=x 2>/dev/null | sort -r | head -n1)")
-            if [ -n "$bpftool_dir" ]; then
-                export PATH="$bpftool_dir:$PATH"
-            fi
-
             if [[ "$phase" =~ ^RUN_CLANG ]]; then
                 export CC=clang
                 export CXX=clang++
@@ -112,12 +105,6 @@ for phase in "${PHASES[@]}"; do
             TZ=GMT+12 meson test "${MESON_TEST_ARGS[@]}" -C build --print-errorlogs
             ;;
         RUN_ASAN_UBSAN|RUN_GCC_ASAN_UBSAN|RUN_CLANG_ASAN_UBSAN|RUN_CLANG_ASAN_UBSAN_NO_DEPS)
-            # TODO: drop after we switch to ubuntu 26.04
-            bpftool_dir=$(dirname "$(find /usr/lib/linux-tools/ /usr/lib/linux-tools-* -name 'bpftool' -perm /u=x 2>/dev/null | sort -r | head -n1)")
-            if [ -n "$bpftool_dir" ]; then
-                export PATH="$bpftool_dir:$PATH"
-            fi
-
             MESON_ARGS=(--optimization=1)
 
             if [[ "$phase" =~ ^RUN_CLANG_ASAN_UBSAN ]]; then

src/core/unit.c

@@ -5551,11 +5551,11 @@ int unit_fork_helper_process(Unit *u, const char *name, bool into_cgroup, PidRef
          * with the child's PID. */
 
         if (into_cgroup) {
-                r = unit_realize_cgroup(u);
+                (void) unit_realize_cgroup(u);
-                if (r < 0)
-                        return r;
 
-                crt = unit_get_cgroup_runtime(u);
+                crt = unit_setup_cgroup_runtime(u);
+                if (!crt)
+                        return -ENOMEM;
         }
 
         r = safe_fork(name, FORK_REOPEN_LOG|FORK_DEATHSIG_SIGTERM, &pid);
@@ -6005,9 +6005,7 @@ int unit_prepare_exec(Unit *u) {
 
         /* Prepares everything so that we can fork of a process for this unit */
 
-        r = unit_realize_cgroup(u);
+        (void) unit_realize_cgroup(u);
-        if (r < 0)
-                return r;
 
         CGroupRuntime *crt = unit_get_cgroup_runtime(u);
         if (crt && crt->reset_accounting) {

test/units/TEST-19-CGROUP.abort-on-cgroup-creation-failure.sh

@@ -1,46 +0,0 @@
-#!/usr/bin/env bash
-# SPDX-License-Identifier: LGPL-2.1-or-later
-set -ex
-set -o pipefail
-
-# Test that the service is not invoked if the cgroup cannot be created.
-
-# It seems openSUSE kernel (at least kernel-default-6.16.8-1.1.x86_64.rpm) has a
-# bag in kernel oom killer or clone3 syscall, and spawning executor on a cgroup
-# with too small MemoryMax= triggers infinite loop of OOM kill, and posix_spawn()
-# will never return, and the service manager will stuck.
-####
-# [  119.776797] systemd invoked oom-killer: gfp_mask=0xcc0(GFP_KERNEL), order=0, oom_score_adj=0
-# [  119.776859] CPU: 1 UID: 0 PID: 1472 Comm: systemd Not tainted 6.16.8-1-default #1 PREEMPT(voluntary) openSUSE Tumbleweed  6c85865973e4ae641870ed68afe8933a6986c974
-# [  119.776865] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.17.0-5.fc42 04/01/2014
-# [  119.776867] Call Trace:
-# (snip)
-# [  119.778126] Out of memory and no killable processes...
-####
-# On other distributions, the oom killer is triggered, but clone3 immediately
-# fails with ENOMEM, and such problematic loop does not happen.
-. /etc/os-release
-if [[ "$ID" =~ opensuse ]]; then
-    echo "Skipping cgroup test with too small MemoryMax= setting on openSUSE."
-    exit 0
-fi
-
-cat >/run/systemd/system/testslice.slice <<EOF
-[Slice]
-MemoryMax=1
-EOF
-
-cat >/run/systemd/system/testservice.service <<EOF
-[Service]
-Type=oneshot
-ExecStart=cat /proc/self/cgroup
-Slice=testslice.slice
-EOF
-
-systemctl daemon-reload
-(! systemctl start testservice.service)
-
-rm /run/systemd/system/testslice.slice
-rm /run/systemd/system/testservice.service
-
-exit 0