Emmanuel Grumbach 8ffcc704c9 mac80211: avoid deadlock revealed by lockdep ... sdata->u.ap.request_smps_work can’t be flushed synchronously under wdev_lock(wdev) since ieee80211_request_smps_ap_work itself locks the same lock. While at it, reset the driver_smps_mode when the ap is stopped to its default: OFF. This solves: ====================================================== [ INFO: possible circular locking dependency detected ] 3.12.0-ipeer+ #2 Tainted: G O ------------------------------------------------------- rmmod/2867 is trying to acquire lock: ((&sdata->u.ap.request_smps_work)){+.+...}, at: [<c105b8d0>] flush_work+0x0/0x90 but task is already holding lock: (&wdev->mtx){+.+.+.}, at: [<f9b32626>] cfg80211_stop_ap+0x26/0x230 [cfg80211] which lock already depends on the new lock. the existing dependency chain (in reverse order) is: -> #1 (&wdev->mtx){+.+.+.}: [<c10aefa9>] lock_acquire+0x79/0xe0 [<c1607a1a>] mutex_lock_nested+0x4a/0x360 [<fb06288b>] ieee80211_request_smps_ap_work+0x2b/0x50 [mac80211] [<c105cdd8>] process_one_work+0x198/0x450 [<c105d469>] worker_thread+0xf9/0x320 [<c10669ff>] kthread+0x9f/0xb0 [<c1613397>] ret_from_kernel_thread+0x1b/0x28 -> #0 ((&sdata->u.ap.request_smps_work)){+.+...}: [<c10ae9df>] __lock_acquire+0x183f/0x1910 [<c10aefa9>] lock_acquire+0x79/0xe0 [<c105b917>] flush_work+0x47/0x90 [<c105d867>] __cancel_work_timer+0x67/0xe0 [<c105d90f>] cancel_work_sync+0xf/0x20 [<fb0765cc>] ieee80211_stop_ap+0x8c/0x340 [mac80211] [<f9b3268c>] cfg80211_stop_ap+0x8c/0x230 [cfg80211] [<f9b0d8f9>] cfg80211_leave+0x79/0x100 [cfg80211] [<f9b0da72>] cfg80211_netdev_notifier_call+0xf2/0x4f0 [cfg80211] [<c160f2c9>] notifier_call_chain+0x59/0x130 [<c106c6de>] __raw_notifier_call_chain+0x1e/0x30 [<c106c70f>] raw_notifier_call_chain+0x1f/0x30 [<c14f8213>] call_netdevice_notifiers_info+0x33/0x70 [<c14f8263>] call_netdevice_notifiers+0x13/0x20 [<c14f82a4>] __dev_close_many+0x34/0xb0 [<c14f83fe>] dev_close_many+0x6e/0xc0 [<c14f9c77>] rollback_registered_many+0xa7/0x1f0 [<c14f9dd4>] unregister_netdevice_many+0x14/0x60 [<fb06f4d9>] ieee80211_remove_interfaces+0xe9/0x170 [mac80211] [<fb055116>] ieee80211_unregister_hw+0x56/0x110 [mac80211] [<fa3e9396>] iwl_op_mode_mvm_stop+0x26/0xe0 [iwlmvm] [<f9b9d8ca>] _iwl_op_mode_stop+0x3a/0x70 [iwlwifi] [<f9b9d96f>] iwl_opmode_deregister+0x6f/0x90 [iwlwifi] [<fa405179>] __exit_compat+0xd/0x19 [iwlmvm] [<c10b8bf9>] SyS_delete_module+0x179/0x2b0 [<c1613421>] sysenter_do_call+0x12/0x32 Fixes: 687da13223 ("mac80211: implement SMPS for AP") Cc: <stable@vger.kernel.org> [3.13] Reported-by: Ilan Peer <ilan.peer@intel.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>		2014-02-06 09:55:18 +01:00
..
aes_ccm.c	mac80211: port CCMP to cryptoapi's CCM driver	2013-10-11 15:38:20 +02:00
aes_ccm.h	mac80211: port CCMP to cryptoapi's CCM driver	2013-10-11 15:38:20 +02:00
aes_cmac.c	mac80211: fix checkpatch errors	2013-12-18 10:33:06 +01:00
aes_cmac.h	mac80211: fix checkpatch errors	2013-12-18 10:33:06 +01:00
agg-rx.c
agg-tx.c
cfg.c	mac80211: avoid deadlock revealed by lockdep	2014-02-06 09:55:18 +01:00
cfg.h
chan.c	mac80211: fix iflist_mtx/mtx locking in radar detection	2013-12-19 13:33:33 +01:00
debug.h	mac80211: process the CSA frame for mesh accordingly	2013-10-28 15:05:28 +01:00
debugfs.c	mac80211: Tx frame latency statistics	2013-12-02 11:51:50 +01:00
debugfs.h
debugfs_key.c	mac80211: move sdata debugfs dir to vif	2013-03-18 20:10:04 +01:00
debugfs_key.h
debugfs_netdev.c	mac80211: sync dtim_count to TSF	2014-01-06 20:10:47 +01:00
debugfs_netdev.h
debugfs_sta.c	mac80211: Tx frame latency statistics	2013-12-02 11:51:50 +01:00
debugfs_sta.h
driver-ops.h	mac80211: add pre-RCU-sync sta removal driver operation	2013-12-16 11:29:44 +01:00
event.c
ht.c	mac80211: avoid deadlock revealed by lockdep	2014-02-06 09:55:18 +01:00
ibss.c	mac80211: fix iflist_mtx/mtx locking in radar detection	2013-12-19 13:33:33 +01:00
ieee80211_i.h	mac80211: sync dtim_count to TSF	2014-01-06 20:10:47 +01:00
iface.c	mac80211: avoid deadlock revealed by lockdep	2014-02-06 09:55:18 +01:00
Kconfig	mac80211: process the CSA frame for mesh accordingly	2013-10-28 15:05:28 +01:00
key.c	mac80211: free all AP/VLAN keys at once	2013-12-16 11:29:48 +01:00
key.h	mac80211: free all AP/VLAN keys at once	2013-12-16 11:29:48 +01:00
led.c	mac80211: use oneshot blink API for LED triggers	2013-08-01 10:48:49 +02:00
led.h	mac80211: use oneshot blink API for LED triggers	2013-08-01 10:48:49 +02:00
main.c	mac80211: fix memory leak in register_hw() error path	2014-01-06 16:02:34 +01:00
Makefile
mesh.c	mac80211: sync dtim_count to TSF	2014-01-06 20:10:47 +01:00
mesh.h	mac80211: use put_unaligned_le in mesh when necessary	2013-11-25 20:51:55 +01:00
mesh_hwmp.c	mac80211: use put_unaligned_le in mesh when necessary	2013-11-25 20:51:55 +01:00
mesh_pathtbl.c	mac80211: use put_unaligned_le in mesh when necessary	2013-11-25 20:51:55 +01:00
mesh_plink.c	mac80211: enable WME for peer mesh STA	2014-01-06 17:43:06 +01:00
mesh_ps.c	mac80211: use put_unaligned_le16 in mesh_plink_frame_tx	2013-11-25 20:51:53 +01:00
mesh_sync.c	mac80211: update adjusting TBTT bit in beacon	2013-12-16 14:21:22 +01:00
michael.c
michael.h
mlme.c	mac80211: fix iflist_mtx/mtx locking in radar detection	2013-12-19 13:33:33 +01:00
offchannel.c	mac80211: Run deferred scan if last roc_list item is not started	2013-09-30 12:36:56 +02:00
pm.c	mac80211: don't delay station destruction	2013-12-16 11:29:45 +01:00
rate.c	mac80211: respect rate mask in TX	2013-10-15 15:16:29 +02:00
rate.h	Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next	2013-12-02 14:25:38 -05:00
rc80211_minstrel.c	mac80211: fix checkpatch errors	2013-12-18 10:33:06 +01:00
rc80211_minstrel.h	mac80211/minstrel: use the new rate control API	2013-04-22 16:16:41 +02:00
rc80211_minstrel_debugfs.c	mac80211: cosmetics for minstrel_debugfs	2013-04-17 17:08:23 +02:00
rc80211_minstrel_ht.c	mac80211: fix checkpatch errors	2013-12-18 10:33:06 +01:00
rc80211_minstrel_ht.h	mac80211/minstrel_ht: use the new rate control API	2013-04-22 16:16:41 +02:00
rc80211_minstrel_ht_debugfs.c	mac80211: minstrel_ht: replace some occurences of MCS_GROUP_RATES	2013-11-25 20:52:07 +01:00
rc80211_pid.h
rc80211_pid_algo.c	mac80211/rc80211: add chandef to rate initialization	2013-07-16 09:58:02 +03:00
rc80211_pid_debugfs.c	mac80211: fix some snprintf misuses	2013-10-01 12:16:51 +02:00
rx.c	mac80211: clean up prepare_for_handlers() return value	2014-01-07 16:23:24 +01:00
scan.c	mac80211: reschedule sched scan after HW restart	2013-12-16 13:47:26 +01:00
spectmgmt.c	mac80211: fix the mesh channel switch support	2013-11-25 16:50:13 +01:00
sta_info.c	mac80211: handle MMPDUs at EOSP correctly	2014-01-10 09:50:02 +01:00
sta_info.h	mac80211: optimise mixed AP/VLAN station removal	2013-12-16 11:29:47 +01:00
status.c	mac80211: Tx frame latency statistics	2013-12-02 11:51:50 +01:00
tkip.c	mac80211: fix checkpatch errors	2013-12-18 10:33:06 +01:00
tkip.h
trace.c
trace.h	mac80211: add tracing for ieee80211_sta_set_buffered	2014-01-06 12:09:01 +01:00
tx.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2014-01-17 14:43:17 -05:00
util.c	mac80211: sync dtim_count to TSF	2014-01-06 20:10:47 +01:00
vht.c	mac80211: enable easier manipulation of VHT beamforming caps	2013-11-25 20:52:01 +01:00
wep.c	wireless: move crypto constants to ieee80211.h	2013-05-16 22:39:41 +02:00
wep.h
wme.c	mac80211: Add support for QoS mapping	2013-12-19 16:30:58 +01:00
wme.h
wpa.c	mac80211: clean up garbage in comment	2014-01-07 16:21:56 +01:00
wpa.h	mac80211: add generic cipher scheme support	2013-11-25 20:50:52 +01:00