Patch "tcp: fix data delivery rate" has been added to the 4.13-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
tcp: fix data delivery rate
to the 4.13-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.13 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Mon Oct 9 09:32:35 CEST 2017
From: Eric Dumazet <[email protected]>
Date: Fri, 15 Sep 2017 16:47:42 -0700
Subject: tcp: fix data delivery rate
From: Eric Dumazet <[email protected]>
[ Upstream commit fc22579917eb7e13433448a342f1cb1592920940 ]
Now skb->mstamp_skb is updated later, we also need to call tcp_rate_skb_sent() after the update is done.
--- net/ipv4/tcp_output.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
net/ipv4/tcp_output.c +3 -4
@@ -1002,8 +1002,6 @@ static int tcp_transmit_skb(struct sockif (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);
@@ -1128,9 +1126,10 @@ static int tcp_transmit_skb(struct socktcp_enter_cwr (sk); err =net_xmit_eval (err); } -if (!err && oskb) +if (!err && oskb) { oskb->skb_mstamp = tp->tcp_mstamp; - +tcp_rate_skb_sent (sk, oskb); + }return err; }
Patches currently in stable-queue which might be from [email protected] are
queue-4.13/packet-in-packet_do_bind-test-fanout-with-bind_lock-held.patch queue-4.13/socket-bpf-fix-possible-use-after-free.patch queue-4.13/bpf-do-not-disable-enable-bh-in-bpf_map_free_id.patch queue-4.13/packet-only-test-po-has_vnet_hdr-once-in-packet_snd.patch queue-4.13/8139too-revisit-napi_complete_done-usage.patch queue-4.13/net_sched-gen_estimator-fix-scaling-error-in-bytes-packets-samples.patch queue-4.13/tcp-fastopen-fix-on-syn-data-transmit-failure.patch queue-4.13/bpf-fix-bpf_tail_call-x64-jit.patch queue-4.13/net-set-sk_prot_creator-when-cloning-sockets-to-the-right-proto.patch queue-4.13/tcp-fix-data-delivery-rate.patch