datapath: Don't write into IPV4_TUNNEL data when using TUN_ID.

[openvswitch] / datapath / actions.c

diff --git a/datapath/actions.c b/datapath/actions.c
index 208f260e0059ef1da9b7af8b5c0af63dda54af05..8ec692d1d3d61c03aba0628393eff1ce8acc7efa 100644 (file)
--- a/datapath/actions.c
+++ b/datapath/actions.c
@@ -37,7 +37,8 @@
 #include "vport.h"
 
 static int do_execute_actions(struct datapath *dp, struct sk_buff *skb,
-                       const struct nlattr *attr, int len, bool keep_skb);
+                             const struct nlattr *attr, int len,
+                             struct ovs_key_ipv4_tunnel *tun_key, bool keep_skb);
 
 static int make_writable(struct sk_buff *skb, int write_len)
 {
@@ -47,7 +48,7 @@ static int make_writable(struct sk_buff *skb, int write_len)
        return pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
 }
 
-/* remove VLAN header from packet and update csum accrodingly. */
+/* remove VLAN header from packet and update csum accordingly. */
 static int __pop_vlan_tci(struct sk_buff *skb, __be16 *current_tci)
 {
        struct vlan_hdr *vhdr;
@@ -308,7 +309,8 @@ static int output_userspace(struct datapath *dp, struct sk_buff *skb,
 }
 
 static int sample(struct datapath *dp, struct sk_buff *skb,
-                 const struct nlattr *attr)
+                 const struct nlattr *attr,
+                 struct ovs_key_ipv4_tunnel *tun_key)
 {
        const struct nlattr *acts_list = NULL;
        const struct nlattr *a;
@@ -329,11 +331,12 @@ static int sample(struct datapath *dp, struct sk_buff *skb,
        }
 
        return do_execute_actions(dp, skb, nla_data(acts_list),
-                                                nla_len(acts_list), true);
+                                 nla_len(acts_list), tun_key, true);
 }
 
 static int execute_set_action(struct sk_buff *skb,
-                                const struct nlattr *nested_attr)
+                                const struct nlattr *nested_attr,
+                                struct ovs_key_ipv4_tunnel *tun_key)
 {
        int err = 0;
 
@@ -343,7 +346,23 @@ static int execute_set_action(struct sk_buff *skb,
                break;
 
        case OVS_KEY_ATTR_TUN_ID:
-               OVS_CB(skb)->tun_id = nla_get_be64(nested_attr);
+               /* If we're only using the TUN_ID action, store the value in a
+                * temporary instance of struct ovs_key_ipv4_tunnel on the stack.
+                * If both IPV4_TUNNEL and TUN_ID are being used together we
+                * can't write into the IPV4_TUNNEL action, so make a copy and
+                * write into that version.
+                */
+               if (!OVS_CB(skb)->tun_key)
+                       memset(tun_key, 0, sizeof(*tun_key));
+               else if (OVS_CB(skb)->tun_key != tun_key)
+                       memcpy(tun_key, OVS_CB(skb)->tun_key, sizeof(*tun_key));
+               OVS_CB(skb)->tun_key = tun_key;
+
+               OVS_CB(skb)->tun_key->tun_id = nla_get_be64(nested_attr);
+               break;
+
+       case OVS_KEY_ATTR_IPV4_TUNNEL:
+               OVS_CB(skb)->tun_key = nla_data(nested_attr);
                break;
 
        case OVS_KEY_ATTR_ETHERNET:
@@ -368,7 +387,8 @@ static int execute_set_action(struct sk_buff *skb,
 
 /* Execute a list of actions against 'skb'. */
 static int do_execute_actions(struct datapath *dp, struct sk_buff *skb,
-                       const struct nlattr *attr, int len, bool keep_skb)
+                       const struct nlattr *attr, int len,
+                       struct ovs_key_ipv4_tunnel *tun_key, bool keep_skb)
 {
        /* Every output action needs a separate clone of 'skb', but the common
         * case is just a single output action, so that doing a clone and
@@ -407,11 +427,11 @@ static int do_execute_actions(struct datapath *dp, struct sk_buff *skb,
                        break;
 
                case OVS_ACTION_ATTR_SET:
-                       err = execute_set_action(skb, nla_data(a));
+                       err = execute_set_action(skb, nla_data(a), tun_key);
                        break;
 
                case OVS_ACTION_ATTR_SAMPLE:
-                       err = sample(dp, skb, a);
+                       err = sample(dp, skb, a, tun_key);
                        break;
                }
 
@@ -458,6 +478,7 @@ int ovs_execute_actions(struct datapath *dp, struct sk_buff *skb)
        struct sw_flow_actions *acts = rcu_dereference(OVS_CB(skb)->flow->sf_acts);
        struct loop_counter *loop;
        int error;
+       struct ovs_key_ipv4_tunnel tun_key;
 
        /* Check whether we've looped too much. */
        loop = &__get_cpu_var(loop_counters);
@@ -469,9 +490,9 @@ int ovs_execute_actions(struct datapath *dp, struct sk_buff *skb)
                goto out_loop;
        }
 
-       OVS_CB(skb)->tun_id = 0;
+       OVS_CB(skb)->tun_key = NULL;
        error = do_execute_actions(dp, skb, acts->actions,
-                                        acts->actions_len, false);
+                                        acts->actions_len, &tun_key, false);
 
        /* Check whether sub-actions looped too much. */
        if (unlikely(loop->looping))