[PATCH] tracing/probe: fix typo in pr_fmt in trace_uprobe.c

[PATCH] tracing/probe: fix typo in pr_fmt in trace_uprobe.c

[Song Liu]

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

Re: [PATCH] tracing/probe: fix typo in pr_fmt in trace_uprobe.c

[Masami Hiramatsu]

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>

Re: [PATCH] tracing/probe: fix typo in pr_fmt in trace_uprobe.c

[Steven Rostedt]

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
> >   
> 
> 

Re: [PATCH] tracing/probe: fix typo in pr_fmt in trace_uprobe.c

[Joe Perches]

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

Re: [PATCH] tracing/probe: fix typo in pr_fmt in trace_uprobe.c

[Steven Rostedt]

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

Re: [PATCH] tracing/probe: fix typo in pr_fmt in trace_uprobe.c

[Jiri Kosina]

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

Re: [PATCH] tracing/probe: fix typo in pr_fmt in trace_uprobe.c

[Joe Perches]

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

Re: [PATCH] tracing/probe: fix typo in pr_fmt in trace_uprobe.c

[Masahiro Yamada]

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