[PATCH] dyndbg: fix for SOH in logging messages

[PATCH] dyndbg: fix for SOH in logging messages

[Jim Cromie]

commit af7f2158fde was done against master, and clashed with structured logging's change of KERN_LEVEL to SOH.

Bisected and fixed by Markus Trippelsdorf.

CC: Markus Trippelsdorf <markus@trippelsdorf.de>
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
---
 drivers/base/core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/base/core.c b/drivers/base/core.c
index cdd01c5..5e6e00b 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -1912,8 +1912,8 @@ int __dev_printk(const char *level, const struct device *dev,
 				    "DEVICE=+%s:%s", subsys, dev_name(dev));
 	}
 skip:
-	if (level[3])
-		level_extra = &level[3]; /* skip past "<L>" */
+	if (level[2])
+		level_extra = &level[2]; /* skip past KERN_SOH "L" */
 
 	return printk_emit(0, level[1] - '0',
 			   dictlen ? dict : NULL, dictlen,
-- 
1.7.10.1.487.ga3935e6

Re: [PATCH] dyndbg: fix for SOH in logging messages

[Greg KH]

On Sat, Aug 18, 2012 at 06:35:51PM -0600, Jim Cromie wrote:
> commit af7f2158fde was done against master, and clashed with structured logging's change of KERN_LEVEL to SOH.
> 
> Bisected and fixed by Markus Trippelsdorf.
> 
> CC: Markus Trippelsdorf <markus@trippelsdorf.de>
> Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
> ---
>  drivers/base/core.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/base/core.c b/drivers/base/core.c
> index cdd01c5..5e6e00b 100644
> --- a/drivers/base/core.c
> +++ b/drivers/base/core.c
> @@ -1912,8 +1912,8 @@ int __dev_printk(const char *level, const struct device *dev,
>  				    "DEVICE=+%s:%s", subsys, dev_name(dev));
>  	}
>  skip:
> -	if (level[3])
> -		level_extra = &level[3]; /* skip past "<L>" */
> +	if (level[2])
> +		level_extra = &level[2]; /* skip past KERN_SOH "L" */
>  
>  	return printk_emit(0, level[1] - '0',
>  			   dictlen ? dict : NULL, dictlen,

No, this still doesn't resolve the issue for me, it still looks like it
did before this patch (exactly the same to be exact.)

I do seem to get the correct output if I revert your original patch
(af7f2158fde), should I just do that instead?

greg k-h

Re: [PATCH] dyndbg: fix for SOH in logging messages

[Greg KH]

On Sat, Aug 18, 2012 at 11:13:52PM -0700, Greg KH wrote:
> On Sat, Aug 18, 2012 at 06:35:51PM -0600, Jim Cromie wrote:
> > commit af7f2158fde was done against master, and clashed with structured logging's change of KERN_LEVEL to SOH.
> > 
> > Bisected and fixed by Markus Trippelsdorf.
> > 
> > CC: Markus Trippelsdorf <markus@trippelsdorf.de>
> > Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
> > ---
> >  drivers/base/core.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/base/core.c b/drivers/base/core.c
> > index cdd01c5..5e6e00b 100644
> > --- a/drivers/base/core.c
> > +++ b/drivers/base/core.c
> > @@ -1912,8 +1912,8 @@ int __dev_printk(const char *level, const struct device *dev,
> >  				    "DEVICE=+%s:%s", subsys, dev_name(dev));
> >  	}
> >  skip:
> > -	if (level[3])
> > -		level_extra = &level[3]; /* skip past "<L>" */
> > +	if (level[2])
> > +		level_extra = &level[2]; /* skip past KERN_SOH "L" */
> >  
> >  	return printk_emit(0, level[1] - '0',
> >  			   dictlen ? dict : NULL, dictlen,
> 
> No, this still doesn't resolve the issue for me, it still looks like it
> did before this patch (exactly the same to be exact.)
> 
> I do seem to get the correct output if I revert your original patch
> (af7f2158fde), should I just do that instead?

Crap, no, sorry, it's late, I didn't apply your patch at all (--dry-run
only, my bad).

Let me go test this for real now, my applogies...

greg k-h

Re: [PATCH] dyndbg: fix for SOH in logging messages

[Greg KH]

On Sat, Aug 18, 2012 at 11:33:02PM -0700, Greg KH wrote:
> On Sat, Aug 18, 2012 at 11:13:52PM -0700, Greg KH wrote:
> > On Sat, Aug 18, 2012 at 06:35:51PM -0600, Jim Cromie wrote:
> > > commit af7f2158fde was done against master, and clashed with structured logging's change of KERN_LEVEL to SOH.
> > > 
> > > Bisected and fixed by Markus Trippelsdorf.
> > > 
> > > CC: Markus Trippelsdorf <markus@trippelsdorf.de>
> > > Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
> > > ---
> > >  drivers/base/core.c | 4 ++--
> > >  1 file changed, 2 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/drivers/base/core.c b/drivers/base/core.c
> > > index cdd01c5..5e6e00b 100644
> > > --- a/drivers/base/core.c
> > > +++ b/drivers/base/core.c
> > > @@ -1912,8 +1912,8 @@ int __dev_printk(const char *level, const struct device *dev,
> > >  				    "DEVICE=+%s:%s", subsys, dev_name(dev));
> > >  	}
> > >  skip:
> > > -	if (level[3])
> > > -		level_extra = &level[3]; /* skip past "<L>" */
> > > +	if (level[2])
> > > +		level_extra = &level[2]; /* skip past KERN_SOH "L" */
> > >  
> > >  	return printk_emit(0, level[1] - '0',
> > >  			   dictlen ? dict : NULL, dictlen,
> > 
> > No, this still doesn't resolve the issue for me, it still looks like it
> > did before this patch (exactly the same to be exact.)
> > 
> > I do seem to get the correct output if I revert your original patch
> > (af7f2158fde), should I just do that instead?
> 
> Crap, no, sorry, it's late, I didn't apply your patch at all (--dry-run
> only, my bad).
> 
> Let me go test this for real now, my applogies...

And it works, sorry for the noise, I'll go queue it up now.

greg k-h