[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>

[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>
Eric Dumazet · David S. Miller
1 parent 3927f2e8f9
Showing 20 changed files with 85 additions and 98 deletions Side-by-side Diff
include/linux/skbuff.h
include/net/sock.h
kernel/time.c
net/bridge/netfilter/ebt_ulog.c
net/compat.c
net/core/dev.c
net/core/sock.c
net/econet/af_econet.c
net/ipv4/ip_fragment.c
net/ipv4/netfilter/ip_queue.c
net/ipv4/netfilter/ipt_ULOG.c
net/ipv6/exthdrs.c
net/ipv6/netfilter/ip6_queue.c
net/ipv6/netfilter/nf_conntrack_reasm.c
net/ipv6/reassembly.c
net/ipx/af_ipx.c
net/netfilter/nfnetlink_log.c
net/netfilter/nfnetlink_queue.c
net/packet/af_packet.c
net/sunrpc/svcsock.c
@@ -27,6 +27,7 @@
 #include <net/checksum.h>
 #include <linux/rcupdate.h>
 #include <linux/dmaengine.h>
+#include <linux/hrtimer.h>
  
 #define HAVE_ALLOC_SKB		/* For the drivers to know */
 #define HAVE_ALIGNABLE_SKB	/* Ditto 8)		   */
  
@@ -156,12 +157,7 @@
 #define SKB_DATAREF_SHIFT 16
 #define SKB_DATAREF_MASK ((1 << SKB_DATAREF_SHIFT) - 1)
  
-struct skb_timeval {
-	u32	off_sec;
-	u32	off_usec;
-};
  
-
 enum {
 	SKB_FCLONE_UNAVAILABLE,
 	SKB_FCLONE_ORIG,
@@ -233,7 +229,7 @@
 	struct sk_buff		*prev;
  
 	struct sock		*sk;
-	struct skb_timeval	tstamp;
+	ktime_t			tstamp;
 	struct net_device	*dev;
 	int			iif;
 	/* 4 byte hole on 64 bit*/
  
  
  
@@ -1365,26 +1361,14 @@
  */
 static inline void skb_get_timestamp(const struct sk_buff *skb, struct timeval *stamp)
 {
-	stamp->tv_sec  = skb->tstamp.off_sec;
-	stamp->tv_usec = skb->tstamp.off_usec;
+	*stamp = ktime_to_timeval(skb->tstamp);
 }
  
-/**
- * 	skb_set_timestamp - set timestamp of a skb
- *	@skb: skb to set stamp of
- *	@stamp: pointer to struct timeval to get stamp from
- *
- *	Timestamps are stored in the skb as offsets to a base timestamp.
- *	This function converts a struct timeval to an offset and stores
- *	it in the skb.
- */
-static inline void skb_set_timestamp(struct sk_buff *skb, const struct timeval *stamp)
+static inline void __net_timestamp(struct sk_buff *skb)
 {
-	skb->tstamp.off_sec  = stamp->tv_sec;
-	skb->tstamp.off_usec = stamp->tv_usec;
+	skb->tstamp = ktime_get_real();
 }
  
-extern void __net_timestamp(struct sk_buff *skb);
  
 extern __sum16 __skb_checksum_complete(struct sk_buff *skb);
  
@@ -244,7 +244,7 @@
 	struct sk_filter      	*sk_filter;
 	void			*sk_protinfo;
 	struct timer_list	sk_timer;
-	struct timeval		sk_stamp;
+	ktime_t			sk_stamp;
 	struct socket		*sk_socket;
 	void			*sk_user_data;
 	struct page		*sk_sndmsg_page;
  
  
  
  
@@ -1307,19 +1307,19 @@
 static __inline__ void
 sock_recv_timestamp(struct msghdr *msg, struct sock *sk, struct sk_buff *skb)
 {
-	struct timeval stamp;
+	ktime_t kt = skb->tstamp;
  
-	skb_get_timestamp(skb, &stamp);
 	if (sock_flag(sk, SOCK_RCVTSTAMP)) {
+		struct timeval tv;
 		/* Race occurred between timestamp enabling and packet
 		   receiving.  Fill in the current time for now. */
-		if (stamp.tv_sec == 0)
-			do_gettimeofday(&stamp);
-		skb_set_timestamp(skb, &stamp);
-		put_cmsg(msg, SOL_SOCKET, SO_TIMESTAMP, sizeof(struct timeval),
-			 &stamp);
+		if (kt.tv64 == 0)
+			kt = ktime_get_real();
+		skb->tstamp = kt;
+		tv = ktime_to_timeval(kt);
+		put_cmsg(msg, SOL_SOCKET, SO_TIMESTAMP, sizeof(tv), &tv);
 	} else
-		sk->sk_stamp = stamp;
+		sk->sk_stamp = kt;
 }
  
 /**
@@ -469,6 +469,7 @@
  
 	return tv;
 }
+EXPORT_SYMBOL(ns_to_timeval);
  
 /*
  * Convert jiffies to milliseconds and back.
@@ -130,6 +130,7 @@
 	unsigned int group = uloginfo->nlgroup;
 	ebt_ulog_buff_t *ub = &ulog_buffers[group];
 	spinlock_t *lock = &ub->lock;
+	ktime_t kt;
  
 	if ((uloginfo->cprange == 0) ||
 	    (uloginfo->cprange > skb->len + ETH_HLEN))
  
@@ -164,9 +165,10 @@
  
 	/* Fill in the ulog data */
 	pm->version = EBT_ULOG_VERSION;
-	do_gettimeofday(&pm->stamp);
+	kt = ktime_get_real();
+	pm->stamp = ktime_to_timeval(kt);
 	if (ub->qlen == 1)
-		skb_set_timestamp(ub->skb, &pm->stamp);
+		ub->skb->tstamp = kt;
 	pm->data_len = copy_len;
 	pm->mark = skb->mark;
 	pm->hook = hooknr;
@@ -545,15 +545,20 @@
 	struct compat_timeval __user *ctv =
 			(struct compat_timeval __user*) userstamp;
 	int err = -ENOENT;
+	struct timeval tv;
  
 	if (!sock_flag(sk, SOCK_TIMESTAMP))
 		sock_enable_timestamp(sk);
-	if (sk->sk_stamp.tv_sec == -1)
+	tv = ktime_to_timeval(sk->sk_stamp);
+	if (tv.tv_sec == -1)
 		return err;
-	if (sk->sk_stamp.tv_sec == 0)
-		do_gettimeofday(&sk->sk_stamp);
-	if (put_user(sk->sk_stamp.tv_sec, &ctv->tv_sec) ||
-			put_user(sk->sk_stamp.tv_usec, &ctv->tv_usec))
+	if (tv.tv_sec == 0) {
+		sk->sk_stamp = ktime_get_real();
+		tv = ktime_to_timeval(sk->sk_stamp);
+	}
+	err = 0;
+	if (put_user(tv.tv_sec, &ctv->tv_sec) ||
+			put_user(tv.tv_usec, &ctv->tv_usec))
 		err = -EFAULT;
 	return err;
 }
@@ -1031,23 +1031,12 @@
 	atomic_dec(&netstamp_needed);
 }
  
-void __net_timestamp(struct sk_buff *skb)
-{
-	struct timeval tv;
-
-	do_gettimeofday(&tv);
-	skb_set_timestamp(skb, &tv);
-}
-EXPORT_SYMBOL(__net_timestamp);
-
 static inline void net_timestamp(struct sk_buff *skb)
 {
 	if (atomic_read(&netstamp_needed))
 		__net_timestamp(skb);
-	else {
-		skb->tstamp.off_sec = 0;
-		skb->tstamp.off_usec = 0;
-	}
+	else
+		skb->tstamp.tv64 = 0;
 }
  
 /*
@@ -1577,7 +1566,7 @@
 	if (netpoll_rx(skb))
 		return NET_RX_DROP;
  
-	if (!skb->tstamp.off_sec)
+	if (!skb->tstamp.tv64)
 		net_timestamp(skb);
  
 	/*
@@ -1769,7 +1758,7 @@
 	if (skb->dev->poll && netpoll_rx(skb))
 		return NET_RX_DROP;
  
-	if (!skb->tstamp.off_sec)
+	if (!skb->tstamp.tv64)
 		net_timestamp(skb);
  
 	if (!skb->iif)
@@ -1512,8 +1512,7 @@
 	sk->sk_rcvtimeo		=	MAX_SCHEDULE_TIMEOUT;
 	sk->sk_sndtimeo		=	MAX_SCHEDULE_TIMEOUT;
  
-	sk->sk_stamp.tv_sec     = -1L;
-	sk->sk_stamp.tv_usec    = -1L;
+	sk->sk_stamp = ktime_set(-1L, -1L);
  
 	atomic_set(&sk->sk_refcnt, 1);
 }
  
  
@@ -1554,14 +1553,17 @@
  
 int sock_get_timestamp(struct sock *sk, struct timeval __user *userstamp)
 {
+	struct timeval tv;
 	if (!sock_flag(sk, SOCK_TIMESTAMP))
 		sock_enable_timestamp(sk);
-	if (sk->sk_stamp.tv_sec == -1)
+	tv = ktime_to_timeval(sk->sk_stamp);
+	if (tv.tv_sec == -1)
 		return -ENOENT;
-	if (sk->sk_stamp.tv_sec == 0)
-		do_gettimeofday(&sk->sk_stamp);
-	return copy_to_user(userstamp, &sk->sk_stamp, sizeof(struct timeval)) ?
-		-EFAULT : 0;
+	if (tv.tv_sec == 0) {
+		sk->sk_stamp = ktime_get_real();
+		tv = ktime_to_timeval(sk->sk_stamp);
+	}
+	return copy_to_user(userstamp, &tv, sizeof(tv)) ? -EFAULT : 0;
 }
 EXPORT_SYMBOL(sock_get_timestamp);
  
@@ -162,7 +162,7 @@
 	err = memcpy_toiovec(msg->msg_iov, skb->data, copied);
 	if (err)
 		goto out_free;
-	skb_get_timestamp(skb, &sk->sk_stamp);
+	sk->sk_stamp = skb->tstamp;
  
 	if (msg->msg_name)
 		memcpy(msg->msg_name, skb->cb, msg->msg_namelen);
@@ -92,7 +92,7 @@
 	spinlock_t	lock;
 	atomic_t	refcnt;
 	struct timer_list timer;	/* when will this queue expire?		*/
-	struct timeval	stamp;
+	ktime_t		stamp;
 	int             iif;
 	unsigned int    rid;
 	struct inet_peer *peer;
@@ -592,7 +592,7 @@
 	if (skb->dev)
 		qp->iif = skb->dev->ifindex;
 	skb->dev = NULL;
-	skb_get_timestamp(skb, &qp->stamp);
+	qp->stamp = skb->tstamp;
 	qp->meat += skb->len;
 	atomic_add(skb->truesize, &ip_frag_mem);
 	if (offset == 0)
@@ -674,7 +674,7 @@
  
 	head->next = NULL;
 	head->dev = dev;
-	skb_set_timestamp(head, &qp->stamp);
+	head->tstamp = qp->stamp;
  
 	iph = head->nh.iph;
 	iph->frag_off = 0;
@@ -734,7 +734,7 @@
 	return NULL;
 }
  
-void ipfrag_init(void)
+void __init ipfrag_init(void)
 {
 	ipfrag_hash_rnd = (u32) ((num_physpages ^ (num_physpages>>7)) ^
 				 (jiffies ^ (jiffies >> 6)));
@@ -197,6 +197,7 @@
 	struct sk_buff *skb;
 	struct ipq_packet_msg *pmsg;
 	struct nlmsghdr *nlh;
+	struct timeval tv;
  
 	read_lock_bh(&queue_lock);
  
@@ -241,8 +242,9 @@
  
 	pmsg->packet_id       = (unsigned long )entry;
 	pmsg->data_len        = data_len;
-	pmsg->timestamp_sec   = entry->skb->tstamp.off_sec;
-	pmsg->timestamp_usec  = entry->skb->tstamp.off_usec;
+	tv = ktime_to_timeval(entry->skb->tstamp);
+	pmsg->timestamp_sec   = tv.tv_sec;
+	pmsg->timestamp_usec  = tv.tv_usec;
 	pmsg->mark            = entry->skb->mark;
 	pmsg->hook            = entry->info->hook;
 	pmsg->hw_protocol     = entry->skb->protocol;
@@ -187,6 +187,7 @@
 	ulog_packet_msg_t *pm;
 	size_t size, copy_len;
 	struct nlmsghdr *nlh;
+	struct timeval tv;
  
 	/* ffs == find first bit set, necessary because userspace
 	 * is already shifting groupnumber, but we need unshifted.
  
@@ -232,13 +233,14 @@
 	pm = NLMSG_DATA(nlh);
  
 	/* We might not have a timestamp, get one */
-	if (skb->tstamp.off_sec == 0)
+	if (skb->tstamp.tv64 == 0)
 		__net_timestamp((struct sk_buff *)skb);
  
 	/* copy hook, prefix, timestamp, payload, etc. */
 	pm->data_len = copy_len;
-	put_unaligned(skb->tstamp.off_sec, &pm->timestamp_sec);
-	put_unaligned(skb->tstamp.off_usec, &pm->timestamp_usec);
+	tv = ktime_to_timeval(skb->tstamp);
+	put_unaligned(tv.tv_sec, &pm->timestamp_sec);
+	put_unaligned(tv.tv_usec, &pm->timestamp_usec);
 	put_unaligned(skb->mark, &pm->mark);
 	pm->hook = hooknum;
 	if (prefix != NULL)
@@ -255,7 +255,7 @@
 	ipv6_addr_copy(&ipv6h->saddr, &hao->addr);
 	ipv6_addr_copy(&hao->addr, &tmp_addr);
  
-	if (skb->tstamp.off_sec == 0)
+	if (skb->tstamp.tv64 == 0)
 		__net_timestamp(skb);
  
 	return 1;
@@ -195,6 +195,7 @@
 	struct sk_buff *skb;
 	struct ipq_packet_msg *pmsg;
 	struct nlmsghdr *nlh;
+	struct timeval tv;
  
 	read_lock_bh(&queue_lock);
  
@@ -239,8 +240,9 @@
  
 	pmsg->packet_id       = (unsigned long )entry;
 	pmsg->data_len        = data_len;
-	pmsg->timestamp_sec   = entry->skb->tstamp.off_sec;
-	pmsg->timestamp_usec  = entry->skb->tstamp.off_usec;
+	tv = ktime_to_timeval(entry->skb->tstamp);
+	pmsg->timestamp_sec   = tv.tv_sec;
+	pmsg->timestamp_usec  = tv.tv_usec;
 	pmsg->mark            = entry->skb->mark;
 	pmsg->hook            = entry->info->hook;
 	pmsg->hw_protocol     = entry->skb->protocol;
@@ -82,7 +82,7 @@
 	struct sk_buff		*fragments;
 	int			len;
 	int			meat;
-	struct timeval		stamp;
+	ktime_t			stamp;
 	unsigned int		csum;
 	__u8			last_in;	/* has first/last segment arrived? */
 #define COMPLETE		4
@@ -542,7 +542,7 @@
 		fq->fragments = skb;
  
 	skb->dev = NULL;
-	skb_get_timestamp(skb, &fq->stamp);
+	fq->stamp = skb->tstamp;
 	fq->meat += skb->len;
 	atomic_add(skb->truesize, &nf_ct_frag6_mem);
  
@@ -648,7 +648,7 @@
  
 	head->next = NULL;
 	head->dev = dev;
-	skb_set_timestamp(head, &fq->stamp);
+	head->tstamp = fq->stamp;
 	head->nh.ipv6h->payload_len = htons(payload_len);
  
 	/* Yes, and fold redundant checksum back. 8) */
@@ -88,7 +88,7 @@
 	int			len;
 	int			meat;
 	int			iif;
-	struct timeval		stamp;
+	ktime_t			stamp;
 	unsigned int		csum;
 	__u8			last_in;	/* has first/last segment arrived? */
 #define COMPLETE		4
@@ -562,7 +562,7 @@
 	if (skb->dev)
 		fq->iif = skb->dev->ifindex;
 	skb->dev = NULL;
-	skb_get_timestamp(skb, &fq->stamp);
+	fq->stamp = skb->tstamp;
 	fq->meat += skb->len;
 	atomic_add(skb->truesize, &ip6_frag_mem);
  
@@ -663,7 +663,7 @@
  
 	head->next = NULL;
 	head->dev = dev;
-	skb_set_timestamp(head, &fq->stamp);
+	head->tstamp = fq->stamp;
 	head->nh.ipv6h->payload_len = htons(payload_len);
 	IP6CB(head)->nhoff = nhoff;
  
@@ -1807,8 +1807,8 @@
 				     copied);
 	if (rc)
 		goto out_free;
-	if (skb->tstamp.off_sec)
-		skb_get_timestamp(skb, &sk->sk_stamp);
+	if (skb->tstamp.tv64)
+		sk->sk_stamp = skb->tstamp;
  
 	msg->msg_namelen = sizeof(*sipx);
  
@@ -509,11 +509,11 @@
 		NFA_PUT(inst->skb, NFULA_HWADDR, sizeof(phw), &phw);
 	}
  
-	if (skb->tstamp.off_sec) {
+	if (skb->tstamp.tv64) {
 		struct nfulnl_msg_packet_timestamp ts;
-
-		ts.sec = cpu_to_be64(skb->tstamp.off_sec);
-		ts.usec = cpu_to_be64(skb->tstamp.off_usec);
+		struct timeval tv = ktime_to_timeval(skb->tstamp);
+		ts.sec = cpu_to_be64(tv.tv_sec);
+		ts.usec = cpu_to_be64(tv.tv_usec);
  
 		NFA_PUT(inst->skb, NFULA_TIMESTAMP, sizeof(ts), &ts);
 	}
@@ -495,11 +495,11 @@
 		NFA_PUT(skb, NFQA_HWADDR, sizeof(phw), &phw);
 	}
  
-	if (entskb->tstamp.off_sec) {
+	if (entskb->tstamp.tv64) {
 		struct nfqnl_msg_packet_timestamp ts;
-
-		ts.sec = cpu_to_be64(entskb->tstamp.off_sec);
-		ts.usec = cpu_to_be64(entskb->tstamp.off_usec);
+		struct timeval tv = ktime_to_timeval(entskb->tstamp);
+		ts.sec = cpu_to_be64(tv.tv_sec);
+		ts.usec = cpu_to_be64(tv.tv_usec);
  
 		NFA_PUT(skb, NFQA_TIMESTAMP, sizeof(ts), &ts);
 	}
@@ -582,6 +582,7 @@
 	unsigned long status = TP_STATUS_LOSING|TP_STATUS_USER;
 	unsigned short macoff, netoff;
 	struct sk_buff *copy_skb = NULL;
+	struct timeval tv;
  
 	if (skb->pkt_type == PACKET_LOOPBACK)
 		goto drop;
  
@@ -656,12 +657,13 @@
 	h->tp_snaplen = snaplen;
 	h->tp_mac = macoff;
 	h->tp_net = netoff;
-	if (skb->tstamp.off_sec == 0) {
+	if (skb->tstamp.tv64 == 0) {
 		__net_timestamp(skb);
 		sock_enable_timestamp(sk);
 	}
-	h->tp_sec = skb->tstamp.off_sec;
-	h->tp_usec = skb->tstamp.off_usec;
+	tv = ktime_to_timeval(skb->tstamp);
+	h->tp_sec = tv.tv_sec;
+	h->tp_usec = tv.tv_usec;
  
 	sll = (struct sockaddr_ll*)((u8*)h + TPACKET_ALIGN(sizeof(*h)));
 	sll->sll_halen = 0;
@@ -798,16 +798,12 @@
 		dprintk("svc: recvfrom returned error %d\n", -err);
 	}
 	rqstp->rq_addrlen = sizeof(rqstp->rq_addr);
-	if (skb->tstamp.off_sec == 0) {
-		struct timeval tv;
-
-		tv.tv_sec = xtime.tv_sec;
-		tv.tv_usec = xtime.tv_nsec / NSEC_PER_USEC;
-		skb_set_timestamp(skb, &tv);
+	if (skb->tstamp.tv64 == 0) {
+		skb->tstamp = ktime_get_real();
 		/* Don't enable netstamp, sunrpc doesn't
 		   need that much accuracy */
 	}
-	skb_get_timestamp(skb, &svsk->sk_sk->sk_stamp);
+	svsk->sk_sk->sk_stamp = skb->tstamp;
 	set_bit(SK_DATA, &svsk->sk_flags); /* there may be more data... */
  
 	/*
...	...	@@ -27,6 +27,7 @@
27	27	#include <net/checksum.h>
28	28	#include <linux/rcupdate.h>
29	29	#include <linux/dmaengine.h>
	30	+#include <linux/hrtimer.h>
30	31
31	32	#define HAVE_ALLOC_SKB /* For the drivers to know */
32	33	#define HAVE_ALIGNABLE_SKB /* Ditto 8) */
33	34
...	...	@@ -156,12 +157,7 @@
156	157	#define SKB_DATAREF_SHIFT 16
157	158	#define SKB_DATAREF_MASK ((1 << SKB_DATAREF_SHIFT) - 1)
158	159
159		-struct skb_timeval {
160		- u32 off_sec;
161		- u32 off_usec;
162		-};
163	160
164		-
165	161	enum {
166	162	SKB_FCLONE_UNAVAILABLE,
167	163	SKB_FCLONE_ORIG,
...	...	@@ -233,7 +229,7 @@
233	229	struct sk_buff *prev;
234	230
235	231	struct sock *sk;
236		- struct skb_timeval tstamp;
	232	+ ktime_t tstamp;
237	233	struct net_device *dev;
238	234	int iif;
239	235	/* 4 byte hole on 64 bit*/
240	236
241	237
242	238
...	...	@@ -1365,26 +1361,14 @@
1365	1361	*/
1366	1362	static inline void skb_get_timestamp(const struct sk_buff skb, struct timeval stamp)
1367	1363	{
1368		- stamp->tv_sec = skb->tstamp.off_sec;
1369		- stamp->tv_usec = skb->tstamp.off_usec;
	1364	+ *stamp = ktime_to_timeval(skb->tstamp);
1370	1365	}
1371	1366
1372		-/**
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		- */
1381		-static inline void skb_set_timestamp(struct sk_buff skb, const struct timeval stamp)
	1367	+static inline void __net_timestamp(struct sk_buff *skb)
1382	1368	{
1383		- skb->tstamp.off_sec = stamp->tv_sec;
1384		- skb->tstamp.off_usec = stamp->tv_usec;
	1369	+ skb->tstamp = ktime_get_real();
1385	1370	}
1386	1371
1387		-extern void __net_timestamp(struct sk_buff *skb);
1388	1372
1389	1373	extern __sum16 __skb_checksum_complete(struct sk_buff *skb);
1390	1374
...	...	@@ -244,7 +244,7 @@
244	244	struct sk_filter *sk_filter;
245	245	void *sk_protinfo;
246	246	struct timer_list sk_timer;
247		- struct timeval sk_stamp;
	247	+ ktime_t sk_stamp;
248	248	struct socket *sk_socket;
249	249	void *sk_user_data;
250	250	struct page *sk_sndmsg_page;
251	251
252	252
253	253
254	254
...	...	@@ -1307,19 +1307,19 @@
1307	1307	static __inline__ void
1308	1308	sock_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	1312	if (sock_flag(sk, SOCK_RCVTSTAMP)) {
	1313	+ struct timeval tv;
1314	1314	/* Race occurred between timestamp enabling and packet
1315	1315	receiving. Fill in the current time for now. */
1316		- if (stamp.tv_sec == 0)
1317		- do_gettimeofday(&stamp);
1318		- skb_set_timestamp(skb, &stamp);
1319		- put_cmsg(msg, SOL_SOCKET, SO_TIMESTAMP, sizeof(struct timeval),
1320		- &stamp);
	1316	+ if (kt.tv64 == 0)
	1317	+ kt = ktime_get_real();
	1318	+ skb->tstamp = kt;
	1319	+ tv = ktime_to_timeval(kt);
	1320	+ put_cmsg(msg, SOL_SOCKET, SO_TIMESTAMP, sizeof(tv), &tv);
1321	1321	} else
1322		- sk->sk_stamp = stamp;
	1322	+ sk->sk_stamp = kt;
1323	1323	}
1324	1324
1325	1325	/**
...	...	@@ -469,6 +469,7 @@
469	469
470	470	return tv;
471	471	}
	472	+EXPORT_SYMBOL(ns_to_timeval);
472	473
473	474	/*
474	475	* Convert jiffies to milliseconds and back.
...	...	@@ -130,6 +130,7 @@
130	130	unsigned int group = uloginfo->nlgroup;
131	131	ebt_ulog_buff_t *ub = &ulog_buffers[group];
132	132	spinlock_t *lock = &ub->lock;
	133	+ ktime_t kt;
133	134
134	135	if ((uloginfo->cprange == 0) \|\|
135	136	(uloginfo->cprange > skb->len + ETH_HLEN))
136	137
...	...	@@ -164,9 +165,10 @@
164	165
165	166	/* Fill in the ulog data */
166	167	pm->version = EBT_ULOG_VERSION;
167		- do_gettimeofday(&pm->stamp);
	168	+ kt = ktime_get_real();
	169	+ pm->stamp = ktime_to_timeval(kt);
168	170	if (ub->qlen == 1)
169		- skb_set_timestamp(ub->skb, &pm->stamp);
	171	+ ub->skb->tstamp = kt;
170	172	pm->data_len = copy_len;
171	173	pm->mark = skb->mark;
172	174	pm->hook = hooknr;
...	...	@@ -545,15 +545,20 @@
545	545	struct compat_timeval __user *ctv =
546	546	(struct compat_timeval __user*) userstamp;
547	547	int err = -ENOENT;
	548	+ struct timeval tv;
548	549
549	550	if (!sock_flag(sk, SOCK_TIMESTAMP))
550	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	554	return err;
553		- if (sk->sk_stamp.tv_sec == 0)
554		- do_gettimeofday(&sk->sk_stamp);
555		- if (put_user(sk->sk_stamp.tv_sec, &ctv->tv_sec) \|\|
556		- put_user(sk->sk_stamp.tv_usec, &ctv->tv_usec))
	555	+ if (tv.tv_sec == 0) {
	556	+ sk->sk_stamp = ktime_get_real();
	557	+ tv = ktime_to_timeval(sk->sk_stamp);
	558	+ }
	559	+ err = 0;
	560	+ if (put_user(tv.tv_sec, &ctv->tv_sec) \|\|
	561	+ put_user(tv.tv_usec, &ctv->tv_usec))
557	562	err = -EFAULT;
558	563	return err;
559	564	}
...	...	@@ -1031,23 +1031,12 @@
1031	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	1034	static inline void net_timestamp(struct sk_buff *skb)
1044	1035	{
1045	1036	if (atomic_read(&netstamp_needed))
1046	1037	__net_timestamp(skb);
1047		- else {
1048		- skb->tstamp.off_sec = 0;
1049		- skb->tstamp.off_usec = 0;
1050		- }
	1038	+ else
	1039	+ skb->tstamp.tv64 = 0;
1051	1040	}
1052	1041
1053	1042	/*
...	...	@@ -1577,7 +1566,7 @@
1577	1566	if (netpoll_rx(skb))
1578	1567	return NET_RX_DROP;
1579	1568
1580		- if (!skb->tstamp.off_sec)
	1569	+ if (!skb->tstamp.tv64)
1581	1570	net_timestamp(skb);
1582	1571
1583	1572	/*
...	...	@@ -1769,7 +1758,7 @@
1769	1758	if (skb->dev->poll && netpoll_rx(skb))
1770	1759	return NET_RX_DROP;
1771	1760
1772		- if (!skb->tstamp.off_sec)
	1761	+ if (!skb->tstamp.tv64)
1773	1762	net_timestamp(skb);
1774	1763
1775	1764	if (!skb->iif)
...	...	@@ -1512,8 +1512,7 @@
1512	1512	sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT;
1513	1513	sk->sk_sndtimeo = MAX_SCHEDULE_TIMEOUT;
1514	1514
1515		- sk->sk_stamp.tv_sec = -1L;
1516		- sk->sk_stamp.tv_usec = -1L;
	1515	+ sk->sk_stamp = ktime_set(-1L, -1L);
1517	1516
1518	1517	atomic_set(&sk->sk_refcnt, 1);
1519	1518	}
1520	1519
1521	1520
...	...	@@ -1554,14 +1553,17 @@
1554	1553
1555	1554	int sock_get_timestamp(struct sock sk, struct timeval __user userstamp)
1556	1555	{
	1556	+ struct timeval tv;
1557	1557	if (!sock_flag(sk, SOCK_TIMESTAMP))
1558	1558	sock_enable_timestamp(sk);
1559		- if (sk->sk_stamp.tv_sec == -1)
	1559	+ tv = ktime_to_timeval(sk->sk_stamp);
	1560	+ if (tv.tv_sec == -1)
1560	1561	return -ENOENT;
1561		- if (sk->sk_stamp.tv_sec == 0)
1562		- do_gettimeofday(&sk->sk_stamp);
1563		- return copy_to_user(userstamp, &sk->sk_stamp, sizeof(struct timeval)) ?
1564		- -EFAULT : 0;
	1562	+ if (tv.tv_sec == 0) {
	1563	+ sk->sk_stamp = ktime_get_real();
	1564	+ tv = ktime_to_timeval(sk->sk_stamp);
	1565	+ }
	1566	+ return copy_to_user(userstamp, &tv, sizeof(tv)) ? -EFAULT : 0;
1565	1567	}
1566	1568	EXPORT_SYMBOL(sock_get_timestamp);
1567	1569
...	...	@@ -162,7 +162,7 @@
162	162	err = memcpy_toiovec(msg->msg_iov, skb->data, copied);
163	163	if (err)
164	164	goto out_free;
165		- skb_get_timestamp(skb, &sk->sk_stamp);
	165	+ sk->sk_stamp = skb->tstamp;
166	166
167	167	if (msg->msg_name)
168	168	memcpy(msg->msg_name, skb->cb, msg->msg_namelen);
...	...	@@ -92,7 +92,7 @@
92	92	spinlock_t lock;
93	93	atomic_t refcnt;
94	94	struct timer_list timer; /* when will this queue expire? */
95		- struct timeval stamp;
	95	+ ktime_t stamp;
96	96	int iif;
97	97	unsigned int rid;
98	98	struct inet_peer *peer;
...	...	@@ -592,7 +592,7 @@
592	592	if (skb->dev)
593	593	qp->iif = skb->dev->ifindex;
594	594	skb->dev = NULL;
595		- skb_get_timestamp(skb, &qp->stamp);
	595	+ qp->stamp = skb->tstamp;
596	596	qp->meat += skb->len;
597	597	atomic_add(skb->truesize, &ip_frag_mem);
598	598	if (offset == 0)
...	...	@@ -674,7 +674,7 @@
674	674
675	675	head->next = NULL;
676	676	head->dev = dev;
677		- skb_set_timestamp(head, &qp->stamp);
	677	+ head->tstamp = qp->stamp;
678	678
679	679	iph = head->nh.iph;
680	680	iph->frag_off = 0;
...	...	@@ -734,7 +734,7 @@
734	734	return NULL;
735	735	}
736	736
737		-void ipfrag_init(void)
	737	+void __init ipfrag_init(void)
738	738	{
739	739	ipfrag_hash_rnd = (u32) ((num_physpages ^ (num_physpages>>7)) ^
740	740	(jiffies ^ (jiffies >> 6)));
...	...	@@ -197,6 +197,7 @@
197	197	struct sk_buff *skb;
198	198	struct ipq_packet_msg *pmsg;
199	199	struct nlmsghdr *nlh;
	200	+ struct timeval tv;
200	201
201	202	read_lock_bh(&queue_lock);
202	203
...	...	@@ -241,8 +242,9 @@
241	242
242	243	pmsg->packet_id = (unsigned long )entry;
243	244	pmsg->data_len = data_len;
244		- pmsg->timestamp_sec = entry->skb->tstamp.off_sec;
245		- pmsg->timestamp_usec = entry->skb->tstamp.off_usec;
	245	+ tv = ktime_to_timeval(entry->skb->tstamp);
	246	+ pmsg->timestamp_sec = tv.tv_sec;
	247	+ pmsg->timestamp_usec = tv.tv_usec;
246	248	pmsg->mark = entry->skb->mark;
247	249	pmsg->hook = entry->info->hook;
248	250	pmsg->hw_protocol = entry->skb->protocol;