Commit 5c9a3b24 authored by Ido Schimmel's avatar Ido Schimmel Committed by Jakub Kicinski
Browse files

mlxsw: spectrum_router: Set FIB entry's type after creating nexthop group 



Each FIB entry has a type (e.g., remote, local) that determines how the
entry is programmed to the device. In order to determine if the entry is
local (directly connected) or remote (has a gateway) the relevant FIB
info structures (e.g., 'struct fib_info') are checked.

When entries that use nexthop objects are supported, these checks will
need to be changed to take into account 'struct nexthop'.

Instead, first associate the entry with a nexthop group so that the next
patch could determine the entry's type based on the associated nexthop
group's type.

Signed-off-by: default avatarIdo Schimmel <idosch@nvidia.com>
Reviewed-by: default avatarJiri Pirko <jiri@nvidia.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent c68e248d

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

+9 −9
Original line number Diff line number Diff line
@@ -4864,14 +4864,14 @@ mlxsw_sp_fib4_entry_create(struct mlxsw_sp *mlxsw_sp, 
		goto err_fib_entry_priv_create;

	}



	err = mlxsw_sp_fib4_entry_type_set(mlxsw_sp, fen_info, fib_entry);

	if (err)

		goto err_fib4_entry_type_set;



	err = mlxsw_sp_nexthop4_group_get(mlxsw_sp, fib_entry, fen_info->fi);

	if (err)

		goto err_nexthop4_group_get;



	err = mlxsw_sp_fib4_entry_type_set(mlxsw_sp, fen_info, fib_entry);

	if (err)

		goto err_fib4_entry_type_set;



	fib4_entry->fi = fen_info->fi;

	fib_info_hold(fib4_entry->fi);

	fib4_entry->tb_id = fen_info->tb_id;
@@ -4882,9 +4882,9 @@ mlxsw_sp_fib4_entry_create(struct mlxsw_sp *mlxsw_sp, 


	return fib4_entry;



err_nexthop4_group_get:

	mlxsw_sp_fib4_entry_type_unset(mlxsw_sp, fib_entry);

err_fib4_entry_type_set:

	mlxsw_sp_nexthop4_group_put(mlxsw_sp, &fib4_entry->common);

err_nexthop4_group_get:

	mlxsw_sp_fib_entry_priv_put(fib_entry->priv);

err_fib_entry_priv_create:

	kfree(fib4_entry);
@@ -4895,8 +4895,8 @@ static void mlxsw_sp_fib4_entry_destroy(struct mlxsw_sp *mlxsw_sp, 
					struct mlxsw_sp_fib4_entry *fib4_entry)

{

	fib_info_put(fib4_entry->fi);

	mlxsw_sp_nexthop4_group_put(mlxsw_sp, &fib4_entry->common);

	mlxsw_sp_fib4_entry_type_unset(mlxsw_sp, &fib4_entry->common);

	mlxsw_sp_nexthop4_group_put(mlxsw_sp, &fib4_entry->common);

	mlxsw_sp_fib_entry_priv_put(fib4_entry->common.priv);

	kfree(fib4_entry);

}
@@ -5692,12 +5692,12 @@ mlxsw_sp_fib6_entry_create(struct mlxsw_sp *mlxsw_sp, 
		fib6_entry->nrt6++;

	}



	mlxsw_sp_fib6_entry_type_set(mlxsw_sp, fib_entry, rt_arr[0]);



	err = mlxsw_sp_nexthop6_group_get(mlxsw_sp, fib6_entry);

	if (err)

		goto err_nexthop6_group_get;



	mlxsw_sp_fib6_entry_type_set(mlxsw_sp, fib_entry, rt_arr[0]);



	fib_entry->fib_node = fib_node;



	return fib6_entry;

CRA Git | Maintained and supported by SUSTech CRA and CCSE