* [RFC][PATCH v2 30/31] timers: x86/mce: Use __init_timer() for resetting timers
[not found] <20221027150525.753064657@goodmis.org>
@ 2022-10-27 15:05 ` Steven Rostedt
0 siblings, 0 replies; only message in thread
From: Steven Rostedt @ 2022-10-27 15:05 UTC (permalink / raw)
To: linux-kernel
Cc: Linus Torvalds, Thomas Gleixner, Stephen Boyd, Guenter Roeck,
Tony Luck, Borislav Petkov, Ingo Molnar, Dave Hansen, x86,
H. Peter Anvin, linux-edac
From: "Steven Rostedt (Google)" <rostedt@goodmis.org>
DEBUG_OBJECTS_TIMERS is now checking if a timer is ever enqueued, and if
so, it must call del_timer_shutdown() before freeing, otherwise
debug objects will trigger. This requires that once a timer is initialized
(and initialized for debug objects) it must not be re-initialized using
timer_setup(), as that will call the debug objects initialization code
again and trigger a bug if it was ever used.
As the mce reinitializes its timers on CPU hotplug, it must use
__init_timer() instead of timer_setup(), which will only initialize the
debug objects once.
Link: https://lore.kernel.org/all/20220407161745.7d6754b3@gandalf.local.home/
Cc: Tony Luck <tony.luck@intel.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: x86@kernel.org
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: linux-edac@vger.kernel.org
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
---
arch/x86/kernel/cpu/mce/core.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c
index 2c8ec5c71712..d2653c7d40b3 100644
--- a/arch/x86/kernel/cpu/mce/core.c
+++ b/arch/x86/kernel/cpu/mce/core.c
@@ -2051,14 +2051,24 @@ static void __mcheck_cpu_setup_timer(void)
{
struct timer_list *t = this_cpu_ptr(&mce_timer);
- timer_setup(t, mce_timer_fn, TIMER_PINNED);
+ /*
+ * timer_setup() may only be used on a timer for the
+ * first time it is initialized. This resets the
+ * timer on CPU hotplug, so use __init_timer() instead.
+ */
+ __init_timer(t, mce_timer_fn, TIMER_PINNED);
}
static void __mcheck_cpu_init_timer(void)
{
struct timer_list *t = this_cpu_ptr(&mce_timer);
- timer_setup(t, mce_timer_fn, TIMER_PINNED);
+ /*
+ * timer_setup() may only be used on a timer for the
+ * first time it is initialized. This resets the
+ * timer on CPU hotplug, so use __init_timer() instead.
+ */
+ __init_timer(t, mce_timer_fn, TIMER_PINNED);
mce_start_timer(t);
}
--
2.35.1
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2022-10-27 15:10 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20221027150525.753064657@goodmis.org>
2022-10-27 15:05 ` [RFC][PATCH v2 30/31] timers: x86/mce: Use __init_timer() for resetting timers Steven Rostedt
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).