Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17c18bf8 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: add TX fastpath 



In order to speed up mac80211's TX path, add the "fast-xmit" cache
that will cache the data frame 802.11 header and other data to be
able to build the frame more quickly. This cache is rebuilt when
external triggers imply changes, but a lot of the checks done per
packet today are simplified away to the check for the cache.

There's also a more detailed description in the code.

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

include/net/mac80211.h

+5 −1
Original line number Diff line number Diff line
@@ -1796,6 +1796,10 @@ struct ieee80211_txq { 
 *	the driver returns 1. This also forces the driver to advertise its

 *	supported cipher suites.

 *

 * @IEEE80211_HW_SUPPORT_FAST_XMIT: The driver/hardware supports fast-xmit,

 *	this currently requires only the ability to calculate the duration

 *	for frames.

 *

 * @IEEE80211_HW_QUEUE_CONTROL: The driver wants to control per-interface

 *	queue mapping in order to use different queues (not just one per AC)

 *	for different virtual interfaces. See the doc section on HW queue
@@ -1844,7 +1848,7 @@ enum ieee80211_hw_flags { 
	IEEE80211_HW_WANT_MONITOR_VIF			= 1<<14,

	IEEE80211_HW_NO_AUTO_VIF			= 1<<15,

	IEEE80211_HW_SW_CRYPTO_CONTROL			= 1<<16,

	/* free slots */

	IEEE80211_HW_SUPPORT_FAST_XMIT			= 1<<17,

	IEEE80211_HW_REPORTS_TX_ACK_STATUS		= 1<<18,

	IEEE80211_HW_CONNECTION_MONITOR			= 1<<19,

	IEEE80211_HW_QUEUE_CONTROL			= 1<<20,

net/mac80211/cfg.c

+8 −1
Original line number Diff line number Diff line
@@ -137,6 +137,9 @@ static int ieee80211_set_noack_map(struct wiphy *wiphy, 
	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);



	sdata->noack_map = noack_map;



	ieee80211_check_fast_xmit_iface(sdata);



	return 0;

}
@@ -2099,11 +2102,15 @@ static int ieee80211_set_wiphy_params(struct wiphy *wiphy, u32 changed) 
	int err;



	if (changed & WIPHY_PARAM_FRAG_THRESHOLD) {

		ieee80211_check_fast_xmit_all(local);



		err = drv_set_frag_threshold(local, wiphy->frag_threshold);



		if (err)

		if (err) {

			ieee80211_check_fast_xmit_all(local);

			return err;

		}

	}



	if ((changed & WIPHY_PARAM_COVERAGE_CLASS) ||

	    (changed & WIPHY_PARAM_DYN_ACK)) {

net/mac80211/chan.c

+6 −0
Original line number Diff line number Diff line
@@ -664,6 +664,8 @@ out: 
		ieee80211_bss_info_change_notify(sdata,

						 BSS_CHANGED_IDLE);



	ieee80211_check_fast_xmit_iface(sdata);



	return ret;

}
@@ -1030,6 +1032,8 @@ ieee80211_vif_use_reserved_reassign(struct ieee80211_sub_if_data *sdata) 
	if (sdata->vif.type == NL80211_IFTYPE_AP)

		__ieee80211_vif_copy_chanctx_to_vlans(sdata, false);



	ieee80211_check_fast_xmit_iface(sdata);



	if (ieee80211_chanctx_refcount(local, old_ctx) == 0)

		ieee80211_free_chanctx(local, old_ctx);
@@ -1376,6 +1380,8 @@ static int ieee80211_vif_use_reserved_switch(struct ieee80211_local *local) 
				__ieee80211_vif_copy_chanctx_to_vlans(sdata,

								      false);



			ieee80211_check_fast_xmit_iface(sdata);



			sdata->radar_required = sdata->reserved_radar_required;



			if (sdata->vif.bss_conf.chandef.width !=

net/mac80211/ieee80211_i.h

+5 −0
Original line number Diff line number Diff line
@@ -1651,6 +1651,11 @@ struct sk_buff * 
ieee80211_build_data_template(struct ieee80211_sub_if_data *sdata,

			      struct sk_buff *skb, u32 info_flags);



void ieee80211_check_fast_xmit(struct sta_info *sta);

void ieee80211_check_fast_xmit_all(struct ieee80211_local *local);

void ieee80211_check_fast_xmit_iface(struct ieee80211_sub_if_data *sdata);

void ieee80211_clear_fast_xmit(struct sta_info *sta);



/* HT */

void ieee80211_apply_htcap_overrides(struct ieee80211_sub_if_data *sdata,

				     struct ieee80211_sta_ht_cap *ht_cap);

net/mac80211/key.c

+2 −0
Original line number Diff line number Diff line
@@ -229,6 +229,7 @@ static void __ieee80211_set_default_key(struct ieee80211_sub_if_data *sdata, 


	if (uni) {

		rcu_assign_pointer(sdata->default_unicast_key, key);

		ieee80211_check_fast_xmit_iface(sdata);

		drv_set_default_unicast_key(sdata->local, sdata, idx);

	}
@@ -298,6 +299,7 @@ static void ieee80211_key_replace(struct ieee80211_sub_if_data *sdata, 
		if (pairwise) {

			rcu_assign_pointer(sta->ptk[idx], new);

			sta->ptk_idx = idx;

			ieee80211_check_fast_xmit(sta);

		} else {

			rcu_assign_pointer(sta->gtk[idx], new);

			sta->gtk_idx = idx;