Эх сурвалжийг харах

net/mlx5e: Pop cq outside mlx5e_get_cqe

Separate between mlx5e_get_cqe() and mlx5_cqwq_pop(), this helps for
better code readability and better CQ buffer management.

Signed-off-by: Achiad Shochat <achiad@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Achiad Shochat 10 жил өмнө
parent
commit
a1f5a1a87a

+ 2 - 0
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c

@@ -209,6 +209,8 @@ bool mlx5e_poll_rx_cq(struct mlx5e_cq *cq, int budget)
 		if (!cqe)
 		if (!cqe)
 			break;
 			break;
 
 
+		mlx5_cqwq_pop(&cq->wq);
+
 		wqe_counter_be = cqe->wqe_counter;
 		wqe_counter_be = cqe->wqe_counter;
 		wqe_counter    = be16_to_cpu(wqe_counter_be);
 		wqe_counter    = be16_to_cpu(wqe_counter_be);
 		wqe            = mlx5_wq_ll_get_wqe(&rq->wq, wqe_counter);
 		wqe            = mlx5_wq_ll_get_wqe(&rq->wq, wqe_counter);

+ 2 - 0
drivers/net/ethernet/mellanox/mlx5/core/en_tx.c

@@ -288,6 +288,8 @@ bool mlx5e_poll_tx_cq(struct mlx5e_cq *cq)
 		if (!cqe)
 		if (!cqe)
 			break;
 			break;
 
 
+		mlx5_cqwq_pop(&cq->wq);
+
 		wqe_counter = be16_to_cpu(cqe->wqe_counter);
 		wqe_counter = be16_to_cpu(cqe->wqe_counter);
 
 
 		do {
 		do {

+ 0 - 2
drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c

@@ -43,8 +43,6 @@ struct mlx5_cqe64 *mlx5e_get_cqe(struct mlx5e_cq *cq)
 	if (cqe_ownership_bit != sw_ownership_val)
 	if (cqe_ownership_bit != sw_ownership_val)
 		return NULL;
 		return NULL;
 
 
-	mlx5_cqwq_pop(wq);
-
 	/* ensure cqe content is read after cqe ownership bit */
 	/* ensure cqe content is read after cqe ownership bit */
 	rmb();
 	rmb();