Skip to contentSkip to conversation

watchdog: Remove soft_lockup_hrtimer_cnt and related code

PATCH Applied Jisheng Zhang 2 participants 3 messages Dec 18, 2019 – Jan 17, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 watchdog: Remove soft_lockup_hrtimer_cnt and related code

After commit 9cf57731b63e ("watchdog/softlockup: Replace "watchdog/%u" threads with cpu_stop_work"), the percpu soft_lockup_hrtimer_cnt is not used any more, so remove it and related code.

---
Since v1
- rebase on v5.5-rc1

 kernel/watchdog.c | 3 ---
 1 file changed, 3 deletions(-)
kernel/watchdog.c +0 -3
index f41334ef0971..0621301ae8cf 100644
@@ -173,7 +173,6 @@ static DEFINE_PER_CPU(struct hrtimer, watchdog_hrtimer);
 static DEFINE_PER_CPU(bool, softlockup_touch_sync);
 static DEFINE_PER_CPU(bool, soft_watchdog_warn);
 static DEFINE_PER_CPU(unsigned long, hrtimer_interrupts);
-static DEFINE_PER_CPU(unsigned long, soft_lockup_hrtimer_cnt);
 static DEFINE_PER_CPU(struct task_struct *, softlockup_task_ptr_saved);
 static DEFINE_PER_CPU(unsigned long, hrtimer_interrupts_saved);
 static unsigned long soft_lockup_nmi_warn;
@@ -350,8 +349,6 @@ static DEFINE_PER_CPU(struct cpu_stop_work, softlockup_stop_work);
  */
 static int softlockup_fn(void *data)
 {
-	__this_cpu_write(soft_lockup_hrtimer_cnt,
-			 __this_cpu_read(hrtimer_interrupts));
 	__touch_watchdog();
 	complete(this_cpu_ptr(&softlockup_completion));
 
Signature · 1 line
2.24.1
merge bot Applied
#1 lore raw
The following commit has been merged into the core/core branch of tip:

The following commit has been merged into the core/core branch of tip:

Commit-ID:     d129479f1fff5c88adbf8dff7649664916d28f81
Gitweb:        https://git.kernel.org/tip/d129479f1fff5c88adbf8dff7649664916d28f81
Author:        Jisheng Zhang <[email protected]>
AuthorDate:    Wed, 18 Dec 2019 05:31:25 
Committer:     Thomas Gleixner <[email protected]>
CommitterDate: Thu, 16 Jan 2020 12:25:51 +01:00

watchdog: Remove soft_lockup_hrtimer_cnt and related code

After commit 9cf57731b63e ("watchdog/softlockup: Replace "watchdog/%u" threads with cpu_stop_work"), the percpu soft_lockup_hrtimer_cnt is not used any more, so remove it and related code.

---
 kernel/watchdog.c | 3 ---
 1 file changed, 3 deletions(-)
kernel/watchdog.c +0 -3
index f41334e..0621301 100644
@@ -173,7 +173,6 @@ static DEFINE_PER_CPU(struct hrtimer, watchdog_hrtimer);
 static DEFINE_PER_CPU(bool, softlockup_touch_sync);
 static DEFINE_PER_CPU(bool, soft_watchdog_warn);
 static DEFINE_PER_CPU(unsigned long, hrtimer_interrupts);
-static DEFINE_PER_CPU(unsigned long, soft_lockup_hrtimer_cnt);
 static DEFINE_PER_CPU(struct task_struct *, softlockup_task_ptr_saved);
 static DEFINE_PER_CPU(unsigned long, hrtimer_interrupts_saved);
 static unsigned long soft_lockup_nmi_warn;
@@ -350,8 +349,6 @@ static DEFINE_PER_CPU(struct cpu_stop_work, softlockup_stop_work);
  */
 static int softlockup_fn(void *data)
 {
-	__this_cpu_write(soft_lockup_hrtimer_cnt,
-			 __this_cpu_read(hrtimer_interrupts));
 	__touch_watchdog();
 	complete(this_cpu_ptr(&softlockup_completion));
 
merge bot Applied
#2 lore raw
In reply to Jisheng Zhang
The following commit has been merged into the sched/core branch of tip:

The following commit has been merged into the sched/core branch of tip:

Commit-ID:     db5793c5993d265fe6644b6638fcb0758f6b5347
Gitweb:        https://git.kernel.org/tip/db5793c5993d265fe6644b6638fcb0758f6b5347
Author:        Jisheng Zhang <[email protected]>
AuthorDate:    Wed, 18 Dec 2019 05:31:25 
Committer:     Peter Zijlstra <[email protected]>
CommitterDate: Fri, 17 Jan 2020 10:19:19 +01:00

watchdog: Remove soft_lockup_hrtimer_cnt and related code

After commit 9cf57731b63e ("watchdog/softlockup: Replace "watchdog/%u" threads with cpu_stop_work"), the percpu soft_lockup_hrtimer_cnt is not used any more, so remove it and related code.

---
 kernel/watchdog.c | 3 ---
 1 file changed, 3 deletions(-)
kernel/watchdog.c +0 -3
index f41334e..0621301 100644
@@ -173,7 +173,6 @@ static DEFINE_PER_CPU(struct hrtimer, watchdog_hrtimer);
 static DEFINE_PER_CPU(bool, softlockup_touch_sync);
 static DEFINE_PER_CPU(bool, soft_watchdog_warn);
 static DEFINE_PER_CPU(unsigned long, hrtimer_interrupts);
-static DEFINE_PER_CPU(unsigned long, soft_lockup_hrtimer_cnt);
 static DEFINE_PER_CPU(struct task_struct *, softlockup_task_ptr_saved);
 static DEFINE_PER_CPU(unsigned long, hrtimer_interrupts_saved);
 static unsigned long soft_lockup_nmi_warn;
@@ -350,8 +349,6 @@ static DEFINE_PER_CPU(struct cpu_stop_work, softlockup_stop_work);
  */
 static int softlockup_fn(void *data)
 {
-	__this_cpu_write(soft_lockup_hrtimer_cnt,
-			 __this_cpu_read(hrtimer_interrupts));
 	__touch_watchdog();
 	complete(this_cpu_ptr(&softlockup_completion));