ath10k: improve tx status reporting
authorSergey Ryazanov <ryazanov.s.a@gmail.com>
Wed, 18 May 2022 07:27:26 +0000 (10:27 +0300)
committerKalle Valo <quic_kvalo@quicinc.com>
Sun, 22 May 2022 12:27:51 +0000 (15:27 +0300)
We use ieee80211_tx_status() to report each completed tx frame.
Internally, this function calls sta_info_get_by_addrs(), what has a
couple of drawbacks:
1. additional station lookup causes a performance degradation;
2. mac80211 can not properly account Ethernet encapsulated frames due
   to the inability to properly determine the destination (station) MAC
   address since ieee80211_tx_status() assumes the frame has a 802.11
   header.

The latter is especially destructive if we want to use hardware frames
encapsulation.

To fix both of these issues, replace ieee80211_tx_status() with
ieee80211_tx_status_ext() call and feed it station pointer from the tx
queue associated with the transmitted frame.

Tested-on: QCA9888 hw2.0 PCI 10.4-3.9.0.2-00131
Tested-on: QCA6174 hw3.2 PCI WLAN.RM.4.4.1-00157-QCARMSWPZ-1

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>
Tested-by: Oldřich Jedlička <oldium.pro@gmail.com> # TP-Link Archer C7 v4 & v5 (QCA9563 + QCA9880)
Tested-by: Edward Matijevic <motolav@gmail.com> # TP-Link Archer C2600 (IPQ8064 + QCA9980 10.4.1.00030-1)
Tested-by: Edward Matijevic <motolav@gmail.com> # QCA9377 PCI in Sta mode
Tested-by: Zhijun You <hujy652@gmail.com> # NETGEAR R7800 (QCA9984 10.4-3.9.0.2-00159)
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20220516032519.29831-2-ryazanov.s.a@gmail.com
drivers/net/wireless/ath/ath10k/txrx.c

index 10123974c3da76041f2a6028d7116a461e6a9d40..da3bc35e41aa08da9c325a34d4ab82b64d6f80cc 100644 (file)
@@ -43,6 +43,7 @@ out:
 int ath10k_txrx_tx_unref(struct ath10k_htt *htt,
                         const struct htt_tx_done *tx_done)
 {
+       struct ieee80211_tx_status status;
        struct ath10k *ar = htt->ar;
        struct device *dev = ar->dev;
        struct ieee80211_tx_info *info;
@@ -128,7 +129,19 @@ int ath10k_txrx_tx_unref(struct ath10k_htt *htt,
                info->status.flags |= IEEE80211_TX_STATUS_ACK_SIGNAL_VALID;
        }
 
-       ieee80211_tx_status(htt->ar->hw, msdu);
+       memset(&status, 0, sizeof(status));
+       status.skb = msdu;
+       status.info = info;
+
+       rcu_read_lock();
+
+       if (txq)
+               status.sta = txq->sta;
+
+       ieee80211_tx_status_ext(htt->ar->hw, &status);
+
+       rcu_read_unlock();
+
        /* we do not own the msdu anymore */
 
        return 0;