Skip to contentSkip to conversation

wifi: ath11k: fix SAC bug on peer addition with sta band migration

PATCH In review Christian Marangi 2 participants 5 messages Feb 9, 2023 – Feb 22, 2023

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 wifi: ath11k: fix SAC bug on peer addition with sta band migration

Fix sleep in atomic context warning detected by Smatch static checker analyzer.

Following the locking pattern for peer_rhash_add lock tbl_mtx_lock mutex always even if sta is not transitioning to another band. This is peer_add function and a more secure locking should not cause performance regression.

Fixes d673cb6fe6c0 ("wifi: ath11k: fix peer addition/deletion error on sta band migration")
---
 drivers/net/wireless/ath/ath11k/peer.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath11k/peer.c +3 -2
index 1ae7af02c364..1380811827a8 100644
@@ -382,22 +382,23 @@ int ath11k_peer_create(struct ath11k *ar, struct ath11k_vif *arvif,
 		return -ENOBUFS;
 	}
 
+	mutex_lock(&ar->ab->tbl_mtx_lock);
 	spin_lock_bh(&ar->ab->base_lock);
 	peer = ath11k_peer_find_by_addr(ar->ab, param->peer_addr);
 	if (peer) {
 		if (peer->vdev_id == param->vdev_id) {
 			spin_unlock_bh(&ar->ab->base_lock);
+			mutex_unlock(&ar->ab->tbl_mtx_lock);
 			return -EINVAL;
 		}
 
 		/* Assume sta is transitioning to another band.
 		 * Remove here the peer from rhash.
 		 */
-		mutex_lock(&ar->ab->tbl_mtx_lock);
 		ath11k_peer_rhash_delete(ar->ab, peer);
-		mutex_unlock(&ar->ab->tbl_mtx_lock);
 	}
 	spin_unlock_bh(&ar->ab->base_lock);
+	mutex_unlock(&ar->ab->tbl_mtx_lock);
 
 	ret = ath11k_wmi_send_peer_create_cmd(ar, param);
 	if (ret) {
Signature · 1 line
2.38.1
#1 lore raw
Quoted 8 lines · Christian Marangi

Fix sleep in atomic context warning detected by Smatch static checker analyzer.

Following the locking pattern for peer_rhash_add lock tbl_mtx_lock mutex always even if sta is not transitioning to another band. This is peer_add function and a more secure locking should not cause performance regression.

Quoted 4 lines
Fixes d673cb6fe6c0 ("wifi: ath11k: fix peer addition/deletion error on sta band migration")

I assume you only compile tested this and I'll add that to the commit log. It's always good to know how the patch was tested.

Signature · 9 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches


-- 
ath11k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath11k
#2 lore raw
Quoted 10 lines · Kalle Valo
Quoted 8 lines · Christian Marangi

Fix sleep in atomic context warning detected by Smatch static checker analyzer.

Following the locking pattern for peer_rhash_add lock tbl_mtx_lock mutex always even if sta is not transitioning to another band. This is peer_add function and a more secure locking should not cause performance regression.

Quoted 8 lines
Quoted 4 lines
Fixes d673cb6fe6c0 ("wifi: ath11k: fix peer addition/deletion error on sta band migration")

I assume you only compile tested this and I'll add that to the commit log. It's always good to know how the patch was tested.

Hi, I just got time to test this and works correctly on my Xiaomi AX3600.

Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.5.0.1-01208-QCAHKSWPL_SILICONZ-1

Signature · 6 lines
	Ansuel

-- 
ath11k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath11k
#3 lore raw
Quoted 17 lines · Christian Marangi
Quoted 16 lines · Kalle Valo
Quoted 13 lines · Christian Marangi

Fix sleep in atomic context warning detected by Smatch static checker analyzer.

Following the locking pattern for peer_rhash_add lock tbl_mtx_lock mutex always even if sta is not transitioning to another band. This is peer_add function and a more secure locking should not cause performance regression.

Fixes d673cb6fe6c0 ("wifi: ath11k: fix peer addition/deletion

error on sta band migration")

Quoted 8 lines
Quoted 3 lines

I assume you only compile tested this and I'll add that to the commit log. It's always good to know how the patch was tested.

Hi, I just got time to test this and works correctly on my Xiaomi AX3600.

Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.5.0.1-01208-QCAHKSWPL_SILICONZ-1

Thanks, I'll add this to the commit log.

Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
#4 lore raw
In reply to Christian Marangi
Quoted 8 lines · Christian Marangi

Fix sleep in atomic context warning detected by Smatch static checker analyzer.

Following the locking pattern for peer_rhash_add lock tbl_mtx_lock mutex always even if sta is not transitioning to another band. This is peer_add function and a more secure locking should not cause performance regression.

Quoted 6 lines

Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.5.0.1-01208-QCAHKSWPL_SILICONZ-1

Fixes d673cb6fe6c0 ("wifi: ath11k: fix peer addition/deletion error on sta band migration")

Patch applied to ath-next branch of ath.git, thanks.

60b7d62ba8cd wifi: ath11k: fix SAC bug on peer addition with sta band migration

Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches