Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-block.git] / net / openvswitch / actions.c

diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c
index 514f7bcf7c63ce0f3148e42726df74ff77c0c8af..b1beb2b94ec76c6a8e415019439d09e47d11a7df 100644 (file)
--- a/net/openvswitch/actions.c
+++ b/net/openvswitch/actions.c
@@ -1074,6 +1074,8 @@ static int execute_masked_set_action(struct sk_buff *skb,
        case OVS_KEY_ATTR_CT_ZONE:
        case OVS_KEY_ATTR_CT_MARK:
        case OVS_KEY_ATTR_CT_LABELS:
+       case OVS_KEY_ATTR_CT_ORIG_TUPLE_IPV4:
+       case OVS_KEY_ATTR_CT_ORIG_TUPLE_IPV6:
                err = -EINVAL;
                break;
        }
@@ -1141,12 +1143,6 @@ static int do_execute_actions(struct datapath *dp, struct sk_buff *skb,
                              struct sw_flow_key *key,
                              const struct nlattr *attr, int len)
 {
-       /* 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
-        * then freeing the original skbuff is wasteful.  So the following code
-        * is slightly obscure just to avoid that.
-        */
-       int prev_port = -1;
        const struct nlattr *a;
        int rem;
 
@@ -1154,20 +1150,28 @@ static int do_execute_actions(struct datapath *dp, struct sk_buff *skb,
             a = nla_next(a, &rem)) {
                int err = 0;
 
-               if (unlikely(prev_port != -1)) {
-                       struct sk_buff *out_skb = skb_clone(skb, GFP_ATOMIC);
-
-                       if (out_skb)
-                               do_output(dp, out_skb, prev_port, key);
+               switch (nla_type(a)) {
+               case OVS_ACTION_ATTR_OUTPUT: {
+                       int port = nla_get_u32(a);
+                       struct sk_buff *clone;
+
+                       /* Every output action needs a separate clone
+                        * of 'skb', In case the output action is the
+                        * last action, cloning can be avoided.
+                        */
+                       if (nla_is_last(a, rem)) {
+                               do_output(dp, skb, port, key);
+                               /* 'skb' has been used for output.
+                                */
+                               return 0;
+                       }
 
+                       clone = skb_clone(skb, GFP_ATOMIC);
+                       if (clone)
+                               do_output(dp, clone, port, key);
                        OVS_CB(skb)->cutlen = 0;
-                       prev_port = -1;
-               }
-
-               switch (nla_type(a)) {
-               case OVS_ACTION_ATTR_OUTPUT:
-                       prev_port = nla_get_u32(a);
                        break;
+               }
 
                case OVS_ACTION_ATTR_TRUNC: {
                        struct ovs_action_trunc *trunc = nla_data(a);
@@ -1257,11 +1261,7 @@ static int do_execute_actions(struct datapath *dp, struct sk_buff *skb,
                }
        }
 
-       if (prev_port != -1)
-               do_output(dp, skb, prev_port, key);
-       else
-               consume_skb(skb);
-
+       consume_skb(skb);
        return 0;
 }