* [PATCH] tracing/probe: fix typo in pr_fmt in trace_uprobe.c
@ 2017-11-13 22:02 Song Liu
2017-11-14 13:58 ` Masami Hiramatsu
0 siblings, 1 reply; 8+ messages in thread
From: Song Liu @ 2017-11-13 22:02 UTC (permalink / raw)
To: linux-kernel; +Cc: kernel-team, Song Liu, Masami Hiramatsu, Steven Rostedt
pr_fmt in trace_uprobe.c should say "trace_uprobe" instead of
"trace_kprobe".
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Song Liu <songliubraving@fb.com>
---
kernel/trace/trace_uprobe.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
index 4525e02..5d5d848 100644
--- a/kernel/trace/trace_uprobe.c
+++ b/kernel/trace/trace_uprobe.c
@@ -17,7 +17,7 @@
* Copyright (C) IBM Corporation, 2010-2012
* Author: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
*/
-#define pr_fmt(fmt) "trace_kprobe: " fmt
+#define pr_fmt(fmt) "trace_uprobe: " fmt
#include <linux/module.h>
#include <linux/uaccess.h>
--
2.9.5
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] tracing/probe: fix typo in pr_fmt in trace_uprobe.c
2017-11-13 22:02 [PATCH] tracing/probe: fix typo in pr_fmt in trace_uprobe.c Song Liu
@ 2017-11-14 13:58 ` Masami Hiramatsu
2017-11-15 18:14 ` Steven Rostedt
0 siblings, 1 reply; 8+ messages in thread
From: Masami Hiramatsu @ 2017-11-14 13:58 UTC (permalink / raw)
To: Song Liu; +Cc: linux-kernel, kernel-team, Masami Hiramatsu, Steven Rostedt
On Mon, 13 Nov 2017 14:02:46 -0800
Song Liu <songliubraving@fb.com> wrote:
> pr_fmt in trace_uprobe.c should say "trace_uprobe" instead of
> "trace_kprobe".
Oh, good catch!
Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
Thank you!
>
> Cc: Masami Hiramatsu <mhiramat@kernel.org>
> Cc: Steven Rostedt <rostedt@goodmis.org>
> Signed-off-by: Song Liu <songliubraving@fb.com>
> ---
> kernel/trace/trace_uprobe.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
> index 4525e02..5d5d848 100644
> --- a/kernel/trace/trace_uprobe.c
> +++ b/kernel/trace/trace_uprobe.c
> @@ -17,7 +17,7 @@
> * Copyright (C) IBM Corporation, 2010-2012
> * Author: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
> */
> -#define pr_fmt(fmt) "trace_kprobe: " fmt
> +#define pr_fmt(fmt) "trace_uprobe: " fmt
>
> #include <linux/module.h>
> #include <linux/uaccess.h>
> --
> 2.9.5
>
--
Masami Hiramatsu <mhiramat@kernel.org>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] tracing/probe: fix typo in pr_fmt in trace_uprobe.c
2017-11-14 13:58 ` Masami Hiramatsu
@ 2017-11-15 18:14 ` Steven Rostedt
2017-11-15 22:55 ` Joe Perches
2017-11-16 13:21 ` Jiri Kosina
0 siblings, 2 replies; 8+ messages in thread
From: Steven Rostedt @ 2017-11-15 18:14 UTC (permalink / raw)
To: Masami Hiramatsu, Jiri Kosina
Cc: Song Liu, linux-kernel, kernel-team, trivial
On Tue, 14 Nov 2017 22:58:31 +0900
Masami Hiramatsu <mhiramat@kernel.org> wrote:
> On Mon, 13 Nov 2017 14:02:46 -0800
> Song Liu <songliubraving@fb.com> wrote:
>
> > pr_fmt in trace_uprobe.c should say "trace_uprobe" instead of
> > "trace_kprobe".
>
> Oh, good catch!
>
> Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
>
Thanks.
Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Jiri, can you take this in your tree?
-- Steve
> Thank you!
>
>
> >
> > Cc: Masami Hiramatsu <mhiramat@kernel.org>
> > Cc: Steven Rostedt <rostedt@goodmis.org>
> > Signed-off-by: Song Liu <songliubraving@fb.com>
> > ---
> > kernel/trace/trace_uprobe.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
> > index 4525e02..5d5d848 100644
> > --- a/kernel/trace/trace_uprobe.c
> > +++ b/kernel/trace/trace_uprobe.c
> > @@ -17,7 +17,7 @@
> > * Copyright (C) IBM Corporation, 2010-2012
> > * Author: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
> > */
> > -#define pr_fmt(fmt) "trace_kprobe: " fmt
> > +#define pr_fmt(fmt) "trace_uprobe: " fmt
> >
> > #include <linux/module.h>
> > #include <linux/uaccess.h>
> > --
> > 2.9.5
> >
>
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] tracing/probe: fix typo in pr_fmt in trace_uprobe.c
2017-11-15 18:14 ` Steven Rostedt
@ 2017-11-15 22:55 ` Joe Perches
2017-11-16 2:55 ` Steven Rostedt
2017-11-16 13:21 ` Jiri Kosina
1 sibling, 1 reply; 8+ messages in thread
From: Joe Perches @ 2017-11-15 22:55 UTC (permalink / raw)
To: Steven Rostedt, Masami Hiramatsu, Jiri Kosina
Cc: Song Liu, linux-kernel, kernel-team, trivial
On Wed, 2017-11-15 at 13:14 -0500, Steven Rostedt wrote:
> On Tue, 14 Nov 2017 22:58:31 +0900 Masami Hiramatsu <mhiramat@kernel.org> wrote:
> > On Mon, 13 Nov 2017 14:02:46 -0800 Song Liu <songliubraving@fb.com> wrote:
> > > pr_fmt in trace_uprobe.c should say "trace_uprobe" instead of
> > > "trace_kprobe".
> > Oh, good catch!
> > Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
> Thanks.
> Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
> Jiri, can you take this in your tree?
>
[]
> > > diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
[]
> > > @@ -17,7 +17,7 @@
> > > * Copyright (C) IBM Corporation, 2010-2012
> > > * Author: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
> > > */
> > > -#define pr_fmt(fmt) "trace_kprobe: " fmt
> > > +#define pr_fmt(fmt) "trace_uprobe: " fmt
Maybe use the much more common below instead?
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] tracing/probe: fix typo in pr_fmt in trace_uprobe.c
2017-11-15 22:55 ` Joe Perches
@ 2017-11-16 2:55 ` Steven Rostedt
2017-11-16 17:05 ` Joe Perches
0 siblings, 1 reply; 8+ messages in thread
From: Steven Rostedt @ 2017-11-16 2:55 UTC (permalink / raw)
To: Joe Perches
Cc: Masami Hiramatsu, Jiri Kosina, Song Liu, linux-kernel,
kernel-team, trivial
On Wed, 15 Nov 2017 14:55:19 -0800
Joe Perches <joe@perches.com> wrote:
> Maybe use the much more common below instead?
>
> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
Is there someplace this is documented. My git grep foo isn't finding it
for me.
-- Steve
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] tracing/probe: fix typo in pr_fmt in trace_uprobe.c
2017-11-16 2:55 ` Steven Rostedt
@ 2017-11-16 17:05 ` Joe Perches
2017-12-06 11:00 ` Masahiro Yamada
0 siblings, 1 reply; 8+ messages in thread
From: Joe Perches @ 2017-11-16 17:05 UTC (permalink / raw)
To: Steven Rostedt, Michal Marek, Masahiro Yamada
Cc: Masami Hiramatsu, Jiri Kosina, Song Liu, linux-kernel,
kernel-team, trivial
On Wed, 2017-11-15 at 21:55 -0500, Steven Rostedt wrote:
> On Wed, 15 Nov 2017 14:55:19 -0800
> Joe Perches <joe@perches.com> wrote:
>
> > Maybe use the much more common below instead?
> >
> > #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>
> Is there someplace this is documented. My git grep foo isn't finding it
> for me.
Not so far as I know.
Maybe Michal Marek or Masahiro Yamada might add some
documentation in the future about these KBUILD defines.
btw, there are about 1800 #define pr_fmt uses and most
of them use KBUILD_MODNAME
$ git grep -P "^\s*#\s*define\s+pr_fmt\b" | \
cut -f2- -d":" | \
sed -r 's/^\s*#\s*define\s+pr_fmt([^ ]+)\s++/#define pr_fmt\1 /' | \
sed -r 's/\)\s+/) /' | sort | uniq -c | sort -rn | head -10
1166 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
134 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
32 #define pr_fmt(fmt) "%s: " fmt, __func__
22 #define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
17 #define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__
13 #define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt
11 #define pr_fmt(fmt) "arcnet:" KBUILD_MODNAME ": " fmt
10 #define pr_fmt(fmt) KBUILD_MODNAME ": %s: " fmt, __func__
10 #define pr_fmt(fmt) "IPv6: " fmt
9 #define pr_fmt(fmt) fmt
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH] tracing/probe: fix typo in pr_fmt in trace_uprobe.c
2017-11-16 17:05 ` Joe Perches
@ 2017-12-06 11:00 ` Masahiro Yamada
0 siblings, 0 replies; 8+ messages in thread
From: Masahiro Yamada @ 2017-12-06 11:00 UTC (permalink / raw)
To: Joe Perches
Cc: Steven Rostedt, Michal Marek, Masami Hiramatsu, Jiri Kosina,
Song Liu, Linux Kernel Mailing List, kernel-team, Jiri Kosina
2017-11-17 2:05 GMT+09:00 Joe Perches <joe@perches.com>:
> On Wed, 2017-11-15 at 21:55 -0500, Steven Rostedt wrote:
>> On Wed, 15 Nov 2017 14:55:19 -0800
>> Joe Perches <joe@perches.com> wrote:
>>
>> > Maybe use the much more common below instead?
>> >
>> > #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>>
>> Is there someplace this is documented. My git grep foo isn't finding it
>> for me.
>
> Not so far as I know.
>
> Maybe Michal Marek or Masahiro Yamada might add some
> documentation in the future about these KBUILD defines.
>
> btw, there are about 1800 #define pr_fmt uses and most
> of them use KBUILD_MODNAME
>
> $ git grep -P "^\s*#\s*define\s+pr_fmt\b" | \
> cut -f2- -d":" | \
> sed -r 's/^\s*#\s*define\s+pr_fmt([^ ]+)\s++/#define pr_fmt\1 /' | \
> sed -r 's/\)\s+/) /' | sort | uniq -c | sort -rn | head -10
> 1166 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> 134 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> 32 #define pr_fmt(fmt) "%s: " fmt, __func__
> 22 #define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
> 17 #define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__
> 13 #define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt
> 11 #define pr_fmt(fmt) "arcnet:" KBUILD_MODNAME ": " fmt
> 10 #define pr_fmt(fmt) KBUILD_MODNAME ": %s: " fmt, __func__
> 10 #define pr_fmt(fmt) "IPv6: " fmt
> 9 #define pr_fmt(fmt) fmt
>
Slightly related topic.
Does KBUILD_MODNAME need to be correct,
or defined all the time?
One object could be shared among multiple modules, like follows:
obj-m += foo.o
obj-m += bar.o
foo-objs := foo-bar-common.o foo-main.o
bar-objs := foo-bar-common.o bar-main.o
In this case, it is debatable
what we should define for KBUILD_MODNAME
when compiling foo-bar-common.o
[1] -DKBUILD_MODNAME='"foo-bar-common"'
(define base name of object name)
[2] -DKBUILD_MODNAME='"foo:bar"'
(define colon separated module names)
[3] Do not define KBUILD_MODNAME at all
or any other idea?
[3] is the current behavior of Kbuild.
If KBUILD_MODNAME is referenced, it is a build error.
One object is shared among multiple modules,
for example:
lib/zstd/Makefile
drivers/mtd/tests/Makefile
drivers/net/ethernet/cavium/liquidio/Makefile
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] tracing/probe: fix typo in pr_fmt in trace_uprobe.c
2017-11-15 18:14 ` Steven Rostedt
2017-11-15 22:55 ` Joe Perches
@ 2017-11-16 13:21 ` Jiri Kosina
1 sibling, 0 replies; 8+ messages in thread
From: Jiri Kosina @ 2017-11-16 13:21 UTC (permalink / raw)
To: Steven Rostedt; +Cc: Masami Hiramatsu, Song Liu, linux-kernel, kernel-team
On Wed, 15 Nov 2017, Steven Rostedt wrote:
> On Tue, 14 Nov 2017 22:58:31 +0900
> Masami Hiramatsu <mhiramat@kernel.org> wrote:
>
> > On Mon, 13 Nov 2017 14:02:46 -0800
> > Song Liu <songliubraving@fb.com> wrote:
> >
> > > pr_fmt in trace_uprobe.c should say "trace_uprobe" instead of
> > > "trace_kprobe".
> >
> > Oh, good catch!
> >
> > Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
> >
>
> Thanks.
>
> Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
>
> Jiri, can you take this in your tree?
Yup, no problem; will add it to queue once merge window is over.
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2017-12-06 11:01 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-13 22:02 [PATCH] tracing/probe: fix typo in pr_fmt in trace_uprobe.c Song Liu
2017-11-14 13:58 ` Masami Hiramatsu
2017-11-15 18:14 ` Steven Rostedt
2017-11-15 22:55 ` Joe Perches
2017-11-16 2:55 ` Steven Rostedt
2017-11-16 17:05 ` Joe Perches
2017-12-06 11:00 ` Masahiro Yamada
2017-11-16 13:21 ` Jiri Kosina
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome