Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-09 22:50:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

net-timestamp: SCHED timestamp on entering packet scheduler

Browse Source 
Kernel transmit latency is often incurred in the packet scheduler.
Introduce a new timestamp on transmission just before entering the
scheduler. When data travels through multiple devices (bonding,
tunneling, ...) each device will export an individual timestamp.

Signed-off-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Willem de Bruijn 2014-08-04 22:11:48 -04:00 committed by David S. Miller
parent 09c2d251b7
commit e7fd288538
6 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/linux/skbuff.h
View File

@ -229,7 +229,7 @@ enum {
/* generate hardware time stamp */ /* generate hardware time stamp */
SKBTX_HW_TSTAMP = 1 << 0, SKBTX_HW_TSTAMP = 1 << 0,
/* generate software time stamp */ /* generate software time stamp when queueing packet to NIC */
SKBTX_SW_TSTAMP = 1 << 1, SKBTX_SW_TSTAMP = 1 << 1,
/* device driver is going to provide hardware time stamp */ /* device driver is going to provide hardware time stamp */
@ -247,9 +247,12 @@ enum {
* all frags to avoid possible bad checksum * all frags to avoid possible bad checksum
*/ */
SKBTX_SHARED_FRAG = 1 << 5, SKBTX_SHARED_FRAG = 1 << 5,
/* generate software time stamp when entering packet scheduling */
SKBTX_SCHED_TSTAMP = 1 << 6,
}; };
#define SKBTX_ANY_SW_TSTAMP SKBTX_SW_TSTAMP #define SKBTX_ANY_SW_TSTAMP (SKBTX_SW_TSTAMP | SKBTX_SCHED_TSTAMP)
#define SKBTX_ANY_TSTAMP (SKBTX_HW_TSTAMP | SKBTX_ANY_SW_TSTAMP) #define SKBTX_ANY_TSTAMP (SKBTX_HW_TSTAMP | SKBTX_ANY_SW_TSTAMP)
/* /*
@ -2695,6 +2698,10 @@ static inline bool skb_defer_rx_timestamp(struct sk_buff *skb)
void skb_complete_tx_timestamp(struct sk_buff *skb, void skb_complete_tx_timestamp(struct sk_buff *skb,
struct skb_shared_hwtstamps *hwtstamps); struct skb_shared_hwtstamps *hwtstamps);
void __skb_tstamp_tx(struct sk_buff *orig_skb,
struct skb_shared_hwtstamps *hwtstamps,
struct sock *sk, int tstype);
/** /**
* skb_tstamp_tx - queue clone of skb with send time stamps * skb_tstamp_tx - queue clone of skb with send time stamps
* @orig_skb: the original outgoing packet * @orig_skb: the original outgoing packet

1
include/uapi/linux/errqueue.h
View File

@ -39,6 +39,7 @@ struct scm_timestamping {
*/ */
enum { enum {
SCM_TSTAMP_SND, /* driver passed skb to NIC, or HW */ SCM_TSTAMP_SND, /* driver passed skb to NIC, or HW */
SCM_TSTAMP_SCHED, /* data entered the packet scheduler */
}; };
#endif /* _UAPI_LINUX_ERRQUEUE_H */ #endif /* _UAPI_LINUX_ERRQUEUE_H */

3
include/uapi/linux/net_tstamp.h
View File

@ -21,8 +21,9 @@ enum {
SOF_TIMESTAMPING_SYS_HARDWARE = (1<<5), SOF_TIMESTAMPING_SYS_HARDWARE = (1<<5),
SOF_TIMESTAMPING_RAW_HARDWARE = (1<<6), SOF_TIMESTAMPING_RAW_HARDWARE = (1<<6),
SOF_TIMESTAMPING_OPT_ID = (1<<7), SOF_TIMESTAMPING_OPT_ID = (1<<7),
SOF_TIMESTAMPING_TX_SCHED = (1<<8),
SOF_TIMESTAMPING_LAST = SOF_TIMESTAMPING_OPT_ID, SOF_TIMESTAMPING_LAST = SOF_TIMESTAMPING_TX_SCHED,
SOF_TIMESTAMPING_MASK = (SOF_TIMESTAMPING_LAST - 1) | SOF_TIMESTAMPING_MASK = (SOF_TIMESTAMPING_LAST - 1) |
SOF_TIMESTAMPING_LAST SOF_TIMESTAMPING_LAST
}; };

4
net/core/dev.c
View File

@ -132,6 +132,7 @@
#include <linux/hashtable.h> #include <linux/hashtable.h>
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include <linux/if_macvlan.h> #include <linux/if_macvlan.h>
#include <linux/errqueue.h>
#include "net-sysfs.h" #include "net-sysfs.h"
@ -2876,6 +2877,9 @@ static int __dev_queue_xmit(struct sk_buff *skb, void *accel_priv)
skb_reset_mac_header(skb); skb_reset_mac_header(skb);
if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_SCHED_TSTAMP))
__skb_tstamp_tx(skb, NULL, skb->sk, SCM_TSTAMP_SCHED);
/* Disable soft irqs for various locks below. Also /* Disable soft irqs for various locks below. Also
* stops preemption for RCU. * stops preemption for RCU.
*/ */

16
net/core/skbuff.c
View File

@ -3490,10 +3490,10 @@ int sock_queue_err_skb(struct sock *sk, struct sk_buff *skb)
} }
EXPORT_SYMBOL(sock_queue_err_skb); EXPORT_SYMBOL(sock_queue_err_skb);
void skb_tstamp_tx(struct sk_buff *orig_skb, void __skb_tstamp_tx(struct sk_buff *orig_skb,
struct skb_shared_hwtstamps *hwtstamps) struct skb_shared_hwtstamps *hwtstamps,
struct sock *sk, int tstype)
{ {
struct sock *sk = orig_skb->sk;
struct sock_exterr_skb *serr; struct sock_exterr_skb *serr;
struct sk_buff *skb; struct sk_buff *skb;
int err; int err;
@ -3521,7 +3521,7 @@ void skb_tstamp_tx(struct sk_buff *orig_skb,
memset(serr, 0, sizeof(*serr)); memset(serr, 0, sizeof(*serr));
serr->ee.ee_errno = ENOMSG; serr->ee.ee_errno = ENOMSG;
serr->ee.ee_origin = SO_EE_ORIGIN_TIMESTAMPING; serr->ee.ee_origin = SO_EE_ORIGIN_TIMESTAMPING;
serr->ee.ee_info = SCM_TSTAMP_SND; serr->ee.ee_info = tstype;
if (sk->sk_tsflags & SOF_TIMESTAMPING_OPT_ID) if (sk->sk_tsflags & SOF_TIMESTAMPING_OPT_ID)
serr->ee.ee_data = skb_shinfo(skb)->tskey; serr->ee.ee_data = skb_shinfo(skb)->tskey;
@ -3530,6 +3530,14 @@ void skb_tstamp_tx(struct sk_buff *orig_skb,
if (err) if (err)
kfree_skb(skb); kfree_skb(skb);
} }
EXPORT_SYMBOL_GPL(__skb_tstamp_tx);
void skb_tstamp_tx(struct sk_buff *orig_skb,
struct skb_shared_hwtstamps *hwtstamps)
{
return __skb_tstamp_tx(orig_skb, hwtstamps, orig_skb->sk,
SCM_TSTAMP_SND);
}
EXPORT_SYMBOL_GPL(skb_tstamp_tx); EXPORT_SYMBOL_GPL(skb_tstamp_tx);
void skb_complete_wifi_ack(struct sk_buff *skb, bool acked) void skb_complete_wifi_ack(struct sk_buff *skb, bool acked)

3
net/socket.c
View File

@ -617,6 +617,9 @@ void sock_tx_timestamp(struct sock *sk, __u8 *tx_flags)
*tx_flags |= SKBTX_HW_TSTAMP; *tx_flags |= SKBTX_HW_TSTAMP;
if (sk->sk_tsflags & SOF_TIMESTAMPING_TX_SOFTWARE) if (sk->sk_tsflags & SOF_TIMESTAMPING_TX_SOFTWARE)
*tx_flags |= SKBTX_SW_TSTAMP; *tx_flags |= SKBTX_SW_TSTAMP;
if (sk->sk_tsflags & SOF_TIMESTAMPING_TX_SCHED)
*tx_flags |= SKBTX_SCHED_TSTAMP;
if (sock_flag(sk, SOCK_WIFI_STATUS)) if (sock_flag(sk, SOCK_WIFI_STATUS))
*tx_flags |= SKBTX_WIFI_STATUS; *tx_flags |= SKBTX_WIFI_STATUS;
} }