From patchwork Tue Oct 15 17:19:01 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: 11191307 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 0ECD21390 for ; Tue, 15 Oct 2019 17:19: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 E085C20854 for ; Tue, 15 Oct 2019 17:19:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="GvMpOK0V"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="OLYFNKrd" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E085C20854 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=KpeiwxLeEEOpsUldsZuLkLgKhmrq3UqzxTExO9o9NjY=; b=GvMpOK0VvyIarC HK3raXoNwXrV9m1NNYCDgaW5tPpl0iTwmMqzX4VOAVQ3O/LwCvBdcIO0DLSi6HTS5eq7swUVYwFDf cafCslVyRjZa3/7kMd71V7zSwWnGusfZcpXJyfqdpZiN+igoDVOY7yyjaAAAF0swsgArVI392wgKl xjTX50WMQ+Wlx2uCjB8unlJaVytDDdRxVBzlHWm/4KE0m8KuUGvsFo9uw0xgGVdwInP1KudvrG17q zNFso7ewuA6q6brhzQgleBvMrA6YdRDPi1YejLuCzyroMylech8Qi4Lheef5s7fr/p+U9eP2B4hy5 0YIdr8gqmscsTwWEwLjA==; 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 1iKQTn-0007If-B9; Tue, 15 Oct 2019 17:19:27 +0000 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120] helo=us-smtp-1.mimecast.com) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iKQTW-0006zF-Sb for ath10k@lists.infradead.org; Tue, 15 Oct 2019 17:19:12 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571159947; 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=GyvbrDu8qEmiyON3oCp/2+bOvx6xuJkqb2dCqG+bTwY=; b=OLYFNKrd+y1DoVjsXyeK4O1rxkkNiGXWoDOsvDuT3zxblaGxW3dad9ECDFFryVbemCAL4N 35B23nliB2jQUkAxcBKBnFUxu7Oq4Ys5awnyZYge1RK4VS5+12pqpGI8QOp+bnrG50maBH ioiPA6cZ4Sh4+ITH0E/uXbjE1nwfc4E= Received: from mail-lj1-f198.google.com (mail-lj1-f198.google.com [209.85.208.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-46-XJKhUdL3MSCO8ncdiU5RMw-1; Tue, 15 Oct 2019 13:19:05 -0400 Received: by mail-lj1-f198.google.com with SMTP id i18so4044685ljg.14 for ; Tue, 15 Oct 2019 10:19:05 -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=mshGTrJaOuTUiekVjuspbBrpGAw6s+TpOZLBOSqMh18=; b=PwEtbmBK69PxNDDndN1m4JhAX22e0G1Y+wafROpLlY0uUcQ9d20jh3u30iZfMviDX2 jmFxdNipNy9QSJtB4KWu3HsKBvkS9ZSWgBrL8XYVgurGKiCpTvNx94ANHYqAzsVVaxY4 KFe7SUOzYSlkYb9EOPR8X064Fhd8AKEB7SfyJFnQ9qvmaaQH4sWKoYk7eUdP0oh3u00s f13klr2v9rU3STLpwsVnd7i0UAryBOZfzN4VcM93Z/+kU6j9j+UGnDnchTGuzUCooiNu YHLrhtT+16nxvDnOTueVctbhNDMbdumTgmB4Fw9KfS/XARlgwRiWkygVezHM92VKFZpn HmJA== X-Gm-Message-State: APjAAAX/WDQyDOdfYgFnxJ/Y1EgSayjiaxLuSfVGZ0yHJaXERFvTaCmy EjogG38zQ/kdgUsgzWyrnFuIrQX1R6Y9NcibAFVTXJGT3yHKdrubQNGGWUzvfesdYkjs6tbfiQ2 lwiRVyOHSbUf/q0DyMtGCLg== X-Received: by 2002:ac2:5df0:: with SMTP id z16mr14300267lfq.36.1571159943775; Tue, 15 Oct 2019 10:19:03 -0700 (PDT) X-Google-Smtp-Source: APXvYqwtmWhVJzibU3fbFh0zzmpTOwLDpwyRfz8OIjlJgF3lnE3XdYDXQ1Jt6j749UmjRgzPR7qwpg== X-Received: by 2002:ac2:5df0:: with SMTP id z16mr14300247lfq.36.1571159943542; Tue, 15 Oct 2019 10:19:03 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk (borgediget.toke.dk. [85.204.121.218]) by smtp.gmail.com with ESMTPSA id z18sm5130432ljh.17.2019.10.15.10.19.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2019 10:19:02 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id F1C501803A8; Tue, 15 Oct 2019 19:19:01 +0200 (CEST) Subject: [PATCH v2 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: Tue, 15 Oct 2019 19:19:01 +0200 Message-ID: <157115994190.2500430.14955682016008497593.stgit@toke.dk> In-Reply-To: <157115993755.2500430.12214017471129215800.stgit@toke.dk> References: <157115993755.2500430.12214017471129215800.stgit@toke.dk> User-Agent: StGit/0.20 MIME-Version: 1.0 X-MC-Unique: XJKhUdL3MSCO8ncdiU5RMw-1 X-Mimecast-Spam-Score: 0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191015_101911_043662_52AEB566 X-CRM114-Status: GOOD ( 12.15 ) 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 [205.139.110.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 Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 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 | 16 ++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/net/mac80211/status.c b/net/mac80211/status.c index ab8ba5835ca0..ce990a1e9043 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->status.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->status.tx_time_est, + 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->status.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->status.tx_time_est, + true); + info->status.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 405f622b3fe0..b6b47171b340 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,17 @@ 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 + 38); + if (airtime) { + info->control.tx_time_est = airtime; + ieee80211_sta_update_pending_airtime(local, tx.sta, ac, + airtime, false); + } + } + return skb; out: