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=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 54C44C43333 for ; Wed, 23 Dec 2020 02:33:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 275A822257 for ; Wed, 23 Dec 2020 02:33:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730702AbgLWCdM (ORCPT ); Tue, 22 Dec 2020 21:33:12 -0500 Received: from mail.kernel.org ([198.145.29.99]:55146 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730426AbgLWCZP (ORCPT ); Tue, 22 Dec 2020 21:25:15 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3C9C52313F; Wed, 23 Dec 2020 02:24:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1608690299; bh=W87wdJFW4bn3OwkdIbOKX3tnUCR9vIptM5VXATAwiQc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BepywIVE4FwqVknpdgZDYJSUp04hJDE8AbECVYgS4STKzb1EnE6WKZ+KikOGV19nr uANXY/2c94p19O6jQVPYGs081K2b+MQ5XG1oosdZ2e704U/24QmV5PsU1rp2umOTo4 x4r4XattYoCfMttE9+uSWbuxkBPL3kw3HeC2faJokWs3wh2f95N5UivSleo5HA/3Jd A/v3eNZyblSjfLqYipV4SimW05mDltUhvo6SpkvAJ7eje6o2AyUIhcWkZ3xRrRu/3E pheYGwNvrowQrsv5XKfI9BY2CCowS4EUbI3mGqCO0wZ/lvvYqlGgc0cbMrmFZkzc1y XOph15j/M6/Xw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Gabriele Paoloni , Borislav Petkov , Tony Luck , Sasha Levin Subject: [PATCH AUTOSEL 4.9 35/48] x86/mce: Panic for LMCE only if mca_cfg.tolerant < 3 Date: Tue, 22 Dec 2020 21:24:03 -0500 Message-Id: <20201223022417.2794032-35-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201223022417.2794032-1-sashal@kernel.org> References: <20201223022417.2794032-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Gabriele Paoloni [ Upstream commit 3a866b16fd2360a9c4ebf71cfbf7ebfe968c1409 ] Right now for LMCE, if no_way_out is set, mce_panic() is called regardless of mca_cfg.tolerant. This is not correct as, if mca_cfg.tolerant = 3, the code should never panic. Add that check. [ bp: use local ptr 'cfg'. ] Signed-off-by: Gabriele Paoloni Signed-off-by: Borislav Petkov Reviewed-by: Tony Luck Link: https://lkml.kernel.org/r/20201127161819.3106432-4-gabriele.paoloni@intel.com Signed-off-by: Sasha Levin --- arch/x86/kernel/cpu/mcheck/mce.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index 07188a0124922..c0e85ad111de8 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -1182,7 +1182,7 @@ void do_machine_check(struct pt_regs *regs, long error_code) * to see it will clear it. */ if (lmce) { - if (no_way_out) + if (no_way_out && cfg->tolerant < 3) mce_panic("Fatal local machine check", &m, msg); } else { order = mce_start(&no_way_out); -- 2.27.0