From patchwork Wed Oct 23 09:58:59 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: 11206221 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 18C941390 for ; Wed, 23 Oct 2019 09:59:10 +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 EA7B120650 for ; Wed, 23 Oct 2019 09:59:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="mU4tzVwX"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="V0xt0jpx" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EA7B120650 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: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:In-Reply-To:References: List-Owner; bh=BhREk7d5KEHQCVMX9AoMkZDe8fUWshP96P56NmXSvvU=; b=mU4tzVwX9hhlht gMY2U59hzdrTQ6lUw5HY7RULVb1+d0JsaRlRfNM0lZ0NPEoX218xwIbWkXYjJoTLIqoU2UiKp73Bw RBhKM0RqC2vRW8zAp3O6szAIpSj0RwNx37Vkh1my9q6MLX6a8oiUkBR12fkXvjghIpNfMDEKBdiqp bq+O14RY5LSVQF8tR+KpQo8X4fcsRVMUXD3Bp7Xo6Awe7Epw7SJqEQZqRQwmhUvqJ+nPGomzvXOh2 /QoH/w03Eg/7wwsCAuPsd67fZljbnk8rZV1Yb1OKyZJsgvAOvjAvuu7+hngvZKqFCalSE8CPlSoI8 zzcxg29CnxOq73NyOiMw==; 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 1iNDQ4-0004sl-I2; Wed, 23 Oct 2019 09:59:08 +0000 Received: from us-smtp-2.mimecast.com ([205.139.110.61] helo=us-smtp-delivery-1.mimecast.com) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iNDQ2-0004qR-9A for ath10k@lists.infradead.org; Wed, 23 Oct 2019 09:59:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571824745; 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; bh=4pXgKJBnjUz11VWkqBfpqr53KxozwKIwmkHNMl/9+zw=; b=V0xt0jpx9FhIfygkJm27NI8mvFSP8OwcUHAN1L9MMpvoAl0vUo6cGPBOXwnFeC4GsWaaDC wlUOofm15TU+yeeX/5zBWgYFpGUlbe40VqBineXq1IYQCBk7440OLdqheiCjAieVWyHEVN re2a9+4aQZ5gjb7mPTylO7jtOwTWdm4= 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-272-_K0p6OtvPCaMthsKDnprtQ-1; Wed, 23 Oct 2019 05:59:03 -0400 Received: by mail-lj1-f198.google.com with SMTP id x13so3489762ljj.18 for ; Wed, 23 Oct 2019 02:59:03 -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:user-agent :mime-version:content-transfer-encoding; bh=3MdYMdnRKSV1nWFKnq3bdn9+gHDBMXYlX8Fslkg9MNs=; b=Ios3mcsw0VxQixNUqQt2VUHEG6Uv4E1ah53So+W+w6VsnFIZjJVPtVTKb8SxA9zYGI yjqga63X4v9BNI6Foo0VuQlrQmc/tAWugUqggDuDmV+AoG8PlIL+3bArVxiuqP/CQ75/ fNH+2djd240xqHpZqz825WSaYilOnuC7Rz7v2zP+OOEle2nRn6mk/unYv2B1rhi2WRbA gWTZy6kZTdPvmYVulwS1AFGhoT7npGgk48D01yC4daNWySrgZNZlfSXGngTwdhrbpPQ1 Zxvsu3Cy/jKvQIfI4FSTwHs5RHPh5bC2NQA7QInZvsHMw+Bgi6vt5XklALHtMWGtZft3 CSOA== X-Gm-Message-State: APjAAAU1mvzGxPgOEr6bQK6r02NfponnDw6d6nbCnNXM6zyABkupsq/3 M8mMQLiJiRVwagiQBXoKJVDVTH6tAgpqQCHGEcrsZLj48eAf3hbuv0yJkRziS2KJs5JYLv4QQHN 5ID5y6ebFAD+FZfzlZurw7Q== X-Received: by 2002:a19:ad0c:: with SMTP id t12mr21890689lfc.149.1571824742220; Wed, 23 Oct 2019 02:59:02 -0700 (PDT) X-Google-Smtp-Source: APXvYqxsccYFxdpe6TJ9G5owaW/IC69cMu7dyocQsa5i4gjDIRydu1slZLTJ+S7n4J8F2QYqIktmXA== X-Received: by 2002:a19:ad0c:: with SMTP id t12mr21890675lfc.149.1571824742010; Wed, 23 Oct 2019 02:59:02 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk ([2a00:7660:6da:443::2]) by smtp.gmail.com with ESMTPSA id x5sm12560666lfg.71.2019.10.23.02.59.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2019 02:59:00 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 9B33A1804B1; Wed, 23 Oct 2019 11:58:59 +0200 (CEST) Subject: [PATCH v6 0/4] Add Airtime Queue Limits (AQL) to mac80211 From: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= To: Johannes Berg Date: Wed, 23 Oct 2019 11:58:59 +0200 Message-ID: <157182473951.150713.7978051149956899705.stgit@toke.dk> User-Agent: StGit/0.20 MIME-Version: 1.0 X-MC-Unique: _K0p6OtvPCaMthsKDnprtQ-1 X-Mimecast-Spam-Score: 0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191023_025906_398408_0C1F7200 X-CRM114-Status: GOOD ( 13.28 ) 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.61 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 This series is a first attempt at porting the Airtime Queue Limits concept from the out-of-tree ath10k implementation[0] to mac80211. This version takes Kan's patch to do the throttling in mac80211, and replaces the driver API with the mechanism from the previous version of my series, which instead calculated the expected airtime at dequeue time inside mac80211, storing it in the SKB cb field. This series also imports Felix' airtime calculation code from mt76 into mac80211, adjusting the API so it can be used from TX dequeue, by extracting the latest TX rate from the tx_stats structure kept for each station. As before, I've only compile tested this (lacking the proper hardware to do more testing). So I'm hoping someone with a proper testing setup can take the whole thing for a spin... :) The series is also available in my git repo here: https://git.kernel.org/pub/scm/linux/kernel/git/toke/linux.git/log/?h=mac80211-aql-06 Changelog: v6: - Fix sta lookup in ieee80211_report_used_skb(). - Move call to ieee80211_sta_update_pending_airtime() to a bit later in __ieee80211_tx_status() v5: - Add missing export of ieee80211_calc_rx_airtime() and make ieee80211_calc_tx_airtime_rate() static (kbuildbot). - Use skb_get_queue_mapping() to get the AC from the skb. - Take basic rate configuration for the BSS into account when calculating multicast rate. v4: - Fix calculation that clamps the maximum airtime to fit into 10 bits - Incorporate Rich Brown's nits for the commit message in Kan's patch - Add fewer local variables to ieee80211_tx_dequeue() v3: - Move the tx_time_est field so it's shared with ack_frame_id, and use units of 4us for the value stored in it. - Move the addition of the Ethernet header size into ieee80211_calc_expected_tx_airtime() v2: - Integrate Kan's approach to airtime throttling. - Hopefully fix the cb struct alignment on big-endian architectures. --- Kan Yan (1): mac80211: Implement Airtime-based Queue Limit (AQL) Toke Høiland-Jørgensen (3): mac80211: Shrink the size of ack_frame_id to make room for tx_time_est mac80211: Import airtime calculation code from mt76 mac80211: Use Airtime-based Queue Limits (AQL) on packet dequeue include/net/cfg80211.h | 7 + include/net/mac80211.h | 45 +++++ net/mac80211/Makefile | 3 net/mac80211/airtime.c | 390 ++++++++++++++++++++++++++++++++++++++++++++ net/mac80211/cfg.c | 2 net/mac80211/debugfs.c | 78 +++++++++ net/mac80211/debugfs_sta.c | 43 ++++- net/mac80211/ieee80211_i.h | 8 + net/mac80211/main.c | 9 + net/mac80211/sta_info.c | 32 ++++ net/mac80211/sta_info.h | 8 + net/mac80211/status.c | 33 ++++ net/mac80211/tx.c | 69 +++++++- 13 files changed, 709 insertions(+), 18 deletions(-) create mode 100644 net/mac80211/airtime.c