Commit 5f61385d authored by Moni Shoua's avatar Moni Shoua Committed by David S. Miller
Browse files

net/mlx4_core: Keep VLAN/MAC tables mirrored in multifunc HA mode 



Due to HW limitations, indexes to MAC and VLAN tables are always taken
from the table of the actual port. So, if a resource holds an index to
a table, it may refer to different values during the lifetime of the
resource,  unless the tables are mirrored. Also, even when
driver is not in HA mode the policy of allocating an index to these
tables is such to make sure, as much as possible, that when the time
comes the mirroring will be successful. This means that in multifunction
mode the allocation of a free index in a port's table tries to make sure
that the same index in the other's port table is also free.

Signed-off-by: default avatarMoni Shoua <monis@mellanox.com>
Reviewed-by: default avatarJack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 78efed27

drivers/net/ethernet/mellanox/mlx4/mlx4.h

+6 −0
Original line number Diff line number Diff line
@@ -736,6 +736,7 @@ struct mlx4_catas_err { 
struct mlx4_mac_table {

	__be64			entries[MLX4_MAX_MAC_NUM];

	int			refs[MLX4_MAX_MAC_NUM];

	bool			is_dup[MLX4_MAX_MAC_NUM];

	struct mutex		mutex;

	int			total;

	int			max;
@@ -758,6 +759,7 @@ struct mlx4_roce_gid_table { 
struct mlx4_vlan_table {

	__be32			entries[MLX4_MAX_VLAN_NUM];

	int			refs[MLX4_MAX_VLAN_NUM];

	int			is_dup[MLX4_MAX_VLAN_NUM];

	struct mutex		mutex;

	int			total;

	int			max;
@@ -1225,6 +1227,10 @@ void mlx4_init_roce_gid_table(struct mlx4_dev *dev, 
			      struct mlx4_roce_gid_table *table);

void __mlx4_unregister_vlan(struct mlx4_dev *dev, u8 port, u16 vlan);

int __mlx4_register_vlan(struct mlx4_dev *dev, u8 port, u16 vlan, int *index);

int mlx4_bond_vlan_table(struct mlx4_dev *dev);

int mlx4_unbond_vlan_table(struct mlx4_dev *dev);

int mlx4_bond_mac_table(struct mlx4_dev *dev);

int mlx4_unbond_mac_table(struct mlx4_dev *dev);



int mlx4_SET_PORT(struct mlx4_dev *dev, u8 port, int pkey_tbl_sz);

/* resource tracker functions*/

drivers/net/ethernet/mellanox/mlx4/port.c

+575 −23

File changed.

Preview size limit exceeded, changes collapsed.

include/linux/mlx4/driver.h

+5 −0
Original line number Diff line number Diff line
@@ -75,6 +75,11 @@ static inline int mlx4_is_bonded(struct mlx4_dev *dev) 
	return !!(dev->flags & MLX4_FLAG_BONDED);

}



static inline int mlx4_is_mf_bonded(struct mlx4_dev *dev)

{

	return (mlx4_is_bonded(dev) && mlx4_is_mfunc(dev));

}



struct mlx4_port_map {

	u8	port1;

	u8	port2;

CRA Git | Maintained and supported by SUSTech CRA and CCSE