From: Kan Yan <kyan@google.com>
To: johannes@sipsolutions.net
Cc: linux-wireless@vger.kernel.org,
make-wifi-fast@lists.bufferbloat.net, toke@redhat.com,
nbd@nbd.name, ath10k@lists.infradead.org, yiboz@codeaurora.org,
Kan Yan <kyan@google.com>
Subject: [PATCH v3 2/2] ath10k: Enable Airtime-based Queue Limit (AQL)
Date: Wed, 9 Oct 2019 19:25:02 -0700 [thread overview]
Message-ID: <20191010022502.141862-3-kyan@google.com> (raw)
In-Reply-To: <20191010022502.141862-1-kyan@google.com>
Calculate the estimated airtime pending in the txqs and apply AQL to
prevent excessive amounts of packets being queued in the firmware queue.
Signed-off-by: Kan Yan <kyan@google.com>
---
drivers/net/wireless/ath/ath10k/htt_rx.c | 1 +
drivers/net/wireless/ath/ath10k/mac.c | 8 +++++---
drivers/net/wireless/ath/ath10k/txrx.c | 11 ++++++++---
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c
index 83a7fb68fd24..f2115b940964 100644
--- a/drivers/net/wireless/ath/ath10k/htt_rx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
@@ -3053,6 +3053,7 @@ static void ath10k_htt_rx_tx_fetch_ind(struct ath10k *ar, struct sk_buff *skb)
num_msdus++;
num_bytes += ret;
+ may_tx = ieee80211_txq_aql_check(hw, txq);
}
ieee80211_return_txq(hw, txq, false);
ieee80211_txq_schedule_end(hw, txq->ac);
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 0606416dc971..b300a3c506b2 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -3983,6 +3983,9 @@ static bool ath10k_mac_tx_can_push(struct ieee80211_hw *hw,
struct ath10k_txq *artxq = (void *)txq->drv_priv;
/* No need to get locks */
+ if (!ieee80211_txq_aql_check(hw, txq))
+ return false;
+
if (ar->htt.tx_q_state.mode == HTT_TX_MODE_SWITCH_PUSH)
return true;
@@ -4009,13 +4012,11 @@ static u16 ath10k_mac_update_airtime(struct ath10k *ar,
{
struct ath10k_sta *arsta;
u32 pktlen;
- u16 airtime = 0;
+ s32 airtime = 0;
if (!txq || !txq->sta)
return airtime;
- if (test_bit(WMI_SERVICE_REPORT_AIRTIME, ar->wmi.svc_map))
- return airtime;
spin_lock_bh(&ar->data_lock);
arsta = (struct ath10k_sta *)txq->sta->drv_priv;
@@ -4038,6 +4039,7 @@ static u16 ath10k_mac_update_airtime(struct ath10k *ar,
}
spin_unlock_bh(&ar->data_lock);
+ ieee80211_sta_register_pending_airtime(txq->sta, txq->tid, airtime);
return airtime;
}
diff --git a/drivers/net/wireless/ath/ath10k/txrx.c b/drivers/net/wireless/ath/ath10k/txrx.c
index 4102df016931..739046b34d4b 100644
--- a/drivers/net/wireless/ath/ath10k/txrx.c
+++ b/drivers/net/wireless/ath/ath10k/txrx.c
@@ -84,9 +84,14 @@ int ath10k_txrx_tx_unref(struct ath10k_htt *htt,
wake_up(&htt->empty_tx_wq);
spin_unlock_bh(&htt->tx_lock);
- if (txq && txq->sta && skb_cb->airtime_est)
- ieee80211_sta_register_airtime(txq->sta, txq->tid,
- skb_cb->airtime_est, 0);
+ if (txq && txq->sta && skb_cb->airtime_est) {
+ if (!test_bit(WMI_SERVICE_REPORT_AIRTIME, ar->wmi.svc_map))
+ ieee80211_sta_register_airtime(txq->sta, txq->tid,
+ skb_cb->airtime_est, 0);
+
+ ieee80211_sta_release_pending_airtime(txq->sta, txq->tid,
+ skb_cb->airtime_est);
+ }
if (ar->bus_param.dev_type != ATH10K_DEV_TYPE_HL)
dma_unmap_single(dev, skb_cb->paddr, msdu->len, DMA_TO_DEVICE);
--
2.23.0.581.g78d2f28ef7-goog
prev parent reply other threads:[~2019-10-10 2:25 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-10 2:25 [PATCH v3 0/2] Implement Airtime-based Queue Limit (AQL) Kan Yan
2019-10-10 2:25 ` [PATCH v3 1/2] mac80211: " Kan Yan
2019-10-10 15:40 ` Johannes Berg
2019-10-10 20:12 ` Toke Høiland-Jørgensen
2019-10-11 2:24 ` Kan Yan
2019-10-11 8:16 ` Johannes Berg
2019-10-10 2:25 ` Kan Yan [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191010022502.141862-3-kyan@google.com \
--to=kyan@google.com \
--cc=ath10k@lists.infradead.org \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
--cc=make-wifi-fast@lists.bufferbloat.net \
--cc=nbd@nbd.name \
--cc=toke@redhat.com \
--cc=yiboz@codeaurora.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).