From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E2F4664CEB; Tue, 23 Jan 2024 00:59:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705971593; cv=none; b=S/QloifcJPACCRrNdOzOYR8moPbY9uB+TevN0WBtL5y0UvveaJX0Ev2xoRkM6isH2x8WaG9Wzz6tfGZNc3scWQ685pXSsNLtCBdpJ1gDvls3N5srrLt8AT8ERYaKi17sO6fn/GXq5FUEINCPM174O4JuY3dGgQcCGhS1KWjREA4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705971593; c=relaxed/simple; bh=4RwgCmSODM/y/I8WQX0AJRwuR7f22gHDD1Jw8VF28QQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WyWsA09Kwqkx/fOf+u0Evp6chgYmqvIU2p+jO62Ztzcsc1wKqRJDjv1nL3M9ZZpg6rOOAEhsDjEvQf0x07wALsnvxKpPXtrxorBNvg4LFIbqXyD3X/NfYdeVqkqvNIgoxJ5iarw38TfW/SDarLI+Gpvl5pkwKQQOnMl3irAwz0E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=qRaUirwm; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="qRaUirwm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 67FC5C433F1; Tue, 23 Jan 2024 00:59:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1705971592; bh=4RwgCmSODM/y/I8WQX0AJRwuR7f22gHDD1Jw8VF28QQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qRaUirwmfIlE39RUisJJcULlZB0DJTf9SA3ix9A0Z50qweYX2MyThN5fIoJneFk5M 0hy4r/iqgiFqf9yBqywgR5kB2twaB9ty3cqmRVlB6xF9OTtTlzpdRq+ceHvzmg903I aMO/fhmXVBNx/d5uhBq1sHdGlvCaGfKkf802JuGg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jerry Hoemann , Guenter Roeck , Wim Van Sebroeck , Sasha Levin Subject: [PATCH 5.10 183/286] watchdog/hpwdt: Only claim UNKNOWN NMI if from iLO Date: Mon, 22 Jan 2024 15:58:09 -0800 Message-ID: <20240122235739.199388982@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240122235732.009174833@linuxfoundation.org> References: <20240122235732.009174833@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jerry Hoemann [ Upstream commit dced0b3e51dd2af3730efe14dd86b5e3173f0a65 ] Avoid unnecessary crashes by claiming only NMIs that are due to ERROR signalling or generated by the hpwdt hardware device. The code does this, but only for iLO5. The intent was to preserve legacy, Gen9 and earlier, semantics of using hpwdt for error containtment as hardware/firmware would signal fatal IO errors as an NMI with the expectation of hpwdt crashing the system. Howerver, these IO errors should be received by hpwdt as an NMI_IO_CHECK. So the test is overly permissive and should not be limited to only ilo5. We need to enable this protection for future iLOs not matching the current PCI IDs. Fixes: 62290a5c194b ("watchdog: hpwdt: Claim NMIs generated by iLO5") Signed-off-by: Jerry Hoemann Reviewed-by: Guenter Roeck Link: https://lore.kernel.org/r/20231213215340.495734-2-jerry.hoemann@hpe.com Signed-off-by: Guenter Roeck Signed-off-by: Wim Van Sebroeck Signed-off-by: Sasha Levin --- drivers/watchdog/hpwdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c index 7d34bcf1c45b..53573c3ddd1a 100644 --- a/drivers/watchdog/hpwdt.c +++ b/drivers/watchdog/hpwdt.c @@ -174,7 +174,7 @@ static int hpwdt_pretimeout(unsigned int ulReason, struct pt_regs *regs) "3. OA Forward Progress Log\n" "4. iLO Event Log"; - if (ilo5 && ulReason == NMI_UNKNOWN && !mynmi) + if (ulReason == NMI_UNKNOWN && !mynmi) return NMI_DONE; if (ilo5 && !pretimeout && !mynmi) -- 2.43.0