cpuidle: teo: Take negative "sleep length" values into account

Modify the TEO governor to take possible negative return values of
tick_nohz_get_next_hrtimer() into account by changing the data type
of some variables used by it to s64 which allows it to carry out
computations without potentially problematic data type conversions
into u64.

Also change the computations in teo_select() so that the negative
values themselves are handled in a natural way to avoid adding extra
negative value checks to that function.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/cpuidle/governors/teo.c b/drivers/cpuidle/governors/teo.c
index 7dcfc94..ac4bb27 100644 (file)
--- a/drivers/cpuidle/governors/teo.c
+++ b/drivers/cpuidle/governors/teo.c
@@ -100,8 +100,8 @@ struct teo_idle_state {
  * @intervals: Saved idle duration values.
  */
 struct teo_cpu {
-       u64 time_span_ns;
-       u64 sleep_length_ns;
+       s64 time_span_ns;
+       s64 sleep_length_ns;
        struct teo_idle_state states[CPUIDLE_STATE_MAX];
        int interval_idx;
        u64 intervals[INTERVALS];
@@ -214,7 +214,7 @@ static bool teo_time_ok(u64 interval_ns)
  */
 static int teo_find_shallower_state(struct cpuidle_driver *drv,
                                    struct cpuidle_device *dev, int state_idx,
-                                   u64 duration_ns)
+                                   s64 duration_ns)
 {
        int i;
 
@@ -240,10 +240,10 @@ static int teo_select(struct cpuidle_driver *drv, struct cpuidle_device *dev,
 {
        struct teo_cpu *cpu_data = per_cpu_ptr(&teo_cpus, dev->cpu);
        s64 latency_req = cpuidle_governor_latency_req(dev->cpu);
-       u64 duration_ns;
+       int max_early_idx, prev_max_early_idx, constraint_idx, idx0, idx, i;
        unsigned int hits, misses, early_hits;
-       int max_early_idx, prev_max_early_idx, constraint_idx, idx, i;
        ktime_t delta_tick;
+       s64 duration_ns;
 
        if (dev->last_state_idx >= 0) {
                teo_update(drv, dev);
@@ -262,6 +262,7 @@ static int teo_select(struct cpuidle_driver *drv, struct cpuidle_device *dev,
        prev_max_early_idx = -1;
        constraint_idx = drv->state_count;
        idx = -1;
+       idx0 = idx;
 
        for (i = 0; i < drv->state_count; i++) {
                struct cpuidle_state *s = &drv->states[i];
@@ -322,6 +323,7 @@ static int teo_select(struct cpuidle_driver *drv, struct cpuidle_device *dev,
                        idx = i; /* first enabled state */
                        hits = cpu_data->states[i].hits;
                        misses = cpu_data->states[i].misses;
+                       idx0 = i;
                }
 
                if (s->target_residency_ns > duration_ns)
@@ -374,11 +376,16 @@ static int teo_select(struct cpuidle_driver *drv, struct cpuidle_device *dev,
 
        if (idx < 0) {
                idx = 0; /* No states enabled. Must use 0. */
-       } else if (idx > 0) {
+       } else if (idx > idx0) {
                unsigned int count = 0;
                u64 sum = 0;
 
                /*
+                * The target residencies of at least two different enabled idle
+                * states are less than or equal to the current expected idle
+                * duration.  Try to refine the selection using the most recent
+                * measured idle duration values.
+                *
                 * Count and sum the most recent idle duration values less than
                 * the current expected idle duration value.
                 */
@@ -426,7 +433,8 @@ static int teo_select(struct cpuidle_driver *drv, struct cpuidle_device *dev,
                 * till the closest timer including the tick, try to correct
                 * that.
                 */
-               if (idx > 0 && drv->states[idx].target_residency_ns > delta_tick)
+               if (idx > idx0 &&
+                   drv->states[idx].target_residency_ns > delta_tick)
                        idx = teo_find_shallower_state(drv, dev, idx, delta_tick);
        }