watchdog-buddy-cleanup-how-watchdog_buddy_check_hardlockup-is-called.patch removed from -mm tree
The quilt patch titled
Subject: watchdog/buddy: cleanup how watchdog_buddy_check_hardlockup() is called
has been removed from the -mm tree. Its filename was
watchdog-buddy-cleanup-how-watchdog_buddy_check_hardlockup-is-called.patch
This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Douglas Anderson <[email protected]>
Subject: watchdog/buddy: cleanup how watchdog_buddy_check_hardlockup() is called
Date: Fri, 26 May 2023 18:41:36 -0700
In the patch ("watchdog/hardlockup: detect hard lockups using secondary (buddy) CPUs"), we added a call from the common watchdog.c file into the buddy. That call could be done more cleanly. Specifically:
1. If we move the call into watchdog_hardlockup_kick() then it keeps watchdog_timer_fn() simpler.
2. We don't need to pass an "unsigned long" to the buddy for the timer count. In the patch ("watchdog/hardlockup: add a "cpu" param to watchdog_hardlockup_check()") the count was changed to "atomic_t" which is backed by an int, so we should match types.
---
include/linux/nmi.h | 4 ++-- kernel/watchdog.c | 15 +++++++-------- kernel/watchdog_buddy.c | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-)
include/linux/nmi.h renamed from include/linux/nmi.h~watchdog-buddy-cleanup-how-watchdog_buddy_check_hardlockup-is-called +2 -2
@@ -114,9 +114,9 @@ void watchdog_hardlockup_disable(unsignevoid lockup_detector_reconfigure (void );#ifdef CONFIG_HARDLOCKUP_DETECTOR_BUDDY -void watchdog_buddy_check_hardlockup (unsigned long hrtimer_interrupts); +void watchdog_buddy_check_hardlockup (int hrtimer_interrupts);#else -static inline void watchdog_buddy_check_hardlockup (unsigned long hrtimer_interrupts) {} +static inline void watchdog_buddy_check_hardlockup (int hrtimer_interrupts) {}#endif /**
kernel/watchdog_buddy.c renamed from kernel/watchdog_buddy.c~watchdog-buddy-cleanup-how-watchdog_buddy_check_hardlockup-is-called +1 -1
@@ -72,7 +72,7 @@ void watchdog_hardlockup_disable(unsignecpumask_clear_cpu (cpu, &watchdog_cpus); } -void watchdog_buddy_check_hardlockup (unsigned long hrtimer_interrupts) +void watchdog_buddy_check_hardlockup (int hrtimer_interrupts) {unsigned int next_cpu;
kernel/watchdog.c renamed from kernel/watchdog.c~watchdog-buddy-cleanup-how-watchdog_buddy_check_hardlockup-is-called +7 -8
@@ -131,9 +131,12 @@ static bool is_hardlockup(unsigned int creturn false; } -static unsigned long watchdog_hardlockup_kick (void ) +static void watchdog_hardlockup_kick (void ) { -return atomic_inc_return (this_cpu_ptr (&hrtimer_interrupts)); +int new_interrupts; + + new_interrupts =atomic_inc_return (this_cpu_ptr (&hrtimer_interrupts)); +watchdog_buddy_check_hardlockup (new_interrupts); }void watchdog_hardlockup_check (unsigned int cpu,struct pt_regs *regs)
@@ -195,7 +198,7 @@ void watchdog_hardlockup_check(unsigned#else /* CONFIG_HARDLOCKUP_DETECTOR_COUNTS_HRTIMER */ -static inline unsigned long watchdog_hardlockup_kick (void ) {return 0 ; } +static inline void watchdog_hardlockup_kick (void ) { }#endif /* !CONFIG_HARDLOCKUP_DETECTOR_COUNTS_HRTIMER */
@@ -449,15 +452,11 @@ static enum hrtimer_restart watchdog_timstruct pt_regs *regs =get_irq_regs ();int duration;int softlockup_all_cpu_backtrace = sysctl_softlockup_all_cpu_backtrace; -unsigned long hrtimer_interrupts;if (!watchdog_enabled)return HRTIMER_NORESTART ; - hrtimer_interrupts =watchdog_hardlockup_kick (); - -/* test for hardlockups */ -watchdog_buddy_check_hardlockup (hrtimer_interrupts); +watchdog_hardlockup_kick ();/* kick the softlockup detector */ if (completion_done (this_cpu_ptr (&softlockup_completion))) {
_
Patches currently in -mm which might be from [email protected] are