linux-kernel - Re: [PATCH net v2] net: stmmac: protect updates of 64-bit statistics counters

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date: Tue, 30 Jan 2024 19:39:35 +0800
From: Jisheng Zhang <jszhang@...nel.org>
To: Petr Tesařík <petr@...arici.cz>
Cc: Alexandre Torgue <alexandre.torgue@...s.st.com>,
	Jose Abreu <joabreu@...opsys.com>,
	"David S. Miller" <davem@...emloft.net>,
	Eric Dumazet <edumazet@...gle.com>,
	Jakub Kicinski <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>,
	Maxime Coquelin <mcoquelin.stm32@...il.com>,
	Chen-Yu Tsai <wens@...e.org>,
	Jernej Skrabec <jernej.skrabec@...il.com>,
	Samuel Holland <samuel@...lland.org>,
	"open list:STMMAC ETHERNET DRIVER" <netdev@...r.kernel.org>,
	"moderated list:ARM/STM32 ARCHITECTURE" <linux-stm32@...md-mailman.stormreply.com>,
	"moderated list:ARM/STM32 ARCHITECTURE" <linux-arm-kernel@...ts.infradead.org>,
	open list <linux-kernel@...r.kernel.org>,
	"open list:ARM/Allwinner sunXi SoC support" <linux-sunxi@...ts.linux.dev>,
	Marc Haber <mh+netdev@...schlus.de>, Andrew Lunn <andrew@...n.ch>,
	Florian Fainelli <f.fainelli@...il.com>, stable@...r.kernel.org
Subject: Re: [PATCH net v2] net: stmmac: protect updates of 64-bit statistics
 counters

On Tue, Jan 30, 2024 at 08:35:39AM +0100, Petr Tesařík wrote:
> On Tue, 30 Jan 2024 13:00:10 +0800
> Jisheng Zhang <jszhang@...nel.org> wrote:
> 
> > On Sun, Jan 28, 2024 at 08:35:29PM +0100, Petr Tesarik wrote:
> > > As explained by a comment in <linux/u64_stats_sync.h>, write side of struct
> > > u64_stats_sync must ensure mutual exclusion, or one seqcount update could
> > > be lost on 32-bit platforms, thus blocking readers forever. Such lockups
> > > have been observed in real world after stmmac_xmit() on one CPU raced with
> > > stmmac_napi_poll_tx() on another CPU.
> > > 
> > > To fix the issue without introducing a new lock, split the statics into
> > > three parts:
> > > 
> > > 1. fields updated only under the tx queue lock,
> > > 2. fields updated only during NAPI poll,
> > > 3. fields updated only from interrupt context,
> > > 
> > > Updates to fields in the first two groups are already serialized through
> > > other locks. It is sufficient to split the existing struct u64_stats_sync
> > > so that each group has its own.
> > > 
> > > Note that tx_set_ic_bit is updated from both contexts. Split this counter
> > > so that each context gets its own, and calculate their sum to get the total
> > > value in stmmac_get_ethtool_stats().
> > > 
> > > For the third group, multiple interrupts may be processed by different CPUs
> > > at the same time, but interrupts on the same CPU will not nest. Move fields
> > > from this group to a newly created per-cpu struct stmmac_pcpu_stats.
> > > 
> > > Fixes: 133466c3bbe1 ("net: stmmac: use per-queue 64 bit statistics where necessary")
> > > Link: https://lore.kernel.org/netdev/Za173PhviYg-1qIn@torres.zugschlus.de/t/
> > > Cc: stable@...r.kernel.org
> > > Signed-off-by: Petr Tesarik <petr@...arici.cz>  
> > 
> > Thanks for the fix patch. One trivial improviement below
> > s/netdev_alloc_pcpu_stats/devm_netdev_alloc_pcpu_stats to simplify
> > error and exit code path.
> 
> Thanks for your review.
> 
> In fact, many other allocations in stmmac could be converted to devm_*.
> I wanted to stay consistent with the existing code, but hey, you're

there's already devm_* usage in stmmac_dvr_probe(), eg. devm_alloc_etherdev_mqs
I believe other parts are from the old days when there's no devm_* APIs

> right there's no good reason for it.
> 
> Plus, I can send convert the other places with another patch.
> 
> > With that:
> > Reviewed-by: Jisheng Zhang <jszhang@...nel.org>
> > 
> > PS: when I sent the above "net: stmmac: use per-queue 64 bit statistics
> > where necessary", I had an impression: there are too much statistics in
> > stmmac driver, I didn't see so many statistics in other eth drivers, is
> > it possible to remove some useless or not that useful statistic members?
> 
> I don't feel authorized to make the decision. But I also wonder about
> some counters. For example, why is there tx_packets and tx_pkt_n? The
> former is shown as RX packets by "ip stats show dev end0", the latter
> is shown by as tx_pkt_n by "ethtools -S end0". The values do differ,
> but I have no clue why, and if they are even expected to be different
> or if it's a bug.
> 
> Petr T