All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 2.6.36] wireless: register wiphy rfkill w/o holding cfg80211_mutex
@ 2010-08-30 22:10 John W. Linville
  2010-08-31  6:51 ` Johannes Berg
  0 siblings, 1 reply; 6+ messages in thread
From: John W. Linville @ 2010-08-30 22:10 UTC (permalink / raw)
  To: linux-wireless
  Cc: Miles Lane, rjw, maciej.rutecki, johannes, John W. Linville

Otherwise lockdep complains...

https://bugzilla.kernel.org/show_bug.cgi?id=17311

[ INFO: possible circular locking dependency detected ]
2.6.36-rc2-git4 #12
-------------------------------------------------------
kworker/0:3/3630 is trying to acquire lock:
 (rtnl_mutex){+.+.+.}, at: [<ffffffff813396c7>] rtnl_lock+0x12/0x14

but task is already holding lock:
 (rfkill_global_mutex){+.+.+.}, at: [<ffffffffa014b129>]
rfkill_switch_all+0x24/0x49 [rfkill]

which lock already depends on the new lock.

the existing dependency chain (in reverse order) is:

-> #2 (rfkill_global_mutex){+.+.+.}:
       [<ffffffff81079ad7>] lock_acquire+0x120/0x15b
       [<ffffffff813ae869>] __mutex_lock_common+0x54/0x52e
       [<ffffffff813aede9>] mutex_lock_nested+0x34/0x39
       [<ffffffffa014b4ab>] rfkill_register+0x2b/0x29c [rfkill]
       [<ffffffffa0185ba0>] wiphy_register+0x1ae/0x270 [cfg80211]
       [<ffffffffa0206f01>] ieee80211_register_hw+0x1b4/0x3cf [mac80211]
       [<ffffffffa0292e98>] iwl_ucode_callback+0x9e9/0xae3 [iwlagn]
       [<ffffffff812d3e9d>] request_firmware_work_func+0x54/0x6f
       [<ffffffff81065d15>] kthread+0x8c/0x94
       [<ffffffff8100ac24>] kernel_thread_helper+0x4/0x10

-> #1 (cfg80211_mutex){+.+.+.}:
       [<ffffffff81079ad7>] lock_acquire+0x120/0x15b
       [<ffffffff813ae869>] __mutex_lock_common+0x54/0x52e
       [<ffffffff813aede9>] mutex_lock_nested+0x34/0x39
       [<ffffffffa018605e>] cfg80211_get_dev_from_ifindex+0x1b/0x7c [cfg80211]
       [<ffffffffa0189f36>] cfg80211_wext_giwscan+0x58/0x990 [cfg80211]
       [<ffffffff8139a3ce>] ioctl_standard_iw_point+0x1a8/0x272
       [<ffffffff8139a529>] ioctl_standard_call+0x91/0xa7
       [<ffffffff8139a687>] T.723+0xbd/0x12c
       [<ffffffff8139a727>] wext_handle_ioctl+0x31/0x6d
       [<ffffffff8133014e>] dev_ioctl+0x63d/0x67a
       [<ffffffff8131afd9>] sock_ioctl+0x48/0x21d
       [<ffffffff81102abd>] do_vfs_ioctl+0x4ba/0x509
       [<ffffffff81102b5d>] sys_ioctl+0x51/0x74
       [<ffffffff81009e02>] system_call_fastpath+0x16/0x1b

-> #0 (rtnl_mutex){+.+.+.}:
       [<ffffffff810796b0>] __lock_acquire+0xa93/0xd9a
       [<ffffffff81079ad7>] lock_acquire+0x120/0x15b
       [<ffffffff813ae869>] __mutex_lock_common+0x54/0x52e
       [<ffffffff813aede9>] mutex_lock_nested+0x34/0x39
       [<ffffffff813396c7>] rtnl_lock+0x12/0x14
       [<ffffffffa0185cb5>] cfg80211_rfkill_set_block+0x1a/0x7b [cfg80211]
       [<ffffffffa014aed0>] rfkill_set_block+0x80/0xd5 [rfkill]
       [<ffffffffa014b07e>] __rfkill_switch_all+0x3f/0x6f [rfkill]
       [<ffffffffa014b13d>] rfkill_switch_all+0x38/0x49 [rfkill]
       [<ffffffffa014b821>] rfkill_op_handler+0x105/0x136 [rfkill]
       [<ffffffff81060708>] process_one_work+0x248/0x403
       [<ffffffff81062620>] worker_thread+0x139/0x214
       [<ffffffff81065d15>] kthread+0x8c/0x94
       [<ffffffff8100ac24>] kernel_thread_helper+0x4/0x10

Signed-off-by: John W. Linville <linville@tuxdriver.com>
---
 net/wireless/core.c |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/net/wireless/core.c b/net/wireless/core.c
index 541e2ff..d80c1d5 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -472,16 +472,16 @@ int wiphy_register(struct wiphy *wiphy)
 	/* check and set up bitrates */
 	ieee80211_set_bitrate_flags(wiphy);
 
+	res = rfkill_register(rdev->rfkill);
+	if (res)
+		return res;
+
 	mutex_lock(&cfg80211_mutex);
 
 	res = device_add(&rdev->wiphy.dev);
 	if (res)
 		goto out_unlock;
 
-	res = rfkill_register(rdev->rfkill);
-	if (res)
-		goto out_rm_dev;
-
 	/* set up regulatory info */
 	wiphy_update_regulatory(wiphy, NL80211_REGDOM_SET_BY_CORE);
 
@@ -511,9 +511,6 @@ int wiphy_register(struct wiphy *wiphy)
 
 	return 0;
 
-out_rm_dev:
-	device_del(&rdev->wiphy.dev);
-
 out_unlock:
 	mutex_unlock(&cfg80211_mutex);
 	return res;
-- 
1.7.2.2


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH 2.6.36] wireless: register wiphy rfkill w/o holding cfg80211_mutex
  2010-08-30 22:10 [PATCH 2.6.36] wireless: register wiphy rfkill w/o holding cfg80211_mutex John W. Linville
@ 2010-08-31  6:51 ` Johannes Berg
  2010-08-31 17:55   ` John W. Linville
  2010-08-31 17:57   ` [PATCH] " John W. Linville
  0 siblings, 2 replies; 6+ messages in thread
From: Johannes Berg @ 2010-08-31  6:51 UTC (permalink / raw)
  To: John W. Linville; +Cc: linux-wireless, Miles Lane, rjw, maciej.rutecki

Thanks,

> +	res = rfkill_register(rdev->rfkill);
> +	if (res)
> +		return res;
> +
>  	mutex_lock(&cfg80211_mutex);
>  
>  	res = device_add(&rdev->wiphy.dev);
>  	if (res)
>  		goto out_unlock;

but does that behave correctly in sysfs? rfkill_register should create
some sysfs stuff that points to the device that now only gets added
later, doesn't that break things?

johannes


^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH 2.6.36] wireless: register wiphy rfkill w/o holding cfg80211_mutex
  2010-08-31  6:51 ` Johannes Berg
@ 2010-08-31 17:55   ` John W. Linville
  2010-08-31 17:57   ` [PATCH] " John W. Linville
  1 sibling, 0 replies; 6+ messages in thread
From: John W. Linville @ 2010-08-31 17:55 UTC (permalink / raw)
  To: Johannes Berg; +Cc: linux-wireless, Miles Lane, rjw, maciej.rutecki

On Tue, Aug 31, 2010 at 08:51:17AM +0200, Johannes Berg wrote:
> Thanks,
> 
> > +	res = rfkill_register(rdev->rfkill);
> > +	if (res)
> > +		return res;
> > +
> >  	mutex_lock(&cfg80211_mutex);
> >  
> >  	res = device_add(&rdev->wiphy.dev);
> >  	if (res)
> >  		goto out_unlock;
> 
> but does that behave correctly in sysfs? rfkill_register should create
> some sysfs stuff that points to the device that now only gets added
> later, doesn't that break things?

Yeah, I see that now -- should have looked closer.

John
-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [PATCH] wireless: register wiphy rfkill w/o holding cfg80211_mutex
  2010-08-31  6:51 ` Johannes Berg
  2010-08-31 17:55   ` John W. Linville
@ 2010-08-31 17:57   ` John W. Linville
  2010-08-31 18:10     ` Johannes Berg
  1 sibling, 1 reply; 6+ messages in thread
From: John W. Linville @ 2010-08-31 17:57 UTC (permalink / raw)
  To: linux-wireless; +Cc: Miles Lane, rjw, maciej.rutecki, John W. Linville

Otherwise lockdep complains...

https://bugzilla.kernel.org/show_bug.cgi?id=17311

[ INFO: possible circular locking dependency detected ]
2.6.36-rc2-git4 #12
-------------------------------------------------------
kworker/0:3/3630 is trying to acquire lock:
 (rtnl_mutex){+.+.+.}, at: [<ffffffff813396c7>] rtnl_lock+0x12/0x14

but task is already holding lock:
 (rfkill_global_mutex){+.+.+.}, at: [<ffffffffa014b129>]
rfkill_switch_all+0x24/0x49 [rfkill]

which lock already depends on the new lock.

the existing dependency chain (in reverse order) is:

-> #2 (rfkill_global_mutex){+.+.+.}:
       [<ffffffff81079ad7>] lock_acquire+0x120/0x15b
       [<ffffffff813ae869>] __mutex_lock_common+0x54/0x52e
       [<ffffffff813aede9>] mutex_lock_nested+0x34/0x39
       [<ffffffffa014b4ab>] rfkill_register+0x2b/0x29c [rfkill]
       [<ffffffffa0185ba0>] wiphy_register+0x1ae/0x270 [cfg80211]
       [<ffffffffa0206f01>] ieee80211_register_hw+0x1b4/0x3cf [mac80211]
       [<ffffffffa0292e98>] iwl_ucode_callback+0x9e9/0xae3 [iwlagn]
       [<ffffffff812d3e9d>] request_firmware_work_func+0x54/0x6f
       [<ffffffff81065d15>] kthread+0x8c/0x94
       [<ffffffff8100ac24>] kernel_thread_helper+0x4/0x10

-> #1 (cfg80211_mutex){+.+.+.}:
       [<ffffffff81079ad7>] lock_acquire+0x120/0x15b
       [<ffffffff813ae869>] __mutex_lock_common+0x54/0x52e
       [<ffffffff813aede9>] mutex_lock_nested+0x34/0x39
       [<ffffffffa018605e>] cfg80211_get_dev_from_ifindex+0x1b/0x7c [cfg80211]
       [<ffffffffa0189f36>] cfg80211_wext_giwscan+0x58/0x990 [cfg80211]
       [<ffffffff8139a3ce>] ioctl_standard_iw_point+0x1a8/0x272
       [<ffffffff8139a529>] ioctl_standard_call+0x91/0xa7
       [<ffffffff8139a687>] T.723+0xbd/0x12c
       [<ffffffff8139a727>] wext_handle_ioctl+0x31/0x6d
       [<ffffffff8133014e>] dev_ioctl+0x63d/0x67a
       [<ffffffff8131afd9>] sock_ioctl+0x48/0x21d
       [<ffffffff81102abd>] do_vfs_ioctl+0x4ba/0x509
       [<ffffffff81102b5d>] sys_ioctl+0x51/0x74
       [<ffffffff81009e02>] system_call_fastpath+0x16/0x1b

-> #0 (rtnl_mutex){+.+.+.}:
       [<ffffffff810796b0>] __lock_acquire+0xa93/0xd9a
       [<ffffffff81079ad7>] lock_acquire+0x120/0x15b
       [<ffffffff813ae869>] __mutex_lock_common+0x54/0x52e
       [<ffffffff813aede9>] mutex_lock_nested+0x34/0x39
       [<ffffffff813396c7>] rtnl_lock+0x12/0x14
       [<ffffffffa0185cb5>] cfg80211_rfkill_set_block+0x1a/0x7b [cfg80211]
       [<ffffffffa014aed0>] rfkill_set_block+0x80/0xd5 [rfkill]
       [<ffffffffa014b07e>] __rfkill_switch_all+0x3f/0x6f [rfkill]
       [<ffffffffa014b13d>] rfkill_switch_all+0x38/0x49 [rfkill]
       [<ffffffffa014b821>] rfkill_op_handler+0x105/0x136 [rfkill]
       [<ffffffff81060708>] process_one_work+0x248/0x403
       [<ffffffff81062620>] worker_thread+0x139/0x214
       [<ffffffff81065d15>] kthread+0x8c/0x94
       [<ffffffff8100ac24>] kernel_thread_helper+0x4/0x10

Signed-off-by: John W. Linville <linville@tuxdriver.com>
---
 net/wireless/core.c |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/net/wireless/core.c b/net/wireless/core.c
index 541e2ff..d6d046b 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -475,12 +475,10 @@ int wiphy_register(struct wiphy *wiphy)
 	mutex_lock(&cfg80211_mutex);
 
 	res = device_add(&rdev->wiphy.dev);
-	if (res)
-		goto out_unlock;
-
-	res = rfkill_register(rdev->rfkill);
-	if (res)
-		goto out_rm_dev;
+	if (res) {
+		mutex_unlock(&cfg80211_mutex);
+		return res;
+	}
 
 	/* set up regulatory info */
 	wiphy_update_regulatory(wiphy, NL80211_REGDOM_SET_BY_CORE);
@@ -509,13 +507,18 @@ int wiphy_register(struct wiphy *wiphy)
 	cfg80211_debugfs_rdev_add(rdev);
 	mutex_unlock(&cfg80211_mutex);
 
+	/*
+	 * due to a locking dependency this has to be outside of the
+	 * cfg80211_mutex lock
+	 */
+	res = rfkill_register(rdev->rfkill);
+	if (res)
+		goto out_rm_dev;
+
 	return 0;
 
 out_rm_dev:
 	device_del(&rdev->wiphy.dev);
-
-out_unlock:
-	mutex_unlock(&cfg80211_mutex);
 	return res;
 }
 EXPORT_SYMBOL(wiphy_register);
-- 
1.7.2.2


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH] wireless: register wiphy rfkill w/o holding cfg80211_mutex
  2010-08-31 17:57   ` [PATCH] " John W. Linville
@ 2010-08-31 18:10     ` Johannes Berg
  2010-08-31 23:08       ` Miles Lane
  0 siblings, 1 reply; 6+ messages in thread
From: Johannes Berg @ 2010-08-31 18:10 UTC (permalink / raw)
  To: John W. Linville; +Cc: linux-wireless, Miles Lane, rjw, maciej.rutecki

On Tue, 2010-08-31 at 13:57 -0400, John W. Linville wrote:
> Otherwise lockdep complains...
> 
> https://bugzilla.kernel.org/show_bug.cgi?id=17311
...

> Signed-off-by: John W. Linville <linville@tuxdriver.com>

Acked-by: Johannes Berg <johannes@sipsolutions.net>

Thanks John.

johannes


^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] wireless: register wiphy rfkill w/o holding cfg80211_mutex
  2010-08-31 18:10     ` Johannes Berg
@ 2010-08-31 23:08       ` Miles Lane
  0 siblings, 0 replies; 6+ messages in thread
From: Miles Lane @ 2010-08-31 23:08 UTC (permalink / raw)
  To: Johannes Berg; +Cc: John W. Linville, linux-wireless, rjw, maciej.rutecki

Works great!  Thanks.

On Tue, Aug 31, 2010 at 2:10 PM, Johannes Berg
<johannes@sipsolutions.net> wrote:
> On Tue, 2010-08-31 at 13:57 -0400, John W. Linville wrote:
>> Otherwise lockdep complains...
>>
>> https://bugzilla.kernel.org/show_bug.cgi?id=17311
> ...
>
>> Signed-off-by: John W. Linville <linville@tuxdriver.com>
>
> Acked-by: Johannes Berg <johannes@sipsolutions.net>
>
> Thanks John.
>
> johannes
>
>

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-08-31 23:08 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-08-30 22:10 [PATCH 2.6.36] wireless: register wiphy rfkill w/o holding cfg80211_mutex John W. Linville
2010-08-31  6:51 ` Johannes Berg
2010-08-31 17:55   ` John W. Linville
2010-08-31 17:57   ` [PATCH] " John W. Linville
2010-08-31 18:10     ` Johannes Berg
2010-08-31 23:08       ` Miles Lane

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.