Received: by 2002:ac0:946b:0:0:0:0:0 with SMTP id j40csp2685196imj; Mon, 11 Feb 2019 07:01:31 -0800 (PST) X-Google-Smtp-Source: AHgI3IbUVlysjPeBQvkyc/kcvJilTxJ6p6312AjAMzeRzG4QU77VOMLP6zOXaMDRQWoaAMdOyGCA X-Received: by 2002:a62:f204:: with SMTP id m4mr3022242pfh.58.1549897290860; Mon, 11 Feb 2019 07:01:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549897290; cv=none; d=google.com; s=arc-20160816; b=azdH3B0lOYtsVpZcxvKOnNJ1LVnNqRCal+CNa301XuzxaMcAOMc1EQQQicZhmI9KVu T2nr9y7U3zJCL72MBZD8bYA6d5EDoi8OktOLuptF0zB+Rt/EPC4dEDl+N7NfVyOPhQ1x AbfRy7QZR1HwwDnt3oi3XtZoOmNvAoAmhGPiKRyppKvcyBV10UoQGImGbKGUQePjlhHc PtYqSwl2SbIMW/vUuj6SrnK+uXC12woY8H/QELwHuzGa9xRvWN80SkOA6XhH0FXYdmsA SEVo+DzS+ktONfswa+1tv0pdcrtFvPMnTtVJbB22AlF1QrVEWmjPfI8lbL0pGn/VU/tt DwFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=vb5rYGjMXiGCovk7JWSUZL2gEBpcmPeZKVdLviM8iBE=; b=MliITTHB02EKC0vyyfWwu3IFmEhbrK1aR2pbsaAqvXnfs4qMRgDN2Nrl7d+yAaYyC4 nIm66y+giYBhbBATMuxSzTURr4sP1Z68Ky0y62oi4Qa2pEZKPLuoJ/y/4d/fdTL2mure lfQtkVPLFOXRutEU+vo2f/d3nr2oLu2Tce3mw3jvE5o2A92w7+CXv27nvq714dQ4b+eU +zF0eDyIE8egKk8xEmEijCaECW2/tGmFUQfYzvXhwe4I8RaMG2SjQdPAVuMKPE7HYlxr Lkzdhs0HZy3+Jck5dbSeEs0YuY8vz9gbr9fotBGQwd4qJUMm6ZCmBLLvAWe1leYhCIu0 vueg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=b4GX8SeG; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d130si9531515pgc.232.2019.02.11.07.01.09; Mon, 11 Feb 2019 07:01:30 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=b4GX8SeG; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389954AbfBKPAM (ORCPT + 99 others); Mon, 11 Feb 2019 10:00:12 -0500 Received: from mail.kernel.org ([198.145.29.99]:48054 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389946AbfBKPAJ (ORCPT ); Mon, 11 Feb 2019 10:00:09 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 92B08206BA; Mon, 11 Feb 2019 15:00:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549897209; bh=XcyQ8FX7UTxIUBcY0ZfcRpbg6DZWjb4V37Y4hykWqMU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=b4GX8SeGKASzVau0TCXQS5PioNY2PwnOG956/Iw8hLiks+Gzey9VP/84ppVKaniup TG0d9huKzlidUsj/bEEfdZPDwQUAEiagsXuOJ1NoJ8oPspvrZPfV2sT6D0n8YN+Xnx KFcAK/zFWykSwgkQWJuItvyjMzlXF8G2wJRA/YrQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lenny Szubowicz , David Arcari , Tyler Baicar , Borislav Petkov , "Rafael J. Wysocki" , Sasha Levin Subject: [PATCH 4.14 127/205] ACPI/APEI: Clear GHES block_status before panic() Date: Mon, 11 Feb 2019 15:18:45 +0100 Message-Id: <20190211141836.763596106@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211141827.214852402@linuxfoundation.org> References: <20190211141827.214852402@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 98cff8b23ed1c763a029ee81ea300df0d153d07d ] In __ghes_panic() clear the block status in the APEI generic error status block for that generic hardware error source before calling panic() to prevent a second panic() in the crash kernel for exactly the same fatal error. Otherwise ghes_probe(), running in the crash kernel, would see an unhandled error in the APEI generic error status block and panic again, thereby precluding any crash dump. Signed-off-by: Lenny Szubowicz Signed-off-by: David Arcari Tested-by: Tyler Baicar Acked-by: Borislav Petkov Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- drivers/acpi/apei/ghes.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c index f14695e744d0..5889f6407fea 100644 --- a/drivers/acpi/apei/ghes.c +++ b/drivers/acpi/apei/ghes.c @@ -675,6 +675,8 @@ static void __ghes_panic(struct ghes *ghes) { __ghes_print_estatus(KERN_EMERG, ghes->generic, ghes->estatus); + ghes_clear_estatus(ghes); + /* reboot to log the error! */ if (!panic_timeout) panic_timeout = ghes_panic_timeout; -- 2.19.1