From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1758242AbcJYCYl (ORCPT <rfc822;w@1wt.eu>);
        Mon, 24 Oct 2016 22:24:41 -0400
Received: from mail-pf0-f171.google.com ([209.85.192.171]:33924 "EHLO
        mail-pf0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1757207AbcJYCYk (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Mon, 24 Oct 2016 22:24:40 -0400
Date: Tue, 25 Oct 2016 11:24:36 +0900
From: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
To: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
        Sergey Senozhatsky <sergey.senozhatsky@gmail.com>,
        Joe Perches <joe@perches.com>,
        Geert Uytterhoeven <geert@linux-m68k.org>,
        Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Petr Mladek <pmladek@suse.cz>, Tejun Heo <tj@kernel.org>,
        Calvin Owens <calvinowens@fb.com>,
        Steven Rostedt <rostedt@goodmis.org>,
        Andrew Morton <akpm@linux-foundation.org>
Subject: Re: linux.git: printk() problem
Message-ID: <20161025022436.GB446@swordfish>
References: <CA+55aFwLLxVKZcN4qm0GH0sHk70xRE8e4s8_ma6WYafao85Rfw@mail.gmail.com>
 <CAMuHMdXUqOhv37mTvX+ic45VsgvM1g3=McWAa1WCeVYH+KohCw@mail.gmail.com>
 <CA+55aFw1Z95Lfefr1PfZW17qj9zjv+-bZ-oPESTNk+tbAEVrhQ@mail.gmail.com>
 <1477249607.3561.2.camel@perches.com>
 <CA+55aFwOBR6z55r2abAT_TuYTHfyuc8f75B2+Z7+Lhr9fzSZRA@mail.gmail.com>
 <CA+55aFzm6RpkaiDzS_q3J=4_hykCCgAZLjEf5nffgSZjUpQ17A@mail.gmail.com>
 <20161024140845.GA626@swordfish>
 <CA+55aFwNU_ggMjguqFNHpY6r4UmsLuu3-rXKoNRi8umRNCRJQw@mail.gmail.com>
 <CA+55aFy7+6YgT9oZwO6xRBYiWh6uxmx7-=uV4X2xcAt9dswBZQ@mail.gmail.com>
 <20161025015554.GA495@swordfish>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20161025015554.GA495@swordfish>
User-Agent: Mutt/1.7.1 (2016-10-04)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On (10/25/16 10:55), Sergey Senozhatsky wrote:
> I think cont_flush() should grab the logbuf_lock lock, because
> it does log_store() and touches the cont.len. so something like
> this perhaps
> 
> diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
> index c7f490f..47f887c 100644
> --- a/kernel/printk/printk.c
> +++ b/kernel/printk/printk.c
> @@ -1608,13 +1608,20 @@ static struct cont {
>  
>  static bool cont_flush(void)
>  {
> +       unsigned long flags;
> +       bool flushed = false;
> +
> +       raw_spin_lock_irqsave(&logbuf_lock, flags);
>         if (!cont.len)
> -               return false;
> +               goto out;
>  
>         log_store(cont.facility, cont.level, cont.flags, cont.ts_nsec,
>                   NULL, 0, cont.buf, cont.len);
>         cont.len = 0;
> -       return true;
> +       flushed = true;
> +out:
> +       raw_spin_unlock_irqrestore(&logbuf_lock, flags);
> +       return flushed;
>  }


... clearly, wasn't tested at all! sorry about that.
what I meant was cont_flush() from deferred_cont_flush()->flush_timer().


diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index c7f490f..bd7841c 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -1619,7 +1619,14 @@ static bool cont_flush(void)
 
 static void flush_timer(unsigned long data)
 {
-	if (cont_flush())
+	unsigned long flags;
+	bool flushed;
+
+	raw_spin_lock_irqsave(&logbuf_lock, flags);
+	flushed = cont_flush();
+	raw_spin_unlock_irqrestore(&logbuf_lock, flags);
+
+	if (flushed)
 		wake_up_klogd();
 }

 	-ss