net: netdev_queue: netdev_txq_completed_mb(): fix wake condition
Subsystems (2)
PATCH 1/1 net: netdev_queue: netdev_txq_completed_mb(): fix wake condition
netif_txq_try_stop() uses "get_desc >= start_thrs" as the check for the call to netif_tx_start_queue().
Use ">=" i netdev_txq_completed_mb(), too.
---
Hello,
I'm currently converting a networking driver with a TX-FIFO depth of 1 (CAN device with lots of errata :/) to the netdev_queue.h helpers and stumbled over an off-by-one error on __netif_txq_completed_wake().
regards,
Marc
--- include/net/netdev_queues.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/net/netdev_queues.h +1 -1
@@ -128,7 +128,7 @@ netdev_txq_completed_mb(struct netdev_queue *dev_queue,netdev_txq_completed_mb (txq, pkts, bytes); \ \ _res =-1 ; \ -if (pkts &&likely (get_desc > start_thrs)) { \ +if (pkts &&likely (get_desc >= start_thrs)) { \ _res =1 ; \if (unlikely (netif_tx_queue_stopped (txq)) && \ !(down_cond)) { \
---
base-commit: 907ee6681788556b9ade3ad0a1f6f4aea192399c
change-id: 20240112-netdev_queue-e91686f5fece
Best regards,
Signature · 1 line
Marc Kleine-Budde <[email protected]>
Quoted 11 lines · On Fri, 12 Jan 2024 17:13:14 +0100 Marc Kleine-Budde wrote:
netif_txq_try_stop()uses "get_desc>=start_thrs" as the check for the call tonetif_tx_start_queue().Use ">=" i
netdev_txq_completed_mb(), too.Fixes c91c46de6bbc ("net: provide macros for commonly copied lockless queue stop/wake code")Signed-off-by Marc Kleine-Budde <[email protected]>---
I'm currently converting a networking driver with a TX-FIFO depth of 1 (CAN device with lots of errata :/) to thenetdev_queue.hhelpers and stumbled over an off-by-one error on__netif_txq_completed_wake().
Makes sense, could be copy'n'paste from one of the drivers this is based on. A bit unsure if it deserves the Fixes tag and net as we don't know of any current user that would be suffering. start_thrs == ring size is a bit of an extreme use case indeed :) Either way:
This patch was applied to netdev/net.git (main) by David S. Miller <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by David S. Miller <[email protected]>:
Quoted 9 lines · On Fri, 12 Jan 2024 17:13:14 +0100 you wrote:
netif_txq_try_stop()uses "get_desc>=start_thrs" as the check for the call tonetif_tx_start_queue().Use ">=" i
netdev_txq_completed_mb(), too.Fixes c91c46de6bbc ("net: provide macros for commonly copied lockless queue stop/wake code")Signed-off-by Marc Kleine-Budde <[email protected]>[...]
Here is the summary with links:
- net: netdev_queue: netdev_txq_completed_mb(): fix wake condition
https://git.kernel.org/netdev/net/c/894d7508316e
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html