Commit cca07b00 authored by Luciano Coelho's avatar Luciano Coelho Committed by Johannes Berg
Browse files

mac80211: introduce refcount for queue_stop_reasons 



Sometimes different vifs may be stopping the queues for the same
reason (e.g. when several interfaces are performing a channel switch).
Instead of using a bitmask for the reasons, use an integer that holds
a refcount instead.  In order to keep it backwards compatible,
introduce a boolean in some functions that tell us whether the queue
stopping should be refcounted or not.  For now, use not refcounted for
all calls to keep it functionally the same as before.

Signed-off-by: default avatarLuciano Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 59f48fe2

net/mac80211/agg-tx.c

+6 −2
Original line number Diff line number Diff line
@@ -170,10 +170,13 @@ ieee80211_stop_queue_agg(struct ieee80211_sub_if_data *sdata, int tid) 
{

	int queue = sdata->vif.hw_queue[ieee80211_ac_from_tid(tid)];



	/* we do refcounting here, so don't use the queue reason refcounting */



	if (atomic_inc_return(&sdata->local->agg_queue_stop[queue]) == 1)

		ieee80211_stop_queue_by_reason(

			&sdata->local->hw, queue,

			IEEE80211_QUEUE_STOP_REASON_AGGREGATION);

			IEEE80211_QUEUE_STOP_REASON_AGGREGATION,

			false);

	__acquire(agg_queue);

}
@@ -185,7 +188,8 @@ ieee80211_wake_queue_agg(struct ieee80211_sub_if_data *sdata, int tid) 
	if (atomic_dec_return(&sdata->local->agg_queue_stop[queue]) == 0)

		ieee80211_wake_queue_by_reason(

			&sdata->local->hw, queue,

			IEEE80211_QUEUE_STOP_REASON_AGGREGATION);

			IEEE80211_QUEUE_STOP_REASON_AGGREGATION,

			false);

	__release(agg_queue);

}

net/mac80211/cfg.c

+6 −3
Original line number Diff line number Diff line
@@ -837,7 +837,8 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev) 
	if (!ieee80211_csa_needs_block_tx(local))

		ieee80211_wake_queues_by_reason(&local->hw,

					IEEE80211_MAX_QUEUE_MAP,

					IEEE80211_QUEUE_STOP_REASON_CSA);

					IEEE80211_QUEUE_STOP_REASON_CSA,

					false);

	mutex_unlock(&local->mtx);



	kfree(sdata->u.ap.next_beacon);
@@ -2828,7 +2829,8 @@ static int __ieee80211_csa_finalize(struct ieee80211_sub_if_data *sdata) 
	if (!ieee80211_csa_needs_block_tx(local))

		ieee80211_wake_queues_by_reason(&local->hw,

					IEEE80211_MAX_QUEUE_MAP,

					IEEE80211_QUEUE_STOP_REASON_CSA);

					IEEE80211_QUEUE_STOP_REASON_CSA,

					false);



	return 0;

}
@@ -3060,7 +3062,8 @@ __ieee80211_channel_switch(struct wiphy *wiphy, struct net_device *dev, 
	if (sdata->csa_block_tx)

		ieee80211_stop_queues_by_reason(&local->hw,

					IEEE80211_MAX_QUEUE_MAP,

					IEEE80211_QUEUE_STOP_REASON_CSA);

					IEEE80211_QUEUE_STOP_REASON_CSA,

					false);



	if (changed) {

		ieee80211_bss_info_change_notify(sdata, changed);

net/mac80211/ieee80211_i.h

+11 −4
Original line number Diff line number Diff line
@@ -922,6 +922,8 @@ enum queue_stop_reason { 
	IEEE80211_QUEUE_STOP_REASON_SKB_ADD,

	IEEE80211_QUEUE_STOP_REASON_OFFCHANNEL,

	IEEE80211_QUEUE_STOP_REASON_FLUSH,



	IEEE80211_QUEUE_STOP_REASONS,

};



#ifdef CONFIG_MAC80211_LEDS
@@ -1018,6 +1020,7 @@ struct ieee80211_local { 
	struct workqueue_struct *workqueue;



	unsigned long queue_stop_reasons[IEEE80211_MAX_QUEUES];

	int q_stop_reasons[IEEE80211_MAX_QUEUES][IEEE80211_QUEUE_STOP_REASONS];

	/* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */

	spinlock_t queue_stop_reason_lock;
@@ -1715,14 +1718,18 @@ void ieee80211_sta_tx_notify(struct ieee80211_sub_if_data *sdata, 


void ieee80211_wake_queues_by_reason(struct ieee80211_hw *hw,

				     unsigned long queues,

				     enum queue_stop_reason reason);

				     enum queue_stop_reason reason,

				     bool refcounted);

void ieee80211_stop_queues_by_reason(struct ieee80211_hw *hw,

				     unsigned long queues,

				     enum queue_stop_reason reason);

				     enum queue_stop_reason reason,

				     bool refcounted);

void ieee80211_wake_queue_by_reason(struct ieee80211_hw *hw, int queue,

				    enum queue_stop_reason reason);

				    enum queue_stop_reason reason,

				    bool refcounted);

void ieee80211_stop_queue_by_reason(struct ieee80211_hw *hw, int queue,

				    enum queue_stop_reason reason);

				    enum queue_stop_reason reason,

				    bool refcounted);

void ieee80211_propagate_queue_wake(struct ieee80211_local *local, int queue);

void ieee80211_add_pending_skb(struct ieee80211_local *local,

			       struct sk_buff *skb);

net/mac80211/iface.c

+2 −1
Original line number Diff line number Diff line
@@ -844,7 +844,8 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, 
	if (!ieee80211_csa_needs_block_tx(local))

		ieee80211_wake_queues_by_reason(&local->hw,

					IEEE80211_MAX_QUEUE_MAP,

					IEEE80211_QUEUE_STOP_REASON_CSA);

					IEEE80211_QUEUE_STOP_REASON_CSA,

					false);

	mutex_unlock(&local->mtx);

	sdata_unlock(sdata);

net/mac80211/main.c

+2 −1
Original line number Diff line number Diff line
@@ -272,7 +272,8 @@ void ieee80211_restart_hw(struct ieee80211_hw *hw) 


	/* use this reason, ieee80211_reconfig will unblock it */

	ieee80211_stop_queues_by_reason(hw, IEEE80211_MAX_QUEUE_MAP,

					IEEE80211_QUEUE_STOP_REASON_SUSPEND);

					IEEE80211_QUEUE_STOP_REASON_SUSPEND,

					false);



	/*

	 * Stop all Rx during the reconfig. We don't want state changes

CRA Git | Maintained and supported by SUSTech CRA and CCSE