Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757481AbZFQRFa (ORCPT ); Wed, 17 Jun 2009 13:05:30 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753651AbZFQRFV (ORCPT ); Wed, 17 Jun 2009 13:05:21 -0400 Received: from mga11.intel.com ([192.55.52.93]:19982 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753245AbZFQRFU (ORCPT ); Wed, 17 Jun 2009 13:05:20 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.42,238,1243839600"; d="scan'208";a="467262973" Subject: Re: [Bug #13475] suspend/hibernate lockdep warning From: "Pallipadi, Venkatesh" To: Thomas Renninger Cc: Mathieu Desnoyers , Simon Holm =?ISO-8859-1?Q?Th=F8gersen?= , Dave Jones , Pekka Enberg , Dave Young , "Rafael J. Wysocki" , Linux Kernel Mailing List , Kernel Testers List , "cpufreq@vger.kernel.org" , Rusty Russell , "sven.wegener@stealer.net" In-Reply-To: <200906171729.16272.trenn@suse.de> References: <20090611152329.GB28099@Krystal> <20090617003925.GA3900@linux-os.sc.intel.com> <200906171729.16272.trenn@suse.de> Content-Type: text/plain; charset="UTF-8" Date: Wed, 17 Jun 2009 10:03:42 -0700 Message-Id: <1245258222.4534.8632.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 2.24.3 (2.24.3-1.fc10) Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 9700 Lines: 207 On Wed, 2009-06-17 at 08:29 -0700, Thomas Renninger wrote: > On Wednesday 17 June 2009 02:39:25 Pallipadi, Venkatesh wrote: > > On Thu, Jun 11, 2009 at 08:23:29AM -0700, Mathieu Desnoyers wrote: > > > * Simon Holm Thøgersen (odie@cs.aau.dk) wrote: > > > > man, 08 06 2009 kl. 10:32 -0400, skrev Dave Jones: > > > > > On Mon, Jun 08, 2009 at 08:48:45AM -0400, Mathieu Desnoyers wrote: > > > > > > > > > > > > > >> Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=13475 > > > > > > > > >> Subject : suspend/hibernate lockdep warning > > > > > > > > >> References : http://marc.info/?l=linux-kernel&m=124393723321241&w=4 > > > > > > > > > > > > > > > > I suspect the following commit, after revert this patch I test 5 times > > > > > > > > without lockdep warnings. > > > > > > > > > > > > > > > > commit b14893a62c73af0eca414cfed505b8c09efc613c > > > > > > > > Author: Mathieu Desnoyers > > > > > > > > Date: Sun May 17 10:30:45 2009 -0400 > > > > > > > > > > > > > > > > [CPUFREQ] fix timer teardown in ondemand governor > > > > > > > > > > > > > > The patch is probably not at fault here. I suspect it's some latent bug > > > > > > > that simply got exposed by the change to cancel_delayed_work_sync(). In > > > > > > > any case, Mathieu, can you take a look at this please? > > > > > > > > > > > > Yes, it's been looked at and discussed on the cpufreq ML. The short > > > > > > answer is that they plan to re-engineer cpufreq and remove the policy > > > > > > rwlock taken around almost every operations at the cpufreq level. > > > > > > > > > > > > The short-term solution, which is recognised as ugly, would be do to the > > > > > > following before doing the cancel_delayed_work_sync() : > > > > > > > > > > > > unlock policy rwlock write lock > > > > > > > > > > > > lock policy rwlock write lock > > > > > > > > > > > > It basically works because this rwlock is unneeded for teardown, hence > > > > > > the future re-work planned. > > > > > > > > > > > > I'm sorry I cannot prepare a patch current... I've got quite a few pages > > > > > > of Ph.D. thesis due for the beginning of July. > > > > > > > > > > I'm kinda scared to touch this code at all for .30 due to the number of > > > > > unexpected gotchas we seem to run into every time we touch something > > > > > locking related. So I'm inclined to just live with the lockdep warning > > > > > for .30, and see how the real fixes look for .31, and push them back > > > > > as -stable updates if they work out. > > > > > > > > Unfortunately I don't think it is just theoretical, I've actually hit > > > > the following (that haven't got anything to do with suspend/hibernate) > > > > > > > > INFO: task cpufreqd:4676 blocked for more than 120 seconds. > > > > "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. > > > > cpufreqd D eee2ac60 0 4676 1 > > > > ee01bd68 00000086 eee2aad0 eee2ac60 00000533 eee2aad0 eee2ac60 0002b16f > > > > 00000000 eee2ac60 7fffffff 7fffffff eee2ac60 7fffffff 7fffffff 00000000 > > > > ee01bd70 c03117ee ee01bdbc c0311c0c eee2aad0 eecf6900 eee2aad0 eecf6900 > > > > Call Trace: > > > > [] schedule+0x12/0x24 > > > > [] schedule_timeout+0x17/0x170 > > > > [] ? __wake_up+0x2b/0x51 > > > > [] wait_for_common+0xc4/0x135 > > > > [] ? default_wake_function+0x0/0xd > > > > [] wait_for_completion+0x12/0x14 > > > > [] __cancel_work_timer+0xfe/0x129 > > > > [] ? wq_barrier_func+0x0/0xd > > > > [] cancel_delayed_work_sync+0xb/0xd > > > > [] cpufreq_governor_dbs+0x22e/0x291 [cpufreq_ondemand] > > > > [] __cpufreq_governor+0x65/0x9d > > > > [] __cpufreq_set_policy+0xd1/0x11f > > > > [] store_scaling_governor+0x18a/0x1b2 > > > > [] ? handle_update+0x0/0xd > > > > [] ? store_scaling_governor+0x0/0x1b2 > > > > [] store+0x48/0x61 > > > > [] sysfs_write_file+0xb4/0xdf > > > > [] ? sysfs_write_file+0x0/0xdf > > > > [] vfs_write+0x8a/0x104 > > > > [] sys_write+0x3b/0x60 > > > > [] sysenter_do_call+0x12/0x2c > > > > INFO: task kondemand/0:4956 blocked for more than 120 seconds. > > > > "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. > > > > kondemand/0 D 00000533 0 4956 2 > > > > ee1d9efc 00000046 c011815f 00000533 071148de ee1e0080 ee1e0210 00000000 > > > > c03ff478 9189e633 00000082 c03ff478 ee1e0210 c04159f4 c04159f0 00000000 > > > > ee1d9f04 c03117ee ee1d9f28 c0313104 ee1d9f30 c04159f4 ee1e0080 c01183be > > > > Call Trace: > > > > [] ? update_curr+0x6c/0x14b > > > > [] schedule+0x12/0x24 > > > > [] rwsem_down_failed_common+0x150/0x16e > > > > [] ? dequeue_task_fair+0x51/0x56 > > > > [] rwsem_down_write_failed+0x1b/0x23 > > > > [] call_rwsem_down_write_failed+0x6/0x8 > > > > [] ? down_write+0x14/0x16 > > > > [] lock_policy_rwsem_write+0x1d/0x33 > > > > [] do_dbs_timer+0x45/0x266 [cpufreq_ondemand] > > > > [] worker_thread+0x165/0x212 > > > > [] ? do_dbs_timer+0x0/0x266 [cpufreq_ondemand] > > > > [] ? autoremove_wake_function+0x0/0x33 > > > > [] ? worker_thread+0x0/0x212 > > > > [] kthread+0x42/0x67 > > > > [] ? kthread+0x0/0x67 > > > > [] kernel_thread_helper+0x7/0x10 > > > > > > > > I've only seen it once in 5 boots and CONFIG_PROVELOCKING does not give any > > > > warnings about this, though it does yell when switching governor as reported > > > > by others in bug #13493. > > > > > > > > Let's hope Mathieu nails it, though I know he's busy with his thesis. > > > > > > > > > > Thanks for the lockdep reports, > > > > > > I'm currently looking into it, and it's not pretty. Basically we have : > > > > > > A > > > B > > > (means B nested in A) > > > > > > work > > > read rwlock policy > > > > > > dbs_mutex > > > work > > > read rwlock policy > > > > > > write rwlock policy > > > dbs_mutex > > > > > > So the added dbs_mutex <- work <- rwlock policy dependency (for proper > > > teardown) is firing the reverse dependency between policy rwlock and > > > dbs_mutex. > > > > > > The real way to fix this is to do not take the rwlock policy around > > > non-policy-related actions, like governor START/STOP doing worker > > > creation/teardown. > > > > > > One simple short-term solution would be to take a mutex outside of the > > > policy rwlock write lock in cpufreq.c. This mutex would be the > > > equivalent of dbs_mutex "lifted" outside of the rwlock write lock. For > > > teardown, we only need to hold this mutex, not the rwlock write lock. > > > Then we can remove the dbs_mutex from the governors. > > > > > > But looking at cpufreq.c's cpufreq_add_dev() is very much like kicking a > > > wasp nest: a lot of error paths are not handled properly, and I fear > > > someone will have to go through the code, fix the currently incorrect > > > code paths, and then add the lifted mutex. > > > > > > I currently have no time for implementation due to my thesis, but I'll > > > be happy to review a patch. > > > > > > > How about below patch on top of Mathieu's patch here > > http://marc.info/?l=linux-kernel&m=124448150529838&w=2 > > > > [PATCH] cpufreq: Eliminate lockdep issue with dbs_mutex and policy_rwsem > > > > This removes the unneeded dependency of > > write rwlock policy > > dbs_mutex > > > > dbs_mutex does not have anything to do with timer_init and timer_exit. It > > is just to protect dbs tunables in sysfs cpufreq/ondemand > Why is sysfs tunables protection needed at all? > > The ondemand locking very much looks like taken over from the userspace > governor. There you need the lock because a write to set_speed directly > calls ->target. > I was looking at the same thing before sending the patch yesterday. I don't think the dbs_lock is similar to userspace lock. Infact, I don't think we need the lock in userspace case, as we will already be holding policy rwsem in cpufreq, before calling setspeed. But thats a different story. > What is urgently missing is a description for what the locks are > really used, not only in which case they deadlock. > > From your comment above: > > dbs_mutex does not have anything to do with timer_init and timer_exit. > But this is what it seems to do? > If it's not needed to protect calling timer_init while in timer_exit > (or the other way around) and sysfs_create_group while > in sysfs_remove_group I think the mutex can be deleted. > What do you think about this patch (compile tested only and not > for .30)? > > Is someone aware of any test scenarios I could run to try without > the mutex and run into trouble? > Do I totally miss something here or does this make sense? > The reason I left dbs_mutex as is and just removed the init/exit timer outside the lock was because of the non typical sysfs usage in ondemand. We have dbs_attr_group that gets added under each cpu's cpufreq directory, but they are controlling a single set of ondemand variables. This mutex is just serializing the changes to those variables. I could't think of any functionality issues of not having the lock as such. Thanks, Venki -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/