]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
clockevents: prevent endless loop in periodic broadcast handler
authorThomas Gleixner <tglx@linutronix.de>
Wed, 3 Sep 2008 21:36:57 +0000 (21:36 +0000)
committerThomas Gleixner <tglx@linutronix.de>
Fri, 5 Sep 2008 09:11:51 +0000 (11:11 +0200)
The reprogramming of the periodic broadcast handler was broken,
when the first programming returned -ETIME. The clockevents code
stores the new expiry value in the clock events device next_event field
only when the programming time has not been elapsed yet. The loop in
question calculates the new expiry value from the next_event value
and therefor never increases.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/time/tick-broadcast.c

index 31463d370b944ff37919d184a125e7efc1bf563a..3044a88357faf3e575f0f47930fa8bdc3c98c036 100644 (file)
@@ -175,6 +175,8 @@ static void tick_do_periodic_broadcast(void)
  */
 static void tick_handle_periodic_broadcast(struct clock_event_device *dev)
 {
+       ktime_t next;
+
        tick_do_periodic_broadcast();
 
        /*
@@ -185,10 +187,13 @@ static void tick_handle_periodic_broadcast(struct clock_event_device *dev)
 
        /*
         * Setup the next period for devices, which do not have
-        * periodic mode:
+        * periodic mode. We read dev->next_event first and add to it
+        * when the event alrady expired. clockevents_program_event()
+        * sets dev->next_event only when the event is really
+        * programmed to the device.
         */
-       for (;;) {
-               ktime_t next = ktime_add(dev->next_event, tick_period);
+       for (next = dev->next_event; ;) {
+               next = ktime_add(next, tick_period);
 
                if (!clockevents_program_event(dev, next, ktime_get()))
                        return;