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/ipv4/netfilter/ip_queue.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/ipv4/netfilter/ip_queue.c')
-rw-r--r-- | net/ipv4/netfilter/ip_queue.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/ipv4/netfilter/ip_queue.c b/net/ipv4/netfilter/ip_queue.c index a14798a850d..5842f1aa973 100644 --- a/net/ipv4/netfilter/ip_queue.c +++ b/net/ipv4/netfilter/ip_queue.c | |||
@@ -197,6 +197,7 @@ ipq_build_packet_message(struct ipq_queue_entry *entry, int *errp) | |||
197 | struct sk_buff *skb; | 197 | struct sk_buff *skb; |
198 | struct ipq_packet_msg *pmsg; | 198 | struct ipq_packet_msg *pmsg; |
199 | struct nlmsghdr *nlh; | 199 | struct nlmsghdr *nlh; |
200 | struct timeval tv; | ||
200 | 201 | ||
201 | read_lock_bh(&queue_lock); | 202 | read_lock_bh(&queue_lock); |
202 | 203 | ||
@@ -241,8 +242,9 @@ ipq_build_packet_message(struct ipq_queue_entry *entry, int *errp) | |||
241 | 242 | ||
242 | pmsg->packet_id = (unsigned long )entry; | 243 | pmsg->packet_id = (unsigned long )entry; |
243 | pmsg->data_len = data_len; | 244 | pmsg->data_len = data_len; |
244 | pmsg->timestamp_sec = entry->skb->tstamp.off_sec; | 245 | tv = ktime_to_timeval(entry->skb->tstamp); |
245 | pmsg->timestamp_usec = entry->skb->tstamp.off_usec; | 246 | pmsg->timestamp_sec = tv.tv_sec; |
247 | pmsg->timestamp_usec = tv.tv_usec; | ||
246 | pmsg->mark = entry->skb->mark; | 248 | pmsg->mark = entry->skb->mark; |
247 | pmsg->hook = entry->info->hook; | 249 | pmsg->hook = entry->info->hook; |
248 | pmsg->hw_protocol = entry->skb->protocol; | 250 | pmsg->hw_protocol = entry->skb->protocol; |