From: Petr Mladek <pmladek@suse.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Joe Perches <joe@perches.com>,
Andrew Morton <akpm@linux-foundation.org>,
Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>,
Steven Rostedt <rostedt@goodmis.org>,
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, Petr Mladek <pmladek@suse.com>
Subject: [PATCH 4/4] printk/sound: Handle more message headers
Date: Thu, 27 Oct 2016 17:52:54 +0200 [thread overview]
Message-ID: <1477583574-30988-5-git-send-email-pmladek@suse.com> (raw)
In-Reply-To: <1477583574-30988-1-git-send-email-pmladek@suse.com>
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 tries to copy the entire header. Well, it limits it
to 4 bytes because it does not make sense to combine more message
headers except for KERN_CONT and some real level.
Signed-off-by: Petr Mladek <pmladek@suse.com>
---
sound/core/misc.c | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/sound/core/misc.c b/sound/core/misc.c
index f2e8226c88fb..52b719cc875d 100644
--- a/sound/core/misc.c
+++ b/sound/core/misc.c
@@ -68,9 +68,10 @@ void __snd_printk(unsigned int level, const char *path, int line,
{
va_list args;
#ifdef CONFIG_SND_VERBOSE_PRINTK
- int kern_level;
struct va_format vaf;
- char verbose_fmt[] = KERN_DEFAULT "ALSA %s:%d %pV";
+ char header[5] = KERN_DEFAULT;
+ const char *end_of_header;
+ size_t size_of_header;
#endif
#ifdef CONFIG_SND_DEBUG
@@ -83,15 +84,18 @@ 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);
+ end_of_header = printk_skip_headers(format);
+ size_of_header = min((size_t)(end_of_header - format),
+ sizeof(header) - 1);
+ if (size_of_header) {
+ memcpy(header, format, size_of_header);
+ header[size_of_header] = '\0';
vaf.fmt = end_of_header;
- } else if (level)
- memcpy(verbose_fmt, KERN_DEBUG, sizeof(KERN_DEBUG) - 1);
- printk(verbose_fmt, sanity_file_name(path), line, &vaf);
+ } else if (level) {
+ memcpy(header, KERN_DEBUG, sizeof(KERN_DEBUG) - 1);
+ }
+ printk("%sALSA %s:%d %pV", header, sanity_file_name(path), line, &vaf);
#else
vprintk(format, args);
#endif
--
1.8.5.6
prev parent reply other threads:[~2016-10-27 15:53 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-27 15:52 [PATCH 0/4] printk: Fixes and hardening related to KERN_CONT Petr Mladek
2016-10-27 15:52 ` [PATCH 1/4] printk/NMI: Handle continuous lines and missing newline Petr Mladek
2016-10-27 16:35 ` Joe Perches
2016-10-28 4:08 ` Sergey Senozhatsky
2016-10-31 8:51 ` David Sterba
2016-10-27 15:52 ` [PATCH 2/4] printk/kdb: Handle more message headers Petr Mladek
2016-10-27 16:57 ` Joe Perches
2016-10-27 15:52 ` [PATCH 3/4] printk/btrfs: " Petr Mladek
2016-10-27 16:12 ` Joe Perches
2016-10-31 8:57 ` David Sterba
2016-10-27 15:52 ` Petr Mladek [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=1477583574-30988-5-git-send-email-pmladek@suse.com \
--to=pmladek@suse.com \
--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=rostedt@goodmis.org \
--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;
as well as URLs for NNTP newsgroup(s).