From patchwork Fri Oct 18 14:40:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= X-Patchwork-Id: 11198613 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 72B14112C for ; Fri, 18 Oct 2019 14:40:44 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4FDFB222C5 for ; Fri, 18 Oct 2019 14:40:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="rMpeZUjf"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="jFSOqBde" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4FDFB222C5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:To:From:Subject:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=XQdT8cgDrJ+mSoig6WvTcUcdNHTaKgDg/U+GIcLqX4M=; b=rMpeZUjfVrem9a YD2im9rWMo8zqdk/D8+k6hHU2SlgD/YNFNbf0a36IJ3uCTrpXde7CzV6T8Uf2LKQnha2Ur7yVrz6g pqvHAwqMkzWRn0B/nulQFj+ll0H6/wn008YSFCSKE9j3u0I9vR6mIPGG7Q4fN6jctfr7zLvaYH2Ze WKY2BqkqQlvV4n/IdAHx7qLo8GDMrqZsNxV7mRrE5HKe2flXZhF3HMKvPq0zU4XBPZkx+ivsd4+Ot qnaCz+ZuasfNVoGSgWxNcHd/zR0hvHkE2MYoHF4ud3L0Onk27xddbYFwSccy3QzfUQbiCKTftKF/x yfBajBJySD5wt/EaAKqA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iLTQn-00006A-O1; Fri, 18 Oct 2019 14:40:41 +0000 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120] helo=us-smtp-1.mimecast.com) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iLTQe-0008LQ-TC for ath10k@lists.infradead.org; Fri, 18 Oct 2019 14:40:34 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571409630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lqBYAyfvGqVBfvQQyb/0J8hd/48vyEbBcTT/es8g2a8=; b=jFSOqBdeeUyrapoZYGsbTVp11SJVvfBO8VNUYHi0z8AsGXOH6lnHRVag7veTte8IuRFhj2 sTTkySeSGH/174pwPIGqHmAjI9HNO01V5xEZzC906uQ05lbQaR8ZooZUxZPahCTRpnDjxc 05o3KNOMz790eJ21+KUQpHRKQrW1PCI= Received: from mail-lj1-f199.google.com (mail-lj1-f199.google.com [209.85.208.199]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-317-zFgLEVqpNdCVh19RoGq5wg-1; Fri, 18 Oct 2019 10:40:28 -0400 Received: by mail-lj1-f199.google.com with SMTP id l15so1124710lje.17 for ; Fri, 18 Oct 2019 07:40:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=B/zTxrtPVbDPMk1jNIRjvApKrsIv0Uj3+z7s63i2jdw=; b=EJ2YdOgEG0t8IpHVrZ+MJpZNgt2u1Jzc+5akCe+j5nyngmgo4FEQmzs4OnD4O9loGZ usAMm0jNXYGf1cbOjdJ+BVoK4uFfOdi1GcUgMY4UzhGawwQEt9W5N7KpIkxOVD5YtlTo xxVE4BWyRMA2BNPGBBSqSOsV90oyhDpkn1mWNJVbTPYbYbkD+kH+q2jSLiIWSXvDecVz ThzJpmiWV66pWrpRDOK3A3eM2A+UAh10UfOVQTTuLzSYCSgT0AsTi6FGd68d6Ss+1hGF lr8jN4pmQcdkobQm8fZaMRP749247irtcjcOewU3zjSq46bE1m0nJkCkG9jutCuMoZuO L76A== X-Gm-Message-State: APjAAAUP5xMMa7fXlfO28eFL4xIZfCkadulXyzBaj92CNDEnyp2d1nRN t2uns7xGdQvSNoA/LIGmKHHpPBP4Yo++tZZ9JhuIgiRBD32ewTxFrW1sxQxUTWe3gNA+8zk1wkw ul0bXnyegKLAy/vOf6NZFZA== X-Received: by 2002:a2e:5dd5:: with SMTP id v82mr6545678lje.54.1571409627128; Fri, 18 Oct 2019 07:40:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqxolQE2snCfRFv7NPp6VkDcPkPnM67ptbRrwbO/RDkqMvooRv8yklzlnAGDuCtp1Rd02Oj9BA== X-Received: by 2002:a2e:5dd5:: with SMTP id v82mr6545664lje.54.1571409626863; Fri, 18 Oct 2019 07:40:26 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk ([2a00:7660:6da:443::2]) by smtp.gmail.com with ESMTPSA id d25sm2572501lfj.15.2019.10.18.07.40.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Oct 2019 07:40:26 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 6A8AC1804B6; Fri, 18 Oct 2019 16:40:25 +0200 (CEST) Subject: [PATCH v3 4/4] mac80211: Use Airtime-based Queue Limits (AQL) on packet dequeue From: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= To: Johannes Berg Date: Fri, 18 Oct 2019 16:40:25 +0200 Message-ID: <157140962534.2866668.1182822483250825739.stgit@toke.dk> In-Reply-To: <157140962094.2866668.3383184317264069493.stgit@toke.dk> References: <157140962094.2866668.3383184317264069493.stgit@toke.dk> User-Agent: StGit/0.20 MIME-Version: 1.0 X-MC-Unique: zFgLEVqpNdCVh19RoGq5wg-1 X-Mimecast-Spam-Score: 0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191018_074033_065117_573A145A X-CRM114-Status: GOOD ( 12.65 ) X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [207.211.31.120 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: ath10k@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kan Yan , Rajkumar Manoharan , Kevin Hayes , make-wifi-fast@lists.bufferbloat.net, linux-wireless@vger.kernel.org, ath10k@lists.infradead.org, John Crispin , Lorenzo Bianconi , Felix Fietkau Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org From: Toke Høiland-Jørgensen The previous commit added the ability to throttle stations when they queue too much airtime in the hardware. This commit enables the functionality by calculating the expected airtime usage of each packet that is dequeued from the TXQs in mac80211, and accounting that as pending airtime. The estimated airtime for each skb is stored in the tx_info, so we can subtract the same amount from the running total when the skb is freed or recycled. The throttling mechanism relies on this accounting to be accurate (i.e., that we are not freeing skbs without subtracting any airtime they were accounted for), so we put the subtraction into ieee80211_report_used_skb(). As an optimisation, we also subtract the airtime on regular TX completion, zeroing out the value stored in the packet afterwards, to avoid having to do an expensive lookup of the station from the packet data on every packet. This patch does *not* include any mechanism to wake a throttled TXQ again, on the assumption that this will happen anyway as a side effect of whatever freed the skb (most commonly a TX completion). Signed-off-by: Toke Høiland-Jørgensen --- net/mac80211/status.c | 38 ++++++++++++++++++++++++++++++++++++++ net/mac80211/tx.c | 19 +++++++++++++++++++ 2 files changed, 57 insertions(+) diff --git a/net/mac80211/status.c b/net/mac80211/status.c index ab8ba5835ca0..905b4afd457d 100644 --- a/net/mac80211/status.c +++ b/net/mac80211/status.c @@ -676,6 +676,33 @@ static void ieee80211_report_used_skb(struct ieee80211_local *local, if (dropped) acked = false; + if (info->tx_time_est) { + struct ieee80211_sub_if_data *sdata; + struct sta_info *sta = NULL; + u8 *qc, ac; + int tid; + + rcu_read_lock(); + + sdata = ieee80211_sdata_from_skb(local, skb); + if (sdata) + sta = sta_info_get_bss(sdata, skb_mac_header(skb)); + + if (ieee80211_is_data_qos(hdr->frame_control)) { + qc = ieee80211_get_qos_ctl(hdr); + tid = qc[0] & 0xf; + ac = ieee80211_ac_from_tid(tid); + } else { + ac = IEEE80211_AC_BE; + } + + ieee80211_sta_update_pending_airtime(local, sta, ac, + info->tx_time_est << 2, + true); + rcu_read_unlock(); + + } + if (info->flags & IEEE80211_TX_INTFL_MLME_CONN_TX) { struct ieee80211_sub_if_data *sdata; @@ -930,6 +957,17 @@ static void __ieee80211_tx_status(struct ieee80211_hw *hw, tid = qc[0] & 0xf; } + if (info->tx_time_est) { + /* Do this here to avoid the expensive lookup of the sta + * in ieee80211_report_used_skb(). + */ + ieee80211_sta_update_pending_airtime(local, sta, + ieee80211_ac_from_tid(tid), + info->tx_time_est << 2, + true); + info->tx_time_est = 0; + } + if (!acked && ieee80211_is_back_req(fc)) { u16 control; diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 12653d873b8c..bd8284f04361 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -3539,9 +3539,14 @@ struct sk_buff *ieee80211_tx_dequeue(struct ieee80211_hw *hw, struct ieee80211_tx_data tx; ieee80211_tx_result r; struct ieee80211_vif *vif = txq->vif; + u8 ac = txq->ac; + u32 airtime; WARN_ON_ONCE(softirq_count() == 0); + if (!ieee80211_txq_airtime_check(hw, txq)) + return NULL; + begin: spin_lock_bh(&fq->lock); @@ -3652,6 +3657,20 @@ struct sk_buff *ieee80211_tx_dequeue(struct ieee80211_hw *hw, } IEEE80211_SKB_CB(skb)->control.vif = vif; + + if (local->airtime_flags & AIRTIME_USE_AQL) { + airtime = ieee80211_calc_expected_tx_airtime(hw, vif, txq->sta, + skb->len); + if (airtime) { + /* We only have 10 bits in tx_time_est, so store airtime + * in increments of 4 us and clamp that to 2**10. + */ + info->tx_time_est = min_t(u32, airtime >> 2, 1 << 10); + ieee80211_sta_update_pending_airtime(local, tx.sta, ac, + airtime, false); + } + } + return skb; out: