redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

net/mlx5e: Refactor mlx5e flow steering structs 

Slightly refactor and re-order the flow steering structs,
tables and data-bases for better self-containment and
flexibility to add more future steering phases
(tables/rules/data bases) e.g: aRFS.

Changes:
1. Move the vlan DB and address DB into their table structs.
2. Rename steering table structs to unique format: mlx5e_*_table,
e.g: mlx5e_vlan_table.

Signed-off-by: Maor Gottlieb <maorg@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
hifive-unleashed-5.1
Maor Gottlieb 2016-04-29 01:36:37 +03:00 committed by David S. Miller
parent 13de6c106c
commit acff797cd1
5 changed files with 160 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
drivers/net/ethernet/mellanox/mlx5/core/en.h
View File

@ -388,6 +388,17 @@ enum mlx5e_traffic_types {
MLX5E_NUM_INDIR_TIRS = MLX5E_TT_ANY, MLX5E_NUM_INDIR_TIRS = MLX5E_TT_ANY,
}; };
enum {
MLX5E_STATE_ASYNC_EVENTS_ENABLE,
MLX5E_STATE_OPENED,
MLX5E_STATE_DESTROYING,
};
struct mlx5e_vxlan_db {
spinlock_t lock; /* protect vxlan table */
struct radix_tree_root tree;
};
struct mlx5e_eth_addr_info { struct mlx5e_eth_addr_info {
u8 addr[ETH_ALEN + 2]; u8 addr[ETH_ALEN + 2];
u32 tt_vec; u32 tt_vec;
@ -396,7 +407,14 @@ struct mlx5e_eth_addr_info {
#define MLX5E_ETH_ADDR_HASH_SIZE (1 << BITS_PER_BYTE) #define MLX5E_ETH_ADDR_HASH_SIZE (1 << BITS_PER_BYTE)
struct mlx5e_eth_addr_db { struct mlx5e_flow_table {
int num_groups;
struct mlx5_flow_table *t;
struct mlx5_flow_group **g;
};
struct mlx5e_main_table {
struct mlx5e_flow_table ft;
struct hlist_head netdev_uc[MLX5E_ETH_ADDR_HASH_SIZE]; struct hlist_head netdev_uc[MLX5E_ETH_ADDR_HASH_SIZE];
struct hlist_head netdev_mc[MLX5E_ETH_ADDR_HASH_SIZE]; struct hlist_head netdev_mc[MLX5E_ETH_ADDR_HASH_SIZE];
struct mlx5e_eth_addr_info broadcast; struct mlx5e_eth_addr_info broadcast;
@ -407,13 +425,15 @@ struct mlx5e_eth_addr_db {
bool promisc_enabled; bool promisc_enabled;
}; };
enum { struct mlx5e_tc_table {
MLX5E_STATE_ASYNC_EVENTS_ENABLE, struct mlx5_flow_table *t;
MLX5E_STATE_OPENED,
MLX5E_STATE_DESTROYING, struct rhashtable_params ht_params;
struct rhashtable ht;
}; };
struct mlx5e_vlan_db { struct mlx5e_vlan_table {
struct mlx5e_flow_table ft;
unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)]; unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];
struct mlx5_flow_rule *active_vlans_rule[VLAN_N_VID]; struct mlx5_flow_rule *active_vlans_rule[VLAN_N_VID];
struct mlx5_flow_rule *untagged_rule; struct mlx5_flow_rule *untagged_rule;
@ -421,29 +441,11 @@ struct mlx5e_vlan_db {
bool filter_disabled; bool filter_disabled;
}; };
struct mlx5e_vxlan_db { struct mlx5e_flow_steering {
spinlock_t lock; /* protect vxlan table */ struct mlx5_flow_namespace *ns;
struct radix_tree_root tree; struct mlx5e_tc_table tc;
}; struct mlx5e_vlan_table vlan;
struct mlx5e_main_table main;
struct mlx5e_flow_table {
int num_groups;
struct mlx5_flow_table *t;
struct mlx5_flow_group **g;
};
struct mlx5e_tc_flow_table {
struct mlx5_flow_table *t;
struct rhashtable_params ht_params;
struct rhashtable ht;
};
struct mlx5e_flow_tables {
struct mlx5_flow_namespace *ns;
struct mlx5e_tc_flow_table tc;
struct mlx5e_flow_table vlan;
struct mlx5e_flow_table main;
}; };
struct mlx5e_direct_tir { struct mlx5e_direct_tir {
@ -451,6 +453,11 @@ struct mlx5e_direct_tir {
u32 rqtn; u32 rqtn;
}; };
enum {
MLX5E_TC_PRIO = 0,
MLX5E_NIC_PRIO
};
struct mlx5e_priv { struct mlx5e_priv {
/* priv data path fields - start */ /* priv data path fields - start */
struct mlx5e_sq **txq_to_sq_map; struct mlx5e_sq **txq_to_sq_map;
@ -472,9 +479,7 @@ struct mlx5e_priv {
u32 indir_tirn[MLX5E_NUM_INDIR_TIRS]; u32 indir_tirn[MLX5E_NUM_INDIR_TIRS];
struct mlx5e_direct_tir direct_tir[MLX5E_MAX_NUM_CHANNELS]; struct mlx5e_direct_tir direct_tir[MLX5E_MAX_NUM_CHANNELS];
struct mlx5e_flow_tables fts; struct mlx5e_flow_steering fs;
struct mlx5e_eth_addr_db eth_addr;
struct mlx5e_vlan_db vlan;
struct mlx5e_vxlan_db vxlan; struct mlx5e_vxlan_db vxlan;
struct mlx5e_params params; struct mlx5e_params params;
@ -556,8 +561,8 @@ struct mlx5_cqe64 *mlx5e_get_cqe(struct mlx5e_cq *cq);
void mlx5e_update_stats(struct mlx5e_priv *priv); void mlx5e_update_stats(struct mlx5e_priv *priv);
int mlx5e_create_flow_tables(struct mlx5e_priv *priv); int mlx5e_create_flow_steering(struct mlx5e_priv *priv);
void mlx5e_destroy_flow_tables(struct mlx5e_priv *priv); void mlx5e_destroy_flow_steering(struct mlx5e_priv *priv);
void mlx5e_init_eth_addr(struct mlx5e_priv *priv); void mlx5e_init_eth_addr(struct mlx5e_priv *priv);
void mlx5e_set_rx_mode_work(struct work_struct *work); void mlx5e_set_rx_mode_work(struct work_struct *work);

186
drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
View File

@ -247,7 +247,7 @@ static int __mlx5e_add_eth_addr_rule(struct mlx5e_priv *priv,
struct mlx5_flow_destination dest; struct mlx5_flow_destination dest;
u8 match_criteria_enable = 0; u8 match_criteria_enable = 0;
struct mlx5_flow_rule **rule_p; struct mlx5_flow_rule **rule_p;
struct mlx5_flow_table *ft = priv->fts.main.t; struct mlx5_flow_table *ft = priv->fs.main.ft.t;
u8 *mc_dmac = MLX5_ADDR_OF(fte_match_param, mc, u8 *mc_dmac = MLX5_ADDR_OF(fte_match_param, mc,
outer_headers.dmac_47_16); outer_headers.dmac_47_16);
u8 *mv_dmac = MLX5_ADDR_OF(fte_match_param, mv, u8 *mv_dmac = MLX5_ADDR_OF(fte_match_param, mv,
@ -477,7 +477,7 @@ static int mlx5e_vport_context_update_vlans(struct mlx5e_priv *priv)
int i; int i;
list_size = 0; list_size = 0;
for_each_set_bit(vlan, priv->vlan.active_vlans, VLAN_N_VID) for_each_set_bit(vlan, priv->fs.vlan.active_vlans, VLAN_N_VID)
list_size++; list_size++;
max_list_size = 1 << MLX5_CAP_GEN(priv->mdev, log_max_vlan_list); max_list_size = 1 << MLX5_CAP_GEN(priv->mdev, log_max_vlan_list);
@ -494,7 +494,7 @@ static int mlx5e_vport_context_update_vlans(struct mlx5e_priv *priv)
return -ENOMEM; return -ENOMEM;
i = 0; i = 0;
for_each_set_bit(vlan, priv->vlan.active_vlans, VLAN_N_VID) { for_each_set_bit(vlan, priv->fs.vlan.active_vlans, VLAN_N_VID) {
if (i >= list_size) if (i >= list_size)
break; break;
vlans[i++] = vlan; vlans[i++] = vlan;
@ -519,28 +519,28 @@ static int __mlx5e_add_vlan_rule(struct mlx5e_priv *priv,
enum mlx5e_vlan_rule_type rule_type, enum mlx5e_vlan_rule_type rule_type,
u16 vid, u32 *mc, u32 *mv) u16 vid, u32 *mc, u32 *mv)
{ {
struct mlx5_flow_table *ft = priv->fts.vlan.t; struct mlx5_flow_table *ft = priv->fs.vlan.ft.t;
struct mlx5_flow_destination dest; struct mlx5_flow_destination dest;
u8 match_criteria_enable = 0; u8 match_criteria_enable = 0;
struct mlx5_flow_rule **rule_p; struct mlx5_flow_rule **rule_p;
int err = 0; int err = 0;
dest.type = MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE; dest.type = MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE;
dest.ft = priv->fts.main.t; dest.ft = priv->fs.main.ft.t;
match_criteria_enable = MLX5_MATCH_OUTER_HEADERS; 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.vlan_tag);
switch (rule_type) { switch (rule_type) {
case MLX5E_VLAN_RULE_TYPE_UNTAGGED: case MLX5E_VLAN_RULE_TYPE_UNTAGGED:
rule_p = &priv->vlan.untagged_rule; rule_p = &priv->fs.vlan.untagged_rule;
break; break;
case MLX5E_VLAN_RULE_TYPE_ANY_VID: case MLX5E_VLAN_RULE_TYPE_ANY_VID:
rule_p = &priv->vlan.any_vlan_rule; rule_p = &priv->fs.vlan.any_vlan_rule;
MLX5_SET(fte_match_param, mv, outer_headers.vlan_tag, 1); MLX5_SET(fte_match_param, mv, outer_headers.vlan_tag, 1);
break; break;
default: /* MLX5E_VLAN_RULE_TYPE_MATCH_VID */ default: /* MLX5E_VLAN_RULE_TYPE_MATCH_VID */
rule_p = &priv->vlan.active_vlans_rule[vid]; rule_p = &priv->fs.vlan.active_vlans_rule[vid];
MLX5_SET(fte_match_param, mv, outer_headers.vlan_tag, 1); 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_TO_ONES(fte_match_param, mc, outer_headers.first_vid);
MLX5_SET(fte_match_param, mv, outer_headers.first_vid, vid); MLX5_SET(fte_match_param, mv, outer_headers.first_vid, vid);
@ -594,22 +594,22 @@ static void mlx5e_del_vlan_rule(struct mlx5e_priv *priv,
{ {
switch (rule_type) { switch (rule_type) {
case MLX5E_VLAN_RULE_TYPE_UNTAGGED: case MLX5E_VLAN_RULE_TYPE_UNTAGGED:
if (priv->vlan.untagged_rule) { if (priv->fs.vlan.untagged_rule) {
mlx5_del_flow_rule(priv->vlan.untagged_rule); mlx5_del_flow_rule(priv->fs.vlan.untagged_rule);
priv->vlan.untagged_rule = NULL; priv->fs.vlan.untagged_rule = NULL;
} }
break; break;
case MLX5E_VLAN_RULE_TYPE_ANY_VID: case MLX5E_VLAN_RULE_TYPE_ANY_VID:
if (priv->vlan.any_vlan_rule) { if (priv->fs.vlan.any_vlan_rule) {
mlx5_del_flow_rule(priv->vlan.any_vlan_rule); mlx5_del_flow_rule(priv->fs.vlan.any_vlan_rule);
priv->vlan.any_vlan_rule = NULL; priv->fs.vlan.any_vlan_rule = NULL;
} }
break; break;
case MLX5E_VLAN_RULE_TYPE_MATCH_VID: case MLX5E_VLAN_RULE_TYPE_MATCH_VID:
mlx5e_vport_context_update_vlans(priv); mlx5e_vport_context_update_vlans(priv);
if (priv->vlan.active_vlans_rule[vid]) { if (priv->fs.vlan.active_vlans_rule[vid]) {
mlx5_del_flow_rule(priv->vlan.active_vlans_rule[vid]); mlx5_del_flow_rule(priv->fs.vlan.active_vlans_rule[vid]);
priv->vlan.active_vlans_rule[vid] = NULL; priv->fs.vlan.active_vlans_rule[vid] = NULL;
} }
mlx5e_vport_context_update_vlans(priv); mlx5e_vport_context_update_vlans(priv);
break; break;
@ -618,10 +618,10 @@ static void mlx5e_del_vlan_rule(struct mlx5e_priv *priv,
void mlx5e_enable_vlan_filter(struct mlx5e_priv *priv) void mlx5e_enable_vlan_filter(struct mlx5e_priv *priv)
{ {
if (!priv->vlan.filter_disabled) if (!priv->fs.vlan.filter_disabled)
return; return;
priv->vlan.filter_disabled = false; priv->fs.vlan.filter_disabled = false;
if (priv->netdev->flags & IFF_PROMISC) if (priv->netdev->flags & IFF_PROMISC)
return; return;
mlx5e_del_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_ANY_VID, 0); mlx5e_del_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_ANY_VID, 0);
@ -629,10 +629,10 @@ void mlx5e_enable_vlan_filter(struct mlx5e_priv *priv)
void mlx5e_disable_vlan_filter(struct mlx5e_priv *priv) void mlx5e_disable_vlan_filter(struct mlx5e_priv *priv)
{ {
if (priv->vlan.filter_disabled) if (priv->fs.vlan.filter_disabled)
return; return;
priv->vlan.filter_disabled = true; priv->fs.vlan.filter_disabled = true;
if (priv->netdev->flags & IFF_PROMISC) if (priv->netdev->flags & IFF_PROMISC)
return; return;
mlx5e_add_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_ANY_VID, 0); mlx5e_add_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_ANY_VID, 0);
@ -643,7 +643,7 @@ int mlx5e_vlan_rx_add_vid(struct net_device *dev, __always_unused __be16 proto,
{ {
struct mlx5e_priv *priv = netdev_priv(dev); struct mlx5e_priv *priv = netdev_priv(dev);
set_bit(vid, priv->vlan.active_vlans); set_bit(vid, priv->fs.vlan.active_vlans);
return mlx5e_add_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_MATCH_VID, vid); return mlx5e_add_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_MATCH_VID, vid);
} }
@ -653,7 +653,7 @@ int mlx5e_vlan_rx_kill_vid(struct net_device *dev, __always_unused __be16 proto,
{ {
struct mlx5e_priv *priv = netdev_priv(dev); struct mlx5e_priv *priv = netdev_priv(dev);
clear_bit(vid, priv->vlan.active_vlans); clear_bit(vid, priv->fs.vlan.active_vlans);
mlx5e_del_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_MATCH_VID, vid); mlx5e_del_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_MATCH_VID, vid);
@ -687,14 +687,14 @@ static void mlx5e_sync_netdev_addr(struct mlx5e_priv *priv)
netif_addr_lock_bh(netdev); netif_addr_lock_bh(netdev);
mlx5e_add_eth_addr_to_hash(priv->eth_addr.netdev_uc, mlx5e_add_eth_addr_to_hash(priv->fs.main.netdev_uc,
priv->netdev->dev_addr); priv->netdev->dev_addr);
netdev_for_each_uc_addr(ha, netdev) netdev_for_each_uc_addr(ha, netdev)
mlx5e_add_eth_addr_to_hash(priv->eth_addr.netdev_uc, ha->addr); mlx5e_add_eth_addr_to_hash(priv->fs.main.netdev_uc, ha->addr);
netdev_for_each_mc_addr(ha, netdev) netdev_for_each_mc_addr(ha, netdev)
mlx5e_add_eth_addr_to_hash(priv->eth_addr.netdev_mc, ha->addr); mlx5e_add_eth_addr_to_hash(priv->fs.main.netdev_mc, ha->addr);
netif_addr_unlock_bh(netdev); netif_addr_unlock_bh(netdev);
} }
@ -710,11 +710,11 @@ static void mlx5e_fill_addr_array(struct mlx5e_priv *priv, int list_type,
int i = 0; int i = 0;
int hi; int hi;
addr_list = is_uc ? priv->eth_addr.netdev_uc : priv->eth_addr.netdev_mc; addr_list = is_uc ? priv->fs.main.netdev_uc : priv->fs.main.netdev_mc;
if (is_uc) /* Make sure our own address is pushed first */ if (is_uc) /* Make sure our own address is pushed first */
ether_addr_copy(addr_array[i++], ndev->dev_addr); ether_addr_copy(addr_array[i++], ndev->dev_addr);
else if (priv->eth_addr.broadcast_enabled) else if (priv->fs.main.broadcast_enabled)
ether_addr_copy(addr_array[i++], ndev->broadcast); ether_addr_copy(addr_array[i++], ndev->broadcast);
mlx5e_for_each_hash_node(hn, tmp, addr_list, hi) { mlx5e_for_each_hash_node(hn, tmp, addr_list, hi) {
@ -739,12 +739,12 @@ static void mlx5e_vport_context_update_addr_list(struct mlx5e_priv *priv,
int err; int err;
int hi; int hi;
size = is_uc ? 0 : (priv->eth_addr.broadcast_enabled ? 1 : 0); size = is_uc ? 0 : (priv->fs.main.broadcast_enabled ? 1 : 0);
max_size = is_uc ? max_size = is_uc ?
1 << MLX5_CAP_GEN(priv->mdev, log_max_current_uc_list) : 1 << MLX5_CAP_GEN(priv->mdev, log_max_current_uc_list) :
1 << MLX5_CAP_GEN(priv->mdev, log_max_current_mc_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; addr_list = is_uc ? priv->fs.main.netdev_uc : priv->fs.main.netdev_mc;
mlx5e_for_each_hash_node(hn, tmp, addr_list, hi) mlx5e_for_each_hash_node(hn, tmp, addr_list, hi)
size++; size++;
@ -775,13 +775,13 @@ out:
static void mlx5e_vport_context_update(struct mlx5e_priv *priv) static void mlx5e_vport_context_update(struct mlx5e_priv *priv)
{ {
struct mlx5e_eth_addr_db *ea = &priv->eth_addr; struct mlx5e_main_table *main_table = &priv->fs.main;
mlx5e_vport_context_update_addr_list(priv, MLX5_NVPRT_LIST_TYPE_UC); mlx5e_vport_context_update_addr_list(priv, MLX5_NVPRT_LIST_TYPE_UC);
mlx5e_vport_context_update_addr_list(priv, MLX5_NVPRT_LIST_TYPE_MC); mlx5e_vport_context_update_addr_list(priv, MLX5_NVPRT_LIST_TYPE_MC);
mlx5_modify_nic_vport_promisc(priv->mdev, 0, mlx5_modify_nic_vport_promisc(priv->mdev, 0,
ea->allmulti_enabled, main_table->allmulti_enabled,
ea->promisc_enabled); main_table->promisc_enabled);
} }
static void mlx5e_apply_netdev_addr(struct mlx5e_priv *priv) static void mlx5e_apply_netdev_addr(struct mlx5e_priv *priv)
@ -790,10 +790,10 @@ static void mlx5e_apply_netdev_addr(struct mlx5e_priv *priv)
struct hlist_node *tmp; struct hlist_node *tmp;
int i; int i;
mlx5e_for_each_hash_node(hn, tmp, priv->eth_addr.netdev_uc, i) mlx5e_for_each_hash_node(hn, tmp, priv->fs.main.netdev_uc, i)
mlx5e_execute_action(priv, hn); mlx5e_execute_action(priv, hn);
mlx5e_for_each_hash_node(hn, tmp, priv->eth_addr.netdev_mc, i) mlx5e_for_each_hash_node(hn, tmp, priv->fs.main.netdev_mc, i)
mlx5e_execute_action(priv, hn); mlx5e_execute_action(priv, hn);
} }
@ -803,9 +803,9 @@ static void mlx5e_handle_netdev_addr(struct mlx5e_priv *priv)
struct hlist_node *tmp; struct hlist_node *tmp;
int i; int i;
mlx5e_for_each_hash_node(hn, tmp, priv->eth_addr.netdev_uc, i) mlx5e_for_each_hash_node(hn, tmp, priv->fs.main.netdev_uc, i)
hn->action = MLX5E_ACTION_DEL; hn->action = MLX5E_ACTION_DEL;
mlx5e_for_each_hash_node(hn, tmp, priv->eth_addr.netdev_mc, i) mlx5e_for_each_hash_node(hn, tmp, priv->fs.main.netdev_mc, i)
hn->action = MLX5E_ACTION_DEL; hn->action = MLX5E_ACTION_DEL;
if (!test_bit(MLX5E_STATE_DESTROYING, &priv->state)) if (!test_bit(MLX5E_STATE_DESTROYING, &priv->state))
@ -819,7 +819,7 @@ void mlx5e_set_rx_mode_work(struct work_struct *work)
struct mlx5e_priv *priv = container_of(work, struct mlx5e_priv, struct mlx5e_priv *priv = container_of(work, struct mlx5e_priv,
set_rx_mode_work); set_rx_mode_work);
struct mlx5e_eth_addr_db *ea = &priv->eth_addr; struct mlx5e_main_table *main_table = &priv->fs.main;
struct net_device *ndev = priv->netdev; struct net_device *ndev = priv->netdev;
bool rx_mode_enable = !test_bit(MLX5E_STATE_DESTROYING, &priv->state); bool rx_mode_enable = !test_bit(MLX5E_STATE_DESTROYING, &priv->state);
@ -827,40 +827,40 @@ void mlx5e_set_rx_mode_work(struct work_struct *work)
bool allmulti_enabled = rx_mode_enable && (ndev->flags & IFF_ALLMULTI); bool allmulti_enabled = rx_mode_enable && (ndev->flags & IFF_ALLMULTI);
bool broadcast_enabled = rx_mode_enable; bool broadcast_enabled = rx_mode_enable;
bool enable_promisc = !ea->promisc_enabled && promisc_enabled; bool enable_promisc = !main_table->promisc_enabled && promisc_enabled;
bool disable_promisc = ea->promisc_enabled && !promisc_enabled; bool disable_promisc = main_table->promisc_enabled && !promisc_enabled;
bool enable_allmulti = !ea->allmulti_enabled && allmulti_enabled; bool enable_allmulti = !main_table->allmulti_enabled && allmulti_enabled;
bool disable_allmulti = ea->allmulti_enabled && !allmulti_enabled; bool disable_allmulti = main_table->allmulti_enabled && !allmulti_enabled;
bool enable_broadcast = !ea->broadcast_enabled && broadcast_enabled; bool enable_broadcast = !main_table->broadcast_enabled && broadcast_enabled;
bool disable_broadcast = ea->broadcast_enabled && !broadcast_enabled; bool disable_broadcast = main_table->broadcast_enabled && !broadcast_enabled;
if (enable_promisc) { if (enable_promisc) {
mlx5e_add_eth_addr_rule(priv, &ea->promisc, MLX5E_PROMISC); mlx5e_add_eth_addr_rule(priv, &main_table->promisc, MLX5E_PROMISC);
if (!priv->vlan.filter_disabled) if (!priv->fs.vlan.filter_disabled)
mlx5e_add_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_ANY_VID, mlx5e_add_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_ANY_VID,
0); 0);
} }
if (enable_allmulti) if (enable_allmulti)
mlx5e_add_eth_addr_rule(priv, &ea->allmulti, MLX5E_ALLMULTI); mlx5e_add_eth_addr_rule(priv, &main_table->allmulti, MLX5E_ALLMULTI);
if (enable_broadcast) if (enable_broadcast)
mlx5e_add_eth_addr_rule(priv, &ea->broadcast, MLX5E_FULLMATCH); mlx5e_add_eth_addr_rule(priv, &main_table->broadcast, MLX5E_FULLMATCH);
mlx5e_handle_netdev_addr(priv); mlx5e_handle_netdev_addr(priv);
if (disable_broadcast) if (disable_broadcast)
mlx5e_del_eth_addr_from_flow_table(priv, &ea->broadcast); mlx5e_del_eth_addr_from_flow_table(priv, &main_table->broadcast);
if (disable_allmulti) if (disable_allmulti)
mlx5e_del_eth_addr_from_flow_table(priv, &ea->allmulti); mlx5e_del_eth_addr_from_flow_table(priv, &main_table->allmulti);
if (disable_promisc) { if (disable_promisc) {
if (!priv->vlan.filter_disabled) if (!priv->fs.vlan.filter_disabled)
mlx5e_del_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_ANY_VID, mlx5e_del_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_ANY_VID,
0); 0);
mlx5e_del_eth_addr_from_flow_table(priv, &ea->promisc); mlx5e_del_eth_addr_from_flow_table(priv, &main_table->promisc);
} }
ea->promisc_enabled = promisc_enabled; main_table->promisc_enabled = promisc_enabled;
ea->allmulti_enabled = allmulti_enabled; main_table->allmulti_enabled = allmulti_enabled;
ea->broadcast_enabled = broadcast_enabled; main_table->broadcast_enabled = broadcast_enabled;
mlx5e_vport_context_update(priv); mlx5e_vport_context_update(priv);
} }
@ -879,7 +879,7 @@ static void mlx5e_destroy_groups(struct mlx5e_flow_table *ft)
void mlx5e_init_eth_addr(struct mlx5e_priv *priv) void mlx5e_init_eth_addr(struct mlx5e_priv *priv)
{ {
ether_addr_copy(priv->eth_addr.broadcast.addr, priv->netdev->broadcast); ether_addr_copy(priv->fs.main.broadcast.addr, priv->netdev->broadcast);
} }
#define MLX5E_MAIN_GROUP0_SIZE BIT(3) #define MLX5E_MAIN_GROUP0_SIZE BIT(3)
@ -901,8 +901,8 @@ void mlx5e_init_eth_addr(struct mlx5e_priv *priv)
MLX5E_MAIN_GROUP7_SIZE +\ MLX5E_MAIN_GROUP7_SIZE +\
MLX5E_MAIN_GROUP8_SIZE) MLX5E_MAIN_GROUP8_SIZE)
static int __mlx5e_create_main_groups(struct mlx5e_flow_table *ft, u32 *in, static int __mlx5e_create_main_table_groups(struct mlx5e_flow_table *ft, u32 *in,
int inlen) int inlen)
{ {
u8 *mc = MLX5_ADDR_OF(create_flow_group_in, in, match_criteria); u8 *mc = MLX5_ADDR_OF(create_flow_group_in, in, match_criteria);
u8 *dmac = MLX5_ADDR_OF(create_flow_group_in, in, u8 *dmac = MLX5_ADDR_OF(create_flow_group_in, in,
@ -1024,7 +1024,7 @@ err_destroy_groups:
return err; return err;
} }
static int mlx5e_create_main_groups(struct mlx5e_flow_table *ft) static int mlx5e_create_main_table_groups(struct mlx5e_flow_table *ft)
{ {
u32 *in; u32 *in;
int inlen = MLX5_ST_SZ_BYTES(create_flow_group_in); int inlen = MLX5_ST_SZ_BYTES(create_flow_group_in);
@ -1034,20 +1034,20 @@ static int mlx5e_create_main_groups(struct mlx5e_flow_table *ft)
if (!in) if (!in)
return -ENOMEM; return -ENOMEM;
err = __mlx5e_create_main_groups(ft, in, inlen); err = __mlx5e_create_main_table_groups(ft, in, inlen);
kvfree(in); kvfree(in);
return err; return err;
} }
static int mlx5e_create_main_flow_table(struct mlx5e_priv *priv) static int mlx5e_create_main_table(struct mlx5e_priv *priv)
{ {
struct mlx5e_flow_table *ft = &priv->fts.main; struct mlx5e_flow_table *ft = &priv->fs.main.ft;
int err; int err;
ft->num_groups = 0; ft->num_groups = 0;
ft->t = mlx5_create_flow_table(priv->fts.ns, 1, MLX5E_MAIN_TABLE_SIZE, ft->t = mlx5_create_flow_table(priv->fs.ns, MLX5E_NIC_PRIO,
MLX5E_MAIN_FT_LEVEL); MLX5E_MAIN_TABLE_SIZE, MLX5E_MAIN_FT_LEVEL);
if (IS_ERR(ft->t)) { if (IS_ERR(ft->t)) {
err = PTR_ERR(ft->t); err = PTR_ERR(ft->t);
@ -1057,10 +1057,10 @@ static int mlx5e_create_main_flow_table(struct mlx5e_priv *priv)
ft->g = kcalloc(MLX5E_NUM_MAIN_GROUPS, sizeof(*ft->g), GFP_KERNEL); ft->g = kcalloc(MLX5E_NUM_MAIN_GROUPS, sizeof(*ft->g), GFP_KERNEL);
if (!ft->g) { if (!ft->g) {
err = -ENOMEM; err = -ENOMEM;
goto err_destroy_main_flow_table; goto err_destroy_main_table;
} }
err = mlx5e_create_main_groups(ft); err = mlx5e_create_main_table_groups(ft);
if (err) if (err)
goto err_free_g; goto err_free_g;
return 0; return 0;
@ -1068,7 +1068,7 @@ static int mlx5e_create_main_flow_table(struct mlx5e_priv *priv)
err_free_g: err_free_g:
kfree(ft->g); kfree(ft->g);
err_destroy_main_flow_table: err_destroy_main_table:
mlx5_destroy_flow_table(ft->t); mlx5_destroy_flow_table(ft->t);
ft->t = NULL; ft->t = NULL;
@ -1083,9 +1083,9 @@ static void mlx5e_destroy_flow_table(struct mlx5e_flow_table *ft)
ft->t = NULL; ft->t = NULL;
} }
static void mlx5e_destroy_main_flow_table(struct mlx5e_priv *priv) static void mlx5e_destroy_main_table(struct mlx5e_priv *priv)
{ {
mlx5e_destroy_flow_table(&priv->fts.main); mlx5e_destroy_flow_table(&priv->fs.main.ft);
} }
#define MLX5E_NUM_VLAN_GROUPS 2 #define MLX5E_NUM_VLAN_GROUPS 2
@ -1094,8 +1094,8 @@ static void mlx5e_destroy_main_flow_table(struct mlx5e_priv *priv)
#define MLX5E_VLAN_TABLE_SIZE (MLX5E_VLAN_GROUP0_SIZE +\ #define MLX5E_VLAN_TABLE_SIZE (MLX5E_VLAN_GROUP0_SIZE +\
MLX5E_VLAN_GROUP1_SIZE) MLX5E_VLAN_GROUP1_SIZE)
static int __mlx5e_create_vlan_groups(struct mlx5e_flow_table *ft, u32 *in, static int __mlx5e_create_vlan_table_groups(struct mlx5e_flow_table *ft, u32 *in,
int inlen) int inlen)
{ {
int err; int err;
int ix = 0; int ix = 0;
@ -1134,7 +1134,7 @@ err_destroy_groups:
return err; return err;
} }
static int mlx5e_create_vlan_groups(struct mlx5e_flow_table *ft) static int mlx5e_create_vlan_table_groups(struct mlx5e_flow_table *ft)
{ {
u32 *in; u32 *in;
int inlen = MLX5_ST_SZ_BYTES(create_flow_group_in); int inlen = MLX5_ST_SZ_BYTES(create_flow_group_in);
@ -1144,20 +1144,20 @@ static int mlx5e_create_vlan_groups(struct mlx5e_flow_table *ft)
if (!in) if (!in)
return -ENOMEM; return -ENOMEM;
err = __mlx5e_create_vlan_groups(ft, in, inlen); err = __mlx5e_create_vlan_table_groups(ft, in, inlen);
kvfree(in); kvfree(in);
return err; return err;
} }
static int mlx5e_create_vlan_flow_table(struct mlx5e_priv *priv) static int mlx5e_create_vlan_table(struct mlx5e_priv *priv)
{ {
struct mlx5e_flow_table *ft = &priv->fts.vlan; struct mlx5e_flow_table *ft = &priv->fs.vlan.ft;
int err; int err;
ft->num_groups = 0; ft->num_groups = 0;
ft->t = mlx5_create_flow_table(priv->fts.ns, 1, MLX5E_VLAN_TABLE_SIZE, ft->t = mlx5_create_flow_table(priv->fs.ns, MLX5E_NIC_PRIO,
MLX5E_VLAN_FT_LEVEL); MLX5E_VLAN_TABLE_SIZE, MLX5E_VLAN_FT_LEVEL);
if (IS_ERR(ft->t)) { if (IS_ERR(ft->t)) {
err = PTR_ERR(ft->t); err = PTR_ERR(ft->t);
@ -1167,10 +1167,10 @@ static int mlx5e_create_vlan_flow_table(struct mlx5e_priv *priv)
ft->g = kcalloc(MLX5E_NUM_VLAN_GROUPS, sizeof(*ft->g), GFP_KERNEL); ft->g = kcalloc(MLX5E_NUM_VLAN_GROUPS, sizeof(*ft->g), GFP_KERNEL);
if (!ft->g) { if (!ft->g) {
err = -ENOMEM; err = -ENOMEM;
goto err_destroy_vlan_flow_table; goto err_destroy_vlan_table;
} }
err = mlx5e_create_vlan_groups(ft); err = mlx5e_create_vlan_table_groups(ft);
if (err) if (err)
goto err_free_g; goto err_free_g;
@ -1184,47 +1184,47 @@ err_destroy_vlan_flow_groups:
mlx5e_destroy_groups(ft); mlx5e_destroy_groups(ft);
err_free_g: err_free_g:
kfree(ft->g); kfree(ft->g);
err_destroy_vlan_flow_table: err_destroy_vlan_table:
mlx5_destroy_flow_table(ft->t); mlx5_destroy_flow_table(ft->t);
ft->t = NULL; ft->t = NULL;
return err; return err;
} }
static void mlx5e_destroy_vlan_flow_table(struct mlx5e_priv *priv) static void mlx5e_destroy_vlan_table(struct mlx5e_priv *priv)
{ {
mlx5e_destroy_flow_table(&priv->fts.vlan); mlx5e_destroy_flow_table(&priv->fs.vlan.ft);
} }
int mlx5e_create_flow_tables(struct mlx5e_priv *priv) int mlx5e_create_flow_steering(struct mlx5e_priv *priv)
{ {
int err; int err;
priv->fts.ns = mlx5_get_flow_namespace(priv->mdev, priv->fs.ns = mlx5_get_flow_namespace(priv->mdev,
MLX5_FLOW_NAMESPACE_KERNEL); MLX5_FLOW_NAMESPACE_KERNEL);
if (!priv->fts.ns) if (!priv->fs.ns)
return -EINVAL; return -EINVAL;
err = mlx5e_create_main_flow_table(priv); err = mlx5e_create_main_table(priv);
if (err) if (err)
return err; return err;
err = mlx5e_create_vlan_flow_table(priv); err = mlx5e_create_vlan_table(priv);
if (err) if (err)
goto err_destroy_main_flow_table; goto err_destroy_main_table;
return 0; return 0;
err_destroy_main_flow_table: err_destroy_main_table:
mlx5e_destroy_main_flow_table(priv); mlx5e_destroy_main_table(priv);
return err; return err;
} }
void mlx5e_destroy_flow_tables(struct mlx5e_priv *priv) void mlx5e_destroy_flow_steering(struct mlx5e_priv *priv)
{ {
mlx5e_del_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_UNTAGGED, 0); mlx5e_del_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_UNTAGGED, 0);
mlx5e_destroy_vlan_flow_table(priv); mlx5e_destroy_vlan_table(priv);
mlx5e_destroy_main_flow_table(priv); mlx5e_destroy_main_table(priv);
} }

8
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
View File

@ -2969,9 +2969,9 @@ static void *mlx5e_create_netdev(struct mlx5_core_dev *mdev)
goto err_destroy_rqts; goto err_destroy_rqts;
} }
err = mlx5e_create_flow_tables(priv); err = mlx5e_create_flow_steering(priv);
if (err) { if (err) {
mlx5_core_warn(mdev, "create flow tables failed, %d\n", err); mlx5_core_warn(mdev, "create flow steering failed, %d\n", err);
goto err_destroy_tirs; goto err_destroy_tirs;
} }
@ -3011,7 +3011,7 @@ err_tc_cleanup:
err_dealloc_q_counters: err_dealloc_q_counters:
mlx5e_destroy_q_counter(priv); mlx5e_destroy_q_counter(priv);
mlx5e_destroy_flow_tables(priv); mlx5e_destroy_flow_steering(priv);
err_destroy_tirs: err_destroy_tirs:
mlx5e_destroy_tirs(priv); mlx5e_destroy_tirs(priv);
@ -3069,7 +3069,7 @@ static void mlx5e_destroy_netdev(struct mlx5_core_dev *mdev, void *vpriv)
mlx5e_tc_cleanup(priv); mlx5e_tc_cleanup(priv);
mlx5e_vxlan_cleanup(priv); mlx5e_vxlan_cleanup(priv);
mlx5e_destroy_q_counter(priv); mlx5e_destroy_q_counter(priv);
mlx5e_destroy_flow_tables(priv); mlx5e_destroy_flow_steering(priv);
mlx5e_destroy_tirs(priv); mlx5e_destroy_tirs(priv);
mlx5e_destroy_rqts(priv); mlx5e_destroy_rqts(priv);
mlx5e_close_drop_rq(priv); mlx5e_close_drop_rq(priv);

45
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
View File

@ -46,8 +46,8 @@ struct mlx5e_tc_flow {
struct mlx5_flow_rule *rule; struct mlx5_flow_rule *rule;
}; };
#define MLX5E_TC_FLOW_TABLE_NUM_ENTRIES 1024 #define MLX5E_TC_TABLE_NUM_ENTRIES 1024
#define MLX5E_TC_FLOW_TABLE_NUM_GROUPS 4 #define MLX5E_TC_TABLE_NUM_GROUPS 4
static struct mlx5_flow_rule *mlx5e_tc_add_flow(struct mlx5e_priv *priv, static struct mlx5_flow_rule *mlx5e_tc_add_flow(struct mlx5e_priv *priv,
u32 *match_c, u32 *match_v, u32 *match_c, u32 *match_v,
@ -55,34 +55,35 @@ static struct mlx5_flow_rule *mlx5e_tc_add_flow(struct mlx5e_priv *priv,
{ {
struct mlx5_flow_destination dest = { struct mlx5_flow_destination dest = {
.type = MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE, .type = MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE,
{.ft = priv->fts.vlan.t}, {.ft = priv->fs.vlan.ft.t},
}; };
struct mlx5_flow_rule *rule; struct mlx5_flow_rule *rule;
bool table_created = false; bool table_created = false;
if (IS_ERR_OR_NULL(priv->fts.tc.t)) { if (IS_ERR_OR_NULL(priv->fs.tc.t)) {
priv->fts.tc.t = priv->fs.tc.t =
mlx5_create_auto_grouped_flow_table(priv->fts.ns, 0, mlx5_create_auto_grouped_flow_table(priv->fs.ns,
MLX5E_TC_FLOW_TABLE_NUM_ENTRIES, MLX5E_TC_PRIO,
MLX5E_TC_FLOW_TABLE_NUM_GROUPS, MLX5E_TC_TABLE_NUM_ENTRIES,
MLX5E_TC_TABLE_NUM_GROUPS,
0); 0);
if (IS_ERR(priv->fts.tc.t)) { if (IS_ERR(priv->fs.tc.t)) {
netdev_err(priv->netdev, netdev_err(priv->netdev,
"Failed to create tc offload table\n"); "Failed to create tc offload table\n");
return ERR_CAST(priv->fts.tc.t); return ERR_CAST(priv->fs.tc.t);
} }
table_created = true; table_created = true;
} }
rule = mlx5_add_flow_rule(priv->fts.tc.t, MLX5_MATCH_OUTER_HEADERS, rule = mlx5_add_flow_rule(priv->fs.tc.t, MLX5_MATCH_OUTER_HEADERS,
match_c, match_v, match_c, match_v,
action, flow_tag, action, flow_tag,
action & MLX5_FLOW_CONTEXT_ACTION_FWD_DEST ? &dest : NULL); action & MLX5_FLOW_CONTEXT_ACTION_FWD_DEST ? &dest : NULL);
if (IS_ERR(rule) && table_created) { if (IS_ERR(rule) && table_created) {
mlx5_destroy_flow_table(priv->fts.tc.t); mlx5_destroy_flow_table(priv->fs.tc.t);
priv->fts.tc.t = NULL; priv->fs.tc.t = NULL;
} }
return rule; return rule;
@ -94,8 +95,8 @@ static void mlx5e_tc_del_flow(struct mlx5e_priv *priv,
mlx5_del_flow_rule(rule); mlx5_del_flow_rule(rule);
if (!mlx5e_tc_num_filters(priv)) { if (!mlx5e_tc_num_filters(priv)) {
mlx5_destroy_flow_table(priv->fts.tc.t); mlx5_destroy_flow_table(priv->fs.tc.t);
priv->fts.tc.t = NULL; priv->fs.tc.t = NULL;
} }
} }
@ -311,7 +312,7 @@ static int parse_tc_actions(struct mlx5e_priv *priv, struct tcf_exts *exts,
int mlx5e_configure_flower(struct mlx5e_priv *priv, __be16 protocol, int mlx5e_configure_flower(struct mlx5e_priv *priv, __be16 protocol,
struct tc_cls_flower_offload *f) struct tc_cls_flower_offload *f)
{ {
struct mlx5e_tc_flow_table *tc = &priv->fts.tc; struct mlx5e_tc_table *tc = &priv->fs.tc;
u32 *match_c; u32 *match_c;
u32 *match_v; u32 *match_v;
int err = 0; int err = 0;
@ -377,7 +378,7 @@ int mlx5e_delete_flower(struct mlx5e_priv *priv,
struct tc_cls_flower_offload *f) struct tc_cls_flower_offload *f)
{ {
struct mlx5e_tc_flow *flow; struct mlx5e_tc_flow *flow;
struct mlx5e_tc_flow_table *tc = &priv->fts.tc; struct mlx5e_tc_table *tc = &priv->fs.tc;
flow = rhashtable_lookup_fast(&tc->ht, &f->cookie, flow = rhashtable_lookup_fast(&tc->ht, &f->cookie,
tc->ht_params); tc->ht_params);
@ -402,7 +403,7 @@ static const struct rhashtable_params mlx5e_tc_flow_ht_params = {
int mlx5e_tc_init(struct mlx5e_priv *priv) int mlx5e_tc_init(struct mlx5e_priv *priv)
{ {
struct mlx5e_tc_flow_table *tc = &priv->fts.tc; struct mlx5e_tc_table *tc = &priv->fs.tc;
tc->ht_params = mlx5e_tc_flow_ht_params; tc->ht_params = mlx5e_tc_flow_ht_params;
return rhashtable_init(&tc->ht, &tc->ht_params); return rhashtable_init(&tc->ht, &tc->ht_params);
@ -419,12 +420,12 @@ static void _mlx5e_tc_del_flow(void *ptr, void *arg)
void mlx5e_tc_cleanup(struct mlx5e_priv *priv) void mlx5e_tc_cleanup(struct mlx5e_priv *priv)
{ {
struct mlx5e_tc_flow_table *tc = &priv->fts.tc; struct mlx5e_tc_table *tc = &priv->fs.tc;
rhashtable_free_and_destroy(&tc->ht, _mlx5e_tc_del_flow, priv); rhashtable_free_and_destroy(&tc->ht, _mlx5e_tc_del_flow, priv);
if (!IS_ERR_OR_NULL(priv->fts.tc.t)) { if (!IS_ERR_OR_NULL(tc->t)) {
mlx5_destroy_flow_table(priv->fts.tc.t); mlx5_destroy_flow_table(tc->t);
priv->fts.tc.t = NULL; tc->t = NULL;
} }
} }

2
drivers/net/ethernet/mellanox/mlx5/core/en_tc.h
View File

@ -45,7 +45,7 @@ int mlx5e_delete_flower(struct mlx5e_priv *priv,
static inline int mlx5e_tc_num_filters(struct mlx5e_priv *priv) static inline int mlx5e_tc_num_filters(struct mlx5e_priv *priv)
{ {
return atomic_read(&priv->fts.tc.ht.nelems); return atomic_read(&priv->fs.tc.ht.nelems);
} }
#endif /* __MLX5_EN_TC_H__ */ #endif /* __MLX5_EN_TC_H__ */