mac80211: move A-MPDU session check from minstrel_ht to mac80211
PATCH v3 1/3 mac80211: move A-MPDU session check from minstrel_ht to mac80211
This avoids calling back into tx handlers from within the rate control module. Preparation for deferring rate control until tx dequeue
Signed-off-by Felix Fietkau <[email protected]>
--- include/net/mac80211.h | 5 +++++ net/mac80211/rc80211_minstrel_ht.c | 28 +--------------------------- net/mac80211/tx.c | 27 +++++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 27 deletions(-)
include/net/mac80211.h +5 -0
@@ -6184,6 +6184,11 @@ enum rate_control_capabilities {* otherwise the NSS difference doesn't bother us. */ RATE_CTRL_CAPA_VHT_EXT_NSS_BW =BIT (0 ), +/** +* @RATE_CTRL_CAPA_AMPDU_TRIGGER: +* mac80211 should start A-MPDU sessions on tx +*/ + RATE_CTRL_CAPA_AMPDU_TRIGGER = BIT(1), }; struct rate_control_ops {
net/mac80211/rc80211_minstrel_ht.c +1 -27
@@ -1175,29 +1175,6 @@ minstrel_downgrade_rate(struct minstrel_ht_sta *mi, u16 *idx, bool primary) } } -static void -minstrel_aggr_check (struct ieee80211_sta *pubsta,struct sk_buff *skb) -{ -struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data; - struct sta_info *sta = container_of(pubsta, struct sta_info, sta); -u16 tid; - -if (skb_get_queue_mapping (skb) ==IEEE80211_AC_VO ) -return ; - -if (unlikely (!ieee80211_is_data_qos (hdr->frame_control))) -return ; - -if (unlikely (skb->protocol ==cpu_to_be16 (ETH_P_PAE ))) -return ; - - tid =ieee80211_get_tid (hdr); -if (likely (sta->ampdu_mlme.tid_tx[tid])) -return ; - -ieee80211_start_tx_ba_session (pubsta, tid,0 ); -} -static void minstrel_ht_tx_status (void *priv,struct ieee80211_supported_band *sband,void *priv_sta,struct ieee80211_tx_status *st)
@@ -1498,10 +1475,6 @@ minstrel_ht_get_rate(void *priv, struct ieee80211_sta *sta, void *priv_sta,struct minstrel_priv *mp = priv;u16 sample_idx; -if (!(info->flags &IEEE80211_TX_CTL_AMPDU ) && - !minstrel_ht_is_legacy_group (MI_RATE_GROUP (mi->max_prob_rate))) -minstrel_aggr_check (sta, txrc->skb); - info->flags |= mi->tx_flags;#ifdef CONFIG_MAC80211_DEBUGFS
@@ -1907,6 +1880,7 @@ static u32 minstrel_ht_get_expected_throughput(void *priv_sta)static const struct rate_control_ops mac80211_minstrel_ht = { .name ="minstrel_ht" , + .capa =RATE_CTRL_CAPA_AMPDU_TRIGGER , .tx_status_ext = minstrel_ht_tx_status, .get_rate = minstrel_ht_get_rate, .rate_init = minstrel_ht_rate_init,
net/mac80211/tx.c +27 -0
@@ -3929,6 +3929,29 @@ void ieee80211_txq_schedule_start(struct ieee80211_hw *hw, u8 ac) }EXPORT_SYMBOL (ieee80211_txq_schedule_start); +static void +ieee80211_aggr_check (struct ieee80211_sub_if_data *sdata, +struct sta_info *sta, +struct sk_buff *skb) +{ +struct rate_control_ref *ref = sdata->local->rate_ctrl; +u16 tid; + +if (!ref || !(ref->ops->capa &RATE_CTRL_CAPA_AMPDU_TRIGGER )) +return ; + +if (!sta || !sta->sta.ht_cap.ht_supported || + !sta->sta.wme ||skb_get_queue_mapping (skb) ==IEEE80211_AC_VO || + skb->protocol == sdata->control_port_protocol) +return ; + + tid = skb->priority &IEEE80211_QOS_CTL_TID_MASK ; +if (likely (sta->ampdu_mlme.tid_tx[tid])) +return ; + +ieee80211_start_tx_ba_session (&sta->sta, tid,0 ); +} + void __ieee80211_subif_start_xmit(struct sk_buff *skb, struct net_device *dev, u32 info_flags,
@@ -3959,6 +3982,8 @@ void __ieee80211_subif_start_xmit(struct sk_buff *skb,skb_get_hash (skb); } +ieee80211_aggr_check (sdata, sta, skb); +if (sta) {struct ieee80211_fast_tx *fast_tx;
@@ -4222,6 +4247,8 @@ static void ieee80211_8023_xmit(struct ieee80211_sub_if_data *sdata,memset (info,0 ,sizeof (*info)); +ieee80211_aggr_check (sdata, sta, skb); + tid = skb->priority &IEEE80211_QOS_CTL_TAG1D_MASK ; tid_tx =rcu_dereference (sta->ampdu_mlme.tid_tx[tid]);if (tid_tx) {
Signature · 1 line
2.30.1
PATCH v3 2/3 mac80211: call ieee80211_tx_h_rate_ctrl() when dequeue
From: Ryder Lee <[email protected]>
Make ieee80211_tx_h_rate_ctrl() get called on dequeue to improve performance since it reduces the turnaround time for rate control.
Signed-off-by Ryder Lee <[email protected]>
--- net/mac80211/tx.c | 52 ++++++++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 23 deletions(-)
net/mac80211/tx.c +29 -23
@@ -1768,8 +1768,6 @@ static int invoke_tx_handlers_early(struct ieee80211_tx_data *tx)CALL_TXH (ieee80211_tx_h_ps_buf);CALL_TXH (ieee80211_tx_h_check_control_port_protocol);CALL_TXH (ieee80211_tx_h_select_key); -if (!ieee80211_hw_check (&tx->local->hw,HAS_RATE_CONTROL )) -CALL_TXH (ieee80211_tx_h_rate_ctrl); txh_done:if (unlikely (res ==TX_DROP )) {
@@ -1802,6 +1800,9 @@ static int invoke_tx_handlers_late(struct ieee80211_tx_data *tx) goto txh_done; } +if (!ieee80211_hw_check (&tx->local->hw,HAS_RATE_CONTROL )) +CALL_TXH (ieee80211_tx_h_rate_ctrl); +CALL_TXH (ieee80211_tx_h_michael_mic_add);CALL_TXH (ieee80211_tx_h_sequence);CALL_TXH (ieee80211_tx_h_fragment);
@@ -3369,15 +3370,21 @@ static bool ieee80211_amsdu_aggregate(struct ieee80211_sub_if_data *sdata,* Can be called while the sta lock is held. Anything that can cause packets to * be generated will cause deadlock! */ -static void ieee80211_xmit_fast_finish (struct ieee80211_sub_if_data *sdata, -struct sta_info *sta,u8 pn_offs, -struct ieee80211_key *key, -struct sk_buff *skb) +static ieee80211_tx_result +ieee80211_xmit_fast_finish (struct ieee80211_sub_if_data *sdata, +struct sta_info *sta,u8 pn_offs, +struct ieee80211_key *key, +struct ieee80211_tx_data *tx) { +struct sk_buff *skb = tx->skb;struct ieee80211_tx_info *info =IEEE80211_SKB_CB (skb);struct ieee80211_hdr *hdr = (void *)skb->data;u8 tid =IEEE80211_NUM_TIDS ; +if (!ieee80211_hw_check (&tx->local->hw,HAS_RATE_CONTROL ) && +ieee80211_tx_h_rate_ctrl (tx) !=TX_CONTINUE ) +return TX_DROP ; +if (key) info->control.hw_key = &key->conf;
@@ -3426,6 +3433,8 @@ static void ieee80211_xmit_fast_finish(struct ieee80211_sub_if_data *sdata,break ; } } + +return TX_CONTINUE ; } static bool ieee80211_xmit_fast(struct ieee80211_sub_if_data *sdata,
@@ -3529,24 +3538,17 @@ static bool ieee80211_xmit_fast(struct ieee80211_sub_if_data *sdata, tx.sta = sta; tx.key = fast_tx->key; -if (!ieee80211_hw_check (&local->hw,HAS_RATE_CONTROL )) { - tx.skb = skb; - r =ieee80211_tx_h_rate_ctrl (&tx); - skb = tx.skb; - tx.skb =NULL ; - -if (r !=TX_CONTINUE ) { -if (r !=TX_QUEUED ) -kfree_skb (skb); -return true; - } - } -if (ieee80211_queue_skb (local, sdata, sta, skb))return true; -ieee80211_xmit_fast_finish (sdata, sta, fast_tx->pn_offs, - fast_tx->key, skb); + tx.skb = skb; + r =ieee80211_xmit_fast_finish (sdata, sta, fast_tx->pn_offs, + fast_tx->key, &tx); + tx.skb =NULL ; +if (r ==TX_DROP ) { +kfree_skb (skb); +return true; + }if (sdata->vif.type ==NL80211_IFTYPE_AP_VLAN ) sdata = container_of(sdata->bss,
@@ -3663,8 +3665,12 @@ struct sk_buff *ieee80211_tx_dequeue(struct ieee80211_hw *hw, (tx.key->conf.flags & IEEE80211_KEY_FLAG_GENERATE_IV)) pn_offs =ieee80211_hdrlen (hdr->frame_control); -ieee80211_xmit_fast_finish (sta->sdata, sta, pn_offs, - tx.key, skb); + r =ieee80211_xmit_fast_finish (sta->sdata, sta, pn_offs, + tx.key, &tx); +if (r !=TX_CONTINUE ) { +ieee80211_free_txskb (&local->hw, skb); + goto begin; + } }else {if (invoke_tx_handlers_late (&tx)) goto begin;
Signature · 1 line
2.30.1
PATCH v3 3/3 mac80211: add rate control support for encap offload
In reply to Felix FietkauFrom: Ryder Lee <[email protected]>
The software rate control cannot deal with encap offload, so fix it.
Signed-off-by Ryder Lee <[email protected]>
--- net/mac80211/ieee80211_i.h | 9 +++++++++ net/mac80211/rate.c | 9 ++------- net/mac80211/tx.c | 18 ++++++++++++++---- 3 files changed, 25 insertions(+), 11 deletions(-)
net/mac80211/ieee80211_i.h +9 -0
@@ -2030,6 +2030,15 @@ static inline void ieee80211_tx_skb(struct ieee80211_sub_if_data *sdata,ieee80211_tx_skb_tid (sdata, skb,7 ); } +static inline bool ieee80211_is_tx_data (struct sk_buff *skb) +{ +struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; +struct ieee80211_tx_info *info =IEEE80211_SKB_CB (skb); + +return info->flags &IEEE80211_TX_CTL_HW_80211_ENCAP || +ieee80211_is_data (hdr->frame_control); +} + u32 ieee802_11_parse_elems_crc(const u8 *start, size_t len, bool action, struct ieee802_11_elems *elems, u64 filter, u32 crc, u8 *transmitter_bssid,
net/mac80211/rate.c +2 -7
@@ -297,15 +297,11 @@ void ieee80211_check_rate_mask(struct ieee80211_sub_if_data *sdata)static bool rc_no_data_or_no_ack_use_min (struct ieee80211_tx_rate_control *txrc) {struct sk_buff *skb = txrc->skb; -struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;struct ieee80211_tx_info *info =IEEE80211_SKB_CB (skb); -__le16 fc; - - fc = hdr->frame_control;return (info->flags & (IEEE80211_TX_CTL_NO_ACK |IEEE80211_TX_CTL_USE_MINRATE )) || - !ieee80211_is_data (fc); + !ieee80211_is_tx_data (skb); } static void rc_send_low_basicrate(struct ieee80211_tx_rate *rate,
@@ -870,7 +866,6 @@ void ieee80211_get_tx_rates(struct ieee80211_vif *vif, int max_rates) {struct ieee80211_sub_if_data *sdata; -struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;struct ieee80211_tx_info *info =IEEE80211_SKB_CB (skb);struct ieee80211_supported_band *sband;
@@ -882,7 +877,7 @@ void ieee80211_get_tx_rates(struct ieee80211_vif *vif, sdata =vif_to_sdata (vif); sband = sdata->local->hw.wiphy->bands[info->band]; -if (ieee80211_is_data (hdr->frame_control)) +if (ieee80211_is_tx_data (skb))rate_control_apply_mask (sdata, sta, sband, dest, max_rates);if (dest[0 ].idx <0 )
net/mac80211/tx.c +14 -4
@@ -666,6 +666,7 @@ ieee80211_tx_h_rate_ctrl(struct ieee80211_tx_data *tx)u32 len;struct ieee80211_tx_rate_control txrc;struct ieee80211_sta_rates *ratetbl =NULL ; +bool encap = info->flags &IEEE80211_TX_CTL_HW_80211_ENCAP ;bool assoc = false;memset (&txrc,0 ,sizeof (txrc));
@@ -707,7 +708,7 @@ ieee80211_tx_h_rate_ctrl(struct ieee80211_tx_data *tx)* just wants a probe response. */ if (tx->sdata->vif.bss_conf.use_short_preamble && - (ieee80211_is_data (hdr->frame_control) || + (ieee80211_is_tx_data (tx->skb) || (tx->sta &&test_sta_flag (tx->sta,WLAN_STA_SHORT_PREAMBLE )))) txrc.short_preamble = true;
@@ -729,7 +730,8 @@ ieee80211_tx_h_rate_ctrl(struct ieee80211_tx_data *tx)"%s: Dropped data frame as no usable bitrate found while " "scanning and associated. Target station: " "%pM on %d GHz band\n" , - tx->sdata->name, hdr->addr1, + tx->sdata->name, + encap ? ((struct ethhdr *)hdr)->h_dest : hdr->addr1, info->band ? 5 : 2)) return TX_DROP;
@@ -763,7 +765,7 @@ ieee80211_tx_h_rate_ctrl(struct ieee80211_tx_data *tx)if (txrc.reported_rate.idx <0 ) { txrc.reported_rate = tx->rate; -if (tx->sta &&ieee80211_is_data (hdr->frame_control)) +if (tx->sta &&ieee80211_is_tx_data (tx->skb)) tx->sta->tx_stats.last_rate = txrc.reported_rate; }else if (tx->sta) tx->sta->tx_stats.last_rate = txrc.reported_rate;
@@ -3653,8 +3655,16 @@ struct sk_buff *ieee80211_tx_dequeue(struct ieee80211_hw *hw,else info->flags &= ~IEEE80211_TX_CTL_AMPDU ; -if (info->flags &IEEE80211_TX_CTL_HW_80211_ENCAP ) +if (info->flags &IEEE80211_TX_CTL_HW_80211_ENCAP ) { +if (!ieee80211_hw_check (&local->hw,HAS_RATE_CONTROL )) { + r =ieee80211_tx_h_rate_ctrl (&tx); +if (r !=TX_CONTINUE ) { +ieee80211_free_txskb (&local->hw, skb); + goto begin; + } + } goto encap_out; + }if (info->control.flags &IEEE80211_TX_CTRL_FAST_XMIT ) { struct sta_info *sta = container_of(txq->sta, struct sta_info,
Signature · 1 line
2.30.1