Skip to content

Update vmlinux.h headers to latest Linux #7

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
anakryiko merged 3 commits into from
Apr 10, 2025
Merged

Update vmlinux.h headers to latest Linux #7

anakryiko merged 3 commits into from
Apr 10, 2025

Conversation

@theihor
Copy link
Contributor

@theihor theihor commented Apr 9, 2025 •
edited
Loading

Linux version: 6.14.1
Headers generated by scripts/gen-vmlinux-header.sh on a local machine.

@theihor theihor requested a review from anakryiko April 9, 2025 19:02
@theihor theihor mentioned this pull request Apr 9, 2025
Merged
@theihor
kconfigs: add CONFIG_INET to config.common
cf8bfa1 
Required for struct bpf_sock_tupl and others.

libbpf-rs failure example:
https://github.com/libbpf/vmlinux.h/actions/runs/14366702710/job/40281267348

Signed-off-by: Ihor Solodrai <ihor.solodrai@linux.dev>
anakryiko
anakryiko reviewed Apr 10, 2025
View reviewed changes
include/aarch64/vmlinux.h Outdated
@@ -1 +1 @@
vmlinux_6.6.h No newline at end of file
vmlinux_6.15-rc1.h No newline at end of file
Copy link
Member

@anakryiko anakryiko Apr 10, 2025

Choose a reason for hiding this comment

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

can we get rid of -rc1?

Copy link
Contributor Author

@theihor theihor Apr 10, 2025

Choose a reason for hiding this comment

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

Sure. I mean this is the specific version used, that's why I left the suffix.

Maybe we should use only release tags (not rcs)?

Copy link
Contributor Author

@theihor theihor Apr 10, 2025

Choose a reason for hiding this comment

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

Switched to stable (6.14.1), renamed to vmlinux_6.14.h

@theihor
Copy link
Contributor Author

theihor commented Apr 10, 2025 •
edited
Loading

@d-e-s-o it appears that this job fails because bpf_dynptr_from_skb and bpf_dynptr_slice are redefined in the example program.

They are absent in vmlinux.h 6.6, so we probably can simply remove them from example program, right?

@theihor
Copy link
Contributor Author

theihor commented Apr 10, 2025

Ok, vmlinux.h is pinned in libbpf-rs/examples. So here is the plan:

theihor added 2 commits April 9, 2025 18:01
@theihor
Update vmlinux.h headers to latest Linux
7fe380c 
Linux version: 6.14.1 (latest stable)
Headers generated with ./scripts/gen-vmlinux-header.sh

Signed-off-by: Ihor Solodrai <ihor.solodrai@linux.dev>
@theihor
scripts: use latest stable release by default
6f62e52 
In download-latest-linux-release.sh pick latest stable (instead of
mainline) Linux source version.

Signed-off-by: Ihor Solodrai <ihor.solodrai@linux.dev>
@theihor
Copy link
Contributor Author

theihor commented Apr 10, 2025

@anakryiko @d-e-s-o

libbpf-rs PR draft: libbpf/libbpf-rs#1152 (it will have to be changed to libbpf/vmlinux.h revision after this lands).

libbpf-rs build passes with changed netfilter example and vmlinux.h from this PR. The linter error seems to be unrelated to my change (maybe Cargo.lock update messed things up?).

arm build in libbpf-bootstrap passes too: https://github.com/libbpf/libbpf-bootstrap/actions/runs/14370042331

I think this is ready to be merged in.

@theihor theihor requested a review from anakryiko April 10, 2025 01:22
@anakryiko anakryiko merged commit 8f91e9f into libbpf:main Apr 10, 2025
5 of 6 checks passed
theihor added a commit to theihor/libbpf-bootstrap that referenced this pull request Apr 10, 2025
@theihor
Update vmlinux.h submodule to latest main
8534eb3 
See libbpf/vmlinux.h#7

Signed-off-by: Ihor Solodrai <ihor.solodrai@linux.dev>
@theihor theihor mentioned this pull request Apr 10, 2025
Merged
anakryiko pushed a commit to libbpf/libbpf-bootstrap that referenced this pull request Apr 10, 2025
@theihor @anakryiko
Update vmlinux.h submodule to latest main
c4ad518 
See libbpf/vmlinux.h#7

Signed-off-by: Ihor Solodrai <ihor.solodrai@linux.dev>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@anakryiko anakryiko Awaiting requested review from anakryiko

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@theihor @anakryiko