Skip to content

Commit 45b3894

Browse files
davemarchevskyanakryiko
authored andcommitted
selftests/bpf: Rename bpf_iter_task_vma.c to bpf_iter_task_vmas.c
Further patches in this series will add a struct bpf_iter_task_vma, which will result in a name collision with the selftest prog renamed in this patch. Rename the selftest to avoid the collision. Signed-off-by: Dave Marchevsky <davemarchevsky@fb.com> Signed-off-by: Andrii Nakryiko <andrii@kernel.org> Acked-by: Andrii Nakryiko <andrii@kernel.org> Link: https://lore.kernel.org/bpf/20231013204426.1074286-3-davemarchevsky@fb.com
1 parent f10ca5d commit 45b3894

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

tools/testing/selftests/bpf/prog_tests/bpf_iter.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "bpf_iter_task.skel.h"
1111
#include "bpf_iter_task_stack.skel.h"
1212
#include "bpf_iter_task_file.skel.h"
13-
#include "bpf_iter_task_vma.skel.h"
13+
#include "bpf_iter_task_vmas.skel.h"
1414
#include "bpf_iter_task_btf.skel.h"
1515
#include "bpf_iter_tcp4.skel.h"
1616
#include "bpf_iter_tcp6.skel.h"
@@ -1399,19 +1399,19 @@ static void str_strip_first_line(char *str)
13991399
static void test_task_vma_common(struct bpf_iter_attach_opts *opts)
14001400
{
14011401
int err, iter_fd = -1, proc_maps_fd = -1;
1402-
struct bpf_iter_task_vma *skel;
1402+
struct bpf_iter_task_vmas *skel;
14031403
int len, read_size = 4;
14041404
char maps_path[64];
14051405

1406-
skel = bpf_iter_task_vma__open();
1407-
if (!ASSERT_OK_PTR(skel, "bpf_iter_task_vma__open"))
1406+
skel = bpf_iter_task_vmas__open();
1407+
if (!ASSERT_OK_PTR(skel, "bpf_iter_task_vmas__open"))
14081408
return;
14091409

14101410
skel->bss->pid = getpid();
14111411
skel->bss->one_task = opts ? 1 : 0;
14121412

1413-
err = bpf_iter_task_vma__load(skel);
1414-
if (!ASSERT_OK(err, "bpf_iter_task_vma__load"))
1413+
err = bpf_iter_task_vmas__load(skel);
1414+
if (!ASSERT_OK(err, "bpf_iter_task_vmas__load"))
14151415
goto out;
14161416

14171417
skel->links.proc_maps = bpf_program__attach_iter(
@@ -1462,25 +1462,25 @@ static void test_task_vma_common(struct bpf_iter_attach_opts *opts)
14621462
out:
14631463
close(proc_maps_fd);
14641464
close(iter_fd);
1465-
bpf_iter_task_vma__destroy(skel);
1465+
bpf_iter_task_vmas__destroy(skel);
14661466
}
14671467

14681468
static void test_task_vma_dead_task(void)
14691469
{
1470-
struct bpf_iter_task_vma *skel;
1470+
struct bpf_iter_task_vmas *skel;
14711471
int wstatus, child_pid = -1;
14721472
time_t start_tm, cur_tm;
14731473
int err, iter_fd = -1;
14741474
int wait_sec = 3;
14751475

1476-
skel = bpf_iter_task_vma__open();
1477-
if (!ASSERT_OK_PTR(skel, "bpf_iter_task_vma__open"))
1476+
skel = bpf_iter_task_vmas__open();
1477+
if (!ASSERT_OK_PTR(skel, "bpf_iter_task_vmas__open"))
14781478
return;
14791479

14801480
skel->bss->pid = getpid();
14811481

1482-
err = bpf_iter_task_vma__load(skel);
1483-
if (!ASSERT_OK(err, "bpf_iter_task_vma__load"))
1482+
err = bpf_iter_task_vmas__load(skel);
1483+
if (!ASSERT_OK(err, "bpf_iter_task_vmas__load"))
14841484
goto out;
14851485

14861486
skel->links.proc_maps = bpf_program__attach_iter(
@@ -1533,7 +1533,7 @@ static void test_task_vma_dead_task(void)
15331533
out:
15341534
waitpid(child_pid, &wstatus, 0);
15351535
close(iter_fd);
1536-
bpf_iter_task_vma__destroy(skel);
1536+
bpf_iter_task_vmas__destroy(skel);
15371537
}
15381538

15391539
void test_bpf_sockmap_map_iter_fd(void)

0 commit comments

Comments
 (0)