From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <3G-WWXQQKDjQaoQdWeeWbU.SeccQaU-mYVY-VQijbYiji.RkVVUhRbeQj.dUj@flex--kyan.bounces.google.com> Received: from mail-qt1-x849.google.com (mail-qt1-x849.google.com [IPv6:2607:f8b0:4864:20::849]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.bufferbloat.net (Postfix) with ESMTPS id 287003CB3D for ; Fri, 4 Oct 2019 02:22:20 -0400 (EDT) Received: by mail-qt1-x849.google.com with SMTP id j5so5458005qtn.10 for ; Thu, 03 Oct 2019 23:22:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=0xv2gsEZKMIy9BZwSukLE/PzPmhsWw+mQ+8OOHaVoTo=; b=ijT2V7gB1tVcq0VrkvVzswZZ65RfrQN0t4UkkV9RzWajb4hoRa+UCKnpIm7RlrxkWM CjFt80iPUcEVdzVZYxt2AoKoq1odPpqe1zfFD3jTZy1OQ+ONp7N/oPKuQFL/gOS5NeCh xA5qCwJWxvyBk52KxvxdqkdTfWK/sz7quhI5L9c6qBfYaHwNTD4fvXh5CwLTGujoz2Ii yyLUKgomvDP+6PuyhohM8ZbAxHBg8Tx3jb2C1tSu/pMz3rJSEViNFaa1WBT8W2L42g/o a8t1x9zZ8u4EFHwvpS7+jLPsplKqf0SACB4yznakK5c6kbYCETkv0RrgNB4Doew339Y/ cJ2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=0xv2gsEZKMIy9BZwSukLE/PzPmhsWw+mQ+8OOHaVoTo=; b=UAA34qlTO59La2LU2dgkNmHbpDJrT4B28nNRal+JJ+Eg8r4AuuFHdyk7NZyV7L2p+0 mVYNjNzfz3vZ8CCnETy+G+q6cZj16jA/yKblTPxP6HziPY3ogmNwmlhzFAuH6O8eMO/J /Vf0MggOwme65MNltfEbfvymMDLTtd7eIE6q1fDFggaD1cnwMA7VIF2MayzGfZyJalxk MddmVTPvU3IBuUTIaJKJGm2KDKzcs9QJN42weY6Hhsmi+KvFgd6GMt9lowI7C1slaIHh yi5i0nNW8ipoVXOohWui9FjEgcgA9Vh31jZVtqALgNVVRs45ycuDkVTc050kofrf4ftS ovBQ== X-Gm-Message-State: APjAAAUV2pkqrygDKaI4TP0AgF+Q9RLPW+y4kAT/5kb2687RqC5/66aL tDuYUkpjdvBsWzAZ8+HTEhzuBG1X X-Google-Smtp-Source: APXvYqxQbotguQD+514N6gU3cwt59u3Q1YJw+87iinBS/+Y9U7qjedBWZNLanmJeTAOTatENPodCTAs6 X-Received: by 2002:a05:6214:4c2:: with SMTP id ck2mr12488148qvb.21.1570170139537; Thu, 03 Oct 2019 23:22:19 -0700 (PDT) Date: Thu, 3 Oct 2019 23:21:51 -0700 In-Reply-To: <20191004062151.131405-1-kyan@google.com> Message-Id: <20191004062151.131405-3-kyan@google.com> Mime-Version: 1.0 References: <20191004062151.131405-1-kyan@google.com> X-Mailer: git-send-email 2.23.0.581.g78d2f28ef7-goog From: Kan Yan To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, make-wifi-fast@lists.bufferbloat.net, toke@redhat.com, nbd@nbd.name, yiboz@codeaurora.org, Kan Yan Content-Type: text/plain; charset="UTF-8" Subject: [Make-wifi-fast] [PATCH 2/2] ath10k: Enable Airtime-based Queue Limit (AQL) X-BeenThere: make-wifi-fast@lists.bufferbloat.net X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Oct 2019 06:22:20 -0000 Calculate the estimated airtime pending in the txqs and apply AQL to prevent excessive amounts of packets being queued in the firmware queue. Change-Id: I4047ce0938f7b97440fb040b16b74f2e49aa3433 Signed-off-by: Kan Yan --- drivers/net/wireless/ath/ath10k/mac.c | 7 +++++-- drivers/net/wireless/ath/ath10k/txrx.c | 12 +++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index 0606416dc971..37eb56c19f19 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_airtime_check(hw, txq)) + return false; + if (ar->htt.tx_q_state.mode == HTT_TX_MODE_SWITCH_PUSH) return true; @@ -4014,8 +4017,6 @@ static u16 ath10k_mac_update_airtime(struct ath10k *ar, 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,8 @@ 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, + false); return airtime; } diff --git a/drivers/net/wireless/ath/ath10k/txrx.c b/drivers/net/wireless/ath/ath10k/txrx.c index 4102df016931..9266d3dd6adb 100644 --- a/drivers/net/wireless/ath/ath10k/txrx.c +++ b/drivers/net/wireless/ath/ath10k/txrx.c @@ -84,9 +84,15 @@ 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_register_pending_airtime(txq->sta, txq->tid, + skb_cb->airtime_est, + true); + } 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