Skip to content

Commit

Permalink
cpuidle: poll_state: Add time limit to poll_idle()
Browse files Browse the repository at this point in the history
If poll_idle() is allowed to spin until need_resched() returns 'true',
it may actually spin for a much longer time than expected by the idle
governor, since set_tsk_need_resched() is not always called by the
timer interrupt handler.  If that happens, the CPU may spend much
more time than anticipated in the "polling" state.

To prevent that from happening, limit the time of the spinning loop
in poll_idle().

Suggested-by: Peter Zijlstra <[email protected]>
Signed-off-by: Rafael J. Wysocki <[email protected]>
Tested-by: Doug Smythies <[email protected]>
  • Loading branch information
rafaeljw committed Mar 29, 2018
1 parent bda4d21 commit a37b969
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion drivers/cpuidle/poll_state.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,24 @@

#include <linux/cpuidle.h>
#include <linux/sched.h>
#include <linux/sched/clock.h>
#include <linux/sched/idle.h>

#define POLL_IDLE_TIME_LIMIT (TICK_NSEC / 16)

static int __cpuidle poll_idle(struct cpuidle_device *dev,
struct cpuidle_driver *drv, int index)
{
u64 time_start = local_clock();

local_irq_enable();
if (!current_set_polling_and_test()) {
while (!need_resched())
while (!need_resched()) {
cpu_relax();

if (local_clock() - time_start > POLL_IDLE_TIME_LIMIT)
break;
}
}
current_clr_polling();

Expand Down

0 comments on commit a37b969

Please sign in to comment.