Commit 8d61ffa5 authored by Johannes Berg's avatar Johannes Berg
Browse files

cfg80211/mac80211: use cfg80211 wdev mutex in mac80211 



Using separate locks in cfg80211 and mac80211 has always
caused issues, for example having to unlock in places in
mac80211 to call cfg80211, which even needed a framework
to make cfg80211 calls after some functions returned etc.

Additionally, I suspect some issues people have reported
with the cfg80211 state getting confused could be due to
such issues, when cfg80211 is asking mac80211 to change
state but mac80211 is in the process of telling cfg80211
that the state changed (in another way.)

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 5fe231e8

Documentation/DocBook/80211.tmpl

+0 −2
Original line number Diff line number Diff line
@@ -132,9 +132,7 @@ 
!Finclude/net/cfg80211.h cfg80211_send_rx_assoc

!Finclude/net/cfg80211.h cfg80211_send_assoc_timeout

!Finclude/net/cfg80211.h cfg80211_send_deauth

!Finclude/net/cfg80211.h __cfg80211_send_deauth

!Finclude/net/cfg80211.h cfg80211_send_disassoc

!Finclude/net/cfg80211.h __cfg80211_send_disassoc

!Finclude/net/cfg80211.h cfg80211_ibss_joined

!Finclude/net/cfg80211.h cfg80211_connect_result

!Finclude/net/cfg80211.h cfg80211_roamed

include/net/cfg80211.h

+23 −28
Original line number Diff line number Diff line
@@ -1867,7 +1867,9 @@ struct cfg80211_update_ft_ies_params { 
 * @get_mpath: get a mesh path for the given parameters

 * @dump_mpath: dump mesh path callback -- resume dump at index @idx

 * @join_mesh: join the mesh network with the specified parameters

 *	(invoked with the wireless_dev mutex held)

 * @leave_mesh: leave the current mesh network

 *	(invoked with the wireless_dev mutex held)

 *

 * @get_mesh_config: Get the current mesh configuration

 *
@@ -1894,20 +1896,28 @@ struct cfg80211_update_ft_ies_params { 
 *	the scan/scan_done bracket too.

 *

 * @auth: Request to authenticate with the specified peer

 *	(invoked with the wireless_dev mutex held)

 * @assoc: Request to (re)associate with the specified peer

 *	(invoked with the wireless_dev mutex held)

 * @deauth: Request to deauthenticate from the specified peer

 *	(invoked with the wireless_dev mutex held)

 * @disassoc: Request to disassociate from the specified peer

 *	(invoked with the wireless_dev mutex held)

 *

 * @connect: Connect to the ESS with the specified parameters. When connected,

 *	call cfg80211_connect_result() with status code %WLAN_STATUS_SUCCESS.

 *	If the connection fails for some reason, call cfg80211_connect_result()

 *	with the status from the AP.

 *	(invoked with the wireless_dev mutex held)

 * @disconnect: Disconnect from the BSS/ESS.

 *	(invoked with the wireless_dev mutex held)

 *

 * @join_ibss: Join the specified IBSS (or create if necessary). Once done, call

 *	cfg80211_ibss_joined(), also call that function when changing BSSID due

 *	to a merge.

 *	(invoked with the wireless_dev mutex held)

 * @leave_ibss: Leave the IBSS.

 *	(invoked with the wireless_dev mutex held)

 *

 * @set_mcast_rate: Set the specified multicast rate (only if vif is in ADHOC or

 *	MESH mode)
@@ -2851,7 +2861,8 @@ struct cfg80211_cached_keys; 
 *	by cfg80211 on change_interface

 * @mgmt_registrations: list of registrations for management frames

 * @mgmt_registrations_lock: lock for the list

 * @mtx: mutex used to lock data in this struct

 * @mtx: mutex used to lock data in this struct, may be used by drivers

 *	and some API functions require it held

 * @cleanup_work: work struct used for cleanup that can't be done directly

 * @beacon_interval: beacon interval used on this device for transmitting

 *	beacons, 0 when not valid
@@ -3424,7 +3435,8 @@ void cfg80211_unlink_bss(struct wiphy *wiphy, struct cfg80211_bss *bss); 
 * This function is called whenever an authentication has been processed in

 * station mode. The driver is required to call either this function or

 * cfg80211_send_auth_timeout() to indicate the result of cfg80211_ops::auth()

 * call. This function may sleep.

 * call. This function may sleep. The caller must hold the corresponding wdev's

 * mutex.

 */

void cfg80211_send_rx_auth(struct net_device *dev, const u8 *buf, size_t len);
@@ -3433,7 +3445,8 @@ void cfg80211_send_rx_auth(struct net_device *dev, const u8 *buf, size_t len); 
 * @dev: network device

 * @addr: The MAC address of the device with which the authentication timed out

 *

 * This function may sleep.

 * This function may sleep. The caller must hold the corresponding wdev's

 * mutex.

 */

void cfg80211_send_auth_timeout(struct net_device *dev, const u8 *addr);
@@ -3448,7 +3461,8 @@ void cfg80211_send_auth_timeout(struct net_device *dev, const u8 *addr); 
 * This function is called whenever a (re)association response has been

 * processed in station mode. The driver is required to call either this

 * function or cfg80211_send_assoc_timeout() to indicate the result of

 * cfg80211_ops::assoc() call. This function may sleep.

 * cfg80211_ops::assoc() call. This function may sleep. The caller must hold

 * the corresponding wdev's mutex.

 */

void cfg80211_send_rx_assoc(struct net_device *dev, struct cfg80211_bss *bss,

			    const u8 *buf, size_t len);
@@ -3458,7 +3472,7 @@ void cfg80211_send_rx_assoc(struct net_device *dev, struct cfg80211_bss *bss, 
 * @dev: network device

 * @addr: The MAC address of the device with which the association timed out

 *

 * This function may sleep.

 * This function may sleep. The caller must hold the corresponding wdev's mutex.

 */

void cfg80211_send_assoc_timeout(struct net_device *dev, const u8 *addr);
@@ -3470,20 +3484,11 @@ void cfg80211_send_assoc_timeout(struct net_device *dev, const u8 *addr); 
 *

 * This function is called whenever deauthentication has been processed in

 * station mode. This includes both received deauthentication frames and

 * locally generated ones. This function may sleep.

 * locally generated ones. This function may sleep. The caller must hold the

 * corresponding wdev's mutex.

 */

void cfg80211_send_deauth(struct net_device *dev, const u8 *buf, size_t len);



/**

 * __cfg80211_send_deauth - notification of processed deauthentication

 * @dev: network device

 * @buf: deauthentication frame (header + body)

 * @len: length of the frame data

 *

 * Like cfg80211_send_deauth(), but doesn't take the wdev lock.

 */

void __cfg80211_send_deauth(struct net_device *dev, const u8 *buf, size_t len);



/**

 * cfg80211_send_disassoc - notification of processed disassociation

 * @dev: network device
@@ -3492,21 +3497,11 @@ void __cfg80211_send_deauth(struct net_device *dev, const u8 *buf, size_t len); 
 *

 * This function is called whenever disassociation has been processed in

 * station mode. This includes both received disassociation frames and locally

 * generated ones. This function may sleep.

 * generated ones. This function may sleep. The caller must hold the

 * corresponding wdev's mutex.

 */

void cfg80211_send_disassoc(struct net_device *dev, const u8 *buf, size_t len);



/**

 * __cfg80211_send_disassoc - notification of processed disassociation

 * @dev: network device

 * @buf: disassociation response frame (header + body)

 * @len: length of the frame data

 *

 * Like cfg80211_send_disassoc(), but doesn't take the wdev lock.

 */

void __cfg80211_send_disassoc(struct net_device *dev, const u8 *buf,

	size_t len);



/**

 * cfg80211_send_unprot_deauth - notification of unprotected deauthentication

 * @dev: network device

net/mac80211/cfg.c

+1 −3
Original line number Diff line number Diff line
@@ -2318,7 +2318,7 @@ int __ieee80211_request_smps(struct ieee80211_sub_if_data *sdata, 
	enum ieee80211_smps_mode old_req;

	int err;



	lockdep_assert_held(&sdata->u.mgd.mtx);

	lockdep_assert_held(&sdata->wdev.mtx);



	old_req = sdata->u.mgd.req_smps;

	sdata->u.mgd.req_smps = smps_mode;
@@ -2375,9 +2375,7 @@ static int ieee80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *dev, 
	local->dynamic_ps_forced_timeout = timeout;



	/* no change, but if automatic follow powersave */

	mutex_lock(&sdata->u.mgd.mtx);

	__ieee80211_request_smps(sdata, sdata->u.mgd.req_smps);

	mutex_unlock(&sdata->u.mgd.mtx);



	if (local->hw.flags & IEEE80211_HW_SUPPORTS_DYNAMIC_PS)

		ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_PS);

net/mac80211/debugfs_netdev.c

+5 −5
Original line number Diff line number Diff line
@@ -228,9 +228,9 @@ static int ieee80211_set_smps(struct ieee80211_sub_if_data *sdata, 
	if (sdata->vif.type != NL80211_IFTYPE_STATION)

		return -EOPNOTSUPP;



	mutex_lock(&sdata->u.mgd.mtx);

	sdata_lock(sdata);

	err = __ieee80211_request_smps(sdata, smps_mode);

	mutex_unlock(&sdata->u.mgd.mtx);

	sdata_unlock(sdata);



	return err;

}
@@ -313,16 +313,16 @@ static ssize_t ieee80211_if_parse_tkip_mic_test( 
	case NL80211_IFTYPE_STATION:

		fc |= cpu_to_le16(IEEE80211_FCTL_TODS);

		/* BSSID SA DA */

		mutex_lock(&sdata->u.mgd.mtx);

		sdata_lock(sdata);

		if (!sdata->u.mgd.associated) {

			mutex_unlock(&sdata->u.mgd.mtx);

			sdata_unlock(sdata);

			dev_kfree_skb(skb);

			return -ENOTCONN;

		}

		memcpy(hdr->addr1, sdata->u.mgd.associated->bssid, ETH_ALEN);

		memcpy(hdr->addr2, sdata->vif.addr, ETH_ALEN);

		memcpy(hdr->addr3, addr, ETH_ALEN);

		mutex_unlock(&sdata->u.mgd.mtx);

		sdata_unlock(sdata);

		break;

	default:

		dev_kfree_skb(skb);

net/mac80211/ht.c

+2 −2
Original line number Diff line number Diff line
@@ -429,9 +429,9 @@ void ieee80211_request_smps_work(struct work_struct *work) 
		container_of(work, struct ieee80211_sub_if_data,

			     u.mgd.request_smps_work);



	mutex_lock(&sdata->u.mgd.mtx);

	sdata_lock(sdata);

	__ieee80211_request_smps(sdata, sdata->u.mgd.driver_smps_mode);

	mutex_unlock(&sdata->u.mgd.mtx);

	sdata_unlock(sdata);

}



void ieee80211_request_smps(struct ieee80211_vif *vif,

CRA Git | Maintained and supported by SUSTech CRA and CCSE