On Wed, Oct 11, 2023 at 5:09 AM Chuyi Zhou <zhouchuyi@xxxxxxxxxxxxx> wrote:
>
> 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@xxxxxxxxxxxxx>
> ---
Acked-by: Andrii Nakryiko <andrii@xxxxxxxxxx>
> .../selftests/bpf/prog_tests/bpf_iter.c | 18 +++++++++---------
> .../{bpf_iter_task.c => bpf_iter_tasks.c} | 0
> 2 files changed, 9 insertions(+), 9 deletions(-)
> rename tools/testing/selftests/bpf/progs/{bpf_iter_task.c => bpf_iter_tasks.c} (100%)
>
> diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_iter.c b/tools/testing/selftests/bpf/prog_tests/bpf_iter.c
> index 1f02168103dd..dc60e8e125cd 100644
> --- a/tools/testing/selftests/bpf/prog_tests/bpf_iter.c
> +++ b/tools/testing/selftests/bpf/prog_tests/bpf_iter.c
> @@ -7,7 +7,7 @@
> #include "bpf_iter_ipv6_route.skel.h"
> #include "bpf_iter_netlink.skel.h"
> #include "bpf_iter_bpf_map.skel.h"
> -#include "bpf_iter_task.skel.h"
> +#include "bpf_iter_tasks.skel.h"
> #include "bpf_iter_task_stack.skel.h"
> #include "bpf_iter_task_file.skel.h"
> #include "bpf_iter_task_vma.skel.h"
> @@ -215,12 +215,12 @@ static void *do_nothing_wait(void *arg)
> static void test_task_common_nocheck(struct bpf_iter_attach_opts *opts,
> int *num_unknown, int *num_known)
> {
> - struct bpf_iter_task *skel;
> + struct bpf_iter_tasks *skel;
> pthread_t thread_id;
> void *ret;
>
> - skel = bpf_iter_task__open_and_load();
> - if (!ASSERT_OK_PTR(skel, "bpf_iter_task__open_and_load"))
> + skel = bpf_iter_tasks__open_and_load();
> + if (!ASSERT_OK_PTR(skel, "bpf_iter_tasks__open_and_load"))
> return;
>
> ASSERT_OK(pthread_mutex_lock(&do_nothing_mutex), "pthread_mutex_lock");
> @@ -239,7 +239,7 @@ static void test_task_common_nocheck(struct bpf_iter_attach_opts *opts,
> ASSERT_FALSE(pthread_join(thread_id, &ret) || ret != NULL,
> "pthread_join");
>
> - bpf_iter_task__destroy(skel);
> + bpf_iter_tasks__destroy(skel);
> }
>
> static void test_task_common(struct bpf_iter_attach_opts *opts, int num_unknown, int num_known)
> @@ -307,10 +307,10 @@ static void test_task_pidfd(void)
>
> static void test_task_sleepable(void)
> {
> - struct bpf_iter_task *skel;
> + struct bpf_iter_tasks *skel;
>
> - skel = bpf_iter_task__open_and_load();
> - if (!ASSERT_OK_PTR(skel, "bpf_iter_task__open_and_load"))
> + skel = bpf_iter_tasks__open_and_load();
> + if (!ASSERT_OK_PTR(skel, "bpf_iter_tasks__open_and_load"))
> return;
>
> do_dummy_read(skel->progs.dump_task_sleepable);
> @@ -320,7 +320,7 @@ static void test_task_sleepable(void)
> ASSERT_GT(skel->bss->num_success_copy_from_user_task, 0,
> "num_success_copy_from_user_task");
>
> - bpf_iter_task__destroy(skel);
> + bpf_iter_tasks__destroy(skel);
> }
>
> static void test_task_stack(void)
> diff --git a/tools/testing/selftests/bpf/progs/bpf_iter_task.c b/tools/testing/selftests/bpf/progs/bpf_iter_tasks.c
> similarity index 100%
> rename from tools/testing/selftests/bpf/progs/bpf_iter_task.c
> rename to tools/testing/selftests/bpf/progs/bpf_iter_tasks.c
> --
> 2.20.1
>
