Commit 80a83cfc authored by Michal Kazior's avatar Michal Kazior Committed by Johannes Berg
Browse files

mac80211: skip netdev queue control with software queuing 



Qdiscs are designed with no regard to 802.11
aggregation requirements and hand out
packet-by-packet with no guarantee they are
destined to the same tid. This does more bad than
good no matter how fairly a given qdisc may behave
on an ethernet interface.

Software queuing used per-AC netdev subqueue
congestion control whenever a global AC limit was
hit. This meant in practice a single station or
tid queue could starve others rather easily. This
could resonate with qdiscs in a bad way or could
just end up with poor aggregation performance.
Increasing the AC limit would increase induced
latency which is also bad.

Disabling qdiscs by default and performing
taildrop instead of netdev subqueue congestion
control on the other hand makes it possible for
tid queues to fill up "in the meantime" while
preventing stations starving each other.

This increases aggregation opportunities and
should allow software queuing based drivers
achieve better performance by utilizing airtime
more efficiently with big aggregates.

Signed-off-by: default avatarMichal Kazior <michal.kazior@tieto.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 06627990

include/net/mac80211.h

+0 −4
Original line number Diff line number Diff line
@@ -2147,9 +2147,6 @@ enum ieee80211_hw_flags { 
 * @n_cipher_schemes: a size of an array of cipher schemes definitions.

 * @cipher_schemes: a pointer to an array of cipher scheme definitions

 *	supported by HW.

 *

 * @txq_ac_max_pending: maximum number of frames per AC pending in all txq

 *	entries for a vif.

 */

struct ieee80211_hw {

	struct ieee80211_conf conf;
@@ -2180,7 +2177,6 @@ struct ieee80211_hw { 
	u8 uapsd_max_sp_len;

	u8 n_cipher_schemes;

	const struct ieee80211_cipher_scheme *cipher_schemes;

	int txq_ac_max_pending;

};



static inline bool _ieee80211_hw_check(struct ieee80211_hw *hw,

net/mac80211/ieee80211_i.h

+1 −1
Original line number Diff line number Diff line
@@ -856,7 +856,7 @@ struct ieee80211_sub_if_data { 
	bool control_port_no_encrypt;

	int encrypt_headroom;



	atomic_t txqs_len[IEEE80211_NUM_ACS];

	atomic_t num_tx_queued;

	struct ieee80211_tx_queue_params tx_conf[IEEE80211_NUM_ACS];

	struct mac80211_qos_map __rcu *qos_map;

net/mac80211/iface.c

+15 −3
Original line number Diff line number Diff line
@@ -976,13 +976,13 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, 


	if (sdata->vif.txq) {

		struct txq_info *txqi = to_txq_info(sdata->vif.txq);

		int n = skb_queue_len(&txqi->queue);



		spin_lock_bh(&txqi->queue.lock);

		ieee80211_purge_tx_queue(&local->hw, &txqi->queue);

		atomic_sub(n, &sdata->num_tx_queued);

		txqi->byte_cnt = 0;

		spin_unlock_bh(&txqi->queue.lock);



		atomic_set(&sdata->txqs_len[txqi->txq.ac], 0);

	}



	if (local->open_count == 0)
@@ -1198,6 +1198,12 @@ static void ieee80211_if_setup(struct net_device *dev) 
	dev->destructor = ieee80211_if_free;

}



static void ieee80211_if_setup_no_queue(struct net_device *dev)

{

	ieee80211_if_setup(dev);

	dev->priv_flags |= IFF_NO_QUEUE;

}



static void ieee80211_iface_work(struct work_struct *work)

{

	struct ieee80211_sub_if_data *sdata =
@@ -1707,6 +1713,7 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name, 
	struct net_device *ndev = NULL;

	struct ieee80211_sub_if_data *sdata = NULL;

	struct txq_info *txqi;

	void (*if_setup)(struct net_device *dev);

	int ret, i;

	int txqs = 1;
@@ -1734,12 +1741,17 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name, 
			txq_size += sizeof(struct txq_info) +

				    local->hw.txq_data_size;



		if (local->ops->wake_tx_queue)

			if_setup = ieee80211_if_setup_no_queue;

		else

			if_setup = ieee80211_if_setup;



		if (local->hw.queues >= IEEE80211_NUM_ACS)

			txqs = IEEE80211_NUM_ACS;



		ndev = alloc_netdev_mqs(size + txq_size,

					name, name_assign_type,

					ieee80211_if_setup, txqs, 1);

					if_setup, txqs, 1);

		if (!ndev)

			return -ENOMEM;

		dev_net_set(ndev, wiphy_net(local->hw.wiphy));

net/mac80211/main.c

+0 −3
Original line number Diff line number Diff line
@@ -1055,9 +1055,6 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) 


	local->dynamic_ps_forced_timeout = -1;



	if (!local->hw.txq_ac_max_pending)

		local->hw.txq_ac_max_pending = 64;



	result = ieee80211_wep_init(local);

	if (result < 0)

		wiphy_debug(local->hw.wiphy, "Failed to initialize wep: %d\n",

net/mac80211/sta_info.c

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static void __cleanup_single_sta(struct sta_info *sta) 
			int n = skb_queue_len(&txqi->queue);



			ieee80211_purge_tx_queue(&local->hw, &txqi->queue);

			atomic_sub(n, &sdata->txqs_len[txqi->txq.ac]);

			atomic_sub(n, &sdata->num_tx_queued);

			txqi->byte_cnt = 0;

		}

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE