@@ -260,9 +260,13 @@ enum {
SKBTX_SHARED_FRAG = 1 << 5,
SKBTX_ACK_TSTAMP = 1 << 6,
+
+ SKBTX_ENQ_TSTAMP = 1 << 7,
};
-#define SKBTX_ANY_SW_TSTAMP (SKBTX_SW_TSTAMP | SKBTX_ACK_TSTAMP)
+#define SKBTX_ANY_SW_TSTAMP (SKBTX_SW_TSTAMP | \
+ SKBTX_ACK_TSTAMP | \
+ SKBTX_ENQ_TSTAMP)
/*
* The callback notifies userspace to release buffers when skb DMA is done in
@@ -2757,6 +2761,8 @@ static inline u8 skbflags_tx_tstamp(int flags)
tx_flags |= SKBTX_SW_TSTAMP;
if (flags & MSG_TSTAMP_ACK)
tx_flags |= SKBTX_ACK_TSTAMP;
+ if (flags & MSG_TSTAMP_ENQ)
+ tx_flags |= SKBTX_ENQ_TSTAMP;
}
return tx_flags;
@@ -255,7 +255,8 @@ struct ucred {
#define MSG_SENDPAGE_NOTLAST 0x20000 /* sendpage() internal : not the last page */
#define MSG_TSTAMP 0x100000
#define MSG_TSTAMP_ACK 0x200000
-#define MSG_TSTAMP_MASK (MSG_TSTAMP | MSG_TSTAMP_ACK)
+#define MSG_TSTAMP_ENQ 0x400000
+#define MSG_TSTAMP_MASK (MSG_TSTAMP | MSG_TSTAMP_ACK | MSG_TSTAMP_ENQ)
#define MSG_EOF MSG_FIN
#define MSG_FASTOPEN 0x20000000 /* Send data in TCP SYN */
@@ -2859,6 +2859,9 @@ static int __dev_queue_xmit(struct sk_buff *skb, void *accel_priv)
skb_reset_mac_header(skb);
+ if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_ENQ_TSTAMP))
+ __skb_tstamp_tx(skb, NULL, skb->sk, SKBTX_ENQ_TSTAMP);
+
/* Disable soft irqs for various locks below. Also
* stops preemption for RCU.
*/
@@ -736,6 +736,9 @@ void __sock_recv_timestamp(struct msghdr *msg, struct sock *sk,
case SKBTX_ACK_TSTAMP:
tss.ts_type = SCM_TSTAMP_ACK;
break;
+ case SKBTX_ENQ_TSTAMP:
+ tss.ts_type = SCM_TSTAMP_ENQ;
+ break;
}
}
if (shhwtstamps) {
Kernel transmit latency is often incurred in the traffic shaping layer. This patch adds a new timestamp on transmission just before entering traffic shaping. When data travels through multiple devices (bonding, tunneling, ...) each device will export an individual timestamp. Signed-off-by: Willem de Bruijn <willemb@google.com> --- include/linux/skbuff.h | 8 +++++++- include/linux/socket.h | 3 ++- net/core/dev.c | 3 +++ net/socket.c | 3 +++ 4 files changed, 15 insertions(+), 2 deletions(-)