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 S1754806AbdESNC3 (ORCPT <rfc822;w@1wt.eu>);
        Fri, 19 May 2017 09:02:29 -0400
Received: from mx2.suse.de ([195.135.220.15]:43741 "EHLO mx1.suse.de"
        rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP
        id S1751598AbdESNC0 (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Fri, 19 May 2017 09:02:26 -0400
Date: Fri, 19 May 2017 15:02:23 +0200
From: Petr Mladek <pmladek@suse.com>
To: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>,
        Steven Rostedt <rostedt@goodmis.org>,
        Andrew Morton <akpm@linux-foundation.org>,
        Peter Zijlstra <peterz@infradead.org>,
        Russell King <rmk+kernel@arm.linux.org.uk>,
        Daniel Thompson <daniel.thompson@linaro.org>,
        Ingo Molnar <mingo@redhat.com>, Thomas Gleixner <tglx@linutronix.de>,
        Chris Metcalf <cmetcalf@ezchip.com>, x86@kernel.org,
        linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2] printk: Use the main logbuf in NMI when logbuf_lock
 is available
Message-ID: <20170519130223.GB12489@pathway.suse.cz>
References: <1493912763-24873-1-git-send-email-pmladek@suse.com>
 <20170519025803.GA593@jagdpanzerIV.localdomain>
 <20170519043815.GB593@jagdpanzerIV.localdomain>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20170519043815.GB593@jagdpanzerIV.localdomain>
User-Agent: Mutt/1.5.21 (2010-09-15)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Fri 2017-05-19 13:38:15, Sergey Senozhatsky wrote:
> On (05/19/17 11:58), Sergey Senozhatsky wrote:
> > >  void printk_nmi_exit(void)
> > >  {
> > > -	this_cpu_and(printk_context, ~PRINTK_NMI_CONTEXT_MASK);
> > > +	this_cpu_and(printk_context,
> > > +		     ~(PRINTK_NMI_CONTEXT_MASK ||
> > > +		       PRINTK_NMI_DEFERRED_CONTEXT_MASK));
> > >  }
> 
> [..]
> 
> > the problem is that
> > 
> > 	`PRINTK_NMI_CONTEXT_MASK || PRINTK_NMI_DEFERRED_CONTEXT_MASK' is 0x01
> 
> d'oh... forgot to copy-paste this...

Grrr, thanks a lot for chasing this down and I am sorry for the troubles.

> ---
> 
> diff --git a/kernel/printk/printk_safe.c b/kernel/printk/printk_safe.c
> index 6fec9cfb9a69..b6ff3fe4370a 100644
> --- a/kernel/printk/printk_safe.c
> +++ b/kernel/printk/printk_safe.c
> @@ -324,7 +324,7 @@ void printk_nmi_enter(void)
>  void printk_nmi_exit(void)
>  {
>         this_cpu_and(printk_context,
> -                    ~(PRINTK_NMI_CONTEXT_MASK ||
> +                    ~(PRINTK_NMI_CONTEXT_MASK |
>                        PRINTK_NMI_DEFERRED_CONTEXT_MASK));
>  }

I have rebased both for-4.13 and for-next branches in printk.git
with this fix. I wanted to get rid of this bug in linux-next
ASAP. Please, let me know if you would prefer to handle
this another way in the future.

Best Regards,
Petr