* [PATCH v4 0/2] Fix typos in samples/kprobes/kprobe_example.c
@ 2021-05-17 2:21 Tiezhu Yang
2021-05-17 2:21 ` [PATCH v4 1/2] samples/kprobes: Fix typo in handler_fault() Tiezhu Yang
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Tiezhu Yang @ 2021-05-17 2:21 UTC (permalink / raw)
To: Jonathan Corbet, Marc Koderer, Masami Hiramatsu,
Mauro Carvalho Chehab, Christian Brauner, Jisheng Zhang,
Mathieu Desnoyers, Ananth N Mavinakayanahalli, Andrew Morton,
Randy Dunlap, Martin Schwidefsky, Johannes Thumshirn,
Heiko Carstens, Joe Perches
Cc: linux-kernel, Xuefeng Li
Split the v3 patch [1] into two patches suggested by Masami Hiramatsu.
[1] https://lore.kernel.org/patchwork/patch/1429021/
Tiezhu Yang (2):
samples/kprobes: Fix typo in handler_fault()
samples/kprobes: Fix typo in handler_post()
samples/kprobes/kprobe_example.c | 33 +++++++++++++++++----------------
1 file changed, 17 insertions(+), 16 deletions(-)
--
2.1.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v4 1/2] samples/kprobes: Fix typo in handler_fault()
2021-05-17 2:21 [PATCH v4 0/2] Fix typos in samples/kprobes/kprobe_example.c Tiezhu Yang
@ 2021-05-17 2:21 ` Tiezhu Yang
2021-05-17 5:46 ` Masami Hiramatsu
2021-05-17 2:21 ` [PATCH v4 2/2] samples/kprobes: Fix typo in handler_post() Tiezhu Yang
2021-05-20 20:05 ` [PATCH v4 0/2] Fix typos in samples/kprobes/kprobe_example.c Jonathan Corbet
2 siblings, 1 reply; 6+ messages in thread
From: Tiezhu Yang @ 2021-05-17 2:21 UTC (permalink / raw)
To: Jonathan Corbet, Marc Koderer, Masami Hiramatsu,
Mauro Carvalho Chehab, Christian Brauner, Jisheng Zhang,
Mathieu Desnoyers, Ananth N Mavinakayanahalli, Andrew Morton,
Randy Dunlap, Martin Schwidefsky, Johannes Thumshirn,
Heiko Carstens, Joe Perches
Cc: linux-kernel, Xuefeng Li
Fix a defective format in handler_fault() ending with an 'n' that
should be '\n'.
Fixes: 804defea1c02 ("Kprobes: move kprobe examples to samples/")
Suggested-by: Joe Perches <joe@perches.com>
Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn>
---
samples/kprobes/kprobe_example.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/samples/kprobes/kprobe_example.c b/samples/kprobes/kprobe_example.c
index c495664..d77a546 100644
--- a/samples/kprobes/kprobe_example.c
+++ b/samples/kprobes/kprobe_example.c
@@ -101,7 +101,7 @@ static void __kprobes handler_post(struct kprobe *p, struct pt_regs *regs,
*/
static int handler_fault(struct kprobe *p, struct pt_regs *regs, int trapnr)
{
- pr_info("fault_handler: p->addr = 0x%p, trap #%dn", p->addr, trapnr);
+ pr_info("fault_handler: p->addr = 0x%p, trap #%d\n", p->addr, trapnr);
/* Return 0 because we don't handle the fault. */
return 0;
}
--
2.1.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v4 2/2] samples/kprobes: Fix typo in handler_post()
2021-05-17 2:21 [PATCH v4 0/2] Fix typos in samples/kprobes/kprobe_example.c Tiezhu Yang
2021-05-17 2:21 ` [PATCH v4 1/2] samples/kprobes: Fix typo in handler_fault() Tiezhu Yang
@ 2021-05-17 2:21 ` Tiezhu Yang
2021-05-17 5:46 ` Masami Hiramatsu
2021-05-20 20:05 ` [PATCH v4 0/2] Fix typos in samples/kprobes/kprobe_example.c Jonathan Corbet
2 siblings, 1 reply; 6+ messages in thread
From: Tiezhu Yang @ 2021-05-17 2:21 UTC (permalink / raw)
To: Jonathan Corbet, Marc Koderer, Masami Hiramatsu,
Mauro Carvalho Chehab, Christian Brauner, Jisheng Zhang,
Mathieu Desnoyers, Ananth N Mavinakayanahalli, Andrew Morton,
Randy Dunlap, Martin Schwidefsky, Johannes Thumshirn,
Heiko Carstens, Joe Perches
Cc: linux-kernel, Xuefeng Li
It should use post_handler instead of pre_handler in handler_post().
As Joe Perches suggested, it would be better to use pr_fmt and remove
all the embedded pre/post/fault strings. This would change the style of
the output through.
Fixes: e16c5dd5157e ("samples/kprobes: Add s390 case in kprobe example module")
Acked-by: Marc Koderer <marc@koderer.com>
Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
Suggested-by: Joe Perches <joe@perches.com>
Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn>
---
samples/kprobes/kprobe_example.c | 33 +++++++++++++++++----------------
1 file changed, 17 insertions(+), 16 deletions(-)
diff --git a/samples/kprobes/kprobe_example.c b/samples/kprobes/kprobe_example.c
index d77a546..5f1eb8b 100644
--- a/samples/kprobes/kprobe_example.c
+++ b/samples/kprobes/kprobe_example.c
@@ -10,6 +10,8 @@
* whenever kernel_clone() is invoked to create a new process.
*/
+#define pr_fmt(fmt) "%s: " fmt, __func__
+
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/kprobes.h>
@@ -27,32 +29,31 @@ static struct kprobe kp = {
static int __kprobes handler_pre(struct kprobe *p, struct pt_regs *regs)
{
#ifdef CONFIG_X86
- pr_info("<%s> pre_handler: p->addr = 0x%p, ip = %lx, flags = 0x%lx\n",
+ pr_info("<%s> p->addr = 0x%p, ip = %lx, flags = 0x%lx\n",
p->symbol_name, p->addr, regs->ip, regs->flags);
#endif
#ifdef CONFIG_PPC
- pr_info("<%s> pre_handler: p->addr = 0x%p, nip = 0x%lx, msr = 0x%lx\n",
+ pr_info("<%s> p->addr = 0x%p, nip = 0x%lx, msr = 0x%lx\n",
p->symbol_name, p->addr, regs->nip, regs->msr);
#endif
#ifdef CONFIG_MIPS
- pr_info("<%s> pre_handler: p->addr = 0x%p, epc = 0x%lx, status = 0x%lx\n",
+ pr_info("<%s> p->addr = 0x%p, epc = 0x%lx, status = 0x%lx\n",
p->symbol_name, p->addr, regs->cp0_epc, regs->cp0_status);
#endif
#ifdef CONFIG_ARM64
- pr_info("<%s> pre_handler: p->addr = 0x%p, pc = 0x%lx,"
- " pstate = 0x%lx\n",
+ pr_info("<%s> p->addr = 0x%p, pc = 0x%lx, pstate = 0x%lx\n",
p->symbol_name, p->addr, (long)regs->pc, (long)regs->pstate);
#endif
#ifdef CONFIG_ARM
- pr_info("<%s> pre_handler: p->addr = 0x%p, pc = 0x%lx, cpsr = 0x%lx\n",
+ pr_info("<%s> p->addr = 0x%p, pc = 0x%lx, cpsr = 0x%lx\n",
p->symbol_name, p->addr, (long)regs->ARM_pc, (long)regs->ARM_cpsr);
#endif
#ifdef CONFIG_RISCV
- pr_info("<%s> pre_handler: p->addr = 0x%p, pc = 0x%lx, status = 0x%lx\n",
+ pr_info("<%s> p->addr = 0x%p, pc = 0x%lx, status = 0x%lx\n",
p->symbol_name, p->addr, regs->epc, regs->status);
#endif
#ifdef CONFIG_S390
- pr_info("<%s> pre_handler: p->addr, 0x%p, ip = 0x%lx, flags = 0x%lx\n",
+ pr_info("<%s> p->addr, 0x%p, ip = 0x%lx, flags = 0x%lx\n",
p->symbol_name, p->addr, regs->psw.addr, regs->flags);
#endif
@@ -65,31 +66,31 @@ static void __kprobes handler_post(struct kprobe *p, struct pt_regs *regs,
unsigned long flags)
{
#ifdef CONFIG_X86
- pr_info("<%s> post_handler: p->addr = 0x%p, flags = 0x%lx\n",
+ pr_info("<%s> p->addr = 0x%p, flags = 0x%lx\n",
p->symbol_name, p->addr, regs->flags);
#endif
#ifdef CONFIG_PPC
- pr_info("<%s> post_handler: p->addr = 0x%p, msr = 0x%lx\n",
+ pr_info("<%s> p->addr = 0x%p, msr = 0x%lx\n",
p->symbol_name, p->addr, regs->msr);
#endif
#ifdef CONFIG_MIPS
- pr_info("<%s> post_handler: p->addr = 0x%p, status = 0x%lx\n",
+ pr_info("<%s> p->addr = 0x%p, status = 0x%lx\n",
p->symbol_name, p->addr, regs->cp0_status);
#endif
#ifdef CONFIG_ARM64
- pr_info("<%s> post_handler: p->addr = 0x%p, pstate = 0x%lx\n",
+ pr_info("<%s> p->addr = 0x%p, pstate = 0x%lx\n",
p->symbol_name, p->addr, (long)regs->pstate);
#endif
#ifdef CONFIG_ARM
- pr_info("<%s> post_handler: p->addr = 0x%p, cpsr = 0x%lx\n",
+ pr_info("<%s> p->addr = 0x%p, cpsr = 0x%lx\n",
p->symbol_name, p->addr, (long)regs->ARM_cpsr);
#endif
#ifdef CONFIG_RISCV
- pr_info("<%s> post_handler: p->addr = 0x%p, status = 0x%lx\n",
+ pr_info("<%s> p->addr = 0x%p, status = 0x%lx\n",
p->symbol_name, p->addr, regs->status);
#endif
#ifdef CONFIG_S390
- pr_info("<%s> pre_handler: p->addr, 0x%p, flags = 0x%lx\n",
+ pr_info("<%s> p->addr, 0x%p, flags = 0x%lx\n",
p->symbol_name, p->addr, regs->flags);
#endif
}
@@ -101,7 +102,7 @@ static void __kprobes handler_post(struct kprobe *p, struct pt_regs *regs,
*/
static int handler_fault(struct kprobe *p, struct pt_regs *regs, int trapnr)
{
- pr_info("fault_handler: p->addr = 0x%p, trap #%d\n", p->addr, trapnr);
+ pr_info("p->addr = 0x%p, trap #%d\n", p->addr, trapnr);
/* Return 0 because we don't handle the fault. */
return 0;
}
--
2.1.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v4 1/2] samples/kprobes: Fix typo in handler_fault()
2021-05-17 2:21 ` [PATCH v4 1/2] samples/kprobes: Fix typo in handler_fault() Tiezhu Yang
@ 2021-05-17 5:46 ` Masami Hiramatsu
0 siblings, 0 replies; 6+ messages in thread
From: Masami Hiramatsu @ 2021-05-17 5:46 UTC (permalink / raw)
To: Tiezhu Yang
Cc: Jonathan Corbet, Marc Koderer, Mauro Carvalho Chehab,
Christian Brauner, Jisheng Zhang, Mathieu Desnoyers,
Ananth N Mavinakayanahalli, Andrew Morton, Randy Dunlap,
Martin Schwidefsky, Johannes Thumshirn, Heiko Carstens,
Joe Perches, linux-kernel, Xuefeng Li
On Mon, 17 May 2021 10:21:22 +0800
Tiezhu Yang <yangtiezhu@loongson.cn> wrote:
> Fix a defective format in handler_fault() ending with an 'n' that
> should be '\n'.
>
> Fixes: 804defea1c02 ("Kprobes: move kprobe examples to samples/")
> Suggested-by: Joe Perches <joe@perches.com>
> Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn>
Looks good to me.
Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
Thank you!
> ---
> samples/kprobes/kprobe_example.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/samples/kprobes/kprobe_example.c b/samples/kprobes/kprobe_example.c
> index c495664..d77a546 100644
> --- a/samples/kprobes/kprobe_example.c
> +++ b/samples/kprobes/kprobe_example.c
> @@ -101,7 +101,7 @@ static void __kprobes handler_post(struct kprobe *p, struct pt_regs *regs,
> */
> static int handler_fault(struct kprobe *p, struct pt_regs *regs, int trapnr)
> {
> - pr_info("fault_handler: p->addr = 0x%p, trap #%dn", p->addr, trapnr);
> + pr_info("fault_handler: p->addr = 0x%p, trap #%d\n", p->addr, trapnr);
> /* Return 0 because we don't handle the fault. */
> return 0;
> }
> --
> 2.1.0
>
--
Masami Hiramatsu <mhiramat@kernel.org>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v4 2/2] samples/kprobes: Fix typo in handler_post()
2021-05-17 2:21 ` [PATCH v4 2/2] samples/kprobes: Fix typo in handler_post() Tiezhu Yang
@ 2021-05-17 5:46 ` Masami Hiramatsu
0 siblings, 0 replies; 6+ messages in thread
From: Masami Hiramatsu @ 2021-05-17 5:46 UTC (permalink / raw)
To: Tiezhu Yang
Cc: Jonathan Corbet, Marc Koderer, Mauro Carvalho Chehab,
Christian Brauner, Jisheng Zhang, Mathieu Desnoyers,
Ananth N Mavinakayanahalli, Andrew Morton, Randy Dunlap,
Martin Schwidefsky, Johannes Thumshirn, Heiko Carstens,
Joe Perches, linux-kernel, Xuefeng Li
On Mon, 17 May 2021 10:21:23 +0800
Tiezhu Yang <yangtiezhu@loongson.cn> wrote:
> It should use post_handler instead of pre_handler in handler_post().
>
> As Joe Perches suggested, it would be better to use pr_fmt and remove
> all the embedded pre/post/fault strings. This would change the style of
> the output through.
>
Looks good to me.
Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
Thank you!
> Fixes: e16c5dd5157e ("samples/kprobes: Add s390 case in kprobe example module")
> Acked-by: Marc Koderer <marc@koderer.com>
> Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
> Suggested-by: Joe Perches <joe@perches.com>
> Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn>
> ---
> samples/kprobes/kprobe_example.c | 33 +++++++++++++++++----------------
> 1 file changed, 17 insertions(+), 16 deletions(-)
>
> diff --git a/samples/kprobes/kprobe_example.c b/samples/kprobes/kprobe_example.c
> index d77a546..5f1eb8b 100644
> --- a/samples/kprobes/kprobe_example.c
> +++ b/samples/kprobes/kprobe_example.c
> @@ -10,6 +10,8 @@
> * whenever kernel_clone() is invoked to create a new process.
> */
>
> +#define pr_fmt(fmt) "%s: " fmt, __func__
> +
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/kprobes.h>
> @@ -27,32 +29,31 @@ static struct kprobe kp = {
> static int __kprobes handler_pre(struct kprobe *p, struct pt_regs *regs)
> {
> #ifdef CONFIG_X86
> - pr_info("<%s> pre_handler: p->addr = 0x%p, ip = %lx, flags = 0x%lx\n",
> + pr_info("<%s> p->addr = 0x%p, ip = %lx, flags = 0x%lx\n",
> p->symbol_name, p->addr, regs->ip, regs->flags);
> #endif
> #ifdef CONFIG_PPC
> - pr_info("<%s> pre_handler: p->addr = 0x%p, nip = 0x%lx, msr = 0x%lx\n",
> + pr_info("<%s> p->addr = 0x%p, nip = 0x%lx, msr = 0x%lx\n",
> p->symbol_name, p->addr, regs->nip, regs->msr);
> #endif
> #ifdef CONFIG_MIPS
> - pr_info("<%s> pre_handler: p->addr = 0x%p, epc = 0x%lx, status = 0x%lx\n",
> + pr_info("<%s> p->addr = 0x%p, epc = 0x%lx, status = 0x%lx\n",
> p->symbol_name, p->addr, regs->cp0_epc, regs->cp0_status);
> #endif
> #ifdef CONFIG_ARM64
> - pr_info("<%s> pre_handler: p->addr = 0x%p, pc = 0x%lx,"
> - " pstate = 0x%lx\n",
> + pr_info("<%s> p->addr = 0x%p, pc = 0x%lx, pstate = 0x%lx\n",
> p->symbol_name, p->addr, (long)regs->pc, (long)regs->pstate);
> #endif
> #ifdef CONFIG_ARM
> - pr_info("<%s> pre_handler: p->addr = 0x%p, pc = 0x%lx, cpsr = 0x%lx\n",
> + pr_info("<%s> p->addr = 0x%p, pc = 0x%lx, cpsr = 0x%lx\n",
> p->symbol_name, p->addr, (long)regs->ARM_pc, (long)regs->ARM_cpsr);
> #endif
> #ifdef CONFIG_RISCV
> - pr_info("<%s> pre_handler: p->addr = 0x%p, pc = 0x%lx, status = 0x%lx\n",
> + pr_info("<%s> p->addr = 0x%p, pc = 0x%lx, status = 0x%lx\n",
> p->symbol_name, p->addr, regs->epc, regs->status);
> #endif
> #ifdef CONFIG_S390
> - pr_info("<%s> pre_handler: p->addr, 0x%p, ip = 0x%lx, flags = 0x%lx\n",
> + pr_info("<%s> p->addr, 0x%p, ip = 0x%lx, flags = 0x%lx\n",
> p->symbol_name, p->addr, regs->psw.addr, regs->flags);
> #endif
>
> @@ -65,31 +66,31 @@ static void __kprobes handler_post(struct kprobe *p, struct pt_regs *regs,
> unsigned long flags)
> {
> #ifdef CONFIG_X86
> - pr_info("<%s> post_handler: p->addr = 0x%p, flags = 0x%lx\n",
> + pr_info("<%s> p->addr = 0x%p, flags = 0x%lx\n",
> p->symbol_name, p->addr, regs->flags);
> #endif
> #ifdef CONFIG_PPC
> - pr_info("<%s> post_handler: p->addr = 0x%p, msr = 0x%lx\n",
> + pr_info("<%s> p->addr = 0x%p, msr = 0x%lx\n",
> p->symbol_name, p->addr, regs->msr);
> #endif
> #ifdef CONFIG_MIPS
> - pr_info("<%s> post_handler: p->addr = 0x%p, status = 0x%lx\n",
> + pr_info("<%s> p->addr = 0x%p, status = 0x%lx\n",
> p->symbol_name, p->addr, regs->cp0_status);
> #endif
> #ifdef CONFIG_ARM64
> - pr_info("<%s> post_handler: p->addr = 0x%p, pstate = 0x%lx\n",
> + pr_info("<%s> p->addr = 0x%p, pstate = 0x%lx\n",
> p->symbol_name, p->addr, (long)regs->pstate);
> #endif
> #ifdef CONFIG_ARM
> - pr_info("<%s> post_handler: p->addr = 0x%p, cpsr = 0x%lx\n",
> + pr_info("<%s> p->addr = 0x%p, cpsr = 0x%lx\n",
> p->symbol_name, p->addr, (long)regs->ARM_cpsr);
> #endif
> #ifdef CONFIG_RISCV
> - pr_info("<%s> post_handler: p->addr = 0x%p, status = 0x%lx\n",
> + pr_info("<%s> p->addr = 0x%p, status = 0x%lx\n",
> p->symbol_name, p->addr, regs->status);
> #endif
> #ifdef CONFIG_S390
> - pr_info("<%s> pre_handler: p->addr, 0x%p, flags = 0x%lx\n",
> + pr_info("<%s> p->addr, 0x%p, flags = 0x%lx\n",
> p->symbol_name, p->addr, regs->flags);
> #endif
> }
> @@ -101,7 +102,7 @@ static void __kprobes handler_post(struct kprobe *p, struct pt_regs *regs,
> */
> static int handler_fault(struct kprobe *p, struct pt_regs *regs, int trapnr)
> {
> - pr_info("fault_handler: p->addr = 0x%p, trap #%d\n", p->addr, trapnr);
> + pr_info("p->addr = 0x%p, trap #%d\n", p->addr, trapnr);
> /* Return 0 because we don't handle the fault. */
> return 0;
> }
> --
> 2.1.0
>
--
Masami Hiramatsu <mhiramat@kernel.org>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v4 0/2] Fix typos in samples/kprobes/kprobe_example.c
2021-05-17 2:21 [PATCH v4 0/2] Fix typos in samples/kprobes/kprobe_example.c Tiezhu Yang
2021-05-17 2:21 ` [PATCH v4 1/2] samples/kprobes: Fix typo in handler_fault() Tiezhu Yang
2021-05-17 2:21 ` [PATCH v4 2/2] samples/kprobes: Fix typo in handler_post() Tiezhu Yang
@ 2021-05-20 20:05 ` Jonathan Corbet
2 siblings, 0 replies; 6+ messages in thread
From: Jonathan Corbet @ 2021-05-20 20:05 UTC (permalink / raw)
To: Tiezhu Yang, Marc Koderer, Masami Hiramatsu,
Mauro Carvalho Chehab, Christian Brauner, Jisheng Zhang,
Mathieu Desnoyers, Ananth N Mavinakayanahalli, Andrew Morton,
Randy Dunlap, Martin Schwidefsky, Johannes Thumshirn,
Heiko Carstens, Joe Perches
Cc: linux-kernel, Xuefeng Li
Tiezhu Yang <yangtiezhu@loongson.cn> writes:
> Split the v3 patch [1] into two patches suggested by Masami Hiramatsu.
>
> [1] https://lore.kernel.org/patchwork/patch/1429021/
>
> Tiezhu Yang (2):
> samples/kprobes: Fix typo in handler_fault()
> samples/kprobes: Fix typo in handler_post()
>
> samples/kprobes/kprobe_example.c | 33 +++++++++++++++++----------------
> 1 file changed, 17 insertions(+), 16 deletions(-)
I've applied the set, with one tweak. The first patch included this
line:
Fixes: 804defea1c02 ("Kprobes: move kprobe examples to samples/")
But that patch, as its title suggests, simply moved the code to a
different place; it didn't introduce that particular mistake. So I took
the Fixes tag out.
Thanks,
jon
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-05-20 20:05 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-17 2:21 [PATCH v4 0/2] Fix typos in samples/kprobes/kprobe_example.c Tiezhu Yang
2021-05-17 2:21 ` [PATCH v4 1/2] samples/kprobes: Fix typo in handler_fault() Tiezhu Yang
2021-05-17 5:46 ` Masami Hiramatsu
2021-05-17 2:21 ` [PATCH v4 2/2] samples/kprobes: Fix typo in handler_post() Tiezhu Yang
2021-05-17 5:46 ` Masami Hiramatsu
2021-05-20 20:05 ` [PATCH v4 0/2] Fix typos in samples/kprobes/kprobe_example.c Jonathan Corbet
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).