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: Gavi Teitz <gavi@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c b/drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c
index 9ae7dad590a966ff449d33295b7cca278c9e470a..3118e8d664072d60790afb5ff139992005324b9f 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c
@@ -67,6 +67,7 @@ static int del_l2table_entry_cmd(struct mlx5_core_dev *dev, u32 index)
 struct l2table_node {
        struct l2addr_node node;
        u32                index; /* index in HW l2 table */
+       int                ref_count;
 };
 
 struct mlx5_mpfs {
@@ -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);
        if (l2addr) {
-               err = -EEXIST;
+               l2addr->ref_count++;
                goto out;
        }
 
@@ -163,6 +164,7 @@ int mlx5_mpfs_add_mac(struct mlx5_core_dev *dev, u8 *mac)
                goto set_table_entry_err;
 
        l2addr->index = index;
+       l2addr->ref_count = 1;
 
        mlx5_core_dbg(dev, "MPFS mac added %pM, index (%d)\n", mac, index);
        goto out;
@@ -194,6 +196,9 @@ int mlx5_mpfs_del_mac(struct mlx5_core_dev *dev, u8 *mac)
                goto unlock;
        }
 
+       if (--l2addr->ref_count > 0)
+               goto unlock;
+
        index = l2addr->index;
        del_l2table_entry_cmd(dev, index);
        l2addr_hash_del(l2addr);