Re: [PATCH net-next 5/9] openvswitch: Add conntrack action

diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c
index e50678d..4a62ed4 100644
--- a/net/openvswitch/actions.c
+++ b/net/openvswitch/actions.c

@@ -22,6 +22,7 @@
 #include <linux/in.h>
 #include <linux/ip.h>
 #include <linux/openvswitch.h>
+#include <linux/netfilter_ipv6.h>
 #include <linux/sctp.h>
 #include <linux/tcp.h>
 #include <linux/udp.h>

@@ -29,6 +30,7 @@
 #include <linux/if_arp.h>
 #include <linux/if_vlan.h>
 
+#include <net/dst.h>
 #include <net/ip.h>
 #include <net/ipv6.h>
 #include <net/checksum.h>

@@ -38,6 +40,7 @@
 
 #include "datapath.h"
 #include "flow.h"
+#include "conntrack.h"
 #include "vport.h"
 
 static int do_execute_actions(struct datapath *dp, struct sk_buff 

*skb,

@@ -52,6 +55,16 @@ struct deferred_action {
 	struct sw_flow_key pkt_key;
 };
 
+struct ovs_frag_data {
+	struct dst_entry *dst;

+	struct vport *vport;
+	struct sw_flow_key *key;
+	struct ovs_skb_cb cb;
+	__be16 vlan_proto;
+};
+
+static DEFINE_PER_CPU(struct ovs_frag_data, ovs_frag_data_storage);
+
 #define DEFERRED_ACTION_FIFO_SIZE 10
 struct action_fifo {
 	int head;

@@ -594,14 +607,136 @@ static int set_sctp(struct sk_buff *skb, struct 

sw_flow_key *flow_key,
 	return 0;
 }
 
-static void do_output(struct datapath *dp, struct sk_buff *skb, int 
out_port)
+/* Given an IP frame, reconstruct its MAC header.  */
+static void ovs_setup_l2_header(struct sk_buff *skb,
+				const struct ovs_frag_data *data)
+{
+	struct sw_flow_key *key = data->key;
+
+	skb_push(skb, ETH_HLEN);
+	skb_reset_mac_header(skb);
+
+	ether_addr_copy(eth_hdr(skb)->h_source, key->eth.src);
+	ether_addr_copy(eth_hdr(skb)->h_dest, key->eth.dst);
+	eth_hdr(skb)->h_proto = key->eth.type;
+
+	if ((data->key->eth.tci & htons(VLAN_TAG_PRESENT)) &&
+	    !skb_vlan_tag_present(skb))
+		__vlan_hwaccel_put_tag(skb, data->vlan_proto,
+				       ntohs(key->eth.tci));
+}
+
+static void prepare_frag(struct vport *vport, struct sw_flow_key 
*key,
+			 struct sk_buff *skb)
+{
+	unsigned int hlen = ETH_HLEN;
+	struct ovs_frag_data *data;
+
+	data = this_cpu_ptr(&ovs_frag_data_storage);
+	data->dst = skb_dst(skb);

+		} else {
+			WARN_ONCE(1, "Failed fragment to %s: MRU=%d, 
MTU=%d.",
+				  ovs_vport_name(vport), mru, vport
->dev->mtu);
+			kfree_skb(skb);
+		}
+exit:
+		dst_release(orig_dst);
+	} else {
 		kfree_skb(skb);
+	}
 }
 
 static int output_userspace(struct datapath *dp, struct sk_buff *skb,

@@ -615,6 +750,10 @@ static int output_userspace(struct datapath *dp, 

struct sk_buff *skb,
 
 	memset(&upcall, 0, sizeof(upcall));
 	upcall.cmd = OVS_PACKET_CMD_ACTION;
+	upcall.userdata = NULL;
+	upcall.portid = 0;
+	upcall.egress_tun_info = NULL;
+	upcall.mru = OVS_CB(skb)->mru;
 
 	for (a = nla_data(attr), rem = nla_len(attr); rem > 0;
 		 a = nla_next(a, &rem)) {

@@ -874,7 +1013,7 @@ static int do_execute_actions(struct datapath 

*dp, struct sk_buff *skb,
 			struct sk_buff *out_skb = skb_clone(skb, 
GFP_ATOMIC);
 
 			if (out_skb)
-				do_output(dp, out_skb, prev_port);
+				do_output(dp, out_skb, prev_port, 
key);
 
 			prev_port = -1;
 		}

@@ -931,16 +1070,25 @@ static int do_execute_actions(struct datapath 

*dp, struct sk_buff *skb,
 		case OVS_ACTION_ATTR_SAMPLE:
 			err = sample(dp, skb, key, a, attr, len);
 			break;
+
+		case OVS_ACTION_ATTR_CT:
+			err = ovs_ct_execute(skb, key, nla_data(a));
+			break;
 		}
 
 		if (unlikely(err)) {
-			kfree_skb(skb);
+			/* Hide stolen fragments from user space. */
+			if (err == -EINPROGRESS)
+				err = 0;
+			else
+				kfree_skb(skb);
+
 			return err;
 		}
 	}
 
 	if (prev_port != -1)
-		do_output(dp, skb, prev_port);
+		do_output(dp, skb, prev_port, key);
 	else
 		consume_skb(skb);