79 lines
3.1 KiB
Diff
79 lines
3.1 KiB
Diff
From caaa5c0c5b3a539eefe31c4fe578b881ba6512bf Mon Sep 17 00:00:00 2001
|
|
From: Kamal Heib <kheib@redhat.com>
|
|
Date: Thu, 16 Apr 2026 17:42:03 -0400
|
|
Subject: [PATCH] net/mlx5: support software TX timestamp
|
|
|
|
JIRA: https://redhat.atlassian.net/browse/RHEL-169055
|
|
|
|
commit 2451d3fb388f29d87d1abd3d2952d5ce36109816
|
|
Author: Stanislav Fomichev <sdf@fomichev.me>
|
|
Date: Thu May 8 16:51:09 2025 -0700
|
|
|
|
net/mlx5: support software TX timestamp
|
|
|
|
Having a software timestamp (along with existing hardware one) is
|
|
useful to trace how the packets flow through the stack.
|
|
mlx5e_tx_skb_update_hwts_flags is called from tx paths
|
|
to setup HW timestamp; extend it to add software one as well.
|
|
|
|
Reviewed-by: Jason Xing <kerneljasonxing@gmail.com>
|
|
Signed-off-by: Stanislav Fomichev <stfomichev@gmail.com>
|
|
Reviewed-by: Vadim Fedorenko <vadim.fedorenko@linux.dev>
|
|
Acked-by: Martin KaFai Lau <martin.lau@kernel.org>
|
|
Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
|
|
Link: https://patch.msgid.link/20250508235109.585096-1-stfomichev@gmail.com
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
|
|
Signed-off-by: Kamal Heib <kheib@redhat.com>
|
|
|
|
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
|
|
index 8578f03783bc..e6c9338ddae8 100644
|
|
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
|
|
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
|
|
@@ -1686,6 +1686,7 @@ int mlx5e_ethtool_get_ts_info(struct mlx5e_priv *priv,
|
|
return 0;
|
|
|
|
info->so_timestamping = SOF_TIMESTAMPING_TX_HARDWARE |
|
|
+ SOF_TIMESTAMPING_TX_SOFTWARE |
|
|
SOF_TIMESTAMPING_RX_HARDWARE |
|
|
SOF_TIMESTAMPING_RAW_HARDWARE;
|
|
|
|
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
|
|
index 4fd853d19e31..55a8629f0792 100644
|
|
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
|
|
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
|
|
@@ -337,10 +337,11 @@ static void mlx5e_sq_calc_wqe_attr(struct sk_buff *skb, const struct mlx5e_tx_at
|
|
};
|
|
}
|
|
|
|
-static void mlx5e_tx_skb_update_hwts_flags(struct sk_buff *skb)
|
|
+static void mlx5e_tx_skb_update_ts_flags(struct sk_buff *skb)
|
|
{
|
|
if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP))
|
|
skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS;
|
|
+ skb_tx_timestamp(skb);
|
|
}
|
|
|
|
static void mlx5e_tx_check_stop(struct mlx5e_txqsq *sq)
|
|
@@ -392,7 +393,7 @@ mlx5e_txwqe_complete(struct mlx5e_txqsq *sq, struct sk_buff *skb,
|
|
cseg->opmod_idx_opcode = cpu_to_be32((sq->pc << 8) | attr->opcode);
|
|
cseg->qpn_ds = cpu_to_be32((sq->sqn << 8) | wqe_attr->ds_cnt);
|
|
|
|
- mlx5e_tx_skb_update_hwts_flags(skb);
|
|
+ mlx5e_tx_skb_update_ts_flags(skb);
|
|
|
|
sq->pc += wi->num_wqebbs;
|
|
|
|
@@ -625,7 +626,7 @@ mlx5e_sq_xmit_mpwqe(struct mlx5e_txqsq *sq, struct sk_buff *skb,
|
|
mlx5e_dma_push(sq, txd.dma_addr, txd.len, MLX5E_DMA_MAP_SINGLE);
|
|
mlx5e_skb_fifo_push(&sq->db.skb_fifo, skb);
|
|
mlx5e_tx_mpwqe_add_dseg(sq, &txd);
|
|
- mlx5e_tx_skb_update_hwts_flags(skb);
|
|
+ mlx5e_tx_skb_update_ts_flags(skb);
|
|
|
|
if (unlikely(mlx5e_tx_mpwqe_is_full(&sq->mpwqe))) {
|
|
/* Might stop the queue and affect the retval of __netdev_tx_sent_queue. */
|
|
--
|
|
2.50.1 (Apple Git-155)
|
|
|