From: Dimitri Daskalakis <dimitri.daskalakis1@gmail.com>
To: "David S. Miller" <davem@davemloft.net>
Cc: "Alexander Duyck" <alexanderduyck@fb.com>,
"Jakub Kicinski" <kuba@kernel.org>,
kernel-team@meta.com, "Andrew Lunn" <andrew+netdev@lunn.ch>,
"Eric Dumazet" <edumazet@kernel.org>,
"Paolo Abeni" <pabeni@redhat.com>,
"Willem de Bruijn" <willemb@google.com>,
"Simon Horman" <horms@kernel.org>,
"Björn Töpel" <bjorn@kernel.org>,
"Bobby Eshleman" <bobbyeshleman@meta.com>,
"Mina Almasry" <almasrymina@google.com>,
"Dimitri Daskalakis" <daskald@meta.com>,
netdev@vger.kernel.org,
"Dimitri Daskalakis" <dimitri.daskalakis1@gmail.com>
Subject: [PATCH net 3/4] eth: fbnic: wait for in-flight xmit in fbnic_queue_stop()
Date: Fri, 20 Nov 2026 19:32:14 -0800 [thread overview]
Message-ID: <20261121033215.1020506-4-dimitri.daskalakis1@gmail.com> (raw)
In-Reply-To: <20261121033215.1020506-1-dimitri.daskalakis1@gmail.com>
From: Dimitri Daskalakis <daskald@meta.com>
fbnic_queue_stop() stops the vector's Tx queues with netif_stop_subqueue(),
which only sets the stop bit. This races with senders who are already in
fbnic_xmit_frame().
Use the new netif_disable_subqueue() helper prevent freeing rings
while senders are still in xmit.
This bug was found by AI and verified on HW.
Forced by adding a 20ms delay in fbnic_tx_map() on Tx queue 5,
binding devmem to rxq 5 under traffic:
before: BUG: kernel NULL pointer dereference, address: 000000000000002e
RIP: 0010:fbnic_clean_twq0+0xa8/0x290
after: fbnic_queue_stop() waits for the in-flight xmit, no crash (10/10)
Fixes: da43127a8edc ("eth: fbnic: support queue ops / zero-copy Rx")
Signed-off-by: Dimitri Daskalakis <daskald@meta.com>
---
drivers/net/ethernet/meta/fbnic/fbnic_txrx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_txrx.c b/drivers/net/ethernet/meta/fbnic/fbnic_txrx.c
index c0fe89425430..62b67940c13e 100644
--- a/drivers/net/ethernet/meta/fbnic/fbnic_txrx.c
+++ b/drivers/net/ethernet/meta/fbnic/fbnic_txrx.c
@@ -3191,7 +3191,7 @@ static int fbnic_queue_stop(struct net_device *dev, void *qmem, int idx)
for (i = 0; i < nv->txt_count; i++) {
if (nv->qt[i].sub0.flags & FBNIC_RING_F_DISABLED)
continue;
- netif_stop_subqueue(dev, nv->qt[i].sub0.q_idx);
+ netif_disable_subqueue(dev, nv->qt[i].sub0.q_idx);
}
fbnic_nv_disable(fbn, nv);
--
2.52.1
next prev parent reply other threads:[~2026-11-21 3:32 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-21 3:32 [PATCH net 0/4] eth: fbnic: queue stop fixes Dimitri Daskalakis
2026-11-21 3:32 ` [PATCH net 1/4] eth: fbnic: restart queues in place when fbnic_queue_stop() fails Dimitri Daskalakis
2026-11-21 3:32 ` [PATCH net 2/4] net: add netif_disable_subqueue() Dimitri Daskalakis
2026-11-21 3:32 ` Dimitri Daskalakis [this message]
2026-11-21 3:32 ` [PATCH net 4/4] eth: fbnic: wait for both TWQs of a Tx queue to go idle Dimitri Daskalakis
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=20261121033215.1020506-4-dimitri.daskalakis1@gmail.com \
--to=dimitri.daskalakis1@gmail.com \
--cc=alexanderduyck@fb.com \
--cc=almasrymina@google.com \
--cc=andrew+netdev@lunn.ch \
--cc=bjorn@kernel.org \
--cc=bobbyeshleman@meta.com \
--cc=daskald@meta.com \
--cc=davem@davemloft.net \
--cc=edumazet@kernel.org \
--cc=horms@kernel.org \
--cc=kernel-team@meta.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=willemb@google.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