* [PATCH bpf RESEND] samples/bpf: Replace blk_account_io_done() with __blk_account_io_done()
@ 2022-09-09 8:04 Rong Tao
2022-09-09 16:48 ` sdf
0 siblings, 1 reply; 5+ messages in thread
From: Rong Tao @ 2022-09-09 8:04 UTC (permalink / raw)
To: bpf
Cc: Rong Tao, Rong Tao, Alexei Starovoitov, Daniel Borkmann,
Andrii Nakryiko, Martin KaFai Lau, Song Liu, Yonghong Song,
John Fastabend, KP Singh, Stanislav Fomichev, Hao Luo, Jiri Olsa,
linux-kernel
From: Rong Tao <rongtao@cestc.cn>
Since commit be6bfe36db17 ("block: inline hot paths of blk_account_io_*()")
blk_account_io_*() become inline functions.
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH bpf RESEND] samples/bpf: Replace blk_account_io_done() with __blk_account_io_done()
2022-09-09 8:04 [PATCH bpf RESEND] samples/bpf: Replace blk_account_io_done() with __blk_account_io_done() Rong Tao
@ 2022-09-09 16:48 ` sdf
2022-09-11 13:03 ` [PATCH bpf-next] " Rong Tao
0 siblings, 1 reply; 5+ messages in thread
From: sdf @ 2022-09-09 16:48 UTC (permalink / raw)
To: Rong Tao
Cc: bpf, Rong Tao, Alexei Starovoitov, Daniel Borkmann,
Andrii Nakryiko, Martin KaFai Lau, Song Liu, Yonghong Song,
John Fastabend, KP Singh, Hao Luo, Jiri Olsa, linux-kernel
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH bpf-next] samples/bpf: Replace blk_account_io_done() with __blk_account_io_done()
2022-09-09 16:48 ` sdf
@ 2022-09-11 13:03 ` Rong Tao
2022-09-20 0:12 ` Yonghong Song
2022-09-21 0:30 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 5+ messages in thread
From: Rong Tao @ 2022-09-11 13:03 UTC (permalink / raw)
To: sdf
Cc: andrii, ast, bpf, daniel, haoluo, john.fastabend, jolsa, kpsingh,
linux-kernel, martin.lau, rongtao, rtoax, song, yhs
From: Rong Tao <rongtao@cestc.cn>
Since commit be6bfe36db17 ("block: inline hot paths of blk_account_io_*()")
blk_account_io_*() become inline functions.
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH bpf-next] samples/bpf: Replace blk_account_io_done() with __blk_account_io_done()
2022-09-11 13:03 ` [PATCH bpf-next] " Rong Tao
@ 2022-09-20 0:12 ` Yonghong Song
2022-09-21 0:30 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 5+ messages in thread
From: Yonghong Song @ 2022-09-20 0:12 UTC (permalink / raw)
To: Rong Tao, sdf
Cc: andrii, ast, bpf, daniel, haoluo, john.fastabend, jolsa, kpsingh,
linux-kernel, martin.lau, rongtao, song
On 9/11/22 6:03 AM, 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.
>
> Signed-off-by: Rong Tao <rtoax@foxmail.com>
Acked-by: Yonghong Song <yhs@fb.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH bpf-next] samples/bpf: Replace blk_account_io_done() with __blk_account_io_done()
2022-09-11 13:03 ` [PATCH bpf-next] " Rong Tao
2022-09-20 0:12 ` Yonghong Song
@ 2022-09-21 0:30 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 5+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-09-21 0:30 UTC (permalink / raw)
To: Rong Tao
Cc: sdf, andrii, ast, bpf, daniel, haoluo, john.fastabend, jolsa,
kpsingh, linux-kernel, martin.lau, rongtao, song, yhs
Hello:
This patch was applied to bpf/bpf-next.git (master)
by Andrii Nakryiko <andrii@kernel.org>:
On Sun, 11 Sep 2022 21:03:30 +0800 you wrote:
> From: Rong Tao <rongtao@cestc.cn>
>
> Since commit be6bfe36db17 ("block: inline hot paths of blk_account_io_*()")
> blk_account_io_*() become inline functions.
>
> Signed-off-by: Rong Tao <rtoax@foxmail.com>
>
> [...]
Here is the summary with links:
- [bpf-next] samples/bpf: Replace blk_account_io_done() with __blk_account_io_done()
https://git.kernel.org/bpf/bpf-next/c/bc069da65eec
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-09-21 0:30 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-09 8:04 [PATCH bpf RESEND] samples/bpf: Replace blk_account_io_done() with __blk_account_io_done() Rong Tao
2022-09-09 16:48 ` sdf
2022-09-11 13:03 ` [PATCH bpf-next] " Rong Tao
2022-09-20 0:12 ` Yonghong Song
2022-09-21 0:30 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).