xnu-4903.270.47.tar.gz

[apple/xnu.git] / bsd / netinet / tcp_timer.c

diff --git a/bsd/netinet/tcp_timer.c b/bsd/netinet/tcp_timer.c
index bda29ca8200288a32f622bad9fa02d6220014727..fda0f86f674ea97494b32c12a4b9fd1272f4b846 100644 (file)
--- a/bsd/netinet/tcp_timer.c
+++ b/bsd/netinet/tcp_timer.c
@@ -1,8 +1,8 @@
 /*
 /*

- * Copyright (c) 2000-2015 Apple Inc. All rights reserved.
+ * Copyright (c) 2000-2017 Apple Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

- * 
+ *

  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in


@@ -11,10 +11,10 @@
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.

- * 
+ *

  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.
  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.

- * 
+ *

  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,


@@ -22,7 +22,7 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.

- * 
+ *

  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*


@@ -74,7 +74,7 @@
 #include <sys/mcache.h>
 #include <sys/queue.h>
 #include <kern/locks.h>
 #include <sys/mcache.h>
 #include <sys/queue.h>
 #include <kern/locks.h>

-#include <kern/cpu_number.h>   /* before tcp_seq.h, for tcp_random18() */
+#include <kern/cpu_number.h>    /* before tcp_seq.h, for tcp_random18() */

 #include <mach/boolean.h>
 
 #include <net/route.h>
 #include <mach/boolean.h>
 
 #include <net/route.h>


@@ -106,37 +106,14 @@
 #include <mach/sdt.h>
 #include <netinet/mptcp_var.h>
 
 #include <mach/sdt.h>
 #include <netinet/mptcp_var.h>
 

-#define TIMERENTRY_TO_TP(te) ((struct tcpcb *)((uintptr_t)te - offsetof(struct tcpcb, tentry.le.le_next))) 
-
-#define VERIFY_NEXT_LINK(elm,field) do {       \
-       if (LIST_NEXT((elm),field) != NULL &&   \
-           LIST_NEXT((elm),field)->field.le_prev !=    \
-               &((elm)->field.le_next))        \
-               panic("Bad link elm %p next->prev != elm", (elm));      \
-} while(0)
-
-#define VERIFY_PREV_LINK(elm,field) do {       \
-       if (*(elm)->field.le_prev != (elm))     \
-               panic("Bad link elm %p prev->next != elm", (elm));      \
-} while(0)
-
-#define TCP_SET_TIMER_MODE(mode, i) do { \
-       if (IS_TIMER_HZ_10MS(i)) \
-               (mode) |= TCP_TIMERLIST_10MS_MODE; \
-       else if (IS_TIMER_HZ_100MS(i)) \
-               (mode) |= TCP_TIMERLIST_100MS_MODE; \
-       else \
-               (mode) |= TCP_TIMERLIST_500MS_MODE; \
-} while(0)
-

 /* Max number of times a stretch ack can be delayed on a connection */
 /* Max number of times a stretch ack can be delayed on a connection */

-#define        TCP_STRETCHACK_DELAY_THRESHOLD  5
+#define TCP_STRETCHACK_DELAY_THRESHOLD  5

 
 /*
  * If the host processor has been sleeping for too long, this is the threshold
  * used to avoid sending stale retransmissions.
  */
 
 /*
  * If the host processor has been sleeping for too long, this is the threshold
  * used to avoid sending stale retransmissions.
  */

-#define        TCP_SLEEP_TOO_LONG      (10 * 60 * 1000) /* 10 minutes in ms */
+#define TCP_SLEEP_TOO_LONG      (10 * 60 * 1000) /* 10 minutes in ms */

 
 /* tcp timer list */
 struct tcptimerlist tcp_timer_list;
 
 /* tcp timer list */
 struct tcptimerlist tcp_timer_list;


@@ -147,50 +124,83 @@ struct tcptailq tcp_tw_tailq;
 static int
 sysctl_msec_to_ticks SYSCTL_HANDLER_ARGS
 {
 static int
 sysctl_msec_to_ticks SYSCTL_HANDLER_ARGS
 {

-#pragma unused(arg1, arg2)
+#pragma unused(arg2)

        int error, s, tt;
 
        int error, s, tt;
 

-       tt = *(int *)oidp->oid_arg1;
+       tt = *(int *)arg1;

        s = tt * 1000 / TCP_RETRANSHZ;;
 
        error = sysctl_handle_int(oidp, &s, 0, req);
        s = tt * 1000 / TCP_RETRANSHZ;;
 
        error = sysctl_handle_int(oidp, &s, 0, req);

-       if (error || !req->newptr)
-               return (error);
+       if (error || !req->newptr) {
+               return error;
+       }

 
        tt = s * TCP_RETRANSHZ / 1000;
 
        tt = s * TCP_RETRANSHZ / 1000;

-       if (tt < 1)
-               return (EINVAL);
+       if (tt < 1) {
+               return EINVAL;
+       }

 
 

-       *(int *)oidp->oid_arg1 = tt;
-        return (0);
+       *(int *)arg1 = tt;
+       SYSCTL_SKMEM_UPDATE_AT_OFFSET(arg2, *(int*)arg1);
+       return 0;

 }
 
 }
 

-int    tcp_keepinit;
+#if SYSCTL_SKMEM
+int     tcp_keepinit = TCPTV_KEEP_INIT;
+SYSCTL_PROC(_net_inet_tcp, TCPCTL_KEEPINIT, keepinit,
+    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED,
+    &tcp_keepinit, offsetof(skmem_sysctl, tcp.keepinit),
+    sysctl_msec_to_ticks, "I", "");
+
+int     tcp_keepidle = TCPTV_KEEP_IDLE;
+SYSCTL_PROC(_net_inet_tcp, TCPCTL_KEEPIDLE, keepidle,
+    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED,
+    &tcp_keepidle, offsetof(skmem_sysctl, tcp.keepidle),
+    sysctl_msec_to_ticks, "I", "");
+
+int     tcp_keepintvl = TCPTV_KEEPINTVL;
+SYSCTL_PROC(_net_inet_tcp, TCPCTL_KEEPINTVL, keepintvl,
+    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED,
+    &tcp_keepintvl, offsetof(skmem_sysctl, tcp.keepintvl),
+    sysctl_msec_to_ticks, "I", "");
+
+SYSCTL_SKMEM_TCP_INT(OID_AUTO, keepcnt,
+    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED,
+    int, tcp_keepcnt, TCPTV_KEEPCNT, "number of times to repeat keepalive");
+
+int     tcp_msl = TCPTV_MSL;
+SYSCTL_PROC(_net_inet_tcp, OID_AUTO, msl,
+    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED,
+    &tcp_msl, offsetof(skmem_sysctl, tcp.msl),
+    sysctl_msec_to_ticks, "I", "Maximum segment lifetime");
+#else /* SYSCTL_SKMEM */
+int     tcp_keepinit;

 SYSCTL_PROC(_net_inet_tcp, TCPCTL_KEEPINIT, keepinit,
     CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED,
     &tcp_keepinit, 0, sysctl_msec_to_ticks, "I", "");
 
 SYSCTL_PROC(_net_inet_tcp, TCPCTL_KEEPINIT, keepinit,
     CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED,
     &tcp_keepinit, 0, sysctl_msec_to_ticks, "I", "");
 

-int    tcp_keepidle;
+int     tcp_keepidle;

 SYSCTL_PROC(_net_inet_tcp, TCPCTL_KEEPIDLE, keepidle,
     CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED,
     &tcp_keepidle, 0, sysctl_msec_to_ticks, "I", "");
 
 SYSCTL_PROC(_net_inet_tcp, TCPCTL_KEEPIDLE, keepidle,
     CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED,
     &tcp_keepidle, 0, sysctl_msec_to_ticks, "I", "");
 

-int    tcp_keepintvl;
+int     tcp_keepintvl;

 SYSCTL_PROC(_net_inet_tcp, TCPCTL_KEEPINTVL, keepintvl,
     CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED,
     &tcp_keepintvl, 0, sysctl_msec_to_ticks, "I", "");
 
 SYSCTL_PROC(_net_inet_tcp, TCPCTL_KEEPINTVL, keepintvl,
     CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED,
     &tcp_keepintvl, 0, sysctl_msec_to_ticks, "I", "");
 

-int    tcp_keepcnt;
+int     tcp_keepcnt;

 SYSCTL_INT(_net_inet_tcp, OID_AUTO, keepcnt,
     CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED,
     &tcp_keepcnt, 0, "number of times to repeat keepalive");
 
 SYSCTL_INT(_net_inet_tcp, OID_AUTO, keepcnt,
     CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED,
     &tcp_keepcnt, 0, "number of times to repeat keepalive");
 

-int    tcp_msl;
+int     tcp_msl;

 SYSCTL_PROC(_net_inet_tcp, OID_AUTO, msl,
     CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED,
     &tcp_msl, 0, sysctl_msec_to_ticks, "I", "Maximum segment lifetime");
 SYSCTL_PROC(_net_inet_tcp, OID_AUTO, msl,
     CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED,
     &tcp_msl, 0, sysctl_msec_to_ticks, "I", "Maximum segment lifetime");

+#endif /* SYSCTL_SKMEM */

 
 

-/* 
+/*

  * Avoid DoS via TCP Robustness in Persist Condition
  * (see http://www.ietf.org/id/draft-ananth-tcpm-persist-02.txt)
  * by allowing a system wide maximum persistence timeout value when in
  * Avoid DoS via TCP Robustness in Persist Condition
  * (see http://www.ietf.org/id/draft-ananth-tcpm-persist-02.txt)
  * by allowing a system wide maximum persistence timeout value when in


@@ -199,26 +209,32 @@ SYSCTL_PROC(_net_inet_tcp, OID_AUTO, msl,
  * Expressed in milliseconds to be consistent without timeout related
  * values, the TCP socket option is in seconds.
  */
  * Expressed in milliseconds to be consistent without timeout related
  * values, the TCP socket option is in seconds.
  */

+#if SYSCTL_SKMEM
+u_int32_t tcp_max_persist_timeout = 0;
+SYSCTL_PROC(_net_inet_tcp, OID_AUTO, max_persist_timeout,
+    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED,
+    &tcp_max_persist_timeout, offsetof(skmem_sysctl, tcp.max_persist_timeout),
+    sysctl_msec_to_ticks, "I", "Maximum persistence timeout for ZWP");
+#else /* SYSCTL_SKMEM */

 u_int32_t tcp_max_persist_timeout = 0;
 SYSCTL_PROC(_net_inet_tcp, OID_AUTO, max_persist_timeout,
     CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED,
 u_int32_t tcp_max_persist_timeout = 0;
 SYSCTL_PROC(_net_inet_tcp, OID_AUTO, max_persist_timeout,
     CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED,

-    &tcp_max_persist_timeout, 0, sysctl_msec_to_ticks, "I", 
+    &tcp_max_persist_timeout, 0, sysctl_msec_to_ticks, "I",

     "Maximum persistence timeout for ZWP");
     "Maximum persistence timeout for ZWP");

+#endif /* SYSCTL_SKMEM */

 
 

-static int     always_keepalive = 0;
-SYSCTL_INT(_net_inet_tcp, OID_AUTO, always_keepalive,
-    CTLFLAG_RW | CTLFLAG_LOCKED,
-    &always_keepalive , 0, "Assume SO_KEEPALIVE on all TCP connections");
+SYSCTL_SKMEM_TCP_INT(OID_AUTO, always_keepalive,
+    CTLFLAG_RW | CTLFLAG_LOCKED, static int, always_keepalive, 0,
+    "Assume SO_KEEPALIVE on all TCP connections");

 
 /*
  * This parameter determines how long the timer list will stay in fast or
 
 /*
  * This parameter determines how long the timer list will stay in fast or

- * quick mode even though all connections are idle. In this state, the 
+ * quick mode even though all connections are idle. In this state, the

  * timer will run more frequently anticipating new data.
  */
  * timer will run more frequently anticipating new data.
  */

-int timer_fastmode_idlemax = TCP_FASTMODE_IDLERUN_MAX;
-SYSCTL_INT(_net_inet_tcp, OID_AUTO, timer_fastmode_idlemax,
-    CTLFLAG_RW | CTLFLAG_LOCKED,
-    &timer_fastmode_idlemax, 0, "Maximum idle generations in fast mode");
+SYSCTL_SKMEM_TCP_INT(OID_AUTO, timer_fastmode_idlemax,
+    CTLFLAG_RW | CTLFLAG_LOCKED, int, timer_fastmode_idlemax,
+    TCP_FASTMODE_IDLERUN_MAX, "Maximum idle generations in fast mode");

 
 /*
  * See tcp_syn_backoff[] for interval values between SYN retransmits;
 
 /*
  * See tcp_syn_backoff[] for interval values between SYN retransmits;


@@ -227,10 +243,9 @@ SYSCTL_INT(_net_inet_tcp, OID_AUTO, timer_fastmode_idlemax,
  * SYN retransmits.  Setting it to 0 disables the dropping off of those
  * two options.
  */
  * SYN retransmits.  Setting it to 0 disables the dropping off of those
  * two options.
  */

-static int tcp_broken_peer_syn_rxmit_thres = 10;
-SYSCTL_INT(_net_inet_tcp, OID_AUTO, broken_peer_syn_rexmit_thres,
-    CTLFLAG_RW | CTLFLAG_LOCKED, &tcp_broken_peer_syn_rxmit_thres, 0,
-    "Number of retransmitted SYNs before disabling RFC 1323 "
+SYSCTL_SKMEM_TCP_INT(OID_AUTO, broken_peer_syn_rexmit_thres,
+    CTLFLAG_RW | CTLFLAG_LOCKED, static int, tcp_broken_peer_syn_rxmit_thres,
+    10, "Number of retransmitted SYNs before disabling RFC 1323 "

     "options on local connections");
 
 static int tcp_timer_advanced = 0;
     "options on local connections");
 
 static int tcp_timer_advanced = 0;


@@ -240,45 +255,41 @@ SYSCTL_INT(_net_inet_tcp, OID_AUTO, tcp_timer_advanced,
 
 static int tcp_resched_timerlist = 0;
 SYSCTL_INT(_net_inet_tcp, OID_AUTO, tcp_resched_timerlist,
 
 static int tcp_resched_timerlist = 0;
 SYSCTL_INT(_net_inet_tcp, OID_AUTO, tcp_resched_timerlist,

-    CTLFLAG_RD | CTLFLAG_LOCKED, &tcp_resched_timerlist, 0, 
+    CTLFLAG_RD | CTLFLAG_LOCKED, &tcp_resched_timerlist, 0,

     "Number of times timer list was rescheduled as part of processing a packet");
 
     "Number of times timer list was rescheduled as part of processing a packet");
 

-int    tcp_pmtud_black_hole_detect = 1 ;
-SYSCTL_INT(_net_inet_tcp, OID_AUTO, pmtud_blackhole_detection,
-    CTLFLAG_RW | CTLFLAG_LOCKED, &tcp_pmtud_black_hole_detect, 0,
+SYSCTL_SKMEM_TCP_INT(OID_AUTO, pmtud_blackhole_detection,
+    CTLFLAG_RW | CTLFLAG_LOCKED, int, tcp_pmtud_black_hole_detect, 1,

     "Path MTU Discovery Black Hole Detection");
 
     "Path MTU Discovery Black Hole Detection");
 

-int    tcp_pmtud_black_hole_mss = 1200 ;
-SYSCTL_INT(_net_inet_tcp, OID_AUTO, pmtud_blackhole_mss,
-    CTLFLAG_RW | CTLFLAG_LOCKED, &tcp_pmtud_black_hole_mss, 0,
+SYSCTL_SKMEM_TCP_INT(OID_AUTO, pmtud_blackhole_mss,
+    CTLFLAG_RW | CTLFLAG_LOCKED, int, tcp_pmtud_black_hole_mss, 1200,

     "Path MTU Discovery Black Hole Detection lowered MSS");
 
     "Path MTU Discovery Black Hole Detection lowered MSS");
 

-#define        TCP_REPORT_STATS_INTERVAL       43200 /* 12 hours, in seconds */
+static u_int32_t tcp_mss_rec_medium = 1200;
+static u_int32_t tcp_mss_rec_low = 512;
+
+#define TCP_REPORT_STATS_INTERVAL       43200 /* 12 hours, in seconds */

 int tcp_report_stats_interval = TCP_REPORT_STATS_INTERVAL;
 int tcp_report_stats_interval = TCP_REPORT_STATS_INTERVAL;

-#if (DEVELOPMENT || DEBUG)
-SYSCTL_INT(_net_inet_tcp, OID_AUTO, report_stats_interval,
-    CTLFLAG_RW | CTLFLAG_LOCKED, &tcp_report_stats_interval, 0,
-    "Report stats interval");
-#endif /* (DEVELOPMENT || DEBUG) */

 
 /* performed garbage collection of "used" sockets */
 static boolean_t tcp_gc_done = FALSE;
 
 /* max idle probes */
 
 /* performed garbage collection of "used" sockets */
 static boolean_t tcp_gc_done = FALSE;
 
 /* max idle probes */

-int    tcp_maxpersistidle;
+int     tcp_maxpersistidle = TCPTV_KEEP_IDLE;

 
 /*
  * TCP delack timer is set to 100 ms. Since the processing of timer list
  * in fast mode will happen no faster than 100 ms, the delayed ack timer
  * will fire some where between 100 and 200 ms.
  */
 
 /*
  * TCP delack timer is set to 100 ms. Since the processing of timer list
  * in fast mode will happen no faster than 100 ms, the delayed ack timer
  * will fire some where between 100 and 200 ms.
  */

-int    tcp_delack = TCP_RETRANSHZ / 10;
+int     tcp_delack = TCP_RETRANSHZ / 10;

 
 #if MPTCP
 /*
  * MP_JOIN retransmission of 3rd ACK will be every 500 msecs without backoff
  */
 
 #if MPTCP
 /*
  * MP_JOIN retransmission of 3rd ACK will be every 500 msecs without backoff
  */

-int    tcp_jack_rxmt = TCP_RETRANSHZ / 2;
+int     tcp_jack_rxmt = TCP_RETRANSHZ / 2;

 #endif /* MPTCP */
 
 static boolean_t tcp_itimer_done = FALSE;
 #endif /* MPTCP */
 
 static boolean_t tcp_itimer_done = FALSE;


@@ -290,58 +301,83 @@ static u_int32_t tcp_run_conn_timer(struct tcpcb *tp, u_int16_t *mode,
 static void tcp_sched_timers(struct tcpcb *tp);
 static inline void tcp_set_lotimer_index(struct tcpcb *);
 __private_extern__ void tcp_remove_from_time_wait(struct inpcb *inp);
 static void tcp_sched_timers(struct tcpcb *tp);
 static inline void tcp_set_lotimer_index(struct tcpcb *);
 __private_extern__ void tcp_remove_from_time_wait(struct inpcb *inp);

+static inline void tcp_update_mss_core(struct tcpcb *tp, struct ifnet *ifp);

 __private_extern__ void tcp_report_stats(void);
 
 __private_extern__ void tcp_report_stats(void);
 

-/*
- * Macro to compare two timers. If there is a reset of the sign bit,
- * it is safe to assume that the timer has wrapped around. By doing
- * signed comparision, we take care of wrap around such that the value
- * with the sign bit reset is actually ahead of the other.
- */
-inline int32_t
-timer_diff(uint32_t t1, uint32_t toff1, uint32_t t2, uint32_t toff2) {
-       return (int32_t)((t1 + toff1) - (t2 + toff2));
-};
-
-static u_int64_t tcp_last_report_time;
+static  u_int64_t tcp_last_report_time;

 
 /*
  * Structure to store previously reported stats so that we can send
  * incremental changes in each report interval.
  */
 struct tcp_last_report_stats {
 
 /*
  * Structure to store previously reported stats so that we can send
  * incremental changes in each report interval.
  */
 struct tcp_last_report_stats {

-       u_int32_t       tcps_connattempt;
-       u_int32_t       tcps_accepts;
-       u_int32_t       tcps_ecn_client_setup;
-       u_int32_t       tcps_ecn_server_setup;
-       u_int32_t       tcps_ecn_client_success;
-       u_int32_t       tcps_ecn_server_success;
-       u_int32_t       tcps_ecn_not_supported;
-       u_int32_t       tcps_ecn_lost_syn;
-       u_int32_t       tcps_ecn_lost_synack;
-       u_int32_t       tcps_ecn_recv_ce;
-       u_int32_t       tcps_ecn_recv_ece;
-       u_int32_t       tcps_ecn_sent_ece;
-       u_int32_t       tcps_ecn_conn_recv_ce;
-       u_int32_t       tcps_ecn_conn_recv_ece;
-       u_int32_t       tcps_ecn_conn_plnoce;
-       u_int32_t       tcps_ecn_conn_pl_ce;
-       u_int32_t       tcps_ecn_conn_nopl_ce;
-       u_int32_t       tcps_ecn_fallback_synloss;
-       u_int32_t       tcps_ecn_fallback_reorder;
-       u_int32_t       tcps_ecn_fallback_ce;
+       u_int32_t       tcps_connattempt;
+       u_int32_t       tcps_accepts;
+       u_int32_t       tcps_ecn_client_setup;
+       u_int32_t       tcps_ecn_server_setup;
+       u_int32_t       tcps_ecn_client_success;
+       u_int32_t       tcps_ecn_server_success;
+       u_int32_t       tcps_ecn_not_supported;
+       u_int32_t       tcps_ecn_lost_syn;
+       u_int32_t       tcps_ecn_lost_synack;
+       u_int32_t       tcps_ecn_recv_ce;
+       u_int32_t       tcps_ecn_recv_ece;
+       u_int32_t       tcps_ecn_sent_ece;
+       u_int32_t       tcps_ecn_conn_recv_ce;
+       u_int32_t       tcps_ecn_conn_recv_ece;
+       u_int32_t       tcps_ecn_conn_plnoce;
+       u_int32_t       tcps_ecn_conn_pl_ce;
+       u_int32_t       tcps_ecn_conn_nopl_ce;
+       u_int32_t       tcps_ecn_fallback_synloss;
+       u_int32_t       tcps_ecn_fallback_reorder;
+       u_int32_t       tcps_ecn_fallback_ce;

 
        /* TFO-related statistics */
 
        /* TFO-related statistics */

-       u_int32_t       tcps_tfo_syn_data_rcv;
-       u_int32_t       tcps_tfo_cookie_req_rcv;
-       u_int32_t       tcps_tfo_cookie_sent;
-       u_int32_t       tcps_tfo_cookie_invalid;
-       u_int32_t       tcps_tfo_cookie_req;
-       u_int32_t       tcps_tfo_cookie_rcv;
-       u_int32_t       tcps_tfo_syn_data_sent;
-       u_int32_t       tcps_tfo_syn_data_acked;
-       u_int32_t       tcps_tfo_syn_loss;
-       u_int32_t       tcps_tfo_blackhole;
+       u_int32_t       tcps_tfo_syn_data_rcv;
+       u_int32_t       tcps_tfo_cookie_req_rcv;
+       u_int32_t       tcps_tfo_cookie_sent;
+       u_int32_t       tcps_tfo_cookie_invalid;
+       u_int32_t       tcps_tfo_cookie_req;
+       u_int32_t       tcps_tfo_cookie_rcv;
+       u_int32_t       tcps_tfo_syn_data_sent;
+       u_int32_t       tcps_tfo_syn_data_acked;
+       u_int32_t       tcps_tfo_syn_loss;
+       u_int32_t       tcps_tfo_blackhole;
+       u_int32_t       tcps_tfo_cookie_wrong;
+       u_int32_t       tcps_tfo_no_cookie_rcv;
+       u_int32_t       tcps_tfo_heuristics_disable;
+       u_int32_t       tcps_tfo_sndblackhole;
+
+       /* MPTCP-related statistics */
+       u_int32_t       tcps_mptcp_handover_attempt;
+       u_int32_t       tcps_mptcp_interactive_attempt;
+       u_int32_t       tcps_mptcp_aggregate_attempt;
+       u_int32_t       tcps_mptcp_fp_handover_attempt;
+       u_int32_t       tcps_mptcp_fp_interactive_attempt;
+       u_int32_t       tcps_mptcp_fp_aggregate_attempt;
+       u_int32_t       tcps_mptcp_heuristic_fallback;
+       u_int32_t       tcps_mptcp_fp_heuristic_fallback;
+       u_int32_t       tcps_mptcp_handover_success_wifi;
+       u_int32_t       tcps_mptcp_handover_success_cell;
+       u_int32_t       tcps_mptcp_interactive_success;
+       u_int32_t       tcps_mptcp_aggregate_success;
+       u_int32_t       tcps_mptcp_fp_handover_success_wifi;
+       u_int32_t       tcps_mptcp_fp_handover_success_cell;
+       u_int32_t       tcps_mptcp_fp_interactive_success;
+       u_int32_t       tcps_mptcp_fp_aggregate_success;
+       u_int32_t       tcps_mptcp_handover_cell_from_wifi;
+       u_int32_t       tcps_mptcp_handover_wifi_from_cell;
+       u_int32_t       tcps_mptcp_interactive_cell_from_wifi;
+       u_int64_t       tcps_mptcp_handover_cell_bytes;
+       u_int64_t       tcps_mptcp_interactive_cell_bytes;
+       u_int64_t       tcps_mptcp_aggregate_cell_bytes;
+       u_int64_t       tcps_mptcp_handover_all_bytes;
+       u_int64_t       tcps_mptcp_interactive_all_bytes;
+       u_int64_t       tcps_mptcp_aggregate_all_bytes;
+       u_int32_t       tcps_mptcp_back_to_wifi;
+       u_int32_t       tcps_mptcp_wifi_proxy;
+       u_int32_t       tcps_mptcp_cell_proxy;
+       u_int32_t       tcps_mptcp_triggered_cell;

 };
 
 
 };
 
 


@@ -355,6 +391,94 @@ struct tcp_last_report_stats {
 static void add_to_time_wait_locked(struct tcpcb *tp, uint32_t delay);
 static boolean_t tcp_garbage_collect(struct inpcb *, int);
 
 static void add_to_time_wait_locked(struct tcpcb *tp, uint32_t delay);
 static boolean_t tcp_garbage_collect(struct inpcb *, int);
 

+#define TIMERENTRY_TO_TP(te) ((struct tcpcb *)((uintptr_t)te - offsetof(struct tcpcb, tentry.le.le_next)))
+
+#define VERIFY_NEXT_LINK(elm, field) do {       \
+       if (LIST_NEXT((elm),field) != NULL &&   \
+           LIST_NEXT((elm),field)->field.le_prev !=    \
+               &((elm)->field.le_next))        \
+               panic("Bad link elm %p next->prev != elm", (elm));      \
+} while(0)
+
+#define VERIFY_PREV_LINK(elm, field) do {       \
+       if (*(elm)->field.le_prev != (elm))     \
+               panic("Bad link elm %p prev->next != elm", (elm));      \
+} while(0)
+
+#define TCP_SET_TIMER_MODE(mode, i) do { \
+       if (IS_TIMER_HZ_10MS(i)) \
+               (mode) |= TCP_TIMERLIST_10MS_MODE; \
+       else if (IS_TIMER_HZ_100MS(i)) \
+               (mode) |= TCP_TIMERLIST_100MS_MODE; \
+       else \
+               (mode) |= TCP_TIMERLIST_500MS_MODE; \
+} while(0)
+
+#if (DEVELOPMENT || DEBUG)
+SYSCTL_UINT(_net_inet_tcp, OID_AUTO, mss_rec_medium,
+    CTLFLAG_RW | CTLFLAG_LOCKED, &tcp_mss_rec_medium, 0,
+    "Medium MSS based on recommendation in link status report");
+SYSCTL_UINT(_net_inet_tcp, OID_AUTO, mss_rec_low,
+    CTLFLAG_RW | CTLFLAG_LOCKED, &tcp_mss_rec_low, 0,
+    "Low MSS based on recommendation in link status report");
+
+static int32_t tcp_change_mss_recommended = 0;
+static int
+sysctl_change_mss_recommended SYSCTL_HANDLER_ARGS
+{
+#pragma unused(oidp, arg1, arg2)
+       int i, err = 0, changed = 0;
+       struct ifnet *ifp;
+       struct if_link_status ifsr;
+       struct if_cellular_status_v1 *new_cell_sr;
+       err = sysctl_io_number(req, tcp_change_mss_recommended,
+           sizeof(int32_t), &i, &changed);
+       if (changed) {
+               ifnet_head_lock_shared();
+               TAILQ_FOREACH(ifp, &ifnet_head, if_link) {
+                       if (IFNET_IS_CELLULAR(ifp)) {
+                               bzero(&ifsr, sizeof(ifsr));
+                               new_cell_sr = &ifsr.ifsr_u.ifsr_cell.if_cell_u.if_status_v1;
+                               ifsr.ifsr_version = IF_CELLULAR_STATUS_REPORT_CURRENT_VERSION;
+                               ifsr.ifsr_len = sizeof(*new_cell_sr);
+
+                               /* Set MSS recommended */
+                               new_cell_sr->valid_bitmask |= IF_CELL_UL_MSS_RECOMMENDED_VALID;
+                               new_cell_sr->mss_recommended = i;
+                               err = ifnet_link_status_report(ifp, new_cell_sr, sizeof(new_cell_sr));
+                               if (err == 0) {
+                                       tcp_change_mss_recommended = i;
+                               } else {
+                                       break;
+                               }
+                       }
+               }
+               ifnet_head_done();
+       }
+       return err;
+}
+
+SYSCTL_PROC(_net_inet_tcp, OID_AUTO, change_mss_recommended,
+    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED, &tcp_change_mss_recommended,
+    0, sysctl_change_mss_recommended, "IU", "Change MSS recommended");
+
+SYSCTL_INT(_net_inet_tcp, OID_AUTO, report_stats_interval,
+    CTLFLAG_RW | CTLFLAG_LOCKED, &tcp_report_stats_interval, 0,
+    "Report stats interval");
+#endif /* (DEVELOPMENT || DEBUG) */
+
+/*
+ * Macro to compare two timers. If there is a reset of the sign bit,
+ * it is safe to assume that the timer has wrapped around. By doing
+ * signed comparision, we take care of wrap around such that the value
+ * with the sign bit reset is actually ahead of the other.
+ */
+inline int32_t
+timer_diff(uint32_t t1, uint32_t toff1, uint32_t t2, uint32_t toff2)
+{
+       return (int32_t)((t1 + toff1) - (t2 + toff2));
+};
+

 /*
  * Add to tcp timewait list, delay is given in milliseconds.
  */
 /*
  * Add to tcp timewait list, delay is given in milliseconds.
  */


@@ -366,13 +490,13 @@ add_to_time_wait_locked(struct tcpcb *tp, uint32_t delay)
        uint32_t timer;
 
        /* pcb list should be locked when we get here */
        uint32_t timer;
 
        /* pcb list should be locked when we get here */

-       lck_rw_assert(pcbinfo->ipi_lock, LCK_RW_ASSERT_EXCLUSIVE);
+       LCK_RW_ASSERT(pcbinfo->ipi_lock, LCK_RW_ASSERT_EXCLUSIVE);

 
        /* We may get here multiple times, so check */
        if (!(inp->inp_flags2 & INP2_TIMEWAIT)) {
                pcbinfo->ipi_twcount++;
                inp->inp_flags2 |= INP2_TIMEWAIT;
 
        /* We may get here multiple times, so check */
        if (!(inp->inp_flags2 & INP2_TIMEWAIT)) {
                pcbinfo->ipi_twcount++;
                inp->inp_flags2 |= INP2_TIMEWAIT;

-               
+

                /* Remove from global inp list */
                LIST_REMOVE(inp, inp_list);
        } else {
                /* Remove from global inp list */
                LIST_REMOVE(inp, inp_list);
        } else {


@@ -381,11 +505,12 @@ add_to_time_wait_locked(struct tcpcb *tp, uint32_t delay)
 
        /* Compute the time at which this socket can be closed */
        timer = tcp_now + delay;
 
        /* Compute the time at which this socket can be closed */
        timer = tcp_now + delay;

-       
+

        /* We will use the TCPT_2MSL timer for tracking this delay */
 
        /* We will use the TCPT_2MSL timer for tracking this delay */
 

-       if (TIMER_IS_ON_LIST(tp))
+       if (TIMER_IS_ON_LIST(tp)) {

                tcp_remove_timer(tp);
                tcp_remove_timer(tp);

+       }

        tp->t_timer[TCPT_2MSL] = timer;
 
        TAILQ_INSERT_TAIL(&tcp_tw_tailq, tp, t_twentry);
        tp->t_timer[TCPT_2MSL] = timer;
 
        TAILQ_INSERT_TAIL(&tcp_tw_tailq, tp, t_twentry);


@@ -395,16 +520,17 @@ void
 add_to_time_wait(struct tcpcb *tp, uint32_t delay)
 {
        struct inpcbinfo *pcbinfo = &tcbinfo;
 add_to_time_wait(struct tcpcb *tp, uint32_t delay)
 {
        struct inpcbinfo *pcbinfo = &tcbinfo;

-       if (tp->t_inpcb->inp_socket->so_options & SO_NOWAKEFROMSLEEP)
+       if (tp->t_inpcb->inp_socket->so_options & SO_NOWAKEFROMSLEEP) {

                socket_post_kev_msg_closed(tp->t_inpcb->inp_socket);
                socket_post_kev_msg_closed(tp->t_inpcb->inp_socket);

+       }

 
        /* 19182803: Notify nstat that connection is closing before waiting. */
        nstat_pcb_detach(tp->t_inpcb);
 
        if (!lck_rw_try_lock_exclusive(pcbinfo->ipi_lock)) {
 
        /* 19182803: Notify nstat that connection is closing before waiting. */
        nstat_pcb_detach(tp->t_inpcb);
 
        if (!lck_rw_try_lock_exclusive(pcbinfo->ipi_lock)) {

-               tcp_unlock(tp->t_inpcb->inp_socket, 0, 0);
+               socket_unlock(tp->t_inpcb->inp_socket, 0);

                lck_rw_lock_exclusive(pcbinfo->ipi_lock);
                lck_rw_lock_exclusive(pcbinfo->ipi_lock);

-               tcp_lock(tp->t_inpcb->inp_socket, 0, 0);
+               socket_lock(tp->t_inpcb->inp_socket, 0);

        }
        add_to_time_wait_locked(tp, delay);
        lck_rw_done(pcbinfo->ipi_lock);
        }
        add_to_time_wait_locked(tp, delay);
        lck_rw_done(pcbinfo->ipi_lock);


@@ -417,20 +543,31 @@ void
 tcp_remove_from_time_wait(struct inpcb *inp)
 {
        struct tcpcb *tp = intotcpcb(inp);
 tcp_remove_from_time_wait(struct inpcb *inp)
 {
        struct tcpcb *tp = intotcpcb(inp);

-       if (inp->inp_flags2 & INP2_TIMEWAIT)
+       if (inp->inp_flags2 & INP2_TIMEWAIT) {

                TAILQ_REMOVE(&tcp_tw_tailq, tp, t_twentry);
                TAILQ_REMOVE(&tcp_tw_tailq, tp, t_twentry);

+       }

 }
 
 static boolean_t
 tcp_garbage_collect(struct inpcb *inp, int istimewait)
 {
        boolean_t active = FALSE;
 }
 
 static boolean_t
 tcp_garbage_collect(struct inpcb *inp, int istimewait)
 {
        boolean_t active = FALSE;

-       struct socket *so;
+       struct socket *so, *mp_so = NULL;

        struct tcpcb *tp;
 
        so = inp->inp_socket;
        tp = intotcpcb(inp);
 
        struct tcpcb *tp;
 
        so = inp->inp_socket;
        tp = intotcpcb(inp);
 

+       if (so->so_flags & SOF_MP_SUBFLOW) {
+               mp_so = mptetoso(tptomptp(tp)->mpt_mpte);
+               if (!socket_try_lock(mp_so)) {
+                       mp_so = NULL;
+                       active = TRUE;
+                       goto out;
+               }
+               mp_so->so_usecount++;
+       }
+

        /*
         * Skip if still in use or busy; it would have been more efficient
         * if we were to test so_usecount against 0, but this isn't possible
        /*
         * Skip if still in use or busy; it would have been more efficient
         * if we were to test so_usecount against 0, but this isn't possible


@@ -438,20 +575,22 @@ tcp_garbage_collect(struct inpcb *inp, int istimewait)
         * overflow sockets that are eligible for garbage collection have
         * their usecounts set to 1.
         */
         * overflow sockets that are eligible for garbage collection have
         * their usecounts set to 1.
         */

-       if (!lck_mtx_try_lock_spin(&inp->inpcb_mtx))
-               return (TRUE);
+       if (!lck_mtx_try_lock_spin(&inp->inpcb_mtx)) {
+               active = TRUE;
+               goto out;
+       }

 
        /* Check again under the lock */
        if (so->so_usecount > 1) {
 
        /* Check again under the lock */
        if (so->so_usecount > 1) {

-               if (inp->inp_wantcnt == WNT_STOPUSING)
+               if (inp->inp_wantcnt == WNT_STOPUSING) {

                        active = TRUE;
                        active = TRUE;

+               }

                lck_mtx_unlock(&inp->inpcb_mtx);
                lck_mtx_unlock(&inp->inpcb_mtx);

-               return (active);
+               goto out;

        }
 
        }
 

-       if (istimewait &&
-               TSTMP_GEQ(tcp_now, tp->t_timer[TCPT_2MSL]) &&
-               tp->t_state != TCPS_CLOSED) {
+       if (istimewait && TSTMP_GEQ(tcp_now, tp->t_timer[TCPT_2MSL]) &&
+           tp->t_state != TCPS_CLOSED) {

                /* Become a regular mutex */
                lck_mtx_convert_spin(&inp->inpcb_mtx);
                tcp_close(tp);
                /* Become a regular mutex */
                lck_mtx_convert_spin(&inp->inpcb_mtx);
                tcp_close(tp);


@@ -470,48 +609,50 @@ tcp_garbage_collect(struct inpcb *inp, int istimewait)
            ((istimewait && (so->so_flags & SOF_OVERFLOW)) ||
            ((tp != NULL) && (tp->t_state == TCPS_CLOSED) &&
            (so->so_head != NULL) &&
            ((istimewait && (so->so_flags & SOF_OVERFLOW)) ||
            ((tp != NULL) && (tp->t_state == TCPS_CLOSED) &&
            (so->so_head != NULL) &&

-           ((so->so_state & (SS_INCOMP|SS_CANTSENDMORE|SS_CANTRCVMORE)) ==
-           (SS_INCOMP|SS_CANTSENDMORE|SS_CANTRCVMORE))))) {
-
+           ((so->so_state & (SS_INCOMP | SS_CANTSENDMORE | SS_CANTRCVMORE)) ==
+           (SS_INCOMP | SS_CANTSENDMORE | SS_CANTRCVMORE))))) {

                if (inp->inp_state != INPCB_STATE_DEAD) {
                        /* Become a regular mutex */
                        lck_mtx_convert_spin(&inp->inpcb_mtx);
 #if INET6
                if (inp->inp_state != INPCB_STATE_DEAD) {
                        /* Become a regular mutex */
                        lck_mtx_convert_spin(&inp->inpcb_mtx);
 #if INET6

-                       if (SOCK_CHECK_DOM(so, PF_INET6))
+                       if (SOCK_CHECK_DOM(so, PF_INET6)) {

                                in6_pcbdetach(inp);
                                in6_pcbdetach(inp);

-                       else
+                       } else

 #endif /* INET6 */
 #endif /* INET6 */

-                               in_pcbdetach(inp);
+                       in_pcbdetach(inp);

                }
                }

+               VERIFY(so->so_usecount > 0);

                so->so_usecount--;
                so->so_usecount--;

-               if (inp->inp_wantcnt == WNT_STOPUSING)
+               if (inp->inp_wantcnt == WNT_STOPUSING) {

                        active = TRUE;
                        active = TRUE;

+               }

                lck_mtx_unlock(&inp->inpcb_mtx);
                lck_mtx_unlock(&inp->inpcb_mtx);

-               return (active);
+               goto out;

        } else if (inp->inp_wantcnt != WNT_STOPUSING) {
                lck_mtx_unlock(&inp->inpcb_mtx);
        } else if (inp->inp_wantcnt != WNT_STOPUSING) {
                lck_mtx_unlock(&inp->inpcb_mtx);

-               return (FALSE);
+               active = FALSE;
+               goto out;

        }
 
        /*
        }
 
        /*

-        * We get here because the PCB is no longer searchable 
-        * (WNT_STOPUSING); detach (if needed) and dispose if it is dead 
-        * (usecount is 0).  This covers all cases, including overflow 
-        * sockets and those that are considered as "embryonic", 
-        * i.e. created by sonewconn() in TCP input path, and have 
+        * We get here because the PCB is no longer searchable
+        * (WNT_STOPUSING); detach (if needed) and dispose if it is dead
+        * (usecount is 0).  This covers all cases, including overflow
+        * sockets and those that are considered as "embryonic",
+        * i.e. created by sonewconn() in TCP input path, and have

         * not yet been committed.  For the former, we reduce the usecount
         * not yet been committed.  For the former, we reduce the usecount

-        *  to 0 as done by the code above.  For the latter, the usecount 
+        *  to 0 as done by the code above.  For the latter, the usecount

         * would have reduced to 0 as part calling soabort() when the
         * socket is dropped at the end of tcp_input().
         */
        if (so->so_usecount == 0) {
                DTRACE_TCP4(state__change, void, NULL, struct inpcb *, inp,
         * would have reduced to 0 as part calling soabort() when the
         * socket is dropped at the end of tcp_input().
         */
        if (so->so_usecount == 0) {
                DTRACE_TCP4(state__change, void, NULL, struct inpcb *, inp,

-                       struct tcpcb *, tp, int32_t, TCPS_CLOSED);
+                   struct tcpcb *, tp, int32_t, TCPS_CLOSED);

                /* Become a regular mutex */
                lck_mtx_convert_spin(&inp->inpcb_mtx);
 
                /*
                /* Become a regular mutex */
                lck_mtx_convert_spin(&inp->inpcb_mtx);
 
                /*

-                * If this tp still happens to be on the timer list, 
+                * If this tp still happens to be on the timer list,

                 * take it out
                 */
                if (TIMER_IS_ON_LIST(tp)) {
                 * take it out
                 */
                if (TIMER_IS_ON_LIST(tp)) {


@@ -520,18 +661,35 @@ tcp_garbage_collect(struct inpcb *inp, int istimewait)
 
                if (inp->inp_state != INPCB_STATE_DEAD) {
 #if INET6
 
                if (inp->inp_state != INPCB_STATE_DEAD) {
 #if INET6

-                       if (SOCK_CHECK_DOM(so, PF_INET6))
+                       if (SOCK_CHECK_DOM(so, PF_INET6)) {

                                in6_pcbdetach(inp);
                                in6_pcbdetach(inp);

-                       else
+                       } else

 #endif /* INET6 */
 #endif /* INET6 */

-                               in_pcbdetach(inp);
+                       in_pcbdetach(inp);
+               }
+
+               if (mp_so) {
+                       mptcp_subflow_del(tptomptp(tp)->mpt_mpte, tp->t_mpsub);
+
+                       /* so is now unlinked from mp_so - let's drop the lock */
+                       socket_unlock(mp_so, 1);
+                       mp_so = NULL;

                }
                }

+

                in_pcbdispose(inp);
                in_pcbdispose(inp);

-               return (FALSE);
+               active = FALSE;
+               goto out;

        }
 
        lck_mtx_unlock(&inp->inpcb_mtx);
        }
 
        lck_mtx_unlock(&inp->inpcb_mtx);

-       return (TRUE);
+       active = TRUE;
+
+out:
+       if (mp_so) {
+               socket_unlock(mp_so, 1);
+       }
+
+       return active;

 }
 
 /*
 }
 
 /*


@@ -581,26 +739,28 @@ tcp_gc(struct inpcbinfo *ipi)
        tcp_gc_done = TRUE;
 
        LIST_FOREACH_SAFE(inp, &tcb, inp_list, nxt) {
        tcp_gc_done = TRUE;
 
        LIST_FOREACH_SAFE(inp, &tcb, inp_list, nxt) {

-               if (tcp_garbage_collect(inp, 0))
+               if (tcp_garbage_collect(inp, 0)) {

                        atomic_add_32(&ipi->ipi_gc_req.intimer_fast, 1);
                        atomic_add_32(&ipi->ipi_gc_req.intimer_fast, 1);

+               }

        }
 
        /* Now cleanup the time wait ones */
        TAILQ_FOREACH_SAFE(tw_tp, &tcp_tw_tailq, t_twentry, tw_ntp) {
                /*
        }
 
        /* Now cleanup the time wait ones */
        TAILQ_FOREACH_SAFE(tw_tp, &tcp_tw_tailq, t_twentry, tw_ntp) {
                /*

-                * We check the timestamp here without holding the 
+                * We check the timestamp here without holding the

                 * socket lock for better performance. If there are
                 * any pcbs in time-wait, the timer will get rescheduled.
                 * Hence some error in this check can be tolerated.
                 *
                 * Sometimes a socket on time-wait queue can be closed if
                 * 2MSL timer expired but the application still has a
                 * socket lock for better performance. If there are
                 * any pcbs in time-wait, the timer will get rescheduled.
                 * Hence some error in this check can be tolerated.
                 *
                 * Sometimes a socket on time-wait queue can be closed if
                 * 2MSL timer expired but the application still has a

-                * usecount on it. 
+                * usecount on it.

                 */
                 */

-               if (tw_tp->t_state == TCPS_CLOSED ||  
+               if (tw_tp->t_state == TCPS_CLOSED ||

                    TSTMP_GEQ(tcp_now, tw_tp->t_timer[TCPT_2MSL])) {
                    TSTMP_GEQ(tcp_now, tw_tp->t_timer[TCPT_2MSL])) {

-                       if (tcp_garbage_collect(tw_tp->t_inpcb, 1))
+                       if (tcp_garbage_collect(tw_tp->t_inpcb, 1)) {

                                atomic_add_32(&ipi->ipi_gc_req.intimer_lazy, 1);
                                atomic_add_32(&ipi->ipi_gc_req.intimer_lazy, 1);

+                       }

                }
        }
 
                }
        }
 


@@ -610,8 +770,9 @@ tcp_gc(struct inpcbinfo *ipi)
        lck_rw_done(ipi->ipi_lock);
 
        /* Clean up the socache while we are here */
        lck_rw_done(ipi->ipi_lock);
 
        /* Clean up the socache while we are here */

-       if (so_cache_timer())
+       if (so_cache_timer()) {

                atomic_add_32(&ipi->ipi_gc_req.intimer_lazy, 1);
                atomic_add_32(&ipi->ipi_gc_req.intimer_lazy, 1);

+       }

 
        KERNEL_DEBUG(DBG_FNC_TCP_SLOW | DBG_FUNC_END, tws_checked,
            cur_tw_slot, 0, 0, 0);
 
        KERNEL_DEBUG(DBG_FNC_TCP_SLOW | DBG_FUNC_END, tws_checked,
            cur_tw_slot, 0, 0, 0);


@@ -623,32 +784,33 @@ tcp_gc(struct inpcbinfo *ipi)
  * Cancel all timers for TCP tp.
  */
 void
  * Cancel all timers for TCP tp.
  */
 void

-tcp_canceltimers(tp)
-       struct tcpcb *tp;
+tcp_canceltimers(struct tcpcb *tp)

 {
 {

-       register int i;
+       int i;

 
        tcp_remove_timer(tp);
 
        tcp_remove_timer(tp);

-       for (i = 0; i < TCPT_NTIMERS; i++)
+       for (i = 0; i < TCPT_NTIMERS; i++) {

                tp->t_timer[i] = 0;
                tp->t_timer[i] = 0;

+       }

        tp->tentry.timer_start = tcp_now;
        tp->tentry.index = TCPT_NONE;
 }
 
        tp->tentry.timer_start = tcp_now;
        tp->tentry.index = TCPT_NONE;
 }
 

-int    tcp_syn_backoff[TCP_MAXRXTSHIFT + 1] =
-    { 1, 1, 1, 1, 1, 2, 4, 8, 16, 32, 64, 64, 64 };
+int     tcp_syn_backoff[TCP_MAXRXTSHIFT + 1] =
+{ 1, 1, 1, 1, 1, 2, 4, 8, 16, 32, 64, 64, 64 };

 
 

-int    tcp_backoff[TCP_MAXRXTSHIFT + 1] =
-    { 1, 2, 4, 8, 16, 32, 64, 64, 64, 64, 64, 64, 64 };
+int     tcp_backoff[TCP_MAXRXTSHIFT + 1] =
+{ 1, 2, 4, 8, 16, 32, 64, 64, 64, 64, 64, 64, 64 };

 
 

-static int tcp_totbackoff = 511;       /* sum of tcp_backoff[] */
+static int tcp_totbackoff = 511;        /* sum of tcp_backoff[] */

 
 

-void tcp_rexmt_save_state(struct tcpcb *tp)
+void
+tcp_rexmt_save_state(struct tcpcb *tp)

 {
        u_int32_t fsize;
        if (TSTMP_SUPPORTED(tp)) {
                /*
 {
        u_int32_t fsize;
        if (TSTMP_SUPPORTED(tp)) {
                /*

-                * Since timestamps are supported on the connection, 
+                * Since timestamps are supported on the connection,

                 * we can do recovery as described in rfc 4015.
                 */
                fsize = tp->snd_max - tp->snd_una;
                 * we can do recovery as described in rfc 4015.
                 */
                fsize = tp->snd_max - tp->snd_una;


@@ -659,19 +821,20 @@ void tcp_rexmt_save_state(struct tcpcb *tp)
                 * Timestamp option is not supported on this connection.
                 * Record ssthresh and cwnd so they can
                 * be recovered if this turns out to be a "bad" retransmit.
                 * Timestamp option is not supported on this connection.
                 * Record ssthresh and cwnd so they can
                 * be recovered if this turns out to be a "bad" retransmit.

-                * A retransmit is considered "bad" if an ACK for this 
+                * A retransmit is considered "bad" if an ACK for this

                 * segment is received within RTT/2 interval; the assumption
                 * segment is received within RTT/2 interval; the assumption

-                * here is that the ACK was already in flight.  See 
+                * here is that the ACK was already in flight.  See

                 * "On Estimating End-to-End Network Path Properties" by
                 * Allman and Paxson for more details.
                 */
                tp->snd_cwnd_prev = tp->snd_cwnd;
                tp->snd_ssthresh_prev = tp->snd_ssthresh;
                tp->snd_recover_prev = tp->snd_recover;
                 * "On Estimating End-to-End Network Path Properties" by
                 * Allman and Paxson for more details.
                 */
                tp->snd_cwnd_prev = tp->snd_cwnd;
                tp->snd_ssthresh_prev = tp->snd_ssthresh;
                tp->snd_recover_prev = tp->snd_recover;

-               if (IN_FASTRECOVERY(tp))
+               if (IN_FASTRECOVERY(tp)) {

                        tp->t_flags |= TF_WASFRECOVERY;
                        tp->t_flags |= TF_WASFRECOVERY;

-               else
+               } else {

                        tp->t_flags &= ~TF_WASFRECOVERY;
                        tp->t_flags &= ~TF_WASFRECOVERY;

+               }

        }
        tp->t_srtt_prev = (tp->t_srtt >> TCP_RTT_SHIFT) + 2;
        tp->t_rttvar_prev = (tp->t_rttvar >> TCP_RTTVAR_SHIFT);
        }
        tp->t_srtt_prev = (tp->t_srtt >> TCP_RTT_SHIFT) + 2;
        tp->t_rttvar_prev = (tp->t_rttvar >> TCP_RTTVAR_SHIFT);


@@ -682,33 +845,37 @@ void tcp_rexmt_save_state(struct tcpcb *tp)
  * Revert to the older segment size if there is an indication that PMTU
  * blackhole detection was not needed.
  */
  * Revert to the older segment size if there is an indication that PMTU
  * blackhole detection was not needed.
  */

-void tcp_pmtud_revert_segment_size(struct tcpcb *tp)
+void
+tcp_pmtud_revert_segment_size(struct tcpcb *tp)

 {
        int32_t optlen;
 
        VERIFY(tp->t_pmtud_saved_maxopd > 0);
 {
        int32_t optlen;
 
        VERIFY(tp->t_pmtud_saved_maxopd > 0);

-       tp->t_flags |= TF_PMTUD; 
-       tp->t_flags &= ~TF_BLACKHOLE; 
+       tp->t_flags |= TF_PMTUD;
+       tp->t_flags &= ~TF_BLACKHOLE;

        optlen = tp->t_maxopd - tp->t_maxseg;
        tp->t_maxopd = tp->t_pmtud_saved_maxopd;
        tp->t_maxseg = tp->t_maxopd - optlen;
        optlen = tp->t_maxopd - tp->t_maxseg;
        tp->t_maxopd = tp->t_pmtud_saved_maxopd;
        tp->t_maxseg = tp->t_maxopd - optlen;

+

        /*
        /*

-        * Reset the slow-start flight size as it 
+        * Reset the slow-start flight size as it

         * may depend on the new MSS
         */
         * may depend on the new MSS
         */

-       if (CC_ALGO(tp)->cwnd_init != NULL)
+       if (CC_ALGO(tp)->cwnd_init != NULL) {

                CC_ALGO(tp)->cwnd_init(tp);
                CC_ALGO(tp)->cwnd_init(tp);

+       }

        tp->t_pmtud_start_ts = 0;
        tcpstat.tcps_pmtudbh_reverted++;
        tp->t_pmtud_start_ts = 0;
        tcpstat.tcps_pmtudbh_reverted++;

+
+       /* change MSS according to recommendation, if there was one */
+       tcp_update_mss_locked(tp->t_inpcb->inp_socket, NULL);

 }
 
 /*
  * TCP timer processing.
  */
 struct tcpcb *
 }
 
 /*
  * TCP timer processing.
  */
 struct tcpcb *

-tcp_timers(tp, timer)
-       register struct tcpcb *tp;
-       int timer;
+tcp_timers(struct tcpcb *tp, int timer)

 {
        int32_t rexmt, optlen = 0, idle_time = 0;
        struct socket *so;
 {
        int32_t rexmt, optlen = 0, idle_time = 0;
        struct socket *so;


@@ -727,7 +894,6 @@ tcp_timers(tp, timer)
        idle_time = tcp_now - tp->t_rcvtime;
 
        switch (timer) {
        idle_time = tcp_now - tp->t_rcvtime;
 
        switch (timer) {

-

        /*
         * 2 MSL timeout in shutdown went off.  If we're closed but
         * still waiting for peer to close and connection has been idle
        /*
         * 2 MSL timeout in shutdown went off.  If we're closed but
         * still waiting for peer to close and connection has been idle


@@ -741,11 +907,11 @@ tcp_timers(tp, timer)
                if (tp->t_state != TCPS_TIME_WAIT &&
                    tp->t_state != TCPS_FIN_WAIT_2 &&
                    ((idle_time > 0) && (idle_time < TCP_CONN_MAXIDLE(tp)))) {
                if (tp->t_state != TCPS_TIME_WAIT &&
                    tp->t_state != TCPS_FIN_WAIT_2 &&
                    ((idle_time > 0) && (idle_time < TCP_CONN_MAXIDLE(tp)))) {

-                       tp->t_timer[TCPT_2MSL] = OFFSET_FROM_START(tp, 
-                               (u_int32_t)TCP_CONN_KEEPINTVL(tp));
+                       tp->t_timer[TCPT_2MSL] = OFFSET_FROM_START(tp,
+                           (u_int32_t)TCP_CONN_KEEPINTVL(tp));

                } else {
                        tp = tcp_close(tp);
                } else {
                        tp = tcp_close(tp);

-                       return(tp);
+                       return tp;

                }
                break;
 
                }
                break;
 


@@ -755,9 +921,12 @@ tcp_timers(tp, timer)
         * to a longer retransmit interval and retransmit one segment.
         */
        case TCPT_REXMT:
         * to a longer retransmit interval and retransmit one segment.
         */
        case TCPT_REXMT:

-               accsleep_ms = mach_absolutetime_asleep / 1000000UL;
-               if (accsleep_ms > tp->t_accsleep_ms)
+               absolutetime_to_nanoseconds(mach_absolutetime_asleep,
+                   &accsleep_ms);
+               accsleep_ms = accsleep_ms / 1000000UL;
+               if (accsleep_ms > tp->t_accsleep_ms) {

                        last_sleep_ms = accsleep_ms - tp->t_accsleep_ms;
                        last_sleep_ms = accsleep_ms - tp->t_accsleep_ms;

+               }

                /*
                 * Drop a connection in the retransmit timer
                 * 1. If we have retransmitted more than TCP_MAXRXTSHIFT
                /*
                 * Drop a connection in the retransmit timer
                 * 1. If we have retransmitted more than TCP_MAXRXTSHIFT


@@ -775,6 +944,20 @@ tcp_timers(tp, timer)
                    ((tp->t_flagsext & TF_RXTFINDROP) != 0 &&
                    (tp->t_flags & TF_SENTFIN) != 0 && tp->t_rxtshift >= 4) ||
                    (tp->t_rxtshift > 4 && last_sleep_ms >= TCP_SLEEP_TOO_LONG)) {
                    ((tp->t_flagsext & TF_RXTFINDROP) != 0 &&
                    (tp->t_flags & TF_SENTFIN) != 0 && tp->t_rxtshift >= 4) ||
                    (tp->t_rxtshift > 4 && last_sleep_ms >= TCP_SLEEP_TOO_LONG)) {

+                       if (tp->t_state == TCPS_ESTABLISHED &&
+                           tp->t_rxt_minimum_timeout > 0) {
+                               /*
+                                * Avoid dropping a connection if minimum
+                                * timeout is set and that time did not
+                                * pass. We will retry sending
+                                * retransmissions at the maximum interval
+                                */
+                               if (TSTMP_LT(tcp_now, (tp->t_rxtstart +
+                                   tp->t_rxt_minimum_timeout))) {
+                                       tp->t_rxtshift = TCP_MAXRXTSHIFT - 1;
+                                       goto retransmit_packet;
+                               }
+                       }

                        if ((tp->t_flagsext & TF_RXTFINDROP) != 0) {
                                tcpstat.tcps_rxtfindrop++;
                        } else if (last_sleep_ms >= TCP_SLEEP_TOO_LONG) {
                        if ((tp->t_flagsext & TF_RXTFINDROP) != 0) {
                                tcpstat.tcps_rxtfindrop++;
                        } else if (last_sleep_ms >= TCP_SLEEP_TOO_LONG) {


@@ -792,28 +975,34 @@ tcp_timers(tp, timer)
                                }
                        }
                        tp->t_rxtshift = TCP_MAXRXTSHIFT;
                                }
                        }
                        tp->t_rxtshift = TCP_MAXRXTSHIFT;

-                       postevent(so, 0, EV_TIMEOUT);                   
-                       soevent(so, 
-                           (SO_FILT_HINT_LOCKED|SO_FILT_HINT_TIMEOUT));
+                       postevent(so, 0, EV_TIMEOUT);
+                       soevent(so,
+                           (SO_FILT_HINT_LOCKED | SO_FILT_HINT_TIMEOUT));
+
+                       if (TCP_ECN_ENABLED(tp) &&
+                           tp->t_state == TCPS_ESTABLISHED) {
+                               tcp_heuristic_ecn_droprxmt(tp);
+                       }
+

                        tp = tcp_drop(tp, tp->t_softerror ?
                            tp->t_softerror : ETIMEDOUT);
 
                        break;
                }
                        tp = tcp_drop(tp, tp->t_softerror ?
                            tp->t_softerror : ETIMEDOUT);
 
                        break;
                }

-
+retransmit_packet:

                tcpstat.tcps_rexmttimeo++;
                tp->t_accsleep_ms = accsleep_ms;
 
                tcpstat.tcps_rexmttimeo++;
                tp->t_accsleep_ms = accsleep_ms;
 

-               if (tp->t_rxtshift == 1 && 
-                       tp->t_state == TCPS_ESTABLISHED) {
+               if (tp->t_rxtshift == 1 &&
+                   tp->t_state == TCPS_ESTABLISHED) {

                        /* Set the time at which retransmission started. */
                        tp->t_rxtstart = tcp_now;
 
                        /* Set the time at which retransmission started. */
                        tp->t_rxtstart = tcp_now;
 

-                       /* 
+                       /*

                         * if this is the first retransmit timeout, save
                         * the state so that we can recover if the timeout
                         * is spurious.
                         * if this is the first retransmit timeout, save
                         * the state so that we can recover if the timeout
                         * is spurious.

-                        */ 
+                        */

                        tcp_rexmt_save_state(tp);
                }
 #if MPTCP
                        tcp_rexmt_save_state(tp);
                }
 #if MPTCP


@@ -821,17 +1010,22 @@ tcp_timers(tp, timer)
                    (tp->t_state == TCPS_ESTABLISHED) &&
                    (tp->t_mpflags & TMPF_MPTCP_TRUE)) {
                        mptcp_act_on_txfail(so);
                    (tp->t_state == TCPS_ESTABLISHED) &&
                    (tp->t_mpflags & TMPF_MPTCP_TRUE)) {
                        mptcp_act_on_txfail(so);

+               }
+
+               if (so->so_flags & SOF_MP_SUBFLOW) {
+                       struct mptses *mpte = tptomptp(tp)->mpt_mpte;

 
 

+                       mptcp_check_subflows_and_add(mpte);

                }
 #endif /* MPTCP */
 
                if (tp->t_adaptive_wtimo > 0 &&
                }
 #endif /* MPTCP */
 
                if (tp->t_adaptive_wtimo > 0 &&

-                       tp->t_rxtshift > tp->t_adaptive_wtimo &&
-                       TCPS_HAVEESTABLISHED(tp->t_state)) {
+                   tp->t_rxtshift > tp->t_adaptive_wtimo &&
+                   TCPS_HAVEESTABLISHED(tp->t_state)) {

                        /* Send an event to the application */
                        soevent(so,
                        /* Send an event to the application */
                        soevent(so,

-                               (SO_FILT_HINT_LOCKED|
-                               SO_FILT_HINT_ADAPTIVE_WTIMO));
+                           (SO_FILT_HINT_LOCKED |
+                           SO_FILT_HINT_ADAPTIVE_WTIMO));

                }
 
                /*
                }
 
                /*


@@ -855,13 +1049,15 @@ tcp_timers(tp, timer)
                        tp->t_flagsext &= ~(TF_DELAY_RECOVERY);
                }
 
                        tp->t_flagsext &= ~(TF_DELAY_RECOVERY);
                }
 

-               if (tp->t_state == TCPS_SYN_RECEIVED)
+               if (tp->t_state == TCPS_SYN_RECEIVED) {

                        tcp_disable_tfo(tp);
                        tcp_disable_tfo(tp);

+               }

 
 

-               if ((tp->t_tfo_stats & TFO_S_SYN_DATA_SENT) &&
+               if (!(tp->t_tfo_flags & TFO_F_HEURISTIC_DONE) &&
+                   (tp->t_tfo_stats & TFO_S_SYN_DATA_SENT) &&

                    !(tp->t_tfo_flags & TFO_F_NO_SNDPROBING) &&
                    ((tp->t_state != TCPS_SYN_SENT && tp->t_rxtshift > 1) ||
                    !(tp->t_tfo_flags & TFO_F_NO_SNDPROBING) &&
                    ((tp->t_state != TCPS_SYN_SENT && tp->t_rxtshift > 1) ||

-                    tp->t_rxtshift > 2)) {
+                   tp->t_rxtshift > 4)) {

                        /*
                         * For regular retransmissions, a first one is being
                         * done for tail-loss probe.
                        /*
                         * For regular retransmissions, a first one is being
                         * done for tail-loss probe.


@@ -876,6 +1072,21 @@ tcp_timers(tp, timer)
                        so->so_error = ENODATA;
                        sorwakeup(so);
                        sowwakeup(so);
                        so->so_error = ENODATA;
                        sorwakeup(so);
                        sowwakeup(so);

+
+                       tp->t_tfo_stats |= TFO_S_SEND_BLACKHOLE;
+                       tcpstat.tcps_tfo_sndblackhole++;
+               }
+
+               if (!(tp->t_tfo_flags & TFO_F_HEURISTIC_DONE) &&
+                   (tp->t_tfo_stats & TFO_S_SYN_DATA_ACKED) &&
+                   tp->t_rxtshift > 3) {
+                       if (TSTMP_GT(tp->t_sndtime - 10 * TCP_RETRANSHZ, tp->t_rcvtime)) {
+                               tcp_heuristic_tfo_middlebox(tp);
+
+                               so->so_error = ENODATA;
+                               sorwakeup(so);
+                               sowwakeup(so);
+                       }

                }
 
                if (tp->t_state == TCPS_SYN_SENT) {
                }
 
                if (tp->t_state == TCPS_SYN_SENT) {


@@ -883,36 +1094,36 @@ tcp_timers(tp, timer)
                        tp->t_stat.synrxtshift = tp->t_rxtshift;
 
                        /* When retransmitting, disable TFO */
                        tp->t_stat.synrxtshift = tp->t_rxtshift;
 
                        /* When retransmitting, disable TFO */

-                       if (tfo_enabled(tp)) {
+                       if (tfo_enabled(tp) &&
+                           (!(so->so_flags1 & SOF1_DATA_AUTHENTICATED) ||
+                           (tp->t_flagsext & TF_FASTOPEN_HEUR))) {

                                tp->t_flagsext &= ~TF_FASTOPEN;
                                tp->t_tfo_flags |= TFO_F_SYN_LOSS;
                                tp->t_flagsext &= ~TF_FASTOPEN;
                                tp->t_tfo_flags |= TFO_F_SYN_LOSS;

-
-                               tp->t_tfo_stats |= TFO_S_SYN_LOSS;
-                               tcpstat.tcps_tfo_syn_loss++;

                        }
                } else {
                        rexmt = TCP_REXMTVAL(tp) * tcp_backoff[tp->t_rxtshift];
                }
 
                TCPT_RANGESET(tp->t_rxtcur, rexmt, tp->t_rttmin, TCPTV_REXMTMAX,
                        }
                } else {
                        rexmt = TCP_REXMTVAL(tp) * tcp_backoff[tp->t_rxtshift];
                }
 
                TCPT_RANGESET(tp->t_rxtcur, rexmt, tp->t_rttmin, TCPTV_REXMTMAX,

-                       TCP_ADD_REXMTSLOP(tp));
+                   TCP_ADD_REXMTSLOP(tp));

                tp->t_timer[TCPT_REXMT] = OFFSET_FROM_START(tp, tp->t_rxtcur);
 
                tp->t_timer[TCPT_REXMT] = OFFSET_FROM_START(tp, tp->t_rxtcur);
 

-               if (INP_WAIT_FOR_IF_FEEDBACK(tp->t_inpcb))
+               if (INP_WAIT_FOR_IF_FEEDBACK(tp->t_inpcb)) {

                        goto fc_output;
                        goto fc_output;

+               }

 
                tcp_free_sackholes(tp);
                /*
                 * Check for potential Path MTU Discovery Black Hole
                 */
                if (tcp_pmtud_black_hole_detect &&
 
                tcp_free_sackholes(tp);
                /*
                 * Check for potential Path MTU Discovery Black Hole
                 */
                if (tcp_pmtud_black_hole_detect &&

-                       !(tp->t_flagsext & TF_NOBLACKHOLE_DETECTION) &&
-                       (tp->t_state == TCPS_ESTABLISHED)) {
+                   !(tp->t_flagsext & TF_NOBLACKHOLE_DETECTION) &&
+                   (tp->t_state == TCPS_ESTABLISHED)) {

                        if ((tp->t_flags & TF_PMTUD) &&
                            ((tp->t_flags & TF_MAXSEGSNT)
                            || tp->t_pmtud_lastseg_size > tcp_pmtud_black_hole_mss) &&
                            tp->t_rxtshift == 2) {
                        if ((tp->t_flags & TF_PMTUD) &&
                            ((tp->t_flags & TF_MAXSEGSNT)
                            || tp->t_pmtud_lastseg_size > tcp_pmtud_black_hole_mss) &&
                            tp->t_rxtshift == 2) {

-                               /* 
+                               /*

                                 * Enter Path MTU Black-hole Detection mechanism:
                                 * - Disable Path MTU Discovery (IP "DF" bit).
                                 * - Reduce MTU to lower value than what we
                                 * Enter Path MTU Black-hole Detection mechanism:
                                 * - Disable Path MTU Discovery (IP "DF" bit).
                                 * - Reduce MTU to lower value than what we


@@ -926,26 +1137,29 @@ tcp_timers(tp, timer)
                                /* Keep track of previous MSS */
                                tp->t_pmtud_saved_maxopd = tp->t_maxopd;
                                tp->t_pmtud_start_ts = tcp_now;
                                /* Keep track of previous MSS */
                                tp->t_pmtud_saved_maxopd = tp->t_maxopd;
                                tp->t_pmtud_start_ts = tcp_now;

-                               if (tp->t_pmtud_start_ts == 0)
+                               if (tp->t_pmtud_start_ts == 0) {

                                        tp->t_pmtud_start_ts++;
                                        tp->t_pmtud_start_ts++;

+                               }

                                /* Reduce the MSS to intermediary value */
                                if (tp->t_maxopd > tcp_pmtud_black_hole_mss) {
                                        tp->t_maxopd = tcp_pmtud_black_hole_mss;
                                } else {
                                /* Reduce the MSS to intermediary value */
                                if (tp->t_maxopd > tcp_pmtud_black_hole_mss) {
                                        tp->t_maxopd = tcp_pmtud_black_hole_mss;
                                } else {

-                                       tp->t_maxopd =  /* use the default MSS */
+                                       tp->t_maxopd = /* use the default MSS */

 #if INET6
 #if INET6

-                                               isipv6 ? tcp_v6mssdflt :
+                                           isipv6 ? tcp_v6mssdflt :

 #endif /* INET6 */
 #endif /* INET6 */

-                                                       tcp_mssdflt;
+                                           tcp_mssdflt;

                                }
                                tp->t_maxseg = tp->t_maxopd - optlen;
 
                                /*
                                }
                                tp->t_maxseg = tp->t_maxopd - optlen;
 
                                /*

-                                * Reset the slow-start flight size 
+                                * Reset the slow-start flight size

                                 * as it may depend on the new MSS
                                 * as it may depend on the new MSS

-                                */
-                               if (CC_ALGO(tp)->cwnd_init != NULL)
+                                */
+                               if (CC_ALGO(tp)->cwnd_init != NULL) {

                                        CC_ALGO(tp)->cwnd_init(tp);
                                        CC_ALGO(tp)->cwnd_init(tp);

+                               }
+                               tp->snd_cwnd = tp->t_maxseg;

                        }
                        /*
                         * If further retransmissions are still
                        }
                        /*
                         * If further retransmissions are still


@@ -954,10 +1168,10 @@ tcp_timers(tp, timer)
                         * MSS and blackhole detection flags.
                         */
                        else {
                         * MSS and blackhole detection flags.
                         */
                        else {

-       

                                if ((tp->t_flags & TF_BLACKHOLE) &&
                                    (tp->t_rxtshift > 4)) {
                                        tcp_pmtud_revert_segment_size(tp);
                                if ((tp->t_flags & TF_BLACKHOLE) &&
                                    (tp->t_rxtshift > 4)) {
                                        tcp_pmtud_revert_segment_size(tp);

+                                       tp->snd_cwnd = tp->t_maxseg;

                                }
                        }
                }
                                }
                        }
                }


@@ -973,8 +1187,9 @@ tcp_timers(tp, timer)
                 * Do this only on non-local connections.
                 */
                if (tp->t_state == TCPS_SYN_SENT &&
                 * Do this only on non-local connections.
                 */
                if (tp->t_state == TCPS_SYN_SENT &&

-                   tp->t_rxtshift == tcp_broken_peer_syn_rxmit_thres)
-                       tp->t_flags &= ~(TF_REQ_SCALE|TF_REQ_TSTMP|TF_REQ_CC);
+                   tp->t_rxtshift == tcp_broken_peer_syn_rxmit_thres) {
+                       tp->t_flags &= ~(TF_REQ_SCALE | TF_REQ_TSTMP | TF_REQ_CC);
+               }

 
                /*
                 * If losing, let the lower level know and try for
 
                /*
                 * If losing, let the lower level know and try for


@@ -986,9 +1201,9 @@ tcp_timers(tp, timer)
                 */
                if (tp->t_rxtshift > TCP_MAXRXTSHIFT / 4) {
 #if INET6
                 */
                if (tp->t_rxtshift > TCP_MAXRXTSHIFT / 4) {
 #if INET6

-                       if (isipv6)
+                       if (isipv6) {

                                in6_losing(tp->t_inpcb);
                                in6_losing(tp->t_inpcb);

-                       else
+                       } else

 #endif /* INET6 */
                        in_losing(tp->t_inpcb);
                        tp->t_rttvar += (tp->t_srtt >> TCP_RTT_SHIFT);
 #endif /* INET6 */
                        in_losing(tp->t_inpcb);
                        tp->t_rttvar += (tp->t_srtt >> TCP_RTT_SHIFT);


@@ -1008,8 +1223,9 @@ tcp_timers(tp, timer)
                /* If timing a segment in this window, stop the timer */
                tp->t_rtttime = 0;
 
                /* If timing a segment in this window, stop the timer */
                tp->t_rtttime = 0;
 

-               if (!IN_FASTRECOVERY(tp) && tp->t_rxtshift == 1)
+               if (!IN_FASTRECOVERY(tp) && tp->t_rxtshift == 1) {

                        tcpstat.tcps_tailloss_rto++;
                        tcpstat.tcps_tailloss_rto++;

+               }

 
 
                /*
 
 
                /*


@@ -1018,7 +1234,7 @@ tcp_timers(tp, timer)
                 * been retransmitted by way of the retransmission timer at
                 * least once, the value of ssthresh is held constant
                 */
                 * been retransmitted by way of the retransmission timer at
                 * least once, the value of ssthresh is held constant
                 */

-               if (tp->t_rxtshift == 1 && 
+               if (tp->t_rxtshift == 1 &&

                    CC_ALGO(tp)->after_timeout != NULL) {
                        CC_ALGO(tp)->after_timeout(tp);
                        /*
                    CC_ALGO(tp)->after_timeout != NULL) {
                        CC_ALGO(tp)->after_timeout(tp);
                        /*


@@ -1026,8 +1242,9 @@ tcp_timers(tp, timer)
                         * right after Fast Retransmits and ECE
                         * notification receipts.
                         */
                         * right after Fast Retransmits and ECE
                         * notification receipts.
                         */

-                       if (TCP_ECN_ENABLED(tp))
+                       if (TCP_ECN_ENABLED(tp)) {

                                tp->ecn_flags |= TE_SENDCWR;
                                tp->ecn_flags |= TE_SENDCWR;

+                       }

                }
 
                EXIT_FASTRECOVERY(tp);
                }
 
                EXIT_FASTRECOVERY(tp);


@@ -1054,20 +1271,20 @@ fc_output:
                 * backoff, drop the connection if the idle time
                 * (no responses to probes) reaches the maximum
                 * backoff that we would use if retransmitting.
                 * backoff, drop the connection if the idle time
                 * (no responses to probes) reaches the maximum
                 * backoff that we would use if retransmitting.

-                * 
-                * Drop the connection if we reached the maximum allowed time for 
-                * Zero Window Probes without a non-zero update from the peer. 
+                *
+                * Drop the connection if we reached the maximum allowed time for
+                * Zero Window Probes without a non-zero update from the peer.

                 * See rdar://5805356
                 */
                if ((tp->t_rxtshift == TCP_MAXRXTSHIFT &&
                    (idle_time >= tcp_maxpersistidle ||
                 * See rdar://5805356
                 */
                if ((tp->t_rxtshift == TCP_MAXRXTSHIFT &&
                    (idle_time >= tcp_maxpersistidle ||

-                   idle_time >= TCP_REXMTVAL(tp) * tcp_totbackoff)) || 
-                   ((tp->t_persist_stop != 0) && 
-                       TSTMP_LEQ(tp->t_persist_stop, tcp_now))) {
+                   idle_time >= TCP_REXMTVAL(tp) * tcp_totbackoff)) ||
+                   ((tp->t_persist_stop != 0) &&
+                   TSTMP_LEQ(tp->t_persist_stop, tcp_now))) {

                        tcpstat.tcps_persistdrop++;
                        postevent(so, 0, EV_TIMEOUT);
                        soevent(so,
                        tcpstat.tcps_persistdrop++;
                        postevent(so, 0, EV_TIMEOUT);
                        soevent(so,

-                           (SO_FILT_HINT_LOCKED|SO_FILT_HINT_TIMEOUT));
+                           (SO_FILT_HINT_LOCKED | SO_FILT_HINT_TIMEOUT));

                        tp = tcp_drop(tp, ETIMEDOUT);
                        break;
                }
                        tp = tcp_drop(tp, ETIMEDOUT);
                        break;
                }


@@ -1088,24 +1305,27 @@ fc_output:
                 * Regular TCP connections do not send keepalives after closing
                 * MPTCP must not also, after sending Data FINs.
                 */
                 * Regular TCP connections do not send keepalives after closing
                 * MPTCP must not also, after sending Data FINs.
                 */

-               struct mptcb *mp_tp = tp->t_mptcb;
+               struct mptcb *mp_tp = tptomptp(tp);

                if ((tp->t_mpflags & TMPF_MPTCP_TRUE) &&
                    (tp->t_state > TCPS_ESTABLISHED)) {
                        goto dropit;
                } else if (mp_tp != NULL) {
                if ((tp->t_mpflags & TMPF_MPTCP_TRUE) &&
                    (tp->t_state > TCPS_ESTABLISHED)) {
                        goto dropit;
                } else if (mp_tp != NULL) {

-                       if ((mptcp_ok_to_keepalive(mp_tp) == 0))
+                       if ((mptcp_ok_to_keepalive(mp_tp) == 0)) {

                                goto dropit;
                                goto dropit;

+                       }

                }
 #endif /* MPTCP */
                }
 #endif /* MPTCP */

-               if (tp->t_state < TCPS_ESTABLISHED)
+               if (tp->t_state < TCPS_ESTABLISHED) {

                        goto dropit;
                        goto dropit;

+               }

                if ((always_keepalive ||
                    (tp->t_inpcb->inp_socket->so_options & SO_KEEPALIVE) ||
                    (tp->t_flagsext & TF_DETECT_READSTALL) ||
                    (tp->t_tfo_probe_state == TFO_PROBE_PROBING)) &&
                    (tp->t_state <= TCPS_CLOSING || tp->t_state == TCPS_FIN_WAIT_2)) {
                if ((always_keepalive ||
                    (tp->t_inpcb->inp_socket->so_options & SO_KEEPALIVE) ||
                    (tp->t_flagsext & TF_DETECT_READSTALL) ||
                    (tp->t_tfo_probe_state == TFO_PROBE_PROBING)) &&
                    (tp->t_state <= TCPS_CLOSING || tp->t_state == TCPS_FIN_WAIT_2)) {

-                       if (idle_time >= TCP_CONN_KEEPIDLE(tp) + TCP_CONN_MAXIDLE(tp))
+                       if (idle_time >= TCP_CONN_KEEPIDLE(tp) + TCP_CONN_MAXIDLE(tp)) {

                                goto dropit;
                                goto dropit;

+                       }

                        /*
                         * Send a packet designed to force a response
                         * if the peer is up and reachable:
                        /*
                         * Send a packet designed to force a response
                         * if the peer is up and reachable:


@@ -1128,16 +1348,19 @@ fc_output:
                                tra.nocell = INP_NO_CELLULAR(inp);
                                tra.noexpensive = INP_NO_EXPENSIVE(inp);
                                tra.awdl_unrestricted = INP_AWDL_UNRESTRICTED(inp);
                                tra.nocell = INP_NO_CELLULAR(inp);
                                tra.noexpensive = INP_NO_EXPENSIVE(inp);
                                tra.awdl_unrestricted = INP_AWDL_UNRESTRICTED(inp);

-                               if (tp->t_inpcb->inp_flags & INP_BOUND_IF)
+                               tra.intcoproc_allowed = INP_INTCOPROC_ALLOWED(inp);
+                               if (tp->t_inpcb->inp_flags & INP_BOUND_IF) {

                                        tra.ifscope = tp->t_inpcb->inp_boundifp->if_index;
                                        tra.ifscope = tp->t_inpcb->inp_boundifp->if_index;

-                               else
+                               } else {

                                        tra.ifscope = IFSCOPE_NONE;
                                        tra.ifscope = IFSCOPE_NONE;

+                               }

                                tcp_respond(tp, t_template->tt_ipgen,
                                    &t_template->tt_t, (struct mbuf *)NULL,
                                    tp->rcv_nxt, tp->snd_una - 1, 0, &tra);
                                (void) m_free(dtom(t_template));
                                tcp_respond(tp, t_template->tt_ipgen,
                                    &t_template->tt_t, (struct mbuf *)NULL,
                                    tp->rcv_nxt, tp->snd_una - 1, 0, &tra);
                                (void) m_free(dtom(t_template));

-                               if (tp->t_flagsext & TF_DETECT_READSTALL)
+                               if (tp->t_flagsext & TF_DETECT_READSTALL) {

                                        tp->t_rtimo_probes++;
                                        tp->t_rtimo_probes++;

+                               }

                        }
                        tp->t_timer[TCPT_KEEP] = OFFSET_FROM_START(tp,
                            TCP_CONN_KEEPINTVL(tp));
                        }
                        tp->t_timer[TCPT_KEEP] = OFFSET_FROM_START(tp,
                            TCP_CONN_KEEPINTVL(tp));


@@ -1148,9 +1371,9 @@ fc_output:
                if (tp->t_flagsext & TF_DETECT_READSTALL) {
                        struct ifnet *outifp = tp->t_inpcb->inp_last_outifp;
                        bool reenable_probe = false;
                if (tp->t_flagsext & TF_DETECT_READSTALL) {
                        struct ifnet *outifp = tp->t_inpcb->inp_last_outifp;
                        bool reenable_probe = false;

-                       /* 
+                       /*

                         * The keep alive packets sent to detect a read
                         * The keep alive packets sent to detect a read

-                        * stall did not get a response from the 
+                        * stall did not get a response from the

                         * peer. Generate more keep-alives to confirm this.
                         * If the number of probes sent reaches the limit,
                         * generate an event.
                         * peer. Generate more keep-alives to confirm this.
                         * If the number of probes sent reaches the limit,
                         * generate an event.


@@ -1176,7 +1399,7 @@ fc_output:
                                int ind = min(tp->t_rtimo_probes,
                                    TCP_MAXRXTSHIFT);
                                tp->t_timer[TCPT_KEEP] = OFFSET_FROM_START(
                                int ind = min(tp->t_rtimo_probes,
                                    TCP_MAXRXTSHIFT);
                                tp->t_timer[TCPT_KEEP] = OFFSET_FROM_START(

-                                   tp, tcp_backoff[ind] * TCP_REXMTVAL(tp));
+                                       tp, tcp_backoff[ind] * TCP_REXMTVAL(tp));

                        }
                }
                if (tp->t_tfo_probe_state == TFO_PROBE_PROBING) {
                        }
                }
                if (tp->t_tfo_probe_state == TFO_PROBE_PROBING) {


@@ -1193,14 +1416,16 @@ fc_output:
                         * backing off.
                         */
                        tp->t_timer[TCPT_KEEP] = min(OFFSET_FROM_START(
                         * backing off.
                         */
                        tp->t_timer[TCPT_KEEP] = min(OFFSET_FROM_START(

-                           tp, tcp_backoff[ind] * TCP_REXMTVAL(tp)),
+                                   tp, tcp_backoff[ind] * TCP_REXMTVAL(tp)),

                            tp->t_timer[TCPT_KEEP]);
                            tp->t_timer[TCPT_KEEP]);

-               } else if (tp->t_tfo_probe_state == TFO_PROBE_WAIT_DATA) {
+               } else if (!(tp->t_tfo_flags & TFO_F_HEURISTIC_DONE) &&
+                   tp->t_tfo_probe_state == TFO_PROBE_WAIT_DATA) {

                        /* Still no data! Let's assume a TFO-error and err out... */
                        tcp_heuristic_tfo_middlebox(tp);
 
                        so->so_error = ENODATA;
                        sorwakeup(so);
                        /* Still no data! Let's assume a TFO-error and err out... */
                        tcp_heuristic_tfo_middlebox(tp);
 
                        so->so_error = ENODATA;
                        sorwakeup(so);

+                       tp->t_tfo_stats |= TFO_S_RECV_BLACKHOLE;

                        tcpstat.tcps_tfo_blackhole++;
                }
                break;
                        tcpstat.tcps_tfo_blackhole++;
                }
                break;


@@ -1213,7 +1438,7 @@ fc_output:
                        /*
                         * If delayed ack timer fired while stretching
                         * acks, count the number of times the streaming
                        /*
                         * If delayed ack timer fired while stretching
                         * acks, count the number of times the streaming

-                        * detection was not correct. If this exceeds a 
+                        * detection was not correct. If this exceeds a

                         * threshold, disable strech ack on this
                         * connection
                         *
                         * threshold, disable strech ack on this
                         * connection
                         *


@@ -1221,11 +1446,12 @@ fc_output:
                         */
                        if ((tp->t_flags & TF_STRETCHACK)) {
                                if (tp->t_unacksegs > 1 &&
                         */
                        if ((tp->t_flags & TF_STRETCHACK)) {
                                if (tp->t_unacksegs > 1 &&

-                                   tp->t_unacksegs < maxseg_unacked)
+                                   tp->t_unacksegs < maxseg_unacked) {

                                        tp->t_stretchack_delayed++;
                                        tp->t_stretchack_delayed++;

+                               }

 
                                if (tp->t_stretchack_delayed >
 
                                if (tp->t_stretchack_delayed >

-                                       TCP_STRETCHACK_DELAY_THRESHOLD) {
+                                   TCP_STRETCHACK_DELAY_THRESHOLD) {

                                        tp->t_flagsext |= TF_DISABLE_STRETCHACK;
                                        /*
                                         * Note the time at which stretch
                                        tp->t_flagsext |= TF_DISABLE_STRETCHACK;
                                        /*
                                         * Note the time at which stretch


@@ -1234,6 +1460,7 @@ fc_output:
                                        tp->rcv_nostrack_ts = tcp_now;
                                        tcpstat.tcps_nostretchack++;
                                        tp->t_stretchack_delayed = 0;
                                        tp->rcv_nostrack_ts = tcp_now;
                                        tcpstat.tcps_nostretchack++;
                                        tp->t_stretchack_delayed = 0;

+                                       tp->rcv_nostrack_pkts = 0;

                                }
                                tcp_reset_stretch_ack(tp);
                        }
                                }
                                tcp_reset_stretch_ack(tp);
                        }


@@ -1259,18 +1486,19 @@ fc_output:
                        if (++tp->t_mprxtshift > TCP_MAXRXTSHIFT) {
                                tcpstat.tcps_timeoutdrop++;
                                postevent(so, 0, EV_TIMEOUT);
                        if (++tp->t_mprxtshift > TCP_MAXRXTSHIFT) {
                                tcpstat.tcps_timeoutdrop++;
                                postevent(so, 0, EV_TIMEOUT);

-                               soevent(so, 
-                                   (SO_FILT_HINT_LOCKED|
+                               soevent(so,
+                                   (SO_FILT_HINT_LOCKED |

                                    SO_FILT_HINT_TIMEOUT));
                                tp = tcp_drop(tp, tp->t_softerror ?
                                    SO_FILT_HINT_TIMEOUT));
                                tp = tcp_drop(tp, tp->t_softerror ?

-                                   tp->t_softerror : ETIMEDOUT);
+                                   tp->t_softerror : ETIMEDOUT);

                                break;
                        }
                        tcpstat.tcps_join_rxmts++;
                                break;
                        }
                        tcpstat.tcps_join_rxmts++;

+                       tp->t_mpflags |= TMPF_SND_JACK;

                        tp->t_flags |= TF_ACKNOW;
 
                        /*
                        tp->t_flags |= TF_ACKNOW;
 
                        /*

-                        * No backoff is implemented for simplicity for this 
+                        * No backoff is implemented for simplicity for this

                         * corner case.
                         */
                        (void) tcp_output(tp);
                         * corner case.
                         */
                        (void) tcp_output(tp);


@@ -1288,11 +1516,13 @@ fc_output:
                 * send a probe
                 */
                if (tp->t_state != TCPS_ESTABLISHED ||
                 * send a probe
                 */
                if (tp->t_state != TCPS_ESTABLISHED ||

-                   (tp->t_rxtshift > 0 && !(tp->t_flagsext & TF_PROBING))
-                   || tp->snd_max == tp->snd_una ||
-                   !SACK_ENABLED(tp) || !TAILQ_EMPTY(&tp->snd_holes) ||
-                   IN_FASTRECOVERY(tp))
+                   (tp->t_rxtshift > 0 && !(tp->t_flagsext & TF_PROBING)) ||
+                   tp->snd_max == tp->snd_una ||
+                   !SACK_ENABLED(tp) ||
+                   !TAILQ_EMPTY(&tp->snd_holes) ||
+                   IN_FASTRECOVERY(tp)) {

                        break;
                        break;

+               }

 
                /*
                 * If there is no new data to send or if the
 
                /*
                 * If there is no new data to send or if the


@@ -1311,8 +1541,9 @@ fc_output:
                }
 
                tcpstat.tcps_pto++;
                }
 
                tcpstat.tcps_pto++;

-               if (tp->t_flagsext & TF_PROBING)
+               if (tp->t_flagsext & TF_PROBING) {

                        tcpstat.tcps_probe_if++;
                        tcpstat.tcps_probe_if++;

+               }

 
                /* If timing a segment in this window, stop the timer */
                tp->t_rtttime = 0;
 
                /* If timing a segment in this window, stop the timer */
                tp->t_rtttime = 0;


@@ -1321,7 +1552,16 @@ fc_output:
                tp->t_tlpstart = tcp_now;
 
                tp->snd_cwnd += tp->t_maxseg;
                tp->t_tlpstart = tcp_now;
 
                tp->snd_cwnd += tp->t_maxseg;

-               (void )tcp_output(tp);
+
+               /*
+                * When tail-loss-probe fires, we reset the RTO timer, because
+                * a probe just got sent, so we are good to push out the timer.
+                *
+                * Set to 0 to ensure that tcp_output() will reschedule it
+                */
+               tp->t_timer[TCPT_REXMT] = 0;
+
+               (void)tcp_output(tp);

                tp->snd_cwnd -= tp->t_maxseg;
 
                tp->t_tlphighrxt = tp->snd_nxt;
                tp->snd_cwnd -= tp->t_maxseg;
 
                tp->t_tlphighrxt = tp->snd_nxt;


@@ -1338,15 +1578,17 @@ fc_output:
                 */
                if (IN_FASTRECOVERY(tp) ||
                    SEQ_GEQ(tp->snd_una, tp->snd_recover) ||
                 */
                if (IN_FASTRECOVERY(tp) ||
                    SEQ_GEQ(tp->snd_una, tp->snd_recover) ||

-                   tp->t_rxtshift > 0)
+                   tp->t_rxtshift > 0) {

                        break;
                        break;

+               }

 
                VERIFY(SACK_ENABLED(tp));
                tcp_rexmt_save_state(tp);
                if (CC_ALGO(tp)->pre_fr != NULL) {
                        CC_ALGO(tp)->pre_fr(tp);
 
                VERIFY(SACK_ENABLED(tp));
                tcp_rexmt_save_state(tp);
                if (CC_ALGO(tp)->pre_fr != NULL) {
                        CC_ALGO(tp)->pre_fr(tp);

-                       if (TCP_ECN_ENABLED(tp))
+                       if (TCP_ECN_ENABLED(tp)) {

                                tp->ecn_flags |= TE_SENDCWR;
                                tp->ecn_flags |= TE_SENDCWR;

+                       }

                }
                ENTER_FASTRECOVERY(tp);
 
                }
                ENTER_FASTRECOVERY(tp);
 


@@ -1358,20 +1600,21 @@ fc_output:
                tcp_ccdbg_trace(tp, NULL, TCP_CC_ENTER_FASTRECOVERY);
                (void) tcp_output(tp);
                break;
                tcp_ccdbg_trace(tp, NULL, TCP_CC_ENTER_FASTRECOVERY);
                (void) tcp_output(tp);
                break;

-       dropit:
+dropit:

                tcpstat.tcps_keepdrops++;
                postevent(so, 0, EV_TIMEOUT);
                soevent(so,
                tcpstat.tcps_keepdrops++;
                postevent(so, 0, EV_TIMEOUT);
                soevent(so,

-                   (SO_FILT_HINT_LOCKED|SO_FILT_HINT_TIMEOUT));
+                   (SO_FILT_HINT_LOCKED | SO_FILT_HINT_TIMEOUT));

                tp = tcp_drop(tp, ETIMEDOUT);
                break;
        }
 #if TCPDEBUG
                tp = tcp_drop(tp, ETIMEDOUT);
                break;
        }
 #if TCPDEBUG

-       if (tp->t_inpcb->inp_socket->so_options & SO_DEBUG)
+       if (tp->t_inpcb->inp_socket->so_options & SO_DEBUG) {

                tcp_trace(TA_USER, ostate, tp, (void *)0, (struct tcphdr *)0,
                tcp_trace(TA_USER, ostate, tp, (void *)0, (struct tcphdr *)0,

-                         PRU_SLOWTIMO);
+                   PRU_SLOWTIMO);
+       }

 #endif
 #endif

-       return (tp);
+       return tp;

 }
 
 /* Remove a timer entry from timer list */
 }
 
 /* Remove a timer entry from timer list */


@@ -1380,20 +1623,21 @@ tcp_remove_timer(struct tcpcb *tp)
 {
        struct tcptimerlist *listp = &tcp_timer_list;
 
 {
        struct tcptimerlist *listp = &tcp_timer_list;
 

-       lck_mtx_assert(&tp->t_inpcb->inpcb_mtx, LCK_MTX_ASSERT_OWNED);
+       socket_lock_assert_owned(tp->t_inpcb->inp_socket);

        if (!(TIMER_IS_ON_LIST(tp))) {
                return;
        }
        lck_mtx_lock(listp->mtx);
        if (!(TIMER_IS_ON_LIST(tp))) {
                return;
        }
        lck_mtx_lock(listp->mtx);

-       
+

        /* Check if pcb is on timer list again after acquiring the lock */
        if (!(TIMER_IS_ON_LIST(tp))) {
                lck_mtx_unlock(listp->mtx);
                return;
        }
        /* Check if pcb is on timer list again after acquiring the lock */
        if (!(TIMER_IS_ON_LIST(tp))) {
                lck_mtx_unlock(listp->mtx);
                return;
        }

-       
-       if (listp->next_te != NULL && listp->next_te == &tp->tentry)
+
+       if (listp->next_te != NULL && listp->next_te == &tp->tentry) {

                listp->next_te = LIST_NEXT(&tp->tentry, le);
                listp->next_te = LIST_NEXT(&tp->tentry, le);

+       }

 
        LIST_REMOVE(&tp->tentry, le);
        tp->t_flags &= ~(TF_TIMER_ONLIST);
 
        LIST_REMOVE(&tp->tentry, le);
        tp->t_flags &= ~(TF_TIMER_ONLIST);


@@ -1422,41 +1666,47 @@ need_to_resched_timerlist(u_int32_t runtime, u_int16_t mode)
         * in flux. In this case always acquire the lock and set the state
         * correctly.
         */
         * in flux. In this case always acquire the lock and set the state
         * correctly.
         */

-       if (listp->running)
-               return (TRUE);
+       if (listp->running) {
+               return TRUE;
+       }

 
 

-       if (!listp->scheduled)
-               return (TRUE);
+       if (!listp->scheduled) {
+               return TRUE;
+       }

 
        diff = timer_diff(listp->runtime, 0, runtime, 0);
        if (diff <= 0) {
                /* The list is going to run before this timer */
 
        diff = timer_diff(listp->runtime, 0, runtime, 0);
        if (diff <= 0) {
                /* The list is going to run before this timer */

-               return (FALSE);
+               return FALSE;

        } else {
                if (mode & TCP_TIMERLIST_10MS_MODE) {
        } else {
                if (mode & TCP_TIMERLIST_10MS_MODE) {

-                       if (diff <= TCP_TIMER_10MS_QUANTUM)
-                               return (FALSE);
+                       if (diff <= TCP_TIMER_10MS_QUANTUM) {
+                               return FALSE;
+                       }

                } else if (mode & TCP_TIMERLIST_100MS_MODE) {
                } else if (mode & TCP_TIMERLIST_100MS_MODE) {

-                       if (diff <= TCP_TIMER_100MS_QUANTUM)
-                               return (FALSE);
+                       if (diff <= TCP_TIMER_100MS_QUANTUM) {
+                               return FALSE;
+                       }

                } else {
                } else {

-                       if (diff <= TCP_TIMER_500MS_QUANTUM)
-                               return (FALSE);
+                       if (diff <= TCP_TIMER_500MS_QUANTUM) {
+                               return FALSE;
+                       }

                }
        }
                }
        }

-       return (TRUE);
+       return TRUE;

 }
 
 void
 }
 
 void

-tcp_sched_timerlist(uint32_t offset) 
+tcp_sched_timerlist(uint32_t offset)

 {
        uint64_t deadline = 0;
        struct tcptimerlist *listp = &tcp_timer_list;
 
 {
        uint64_t deadline = 0;
        struct tcptimerlist *listp = &tcp_timer_list;
 

-       lck_mtx_assert(listp->mtx, LCK_MTX_ASSERT_OWNED);
+       LCK_MTX_ASSERT(listp->mtx, LCK_MTX_ASSERT_OWNED);

 
        offset = min(offset, TCP_TIMERLIST_MAX_OFFSET);
        listp->runtime = tcp_now + offset;
 
        offset = min(offset, TCP_TIMERLIST_MAX_OFFSET);
        listp->runtime = tcp_now + offset;

+       listp->schedtime = tcp_now;

        if (listp->runtime == 0) {
                listp->runtime++;
                offset++;
        if (listp->runtime == 0) {
                listp->runtime++;
                offset++;


@@ -1471,7 +1721,7 @@ tcp_sched_timerlist(uint32_t offset)
 /*
  * Function to run the timers for a connection.
  *
 /*
  * Function to run the timers for a connection.
  *

- * Returns the offset of next timer to be run for this connection which 
+ * Returns the offset of next timer to be run for this connection which

  * can be used to reschedule the timerlist.
  *
  * te_mode is an out parameter that indicates the modes of active
  * can be used to reschedule the timerlist.
  *
  * te_mode is an out parameter that indicates the modes of active


@@ -1479,7 +1729,7 @@ tcp_sched_timerlist(uint32_t offset)
  */
 u_int32_t
 tcp_run_conn_timer(struct tcpcb *tp, u_int16_t *te_mode,
  */
 u_int32_t
 tcp_run_conn_timer(struct tcpcb *tp, u_int16_t *te_mode,

-       u_int16_t probe_if_index)
+    u_int16_t probe_if_index)

 {
        struct socket *so;
        u_int16_t i = 0, index = TCPT_NONE, lo_index = TCPT_NONE;
 {
        struct socket *so;
        u_int16_t i = 0, index = TCPT_NONE, lo_index = TCPT_NONE;


@@ -1492,17 +1742,17 @@ tcp_run_conn_timer(struct tcpcb *tp, u_int16_t *te_mode,
        bzero(needtorun, sizeof(needtorun));
        *te_mode = 0;
 
        bzero(needtorun, sizeof(needtorun));
        *te_mode = 0;
 

-       tcp_lock(tp->t_inpcb->inp_socket, 1, 0);
+       socket_lock(tp->t_inpcb->inp_socket, 1);

 
        so = tp->t_inpcb->inp_socket;
 
        so = tp->t_inpcb->inp_socket;

-       /* Release the want count on inp */ 
+       /* Release the want count on inp */

        if (in_pcb_checkstate(tp->t_inpcb, WNT_RELEASE, 1)
        if (in_pcb_checkstate(tp->t_inpcb, WNT_RELEASE, 1)

-               == WNT_STOPUSING) {
+           == WNT_STOPUSING) {

                if (TIMER_IS_ON_LIST(tp)) {
                        tcp_remove_timer(tp);
                }
 
                if (TIMER_IS_ON_LIST(tp)) {
                        tcp_remove_timer(tp);
                }
 

-               /* Looks like the TCP connection got closed while we 
+               /* Looks like the TCP connection got closed while we

                 * were waiting for the lock.. Done
                 */
                goto done;
                 * were waiting for the lock.. Done
                 */
                goto done;


@@ -1517,7 +1767,7 @@ tcp_run_conn_timer(struct tcpcb *tp, u_int16_t *te_mode,
                tp->t_flagsext |= TF_PROBING;
                tcp_timers(tp, TCPT_PTO);
                tp->t_timer[TCPT_PTO] = 0;
                tp->t_flagsext |= TF_PROBING;
                tcp_timers(tp, TCPT_PTO);
                tp->t_timer[TCPT_PTO] = 0;

-               tp->t_flagsext &= TF_PROBING;
+               tp->t_flagsext &= ~TF_PROBING;

        }
 
        /*
        }
 
        /*


@@ -1525,9 +1775,10 @@ tcp_run_conn_timer(struct tcpcb *tp, u_int16_t *te_mode,
         * with another thread that can cancel or reschedule the timer
         * that is about to run. Check if we need to run anything.
         */
         * with another thread that can cancel or reschedule the timer
         * that is about to run. Check if we need to run anything.
         */

-       if ((index = tp->tentry.index) == TCPT_NONE)
+       if ((index = tp->tentry.index) == TCPT_NONE) {

                goto done;
                goto done;

-       
+       }
+

        timer_val = tp->t_timer[index];
 
        diff = timer_diff(tp->tentry.runtime, 0, tcp_now, 0);
        timer_val = tp->t_timer[index];
 
        diff = timer_diff(tp->tentry.runtime, 0, tcp_now, 0);


@@ -1542,10 +1793,11 @@ tcp_run_conn_timer(struct tcpcb *tp, u_int16_t *te_mode,
        tp->t_timer[index] = 0;
        if (timer_val > 0) {
                tp = tcp_timers(tp, index);
        tp->t_timer[index] = 0;
        if (timer_val > 0) {
                tp = tcp_timers(tp, index);

-               if (tp == NULL)
+               if (tp == NULL) {

                        goto done;
                        goto done;

+               }

        }
        }

-       
+

        /*
         * Check if there are any other timers that need to be run.
         * While doing it, adjust the timer values wrt tcp_now.
        /*
         * Check if there are any other timers that need to be run.
         * While doing it, adjust the timer values wrt tcp_now.


@@ -1554,7 +1806,7 @@ tcp_run_conn_timer(struct tcpcb *tp, u_int16_t *te_mode,
        for (i = 0; i < TCPT_NTIMERS; ++i) {
                if (tp->t_timer[i] != 0) {
                        diff = timer_diff(tp->tentry.timer_start,
        for (i = 0; i < TCPT_NTIMERS; ++i) {
                if (tp->t_timer[i] != 0) {
                        diff = timer_diff(tp->tentry.timer_start,

-                               tp->t_timer[i], tcp_now, 0);
+                           tp->t_timer[i], tcp_now, 0);

                        if (diff <= 0) {
                                needtorun[i] = TRUE;
                                count++;
                        if (diff <= 0) {
                                needtorun[i] = TRUE;
                                count++;


@@ -1569,16 +1821,17 @@ tcp_run_conn_timer(struct tcpcb *tp, u_int16_t *te_mode,
                        }
                }
        }
                        }
                }
        }

-       
+

        tp->tentry.timer_start = tcp_now;
        tp->tentry.index = lo_index;
        VERIFY(tp->tentry.index == TCPT_NONE || tp->tentry.mode > 0);
 
        if (tp->tentry.index != TCPT_NONE) {
                tp->tentry.runtime = tp->tentry.timer_start +
        tp->tentry.timer_start = tcp_now;
        tp->tentry.index = lo_index;
        VERIFY(tp->tentry.index == TCPT_NONE || tp->tentry.mode > 0);
 
        if (tp->tentry.index != TCPT_NONE) {
                tp->tentry.runtime = tp->tentry.timer_start +

-                       tp->t_timer[tp->tentry.index];
-               if (tp->tentry.runtime == 0)
+                   tp->t_timer[tp->tentry.index];
+               if (tp->tentry.runtime == 0) {

                        tp->tentry.runtime++;
                        tp->tentry.runtime++;

+               }

        }
 
        if (count > 0) {
        }
 
        if (count > 0) {


@@ -1608,18 +1861,19 @@ done:
                offset = 0;
        }
 
                offset = 0;
        }
 

-       tcp_unlock(so, 1, 0);
-       return(offset);
+       socket_unlock(so, 1);
+       return offset;

 }
 
 void
 }
 
 void

-tcp_run_timerlist(void * arg1, void * arg2) {
+tcp_run_timerlist(void * arg1, void * arg2)
+{

 #pragma unused(arg1, arg2)
        struct tcptimerentry *te, *next_te;
        struct tcptimerlist *listp = &tcp_timer_list;
        struct tcpcb *tp;
        uint32_t next_timer = 0; /* offset of the next timer on the list */
 #pragma unused(arg1, arg2)
        struct tcptimerentry *te, *next_te;
        struct tcptimerlist *listp = &tcp_timer_list;
        struct tcpcb *tp;
        uint32_t next_timer = 0; /* offset of the next timer on the list */

-       u_int16_t te_mode = 0;  /* modes of all active timers in a tcpcb */
+       u_int16_t te_mode = 0;  /* modes of all active timers in a tcpcb */

        u_int16_t list_mode = 0; /* cumulative of modes of all tcpcbs */
        uint32_t active_count = 0;
 
        u_int16_t list_mode = 0; /* cumulative of modes of all tcpcbs */
        uint32_t active_count = 0;
 


@@ -1627,8 +1881,29 @@ tcp_run_timerlist(void * arg1, void * arg2) {
 
        lck_mtx_lock(listp->mtx);
 
 
        lck_mtx_lock(listp->mtx);
 

+       int32_t drift = tcp_now - listp->runtime;
+       if (drift <= 1) {
+               tcpstat.tcps_timer_drift_le_1_ms++;
+       } else if (drift <= 10) {
+               tcpstat.tcps_timer_drift_le_10_ms++;
+       } else if (drift <= 20) {
+               tcpstat.tcps_timer_drift_le_20_ms++;
+       } else if (drift <= 50) {
+               tcpstat.tcps_timer_drift_le_50_ms++;
+       } else if (drift <= 100) {
+               tcpstat.tcps_timer_drift_le_100_ms++;
+       } else if (drift <= 200) {
+               tcpstat.tcps_timer_drift_le_200_ms++;
+       } else if (drift <= 500) {
+               tcpstat.tcps_timer_drift_le_500_ms++;
+       } else if (drift <= 1000) {
+               tcpstat.tcps_timer_drift_le_1000_ms++;
+       } else {
+               tcpstat.tcps_timer_drift_gt_1000_ms++;
+       }
+

        listp->running = TRUE;
        listp->running = TRUE;

-       
+

        LIST_FOREACH_SAFE(te, &listp->lhead, le, next_te) {
                uint32_t offset = 0;
                uint32_t runtime = te->runtime;
        LIST_FOREACH_SAFE(te, &listp->lhead, le, next_te) {
                uint32_t offset = 0;
                uint32_t runtime = te->runtime;


@@ -1653,7 +1928,7 @@ tcp_run_timerlist(void * arg1, void * arg2) {
                         * Some how this pcb went into dead state while
                         * on the timer list, just take it off the list.
                         * Since the timer list entry pointers are
                         * Some how this pcb went into dead state while
                         * on the timer list, just take it off the list.
                         * Since the timer list entry pointers are

-                        * protected by the timer list lock, we can 
+                        * protected by the timer list lock, we can

                         * do it here without the socket lock.
                         */
                        if (TIMER_IS_ON_LIST(tp)) {
                         * do it here without the socket lock.
                         */
                        if (TIMER_IS_ON_LIST(tp)) {


@@ -1674,7 +1949,7 @@ tcp_run_timerlist(void * arg1, void * arg2) {
                 * release the lock, this pointer will be updated to the
                 * element after that.
                 */
                 * release the lock, this pointer will be updated to the
                 * element after that.
                 */

-               listp->next_te = next_te; 
+               listp->next_te = next_te;

 
                VERIFY_NEXT_LINK(&tp->tentry, le);
                VERIFY_PREV_LINK(&tp->tentry, le);
 
                VERIFY_NEXT_LINK(&tp->tentry, le);
                VERIFY_PREV_LINK(&tp->tentry, le);


@@ -1683,7 +1958,7 @@ tcp_run_timerlist(void * arg1, void * arg2) {
 
                offset = tcp_run_conn_timer(tp, &te_mode,
                    listp->probe_if_index);
 
                offset = tcp_run_conn_timer(tp, &te_mode,
                    listp->probe_if_index);

-               
+

                lck_mtx_lock(listp->mtx);
 
                next_te = listp->next_te;
                lck_mtx_lock(listp->mtx);
 
                next_te = listp->next_te;


@@ -1692,21 +1967,23 @@ tcp_run_timerlist(void * arg1, void * arg2) {
                if (offset > 0 && te_mode != 0) {
                        list_mode |= te_mode;
 
                if (offset > 0 && te_mode != 0) {
                        list_mode |= te_mode;
 

-                       if (next_timer == 0 || offset < next_timer)
+                       if (next_timer == 0 || offset < next_timer) {

                                next_timer = offset;
                                next_timer = offset;

+                       }

                }
        }
 
        if (!LIST_EMPTY(&listp->lhead)) {
                u_int16_t next_mode = 0;
                if ((list_mode & TCP_TIMERLIST_10MS_MODE) ||
                }
        }
 
        if (!LIST_EMPTY(&listp->lhead)) {
                u_int16_t next_mode = 0;
                if ((list_mode & TCP_TIMERLIST_10MS_MODE) ||

-                       (listp->pref_mode & TCP_TIMERLIST_10MS_MODE))
+                   (listp->pref_mode & TCP_TIMERLIST_10MS_MODE)) {

                        next_mode = TCP_TIMERLIST_10MS_MODE;
                        next_mode = TCP_TIMERLIST_10MS_MODE;

-               else if ((list_mode & TCP_TIMERLIST_100MS_MODE) ||
-                       (listp->pref_mode & TCP_TIMERLIST_100MS_MODE))
+               } else if ((list_mode & TCP_TIMERLIST_100MS_MODE) ||
+                   (listp->pref_mode & TCP_TIMERLIST_100MS_MODE)) {

                        next_mode = TCP_TIMERLIST_100MS_MODE;
                        next_mode = TCP_TIMERLIST_100MS_MODE;

-               else
+               } else {

                        next_mode = TCP_TIMERLIST_500MS_MODE;
                        next_mode = TCP_TIMERLIST_500MS_MODE;

+               }

 
                if (next_mode != TCP_TIMERLIST_500MS_MODE) {
                        listp->idleruns = 0;
 
                if (next_mode != TCP_TIMERLIST_500MS_MODE) {
                        listp->idleruns = 0;


@@ -1729,12 +2006,14 @@ tcp_run_timerlist(void * arg1, void * arg2) {
                        }
                }
                listp->mode = next_mode;
                        }
                }
                listp->mode = next_mode;

-               if (listp->pref_offset != 0)
+               if (listp->pref_offset != 0) {

                        next_timer = min(listp->pref_offset, next_timer);
                        next_timer = min(listp->pref_offset, next_timer);

+               }

 
 

-               if (listp->mode == TCP_TIMERLIST_500MS_MODE)
+               if (listp->mode == TCP_TIMERLIST_500MS_MODE) {

                        next_timer = max(next_timer,
                        next_timer = max(next_timer,

-                               TCP_TIMER_500MS_QUANTUM);
+                           TCP_TIMER_500MS_QUANTUM);
+               }

 
                tcp_sched_timerlist(next_timer);
        } else {
 
                tcp_sched_timerlist(next_timer);
        } else {


@@ -1757,8 +2036,8 @@ tcp_run_timerlist(void * arg1, void * arg2) {
  * Function to check if the timerlist needs to be rescheduled to run this
  * connection's timers correctly.
  */
  * Function to check if the timerlist needs to be rescheduled to run this
  * connection's timers correctly.
  */

-void 
-tcp_sched_timers(struct tcpcb *tp) 
+void
+tcp_sched_timers(struct tcpcb *tp)

 {
        struct tcptimerentry *te = &tp->tentry;
        u_int16_t index = te->index;
 {
        struct tcptimerentry *te = &tp->tentry;
        u_int16_t index = te->index;


@@ -1797,26 +2076,29 @@ tcp_sched_timers(struct tcpcb *tp)
                        list_locked = TRUE;
                }
 
                        list_locked = TRUE;
                }
 

-               LIST_INSERT_HEAD(&listp->lhead, te, le);
-               tp->t_flags |= TF_TIMER_ONLIST;
+               if (!TIMER_IS_ON_LIST(tp)) {
+                       LIST_INSERT_HEAD(&listp->lhead, te, le);
+                       tp->t_flags |= TF_TIMER_ONLIST;

 
 

-               listp->entries++;
-               if (listp->entries > listp->maxentries)
-                       listp->maxentries = listp->entries;
+                       listp->entries++;
+                       if (listp->entries > listp->maxentries) {
+                               listp->maxentries = listp->entries;
+                       }

 
 

-               /* if the list is not scheduled, just schedule it */
-               if (!listp->scheduled)
-                       goto schedule;
+                       /* if the list is not scheduled, just schedule it */
+                       if (!listp->scheduled) {
+                               goto schedule;
+                       }
+               }

        }
 
        }
 

-

        /*
         * Timer entry is currently on the list, check if the list needs
         * to be rescheduled.
         */
        if (need_to_resched_timerlist(te->runtime, mode)) {
                tcp_resched_timerlist++;
        /*
         * Timer entry is currently on the list, check if the list needs
         * to be rescheduled.
         */
        if (need_to_resched_timerlist(te->runtime, mode)) {
                tcp_resched_timerlist++;

-       
+

                if (!list_locked) {
                        lck_mtx_lock(listp->mtx);
                        list_locked = TRUE;
                if (!list_locked) {
                        lck_mtx_lock(listp->mtx);
                        list_locked = TRUE;


@@ -1828,7 +2110,7 @@ tcp_sched_timers(struct tcpcb *tp)
                if (listp->running) {
                        listp->pref_mode |= mode;
                        if (listp->pref_offset == 0 ||
                if (listp->running) {
                        listp->pref_mode |= mode;
                        if (listp->pref_offset == 0 ||

-                               offset < listp->pref_offset) {
+                           offset < listp->pref_offset) {

                                listp->pref_offset = offset;
                        }
                } else {
                                listp->pref_offset = offset;
                        }
                } else {


@@ -1840,10 +2122,11 @@ tcp_sched_timers(struct tcpcb *tp)
                                int32_t diff;
                                diff = timer_diff(listp->runtime, 0,
                                    tcp_now, offset);
                                int32_t diff;
                                diff = timer_diff(listp->runtime, 0,
                                    tcp_now, offset);

-                               if (diff <= 0)
+                               if (diff <= 0) {

                                        goto done;
                                        goto done;

-                               else
+                               } else {

                                        goto schedule;
                                        goto schedule;

+                               }

                        } else {
                                goto schedule;
                        }
                        } else {
                                goto schedule;
                        }


@@ -1862,20 +2145,22 @@ schedule:
                listp->idleruns = 0;
                offset = min(offset, TCP_TIMER_10MS_QUANTUM);
        } else if (mode & TCP_TIMERLIST_100MS_MODE) {
                listp->idleruns = 0;
                offset = min(offset, TCP_TIMER_10MS_QUANTUM);
        } else if (mode & TCP_TIMERLIST_100MS_MODE) {

-               if (listp->mode > TCP_TIMERLIST_100MS_MODE)
+               if (listp->mode > TCP_TIMERLIST_100MS_MODE) {

                        listp->mode = TCP_TIMERLIST_100MS_MODE;
                        listp->mode = TCP_TIMERLIST_100MS_MODE;

+               }

                listp->idleruns = 0;
                offset = min(offset, TCP_TIMER_100MS_QUANTUM);
        }
        tcp_sched_timerlist(offset);
 
 done:
                listp->idleruns = 0;
                offset = min(offset, TCP_TIMER_100MS_QUANTUM);
        }
        tcp_sched_timerlist(offset);
 
 done:

-       if (list_locked)
+       if (list_locked) {

                lck_mtx_unlock(listp->mtx);
                lck_mtx_unlock(listp->mtx);

+       }

 
        return;
 }
 
        return;
 }

-               
+

 static inline void
 tcp_set_lotimer_index(struct tcpcb *tp)
 {
 static inline void
 tcp_set_lotimer_index(struct tcpcb *tp)
 {


@@ -1895,20 +2180,22 @@ tcp_set_lotimer_index(struct tcpcb *tp)
        VERIFY(tp->tentry.index == TCPT_NONE || tp->tentry.mode > 0);
 
        if (tp->tentry.index != TCPT_NONE) {
        VERIFY(tp->tentry.index == TCPT_NONE || tp->tentry.mode > 0);
 
        if (tp->tentry.index != TCPT_NONE) {

-               tp->tentry.runtime = tp->tentry.timer_start 
+               tp->tentry.runtime = tp->tentry.timer_start

                    + tp->t_timer[tp->tentry.index];
                    + tp->t_timer[tp->tentry.index];

-               if (tp->tentry.runtime == 0)
+               if (tp->tentry.runtime == 0) {

                        tp->tentry.runtime++;
                        tp->tentry.runtime++;

+               }

        }
 }
 
 void
 tcp_check_timer_state(struct tcpcb *tp)
 {
        }
 }
 
 void
 tcp_check_timer_state(struct tcpcb *tp)
 {

-       lck_mtx_assert(&tp->t_inpcb->inpcb_mtx, LCK_MTX_ASSERT_OWNED);
+       socket_lock_assert_owned(tp->t_inpcb->inp_socket);

 
 

-       if (tp->t_inpcb->inp_flags2 & INP2_TIMEWAIT)
+       if (tp->t_inpcb->inp_flags2 & INP2_TIMEWAIT) {

                return;
                return;

+       }

 
        tcp_set_lotimer_index(tp);
 
 
        tcp_set_lotimer_index(tp);
 


@@ -1921,10 +2208,25 @@ tcp_cumulative_stat(u_int32_t cur, u_int32_t *prev, u_int32_t *dest)
 {
        /* handle wrap around */
        int32_t diff = (int32_t) (cur - *prev);
 {
        /* handle wrap around */
        int32_t diff = (int32_t) (cur - *prev);

-       if (diff > 0)
+       if (diff > 0) {

                *dest = diff;
                *dest = diff;

-       else
+       } else {

                *dest = 0;
                *dest = 0;

+       }
+       *prev = cur;
+       return;
+}
+
+static inline void
+tcp_cumulative_stat64(u_int64_t cur, u_int64_t *prev, u_int64_t *dest)
+{
+       /* handle wrap around */
+       int64_t diff = (int64_t) (cur - *prev);
+       if (diff > 0) {
+               *dest = diff;
+       } else {
+               *dest = 0;
+       }

        *prev = cur;
        return;
 }
        *prev = cur;
        return;
 }


@@ -1937,12 +2239,13 @@ tcp_report_stats(void)
        struct sockaddr_in6 dst6;
        struct rtentry *rt = NULL;
        static struct tcp_last_report_stats prev;
        struct sockaddr_in6 dst6;
        struct rtentry *rt = NULL;
        static struct tcp_last_report_stats prev;

-       u_int64_t var, uptime;  
+       u_int64_t var, uptime;

 
 

-#define        stat    data.u.tcp_stats
+#define stat    data.u.tcp_stats

        if (((uptime = net_uptime()) - tcp_last_report_time) <
        if (((uptime = net_uptime()) - tcp_last_report_time) <

-               tcp_report_stats_interval)
+           tcp_report_stats_interval) {

                return;
                return;

+       }

 
        tcp_last_report_time = uptime;
 
 
        tcp_last_report_time = uptime;
 


@@ -1956,12 +2259,12 @@ tcp_report_stats(void)
        /* ipv4 avg rtt */
        lck_mtx_lock(rnh_lock);
        rt =  rt_lookup(TRUE, (struct sockaddr *)&dst, NULL,
        /* ipv4 avg rtt */
        lck_mtx_lock(rnh_lock);
        rt =  rt_lookup(TRUE, (struct sockaddr *)&dst, NULL,

-               rt_tables[AF_INET], IFSCOPE_NONE);
+           rt_tables[AF_INET], IFSCOPE_NONE);

        lck_mtx_unlock(rnh_lock);
        if (rt != NULL) {
                RT_LOCK(rt);
                if (rt_primary_default(rt, rt_key(rt)) &&
        lck_mtx_unlock(rnh_lock);
        if (rt != NULL) {
                RT_LOCK(rt);
                if (rt_primary_default(rt, rt_key(rt)) &&

-                       rt->rt_stats != NULL) {
+                   rt->rt_stats != NULL) {

                        stat.ipv4_avgrtt = rt->rt_stats->nstat_avg_rtt;
                }
                RT_UNLOCK(rt);
                        stat.ipv4_avgrtt = rt->rt_stats->nstat_avg_rtt;
                }
                RT_UNLOCK(rt);


@@ -1975,13 +2278,13 @@ tcp_report_stats(void)
        dst6.sin6_family = AF_INET6;
 
        lck_mtx_lock(rnh_lock);
        dst6.sin6_family = AF_INET6;
 
        lck_mtx_lock(rnh_lock);

-       rt = rt_lookup(TRUE,(struct sockaddr *)&dst6, NULL,
-               rt_tables[AF_INET6], IFSCOPE_NONE);
+       rt = rt_lookup(TRUE, (struct sockaddr *)&dst6, NULL,
+           rt_tables[AF_INET6], IFSCOPE_NONE);

        lck_mtx_unlock(rnh_lock);
        if (rt != NULL) {
                RT_LOCK(rt);
                if (rt_primary_default(rt, rt_key(rt)) &&
        lck_mtx_unlock(rnh_lock);
        if (rt != NULL) {
                RT_LOCK(rt);
                if (rt_primary_default(rt, rt_key(rt)) &&

-                       rt->rt_stats != NULL) {
+                   rt->rt_stats != NULL) {

                        stat.ipv6_avgrtt = rt->rt_stats->nstat_avg_rtt;
                }
                RT_UNLOCK(rt);
                        stat.ipv6_avgrtt = rt->rt_stats->nstat_avg_rtt;
                }
                RT_UNLOCK(rt);


@@ -2002,24 +2305,26 @@ tcp_report_stats(void)
        }
 
        /* RTO after tail loss, shift by 10 for precision */
        }
 
        /* RTO after tail loss, shift by 10 for precision */

-       if (tcpstat.tcps_sndrexmitpack > 0 
+       if (tcpstat.tcps_sndrexmitpack > 0

            && tcpstat.tcps_tailloss_rto > 0) {
                var = tcpstat.tcps_tailloss_rto << 10;
                stat.send_tlrto_rate =
            && tcpstat.tcps_tailloss_rto > 0) {
                var = tcpstat.tcps_tailloss_rto << 10;
                stat.send_tlrto_rate =

-                       (var * 100) / tcpstat.tcps_sndrexmitpack;
+                   (var * 100) / tcpstat.tcps_sndrexmitpack;

        }
        }

-       
+

        /* packet reordering */
        if (tcpstat.tcps_sndpack > 0 && tcpstat.tcps_reordered_pkts > 0) {
                var = tcpstat.tcps_reordered_pkts << 10;
                stat.send_reorder_rate =
        /* packet reordering */
        if (tcpstat.tcps_sndpack > 0 && tcpstat.tcps_reordered_pkts > 0) {
                var = tcpstat.tcps_reordered_pkts << 10;
                stat.send_reorder_rate =

-                       (var * 100) / tcpstat.tcps_sndpack;
+                   (var * 100) / tcpstat.tcps_sndpack;

        }
 
        }
 

-       if (tcp_ecn_outbound == 1)
+       if (tcp_ecn_outbound == 1) {

                stat.ecn_client_enabled = 1;
                stat.ecn_client_enabled = 1;

-       if (tcp_ecn_inbound == 1)
+       }
+       if (tcp_ecn_inbound == 1) {

                stat.ecn_server_enabled = 1;
                stat.ecn_server_enabled = 1;

+       }

        tcp_cumulative_stat(tcpstat.tcps_connattempt,
            &prev.tcps_connattempt, &stat.connection_attempts);
        tcp_cumulative_stat(tcpstat.tcps_accepts,
        tcp_cumulative_stat(tcpstat.tcps_connattempt,
            &prev.tcps_connattempt, &stat.connection_attempts);
        tcp_cumulative_stat(tcpstat.tcps_accepts,


@@ -2084,10 +2389,78 @@ tcp_report_stats(void)
            &prev.tcps_tfo_syn_loss, &stat.tfo_syn_loss);
        tcp_cumulative_stat(tcpstat.tcps_tfo_blackhole,
            &prev.tcps_tfo_blackhole, &stat.tfo_blackhole);
            &prev.tcps_tfo_syn_loss, &stat.tfo_syn_loss);
        tcp_cumulative_stat(tcpstat.tcps_tfo_blackhole,
            &prev.tcps_tfo_blackhole, &stat.tfo_blackhole);

+       tcp_cumulative_stat(tcpstat.tcps_tfo_cookie_wrong,
+           &prev.tcps_tfo_cookie_wrong, &stat.tfo_cookie_wrong);
+       tcp_cumulative_stat(tcpstat.tcps_tfo_no_cookie_rcv,
+           &prev.tcps_tfo_no_cookie_rcv, &stat.tfo_no_cookie_rcv);
+       tcp_cumulative_stat(tcpstat.tcps_tfo_heuristics_disable,
+           &prev.tcps_tfo_heuristics_disable, &stat.tfo_heuristics_disable);
+       tcp_cumulative_stat(tcpstat.tcps_tfo_sndblackhole,
+           &prev.tcps_tfo_sndblackhole, &stat.tfo_sndblackhole);
+
+
+       tcp_cumulative_stat(tcpstat.tcps_mptcp_handover_attempt,
+           &prev.tcps_mptcp_handover_attempt, &stat.mptcp_handover_attempt);
+       tcp_cumulative_stat(tcpstat.tcps_mptcp_interactive_attempt,
+           &prev.tcps_mptcp_interactive_attempt, &stat.mptcp_interactive_attempt);
+       tcp_cumulative_stat(tcpstat.tcps_mptcp_aggregate_attempt,
+           &prev.tcps_mptcp_aggregate_attempt, &stat.mptcp_aggregate_attempt);
+       tcp_cumulative_stat(tcpstat.tcps_mptcp_fp_handover_attempt,
+           &prev.tcps_mptcp_fp_handover_attempt, &stat.mptcp_fp_handover_attempt);
+       tcp_cumulative_stat(tcpstat.tcps_mptcp_fp_interactive_attempt,
+           &prev.tcps_mptcp_fp_interactive_attempt, &stat.mptcp_fp_interactive_attempt);
+       tcp_cumulative_stat(tcpstat.tcps_mptcp_fp_aggregate_attempt,
+           &prev.tcps_mptcp_fp_aggregate_attempt, &stat.mptcp_fp_aggregate_attempt);
+       tcp_cumulative_stat(tcpstat.tcps_mptcp_heuristic_fallback,
+           &prev.tcps_mptcp_heuristic_fallback, &stat.mptcp_heuristic_fallback);
+       tcp_cumulative_stat(tcpstat.tcps_mptcp_fp_heuristic_fallback,
+           &prev.tcps_mptcp_fp_heuristic_fallback, &stat.mptcp_fp_heuristic_fallback);
+       tcp_cumulative_stat(tcpstat.tcps_mptcp_handover_success_wifi,
+           &prev.tcps_mptcp_handover_success_wifi, &stat.mptcp_handover_success_wifi);
+       tcp_cumulative_stat(tcpstat.tcps_mptcp_handover_success_cell,
+           &prev.tcps_mptcp_handover_success_cell, &stat.mptcp_handover_success_cell);
+       tcp_cumulative_stat(tcpstat.tcps_mptcp_interactive_success,
+           &prev.tcps_mptcp_interactive_success, &stat.mptcp_interactive_success);
+       tcp_cumulative_stat(tcpstat.tcps_mptcp_aggregate_success,
+           &prev.tcps_mptcp_aggregate_success, &stat.mptcp_aggregate_success);
+       tcp_cumulative_stat(tcpstat.tcps_mptcp_fp_handover_success_wifi,
+           &prev.tcps_mptcp_fp_handover_success_wifi, &stat.mptcp_fp_handover_success_wifi);
+       tcp_cumulative_stat(tcpstat.tcps_mptcp_fp_handover_success_cell,
+           &prev.tcps_mptcp_fp_handover_success_cell, &stat.mptcp_fp_handover_success_cell);
+       tcp_cumulative_stat(tcpstat.tcps_mptcp_fp_interactive_success,
+           &prev.tcps_mptcp_fp_interactive_success, &stat.mptcp_fp_interactive_success);
+       tcp_cumulative_stat(tcpstat.tcps_mptcp_fp_aggregate_success,
+           &prev.tcps_mptcp_fp_aggregate_success, &stat.mptcp_fp_aggregate_success);
+       tcp_cumulative_stat(tcpstat.tcps_mptcp_handover_cell_from_wifi,
+           &prev.tcps_mptcp_handover_cell_from_wifi, &stat.mptcp_handover_cell_from_wifi);
+       tcp_cumulative_stat(tcpstat.tcps_mptcp_handover_wifi_from_cell,
+           &prev.tcps_mptcp_handover_wifi_from_cell, &stat.mptcp_handover_wifi_from_cell);
+       tcp_cumulative_stat(tcpstat.tcps_mptcp_interactive_cell_from_wifi,
+           &prev.tcps_mptcp_interactive_cell_from_wifi, &stat.mptcp_interactive_cell_from_wifi);
+       tcp_cumulative_stat64(tcpstat.tcps_mptcp_handover_cell_bytes,
+           &prev.tcps_mptcp_handover_cell_bytes, &stat.mptcp_handover_cell_bytes);
+       tcp_cumulative_stat64(tcpstat.tcps_mptcp_interactive_cell_bytes,
+           &prev.tcps_mptcp_interactive_cell_bytes, &stat.mptcp_interactive_cell_bytes);
+       tcp_cumulative_stat64(tcpstat.tcps_mptcp_aggregate_cell_bytes,
+           &prev.tcps_mptcp_aggregate_cell_bytes, &stat.mptcp_aggregate_cell_bytes);
+       tcp_cumulative_stat64(tcpstat.tcps_mptcp_handover_all_bytes,
+           &prev.tcps_mptcp_handover_all_bytes, &stat.mptcp_handover_all_bytes);
+       tcp_cumulative_stat64(tcpstat.tcps_mptcp_interactive_all_bytes,
+           &prev.tcps_mptcp_interactive_all_bytes, &stat.mptcp_interactive_all_bytes);
+       tcp_cumulative_stat64(tcpstat.tcps_mptcp_aggregate_all_bytes,
+           &prev.tcps_mptcp_aggregate_all_bytes, &stat.mptcp_aggregate_all_bytes);
+       tcp_cumulative_stat(tcpstat.tcps_mptcp_back_to_wifi,
+           &prev.tcps_mptcp_back_to_wifi, &stat.mptcp_back_to_wifi);
+       tcp_cumulative_stat(tcpstat.tcps_mptcp_wifi_proxy,
+           &prev.tcps_mptcp_wifi_proxy, &stat.mptcp_wifi_proxy);
+       tcp_cumulative_stat(tcpstat.tcps_mptcp_cell_proxy,
+           &prev.tcps_mptcp_cell_proxy, &stat.mptcp_cell_proxy);
+       tcp_cumulative_stat(tcpstat.tcps_mptcp_triggered_cell,
+           &prev.tcps_mptcp_triggered_cell, &stat.mptcp_triggered_cell);

 
        nstat_sysinfo_send_data(&data);
 
 
        nstat_sysinfo_send_data(&data);
 

-#undef stat
+#undef  stat

 }
 
 void
 }
 
 void


@@ -2106,8 +2479,9 @@ tcp_interface_send_probe(u_int16_t probe_if_index)
        }
 
        listp->probe_if_index = probe_if_index;
        }
 
        listp->probe_if_index = probe_if_index;

-       if (listp->running)
+       if (listp->running) {

                goto done;
                goto done;

+       }

 
        /*
         * Reschedule the timerlist to run within the next 10ms, which is
 
        /*
         * Reschedule the timerlist to run within the next 10ms, which is


@@ -2165,8 +2539,9 @@ tcp_enable_read_probe(struct tcpcb *tp, struct ifnet *ifp)
                                tp->tentry.index = TCPT_KEEP;
                                tp->tentry.runtime = tcp_now +
                                    TCP_TIMER_10MS_QUANTUM;
                                tp->tentry.index = TCPT_KEEP;
                                tp->tentry.runtime = tcp_now +
                                    TCP_TIMER_10MS_QUANTUM;

-                               if (tp->tentry.runtime == 0)
+                               if (tp->tentry.runtime == 0) {

                                        tp->tentry.runtime++;
                                        tp->tentry.runtime++;

+                               }

                        }
                }
        }
                        }
                }
        }


@@ -2182,6 +2557,10 @@ tcp_disable_read_probe(struct tcpcb *tp)
            ((tp->t_flagsext & TF_DETECT_READSTALL) ||
            tp->t_rtimo_probes > 0)) {
                tcp_keepalive_reset(tp);
            ((tp->t_flagsext & TF_DETECT_READSTALL) ||
            tp->t_rtimo_probes > 0)) {
                tcp_keepalive_reset(tp);

+
+               if (tp->t_mpsub) {
+                       mptcp_reset_keepalive(tp);
+               }

        }
 }
 
        }
 }
 


@@ -2197,8 +2576,9 @@ tcp_probe_connectivity(struct ifnet *ifp, u_int32_t enable)
        struct inpcbinfo *pcbinfo = &tcbinfo;
        struct inpcb *inp, *nxt;
 
        struct inpcbinfo *pcbinfo = &tcbinfo;
        struct inpcb *inp, *nxt;
 

-       if (ifp == NULL)
+       if (ifp == NULL) {

                return;
                return;

+       }

 
        /* update clock */
        calculate_tcp_clock();
 
        /* update clock */
        calculate_tcp_clock();


@@ -2212,25 +2592,27 @@ tcp_probe_connectivity(struct ifnet *ifp, u_int32_t enable)
        LIST_FOREACH_SAFE(inp, pcbinfo->ipi_listhead, inp_list, nxt) {
                struct tcpcb *tp = NULL;
                if (in_pcb_checkstate(inp, WNT_ACQUIRE, 0) ==
        LIST_FOREACH_SAFE(inp, pcbinfo->ipi_listhead, inp_list, nxt) {
                struct tcpcb *tp = NULL;
                if (in_pcb_checkstate(inp, WNT_ACQUIRE, 0) ==

-                   WNT_STOPUSING)
+                   WNT_STOPUSING) {

                        continue;
                        continue;

+               }

 
                /* Acquire lock to look at the state of the connection */
 
                /* Acquire lock to look at the state of the connection */

-               tcp_lock(inp->inp_socket, 1, 0);
+               socket_lock(inp->inp_socket, 1);

 
                /* Release the want count */
                if (inp->inp_ppcb == NULL ||
                    (in_pcb_checkstate(inp, WNT_RELEASE, 1) == WNT_STOPUSING)) {
 
                /* Release the want count */
                if (inp->inp_ppcb == NULL ||
                    (in_pcb_checkstate(inp, WNT_RELEASE, 1) == WNT_STOPUSING)) {

-                       tcp_unlock(inp->inp_socket, 1, 0);
+                       socket_unlock(inp->inp_socket, 1);

                        continue;
                }
                tp = intotcpcb(inp);
                        continue;
                }
                tp = intotcpcb(inp);

-               if (enable)
+               if (enable) {

                        tcp_enable_read_probe(tp, ifp);
                        tcp_enable_read_probe(tp, ifp);

-               else
+               } else {

                        tcp_disable_read_probe(tp);
                        tcp_disable_read_probe(tp);

+               }

 
 

-               tcp_unlock(inp->inp_socket, 1, 0);
+               socket_unlock(inp->inp_socket, 1);

        }
        lck_rw_done(pcbinfo->ipi_lock);
 
        }
        lck_rw_done(pcbinfo->ipi_lock);
 


@@ -2259,6 +2641,77 @@ done:
        return;
 }
 
        return;
 }
 

+inline void
+tcp_update_mss_core(struct tcpcb *tp, struct ifnet *ifp)
+{
+       struct if_cellular_status_v1 *ifsr;
+       u_int32_t optlen;
+       ifsr = &ifp->if_link_status->ifsr_u.ifsr_cell.if_cell_u.if_status_v1;
+       if (ifsr->valid_bitmask & IF_CELL_UL_MSS_RECOMMENDED_VALID) {
+               optlen = tp->t_maxopd - tp->t_maxseg;
+
+               if (ifsr->mss_recommended ==
+                   IF_CELL_UL_MSS_RECOMMENDED_NONE &&
+                   tp->t_cached_maxopd > 0 &&
+                   tp->t_maxopd < tp->t_cached_maxopd) {
+                       tp->t_maxopd = tp->t_cached_maxopd;
+                       tcpstat.tcps_mss_to_default++;
+               } else if (ifsr->mss_recommended ==
+                   IF_CELL_UL_MSS_RECOMMENDED_MEDIUM &&
+                   tp->t_maxopd > tcp_mss_rec_medium) {
+                       tp->t_cached_maxopd = tp->t_maxopd;
+                       tp->t_maxopd = tcp_mss_rec_medium;
+                       tcpstat.tcps_mss_to_medium++;
+               } else if (ifsr->mss_recommended ==
+                   IF_CELL_UL_MSS_RECOMMENDED_LOW &&
+                   tp->t_maxopd > tcp_mss_rec_low) {
+                       tp->t_cached_maxopd = tp->t_maxopd;
+                       tp->t_maxopd = tcp_mss_rec_low;
+                       tcpstat.tcps_mss_to_low++;
+               }
+               tp->t_maxseg = tp->t_maxopd - optlen;
+
+               /*
+                * clear the cached value if it is same as the current
+                */
+               if (tp->t_maxopd == tp->t_cached_maxopd) {
+                       tp->t_cached_maxopd = 0;
+               }
+       }
+}
+
+void
+tcp_update_mss_locked(struct socket *so, struct ifnet *ifp)
+{
+       struct inpcb *inp = sotoinpcb(so);
+       struct tcpcb *tp = intotcpcb(inp);
+
+       if (ifp == NULL && (ifp = inp->inp_last_outifp) == NULL) {
+               return;
+       }
+
+       if (!IFNET_IS_CELLULAR(ifp)) {
+               /*
+                * This optimization is implemented for cellular
+                * networks only
+                */
+               return;
+       }
+       if (tp->t_state <= TCPS_CLOSE_WAIT) {
+               /*
+                * If the connection is currently doing or has done PMTU
+                * blackhole detection, do not change the MSS
+                */
+               if (tp->t_flags & TF_BLACKHOLE) {
+                       return;
+               }
+               if (ifp->if_link_status == NULL) {
+                       return;
+               }
+               tcp_update_mss_core(tp, ifp);
+       }
+}
+

 void
 tcp_itimer(struct inpcbinfo *ipi)
 {
 void
 tcp_itimer(struct inpcbinfo *ipi)
 {


@@ -2277,19 +2730,42 @@ tcp_itimer(struct inpcbinfo *ipi)
 
        LIST_FOREACH_SAFE(inp, &tcb, inp_list, nxt) {
                struct socket *so;
 
        LIST_FOREACH_SAFE(inp, &tcb, inp_list, nxt) {
                struct socket *so;

+               struct ifnet *ifp;

 
 

-               if (in_pcb_checkstate(inp, WNT_ACQUIRE, 0) == WNT_STOPUSING)
+               if (inp->inp_ppcb == NULL ||
+                   in_pcb_checkstate(inp, WNT_ACQUIRE, 0) == WNT_STOPUSING) {

                        continue;
                        continue;

+               }

                so = inp->inp_socket;
                so = inp->inp_socket;

-               tcp_lock(so, 1, 0);
+               ifp = inp->inp_last_outifp;
+               socket_lock(so, 1);

                if (in_pcb_checkstate(inp, WNT_RELEASE, 1) == WNT_STOPUSING) {
                if (in_pcb_checkstate(inp, WNT_RELEASE, 1) == WNT_STOPUSING) {

-                       tcp_unlock(so, 1, 0);
+                       socket_unlock(so, 1);

                        continue;
                }
                so_check_extended_bk_idle_time(so);
                        continue;
                }
                so_check_extended_bk_idle_time(so);

-               tcp_unlock(so, 1, 0);
+               if (ipi->ipi_flags & INPCBINFO_UPDATE_MSS) {
+                       tcp_update_mss_locked(so, NULL);
+               }
+               socket_unlock(so, 1);
+
+               /*
+                * Defunct all system-initiated background sockets if the
+                * socket is using the cellular interface and the interface
+                * has its LQM set to abort.
+                */
+               if ((ipi->ipi_flags & INPCBINFO_HANDLE_LQM_ABORT) &&
+                   IS_SO_TC_BACKGROUNDSYSTEM(so->so_traffic_class) &&
+                   ifp != NULL && IFNET_IS_CELLULAR(ifp) &&
+                   (ifp->if_interface_state.valid_bitmask &
+                   IF_INTERFACE_STATE_LQM_STATE_VALID) &&
+                   ifp->if_interface_state.lqm_state ==
+                   IFNET_LQM_THRESH_ABORT) {
+                       socket_defunct(current_proc(), so,
+                           SHUTDOWN_SOCKET_LEVEL_DISCONNECT_ALL);
+               }

        }
 
        }
 

+       ipi->ipi_flags &= ~(INPCBINFO_UPDATE_MSS | INPCBINFO_HANDLE_LQM_ABORT);

        lck_rw_done(ipi->ipi_lock);
 }
        lck_rw_done(ipi->ipi_lock);
 }

-