Commit 0c258dec authored by Tariq Toukan's avatar Tariq Toukan Committed by Saeed Mahameed
Browse files

net/mlx5e: Tx, Fix assumption of single WQEBB of NOP in cleanup flow 



Cited patch removed the assumption only in datapath.
Here we remove it also form control/cleanup flow.

Fixes: 9ab02337 ("net/mlx5e: Tx, Don't implicitly assume SKB-less wqe has one WQEBB")
Signed-off-by: default avatarTariq Toukan <tariqt@mellanox.com>
Reviewed-by: default avatarEran Ben Elisha <eranbe@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 38b4fe32

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

+5 −1
Original line number Diff line number Diff line
@@ -1349,9 +1349,13 @@ static void mlx5e_deactivate_txqsq(struct mlx5e_txqsq *sq) 
	/* last doorbell out, godspeed .. */

	if (mlx5e_wqc_has_room_for(wq, sq->cc, sq->pc, 1)) {

		u16 pi = mlx5_wq_cyc_ctr2ix(wq, sq->pc);

		struct mlx5e_tx_wqe_info *wi;

		struct mlx5e_tx_wqe *nop;



		sq->db.wqe_info[pi].skb = NULL;

		wi = &sq->db.wqe_info[pi];



		memset(wi, 0, sizeof(*wi));

		wi->num_wqebbs = 1;

		nop = mlx5e_post_nop(wq, sq->sqn, &sq->pc);

		mlx5e_notify_hw(wq, sq->pc, sq->uar_map, &nop->ctrl);

	}

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

+2 −2
Original line number Diff line number Diff line
@@ -550,8 +550,8 @@ void mlx5e_free_txqsq_descs(struct mlx5e_txqsq *sq) 
		wi = &sq->db.wqe_info[ci];

		skb = wi->skb;



		if (!skb) { /* nop */

			sq->cc++;

		if (!skb) {

			sq->cc += wi->num_wqebbs;

			continue;

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE