| Message ID | 20191213154634.27338-1-lmb@cloudflare.com |
|---|---|
| State | Changes Requested |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | [bpf] bpf: clear skb->tstamp in bpf_redirect when necessary | expand |
On 12/13/19 7:46 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 8203e2d8 ("net: clear skb->tstamp in forwarding paths"). > > Clear skb->tstamp when redirecting into the egress path. > > Fixes: 80b14de ("net: Add a new socket option for a future transmit time.") Please use 12 digits sha1 > Fixes: fb420d5 ("tcp/fq: move back to CLOCK_MONOTONIC") > Signed-off-by: Lorenz Bauer <lmb@cloudflare.com> Thanks for fixing this !
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);
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 8203e2d8 ("net: clear skb->tstamp in forwarding paths"). Clear skb->tstamp when redirecting into the egress path. Fixes: 80b14de ("net: Add a new socket option for a future transmit time.") Fixes: fb420d5 ("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(+)