From patchwork Mon Jul 28 13:29:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 34362 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f198.google.com (mail-vc0-f198.google.com [209.85.220.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2BDED20AE8 for ; Mon, 28 Jul 2014 13:29:46 +0000 (UTC) Received: by mail-vc0-f198.google.com with SMTP id le20sf7002169vcb.5 for ; Mon, 28 Jul 2014 06:29:46 -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=1izvN5qsALd3fyCx6yRF64DraWQA1bNl4kOxKnfkSPM=; b=KI/NE5bTMRpWpom1dsO+51DMExK4xuhsuIOLX7DqlZNPFYAvMhuN6S7PlMCoMFIoom 9jbYF78oNN/2TWiQjpfHdlgYzDXfIS5LwE9f/7mv1SsXx5uQX/5spSdUyUeXEDnfyOmH PDj7lMvVTCiuCKXsqzIXrLKIvhXjrdjJ+y5cl2HDlYxvLHKvDmw5flyu3qsNJkkdGNx3 ZqMx20I77GRnhdYHEbOb64NetKiRluBKNzS4cD64z6r0dfeBRtjD0L+3/dWsuEQNDumA rOpeJekkamHShNxYACtc2Yfr7TUaB400nngOPOTt34yJFAmctvx5U0bnzYyWAyjtpjo7 WM5w== X-Gm-Message-State: ALoCoQnrNidRvj57oHYAhpk7YPP3xrh/BjCvDTFo9Xwpn17eQ/ONLrFCSFrSJGfDXgaEvqzivCqd X-Received: by 10.236.129.2 with SMTP id g2mr14463125yhi.2.1406554185951; Mon, 28 Jul 2014 06:29:45 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.94.13 with SMTP id f13ls2147603qge.65.gmail; Mon, 28 Jul 2014 06:29:45 -0700 (PDT) X-Received: by 10.52.113.37 with SMTP id iv5mr14423373vdb.51.1406554185850; Mon, 28 Jul 2014 06:29:45 -0700 (PDT) Received: from mail-vc0-f178.google.com (mail-vc0-f178.google.com [209.85.220.178]) by mx.google.com with ESMTPS id py4si12420113vcb.49.2014.07.28.06.29.45 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 28 Jul 2014 06:29:45 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.178 as permitted sender) client-ip=209.85.220.178; Received: by mail-vc0-f178.google.com with SMTP id la4so10962078vcb.23 for ; Mon, 28 Jul 2014 06:29:45 -0700 (PDT) X-Received: by 10.52.37.81 with SMTP id w17mr1158323vdj.95.1406554185725; Mon, 28 Jul 2014 06:29:45 -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 tc5csp166623vcb; Mon, 28 Jul 2014 06:29:44 -0700 (PDT) X-Received: by 10.68.225.133 with SMTP id rk5mr38025925pbc.101.1406554182453; Mon, 28 Jul 2014 06:29:42 -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.41 for ; Mon, 28 Jul 2014 06:29:42 -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 S1752790AbaG1N3a (ORCPT + 26 others); Mon, 28 Jul 2014 09:29:30 -0400 Received: from mail-ie0-f172.google.com ([209.85.223.172]:60955 "EHLO mail-ie0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752758AbaG1N31 (ORCPT ); Mon, 28 Jul 2014 09:29:27 -0400 Received: by mail-ie0-f172.google.com with SMTP id lx4so6623288iec.31 for ; Mon, 28 Jul 2014 06:29:26 -0700 (PDT) X-Received: by 10.50.147.70 with SMTP id ti6mr32821977igb.45.1406554165792; Mon, 28 Jul 2014 06:29:25 -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.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 28 Jul 2014 06:29:25 -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 6/7] printk: honor LOG_PREFIX in msg_print_text() Date: Mon, 28 Jul 2014 08:29:19 -0500 Message-Id: <1406554160-9562-7-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.178 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: , This patch fixes a problem similar to what was addressed in the previous patch. All paths that read and format log records (for consoles, and for reading via syslog and /dev/kmsg) go through msg_print_text(). That function starts with some logic to determine whether the given log record when formatted should begin with a "prefix" string, and whether it should end with a newline. That logic has a bug. The LOG_PREFIX flag in a log record indicates that when it's formatted, a log record should include a prefix. This is used to force a record to begin a new line--even if its preceding log record contained LOG_CONT (indicating its content should be combined with the next record). Like the previous patch, the problem occurs when these flags are all set: prev & LOG_CONT msg->flags & LOG_PREFIX msg->flags & LOG_CONT In that case, "prefix" should be true but it is not. The fix involves checking LOG_PREFIX when a message has its LOG_CONT flag set, and in that case allowing "prefix" to become false only if LOG_PREFIX is not set. I.e., the logic for "prefix" would become: if (prev & LOG_CONT && !(msg->flags & LOG_PREFIX)) prefix = false; if (msg->flags & LOG_CONT) if (prev & LOG_CONT && !(msg->flags & LOG_PREFIX)) prefix = false; However, note that this makes the (msg->flags & LOG_CONT) block redunant--it's handled by the test just above it. The result becomes quite a bit simpler than before. The following table concisely defines the problem: prev | msg | msg || CONT |PREFIX| CONT ||prefix ------+------+------++------ clear| clear| clear|| true clear| clear| set || true clear| set | clear|| true clear| set | set || true set | clear| clear|| false set | clear| set || false set | set | clear|| true set | set | set || false <-- should be true Signed-off-by: Alex Elder Reviewed-by: Petr Mládek --- kernel/printk/printk.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 1eb07f4..982873b 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -1006,11 +1006,8 @@ static size_t msg_print_text(const struct printk_log *msg, enum log_flags prev, if ((prev & LOG_CONT) && !(msg->flags & LOG_PREFIX)) prefix = false; - if (msg->flags & LOG_CONT) { - if (prev & LOG_CONT) - prefix = false; + if (msg->flags & LOG_CONT) newline = false; - } if ((prev & LOG_CONT) && (msg->flags & LOG_PREFIX) && len < size) { if (buf)