Commit 66bd2ec1 authored by Stanislav Fomichev's avatar Stanislav Fomichev Committed by Alexei Starovoitov

selftests/bpf: test_progs: test__printf -> printf

Now that test__printf is a simple wraper around printf, let's drop it
(and test__vprintf as well).

Cc: Andrii Nakryiko <andriin@fb.com>
Acked-by: default avatarAndrii Nakryiko <andriin@fb.com>
Signed-off-by: default avatarStanislav Fomichev <sdf@google.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent 946152b3
...@@ -5,13 +5,13 @@ static int libbpf_debug_print(enum libbpf_print_level level, ...@@ -5,13 +5,13 @@ static int libbpf_debug_print(enum libbpf_print_level level,
const char *format, va_list args) const char *format, va_list args)
{ {
if (level != LIBBPF_DEBUG) { if (level != LIBBPF_DEBUG) {
test__vprintf(format, args); vprintf(format, args);
return 0; return 0;
} }
if (!strstr(format, "verifier log")) if (!strstr(format, "verifier log"))
return 0; return 0;
test__vprintf("%s", args); vprintf("%s", args);
return 0; return 0;
} }
......
...@@ -74,7 +74,7 @@ static void test_l4lb(const char *file) ...@@ -74,7 +74,7 @@ static void test_l4lb(const char *file)
} }
if (bytes != MAGIC_BYTES * NUM_ITER * 2 || pkts != NUM_ITER * 2) { if (bytes != MAGIC_BYTES * NUM_ITER * 2 || pkts != NUM_ITER * 2) {
error_cnt++; error_cnt++;
test__printf("test_l4lb:FAIL:stats %lld %lld\n", bytes, pkts); printf("test_l4lb:FAIL:stats %lld %lld\n", bytes, pkts);
} }
out: out:
bpf_object__close(obj); bpf_object__close(obj);
......
...@@ -9,12 +9,12 @@ static void *parallel_map_access(void *arg) ...@@ -9,12 +9,12 @@ static void *parallel_map_access(void *arg)
for (i = 0; i < 10000; i++) { for (i = 0; i < 10000; i++) {
err = bpf_map_lookup_elem_flags(map_fd, &key, vars, BPF_F_LOCK); err = bpf_map_lookup_elem_flags(map_fd, &key, vars, BPF_F_LOCK);
if (err) { if (err) {
test__printf("lookup failed\n"); printf("lookup failed\n");
error_cnt++; error_cnt++;
goto out; goto out;
} }
if (vars[0] != 0) { if (vars[0] != 0) {
test__printf("lookup #%d var[0]=%d\n", i, vars[0]); printf("lookup #%d var[0]=%d\n", i, vars[0]);
error_cnt++; error_cnt++;
goto out; goto out;
} }
...@@ -22,7 +22,7 @@ static void *parallel_map_access(void *arg) ...@@ -22,7 +22,7 @@ static void *parallel_map_access(void *arg)
for (j = 2; j < 17; j++) { for (j = 2; j < 17; j++) {
if (vars[j] == rnd) if (vars[j] == rnd)
continue; continue;
test__printf("lookup #%d var[1]=%d var[%d]=%d\n", printf("lookup #%d var[1]=%d var[%d]=%d\n",
i, rnd, j, vars[j]); i, rnd, j, vars[j]);
error_cnt++; error_cnt++;
goto out; goto out;
...@@ -43,7 +43,7 @@ void test_map_lock(void) ...@@ -43,7 +43,7 @@ void test_map_lock(void)
err = bpf_prog_load(file, BPF_PROG_TYPE_CGROUP_SKB, &obj, &prog_fd); err = bpf_prog_load(file, BPF_PROG_TYPE_CGROUP_SKB, &obj, &prog_fd);
if (err) { if (err) {
test__printf("test_map_lock:bpf_prog_load errno %d\n", errno); printf("test_map_lock:bpf_prog_load errno %d\n", errno);
goto close_prog; goto close_prog;
} }
map_fd[0] = bpf_find_map(__func__, obj, "hash_map"); map_fd[0] = bpf_find_map(__func__, obj, "hash_map");
......
...@@ -202,7 +202,7 @@ static int test_send_signal_nmi(void) ...@@ -202,7 +202,7 @@ static int test_send_signal_nmi(void)
-1 /* cpu */, -1 /* group_fd */, 0 /* flags */); -1 /* cpu */, -1 /* group_fd */, 0 /* flags */);
if (pmu_fd == -1) { if (pmu_fd == -1) {
if (errno == ENOENT) { if (errno == ENOENT) {
test__printf("%s:SKIP:no PERF_COUNT_HW_CPU_CYCLES\n", printf("%s:SKIP:no PERF_COUNT_HW_CPU_CYCLES\n",
__func__); __func__);
return 0; return 0;
} }
......
...@@ -12,7 +12,7 @@ void test_spinlock(void) ...@@ -12,7 +12,7 @@ void test_spinlock(void)
err = bpf_prog_load(file, BPF_PROG_TYPE_CGROUP_SKB, &obj, &prog_fd); err = bpf_prog_load(file, BPF_PROG_TYPE_CGROUP_SKB, &obj, &prog_fd);
if (err) { if (err) {
test__printf("test_spin_lock:bpf_prog_load errno %d\n", errno); printf("test_spin_lock:bpf_prog_load errno %d\n", errno);
goto close_prog; goto close_prog;
} }
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
......
...@@ -109,7 +109,7 @@ void test_stacktrace_build_id(void) ...@@ -109,7 +109,7 @@ void test_stacktrace_build_id(void)
if (build_id_matches < 1 && retry--) { if (build_id_matches < 1 && retry--) {
bpf_link__destroy(link); bpf_link__destroy(link);
bpf_object__close(obj); bpf_object__close(obj);
test__printf("%s:WARN:Didn't find expected build ID from the map, retrying\n", printf("%s:WARN:Didn't find expected build ID from the map, retrying\n",
__func__); __func__);
goto retry; goto retry;
} }
......
...@@ -140,7 +140,7 @@ void test_stacktrace_build_id_nmi(void) ...@@ -140,7 +140,7 @@ void test_stacktrace_build_id_nmi(void)
if (build_id_matches < 1 && retry--) { if (build_id_matches < 1 && retry--) {
bpf_link__destroy(link); bpf_link__destroy(link);
bpf_object__close(obj); bpf_object__close(obj);
test__printf("%s:WARN:Didn't find expected build ID from the map, retrying\n", printf("%s:WARN:Didn't find expected build ID from the map, retrying\n",
__func__); __func__);
goto retry; goto retry;
} }
......
...@@ -75,7 +75,7 @@ void test_xdp_noinline(void) ...@@ -75,7 +75,7 @@ void test_xdp_noinline(void)
} }
if (bytes != MAGIC_BYTES * NUM_ITER * 2 || pkts != NUM_ITER * 2) { if (bytes != MAGIC_BYTES * NUM_ITER * 2 || pkts != NUM_ITER * 2) {
error_cnt++; error_cnt++;
test__printf("test_xdp_noinline:FAIL:stats %lld %lld\n", printf("test_xdp_noinline:FAIL:stats %lld %lld\n",
bytes, pkts); bytes, pkts);
} }
out: out:
......
...@@ -105,20 +105,6 @@ void test__force_log() { ...@@ -105,20 +105,6 @@ void test__force_log() {
env.test->force_log = true; env.test->force_log = true;
} }
void test__vprintf(const char *fmt, va_list args)
{
vprintf(fmt, args);
}
void test__printf(const char *fmt, ...)
{
va_list args;
va_start(args, fmt);
test__vprintf(fmt, args);
va_end(args);
}
struct ipv4_packet pkt_v4 = { struct ipv4_packet pkt_v4 = {
.eth.h_proto = __bpf_constant_htons(ETH_P_IP), .eth.h_proto = __bpf_constant_htons(ETH_P_IP),
.iph.ihl = 5, .iph.ihl = 5,
...@@ -310,7 +296,7 @@ static int libbpf_print_fn(enum libbpf_print_level level, ...@@ -310,7 +296,7 @@ static int libbpf_print_fn(enum libbpf_print_level level,
{ {
if (!env.very_verbose && level == LIBBPF_DEBUG) if (!env.very_verbose && level == LIBBPF_DEBUG)
return 0; return 0;
test__vprintf(format, args); vprintf(format, args);
return 0; return 0;
} }
......
...@@ -70,8 +70,6 @@ extern int error_cnt; ...@@ -70,8 +70,6 @@ extern int error_cnt;
extern int pass_cnt; extern int pass_cnt;
extern struct test_env env; extern struct test_env env;
extern void test__printf(const char *fmt, ...);
extern void test__vprintf(const char *fmt, va_list args);
extern void test__force_log(); extern void test__force_log();
extern bool test__start_subtest(const char *name); extern bool test__start_subtest(const char *name);
...@@ -97,11 +95,11 @@ extern struct ipv6_packet pkt_v6; ...@@ -97,11 +95,11 @@ extern struct ipv6_packet pkt_v6;
int __ret = !!(condition); \ int __ret = !!(condition); \
if (__ret) { \ if (__ret) { \
error_cnt++; \ error_cnt++; \
test__printf("%s:FAIL:%s ", __func__, tag); \ printf("%s:FAIL:%s ", __func__, tag); \
test__printf(format); \ printf(format); \
} else { \ } else { \
pass_cnt++; \ pass_cnt++; \
test__printf("%s:PASS:%s %d nsec\n", \ printf("%s:PASS:%s %d nsec\n", \
__func__, tag, duration); \ __func__, tag, duration); \
} \ } \
__ret; \ __ret; \
......
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