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=-3.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,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 5F12FC43603 for ; Wed, 11 Dec 2019 13:46:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 406DA2173E for ; Wed, 11 Dec 2019 13:46:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729700AbfLKNqB (ORCPT ); Wed, 11 Dec 2019 08:46:01 -0500 Received: from s3.sipsolutions.net ([144.76.43.62]:54366 "EHLO sipsolutions.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729029AbfLKNqA (ORCPT ); Wed, 11 Dec 2019 08:46:00 -0500 Received: by sipsolutions.net with esmtpsa (TLS1.3:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.92.3) (envelope-from ) id 1if2JP-0048cr-P6; Wed, 11 Dec 2019 14:45:55 +0100 Message-ID: Subject: Re: iwlwifi warnings in 5.5-rc1 From: Johannes Berg To: Jens Axboe , Emmanuel Grumbach , Luca Coelho , "Jason A. Donenfeld" , Steve French Cc: "linux-wireless@vger.kernel.org" , Networking , Toke =?ISO-8859-1?Q?H=F8iland-J=F8rgensen?= Date: Wed, 11 Dec 2019 14:45:54 +0100 In-Reply-To: (sfid-20191210_214627_221076_8C5C32D1) References: (sfid-20191210_214627_221076_8C5C32D1) Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 (3.34.2-1.fc31) MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org ++ 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,