From: Simon Horman <horms@verge.net.au>
To: Julian Anastasov <ja@ssi.bg>
Cc: lvs-devel@vger.kernel.org,
Pablo Neira Ayuso <pablo@netfilter.org>,
netfilter-devel@vger.kernel.org, Evgeny B <abt-admin@mail.ru>,
Eric Dumazet <eric.dumazet@gmail.com>
Subject: Re: [PATCH net] ipvs: clear skb->tstamp in forwarding path
Date: Sat, 10 Oct 2020 08:42:06 +0200 [thread overview]
Message-ID: <20201010064206.GC22339@vergenet.net> (raw)
In-Reply-To: <20201009182425.9050-1-ja@ssi.bg>
On Fri, Oct 09, 2020 at 09:24:25PM +0300, Julian Anastasov wrote:
> 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>
Pablo, could you consider this for nf ?
> ---
> 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 b00866d777fe..d2e5a8f644b8 100644
> --- a/net/netfilter/ipvs/ip_vs_xmit.c
> +++ b/net/netfilter/ipvs/ip_vs_xmit.c
> @@ -609,6 +609,8 @@ static inline int ip_vs_tunnel_xmit_prepare(struct sk_buff *skb,
> if (ret == NF_ACCEPT) {
> nf_reset_ct(skb);
> skb_forward_csum(skb);
> + if (skb->dev)
> + skb->tstamp = 0;
> }
> return ret;
> }
> @@ -649,6 +651,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
> @@ -669,6 +673,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.26.2
>
>
next prev parent reply other threads:[~2020-10-10 6:42 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-09 18:24 [PATCH net] ipvs: clear skb->tstamp in forwarding path Julian Anastasov
2020-10-10 6:42 ` Simon Horman [this message]
2020-10-12 0:00 ` Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201010064206.GC22339@vergenet.net \
--to=horms@verge.net.au \
--cc=abt-admin@mail.ru \
--cc=eric.dumazet@gmail.com \
--cc=ja@ssi.bg \
--cc=lvs-devel@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.