On 12/11/20 6:48 PM, Song Liu wrote:
Introduce task_vma bpf_iter to print memory information of a process. It
can be used to print customized information similar to /proc/<pid>/maps.

task_vma iterator releases mmap_lock before calling the BPF program.
Therefore, we cannot pass vm_area_struct directly to the BPF program. A
new __vm_area_struct is introduced to keep key information of a vma. On
each iteration, task_vma gathers information in __vm_area_struct and
passes it to the BPF program.

If the vma maps to a file, task_vma also holds a reference to the file
while calling the BPF program.

Signed-off-by: Song Liu <songliubrav...@fb.com>
---
  include/linux/bpf.h      |   2 +-
  include/uapi/linux/bpf.h |   7 ++
  kernel/bpf/task_iter.c   | 193 ++++++++++++++++++++++++++++++++++++++-
  3 files changed, 200 insertions(+), 2 deletions(-)

diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index 07cb5d15e7439..49dd1e29c8118 100644
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -1325,7 +1325,7 @@ enum bpf_iter_feature {
        BPF_ITER_RESCHED        = BIT(0),
  };
-#define BPF_ITER_CTX_ARG_MAX 2
+#define BPF_ITER_CTX_ARG_MAX 3
  struct bpf_iter_reg {
        const char *target;
        bpf_iter_attach_target_t attach_target;
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index 30b477a264827..c2db8a1d0cbd2 100644
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -5151,4 +5151,11 @@ enum {
        BTF_F_ZERO      =       (1ULL << 3),
  };
+struct __vm_area_struct {
+       __u64 start;
+       __u64 end;
+       __u64 flags;
+       __u64 pgoff;
+};
+
  #endif /* _UAPI__LINUX_BPF_H__ */
diff --git a/kernel/bpf/task_iter.c b/kernel/bpf/task_iter.c
index 0458a40edf10a..30e5475d0831e 100644
--- a/kernel/bpf/task_iter.c
+++ b/kernel/bpf/task_iter.c
@@ -304,9 +304,171 @@ static const struct seq_operations task_file_seq_ops = {
        .show   = task_file_seq_show,
  };
+struct bpf_iter_seq_task_vma_info {
+       /* The first field must be struct bpf_iter_seq_task_common.
+        * this is assumed by {init, fini}_seq_pidns() callback functions.
+        */
+       struct bpf_iter_seq_task_common common;
+       struct task_struct *task;
+       struct __vm_area_struct vma;
+       struct file *file;
+       u32 tid;
+};
+
+static struct __vm_area_struct *
+task_vma_seq_get_next(struct bpf_iter_seq_task_vma_info *info)
+{
+       struct pid_namespace *ns = info->common.ns;
+       struct task_struct *curr_task;
+       struct vm_area_struct *vma;
+       u32 curr_tid = info->tid;
+       bool new_task = false;
+
+       /* If this function returns a non-NULL vma, it held a reference to

the function does not return vma, it returns an internal data
structure __vm_area_struct which captures some fields from vma.

+        * the task_struct. If info->file is non-NULL, it also holds a
+        * reference to the file. Otherwise, it does not hold any
+        * reference.
+        */
+again:
+       if (info->task) {
+               curr_task = info->task;
+       } else {
+               curr_task = task_seq_get_next(ns, &curr_tid, true);
+               if (!curr_task) {
+                       info->task = NULL;

adding "info->tid = curr_tid  + 1" so next read, e.g. after read()
syscall return 0 read length, will start after last checked curr_tid.

+                       return NULL;
+               }
+
+               if (curr_tid != info->tid) {
+                       info->tid = curr_tid;
+                       new_task = true;
+               }
+
+               if (!curr_task->mm)
+                       goto next_task;
+               info->task = curr_task;
+       }
+
+       mmap_read_lock(curr_task->mm);
+       if (new_task) {
+               vma = curr_task->mm->mmap;
+       } else {
+               /* We drop the lock between each iteration, so it is
+                * necessary to use find_vma() to find the next vma. This
+                * is similar to the mechanism in show_smaps_rollup().
+                */
+               vma = find_vma(curr_task->mm, info->vma.end - 1);
+               /* same vma as previous iteration, use vma->next */
+               if (vma && (vma->vm_start == info->vma.start))
+                       vma = vma->vm_next;
+       }
+       if (!vma) {
+               mmap_read_unlock(curr_task->mm);
+               goto next_task;
+       }
+       info->task = curr_task;
+       info->vma.start = vma->vm_start;
+       info->vma.end = vma->vm_end;
+       info->vma.pgoff = vma->vm_pgoff;
+       info->vma.flags = vma->vm_flags;
+       if (vma->vm_file)
+               info->file = get_file(vma->vm_file);
+       mmap_read_unlock(curr_task->mm);
+       return &info->vma;
+
+next_task:
+       put_task_struct(curr_task);
+       info->task = NULL;
+       curr_tid = ++(info->tid);
+       goto again;
+}
+
+static void *task_vma_seq_start(struct seq_file *seq, loff_t *pos)
+{
+       struct bpf_iter_seq_task_vma_info *info = seq->private;
+       struct __vm_area_struct *vma;
+
+       info->task = NULL;

Maybe put info->task = NULL in task_vma_seq_stop()?

+       vma = task_vma_seq_get_next(info);
+       if (vma && *pos == 0)
+               ++*pos;
+
+       return vma;
+}
+
+static void *task_vma_seq_next(struct seq_file *seq, void *v, loff_t *pos)
+{
+       struct bpf_iter_seq_task_vma_info *info = seq->private;
+
+       ++*pos;
+       if (info->file) {
+               fput(info->file);
+               info->file = NULL;
+       }
+       return task_vma_seq_get_next(info);
+}
+
+struct bpf_iter__task_vma {
+       __bpf_md_ptr(struct bpf_iter_meta *, meta);
+       __bpf_md_ptr(struct task_struct *, task);
+       __bpf_md_ptr(struct __vm_area_struct *, vma);
+       __bpf_md_ptr(struct file *, file);
+};
+
+DEFINE_BPF_ITER_FUNC(task_vma, struct bpf_iter_meta *meta,
+                    struct task_struct *task, struct __vm_area_struct *vma,
+                    struct file *file)
+
[...]

Reply via email to