mac80211 encapsulation offload / performance patches
Subsystems (2)
v2 cover mac80211 encapsulation offload / performance patches
v2:
- add cover letter
- fix netdev ops for vlan interfaces
- make multicast traffic fall back to non-offload path to support sw crypto
- use ieee80211_tx_status_ext as replacements for ieee80211_free_txskb (the latter does not work with encap offload packets)
- add api for bulk free after tx status
Felix Fietkau (13):
mac80211: rework tx encapsulation offload API
mac80211: reduce duplication in tx status functions
mac80211: remove tx status call to ieee80211_sta_register_airtime
mac80211: optimize station connection monitor
mac80211: swap NEED_TXPROCESSING and HW_80211_ENCAP tx flags
mac80211: unify 802.3 (offload) and 802.11 tx status codepath
mac80211: add missing queue/hash initialization to 802.3 xmit
mac80211: check and refresh aggregation session in encap offload tx
mac80211: support using ieee80211_tx_status_ext to free skbs without
status info
mac80211: extend ieee80211_tx_status_ext to support bulk free
mac80211: notify the driver when a sta uses 4-address mode
mac80211: skip encap offload for tx multicast/control packets
mac80211: set info->control.hw_key for encap offload packets
drivers/net/wireless/ath/ath11k/dp_tx.c | 4 +- drivers/net/wireless/ath/ath11k/mac.c | 61 ++++--- include/net/mac80211.h | 49 +++++- net/mac80211/cfg.c | 6 + net/mac80211/debugfs.c | 1 + net/mac80211/driver-ops.h | 29 ++++ net/mac80211/ieee80211_i.h | 5 +- net/mac80211/iface.c | 204 ++++++++++++++++------ net/mac80211/key.c | 23 +-- net/mac80211/mesh_hwmp.c | 4 +- net/mac80211/mesh_ps.c | 2 +- net/mac80211/mlme.c | 56 +++--- net/mac80211/rx.c | 11 +- net/mac80211/sta_info.h | 2 - net/mac80211/status.c | 218 +++++++++--------------- net/mac80211/trace.h | 33 ++++ net/mac80211/tx.c | 96 +++++------ 17 files changed, 451 insertions(+), 353 deletions(-)
Signature · 1 line
2.28.0
PATCH v2 1/13 mac80211: rework tx encapsulation offload API
The current API (which lets the driver turn on/off per vif directly) has a number of limitations:
- it does not deal with AP_VLAN
- conditions for enabling (no tkip, no monitor) are only checked at add_interface time
- no way to indicate 4-addr support
In order to address this, store offload flags in struct ieee80211_vif (easy to extend for decap offload later). mac80211 initially sets the enable flag, but gives the driver a chance to modify it before its settings are applied. In addition to the .add_interface op, a .update_vif_offload op is introduced, which can be used for runtime changes.
If a driver can't disable encap offload at runtime, or if it has some extra limitations, it can simply override the flags within those ops.
Support for encap offload with 4-address mode interfaces can be enabled by setting a flag from .add_interface or .update_vif_offload.
--- drivers/net/wireless/ath/ath11k/mac.c | 57 ++++---- include/net/mac80211.h | 29 ++++ net/mac80211/cfg.c | 5 + net/mac80211/debugfs.c | 1 + net/mac80211/driver-ops.h | 15 ++ net/mac80211/ieee80211_i.h | 3 +- net/mac80211/iface.c | 202 +++++++++++++++++++------- net/mac80211/key.c | 23 +-- net/mac80211/trace.h | 6 + net/mac80211/tx.c | 5 - 10 files changed, 243 insertions(+), 103 deletions(-)
drivers/net/wireless/ath/ath11k/mac.c +32 -25
@@ -4304,6 +4304,35 @@ static int ath11k_set_he_mu_sounding_mode(struct ath11k *ar,return ret; } +static void ath11k_mac_op_update_vif_offload (struct ieee80211_hw *hw, +struct ieee80211_vif *vif) +{ +struct ath11k *ar = hw->priv; +struct ath11k_base *ab = ar->ab; +struct ath11k_vif *arvif =ath11k_vif_to_arvif (vif); +u32 param_id, param_value; +int ret; + + param_id =WMI_VDEV_PARAM_TX_ENCAP_TYPE ; +if (ath11k_frame_mode !=ATH11K_HW_TXRX_ETHERNET || + (vif->type !=NL80211_IFTYPE_STATION && + vif->type !=NL80211_IFTYPE_AP )) + vif->offload_flags &= ~IEEE80211_OFFLOAD_ENCAP_ENABLED ; + +if (vif->offload_flags &IEEE80211_OFFLOAD_ENCAP_ENABLED ) + param_value =ATH11K_HW_TXRX_ETHERNET ; +else + param_value =ATH11K_HW_TXRX_NATIVE_WIFI ; + + ret =ath11k_wmi_vdev_set_param_cmd (ar, arvif->vdev_id, + param_id, param_value); +if (ret) { +ath11k_warn (ab,"failed to set vdev %d tx encap mode: %d\n" , + arvif->vdev_id, ret); + vif->offload_flags &= ~IEEE80211_OFFLOAD_ENCAP_ENABLED ; + } +} +static int ath11k_mac_op_add_interface (struct ieee80211_hw *hw,struct ieee80211_vif *vif) {
@@ -4313,7 +4342,6 @@ static int ath11k_mac_op_add_interface(struct ieee80211_hw *hw,struct vdev_create_params vdev_param = {0 };struct peer_create_params peer_param;u32 param_id, param_value; -int hw_encap =0 ;u16 nss;int i;int ret;
@@ -4407,30 +4435,7 @@ static int ath11k_mac_op_add_interface(struct ieee80211_hw *hw,list_add (&arvif->list, &ar->arvifs);spin_unlock_bh (&ar->data_lock); - param_id =WMI_VDEV_PARAM_TX_ENCAP_TYPE ; -if (ath11k_frame_mode ==ATH11K_HW_TXRX_ETHERNET ) -switch (vif->type) { -case NL80211_IFTYPE_STATION : -case NL80211_IFTYPE_AP_VLAN : -case NL80211_IFTYPE_AP : - hw_encap =1 ; -break ; -default : -break ; - } - -if (ieee80211_set_hw_80211_encap (vif, hw_encap)) - param_value =ATH11K_HW_TXRX_ETHERNET ; -else - param_value =ATH11K_HW_TXRX_NATIVE_WIFI ; - - ret =ath11k_wmi_vdev_set_param_cmd (ar, arvif->vdev_id, - param_id, param_value); -if (ret) { -ath11k_warn (ab,"failed to set vdev %d tx encap mode: %d\n" , - arvif->vdev_id, ret); - goto err_vdev_del; - } +ath11k_mac_op_update_vif_offload (hw, vif); nss =get_num_chains (ar->cfg_tx_chainmask) ? :1 ; ret = ath11k_wmi_vdev_set_param_cmd(ar, arvif->vdev_id,
@@ -5753,6 +5758,7 @@ static const struct ieee80211_ops ath11k_ops = { .reconfig_complete = ath11k_mac_op_reconfig_complete, .add_interface = ath11k_mac_op_add_interface, .remove_interface = ath11k_mac_op_remove_interface, + .update_vif_offload = ath11k_mac_op_update_vif_offload, .config = ath11k_mac_op_config, .bss_info_changed = ath11k_mac_op_bss_info_changed, .configure_filter = ath11k_mac_op_configure_filter,
@@ -6034,6 +6040,7 @@ static int __ath11k_mac_register(struct ath11k *ar)ieee80211_hw_set (ar->hw,QUEUE_CONTROL );ieee80211_hw_set (ar->hw,SUPPORTS_TX_FRAG );ieee80211_hw_set (ar->hw,REPORTS_LOW_ACK ); +ieee80211_hw_set (ar->hw,SUPPORTS_TX_ENCAP_OFFLOAD );if (ht_cap &WMI_HT_CAP_ENABLED ) {ieee80211_hw_set (ar->hw,AMPDU_AGGREGATION );ieee80211_hw_set (ar->hw,TX_AMPDU_SETUP_IN_HW );
include/net/mac80211.h +29 -0
@@ -1606,6 +1606,21 @@ enum ieee80211_vif_flags { IEEE80211_VIF_GET_NOA_UPDATE = BIT(3), }; + +/** +* enum ieee80211_offload_flags - virtual interface offload flags +* +* @IEEE80211_OFFLOAD_ENCAP_ENABLED: tx encapsulation offload is enabled +* The driver supports sending frames passed as 802.3 frames by mac80211. +* It must also support sending 802.11 packets for the same interface. +* @IEEE80211_OFFLOAD_ENCAP_4ADDR: support 4-address mode encapsulation offload +*/ + +enum ieee80211_offload_flags { +IEEE80211_OFFLOAD_ENCAP_ENABLED =BIT (0 ), +IEEE80211_OFFLOAD_ENCAP_4ADDR =BIT (1 ), +}; +/** * struct ieee80211_vif - per-interface data *
@@ -1626,6 +1641,11 @@ enum ieee80211_vif_flags {* these need to be set (or cleared) when the interface is added * or, if supported by the driver, the interface type is changed * at runtime, mac80211 will never touch this field +* @offloaad_flags: hardware offload capabilities/flags for this interface. +* These are initialized by mac80211 before calling .add_interface, +* .change_interface or .update_vif_offload and updated by the driver +* within these ops, based on supported features or runtime change +* restrictions. * @hw_queue: hardware queue for each AC * @cab_queue: content-after-beacon (DTIM beacon really) queue, AP mode only * @chanctx_conf: The channel context this interface is assigned to, or %NULL
@@ -1662,6 +1682,7 @@ struct ieee80211_vif {struct ieee80211_chanctx_conf __rcu *chanctx_conf;u32 driver_flags; +u32 offload_flags;#ifdef CONFIG_MAC80211_DEBUGFS struct dentry *debugfs_dir;
@@ -2328,6 +2349,9 @@ struct ieee80211_txq {* aggregating MPDUs with the same keyid, allowing mac80211 to keep Tx * A-MPDU sessions active while rekeying with Extended Key ID. * +* @IEEE80211_HW_SUPPORTS_TX_ENCAP_OFFLOAD: Hardware supports tx encapsulation +* offload +* * @NUM_IEEE80211_HW_FLAGS: number of hardware flags, used for sizing arrays */ enum ieee80211_hw_flags {
@@ -2380,6 +2404,7 @@ enum ieee80211_hw_flags {IEEE80211_HW_SUPPORTS_MULTI_BSSID ,IEEE80211_HW_SUPPORTS_ONLY_HE_MULTI_BSSID ,IEEE80211_HW_AMPDU_KEYBORDER_SUPPORT , +IEEE80211_HW_SUPPORTS_TX_ENCAP_OFFLOAD ,/* keep last, obviously */ NUM_IEEE80211_HW_FLAGS
@@ -3814,6 +3839,8 @@ enum ieee80211_reconfig_type {* @set_tid_config: Apply TID specific configurations. This callback may sleep. * @reset_tid_config: Reset TID specific configuration for the peer. * This callback may sleep. +* @update_vif_config: Update virtual interface offload flags +* This callback may sleep. */ struct ieee80211_ops { void (*tx)(struct ieee80211_hw *hw,
@@ -4125,6 +4152,8 @@ struct ieee80211_ops {int (*reset_tid_config)(struct ieee80211_hw *hw,struct ieee80211_vif *vif,struct ieee80211_sta *sta,u8 tids); +void (*update_vif_offload)(struct ieee80211_hw *hw, +struct ieee80211_vif *vif); };/**
net/mac80211/cfg.c +5 -0
@@ -504,6 +504,7 @@ static int ieee80211_del_key(struct wiphy *wiphy, struct net_device *dev,struct ieee80211_local *local = sdata->local;struct sta_info *sta;struct ieee80211_key *key =NULL ; +bool recalc_offload = false;int ret;mutex_lock (&local->sta_mtx);
@@ -528,6 +529,7 @@ static int ieee80211_del_key(struct wiphy *wiphy, struct net_device *dev, goto out_unlock; } + recalc_offload = key->conf.cipher ==WLAN_CIPHER_SUITE_TKIP ;ieee80211_key_free (key, sdata->vif.type ==NL80211_IFTYPE_STATION ); ret =0 ;
@@ -535,6 +537,9 @@ static int ieee80211_del_key(struct wiphy *wiphy, struct net_device *dev,mutex_unlock (&local->key_mtx);mutex_unlock (&local->sta_mtx); +if (recalc_offload) +ieee80211_recalc_offload (local); +return ret; }
net/mac80211/debugfs.c +1 -0
@@ -408,6 +408,7 @@ static const char *hw_flag_names[] = {FLAG (SUPPORTS_MULTI_BSSID ),FLAG (SUPPORTS_ONLY_HE_MULTI_BSSID ),FLAG (AMPDU_KEYBORDER_SUPPORT ), +FLAG (SUPPORTS_TX_ENCAP_OFFLOAD ), #undef FLAG };
net/mac80211/driver-ops.h +15 -0
@@ -1384,4 +1384,19 @@ static inline int drv_reset_tid_config(struct ieee80211_local *local, return ret; } + +static inline void drv_update_vif_offload (struct ieee80211_local *local, +struct ieee80211_sub_if_data *sdata) +{ +might_sleep (); +check_sdata_in_driver (sdata); + +if (!local->ops->update_vif_offload) +return ; + +trace_drv_update_vif_offload (local, sdata); + local->ops->update_vif_offload (&local->hw, &sdata->vif); +trace_drv_return_void (local); +} +#endif /* __MAC80211_DRIVER_OPS */
net/mac80211/ieee80211_i.h +1 -2
@@ -989,8 +989,6 @@ struct ieee80211_sub_if_data { } debugfs;#endif -bool hw_80211_encap; -/* must be last, dynamically sized area in this! */ struct ieee80211_vif vif; };
@@ -1767,6 +1765,7 @@ void ieee80211_del_virtual_monitor(struct ieee80211_local *local);bool __ieee80211_recalc_txpower (struct ieee80211_sub_if_data *sdata);void ieee80211_recalc_txpower (struct ieee80211_sub_if_data *sdata,bool update_bss); +void ieee80211_recalc_offload (struct ieee80211_local *local);static inline bool ieee80211_sdata_running (struct ieee80211_sub_if_data *sdata) {
net/mac80211/iface.c +146 -56
266 lines not on this page · raw message
net/mac80211/key.c +8 -15
@@ -177,13 +177,6 @@ static int ieee80211_key_enable_hw_accel(struct ieee80211_key *key) } } -/* TKIP countermeasures don't work in encap offload mode */ -if (key->conf.cipher ==WLAN_CIPHER_SUITE_TKIP && - sdata->hw_80211_encap) { -sdata_dbg (sdata,"TKIP is not allowed in hw 80211 encap mode\n" ); -return -EINVAL ; - } - ret =drv_set_key (key->local,SET_KEY , sdata, sta ? &sta->sta :NULL , &key->conf);
@@ -219,14 +212,6 @@ static int ieee80211_key_enable_hw_accel(struct ieee80211_key *key)case WLAN_CIPHER_SUITE_CCMP_256 :case WLAN_CIPHER_SUITE_GCMP :case WLAN_CIPHER_SUITE_GCMP_256 : -/* We cannot do software crypto of data frames with -* encapsulation offload enabled. However for 802.11w to -* function properly we need cmac/gmac keys. -*/ -if (sdata->hw_80211_encap) -return -EINVAL ; - fallthrough; -case WLAN_CIPHER_SUITE_AES_CMAC :case WLAN_CIPHER_SUITE_BIP_CMAC_256 :case WLAN_CIPHER_SUITE_BIP_GMAC_128 :
@@ -824,6 +809,7 @@ int ieee80211_key_link(struct ieee80211_key *key,*/ bool delay_tailroom = sdata->vif.type ==NL80211_IFTYPE_STATION ;int ret = -EOPNOTSUPP ; +bool recalc_offload = false;mutex_lock (&sdata->local->key_mtx);
@@ -864,11 +850,15 @@ int ieee80211_key_link(struct ieee80211_key *key, key->local = sdata->local; key->sdata = sdata; key->sta = sta; + recalc_offload = !old_key && key->conf.cipher ==WLAN_CIPHER_SUITE_TKIP ;increment_tailroom_need_count (sdata); ret =ieee80211_key_replace (sdata, sta, pairwise, old_key, key); +if (!(key->flags &KEY_FLAG_UPLOADED_TO_HARDWARE )) + recalc_offload = true; +if (!ret) {ieee80211_debugfs_key_add (key);ieee80211_key_destroy (old_key, delay_tailroom);
@@ -879,6 +869,9 @@ int ieee80211_key_link(struct ieee80211_key *key, out:mutex_unlock (&sdata->local->key_mtx); +if (recalc_offload) +ieee80211_recalc_offload (sdata->local); +return ret; }
net/mac80211/trace.h +6 -0
@@ -2734,6 +2734,12 @@ TRACE_EVENT(drv_get_ftm_responder_stats, ) ); +DEFINE_EVENT (local_sdata_addr_evt, drv_update_vif_offload, + TP_PROTO(struct ieee80211_local *local, + struct ieee80211_sub_if_data *sdata), +TP_ARGS (local, sdata) +); +#endif /* !__MAC80211_DRIVER_TRACE || TRACE_HEADER_MULTI_READ */ #undef TRACE_INCLUDE_PATH
net/mac80211/tx.c +0 -5
@@ -4273,11 +4273,6 @@ netdev_tx_t ieee80211_subif_start_xmit_8023(struct sk_buff *skb,struct ieee80211_sub_if_data *sdata =IEEE80211_DEV_TO_SUB_IF (dev);struct sta_info *sta; -if (WARN_ON (!sdata->hw_80211_encap)) { -kfree_skb (skb); -return NETDEV_TX_OK ; - } -if (unlikely (skb->len <ETH_HLEN )) {kfree_skb (skb);return NETDEV_TX_OK ;
Signature · 1 line
2.28.0
PATCH v2 2/13 mac80211: reduce duplication in tx status functions
In reply to Felix FietkauMove redundant functionality from __ieee80211_tx_status into ieee80211_tx_status_ext. Preparation for unifying with the 802.3 tx status codepath.
--- net/mac80211/status.c | 101 +++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 66 deletions(-)
net/mac80211/status.c +35 -66
@@ -184,18 +184,6 @@ static void ieee80211_frame_acked(struct sta_info *sta, struct sk_buff *skb)struct ieee80211_mgmt *mgmt = (void *) skb->data;struct ieee80211_local *local = sta->local;struct ieee80211_sub_if_data *sdata = sta->sdata; -struct ieee80211_tx_info *txinfo =IEEE80211_SKB_CB (skb); - -if (ieee80211_hw_check (&local->hw,REPORTS_TX_ACK_STATUS )) { - sta->status_stats.last_ack = jiffies; -if (txinfo->status.is_valid_ack_signal) { - sta->status_stats.last_ack_signal = - (s8 )txinfo->status.ack_signal; - sta->status_stats.ack_signal_filled = true; -ewma_avg_signal_add (&sta->status_stats.avg_ack_signal, - -txinfo->status.ack_signal); - } - }if (ieee80211_is_data_qos (mgmt->frame_control)) {struct ieee80211_hdr *hdr = (void *) skb->data;
@@ -890,7 +878,8 @@ void ieee80211_tx_monitor(struct ieee80211_local *local, struct sk_buff *skb, }static void __ieee80211_tx_status (struct ieee80211_hw *hw, -struct ieee80211_tx_status *status) +struct ieee80211_tx_status *status, +int rates_idx,int retry_count) {struct sk_buff *skb = status->skb;struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
@@ -899,8 +888,6 @@ static void __ieee80211_tx_status(struct ieee80211_hw *hw,struct sta_info *sta;__le16 fc;struct ieee80211_supported_band *sband; -int retry_count; -int rates_idx;bool send_to_cooked;bool acked;bool noack_success;
@@ -909,8 +896,6 @@ static void __ieee80211_tx_status(struct ieee80211_hw *hw,int tid =IEEE80211_NUM_TIDS ;u16 tx_time_est; - rates_idx =ieee80211_tx_get_rates (hw, info, &retry_count); - sband = local->hw.wiphy->bands[info->band]; fc = hdr->frame_control;
@@ -987,24 +972,14 @@ static void __ieee80211_tx_status(struct ieee80211_hw *hw,if (info->flags &IEEE80211_TX_STAT_TX_FILTERED ) {ieee80211_handle_filtered_frame (local, sta, skb);return ; - }else { + }else if (ieee80211_is_data_present (fc)) {if (!acked && !noack_success) - sta->status_stats.retry_failed++; - sta->status_stats.retry_count += retry_count; + sta->status_stats.msdu_failed[tid]++; -if (ieee80211_is_data_present (fc)) { -if (!acked && !noack_success) - sta->status_stats.msdu_failed[tid]++; - - sta->status_stats.msdu_retries[tid] += - retry_count; - } + sta->status_stats.msdu_retries[tid] += + retry_count; } -rate_control_tx_status (local, sband, status); -if (ieee80211_vif_is_mesh (&sta->sdata->vif)) -ieee80211s_update_metric (local, sta, status); -if (!(info->flags &IEEE80211_TX_CTL_INJECTED ) && acked)ieee80211_frame_acked (sta, skb);
@@ -1029,20 +1004,6 @@ static void __ieee80211_tx_status(struct ieee80211_hw *hw, true);ieee80211_info_set_tx_time_est (info,0 ); } - -if (ieee80211_hw_check (&local->hw,REPORTS_TX_ACK_STATUS )) { -if (acked) { -if (sta->status_stats.lost_packets) - sta->status_stats.lost_packets =0 ; - -/* Track when last TDLS packet was ACKed */ - sta->status_stats.last_pkt_time = jiffies; - }else if (noack_success) { -/* nothing to do here, do not account as lost */ - }else { -ieee80211_lost_packet (sta, info); - } - } }/* SNMP counters
@@ -1126,7 +1087,7 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)if (sta) status.sta = &sta->sta; -__ieee80211_tx_status (hw, &status); +ieee80211_tx_status_ext (hw, &status);rcu_read_unlock (); }EXPORT_SYMBOL (ieee80211_tx_status);
@@ -1138,16 +1099,10 @@ void ieee80211_tx_status_ext(struct ieee80211_hw *hw,struct ieee80211_tx_info *info = status->info;struct ieee80211_sta *pubsta = status->sta;struct ieee80211_supported_band *sband; -int retry_count; +int rates_idx, retry_count;bool acked, noack_success; -if (status->skb) -return __ieee80211_tx_status (hw, status); - -if (!status->sta) -return ; - -ieee80211_tx_get_rates (hw, info, &retry_count); + rates_idx =ieee80211_tx_get_rates (hw, info, &retry_count); sband = hw->wiphy->bands[info->band];
@@ -1163,20 +1118,30 @@ void ieee80211_tx_status_ext(struct ieee80211_hw *hw, sta->status_stats.retry_failed++; sta->status_stats.retry_count += retry_count; -if (acked) { - sta->status_stats.last_ack = jiffies; +if (ieee80211_hw_check (&local->hw,REPORTS_TX_ACK_STATUS )) { +if (acked) { + sta->status_stats.last_ack = jiffies; -if (sta->status_stats.lost_packets) - sta->status_stats.lost_packets =0 ; +if (sta->status_stats.lost_packets) + sta->status_stats.lost_packets =0 ; -/* Track when last packet was ACKed */ - sta->status_stats.last_pkt_time = jiffies; - }else if (test_sta_flag (sta,WLAN_STA_PS_STA )) { -return ; - }else if (noack_success) { -/* nothing to do here, do not account as lost */ - }else { -ieee80211_lost_packet (sta, info); +/* Track when last packet was ACKed */ + sta->status_stats.last_pkt_time = jiffies; + +if (info->status.is_valid_ack_signal) { + sta->status_stats.last_ack_signal = + (s8 )info->status.ack_signal; + sta->status_stats.ack_signal_filled = true; +ewma_avg_signal_add (&sta->status_stats.avg_ack_signal, + -info->status.ack_signal); + } + }else if (test_sta_flag (sta,WLAN_STA_PS_STA )) { +return ; + }else if (noack_success) { +/* nothing to do here, do not account as lost */ + }else { +ieee80211_lost_packet (sta, info); + } }rate_control_tx_status (local, sband, status);
@@ -1184,6 +1149,10 @@ void ieee80211_tx_status_ext(struct ieee80211_hw *hw,ieee80211s_update_metric (local, sta, status); } +if (status->skb) +return __ieee80211_tx_status (hw, status, rates_idx, + retry_count); +if (acked || noack_success) {I802_DEBUG_INC (local->dot11TransmittedFrameCount);if (!pubsta)
Signature · 1 line
2.28.0
PATCH v2 3/13 mac80211: remove tx status call to ieee80211_sta_register_airtime
In reply to Felix FietkauAll drivers using airtime fairness are calling ieee80211_sta_register_airtime directly
--- net/mac80211/status.c | 6 ------ 1 file changed, 6 deletions(-)
net/mac80211/status.c +0 -6
@@ -988,12 +988,6 @@ static void __ieee80211_tx_status(struct ieee80211_hw *hw,ieee80211_sta_tx_notify (sta->sdata, (void *) skb->data, acked, info->status.tx_time); -if (info->status.tx_time && -wiphy_ext_feature_isset (local->hw.wiphy, -NL80211_EXT_FEATURE_AIRTIME_FAIRNESS )) -ieee80211_sta_register_airtime (&sta->sta, tid, - info->status.tx_time,0 ); -if ((tx_time_est =ieee80211_info_get_tx_time_est (info)) >0 ) {/* Do this here to avoid the expensive lookup of the sta * in ieee80211_report_used_skb().
Signature · 1 line
2.28.0
PATCH v2 4/13 mac80211: optimize station connection monitor
In reply to Felix FietkauCalling mod_timer for every rx/tx packet can be quite expensive. Instead of constantly updating the timer, we can simply let it run out and check the timestamp of the last ACK or rx packet to re-arm it.
--- net/mac80211/ieee80211_i.h | 2 -- net/mac80211/mlme.c | 53 ++++++++++++++++---------------------- net/mac80211/rx.c | 9 ------- net/mac80211/sta_info.h | 2 -- net/mac80211/status.c | 3 --- 5 files changed, 22 insertions(+), 47 deletions(-)
net/mac80211/ieee80211_i.h +0 -2
@@ -2039,8 +2039,6 @@ void ieee80211_dynamic_ps_timer(struct timer_list *t);void ieee80211_send_nullfunc (struct ieee80211_local *local,struct ieee80211_sub_if_data *sdata,bool powersave); -void ieee80211_sta_rx_notify (struct ieee80211_sub_if_data *sdata, -struct ieee80211_hdr *hdr);void ieee80211_sta_tx_notify (struct ieee80211_sub_if_data *sdata,struct ieee80211_hdr *hdr,bool ack,u16 tx_time);
net/mac80211/mlme.c +22 -31
84 lines not on this page · raw message
net/mac80211/rx.c +0 -9
@@ -1811,9 +1811,6 @@ ieee80211_rx_h_sta_process(struct ieee80211_rx_data *rx) sta->rx_stats.last_rate =sta_stats_encode_rate (status); } -if (rx->sdata->vif.type ==NL80211_IFTYPE_STATION ) -ieee80211_sta_rx_notify (rx->sdata, hdr); - sta->rx_stats.fragments++;u64_stats_update_begin (&rx->sta->rx_stats.syncp);
@@ -4148,7 +4145,6 @@ void ieee80211_check_fast_rx(struct sta_info *sta) fastrx.sa_offs = offsetof(struct ieee80211_hdr , addr2); fastrx.expected_ds_bits =0 ; }else { - fastrx.sta_notify = sdata->u.mgd.probe_send_count >0 ; fastrx.da_offs = offsetof(struct ieee80211_hdr , addr1); fastrx.sa_offs = offsetof(struct ieee80211_hdr , addr3); fastrx.expected_ds_bits =
@@ -4378,11 +4374,6 @@ static bool ieee80211_invoke_fast_rx(struct ieee80211_rx_data *rx, pskb_trim(skb, skb->len - fast_rx->icv_len)) goto drop; -if (unlikely (fast_rx->sta_notify)) { -ieee80211_sta_rx_notify (rx->sdata, hdr); - fast_rx->sta_notify = false; - } -/* statistics part of ieee80211_rx_h_sta_process() */ if (!(status->flag &RX_FLAG_NO_SIGNAL_VAL )) { stats->last_signal = status->signal;
net/mac80211/sta_info.h +0 -2
@@ -336,7 +336,6 @@ struct ieee80211_fast_tx {* @expected_ds_bits: from/to DS bits expected * @icv_len: length of the MIC if present * @key: bool indicating encryption is expected (key is set) -* @sta_notify: notify the MLME code (once) * @internal_forward: forward froms internally on AP/VLAN type interfaces * @uses_rss: copy of USES_RSS hw flag * @da_offs: offset of the DA in the header (for header conversion)
@@ -352,7 +351,6 @@ struct ieee80211_fast_rx {__le16 expected_ds_bits;u8 icv_len; u8 key:1, - sta_notify:1, internal_forward:1, uses_rss:1;u8 da_offs, sa_offs;
net/mac80211/status.c +0 -3
@@ -1214,9 +1214,6 @@ void ieee80211_tx_status_8023(struct ieee80211_hw *hw, sta->status_stats.retry_count += retry_count;if (ieee80211_hw_check (hw,REPORTS_TX_ACK_STATUS )) { -if (acked && vif->type ==NL80211_IFTYPE_STATION ) -ieee80211_sta_reset_conn_monitor (sdata); - sta->status_stats.last_ack = jiffies;if (info->flags &IEEE80211_TX_STAT_ACK ) {if (sta->status_stats.lost_packets)
Signature · 1 line
2.28.0
PATCH v2 5/13 mac80211: swap NEED_TXPROCESSING and HW_80211_ENCAP tx flags
In reply to Felix FietkauIn order to unify the tx status path, the hw 802.11 encapsulation flag needs to survive the trip to the tx status call.
Since we don't have any free bits in info->flags, we need to move one. IEEE80211_TX_INTFL_NEED_TXPROCESSING is only used internally in mac80211, and only before the call into the driver.
--- drivers/net/wireless/ath/ath11k/dp_tx.c | 4 ++-- drivers/net/wireless/ath/ath11k/mac.c | 4 ++-- include/net/mac80211.h | 14 +++++++------- net/mac80211/mesh_hwmp.c | 4 ++-- net/mac80211/mesh_ps.c | 2 +- net/mac80211/rx.c | 2 +- net/mac80211/status.c | 4 ++-- net/mac80211/tx.c | 16 ++++++++-------- 8 files changed, 25 insertions(+), 25 deletions(-)
drivers/net/wireless/ath/ath11k/dp_tx.c +2 -2
@@ -14,7 +14,7 @@ ath11k_dp_tx_get_encap_type(struct ath11k_vif *arvif, struct sk_buff *skb) {struct ieee80211_tx_info *tx_info =IEEE80211_SKB_CB (skb); -if (tx_info->control.flags &IEEE80211_TX_CTRL_HW_80211_ENCAP ) +if (tx_info->flags &IEEE80211_TX_CTL_HW_80211_ENCAP )return HAL_TCL_ENCAP_TYPE_ETHERNET ;return HAL_TCL_ENCAP_TYPE_NATIVE_WIFI ;
@@ -93,7 +93,7 @@ int ath11k_dp_tx(struct ath11k *ar, struct ath11k_vif *arvif,if (test_bit (ATH11K_FLAG_CRASH_FLUSH , &ar->ab->dev_flags))return -ESHUTDOWN ; -if (!(info->control.flags &IEEE80211_TX_CTRL_HW_80211_ENCAP ) && +if (!(info->flags &IEEE80211_TX_CTL_HW_80211_ENCAP ) && !ieee80211_is_data (hdr->frame_control))return -ENOTSUPP ;
drivers/net/wireless/ath/ath11k/mac.c +2 -2
@@ -3898,7 +3898,7 @@ static int ath11k_mac_mgmt_tx_wmi(struct ath11k *ar, struct ath11k_vif *arvif,return -ENOSPC ; info =IEEE80211_SKB_CB (skb); -if (!(info->control.flags &IEEE80211_TX_CTRL_HW_80211_ENCAP )) { +if (!(info->flags &IEEE80211_TX_CTL_HW_80211_ENCAP )) { if ((ieee80211_is_action(hdr->frame_control) || ieee80211_is_deauth(hdr->frame_control) || ieee80211_is_disassoc(hdr->frame_control)) &&
@@ -4025,7 +4025,7 @@ static void ath11k_mac_op_tx(struct ieee80211_hw *hw,bool is_prb_rsp;int ret; -if (info->control.flags &IEEE80211_TX_CTRL_HW_80211_ENCAP ) { +if (info->flags &IEEE80211_TX_CTL_HW_80211_ENCAP ) { skb_cb->flags |=ATH11K_SKB_HW_80211_ENCAP ; }else if (ieee80211_is_mgmt (hdr->frame_control)) { is_prb_rsp =ieee80211_is_probe_resp (hdr->frame_control);
include/net/mac80211.h +7 -7
@@ -720,9 +720,8 @@ struct ieee80211_bss_conf {* @IEEE80211_TX_INTFL_OFFCHAN_TX_OK: Internal to mac80211. Used to indicate * that a frame can be transmitted while the queues are stopped for * off-channel operation. -* @IEEE80211_TX_INTFL_NEED_TXPROCESSING: completely internal to mac80211, -* used to indicate that a pending frame requires TX processing before -* it can be sent out. +* @IEEE80211_TX_CTL_HW_80211_ENCAP: This frame uses hardware encapsulation +* (header conversion) * @IEEE80211_TX_INTFL_RETRIED: completely internal to mac80211, * used to indicate that a frame was already retried due to PS * @IEEE80211_TX_INTFL_DONT_ENCRYPT: completely internal to mac80211,
@@ -791,7 +790,7 @@ enum mac80211_tx_info_flags {IEEE80211_TX_STAT_AMPDU_NO_BACK =BIT (11 ),IEEE80211_TX_CTL_RATE_CTRL_PROBE =BIT (12 ),IEEE80211_TX_INTFL_OFFCHAN_TX_OK =BIT (13 ), -IEEE80211_TX_INTFL_NEED_TXPROCESSING =BIT (14 ), +IEEE80211_TX_CTL_HW_80211_ENCAP =BIT (14 ),IEEE80211_TX_INTFL_RETRIED =BIT (15 ),IEEE80211_TX_INTFL_DONT_ENCRYPT =BIT (16 ), IEEE80211_TX_CTL_NO_PS_BUFFER = BIT(17),
@@ -823,8 +822,9 @@ enum mac80211_tx_info_flags {* @IEEE80211_TX_CTRL_AMSDU: This frame is an A-MSDU frame * @IEEE80211_TX_CTRL_FAST_XMIT: This frame is going through the fast_xmit path * @IEEE80211_TX_CTRL_SKIP_MPATH_LOOKUP: This frame skips mesh path lookup -* @IEEE80211_TX_CTRL_HW_80211_ENCAP: This frame uses hardware encapsulation -* (header conversion) +* @IEEE80211_TX_INTCFL_NEED_TXPROCESSING: completely internal to mac80211, +* used to indicate that a pending frame requires TX processing before +* it can be sent out. * @IEEE80211_TX_CTRL_NO_SEQNO: Do not overwrite the sequence number that * has already been assigned to this frame. *
@@ -837,7 +837,7 @@ enum mac80211_tx_control_flags {IEEE80211_TX_CTRL_AMSDU =BIT (3 ),IEEE80211_TX_CTRL_FAST_XMIT =BIT (4 ),IEEE80211_TX_CTRL_SKIP_MPATH_LOOKUP =BIT (5 ), -IEEE80211_TX_CTRL_HW_80211_ENCAP =BIT (6 ), +IEEE80211_TX_INTCFL_NEED_TXPROCESSING =BIT (6 ), IEEE80211_TX_CTRL_NO_SEQNO = BIT(7), };
net/mac80211/mesh_hwmp.c +2 -2
@@ -212,7 +212,7 @@ static void prepare_frame_for_deferred_tx(struct ieee80211_sub_if_data *sdata, skb->priority =7 ; info->control.vif = &sdata->vif; - info->flags |=IEEE80211_TX_INTFL_NEED_TXPROCESSING ; + info->control.flags |=IEEE80211_TX_INTCFL_NEED_TXPROCESSING ;ieee80211_set_qos_hdr (sdata, skb);ieee80211_mps_set_frame_flags (sdata,NULL , hdr); }
@@ -1163,7 +1163,7 @@ int mesh_nexthop_resolve(struct ieee80211_sub_if_data *sdata,if (skb_queue_len (&mpath->frame_queue) >=MESH_FRAME_QUEUE_LEN ) skb_to_free =skb_dequeue (&mpath->frame_queue); - info->flags |=IEEE80211_TX_INTFL_NEED_TXPROCESSING ; + info->control.flags |=IEEE80211_TX_INTCFL_NEED_TXPROCESSING ;ieee80211_set_qos_hdr (sdata, skb);skb_queue_tail (&mpath->frame_queue, skb);if (skb_to_free)
net/mac80211/mesh_ps.c +1 -1
@@ -432,7 +432,7 @@ static void mpsp_qos_null_append(struct sta_info *sta, info =IEEE80211_SKB_CB (new_skb); info->control.vif = &sdata->vif; - info->flags |=IEEE80211_TX_INTFL_NEED_TXPROCESSING ; + info->control.flags |=IEEE80211_TX_INTCFL_NEED_TXPROCESSING ;__skb_queue_tail (frames, new_skb); }
net/mac80211/rx.c +1 -1
@@ -2896,7 +2896,7 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx) fwd_hdr->frame_control &= ~cpu_to_le16 (IEEE80211_FCTL_RETRY ); info =IEEE80211_SKB_CB (fwd_skb);memset (info,0 ,sizeof (*info)); - info->flags |=IEEE80211_TX_INTFL_NEED_TXPROCESSING ; + info->control.flags |=IEEE80211_TX_INTCFL_NEED_TXPROCESSING ; info->control.vif = &rx->sdata->vif; info->control.jiffies = jiffies;if (is_multicast_ether_addr (fwd_hdr->addr1)) {
net/mac80211/status.c +2 -2
@@ -66,8 +66,8 @@ static void ieee80211_handle_filtered_frame(struct ieee80211_local *local, info->control.jiffies = jiffies; info->control.vif = &sta->sdata->vif; - info->flags |=IEEE80211_TX_INTFL_NEED_TXPROCESSING | -IEEE80211_TX_INTFL_RETRANSMISSION ; + info->control.flags |=IEEE80211_TX_INTCFL_NEED_TXPROCESSING ; + info->flags |=IEEE80211_TX_INTFL_RETRANSMISSION ; info->flags &= ~IEEE80211_TX_TEMPORARY_FLAGS ; sta->status_stats.filtered++;
net/mac80211/tx.c +8 -8
@@ -531,7 +531,7 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_tx_data *tx) info->control.jiffies = jiffies; info->control.vif = &tx->sdata->vif; - info->flags |=IEEE80211_TX_INTFL_NEED_TXPROCESSING ; + info->control.flags |=IEEE80211_TX_INTCFL_NEED_TXPROCESSING ; info->flags &= ~IEEE80211_TX_TEMPORARY_FLAGS ;skb_queue_tail (&sta->ps_tx_buf[ac], tx->skb);spin_unlock (&sta->ps_lock);
@@ -1134,7 +1134,7 @@ static bool ieee80211_tx_prep_agg(struct ieee80211_tx_data *tx, tx->sta->sta.addr, tx->sta->sta.aid); } info->control.vif = &tx->sdata->vif; - info->flags |=IEEE80211_TX_INTFL_NEED_TXPROCESSING ; + info->control.flags |=IEEE80211_TX_INTCFL_NEED_TXPROCESSING ; info->flags &= ~IEEE80211_TX_TEMPORARY_FLAGS ;__skb_queue_tail (&tid_tx->pending, skb);if (skb_queue_len (&tid_tx->pending) >STA_MAX_TX_BUFFER )
@@ -1179,7 +1179,7 @@ ieee80211_tx_prepare(struct ieee80211_sub_if_data *sdata,* we are doing the needed processing, so remove the flag * now. */ - info->flags &= ~IEEE80211_TX_INTFL_NEED_TXPROCESSING ; + info->control.flags &= ~IEEE80211_TX_INTCFL_NEED_TXPROCESSING ; hdr = (struct ieee80211_hdr *) skb->data;
@@ -1258,7 +1258,7 @@ static struct txq_info *ieee80211_get_txq(struct ieee80211_local *local, (info->control.flags & IEEE80211_TX_CTRL_PS_RESPONSE))return NULL ; -if (!(info->control.flags &IEEE80211_TX_CTRL_HW_80211_ENCAP ) && +if (!(info->flags &IEEE80211_TX_CTL_HW_80211_ENCAP ) &&unlikely (!ieee80211_is_data_present (hdr->frame_control))) { if ((!ieee80211_is_mgmt(hdr->frame_control) || ieee80211_is_bufferable_mmpdu(hdr->frame_control) ||
@@ -3649,7 +3649,7 @@ struct sk_buff *ieee80211_tx_dequeue(struct ieee80211_hw *hw,else info->flags &= ~IEEE80211_TX_CTL_AMPDU ; -if (info->control.flags &IEEE80211_TX_CTRL_HW_80211_ENCAP ) +if (info->flags &IEEE80211_TX_CTL_HW_80211_ENCAP ) goto encap_out;if (info->control.flags &IEEE80211_TX_CTRL_FAST_XMIT ) {
@@ -4256,7 +4256,7 @@ static void ieee80211_8023_xmit(struct ieee80211_sub_if_data *sdata, sdata =container_of (sdata->bss, struct ieee80211_sub_if_data, u.ap); - info->control.flags |=IEEE80211_TX_CTRL_HW_80211_ENCAP ; + info->flags |=IEEE80211_TX_CTL_HW_80211_ENCAP ; info->control.vif = &sdata->vif;ieee80211_tx_8023 (sdata, skb, skb->len, sta, false);
@@ -4360,7 +4360,7 @@ static bool ieee80211_tx_pending_skb(struct ieee80211_local *local, sdata =vif_to_sdata (info->control.vif); -if (info->flags &IEEE80211_TX_INTFL_NEED_TXPROCESSING ) { +if (info->control.flags &IEEE80211_TX_INTCFL_NEED_TXPROCESSING ) { chanctx_conf =rcu_dereference (sdata->vif.chanctx_conf);if (unlikely (!chanctx_conf)) {dev_kfree_skb (skb);
@@ -4368,7 +4368,7 @@ static bool ieee80211_tx_pending_skb(struct ieee80211_local *local, } info->band = chanctx_conf->def.chan->band; result =ieee80211_tx (sdata,NULL , skb, true); - }else if (info->control.flags &IEEE80211_TX_CTRL_HW_80211_ENCAP ) { + }else if (info->flags &IEEE80211_TX_CTL_HW_80211_ENCAP ) {if (ieee80211_lookup_ra_sta (sdata, skb, &sta)) {dev_kfree_skb (skb);return true;
Signature · 1 line
2.28.0
PATCH v2 6/13 mac80211: unify 802.3 (offload) and 802.11 tx status codepath
In reply to Felix FietkauMake ieee80211_tx_status_8023 call ieee80211_tx_status_ext, similar to ieee80211_tx_status.
--- net/mac80211/status.c | 93 +++++++++++++------------------------------ 1 file changed, 28 insertions(+), 65 deletions(-)
net/mac80211/status.c +28 -65
@@ -894,7 +894,6 @@ static void __ieee80211_tx_status(struct ieee80211_hw *hw,struct ieee80211_bar *bar;int shift =0 ;int tid =IEEE80211_NUM_TIDS ; -u16 tx_time_est; sband = local->hw.wiphy->bands[info->band]; fc = hdr->frame_control;
@@ -987,17 +986,6 @@ static void __ieee80211_tx_status(struct ieee80211_hw *hw, ieee80211_hw_check(&local->hw, REPORTS_TX_ACK_STATUS))ieee80211_sta_tx_notify (sta->sdata, (void *) skb->data, acked, info->status.tx_time); - -if ((tx_time_est =ieee80211_info_get_tx_time_est (info)) >0 ) { -/* Do this here to avoid the expensive lookup of the sta -* in ieee80211_report_used_skb(). -*/ -ieee80211_sta_update_pending_airtime (local, sta, -skb_get_queue_mapping (skb), - tx_time_est, - true); -ieee80211_info_set_tx_time_est (info,0 ); - } }/* SNMP counters
@@ -1092,9 +1080,12 @@ void ieee80211_tx_status_ext(struct ieee80211_hw *hw,struct ieee80211_local *local =hw_to_local (hw);struct ieee80211_tx_info *info = status->info;struct ieee80211_sta *pubsta = status->sta; +struct sk_buff *skb = status->skb; +struct sta_info *sta =NULL ;struct ieee80211_supported_band *sband;int rates_idx, retry_count;bool acked, noack_success; +u16 tx_time_est; rates_idx =ieee80211_tx_get_rates (hw, info, &retry_count);
@@ -1104,8 +1095,6 @@ void ieee80211_tx_status_ext(struct ieee80211_hw *hw, noack_success = !!(info->flags &IEEE80211_TX_STAT_NOACK_TRANSMITTED );if (pubsta) { -struct sta_info *sta; - sta = container_of(pubsta, struct sta_info, sta);if (!acked && !noack_success)
@@ -1143,7 +1132,18 @@ void ieee80211_tx_status_ext(struct ieee80211_hw *hw,ieee80211s_update_metric (local, sta, status); } -if (status->skb) +if (skb && (tx_time_est =ieee80211_info_get_tx_time_est (info)) >0 ) { +/* Do this here to avoid the expensive lookup of the sta +* in ieee80211_report_used_skb(). +*/ +ieee80211_sta_update_pending_airtime (local, sta, +skb_get_queue_mapping (skb), + tx_time_est, + true); +ieee80211_info_set_tx_time_est (info,0 ); + } + +if (skb && !(info->flags &IEEE80211_TX_CTL_HW_80211_ENCAP ))return __ieee80211_tx_status (hw, status, rates_idx, retry_count);
@@ -1158,6 +1158,12 @@ void ieee80211_tx_status_ext(struct ieee80211_hw *hw, }else {I802_DEBUG_INC (local->dot11FailedCount); } + +if (!skb) +return ; + +ieee80211_report_used_skb (local, skb, false); +dev_kfree_skb (skb); }EXPORT_SYMBOL (ieee80211_tx_status_ext);
@@ -1184,66 +1190,23 @@ void ieee80211_tx_status_8023(struct ieee80211_hw *hw,struct ieee80211_vif *vif, struct sk_buff *skb) { - struct ieee80211_local *local = hw_to_local(hw); struct ieee80211_sub_if_data *sdata; -struct ieee80211_tx_info *info =IEEE80211_SKB_CB (skb); +struct ieee80211_tx_status status = { + .skb = skb, + .info =IEEE80211_SKB_CB (skb), + };struct sta_info *sta; -int retry_count; -int rates_idx; -bool acked; sdata =vif_to_sdata (vif); - acked = info->flags &IEEE80211_TX_STAT_ACK ; - rates_idx =ieee80211_tx_get_rates (hw, info, &retry_count); -rcu_read_lock (); -if (ieee80211_lookup_ra_sta (sdata, skb, &sta)) - goto counters_update; - -if (IS_ERR (sta)) - goto counters_update; - -if (!acked) - sta->status_stats.retry_failed++; - -if (rates_idx !=-1 ) - sta->tx_stats.last_rate = info->status.rates[rates_idx]; - - sta->status_stats.retry_count += retry_count; - -if (ieee80211_hw_check (hw,REPORTS_TX_ACK_STATUS )) { - sta->status_stats.last_ack = jiffies; -if (info->flags &IEEE80211_TX_STAT_ACK ) { -if (sta->status_stats.lost_packets) - sta->status_stats.lost_packets =0 ; +if (!ieee80211_lookup_ra_sta (sdata, skb, &sta) && !IS_ERR (sta)) + status.sta = &sta->sta; - sta->status_stats.last_pkt_time = jiffies; - }else { -ieee80211_lost_packet (sta, info); - } - } +ieee80211_tx_status_ext (hw, &status); -counters_update:rcu_read_unlock (); -ieee80211_led_tx (local); - -if (!(info->flags &IEEE80211_TX_STAT_ACK ) && - !(info->flags &IEEE80211_TX_STAT_NOACK_TRANSMITTED )) - goto skip_stats_update; - -I802_DEBUG_INC (local->dot11TransmittedFrameCount); -if (is_multicast_ether_addr (skb->data)) -I802_DEBUG_INC (local->dot11MulticastTransmittedFrameCount); -if (retry_count >0 ) -I802_DEBUG_INC (local->dot11RetryCount); -if (retry_count >1 ) -I802_DEBUG_INC (local->dot11MultipleRetryCount); - -skip_stats_update: -ieee80211_report_used_skb (local, skb, false); -dev_kfree_skb (skb); }EXPORT_SYMBOL (ieee80211_tx_status_8023);
Signature · 1 line
2.28.0
PATCH v2 7/13 mac80211: add missing queue/hash initialization to 802.3 xmit
In reply to Felix FietkauFixes AQL for encap-offloaded tx
--- net/mac80211/tx.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/mac80211/tx.c +6 -0
@@ -4209,6 +4209,12 @@ static void ieee80211_8023_xmit(struct ieee80211_sub_if_data *sdata,if (is_zero_ether_addr (ra)) goto out_free; +if (local->ops->wake_tx_queue) { +u16 queue =__ieee80211_select_queue (sdata, sta, skb); +skb_set_queue_mapping (skb, queue); +skb_get_hash (skb); + } + multicast =is_multicast_ether_addr (ra);if (sta)
Signature · 1 line
2.28.0
PATCH v2 8/13 mac80211: check and refresh aggregation session in encap offload tx
In reply to Felix FietkauUpdate the last_tx timestamp to avoid tearing down the aggregation session early. Fall back to the slow path if the session setup is still running
--- net/mac80211/tx.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
net/mac80211/tx.c +18 -0
@@ -4198,6 +4198,8 @@ static void ieee80211_8023_xmit(struct ieee80211_sub_if_data *sdata,bool authorized = false;bool multicast;unsigned char *ra = ehdr->h_dest; +struct tid_ampdu_tx *tid_tx; +u8 tid;if (IS_ERR (sta) || (sta && !sta->uploaded)) sta =NULL ;
@@ -4235,6 +4237,22 @@ static void ieee80211_8023_xmit(struct ieee80211_sub_if_data *sdata,memset (info,0 ,sizeof (*info)); +if (sta) { + tid = skb->priority &IEEE80211_QOS_CTL_TAG1D_MASK ; + tid_tx =rcu_dereference (sta->ampdu_mlme.tid_tx[tid]); +if (tid_tx) { +if (!test_bit (HT_AGG_STATE_OPERATIONAL , &tid_tx->state)) { +/* fall back to non-offload slow path */ +__ieee80211_subif_start_xmit (skb, dev,0 ,0 ,NULL ); +return ; + } + + info->flags |=IEEE80211_TX_CTL_AMPDU ; +if (tid_tx->timeout) + tid_tx->last_tx = jiffies; + } + } +if (unlikely (!multicast && skb->sk &&skb_shinfo (skb)->tx_flags &SKBTX_WIFI_STATUS )) info->ack_frame_id = ieee80211_store_ack_skb(local, skb,
Signature · 1 line
2.28.0
PATCH v2 9/13 mac80211: support using ieee80211_tx_status_ext to free skbs without status info
In reply to Felix FietkauFor encap-offloaded packets, ieee80211_free_txskb cannot be used, since it does not have the vif pointer.
Using ieee80211_tx_status_ext for this purpose has the advantage of being able avoid an extra station lookup for AQL
--- net/mac80211/status.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-)
net/mac80211/status.c +16 -11
@@ -1094,6 +1094,21 @@ void ieee80211_tx_status_ext(struct ieee80211_hw *hw, acked = !!(info->flags &IEEE80211_TX_STAT_ACK ); noack_success = !!(info->flags &IEEE80211_TX_STAT_NOACK_TRANSMITTED ); +if (skb && (tx_time_est = +ieee80211_info_get_tx_time_est (IEEE80211_SKB_CB (skb))) >0 ) { +/* Do this here to avoid the expensive lookup of the sta +* in ieee80211_report_used_skb(). +*/ +ieee80211_sta_update_pending_airtime (local, sta, +skb_get_queue_mapping (skb), + tx_time_est, + true); +ieee80211_info_set_tx_time_est (info,0 ); + } + +if (!status->info) + goto free; +if (pubsta) { sta = container_of(pubsta, struct sta_info, sta);
@@ -1132,17 +1147,6 @@ void ieee80211_tx_status_ext(struct ieee80211_hw *hw,ieee80211s_update_metric (local, sta, status); } -if (skb && (tx_time_est =ieee80211_info_get_tx_time_est (info)) >0 ) { -/* Do this here to avoid the expensive lookup of the sta -* in ieee80211_report_used_skb(). -*/ -ieee80211_sta_update_pending_airtime (local, sta, -skb_get_queue_mapping (skb), - tx_time_est, - true); -ieee80211_info_set_tx_time_est (info,0 ); - } -if (skb && !(info->flags &IEEE80211_TX_CTL_HW_80211_ENCAP ))return __ieee80211_tx_status (hw, status, rates_idx, retry_count);
@@ -1159,6 +1163,7 @@ void ieee80211_tx_status_ext(struct ieee80211_hw *hw,I802_DEBUG_INC (local->dot11FailedCount); } +free:if (!skb)return ;
Signature · 1 line
2.28.0
Re: [PATCH v2 09/13] mac80211: support using ieee80211_tx_status_ext to free skbs without status info
Quoted 6 lines · Felix Fietkau
For encap-offloaded packets,
ieee80211_free_txskbcannot be used, since it does not have the vif pointer.
Usingieee80211_tx_status_extfor this purpose has the advantage of being able avoid an extra station lookup for AQLSigned-off-by Felix Fietkau <[email protected]>
Sorry, sent the wrong version of this patch. Will send v3
- Felix
PATCH v2 10/13 mac80211: extend ieee80211_tx_status_ext to support bulk free
In reply to Felix FietkauStore processed skbs ready to be freed in a list so the driver bulk free them
--- include/net/mac80211.h | 2 ++ net/mac80211/status.c | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-)
include/net/mac80211.h +2 -0
@@ -1095,12 +1095,14 @@ ieee80211_info_get_tx_time_est(struct ieee80211_tx_info *info)* @info: Basic tx status information * @skb: Packet skb (can be NULL if not provided by the driver) * @rate: The TX rate that was used when sending the packet +* @free_list: list where processed skbs are stored to be free'd by the driver */ struct ieee80211_tx_status {struct ieee80211_sta *sta;struct ieee80211_tx_info *info;struct sk_buff *skb;struct rate_info *rate; +struct list_head *free_list; };/**
net/mac80211/status.c +8 -2
@@ -1044,7 +1044,10 @@ static void __ieee80211_tx_status(struct ieee80211_hw *hw,* with this test... */ if (!local->monitors && (!send_to_cooked || !local->cooked_mntrs)) { -dev_kfree_skb (skb); +if (status->free_list) +list_add_tail (&skb->list, status->free_list); +else +dev_kfree_skb (skb);return ; }
@@ -1168,7 +1171,10 @@ void ieee80211_tx_status_ext(struct ieee80211_hw *hw,return ;ieee80211_report_used_skb (local, skb, false); -dev_kfree_skb (skb); +if (status->free_list) +list_add_tail (&skb->list, status->free_list); +else +dev_kfree_skb (skb); }EXPORT_SYMBOL (ieee80211_tx_status_ext);
Signature · 1 line
2.28.0
PATCH v2 11/13 mac80211: notify the driver when a sta uses 4-address mode
In reply to Felix FietkauThis is needed for encapsulation offload of 4-address mode packets
--- include/net/mac80211.h | 4 ++++ net/mac80211/cfg.c | 1 + net/mac80211/driver-ops.h | 14 ++++++++++++++ net/mac80211/mlme.c | 3 +++ net/mac80211/trace.h | 27 +++++++++++++++++++++++++++ 5 files changed, 49 insertions(+)
include/net/mac80211.h +4 -0
@@ -3843,6 +3843,8 @@ enum ieee80211_reconfig_type {* This callback may sleep. * @update_vif_config: Update virtual interface offload flags * This callback may sleep. +* @sta_set_4addr: Called to notify the driver when a station starts/stops using +* 4-address mode */ struct ieee80211_ops { void (*tx)(struct ieee80211_hw *hw,
@@ -4156,6 +4158,8 @@ struct ieee80211_ops { struct ieee80211_sta *sta, u8 tids);void (*update_vif_offload)(struct ieee80211_hw *hw,struct ieee80211_vif *vif); +void (*sta_set_4addr)(struct ieee80211_hw *hw,struct ieee80211_vif *vif, +struct ieee80211_sta *sta,bool enabled); };/**
net/mac80211/cfg.c +1 -0
@@ -1701,6 +1701,7 @@ static int ieee80211_change_station(struct wiphy *wiphy,rcu_assign_pointer (vlansdata->u.vlan.sta, sta);__ieee80211_check_fast_rx_iface (vlansdata); +drv_sta_set_4addr (local, sta->sdata, &sta->sta, true); } if (sta->sdata->vif.type == NL80211_IFTYPE_AP_VLAN &&
net/mac80211/driver-ops.h +14 -0
@@ -1399,4 +1399,18 @@ static inline void drv_update_vif_offload(struct ieee80211_local *local, trace_drv_return_void(local); } +static inline void drv_sta_set_4addr (struct ieee80211_local *local, +struct ieee80211_sub_if_data *sdata, +struct ieee80211_sta *sta,bool enabled) +{ + sdata =get_bss_sdata (sdata); +if (!check_sdata_in_driver (sdata)) +return ; + +trace_drv_sta_set_4addr (local, sdata, sta, enabled); +if (local->ops->sta_set_4addr) + local->ops->sta_set_4addr (&local->hw, &sdata->vif, sta, enabled); +trace_drv_return_void (local); +} +#endif /* __MAC80211_DRIVER_OPS */
net/mac80211/mlme.c +3 -0
@@ -3523,6 +3523,9 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata, goto out; } +if (sdata->wdev.use_4addr) +drv_sta_set_4addr (local, sdata, &sta->sta, true); +mutex_unlock (&sdata->local->sta_mtx);/*
net/mac80211/trace.h +27 -0
@@ -2740,6 +2740,33 @@ DEFINE_EVENT(local_sdata_addr_evt, drv_update_vif_offload,TP_ARGS (local, sdata) ); +TRACE_EVENT (drv_sta_set_4addr, + TP_PROTO(struct ieee80211_local *local, + struct ieee80211_sub_if_data *sdata, + struct ieee80211_sta *sta, bool enabled), + +TP_ARGS (local, sdata, sta, enabled), + +TP_STRUCT__entry ( + LOCAL_ENTRY + VIF_ENTRY + STA_ENTRY +__field (bool, enabled) + ), + +TP_fast_assign ( + LOCAL_ASSIGN; + VIF_ASSIGN; + STA_ASSIGN; + __entry->enabled = enabled; + ), + +TP_printk ( + LOCAL_PR_FMT VIF_PR_FMT STA_PR_FMT " enabled:%d", +LOCAL_PR_ARG ,VIF_PR_ARG ,STA_PR_ARG , __entry->enabled + ) +); +#endif /* !__MAC80211_DRIVER_TRACE || TRACE_HEADER_MULTI_READ */ #undef TRACE_INCLUDE_PATH
Signature · 1 line
2.28.0
PATCH v2 12/13 mac80211: skip encap offload for tx multicast/control packets
In reply to Felix FietkauThis simplifies the checks in the encap offload tx handler and allows using it in cases where software crypto is used for multicast packets, e.g. when using an AP_VLAN.
--- net/mac80211/iface.c | 6 ++-- net/mac80211/tx.c | 74 ++++++++++++-------------------------------- 2 files changed, 23 insertions(+), 57 deletions(-)
net/mac80211/iface.c +4 -2
@@ -378,7 +378,8 @@ static bool ieee80211_set_sdata_offload_flags(struct ieee80211_sub_if_data *sdatif (key->conf.cipher ==WLAN_CIPHER_SUITE_AES_CMAC || key->conf.cipher ==WLAN_CIPHER_SUITE_BIP_GMAC_128 || key->conf.cipher ==WLAN_CIPHER_SUITE_BIP_GMAC_256 || - key->conf.cipher ==WLAN_CIPHER_SUITE_BIP_CMAC_256 ) + key->conf.cipher ==WLAN_CIPHER_SUITE_BIP_CMAC_256 || + !(key->conf.flags &IEEE80211_KEY_FLAG_PAIRWISE ))continue ;if (key->conf.cipher ==WLAN_CIPHER_SUITE_TKIP || !(key->flags &KEY_FLAG_UPLOADED_TO_HARDWARE ))
@@ -1379,7 +1380,8 @@ static void ieee80211_set_vif_encap_ops(struct ieee80211_sub_if_data *sdata)if (key->conf.cipher ==WLAN_CIPHER_SUITE_AES_CMAC || key->conf.cipher ==WLAN_CIPHER_SUITE_BIP_GMAC_128 || key->conf.cipher ==WLAN_CIPHER_SUITE_BIP_GMAC_256 || - key->conf.cipher ==WLAN_CIPHER_SUITE_BIP_CMAC_256 ) + key->conf.cipher ==WLAN_CIPHER_SUITE_BIP_CMAC_256 || + !(key->conf.flags &IEEE80211_KEY_FLAG_PAIRWISE ))continue ;if (!(key->flags &KEY_FLAG_UPLOADED_TO_HARDWARE )) enabled = false;
net/mac80211/tx.c +19 -55
119 lines not on this page · raw message
Signature · 1 line
2.28.0
PATCH v2 13/13 mac80211: set info->control.hw_key for encap offload packets
In reply to Felix FietkauThis is needed for drivers that don't do the key lookup themselves
--- net/mac80211/tx.c | 5 +++++ 1 file changed, 5 insertions(+)
net/mac80211/tx.c +5 -0
@@ -4194,6 +4194,7 @@ static void ieee80211_8023_xmit(struct ieee80211_sub_if_data *sdata, {struct ieee80211_tx_info *info =IEEE80211_SKB_CB (skb);struct ieee80211_local *local = sdata->local; +struct ieee80211_key *key;struct tid_ampdu_tx *tid_tx;u8 tid;
@@ -4242,6 +4243,10 @@ static void ieee80211_8023_xmit(struct ieee80211_sub_if_data *sdata, info->flags |=IEEE80211_TX_CTL_HW_80211_ENCAP ; info->control.vif = &sdata->vif; + key =rcu_dereference (sta->ptk[sta->ptk_idx]); +if (key) + info->control.hw_key = &key->conf; +ieee80211_tx_8023 (sdata, skb, skb->len, sta, false);return ;
Signature · 1 line
2.28.0