UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Willem de Bruijn 2014-09-08 19:58:58 -04:00 committed by David S. Miller
parent 17448e5f63
commit 67cc0d4077
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/net/sock.h
View File

@ -2199,6 +2199,8 @@ static inline void sock_recv_ts_and_drops(struct msghdr *msg, struct sock *sk,
sk->sk_stamp = skb->tstamp; 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 * sock_tx_timestamp - checks whether the outgoing packet is to be time stamped
* @sk: socket sending this packet * @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) * 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 * sk_eat_skb - Release a skb if it is no longer needed

7
net/socket.c
View File

@ -610,7 +610,7 @@ void sock_release(struct socket *sock)
} }
EXPORT_SYMBOL(sock_release); 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; 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) if (sk->sk_tsflags & SOF_TIMESTAMPING_TX_ACK)
flags |= SKBTX_ACK_TSTAMP; flags |= SKBTX_ACK_TSTAMP;
if (sock_flag(sk, SOCK_WIFI_STATUS))
flags |= SKBTX_WIFI_STATUS;
*tx_flags = flags; *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, static inline int __sock_sendmsg_nosec(struct kiocb *iocb, struct socket *sock,
struct msghdr *msg, size_t size) struct msghdr *msg, size_t size)