cpuidle: teo: Ignore disabled idle states that are too deep

commit 069ce2ef1a6dd84cbd4d897b333e30f825e021f0 upstream.

Prevent disabled CPU idle state with target residencies beyond the
anticipated idle duration from being taken into account by the TEO
governor.

Fixes: b26bf6ab716f ("cpuidle: New timer events oriented governor for tickless systems")
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: 5.1+ <stable@vger.kernel.org> # 5.1+
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/cpuidle/governors/teo.c b/drivers/cpuidle/governors/teo.c
index 12d9e6cecf1de1dbef7985fbbc4b7f42b6c9cc4c..c679a75d989314a192f027154afb1c16f33d03dd 100644 (file)
--- a/drivers/cpuidle/governors/teo.c
+++ b/drivers/cpuidle/governors/teo.c
@@ -265,6 +265,13 @@ static int teo_select(struct cpuidle_driver *drv, struct cpuidle_device *dev,
                struct cpuidle_state_usage *su = &dev->states_usage[i];
 
                if (s->disabled || su->disable) {
+                       /*
+                        * Ignore disabled states with target residencies beyond
+                        * the anticipated idle duration.
+                        */
+                       if (s->target_residency > duration_us)
+                               continue;
+
                        /*
                         * If the "early hits" metric of a disabled state is
                         * greater than the current maximum, it should be taken