From: Shinas Rasheed <srasheed@marvell.com>
To: <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Cc: <hgani@marvell.com>, <sedara@marvell.com>, <vimleshk@marvell.com>,
<thaller@redhat.com>, <wizhao@redhat.com>, <kheib@redhat.com>,
<konguyen@redhat.com>, <horms@kernel.org>,
<einstein.xue@synaxg.com>,
"Shinas Rasheed" <srasheed@marvell.com>,
Veerasenareddy Burru <vburru@marvell.com>,
Andrew Lunn <andrew+netdev@lunn.ch>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>,
"Paolo Abeni" <pabeni@redhat.com>,
Abhijit Ayarekar <aayarekar@marvell.com>,
Satananda Burla <sburla@marvell.com>
Subject: [PATCH net v4 1/4] octeon_ep: fix race conditions in ndo_get_stats64
Date: Thu, 2 Jan 2025 03:22:43 -0800 [thread overview]
Message-ID: <20250102112246.2494230-2-srasheed@marvell.com> (raw)
In-Reply-To: <20250102112246.2494230-1-srasheed@marvell.com>
ndo_get_stats64() can race with ndo_stop(), which frees input and
output queue resources. Check if netdev is running before accessing
per queue resources.
Fixes: 6a610a46bad1 ("octeon_ep: add support for ndo ops")
Signed-off-by: Shinas Rasheed <srasheed@marvell.com>
---
V4:
- Check if netdev is running, as decision for accessing resources
rather than availing lock implementations, in ndo_get_stats64()
V3: https://lore.kernel.org/all/20241218115111.2407958-2-srasheed@marvell.com/
- No changes
V2: https://lore.kernel.org/all/20241216075842.2394606-2-srasheed@marvell.com/
- Changed sync mechanism to fix race conditions from using an atomic
set_bit ops to a much simpler synchronize_net()
V1: https://lore.kernel.org/all/20241203072130.2316913-2-srasheed@marvell.com/
drivers/net/ethernet/marvell/octeon_ep/octep_main.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c
index 549436efc204..a452ee3b9a98 100644
--- a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c
+++ b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c
@@ -995,16 +995,14 @@ static void octep_get_stats64(struct net_device *netdev,
struct octep_device *oct = netdev_priv(netdev);
int q;
- if (netif_running(netdev))
- octep_ctrl_net_get_if_stats(oct,
- OCTEP_CTRL_NET_INVALID_VFID,
- &oct->iface_rx_stats,
- &oct->iface_tx_stats);
-
tx_packets = 0;
tx_bytes = 0;
rx_packets = 0;
rx_bytes = 0;
+
+ if (!netif_running(netdev))
+ return;
+
for (q = 0; q < oct->num_oqs; q++) {
struct octep_iq *iq = oct->iq[q];
struct octep_oq *oq = oct->oq[q];
--
2.25.1
next prev parent reply other threads:[~2025-01-02 11:23 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-02 11:22 [PATCH net v4 0/4] Fix " Shinas Rasheed
2025-01-02 11:22 ` Shinas Rasheed [this message]
2025-01-04 17:01 ` [PATCH net v4 1/4] octeon_ep: fix " Jakub Kicinski
2025-01-06 5:57 ` [EXTERNAL] " Shinas Rasheed
2025-01-06 20:57 ` Jakub Kicinski
2025-01-07 6:11 ` Shinas Rasheed
2025-01-02 11:22 ` [PATCH net v4 2/4] octeon_ep: remove firmware stats fetch " Shinas Rasheed
2025-01-02 11:22 ` [PATCH net v4 3/4] octeon_ep_vf: fix race conditions " Shinas Rasheed
2025-01-02 11:22 ` [PATCH net v4 4/4] octeon_ep_vf: remove firmware stats fetch " Shinas Rasheed
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=20250102112246.2494230-2-srasheed@marvell.com \
--to=srasheed@marvell.com \
--cc=aayarekar@marvell.com \
--cc=andrew+netdev@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=einstein.xue@synaxg.com \
--cc=hgani@marvell.com \
--cc=horms@kernel.org \
--cc=kheib@redhat.com \
--cc=konguyen@redhat.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sburla@marvell.com \
--cc=sedara@marvell.com \
--cc=thaller@redhat.com \
--cc=vburru@marvell.com \
--cc=vimleshk@marvell.com \
--cc=wizhao@redhat.com \
/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
all inboxes | Powered by JetHome®