leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kernel/watchdog: introduce arch_touch_nmi_watchdog()

Browse Source 
For architectures that define HAVE_NMI_WATCHDOG, instead of having them
provide the complete touch_nmi_watchdog() function, just have them
provide arch_touch_nmi_watchdog().

This gives the generic code more flexibility in implementing this
function, and arch implementations don't miss out on touching the
softlockup watchdog or other generic details.

Link: http://lkml.kernel.org/r/20170616065715.18390-3-npiggin@gmail.com
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Reviewed-by: Don Zickus <dzickus@redhat.com>
Reviewed-by: Babu Moger <babu.moger@oracle.com>
Tested-by: Babu Moger <babu.moger@oracle.com>	[sparc]
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Nicholas Piggin
2017-07-12 14:35:43 -07:00
committed by Linus Torvalds
parent 24bb44612c
commit f2e0cff85e
9 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/blackfin/include/asm/nmi.h
View File

@@ -9,4 +9,6 @@
#include <linux/nmi.h> #include <linux/nmi.h>
extern void arch_touch_nmi_watchdog(void);
#endif #endif

2
arch/blackfin/kernel/nmi.c
View File

@@ -190,7 +190,7 @@ static int __init init_nmi_wdt(void)
} }
device_initcall(init_nmi_wdt); device_initcall(init_nmi_wdt);
void touch_nmi_watchdog(void) void arch_touch_nmi_watchdog(void)
{ {
atomic_set(&nmi_touched[smp_processor_id()], 1); atomic_set(&nmi_touched[smp_processor_id()], 1);
} }

2
arch/mn10300/include/asm/nmi.h
View File

@@ -11,4 +11,6 @@
#ifndef _ASM_NMI_H #ifndef _ASM_NMI_H
#define _ASM_NMI_H #define _ASM_NMI_H
extern void arch_touch_nmi_watchdog(void);
#endif /* _ASM_NMI_H */ #endif /* _ASM_NMI_H */

8
arch/mn10300/kernel/mn10300-watchdog-low.S
View File

@@ -50,9 +50,9 @@ watchdog_handler:
# we can't inline it) # we can't inline it)
# #
############################################################################### ###############################################################################
.globl touch_nmi_watchdog .globl arch_touch_nmi_watchdog
.type touch_nmi_watchdog,@function .type arch_touch_nmi_watchdog,@function
touch_nmi_watchdog: arch_touch_nmi_watchdog:
clr d0 clr d0
clr d1 clr d1
mov watchdog_alert_counter, a0 mov watchdog_alert_counter, a0
@@ -63,4 +63,4 @@ touch_nmi_watchdog:
lne lne
ret [],0 ret [],0
.size touch_nmi_watchdog,.-touch_nmi_watchdog .size arch_touch_nmi_watchdog,.-arch_touch_nmi_watchdog

2
arch/mn10300/kernel/mn10300-watchdog.c
View File

@@ -31,7 +31,7 @@ static unsigned int watchdog;
static unsigned int watchdog_hz = 1; static unsigned int watchdog_hz = 1;
unsigned int watchdog_alert_counter[NR_CPUS]; unsigned int watchdog_alert_counter[NR_CPUS];
EXPORT_SYMBOL(touch_nmi_watchdog); EXPORT_SYMBOL(arch_touch_nmi_watchdog);
/* /*
* the best way to detect whether a CPU has a 'hard lockup' problem * the best way to detect whether a CPU has a 'hard lockup' problem

1
arch/sparc/include/asm/nmi.h
View File

@@ -7,6 +7,7 @@ void nmi_adjust_hz(unsigned int new_hz);
extern atomic_t nmi_active; extern atomic_t nmi_active;
void arch_touch_nmi_watchdog(void);
void start_nmi_watchdog(void *unused); void start_nmi_watchdog(void *unused);
void stop_nmi_watchdog(void *unused); void stop_nmi_watchdog(void *unused);

6
arch/sparc/kernel/nmi.c
View File

@@ -51,7 +51,7 @@ static DEFINE_PER_CPU(unsigned int, last_irq_sum);
static DEFINE_PER_CPU(long, alert_counter); static DEFINE_PER_CPU(long, alert_counter);
static DEFINE_PER_CPU(int, nmi_touch); static DEFINE_PER_CPU(int, nmi_touch);
void touch_nmi_watchdog(void) void arch_touch_nmi_watchdog(void)
{ {
if (atomic_read(&nmi_active)) { if (atomic_read(&nmi_active)) {
int cpu; int cpu;
@@ -61,10 +61,8 @@ void touch_nmi_watchdog(void)
per_cpu(nmi_touch, cpu) = 1; per_cpu(nmi_touch, cpu) = 1;
} }
} }
touch_softlockup_watchdog();
} }
EXPORT_SYMBOL(touch_nmi_watchdog); EXPORT_SYMBOL(arch_touch_nmi_watchdog);
static void die_nmi(const char *str, struct pt_regs *regs, int do_panic) static void die_nmi(const char *str, struct pt_regs *regs, int do_panic)
{ {

27
include/linux/nmi.h
View File

@@ -6,6 +6,9 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <asm/irq.h> #include <asm/irq.h>
#if defined(CONFIG_HAVE_NMI_WATCHDOG)
#include <asm/nmi.h>
#endif
#ifdef CONFIG_LOCKUP_DETECTOR #ifdef CONFIG_LOCKUP_DETECTOR
extern void touch_softlockup_watchdog_sched(void); extern void touch_softlockup_watchdog_sched(void);
@@ -58,6 +61,18 @@ static inline void reset_hung_task_detector(void)
#define NMI_WATCHDOG_ENABLED (1 << NMI_WATCHDOG_ENABLED_BIT) #define NMI_WATCHDOG_ENABLED (1 << NMI_WATCHDOG_ENABLED_BIT)
#define SOFT_WATCHDOG_ENABLED (1 << SOFT_WATCHDOG_ENABLED_BIT) #define SOFT_WATCHDOG_ENABLED (1 << SOFT_WATCHDOG_ENABLED_BIT)
#if defined(CONFIG_HARDLOCKUP_DETECTOR)
extern void hardlockup_detector_disable(void);
#else
static inline void hardlockup_detector_disable(void) {}
#endif
#if defined(CONFIG_HARDLOCKUP_DETECTOR) || defined(CONFIG_HAVE_NMI_WATCHDOG)
extern void arch_touch_nmi_watchdog(void);
#else
static inline void arch_touch_nmi_watchdog(void) {}
#endif
/** /**
* touch_nmi_watchdog - restart NMI watchdog timeout. * touch_nmi_watchdog - restart NMI watchdog timeout.
* *
@@ -65,21 +80,11 @@ static inline void reset_hung_task_detector(void)
* may be used to reset the timeout - for code which intentionally * may be used to reset the timeout - for code which intentionally
* disables interrupts for a long time. This call is stateless. * disables interrupts for a long time. This call is stateless.
*/ */
#if defined(CONFIG_HAVE_NMI_WATCHDOG) || defined(CONFIG_HARDLOCKUP_DETECTOR)
#include <asm/nmi.h>
extern void touch_nmi_watchdog(void);
#else
static inline void touch_nmi_watchdog(void) static inline void touch_nmi_watchdog(void)
{ {
arch_touch_nmi_watchdog();
touch_softlockup_watchdog(); touch_softlockup_watchdog();
} }
#endif
#if defined(CONFIG_HARDLOCKUP_DETECTOR)
extern void hardlockup_detector_disable(void);
#else
static inline void hardlockup_detector_disable(void) {}
#endif
/* /*
* Create trigger_all_cpu_backtrace() out of the arch-provided * Create trigger_all_cpu_backtrace() out of the arch-provided

5
kernel/watchdog_hld.c
View File

@@ -56,7 +56,7 @@ static int __init hardlockup_panic_setup(char *str)
} }
__setup("nmi_watchdog=", hardlockup_panic_setup); __setup("nmi_watchdog=", hardlockup_panic_setup);
void touch_nmi_watchdog(void) void arch_touch_nmi_watchdog(void)
{ {
/* /*
* Using __raw here because some code paths have * Using __raw here because some code paths have
@@ -66,9 +66,8 @@ void touch_nmi_watchdog(void)
* going off. * going off.
*/ */
raw_cpu_write(watchdog_nmi_touch, true); raw_cpu_write(watchdog_nmi_touch, true);
touch_softlockup_watchdog();
} }
EXPORT_SYMBOL(touch_nmi_watchdog); EXPORT_SYMBOL(arch_touch_nmi_watchdog);
static struct perf_event_attr wd_hw_attr = { static struct perf_event_attr wd_hw_attr = {
.type = PERF_TYPE_HARDWARE, .type = PERF_TYPE_HARDWARE,