mlxsw: spectrum_switchdev: Add a ports bitmap to the mid db

Add a bitmap of ports to the mid struct to hold the ports that are
registered to this mid.

Signed-off-by: Nogah Frankel <nogahf@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
index 7180d8f3de7526426792116a113b6b49078556fd..0424bee88407966763b84c2e4a5ce43aa45b9ae9 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
@@ -95,6 +95,7 @@ struct mlxsw_sp_mid {
        u16 fid;
        u16 mid;
        unsigned int ref_count;
+       unsigned long *ports_in_mid; /* bits array */
 };
 
 enum mlxsw_sp_span_type {

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
index 22f8d7428d96174772e6a71d290b07a43b6f6ce6..0fde16a22b729849de37c5578e4f92a6d3e4da39 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
@@ -1239,6 +1239,7 @@ static struct mlxsw_sp_mid *__mlxsw_sp_mc_alloc(struct mlxsw_sp *mlxsw_sp,
                                                u16 fid)
 {
        struct mlxsw_sp_mid *mid;
+       size_t alloc_size;
        u16 mid_idx;
 
        mid_idx = find_first_zero_bit(mlxsw_sp->bridge->mids_bitmap,
@@ -1250,6 +1251,14 @@ static struct mlxsw_sp_mid *__mlxsw_sp_mc_alloc(struct mlxsw_sp *mlxsw_sp,
        if (!mid)
                return NULL;
 
+       alloc_size = sizeof(unsigned long) *
+                    BITS_TO_LONGS(mlxsw_core_max_ports(mlxsw_sp->core));
+       mid->ports_in_mid = kzalloc(alloc_size, GFP_KERNEL);
+       if (!mid->ports_in_mid) {
+               kfree(mid);
+               return NULL;
+       }
+
        set_bit(mid_idx, mlxsw_sp->bridge->mids_bitmap);
        ether_addr_copy(mid->addr, addr);
        mid->fid = fid;
@@ -1260,12 +1269,16 @@ static struct mlxsw_sp_mid *__mlxsw_sp_mc_alloc(struct mlxsw_sp *mlxsw_sp,
        return mid;
 }
 
-static int __mlxsw_sp_mc_dec_ref(struct mlxsw_sp *mlxsw_sp,
+static int __mlxsw_sp_mc_dec_ref(struct mlxsw_sp_port *mlxsw_sp_port,
                                 struct mlxsw_sp_mid *mid)
 {
+       struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;
+
+       clear_bit(mlxsw_sp_port->local_port, mid->ports_in_mid);
        if (--mid->ref_count == 0) {
                list_del(&mid->list);
                clear_bit(mid->mid, mlxsw_sp->bridge->mids_bitmap);
+               kfree(mid->ports_in_mid);
                kfree(mid);
                return 1;
        }
@@ -1311,6 +1324,7 @@ static int mlxsw_sp_port_mdb_add(struct mlxsw_sp_port *mlxsw_sp_port,
                }
        }
        mid->ref_count++;
+       set_bit(mlxsw_sp_port->local_port, mid->ports_in_mid);
 
        err = mlxsw_sp_port_smid_set(mlxsw_sp_port, mid->mid, true,
                                     mid->ref_count == 1);
@@ -1331,7 +1345,7 @@ static int mlxsw_sp_port_mdb_add(struct mlxsw_sp_port *mlxsw_sp_port,
        return 0;
 
 err_out:
-       __mlxsw_sp_mc_dec_ref(mlxsw_sp, mid);
+       __mlxsw_sp_mc_dec_ref(mlxsw_sp_port, mid);
        return err;
 }
 
@@ -1437,7 +1451,7 @@ static int mlxsw_sp_port_mdb_del(struct mlxsw_sp_port *mlxsw_sp_port,
                netdev_err(dev, "Unable to remove port from SMID\n");
 
        mid_idx = mid->mid;
-       if (__mlxsw_sp_mc_dec_ref(mlxsw_sp, mid)) {
+       if (__mlxsw_sp_mc_dec_ref(mlxsw_sp_port, mid)) {
                err = mlxsw_sp_port_mdb_op(mlxsw_sp, mdb->addr, fid_index,
                                           mid_idx, false);
                if (err)