From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AG47ELuuyVcW93OQpWChtrH9oW/P2eaxzMVaHUJUZsW3nmKMmWAJ1auXOBqwVDimPSOTnacH5MyX ARC-Seal: i=1; a=rsa-sha256; t=1521800327; cv=none; d=google.com; s=arc-20160816; b=a56ssZ669qKi8uId4AfQPU6QcNvcLYnT39ZnVgLjQRBD1peRtpp/woGr0JQHIKjNiM X7Bf9+gfq3VzZBi44OmYAL5V6eGkoKxXw8osX4OOouG97+R7tlnFIGJlpSD/2Kc9gE50 sIFmhVJsr30iCIuf0ErU6zkgK3cmTQ+NE1OW6lWc40zSiCmXC61oikk03fmMCaVVdzWN 2Y3vo3ug8FdMJ7mq5rj16DDfYiO3H8rG2AhQK3fBz0IIzGPgfgG8AH1uIcW+9cSyxZmk EQbNjxM4WRIijMOhF0JPUmhsipqRJgiRsMo4enix0pFyYxD9yWvyvC8KQ5T1IxfZT4Ex kwCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=sJWpAyx6+sVtXQZrD2X1Wu0F1MOW2h+O00xCszRbaTw=; b=y1D/HBvnIZjKrhQADVDsZPXYEhuKPqMk9LXyVq7P0rKi9YpiobNyOSXdeIQZAV1HXr qu7C+z2woSHsR3ZJ+yWvE+ZbzpaaMkUX9JQ3H8lydiQ7z70IC2jKqAHNVaJPb937MWoH gF3EEYK5ND9aD8Z+y7XTsl32NCfqotyyZDGlPg2x6TsTBg/TgQjiD8o0ZHiSJCMChKq2 Ai5J3jmWGawzcT86DAQOZKU+pLTL7ds2nzMWS6KORRuSPi2zSHE0EYHdfbLKNq0BAiFb 46AgAe2tJajjXotSaGC+Z8kNjI5K0kIGTNuqLTggUyt67NipK3g5oq22Xrf0QaIpF402 4llw== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Robert Lippert , Corey Minyard , Sasha Levin Subject: [PATCH 3.18 29/47] ipmi/watchdog: fix wdog hang on panic waiting for ipmi response Date: Fri, 23 Mar 2018 10:55:20 +0100 Message-Id: <20180323094249.361719351@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180323094248.117679641@linuxfoundation.org> References: <20180323094248.117679641@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1595722653980136364?= X-GMAIL-MSGID: =?utf-8?q?1595723300395807852?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Robert Lippert [ Upstream commit 2c1175c2e8e5487233cabde358a19577562ac83e ] Commit c49c097610fe ("ipmi: Don't call receive handler in the panic context") means that the panic_recv_free is not called during a panic and the atomic count does not drop to 0. Fix this by only expecting one decrement of the atomic variable which comes from panic_smi_free. Signed-off-by: Robert Lippert Signed-off-by: Corey Minyard Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/char/ipmi/ipmi_watchdog.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- a/drivers/char/ipmi/ipmi_watchdog.c +++ b/drivers/char/ipmi/ipmi_watchdog.c @@ -509,7 +509,7 @@ static void panic_halt_ipmi_heartbeat(vo msg.cmd = IPMI_WDOG_RESET_TIMER; msg.data = NULL; msg.data_len = 0; - atomic_add(2, &panic_done_count); + atomic_add(1, &panic_done_count); rv = ipmi_request_supply_msgs(watchdog_user, (struct ipmi_addr *) &addr, 0, @@ -519,7 +519,7 @@ static void panic_halt_ipmi_heartbeat(vo &panic_halt_heartbeat_recv_msg, 1); if (rv) - atomic_sub(2, &panic_done_count); + atomic_sub(1, &panic_done_count); } static struct ipmi_smi_msg panic_halt_smi_msg = { @@ -543,12 +543,12 @@ static void panic_halt_ipmi_set_timeout( /* Wait for the messages to be free. */ while (atomic_read(&panic_done_count) != 0) ipmi_poll_interface(watchdog_user); - atomic_add(2, &panic_done_count); + atomic_add(1, &panic_done_count); rv = i_ipmi_set_timeout(&panic_halt_smi_msg, &panic_halt_recv_msg, &send_heartbeat_now); if (rv) { - atomic_sub(2, &panic_done_count); + atomic_sub(1, &panic_done_count); printk(KERN_WARNING PFX "Unable to extend the watchdog timeout."); } else {