ovs: clear skb->tstamp in forwarding path

kaixi.fan · davem330 · commit 01634047bf0d · 2021-08-18T11:31:13.000+01:00
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: fb420d5 ("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>
diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c
@@ -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;
 

Original file line number	Diff line number	Diff line change
`@@ -507,6 +507,7 @@ void ovs_vport_send(struct vport vport, struct sk_buff skb, u8 mac_proto)`
`507`	`507`	`}`
`508`	`508`
`509`	`509`	`skb->dev = vport->dev;`
	`510`	`+ skb->tstamp = 0;`
`510`	`511`	`vport->ops->send(skb);`
`511`	`512`	`return;`
`512`	`513`