bpf/arena: Add kfunc for reserving arena memory
Subsystems (3)
Emil Tsalapatis
reviewerv2 cover bpf/arena: Add kfunc for reserving arena memory
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.
CHANGELOG
=========
From v1 ([email protected])
------------------------------------------------------
Addressed feedback by Alexei & Kartikeya:
- Changed terminology from guard pages to reserved pages.
- Removed the additional guard range tree. Adjusted tests accordingly. Reserved regions now behave like allocated regions, and can be unreserved using bpf_arena_free_pages(). They can also be allocated from userspace through minor faults. It is up to the user to prevent erroneous frees and/or use the BPF_F_SEGV_ON_FAULT flag to catch stray userspace accesses.
Emil Tsalapatis (2):
bpf/arena: add bpf_arena_reserve_pages kfunc selftests/bpf: add selftests for bpf_arena_reserve_pages
kernel/bpf/arena.c | 43 +++++++ .../testing/selftests/bpf/bpf_arena_common.h | 3 + .../selftests/bpf/progs/verifier_arena.c | 106 ++++++++++++++++++ .../bpf/progs/verifier_arena_large.c | 95 ++++++++++++++++ 4 files changed, 247 insertions(+)
Signature · 1 line
2.49.0
Emil Tsalapatis
reviewerPATCH v2 1/2 bpf/arena: add bpf_arena_reserve_pages kfunc
Add a new BPF arena kfunc for reserving a range of arena virtual addresses without backing them with pages. This prevents the range from being populated using bpf_arena_alloc_pages().
--- kernel/bpf/arena.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+)
kernel/bpf/arena.c +43 -0
@@ -550,6 +550,34 @@ static void arena_free_pages(struct bpf_arena *arena, long uaddr, long page_cnt) } } +/* +* Reserve an arena virtual address range without populating it. This call stops +* bpf_arena_alloc_pages from adding pages to this range. +*/ +static int arena_reserve_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); + +/* Cannot guard already allocated pages. */ + ret =is_range_tree_set (&arena->rt, pgoff, page_cnt); +if (ret) +return -EALREADY ; + +/* "Allocate" the region to prevent it from being allocated. */ +return range_tree_clear (&arena->rt, pgoff, page_cnt); +} +__bpf_kfunc_start_defs (); __bpf_kfunc void *bpf_arena_alloc_pages(void *p__map, void *addr__ign, u32 page_cnt,
@@ -573,11 +601,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_reserve_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_reserve_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_reserve_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 v2 1/2] bpf/arena: add bpf_arena_reserve_pages kfunc
Quoted 31 lines · Emil Tsalapatis
Add a new BPF arena kfunc for reserving a range of arena virtual addresses without backing them with pages. This prevents the range from being populated using
bpf_arena_alloc_pages().Signed-off-by Emil Tsalapatis <[email protected]>--- kernel/bpf/arena.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+)kernel/bpf/arena.c +13
-0@@ -550,6 +550,34 @@ static void arena_free_pages(struct bpf_arena *arena, long uaddr, long page_cnt) } } +/* +* Reserve an arena virtual address range without populating it. This call stops +* bpf_arena_alloc_pages from adding pages to this range. +*/ +static int arena_reserve_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 ; +
kernel/bpf/arena.c static void arena_free_pages(struct bpf_arena *arena, long uaddr, long page_cnt) · line 575
Quoted 10 lines
kernel/bpf/arena.c +10
-0+ pgoff =compute_pgoff (arena, uaddr); +if (pgoff + page_cnt > page_cnt_max) +return -EINVAL ; + +guard (mutex)(&arena->lock); + +/* Cannot guard already allocated pages. */ + ret =is_range_tree_set (&arena->rt, pgoff, page_cnt); +if (ret) +return -EALREADY ;
Overall looks good, but this error code gives me a pause. We never used it in a bpf subsystem.
We typically return EBUSY in such cases.
Unless there is a strong reason to use this new error code my preference is to stick to old code.
--
pw-bot: cr
Emil Tsalapatis
reviewerPATCH v2 2/2 selftests/bpf: add selftests for bpf_arena_reserve_pages
In reply to Emil TsalapatisAdd selftests for the new bpf_arena_reserve_pages kfunc.
--- .../testing/selftests/bpf/bpf_arena_common.h | 3 + .../selftests/bpf/progs/verifier_arena.c | 106 ++++++++++++++++++ .../bpf/progs/verifier_arena_large.c | 95 ++++++++++++++++ 3 files changed, 204 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_reserve_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 +95 -0
101 lines not on this page · raw message
Signature · 1 line
2.49.0