Skip to contentSkip to conversation

lan743x: fix return value for lan743x_tx_napi_poll

PATCH Superseded Bryan Whitehead 1 participant 1 message Nov 22, 2018

Subsystems (3)
Networking Network drivers Microchip LAN743X Ethernet driver

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Bryan Whitehead

author maintainer
#0 lore raw

PATCH v2 1/1 lan743x: fix return value for lan743x_tx_napi_poll

The lan743x driver, when under heavy traffic load, has been noticed to sometimes hang, or cause a kernel panic.

Debugging reveals that the TX napi poll routine was returning the wrong value, 'weight'. Most other drivers return 0. And call napi_complete, instead of napi_complete_done.

Additionally when creating the tx napi poll routine. Changed netif_napi_add, to netif_tx_napi_add.

Updates for v2:
use napi_complete, instead of napi_complete_done in

    lan743x_tx_napi_poll

use netif_tx_napi_add, instead of netif_napi_add for
registration of tx napi poll routine

Fixes rare kernel panic under heavy traffic load.
Signed-off-by Bryan Whitehead <[email protected]>
---
 drivers/net/ethernet/microchip/lan743x_main.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/net/ethernet/microchip/lan743x_main.c +5 -5
index 867cddb..d627129 100644
@@ -1672,7 +1672,7 @@ static int lan743x_tx_napi_poll(struct napi_struct *napi, int weight)
 		netif_wake_queue(adapter->netdev);
 	}
 
-	if (!napi_complete_done(napi, weight))
+	if (!napi_complete(napi))
 		goto done;
 
 	/* enable isr */

@@ -1681,7 +1681,7 @@ static int lan743x_tx_napi_poll(struct napi_struct *napi, int weight)
 	lan743x_csr_read(adapter, INT_STS);
 
 done:
-	return weight;
+	return 0;
 }
 
 static void lan743x_tx_ring_cleanup(struct lan743x_tx *tx)

@@ -1870,9 +1870,9 @@ static int lan743x_tx_open(struct lan743x_tx *tx)
 	tx->vector_flags = lan743x_intr_get_vector_flags(adapter,
 							 INT_BIT_DMA_TX_
 							 (tx->channel_number));
-	netif_napi_add(adapter->netdev,
-		       &tx->napi, lan743x_tx_napi_poll,
-		       tx->ring_size - 1);
+	netif_tx_napi_add(adapter->netdev,
+			  &tx->napi, lan743x_tx_napi_poll,
+			  tx->ring_size - 1);
 	napi_enable(&tx->napi);
 
 	data = 0;
Signature · 1 line
2.7.4