diff --git a/build.sh b/build.sh index 2440b241..31047227 100755 --- a/build.sh +++ b/build.sh @@ -58,9 +58,9 @@ else fi #_get_repo source https://github.com/ysurac/openmptcprouter-source "master" -_get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "a74095c68c4fc66195f7c4885171e4f1d9e5c5e6" -_get_repo feeds/packages https://github.com/openwrt/packages "a5a6336071c37059da89e4b499a933bbd7ef0856" -_get_repo feeds/luci https://github.com/openwrt/luci "2096d67522e6622920d8d6aa1e0009769b392ef2" +_get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "1ab81bf02d750c9a2a447dbf4fdb323921f291d7" +_get_repo feeds/packages https://github.com/openwrt/packages "9aeb5cfbd402602f747477b3818edf73d11772e7" +_get_repo feeds/luci https://github.com/openwrt/luci "1d5a2fb0b98b5bf9d537843237a5241ada2316ed" if [ -z "$OMR_FEED" ]; then OMR_FEED=feeds/openmptcprouter diff --git a/root/target/linux/generic/hack-4.19/690-mptcp_v0.95.patch b/root/target/linux/generic/hack-4.19/690-mptcp_v0.95.patch index 0ba61758..3484259d 100644 --- a/root/target/linux/generic/hack-4.19/690-mptcp_v0.95.patch +++ b/root/target/linux/generic/hack-4.19/690-mptcp_v0.95.patch @@ -1,6 +1,6 @@ -diff -aurN linux-4.19.80/Documentation/networking/ip-sysctl.txt mptcp-mptcp_v0.95/Documentation/networking/ip-sysctl.txt ---- linux-4.19.80/Documentation/networking/ip-sysctl.txt 2019-10-17 22:45:44.000000000 +0200 -+++ mptcp-mptcp_v0.95/Documentation/networking/ip-sysctl.txt 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/Documentation/networking/ip-sysctl.txt mptcp-mptcp_v0.95/Documentation/networking/ip-sysctl.txt +--- linux-4.19.98/Documentation/networking/ip-sysctl.txt 2020-01-23 08:21:39.000000000 +0100 ++++ mptcp-mptcp_v0.95/Documentation/networking/ip-sysctl.txt 2020-01-23 21:52:06.000000000 +0100 @@ -763,6 +763,18 @@ in RFC 5961 (Improving TCP's Robustness to Blind In-Window Attacks) Default: 100 @@ -20,10 +20,10 @@ diff -aurN linux-4.19.80/Documentation/networking/ip-sysctl.txt mptcp-mptcp_v0.9 UDP variables: udp_l3mdev_accept - BOOLEAN -diff -aurN linux-4.19.80/drivers/infiniband/hw/cxgb4/cm.c mptcp-mptcp_v0.95/drivers/infiniband/hw/cxgb4/cm.c ---- linux-4.19.80/drivers/infiniband/hw/cxgb4/cm.c 2019-10-17 22:45:44.000000000 +0200 -+++ mptcp-mptcp_v0.95/drivers/infiniband/hw/cxgb4/cm.c 2019-11-20 10:07:30.000000000 +0100 -@@ -3779,7 +3779,7 @@ +diff -aurN linux-4.19.98/drivers/infiniband/hw/cxgb4/cm.c mptcp-mptcp_v0.95/drivers/infiniband/hw/cxgb4/cm.c +--- linux-4.19.98/drivers/infiniband/hw/cxgb4/cm.c 2020-01-23 08:21:39.000000000 +0100 ++++ mptcp-mptcp_v0.95/drivers/infiniband/hw/cxgb4/cm.c 2020-01-23 21:52:06.000000000 +0100 +@@ -3778,7 +3778,7 @@ */ memset(&tmp_opt, 0, sizeof(tmp_opt)); tcp_clear_options(&tmp_opt); @@ -32,9 +32,9 @@ diff -aurN linux-4.19.80/drivers/infiniband/hw/cxgb4/cm.c mptcp-mptcp_v0.95/driv req = __skb_push(skb, sizeof(*req)); memset(req, 0, sizeof(*req)); -diff -aurN linux-4.19.80/include/linux/skbuff.h mptcp-mptcp_v0.95/include/linux/skbuff.h ---- linux-4.19.80/include/linux/skbuff.h 2019-10-17 22:45:44.000000000 +0200 -+++ mptcp-mptcp_v0.95/include/linux/skbuff.h 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/include/linux/skbuff.h mptcp-mptcp_v0.95/include/linux/skbuff.h +--- linux-4.19.98/include/linux/skbuff.h 2020-01-23 08:21:39.000000000 +0100 ++++ mptcp-mptcp_v0.95/include/linux/skbuff.h 2020-01-23 21:52:06.000000000 +0100 @@ -697,7 +697,7 @@ * want to keep them across layers you have to do a skb_clone() * first. This is owned by whoever has the skb queued ATM. @@ -44,9 +44,9 @@ diff -aurN linux-4.19.80/include/linux/skbuff.h mptcp-mptcp_v0.95/include/linux/ union { struct { -diff -aurN linux-4.19.80/include/linux/tcp.h mptcp-mptcp_v0.95/include/linux/tcp.h ---- linux-4.19.80/include/linux/tcp.h 2019-10-17 22:45:44.000000000 +0200 -+++ mptcp-mptcp_v0.95/include/linux/tcp.h 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/include/linux/tcp.h mptcp-mptcp_v0.95/include/linux/tcp.h +--- linux-4.19.98/include/linux/tcp.h 2020-01-23 08:21:39.000000000 +0100 ++++ mptcp-mptcp_v0.95/include/linux/tcp.h 2020-01-23 21:52:06.000000000 +0100 @@ -58,7 +58,7 @@ /* TCP Fast Open */ #define TCP_FASTOPEN_COOKIE_MIN 4 /* Min Fast Open Cookie size in bytes */ @@ -203,9 +203,9 @@ diff -aurN linux-4.19.80/include/linux/tcp.h mptcp-mptcp_v0.95/include/linux/tcp }; static inline struct tcp_timewait_sock *tcp_twsk(const struct sock *sk) -diff -aurN linux-4.19.80/include/net/inet_common.h mptcp-mptcp_v0.95/include/net/inet_common.h ---- linux-4.19.80/include/net/inet_common.h 2019-10-17 22:45:44.000000000 +0200 -+++ mptcp-mptcp_v0.95/include/net/inet_common.h 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/include/net/inet_common.h mptcp-mptcp_v0.95/include/net/inet_common.h +--- linux-4.19.98/include/net/inet_common.h 2020-01-23 08:21:39.000000000 +0100 ++++ mptcp-mptcp_v0.95/include/net/inet_common.h 2020-01-23 21:52:06.000000000 +0100 @@ -2,6 +2,8 @@ #ifndef _INET_COMMON_H #define _INET_COMMON_H @@ -224,9 +224,9 @@ diff -aurN linux-4.19.80/include/net/inet_common.h mptcp-mptcp_v0.95/include/net int inet_release(struct socket *sock); int inet_stream_connect(struct socket *sock, struct sockaddr *uaddr, int addr_len, int flags); -diff -aurN linux-4.19.80/include/net/inet_connection_sock.h mptcp-mptcp_v0.95/include/net/inet_connection_sock.h ---- linux-4.19.80/include/net/inet_connection_sock.h 2019-10-17 22:45:44.000000000 +0200 -+++ mptcp-mptcp_v0.95/include/net/inet_connection_sock.h 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/include/net/inet_connection_sock.h mptcp-mptcp_v0.95/include/net/inet_connection_sock.h +--- linux-4.19.98/include/net/inet_connection_sock.h 2020-01-23 08:21:39.000000000 +0100 ++++ mptcp-mptcp_v0.95/include/net/inet_connection_sock.h 2020-01-23 21:52:06.000000000 +0100 @@ -29,6 +29,7 @@ struct inet_bind_bucket; @@ -235,9 +235,9 @@ diff -aurN linux-4.19.80/include/net/inet_connection_sock.h mptcp-mptcp_v0.95/in /* * Pointers to address related TCP functions -diff -aurN linux-4.19.80/include/net/inet_sock.h mptcp-mptcp_v0.95/include/net/inet_sock.h ---- linux-4.19.80/include/net/inet_sock.h 2019-10-17 22:45:44.000000000 +0200 -+++ mptcp-mptcp_v0.95/include/net/inet_sock.h 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/include/net/inet_sock.h mptcp-mptcp_v0.95/include/net/inet_sock.h +--- linux-4.19.98/include/net/inet_sock.h 2020-01-23 08:21:39.000000000 +0100 ++++ mptcp-mptcp_v0.95/include/net/inet_sock.h 2020-01-23 21:52:06.000000000 +0100 @@ -83,7 +83,7 @@ #define ireq_state req.__req_common.skc_state #define ireq_family req.__req_common.skc_family @@ -256,10 +256,10 @@ diff -aurN linux-4.19.80/include/net/inet_sock.h mptcp-mptcp_v0.95/include/net/i smc_ok : 1; u32 ir_mark; union { -diff -aurN linux-4.19.80/include/net/mptcp.h mptcp-mptcp_v0.95/include/net/mptcp.h ---- linux-4.19.80/include/net/mptcp.h 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/include/net/mptcp.h 2019-11-20 10:07:30.000000000 +0100 -@@ -0,0 +1,1497 @@ +diff -aurN linux-4.19.98/include/net/mptcp.h mptcp-mptcp_v0.95/include/net/mptcp.h +--- linux-4.19.98/include/net/mptcp.h 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/include/net/mptcp.h 2020-01-23 21:52:06.000000000 +0100 +@@ -0,0 +1,1498 @@ +/* + * MPTCP implementation + * @@ -544,7 +544,8 @@ diff -aurN linux-4.19.80/include/net/mptcp.h mptcp-mptcp_v0.95/include/net/mptcp + dfin_combined:1, /* Was the DFIN combined with subflow-fin? */ + passive_close:1, + snd_hiseq_index:1, /* Index in snd_high_order of snd_nxt */ -+ rcv_hiseq_index:1; /* Index in rcv_high_order of rcv_nxt */ ++ rcv_hiseq_index:1, /* Index in rcv_high_order of rcv_nxt */ ++ tcp_ca_explicit_set:1; /* was meta CC set by app? */ + +#define MPTCP_SCHED_DATA_SIZE 8 + u8 mptcp_sched[MPTCP_SCHED_DATA_SIZE] __aligned(8); @@ -1757,9 +1758,9 @@ diff -aurN linux-4.19.80/include/net/mptcp.h mptcp-mptcp_v0.95/include/net/mptcp +#endif /* CONFIG_MPTCP */ + +#endif /* _MPTCP_H */ -diff -aurN linux-4.19.80/include/net/mptcp_v4.h mptcp-mptcp_v0.95/include/net/mptcp_v4.h ---- linux-4.19.80/include/net/mptcp_v4.h 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/include/net/mptcp_v4.h 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/include/net/mptcp_v4.h mptcp-mptcp_v0.95/include/net/mptcp_v4.h +--- linux-4.19.98/include/net/mptcp_v4.h 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/include/net/mptcp_v4.h 2020-01-23 21:52:06.000000000 +0100 @@ -0,0 +1,76 @@ +/* + * MPTCP implementation @@ -1837,9 +1838,9 @@ diff -aurN linux-4.19.80/include/net/mptcp_v4.h mptcp-mptcp_v0.95/include/net/mp +#endif /* CONFIG_MPTCP */ + +#endif /* MPTCP_V4_H_ */ -diff -aurN linux-4.19.80/include/net/mptcp_v6.h mptcp-mptcp_v0.95/include/net/mptcp_v6.h ---- linux-4.19.80/include/net/mptcp_v6.h 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/include/net/mptcp_v6.h 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/include/net/mptcp_v6.h mptcp-mptcp_v0.95/include/net/mptcp_v6.h +--- linux-4.19.98/include/net/mptcp_v6.h 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/include/net/mptcp_v6.h 2020-01-23 21:52:06.000000000 +0100 @@ -0,0 +1,77 @@ +/* + * MPTCP implementation @@ -1918,9 +1919,9 @@ diff -aurN linux-4.19.80/include/net/mptcp_v6.h mptcp-mptcp_v0.95/include/net/mp +#endif /* CONFIG_MPTCP */ + +#endif /* _MPTCP_V6_H */ -diff -aurN linux-4.19.80/include/net/net_namespace.h mptcp-mptcp_v0.95/include/net/net_namespace.h ---- linux-4.19.80/include/net/net_namespace.h 2019-10-17 22:45:44.000000000 +0200 -+++ mptcp-mptcp_v0.95/include/net/net_namespace.h 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/include/net/net_namespace.h mptcp-mptcp_v0.95/include/net/net_namespace.h +--- linux-4.19.98/include/net/net_namespace.h 2020-01-23 08:21:39.000000000 +0100 ++++ mptcp-mptcp_v0.95/include/net/net_namespace.h 2020-01-23 21:52:06.000000000 +0100 @@ -19,6 +19,7 @@ #include #include @@ -1939,9 +1940,9 @@ diff -aurN linux-4.19.80/include/net/net_namespace.h mptcp-mptcp_v0.95/include/n #if IS_ENABLED(CONFIG_IEEE802154_6LOWPAN) struct netns_ieee802154_lowpan ieee802154_lowpan; #endif -diff -aurN linux-4.19.80/include/net/netns/mptcp.h mptcp-mptcp_v0.95/include/net/netns/mptcp.h ---- linux-4.19.80/include/net/netns/mptcp.h 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/include/net/netns/mptcp.h 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/include/net/netns/mptcp.h mptcp-mptcp_v0.95/include/net/netns/mptcp.h +--- linux-4.19.98/include/net/netns/mptcp.h 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/include/net/netns/mptcp.h 2020-01-23 21:52:06.000000000 +0100 @@ -0,0 +1,52 @@ +/* + * MPTCP implementation - MPTCP namespace @@ -1995,9 +1996,9 @@ diff -aurN linux-4.19.80/include/net/netns/mptcp.h mptcp-mptcp_v0.95/include/net +}; + +#endif /* __NETNS_MPTCP_H__ */ -diff -aurN linux-4.19.80/include/net/snmp.h mptcp-mptcp_v0.95/include/net/snmp.h ---- linux-4.19.80/include/net/snmp.h 2019-10-17 22:45:44.000000000 +0200 -+++ mptcp-mptcp_v0.95/include/net/snmp.h 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/include/net/snmp.h mptcp-mptcp_v0.95/include/net/snmp.h +--- linux-4.19.98/include/net/snmp.h 2020-01-23 08:21:39.000000000 +0100 ++++ mptcp-mptcp_v0.95/include/net/snmp.h 2020-01-23 21:52:06.000000000 +0100 @@ -91,7 +91,6 @@ atomic_long_t mibs[ICMP6MSG_MIB_MAX]; }; @@ -2006,10 +2007,10 @@ diff -aurN linux-4.19.80/include/net/snmp.h mptcp-mptcp_v0.95/include/net/snmp.h /* TCP */ #define TCP_MIB_MAX __TCP_MIB_MAX struct tcp_mib { -diff -aurN linux-4.19.80/include/net/sock.h mptcp-mptcp_v0.95/include/net/sock.h ---- linux-4.19.80/include/net/sock.h 2019-10-17 22:45:44.000000000 +0200 -+++ mptcp-mptcp_v0.95/include/net/sock.h 2019-11-20 10:07:30.000000000 +0100 -@@ -810,6 +810,7 @@ +diff -aurN linux-4.19.98/include/net/sock.h mptcp-mptcp_v0.95/include/net/sock.h +--- linux-4.19.98/include/net/sock.h 2020-01-23 08:21:39.000000000 +0100 ++++ mptcp-mptcp_v0.95/include/net/sock.h 2020-01-23 21:52:06.000000000 +0100 +@@ -815,6 +815,7 @@ SOCK_SELECT_ERR_QUEUE, /* Wake select on error queue */ SOCK_RCU_FREE, /* wait rcu grace period in sk_destruct() */ SOCK_TXTIME, @@ -2017,7 +2018,7 @@ diff -aurN linux-4.19.80/include/net/sock.h mptcp-mptcp_v0.95/include/net/sock.h }; #define SK_FLAGS_TIMESTAMP ((1UL << SOCK_TIMESTAMP) | (1UL << SOCK_TIMESTAMPING_RX_SOFTWARE)) -@@ -1113,6 +1114,7 @@ +@@ -1118,6 +1119,7 @@ void (*unhash)(struct sock *sk); void (*rehash)(struct sock *sk); int (*get_port)(struct sock *sk, unsigned short snum); @@ -2025,9 +2026,9 @@ diff -aurN linux-4.19.80/include/net/sock.h mptcp-mptcp_v0.95/include/net/sock.h /* Keeping track of sockets in use */ #ifdef CONFIG_PROC_FS -diff -aurN linux-4.19.80/include/net/tcp.h mptcp-mptcp_v0.95/include/net/tcp.h ---- linux-4.19.80/include/net/tcp.h 2019-10-17 22:45:44.000000000 +0200 -+++ mptcp-mptcp_v0.95/include/net/tcp.h 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/include/net/tcp.h mptcp-mptcp_v0.95/include/net/tcp.h +--- linux-4.19.98/include/net/tcp.h 2020-01-23 08:21:39.000000000 +0100 ++++ mptcp-mptcp_v0.95/include/net/tcp.h 2020-01-23 21:52:06.000000000 +0100 @@ -185,6 +185,7 @@ #define TCPOPT_SACK 5 /* SACK Block */ #define TCPOPT_TIMESTAMP 8 /* Better RTT estimations/PAWS */ @@ -2184,7 +2185,7 @@ diff -aurN linux-4.19.80/include/net/tcp.h mptcp-mptcp_v0.95/include/net/tcp.h void tcp_req_err(struct sock *sk, u32 seq, bool abort); int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb); struct sock *tcp_create_openreq_child(const struct sock *sk, -@@ -527,7 +646,8 @@ +@@ -538,7 +657,8 @@ u32 __cookie_v4_init_sequence(const struct iphdr *iph, const struct tcphdr *th, u16 *mssp); @@ -2194,7 +2195,7 @@ diff -aurN linux-4.19.80/include/net/tcp.h mptcp-mptcp_v0.95/include/net/tcp.h u64 cookie_init_timestamp(struct request_sock *req); bool cookie_timestamp_decode(const struct net *net, struct tcp_options_received *opt); -@@ -541,7 +661,8 @@ +@@ -552,7 +672,8 @@ u32 __cookie_v6_init_sequence(const struct ipv6hdr *iph, const struct tcphdr *th, u16 *mssp); @@ -2204,7 +2205,7 @@ diff -aurN linux-4.19.80/include/net/tcp.h mptcp-mptcp_v0.95/include/net/tcp.h #endif /* tcp_output.c */ -@@ -577,10 +698,16 @@ +@@ -588,10 +709,16 @@ void tcp_skb_collapse_tstamp(struct sk_buff *skb, const struct sk_buff *next_skb); @@ -2221,7 +2222,7 @@ diff -aurN linux-4.19.80/include/net/tcp.h mptcp-mptcp_v0.95/include/net/tcp.h void tcp_skb_mark_lost_uncond_verify(struct tcp_sock *tp, struct sk_buff *skb); void tcp_fin(struct sock *sk); -@@ -624,7 +751,7 @@ +@@ -635,7 +762,7 @@ } /* tcp.c */ @@ -2230,7 +2231,7 @@ diff -aurN linux-4.19.80/include/net/tcp.h mptcp-mptcp_v0.95/include/net/tcp.h /* Read 'sendfile()'-style from a TCP socket */ int tcp_read_sock(struct sock *sk, read_descriptor_t *desc, -@@ -812,6 +939,12 @@ +@@ -823,6 +950,12 @@ u16 tcp_gso_size; }; }; @@ -2243,7 +2244,7 @@ diff -aurN linux-4.19.80/include/net/tcp.h mptcp-mptcp_v0.95/include/net/tcp.h __u8 tcp_flags; /* TCP header flags. (tcp[13]) */ __u8 sacked; /* State flags for SACK. */ -@@ -830,6 +963,14 @@ +@@ -841,6 +974,14 @@ has_rxtstamp:1, /* SKB has a RX timestamp */ unused:5; __u32 ack_seq; /* Sequence number ACK'd */ @@ -2258,7 +2259,16 @@ diff -aurN linux-4.19.80/include/net/tcp.h mptcp-mptcp_v0.95/include/net/tcp.h union { struct { /* There is space for up to 24 bytes */ -@@ -1350,6 +1491,19 @@ +@@ -1067,6 +1208,8 @@ + int tcp_set_allowed_congestion_control(char *allowed); + int tcp_set_congestion_control(struct sock *sk, const char *name, bool load, + bool reinit, bool cap_net_admin); ++int __tcp_set_congestion_control(struct sock *sk, const char *name, bool load, ++ bool reinit, bool cap_net_admin); + u32 tcp_slow_start(struct tcp_sock *tp, u32 acked); + void tcp_cong_avoid_ai(struct tcp_sock *tp, u32 w, u32 acked); + +@@ -1361,6 +1504,19 @@ space - (space>>tcp_adv_win_scale); } @@ -2278,7 +2288,7 @@ diff -aurN linux-4.19.80/include/net/tcp.h mptcp-mptcp_v0.95/include/net/tcp.h /* Note: caller must be prepared to deal with negative returns */ static inline int tcp_space(const struct sock *sk) { -@@ -1882,6 +2036,30 @@ +@@ -1893,6 +2049,32 @@ #endif }; @@ -2303,13 +2313,15 @@ diff -aurN linux-4.19.80/include/net/tcp.h mptcp-mptcp_v0.95/include/net/tcp.h + void (*time_wait)(struct sock *sk, int state, int timeo); + void (*cleanup_rbuf)(struct sock *sk, int copied); + void (*cwnd_validate)(struct sock *sk, bool is_cwnd_limited); ++ int (*set_cong_ctrl)(struct sock *sk, const char *name, bool load, ++ bool reinit, bool cap_net_admin); +}; +extern const struct tcp_sock_ops tcp_specific; + struct tcp_request_sock_ops { u16 mss_clamp; #ifdef CONFIG_TCP_MD5SIG -@@ -1892,12 +2070,13 @@ +@@ -1903,12 +2085,13 @@ const struct sock *sk, const struct sk_buff *skb); #endif @@ -2328,7 +2340,7 @@ diff -aurN linux-4.19.80/include/net/tcp.h mptcp-mptcp_v0.95/include/net/tcp.h #endif struct dst_entry *(*route_req)(const struct sock *sk, struct flowi *fl, const struct request_sock *req); -@@ -1911,15 +2090,17 @@ +@@ -1922,15 +2105,17 @@ #ifdef CONFIG_SYN_COOKIES static inline __u32 cookie_init_sequence(const struct tcp_request_sock_ops *ops, @@ -2347,9 +2359,9 @@ diff -aurN linux-4.19.80/include/net/tcp.h mptcp-mptcp_v0.95/include/net/tcp.h const struct sock *sk, struct sk_buff *skb, __u16 *mss) { -diff -aurN linux-4.19.80/include/net/tcp_states.h mptcp-mptcp_v0.95/include/net/tcp_states.h ---- linux-4.19.80/include/net/tcp_states.h 2019-10-17 22:45:44.000000000 +0200 -+++ mptcp-mptcp_v0.95/include/net/tcp_states.h 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/include/net/tcp_states.h mptcp-mptcp_v0.95/include/net/tcp_states.h +--- linux-4.19.98/include/net/tcp_states.h 2020-01-23 08:21:39.000000000 +0100 ++++ mptcp-mptcp_v0.95/include/net/tcp_states.h 2020-01-23 21:52:06.000000000 +0100 @@ -26,6 +26,7 @@ TCP_LISTEN, TCP_CLOSING, /* Now a valid state */ @@ -2366,9 +2378,9 @@ diff -aurN linux-4.19.80/include/net/tcp_states.h mptcp-mptcp_v0.95/include/net/ }; #endif /* _LINUX_TCP_STATES_H */ -diff -aurN linux-4.19.80/include/net/transp_v6.h mptcp-mptcp_v0.95/include/net/transp_v6.h ---- linux-4.19.80/include/net/transp_v6.h 2019-10-17 22:45:44.000000000 +0200 -+++ mptcp-mptcp_v0.95/include/net/transp_v6.h 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/include/net/transp_v6.h mptcp-mptcp_v0.95/include/net/transp_v6.h +--- linux-4.19.98/include/net/transp_v6.h 2020-01-23 08:21:39.000000000 +0100 ++++ mptcp-mptcp_v0.95/include/net/transp_v6.h 2020-01-23 21:52:06.000000000 +0100 @@ -58,6 +58,8 @@ /* address family specific functions */ @@ -2378,9 +2390,9 @@ diff -aurN linux-4.19.80/include/net/transp_v6.h mptcp-mptcp_v0.95/include/net/t void inet6_destroy_sock(struct sock *sk); -diff -aurN linux-4.19.80/include/trace/events/tcp.h mptcp-mptcp_v0.95/include/trace/events/tcp.h ---- linux-4.19.80/include/trace/events/tcp.h 2019-10-17 22:45:44.000000000 +0200 -+++ mptcp-mptcp_v0.95/include/trace/events/tcp.h 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/include/trace/events/tcp.h mptcp-mptcp_v0.95/include/trace/events/tcp.h +--- linux-4.19.98/include/trace/events/tcp.h 2020-01-23 08:21:39.000000000 +0100 ++++ mptcp-mptcp_v0.95/include/trace/events/tcp.h 2020-01-23 21:52:06.000000000 +0100 @@ -10,6 +10,7 @@ #include #include @@ -2429,9 +2441,9 @@ diff -aurN linux-4.19.80/include/trace/events/tcp.h mptcp-mptcp_v0.95/include/tr ); #endif /* _TRACE_TCP_H */ -diff -aurN linux-4.19.80/include/uapi/linux/bpf.h mptcp-mptcp_v0.95/include/uapi/linux/bpf.h ---- linux-4.19.80/include/uapi/linux/bpf.h 2019-10-17 22:45:44.000000000 +0200 -+++ mptcp-mptcp_v0.95/include/uapi/linux/bpf.h 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/include/uapi/linux/bpf.h mptcp-mptcp_v0.95/include/uapi/linux/bpf.h +--- linux-4.19.98/include/uapi/linux/bpf.h 2020-01-23 08:21:39.000000000 +0100 ++++ mptcp-mptcp_v0.95/include/uapi/linux/bpf.h 2020-01-23 21:52:06.000000000 +0100 @@ -2674,6 +2674,7 @@ BPF_TCP_LISTEN, BPF_TCP_CLOSING, /* Now a valid state */ @@ -2440,9 +2452,9 @@ diff -aurN linux-4.19.80/include/uapi/linux/bpf.h mptcp-mptcp_v0.95/include/uapi BPF_TCP_MAX_STATES /* Leave at the end! */ }; -diff -aurN linux-4.19.80/include/uapi/linux/if.h mptcp-mptcp_v0.95/include/uapi/linux/if.h ---- linux-4.19.80/include/uapi/linux/if.h 2019-10-17 22:45:44.000000000 +0200 -+++ mptcp-mptcp_v0.95/include/uapi/linux/if.h 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/include/uapi/linux/if.h mptcp-mptcp_v0.95/include/uapi/linux/if.h +--- linux-4.19.98/include/uapi/linux/if.h 2020-01-23 08:21:39.000000000 +0100 ++++ mptcp-mptcp_v0.95/include/uapi/linux/if.h 2020-01-23 21:52:06.000000000 +0100 @@ -132,6 +132,9 @@ #define IFF_ECHO IFF_ECHO #endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */ @@ -2453,9 +2465,9 @@ diff -aurN linux-4.19.80/include/uapi/linux/if.h mptcp-mptcp_v0.95/include/uapi/ #define IFF_VOLATILE (IFF_LOOPBACK|IFF_POINTOPOINT|IFF_BROADCAST|IFF_ECHO|\ IFF_MASTER|IFF_SLAVE|IFF_RUNNING|IFF_LOWER_UP|IFF_DORMANT) -diff -aurN linux-4.19.80/include/uapi/linux/mptcp.h mptcp-mptcp_v0.95/include/uapi/linux/mptcp.h ---- linux-4.19.80/include/uapi/linux/mptcp.h 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/include/uapi/linux/mptcp.h 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/include/uapi/linux/mptcp.h mptcp-mptcp_v0.95/include/uapi/linux/mptcp.h +--- linux-4.19.98/include/uapi/linux/mptcp.h 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/include/uapi/linux/mptcp.h 2020-01-23 21:52:06.000000000 +0100 @@ -0,0 +1,149 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* @@ -2606,9 +2618,9 @@ diff -aurN linux-4.19.80/include/uapi/linux/mptcp.h mptcp-mptcp_v0.95/include/ua +}; + +#endif /* _LINUX_MPTCP_H */ -diff -aurN linux-4.19.80/include/uapi/linux/tcp.h mptcp-mptcp_v0.95/include/uapi/linux/tcp.h ---- linux-4.19.80/include/uapi/linux/tcp.h 2019-10-17 22:45:44.000000000 +0200 -+++ mptcp-mptcp_v0.95/include/uapi/linux/tcp.h 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/include/uapi/linux/tcp.h mptcp-mptcp_v0.95/include/uapi/linux/tcp.h +--- linux-4.19.98/include/uapi/linux/tcp.h 2020-01-23 08:21:39.000000000 +0100 ++++ mptcp-mptcp_v0.95/include/uapi/linux/tcp.h 2020-01-23 21:52:06.000000000 +0100 @@ -18,9 +18,15 @@ #ifndef _UAPI_LINUX_TCP_H #define _UAPI_LINUX_TCP_H @@ -2694,10 +2706,10 @@ diff -aurN linux-4.19.80/include/uapi/linux/tcp.h mptcp-mptcp_v0.95/include/uapi /* for TCP_MD5SIG socket option */ #define TCP_MD5SIG_MAXKEYLEN 80 -diff -aurN linux-4.19.80/net/core/dev.c mptcp-mptcp_v0.95/net/core/dev.c ---- linux-4.19.80/net/core/dev.c 2019-10-17 22:45:44.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/core/dev.c 2019-11-20 10:07:30.000000000 +0100 -@@ -7471,7 +7471,7 @@ +diff -aurN linux-4.19.98/net/core/dev.c mptcp-mptcp_v0.95/net/core/dev.c +--- linux-4.19.98/net/core/dev.c 2020-01-23 08:21:39.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/core/dev.c 2020-01-23 21:52:06.000000000 +0100 +@@ -7665,7 +7665,7 @@ dev->flags = (flags & (IFF_DEBUG | IFF_NOTRAILERS | IFF_NOARP | IFF_DYNAMIC | IFF_MULTICAST | IFF_PORTSEL | @@ -2706,18 +2718,18 @@ diff -aurN linux-4.19.80/net/core/dev.c mptcp-mptcp_v0.95/net/core/dev.c (dev->flags & (IFF_UP | IFF_VOLATILE | IFF_PROMISC | IFF_ALLMULTI)); -diff -aurN linux-4.19.80/net/core/net-traces.c mptcp-mptcp_v0.95/net/core/net-traces.c ---- linux-4.19.80/net/core/net-traces.c 2019-10-17 22:45:44.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/core/net-traces.c 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/net/core/net-traces.c mptcp-mptcp_v0.95/net/core/net-traces.c +--- linux-4.19.98/net/core/net-traces.c 2020-01-23 08:21:39.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/core/net-traces.c 2020-01-23 21:52:06.000000000 +0100 @@ -48,3 +48,5 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(napi_poll); EXPORT_TRACEPOINT_SYMBOL_GPL(tcp_send_reset); + +EXPORT_TRACEPOINT_SYMBOL_GPL(mptcp_retransmit); -diff -aurN linux-4.19.80/net/core/skbuff.c mptcp-mptcp_v0.95/net/core/skbuff.c ---- linux-4.19.80/net/core/skbuff.c 2019-10-17 22:45:44.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/core/skbuff.c 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/net/core/skbuff.c mptcp-mptcp_v0.95/net/core/skbuff.c +--- linux-4.19.98/net/core/skbuff.c 2020-01-23 08:21:39.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/core/skbuff.c 2020-01-23 21:52:06.000000000 +0100 @@ -536,7 +536,7 @@ skb_drop_list(&skb_shinfo(skb)->frag_list); } @@ -2727,9 +2739,9 @@ diff -aurN linux-4.19.80/net/core/skbuff.c mptcp-mptcp_v0.95/net/core/skbuff.c { struct sk_buff *list; -diff -aurN linux-4.19.80/net/core/sock.c mptcp-mptcp_v0.95/net/core/sock.c ---- linux-4.19.80/net/core/sock.c 2019-10-17 22:45:44.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/core/sock.c 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/net/core/sock.c mptcp-mptcp_v0.95/net/core/sock.c +--- linux-4.19.98/net/core/sock.c 2020-01-23 08:21:39.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/core/sock.c 2020-01-23 21:52:06.000000000 +0100 @@ -140,6 +140,11 @@ #include @@ -2789,9 +2801,9 @@ diff -aurN linux-4.19.80/net/core/sock.c mptcp-mptcp_v0.95/net/core/sock.c mem_cgroup_sk_alloc(newsk); cgroup_sk_alloc(&newsk->sk_cgrp_data); -diff -aurN linux-4.19.80/net/ipv4/af_inet.c mptcp-mptcp_v0.95/net/ipv4/af_inet.c ---- linux-4.19.80/net/ipv4/af_inet.c 2019-10-17 22:45:44.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/ipv4/af_inet.c 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/net/ipv4/af_inet.c mptcp-mptcp_v0.95/net/ipv4/af_inet.c +--- linux-4.19.98/net/ipv4/af_inet.c 2020-01-23 08:21:39.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/ipv4/af_inet.c 2020-01-23 21:52:06.000000000 +0100 @@ -104,6 +104,7 @@ #include #include @@ -2855,9 +2867,9 @@ diff -aurN linux-4.19.80/net/ipv4/af_inet.c mptcp-mptcp_v0.95/net/ipv4/af_inet.c /* Setup TCP slab cache for open requests. */ tcp_init(); -diff -aurN linux-4.19.80/net/ipv4/inet_connection_sock.c mptcp-mptcp_v0.95/net/ipv4/inet_connection_sock.c ---- linux-4.19.80/net/ipv4/inet_connection_sock.c 2019-10-17 22:45:44.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/ipv4/inet_connection_sock.c 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/net/ipv4/inet_connection_sock.c mptcp-mptcp_v0.95/net/ipv4/inet_connection_sock.c +--- linux-4.19.98/net/ipv4/inet_connection_sock.c 2020-01-23 08:21:39.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/ipv4/inet_connection_sock.c 2020-01-23 21:52:06.000000000 +0100 @@ -23,6 +23,7 @@ #include #include @@ -2915,9 +2927,9 @@ diff -aurN linux-4.19.80/net/ipv4/inet_connection_sock.c mptcp-mptcp_v0.95/net/i sock_put(child); cond_resched(); -diff -aurN linux-4.19.80/net/ipv4/ip_sockglue.c mptcp-mptcp_v0.95/net/ipv4/ip_sockglue.c ---- linux-4.19.80/net/ipv4/ip_sockglue.c 2019-10-17 22:45:44.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/ipv4/ip_sockglue.c 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/net/ipv4/ip_sockglue.c mptcp-mptcp_v0.95/net/ipv4/ip_sockglue.c +--- linux-4.19.98/net/ipv4/ip_sockglue.c 2020-01-23 08:21:39.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/ipv4/ip_sockglue.c 2020-01-23 21:52:06.000000000 +0100 @@ -44,6 +44,8 @@ #endif #include @@ -2957,9 +2969,9 @@ diff -aurN linux-4.19.80/net/ipv4/ip_sockglue.c mptcp-mptcp_v0.95/net/ipv4/ip_so } break; case IP_TTL: -diff -aurN linux-4.19.80/net/ipv4/Kconfig mptcp-mptcp_v0.95/net/ipv4/Kconfig ---- linux-4.19.80/net/ipv4/Kconfig 2019-10-17 22:45:44.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/ipv4/Kconfig 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/net/ipv4/Kconfig mptcp-mptcp_v0.95/net/ipv4/Kconfig +--- linux-4.19.98/net/ipv4/Kconfig 2020-01-23 08:21:39.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/ipv4/Kconfig 2020-01-23 21:52:06.000000000 +0100 @@ -680,6 +680,51 @@ bufferbloat, policers, or AQM schemes that do not provide a delay signal. It requires the fq ("Fair Queue") pacing packet scheduler. @@ -3045,9 +3057,9 @@ diff -aurN linux-4.19.80/net/ipv4/Kconfig mptcp-mptcp_v0.95/net/ipv4/Kconfig default "reno" if DEFAULT_RENO default "dctcp" if DEFAULT_DCTCP default "cdg" if DEFAULT_CDG -diff -aurN linux-4.19.80/net/ipv4/syncookies.c mptcp-mptcp_v0.95/net/ipv4/syncookies.c ---- linux-4.19.80/net/ipv4/syncookies.c 2019-10-17 22:45:44.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/ipv4/syncookies.c 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/net/ipv4/syncookies.c mptcp-mptcp_v0.95/net/ipv4/syncookies.c +--- linux-4.19.98/net/ipv4/syncookies.c 2020-01-23 08:21:39.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/ipv4/syncookies.c 2020-01-23 21:52:06.000000000 +0100 @@ -16,6 +16,8 @@ #include #include @@ -3161,9 +3173,9 @@ diff -aurN linux-4.19.80/net/ipv4/syncookies.c mptcp-mptcp_v0.95/net/ipv4/syncoo ireq->rcv_wscale = rcv_wscale; ireq->ecn_ok = cookie_ecn_ok(&tcp_opt, sock_net(sk), &rt->dst); -diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c ---- linux-4.19.80/net/ipv4/tcp.c 2019-10-17 22:45:44.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/ipv4/tcp.c 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c +--- linux-4.19.98/net/ipv4/tcp.c 2020-01-23 08:21:39.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/ipv4/tcp.c 2020-01-23 21:52:06.000000000 +0100 @@ -274,6 +274,7 @@ #include @@ -3172,7 +3184,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c #include #include #include -@@ -399,6 +400,26 @@ +@@ -399,6 +400,27 @@ return rate64; } @@ -3194,12 +3206,13 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c + .time_wait = tcp_time_wait, + .cleanup_rbuf = tcp_cleanup_rbuf, + .cwnd_validate = tcp_cwnd_validate, ++ .set_cong_ctrl = __tcp_set_congestion_control, +}; + /* Address-family independent initialization for a tcp_sock. * * NOTE: A lot of things set to zero explicitly by call to -@@ -452,6 +473,11 @@ +@@ -452,6 +474,11 @@ sk->sk_sndbuf = sock_net(sk)->ipv4.sysctl_tcp_wmem[1]; sk->sk_rcvbuf = sock_net(sk)->ipv4.sysctl_tcp_rmem[1]; @@ -3211,7 +3224,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c sk_sockets_allocated_inc(sk); sk->sk_route_forced_caps = NETIF_F_GSO; } -@@ -466,7 +492,7 @@ +@@ -466,7 +493,7 @@ tcp_init_metrics(sk); tcp_call_bpf(sk, bpf_op, 0, NULL); tcp_init_congestion_control(sk); @@ -3220,7 +3233,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c } static void tcp_tx_timestamp(struct sock *sk, u16 tsflags) -@@ -786,6 +812,7 @@ +@@ -786,6 +813,7 @@ int ret; sock_rps_record_flow(sk); @@ -3228,7 +3241,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c /* * We can't seek on a socket input */ -@@ -796,6 +823,16 @@ +@@ -796,6 +824,16 @@ lock_sock(sk); @@ -3245,7 +3258,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c timeo = sock_rcvtimeo(sk, sock->file->f_flags & O_NONBLOCK); while (tss.len) { ret = __tcp_splice_read(sk, &tss); -@@ -899,8 +936,7 @@ +@@ -899,8 +937,7 @@ return NULL; } @@ -3255,7 +3268,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c { struct tcp_sock *tp = tcp_sk(sk); u32 new_size_goal, size_goal; -@@ -928,8 +964,13 @@ +@@ -928,8 +965,13 @@ { int mss_now; @@ -3271,7 +3284,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c return mss_now; } -@@ -964,12 +1005,34 @@ +@@ -964,12 +1006,34 @@ * is fully established. */ if (((1 << sk->sk_state) & ~(TCPF_ESTABLISHED | TCPF_CLOSE_WAIT)) && @@ -3307,7 +3320,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c sk_clear_bit(SOCKWQ_ASYNC_NOSPACE, sk); mss_now = tcp_send_mss(sk, &size_goal, flags); -@@ -1089,7 +1152,8 @@ +@@ -1088,7 +1152,8 @@ int tcp_sendpage_locked(struct sock *sk, struct page *page, int offset, size_t size, int flags) { @@ -3317,7 +3330,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c return sock_no_sendpage_locked(sk, page, offset, size, flags); tcp_rate_check_app_limited(sk); /* is sending application-limited? */ -@@ -1121,14 +1185,14 @@ +@@ -1120,14 +1185,14 @@ * This also speeds up tso_fragment(), since it wont fallback * to tcp_fragment(). */ @@ -3334,7 +3347,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c { if (zc) return 0; -@@ -1238,12 +1302,21 @@ +@@ -1237,12 +1302,21 @@ * is fully established. */ if (((1 << sk->sk_state) & ~(TCPF_ESTABLISHED | TCPF_CLOSE_WAIT)) && @@ -3357,7 +3370,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c if (unlikely(tp->repair)) { if (tp->repair_queue == TCP_RECV_QUEUE) { copied = tcp_send_rcvq(sk, msg, size); -@@ -1299,7 +1372,7 @@ +@@ -1298,7 +1372,7 @@ goto restart; } first_skb = tcp_rtx_and_write_queues_empty(sk); @@ -3366,7 +3379,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c skb = sk_stream_alloc_skb(sk, linear, sk->sk_allocation, first_skb); if (!skb) -@@ -1538,7 +1611,7 @@ +@@ -1536,7 +1610,7 @@ * calculation of whether or not we must ACK for the sake of * a window update. */ @@ -3375,7 +3388,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c { struct tcp_sock *tp = tcp_sk(sk); bool time_to_ack = false; -@@ -1581,7 +1654,7 @@ +@@ -1579,7 +1653,7 @@ /* Optimize, __tcp_select_window() is not cheap. */ if (2*rcv_window_now <= tp->window_clamp) { @@ -3384,7 +3397,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c /* Send ACK now, if this read freed lots of space * in our buffer. Certainly, new_window is new window. -@@ -1697,7 +1770,7 @@ +@@ -1695,7 +1769,7 @@ /* Clean up data we have read: This will do ACK frames. */ if (copied > 0) { tcp_recv_skb(sk, seq, &offset); @@ -3393,7 +3406,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c } return copied; } -@@ -1954,6 +2027,16 @@ +@@ -1952,6 +2026,16 @@ lock_sock(sk); @@ -3410,7 +3423,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c err = -ENOTCONN; if (sk->sk_state == TCP_LISTEN) goto out; -@@ -2072,7 +2155,7 @@ +@@ -2070,7 +2154,7 @@ } } @@ -3419,7 +3432,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c if (copied >= target) { /* Do not sleep, just process backlog. */ -@@ -2163,7 +2246,7 @@ +@@ -2161,7 +2245,7 @@ */ /* Clean up data we have read: This will do ACK frames. */ @@ -3428,7 +3441,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c release_sock(sk); -@@ -2275,7 +2358,7 @@ +@@ -2273,7 +2357,7 @@ [TCP_NEW_SYN_RECV] = TCP_CLOSE, /* should not happen ! */ }; @@ -3437,7 +3450,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c { int next = (int)new_state[sk->sk_state]; int ns = next & TCP_STATE_MASK; -@@ -2305,7 +2388,7 @@ +@@ -2303,7 +2387,7 @@ TCPF_SYN_RECV | TCPF_CLOSE_WAIT)) { /* Clear out any half completed packets. FIN if needed. */ if (tcp_close_state(sk)) @@ -3446,7 +3459,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c } } EXPORT_SYMBOL(tcp_shutdown); -@@ -2330,6 +2413,17 @@ +@@ -2328,6 +2412,17 @@ int data_was_unread = 0; int state; @@ -3464,7 +3477,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c lock_sock(sk); sk->sk_shutdown = SHUTDOWN_MASK; -@@ -2374,7 +2468,7 @@ +@@ -2372,7 +2467,7 @@ /* Unread data was tossed, zap the connection. */ NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPABORTONCLOSE); tcp_set_state(sk, TCP_CLOSE); @@ -3473,7 +3486,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c } else if (sock_flag(sk, SOCK_LINGER) && !sk->sk_lingertime) { /* Check zero linger _after_ checking for unread data. */ sk->sk_prot->disconnect(sk, 0); -@@ -2448,7 +2542,7 @@ +@@ -2446,7 +2541,7 @@ struct tcp_sock *tp = tcp_sk(sk); if (tp->linger2 < 0) { tcp_set_state(sk, TCP_CLOSE); @@ -3482,7 +3495,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c __NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPABORTONLINGER); } else { -@@ -2458,7 +2552,8 @@ +@@ -2456,7 +2551,8 @@ inet_csk_reset_keepalive_timer(sk, tmo - TCP_TIMEWAIT_LEN); } else { @@ -3492,7 +3505,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c goto out; } } -@@ -2467,7 +2562,7 @@ +@@ -2465,7 +2561,7 @@ sk_mem_reclaim(sk); if (tcp_check_oom(sk, 0)) { tcp_set_state(sk, TCP_CLOSE); @@ -3501,7 +3514,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c __NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPABORTONMEMORY); } else if (!check_net(sock_net(sk))) { -@@ -2496,15 +2591,6 @@ +@@ -2494,15 +2590,6 @@ } EXPORT_SYMBOL(tcp_close); @@ -3517,7 +3530,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c static void tcp_rtx_queue_purge(struct sock *sk) { struct rb_node *p = rb_first(&sk->tcp_rtx_queue); -@@ -2525,6 +2611,10 @@ +@@ -2523,6 +2610,10 @@ { struct sk_buff *skb; @@ -3528,7 +3541,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c tcp_chrono_stop(sk, TCP_CHRONO_BUSY); while ((skb = __skb_dequeue(&sk->sk_write_queue)) != NULL) { tcp_skb_tsorted_anchor_cleanup(skb); -@@ -2559,7 +2649,7 @@ +@@ -2557,7 +2648,7 @@ /* The last check adjusts for discrepancy of Linux wrt. RFC * states */ @@ -3537,7 +3550,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c sk->sk_err = ECONNRESET; } else if (old_state == TCP_SYN_SENT) sk->sk_err = ECONNRESET; -@@ -2577,6 +2667,13 @@ +@@ -2575,6 +2666,13 @@ if (!(sk->sk_userlocks & SOCK_BINDADDR_LOCK)) inet_reset_saddr(sk); @@ -3551,7 +3564,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c sk->sk_shutdown = 0; sock_reset_flag(sk, SOCK_DONE); tp->srtt_us = 0; -@@ -2631,7 +2728,7 @@ +@@ -2629,7 +2727,7 @@ static inline bool tcp_can_repair_sock(const struct sock *sk) { return ns_capable(sock_net(sk)->user_ns, CAP_NET_ADMIN) && @@ -3560,7 +3573,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c } static int tcp_repair_set_window(struct tcp_sock *tp, char __user *optbuf, int len) -@@ -2777,6 +2874,61 @@ +@@ -2775,6 +2873,61 @@ return tcp_fastopen_reset_cipher(net, sk, key, sizeof(key)); } @@ -3622,7 +3635,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c default: /* fallthru */ break; -@@ -2957,6 +3109,12 @@ +@@ -2955,6 +3108,12 @@ break; case TCP_DEFER_ACCEPT: @@ -3635,7 +3648,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c /* Translate value in seconds to number of retransmits */ icsk->icsk_accept_queue.rskq_defer_accept = secs_to_retrans(val, TCP_TIMEOUT_INIT / HZ, -@@ -2984,7 +3142,7 @@ +@@ -2982,7 +3141,7 @@ (TCPF_ESTABLISHED | TCPF_CLOSE_WAIT) && inet_csk_ack_scheduled(sk)) { icsk->icsk_ack.pending |= ICSK_ACK_PUSHED; @@ -3644,7 +3657,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c if (!(val & 1)) icsk->icsk_ack.pingpong = 1; } -@@ -2994,7 +3152,7 @@ +@@ -2992,7 +3151,7 @@ #ifdef CONFIG_TCP_MD5SIG case TCP_MD5SIG: case TCP_MD5SIG_EXT: @@ -3653,7 +3666,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c err = tp->af_specific->md5_parse(sk, optname, optval, optlen); else err = -EINVAL; -@@ -3053,6 +3211,32 @@ +@@ -3051,6 +3210,32 @@ tp->notsent_lowat = val; sk->sk_write_space(sk); break; @@ -3686,7 +3699,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c case TCP_INQ: if (val > 1 || val < 0) err = -EINVAL; -@@ -3112,7 +3296,7 @@ +@@ -3110,7 +3295,7 @@ } /* Return information about state of tcp endpoint in API format. */ @@ -3695,7 +3708,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c { const struct tcp_sock *tp = tcp_sk(sk); /* iff sk_type == SOCK_STREAM */ const struct inet_connection_sock *icsk = inet_csk(sk); -@@ -3149,7 +3333,8 @@ +@@ -3147,7 +3332,8 @@ return; } @@ -3705,7 +3718,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c info->tcpi_ca_state = icsk->icsk_ca_state; info->tcpi_retransmits = icsk->icsk_retransmits; -@@ -3223,7 +3408,9 @@ +@@ -3221,7 +3407,9 @@ info->tcpi_bytes_retrans = tp->bytes_retrans; info->tcpi_dsack_dups = tp->dsack_dups; info->tcpi_reord_seen = tp->reord_seen; @@ -3716,7 +3729,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c } EXPORT_SYMBOL_GPL(tcp_get_info); -@@ -3368,7 +3555,7 @@ +@@ -3366,7 +3554,7 @@ if (get_user(len, optlen)) return -EFAULT; @@ -3725,7 +3738,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c len = min_t(unsigned int, len, sizeof(info)); if (put_user(len, optlen)) -@@ -3559,6 +3746,87 @@ +@@ -3557,6 +3745,87 @@ } return 0; } @@ -3813,7 +3826,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c #ifdef CONFIG_MMU case TCP_ZEROCOPY_RECEIVE: { struct tcp_zerocopy_receive zc; -@@ -3752,7 +4020,9 @@ +@@ -3750,7 +4019,9 @@ if (sk->sk_state == TCP_SYN_SENT || sk->sk_state == TCP_SYN_RECV) TCP_INC_STATS(sock_net(sk), TCP_MIB_ATTEMPTFAILS); @@ -3823,7 +3836,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c tcp_clear_xmit_timers(sk); if (req) reqsk_fastopen_remove(sk, req, false); -@@ -3768,6 +4038,8 @@ +@@ -3766,6 +4037,8 @@ int tcp_abort(struct sock *sk, int err) { @@ -3832,7 +3845,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c if (!sk_fullsock(sk)) { if (sk->sk_state == TCP_NEW_SYN_RECV) { struct request_sock *req = inet_reqsk(sk); -@@ -3781,7 +4053,7 @@ +@@ -3779,7 +4052,7 @@ } /* Don't race with userspace socket closes such as tcp_close. */ @@ -3841,7 +3854,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c if (sk->sk_state == TCP_LISTEN) { tcp_set_state(sk, TCP_CLOSE); -@@ -3790,7 +4062,7 @@ +@@ -3788,7 +4061,7 @@ /* Don't race with BH socket closes such as inet_csk_listen_stop. */ local_bh_disable(); @@ -3850,7 +3863,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c if (!sock_flag(sk, SOCK_DEAD)) { sk->sk_err = err; -@@ -3798,14 +4070,14 @@ +@@ -3796,14 +4069,14 @@ smp_wmb(); sk->sk_error_report(sk); if (tcp_need_reset(sk->sk_state)) @@ -3868,9 +3881,34 @@ diff -aurN linux-4.19.80/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c return 0; } EXPORT_SYMBOL_GPL(tcp_abort); -diff -aurN linux-4.19.80/net/ipv4/tcp_diag.c mptcp-mptcp_v0.95/net/ipv4/tcp_diag.c ---- linux-4.19.80/net/ipv4/tcp_diag.c 2019-10-17 22:45:44.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/ipv4/tcp_diag.c 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/net/ipv4/tcp_cong.c mptcp-mptcp_v0.95/net/ipv4/tcp_cong.c +--- linux-4.19.98/net/ipv4/tcp_cong.c 2020-01-23 08:21:39.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/ipv4/tcp_cong.c 2020-01-23 21:52:06.000000000 +0100 +@@ -327,13 +327,19 @@ + return ret; + } + ++int tcp_set_congestion_control(struct sock *sk, const char *name, bool load, ++ bool reinit, bool cap_net_admin) ++{ ++ return tcp_sk(sk)->ops->set_cong_ctrl(sk, name, load, reinit, cap_net_admin); ++} ++ + /* Change congestion control for socket. If load is false, then it is the + * responsibility of the caller to call tcp_init_congestion_control or + * tcp_reinit_congestion_control (if the current congestion control was + * already initialized. + */ +-int tcp_set_congestion_control(struct sock *sk, const char *name, bool load, +- bool reinit, bool cap_net_admin) ++int __tcp_set_congestion_control(struct sock *sk, const char *name, bool load, ++ bool reinit, bool cap_net_admin) + { + struct inet_connection_sock *icsk = inet_csk(sk); + const struct tcp_congestion_ops *ca; +diff -aurN linux-4.19.98/net/ipv4/tcp_diag.c mptcp-mptcp_v0.95/net/ipv4/tcp_diag.c +--- linux-4.19.98/net/ipv4/tcp_diag.c 2020-01-23 08:21:39.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/ipv4/tcp_diag.c 2020-01-23 21:52:06.000000000 +0100 @@ -34,7 +34,7 @@ r->idiag_wqueue = tp->write_seq - tp->snd_una; } @@ -3880,9 +3918,9 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_diag.c mptcp-mptcp_v0.95/net/ipv4/tcp_diag } #ifdef CONFIG_TCP_MD5SIG -diff -aurN linux-4.19.80/net/ipv4/tcp_fastopen.c mptcp-mptcp_v0.95/net/ipv4/tcp_fastopen.c ---- linux-4.19.80/net/ipv4/tcp_fastopen.c 2019-10-17 22:45:44.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/ipv4/tcp_fastopen.c 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/net/ipv4/tcp_fastopen.c mptcp-mptcp_v0.95/net/ipv4/tcp_fastopen.c +--- linux-4.19.98/net/ipv4/tcp_fastopen.c 2020-01-23 08:21:39.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/ipv4/tcp_fastopen.c 2020-01-23 21:52:06.000000000 +0100 @@ -9,6 +9,7 @@ #include #include @@ -3932,9 +3970,9 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_fastopen.c mptcp-mptcp_v0.95/net/ipv4/tcp_ /* tcp_conn_request() is sending the SYNACK, * and queues the child into listener accept queue. */ -diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_input.c ---- linux-4.19.80/net/ipv4/tcp_input.c 2019-10-17 22:45:44.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/ipv4/tcp_input.c 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_input.c +--- linux-4.19.98/net/ipv4/tcp_input.c 2020-01-23 08:21:39.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/ipv4/tcp_input.c 2020-01-23 21:52:06.000000000 +0100 @@ -76,35 +76,15 @@ #include #include @@ -4040,7 +4078,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp inet_csk(sk)->icsk_ack.quick |= 1; } } -@@ -621,7 +618,10 @@ +@@ -600,7 +597,10 @@ tcp_mstamp_refresh(tp); time = tcp_stamp_us_delta(tp->tcp_mstamp, tp->rcvq_space.time); @@ -4052,7 +4090,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp return; /* Number of bytes copied to user in last RTT */ -@@ -840,7 +840,7 @@ +@@ -819,7 +819,7 @@ /* Calculate rto without backoff. This is the second half of Van Jacobson's * routine referred to above. */ @@ -4061,7 +4099,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp { const struct tcp_sock *tp = tcp_sk(sk); /* Old crap is replaced with new one. 8) -@@ -1411,6 +1411,13 @@ +@@ -1391,6 +1391,13 @@ int len; int in_sack; @@ -4075,7 +4113,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp /* Normally R but no L won't result in plain S */ if (!dup_sack && (TCP_SKB_CB(skb)->sacked & (TCPCB_LOST|TCPCB_SACKED_RETRANS)) == TCPCB_SACKED_RETRANS) -@@ -2959,7 +2966,7 @@ +@@ -2942,7 +2949,7 @@ */ tcp_update_rtt_min(sk, ca_rtt_us, flag); tcp_rtt_estimator(sk, seq_rtt_us); @@ -4084,7 +4122,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp /* RFC6298: only reset backoff on valid RTT measurement. */ inet_csk(sk)->icsk_backoff = 0; -@@ -3027,7 +3034,7 @@ +@@ -3010,7 +3017,7 @@ } /* If we get here, the whole TSO packet has not been acked. */ @@ -4093,7 +4131,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp { struct tcp_sock *tp = tcp_sk(sk); u32 packets_acked; -@@ -3153,6 +3160,8 @@ +@@ -3136,6 +3143,8 @@ */ if (likely(!(scb->tcp_flags & TCPHDR_SYN))) { flag |= FLAG_DATA_ACKED; @@ -4102,7 +4140,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp } else { flag |= FLAG_SYN_ACKED; tp->retrans_stamp = 0; -@@ -3271,7 +3280,7 @@ +@@ -3254,7 +3263,7 @@ return flag; } @@ -4111,7 +4149,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp { struct inet_connection_sock *icsk = inet_csk(sk); struct sk_buff *head = tcp_send_head(sk); -@@ -3343,9 +3352,8 @@ +@@ -3326,9 +3335,8 @@ /* Check that window update is acceptable. * The function assumes that snd_una<=ack<=snd_next. */ @@ -4123,7 +4161,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp { return after(ack, tp->snd_una) || after(ack_seq, tp->snd_wl1) || -@@ -3582,7 +3590,7 @@ +@@ -3565,7 +3573,7 @@ } /* This routine deals with incoming acks, but not outgoing ones. */ @@ -4132,7 +4170,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp { struct inet_connection_sock *icsk = inet_csk(sk); struct tcp_sock *tp = tcp_sk(sk); -@@ -3695,6 +3703,16 @@ +@@ -3678,6 +3686,16 @@ tcp_rack_update_reo_wnd(sk, &rs); @@ -4149,7 +4187,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp if (tp->tlp_high_seq) tcp_process_tlp_ack(sk, ack, flag); /* If needed, reset TLP/RTO timer; RACK may later override this. */ -@@ -3794,8 +3812,10 @@ +@@ -3777,8 +3795,10 @@ */ void tcp_parse_options(const struct net *net, const struct sk_buff *skb, @@ -4162,7 +4200,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp { const unsigned char *ptr; const struct tcphdr *th = tcp_hdr(skb); -@@ -3879,6 +3899,10 @@ +@@ -3862,6 +3882,10 @@ */ break; #endif @@ -4173,7 +4211,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp case TCPOPT_FASTOPEN: tcp_parse_fastopen_option( opsize - TCPOLEN_FASTOPEN_BASE, -@@ -3946,7 +3970,9 @@ +@@ -3929,7 +3953,9 @@ return true; } @@ -4184,7 +4222,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp if (tp->rx_opt.saw_tstamp && tp->rx_opt.rcv_tsecr) tp->rx_opt.rcv_tsecr -= tp->tsoffset; -@@ -4105,6 +4131,11 @@ +@@ -4088,6 +4114,11 @@ { struct tcp_sock *tp = tcp_sk(sk); @@ -4196,7 +4234,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp inet_csk_schedule_ack(sk); sk->sk_shutdown |= RCV_SHUTDOWN; -@@ -4115,6 +4146,10 @@ +@@ -4098,6 +4129,10 @@ case TCP_ESTABLISHED: /* Move to CLOSE_WAIT */ tcp_set_state(sk, TCP_CLOSE_WAIT); @@ -4207,7 +4245,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp inet_csk(sk)->icsk_ack.pingpong = 1; break; -@@ -4137,9 +4172,16 @@ +@@ -4120,9 +4155,16 @@ tcp_set_state(sk, TCP_CLOSING); break; case TCP_FIN_WAIT2: @@ -4225,7 +4263,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp break; default: /* Only TCP_LISTEN and TCP_CLOSE are left, in these -@@ -4161,6 +4203,10 @@ +@@ -4144,6 +4186,10 @@ if (!sock_flag(sk, SOCK_DEAD)) { sk->sk_state_change(sk); @@ -4236,7 +4274,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp /* Do not send POLL_HUP for half duplex close. */ if (sk->sk_shutdown == SHUTDOWN_MASK || sk->sk_state == TCP_CLOSE) -@@ -4363,6 +4409,9 @@ +@@ -4346,6 +4392,9 @@ *fragstolen = false; @@ -4246,7 +4284,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp /* Its possible this segment overlaps with prior segment in queue */ if (TCP_SKB_CB(from)->seq != TCP_SKB_CB(to)->end_seq) return false; -@@ -4417,7 +4466,7 @@ +@@ -4400,7 +4449,7 @@ /* This one checks to see if we can put data from the * out_of_order queue into the receive_queue. */ @@ -4255,7 +4293,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp { struct tcp_sock *tp = tcp_sk(sk); __u32 dsack_high = tp->rcv_nxt; -@@ -4440,7 +4489,14 @@ +@@ -4423,7 +4472,14 @@ p = rb_next(p); rb_erase(&skb->rbnode, &tp->out_of_order_queue); @@ -4271,7 +4309,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp SOCK_DEBUG(sk, "ofo packet was already received\n"); tcp_drop(sk, skb); continue; -@@ -4474,6 +4530,9 @@ +@@ -4457,6 +4513,9 @@ static int tcp_try_rmem_schedule(struct sock *sk, struct sk_buff *skb, unsigned int size) { @@ -4281,7 +4319,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp if (atomic_read(&sk->sk_rmem_alloc) > sk->sk_rcvbuf || !sk_rmem_schedule(sk, skb, size)) { -@@ -4488,7 +4547,7 @@ +@@ -4471,7 +4530,7 @@ return 0; } @@ -4290,7 +4328,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp { struct tcp_sock *tp = tcp_sk(sk); struct rb_node **p, *parent; -@@ -4556,7 +4615,8 @@ +@@ -4539,7 +4598,8 @@ continue; } if (before(seq, TCP_SKB_CB(skb1)->end_seq)) { @@ -4300,7 +4338,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp /* All the bits are present. Drop. */ NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPOFOMERGE); -@@ -4603,6 +4663,11 @@ +@@ -4586,6 +4646,11 @@ end_seq); break; } @@ -4312,7 +4350,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp rb_erase(&skb1->rbnode, &tp->out_of_order_queue); tcp_dsack_extend(sk, TCP_SKB_CB(skb1)->seq, TCP_SKB_CB(skb1)->end_seq); -@@ -4614,7 +4679,7 @@ +@@ -4597,7 +4662,7 @@ tp->ooo_last_skb = skb; add_sack: @@ -4321,7 +4359,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp tcp_sack_new_ofo_skb(sk, seq, end_seq); end: if (skb) { -@@ -4624,8 +4689,8 @@ +@@ -4607,8 +4672,8 @@ } } @@ -4332,7 +4370,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp { int eaten; struct sk_buff *tail = skb_peek_tail(&sk->sk_receive_queue); -@@ -4699,7 +4764,7 @@ +@@ -4682,7 +4747,7 @@ const struct tcp_sock *tp = tcp_sk(sk); int avail = tp->rcv_nxt - tp->copied_seq; @@ -4341,7 +4379,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp return; sk->sk_data_ready(sk); -@@ -4711,10 +4776,14 @@ +@@ -4694,10 +4759,14 @@ bool fragstolen; int eaten; @@ -4357,7 +4395,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp skb_dst_drop(skb); __skb_pull(skb, tcp_hdr(skb)->doff * 4); -@@ -4742,7 +4811,7 @@ +@@ -4725,7 +4794,7 @@ } eaten = tcp_queue_rcv(sk, skb, 0, &fragstolen); @@ -4366,7 +4404,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp tcp_event_data_recv(sk, skb); if (TCP_SKB_CB(skb)->tcp_flags & TCPHDR_FIN) tcp_fin(sk); -@@ -4764,7 +4833,11 @@ +@@ -4747,7 +4816,11 @@ if (eaten > 0) kfree_skb_partial(skb, fragstolen); @@ -4379,7 +4417,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp tcp_data_ready(sk); return; } -@@ -5112,7 +5185,7 @@ +@@ -5095,7 +5168,7 @@ return -1; } @@ -4388,7 +4426,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp { const struct tcp_sock *tp = tcp_sk(sk); -@@ -5147,7 +5220,7 @@ +@@ -5130,7 +5203,7 @@ { struct tcp_sock *tp = tcp_sk(sk); @@ -4397,7 +4435,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp tcp_sndbuf_expand(sk); tp->snd_cwnd_stamp = tcp_jiffies32; } -@@ -5161,10 +5234,11 @@ +@@ -5144,10 +5217,11 @@ sock_reset_flag(sk, SOCK_QUEUE_SHRUNK); /* pairs with tcp_poll() */ smp_mb(); @@ -4412,7 +4450,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp tcp_chrono_stop(sk, TCP_CHRONO_SNDBUF_LIMITED); } } -@@ -5183,6 +5257,8 @@ +@@ -5166,6 +5240,8 @@ { struct tcp_sock *tp = tcp_sk(sk); unsigned long rtt, delay; @@ -4421,7 +4459,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp /* More than one full frame received... */ if (((tp->rcv_nxt - tp->rcv_wup) > inet_csk(sk)->icsk_ack.rcv_mss && -@@ -5191,8 +5267,8 @@ +@@ -5174,8 +5250,8 @@ * If application uses SO_RCVLOWAT, we want send ack now if * we have not received enough bytes to satisfy the condition. */ @@ -4432,7 +4470,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp /* We ACK each frame or... */ tcp_in_quickack_mode(sk) || /* Protocol state mandates a one-time immediate ACK */ -@@ -5327,6 +5403,10 @@ +@@ -5310,6 +5386,10 @@ { struct tcp_sock *tp = tcp_sk(sk); @@ -4443,7 +4481,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp /* Check if we get a new urgent pointer - normally not. */ if (th->urg) tcp_check_urg(sk, th); -@@ -5469,9 +5549,15 @@ +@@ -5452,9 +5532,15 @@ goto discard; } @@ -4459,7 +4497,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp tcp_drop(sk, skb); return false; } -@@ -5528,6 +5614,10 @@ +@@ -5511,6 +5597,10 @@ tp->rx_opt.saw_tstamp = 0; @@ -4470,7 +4508,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp /* pred_flags is 0xS?10 << 16 + snd_wnd * if header_prediction is to be made * 'S' will always be tp->tcp_header_len >> 2 -@@ -5711,17 +5801,24 @@ +@@ -5694,17 +5784,24 @@ struct tcp_fastopen_cookie *cookie) { struct tcp_sock *tp = tcp_sk(sk); @@ -4497,7 +4535,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp mss = opt.mss_clamp; } -@@ -5745,7 +5842,11 @@ +@@ -5728,7 +5825,11 @@ tcp_fastopen_cache_set(sk, mss, cookie, syn_drop, try_exp); @@ -4510,7 +4548,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp skb_rbtree_walk_from(data) { if (__tcp_retransmit_skb(sk, data, 1)) break; -@@ -5785,9 +5886,13 @@ +@@ -5768,9 +5869,13 @@ struct tcp_sock *tp = tcp_sk(sk); struct tcp_fastopen_cookie foc = { .len = -1 }; int saved_clamp = tp->rx_opt.mss_clamp; @@ -4525,7 +4563,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp if (tp->rx_opt.saw_tstamp && tp->rx_opt.rcv_tsecr) tp->rx_opt.rcv_tsecr -= tp->tsoffset; -@@ -5847,6 +5952,35 @@ +@@ -5830,6 +5935,35 @@ tcp_init_wl(tp, TCP_SKB_CB(skb)->seq); tcp_ack(sk, skb, FLAG_SLOWPATH); @@ -4561,7 +4599,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp /* Ok.. it's good. Set up sequence numbers and * move to established. */ -@@ -5873,6 +6007,11 @@ +@@ -5856,6 +5990,11 @@ tp->tcp_header_len = sizeof(struct tcphdr); } @@ -4573,7 +4611,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp tcp_sync_mss(sk, icsk->icsk_pmtu_cookie); tcp_initialize_rcv_mss(sk); -@@ -5896,9 +6035,12 @@ +@@ -5879,9 +6018,12 @@ } if (fastopen_fail) return -1; @@ -4588,7 +4626,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp /* Save one ACK. Data will be ready after * several ticks, if write_pending is set. * -@@ -5937,6 +6079,7 @@ +@@ -5920,6 +6062,7 @@ tcp_paws_reject(&tp->rx_opt, 0)) goto discard_and_undo; @@ -4596,7 +4634,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp if (th->syn) { /* We see SYN without ACK. It is attempt of * simultaneous connect with crossed SYNs. -@@ -5953,6 +6096,11 @@ +@@ -5936,6 +6079,11 @@ tp->tcp_header_len = sizeof(struct tcphdr); } @@ -4605,10 +4643,10 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp + tp->advmss -= MPTCP_SUB_LEN_DSM_ALIGN; + } + - tp->rcv_nxt = TCP_SKB_CB(skb)->seq + 1; + WRITE_ONCE(tp->rcv_nxt, TCP_SKB_CB(skb)->seq + 1); tp->copied_seq = tp->rcv_nxt; tp->rcv_wup = TCP_SKB_CB(skb)->seq + 1; -@@ -6011,6 +6159,7 @@ +@@ -5994,6 +6142,7 @@ */ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb) @@ -4616,7 +4654,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp { struct tcp_sock *tp = tcp_sk(sk); struct inet_connection_sock *icsk = inet_csk(sk); -@@ -6053,6 +6202,16 @@ +@@ -6036,6 +6185,16 @@ tp->rx_opt.saw_tstamp = 0; tcp_mstamp_refresh(tp); queued = tcp_rcv_synsent_state_process(sk, skb, th); @@ -4633,7 +4671,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp if (queued >= 0) return queued; -@@ -6135,6 +6294,8 @@ +@@ -6118,6 +6277,8 @@ if (tp->rx_opt.tstamp_ok) tp->advmss -= TCPOLEN_TSTAMP_ALIGNED; @@ -4642,7 +4680,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp if (!inet_csk(sk)->icsk_ca_ops->cong_control) tcp_update_pacing_rate(sk); -@@ -6144,6 +6305,30 @@ +@@ -6127,6 +6288,30 @@ tcp_initialize_rcv_mss(sk); tcp_fast_path_on(tp); @@ -4673,7 +4711,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp break; case TCP_FIN_WAIT1: { -@@ -6191,7 +6376,8 @@ +@@ -6174,7 +6359,8 @@ tmo = tcp_fin_time(sk); if (tmo > TCP_TIMEWAIT_LEN) { inet_csk_reset_keepalive_timer(sk, tmo - TCP_TIMEWAIT_LEN); @@ -4683,7 +4721,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp /* Bad case. We could lose such FIN otherwise. * It is not a big problem, but it looks confusing * and not so rare event. We still can lose it now, -@@ -6200,7 +6386,7 @@ +@@ -6183,7 +6369,7 @@ */ inet_csk_reset_keepalive_timer(sk, tmo); } else { @@ -4692,7 +4730,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp goto discard; } break; -@@ -6208,7 +6394,7 @@ +@@ -6191,7 +6377,7 @@ case TCP_CLOSING: if (tp->snd_una == tp->write_seq) { @@ -4701,7 +4739,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp goto discard; } break; -@@ -6220,6 +6406,9 @@ +@@ -6203,6 +6389,9 @@ goto discard; } break; @@ -4711,7 +4749,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp } /* step 6: check the URG bit */ -@@ -6241,7 +6430,8 @@ +@@ -6224,7 +6413,8 @@ */ if (sk->sk_shutdown & RCV_SHUTDOWN) { if (TCP_SKB_CB(skb)->end_seq != TCP_SKB_CB(skb)->seq && @@ -4721,7 +4759,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPABORTONDATA); tcp_reset(sk); return 1; -@@ -6338,6 +6528,8 @@ +@@ -6321,6 +6511,8 @@ ireq->wscale_ok = rx_opt->wscale_ok; ireq->acked = 0; ireq->ecn_ok = 0; @@ -4730,7 +4768,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp ireq->ir_rmt_port = tcp_hdr(skb)->source; ireq->ir_num = ntohs(tcp_hdr(skb)->dest); ireq->ir_mark = inet_request_mark(sk, skb); -@@ -6435,12 +6627,17 @@ +@@ -6418,12 +6610,17 @@ /* TW buckets are converted to open requests without * limitations, they conserve resources and peer is * evidently real one. @@ -4749,7 +4787,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp } if (sk_acceptq_is_full(sk)) { -@@ -6458,8 +6655,8 @@ +@@ -6441,8 +6638,8 @@ tcp_clear_options(&tmp_opt); tmp_opt.mss_clamp = af_ops->mss_clamp; tmp_opt.user_mss = tp->rx_opt.user_mss; @@ -4760,7 +4798,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp if (want_cookie && !tmp_opt.saw_tstamp) tcp_clear_options(&tmp_opt); -@@ -6474,7 +6671,8 @@ +@@ -6457,7 +6654,8 @@ /* Note: tcp_v6_init_req() might override ir_iif for link locals */ inet_rsk(req)->ir_iif = inet_request_bound_dev_if(sk, skb); @@ -4770,7 +4808,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp if (security_inet_conn_request(sk, skb, req)) goto drop_and_free; -@@ -6510,7 +6708,7 @@ +@@ -6493,7 +6691,7 @@ tcp_ecn_create_request(req, skb, sk, dst); if (want_cookie) { @@ -4779,7 +4817,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp req->cookie_ts = tmp_opt.tstamp_ok; if (!tmp_opt.tstamp_ok) inet_rsk(req)->ecn_ok = 0; -@@ -6525,18 +6723,26 @@ +@@ -6508,18 +6706,26 @@ fastopen_sk = tcp_try_fastopen(sk, skb, req, &foc, dst); } if (fastopen_sk) { @@ -4807,9 +4845,9 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp sock_put(fastopen_sk); } else { tcp_rsk(req)->tfo_listener = false; -diff -aurN linux-4.19.80/net/ipv4/tcp_ipv4.c mptcp-mptcp_v0.95/net/ipv4/tcp_ipv4.c ---- linux-4.19.80/net/ipv4/tcp_ipv4.c 2019-10-17 22:45:44.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/ipv4/tcp_ipv4.c 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/net/ipv4/tcp_ipv4.c mptcp-mptcp_v0.95/net/ipv4/tcp_ipv4.c +--- linux-4.19.98/net/ipv4/tcp_ipv4.c 2020-01-23 08:21:39.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/ipv4/tcp_ipv4.c 2020-01-23 21:52:06.000000000 +0100 @@ -67,6 +67,8 @@ #include #include @@ -5246,7 +5284,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_ipv4.c mptcp-mptcp_v0.95/net/ipv4/tcp_ipv4 tcp_cleanup_ulp(sk); /* Cleanup up the write buffer. */ -@@ -2473,6 +2568,11 @@ +@@ -2475,6 +2570,11 @@ .sysctl_rmem_offset = offsetof(struct net, ipv4.sysctl_tcp_rmem), .max_header = MAX_TCP_HEADER, .obj_size = sizeof(struct tcp_sock), @@ -5258,7 +5296,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_ipv4.c mptcp-mptcp_v0.95/net/ipv4/tcp_ipv4 .slab_flags = SLAB_TYPESAFE_BY_RCU, .twsk_prot = &tcp_timewait_sock_ops, .rsk_prot = &tcp_request_sock_ops, -@@ -2483,6 +2583,9 @@ +@@ -2485,6 +2585,9 @@ .compat_getsockopt = compat_tcp_getsockopt, #endif .diag_destroy = tcp_abort, @@ -5268,9 +5306,9 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_ipv4.c mptcp-mptcp_v0.95/net/ipv4/tcp_ipv4 }; EXPORT_SYMBOL(tcp_prot); -diff -aurN linux-4.19.80/net/ipv4/tcp_minisocks.c mptcp-mptcp_v0.95/net/ipv4/tcp_minisocks.c ---- linux-4.19.80/net/ipv4/tcp_minisocks.c 2019-10-17 22:45:44.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/ipv4/tcp_minisocks.c 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/net/ipv4/tcp_minisocks.c mptcp-mptcp_v0.95/net/ipv4/tcp_minisocks.c +--- linux-4.19.98/net/ipv4/tcp_minisocks.c 2020-01-23 08:21:39.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/ipv4/tcp_minisocks.c 2020-01-23 21:52:06.000000000 +0100 @@ -18,11 +18,13 @@ * Jorge Cwik, */ @@ -5380,7 +5418,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_minisocks.c mptcp-mptcp_v0.95/net/ipv4/tcp &req->rsk_rcv_wnd, &req->rsk_window_clamp, ireq->wscale_ok, -@@ -474,6 +508,8 @@ +@@ -477,6 +511,8 @@ newtp->snd_sml = newtp->snd_una = newtp->snd_nxt = newtp->snd_up = treq->snt_isn + 1; @@ -5389,7 +5427,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_minisocks.c mptcp-mptcp_v0.95/net/ipv4/tcp INIT_LIST_HEAD(&newtp->tsq_node); INIT_LIST_HEAD(&newtp->tsorted_sent_queue); -@@ -544,6 +580,8 @@ +@@ -547,6 +583,8 @@ newtp->rx_opt.ts_recent_stamp = 0; newtp->tcp_header_len = sizeof(struct tcphdr); } @@ -5398,7 +5436,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_minisocks.c mptcp-mptcp_v0.95/net/ipv4/tcp newtp->tsoffset = treq->ts_off; #ifdef CONFIG_TCP_MD5SIG newtp->md5sig_info = NULL; /*XXX*/ -@@ -586,6 +624,7 @@ +@@ -589,6 +627,7 @@ bool fastopen, bool *req_stolen) { struct tcp_options_received tmp_opt; @@ -5406,7 +5444,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_minisocks.c mptcp-mptcp_v0.95/net/ipv4/tcp struct sock *child; const struct tcphdr *th = tcp_hdr(skb); __be32 flg = tcp_flag_word(th) & (TCP_FLAG_RST|TCP_FLAG_SYN|TCP_FLAG_ACK); -@@ -593,8 +632,11 @@ +@@ -596,8 +635,11 @@ bool own_req; tmp_opt.saw_tstamp = 0; @@ -5419,7 +5457,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_minisocks.c mptcp-mptcp_v0.95/net/ipv4/tcp if (tmp_opt.saw_tstamp) { tmp_opt.ts_recent = req->ts_recent; -@@ -635,7 +677,14 @@ +@@ -638,7 +680,14 @@ * * Reset timer after retransmitting SYNACK, similar to * the idea of fast retransmit in recovery. @@ -5434,7 +5472,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_minisocks.c mptcp-mptcp_v0.95/net/ipv4/tcp if (!tcp_oow_rate_limited(sock_net(sk), skb, LINUX_MIB_TCPACKSKIPPEDSYNRECV, &tcp_rsk(req)->last_oow_ack_time) && -@@ -788,6 +837,18 @@ +@@ -791,6 +840,18 @@ if (!child) goto listen_overflow; @@ -5453,7 +5491,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_minisocks.c mptcp-mptcp_v0.95/net/ipv4/tcp sock_rps_save_rxhash(child, skb); tcp_synack_rtt_meas(child, req); *req_stolen = !own_req; -@@ -836,12 +897,18 @@ +@@ -839,12 +900,18 @@ { int ret = 0; int state = child->sk_state; @@ -5473,7 +5511,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_minisocks.c mptcp-mptcp_v0.95/net/ipv4/tcp ret = tcp_rcv_state_process(child, skb); /* Wakeup parent, send SIGIO */ if (state == TCP_SYN_RECV && child->sk_state != state) -@@ -851,10 +918,14 @@ +@@ -854,10 +921,14 @@ * in main socket hash table and lock on listening * socket does not protect us more. */ @@ -5489,9 +5527,9 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_minisocks.c mptcp-mptcp_v0.95/net/ipv4/tcp sock_put(child); return ret; } -diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_output.c ---- linux-4.19.80/net/ipv4/tcp_output.c 2019-10-17 22:45:44.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/ipv4/tcp_output.c 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_output.c +--- linux-4.19.98/net/ipv4/tcp_output.c 2020-01-23 08:21:39.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/ipv4/tcp_output.c 2020-01-23 21:52:06.000000000 +0100 @@ -36,6 +36,12 @@ #define pr_fmt(fmt) "TCP: " fmt @@ -5518,7 +5556,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou { struct inet_connection_sock *icsk = inet_csk(sk); struct tcp_sock *tp = tcp_sk(sk); -@@ -256,12 +259,16 @@ +@@ -242,12 +245,16 @@ * value can be stuffed directly into th->window for an outgoing * frame. */ @@ -5538,7 +5576,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou /* Never shrink the offered window */ if (new_win < cur_win) { -@@ -277,6 +284,7 @@ +@@ -263,6 +270,7 @@ LINUX_MIB_TCPWANTZEROWINDOWADV); new_win = ALIGN(cur_win, 1 << tp->rx_opt.rcv_wscale); } @@ -5546,7 +5584,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou tp->rcv_wnd = new_win; tp->rcv_wup = tp->rcv_nxt; -@@ -389,7 +397,7 @@ +@@ -375,7 +383,7 @@ /* Constructs common control bits of non-data skb. If SYN/FIN is present, * auto increment end seqno. */ @@ -5555,7 +5593,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou { skb->ip_summed = CHECKSUM_PARTIAL; -@@ -404,7 +412,7 @@ +@@ -390,7 +398,7 @@ TCP_SKB_CB(skb)->end_seq = seq; } @@ -5564,7 +5602,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou { return tp->snd_una != tp->snd_up; } -@@ -415,6 +423,7 @@ +@@ -401,6 +409,7 @@ #define OPTION_WSCALE (1 << 3) #define OPTION_FAST_OPEN_COOKIE (1 << 8) #define OPTION_SMC (1 << 9) @@ -5572,7 +5610,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou static void smc_options_write(__be32 *ptr, u16 *options) { -@@ -431,17 +440,6 @@ +@@ -417,17 +426,6 @@ #endif } @@ -5590,7 +5628,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou /* Write previously computed TCP options to the packet. * * Beware: Something in the Internet is very sensitive to the ordering of -@@ -456,7 +454,7 @@ +@@ -442,7 +440,7 @@ * (but it may well be that other scenarios fail similarly). */ static void tcp_options_write(__be32 *ptr, struct tcp_sock *tp, @@ -5599,7 +5637,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou { u16 options = opts->options; /* mungable copy */ -@@ -550,6 +548,9 @@ +@@ -536,6 +534,9 @@ } smc_options_write(ptr, &options); @@ -5609,7 +5647,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou } static void smc_set_option(const struct tcp_sock *tp, -@@ -635,6 +636,8 @@ +@@ -621,6 +622,8 @@ if (unlikely(!(OPTION_TS & opts->options))) remaining -= TCPOLEN_SACKPERM_ALIGNED; } @@ -5618,7 +5656,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou if (fastopen && fastopen->cookie.len >= 0) { u32 need = fastopen->cookie.len; -@@ -716,6 +719,9 @@ +@@ -702,6 +705,9 @@ smc_set_option_cond(tcp_sk(sk), ireq, opts, &remaining); @@ -5628,7 +5666,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou return MAX_TCP_OPTION_SPACE - remaining; } -@@ -749,16 +755,22 @@ +@@ -735,6 +741,8 @@ opts->tsecr = tp->rx_opt.ts_recent; size += TCPOLEN_TSTAMP_ALIGNED; } @@ -5637,28 +5675,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou eff_sacks = tp->rx_opt.num_sacks + tp->rx_opt.dsack; if (unlikely(eff_sacks)) { -- const unsigned int remaining = MAX_TCP_OPTION_SPACE - size; -- opts->num_sack_blocks = -- min_t(unsigned int, eff_sacks, -- (remaining - TCPOLEN_SACK_BASE_ALIGNED) / -- TCPOLEN_SACK_PERBLOCK); -- size += TCPOLEN_SACK_BASE_ALIGNED + -- opts->num_sack_blocks * TCPOLEN_SACK_PERBLOCK; -+ const unsigned remaining = MAX_TCP_OPTION_SPACE - size; -+ if (remaining < TCPOLEN_SACK_BASE_ALIGNED) -+ opts->num_sack_blocks = 0; -+ else -+ opts->num_sack_blocks = -+ min_t(unsigned int, eff_sacks, -+ (remaining - TCPOLEN_SACK_BASE_ALIGNED) / -+ TCPOLEN_SACK_PERBLOCK); -+ if (opts->num_sack_blocks) -+ size += TCPOLEN_SACK_BASE_ALIGNED + -+ opts->num_sack_blocks * TCPOLEN_SACK_PERBLOCK; - } - - return size; -@@ -798,19 +810,31 @@ +@@ -785,19 +793,31 @@ tcp_xmit_retransmit_queue(sk); } @@ -5697,7 +5714,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou } /* * One tasklet per cpu tries to send more skbs. -@@ -847,7 +871,9 @@ +@@ -834,7 +854,9 @@ #define TCP_DEFERRED_ALL (TCPF_TSQ_DEFERRED | \ TCPF_WRITE_TIMER_DEFERRED | \ TCPF_DELACK_TIMER_DEFERRED | \ @@ -5708,7 +5725,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou /** * tcp_release_cb - tcp release_sock() callback * @sk: socket -@@ -870,6 +896,9 @@ +@@ -857,6 +879,9 @@ if (flags & TCPF_TSQ_DEFERRED) { tcp_tsq_write(sk); __sock_put(sk); @@ -5718,7 +5735,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou } /* Here begins the tricky part : * We are called from release_sock() with : -@@ -894,6 +923,13 @@ +@@ -881,6 +906,13 @@ inet_csk(sk)->icsk_af_ops->mtu_reduced(sk); __sock_put(sk); } @@ -5732,7 +5749,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou } EXPORT_SYMBOL(tcp_release_cb); -@@ -996,7 +1032,7 @@ +@@ -983,7 +1015,7 @@ sock_hold(sk); } @@ -5741,7 +5758,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou { skb->skb_mstamp = tp->tcp_mstamp; list_move_tail(&skb->tcp_tsorted_anchor, &tp->tsorted_sent_queue); -@@ -1108,10 +1144,10 @@ +@@ -1095,10 +1127,10 @@ } } @@ -5754,7 +5771,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou tcp_ecn_send(sk, skb, th, tcp_header_size); } else { /* RFC1323: The window in SYN & SYN/ACK segments -@@ -1169,8 +1205,8 @@ +@@ -1156,8 +1188,8 @@ return err; } @@ -5765,7 +5782,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou { return __tcp_transmit_skb(sk, skb, clone_it, gfp_mask, tcp_sk(sk)->rcv_nxt); -@@ -1181,7 +1217,7 @@ +@@ -1168,7 +1200,7 @@ * NOTE: probe0 timer is not checked, do not forget tcp_push_pending_frames, * otherwise socket can stall. */ @@ -5774,7 +5791,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou { struct tcp_sock *tp = tcp_sk(sk); -@@ -1194,7 +1230,7 @@ +@@ -1181,7 +1213,7 @@ } /* Initialize TSO segments for a packet. */ @@ -5783,7 +5800,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou { if (skb->len <= mss_now) { /* Avoid the costly divide in the normal -@@ -1211,7 +1247,7 @@ +@@ -1198,7 +1230,7 @@ /* Pcount in the middle of the write queue got changed, we need to do various * tweaks to fix counters */ @@ -5792,7 +5809,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou { struct tcp_sock *tp = tcp_sk(sk); -@@ -1379,7 +1415,7 @@ +@@ -1366,7 +1398,7 @@ /* This is similar to __pskb_pull_tail(). The difference is that pulled * data is not copied, but immediately discarded. */ @@ -5801,7 +5818,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou { struct skb_shared_info *shinfo; int i, k, eat; -@@ -1601,6 +1637,7 @@ +@@ -1588,6 +1620,7 @@ return mss_now; } @@ -5809,7 +5826,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou /* RFC2861, slow part. Adjust cwnd, after it was not full during one rto. * As additional protections, we do not touch cwnd in retransmission phases, -@@ -1624,7 +1661,7 @@ +@@ -1611,7 +1644,7 @@ tp->snd_cwnd_stamp = tcp_jiffies32; } @@ -5818,7 +5835,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou { const struct tcp_congestion_ops *ca_ops = inet_csk(sk)->icsk_ca_ops; struct tcp_sock *tp = tcp_sk(sk); -@@ -1682,8 +1719,8 @@ +@@ -1669,8 +1702,8 @@ * But we can avoid doing the divide again given we already have * skb_pcount = skb->len / mss_now */ @@ -5829,7 +5846,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou { if (skb->len < tcp_skb_pcount(skb) * mss_now) tp->snd_sml = TCP_SKB_CB(skb)->end_seq; -@@ -1742,11 +1779,11 @@ +@@ -1729,11 +1762,11 @@ } /* Returns the portion of skb which can be sent right away */ @@ -5846,7 +5863,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou { const struct tcp_sock *tp = tcp_sk(sk); u32 partial, needed, window, max_len; -@@ -1776,13 +1813,14 @@ +@@ -1763,13 +1796,14 @@ /* Can at least one segment of SKB be sent right now, according to the * congestion window rules? If so, return how many segments are allowed. */ @@ -5864,7 +5881,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou tcp_skb_pcount(skb) == 1) return 1; -@@ -1797,12 +1835,13 @@ +@@ -1784,12 +1818,13 @@ halfcwnd = max(cwnd >> 1, 1U); return min(halfcwnd, cwnd - in_flight); } @@ -5879,7 +5896,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou { int tso_segs = tcp_skb_pcount(skb); -@@ -1817,8 +1856,8 @@ +@@ -1804,8 +1839,8 @@ /* Return true if the Nagle test allows this packet to be * sent now. */ @@ -5890,7 +5907,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou { /* Nagle rule does not apply to frames, which sit in the middle of the * write_queue (they have no chances to get new data). -@@ -1830,7 +1869,8 @@ +@@ -1817,7 +1852,8 @@ return true; /* Don't use the nagle rule for urgent data (or for the final FIN). */ @@ -5900,7 +5917,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou return true; if (!tcp_nagle_check(skb->len < cur_mss, tp, nonagle)) -@@ -1840,9 +1880,8 @@ +@@ -1827,9 +1863,8 @@ } /* Does at least the first segment of SKB fit into the send window? */ @@ -5912,7 +5929,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou { u32 end_seq = TCP_SKB_CB(skb)->end_seq; -@@ -1851,6 +1890,7 @@ +@@ -1838,6 +1873,7 @@ return !after(end_seq, tcp_wnd_end(tp)); } @@ -5920,7 +5937,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou /* Trim TSO SKB to LEN bytes, put the remaining data into a new packet * which is put after SKB on the list. It is very much like -@@ -2003,7 +2043,7 @@ +@@ -1990,7 +2026,7 @@ } /* If this packet won't get more data, do not wait. */ @@ -5929,7 +5946,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou goto send_now; return true; -@@ -2307,7 +2347,7 @@ +@@ -2294,7 +2330,7 @@ * Returns true, if no segments are in flight and we have queued segments, * but cannot send anything now because of SWS or another problem. */ @@ -5938,7 +5955,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou int push_one, gfp_t gfp) { struct tcp_sock *tp = tcp_sk(sk); -@@ -2321,7 +2361,12 @@ +@@ -2308,7 +2344,12 @@ sent_pkts = 0; tcp_mstamp_refresh(tp); @@ -5952,7 +5969,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou /* Do MTU probing. */ result = tcp_mtu_probe(sk); if (!result) { -@@ -2418,7 +2463,8 @@ +@@ -2413,7 +2454,8 @@ if (push_one != 2) tcp_schedule_loss_probe(sk, false); is_cwnd_limited |= (tcp_packets_in_flight(tp) >= tp->snd_cwnd); @@ -5962,7 +5979,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou return false; } return !tp->packets_out && !tcp_write_queue_empty(sk); -@@ -2501,7 +2547,7 @@ +@@ -2496,7 +2538,7 @@ skb = tcp_send_head(sk); if (skb && tcp_snd_wnd_test(tp, skb, mss)) { pcount = tp->packets_out; @@ -5971,7 +5988,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou if (tp->packets_out > pcount) goto probe_sent; goto rearm_timer; -@@ -2565,8 +2611,8 @@ +@@ -2560,8 +2602,8 @@ if (unlikely(sk->sk_state == TCP_CLOSE)) return; @@ -5982,7 +5999,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou tcp_check_probe_timer(sk); } -@@ -2579,7 +2625,8 @@ +@@ -2574,7 +2616,8 @@ BUG_ON(!skb || skb->len < mss_now); @@ -5992,7 +6009,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou } /* This function returns the amount that we can raise the -@@ -2801,6 +2848,10 @@ +@@ -2796,6 +2839,10 @@ if (TCP_SKB_CB(skb)->tcp_flags & TCPHDR_SYN) return; @@ -6003,7 +6020,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou skb_rbtree_walk_from_safe(skb, tmp) { if (!tcp_can_collapse(sk, skb)) break; -@@ -3270,7 +3321,7 @@ +@@ -3265,7 +3312,7 @@ /* RFC1323: The window in SYN & SYN/ACK segments is never scaled. */ th->window = htons(min(req->rsk_rcv_wnd, 65535U)); @@ -6012,7 +6029,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou th->doff = (tcp_header_size >> 2); __TCP_INC_STATS(sock_net(sk), TCP_MIB_OUTSEGS); -@@ -3351,13 +3402,13 @@ +@@ -3346,13 +3393,13 @@ if (rcv_wnd == 0) rcv_wnd = dst_metric(dst, RTAX_INITRWND); @@ -6033,7 +6050,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou tp->rx_opt.rcv_wscale = rcv_wscale; tp->rcv_ssthresh = tp->rcv_wnd; -@@ -3382,6 +3433,36 @@ +@@ -3377,6 +3424,36 @@ inet_csk(sk)->icsk_rto = tcp_timeout_init(sk); inet_csk(sk)->icsk_retransmits = 0; tcp_clear_retrans(tp); @@ -6070,7 +6087,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou } static void tcp_connect_queue_skb(struct sock *sk, struct sk_buff *skb) -@@ -3644,6 +3725,7 @@ +@@ -3639,6 +3716,7 @@ { __tcp_send_ack(sk, tcp_sk(sk)->rcv_nxt); } @@ -6078,7 +6095,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou /* This routine sends a packet with an out of date sequence * number. It assumes the other end will try to ack it. -@@ -3656,7 +3738,7 @@ +@@ -3651,7 +3729,7 @@ * one is with SEG.SEQ=SND.UNA to deliver urgent pointer, another is * out-of-date with SND.UNA-1 to probe window. */ @@ -6087,7 +6104,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou { struct tcp_sock *tp = tcp_sk(sk); struct sk_buff *skb; -@@ -3743,7 +3825,7 @@ +@@ -3738,7 +3816,7 @@ unsigned long probe_max; int err; @@ -6096,9 +6113,9 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou if (tp->packets_out || tcp_write_queue_empty(sk)) { /* Cancel probe timer, if it is not required. */ -diff -aurN linux-4.19.80/net/ipv4/tcp_timer.c mptcp-mptcp_v0.95/net/ipv4/tcp_timer.c ---- linux-4.19.80/net/ipv4/tcp_timer.c 2019-10-17 22:45:44.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/ipv4/tcp_timer.c 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/net/ipv4/tcp_timer.c mptcp-mptcp_v0.95/net/ipv4/tcp_timer.c +--- linux-4.19.98/net/ipv4/tcp_timer.c 2020-01-23 08:21:39.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/ipv4/tcp_timer.c 2020-01-23 21:52:06.000000000 +0100 @@ -20,6 +20,7 @@ #include @@ -6192,13 +6209,10 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_timer.c mptcp-mptcp_v0.95/net/ipv4/tcp_tim sock_put(sk); } -@@ -379,7 +395,12 @@ - } +@@ -380,6 +396,10 @@ - if (icsk->icsk_probes_out > max_probes) { --abort: tcp_write_err(sk); -+abort: -+ tcp_write_err(sk); + if (icsk->icsk_probes_out >= max_probes) { + abort: tcp_write_err(sk); + if (is_meta_sk(sk) && + mptcp_in_infinite_mapping_weak(tp->mpcb)) { + mptcp_sub_force_close_all(tp->mpcb, NULL); @@ -6206,7 +6220,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_timer.c mptcp-mptcp_v0.95/net/ipv4/tcp_tim } else { /* Only send another probe if we didn't close things up. */ tcp_send_probe0(sk); -@@ -597,7 +618,7 @@ +@@ -595,7 +615,7 @@ break; case ICSK_TIME_RETRANS: icsk->icsk_pending = 0; @@ -6215,7 +6229,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_timer.c mptcp-mptcp_v0.95/net/ipv4/tcp_tim break; case ICSK_TIME_PROBE0: icsk->icsk_pending = 0; -@@ -614,16 +635,19 @@ +@@ -612,16 +632,19 @@ struct inet_connection_sock *icsk = from_timer(icsk, t, icsk_retransmit_timer); struct sock *sk = &icsk->icsk_inet.sk; @@ -6238,7 +6252,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_timer.c mptcp-mptcp_v0.95/net/ipv4/tcp_tim sock_put(sk); } -@@ -653,11 +677,12 @@ +@@ -651,11 +674,12 @@ struct sock *sk = from_timer(sk, t, sk_timer); struct inet_connection_sock *icsk = inet_csk(sk); struct tcp_sock *tp = tcp_sk(sk); @@ -6253,7 +6267,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_timer.c mptcp-mptcp_v0.95/net/ipv4/tcp_tim /* Try again later. */ inet_csk_reset_keepalive_timer (sk, HZ/20); goto out; -@@ -669,16 +694,31 @@ +@@ -667,16 +691,31 @@ } tcp_mstamp_refresh(tp); @@ -6287,7 +6301,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_timer.c mptcp-mptcp_v0.95/net/ipv4/tcp_tim goto death; } -@@ -703,11 +743,11 @@ +@@ -701,11 +740,11 @@ icsk->icsk_probes_out > 0) || (icsk->icsk_user_timeout == 0 && icsk->icsk_probes_out >= keepalive_probes(tp))) { @@ -6301,7 +6315,7 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_timer.c mptcp-mptcp_v0.95/net/ipv4/tcp_tim icsk->icsk_probes_out++; elapsed = keepalive_intvl_when(tp); } else { -@@ -731,7 +771,7 @@ +@@ -729,7 +768,7 @@ tcp_done(sk); out: @@ -6310,9 +6324,9 @@ diff -aurN linux-4.19.80/net/ipv4/tcp_timer.c mptcp-mptcp_v0.95/net/ipv4/tcp_tim sock_put(sk); } -diff -aurN linux-4.19.80/net/ipv6/addrconf.c mptcp-mptcp_v0.95/net/ipv6/addrconf.c ---- linux-4.19.80/net/ipv6/addrconf.c 2019-10-17 22:45:44.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/ipv6/addrconf.c 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/net/ipv6/addrconf.c mptcp-mptcp_v0.95/net/ipv6/addrconf.c +--- linux-4.19.98/net/ipv6/addrconf.c 2020-01-23 08:21:39.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/ipv6/addrconf.c 2020-01-23 21:52:06.000000000 +0100 @@ -917,6 +917,7 @@ kfree_rcu(ifp, rcu); @@ -6321,9 +6335,9 @@ diff -aurN linux-4.19.80/net/ipv6/addrconf.c mptcp-mptcp_v0.95/net/ipv6/addrconf static void ipv6_link_dev_addr(struct inet6_dev *idev, struct inet6_ifaddr *ifp) -diff -aurN linux-4.19.80/net/ipv6/af_inet6.c mptcp-mptcp_v0.95/net/ipv6/af_inet6.c ---- linux-4.19.80/net/ipv6/af_inet6.c 2019-10-17 22:45:44.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/ipv6/af_inet6.c 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/net/ipv6/af_inet6.c mptcp-mptcp_v0.95/net/ipv6/af_inet6.c +--- linux-4.19.98/net/ipv6/af_inet6.c 2020-01-23 08:21:39.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/ipv6/af_inet6.c 2020-01-23 21:52:06.000000000 +0100 @@ -107,8 +107,7 @@ return (struct ipv6_pinfo *)(((u8 *)sk) + offset); } @@ -6334,9 +6348,9 @@ diff -aurN linux-4.19.80/net/ipv6/af_inet6.c mptcp-mptcp_v0.95/net/ipv6/af_inet6 { struct inet_sock *inet; struct ipv6_pinfo *np; -diff -aurN linux-4.19.80/net/ipv6/ipv6_sockglue.c mptcp-mptcp_v0.95/net/ipv6/ipv6_sockglue.c ---- linux-4.19.80/net/ipv6/ipv6_sockglue.c 2019-10-17 22:45:44.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/ipv6/ipv6_sockglue.c 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/net/ipv6/ipv6_sockglue.c mptcp-mptcp_v0.95/net/ipv6/ipv6_sockglue.c +--- linux-4.19.98/net/ipv6/ipv6_sockglue.c 2020-01-23 08:21:39.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/ipv6/ipv6_sockglue.c 2020-01-23 21:52:06.000000000 +0100 @@ -48,6 +48,8 @@ #include #include @@ -6360,9 +6374,9 @@ diff -aurN linux-4.19.80/net/ipv6/ipv6_sockglue.c mptcp-mptcp_v0.95/net/ipv6/ipv sk->sk_socket->ops = &inet_stream_ops; sk->sk_family = PF_INET; tcp_sync_mss(sk, icsk->icsk_pmtu_cookie); -diff -aurN linux-4.19.80/net/ipv6/syncookies.c mptcp-mptcp_v0.95/net/ipv6/syncookies.c ---- linux-4.19.80/net/ipv6/syncookies.c 2019-10-17 22:45:44.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/ipv6/syncookies.c 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/net/ipv6/syncookies.c mptcp-mptcp_v0.95/net/ipv6/syncookies.c +--- linux-4.19.98/net/ipv6/syncookies.c 2020-01-23 08:21:39.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/ipv6/syncookies.c 2020-01-23 21:52:06.000000000 +0100 @@ -20,6 +20,8 @@ #include #include @@ -6444,9 +6458,9 @@ diff -aurN linux-4.19.80/net/ipv6/syncookies.c mptcp-mptcp_v0.95/net/ipv6/syncoo ireq->rcv_wscale = rcv_wscale; ireq->ecn_ok = cookie_ecn_ok(&tcp_opt, sock_net(sk), dst); -diff -aurN linux-4.19.80/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.95/net/ipv6/tcp_ipv6.c ---- linux-4.19.80/net/ipv6/tcp_ipv6.c 2019-10-17 22:45:44.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/ipv6/tcp_ipv6.c 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.95/net/ipv6/tcp_ipv6.c +--- linux-4.19.98/net/ipv6/tcp_ipv6.c 2020-01-23 08:21:39.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/ipv6/tcp_ipv6.c 2020-01-23 21:52:06.000000000 +0100 @@ -61,6 +61,8 @@ #include #include @@ -6629,9 +6643,9 @@ diff -aurN linux-4.19.80/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.95/net/ipv6/tcp_ipv6 + struct sk_buff *skb, + bool want_cookie) { + bool l3_slave = ipv6_l3mdev_skb(TCP_SKB_CB(skb)->header.h6.flags); struct inet_request_sock *ireq = inet_rsk(req); - const struct ipv6_pinfo *np = inet6_sk(sk_listener); -@@ -753,6 +765,8 @@ +@@ -754,6 +766,8 @@ refcount_inc(&skb->users); ireq->pktopts = skb; } @@ -6640,7 +6654,7 @@ diff -aurN linux-4.19.80/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.95/net/ipv6/tcp_ipv6 } static struct dst_entry *tcp_v6_route_req(const struct sock *sk, -@@ -772,7 +786,7 @@ +@@ -773,7 +787,7 @@ .syn_ack_timeout = tcp_syn_ack_timeout, }; @@ -6649,7 +6663,7 @@ diff -aurN linux-4.19.80/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.95/net/ipv6/tcp_ipv6 .mss_clamp = IPV6_MIN_MTU - sizeof(struct tcphdr) - sizeof(struct ipv6hdr), #ifdef CONFIG_TCP_MD5SIG -@@ -790,9 +804,9 @@ +@@ -791,9 +805,9 @@ }; static void tcp_v6_send_response(const struct sock *sk, struct sk_buff *skb, u32 seq, @@ -6661,7 +6675,7 @@ diff -aurN linux-4.19.80/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.95/net/ipv6/tcp_ipv6 { const struct tcphdr *th = tcp_hdr(skb); struct tcphdr *t1; -@@ -811,7 +825,10 @@ +@@ -812,7 +826,10 @@ if (key) tot_len += TCPOLEN_MD5SIG_ALIGNED; #endif @@ -6673,7 +6687,7 @@ diff -aurN linux-4.19.80/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.95/net/ipv6/tcp_ipv6 buff = alloc_skb(MAX_HEADER + sizeof(struct ipv6hdr) + tot_len, GFP_ATOMIC); if (!buff) -@@ -849,6 +866,17 @@ +@@ -850,6 +867,17 @@ tcp_v6_md5_hash_hdr((__u8 *)topt, key, &ipv6_hdr(skb)->saddr, &ipv6_hdr(skb)->daddr, t1); @@ -6691,7 +6705,7 @@ diff -aurN linux-4.19.80/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.95/net/ipv6/tcp_ipv6 } #endif -@@ -898,7 +926,7 @@ +@@ -899,7 +927,7 @@ kfree_skb(buff); } @@ -6700,7 +6714,7 @@ diff -aurN linux-4.19.80/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.95/net/ipv6/tcp_ipv6 { const struct tcphdr *th = tcp_hdr(skb); u32 seq = 0, ack_seq = 0; -@@ -966,7 +994,7 @@ +@@ -967,7 +995,7 @@ trace_tcp_send_reset(sk, skb); } @@ -6709,7 +6723,7 @@ diff -aurN linux-4.19.80/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.95/net/ipv6/tcp_ipv6 #ifdef CONFIG_TCP_MD5SIG out: -@@ -975,30 +1003,37 @@ +@@ -976,30 +1004,37 @@ } static void tcp_v6_send_ack(const struct sock *sk, struct sk_buff *skb, u32 seq, @@ -6754,7 +6768,7 @@ diff -aurN linux-4.19.80/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.95/net/ipv6/tcp_ipv6 { /* sk->sk_state == TCP_LISTEN -> for regular TCP_SYN_RECV * sk->sk_state == TCP_SYN_RECV -> for Fast Open. -@@ -1008,18 +1043,18 @@ +@@ -1009,18 +1044,18 @@ * exception of segments, MUST be right-shifted by * Rcv.Wind.Shift bits: */ @@ -6777,7 +6791,7 @@ diff -aurN linux-4.19.80/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.95/net/ipv6/tcp_ipv6 { #ifdef CONFIG_SYN_COOKIES const struct tcphdr *th = tcp_hdr(skb); -@@ -1030,7 +1065,7 @@ +@@ -1031,7 +1066,7 @@ return sk; } @@ -6786,7 +6800,7 @@ diff -aurN linux-4.19.80/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.95/net/ipv6/tcp_ipv6 { if (skb->protocol == htons(ETH_P_IP)) return tcp_v4_conn_request(sk, skb); -@@ -1056,11 +1091,11 @@ +@@ -1057,11 +1092,11 @@ sizeof(struct inet6_skb_parm)); } @@ -6803,7 +6817,7 @@ diff -aurN linux-4.19.80/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.95/net/ipv6/tcp_ipv6 { struct inet_request_sock *ireq; struct ipv6_pinfo *newnp; -@@ -1097,7 +1132,15 @@ +@@ -1098,7 +1133,15 @@ newnp->saddr = newsk->sk_v6_rcv_saddr; @@ -6820,7 +6834,7 @@ diff -aurN linux-4.19.80/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.95/net/ipv6/tcp_ipv6 newsk->sk_backlog_rcv = tcp_v4_do_rcv; #ifdef CONFIG_TCP_MD5SIG newtp->af_specific = &tcp_sock_ipv6_mapped_specific; -@@ -1144,6 +1187,14 @@ +@@ -1145,6 +1188,14 @@ if (!newsk) goto out_nonewsk; @@ -6835,7 +6849,7 @@ diff -aurN linux-4.19.80/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.95/net/ipv6/tcp_ipv6 /* * No need to charge this sock to the relevant IPv6 refcnt debug socks * count here, tcp_create_openreq_child now does this for us, see the -@@ -1272,7 +1323,7 @@ +@@ -1273,7 +1324,7 @@ * This is because we cannot sleep with the original spinlock * held. */ @@ -6844,7 +6858,7 @@ diff -aurN linux-4.19.80/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.95/net/ipv6/tcp_ipv6 { struct ipv6_pinfo *np = inet6_sk(sk); struct tcp_sock *tp; -@@ -1289,6 +1340,9 @@ +@@ -1290,6 +1341,9 @@ if (skb->protocol == htons(ETH_P_IP)) return tcp_v4_do_rcv(sk, skb); @@ -6854,7 +6868,7 @@ diff -aurN linux-4.19.80/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.95/net/ipv6/tcp_ipv6 /* * socket locking is here for SMP purposes as backlog rcv * is currently called with bh processing disabled. -@@ -1416,6 +1470,10 @@ +@@ -1417,6 +1471,10 @@ TCP_SKB_CB(skb)->end_seq = (TCP_SKB_CB(skb)->seq + th->syn + th->fin + skb->len - th->doff*4); TCP_SKB_CB(skb)->ack_seq = ntohl(th->ack_seq); @@ -6865,7 +6879,7 @@ diff -aurN linux-4.19.80/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.95/net/ipv6/tcp_ipv6 TCP_SKB_CB(skb)->tcp_flags = tcp_flag_byte(th); TCP_SKB_CB(skb)->tcp_tw_isn = 0; TCP_SKB_CB(skb)->ip_dsfield = ipv6_get_dsfield(hdr); -@@ -1429,8 +1487,8 @@ +@@ -1430,8 +1488,8 @@ int sdif = inet6_sdif(skb); const struct tcphdr *th; const struct ipv6hdr *hdr; @@ -6875,7 +6889,7 @@ diff -aurN linux-4.19.80/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.95/net/ipv6/tcp_ipv6 int ret; struct net *net = dev_net(skb->dev); -@@ -1484,12 +1542,17 @@ +@@ -1485,12 +1543,17 @@ reqsk_put(req); goto csum_error; } @@ -6894,7 +6908,7 @@ diff -aurN linux-4.19.80/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.95/net/ipv6/tcp_ipv6 nsk = NULL; if (!tcp_filter(sk, skb)) { th = (const struct tcphdr *)skb->data; -@@ -1522,6 +1585,7 @@ +@@ -1523,6 +1586,7 @@ return 0; } } @@ -6902,7 +6916,7 @@ diff -aurN linux-4.19.80/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.95/net/ipv6/tcp_ipv6 if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) { __NET_INC_STATS(net, LINUX_MIB_TCPMINTTLDROP); goto discard_and_relse; -@@ -1548,15 +1612,25 @@ +@@ -1549,15 +1613,25 @@ sk_incoming_cpu_update(sk); @@ -6932,7 +6946,7 @@ diff -aurN linux-4.19.80/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.95/net/ipv6/tcp_ipv6 put_and_return: if (refcounted) -@@ -1569,6 +1643,19 @@ +@@ -1570,6 +1644,19 @@ tcp_v6_fill_cb(skb, hdr, th); @@ -6952,7 +6966,7 @@ diff -aurN linux-4.19.80/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.95/net/ipv6/tcp_ipv6 if (tcp_checksum_complete(skb)) { csum_error: __TCP_INC_STATS(net, TCP_MIB_CSUMERRORS); -@@ -1621,6 +1708,18 @@ +@@ -1622,6 +1709,18 @@ refcounted = false; goto process; } @@ -6971,7 +6985,7 @@ diff -aurN linux-4.19.80/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.95/net/ipv6/tcp_ipv6 } /* to ACK */ /* fall through */ -@@ -1675,13 +1774,13 @@ +@@ -1676,13 +1775,13 @@ } } @@ -6987,7 +7001,7 @@ diff -aurN linux-4.19.80/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.95/net/ipv6/tcp_ipv6 .queue_xmit = inet6_csk_xmit, .send_check = tcp_v6_send_check, .rebuild_header = inet6_sk_rebuild_header, -@@ -1712,7 +1811,7 @@ +@@ -1713,7 +1812,7 @@ /* * TCP over IPv4 via INET6 API */ @@ -6996,7 +7010,7 @@ diff -aurN linux-4.19.80/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.95/net/ipv6/tcp_ipv6 .queue_xmit = ip_queue_xmit, .send_check = tcp_v4_send_check, .rebuild_header = inet_sk_rebuild_header, -@@ -1748,7 +1847,12 @@ +@@ -1749,7 +1848,12 @@ tcp_init_sock(sk); @@ -7010,7 +7024,7 @@ diff -aurN linux-4.19.80/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.95/net/ipv6/tcp_ipv6 #ifdef CONFIG_TCP_MD5SIG tcp_sk(sk)->af_specific = &tcp_sock_ipv6_specific; -@@ -1757,7 +1861,7 @@ +@@ -1758,7 +1862,7 @@ return 0; } @@ -7019,7 +7033,7 @@ diff -aurN linux-4.19.80/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.95/net/ipv6/tcp_ipv6 { tcp_v4_destroy_sock(sk); inet6_destroy_sock(sk); -@@ -1979,6 +2083,11 @@ +@@ -1981,6 +2085,11 @@ .sysctl_rmem_offset = offsetof(struct net, ipv4.sysctl_tcp_rmem), .max_header = MAX_TCP_HEADER, .obj_size = sizeof(struct tcp6_sock), @@ -7031,7 +7045,7 @@ diff -aurN linux-4.19.80/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.95/net/ipv6/tcp_ipv6 .slab_flags = SLAB_TYPESAFE_BY_RCU, .twsk_prot = &tcp6_timewait_sock_ops, .rsk_prot = &tcp6_request_sock_ops, -@@ -1989,6 +2098,9 @@ +@@ -1991,6 +2100,9 @@ .compat_getsockopt = compat_tcp_getsockopt, #endif .diag_destroy = tcp_abort, @@ -7041,9 +7055,9 @@ diff -aurN linux-4.19.80/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.95/net/ipv6/tcp_ipv6 }; /* thinking of making this const? Don't. -diff -aurN linux-4.19.80/net/Kconfig mptcp-mptcp_v0.95/net/Kconfig ---- linux-4.19.80/net/Kconfig 2019-10-17 22:45:44.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/Kconfig 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/net/Kconfig mptcp-mptcp_v0.95/net/Kconfig +--- linux-4.19.98/net/Kconfig 2020-01-23 08:21:39.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/Kconfig 2020-01-23 21:52:06.000000000 +0100 @@ -89,6 +89,7 @@ source "net/ipv4/Kconfig" source "net/ipv6/Kconfig" @@ -7052,9 +7066,9 @@ diff -aurN linux-4.19.80/net/Kconfig mptcp-mptcp_v0.95/net/Kconfig endif # if INET -diff -aurN linux-4.19.80/net/Makefile mptcp-mptcp_v0.95/net/Makefile ---- linux-4.19.80/net/Makefile 2019-10-17 22:45:44.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/Makefile 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/net/Makefile mptcp-mptcp_v0.95/net/Makefile +--- linux-4.19.98/net/Makefile 2020-01-23 08:21:39.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/Makefile 2020-01-23 21:52:06.000000000 +0100 @@ -20,6 +20,7 @@ obj-$(CONFIG_XFRM) += xfrm/ obj-$(CONFIG_UNIX) += unix/ @@ -7063,9 +7077,9 @@ diff -aurN linux-4.19.80/net/Makefile mptcp-mptcp_v0.95/net/Makefile obj-$(CONFIG_BPFILTER) += bpfilter/ obj-$(CONFIG_PACKET) += packet/ obj-$(CONFIG_NET_KEY) += key/ -diff -aurN linux-4.19.80/net/mptcp/Kconfig mptcp-mptcp_v0.95/net/mptcp/Kconfig ---- linux-4.19.80/net/mptcp/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/net/mptcp/Kconfig 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/net/mptcp/Kconfig mptcp-mptcp_v0.95/net/mptcp/Kconfig +--- linux-4.19.98/net/mptcp/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/mptcp/Kconfig 2020-01-23 21:52:06.000000000 +0100 @@ -0,0 +1,146 @@ +# +# MPTCP configuration @@ -7213,9 +7227,9 @@ diff -aurN linux-4.19.80/net/mptcp/Kconfig mptcp-mptcp_v0.95/net/mptcp/Kconfig + default "redundant" if DEFAULT_REDUNDANT + default "default" + -diff -aurN linux-4.19.80/net/mptcp/Makefile mptcp-mptcp_v0.95/net/mptcp/Makefile ---- linux-4.19.80/net/mptcp/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/net/mptcp/Makefile 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/net/mptcp/Makefile mptcp-mptcp_v0.95/net/mptcp/Makefile +--- linux-4.19.98/net/mptcp/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/mptcp/Makefile 2020-01-23 21:52:06.000000000 +0100 @@ -0,0 +1,24 @@ +# +## Makefile for MultiPath TCP support code. @@ -7241,9 +7255,9 @@ diff -aurN linux-4.19.80/net/mptcp/Makefile mptcp-mptcp_v0.95/net/mptcp/Makefile +obj-$(CONFIG_MPTCP_BLEST) += mptcp_blest.o + +mptcp-$(subst m,y,$(CONFIG_IPV6)) += mptcp_ipv6.o -diff -aurN linux-4.19.80/net/mptcp/mctcp_desync.c mptcp-mptcp_v0.95/net/mptcp/mctcp_desync.c ---- linux-4.19.80/net/mptcp/mctcp_desync.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/net/mptcp/mctcp_desync.c 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/net/mptcp/mctcp_desync.c mptcp-mptcp_v0.95/net/mptcp/mctcp_desync.c +--- linux-4.19.98/net/mptcp/mctcp_desync.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/mptcp/mctcp_desync.c 2020-01-23 21:52:06.000000000 +0100 @@ -0,0 +1,193 @@ +/* + * Desynchronized Multi-Channel TCP Congestion Control Algorithm @@ -7438,9 +7452,9 @@ diff -aurN linux-4.19.80/net/mptcp/mctcp_desync.c mptcp-mptcp_v0.95/net/mptcp/mc +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("MCTCP: DESYNCHRONIZED MULTICHANNEL TCP CONGESTION CONTROL"); +MODULE_VERSION("1.0"); -diff -aurN linux-4.19.80/net/mptcp/mptcp_balia.c mptcp-mptcp_v0.95/net/mptcp/mptcp_balia.c ---- linux-4.19.80/net/mptcp/mptcp_balia.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_balia.c 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/net/mptcp/mptcp_balia.c mptcp-mptcp_v0.95/net/mptcp/mptcp_balia.c +--- linux-4.19.98/net/mptcp/mptcp_balia.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/mptcp/mptcp_balia.c 2020-01-23 21:52:06.000000000 +0100 @@ -0,0 +1,261 @@ +/* + * MPTCP implementation - Balia Congestion Control @@ -7703,9 +7717,9 @@ diff -aurN linux-4.19.80/net/mptcp/mptcp_balia.c mptcp-mptcp_v0.95/net/mptcp/mpt +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("MPTCP BALIA CONGESTION CONTROL ALGORITHM"); +MODULE_VERSION("0.1"); -diff -aurN linux-4.19.80/net/mptcp/mptcp_binder.c mptcp-mptcp_v0.95/net/mptcp/mptcp_binder.c ---- linux-4.19.80/net/mptcp/mptcp_binder.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_binder.c 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/net/mptcp/mptcp_binder.c mptcp-mptcp_v0.95/net/mptcp/mptcp_binder.c +--- linux-4.19.98/net/mptcp/mptcp_binder.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/mptcp/mptcp_binder.c 2020-01-23 21:52:06.000000000 +0100 @@ -0,0 +1,494 @@ +#include + @@ -8201,9 +8215,9 @@ diff -aurN linux-4.19.80/net/mptcp/mptcp_binder.c mptcp-mptcp_v0.95/net/mptcp/mp +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("BINDER MPTCP"); +MODULE_VERSION("0.1"); -diff -aurN linux-4.19.80/net/mptcp/mptcp_blest.c mptcp-mptcp_v0.95/net/mptcp/mptcp_blest.c ---- linux-4.19.80/net/mptcp/mptcp_blest.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_blest.c 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/net/mptcp/mptcp_blest.c mptcp-mptcp_v0.95/net/mptcp/mptcp_blest.c +--- linux-4.19.98/net/mptcp/mptcp_blest.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/mptcp/mptcp_blest.c 2020-01-23 21:52:06.000000000 +0100 @@ -0,0 +1,481 @@ +// SPDX-License-Identifier: GPL-2.0 +/* MPTCP Scheduler to reduce HoL-blocking and spurious retransmissions. @@ -8686,9 +8700,9 @@ diff -aurN linux-4.19.80/net/mptcp/mptcp_blest.c mptcp-mptcp_v0.95/net/mptcp/mpt +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("BLEST scheduler for MPTCP, based on default minimum RTT scheduler"); +MODULE_VERSION("0.95"); -diff -aurN linux-4.19.80/net/mptcp/mptcp_coupled.c mptcp-mptcp_v0.95/net/mptcp/mptcp_coupled.c ---- linux-4.19.80/net/mptcp/mptcp_coupled.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_coupled.c 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/net/mptcp/mptcp_coupled.c mptcp-mptcp_v0.95/net/mptcp/mptcp_coupled.c +--- linux-4.19.98/net/mptcp/mptcp_coupled.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/mptcp/mptcp_coupled.c 2020-01-23 21:52:06.000000000 +0100 @@ -0,0 +1,262 @@ +/* + * MPTCP implementation - Linked Increase congestion control Algorithm (LIA) @@ -8952,10 +8966,10 @@ diff -aurN linux-4.19.80/net/mptcp/mptcp_coupled.c mptcp-mptcp_v0.95/net/mptcp/m +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("MPTCP LINKED INCREASE CONGESTION CONTROL ALGORITHM"); +MODULE_VERSION("0.1"); -diff -aurN linux-4.19.80/net/mptcp/mptcp_ctrl.c mptcp-mptcp_v0.95/net/mptcp/mptcp_ctrl.c ---- linux-4.19.80/net/mptcp/mptcp_ctrl.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_ctrl.c 2019-11-20 10:07:30.000000000 +0100 -@@ -0,0 +1,3124 @@ +diff -aurN linux-4.19.98/net/mptcp/mptcp_ctrl.c mptcp-mptcp_v0.95/net/mptcp/mptcp_ctrl.c +--- linux-4.19.98/net/mptcp/mptcp_ctrl.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/mptcp/mptcp_ctrl.c 2020-01-23 21:52:06.000000000 +0100 +@@ -0,0 +1,3150 @@ +/* + * MPTCP implementation - MPTCP-control + * @@ -9734,6 +9748,26 @@ diff -aurN linux-4.19.80/net/mptcp/mptcp_ctrl.c mptcp-mptcp_v0.95/net/mptcp/mptc + } +} + ++static int mptcp_set_congestion_control(struct sock *meta_sk, const char *name, ++ bool load, bool reinit, bool cap_net_admin) ++{ ++ struct mptcp_tcp_sock *mptcp; ++ int err, result = 0; ++ ++ result = __tcp_set_congestion_control(meta_sk, name, load, reinit, cap_net_admin); ++ ++ tcp_sk(meta_sk)->mpcb->tcp_ca_explicit_set = true; ++ ++ mptcp_for_each_sub(tcp_sk(meta_sk)->mpcb, mptcp) { ++ struct sock *sk_it = mptcp_to_sock(mptcp); ++ ++ err = __tcp_set_congestion_control(sk_it, name, load, reinit, cap_net_admin); ++ if (err) ++ result = err; ++ } ++ return result; ++} ++ +static void mptcp_assign_congestion_control(struct sock *sk) +{ + struct inet_connection_sock *icsk = inet_csk(sk); @@ -9742,8 +9776,11 @@ diff -aurN linux-4.19.80/net/mptcp/mptcp_ctrl.c mptcp-mptcp_v0.95/net/mptcp/mptc + + /* Congestion control is the same as meta. Thus, it has been + * try_module_get'd by tcp_assign_congestion_control. ++ * Congestion control on meta was not explicitly configured by ++ * application, leave default or route based. + */ -+ if (icsk->icsk_ca_ops == ca) ++ if (icsk->icsk_ca_ops == ca || ++ !tcp_sk(mptcp_meta_sk(sk))->mpcb->tcp_ca_explicit_set) + return; + + /* Use the same congestion control as set on the meta-sk */ @@ -9755,6 +9792,7 @@ diff -aurN linux-4.19.80/net/mptcp/mptcp_ctrl.c mptcp-mptcp_v0.95/net/mptcp/mptc + WARN(1, "Could not get the congestion control!"); + return; + } ++ module_put(icsk->icsk_ca_ops->owner); + icsk->icsk_ca_ops = ca; + + /* Clear out private data before diag gets it and @@ -10084,6 +10122,7 @@ diff -aurN linux-4.19.80/net/mptcp/mptcp_ctrl.c mptcp-mptcp_v0.95/net/mptcp/mptc + .retransmit_timer = mptcp_meta_retransmit_timer, + .time_wait = mptcp_time_wait, + .cleanup_rbuf = mptcp_cleanup_rbuf, ++ .set_cong_ctrl = mptcp_set_congestion_control, +}; + +static const struct tcp_sock_ops mptcp_sub_specific = { @@ -10101,6 +10140,7 @@ diff -aurN linux-4.19.80/net/mptcp/mptcp_ctrl.c mptcp-mptcp_v0.95/net/mptcp/mptc + .retransmit_timer = mptcp_sub_retransmit_timer, + .time_wait = tcp_time_wait, + .cleanup_rbuf = tcp_cleanup_rbuf, ++ .set_cong_ctrl = __tcp_set_congestion_control, +}; + +static int mptcp_alloc_mpcb(struct sock *meta_sk, __u64 remote_key, @@ -12080,9 +12120,9 @@ diff -aurN linux-4.19.80/net/mptcp/mptcp_ctrl.c mptcp-mptcp_v0.95/net/mptcp/mptc +mptcp_sock_cache_failed: + mptcp_init_failed = true; +} -diff -aurN linux-4.19.80/net/mptcp/mptcp_fullmesh.c mptcp-mptcp_v0.95/net/mptcp/mptcp_fullmesh.c ---- linux-4.19.80/net/mptcp/mptcp_fullmesh.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_fullmesh.c 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/net/mptcp/mptcp_fullmesh.c mptcp-mptcp_v0.95/net/mptcp/mptcp_fullmesh.c +--- linux-4.19.98/net/mptcp/mptcp_fullmesh.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/mptcp/mptcp_fullmesh.c 2020-01-23 21:52:06.000000000 +0100 @@ -0,0 +1,1941 @@ +#include +#include @@ -14025,9 +14065,9 @@ diff -aurN linux-4.19.80/net/mptcp/mptcp_fullmesh.c mptcp-mptcp_v0.95/net/mptcp/ +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("Full-Mesh MPTCP"); +MODULE_VERSION("0.88"); -diff -aurN linux-4.19.80/net/mptcp/mptcp_input.c mptcp-mptcp_v0.95/net/mptcp/mptcp_input.c ---- linux-4.19.80/net/mptcp/mptcp_input.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_input.c 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/net/mptcp/mptcp_input.c mptcp-mptcp_v0.95/net/mptcp/mptcp_input.c +--- linux-4.19.98/net/mptcp/mptcp_input.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/mptcp/mptcp_input.c 2020-01-23 21:52:06.000000000 +0100 @@ -0,0 +1,2431 @@ +/* + * MPTCP implementation - Sending side @@ -16460,9 +16500,9 @@ diff -aurN linux-4.19.80/net/mptcp/mptcp_input.c mptcp-mptcp_v0.95/net/mptcp/mpt + tcp_set_rto(sk); + mptcp_set_rto(sk); +} -diff -aurN linux-4.19.80/net/mptcp/mptcp_ipv4.c mptcp-mptcp_v0.95/net/mptcp/mptcp_ipv4.c ---- linux-4.19.80/net/mptcp/mptcp_ipv4.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_ipv4.c 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/net/mptcp/mptcp_ipv4.c mptcp-mptcp_v0.95/net/mptcp/mptcp_ipv4.c +--- linux-4.19.98/net/mptcp/mptcp_ipv4.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/mptcp/mptcp_ipv4.c 2020-01-23 21:52:06.000000000 +0100 @@ -0,0 +1,427 @@ +/* + * MPTCP implementation - IPv4-specific functions @@ -16891,9 +16931,9 @@ diff -aurN linux-4.19.80/net/mptcp/mptcp_ipv4.c mptcp-mptcp_v0.95/net/mptcp/mptc + kmem_cache_destroy(mptcp_request_sock_ops.slab); + kfree(mptcp_request_sock_ops.slab_name); +} -diff -aurN linux-4.19.80/net/mptcp/mptcp_ipv6.c mptcp-mptcp_v0.95/net/mptcp/mptcp_ipv6.c ---- linux-4.19.80/net/mptcp/mptcp_ipv6.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_ipv6.c 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/net/mptcp/mptcp_ipv6.c mptcp-mptcp_v0.95/net/mptcp/mptcp_ipv6.c +--- linux-4.19.98/net/mptcp/mptcp_ipv6.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/mptcp/mptcp_ipv6.c 2020-01-23 21:52:06.000000000 +0100 @@ -0,0 +1,475 @@ +/* + * MPTCP implementation - IPv6-specific functions @@ -17370,9 +17410,9 @@ diff -aurN linux-4.19.80/net/mptcp/mptcp_ipv6.c mptcp-mptcp_v0.95/net/mptcp/mptc + kmem_cache_destroy(mptcp6_request_sock_ops.slab); + kfree(mptcp6_request_sock_ops.slab_name); +} -diff -aurN linux-4.19.80/net/mptcp/mptcp_ndiffports.c mptcp-mptcp_v0.95/net/mptcp/mptcp_ndiffports.c ---- linux-4.19.80/net/mptcp/mptcp_ndiffports.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_ndiffports.c 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/net/mptcp/mptcp_ndiffports.c mptcp-mptcp_v0.95/net/mptcp/mptcp_ndiffports.c +--- linux-4.19.98/net/mptcp/mptcp_ndiffports.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/mptcp/mptcp_ndiffports.c 2020-01-23 21:52:06.000000000 +0100 @@ -0,0 +1,174 @@ +#include + @@ -17548,9 +17588,9 @@ diff -aurN linux-4.19.80/net/mptcp/mptcp_ndiffports.c mptcp-mptcp_v0.95/net/mptc +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("NDIFF-PORTS MPTCP"); +MODULE_VERSION("0.88"); -diff -aurN linux-4.19.80/net/mptcp/mptcp_netlink.c mptcp-mptcp_v0.95/net/mptcp/mptcp_netlink.c ---- linux-4.19.80/net/mptcp/mptcp_netlink.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_netlink.c 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/net/mptcp/mptcp_netlink.c mptcp-mptcp_v0.95/net/mptcp/mptcp_netlink.c +--- linux-4.19.98/net/mptcp/mptcp_netlink.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/mptcp/mptcp_netlink.c 2020-01-23 21:52:06.000000000 +0100 @@ -0,0 +1,1277 @@ +// SPDX-License-Identifier: GPL-2.0 +/* MPTCP implementation - Netlink Path Manager @@ -18829,9 +18869,9 @@ diff -aurN linux-4.19.80/net/mptcp/mptcp_netlink.c mptcp-mptcp_v0.95/net/mptcp/m +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("MPTCP netlink-based path manager"); +MODULE_ALIAS_GENL_FAMILY(MPTCP_GENL_NAME); -diff -aurN linux-4.19.80/net/mptcp/mptcp_olia.c mptcp-mptcp_v0.95/net/mptcp/mptcp_olia.c ---- linux-4.19.80/net/mptcp/mptcp_olia.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_olia.c 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/net/mptcp/mptcp_olia.c mptcp-mptcp_v0.95/net/mptcp/mptcp_olia.c +--- linux-4.19.98/net/mptcp/mptcp_olia.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/mptcp/mptcp_olia.c 2020-01-23 21:52:06.000000000 +0100 @@ -0,0 +1,318 @@ +/* + * MPTCP implementation - OPPORTUNISTIC LINKED INCREASES CONGESTION CONTROL: @@ -19151,9 +19191,9 @@ diff -aurN linux-4.19.80/net/mptcp/mptcp_olia.c mptcp-mptcp_v0.95/net/mptcp/mptc +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("MPTCP COUPLED CONGESTION CONTROL"); +MODULE_VERSION("0.1"); -diff -aurN linux-4.19.80/net/mptcp/mptcp_output.c mptcp-mptcp_v0.95/net/mptcp/mptcp_output.c ---- linux-4.19.80/net/mptcp/mptcp_output.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_output.c 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/net/mptcp/mptcp_output.c mptcp-mptcp_v0.95/net/mptcp/mptcp_output.c +--- linux-4.19.98/net/mptcp/mptcp_output.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/mptcp/mptcp_output.c 2020-01-23 21:52:06.000000000 +0100 @@ -0,0 +1,1929 @@ +/* + * MPTCP implementation - Sending side @@ -21084,9 +21124,9 @@ diff -aurN linux-4.19.80/net/mptcp/mptcp_output.c mptcp-mptcp_v0.95/net/mptcp/mp + return max(xmit_size_goal, mss_now); +} + -diff -aurN linux-4.19.80/net/mptcp/mptcp_pm.c mptcp-mptcp_v0.95/net/mptcp/mptcp_pm.c ---- linux-4.19.80/net/mptcp/mptcp_pm.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_pm.c 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/net/mptcp/mptcp_pm.c mptcp-mptcp_v0.95/net/mptcp/mptcp_pm.c +--- linux-4.19.98/net/mptcp/mptcp_pm.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/mptcp/mptcp_pm.c 2020-01-23 21:52:06.000000000 +0100 @@ -0,0 +1,226 @@ +/* + * MPTCP implementation - MPTCP-subflow-management @@ -21314,9 +21354,9 @@ diff -aurN linux-4.19.80/net/mptcp/mptcp_pm.c mptcp-mptcp_v0.95/net/mptcp/mptcp_ + return mptcp_set_default_path_manager(CONFIG_DEFAULT_MPTCP_PM); +} +late_initcall(mptcp_path_manager_default); -diff -aurN linux-4.19.80/net/mptcp/mptcp_redundant.c mptcp-mptcp_v0.95/net/mptcp/mptcp_redundant.c ---- linux-4.19.80/net/mptcp/mptcp_redundant.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_redundant.c 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/net/mptcp/mptcp_redundant.c mptcp-mptcp_v0.95/net/mptcp/mptcp_redundant.c +--- linux-4.19.98/net/mptcp/mptcp_redundant.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/mptcp/mptcp_redundant.c 2020-01-23 21:52:06.000000000 +0100 @@ -0,0 +1,389 @@ +/* + * MPTCP Scheduler to reduce latency and jitter. @@ -21707,9 +21747,9 @@ diff -aurN linux-4.19.80/net/mptcp/mptcp_redundant.c mptcp-mptcp_v0.95/net/mptcp +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("REDUNDANT MPTCP"); +MODULE_VERSION("0.90"); -diff -aurN linux-4.19.80/net/mptcp/mptcp_rr.c mptcp-mptcp_v0.95/net/mptcp/mptcp_rr.c ---- linux-4.19.80/net/mptcp/mptcp_rr.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_rr.c 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/net/mptcp/mptcp_rr.c mptcp-mptcp_v0.95/net/mptcp/mptcp_rr.c +--- linux-4.19.98/net/mptcp/mptcp_rr.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/mptcp/mptcp_rr.c 2020-01-23 21:52:06.000000000 +0100 @@ -0,0 +1,309 @@ +/* MPTCP Scheduler module selector. Highly inspired by tcp_cong.c */ + @@ -22020,9 +22060,9 @@ diff -aurN linux-4.19.80/net/mptcp/mptcp_rr.c mptcp-mptcp_v0.95/net/mptcp/mptcp_ +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("ROUNDROBIN MPTCP"); +MODULE_VERSION("0.89"); -diff -aurN linux-4.19.80/net/mptcp/mptcp_sched.c mptcp-mptcp_v0.95/net/mptcp/mptcp_sched.c ---- linux-4.19.80/net/mptcp/mptcp_sched.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_sched.c 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/net/mptcp/mptcp_sched.c mptcp-mptcp_v0.95/net/mptcp/mptcp_sched.c +--- linux-4.19.98/net/mptcp/mptcp_sched.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/mptcp/mptcp_sched.c 2020-01-23 21:52:06.000000000 +0100 @@ -0,0 +1,634 @@ +/* MPTCP Scheduler module selector. Highly inspired by tcp_cong.c */ + @@ -22658,9 +22698,9 @@ diff -aurN linux-4.19.80/net/mptcp/mptcp_sched.c mptcp-mptcp_v0.95/net/mptcp/mpt + return mptcp_set_default_scheduler(CONFIG_DEFAULT_MPTCP_SCHED); +} +late_initcall(mptcp_scheduler_default); -diff -aurN linux-4.19.80/net/mptcp/mptcp_wvegas.c mptcp-mptcp_v0.95/net/mptcp/mptcp_wvegas.c ---- linux-4.19.80/net/mptcp/mptcp_wvegas.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_wvegas.c 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/net/mptcp/mptcp_wvegas.c mptcp-mptcp_v0.95/net/mptcp/mptcp_wvegas.c +--- linux-4.19.98/net/mptcp/mptcp_wvegas.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/mptcp/mptcp_wvegas.c 2020-01-23 21:52:06.000000000 +0100 @@ -0,0 +1,271 @@ +/* + * MPTCP implementation - WEIGHTED VEGAS @@ -22933,9 +22973,9 @@ diff -aurN linux-4.19.80/net/mptcp/mptcp_wvegas.c mptcp-mptcp_v0.95/net/mptcp/mp +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("MPTCP wVegas"); +MODULE_VERSION("0.1"); -diff -aurN linux-4.19.80/tools/include/uapi/linux/bpf.h mptcp-mptcp_v0.95/tools/include/uapi/linux/bpf.h ---- linux-4.19.80/tools/include/uapi/linux/bpf.h 2019-10-17 22:45:44.000000000 +0200 -+++ mptcp-mptcp_v0.95/tools/include/uapi/linux/bpf.h 2019-11-20 10:07:30.000000000 +0100 +diff -aurN linux-4.19.98/tools/include/uapi/linux/bpf.h mptcp-mptcp_v0.95/tools/include/uapi/linux/bpf.h +--- linux-4.19.98/tools/include/uapi/linux/bpf.h 2020-01-23 08:21:39.000000000 +0100 ++++ mptcp-mptcp_v0.95/tools/include/uapi/linux/bpf.h 2020-01-23 21:52:06.000000000 +0100 @@ -2672,6 +2672,7 @@ BPF_TCP_LISTEN, BPF_TCP_CLOSING, /* Now a valid state */