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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 518FAC433F5 for ; Sat, 2 Apr 2022 14:34:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1356529AbiDBOf5 (ORCPT ); Sat, 2 Apr 2022 10:35:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46802 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356530AbiDBOf4 (ORCPT ); Sat, 2 Apr 2022 10:35:56 -0400 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 121AB326F1 for ; Sat, 2 Apr 2022 07:34:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1648910036; bh=/Vo1EL/YMaPjk68Z9ZfK0gIGRi074dD9ZAUPGBkrmbE=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=HeIGwk8CS3vo6kaV7JBIOGJEgSmCcVtf+3+RdSjQPKoDp1/deOrihqJRO4KzSvMWM glgF2oaQfERxIZarHcaqf1a/aoYZ7xnSjfxXhfIsZr/dyRMU+Ir6slM1C7BXLbiV8/ r3YvwFscmZ9+9g3ZmshDVRU8j5173bGSY/sSNGEw= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost ([62.216.209.166]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MS3mt-1nQRHL0C0x-00TXxY; Sat, 02 Apr 2022 16:33:56 +0200 Date: Sat, 2 Apr 2022 16:33:55 +0200 From: Peter Seiderer To: Toke =?UTF-8?B?SMO4aWxhbmQtSsO4cmdlbnNlbg==?= Cc: Kalle Valo , linux-wireless@vger.kernel.org, Bagas Sanjaya Subject: Re: [PATCH v5.18] ath9k: Properly clear TX status area before reporting to mac80211 Message-ID: <20220402163355.5ade795a@gmx.net> In-Reply-To: <20220401192657.16674bf7@gmx.net> References: <20220330164409.16645-1-toke@toke.dk> <20220401192657.16674bf7@gmx.net> X-Mailer: Claws Mail 4.0.0 (GTK+ 3.24.33; x86_64-suse-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:C6/srNLJUnmTSAhfQFvclNYYyKJIqb9iuzzVetG+JGIAroDHrRD uTogfFHiu95tJln48s5MNNqoGJeJm8LlU40tgMYcMO2bSuZTDJR8DRTO+wiRHbhpHDe2uW3 mndUfu3647CJQuY6xfeZAMYZSVaI96ppKtydVYCzl4akex3flivzFd62XKaRzhPve0elrgu ib0aN7chgt6MjlctwToug== X-UI-Out-Filterresults: notjunk:1;V03:K0:5g8t1a+CLkg=:QP0yQ0KhNI4QPmzujT2ezN yNY9owVXC4pg4qYG3/yqpH+O7M+gvO1MVXNEOnD+O6GiuxemA7/Y6S9hVtyNqD0IB5Bd3bDPG hO2swJ+WehOhAbKgqgK3DzfhUHPzBUAxZmeQDbsA+AliZCQekjWMrS6KOv2kyPXysM3/Q0pY+ FARHO6bG8gjTnh7LQVf/YFmz0YsxvzUGyatxsKFAhTu8gSUZj4IFr9mBhuPHLYZ62pQHkNooC tQ19iBFWgp7OlMbLyiNh1asIy9H1SCSqYVIvvTVV+vo4sUKckvvUSpLJdja4NnKI7w5gP4ceU 8oQqwKpcFphsfGk6eEiBAjXWsjN/kkwUVg9XfRXWa22/P3fk9TWFprvv9rm0QUWgEl5eeVWHE tOu/wNJqTeHa80zcNoSp3Y0bAPnqFFQ6P5bYC+RZqFnu0SMJye0CjFuvA3mSTgPQp+6jAa8o4 cij/mOIIdDJnSfy3kf+mgPggG4Xk2wx0C1ebJ9oAjVYSGLlVIHP/tqt+Iio/lmQJcLdNEfqPY MUgT7ZjVJfpgcGtA67diiK1gy5D60098MN1djS3RepBQZLudu03Afn8f9yDbsRr67OPMt7nTk 4dp/omkp9jBlxAEsm0AQi/omEsctUJosMkirvzElZdj/Aw/X2sT4lpd1UyX8IlqktGObWi1Xr /m5+pj/FI1JiLf0AahThzKNvT9dkKFrJ4d6df80pgHb6SKYAtkzz5YLjW1kVp78Qa2ZIdStmB REQ4+AMSyrI2qhGgFWloA6WXia9ObiUV1e8QYV9WvGwyydAGsdsS59JsTs1ZIuV5XGJCdt+5H 66lrqOiL1a5Z9sF/t8UoCuLI4/CdtIKNc9wXsxifkBrZZfX0WNpQmvuYNgrQ+R0iYaQBsLdk1 LwkvHBxpywv4DmGP62HoWuyuCUPupfQYZBDuDtcCvBs3xr2C+otSg7JJJ5nSCn+R20jMUMURL q/8yhAXgQHys0x/W57gKROrSqA6yBKPQjgRVcXDCMoXzZe78ho0SNf8wWPOi7jv8QiR/+3GOV A6OXLi5nbv0EwxDzf8UtplJDEJnFMqjSuBzqsZ1PNj33/W3MYxV9o+noZhlSbWDBmei7/w/SF osPkMFmNjh7noQ= Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Hello Toke, On Fri, 1 Apr 2022 19:26:57 +0200, Peter Seiderer wrote: > Hello Toke, >=20 > On Wed, 30 Mar 2022 18:44:09 +0200, Toke H=C3=B8iland-J=C3=B8rgensen wrote: >=20 > > The ath9k driver was not properly clearing the status area in the > > ieee80211_tx_info struct before reporting TX status to mac80211. Instea= d, > > it was manually filling in fields, which meant that fields introduced l= ater > > were left as-is. > >=20 > > Conveniently, mac80211 actually provides a helper to zero out the status > > area, so use that to make sure we zero everything. > >=20 > > The last commit touching the driver function writing the status informa= tion > > seems to have actually been fixing an issue that was also caused by the > > area being uninitialised; but it only added clearing of a single field > > instead of the whole struct. That is now redundant, though, so revert t= hat > > commit and use it as a convenient Fixes tag. > >=20 > > Fixes: cc591d77aba1 ("ath9k: Make sure to zero status.tx_time before re= porting TX status") > > Reported-by: Bagas Sanjaya > > Signed-off-by: Toke H=C3=B8iland-J=C3=B8rgensen > > --- > > drivers/net/wireless/ath/ath9k/xmit.c | 5 ++--- > > 1 file changed, 2 insertions(+), 3 deletions(-) > >=20 > > diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wirele= ss/ath/ath9k/xmit.c > > index d0caf1de2bde..cbcf96ac303e 100644 > > --- a/drivers/net/wireless/ath/ath9k/xmit.c > > +++ b/drivers/net/wireless/ath/ath9k/xmit.c > > @@ -2553,6 +2553,8 @@ static void ath_tx_rc_status(struct ath_softc *sc= , struct ath_buf *bf, > > struct ath_hw *ah =3D sc->sc_ah; > > u8 i, tx_rateindex; > > =20 > > + ieee80211_tx_info_clear_status(tx_info); > > + =20 >=20 > As this also clears the status.rates[].count, see include/net/mac80211.h: >=20 > 1195 static inline void > 1196 ieee80211_tx_info_clear_status(struct ieee80211_tx_info *info) > 1197 { > 1198 int i; > 1199 =20 > 1200 BUILD_BUG_ON(offsetof(struct ieee80211_tx_info, status.rates= ) !=3D > 1201 offsetof(struct ieee80211_tx_info, control.rate= s)); > 1202 BUILD_BUG_ON(offsetof(struct ieee80211_tx_info, status.rates= ) !=3D > 1203 offsetof(struct ieee80211_tx_info, driver_rates= )); > 1204 BUILD_BUG_ON(offsetof(struct ieee80211_tx_info, status.rates= ) !=3D 8) ; =20 > 1205 /* clear the rate counts */ > 1206 for (i =3D 0; i < IEEE80211_TX_MAX_RATES; i++) > 1207 info->status.rates[i].count =3D 0; > 1208 memset_after(&info->status, 0, rates); > 1209 } >=20 > I would have expected some lines added to restore the count (for the > rates with index < tx_rateindex), e.g. as done in > drivers/net/wireless/ath/ath5k/base.c: >=20 > 1731 ieee80211_tx_info_clear_status(info); > 1732=20 > 1733 for (i =3D 0; i < ts->ts_final_idx; i++) { > 1734 struct ieee80211_tx_rate *r =3D > 1735 &info->status.rates[i]; > 1736=20 > 1737 r->count =3D tries[i]; > 1738 } >=20 > In drivers/net/wireless/ath/ath9k/xmit.c this is only done/changed for > the tx_rateindex index (which is often zero in case the first suggested r= ate > succeeds, but in noisy environment is sometimes > 0)... >=20 > > if (txok) > > tx_info->status.ack_signal =3D ts->ts_rssi; > > =20 > > @@ -2595,9 +2597,6 @@ static void ath_tx_rc_status(struct ath_softc *sc= , struct ath_buf *bf, > > } > > =20 > > tx_info->status.rates[)].count =3D ts->ts_longretry + 1; > > - > > - /* we report airtime in ath_tx_count_airtime(), don't report twice */ > > - tx_info->status.tx_time =3D 0; > > } > > =20 > > static void ath_tx_processq(struct ath_softc *sc, struct ath_txq *txq)= =20 >=20 >=20 > And from drivers/net/wireless/ath/ath9k/xmit.c: >=20 > 2592 for (i =3D tx_rateindex + 1; i < hw->max_rates; i++) { > 2593 tx_info->status.rates[i].count =3D 0; > 2594 tx_info->status.rates[i].idx =3D -1; > 2595 } >=20 > Line 2593 can be deleted as status.rates[].count is already zeroed throug= h the > ieee80211_tx_info_clear_status() call... >=20 > And it should be sufficient to do: >=20 > if (tx_rateindex + 1 < hw->max_rates) > tx_info->status.rates[tx_rateindex + 1].idx =3D -1; >=20 > Regards, > Peter And one additional problem found with your patch applied (to 5.16.18), the = log get spammed by: [ 445.489139] ------------[ cut here ]------------ [ 445.489150] WARNING: CPU: 0 PID: 8630 at drivers/net/wireless/ath/ath9k/= xmit.c:174 ath_tx_complete+0x190/0x1a0 [ath9k] [ 445.489178] Modules linked in: ath9k ath9k_common ath9k_hw mac80211 ppp_= async ppp_generic slhc xt_u32 xt_TCPMSS xt_tcpmss xt_MASQUERADE iptable_nat= nf_nat nf_conntrack nf_defrag_ipv6 nf_defrag_ipv4 ip6table_filter iptable_= filter ip6table_mangle ip6_tables cls_u32 sch_prio qmi_wwan cdc_wdm usbnet = qcserial usb_wwan gpio_pca953x xt_tcpudp xt_mark iptable_mangle ip_tables x= _tables dummy tqmx86_wdt watchdog i2c_machxo2 gpio_tqmx86 libarc4 ath tqmx8= 6 mfd_core ftdi_sio cfg80211 usbserial nct7802 regmap_i2c [last unloaded: m= ac80211] [ 445.489298] CPU: 0 PID: 8630 Comm: modprobe Tainted: G W = 5.16.18+ #2 [ 445.489307] Hardware name: TQ-Group TQMxE38M X64/Type2 - Board Product N= ame, BIOS TQMxE38M.5.4.48.0028.12 01/31/2017 [ 445.489311] EIP: ath_tx_complete+0x190/0x1a0 [ath9k] [ 445.489328] Code: ff 75 e8 68 d7 a1 2c f8 89 55 ec e8 d5 4f e3 ff 8b 45 = f0 8b 55 ec 83 c4 10 8b 80 58 0a 00 00 e9 a8 fe ff ff 8d b6 00 00 00 00 <0f= > 0b c7 42 68 00 00 00 00 e9 1d ff ff ff 66 90 55 89 e5 57 56 89 [ 445.489336] EAX: 00000000 EBX: c2e67900 ECX: c23cc040 EDX: c235a980 [ 445.489342] ESI: c235a888 EDI: c2359860 EBP: c1089e18 ESP: c1089dfc [ 445.489348] DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068 EFLAGS: 00010297 [ 445.489355] CR0: 80050033 CR2: b7f81000 CR3: 02ec7000 CR4: 001006d0 [ 445.489362] Call Trace: [ 445.489366] [ 445.489372] ath_tx_complete_buf+0x100/0x130 [ath9k] [ 445.489390] ath_tx_process_buffer+0x187/0xb40 [ath9k] [ 445.489407] ? resched_curr+0x1d/0xc0 [ 445.489419] ? check_preempt_wakeup+0x115/0x250 [ 445.489429] ? task_fork_fair+0xc0/0x170 [ 445.489436] ? put_prev_task_fair+0x40/0x40 [ 445.489444] ? check_preempt_curr+0x62/0x70 [ 445.489452] ? __local_bh_enable_ip+0x33/0x80 [ 445.489460] ? _raw_spin_unlock_bh+0x13/0x20 [ 445.489468] ? ath_txq_unlock_complete+0x5a/0x100 [ath9k] [ 445.489485] ? _raw_spin_unlock_irqrestore+0x16/0x30 [ 445.489492] ? try_to_wake_up+0x7c/0x550 [ 445.489499] ath_tx_tasklet+0x1de/0x2e0 [ath9k] [ 445.489519] ath9k_tasklet+0x22f/0x330 [ath9k] [ 445.489535] tasklet_action_common.constprop.0+0x89/0xb0 [ 445.489544] tasklet_action+0x21/0x30 [ 445.489551] __do_softirq+0xc5/0x28b [ 445.489559] ? __entry_text_end+0x4/0x4 [ 445.489567] call_on_stack+0x40/0x50 [ 445.489576] [ 445.489580] ? irq_exit_rcu+0x92/0x100 [ 445.489587] ? common_interrupt+0x27/0x40 [ 445.489595] ? asm_common_interrupt+0x102/0x140 [ 445.489605] ---[ end trace 5c176b666255bca1 ]--- [ 445.607206] ------------[ cut here ]------------ Could be fixed by the following additional change: --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c @@ -2511,9 +2511,12 @@ static void ath_tx_rc_status(struct ath_softc *sc, s= truct ath_buf *bf, struct ieee80211_hw *hw =3D sc->hw; struct ath_hw *ah =3D sc->sc_ah; u8 i, tx_rateindex; + bool is_valid_ack_signal =3D tx_info->status.is_valid_ack_signal; ieee80211_tx_info_clear_status(tx_info); + tx_info->status.is_valid_ack_signal =3D is_valid_ack_signal; + if (txok) Regards, Peter