From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.bufferbloat.net (Postfix) with ESMTPS id AE0D93B29E for ; Sat, 16 Nov 2019 06:57:29 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573905449; 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=ilLVPFyCpQyNKBk2EUG5/jj7bM3HS/7e/LF0ODvZAgk=; b=P3MBRcmcDv9EkptaLjXqzQDIQjzJTmaLPyrUsckbbFPwtJtQlGwXEvfgLpmZwcvrZzhdNL eRHiSWGorTHe8BjexpApeuBIMBZIKnCMpRMDn6/jOaWXOrP9EdLFyYJc7JwP9YtRoAxoNj hV84rSqJiK2F/DWk67i+dyen6XNexSk= Received: from mail-lf1-f72.google.com (mail-lf1-f72.google.com [209.85.167.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-223-rPe7NN-bMASXnbSvZz7BOQ-1; Sat, 16 Nov 2019 06:57:25 -0500 Received: by mail-lf1-f72.google.com with SMTP id h3so3973439lfp.17 for ; Sat, 16 Nov 2019 03:57:25 -0800 (PST) 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=oxn6hk/e7p0C1hhW6DxtPJarksX3rwfaNgc1kLL7sWQ=; b=QNBd/tJcn5CZNT5w+1CIU3SsWB34KUMsIKzjBU3qCOUYiDJaUzAFaLlYLfCnG8pRnW x83eknBPoaaywCHgTQoRdtd0OUnPG4eovWYAMObGr8ONj8FkP0Ketr1a65nVP+BlcIlM kYCs/ELl1foDvcLpqXoHqRiP93egLHf+vJOgCygztwL+sCj96X9ZlxT+uVBP1ZxDwFET z0Jx/pTVPERQqwP5eoLP1VuyHD2QlV2f9tjglLj5em+gNHJ780Jcjc3S5B+imZmWWhIQ ApJEOSfkCqtzlBpZPDxY4EHwVUfV1IiDuM4QWbeFI9FtXgWk5DnDlu9wjlu4b2aGDST4 xJyQ== X-Gm-Message-State: APjAAAWv0PmH20bcVV1/xS68nnX/H1/TGZxPz1mmn2TuxEHShtAEKDqc efYyNXrw83L/Jm5WpI5GJ88Q/QXlUbPyB0aQxT1anDhhRxNqVJLRI4XDHyoOY55riiPFfr0zyk1 eSwHKkVqc/+z6W4SwLTADiOac3ul/BRwg8+U= X-Received: by 2002:a2e:9590:: with SMTP id w16mr13840387ljh.234.1573905443978; Sat, 16 Nov 2019 03:57:23 -0800 (PST) X-Google-Smtp-Source: APXvYqyP22WR0NlepWHXAp3bvMncxdf9rNBg9M37I4i1Hsk5sTldlqTbJHbyJANcRzpTzmN521ic1w== X-Received: by 2002:a2e:9590:: with SMTP id w16mr13840380ljh.234.1573905443776; Sat, 16 Nov 2019 03:57:23 -0800 (PST) Received: from alrua-x1.borgediget.toke.dk (borgediget.toke.dk. [85.204.121.218]) by smtp.gmail.com with ESMTPSA id 12sm5430059lju.55.2019.11.16.03.57.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Nov 2019 03:57:22 -0800 (PST) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 5DFF6181918; Sat, 16 Nov 2019 12:57:21 +0100 (CET) From: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= To: Johannes Berg Cc: linux-wireless@vger.kernel.org, make-wifi-fast@lists.bufferbloat.net, ath10k@lists.infradead.org, John Crispin , Lorenzo Bianconi , Felix Fietkau , Kan Yan , Rajkumar Manoharan , Kevin Hayes Date: Sat, 16 Nov 2019 12:57:21 +0100 Message-ID: <157390544128.662247.18090629768427352084.stgit@toke.dk> In-Reply-To: <157390543688.662247.3735146484299260207.stgit@toke.dk> References: <157390543688.662247.3735146484299260207.stgit@toke.dk> User-Agent: StGit/0.21 MIME-Version: 1.0 X-MC-Unique: rPe7NN-bMASXnbSvZz7BOQ-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Subject: [Make-wifi-fast] [PATCH v10 4/4] mac80211: Use Airtime-based Queue Limits (AQL) on packet dequeue 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: Sat, 16 Nov 2019 11:57:29 -0000 From: Toke H=C3=B8iland-J=C3=B8rgensen 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=C3=B8iland-J=C3=B8rgensen --- include/net/mac80211.h | 16 ++++++++++++++++ net/mac80211/status.c | 26 ++++++++++++++++++++++++++ net/mac80211/tx.c | 18 ++++++++++++++++++ 3 files changed, 60 insertions(+) diff --git a/include/net/mac80211.h b/include/net/mac80211.h index ba3f33cc41ea..aa145808e57a 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -1060,6 +1060,22 @@ struct ieee80211_tx_info { =09}; }; =20 +static inline u16 +ieee80211_info_set_tx_time_est(struct ieee80211_tx_info *info, u16 tx_time= _est) +{ +=09/* We only have 10 bits in tx_time_est, so store airtime +=09 * in increments of 4us and clamp the maximum to 2**12-1 +=09 */ +=09info->tx_time_est =3D min_t(u16, tx_time_est, 4095) >> 2; +=09return info->tx_time_est << 2; +} + +static inline u16 +ieee80211_info_get_tx_time_est(struct ieee80211_tx_info *info) +{ +=09return info->tx_time_est << 2; +} + /** * struct ieee80211_tx_status - extended tx status info for rate control * diff --git a/net/mac80211/status.c b/net/mac80211/status.c index 0e51def35b8a..39da82b35be9 100644 --- a/net/mac80211/status.c +++ b/net/mac80211/status.c @@ -670,12 +670,26 @@ static void ieee80211_report_used_skb(struct ieee8021= 1_local *local, =09=09=09=09 struct sk_buff *skb, bool dropped) { =09struct ieee80211_tx_info *info =3D IEEE80211_SKB_CB(skb); +=09u16 tx_time_est =3D ieee80211_info_get_tx_time_est(info); =09struct ieee80211_hdr *hdr =3D (void *)skb->data; =09bool acked =3D info->flags & IEEE80211_TX_STAT_ACK; =20 =09if (dropped) =09=09acked =3D false; =20 +=09if (tx_time_est) { +=09=09struct sta_info *sta; + +=09=09rcu_read_lock(); + +=09=09sta =3D sta_info_get_by_addrs(local, hdr->addr1, hdr->addr2); +=09=09ieee80211_sta_update_pending_airtime(local, sta, +=09=09=09=09=09=09 skb_get_queue_mapping(skb), +=09=09=09=09=09=09 tx_time_est, +=09=09=09=09=09=09 true); +=09=09rcu_read_unlock(); +=09} + =09if (info->flags & IEEE80211_TX_INTFL_MLME_CONN_TX) { =09=09struct ieee80211_sub_if_data *sdata; =20 @@ -877,6 +891,7 @@ static void __ieee80211_tx_status(struct ieee80211_hw *= hw, =09struct ieee80211_bar *bar; =09int shift =3D 0; =09int tid =3D IEEE80211_NUM_TIDS; +=09u16 tx_time_est; =20 =09rates_idx =3D ieee80211_tx_get_rates(hw, info, &retry_count); =20 @@ -986,6 +1001,17 @@ static void __ieee80211_tx_status(struct ieee80211_hw= *hw, =09=09=09ieee80211_sta_register_airtime(&sta->sta, tid, =09=09=09=09=09=09 info->status.tx_time, 0); =20 +=09=09if ((tx_time_est =3D ieee80211_info_get_tx_time_est(info)) > 0) { +=09=09=09/* Do this here to avoid the expensive lookup of the sta +=09=09=09 * in ieee80211_report_used_skb(). +=09=09=09 */ +=09=09=09ieee80211_sta_update_pending_airtime(local, sta, +=09=09=09=09=09=09=09 skb_get_queue_mapping(skb), +=09=09=09=09=09=09=09 tx_time_est, +=09=09=09=09=09=09=09 true); +=09=09=09ieee80211_info_set_tx_time_est(info, 0); +=09=09} + =09=09if (ieee80211_hw_check(&local->hw, REPORTS_TX_ACK_STATUS)) { =09=09=09if (info->flags & IEEE80211_TX_STAT_ACK) { =09=09=09=09if (sta->status_stats.lost_packets) diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index aafc67b562eb..2fb6571453e7 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -3551,6 +3551,9 @@ struct sk_buff *ieee80211_tx_dequeue(struct ieee80211= _hw *hw, =20 =09WARN_ON_ONCE(softirq_count() =3D=3D 0); =20 +=09if (!ieee80211_txq_airtime_check(hw, txq)) +=09=09return NULL; + begin: =09spin_lock_bh(&fq->lock); =20 @@ -3661,6 +3664,21 @@ struct sk_buff *ieee80211_tx_dequeue(struct ieee8021= 1_hw *hw, =09} =20 =09IEEE80211_SKB_CB(skb)->control.vif =3D vif; + +=09if (local->airtime_flags & AIRTIME_USE_AQL) { +=09=09u32 airtime; + +=09=09airtime =3D ieee80211_calc_expected_tx_airtime(hw, vif, txq->sta, +=09=09=09=09=09=09=09 skb->len); +=09=09if (airtime) { +=09=09=09airtime =3D ieee80211_info_set_tx_time_est(info, airtime); +=09=09=09ieee80211_sta_update_pending_airtime(local, tx.sta, +=09=09=09=09=09=09=09 txq->ac, +=09=09=09=09=09=09=09 airtime, +=09=09=09=09=09=09=09 false); +=09=09} +=09} + =09return skb; =20 out: