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

Commit 010cadf9 authored by Petr Machata's avatar Petr Machata Committed by David S. Miller
Browse files

mlxsw: spectrum_router: Support FID-less RIFs 



Loopback RIFs, which will be introduced in a follow-up patch, differ
from other RIFs in that they do not have a FID associated with them.

To support this, demote FID allocation from mlxsw_sp_rif_create to
configure op of the existing RIF types, and likewise the FID release
from mlxsw_sp_rif_destroy to deconfigure op.

Signed-off-by: default avatarPetr Machata <petrm@mellanox.com>
Reviewed-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 38ebc0f4

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

+63 −22
Original line number Original line Diff line number Diff line
@@ -4444,9 +4444,9 @@ mlxsw_sp_rif_create(struct mlxsw_sp *mlxsw_sp, 
{

{

	u32 tb_id = l3mdev_fib_table(params->dev);

	u32 tb_id = l3mdev_fib_table(params->dev);

	const struct mlxsw_sp_rif_ops *ops;

	const struct mlxsw_sp_rif_ops *ops;

	struct mlxsw_sp_fid *fid = NULL;

	enum mlxsw_sp_rif_type type;

	enum mlxsw_sp_rif_type type;

	struct mlxsw_sp_rif *rif;

	struct mlxsw_sp_rif *rif;

	struct mlxsw_sp_fid *fid;

	struct mlxsw_sp_vr *vr;

	struct mlxsw_sp_vr *vr;

	u16 rif_index;

	u16 rif_index;

	int err;

	int err;
@@ -4470,12 +4470,14 @@ mlxsw_sp_rif_create(struct mlxsw_sp *mlxsw_sp, 
	rif->mlxsw_sp = mlxsw_sp;

	rif->mlxsw_sp = mlxsw_sp;

	rif->ops = ops;

	rif->ops = ops;





	if (ops->fid_get) {

		fid = ops->fid_get(rif);

		fid = ops->fid_get(rif);

		if (IS_ERR(fid)) {

		if (IS_ERR(fid)) {

			err = PTR_ERR(fid);

			err = PTR_ERR(fid);

			goto err_fid_get;

			goto err_fid_get;

		}

		}

		rif->fid = fid;

		rif->fid = fid;

	}





	if (ops->setup)

	if (ops->setup)

		ops->setup(rif, params);

		ops->setup(rif, params);
@@ -4484,21 +4486,14 @@ mlxsw_sp_rif_create(struct mlxsw_sp *mlxsw_sp, 
	if (err)

	if (err)

		goto err_configure;

		goto err_configure;





	err = mlxsw_sp_rif_fdb_op(mlxsw_sp, params->dev->dev_addr,

				  mlxsw_sp_fid_index(fid), true);

	if (err)

		goto err_rif_fdb_op;



	mlxsw_sp_rif_counters_alloc(rif);

	mlxsw_sp_rif_counters_alloc(rif);

	mlxsw_sp_fid_rif_set(fid, rif);

	mlxsw_sp->router->rifs[rif_index] = rif;

	mlxsw_sp->router->rifs[rif_index] = rif;

	vr->rif_count++;

	vr->rif_count++;





	return rif;

	return rif;





err_rif_fdb_op:

	ops->deconfigure(rif);

err_configure:

err_configure:

	if (fid)

		mlxsw_sp_fid_put(fid);

		mlxsw_sp_fid_put(fid);

err_fid_get:

err_fid_get:

	kfree(rif);

	kfree(rif);
@@ -4520,11 +4515,10 @@ void mlxsw_sp_rif_destroy(struct mlxsw_sp_rif *rif) 




	vr->rif_count--;

	vr->rif_count--;

	mlxsw_sp->router->rifs[rif->rif_index] = NULL;

	mlxsw_sp->router->rifs[rif->rif_index] = NULL;

	mlxsw_sp_fid_rif_set(fid, NULL);

	mlxsw_sp_rif_counters_free(rif);

	mlxsw_sp_rif_counters_free(rif);

	mlxsw_sp_rif_fdb_op(mlxsw_sp, rif->dev->dev_addr,

			    mlxsw_sp_fid_index(fid), false);

	ops->deconfigure(rif);

	ops->deconfigure(rif);

	if (fid)

		/* Loopback RIFs are not associated with a FID. */

		mlxsw_sp_fid_put(fid);

		mlxsw_sp_fid_put(fid);

	kfree(rif);

	kfree(rif);

	mlxsw_sp_vr_put(vr);

	mlxsw_sp_vr_put(vr);
@@ -4965,11 +4959,32 @@ static int mlxsw_sp_rif_subport_op(struct mlxsw_sp_rif *rif, bool enable) 




static int mlxsw_sp_rif_subport_configure(struct mlxsw_sp_rif *rif)

static int mlxsw_sp_rif_subport_configure(struct mlxsw_sp_rif *rif)

{

{

	return mlxsw_sp_rif_subport_op(rif, true);

	int err;



	err = mlxsw_sp_rif_subport_op(rif, true);

	if (err)

		return err;



	err = mlxsw_sp_rif_fdb_op(rif->mlxsw_sp, rif->dev->dev_addr,

				  mlxsw_sp_fid_index(rif->fid), true);

	if (err)

		goto err_rif_fdb_op;



	mlxsw_sp_fid_rif_set(rif->fid, rif);

	return 0;



err_rif_fdb_op:

	mlxsw_sp_rif_subport_op(rif, false);

	return err;

}

}





static void mlxsw_sp_rif_subport_deconfigure(struct mlxsw_sp_rif *rif)

static void mlxsw_sp_rif_subport_deconfigure(struct mlxsw_sp_rif *rif)

{

{

	struct mlxsw_sp_fid *fid = rif->fid;



	mlxsw_sp_fid_rif_set(fid, NULL);

	mlxsw_sp_rif_fdb_op(rif->mlxsw_sp, rif->dev->dev_addr,

			    mlxsw_sp_fid_index(fid), false);

	mlxsw_sp_rif_subport_op(rif, false);

	mlxsw_sp_rif_subport_op(rif, false);

}

}
@@ -5028,8 +5043,17 @@ static int mlxsw_sp_rif_vlan_configure(struct mlxsw_sp_rif *rif) 
	if (err)

	if (err)

		goto err_fid_bc_flood_set;

		goto err_fid_bc_flood_set;





	err = mlxsw_sp_rif_fdb_op(rif->mlxsw_sp, rif->dev->dev_addr,

				  mlxsw_sp_fid_index(rif->fid), true);

	if (err)

		goto err_rif_fdb_op;



	mlxsw_sp_fid_rif_set(rif->fid, rif);

	return 0;

	return 0;





err_rif_fdb_op:

	mlxsw_sp_fid_flood_set(rif->fid, MLXSW_SP_FLOOD_TYPE_BC,

			       mlxsw_sp_router_port(mlxsw_sp), false);

err_fid_bc_flood_set:

err_fid_bc_flood_set:

	mlxsw_sp_fid_flood_set(rif->fid, MLXSW_SP_FLOOD_TYPE_MC,

	mlxsw_sp_fid_flood_set(rif->fid, MLXSW_SP_FLOOD_TYPE_MC,

			       mlxsw_sp_router_port(mlxsw_sp), false);

			       mlxsw_sp_router_port(mlxsw_sp), false);
@@ -5040,9 +5064,13 @@ static int mlxsw_sp_rif_vlan_configure(struct mlxsw_sp_rif *rif) 




static void mlxsw_sp_rif_vlan_deconfigure(struct mlxsw_sp_rif *rif)

static void mlxsw_sp_rif_vlan_deconfigure(struct mlxsw_sp_rif *rif)

{

{

	struct mlxsw_sp *mlxsw_sp = rif->mlxsw_sp;

	u16 vid = mlxsw_sp_fid_8021q_vid(rif->fid);

	u16 vid = mlxsw_sp_fid_8021q_vid(rif->fid);

	struct mlxsw_sp *mlxsw_sp = rif->mlxsw_sp;

	struct mlxsw_sp_fid *fid = rif->fid;





	mlxsw_sp_fid_rif_set(fid, NULL);

	mlxsw_sp_rif_fdb_op(rif->mlxsw_sp, rif->dev->dev_addr,

			    mlxsw_sp_fid_index(fid), false);

	mlxsw_sp_fid_flood_set(rif->fid, MLXSW_SP_FLOOD_TYPE_BC,

	mlxsw_sp_fid_flood_set(rif->fid, MLXSW_SP_FLOOD_TYPE_BC,

			       mlxsw_sp_router_port(mlxsw_sp), false);

			       mlxsw_sp_router_port(mlxsw_sp), false);

	mlxsw_sp_fid_flood_set(rif->fid, MLXSW_SP_FLOOD_TYPE_MC,

	mlxsw_sp_fid_flood_set(rif->fid, MLXSW_SP_FLOOD_TYPE_MC,
@@ -5087,8 +5115,17 @@ static int mlxsw_sp_rif_fid_configure(struct mlxsw_sp_rif *rif) 
	if (err)

	if (err)

		goto err_fid_bc_flood_set;

		goto err_fid_bc_flood_set;





	err = mlxsw_sp_rif_fdb_op(rif->mlxsw_sp, rif->dev->dev_addr,

				  mlxsw_sp_fid_index(rif->fid), true);

	if (err)

		goto err_rif_fdb_op;



	mlxsw_sp_fid_rif_set(rif->fid, rif);

	return 0;

	return 0;





err_rif_fdb_op:

	mlxsw_sp_fid_flood_set(rif->fid, MLXSW_SP_FLOOD_TYPE_BC,

			       mlxsw_sp_router_port(mlxsw_sp), false);

err_fid_bc_flood_set:

err_fid_bc_flood_set:

	mlxsw_sp_fid_flood_set(rif->fid, MLXSW_SP_FLOOD_TYPE_MC,

	mlxsw_sp_fid_flood_set(rif->fid, MLXSW_SP_FLOOD_TYPE_MC,

			       mlxsw_sp_router_port(mlxsw_sp), false);

			       mlxsw_sp_router_port(mlxsw_sp), false);
@@ -5099,9 +5136,13 @@ static int mlxsw_sp_rif_fid_configure(struct mlxsw_sp_rif *rif) 




static void mlxsw_sp_rif_fid_deconfigure(struct mlxsw_sp_rif *rif)

static void mlxsw_sp_rif_fid_deconfigure(struct mlxsw_sp_rif *rif)

{

{

	struct mlxsw_sp *mlxsw_sp = rif->mlxsw_sp;

	u16 fid_index = mlxsw_sp_fid_index(rif->fid);

	u16 fid_index = mlxsw_sp_fid_index(rif->fid);

	struct mlxsw_sp *mlxsw_sp = rif->mlxsw_sp;

	struct mlxsw_sp_fid *fid = rif->fid;





	mlxsw_sp_fid_rif_set(fid, NULL);

	mlxsw_sp_rif_fdb_op(rif->mlxsw_sp, rif->dev->dev_addr,

			    mlxsw_sp_fid_index(fid), false);

	mlxsw_sp_fid_flood_set(rif->fid, MLXSW_SP_FLOOD_TYPE_BC,

	mlxsw_sp_fid_flood_set(rif->fid, MLXSW_SP_FLOOD_TYPE_BC,

			       mlxsw_sp_router_port(mlxsw_sp), false);

			       mlxsw_sp_router_port(mlxsw_sp), false);

	mlxsw_sp_fid_flood_set(rif->fid, MLXSW_SP_FLOOD_TYPE_MC,

	mlxsw_sp_fid_flood_set(rif->fid, MLXSW_SP_FLOOD_TYPE_MC,