linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2] watchdog: Remove soft_lockup_hrtimer_cnt and related code
@ 2019-12-18  5:31 Jisheng Zhang
  2020-01-16 11:35 ` [tip: core/core] " tip-bot2 for Jisheng Zhang
  2020-01-17 10:08 ` [tip: sched/core] " tip-bot2 for Jisheng Zhang
  0 siblings, 2 replies; 3+ messages in thread
From: Jisheng Zhang @ 2019-12-18  5:31 UTC (permalink / raw)
  To: tglx, peterz, mingo; +Cc: linux-kernel

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.

Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
---
Since v1
 - rebase on v5.5-rc1

 kernel/watchdog.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index f41334ef0971..0621301ae8cf 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -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));
 
-- 
2.24.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [tip: core/core] watchdog: Remove soft_lockup_hrtimer_cnt and related code
  2019-12-18  5:31 [PATCH v2] watchdog: Remove soft_lockup_hrtimer_cnt and related code Jisheng Zhang
@ 2020-01-16 11:35 ` tip-bot2 for Jisheng Zhang
  2020-01-17 10:08 ` [tip: sched/core] " tip-bot2 for Jisheng Zhang
  1 sibling, 0 replies; 3+ messages in thread
From: tip-bot2 for Jisheng Zhang @ 2020-01-16 11:35 UTC (permalink / raw)
  To: linux-tip-commits; +Cc: Jisheng Zhang, Thomas Gleixner, x86, LKML

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 <Jisheng.Zhang@synaptics.com>
AuthorDate:    Wed, 18 Dec 2019 05:31:25 
Committer:     Thomas Gleixner <tglx@linutronix.de>
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.

Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20191218131720.4146aea2@xhacker.debian

---
 kernel/watchdog.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index f41334e..0621301 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -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));
 

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [tip: sched/core] watchdog: Remove soft_lockup_hrtimer_cnt and related code
  2019-12-18  5:31 [PATCH v2] watchdog: Remove soft_lockup_hrtimer_cnt and related code Jisheng Zhang
  2020-01-16 11:35 ` [tip: core/core] " tip-bot2 for Jisheng Zhang
@ 2020-01-17 10:08 ` tip-bot2 for Jisheng Zhang
  1 sibling, 0 replies; 3+ messages in thread
From: tip-bot2 for Jisheng Zhang @ 2020-01-17 10:08 UTC (permalink / raw)
  To: linux-tip-commits; +Cc: Jisheng Zhang, Peter Zijlstra (Intel), x86, LKML

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 <Jisheng.Zhang@synaptics.com>
AuthorDate:    Wed, 18 Dec 2019 05:31:25 
Committer:     Peter Zijlstra <peterz@infradead.org>
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.

Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20191218131720.4146aea2@xhacker.debian
---
 kernel/watchdog.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index f41334e..0621301 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -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));
 

^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-01-17 10:09 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-18  5:31 [PATCH v2] watchdog: Remove soft_lockup_hrtimer_cnt and related code Jisheng Zhang
2020-01-16 11:35 ` [tip: core/core] " tip-bot2 for Jisheng Zhang
2020-01-17 10:08 ` [tip: sched/core] " tip-bot2 for Jisheng Zhang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).