]> git.itanic.dy.fi Git - linux-stable/commitdiff
ovs: clear skb->tstamp in forwarding path
authorkaixi.fan <fankaixi.li@bytedance.com>
Wed, 18 Aug 2021 02:22:15 +0000 (10:22 +0800)
committerSasha Levin <sashal@kernel.org>
Thu, 26 Aug 2021 12:35:09 +0000 (08:35 -0400)
[ Upstream commit 01634047bf0d5c2d9b7d8095bb4de1663dbeedeb ]

fq qdisc requires tstamp to be cleared in the forwarding path. Now ovs
doesn't clear skb->tstamp. We encountered a problem with linux
version 5.4.56 and ovs version 2.14.1, and packets failed to
dequeue from qdisc when fq qdisc was attached to ovs port.

Fixes: fb420d5d91c1 ("tcp/fq: move back to CLOCK_MONOTONIC")
Signed-off-by: kaixi.fan <fankaixi.li@bytedance.com>
Signed-off-by: xiexiaohui <xiexiaohui.xxh@bytedance.com>
Reviewed-by: Cong Wang <cong.wang@bytedance.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/openvswitch/vport.c

index 88deb5b41429f5852a7613d50aaf4003861172f5..cf2ce581248968293efd5cd5d3462d8a4ca94e4e 100644 (file)
@@ -507,6 +507,7 @@ void ovs_vport_send(struct vport *vport, struct sk_buff *skb, u8 mac_proto)
        }
 
        skb->dev = vport->dev;
+       skb->tstamp = 0;
        vport->ops->send(skb);
        return;