[PATCH AUTOSEL 6.1 20/46] net: atlantic: generate software timestamp just before the doorbell

[Sasha Levin <sashal@kernel.org>]

From: Jason Xing <kernelxing@tencent.com>

[ Upstream commit 285ad7477559b6b5ceed10ba7ecfed9d17c0e7c6 ]

Make sure the call of skb_tx_timestamp is as close as possible to the
doorbell.

Signed-off-by: Jason Xing <kernelxing@tencent.com>
Link: https://patch.msgid.link/20250510134812.48199-2-kerneljasonxing@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

**YES** This commit should be backported to stable kernel trees. Here's
my comprehensive analysis: ## Primary Analysis **This is a timestamp
accuracy fix that addresses when software timestamps are recorded
relative to hardware transmission**. The commit moves
`skb_tx_timestamp(skb)` from before the hardware doorbell to immediately
after it, ensuring timestamps are recorded as close as possible to
actual packet transmission. ## Code Change Analysis ### What Changed 1.
**In `aq_main.c`**: Removed `skb_tx_timestamp(skb)` from the main
transmission path 2. **In `aq_nic.c`**: Added `skb_tx_timestamp(skb)` in
`aq_nic_xmit()` right after `aq_nic_map_skb()` but before the hardware
doorbell via `hw_ring_tx_xmit()` ### Critical Timing Issue Fixed The
original sequence was: ```c // BEFORE (problematic):
skb_tx_timestamp(skb); // Timestamp recorded before hardware
notification return aq_nic_xmit(aq_nic, skb); └─ frags =
aq_nic_map_skb(self, skb, ring); └─ hw_ring_tx_xmit() // Hardware
doorbell rung HERE ``` The fixed sequence is: ```c // AFTER (correct):
return aq_nic_xmit(aq_nic, skb); └─ frags = aq_nic_map_skb(self, skb,
ring); └─ skb_tx_timestamp(skb); // Timestamp recorded right before
hardware doorbell └─ hw_ring_tx_xmit() // Hardware doorbell rung
immediately after ``` ## Backporting Assessment ### 1. **Fixes Important
Timing Bug** ✅ - **Software timestamp accuracy** is critical for network
applications, especially PTP (Precision Time Protocol) - **Wrong
timestamp ordering** can cause timing skew and affect time-sensitive
applications - **Low-latency networking** applications depend on
accurate TX timestamps ### 2. **Minimal Risk** ✅ - **Small, contained
change**: Only moves one function call - **No behavioral changes**: Same
timestamp function, just better timing - **No architectural
modifications**: Same code path, different ordering - **No new
dependencies**: Uses existing functionality ### 3. **Clear Bug Fix** ✅ -
**Specific problem**: Timestamps recorded too early in TX pipeline -
**Well-defined solution**: Move timestamp closer to hardware
transmission - **Matches stable criteria**: Important bugfix with
minimal regression risk ### 4. **Comparison with Similar Commits** This
commit is **nearly identical** to Similar Commit #1 (marked YES for
backporting): - **Subject: "nfp: TX time stamp packets before HW
doorbell is rung"** - **Same exact issue**: Moving timestamp call to be
closer to hardware doorbell - **Same pattern**: `skb_tx_timestamp(skb)`
moved from after to before hardware notification - **Same stable tree
acceptance**: The NFP driver fix was accepted The only differences are:
- Different driver (atlantic vs nfp) - Same underlying network timing
issue - Same solution approach ### 5. **User Impact** ✅ - **Affects all
atlantic driver users** who rely on software timestamps - **Time-
sensitive applications** like PTP, trading systems, and real-time
monitoring - **Improves timestamp precision** without breaking existing
functionality ### 6. **Stable Tree Compatibility** ✅ - **No API
changes**: Uses standard `skb_tx_timestamp()` function - **No kernel
version dependencies**: Should work across stable versions - **Self-
contained**: Limited to atlantic driver code ## Conclusion This commit
meets all stable backporting criteria: - **Fixes important timestamp
accuracy bug** - **Minimal regression risk** - **Clear, contained
solution** - **Matches proven pattern** from Similar Commit #1 (NFP
driver fix) - **Benefits time-sensitive network applications** The fix
ensures software timestamps are recorded as close as possible to when
hardware actually starts transmitting packets, which is crucial for
applications requiring precise timing information.

 drivers/net/ethernet/aquantia/atlantic/aq_main.c | 1 -
 drivers/net/ethernet/aquantia/atlantic/aq_nic.c  | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_main.c b/drivers/net/ethernet/aquantia/atlantic/aq_main.c
index 77609dc0a08d6..9d877f436e335 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_main.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_main.c
@@ -122,7 +122,6 @@ static netdev_tx_t aq_ndev_start_xmit(struct sk_buff *skb, struct net_device *nd
 	}
 #endif
 
-	skb_tx_timestamp(skb);
 	return aq_nic_xmit(aq_nic, skb);
 }
 
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
index a467c8f91020b..3bfd9027cccac 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
@@ -893,6 +893,8 @@ int aq_nic_xmit(struct aq_nic_s *self, struct sk_buff *skb)
 
 	frags = aq_nic_map_skb(self, skb, ring);
 
+	skb_tx_timestamp(skb);
+
 	if (likely(frags)) {
 		err = self->aq_hw_ops->hw_ring_tx_xmit(self->aq_hw,
 						       ring, frags);
-- 
2.39.5