printk: split out core logging code into helper function

[cascardo/linux.git] / kernel / printk / printk.c

diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index eea6dbc..090e201 100644 (file)
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -655,11 +655,8 @@ static ssize_t msg_print_ext_header(char *buf, size_t size,
         * better readable output. 'c' in the record flags mark the first
         * fragment of a line, '+' the following.
         */
-       if (msg->flags & LOG_CONT && !(prev_flags & LOG_CONT))
-               cont = 'c';
-       else if ((msg->flags & LOG_CONT) ||
-                ((prev_flags & LOG_CONT) && !(msg->flags & LOG_PREFIX)))
-               cont = '+';
+       if (msg->flags & LOG_CONT)
+               cont = (prev_flags & LOG_CONT) ? '+' : 'c';
 
        return scnprintf(buf, size, "%u,%llu,%llu,%c;",
                       (msg->facility << 3) | msg->level, seq, ts_usec, cont);
@@ -1733,6 +1730,44 @@ static size_t cont_print_text(char *text, size_t size)
        return textlen;
 }
 
+static size_t log_output(int facility, int level, enum log_flags lflags, const char *dict, size_t dictlen, char *text, size_t text_len)
+{
+       if (!(lflags & LOG_NEWLINE)) {
+               /*
+                * Flush the conflicting buffer. An earlier newline was missing,
+                * or another task also prints continuation lines.
+                */
+               if (cont.len && (!(lflags & LOG_CONT) || cont.owner != current))
+                       cont_flush(LOG_NEWLINE);
+
+               /* buffer line if possible, otherwise store it right away */
+               if (cont_add(facility, level, text, text_len))
+                       return text_len;
+
+               return log_store(facility, level, lflags | LOG_CONT, 0, dict, dictlen, text, text_len);
+       }
+
+       /*
+        * If an earlier newline was missing and it was the same task,
+        * either merge it with the current buffer and flush, or if
+        * there was a race with interrupts (prefix == true) then just
+        * flush it out and store this line separately.
+        * If the preceding printk was from a different task and missed
+        * a newline, flush and append the newline.
+        */
+       if (cont.len) {
+               bool stored = false;
+
+               if (cont.owner == current && (lflags & LOG_CONT))
+                       stored = cont_add(facility, level, text, text_len);
+               cont_flush(LOG_NEWLINE);
+               if (stored)
+                       return text_len;
+       }
+
+       return log_store(facility, level, lflags, 0, dict, dictlen, text, text_len);
+}
+
 asmlinkage int vprintk_emit(int facility, int level,
                            const char *dict, size_t dictlen,
                            const char *fmt, va_list args)
@@ -1819,10 +1854,9 @@ asmlinkage int vprintk_emit(int facility, int level,
 
        /* strip kernel syslog prefix and extract log level or control flags */
        if (facility == 0) {
-               int kern_level = printk_get_level(text);
+               int kern_level;
 
-               if (kern_level) {
-                       const char *end_of_header = printk_skip_level(text);
+               while ((kern_level = printk_get_level(text)) != 0) {
                        switch (kern_level) {
                        case '0' ... '7':
                                if (level == LOGLEVEL_DEFAULT)
@@ -1830,14 +1864,13 @@ asmlinkage int vprintk_emit(int facility, int level,
                                /* fallthrough */
                        case 'd':       /* KERN_DEFAULT */
                                lflags |= LOG_PREFIX;
+                               break;
+                       case 'c':       /* KERN_CONT */
+                               lflags |= LOG_CONT;
                        }
-                       /*
-                        * No need to check length here because vscnprintf
-                        * put '\0' at the end of the string. Only valid and
-                        * newly printed level is detected.
-                        */
-                       text_len -= end_of_header - text;
-                       text = (char *)end_of_header;
+
+                       text_len -= 2;
+                       text += 2;
                }
        }
 
@@ -1847,45 +1880,7 @@ asmlinkage int vprintk_emit(int facility, int level,
        if (dict)
                lflags |= LOG_PREFIX|LOG_NEWLINE;
 
-       if (!(lflags & LOG_NEWLINE)) {
-               /*
-                * Flush the conflicting buffer. An earlier newline was missing,
-                * or another task also prints continuation lines.
-                */
-               if (cont.len && (lflags & LOG_PREFIX || cont.owner != current))
-                       cont_flush(LOG_NEWLINE);
-
-               /* buffer line if possible, otherwise store it right away */
-               if (cont_add(facility, level, text, text_len))
-                       printed_len += text_len;
-               else
-                       printed_len += log_store(facility, level,
-                                                lflags | LOG_CONT, 0,
-                                                dict, dictlen, text, text_len);
-       } else {
-               bool stored = false;
-
-               /*
-                * If an earlier newline was missing and it was the same task,
-                * either merge it with the current buffer and flush, or if
-                * there was a race with interrupts (prefix == true) then just
-                * flush it out and store this line separately.
-                * If the preceding printk was from a different task and missed
-                * a newline, flush and append the newline.
-                */
-               if (cont.len) {
-                       if (cont.owner == current && !(lflags & LOG_PREFIX))
-                               stored = cont_add(facility, level, text,
-                                                 text_len);
-                       cont_flush(LOG_NEWLINE);
-               }
-
-               if (stored)
-                       printed_len += text_len;
-               else
-                       printed_len += log_store(facility, level, lflags, 0,
-                                                dict, dictlen, text, text_len);
-       }
+       printed_len += log_output(facility, level, lflags, dict, dictlen, text, text_len);
 
        logbuf_cpu = UINT_MAX;
        raw_spin_unlock(&logbuf_lock);