Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 40 additions & 12 deletions kernel/bpf/task_iter.c
Original file line number Diff line number Diff line change
Expand Up @@ -750,12 +750,22 @@ static struct bpf_iter_reg task_vma_reg_info = {
.show_fdinfo = bpf_iter_task_show_fdinfo,
};

static inline void bpf_iter_mmput_async(struct mm_struct *mm)
{
#ifdef CONFIG_MMU
mmput_async(mm);
#else
mmput(mm);
#endif
}

BPF_CALL_5(bpf_find_vma, struct task_struct *, task, u64, start,
bpf_callback_t, callback_fn, void *, callback_ctx, u64, flags)
{
struct mmap_unlock_irq_work *work = NULL;
struct vm_area_struct *vma;
bool irq_work_busy = false;
bool mmput_needed = false;
struct mm_struct *mm;
int ret = -ENOENT;

Expand All @@ -765,14 +775,38 @@ BPF_CALL_5(bpf_find_vma, struct task_struct *, task, u64, start,
if (!task)
return -ENOENT;

mm = task->mm;
if (task == current) {
mm = task->mm;
} else {
/*
* Foreign task: pin task->mm against a concurrent exit_mm().
* Use trylock on alloc_lock instead of get_task_mm()'s
* blocking task_lock() to avoid deadlocking the target task.
*/
if (!IS_ENABLED(CONFIG_MMU))
return -EOPNOTSUPP;
if (irqs_disabled())
return -EBUSY;
if (!spin_trylock(&task->alloc_lock))
return -EBUSY;
mm = task->mm;
if (mm && !(task->flags & PF_KTHREAD)) {
mmget(mm);
mmput_needed = true;
} else {
mm = NULL;
}
spin_unlock(&task->alloc_lock);
}
if (!mm)
return -ENOENT;

irq_work_busy = bpf_mmap_unlock_get_irq_work(&work);

if (irq_work_busy || !mmap_read_trylock(mm))
return -EBUSY;
if (irq_work_busy || !mmap_read_trylock(mm)) {
ret = -EBUSY;
goto out;
}

vma = find_vma(mm, start);

Expand All @@ -782,6 +816,9 @@ BPF_CALL_5(bpf_find_vma, struct task_struct *, task, u64, start,
ret = 0;
}
bpf_mmap_unlock_mm(work, mm);
out:
if (mmput_needed)
bpf_iter_mmput_async(mm);
return ret;
}

Expand All @@ -796,15 +833,6 @@ const struct bpf_func_proto bpf_find_vma_proto = {
.arg5_type = ARG_ANYTHING,
};

static inline void bpf_iter_mmput_async(struct mm_struct *mm)
{
#ifdef CONFIG_MMU
mmput_async(mm);
#else
mmput(mm);
#endif
}

struct bpf_iter_task_vma_kern_data {
struct task_struct *task;
struct mm_struct *mm;
Expand Down
Loading