drivers: staging: rtl8723bs: Fix locking in _rtw_join_timeout_handler()
PATCH 1/4 drivers: staging: rtl8723bs: Fix locking in _rtw_join_timeout_handler()
Commit 041879b12ddb ("drivers: staging: rtl8192bs: Fix deadlock in rtw_joinbss_event_prehandle()") besides fixing the deadlock also modified _rtw_join_timeout_handler() to use spin_[un]lock_irq() instead of spin_[un]lock_bh().
_rtw_join_timeout_handler() calls rtw_do_join() which takes pmlmepriv->scanned_queue.lock using spin_[un]lock_bh(). This spin_unlock_bh() call re-enables softirqs which triggers an oops in kernel/softirq.c: __local_bh_enable_ip() when it calls lockdep_assert_irqs_enabled():
[ 244.506087] WARNING: CPU: 2 PID: 0 at kernel/softirq.c:376 __local_bh_enable_ip+0xa6/0x100 ... [ 244.509022] Call Trace: [ 244.509048] <IRQ> [ 244.509100] _rtw_join_timeout_handler+0x134/0x170 [r8723bs] [ 244.509468] ? __pfx__rtw_join_timeout_handler+0x10/0x10 [r8723bs] [ 244.509772] ? __pfx__rtw_join_timeout_handler+0x10/0x10 [r8723bs] [ 244.510076] call_timer_fn+0x95/0x2a0 [ 244.510200] __run_timers.part.0+0x1da/0x2d0
This oops is causd by the switch to spin_[un]lock_irq() which disables the IRQs for the entire duration of _rtw_join_timeout_handler().
Disabling the IRQs is not necessary since all code taking this lock runs from either user contexts or from softirqs, switch back to spin_[un]lock_bh() to fix this.
--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +2 -2
@@ -1549,7 +1549,7 @@ void _rtw_join_timeout_handler(struct timer_list *t)if (adapter->bDriverStopped || adapter->bSurpriseRemoved)return ; -spin_lock_irq (&pmlmepriv->lock); +spin_lock_bh (&pmlmepriv->lock);if (rtw_to_roam (adapter) >0 ) {/* join timeout caused by roaming */ while (1 ) {
@@ -1577,7 +1577,7 @@ void _rtw_join_timeout_handler(struct timer_list *t) } -spin_unlock_irq (&pmlmepriv->lock); +spin_unlock_bh (&pmlmepriv->lock); }/*
Signature · 1 line
2.39.1
PATCH 2/4 drivers: staging: rtl8723bs: Fix locking in rtw_scan_timeout_handler()
Commit cc7ad0d77b51 ("drivers: staging: rtl8723bs: Fix deadlock in rtw_surveydone_event_callback()") besides fixing the deadlock also modified rtw_scan_timeout_handler() to use spin_[un]lock_irq() instead of spin_[un]lock_bh().
Disabling the IRQs is not necessary since all code taking this lock runs from either user contexts or from softirqs
rtw_scan_timeout_handler() is the only function taking pmlmepriv->lock which uses spin_[un]lock_irq() for this. Switch back to spin_[un]lock_bh() to make it consistent with the rest of the code.
--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +2 -2
@@ -1590,11 +1590,11 @@ void rtw_scan_timeout_handler(struct timer_list *t) mlmepriv.scan_to_timer);struct mlme_priv *pmlmepriv = &adapter->mlmepriv; -spin_lock_irq (&pmlmepriv->lock); +spin_lock_bh (&pmlmepriv->lock);_clr_fwstate_ (pmlmepriv, _FW_UNDER_SURVEY); -spin_unlock_irq (&pmlmepriv->lock); +spin_unlock_bh (&pmlmepriv->lock);rtw_indicate_scan_done (adapter, true); }
Signature · 1 line
2.39.1
PATCH 3/4 drivers: staging: rtl8723bs: Remove unused clr_fwstate() function
In reply to Hans de GoedeThe clr_fwstate() function is not used anywhere, remove it.
--- drivers/staging/rtl8723bs/include/rtw_mlme.h | 12 ------------ 1 file changed, 12 deletions(-)
drivers/staging/rtl8723bs/include/rtw_mlme.h +0 -12
@@ -490,18 +490,6 @@ static inline void _clr_fwstate_(struct mlme_priv *pmlmepriv, signed int state) pmlmepriv->bScanInProcess = false; } -/* -* No Limit on the calling context, -* therefore set it to be the critical section... -*/ -static inline void clr_fwstate (struct mlme_priv *pmlmepriv,signed int state) -{ -spin_lock_bh (&pmlmepriv->lock); -if (check_fwstate (pmlmepriv, state) == true) - pmlmepriv->fw_state ^= state; -spin_unlock_bh (&pmlmepriv->lock); -} -static inline void set_scanned_network_val (struct mlme_priv *pmlmepriv,signed int val) {spin_lock_bh (&pmlmepriv->lock);
Signature · 1 line
2.39.1
PATCH 4/4 drivers: staging: rtl8723bs: Remove pmlmepriv->num_of_scanned
In reply to Hans de Goedepmlmepriv->num_of_scanned is only ever set and never read, remove it.
--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 9 --------- drivers/staging/rtl8723bs/include/rtw_mlme.h | 8 -------- 2 files changed, 17 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +0 -9
@@ -32,8 +32,6 @@ int rtw_init_mlme_priv(struct adapter *padapter)INIT_LIST_HEAD (&pmlmepriv->scanned_queue.queue);spin_lock_init (&pmlmepriv->scanned_queue.lock); -set_scanned_network_val (pmlmepriv,0 ); -memset (&pmlmepriv->assoc_ssid,0 ,sizeof (struct ndis_802_11_ssid )); pbuf =vzalloc (array_size (MAX_BSS_CNT ,sizeof (struct wlan_network )));
@@ -161,8 +159,6 @@ struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv) pnetwork->aid =0 ; pnetwork->join_res =0 ; - pmlmepriv->num_of_scanned++; - exit:spin_unlock_bh (&free_queue->lock);
@@ -198,8 +194,6 @@ void _rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetworlist_add_tail (&(pnetwork->list), &(free_queue->queue)); - pmlmepriv->num_of_scanned--; -spin_unlock_bh (&free_queue->lock); }
@@ -220,8 +214,6 @@ void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_network *list_add_tail (&(pnetwork->list),get_list_head (free_queue)); - pmlmepriv->num_of_scanned--; -/* spin_unlock_irqrestore(&free_queue->lock, irqL); */ }
@@ -863,7 +855,6 @@ static void free_scanqueue(struct mlme_priv *pmlmepriv)list_del_init (plist);list_add_tail (plist, &free_queue->queue); plist = ptemp; - pmlmepriv->num_of_scanned--; }spin_unlock_bh (&free_queue->lock);
drivers/staging/rtl8723bs/include/rtw_mlme.h +0 -8
@@ -303,7 +303,6 @@ struct mlme_priv {struct __queue free_bss_pool;struct __queue scanned_queue;u8 *free_bss_buf; -u32 num_of_scanned;struct ndis_802_11_ssid assoc_ssid;u8 assoc_bssid[6 ];
@@ -490,13 +489,6 @@ static inline void _clr_fwstate_(struct mlme_priv *pmlmepriv, signed int state) pmlmepriv->bScanInProcess = false; } -static inline void set_scanned_network_val (struct mlme_priv *pmlmepriv,signed int val) -{ -spin_lock_bh (&pmlmepriv->lock); - pmlmepriv->num_of_scanned = val; -spin_unlock_bh (&pmlmepriv->lock); -} -extern u16 rtw_get_capability (struct wlan_bssid_ex *bss);extern void rtw_update_scanned_network (struct adapter *adapter,struct wlan_bssid_ex *target);extern void rtw_disconnect_hdl_under_linked (struct adapter *adapter,struct sta_info *psta,u8 free_assoc);
Signature · 1 line
2.39.1