Skip to content

datapath: strictly require more BPF functionality #39384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 5 commits into from
May 12, 2025
Merged

datapath: strictly require more BPF functionality #39384

merged 5 commits into from
May 12, 2025

Conversation

julianwiedmann
Copy link
Member

@julianwiedmann julianwiedmann commented May 7, 2025 •
edited
Loading

With #38308 merged, we can unconditionally require a bunch of BPF functionality that's provided by all v5.10+ kernels. And remove the corresponding fallback paths.

@maintainer-s-little-helper maintainer-s-little-helper bot added the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label May 7, 2025
@julianwiedmann
Copy link
Member Author

/test

@julianwiedmann
Copy link
Member Author

/ci-e2e-upgrade

@julianwiedmann
datapath: require HAVE_CSUM_LEVEL
1846f11 
The corresponding helper is available as of kernel v5.8, and thus covered
by our new v5.10 requirement.

Intentionally leaving the empty infrastructure for writeSkbHeader() behind,
to match the XDP case.

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
@julianwiedmann
datapath: require bpf_skb_change_tail()
300ebf4 
This helper has been available ever since kernel v4.9, just require it
unconditionally.

Given that the datapath doesn't even seem to use this probe, we could also
remove it entirely.

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
@julianwiedmann
datapath: require HAVE_CGROUP_ID
38cf8db 
bpf_get_current_cgroup_id() is available since kernel v4.18, just require
it unconditionally.

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
@julianwiedmann
Copy link
Member Author

/test

1 similar comment
@julianwiedmann
Copy link
Member Author

/test

@julianwiedmann
Copy link
Member Author

/test

@julianwiedmann
datapath: require HAVE_NETNS_COOKIE
b77c96d 
The needed helpers are available since kernel v5.7, just require them
unconditionally.

Fixes: cilium#29736
Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
@julianwiedmann
datapath: require HAVE_JIFFIES
fa887a5 
The relevant helpers are available since kernel 5.6, just require them
unconditionally.

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
@julianwiedmann julianwiedmann added area/loader Impacts the loading of BPF programs into the kernel. area/datapath Impacts bpf/ or low-level forwarding details, including map management and monitor messages. release-note/misc This PR makes changes that have no direct user impact. labels May 8, 2025
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label May 8, 2025
@julianwiedmann julianwiedmann added the area/kernel Requires upstream work in the Linux kernel. label May 8, 2025
@julianwiedmann
Copy link
Member Author

/test

@julianwiedmann julianwiedmann changed the title 1.18 bpf helpers datapath: strictly require more BPF functionality May 8, 2025
@julianwiedmann julianwiedmann marked this pull request as ready for review May 8, 2025 18:12
@julianwiedmann julianwiedmann requested review from a team as code owners May 8, 2025 18:12
@julianwiedmann julianwiedmann requested a review from christarazi May 8, 2025 18:12
@julianwiedmann julianwiedmann enabled auto-merge May 8, 2025 18:12
@julianwiedmann julianwiedmann mentioned this pull request May 10, 2025
Closed
5 tasks
dylandreimerink
dylandreimerink approved these changes May 12, 2025
View reviewed changes
Copy link
Member

@dylandreimerink dylandreimerink left a comment

Choose a reason for hiding this comment

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

🧹

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label May 12, 2025
@julianwiedmann julianwiedmann added this pull request to the merge queue May 12, 2025
Merged via the queue into cilium:main with commit c595c75 May 12, 2025
78 checks passed
@julianwiedmann julianwiedmann deleted the 1.18-bpf-helpers branch May 12, 2025 09:41
This was referenced May 12, 2025
Closed
Merged
@julianwiedmann julianwiedmann mentioned this pull request May 22, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dylandreimerink dylandreimerink dylandreimerink approved these changes

@christarazi christarazi christarazi approved these changes

Assignees
No one assigned
Labels
area/datapath Impacts bpf/ or low-level forwarding details, including map management and monitor messages. area/kernel Requires upstream work in the Linux kernel. area/loader Impacts the loading of BPF programs into the kernel. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/misc This PR makes changes that have no direct user impact.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@julianwiedmann @dylandreimerink @christarazi