Merge tag 'tif-task_work.arch-2020-12-14' of git://git.kernel.dk/linux-block

[linux.git] / kernel / time / tick-broadcast.c

diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c
index 36d7464c8962543d6b29fa43f3c70d28c3c41362..5a23829372c7fc2d4b60814b397a1af9e72298ba 100644 (file)
--- a/kernel/time/tick-broadcast.c
+++ b/kernel/time/tick-broadcast.c
@@ -331,7 +331,7 @@ static void tick_handle_periodic_broadcast(struct clock_event_device *dev)
        bc_local = tick_do_periodic_broadcast();
 
        if (clockevent_state_oneshot(dev)) {
-               ktime_t next = ktime_add(dev->next_event, tick_period);
+               ktime_t next = ktime_add_ns(dev->next_event, TICK_NSEC);
 
                clockevents_program_event(dev, next, true);
        }
@@ -877,6 +877,22 @@ static void tick_broadcast_init_next_event(struct cpumask *mask,
        }
 }
 
+static inline ktime_t tick_get_next_period(void)
+{
+       ktime_t next;
+
+       /*
+        * Protect against concurrent updates (store /load tearing on
+        * 32bit). It does not matter if the time is already in the
+        * past. The broadcast device which is about to be programmed will
+        * fire in any case.
+        */
+       raw_spin_lock(&jiffies_lock);
+       next = tick_next_period;
+       raw_spin_unlock(&jiffies_lock);
+       return next;
+}
+
 /**
  * tick_broadcast_setup_oneshot - setup the broadcast device
  */
@@ -905,10 +921,11 @@ static void tick_broadcast_setup_oneshot(struct clock_event_device *bc)
                           tick_broadcast_oneshot_mask, tmpmask);
 
                if (was_periodic && !cpumask_empty(tmpmask)) {
+                       ktime_t nextevt = tick_get_next_period();
+
                        clockevents_switch_state(bc, CLOCK_EVT_STATE_ONESHOT);
-                       tick_broadcast_init_next_event(tmpmask,
-                                                      tick_next_period);
-                       tick_broadcast_set_event(bc, cpu, tick_next_period);
+                       tick_broadcast_init_next_event(tmpmask, nextevt);
+                       tick_broadcast_set_event(bc, cpu, nextevt);
                } else
                        bc->next_event = KTIME_MAX;
        } else {