| Message ID | 20191219201000.1712-1-jacob.e.keller@intel.com |
|---|---|
| State | Accepted |
| Delegated to: | Jeff Kirsher |
| Headers | show |
| Series | [v2] fm10k: use txqueue parameter in fm10k_tx_timeout | expand |
> -----Original Message----- > From: Intel-wired-lan [mailto:intel-wired-lan-bounces@osuosl.org] On > Behalf Of Jacob Keller > Sent: Thursday, December 19, 2019 12:10 PM > To: Intel Wired LAN <intel-wired-lan@lists.osuosl.org> > Subject: [Intel-wired-lan] [PATCH v2] 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. > > Signed-off-by: Jacob Keller <jacob.e.keller@intel.com> > --- > > 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(-) Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c index ba2566e2123d..0637ccadee79 100644 --- a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c +++ b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c @@ -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 16000 if (real_tx_hang) { fm10k_tx_timeout_reset(interface); } else {
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. Signed-off-by: Jacob Keller <jacob.e.keller@intel.com> --- 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(-)