AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-27 20:25:09 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Nogah Frankel 2017-09-20 16:15:02 +02:00 committed by David S. Miller
parent dff37b58ca
commit 4cdc35e4eb
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/ethernet/mellanox/mlxsw/spectrum.h
View File

@ -95,6 +95,7 @@ struct mlxsw_sp_mid {
u16 fid; u16 fid;
u16 mid; u16 mid;
unsigned int ref_count; unsigned int ref_count;
unsigned long *ports_in_mid; /* bits array */
}; };
enum mlxsw_sp_span_type { enum mlxsw_sp_span_type {

20
drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
View File

@ -1239,6 +1239,7 @@ static struct mlxsw_sp_mid *__mlxsw_sp_mc_alloc(struct mlxsw_sp *mlxsw_sp,
u16 fid) u16 fid)
{ {
struct mlxsw_sp_mid *mid; struct mlxsw_sp_mid *mid;
size_t alloc_size;
u16 mid_idx; u16 mid_idx;
mid_idx = find_first_zero_bit(mlxsw_sp->bridge->mids_bitmap, 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) if (!mid)
return NULL; 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); set_bit(mid_idx, mlxsw_sp->bridge->mids_bitmap);
ether_addr_copy(mid->addr, addr); ether_addr_copy(mid->addr, addr);
mid->fid = fid; mid->fid = fid;
@ -1260,12 +1269,16 @@ static struct mlxsw_sp_mid *__mlxsw_sp_mc_alloc(struct mlxsw_sp *mlxsw_sp,
return mid; 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_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) { if (--mid->ref_count == 0) {
list_del(&mid->list); list_del(&mid->list);
clear_bit(mid->mid, mlxsw_sp->bridge->mids_bitmap); clear_bit(mid->mid, mlxsw_sp->bridge->mids_bitmap);
kfree(mid->ports_in_mid);
kfree(mid); kfree(mid);
return 1; return 1;
} }
@ -1311,6 +1324,7 @@ static int mlxsw_sp_port_mdb_add(struct mlxsw_sp_port *mlxsw_sp_port,
} }
} }
mid->ref_count++; 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, err = mlxsw_sp_port_smid_set(mlxsw_sp_port, mid->mid, true,
mid->ref_count == 1); mid->ref_count == 1);
@ -1331,7 +1345,7 @@ static int mlxsw_sp_port_mdb_add(struct mlxsw_sp_port *mlxsw_sp_port,
return 0; return 0;
err_out: err_out:
__mlxsw_sp_mc_dec_ref(mlxsw_sp, mid); __mlxsw_sp_mc_dec_ref(mlxsw_sp_port, mid);
return err; 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"); netdev_err(dev, "Unable to remove port from SMID\n");
mid_idx = mid->mid; 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, err = mlxsw_sp_port_mdb_op(mlxsw_sp, mdb->addr, fid_index,
mid_idx, false); mid_idx, false);
if (err) if (err)