From patchwork Mon Jul 28 13:29:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 34361 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f69.google.com (mail-oa0-f69.google.com [209.85.219.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 96C5320AE8 for ; Mon, 28 Jul 2014 13:29:44 +0000 (UTC) Received: by mail-oa0-f69.google.com with SMTP id i7sf51530724oag.8 for ; Mon, 28 Jul 2014 06:29:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type :content-transfer-encoding; bh=ztsCfSlHh8ggucfbD3Ca2m2r9PIHp5agWVY8h67yRDM=; b=iqdfxEtOP+fcrdfM7jbFw2JOK0s1avOQcTBQfHTG2pd9s/S5v3cfdI2TGSFrk3CYWS t3edpdGvrm7ddqYxaejTZtq95AYThNf6enI+/ZgNd6TIgM9e6QBevOg72Ij39xGz1WYj nLvJxrz5vlIB9P/05KtHBLAFOfvo+5HQVgsq5q2P6s7zmxwgafFIv2z8slei4OB6HtqO QaVcQag5T5z2vZENu8sIZqxQ1gCwMiZlxhE2xS0pakpbwca/mkYyFE0Httpjn+IZxpvB gfKfq/R9uQGyKnsAgbPePm770/Ui6GemxzvHiw28fk1Ct5wctCSV/lEcPZWKxFYzt1M3 dZhA== X-Gm-Message-State: ALoCoQkVCDTfPU97+0rI+Wk+MVR7DXB5weJDCFgTzkznWh5EJJtvdhRnjX/OnLhMuxQoV0miS2Ql X-Received: by 10.182.45.197 with SMTP id p5mr6189744obm.2.1406554184169; Mon, 28 Jul 2014 06:29:44 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.40.169 with SMTP id x38ls2109337qgx.28.gmail; Mon, 28 Jul 2014 06:29:44 -0700 (PDT) X-Received: by 10.220.3.79 with SMTP id 15mr214475vcm.63.1406554184065; Mon, 28 Jul 2014 06:29:44 -0700 (PDT) Received: from mail-vc0-f174.google.com (mail-vc0-f174.google.com [209.85.220.174]) by mx.google.com with ESMTPS id vw2si12417854vcb.54.2014.07.28.06.29.44 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 28 Jul 2014 06:29:44 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.174 as permitted sender) client-ip=209.85.220.174; Received: by mail-vc0-f174.google.com with SMTP id la4so11153732vcb.33 for ; Mon, 28 Jul 2014 06:29:44 -0700 (PDT) X-Received: by 10.52.129.165 with SMTP id nx5mr16101832vdb.25.1406554183981; Mon, 28 Jul 2014 06:29:43 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp166619vcb; Mon, 28 Jul 2014 06:29:43 -0700 (PDT) X-Received: by 10.66.174.17 with SMTP id bo17mr38274586pac.98.1406554181685; Mon, 28 Jul 2014 06:29:41 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id iq4si17852709pbb.75.2014.07.28.06.29.40 for ; Mon, 28 Jul 2014 06:29:41 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752768AbaG1N32 (ORCPT + 26 others); Mon, 28 Jul 2014 09:29:28 -0400 Received: from mail-ie0-f182.google.com ([209.85.223.182]:54418 "EHLO mail-ie0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752730AbaG1N3X (ORCPT ); Mon, 28 Jul 2014 09:29:23 -0400 Received: by mail-ie0-f182.google.com with SMTP id y20so6761312ier.13 for ; Mon, 28 Jul 2014 06:29:22 -0700 (PDT) X-Received: by 10.50.153.83 with SMTP id ve19mr22114137igb.4.1406554162868; Mon, 28 Jul 2014 06:29:22 -0700 (PDT) Received: from localhost.localdomain (c-24-245-18-91.hsd1.mn.comcast.net. [24.245.18.91]) by mx.google.com with ESMTPSA id i10sm26832385igm.13.2014.07.28.06.29.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 28 Jul 2014 06:29:22 -0700 (PDT) From: Alex Elder To: akpm@linux-foundation.org Cc: kay@vrfy.org, pmladek@suse.cz, john.stultz@linaro.org, jack@suse.cz, linux-kernel@vger.kernel.org Subject: [PATCH v7 3/7] printk: initialize syslog_prev and console_prev Date: Mon, 28 Jul 2014 08:29:16 -0500 Message-Id: <1406554160-9562-4-git-send-email-elder@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1406554160-9562-1-git-send-email-elder@linaro.org> References: <1406554160-9562-1-git-send-email-elder@linaro.org> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: elder@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.174 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Two global variables, "syslog_prev" and "console_prev", maintain a copy of the flags value used in the log record most recently formatted for syslog or the console, respectively. Initially there is no previous formatted log record, and these variables simply have an initial value 0. And occasionally log records can get consumed at a rate such that syslog or the console can't keep up, in which case those variables (along with their corresponding position variables) must be reset. Here too, they're reset to 0. This patch changes it so the initial value used is LOG_NEWLINE. That is, if we know nothing about the prevously-formatted log record, we can assume it was complete, and ended with a newline. One exception is that occasionally we reset our syslog or console (etc.) position variables. In that case the previously-formatted record flags value is still valid, so we preserve that information. This is being done to support the next patch. Initializing these variables this way makes LOG_NEWLINE and LOG_CONT be mutually exclusive, and the next patch uses that fact to simplify some logic. Signed-off-by: Alex Elder Reviewed-by: Petr Mládek --- kernel/printk/printk.c | 40 ++++++++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 7dfa658..5c32938 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -236,7 +236,7 @@ DECLARE_WAIT_QUEUE_HEAD(log_wait); /* the next printk record to read by syslog(READ) or /proc/kmsg */ static u64 syslog_seq; static u32 syslog_idx; -static enum log_flags syslog_prev; +static enum log_flags syslog_prev = LOG_NEWLINE; static size_t syslog_partial; /* index and sequence number of the first record stored in the buffer */ @@ -250,7 +250,7 @@ static u32 log_next_idx; /* the next printk record to write to the console */ static u64 console_seq; static u32 console_idx; -static enum log_flags console_prev; +static enum log_flags console_prev = LOG_NEWLINE; /* the next printk record to read after the last 'clear' command */ static u64 clear_seq; @@ -1074,10 +1074,14 @@ static int syslog_print(char __user *buf, int size) raw_spin_lock_irq(&logbuf_lock); if (syslog_seq < log_first_seq) { - /* messages are gone, move to first one */ + /* + * Messages are gone, move to first one. + * Don't discard what we know about the + * previously-formatted record. + */ syslog_seq = log_first_seq; syslog_idx = log_first_idx; - syslog_prev = 0; + syslog_prev &= LOG_NEWLINE|LOG_CONT; syslog_partial = 0; } if (syslog_seq == log_next_seq) { @@ -1150,7 +1154,7 @@ static int syslog_print_all(char __user *buf, int size, bool clear) */ seq = clear_seq; idx = clear_idx; - prev = 0; + prev = LOG_NEWLINE; while (seq < log_next_seq) { struct printk_log *msg = log_from_idx(idx); @@ -1163,7 +1167,7 @@ static int syslog_print_all(char __user *buf, int size, bool clear) /* move first record forward until length fits into the buffer */ seq = clear_seq; idx = clear_idx; - prev = 0; + prev = LOG_NEWLINE; while (len > size && seq < log_next_seq) { struct printk_log *msg = log_from_idx(idx); @@ -1199,10 +1203,14 @@ static int syslog_print_all(char __user *buf, int size, bool clear) raw_spin_lock_irq(&logbuf_lock); if (seq < log_first_seq) { - /* messages are gone, move to next one */ + /* + * Messages are gone, move to first one. + * Don't discard what we know about the + * previously-formatted record. + */ seq = log_first_seq; idx = log_first_idx; - prev = 0; + prev &= LOG_NEWLINE|LOG_CONT; } } } @@ -1304,10 +1312,14 @@ int do_syslog(int type, char __user *buf, int len, bool from_file) case SYSLOG_ACTION_SIZE_UNREAD: raw_spin_lock_irq(&logbuf_lock); if (syslog_seq < log_first_seq) { - /* messages are gone, move to first one */ + /* + * Messages are gone, move to first one. + * Don't discard what we know about the + * previously-formatted record. + */ syslog_seq = log_first_seq; syslog_idx = log_first_idx; - syslog_prev = 0; + syslog_prev &= LOG_NEWLINE|LOG_CONT; syslog_partial = 0; } if (from_file) { @@ -2152,10 +2164,10 @@ again: "%s** %u printk messages dropped **\n", (console_prev & LOG_CONT) ? "\n" : "", (unsigned)(log_first_seq - console_seq)); - /* messages are gone, move to first one */ + /* Messages are gone, move to first one. */ console_seq = log_first_seq; console_idx = log_first_idx; - console_prev = 0; + console_prev = LOG_NEWLINE; } else { len = 0; } @@ -2869,7 +2881,7 @@ bool kmsg_dump_get_buffer(struct kmsg_dumper *dumper, bool syslog, /* calculate length of entire buffer */ seq = dumper->cur_seq; idx = dumper->cur_idx; - prev = 0; + prev = LOG_NEWLINE; while (seq < dumper->next_seq) { struct printk_log *msg = log_from_idx(idx); @@ -2882,7 +2894,7 @@ bool kmsg_dump_get_buffer(struct kmsg_dumper *dumper, bool syslog, /* move first record forward until length fits into the buffer */ seq = dumper->cur_seq; idx = dumper->cur_idx; - prev = 0; + prev = LOG_NEWLINE; while (l > size && seq < dumper->next_seq) { struct printk_log *msg = log_from_idx(idx);