Netdev Archive on
help / color / mirror / Atom feed
From: Kurt Kanzenbach <>
To: Roopa Prabhu <>,
	Nikolay Aleksandrov <>
Cc: "David S. Miller" <>,
	Jakub Kicinski <>,,,
	Kurt Kanzenbach <>
Subject: [RFC PATCH] net: bridge: Don't reset time stamps on SO_TXTIME enabled sockets
Date: Thu, 20 Aug 2020 12:57:37 +0200	[thread overview]
Message-ID: <> (raw)

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.

Signed-off-by: Kurt Kanzenbach <>
 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.

diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c
index 7629b63f6f30..e5f7e49ed91d 100644
--- a/net/bridge/br_forward.c
+++ b/net/bridge/br_forward.c
@@ -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;
 		       net, sk, skb, NULL, skb->dev,

             reply	other threads:[~2020-08-20 10:59 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-20 10:57 Kurt Kanzenbach [this message]
2020-08-20 11:23 ` Nikolay Aleksandrov
2020-08-21  7:47   ` Kurt Kanzenbach

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:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \ \
    --subject='Re: [RFC PATCH] net: bridge: Don'\''t reset time stamps on SO_TXTIME enabled sockets' \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

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).