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/compat.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/compat.c')
-rw-r--r-- | net/compat.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/net/compat.c b/net/compat.c index 1f32866d09b7..17c2710b2b93 100644 --- a/net/compat.c +++ b/net/compat.c | |||
@@ -545,15 +545,20 @@ int compat_sock_get_timestamp(struct sock *sk, struct timeval __user *userstamp) | |||
545 | struct compat_timeval __user *ctv = | 545 | struct compat_timeval __user *ctv = |
546 | (struct compat_timeval __user*) userstamp; | 546 | (struct compat_timeval __user*) userstamp; |
547 | int err = -ENOENT; | 547 | int err = -ENOENT; |
548 | struct timeval tv; | ||
548 | 549 | ||
549 | if (!sock_flag(sk, SOCK_TIMESTAMP)) | 550 | if (!sock_flag(sk, SOCK_TIMESTAMP)) |
550 | sock_enable_timestamp(sk); | 551 | sock_enable_timestamp(sk); |
551 | if (sk->sk_stamp.tv_sec == -1) | 552 | tv = ktime_to_timeval(sk->sk_stamp); |
553 | if (tv.tv_sec == -1) | ||
552 | return err; | 554 | return err; |
553 | if (sk->sk_stamp.tv_sec == 0) | 555 | if (tv.tv_sec == 0) { |
554 | do_gettimeofday(&sk->sk_stamp); | 556 | sk->sk_stamp = ktime_get_real(); |
555 | if (put_user(sk->sk_stamp.tv_sec, &ctv->tv_sec) || | 557 | tv = ktime_to_timeval(sk->sk_stamp); |
556 | put_user(sk->sk_stamp.tv_usec, &ctv->tv_usec)) | 558 | } |
559 | err = 0; | ||
560 | if (put_user(tv.tv_sec, &ctv->tv_sec) || | ||
561 | put_user(tv.tv_usec, &ctv->tv_usec)) | ||
557 | err = -EFAULT; | 562 | err = -EFAULT; |
558 | return err; | 563 | return err; |
559 | } | 564 | } |