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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E3D32C44529 for ; Tue, 21 Jul 2026 09:27:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=g2QO9Gcwg7klcjvR8NI82eIGPSP5QACIwc+p9XrZoWA=; b=vypKF8Ycjm7iXpRIV3voXiF1eq 1VKh2zbXfTI/imbY+pcuSXpHQcWAiahunIW0tqs1TU8uJ4qCo8rVGoJIAwX3eOXJjye3EZlzl88Mc mKHSkt2ykjYbmxS0pP/O+BpLDMFV8DNVIAR5nTnjiTBR6h5uTyWZ0Q+RZAap4wKtcJwQuiA9NOIWx 1MRd7cK82HVZmWu1wiu7QqNWD/G4ZOPxTwiRkVYYokK1BUX9zvnyogFFW2kd7U9xJndr+Zh2Gx5Ax zeSahry32P9CGrFAMDLZFEem7J/Sh5JTA+7mbnYBZS0ZZNoVmrIXgO0xUi4Pi0w6qBfBr7puPpV/V DVlCFd3A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wm6ks-00000008yjs-2LgV; Tue, 21 Jul 2026 09:27:14 +0000 Received: from tor.source.kernel.org ([2600:3c04:e001:324:0:1991:8:25]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wm6kn-00000008yi9-43QA; Tue, 21 Jul 2026 09:27:10 +0000 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by tor.source.kernel.org (Postfix) with ESMTP id F020960A95; Tue, 21 Jul 2026 09:27:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 28E431F000E9; Tue, 21 Jul 2026 09:27:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1784626028; bh=g2QO9Gcwg7klcjvR8NI82eIGPSP5QACIwc+p9XrZoWA=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=WggJLxA4QzSswWIq+HKeTRpwcg5HgolQXD+uYIT1+lEju0hA76PjChEnyKCGL2VWe XCT1eXt8k6zU5G5e8a6/qbXc2XKJ95D67fLR+1SIFBRqcQk2FiiqU1VCCPZoDmb/rz iEcoRxfQAi51yWd5MF1T7Jd71R0mUybhJHKfn2S/EBv3WbS4a1O5Mji9yJdHaG1Mgg TwOOFPPVpVN7TeOccmURFc9Z5jUeoJLmC7l+P8IBldQEtYU20AlsbvcikdQocPLEE2 vrSSA6Q+u3myxyicJIrnIYVh7BJPUEt951nv6eQbg1lwnc8+1SlkHVuiWGCRzUoWH+ REQEl93FFPsig== Date: Tue, 21 Jul 2026 11:27:06 +0200 From: Lorenzo Bianconi To: Jacob Keller Cc: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Alexander Lobakin , linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, netdev@vger.kernel.org Subject: Re: [PATCH net-next v9 2/3] net: airoha: fix ETS QoS stats counter underflow and cross-channel corruption Message-ID: References: <20260721-airoha-ethtool-priv_flags-v9-0-9c15d8b71a56@kernel.org> <20260721-airoha-ethtool-priv_flags-v9-2-9c15d8b71a56@kernel.org> <4f875005-e07c-4366-af8d-b7173d2d3b77@intel.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="Kw43FT3PQHLFXCdE" Content-Disposition: inline In-Reply-To: <4f875005-e07c-4366-af8d-b7173d2d3b77@intel.com> X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org --Kw43FT3PQHLFXCdE Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable > On 7/20/2026 3:03 PM, Lorenzo Bianconi wrote: > > airoha_qdma_get_tx_ets_stats() has two bugs: > > - The hardware counters read via airoha_qdma_rr() are 32-bit values > > but are stored in u64 locals and subtracted from u64 baselines. When > > a 32-bit hardware counter wraps around, the subtraction produces a > > large underflow value passed to _bstats_update(). >=20 > This issue would only be a problem during rollover, which depending on > how fast the counts increment may not be a big problem. I could see this > not being worth going to net since it could be rare enough that it isn't > considered a widespread issue... >=20 > > - The baseline counters (cpu_tx_packets, fwd_tx_packets) are stored as > > single per-device fields, but airoha_qdma_get_tx_ets_stats() is > > called with different channel values (0-3). Each call reads a > > different channel's hardware counter but overwrites the same > > baseline, corrupting the delta computation for other channels. > >=20 >=20 > However, this issue seems like its going to cause a problem every time > you read because any time you use a mix of channels you will get > corrupted values? Hi Jacob, I agree this is a real bug (and it needs to be fixed). However, the real use-case is having a single channel per net_device (a single HTB offloaded qdisc) and multiple hw queues (connected to the ETS offloaded classes). In this scenario we do not trigger this issue. >=20 > > Fix both by: > > - Narrowing the counter locals and baselines to u32 so that 32-bit > > unsigned subtraction handles wrap-around naturally. > > - Grouping the baselines into a per-channel qos_stats array so each > > channel tracks its own previous counter value independently. > > - Splitting the delta addition into two statements so the first u32 > > delta is widened to u64 on assignment and the second is added in > > u64 arithmetic, preventing overflow when both deltas are large. > >=20 > > Fixes: 20bf7d07c956 ("net: airoha: Add sched ETS offload support") >=20 > This targets a commit which merged in v6.14, but the patch is part of a > series aimed at net-next. Could you explain why this shouldn't be > separated out and put as a fix in net? It seems pretty obvious that > users can easily reproduce problems by requesting stats from each > channel? Or is this not really possible to trigger from userspace until > patch 3/3? For the reason described above and to avoid any possible conflicts with pat= ch 3/3 I decided to add this patch here (adding the proper Fixes tag for the backport) but if you prefer I can remove patch 2/3 from this series and send it to net. What do you prefer? Regards, Lorenzo >=20 > > Reviewed-by: Simon Horman > > Reviewed-by: Alexander Lobakin > > Signed-off-by: Lorenzo Bianconi > > --- > > drivers/net/ethernet/airoha/airoha_eth.c | 18 +++++++++++------- > > drivers/net/ethernet/airoha/airoha_eth.h | 7 ++++--- > > 2 files changed, 15 insertions(+), 10 deletions(-) > >=20 > > diff --git a/drivers/net/ethernet/airoha/airoha_eth.c b/drivers/net/eth= ernet/airoha/airoha_eth.c > > index 41c1a0ffbdd8..aaf2a4717d12 100644 > > --- a/drivers/net/ethernet/airoha/airoha_eth.c > > +++ b/drivers/net/ethernet/airoha/airoha_eth.c > > @@ -2482,16 +2482,20 @@ static int airoha_qdma_get_tx_ets_stats(struct = net_device *netdev, int channel, > > { > > struct airoha_gdm_dev *dev =3D netdev_priv(netdev); > > struct airoha_qdma *qdma =3D dev->qdma; > > + u32 cpu_tx_packets, fwd_tx_packets; > > + u64 tx_packets; > > =20 > > - u64 cpu_tx_packets =3D airoha_qdma_rr(qdma, REG_CNTR_VAL(channel << 1= )); > > - u64 fwd_tx_packets =3D airoha_qdma_rr(qdma, > > - REG_CNTR_VAL((channel << 1) + 1)); > > - u64 tx_packets =3D (cpu_tx_packets - dev->cpu_tx_packets) + > > - (fwd_tx_packets - dev->fwd_tx_packets); > > + cpu_tx_packets =3D airoha_qdma_rr(qdma, REG_CNTR_VAL(channel << 1)); > > + fwd_tx_packets =3D airoha_qdma_rr(qdma, > > + REG_CNTR_VAL((channel << 1) + 1)); > > + tx_packets =3D (u32)(cpu_tx_packets - > > + dev->qos_stats[channel].cpu_tx_packets); > > + tx_packets +=3D (u32)(fwd_tx_packets - > > + dev->qos_stats[channel].fwd_tx_packets); > > =20 > > _bstats_update(opt->stats.bstats, 0, tx_packets); > > - dev->cpu_tx_packets =3D cpu_tx_packets; > > - dev->fwd_tx_packets =3D fwd_tx_packets; > > + dev->qos_stats[channel].cpu_tx_packets =3D cpu_tx_packets; > > + dev->qos_stats[channel].fwd_tx_packets =3D fwd_tx_packets; > > =20 > > return 0; > > } > > diff --git a/drivers/net/ethernet/airoha/airoha_eth.h b/drivers/net/eth= ernet/airoha/airoha_eth.h > > index bf1c249255bd..bf44be9f0954 100644 > > --- a/drivers/net/ethernet/airoha/airoha_eth.h > > +++ b/drivers/net/ethernet/airoha/airoha_eth.h > > @@ -553,9 +553,10 @@ struct airoha_gdm_dev { > > struct airoha_eth *eth; > > =20 > > DECLARE_BITMAP(qos_sq_bmap, AIROHA_NUM_QOS_CHANNELS); > > - /* qos stats counters */ > > - u64 cpu_tx_packets; > > - u64 fwd_tx_packets; > > + struct { > > + u32 cpu_tx_packets; > > + u32 fwd_tx_packets; > > + } qos_stats[AIROHA_NUM_QOS_CHANNELS]; > > =20 > > u32 flags; > > int nbq; > >=20 >=20 --Kw43FT3PQHLFXCdE Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQTquNwa3Txd3rGGn7Y6cBh0uS2trAUCal87agAKCRA6cBh0uS2t rCd0AQDc2lEHGNWduh9eYsxNxeCYsIvmowkTAtPBBREEmcw6JwEA4BIM1E9ui0UN sr0Ei83KIu326VPsWSC28VxsxcXK9Qg= =4TOp -----END PGP SIGNATURE----- --Kw43FT3PQHLFXCdE--