[PATCH 1/2] tracing: kprobe: fix kprobe event gen test module on exit

Yipeng Zou posted 2 patches 3 years, 6 months ago
[PATCH 1/2] tracing: kprobe: fix kprobe event gen test module on exit
Posted by Yipeng Zou 3 years, 6 months ago
Correct gen_kretprobe_test clr event para on module exit.
This will make it can't to delete.

Fixes: 64836248dda2 ("tracing: Add kprobe event command generation test module")
Signed-off-by: Yipeng Zou <zouyipeng@huawei.com>
---
 kernel/trace/kprobe_event_gen_test.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/trace/kprobe_event_gen_test.c b/kernel/trace/kprobe_event_gen_test.c
index 18b0f1cbb947..e023154be0f8 100644
--- a/kernel/trace/kprobe_event_gen_test.c
+++ b/kernel/trace/kprobe_event_gen_test.c
@@ -206,7 +206,7 @@ static void __exit kprobe_event_gen_test_exit(void)
 	WARN_ON(kprobe_event_delete("gen_kprobe_test"));
 
 	/* Disable the event or you can't remove it */
-	WARN_ON(trace_array_set_clr_event(gen_kprobe_test->tr,
+	WARN_ON(trace_array_set_clr_event(gen_kretprobe_test->tr,
 					  "kprobes",
 					  "gen_kretprobe_test", false));
 
-- 
2.17.1
Re: [PATCH 1/2] tracing: kprobe: fix kprobe event gen test module on exit
Posted by Masami Hiramatsu (Google) 3 years, 6 months ago
On Mon, 19 Sep 2022 20:56:28 +0800
Yipeng Zou <zouyipeng@huawei.com> wrote:

> Correct gen_kretprobe_test clr event para on module exit.
> This will make it can't to delete.

Looks good to me. (actually, both tests will use the same root
trace_array, so the test itself will not fail, but this should
be fixed.)

Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>

Thanks!

> 
> Fixes: 64836248dda2 ("tracing: Add kprobe event command generation test module")
> Signed-off-by: Yipeng Zou <zouyipeng@huawei.com>
> ---
>  kernel/trace/kprobe_event_gen_test.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/kernel/trace/kprobe_event_gen_test.c b/kernel/trace/kprobe_event_gen_test.c
> index 18b0f1cbb947..e023154be0f8 100644
> --- a/kernel/trace/kprobe_event_gen_test.c
> +++ b/kernel/trace/kprobe_event_gen_test.c
> @@ -206,7 +206,7 @@ static void __exit kprobe_event_gen_test_exit(void)
>  	WARN_ON(kprobe_event_delete("gen_kprobe_test"));
>  
>  	/* Disable the event or you can't remove it */
> -	WARN_ON(trace_array_set_clr_event(gen_kprobe_test->tr,
> +	WARN_ON(trace_array_set_clr_event(gen_kretprobe_test->tr,
>  					  "kprobes",
>  					  "gen_kretprobe_test", false));
>  
> -- 
> 2.17.1
> 


-- 
Masami Hiramatsu (Google) <mhiramat@kernel.org>