Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp660422pxv; Thu, 15 Jul 2021 12:46:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxzBOcwcEG4DD8Gzxk3RzpCx4lSo1QHRTGgHbk9ZXbvw5sos9onBRBEtQL6Kx7QtETy/kOe X-Received: by 2002:a17:906:3e8a:: with SMTP id a10mr7250254ejj.479.1626378373846; Thu, 15 Jul 2021 12:46:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626378373; cv=none; d=google.com; s=arc-20160816; b=LX+s0Js2+5GeHQKeff4FG3QbCL7+Y/3+YuQwv8eGLd7Q31ZeGP6pl9BFaGtDY5uxpY ZdtayfE8cuOdDYZ4+vZL11diwj2OcPP5dFN2RkY9LNEsrKNrbXPIHqtNRmbYMX9BeHT7 VqWa2oLcbG9a7oNmsSkT8pT95A7FoQqBlalVuEtPn+UvpGr3fZ3iWNOZzuzW2DxVowAz 0ti9OjUKsohHsXLD5cUsjv21QocqR3+JhQOvLFvXTeE3p+YbAcS396XHYHjvhrs0Y5cG j5G3IUuMMGAQITgjqMAJL1+IaUVh4vDoXQ+Gr4EnL020a4ICj8A3V3mahJRp6+pDJXcb fQ/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=bpFcJJ/hU9WObCORE1XVIZHvr2MYEKvxxb2vd4nLFWA=; b=puPSmSJtyhKAAkSJtpWXyRSD/kfusxtWN7/ZlYlra4LNJVBn3NiLFcEwg/XFCMs36W VrFtYAVhXyPU0d95xzpfBFnRhy9NwZB4egSEe/qyhayc5NJYN75XlLNNoC7QzmDhJMJc 0sT2cuLNjg9XI6O98pE2ExJaghwFb02jPTldBUSHsfUQYHm6yWpVNuSYCuPVeh4tcMOU ueLlgcVwIyEmOOfjShqJPeDPpdzOjP5d8tp/abvXANCoStNuRldYHk+NLCQfslyPMeqe K6r1AgIeObTMMlayEwW/qNwkyZKDEe03k00xu/yDXWdHqXf6eCDwQ5bwi/YHdjKBH1IT crTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="g/h5rUhe"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id l25si8803301edw.513.2021.07.15.12.45.51; Thu, 15 Jul 2021 12:46:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="g/h5rUhe"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345846AbhGOTpa (ORCPT + 99 others); Thu, 15 Jul 2021 15:45:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:50134 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242435AbhGOTPU (ORCPT ); Thu, 15 Jul 2021 15:15:20 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 101CB6127C; Thu, 15 Jul 2021 19:11:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626376318; bh=lujL2cvlgyfZDifBxwWYnoklm+/o68G+SorLx8OaS6U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g/h5rUheJyj2Etir/q5ip3MSsoy1e+ZRDuWOA9QJGSId2xRtWvfv9LWEUFCSgERcK zlUrbkiStAUeWSrpo4q6BomHvqPBr4Owa02/9MlVXK6Y7ihFNNxXnYFenP/WC3Xosx 6DEKiB7z7HB7NTCAg8FgaLaOdbM6TiO+uVdVff3E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Petr Pavlu , Corey Minyard Subject: [PATCH 5.13 221/266] ipmi/watchdog: Stop watchdog timer when the current action is none Date: Thu, 15 Jul 2021 20:39:36 +0200 Message-Id: <20210715182648.381496973@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210715182613.933608881@linuxfoundation.org> References: <20210715182613.933608881@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Petr Pavlu commit 2253042d86f57d90a621ac2513a7a7a13afcf809 upstream. When an IPMI watchdog timer is being stopped in ipmi_close() or ipmi_ioctl(WDIOS_DISABLECARD), the current watchdog action is updated to WDOG_TIMEOUT_NONE and _ipmi_set_timeout(IPMI_SET_TIMEOUT_NO_HB) is called to install this action. The latter function ends up invoking __ipmi_set_timeout() which makes the actual 'Set Watchdog Timer' IPMI request. For IPMI 1.0, this operation results in fully stopping the watchdog timer. For IPMI >= 1.5, function __ipmi_set_timeout() always specifies the "don't stop" flag in the prepared 'Set Watchdog Timer' IPMI request. This causes that the watchdog timer has its action correctly updated to 'none' but the timer continues to run. A problem is that IPMI firmware can then still log an expiration event when the configured timeout is reached, which is unexpected because the watchdog timer was requested to be stopped. The patch fixes this problem by not setting the "don't stop" flag in __ipmi_set_timeout() when the current action is WDOG_TIMEOUT_NONE which results in stopping the watchdog timer. This makes the behaviour for IPMI >= 1.5 consistent with IPMI 1.0. It also matches the logic in __ipmi_heartbeat() which does not allow to reset the watchdog if the current action is WDOG_TIMEOUT_NONE as that would start the timer. Signed-off-by: Petr Pavlu Message-Id: <10a41bdc-9c99-089c-8d89-fa98ce5ea080@suse.com> Cc: stable@vger.kernel.org Signed-off-by: Corey Minyard Signed-off-by: Greg Kroah-Hartman --- drivers/char/ipmi/ipmi_watchdog.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) --- a/drivers/char/ipmi/ipmi_watchdog.c +++ b/drivers/char/ipmi/ipmi_watchdog.c @@ -371,16 +371,18 @@ static int __ipmi_set_timeout(struct ipm data[0] = 0; WDOG_SET_TIMER_USE(data[0], WDOG_TIMER_USE_SMS_OS); - if ((ipmi_version_major > 1) - || ((ipmi_version_major == 1) && (ipmi_version_minor >= 5))) { - /* This is an IPMI 1.5-only feature. */ - data[0] |= WDOG_DONT_STOP_ON_SET; - } else if (ipmi_watchdog_state != WDOG_TIMEOUT_NONE) { - /* - * In ipmi 1.0, setting the timer stops the watchdog, we - * need to start it back up again. - */ - hbnow = 1; + if (ipmi_watchdog_state != WDOG_TIMEOUT_NONE) { + if ((ipmi_version_major > 1) || + ((ipmi_version_major == 1) && (ipmi_version_minor >= 5))) { + /* This is an IPMI 1.5-only feature. */ + data[0] |= WDOG_DONT_STOP_ON_SET; + } else { + /* + * In ipmi 1.0, setting the timer stops the watchdog, we + * need to start it back up again. + */ + hbnow = 1; + } } data[1] = 0;