13 files changed, 599 insertions, 92 deletions

diff --git a/net/openvswitch/Kconfig b/net/openvswitch/Kconfig
index 6ecf491ad509..ba3bb8203b99 100644
--- a/net/openvswitch/Kconfig
+++ b/net/openvswitch/Kconfig
@@ -54,3 +54,14 @@ config OPENVSWITCH_VXLAN
           Say N to exclude this support and reduce the binary size.
 
           If unsure, say Y.
+
+config OPENVSWITCH_GENEVE
+        bool "Open vSwitch Geneve tunneling support"
+        depends on INET
+        depends on OPENVSWITCH
+        depends on GENEVE && !(OPENVSWITCH=y && GENEVE=m)
+        default y
+        ---help---
+          If you say Y here, then the Open vSwitch will be able create geneve vport.
+
+          Say N to exclude this support and reduce the binary size.
diff --git a/net/openvswitch/Makefile b/net/openvswitch/Makefile
index 3591cb5dae91..9a33a273c375 100644
--- a/net/openvswitch/Makefile
+++ b/net/openvswitch/Makefile
@@ -15,6 +15,10 @@ openvswitch-y := \
         vport-internal_dev.o \
         vport-netdev.o
 
+ifneq ($(CONFIG_OPENVSWITCH_GENEVE),)
+openvswitch-y += vport-geneve.o
+endif
+
 ifneq ($(CONFIG_OPENVSWITCH_VXLAN),)
 openvswitch-y += vport-vxlan.o
 endif
diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c
index 6932a42e41a2..006886dbee36 100644
--- a/net/openvswitch/actions.c
+++ b/net/openvswitch/actions.c
@@ -590,8 +590,8 @@ static int execute_set_action(struct sk_buff *skb,
                 skb->mark = nla_get_u32(nested_attr);
                 break;
 
-        case OVS_KEY_ATTR_IPV4_TUNNEL:
-                OVS_CB(skb)->egress_tun_key = nla_data(nested_attr);
+        case OVS_KEY_ATTR_TUNNEL_INFO:
+                OVS_CB(skb)->egress_tun_info = nla_data(nested_attr);
                 break;
 
         case OVS_KEY_ATTR_ETHERNET:
@@ -778,6 +778,7 @@ int ovs_execute_actions(struct datapath *dp, struct sk_buff *skb,
         acts = rcu_dereference(OVS_CB(skb)->flow->sf_acts);
 
         this_cpu_inc(exec_actions_level);
+        OVS_CB(skb)->egress_tun_info = NULL;
         err = do_execute_actions(dp, skb, key,
                                  acts->actions, acts->actions_len);
 
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index 9e3a2fae6a8f..2e31d9e7f4dc 100644
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -369,6 +369,8 @@ static size_t key_attr_size(void)
                   + nla_total_size(1)   /* OVS_TUNNEL_KEY_ATTR_TTL */
                   + nla_total_size(0)   /* OVS_TUNNEL_KEY_ATTR_DONT_FRAGMENT */
                   + nla_total_size(0)   /* OVS_TUNNEL_KEY_ATTR_CSUM */
+                  + nla_total_size(0)   /* OVS_TUNNEL_KEY_ATTR_OAM */
+                  + nla_total_size(256)   /* OVS_TUNNEL_KEY_ATTR_GENEVE_OPTS */
                 + nla_total_size(4)   /* OVS_KEY_ATTR_IN_PORT */
                 + nla_total_size(4)   /* OVS_KEY_ATTR_SKB_MARK */
                 + nla_total_size(12)  /* OVS_KEY_ATTR_ETHERNET */
@@ -555,10 +557,12 @@ static int ovs_packet_cmd_execute(struct sk_buff *skb, struct genl_info *info)
 
         err = ovs_nla_copy_actions(a[OVS_PACKET_ATTR_ACTIONS],
                                    &flow->key, 0, &acts);
-        rcu_assign_pointer(flow->sf_acts, acts);
         if (err)
                 goto err_flow_free;
 
+        rcu_assign_pointer(flow->sf_acts, acts);
+
+        OVS_CB(packet)->egress_tun_info = NULL;
         OVS_CB(packet)->flow = flow;
         packet->priority = flow->key.phy.priority;
         packet->mark = flow->key.phy.skb_mark;
@@ -932,11 +936,34 @@ error:
         return error;
 }
 
+static struct sw_flow_actions *get_flow_actions(const struct nlattr *a,
+                                                const struct sw_flow_key *key,
+                                                const struct sw_flow_mask *mask)
+{
+        struct sw_flow_actions *acts;
+        struct sw_flow_key masked_key;
+        int error;
+
+        acts = ovs_nla_alloc_flow_actions(nla_len(a));
+        if (IS_ERR(acts))
+                return acts;
+
+        ovs_flow_mask_key(&masked_key, key, mask);
+        error = ovs_nla_copy_actions(a, &masked_key, 0, &acts);
+        if (error) {
+                OVS_NLERR("Flow actions may not be safe on all matching packets.\n");
+                kfree(acts);
+                return ERR_PTR(error);
+        }
+
+        return acts;
+}
+
 static int ovs_flow_cmd_set(struct sk_buff *skb, struct genl_info *info)
 {
         struct nlattr **a = info->attrs;
         struct ovs_header *ovs_header = info->userhdr;
-        struct sw_flow_key key, masked_key;
+        struct sw_flow_key key;
         struct sw_flow *flow;
         struct sw_flow_mask mask;
         struct sk_buff *reply = NULL;
@@ -958,17 +985,10 @@ static int ovs_flow_cmd_set(struct sk_buff *skb, struct genl_info *info)
 
         /* Validate actions. */
         if (a[OVS_FLOW_ATTR_ACTIONS]) {
-                acts = ovs_nla_alloc_flow_actions(nla_len(a[OVS_FLOW_ATTR_ACTIONS]));
-                error = PTR_ERR(acts);
-                if (IS_ERR(acts))
+                acts = get_flow_actions(a[OVS_FLOW_ATTR_ACTIONS], &key, &mask);
+                if (IS_ERR(acts)) {
+                        error = PTR_ERR(acts);
                         goto error;
-
-                ovs_flow_mask_key(&masked_key, &key, &mask);
-                error = ovs_nla_copy_actions(a[OVS_FLOW_ATTR_ACTIONS],
-                                             &masked_key, 0, &acts);
-                if (error) {
-                        OVS_NLERR("Flow actions may not be safe on all matching packets.\n");
-                        goto err_kfree_acts;
                 }
         }
 
diff --git a/net/openvswitch/datapath.h b/net/openvswitch/datapath.h
index ac3f3df96961..974135439c5c 100644
--- a/net/openvswitch/datapath.h
+++ b/net/openvswitch/datapath.h
@@ -102,8 +102,8 @@ struct datapath {
  */
 struct ovs_skb_cb {
         struct sw_flow          *flow;
+        struct ovs_tunnel_info  *egress_tun_info;
         struct vport            *input_vport;
-        struct ovs_key_ipv4_tunnel  *egress_tun_key;
 };
 #define OVS_CB(skb) ((struct ovs_skb_cb *)(skb)->cb)
 
diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c
index 4010423f2831..62db02ba36bc 100644
--- a/net/openvswitch/flow.c
+++ b/net/openvswitch/flow.c
@@ -448,6 +448,9 @@ static int key_extract(struct sk_buff *skb, struct sw_flow_key *key)
         int error;
         struct ethhdr *eth;
 
+        /* Flags are always used as part of stats */