[PATCH] kexec: Add prefix "kexec" to output message

[PATCH] kexec: Add prefix "kexec" to output message

[Minfei Huang]

kexec output message misses the prefix "kexec", when Dave Young split
the kexec code. To keep the same format, add the prefix "kexec" to
output message.

Following is the format of output message now.
[  140.290795] SYSC_kexec_load: hello, world

Ideally, the format of output message likes below.
[  140.291534] kexec: sanity_check_segment_list: hello, world

Signed-off-by: Minfei Huang <mnfhuang@gmail.com>
---
 kernel/kexec.c      | 2 ++
 kernel/kexec_file.c | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/kernel/kexec.c b/kernel/kexec.c
index 4c5edc3..15351ba 100644
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -6,6 +6,8 @@
  * Version 2.  See the file COPYING for more details.
  */
 
+#define pr_fmt(fmt)	"kexec: " fmt
+
 #include <linux/capability.h>
 #include <linux/mm.h>
 #include <linux/file.h>
diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c
index 6a9a3f2..b1ad01b 100644
--- a/kernel/kexec_file.c
+++ b/kernel/kexec_file.c
@@ -9,6 +9,8 @@
  * Version 2.  See the file COPYING for more details.
  */
 
+#define pr_fmt(fmt)	"kexec: " fmt
+
 #include <linux/capability.h>
 #include <linux/mm.h>
 #include <linux/file.h>
-- 
2.4.0

Re: [PATCH] kexec: Add prefix "kexec" to output message

[Eric W. Biederman]

Minfei Huang <mnfhuang@gmail.com> writes:

> kexec output message misses the prefix "kexec", when Dave Young split
> the kexec code. To keep the same format, add the prefix "kexec" to
> output message.

What of kexec_core? What of the messages that already have a prefix?

Eric

> Following is the format of output message now.
> [  140.290795] SYSC_kexec_load: hello, world
>
> Ideally, the format of output message likes below.
> [  140.291534] kexec: sanity_check_segment_list: hello, world
>
> Signed-off-by: Minfei Huang <mnfhuang@gmail.com>
> ---
>  kernel/kexec.c      | 2 ++
>  kernel/kexec_file.c | 2 ++
>  2 files changed, 4 insertions(+)
>
> diff --git a/kernel/kexec.c b/kernel/kexec.c
> index 4c5edc3..15351ba 100644
> --- a/kernel/kexec.c
> +++ b/kernel/kexec.c
> @@ -6,6 +6,8 @@
>   * Version 2.  See the file COPYING for more details.
>   */
>  
> +#define pr_fmt(fmt)	"kexec: " fmt
> +
>  #include <linux/capability.h>
>  #include <linux/mm.h>
>  #include <linux/file.h>
> diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c
> index 6a9a3f2..b1ad01b 100644
> --- a/kernel/kexec_file.c
> +++ b/kernel/kexec_file.c
> @@ -9,6 +9,8 @@
>   * Version 2.  See the file COPYING for more details.
>   */
>  
> +#define pr_fmt(fmt)	"kexec: " fmt
> +
>  #include <linux/capability.h>
>  #include <linux/mm.h>
>  #include <linux/file.h>

Re: [PATCH] kexec: Add prefix "kexec" to output message

[Minfei Huang]

On 09/13/15 at 11:52am, Eric W. Biederman wrote:
> Minfei Huang <mnfhuang@gmail.com> writes:
> 
> > kexec output message misses the prefix "kexec", when Dave Young split
> > the kexec code. To keep the same format, add the prefix "kexec" to
> > output message.
> 
> What of kexec_core? What of the messages that already have a prefix?
> 

Hi, Eric.

Last commit(2965fa), Dave Young (dyoung@redhatcom) split the previous
kernel/kexec.c into three pieces(kexec_core.c, kexec_file.c, kexec.c).
The common functions used by both kexec and kexec_file are placed in
file kernel/kexec_core.c.

The format of the output message likes "kexec: SYSC_kexec_load: hello,
world" previously. Due to the missing prefix "kexec", now it like
"SYSC_kexec_load: hello, world".

Dave Young misses the Macro pr_fmt to define the prefix output message
in file kexec.c and kexec_file.c. I think the previous Macro was moved
into the file kexec_core.c when Dave did the splitting.

Thanks
Minfei

> > Following is the format of output message now.
> > [  140.290795] SYSC_kexec_load: hello, world
> >
> > Ideally, the format of output message likes below.
> > [  140.291534] kexec: sanity_check_segment_list: hello, world
> >
> > Signed-off-by: Minfei Huang <mnfhuang@gmail.com>
> > ---
> >  kernel/kexec.c      | 2 ++
> >  kernel/kexec_file.c | 2 ++
> >  2 files changed, 4 insertions(+)
> >
> > diff --git a/kernel/kexec.c b/kernel/kexec.c
> > index 4c5edc3..15351ba 100644
> > --- a/kernel/kexec.c
> > +++ b/kernel/kexec.c
> > @@ -6,6 +6,8 @@
> >   * Version 2.  See the file COPYING for more details.
> >   */
> >  
> > +#define pr_fmt(fmt)	"kexec: " fmt
> > +
> >  #include <linux/capability.h>
> >  #include <linux/mm.h>
> >  #include <linux/file.h>
> > diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c
> > index 6a9a3f2..b1ad01b 100644
> > --- a/kernel/kexec_file.c
> > +++ b/kernel/kexec_file.c
> > @@ -9,6 +9,8 @@
> >   * Version 2.  See the file COPYING for more details.
> >   */
> >  
> > +#define pr_fmt(fmt)	"kexec: " fmt
> > +
> >  #include <linux/capability.h>
> >  #include <linux/mm.h>
> >  #include <linux/file.h>

Re: [PATCH] kexec: Add prefix "kexec" to output message

[Dave Young]

On 09/14/15 at 03:50pm, Minfei Huang wrote:
> On 09/13/15 at 11:52am, Eric W. Biederman wrote:
> > Minfei Huang <mnfhuang@gmail.com> writes:
> > 
> > > kexec output message misses the prefix "kexec", when Dave Young split
> > > the kexec code. To keep the same format, add the prefix "kexec" to
> > > output message.
> > 
> > What of kexec_core? What of the messages that already have a prefix?
> > 
> 
> Hi, Eric.
> 
> Last commit(2965fa), Dave Young (dyoung@redhatcom) split the previous
> kernel/kexec.c into three pieces(kexec_core.c, kexec_file.c, kexec.c).
> The common functions used by both kexec and kexec_file are placed in
> file kernel/kexec_core.c.
> 
> The format of the output message likes "kexec: SYSC_kexec_load: hello,
> world" previously. Due to the missing prefix "kexec", now it like
> "SYSC_kexec_load: hello, world".
> 
> Dave Young misses the Macro pr_fmt to define the prefix output message
> in file kexec.c and kexec_file.c. I think the previous Macro was moved
> into the file kexec_core.c when Dave did the splitting.

I'm not sure it is proper to add prefix "kexec: " in all kexec*.c, so
only keep it in kexec_core.c.

There's already printks with prefix like "Kexec:", "crashkernel:" and
other strings. Adding another prefix before them looks odd. So either remove 
the prefix in kexec_core, or remove other prefixes already exists in kexec*.c
I would prefix to remove the "kexec:" prefix in kexec_core.c

> 
> Thanks
> Minfei
> 
> > > Following is the format of output message now.
> > > [  140.290795] SYSC_kexec_load: hello, world
> > >
> > > Ideally, the format of output message likes below.
> > > [  140.291534] kexec: sanity_check_segment_list: hello, world
> > >
> > > Signed-off-by: Minfei Huang <mnfhuang@gmail.com>
> > > ---
> > >  kernel/kexec.c      | 2 ++
> > >  kernel/kexec_file.c | 2 ++
> > >  2 files changed, 4 insertions(+)
> > >
> > > diff --git a/kernel/kexec.c b/kernel/kexec.c
> > > index 4c5edc3..15351ba 100644
> > > --- a/kernel/kexec.c
> > > +++ b/kernel/kexec.c
> > > @@ -6,6 +6,8 @@
> > >   * Version 2.  See the file COPYING for more details.
> > >   */
> > >  
> > > +#define pr_fmt(fmt)	"kexec: " fmt
> > > +
> > >  #include <linux/capability.h>
> > >  #include <linux/mm.h>
> > >  #include <linux/file.h>
> > > diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c
> > > index 6a9a3f2..b1ad01b 100644
> > > --- a/kernel/kexec_file.c
> > > +++ b/kernel/kexec_file.c
> > > @@ -9,6 +9,8 @@
> > >   * Version 2.  See the file COPYING for more details.
> > >   */
> > >  
> > > +#define pr_fmt(fmt)	"kexec: " fmt
> > > +
> > >  #include <linux/capability.h>
> > >  #include <linux/mm.h>
> > >  #include <linux/file.h>

Re: [PATCH] kexec: Add prefix "kexec" to output message

[Minfei Huang]

On 09/14/15 at 04:44pm, Dave Young wrote:
> On 09/14/15 at 03:50pm, Minfei Huang wrote:
> > On 09/13/15 at 11:52am, Eric W. Biederman wrote:
> > > Minfei Huang <mnfhuang@gmail.com> writes:
> > > 
> > > > kexec output message misses the prefix "kexec", when Dave Young split
> > > > the kexec code. To keep the same format, add the prefix "kexec" to
> > > > output message.
> > > 
> > > What of kexec_core? What of the messages that already have a prefix?
> > > 
> > 
> > Hi, Eric.
> > 
> > Last commit(2965fa), Dave Young (dyoung@redhatcom) split the previous
> > kernel/kexec.c into three pieces(kexec_core.c, kexec_file.c, kexec.c).
> > The common functions used by both kexec and kexec_file are placed in
> > file kernel/kexec_core.c.
> > 
> > The format of the output message likes "kexec: SYSC_kexec_load: hello,
> > world" previously. Due to the missing prefix "kexec", now it like
> > "SYSC_kexec_load: hello, world".
> > 
> > Dave Young misses the Macro pr_fmt to define the prefix output message
> > in file kexec.c and kexec_file.c. I think the previous Macro was moved
> > into the file kexec_core.c when Dave did the splitting.
> 
> I'm not sure it is proper to add prefix "kexec: " in all kexec*.c, so
> only keep it in kexec_core.c.
> 
> There's already printks with prefix like "Kexec:", "crashkernel:" and
> other strings. Adding another prefix before them looks odd. So either remove 
> the prefix in kexec_core, or remove other prefixes already exists in kexec*.c
> I would prefix to remove the "kexec:" prefix in kexec_core.c

Hi, Dave.

How about removing all of the prefix "crashkernel" in kexec_core. Thus
we can be consistent with the output message prefix "kexec".

Thanks
Minfei

Re: [PATCH] kexec: Add prefix "kexec" to output message

[Minfei Huang]

On 09/15/15 at 11:08am, Minfei Huang wrote:
> On 09/14/15 at 04:44pm, Dave Young wrote:
> > On 09/14/15 at 03:50pm, Minfei Huang wrote:
> > > On 09/13/15 at 11:52am, Eric W. Biederman wrote:
> > > > Minfei Huang <mnfhuang@gmail.com> writes:
> > > > 
> > > > > kexec output message misses the prefix "kexec", when Dave Young split
> > > > > the kexec code. To keep the same format, add the prefix "kexec" to
> > > > > output message.
> > > > 
> > > > What of kexec_core? What of the messages that already have a prefix?
> > > > 
> > > 
> > > Hi, Eric.
> > > 
> > > Last commit(2965fa), Dave Young (dyoung@redhatcom) split the previous
> > > kernel/kexec.c into three pieces(kexec_core.c, kexec_file.c, kexec.c).
> > > The common functions used by both kexec and kexec_file are placed in
> > > file kernel/kexec_core.c.
> > > 
> > > The format of the output message likes "kexec: SYSC_kexec_load: hello,
> > > world" previously. Due to the missing prefix "kexec", now it like
> > > "SYSC_kexec_load: hello, world".
> > > 
> > > Dave Young misses the Macro pr_fmt to define the prefix output message
> > > in file kexec.c and kexec_file.c. I think the previous Macro was moved
> > > into the file kexec_core.c when Dave did the splitting.
> > 
> > I'm not sure it is proper to add prefix "kexec: " in all kexec*.c, so
> > only keep it in kexec_core.c.
> > 
> > There's already printks with prefix like "Kexec:", "crashkernel:" and
> > other strings. Adding another prefix before them looks odd. So either remove 
> > the prefix in kexec_core, or remove other prefixes already exists in kexec*.c
> > I would prefix to remove the "kexec:" prefix in kexec_core.c
> 
> Hi, Dave.
> 
> How about removing all of the prefix "crashkernel" in kexec_core. Thus
> we can be consistent with the output message prefix "kexec".

Ping, any comment is appreciate and helpful.

Thanks
Minfei

Re: [PATCH] kexec: Add prefix "kexec" to output message

[Dave Young]

On 09/23/15 at 12:07am, Minfei Huang wrote:
> On 09/15/15 at 11:08am, Minfei Huang wrote:
> > On 09/14/15 at 04:44pm, Dave Young wrote:
> > > On 09/14/15 at 03:50pm, Minfei Huang wrote:
> > > > On 09/13/15 at 11:52am, Eric W. Biederman wrote:
> > > > > Minfei Huang <mnfhuang@gmail.com> writes:
> > > > > 
> > > > > > kexec output message misses the prefix "kexec", when Dave Young split
> > > > > > the kexec code. To keep the same format, add the prefix "kexec" to
> > > > > > output message.
> > > > > 
> > > > > What of kexec_core? What of the messages that already have a prefix?
> > > > > 
> > > > 
> > > > Hi, Eric.
> > > > 
> > > > Last commit(2965fa), Dave Young (dyoung@redhatcom) split the previous
> > > > kernel/kexec.c into three pieces(kexec_core.c, kexec_file.c, kexec.c).
> > > > The common functions used by both kexec and kexec_file are placed in
> > > > file kernel/kexec_core.c.
> > > > 
> > > > The format of the output message likes "kexec: SYSC_kexec_load: hello,
> > > > world" previously. Due to the missing prefix "kexec", now it like
> > > > "SYSC_kexec_load: hello, world".
> > > > 
> > > > Dave Young misses the Macro pr_fmt to define the prefix output message
> > > > in file kexec.c and kexec_file.c. I think the previous Macro was moved
> > > > into the file kexec_core.c when Dave did the splitting.
> > > 
> > > I'm not sure it is proper to add prefix "kexec: " in all kexec*.c, so
> > > only keep it in kexec_core.c.
> > > 
> > > There's already printks with prefix like "Kexec:", "crashkernel:" and
> > > other strings. Adding another prefix before them looks odd. So either remove 
> > > the prefix in kexec_core, or remove other prefixes already exists in kexec*.c
> > > I would prefix to remove the "kexec:" prefix in kexec_core.c
> > 
> > Hi, Dave.
> > 
> > How about removing all of the prefix "crashkernel" in kexec_core. Thus
> > we can be consistent with the output message prefix "kexec".
> 
> Ping, any comment is appreciate and helpful.

Remove "crashkernel" sounds not a proper way, it indicates crashkernel parsing
messages. I have no idea what is the best way but below modification sounds better to me:

kexec_core.c:

#define pr_fmt(fmt)        "[kexec_core] " fmt
Also remove below prefix "Kexec:"
pr_warn("Kexec: Memory allocation for saving cpu register states failed\n"); 

kexec.c:
#define pr_fmt(fmt)        "[kexec] " fmt

kexec_file.c:
#define pr_fmt(fmt)        "[kexec_file] " fmt

Thanks
Dave

Re: [PATCH] kexec: Add prefix "kexec" to output message

[Baoquan He]

On 09/23/15 at 09:37am, Dave Young wrote:
> > > Hi, Dave.
> > > 
> > > How about removing all of the prefix "crashkernel" in kexec_core. Thus
> > > we can be consistent with the output message prefix "kexec".
> > 
> > Ping, any comment is appreciate and helpful.
> 
> Remove "crashkernel" sounds not a proper way, it indicates crashkernel parsing
> messages. I have no idea what is the best way but below modification sounds better to me:
> 
> kexec_core.c:
> 
> #define pr_fmt(fmt)        "[kexec_core] " fmt
> Also remove below prefix "Kexec:"
> pr_warn("Kexec: Memory allocation for saving cpu register states failed\n"); 
> 
> kexec.c:
> #define pr_fmt(fmt)        "[kexec] " fmt
> 
> kexec_file.c:
> #define pr_fmt(fmt)        "[kexec_file] " fmt

This is weird, user really don't need to know each file. I saw you added
a new file kexec_internal.h and all three files includes it. Why not doing
it there to make it the same as before?

> 
> Thanks
> Dave
> 
> _______________________________________________
> kexec mailing list
> kexec@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/kexec

Re: [PATCH] kexec: Add prefix "kexec" to output message

[Minfei Huang]

On 09/23/15 at 10:49am, Baoquan He wrote:
> On 09/23/15 at 09:37am, Dave Young wrote:
> > > > Hi, Dave.
> > > > 
> > > > How about removing all of the prefix "crashkernel" in kexec_core. Thus
> > > > we can be consistent with the output message prefix "kexec".
> > > 
> > > Ping, any comment is appreciate and helpful.
> > 
> > Remove "crashkernel" sounds not a proper way, it indicates crashkernel parsing
> > messages. I have no idea what is the best way but below modification sounds better to me:
> > 
> > kexec_core.c:
> > 
> > #define pr_fmt(fmt)        "[kexec_core] " fmt
> > Also remove below prefix "Kexec:"
> > pr_warn("Kexec: Memory allocation for saving cpu register states failed\n"); 
> > 
> > kexec.c:
> > #define pr_fmt(fmt)        "[kexec] " fmt
> > 
> > kexec_file.c:
> > #define pr_fmt(fmt)        "[kexec_file] " fmt
> 
> This is weird, user really don't need to know each file. I saw you added
> a new file kexec_internal.h and all three files includes it. Why not doing
> it there to make it the same as before?

The output message format is incorrect, if other *.c (except for kexec*)
include the kexec_internal.h.

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

How about defining the format like above in each *.c?

Thanks
Minfei

Re: [PATCH] kexec: Add prefix "kexec" to output message

[Baoquan He]

On 09/23/15 at 01:14pm, Minfei Huang wrote:
> On 09/23/15 at 10:49am, Baoquan He wrote:
> > This is weird, user really don't need to know each file. I saw you added
> > a new file kexec_internal.h and all three files includes it. Why not doing
> > it there to make it the same as before?
> 
> The output message format is incorrect, if other *.c (except for kexec*)
> include the kexec_internal.h.

No, I assume Dave added kexec_internal.h not to be used by other *.c.
It should be only used by kexec*.c

> 
> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> 
> How about defining the format like above in each *.c?
> 
> Thanks
> Minfei

Re: [PATCH] kexec: Add prefix "kexec" to output message

[Minfei Huang]

On 09/23/15 at 01:26pm, Baoquan He wrote:
> On 09/23/15 at 01:14pm, Minfei Huang wrote:
> > On 09/23/15 at 10:49am, Baoquan He wrote:
> > > This is weird, user really don't need to know each file. I saw you added
> > > a new file kexec_internal.h and all three files includes it. Why not doing
> > > it there to make it the same as before?
> > 
> > The output message format is incorrect, if other *.c (except for kexec*)
> > include the kexec_internal.h.
> 
> No, I assume Dave added kexec_internal.h not to be used by other *.c.
> It should be only used by kexec*.c
> 
> > 
> > #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> > 
> > How about defining the format like above in each *.c?

Ok. I can split this patch as two patches One for cleanup, other to fix
the prefix issue.

Thanks
Minfei

Re: [PATCH] kexec: Add prefix "kexec" to output message

[Dave Young]

On 09/23/15 at 10:49am, Baoquan He wrote:
> On 09/23/15 at 09:37am, Dave Young wrote:
> > > > Hi, Dave.
> > > > 
> > > > How about removing all of the prefix "crashkernel" in kexec_core. Thus
> > > > we can be consistent with the output message prefix "kexec".
> > > 
> > > Ping, any comment is appreciate and helpful.
> > 
> > Remove "crashkernel" sounds not a proper way, it indicates crashkernel parsing
> > messages. I have no idea what is the best way but below modification sounds better to me:
> > 
> > kexec_core.c:
> > 
> > #define pr_fmt(fmt)        "[kexec_core] " fmt
> > Also remove below prefix "Kexec:"
> > pr_warn("Kexec: Memory allocation for saving cpu register states failed\n"); 
> > 
> > kexec.c:
> > #define pr_fmt(fmt)        "[kexec] " fmt
> > 
> > kexec_file.c:
> > #define pr_fmt(fmt)        "[kexec_file] " fmt
> 
> This is weird, user really don't need to know each file. I saw you added
> a new file kexec_internal.h and all three files includes it. Why not doing
> it there to make it the same as before?

I personally do not like add these prefix to a header file. One prefix for
a c file is better to me.

But rethinking about the prefix, looks like there's a lot of other components
using ":" so KBUILD_MODNAME ": "  should be fine.

Thanks
Dave