From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from us-smtp-2.mimecast.com ([207.211.31.81] helo=us-smtp-delivery-1.mimecast.com) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iT1va-0004Z7-R3 for ath10k@lists.infradead.org; Fri, 08 Nov 2019 10:55:44 +0000 Received: by mail-lj1-f199.google.com with SMTP id r5so1173508ljj.7 for ; Fri, 08 Nov 2019 02:55:38 -0800 (PST) From: Toke =?utf-8?Q?H=C3=B8iland-J=C3=B8rgensen?= Subject: Re: [PATCH v6 2/4] mac80211: Import airtime calculation code from mt76 In-Reply-To: <42266e95f45d5772e04c9c016bd6179ea14ffefa.camel@sipsolutions.net> References: <157182473951.150713.7978051149956899705.stgit@toke.dk> <157182474174.150713.17459330922820192258.stgit@toke.dk> <42266e95f45d5772e04c9c016bd6179ea14ffefa.camel@sipsolutions.net> Date: Fri, 08 Nov 2019 11:55:35 +0100 Message-ID: <87d0e2fxi0.fsf@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 Sm9oYW5uZXMgQmVyZyA8am9oYW5uZXNAc2lwc29sdXRpb25zLm5ldD4gd3JpdGVzOgoKPiBPbiBX ZWQsIDIwMTktMTAtMjMgYXQgMTE6NTkgKzAyMDAsIFRva2UgSMO4aWxhbmQtSsO4cmdlbnNlbiB3 cm90ZToKPj4gRnJvbTogVG9rZSBIw7hpbGFuZC1Kw7hyZ2Vuc2VuIDx0b2tlQHJlZGhhdC5jb20+ Cj4+IAo+PiBGZWxpeCByZWNlbnRseSBhZGRlZCBjb2RlIHRvIGNhbGN1bGF0ZSBhaXJ0aW1lIG9m IHBhY2tldHMgdG8gdGhlIG10NzYKPj4gZHJpdmVyLiBJbXBvcnQgdGhpcyBpbnRvIG1hYzgwMjEx IHNvIHdlIGNhbiB1c2UgaXQgZm9yIGFpcnRpbWUgcXVldWUgbGltaXQKPj4gY2FsY3VsYXRpb25z IGxhdGVyLgo+PiAKPj4gVGhlIGFpcnRpbWUuYyBmaWxlIGlzIGNvcGllZCB2ZXJiYXRpbSBmcm9t IHRoZSBtdDc2IGRyaXZlciwgYW5kIGFkanVzdGVkIHRvCj4+IHVzZSBtYWM4MDIxMSBkYXRhIHN0 cnVjdHVyZXMgaW5zdGVhZCAod2hpY2ggaXMgZmFpcmx5IHN0cmFpZ2h0IGZvcndhcmQpLgo+PiBU aGUgcGVyLXJhdGUgVFggcmF0ZSBjYWxjdWxhdGlvbiBpcyBzcGxpdCBvdXQgdG8gaXRzIG93bgo+ PiBmdW5jdGlvbiAoaWVlZTgwMjExX2NhbGNfdHhfYWlydGltZV9yYXRlKCkpIHNvIGl0IGNhbiBi ZSB1c2VkIGRpcmVjdGx5IGZvcgo+PiB0aGUgQVFMIGNhbGN1bGF0aW9ucyBhZGRlZCBpbiBhIHN1 YnNlcXVlbnQgcGF0Y2guCj4KPiBBbnkgd2F5IGl0IGNvdWxkIGJlIGV4cG9zZWQgYnkgbWFjODAy MTEgYmFjayB0byB0aGUgZHJpdmVycywgcGVyaGFwcywgdG8KPiBzaGFyZSBpdD8KCkRpZG4ndCBJ IGFscmVhZHkgZXhwb3J0IHNvbWUgb2YgdGhlIGZ1bmN0aW9ucz8gTXkgaW50ZW50aW9uIHdhcyB0 byBkbwp0aGF0LCBjZXJ0YWlubHksIGFuZCB0byBwYXRjaCBtdDc2IHRvIHN3aXRjaCB0byB1c2lu ZyB0aGVtIG9uY2UgdGhlCnRyZWVzIGhhdmUgY29udmVyZ2VkLi4uCgo+PiBUaGUgb25seSB0aGlu ZyB0aGF0IGl0IHdhcyBub3QgcG9zc2libGUgdG8gcG9ydCBkaXJlY3RseSB3YXMgdGhlIGJpdCB0 aGF0Cj4+IHJlYWQgdGhlIGludGVybmFsIGRyaXZlciBmbGFncyBvZiBzdHJ1Y3QgaWVlZTgwMjEx X3JhdGUgdG8gZGV0ZXJtaW5lCj4+IHdoZXRoZXIgYSByYXRlIGlzIHVzaW5nIENDSyBvciBPRkRN IGVuY29kaW5nLiBJbnN0ZWFkLCBqdXN0IGxvb2sgYXQgdGhlCj4+IHJhdGUgaW5kZXgsIHNpbmNl IGF0IGxlYXN0IG10NzYgYW5kIGF0aDEwayBib3RoIHNlZW0gdG8gaGF2ZSB0aGUgc2FtZQo+PiBu dW1iZXIgb2YgQ0NLIHJhdGVzICg0KSBpbiB0aGVpciB0YWJsZXMuCj4KPiBUaGlzIGlzIGhpZ2hs eSBxdWVzdGlvbmFibGUgLi4uCj4KPj4gKwlzd2l0Y2ggKHN0YXR1cy0+ZW5jb2RpbmcpIHsKPj4g KwljYXNlIFJYX0VOQ19MRUdBQ1k6Cj4+ICsJCWlmIChXQVJOX09OX09OQ0Uoc3RhdHVzLT5iYW5k ID4gTkw4MDIxMV9CQU5EXzVHSFopKQo+PiArCQkJcmV0dXJuIDA7Cj4+ICsKPj4gKwkJc2JhbmQg PSBody0+d2lwaHktPmJhbmRzW3N0YXR1cy0+YmFuZF07Cj4+ICsJCWlmICghc2JhbmQgfHwgc3Rh dHVzLT5yYXRlX2lkeCA+IHNiYW5kLT5uX2JpdHJhdGVzKQo+PiArCQkJcmV0dXJuIDA7Cj4+ICsK Pj4gKwkJcmF0ZSA9ICZzYmFuZC0+Yml0cmF0ZXNbc3RhdHVzLT5yYXRlX2lkeF07Cj4+ICsJCWNj ayA9IChzdGF0dXMtPnJhdGVfaWR4IDwgQ0NLX05VTV9SQVRFUyk7CgpIZWgsIHllYWggdGhpcyBk aWQgZmVlbCBsaWtlIGEgaGFjayB0byBtZSBhcyB3ZWxsIDspCgo+IFdoeSBub3QKPgo+IAljY2sg PSByYXRlLT5mbGFncyAmIElFRUU4MDIxMV9SQVRFX01BTkRBVE9SWV9COwo+Cj4gSSBtZWFuIC4u IHdlIGtub3cgdGhhdCBJRUVFODAyMTFfUkFURV9NQU5EQVRPUllfQiByYXRlcyBhcmUgZXhhY3Rs eSB0aGUKPiBDQ0sgcmF0ZXMsIGFuZCB0aGF0J3Mgbm90IHJlYWxseSBnb2luZyB0byBjaGFuZ2U/ Cj4KPiBBbHRlcm5hdGl2ZWx5LCB3ZSBjb3VsZCBkbwo+Cj4gCWNjayA9IHNiYW5kLT5iYW5kID09 IE5MODAyMTFfQkFORF8yR0haICYmCj4gCSAgICAgICEocmF0ZS0+ZmxhZ3MgJiBJRUVFODAyMTFf UkFURV9FUlBfRyk7Cj4KPiBvciBldmVuCj4KPiAJY2NrID0gcmF0ZS0+Yml0cmF0ZSA9PSAxMCB8 fCByYXRlLT5iaXRyYXRlID09IDIwIHx8Cj4gCSAgICAgIHJhdGUtPmJpdHJhdGUgPT0gNTUgfHwg cmF0ZS0+Yml0cmF0ZSA9PSAxMTA7CgpJIGFtIGZpbmUgd2l0aCBlaXRoZXIgb2YgdGhvc2U7IEkg anVzdCB3YXNuJ3Qgc3VyZSB3aGF0IGFzc3VtcHRpb25zIEkKY291bGQgYWN0dWFsbHkgbWFrZSBo ZXJlLiBJIGd1ZXNzIEknbGwganVzdCBwaWNrIG9uZSA6KQoKPj4gKwlkZWZhdWx0Ogo+PiArCQlX QVJOX09OX09OQ0UoMSk7Cj4KPiBZb3UgY2FuJ3QgZG8gdGhhdCBpbiBtYWM4MDIxMSBlaXRoZXIu IFRoYXQgbWlnaHQgYmUgZmluZSBmb3IgbXQ3NiwgYnV0Cj4gbWFjODAyMTEgYWxyZWFkeSBzdXBw b3J0cyBIRS4KCkdvb2QgcG9pbnQsIHdpbGwgZml4LgoKLVRva2UKCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphdGgxMGsgbWFpbGluZyBsaXN0CmF0aDEw a0BsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4v bGlzdGluZm8vYXRoMTBrCg== 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=-0.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS 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 7E338C5DF60 for ; Fri, 8 Nov 2019 10:55:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 501F5218AE for ; Fri, 8 Nov 2019 10:55:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="NHV9K5Zt" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726180AbfKHKzm (ORCPT ); Fri, 8 Nov 2019 05:55:42 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:52738 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726149AbfKHKzm (ORCPT ); Fri, 8 Nov 2019 05:55:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573210540; 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=bsPfNwlAkGOPfmWxI5u777tBP7n0JZnEAYYAZmhM14E=; b=NHV9K5Ztv0xnFig0glSuA//YhiyYpfDZvtH9EyD+zxcs7KR1Nq69x7AC1XvrhMnj+qA5oo MnfpKVYS8ICyut6WwgZUH+TxOcDMSTu8YANMr0ecwdD7TQkt8pN8H40mFFELoLetzFh/YN urwMGm+eyo7u0zlPQk9WjaRD0Vh7Wzw= Received: from mail-lf1-f70.google.com (mail-lf1-f70.google.com [209.85.167.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-114-Z90XCaXJPWyH33a6R9uQpA-1; Fri, 08 Nov 2019 05:55:39 -0500 Received: by mail-lf1-f70.google.com with SMTP id d11so1232048lfj.3 for ; Fri, 08 Nov 2019 02:55:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version:content-transfer-encoding; bh=YJrXGtCnMlroIEY2nnixcaaDlLt4fqJ7BPUU7uurxtY=; b=hdX9kce5AY/iLBFFkCVef9CVZgQ61i7c4lB/EkL7JZg3tv+0UTlM/RAdN9jxpjuQAo 3iotzANqzRGS2LKOUoJioF5Ji+DJ47P8+pdqKozAXDKOtsTvDbjPjz2yS3MGeRdFamn4 4P8XtcREjSuRs2+uRmlv18md+Qp9jN0O/Icf7SnumWAi7Cuz/UwYoXQL92RRdvQuYRMY C9GvCCKhCdiBCAibCk1GxJDLmHq0bgQ1XhFqeimwkuVRX7Doxhpdg+YQ4joELjmPwP8+ oE4Vy5OhOGPeoqq7hd/3hxGHCMIwLpLSHKzA0DJqWqJ4713A8zq05WjTelmtbKn5utLg Iocg== X-Gm-Message-State: APjAAAVBa1ypt3VKREXoshyKU7irJ7bavXlKgUvYBmtRjOx8T15XJKJT ueujcggri7DVK3cCpC8Z8vX/Gy3Hr5SGmMYSc0LFtqrpZaYfIpYeggPcTK0Grhfm/JD1nc369fO jYWwr8B/fhoBFItU780wbCDouPzg= X-Received: by 2002:a2e:998a:: with SMTP id w10mr6332841lji.66.1573210537774; Fri, 08 Nov 2019 02:55:37 -0800 (PST) X-Google-Smtp-Source: APXvYqyEGKU7zYVEzHqvutjPdhb0Ch2cJ7Jo3JKjhWNBQYUJrGbfwFRDp8nlKlaaBjRUW80eWrShhw== X-Received: by 2002:a2e:998a:: with SMTP id w10mr6332815lji.66.1573210537418; Fri, 08 Nov 2019 02:55:37 -0800 (PST) Received: from alrua-x1.borgediget.toke.dk (borgediget.toke.dk. [85.204.121.218]) by smtp.gmail.com with ESMTPSA id v12sm2326039ljg.14.2019.11.08.02.55.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Nov 2019 02:55:36 -0800 (PST) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id D26D61818B5; Fri, 8 Nov 2019 11:55:35 +0100 (CET) From: Toke =?utf-8?Q?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 Subject: Re: [PATCH v6 2/4] mac80211: Import airtime calculation code from mt76 In-Reply-To: <42266e95f45d5772e04c9c016bd6179ea14ffefa.camel@sipsolutions.net> References: <157182473951.150713.7978051149956899705.stgit@toke.dk> <157182474174.150713.17459330922820192258.stgit@toke.dk> <42266e95f45d5772e04c9c016bd6179ea14ffefa.camel@sipsolutions.net> X-Clacks-Overhead: GNU Terry Pratchett Date: Fri, 08 Nov 2019 11:55:35 +0100 Message-ID: <87d0e2fxi0.fsf@toke.dk> MIME-Version: 1.0 X-MC-Unique: Z90XCaXJPWyH33a6R9uQpA-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 Johannes Berg writes: > On Wed, 2019-10-23 at 11:59 +0200, Toke H=C3=B8iland-J=C3=B8rgensen wrote= : >> From: Toke H=C3=B8iland-J=C3=B8rgensen >>=20 >> Felix recently added code to calculate airtime of packets to the mt76 >> driver. Import this into mac80211 so we can use it for airtime queue lim= it >> calculations later. >>=20 >> The airtime.c file is copied verbatim from the mt76 driver, and adjusted= to >> use mac80211 data structures instead (which is fairly straight forward). >> The per-rate TX rate calculation is split out to its own >> function (ieee80211_calc_tx_airtime_rate()) so it can be used directly f= or >> the AQL calculations added in a subsequent patch. > > Any way it could be exposed by mac80211 back to the drivers, perhaps, to > share it? Didn't I already export some of the functions? My intention was to do that, certainly, and to patch mt76 to switch to using them once the trees have converged... >> The only thing that it was not possible to port directly was the bit tha= t >> read the internal driver flags of struct ieee80211_rate to determine >> whether a rate is using CCK or OFDM encoding. Instead, just look at the >> rate index, since at least mt76 and ath10k both seem to have the same >> number of CCK rates (4) in their tables. > > This is highly questionable ... > >> +=09switch (status->encoding) { >> +=09case RX_ENC_LEGACY: >> +=09=09if (WARN_ON_ONCE(status->band > NL80211_BAND_5GHZ)) >> +=09=09=09return 0; >> + >> +=09=09sband =3D hw->wiphy->bands[status->band]; >> +=09=09if (!sband || status->rate_idx > sband->n_bitrates) >> +=09=09=09return 0; >> + >> +=09=09rate =3D &sband->bitrates[status->rate_idx]; >> +=09=09cck =3D (status->rate_idx < CCK_NUM_RATES); Heh, yeah this did feel like a hack to me as well ;) > Why not > > =09cck =3D rate->flags & IEEE80211_RATE_MANDATORY_B; > > I mean .. we know that IEEE80211_RATE_MANDATORY_B rates are exactly the > CCK rates, and that's not really going to change? > > Alternatively, we could do > > =09cck =3D sband->band =3D=3D NL80211_BAND_2GHZ && > =09 !(rate->flags & IEEE80211_RATE_ERP_G); > > or even > > =09cck =3D rate->bitrate =3D=3D 10 || rate->bitrate =3D=3D 20 || > =09 rate->bitrate =3D=3D 55 || rate->bitrate =3D=3D 110; I am fine with either of those; I just wasn't sure what assumptions I could actually make here. I guess I'll just pick one :) >> +=09default: >> +=09=09WARN_ON_ONCE(1); > > You can't do that in mac80211 either. That might be fine for mt76, but > mac80211 already supports HE. Good point, will fix. -Toke