watchdog/hardlockup/perf: Implement CPU enable replacement (2a1b8ee4) · Commits · 戴 / test

watchdog_nmi_enable() is an unparseable mess, Provide a clean perf specific implementation, which will be used when the existing setup/teardown mess is replaced. Signed-off-by:

Thomas Gleixner <tglx@linutronix.de> Reviewed-by:

Don Zickus <dzickus@redhat.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Borislav Petkov <bp@alien8.de> Cc: Chris Metcalf <cmetcalf@mellanox.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Nicholas Piggin <npiggin@gmail.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Sebastian Siewior <bigeasy@linutronix.de> Cc: Ulrich Obergfell <uobergfe@redhat.com> Link: http://lkml.kernel.org/r/20170912194148.180215498@linutronix.de Signed-off-by:

Ingo Molnar <mingo@kernel.org>

include/linux/nmi.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -92,12 +92,14 @@ extern void arch_touch_nmi_watchdog(void);
		extern void hardlockup_detector_perf_stop(void);
		extern void hardlockup_detector_perf_restart(void);
		extern void hardlockup_detector_perf_disable(void);
		extern void hardlockup_detector_perf_enable(void);
		extern void hardlockup_detector_perf_cleanup(void);
		extern int hardlockup_detector_perf_init(void);
		#else
		static inline void hardlockup_detector_perf_stop(void) { }
		static inline void hardlockup_detector_perf_restart(void) { }
		static inline void hardlockup_detector_perf_disable(void) { }
		static inline void hardlockup_detector_perf_enable(void) { }
		static inline void hardlockup_detector_perf_cleanup(void) { }
		# if !defined(CONFIG_HAVE_NMI_WATCHDOG)
		static inline int hardlockup_detector_perf_init(void) { return -ENODEV; }

kernel/watchdog_hld.c

+11 −0

Original line number	Diff line number	Diff line
		@@ -259,6 +259,17 @@ static int hardlockup_detector_event_create(void)
		return 0;
		}

		/**
		* hardlockup_detector_perf_enable - Enable the local event
		*/
		void hardlockup_detector_perf_enable(void)
		{
		if (hardlockup_detector_event_create())
		return;

		perf_event_enable(this_cpu_read(watchdog_ev));
		}

		/**
		* hardlockup_detector_perf_disable - Disable the local event
		*/

Admin message