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

fix: Fix bpf CO-RE issue on 6.9 #483

Merged
merged 1 commit into from
Mar 27, 2024
Merged

fix: Fix bpf CO-RE issue on 6.9 #483

merged 1 commit into from
Mar 27, 2024

Conversation

jschwinger233
Copy link
Member

@jschwinger233 jschwinger233 commented Mar 26, 2024

Background

6.9 introduces https://lore.kernel.org/bpf/202402221046.020C94D@keescook/T/ which renamed bpf_lpm_trie_key to bpf_lpm_trie_key_u8, breaking CO-RE because vmlinux no longer has the definition.

This patch fixes the CO-RE issue by relying on a special cornor case that doesn't emit CO-RE relocation.

Checklist

Full Changelogs

  • [Implement ...]

Issue Reference

Closes #482

Test Result

6.9 introduces
https://lore.kernel.org/bpf/202402221046.020C94D@keescook/T/ which
renamed bpf_lpm_trie_key to bpf_lpm_trie_key_u8, breaking CO-RE
because vmlinux no longer has the definition.

This patch fixes the CO-RE issue by relying on a special cornor case
that doesn't emit CO-RE relocation.
@jschwinger233 jschwinger233 changed the title bpf: Fix CO-RE issue on 6.9 fix: Fix bpf CO-RE issue on 6.9 Mar 26, 2024
@jschwinger233 jschwinger233 marked this pull request as ready for review March 26, 2024 10:04
@jschwinger233 jschwinger233 requested a review from a team as a code owner March 26, 2024 10:04
Copy link
Contributor

@mzz2017 mzz2017 left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@dae-prow dae-prow bot left a comment

Choose a reason for hiding this comment

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

🧪 Since the PR has been fully tested, please consider merging it.

@jschwinger233 jschwinger233 merged commit b18e081 into main Mar 27, 2024
34 checks passed
@jschwinger233 jschwinger233 deleted the gray/fix-6.9-core branch March 27, 2024 04:39
@dae-prow dae-prow bot mentioned this pull request Jun 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug Report] Failed to start dae on kernel 6.9rc1
3 participants