niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

watchdog: introduce the hardlockup_detector_disable() function

Browse source 
Have kvm_guest_init() use hardlockup_detector_disable() instead of
watchdog_enable_hardlockup_detector(false).

Remove the watchdog_hardlockup_detector_is_enabled() and the
watchdog_enable_hardlockup_detector() function which are no longer needed.

Signed-off-by: Ulrich Obergfell <uobergfe@redhat.com>
Signed-off-by: Don Zickus <dzickus@redhat.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Ulrich Obergfell 2015-04-14 15:44:19 -07:00 • committed by Linus Torvalds
parent b2f57c3a0d
commit 692297d8f9
3 changed files with 5 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/x86/kernel/kvm.c
View file

@ -513,7 +513,7 @@ void __init kvm_guest_init(void)
* can get false positives too easily, for example if the host is * can get false positives too easily, for example if the host is
* overcommitted. * overcommitted.
*/ */
watchdog_enable_hardlockup_detector(false); hardlockup_detector_disable();
} }
static noinline uint32_t __kvm_cpuid_base(void) static noinline uint32_t __kvm_cpuid_base(void)

9
include/linux/nmi.h
View file

@ -25,16 +25,11 @@ static inline void touch_nmi_watchdog(void)
#endif #endif
#if defined(CONFIG_HARDLOCKUP_DETECTOR) #if defined(CONFIG_HARDLOCKUP_DETECTOR)
extern void watchdog_enable_hardlockup_detector(bool val); extern void hardlockup_detector_disable(void);
extern bool watchdog_hardlockup_detector_is_enabled(void);
#else #else
static inline void watchdog_enable_hardlockup_detector(bool val) static inline void hardlockup_detector_disable(void)
{ {
} }
static inline bool watchdog_hardlockup_detector_is_enabled(void)
{
return true;
}
#endif #endif
/* /*

21
kernel/watchdog.c
View file

@ -83,8 +83,6 @@ static unsigned long soft_lockup_nmi_warn;
#ifdef CONFIG_HARDLOCKUP_DETECTOR #ifdef CONFIG_HARDLOCKUP_DETECTOR
static int hardlockup_panic = static int hardlockup_panic =
CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE; CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE;
static bool hardlockup_detector_enabled = true;
/* /*
* We may not want to enable hard lockup detection by default in all cases, * We may not want to enable hard lockup detection by default in all cases,
* for example when running the kernel as a guest on a hypervisor. In these * for example when running the kernel as a guest on a hypervisor. In these
@ -93,14 +91,9 @@ static bool hardlockup_detector_enabled = true;
* kernel command line parameters are parsed, because otherwise it is not * kernel command line parameters are parsed, because otherwise it is not
* possible to override this in hardlockup_panic_setup(). * possible to override this in hardlockup_panic_setup().
*/ */
void watchdog_enable_hardlockup_detector(bool val) void hardlockup_detector_disable(void)
{ {
hardlockup_detector_enabled = val; watchdog_enabled &= ~NMI_WATCHDOG_ENABLED;
}
bool watchdog_hardlockup_detector_is_enabled(void)
{
return hardlockup_detector_enabled;
} }
static int __init hardlockup_panic_setup(char *str) static int __init hardlockup_panic_setup(char *str)
@ -530,15 +523,6 @@ static int watchdog_nmi_enable(unsigned int cpu)
if (!(watchdog_enabled & NMI_WATCHDOG_ENABLED)) if (!(watchdog_enabled & NMI_WATCHDOG_ENABLED))
goto out; goto out;
/*
* Some kernels need to default hard lockup detection to
* 'disabled', for example a guest on a hypervisor.
*/
if (!watchdog_hardlockup_detector_is_enabled()) {
event = ERR_PTR(-ENOENT);
goto handle_err;
}
/* is it already setup and enabled? */ /* is it already setup and enabled? */
if (event && event->state > PERF_EVENT_STATE_OFF) if (event && event->state > PERF_EVENT_STATE_OFF)
goto out; goto out;
@ -553,7 +537,6 @@ static int watchdog_nmi_enable(unsigned int cpu)
/* Try to register using hardware perf events */ /* Try to register using hardware perf events */
event = perf_event_create_kernel_counter(wd_attr, cpu, NULL, watchdog_overflow_callback, NULL); event = perf_event_create_kernel_counter(wd_attr, cpu, NULL, watchdog_overflow_callback, NULL);
handle_err:
/* save cpu0 error for future comparision */ /* save cpu0 error for future comparision */
if (cpu == 0 && IS_ERR(event)) if (cpu == 0 && IS_ERR(event))
cpu0_err = PTR_ERR(event); cpu0_err = PTR_ERR(event);