Commit 9ce254d9 authored by Ido Schimmel's avatar Ido Schimmel Committed by Jakub Kicinski
Browse files

mlxsw: spectrum_router: Store FIB info in route 



When needed, IPv4 routes fetch the FIB info (i.e., 'struct fib_info')
from their associated nexthop group. This will not work when the nexthop
group represents a nexthop object (i.e., 'struct nexthop'), as it will
only have access to the nexthop's identifier.

Instead, store the FIB info in the route itself.

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 02d8fdca

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

+7 −6
Original line number Diff line number Diff line
@@ -431,6 +431,7 @@ struct mlxsw_sp_fib_entry { 


struct mlxsw_sp_fib4_entry {

	struct mlxsw_sp_fib_entry common;

	struct fib_info *fi;

	u32 tb_id;

	u32 prio;

	u8 tos;
@@ -4240,7 +4241,6 @@ static void 
mlxsw_sp_fib4_entry_hw_flags_set(struct mlxsw_sp *mlxsw_sp,

				 struct mlxsw_sp_fib_entry *fib_entry)

{

	struct fib_info *fi = mlxsw_sp_nexthop4_group_fi(fib_entry->nh_group);

	u32 *p_dst = (u32 *) fib_entry->fib_node->key.addr;

	int dst_len = fib_entry->fib_node->key.prefix_len;

	struct mlxsw_sp_fib4_entry *fib4_entry;
@@ -4250,7 +4250,7 @@ mlxsw_sp_fib4_entry_hw_flags_set(struct mlxsw_sp *mlxsw_sp, 
	should_offload = mlxsw_sp_fib_entry_should_offload(fib_entry);

	fib4_entry = container_of(fib_entry, struct mlxsw_sp_fib4_entry,

				  common);

	fri.fi = fi;

	fri.fi = fib4_entry->fi;

	fri.tb_id = fib4_entry->tb_id;

	fri.dst = cpu_to_be32(*p_dst);

	fri.dst_len = dst_len;
@@ -4265,7 +4265,6 @@ static void 
mlxsw_sp_fib4_entry_hw_flags_clear(struct mlxsw_sp *mlxsw_sp,

				   struct mlxsw_sp_fib_entry *fib_entry)

{

	struct fib_info *fi = mlxsw_sp_nexthop4_group_fi(fib_entry->nh_group);

	u32 *p_dst = (u32 *) fib_entry->fib_node->key.addr;

	int dst_len = fib_entry->fib_node->key.prefix_len;

	struct mlxsw_sp_fib4_entry *fib4_entry;
@@ -4273,7 +4272,7 @@ mlxsw_sp_fib4_entry_hw_flags_clear(struct mlxsw_sp *mlxsw_sp, 


	fib4_entry = container_of(fib_entry, struct mlxsw_sp_fib4_entry,

				  common);

	fri.fi = fi;

	fri.fi = fib4_entry->fi;

	fri.tb_id = fib4_entry->tb_id;

	fri.dst = cpu_to_be32(*p_dst);

	fri.dst_len = dst_len;
@@ -4831,6 +4830,8 @@ mlxsw_sp_fib4_entry_create(struct mlxsw_sp *mlxsw_sp, 
	if (err)

		goto err_nexthop4_group_get;



	fib4_entry->fi = fen_info->fi;

	fib_info_hold(fib4_entry->fi);

	fib4_entry->prio = fen_info->fi->fib_priority;

	fib4_entry->tb_id = fen_info->tb_id;

	fib4_entry->type = fen_info->type;
@@ -4852,6 +4853,7 @@ mlxsw_sp_fib4_entry_create(struct mlxsw_sp *mlxsw_sp, 
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_fib_entry_priv_put(fib4_entry->common.priv);
@@ -4883,8 +4885,7 @@ mlxsw_sp_fib4_entry_lookup(struct mlxsw_sp *mlxsw_sp, 
	if (fib4_entry->tb_id == fen_info->tb_id &&

	    fib4_entry->tos == fen_info->tos &&

	    fib4_entry->type == fen_info->type &&

	    mlxsw_sp_nexthop4_group_fi(fib4_entry->common.nh_group) ==

	    fen_info->fi)

	    fib4_entry->fi == fen_info->fi)

		return fib4_entry;



	return NULL;