X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fdatapath.h;h=28ce0dae4ded0d212cbc3a80e36c640f1c66d2c1;hb=f632c8fc817ff5597007a795b51574bddd32563a;hp=07406da122d72fff3269d84f0e41aeeb0a14a917;hpb=e779d8d90d65297473febcf82ec44c9225cc4fe3;p=openvswitch

diff --git a/datapath/datapath.h b/datapath/datapath.h
index 07406da1..28ce0dae 100644
--- a/datapath/datapath.h
+++ b/datapath/datapath.h
@@ -19,6 +19,8 @@
 #include <linux/seqlock.h>
 #include <linux/skbuff.h>
 #include <linux/version.h>
+
+#include "checksum.h"
 #include "flow.h"
 #include "dp_sysfs.h"
 
@@ -57,6 +59,7 @@ struct dp_stats_percpu {
 
 /**
  * struct datapath - datapath for flow-based packet switching
+ * @rcu: RCU callback head for deferred destruction.
  * @mutex: Mutual exclusion for ioctls.
  * @dp_idx: Datapath number (index into the dps[] array in datapath.c).
  * @ifobj: Represents /sys/class/net/<devname>/brif.
@@ -64,7 +67,7 @@ struct dp_stats_percpu {
  * @queues: %DP_N_QUEUES sets of queued packets for userspace to handle.
  * @waitqueue: Waitqueue, for waiting for new packets in @queues.
  * @n_flows: Number of flows currently in flow table.
- * @table: Current flow table (RCU protected).
+ * @table: Current flow table.
  * @n_ports: Number of ports currently in @ports.
  * @ports: Map from port number to &struct vport.  %ODPP_LOCAL port
  * always exists, other ports may be %NULL.
@@ -75,6 +78,7 @@ struct dp_stats_percpu {
  * sampling a given packet.
  */
 struct datapath {
+	struct rcu_head rcu;
 	struct mutex mutex;
 	int dp_idx;
 	struct kobject ifobj;
@@ -86,41 +90,36 @@ struct datapath {
 	wait_queue_head_t waitqueue;
 
 	/* Flow table. */
-	struct tbl *table;
+	struct tbl __rcu *table;
 
 	/* Switch ports. */
 	unsigned int n_ports;
-	struct vport *ports[DP_MAX_PORTS];
+	struct vport __rcu *ports[DP_MAX_PORTS];
 	struct list_head port_list;
 
 	/* Stats. */
-	struct dp_stats_percpu *stats_percpu;
+	struct dp_stats_percpu __percpu *stats_percpu;
 
 	/* sFlow Sampling */
 	unsigned int sflow_probability;
 };
 
-enum csum_type {
-	OVS_CSUM_NONE = 0,
-	OVS_CSUM_UNNECESSARY = 1,
-	OVS_CSUM_COMPLETE = 2,
-	OVS_CSUM_PARTIAL = 3,
-};
-
 /**
  * struct ovs_skb_cb - OVS data in skb CB
  * @vport: The datapath port on which the skb entered the switch.
  * @flow: The flow associated with this packet.  May be %NULL if no flow.
  * @ip_summed: Consistently stores L4 checksumming status across different
  * kernel versions.
- * @tun_id: ID (in network byte order) of the tunnel that encapsulated this
- * packet. It is 0 if the packet was not received on a tunnel.
+ * @tun_id: ID of the tunnel that encapsulated this packet.  It is 0 if the
+ * packet was not received on a tunnel.
  */
 struct ovs_skb_cb {
 	struct vport		*vport;
 	struct sw_flow		*flow;
+#ifdef NEED_CSUM_NORMALIZE
 	enum csum_type		ip_summed;
-	__be32			tun_id;
+#endif
+	__be64			tun_id;
 };
 #define OVS_CB(skb) ((struct ovs_skb_cb *)(skb)->cb)
 
@@ -129,23 +128,11 @@ extern int (*dp_ioctl_hook)(struct net_device *dev, struct ifreq *rq, int cmd);
 
 void dp_process_received_packet(struct vport *, struct sk_buff *);
 int dp_detach_port(struct vport *);
-int dp_output_control(struct datapath *, struct sk_buff *, int, u32 arg);
+int dp_output_control(struct datapath *, struct sk_buff *, int, u64 arg);
 int dp_min_mtu(const struct datapath *dp);
 void set_internal_devs_mtu(const struct datapath *dp);
 
 struct datapath *get_dp(int dp_idx);
 const char *dp_name(const struct datapath *dp);
 
-#if defined(CONFIG_XEN) && defined(HAVE_PROTO_DATA_VALID)
-int vswitch_skb_checksum_setup(struct sk_buff *skb);
-#else
-static inline int vswitch_skb_checksum_setup(struct sk_buff *skb)
-{
-	return 0;
-}
-#endif
-
-void compute_ip_summed(struct sk_buff *skb, bool xmit);
-void forward_ip_summed(struct sk_buff *skb);
-
 #endif /* datapath.h */