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 S938735AbcJaK5s (ORCPT <rfc822;w@1wt.eu>);
        Mon, 31 Oct 2016 06:57:48 -0400
Received: from mail.skyhub.de ([78.46.96.112]:33399 "EHLO mail.skyhub.de"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S936089AbcJaK5r (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Mon, 31 Oct 2016 06:57:47 -0400
Date: Mon, 31 Oct 2016 11:57:42 +0100
From: Borislav Petkov <bp@alien8.de>
To: Yinghai Lu <yinghai@kernel.org>
Cc: Tony Luck <tony.luck@intel.com>,
        the arch/x86 maintainers <x86@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        linux-edac@vger.kernel.org, Yinghai Lu <yinghai.lu@oracle.com>
Subject: Re: [RFC PATCH] x86: Do not panic if mce=2 is passed
Message-ID: <20161031105742.5isego5fntkjj7mz@pd.tnic>
References: <20160916202325.4972-1-yinghai@kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <20160916202325.4972-1-yinghai@kernel.org>
User-Agent: NeoMutt/20161014 (1.7.1)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Fri, Sep 16, 2016 at 01:23:25PM -0700, Yinghai Lu wrote:
> From: Yinghai Lu <yinghai.lu@oracle.com>
> 
> For UE recovery support, current we need mce=2 in command line
> and also disable panic_on_oops with sysctl.
> 
> but other user may still need to have panic_on_oops to 1 always.
> 
> We can remove checking of panic_on_oops for mce-severity path.
> 
> We should be ok as on default path when mce=2 is not passed, tolerant
> is 0, so they will still get MCE_PANIC_SEVERITY returned.
> 
> Signed-off-by: Yinghai Lu <yinghai.lu@oracle.com>
> 
> 
> ---
>  arch/x86/kernel/cpu/mcheck/mce-severity.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Index: linux-2.6/arch/x86/kernel/cpu/mcheck/mce-severity.c
> ===================================================================
> --- linux-2.6.orig/arch/x86/kernel/cpu/mcheck/mce-severity.c
> +++ linux-2.6/arch/x86/kernel/cpu/mcheck/mce-severity.c
> @@ -311,7 +311,7 @@ static int mce_severity_intel(struct mce
>  			*msg = s->msg;
>  		s->covered = 1;
>  		if (s->sev >= MCE_UC_SEVERITY && ctx == IN_KERNEL) {
> -			if (panic_on_oops || tolerant < 1)
> +			if (tolerant < 1)
>  				return MCE_PANIC_SEVERITY;
>  		}
>  		return s->sev;

Applied,
thanks.

-- 
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.