cpuidle: teo: Fix "early hits" handling for disabled idle states

The TEO governor uses idle duration "bins" defined in accordance with
the CPU idle states table provided by the driver, so that each "bin"
covers the idle duration range between the target residency of the
idle state corresponding to it and the target residency of the closest
deeper idle state.  The governor collects statistics for each bin
regardless of whether or not the idle state corresponding to it is
currently enabled.

In particular, the "early hits" metric measures the likelihood of a
situation in which the idle duration measured after wakeup falls into
to given bin, but the time till the next timer (sleep length) falls
into a bin corresponding to one of the deeper idle states.  It is
used when the "hits" and "misses" metrics indicate that the state
"matching" the sleep length should not be selected, so that the state
with the maximum "early hits" value is selected instead of it.

If the idle state corresponding to the given bin is disabled, it
cannot be selected and if it turns out to be the one that should be
selected, a shallower idle state needs to be used instead of it.
Nevertheless, the metrics collected for the bin corresponding to it
are still valid and need to be taken into account as though that
state had not been disabled.

As far as the "early hits" metric is concerned, teo_select() tries to
take disabled states into account, but the state index corresponding
to the maximum "early hits" value computed by it may be incorrect.
Namely, it always uses the index of the previous maximum "early hits"
state then, but there may be enabled idle states closer to the
disabled one in question.  In particular, if the current candidate
state (whose index is the idx value) is closer to the disabled one
and the "early hits" value of the disabled state is greater than the
current maximum, the index of the current candidate state (idx)
should replace the "maximum early hits state" index.

Modify the code to handle that case correctly.

Fixes: b26bf6ab716f ("cpuidle: New timer events oriented governor for tickless systems")
Reported-by: Doug Smythies <dsmythies@telus.net>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: 5.1+ <stable@vger.kernel.org> # 5.1+

diff --git a/drivers/cpuidle/governors/teo.c b/drivers/cpuidle/governors/teo.c
index 5a0f60ea4ab9e04a961d60f9eece0d0de46410b2..b9b9156618e60c088c023d484b0a5a24c11f10c4 100644 (file)
--- a/drivers/cpuidle/governors/teo.c
+++ b/drivers/cpuidle/governors/teo.c
@@ -277,18 +277,35 @@ static int teo_select(struct cpuidle_driver *drv, struct cpuidle_device *dev,
                        hits = cpu_data->states[i].hits;
                        misses = cpu_data->states[i].misses;
 
+                       if (early_hits >= cpu_data->states[i].early_hits ||
+                           idx < 0)
+                               continue;
+
                        /*
-                        * If the "early hits" metric of a disabled state is
-                        * greater than the current maximum, it should be taken
-                        * into account, because it would be a mistake to select
-                        * a deeper state with lower "early hits" metric.  The
-                        * index cannot be changed to point to it, however, so
-                        * just increase the "early hits" count alone and let
-                        * the index still point to a shallower idle state.
+                        * If the current candidate state has been the one with
+                        * the maximum "early hits" metric so far, the "early
+                        * hits" metric of the disabled state replaces the
+                        * current "early hits" count to avoid selecting a
+                        * deeper state with lower "early hits" metric.
                         */
-                       if (max_early_idx >= 0 &&
-                           early_hits < cpu_data->states[i].early_hits)
+                       if (max_early_idx == idx) {
                                early_hits = cpu_data->states[i].early_hits;
+                               continue;
+                       }
+
+                       /*
+                        * The current candidate state is closer to the disabled
+                        * one than the current maximum "early hits" state, so
+                        * replace the latter with it, but in case the maximum
+                        * "early hits" state index has not been set so far,
+                        * check if the current candidate state is not too
+                        * shallow for that role.
+                        */
+                       if (!(tick_nohz_tick_stopped() &&
+                             drv->states[idx].target_residency < TICK_USEC)) {
+                               early_hits = cpu_data->states[i].early_hits;
+                               max_early_idx = idx;
+                       }
 
                        continue;
                }