Skip to content

Commit f06eab0

Browse files
author
Alexei Starovoitov
committed
Merge branch 'libbpf-remove-extern-declaration-of-bpf_stream_vprintk'
Ihor Solodrai says: ==================== libbpf: Remove extern declaration of bpf_stream_vprintk() The first patch adjusts a selftest that has been using bpf_stream_printk() macro. The second patch removes the declaration. ==================== Link: https://patch.msgid.link/20260218215651.2057673-1-ihor.solodrai@linux.dev Signed-off-by: Alexei Starovoitov <ast@kernel.org>
2 parents 3b39d73 + 0cecd49 commit f06eab0

2 files changed

Lines changed: 6 additions & 9 deletions

File tree

tools/lib/bpf/bpf_helpers.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -315,9 +315,6 @@ enum libbpf_tristate {
315315
___param, sizeof(___param)); \
316316
})
317317

318-
extern int bpf_stream_vprintk(int stream_id, const char *fmt__str, const void *args,
319-
__u32 len__sz) __weak __ksym;
320-
321318
#define bpf_stream_printk(stream_id, fmt, args...) \
322319
({ \
323320
static const char ___fmt[] = fmt; \

tools/testing/selftests/bpf/progs/test_xdp_meta.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
#include <stdbool.h>
2-
#include <linux/bpf.h>
3-
#include <linux/errno.h>
4-
#include <linux/if_ether.h>
5-
#include <linux/pkt_cls.h>
1+
// SPDX-License-Identifier: GPL-2.0
2+
#include <vmlinux.h>
63

74
#include <bpf/bpf_endian.h>
85
#include <bpf/bpf_helpers.h>
6+
#include <errno.h>
7+
98
#include "bpf_kfuncs.h"
9+
#include "bpf_tracing_net.h"
1010

1111
#define META_SIZE 32
1212

@@ -42,7 +42,7 @@ static bool check_metadata(const char *file, int line, __u8 *meta_have)
4242
if (!__builtin_memcmp(meta_have, meta_want, META_SIZE))
4343
return true;
4444

45-
bpf_stream_printk(BPF_STREAM_STDERR,
45+
bpf_stream_printk(BPF_STDERR,
4646
"FAIL:%s:%d: metadata mismatch\n"
4747
" have:\n %pI6\n %pI6\n"
4848
" want:\n %pI6\n %pI6\n",

0 commit comments

Comments
 (0)