Commit 5c1ea082 authored May 25, 2008 by Steven Rostedt Committed by Thomas Gleixner Jun 04, 2008

x86: enable preemption in delay



The RT team has been searching for a nasty latency. This latency shows
up out of the blue and has been seen to be as big as 5ms!

Using ftrace I found the cause of the latency.

   pcscd-2995  3dNh1 52360300us : irq_exit (smp_apic_timer_interrupt)
   pcscd-2995  3dN.2 52360301us : idle_cpu (irq_exit)
   pcscd-2995  3dN.2 52360301us : rcu_irq_exit (irq_exit)
   pcscd-2995  3dN.1 52360771us : smp_apic_timer_interrupt (apic_timer_interrupt
)
   pcscd-2995  3dN.1 52360771us : exit_idle (smp_apic_timer_interrupt)

Here's an example of a 400 us latency. pcscd took a timer interrupt and
returned with "need resched" enabled, but did not reschedule until after
the next interrupt came in at 52360771us 400us later!

At first I thought we somehow missed a preemption check in entry.S. But
I also noticed that this always seemed to happen during a __delay call.

   pcscd-2995  3dN.2 52360836us : rcu_irq_exit (irq_exit)
   pcscd-2995  3.N.. 52361265us : preempt_schedule (__delay)

Looking at the x86 delay, I found my problem.

In git commit 35d5d08a, Andrew Morton
placed preempt_disable around the entire delay due to TSC's not working
nicely on SMP.  Unfortunately for those that care about latencies this
is devastating! Especially when we have callers to mdelay(8).

Here I enable preemption during the loop and account for anytime the task
migrates to a new CPU. The delay asked for may be extended a bit by
the migration, but delay only guarantees that it will delay for that minimum
time. Delaying longer should not be an issue.

[
  Thanks to Thomas Gleixner for spotting that cpu wasn't updated,
    and to place the rep_nop between preempt_enabled/disable.
]

Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Cc: akpm@osdl.org
Cc: Clark Williams <clark.williams@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: "Luis Claudio R. Goncalves" <lclaudio@uudg.org>
Cc: Gregory Haskins <ghaskins@novell.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andi Kleen <andi-suse@firstfloor.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

parent deef3250

arch/x86/lib/delay_32.c

+27 −4

Original line number	Diff line number	Diff line
		@@ -44,13 +44,36 @@ static void delay_loop(unsigned long loops)
		static void delay_tsc(unsigned long loops)
		{
		unsigned long bclock, now;
		int cpu;

		preempt_disable(); /* TSC's are per-cpu */
		preempt_disable();
		cpu = smp_processor_id();
		rdtscl(bclock);
		do {
		rep_nop();
		for (;;) {
		rdtscl(now);
		} while ((now-bclock) < loops);
		if ((now - bclock) >= loops)
		break;

		/* Allow RT tasks to run */
		preempt_enable();
		rep_nop();
		preempt_disable();

		/*
		* It is possible that we moved to another CPU, and
		* since TSC's are per-cpu we need to calculate
		* that. The delay must guarantee that we wait "at
		* least" the amount of time. Being moved to another
		* CPU could make the wait longer but we just need to
		* make sure we waited long enough. Rebalance the
		* counter for this CPU.
		*/
		if (unlikely(cpu != smp_processor_id())) {
		loops -= (now - bclock);
		cpu = smp_processor_id();
		rdtscl(bclock);
		}
		}
		preempt_enable();
		}

arch/x86/lib/delay_64.c

+26 −4

Original line number	Diff line number	Diff line
		@@ -31,14 +31,36 @@ int __devinit read_current_timer(unsigned long *timer_value)
		void __delay(unsigned long loops)
		{
		unsigned bclock, now;
		int cpu;

		preempt_disable(); /* TSC's are pre-cpu */
		preempt_disable();
		cpu = smp_processor_id();
		rdtscl(bclock);
		do {
		rep_nop();
		for (;;) {
		rdtscl(now);
		if ((now - bclock) >= loops)
		break;

		/* Allow RT tasks to run */
		preempt_enable();
		rep_nop();
		preempt_disable();

		/*
		* It is possible that we moved to another CPU, and
		* since TSC's are per-cpu we need to calculate
		* that. The delay must guarantee that we wait "at
		* least" the amount of time. Being moved to another
		* CPU could make the wait longer but we just need to
		* make sure we waited long enough. Rebalance the
		* counter for this CPU.
		*/
		if (unlikely(cpu != smp_processor_id())) {
		loops -= (now - bclock);
		cpu = smp_processor_id();
		rdtscl(bclock);
		}
		}
		while ((now-bclock) < loops);
		preempt_enable();
		}
		EXPORT_SYMBOL(__delay);

Admin message