Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

selftests/bpf: Convert map_ptr_kern test to use light skeleton.

To exercise CO-RE in the kernel further convert map_ptr_kern
test to light skeleton.

Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Acked-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20211201181040.23337-15-alexei.starovoitov@gmail.com

authored by

Alexei Starovoitov and committed by
Andrii Nakryiko
650c9dbd d82fa9b7

+9 -10
+2 -1
tools/testing/selftests/bpf/Makefile
··· 325 325 linked_vars.skel.h linked_maps.skel.h 326 326 327 327 LSKELS := kfunc_call_test.c fentry_test.c fexit_test.c fexit_sleep.c \ 328 - test_ringbuf.c atomics.c trace_printk.c trace_vprintk.c 328 + test_ringbuf.c atomics.c trace_printk.c trace_vprintk.c \ 329 + map_ptr_kern.c 329 330 # Generate both light skeleton and libbpf skeleton for these 330 331 LSKELS_EXTRA := test_ksyms_module.c test_ksyms_weak.c kfunc_call_test_subprog.c 331 332 SKEL_BLACKLIST += $$(LSKELS)
+7 -9
tools/testing/selftests/bpf/prog_tests/map_ptr.c
··· 4 4 #include <test_progs.h> 5 5 #include <network_helpers.h> 6 6 7 - #include "map_ptr_kern.skel.h" 7 + #include "map_ptr_kern.lskel.h" 8 8 9 9 void test_map_ptr(void) 10 10 { 11 - struct map_ptr_kern *skel; 11 + struct map_ptr_kern_lskel *skel; 12 12 __u32 duration = 0, retval; 13 13 char buf[128]; 14 14 int err; 15 15 int page_size = getpagesize(); 16 16 17 - skel = map_ptr_kern__open(); 17 + skel = map_ptr_kern_lskel__open(); 18 18 if (!ASSERT_OK_PTR(skel, "skel_open")) 19 19 return; 20 20 21 - err = bpf_map__set_max_entries(skel->maps.m_ringbuf, page_size); 22 - if (!ASSERT_OK(err, "bpf_map__set_max_entries")) 23 - goto cleanup; 21 + skel->maps.m_ringbuf.max_entries = page_size; 24 22 25 - err = map_ptr_kern__load(skel); 23 + err = map_ptr_kern_lskel__load(skel); 26 24 if (!ASSERT_OK(err, "skel_load")) 27 25 goto cleanup; 28 26 29 27 skel->bss->page_size = page_size; 30 28 31 - err = bpf_prog_test_run(bpf_program__fd(skel->progs.cg_skb), 1, &pkt_v4, 29 + err = bpf_prog_test_run(skel->progs.cg_skb.prog_fd, 1, &pkt_v4, 32 30 sizeof(pkt_v4), buf, NULL, &retval, NULL); 33 31 34 32 if (CHECK(err, "test_run", "err=%d errno=%d\n", err, errno)) ··· 37 39 goto cleanup; 38 40 39 41 cleanup: 40 - map_ptr_kern__destroy(skel); 42 + map_ptr_kern_lskel__destroy(skel); 41 43 }