[net-next,2/2,v2] net: netsec: remove loops in napi Rx process

Message ID 1560938641-16778-2-git-send-email-ilias.apalodimas@linaro.org
State New
Headers show
Series
  • [net-next,1/2,v2] net: netsec: initialize tx ring on ndo_open
Related show

Commit Message

Ilias Apalodimas June 19, 2019, 10:04 a.m.
netsec_process_rx was running in a loop trying to process as many packets
as possible before re-enabling interrupts. With the recent DMA changes
this is not needed anymore as we manage to consume all the budget without
looping over the function.
Since it has no performance penalty let's remove that and simplify the Rx
path a bit

Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>

Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

---
 drivers/net/ethernet/socionext/netsec.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

-- 
2.20.1

Comments

David Miller June 19, 2019, 2:29 p.m. | #1
From: Ilias Apalodimas <ilias.apalodimas@linaro.org>

Date: Wed, 19 Jun 2019 13:04:01 +0300

> netsec_process_rx was running in a loop trying to process as many packets

> as possible before re-enabling interrupts. With the recent DMA changes

> this is not needed anymore as we manage to consume all the budget without

> looping over the function.

> Since it has no performance penalty let's remove that and simplify the Rx

> path a bit

> 

> Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>

> Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>


Applied.

Patch

diff --git a/drivers/net/ethernet/socionext/netsec.c b/drivers/net/ethernet/socionext/netsec.c
index a10ef700f16d..48fd7448b513 100644
--- a/drivers/net/ethernet/socionext/netsec.c
+++ b/drivers/net/ethernet/socionext/netsec.c
@@ -820,19 +820,12 @@  static int netsec_process_rx(struct netsec_priv *priv, int budget)
 static int netsec_napi_poll(struct napi_struct *napi, int budget)
 {
 	struct netsec_priv *priv;
-	int rx, done, todo;
+	int done;
 
 	priv = container_of(napi, struct netsec_priv, napi);
 
 	netsec_process_tx(priv);
-
-	todo = budget;
-	do {
-		rx = netsec_process_rx(priv, todo);
-		todo -= rx;
-	} while (rx);
-
-	done = budget - todo;
+	done = netsec_process_rx(priv, budget);
 
 	if (done < budget && napi_complete_done(napi, done)) {
 		unsigned long flags;