From: Steven Rostedt <rostedt@goodmis.org>
To: Petr Mladek <pmladek@suse.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Joe Perches <joe@perches.com>,
Andrew Morton <akpm@linux-foundation.org>,
Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>,
Jason Wessel <jason.wessel@windriver.com>,
Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
Chris Mason <clm@fb.com>, Josef Bacik <jbacik@fb.com>,
David Sterba <dsterba@suse.com>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 4/4] printk/sound: Handle more message headers
Date: Fri, 11 Nov 2016 12:54:51 -0500 [thread overview]
Message-ID: <20161111125451.611f40c7@gandalf.local.home> (raw)
In-Reply-To: <1478695291-12169-5-git-send-email-pmladek@suse.com>
On Wed, 9 Nov 2016 13:41:31 +0100
Petr Mladek <pmladek@suse.com> wrote:
> The commit 4bcc595ccd80decb4245096e ("printk: reinstate KERN_CONT for
> printing continuation lines") allows to define more message headers
> for a single message. The motivation is that continuous lines might
> get mixed. Therefore it make sense to define the right log level
> for every piece of a cont line.
>
> This patch allows to copy only the real message level. We should
> ignore KERN_CONT because <filename:line> is added for each message.
> By other words, we want to know where each piece of the line comes
> from.
>
> Signed-off-by: Petr Mladek <pmladek@suse.com>
> ---
> sound/core/misc.c | 20 ++++++++++++++------
> 1 file changed, 14 insertions(+), 6 deletions(-)
>
> diff --git a/sound/core/misc.c b/sound/core/misc.c
> index f2e8226c88fb..45f03b1d4102 100644
> --- a/sound/core/misc.c
> +++ b/sound/core/misc.c
> @@ -71,6 +71,7 @@ void __snd_printk(unsigned int level, const char *path, int line,
> int kern_level;
> struct va_format vaf;
> char verbose_fmt[] = KERN_DEFAULT "ALSA %s:%d %pV";
> + bool level_found = false;
> #endif
>
> #ifdef CONFIG_SND_DEBUG
> @@ -83,15 +84,22 @@ void __snd_printk(unsigned int level, const char *path, int line,
> vaf.fmt = format;
> vaf.va = &args;
>
> - kern_level = printk_get_level(format);
> - if (kern_level) {
> - const char *end_of_header = printk_skip_level(format);
> - memcpy(verbose_fmt, format, end_of_header - format);
> + while ((kern_level = printk_get_level(vaf.fmt)) != 0) {
> + const char *end_of_header = printk_skip_level(vaf.fmt);
> +
> + /* Ignore KERN_CONT. We print filename:line for each piece. */
> + if (kern_level >= '0' || kern_level <= '7') {
Again, the above is always true.
-- Steve
> + memcpy(verbose_fmt, vaf.fmt, end_of_header - vaf.fmt);
> + level_found = true;
> + }
> +
> vaf.fmt = end_of_header;
> - } else if (level)
> + }
> +
> + if (!level_found && level)
> memcpy(verbose_fmt, KERN_DEBUG, sizeof(KERN_DEBUG) - 1);
> - printk(verbose_fmt, sanity_file_name(path), line, &vaf);
>
> + printk(verbose_fmt, sanity_file_name(path), line, &vaf);
> #else
> vprintk(format, args);
> #endif
prev parent reply other threads:[~2016-11-11 17:55 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-09 12:41 [PATCH v2 0/4] printk: Fixes and hardening related to KERN_CONT Petr Mladek
2016-11-09 12:41 ` [PATCH v2 1/4] printk/NMI: Handle continuous lines and missing newline Petr Mladek
2016-11-11 0:26 ` Sergey Senozhatsky
2016-11-11 17:28 ` Steven Rostedt
2016-11-11 18:07 ` Petr Mladek
2016-11-09 12:41 ` [PATCH v2 2/4] printk/kdb: Handle more message headers Petr Mladek
2016-11-11 17:35 ` Steven Rostedt
2016-11-11 18:13 ` Petr Mladek
2016-11-09 12:41 ` [PATCH v2 3/4] printk/btrfs: " Petr Mladek
2016-11-10 13:20 ` David Sterba
2016-11-11 17:41 ` Steven Rostedt
2016-11-11 18:16 ` Petr Mladek
2016-12-13 9:21 ` Geert Uytterhoeven
2016-12-13 13:52 ` Petr Mladek
2016-12-13 14:01 ` Geert Uytterhoeven
2016-12-13 14:26 ` David Sterba
2016-11-09 12:41 ` [PATCH v2 4/4] printk/sound: " Petr Mladek
2016-11-11 17:54 ` Steven Rostedt [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161111125451.611f40c7@gandalf.local.home \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=clm@fb.com \
--cc=dsterba@suse.com \
--cc=jason.wessel@windriver.com \
--cc=jbacik@fb.com \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=perex@perex.cz \
--cc=pmladek@suse.com \
--cc=sergey.senozhatsky.work@gmail.com \
--cc=tiwai@suse.com \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®