Merge tag 'fs_for_v5.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / net / ipv4 / tcp.c

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 6baa6dc1b13b0b94b1da238668b93e167cf444fe..1fa15beb83806696a6b4f5eddb7e45c13a2dea45 100644 (file)
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -457,18 +457,6 @@ void tcp_init_sock(struct sock *sk)
 }
 EXPORT_SYMBOL(tcp_init_sock);
 
-void tcp_init_transfer(struct sock *sk, int bpf_op)
-{
-       struct inet_connection_sock *icsk = inet_csk(sk);
-
-       tcp_mtup_init(sk);
-       icsk->icsk_af_ops->rebuild_header(sk);
-       tcp_init_metrics(sk);
-       tcp_call_bpf(sk, bpf_op, 0, NULL);
-       tcp_init_congestion_control(sk);
-       tcp_init_buffer_space(sk);
-}
-
 static void tcp_tx_timestamp(struct sock *sk, u16 tsflags)
 {
        struct sk_buff *skb = tcp_write_queue_tail(sk);
@@ -865,6 +853,18 @@ struct sk_buff *sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp,
 {
        struct sk_buff *skb;
 
+       if (likely(!size)) {
+               skb = sk->sk_tx_skb_cache;
+               if (skb && !skb_cloned(skb)) {
+                       skb->truesize = SKB_TRUESIZE(skb_end_offset(skb));
+                       sk->sk_tx_skb_cache = NULL;
+                       pskb_trim(skb, 0);
+                       INIT_LIST_HEAD(&skb->tcp_tsorted_anchor);
+                       skb_shinfo(skb)->tx_flags = 0;
+                       memset(TCP_SKB_CB(skb), 0, sizeof(struct tcp_skb_cb));
+                       return skb;
+               }
+       }
        /* The TCP header must be at least 32-bit aligned.  */
        size = ALIGN(size, 4);
 
@@ -1098,30 +1098,6 @@ int tcp_sendpage(struct sock *sk, struct page *page, int offset,
 }
 EXPORT_SYMBOL(tcp_sendpage);
 
-/* Do not bother using a page frag for very small frames.
- * But use this heuristic only for the first skb in write queue.
- *
- * Having no payload in skb->head allows better SACK shifting
- * in tcp_shift_skb_data(), reducing sack/rack overhead, because
- * write queue has less skbs.
- * Each skb can hold up to MAX_SKB_FRAGS * 32Kbytes, or ~0.5 MB.
- * This also speeds up tso_fragment(), since it wont fallback
- * to tcp_fragment().
- */
-static int linear_payload_sz(bool first_skb)
-{
-       if (first_skb)
-               return SKB_WITH_OVERHEAD(2048 - MAX_TCP_HEADER);
-       return 0;
-}
-
-static int select_size(bool first_skb, bool zc)
-{
-       if (zc)
-               return 0;
-       return linear_payload_sz(first_skb);
-}
-
 void tcp_free_fastopen_req(struct tcp_sock *tp)
 {
        if (tp->fastopen_req) {
@@ -1272,7 +1248,6 @@ restart:
 
                if (copy <= 0 || !tcp_skb_can_collapse_to(skb)) {
                        bool first_skb;
-                       int linear;
 
 new_segment:
                        if (!sk_stream_memory_free(sk))
@@ -1283,8 +1258,7 @@ new_segment:
                                goto restart;
                        }
                        first_skb = tcp_rtx_and_write_queues_empty(sk);
-                       linear = select_size(first_skb, zc);
-                       skb = sk_stream_alloc_skb(sk, linear, sk->sk_allocation,
+                       skb = sk_stream_alloc_skb(sk, 0, sk->sk_allocation,
                                                  first_skb);
                        if (!skb)
                                goto wait_for_memory;
@@ -2552,6 +2526,11 @@ void tcp_write_queue_purge(struct sock *sk)
                sk_wmem_free_skb(sk, skb);
        }
        tcp_rtx_queue_purge(sk);
+       skb = sk->sk_tx_skb_cache;
+       if (skb) {
+               __kfree_skb(skb);
+               sk->sk_tx_skb_cache = NULL;
+       }
        INIT_LIST_HEAD(&tcp_sk(sk)->tsorted_sent_queue);
        sk_mem_reclaim(sk);
        tcp_clear_all_retrans_hints(tcp_sk(sk));
@@ -2587,6 +2566,10 @@ int tcp_disconnect(struct sock *sk, int flags)
 
        tcp_clear_xmit_timers(sk);
        __skb_queue_purge(&sk->sk_receive_queue);
+       if (sk->sk_rx_skb_cache) {
+               __kfree_skb(sk->sk_rx_skb_cache);
+               sk->sk_rx_skb_cache = NULL;
+       }
        tp->copied_seq = tp->rcv_nxt;
        tp->urg_data = 0;
        tcp_write_queue_purge(sk);