Patch "tcp: fix data delivery rate" has been added to the 4.9-stable tree

Patch "tcp: fix data delivery rate" has been added to the 4.9-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    tcp: fix data delivery rate

to the 4.9-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     tcp-fix-data-delivery-rate.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From foo@baz Tue Oct 10 16:09:22 CEST 2017
From: Eric Dumazet <edumazet@google.com>
Date: Fri, 15 Sep 2017 16:47:42 -0700
Subject: tcp: fix data delivery rate

From: Eric Dumazet <edumazet@google.com>


[ Upstream commit fc22579917eb7e13433448a342f1cb1592920940 ]

Now skb->mstamp_skb is updated later, we also need to call
tcp_rate_skb_sent() after the update is done.

Fixes: 8c72c65b426b ("tcp: update skb->skb_mstamp more carefully")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-by: Soheil Hassas Yeganeh <soheil@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 net/ipv4/tcp_output.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -925,8 +925,6 @@ static int tcp_transmit_skb(struct sock
 	if (clone_it) {
 		TCP_SKB_CB(skb)->tx.in_flight = TCP_SKB_CB(skb)->end_seq
 			- tp->snd_una;
-		tcp_rate_skb_sent(sk, skb);
-
 		oskb = skb;
 		if (unlikely(skb_cloned(skb)))
 			skb = pskb_copy(skb, gfp_mask);
@@ -1041,9 +1039,10 @@ static int tcp_transmit_skb(struct sock
 		tcp_enter_cwr(sk);
 		err = net_xmit_eval(err);
 	}
-	if (!err && oskb)
+	if (!err && oskb) {
 		skb_mstamp_get(&oskb->skb_mstamp);
-
+		tcp_rate_skb_sent(sk, oskb);
+	}
 	return err;
 }
 


Patches currently in stable-queue which might be from edumazet@google.com are

queue-4.9/packet-in-packet_do_bind-test-fanout-with-bind_lock-held.patch
queue-4.9/socket-bpf-fix-possible-use-after-free.patch
queue-4.9/packet-only-test-po-has_vnet_hdr-once-in-packet_snd.patch
queue-4.9/tcp-fastopen-fix-on-syn-data-transmit-failure.patch
queue-4.9/net-set-sk_prot_creator-when-cloning-sockets-to-the-right-proto.patch
queue-4.9/tcp-fix-data-delivery-rate.patch