mlx5: use napi_consume_skb API to get bulk free operations
authorJesper Dangaard Brouer <brouer@redhat.com>
Fri, 11 Mar 2016 08:44:17 +0000 (09:44 +0100)
committerDavid S. Miller <davem@davemloft.net>
Mon, 14 Mar 2016 02:35:36 +0000 (22:35 -0400)
Bulk free of SKBs happen transparently by the API call napi_consume_skb().
The napi budget parameter is needed by napi_consume_skb() to detect
if called from netpoll.

Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/mellanox/mlx5/core/en.h
drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c

index 0f76d321030ff35de2adea1cb11067c14a2176a1..0cb4a093958b5c7434b212f4c7b484c888671c32 100644 (file)
@@ -629,7 +629,7 @@ netdev_tx_t mlx5e_xmit(struct sk_buff *skb, struct net_device *dev);
 void mlx5e_completion_event(struct mlx5_core_cq *mcq);
 void mlx5e_cq_error_event(struct mlx5_core_cq *mcq, enum mlx5_event event);
 int mlx5e_napi_poll(struct napi_struct *napi, int budget);
-bool mlx5e_poll_tx_cq(struct mlx5e_cq *cq);
+bool mlx5e_poll_tx_cq(struct mlx5e_cq *cq, int napi_budget);
 int mlx5e_poll_rx_cq(struct mlx5e_cq *cq, int budget);
 bool mlx5e_post_rx_wqes(struct mlx5e_rq *rq);
 struct mlx5_cqe64 *mlx5e_get_cqe(struct mlx5e_cq *cq);
index 94a14f85f70d87a0ed49ef4f961db2cb745fe073..1ffc7cb6f78c4ab7de755ac751e5cf24f0b8a426 100644 (file)
@@ -339,7 +339,7 @@ netdev_tx_t mlx5e_xmit(struct sk_buff *skb, struct net_device *dev)
        return mlx5e_sq_xmit(sq, skb);
 }
 
-bool mlx5e_poll_tx_cq(struct mlx5e_cq *cq)
+bool mlx5e_poll_tx_cq(struct mlx5e_cq *cq, int napi_budget)
 {
        struct mlx5e_sq *sq;
        u32 dma_fifo_cc;
@@ -411,7 +411,7 @@ bool mlx5e_poll_tx_cq(struct mlx5e_cq *cq)
                        npkts++;
                        nbytes += wi->num_bytes;
                        sqcc += wi->num_wqebbs;
-                       dev_kfree_skb(skb);
+                       napi_consume_skb(skb, napi_budget);
                } while (!last_wqe);
        }
 
index 66d51a77609e890263cd91277c6b8e7315d660e3..9bb4395aceeb495156550821d34d6ea976a812d2 100644 (file)
@@ -60,7 +60,7 @@ int mlx5e_napi_poll(struct napi_struct *napi, int budget)
        clear_bit(MLX5E_CHANNEL_NAPI_SCHED, &c->flags);
 
        for (i = 0; i < c->num_tc; i++)
-               busy |= mlx5e_poll_tx_cq(&c->sq[i].cq);
+               busy |= mlx5e_poll_tx_cq(&c->sq[i].cq, budget);
 
        work_done = mlx5e_poll_rx_cq(&c->rq.cq, budget);
        busy |= work_done == budget;