From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F02CACA9EBB for ; Tue, 22 Oct 2019 13:30:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C6C8021906 for ; Tue, 22 Oct 2019 13:30:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="VInaSbqh" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387774AbfJVNaV (ORCPT ); Tue, 22 Oct 2019 09:30:21 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:31358 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1731060AbfJVNaU (ORCPT ); Tue, 22 Oct 2019 09:30:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571751019; 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=IrDLzKu3QUrojH/OETXB4MdYg9Xjq+HLcPnCemzkA6Q=; b=VInaSbqh8tT1KaW9ZJY91t5jQtJDWJFGr3iDF9cu16YkSx2iJ5cEP5PJL+fIRPltKsB1Wm Epm4tYwG44iN1SpFkTT2YzRkiNwRyTx+dOX9EDAYNUBCGCN/s4t2DFg7xQevEYJcREIdMT pi/gZ9TpGaoL0akwPhW4XEQYsakQrSc= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-229-D4r_xS8VOy2VcqkUHanh9A-1; Tue, 22 Oct 2019 09:30:18 -0400 Received: by mail-wm1-f72.google.com with SMTP id z205so7498036wmb.7 for ; Tue, 22 Oct 2019 06:30:18 -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=HF+1TVAQSxCzMriSPvPocN7qek9sM/0jfjtpbpavxbM=; b=pJx5mGA2/TdfwD8xPwmdSqdtgf1G8A/gBJVMchmD2qmGDIddTk5QuF2Szu+niYRw1X fSKcCcFsNZLPWHxTQcZppFUUjQZCzcYnud1AcfCXT06AqGMKfsoHZ5pGkGcl2CGX3CCF +HofEJz7VVkoIMLztjZX9zPu9hFtiHHDlhYdvnmK5aB/yPYupLP6XJuL7PxNsBXmNITx 82nV4bbEs5dhCS0WqDM4xObrJAIB06XzgMSWOLDs8Pb61p5qfSMj3JAgEokRMMC8m98b Vib2ypf3s7AhN0Gj9HitmDbe7l6xLal/bKovQcdTteVQKyVicnSleC3csdgolL9oBlsC iNKg== X-Gm-Message-State: APjAAAWGxZitcUabHeB8l1WYJXpYOsn1b41kmC6h08XllDRlZErWTVpX ZPICpPDGPTqMbMN5j63FYwPNwjAhwl3tBzVw+qFXkyRw8qpl/iu9EIQ5rJOxloHdMVXQertijao 7n7rGOWkOYtjcVKzSrPtvLc8KcFY= X-Received: by 2002:a1c:b4c1:: with SMTP id d184mr2889388wmf.37.1571751017061; Tue, 22 Oct 2019 06:30:17 -0700 (PDT) X-Google-Smtp-Source: APXvYqxoGxGUot97MZlqwfPaLTsIDEjUXh20FBPZYwIEwIdrmUKHsNxhK9PMFDu5LGyPVlS9+2/g8A== X-Received: by 2002:a1c:b4c1:: with SMTP id d184mr2889362wmf.37.1571751016790; Tue, 22 Oct 2019 06:30:16 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk (borgediget.toke.dk. [85.204.121.218]) by smtp.gmail.com with ESMTPSA id u11sm16355257wmd.32.2019.10.22.06.30.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2019 06:30:15 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 49BFD1804B1; Tue, 22 Oct 2019 15:30:15 +0200 (CEST) Subject: [PATCH v5 0/4] Add Airtime Queue Limits (AQL) to mac80211 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:15 +0200 Message-ID: <157175101518.104114.6722791270722911023.stgit@toke.dk> User-Agent: StGit/0.20 MIME-Version: 1.0 X-MC-Unique: D4r_xS8VOy2VcqkUHanh9A-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.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 Ka= n's patch to do the throttling in mac80211, and replaces the driver API with th= e 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 extractin= g 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 wh= ole 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=3Dmac= 80211-aql-02 Changelog: 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 un= its of 4us for the value stored in it. - Move the addition of the Ethernet header size into ieee80211_calc_expec= ted_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=C3=B8iland-J=C3=B8rgensen (3): mac80211: Shrink the size of ack_frame_id to make room for tx_time_es= t 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=20 net/mac80211/airtime.c | 390 ++++++++++++++++++++++++++++++++++++++++= ++++ net/mac80211/cfg.c | 2=20 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 | 28 +++ net/mac80211/tx.c | 69 +++++++- 13 files changed, 704 insertions(+), 18 deletions(-) create mode 100644 net/mac80211/airtime.c From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120] helo=us-smtp-1.mimecast.com) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iMuEx-0008DI-3i for ath10k@lists.infradead.org; Tue, 22 Oct 2019 13:30:25 +0000 Received: by mail-wm1-f71.google.com with SMTP id z24so6238812wmk.8 for ; Tue, 22 Oct 2019 06:30:18 -0700 (PDT) Subject: [PATCH v5 0/4] Add Airtime Queue Limits (AQL) to mac80211 From: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= Date: Tue, 22 Oct 2019 15:30:15 +0200 Message-ID: <157175101518.104114.6722791270722911023.stgit@toke.dk> MIME-Version: 1.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "ath10k" Errors-To: ath10k-bounces+kvalo=adurom.com@lists.infradead.org To: Johannes Berg 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 VGhpcyBzZXJpZXMgaXMgYSBmaXJzdCBhdHRlbXB0IGF0IHBvcnRpbmcgdGhlIEFpcnRpbWUgUXVl dWUgTGltaXRzIGNvbmNlcHQgZnJvbQp0aGUgb3V0LW9mLXRyZWUgYXRoMTBrIGltcGxlbWVudGF0 aW9uWzBdIHRvIG1hYzgwMjExLiBUaGlzIHZlcnNpb24gdGFrZXMgS2FuJ3MKcGF0Y2ggdG8gZG8g dGhlIHRocm90dGxpbmcgaW4gbWFjODAyMTEsIGFuZCByZXBsYWNlcyB0aGUgZHJpdmVyIEFQSSB3 aXRoIHRoZQptZWNoYW5pc20gZnJvbSB0aGUgcHJldmlvdXMgdmVyc2lvbiBvZiBteSBzZXJpZXMs IHdoaWNoIGluc3RlYWQgY2FsY3VsYXRlZCB0aGUKZXhwZWN0ZWQgYWlydGltZSBhdCBkZXF1ZXVl IHRpbWUgaW5zaWRlIG1hYzgwMjExLCBzdG9yaW5nIGl0IGluIHRoZSBTS0IgY2IKZmllbGQuCgpU aGlzIHNlcmllcyBhbHNvIGltcG9ydHMgRmVsaXgnIGFpcnRpbWUgY2FsY3VsYXRpb24gY29kZSBm cm9tIG10NzYgaW50bwptYWM4MDIxMSwgYWRqdXN0aW5nIHRoZSBBUEkgc28gaXQgY2FuIGJlIHVz ZWQgZnJvbSBUWCBkZXF1ZXVlLCBieSBleHRyYWN0aW5nIHRoZQpsYXRlc3QgVFggcmF0ZSBmcm9t IHRoZSB0eF9zdGF0cyBzdHJ1Y3R1cmUga2VwdCBmb3IgZWFjaCBzdGF0aW9uLgoKQXMgYmVmb3Jl LCBJJ3ZlIG9ubHkgY29tcGlsZSB0ZXN0ZWQgdGhpcyAobGFja2luZyB0aGUgcHJvcGVyIGhhcmR3 YXJlIHRvIGRvIG1vcmUKdGVzdGluZykuIFNvIEknbSBob3Bpbmcgc29tZW9uZSB3aXRoIGEgcHJv cGVyIHRlc3Rpbmcgc2V0dXAgY2FuIHRha2UgdGhlIHdob2xlCnRoaW5nIGZvciBhIHNwaW4uLi4g OikKClRoZSBzZXJpZXMgaXMgYWxzbyBhdmFpbGFibGUgaW4gbXkgZ2l0IHJlcG8gaGVyZToKaHR0 cHM6Ly9naXQua2VybmVsLm9yZy9wdWIvc2NtL2xpbnV4L2tlcm5lbC9naXQvdG9rZS9saW51eC5n aXQvbG9nLz9oPW1hYzgwMjExLWFxbC0wMgoKQ2hhbmdlbG9nOgoKdjU6CiAgLSBBZGQgbWlzc2lu ZyBleHBvcnQgb2YgaWVlZTgwMjExX2NhbGNfcnhfYWlydGltZSgpIGFuZCBtYWtlCiAgICBpZWVl ODAyMTFfY2FsY190eF9haXJ0aW1lX3JhdGUoKSBzdGF0aWMgKGtidWlsZGJvdCkuCiAgLSBVc2Ug c2tiX2dldF9xdWV1ZV9tYXBwaW5nKCkgdG8gZ2V0IHRoZSBBQyBmcm9tIHRoZSBza2IuCiAgLSBU YWtlIGJhc2ljIHJhdGUgY29uZmlndXJhdGlvbiBmb3IgdGhlIEJTUyBpbnRvIGFjY291bnQgd2hl biBjYWxjdWxhdGluZwogICAgbXVsdGljYXN0IHJhdGUuCnY0OgogIC0gRml4IGNhbGN1bGF0aW9u IHRoYXQgY2xhbXBzIHRoZSBtYXhpbXVtIGFpcnRpbWUgdG8gZml0IGludG8gMTAgYml0cwogIC0g SW5jb3Jwb3JhdGUgUmljaCBCcm93bidzIG5pdHMgZm9yIHRoZSBjb21taXQgbWVzc2FnZSBpbiBL YW4ncyBwYXRjaAogIC0gQWRkIGZld2VyIGxvY2FsIHZhcmlhYmxlcyB0byBpZWVlODAyMTFfdHhf ZGVxdWV1ZSgpCnYzOgogIC0gTW92ZSB0aGUgdHhfdGltZV9lc3QgZmllbGQgc28gaXQncyBzaGFy ZWQgd2l0aCBhY2tfZnJhbWVfaWQsIGFuZCB1c2UgdW5pdHMKICAgIG9mIDR1cyBmb3IgdGhlIHZh bHVlIHN0b3JlZCBpbiBpdC4KICAtIE1vdmUgdGhlIGFkZGl0aW9uIG9mIHRoZSBFdGhlcm5ldCBo ZWFkZXIgc2l6ZSBpbnRvIGllZWU4MDIxMV9jYWxjX2V4cGVjdGVkX3R4X2FpcnRpbWUoKQp2MjoK ICAtIEludGVncmF0ZSBLYW4ncyBhcHByb2FjaCB0byBhaXJ0aW1lIHRocm90dGxpbmcuCiAgLSBI b3BlZnVsbHkgZml4IHRoZSBjYiBzdHJ1Y3QgYWxpZ25tZW50IG9uIGJpZy1lbmRpYW4gYXJjaGl0 ZWN0dXJlcy4KCi0tLQoKS2FuIFlhbiAoMSk6CiAgICAgIG1hYzgwMjExOiBJbXBsZW1lbnQgQWly dGltZS1iYXNlZCBRdWV1ZSBMaW1pdCAoQVFMKQoKVG9rZSBIw7hpbGFuZC1Kw7hyZ2Vuc2VuICgz KToKICAgICAgbWFjODAyMTE6IFNocmluayB0aGUgc2l6ZSBvZiBhY2tfZnJhbWVfaWQgdG8gbWFr ZSByb29tIGZvciB0eF90aW1lX2VzdAogICAgICBtYWM4MDIxMTogSW1wb3J0IGFpcnRpbWUgY2Fs Y3VsYXRpb24gY29kZSBmcm9tIG10NzYKICAgICAgbWFjODAyMTE6IFVzZSBBaXJ0aW1lLWJhc2Vk IFF1ZXVlIExpbWl0cyAoQVFMKSBvbiBwYWNrZXQgZGVxdWV1ZQoKCiBpbmNsdWRlL25ldC9jZmc4 MDIxMS5oICAgICB8ICAgIDcgKwogaW5jbHVkZS9uZXQvbWFjODAyMTEuaCAgICAgfCAgIDQ1ICsr KysrCiBuZXQvbWFjODAyMTEvTWFrZWZpbGUgICAgICB8ICAgIDMgCiBuZXQvbWFjODAyMTEvYWly dGltZS5jICAgICB8ICAzOTAgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysKIG5ldC9tYWM4MDIxMS9jZmcuYyAgICAgICAgIHwgICAgMiAKIG5ldC9tYWM4MDIxMS9k ZWJ1Z2ZzLmMgICAgIHwgICA3OCArKysrKysrKysKIG5ldC9tYWM4MDIxMS9kZWJ1Z2ZzX3N0YS5j IHwgICA0MyArKysrLQogbmV0L21hYzgwMjExL2llZWU4MDIxMV9pLmggfCAgICA4ICsKIG5ldC9t YWM4MDIxMS9tYWluLmMgICAgICAgIHwgICAgOSArCiBuZXQvbWFjODAyMTEvc3RhX2luZm8uYyAg ICB8ICAgMzIgKysrKwogbmV0L21hYzgwMjExL3N0YV9pbmZvLmggICAgfCAgICA4ICsKIG5ldC9t YWM4MDIxMS9zdGF0dXMuYyAgICAgIHwgICAyOCArKysKIG5ldC9tYWM4MDIxMS90eC5jICAgICAg ICAgIHwgICA2OSArKysrKysrLQogMTMgZmlsZXMgY2hhbmdlZCwgNzA0IGluc2VydGlvbnMoKyks IDE4IGRlbGV0aW9ucygtKQogY3JlYXRlIG1vZGUgMTAwNjQ0IG5ldC9tYWM4MDIxMS9haXJ0aW1l LmMKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphdGgx MGsgbWFpbGluZyBsaXN0CmF0aDEwa0BsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5p bmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8vYXRoMTBrCg==