|
10 | 10 | #include "bpf_iter_task.skel.h"
|
11 | 11 | #include "bpf_iter_task_stack.skel.h"
|
12 | 12 | #include "bpf_iter_task_file.skel.h"
|
13 |
| -#include "bpf_iter_task_vma.skel.h" |
| 13 | +#include "bpf_iter_task_vmas.skel.h" |
14 | 14 | #include "bpf_iter_task_btf.skel.h"
|
15 | 15 | #include "bpf_iter_tcp4.skel.h"
|
16 | 16 | #include "bpf_iter_tcp6.skel.h"
|
@@ -1399,19 +1399,19 @@ static void str_strip_first_line(char *str)
|
1399 | 1399 | static void test_task_vma_common(struct bpf_iter_attach_opts *opts)
|
1400 | 1400 | {
|
1401 | 1401 | int err, iter_fd = -1, proc_maps_fd = -1;
|
1402 |
| - struct bpf_iter_task_vma *skel; |
| 1402 | + struct bpf_iter_task_vmas *skel; |
1403 | 1403 | int len, read_size = 4;
|
1404 | 1404 | char maps_path[64];
|
1405 | 1405 |
|
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")) |
1408 | 1408 | return;
|
1409 | 1409 |
|
1410 | 1410 | skel->bss->pid = getpid();
|
1411 | 1411 | skel->bss->one_task = opts ? 1 : 0;
|
1412 | 1412 |
|
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")) |
1415 | 1415 | goto out;
|
1416 | 1416 |
|
1417 | 1417 | skel->links.proc_maps = bpf_program__attach_iter(
|
@@ -1462,25 +1462,25 @@ static void test_task_vma_common(struct bpf_iter_attach_opts *opts)
|
1462 | 1462 | out:
|
1463 | 1463 | close(proc_maps_fd);
|
1464 | 1464 | close(iter_fd);
|
1465 |
| - bpf_iter_task_vma__destroy(skel); |
| 1465 | + bpf_iter_task_vmas__destroy(skel); |
1466 | 1466 | }
|
1467 | 1467 |
|
1468 | 1468 | static void test_task_vma_dead_task(void)
|
1469 | 1469 | {
|
1470 |
| - struct bpf_iter_task_vma *skel; |
| 1470 | + struct bpf_iter_task_vmas *skel; |
1471 | 1471 | int wstatus, child_pid = -1;
|
1472 | 1472 | time_t start_tm, cur_tm;
|
1473 | 1473 | int err, iter_fd = -1;
|
1474 | 1474 | int wait_sec = 3;
|
1475 | 1475 |
|
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")) |
1478 | 1478 | return;
|
1479 | 1479 |
|
1480 | 1480 | skel->bss->pid = getpid();
|
1481 | 1481 |
|
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")) |
1484 | 1484 | goto out;
|
1485 | 1485 |
|
1486 | 1486 | skel->links.proc_maps = bpf_program__attach_iter(
|
@@ -1533,7 +1533,7 @@ static void test_task_vma_dead_task(void)
|
1533 | 1533 | out:
|
1534 | 1534 | waitpid(child_pid, &wstatus, 0);
|
1535 | 1535 | close(iter_fd);
|
1536 |
| - bpf_iter_task_vma__destroy(skel); |
| 1536 | + bpf_iter_task_vmas__destroy(skel); |
1537 | 1537 | }
|
1538 | 1538 |
|
1539 | 1539 | void test_bpf_sockmap_map_iter_fd(void)
|
|
0 commit comments