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,URIBL_BLOCKED,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 7BFD7C10F14 for ; Fri, 11 Oct 2019 02:24:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 540DB2054F for ; Fri, 11 Oct 2019 02:24:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="V6ox/LNA" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728027AbfJKCYV (ORCPT ); Thu, 10 Oct 2019 22:24:21 -0400 Received: from mail-lf1-f66.google.com ([209.85.167.66]:39000 "EHLO mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727854AbfJKCYV (ORCPT ); Thu, 10 Oct 2019 22:24:21 -0400 Received: by mail-lf1-f66.google.com with SMTP id 72so5863419lfh.6 for ; Thu, 10 Oct 2019 19:24:20 -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=SjV9H9pvD4UfBezCzuurED84stJjiWTQaM9lntveN6U=; b=V6ox/LNAFOrwge/xclW0/5nANo7T6nEcuUMjdEM/Wgau0izWeJSEz/cbjVUyct1AqF m9yGbnSzbVeigxWS7Wqc+YbfVkvu7VDTqYdnfEsgvUN3PszcNp4basm8timUeftMeZrM nhchYgS3ekRXscC2Q3VJeUFXJIQgfsGsWJy2ow46sN7sHPnen44I5Zy6JReSTU/o3yw2 /47Ij+shzt/H3NpmNXxYXQos/Cat7UcBvWyr3PtuTsgZhJxzlPjw1656FixZk89fR9GH Y7gKiTkmARsWZaCrGVIzD0Anlek2pZIrOf06UO5SsM6gs8J3zAMDB2q567Wnviy1K5sQ L6hg== 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=SjV9H9pvD4UfBezCzuurED84stJjiWTQaM9lntveN6U=; b=enAPgR+/Ne7n0HWZcysWyYdOl2ns9hNs6GsSTOyZ7q6CAaa57pPUdFoXzC8AoA8ai0 dCGs01J8EzoEEYxDVrPvPB4hx5CbegDIB+S5EbLulmc4kvsM3db2TeqOWgqJf2C4+yAw nTK84dHBblOz5HRrfL01FMiRbKpypjeHOODPip6bJgeuLaRAnfxuISb3+3jATr8hEUdL xQiTomda3mYfrOBmVCUltJwUVYIo3PdtpBKTkhy0H5z8PtPeQHsyO5utPNPoiIDtB2WL MEGkGL4TzcrWkPTgqEiQJUNqE5wY+mb8SudfQ8v24J4X8R6Pj4f93r3RfMQk9XSX3aRF +k1Q== X-Gm-Message-State: APjAAAVGcN+JbXXClVIBQgvlFXDuch/uB+2H8BtJxHsn2VBKmk71ugY7 aWZX0eO+EhyGCdmr8IEJEnpGxsvCqnUExrKjS+7DLg== X-Google-Smtp-Source: APXvYqyF1c9G+UjSG+tfYXCeklU+q02bWAAhxHTvl4NcU9gFzaUgyRGvP8xq7x+9DITcQ+8s1L1Jq9IGvoMIxTOGGvw= X-Received: by 2002:a19:7b08:: with SMTP id w8mr7371507lfc.95.1570760659240; Thu, 10 Oct 2019 19:24:19 -0700 (PDT) MIME-Version: 1.0 References: <20191010022502.141862-1-kyan@google.com> <20191010022502.141862-2-kyan@google.com> <87ftk0jr70.fsf@toke.dk> In-Reply-To: <87ftk0jr70.fsf@toke.dk> From: Kan Yan Date: Thu, 10 Oct 2019 19:24:07 -0700 Message-ID: Subject: Re: [PATCH v3 1/2] mac80211: Implement Airtime-based Queue Limit (AQL) To: =?UTF-8?B?VG9rZSBIw7hpbGFuZC1Kw7hyZ2Vuc2Vu?= Cc: Johannes Berg , linux-wireless@vger.kernel.org, make-wifi-fast@lists.bufferbloat.net, Felix Fietkau , ath10k@lists.infradead.org, Yibo Zhao 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 > > +/* The per TXQ firmware queue limit in airtime */ > > I was pretty sure I mentioned it *somewhere*, but I think just calling > this "device" or something would be more general. If you don't mind, I > can edit that also (unless you have other reasons to resubmit?) done. I will upload a new version to fix coding style issues according to your comment. Please do help revise comment as you see fit. > > + * ieee80211_txq_aql_check - check if a txq can send frame to device > I wonder if this really should even be have "aql" in the name? It's also > going to return NULL if there's nothing on the TXQ, for example, right? Renamed to ieee80211_txq_airtime_check() This function is not for finding next eligible txq, but return a boolean to indicate if a given txq can send more packets to device. It is also called from ath10k: static bool ath10k_mac_tx_can_push(struct ieee80211_hw *hw, struct ieee80211_txq *txq) { ... if (!ieee80211_txq_airtime_check(hw, txq)) return false; > if (WARN_ONCE(..., "...", ...)) > saves you the braces and the extra condition done. > But then again, we don't really care *that* much about overflow or > underflow in this code path - it's not going to be security critical. > But it seems that your code there actually can cause UB? That would be > nice to avoid. > Actually, that condition can never be true, right? Wait, ok, this one > can because integer promotion? I don't think that condition could happen. The WARN_ONCE() was added per your earlier comment. The older version don't have underflow check and reset pending_airtime part and I didn't find any issues. > Except aql_total_pending_airtime is still defined as s32 and that causes > different behaviour? > All this confuses me ... is it possible to write this more clearly? I revised it to something similar to the original version, which ieee80211_sta_update_pending_airtime() takes extra parameter to indicate whether it is for a tx completion event. void ieee80211_sta_update_pending_airtime(struct ieee80211_sta *pubsta, u8 = tid, u32 tx_airtime, bool tx_completed= ) This help get rid of the problem that airtime need be signed. Also added the inline function of ieee80211_sta_register/release_pending_airtime() as you suggested. On Thu, Oct 10, 2019 at 1:12 PM Toke H=C3=B8iland-J=C3=B8rgensen wrote: > > Johannes Berg writes: > > > Hi, > > > > A couple of points... > > > > First, I'd like Toke to review & ack this if possible :-) > > Sure, I'll look at it. I'm away the rest of this week, but should > hopefully get some more time next week. It may be that it will take the > form of another submission that integrates this with the previous patch > I sent that put more of the calculation into mac80211 itself... > > -Toke > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-lf1-x143.google.com ([2a00:1450:4864:20::143]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iIkbR-0004AC-98 for ath10k@lists.infradead.org; Fri, 11 Oct 2019 02:24:28 +0000 Received: by mail-lf1-x143.google.com with SMTP id u28so5861327lfc.5 for ; Thu, 10 Oct 2019 19:24:20 -0700 (PDT) MIME-Version: 1.0 References: <20191010022502.141862-1-kyan@google.com> <20191010022502.141862-2-kyan@google.com> <87ftk0jr70.fsf@toke.dk> In-Reply-To: <87ftk0jr70.fsf@toke.dk> From: Kan Yan Date: Thu, 10 Oct 2019 19:24:07 -0700 Message-ID: Subject: Re: [PATCH v3 1/2] mac80211: Implement Airtime-based Queue Limit (AQL) 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: make-wifi-fast@lists.bufferbloat.net, linux-wireless@vger.kernel.org, ath10k@lists.infradead.org, Yibo Zhao , Johannes Berg , Felix Fietkau PiA+ICsvKiBUaGUgcGVyIFRYUSBmaXJtd2FyZSBxdWV1ZSBsaW1pdCBpbiBhaXJ0aW1lICovCj4K PiBJIHdhcyBwcmV0dHkgc3VyZSBJIG1lbnRpb25lZCBpdCAqc29tZXdoZXJlKiwgYnV0IEkgdGhp bmsganVzdCBjYWxsaW5nCj4gdGhpcyAiZGV2aWNlIiBvciBzb21ldGhpbmcgd291bGQgYmUgbW9y ZSBnZW5lcmFsLiBJZiB5b3UgZG9uJ3QgbWluZCwgSQo+IGNhbiBlZGl0IHRoYXQgYWxzbyAodW5s ZXNzIHlvdSBoYXZlIG90aGVyIHJlYXNvbnMgdG8gcmVzdWJtaXQ/KQoKZG9uZS4gSSB3aWxsIHVw bG9hZCBhIG5ldyB2ZXJzaW9uIHRvIGZpeCBjb2Rpbmcgc3R5bGUgaXNzdWVzIGFjY29yZGluZwp0 byB5b3VyIGNvbW1lbnQuIFBsZWFzZSBkbyBoZWxwCnJldmlzZSBjb21tZW50IGFzIHlvdSBzZWUg Zml0LgoKPiA+ICsgKiBpZWVlODAyMTFfdHhxX2FxbF9jaGVjayAtIGNoZWNrIGlmIGEgdHhxIGNh biBzZW5kIGZyYW1lIHRvIGRldmljZQo+IEkgd29uZGVyIGlmIHRoaXMgcmVhbGx5IHNob3VsZCBl dmVuIGJlIGhhdmUgImFxbCIgaW4gdGhlIG5hbWU/IEl0J3MgYWxzbwo+IGdvaW5nIHRvIHJldHVy biBOVUxMIGlmIHRoZXJlJ3Mgbm90aGluZyBvbiB0aGUgVFhRLCBmb3IgZXhhbXBsZSwgcmlnaHQ/ CgpSZW5hbWVkIHRvICBpZWVlODAyMTFfdHhxX2FpcnRpbWVfY2hlY2soKQpUaGlzIGZ1bmN0aW9u IGlzIG5vdCBmb3IgZmluZGluZyBuZXh0IGVsaWdpYmxlIHR4cSwgYnV0IHJldHVybiBhCmJvb2xl YW4gdG8gaW5kaWNhdGUgaWYgYSBnaXZlbiB0eHEgY2FuIHNlbmQgbW9yZSBwYWNrZXRzIHRvIGRl dmljZS4gSXQKaXMgYWxzbyBjYWxsZWQgZnJvbSBhdGgxMGs6CnN0YXRpYyBib29sIGF0aDEwa19t YWNfdHhfY2FuX3B1c2goc3RydWN0IGllZWU4MDIxMV9odyAqaHcsCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgc3RydWN0IGllZWU4MDIxMV90eHEgKnR4cSkKewogICAgICAgLi4u CiAgICAgICAgaWYgKCFpZWVlODAyMTFfdHhxX2FpcnRpbWVfY2hlY2soaHcsIHR4cSkpCiAgICAg ICAgICAgICAgICByZXR1cm4gZmFsc2U7Cgo+IGlmIChXQVJOX09OQ0UoLi4uLCAiLi4uIiwgLi4u KSkKPiBzYXZlcyB5b3UgdGhlIGJyYWNlcyBhbmQgdGhlIGV4dHJhIGNvbmRpdGlvbgoKZG9uZS4K Cj4gQnV0IHRoZW4gYWdhaW4sIHdlIGRvbid0IHJlYWxseSBjYXJlICp0aGF0KiBtdWNoIGFib3V0 IG92ZXJmbG93IG9yCj4gdW5kZXJmbG93IGluIHRoaXMgY29kZSBwYXRoIC0gaXQncyBub3QgZ29p bmcgdG8gYmUgc2VjdXJpdHkgY3JpdGljYWwuCj4gQnV0IGl0IHNlZW1zIHRoYXQgeW91ciBjb2Rl IHRoZXJlIGFjdHVhbGx5IGNhbiBjYXVzZSBVQj8gVGhhdCB3b3VsZCBiZQo+IG5pY2UgdG8gYXZv aWQuCj4gQWN0dWFsbHksIHRoYXQgY29uZGl0aW9uIGNhbiBuZXZlciBiZSB0cnVlLCByaWdodD8g V2FpdCwgb2ssIHRoaXMgb25lCj4gY2FuIGJlY2F1c2UgaW50ZWdlciBwcm9tb3Rpb24/CgogSSBk b24ndCB0aGluayB0aGF0IGNvbmRpdGlvbiBjb3VsZCBoYXBwZW4uIFRoZSBXQVJOX09OQ0UoKSB3 YXMgYWRkZWQKcGVyIHlvdXIgZWFybGllciBjb21tZW50LiBUaGUgb2xkZXIgdmVyc2lvbiBkb24n dCBoYXZlIHVuZGVyZmxvdyBjaGVjawphbmQgcmVzZXQgcGVuZGluZ19haXJ0aW1lIHBhcnQgYW5k IEkgZGlkbid0IGZpbmQgYW55IGlzc3Vlcy4KCj4gRXhjZXB0IGFxbF90b3RhbF9wZW5kaW5nX2Fp cnRpbWUgaXMgc3RpbGwgZGVmaW5lZCBhcyBzMzIgYW5kIHRoYXQgY2F1c2VzCj4gZGlmZmVyZW50 IGJlaGF2aW91cj8KPiBBbGwgdGhpcyBjb25mdXNlcyBtZSAuLi4gaXMgaXQgcG9zc2libGUgdG8g d3JpdGUgdGhpcyBtb3JlIGNsZWFybHk/CgpJIHJldmlzZWQgaXQgdG8gc29tZXRoaW5nIHNpbWls YXIgdG8gdGhlIG9yaWdpbmFsIHZlcnNpb24sIHdoaWNoCmllZWU4MDIxMV9zdGFfdXBkYXRlX3Bl bmRpbmdfYWlydGltZSgpIHRha2VzIGV4dHJhIHBhcmFtZXRlciB0bwppbmRpY2F0ZSB3aGV0aGVy IGl0IGlzIGZvciBhIHR4IGNvbXBsZXRpb24gZXZlbnQuCnZvaWQgaWVlZTgwMjExX3N0YV91cGRh dGVfcGVuZGluZ19haXJ0aW1lKHN0cnVjdCBpZWVlODAyMTFfc3RhICpwdWJzdGEsIHU4IHRpZCwK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdTMyIHR4X2FpcnRpbWUs IGJvb2wgdHhfY29tcGxldGVkKQpUaGlzIGhlbHAgZ2V0IHJpZCBvZiB0aGUgcHJvYmxlbSB0aGF0 IGFpcnRpbWUgbmVlZCBiZSBzaWduZWQuIEFsc28KYWRkZWQgdGhlIGlubGluZSBmdW5jdGlvbiBv ZgppZWVlODAyMTFfc3RhX3JlZ2lzdGVyL3JlbGVhc2VfcGVuZGluZ19haXJ0aW1lKCkgYXMgeW91 IHN1Z2dlc3RlZC4KCgpPbiBUaHUsIE9jdCAxMCwgMjAxOSBhdCAxOjEyIFBNIFRva2UgSMO4aWxh bmQtSsO4cmdlbnNlbiA8dG9rZUByZWRoYXQuY29tPiB3cm90ZToKPgo+IEpvaGFubmVzIEJlcmcg PGpvaGFubmVzQHNpcHNvbHV0aW9ucy5uZXQ+IHdyaXRlczoKPgo+ID4gSGksCj4gPgo+ID4gQSBj b3VwbGUgb2YgcG9pbnRzLi4uCj4gPgo+ID4gRmlyc3QsIEknZCBsaWtlIFRva2UgdG8gcmV2aWV3 ICYgYWNrIHRoaXMgaWYgcG9zc2libGUgOi0pCj4KPiBTdXJlLCBJJ2xsIGxvb2sgYXQgaXQuIEkn bSBhd2F5IHRoZSByZXN0IG9mIHRoaXMgd2VlaywgYnV0IHNob3VsZAo+IGhvcGVmdWxseSBnZXQg c29tZSBtb3JlIHRpbWUgbmV4dCB3ZWVrLiBJdCBtYXkgYmUgdGhhdCBpdCB3aWxsIHRha2UgdGhl Cj4gZm9ybSBvZiBhbm90aGVyIHN1Ym1pc3Npb24gdGhhdCBpbnRlZ3JhdGVzIHRoaXMgd2l0aCB0 aGUgcHJldmlvdXMgcGF0Y2gKPiBJIHNlbnQgdGhhdCBwdXQgbW9yZSBvZiB0aGUgY2FsY3VsYXRp b24gaW50byBtYWM4MDIxMSBpdHNlbGYuLi4KPgo+IC1Ub2tlCj4KCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmF0aDEwayBtYWlsaW5nIGxpc3QKYXRoMTBr QGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFpbG1hbi9s aXN0aW5mby9hdGgxMGsK