Skip to contentSkip to conversation

staging: rtl8723bs: Use guards for mutexes

PATCH In review Omer PALA 2 participants 2 messages Sep 19 – Sep 20 Staging

lore
Share & tools
lore

Omer PALA

author
#0 lore raw

PATCH 1/1 staging: rtl8723bs: Use guards for mutexes

Simplify lock management across the rtl8723bs driver by replacing manual spinlock and mutex acquire/release calls with scope-based cleanup guards (guard() and scoped_guard()).

This reduces boilerplate code, removes redundant error-path unlock logic, and prevents potential lock leaks on early return statements.

---
 drivers/staging/rtl8723bs/core/rtw_ap.c       |  18 +--
 drivers/staging/rtl8723bs/core/rtw_cmd.c      |  23 ++-
 .../staging/rtl8723bs/core/rtw_ioctl_set.c    | 127 ++++++----------
 drivers/staging/rtl8723bs/core/rtw_mlme.c     |   3 +-
 drivers/staging/rtl8723bs/core/rtw_mlme_ext.c |   3 +-
 drivers/staging/rtl8723bs/core/rtw_pwrctrl.c  | 143 +++++++-----------
 .../staging/rtl8723bs/core/rtw_wlan_util.c    |  30 ++--
 7 files changed, 139 insertions(+), 208 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ap.c +9 -9
index 4728f62a1..0ca2fecdc 100644
@@ -1912,20 +1912,20 @@ void stop_ap_mode(struct adapter *padapter)
 	padapter->securitypriv.ndisencryptstatus = Ndis802_11WEPDisabled;
 
 	/* for ACL */
-	spin_lock_bh(&pacl_node_q->lock);
-	phead = get_list_head(pacl_node_q);
-	list_for_each_safe(plist, tmp, phead) {
-		paclnode = list_entry(plist, struct rtw_wlan_acl_node, list);
+	scoped_guard(spinlock_bh, &pacl_node_q->lock) {
+		phead = get_list_head(pacl_node_q);
+		list_for_each_safe(plist, tmp, phead) {
+			paclnode = list_entry(plist, struct rtw_wlan_acl_node, list);
 
-		if (paclnode->valid) {
-			paclnode->valid = false;
+			if (paclnode->valid) {
+				paclnode->valid = false;
 
-			list_del_init(&paclnode->list);
+				list_del_init(&paclnode->list);
 
-			pacl_list->num--;
+				pacl_list->num--;
+			}
 		}
 	}
-	spin_unlock_bh(&pacl_node_q->lock);
 
 	rtw_sta_flush(padapter);
 
drivers/staging/rtl8723bs/core/rtw_cmd.c +9 -14
index ce3dfa1fe..1894e447a 100644
@@ -460,8 +460,7 @@ int rtw_cmd_thread(void *context)
 		cmd_hdl = NULL;
 
 post_process:
-
-		if (mutex_lock_interruptible(&pcmd->padapter->cmdpriv.sctx_mutex) == 0) {
+		scoped_cond_guard(mutex_intr, (void)0, &pcmd->padapter->cmdpriv.sctx_mutex) {
 			if (pcmd->sctx) {
 				netdev_dbg(padapter->pnetdev,
 					   FUNC_ADPT_FMT " pcmd->sctx\n",
@@ -472,7 +471,6 @@ int rtw_cmd_thread(void *context)
 				else
 					rtw_sctx_done_err(&pcmd->sctx, RTW_SCTX_DONE_CMD_ERROR);
 			}
-			mutex_unlock(&pcmd->padapter->cmdpriv.sctx_mutex);
 		}
 
 		/* call callback function for post-processed */
@@ -655,10 +653,9 @@ int rtw_startbss_cmd(struct adapter  *padapter, int flags)
 
 		if (res == _SUCCESS && (flags & RTW_CMDF_WAIT_ACK)) {
 			rtw_sctx_wait(&sctx);
-			if (mutex_lock_interruptible(&pcmdpriv->sctx_mutex) == 0) {
+			scoped_cond_guard(mutex_intr, (void)0, &pcmdpriv->sctx_mutex) {
 				if (sctx.status == RTW_SCTX_SUBMITTED)
 					pcmd->sctx = NULL;
-				mutex_unlock(&pcmdpriv->sctx_mutex);
 			}
 		}
 	}
@@ -1406,7 +1403,7 @@ static void rtw_lps_change_dtim_hdl(struct adapter *padapter, u8 dtim)
 	if (hal_btcoex_IsBtControlLps(padapter))
 		return;
 
-	mutex_lock(&pwrpriv->lock);
+	guard(mutex)(&pwrpriv->lock);
 
 	pwrpriv->dtim = dtim;
 
@@ -1415,8 +1412,6 @@ static void rtw_lps_change_dtim_hdl(struct adapter *padapter, u8 dtim)
 
 		rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_PWRMODE, (u8 *)(&ps_mode));
 	}
-
-	mutex_unlock(&pwrpriv->lock);
 }
 
 static void rtw_dm_ra_mask_hdl(struct adapter *padapter, struct sta_info *psta)
@@ -1923,13 +1918,13 @@ void rtw_setassocsta_cmdrsp_callback(struct adapter *padapter,  struct cmd_obj *
 	psta->aid = passocsta_rsp->cam_id;
 	psta->mac_id = passocsta_rsp->cam_id;
 
-	spin_lock_bh(&pmlmepriv->lock);
-
-	if (check_fwstate(pmlmepriv, WIFI_MP_STATE) && check_fwstate(pmlmepriv, _FW_UNDER_LINKING))
-		_clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);
+	scoped_guard(spinlock_bh, &pmlmepriv->lock) {
+		if (check_fwstate(pmlmepriv, WIFI_MP_STATE) &&
+		    check_fwstate(pmlmepriv, _FW_UNDER_LINKING))
+			_clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);
 
-	set_fwstate(pmlmepriv, _FW_LINKED);
-	spin_unlock_bh(&pmlmepriv->lock);
+		set_fwstate(pmlmepriv, _FW_LINKED);
+	}
 
 exit:
 	rtw_free_cmd_obj(pcmd);
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +49 -78

223 lines not on this page · raw message

drivers/staging/rtl8723bs/core/rtw_mlme.c +1 -2
index d18768a51..52b155a35 100644
@@ -1086,7 +1086,7 @@ void rtw_reset_securitypriv(struct adapter *adapter)
 	u32 backupTKIPcountermeasure_time = 0;
 	struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv;
 
-	spin_lock_bh(&adapter->security_key_mutex);
+	guard(spinlock_bh)(&adapter->security_key_mutex);
 
 	if (adapter->securitypriv.dot11_auth_algrthm == dot11_auth_algrthm_8021x) {
 		/* 802.1x */
@@ -1133,7 +1133,6 @@ void rtw_reset_securitypriv(struct adapter *adapter)
 		psec_priv->ndisencryptstatus = Ndis802_11WEPDisabled;
 		/*  */
 	}
-	spin_unlock_bh(&adapter->security_key_mutex);
 }
 
 /* Notes: the function could be > passive_level (the same context as Rx tasklet) */
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +1 -2
index e965133d9..7e499b17d 100644
@@ -2015,7 +2015,7 @@ s32 dump_mgntframe_and_wait_ack(struct adapter *padapter, struct xmit_frame *pmg
 		return -1;
 	}
 
-	if (mutex_lock_interruptible(&pxmitpriv->ack_tx_mutex) == 0) {
+	scoped_cond_guard(mutex_intr, (void)0, &pxmitpriv->ack_tx_mutex) {
 		pxmitpriv->ack_tx = true;
 		pxmitpriv->seq_no = seq_no++;
 		pmgntframe->ack_report = 1;
@@ -2023,7 +2023,6 @@ s32 dump_mgntframe_and_wait_ack(struct adapter *padapter, struct xmit_frame *pmg
 			ret = rtw_ack_tx_wait(pxmitpriv, timeout_ms);
 
 		pxmitpriv->ack_tx = false;
-		mutex_unlock(&pxmitpriv->ack_tx_mutex);
 	}
 
 	return ret;
drivers/staging/rtl8723bs/core/rtw_pwrctrl.c +58 -85

298 lines not on this page · raw message

drivers/staging/rtl8723bs/core/rtw_wlan_util.c +12 -18
index 8c1f46706..e14d4ffde 100644
@@ -296,15 +296,12 @@ inline unsigned long rtw_get_on_cur_ch_time(struct adapter *adapter)
 
 void r8723bs_select_channel(struct adapter *padapter, unsigned char channel)
 {
-	if (mutex_lock_interruptible(&(adapter_to_dvobj(padapter)->setch_mutex)))
-		return;
-
-	/* saved channel info */
-	rtw_set_oper_ch(padapter, channel);
+	scoped_cond_guard(mutex_intr, return, &(adapter_to_dvobj(padapter)->setch_mutex)) {
+		/* saved channel info */
+		rtw_set_oper_ch(padapter, channel);
 
-	rtw_hal_set_chan(padapter, channel);
-
-	mutex_unlock(&(adapter_to_dvobj(padapter)->setch_mutex));
+		rtw_hal_set_chan(padapter, channel);
+	}
 }
 
 void set_channel_bwmode(struct adapter *padapter, unsigned char channel, unsigned char channel_offset, unsigned short bwmode)
@@ -314,17 +311,14 @@ void set_channel_bwmode(struct adapter *padapter, unsigned char channel, unsigne
 	center_ch = rtw_get_center_ch(channel, bwmode, channel_offset);
 
 	/* set Channel */
-	if (mutex_lock_interruptible(&(adapter_to_dvobj(padapter)->setch_mutex)))
-		return;
-
-	/* saved channel/bw info */
-	rtw_set_oper_ch(padapter, channel);
-	rtw_set_oper_bw(padapter, bwmode);
-	rtw_set_oper_choffset(padapter, channel_offset);
+	scoped_cond_guard(mutex_intr, return, &(adapter_to_dvobj(padapter)->setch_mutex)) {
+		/* saved channel/bw info */
+		rtw_set_oper_ch(padapter, channel);
+		rtw_set_oper_bw(padapter, bwmode);
+		rtw_set_oper_choffset(padapter, channel_offset);
 
-	rtw_hal_set_chnl_bw(padapter, center_ch, bwmode, channel_offset, chnl_offset80); /*  set center channel */
-
-	mutex_unlock(&(adapter_to_dvobj(padapter)->setch_mutex));
+		rtw_hal_set_chnl_bw(padapter, center_ch, bwmode, channel_offset, chnl_offset80); /*  set center channel */
+	}
 }
 
 inline u8 *get_my_bssid(struct wlan_bssid_ex *pnetwork)
Signature · 1 line
2.55.0
#1 lore raw
Quoted 8 lines · Omer PALA

Simplify lock management across the rtl8723bs driver by replacing manual spinlock and mutex acquire/release calls with scope-based cleanup guards (guard() and scoped_guard()).

This reduces boilerplate code, removes redundant error-path unlock logic, and prevents potential lock leaks on early return statements.

Please read the email archives for why we don't take patches like this.

thanks,

greg k-h