Skip to content

Commit 71158bb

Browse files
Paolo Abenidavem330
authored andcommitted
tcp: consistently disable header prediction for mptcp
The MPTCP receive path is hooked only into the TCP slow-path. The DSS presence allows plain MPTCP traffic to hit that consistently. Since commit e1ff9e8 ("net: mptcp: improve fallback to TCP"), when an MPTCP socket falls back to TCP, it can hit the TCP receive fast-path, and delay or stop triggering the event notification. Address the issue explicitly disabling the header prediction for MPTCP sockets. Closes: multipath-tcp/mptcp_net-next#200 Fixes: e1ff9e8 ("net: mptcp: improve fallback to TCP") Signed-off-by: Paolo Abeni <[email protected]> Reviewed-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent ca75bcf commit 71158bb

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

include/net/tcp.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -686,6 +686,10 @@ static inline u32 __tcp_set_rto(const struct tcp_sock *tp)
686686

687687
static inline void __tcp_fast_path_on(struct tcp_sock *tp, u32 snd_wnd)
688688
{
689+
/* mptcp hooks are only on the slow path */
690+
if (sk_is_mptcp((struct sock *)tp))
691+
return;
692+
689693
tp->pred_flags = htonl((tp->tcp_header_len << 26) |
690694
ntohl(TCP_FLAG_ACK) |
691695
snd_wnd);

0 commit comments

Comments
 (0)