Skip to content

bpf: use bpf_xdp_load_bytes() / bpf_xdp_store_bytes() helpers #29377

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 3 commits into from
Nov 28, 2023
Merged

bpf: use bpf_xdp_load_bytes() / bpf_xdp_store_bytes() helpers #29377

merged 3 commits into from
Nov 28, 2023

Conversation

julianwiedmann
Copy link
Member

@julianwiedmann julianwiedmann commented Nov 25, 2023 •
edited
Loading

These helpers were introduced in kernel 5.18, with
3f364222d032 ("net: xdp: introduce bpf_xdp_pointer utility routine").

Add the needed probes, and have the datapath use the helpers when available.

Fixes: #29356

bpf: use bpf_xdp_load_bytes() / bpf_xdp_store_bytes() helpers when available

@julianwiedmann julianwiedmann added kind/enhancement This would improve or streamline existing functionality. area/datapath Impacts bpf/ or low-level forwarding details, including map management and monitor messages. release-note/minor This PR changes functionality that users may find relevant to operating Cilium. labels Nov 25, 2023
@julianwiedmann
Copy link
Member Author

/test

@julianwiedmann julianwiedmann force-pushed the pr/jwi/1.15-bpf-xdp-load-store-bytes branch from 8835783 to f6fb874 Compare November 27, 2023 06:38
@julianwiedmann
Copy link
Member Author

/test

@julianwiedmann
Copy link
Member Author

/ci-e2e

@julianwiedmann julianwiedmann mentioned this pull request Nov 27, 2023
Merged
@julianwiedmann
Copy link
Member Author

/ci-verifier

@julianwiedmann
bpf: add support for xdp_load_bytes() / xdp_store_bytes() helpers
e3367b9 
These helpers were introduced in kernel 5.18, with
3f364222d032 ("net: xdp: introduce bpf_xdp_pointer utility routine").

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
@julianwiedmann
bpf: complexity-tests: populate HAVE_XDP_{LOAD,STORE}_BYTES
b75cc1a 
As the corresponding helpers were introduced in kernel 5.18, also add
separate configs for the 6.1 kernel. For now these are just copies of the
net-next configs.

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
@julianwiedmann
gh: datapath-verifier: pick up configs for 6.1 kernel
cc61bdb 
These are now different from the 5.10 configs.

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
@julianwiedmann julianwiedmann force-pushed the pr/jwi/1.15-bpf-xdp-load-store-bytes branch from aab3cad to cc61bdb Compare November 27, 2023 16:39
@julianwiedmann
Copy link
Member Author

/test

@julianwiedmann julianwiedmann marked this pull request as ready for review November 27, 2023 17:23
@julianwiedmann julianwiedmann requested review from a team as code owners November 27, 2023 17:23
@borkmann
Copy link
Member

Add the needed probes, and have the datapath use the helpers when available.

🚀 this could also get us closer to supporting >4k MTU on XDP.

@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 Nov 28, 2023
@tklauser tklauser added this pull request to the merge queue Nov 28, 2023
Merged via the queue into main with commit d07f8a6 Nov 28, 2023
@tklauser tklauser deleted the pr/jwi/1.15-bpf-xdp-load-store-bytes branch November 28, 2023 13:04
This was referenced Nov 29, 2023
Merged
Open
@julianwiedmann julianwiedmann added backport/author The backport will be carried out by the author of the PR. needs-backport/1.14 labels Dec 7, 2023
@julianwiedmann
Copy link
Member Author

Looks like we want this in v1.14 to improve complexity for the 6.1 kernel.

@julianwiedmann julianwiedmann mentioned this pull request Dec 8, 2023
Merged
@julianwiedmann julianwiedmann added backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. and removed needs-backport/1.14 backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. labels Dec 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tklauser tklauser tklauser approved these changes

@borkmann borkmann borkmann approved these changes

@brlbil brlbil brlbil approved these changes

@rgo3 rgo3 rgo3 approved these changes

Assignees
No one assigned
Labels
area/datapath Impacts bpf/ or low-level forwarding details, including map management and monitor messages. backport/author The backport will be carried out by the author of the PR. backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. kind/enhancement This would improve or streamline existing functionality. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/minor This PR changes functionality that users may find relevant to operating Cilium.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

bpf: use bpf_xdp_load_bytes() / bpf_xdp_store_bytes() when available
5 participants
@julianwiedmann @borkmann @tklauser @brlbil @rgo3