lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 124/264] ipvs: clear skb->tstamp in forwarding path
    Date
    From: Julian Anastasov <ja@ssi.bg>

    [ Upstream commit 7980d2eabde82be86c5be18aa3d07e88ec13c6a1 ]

    fq qdisc requires tstamp to be cleared in forwarding path

    Reported-by: Evgeny B <abt-admin@mail.ru>
    Link: https://bugzilla.kernel.org/show_bug.cgi?id=209427
    Suggested-by: Eric Dumazet <eric.dumazet@gmail.com>
    Fixes: 8203e2d844d3 ("net: clear skb->tstamp in forwarding paths")
    Fixes: fb420d5d91c1 ("tcp/fq: move back to CLOCK_MONOTONIC")
    Fixes: 80b14dee2bea ("net: Add a new socket option for a future transmit time.")
    Signed-off-by: Julian Anastasov <ja@ssi.bg>
    Reviewed-by: Simon Horman <horms@verge.net.au>
    Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/netfilter/ipvs/ip_vs_xmit.c | 6 ++++++
    1 file changed, 6 insertions(+)

    diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
    index 3f75cd947045e..11f7c546e57b3 100644
    --- a/net/netfilter/ipvs/ip_vs_xmit.c
    +++ b/net/netfilter/ipvs/ip_vs_xmit.c
    @@ -586,6 +586,8 @@ static inline int ip_vs_tunnel_xmit_prepare(struct sk_buff *skb,
    if (ret == NF_ACCEPT) {
    nf_reset(skb);
    skb_forward_csum(skb);
    + if (skb->dev)
    + skb->tstamp = 0;
    }
    return ret;
    }
    @@ -626,6 +628,8 @@ static inline int ip_vs_nat_send_or_cont(int pf, struct sk_buff *skb,

    if (!local) {
    skb_forward_csum(skb);
    + if (skb->dev)
    + skb->tstamp = 0;
    NF_HOOK(pf, NF_INET_LOCAL_OUT, cp->ipvs->net, NULL, skb,
    NULL, skb_dst(skb)->dev, dst_output);
    } else
    @@ -646,6 +650,8 @@ static inline int ip_vs_send_or_cont(int pf, struct sk_buff *skb,
    if (!local) {
    ip_vs_drop_early_demux_sk(skb);
    skb_forward_csum(skb);
    + if (skb->dev)
    + skb->tstamp = 0;
    NF_HOOK(pf, NF_INET_LOCAL_OUT, cp->ipvs->net, NULL, skb,
    NULL, skb_dst(skb)->dev, dst_output);
    } else
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 15:23    [W:4.220 / U:0.316 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site