renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-27 14:43:58 +08:00
Code

bpf: Allow %pB in bpf_seq_printf() and bpf_trace_printk()

Browse Source 
This makes it easy to dump stack trace in text.

Signed-off-by: Song Liu <songliubraving@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Yonghong Song <yhs@fb.com>
Acked-by: Andrii Nakryiko <andriin@fb.com>
Link: https://lore.kernel.org/bpf/20200630062846.664389-4-songliubraving@fb.com
This commit is contained in:
Song Liu 2020-06-29 23:28:45 -07:00 committed by Alexei Starovoitov
parent fa28dcb82a
commit 2df6bb5493
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kernel/trace/bpf_trace.c
View File

@ -376,7 +376,7 @@ static void bpf_trace_copy_string(char *buf, void *unsafe_ptr, char fmt_ptype,
/* /*
* Only limited trace_printk() conversion specifiers allowed: * Only limited trace_printk() conversion specifiers allowed:
* %d %i %u %x %ld %li %lu %lx %lld %lli %llu %llx %p %pks %pus %s * %d %i %u %x %ld %li %lu %lx %lld %lli %llu %llx %p %pB %pks %pus %s
*/ */
BPF_CALL_5(bpf_trace_printk, char *, fmt, u32, fmt_size, u64, arg1, BPF_CALL_5(bpf_trace_printk, char *, fmt, u32, fmt_size, u64, arg1,
u64, arg2, u64, arg3) u64, arg2, u64, arg3)
@ -420,6 +420,11 @@ BPF_CALL_5(bpf_trace_printk, char *, fmt, u32, fmt_size, u64, arg1,
goto fmt_str; goto fmt_str;
} }
if (fmt[i + 1] == 'B') {
i++;
goto fmt_next;
}
/* disallow any further format extensions */ /* disallow any further format extensions */
if (fmt[i + 1] != 0 && if (fmt[i + 1] != 0 &&
!isspace(fmt[i + 1]) && !isspace(fmt[i + 1]) &&
@ -636,7 +641,8 @@ BPF_CALL_5(bpf_seq_printf, struct seq_file *, m, char *, fmt, u32, fmt_size,
if (fmt[i] == 'p') { if (fmt[i] == 'p') {
if (fmt[i + 1] == 0 || if (fmt[i + 1] == 0 ||
fmt[i + 1] == 'K' || fmt[i + 1] == 'K' ||
fmt[i + 1] == 'x') { fmt[i + 1] == 'x' ||
fmt[i + 1] == 'B') {
/* just kernel pointers */ /* just kernel pointers */
params[fmt_cnt] = args[fmt_cnt]; params[fmt_cnt] = args[fmt_cnt];
fmt_cnt++; fmt_cnt++;