bpftool: btf: Support dumping a single type from file #4758
+42
−5
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![kernel-patches-daemon-bpf-rc[bot]](https://avatars.githubusercontent.com/u/70728002?s=60&v=4){kind=small}
|
Upstream branch: d6212d8 |
|
Upstream branch: d6212d8 |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/915544=>bpf-next
branch
from
7d814f8 to
5edb9b2
Compare
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
bpf-next_base
branch
from
e788156 to
6f73df7
Compare
|
Upstream branch: 442bc81 |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/915544=>bpf-next
branch
from
5edb9b2 to
6fa87b2
Compare
|
At least one diff in series https://patchwork.kernel.org/project/netdevbpf/list/?series=915643 expired. Closing PR. |
|
Upstream branch: 4d33dc1 |
kernel-patches-daemon-bpf-rc
bot
added
new
V3
and removed
changes-requested
V2
V2-ci-pass
labels
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/915544=>bpf-next
branch
from
6fa87b2 to
4e8a046
Compare
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
bpf-next_base
branch
from
05fce66 to
e666082
Compare
|
Upstream branch: 6e8ba49 |
The command description was missing the optional argument. Add it there for consistency with the rest of the commands. Signed-off-by: Daniel Xu <[email protected]>
Handle invalid root_type_ids early, as an invalid ID will cause dumpers to half-emit valid boilerplate and then bail with an unclean exit. This is ugly and possibly confusing for users, so preemptively handle the common error case before any dumping begins. Signed-off-by: Daniel Xu <[email protected]>
Some projects, for example xdp-tools [0], prefer to check in a minimized
vmlinux.h rather than the complete file which can get rather large.
However, when you try to add a minimized version of a complex struct (eg
struct xfrm_state), things can get quite complex if you're trying to
manually untangle and deduplicate the dependencies.
This commit teaches bpftool to do a minimized dump of a single type by
providing an optional root_id argument.
Example usage:
$ ./bpftool btf dump file ~/dev/linux/vmlinux | rg "STRUCT 'xfrm_state'"
[12643] STRUCT 'xfrm_state' size=912 vlen=58
$ ./bpftool btf dump file ~/dev/linux/vmlinux root_id 12643 format c
#ifndef __VMLINUX_H__
#define __VMLINUX_H__
[..]
struct xfrm_type_offload;
struct xfrm_sec_ctx;
struct xfrm_state {
possible_net_t xs_net;
union {
struct hlist_node gclist;
struct hlist_node bydst;
};
union {
struct hlist_node dev_gclist;
struct hlist_node bysrc;
};
struct hlist_node byspi;
[..]
[0]: https://github.com/xdp-project/xdp-tools/blob/master/headers/bpf/vmlinux.h
Signed-off-by: Daniel Xu <[email protected]>
This commit updates the bash completion script with the new root_id argument. Signed-off-by: Daniel Xu <[email protected]>
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/915544=>bpf-next
branch
from
4e8a046 to
81a9bab
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull request for series with
subject: bpftool: btf: Support dumping a single type from file
version: 1
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=915544