bpftool: Add inline annotations when dumping program CFGs #4817
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
|
Upstream branch: 55fbae0 |
kernel-patches-bot
force-pushed
the
bpf-next_base
branch
from
49e25e4
to
fe39b7b
Compare
|
Upstream branch: 496f4f1 |
kernel-patches-bot
force-pushed
the
series/733732=>bpf-next
branch
from
f60ea3a
to
5a560cc
Compare
kernel-patches-bot
force-pushed
the
bpf-next_base
branch
from
fe39b7b
to
64a47ba
Compare
|
Upstream branch: e993607 |
kernel-patches-bot
force-pushed
the
series/733732=>bpf-next
branch
from
5a560cc
to
61fc0ae
Compare
kernel-patches-bot
force-pushed
the
bpf-next_base
branch
from
64a47ba
to
88b3244
Compare
|
Upstream branch: 8d27596 |
kernel-patches-bot
force-pushed
the
series/733732=>bpf-next
branch
from
61fc0ae
to
4fd3daa
Compare
kernel-patches-bot
force-pushed
the
bpf-next_base
branch
from
88b3244
to
38702e7
Compare
|
Upstream branch: 8d27596 |
kernel-patches-bot
force-pushed
the
series/733732=>bpf-next
branch
from
4fd3daa
to
56375f7
Compare
kernel-patches-bot
force-pushed
the
bpf-next_base
branch
from
38702e7
to
10fd22a
Compare
|
Upstream branch: 8cfee11 |
kernel-patches-bot
force-pushed
the
series/733732=>bpf-next
branch
from
56375f7
to
0bfaa8a
Compare
kernel-patches-bot
force-pushed
the
bpf-next_base
branch
from
10fd22a
to
83306f4
Compare
|
Upstream branch: 5f5a7d8 |
kernel-patches-bot
force-pushed
the
series/733732=>bpf-next
branch
from
0bfaa8a
to
032b612
Compare
|
Upstream branch: 5f5a7d8 |
kernel-patches-bot
force-pushed
the
series/733732=>bpf-next
branch
from
032b612
to
de9b0e9
Compare
kernel-patches-bot
force-pushed
the
bpf-next_base
branch
from
83306f4
to
bc844fe
Compare
|
Upstream branch: f1cb927 |
kernel-patches-bot
force-pushed
the
series/733732=>bpf-next
branch
from
de9b0e9
to
6c8fc13
Compare
kernel-patches-bot
force-pushed
the
bpf-next_base
branch
from
bc844fe
to
f8769a2
Compare
|
Upstream branch: 7283137 |
kernel-patches-bot
force-pushed
the
series/733732=>bpf-next
branch
from
6c8fc13
to
bde71f2
Compare
kernel-patches-bot
force-pushed
the
bpf-next_base
branch
from
f8769a2
to
93667d1
Compare
The documentation states that when line_info is available when dumping a program, the source line will be displayed "by default". There is no notion of "default" here: the line is always displayed if available, there is no way currently to turn it off. In the next sentence, the documentation states that if "linum" is used on the command line, the relevant filename, line, and column will be displayed "on top of the source line". This is incorrect, as they are currently displayed on the right side of the source line (or on top of the eBPF instruction, not the source). This commit fixes the documentation to address these points. Signed-off-by: Quentin Monnet <quentin@isovalent.com> Acked-by: Stanislav Fomichev <sdf@google.com>
When dumping the control flow graphs for programs using the 16-byte long load instruction, we need to skip the second part of this instruction when looking for the next instruction to process. Otherwise, we end up printing "BUG_ld_00" from the kernel disassembler in the CFG. Fixes: efcef17 ("tools: bpftool: generate .dot graph from CFG information") Signed-off-by: Quentin Monnet <quentin@isovalent.com> Acked-by: Stanislav Fomichev <sdf@google.com>
We support dumping the control flow graph of loaded programs to the DOT format with bpftool, but so far this feature wouldn't display the source code lines available through BTF along with the eBPF bytecode. Let's add support for these annotations, to make it easier to read the graph. In prog.c, we move the call to dump_xlated_cfg() in order to pass and use the full struct dump_data, instead of creating a minimal one in draw_bb_node(). We pass the pointer to this struct down to dump_xlated_for_graph() in xlated_dumper.c, where most of the logics is added. We deal with BTF mostly like we do for plain or JSON output, except that we cannot use a "nr_skip" value to skip a given number of linfo records (we don't process the BPF instructions linearly, and apart from the root of the graph we don't know how many records we should skip, so we just store the last linfo and make sure the new one we find is different before printing it). When printing the source instructions to the label of a DOT graph node, there are a few subtleties to address. We want some special newline markers, and there are some characters that we must escape. To deal with them, we introduce a new dedicated function btf_dump_linfo_dotlabel() in btf_dumper.c. We'll reuse this function in a later commit to format the filepath, line, and column references as well. Signed-off-by: Quentin Monnet <quentin@isovalent.com> Acked-by: Stanislav Fomichev <sdf@google.com>
|
Upstream branch: d08ab82 |
When dumping a program, the keywords "opcodes" (for printing the raw opcodes), "linum" (for displaying the filename, line number, column number along with the source code), and "visual" (for generating the control flow graph for translated programs) are mutually exclusive. But there's no reason why they should be. Let's make it possible to pass several of them at once. The "file FILE" option, which makes bpftool output a binary image to a file, remains incompatible with the others. Signed-off-by: Quentin Monnet <quentin@isovalent.com> Acked-by: Stanislav Fomichev <sdf@google.com>
Add support for displaying opcodes or/and file references (filepath, line and column numbers) when dumping the control flow graphs of loaded BPF programs with bpftool. Signed-off-by: Quentin Monnet <quentin@isovalent.com> Acked-by: Stanislav Fomichev <sdf@google.com>
kernel-patches-bot
force-pushed
the
series/733732=>bpf-next
branch
from
bde71f2
to
b8dd62c
Compare
|
At least one diff in series https://patchwork.kernel.org/project/netdevbpf/list/?series=734111 expired. Closing PR. |
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: Add inline annotations when dumping program CFGs
version: 1
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=733732