Skip to content

Commit d1cfdca

Browse files
fabioaiutogregkh
fabioaiuto
authored and
gregkh
committed
staging: rtl8723bs: unwrap initialization of queues
unwrap initialization of queues to avoid false positive lockdep warning: [ 27.350258] ============================================ [ 27.350267] WARNING: possible recursive locking detected [ 27.350276] 5.14.0-rc6+ #16 Tainted: G C OE [ 27.350288] -------------------------------------------- [ 27.350295] RTW_CMD_THREAD/679 is trying to acquire lock: [ 27.350306] ffffa846c03290c8 (&(pqueue->lock)){+.-.}-{2:2}, at: rtw_alloc_network+0x1b/0xa0 [r8723bs] [ 27.350441] but task is already holding lock: [ 27.350448] ffffa846c0329118 (&(pqueue->lock)){+.-.}-{2:2}, at: rtw_update_scanned_network+0x33/0x1d0 [r8723bs] [ 27.350573] other info that might help us debug this: [ 27.350581] Possible unsafe locking scenario: [ 27.350588] CPU0 [ 27.350594] ---- [ 27.350600] lock(&(pqueue->lock)); [ 27.350614] lock(&(pqueue->lock)); [ 27.350627] *** DEADLOCK *** [ 27.350634] May be due to missing lock nesting notation [ 27.350641] 2 locks held by RTW_CMD_THREAD/679: [ 27.350652] #0: ffffa846c0329038 (&pmlmepriv->lock){+...}-{2:2}, at: rtw_survey_event_callback+0x2d/0xe0 [r8723bs] [ 27.350780] #1: ffffa846c0329118 (&(pqueue->lock)){+.-.}-{2:2}, at: rtw_update_scanned_network+0x33/0x1d0 [r8723bs] [ 27.350907] stack backtrace: [ 27.350916] CPU: 3 PID: 679 Comm: RTW_CMD_THREAD Tainted: G C OE 5.14.0-rc6+ #16 [ 27.350933] Hardware name: LENOVO 80NR/Madrid, BIOS DACN25WW 08/20/2015 [ 27.350943] Call Trace: [ 27.350959] dump_stack_lvl+0x56/0x6f [ 27.350982] __lock_acquire.cold.79+0x137/0x298 [ 27.351012] lock_acquire+0xb4/0x2c0 [ 27.351031] ? rtw_alloc_network+0x1b/0xa0 [r8723bs] [ 27.351140] ? rtw_update_scanned_network+0x33/0x1d0 [r8723bs] [ 27.351254] _raw_spin_lock_bh+0x34/0x40 [ 27.351271] ? rtw_alloc_network+0x1b/0xa0 [r8723bs] [ 27.351378] rtw_alloc_network+0x1b/0xa0 [r8723bs] [ 27.351488] rtw_update_scanned_network+0xa5/0x1d0 [r8723bs] [ 27.351605] rtw_survey_event_callback+0x54/0xe0 [r8723bs] [ 27.351719] mlme_evt_hdl+0x4e/0x70 [r8723bs] [ 27.351839] rtw_cmd_thread+0x16c/0x3d0 [r8723bs] [ 27.351945] ? rtw_stop_cmd_thread+0x50/0x50 [r8723bs] [ 27.352045] kthread+0x136/0x160 [ 27.352064] ? set_kthread_struct+0x40/0x40 [ 27.352083] ret_from_fork+0x22/0x30 This happens because the wrapping function _rtw_init_queues() bring lockdep considering all queues as a single one. But all queues are different with their own lock. Applied the following semantic patch: @@ expression a; @@ - _rtw_init_queue(&a); + INIT_LIST_HEAD(&a.queue); + spin_lock_init(&a.lock); Reported-by: Hans De Goede <[email protected]> Reviewed-by: Hans de Goede <[email protected]> Signed-off-by: Fabio Aiuto <[email protected]> Link: https://lore.kernel.org/r/c2c3a18cc2b883feab74f150ccbaa4f2cc11995c.1630307025.git.fabioaiuto83@gmail.com Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 8ffd91d commit d1cfdca

File tree

7 files changed

+52
-26
lines changed

7 files changed

+52
-26
lines changed

‎drivers/staging/rtl8723bs/core/rtw_ap.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ void init_mlme_ap_info(struct adapter *padapter)
1818
spin_lock_init(&pmlmepriv->bcn_update_lock);
1919

2020
/* for ACL */
21-
_rtw_init_queue(&pacl_list->acl_node_q);
21+
INIT_LIST_HEAD(&pacl_list->acl_node_q.queue);
22+
spin_lock_init(&pacl_list->acl_node_q.lock);
2223

2324
/* pmlmeext->bstart_bss = false; */
2425

‎drivers/staging/rtl8723bs/core/rtw_cmd.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,8 @@ int rtw_init_cmd_priv(struct cmd_priv *pcmdpriv)
166166
init_completion(&pcmdpriv->cmd_queue_comp);
167167
init_completion(&pcmdpriv->terminate_cmdthread_comp);
168168

169-
_rtw_init_queue(&(pcmdpriv->cmd_queue));
169+
INIT_LIST_HEAD(&(pcmdpriv->cmd_queue).queue);
170+
spin_lock_init(&(pcmdpriv->cmd_queue).lock);
170171

171172
/* allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf */
172173

‎drivers/staging/rtl8723bs/core/rtw_mlme.c‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,10 @@ int rtw_init_mlme_priv(struct adapter *padapter)
2727
pmlmepriv->scan_mode = SCAN_ACTIVE;/* 1: active, 0: pasive. Maybe someday we should rename this varable to "active_mode" (Jeff) */
2828

2929
spin_lock_init(&pmlmepriv->lock);
30-
_rtw_init_queue(&pmlmepriv->free_bss_pool);
31-
_rtw_init_queue(&pmlmepriv->scanned_queue);
30+
INIT_LIST_HEAD(&pmlmepriv->free_bss_pool.queue);
31+
spin_lock_init(&pmlmepriv->free_bss_pool.lock);
32+
INIT_LIST_HEAD(&pmlmepriv->scanned_queue.queue);
33+
spin_lock_init(&pmlmepriv->scanned_queue.lock);
3234

3335
set_scanned_network_val(pmlmepriv, 0);
3436

‎drivers/staging/rtl8723bs/core/rtw_recv.c‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ void _rtw_init_sta_recv_priv(struct sta_recv_priv *psta_recvpriv)
2525
/* for (i = 0; i<MAX_RX_NUMBLKS; i++) */
2626
/* _rtw_init_queue(&psta_recvpriv->blk_strms[i]); */
2727

28-
_rtw_init_queue(&psta_recvpriv->defrag_q);
28+
INIT_LIST_HEAD(&psta_recvpriv->defrag_q.queue);
29+
spin_lock_init(&psta_recvpriv->defrag_q.lock);
2930
}
3031

3132
signed int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter)
@@ -36,9 +37,12 @@ signed int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *pada
3637

3738
spin_lock_init(&precvpriv->lock);
3839

39-
_rtw_init_queue(&precvpriv->free_recv_queue);
40-
_rtw_init_queue(&precvpriv->recv_pending_queue);
41-
_rtw_init_queue(&precvpriv->uc_swdec_pending_queue);
40+
INIT_LIST_HEAD(&precvpriv->free_recv_queue.queue);
41+
spin_lock_init(&precvpriv->free_recv_queue.lock);
42+
INIT_LIST_HEAD(&precvpriv->recv_pending_queue.queue);
43+
spin_lock_init(&precvpriv->recv_pending_queue.lock);
44+
INIT_LIST_HEAD(&precvpriv->uc_swdec_pending_queue.queue);
45+
spin_lock_init(&precvpriv->uc_swdec_pending_queue.lock);
4246

4347
precvpriv->adapter = padapter;
4448

‎drivers/staging/rtl8723bs/core/rtw_sta_mgt.c‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ void _rtw_init_stainfo(struct sta_info *psta)
1919
/* INIT_LIST_HEAD(&psta->sleep_list); */
2020
/* INIT_LIST_HEAD(&psta->wakeup_list); */
2121

22-
_rtw_init_queue(&psta->sleep_q);
22+
INIT_LIST_HEAD(&psta->sleep_q.queue);
23+
spin_lock_init(&psta->sleep_q.lock);
2324
psta->sleepq_len = 0;
2425

2526
_rtw_init_sta_xmit_priv(&psta->sta_xmitpriv);
@@ -62,14 +63,17 @@ u32 _rtw_init_sta_priv(struct sta_priv *pstapriv)
6263
pstapriv->pstainfo_buf = pstapriv->pallocated_stainfo_buf + 4 -
6364
((SIZE_PTR)(pstapriv->pallocated_stainfo_buf) & 3);
6465

65-
_rtw_init_queue(&pstapriv->free_sta_queue);
66+
INIT_LIST_HEAD(&pstapriv->free_sta_queue.queue);
67+
spin_lock_init(&pstapriv->free_sta_queue.lock);
6668

6769
spin_lock_init(&pstapriv->sta_hash_lock);
6870

6971
/* _rtw_init_queue(&pstapriv->asoc_q); */
7072
pstapriv->asoc_sta_count = 0;
71-
_rtw_init_queue(&pstapriv->sleep_q);
72-
_rtw_init_queue(&pstapriv->wakeup_q);
73+
INIT_LIST_HEAD(&pstapriv->sleep_q.queue);
74+
spin_lock_init(&pstapriv->sleep_q.lock);
75+
INIT_LIST_HEAD(&pstapriv->wakeup_q.queue);
76+
spin_lock_init(&pstapriv->wakeup_q.lock);
7377

7478
psta = (struct sta_info *)(pstapriv->pstainfo_buf);
7579

@@ -242,7 +246,8 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)
242246
/* preorder_ctrl->wsize_b = (NR_RECVBUFF-2); */
243247
preorder_ctrl->wsize_b = 64;/* 64; */
244248

245-
_rtw_init_queue(&preorder_ctrl->pending_recvframe_queue);
249+
INIT_LIST_HEAD(&preorder_ctrl->pending_recvframe_queue.queue);
250+
spin_lock_init(&preorder_ctrl->pending_recvframe_queue.lock);
246251

247252
rtw_init_recv_timer(preorder_ctrl);
248253
}

‎drivers/staging/rtl8723bs/core/rtw_xmit.c‎

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ static u8 RFC1042_OUI[P80211_OUI_LEN] = { 0x00, 0x00, 0x00 };
1313
static void _init_txservq(struct tx_servq *ptxservq)
1414
{
1515
INIT_LIST_HEAD(&ptxservq->tx_pending);
16-
_rtw_init_queue(&ptxservq->sta_pending);
16+
INIT_LIST_HEAD(&ptxservq->sta_pending.queue);
17+
spin_lock_init(&ptxservq->sta_pending.lock);
1718
ptxservq->qcnt = 0;
1819
}
1920

@@ -49,13 +50,19 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
4950

5051
pxmitpriv->adapter = padapter;
5152

52-
_rtw_init_queue(&pxmitpriv->be_pending);
53-
_rtw_init_queue(&pxmitpriv->bk_pending);
54-
_rtw_init_queue(&pxmitpriv->vi_pending);
55-
_rtw_init_queue(&pxmitpriv->vo_pending);
56-
_rtw_init_queue(&pxmitpriv->bm_pending);
53+
INIT_LIST_HEAD(&pxmitpriv->be_pending.queue);
54+
spin_lock_init(&pxmitpriv->be_pending.lock);
55+
INIT_LIST_HEAD(&pxmitpriv->bk_pending.queue);
56+
spin_lock_init(&pxmitpriv->bk_pending.lock);
57+
INIT_LIST_HEAD(&pxmitpriv->vi_pending.queue);
58+
spin_lock_init(&pxmitpriv->vi_pending.lock);
59+
INIT_LIST_HEAD(&pxmitpriv->vo_pending.queue);
60+
spin_lock_init(&pxmitpriv->vo_pending.lock);
61+
INIT_LIST_HEAD(&pxmitpriv->bm_pending.queue);
62+
spin_lock_init(&pxmitpriv->bm_pending.lock);
5763

58-
_rtw_init_queue(&pxmitpriv->free_xmit_queue);
64+
INIT_LIST_HEAD(&pxmitpriv->free_xmit_queue.queue);
65+
spin_lock_init(&pxmitpriv->free_xmit_queue.lock);
5966

6067
/*
6168
* Please allocate memory with the sz = (struct xmit_frame) * NR_XMITFRAME,
@@ -96,8 +103,10 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
96103
pxmitpriv->frag_len = MAX_FRAG_THRESHOLD;
97104

98105
/* init xmit_buf */
99-
_rtw_init_queue(&pxmitpriv->free_xmitbuf_queue);
100-
_rtw_init_queue(&pxmitpriv->pending_xmitbuf_queue);
106+
INIT_LIST_HEAD(&pxmitpriv->free_xmitbuf_queue.queue);
107+
spin_lock_init(&pxmitpriv->free_xmitbuf_queue.lock);
108+
INIT_LIST_HEAD(&pxmitpriv->pending_xmitbuf_queue.queue);
109+
spin_lock_init(&pxmitpriv->pending_xmitbuf_queue.lock);
101110

102111
pxmitpriv->pallocated_xmitbuf = vzalloc(NR_XMITBUFF * sizeof(struct xmit_buf) + 4);
103112

@@ -145,7 +154,8 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
145154
pxmitpriv->free_xmitbuf_cnt = NR_XMITBUFF;
146155

147156
/* init xframe_ext queue, the same count as extbuf */
148-
_rtw_init_queue(&pxmitpriv->free_xframe_ext_queue);
157+
INIT_LIST_HEAD(&pxmitpriv->free_xframe_ext_queue.queue);
158+
spin_lock_init(&pxmitpriv->free_xframe_ext_queue.lock);
149159

150160
pxmitpriv->xframe_ext_alloc_addr = vzalloc(NR_XMIT_EXTBUFF * sizeof(struct xmit_frame) + 4);
151161

@@ -178,7 +188,8 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
178188
pxmitpriv->free_xframe_ext_cnt = NR_XMIT_EXTBUFF;
179189

180190
/* Init xmit extension buff */
181-
_rtw_init_queue(&pxmitpriv->free_xmit_extbuf_queue);
191+
INIT_LIST_HEAD(&pxmitpriv->free_xmit_extbuf_queue.queue);
192+
spin_lock_init(&pxmitpriv->free_xmit_extbuf_queue.lock);
182193

183194
pxmitpriv->pallocated_xmit_extbuf = vzalloc(NR_XMIT_EXTBUFF * sizeof(struct xmit_buf) + 4);
184195

‎drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -378,8 +378,10 @@ s32 rtl8723bs_init_recv_priv(struct adapter *padapter)
378378
precvpriv = &padapter->recvpriv;
379379

380380
/* 3 1. init recv buffer */
381-
_rtw_init_queue(&precvpriv->free_recv_buf_queue);
382-
_rtw_init_queue(&precvpriv->recv_buf_pending_queue);
381+
INIT_LIST_HEAD(&precvpriv->free_recv_buf_queue.queue);
382+
spin_lock_init(&precvpriv->free_recv_buf_queue.lock);
383+
INIT_LIST_HEAD(&precvpriv->recv_buf_pending_queue.queue);
384+
spin_lock_init(&precvpriv->recv_buf_pending_queue.lock);
383385

384386
n = NR_RECVBUFF * sizeof(struct recv_buf) + 4;
385387
precvpriv->pallocated_recv_buf = rtw_zmalloc(n);

0 commit comments

Comments
 (0)