Skip to content

bpf: complexity-tests: add HAVE_SET_RETVAL and HAVE_NETNS_COOKIE for bpf_sock tests#35291

Merged
julianwiedmann merged 2 commits intocilium:mainfrom
julianwiedmann:1.17-bpf-tests-retval
Oct 10, 2024
Merged

bpf: complexity-tests: add HAVE_SET_RETVAL and HAVE_NETNS_COOKIE for bpf_sock tests#35291
julianwiedmann merged 2 commits intocilium:mainfrom
julianwiedmann:1.17-bpf-tests-retval

Conversation

@julianwiedmann
Copy link
Copy Markdown
Member

@julianwiedmann julianwiedmann commented Oct 8, 2024

Consider two kernel-dependent capabilities in the bpf_sock tests.

bpf_set_retval() was added to the kernel with v5.18.

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
@julianwiedmann julianwiedmann added area/CI Continuous Integration testing issue or flake area/datapath Impacts bpf/ or low-level forwarding details, including map management and monitor messages. release-note/ci This PR makes changes to the CI. labels Oct 8, 2024
@julianwiedmann
Copy link
Copy Markdown
Member Author

/test

bpf_get_netns_cookie() was added to the kernel with v5.7.

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
@julianwiedmann julianwiedmann changed the title bpf: complexity-tests: add HAVE_SET_RETVAL for bpf_sock tests bpf: complexity-tests: add HAVE_SET_RETVAL and HAVE_NETNS_COOKIE for bpf_sock tests Oct 8, 2024
@julianwiedmann
Copy link
Copy Markdown
Member Author

/test

@julianwiedmann julianwiedmann marked this pull request as ready for review October 8, 2024 11:03
@julianwiedmann julianwiedmann requested a review from a team as a code owner October 8, 2024 11:03
@julianwiedmann julianwiedmann added the dont-merge/waiting-for-review Requires further review before merging. label Oct 9, 2024
Copy link
Copy Markdown
Member

@ysksuzuki ysksuzuki left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks!

@julianwiedmann julianwiedmann removed the dont-merge/waiting-for-review Requires further review before merging. label Oct 10, 2024
@julianwiedmann julianwiedmann added this pull request to the merge queue Oct 10, 2024
Merged via the queue into cilium:main with commit 36c6431 Oct 10, 2024
@julianwiedmann julianwiedmann deleted the 1.17-bpf-tests-retval branch October 10, 2024 06:52
@julianwiedmann julianwiedmann added backport-pending/1.16 backport-done/1.16 The backport for Cilium 1.16.x for this PR is done. and removed backport-pending/1.16 labels Sep 1, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/CI Continuous Integration testing issue or flake area/datapath Impacts bpf/ or low-level forwarding details, including map management and monitor messages. backport-done/1.16 The backport for Cilium 1.16.x for this PR is done. release-note/ci This PR makes changes to the CI.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants