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=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 7E3BBC04E53 for ; Wed, 15 May 2019 12:09:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4EFF920657 for ; Wed, 15 May 2019 12:09:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557922186; bh=jlctFPLw9QXabjpGlzU77A6ZhGNjR2HWwduwPjTiisI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=dvXbIlfTt+92rOayjHJagoIFWrcXFAh/LqUeHa443WRBzznvuO73yB/5lGRVhaYfz HPgV/sQKQovbfik1j2AVxvlSOK0dUxPSXIO3io9oYBUc8PqYfg3g8T6wlkMJL7dlfU w3R7sCFUi/JvWBZBBNSivbp5Nix+C17nBU5XcKI0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728971AbfEOLHo (ORCPT ); Wed, 15 May 2019 07:07:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:39638 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728966AbfEOLHo (ORCPT ); Wed, 15 May 2019 07:07:44 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4940B20644; Wed, 15 May 2019 11:07:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557918463; bh=jlctFPLw9QXabjpGlzU77A6ZhGNjR2HWwduwPjTiisI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Kvpq5RUTL/bzZnWV+SS+VzSGMVfU5gRI9d7mjVRt8zgi1msvysxVT7maT7tshsiUl 6SnqLc36U/Z7/HdiW2DO8qcYdFWwI4q0BY0/nJYheabx2U8PSRmTrFLlMp4ARKFMgD 9/QspDkww2eqMm62oCLl1Pr8aI7zJ0H6O6UXfDaE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tony Luck , Borislav Petkov , "H. Peter Anvin" , Ingo Molnar , Pu Wen , Thomas Gleixner , x86-ml Subject: [PATCH 4.4 141/266] x86/mce: Improve error message when kernel cannot recover, p2 Date: Wed, 15 May 2019 12:54:08 +0200 Message-Id: <20190515090727.675613246@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190515090722.696531131@linuxfoundation.org> References: <20190515090722.696531131@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Tony Luck commit 41f035a86b5b72a4f947c38e94239d20d595352a upstream. In c7d606f560e4 ("x86/mce: Improve error message when kernel cannot recover") a case was added for a machine check caused by a DATA access to poison memory from the kernel. A case should have been added also for an uncorrectable error during an instruction fetch in the kernel. Add that extra case so the error message now reads: mce: [Hardware Error]: Machine check: Instruction fetch error in kernel Fixes: c7d606f560e4 ("x86/mce: Improve error message when kernel cannot recover") Signed-off-by: Tony Luck Signed-off-by: Borislav Petkov Cc: "H. Peter Anvin" Cc: Ingo Molnar Cc: Pu Wen Cc: Thomas Gleixner Cc: x86-ml Link: https://lkml.kernel.org/r/20190225205940.15226-1-tony.luck@intel.com Signed-off-by: Greg Kroah-Hartman --- arch/x86/kernel/cpu/mcheck/mce-severity.c | 5 +++++ 1 file changed, 5 insertions(+) --- a/arch/x86/kernel/cpu/mcheck/mce-severity.c +++ b/arch/x86/kernel/cpu/mcheck/mce-severity.c @@ -132,6 +132,11 @@ static struct severity { SER, MASK(MCI_STATUS_OVER|MCI_UC_SAR|MCI_ADDR|MCACOD, MCI_UC_SAR|MCI_ADDR|MCACOD_INSTR), USER ), + MCESEV( + PANIC, "Instruction fetch error in kernel", + SER, MASK(MCI_STATUS_OVER|MCI_UC_SAR|MCI_ADDR|MCACOD, MCI_UC_SAR|MCI_ADDR|MCACOD_INSTR), + KERNEL + ), #endif MCESEV( PANIC, "Action required: unknown MCACOD",