Commit e7e0bee8 authored by Gavi Teitz's avatar Gavi Teitz Committed by Saeed Mahameed

net/mlx5: MPFS, Allow adding the same MAC more than once

Remove the limitation preventing adding a vport's MAC address to the
Multi-Physical Function Switch (MPFS) more than once per E-switch, as
there is no difference in the MPFS if an address is being used by an
E-switch more than once.

This allows the E-switch to have multiple vports with the same MAC
address, allowing vports to be classified by VLAN id instead of by MAC
if desired.
Signed-off-by: default avatarGavi Teitz <gavi@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 6311f308
...@@ -67,6 +67,7 @@ static int del_l2table_entry_cmd(struct mlx5_core_dev *dev, u32 index) ...@@ -67,6 +67,7 @@ static int del_l2table_entry_cmd(struct mlx5_core_dev *dev, u32 index)
struct l2table_node { struct l2table_node {
struct l2addr_node node; struct l2addr_node node;
u32 index; /* index in HW l2 table */ u32 index; /* index in HW l2 table */
int ref_count;
}; };
struct mlx5_mpfs { struct mlx5_mpfs {
...@@ -144,7 +145,7 @@ int mlx5_mpfs_add_mac(struct mlx5_core_dev *dev, u8 *mac) ...@@ -144,7 +145,7 @@ int mlx5_mpfs_add_mac(struct mlx5_core_dev *dev, u8 *mac)
l2addr = l2addr_hash_find(mpfs->hash, mac, struct l2table_node); l2addr = l2addr_hash_find(mpfs->hash, mac, struct l2table_node);
if (l2addr) { if (l2addr) {
err = -EEXIST; l2addr->ref_count++;
goto out; goto out;
} }
...@@ -163,6 +164,7 @@ int mlx5_mpfs_add_mac(struct mlx5_core_dev *dev, u8 *mac) ...@@ -163,6 +164,7 @@ int mlx5_mpfs_add_mac(struct mlx5_core_dev *dev, u8 *mac)
goto set_table_entry_err; goto set_table_entry_err;
l2addr->index = index; l2addr->index = index;
l2addr->ref_count = 1;
mlx5_core_dbg(dev, "MPFS mac added %pM, index (%d)\n", mac, index); mlx5_core_dbg(dev, "MPFS mac added %pM, index (%d)\n", mac, index);
goto out; goto out;
...@@ -194,6 +196,9 @@ int mlx5_mpfs_del_mac(struct mlx5_core_dev *dev, u8 *mac) ...@@ -194,6 +196,9 @@ int mlx5_mpfs_del_mac(struct mlx5_core_dev *dev, u8 *mac)
goto unlock; goto unlock;
} }
if (--l2addr->ref_count > 0)
goto unlock;
index = l2addr->index; index = l2addr->index;
del_l2table_entry_cmd(dev, index); del_l2table_entry_cmd(dev, index);
l2addr_hash_del(l2addr); l2addr_hash_del(l2addr);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment