bpf/arena: Add kfunc for reserving arena guard memory regions
Subsystems (3)
Emil Tsalapatis
reviewercover bpf/arena: Add kfunc for reserving arena guard memory regions
Add a new kfunc for BPF arenas that reserves a region of the mapping to prevent it from being mapped. These regions serve as guards against out-of-bounds accesses and are useful for debugging arena-related code.
Emil Tsalapatis (2):
bpf/arena: add bpf_arena_guard_pages kfunc selftests/bpf: add selftests for bpf_arena_guard_pages
kernel/bpf/arena.c | 95 +++++++++++++++- .../testing/selftests/bpf/bpf_arena_common.h | 3 + .../selftests/bpf/progs/verifier_arena.c | 106 ++++++++++++++++++ .../bpf/progs/verifier_arena_large.c | 93 +++++++++++++++ 4 files changed, 294 insertions(+), 3 deletions(-)
Signature · 1 line
2.49.0
Emil Tsalapatis
reviewerPATCH 1/2 bpf/arena: add bpf_arena_guard_pages kfunc
Add a new BPF arena kfunc from protecting a range of pages. These pages cannot be allocated, either explicitly through bpf_arena_alloc_pages() or implicitly through userspace page faults.
--- kernel/bpf/arena.c | 95 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 92 insertions(+), 3 deletions(-)
kernel/bpf/arena.c +92 -3
@@ -48,6 +48,7 @@ struct bpf_arena {u64 user_vm_end;struct vm_struct *kern_vm;struct range_tree rt; +struct range_tree rt_guard;struct list_head vma_list;struct mutex lock; };
@@ -143,6 +144,20 @@ static struct bpf_map *arena_map_alloc(union bpf_attr *attr)bpf_map_area_free (arena); goto err; } + +/* +* Use the same semantics as the main range tree to reuse +* its methods: Present ranges are all unguarded, while +* absent ones are guarded. +*/ +range_tree_init (&arena->rt_guard); + err =range_tree_set (&arena->rt_guard,0 , attr->max_entries); +if (err) { +range_tree_destroy (&arena->rt); +bpf_map_area_free (arena); + goto err; + } +mutex_init (&arena->lock);return &arena->map;
@@ -193,6 +208,7 @@ static void arena_map_free(struct bpf_map *map)apply_to_existing_page_range (&init_mm,bpf_arena_get_kern_vm_start (arena),KERN_VM_SZ -GUARD_SZ , existing_page_cb,NULL );free_vm_area (arena->kern_vm); +range_tree_destroy (&arena->rt_guard);range_tree_destroy (&arena->rt);bpf_map_area_free (arena); }
@@ -282,6 +298,11 @@ static vm_fault_t arena_vm_fault(struct vm_fault *vmf)/* User space requested to segfault when page is not allocated by bpf prog */ return VM_FAULT_SIGSEGV ; +/* Make sure the page is not guarded. */ + ret =is_range_tree_set (&arena->rt_guard, vmf->pgoff,1 ); +if (ret) +return VM_FAULT_SIGSEGV ; + ret =range_tree_clear (&arena->rt, vmf->pgoff,1 );if (ret)return VM_FAULT_SIGSEGV ;
@@ -456,12 +477,17 @@ static long arena_alloc_pages(struct bpf_arena *arena, long uaddr, long page_cnt ret =is_range_tree_set (&arena->rt, pgoff, page_cnt);if (ret) goto out_free_pages; - ret =range_tree_clear (&arena->rt, pgoff, page_cnt); }else { ret = pgoff =range_tree_find (&arena->rt, page_cnt); -if (pgoff >=0 ) - ret =range_tree_clear (&arena->rt, pgoff, page_cnt); +if (pgoff <0 ) + goto out_free_pages; } + + ret =is_range_tree_set (&arena->rt_guard, pgoff, page_cnt); +if (ret) + goto out_free_pages; + + ret =range_tree_clear (&arena->rt, pgoff, page_cnt);if (ret) goto out_free_pages;
@@ -512,6 +538,7 @@ static void arena_free_pages(struct bpf_arena *arena, long uaddr, long page_cnt)u64 full_uaddr, uaddr_end;long kaddr, pgoff, i;struct page *page; +int ret;/* only aligned lower 32-bit are relevant */ uaddr = (u32 )uaddr;
@@ -525,7 +552,14 @@ static void arena_free_pages(struct bpf_arena *arena, long uaddr, long page_cnt)guard (mutex)(&arena->lock); + pgoff =compute_pgoff (arena, uaddr); + +/* Do not free regions that include guarded pages. */ + ret =is_range_tree_set (&arena->rt_guard, pgoff, page_cnt); +if (ret) +return ; +/* clear range */ range_tree_set (&arena->rt, pgoff, page_cnt);
@@ -550,6 +584,46 @@ static void arena_free_pages(struct bpf_arena *arena, long uaddr, long page_cnt) } } +static int arena_guard_pages (struct bpf_arena *arena,long uaddr,u32 page_cnt) +{ +long page_cnt_max = (arena->user_vm_end - arena->user_vm_start) >>PAGE_SHIFT ; +long pgoff; +int ret; + +if (uaddr & ~PAGE_MASK ) +return 0 ; + + pgoff =compute_pgoff (arena, uaddr); +if (pgoff + page_cnt > page_cnt_max) +return -EINVAL ; + +guard (mutex)(&arena->lock); + +/* Make sure we have not already guarded the pages. */ + ret =is_range_tree_set (&arena->rt_guard, pgoff, page_cnt); +if (ret) +return -EALREADY ; + +/* Cannot guard already allocated pages. */ + ret =is_range_tree_set (&arena->rt, pgoff, page_cnt); +if (ret) +return -EINVAL ; + +/* Reserve the region. */ + ret =range_tree_clear (&arena->rt_guard, pgoff, page_cnt); +if (ret) +return ret; + +/* Also "allocate" the region to prevent it from being allocated. */ + ret =range_tree_clear (&arena->rt, pgoff, page_cnt); +if (ret) { +range_tree_set (&arena->rt_guard, pgoff, page_cnt); +return ret; + } + +return 0 ; +} +__bpf_kfunc_start_defs (); __bpf_kfunc void *bpf_arena_alloc_pages(void *p__map, void *addr__ign, u32 page_cnt,
@@ -573,11 +647,26 @@ __bpf_kfunc void bpf_arena_free_pages(void *p__map, void *ptr__ign, u32 page_cntreturn ;arena_free_pages (arena, (long )ptr__ign, page_cnt); } + +__bpf_kfunc int bpf_arena_guard_pages(void *p__map, void *ptr__ign, u32 page_cnt) +{ +struct bpf_map *map = p__map; + struct bpf_arena *arena = container_of(map, struct bpf_arena, map); + +if (map->map_type !=BPF_MAP_TYPE_ARENA ) +return -EINVAL ; + +if (!page_cnt) +return 0 ; + +return arena_guard_pages (arena, (long )ptr__ign, page_cnt); +}__bpf_kfunc_end_defs (); BTF_KFUNCS_START(arena_kfuncs) BTF_ID_FLAGS(func, bpf_arena_alloc_pages, KF_TRUSTED_ARGS | KF_SLEEPABLE | KF_ARENA_RET | KF_ARENA_ARG2) BTF_ID_FLAGS(func, bpf_arena_free_pages, KF_TRUSTED_ARGS | KF_SLEEPABLE | KF_ARENA_ARG2) +BTF_ID_FLAGS(func, bpf_arena_guard_pages, KF_TRUSTED_ARGS | KF_SLEEPABLE | KF_ARENA_ARG2) BTF_KFUNCS_END(arena_kfuncs) static const struct btf_kfunc_id_set common_kfunc_set = {
Signature · 1 line
2.49.0
Re: [PATCH bpf-next 1/2] bpf/arena: add bpf_arena_guard_pages kfunc
Quoted 19 lines · Emil Tsalapatis
Add a new BPF arena kfunc from protecting a range of pages. These pages cannot be allocated, either explicitly through
bpf_arena_alloc_pages()or implicitly through userspace page faults.Signed-off-by Emil Tsalapatis <[email protected]>--- kernel/bpf/arena.c | 95 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 92 insertions(+), 3 deletions(-)kernel/bpf/arena.c +1
-0@@ -48,6 +48,7 @@ struct bpf_arena {u64 user_vm_end;struct vm_struct *kern_vm;struct range_tree rt; +struct range_tree rt_guard;
...
kernel/bpf/arena.c static vm_fault_t arena_vm_fault(struct vm_fault *vmf) · line 306
Quoted 11 lines
}
kernel/bpf/arena.c +5
-0@@ -282,6 +298,11 @@ static vm_fault_t arena_vm_fault(struct vm_fault *vmf)/* User space requested to segfault when page is not allocated by bpf prog */ return VM_FAULT_SIGSEGV ; +/* Make sure the page is not guarded. */ + ret =is_range_tree_set (&arena->rt_guard, vmf->pgoff,1 ); +if (ret) +return VM_FAULT_SIGSEGV ; + ret =range_tree_clear (&arena->rt, vmf->pgoff,1 );
Why complicate things with another tree ?
The logic has to range_tree_clear(&arena->rt, ... anyway and here check:
is_range_tree_set(&arena->rt, ...
bpf_arena_guard_pages() won't have EALREADY errors, so be it. Keeping another range_tree and spending kernel memory just to produce an error to buggy bpf prog is imo wrong trade off.
Kumar Kartikeya Dwivedi
maintainerRe: [PATCH bpf-next 1/2] bpf/arena: add bpf_arena_guard_pages kfunc
Quoted 41 lines · Alexei Starovoitov
Quoted 19 lines · Emil Tsalapatis
Add a new BPF arena kfunc from protecting a range of pages. These pages cannot be allocated, either explicitly through
bpf_arena_alloc_pages()or implicitly through userspace page faults.Signed-off-by Emil Tsalapatis <[email protected]>--- kernel/bpf/arena.c | 95 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 92 insertions(+), 3 deletions(-)kernel/bpf/arena.c +1
-0@@ -48,6 +48,7 @@ struct bpf_arena {u64 user_vm_end;struct vm_struct *kern_vm;struct range_tree rt; +struct range_tree rt_guard;...
kernel/bpf/arena.c static vm_fault_t arena_vm_fault(struct vm_fault *vmf) · line 306
Quoted 11 lines
}
kernel/bpf/arena.c +5
-0@@ -282,6 +298,11 @@ static vm_fault_t arena_vm_fault(struct vm_fault *vmf)/* User space requested to segfault when page is not allocated by bpf prog */ return VM_FAULT_SIGSEGV ; +/* Make sure the page is not guarded. */ + ret =is_range_tree_set (&arena->rt_guard, vmf->pgoff,1 ); +if (ret) +return VM_FAULT_SIGSEGV ; + ret =range_tree_clear (&arena->rt, vmf->pgoff,1 );Why complicate things with another tree ?
The logic has to range_tree_clear(&arena->rt, ... anyway and here check:
is_range_tree_set(&arena->rt, ...
Quoted 3 lines
bpf_arena_guard_pages()won't have EALREADY errors, so be it. Keeping anotherrange_treeand spending kernel memory just to produce an error to buggy bpf prog is imo wrong trade off.
IIUC the main requirement is reserving a region that cannot be faulted in user space, and cannot be allocated from the BPF side.
I would instead add a flag that when set overrides the SIGSEGV/page-in behavior (which can be set globally by a flag on the map). That sounds more generic and potentially useful to pick the behavior on a per-allocation basis instead of making it global.
So for specific allocations, we get SEGSEGV instead of paging in memory, while for the rest it's the default based on map's flags. And to prevent anybody else from allocating this range, reserve it ahead of time in the scheduler's init() callback.
For normal programs it can be an extra prog run before the program is attached and starts firing.
We won't need a new kfunc either.
Re: [PATCH bpf-next 1/2] bpf/arena: add bpf_arena_guard_pages kfunc
Quoted 48 lines · Kumar Kartikeya Dwivedi
Quoted 41 lines · Alexei Starovoitov
Quoted 19 lines · Emil Tsalapatis
Add a new BPF arena kfunc from protecting a range of pages. These pages cannot be allocated, either explicitly through
bpf_arena_alloc_pages()or implicitly through userspace page faults.Signed-off-by Emil Tsalapatis <[email protected]>--- kernel/bpf/arena.c | 95 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 92 insertions(+), 3 deletions(-)kernel/bpf/arena.c +1
-0@@ -48,6 +48,7 @@ struct bpf_arena {u64 user_vm_end;struct vm_struct *kern_vm;struct range_tree rt; +struct range_tree rt_guard;...
kernel/bpf/arena.c static vm_fault_t arena_vm_fault(struct vm_fault *vmf) · line 306
Quoted 11 lines
}
kernel/bpf/arena.c +5
-0@@ -282,6 +298,11 @@ static vm_fault_t arena_vm_fault(struct vm_fault *vmf)/* User space requested to segfault when page is not allocated by bpf prog */ return VM_FAULT_SIGSEGV ; +/* Make sure the page is not guarded. */ + ret =is_range_tree_set (&arena->rt_guard, vmf->pgoff,1 ); +if (ret) +return VM_FAULT_SIGSEGV ; + ret =range_tree_clear (&arena->rt, vmf->pgoff,1 );Why complicate things with another tree ?
The logic has to range_tree_clear(&arena->rt, ... anyway and here check:
is_range_tree_set(&arena->rt, ...Quoted 3 lines
bpf_arena_guard_pages()won't have EALREADY errors, so be it. Keeping anotherrange_treeand spending kernel memory just to produce an error to buggy bpf prog is imo wrong trade off.
Quoted 13 lines
IIUC the main requirement is reserving a region that cannot be faulted in user space, and cannot be allocated from the BPF side.
I would instead add a flag that when set overrides the SIGSEGV/page-in behavior (which can be set globally by a flag on the map). That sounds more generic and potentially useful to pick the behavior on a per-allocation basis instead of making it global.
So for specific allocations, we get SEGSEGV instead of paging in memory, while for the rest it's the default based on map's flags. And to prevent anybody else from allocating this range, reserve it ahead of time in the scheduler'sinit()callback.
For normal programs it can be an extra prog run before the program is attached and starts firing.
We won't need a new kfunc either.
I'm not following the idea.
There is already a flag:
if (arena->map.map_flags & BPF_F_SEGV_ON_FAULT)
/* User space requested to segfault when page is not
allocated by bpf prog */
return VM_FAULT_SIGSEGV;Kumar Kartikeya Dwivedi
maintainerRe: [PATCH bpf-next 1/2] bpf/arena: add bpf_arena_guard_pages kfunc
Quoted 65 lines · Alexei Starovoitov
Quoted 48 lines · Kumar Kartikeya Dwivedi
Quoted 41 lines · Alexei Starovoitov
Quoted 19 lines · Emil Tsalapatis
Add a new BPF arena kfunc from protecting a range of pages. These pages cannot be allocated, either explicitly through
bpf_arena_alloc_pages()or implicitly through userspace page faults.Signed-off-by Emil Tsalapatis <[email protected]>--- kernel/bpf/arena.c | 95 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 92 insertions(+), 3 deletions(-)kernel/bpf/arena.c +1
-0@@ -48,6 +48,7 @@ struct bpf_arena {u64 user_vm_end;struct vm_struct *kern_vm;struct range_tree rt; +struct range_tree rt_guard;...
kernel/bpf/arena.c static vm_fault_t arena_vm_fault(struct vm_fault *vmf) · line 306
Quoted 11 lines
}
kernel/bpf/arena.c +5
-0@@ -282,6 +298,11 @@ static vm_fault_t arena_vm_fault(struct vm_fault *vmf)/* User space requested to segfault when page is not allocated by bpf prog */ return VM_FAULT_SIGSEGV ; +/* Make sure the page is not guarded. */ + ret =is_range_tree_set (&arena->rt_guard, vmf->pgoff,1 ); +if (ret) +return VM_FAULT_SIGSEGV ; + ret =range_tree_clear (&arena->rt, vmf->pgoff,1 );Why complicate things with another tree ?
The logic has to range_tree_clear(&arena->rt, ... anyway and here check:
is_range_tree_set(&arena->rt, ...Quoted 3 lines
bpf_arena_guard_pages()won't have EALREADY errors, so be it. Keeping anotherrange_treeand spending kernel memory just to produce an error to buggy bpf prog is imo wrong trade off.Quoted 13 lines
IIUC the main requirement is reserving a region that cannot be faulted in user space, and cannot be allocated from the BPF side.
I would instead add a flag that when set overrides the SIGSEGV/page-in behavior (which can be set globally by a flag on the map). That sounds more generic and potentially useful to pick the behavior on a per-allocation basis instead of making it global.
So for specific allocations, we get SEGSEGV instead of paging in memory, while for the rest it's the default based on map's flags. And to prevent anybody else from allocating this range, reserve it ahead of time in the scheduler'sinit()callback.
For normal programs it can be an extra prog run before the program is attached and starts firing.
We won't need a new kfunc either.
Quoted 6 lines
I'm not following the idea.
There is already a flag:if (arena->map.map_flags & BPF_F_SEGV_ON_FAULT) /* User space requested to segfault when page is not allocated by bpf prog */ return VM_FAULT_SIGSEGV;
Yeah, but it's global. We may want fault-in for normal memory on access, but we may want some range in the address space to have SEGV_ON_FAULT behavior.
It allows some allocations to pick their fault-in/segv behavior independent of the arena user's choice, which I think is important for library like code / malloc etc.
The thing described above still wastes some memory because we map pages. I feel the proper way to do this is how one would do something like this in user space.
Have pages mapped in a range and remove PROT_READ | PROT_WRITE from them, making them inaccessible.
Ideally it'd be zero pages but if we cannot do that, wasting some memory for guard regions may not be too bad, for now.
We need mprotect() like capabilities to change r/w permissions to create such guard pages, e.g. for a malloc with some debug features / efence-like protection.
Re: [PATCH bpf-next 1/2] bpf/arena: add bpf_arena_guard_pages kfunc
Quoted 75 lines · Kumar Kartikeya Dwivedi
Quoted 65 lines · Alexei Starovoitov
Quoted 48 lines · Kumar Kartikeya Dwivedi
Quoted 41 lines · Alexei Starovoitov
Quoted 19 lines · Emil Tsalapatis
Add a new BPF arena kfunc from protecting a range of pages. These pages cannot be allocated, either explicitly through
bpf_arena_alloc_pages()or implicitly through userspace page faults.Signed-off-by Emil Tsalapatis <[email protected]>--- kernel/bpf/arena.c | 95 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 92 insertions(+), 3 deletions(-)kernel/bpf/arena.c +1
-0@@ -48,6 +48,7 @@ struct bpf_arena {u64 user_vm_end;struct vm_struct *kern_vm;struct range_tree rt; +struct range_tree rt_guard;...
kernel/bpf/arena.c static vm_fault_t arena_vm_fault(struct vm_fault *vmf) · line 306
Quoted 11 lines
}
kernel/bpf/arena.c +5
-0@@ -282,6 +298,11 @@ static vm_fault_t arena_vm_fault(struct vm_fault *vmf)/* User space requested to segfault when page is not allocated by bpf prog */ return VM_FAULT_SIGSEGV ; +/* Make sure the page is not guarded. */ + ret =is_range_tree_set (&arena->rt_guard, vmf->pgoff,1 ); +if (ret) +return VM_FAULT_SIGSEGV ; + ret =range_tree_clear (&arena->rt, vmf->pgoff,1 );Why complicate things with another tree ?
The logic has to range_tree_clear(&arena->rt, ... anyway and here check:
is_range_tree_set(&arena->rt, ...Quoted 3 lines
bpf_arena_guard_pages()won't have EALREADY errors, so be it. Keeping anotherrange_treeand spending kernel memory just to produce an error to buggy bpf prog is imo wrong trade off.Quoted 13 lines
IIUC the main requirement is reserving a region that cannot be faulted in user space, and cannot be allocated from the BPF side.
I would instead add a flag that when set overrides the SIGSEGV/page-in behavior (which can be set globally by a flag on the map). That sounds more generic and potentially useful to pick the behavior on a per-allocation basis instead of making it global.
So for specific allocations, we get SEGSEGV instead of paging in memory, while for the rest it's the default based on map's flags. And to prevent anybody else from allocating this range, reserve it ahead of time in the scheduler'sinit()callback.
For normal programs it can be an extra prog run before the program is attached and starts firing.
We won't need a new kfunc either.Quoted 6 lines
I'm not following the idea.
There is already a flag:if (arena->map.map_flags & BPF_F_SEGV_ON_FAULT) /* User space requested to segfault when page is not allocated by bpf prog */ return VM_FAULT_SIGSEGV;
Quoted 6 lines
Yeah, but it's global. We may want fault-in for normal memory on access, but we may want some range in the address space to have
SEGV_ON_FAULTbehavior.
It allows some allocations to pick their fault-in/segv behavior independent of the arena user's choice, which I think is important for library like code / malloc etc.
You mean to augment range_tree with extra flags per range ? I don't like it. So far no one has used BPF_F_SEGV_ON_FAULT. Making it more granular won't make it more useful.
Quoted 10 lines
The thing described above still wastes some memory because we map pages. I feel the proper way to do this is how one would do something like this in user space.
Have pages mapped in a range and removePROT_READ|PROT_WRITEfrom them, making them inaccessible.
Ideally it'd be zero pages but if we cannot do that, wasting some memory for guard regions may not be too bad, for now.
We needmprotect()like capabilities to change r/w permissions to create such guard pages, e.g. for a malloc with some debug features / efence-like protection.
I don't see the point of all that.bpf_arena_guard_pages() that only reserve the range without allocating the pages makes sense to me.
I think bpf_arena_reserve_range() would be a better name for such api. Since actual pages are not allocated.
"guard pages" typically means actual pages are allocated and populated with some pattern. Here it's not the case.
Emil Tsalapatis
reviewerRe: [PATCH bpf-next 1/2] bpf/arena: add bpf_arena_guard_pages kfunc
Quoted 100 lines · Alexei Starovoitov
Quoted 75 lines · Kumar Kartikeya Dwivedi
Quoted 65 lines · Alexei Starovoitov
Quoted 48 lines · Kumar Kartikeya Dwivedi
Quoted 41 lines · Alexei Starovoitov
Quoted 19 lines · Emil Tsalapatis
Add a new BPF arena kfunc from protecting a range of pages. These pages cannot be allocated, either explicitly through
bpf_arena_alloc_pages()or implicitly through userspace page faults.Signed-off-by Emil Tsalapatis <[email protected]>--- kernel/bpf/arena.c | 95 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 92 insertions(+), 3 deletions(-)kernel/bpf/arena.c +1
-0@@ -48,6 +48,7 @@ struct bpf_arena {u64 user_vm_end;struct vm_struct *kern_vm;struct range_tree rt; +struct range_tree rt_guard;...
kernel/bpf/arena.c static vm_fault_t arena_vm_fault(struct vm_fault *vmf) · line 306
Quoted 11 lines
}
kernel/bpf/arena.c +5
-0@@ -282,6 +298,11 @@ static vm_fault_t arena_vm_fault(struct vm_fault *vmf)/* User space requested to segfault when page is not allocated by bpf prog */ return VM_FAULT_SIGSEGV ; +/* Make sure the page is not guarded. */ + ret =is_range_tree_set (&arena->rt_guard, vmf->pgoff,1 ); +if (ret) +return VM_FAULT_SIGSEGV ; + ret =range_tree_clear (&arena->rt, vmf->pgoff,1 );Why complicate things with another tree ?
The logic has to range_tree_clear(&arena->rt, ... anyway and here check:
is_range_tree_set(&arena->rt, ...Quoted 3 lines
bpf_arena_guard_pages()won't have EALREADY errors, so be it. Keeping anotherrange_treeand spending kernel memory just to produce an error to buggy bpf prog is imo wrong trade off.Quoted 13 lines
IIUC the main requirement is reserving a region that cannot be faulted in user space, and cannot be allocated from the BPF side.
I would instead add a flag that when set overrides the SIGSEGV/page-in behavior (which can be set globally by a flag on the map). That sounds more generic and potentially useful to pick the behavior on a per-allocation basis instead of making it global.
So for specific allocations, we get SEGSEGV instead of paging in memory, while for the rest it's the default based on map's flags. And to prevent anybody else from allocating this range, reserve it ahead of time in the scheduler'sinit()callback.
For normal programs it can be an extra prog run before the program is attached and starts firing.
We won't need a new kfunc either.Quoted 6 lines
I'm not following the idea.
There is already a flag:if (arena->map.map_flags & BPF_F_SEGV_ON_FAULT) /* User space requested to segfault when page is not allocated by bpf prog */ return VM_FAULT_SIGSEGV;Quoted 6 lines
Yeah, but it's global. We may want fault-in for normal memory on access, but we may want some range in the address space to have
SEGV_ON_FAULTbehavior.
It allows some allocations to pick their fault-in/segv behavior independent of the arena user's choice, which I think is important for library like code / malloc etc.You mean to augment
range_treewith extra flags per range ? I don't like it. So far no one has usedBPF_F_SEGV_ON_FAULT. Making it more granular won't make it more useful.Quoted 10 lines
The thing described above still wastes some memory because we map pages. I feel the proper way to do this is how one would do something like this in user space.
Have pages mapped in a range and removePROT_READ|PROT_WRITEfrom them, making them inaccessible.
Ideally it'd be zero pages but if we cannot do that, wasting some memory for guard regions may not be too bad, for now.
We needmprotect()like capabilities to change r/w permissions to create such guard pages, e.g. for a malloc with some debug features / efence-like protection.
Quoted 7 lines
I don't see the point of all that.
bpf_arena_guard_pages()that only reserve the range without allocating the pages makes sense to me.
I thinkbpf_arena_reserve_range()would be a better name for such api. Since actual pages are not allocated.
"guard pages" typically means actual pages are allocated and populated with some pattern. Here it's not the case.
I'd agree with bpf_arena_reserve_range() as the name.
Wrt having more granular permissions, it can be useful for some consumers of the arena API, e.g., for sched-ext arena data that gets set up at initialization but is never modified afterward. But we can consider the two features separately imo even if they touch the same code.
Emil Tsalapatis
reviewerRe: [PATCH bpf-next 1/2] bpf/arena: add bpf_arena_guard_pages kfunc
In reply to Alexei StarovoitovQuoted 29 lines · Alexei Starovoitov
Quoted 19 lines · Emil Tsalapatis
Add a new BPF arena kfunc from protecting a range of pages. These pages cannot be allocated, either explicitly through
bpf_arena_alloc_pages()or implicitly through userspace page faults.Signed-off-by Emil Tsalapatis <[email protected]>--- kernel/bpf/arena.c | 95 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 92 insertions(+), 3 deletions(-)kernel/bpf/arena.c +1
-0@@ -48,6 +48,7 @@ struct bpf_arena {u64 user_vm_end;struct vm_struct *kern_vm;struct range_tree rt; +struct range_tree rt_guard;...
Quoted 5 lines
}
kernel/bpf/arena.c +0
-0@@ -282,6 +298,11 @@ static vm_fault_t arena_vm_fault(struct vm_fault *vmf)/* User space requested to segfault when page is not allocated by bpf prog */ return VM_FAULT_SIGSEGV ;
Quoted 12 lines
kernel/bpf/arena.c static vm_fault_t arena_vm_fault(struct vm_fault *vmf) · line 306
Quoted 6 lines
kernel/bpf/arena.c +5
-0+/* Make sure the page is not guarded. */ + ret =is_range_tree_set (&arena->rt_guard, vmf->pgoff,1 ); +if (ret) +return VM_FAULT_SIGSEGV ; + ret =range_tree_clear (&arena->rt, vmf->pgoff,1 );Why complicate things with another tree ?
The logic has to range_tree_clear(&arena->rt, ... anyway and here check:
is_range_tree_set(&arena->rt, ...
The idea was to distinguish between allocated and reserved regions to avoid a stray bpf_arena_free_pages() from freeing a guarded region or using bpf_arena_guard_pages twice on the same set of addresses. We can remove the extra tree If we don't care about particularly egregious misuses of the bpf_arena_* API.
Quoted 3 lines
bpf_arena_guard_pages()won't have EALREADY errors, so be it. Keeping anotherrange_treeand spending kernel memory just to produce an error to buggy bpf prog is imo wrong trade off.
Same as above, we can remove the checks and extra tree if that's the case.
Emil Tsalapatis
reviewerPATCH 2/2 selftests/bpf: add selftests for bpf_arena_guard_pages
In reply to Emil TsalapatisAdd selftests for the new bpf_arena_guard_pages kfunc.
--- .../testing/selftests/bpf/bpf_arena_common.h | 3 + .../selftests/bpf/progs/verifier_arena.c | 106 ++++++++++++++++++ .../bpf/progs/verifier_arena_large.c | 93 +++++++++++++++ 3 files changed, 202 insertions(+)
tools/testing/selftests/bpf/bpf_arena_common.h +3 -0
@@ -46,8 +46,11 @@ void __arena* bpf_arena_alloc_pages(void *map, void __arena *addr, __u32 page_cnt,int node_id,__u64 flags) __ksym__weak ; +int bpf_arena_guard_pages(void *map, void __arena *addr, __u32 page_cnt) __ksym __weak; void bpf_arena_free_pages(void *map, void __arena *ptr, __u32 page_cnt) __ksym __weak; +#define arena_base (map) ((void __arena *)((struct bpf_arena *)(map))->user_vm_start) +#else /* when compiled as user space code */ #define __arena
tools/testing/selftests/bpf/progs/verifier_arena.c +106 -0
112 lines not on this page · raw message
tools/testing/selftests/bpf/progs/verifier_arena_large.c +93 -0
99 lines not on this page · raw message
Signature · 1 line
2.49.0