1 files changed, 24 insertions, 22 deletions

diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 48c3696e8645..b386361ba3e8 100644
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -112,10 +112,11 @@ struct tcp_request_sock_ops;
 struct tcp_request_sock {
         struct inet_request_sock        req;
         const struct tcp_request_sock_ops *af_specific;
+        struct skb_mstamp               snt_synack; /* first SYNACK sent time */
         bool                            tfo_listener;
+        u32                             txhash;
         u32                             rcv_isn;
         u32                             snt_isn;
-        u32                             snt_synack; /* synack sent time */
         u32                             last_oow_ack_time; /* last SYNACK */
         u32                             rcv_nxt; /* the ack # by SYNACK. For
                                                   * FastOpen it's the seq#
@@ -193,6 +194,12 @@ struct tcp_sock {
         u32     window_clamp;   /* Maximal window to advertise          */
         u32     rcv_ssthresh;   /* Current window clamp                 */
 
+        /* Information of the most recently (s)acked skb */
+        struct tcp_rack {
+                struct skb_mstamp mstamp; /* (Re)sent time of the skb */
+                u8 advanced; /* mstamp advanced since last lost marking */
+                u8 reord;    /* reordering detected */
+        } rack;
         u16     advmss;         /* Advertised MSS                       */
         u8      unused;
         u8      nonagle     : 4,/* Disable Nagle algorithm?             */
@@ -216,6 +223,9 @@ struct tcp_sock {
         u32     mdev_max_us;    /* maximal mdev for the last rtt period */
         u32     rttvar_us;      /* smoothed mdev_max                    */
         u32     rtt_seq;        /* sequence number to update rttvar     */
+        struct rtt_meas {
+                u32 rtt, ts;    /* RTT in usec and sampling time in jiffies. */
+        } rtt_min[3];
 
         u32     packets_out;    /* Packets which are "in flight"        */
         u32     retrans_out;    /* Retransmitted packets out            */
@@ -279,8 +289,6 @@ struct tcp_sock {
         int     lost_cnt_hint;
         u32     retransmit_high;        /* L-bits may be on up to this seqno */
 
-        u32     lost_retrans_low;       /* Sent seq after any rxmit (lowest) */
-
         u32     prior_ssthresh; /* ssthresh saved at recovery start     */
         u32     high_seq;       /* snd_nxt at onset of congestion       */
 
@@ -355,8 +363,8 @@ static inline struct tcp_sock *tcp_sk(const struct sock *sk)
 
 struct tcp_timewait_sock {
         struct inet_timewait_sock tw_sk;
-        u32                       tw_rcv_nxt;
-        u32                       tw_snd_nxt;
+#define tw_rcv_nxt tw_sk.__tw_common.skc_tw_rcv_nxt
+#define tw_snd_nxt tw_sk.__tw_common.skc_tw_snd_nxt
         u32                       tw_rcv_wnd;
         u32                       tw_ts_offset;
         u32                       tw_ts_recent;
@@ -381,25 +389,19 @@ static inline bool tcp_passive_fastopen(const struct sock *sk)
                 tcp_sk(sk)->fastopen_rsk != NULL);
 }
 
-extern void tcp_sock_destruct(struct sock *sk);
+static inline void fastopen_queue_tune(struct sock *sk, int backlog)
+{
+        struct request_sock_queue *queue = &inet_csk(sk)->icsk_accept_queue;
+        int somaxconn = READ_ONCE(sock_net(sk)->core.sysctl_somaxconn);
+
+        queue->fastopenq.max_qlen = min_t(unsigned int, backlog, somaxconn);
+}
 
-static inline int fastopen_init_queue(struct sock *sk, int backlog)
+static inline void tcp_move_syn(struct tcp_sock *tp,
+                                struct request_sock *req)
 {
-        struct request_sock_queue *queue =
-            &inet_csk(sk)->icsk_accept_queue;
-
-        if (queue->fastopenq == NULL) {
-                queue->fastopenq = kzalloc(
-                    sizeof(struct fastopen_queue),
-                    sk->sk_allocation);
-                if (queue->fastopenq == NULL)
-                        return -ENOMEM;
-
-                sk->sk_destruct = tcp_sock_destruct;
-                spin_lock_init(&queue->fastopenq->lock);
-        }
-        queue->fastopenq->max_qlen = backlog;
-        return 0;
+        tp->saved_syn = req->saved_syn;
+        req->saved_syn = NULL;
 }
 
 static inline void tcp_saved_syn_free(struct tcp_sock *tp)