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

diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_iter.c b/tools/testing/selftests/bpf/prog_tests/bpf_iter.c
index 1f02168103dd776fd5c9e83d4a90f173f0153ae1..41aba139b20b85f6bdca394f266773fc20e83fcc 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/bpf_iter.c
+++ b/tools/testing/selftests/bpf/prog_tests/bpf_iter.c
@@ -10,7 +10,7 @@
 #include "bpf_iter_task.skel.h"
 #include "bpf_iter_task_stack.skel.h"
 #include "bpf_iter_task_file.skel.h"
-#include "bpf_iter_task_vma.skel.h"
+#include "bpf_iter_task_vmas.skel.h"
 #include "bpf_iter_task_btf.skel.h"
 #include "bpf_iter_tcp4.skel.h"
 #include "bpf_iter_tcp6.skel.h"
@@ -1399,19 +1399,19 @@ static void str_strip_first_line(char *str)
 static void test_task_vma_common(struct bpf_iter_attach_opts *opts)
 {
        int err, iter_fd = -1, proc_maps_fd = -1;
-       struct bpf_iter_task_vma *skel;
+       struct bpf_iter_task_vmas *skel;
        int len, read_size = 4;
        char maps_path[64];
 
-       skel = bpf_iter_task_vma__open();
-       if (!ASSERT_OK_PTR(skel, "bpf_iter_task_vma__open"))
+       skel = bpf_iter_task_vmas__open();
+       if (!ASSERT_OK_PTR(skel, "bpf_iter_task_vmas__open"))
                return;
 
        skel->bss->pid = getpid();
        skel->bss->one_task = opts ? 1 : 0;
 
-       err = bpf_iter_task_vma__load(skel);
-       if (!ASSERT_OK(err, "bpf_iter_task_vma__load"))
+       err = bpf_iter_task_vmas__load(skel);
+       if (!ASSERT_OK(err, "bpf_iter_task_vmas__load"))
                goto out;
 
        skel->links.proc_maps = bpf_program__attach_iter(
@@ -1462,25 +1462,25 @@ static void test_task_vma_common(struct bpf_iter_attach_opts *opts)
 out:
        close(proc_maps_fd);
        close(iter_fd);
-       bpf_iter_task_vma__destroy(skel);
+       bpf_iter_task_vmas__destroy(skel);
 }
 
 static void test_task_vma_dead_task(void)
 {
-       struct bpf_iter_task_vma *skel;
+       struct bpf_iter_task_vmas *skel;
        int wstatus, child_pid = -1;
        time_t start_tm, cur_tm;
        int err, iter_fd = -1;
        int wait_sec = 3;
 
-       skel = bpf_iter_task_vma__open();
-       if (!ASSERT_OK_PTR(skel, "bpf_iter_task_vma__open"))
+       skel = bpf_iter_task_vmas__open();
+       if (!ASSERT_OK_PTR(skel, "bpf_iter_task_vmas__open"))
                return;
 
        skel->bss->pid = getpid();
 
-       err = bpf_iter_task_vma__load(skel);
-       if (!ASSERT_OK(err, "bpf_iter_task_vma__load"))
+       err = bpf_iter_task_vmas__load(skel);
+       if (!ASSERT_OK(err, "bpf_iter_task_vmas__load"))
                goto out;
 
        skel->links.proc_maps = bpf_program__attach_iter(
@@ -1533,7 +1533,7 @@ static void test_task_vma_dead_task(void)
 out:
        waitpid(child_pid, &wstatus, 0);
        close(iter_fd);
-       bpf_iter_task_vma__destroy(skel);
+       bpf_iter_task_vmas__destroy(skel);
 }
 
 void test_bpf_sockmap_map_iter_fd(void)

diff --git a/tools/testing/selftests/bpf/progs/bpf_iter_task_vma.c b/tools/testing/selftests/bpf/progs/bpf_iter_task_vma.c
deleted file mode 100644 (file)
index dd923dc..0000000
--- a/tools/testing/selftests/bpf/progs/bpf_iter_task_vma.c
+++ /dev/null
@@ -1,62 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/* Copyright (c) 2020 Facebook */
-#include "bpf_iter.h"
-#include <bpf/bpf_helpers.h>
-
-char _license[] SEC("license") = "GPL";
-
-/* Copied from mm.h */
-#define VM_READ                0x00000001
-#define VM_WRITE       0x00000002
-#define VM_EXEC                0x00000004
-#define VM_MAYSHARE    0x00000080
-
-/* Copied from kdev_t.h */
-#define MINORBITS      20
-#define MINORMASK      ((1U << MINORBITS) - 1)
-#define MAJOR(dev)     ((unsigned int) ((dev) >> MINORBITS))
-#define MINOR(dev)     ((unsigned int) ((dev) & MINORMASK))
-
-#define D_PATH_BUF_SIZE 1024
-char d_path_buf[D_PATH_BUF_SIZE] = {};
-__u32 pid = 0;
-__u32 one_task = 0;
-__u32 one_task_error = 0;
-
-SEC("iter/task_vma") int proc_maps(struct bpf_iter__task_vma *ctx)
-{
-       struct vm_area_struct *vma = ctx->vma;
-       struct seq_file *seq = ctx->meta->seq;
-       struct task_struct *task = ctx->task;
-       struct file *file;
-       char perm_str[] = "----";
-
-       if (task == (void *)0 || vma == (void *)0)
-               return 0;
-
-       file = vma->vm_file;
-       if (task->tgid != pid) {
-               if (one_task)
-                       one_task_error = 1;
-               return 0;
-       }
-       perm_str[0] = (vma->vm_flags & VM_READ) ? 'r' : '-';
-       perm_str[1] = (vma->vm_flags & VM_WRITE) ? 'w' : '-';
-       perm_str[2] = (vma->vm_flags & VM_EXEC) ? 'x' : '-';
-       perm_str[3] = (vma->vm_flags & VM_MAYSHARE) ? 's' : 'p';
-       BPF_SEQ_PRINTF(seq, "%08llx-%08llx %s ", vma->vm_start, vma->vm_end, perm_str);
-
-       if (file) {
-               __u32 dev = file->f_inode->i_sb->s_dev;
-
-               bpf_d_path(&file->f_path, d_path_buf, D_PATH_BUF_SIZE);
-
-               BPF_SEQ_PRINTF(seq, "%08llx ", vma->vm_pgoff << 12);
-               BPF_SEQ_PRINTF(seq, "%02x:%02x %u", MAJOR(dev), MINOR(dev),
-                              file->f_inode->i_ino);
-               BPF_SEQ_PRINTF(seq, "\t%s\n", d_path_buf);
-       } else {
-               BPF_SEQ_PRINTF(seq, "%08llx 00:00 0\n", 0ULL);
-       }
-       return 0;
-}

diff --git a/tools/testing/selftests/bpf/progs/bpf_iter_task_vmas.c b/tools/testing/selftests/bpf/progs/bpf_iter_task_vmas.c
new file mode 100644 (file)
index 0000000..dd923dc
--- /dev/null
+++ b/tools/testing/selftests/bpf/progs/bpf_iter_task_vmas.c
@@ -0,0 +1,62 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright (c) 2020 Facebook */
+#include "bpf_iter.h"
+#include <bpf/bpf_helpers.h>
+
+char _license[] SEC("license") = "GPL";
+
+/* Copied from mm.h */
+#define VM_READ                0x00000001
+#define VM_WRITE       0x00000002
+#define VM_EXEC                0x00000004
+#define VM_MAYSHARE    0x00000080
+
+/* Copied from kdev_t.h */
+#define MINORBITS      20
+#define MINORMASK      ((1U << MINORBITS) - 1)
+#define MAJOR(dev)     ((unsigned int) ((dev) >> MINORBITS))
+#define MINOR(dev)     ((unsigned int) ((dev) & MINORMASK))
+
+#define D_PATH_BUF_SIZE 1024
+char d_path_buf[D_PATH_BUF_SIZE] = {};
+__u32 pid = 0;
+__u32 one_task = 0;
+__u32 one_task_error = 0;
+
+SEC("iter/task_vma") int proc_maps(struct bpf_iter__task_vma *ctx)
+{
+       struct vm_area_struct *vma = ctx->vma;
+       struct seq_file *seq = ctx->meta->seq;
+       struct task_struct *task = ctx->task;
+       struct file *file;
+       char perm_str[] = "----";
+
+       if (task == (void *)0 || vma == (void *)0)
+               return 0;
+
+       file = vma->vm_file;
+       if (task->tgid != pid) {
+               if (one_task)
+                       one_task_error = 1;
+               return 0;
+       }
+       perm_str[0] = (vma->vm_flags & VM_READ) ? 'r' : '-';
+       perm_str[1] = (vma->vm_flags & VM_WRITE) ? 'w' : '-';
+       perm_str[2] = (vma->vm_flags & VM_EXEC) ? 'x' : '-';
+       perm_str[3] = (vma->vm_flags & VM_MAYSHARE) ? 's' : 'p';
+       BPF_SEQ_PRINTF(seq, "%08llx-%08llx %s ", vma->vm_start, vma->vm_end, perm_str);
+
+       if (file) {
+               __u32 dev = file->f_inode->i_sb->s_dev;
+
+               bpf_d_path(&file->f_path, d_path_buf, D_PATH_BUF_SIZE);
+
+               BPF_SEQ_PRINTF(seq, "%08llx ", vma->vm_pgoff << 12);
+               BPF_SEQ_PRINTF(seq, "%02x:%02x %u", MAJOR(dev), MINOR(dev),
+                              file->f_inode->i_ino);
+               BPF_SEQ_PRINTF(seq, "\t%s\n", d_path_buf);
+       } else {
+               BPF_SEQ_PRINTF(seq, "%08llx 00:00 0\n", 0ULL);
+       }
+       return 0;
+}