From: tip-bot for Thomas Gleixner <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: hpa@zytor.com, mingo@kernel.org, akpm@linux-foundation.org,
peterz@infradead.org, rafael.j.wysocki@intel.com,
linux-kernel@vger.kernel.org, john.stultz@linaro.org,
tglx@linutronix.de, torvalds@linux-foundation.org
Subject: [tip:timers/core] clockevents: Make tick handover explicit
Date: Fri, 3 Apr 2015 01:26:41 -0700 [thread overview]
Message-ID: <tip-52c063d1adbc16c76e70fffa20727fcd4e9343b3@git.kernel.org> (raw)
In-Reply-To: <1658173.RkEEILFiQZ@vostro.rjw.lan>
Commit-ID: 52c063d1adbc16c76e70fffa20727fcd4e9343b3
Gitweb: http://git.kernel.org/tip/52c063d1adbc16c76e70fffa20727fcd4e9343b3
Author: Thomas Gleixner <tglx@linutronix.de>
AuthorDate: Fri, 3 Apr 2015 02:37:24 +0200
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Fri, 3 Apr 2015 08:44:36 +0200
clockevents: Make tick handover explicit
clockevents_notify() is a leftover from the early design of the
clockevents facility. It's really not a notification mechanism,
it's a multiplex call. We are way better off to have explicit
calls instead of this monstrosity.
Split out the tick_handover call and invoke it explicitely from
the hotplug code. Temporary solution will be cleaned up in later
patches.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
[ Rebase ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Link: http://lkml.kernel.org/r/1658173.RkEEILFiQZ@vostro.rjw.lan
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
include/linux/clockchips.h | 1 -
include/linux/tick.h | 2 ++
kernel/cpu.c | 2 ++
kernel/time/clockevents.c | 4 ----
kernel/time/hrtimer.c | 4 ----
kernel/time/tick-common.c | 9 ++++++---
kernel/time/tick-internal.h | 1 -
7 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h
index f97f498..f4bde22 100644
--- a/include/linux/clockchips.h
+++ b/include/linux/clockchips.h
@@ -11,7 +11,6 @@
/* Clock event notification values */
enum clock_event_nofitiers {
CLOCK_EVT_NOTIFY_ADD,
- CLOCK_EVT_NOTIFY_CPU_DYING,
CLOCK_EVT_NOTIFY_CPU_DEAD,
};
diff --git a/include/linux/tick.h b/include/linux/tick.h
index 6119321..2c68fa3 100644
--- a/include/linux/tick.h
+++ b/include/linux/tick.h
@@ -19,12 +19,14 @@ extern void tick_unfreeze(void);
extern void tick_suspend_local(void);
/* Should be core only, but XEN resume magic and ARM BL switcher require it */
extern void tick_resume_local(void);
+extern void tick_handover_do_timer(void);
#else /* CONFIG_GENERIC_CLOCKEVENTS */
static inline void tick_init(void) { }
static inline void tick_freeze(void) { }
static inline void tick_unfreeze(void) { }
static inline void tick_suspend_local(void) { }
static inline void tick_resume_local(void) { }
+static inline void tick_handover_do_timer(void) { }
#endif /* !CONFIG_GENERIC_CLOCKEVENTS */
#ifdef CONFIG_TICK_ONESHOT
diff --git a/kernel/cpu.c b/kernel/cpu.c
index af5db20..eba7eaa 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -339,6 +339,8 @@ static int __ref take_cpu_down(void *_param)
return err;
cpu_notify(CPU_DYING | param->mod, param->hcpu);
+ /* Give up timekeeping duties */
+ tick_handover_do_timer();
/* Park the stopper thread */
kthread_park(current);
return 0;
diff --git a/kernel/time/clockevents.c b/kernel/time/clockevents.c
index be9abf3..88fb3b9 100644
--- a/kernel/time/clockevents.c
+++ b/kernel/time/clockevents.c
@@ -655,10 +655,6 @@ int clockevents_notify(unsigned long reason, void *arg)
raw_spin_lock_irqsave(&clockevents_lock, flags);
switch (reason) {
- case CLOCK_EVT_NOTIFY_CPU_DYING:
- tick_handover_do_timer(arg);
- break;
-
case CLOCK_EVT_NOTIFY_CPU_DEAD:
tick_shutdown_broadcast_oneshot(arg);
tick_shutdown_broadcast(arg);
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
index 721d29b..6a7a64e 100644
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -1707,10 +1707,6 @@ static int hrtimer_cpu_notify(struct notifier_block *self,
break;
#ifdef CONFIG_HOTPLUG_CPU
- case CPU_DYING:
- case CPU_DYING_FROZEN:
- clockevents_notify(CLOCK_EVT_NOTIFY_CPU_DYING, &scpu);
- break;
case CPU_DEAD:
case CPU_DEAD_FROZEN:
{
diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c
index e28ba5c..055c868 100644
--- a/kernel/time/tick-common.c
+++ b/kernel/time/tick-common.c
@@ -332,20 +332,23 @@ out_bc:
tick_install_broadcast_device(newdev);
}
+#ifdef CONFIG_HOTPLUG_CPU
/*
* Transfer the do_timer job away from a dying cpu.
*
- * Called with interrupts disabled.
+ * Called with interrupts disabled. Not locking required. If
+ * tick_do_timer_cpu is owned by this cpu, nothing can change it.
*/
-void tick_handover_do_timer(int *cpup)
+void tick_handover_do_timer(void)
{
- if (*cpup == tick_do_timer_cpu) {
+ if (tick_do_timer_cpu == smp_processor_id()) {
int cpu = cpumask_first(cpu_online_mask);
tick_do_timer_cpu = (cpu < nr_cpu_ids) ? cpu :
TICK_DO_TIMER_NONE;
}
}
+#endif
/*
* Shutdown an event device on a given cpu:
diff --git a/kernel/time/tick-internal.h b/kernel/time/tick-internal.h
index 0266f9d..aabcb5d 100644
--- a/kernel/time/tick-internal.h
+++ b/kernel/time/tick-internal.h
@@ -20,7 +20,6 @@ extern int tick_do_timer_cpu __read_mostly;
extern void tick_setup_periodic(struct clock_event_device *dev, int broadcast);
extern void tick_handle_periodic(struct clock_event_device *dev);
extern void tick_check_new_device(struct clock_event_device *dev);
-extern void tick_handover_do_timer(int *cpup);
extern void tick_shutdown(unsigned int *cpup);
extern void tick_suspend(void);
extern void tick_resume(void);
next prev parent reply other threads:[~2015-04-03 8:27 UTC|newest]
Thread overview: 90+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-01 22:02 [PATCH 00/20] clockevents_notify() removal Rafael J. Wysocki
2015-04-01 22:03 ` [PATCH 01/20] clockevents: Provide explicit broadcast control functions Rafael J. Wysocki
2015-04-01 22:04 ` [PATCH 02/20] x86, amd_idle: Use explicit broadcast control function Rafael J. Wysocki
2015-04-01 22:05 ` [PATCH 03/20] ACPI / PAD: " Rafael J. Wysocki
2015-04-01 22:06 ` [PATCH 04/20] ACPI / processor: " Rafael J. Wysocki
2015-04-01 22:07 ` [PATCH 05/20] cpuidle: " Rafael J. Wysocki
2015-04-01 22:09 ` [PATCH 06/20] intel_idle: " Rafael J. Wysocki
2015-04-01 22:10 ` [PATCH 07/20] ARM: OMAP: " Rafael J. Wysocki
2015-04-01 22:11 ` [PATCH 08/20] clockevents: Remove the broadcast control leftovers Rafael J. Wysocki
2015-04-01 22:13 ` [PATCH 09/20] clockevents: Provide explicit broadcast oneshot control functions Rafael J. Wysocki
2015-04-01 22:15 ` [PATCH 10/20] x86, amd_idle: Use " Rafael J. Wysocki
2015-04-01 22:16 ` [PATCH 11/20] ACPI / PAD: Use explicit broadcast oneshot control function Rafael J. Wysocki
2015-04-01 22:17 ` [PATCH 12/20] ACPI / processor: Use explicit broadcast controll function Rafael J. Wysocki
2015-04-01 22:20 ` [PATCH 13/20] intel_idle: Use explicit broadcast oneshot control function Rafael J. Wysocki
2015-04-01 22:20 ` [PATCH 14/20] ARM: OMAP: " Rafael J. Wysocki
2015-04-01 22:21 ` [PATCH 15/20] ARM: tegra: " Rafael J. Wysocki
2015-04-01 22:22 ` [PATCH 16/20] sched/idle: " Rafael J. Wysocki
2015-04-28 10:11 ` Linus Walleij
2015-04-28 10:17 ` Sudeep Holla
2015-04-28 10:34 ` Daniel Lezcano
2015-04-28 10:42 ` Sudeep Holla
2015-04-28 12:19 ` Rafael J. Wysocki
2015-04-28 12:37 ` Linus Walleij
2015-04-28 13:31 ` Rafael J. Wysocki
2015-04-28 13:37 ` Rafael J. Wysocki
2015-04-28 14:14 ` Rafael J. Wysocki
2015-04-28 13:58 ` Sudeep Holla
2015-04-29 0:50 ` Rafael J. Wysocki
2015-04-29 1:04 ` Rafael J. Wysocki
2015-04-29 7:10 ` Linus Walleij
2015-04-29 8:57 ` Peter Zijlstra
2015-04-29 9:44 ` Daniel Lezcano
2015-04-29 9:50 ` Sudeep Holla
2015-04-29 14:07 ` [PATCH][Fix] cpuidle: Run tick_broadcast_exit() with disabled interrupts Rafael J. Wysocki
2015-04-30 3:47 ` Preeti U Murthy
2015-04-30 20:12 ` Nicolas Pitre
2015-04-30 22:10 ` Rafael J. Wysocki
2015-04-30 3:45 ` [PATCH 16/20] sched/idle: Use explicit broadcast oneshot control function Preeti U Murthy
2015-04-28 13:04 ` Sudeep Holla
2015-04-01 22:23 ` [PATCH 17/20] clockevents: Remove broadcast oneshot control leftovers Rafael J. Wysocki
2015-04-01 22:24 ` [PATCH 18/20] clockevents: Make tick handover explicit Rafael J. Wysocki
2015-04-01 22:25 ` [PATCH 19/20] clockevents: Cleanup dead cpu explicitely Rafael J. Wysocki
2015-04-01 22:26 ` [PATCH 20/20] timekeeping: Get rid of stale comment Rafael J. Wysocki
2015-04-01 23:57 ` John Stultz
2015-04-02 12:39 ` [PATCH 00/20] clockevents_notify() removal Ingo Molnar
2015-04-02 22:19 ` Rafael J. Wysocki
2015-04-02 23:45 ` [v2][PATCH 00/21] " Rafael J. Wysocki
2015-04-02 23:46 ` [v2][PATCH 01/21] ACPI / PAD: Remove the local APIC nonsense Rafael J. Wysocki
2015-04-03 8:21 ` [tip:timers/core] ACPI/PAD: " tip-bot for Thomas Gleixner
2015-04-03 0:01 ` [v2][PATCH 02/21] clockevents: Provide explicit broadcast control functions Rafael J. Wysocki
2015-04-03 8:21 ` [tip:timers/core] " tip-bot for Thomas Gleixner
2015-04-03 0:01 ` [v2][PATCH 03/21] x86, amd_idle: Use explicit broadcast control function Rafael J. Wysocki
2015-04-03 8:22 ` [tip:timers/core] x86/amd/idle, clockevents: " tip-bot for Thomas Gleixner
2015-04-03 0:01 ` [v2][PATCH 04/21] ACPI / PAD: " Rafael J. Wysocki
2015-04-03 8:22 ` [tip:timers/core] ACPI/PAD: " tip-bot for Thomas Gleixner
2015-04-03 0:02 ` [v2][PATCH 05/21] ACPI / processor: " Rafael J. Wysocki
2015-04-03 8:22 ` [tip:timers/core] ACPI/processor: " tip-bot for Thomas Gleixner
2015-04-03 0:02 ` [v2][PATCH 06/21] cpuidle: " Rafael J. Wysocki
2015-04-03 8:23 ` [tip:timers/core] " tip-bot for Thomas Gleixner
2015-04-03 0:02 ` [v2][PATCH 07/21] intel_idle: " Rafael J. Wysocki
2015-04-03 8:23 ` [tip:timers/core] " tip-bot for Thomas Gleixner
2015-04-03 0:02 ` [v2][PATCH 08/21] ARM: OMAP: " Rafael J. Wysocki
2015-04-03 8:23 ` [tip:timers/core] " tip-bot for Thomas Gleixner
2015-04-03 0:03 ` [v2][PATCH 09/21] clockevents: Remove the broadcast control leftovers Rafael J. Wysocki
2015-04-03 8:23 ` [tip:timers/core] " tip-bot for Thomas Gleixner
2015-04-03 0:05 ` [v2][PATCH 10/21] clockevents: Provide explicit broadcast oneshot control functions Rafael J. Wysocki
2015-04-03 8:24 ` [tip:timers/core] " tip-bot for Thomas Gleixner
2015-04-03 0:05 ` [v2][PATCH 11/21] x86, amd_idle: Use " Rafael J. Wysocki
2015-04-03 8:24 ` [tip:timers/core] x86/amd/idle, clockevents: " tip-bot for Thomas Gleixner
2015-04-03 0:06 ` [v2][PATCH 12/21] ACPI / PAD: Use explicit broadcast oneshot control function Rafael J. Wysocki
2015-04-03 8:24 ` [tip:timers/core] ACPI/PAD: " tip-bot for Thomas Gleixner
2015-04-03 0:12 ` [v2][PATCH 13/21] ACPI / processor: Use explicit broadcast controll function Rafael J. Wysocki
2015-04-03 8:25 ` [tip:timers/core] ACPI/idle: Use explicit broadcast control function tip-bot for Thomas Gleixner
2015-04-03 0:14 ` [v2][PATCH 14/21] intel_idle: Use explicit broadcast oneshot " Rafael J. Wysocki
2015-04-03 8:25 ` [tip:timers/core] " tip-bot for Thomas Gleixner
2015-04-03 0:31 ` [v2][PATCH 15/21] ARM: OMAP: " Rafael J. Wysocki
2015-04-03 8:25 ` [tip:timers/core] " tip-bot for Thomas Gleixner
2015-04-03 0:32 ` [v2][PATCH 16/21] ARM: tegra: " Rafael J. Wysocki
2015-04-03 8:25 ` [tip:timers/core] ARM: Tegra: " tip-bot for Thomas Gleixner
2015-04-03 0:34 ` [v2][PATCH 17/21] sched/idle: " Rafael J. Wysocki
2015-04-03 8:26 ` [tip:timers/core] " tip-bot for Thomas Gleixner
2015-04-03 0:36 ` [v2][PATCH 18/21] clockevents: Remove broadcast oneshot control leftovers Rafael J. Wysocki
2015-04-03 8:26 ` [tip:timers/core] " tip-bot for Rafael J. Wysocki
2015-04-03 0:37 ` [v2][PATCH 19/21] clockevents: Make tick handover explicit Rafael J. Wysocki
2015-04-03 8:26 ` tip-bot for Thomas Gleixner [this message]
2015-04-03 0:38 ` [v2][PATCH 20/21] clockevents: Cleanup dead cpu explicitely Rafael J. Wysocki
2015-04-03 8:26 ` [tip:timers/core] " tip-bot for Thomas Gleixner
2015-04-03 0:39 ` [v2][PATCH 21/21] timekeeping: Get rid of stale comment Rafael J. Wysocki
2015-04-03 8:27 ` [tip:timers/core] " tip-bot for Thomas Gleixner
2015-04-03 6:45 ` [v2][PATCH 00/21] clockevents_notify() removal Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-52c063d1adbc16c76e70fffa20727fcd4e9343b3@git.kernel.org \
--to=tipbot@zytor.com \
--cc=akpm@linux-foundation.org \
--cc=hpa@zytor.com \
--cc=john.stultz@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=rafael.j.wysocki@intel.com \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).