sched, idle: Fix the idle polling state logic

commit ea8117478918a4734586d35ff530721b682425be upstream.

Mike reported that commit 7d1a9417 ("x86: Use generic idle loop")
regressed several workloads and caused excessive reschedule
interrupts.

The patch in question failed to notice that the x86 code had an
inverted sense of the polling state versus the new generic code (x86:
default polling, generic: default !polling).

Fix the two prominent x86 mwait based idle drivers and introduce a few
new generic polling helpers (fixing the wrong smp_mb__after_clear_bit
usage).

Also switch the idle routines to using tif_need_resched() which is an
immediate TIF_NEED_RESCHED test as opposed to need_resched which will
end up being slightly different.

Reported-by: Mike Galbraith <bitbucket@online.de>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Cc: lenb@kernel.org
Cc: tglx@linutronix.de
Link: http://lkml.kernel.org/n/tip-nc03imb0etuefmzybzj7sprf@git.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 10 insertions, 36 deletions

diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index eb133c77aadb..4056d3175178 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -121,17 +121,10 @@ static struct dmi_system_id __cpuinitdata processor_power_dmi_table[] = {
  */
 static void acpi_safe_halt(void)
 {
-        current_thread_info()->status &= ~TS_POLLING;
-        /*
-         * TS_POLLING-cleared state must be visible before we
-         * test NEED_RESCHED:
-         */
-        smp_mb();
-        if (!need_resched()) {
+        if (!tif_need_resched()) {
                 safe_halt();
                 local_irq_disable();
         }
-        current_thread_info()->status |= TS_POLLING;
 }
 
 #ifdef ARCH_APICTIMER_STOPS_ON_C3
@@ -739,6 +732,11 @@ static int acpi_idle_enter_c1(struct cpuidle_device *dev,
         if (unlikely(!pr))
                 return -EINVAL;
 
+        if (cx->entry_method == ACPI_CSTATE_FFH) {
+                if (current_set_polling_and_test())
+                        return -EINVAL;
+        }
+
         lapic_timer_state_broadcast(pr, cx, 1);
         acpi_idle_do_entry(cx);
 
@@ -792,18 +790,9 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
         if (unlikely(!pr))
                 return -EINVAL;
 
-        if (cx->entry_method != ACPI_CSTATE_FFH) {
-                current_thread_info()->status &= ~TS_POLLING;
-                /*
-                 * TS_POLLING-cleared state must be visible before we test
-                 * NEED_RESCHED:
-                 */
-                smp_mb();
-
-                if (unlikely(need_resched())) {
-                        current_thread_info()->status |= TS_POLLING;
+        if (cx->entry_method == ACPI_CSTATE_FFH) {
+                if (current_set_polling_and_test())
                         return -EINVAL;
-                }
         }
 
         /*
@@ -821,9 +810,6 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
 
         sched_clock_idle_wakeup_event(0);
 
-        if (cx->entry_method != ACPI_CSTATE_FFH)
-                current_thread_info()->status |= TS_POLLING;
-
         lapic_timer_state_broadcast(pr, cx, 0);
         return index;
 }
@@ -860,18 +846,9 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
                 }
         }
 
-        if (cx->entry_method != ACPI_CSTATE_FFH) {
-                current_thread_info()->status &= ~TS_POLLING;
-                /*
-                 * TS_POLLING-cleared state must be visible before we test
-                 * NEED_RESCHED:
-                 */
-                smp_mb();
-
-                if (unlikely(need_resched())) {
-                        current_thread_info()->status |= TS_POLLING;
+        if (cx->entry_method == ACPI_CSTATE_FFH) {
+                if (current_set_polling_and_test())
                         return -EINVAL;
-                }
         }
 
         acpi_unlazy_tlb(smp_processor_id());
@@ -917,9 +894,6 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
 
         sched_clock_idle_wakeup_event(0);
 
-        if (cx->entry_method != ACPI_CSTATE_FFH)
-                current_thread_info()->status |= TS_POLLING;
-
         lapic_timer_state_broadcast(pr, cx, 0);
         return index;
 }