Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10a5ce98 authored by Martin KaFai Lau's avatar Martin KaFai Lau Committed by Alexei Starovoitov
Browse files

bpf: bpftool: Fix newline and p_err issue 



This patch fixes a few newline issues and also
replaces p_err with p_info in prog.c

Fixes: b053b439 ("bpf: libbpf: bpftool: Print bpf_line_info during prog dump")
Cc: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: default avatarMartin KaFai Lau <kafai@fb.com>
Acked-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent e434b8cd

tools/bpf/bpftool/Documentation/bpftool-prog.rst

+2 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ DESCRIPTION 
		  be displayed by default.  If **linum** is specified,

		  the filename, line number and line column will also be

		  displayed on top of the source line.



	**bpftool prog dump jited**  *PROG* [{ **file** *FILE* | **opcodes** | **linum** }]

		  Dump jited image (host machine code) of the program.

		  If *FILE* is specified image will be written to a file,
@@ -84,6 +85,7 @@ DESCRIPTION 
		  be displayed by default.  If **linum** is specified,

		  the filename, line number and line column will also be

		  displayed on top of the source line.



	**bpftool prog pin** *PROG* *FILE*

		  Pin program *PROG* as *FILE*.

tools/bpf/bpftool/main.h

+0 −1
Original line number Diff line number Diff line
@@ -194,7 +194,6 @@ void disasm_print_insn(unsigned char *image, ssize_t len, int opcodes, 
		       const struct bpf_prog_linfo *prog_linfo,

		       __u64 func_ksym, unsigned int func_idx,

		       bool linum)



{

}

static inline int disasm_init(void)

tools/bpf/bpftool/prog.c

+1 −2
Original line number Diff line number Diff line
@@ -592,7 +592,6 @@ static int do_dump(int argc, char **argv) 
	info.jited_line_info_rec_size = jited_linfo_rec_size;

	info.jited_line_info = ptr_to_u64(jited_linfo);





	err = bpf_obj_get_info_by_fd(fd, &info, &len);

	close(fd);

	if (err) {
@@ -674,7 +673,7 @@ static int do_dump(int argc, char **argv) 
	if (linfo_cnt) {

		prog_linfo = bpf_prog_linfo__new(&info);

		if (!prog_linfo)

			p_err("error in processing bpf_line_info.  continue without it.");

			p_info("error in processing bpf_line_info.  continue without it.");

	}



	if (filepath) {