Commit 64f14d16 authored by Rahul Rameshbabu's avatar Rahul Rameshbabu Committed by Jakub Kicinski
Browse files

net/mlx5e: Avoid referencing skb after free-ing in drop path of mlx5e_sq_xmit_wqe 



When SQ is a port timestamping SQ for PTP, do not access tx flags of skb
after free-ing the skb. Free the skb only after all references that depend
on it have been handled in the dropped WQE path.

Fixes: 3178308a ("net/mlx5e: Make tx_port_ts logic resilient to out-of-order CQEs")
Signed-off-by: default avatarRahul Rameshbabu <rrameshbabu@nvidia.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
Link: https://lore.kernel.org/r/20231114215846.5902-10-saeed@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent bdf788cf

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

+1 −1
Original line number Diff line number Diff line
@@ -494,10 +494,10 @@ mlx5e_sq_xmit_wqe(struct mlx5e_txqsq *sq, struct sk_buff *skb, 


err_drop:

	stats->dropped++;

	dev_kfree_skb_any(skb);

	if (unlikely(sq->ptpsq && (skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)))

		mlx5e_ptp_metadata_fifo_push(&sq->ptpsq->metadata_freelist,

					     be32_to_cpu(eseg->flow_table_metadata));

	dev_kfree_skb_any(skb);

	mlx5e_tx_flush(sq);

}