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

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
...@@ -73,6 +73,7 @@ DESCRIPTION ...@@ -73,6 +73,7 @@ DESCRIPTION
be displayed by default. If **linum** is specified, be displayed by default. If **linum** is specified,
the filename, line number and line column will also be the filename, line number and line column will also be
displayed on top of the source line. displayed on top of the source line.
**bpftool prog dump jited** *PROG* [{ **file** *FILE* | **opcodes** | **linum** }] **bpftool prog dump jited** *PROG* [{ **file** *FILE* | **opcodes** | **linum** }]
Dump jited image (host machine code) of the program. Dump jited image (host machine code) of the program.
If *FILE* is specified image will be written to a file, If *FILE* is specified image will be written to a file,
...@@ -84,6 +85,7 @@ DESCRIPTION ...@@ -84,6 +85,7 @@ DESCRIPTION
be displayed by default. If **linum** is specified, be displayed by default. If **linum** is specified,
the filename, line number and line column will also be the filename, line number and line column will also be
displayed on top of the source line. displayed on top of the source line.
**bpftool prog pin** *PROG* *FILE* **bpftool prog pin** *PROG* *FILE*
Pin program *PROG* as *FILE*. Pin program *PROG* as *FILE*.
......
...@@ -194,7 +194,6 @@ void disasm_print_insn(unsigned char *image, ssize_t len, int opcodes, ...@@ -194,7 +194,6 @@ void disasm_print_insn(unsigned char *image, ssize_t len, int opcodes,
const struct bpf_prog_linfo *prog_linfo, const struct bpf_prog_linfo *prog_linfo,
__u64 func_ksym, unsigned int func_idx, __u64 func_ksym, unsigned int func_idx,
bool linum) bool linum)
{ {
} }
static inline int disasm_init(void) static inline int disasm_init(void)
......
...@@ -592,7 +592,6 @@ static int do_dump(int argc, char **argv) ...@@ -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_rec_size = jited_linfo_rec_size;
info.jited_line_info = ptr_to_u64(jited_linfo); info.jited_line_info = ptr_to_u64(jited_linfo);
err = bpf_obj_get_info_by_fd(fd, &info, &len); err = bpf_obj_get_info_by_fd(fd, &info, &len);
close(fd); close(fd);
if (err) { if (err) {
...@@ -674,7 +673,7 @@ static int do_dump(int argc, char **argv) ...@@ -674,7 +673,7 @@ static int do_dump(int argc, char **argv)
if (linfo_cnt) { if (linfo_cnt) {
prog_linfo = bpf_prog_linfo__new(&info); prog_linfo = bpf_prog_linfo__new(&info);
if (!prog_linfo) 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) { if (filepath) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment