The patch titled
high-res timers: PIT broadcasting fix
has been removed from the -mm tree. Its filename was
updated-add-a-framework-to-manage-clock-event-devices-pit-broadcasting-fix.patch
This patch was dropped because it is obsolete
------------------------------------------------------
Subject: high-res timers: PIT broadcasting fix
From: Ingo Molnar <mingo@xxxxxxx>
Systems that enter C3 and have to turn off the APIC we fall back to the PIT
as the clock events source which emulates a local events source. Dynticks
exposed a bug in the broadcast/local-events emulation code: if the PIT IRQ
came earlier than the next high-res timer on an idle CPU would have needed,
then the PIT was not reprogrammed for followup irqs.
(also, clean things up a bit by splitting out the broadcast
reprogramming logic into clockevents_reprogram_broadcast())
This bug can explain certain rare boot-time hangs on C3-capable laptops
that run with HIGH_RES_TIMERS and NO_HZ enabled.
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
Cc: Roman Zippel <zippel@xxxxxxxxxxxxxx>
Cc: john stultz <johnstul@xxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
kernel/time/clockevents.c | 60 +++++++++++++++++++++++++-----------
1 file changed, 42 insertions(+), 18 deletions(-)
diff -puN kernel/time/clockevents.c~updated-add-a-framework-to-manage-clock-event-devices-pit-broadcasting-fix kernel/time/clockevents.c
--- a/kernel/time/clockevents.c~updated-add-a-framework-to-manage-clock-event-devices-pit-broadcasting-fix
+++ a/kernel/time/clockevents.c
@@ -527,6 +527,32 @@ static cpumask_t local_event_broadcast;
static void (*broadcast_function)(cpumask_t *mask);
static void (*global_event_handler)(struct pt_regs *regs);
+/*
+ * Reprogram the broadcast device:
+ *
+ * Called with events_lock held and interrupts disabled.
+ */
+static void clockevents_reprogram_broadcast(void)
+{
+ struct clock_event_device *glblevt = global_eventdevice.event;
+ struct local_events *dev;
+ ktime_t expires = { .tv64 = KTIME_MAX };
+ int64_t delta;
+ int cpu;
+
+ for (cpu = first_cpu(local_event_broadcast); cpu != NR_CPUS;
+ cpu = next_cpu(cpu, local_event_broadcast)) {
+ dev = &per_cpu(local_eventdevices, cpu);
+ if (dev->expires_next.tv64 < expires.tv64)
+ expires = dev->expires_next;
+ }
+
+ if (expires.tv64 != KTIME_MAX) {
+ delta = ktime_to_ns(ktime_sub(expires, ktime_get()));
+ do_clockevents_set_next_event(glblevt, delta);
+ }
+}
+
/**
* clockevents_set_broadcast - switch next event device from/to broadcast mode
*
@@ -536,10 +562,7 @@ static void (*global_event_handler)(stru
void clockevents_set_broadcast(struct clock_event_device *evt, int broadcast)
{
struct local_events *devices = &__get_cpu_var(local_eventdevices);
- struct clock_event_device *glblevt = global_eventdevice.event;
int cpu = smp_processor_id();
- ktime_t expires = { .tv64 = KTIME_MAX };
- int64_t delta;
unsigned long flags;
if (devices->nextevt != evt)
@@ -556,19 +579,7 @@ void clockevents_set_broadcast(struct cl
if (devices->expires_next.tv64 != KTIME_MAX)
clockevents_set_next_event(devices->expires_next, 1);
}
-
- /* Reprogram the broadcast device */
- for (cpu = first_cpu(local_event_broadcast); cpu != NR_CPUS;
- cpu = next_cpu(cpu, local_event_broadcast)) {
- devices = &per_cpu(local_eventdevices, cpu);
- if (devices->expires_next.tv64 < expires.tv64)
- expires = devices->expires_next;
- }
-
- if (expires.tv64 != KTIME_MAX) {
- delta = ktime_to_ns(ktime_sub(expires, ktime_get()));
- do_clockevents_set_next_event(glblevt, delta);
- }
+ clockevents_reprogram_broadcast();
spin_unlock_irqrestore(&events_lock, flags);
}
@@ -635,9 +646,22 @@ static void handle_nextevt_broadcast(str
cpu_set(cpu, mask);
}
}
+ if (!cpus_empty(mask)) {
+ /*
+ * Wakeup the cpus which have an expired event. The
+ * global event is reprogrammed in the return from
+ * idle code.
+ */
+ broadcast_function(&mask);
+ } else {
+ /*
+ * The global event did not expire any CPU local
+ * events. This happens in dyntick mode, as the
+ * maximum PIT delta is quite small.
+ */
+ clockevents_reprogram_broadcast();
+ }
spin_unlock(&events_lock);
- /* Wakeup the cpus which have an expired event */
- broadcast_function(&mask);
}
/*
_
Patches currently in -mm which might be from mingo@xxxxxxx are
origin.patch
debug-add-sysrq_always_enabled-boot-option.patch
lockdep-filter-off-by-default.patch
lockdep-improve-verbose-messages.patch
lockdep-improve-lockdep_reset.patch
lockdep-clean-up-very_verbose-define.patch
lockdep-use-chain-hash-on-config_debug_lockdep-too.patch
lockdep-print-irq-trace-info-on-asserts.patch
lockdep-fix-possible-races-while-disabling-lock-debugging.patch
optimize-calc_load.patch
acpi-i686-x86_64-fix-laptop-bootup-hang-in-init_acpi.patch
revert-i386-fix-the-verify_quirk_intel_irqbalance.patch
revert-x86_64-mm-add-genapic_force.patch
revert-x86_64-mm-fix-the-irqbalance-quirk-for-e7320-e7520-e7525.patch
convert-i386-pda-code-to-use-%fs.patch
convert-i386-pda-code-to-use-%fs-fixes.patch
genapic-optimize-fix-apic-mode-setup-2.patch
genapic-always-use-physical-delivery-mode-on-8-cpus.patch
genapic-remove-es7000-workaround.patch
genapic-remove-clustered-apic-mode.patch
genapic-default-to-physical-mode-on-hotplug-cpu-kernels.patch
x86_64-do-not-enable-the-nmi-watchdog-by-default.patch
cpuset-remove-sched-domain-hooks-from-cpusets.patch
gtod-uninline-jiffiesh.patch
gtod-fix-multiple-conversion-bugs-in-msecs_to_jiffies.patch
gtod-fix-timeout-overflow.patch
gtod-persistent-clock-support-core.patch
gtod-persistent-clock-support-i386.patch
dynticks-uninline-irq_enter.patch
dynticks-extend-next_timer_interrupt-to-use-a-reference-jiffie.patch
hrtimers-namespace-and-enum-cleanup.patch
hrtimers-clean-up-locking.patch
hrtimers-add-state-tracking.patch
hrtimers-clean-up-callback-tracking.patch
hrtimers-move-and-add-documentation.patch
acpi-include-fix.patch
acpi-keep-track-of-timer-broadcast.patch
acpi-add-state-propagation-for-dynamic-broadcasting.patch
acpi-cleanups-allow-early-access-to-pmtimer.patch
i386-apic-clean-up-the-apic-code.patch
clockevents-core.patch
clockevents-i386-drivers.patch
clockevents-i386-hpet-driver.patch
i386-apic-rework-and-fix-local-apic-calibration.patch
high-res-timers-core.patch
high-res-timers-core-do-itimer-rearming-in-process-context.patch
high-res-timers-allow-tsc-clocksource-if-pmtimer-present.patch
dynticks-core.patch
dynticks-add-nohz-stats-to-proc-stat.patch
dynticks-i386-support-idle-handler-callbacks.patch
dynticks-i386-prepare-nmi-watchdog.patch
high-res-timers-dynticks-i386-support-enable-in-kconfig.patch
debugging-feature-add-proc-timer_stat.patch
debugging-feature-proc-timer_list.patch
workqueue-dont-hold-workqueue_mutex-in-flush_scheduled_work.patch
mm-only-sched-add-a-few-scheduler-event-counters.patch
sched-add-above-background-load-function.patch
mm-implement-swap-prefetching.patch
mm-implement-swap-prefetching-use-ctl_unnumbered.patch
sched-cleanup-remove-task_t-convert-to-struct-task_struct-prefetch.patch
detect-atomic-counter-underflows.patch
debug-shared-irqs.patch
make-frame_pointer-default=y.patch
mutex-subsystem-synchro-test-module.patch
vdso-print-fatal-signals.patch
vdso-improve-print_fatal_signals-support-by-adding-memory-maps.patch
vdso-print-fatal-signals-use-ctl_unnumbered.patch
lockdep-show-held-locks-when-showing-a-stackdump.patch
lockdep-show-held-locks-when-showing-a-stackdump-fix.patch
lockdep-show-held-locks-when-showing-a-stackdump-fix-2.patch
kmap_atomic-debugging.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
