Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83de7883 authored by Petr Machata's avatar Petr Machata Committed by David S. Miller
Browse files

mlxsw: spectrum: Add mlxsw_sp_fid_ops.fdb_clear_offload 



If there are any offloaded FDB entries at bridge master of an NVE device
at the time that it's un-offloaded, their offloaded marks need to be
cleared. How that is done depends on whether the bridge in question is
vlan aware. Therefore add a per-FID-type operation.

Implement the operation for the 802.1q and 802.1d bridges.

Add and publish a function mlxsw_sp_fid_fdb_clear_offload() to dispatch
to the new operation according to FID type.

Signed-off-by: default avatarPetr Machata <petrm@mellanox.com>
Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b73ef0e0

drivers/net/ethernet/mellanox/mlxsw/spectrum.h

+2 −0
Original line number Diff line number Diff line
@@ -763,6 +763,8 @@ int mlxsw_sp_fid_vni_set(struct mlxsw_sp_fid *fid, enum mlxsw_sp_nve_type type, 
			 __be32 vni, int nve_ifindex);

void mlxsw_sp_fid_vni_clear(struct mlxsw_sp_fid *fid);

bool mlxsw_sp_fid_vni_is_set(const struct mlxsw_sp_fid *fid);

void mlxsw_sp_fid_fdb_clear_offload(const struct mlxsw_sp_fid *fid,

				    const struct net_device *nve_dev);

int mlxsw_sp_fid_flood_set(struct mlxsw_sp_fid *fid,

			   enum mlxsw_sp_flood_type packet_type, u8 local_port,

			   bool member);

drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c

+28 −0
Original line number Diff line number Diff line
@@ -85,6 +85,8 @@ struct mlxsw_sp_fid_ops { 
	int (*nve_flood_index_set)(struct mlxsw_sp_fid *fid,

				   u32 nve_flood_index);

	void (*nve_flood_index_clear)(struct mlxsw_sp_fid *fid);

	void (*fdb_clear_offload)(const struct mlxsw_sp_fid *fid,

				  const struct net_device *nve_dev);

};



struct mlxsw_sp_fid_family {
@@ -277,6 +279,16 @@ bool mlxsw_sp_fid_vni_is_set(const struct mlxsw_sp_fid *fid) 
	return fid->vni_valid;

}



void mlxsw_sp_fid_fdb_clear_offload(const struct mlxsw_sp_fid *fid,

				    const struct net_device *nve_dev)

{

	struct mlxsw_sp_fid_family *fid_family = fid->fid_family;

	const struct mlxsw_sp_fid_ops *ops = fid_family->ops;



	if (ops->fdb_clear_offload)

		ops->fdb_clear_offload(fid, nve_dev);

}



static const struct mlxsw_sp_flood_table *

mlxsw_sp_fid_flood_table_lookup(const struct mlxsw_sp_fid *fid,

				enum mlxsw_sp_flood_type packet_type)
@@ -766,6 +778,13 @@ static void mlxsw_sp_fid_8021d_nve_flood_index_clear(struct mlxsw_sp_fid *fid) 
			    fid->vni_valid, 0, false);

}



static void

mlxsw_sp_fid_8021d_fdb_clear_offload(const struct mlxsw_sp_fid *fid,

				     const struct net_device *nve_dev)

{

	br_fdb_clear_offload(nve_dev, 0);

}



static const struct mlxsw_sp_fid_ops mlxsw_sp_fid_8021d_ops = {

	.setup			= mlxsw_sp_fid_8021d_setup,

	.configure		= mlxsw_sp_fid_8021d_configure,
@@ -779,6 +798,7 @@ static const struct mlxsw_sp_fid_ops mlxsw_sp_fid_8021d_ops = { 
	.vni_clear		= mlxsw_sp_fid_8021d_vni_clear,

	.nve_flood_index_set	= mlxsw_sp_fid_8021d_nve_flood_index_set,

	.nve_flood_index_clear	= mlxsw_sp_fid_8021d_nve_flood_index_clear,

	.fdb_clear_offload	= mlxsw_sp_fid_8021d_fdb_clear_offload,

};



static const struct mlxsw_sp_flood_table mlxsw_sp_fid_8021d_flood_tables[] = {
@@ -815,6 +835,13 @@ static const struct mlxsw_sp_fid_family mlxsw_sp_fid_8021d_family = { 
	.lag_vid_valid		= 1,

};



static void

mlxsw_sp_fid_8021q_fdb_clear_offload(const struct mlxsw_sp_fid *fid,

				     const struct net_device *nve_dev)

{

	br_fdb_clear_offload(nve_dev, mlxsw_sp_fid_8021q_vid(fid));

}



static const struct mlxsw_sp_fid_ops mlxsw_sp_fid_8021q_emu_ops = {

	.setup			= mlxsw_sp_fid_8021q_setup,

	.configure		= mlxsw_sp_fid_8021d_configure,
@@ -828,6 +855,7 @@ static const struct mlxsw_sp_fid_ops mlxsw_sp_fid_8021q_emu_ops = { 
	.vni_clear		= mlxsw_sp_fid_8021d_vni_clear,

	.nve_flood_index_set	= mlxsw_sp_fid_8021d_nve_flood_index_set,

	.nve_flood_index_clear	= mlxsw_sp_fid_8021d_nve_flood_index_clear,

	.fdb_clear_offload	= mlxsw_sp_fid_8021q_fdb_clear_offload,

};



/* There are 4K-2 emulated 802.1Q FIDs, starting right after the 802.1D FIDs */