diff options
| author | Tariq Toukan <tariqt@mellanox.com> | 2018-05-31 18:01:31 +0300 |
|---|---|---|
| committer | Saeed Mahameed <saeedm@mellanox.com> | 2018-06-01 16:48:13 -0700 |
| commit | 4b3e85a52ae4ea516fe297acad32872bc13bf620 (patch) | |
| tree | d1ccdd2ce951812a04c4bbafb53fb7476bce5840 | |
| parent | 21ad1173589ef63a93f94e05c879393e2c27588c (diff) | |
| download | nfc-next-4b3e85a52ae4ea516fe297acad32872bc13bf620.tar.gz | |
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: 043dc78ecf07 ("net/mlx5e: TX, Use actual WQE size for SQ edge fill")
Signed-off-by: Tariq Toukan <tariqt@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c index aafd75257fd0c6..9829ee02de31a3 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c @@ -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; |