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

Commit 3984d1a8 authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller
Browse files

mlxsw: spectrum_router: Provide offload indication using nexthop flags 



In a similar fashion to previous patch, use the nexthop flags to provide
offload indication instead of the FIB info's flags.

In case a nexthop in a multipath route can't be offloaded (gateway's MAC
can't be resolved, for example), then its offload flag isn't set.

Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Tested-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 63e701c1

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

+36 −2
Original line number Diff line number Diff line
@@ -2103,13 +2103,47 @@ mlxsw_sp_fib_entry_should_offload(const struct mlxsw_sp_fib_entry *fib_entry) 
	}

}



static void

mlxsw_sp_fib4_entry_offload_set(struct mlxsw_sp_fib_entry *fib_entry)

{

	struct mlxsw_sp_nexthop_group *nh_grp = fib_entry->nh_group;

	int i;



	if (fib_entry->type == MLXSW_SP_FIB_ENTRY_TYPE_LOCAL) {

		nh_grp->nexthops->key.fib_nh->nh_flags |= RTNH_F_OFFLOAD;

		return;

	}



	for (i = 0; i < nh_grp->count; i++) {

		struct mlxsw_sp_nexthop *nh = &nh_grp->nexthops[i];



		if (nh->offloaded)

			nh->key.fib_nh->nh_flags |= RTNH_F_OFFLOAD;

		else

			nh->key.fib_nh->nh_flags &= ~RTNH_F_OFFLOAD;

	}

}



static void

mlxsw_sp_fib4_entry_offload_unset(struct mlxsw_sp_fib_entry *fib_entry)

{

	struct mlxsw_sp_nexthop_group *nh_grp = fib_entry->nh_group;

	int i;



	for (i = 0; i < nh_grp->count; i++) {

		struct mlxsw_sp_nexthop *nh = &nh_grp->nexthops[i];



		nh->key.fib_nh->nh_flags &= ~RTNH_F_OFFLOAD;

	}

}



static void mlxsw_sp_fib_entry_offload_set(struct mlxsw_sp_fib_entry *fib_entry)

{

	fib_entry->offloaded = true;



	switch (fib_entry->fib_node->fib->proto) {

	case MLXSW_SP_L3_PROTO_IPV4:

		fib_info_offload_inc(fib_entry->nh_group->key.fi);

		mlxsw_sp_fib4_entry_offload_set(fib_entry);

		break;

	case MLXSW_SP_L3_PROTO_IPV6:

		WARN_ON_ONCE(1);
@@ -2121,7 +2155,7 @@ mlxsw_sp_fib_entry_offload_unset(struct mlxsw_sp_fib_entry *fib_entry) 
{

	switch (fib_entry->fib_node->fib->proto) {

	case MLXSW_SP_L3_PROTO_IPV4:

		fib_info_offload_dec(fib_entry->nh_group->key.fi);

		mlxsw_sp_fib4_entry_offload_unset(fib_entry);

		break;

	case MLXSW_SP_L3_PROTO_IPV6:

		WARN_ON_ONCE(1);