Commit 5e911e2c authored by Moshe Shemesh's avatar Moshe Shemesh Committed by Saeed Mahameed
Browse files

net/mlx5e: Update netdev txq on completions during closure 



On sq closure when we free its descriptors, we should also update netdev
txq on completions which would not arrive. Otherwise if we reopen sqs
and attach them back, for example on fw fatal recovery flow, we may get
tx timeout.

Fixes: 29429f33 ("net/mlx5e: Timeout if SQ doesn't flush during close")
Signed-off-by: default avatarMoshe Shemesh <moshe@mellanox.com>
Reviewed-by: default avatarTariq Toukan <tariqt@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 9ca41539

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

+6 −3
Original line number Diff line number Diff line
@@ -537,10 +537,9 @@ bool mlx5e_poll_tx_cq(struct mlx5e_cq *cq, int napi_budget) 
void mlx5e_free_txqsq_descs(struct mlx5e_txqsq *sq)

{

	struct mlx5e_tx_wqe_info *wi;

	u32 dma_fifo_cc, nbytes = 0;

	u16 ci, sqcc, npkts = 0;

	struct sk_buff *skb;

	u32 dma_fifo_cc;

	u16 sqcc;

	u16 ci;

	int i;



	sqcc = sq->cc;
@@ -565,11 +564,15 @@ void mlx5e_free_txqsq_descs(struct mlx5e_txqsq *sq) 
		}



		dev_kfree_skb_any(skb);

		npkts++;

		nbytes += wi->num_bytes;

		sqcc += wi->num_wqebbs;

	}



	sq->dma_fifo_cc = dma_fifo_cc;

	sq->cc = sqcc;



	netdev_tx_completed_queue(sq->txq, npkts, nbytes);

}



#ifdef CONFIG_MLX5_CORE_IPOIB