fm10k: use txqueue parameter in fm10k_tx_timeout
Subsystems (2)
PATCH v2 1/1 fm10k: use txqueue parameter in fm10k_tx_timeout
Make use of the new txqueue parameter to the .ndo_tx_timeout function. In fm10k_tx_timeout, remove the now unnecessary loop to determine which Tx queue is stuck. Instead, just double check the specified queue
This could be improved further to attempt resetting only the specific queue that got stuck. However, that is a much larger refactor and has been left as a future improvement.
---
Woops, sorry for the quick v2. Had missed a semicolon and apparently my config I used to check this after a last minute move to add the Tx queue warning didn't have CONFIG_FM10K enabled.. Woops.
drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
drivers/net/ethernet/intel/fm10k/fm10k_netdev.c +10 -7
@@ -696,21 +696,24 @@ static netdev_tx_t fm10k_xmit_frame(struct sk_buff *skb, struct net_device *dev)/** * fm10k_tx_timeout - Respond to a Tx Hang * @netdev: network interface device structure +* @txqueue: the index of the Tx queue that timed out **/ static void fm10k_tx_timeout (struct net_device *netdev,unsigned int txqueue) {struct fm10k_intfc *interface =netdev_priv (netdev); +struct fm10k_ring *tx_ring;bool real_tx_hang = false; -int i; - -#define TX_TIMEO_LIMIT 16000 -for (i =0 ; i < interface->num_tx_queues; i++) { -struct fm10k_ring *tx_ring = interface->tx_ring[i]; -if (check_for_tx_hang (tx_ring) &&fm10k_check_tx_hang (tx_ring)) - real_tx_hang = true; +if (txqueue >= interface->num_tx_queues) { +WARN (1 ,"invalid Tx queue index %d" , txqueue); +return ; } + tx_ring = interface->tx_ring[txqueue]; +if (check_for_tx_hang (tx_ring) &&fm10k_check_tx_hang (tx_ring)) + real_tx_hang = true; + +#define TX_TIMEO_LIMIT 16000if (real_tx_hang) {fm10k_tx_timeout_reset (interface); }else {
Signature · 1 line
2.24.0.155.gd9f6f3b6195a
Bowers
PATCH v2 1/1 fm10k: use txqueue parameter in fm10k_tx_timeout
Quoted 17 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Jacob Keller
Sent: Thursday, December 19, 2019 12:10 PM
To: Intel Wired LAN <[email protected]>
Subject: [Intel-wired-lan] [PATCH v2] fm10k: use txqueue parameter infm10k_tx_timeoutMake use of the new txqueue parameter to the .ndo_tx_timeout function. In
fm10k_tx_timeout, remove the now unnecessary loop to determine which Tx queue is stuck. Instead, just double check the specified queueThis could be improved further to attempt resetting only the specific queue that got stuck. However, that is a much larger refactor and has been left as a future improvement.
Signed-off-by Jacob Keller <[email protected]>
Quoted 8 lines
---
Woops, sorry for the quick v2. Had missed a semicolon and apparently my config I used to check this after a last minute move to add the Tx queue warning didn't have
CONFIG_FM10Kenabled.. Woops.drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)