datapath: Remove checksum compat support

[sliver-openvswitch.git] / datapath / datapath.h

diff --git a/datapath/datapath.h b/datapath/datapath.h
index af2e5a1..e3cd2f7 100644 (file)
--- a/datapath/datapath.h
+++ b/datapath/datapath.h
@@ -26,11 +26,8 @@
 #include <linux/skbuff.h>
 #include <linux/u64_stats_sync.h>
 
-#include "checksum.h"
 #include "compat.h"
-#include "dp_sysfs.h"
 #include "flow.h"
-#include "tunnel.h"
 #include "vlan.h"
 #include "vport.h"
 
@@ -62,11 +59,9 @@ struct dp_stats_percpu {
  * struct datapath - datapath for flow-based packet switching
  * @rcu: RCU callback head for deferred destruction.
  * @list_node: Element in global 'dps' list.
- * @ifobj: Represents /sys/class/net/<devname>/brif.  Protected by RTNL.
- * @n_flows: Number of flows currently in flow table.
- * @table: Current flow table.  Protected by genl_lock and RCU.
+ * @table: Current flow table.  Protected by ovs_mutex and RCU.
  * @ports: Hash table for ports.  %OVSP_LOCAL port always exists.  Protected by
- * RTNL and RCU.
+ * ovs_mutex and RCU.
  * @stats_percpu: Per-CPU datapath statistics.
  * @net: Reference to net namespace.
  *
@@ -76,7 +71,6 @@ struct dp_stats_percpu {
 struct datapath {
        struct rcu_head rcu;
        struct list_head list_node;
-       struct kobject ifobj;
 
        /* Flow table. */
        struct flow_table __rcu *table;
@@ -96,23 +90,16 @@ struct datapath {
 /**
  * struct ovs_skb_cb - OVS data in skb CB
  * @flow: The flow associated with this packet.  May be %NULL if no flow.
+ * @pkt_key: The flow information extracted from the packet.  Must be nonnull.
  * @tun_key: Key for the tunnel that encapsulated this packet. NULL if the
  * packet is not being tunneled.
- * @ip_summed: Consistently stores L4 checksumming status across different
- * kernel versions.
- * @csum_start: Stores the offset from which to start checksumming independent
- * of the transport header on all kernel versions.
- * packet was not received on a tunnel.
  * @vlan_tci: Provides a substitute for the skb->vlan_tci field on kernels
  * before 2.6.27.
  */
 struct ovs_skb_cb {
        struct sw_flow          *flow;
+       struct sw_flow_key      *pkt_key;
        struct ovs_key_ipv4_tunnel  *tun_key;
-#ifdef NEED_CSUM_NORMALIZE
-       enum csum_type          ip_summed;
-       u16                     csum_start;
-#endif
 #ifdef NEED_VLAN_FIELD
        u16                     vlan_tci;
 #endif
@@ -123,7 +110,7 @@ struct ovs_skb_cb {
  * struct dp_upcall - metadata to include with a packet to send to userspace
  * @cmd: One of %OVS_PACKET_CMD_*.
  * @key: Becomes %OVS_PACKET_ATTR_KEY.  Must be nonnull.
- * @userdata: If nonnull, its u64 value is extracted and passed to userspace as
+ * @userdata: If nonnull, its variable-length value is passed to userspace as
  * %OVS_PACKET_ATTR_USERDATA.
  * @portid: Netlink PID to which packet should be sent.  If @portid is 0 then no
  * packet is sent and the packet is accounted in the datapath's @n_lost
@@ -145,9 +132,22 @@ struct dp_upcall_info {
 struct ovs_net {
        struct list_head dps;
        struct vport_net vport_net;
+       struct work_struct dp_notify_work;
 };
 
 extern int ovs_net_id;
+void ovs_lock(void);
+void ovs_unlock(void);
+
+#ifdef CONFIG_LOCKDEP
+int lockdep_ovsl_is_held(void);
+#else
+#define lockdep_ovsl_is_held() 1
+#endif
+
+#define ASSERT_OVSL()          WARN_ON(unlikely(!lockdep_ovsl_is_held()))
+#define ovsl_dereference(p)                                    \
+       rcu_dereference_protected(p, lockdep_ovsl_is_held())
 
 static inline struct net *ovs_dp_get_net(struct datapath *dp)
 {
@@ -167,21 +167,20 @@ static inline struct vport *ovs_vport_rcu(const struct datapath *dp, int port_no
        return ovs_lookup_vport(dp, port_no);
 }
 
-static inline struct vport *ovs_vport_rtnl_rcu(const struct datapath *dp, int port_no)
+static inline struct vport *ovs_vport_ovsl_rcu(const struct datapath *dp, int port_no)
 {
-       WARN_ON_ONCE(!rcu_read_lock_held() && !rtnl_is_locked());
+       WARN_ON_ONCE(!rcu_read_lock_held() && !lockdep_ovsl_is_held());
        return ovs_lookup_vport(dp, port_no);
 }
 
-static inline struct vport *ovs_vport_rtnl(const struct datapath *dp, int port_no)
+static inline struct vport *ovs_vport_ovsl(const struct datapath *dp, int port_no)
 {
-       ASSERT_RTNL();
+       ASSERT_OVSL();
        return ovs_lookup_vport(dp, port_no);
 }
 
 extern struct notifier_block ovs_dp_device_notifier;
 extern struct genl_multicast_group ovs_dp_vport_multicast_group;
-extern int (*ovs_dp_ioctl_hook)(struct net_device *dev, struct ifreq *rq, int cmd);
 
 void ovs_dp_process_received_packet(struct vport *, struct sk_buff *);
 void ovs_dp_detach_port(struct vport *);
@@ -193,4 +192,9 @@ struct sk_buff *ovs_vport_cmd_build_info(struct vport *, u32 portid, u32 seq,
                                         u8 cmd);
 
 int ovs_execute_actions(struct datapath *dp, struct sk_buff *skb);
+void ovs_dp_notify_wq(struct work_struct *work);
+
+#define OVS_NLERR(fmt, ...) \
+       pr_info_once("netlink: " fmt, ##__VA_ARGS__)
+
 #endif /* datapath.h */