lkml.org 
[lkml]   [2017]   [Oct]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.13 013/160] tcp: fix data delivery rate
    Date
    4.13-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    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
    @@ -1002,8 +1002,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);
    @@ -1128,9 +1126,10 @@ static int tcp_transmit_skb(struct sock
    tcp_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;
    }


    \
     
     \ /
      Last update: 2017-10-10 22:44    [W:2.950 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site