net/rds: clear i_rx_lat_trace in rds_inc_path_init()
Subsystems (4)
Allison Henderson
maintainerPATCH 1/1 net/rds: clear i_rx_lat_trace in rds_inc_path_init()
The commit that introduced the receive-path latency trace added the clearing of inc->i_rx_lat_trace[] to rds_inc_init() only; rds_inc_path_init() never got it.
That asymmetry matters for the one caller that reuses memory:rds_tcp_data_recv() carves its rds_tcp_incoming out of a kmem_cache with no zeroing and no constructor, so after rds_inc_path_init() the array still holds the timestamps of whatever message previously occupied that slab object. No stale value is user-visible today - every message that reaches the socket happens to overwrite all four slots (RX_HDR at allocation, RX_START when the header completes, RX_END at delivery, RX_CMSG at recvmsg time) before RDS_CMSG_RXPATH_LATENCY reads them back as deltas - but that is a property of the current writers, not of the init contract, and a future trace point or an early-exit path would expose another message's timestamps to userspace.
Clear the array in rds_inc_path_init() too, so both init helpers leave the inc fully initialized. memset is the form the clearing already takes on the rds_inc_init() side since commit 1635bb548f84 ("net: rds: use memset to optimize the recv"). Hardening only; no user-visible bug in the current code.
--- net/rds/recv.c | 2 ++ 1 file changed, 2 insertions(+)
net/rds/recv.c +2 -0
@@ -66,6 +66,8 @@ void rds_inc_path_init(struct rds_incoming *inc, struct rds_conn_path *cp, inc->i_saddr = *saddr; inc->i_usercopy.rdma_cookie =0 ; inc->i_usercopy.rx_tstamp =ktime_set (0 ,0 ); + +memset (inc->i_rx_lat_trace,0 ,sizeof (inc->i_rx_lat_trace)); }EXPORT_SYMBOL_GPL (rds_inc_path_init);
base-commit: 4fa4977a0d900f936bcae5cd2c510be5554e8dd6
prerequisite-patch-id: ac6fbdba01fa66022d37321e8270d4f9f9fb834b
prerequisite-patch-id: 45883e7cfa080a48b943e4ba58e0da22767c4c01
Signature · 1 line
2.25.1
Quoted 17 lines · Allison Henderson
The commit that introduced the receive-path latency trace added the clearing of inc->i_rx_lat_trace[] to
rds_inc_init()only;rds_inc_path_init()never got it.That asymmetry matters for the one caller that reuses memory:
rds_tcp_data_recv()carves itsrds_tcp_incomingout of akmem_cachewith no zeroing and no constructor, so afterrds_inc_path_init()the array still holds the timestamps of whatever message previously occupied that slab object. No stale value is user-visible today - every message that reaches the socket happens to overwrite all four slots (RX_HDRat allocation,RX_STARTwhen the header completes,RX_ENDat delivery,RX_CMSGat recvmsg time) beforeRDS_CMSG_RXPATH_LATENCYreads them back as deltas - but that is a property of the current writers, not of the init contract, and a future trace point or an early-exit path would expose another message's timestamps to userspace.
Quoted 8 lines
Clear the array in
rds_inc_path_init()too, so both init helpers leave the inc fully initialized. memset is the form the clearing already takes on therds_inc_init()side since commit1635bb548f84("net: rds: use memset to optimize the recv"). Hardening only; no user-visible bug in the current code.Assisted-by Claude-Code:claude-fable-5Signed-off-by Allison Henderson <[email protected]>
Paolo Abeni
maintainerQuoted 17 lines · Allison Henderson
The commit that introduced the receive-path latency trace added the clearing of inc->i_rx_lat_trace[] to
rds_inc_init()only;rds_inc_path_init()never got it.That asymmetry matters for the one caller that reuses memory:
rds_tcp_data_recv()carves itsrds_tcp_incomingout of akmem_cachewith no zeroing and no constructor, so afterrds_inc_path_init()the array still holds the timestamps of whatever message previously occupied that slab object. No stale value is user-visible today - every message that reaches the socket happens to overwrite all four slots (RX_HDRat allocation,RX_STARTwhen the header completes,RX_ENDat delivery,RX_CMSGat recvmsg time) beforeRDS_CMSG_RXPATH_LATENCYreads them back as deltas - but that is a property of the current writers, not of the init contract, and a future trace point or an early-exit path would expose another message's timestamps to userspace.
Quoted 8 lines
Clear the array in
rds_inc_path_init()too, so both init helpers leave the inc fully initialized. memset is the form the clearing already takes on therds_inc_init()side since commit1635bb548f84("net: rds: use memset to optimize the recv"). Hardening only; no user-visible bug in the current code.Assisted-by Claude-Code:claude-fable-5Signed-off-by Allison Henderson <[email protected]>
Mentioning this change in the previous series thread would have saved me a lot of time :(
/P
This patch was applied to netdev/net-next.git (main) by Paolo Abeni <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by Paolo Abeni <[email protected]>:
Quoted 17 lines · On Sun, 9 Aug 2026 22:56:31 -0700 you wrote:
The commit that introduced the receive-path latency trace added the clearing of inc->i_rx_lat_trace[] to
rds_inc_init()only;rds_inc_path_init()never got it.That asymmetry matters for the one caller that reuses memory:
rds_tcp_data_recv()carves itsrds_tcp_incomingout of akmem_cachewith no zeroing and no constructor, so afterrds_inc_path_init()the array still holds the timestamps of whatever message previously occupied that slab object. No stale value is user-visible today - every message that reaches the socket happens to overwrite all four slots (RX_HDRat allocation,RX_STARTwhen the header completes,RX_ENDat delivery,RX_CMSGat recvmsg time) beforeRDS_CMSG_RXPATH_LATENCYreads them back as deltas - but that is a property of the current writers, not of the init contract, and a future trace point or an early-exit path would expose another message's timestamps to userspace.
Quoted 1 line
[...]
Here is the summary with links:
- [net-next] net/rds: clear i_rx_lat_trace in rds_inc_path_init()
https://git.kernel.org/netdev/net-next/c/68b3d4dbaf20
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
Allison Henderson
maintainerQuoted 24 lines · Paolo Abeni
Quoted 23 lines · Allison Henderson
The commit that introduced the receive-path latency trace added the clearing of inc->i_rx_lat_trace[] to
rds_inc_init()only;rds_inc_path_init()never got it.That asymmetry matters for the one caller that reuses memory:
rds_tcp_data_recv()carves itsrds_tcp_incomingout of akmem_cachewith no zeroing and no constructor, so afterrds_inc_path_init()the array still holds the timestamps of whatever message previously occupied that slab object. No stale value is user-visible today - every message that reaches the socket happens to overwrite all four slots (RX_HDRat allocation,RX_STARTwhen the header completes,RX_ENDat delivery,RX_CMSGat recvmsg time) beforeRDS_CMSG_RXPATH_LATENCYreads them back as deltas - but that is a property of the current writers, not of the init contract, and a future trace point or an early-exit path would expose another message's timestamps to userspace.Clear the array in
rds_inc_path_init()too, so both init helpers leave the inc fully initialized. memset is the form the clearing already takes on therds_inc_init()side since commit1635bb548f84("net: rds: use memset to optimize the recv"). Hardening only; no user-visible bug in the current code.
Quoted 7 lines
Quoted 2 lines
Assisted-by Claude-Code:claude-fable-5Signed-off-by Allison Henderson <[email protected]>Mentioning this change in the previous series thread would have saved me a lot of time :(
/P
Sorry about that! You're right, the follow-up came out of the same review pass as v2, and I should have replied to the series thread with a pointer to it. I'll be sure to cross-reference follow-ups like that in the future.
Thank you for picking up all three!
Allison