X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fdatapath.h;h=e1bdb7b4ce17f621d0fbc67d6608b774244c2185;hb=dab45bfd5748e7d871ae312df6e9b7ce89a8f46c;hp=991a7e818a63813089ff5d6b63629f29143707e5;hpb=8d5ebd839b86463c72239fe972001e4f1a367a7b;p=openvswitch

diff --git a/datapath/datapath.h b/datapath/datapath.h
index 991a7e81..e1bdb7b4 100644
--- a/datapath/datapath.h
+++ b/datapath/datapath.h
@@ -16,13 +16,15 @@
 #include <linux/mutex.h>
 #include <linux/netdevice.h>
 #include <linux/workqueue.h>
+#include <linux/seqlock.h>
 #include <linux/skbuff.h>
 #include <linux/version.h>
+
+#include "checksum.h"
 #include "flow.h"
 #include "dp_sysfs.h"
 
 struct vport;
-struct dp_port;
 
 /* Mask for the priority bits in a vlan header.  If we ever merge upstream
  * then this should go into include/linux/if_vlan.h. */
@@ -30,7 +32,6 @@ struct dp_port;
 #define VLAN_PCP_SHIFT 13
 
 #define DP_MAX_PORTS 1024
-#define DP_MAX_GROUPS 16
 
 #define DP_N_QUEUES 3
 #define DP_MAX_QUEUE_LEN 100
@@ -53,12 +54,7 @@ struct dp_stats_percpu {
 	u64 n_hit;
 	u64 n_missed;
 	u64 n_lost;
-};
-
-struct dp_port_group {
-	struct rcu_head rcu;
-	int n_ports;
-	u16 ports[];
+	seqcount_t seqlock;
 };
 
 /**
@@ -71,9 +67,8 @@ struct dp_port_group {
  * @waitqueue: Waitqueue, for waiting for new packets in @queues.
  * @n_flows: Number of flows currently in flow table.
  * @table: Current flow table (RCU protected).
- * @groups: Port groups, used by ODPAT_OUTPUT_GROUP action (RCU protected).
  * @n_ports: Number of ports currently in @ports.
- * @ports: Map from port number to &struct dp_port.  %ODPP_LOCAL port
+ * @ports: Map from port number to &struct vport.  %ODPP_LOCAL port
  * always exists, other ports may be %NULL.
  * @port_list: List of all ports in @ports in arbitrary order.
  * @stats_percpu: Per-CPU datapath statistics.
@@ -95,12 +90,9 @@ struct datapath {
 	/* Flow table. */
 	struct tbl *table;
 
-	/* Port groups. */
-	struct dp_port_group *groups[DP_MAX_GROUPS];
-
 	/* Switch ports. */
 	unsigned int n_ports;
-	struct dp_port *ports[DP_MAX_PORTS];
+	struct vport *ports[DP_MAX_PORTS];
 	struct list_head port_list;
 
 	/* Stats. */
@@ -110,46 +102,21 @@ struct datapath {
 	unsigned int sflow_probability;
 };
 
-/**
- * struct dp_port - one port within a datapath
- * @port_no: Index into @dp's @ports array.
- * @dp: Datapath to which this port belongs.
- * @vport: The network device attached to this port.  The contents depends on
- * the device and should be accessed only through the vport_* functions.
- * @kobj: Represents /sys/class/net/<devname>/brport.
- * @linkname: The name of the link from /sys/class/net/<datapath>/brif to this
- * &struct dp_port.  (We keep this around so that we can delete it if the
- * device gets renamed.)  Set to the null string when no link exists.
- * @node: Element in @dp's @port_list.
- * @sflow_pool: Number of packets that were candidates for sFlow sampling,
- * regardless of whether they were actually chosen and sent down to userspace.
- */
-struct dp_port {
-	u16 port_no;
-	struct datapath	*dp;
-	struct vport *vport;
-	struct kobject kobj;
-	char linkname[IFNAMSIZ];
-	struct list_head node;
-	atomic_t sflow_pool;
-};
-
-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
- * @br_port: The bridge port on which the skb entered the switch.
+ * @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.
  */
 struct ovs_skb_cb {
-	struct dp_port		*dp_port;
+	struct vport		*vport;
+	struct sw_flow		*flow;
+#ifdef NEED_CSUM_NORMALIZE
 	enum csum_type		ip_summed;
+#endif
 	__be32			tun_id;
 };
 #define OVS_CB(skb) ((struct ovs_skb_cb *)(skb)->cb)
@@ -157,8 +124,8 @@ struct ovs_skb_cb {
 extern struct notifier_block dp_device_notifier;
 extern int (*dp_ioctl_hook)(struct net_device *dev, struct ifreq *rq, int cmd);
 
-void dp_process_received_packet(struct dp_port *, struct sk_buff *);
-int dp_detach_port(struct dp_port *, int may_delete);
+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_min_mtu(const struct datapath *dp);
 void set_internal_devs_mtu(const struct datapath *dp);
@@ -166,16 +133,4 @@ 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 */