1 files changed, 26 insertions, 7 deletions

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 8e5522c6833a..814ea43dd12f 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -78,6 +78,7 @@
 #include <linux/errqueue.h>
 #include <trace/events/tcp.h>
 #include <linux/static_key.h>
+#include <net/busy_poll.h>
 
 int sysctl_tcp_max_orphans __read_mostly = NR_FILE;
 
@@ -582,9 +583,12 @@ static inline void tcp_rcv_rtt_measure_ts(struct sock *sk,
 {
         struct tcp_sock *tp = tcp_sk(sk);
 
-        if (tp->rx_opt.rcv_tsecr &&
-            (TCP_SKB_CB(skb)->end_seq -
-             TCP_SKB_CB(skb)->seq >= inet_csk(sk)->icsk_ack.rcv_mss)) {
+        if (tp->rx_opt.rcv_tsecr == tp->rcv_rtt_last_tsecr)
+                return;
+        tp->rcv_rtt_last_tsecr = tp->rx_opt.rcv_tsecr;
+
+        if (TCP_SKB_CB(skb)->end_seq -
+            TCP_SKB_CB(skb)->seq >= inet_csk(sk)->icsk_ack.rcv_mss) {
                 u32 delta = tcp_time_stamp(tp) - tp->rx_opt.rcv_tsecr;
                 u32 delta_us;
 
@@ -4617,8 +4621,10 @@ int tcp_send_rcvq(struct sock *sk, struct msghdr *msg, size_t size)
         skb->data_len = data_len;
         skb->len = size;
 
-        if (tcp_try_rmem_schedule(sk, skb, skb->truesize))
+        if (tcp_try_rmem_schedule(sk, skb, skb->truesize)) {
+                NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPRCVQDROP);
                 goto err_free;
+        }
 
         err = skb_copy_datagram_from_iter(skb, 0, &msg->msg_iter, size);
         if (err)
@@ -4674,15 +4680,19 @@ static void tcp_data_queue(struct sock *sk, struct sk_buff *skb)
          *  Out of sequence packets to the out_of_order_queue.
          */
         if (TCP_SKB_CB(skb)->seq == tp->rcv_nxt) {
-                if (tcp_receive_window(tp) == 0)
+                if (tcp_receive_window(tp) == 0) {
+                        NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPZEROWINDOWDROP);
                         goto out_of_window;
+                }
 
                 /* Ok. In sequence. In window. */
 queue_and_out:
                 if (skb_queue_len(&sk->sk_receive_queue) == 0)
                         sk_forced_mem_schedule(sk, skb->truesize);
-                else if (tcp_try_rmem_schedule(sk, skb, skb->truesize))
+                else if (tcp_try_rmem_schedule(sk, skb, skb->truesize)) {
+                        NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPRCVQDROP);
                         goto drop;
+                }
 
                 eaten = tcp_queue_rcv(sk, skb, 0, &fragstolen);
                 tcp_rcv_nxt_update(tp, TCP_SKB_CB(skb)->end_seq);
@@ -4741,8 +4751,10 @@ drop:
                 /* If window is closed, drop tail of packet. But after
                  * remembering D-SACK for its head made in previous line.
                  */
-                if (!tcp_receive_window(tp))
+                if (!tcp_receive_window(tp)) {
+                        NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPZEROWINDOWDROP);
                         goto out_of_window;
+                }
                 goto queue_and_out;
         }
 
@@ -5484,6 +5496,11 @@ void tcp_rcv_established(struct sock *sk, struct sk_buff *skb)
                                 tcp_ack(sk, skb, 0);
                                 __kfree_skb(skb);
                                 tcp_data_snd_check(sk);
+                                /* When receiving pure ack in fast path, update
+                                 * last ts ecr directly instead of calling
+                                 * tcp_rcv_rtt_measure_ts()
+                                 */
+                                tp->rcv_rtt_last_tsecr = tp->rx_opt.rcv_tsecr;
                                 return;
                         } else { /* Header too small */
                                 TCP_INC_STATS(sock_net(sk), TCP_MIB_INERRS);
@@ -5585,6 +5602,7 @@ void tcp_finish_connect(struct sock *sk, struct sk_buff *skb)
         if (skb) {
                 icsk->icsk_af_ops->sk_rx_dst_set(sk, skb);
                 security_inet_conn_established(sk, skb);
+                sk_mark_napi_id(sk, skb);
         }
 
         tcp_init_transfer(sk, BPF_SOCK_OPS_ACTIVE_ESTABLISHED_CB);
@@ -6413,6 +6431,7 @@ int tcp_conn_request(struct request_sock_ops *rsk_ops,
         tcp_rsk(req)->snt_isn = isn;
         tcp_rsk(req)->txhash = net_tx_rndhash();
         tcp_openreq_init_rwin(req, sk, dst);
+        sk_rx_queue_set(req_to_sk(req), skb);
         if (!want_cookie) {
                 tcp_reqsk_record_syn(sk, req, skb);
                 fastopen_sk = tcp_try_fastopen(sk, skb, req, &foc, dst);