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=-8.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=no 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 EC5ACCA9EAE for ; Wed, 23 Oct 2019 06:42:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BE67C214B2 for ; Wed, 23 Oct 2019 06:42:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="LJWHaiQc" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388034AbfJWGmB (ORCPT ); Wed, 23 Oct 2019 02:42:01 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:45226 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732574AbfJWGmA (ORCPT ); Wed, 23 Oct 2019 02:42:00 -0400 Received: by mail-lj1-f195.google.com with SMTP id q64so19772945ljb.12 for ; Tue, 22 Oct 2019 23:41:59 -0700 (PDT) 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=xLzPgNOZ8X14gfCEvYWsxDF01OFUZfoQjcWDyuoGltc=; b=LJWHaiQc/q6Hg9z63NPV0MjMzWfOhKO0ey++fb4OkDyjZxD45pVUtUWBaO1/A2Qw2d RJd7oMRFkK9acDzP60fuBo6rXfXFDBhRQNsaSsYvkYETY+Y//R9nqZUBljNNONlm2JRJ fA/4lfnnSbauy8m0CvVAUs+97DA1Lf3yvlh2Ek0wox9gA1zBdoGbHsm6eJ5bUAmzQbNq +CZzAgGbM6Pffjp8WhndhgV/FPWBbAZP77u09c6zMgkfR77ity9Rx2DfjWwUpJsmAL1g TDWItxlH08H4EGtDcM+O35SFI3kDJZEl/vvqCBaLjWr7MkbwhQW3690smPgjvwVTpcrg pThA== 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=xLzPgNOZ8X14gfCEvYWsxDF01OFUZfoQjcWDyuoGltc=; b=iiql63sHnL/5Fv8tP4TC4Jq4Xe4CYVeEOh1ohQntSX1fvMfFbu7DnViIfsrsdQNsCS hReGsCdLn8iPUCZVxaEmp3Mi0bXcQEQpJN7SRPeD8jTyzSwFRZ1hHqMB4pycxvwVSvDm MyrBCRylEuUNWitGipP9dqgIK2oohnE1FbKKduJVi58yUxK0RiI6fcivGMEHCjhOZCGR 7xtDotwjKxBHqsV+Q2GsywhIChY/C/LHCHi4N6OWx1FwLEdeVaDqimcUPnlA4DjSb8Pr 8zkNI+pphIyypHQ+5I3bOJ0lfrUCj0kaxLPY8mC21o9C9XN2aOEHnNxI/KncEA+sRWi7 Qe9Q== X-Gm-Message-State: APjAAAXyUs5OU2PZiiLUTGaKYhZlDiyU58g/kvxmxZiLRsMVHzQEAtpR cjr9pDr8NTaIqfsk/fTTiwRtb2nFOOUc8ISuE2qMGg== X-Google-Smtp-Source: APXvYqwbYShriZrtOfH5CKHMRI9ZjT56L9KXRHcmYVKve8FvpLfX1msZDukO1Wkvr96pb24xb7V1qDQkpFKWU15F9BQ= X-Received: by 2002:a2e:9759:: with SMTP id f25mr21512398ljj.173.1571812918369; Tue, 22 Oct 2019 23:41:58 -0700 (PDT) MIME-Version: 1.0 References: <157148503415.2989444.7391437309981941226.stgit@toke.dk> <157148503865.2989444.7118792679603045723.stgit@toke.dk> <871rv5ovwr.fsf@toke.dk> In-Reply-To: <871rv5ovwr.fsf@toke.dk> From: Kan Yan Date: Tue, 22 Oct 2019 23:41:47 -0700 Message-ID: Subject: Re: [PATCH v4 4/4] mac80211: Use Airtime-based Queue Limits (AQL) on packet dequeue 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 > >> + if (ieee80211_is_data_qos(hdr->frame_control)) { > >> + qc =3D ieee80211_get_qos_ctl(hdr); > >> + tid =3D qc[0] & 0xf; > >> + ac =3D ieee80211_ac_from_tid(tid); > >> + } else { > >> + ac =3D IEEE80211_AC_BE; > >> + } > > > > The tid/ac is incorrect either here or in __ieee80211_tx_status() when > > tested with ath10k. The ac is set to AC_BE with test done using BK > > class traffic, hence the pending airtime get updated for the wrong > > txq. > > Huh, well that won't do, obviously :) > > Any idea why it might be wrong? somehow ieee80211_is_data_qos() returns false. Besides, qos_control field doesn't seems to be set in ieee80211_build_hdr(). > Hmm, I guess we could just get the ac using skb_get_queue_mapping(). > I'll send an update with this fixed for you to try :) Thanks for the quick update. It is getting much better, but unfortunately the pending airtime accounting sometimes is still not correct and cause txq stuck occasionally. On Tue, Oct 22, 2019 at 4:35 AM Toke H=C3=B8iland-J=C3=B8rgensen wrote: > > Kan Yan writes: > > >> + if (ieee80211_is_data_qos(hdr->frame_control)) { > >> + qc =3D ieee80211_get_qos_ctl(hdr); > >> + tid =3D qc[0] & 0xf; > >> + ac =3D ieee80211_ac_from_tid(tid); > >> + } else { > >> + ac =3D IEEE80211_AC_BE; > >> + } > > > > The tid/ac is incorrect either here or in __ieee80211_tx_status() when > > tested with ath10k. The ac is set to AC_BE with test done using BK > > class traffic, hence the pending airtime get updated for the wrong > > txq. > > Hmm, I guess we could just get the ac using skb_get_queue_mapping(). > I'll send an update with this fixed for you to try :) > > -Toke > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-lj1-x243.google.com ([2a00:1450:4864:20::243]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iNALL-0005Uc-Ce for ath10k@lists.infradead.org; Wed, 23 Oct 2019 06:42:04 +0000 Received: by mail-lj1-x243.google.com with SMTP id q64so19772947ljb.12 for ; Tue, 22 Oct 2019 23:42:00 -0700 (PDT) MIME-Version: 1.0 References: <157148503415.2989444.7391437309981941226.stgit@toke.dk> <157148503865.2989444.7118792679603045723.stgit@toke.dk> <871rv5ovwr.fsf@toke.dk> In-Reply-To: <871rv5ovwr.fsf@toke.dk> From: Kan Yan Date: Tue, 22 Oct 2019 23:41:47 -0700 Message-ID: Subject: Re: [PATCH v4 4/4] mac80211: Use Airtime-based Queue Limits (AQL) on packet dequeue 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 PiA+PiArICAgICAgICAgICAgICAgaWYgKGllZWU4MDIxMV9pc19kYXRhX3FvcyhoZHItPmZyYW1l X2NvbnRyb2wpKSB7Cj4gPj4gKyAgICAgICAgICAgICAgICAgICAgICAgcWMgPSBpZWVlODAyMTFf Z2V0X3Fvc19jdGwoaGRyKTsKPiA+PiArICAgICAgICAgICAgICAgICAgICAgICB0aWQgPSBxY1sw XSAmIDB4ZjsKPiA+PiArICAgICAgICAgICAgICAgICAgICAgICBhYyA9IGllZWU4MDIxMV9hY19m cm9tX3RpZCh0aWQpOwo+ID4+ICsgICAgICAgICAgICAgICB9IGVsc2Ugewo+ID4+ICsgICAgICAg ICAgICAgICAgICAgICAgIGFjID0gSUVFRTgwMjExX0FDX0JFOwo+ID4+ICsgICAgICAgICAgICAg ICB9Cj4gPgo+ID4gVGhlIHRpZC9hYyBpcyBpbmNvcnJlY3QgZWl0aGVyIGhlcmUgb3IgaW4gX19p ZWVlODAyMTFfdHhfc3RhdHVzKCkgd2hlbgo+ID4gdGVzdGVkIHdpdGggYXRoMTBrLiBUaGUgYWMg aXMgc2V0IHRvIEFDX0JFIHdpdGggdGVzdCBkb25lIHVzaW5nIEJLCj4gPiBjbGFzcyB0cmFmZmlj LCBoZW5jZSB0aGUgcGVuZGluZyBhaXJ0aW1lIGdldCB1cGRhdGVkIGZvciB0aGUgd3JvbmcKPiA+ IHR4cS4KPgo+IEh1aCwgd2VsbCB0aGF0IHdvbid0IGRvLCBvYnZpb3VzbHkgOikKPgo+IEFueSBp ZGVhIHdoeSBpdCBtaWdodCBiZSB3cm9uZz8KCnNvbWVob3cgIGllZWU4MDIxMV9pc19kYXRhX3Fv cygpIHJldHVybnMgZmFsc2UuIEJlc2lkZXMsICBxb3NfY29udHJvbApmaWVsZCBkb2Vzbid0IHNl ZW1zIHRvIGJlIHNldCBpbiBpZWVlODAyMTFfYnVpbGRfaGRyKCkuCgo+IEhtbSwgSSBndWVzcyB3 ZSBjb3VsZCBqdXN0IGdldCB0aGUgYWMgdXNpbmcgc2tiX2dldF9xdWV1ZV9tYXBwaW5nKCkuCj4g SSdsbCBzZW5kIGFuIHVwZGF0ZSB3aXRoIHRoaXMgZml4ZWQgZm9yIHlvdSB0byB0cnkgOikKVGhh bmtzIGZvciB0aGUgcXVpY2sgdXBkYXRlLiBJdCBpcyBnZXR0aW5nIG11Y2ggYmV0dGVyLCBidXQK dW5mb3J0dW5hdGVseSB0aGUgcGVuZGluZyBhaXJ0aW1lIGFjY291bnRpbmcgc29tZXRpbWVzIGlz IHN0aWxsIG5vdApjb3JyZWN0IGFuZCBjYXVzZSB0eHEgc3R1Y2sgb2NjYXNpb25hbGx5LgoKCgoK Ck9uIFR1ZSwgT2N0IDIyLCAyMDE5IGF0IDQ6MzUgQU0gVG9rZSBIw7hpbGFuZC1Kw7hyZ2Vuc2Vu IDx0b2tlQHJlZGhhdC5jb20+IHdyb3RlOgo+Cj4gS2FuIFlhbiA8a3lhbkBnb29nbGUuY29tPiB3 cml0ZXM6Cj4KPiA+PiArICAgICAgICAgICAgICAgaWYgKGllZWU4MDIxMV9pc19kYXRhX3Fvcyho ZHItPmZyYW1lX2NvbnRyb2wpKSB7Cj4gPj4gKyAgICAgICAgICAgICAgICAgICAgICAgcWMgPSBp ZWVlODAyMTFfZ2V0X3Fvc19jdGwoaGRyKTsKPiA+PiArICAgICAgICAgICAgICAgICAgICAgICB0 aWQgPSBxY1swXSAmIDB4ZjsKPiA+PiArICAgICAgICAgICAgICAgICAgICAgICBhYyA9IGllZWU4 MDIxMV9hY19mcm9tX3RpZCh0aWQpOwo+ID4+ICsgICAgICAgICAgICAgICB9IGVsc2Ugewo+ID4+ ICsgICAgICAgICAgICAgICAgICAgICAgIGFjID0gSUVFRTgwMjExX0FDX0JFOwo+ID4+ICsgICAg ICAgICAgICAgICB9Cj4gPgo+ID4gVGhlIHRpZC9hYyBpcyBpbmNvcnJlY3QgZWl0aGVyIGhlcmUg b3IgaW4gX19pZWVlODAyMTFfdHhfc3RhdHVzKCkgd2hlbgo+ID4gdGVzdGVkIHdpdGggYXRoMTBr LiBUaGUgYWMgaXMgc2V0IHRvIEFDX0JFIHdpdGggdGVzdCBkb25lIHVzaW5nIEJLCj4gPiBjbGFz cyB0cmFmZmljLCAgaGVuY2UgdGhlIHBlbmRpbmcgYWlydGltZSBnZXQgdXBkYXRlZCBmb3IgdGhl IHdyb25nCj4gPiB0eHEuCj4KPiBIbW0sIEkgZ3Vlc3Mgd2UgY291bGQganVzdCBnZXQgdGhlIGFj IHVzaW5nIHNrYl9nZXRfcXVldWVfbWFwcGluZygpLgo+IEknbGwgc2VuZCBhbiB1cGRhdGUgd2l0 aCB0aGlzIGZpeGVkIGZvciB5b3UgdG8gdHJ5IDopCj4KPiAtVG9rZQo+CgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphdGgxMGsgbWFpbGluZyBsaXN0CmF0 aDEwa0BsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxt YW4vbGlzdGluZm8vYXRoMTBrCg==