| Message ID | tencent_6715F3D7DF513D441A835321FAACFFCB0907@qq.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | BPF |
| Headers | show |
| Series | [bpf,RESEND] samples/bpf: Replace blk_account_io_done() with __blk_account_io_done() | expand |
On 09/09, Rong Tao wrote: > From: Rong Tao <rongtao@cestc.cn> > Since commit be6bfe36db17 ("block: inline hot paths of > blk_account_io_*()") > blk_account_io_*() become inline functions. Thanks for the fix. Not sure why RESEND. And it should target bpf-next; this doesn't seem like an important fix to warrant bpf. For future submissions, if you're targeting bpf, try to also add Fixes: tag. Not worth another resend though. Assuming it can be pulled in the proper subtree by the maintainers. Reviewed-by: Stanislav Fomichev <sdf@google.com> > Signed-off-by: Rong Tao <rtoax@foxmail.com> > --- > samples/bpf/task_fd_query_kern.c | 2 +- > samples/bpf/task_fd_query_user.c | 2 +- > samples/bpf/tracex3_kern.c | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > diff --git a/samples/bpf/task_fd_query_kern.c > b/samples/bpf/task_fd_query_kern.c > index c821294e1774..186ac0a79c0a 100644 > --- a/samples/bpf/task_fd_query_kern.c > +++ b/samples/bpf/task_fd_query_kern.c > @@ -10,7 +10,7 @@ int bpf_prog1(struct pt_regs *ctx) > return 0; > } > -SEC("kretprobe/blk_account_io_done") > +SEC("kretprobe/__blk_account_io_done") > int bpf_prog2(struct pt_regs *ctx) > { > return 0; > diff --git a/samples/bpf/task_fd_query_user.c > b/samples/bpf/task_fd_query_user.c > index 424718c0872c..a33d74bd3a4b 100644 > --- a/samples/bpf/task_fd_query_user.c > +++ b/samples/bpf/task_fd_query_user.c > @@ -348,7 +348,7 @@ int main(int argc, char **argv) > /* test two functions in the corresponding *_kern.c file */ > CHECK_AND_RET(test_debug_fs_kprobe(0, "blk_mq_start_request", > BPF_FD_TYPE_KPROBE)); > - CHECK_AND_RET(test_debug_fs_kprobe(1, "blk_account_io_done", > + CHECK_AND_RET(test_debug_fs_kprobe(1, "__blk_account_io_done", > BPF_FD_TYPE_KRETPROBE)); > /* test nondebug fs kprobe */ > diff --git a/samples/bpf/tracex3_kern.c b/samples/bpf/tracex3_kern.c > index 710a4410b2fb..bde6591cb20c 100644 > --- a/samples/bpf/tracex3_kern.c > +++ b/samples/bpf/tracex3_kern.c > @@ -49,7 +49,7 @@ struct { > __uint(max_entries, SLOTS); > } lat_map SEC(".maps"); > -SEC("kprobe/blk_account_io_done") > +SEC("kprobe/__blk_account_io_done") > int bpf_prog2(struct pt_regs *ctx) > { > long rq = PT_REGS_PARM1(ctx); > -- > 2.31.1
diff --git a/samples/bpf/task_fd_query_kern.c b/samples/bpf/task_fd_query_kern.c index c821294e1774..186ac0a79c0a 100644 --- a/samples/bpf/task_fd_query_kern.c +++ b/samples/bpf/task_fd_query_kern.c @@ -10,7 +10,7 @@ int bpf_prog1(struct pt_regs *ctx) return 0; } -SEC("kretprobe/blk_account_io_done") +SEC("kretprobe/__blk_account_io_done") int bpf_prog2(struct pt_regs *ctx) { return 0; diff --git a/samples/bpf/task_fd_query_user.c b/samples/bpf/task_fd_query_user.c index 424718c0872c..a33d74bd3a4b 100644 --- a/samples/bpf/task_fd_query_user.c +++ b/samples/bpf/task_fd_query_user.c @@ -348,7 +348,7 @@ int main(int argc, char **argv) /* test two functions in the corresponding *_kern.c file */ CHECK_AND_RET(test_debug_fs_kprobe(0, "blk_mq_start_request", BPF_FD_TYPE_KPROBE)); - CHECK_AND_RET(test_debug_fs_kprobe(1, "blk_account_io_done", + CHECK_AND_RET(test_debug_fs_kprobe(1, "__blk_account_io_done", BPF_FD_TYPE_KRETPROBE)); /* test nondebug fs kprobe */ diff --git a/samples/bpf/tracex3_kern.c b/samples/bpf/tracex3_kern.c index 710a4410b2fb..bde6591cb20c 100644 --- a/samples/bpf/tracex3_kern.c +++ b/samples/bpf/tracex3_kern.c @@ -49,7 +49,7 @@ struct { __uint(max_entries, SLOTS); } lat_map SEC(".maps"); -SEC("kprobe/blk_account_io_done") +SEC("kprobe/__blk_account_io_done") int bpf_prog2(struct pt_regs *ctx) { long rq = PT_REGS_PARM1(ctx);