• Quentin Monnet's avatar
    bpftool: Support inline annotations when dumping the CFG of a program · 9fd49684
    Quentin Monnet authored
    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: default avatarQuentin Monnet <quentin@isovalent.com>
    Link: https://lore.kernel.org/r/20230405132120.59886-4-quentin@isovalent.comSigned-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
    9fd49684
cfg.c 9.92 KB