Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-27 21:33:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

samples: bpf: Remove bpf_debug macro in favor of bpf_printk

Browse Source 
ibumad example was implementing the bpf_debug macro which is exactly the
same as the bpf_printk macro available in bpf_helpers.h. This change
makes use of bpf_printk instead of bpf_debug.

Signed-off-by: Michal Rostecki <mrostecki@opensuse.org>
Acked-by: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
This commit is contained in:
Michal Rostecki 2019-06-18 20:13:18 +02:00 committed by Alexei Starovoitov
parent 7d30a7f642
commit 7ae9f2817a
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
samples/bpf/ibumad_kern.c
View File

@ -31,15 +31,9 @@ struct bpf_map_def SEC("maps") write_count = {
}; };
#undef DEBUG #undef DEBUG
#ifdef DEBUG #ifndef DEBUG
#define bpf_debug(fmt, ...) \ #undef bpf_printk
({ \ #define bpf_printk(fmt, ...)
char ____fmt[] = fmt; \
bpf_trace_printk(____fmt, sizeof(____fmt), \
##__VA_ARGS__); \
})
#else
#define bpf_debug(fmt, ...)
#endif #endif
/* Taken from the current format defined in /* Taken from the current format defined in
@ -86,7 +80,7 @@ int on_ib_umad_read_recv(struct ib_umad_rw_args *ctx)
u64 zero = 0, *val; u64 zero = 0, *val;
u8 class = ctx->mgmt_class; u8 class = ctx->mgmt_class;
bpf_debug("ib_umad read recv : class 0x%x\n", class); bpf_printk("ib_umad read recv : class 0x%x\n", class);
val = bpf_map_lookup_elem(&read_count, &class); val = bpf_map_lookup_elem(&read_count, &class);
if (!val) { if (!val) {
@ -106,7 +100,7 @@ int on_ib_umad_read_send(struct ib_umad_rw_args *ctx)
u64 zero = 0, *val; u64 zero = 0, *val;
u8 class = ctx->mgmt_class; u8 class = ctx->mgmt_class;
bpf_debug("ib_umad read send : class 0x%x\n", class); bpf_printk("ib_umad read send : class 0x%x\n", class);
val = bpf_map_lookup_elem(&read_count, &class); val = bpf_map_lookup_elem(&read_count, &class);
if (!val) { if (!val) {
@ -126,7 +120,7 @@ int on_ib_umad_write(struct ib_umad_rw_args *ctx)
u64 zero = 0, *val; u64 zero = 0, *val;
u8 class = ctx->mgmt_class; u8 class = ctx->mgmt_class;
bpf_debug("ib_umad write : class 0x%x\n", class); bpf_printk("ib_umad write : class 0x%x\n", class);
val = bpf_map_lookup_elem(&write_count, &class); val = bpf_map_lookup_elem(&write_count, &class);
if (!val) { if (!val) {