From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from us-smtp-1.mimecast.com ([205.139.110.61] helo=us-smtp-delivery-1.mimecast.com) by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux)) id 1iAY3k-0007YT-TZ for ath10k@lists.infradead.org; Wed, 18 Sep 2019 11:23:47 +0000 Received: by mail-ed1-f69.google.com with SMTP id f9so4220953edv.1 for ; Wed, 18 Sep 2019 04:23:41 -0700 (PDT) From: Toke =?utf-8?Q?H=C3=B8iland-J=C3=B8rgensen?= Subject: Re: [PATCH 2/4] mac80211: defer txqs removal from rbtree In-Reply-To: References: <1568639388-27291-1-git-send-email-yiboz@codeaurora.org> <1568639388-27291-2-git-send-email-yiboz@codeaurora.org> <87pnjyiq7o.fsf@toke.dk> Date: Wed, 18 Sep 2019 13:23:37 +0200 Message-ID: <87sgothmpy.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: Yibo Zhao Cc: linux-wireless@vger.kernel.org, ath10k@lists.infradead.org WWlibyBaaGFvIDx5aWJvekBjb2RlYXVyb3JhLm9yZz4gd3JpdGVzOgoKPiBPbiAyMDE5LTA5LTE4 IDA1OjEwLCBUb2tlIEjDuGlsYW5kLUrDuHJnZW5zZW4gd3JvdGU6Cj4+IFlpYm8gWmhhbyA8eWli b3pAY29kZWF1cm9yYS5vcmc+IHdyaXRlczoKPj4gCj4+PiBJbiBhIGxvb3AgdHhxcyBkZXF1ZXVl IHNjZW5hcmlvLCBpZiB0aGUgZmlyc3QgdHhxIGluIHRoZSByYnRyZWUgZ2V0cwo+Pj4gcmVtb3Zl ZCBmcm9tIHJidHJlZSBpbW1lZGlhdGVseSBpbiB0aGUgaWVlZTgwMjExX3JldHVybl90eHEoKSwg dGhlCj4+PiBsb29wIHdpbGwgYnJlYWsgc29vbiBpbiB0aGUgaWVlZTgwMjExX25leHRfdHhxKCkg ZHVlIHRvIHNjaGVkdWxlX3Bvcwo+Pj4gbm90IGxlYWRpbmcgdG8gdGhlIHNlY29uZCB0eHEgaW4g dGhlIHJidHJlZS4gVGh1cywgZGVmZXJpbmcgdGhlCj4+PiByZW1vdmFsIHJpZ2h0IGJlZm9yZSB0 aGUgZW5kIG9mIHRoaXMgc2NoZWR1bGUgcm91bmQuCj4+PiAKPj4+IENvLWRldmVsb3BlZC1ieTog WWlibyBaaGFvIDx5aWJvekBjb2RlYXVyb3JhLm9yZz4KPj4+IFNpZ25lZC1vZmYtYnk6IFlpYm8g WmhhbyA8eWlib3pAY29kZWF1cm9yYS5vcmc+Cj4+PiBTaWduZWQtb2ZmLWJ5OiBUb2tlIEjDuGls YW5kLUrDuHJnZW5zZW4gPHRva2VAdG9rZS5kaz4KPj4gCj4+IEkgZGlkbid0IHdyaXRlIHRoaXMg cGF0Y2gsIHNvIHBsZWFzZSBkb24ndCB1c2UgbXkgc2lnbi1vZmYuIEknbGwgYWRkCj4+IGFjayBv ciByZXZpZXcgdGFncyBhcyBhcHByb3ByaWF0ZSBpbiByZXBseTsgYnV0IGEgZmV3IGNvbW1lbnRz IGZpcnN0Ogo+PiAKPj4+IC0tLQo+Pj4gIGluY2x1ZGUvbmV0L21hYzgwMjExLmggICAgIHwgMTYg KysrKysrKysrKy0tCj4+PiAgbmV0L21hYzgwMjExL2llZWU4MDIxMV9pLmggfCAgMyArKysKPj4+ ICBuZXQvbWFjODAyMTEvbWFpbi5jICAgICAgICB8ICA2ICsrKysrCj4+PiAgbmV0L21hYzgwMjEx L3R4LmMgICAgICAgICAgfCA2MyAKPj4+ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKystLS0KPj4+ICA0IGZpbGVzIGNoYW5nZWQsIDgzIGluc2VydGlvbnMoKyksIDUg ZGVsZXRpb25zKC0pCj4+PiAKPj4+IGRpZmYgLS1naXQgYS9pbmNsdWRlL25ldC9tYWM4MDIxMS5o IGIvaW5jbHVkZS9uZXQvbWFjODAyMTEuaAo+Pj4gaW5kZXggYWMyZWQ4ZS4uYmE1YTM0NSAxMDA2 NDQKPj4+IC0tLSBhL2luY2x1ZGUvbmV0L21hYzgwMjExLmgKPj4+ICsrKyBiL2luY2x1ZGUvbmV0 L21hYzgwMjExLmgKPj4+IEBAIC05MjUsNiArOTI1LDggQEAgc3RydWN0IGllZWU4MDIxMV90eF9y YXRlIHsKPj4+IAo+Pj4gICNkZWZpbmUgSUVFRTgwMjExX01BWF9UWF9SRVRSWQkJMzEKPj4+IAo+ Pj4gKyNkZWZpbmUgSUVFRTgwMjExX0FJUlRJTUVfVFhRX1JNX0NIS19JTlRWX0lOX01TIDEwMAo+ Pj4gKwo+Pj4gIHN0YXRpYyBpbmxpbmUgdm9pZCBpZWVlODAyMTFfcmF0ZV9zZXRfdmh0KHN0cnVj dCBpZWVlODAyMTFfdHhfcmF0ZSAKPj4+ICpyYXRlLAo+Pj4gIAkJCQkJICB1OCBtY3MsIHU4IG5z cykKPj4+ICB7Cj4+PiBAQCAtNjIzMiw3ICs2MjM0LDggQEAgc3RydWN0IHNrX2J1ZmYgKmllZWU4 MDIxMV90eF9kZXF1ZXVlKHN0cnVjdCAKPj4+IGllZWU4MDIxMV9odyAqaHcsCj4+PiAgICogQGFj OiBBQyBudW1iZXIgdG8gcmV0dXJuIHBhY2tldHMgZnJvbS4KPj4+ICAgKgo+Pj4gICAqIFNob3Vs ZCBvbmx5IGJlIGNhbGxlZCBiZXR3ZWVuIGNhbGxzIHRvIAo+Pj4gaWVlZTgwMjExX3R4cV9zY2hl ZHVsZV9zdGFydCgpCj4+PiAtICogYW5kIGllZWU4MDIxMV90eHFfc2NoZWR1bGVfZW5kKCkuCj4+ PiArICogYW5kIGllZWU4MDIxMV90eHFfc2NoZWR1bGVfZW5kKCkuIElmIHRoZSB0eHEgaXMgZW1w dHksIGl0IHdpbGwgYmUgCj4+PiBhZGRlZAo+Pj4gKyAqIHRvIGEgcmVtb3ZlIGxpc3QgYW5kIGdl dCByZW1vdmVkIGxhdGVyLgo+Pj4gICAqIFJldHVybnMgdGhlIG5leHQgdHhxIGlmIHN1Y2Nlc3Nm dWwsICVOVUxMIGlmIG5vIHF1ZXVlIGlzIGVsaWdpYmxlLiAKPj4+IElmIGEgdHhxCj4+PiAgICog aXMgcmV0dXJuZWQsIGl0IHNob3VsZCBiZSByZXR1cm5lZCB3aXRoIGllZWU4MDIxMV9yZXR1cm5f dHhxKCkgCj4+PiBhZnRlciB0aGUKPj4+ICAgKiBkcml2ZXIgaGFzIGZpbmlzaGVkIHNjaGVkdWxp bmcgaXQuCj4+PiBAQCAtNjI2OCw3ICs2MjcxLDggQEAgdm9pZCBpZWVlODAyMTFfdHhxX3NjaGVk dWxlX3N0YXJ0KHN0cnVjdCAKPj4+IGllZWU4MDIxMV9odyAqaHcsIHU4IGFjKQo+Pj4gICAqIEBo dzogcG9pbnRlciBhcyBvYnRhaW5lZCBmcm9tIGllZWU4MDIxMV9hbGxvY19odygpCj4+PiAgICog QGFjOiBBQyBudW1iZXIgdG8gYWNxdWlyZSBsb2NrcyBmb3IKPj4+ICAgKgo+Pj4gLSAqIFJlbGVh c2UgbG9ja3MgcHJldmlvdXNseSBhY3F1aXJlZCBieSBpZWVlODAyMTFfdHhxX3NjaGVkdWxlX2Vu ZCgpLgo+Pj4gKyAqIFJlbGVhc2UgbG9ja3MgcHJldmlvdXNseSBhY3F1aXJlZCBieSBpZWVlODAy MTFfdHhxX3NjaGVkdWxlX2VuZCgpLiAKPj4+IENoZWNrCj4+PiArICogYW5kIHJlbW92ZSB0aGUg ZW1wdHkgdHhxIGZyb20gcmItdHJlZS4KPj4+ICAgKi8KPj4+ICB2b2lkIGllZWU4MDIxMV90eHFf c2NoZWR1bGVfZW5kKHN0cnVjdCBpZWVlODAyMTFfaHcgKmh3LCB1OCBhYykKPj4+ICAJX19yZWxl YXNlcyh0eHFfbG9jayk7Cj4+PiBAQCAtNjI4Nyw2ICs2MjkxLDE0IEBAIHZvaWQgaWVlZTgwMjEx X3NjaGVkdWxlX3R4cShzdHJ1Y3QgaWVlZTgwMjExX2h3IAo+Pj4gKmh3LCBzdHJ1Y3QgaWVlZTgw MjExX3R4cSAqdHhxKQo+Pj4gIAlfX2FjcXVpcmVzKHR4cV9sb2NrKSBfX3JlbGVhc2VzKHR4cV9s b2NrKTsKPj4+IAo+Pj4gIC8qKgo+Pj4gKyAqIGllZWU4MDIxMV90eHFzX2NoZWNrIC0gQ2hlY2sg dHhxcyB3YWl0aW5nIGZvciByZW1vdmFsCj4+PiArICoKPj4+ICsgKiBAdG1yOiBwb2ludGVyIGFz IG9idGFpbmVkIGZyb20gbG9jYWwKPj4+ICsgKgo+Pj4gKyAqLwo+Pj4gK3ZvaWQgaWVlZTgwMjEx X3R4cXNfY2hlY2soc3RydWN0IHRpbWVyX2xpc3QgKnRtcik7Cj4+PiArCj4+PiArLyoqCj4+PiAg ICogaWVlZTgwMjExX3R4cV9tYXlfdHJhbnNtaXQgLSBjaGVjayB3aGV0aGVyIFRYUSBpcyBhbGxv d2VkIHRvIAo+Pj4gdHJhbnNtaXQKPj4+ICAgKgo+Pj4gICAqIFRoaXMgZnVuY3Rpb24gaXMgdXNl ZCB0byBjaGVjayB3aGV0aGVyIGdpdmVuIHR4cSBpcyBhbGxvd2VkIHRvIAo+Pj4gdHJhbnNtaXQg YnkKPj4+IGRpZmYgLS1naXQgYS9uZXQvbWFjODAyMTEvaWVlZTgwMjExX2kuaCBiL25ldC9tYWM4 MDIxMS9pZWVlODAyMTFfaS5oCj4+PiBpbmRleCBhNDU1NmY5Li40OWFhMTQzZSAxMDA2NDQKPj4+ IC0tLSBhL25ldC9tYWM4MDIxMS9pZWVlODAyMTFfaS5oCj4+PiArKysgYi9uZXQvbWFjODAyMTEv aWVlZTgwMjExX2kuaAo+Pj4gQEAgLTg0Nyw2ICs4NDcsNyBAQCBzdHJ1Y3QgdHhxX2luZm8gewo+ Pj4gIAlzdHJ1Y3QgY29kZWxfc3RhdHMgY3N0YXRzOwo+Pj4gIAlzdHJ1Y3Qgc2tfYnVmZl9oZWFk IGZyYWdzOwo+Pj4gIAlzdHJ1Y3QgcmJfbm9kZSBzY2hlZHVsZV9vcmRlcjsKPj4+ICsJc3RydWN0 IGxpc3RfaGVhZCBjYW5kaWRhdGU7Cj4+PiAgCXVuc2lnbmVkIGxvbmcgZmxhZ3M7Cj4+PiAKPj4+ ICAJLyoga2VlcCBsYXN0ISAqLwo+Pj4gQEAgLTExNDUsNiArMTE0Niw4IEBAIHN0cnVjdCBpZWVl ODAyMTFfbG9jYWwgewo+Pj4gIAl1NjQgYWlydGltZV92X3RbSUVFRTgwMjExX05VTV9BQ1NdOwo+ Pj4gIAl1NjQgYWlydGltZV93ZWlnaHRfc3VtW0lFRUU4MDIxMV9OVU1fQUNTXTsKPj4+IAo+Pj4g KwlzdHJ1Y3QgbGlzdF9oZWFkIHJlbW92ZV9saXN0W0lFRUU4MDIxMV9OVU1fQUNTXTsKPj4+ICsJ c3RydWN0IHRpbWVyX2xpc3QgcmVtb3ZlX3RpbWVyOwo+Pj4gIAl1MTYgYWlydGltZV9mbGFnczsK Pj4+IAo+Pj4gIAljb25zdCBzdHJ1Y3QgaWVlZTgwMjExX29wcyAqb3BzOwo+Pj4gZGlmZiAtLWdp dCBhL25ldC9tYWM4MDIxMS9tYWluLmMgYi9uZXQvbWFjODAyMTEvbWFpbi5jCj4+PiBpbmRleCBl OWZmYThlLi43OGZlMjRhIDEwMDY0NAo+Pj4gLS0tIGEvbmV0L21hYzgwMjExL21haW4uYwo+Pj4g KysrIGIvbmV0L21hYzgwMjExL21haW4uYwo+Pj4gQEAgLTY2NywxMCArNjY3LDE1IEBAIHN0cnVj dCBpZWVlODAyMTFfaHcgCj4+PiAqaWVlZTgwMjExX2FsbG9jX2h3X25tKHNpemVfdCBwcml2X2Rh dGFfbGVuLAo+Pj4gCj4+PiAgCWZvciAoaSA9IDA7IGkgPCBJRUVFODAyMTFfTlVNX0FDUzsgaSsr KSB7Cj4+PiAgCQlsb2NhbC0+YWN0aXZlX3R4cXNbaV0gPSBSQl9ST09UX0NBQ0hFRDsKPj4+ICsJ CUlOSVRfTElTVF9IRUFEKCZsb2NhbC0+cmVtb3ZlX2xpc3RbaV0pOwo+Pj4gIAkJc3Bpbl9sb2Nr X2luaXQoJmxvY2FsLT5hY3RpdmVfdHhxX2xvY2tbaV0pOwo+Pj4gIAl9Cj4+PiAgCWxvY2FsLT5h aXJ0aW1lX2ZsYWdzID0gQUlSVElNRV9VU0VfVFggfCBBSVJUSU1FX1VTRV9SWDsKPj4+IAo+Pj4g Kwl0aW1lcl9zZXR1cCgmbG9jYWwtPnJlbW92ZV90aW1lciwgaWVlZTgwMjExX3R4cXNfY2hlY2ss IDApOwo+Pj4gKwltb2RfdGltZXIoJmxvY2FsLT5yZW1vdmVfdGltZXIsCj4+PiArCQkgIGppZmZp ZXMgKyAKPj4+IG1zZWNzX3RvX2ppZmZpZXMoSUVFRTgwMjExX0FJUlRJTUVfVFhRX1JNX0NIS19J TlRWX0lOX01TKSk7Cj4+PiArCj4+PiAgCUlOSVRfTElTVF9IRUFEKCZsb2NhbC0+Y2hhbmN0eF9s aXN0KTsKPj4+ICAJbXV0ZXhfaW5pdCgmbG9jYWwtPmNoYW5jdHhfbXR4KTsKPj4+IAo+Pj4gQEAg LTEzMDUsNiArMTMxMCw3IEBAIHZvaWQgaWVlZTgwMjExX3VucmVnaXN0ZXJfaHcoc3RydWN0IGll ZWU4MDIxMV9odyAKPj4+ICpodykKPj4+ICAJdGFza2xldF9raWxsKCZsb2NhbC0+dHhfcGVuZGlu Z190YXNrbGV0KTsKPj4+ICAJdGFza2xldF9raWxsKCZsb2NhbC0+dGFza2xldCk7Cj4+PiAKPj4+ ICsJZGVsX3RpbWVyX3N5bmMoJmxvY2FsLT5yZW1vdmVfdGltZXIpOwo+Pj4gICNpZmRlZiBDT05G SUdfSU5FVAo+Pj4gIAl1bnJlZ2lzdGVyX2luZXRhZGRyX25vdGlmaWVyKCZsb2NhbC0+aWZhX25v dGlmaWVyKTsKPj4+ICAjZW5kaWYKPj4+IGRpZmYgLS1naXQgYS9uZXQvbWFjODAyMTEvdHguYyBi L25ldC9tYWM4MDIxMS90eC5jCj4+PiBpbmRleCBkMDBiYWFhLi40MmNhMDEwIDEwMDY0NAo+Pj4g LS0tIGEvbmV0L21hYzgwMjExL3R4LmMKPj4+ICsrKyBiL25ldC9tYWM4MDIxMS90eC5jCj4+PiBA QCAtMTQ1MCw2ICsxNDUwLDcgQEAgdm9pZCBpZWVlODAyMTFfdHhxX2luaXQoc3RydWN0IAo+Pj4g aWVlZTgwMjExX3N1Yl9pZl9kYXRhICpzZGF0YSwKPj4+ICAJY29kZWxfc3RhdHNfaW5pdCgmdHhx aS0+Y3N0YXRzKTsKPj4+ICAJX19za2JfcXVldWVfaGVhZF9pbml0KCZ0eHFpLT5mcmFncyk7Cj4+ PiAgCVJCX0NMRUFSX05PREUoJnR4cWktPnNjaGVkdWxlX29yZGVyKTsKPj4+ICsJSU5JVF9MSVNU X0hFQUQoJnR4cWktPmNhbmRpZGF0ZSk7Cj4+PiAKPj4+ICAJdHhxaS0+dHhxLnZpZiA9ICZzZGF0 YS0+dmlmOwo+Pj4gCj4+PiBAQCAtMzcyNCw2ICszNzI1LDkgQEAgdm9pZCBpZWVlODAyMTFfc2No ZWR1bGVfdHhxKHN0cnVjdCBpZWVlODAyMTFfaHcgCj4+PiAqaHcsCj4+PiAKPj4+ICAJc3Bpbl9s b2NrX2JoKCZsb2NhbC0+YWN0aXZlX3R4cV9sb2NrW2FjXSk7Cj4+PiAKPj4+ICsJaWYgKCFsaXN0 X2VtcHR5KCZ0eHFpLT5jYW5kaWRhdGUpKQo+Pj4gKwkJbGlzdF9kZWxfaW5pdCgmdHhxaS0+Y2Fu ZGlkYXRlKTsKPj4+ICsKPj4+ICAJaWYgKCFSQl9FTVBUWV9OT0RFKCZ0eHFpLT5zY2hlZHVsZV9v cmRlcikpCj4+PiAgCQlnb3RvIG91dDsKPj4+IAo+Pj4gQEAgLTM3ODMsNiArMzc4NywyMCBAQCBz dGF0aWMgdm9pZCBfX2llZWU4MDIxMV91bnNjaGVkdWxlX3R4cShzdHJ1Y3QgCj4+PiBpZWVlODAy MTFfaHcgKmh3LAo+Pj4gIAlSQl9DTEVBUl9OT0RFKCZ0eHFpLT5zY2hlZHVsZV9vcmRlcik7Cj4+ PiAgfQo+Pj4gCj4+PiArdm9pZCBpZWVlODAyMTFfcmVtb3ZlX3R4cShzdHJ1Y3QgaWVlZTgwMjEx X2h3ICpodywKPj4+ICsJCQkgIHN0cnVjdCBpZWVlODAyMTFfdHhxICp0eHEpCj4+PiArewo+Pj4g KwlzdHJ1Y3QgaWVlZTgwMjExX2xvY2FsICpsb2NhbCA9IGh3X3RvX2xvY2FsKGh3KTsKPj4+ICsJ c3RydWN0IHR4cV9pbmZvICp0eHFpID0gdG9fdHhxX2luZm8odHhxKTsKPj4+ICsKPj4+ICsJbG9j a2RlcF9hc3NlcnRfaGVsZCgmbG9jYWwtPmFjdGl2ZV90eHFfbG9ja1t0eHEtPmFjXSk7Cj4+PiAr Cj4+PiArCWlmICghUkJfRU1QVFlfTk9ERSgmdHhxaS0+c2NoZWR1bGVfb3JkZXIpKSB7Cj4+PiAr CQlfX2llZWU4MDIxMV91bnNjaGVkdWxlX3R4cShodywgdHhxKTsKPj4+ICsJCWxpc3RfZGVsX2lu aXQoJnR4cWktPmNhbmRpZGF0ZSk7Cj4+PiArCX0KPj4+ICt9Cj4+PiArCj4+PiAgdm9pZCBpZWVl ODAyMTFfdW5zY2hlZHVsZV90eHEoc3RydWN0IGllZWU4MDIxMV9odyAqaHcsCj4+PiAgCQkJICAg ICAgc3RydWN0IGllZWU4MDIxMV90eHEgKnR4cSkKPj4+ICAJX19hY3F1aXJlcyh0eHFfbG9jaykg X19yZWxlYXNlcyh0eHFfbG9jaykKPj4+IEBAIC0zNzkwLDcgKzM4MDgsNyBAQCB2b2lkIGllZWU4 MDIxMV91bnNjaGVkdWxlX3R4cShzdHJ1Y3QgCj4+PiBpZWVlODAyMTFfaHcgKmh3LAo+Pj4gIAlz dHJ1Y3QgaWVlZTgwMjExX2xvY2FsICpsb2NhbCA9IGh3X3RvX2xvY2FsKGh3KTsKPj4+IAo+Pj4g IAlzcGluX2xvY2tfYmgoJmxvY2FsLT5hY3RpdmVfdHhxX2xvY2tbdHhxLT5hY10pOwo+Pj4gLQlf X2llZWU4MDIxMV91bnNjaGVkdWxlX3R4cShodywgdHhxKTsKPj4+ICsJaWVlZTgwMjExX3JlbW92 ZV90eHEoaHcsIHR4cSk7Cj4+PiAgCXNwaW5fdW5sb2NrX2JoKCZsb2NhbC0+YWN0aXZlX3R4cV9s b2NrW3R4cS0+YWNdKTsKPj4+ICB9Cj4+PiAKPj4+IEBAIC0zODAzLDExICszODIxLDQ4IEBAIHZv aWQgaWVlZTgwMjExX3JldHVybl90eHEoc3RydWN0IGllZWU4MDIxMV9odyAKPj4+ICpodywKPj4+ ICAJbG9ja2RlcF9hc3NlcnRfaGVsZCgmbG9jYWwtPmFjdGl2ZV90eHFfbG9ja1t0eHEtPmFjXSk7 Cj4+PiAKPj4+ICAJaWYgKCFSQl9FTVBUWV9OT0RFKCZ0eHFpLT5zY2hlZHVsZV9vcmRlcikgJiYK Pj4+IC0JICAgIChza2JfcXVldWVfZW1wdHkoJnR4cWktPmZyYWdzKSAmJiAhdHhxaS0+dGluLmJh Y2tsb2dfcGFja2V0cykpCj4+PiAtCQlfX2llZWU4MDIxMV91bnNjaGVkdWxlX3R4cShodywgdHhx KTsKPj4+ICsJCSF0eHFfaGFzX3F1ZXVlKCZ0eHFpLT50eHEpICYmCj4+PiArCQlsaXN0X2VtcHR5 KCZ0eHFpLT5jYW5kaWRhdGUpKQo+Pj4gKwkJbGlzdF9hZGRfdGFpbCgmdHhxaS0+Y2FuZGlkYXRl LCAmbG9jYWwtPnJlbW92ZV9saXN0W3R4cS0+YWNdKTsKPj4+ICsKPj4+ICB9Cj4+PiAgRVhQT1JU X1NZTUJPTChpZWVlODAyMTFfcmV0dXJuX3R4cSk7Cj4+PiAKPj4+ICt2b2lkIF9faWVlZTgwMjEx X2NoZWNrX3R4cXMoc3RydWN0IGllZWU4MDIxMV9sb2NhbCAqbG9jYWwsIGludCBhYykKPj4+ICt7 Cj4+PiArCXN0cnVjdCB0eHFfaW5mbyAqaXRlciwgKnRtcDsKPj4+ICsJc3RydWN0IHN0YV9pbmZv ICpzdGE7Cj4+PiArCj4+PiArCWxvY2tkZXBfYXNzZXJ0X2hlbGQoJmxvY2FsLT5hY3RpdmVfdHhx X2xvY2tbYWNdKTsKPj4+ICsKPj4+ICsJbGlzdF9mb3JfZWFjaF9lbnRyeV9zYWZlKGl0ZXIsIHRt cCwgJmxvY2FsLT5yZW1vdmVfbGlzdFthY10sCj4+PiArCQkJCSBjYW5kaWRhdGUpIHsKPj4+ICsJ CXN0YSA9IGNvbnRhaW5lcl9vZihpdGVyLT50eHEuc3RhLCBzdHJ1Y3Qgc3RhX2luZm8sIHN0YSk7 Cj4+PiArCj4+PiArCQlpZiAodHhxX2hhc19xdWV1ZSgmaXRlci0+dHhxKSkKPj4+ICsJCQlsaXN0 X2RlbF9pbml0KCZpdGVyLT5jYW5kaWRhdGUpOwo+Pj4gKwkJZWxzZQo+Pj4gKwkJCWllZWU4MDIx MV9yZW1vdmVfdHhxKCZsb2NhbC0+aHcsICZpdGVyLT50eHEpOwo+Pj4gKwl9Cj4+PiArfQo+Pj4g Kwo+Pj4gK3ZvaWQgaWVlZTgwMjExX3R4cXNfY2hlY2soc3RydWN0IHRpbWVyX2xpc3QgKnQpCj4+ PiArewo+Pj4gKwlzdHJ1Y3QgaWVlZTgwMjExX2xvY2FsICpsb2NhbCA9IGZyb21fdGltZXIobG9j YWwsIHQsIHJlbW92ZV90aW1lcik7Cj4+PiArCXN0cnVjdCB0eHFfaW5mbyAqaXRlciwgKnRtcDsK Pj4+ICsJc3RydWN0IHN0YV9pbmZvICpzdGE7Cj4+PiArCWludCBhYzsKPj4+ICsKPj4+ICsJZm9y IChhYyA9IDA7IGFjIDwgSUVFRTgwMjExX05VTV9BQ1M7IGFjKyspIHsKPj4+ICsJCXNwaW5fbG9j a19iaCgmbG9jYWwtPmFjdGl2ZV90eHFfbG9ja1thY10pOwo+Pj4gKwkJX19pZWVlODAyMTFfY2hl Y2tfdHhxcyhsb2NhbCwgYWMpOwo+Pj4gKwkJc3Bpbl91bmxvY2tfYmgoJmxvY2FsLT5hY3RpdmVf dHhxX2xvY2tbYWNdKTsKPj4+ICsJfQo+Pj4gKwo+Pj4gKwltb2RfdGltZXIoJmxvY2FsLT5yZW1v dmVfdGltZXIsCj4+PiArCQkgIGppZmZpZXMgKyAKPj4+IG1zZWNzX3RvX2ppZmZpZXMoSUVFRTgw MjExX0FJUlRJTUVfVFhRX1JNX0NIS19JTlRWX0lOX01TKSk7Cj4+PiArfQo+PiAKPj4gSSdsbCBh c2sgdGhlIHNhbWUgYXMgSSBkaWQgbGFzdCB0aW1lICh3aGVyZSB5b3UgdG9sZCBtZSB0byBob2xk IG9mZgo+PiB1bnRpbCB0aGlzIHJvdW5kKToKPj4gCj4+IFdoeSBkbyB5b3UgbmVlZCB0aGUgdGlt ZXIgYW5kIHRoZSBwZXJpb2RpYyBjaGVjaz8gSWYgVFhRcyBhcmUgYWRkZWQgdG8KPj4gdGhlIHJl bW92ZSBsaXN0IGR1cmluZyB0aGUgc2NoZWR1bGluZyBydW4sIGFuZCBfX2llZWU4MDIxMV9jaGVj a190eHFzKCkKPj4gaXMgcnVuIGZyb20gc2NoZWR1bGVfZW5kKCksIGlzbid0IHRoYXQgc3VmZmlj aWVudCB0byBjbGVhciB0aGUgbGlzdD8KPiBJcyBpdCBwb3NzaWJsZSB0aGF0IGEgdHhxIGlzIG5v dCBhZGRlZCB0byB0aGUgcmVtb3ZlIGxpc3QgYnV0IHRoZW4gCj4gcGFja2V0cyBpbiBpdCBhcmUg ZHJvcHBlZCBieSBmcV9jb2RlbCBhbGdvPyBMaWtlIHRoZSBzdGF0aW9uIGRpc2Nvbm5lY3RzIAo+ IHdpdGhvdXQgYW55IG5vdGlmaWNhdGlvbi4KCldlbGwgYXMgbG9uZyBhcyBhbGwgdGhlIG90aGVy IGNsZWFudXAgcGF0aHMgY2FsbCBkaXJlY3RseSBpbnRvCl9fdW5zY2hlZHVsZV90eHEoKSwgdGhh dCBzaG91bGQgcmVtb3ZlIHN0YXRpb25zIGZyb20gdGhlIHNjaGVkdWxlciB3aGVuCnRoZXkgZGlz Y29ubmVjdCBldGMuCgpXZSBvbmx5IG5lZWQgdG8gZGVmZXIgcmVtb3ZhbCBpbnNpZGUgYSBzaW5n bGUgInNjaGVkdWxpbmcgcm91bmQiIChpLmUuLApiZXR3ZWVuIGEgcGFpciBvZiBpZWVlODAyMTFf dHhxX3NjaGVkdWxlX3N0YXJ0L2VuZC4gU28gaWYgd2UganVzdCB3YWxrCnRoZSByZW1vdmUgbGlz dCBpbiBzY2hlZHVsZV9lbmQoKSB3ZSBzaG91bGQgYmUgZW5vdWdoLCBubz8KCkhtbSwgb3IgbWF5 YmUgYSBzaW1wbGVyIHdheSB0byBmaXggdGhlIG9yaWdpbmFsIGlzc3VlIGlzIGp1c3QgdG8gaGF2 ZQp1bnNjaGVkdWxlX3R4cSgpIHVwZGF0ZSB0aGUgc2NoZWR1bGVfcG9zKCkgcG9pbnRlcj8KCkku ZS4sIHVuc2NoZWR1bGVfdHhxIGNoZWNrcyBpZiB0aGUgdHhxIGJlaW5nIHJlbW92ZWQgaXMgY3Vy cmVudGx5IGJlaW5nCnBvaW50ZWQgdG8gYnkgc2NoZWR1bGVfcG9zW2FjXSwgYW5kIGlmIGl0IGlz LCBpdCB1cGRhdGVzIHNjaGVkdWxlX3BvcyB0bwpiZSB0aGUgcmJfbmV4dCBvZiB0aGUgY3VycmVu dCB2YWx1ZT8KCi1Ub2tlCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KYXRoMTBrIG1haWxpbmcgbGlzdAphdGgxMGtAbGlzdHMuaW5mcmFkZWFkLm9yZwpo dHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2F0aDEwawo= 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=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 4844BC4CEC4 for ; Wed, 18 Sep 2019 11:23:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F1BCB214AF for ; Wed, 18 Sep 2019 11:23:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="QXamgz+9" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730029AbfIRLXq (ORCPT ); Wed, 18 Sep 2019 07:23:46 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:58102 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729986AbfIRLXq (ORCPT ); Wed, 18 Sep 2019 07:23:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1568805823; 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=B7FEzfRmSuY5cNCPBq3tS49KQVwkNj3aEjy0e/Vy1WU=; b=QXamgz+9blXQ2gJLyguYA02/AYvJ+LL66OjeH81xZi7zNk7empTkWE62a4sp0W8j0Afwwn qtjknGWk/9PHtiOU/1fo9pmkUkmoByYYi9+kBqFWgHWEPmM+pvvJ89aN1JC0QoDVP2kM77 myAcQHUyRTnSC3t1WIMTe+tt90aCepI= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-171-H015dgOFNxWSj8_mBNd_4g-1; Wed, 18 Sep 2019 07:23:41 -0400 Received: by mail-ed1-f69.google.com with SMTP id t13so3630736edr.2 for ; Wed, 18 Sep 2019 04:23:40 -0700 (PDT) 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=CzMe6ucFlGxlf4gDvlWB+jsuKQHNyGOAVPAN/D3vKKM=; b=SLzFsLp8M9q5rV6ORmWOG1EnTZwPAn8FmyFIHtYu/vAbXVTVb6N4x8a59WwaraDRdc 6TCmMWKji3N01CcFHswa6t9uhy+K19ZlzXEUuQ4XgYroolr4MJOjgzkkoTgVdz0KuwCM CBjfcfD9og7FvKfbRm5XzMEVS522APsnYn6S6iLvDlIaHgv/UpgfF0nPoWXobAHh6DC8 o8CANCCO2ga2U+9flgH0MASzp8pVAziAU4vaIvr5iGWstwQjgTXMjybpiec4lyq1oMh9 DtCwfMxJGL9vRh+sedE8yfXH7ZSRfmxxSPP52wrWNoEs85ugG6M8HPrgXmlMcIfIZNs6 MZOA== X-Gm-Message-State: APjAAAX+nHGRVhHVeUHhZJx9aPYvwRDexag+MUVY1TwRYmKnj9ghb3Lt 6BObnMdMYTEVUeSdeITjj9Jx0ovJWXKY3gmVD8/qmbNaJ8Q+2TEstDzqrQ4XtybX8cKGSSeHvaf mot1m3/k9M7dvA2zidCynNhygo1o= X-Received: by 2002:a17:906:4f0e:: with SMTP id t14mr8760167eju.47.1568805819816; Wed, 18 Sep 2019 04:23:39 -0700 (PDT) X-Google-Smtp-Source: APXvYqzMHeeGkUsffmmJ/Kvy5IasiNeGzgeTeA74uOZuRloVNpth3e0huqajXVS7MYIYqmK5912YtQ== X-Received: by 2002:a17:906:4f0e:: with SMTP id t14mr8760149eju.47.1568805819534; Wed, 18 Sep 2019 04:23:39 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk ([2a00:7660:6da:443::2]) by smtp.gmail.com with ESMTPSA id v22sm993194edm.89.2019.09.18.04.23.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Sep 2019 04:23:38 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id DDB2818063E; Wed, 18 Sep 2019 13:23:37 +0200 (CEST) From: Toke =?utf-8?Q?H=C3=B8iland-J=C3=B8rgensen?= To: Yibo Zhao Cc: ath10k@lists.infradead.org, linux-wireless@vger.kernel.org Subject: Re: [PATCH 2/4] mac80211: defer txqs removal from rbtree In-Reply-To: References: <1568639388-27291-1-git-send-email-yiboz@codeaurora.org> <1568639388-27291-2-git-send-email-yiboz@codeaurora.org> <87pnjyiq7o.fsf@toke.dk> X-Clacks-Overhead: GNU Terry Pratchett Date: Wed, 18 Sep 2019 13:23:37 +0200 Message-ID: <87sgothmpy.fsf@toke.dk> MIME-Version: 1.0 X-MC-Unique: H015dgOFNxWSj8_mBNd_4g-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 Yibo Zhao writes: > On 2019-09-18 05:10, Toke H=C3=B8iland-J=C3=B8rgensen wrote: >> Yibo Zhao writes: >>=20 >>> In a loop txqs dequeue scenario, if the first txq in the rbtree gets >>> removed from rbtree immediately in the ieee80211_return_txq(), the >>> loop will break soon in the ieee80211_next_txq() due to schedule_pos >>> not leading to the second txq in the rbtree. Thus, defering the >>> removal right before the end of this schedule round. >>>=20 >>> Co-developed-by: Yibo Zhao >>> Signed-off-by: Yibo Zhao >>> Signed-off-by: Toke H=C3=B8iland-J=C3=B8rgensen >>=20 >> I didn't write this patch, so please don't use my sign-off. I'll add >> ack or review tags as appropriate in reply; but a few comments first: >>=20 >>> --- >>> include/net/mac80211.h | 16 ++++++++++-- >>> net/mac80211/ieee80211_i.h | 3 +++ >>> net/mac80211/main.c | 6 +++++ >>> net/mac80211/tx.c | 63=20 >>> +++++++++++++++++++++++++++++++++++++++++++--- >>> 4 files changed, 83 insertions(+), 5 deletions(-) >>>=20 >>> diff --git a/include/net/mac80211.h b/include/net/mac80211.h >>> index ac2ed8e..ba5a345 100644 >>> --- a/include/net/mac80211.h >>> +++ b/include/net/mac80211.h >>> @@ -925,6 +925,8 @@ struct ieee80211_tx_rate { >>>=20 >>> #define IEEE80211_MAX_TX_RETRY=09=0931 >>>=20 >>> +#define IEEE80211_AIRTIME_TXQ_RM_CHK_INTV_IN_MS 100 >>> + >>> static inline void ieee80211_rate_set_vht(struct ieee80211_tx_rate=20 >>> *rate, >>> =09=09=09=09=09 u8 mcs, u8 nss) >>> { >>> @@ -6232,7 +6234,8 @@ struct sk_buff *ieee80211_tx_dequeue(struct=20 >>> ieee80211_hw *hw, >>> * @ac: AC number to return packets from. >>> * >>> * Should only be called between calls to=20 >>> ieee80211_txq_schedule_start() >>> - * and ieee80211_txq_schedule_end(). >>> + * and ieee80211_txq_schedule_end(). If the txq is empty, it will be= =20 >>> added >>> + * to a remove list and get removed later. >>> * Returns the next txq if successful, %NULL if no queue is eligible.= =20 >>> If a txq >>> * is returned, it should be returned with ieee80211_return_txq()=20 >>> after the >>> * driver has finished scheduling it. >>> @@ -6268,7 +6271,8 @@ void ieee80211_txq_schedule_start(struct=20 >>> ieee80211_hw *hw, u8 ac) >>> * @hw: pointer as obtained from ieee80211_alloc_hw() >>> * @ac: AC number to acquire locks for >>> * >>> - * Release locks previously acquired by ieee80211_txq_schedule_end(). >>> + * Release locks previously acquired by ieee80211_txq_schedule_end().= =20 >>> Check >>> + * and remove the empty txq from rb-tree. >>> */ >>> void ieee80211_txq_schedule_end(struct ieee80211_hw *hw, u8 ac) >>> =09__releases(txq_lock); >>> @@ -6287,6 +6291,14 @@ void ieee80211_schedule_txq(struct ieee80211_hw= =20 >>> *hw, struct ieee80211_txq *txq) >>> =09__acquires(txq_lock) __releases(txq_lock); >>>=20 >>> /** >>> + * ieee80211_txqs_check - Check txqs waiting for removal >>> + * >>> + * @tmr: pointer as obtained from local >>> + * >>> + */ >>> +void ieee80211_txqs_check(struct timer_list *tmr); >>> + >>> +/** >>> * ieee80211_txq_may_transmit - check whether TXQ is allowed to=20 >>> transmit >>> * >>> * This function is used to check whether given txq is allowed to=20 >>> transmit by >>> diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h >>> index a4556f9..49aa143e 100644 >>> --- a/net/mac80211/ieee80211_i.h >>> +++ b/net/mac80211/ieee80211_i.h >>> @@ -847,6 +847,7 @@ struct txq_info { >>> =09struct codel_stats cstats; >>> =09struct sk_buff_head frags; >>> =09struct rb_node schedule_order; >>> +=09struct list_head candidate; >>> =09unsigned long flags; >>>=20 >>> =09/* keep last! */ >>> @@ -1145,6 +1146,8 @@ struct ieee80211_local { >>> =09u64 airtime_v_t[IEEE80211_NUM_ACS]; >>> =09u64 airtime_weight_sum[IEEE80211_NUM_ACS]; >>>=20 >>> +=09struct list_head remove_list[IEEE80211_NUM_ACS]; >>> +=09struct timer_list remove_timer; >>> =09u16 airtime_flags; >>>=20 >>> =09const struct ieee80211_ops *ops; >>> diff --git a/net/mac80211/main.c b/net/mac80211/main.c >>> index e9ffa8e..78fe24a 100644 >>> --- a/net/mac80211/main.c >>> +++ b/net/mac80211/main.c >>> @@ -667,10 +667,15 @@ struct ieee80211_hw=20 >>> *ieee80211_alloc_hw_nm(size_t priv_data_len, >>>=20 >>> =09for (i =3D 0; i < IEEE80211_NUM_ACS; i++) { >>> =09=09local->active_txqs[i] =3D RB_ROOT_CACHED; >>> +=09=09INIT_LIST_HEAD(&local->remove_list[i]); >>> =09=09spin_lock_init(&local->active_txq_lock[i]); >>> =09} >>> =09local->airtime_flags =3D AIRTIME_USE_TX | AIRTIME_USE_RX; >>>=20 >>> +=09timer_setup(&local->remove_timer, ieee80211_txqs_check, 0); >>> +=09mod_timer(&local->remove_timer, >>> +=09=09 jiffies +=20 >>> msecs_to_jiffies(IEEE80211_AIRTIME_TXQ_RM_CHK_INTV_IN_MS)); >>> + >>> =09INIT_LIST_HEAD(&local->chanctx_list); >>> =09mutex_init(&local->chanctx_mtx); >>>=20 >>> @@ -1305,6 +1310,7 @@ void ieee80211_unregister_hw(struct ieee80211_hw= =20 >>> *hw) >>> =09tasklet_kill(&local->tx_pending_tasklet); >>> =09tasklet_kill(&local->tasklet); >>>=20 >>> +=09del_timer_sync(&local->remove_timer); >>> #ifdef CONFIG_INET >>> =09unregister_inetaddr_notifier(&local->ifa_notifier); >>> #endif >>> diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c >>> index d00baaa..42ca010 100644 >>> --- a/net/mac80211/tx.c >>> +++ b/net/mac80211/tx.c >>> @@ -1450,6 +1450,7 @@ void ieee80211_txq_init(struct=20 >>> ieee80211_sub_if_data *sdata, >>> =09codel_stats_init(&txqi->cstats); >>> =09__skb_queue_head_init(&txqi->frags); >>> =09RB_CLEAR_NODE(&txqi->schedule_order); >>> +=09INIT_LIST_HEAD(&txqi->candidate); >>>=20 >>> =09txqi->txq.vif =3D &sdata->vif; >>>=20 >>> @@ -3724,6 +3725,9 @@ void ieee80211_schedule_txq(struct ieee80211_hw= =20 >>> *hw, >>>=20 >>> =09spin_lock_bh(&local->active_txq_lock[ac]); >>>=20 >>> +=09if (!list_empty(&txqi->candidate)) >>> +=09=09list_del_init(&txqi->candidate); >>> + >>> =09if (!RB_EMPTY_NODE(&txqi->schedule_order)) >>> =09=09goto out; >>>=20 >>> @@ -3783,6 +3787,20 @@ static void __ieee80211_unschedule_txq(struct=20 >>> ieee80211_hw *hw, >>> =09RB_CLEAR_NODE(&txqi->schedule_order); >>> } >>>=20 >>> +void ieee80211_remove_txq(struct ieee80211_hw *hw, >>> +=09=09=09 struct ieee80211_txq *txq) >>> +{ >>> +=09struct ieee80211_local *local =3D hw_to_local(hw); >>> +=09struct txq_info *txqi =3D to_txq_info(txq); >>> + >>> +=09lockdep_assert_held(&local->active_txq_lock[txq->ac]); >>> + >>> +=09if (!RB_EMPTY_NODE(&txqi->schedule_order)) { >>> +=09=09__ieee80211_unschedule_txq(hw, txq); >>> +=09=09list_del_init(&txqi->candidate); >>> +=09} >>> +} >>> + >>> void ieee80211_unschedule_txq(struct ieee80211_hw *hw, >>> =09=09=09 struct ieee80211_txq *txq) >>> =09__acquires(txq_lock) __releases(txq_lock) >>> @@ -3790,7 +3808,7 @@ void ieee80211_unschedule_txq(struct=20 >>> ieee80211_hw *hw, >>> =09struct ieee80211_local *local =3D hw_to_local(hw); >>>=20 >>> =09spin_lock_bh(&local->active_txq_lock[txq->ac]); >>> -=09__ieee80211_unschedule_txq(hw, txq); >>> +=09ieee80211_remove_txq(hw, txq); >>> =09spin_unlock_bh(&local->active_txq_lock[txq->ac]); >>> } >>>=20 >>> @@ -3803,11 +3821,48 @@ void ieee80211_return_txq(struct ieee80211_hw= =20 >>> *hw, >>> =09lockdep_assert_held(&local->active_txq_lock[txq->ac]); >>>=20 >>> =09if (!RB_EMPTY_NODE(&txqi->schedule_order) && >>> -=09 (skb_queue_empty(&txqi->frags) && !txqi->tin.backlog_packets)) >>> -=09=09__ieee80211_unschedule_txq(hw, txq); >>> +=09=09!txq_has_queue(&txqi->txq) && >>> +=09=09list_empty(&txqi->candidate)) >>> +=09=09list_add_tail(&txqi->candidate, &local->remove_list[txq->ac]); >>> + >>> } >>> EXPORT_SYMBOL(ieee80211_return_txq); >>>=20 >>> +void __ieee80211_check_txqs(struct ieee80211_local *local, int ac) >>> +{ >>> +=09struct txq_info *iter, *tmp; >>> +=09struct sta_info *sta; >>> + >>> +=09lockdep_assert_held(&local->active_txq_lock[ac]); >>> + >>> +=09list_for_each_entry_safe(iter, tmp, &local->remove_list[ac], >>> +=09=09=09=09 candidate) { >>> +=09=09sta =3D container_of(iter->txq.sta, struct sta_info, sta); >>> + >>> +=09=09if (txq_has_queue(&iter->txq)) >>> +=09=09=09list_del_init(&iter->candidate); >>> +=09=09else >>> +=09=09=09ieee80211_remove_txq(&local->hw, &iter->txq); >>> +=09} >>> +} >>> + >>> +void ieee80211_txqs_check(struct timer_list *t) >>> +{ >>> +=09struct ieee80211_local *local =3D from_timer(local, t, remove_timer= ); >>> +=09struct txq_info *iter, *tmp; >>> +=09struct sta_info *sta; >>> +=09int ac; >>> + >>> +=09for (ac =3D 0; ac < IEEE80211_NUM_ACS; ac++) { >>> +=09=09spin_lock_bh(&local->active_txq_lock[ac]); >>> +=09=09__ieee80211_check_txqs(local, ac); >>> +=09=09spin_unlock_bh(&local->active_txq_lock[ac]); >>> +=09} >>> + >>> +=09mod_timer(&local->remove_timer, >>> +=09=09 jiffies +=20 >>> msecs_to_jiffies(IEEE80211_AIRTIME_TXQ_RM_CHK_INTV_IN_MS)); >>> +} >>=20 >> I'll ask the same as I did last time (where you told me to hold off >> until this round): >>=20 >> Why do you need the timer and the periodic check? If TXQs are added to >> the remove list during the scheduling run, and __ieee80211_check_txqs() >> is run from schedule_end(), isn't that sufficient to clear the list? > Is it possible that a txq is not added to the remove list but then=20 > packets in it are dropped by fq_codel algo? Like the station disconnects= =20 > without any notification. Well as long as all the other cleanup paths call directly into __unschedule_txq(), that should remove stations from the scheduler when they disconnect etc. We only need to defer removal inside a single "scheduling round" (i.e., between a pair of ieee80211_txq_schedule_start/end. So if we just walk the remove list in schedule_end() we should be enough, no? Hmm, or maybe a simpler way to fix the original issue is just to have unschedule_txq() update the schedule_pos() pointer? I.e., unschedule_txq checks if the txq being removed is currently being pointed to by schedule_pos[ac], and if it is, it updates schedule_pos to be the rb_next of the current value? -Toke