[PATCH net v2 0/2] net: keep txq->trans_start on repeated netif_tx_stop_queue()

From: Curtis McBurney

Date: Thu Nov 19 2026 - 09:16:50 EST


Since commit 95ecba62e2fd ("net: fix races in
netdev_tx_sent_queue()/dev_watchdog()"), every netif_tx_stop_queue()
call writes txq->trans_start, also on a queue that is already stopped.
Drivers whose Tx hang check stops the queue again on each run (e1000,
e1000e, igb, igc) keep moving trans_start forward, dev_watchdog() never
times out, and the hung adapter is never reset.

Patch 1 makes netif_tx_stop_queue() return early when the driver has
already stopped the queue, so it writes neither trans_start nor the
bit. Patch 2 adds KUnit tests for the four cases; one of them fails
without patch 1.

The issue was observed on a system in real use. I reproduced it and
tested the fix on an AlmaLinux 10 kernel (6.12.0-211.74.2.el10_2) with
e1000 on a VMware-emulated 82545EM, using a test-only module parameter
that forces the e1000 hang check to fire. Patch 1 has the details. The
KUnit tests ran on UML on the net tree.

I wrote the first version of the fix. Claude Code (Anthropic) reviewed
it, wrote v2 of the fix, the KUnit tests, the e1000 reproducer and the
changelogs.

Changes in v2:
- Patch 1: return early when DRV_XOFF is already set instead of only
skipping the trans_start write. In v1, a wake between test_bit() and
set_bit() let set_bit() stop the queue again with the trans_start of
the earlier stop, which could cause a spurious timeout (Sashiko AI
review). The early return issues smp_mb() to keep the full barrier
that callers get after set_bit().
- Patch 1: rewrite the comment and the changelog paragraph on the race,
which claimed a bound that v1 did not have.
- Patch 2: state in the changelog that the tests do not cover a wake
racing with a stop.
- Rebased on net.
- Not carried: Xia Yan's Reviewed-by on v1, since patch 1 changed.

v1: https://lore.kernel.org/netdev/20261116143716.367451-1-cmcburney@xxxxxxxxxxxxxxxx/

Curtis McBurney (2):
net: keep txq->trans_start on repeated netif_tx_stop_queue()
net: net_test: add tests for netif_tx_stop_queue() trans_start

include/linux/netdevice.h | 14 +++++
net/core/net_test.c | 112 ++++++++++++++++++++++++++++++++++++++
2 files changed, 126 insertions(+)


base-commit: a1671b708d2c063d036f6e4c997e63539c2c2f3e
--
2.52.0