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=-13.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL 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 8466CC5DF60 for ; Thu, 7 Nov 2019 06:14:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4F295218AE for ; Thu, 7 Nov 2019 06:14:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Pfr4O/UF" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726282AbfKGGOf (ORCPT ); Thu, 7 Nov 2019 01:14:35 -0500 Received: from mail-lj1-f196.google.com ([209.85.208.196]:42632 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725938AbfKGGOf (ORCPT ); Thu, 7 Nov 2019 01:14:35 -0500 Received: by mail-lj1-f196.google.com with SMTP id n5so851020ljc.9 for ; Wed, 06 Nov 2019 22:14:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=G20uDCnZ3VggElG4QPQIueyfFp9elwSxdclEXe5q4wI=; b=Pfr4O/UFKdu1PstiJc5UkY5CxZVKh1mQyDEUnzFkBFC36EJnrfqe3p8x/jEhdnN6SD ovz0YB2wHd5vKFez+AL9kEqfC7CmhiWdQMUPI/675Aam8MGpaElHbf+bJQjuBmlkNIM/ MECzG6CXNrhdeW5zfg7BH8XAcRGgbfVs2DJr0HhpldDVjyM64qAtH3oLCReaZEeyQ7Jz o052OkpraQz92DWJjimWTjtVqABhXgmduCv8trSbCbof6udAu1dCndCmkigiGbQboFPH R85rfBwd1rk9MOip3TRuyCciD2jVqa3mqyEZ1sOKnPHQGhE6DEy7Bym46JP5vdwFs1iP 4EAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=G20uDCnZ3VggElG4QPQIueyfFp9elwSxdclEXe5q4wI=; b=tgiekmsKqlm6giUo3BEd8SnQbRCqxKykAV5NRvBBwu3RgZEOTSiK2fXcWxnp4APqpQ C6La43MKgjpwqKhsD8nnd1cRKs+Snpk2MBXUtEQLax0ZqS6RmXl6mJJulgl5XuSJr42/ 2cUm4nffIqPXTQZrQtpTsDmS//ZkKrUwQMgjeak3FX1TZZOsla5rMZn6q3QoGD9tJOK2 RMLt0RzW5g2coI+z6cMSEmlahhW90a1Zlx6yQr31QGNWZ5KFSkgzlsT76wozjB4Z7vWt 7TYX5HfZQsfMGWW+VPXKsReQOXqstiyRznKGf32kncRP2hC2jPF0C2hv1nueGQ4QJ47W uB3Q== X-Gm-Message-State: APjAAAVlWqrdHqQT+88P0O5ZKLwt7bGD+8ddyvVqh+d0SEQ6DcSM7jm8 xvtZYeek1plW7XlqnhpfuPhUyqmDdVg275sNcc1yCw== X-Google-Smtp-Source: APXvYqysDCGa4md3DJKlaj1XmpADyCPv3/2tOdV7mFSIVBTUCjOtcAW5LEDFojFZhMnhdYazOBoH+jLACx6BhWt3znk= X-Received: by 2002:a2e:9ad8:: with SMTP id p24mr961356ljj.114.1573107272596; Wed, 06 Nov 2019 22:14:32 -0800 (PST) MIME-Version: 1.0 References: <157182473951.150713.7978051149956899705.stgit@toke.dk> In-Reply-To: <157182473951.150713.7978051149956899705.stgit@toke.dk> From: Kan Yan Date: Wed, 6 Nov 2019 22:14:20 -0800 Message-ID: Subject: Re: [PATCH v6 0/4] Add Airtime Queue Limits (AQL) to mac80211 To: =?UTF-8?B?VG9rZSBIw7hpbGFuZC1Kw7hyZ2Vuc2Vu?= Cc: Johannes Berg , linux-wireless@vger.kernel.org, Make-Wifi-fast , ath10k@lists.infradead.org, John Crispin , Lorenzo Bianconi , Felix Fietkau , Rajkumar Manoharan , Kevin Hayes 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 Patchset v6 works for me with ath10k driver. AQL does its job as expected and tests show very significant reduction in latency in congested environment. The txq stuck issue in patchset v4 got fixed. However, the device's total pending airtime count still underflows sometimes. Even though it doesn't cause apparent side effect, there is some issue with the pending airtime update and needs further debugging. Regards, Kan On Wed, Oct 23, 2019 at 2:59 AM Toke H=C3=B8iland-J=C3=B8rgensen wrote: > > This series is a first attempt at porting the Airtime Queue Limits concep= t 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 calculate= d the > expected airtime at dequeue time inside mac80211, storing it in the SKB c= b > 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 extract= ing 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=3Dm= ac80211-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 calculati= ng > 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_exp= ected_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_= 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 > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-lj1-x244.google.com ([2a00:1450:4864:20::244]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iSb43-0003XM-8W for ath10k@lists.infradead.org; Thu, 07 Nov 2019 06:14:40 +0000 Received: by mail-lj1-x244.google.com with SMTP id g3so843388ljl.11 for ; Wed, 06 Nov 2019 22:14:34 -0800 (PST) MIME-Version: 1.0 References: <157182473951.150713.7978051149956899705.stgit@toke.dk> In-Reply-To: <157182473951.150713.7978051149956899705.stgit@toke.dk> From: Kan Yan Date: Wed, 6 Nov 2019 22:14:20 -0800 Message-ID: Subject: Re: [PATCH v6 0/4] Add Airtime Queue Limits (AQL) to mac80211 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: =?UTF-8?B?VG9rZSBIw7hpbGFuZC1Kw7hyZ2Vuc2Vu?= Cc: Rajkumar Manoharan , Kevin Hayes , Make-Wifi-fast , linux-wireless@vger.kernel.org, ath10k@lists.infradead.org, John Crispin , Johannes Berg , Lorenzo Bianconi , Felix Fietkau UGF0Y2hzZXQgdjYgd29ya3MgZm9yIG1lIHdpdGggYXRoMTBrIGRyaXZlci4gIEFRTCBkb2VzIGl0 cyBqb2IgYXMKZXhwZWN0ZWQgYW5kIHRlc3RzIHNob3cgdmVyeSBzaWduaWZpY2FudCByZWR1Y3Rp b24gaW4gbGF0ZW5jeSBpbgpjb25nZXN0ZWQgZW52aXJvbm1lbnQuIFRoZSB0eHEgc3R1Y2sgaXNz dWUgaW4gcGF0Y2hzZXQgdjQgZ290IGZpeGVkLgoKSG93ZXZlciwgdGhlIGRldmljZSdzIHRvdGFs IHBlbmRpbmcgYWlydGltZSBjb3VudCBzdGlsbCB1bmRlcmZsb3dzCnNvbWV0aW1lcy4gRXZlbiB0 aG91Z2ggaXQgZG9lc24ndCBjYXVzZSBhcHBhcmVudCBzaWRlIGVmZmVjdCwgdGhlcmUgaXMKc29t ZSBpc3N1ZSB3aXRoIHRoZSBwZW5kaW5nIGFpcnRpbWUgdXBkYXRlIGFuZCBuZWVkcyBmdXJ0aGVy CmRlYnVnZ2luZy4KClJlZ2FyZHMsCkthbgoKCk9uIFdlZCwgT2N0IDIzLCAyMDE5IGF0IDI6NTkg QU0gVG9rZSBIw7hpbGFuZC1Kw7hyZ2Vuc2VuIDx0b2tlQHJlZGhhdC5jb20+IHdyb3RlOgo+Cj4g VGhpcyBzZXJpZXMgaXMgYSBmaXJzdCBhdHRlbXB0IGF0IHBvcnRpbmcgdGhlIEFpcnRpbWUgUXVl dWUgTGltaXRzIGNvbmNlcHQgZnJvbQo+IHRoZSBvdXQtb2YtdHJlZSBhdGgxMGsgaW1wbGVtZW50 YXRpb25bMF0gdG8gbWFjODAyMTEuIFRoaXMgdmVyc2lvbiB0YWtlcyBLYW4ncwo+IHBhdGNoIHRv IGRvIHRoZSB0aHJvdHRsaW5nIGluIG1hYzgwMjExLCBhbmQgcmVwbGFjZXMgdGhlIGRyaXZlciBB UEkgd2l0aCB0aGUKPiBtZWNoYW5pc20gZnJvbSB0aGUgcHJldmlvdXMgdmVyc2lvbiBvZiBteSBz ZXJpZXMsIHdoaWNoIGluc3RlYWQgY2FsY3VsYXRlZCB0aGUKPiBleHBlY3RlZCBhaXJ0aW1lIGF0 IGRlcXVldWUgdGltZSBpbnNpZGUgbWFjODAyMTEsIHN0b3JpbmcgaXQgaW4gdGhlIFNLQiBjYgo+ IGZpZWxkLgo+Cj4gVGhpcyBzZXJpZXMgYWxzbyBpbXBvcnRzIEZlbGl4JyBhaXJ0aW1lIGNhbGN1 bGF0aW9uIGNvZGUgZnJvbSBtdDc2IGludG8KPiBtYWM4MDIxMSwgYWRqdXN0aW5nIHRoZSBBUEkg c28gaXQgY2FuIGJlIHVzZWQgZnJvbSBUWCBkZXF1ZXVlLCBieSBleHRyYWN0aW5nIHRoZQo+IGxh dGVzdCBUWCByYXRlIGZyb20gdGhlIHR4X3N0YXRzIHN0cnVjdHVyZSBrZXB0IGZvciBlYWNoIHN0 YXRpb24uCj4KPiBBcyBiZWZvcmUsIEkndmUgb25seSBjb21waWxlIHRlc3RlZCB0aGlzIChsYWNr aW5nIHRoZSBwcm9wZXIgaGFyZHdhcmUgdG8gZG8gbW9yZQo+IHRlc3RpbmcpLiBTbyBJJ20gaG9w aW5nIHNvbWVvbmUgd2l0aCBhIHByb3BlciB0ZXN0aW5nIHNldHVwIGNhbiB0YWtlIHRoZSB3aG9s ZQo+IHRoaW5nIGZvciBhIHNwaW4uLi4gOikKPgo+IFRoZSBzZXJpZXMgaXMgYWxzbyBhdmFpbGFi bGUgaW4gbXkgZ2l0IHJlcG8gaGVyZToKPiBodHRwczovL2dpdC5rZXJuZWwub3JnL3B1Yi9zY20v bGludXgva2VybmVsL2dpdC90b2tlL2xpbnV4LmdpdC9sb2cvP2g9bWFjODAyMTEtYXFsLTA2Cj4K PiBDaGFuZ2Vsb2c6Cj4KPiB2NjoKPiAgIC0gRml4IHN0YSBsb29rdXAgaW4gaWVlZTgwMjExX3Jl cG9ydF91c2VkX3NrYigpLgo+ICAgLSBNb3ZlIGNhbGwgdG8gaWVlZTgwMjExX3N0YV91cGRhdGVf cGVuZGluZ19haXJ0aW1lKCkgdG8gYSBiaXQgbGF0ZXIgaW4KPiAgICAgX19pZWVlODAyMTFfdHhf c3RhdHVzKCkKPiB2NToKPiAgIC0gQWRkIG1pc3NpbmcgZXhwb3J0IG9mIGllZWU4MDIxMV9jYWxj X3J4X2FpcnRpbWUoKSBhbmQgbWFrZQo+ICAgICBpZWVlODAyMTFfY2FsY190eF9haXJ0aW1lX3Jh dGUoKSBzdGF0aWMgKGtidWlsZGJvdCkuCj4gICAtIFVzZSBza2JfZ2V0X3F1ZXVlX21hcHBpbmco KSB0byBnZXQgdGhlIEFDIGZyb20gdGhlIHNrYi4KPiAgIC0gVGFrZSBiYXNpYyByYXRlIGNvbmZp Z3VyYXRpb24gZm9yIHRoZSBCU1MgaW50byBhY2NvdW50IHdoZW4gY2FsY3VsYXRpbmcKPiAgICAg bXVsdGljYXN0IHJhdGUuCj4gdjQ6Cj4gICAtIEZpeCBjYWxjdWxhdGlvbiB0aGF0IGNsYW1wcyB0 aGUgbWF4aW11bSBhaXJ0aW1lIHRvIGZpdCBpbnRvIDEwIGJpdHMKPiAgIC0gSW5jb3Jwb3JhdGUg UmljaCBCcm93bidzIG5pdHMgZm9yIHRoZSBjb21taXQgbWVzc2FnZSBpbiBLYW4ncyBwYXRjaAo+ ICAgLSBBZGQgZmV3ZXIgbG9jYWwgdmFyaWFibGVzIHRvIGllZWU4MDIxMV90eF9kZXF1ZXVlKCkK PiB2MzoKPiAgIC0gTW92ZSB0aGUgdHhfdGltZV9lc3QgZmllbGQgc28gaXQncyBzaGFyZWQgd2l0 aCBhY2tfZnJhbWVfaWQsIGFuZCB1c2UgdW5pdHMKPiAgICAgb2YgNHVzIGZvciB0aGUgdmFsdWUg c3RvcmVkIGluIGl0Lgo+ICAgLSBNb3ZlIHRoZSBhZGRpdGlvbiBvZiB0aGUgRXRoZXJuZXQgaGVh ZGVyIHNpemUgaW50byBpZWVlODAyMTFfY2FsY19leHBlY3RlZF90eF9haXJ0aW1lKCkKPiB2MjoK PiAgIC0gSW50ZWdyYXRlIEthbidzIGFwcHJvYWNoIHRvIGFpcnRpbWUgdGhyb3R0bGluZy4KPiAg IC0gSG9wZWZ1bGx5IGZpeCB0aGUgY2Igc3RydWN0IGFsaWdubWVudCBvbiBiaWctZW5kaWFuIGFy Y2hpdGVjdHVyZXMuCj4KPiAtLS0KPgo+IEthbiBZYW4gKDEpOgo+ICAgICAgIG1hYzgwMjExOiBJ bXBsZW1lbnQgQWlydGltZS1iYXNlZCBRdWV1ZSBMaW1pdCAoQVFMKQo+Cj4gVG9rZSBIw7hpbGFu ZC1Kw7hyZ2Vuc2VuICgzKToKPiAgICAgICBtYWM4MDIxMTogU2hyaW5rIHRoZSBzaXplIG9mIGFj a19mcmFtZV9pZCB0byBtYWtlIHJvb20gZm9yIHR4X3RpbWVfZXN0Cj4gICAgICAgbWFjODAyMTE6 IEltcG9ydCBhaXJ0aW1lIGNhbGN1bGF0aW9uIGNvZGUgZnJvbSBtdDc2Cj4gICAgICAgbWFjODAy MTE6IFVzZSBBaXJ0aW1lLWJhc2VkIFF1ZXVlIExpbWl0cyAoQVFMKSBvbiBwYWNrZXQgZGVxdWV1 ZQo+Cj4KPiAgaW5jbHVkZS9uZXQvY2ZnODAyMTEuaCAgICAgfCAgICA3ICsKPiAgaW5jbHVkZS9u ZXQvbWFjODAyMTEuaCAgICAgfCAgIDQ1ICsrKysrCj4gIG5ldC9tYWM4MDIxMS9NYWtlZmlsZSAg ICAgIHwgICAgMwo+ICBuZXQvbWFjODAyMTEvYWlydGltZS5jICAgICB8ICAzOTAgKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKPiAgbmV0L21hYzgwMjExL2NmZy5j ICAgICAgICAgfCAgICAyCj4gIG5ldC9tYWM4MDIxMS9kZWJ1Z2ZzLmMgICAgIHwgICA3OCArKysr KysrKysKPiAgbmV0L21hYzgwMjExL2RlYnVnZnNfc3RhLmMgfCAgIDQzICsrKystCj4gIG5ldC9t YWM4MDIxMS9pZWVlODAyMTFfaS5oIHwgICAgOCArCj4gIG5ldC9tYWM4MDIxMS9tYWluLmMgICAg ICAgIHwgICAgOSArCj4gIG5ldC9tYWM4MDIxMS9zdGFfaW5mby5jICAgIHwgICAzMiArKysrCj4g IG5ldC9tYWM4MDIxMS9zdGFfaW5mby5oICAgIHwgICAgOCArCj4gIG5ldC9tYWM4MDIxMS9zdGF0 dXMuYyAgICAgIHwgICAzMyArKysrCj4gIG5ldC9tYWM4MDIxMS90eC5jICAgICAgICAgIHwgICA2 OSArKysrKysrLQo+ICAxMyBmaWxlcyBjaGFuZ2VkLCA3MDkgaW5zZXJ0aW9ucygrKSwgMTggZGVs ZXRpb25zKC0pCj4gIGNyZWF0ZSBtb2RlIDEwMDY0NCBuZXQvbWFjODAyMTEvYWlydGltZS5jCj4K Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmF0aDEwayBt YWlsaW5nIGxpc3QKYXRoMTBrQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJh ZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9hdGgxMGsK