5 files changed, 282 insertions, 124 deletions

diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c
index ca91fc33f8a9..4fe9032b1160 100644
--- a/net/openvswitch/actions.c
+++ b/net/openvswitch/actions.c
@@ -246,20 +246,24 @@ static int pop_vlan(struct sk_buff *skb, struct sw_flow_key *key)
         int err;
 
         err = skb_vlan_pop(skb);
-        if (skb_vlan_tag_present(skb))
+        if (skb_vlan_tag_present(skb)) {
                 invalidate_flow_key(key);
-        else
-                key->eth.tci = 0;
+        } else {
+                key->eth.vlan.tci = 0;
+                key->eth.vlan.tpid = 0;
+        }
         return err;
 }
 
 static int push_vlan(struct sk_buff *skb, struct sw_flow_key *key,
                      const struct ovs_action_push_vlan *vlan)
 {
-        if (skb_vlan_tag_present(skb))
+        if (skb_vlan_tag_present(skb)) {
                 invalidate_flow_key(key);
-        else
-                key->eth.tci = vlan->vlan_tci;
+        } else {
+                key->eth.vlan.tci = vlan->vlan_tci;
+                key->eth.vlan.tpid = vlan->vlan_tpid;
+        }
         return skb_vlan_push(skb, vlan->vlan_tpid,
                              ntohs(vlan->vlan_tci) & ~VLAN_TAG_PRESENT);
 }
diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c
index 0ea128eeeab2..1240ae3b88d2 100644
--- a/net/openvswitch/flow.c
+++ b/net/openvswitch/flow.c
@@ -302,24 +302,57 @@ static bool icmp6hdr_ok(struct sk_buff *skb)
                                   sizeof(struct icmp6hdr));
 }
 
-static int parse_vlan(struct sk_buff *skb, struct sw_flow_key *key)
+/**
+ * Parse vlan tag from vlan header.
+ * Returns ERROR on memory error.
+ * Returns 0 if it encounters a non-vlan or incomplete packet.
+ * Returns 1 after successfully parsing vlan tag.
+ */
+static int parse_vlan_tag(struct sk_buff *skb, struct vlan_head *key_vh)
 {
-        struct qtag_prefix {
-                __be16 eth_type; /* ETH_P_8021Q */
-                __be16 tci;
-        };
-        struct qtag_prefix *qp;
+        struct vlan_head *vh = (struct vlan_head *)skb->data;
 
-        if (unlikely(skb->len < sizeof(struct qtag_prefix) + sizeof(__be16)))
+        if (likely(!eth_type_vlan(vh->tpid)))
                 return 0;
 
-        if (unlikely(!pskb_may_pull(skb, sizeof(struct qtag_prefix) +
-                                         sizeof(__be16))))
+        if (unlikely(skb->len < sizeof(struct vlan_head) + sizeof(__be16)))
+                return 0;
+
+        if (unlikely(!pskb_may_pull(skb, sizeof(struct vlan_head) +
+                                 sizeof(__be16))))
                 return -ENOMEM;
 
-        qp = (struct qtag_prefix *) skb->data;
-        key->eth.tci = qp->tci | htons(VLAN_TAG_PRESENT);
-        __skb_pull(skb, sizeof(struct qtag_prefix));
+        vh = (struct vlan_head *)skb->data;
+        key_vh->tci = vh->tci | htons(VLAN_TAG_PRESENT);
+        key_vh->tpid = vh->tpid;
+
+        __skb_pull(skb, sizeof(struct vlan_head));
+        return 1;
+}
+
+static int parse_vlan(struct sk_buff *skb, struct sw_flow_key *key)
+{
+        int res;
+
+        key->eth.vlan.tci = 0;
+        key->eth.vlan.tpid = 0;
+        key->eth.cvlan.tci = 0;
+        key->eth.cvlan.tpid = 0;
+
+        if (likely(skb_vlan_tag_present(skb))) {
+                key->eth.vlan.tci = htons(skb->vlan_tci);
+                key->eth.vlan.tpid = skb->vlan_proto;
+        } else {
+                /* Parse outer vlan tag in the non-accelerated case. */
+                res = parse_vlan_tag(skb, &key->eth.vlan);
+                if (res <= 0)
+                        return res;
+        }
+
+        /* Parse inner vlan tag. */
+        res = parse_vlan_tag(skb, &key->eth.cvlan);
+        if (res <= 0)
+                return res;
 
         return 0;
 }
@@ -480,12 +513,8 @@ static int key_extract(struct sk_buff *skb, struct sw_flow_key *key)
          * update skb->csum here.
          */
 
-        key->eth.tci = 0;
-        if (skb_vlan_tag_present(skb))
-                key->eth.tci = htons(skb->vlan_tci);
-        else if (eth->h_proto == htons(ETH_P_8021Q))
-                if (unlikely(parse_vlan(skb, key)))
-                        return -ENOMEM;
+        if (unlikely(parse_vlan(skb, key)))
+                return -ENOMEM;
 
         key->eth.type = parse_ethertype(skb);
         if (unlikely(key->eth.type == htons(0)))
diff --git a/net/openvswitch/flow.h b/net/openvswitch/flow.h
index 03378e75a67c..156a3029c17b 100644
--- a/net/openvswitch/flow.h
+++ b/net/openvswitch/flow.h
@@ -50,6 +50,11 @@ struct ovs_tunnel_info {
         struct metadata_dst     *tun_dst;
 };
 
+struct vlan_head {
+        __be16 tpid; /* Vlan type. Generally 802.1q or 802.1ad.*/
+        __be16 tci;  /* 0 if no VLAN, VLAN_TAG_PRESENT set otherwise. */
+};
+
 #define OVS_SW_FLOW_KEY_METADATA_SIZE                   \
         (offsetof(struct sw_flow_key, recirc_id) +      \
         FIELD_SIZEOF(struct sw_flow_key, recirc_id))
@@ -69,7 +74,8 @@ struct sw_flow_key {
         struct {
                 u8     src[ETH_ALEN];   /* Ethernet source address. */
                 u8     dst[ETH_ALEN];   /* Ethernet destination address. */
-                __be16 tci;             /* 0 if no VLAN, VLAN_TAG_PRESENT set otherwise. */
+                struct vlan_head vlan;
+                struct vlan_head cvlan;
                 __be16 type;            /* Ethernet frame type. */
         } eth;
         union {
diff --git a/net/openvswitch/flow_netlink.c b/net/openvswitch/flow_netlink.c
index c78a6a1476fb..8efa718ddb5e 100644
--- a/net/openvswitch/flow_netlink.c
+++ b/net/openvswitch/flow_netlink.c
@@ -808,6 +808,167 @@ int ovs_nla_put_tunnel_info(struct sk_buff *skb,
                                   ip_tunnel_info_af(tun_info));
 }
 
+static int encode_vlan_from_nlattrs(struct sw_flow_match *match,
+                                    const struct nlattr *a[],
+                                    bool is_mask, bool inner)
+{
+        __be16 tci = 0;
+        __be16 tpid = 0;
+
+        if (a[OVS_KEY_ATTR_VLAN])
+                tci = nla_get_be16(a[OVS_KEY_ATTR_VLAN]);
+
+        if (a[OVS_KEY_ATTR_ETHERTYPE])
+                tpid = nla_get_be16(a[OVS_KEY_ATTR_ETHERTYPE]);
+
+        if (likely(!inner)) {
+                SW_FLOW_KEY_PUT(match, eth.vlan.tpid, tpid, is_mask);
+                SW_FLOW_KEY_PUT(match, eth.vlan.tci, tci, is_mask);
+        } else {
+                SW_FLOW_KEY_PUT(match, eth.cvlan.tpid, tpid, is_mask);
+                SW_FLOW_KEY_PUT(match, eth.cvlan.tci, tci, is_mask);
+        }
+        return 0;
+}
+
+static int validate_vlan_from_nlattrs(const struct sw_flow_match *match,
+                                      u64 key_attrs, bool inner,
+                                      const struct nlattr **a, bool log)
+{
+        __be16 tci = 0;
+
+        if (!((key_attrs & (1 << OVS_KEY_ATTR_ETHERNET)) &&
+              (key_attrs & (1 << OVS_KEY_ATTR_ETHERTYPE)) &&
+               eth_type_vlan(nla_get_be16(a[OVS_KEY_ATTR_ETHERTYPE])))) {
+                /* Not a VLAN. */
+                return 0;
+        }
+
+        if (!((key_attrs & (1 << OVS_KEY_ATTR_VLAN)) &&
+              (key_attrs & (1 << OVS_KEY_ATTR_ENCAP)))) {
+                OVS_NLERR(log, "Invalid %s frame", (inner) ? "C-VLAN" : "VLAN");
+                return -EINVAL;
+        }
+
+        if (a[OVS_KEY_ATTR_VLAN])