Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761517Ab2EJAzM (ORCPT ); Wed, 9 May 2012 20:55:12 -0400 Received: from mail-we0-f174.google.com ([74.125.82.174]:63745 "EHLO mail-we0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761497Ab2EJAzJ (ORCPT ); Wed, 9 May 2012 20:55:09 -0400 Message-ID: <1336611278.728.9.camel@mop> Subject: Re: [PATCH RESEND 1/3] printk: convert byte-buffer to variable-length record buffer From: Kay Sievers To: Ingo Molnar Cc: Linus Torvalds , Jonathan Corbet , Sasha Levin , Greg Kroah-Hartmann , linux-kernel@vger.kernel.org Date: Thu, 10 May 2012 02:54:38 +0200 In-Reply-To: References: <1336004953.4240.9.camel@mop> <1336475689.1179.12.camel@mop> <20120509070710.GA29981@gmail.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.4.1 (3.4.1-2.fc17) Content-Transfer-Encoding: 7bit Mime-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2526 Lines: 90 On Wed, 2012-05-09 at 15:29 +0200, Kay Sievers wrote: > Can we somehow store the PID of the printk() thread that has left the > un-terminated line behind in the buffer, and flush it out when the > next printk() is from a differnt PID? That could prevent the mangling > of "atomic" printk()s by continuation users, and merging unrelated > continuation users together. How about this? It relaxes the need for KERN_CONT, but it limits continuation lines to repeated calls of the same thread. If things race against each other, the lines are separated and not wrongly mixed with the data from other users. I would be happy with that, as it protects the "atomic" users of printk() from getting mixed up with continuation users. Thanks, Kay From: Kay Sievers Subject: printk() - do not merge continuation lines of different threads Signed-off-by: Kay Sievers --- --- kernel/printk.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) --- a/kernel/printk.c +++ b/kernel/printk.c @@ -1230,12 +1230,13 @@ asmlinkage int vprintk_emit(int facility static size_t buflen; static int buflevel; static char textbuf[LOG_LINE_MAX]; + static struct task_struct *cont; char *text = textbuf; size_t textlen; unsigned long flags; int this_cpu; bool newline = false; - bool cont = false; + bool prefix = false; int printed_len = 0; boot_delay_msec(); @@ -1295,20 +1296,17 @@ asmlinkage int vprintk_emit(int facility case '0' ... '7': if (level == -1) level = text[1] - '0'; - text += 3; - textlen -= 3; - break; case 'c': /* KERN_CONT */ - cont = true; case 'd': /* KERN_DEFAULT */ + if (text[1] != 'c') + prefix = true; text += 3; textlen -= 3; - break; } } - if (buflen && (!cont || dict)) { - /* no continuation; flush existing buffer */ + if (buflen && (prefix || dict || cont != current)) { + /* flush existing buffer */ log_store(facility, buflevel, NULL, 0, buf, buflen); printed_len += buflen; buflen = 0; @@ -1342,6 +1340,10 @@ asmlinkage int vprintk_emit(int facility dict, dictlen, text, textlen); printed_len += textlen; } + cont = NULL; + } else { + /* remember thread which filled the buffer */ + cont = current; } /* -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/