Commit 40b275b6 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: sparse RCU annotations 



This adds sparse RCU annotations to most of
mac80211, only the mesh code remains to be
done.

Due the the previous patches, the annotations
are pretty simple. The only thing that this
actually changes is removing the RCU usage of
key->sta in debugfs since this pointer isn't
actually an RCU-managed pointer (it only has
a single assignment done before the key even
goes live). As that is otherwise harmless, I
decided to make it part of this patch.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ec034b20

net/mac80211/agg-rx.c

+2 −1
Original line number Diff line number Diff line
@@ -63,7 +63,8 @@ void ___ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid, 


	lockdep_assert_held(&sta->ampdu_mlme.mtx);



	tid_rx = sta->ampdu_mlme.tid_rx[tid];

	tid_rx = rcu_dereference_protected(sta->ampdu_mlme.tid_rx[tid],

					lockdep_is_held(&sta->ampdu_mlme.mtx));



	if (!tid_rx)

		return;

net/mac80211/agg-tx.c

+21 −15
Original line number Diff line number Diff line
@@ -157,16 +157,19 @@ int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid, 
				    bool tx)

{

	struct ieee80211_local *local = sta->local;

	struct tid_ampdu_tx *tid_tx = sta->ampdu_mlme.tid_tx[tid];

	struct tid_ampdu_tx *tid_tx;

	int ret;



	lockdep_assert_held(&sta->ampdu_mlme.mtx);



	if (!tid_tx)

		return -ENOENT;



	spin_lock_bh(&sta->lock);



	tid_tx = rcu_dereference_protected_tid_tx(sta, tid);

	if (!tid_tx) {

		spin_unlock_bh(&sta->lock);

		return -ENOENT;

	}



	if (test_bit(HT_AGG_STATE_WANT_START, &tid_tx->state)) {

		/* not even started yet! */

		ieee80211_assign_tid_tx(sta, tid, NULL);
@@ -291,13 +294,13 @@ ieee80211_wake_queue_agg(struct ieee80211_local *local, int tid) 


void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid)

{

	struct tid_ampdu_tx *tid_tx = sta->ampdu_mlme.tid_tx[tid];

	struct tid_ampdu_tx *tid_tx;

	struct ieee80211_local *local = sta->local;

	struct ieee80211_sub_if_data *sdata = sta->sdata;

	u16 start_seq_num;

	int ret;



	lockdep_assert_held(&sta->ampdu_mlme.mtx);

	tid_tx = rcu_dereference_protected_tid_tx(sta, tid);



	/*

	 * While we're asking the driver about the aggregation,
@@ -404,7 +407,7 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid, 
		goto err_unlock_sta;

	}



	tid_tx = sta->ampdu_mlme.tid_tx[tid];

	tid_tx = rcu_dereference_protected_tid_tx(sta, tid);

	/* check if the TID is not in aggregation flow already */

	if (tid_tx || sta->ampdu_mlme.tid_start_tx[tid]) {

#ifdef CONFIG_MAC80211_HT_DEBUG
@@ -491,16 +494,19 @@ ieee80211_agg_splice_finish(struct ieee80211_local *local, u16 tid) 
static void ieee80211_agg_tx_operational(struct ieee80211_local *local,

					 struct sta_info *sta, u16 tid)

{

	struct tid_ampdu_tx *tid_tx;



	lockdep_assert_held(&sta->ampdu_mlme.mtx);



	tid_tx = rcu_dereference_protected_tid_tx(sta, tid);



#ifdef CONFIG_MAC80211_HT_DEBUG

	printk(KERN_DEBUG "Aggregation is on for tid %d\n", tid);

#endif



	drv_ampdu_action(local, sta->sdata,

			 IEEE80211_AMPDU_TX_OPERATIONAL,

			 &sta->sta, tid, NULL,

			 sta->ampdu_mlme.tid_tx[tid]->buf_size);

			 &sta->sta, tid, NULL, tid_tx->buf_size);



	/*

	 * synchronize with TX path, while splicing the TX path
@@ -508,13 +514,13 @@ static void ieee80211_agg_tx_operational(struct ieee80211_local *local, 
	 */

	spin_lock_bh(&sta->lock);



	ieee80211_agg_splice_packets(local, sta->ampdu_mlme.tid_tx[tid], tid);

	ieee80211_agg_splice_packets(local, tid_tx, tid);

	/*

	 * Now mark as operational. This will be visible

	 * in the TX path, and lets it go lock-free in

	 * the common case.

	 */

	set_bit(HT_AGG_STATE_OPERATIONAL, &sta->ampdu_mlme.tid_tx[tid]->state);

	set_bit(HT_AGG_STATE_OPERATIONAL, &tid_tx->state);

	ieee80211_agg_splice_finish(local, tid);



	spin_unlock_bh(&sta->lock);
@@ -548,7 +554,7 @@ void ieee80211_start_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u16 tid) 
	}



	mutex_lock(&sta->ampdu_mlme.mtx);

	tid_tx = sta->ampdu_mlme.tid_tx[tid];

	tid_tx = rcu_dereference_protected_tid_tx(sta, tid);



	if (WARN_ON(!tid_tx)) {

#ifdef CONFIG_MAC80211_HT_DEBUG
@@ -626,7 +632,7 @@ int ieee80211_stop_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid) 
		return -EINVAL;



	spin_lock_bh(&sta->lock);

	tid_tx = sta->ampdu_mlme.tid_tx[tid];

	tid_tx = rcu_dereference_protected_tid_tx(sta, tid);



	if (!tid_tx) {

		ret = -ENOENT;
@@ -682,7 +688,7 @@ void ieee80211_stop_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u8 tid) 


	mutex_lock(&sta->ampdu_mlme.mtx);

	spin_lock_bh(&sta->lock);

	tid_tx = sta->ampdu_mlme.tid_tx[tid];

	tid_tx = rcu_dereference_protected_tid_tx(sta, tid);



	if (!tid_tx || !test_bit(HT_AGG_STATE_STOPPING, &tid_tx->state)) {

#ifdef CONFIG_MAC80211_HT_DEBUG
@@ -763,7 +769,7 @@ void ieee80211_process_addba_resp(struct ieee80211_local *local, 


	mutex_lock(&sta->ampdu_mlme.mtx);



	tid_tx = sta->ampdu_mlme.tid_tx[tid];

	tid_tx = rcu_dereference_protected_tid_tx(sta, tid);

	if (!tid_tx)

		goto out;

net/mac80211/cfg.c

+7 −10
Original line number Diff line number Diff line
@@ -177,11 +177,11 @@ static int ieee80211_del_key(struct wiphy *wiphy, struct net_device *dev, 
			goto out_unlock;



		if (pairwise)

			key = sta->ptk;

			key = key_mtx_dereference(local, sta->ptk);

		else

			key = sta->gtk[key_idx];

			key = key_mtx_dereference(local, sta->gtk[key_idx]);

	} else

		key = sdata->keys[key_idx];

		key = key_mtx_dereference(local, sdata->keys[key_idx]);



	if (!key) {

		ret = -ENOENT;
@@ -463,7 +463,7 @@ static int ieee80211_config_beacon(struct ieee80211_sub_if_data *sdata, 
	int size;

	int err = -EINVAL;



	old = sdata->u.ap.beacon;

	old = rtnl_dereference(sdata->u.ap.beacon);



	/* head must not be zero-length */

	if (params->head && !params->head_len)
@@ -558,8 +558,7 @@ static int ieee80211_add_beacon(struct wiphy *wiphy, struct net_device *dev, 


	sdata = IEEE80211_DEV_TO_SUB_IF(dev);



	old = sdata->u.ap.beacon;



	old = rtnl_dereference(sdata->u.ap.beacon);

	if (old)

		return -EALREADY;
@@ -574,8 +573,7 @@ static int ieee80211_set_beacon(struct wiphy *wiphy, struct net_device *dev, 


	sdata = IEEE80211_DEV_TO_SUB_IF(dev);



	old = sdata->u.ap.beacon;



	old = rtnl_dereference(sdata->u.ap.beacon);

	if (!old)

		return -ENOENT;
@@ -589,8 +587,7 @@ static int ieee80211_del_beacon(struct wiphy *wiphy, struct net_device *dev) 


	sdata = IEEE80211_DEV_TO_SUB_IF(dev);



	old = sdata->u.ap.beacon;



	old = rtnl_dereference(sdata->u.ap.beacon);

	if (!old)

		return -ENOENT;

net/mac80211/debugfs_key.c

+9 −12
Original line number Diff line number Diff line
@@ -241,16 +241,12 @@ void ieee80211_debugfs_key_add(struct ieee80211_key *key) 
	if (!key->debugfs.dir)

		return;



	rcu_read_lock();

	sta = rcu_dereference(key->sta);

	if (sta)

	sta = key->sta;

	if (sta) {

		sprintf(buf, "../../stations/%pM", sta->sta.addr);

	rcu_read_unlock();



	/* using sta as a boolean is fine outside RCU lock */

	if (sta)

		key->debugfs.stalink =

			debugfs_create_symlink("station", key->debugfs.dir, buf);

	}



	DEBUGFS_ADD(keylen);

	DEBUGFS_ADD(flags);
@@ -286,7 +282,8 @@ void ieee80211_debugfs_key_update_default(struct ieee80211_sub_if_data *sdata) 
	lockdep_assert_held(&sdata->local->key_mtx);



	if (sdata->default_unicast_key) {

		key = sdata->default_unicast_key;

		key = key_mtx_dereference(sdata->local,

					  sdata->default_unicast_key);

		sprintf(buf, "../keys/%d", key->debugfs.cnt);

		sdata->debugfs.default_unicast_key =

			debugfs_create_symlink("default_unicast_key",
@@ -297,7 +294,8 @@ void ieee80211_debugfs_key_update_default(struct ieee80211_sub_if_data *sdata) 
	}



	if (sdata->default_multicast_key) {

		key = sdata->default_multicast_key;

		key = key_mtx_dereference(sdata->local,

					  sdata->default_multicast_key);

		sprintf(buf, "../keys/%d", key->debugfs.cnt);

		sdata->debugfs.default_multicast_key =

			debugfs_create_symlink("default_multicast_key",
@@ -316,9 +314,8 @@ void ieee80211_debugfs_key_add_mgmt_default(struct ieee80211_sub_if_data *sdata) 
	if (!sdata->debugfs.dir)

		return;



	/* this is running under the key lock */



	key = sdata->default_mgmt_key;

	key = key_mtx_dereference(sdata->local,

				  sdata->default_mgmt_key);

	if (key) {

		sprintf(buf, "../keys/%d", key->debugfs.cnt);

		sdata->debugfs.default_mgmt_key =

net/mac80211/ht.c

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ void ieee80211_ba_session_work(struct work_struct *work) 
			continue;

		}



		tid_tx = sta->ampdu_mlme.tid_tx[tid];

		tid_tx = rcu_dereference_protected_tid_tx(sta, tid);

		if (tid_tx && test_and_clear_bit(HT_AGG_STATE_WANT_STOP,

						 &tid_tx->state))

			___ieee80211_stop_tx_ba_session(sta, tid,

CRA Git | Maintained and supported by SUSTech CRA and CCSE