[PATCH] ethernet/arc/arc_emac: optimize the Tx/Tx-reclaim paths a bit

[Vineet Gupta]

This came out of staring at code due to recent performance fix.

* TX BD reclaim can call netif_wake_queue() once, outside the loop if
  one/more BDs were freed, NO need to do this each iteration.

* TX need not look at next BD to stop the netif queue. It rather be done
  in the next tx call, when it actually fails as the queue seldom gets
  full but the check nevertheless needs to be done for each packet Tx.
  Profiled this under heavy traffic (big tar file cp, LMBench betworking
  tests) and saw not a single hit to that code.

Signed-off-by: Vineet Gupta <vgupta@xxxxxxxxxxxx>
Cc: Alexey Brodkin <abrodkin@xxxxxxxxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Cc: Francois Romieu <romieu@xxxxxxxxxxxxx>
Cc: netdev@xxxxxxxxxxxxxxx
Cc: linux-kernel@xxxxxxxxxxxxxxx
Cc: arc-linux-dev@xxxxxxxxxxxx
---
 drivers/net/ethernet/arc/emac_main.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/drivers/net/ethernet/arc/emac_main.c b/drivers/net/ethernet/arc/emac_main.c
index 9e16014..a3dd048 100644
--- a/drivers/net/ethernet/arc/emac_main.c
+++ b/drivers/net/ethernet/arc/emac_main.c
@@ -179,10 +179,10 @@ static void arc_emac_tx_clean(struct net_device *ndev)
 		txbd->info = 0;
 
 		*txbd_dirty = (*txbd_dirty + 1) % TX_BD_NUM;
-
-		if (netif_queue_stopped(ndev))
-			netif_wake_queue(ndev);
 	}
+
+	if (i && netif_queue_stopped(ndev))
+		netif_wake_queue(ndev);
 }
 
 /**
@@ -570,13 +570,6 @@ static int arc_emac_tx(struct sk_buff *skb, struct net_device *ndev)
 	/* Increment index to point to the next BD */
 	*txbd_curr = (*txbd_curr + 1) % TX_BD_NUM;
 
-	/* Get "info" of the next BD */
-	info = &priv->txbd[*txbd_curr].info;
-
-	/* Check if if Tx BD ring is full - next BD is still owned by EMAC */
-	if (unlikely((le32_to_cpu(*info) & OWN_MASK) == FOR_EMAC))
-		netif_stop_queue(ndev);
-
 	arc_reg_set(priv, R_STATUS, TXPL_MASK);
 
 	skb_tx_timestamp(skb);
-- 
1.8.1.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/