From: Eric Dumazet <eric.dumazet@gmail.com>
To: Lorenz Bauer <lmb@cloudflare.com>,
ast@kernel.org, daniel@iogearbox.net, davem@davemloft.net,
Eric Dumazet <edumazet@google.com>,
netdev@vger.kernel.org, bpf@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: kernel-team@cloudflare.com
Subject: Re: [PATCH bpf v2] bpf: clear skb->tstamp in bpf_redirect when necessary
Date: Fri, 13 Dec 2019 13:09:12 -0800 [thread overview]
Message-ID: <5e7ccc2c-cb6b-0154-15bf-fa93d374266e@gmail.com> (raw)
In-Reply-To: <20191213180817.2510-1-lmb@cloudflare.com>
On 12/13/19 10:08 AM, Lorenz Bauer wrote:
> Redirecting a packet from ingress to egress by using bpf_redirect
> breaks if the egress interface has an fq qdisc installed. This is the same
> problem as fixed in 'commit 8203e2d844d3 ("net: clear skb->tstamp in forwarding paths")
>
> Clear skb->tstamp when redirecting into the egress path.
>
> Fixes: 80b14dee2bea ("net: Add a new socket option for a future transmit time.")
> Fixes: fb420d5d91c1 ("tcp/fq: move back to CLOCK_MONOTONIC")
> Signed-off-by: Lorenz Bauer <lmb@cloudflare.com>
> ---
> net/core/filter.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/net/core/filter.c b/net/core/filter.c
> index f1e703eed3d2..d914257763b5 100644
> --- a/net/core/filter.c
> +++ b/net/core/filter.c
> @@ -2055,6 +2055,7 @@ static inline int __bpf_tx_skb(struct net_device *dev, struct sk_buff *skb)
> }
>
> skb->dev = dev;
> + skb->tstamp = 0;
>
> dev_xmit_recursion_inc();
> ret = dev_queue_xmit(skb);
>
Thanks !
Reviewed-by: Eric Dumazet <edumazet@google.com>
next prev parent reply other threads:[~2019-12-13 21:09 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-13 15:46 [PATCH bpf] bpf: clear skb->tstamp in bpf_redirect when necessary Lorenz Bauer
2019-12-13 17:49 ` Eric Dumazet
2019-12-13 18:08 ` [PATCH bpf v2] " Lorenz Bauer
2019-12-13 21:09 ` Eric Dumazet [this message]
2019-12-13 23:25 ` Alexei Starovoitov
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=5e7ccc2c-cb6b-0154-15bf-fa93d374266e@gmail.com \
--to=eric.dumazet@gmail.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kernel-team@cloudflare.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lmb@cloudflare.com \
--cc=netdev@vger.kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).