Commit 6e0456b5 authored by Felix Fietkau's avatar Felix Fietkau Committed by Johannes Berg
Browse files

mac80211: add A-MSDU tx support 



Requires software tx queueing and fast-xmit support. For good
performance, drivers need frag_list support as well. This avoids the
need for copying data of aggregated frames. Running without it is only
supported for debugging purposes.

To avoid performance and packet size issues, the rate control module or
driver needs to limit the maximum A-MSDU size by setting
max_rc_amsdu_len in struct ieee80211_sta.

Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
[fix locking issue]
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent c9c5962b

include/linux/ieee80211.h

+3 −0
Original line number Diff line number Diff line
@@ -164,6 +164,9 @@ static inline u16 ieee80211_sn_sub(u16 sn1, u16 sn2) 
/* 30 byte 4 addr hdr, 2 byte QoS, 2304 byte MSDU, 12 byte crypt, 4 byte FCS */

#define IEEE80211_MAX_FRAME_LEN		2352



/* Maximal size of an A-MSDU that can be transported in a HT BA session */

#define IEEE80211_MAX_MPDU_LEN_HT_BA		4095



/* Maximal size of an A-MSDU */

#define IEEE80211_MAX_MPDU_LEN_HT_3839		3839

#define IEEE80211_MAX_MPDU_LEN_HT_7935		7935

include/net/mac80211.h

+19 −0
Original line number Diff line number Diff line
@@ -713,6 +713,7 @@ enum mac80211_tx_info_flags { 
 * @IEEE80211_TX_CTRL_PS_RESPONSE: This frame is a response to a poll

 *	frame (PS-Poll or uAPSD).

 * @IEEE80211_TX_CTRL_RATE_INJECT: This frame is injected with rate information

 * @IEEE80211_TX_CTRL_AMSDU: This frame is an A-MSDU frame

 *

 * These flags are used in tx_info->control.flags.

 */
@@ -720,6 +721,7 @@ enum mac80211_tx_control_flags { 
	IEEE80211_TX_CTRL_PORT_CTRL_PROTO	= BIT(0),

	IEEE80211_TX_CTRL_PS_RESPONSE		= BIT(1),

	IEEE80211_TX_CTRL_RATE_INJECT		= BIT(2),

	IEEE80211_TX_CTRL_AMSDU			= BIT(3),

};



/*
@@ -1746,6 +1748,7 @@ struct ieee80211_sta_rates { 
 *	Both additional HT limits must be enforced by the low level driver.

 *	This is defined by the spec (IEEE 802.11-2012 section 8.3.2.2 NOTE 2).

 * @support_p2p_ps: indicates whether the STA supports P2P PS mechanism or not.

 * @max_rc_amsdu_len: Maximum A-MSDU size in bytes recommended by rate control.

 * @txq: per-TID data TX queues (if driver uses the TXQ abstraction)

 */

struct ieee80211_sta {
@@ -1767,6 +1770,7 @@ struct ieee80211_sta { 
	u8 max_amsdu_subframes;

	u16 max_amsdu_len;

	bool support_p2p_ps;

	u16 max_rc_amsdu_len;



	struct ieee80211_txq *txq[IEEE80211_NUM_TIDS];
@@ -1983,6 +1987,15 @@ struct ieee80211_txq { 
 * @IEEE80211_HW_USES_RSS: The device uses RSS and thus requires parallel RX,

 *	which implies using per-CPU station statistics.

 *

 * @IEEE80211_HW_TX_AMSDU: Hardware (or driver) supports software aggregated

 *	A-MSDU frames. Requires software tx queueing and fast-xmit support.

 *	When not using minstrel/minstrel_ht rate control, the driver must

 *	limit the maximum A-MSDU size based on the current tx rate by setting

 *	max_rc_amsdu_len in struct ieee80211_sta.

 *

 * @IEEE80211_HW_TX_FRAG_LIST: Hardware (or driver) supports sending frag_list

 *	skbs, needed for zero-copy software A-MSDU.

 *

 * @NUM_IEEE80211_HW_FLAGS: number of hardware flags, used for sizing arrays

 */

enum ieee80211_hw_flags {
@@ -2021,6 +2034,8 @@ enum ieee80211_hw_flags { 
	IEEE80211_HW_NEEDS_UNIQUE_STA_ADDR,

	IEEE80211_HW_SUPPORTS_REORDERING_BUFFER,

	IEEE80211_HW_USES_RSS,

	IEEE80211_HW_TX_AMSDU,

	IEEE80211_HW_TX_FRAG_LIST,



	/* keep last, obviously */

	NUM_IEEE80211_HW_FLAGS
@@ -2093,6 +2108,9 @@ enum ieee80211_hw_flags { 
 *	size is smaller (an example is LinkSys WRT120N with FW v1.0.07

 *	build 002 Jun 18 2012).

 *

 * @max_tx_fragments: maximum number of tx buffers per (A)-MSDU, sum

 *	of 1 + skb_shinfo(skb)->nr_frags for each skb in the frag_list.

 *

 * @offchannel_tx_hw_queue: HW queue ID to use for offchannel TX

 *	(if %IEEE80211_HW_QUEUE_CONTROL is set)

 *
@@ -2147,6 +2165,7 @@ struct ieee80211_hw { 
	u8 max_rate_tries;

	u8 max_rx_aggregation_subframes;

	u8 max_tx_aggregation_subframes;

	u8 max_tx_fragments;

	u8 offchannel_tx_hw_queue;

	u8 radiotap_mcs_details;

	u16 radiotap_vht_details;

net/mac80211/agg-tx.c

+5 −0
Original line number Diff line number Diff line
@@ -935,6 +935,7 @@ void ieee80211_process_addba_resp(struct ieee80211_local *local, 
				  size_t len)

{

	struct tid_ampdu_tx *tid_tx;

	struct ieee80211_txq *txq;

	u16 capab, tid;

	u8 buf_size;

	bool amsdu;
@@ -945,6 +946,10 @@ void ieee80211_process_addba_resp(struct ieee80211_local *local, 
	buf_size = (capab & IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK) >> 6;

	buf_size = min(buf_size, local->hw.max_tx_aggregation_subframes);



	txq = sta->sta.txq[tid];

	if (!amsdu && txq)

		set_bit(IEEE80211_TXQ_NO_AMSDU, &to_txq_info(txq)->flags);



	mutex_lock(&sta->ampdu_mlme.mtx);



	tid_tx = rcu_dereference_protected_tid_tx(sta, tid);

net/mac80211/debugfs.c

+2 −0
Original line number Diff line number Diff line
@@ -128,6 +128,8 @@ static const char *hw_flag_names[] = { 
	FLAG(NEEDS_UNIQUE_STA_ADDR),

	FLAG(SUPPORTS_REORDERING_BUFFER),

	FLAG(USES_RSS),

	FLAG(TX_AMSDU),

	FLAG(TX_FRAG_LIST),

#undef FLAG

};

net/mac80211/ieee80211_i.h

+1 −0
Original line number Diff line number Diff line
@@ -802,6 +802,7 @@ struct mac80211_qos_map { 
enum txq_info_flags {

	IEEE80211_TXQ_STOP,

	IEEE80211_TXQ_AMPDU,

	IEEE80211_TXQ_NO_AMSDU,

};



struct txq_info {

CRA Git | Maintained and supported by SUSTech CRA and CCSE