On Tue, 4 Mar 2008 18:43:15 +0100 Andi Kleen <andi@firstfloor.org> wrote:I don't think I quite see the point. If we can't force an update, then it doesn't really help us knowing if the jiffies value is stale or not. Anyway, I'm running the following patch for now. I'll keep it on my machine for a few days and see if I still hear crickets. diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c index 78d77c5..73f954d 100644 --- a/drivers/cpuidle/governors/menu.c +++ b/drivers/cpuidle/governors/menu.c @@ -16,6 +16,9 @@ #define BREAK_FUZZ 4 /* 4 us */ +static unsigned int min_deep_sleep = 0; +static unsigned int failed_deep = 0; + struct menu_device { int last_state_idx; @@ -23,6 +26,8 @@ struct menu_device { unsigned int predicted_us; unsigned int last_measured_us; unsigned int elapsed_us; + + unsigned long last_deep; }; static DEFINE_PER_CPU(struct menu_device, menu_devices); @@ -50,9 +55,33 @@ static int menu_select(struct cpuidle_device *dev) break; if (s->exit_latency > pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY)) break; + + /* + * In order to avoid the problem of "singing capacitors", + * don't enter a deep sleep for short durations (2 ms seems + * to do the trick). This will, hopefully, keep the problem + * inaudible. + */ + if (min_deep_sleep && (s->flags & CPUIDLE_FLAG_DEEP)) { + if (time_before_eq(jiffies, data->last_deep + + HZ * min_deep_sleep / USEC_PER_SEC)) + break; +#if 0 + if (min_deep_sleep > data->expected_us) + break; + if (min_deep_sleep > data->predicted_us) + break; + if (min_deep_sleep > data->last_measured_us) + break; +#endif + } } data->last_state_idx = i - 1; + + if (dev->states[i - 1].flags & CPUIDLE_FLAG_DEEP) + data->last_deep = jiffies; + return i - 1; } @@ -80,6 +109,10 @@ static void menu_reflect(struct cpuidle_device *dev) if (!(target->flags & CPUIDLE_FLAG_TIME_VALID)) measured_us = USEC_PER_SEC / HZ; + if ((target->flags & CPUIDLE_FLAG_DEEP) && + (cpuidle_get_last_residency(dev) < min_deep_sleep)) + failed_deep++; + /* Predict time remaining until next break event */ if (measured_us + BREAK_FUZZ < data->expected_us - target->exit_latency) { data->predicted_us = max(measured_us, data->last_measured_us); @@ -103,6 +136,11 @@ static int menu_enable_device(struct cpuidle_device *dev) struct menu_device *data = &per_cpu(menu_devices, dev->cpu); memset(data, 0, sizeof(struct menu_device)); + /* + * 0 might be slightly ahead of the current jiffies count, so + * it's a bad initial value. + */ + data->last_deep = jiffies; return 0; } @@ -132,6 +170,11 @@ static void __exit exit_menu(void) cpuidle_unregister_governor(&menu_governor); } +module_param(min_deep_sleep, uint, 0644) +MODULE_PARM_DESC(min_deep_sleep, "min time (us) to spend in deep sleep to avoid noise") + +module_param(failed_deep, uint, 0644) + MODULE_LICENSE("GPL"); module_init(init_menu); module_exit(exit_menu); -- -- Pierre Ossman Linux kernel, MMC maintainer http://www.kernel.org PulseAudio, core developer http://pulseaudio.org rdesktop, core developer http://www.rdesktop.org --
| Andrew Morton | -mm merge plans for 2.6.23 |
| Greg Kroah-Hartman | [PATCH 004/196] Chinese: add translation of SubmittingPatches |
| Tarkan Erimer | Re: Dual-Licensing Linux Kernel with GPL V2 and GPL V3 |
| Gabriel C | Re: [Announce] [patch] Modular Scheduler Core and Completely Fair Scheduler [CFS] |
git: | |
| Gerrit Renker | [PATCH 03/37] dccp: List management for new feature negotiation |
| David Miller | [GIT]: Networking |
| Thomas Jarosch | Re: TCP connection stalls under 2.6.24.7 |
| Jarek Poplawski | [PATCH] pkt_sched: Destroy gen estimators under rtnl_lock(). |
