aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorEric Dumazet <dada1@cosmosbay.com>2007-04-19 19:16:32 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-26 01:23:34 -0400
commitb7aa0bf70c4afb9e38be25f5c0922498d0f8684c (patch)
tree4bc9d61031f4eb40d73887d6bde09e7d6bf2b259 /include
parent3927f2e8f9afa3424bb51ca81f7abac01ffd0005 (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 'include')
-rw-r--r--include/linux/skbuff.h26
-rw-r--r--include/net/sock.h18
2 files changed, 14 insertions, 30 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 5992f65b4184..f9441b5f8d13 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -27,6 +27,7 @@
27#include <net/checksum.h> 27#include <net/checksum.h>
28#include <linux/rcupdate.h> 28#include <linux/rcupdate.h>
29#include <linux/dmaengine.h> 29#include <linux/dmaengine.h>
30#include <linux/hrtimer.h>
30 31
31#define HAVE_ALLOC_SKB /* For the drivers to know */ 32#define HAVE_ALLOC_SKB /* For the drivers to know */
32#define HAVE_ALIGNABLE_SKB /* Ditto 8) */ 33#define HAVE_ALIGNABLE_SKB /* Ditto 8) */
@@ -156,11 +157,6 @@ struct skb_shared_info {
156#define SKB_DATAREF_SHIFT 16 157#define SKB_DATAREF_SHIFT 16
157#define SKB_DATAREF_MASK ((1 << SKB_DATAREF_SHIFT) - 1) 158#define SKB_DATAREF_MASK ((1 << SKB_DATAREF_SHIFT) - 1)
158 159
159struct skb_timeval {
160 u32 off_sec;
161 u32 off_usec;
162};
163
164 160
165enum { 161enum {
166 SKB_FCLONE_UNAVAILABLE, 162 SKB_FCLONE_UNAVAILABLE,
@@ -233,7 +229,7 @@ struct sk_buff {
233 struct sk_buff *prev; 229 struct sk_buff *prev;
234 230
235 struct sock *sk; 231 struct sock *sk;
236 struct skb_timeval tstamp; 232 ktime_t tstamp;
237 struct net_device *dev; 233 struct net_device *dev;
238 int iif; 234 int iif;
239 /* 4 byte hole on 64 bit*/ 235 /* 4 byte hole on 64 bit*/
@@ -1365,26 +1361,14 @@ extern void skb_add_mtu(int mtu);
1365 */ 1361 */
1366static inline void skb_get_timestamp(const struct sk_buff *skb, struct timeval *stamp) 1362static inline void skb_get_timestamp(const struct sk_buff *skb, struct timeval *stamp)
1367{ 1363{
1368 stamp->tv_sec = skb->tstamp.off_sec; 1364 *stamp = ktime_to_timeval(skb->tstamp);
1369 stamp->tv_usec = skb->tstamp.off_usec;
1370} 1365}
1371 1366
1372/** 1367static inline void __net_timestamp(struct sk_buff *skb)
1373 * skb_set_timestamp - set timestamp of a skb
1374 * @skb: skb to set stamp of
1375 * @stamp: pointer to struct timeval to get stamp from
1376 *
1377 * Timestamps are stored in the skb as offsets to a base timestamp.
1378 * This function converts a struct timeval to an offset and stores
1379 * it in the skb.
1380 */
1381static inline void skb_set_timestamp(struct sk_buff *skb, const struct timeval *stamp)
1382{ 1368{
1383 skb->tstamp.off_sec = stamp->tv_sec; 1369 skb->tstamp = ktime_get_real();
1384 skb->tstamp.off_usec = stamp->tv_usec;
1385} 1370}
1386 1371
1387extern void __net_timestamp(struct sk_buff *skb);
1388 1372
1389extern __sum16 __skb_checksum_complete(struct sk_buff *skb); 1373extern __sum16 __skb_checksum_complete(struct sk_buff *skb);
1390 1374
diff --git a/include/net/sock.h b/include/net/sock.h
index a3366c3c837a..9583639090d2 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -244,7 +244,7 @@ struct sock {
244 struct sk_filter *sk_filter; 244 struct sk_filter *sk_filter;
245 void *sk_protinfo; 245 void *sk_protinfo;
246 struct timer_list sk_timer; 246 struct timer_list sk_timer;
247 struct timeval sk_stamp; 247 ktime_t sk_stamp;
248 struct socket *sk_socket; 248 struct socket *sk_socket;
249 void *sk_user_data; 249 void *sk_user_data;
250 struct page *sk_sndmsg_page; 250 struct page *sk_sndmsg_page;
@@ -1307,19 +1307,19 @@ static inline int sock_intr_errno(long timeo)
1307static __inline__ void 1307static __inline__ void
1308sock_recv_timestamp(struct msghdr *msg, struct sock *sk, struct sk_buff *skb) 1308sock_recv_timestamp(struct msghdr *msg, struct sock *sk, struct sk_buff *skb)
1309{ 1309{
1310 struct timeval stamp; 1310 ktime_t kt = skb->tstamp;
1311 1311
1312 skb_get_timestamp(skb, &stamp);
1313 if (sock_flag(sk, SOCK_RCVTSTAMP)) { 1312 if (sock_flag(sk, SOCK_RCVTSTAMP)) {
1313 struct timeval tv;
1314 /* Race occurred between timestamp enabling and packet 1314 /* Race occurred between timestamp enabling and packet
1315 receiving. Fill in the current time for now. */ 1315 receiving. Fill in the current time for now. */
1316 if (stamp.tv_sec == 0) 1316 if (kt.tv64 == 0)
1317 do_gettimeofday(&stamp); 1317 kt = ktime_get_real();
1318 skb_set_timestamp(skb, &stamp); 1318 skb->tstamp = kt;
1319 put_cmsg(msg, SOL_SOCKET, SO_TIMESTAMP, sizeof(struct timeval), 1319 tv = ktime_to_timeval(kt);
1320 &stamp); 1320 put_cmsg(msg, SOL_SOCKET, SO_TIMESTAMP, sizeof(tv), &tv);
1321 } else 1321 } else
1322 sk->sk_stamp = stamp; 1322 sk->sk_stamp = kt;
1323} 1323}
1324 1324
1325/** 1325/**