From: Johannes Berg <johannes@sipsolutions.net>
To: Jens Axboe <axboe@kernel.dk>,
Emmanuel Grumbach <emmanuel.grumbach@intel.com>,
Luca Coelho <luciano.coelho@intel.com>,
"Jason A. Donenfeld" <Jason@zx2c4.com>,
Steve French <smfrench@gmail.com>
Cc: "linux-wireless@vger.kernel.org" <linux-wireless@vger.kernel.org>,
Networking <netdev@vger.kernel.org>,
"Toke Høiland-Jørgensen" <toke@redhat.com>
Subject: Re: iwlwifi warnings in 5.5-rc1
Date: Wed, 11 Dec 2019 14:45:54 +0100 [thread overview]
Message-ID: <d4a48cbdc4b0db7b07b8776a1ee70b140e8a9bbf.camel@sipsolutions.net> (raw)
In-Reply-To: <ceb74ea2-6a1b-4cef-8749-db21a2ee4311@kernel.dk> (sfid-20191210_214627_221076_8C5C32D1)
++ others who reported this
On Tue, 2019-12-10 at 13:46 -0700, Jens Axboe wrote:
> ------------[ cut here ]------------
> STA b4:75:0e:99:1f:e0 AC 2 txq pending airtime underflow: 4294967088, 208
We think this is due to TSO, the change below will disable the AQL again
for now until we can figure out how to really fix it. I think I'll do
the equivalent for 5.5 and maybe leave it enabled only for ath10k, or
something like that ...
johannes
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 6cca0853f183..4c2b5ba3ac09 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -672,9 +672,7 @@ struct ieee80211_hw *ieee80211_alloc_hw_nm(size_t priv_data_len,
IEEE80211_DEFAULT_AQL_TXQ_LIMIT_H;
}
- local->airtime_flags = AIRTIME_USE_TX |
- AIRTIME_USE_RX |
- AIRTIME_USE_AQL;
+ local->airtime_flags = AIRTIME_USE_TX | AIRTIME_USE_RX;
local->aql_threshold = IEEE80211_AQL_THRESHOLD;
atomic_set(&local->aql_total_pending_airtime, 0);
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index 8eafd81e97b4..a14d0dac52e8 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -1916,6 +1916,9 @@ void ieee80211_sta_update_pending_airtime(struct ieee80211_local *local,
{
int tx_pending;
+ if (!(local->airtime_flags & AIRTIME_USE_AQL))
+ return;
+
if (!tx_completed) {
if (sta)
atomic_add(tx_airtime,
next prev parent reply other threads:[~2019-12-11 13:46 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-10 20:46 iwlwifi warnings in 5.5-rc1 Jens Axboe
2019-12-11 8:36 ` Johannes Berg
2019-12-11 8:53 ` Toke Høiland-Jørgensen
2019-12-11 10:11 ` Johannes Berg
2019-12-11 10:23 ` Toke Høiland-Jørgensen
2019-12-11 11:51 ` Johannes Berg
2019-12-11 13:42 ` Johannes Berg
2019-12-11 14:04 ` Toke Høiland-Jørgensen
2019-12-11 14:12 ` Johannes Berg
2019-12-11 14:47 ` Toke Høiland-Jørgensen
2019-12-11 21:18 ` Johannes Berg
2019-12-12 10:45 ` Toke Høiland-Jørgensen
2019-12-11 14:02 ` Toke Høiland-Jørgensen
2019-12-11 21:17 ` Johannes Berg
2019-12-12 10:55 ` Toke Høiland-Jørgensen
2019-12-12 11:00 ` Johannes Berg
2019-12-21 0:55 ` Jens Axboe
2019-12-21 9:17 ` Johannes Berg
2019-12-21 13:45 ` Jens Axboe
2019-12-11 13:45 ` Johannes Berg [this message]
2019-12-11 14:09 ` Toke Høiland-Jørgensen
2019-12-11 14:13 ` Johannes Berg
2019-12-11 14:55 ` Toke Høiland-Jørgensen
2019-12-11 21:19 ` Johannes Berg
2019-12-12 10:55 ` Toke Høiland-Jørgensen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d4a48cbdc4b0db7b07b8776a1ee70b140e8a9bbf.camel@sipsolutions.net \
--to=johannes@sipsolutions.net \
--cc=Jason@zx2c4.com \
--cc=axboe@kernel.dk \
--cc=emmanuel.grumbach@intel.com \
--cc=linux-wireless@vger.kernel.org \
--cc=luciano.coelho@intel.com \
--cc=netdev@vger.kernel.org \
--cc=smfrench@gmail.com \
--cc=toke@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.