Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ec736e5 authored by Jesper Dangaard Brouer's avatar Jesper Dangaard Brouer Committed by David S. Miller
Browse files

mlx5: use napi_consume_skb API to get bulk free operations 



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: default avatarJesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b4a53379

drivers/net/ethernet/mellanox/mlx5/core/en.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/net/ethernet/mellanox/mlx5/core/en_tx.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

	}

drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c

+1 −1
Original line number Diff line number Diff line
@@ -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;