[bpf-next,0/5] bpftool: Add inline annotations when dumping program CFGs

Message

Quentin Monnet March 24, 2023, 11:02 p.m. UTC

This set contains some improvements for bpftool's "visual" program dump
option, which produces the control flow graph in a DOT format. The main
objective is to add support for inline annotations on such graphs, so that
we can have the C source code for the program showing up alongside the
instructions, when available. The last commits also make it possible to
display the line numbers or the bare opcodes in the graph, as supported by
regular program dumps.

Quentin Monnet (5):
  bpftool: Fix documentation about line info display for prog dumps
  bpftool: Fix bug for long instructions in program CFG dumps
  bpftool: Support inline annotations when dumping the CFG of a program
  bpftool: Support "opcodes", "linum", "visual" simultaneously
  bpftool: Support printing opcodes and source file references in CFG

 .../bpftool/Documentation/bpftool-prog.rst    | 18 ++---
 tools/bpf/bpftool/bash-completion/bpftool     | 18 +++--
 tools/bpf/bpftool/btf_dumper.c                | 51 ++++++++++++
 tools/bpf/bpftool/cfg.c                       | 29 +++----
 tools/bpf/bpftool/cfg.h                       |  5 +-
 tools/bpf/bpftool/main.h                      |  2 +
 tools/bpf/bpftool/prog.c                      | 78 ++++++++++---------
 tools/bpf/bpftool/xlated_dumper.c             | 52 ++++++++++++-
 tools/bpf/bpftool/xlated_dumper.h             |  3 +-
 9 files changed, 184 insertions(+), 72 deletions(-)

Comments

Stanislav Fomichev March 25, 2023, 3:05 a.m. UTC | #1

On 03/24, Quentin Monnet wrote:
> This set contains some improvements for bpftool's "visual" program dump
> option, which produces the control flow graph in a DOT format. The main
> objective is to add support for inline annotations on such graphs, so that
> we can have the C source code for the program showing up alongside the
> instructions, when available. The last commits also make it possible to
> display the line numbers or the bare opcodes in the graph, as supported by
> regular program dumps.

> Quentin Monnet (5):
>    bpftool: Fix documentation about line info display for prog dumps
>    bpftool: Fix bug for long instructions in program CFG dumps
>    bpftool: Support inline annotations when dumping the CFG of a program
>    bpftool: Support "opcodes", "linum", "visual" simultaneously
>    bpftool: Support printing opcodes and source file references in CFG

Acked-by: Stanislav Fomichev <[e-mail]>

Left two small nits. Up to you on whether it's worth to respin or not.

>   .../bpftool/Documentation/bpftool-prog.rst    | 18 ++---
>   tools/bpf/bpftool/bash-completion/bpftool     | 18 +++--
>   tools/bpf/bpftool/btf_dumper.c                | 51 ++++++++++++
>   tools/bpf/bpftool/cfg.c                       | 29 +++----
>   tools/bpf/bpftool/cfg.h                       |  5 +-
>   tools/bpf/bpftool/main.h                      |  2 +
>   tools/bpf/bpftool/prog.c                      | 78 ++++++++++---------
>   tools/bpf/bpftool/xlated_dumper.c             | 52 ++++++++++++-
>   tools/bpf/bpftool/xlated_dumper.h             |  3 +-
>   9 files changed, 184 insertions(+), 72 deletions(-)

> --
> 2.34.1