bpf: report arena faults to BPF streams
Puranjay Mohan
maintainerv5 cover bpf: report arena faults to BPF streams
Changes in v4->v5:
v4: https://lore.kernel.org/all/[email protected]/
- Added patch 2 to introducing main_prog_aux for easier access to streams.
- Fixed bug in fault handlers when arena_reg == dst_reg
- Updated selftest to check test above edge case.
- Added comments about the usage of barrier_var() in code and commit message.
Changes in v3->v4:
v3: https://lore.kernel.org/all/[email protected]/
- Fixed a build issue when CONFIG_BPF_JIT=y and # CONFIG_BPF_SYSCALL is not set
Changes in v2->v3:
v2: https://lore.kernel.org/all/[email protected]/
- Improved the selftest to check the exact fault address
- Dropped BPF_NO_KFUNC_PROTOTYPES and bpf_arena_alloc/free_pages() usage
- Rebased on bpf-next/master
Changes in v1->v2:
v1: https://lore.kernel.org/all/[email protected]/
- Changed variable and mask names for consistency (Yonghong)
- Added Acked-by: Yonghong Song <[email protected]> on two patches
This set adds the support of reporting page faults inside arena to BPF stderr stream. The reported address is the one that a user would expect to see if they pass it to bpf_printk();
Here is an example output from a stream and bpf_printk()
ERROR: Arena WRITE access at unmapped address 0xdeaddead0000
CPU: 9 UID: 0 PID: 502 Comm: test_progs Call trace: bpf_stream_stage_dump_stack+0xc0/0x150 bpf_prog_report_arena_violation+0x98/0xf0 ex_handler_bpf+0x5c/0x78 fixup_exception+0xf8/0x160 __do_kernel_fault+0x40/0x188 do_bad_area+0x70/0x88 do_translation_fault+0x54/0x98 do_mem_abort+0x4c/0xa8 el1_abort+0x44/0x70 el1h_64_sync_handler+0x50/0x108 el1h_64_sync+0x6c/0x70 bpf_prog_a64a9778d31b8e88_stream_arena_write_fault+0x84/0xc8 *(page) = 1; @ stream.c:100 bpf_prog_test_run_syscall+0x100/0x328 __sys_bpf+0x508/0xb98 __arm64_sys_bpf+0x2c/0x48 invoke_syscall+0x50/0x120 el0_svc_common.constprop.0+0x48/0xf8 do_el0_svc+0x28/0x40 el0_svc+0x48/0xf8 el0t_64_sync_handler+0xa0/0xe8 el0t_64_sync+0x198/0x1a0
Same address is seen by using bpf_printk():
1389.078831: bpf_trace_printk: Read Address: 0xdeaddead0000
To make this possible, some extra metadata has to be passed to the bpf exception handler, so the bpf exception handling mechanism for both x86-64 and arm64 have been improved in this set.
The streams selftest has been updated to also test this new feature.
Puranjay Mohan (4):
bpf: arm64: simplify exception table handling
bpf: core: introduce main_prog_aux for stream access
bpf: Report arena faults to BPF stderr selftests/bpf: Add tests for arena fault reporting
arch/arm64/net/bpf_jit_comp.c | 77 ++++++++++++------ arch/x86/net/bpf_jit_comp.c | 79 ++++++++++++++++++- include/linux/bpf.h | 7 ++ kernel/bpf/arena.c | 27 +++++++ kernel/bpf/core.c | 3 +- kernel/bpf/stream.c | 6 +- kernel/bpf/verifier.c | 1 + .../testing/selftests/bpf/prog_tests/stream.c | 34 +++++++- tools/testing/selftests/bpf/progs/stream.c | 61 ++++++++++++++ 9 files changed, 263 insertions(+), 32 deletions(-)
Signature · 1 line
2.47.3
Puranjay Mohan
maintainerPATCH v5 1/4 bpf: arm64: simplify exception table handling
BPF loads with BPF_PROBE_MEM(SX) can load from unsafe pointers and the JIT adds an exception table entry for the JITed instruction which allows the exeption handler to set the destination register of the load to zero and continue execution from the next instruction.
As all arm64 instructions are AARCH64_INSN_SIZE size, the exception handler can just increment the pc by AARCH64_INSN_SIZE without needing the exact address of the instruction following the the faulting instruction.
Simplify the exception table usage in arm64 JIT by only saving the destination register in ex->fixup and drop everything related to the fixup_offset. The fault handler is modified to add AARCH64_INSN_SIZE to the pc.
--- arch/arm64/net/bpf_jit_comp.c | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-)
arch/arm64/net/bpf_jit_comp.c +3 -22
@@ -1066,19 +1066,18 @@ static void build_epilogue(struct jit_ctx *ctx, bool was_classic)emit (A64_RET (A64_LR ), ctx); } -#define BPF_FIXUP_OFFSET_MASK GENMASK(26, 0)#define BPF_FIXUP_REG_MASK GENMASK(31, 27)#define DONT_CLEAR 5/* Unused ARM64 register from BPF's POV */ bool ex_handler_bpf (const struct exception_table_entry *ex,struct pt_regs *regs) { -off_t offset =FIELD_GET (BPF_FIXUP_OFFSET_MASK , ex->fixup);int dst_reg =FIELD_GET (BPF_FIXUP_REG_MASK , ex->fixup);if (dst_reg !=DONT_CLEAR ) regs->regs[dst_reg] =0 ; - regs->pc = (unsigned long )&ex->fixup - offset; +/* Skip the faulting instruction */ + regs->pc +=AARCH64_INSN_SIZE ;return true; }
@@ -1088,7 +1087,6 @@ static int add_exception_handler(const struct bpf_insn *insn, int dst_reg) {off_t ins_offset; -off_t fixup_offset;unsigned long pc;struct exception_table_entry *ex;
@@ -1119,22 +1117,6 @@ static int add_exception_handler(const struct bpf_insn *insn,if (WARN_ON_ONCE (ins_offset >=0 || ins_offset <INT_MIN ))return -ERANGE ; -/* -* Since the extable follows the program, the fixup offset is always -* negative and limited to BPF_JIT_REGION_SIZE. Store a positive value -* to keep things simple, and put the destination register in the upper -* bits. We don't need to worry about buildtime or runtime sort -* modifying the upper bits because the table is already sorted, and -* isn't part of the main exception table. -* -* The fixup_offset is set to the next instruction from the instruction -* that may fault. The execution will jump to this after handling the -* fault. -*/ - fixup_offset = (long )&ex->fixup - (pc +AARCH64_INSN_SIZE ); -if (!FIELD_FIT (BPF_FIXUP_OFFSET_MASK , fixup_offset)) -return -ERANGE ; -/* * The offsets above have been calculated using the RO buffer but we * need to use the R/W buffer for writes.
@@ -1147,8 +1129,7 @@ static int add_exception_handler(const struct bpf_insn *insn,if (BPF_CLASS (insn->code) !=BPF_LDX ) dst_reg =DONT_CLEAR ; - ex->fixup =FIELD_PREP (BPF_FIXUP_OFFSET_MASK , fixup_offset) | -FIELD_PREP (BPF_FIXUP_REG_MASK , dst_reg); + ex->fixup =FIELD_PREP (BPF_FIXUP_REG_MASK , dst_reg); ex->type =EX_TYPE_BPF ;
Signature · 1 line
2.47.3
Puranjay Mohan
maintainerPATCH v5 2/4 bpf: core: introduce main_prog_aux for stream access
In reply to Puranjay MohanBPF streams are only valid for the main programs, to make it easier to access streams from subprogs, introduce main_prog_aux in struct bpf_prog_aux.
prog->aux->main_prog_aux = prog->aux, for main programs and prog->aux->main_prog_aux = main_prog->aux, for subprograms.
This makes it easy to access streams like:
stream = bpf_stream_get(stream_id, prog->main_prog_aux);
--- include/linux/bpf.h | 1 + kernel/bpf/core.c | 3 +-- kernel/bpf/stream.c | 6 +++--- kernel/bpf/verifier.c | 1 + 4 files changed, 6 insertions(+), 5 deletions(-)
include/linux/bpf.h +1 -0
@@ -1633,6 +1633,7 @@ struct bpf_prog_aux {/* function name for valid attach_btf_id */ const char *attach_func_name;struct bpf_prog **func; +struct bpf_prog_aux *main_prog_aux;void *jit_data;/* JIT specific data. arch dependent */ struct bpf_jit_poke_descriptor *poke_tab;struct bpf_kfunc_desc_tab *kfunc_tab;
kernel/bpf/core.c +1 -2
@@ -120,6 +120,7 @@ struct bpf_prog *bpf_prog_alloc_no_stats(unsigned int size, gfp_t gfp_extra_flag fp->pages = size /PAGE_SIZE ; fp->aux = aux; + fp->aux->main_prog_aux = aux; fp->aux->prog = fp; fp->jit_requested =ebpf_jit_enabled (); fp->blinding_requested =bpf_jit_blinding_enabled (fp);
@@ -3292,8 +3293,6 @@ static bool find_from_stack_cb(void *cookie, u64 ip, u64 sp, u64 bp)rcu_read_unlock ();if (!prog)return true; -if (bpf_is_subprog (prog)) -return true; ctxp->prog = prog;return false; }
kernel/bpf/stream.c +3 -3
@@ -343,7 +343,7 @@ int bpf_prog_stream_read(struct bpf_prog *prog, enum bpf_stream_id stream_id, vo {struct bpf_stream *stream; - stream =bpf_stream_get (stream_id, prog->aux); + stream =bpf_stream_get (stream_id, prog->aux->main_prog_aux);if (!stream)return -ENOENT ;return bpf_stream_read (stream, buf, len);
@@ -367,7 +367,7 @@ __bpf_kfunc int bpf_stream_vprintk(int stream_id, const char *fmt__str, const vou32 data_len = len__sz;int ret, num_args; - stream =bpf_stream_get (stream_id, aux); + stream =bpf_stream_get (stream_id, aux->main_prog_aux);if (!stream)return -ENOENT ;
@@ -457,7 +457,7 @@ int bpf_stream_stage_commit(struct bpf_stream_stage *ss, struct bpf_prog *prog,struct bpf_stream *stream;int ret; - stream =bpf_stream_get (stream_id, prog->aux); + stream =bpf_stream_get (stream_id, prog->aux->main_prog_aux);if (!stream)return -EINVAL ;
kernel/bpf/verifier.c +1 -0
@@ -21597,6 +21597,7 @@ static int jit_subprogs(struct bpf_verifier_env *env) func[i]->aux->func_info_cnt = prog->aux->func_info_cnt; func[i]->aux->poke_tab = prog->aux->poke_tab; func[i]->aux->size_poke_tab = prog->aux->size_poke_tab; + func[i]->aux->main_prog_aux = prog->aux;for (j =0 ; j < prog->aux->size_poke_tab; j++) {struct bpf_jit_poke_descriptor *poke;
Signature · 1 line
2.47.3
Re: [PATCH bpf-next v5 2/4] bpf: core: introduce main_prog_aux for stream access
Quoted 36 lines · Puranjay Mohan
BPF streams are only valid for the main programs, to make it easier to access streams from subprogs, introduce
main_prog_auxin structbpf_prog_aux.
prog->aux->main_prog_aux=prog->aux, for main programs andprog->aux->main_prog_aux=main_prog->aux, for subprograms.This makes it easy to access streams like:
stream =bpf_stream_get(stream_id, prog->main_prog_aux);Signed-off-by Puranjay Mohan <[email protected]>--- include/linux/bpf.h | 1 + kernel/bpf/core.c | 3 +-- kernel/bpf/stream.c | 6 +++--- kernel/bpf/verifier.c | 1 + 4 files changed, 6 insertions(+), 5 deletions(-)include/linux/bpf.h +1
-0@@ -1633,6 +1633,7 @@ struct bpf_prog_aux {/* function name for valid attach_btf_id */ const char *attach_func_name;struct bpf_prog **func; +struct bpf_prog_aux *main_prog_aux;void *jit_data;/* JIT specific data. arch dependent */ struct bpf_jit_poke_descriptor *poke_tab;struct bpf_kfunc_desc_tab *kfunc_tab;kernel/bpf/core.c +0
-0
kernel/bpf/core.c struct bpf_prog *bpf_prog_alloc_no_stats(unsigned int size, gfp_t gfp_extra_flag · line 123
Quoted 4 lines
kernel/bpf/core.c +1
-0@@ -120,6 +120,7 @@ struct bpf_prog *bpf_prog_alloc_no_stats(unsigned int size, gfp_t gfp_extra_flag fp->pages = size /PAGE_SIZE ; fp->aux = aux; + fp->aux->main_prog_aux = aux;
Though I agree that it's not strictly necessary, this approach is so much easier to reason about.
Kumar, wdyt?
Kumar Kartikeya Dwivedi
maintainerRe: [PATCH bpf-next v5 2/4] bpf: core: introduce main_prog_aux for stream access
Quoted 39 lines · Alexei Starovoitov
Quoted 37 lines · Puranjay Mohan
BPF streams are only valid for the main programs, to make it easier to access streams from subprogs, introduce
main_prog_auxin structbpf_prog_aux.
prog->aux->main_prog_aux=prog->aux, for main programs andprog->aux->main_prog_aux=main_prog->aux, for subprograms.This makes it easy to access streams like:
stream =bpf_stream_get(stream_id, prog->main_prog_aux);Signed-off-by Puranjay Mohan <[email protected]>--- include/linux/bpf.h | 1 + kernel/bpf/core.c | 3 +-- kernel/bpf/stream.c | 6 +++--- kernel/bpf/verifier.c | 1 + 4 files changed, 6 insertions(+), 5 deletions(-)include/linux/bpf.h +1
-0@@ -1633,6 +1633,7 @@ struct bpf_prog_aux {/* function name for valid attach_btf_id */ const char *attach_func_name;struct bpf_prog **func; +struct bpf_prog_aux *main_prog_aux;void *jit_data;/* JIT specific data. arch dependent */ struct bpf_jit_poke_descriptor *poke_tab;struct bpf_kfunc_desc_tab *kfunc_tab;kernel/bpf/core.c +0
-0@@ -120,6 +120,7 @@ struct bpf_prog *bpf_prog_alloc_no_stats(unsigned int size, gfp_t gfp_extra_flag
Quoted 8 lines
kernel/bpf/core.c struct bpf_prog *bpf_prog_alloc_no_stats(unsigned int size, gfp_t gfp_extra_flag · line 123
Quoted 3 lines
kernel/bpf/core.c +1
-0fp->pages = size /PAGE_SIZE ; fp->aux = aux; + fp->aux->main_prog_aux = aux;Though I agree that it's not strictly necessary, this approach is so much easier to reason about.
Kumar, wdyt?
Yeah, nbd, this looks fine as well.
Puranjay Mohan
maintainerPATCH v5 3/4 bpf: Report arena faults to BPF stderr
In reply to Puranjay MohanBegin reporting arena page faults and the faulting address to BPF program's stderr, this patch adds support in the arm64 and x86-64 JITs, support for other archs can be added later.
The fault handlers receive the 32 bit address in the arena region so the upper 32 bits of user_vm_start is added to it before printing the address. This is what the user would expect to see as this is what is printed by bpf_printk() is you pass it an address returned by bpf_arena_alloc_pages();
--- arch/arm64/net/bpf_jit_comp.c | 52 +++++++++++++++++++++++ arch/x86/net/bpf_jit_comp.c | 79 +++++++++++++++++++++++++++++++++-- include/linux/bpf.h | 6 +++ kernel/bpf/arena.c | 27 ++++++++++++ 4 files changed, 160 insertions(+), 4 deletions(-)
arch/arm64/net/bpf_jit_comp.c +52 -0
@@ -1066,6 +1066,30 @@ static void build_epilogue(struct jit_ctx *ctx, bool was_classic)emit (A64_RET (A64_LR ), ctx); } +/* +* Metadata encoding for exception handling in JITed code. +* +* Format of `fixup` field in `struct exception_table_entry`: +* +* Bit layout of `fixup` (32-bit): +* +* +-----------+--------+-----------+-----------+----------+ +* | 31-27 | 26-22 | 21 | 20-16 | 15-0 | +* | | | | | | +* | FIXUP_REG | Unused | ARENA_ACC | ARENA_REG | OFFSET | +* +-----------+--------+-----------+-----------+----------+ +* +* - OFFSET (16 bits): Offset used to compute address for Load/Store instruction. +* - ARENA_REG (5 bits): Register that is used to calculate the address for load/store when +* accessing the arena region. +* - ARENA_ACCESS (1 bit): This bit is set when the faulting instruction accessed the arena region. +* - FIXUP_REG (5 bits): Destination register for the load instruction (cleared on fault) or set to +* DONT_CLEAR if it is a store instruction. +*/ + +#define BPF_FIXUP_OFFSET_MASK GENMASK(15, 0) +#define BPF_FIXUP_ARENA_REG_MASK GENMASK(20, 16) +#define BPF_ARENA_ACCESS BIT(21)#define BPF_FIXUP_REG_MASK GENMASK(31, 27)#define DONT_CLEAR 5/* Unused ARM64 register from BPF's POV */
@@ -1073,11 +1097,22 @@ bool ex_handler_bpf(const struct exception_table_entry *ex, struct pt_regs *regs) {int dst_reg =FIELD_GET (BPF_FIXUP_REG_MASK , ex->fixup); +s16 off =FIELD_GET (BPF_FIXUP_OFFSET_MASK , ex->fixup); +int arena_reg =FIELD_GET (BPF_FIXUP_ARENA_REG_MASK , ex->fixup); +bool is_arena = !!(ex->fixup &BPF_ARENA_ACCESS ); +bool is_write = (dst_reg ==DONT_CLEAR ); +unsigned long addr; + +if (is_arena) { + addr = regs->regs[arena_reg] + off; +bpf_prog_report_arena_violation (is_write, addr, regs->pc); + }if (dst_reg !=DONT_CLEAR ) regs->regs[dst_reg] =0 ;/* Skip the faulting instruction */ regs->pc +=AARCH64_INSN_SIZE ; +return true; }
@@ -1087,6 +1122,9 @@ static int add_exception_handler(const struct bpf_insn *insn, int dst_reg) {off_t ins_offset; +s16 off = insn->off; +bool is_arena; +int arena_reg;unsigned long pc;struct exception_table_entry *ex;
@@ -1100,6 +1138,9 @@ static int add_exception_handler(const struct bpf_insn *insn, BPF_MODE(insn->code) != BPF_PROBE_ATOMIC)return 0 ; + is_arena = (BPF_MODE (insn->code) ==BPF_PROBE_MEM32 ) || + (BPF_MODE (insn->code) ==BPF_PROBE_ATOMIC ); +if (!ctx->prog->aux->extable ||WARN_ON_ONCE (ctx->exentry_idx >= ctx->prog->aux->num_exentries))return -EINVAL ;
@@ -1131,6 +1172,17 @@ static int add_exception_handler(const struct bpf_insn *insn, ex->fixup =FIELD_PREP (BPF_FIXUP_REG_MASK , dst_reg); +if (is_arena) { + ex->fixup |=BPF_ARENA_ACCESS ; +if (BPF_CLASS (insn->code) ==BPF_LDX ) + arena_reg = bpf2a64[insn->src_reg]; +else + arena_reg = bpf2a64[insn->dst_reg]; + + ex->fixup |=FIELD_PREP (BPF_FIXUP_OFFSET_MASK , off) | +FIELD_PREP (BPF_FIXUP_ARENA_REG_MASK , arena_reg); + } + ex->type =EX_TYPE_BPF ; ctx->exentry_idx++;
arch/x86/net/bpf_jit_comp.c +75 -4
111 lines not on this page · raw message
include/linux/bpf.h +6 -0
@@ -2014,6 +2014,7 @@ int bpf_struct_ops_desc_init(struct bpf_struct_ops_desc *st_ops_desc, struct bpf_verifier_log *log);void bpf_map_struct_ops_info_fill (struct bpf_map_info *info,struct bpf_map *map);void bpf_struct_ops_desc_release (struct bpf_struct_ops_desc *st_ops_desc); +void bpf_prog_report_arena_violation (bool write,unsigned long addr,unsigned long fault_ip);#else #define register_bpf_struct_ops (st_ops, type) ({ (void *)(st_ops); 0; })static inline bool bpf_try_module_get (const void *data,struct module *owner)
@@ -2046,6 +2047,11 @@ static inline void bpf_struct_ops_desc_release(struct bpf_struct_ops_desc *st_op { } +static inline void bpf_prog_report_arena_violation (bool write,unsigned long addr, +unsigned long fault_ip) +{ +} +#endif int bpf_prog_ctx_arg_info_init(struct bpf_prog *prog,
kernel/bpf/arena.c +27 -0
@@ -633,3 +633,30 @@ static int __init kfunc_init(void)return register_btf_kfunc_id_set (BPF_PROG_TYPE_UNSPEC , &common_kfunc_set); }late_initcall (kfunc_init); + +void bpf_prog_report_arena_violation (bool write,unsigned long addr,unsigned long fault_ip) +{ +struct bpf_stream_stage ss; +struct bpf_prog *prog; +u64 user_vm_start; + +/* +* The RCU read lock is held to safely traverse the latch tree, but we +* don't need its protection when accessing the prog, since it will not +* disappear while we are handling the fault. +*/ +rcu_read_lock (); + prog =bpf_prog_ksym_find (fault_ip); +rcu_read_unlock (); +if (!prog) +return ; + + user_vm_start =bpf_arena_get_user_vm_start (prog->aux->arena); + addr += (user_vm_start >>32 ) <<32 ; + +bpf_stream_stage (ss, prog,BPF_STDERR , ({ +bpf_stream_printk (ss,"ERROR: Arena %s access at unmapped address 0x%lx\n" , + write ?"WRITE" :"READ" , addr); +bpf_stream_dump_stack (ss); + })); +}
Signature · 1 line
2.47.3
kernel test robot
build botRe: [PATCH bpf-next v5 3/4] bpf: Report arena faults to BPF stderr
kernel test robot noticed the following build errors:
Hi Puranjay,
kernel test robot noticed the following build errors:
[auto build test ERROR on bpf-next/master]
url: https://github.com/intel-lab-lkp/linux/commits/Puranjay-Mohan/bpf-arm64-simplify-exception-table-handling/20250902-033833 base: https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git master patch link: https://lore.kernel.org/r/20250901193730.43543-4-puranjay%40kernel.org patch subject: [PATCH bpf-next v5 3/4] bpf: Report arena faults to BPF stderr config: x86_64-buildonly-randconfig-002-20250902 (https://download.01.org/0day-ci/archive/20250902/[email protected]/config) compiler: clang version 20.1.8 (https://github.com/llvm/llvm-project 87f0227cb60147a26a1eeb4fb06e3b505e9c7261) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250902/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
>> kernel/bpf/arena.c:637:6: error: redefinition of 'bpf_prog_report_arena_violation'
637 | void bpf_prog_report_arena_violation(bool write, unsigned long addr, unsigned long fault_ip)
| ^
include/linux/bpf.h:2050:20: note: previous definition is here
2050 | static inline void bpf_prog_report_arena_violation(bool write, unsigned long addr,
| ^
1 error generated.
vim +/bpf_prog_report_arena_violation +637 kernel/bpf/arena.c
636
> 637 void bpf_prog_report_arena_violation(bool write, unsigned long addr, unsigned long fault_ip)
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
Eduard Zingerman
maintainerRe: [PATCH bpf-next v5 3/4] bpf: Report arena faults to BPF stderr
In reply to Puranjay MohanQuoted 10 lines · Puranjay Mohan
Begin reporting arena page faults and the faulting address to BPF program's stderr, this patch adds support in the arm64 and x86-64 JITs, support for other archs can be added later.
The fault handlers receive the 32 bit address in the arena region so the upper 32 bits of
user_vm_startis added to it before printing the address. This is what the user would expect to see as this is what is printed bybpf_printk()is you pass it an address returned bybpf_arena_alloc_pages();
Quoted 3 lines
Signed-off-by Puranjay Mohan <[email protected]>Acked-by Yonghong Song <[email protected]>---
Fwiw, aside from a nit below the patch looks good to me.
Quoted 4 lines
arch/x86/net/bpf_jit_comp.c +0
-0
[...]
arch/x86/net/bpf_jit_comp.c st: if (is_imm8(insn->off)) · line 2147
Quoted 8 lines
arch/x86/net/bpf_jit_comp.c +2
-2@@ -2089,8 +2143,25 @@ st: if (is_imm8(insn->off)) ex->data =EX_TYPE_BPF ; - ex->fixup = (prog - start_of_ldx) | - ((BPF_CLASS (insn->code) ==BPF_LDX ? reg2pt_regs[dst_reg] :DONT_CLEAR ) <<8 ); + is_arena = (BPF_MODE (insn->code) ==BPF_PROBE_MEM32 ) || + (BPF_MODE (insn->code) ==BPF_PROBE_ATOMIC );
Nit:
It looks like label populate_extable is always reachable from either BPF_PROB_MEM32 or BPF_PROBE_ATOMIC instruction. Non-arena use cases for BPF_PROBE_MEM{,SX} are handled separately. So, it appears that this condition is always true.
Quoted 20 lines
arch/x86/net/bpf_jit_comp.c +17
-0+ + fixup_reg = (BPF_CLASS (insn->code) ==BPF_LDX ) ? + reg2pt_regs[dst_reg] :DONT_CLEAR ; + + ex->fixup =FIELD_PREP (FIXUP_INSN_LEN_MASK , prog - start_of_ldx) | +FIELD_PREP (FIXUP_REG_MASK , fixup_reg); + +if (is_arena) { + ex->fixup |=FIXUP_ARENA_ACCESS ; +if (BPF_CLASS (insn->code) ==BPF_LDX ) + arena_reg = reg2pt_regs[src_reg]; +else + arena_reg = reg2pt_regs[dst_reg]; + + ex->fixup |=FIELD_PREP (FIXUP_ARENA_REG_MASK , arena_reg); + ex->data |=FIELD_PREP (DATA_ARENA_OFFSET_MASK , insn->off); + } }break ;
[...]
Puranjay Mohan
maintainerPATCH v5 4/4 selftests/bpf: Add tests for arena fault reporting
In reply to Puranjay MohanAdd selftests for testing the reporting of arena page faults through BPF streams. Two new bpf programs are added that read and write to an unmapped arena address and the fault reporting is verified in the userspace through streams.
The added bpf programs need to access the user_vm_start in struct bpf_arena, this is done by casting &arena to struct bpf_arena *, but barrier_var() is used on this ptr before accessing ptr->user_vm_start; to stop GCC from issuing an out-of-bound access due to the cast from smaller map struct to larger "struct bpf_arena"
--- .../testing/selftests/bpf/prog_tests/stream.c | 34 ++++++++++- tools/testing/selftests/bpf/progs/stream.c | 61 +++++++++++++++++++ 2 files changed, 94 insertions(+), 1 deletion(-)
tools/testing/selftests/bpf/prog_tests/stream.c +33 -1
@@ -41,6 +41,22 @@ struct { "([a-zA-Z_][a-zA-Z0-9_]*\\+0x[0-9a-fA-F]+/0x[0-9a-fA-F]+\n" "|[ \t]+[^\n]+\n)*", }, + { + offsetof(struct stream, progs.stream_arena_read_fault), +"ERROR: Arena READ access at unmapped address 0x.*\n" +"CPU: [0-9]+ UID: 0 PID: [0-9]+ Comm: .*\n" +"Call trace:\n" +"([a-zA-Z_][a-zA-Z0-9_]*\\+0x[0-9a-fA-F]+/0x[0-9a-fA-F]+\n" +"|[ \t]+[^\n]+\n)*" , + }, + { + offsetof(struct stream, progs.stream_arena_write_fault), +"ERROR: Arena WRITE access at unmapped address 0x.*\n" +"CPU: [0-9]+ UID: 0 PID: [0-9]+ Comm: .*\n" +"Call trace:\n" +"([a-zA-Z_][a-zA-Z0-9_]*\\+0x[0-9a-fA-F]+/0x[0-9a-fA-F]+\n" + "|[ \t]+[^\n]+\n)*", + }, };static int match_regex (const char *pattern,const char *string)
@@ -63,6 +79,7 @@ void test_stream_errors(void)struct stream *skel;int ret, prog_fd;char buf[1024 ]; +char fault_addr[64 ] = {0 }; skel =stream__open_and_load ();if (!ASSERT_OK_PTR (skel,"stream__open_and_load" ))
@@ -85,6 +102,14 @@ void test_stream_errors(void) continue; }#endif +#if !defined(__x86_64__) && !defined(__aarch64__) +ASSERT_TRUE (1 ,"Arena fault reporting unsupported, skip." ); +if (i ==2 || i ==3 ) { + ret =bpf_prog_stream_read (prog_fd,2 , buf,sizeof (buf), &ropts); +ASSERT_EQ (ret,0 ,"stream read" ); +continue ; + } +#endif ret =bpf_prog_stream_read (prog_fd,BPF_STREAM_STDERR , buf,sizeof (buf), &ropts);ASSERT_GT (ret,0 ,"stream read" );
@@ -92,8 +117,15 @@ void test_stream_errors(void) buf[ret] ='\0' ; ret =match_regex (stream_error_arr[i].errstr, buf); -if (!ASSERT_TRUE (ret ==1 ,"regex match" )) +if (ret && (i ==2 || i ==3 )) { +sprintf (fault_addr,"0x%lx" , skel->bss->fault_addr); + ret =match_regex (fault_addr, buf); + } +if (!ASSERT_TRUE (ret ==1 ,"regex match" )) {fprintf (stderr,"Output from stream:\n%s\n" , buf); +if (i ==2 || i ==3 ) +fprintf (stderr,"Fault Addr: 0x%lx\n" , skel->bss->fault_addr); + } }stream__destroy (skel);
tools/testing/selftests/bpf/progs/stream.c +61 -0
81 lines not on this page · raw message
Signature · 1 line
2.47.3
Re: [PATCH bpf-next v5 4/4] selftests/bpf: Add tests for arena fault reporting
Quoted 5 lines · Puranjay Mohan
Add selftests for testing the reporting of arena page faults through BPF streams. Two new bpf programs are added that read and write to an unmapped arena address and the fault reporting is verified in the userspace through streams.
Quoted 7 lines
The added bpf programs need to access the
user_vm_startin structbpf_arena, this is done by casting &arena to structbpf_arena*, butbarrier_var()is used on this ptr before accessingptr->user_vm_start; to stop GCC from issuing an out-of-bound access due to the cast from smaller map struct to larger "structbpf_arena"Signed-off-by Puranjay Mohan <[email protected]>
LGTM with one nit below.
Quoted 33 lines
--- .../testing/selftests/bpf/prog_tests/stream.c | 34 ++++++++++- tools/testing/selftests/bpf/progs/stream.c | 61 +++++++++++++++++++ 2 files changed, 94 insertions(+), 1 deletion(-)tools/testing/selftests/bpf/prog_tests/stream.c +16
-0@@ -41,6 +41,22 @@ struct { "([a-zA-Z_][a-zA-Z0-9_]*\\+0x[0-9a-fA-F]+/0x[0-9a-fA-F]+\n" "|[ \t]+[^\n]+\n)*", }, + { + offsetof(struct stream, progs.stream_arena_read_fault), +"ERROR: Arena READ access at unmapped address 0x.*\n" +"CPU: [0-9]+ UID: 0 PID: [0-9]+ Comm: .*\n" +"Call trace:\n" +"([a-zA-Z_][a-zA-Z0-9_]*\\+0x[0-9a-fA-F]+/0x[0-9a-fA-F]+\n" +"|[ \t]+[^\n]+\n)*" , + }, + { + offsetof(struct stream, progs.stream_arena_write_fault), +"ERROR: Arena WRITE access at unmapped address 0x.*\n" +"CPU: [0-9]+ UID: 0 PID: [0-9]+ Comm: .*\n" +"Call trace:\n" +"([a-zA-Z_][a-zA-Z0-9_]*\\+0x[0-9a-fA-F]+/0x[0-9a-fA-F]+\n" + "|[ \t]+[^\n]+\n)*", + }, };static int match_regex (const char *pattern,const char *string)
tools/testing/selftests/bpf/prog_tests/stream.c void test_stream_errors(void) · line 82
Quoted 4 lines
tools/testing/selftests/bpf/prog_tests/stream.c +1
-0@@ -63,6 +79,7 @@ void test_stream_errors(void)struct stream *skel;int ret, prog_fd;char buf[1024 ]; +char fault_addr[64 ] = {0 };
Looks like the above '= {0}' is not necessary as the only usage is below:
+ sprintf(fault_addr, "0x%lx", skel->bss->fault_addr);
+ ret = match_regex(fault_addr, buf);
Quoted 36 lines
tools/testing/selftests/bpf/prog_tests/stream.c +16
-1skel =stream__open_and_load ();if (!ASSERT_OK_PTR (skel,"stream__open_and_load" ))@@ -85,6 +102,14 @@ void test_stream_errors(void) continue; }#endif +#if !defined(__x86_64__) && !defined(__aarch64__) +ASSERT_TRUE (1 ,"Arena fault reporting unsupported, skip." ); +if (i ==2 || i ==3 ) { + ret =bpf_prog_stream_read (prog_fd,2 , buf,sizeof (buf), &ropts); +ASSERT_EQ (ret,0 ,"stream read" ); +continue ; + } +#endif ret =bpf_prog_stream_read (prog_fd,BPF_STREAM_STDERR , buf,sizeof (buf), &ropts);ASSERT_GT (ret,0 ,"stream read" );@@ -92,8 +117,15 @@ void test_stream_errors(void) buf[ret] ='\0' ; ret =match_regex (stream_error_arr[i].errstr, buf); -if (!ASSERT_TRUE (ret ==1 ,"regex match" )) +if (ret && (i ==2 || i ==3 )) { +sprintf (fault_addr,"0x%lx" , skel->bss->fault_addr); + ret =match_regex (fault_addr, buf); + } +if (!ASSERT_TRUE (ret ==1 ,"regex match" )) {fprintf (stderr,"Output from stream:\n%s\n" , buf); +if (i ==2 || i ==3 ) +fprintf (stderr,"Fault Addr: 0x%lx\n" , skel->bss->fault_addr); + } }stream__destroy (skel);
[...]
Eduard Zingerman
maintainerRe: [PATCH bpf-next v5 4/4] selftests/bpf: Add tests for arena fault reporting
In reply to Puranjay MohanOn Mon, 2025-09-01 at 19:37 +0000, Puranjay Mohan wrote:
[...]
Quoted 14 lines
tools/testing/selftests/bpf/prog_tests/stream.c +6
-0@@ -41,6 +41,22 @@ struct {"([a-zA-Z_][a-zA-Z0-9_]*\\+0x[0-9a-fA-F]+/0x[0-9a-fA-F]+\n" "|[ \t]+[^\n]+\n)*" , }, + { + offsetof(struct stream, progs.stream_arena_read_fault), +"ERROR: Arena READ access at unmapped address 0x.*\n" +"CPU: [0-9]+ UID: 0 PID: [0-9]+ Comm: .*\n" +"Call trace:\n" +"([a-zA-Z_][a-zA-Z0-9_]*\\+0x[0-9a-fA-F]+/0x[0-9a-fA-F]+\n"
tools/testing/selftests/bpf/prog_tests/stream.c struct { · line 59
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/stream.c +10
-0+"|[ \t]+[^\n]+\n)*" , + }, + { + offsetof(struct stream, progs.stream_arena_write_fault), +"ERROR: Arena WRITE access at unmapped address 0x.*\n" +"CPU: [0-9]+ UID: 0 PID: [0-9]+ Comm: .*\n" +"Call trace:\n" +"([a-zA-Z_][a-zA-Z0-9_]*\\+0x[0-9a-fA-F]+/0x[0-9a-fA-F]+\n" + "|[ \t]+[^\n]+\n)*", + },
I commented when prog_tests/stream.c was first introduced but it was decided to postpone the change back then.
It would be nice to have the above expressed in terms similar to bpf_misc.h:__msg() macro. E.g. name it __bpf_{stdout,stderr} and have something like this in the progs/stream.c:
SEC("syscall")
__success __retval(0)
__bpf_stderr("ERROR: Arena WRITE access at unmapped address 0x{{.*}}") __bpf_stderr("CPU: {{[0-9]+}} UID: 0 PID: {{[0-9]+}} Comm: {{.*}}")
...
int stream_arena_write_fault(void *ctx)
{
...}
Now that more tests are added, what do you think about such extension?
Quoted 3 lines
tools/testing/selftests/bpf/prog_tests/stream.c +0
-0};static int match_regex (const char *pattern,const char *string)
[...]
Puranjay Mohan
maintainerRe: [PATCH bpf-next v5 4/4] selftests/bpf: Add tests for arena fault reporting
Quoted 35 lines · Eduard Zingerman
On Mon, 2025-09-01 at 19:37 +0000, Puranjay Mohan wrote:
[...]
Quoted 14 lines
tools/testing/selftests/bpf/prog_tests/stream.c +6
-0@@ -41,6 +41,22 @@ struct {"([a-zA-Z_][a-zA-Z0-9_]*\\+0x[0-9a-fA-F]+/0x[0-9a-fA-F]+\n" "|[ \t]+[^\n]+\n)*" , }, + { + offsetof(struct stream, progs.stream_arena_read_fault), +"ERROR: Arena READ access at unmapped address 0x.*\n" +"CPU: [0-9]+ UID: 0 PID: [0-9]+ Comm: .*\n" +"Call trace:\n" +"([a-zA-Z_][a-zA-Z0-9_]*\\+0x[0-9a-fA-F]+/0x[0-9a-fA-F]+\n" tools/testing/selftests/bpf/prog_tests/stream.c struct { · line 59
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/stream.c +10
-0+"|[ \t]+[^\n]+\n)*" , + }, + { + offsetof(struct stream, progs.stream_arena_write_fault), +"ERROR: Arena WRITE access at unmapped address 0x.*\n" +"CPU: [0-9]+ UID: 0 PID: [0-9]+ Comm: .*\n" +"Call trace:\n" +"([a-zA-Z_][a-zA-Z0-9_]*\\+0x[0-9a-fA-F]+/0x[0-9a-fA-F]+\n" + "|[ \t]+[^\n]+\n)*", + },I commented when
prog_tests/stream.cwas first introduced but it was decided to postpone the change back then.
It would be nice to have the above expressed in terms similar to bpf_misc.h:__msg() macro. E.g. name it __bpf_{stdout,stderr} and have something like this in theprogs/stream.c:
Quoted 3 lines
SEC("syscall")
__success__retval(0)
__bpf_stderr("ERROR: Arena WRITE access at unmapped address 0x{{.*}}")
I would prefer naming them __stderr and __stdout
Quoted 8 lines
__bpf_stderr("CPU: {{[0-9]+}} UID: 0 PID: {{[0-9]+}} Comm: {{.*}}")
...
intstream_arena_write_fault(void *ctx){ ...}
Now that more tests are added, what do you think about such extension?
I tried implementing this and it looks nice, so I think we should have it.
Will add it with the next version.
Thanks,
Puranjay
Eduard Zingerman
maintainerRe: [PATCH bpf-next v5 4/4] selftests/bpf: Add tests for arena fault reporting
On Fri, 2025-09-05 at 14:00 +0000, Puranjay Mohan wrote:
[...]
Quoted 11 lines
Quoted 9 lines
I commented when
prog_tests/stream.cwas first introduced but it was decided to postpone the change back then.
It would be nice to have the above expressed in terms similar to bpf_misc.h:__msg() macro. E.g. name it __bpf_{stdout,stderr} and have something like this in theprogs/stream.c:
SEC("syscall")
__success__retval(0)
__bpf_stderr("ERROR: Arena WRITE access at unmapped address 0x{{.*}}")I would prefer naming them
__stderrand__stdout
Works for me.
Quoted 7 lines
Quoted 7 lines
__bpf_stderr("CPU: {{[0-9]+}} UID: 0 PID: {{[0-9]+}} Comm: {{.*}}")
...
intstream_arena_write_fault(void *ctx){ ...}
Quoted 5 lines
Quoted 1 line
Now that more tests are added, what do you think about such extension?
I tried implementing this and it looks nice, so I think we should have it.
Will add it with the next version.
Great, thank you.