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

selftests/bpf: rename bpf_iter_task.c to bpf_iter_tasks.c

The newly-added struct bpf_iter_task has a name collision with a selftest
for the seq_file task iter's bpf skel, so the selftests/bpf/progs file is
renamed in order to avoid the collision.

Signed-off-by: Chuyi Zhou <zhouchuyi@bytedance.com>
Acked-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/r/20231018061746.111364-8-zhouchuyi@bytedance.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

authored by

Chuyi Zhou and committed by
Alexei Starovoitov
ddab78cb cb3ecf79

+9 -9
+9 -9
tools/testing/selftests/bpf/prog_tests/bpf_iter.c
··· 7 7 #include "bpf_iter_ipv6_route.skel.h" 8 8 #include "bpf_iter_netlink.skel.h" 9 9 #include "bpf_iter_bpf_map.skel.h" 10 - #include "bpf_iter_task.skel.h" 10 + #include "bpf_iter_tasks.skel.h" 11 11 #include "bpf_iter_task_stack.skel.h" 12 12 #include "bpf_iter_task_file.skel.h" 13 13 #include "bpf_iter_task_vmas.skel.h" ··· 215 215 static void test_task_common_nocheck(struct bpf_iter_attach_opts *opts, 216 216 int *num_unknown, int *num_known) 217 217 { 218 - struct bpf_iter_task *skel; 218 + struct bpf_iter_tasks *skel; 219 219 pthread_t thread_id; 220 220 void *ret; 221 221 222 - skel = bpf_iter_task__open_and_load(); 223 - if (!ASSERT_OK_PTR(skel, "bpf_iter_task__open_and_load")) 222 + skel = bpf_iter_tasks__open_and_load(); 223 + if (!ASSERT_OK_PTR(skel, "bpf_iter_tasks__open_and_load")) 224 224 return; 225 225 226 226 ASSERT_OK(pthread_mutex_lock(&do_nothing_mutex), "pthread_mutex_lock"); ··· 239 239 ASSERT_FALSE(pthread_join(thread_id, &ret) || ret != NULL, 240 240 "pthread_join"); 241 241 242 - bpf_iter_task__destroy(skel); 242 + bpf_iter_tasks__destroy(skel); 243 243 } 244 244 245 245 static void test_task_common(struct bpf_iter_attach_opts *opts, int num_unknown, int num_known) ··· 307 307 308 308 static void test_task_sleepable(void) 309 309 { 310 - struct bpf_iter_task *skel; 310 + struct bpf_iter_tasks *skel; 311 311 312 - skel = bpf_iter_task__open_and_load(); 313 - if (!ASSERT_OK_PTR(skel, "bpf_iter_task__open_and_load")) 312 + skel = bpf_iter_tasks__open_and_load(); 313 + if (!ASSERT_OK_PTR(skel, "bpf_iter_tasks__open_and_load")) 314 314 return; 315 315 316 316 do_dummy_read(skel->progs.dump_task_sleepable); ··· 320 320 ASSERT_GT(skel->bss->num_success_copy_from_user_task, 0, 321 321 "num_success_copy_from_user_task"); 322 322 323 - bpf_iter_task__destroy(skel); 323 + bpf_iter_tasks__destroy(skel); 324 324 } 325 325 326 326 static void test_task_stack(void)
tools/testing/selftests/bpf/progs/bpf_iter_task.c tools/testing/selftests/bpf/progs/bpf_iter_tasks.c