From patchwork Wed Oct 23 09:59:04 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: 11206239 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 937F41390 for ; Wed, 23 Oct 2019 09:59:28 +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 412402064B for ; Wed, 23 Oct 2019 09:59:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="LUQ2mU62"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="M1e5Zs6a" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 412402064B 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=Kb7WoXIw+elxX1S0qAFjNMtjWsRbOhp6yQ1XXSJPjrk=; b=LUQ2mU62h7bugC n9EORZZk8UDGN4NEUlCPd8pwVVyJdNrMtgS0ZjdY3Y4zE6WCJ65V2jL7esBjtpB+aMnLoTaCNfnvr oo4ixBj/QSTbTI2Fh0Talu8LfBiknEQrdArQYuuxsRrtuCJ3/M6xqcsSuYIMz1hFuMAOfSetl6+2x Zzb16/v1YiXXhb1/GwDKNVifL1zF7rgQlZDTYaTqABuyNkpV2ORsyChBO0VbZ67PPf0ylgnboVcUf /WKj88jRlWVTzeeY9ErudjLM8W2r4cGPVh6+7Y2zROepc/fBf4junPsn/EAMtAnKsGKb8EswX2Ihx xnm+Ga0VV1+SzQMCkzaw==; 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 1iNDQJ-0005Lf-Pg; Wed, 23 Oct 2019 09:59:23 +0000 Received: from us-smtp-1.mimecast.com ([207.211.31.81] helo=us-smtp-delivery-1.mimecast.com) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iNDQ8-0004xs-A4 for ath10k@lists.infradead.org; Wed, 23 Oct 2019 09:59:16 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571824751; 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=GTow40ZP9yz6FXo2iHRwENO6p5Rsw+2IYHRwXehWjq0=; b=M1e5Zs6a8Aud92sB06Qg1jn669NaYp+koFNmn6tFbfxyIQ0LqVtld4CANmavVIsrb4p/8v Rc5XpDTry+atCdS78VcsZmIhkdfnMxI3AayOTBgJ/PMrmzMJpu23vtW0MhWXIDrA/VVvkA NLhuO96iXiDnViF+TgNshg0JWbQ8RVw= Received: from mail-lf1-f69.google.com (mail-lf1-f69.google.com [209.85.167.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-299-R_zCWCWNPA6m55zS5bQy1A-1; Wed, 23 Oct 2019 05:59:09 -0400 Received: by mail-lf1-f69.google.com with SMTP id v204so2214031lfa.0 for ; Wed, 23 Oct 2019 02:59:08 -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=TN/1EpNSFW/3lqrfhiPq8uNXDI9NIMY8XSXJK7178so=; b=OT1WliiJtp8TzrF52tU6w6y4V9bK7Jo2p+5kurk9jyNdXtisuWSbNp+MdS/yhmV0fa MMM2zE30fCo+CL4pzlkJKfATIm5nUAa3oFQI2XM5GXcyik4W3Mm4Qs+e4flZyKP332mC XgQnQLzItqf/bSdU9YRXAUqOMSiQpieetDTYApm7oZu0LqWd0ktusbNN7XkIoIxN9HXc zkY7Hnt6yn3Wm4IxxqqqoyjmiRtFX9Lj8O0rJhhWFwsoq0yhqwBAV7NA6g3UIp5q5TiS Bg9qMkrFzNpMgNpv35kLeQur1QC8l5eZ1RGpUM0IUh1gYS9mkBT9lRviBX9Fn/tA6Fwq WEMw== X-Gm-Message-State: APjAAAX8+ehk13jaQ4tfAFnTd1RlTq4NAeJWLF3gAswOBulAr5cfGBma MUI4pRku3Qgg1yHKAUraakZqZZZSJAI6oJzIcanOEpgUonkADQtm5JhIAYp4cz81f1adL+9otxw m6e+g9kfxh9Clz9qnwzJotg== X-Received: by 2002:a2e:8945:: with SMTP id b5mr17616955ljk.215.1571824747380; Wed, 23 Oct 2019 02:59:07 -0700 (PDT) X-Google-Smtp-Source: APXvYqzU+ZsbP9zZk9TC85BqMliMk8bChnVx6dBasLapL/WDjofhIKojGZXvSqiLPbiNqjPvL3/EHA== X-Received: by 2002:a2e:8945:: with SMTP id b5mr17616936ljk.215.1571824747132; Wed, 23 Oct 2019 02:59:07 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk (borgediget.toke.dk. [85.204.121.218]) by smtp.gmail.com with ESMTPSA id q16sm9186572lfb.74.2019.10.23.02.59.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2019 02:59:04 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 1B4151804B6; Wed, 23 Oct 2019 11:59:04 +0200 (CEST) Subject: [PATCH v6 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: Wed, 23 Oct 2019 11:59:04 +0200 Message-ID: <157182474399.150713.16380222749144410045.stgit@toke.dk> In-Reply-To: <157182473951.150713.7978051149956899705.stgit@toke.dk> References: <157182473951.150713.7978051149956899705.stgit@toke.dk> User-Agent: StGit/0.20 MIME-Version: 1.0 X-MC-Unique: R_zCWCWNPA6m55zS5bQy1A-1 X-Mimecast-Spam-Score: 0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191023_025912_471436_93E50E74 X-CRM114-Status: GOOD ( 12.14 ) 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.81 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 Message has at least one valid DKIM or DK signature -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 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 | 33 +++++++++++++++++++++++++++++++++ net/mac80211/tx.c | 21 +++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/net/mac80211/status.c b/net/mac80211/status.c index ab8ba5835ca0..ae15c8fd2421 100644 --- a/net/mac80211/status.c +++ b/net/mac80211/status.c @@ -676,6 +676,28 @@ static void ieee80211_report_used_skb(struct ieee80211_local *local, if (dropped) acked = false; + if (info->tx_time_est) { + struct sta_info *sta = NULL, *s; + struct rhlist_head *tmp; + + rcu_read_lock(); + + for_each_sta_info(local, hdr->addr1, s, tmp) { + /* skip wrong virtual interface */ + if (!ether_addr_equal(hdr->addr2, s->sdata->vif.addr)) + continue; + + sta = s; + break; + } + + ieee80211_sta_update_pending_airtime(local, sta, + skb_get_queue_mapping(skb), + info->tx_time_est << 2, + true); + rcu_read_unlock(); + } + if (info->flags & IEEE80211_TX_INTFL_MLME_CONN_TX) { struct ieee80211_sub_if_data *sdata; @@ -986,6 +1008,17 @@ static void __ieee80211_tx_status(struct ieee80211_hw *hw, ieee80211_sta_register_airtime(&sta->sta, tid, info->status.tx_time, 0); + 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, + skb_get_queue_mapping(skb), + info->tx_time_est << 2, + true); + info->tx_time_est = 0; + } + if (ieee80211_hw_check(&local->hw, REPORTS_TX_ACK_STATUS)) { if (info->flags & IEEE80211_TX_STAT_ACK) { if (sta->status_stats.lost_packets) diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 12653d873b8c..1405304d8994 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -3542,6 +3542,9 @@ struct sk_buff *ieee80211_tx_dequeue(struct ieee80211_hw *hw, WARN_ON_ONCE(softirq_count() == 0); + if (!ieee80211_txq_airtime_check(hw, txq)) + return NULL; + begin: spin_lock_bh(&fq->lock); @@ -3652,6 +3655,24 @@ struct sk_buff *ieee80211_tx_dequeue(struct ieee80211_hw *hw, } IEEE80211_SKB_CB(skb)->control.vif = vif; + + if (local->airtime_flags & AIRTIME_USE_AQL) { + u32 airtime; + + 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 4us and clamp the maximum to 2**12-1 + */ + airtime = min_t(u32, airtime, 4095) & ~3U; + info->tx_time_est = airtime >> 2; + ieee80211_sta_update_pending_airtime(local, tx.sta, + txq->ac, airtime, + false); + } + } + return skb; out: