Introduce and use netif_xmit_timeout_ms() helper
Subsystems (7)
Tariq Toukan
maintainerv2 cover Introduce and use netif_xmit_timeout_ms() helper
Hi,
This is V2, find V1 here:
https://lore.kernel.org/all/[email protected]/
This series by Shahar introduces a new helper function netif_xmit_timeout_ms() to check if a TX queue has timed out and report the timeout duration.
It also encapsulates the check for whether the TX queue is stopped.
Replace duplicated open-coded timeout check in hns3 driver with the new helper.
For mlx5e, refine the TX timeout recovery flow to act only on SQs whose transmit timestamp indicates an actual timeout, as determined by the helper. This prevents unnecessary channel reopen events caused by attempting recovery on queues that are merely stopped but not truly timed out.
Regards,
Tariq
V2:
- Rebase.
- Move helper to include/net/netdev_queues.h.
- Remove output paramter trans_start from the new helper.
- Revert the code in dev_watchdog to not use the helper.
- Fix the helper name in commit message.
Shahar Shitrit (3):
net: Introduce netif_xmit_timeout_ms() helper
net: hns3: Use netif_xmit_timeout_ms() helper net/mlx5e: Refine TX timeout handling to skip non-timed-out SQ
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 12 +++++------- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 2 +- include/net/netdev_queues.h | 11 +++++++++++ 3 files changed, 17 insertions(+), 8 deletions(-)
base-commit: 60d8484c4cec811f5ceb6550655df74490d1a165
Signature · 1 line
2.31.1
Tariq Toukan
maintainerPATCH v2 1/3 net: Introduce netif_xmit_timeout_ms() helper
From: Shahar Shitrit <[email protected]>
Introduce a new helper function netif_xmit_timeout_ms() to check if a TX queue is stopped and has timed out and report the timeout duration. This makes the timeout logic reusable, and will be used in several places in subsequent patches.
--- include/net/netdev_queues.h | 11 +++++++++++ 1 file changed, 11 insertions(+)
include/net/netdev_queues.h +11 -0
@@ -310,6 +310,17 @@ static inline void netif_subqueue_sent(const struct net_device *dev,netdev_tx_sent_queue (txq, bytes); } +static inline unsigned int netif_xmit_timeout_ms (struct netdev_queue *txq) +{ +unsigned long trans_start =READ_ONCE (txq->trans_start); + +if (netif_xmit_stopped (txq) && +time_after (jiffies, trans_start + txq->dev->watchdog_timeo)) +return jiffies_to_msecs (jiffies - trans_start); + +return 0 ; +} +#define netif_subqueue_maybe_stop (dev, idx, get_desc, stop_thrs, start_thrs) \ ({ \ struct netdev_queue *_txq; \
Signature · 1 line
2.31.1
Tariq Toukan
maintainerPATCH v2 2/3 net: hns3: Use netif_xmit_timeout_ms() helper
In reply to Tariq ToukanFrom: Shahar Shitrit <[email protected]>
Replace the open-coded TX queue timeout check in hns3_get_timeout_queue() with a call to netif_xmit_timeout_ms() helper.
--- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +5 -7
@@ -25,6 +25,7 @@#include <net/tcp.h> #include <net/vxlan.h> #include <net/geneve.h> +#include <net/netdev_queues.h> #include "hnae3.h" #include "hns3_enet.h"
@@ -2807,14 +2808,12 @@ static int hns3_get_timeout_queue(struct net_device *ndev)/* Find the stopped queue the same way the stack does */ for (i =0 ; i < ndev->num_tx_queues; i++) { +unsigned int timedout_ms;struct netdev_queue *q; -unsigned long trans_start; q =netdev_get_tx_queue (ndev, i); - trans_start =READ_ONCE (q->trans_start); -if (netif_xmit_stopped (q) && -time_after (jiffies, - (trans_start + ndev->watchdog_timeo))) { + timedout_ms =netif_xmit_timeout_ms (q); +if (timedout_ms) {#ifdef CONFIG_BQL struct dql *dql = &q->dql;
@@ -2823,8 +2822,7 @@ static int hns3_get_timeout_queue(struct net_device *ndev) dql->adj_limit, dql->num_completed);#endif netdev_info (ndev,"queue state: 0x%lx, delta msecs: %u\n" , - q->state, -jiffies_to_msecs (jiffies - trans_start)); + q->state, timedout_ms);break ; } }
Signature · 1 line
2.31.1
Re: [PATCH net-next V2 2/3] net: hns3: Use netif_xmit_timeout_ms() helper
Quoted 9 lines · Tariq Toukan
From: Shahar Shitrit <[email protected]>
Replace the open-coded TX queue timeout check in
hns3_get_timeout_queue()with a call tonetif_xmit_timeout_ms()helper.Signed-off-by Shahar Shitrit <[email protected]>Reviewed-by Yael Chemla <[email protected]>Signed-off-by Tariq Toukan <[email protected]>
Thanks,
Quoted 44 lines
--- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +5
-7@@ -25,6 +25,7 @@#include <net/tcp.h> #include <net/vxlan.h> #include <net/geneve.h> +#include <net/netdev_queues.h> #include "hnae3.h" #include "hns3_enet.h" @@ -2807,14 +2808,12 @@ static int hns3_get_timeout_queue(struct net_device *ndev)/* Find the stopped queue the same way the stack does */ for (i =0 ; i < ndev->num_tx_queues; i++) { +unsigned int timedout_ms;struct netdev_queue *q; -unsigned long trans_start; q =netdev_get_tx_queue (ndev, i); - trans_start =READ_ONCE (q->trans_start); -if (netif_xmit_stopped (q) && -time_after (jiffies, - (trans_start + ndev->watchdog_timeo))) { + timedout_ms =netif_xmit_timeout_ms (q); +if (timedout_ms) {#ifdef CONFIG_BQL struct dql *dql = &q->dql;@@ -2823,8 +2822,7 @@ static int hns3_get_timeout_queue(struct net_device *ndev) dql->adj_limit, dql->num_completed);#endif netdev_info (ndev,"queue state: 0x%lx, delta msecs: %u\n" , - q->state, -jiffies_to_msecs (jiffies - trans_start)); + q->state, timedout_ms);break ; } }
Tariq Toukan
maintainerPATCH v2 3/3 net/mlx5e: Refine TX timeout handling to skip non-timed-out SQ
In reply to Tariq ToukanFrom: Shahar Shitrit <[email protected]>
mlx5e_tx_timeout_work() is invoked when the dev_watchdog reports a timed-out TX queue. Currently, the recovery flow is triggered for all stopped SQs, which is not always correct — some SQs may be temporarily stopped without actually timing out. Attempting to recover such SQs results in no EQE being polled (since no real timeout occurred), which the driver misinterprets as a recovery failure, unnecessarily causing channel reopening.
Improve the logic to initiate recovery only for SQs that are both stopped and timed out. Utilize the helper introduced in the previous patch to determine whether the netdevice watchdog timeout period has elapsed since the SQ’s last transmit timestamp.
--- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +1 -1
@@ -5137,7 +5137,7 @@ static void mlx5e_tx_timeout_work(struct work_struct *work)netdev_get_tx_queue (netdev, i);struct mlx5e_txqsq *sq = priv->txq2sq[i]; -if (!netif_xmit_stopped (dev_queue)) +if (!netif_xmit_timeout_ms (dev_queue))continue ;if (mlx5e_reporter_tx_timeout (sq))
Signature · 1 line
2.31.1
Quoted 22 lines · Tariq Toukan
Hi,
This is V2, find V1 here:
https://lore.kernel.org/all/[email protected]/This series by Shahar introduces a new helper function
netif_xmit_timeout_ms()to check if a TX queue has timed out and report the timeout duration.
It also encapsulates the check for whether the TX queue is stopped.Replace duplicated open-coded timeout check in hns3 driver with the new helper.
For mlx5e, refine the TX timeout recovery flow to act only on SQs whose transmit timestamp indicates an actual timeout, as determined by the helper. This prevents unnecessary channel reopen events caused by attempting recovery on queues that are merely stopped but not truly timed out.
Regards,
Tariq
Quoted 6 lines
V2:
- Rebase.
- Move helper toinclude/net/netdev_queues.h.
- Remove output paramtertrans_startfrom the new helper.
- Revert the code indev_watchdogto not use the helper.
- Fix the helper name in commit message.
Thanks for the updates.
I agree the address the review of v1.
And, overall, this looks good to me.
This series was applied to netdev/net-next.git (main) by Paolo Abeni <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (main) by Paolo Abeni <[email protected]>:
Quoted 11 lines · On Mon, 12 Jan 2026 11:16:20 +0200 you wrote:
Hi,
This is V2, find V1 here:
https://lore.kernel.org/all/[email protected]/This series by Shahar introduces a new helper function
netif_xmit_timeout_ms()to check if a TX queue has timed out and report the timeout duration.
It also encapsulates the check for whether the TX queue is stopped.[...]
Here is the summary with links:
- [net-next,V2,1/3] net: Introduce netif_xmit_timeout_ms() helper
https://git.kernel.org/netdev/net-next/c/cfbc8b6babf2
- [net-next,V2,2/3] net: hns3: Use netif_xmit_timeout_ms() helper
https://git.kernel.org/netdev/net-next/c/3ae02d659773 - [net-next,V2,3/3] net/mlx5e: Refine TX timeout handling to skip non-timed-out SQ https://git.kernel.org/netdev/net-next/c/b0ba734516d2
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html