diff options
author | Eric Dumazet <dada1@cosmosbay.com> | 2007-04-19 19:16:32 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:23:34 -0400 |
commit | b7aa0bf70c4afb9e38be25f5c0922498d0f8684c (patch) | |
tree | 4bc9d61031f4eb40d73887d6bde09e7d6bf2b259 /net/core/dev.c | |
parent | 3927f2e8f9afa3424bb51ca81f7abac01ffd0005 (diff) |
[NET]: convert network timestamps to ktime_t
We currently use a special structure (struct skb_timeval) and plain
'struct timeval' to store packet timestamps in sk_buffs and struct
sock.
This has some drawbacks :
- Fixed resolution of micro second.
- Waste of space on 64bit platforms where sizeof(struct timeval)=16
I suggest using ktime_t that is a nice abstraction of high resolution
time services, currently capable of nanosecond resolution.
As sizeof(ktime_t) is 8 bytes, using ktime_t in 'struct sock' permits
a 8 byte shrink of this structure on 64bit architectures. Some other
structures also benefit from this size reduction (struct ipq in
ipv4/ip_fragment.c, struct frag_queue in ipv6/reassembly.c, ...)
Once this ktime infrastructure adopted, we can more easily provide
nanosecond resolution on top of it. (ioctl SIOCGSTAMPNS and/or
SO_TIMESTAMPNS/SCM_TIMESTAMPNS)
Note : this patch includes a bug correction in
compat_sock_get_timestamp() where a "err = 0;" was missing (so this
syscall returned -ENOENT instead of 0)
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
CC: Stephen Hemminger <shemminger@linux-foundation.org>
CC: John find <linux.kernel@free.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/dev.c')
-rw-r--r-- | net/core/dev.c | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 4dc93cc4d5b7..582db646cc54 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -1031,23 +1031,12 @@ void net_disable_timestamp(void) | |||
1031 | atomic_dec(&netstamp_needed); | 1031 | atomic_dec(&netstamp_needed); |
1032 | } | 1032 | } |
1033 | 1033 | ||
1034 | void __net_timestamp(struct sk_buff *skb) | ||
1035 | { | ||
1036 | struct timeval tv; | ||
1037 | |||
1038 | do_gettimeofday(&tv); | ||
1039 | skb_set_timestamp(skb, &tv); | ||
1040 | } | ||
1041 | EXPORT_SYMBOL(__net_timestamp); | ||
1042 | |||
1043 | static inline void net_timestamp(struct sk_buff *skb) | 1034 | static inline void net_timestamp(struct sk_buff *skb) |
1044 | { | 1035 | { |
1045 | if (atomic_read(&netstamp_needed)) | 1036 | if (atomic_read(&netstamp_needed)) |
1046 | __net_timestamp(skb); | 1037 | __net_timestamp(skb); |
1047 | else { | 1038 | else |
1048 | skb->tstamp.off_sec = 0; | 1039 | skb->tstamp.tv64 = 0; |
1049 | skb->tstamp.off_usec = 0; | ||
1050 | } | ||
1051 | } | 1040 | } |
1052 | 1041 | ||
1053 | /* | 1042 | /* |
@@ -1577,7 +1566,7 @@ int netif_rx(struct sk_buff *skb) | |||
1577 | if (netpoll_rx(skb)) | 1566 | if (netpoll_rx(skb)) |
1578 | return NET_RX_DROP; | 1567 | return NET_RX_DROP; |
1579 | 1568 | ||
1580 | if (!skb->tstamp.off_sec) | 1569 | if (!skb->tstamp.tv64) |
1581 | net_timestamp(skb); | 1570 | net_timestamp(skb); |
1582 | 1571 | ||
1583 | /* | 1572 | /* |
@@ -1769,7 +1758,7 @@ int netif_receive_skb(struct sk_buff *skb) | |||
1769 | if (skb->dev->poll && netpoll_rx(skb)) | 1758 | if (skb->dev->poll && netpoll_rx(skb)) |
1770 | return NET_RX_DROP; | 1759 | return NET_RX_DROP; |
1771 | 1760 | ||
1772 | if (!skb->tstamp.off_sec) | 1761 | if (!skb->tstamp.tv64) |
1773 | net_timestamp(skb); | 1762 | net_timestamp(skb); |
1774 | 1763 | ||
1775 | if (!skb->iif) | 1764 | if (!skb->iif) |