diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2021-06-30 13:42:13 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-07-25 14:37:36 +0200 |
| commit | 108727841c25e0c8d4f5345850f54b736aae502e (patch) | |
| tree | 072b76cb70e122709c4aa1735d951731a677cc46 /include | |
| parent | ed8c953ef967916932a909cace296250f51f5edc (diff) | |
| download | linux-108727841c25e0c8d4f5345850f54b736aae502e.tar.gz linux-108727841c25e0c8d4f5345850f54b736aae502e.tar.bz2 linux-108727841c25e0c8d4f5345850f54b736aae502e.zip | |
tcp: consistently disable header prediction for mptcp
commit 71158bb1f2d2da61385c58fc1114e1a1c19984ba upstream.
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 e1ff9e82e2ea ("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: https://github.com/multipath-tcp/mptcp_net-next/issues/200
Fixes: e1ff9e82e2ea ("net: mptcp: improve fallback to TCP")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/tcp.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index d05193cb0d99..b42b3e6731ed 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -682,6 +682,10 @@ static inline u32 __tcp_set_rto(const struct tcp_sock *tp) static inline void __tcp_fast_path_on(struct tcp_sock *tp, u32 snd_wnd) { + /* mptcp hooks are only on the slow path */ + if (sk_is_mptcp((struct sock *)tp)) + return; + tp->pred_flags = htonl((tp->tcp_header_len << 26) | ntohl(TCP_FLAG_ACK) | snd_wnd); |