bpf: avoid iterating duplicated files for task_file iterator
Subsystems (6)
PATCH v3 1/2 bpf: avoid iterating duplicated files for task_file iterator
In reply to Yonghong SongCurrently, task_file iterator iterates all files from all tasks. This may potentially visit a lot of duplicated files if there are many tasks sharing the same files, e.g., typical pthreads where these pthreads and the main thread are sharing the same files.
This patch changed task_file iterator to skip a particular task if that task shares the same files as its group_leader (the task having the same tgid and also task->tgid == task->pid). This will preserve the same result, visiting all files from all tasks, and will reduce runtime cost significantl, e.g., if there are a lot of pthreads and the process has a lot of open files.
--- kernel/bpf/task_iter.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
kernel/bpf/task_iter.c +11 -4
@@ -22,7 +22,8 @@ struct bpf_iter_seq_task_info { };static struct task_struct *task_seq_get_next (struct pid_namespace *ns, -u32 *tid) +u32 *tid, +bool skip_if_dup_files) {struct task_struct *task =NULL ;struct pid *pid;
@@ -36,6 +37,12 @@ static struct task_struct *task_seq_get_next(struct pid_namespace *ns,if (!task) { ++*tid; goto retry; + }else if (skip_if_dup_files && task->tgid != task->pid && + task->files == task->group_leader->files) { +put_task_struct (task); + task =NULL ; + ++*tid; + goto retry; } }rcu_read_unlock ();
@@ -48,7 +55,7 @@ static void *task_seq_start(struct seq_file *seq, loff_t *pos)struct bpf_iter_seq_task_info *info = seq->private;struct task_struct *task; - task =task_seq_get_next (info->common.ns, &info->tid); + task =task_seq_get_next (info->common.ns, &info->tid, false);if (!task)return NULL ;
@@ -65,7 +72,7 @@ static void *task_seq_next(struct seq_file *seq, void *v, loff_t *pos) ++*pos; ++info->tid;put_task_struct ((struct task_struct *)v); - task =task_seq_get_next (info->common.ns, &info->tid); + task =task_seq_get_next (info->common.ns, &info->tid, false);if (!task)return NULL ;
@@ -148,7 +155,7 @@ task_file_seq_get_next(struct bpf_iter_seq_task_file_info *info, curr_files = *fstruct; curr_fd = info->fd; }else { - curr_task =task_seq_get_next (ns, &curr_tid); + curr_task =task_seq_get_next (ns, &curr_tid, true);if (!curr_task)return NULL ;
Signature · 1 line
2.24.1
v3 cover bpf: avoid iterating duplicated files for task_file iterator
Commit e679654a704e ("bpf: Fix a rcu_sched stall issue with bpf task/task_file iterator") introduced rate limiting in bpf_seq_read() to fix a case where traversing too many tasks and files (tens of millions of files) may cause kernel rcu stall. But rate limiting won't reduce the amount of work to traverse all these files.
In practice, for a user process, typically all threads belongs to that process share the same file table and there is no need to visit every thread for its files.
This patch added additional logic for task_file iterator to skip tasks if those tasks are not group_leaders and their files are the same as those of group_leaders.
Such reduction of unnecessary work will make iterator runtime much faster if there are a lot of non-main threads and open files for the process.
Patch #1 is the kernel implementation and Patch #2 is the selftest.
Changelogs:
v2 -> v3:
- add put_task_struct(task) for those skipped tasks to avoid leaking tasks. (Josef)
v1 -> v2:
- for task_file, no need for additional user parameter, kernel can just skip those files already visited, and this should not impact user space. (Andrii)
- to add group_leader-only customization for task will be considered later.
- remove Patch #1 and sent it separately as this patch set won't depend on it any more.
Yonghong Song (2):
bpf: avoid iterating duplicated files for task_file iterator selftests/bpf: test task_file iterator without visiting pthreads
kernel/bpf/task_iter.c | 15 +++++++++---- .../selftests/bpf/prog_tests/bpf_iter.c | 21 +++++++++++++++++++ .../selftests/bpf/progs/bpf_iter_task_file.c | 10 ++++++++- 3 files changed, 41 insertions(+), 5 deletions(-)
Signature · 1 line
2.24.1
PATCH v3 2/2 selftests/bpf: test task_file iterator without visiting pthreads
Modified existing bpf_iter_test_file.c program to check whether all accessed files from the main thread or not.
Modified existing bpf_iter_test_file program to check whether all accessed files from the main thread or not.
$ ./test_progs -n 4 ... #4/7 task_file:OK ... #4 bpf_iter:OK Summary: 1/24 PASSED, 0 SKIPPED, 0 FAILED
--- .../selftests/bpf/prog_tests/bpf_iter.c | 21 +++++++++++++++++++ .../selftests/bpf/progs/bpf_iter_task_file.c | 10 ++++++++- 2 files changed, 30 insertions(+), 1 deletion(-)
tools/testing/selftests/bpf/prog_tests/bpf_iter.c +21 -0
@@ -132,17 +132,38 @@ 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 ) {struct bpf_iter_task_file *skel; +pthread_t thread_id; +void *ret; skel =bpf_iter_task_file__open_and_load ();if (CHECK (!skel,"bpf_iter_task_file__open_and_load" ,"skeleton open_and_load failed\n" ))return ; + skel->bss->tgid =getpid (); + +if (CHECK (pthread_create (&thread_id,NULL , &do_nothing,NULL ), +"pthread_create" ,"pthread_create failed\n" )) + goto done; +do_dummy_read (skel->progs.dump_task_file); +if (CHECK (pthread_join (thread_id, &ret) || ret !=NULL , +"pthread_join" ,"pthread_join failed\n" )) + goto done; + +CHECK (skel->bss->count !=0 ,"" , +"invalid non pthread file visit %d\n" , skel->bss->count); + +done:bpf_iter_task_file__destroy (skel); }
tools/testing/selftests/bpf/progs/bpf_iter_task_file.c +9 -1
@@ -6,6 +6,9 @@ char _license[] SEC("license") = "GPL"; +int count =0 ; +int tgid =0 ; + SEC("iter/task_file")int dump_task_file (struct bpf_iter__task_file *ctx) {
@@ -17,8 +20,13 @@ int dump_task_file(struct bpf_iter__task_file *ctx)if (task == (void *)0 || file == (void *)0 )return 0 ; -if (ctx->meta->seq_num ==0 ) +if (ctx->meta->seq_num ==0 ) { + count =0 ;BPF_SEQ_PRINTF (seq," tgid gid fd file\n" ); + } + +if (tgid == task->tgid && task->tgid != task->pid) + count++;BPF_SEQ_PRINTF (seq,"%8d %8d %8d %lx\n" , task->tgid, task->pid, fd, (long )file->f_op);
Signature · 1 line
2.24.1