From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 33DBDC35256 for ; Wed, 16 Sep 2020 09:00:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 058B620708 for ; Wed, 16 Sep 2020 09:00:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726645AbgIPJAl (ORCPT ); Wed, 16 Sep 2020 05:00:41 -0400 Received: from mx2.suse.de ([195.135.220.15]:55062 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726196AbgIPJAg (ORCPT ); Wed, 16 Sep 2020 05:00:36 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 40B73ADBD; Wed, 16 Sep 2020 09:00:50 +0000 (UTC) Date: Wed, 16 Sep 2020 11:00:32 +0200 From: Michal =?iso-8859-1?Q?Such=E1nek?= To: peterz@infradead.org Cc: linuxppc-dev@lists.ozlabs.org, Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Nicholas Piggin , Santosh Sivaraj , Christophe Leroy , Ganesh Goudar , Mahesh Salgaonkar , Alistair Popple , Jordan Niethe , Mike Rapoport , "Aneesh Kumar K.V" , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: Re: [PATCH] Revert "powerpc/64s: machine check interrupt update NMI accounting" Message-ID: <20200916090032.GO29778@kitsune.suse.cz> References: <20200915084302.GG29778@kitsune.suse.cz> <20200915180659.12503-1-msuchanek@suse.de> <20200915181642.GF2674@hirez.programming.kicks-ass.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200915181642.GF2674@hirez.programming.kicks-ass.net> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Sep 15, 2020 at 08:16:42PM +0200, peterz@infradead.org wrote: > On Tue, Sep 15, 2020 at 08:06:59PM +0200, Michal Suchanek wrote: > > This reverts commit 116ac378bb3ff844df333e7609e7604651a0db9d. > > > > This commit causes the kernel to oops and reboot when injecting a SLB > > multihit which causes a MCE. > > > > Before this commit a SLB multihit was corrected by the kernel and the > > system continued to operate normally. > > > > cc: stable@vger.kernel.org > > Fixes: 116ac378bb3f ("powerpc/64s: machine check interrupt update NMI accounting") > > Signed-off-by: Michal Suchanek > > Ever since 69ea03b56ed2 ("hardirq/nmi: Allow nested nmi_enter()") > nmi_enter() supports nesting natively. And this patch was merged in parallel with this native nesting support and conflicted with it - hence the explicit nesting in the hunk that did not conflict. Either way the bug is present on kernels both with and without 69ea03b56ed2. So besides the conflict 69ea03b56ed2 does not affect this problem. Thanks Michal From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A4983C433E2 for ; Wed, 16 Sep 2020 09:02:42 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A35FD20708 for ; Wed, 16 Sep 2020 09:02:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A35FD20708 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4BrvHy2mxpzDqWG for ; Wed, 16 Sep 2020 19:02:38 +1000 (AEST) Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=suse.de (client-ip=195.135.220.15; helo=mx2.suse.de; envelope-from=msuchanek@suse.de; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=suse.de Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4BrvFg11w6zDq8W for ; Wed, 16 Sep 2020 19:00:39 +1000 (AEST) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 40B73ADBD; Wed, 16 Sep 2020 09:00:50 +0000 (UTC) Date: Wed, 16 Sep 2020 11:00:32 +0200 From: Michal =?iso-8859-1?Q?Such=E1nek?= To: peterz@infradead.org Subject: Re: [PATCH] Revert "powerpc/64s: machine check interrupt update NMI accounting" Message-ID: <20200916090032.GO29778@kitsune.suse.cz> References: <20200915084302.GG29778@kitsune.suse.cz> <20200915180659.12503-1-msuchanek@suse.de> <20200915181642.GF2674@hirez.programming.kicks-ass.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200915181642.GF2674@hirez.programming.kicks-ass.net> User-Agent: Mutt/1.10.1 (2018-07-13) X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Aneesh Kumar K.V" , Santosh Sivaraj , Alistair Popple , Greg Kroah-Hartman , Mahesh Salgaonkar , Nicholas Piggin , linux-kernel@vger.kernel.org, Jordan Niethe , Paul Mackerras , Ganesh Goudar , stable@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Mike Rapoport Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" On Tue, Sep 15, 2020 at 08:16:42PM +0200, peterz@infradead.org wrote: > On Tue, Sep 15, 2020 at 08:06:59PM +0200, Michal Suchanek wrote: > > This reverts commit 116ac378bb3ff844df333e7609e7604651a0db9d. > > > > This commit causes the kernel to oops and reboot when injecting a SLB > > multihit which causes a MCE. > > > > Before this commit a SLB multihit was corrected by the kernel and the > > system continued to operate normally. > > > > cc: stable@vger.kernel.org > > Fixes: 116ac378bb3f ("powerpc/64s: machine check interrupt update NMI accounting") > > Signed-off-by: Michal Suchanek > > Ever since 69ea03b56ed2 ("hardirq/nmi: Allow nested nmi_enter()") > nmi_enter() supports nesting natively. And this patch was merged in parallel with this native nesting support and conflicted with it - hence the explicit nesting in the hunk that did not conflict. Either way the bug is present on kernels both with and without 69ea03b56ed2. So besides the conflict 69ea03b56ed2 does not affect this problem. Thanks Michal