net/sched: flower: Add supprt for matching on QinQ vlan headers

As support dissecting of QinQ inner and outer vlan headers, user can
add rules to match on QinQ vlan headers.

Signed-off-by: Jianbo Liu <jianbol@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h
index 84e4c1d..c4262d9 100644 (file)
--- a/include/uapi/linux/pkt_cls.h
+++ b/include/uapi/linux/pkt_cls.h
@@ -469,6 +469,10 @@ enum {
        TCA_FLOWER_KEY_IP_TTL,          /* u8 */
        TCA_FLOWER_KEY_IP_TTL_MASK,     /* u8 */
 
+       TCA_FLOWER_KEY_CVLAN_ID,        /* be16 */
+       TCA_FLOWER_KEY_CVLAN_PRIO,      /* u8   */
+       TCA_FLOWER_KEY_CVLAN_ETH_TYPE,  /* be16 */
+
        __TCA_FLOWER_MAX,
 };
 

diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c
index e93b13d..487a152 100644 (file)
--- a/net/sched/cls_flower.c
+++ b/net/sched/cls_flower.c
@@ -35,6 +35,7 @@ struct fl_flow_key {
        struct flow_dissector_key_basic basic;
        struct flow_dissector_key_eth_addrs eth;
        struct flow_dissector_key_vlan vlan;
+       struct flow_dissector_key_vlan cvlan;
        union {
                struct flow_dissector_key_ipv4_addrs ipv4;
                struct flow_dissector_key_ipv6_addrs ipv6;
@@ -449,6 +450,9 @@ static const struct nla_policy fl_policy[TCA_FLOWER_MAX + 1] = {
        [TCA_FLOWER_KEY_IP_TOS_MASK]    = { .type = NLA_U8 },
        [TCA_FLOWER_KEY_IP_TTL]         = { .type = NLA_U8 },
        [TCA_FLOWER_KEY_IP_TTL_MASK]    = { .type = NLA_U8 },
+       [TCA_FLOWER_KEY_CVLAN_ID]       = { .type = NLA_U16 },
+       [TCA_FLOWER_KEY_CVLAN_PRIO]     = { .type = NLA_U8 },
+       [TCA_FLOWER_KEY_CVLAN_ETH_TYPE] = { .type = NLA_U16 },
 };
 
 static void fl_set_key_val(struct nlattr **tb,
@@ -501,19 +505,20 @@ static int fl_set_key_mpls(struct nlattr **tb,
 
 static void fl_set_key_vlan(struct nlattr **tb,
                            __be16 ethertype,
+                           int vlan_id_key, int vlan_prio_key,
                            struct flow_dissector_key_vlan *key_val,
                            struct flow_dissector_key_vlan *key_mask)
 {
 #define VLAN_PRIORITY_MASK     0x7
 
-       if (tb[TCA_FLOWER_KEY_VLAN_ID]) {
+       if (tb[vlan_id_key]) {
                key_val->vlan_id =
-                       nla_get_u16(tb[TCA_FLOWER_KEY_VLAN_ID]) & VLAN_VID_MASK;
+                       nla_get_u16(tb[vlan_id_key]) & VLAN_VID_MASK;
                key_mask->vlan_id = VLAN_VID_MASK;
        }
-       if (tb[TCA_FLOWER_KEY_VLAN_PRIO]) {
+       if (tb[vlan_prio_key]) {
                key_val->vlan_priority =
-                       nla_get_u8(tb[TCA_FLOWER_KEY_VLAN_PRIO]) &
+                       nla_get_u8(tb[vlan_prio_key]) &
                        VLAN_PRIORITY_MASK;
                key_mask->vlan_priority = VLAN_PRIORITY_MASK;
        }
@@ -596,11 +601,25 @@ static int fl_set_key(struct net *net, struct nlattr **tb,
                ethertype = nla_get_be16(tb[TCA_FLOWER_KEY_ETH_TYPE]);
 
                if (eth_type_vlan(ethertype)) {
-                       fl_set_key_vlan(tb, ethertype, &key->vlan, &mask->vlan);
-                       fl_set_key_val(tb, &key->basic.n_proto,
-                                      TCA_FLOWER_KEY_VLAN_ETH_TYPE,
-                                      &mask->basic.n_proto, TCA_FLOWER_UNSPEC,
-                                      sizeof(key->basic.n_proto));
+                       fl_set_key_vlan(tb, ethertype, TCA_FLOWER_KEY_VLAN_ID,
+                                       TCA_FLOWER_KEY_VLAN_PRIO, &key->vlan,
+                                       &mask->vlan);
+
+                       ethertype = nla_get_be16(tb[TCA_FLOWER_KEY_VLAN_ETH_TYPE]);
+                       if (eth_type_vlan(ethertype)) {
+                               fl_set_key_vlan(tb, ethertype,
+                                               TCA_FLOWER_KEY_CVLAN_ID,
+                                               TCA_FLOWER_KEY_CVLAN_PRIO,
+                                               &key->cvlan, &mask->cvlan);
+                               fl_set_key_val(tb, &key->basic.n_proto,
+                                              TCA_FLOWER_KEY_CVLAN_ETH_TYPE,
+                                              &mask->basic.n_proto,
+                                              TCA_FLOWER_UNSPEC,
+                                              sizeof(key->basic.n_proto));
+                       } else {
+                               key->basic.n_proto = ethertype;
+                               mask->basic.n_proto = cpu_to_be16(~0);
+                       }
                } else {
                        key->basic.n_proto = ethertype;
                        mask->basic.n_proto = cpu_to_be16(~0);
@@ -826,6 +845,8 @@ static void fl_init_dissector(struct fl_flow_mask *mask)
        FL_KEY_SET_IF_MASKED(&mask->key, keys, cnt,
                             FLOW_DISSECTOR_KEY_VLAN, vlan);
        FL_KEY_SET_IF_MASKED(&mask->key, keys, cnt,
+                            FLOW_DISSECTOR_KEY_CVLAN, cvlan);
+       FL_KEY_SET_IF_MASKED(&mask->key, keys, cnt,
                             FLOW_DISSECTOR_KEY_ENC_KEYID, enc_key_id);
        FL_KEY_SET_IF_MASKED(&mask->key, keys, cnt,
                             FLOW_DISSECTOR_KEY_ENC_IPV4_ADDRS, enc_ipv4);
@@ -1201,6 +1222,7 @@ static int fl_dump_key_ip(struct sk_buff *skb,
 }
 
 static int fl_dump_key_vlan(struct sk_buff *skb,
+                           int vlan_id_key, int vlan_prio_key,
                            struct flow_dissector_key_vlan *vlan_key,
                            struct flow_dissector_key_vlan *vlan_mask)
 {
@@ -1209,13 +1231,13 @@ static int fl_dump_key_vlan(struct sk_buff *skb,
        if (!memchr_inv(vlan_mask, 0, sizeof(*vlan_mask)))
                return 0;
        if (vlan_mask->vlan_id) {
-               err = nla_put_u16(skb, TCA_FLOWER_KEY_VLAN_ID,
+               err = nla_put_u16(skb, vlan_id_key,
                                  vlan_key->vlan_id);
                if (err)
                        return err;
        }
        if (vlan_mask->vlan_priority) {
-               err = nla_put_u8(skb, TCA_FLOWER_KEY_VLAN_PRIO,
+               err = nla_put_u8(skb, vlan_prio_key,
                                 vlan_key->vlan_priority);
                if (err)
                        return err;
@@ -1310,13 +1332,28 @@ static int fl_dump(struct net *net, struct tcf_proto *tp, void *fh,
        if (fl_dump_key_mpls(skb, &key->mpls, &mask->mpls))
                goto nla_put_failure;
 
-       if (fl_dump_key_vlan(skb, &key->vlan, &mask->vlan))
+       if (fl_dump_key_vlan(skb, TCA_FLOWER_KEY_VLAN_ID,
+                            TCA_FLOWER_KEY_VLAN_PRIO, &key->vlan, &mask->vlan))
                goto nla_put_failure;
 
-       if (mask->vlan.vlan_tpid &&
-           nla_put_be16(skb, TCA_FLOWER_KEY_VLAN_ETH_TYPE, key->basic.n_proto))
+       if (fl_dump_key_vlan(skb, TCA_FLOWER_KEY_CVLAN_ID,
+                            TCA_FLOWER_KEY_CVLAN_PRIO,
+                            &key->cvlan, &mask->cvlan) ||
+           (mask->cvlan.vlan_tpid &&
+            nla_put_u16(skb, TCA_FLOWER_KEY_VLAN_ETH_TYPE,
+                        key->cvlan.vlan_tpid)))
                goto nla_put_failure;
 
+       if (mask->cvlan.vlan_tpid) {
+               if (nla_put_be16(skb, TCA_FLOWER_KEY_CVLAN_ETH_TYPE,
+                                key->basic.n_proto))
+                       goto nla_put_failure;
+       } else if (mask->vlan.vlan_tpid) {
+               if (nla_put_be16(skb, TCA_FLOWER_KEY_VLAN_ETH_TYPE,
+                                key->basic.n_proto))
+                       goto nla_put_failure;
+       }
+
        if ((key->basic.n_proto == htons(ETH_P_IP) ||
             key->basic.n_proto == htons(ETH_P_IPV6)) &&
            (fl_dump_key_val(skb, &key->basic.ip_proto, TCA_FLOWER_KEY_IP_PROTO,