p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Stanislav Fomichev <sdf@google.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
This commit is contained in:
Stanislav Fomichev 2019-08-06 10:45:28 -07:00 committed by Alexei Starovoitov
parent 946152b3c5
commit 66bd2ec1e0
10 changed files with 22 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/testing/selftests/bpf/prog_tests/bpf_verif_scale.c
View File

@ -5,13 +5,13 @@ static int libbpf_debug_print(enum libbpf_print_level level,
const char *format, va_list args)
{
if (level != LIBBPF_DEBUG) {
test__vprintf(format, args);
vprintf(format, args);
return 0;
}
if (!strstr(format, "verifier log"))
return 0;
test__vprintf("%s", args);
vprintf("%s", args);
return 0;
}

2
tools/testing/selftests/bpf/prog_tests/l4lb_all.c
View File

@ -74,7 +74,7 @@ static void test_l4lb(const char *file)
}
if (bytes != MAGIC_BYTES * NUM_ITER * 2 || pkts != NUM_ITER * 2) {
error_cnt++;
test__printf("test_l4lb:FAIL:stats %lld %lld\n", bytes, pkts);
printf("test_l4lb:FAIL:stats %lld %lld\n", bytes, pkts);
}
out:
bpf_object__close(obj);

10
tools/testing/selftests/bpf/prog_tests/map_lock.c
View File

@ -9,12 +9,12 @@ static void *parallel_map_access(void *arg)
for (i = 0; i < 10000; i++) {
err = bpf_map_lookup_elem_flags(map_fd, &key, vars, BPF_F_LOCK);
if (err) {
test__printf("lookup failed\n");
printf("lookup failed\n");
error_cnt++;
goto out;
}
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++;
goto out;
}
@ -22,8 +22,8 @@ static void *parallel_map_access(void *arg)
for (j = 2; j < 17; j++) {
if (vars[j] == rnd)
continue;
test__printf("lookup #%d var[1]=%d var[%d]=%d\n",
i, rnd, j, vars[j]);
printf("lookup #%d var[1]=%d var[%d]=%d\n",
i, rnd, j, vars[j]);
error_cnt++;
goto out;
}
@ -43,7 +43,7 @@ void test_map_lock(void)
err = bpf_prog_load(file, BPF_PROG_TYPE_CGROUP_SKB, &obj, &prog_fd);
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;
}
map_fd[0] = bpf_find_map(__func__, obj, "hash_map");

4
tools/testing/selftests/bpf/prog_tests/send_signal.c
View File

@ -202,8 +202,8 @@ static int test_send_signal_nmi(void)
-1 /* cpu */, -1 /* group_fd */, 0 /* flags */);
if (pmu_fd == -1) {
if (errno == ENOENT) {
test__printf("%s:SKIP:no PERF_COUNT_HW_CPU_CYCLES\n",
__func__);
printf("%s:SKIP:no PERF_COUNT_HW_CPU_CYCLES\n",
__func__);
return 0;
}
/* Let the test fail with a more informative message */

2
tools/testing/selftests/bpf/prog_tests/spinlock.c
View File

@ -12,7 +12,7 @@ void test_spinlock(void)
err = bpf_prog_load(file, BPF_PROG_TYPE_CGROUP_SKB, &obj, &prog_fd);
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;
}
for (i = 0; i < 4; i++)

4
tools/testing/selftests/bpf/prog_tests/stacktrace_build_id.c
View File

@ -109,8 +109,8 @@ void test_stacktrace_build_id(void)
if (build_id_matches < 1 && retry--) {
bpf_link__destroy(link);
bpf_object__close(obj);
test__printf("%s:WARN:Didn't find expected build ID from the map, retrying\n",
__func__);
printf("%s:WARN:Didn't find expected build ID from the map, retrying\n",
__func__);
goto retry;
}

4
tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c
View File

@ -140,8 +140,8 @@ void test_stacktrace_build_id_nmi(void)
if (build_id_matches < 1 && retry--) {
bpf_link__destroy(link);
bpf_object__close(obj);
test__printf("%s:WARN:Didn't find expected build ID from the map, retrying\n",
__func__);
printf("%s:WARN:Didn't find expected build ID from the map, retrying\n",
__func__);
goto retry;
}

4
tools/testing/selftests/bpf/prog_tests/xdp_noinline.c
View File

@ -75,8 +75,8 @@ void test_xdp_noinline(void)
}
if (bytes != MAGIC_BYTES * NUM_ITER * 2 || pkts != NUM_ITER * 2) {
error_cnt++;
test__printf("test_xdp_noinline:FAIL:stats %lld %lld\n",
bytes, pkts);
printf("test_xdp_noinline:FAIL:stats %lld %lld\n",
bytes, pkts);
}
out:
bpf_object__close(obj);

16
tools/testing/selftests/bpf/test_progs.c
View File

@ -105,20 +105,6 @@ void test__force_log() {
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 = {
.eth.h_proto = __bpf_constant_htons(ETH_P_IP),
.iph.ihl = 5,
@ -310,7 +296,7 @@ static int libbpf_print_fn(enum libbpf_print_level level,
{
if (!env.very_verbose && level == LIBBPF_DEBUG)
return 0;
test__vprintf(format, args);
vprintf(format, args);
return 0;
}

10
tools/testing/selftests/bpf/test_progs.h
View File

@ -70,8 +70,6 @@ extern int error_cnt;
extern int pass_cnt;
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 bool test__start_subtest(const char *name);
@ -97,12 +95,12 @@ extern struct ipv6_packet pkt_v6;
int __ret = !!(condition); \
if (__ret) { \
error_cnt++; \
test__printf("%s:FAIL:%s ", __func__, tag); \
test__printf(format); \
printf("%s:FAIL:%s ", __func__, tag); \
printf(format); \
} else { \
pass_cnt++; \
test__printf("%s:PASS:%s %d nsec\n", \
__func__, tag, duration); \
printf("%s:PASS:%s %d nsec\n", \
__func__, tag, duration); \
} \
__ret; \
})