Skip to content

Commit

Permalink
samples/bpf: Replace blk_account_io_done() with __blk_account_io_done()
Browse files Browse the repository at this point in the history
Since commit be6bfe3 ("block: inline hot paths of blk_account_io_*()")
blk_account_io_*() become inline functions.

Signed-off-by: Rong Tao <rtoax@foxmail.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Acked-by: Yonghong Song <yhs@fb.com>
Link: https://lore.kernel.org/bpf/tencent_1CC476835C219FACD84B6715F0D785517E07@qq.com
  • Loading branch information
Rtoax authored and anakryiko committed Sep 21, 2022
1 parent bfa8fe9 commit bc069da
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion samples/bpf/task_fd_query_kern.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion samples/bpf/task_fd_query_user.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion samples/bpf/tracex3_kern.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit bc069da

Please sign in to comment.