Patch "net/mlx5e: IPoIB, Use correct timestamp in child receive flow" has been added to the 4.15-stable tree
This is a note to let you know that I've just added the patch titled
net/mlx5e: IPoIB, Use correct timestamp in child receive flow
to the 4.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
net-mlx5e-ipoib-use-correct-timestamp-in-child-receive-flow.patch
and it can be found in the queue-4.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Mon Apr 9 10:16:32 CEST 2018
From: Feras Daoud <[email protected]>
Date: Tue, 31 Oct 2017 14:57:27 +0200
Subject: net/mlx5e: IPoIB, Use correct timestamp in child receive flow
From: Feras Daoud <[email protected]>
[ Upstream commit 36e564b76f1862914ad32c35bab433e07da2ebf8 ]
The current implementation takes the child timestamp object from the parent since the rq in mlx5i_complete_rx_cqe belongs to the parent. This change fixes the issue by taking the correct timestamp.
--- drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c +6 -1
@@ -1196,7 +1196,9 @@ static inline void mlx5i_complete_rx_cqeu32 cqe_bcnt, struct sk_buff *skb) { + struct hwtstamp_config *tstamp;struct net_device *netdev; +struct mlx5e_priv *priv;char *pseudo_header;u32 qpn;u8 *dgid;
@@ -1215,6 +1217,9 @@ static inline void mlx5i_complete_rx_cqereturn ; } + priv =mlx5i_epriv (netdev); + tstamp = &priv->tstamp; + g = (be32_to_cpu (cqe->flags_rqpn) >>28 ) &3 ; dgid = skb->data +MLX5_IB_GRH_DGID_OFFSET ;if ((!g) || dgid[0 ] !=0xff )
@@ -1235,7 +1240,7 @@ static inline void mlx5i_complete_rx_cqe skb->ip_summed =CHECKSUM_COMPLETE ; skb->csum =csum_unfold ((__force __sum16 )cqe->check_sum); -if (unlikely (mlx5e_rx_hw_stamp (rq->tstamp))) +if (unlikely (mlx5e_rx_hw_stamp (tstamp)))skb_hwtstamps (skb)->hwtstamp =mlx5_timecounter_cyc2time (rq->clock,get_cqe_ts (cqe));
Patches currently in stable-queue which might be from [email protected] are
queue-4.15/net-mlx5e-ipoib-use-correct-timestamp-in-child-receive-flow.patch