|
@@ -282,8 +282,31 @@ void tick_nohz_stop_sched_tick(int inidle)
|
|
/* Schedule the tick, if we are at least one jiffie off */
|
|
/* Schedule the tick, if we are at least one jiffie off */
|
|
if ((long)delta_jiffies >= 1) {
|
|
if ((long)delta_jiffies >= 1) {
|
|
|
|
|
|
|
|
+ /*
|
|
|
|
+ * calculate the expiry time for the next timer wheel
|
|
|
|
+ * timer
|
|
|
|
+ */
|
|
|
|
+ expires = ktime_add_ns(last_update, tick_period.tv64 *
|
|
|
|
+ delta_jiffies);
|
|
|
|
+
|
|
|
|
+ /*
|
|
|
|
+ * If this cpu is the one which updates jiffies, then
|
|
|
|
+ * give up the assignment and let it be taken by the
|
|
|
|
+ * cpu which runs the tick timer next, which might be
|
|
|
|
+ * this cpu as well. If we don't drop this here the
|
|
|
|
+ * jiffies might be stale and do_timer() never
|
|
|
|
+ * invoked.
|
|
|
|
+ */
|
|
|
|
+ if (cpu == tick_do_timer_cpu)
|
|
|
|
+ tick_do_timer_cpu = TICK_DO_TIMER_NONE;
|
|
|
|
+
|
|
if (delta_jiffies > 1)
|
|
if (delta_jiffies > 1)
|
|
cpu_set(cpu, nohz_cpu_mask);
|
|
cpu_set(cpu, nohz_cpu_mask);
|
|
|
|
+
|
|
|
|
+ /* Skip reprogram of event if its not changed */
|
|
|
|
+ if (ts->tick_stopped && ktime_equal(expires, dev->next_event))
|
|
|
|
+ goto out;
|
|
|
|
+
|
|
/*
|
|
/*
|
|
* nohz_stop_sched_tick can be called several times before
|
|
* nohz_stop_sched_tick can be called several times before
|
|
* the nohz_restart_sched_tick is called. This happens when
|
|
* the nohz_restart_sched_tick is called. This happens when
|
|
@@ -306,17 +329,6 @@ void tick_nohz_stop_sched_tick(int inidle)
|
|
rcu_enter_nohz();
|
|
rcu_enter_nohz();
|
|
}
|
|
}
|
|
|
|
|
|
- /*
|
|
|
|
- * If this cpu is the one which updates jiffies, then
|
|
|
|
- * give up the assignment and let it be taken by the
|
|
|
|
- * cpu which runs the tick timer next, which might be
|
|
|
|
- * this cpu as well. If we don't drop this here the
|
|
|
|
- * jiffies might be stale and do_timer() never
|
|
|
|
- * invoked.
|
|
|
|
- */
|
|
|
|
- if (cpu == tick_do_timer_cpu)
|
|
|
|
- tick_do_timer_cpu = TICK_DO_TIMER_NONE;
|
|
|
|
-
|
|
|
|
ts->idle_sleeps++;
|
|
ts->idle_sleeps++;
|
|
|
|
|
|
/*
|
|
/*
|
|
@@ -332,12 +344,7 @@ void tick_nohz_stop_sched_tick(int inidle)
|
|
goto out;
|
|
goto out;
|
|
}
|
|
}
|
|
|
|
|
|
- /*
|
|
|
|
- * calculate the expiry time for the next timer wheel
|
|
|
|
- * timer
|
|
|
|
- */
|
|
|
|
- expires = ktime_add_ns(last_update, tick_period.tv64 *
|
|
|
|
- delta_jiffies);
|
|
|
|
|
|
+ /* Mark expiries */
|
|
ts->idle_expires = expires;
|
|
ts->idle_expires = expires;
|
|
|
|
|
|
if (ts->nohz_mode == NOHZ_MODE_HIGHRES) {
|
|
if (ts->nohz_mode == NOHZ_MODE_HIGHRES) {
|