hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tools/bpf: print out btf log at LIBBPF_WARN level 

Currently, the btf log is allocated and printed out in case
of error at LIBBPF_DEBUG level.
Such logs from kernel are very important for debugging.
For example, bpf syscall BPF_PROG_LOAD command can get
verifier logs back to user space. In function load_program()
of libbpf.c, the log buffer is allocated unconditionally
and printed out at pr_warning() level.

Let us do the similar thing here for btf. Allocate buffer
unconditionally and print out error logs at pr_warning() level.
This can reduce one global function and
optimize for common situations where pr_warning()
is activated either by default or by user supplied
debug output function.

Signed-off-by: Yonghong Song <yhs@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
This commit is contained in:
Yonghong Song 2019-02-01 16:14:15 -08:00 committed by Alexei Starovoitov
parent 8461ef8b7e
commit 9d100a19ff
3 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tools/lib/bpf/btf.c
View File

@ -377,16 +377,15 @@ struct btf *btf__new(__u8 *data, __u32 size)
btf->fd = -1; btf->fd = -1;
if (libbpf_print_level_available(LIBBPF_DEBUG)) { log_buf = malloc(BPF_LOG_BUF_SIZE);
log_buf = malloc(BPF_LOG_BUF_SIZE); if (!log_buf) {
if (!log_buf) { err = -ENOMEM;
err = -ENOMEM; goto done;
goto done;
}
*log_buf = 0;
log_buf_size = BPF_LOG_BUF_SIZE;
} }
*log_buf = 0;
log_buf_size = BPF_LOG_BUF_SIZE;
btf->data = malloc(size); btf->data = malloc(size);
if (!btf->data) { if (!btf->data) {
err = -ENOMEM; err = -ENOMEM;
@ -401,9 +400,9 @@ struct btf *btf__new(__u8 *data, __u32 size)
if (btf->fd == -1) { if (btf->fd == -1) {
err = -errno; err = -errno;
pr_debug("Error loading BTF: %s(%d)\n", strerror(errno), errno); pr_warning("Error loading BTF: %s(%d)\n", strerror(errno), errno);
if (log_buf && *log_buf) if (log_buf && *log_buf)
pr_debug("%s\n", log_buf); pr_warning("%s\n", log_buf);
goto done; goto done;
} }

10
tools/lib/bpf/libbpf.c
View File

@ -98,16 +98,6 @@ void libbpf_print(enum libbpf_print_level level, const char *format, ...)
va_end(args); va_end(args);
} }
bool libbpf_print_level_available(enum libbpf_print_level level)
{
if (level == LIBBPF_WARN)
return !!__pr_warning;
else if (level == LIBBPF_INFO)
return !!__pr_info;
else
return !!__pr_debug;
}
#define STRERR_BUFSIZE 128 #define STRERR_BUFSIZE 128
#define CHECK_ERR(action, err, out) do { \ #define CHECK_ERR(action, err, out) do { \

2
tools/lib/bpf/libbpf_util.h
View File

@ -14,8 +14,6 @@ extern void libbpf_print(enum libbpf_print_level level,
const char *format, ...) const char *format, ...)
__attribute__((format(printf, 2, 3))); __attribute__((format(printf, 2, 3)));
extern bool libbpf_print_level_available(enum libbpf_print_level level);
#define __pr(level, fmt, ...) \ #define __pr(level, fmt, ...) \
do { \ do { \
libbpf_print(level, "libbpf: " fmt, ##__VA_ARGS__); \ libbpf_print(level, "libbpf: " fmt, ##__VA_ARGS__); \