From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.bufferbloat.net (Postfix) with ESMTPS id 2F4FD3CB3D for ; Tue, 22 Oct 2019 09:30:24 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571751023; 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=bfi5GeAeASQB1mQGyA998jFPTSgjtLqljftKsgNmsmA=; b=DI7ps11Enh2W7MeCSvnmlvylZNBG4P3MjQdX95HB4mESvxizzOD/Kp4d148C3dD3zK/ajs ZjZjbIADucGEtEjQ14DmIlD34nK9dZ+TxqoUqvu/nlXh3xa5Dip5TIKUjT0MijMOnbHY7N 0jkIbLbfG5WmtPmEbTh+jlj80Ec34zw= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-310-tnvZvEl-Oz-RDsbEcUhLrQ-1; Tue, 22 Oct 2019 09:30:22 -0400 Received: by mail-wr1-f70.google.com with SMTP id i10so1078381wrp.7 for ; Tue, 22 Oct 2019 06:30:22 -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=F3IUzbWrPuZHLVvq2XMf85ecX3kHWPzPpSEeKPTtYeU=; b=cM4KI+QhYZth44m+pUJj3AMkmH58gSCrCEP2CqaPcY4bXr/WamgPM0cFvMAhipnqaF O3GJngzuiYNxqn6bfumb2mLzb/ioUMCPk3Q5P5E98LvbZwB2CXbKbJfB3uLN88HcJmUd CZSgLliSKbdzLbh/oXjd5H1goaVSVQE8ykkQg2mFukkDhcqap+I1I+A30DrW16uM6TrK 2k3GjIUtaFfUt7CxZkRK1EBspZg8e92xbapdPRfI5kJfQVjGZgCh7XpmNdfslZtBsExV lExcUuxk33uduJIifjeVRFVe/oGQ+IzdpLGi5nbVTq25OmkzGFdCi48d17Yh6+SohkHi N7BQ== X-Gm-Message-State: APjAAAXcM5iGB861FrPG3smFqtMwK1Lz8NkueuHTXkLHcz8hJNSfyHJa nFV6eczINmL6q96WuANiO1gBB9rt4D4qkr7M6F9RqGGP5SAKZuiJNpYWdHGRO7SJ2pEMG0GP6gO YIcabvOqcaNAI7q8i0pqZfmlLN/E3s0rof2g= X-Received: by 2002:a1c:7219:: with SMTP id n25mr2894079wmc.23.1571751021129; Tue, 22 Oct 2019 06:30:21 -0700 (PDT) X-Google-Smtp-Source: APXvYqziX4ekm8/1EpyD3Im3QUBAKWW7u9wMWWw/uuSmmFI0HTkPrNzx3so3jUSjzVYxgaQs9oaw8Q== X-Received: by 2002:a1c:7219:: with SMTP id n25mr2894066wmc.23.1571751020898; Tue, 22 Oct 2019 06:30:20 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk (borgediget.toke.dk. [85.204.121.218]) by smtp.gmail.com with ESMTPSA id a17sm13394388wmb.8.2019.10.22.06.30.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2019 06:30:20 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 9D5FF1804B6; Tue, 22 Oct 2019 15:30:19 +0200 (CEST) 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: Tue, 22 Oct 2019 15:30:19 +0200 Message-ID: <157175101956.104114.5352455639882457638.stgit@toke.dk> In-Reply-To: <157175101518.104114.6722791270722911023.stgit@toke.dk> References: <157175101518.104114.6722791270722911023.stgit@toke.dk> User-Agent: StGit/0.20 MIME-Version: 1.0 X-MC-Unique: tnvZvEl-Oz-RDsbEcUhLrQ-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Subject: [Make-wifi-fast] [PATCH v5 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: Tue, 22 Oct 2019 13:30:24 -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 --- net/mac80211/status.c | 28 ++++++++++++++++++++++++++++ net/mac80211/tx.c | 21 +++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/net/mac80211/status.c b/net/mac80211/status.c index ab8ba5835ca0..f125984d5beb 100644 --- a/net/mac80211/status.c +++ b/net/mac80211/status.c @@ -676,6 +676,23 @@ static void ieee80211_report_used_skb(struct ieee80211= _local *local, =09if (dropped) =09=09acked =3D false; =20 +=09if (info->tx_time_est) { +=09=09struct ieee80211_sub_if_data *sdata; +=09=09struct sta_info *sta =3D NULL; + +=09=09rcu_read_lock(); + +=09=09sdata =3D ieee80211_sdata_from_skb(local, skb); +=09=09if (sdata) +=09=09=09sta =3D sta_info_get_bss(sdata, skb_mac_header(skb)); + +=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 info->tx_time_est << 2, +=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 @@ -930,6 +947,17 @@ static void __ieee80211_tx_status(struct ieee80211_hw = *hw, =09=09=09tid =3D qc[0] & 0xf; =09=09} =20 +=09=09if (info->tx_time_est) { +=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 info->tx_time_est << 2, +=09=09=09=09=09=09=09 true); +=09=09=09info->tx_time_est =3D 0; +=09=09} + =09=09if (!acked && ieee80211_is_back_req(fc)) { =09=09=09u16 control; =20 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, =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 @@ -3652,6 +3655,24 @@ 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=09/* We only have 10 bits in tx_time_est, so store airtime +=09=09=09 * in increments of 4us and clamp the maximum to 2**12-1 +=09=09=09 */ +=09=09=09airtime =3D min_t(u32, airtime, 4095) & ~3U; +=09=09=09info->tx_time_est =3D airtime >> 2; +=09=09=09ieee80211_sta_update_pending_airtime(local, tx.sta, +=09=09=09=09=09=09=09 txq->ac, airtime, +=09=09=09=09=09=09=09 false); +=09=09} +=09} + =09return skb; =20 out: