Skip to content
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.

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

[v1.14] bpf: use bpf_xdp_load_bytes() / bpf_xdp_store_bytes() helpers #29719

Merged
merged 3 commits into from
Dec 8, 2023

Conversation

julianwiedmann
Copy link
Member

Manual backport of

to resolve some trivial conflicts, and double-check that the 6.1 complexity configs are still in-sync with net-next.

[ upstream commit 902e408 ]

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>
@maintainer-s-little-helper maintainer-s-little-helper bot added backport/1.14 This PR represents a backport for Cilium 1.14.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master. labels Dec 8, 2023
@julianwiedmann
Copy link
Member Author

/test-backport-1.14

@julianwiedmann julianwiedmann marked this pull request as ready for review December 8, 2023 06:56
@julianwiedmann julianwiedmann requested review from a team as code owners December 8, 2023 06:56
[ upstream commit 6155c7c ]

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>
[ upstream commit d07f8a6 ]

These are now different from the 5.10 configs.

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

/test-backport-1.14

@aanm aanm merged commit 5433caa into v1.14 Dec 8, 2023
213 checks passed
@aanm aanm deleted the pr/jwi/v1.14/bpf-xdp-load-store branch December 8, 2023 19:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.14 This PR represents a backport for Cilium 1.14.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants