At bootup, watchdog will exclude nohz_full CPUs specified at boot time. As we are now enabling runtime changes to nohz_full CPUs, the list of CPUs with watchdog timer running should be updated to exclude the current set of isolated CPUs.
Add a new watchdog_cpumask_update() helper to be invoked by housekeeping_update() when the HK_TYPE_KERNEL_NOISE (HK_TYPE_TIMER) cpumask is being updated to update watchdog_cpumask and watchdog_allowed_mask for soft lockup detector. The cpumask updates will be done when the affected CPUs are in the offline state. When those CPUs are brought up later, the new cpumask will be used to determine if any hard/soft watchdog should be enabled again. Signed-off-by: Waiman Long <[email protected]> --- include/linux/nmi.h | 2 ++ kernel/sched/isolation.c | 1 + kernel/watchdog.c | 24 ++++++++++++++++++++++++ 3 files changed, 27 insertions(+) diff --git a/include/linux/nmi.h b/include/linux/nmi.h index bc1162895f35..5bf941d2b168 100644 --- a/include/linux/nmi.h +++ b/include/linux/nmi.h @@ -17,6 +17,7 @@ void lockup_detector_init(void); void lockup_detector_retry_init(void); void lockup_detector_soft_poweroff(void); +void watchdog_cpumask_update(struct cpumask *mask); extern int watchdog_user_enabled; extern int watchdog_thresh; @@ -37,6 +38,7 @@ extern int sysctl_hardlockup_all_cpu_backtrace; static inline void lockup_detector_init(void) { } static inline void lockup_detector_retry_init(void) { } static inline void lockup_detector_soft_poweroff(void) { } +static inline void watchdog_cpumask_update(struct cpumask *mask) { } #endif /* !CONFIG_LOCKUP_DETECTOR */ #ifdef CONFIG_SOFTLOCKUP_DETECTOR diff --git a/kernel/sched/isolation.c b/kernel/sched/isolation.c index b5635484ec69..1f3f1c83dd12 100644 --- a/kernel/sched/isolation.c +++ b/kernel/sched/isolation.c @@ -184,6 +184,7 @@ int housekeeping_update(struct cpumask *isol_mask, unsigned long flags) if (flags & HK_FLAG_KERNEL_NOISE) { tick_nohz_full_update_cpus(isol_mask); rcu_nocb_update_cpus(isol_mask); + watchdog_cpumask_update(isol_mask); } synchronize_rcu(); diff --git a/kernel/watchdog.c b/kernel/watchdog.c index 87dd5e0f6968..498c1463b843 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -1071,6 +1071,30 @@ static inline void lockup_detector_setup(void) } #endif /* !CONFIG_SOFTLOCKUP_DETECTOR */ +/** + * watchdog_cpumask_update - update watchdog_cpumask & watchdog_allowed_mask + * @isol_mask: cpumask of isolated CPUs + * + * Update watchdog_cpumask and watchdog_allowed_mask to be inverse of the + * given isolated cpumask to disable watchdog activities on isolated CPUs. + * It should be called with the affected CPUs in offline state which will be + * brought up online later. + * + * Any changes made in watchdog_cpumask by users via the sysctl parameter will + * be overridden. However, proc_watchdog_update() isn't called. So change will + * only happens on CPUs that will brought up later on to minimize changes to + * the existing watchdog configuration. + */ +void watchdog_cpumask_update(struct cpumask *isol_mask) +{ + mutex_lock(&watchdog_mutex); + cpumask_andnot(&watchdog_cpumask, cpu_possible_mask, isol_mask); +#ifdef CONFIG_SOFTLOCKUP_DETECTOR + cpumask_copy(&watchdog_allowed_mask, &watchdog_cpumask); +#endif + mutex_unlock(&watchdog_mutex); +} + /** * lockup_detector_soft_poweroff - Interface to stop lockup detector(s) * -- 2.53.0
