bpf: Set run context for rawtp test_run callback
Subsystems (6)
Jiri Olsa
reviewerPATCH 1/1 bpf: Set run context for rawtp test_run callback
syzbot reported crash when rawtp program executed through the test_run interface calls bpf_get_attach_cookie helper or any other helper that touches task->bpf_ctx pointer.
We need to setup bpf_ctx pointer in rawtp test_run as well, so fixing this by moving __bpf_trace_run in header file and using it in test_run callback.
Also renaming __bpf_trace_run to bpf_prog_run_trace.
--- include/linux/bpf.h | 27 +++++++++++++++++++++++++++ kernel/trace/bpf_trace.c | 28 ++-------------------------- net/bpf/test_run.c | 4 +--- 3 files changed, 30 insertions(+), 29 deletions(-)
include/linux/bpf.h +27 -0
@@ -2914,6 +2914,33 @@ static inline void bpf_dynptr_set_rdonly(struct bpf_dynptr_kern *ptr) }#endif /* CONFIG_BPF_SYSCALL */ +static __always_inline int +bpf_prog_run_trace (struct bpf_prog *prog,u64 cookie,u64 *ctx, +bpf_prog_run_fn run_prog) +{ +struct bpf_run_ctx *old_run_ctx; +struct bpf_trace_run_ctx run_ctx; +int ret =-1 ; + +cant_sleep (); +if (unlikely (this_cpu_inc_return (*(prog->active)) !=1 )) { +bpf_prog_inc_misses_counter (prog); + goto out; + } + + run_ctx.bpf_cookie = cookie; + old_run_ctx =bpf_set_run_ctx (&run_ctx.run_ctx); + +rcu_read_lock (); + ret =run_prog (prog, ctx); +rcu_read_unlock (); + +bpf_reset_run_ctx (old_run_ctx); +out: +this_cpu_dec (*(prog->active)); +return ret; +} + static __always_inline intbpf_probe_read_kernel_common (void *dst,u32 size,const void *unsafe_ptr) {
kernel/trace/bpf_trace.c +2 -26
@@ -2383,31 +2383,6 @@ void bpf_put_raw_tracepoint(struct bpf_raw_event_map *btp)preempt_enable (); } -static __always_inline -void __bpf_trace_run(struct bpf_raw_tp_link *link, u64 *args) -{ -struct bpf_prog *prog = link->link.prog; -struct bpf_run_ctx *old_run_ctx; -struct bpf_trace_run_ctx run_ctx; - -cant_sleep (); -if (unlikely (this_cpu_inc_return (*(prog->active)) !=1 )) { -bpf_prog_inc_misses_counter (prog); - goto out; - } - - run_ctx.bpf_cookie = link->cookie; - old_run_ctx =bpf_set_run_ctx (&run_ctx.run_ctx); - -rcu_read_lock (); - (void )bpf_prog_run (prog, args); -rcu_read_unlock (); - -bpf_reset_run_ctx (old_run_ctx); -out: -this_cpu_dec (*(prog->active)); -} -#define UNPACK (...) __VA_ARGS__#define REPEAT_1 (FN ,DL ,X , ...) FN(X)#define REPEAT_2 (FN ,DL ,X , ...) FN(X) UNPACK DL REPEAT_1(FN, DL, __VA_ARGS__)
@@ -2437,7 +2412,8 @@ void __bpf_trace_run(struct bpf_raw_tp_link *link, u64 *args) { \u64 args[x]; \REPEAT (x,COPY , __DL_SEM, __SEQ_0_11); \ -__bpf_trace_run (link, args); \ + (void )bpf_prog_run_trace (link->link.prog, link->cookie,\ + args, bpf_prog_run); \ } \ EXPORT_SYMBOL_GPL(bpf_trace_run##x) BPF_TRACE_DEFN_x(1);
net/bpf/test_run.c +1 -3
@@ -728,9 +728,7 @@ __bpf_prog_test_run_raw_tp(void *data) {struct bpf_raw_tp_test_run_info *info = data; -rcu_read_lock (); - info->retval =bpf_prog_run (info->prog, info->ctx); -rcu_read_unlock (); + info->retval =bpf_prog_run_trace (info->prog,0 , info->ctx, bpf_prog_run); } int bpf_prog_test_run_raw_tp(struct bpf_prog *prog,
Signature · 1 line
2.45.1
Quoted 28 lines · Jiri Olsa
syzbot reported crash when rawtp program executed through the
test_runinterface callsbpf_get_attach_cookiehelper or any other helper that touchestask->bpf_ctxpointer.We need to setup
bpf_ctxpointer in rawtptest_runas well, so fixing this by moving__bpf_trace_runin header file and using it intest_runcallback.Also renaming
__bpf_trace_runtobpf_prog_run_trace.Fixes 7adfc6c9b315 ("bpf: Add bpf_get_attach_cookie() BPF helper to access bpf_cookie value")Reported-by [email protected]Signed-off-by Jiri Olsa <[email protected]>--- include/linux/bpf.h | 27 +++++++++++++++++++++++++++ kernel/trace/bpf_trace.c | 28 ++-------------------------- net/bpf/test_run.c | 4 +--- 3 files changed, 30 insertions(+), 29 deletions(-)include/linux/bpf.h +0
-0@@ -2914,6 +2914,33 @@ static inline void bpf_dynptr_set_rdonly(struct bpf_dynptr_kern *ptr) }#endif /* CONFIG_BPF_SYSCALL */
include/linux/bpf.h static inline void bpf_dynptr_set_rdonly(struct bpf_dynptr_kern *ptr) · line 2925
Quoted 10 lines
include/linux/bpf.h +9
-0+static __always_inline int +bpf_prog_run_trace (struct bpf_prog *prog,u64 cookie,u64 *ctx, +bpf_prog_run_fn run_prog) +{ +struct bpf_run_ctx *old_run_ctx; +struct bpf_trace_run_ctx run_ctx; +int ret =-1 ; + +cant_sleep ();
I suspect you should see a splat with that.
Overall I think it's better to add empty run_ctx to __bpf_prog_test_run_raw_tp()
instead of moving such a big function to .h
No need for prog->active increments. test_run is running from syscall. If the same prog is attached somewhere as well it may recurse once and it's fine imo.
pw-bot: cr
Quoted 85 lines
include/linux/bpf.h +18
-0+if (unlikely (this_cpu_inc_return (*(prog->active)) !=1 )) { +bpf_prog_inc_misses_counter (prog); + goto out; + } + + run_ctx.bpf_cookie = cookie; + old_run_ctx =bpf_set_run_ctx (&run_ctx.run_ctx); + +rcu_read_lock (); + ret =run_prog (prog, ctx); +rcu_read_unlock (); + +bpf_reset_run_ctx (old_run_ctx); +out: +this_cpu_dec (*(prog->active)); +return ret; +} + static __always_inline intbpf_probe_read_kernel_common (void *dst,u32 size,const void *unsafe_ptr) {kernel/trace/bpf_trace.c +2
-26@@ -2383,31 +2383,6 @@ void bpf_put_raw_tracepoint(struct bpf_raw_event_map *btp)preempt_enable (); } -static __always_inline -void __bpf_trace_run(struct bpf_raw_tp_link *link, u64 *args) -{ -struct bpf_prog *prog = link->link.prog; -struct bpf_run_ctx *old_run_ctx; -struct bpf_trace_run_ctx run_ctx; - -cant_sleep (); -if (unlikely (this_cpu_inc_return (*(prog->active)) !=1 )) { -bpf_prog_inc_misses_counter (prog); - goto out; - } - - run_ctx.bpf_cookie = link->cookie; - old_run_ctx =bpf_set_run_ctx (&run_ctx.run_ctx); - -rcu_read_lock (); - (void )bpf_prog_run (prog, args); -rcu_read_unlock (); - -bpf_reset_run_ctx (old_run_ctx); -out: -this_cpu_dec (*(prog->active)); -} -#define UNPACK (...) __VA_ARGS__#define REPEAT_1 (FN ,DL ,X , ...) FN(X)#define REPEAT_2 (FN ,DL ,X , ...) FN(X) UNPACK DL REPEAT_1(FN, DL, __VA_ARGS__)@@ -2437,7 +2412,8 @@ void __bpf_trace_run(struct bpf_raw_tp_link *link, u64 *args) { \u64 args[x]; \REPEAT (x,COPY , __DL_SEM, __SEQ_0_11); \ -__bpf_trace_run (link, args); \ + (void )bpf_prog_run_trace (link->link.prog, link->cookie,\ + args, bpf_prog_run); \ } \ EXPORT_SYMBOL_GPL(bpf_trace_run##x) BPF_TRACE_DEFN_x(1);net/bpf/test_run.c +1
-4@@ -728,9 +728,7 @@ __bpf_prog_test_run_raw_tp(void *data) {struct bpf_raw_tp_test_run_info *info = data; -rcu_read_lock (); - info->retval =bpf_prog_run (info->prog, info->ctx); -rcu_read_unlock (); + info->retval =bpf_prog_run_trace (info->prog,0 , info->ctx, bpf_prog_run); } int bpf_prog_test_run_raw_tp(struct bpf_prog *prog, --2.45.1
Quoted 30 lines · Alexei Starovoitov
Quoted 29 lines · Jiri Olsa
syzbot reported crash when rawtp program executed through the
test_runinterface callsbpf_get_attach_cookiehelper or any other helper that touchestask->bpf_ctxpointer.We need to setup
bpf_ctxpointer in rawtptest_runas well, so fixing this by moving__bpf_trace_runin header file and using it intest_runcallback.Also renaming
__bpf_trace_runtobpf_prog_run_trace.Fixes 7adfc6c9b315 ("bpf: Add bpf_get_attach_cookie() BPF helper to access bpf_cookie value")Reported-by [email protected]Signed-off-by Jiri Olsa <[email protected]>--- include/linux/bpf.h | 27 +++++++++++++++++++++++++++ kernel/trace/bpf_trace.c | 28 ++-------------------------- net/bpf/test_run.c | 4 +--- 3 files changed, 30 insertions(+), 29 deletions(-)include/linux/bpf.h +0
-0@@ -2914,6 +2914,33 @@ static inline void bpf_dynptr_set_rdonly(struct bpf_dynptr_kern *ptr) }#endif /* CONFIG_BPF_SYSCALL */
Quoted 11 lines
include/linux/bpf.h static inline void bpf_dynptr_set_rdonly(struct bpf_dynptr_kern *ptr) · line 2925
Quoted 9 lines
include/linux/bpf.h +9
-0+static __always_inline int +bpf_prog_run_trace (struct bpf_prog *prog,u64 cookie,u64 *ctx, +bpf_prog_run_fn run_prog) +{ +struct bpf_run_ctx *old_run_ctx; +struct bpf_trace_run_ctx run_ctx; +int ret =-1 ; + +cant_sleep ();I suspect you should see a splat with that.
hum, __bpf_prog_test_run_raw_tp is called with preempt_disable, so I think it should be fine
Quoted 8 lines
Overall I think it's better to add empty
run_ctxto__bpf_prog_test_run_raw_tp()
instead of moving such a big function to .hNo need for
prog->activeincrements.test_runis running from syscall. If the same prog is attached somewhere as well it may recurse once and it's fine imo.
heh, it was my first change, then I was thinking let's not duplicate the code and re-use the existing function.. but it's true that there's no use for the prog->active intest_run interface
jirka
Quoted 88 lines
pw-bot: cr
Quoted 85 lines
include/linux/bpf.h +18
-0+if (unlikely (this_cpu_inc_return (*(prog->active)) !=1 )) { +bpf_prog_inc_misses_counter (prog); + goto out; + } + + run_ctx.bpf_cookie = cookie; + old_run_ctx =bpf_set_run_ctx (&run_ctx.run_ctx); + +rcu_read_lock (); + ret =run_prog (prog, ctx); +rcu_read_unlock (); + +bpf_reset_run_ctx (old_run_ctx); +out: +this_cpu_dec (*(prog->active)); +return ret; +} + static __always_inline intbpf_probe_read_kernel_common (void *dst,u32 size,const void *unsafe_ptr) {kernel/trace/bpf_trace.c +2
-26@@ -2383,31 +2383,6 @@ void bpf_put_raw_tracepoint(struct bpf_raw_event_map *btp)preempt_enable (); } -static __always_inline -void __bpf_trace_run(struct bpf_raw_tp_link *link, u64 *args) -{ -struct bpf_prog *prog = link->link.prog; -struct bpf_run_ctx *old_run_ctx; -struct bpf_trace_run_ctx run_ctx; - -cant_sleep (); -if (unlikely (this_cpu_inc_return (*(prog->active)) !=1 )) { -bpf_prog_inc_misses_counter (prog); - goto out; - } - - run_ctx.bpf_cookie = link->cookie; - old_run_ctx =bpf_set_run_ctx (&run_ctx.run_ctx); - -rcu_read_lock (); - (void )bpf_prog_run (prog, args); -rcu_read_unlock (); - -bpf_reset_run_ctx (old_run_ctx); -out: -this_cpu_dec (*(prog->active)); -} -#define UNPACK (...) __VA_ARGS__#define REPEAT_1 (FN ,DL ,X , ...) FN(X)#define REPEAT_2 (FN ,DL ,X , ...) FN(X) UNPACK DL REPEAT_1(FN, DL, __VA_ARGS__)@@ -2437,7 +2412,8 @@ void __bpf_trace_run(struct bpf_raw_tp_link *link, u64 *args) { \u64 args[x]; \REPEAT (x,COPY , __DL_SEM, __SEQ_0_11); \ -__bpf_trace_run (link, args); \ + (void )bpf_prog_run_trace (link->link.prog, link->cookie,\ + args, bpf_prog_run); \ } \ EXPORT_SYMBOL_GPL(bpf_trace_run##x) BPF_TRACE_DEFN_x(1);net/bpf/test_run.c +1
-4@@ -728,9 +728,7 @@ __bpf_prog_test_run_raw_tp(void *data) {struct bpf_raw_tp_test_run_info *info = data; -rcu_read_lock (); - info->retval =bpf_prog_run (info->prog, info->ctx); -rcu_read_unlock (); + info->retval =bpf_prog_run_trace (info->prog,0 , info->ctx, bpf_prog_run); } int bpf_prog_test_run_raw_tp(struct bpf_prog *prog, --2.45.1