linux-watchdog.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com>
To: Andrew Morton <akpm@linux-foundation.org>,
	Thomas Mingarelli <thomas.mingarelli@hpe.com>,
	Wim Van Sebroeck <wim@iguana.be>, Corey Minyard <minyard@acm.org>
Cc: openipmi-developer@lists.sourceforge.net,
	Michal Hocko <mhocko@kernel.org>, Borislav Petkov <bp@alien8.de>,
	linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/3] ipmi/watchdog: Use nmi_panic() when kernel panics in NMI handler
Date: Tue, 01 Mar 2016 10:50:39 +0900	[thread overview]
Message-ID: <20160301015039.4318.58063.stgit@softrs> (raw)
In-Reply-To: <20160301015035.4318.78677.stgit@softrs>

commit 58c5661f2144 ("panic, x86: Allow CPUs to save registers even
if looping in NMI context") introduced nmi_panic() which prevents
concurrent/recursive execution of panic().  It also saves registers
for the crash dump on x86.

ipmi_watchdog driver can call panic() from NMI handler, so replace
it with nmi_panic().

Signed-off-by: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com>
Cc: Corey Minyard <minyard@acm.org>
Cc: openipmi-developer@lists.sourceforge.net
---
 drivers/char/ipmi/ipmi_watchdog.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c
index 096f0ce..4facc75 100644
--- a/drivers/char/ipmi/ipmi_watchdog.c
+++ b/drivers/char/ipmi/ipmi_watchdog.c
@@ -1140,7 +1140,7 @@ ipmi_nmi(unsigned int val, struct pt_regs *regs)
 		   the timer.   So do so. */
 		pretimeout_since_last_heartbeat = 1;
 		if (atomic_inc_and_test(&preop_panic_excl))
-			panic(PFX "pre-timeout");
+			nmi_panic(regs, PFX "pre-timeout");
 	}
 
 	return NMI_HANDLED;



  parent reply	other threads:[~2016-03-01  1:57 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-01  1:50 [PATCH 0/3] Use nmi_panic() in panic on NMI case Hidehiro Kawai
2016-03-01  1:50 ` [PATCH 1/3] panic: Export panic_cpu and nmi_panic_self_stop Hidehiro Kawai
2016-03-01  7:24   ` Borislav Petkov
2016-03-01  7:48     ` 河合英宏 / KAWAI,HIDEHIRO
2016-03-01  8:49       ` Michal Hocko
2016-03-01  1:50 ` Hidehiro Kawai [this message]
2016-03-01  2:30   ` [PATCH 2/3] ipmi/watchdog: Use nmi_panic() when kernel panics in NMI handler Corey Minyard
2016-03-01  4:23     ` 河合英宏 / KAWAI,HIDEHIRO
2016-03-01  5:12       ` Guenter Roeck
2016-03-01  2:56   ` Guenter Roeck
2016-03-01  8:50   ` Michal Hocko
2016-03-01  1:50 ` [PATCH 3/3] hpwdt: " Hidehiro Kawai
2016-03-01  2:55   ` Guenter Roeck
2016-03-01  3:54     ` 河合英宏 / KAWAI,HIDEHIRO

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160301015039.4318.58063.stgit@softrs \
    --to=hidehiro.kawai.ez@hitachi.com \
    --cc=akpm@linux-foundation.org \
    --cc=bp@alien8.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-watchdog@vger.kernel.org \
    --cc=mhocko@kernel.org \
    --cc=minyard@acm.org \
    --cc=openipmi-developer@lists.sourceforge.net \
    --cc=thomas.mingarelli@hpe.com \
    --cc=wim@iguana.be \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).