ath11k: improve TX path
cover ath11k: improve TX path
This series improves the TX path. The following numbers are peak performance measured.
prior to series
[SUM] 30.00-31.00 sec 104 MBytes 874 Mbits/sec
series applied
[SUM] 35.00-36.00 sec 124 MBytes 1.04 Gbits/sec
series applied + tx encap
[SUM] 77.00-78.00 sec 167 MBytes 1.40 Gbits/sec
John Crispin (3):
ath11k: move some tx_status parsing to debugfs code
ath11k: optimise ath11k_dp_tx_completion_handler
ath11k: optimize ath11k_hal_tx_status_parse
drivers/net/wireless/ath/ath11k/debugfs_sta.c | 66 +++++++++------- drivers/net/wireless/ath/ath11k/dp.c | 16 ++-- drivers/net/wireless/ath/ath11k/dp.h | 11 ++- drivers/net/wireless/ath/ath11k/dp_tx.c | 79 ++++++++++++------- drivers/net/wireless/ath/ath11k/hal_tx.c | 73 ----------------- drivers/net/wireless/ath/ath11k/hal_tx.h | 13 +-- 6 files changed, 101 insertions(+), 157 deletions(-)
Signature · 7 lines
2.20.1 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH 1/3 ath11k: move some tx_status parsing to debugfs code
Some of the fields are only used by debugfs. Move the parsing of these from the data hot path to the debugfs code.
--- drivers/net/wireless/ath/ath11k/debugfs_sta.c | 66 +++++++++++-------- drivers/net/wireless/ath/ath11k/hal_tx.c | 19 +----- drivers/net/wireless/ath/ath11k/hal_tx.h | 7 +- 3 files changed, 39 insertions(+), 53 deletions(-)
drivers/net/wireless/ath/ath11k/debugfs_sta.c +37 -29
@@ -129,12 +129,17 @@ void ath11k_update_per_peer_stats_from_txcompl(struct ath11k *ar, {struct ath11k_base *ab = ar->ab;struct ath11k_per_peer_tx_stats *peer_stats = &ar->cached_stats; +enum hal_tx_rate_stats_pkt_type pkt_type; +enum hal_tx_rate_stats_sgi sgi; +enum hal_tx_rate_stats_bw bw;struct ath11k_peer *peer;struct ath11k_sta *arsta;struct ieee80211_sta *sta; +u16 num_tones_in_ru;u16 rate;u8 rate_idx;int ret; +u8 mcs;rcu_read_lock ();spin_lock_bh (&ab->base_lock);
@@ -150,51 +155,54 @@ void ath11k_update_per_peer_stats_from_txcompl(struct ath11k *ar, arsta = (struct ath11k_sta *)sta->drv_priv;memset (&arsta->txrate,0 ,sizeof (arsta->txrate)); - -if (ts->pkt_type ==HAL_TX_RATE_STATS_PKT_TYPE_11A || - ts->pkt_type ==HAL_TX_RATE_STATS_PKT_TYPE_11B ) { - ret =ath11k_mac_hw_ratecode_to_legacy_rate (ts->mcs, - ts->pkt_type, + pkt_type =FIELD_GET (HAL_TX_RATE_STATS_INFO0_PKT_TYPE , + ts->rate_stats); + mcs =FIELD_GET (HAL_TX_RATE_STATS_INFO0_MCS , + ts->rate_stats); + sgi =FIELD_GET (HAL_TX_RATE_STATS_INFO0_SGI , + ts->rate_stats); + num_tones_in_ru =FIELD_GET (HAL_TX_RATE_STATS_INFO0_TONES_IN_RU , + ts->rate_stats); + bw =FIELD_GET (HAL_TX_RATE_STATS_INFO0_BW , ts->rate_stats); + +if (pkt_type ==HAL_TX_RATE_STATS_PKT_TYPE_11A || + pkt_type ==HAL_TX_RATE_STATS_PKT_TYPE_11B ) { + ret =ath11k_mac_hw_ratecode_to_legacy_rate (mcs, + pkt_type, &rate_idx, &rate); -if (ret <0 ) { -spin_unlock_bh (&ab->base_lock); -rcu_read_unlock (); -return ; - } +if (ret <0 ) + goto err_out; arsta->txrate.legacy = rate; - }else if (ts->pkt_type ==HAL_TX_RATE_STATS_PKT_TYPE_11N ) { -if (ts->mcs >7 ) { -ath11k_warn (ab,"Invalid HT mcs index %d\n" , ts->mcs); -spin_unlock_bh (&ab->base_lock); -rcu_read_unlock (); -return ; + }else if (pkt_type ==HAL_TX_RATE_STATS_PKT_TYPE_11N ) { +if (mcs >7 ) { +ath11k_warn (ab,"Invalid HT mcs index %d\n" , mcs); + goto err_out; } - arsta->txrate.mcs = ts->mcs +8 * (arsta->last_txrate.nss -1 ); + arsta->txrate.mcs = mcs +8 * (arsta->last_txrate.nss -1 ); arsta->txrate.flags =RATE_INFO_FLAGS_MCS ; -if (ts->sgi) +if (sgi) arsta->txrate.flags |=RATE_INFO_FLAGS_SHORT_GI ; - }else if (ts->pkt_type ==HAL_TX_RATE_STATS_PKT_TYPE_11AC ) { -if (ts->mcs >9 ) { -ath11k_warn (ab,"Invalid VHT mcs index %d\n" , ts->mcs); -spin_unlock_bh (&ab->base_lock); -rcu_read_unlock (); -return ; + }else if (pkt_type ==HAL_TX_RATE_STATS_PKT_TYPE_11AC ) { +if (mcs >9 ) { +ath11k_warn (ab,"Invalid VHT mcs index %d\n" , mcs); + goto err_out; } - arsta->txrate.mcs = ts->mcs; + arsta->txrate.mcs = mcs; arsta->txrate.flags =RATE_INFO_FLAGS_VHT_MCS ; -if (ts->sgi) +if (sgi) arsta->txrate.flags |=RATE_INFO_FLAGS_SHORT_GI ; - }else { -/*TODO: update HE rates */ + }else if (pkt_type ==HAL_TX_RATE_STATS_PKT_TYPE_11AX ) { +/* TODO */ } arsta->txrate.nss = arsta->last_txrate.nss; - arsta->txrate.bw =ath11k_mac_bw_to_mac80211_bw (ts->bw); + arsta->txrate.bw =ath11k_mac_bw_to_mac80211_bw (bw);ath11k_accumulate_per_peer_tx_stats (arsta, peer_stats, rate_idx); +err_out:spin_unlock_bh (&ab->base_lock);rcu_read_unlock (); }
drivers/net/wireless/ath/ath11k/hal_tx.c +1 -18
@@ -127,24 +127,7 @@ void ath11k_hal_tx_status_parse(struct ath11k_base *ab,if (!(desc->rate_stats.info0 &HAL_TX_RATE_STATS_INFO0_VALID ))return ; - ts->flags |=HAL_TX_STATUS_FLAGS_RATE_STATS_VALID ; - ts->tsf = desc->rate_stats.tsf; - ts->bw =FIELD_GET (HAL_TX_RATE_STATS_INFO0_BW , desc->rate_stats.info0); - ts->pkt_type =FIELD_GET (HAL_TX_RATE_STATS_INFO0_PKT_TYPE , - desc->rate_stats.info0); -if (desc->rate_stats.info0 &HAL_TX_RATE_STATS_INFO0_STBC ) - ts->flags |=HAL_TX_STATUS_FLAGS_RATE_STBC ; -if (desc->rate_stats.info0 &HAL_TX_RATE_STATS_INFO0_LDPC ) - ts->flags |=HAL_TX_STATUS_FLAGS_RATE_LDPC ; -if (desc->rate_stats.info0 &HAL_TX_RATE_STATS_INFO0_OFDMA_TX ) - ts->flags |=HAL_TX_STATUS_FLAGS_OFDMA ; - - ts->sgi =FIELD_GET (HAL_TX_RATE_STATS_INFO0_SGI , - desc->rate_stats.info0); - ts->mcs =FIELD_GET (HAL_TX_RATE_STATS_INFO0_MCS , - desc->rate_stats.info0); - ts->num_tones_in_ru =FIELD_GET (HAL_TX_RATE_STATS_INFO0_TONES_IN_RU , - desc->rate_stats.info0); + ts->rate_stats = desc->rate_stats.info0; }void ath11k_hal_tx_set_dscp_tid_map (struct ath11k_base *ab,int id)
drivers/net/wireless/ath/ath11k/hal_tx.h +1 -6
@@ -51,17 +51,12 @@ struct hal_tx_status {u32 desc_id;enum hal_wbm_tqm_rel_reason status;u8 ack_rssi; -enum hal_tx_rate_stats_bw bw; -enum hal_tx_rate_stats_pkt_type pkt_type; -enum hal_tx_rate_stats_sgi sgi; -u8 mcs; -u16 num_tones_in_ru;u32 flags;/* %HAL_TX_STATUS_FLAGS_ */ -u32 tsf;u32 ppdu_id;u8 try_cnt;u8 tid;u16 peer_id; +u32 rate_stats; }; void ath11k_hal_tx_cmd_desc_setup(struct ath11k_base *ab, void *cmd,
Signature · 7 lines
2.20.1 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH 2/3 ath11k: optimise ath11k_dp_tx_completion_handler
In reply to John Crispinthe current code does 4 memcpys for each completion frame.
1) duplicate the desc
2 + 3) inside kfifo insertion
4) kfifo remove
The code simply drops the kfifo and uses a trivial ring buffer. This requires a single memcpy for insertion. There is no removal needed as we can simply use the inserted data for processing. As the code runs inside the NAPI context it is atomic and there is no need for most of the locking.
--- drivers/net/wireless/ath/ath11k/dp.c | 16 ++++----- drivers/net/wireless/ath/ath11k/dp.h | 11 +++---- drivers/net/wireless/ath/ath11k/dp_tx.c | 41 +++++++++--------------- drivers/net/wireless/ath/ath11k/hal_tx.c | 13 -------- drivers/net/wireless/ath/ath11k/hal_tx.h | 2 -- 5 files changed, 27 insertions(+), 56 deletions(-)
drivers/net/wireless/ath/ath11k/dp.c +6 -10
@@ -3,7 +3,6 @@* Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. */ -#include <linux/kfifo.h> #include "core.h" #include "dp_tx.h" #include "hal_tx.h"
@@ -822,10 +821,7 @@ void ath11k_dp_free(struct ath11k_base *ab) ath11k_dp_tx_pending_cleanup, ab);idr_destroy (&dp->tx_ring[i].txbuf_idr);spin_unlock_bh (&dp->tx_ring[i].tx_idr_lock); - -spin_lock_bh (&dp->tx_ring[i].tx_status_lock); -kfifo_free (&dp->tx_ring[i].tx_status_fifo); -spin_unlock_bh (&dp->tx_ring[i].tx_status_lock); +kfree (&dp->tx_ring[i].tx_status); }/* Deinit any SOC level resource */
@@ -865,17 +861,17 @@ int ath11k_dp_alloc(struct ath11k_base *ab)if (ret) goto fail_link_desc_cleanup; - size =roundup_pow_of_two (DP_TX_COMP_RING_SIZE ); + size =sizeof (struct hal_wbm_release_ring ) *DP_TX_COMP_RING_SIZE ;for (i =0 ; i <DP_TCL_NUM_RING_MAX ; i++) {idr_init (&dp->tx_ring[i].txbuf_idr);spin_lock_init (&dp->tx_ring[i].tx_idr_lock); dp->tx_ring[i].tcl_data_ring_id = i; -spin_lock_init (&dp->tx_ring[i].tx_status_lock); - ret =kfifo_alloc (&dp->tx_ring[i].tx_status_fifo, size, -GFP_KERNEL ); -if (ret) + dp->tx_ring[i].tx_status_head =0 ; + dp->tx_ring[i].tx_status_tail =DP_TX_COMP_RING_SIZE -1 ; + dp->tx_ring[i].tx_status =kmalloc (size,GFP_KERNEL ); +if (!dp->tx_ring[i].tx_status) goto fail_cmn_srng_cleanup; }
drivers/net/wireless/ath/ath11k/dp.h +5 -6
@@ -6,7 +6,6 @@#ifndef ATH11K_DP_H #define ATH11K_DP_H -#include <linux/kfifo.h> #include "hal_rx.h" struct ath11k_base ;
@@ -58,6 +57,8 @@ struct dp_rxdma_ring {int bufs_max; }; +#define ATH11K_TX_COMPL_NEXT (x) ((x + 1) % DP_TX_COMP_RING_SIZE) +struct dp_tx_ring {u8 tcl_data_ring_id;struct dp_srng tcl_data_ring;
@@ -65,11 +66,9 @@ struct dp_tx_ring {struct idr txbuf_idr;/* Protects txbuf_idr and num_pending */ spinlock_t tx_idr_lock; - DECLARE_KFIFO_PTR(tx_status_fifo, struct hal_wbm_release_ring); -/* lock to protect tx_status_fifo because tx_status_fifo can be -* accessed concurrently. -*/ -spinlock_t tx_status_lock; +struct hal_wbm_release_ring *tx_status; +int tx_status_head; +int tx_status_tail; };struct ath11k_pdev_mon_stats {
drivers/net/wireless/ath/ath11k/dp_tx.c +16 -25
97 lines not on this page · raw message
drivers/net/wireless/ath/ath11k/hal_tx.c +0 -13
@@ -74,19 +74,6 @@ void ath11k_hal_tx_cmd_desc_setup(struct ath11k_base *ab, void *cmd, tcl_cmd->info4 =0 ; } -/* Commit the descriptor to hardware */ -void ath11k_hal_tx_desc_sync (void *tx_desc_cached,void *hw_desc) -{ -memcpy (hw_desc +sizeof (struct hal_tlv_hdr ), tx_desc_cached, -sizeof (struct hal_tcl_data_cmd )); -} - -/* Get the descriptor status from hardware */ -void ath11k_hal_tx_status_desc_sync (void *hw_desc,void *local_desc) -{ -memcpy (local_desc, hw_desc,HAL_TX_STATUS_DESC_LEN ); -} -void ath11k_hal_tx_status_parse (struct ath11k_base *ab,struct hal_wbm_release_ring *desc,struct hal_tx_status *ts)
drivers/net/wireless/ath/ath11k/hal_tx.h +0 -2
@@ -61,11 +61,9 @@ struct hal_tx_status {void ath11k_hal_tx_cmd_desc_setup (struct ath11k_base *ab,void *cmd,struct hal_tx_info *ti); -void ath11k_hal_tx_desc_sync (void *tx_desc_cached,void *hw_desc);void ath11k_hal_tx_status_parse (struct ath11k_base *ab,struct hal_wbm_release_ring *desc,struct hal_tx_status *ts); -void ath11k_hal_tx_status_desc_sync (void *hw_desc,void *local_desc);void ath11k_hal_tx_set_dscp_tid_map (struct ath11k_base *ab,int id); int ath11k_hal_reo_cmd_send(struct ath11k_base *ab, struct hal_srng *srng, enum hal_reo_cmd_type type,
Signature · 7 lines
2.20.1 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH 3/3 ath11k: optimize ath11k_hal_tx_status_parse
In reply to John CrispinMoving the function into dp_tx.c allows gcc to optimize the code better and also avoid chace invalidates and context switches.
--- drivers/net/wireless/ath/ath11k/dp.h | 2 +- drivers/net/wireless/ath/ath11k/dp_tx.c | 38 +++++++++++++++++++-- drivers/net/wireless/ath/ath11k/hal_tx.c | 43 ------------------------ drivers/net/wireless/ath/ath11k/hal_tx.h | 4 --- 4 files changed, 37 insertions(+), 50 deletions(-)
drivers/net/wireless/ath/ath11k/dp.h +1 -1
@@ -57,7 +57,7 @@ struct dp_rxdma_ring {int bufs_max; }; -#define ATH11K_TX_COMPL_NEXT (x) ((x + 1) % DP_TX_COMP_RING_SIZE) +#define ATH11K_TX_COMPL_NEXT (x) (((x) + 1) % DP_TX_COMP_RING_SIZE)struct dp_tx_ring {u8 tcl_data_ring_id;
drivers/net/wireless/ath/ath11k/dp_tx.c +36 -2
@@ -423,6 +423,37 @@ static void ath11k_dp_tx_complete_msdu(struct ath11k *ar,rcu_read_unlock (); } +static inline void ath11k_hal_tx_status_parse (struct ath11k_base *ab, +struct hal_wbm_release_ring *desc, +struct hal_tx_status *ts) +{ + ts->buf_rel_source = +FIELD_GET (HAL_WBM_RELEASE_INFO0_REL_SRC_MODULE , desc->info0); +if (ts->buf_rel_source !=HAL_WBM_REL_SRC_MODULE_FW && + ts->buf_rel_source !=HAL_WBM_REL_SRC_MODULE_TQM ) +return ; + +if (ts->buf_rel_source ==HAL_WBM_REL_SRC_MODULE_FW ) +return ; + + ts->status =FIELD_GET (HAL_WBM_RELEASE_INFO0_TQM_RELEASE_REASON , + desc->info0); + ts->ppdu_id =FIELD_GET (HAL_WBM_RELEASE_INFO1_TQM_STATUS_NUMBER , + desc->info1); + ts->try_cnt =FIELD_GET (HAL_WBM_RELEASE_INFO1_TRANSMIT_COUNT , + desc->info1); + ts->ack_rssi =FIELD_GET (HAL_WBM_RELEASE_INFO2_ACK_FRAME_RSSI , + desc->info2); +if (desc->info2 &HAL_WBM_RELEASE_INFO2_FIRST_MSDU ) + ts->flags |=HAL_TX_STATUS_FLAGS_FIRST_MSDU ; + ts->peer_id =FIELD_GET (HAL_WBM_RELEASE_INFO3_PEER_ID , desc->info3); + ts->tid =FIELD_GET (HAL_WBM_RELEASE_INFO3_TID , desc->info3); +if (desc->rate_stats.info0 &HAL_TX_RATE_STATS_INFO0_VALID ) + ts->rate_stats = desc->rate_stats.info0; +else + ts->rate_stats =0 ; +} +void ath11k_dp_tx_completion_handler (struct ath11k_base *ab,int ring_id) {struct ath11k *ar;
@@ -456,14 +487,17 @@ void ath11k_dp_tx_completion_handler(struct ath11k_base *ab, int ring_id)while (ATH11K_TX_COMPL_NEXT (tx_ring->tx_status_tail) != tx_ring->tx_status_head) {struct hal_wbm_release_ring *tx_status; +u32 desc_id; tx_ring->tx_status_tail =ATH11K_TX_COMPL_NEXT (tx_ring->tx_status_tail); tx_status = &tx_ring->tx_status[tx_ring->tx_status_tail];ath11k_hal_tx_status_parse (ab, tx_status, &ts); - mac_id =FIELD_GET (DP_TX_DESC_ID_MAC_ID , ts.desc_id); - msdu_id =FIELD_GET (DP_TX_DESC_ID_MSDU_ID , ts.desc_id); + desc_id =FIELD_GET (BUFFER_ADDR_INFO1_SW_COOKIE , + tx_status->buf_addr_info.info1); + mac_id =FIELD_GET (DP_TX_DESC_ID_MAC_ID , desc_id); + msdu_id =FIELD_GET (DP_TX_DESC_ID_MSDU_ID , desc_id);if (ts.buf_rel_source ==HAL_WBM_REL_SRC_MODULE_FW ) { ath11k_dp_tx_process_htt_tx_complete(ab,
drivers/net/wireless/ath/ath11k/hal_tx.c +0 -43
49 lines not on this page · raw message
drivers/net/wireless/ath/ath11k/hal_tx.h +0 -4
@@ -48,7 +48,6 @@ struct hal_tx_info {/* Tx status parsed from srng desc */ struct hal_tx_status {enum hal_wbm_rel_src_module buf_rel_source; -u32 desc_id;enum hal_wbm_tqm_rel_reason status;u8 ack_rssi;u32 flags;/* %HAL_TX_STATUS_FLAGS_ */
@@ -61,9 +60,6 @@ struct hal_tx_status {void ath11k_hal_tx_cmd_desc_setup (struct ath11k_base *ab,void *cmd,struct hal_tx_info *ti); -void ath11k_hal_tx_status_parse (struct ath11k_base *ab, -struct hal_wbm_release_ring *desc, -struct hal_tx_status *ts);void ath11k_hal_tx_set_dscp_tid_map (struct ath11k_base *ab,int id); int ath11k_hal_reo_cmd_send(struct ath11k_base *ab, struct hal_srng *srng, enum hal_reo_cmd_type type,
Signature · 7 lines
2.20.1 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
Re: [PATCH 1/3] ath11k: move some tx_status parsing to debugfs code
In reply to John CrispinQuoted 4 lines · John Crispin
Some of the fields are only used by debugfs. Move the parsing of these from the data hot path to the debugfs code.
Signed-off-by John Crispin <[email protected]>
Does not apply, please rebase.
error: patch failed: drivers/net/wireless/ath/ath11k/dp_tx.c:167
error: drivers/net/wireless/ath/ath11k/dp_tx.c: patch does not apply
error: patch failed: drivers/net/wireless/ath/ath11k/hal_tx.c:74
error: drivers/net/wireless/ath/ath11k/hal_tx.c: patch does not apply stg import: Diff does not apply cleanly
3 patches set to Changes Requested.
11254761 [1/3] ath11k: move some tx_status parsing to debugfs code 11254765 [2/3] ath11k: optimise ath11k_dp_tx_completion_handler 11254767 [3/3] ath11k: optimize ath11k_hal_tx_status_parse
Signature · 9 lines
https://patchwork.kernel.org/patch/11254761/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k