Parameterize task iterators.
Subsystems (6)
v11 cover Parameterize task iterators.
Allow creating an iterator that loops through resources of one task/thread.
People could only create iterators to loop through all resources of files, vma, and tasks in the system, even though they were interested in only the resources of a specific task or process. Passing the additional parameters, people can now create an iterator to go through all resources or only the resources of a task.
Major Changes:
- Add new parameters in bpf_iter_link_info to indicate to go through all tasks or to go through a specific task.
- Change the implementations of BPF iterators of vma, files, and tasks to allow going through only the resources of a specific task.
- Provide the arguments of parameterized task iterators in bpf_link_info.
Differences from v10:
- Check pid_alive() to avoid potential errors.
Differences from v9:
- Fix the boundary check of computing page_shift.
- Rewording the reason of checking and returning the same task.
Differences from v8:
- Fix uninitialized variable.
- Avoid redundant work of getting task from pid.
- Change format string to use %u instead of %d.
- Use the value of page_shift to compute correct offset in bpf_iter_vm_offset.c.
Differences from v7:
- Travel the tasks of a process through task_group linked list instead of traveling through the whole namespace.
Differences from v6:
- Add part 5 to make bpftool show the value of parameters.
- Change of wording of show_fdinfo() to show pid or tid instead of always pid.
- Simplify error handling and naming of test cases.
Differences from v5:
- Use user-space tid/pid terminologies in bpf_iter_link_info and bpf_link_info.
- Fix reference count
- Merge all variants to one 'u32 pid' in internal structs. (bpf_iter_aux_info and bpf_iter_seq_task_common)
- Compare the result of get_uprobe_offset() with the implementation with the vma iterators.
- Implement show_fdinfo.
Differences from v4:
- Remove 'type' from bpf_iter_link_info and bpf_link_info.
v10: https://lore.kernel.org/all/[email protected]/
v9: https://lore.kernel.org/bpf/[email protected]/
v8: https://lore.kernel.org/bpf/[email protected]/
v7: https://lore.kernel.org/bpf/[email protected]/
v6: https://lore.kernel.org/bpf/[email protected]/
v5: https://lore.kernel.org/bpf/[email protected]/
v4: https://lore.kernel.org/bpf/[email protected]/
v3: https://lore.kernel.org/bpf/[email protected]/
v2: https://lore.kernel.org/bpf/[email protected]/
v1: https://lore.kernel.org/bpf/[email protected]/
Kui-Feng Lee (5):
bpf: Parameterize task iterators.
bpf: Handle bpf_link_info for the parameterized task BPF iterators.
bpf: Handle show_fdinfo for the parameterized task BPF iterators selftests/bpf: Test parameterized task BPF iterators.
bpftool: Show parameters of BPF task iterators.
include/linux/bpf.h | 25 ++ include/uapi/linux/bpf.h | 10 + kernel/bpf/task_iter.c | 228 ++++++++++++-- tools/bpf/bpftool/link.c | 19 ++ tools/include/uapi/linux/bpf.h | 10 + .../selftests/bpf/prog_tests/bpf_iter.c | 282 ++++++++++++++++-- .../selftests/bpf/prog_tests/btf_dump.c | 2 +- .../selftests/bpf/progs/bpf_iter_task.c | 9 + .../selftests/bpf/progs/bpf_iter_task_file.c | 9 +- .../selftests/bpf/progs/bpf_iter_task_vma.c | 7 +- .../selftests/bpf/progs/bpf_iter_vma_offset.c | 37 +++ 11 files changed, 592 insertions(+), 46 deletions(-) create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter_vma_offset.c
Signature · 1 line
2.30.2
PATCH v11 1/5 bpf: Parameterize task iterators.
Allow creating an iterator that loops through resources of one thread/process.
People could only create iterators to loop through all resources of files, vma, and tasks in the system, even though they were interested in only the resources of a specific task or process. Passing the additional parameters, people can now create an iterator to go through all resources or only the resources of a task.
--- include/linux/bpf.h | 25 +++++ include/uapi/linux/bpf.h | 6 ++ kernel/bpf/task_iter.c | 192 +++++++++++++++++++++++++++++---- tools/include/uapi/linux/bpf.h | 6 ++ 4 files changed, 207 insertions(+), 22 deletions(-)
include/linux/bpf.h +25 -0
@@ -1796,6 +1796,27 @@ int bpf_obj_get_user(const char __user *pathname, int flags); extern int bpf_iter_ ## target(args); \ int __init bpf_iter_ ## target(args) { return 0; } +/* +* The task type of iterators. +* +* For BPF task iterators, they can be parameterized with various +* parameters to visit only some of tasks. +* +* BPF_TASK_ITER_ALL (default) +* Iterate over resources of every task. +* +* BPF_TASK_ITER_TID +* Iterate over resources of a task/tid. +* +* BPF_TASK_ITER_TGID +* Iterate over resources of every task of a process / task group. +*/ +enum bpf_iter_task_type { +BPF_TASK_ITER_ALL =0 , +BPF_TASK_ITER_TID , +BPF_TASK_ITER_TGID , +}; +struct bpf_iter_aux_info {/* for map_elem iter */ struct bpf_map *map;
@@ -1805,6 +1826,10 @@ struct bpf_iter_aux_info {struct cgroup *start;/* starting cgroup */ enum bpf_cgroup_iter_order order; } cgroup; +struct { +enum bpf_iter_task_type type; +u32 pid; + } task; }; typedef int (*bpf_iter_attach_target_t)(struct bpf_prog *prog,
include/uapi/linux/bpf.h +6 -0
@@ -110,6 +110,12 @@ union bpf_iter_link_info {__u32 cgroup_fd;__u64 cgroup_id; } cgroup; +/* Parameters of task iterators. */ +struct { +__u32 tid; +__u32 pid; +__u32 pid_fd; + } task; };/* BPF syscall commands, see bpf(2) man-page for more details. */
kernel/bpf/task_iter.c +170 -22
310 lines not on this page · raw message
tools/include/uapi/linux/bpf.h +6 -0
@@ -110,6 +110,12 @@ union bpf_iter_link_info {__u32 cgroup_fd;__u64 cgroup_id; } cgroup; +/* Parameters of task iterators. */ +struct { +__u32 tid; +__u32 pid; +__u32 pid_fd; + } task; };/* BPF syscall commands, see bpf(2) man-page for more details. */
Signature · 1 line
2.30.2
Re: [PATCH bpf-next v11 1/5] bpf: Parameterize task iterators.
Quoted 19 lines · Kui-Feng Lee
Allow creating an iterator that loops through resources of one thread/process.
People could only create iterators to loop through all resources of files, vma, and tasks in the system, even though they were interested in only the resources of a specific task or process. Passing the additional parameters, people can now create an iterator to go through all resources or only the resources of a task.
Signed-off-by Kui-Feng Lee <[email protected]>Acked-by Yonghong Song <[email protected]>--- include/linux/bpf.h | 25 +++++ include/uapi/linux/bpf.h | 6 ++ kernel/bpf/task_iter.c | 192 +++++++++++++++++++++++++++++---- tools/include/uapi/linux/bpf.h | 6 ++ 4 files changed, 207 insertions(+), 22 deletions(-)
[...]
Quoted 16 lines
kernel/bpf/task_iter.c +16
-0+static int bpf_iter_attach_task (struct bpf_prog *prog, +union bpf_iter_link_info *linfo, +struct bpf_iter_aux_info *aux) +{ +unsigned int flags; +struct pid_namespace *ns; +struct pid *pid; +pid_t tgid; + +if ((!!linfo->task.tid + !!linfo->task.pid + !!linfo->task.pid_fd) >1 ) +return -EINVAL ; + + aux->task.type =BPF_TASK_ITER_ALL ; +if (linfo->task.tid !=0 ) { + aux->task.type =BPF_TASK_ITER_TID ; + aux->task.pid = linfo->task.tid;
kernel/bpf/task_iter.c static void task_seq_stop(struct seq_file *seq, void *v) · line 245
Quoted 10 lines
kernel/bpf/task_iter.c +10
-0+ } +if (linfo->task.pid !=0 ) { + aux->task.type =BPF_TASK_ITER_TGID ; + aux->task.pid = linfo->task.pid; + } +if (linfo->task.pid_fd !=0 ) { + aux->task.type =BPF_TASK_ITER_TGID ; + ns =task_active_pid_ns (current); +if (IS_ERR (ns)) +return PTR_ERR (ns);
doesn't seem like task_active_pid_ns() can fail (other places in kernel never handle NULL or IS_ERR for this), so I dropped this IS_ERR check
Quoted 13 lines
kernel/bpf/task_iter.c +13
-0+ + pid =pidfd_get_pid (linfo->task.pid_fd, &flags); +if (IS_ERR (pid)) +return PTR_ERR (pid); + + tgid =pid_nr_ns (pid, ns); + aux->task.pid = tgid; +put_pid (pid); + } + +return 0 ; +} +
[...]
PATCH v11 2/5 bpf: Handle bpf_link_info for the parameterized task BPF iterators.
In reply to Kui-Feng LeeAdd new fields to bpf_link_info that users can query it through bpf_obj_get_info_by_fd().
--- include/uapi/linux/bpf.h | 4 ++++ kernel/bpf/task_iter.c | 18 ++++++++++++++++++ tools/include/uapi/linux/bpf.h | 4 ++++ 3 files changed, 26 insertions(+)
include/uapi/linux/bpf.h +4 -0
@@ -6264,6 +6264,10 @@ struct bpf_link_info {__u64 cgroup_id;__u32 order; } cgroup; +struct { +__u32 tid; +__u32 pid; + } task; }; } iter;struct {
kernel/bpf/task_iter.c +18 -0
@@ -676,6 +676,21 @@ static const struct bpf_iter_seq_info task_seq_info = { .seq_priv_size = sizeof(struct bpf_iter_seq_task_info), }; +static int bpf_iter_fill_link_info (const struct bpf_iter_aux_info *aux,struct bpf_link_info *info) +{ +switch (aux->task.type) { +case BPF_TASK_ITER_TID : + info->iter.task.tid = aux->task.pid; +break ; +case BPF_TASK_ITER_TGID : + info->iter.task.pid = aux->task.pid; +break ; +default : +break ; + } +return 0 ; +} +static struct bpf_iter_reg task_reg_info = { .target ="task" , .attach_target = bpf_iter_attach_task,
@@ -686,6 +701,7 @@ static struct bpf_iter_reg task_reg_info = { PTR_TO_BTF_ID_OR_NULL }, }, .seq_info = &task_seq_info, + .fill_link_info = bpf_iter_fill_link_info, };static const struct bpf_iter_seq_info task_file_seq_info = {
@@ -707,6 +723,7 @@ static struct bpf_iter_reg task_file_reg_info = { PTR_TO_BTF_ID_OR_NULL }, }, .seq_info = &task_file_seq_info, + .fill_link_info = bpf_iter_fill_link_info, };static const struct bpf_iter_seq_info task_vma_seq_info = {
@@ -728,6 +745,7 @@ static struct bpf_iter_reg task_vma_reg_info = { PTR_TO_BTF_ID_OR_NULL }, }, .seq_info = &task_vma_seq_info, + .fill_link_info = bpf_iter_fill_link_info, }; BPF_CALL_5(bpf_find_vma, struct task_struct *, task, u64, start,
tools/include/uapi/linux/bpf.h +4 -0
@@ -6264,6 +6264,10 @@ struct bpf_link_info {__u64 cgroup_id;__u32 order; } cgroup; +struct { +__u32 tid; +__u32 pid; + } task; }; } iter;struct {
Signature · 1 line
2.30.2
PATCH v11 3/5 bpf: Handle show_fdinfo for the parameterized task BPF iterators
In reply to Kui-Feng LeeShow information of iterators in the respective files under /proc/<pid>/fdinfo/.
For example, for a task file iterator with 1723 as the value of tid parameter, its fdinfo would look like the following lines.
pos: 0
flags: 02000000
mnt_id: 14
ino: 38
link_type: iter
link_id: 51
prog_tag: a590ac96db22b825
prog_id: 299
target_name: task_file
task_type: TID
tid: 1723This patch add the last three fields. task_type is the type of the task parameter. TID means the iterator visit only the thread specified by tid. The value of tid in the above example is 1723. For the case of PID task_type, it means the iterator visits only threads of a process and will show the pid value of the process instead of a tid.
--- kernel/bpf/task_iter.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
kernel/bpf/task_iter.c +18 -0
@@ -10,6 +10,12 @@#include <linux/btf_ids.h> #include "mmap_unlock_work.h" +static const char *const iter_task_type_names[] = { +"ALL" , +"TID" , +"PID" , +}; +struct bpf_iter_seq_task_common {struct pid_namespace *ns;enum bpf_iter_task_type type;
@@ -691,6 +697,15 @@ static int bpf_iter_fill_link_info(const struct bpf_iter_aux_info *aux, struct breturn 0 ; } +static void bpf_iter_task_show_fdinfo (const struct bpf_iter_aux_info *aux,struct seq_file *seq) +{ +seq_printf (seq,"task_type:\t%s\n" , iter_task_type_names[aux->task.type]); +if (aux->task.type ==BPF_TASK_ITER_TID ) +seq_printf (seq,"tid:\t%u\n" , aux->task.pid); +else if (aux->task.type ==BPF_TASK_ITER_TGID ) +seq_printf (seq,"pid:\t%u\n" , aux->task.pid); +} +static struct bpf_iter_reg task_reg_info = { .target ="task" , .attach_target = bpf_iter_attach_task,
@@ -702,6 +717,7 @@ static struct bpf_iter_reg task_reg_info = { }, .seq_info = &task_seq_info, .fill_link_info = bpf_iter_fill_link_info, + .show_fdinfo = bpf_iter_task_show_fdinfo, };static const struct bpf_iter_seq_info task_file_seq_info = {
@@ -724,6 +740,7 @@ static struct bpf_iter_reg task_file_reg_info = { }, .seq_info = &task_file_seq_info, .fill_link_info = bpf_iter_fill_link_info, + .show_fdinfo = bpf_iter_task_show_fdinfo, };static const struct bpf_iter_seq_info task_vma_seq_info = {
@@ -746,6 +763,7 @@ static struct bpf_iter_reg task_vma_reg_info = { }, .seq_info = &task_vma_seq_info, .fill_link_info = bpf_iter_fill_link_info, + .show_fdinfo = bpf_iter_task_show_fdinfo, }; BPF_CALL_5(bpf_find_vma, struct task_struct *, task, u64, start,
Signature · 1 line
2.30.2
PATCH v11 4/5 selftests/bpf: Test parameterized task BPF iterators.
In reply to Kui-Feng LeeTest iterators of vma, files and tasks.
Ensure the API works appropriately to visit all tasks, tasks in a process, or a particular task.
--- .../selftests/bpf/prog_tests/bpf_iter.c | 282 ++++++++++++++++-- .../selftests/bpf/prog_tests/btf_dump.c | 2 +- .../selftests/bpf/progs/bpf_iter_task.c | 9 + .../selftests/bpf/progs/bpf_iter_task_file.c | 9 +- .../selftests/bpf/progs/bpf_iter_task_vma.c | 7 +- .../selftests/bpf/progs/bpf_iter_vma_offset.c | 37 +++ 6 files changed, 322 insertions(+), 24 deletions(-) create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter_vma_offset.c
tools/testing/selftests/bpf/prog_tests/bpf_iter.c +261 -21
@@ -1,6 +1,8 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2020 Facebook */ #include <test_progs.h> +#include <unistd.h> +#include <sys/syscall.h> #include "bpf_iter_ipv6_route.skel.h" #include "bpf_iter_netlink.skel.h" #include "bpf_iter_bpf_map.skel.h"
@@ -14,6 +16,7 @@#include "bpf_iter_udp4.skel.h" #include "bpf_iter_udp6.skel.h" #include "bpf_iter_unix.skel.h" +#include "bpf_iter_vma_offset.skel.h" #include "bpf_iter_test_kern1.skel.h" #include "bpf_iter_test_kern2.skel.h" #include "bpf_iter_test_kern3.skel.h"
@@ -43,13 +46,13 @@ static void test_btf_id_or_null(void) } } -static void do_dummy_read (struct bpf_program *prog) +static void do_dummy_read_opts (struct bpf_program *prog,struct bpf_iter_attach_opts *opts) {struct bpf_link *link;char buf[16 ] = {};int iter_fd, len; - link =bpf_program__attach_iter (prog,NULL ); + link =bpf_program__attach_iter (prog, opts);if (!ASSERT_OK_PTR (link,"attach_iter" ))return ;
@@ -68,6 +71,11 @@ static void do_dummy_read(struct bpf_program *prog)bpf_link__destroy (link); } +static void do_dummy_read (struct bpf_program *prog) +{ +do_dummy_read_opts (prog,NULL ); +} +static void do_read_map_iter_fd (struct bpf_object_skeleton **skel,struct bpf_program *prog,struct bpf_map *map) {
@@ -167,19 +175,140 @@ static void test_bpf_map(void)bpf_iter_bpf_map__destroy (skel); } -static void test_task (void ) +static int pidfd_open (pid_t pid,unsigned int flags) +{ +return syscall (SYS_pidfd_open, pid, flags); +} + +static void check_bpf_link_info (const struct bpf_program *prog) +{ +LIBBPF_OPTS (bpf_iter_attach_opts, opts); +union bpf_iter_link_info linfo; +struct bpf_link_info info = {}; +struct bpf_link *link; +__u32 info_len; +int err; + +memset (&linfo,0 ,sizeof (linfo)); + linfo.task.tid =getpid (); + opts.link_info = &linfo; + opts.link_info_len =sizeof (linfo); + + link =bpf_program__attach_iter (prog, &opts); +if (!ASSERT_OK_PTR (link,"attach_iter" )) +return ; + + info_len =sizeof (info); + err =bpf_obj_get_info_by_fd (bpf_link__fd (link), &info, &info_len); +ASSERT_OK (err,"bpf_obj_get_info_by_fd" ); +ASSERT_EQ (info.iter.task.tid,getpid (),"check_task_tid" ); + +bpf_link__destroy (link); +} + +static pthread_mutex_t do_nothing_mutex; + +static void *do_nothing_wait (void *arg) +{ +pthread_mutex_lock (&do_nothing_mutex); +pthread_mutex_unlock (&do_nothing_mutex); + +pthread_exit (arg); +} + +static void test_task_common_nocheck (struct bpf_iter_attach_opts *opts, +int *num_unknown,int *num_known) {struct bpf_iter_task *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" ))return ; -do_dummy_read (skel->progs.dump_task); +ASSERT_OK (pthread_mutex_lock (&do_nothing_mutex),"pthread_mutex_lock" ); + +ASSERT_OK (pthread_create (&thread_id,NULL , &do_nothing_wait,NULL ), +"pthread_create" ); + + skel->bss->tid =getpid (); + +do_dummy_read_opts (skel->progs.dump_task, opts); + + *num_unknown = skel->bss->num_unknown_tid; + *num_known = skel->bss->num_known_tid; + +ASSERT_OK (pthread_mutex_unlock (&do_nothing_mutex),"pthread_mutex_unlock" ); +ASSERT_FALSE (pthread_join (thread_id, &ret) || ret !=NULL , +"pthread_join" );bpf_iter_task__destroy (skel); } +static void test_task_common (struct bpf_iter_attach_opts *opts,int num_unknown,int num_known) +{ +int num_unknown_tid, num_known_tid; + +test_task_common_nocheck (opts, &num_unknown_tid, &num_known_tid); +ASSERT_EQ (num_unknown_tid, num_unknown,"check_num_unknown_tid" ); +ASSERT_EQ (num_known_tid, num_known,"check_num_known_tid" ); +} + +static void test_task_tid (void ) +{ +LIBBPF_OPTS (bpf_iter_attach_opts, opts); +union bpf_iter_link_info linfo; +int num_unknown_tid, num_known_tid; + +memset (&linfo,0 ,sizeof (linfo)); + linfo.task.tid =getpid (); + opts.link_info = &linfo; + opts.link_info_len =sizeof (linfo); +test_task_common (&opts,0 ,1 ); + + linfo.task.tid =0 ; + linfo.task.pid =getpid (); +test_task_common (&opts,1 ,1 ); + +test_task_common_nocheck (NULL , &num_unknown_tid, &num_known_tid); +ASSERT_GT (num_unknown_tid,1 ,"check_num_unknown_tid" ); +ASSERT_EQ (num_known_tid,1 ,"check_num_known_tid" ); +} + +static void test_task_pid (void ) +{ +LIBBPF_OPTS (bpf_iter_attach_opts, opts); +union bpf_iter_link_info linfo; + +memset (&linfo,0 ,sizeof (linfo)); + linfo.task.pid =getpid (); + opts.link_info = &linfo; + opts.link_info_len =sizeof (linfo); + +test_task_common (&opts,1 ,1 ); +} + +static void test_task_pidfd (void ) +{ +LIBBPF_OPTS (bpf_iter_attach_opts, opts); +union bpf_iter_link_info linfo; +int pidfd; + + pidfd =pidfd_open (getpid (),0 ); +if (!ASSERT_GT (pidfd,0 ,"pidfd_open" )) +return ; + +memset (&linfo,0 ,sizeof (linfo)); + linfo.task.pid_fd = pidfd; + opts.link_info = &linfo; + opts.link_info_len =sizeof (linfo); + +test_task_common (&opts,1 ,1 ); + +close (pidfd); +} +static void test_task_sleepable (void ) {struct bpf_iter_task *skel;
@@ -212,14 +341,11 @@ static void test_task_stack(void)bpf_iter_task_stack__destroy (skel); } -static void *do_nothing (void *arg) -{ -pthread_exit (arg); -} -static void test_task_file (void ) { +LIBBPF_OPTS (bpf_iter_attach_opts, opts);struct bpf_iter_task_file *skel; +union bpf_iter_link_info linfo;pthread_t thread_id;void *ret;
@@ -229,19 +355,36 @@ static void test_task_file(void) skel->bss->tgid =getpid (); -if (!ASSERT_OK (pthread_create (&thread_id,NULL , &do_nothing,NULL ), -"pthread_create" )) - goto done; +ASSERT_OK (pthread_mutex_lock (&do_nothing_mutex),"pthread_mutex_lock" ); -do_dummy_read (skel->progs.dump_task_file); +ASSERT_OK (pthread_create (&thread_id,NULL , &do_nothing_wait,NULL ), +"pthread_create" ); + +memset (&linfo,0 ,sizeof (linfo)); + linfo.task.tid =getpid (); + opts.link_info = &linfo; + opts.link_info_len =sizeof (linfo); -if (!ASSERT_FALSE (pthread_join (thread_id, &ret) || ret !=NULL , -"pthread_join" )) - goto done; +do_dummy_read_opts (skel->progs.dump_task_file, &opts);ASSERT_EQ (skel->bss->count,0 ,"check_count" ); +ASSERT_EQ (skel->bss->unique_tgid_count,1 ,"check_unique_tgid_count" ); + + skel->bss->last_tgid =0 ; + skel->bss->count =0 ; + skel->bss->unique_tgid_count =0 ; + +do_dummy_read (skel->progs.dump_task_file); + +ASSERT_EQ (skel->bss->count,0 ,"check_count" ); +ASSERT_GT (skel->bss->unique_tgid_count,1 ,"check_unique_tgid_count" ); + +check_bpf_link_info (skel->progs.dump_task_file); + +ASSERT_OK (pthread_mutex_unlock (&do_nothing_mutex),"pthread_mutex_unlock" ); +ASSERT_OK (pthread_join (thread_id, &ret),"pthread_join" ); +ASSERT_NULL (ret,"pthread_join" ); -done:bpf_iter_task_file__destroy (skel); }
@@ -1249,7 +1392,7 @@ static void str_strip_first_line(char *str) *dst ='\0' ; } -static void test_task_vma (void ) +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;
@@ -1261,13 +1404,14 @@ static void test_task_vma(void)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" )) goto out; skel->links.proc_maps =bpf_program__attach_iter ( - skel->progs.proc_maps,NULL ); + skel->progs.proc_maps, opts);if (!ASSERT_OK_PTR (skel->links.proc_maps,"bpf_program__attach_iter" )) { skel->links.proc_maps =NULL ;
@@ -1291,6 +1435,8 @@ static void test_task_vma(void) goto out; len += err; } +if (opts) +ASSERT_EQ (skel->bss->one_task_error,0 ,"unexpected task" );/* read CMP_BUFFER_SIZE (1kB) from /proc/pid/maps */ snprintf (maps_path,64 ,"/proc/%u/maps" , skel->bss->pid);
@@ -1306,6 +1452,9 @@ static void test_task_vma(void)str_strip_first_line (proc_maps_output);ASSERT_STREQ (task_vma_output, proc_maps_output,"compare_output" ); + +check_bpf_link_info (skel->progs.proc_maps); + out:close (proc_maps_fd);close (iter_fd);
@@ -1325,8 +1474,93 @@ void test_bpf_sockmap_map_iter_fd(void)bpf_iter_sockmap__destroy (skel); } +static void test_task_vma (void ) +{ +LIBBPF_OPTS (bpf_iter_attach_opts, opts); +union bpf_iter_link_info linfo; + +memset (&linfo,0 ,sizeof (linfo)); + linfo.task.tid =getpid (); + opts.link_info = &linfo; + opts.link_info_len =sizeof (linfo); + +test_task_vma_common (&opts); +test_task_vma_common (NULL ); +} + +/* uprobe attach point */ +static noinline int trigger_func(int arg) +{ + asmvolatile ("" ); +return arg +1 ; +} + +static void test_task_vma_offset_common (struct bpf_iter_attach_opts *opts,bool one_proc) +{ +struct bpf_iter_vma_offset *skel; +struct bpf_link *link; +char buf[16 ] = {}; +int iter_fd, len; +int pgsz, shift; + + skel =bpf_iter_vma_offset__open_and_load (); +if (!ASSERT_OK_PTR (skel,"bpf_iter_vma_offset__open_and_load" )) +return ; + + skel->bss->pid =getpid (); + skel->bss->address = (uintptr_t )trigger_func; +for (pgsz =getpagesize (), shift =0 ; pgsz >1 ; pgsz >>=1 , shift++) + ; + skel->bss->page_shift = shift; + + link =bpf_program__attach_iter (skel->progs.get_vma_offset, opts); +if (!ASSERT_OK_PTR (link,"attach_iter" )) +return ; + + iter_fd =bpf_iter_create (bpf_link__fd (link)); +if (!ASSERT_GT (iter_fd,0 ,"create_iter" )) + goto exit; + +while ((len =read (iter_fd, buf,sizeof (buf))) >0 ) + ; + buf[15 ] =0 ; +ASSERT_EQ (strcmp (buf,"OK\n" ),0 ,"strcmp" ); + +ASSERT_EQ (skel->bss->offset,get_uprobe_offset (trigger_func),"offset" ); +if (one_proc) +ASSERT_EQ (skel->bss->unique_tgid_cnt,1 ,"unique_tgid_count" ); +else +ASSERT_GT (skel->bss->unique_tgid_cnt,1 ,"unique_tgid_count" ); + +close (iter_fd); + +exit: +bpf_link__destroy (link); +} + +static void test_task_vma_offset (void ) +{ +LIBBPF_OPTS (bpf_iter_attach_opts, opts); +union bpf_iter_link_info linfo; + +memset (&linfo,0 ,sizeof (linfo)); + linfo.task.pid =getpid (); + opts.link_info = &linfo; + opts.link_info_len =sizeof (linfo); + +test_task_vma_offset_common (&opts, true); + + linfo.task.pid =0 ; + linfo.task.tid =getpid (); +test_task_vma_offset_common (&opts, true); + +test_task_vma_offset_common (NULL , false); +} +void test_bpf_iter (void ) { +ASSERT_OK (pthread_mutex_init (&do_nothing_mutex,NULL ),"pthread_mutex_init" ); +if (test__start_subtest ("btf_id_or_null" ))test_btf_id_or_null ();if (test__start_subtest ("ipv6_route" ))
@@ -1335,8 +1569,12 @@ void test_bpf_iter(void)test_netlink ();if (test__start_subtest ("bpf_map" ))test_bpf_map (); -if (test__start_subtest ("task" )) -test_task (); +if (test__start_subtest ("task_tid" )) +test_task_tid (); +if (test__start_subtest ("task_pid" )) +test_task_pid (); +if (test__start_subtest ("task_pidfd" )) +test_task_pidfd ();if (test__start_subtest ("task_sleepable" ))test_task_sleepable ();if (test__start_subtest ("task_stack" ))
@@ -1397,4 +1635,6 @@ void test_bpf_iter(void)test_ksym_iter ();if (test__start_subtest ("bpf_sockmap_map_iter_fd" ))test_bpf_sockmap_map_iter_fd (); +if (test__start_subtest ("vma_offset" )) +test_task_vma_offset (); }
tools/testing/selftests/bpf/prog_tests/btf_dump.c +1 -1
@@ -764,7 +764,7 @@ static void test_btf_dump_struct_data(struct btf *btf, struct btf_dump *d,/* union with nested struct */ TEST_BTF_DUMP_DATA(btf, d, "union", str, union bpf_iter_link_info, BTF_F_COMPACT, -"(union bpf_iter_link_info){.map = (struct){.map_fd = (__u32)1,},.cgroup = (struct){.order = (enum bpf_cgroup_iter_order)BPF_CGROUP_ITER_SELF_ONLY,.cgroup_fd = (__u32)1,},}" , +"(union bpf_iter_link_info){.map = (struct){.map_fd = (__u32)1,},.cgroup = (struct){.order = (enum bpf_cgroup_iter_order)BPF_CGROUP_ITER_SELF_ONLY,.cgroup_fd = (__u32)1,},.task = (struct){.tid = (__u32)1,.pid = (__u32)1,},}" , { .cgroup = { .order = 1, .cgroup_fd = 1, }});/* struct skb with nested structs/unions; because type output is so
tools/testing/selftests/bpf/progs/bpf_iter_task.c +9 -0
@@ -6,6 +6,10 @@ char _license[] SEC("license") = "GPL"; +uint32_t tid =0 ; +int num_unknown_tid =0 ; +int num_known_tid =0 ; + SEC("iter/task")int dump_task (struct bpf_iter__task *ctx) {
@@ -18,6 +22,11 @@ int dump_task(struct bpf_iter__task *ctx)return 0 ; } +if (task->pid != tid) + num_unknown_tid++; +else + num_known_tid++; +if (ctx->meta->seq_num ==0 )BPF_SEQ_PRINTF (seq," tgid gid\n" );
tools/testing/selftests/bpf/progs/bpf_iter_task_file.c +8 -1
@@ -7,14 +7,16 @@ char _license[] SEC("license") = "GPL";int count =0 ;int tgid =0 ; +int last_tgid =0 ; +int unique_tgid_count =0 ; SEC("iter/task_file")int dump_task_file (struct bpf_iter__task_file *ctx) {struct seq_file *seq = ctx->meta->seq;struct task_struct *task = ctx->task; -__u32 fd = ctx->fd;struct file *file = ctx->file; +__u32 fd = ctx->fd;if (task == (void *)0 || file == (void *)0 )return 0 ;
@@ -27,6 +29,11 @@ int dump_task_file(struct bpf_iter__task_file *ctx)if (tgid == task->tgid && task->tgid != task->pid) count++; +if (last_tgid != task->tgid) { + last_tgid = task->tgid; + unique_tgid_count++; + } +BPF_SEQ_PRINTF (seq,"%8d %8d %8d %lx\n" , task->tgid, task->pid, fd, (long )file->f_op);return 0 ;
tools/testing/selftests/bpf/progs/bpf_iter_task_vma.c +6 -1
@@ -20,6 +20,8 @@ char _license[] SEC("license") = "GPL";#define D_PATH_BUF_SIZE 1024char 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) {
@@ -33,8 +35,11 @@ SEC("iter/task_vma") int proc_maps(struct bpf_iter__task_vma *ctx)return 0 ; file = vma->vm_file; -if (task->tgid != pid) +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' :'-' ;
tools/testing/selftests/bpf/progs/bpf_iter_vma_offset.c new file +37 -0
@@ -0,0 +1,37 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2022 Meta Platforms, Inc. and affiliates. */ +#include "bpf_iter.h" +#include <bpf/bpf_helpers.h> + +char _license[] SEC("license") = "GPL"; + +__u32 unique_tgid_cnt =0 ; +uintptr_t address =0 ; +uintptr_t offset =0 ; +__u32 last_tgid =0 ; +__u32 pid =0 ; +__u32 page_shift =0 ; + +SEC("iter/task_vma") +int get_vma_offset (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; + +if (task ==NULL || vma ==NULL ) +return 0 ; + +if (last_tgid != task->tgid) + unique_tgid_cnt++; + last_tgid = task->tgid; + +if (task->tgid != pid) +return 0 ; + +if (vma->vm_start <= address && vma->vm_end > address) { + offset = address - vma->vm_start + (vma->vm_pgoff << page_shift); +BPF_SEQ_PRINTF (seq,"OK\n" ); + } +return 0 ; +}
Signature · 1 line
2.30.2
PATCH v11 5/5 bpftool: Show parameters of BPF task iterators.
In reply to Kui-Feng LeeShow tid or pid of iterators if giving an argument of tid or pid
For example, the command bpftool link list may list following lines.
1: iter prog 2 target_name bpf_map
2: iter prog 3 target_name bpf_prog
33: iter prog 225 target_name task_file tid 1644
pids test_progs(1644)Link 33 is a task_file iterator with tid 1644. For now, only targets of task, task_file and task_vma may be with tid or pid to filter out tasks other than those belonging to a process (pid) or a thread (tid).
--- tools/bpf/bpftool/link.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
tools/bpf/bpftool/link.c +19 -0
@@ -106,6 +106,13 @@ static const char *cgroup_order_string(__u32 order) } } +static bool is_iter_task_target (const char *target_name) +{ +return strcmp (target_name,"task" ) ==0 || +strcmp (target_name,"task_file" ) ==0 || +strcmp (target_name,"task_vma" ) ==0 ; +} +static void show_iter_json (struct bpf_link_info *info,json_writer_t *wtr) {const char *target_name =u64_to_ptr (info->iter.target_name);
@@ -114,6 +121,12 @@ static void show_iter_json(struct bpf_link_info *info, json_writer_t *wtr)if (is_iter_map_target (target_name))jsonw_uint_field (wtr,"map_id" , info->iter.map.map_id); +else if (is_iter_task_target (target_name)) { +if (info->iter.task.tid) +jsonw_uint_field (wtr,"tid" , info->iter.task.tid); +else if (info->iter.task.pid) +jsonw_uint_field (wtr,"pid" , info->iter.task.pid); + }if (is_iter_cgroup_target (target_name)) {jsonw_lluint_field (wtr,"cgroup_id" , info->iter.cgroup.cgroup_id);
@@ -237,6 +250,12 @@ static void show_iter_plain(struct bpf_link_info *info)if (is_iter_map_target (target_name))printf ("map_id %u " , info->iter.map.map_id); +else if (is_iter_task_target (target_name)) { +if (info->iter.task.tid) +printf ("tid %u " , info->iter.task.tid); +else if (info->iter.task.pid) +printf ("pid %u " , info->iter.task.pid); + }if (is_iter_cgroup_target (target_name)) {printf ("cgroup_id %llu " , info->iter.cgroup.cgroup_id);
Signature · 1 line
2.30.2
Quoted 7 lines · Kui-Feng Lee
Allow creating an iterator that loops through resources of one task/thread.
People could only create iterators to loop through all resources of files, vma, and tasks in the system, even though they were interested in only the resources of a specific task or process. Passing the additional parameters, people can now create an iterator to go through all resources or only the resources of a task.
This series was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:
Hello:
This series was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:
Quoted 9 lines · On Mon, 26 Sep 2022 11:49:52 -0700 you wrote:
Allow creating an iterator that loops through resources of one task/thread.
People could only create iterators to loop through all resources of files, vma, and tasks in the system, even though they were interested in only the resources of a specific task or process. Passing the additional parameters, people can now create an iterator to go through all resources or only the resources of a task.
[...]
Here is the summary with links:
- [bpf-next,v11,1/5] bpf: Parameterize task iterators.
https://git.kernel.org/bpf/bpf-next/c/f0d74c4da1f0 - [bpf-next,v11,2/5] bpf: Handle bpf_link_info for the parameterized task BPF iterators. https://git.kernel.org/bpf/bpf-next/c/21fb6f2aa389 - [bpf-next,v11,3/5] bpf: Handle show_fdinfo for the parameterized task BPF iterators https://git.kernel.org/bpf/bpf-next/c/2c4fe44fb020 - [bpf-next,v11,4/5] selftests/bpf: Test parameterized task BPF iterators. https://git.kernel.org/bpf/bpf-next/c/b3e1331eb925 - [bpf-next,v11,5/5] bpftool: Show parameters of BPF task iterators. https://git.kernel.org/bpf/bpf-next/c/6bdb6d6be019
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html