]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
net/mlx5e: Rename en_flow_table.c to en_fs.c
authorMaor Gottlieb <maorg@mellanox.com>
Thu, 10 Dec 2015 15:12:45 +0000 (17:12 +0200)
committerDavid S. Miller <davem@davemloft.net>
Sat, 12 Dec 2015 05:15:24 +0000 (00:15 -0500)
Rename en_flow_table.c to en_fs.c in order to be aligned
with the new flow steering files.

Signed-off-by: Maor Gottlieb <maorg@mellanox.com>
Signed-off-by: Moni Shoua <monis@mellanox.com>
Signed-off-by: Matan Barak <matanb@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/mellanox/mlx5/core/Makefile
drivers/net/ethernet/mellanox/mlx5/core/en_flow_table.c [deleted file]
drivers/net/ethernet/mellanox/mlx5/core/en_fs.c [new file with mode: 0644]

index 11ee062965c52a2c146e9e431ccd589ce3875dd9..fe11e967095fd61df5d37c1fb07be881fbe769fe 100644 (file)
@@ -4,5 +4,5 @@ mlx5_core-y :=  main.o cmd.o debugfs.o fw.o eq.o uar.o pagealloc.o \
                health.o mcg.o cq.o srq.o alloc.o qp.o port.o mr.o pd.o   \
                mad.o transobj.o vport.o sriov.o fs_cmd.o fs_core.o
 mlx5_core-$(CONFIG_MLX5_CORE_EN) += wq.o eswitch.o \
-               en_main.o en_flow_table.o en_ethtool.o en_tx.o en_rx.o \
+               en_main.o en_fs.o en_ethtool.o en_tx.o en_rx.o \
                en_txrx.o
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_flow_table.c b/drivers/net/ethernet/mellanox/mlx5/core/en_flow_table.c
deleted file mode 100644 (file)
index 80d81ab..0000000
+++ /dev/null
@@ -1,1224 +0,0 @@
-/*
- * Copyright (c) 2015, Mellanox Technologies. All rights reserved.
- *
- * This software is available to you under a choice of one of two
- * licenses.  You may choose to be licensed under the terms of the GNU
- * General Public License (GPL) Version 2, available from the file
- * COPYING in the main directory of this source tree, or the
- * OpenIB.org BSD license below:
- *
- *     Redistribution and use in source and binary forms, with or
- *     without modification, are permitted provided that the following
- *     conditions are met:
- *
- *      - Redistributions of source code must retain the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <linux/list.h>
-#include <linux/ip.h>
-#include <linux/ipv6.h>
-#include <linux/tcp.h>
-#include <linux/mlx5/fs.h>
-#include "en.h"
-
-#define MLX5_SET_CFG(p, f, v) MLX5_SET(create_flow_group_in, p, f, v)
-
-enum {
-       MLX5E_FULLMATCH = 0,
-       MLX5E_ALLMULTI  = 1,
-       MLX5E_PROMISC   = 2,
-};
-
-enum {
-       MLX5E_UC        = 0,
-       MLX5E_MC_IPV4   = 1,
-       MLX5E_MC_IPV6   = 2,
-       MLX5E_MC_OTHER  = 3,
-};
-
-enum {
-       MLX5E_ACTION_NONE = 0,
-       MLX5E_ACTION_ADD  = 1,
-       MLX5E_ACTION_DEL  = 2,
-};
-
-struct mlx5e_eth_addr_hash_node {
-       struct hlist_node          hlist;
-       u8                         action;
-       struct mlx5e_eth_addr_info ai;
-};
-
-static inline int mlx5e_hash_eth_addr(u8 *addr)
-{
-       return addr[5];
-}
-
-static void mlx5e_add_eth_addr_to_hash(struct hlist_head *hash, u8 *addr)
-{
-       struct mlx5e_eth_addr_hash_node *hn;
-       int ix = mlx5e_hash_eth_addr(addr);
-       int found = 0;
-
-       hlist_for_each_entry(hn, &hash[ix], hlist)
-               if (ether_addr_equal_64bits(hn->ai.addr, addr)) {
-                       found = 1;
-                       break;
-               }
-
-       if (found) {
-               hn->action = MLX5E_ACTION_NONE;
-               return;
-       }
-
-       hn = kzalloc(sizeof(*hn), GFP_ATOMIC);
-       if (!hn)
-               return;
-
-       ether_addr_copy(hn->ai.addr, addr);
-       hn->action = MLX5E_ACTION_ADD;
-
-       hlist_add_head(&hn->hlist, &hash[ix]);
-}
-
-static void mlx5e_del_eth_addr_from_hash(struct mlx5e_eth_addr_hash_node *hn)
-{
-       hlist_del(&hn->hlist);
-       kfree(hn);
-}
-
-static void mlx5e_del_eth_addr_from_flow_table(struct mlx5e_priv *priv,
-                                              struct mlx5e_eth_addr_info *ai)
-{
-       if (ai->tt_vec & BIT(MLX5E_TT_IPV6_IPSEC_ESP))
-               mlx5_del_flow_rule(ai->ft_rule[MLX5E_TT_IPV6_IPSEC_ESP]);
-
-       if (ai->tt_vec & BIT(MLX5E_TT_IPV4_IPSEC_ESP))
-               mlx5_del_flow_rule(ai->ft_rule[MLX5E_TT_IPV4_IPSEC_ESP]);
-
-       if (ai->tt_vec & BIT(MLX5E_TT_IPV6_IPSEC_AH))
-               mlx5_del_flow_rule(ai->ft_rule[MLX5E_TT_IPV6_IPSEC_AH]);
-
-       if (ai->tt_vec & BIT(MLX5E_TT_IPV4_IPSEC_AH))
-               mlx5_del_flow_rule(ai->ft_rule[MLX5E_TT_IPV4_IPSEC_AH]);
-
-       if (ai->tt_vec & BIT(MLX5E_TT_IPV6_TCP))
-               mlx5_del_flow_rule(ai->ft_rule[MLX5E_TT_IPV6_TCP]);
-
-       if (ai->tt_vec & BIT(MLX5E_TT_IPV4_TCP))
-               mlx5_del_flow_rule(ai->ft_rule[MLX5E_TT_IPV4_TCP]);
-
-       if (ai->tt_vec & BIT(MLX5E_TT_IPV6_UDP))
-               mlx5_del_flow_rule(ai->ft_rule[MLX5E_TT_IPV6_UDP]);
-
-       if (ai->tt_vec & BIT(MLX5E_TT_IPV4_UDP))
-               mlx5_del_flow_rule(ai->ft_rule[MLX5E_TT_IPV4_UDP]);
-
-       if (ai->tt_vec & BIT(MLX5E_TT_IPV6))
-               mlx5_del_flow_rule(ai->ft_rule[MLX5E_TT_IPV6]);
-
-       if (ai->tt_vec & BIT(MLX5E_TT_IPV4))
-               mlx5_del_flow_rule(ai->ft_rule[MLX5E_TT_IPV4]);
-
-       if (ai->tt_vec & BIT(MLX5E_TT_ANY))
-               mlx5_del_flow_rule(ai->ft_rule[MLX5E_TT_ANY]);
-}
-
-static int mlx5e_get_eth_addr_type(u8 *addr)
-{
-       if (is_unicast_ether_addr(addr))
-               return MLX5E_UC;
-
-       if ((addr[0] == 0x01) &&
-           (addr[1] == 0x00) &&
-           (addr[2] == 0x5e) &&
-          !(addr[3] &  0x80))
-               return MLX5E_MC_IPV4;
-
-       if ((addr[0] == 0x33) &&
-           (addr[1] == 0x33))
-               return MLX5E_MC_IPV6;
-
-       return MLX5E_MC_OTHER;
-}
-
-static u32 mlx5e_get_tt_vec(struct mlx5e_eth_addr_info *ai, int type)
-{
-       int eth_addr_type;
-       u32 ret;
-
-       switch (type) {
-       case MLX5E_FULLMATCH:
-               eth_addr_type = mlx5e_get_eth_addr_type(ai->addr);
-               switch (eth_addr_type) {
-               case MLX5E_UC:
-                       ret =
-                               BIT(MLX5E_TT_IPV4_TCP)       |
-                               BIT(MLX5E_TT_IPV6_TCP)       |
-                               BIT(MLX5E_TT_IPV4_UDP)       |
-                               BIT(MLX5E_TT_IPV6_UDP)       |
-                               BIT(MLX5E_TT_IPV4_IPSEC_AH)  |
-                               BIT(MLX5E_TT_IPV6_IPSEC_AH)  |
-                               BIT(MLX5E_TT_IPV4_IPSEC_ESP) |
-                               BIT(MLX5E_TT_IPV6_IPSEC_ESP) |
-                               BIT(MLX5E_TT_IPV4)           |
-                               BIT(MLX5E_TT_IPV6)           |
-                               BIT(MLX5E_TT_ANY)            |
-                               0;
-                       break;
-
-               case MLX5E_MC_IPV4:
-                       ret =
-                               BIT(MLX5E_TT_IPV4_UDP)       |
-                               BIT(MLX5E_TT_IPV4)           |
-                               0;
-                       break;
-
-               case MLX5E_MC_IPV6:
-                       ret =
-                               BIT(MLX5E_TT_IPV6_UDP)       |
-                               BIT(MLX5E_TT_IPV6)           |
-                               0;
-                       break;
-
-               case MLX5E_MC_OTHER:
-                       ret =
-                               BIT(MLX5E_TT_ANY)            |
-                               0;
-                       break;
-               }
-
-               break;
-
-       case MLX5E_ALLMULTI:
-               ret =
-                       BIT(MLX5E_TT_IPV4_UDP) |
-                       BIT(MLX5E_TT_IPV6_UDP) |
-                       BIT(MLX5E_TT_IPV4)     |
-                       BIT(MLX5E_TT_IPV6)     |
-                       BIT(MLX5E_TT_ANY)      |
-                       0;
-               break;
-
-       default: /* MLX5E_PROMISC */
-               ret =
-                       BIT(MLX5E_TT_IPV4_TCP)       |
-                       BIT(MLX5E_TT_IPV6_TCP)       |
-                       BIT(MLX5E_TT_IPV4_UDP)       |
-                       BIT(MLX5E_TT_IPV6_UDP)       |
-                       BIT(MLX5E_TT_IPV4_IPSEC_AH)  |
-                       BIT(MLX5E_TT_IPV6_IPSEC_AH)  |
-                       BIT(MLX5E_TT_IPV4_IPSEC_ESP) |
-                       BIT(MLX5E_TT_IPV6_IPSEC_ESP) |
-                       BIT(MLX5E_TT_IPV4)           |
-                       BIT(MLX5E_TT_IPV6)           |
-                       BIT(MLX5E_TT_ANY)            |
-                       0;
-               break;
-       }
-
-       return ret;
-}
-
-static int __mlx5e_add_eth_addr_rule(struct mlx5e_priv *priv,
-                                    struct mlx5e_eth_addr_info *ai,
-                                    int type, u32 *mc, u32 *mv)
-{
-       struct mlx5_flow_destination dest;
-       u8 match_criteria_enable = 0;
-       struct mlx5_flow_rule **rule_p;
-       struct mlx5_flow_table *ft = priv->fts.main.t;
-       u8 *mc_dmac = MLX5_ADDR_OF(fte_match_param, mc,
-                                  outer_headers.dmac_47_16);
-       u8 *mv_dmac = MLX5_ADDR_OF(fte_match_param, mv,
-                                  outer_headers.dmac_47_16);
-       u32 *tirn = priv->tirn;
-       u32 tt_vec;
-       int err = 0;
-
-       dest.type = MLX5_FLOW_DESTINATION_TYPE_TIR;
-
-       switch (type) {
-       case MLX5E_FULLMATCH:
-               match_criteria_enable = MLX5_MATCH_OUTER_HEADERS;
-               eth_broadcast_addr(mc_dmac);
-               ether_addr_copy(mv_dmac, ai->addr);
-               break;
-
-       case MLX5E_ALLMULTI:
-               match_criteria_enable = MLX5_MATCH_OUTER_HEADERS;
-               mc_dmac[0] = 0x01;
-               mv_dmac[0] = 0x01;
-               break;
-
-       case MLX5E_PROMISC:
-               break;
-       }
-
-       tt_vec = mlx5e_get_tt_vec(ai, type);
-
-       if (tt_vec & BIT(MLX5E_TT_ANY)) {
-               rule_p = &ai->ft_rule[MLX5E_TT_ANY];
-               dest.tir_num = tirn[MLX5E_TT_ANY];
-               *rule_p = mlx5_add_flow_rule(ft, match_criteria_enable, mc, mv,
-                                            MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,
-                                            MLX5_FS_DEFAULT_FLOW_TAG, &dest);
-               if (IS_ERR_OR_NULL(*rule_p))
-                       goto err_del_ai;
-               ai->tt_vec |= BIT(MLX5E_TT_ANY);
-       }
-
-       match_criteria_enable = MLX5_MATCH_OUTER_HEADERS;
-       MLX5_SET_TO_ONES(fte_match_param, mc, outer_headers.ethertype);
-
-       if (tt_vec & BIT(MLX5E_TT_IPV4)) {
-               rule_p = &ai->ft_rule[MLX5E_TT_IPV4];
-               dest.tir_num = tirn[MLX5E_TT_IPV4];
-               MLX5_SET(fte_match_param, mv, outer_headers.ethertype,
-                        ETH_P_IP);
-               *rule_p = mlx5_add_flow_rule(ft, match_criteria_enable, mc, mv,
-                                            MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,
-                                            MLX5_FS_DEFAULT_FLOW_TAG, &dest);
-               if (IS_ERR_OR_NULL(*rule_p))
-                       goto err_del_ai;
-               ai->tt_vec |= BIT(MLX5E_TT_IPV4);
-       }
-
-       if (tt_vec & BIT(MLX5E_TT_IPV6)) {
-               rule_p = &ai->ft_rule[MLX5E_TT_IPV6];
-               dest.tir_num = tirn[MLX5E_TT_IPV6];
-               MLX5_SET(fte_match_param, mv, outer_headers.ethertype,
-                        ETH_P_IPV6);
-               *rule_p = mlx5_add_flow_rule(ft, match_criteria_enable, mc, mv,
-                                            MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,
-                                            MLX5_FS_DEFAULT_FLOW_TAG, &dest);
-               if (IS_ERR_OR_NULL(*rule_p))
-                       goto err_del_ai;
-               ai->tt_vec |= BIT(MLX5E_TT_IPV6);
-       }
-
-       MLX5_SET_TO_ONES(fte_match_param, mc, outer_headers.ip_protocol);
-       MLX5_SET(fte_match_param, mv, outer_headers.ip_protocol, IPPROTO_UDP);
-
-       if (tt_vec & BIT(MLX5E_TT_IPV4_UDP)) {
-               rule_p = &ai->ft_rule[MLX5E_TT_IPV4_UDP];
-               dest.tir_num = tirn[MLX5E_TT_IPV4_UDP];
-               MLX5_SET(fte_match_param, mv, outer_headers.ethertype,
-                        ETH_P_IP);
-               *rule_p = mlx5_add_flow_rule(ft, match_criteria_enable, mc, mv,
-                                            MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,
-                                            MLX5_FS_DEFAULT_FLOW_TAG, &dest);
-               if (IS_ERR_OR_NULL(*rule_p))
-                       goto err_del_ai;
-               ai->tt_vec |= BIT(MLX5E_TT_IPV4_UDP);
-       }
-
-       if (tt_vec & BIT(MLX5E_TT_IPV6_UDP)) {
-               rule_p = &ai->ft_rule[MLX5E_TT_IPV6_UDP];
-               dest.tir_num = tirn[MLX5E_TT_IPV6_UDP];
-               MLX5_SET(fte_match_param, mv, outer_headers.ethertype,
-                        ETH_P_IPV6);
-               *rule_p = mlx5_add_flow_rule(ft, match_criteria_enable, mc, mv,
-                                            MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,
-                                            MLX5_FS_DEFAULT_FLOW_TAG, &dest);
-               if (IS_ERR_OR_NULL(*rule_p))
-                       goto err_del_ai;
-               ai->tt_vec |= BIT(MLX5E_TT_IPV6_UDP);
-       }
-
-       MLX5_SET(fte_match_param, mv, outer_headers.ip_protocol, IPPROTO_TCP);
-
-       if (tt_vec & BIT(MLX5E_TT_IPV4_TCP)) {
-               rule_p = &ai->ft_rule[MLX5E_TT_IPV4_TCP];
-               dest.tir_num = tirn[MLX5E_TT_IPV4_TCP];
-               MLX5_SET(fte_match_param, mv, outer_headers.ethertype,
-                        ETH_P_IP);
-               *rule_p = mlx5_add_flow_rule(ft, match_criteria_enable, mc, mv,
-                                            MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,
-                                            MLX5_FS_DEFAULT_FLOW_TAG, &dest);
-               if (IS_ERR_OR_NULL(*rule_p))
-                       goto err_del_ai;
-               ai->tt_vec |= BIT(MLX5E_TT_IPV4_TCP);
-       }
-
-       if (tt_vec & BIT(MLX5E_TT_IPV6_TCP)) {
-               rule_p = &ai->ft_rule[MLX5E_TT_IPV6_TCP];
-               dest.tir_num = tirn[MLX5E_TT_IPV6_TCP];
-               MLX5_SET(fte_match_param, mv, outer_headers.ethertype,
-                        ETH_P_IPV6);
-               *rule_p = mlx5_add_flow_rule(ft, match_criteria_enable, mc, mv,
-                                            MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,
-                                            MLX5_FS_DEFAULT_FLOW_TAG, &dest);
-               if (IS_ERR_OR_NULL(*rule_p))
-                       goto err_del_ai;
-
-               ai->tt_vec |= BIT(MLX5E_TT_IPV6_TCP);
-       }
-
-       MLX5_SET(fte_match_param, mv, outer_headers.ip_protocol, IPPROTO_AH);
-
-       if (tt_vec & BIT(MLX5E_TT_IPV4_IPSEC_AH)) {
-               rule_p = &ai->ft_rule[MLX5E_TT_IPV4_IPSEC_AH];
-               dest.tir_num = tirn[MLX5E_TT_IPV4_IPSEC_AH];
-               MLX5_SET(fte_match_param, mv, outer_headers.ethertype,
-                        ETH_P_IP);
-               *rule_p = mlx5_add_flow_rule(ft, match_criteria_enable, mc, mv,
-                                            MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,
-                                            MLX5_FS_DEFAULT_FLOW_TAG, &dest);
-               if (IS_ERR_OR_NULL(*rule_p))
-                       goto err_del_ai;
-               ai->tt_vec |= BIT(MLX5E_TT_IPV4_IPSEC_AH);
-       }
-
-       if (tt_vec & BIT(MLX5E_TT_IPV6_IPSEC_AH)) {
-               rule_p = &ai->ft_rule[MLX5E_TT_IPV6_IPSEC_AH];
-               dest.tir_num = tirn[MLX5E_TT_IPV6_IPSEC_AH];
-               MLX5_SET(fte_match_param, mv, outer_headers.ethertype,
-                        ETH_P_IPV6);
-               *rule_p = mlx5_add_flow_rule(ft, match_criteria_enable, mc, mv,
-                                            MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,
-                                            MLX5_FS_DEFAULT_FLOW_TAG, &dest);
-               if (IS_ERR_OR_NULL(*rule_p))
-                       goto err_del_ai;
-               ai->tt_vec |= BIT(MLX5E_TT_IPV6_IPSEC_AH);
-       }
-
-       MLX5_SET(fte_match_param, mv, outer_headers.ip_protocol, IPPROTO_ESP);
-
-       if (tt_vec & BIT(MLX5E_TT_IPV4_IPSEC_ESP)) {
-               rule_p = &ai->ft_rule[MLX5E_TT_IPV4_IPSEC_ESP];
-               dest.tir_num = tirn[MLX5E_TT_IPV4_IPSEC_ESP];
-               MLX5_SET(fte_match_param, mv, outer_headers.ethertype,
-                        ETH_P_IP);
-               *rule_p = mlx5_add_flow_rule(ft, match_criteria_enable, mc, mv,
-                                            MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,
-                                            MLX5_FS_DEFAULT_FLOW_TAG, &dest);
-               if (IS_ERR_OR_NULL(*rule_p))
-                       goto err_del_ai;
-               ai->tt_vec |= BIT(MLX5E_TT_IPV4_IPSEC_ESP);
-       }
-
-       if (tt_vec & BIT(MLX5E_TT_IPV6_IPSEC_ESP)) {
-               rule_p = &ai->ft_rule[MLX5E_TT_IPV6_IPSEC_ESP];
-               dest.tir_num = tirn[MLX5E_TT_IPV6_IPSEC_ESP];
-               MLX5_SET(fte_match_param, mv, outer_headers.ethertype,
-                        ETH_P_IPV6);
-               *rule_p = mlx5_add_flow_rule(ft, match_criteria_enable, mc, mv,
-                                            MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,
-                                            MLX5_FS_DEFAULT_FLOW_TAG, &dest);
-               if (IS_ERR_OR_NULL(*rule_p))
-                       goto err_del_ai;
-               ai->tt_vec |= BIT(MLX5E_TT_IPV6_IPSEC_ESP);
-       }
-
-       return 0;
-
-err_del_ai:
-       err = PTR_ERR(*rule_p);
-       *rule_p = NULL;
-       mlx5e_del_eth_addr_from_flow_table(priv, ai);
-
-       return err;
-}
-
-static int mlx5e_add_eth_addr_rule(struct mlx5e_priv *priv,
-                                  struct mlx5e_eth_addr_info *ai, int type)
-{
-       u32 *match_criteria;
-       u32 *match_value;
-       int err = 0;
-
-       match_value     = mlx5_vzalloc(MLX5_ST_SZ_BYTES(fte_match_param));
-       match_criteria  = mlx5_vzalloc(MLX5_ST_SZ_BYTES(fte_match_param));
-       if (!match_value || !match_criteria) {
-               netdev_err(priv->netdev, "%s: alloc failed\n", __func__);
-               err = -ENOMEM;
-               goto add_eth_addr_rule_out;
-       }
-
-       err = __mlx5e_add_eth_addr_rule(priv, ai, type, match_criteria,
-                                       match_value);
-
-add_eth_addr_rule_out:
-       kvfree(match_criteria);
-       kvfree(match_value);
-
-       return err;
-}
-
-static int mlx5e_vport_context_update_vlans(struct mlx5e_priv *priv)
-{
-       struct net_device *ndev = priv->netdev;
-       int max_list_size;
-       int list_size;
-       u16 *vlans;
-       int vlan;
-       int err;
-       int i;
-
-       list_size = 0;
-       for_each_set_bit(vlan, priv->vlan.active_vlans, VLAN_N_VID)
-               list_size++;
-
-       max_list_size = 1 << MLX5_CAP_GEN(priv->mdev, log_max_vlan_list);
-
-       if (list_size > max_list_size) {
-               netdev_warn(ndev,
-                           "netdev vlans list size (%d) > (%d) max vport list size, some vlans will be dropped\n",
-                           list_size, max_list_size);
-               list_size = max_list_size;
-       }
-
-       vlans = kcalloc(list_size, sizeof(*vlans), GFP_KERNEL);
-       if (!vlans)
-               return -ENOMEM;
-
-       i = 0;
-       for_each_set_bit(vlan, priv->vlan.active_vlans, VLAN_N_VID) {
-               if (i >= list_size)
-                       break;
-               vlans[i++] = vlan;
-       }
-
-       err = mlx5_modify_nic_vport_vlans(priv->mdev, vlans, list_size);
-       if (err)
-               netdev_err(ndev, "Failed to modify vport vlans list err(%d)\n",
-                          err);
-
-       kfree(vlans);
-       return err;
-}
-
-enum mlx5e_vlan_rule_type {
-       MLX5E_VLAN_RULE_TYPE_UNTAGGED,
-       MLX5E_VLAN_RULE_TYPE_ANY_VID,
-       MLX5E_VLAN_RULE_TYPE_MATCH_VID,
-};
-
-static int __mlx5e_add_vlan_rule(struct mlx5e_priv *priv,
-                                enum mlx5e_vlan_rule_type rule_type,
-                                u16 vid, u32 *mc, u32 *mv)
-{
-       struct mlx5_flow_table *ft = priv->fts.vlan.t;
-       struct mlx5_flow_destination dest;
-       u8 match_criteria_enable = 0;
-       struct mlx5_flow_rule **rule_p;
-       int err = 0;
-
-       dest.type = MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE;
-       dest.ft = priv->fts.main.t;
-
-       match_criteria_enable = MLX5_MATCH_OUTER_HEADERS;
-       MLX5_SET_TO_ONES(fte_match_param, mc, outer_headers.vlan_tag);
-
-       switch (rule_type) {
-       case MLX5E_VLAN_RULE_TYPE_UNTAGGED:
-               rule_p = &priv->vlan.untagged_rule;
-               break;
-       case MLX5E_VLAN_RULE_TYPE_ANY_VID:
-               rule_p = &priv->vlan.any_vlan_rule;
-               MLX5_SET(fte_match_param, mv, outer_headers.vlan_tag, 1);
-               break;
-       default: /* MLX5E_VLAN_RULE_TYPE_MATCH_VID */
-               rule_p = &priv->vlan.active_vlans_rule[vid];
-               MLX5_SET(fte_match_param, mv, outer_headers.vlan_tag, 1);
-               MLX5_SET_TO_ONES(fte_match_param, mc, outer_headers.first_vid);
-               MLX5_SET(fte_match_param, mv, outer_headers.first_vid, vid);
-               break;
-       }
-
-       *rule_p = mlx5_add_flow_rule(ft, match_criteria_enable, mc, mv,
-                                    MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,
-                                    MLX5_FS_DEFAULT_FLOW_TAG,
-                                    &dest);
-
-       if (IS_ERR(*rule_p)) {
-               err = PTR_ERR(*rule_p);
-               *rule_p = NULL;
-               netdev_err(priv->netdev, "%s: add rule failed\n", __func__);
-       }
-
-       return err;
-}
-
-static int mlx5e_add_vlan_rule(struct mlx5e_priv *priv,
-                              enum mlx5e_vlan_rule_type rule_type, u16 vid)
-{
-       u32 *match_criteria;
-       u32 *match_value;
-       int err = 0;
-
-       match_value     = mlx5_vzalloc(MLX5_ST_SZ_BYTES(fte_match_param));
-       match_criteria  = mlx5_vzalloc(MLX5_ST_SZ_BYTES(fte_match_param));
-       if (!match_value || !match_criteria) {
-               netdev_err(priv->netdev, "%s: alloc failed\n", __func__);
-               err = -ENOMEM;
-               goto add_vlan_rule_out;
-       }
-
-       if (rule_type == MLX5E_VLAN_RULE_TYPE_MATCH_VID)
-               mlx5e_vport_context_update_vlans(priv);
-
-       err = __mlx5e_add_vlan_rule(priv, rule_type, vid, match_criteria,
-                                   match_value);
-
-add_vlan_rule_out:
-       kvfree(match_criteria);
-       kvfree(match_value);
-
-       return err;
-}
-
-static void mlx5e_del_vlan_rule(struct mlx5e_priv *priv,
-                               enum mlx5e_vlan_rule_type rule_type, u16 vid)
-{
-       switch (rule_type) {
-       case MLX5E_VLAN_RULE_TYPE_UNTAGGED:
-               if (priv->vlan.untagged_rule) {
-                       mlx5_del_flow_rule(priv->vlan.untagged_rule);
-                       priv->vlan.untagged_rule = NULL;
-               }
-               break;
-       case MLX5E_VLAN_RULE_TYPE_ANY_VID:
-               if (priv->vlan.any_vlan_rule) {
-                       mlx5_del_flow_rule(priv->vlan.any_vlan_rule);
-                       priv->vlan.any_vlan_rule = NULL;
-               }
-               break;
-       case MLX5E_VLAN_RULE_TYPE_MATCH_VID:
-               mlx5e_vport_context_update_vlans(priv);
-               if (priv->vlan.active_vlans_rule[vid]) {
-                       mlx5_del_flow_rule(priv->vlan.active_vlans_rule[vid]);
-                       priv->vlan.active_vlans_rule[vid] = NULL;
-               }
-               mlx5e_vport_context_update_vlans(priv);
-               break;
-       }
-}
-
-void mlx5e_enable_vlan_filter(struct mlx5e_priv *priv)
-{
-       if (!priv->vlan.filter_disabled)
-               return;
-
-       priv->vlan.filter_disabled = false;
-       if (priv->netdev->flags & IFF_PROMISC)
-               return;
-       mlx5e_del_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_ANY_VID, 0);
-}
-
-void mlx5e_disable_vlan_filter(struct mlx5e_priv *priv)
-{
-       if (priv->vlan.filter_disabled)
-               return;
-
-       priv->vlan.filter_disabled = true;
-       if (priv->netdev->flags & IFF_PROMISC)
-               return;
-       mlx5e_add_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_ANY_VID, 0);
-}
-
-int mlx5e_vlan_rx_add_vid(struct net_device *dev, __always_unused __be16 proto,
-                         u16 vid)
-{
-       struct mlx5e_priv *priv = netdev_priv(dev);
-
-       set_bit(vid, priv->vlan.active_vlans);
-
-       return mlx5e_add_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_MATCH_VID, vid);
-}
-
-int mlx5e_vlan_rx_kill_vid(struct net_device *dev, __always_unused __be16 proto,
-                          u16 vid)
-{
-       struct mlx5e_priv *priv = netdev_priv(dev);
-
-       clear_bit(vid, priv->vlan.active_vlans);
-
-       mlx5e_del_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_MATCH_VID, vid);
-
-       return 0;
-}
-
-#define mlx5e_for_each_hash_node(hn, tmp, hash, i) \
-       for (i = 0; i < MLX5E_ETH_ADDR_HASH_SIZE; i++) \
-               hlist_for_each_entry_safe(hn, tmp, &hash[i], hlist)
-
-static void mlx5e_execute_action(struct mlx5e_priv *priv,
-                                struct mlx5e_eth_addr_hash_node *hn)
-{
-       switch (hn->action) {
-       case MLX5E_ACTION_ADD:
-               mlx5e_add_eth_addr_rule(priv, &hn->ai, MLX5E_FULLMATCH);
-               hn->action = MLX5E_ACTION_NONE;
-               break;
-
-       case MLX5E_ACTION_DEL:
-               mlx5e_del_eth_addr_from_flow_table(priv, &hn->ai);
-               mlx5e_del_eth_addr_from_hash(hn);
-               break;
-       }
-}
-
-static void mlx5e_sync_netdev_addr(struct mlx5e_priv *priv)
-{
-       struct net_device *netdev = priv->netdev;
-       struct netdev_hw_addr *ha;
-
-       netif_addr_lock_bh(netdev);
-
-       mlx5e_add_eth_addr_to_hash(priv->eth_addr.netdev_uc,
-                                  priv->netdev->dev_addr);
-
-       netdev_for_each_uc_addr(ha, netdev)
-               mlx5e_add_eth_addr_to_hash(priv->eth_addr.netdev_uc, ha->addr);
-
-       netdev_for_each_mc_addr(ha, netdev)
-               mlx5e_add_eth_addr_to_hash(priv->eth_addr.netdev_mc, ha->addr);
-
-       netif_addr_unlock_bh(netdev);
-}
-
-static void mlx5e_fill_addr_array(struct mlx5e_priv *priv, int list_type,
-                                 u8 addr_array[][ETH_ALEN], int size)
-{
-       bool is_uc = (list_type == MLX5_NVPRT_LIST_TYPE_UC);
-       struct net_device *ndev = priv->netdev;
-       struct mlx5e_eth_addr_hash_node *hn;
-       struct hlist_head *addr_list;
-       struct hlist_node *tmp;
-       int i = 0;
-       int hi;
-
-       addr_list = is_uc ? priv->eth_addr.netdev_uc : priv->eth_addr.netdev_mc;
-
-       if (is_uc) /* Make sure our own address is pushed first */
-               ether_addr_copy(addr_array[i++], ndev->dev_addr);
-       else if (priv->eth_addr.broadcast_enabled)
-               ether_addr_copy(addr_array[i++], ndev->broadcast);
-
-       mlx5e_for_each_hash_node(hn, tmp, addr_list, hi) {
-               if (ether_addr_equal(ndev->dev_addr, hn->ai.addr))
-                       continue;
-               if (i >= size)
-                       break;
-               ether_addr_copy(addr_array[i++], hn->ai.addr);
-       }
-}
-
-static void mlx5e_vport_context_update_addr_list(struct mlx5e_priv *priv,
-                                                int list_type)
-{
-       bool is_uc = (list_type == MLX5_NVPRT_LIST_TYPE_UC);
-       struct mlx5e_eth_addr_hash_node *hn;
-       u8 (*addr_array)[ETH_ALEN] = NULL;
-       struct hlist_head *addr_list;
-       struct hlist_node *tmp;
-       int max_size;
-       int size;
-       int err;
-       int hi;
-
-       size = is_uc ? 0 : (priv->eth_addr.broadcast_enabled ? 1 : 0);
-       max_size = is_uc ?
-               1 << MLX5_CAP_GEN(priv->mdev, log_max_current_uc_list) :
-               1 << MLX5_CAP_GEN(priv->mdev, log_max_current_mc_list);
-
-       addr_list = is_uc ? priv->eth_addr.netdev_uc : priv->eth_addr.netdev_mc;
-       mlx5e_for_each_hash_node(hn, tmp, addr_list, hi)
-               size++;
-
-       if (size > max_size) {
-               netdev_warn(priv->netdev,
-                           "netdev %s list size (%d) > (%d) max vport list size, some addresses will be dropped\n",
-                           is_uc ? "UC" : "MC", size, max_size);
-               size = max_size;
-       }
-
-       if (size) {
-               addr_array = kcalloc(size, ETH_ALEN, GFP_KERNEL);
-               if (!addr_array) {
-                       err = -ENOMEM;
-                       goto out;
-               }
-               mlx5e_fill_addr_array(priv, list_type, addr_array, size);
-       }
-
-       err = mlx5_modify_nic_vport_mac_list(priv->mdev, list_type, addr_array, size);
-out:
-       if (err)
-               netdev_err(priv->netdev,
-                          "Failed to modify vport %s list err(%d)\n",
-                          is_uc ? "UC" : "MC", err);
-       kfree(addr_array);
-}
-
-static void mlx5e_vport_context_update(struct mlx5e_priv *priv)
-{
-       struct mlx5e_eth_addr_db *ea = &priv->eth_addr;
-
-       mlx5e_vport_context_update_addr_list(priv, MLX5_NVPRT_LIST_TYPE_UC);
-       mlx5e_vport_context_update_addr_list(priv, MLX5_NVPRT_LIST_TYPE_MC);
-       mlx5_modify_nic_vport_promisc(priv->mdev, 0,
-                                     ea->allmulti_enabled,
-                                     ea->promisc_enabled);
-}
-
-static void mlx5e_apply_netdev_addr(struct mlx5e_priv *priv)
-{
-       struct mlx5e_eth_addr_hash_node *hn;
-       struct hlist_node *tmp;
-       int i;
-
-       mlx5e_for_each_hash_node(hn, tmp, priv->eth_addr.netdev_uc, i)
-               mlx5e_execute_action(priv, hn);
-
-       mlx5e_for_each_hash_node(hn, tmp, priv->eth_addr.netdev_mc, i)
-               mlx5e_execute_action(priv, hn);
-}
-
-static void mlx5e_handle_netdev_addr(struct mlx5e_priv *priv)
-{
-       struct mlx5e_eth_addr_hash_node *hn;
-       struct hlist_node *tmp;
-       int i;
-
-       mlx5e_for_each_hash_node(hn, tmp, priv->eth_addr.netdev_uc, i)
-               hn->action = MLX5E_ACTION_DEL;
-       mlx5e_for_each_hash_node(hn, tmp, priv->eth_addr.netdev_mc, i)
-               hn->action = MLX5E_ACTION_DEL;
-
-       if (!test_bit(MLX5E_STATE_DESTROYING, &priv->state))
-               mlx5e_sync_netdev_addr(priv);
-
-       mlx5e_apply_netdev_addr(priv);
-}
-
-void mlx5e_set_rx_mode_work(struct work_struct *work)
-{
-       struct mlx5e_priv *priv = container_of(work, struct mlx5e_priv,
-                                              set_rx_mode_work);
-
-       struct mlx5e_eth_addr_db *ea = &priv->eth_addr;
-       struct net_device *ndev = priv->netdev;
-
-       bool rx_mode_enable   = !test_bit(MLX5E_STATE_DESTROYING, &priv->state);
-       bool promisc_enabled   = rx_mode_enable && (ndev->flags & IFF_PROMISC);
-       bool allmulti_enabled  = rx_mode_enable && (ndev->flags & IFF_ALLMULTI);
-       bool broadcast_enabled = rx_mode_enable;
-
-       bool enable_promisc    = !ea->promisc_enabled   &&  promisc_enabled;
-       bool disable_promisc   =  ea->promisc_enabled   && !promisc_enabled;
-       bool enable_allmulti   = !ea->allmulti_enabled  &&  allmulti_enabled;
-       bool disable_allmulti  =  ea->allmulti_enabled  && !allmulti_enabled;
-       bool enable_broadcast  = !ea->broadcast_enabled &&  broadcast_enabled;
-       bool disable_broadcast =  ea->broadcast_enabled && !broadcast_enabled;
-
-       if (enable_promisc) {
-               mlx5e_add_eth_addr_rule(priv, &ea->promisc, MLX5E_PROMISC);
-               if (!priv->vlan.filter_disabled)
-                       mlx5e_add_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_ANY_VID,
-                                           0);
-       }
-       if (enable_allmulti)
-               mlx5e_add_eth_addr_rule(priv, &ea->allmulti, MLX5E_ALLMULTI);
-       if (enable_broadcast)
-               mlx5e_add_eth_addr_rule(priv, &ea->broadcast, MLX5E_FULLMATCH);
-
-       mlx5e_handle_netdev_addr(priv);
-
-       if (disable_broadcast)
-               mlx5e_del_eth_addr_from_flow_table(priv, &ea->broadcast);
-       if (disable_allmulti)
-               mlx5e_del_eth_addr_from_flow_table(priv, &ea->allmulti);
-       if (disable_promisc) {
-               if (!priv->vlan.filter_disabled)
-                       mlx5e_del_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_ANY_VID,
-                                           0);
-               mlx5e_del_eth_addr_from_flow_table(priv, &ea->promisc);
-       }
-
-       ea->promisc_enabled   = promisc_enabled;
-       ea->allmulti_enabled  = allmulti_enabled;
-       ea->broadcast_enabled = broadcast_enabled;
-
-       mlx5e_vport_context_update(priv);
-}
-
-static void mlx5e_destroy_groups(struct mlx5e_flow_table *ft)
-{
-       int i;
-
-       for (i = ft->num_groups - 1; i >= 0; i--) {
-               if (!IS_ERR_OR_NULL(ft->g[i]))
-                       mlx5_destroy_flow_group(ft->g[i]);
-               ft->g[i] = NULL;
-       }
-       ft->num_groups = 0;
-}
-
-void mlx5e_init_eth_addr(struct mlx5e_priv *priv)
-{
-       ether_addr_copy(priv->eth_addr.broadcast.addr, priv->netdev->broadcast);
-}
-
-#define MLX5E_MAIN_GROUP0_SIZE BIT(3)
-#define MLX5E_MAIN_GROUP1_SIZE BIT(1)
-#define MLX5E_MAIN_GROUP2_SIZE BIT(0)
-#define MLX5E_MAIN_GROUP3_SIZE BIT(14)
-#define MLX5E_MAIN_GROUP4_SIZE BIT(13)
-#define MLX5E_MAIN_GROUP5_SIZE BIT(11)
-#define MLX5E_MAIN_GROUP6_SIZE BIT(2)
-#define MLX5E_MAIN_GROUP7_SIZE BIT(1)
-#define MLX5E_MAIN_GROUP8_SIZE BIT(0)
-#define MLX5E_MAIN_TABLE_SIZE  (MLX5E_MAIN_GROUP0_SIZE +\
-                                MLX5E_MAIN_GROUP1_SIZE +\
-                                MLX5E_MAIN_GROUP2_SIZE +\
-                                MLX5E_MAIN_GROUP3_SIZE +\
-                                MLX5E_MAIN_GROUP4_SIZE +\
-                                MLX5E_MAIN_GROUP5_SIZE +\
-                                MLX5E_MAIN_GROUP6_SIZE +\
-                                MLX5E_MAIN_GROUP7_SIZE +\
-                                MLX5E_MAIN_GROUP8_SIZE)
-
-static int __mlx5e_create_main_groups(struct mlx5e_flow_table *ft, u32 *in,
-                                     int inlen)
-{
-       u8 *mc = MLX5_ADDR_OF(create_flow_group_in, in, match_criteria);
-       u8 *dmac = MLX5_ADDR_OF(create_flow_group_in, in,
-                               match_criteria.outer_headers.dmac_47_16);
-       int err;
-       int ix = 0;
-
-       memset(in, 0, inlen);
-       MLX5_SET_CFG(in, match_criteria_enable, MLX5_MATCH_OUTER_HEADERS);
-       MLX5_SET_TO_ONES(fte_match_param, mc, outer_headers.ethertype);
-       MLX5_SET_TO_ONES(fte_match_param, mc, outer_headers.ip_protocol);
-       MLX5_SET_CFG(in, start_flow_index, ix);
-       ix += MLX5E_MAIN_GROUP0_SIZE;
-       MLX5_SET_CFG(in, end_flow_index, ix - 1);
-       ft->g[ft->num_groups] = mlx5_create_flow_group(ft->t, in);
-       if (IS_ERR(ft->g[ft->num_groups]))
-               goto err_destroy_groups;
-       ft->num_groups++;
-
-       memset(in, 0, inlen);
-       MLX5_SET_CFG(in, match_criteria_enable, MLX5_MATCH_OUTER_HEADERS);
-       MLX5_SET_TO_ONES(fte_match_param, mc, outer_headers.ethertype);
-       MLX5_SET_CFG(in, start_flow_index, ix);
-       ix += MLX5E_MAIN_GROUP1_SIZE;
-       MLX5_SET_CFG(in, end_flow_index, ix - 1);
-       ft->g[ft->num_groups] = mlx5_create_flow_group(ft->t, in);
-       if (IS_ERR(ft->g[ft->num_groups]))
-               goto err_destroy_groups;
-       ft->num_groups++;
-
-       memset(in, 0, inlen);
-       MLX5_SET_CFG(in, start_flow_index, ix);
-       ix += MLX5E_MAIN_GROUP2_SIZE;
-       MLX5_SET_CFG(in, end_flow_index, ix - 1);
-       ft->g[ft->num_groups] = mlx5_create_flow_group(ft->t, in);
-       if (IS_ERR(ft->g[ft->num_groups]))
-               goto err_destroy_groups;
-       ft->num_groups++;
-
-       memset(in, 0, inlen);
-       MLX5_SET_CFG(in, match_criteria_enable, MLX5_MATCH_OUTER_HEADERS);
-       MLX5_SET_TO_ONES(fte_match_param, mc, outer_headers.ethertype);
-       MLX5_SET_TO_ONES(fte_match_param, mc, outer_headers.ip_protocol);
-       eth_broadcast_addr(dmac);
-       MLX5_SET_CFG(in, start_flow_index, ix);
-       ix += MLX5E_MAIN_GROUP3_SIZE;
-       MLX5_SET_CFG(in, end_flow_index, ix - 1);
-       ft->g[ft->num_groups] = mlx5_create_flow_group(ft->t, in);
-       if (IS_ERR(ft->g[ft->num_groups]))
-               goto err_destroy_groups;
-       ft->num_groups++;
-
-       memset(in, 0, inlen);
-       MLX5_SET_CFG(in, match_criteria_enable, MLX5_MATCH_OUTER_HEADERS);
-       MLX5_SET_TO_ONES(fte_match_param, mc, outer_headers.ethertype);
-       eth_broadcast_addr(dmac);
-       MLX5_SET_CFG(in, start_flow_index, ix);
-       ix += MLX5E_MAIN_GROUP4_SIZE;
-       MLX5_SET_CFG(in, end_flow_index, ix - 1);
-       ft->g[ft->num_groups] = mlx5_create_flow_group(ft->t, in);
-       if (IS_ERR(ft->g[ft->num_groups]))
-               goto err_destroy_groups;
-       ft->num_groups++;
-
-       memset(in, 0, inlen);
-       MLX5_SET_CFG(in, match_criteria_enable, MLX5_MATCH_OUTER_HEADERS);
-       eth_broadcast_addr(dmac);
-       MLX5_SET_CFG(in, start_flow_index, ix);
-       ix += MLX5E_MAIN_GROUP5_SIZE;
-       MLX5_SET_CFG(in, end_flow_index, ix - 1);
-       ft->g[ft->num_groups] = mlx5_create_flow_group(ft->t, in);
-       if (IS_ERR(ft->g[ft->num_groups]))
-               goto err_destroy_groups;
-       ft->num_groups++;
-
-       memset(in, 0, inlen);
-       MLX5_SET_CFG(in, match_criteria_enable, MLX5_MATCH_OUTER_HEADERS);
-       MLX5_SET_TO_ONES(fte_match_param, mc, outer_headers.ethertype);
-       MLX5_SET_TO_ONES(fte_match_param, mc, outer_headers.ip_protocol);
-       dmac[0] = 0x01;
-       MLX5_SET_CFG(in, start_flow_index, ix);
-       ix += MLX5E_MAIN_GROUP6_SIZE;
-       MLX5_SET_CFG(in, end_flow_index, ix - 1);
-       ft->g[ft->num_groups] = mlx5_create_flow_group(ft->t, in);
-       if (IS_ERR(ft->g[ft->num_groups]))
-               goto err_destroy_groups;
-       ft->num_groups++;
-
-       memset(in, 0, inlen);
-       MLX5_SET_CFG(in, match_criteria_enable, MLX5_MATCH_OUTER_HEADERS);
-       MLX5_SET_TO_ONES(fte_match_param, mc, outer_headers.ethertype);
-       dmac[0] = 0x01;
-       MLX5_SET_CFG(in, start_flow_index, ix);
-       ix += MLX5E_MAIN_GROUP7_SIZE;
-       MLX5_SET_CFG(in, end_flow_index, ix - 1);
-       ft->g[ft->num_groups] = mlx5_create_flow_group(ft->t, in);
-       if (IS_ERR(ft->g[ft->num_groups]))
-               goto err_destroy_groups;
-       ft->num_groups++;
-
-       memset(in, 0, inlen);
-       MLX5_SET_CFG(in, match_criteria_enable, MLX5_MATCH_OUTER_HEADERS);
-       dmac[0] = 0x01;
-       MLX5_SET_CFG(in, start_flow_index, ix);
-       ix += MLX5E_MAIN_GROUP8_SIZE;
-       MLX5_SET_CFG(in, end_flow_index, ix - 1);
-       ft->g[ft->num_groups] = mlx5_create_flow_group(ft->t, in);
-       if (IS_ERR(ft->g[ft->num_groups]))
-               goto err_destroy_groups;
-       ft->num_groups++;
-
-       return 0;
-
-err_destroy_groups:
-       err = PTR_ERR(ft->g[ft->num_groups]);
-       ft->g[ft->num_groups] = NULL;
-       mlx5e_destroy_groups(ft);
-
-       return err;
-}
-
-static int mlx5e_create_main_groups(struct mlx5e_flow_table *ft)
-{
-       u32 *in;
-       int inlen = MLX5_ST_SZ_BYTES(create_flow_group_in);
-       int err;
-
-       in = mlx5_vzalloc(inlen);
-       if (!in)
-               return -ENOMEM;
-
-       err = __mlx5e_create_main_groups(ft, in, inlen);
-
-       kvfree(in);
-       return err;
-}
-
-static int mlx5e_create_main_flow_table(struct mlx5e_priv *priv)
-{
-       struct mlx5e_flow_table *ft = &priv->fts.main;
-       int err;
-
-       ft->num_groups = 0;
-       ft->t = mlx5_create_flow_table(priv->fts.ns, 0, MLX5E_MAIN_TABLE_SIZE);
-
-       if (IS_ERR(ft->t)) {
-               err = PTR_ERR(ft->t);
-               ft->t = NULL;
-               return err;
-       }
-       ft->g = kcalloc(MLX5E_NUM_MAIN_GROUPS, sizeof(*ft->g), GFP_KERNEL);
-       if (!ft->g) {
-               err = -ENOMEM;
-               goto err_destroy_main_flow_table;
-       }
-
-       err = mlx5e_create_main_groups(ft);
-       if (err)
-               goto err_free_g;
-       return 0;
-
-err_free_g:
-       kfree(ft->g);
-
-err_destroy_main_flow_table:
-       mlx5_destroy_flow_table(ft->t);
-       ft->t = NULL;
-
-       return err;
-}
-
-static void mlx5e_destroy_flow_table(struct mlx5e_flow_table *ft)
-{
-       mlx5e_destroy_groups(ft);
-       kfree(ft->g);
-       mlx5_destroy_flow_table(ft->t);
-       ft->t = NULL;
-}
-
-static void mlx5e_destroy_main_flow_table(struct mlx5e_priv *priv)
-{
-       mlx5e_destroy_flow_table(&priv->fts.main);
-}
-
-#define MLX5E_NUM_VLAN_GROUPS  2
-#define MLX5E_VLAN_GROUP0_SIZE BIT(12)
-#define MLX5E_VLAN_GROUP1_SIZE BIT(1)
-#define MLX5E_VLAN_TABLE_SIZE  (MLX5E_VLAN_GROUP0_SIZE +\
-                                MLX5E_VLAN_GROUP1_SIZE)
-
-static int __mlx5e_create_vlan_groups(struct mlx5e_flow_table *ft, u32 *in,
-                                     int inlen)
-{
-       int err;
-       int ix = 0;
-       u8 *mc = MLX5_ADDR_OF(create_flow_group_in, in, match_criteria);
-
-       memset(in, 0, inlen);
-       MLX5_SET_CFG(in, match_criteria_enable, MLX5_MATCH_OUTER_HEADERS);
-       MLX5_SET_TO_ONES(fte_match_param, mc, outer_headers.vlan_tag);
-       MLX5_SET_TO_ONES(fte_match_param, mc, outer_headers.first_vid);
-       MLX5_SET_CFG(in, start_flow_index, ix);
-       ix += MLX5E_VLAN_GROUP0_SIZE;
-       MLX5_SET_CFG(in, end_flow_index, ix - 1);
-       ft->g[ft->num_groups] = mlx5_create_flow_group(ft->t, in);
-       if (IS_ERR(ft->g[ft->num_groups]))
-               goto err_destroy_groups;
-       ft->num_groups++;
-
-       memset(in, 0, inlen);
-       MLX5_SET_CFG(in, match_criteria_enable, MLX5_MATCH_OUTER_HEADERS);
-       MLX5_SET_TO_ONES(fte_match_param, mc, outer_headers.vlan_tag);
-       MLX5_SET_CFG(in, start_flow_index, ix);
-       ix += MLX5E_VLAN_GROUP1_SIZE;
-       MLX5_SET_CFG(in, end_flow_index, ix - 1);
-       ft->g[ft->num_groups] = mlx5_create_flow_group(ft->t, in);
-       if (IS_ERR(ft->g[ft->num_groups]))
-               goto err_destroy_groups;
-       ft->num_groups++;
-
-       return 0;
-
-err_destroy_groups:
-       err = PTR_ERR(ft->g[ft->num_groups]);
-       ft->g[ft->num_groups] = NULL;
-       mlx5e_destroy_groups(ft);
-
-       return err;
-}
-
-static int mlx5e_create_vlan_groups(struct mlx5e_flow_table *ft)
-{
-       u32 *in;
-       int inlen = MLX5_ST_SZ_BYTES(create_flow_group_in);
-       int err;
-
-       in = mlx5_vzalloc(inlen);
-       if (!in)
-               return -ENOMEM;
-
-       err = __mlx5e_create_vlan_groups(ft, in, inlen);
-
-       kvfree(in);
-       return err;
-}
-
-static int mlx5e_create_vlan_flow_table(struct mlx5e_priv *priv)
-{
-       struct mlx5e_flow_table *ft = &priv->fts.vlan;
-       int err;
-
-       ft->num_groups = 0;
-       ft->t = mlx5_create_flow_table(priv->fts.ns, 0, MLX5E_VLAN_TABLE_SIZE);
-
-       if (IS_ERR(ft->t)) {
-               err = PTR_ERR(ft->t);
-               ft->t = NULL;
-               return err;
-       }
-       ft->g = kcalloc(MLX5E_NUM_VLAN_GROUPS, sizeof(*ft->g), GFP_KERNEL);
-       if (!ft->g) {
-               err = -ENOMEM;
-               goto err_destroy_vlan_flow_table;
-       }
-
-       err = mlx5e_create_vlan_groups(ft);
-       if (err)
-               goto err_free_g;
-
-       return 0;
-
-err_free_g:
-       kfree(ft->g);
-
-err_destroy_vlan_flow_table:
-       mlx5_destroy_flow_table(ft->t);
-       ft->t = NULL;
-
-       return err;
-}
-
-static void mlx5e_destroy_vlan_flow_table(struct mlx5e_priv *priv)
-{
-       mlx5e_destroy_flow_table(&priv->fts.vlan);
-}
-
-int mlx5e_create_flow_tables(struct mlx5e_priv *priv)
-{
-       int err;
-
-       priv->fts.ns = mlx5_get_flow_namespace(priv->mdev,
-                                              MLX5_FLOW_NAMESPACE_KERNEL);
-
-       if (!priv->fts.ns)
-               return -EINVAL;
-
-       err = mlx5e_create_vlan_flow_table(priv);
-       if (err)
-               return err;
-
-       err = mlx5e_create_main_flow_table(priv);
-       if (err)
-               goto err_destroy_vlan_flow_table;
-
-       err = mlx5e_add_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_UNTAGGED, 0);
-       if (err)
-               goto err_destroy_main_flow_table;
-
-       return 0;
-
-err_destroy_main_flow_table:
-       mlx5e_destroy_main_flow_table(priv);
-err_destroy_vlan_flow_table:
-       mlx5e_destroy_vlan_flow_table(priv);
-
-       return err;
-}
-
-void mlx5e_destroy_flow_tables(struct mlx5e_priv *priv)
-{
-       mlx5e_del_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_UNTAGGED, 0);
-       mlx5e_destroy_main_flow_table(priv);
-       mlx5e_destroy_vlan_flow_table(priv);
-}
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c b/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
new file mode 100644 (file)
index 0000000..80d81ab
--- /dev/null
@@ -0,0 +1,1224 @@
+/*
+ * Copyright (c) 2015, Mellanox Technologies. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <linux/list.h>
+#include <linux/ip.h>
+#include <linux/ipv6.h>
+#include <linux/tcp.h>
+#include <linux/mlx5/fs.h>
+#include "en.h"
+
+#define MLX5_SET_CFG(p, f, v) MLX5_SET(create_flow_group_in, p, f, v)
+
+enum {
+       MLX5E_FULLMATCH = 0,
+       MLX5E_ALLMULTI  = 1,
+       MLX5E_PROMISC   = 2,
+};
+
+enum {
+       MLX5E_UC        = 0,
+       MLX5E_MC_IPV4   = 1,
+       MLX5E_MC_IPV6   = 2,
+       MLX5E_MC_OTHER  = 3,
+};
+
+enum {
+       MLX5E_ACTION_NONE = 0,
+       MLX5E_ACTION_ADD  = 1,
+       MLX5E_ACTION_DEL  = 2,
+};
+
+struct mlx5e_eth_addr_hash_node {
+       struct hlist_node          hlist;
+       u8                         action;
+       struct mlx5e_eth_addr_info ai;
+};
+
+static inline int mlx5e_hash_eth_addr(u8 *addr)
+{
+       return addr[5];
+}
+
+static void mlx5e_add_eth_addr_to_hash(struct hlist_head *hash, u8 *addr)
+{
+       struct mlx5e_eth_addr_hash_node *hn;
+       int ix = mlx5e_hash_eth_addr(addr);
+       int found = 0;
+
+       hlist_for_each_entry(hn, &hash[ix], hlist)
+               if (ether_addr_equal_64bits(hn->ai.addr, addr)) {
+                       found = 1;
+                       break;
+               }
+
+       if (found) {
+               hn->action = MLX5E_ACTION_NONE;
+               return;
+       }
+
+       hn = kzalloc(sizeof(*hn), GFP_ATOMIC);
+       if (!hn)
+               return;
+
+       ether_addr_copy(hn->ai.addr, addr);
+       hn->action = MLX5E_ACTION_ADD;
+
+       hlist_add_head(&hn->hlist, &hash[ix]);
+}
+
+static void mlx5e_del_eth_addr_from_hash(struct mlx5e_eth_addr_hash_node *hn)
+{
+       hlist_del(&hn->hlist);
+       kfree(hn);
+}
+
+static void mlx5e_del_eth_addr_from_flow_table(struct mlx5e_priv *priv,
+                                              struct mlx5e_eth_addr_info *ai)
+{
+       if (ai->tt_vec & BIT(MLX5E_TT_IPV6_IPSEC_ESP))
+               mlx5_del_flow_rule(ai->ft_rule[MLX5E_TT_IPV6_IPSEC_ESP]);
+
+       if (ai->tt_vec & BIT(MLX5E_TT_IPV4_IPSEC_ESP))
+               mlx5_del_flow_rule(ai->ft_rule[MLX5E_TT_IPV4_IPSEC_ESP]);
+
+       if (ai->tt_vec & BIT(MLX5E_TT_IPV6_IPSEC_AH))
+               mlx5_del_flow_rule(ai->ft_rule[MLX5E_TT_IPV6_IPSEC_AH]);
+
+       if (ai->tt_vec & BIT(MLX5E_TT_IPV4_IPSEC_AH))
+               mlx5_del_flow_rule(ai->ft_rule[MLX5E_TT_IPV4_IPSEC_AH]);
+
+       if (ai->tt_vec & BIT(MLX5E_TT_IPV6_TCP))
+               mlx5_del_flow_rule(ai->ft_rule[MLX5E_TT_IPV6_TCP]);
+
+       if (ai->tt_vec & BIT(MLX5E_TT_IPV4_TCP))
+               mlx5_del_flow_rule(ai->ft_rule[MLX5E_TT_IPV4_TCP]);
+
+       if (ai->tt_vec & BIT(MLX5E_TT_IPV6_UDP))
+               mlx5_del_flow_rule(ai->ft_rule[MLX5E_TT_IPV6_UDP]);
+
+       if (ai->tt_vec & BIT(MLX5E_TT_IPV4_UDP))
+               mlx5_del_flow_rule(ai->ft_rule[MLX5E_TT_IPV4_UDP]);
+
+       if (ai->tt_vec & BIT(MLX5E_TT_IPV6))
+               mlx5_del_flow_rule(ai->ft_rule[MLX5E_TT_IPV6]);
+
+       if (ai->tt_vec & BIT(MLX5E_TT_IPV4))
+               mlx5_del_flow_rule(ai->ft_rule[MLX5E_TT_IPV4]);
+
+       if (ai->tt_vec & BIT(MLX5E_TT_ANY))
+               mlx5_del_flow_rule(ai->ft_rule[MLX5E_TT_ANY]);
+}
+
+static int mlx5e_get_eth_addr_type(u8 *addr)
+{
+       if (is_unicast_ether_addr(addr))
+               return MLX5E_UC;
+
+       if ((addr[0] == 0x01) &&
+           (addr[1] == 0x00) &&
+           (addr[2] == 0x5e) &&
+          !(addr[3] &  0x80))
+               return MLX5E_MC_IPV4;
+
+       if ((addr[0] == 0x33) &&
+           (addr[1] == 0x33))
+               return MLX5E_MC_IPV6;
+
+       return MLX5E_MC_OTHER;
+}
+
+static u32 mlx5e_get_tt_vec(struct mlx5e_eth_addr_info *ai, int type)
+{
+       int eth_addr_type;
+       u32 ret;
+
+       switch (type) {
+       case MLX5E_FULLMATCH:
+               eth_addr_type = mlx5e_get_eth_addr_type(ai->addr);
+               switch (eth_addr_type) {
+               case MLX5E_UC:
+                       ret =
+                               BIT(MLX5E_TT_IPV4_TCP)       |
+                               BIT(MLX5E_TT_IPV6_TCP)       |
+                               BIT(MLX5E_TT_IPV4_UDP)       |
+                               BIT(MLX5E_TT_IPV6_UDP)       |
+                               BIT(MLX5E_TT_IPV4_IPSEC_AH)  |
+                               BIT(MLX5E_TT_IPV6_IPSEC_AH)  |
+                               BIT(MLX5E_TT_IPV4_IPSEC_ESP) |
+                               BIT(MLX5E_TT_IPV6_IPSEC_ESP) |
+                               BIT(MLX5E_TT_IPV4)           |
+                               BIT(MLX5E_TT_IPV6)           |
+                               BIT(MLX5E_TT_ANY)            |
+                               0;
+                       break;
+
+               case MLX5E_MC_IPV4:
+                       ret =
+                               BIT(MLX5E_TT_IPV4_UDP)       |
+                               BIT(MLX5E_TT_IPV4)           |
+                               0;
+                       break;
+
+               case MLX5E_MC_IPV6:
+                       ret =
+                               BIT(MLX5E_TT_IPV6_UDP)       |
+                               BIT(MLX5E_TT_IPV6)           |
+                               0;
+                       break;
+
+               case MLX5E_MC_OTHER:
+                       ret =
+                               BIT(MLX5E_TT_ANY)            |
+                               0;
+                       break;
+               }
+
+               break;
+
+       case MLX5E_ALLMULTI:
+               ret =
+                       BIT(MLX5E_TT_IPV4_UDP) |
+                       BIT(MLX5E_TT_IPV6_UDP) |
+                       BIT(MLX5E_TT_IPV4)     |
+                       BIT(MLX5E_TT_IPV6)     |
+                       BIT(MLX5E_TT_ANY)      |
+                       0;
+               break;
+
+       default: /* MLX5E_PROMISC */
+               ret =
+                       BIT(MLX5E_TT_IPV4_TCP)       |
+                       BIT(MLX5E_TT_IPV6_TCP)       |
+                       BIT(MLX5E_TT_IPV4_UDP)       |
+                       BIT(MLX5E_TT_IPV6_UDP)       |
+                       BIT(MLX5E_TT_IPV4_IPSEC_AH)  |
+                       BIT(MLX5E_TT_IPV6_IPSEC_AH)  |
+                       BIT(MLX5E_TT_IPV4_IPSEC_ESP) |
+                       BIT(MLX5E_TT_IPV6_IPSEC_ESP) |
+                       BIT(MLX5E_TT_IPV4)           |
+                       BIT(MLX5E_TT_IPV6)           |
+                       BIT(MLX5E_TT_ANY)            |
+                       0;
+               break;
+       }
+
+       return ret;
+}
+
+static int __mlx5e_add_eth_addr_rule(struct mlx5e_priv *priv,
+                                    struct mlx5e_eth_addr_info *ai,
+                                    int type, u32 *mc, u32 *mv)
+{
+       struct mlx5_flow_destination dest;
+       u8 match_criteria_enable = 0;
+       struct mlx5_flow_rule **rule_p;
+       struct mlx5_flow_table *ft = priv->fts.main.t;
+       u8 *mc_dmac = MLX5_ADDR_OF(fte_match_param, mc,
+                                  outer_headers.dmac_47_16);
+       u8 *mv_dmac = MLX5_ADDR_OF(fte_match_param, mv,
+                                  outer_headers.dmac_47_16);
+       u32 *tirn = priv->tirn;
+       u32 tt_vec;
+       int err = 0;
+
+       dest.type = MLX5_FLOW_DESTINATION_TYPE_TIR;
+
+       switch (type) {
+       case MLX5E_FULLMATCH:
+               match_criteria_enable = MLX5_MATCH_OUTER_HEADERS;
+               eth_broadcast_addr(mc_dmac);
+               ether_addr_copy(mv_dmac, ai->addr);
+               break;
+
+       case MLX5E_ALLMULTI:
+               match_criteria_enable = MLX5_MATCH_OUTER_HEADERS;
+               mc_dmac[0] = 0x01;
+               mv_dmac[0] = 0x01;
+               break;
+
+       case MLX5E_PROMISC:
+               break;
+       }
+
+       tt_vec = mlx5e_get_tt_vec(ai, type);
+
+       if (tt_vec & BIT(MLX5E_TT_ANY)) {
+               rule_p = &ai->ft_rule[MLX5E_TT_ANY];
+               dest.tir_num = tirn[MLX5E_TT_ANY];
+               *rule_p = mlx5_add_flow_rule(ft, match_criteria_enable, mc, mv,
+                                            MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,
+                                            MLX5_FS_DEFAULT_FLOW_TAG, &dest);
+               if (IS_ERR_OR_NULL(*rule_p))
+                       goto err_del_ai;
+               ai->tt_vec |= BIT(MLX5E_TT_ANY);
+       }
+
+       match_criteria_enable = MLX5_MATCH_OUTER_HEADERS;
+       MLX5_SET_TO_ONES(fte_match_param, mc, outer_headers.ethertype);
+
+       if (tt_vec & BIT(MLX5E_TT_IPV4)) {
+               rule_p = &ai->ft_rule[MLX5E_TT_IPV4];
+               dest.tir_num = tirn[MLX5E_TT_IPV4];
+               MLX5_SET(fte_match_param, mv, outer_headers.ethertype,
+                        ETH_P_IP);
+               *rule_p = mlx5_add_flow_rule(ft, match_criteria_enable, mc, mv,
+                                            MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,
+                                            MLX5_FS_DEFAULT_FLOW_TAG, &dest);
+               if (IS_ERR_OR_NULL(*rule_p))
+                       goto err_del_ai;
+               ai->tt_vec |= BIT(MLX5E_TT_IPV4);
+       }
+
+       if (tt_vec & BIT(MLX5E_TT_IPV6)) {
+               rule_p = &ai->ft_rule[MLX5E_TT_IPV6];
+               dest.tir_num = tirn[MLX5E_TT_IPV6];
+               MLX5_SET(fte_match_param, mv, outer_headers.ethertype,
+                        ETH_P_IPV6);
+               *rule_p = mlx5_add_flow_rule(ft, match_criteria_enable, mc, mv,
+                                            MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,
+                                            MLX5_FS_DEFAULT_FLOW_TAG, &dest);
+               if (IS_ERR_OR_NULL(*rule_p))
+                       goto err_del_ai;
+               ai->tt_vec |= BIT(MLX5E_TT_IPV6);
+       }
+
+       MLX5_SET_TO_ONES(fte_match_param, mc, outer_headers.ip_protocol);
+       MLX5_SET(fte_match_param, mv, outer_headers.ip_protocol, IPPROTO_UDP);
+
+       if (tt_vec & BIT(MLX5E_TT_IPV4_UDP)) {
+               rule_p = &ai->ft_rule[MLX5E_TT_IPV4_UDP];
+               dest.tir_num = tirn[MLX5E_TT_IPV4_UDP];
+               MLX5_SET(fte_match_param, mv, outer_headers.ethertype,
+                        ETH_P_IP);
+               *rule_p = mlx5_add_flow_rule(ft, match_criteria_enable, mc, mv,
+                                            MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,
+                                            MLX5_FS_DEFAULT_FLOW_TAG, &dest);
+               if (IS_ERR_OR_NULL(*rule_p))
+                       goto err_del_ai;
+               ai->tt_vec |= BIT(MLX5E_TT_IPV4_UDP);
+       }
+
+       if (tt_vec & BIT(MLX5E_TT_IPV6_UDP)) {
+               rule_p = &ai->ft_rule[MLX5E_TT_IPV6_UDP];
+               dest.tir_num = tirn[MLX5E_TT_IPV6_UDP];
+               MLX5_SET(fte_match_param, mv, outer_headers.ethertype,
+                        ETH_P_IPV6);
+               *rule_p = mlx5_add_flow_rule(ft, match_criteria_enable, mc, mv,
+                                            MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,
+                                            MLX5_FS_DEFAULT_FLOW_TAG, &dest);
+               if (IS_ERR_OR_NULL(*rule_p))
+                       goto err_del_ai;
+               ai->tt_vec |= BIT(MLX5E_TT_IPV6_UDP);
+       }
+
+       MLX5_SET(fte_match_param, mv, outer_headers.ip_protocol, IPPROTO_TCP);
+
+       if (tt_vec & BIT(MLX5E_TT_IPV4_TCP)) {
+               rule_p = &ai->ft_rule[MLX5E_TT_IPV4_TCP];
+               dest.tir_num = tirn[MLX5E_TT_IPV4_TCP];
+               MLX5_SET(fte_match_param, mv, outer_headers.ethertype,
+                        ETH_P_IP);
+               *rule_p = mlx5_add_flow_rule(ft, match_criteria_enable, mc, mv,
+                                            MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,
+                                            MLX5_FS_DEFAULT_FLOW_TAG, &dest);
+               if (IS_ERR_OR_NULL(*rule_p))
+                       goto err_del_ai;
+               ai->tt_vec |= BIT(MLX5E_TT_IPV4_TCP);
+       }
+
+       if (tt_vec & BIT(MLX5E_TT_IPV6_TCP)) {
+               rule_p = &ai->ft_rule[MLX5E_TT_IPV6_TCP];
+               dest.tir_num = tirn[MLX5E_TT_IPV6_TCP];
+               MLX5_SET(fte_match_param, mv, outer_headers.ethertype,
+                        ETH_P_IPV6);
+               *rule_p = mlx5_add_flow_rule(ft, match_criteria_enable, mc, mv,
+                                            MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,
+                                            MLX5_FS_DEFAULT_FLOW_TAG, &dest);
+               if (IS_ERR_OR_NULL(*rule_p))
+                       goto err_del_ai;
+
+               ai->tt_vec |= BIT(MLX5E_TT_IPV6_TCP);
+       }
+
+       MLX5_SET(fte_match_param, mv, outer_headers.ip_protocol, IPPROTO_AH);
+
+       if (tt_vec & BIT(MLX5E_TT_IPV4_IPSEC_AH)) {
+               rule_p = &ai->ft_rule[MLX5E_TT_IPV4_IPSEC_AH];
+               dest.tir_num = tirn[MLX5E_TT_IPV4_IPSEC_AH];
+               MLX5_SET(fte_match_param, mv, outer_headers.ethertype,
+                        ETH_P_IP);
+               *rule_p = mlx5_add_flow_rule(ft, match_criteria_enable, mc, mv,
+                                            MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,
+                                            MLX5_FS_DEFAULT_FLOW_TAG, &dest);
+               if (IS_ERR_OR_NULL(*rule_p))
+                       goto err_del_ai;
+               ai->tt_vec |= BIT(MLX5E_TT_IPV4_IPSEC_AH);
+       }
+
+       if (tt_vec & BIT(MLX5E_TT_IPV6_IPSEC_AH)) {
+               rule_p = &ai->ft_rule[MLX5E_TT_IPV6_IPSEC_AH];
+               dest.tir_num = tirn[MLX5E_TT_IPV6_IPSEC_AH];
+               MLX5_SET(fte_match_param, mv, outer_headers.ethertype,
+                        ETH_P_IPV6);
+               *rule_p = mlx5_add_flow_rule(ft, match_criteria_enable, mc, mv,
+                                            MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,
+                                            MLX5_FS_DEFAULT_FLOW_TAG, &dest);
+               if (IS_ERR_OR_NULL(*rule_p))
+                       goto err_del_ai;
+               ai->tt_vec |= BIT(MLX5E_TT_IPV6_IPSEC_AH);
+       }
+
+       MLX5_SET(fte_match_param, mv, outer_headers.ip_protocol, IPPROTO_ESP);
+
+       if (tt_vec & BIT(MLX5E_TT_IPV4_IPSEC_ESP)) {
+               rule_p = &ai->ft_rule[MLX5E_TT_IPV4_IPSEC_ESP];
+               dest.tir_num = tirn[MLX5E_TT_IPV4_IPSEC_ESP];
+               MLX5_SET(fte_match_param, mv, outer_headers.ethertype,
+                        ETH_P_IP);
+               *rule_p = mlx5_add_flow_rule(ft, match_criteria_enable, mc, mv,
+                                            MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,
+                                            MLX5_FS_DEFAULT_FLOW_TAG, &dest);
+               if (IS_ERR_OR_NULL(*rule_p))
+                       goto err_del_ai;
+               ai->tt_vec |= BIT(MLX5E_TT_IPV4_IPSEC_ESP);
+       }
+
+       if (tt_vec & BIT(MLX5E_TT_IPV6_IPSEC_ESP)) {
+               rule_p = &ai->ft_rule[MLX5E_TT_IPV6_IPSEC_ESP];
+               dest.tir_num = tirn[MLX5E_TT_IPV6_IPSEC_ESP];
+               MLX5_SET(fte_match_param, mv, outer_headers.ethertype,
+                        ETH_P_IPV6);
+               *rule_p = mlx5_add_flow_rule(ft, match_criteria_enable, mc, mv,
+                                            MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,
+                                            MLX5_FS_DEFAULT_FLOW_TAG, &dest);
+               if (IS_ERR_OR_NULL(*rule_p))
+                       goto err_del_ai;
+               ai->tt_vec |= BIT(MLX5E_TT_IPV6_IPSEC_ESP);
+       }
+
+       return 0;
+
+err_del_ai:
+       err = PTR_ERR(*rule_p);
+       *rule_p = NULL;
+       mlx5e_del_eth_addr_from_flow_table(priv, ai);
+
+       return err;
+}
+
+static int mlx5e_add_eth_addr_rule(struct mlx5e_priv *priv,
+                                  struct mlx5e_eth_addr_info *ai, int type)
+{
+       u32 *match_criteria;
+       u32 *match_value;
+       int err = 0;
+
+       match_value     = mlx5_vzalloc(MLX5_ST_SZ_BYTES(fte_match_param));
+       match_criteria  = mlx5_vzalloc(MLX5_ST_SZ_BYTES(fte_match_param));
+       if (!match_value || !match_criteria) {
+               netdev_err(priv->netdev, "%s: alloc failed\n", __func__);
+               err = -ENOMEM;
+               goto add_eth_addr_rule_out;
+       }
+
+       err = __mlx5e_add_eth_addr_rule(priv, ai, type, match_criteria,
+                                       match_value);
+
+add_eth_addr_rule_out:
+       kvfree(match_criteria);
+       kvfree(match_value);
+
+       return err;
+}
+
+static int mlx5e_vport_context_update_vlans(struct mlx5e_priv *priv)
+{
+       struct net_device *ndev = priv->netdev;
+       int max_list_size;
+       int list_size;
+       u16 *vlans;
+       int vlan;
+       int err;
+       int i;
+
+       list_size = 0;
+       for_each_set_bit(vlan, priv->vlan.active_vlans, VLAN_N_VID)
+               list_size++;
+
+       max_list_size = 1 << MLX5_CAP_GEN(priv->mdev, log_max_vlan_list);
+
+       if (list_size > max_list_size) {
+               netdev_warn(ndev,
+                           "netdev vlans list size (%d) > (%d) max vport list size, some vlans will be dropped\n",
+                           list_size, max_list_size);
+               list_size = max_list_size;
+       }
+
+       vlans = kcalloc(list_size, sizeof(*vlans), GFP_KERNEL);
+       if (!vlans)
+               return -ENOMEM;
+
+       i = 0;
+       for_each_set_bit(vlan, priv->vlan.active_vlans, VLAN_N_VID) {
+               if (i >= list_size)
+                       break;
+               vlans[i++] = vlan;
+       }
+
+       err = mlx5_modify_nic_vport_vlans(priv->mdev, vlans, list_size);
+       if (err)
+               netdev_err(ndev, "Failed to modify vport vlans list err(%d)\n",
+                          err);
+
+       kfree(vlans);
+       return err;
+}
+
+enum mlx5e_vlan_rule_type {
+       MLX5E_VLAN_RULE_TYPE_UNTAGGED,
+       MLX5E_VLAN_RULE_TYPE_ANY_VID,
+       MLX5E_VLAN_RULE_TYPE_MATCH_VID,
+};
+
+static int __mlx5e_add_vlan_rule(struct mlx5e_priv *priv,
+                                enum mlx5e_vlan_rule_type rule_type,
+                                u16 vid, u32 *mc, u32 *mv)
+{
+       struct mlx5_flow_table *ft = priv->fts.vlan.t;
+       struct mlx5_flow_destination dest;
+       u8 match_criteria_enable = 0;
+       struct mlx5_flow_rule **rule_p;
+       int err = 0;
+
+       dest.type = MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE;
+       dest.ft = priv->fts.main.t;
+
+       match_criteria_enable = MLX5_MATCH_OUTER_HEADERS;
+       MLX5_SET_TO_ONES(fte_match_param, mc, outer_headers.vlan_tag);
+
+       switch (rule_type) {
+       case MLX5E_VLAN_RULE_TYPE_UNTAGGED:
+               rule_p = &priv->vlan.untagged_rule;
+               break;
+       case MLX5E_VLAN_RULE_TYPE_ANY_VID:
+               rule_p = &priv->vlan.any_vlan_rule;
+               MLX5_SET(fte_match_param, mv, outer_headers.vlan_tag, 1);
+               break;
+       default: /* MLX5E_VLAN_RULE_TYPE_MATCH_VID */
+               rule_p = &priv->vlan.active_vlans_rule[vid];
+               MLX5_SET(fte_match_param, mv, outer_headers.vlan_tag, 1);
+               MLX5_SET_TO_ONES(fte_match_param, mc, outer_headers.first_vid);
+               MLX5_SET(fte_match_param, mv, outer_headers.first_vid, vid);
+               break;
+       }
+
+       *rule_p = mlx5_add_flow_rule(ft, match_criteria_enable, mc, mv,
+                                    MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,
+                                    MLX5_FS_DEFAULT_FLOW_TAG,
+                                    &dest);
+
+       if (IS_ERR(*rule_p)) {
+               err = PTR_ERR(*rule_p);
+               *rule_p = NULL;
+               netdev_err(priv->netdev, "%s: add rule failed\n", __func__);
+       }
+
+       return err;
+}
+
+static int mlx5e_add_vlan_rule(struct mlx5e_priv *priv,
+                              enum mlx5e_vlan_rule_type rule_type, u16 vid)
+{
+       u32 *match_criteria;
+       u32 *match_value;
+       int err = 0;
+
+       match_value     = mlx5_vzalloc(MLX5_ST_SZ_BYTES(fte_match_param));
+       match_criteria  = mlx5_vzalloc(MLX5_ST_SZ_BYTES(fte_match_param));
+       if (!match_value || !match_criteria) {
+               netdev_err(priv->netdev, "%s: alloc failed\n", __func__);
+               err = -ENOMEM;
+               goto add_vlan_rule_out;
+       }
+
+       if (rule_type == MLX5E_VLAN_RULE_TYPE_MATCH_VID)
+               mlx5e_vport_context_update_vlans(priv);
+
+       err = __mlx5e_add_vlan_rule(priv, rule_type, vid, match_criteria,
+                                   match_value);
+
+add_vlan_rule_out:
+       kvfree(match_criteria);
+       kvfree(match_value);
+
+       return err;
+}
+
+static void mlx5e_del_vlan_rule(struct mlx5e_priv *priv,
+                               enum mlx5e_vlan_rule_type rule_type, u16 vid)
+{
+       switch (rule_type) {
+       case MLX5E_VLAN_RULE_TYPE_UNTAGGED:
+               if (priv->vlan.untagged_rule) {
+                       mlx5_del_flow_rule(priv->vlan.untagged_rule);
+                       priv->vlan.untagged_rule = NULL;
+               }
+               break;
+       case MLX5E_VLAN_RULE_TYPE_ANY_VID:
+               if (priv->vlan.any_vlan_rule) {
+                       mlx5_del_flow_rule(priv->vlan.any_vlan_rule);
+                       priv->vlan.any_vlan_rule = NULL;
+               }
+               break;
+       case MLX5E_VLAN_RULE_TYPE_MATCH_VID:
+               mlx5e_vport_context_update_vlans(priv);
+               if (priv->vlan.active_vlans_rule[vid]) {
+                       mlx5_del_flow_rule(priv->vlan.active_vlans_rule[vid]);
+                       priv->vlan.active_vlans_rule[vid] = NULL;
+               }
+               mlx5e_vport_context_update_vlans(priv);
+               break;
+       }
+}
+
+void mlx5e_enable_vlan_filter(struct mlx5e_priv *priv)
+{
+       if (!priv->vlan.filter_disabled)
+               return;
+
+       priv->vlan.filter_disabled = false;
+       if (priv->netdev->flags & IFF_PROMISC)
+               return;
+       mlx5e_del_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_ANY_VID, 0);
+}
+
+void mlx5e_disable_vlan_filter(struct mlx5e_priv *priv)
+{
+       if (priv->vlan.filter_disabled)
+               return;
+
+       priv->vlan.filter_disabled = true;
+       if (priv->netdev->flags & IFF_PROMISC)
+               return;
+       mlx5e_add_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_ANY_VID, 0);
+}
+
+int mlx5e_vlan_rx_add_vid(struct net_device *dev, __always_unused __be16 proto,
+                         u16 vid)
+{
+       struct mlx5e_priv *priv = netdev_priv(dev);
+
+       set_bit(vid, priv->vlan.active_vlans);
+
+       return mlx5e_add_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_MATCH_VID, vid);
+}
+
+int mlx5e_vlan_rx_kill_vid(struct net_device *dev, __always_unused __be16 proto,
+                          u16 vid)
+{
+       struct mlx5e_priv *priv = netdev_priv(dev);
+
+       clear_bit(vid, priv->vlan.active_vlans);
+
+       mlx5e_del_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_MATCH_VID, vid);
+
+       return 0;
+}
+
+#define mlx5e_for_each_hash_node(hn, tmp, hash, i) \
+       for (i = 0; i < MLX5E_ETH_ADDR_HASH_SIZE; i++) \
+               hlist_for_each_entry_safe(hn, tmp, &hash[i], hlist)
+
+static void mlx5e_execute_action(struct mlx5e_priv *priv,
+                                struct mlx5e_eth_addr_hash_node *hn)
+{
+       switch (hn->action) {
+       case MLX5E_ACTION_ADD:
+               mlx5e_add_eth_addr_rule(priv, &hn->ai, MLX5E_FULLMATCH);
+               hn->action = MLX5E_ACTION_NONE;
+               break;
+
+       case MLX5E_ACTION_DEL:
+               mlx5e_del_eth_addr_from_flow_table(priv, &hn->ai);
+               mlx5e_del_eth_addr_from_hash(hn);
+               break;
+       }
+}
+
+static void mlx5e_sync_netdev_addr(struct mlx5e_priv *priv)
+{
+       struct net_device *netdev = priv->netdev;
+       struct netdev_hw_addr *ha;
+
+       netif_addr_lock_bh(netdev);
+
+       mlx5e_add_eth_addr_to_hash(priv->eth_addr.netdev_uc,
+                                  priv->netdev->dev_addr);
+
+       netdev_for_each_uc_addr(ha, netdev)
+               mlx5e_add_eth_addr_to_hash(priv->eth_addr.netdev_uc, ha->addr);
+
+       netdev_for_each_mc_addr(ha, netdev)
+               mlx5e_add_eth_addr_to_hash(priv->eth_addr.netdev_mc, ha->addr);
+
+       netif_addr_unlock_bh(netdev);
+}
+
+static void mlx5e_fill_addr_array(struct mlx5e_priv *priv, int list_type,
+                                 u8 addr_array[][ETH_ALEN], int size)
+{
+       bool is_uc = (list_type == MLX5_NVPRT_LIST_TYPE_UC);
+       struct net_device *ndev = priv->netdev;
+       struct mlx5e_eth_addr_hash_node *hn;
+       struct hlist_head *addr_list;
+       struct hlist_node *tmp;
+       int i = 0;
+       int hi;
+
+       addr_list = is_uc ? priv->eth_addr.netdev_uc : priv->eth_addr.netdev_mc;
+
+       if (is_uc) /* Make sure our own address is pushed first */
+               ether_addr_copy(addr_array[i++], ndev->dev_addr);
+       else if (priv->eth_addr.broadcast_enabled)
+               ether_addr_copy(addr_array[i++], ndev->broadcast);
+
+       mlx5e_for_each_hash_node(hn, tmp, addr_list, hi) {
+               if (ether_addr_equal(ndev->dev_addr, hn->ai.addr))
+                       continue;
+               if (i >= size)
+                       break;
+               ether_addr_copy(addr_array[i++], hn->ai.addr);
+       }
+}
+
+static void mlx5e_vport_context_update_addr_list(struct mlx5e_priv *priv,
+                                                int list_type)
+{
+       bool is_uc = (list_type == MLX5_NVPRT_LIST_TYPE_UC);
+       struct mlx5e_eth_addr_hash_node *hn;
+       u8 (*addr_array)[ETH_ALEN] = NULL;
+       struct hlist_head *addr_list;
+       struct hlist_node *tmp;
+       int max_size;
+       int size;
+       int err;
+       int hi;
+
+       size = is_uc ? 0 : (priv->eth_addr.broadcast_enabled ? 1 : 0);
+       max_size = is_uc ?
+               1 << MLX5_CAP_GEN(priv->mdev, log_max_current_uc_list) :
+               1 << MLX5_CAP_GEN(priv->mdev, log_max_current_mc_list);
+
+       addr_list = is_uc ? priv->eth_addr.netdev_uc : priv->eth_addr.netdev_mc;
+       mlx5e_for_each_hash_node(hn, tmp, addr_list, hi)
+               size++;
+
+       if (size > max_size) {
+               netdev_warn(priv->netdev,
+                           "netdev %s list size (%d) > (%d) max vport list size, some addresses will be dropped\n",
+                           is_uc ? "UC" : "MC", size, max_size);
+               size = max_size;
+       }
+
+       if (size) {
+               addr_array = kcalloc(size, ETH_ALEN, GFP_KERNEL);
+               if (!addr_array) {
+                       err = -ENOMEM;
+                       goto out;
+               }
+               mlx5e_fill_addr_array(priv, list_type, addr_array, size);
+       }
+
+       err = mlx5_modify_nic_vport_mac_list(priv->mdev, list_type, addr_array, size);
+out:
+       if (err)
+               netdev_err(priv->netdev,
+                          "Failed to modify vport %s list err(%d)\n",
+                          is_uc ? "UC" : "MC", err);
+       kfree(addr_array);
+}
+
+static void mlx5e_vport_context_update(struct mlx5e_priv *priv)
+{
+       struct mlx5e_eth_addr_db *ea = &priv->eth_addr;
+
+       mlx5e_vport_context_update_addr_list(priv, MLX5_NVPRT_LIST_TYPE_UC);
+       mlx5e_vport_context_update_addr_list(priv, MLX5_NVPRT_LIST_TYPE_MC);
+       mlx5_modify_nic_vport_promisc(priv->mdev, 0,
+                                     ea->allmulti_enabled,
+                                     ea->promisc_enabled);
+}
+
+static void mlx5e_apply_netdev_addr(struct mlx5e_priv *priv)
+{
+       struct mlx5e_eth_addr_hash_node *hn;
+       struct hlist_node *tmp;
+       int i;
+
+       mlx5e_for_each_hash_node(hn, tmp, priv->eth_addr.netdev_uc, i)
+               mlx5e_execute_action(priv, hn);
+
+       mlx5e_for_each_hash_node(hn, tmp, priv->eth_addr.netdev_mc, i)
+               mlx5e_execute_action(priv, hn);
+}
+
+static void mlx5e_handle_netdev_addr(struct mlx5e_priv *priv)
+{
+       struct mlx5e_eth_addr_hash_node *hn;
+       struct hlist_node *tmp;
+       int i;
+
+       mlx5e_for_each_hash_node(hn, tmp, priv->eth_addr.netdev_uc, i)
+               hn->action = MLX5E_ACTION_DEL;
+       mlx5e_for_each_hash_node(hn, tmp, priv->eth_addr.netdev_mc, i)
+               hn->action = MLX5E_ACTION_DEL;
+
+       if (!test_bit(MLX5E_STATE_DESTROYING, &priv->state))
+               mlx5e_sync_netdev_addr(priv);
+
+       mlx5e_apply_netdev_addr(priv);
+}
+
+void mlx5e_set_rx_mode_work(struct work_struct *work)
+{
+       struct mlx5e_priv *priv = container_of(work, struct mlx5e_priv,
+                                              set_rx_mode_work);
+
+       struct mlx5e_eth_addr_db *ea = &priv->eth_addr;
+       struct net_device *ndev = priv->netdev;
+
+       bool rx_mode_enable   = !test_bit(MLX5E_STATE_DESTROYING, &priv->state);
+       bool promisc_enabled   = rx_mode_enable && (ndev->flags & IFF_PROMISC);
+       bool allmulti_enabled  = rx_mode_enable && (ndev->flags & IFF_ALLMULTI);
+       bool broadcast_enabled = rx_mode_enable;
+
+       bool enable_promisc    = !ea->promisc_enabled   &&  promisc_enabled;
+       bool disable_promisc   =  ea->promisc_enabled   && !promisc_enabled;
+       bool enable_allmulti   = !ea->allmulti_enabled  &&  allmulti_enabled;
+       bool disable_allmulti  =  ea->allmulti_enabled  && !allmulti_enabled;
+       bool enable_broadcast  = !ea->broadcast_enabled &&  broadcast_enabled;
+       bool disable_broadcast =  ea->broadcast_enabled && !broadcast_enabled;
+
+       if (enable_promisc) {
+               mlx5e_add_eth_addr_rule(priv, &ea->promisc, MLX5E_PROMISC);
+               if (!priv->vlan.filter_disabled)
+                       mlx5e_add_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_ANY_VID,
+                                           0);
+       }
+       if (enable_allmulti)
+               mlx5e_add_eth_addr_rule(priv, &ea->allmulti, MLX5E_ALLMULTI);
+       if (enable_broadcast)
+               mlx5e_add_eth_addr_rule(priv, &ea->broadcast, MLX5E_FULLMATCH);
+
+       mlx5e_handle_netdev_addr(priv);
+
+       if (disable_broadcast)
+               mlx5e_del_eth_addr_from_flow_table(priv, &ea->broadcast);
+       if (disable_allmulti)
+               mlx5e_del_eth_addr_from_flow_table(priv, &ea->allmulti);
+       if (disable_promisc) {
+               if (!priv->vlan.filter_disabled)
+                       mlx5e_del_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_ANY_VID,
+                                           0);
+               mlx5e_del_eth_addr_from_flow_table(priv, &ea->promisc);
+       }
+
+       ea->promisc_enabled   = promisc_enabled;
+       ea->allmulti_enabled  = allmulti_enabled;
+       ea->broadcast_enabled = broadcast_enabled;
+
+       mlx5e_vport_context_update(priv);
+}
+
+static void mlx5e_destroy_groups(struct mlx5e_flow_table *ft)
+{
+       int i;
+
+       for (i = ft->num_groups - 1; i >= 0; i--) {
+               if (!IS_ERR_OR_NULL(ft->g[i]))
+                       mlx5_destroy_flow_group(ft->g[i]);
+               ft->g[i] = NULL;
+       }
+       ft->num_groups = 0;
+}
+
+void mlx5e_init_eth_addr(struct mlx5e_priv *priv)
+{
+       ether_addr_copy(priv->eth_addr.broadcast.addr, priv->netdev->broadcast);
+}
+
+#define MLX5E_MAIN_GROUP0_SIZE BIT(3)
+#define MLX5E_MAIN_GROUP1_SIZE BIT(1)
+#define MLX5E_MAIN_GROUP2_SIZE BIT(0)
+#define MLX5E_MAIN_GROUP3_SIZE BIT(14)
+#define MLX5E_MAIN_GROUP4_SIZE BIT(13)
+#define MLX5E_MAIN_GROUP5_SIZE BIT(11)
+#define MLX5E_MAIN_GROUP6_SIZE BIT(2)
+#define MLX5E_MAIN_GROUP7_SIZE BIT(1)
+#define MLX5E_MAIN_GROUP8_SIZE BIT(0)
+#define MLX5E_MAIN_TABLE_SIZE  (MLX5E_MAIN_GROUP0_SIZE +\
+                                MLX5E_MAIN_GROUP1_SIZE +\
+                                MLX5E_MAIN_GROUP2_SIZE +\
+                                MLX5E_MAIN_GROUP3_SIZE +\
+                                MLX5E_MAIN_GROUP4_SIZE +\
+                                MLX5E_MAIN_GROUP5_SIZE +\
+                                MLX5E_MAIN_GROUP6_SIZE +\
+                                MLX5E_MAIN_GROUP7_SIZE +\
+                                MLX5E_MAIN_GROUP8_SIZE)
+
+static int __mlx5e_create_main_groups(struct mlx5e_flow_table *ft, u32 *in,
+                                     int inlen)
+{
+       u8 *mc = MLX5_ADDR_OF(create_flow_group_in, in, match_criteria);
+       u8 *dmac = MLX5_ADDR_OF(create_flow_group_in, in,
+                               match_criteria.outer_headers.dmac_47_16);
+       int err;
+       int ix = 0;
+
+       memset(in, 0, inlen);
+       MLX5_SET_CFG(in, match_criteria_enable, MLX5_MATCH_OUTER_HEADERS);
+       MLX5_SET_TO_ONES(fte_match_param, mc, outer_headers.ethertype);
+       MLX5_SET_TO_ONES(fte_match_param, mc, outer_headers.ip_protocol);
+       MLX5_SET_CFG(in, start_flow_index, ix);
+       ix += MLX5E_MAIN_GROUP0_SIZE;
+       MLX5_SET_CFG(in, end_flow_index, ix - 1);
+       ft->g[ft->num_groups] = mlx5_create_flow_group(ft->t, in);
+       if (IS_ERR(ft->g[ft->num_groups]))
+               goto err_destroy_groups;
+       ft->num_groups++;
+
+       memset(in, 0, inlen);
+       MLX5_SET_CFG(in, match_criteria_enable, MLX5_MATCH_OUTER_HEADERS);
+       MLX5_SET_TO_ONES(fte_match_param, mc, outer_headers.ethertype);
+       MLX5_SET_CFG(in, start_flow_index, ix);
+       ix += MLX5E_MAIN_GROUP1_SIZE;
+       MLX5_SET_CFG(in, end_flow_index, ix - 1);
+       ft->g[ft->num_groups] = mlx5_create_flow_group(ft->t, in);
+       if (IS_ERR(ft->g[ft->num_groups]))
+               goto err_destroy_groups;
+       ft->num_groups++;
+
+       memset(in, 0, inlen);
+       MLX5_SET_CFG(in, start_flow_index, ix);
+       ix += MLX5E_MAIN_GROUP2_SIZE;
+       MLX5_SET_CFG(in, end_flow_index, ix - 1);
+       ft->g[ft->num_groups] = mlx5_create_flow_group(ft->t, in);
+       if (IS_ERR(ft->g[ft->num_groups]))
+               goto err_destroy_groups;
+       ft->num_groups++;
+
+       memset(in, 0, inlen);
+       MLX5_SET_CFG(in, match_criteria_enable, MLX5_MATCH_OUTER_HEADERS);
+       MLX5_SET_TO_ONES(fte_match_param, mc, outer_headers.ethertype);
+       MLX5_SET_TO_ONES(fte_match_param, mc, outer_headers.ip_protocol);
+       eth_broadcast_addr(dmac);
+       MLX5_SET_CFG(in, start_flow_index, ix);
+       ix += MLX5E_MAIN_GROUP3_SIZE;
+       MLX5_SET_CFG(in, end_flow_index, ix - 1);
+       ft->g[ft->num_groups] = mlx5_create_flow_group(ft->t, in);
+       if (IS_ERR(ft->g[ft->num_groups]))
+               goto err_destroy_groups;
+       ft->num_groups++;
+
+       memset(in, 0, inlen);
+       MLX5_SET_CFG(in, match_criteria_enable, MLX5_MATCH_OUTER_HEADERS);
+       MLX5_SET_TO_ONES(fte_match_param, mc, outer_headers.ethertype);
+       eth_broadcast_addr(dmac);
+       MLX5_SET_CFG(in, start_flow_index, ix);
+       ix += MLX5E_MAIN_GROUP4_SIZE;
+       MLX5_SET_CFG(in, end_flow_index, ix - 1);
+       ft->g[ft->num_groups] = mlx5_create_flow_group(ft->t, in);
+       if (IS_ERR(ft->g[ft->num_groups]))
+               goto err_destroy_groups;
+       ft->num_groups++;
+
+       memset(in, 0, inlen);
+       MLX5_SET_CFG(in, match_criteria_enable, MLX5_MATCH_OUTER_HEADERS);
+       eth_broadcast_addr(dmac);
+       MLX5_SET_CFG(in, start_flow_index, ix);
+       ix += MLX5E_MAIN_GROUP5_SIZE;
+       MLX5_SET_CFG(in, end_flow_index, ix - 1);
+       ft->g[ft->num_groups] = mlx5_create_flow_group(ft->t, in);
+       if (IS_ERR(ft->g[ft->num_groups]))
+               goto err_destroy_groups;
+       ft->num_groups++;
+
+       memset(in, 0, inlen);
+       MLX5_SET_CFG(in, match_criteria_enable, MLX5_MATCH_OUTER_HEADERS);
+       MLX5_SET_TO_ONES(fte_match_param, mc, outer_headers.ethertype);
+       MLX5_SET_TO_ONES(fte_match_param, mc, outer_headers.ip_protocol);
+       dmac[0] = 0x01;
+       MLX5_SET_CFG(in, start_flow_index, ix);
+       ix += MLX5E_MAIN_GROUP6_SIZE;
+       MLX5_SET_CFG(in, end_flow_index, ix - 1);
+       ft->g[ft->num_groups] = mlx5_create_flow_group(ft->t, in);
+       if (IS_ERR(ft->g[ft->num_groups]))
+               goto err_destroy_groups;
+       ft->num_groups++;
+
+       memset(in, 0, inlen);
+       MLX5_SET_CFG(in, match_criteria_enable, MLX5_MATCH_OUTER_HEADERS);
+       MLX5_SET_TO_ONES(fte_match_param, mc, outer_headers.ethertype);
+       dmac[0] = 0x01;
+       MLX5_SET_CFG(in, start_flow_index, ix);
+       ix += MLX5E_MAIN_GROUP7_SIZE;
+       MLX5_SET_CFG(in, end_flow_index, ix - 1);
+       ft->g[ft->num_groups] = mlx5_create_flow_group(ft->t, in);
+       if (IS_ERR(ft->g[ft->num_groups]))
+               goto err_destroy_groups;
+       ft->num_groups++;
+
+       memset(in, 0, inlen);
+       MLX5_SET_CFG(in, match_criteria_enable, MLX5_MATCH_OUTER_HEADERS);
+       dmac[0] = 0x01;
+       MLX5_SET_CFG(in, start_flow_index, ix);
+       ix += MLX5E_MAIN_GROUP8_SIZE;
+       MLX5_SET_CFG(in, end_flow_index, ix - 1);
+       ft->g[ft->num_groups] = mlx5_create_flow_group(ft->t, in);
+       if (IS_ERR(ft->g[ft->num_groups]))
+               goto err_destroy_groups;
+       ft->num_groups++;
+
+       return 0;
+
+err_destroy_groups:
+       err = PTR_ERR(ft->g[ft->num_groups]);
+       ft->g[ft->num_groups] = NULL;
+       mlx5e_destroy_groups(ft);
+
+       return err;
+}
+
+static int mlx5e_create_main_groups(struct mlx5e_flow_table *ft)
+{
+       u32 *in;
+       int inlen = MLX5_ST_SZ_BYTES(create_flow_group_in);
+       int err;
+
+       in = mlx5_vzalloc(inlen);
+       if (!in)
+               return -ENOMEM;
+
+       err = __mlx5e_create_main_groups(ft, in, inlen);
+
+       kvfree(in);
+       return err;
+}
+
+static int mlx5e_create_main_flow_table(struct mlx5e_priv *priv)
+{
+       struct mlx5e_flow_table *ft = &priv->fts.main;
+       int err;
+
+       ft->num_groups = 0;
+       ft->t = mlx5_create_flow_table(priv->fts.ns, 0, MLX5E_MAIN_TABLE_SIZE);
+
+       if (IS_ERR(ft->t)) {
+               err = PTR_ERR(ft->t);
+               ft->t = NULL;
+               return err;
+       }
+       ft->g = kcalloc(MLX5E_NUM_MAIN_GROUPS, sizeof(*ft->g), GFP_KERNEL);
+       if (!ft->g) {
+               err = -ENOMEM;
+               goto err_destroy_main_flow_table;
+       }
+
+       err = mlx5e_create_main_groups(ft);
+       if (err)
+               goto err_free_g;
+       return 0;
+
+err_free_g:
+       kfree(ft->g);
+
+err_destroy_main_flow_table:
+       mlx5_destroy_flow_table(ft->t);
+       ft->t = NULL;
+
+       return err;
+}
+
+static void mlx5e_destroy_flow_table(struct mlx5e_flow_table *ft)
+{
+       mlx5e_destroy_groups(ft);
+       kfree(ft->g);
+       mlx5_destroy_flow_table(ft->t);
+       ft->t = NULL;
+}
+
+static void mlx5e_destroy_main_flow_table(struct mlx5e_priv *priv)
+{
+       mlx5e_destroy_flow_table(&priv->fts.main);
+}
+
+#define MLX5E_NUM_VLAN_GROUPS  2
+#define MLX5E_VLAN_GROUP0_SIZE BIT(12)
+#define MLX5E_VLAN_GROUP1_SIZE BIT(1)
+#define MLX5E_VLAN_TABLE_SIZE  (MLX5E_VLAN_GROUP0_SIZE +\
+                                MLX5E_VLAN_GROUP1_SIZE)
+
+static int __mlx5e_create_vlan_groups(struct mlx5e_flow_table *ft, u32 *in,
+                                     int inlen)
+{
+       int err;
+       int ix = 0;
+       u8 *mc = MLX5_ADDR_OF(create_flow_group_in, in, match_criteria);
+
+       memset(in, 0, inlen);
+       MLX5_SET_CFG(in, match_criteria_enable, MLX5_MATCH_OUTER_HEADERS);
+       MLX5_SET_TO_ONES(fte_match_param, mc, outer_headers.vlan_tag);
+       MLX5_SET_TO_ONES(fte_match_param, mc, outer_headers.first_vid);
+       MLX5_SET_CFG(in, start_flow_index, ix);
+       ix += MLX5E_VLAN_GROUP0_SIZE;
+       MLX5_SET_CFG(in, end_flow_index, ix - 1);
+       ft->g[ft->num_groups] = mlx5_create_flow_group(ft->t, in);
+       if (IS_ERR(ft->g[ft->num_groups]))
+               goto err_destroy_groups;
+       ft->num_groups++;
+
+       memset(in, 0, inlen);
+       MLX5_SET_CFG(in, match_criteria_enable, MLX5_MATCH_OUTER_HEADERS);
+       MLX5_SET_TO_ONES(fte_match_param, mc, outer_headers.vlan_tag);
+       MLX5_SET_CFG(in, start_flow_index, ix);
+       ix += MLX5E_VLAN_GROUP1_SIZE;
+       MLX5_SET_CFG(in, end_flow_index, ix - 1);
+       ft->g[ft->num_groups] = mlx5_create_flow_group(ft->t, in);
+       if (IS_ERR(ft->g[ft->num_groups]))
+               goto err_destroy_groups;
+       ft->num_groups++;
+
+       return 0;
+
+err_destroy_groups:
+       err = PTR_ERR(ft->g[ft->num_groups]);
+       ft->g[ft->num_groups] = NULL;
+       mlx5e_destroy_groups(ft);
+
+       return err;
+}
+
+static int mlx5e_create_vlan_groups(struct mlx5e_flow_table *ft)
+{
+       u32 *in;
+       int inlen = MLX5_ST_SZ_BYTES(create_flow_group_in);
+       int err;
+
+       in = mlx5_vzalloc(inlen);
+       if (!in)
+               return -ENOMEM;
+
+       err = __mlx5e_create_vlan_groups(ft, in, inlen);
+
+       kvfree(in);
+       return err;
+}
+
+static int mlx5e_create_vlan_flow_table(struct mlx5e_priv *priv)
+{
+       struct mlx5e_flow_table *ft = &priv->fts.vlan;
+       int err;
+
+       ft->num_groups = 0;
+       ft->t = mlx5_create_flow_table(priv->fts.ns, 0, MLX5E_VLAN_TABLE_SIZE);
+
+       if (IS_ERR(ft->t)) {
+               err = PTR_ERR(ft->t);
+               ft->t = NULL;
+               return err;
+       }
+       ft->g = kcalloc(MLX5E_NUM_VLAN_GROUPS, sizeof(*ft->g), GFP_KERNEL);
+       if (!ft->g) {
+               err = -ENOMEM;
+               goto err_destroy_vlan_flow_table;
+       }
+
+       err = mlx5e_create_vlan_groups(ft);
+       if (err)
+               goto err_free_g;
+
+       return 0;
+
+err_free_g:
+       kfree(ft->g);
+
+err_destroy_vlan_flow_table:
+       mlx5_destroy_flow_table(ft->t);
+       ft->t = NULL;
+
+       return err;
+}
+
+static void mlx5e_destroy_vlan_flow_table(struct mlx5e_priv *priv)
+{
+       mlx5e_destroy_flow_table(&priv->fts.vlan);
+}
+
+int mlx5e_create_flow_tables(struct mlx5e_priv *priv)
+{
+       int err;
+
+       priv->fts.ns = mlx5_get_flow_namespace(priv->mdev,
+                                              MLX5_FLOW_NAMESPACE_KERNEL);
+
+       if (!priv->fts.ns)
+               return -EINVAL;
+
+       err = mlx5e_create_vlan_flow_table(priv);
+       if (err)
+               return err;
+
+       err = mlx5e_create_main_flow_table(priv);
+       if (err)
+               goto err_destroy_vlan_flow_table;
+
+       err = mlx5e_add_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_UNTAGGED, 0);
+       if (err)
+               goto err_destroy_main_flow_table;
+
+       return 0;
+
+err_destroy_main_flow_table:
+       mlx5e_destroy_main_flow_table(priv);
+err_destroy_vlan_flow_table:
+       mlx5e_destroy_vlan_flow_table(priv);
+
+       return err;
+}
+
+void mlx5e_destroy_flow_tables(struct mlx5e_priv *priv)
+{
+       mlx5e_del_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_UNTAGGED, 0);
+       mlx5e_destroy_main_flow_table(priv);
+       mlx5e_destroy_vlan_flow_table(priv);
+}