From: Florian Fainelli <f.fainelli@gmail.com>
To: Eric Dumazet <eric.dumazet@gmail.com>
Cc: netdev@vger.kernel.org, davem@davemloft.net, edumazet@google.com,
jqiaoulk@gmail.com
Subject: Re: [PATCH net] net: systemport: Fix 64-bit stats deadlock
Date: Tue, 12 Sep 2017 14:48:25 -0700 [thread overview]
Message-ID: <23e3924f-7efc-efe5-4866-f552b1b0c97e@gmail.com> (raw)
In-Reply-To: <1505252293.15310.151.camel@edumazet-glaptop3.roam.corp.google.com>
On 09/12/2017 02:38 PM, Eric Dumazet wrote:
> On Tue, 2017-09-12 at 13:14 -0700, Florian Fainelli wrote:
>> We can enter a deadlock situation because there is no sufficient protection
>> when ndo_get_stats64() runs in process context to guard against RX or TX NAPI
>> contexts running in softirq, this can lead to the following lockdep splat and
>> actual deadlock was experienced as well with an iperf session in the background
>> and a while loop doing ifconfig + ethtool.
>
>> So just remove the u64_stats_update_begin()/end() pair in ndo_get_stats64()
>> since it does not appear to be useful for anything. No inconsistency was
>> observed with either ifconfig or ethtool, global TX counts equal the sum of
>> per-queue TX counts on a 32-bit architecture.
>>
>> Fixes: 10377ba7673d ("net: systemport: Support 64bit statistics")
>> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
>> ---
>> drivers/net/ethernet/broadcom/bcmsysport.c | 3 ---
>> 1 file changed, 3 deletions(-)
>>
>> diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
>> index a6572b51435a..c3c53f6cd9e6 100644
>> --- a/drivers/net/ethernet/broadcom/bcmsysport.c
>> +++ b/drivers/net/ethernet/broadcom/bcmsysport.c
>> @@ -1735,11 +1735,8 @@ static void bcm_sysport_get_stats64(struct net_device *dev,
>> stats->tx_packets += tx_packets;
>> }
>>
>> - /* lockless update tx_bytes and tx_packets */
>> - u64_stats_update_begin(&priv->syncp);
>
> Yes, this u64_stats_update_begin()/u64_stats_update_end() is bogus
>
> But why do we even write on tx_bytes/tx_packets here ???
That's for the ethtool -S netdev stats copy (that's on me, I added that
in the driver initial version), so yes, not very robust...
>
> Seems very wrong anyway.
>
> (ethtool -S does not call bcm_sysport_get_stats64() to refresh them )
Yes that might actually be the simplest way to get this fixed.
>
>> stats64->tx_bytes = stats->tx_bytes;
>> stats64->tx_packets = stats->tx_packets;
>> - u64_stats_update_end(&priv->syncp);
>>
>> do {
>> start = u64_stats_fetch_begin_irq(&priv->syncp);
>
>
--
Florian
next prev parent reply other threads:[~2017-09-12 21:48 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-12 20:14 [PATCH net] net: systemport: Fix 64-bit stats deadlock Florian Fainelli
2017-09-12 21:38 ` Eric Dumazet
2017-09-12 21:48 ` Florian Fainelli [this message]
2017-09-15 21:25 ` David Miller
2017-09-15 21:28 ` Florian Fainelli
2017-09-15 21:53 ` David Miller
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=23e3924f-7efc-efe5-4866-f552b1b0c97e@gmail.com \
--to=f.fainelli@gmail.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=eric.dumazet@gmail.com \
--cc=jqiaoulk@gmail.com \
--cc=netdev@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).