On Sat, 24 May 2008, Steven Rostedt wrote:Eeek, once you migrated you do this all the time. you need to update cpu here. Also this is really dangerous with unsynchronized TSCs. You might get migrated and return immediately because the TSC on the other CPU is far ahead. What you really want is something like the patch below, but we should reuse the sched_clock_cpu() thingy to make that simpler. Looking into that right now. Thanks, tglx diff --git a/arch/x86/lib/delay_32.c b/arch/x86/lib/delay_32.c index 4535e6d..66a3c32 100644 --- a/arch/x86/lib/delay_32.c +++ b/arch/x86/lib/delay_32.c @@ -40,17 +40,51 @@ static void delay_loop(unsigned long loops) :"0" (loops)); } +/* + * 5 usec on a 1GHZ machine. Not necessarily correct, but not too long + * either. + */ +#define TSC_MIGRATE_COUNT 5000 + /* TSC based delay: */ 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(); - rdtscl(now); - } while ((now-bclock) < loops); + + /* Allow RT tasks to run */ + preempt_enable(); + 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())) { + if (loops <= TSC_MIGRATE_COUNT) + break; + cpu = smp_processor_id(); + rdtscl(bclock); + loops -= TSC_MIGRATE_COUNT; + } else { + rdtscl(now); + if ((now - bclock) >= loops) + break; + loops -= (now - bclock); + bclock = now; + } + } while (loops > 0); preempt_enable(); } --
| Benjamin Herrenschmidt | Re: [PATCH] Remove process freezer from suspend to RAM pathway |
| Daniel Walker | Re: [Announce] [patch] Modular Scheduler Core and Completely Fair Scheduler [CFS] |
| Greg KH | [GIT PATCH] driver core patches against 2.6.24 |
| Andrew Morton | -mm merge plans for 2.6.23 |
git: | |
| David Miller | [GIT]: Networking |
| Hannes Eder | [PATCH 01/43] drivers/net/at1700.c: fix sparse warning: symbol shadows an earlier ... |
| Gerrit Renker | [PATCH 16/37] dccp: API to query the current TX/RX CCID |
| Herbert Xu | Re: [PATCH] pkt_sched: Destroy gen estimators under rtnl_lock(). |
