net: bridge: Don't reset time stamps on SO_TXTIME enabled sockets
Subsystems (3)
RFC PATCH 1/1 net: bridge: Don't reset time stamps on SO_TXTIME enabled sockets
When using the ETF Qdisc in combination with a bridge and DSA, then all packets gets dropped due to invalid time stamps. The setup looks like this:
Transmit path:
Application -> bridge (br0) -> DSA slave ports (lan0, lan1) -> ETF Qdisc
-> ethernet (eth0)
The user space application uses SO_TXTIME to attach a sending time stamp for each packet using the corresponding interface. That time stamp is then attached to the skb in the kernel. The first network device involved in the chain is the bridge device. However, in br_forward_finish() the time stamp is reset to zero unconditionally. Meaning when the skb arrives at the ETF Qdisc, it's dropped as invalid because the time stamp is zero.
The reset of the time stamp in the bridge code is there for a good reason. See commit 41d1c8839e5f ("net: clear skb->tstamp in bridge forwarding path") Therefore, add a conditional for SO_TXTIME enabled sockets.
--- net/bridge/br_forward.c | 9 +++++++++ 1 file changed, 9 insertions(+)
RFC, because I don't know if that's the correct way to solve that issue.
net/bridge/br_forward.c +9 -0
@@ -15,6 +15,7 @@#include <linux/skbuff.h> #include <linux/if_vlan.h> #include <linux/netfilter_bridge.h> +#include <net/sock.h> #include "br_private.h" /* Don't forward packets to originating port or forwarding disabled */
@@ -61,7 +62,15 @@ EXPORT_SYMBOL_GPL(br_dev_queue_push_xmit);int br_forward_finish (struct net *net,struct sock *sk,struct sk_buff *skb) { +/* When applications provide time stamps for packets via SO_TXTIME +* socket option, then don't reset it. +*/ +if (skb->sk &&sock_flag (skb->sk,SOCK_TXTIME )) + goto finish; + skb->tstamp =0 ; + +finish:return NF_HOOK (NFPROTO_BRIDGE ,NF_BR_POST_ROUTING , net, sk, skb,NULL , skb->dev, br_dev_queue_push_xmit);
Signature · 1 line
2.20.1
Quoted 19 lines · Kurt Kanzenbach
When using the ETF Qdisc in combination with a bridge and DSA, then all packets gets dropped due to invalid time stamps. The setup looks like this:
Transmit path:
Application -> bridge (br0) -> DSA slave ports (lan0, lan1) -> ETF Qdisc
-> ethernet (eth0)The user space application uses
SO_TXTIMEto attach a sending time stamp for each packet using the corresponding interface. That time stamp is then attached to the skb in the kernel. The first network device involved in the chain is the bridge device. However, inbr_forward_finish()the time stamp is reset to zero unconditionally. Meaning when the skb arrives at the ETF Qdisc, it's dropped as invalid because the time stamp is zero.The reset of the time stamp in the bridge code is there for a good reason. See commit
41d1c8839e5f("net: clearskb->tstampin bridge forwarding path") Therefore, add a conditional forSO_TXTIMEenabled sockets.
Quoted 7 lines
Signed-off-by Kurt Kanzenbach <[email protected]>--- net/bridge/br_forward.c | 9 +++++++++ 1 file changed, 9 insertions(+)RFC, because I don't know if that's the correct way to solve that issue.
The new conditionals will be for all forwarded packets, not only the ones that are transmitted through the bridge master device. If you'd like to do this please limit it to the bridge dev transmit.
Thanks,
Nik
Quoted 2 lines · Nikolay Aleksandrov
The new conditionals will be for all forwarded packets, not only the ones that are transmitted through the bridge master device.
I see makes sense.
Quoted 1 line
If you'd like to do this please limit it to the bridge dev transmit.
I'm wondering how to do that. The problem is that the time stamp is reset to zero unconditionally in br_forward_finish(). This function is also called in the transmit path.
Thanks,
Kurt