net-timestamp: optimize sock_tx_timestamp default path
Subsystems (3)
Willem de Bruijn
maintainerPATCH v2 1/1 net-timestamp: optimize sock_tx_timestamp default path
Few packets have timestamping enabled. Exit sock_tx_timestamp quickly in this common case.
Signed-off-by Willem de Bruijn <[email protected]>
--- include/net/sock.h | 10 +++++++++- net/socket.c | 7 ++----- 2 files changed, 11 insertions(+), 6 deletions(-)
include/net/sock.h +9 -1
@@ -2199,6 +2199,8 @@ static inline void sock_recv_ts_and_drops(struct msghdr *msg, struct sock *sk, sk->sk_stamp = skb->tstamp; } +void __sock_tx_timestamp (const struct sock *sk,__u8 *tx_flags); +/** * sock_tx_timestamp - checks whether the outgoing packet is to be time stamped * @sk: socket sending this packet
@@ -2206,7 +2208,13 @@ static inline void sock_recv_ts_and_drops(struct msghdr *msg, struct sock *sk,* * Note : callers should take care of initial *tx_flags value (usually 0) */ -void sock_tx_timestamp (const struct sock *sk,__u8 *tx_flags); +static inline void sock_tx_timestamp (const struct sock *sk,__u8 *tx_flags) +{ +if (unlikely (sk->sk_tsflags)) +__sock_tx_timestamp (sk, tx_flags); +if (unlikely (sock_flag (sk,SOCK_WIFI_STATUS ))) + *tx_flags |=SKBTX_WIFI_STATUS ; +}/** * sk_eat_skb - Release a skb if it is no longer needed
net/socket.c +2 -5
@@ -610,7 +610,7 @@ void sock_release(struct socket *sock) }EXPORT_SYMBOL (sock_release); -void sock_tx_timestamp (const struct sock *sk,__u8 *tx_flags) +void __sock_tx_timestamp (const struct sock *sk,__u8 *tx_flags) {u8 flags = *tx_flags;
@@ -626,12 +626,9 @@ void sock_tx_timestamp(const struct sock *sk, __u8 *tx_flags)if (sk->sk_tsflags &SOF_TIMESTAMPING_TX_ACK ) flags |=SKBTX_ACK_TSTAMP ; -if (sock_flag (sk,SOCK_WIFI_STATUS )) - flags |=SKBTX_WIFI_STATUS ; - *tx_flags = flags; } -EXPORT_SYMBOL (sock_tx_timestamp); +EXPORT_SYMBOL (__sock_tx_timestamp);static inline int __sock_sendmsg_nosec (struct kiocb *iocb,struct socket *sock,struct msghdr *msg,size_t size)
Signature · 1 line
2.1.0.rc2.206.gedb03e5
From: Willem de Bruijn <[email protected]>
Date: Mon, 8 Sep 2014 19:58:58 -0400
Quoted 4 lines
Few packets have timestamping enabled. Exit
sock_tx_timestampquickly in this common case.Signed-off-by Willem de Bruijn <[email protected]>
Applied.