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

Commit 4b3e85a5 authored by Tariq Toukan's avatar Tariq Toukan Committed by Saeed Mahameed
Browse files

net/mlx5e: IPOIB, Fix overflowing SQ WQE memset 



IPoIB WQE size is larger than a single WQEBB.  Must not fetch the WQE,
and surely not memset it, until it is guaranteed that there are enough
WQEBBs available before getting to SQ/frag edge.

Fixes: 043dc78e ("net/mlx5e: TX, Use actual WQE size for SQ edge fill")
Signed-off-by: default avatarTariq Toukan <tariqt@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 21ad1173

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

+3 −3
Original line number Diff line number Diff line
@@ -653,8 +653,6 @@ netdev_tx_t mlx5i_sq_xmit(struct mlx5e_txqsq *sq, struct sk_buff *skb, 
	int num_dma;

	__be16 mss;



	mlx5i_sq_fetch_wqe(sq, &wqe, &pi);



	/* Calc ihs and ds cnt, no writes to wqe yet */

	ds_cnt = sizeof(*wqe) / MLX5_SEND_WQE_DS;

	if (skb_is_gso(skb)) {
@@ -686,10 +684,12 @@ netdev_tx_t mlx5i_sq_xmit(struct mlx5e_txqsq *sq, struct sk_buff *skb, 
	num_wqebbs = DIV_ROUND_UP(ds_cnt, MLX5_SEND_WQEBB_NUM_DS);

	frag_pi = mlx5_wq_cyc_ctr2fragix(wq, sq->pc);

	if (unlikely(frag_pi + num_wqebbs > mlx5_wq_cyc_get_frag_size(wq))) {

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

		mlx5e_fill_sq_frag_edge(sq, wq, pi, frag_pi);

		mlx5i_sq_fetch_wqe(sq, &wqe, &pi);

	}



	mlx5i_sq_fetch_wqe(sq, &wqe, &pi);



	/* fill wqe */

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

	cseg     = &wqe->ctrl;