f_flower: Add num of vlans parameter

Our customers in the fiber telecom world have network configurations
where they would like to control their traffic according to the number
of tags appearing in the packet.

For example, TR247 GPON conformance test suite specification mostly
talks about untagged, single, double tagged packets and gives lax
guidelines on the vlan protocol vs. number of vlan tags.

This is different from the common IT networks where 802.1Q and 802.1ad
protocols are usually describe single and double tagged packet. GPON
configurations that we work with have arbitrary mix the above protocols
and number of vlan tags in the packet.

This patch adds num_of_vlans flower key and associated print and parse
routines. The following command becomes possible:

tc filter add dev eth1 ingress flower num_of_vlans 1 action drop

Signed-off-by: Boris Sukholitko <boris.sukholitko@broadcom.com>
Signed-off-by: David Ahern <dsahern@kernel.org>

diff --git a/tc/f_flower.c b/tc/f_flower.c
index 686cf12140a75553d0d130bf4b92c8d612dfd882..9e7404144d8bca82bd2521e638d87d581483a6df 100644 (file)
--- a/tc/f_flower.c
+++ b/tc/f_flower.c
@@ -48,6 +48,7 @@ static void explain(void)
                "\n"
                "Where: MATCH-LIST := [ MATCH-LIST ] MATCH\n"
                "       MATCH      := { indev DEV-NAME |\n"
+               "                       num_of_vlans VLANS_COUNT |\n"
                "                       vlan_id VID |\n"
                "                       vlan_prio PRIORITY |\n"
                "                       vlan_ethtype [ ipv4 | ipv6 | ETH-TYPE ] |\n"
@@ -1525,6 +1526,17 @@ static int flower_parse_opt(struct filter_util *qu, char *handle,
                        if (check_ifname(*argv))
                                invarg("\"indev\" not a valid ifname", *argv);
                        addattrstrz(n, MAX_MSG, TCA_FLOWER_INDEV, *argv);
+               } else if (strcmp(*argv, "num_of_vlans") == 0) {
+                       __u8 num_of_vlans;
+
+                       NEXT_ARG();
+                       ret = get_u8(&num_of_vlans, *argv, 10);
+                       if (ret < 0) {
+                               fprintf(stderr, "Illegal \"num_of_vlans\"\n");
+                               return -1;
+                       }
+                       addattr8(n, MAX_MSG,
+                                TCA_FLOWER_KEY_NUM_OF_VLANS, num_of_vlans);
                } else if (matches(*argv, "vlan_id") == 0) {
                        __u16 vid;
 
@@ -2694,6 +2706,14 @@ static int flower_print_opt(struct filter_util *qu, FILE *f,
 
        open_json_object("keys");
 
+       if (tb[TCA_FLOWER_KEY_NUM_OF_VLANS]) {
+               struct rtattr *attr = tb[TCA_FLOWER_KEY_NUM_OF_VLANS];
+
+               print_nl();
+               print_uint(PRINT_ANY, "num_of_vlans", "  num_of_vlans %d",
+                          rta_getattr_u8(attr));
+       }
+
        if (tb[TCA_FLOWER_KEY_VLAN_ID]) {
                struct rtattr *attr = tb[TCA_FLOWER_KEY_VLAN_ID];