X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fdatapath.c;h=54c9fa36bc5684c56ce4d38788720d471f80dfee;hb=6bfafa55;hp=8833bc149de9b1db99c0d1c63887ce371d575585;hpb=f057cddae23839523fb353b710c69ee01d45d196;p=openvswitch

diff --git a/datapath/datapath.c b/datapath/datapath.c
index 8833bc14..54c9fa36 100644
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -656,8 +656,7 @@ out:
  * be reverified).  If we receive a packet with CHECKSUM_HW that really means
  * CHECKSUM_PARTIAL, it will be sent with the wrong checksum.  However, there
  * shouldn't be any devices that do this with bridging. */
-void
-compute_ip_summed(struct sk_buff *skb, bool xmit)
+void compute_ip_summed(struct sk_buff *skb, bool xmit)
 {
 	/* For our convenience these defines change repeatedly between kernel
 	 * versions, so we can't just copy them over... */
@@ -714,8 +713,7 @@ compute_ip_summed(struct sk_buff *skb, bool xmit)
  * is slightly different because we are only concerned with bridging and not
  * other types of forwarding and can get away with slightly more optimal
  * behavior.*/
-void
-forward_ip_summed(struct sk_buff *skb)
+void forward_ip_summed(struct sk_buff *skb)
 {
 #ifdef CHECKSUM_HW
 	if (OVS_CB(skb)->ip_summed == OVS_CSUM_COMPLETE)
@@ -725,9 +723,8 @@ forward_ip_summed(struct sk_buff *skb)
 
 /* Append each packet in 'skb' list to 'queue'.  There will be only one packet
  * unless we broke up a GSO packet. */
-static int
-queue_control_packets(struct sk_buff *skb, struct sk_buff_head *queue,
-		      int queue_no, u32 arg)
+static int queue_control_packets(struct sk_buff *skb, struct sk_buff_head *queue,
+				 int queue_no, u32 arg)
 {
 	struct sk_buff *nskb;
 	int port_no;
@@ -769,9 +766,8 @@ err_kfree_skbs:
 	return err;
 }
 
-int
-dp_output_control(struct datapath *dp, struct sk_buff *skb, int queue_no,
-		  u32 arg)
+int dp_output_control(struct datapath *dp, struct sk_buff *skb, int queue_no,
+		      u32 arg)
 {
 	struct dp_stats_percpu *stats;
 	struct sk_buff_head *queue;
@@ -907,15 +903,32 @@ error:
 	return ERR_PTR(error);
 }
 
-static void get_stats(struct sw_flow *flow, struct odp_flow_stats *stats)
+static struct timespec get_time_offset(void)
 {
-	if (flow->used.tv_sec) {
-		stats->used_sec = flow->used.tv_sec;
-		stats->used_nsec = flow->used.tv_nsec;
+	struct timespec now_mono, now_jiffies;
+
+	ktime_get_ts(&now_mono);
+	jiffies_to_timespec(jiffies, &now_jiffies);
+	return timespec_sub(now_mono, now_jiffies);
+}
+
+static void get_stats(struct sw_flow *flow, struct odp_flow_stats *stats,
+		      struct timespec time_offset)
+{
+	if (flow->used) {
+		struct timespec flow_ts, used;
+
+		jiffies_to_timespec(flow->used, &flow_ts);
+		set_normalized_timespec(&used, flow_ts.tv_sec + time_offset.tv_sec,
+					flow_ts.tv_nsec + time_offset.tv_nsec);
+
+		stats->used_sec = used.tv_sec;
+		stats->used_nsec = used.tv_nsec;
 	} else {
 		stats->used_sec = 0;
 		stats->used_nsec = 0;
 	}
+
 	stats->n_packets = flow->packet_count;
 	stats->n_bytes = flow->byte_count;
 	stats->ip_tos = flow->ip_tos;
@@ -925,7 +938,7 @@ static void get_stats(struct sw_flow *flow, struct odp_flow_stats *stats)
 
 static void clear_stats(struct sw_flow *flow)
 {
-	flow->used.tv_sec = flow->used.tv_nsec = 0;
+	flow->used = 0;
 	flow->tcp_flags = 0;
 	flow->ip_tos = 0;
 	flow->packet_count = 0;
@@ -1025,7 +1038,7 @@ static int do_put_flow(struct datapath *dp, struct odp_flow_put *uf,
 
 		/* Fetch stats, then clear them if necessary. */
 		spin_lock_bh(&flow->lock);
-		get_stats(flow, stats);
+		get_stats(flow, stats, get_time_offset());
 		if (uf->flags & ODPPF_ZERO_STATS)
 			clear_stats(flow);
 		spin_unlock_bh(&flow->lock);
@@ -1062,6 +1075,7 @@ static int put_flow(struct datapath *dp, struct odp_flow_put __user *ufp)
 }
 
 static int do_answer_query(struct sw_flow *flow, u32 query_flags,
+			   struct timespec time_offset,
 			   struct odp_flow_stats __user *ustats,
 			   union odp_action __user *actions,
 			   u32 __user *n_actionsp)
@@ -1071,7 +1085,7 @@ static int do_answer_query(struct sw_flow *flow, u32 query_flags,
 	u32 n_actions;
 
 	spin_lock_bh(&flow->lock);
-	get_stats(flow, &stats);
+	get_stats(flow, &stats, time_offset);
 	if (query_flags & ODPFF_ZERO_TCP_FLAGS)
 		flow->tcp_flags = 0;
 
@@ -1095,6 +1109,7 @@ static int do_answer_query(struct sw_flow *flow, u32 query_flags,
 }
 
 static int answer_query(struct sw_flow *flow, u32 query_flags,
+			struct timespec time_offset,
 			struct odp_flow __user *ufp)
 {
 	union odp_action *actions;
@@ -1102,7 +1117,7 @@ static int answer_query(struct sw_flow *flow, u32 query_flags,
 	if (get_user(actions, &ufp->actions))
 		return -EFAULT;
 
-	return do_answer_query(flow, query_flags,
+	return do_answer_query(flow, query_flags, time_offset,
 			       &ufp->stats, actions, &ufp->n_actions);
 }
 
@@ -1141,7 +1156,7 @@ static int del_flow(struct datapath *dp, struct odp_flow __user *ufp)
 	if (IS_ERR(flow))
 		return PTR_ERR(flow);
 
-	error = answer_query(flow, 0, ufp);
+	error = answer_query(flow, 0, get_time_offset(), ufp);
 	flow_deferred_free(flow);
 	return error;
 }
@@ -1149,8 +1164,11 @@ static int del_flow(struct datapath *dp, struct odp_flow __user *ufp)
 static int do_query_flows(struct datapath *dp, const struct odp_flowvec *flowvec)
 {
 	struct tbl *table = rcu_dereference(dp->table);
+	struct timespec time_offset;
 	u32 i;
 
+	time_offset = get_time_offset();
+
 	for (i = 0; i < flowvec->n_flows; i++) {
 		struct odp_flow __user *ufp = &flowvec->flows[i];
 		struct odp_flow uf;
@@ -1165,7 +1183,7 @@ static int do_query_flows(struct datapath *dp, const struct odp_flowvec *flowvec
 		if (!flow_node)
 			error = put_user(ENOENT, &ufp->stats.error);
 		else
-			error = answer_query(flow_cast(flow_node), uf.flags, ufp);
+			error = answer_query(flow_cast(flow_node), uf.flags, time_offset, ufp);
 		if (error)
 			return -EFAULT;
 	}
@@ -1176,6 +1194,7 @@ struct list_flows_cbdata {
 	struct odp_flow __user *uflows;
 	u32 n_flows;
 	u32 listed_flows;
+	struct timespec time_offset;
 };
 
 static int list_flow(struct tbl_node *node, void *cbdata_)
@@ -1187,7 +1206,7 @@ static int list_flow(struct tbl_node *node, void *cbdata_)
 
 	if (copy_to_user(&ufp->key, &flow->key, sizeof flow->key))
 		return -EFAULT;
-	error = answer_query(flow, 0, ufp);
+	error = answer_query(flow, 0, cbdata->time_offset, ufp);
 	if (error)
 		return error;
 
@@ -1207,6 +1226,8 @@ static int do_list_flows(struct datapath *dp, const struct odp_flowvec *flowvec)
 	cbdata.uflows = flowvec->flows;
 	cbdata.n_flows = flowvec->n_flows;
 	cbdata.listed_flows = 0;
+	cbdata.time_offset = get_time_offset();
+
 	error = tbl_foreach(rcu_dereference(dp->table), list_flow, &cbdata);
 	return error ? error : cbdata.listed_flows;
 }
@@ -1379,8 +1400,7 @@ void set_internal_devs_mtu(const struct datapath *dp)
 	}
 }
 
-static int
-put_port(const struct dp_port *p, struct odp_port __user *uop)
+static int put_port(const struct dp_port *p, struct odp_port __user *uop)
 {
 	struct odp_port op;
 
@@ -1396,8 +1416,7 @@ put_port(const struct dp_port *p, struct odp_port __user *uop)
 	return copy_to_user(uop, &op, sizeof op) ? -EFAULT : 0;
 }
 
-static int
-query_port(struct datapath *dp, struct odp_port __user *uport)
+static int query_port(struct datapath *dp, struct odp_port __user *uport)
 {
 	struct odp_port port;
 
@@ -1444,8 +1463,8 @@ error_unlock:
 	return put_port(dp->ports[port.port], uport);
 }
 
-static int
-do_list_ports(struct datapath *dp, struct odp_port __user *uports, int n_ports)
+static int do_list_ports(struct datapath *dp, struct odp_port __user *uports,
+			 int n_ports)
 {
 	int idx = 0;
 	if (n_ports) {
@@ -1461,8 +1480,7 @@ do_list_ports(struct datapath *dp, struct odp_port __user *uports, int n_ports)
 	return idx;
 }
 
-static int
-list_ports(struct datapath *dp, struct odp_portvec __user *upv)
+static int list_ports(struct datapath *dp, struct odp_portvec __user *upv)
 {
 	struct odp_portvec pv;
 	int retval;
@@ -1484,8 +1502,8 @@ static void free_port_group(struct rcu_head *rcu)
 	kfree(g);
 }
 
-static int
-do_set_port_group(struct datapath *dp, u16 __user *ports, int n_ports, int group)
+static int do_set_port_group(struct datapath *dp, u16 __user *ports,
+			     int n_ports, int group)
 {
 	struct dp_port_group *new_group, *old_group;
 	int error;
@@ -1516,8 +1534,8 @@ error:
 	return error;
 }
 
-static int
-set_port_group(struct datapath *dp, const struct odp_port_group __user *upg)
+static int set_port_group(struct datapath *dp,
+			  const struct odp_port_group __user *upg)
 {
 	struct odp_port_group pg;
 
@@ -1527,10 +1545,9 @@ set_port_group(struct datapath *dp, const struct odp_port_group __user *upg)
 	return do_set_port_group(dp, pg.ports, pg.n_ports, pg.group);
 }
 
-static int
-do_get_port_group(struct datapath *dp,
-		  u16 __user *ports, int n_ports, int group,
-		  u16 __user *n_portsp)
+static int do_get_port_group(struct datapath *dp,
+			     u16 __user *ports, int n_ports, int group,
+			     u16 __user *n_portsp)
 {
 	struct dp_port_group *g;
 	u16 n_copy;
@@ -1819,6 +1836,7 @@ static int compat_put_flow(struct datapath *dp, struct compat_odp_flow_put __use
 }
 
 static int compat_answer_query(struct sw_flow *flow, u32 query_flags,
+			       struct timespec time_offset,
 			       struct compat_odp_flow __user *ufp)
 {
 	compat_uptr_t actions;
@@ -1826,7 +1844,7 @@ static int compat_answer_query(struct sw_flow *flow, u32 query_flags,
 	if (get_user(actions, &ufp->actions))
 		return -EFAULT;
 
-	return do_answer_query(flow, query_flags, &ufp->stats,
+	return do_answer_query(flow, query_flags, time_offset, &ufp->stats,
 			       compat_ptr(actions), &ufp->n_actions);
 }
 
@@ -1843,7 +1861,7 @@ static int compat_del_flow(struct datapath *dp, struct compat_odp_flow __user *u
 	if (IS_ERR(flow))
 		return PTR_ERR(flow);
 
-	error = compat_answer_query(flow, 0, ufp);
+	error = compat_answer_query(flow, 0, get_time_offset(), ufp);
 	flow_deferred_free(flow);
 	return error;
 }
@@ -1851,8 +1869,11 @@ static int compat_del_flow(struct datapath *dp, struct compat_odp_flow __user *u
 static int compat_query_flows(struct datapath *dp, struct compat_odp_flow *flows, u32 n_flows)
 {
 	struct tbl *table = rcu_dereference(dp->table);
+	struct timespec time_offset;
 	u32 i;
 
+	time_offset = get_time_offset();
+
 	for (i = 0; i < n_flows; i++) {
 		struct compat_odp_flow __user *ufp = &flows[i];
 		struct odp_flow uf;
@@ -1867,7 +1888,7 @@ static int compat_query_flows(struct datapath *dp, struct compat_odp_flow *flows
 		if (!flow_node)
 			error = put_user(ENOENT, &ufp->stats.error);
 		else
-			error = compat_answer_query(flow_cast(flow_node), uf.flags, ufp);
+			error = compat_answer_query(flow_cast(flow_node), uf.flags, time_offset, ufp);
 		if (error)
 			return -EFAULT;
 	}
@@ -1878,6 +1899,7 @@ struct compat_list_flows_cbdata {
 	struct compat_odp_flow __user *uflows;
 	u32 n_flows;
 	u32 listed_flows;
+	struct timespec time_offset;
 };
 
 static int compat_list_flow(struct tbl_node *node, void *cbdata_)
@@ -1889,7 +1911,7 @@ static int compat_list_flow(struct tbl_node *node, void *cbdata_)
 
 	if (copy_to_user(&ufp->key, &flow->key, sizeof flow->key))
 		return -EFAULT;
-	error = compat_answer_query(flow, 0, ufp);
+	error = compat_answer_query(flow, 0, cbdata->time_offset, ufp);
 	if (error)
 		return error;
 
@@ -1909,6 +1931,8 @@ static int compat_list_flows(struct datapath *dp, struct compat_odp_flow *flows,
 	cbdata.uflows = flows;
 	cbdata.n_flows = n_flows;
 	cbdata.listed_flows = 0;
+	cbdata.time_offset = get_time_offset();
+
 	error = tbl_foreach(rcu_dereference(dp->table), compat_list_flow, &cbdata);
 	return error ? error : cbdata.listed_flows;
 }
@@ -2193,7 +2217,7 @@ success:
 	if (skb->ip_summed == CHECKSUM_PARTIAL) {
 		if (copy_bytes == skb->len) {
 			__wsum csum = 0;
-			int csum_start, csum_offset;
+			unsigned int csum_start, csum_offset;
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
 			csum_start = skb->csum_start - skb_headroom(skb);