[PATCH net-next] net: macb: use GRO

[Antoine Tenart]

This patch updates the macb driver to use NAPI GRO helpers when
receiving SKBs. This improves performances.

Signed-off-by: Antoine Tenart <antoine.ten...@bootlin.com>
---
 drivers/net/ethernet/cadence/macb.h      |  3 ++-
 drivers/net/ethernet/cadence/macb_main.c | 18 ++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/drivers/net/ethernet/cadence/macb.h 
b/drivers/net/ethernet/cadence/macb.h
index 00ee5e8e0ff0..a8ed28b597c0 100644
--- a/drivers/net/ethernet/cadence/macb.h
+++ b/drivers/net/ethernet/cadence/macb.h
@@ -1063,7 +1063,8 @@ struct macb_or_gem_ops {
        int     (*mog_alloc_rx_buffers)(struct macb *bp);
        void    (*mog_free_rx_buffers)(struct macb *bp);
        void    (*mog_init_rings)(struct macb *bp);
-       int     (*mog_rx)(struct macb_queue *queue, int budget);
+       int     (*mog_rx)(struct macb_queue *queue, struct napi_struct *napi,
+                         int budget);
 };
 
 /* MACB-PTP interface: adapt to platform needs. */
diff --git a/drivers/net/ethernet/cadence/macb_main.c 
b/drivers/net/ethernet/cadence/macb_main.c
index 1cd1f2c36d6f..f1cf50b8ad11 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -994,7 +994,8 @@ static void discard_partial_frame(struct macb_queue *queue, 
unsigned int begin,
         */
 }
 
-static int gem_rx(struct macb_queue *queue, int budget)
+static int gem_rx(struct macb_queue *queue, struct napi_struct *napi,
+                 int budget)
 {
        struct macb *bp = queue->bp;
        unsigned int            len;
@@ -1076,7 +1077,7 @@ static int gem_rx(struct macb_queue *queue, int budget)
                               skb->data, 32, true);
 #endif
 
-               netif_receive_skb(skb);
+               napi_gro_receive(napi, skb);
        }
 
        gem_rx_refill(queue);
@@ -1084,8 +1085,8 @@ static int gem_rx(struct macb_queue *queue, int budget)
        return count;
 }
 
-static int macb_rx_frame(struct macb_queue *queue, unsigned int first_frag,
-                        unsigned int last_frag)
+static int macb_rx_frame(struct macb_queue *queue, struct napi_struct *napi,
+                        unsigned int first_frag, unsigned int last_frag)
 {
        unsigned int len;
        unsigned int frag;
@@ -1161,7 +1162,7 @@ static int macb_rx_frame(struct macb_queue *queue, 
unsigned int first_frag,
        bp->dev->stats.rx_bytes += skb->len;
        netdev_vdbg(bp->dev, "received skb of length %u, csum: %08x\n",
                    skb->len, skb->csum);
-       netif_receive_skb(skb);
+       napi_gro_receive(napi, skb);
 
        return 0;
 }
@@ -1184,7 +1185,8 @@ static inline void macb_init_rx_ring(struct macb_queue 
*queue)
        queue->rx_tail = 0;
 }
 
-static int macb_rx(struct macb_queue *queue, int budget)
+static int macb_rx(struct macb_queue *queue, struct napi_struct *napi,
+                  int budget)
 {
        struct macb *bp = queue->bp;
        bool reset_rx_queue = false;
@@ -1221,7 +1223,7 @@ static int macb_rx(struct macb_queue *queue, int budget)
                                continue;
                        }
 
-                       dropped = macb_rx_frame(queue, first_frag, tail);
+                       dropped = macb_rx_frame(queue, napi, first_frag, tail);
                        first_frag = -1;
                        if (unlikely(dropped < 0)) {
                                reset_rx_queue = true;
@@ -1275,7 +1277,7 @@ static int macb_poll(struct napi_struct *napi, int budget)
        netdev_vdbg(bp->dev, "poll: status = %08lx, budget = %d\n",
                    (unsigned long)status, budget);
 
-       work_done = bp->macbgem_ops.mog_rx(queue, budget);
+       work_done = bp->macbgem_ops.mog_rx(queue, napi, budget);
        if (work_done < budget) {
                napi_complete_done(napi, work_done);
 
-- 
2.21.0