Skip to content

net: bcmgenet: fix queue lock up

Justin Chen netdev 2 versions – Applied

Status from this message: This series was applied to netdev/net.git (main)

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest3 patches 0 repliesApplied 3/3
  2. v24 patches 3 repliesSuperseded

Patches in v3 All 3 applied

#Subject and filesSizeRepliesApplied
1/3net: bcmgenet: fix off-by-one in bcmgenet_put_txcbdrivers/net/ethernet/broadcom/genet/bcmgenet.c+3 -30 repliesApplied
2/3net: bcmgenet: fix leaking free_bdsdrivers/net/ethernet/broadcom/genet/bcmgenet.c+2 -00 repliesApplied
3/3net: bcmgenet: fix racing timeout handlerdrivers/net/ethernet/broadcom/genet/bcmgenet.c+9 -130 repliesApplied

Reviews trailers per patch

All 3 patches have a Reviewed-by or Acked-by.

PatchNicolai BuchwitzFlorian Fainelli
1/3R-b
2/3R-b T-b R-b
3/3R-b T-b R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v3 thread

Cover letter [PATCH net v3 0/3] net: bcmgenet: fix queue lock up

We have been seeing reports of logs like this.
# [ 39.713199] bcmgenet 1001300000.ethernet eth0: NETDEV WATCHDOG: CPU: 0: transmit queue 2 timed out 7991 ms

[   41.761198] bcmgenet 1001300000.ethernet eth0: NETDEV WATCHDOG: CPU: 0: transmit queue 2 timed out 10039 ms
[   43.745198] bcmgenet 1001300000.ethernet eth0: NETDEV WATCHDOG: CPU: 0: transmit queue 2 timed out 12023 ms
[   45.729198] bcmgenet 1001300000.ethernet eth0: NETDEV WATCHDOG: CPU: 0: transmit queue 2 timed out 14007 ms

We have two issues. The persistent queue timeouts and the eventual lock up of the entire transmit.

We address the lock up issue first. The queue timeouts are due to a fundamental design issue not a bug perse. Timeouts still persist, but we should no longer lock up.

v3
- Dropped this patch. Not relevant yet.
net: bcmgenet: relax the xmit ring full case

v2
- These patches stayed the same.
net: bcmgenet: fix off-by-one in bcmgenet_put_txcb
net: bcmgenet: fix leaking free_bds
- New patches that fix a few other slightly related issues.
net: bcmgenet: fix off-by-one in bcmgenet_put_txcb
net: bcmgenet: relax the xmit ring full case

Justin Chen (3):
net: bcmgenet: fix off-by-one in bcmgenet_put_txcb
net: bcmgenet: fix leaking free_bds
net: bcmgenet: fix racing timeout handler

 .../net/ethernet/broadcom/genet/bcmgenet.c    | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)
Signature · 1 line
2.34.1