mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2025-01-11 00:04:33 +08:00
d6f1837107
The test_progs subtests, test_spin_lock() and test_map_lock(), requires BTF present to run successfully. Currently, when BTF failed to load, test_progs will segfault, $ ./test_progs ... 12: (bf) r1 = r8 13: (85) call bpf_spin_lock#93 map 'hash_map' has to have BTF in order to use bpf_spin_lock libbpf: -- END LOG -- libbpf: failed to load program 'map_lock_demo' libbpf: failed to load object './test_map_lock.o' test_map_lock:bpf_prog_load errno 13 Segmentation fault The segfault is caused by uninitialized variable "obj", which is used in bpf_object__close(obj), when bpf prog failed to load. Initializing variable "obj" to NULL in two occasions fixed the problem. $ ./test_progs ... Summary: 219 PASSED, 2 FAILED Fixes:b4d4556c32("selftests/bpf: add bpf_spin_lock verifier tests") Fixes:ba72a7b4ba("selftests/bpf: test for BPF_F_LOCK") Reported-by: Daniel Borkmann <daniel@iogearbox.net> Signed-off-by: Yonghong Song <yhs@fb.com> Acked-by: Song Liu <songliubraving@fb.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
76 lines
1.8 KiB
C
76 lines
1.8 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
#include <test_progs.h>
|
|
|
|
static void *parallel_map_access(void *arg)
|
|
{
|
|
int err, map_fd = *(u32 *) arg;
|
|
int vars[17], i, j, rnd, key = 0;
|
|
|
|
for (i = 0; i < 10000; i++) {
|
|
err = bpf_map_lookup_elem_flags(map_fd, &key, vars, BPF_F_LOCK);
|
|
if (err) {
|
|
printf("lookup failed\n");
|
|
error_cnt++;
|
|
goto out;
|
|
}
|
|
if (vars[0] != 0) {
|
|
printf("lookup #%d var[0]=%d\n", i, vars[0]);
|
|
error_cnt++;
|
|
goto out;
|
|
}
|
|
rnd = vars[1];
|
|
for (j = 2; j < 17; j++) {
|
|
if (vars[j] == rnd)
|
|
continue;
|
|
printf("lookup #%d var[1]=%d var[%d]=%d\n",
|
|
i, rnd, j, vars[j]);
|
|
error_cnt++;
|
|
goto out;
|
|
}
|
|
}
|
|
out:
|
|
pthread_exit(arg);
|
|
}
|
|
|
|
void test_map_lock(void)
|
|
{
|
|
const char *file = "./test_map_lock.o";
|
|
int prog_fd, map_fd[2], vars[17] = {};
|
|
pthread_t thread_id[6];
|
|
struct bpf_object *obj = NULL;
|
|
int err = 0, key = 0, i;
|
|
void *ret;
|
|
|
|
err = bpf_prog_load(file, BPF_PROG_TYPE_CGROUP_SKB, &obj, &prog_fd);
|
|
if (err) {
|
|
printf("test_map_lock:bpf_prog_load errno %d\n", errno);
|
|
goto close_prog;
|
|
}
|
|
map_fd[0] = bpf_find_map(__func__, obj, "hash_map");
|
|
if (map_fd[0] < 0)
|
|
goto close_prog;
|
|
map_fd[1] = bpf_find_map(__func__, obj, "array_map");
|
|
if (map_fd[1] < 0)
|
|
goto close_prog;
|
|
|
|
bpf_map_update_elem(map_fd[0], &key, vars, BPF_F_LOCK);
|
|
|
|
for (i = 0; i < 4; i++)
|
|
assert(pthread_create(&thread_id[i], NULL,
|
|
&spin_lock_thread, &prog_fd) == 0);
|
|
for (i = 4; i < 6; i++)
|
|
assert(pthread_create(&thread_id[i], NULL,
|
|
¶llel_map_access, &map_fd[i - 4]) == 0);
|
|
for (i = 0; i < 4; i++)
|
|
assert(pthread_join(thread_id[i], &ret) == 0 &&
|
|
ret == (void *)&prog_fd);
|
|
for (i = 4; i < 6; i++)
|
|
assert(pthread_join(thread_id[i], &ret) == 0 &&
|
|
ret == (void *)&map_fd[i - 4]);
|
|
goto close_prog_noerr;
|
|
close_prog:
|
|
error_cnt++;
|
|
close_prog_noerr:
|
|
bpf_object__close(obj);
|
|
}
|