Skip to content

mptcp: fix 3rd ack rtx timer

Paolo Abeni mptcp netdev 1 version Applied

Status from this message: This series was applied to netdev/net.git (master)

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest2 patches 1 replyApplied 2/2

Patches in v1 All 2 applied

#Subject and filesSizeRepliesApplied
1/2mptcp: fix delack timernet/mptcp/options.c+2 -10 repliesApplied
2/2mptcp: use delegate action to schedule 3rd ack retransnet/mptcp/options.c net/mptcp/protocol.c net/mptcp/protocol.h+60 -410 repliesApplied

Reviews trailers per patch

All 2 patches have a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchPaolo AbeniMat MartineauDavid S. Miller
SeriesA-b
1/2A-b R-b
2/2R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v1 thread

Cover letter [PATCH net 0/2] mptcp: fix 3rd ack rtx timer

Eric noted that the MPTCP code do the wrong thing to schedule the MPJ 3rd ack timer. He also provided a patch to address the issues (patch 1/2).

To fix for good the MPJ 3rd ack retransmission timer, we additionally need to set it after the current ack is transmitted (patch 2/2)

Note that the bug went unnotice so far because all the related tests required some running data transfer, and that causes MPTCP-level ack even on the opening MPJ subflow. We now have explicit packet drill coverage for this code path.

Eric Dumazet (1):
mptcp: fix delack timer

Paolo Abeni (1):
mptcp: use delegate action to schedule 3rd ack retrans

 net/mptcp/options.c  | 32 ++++++++-------------------
 net/mptcp/protocol.c | 51 ++++++++++++++++++++++++++++++++++++--------
 net/mptcp/protocol.h | 17 ++++++++-------
 3 files changed, 60 insertions(+), 40 deletions(-)
Signature · 1 line
2.33.1