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

Commit b75ed8b1 authored by David Ahern's avatar David Ahern Committed by David S. Miller
Browse files

ipv4: Rename fib_nh entries 



Rename fib_nh entries that will be moved to a fib_nh_common struct.
Specifically, the device, oif, gateway, flags, scope, lwtstate,
nh_weight and nh_upper_bound are common with all nexthop definitions.
In the process shorten fib_nh_lwtstate to fib_nh_lws to avoid really
long lines.

Rename only; no functional change intended.

Signed-off-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 572bf4dd

drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c

+6 −6
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static void mlx5_lag_fib_route_event(struct mlx5_lag *ldev, 
	/* Handle add/replace event */

	if (fi->fib_nhs == 1) {

		if (__mlx5_lag_is_active(ldev)) {

			struct net_device *nh_dev = fi->fib_nh[0].nh_dev;

			struct net_device *nh_dev = fi->fib_nh[0].fib_nh_dev;

			int i = mlx5_lag_dev_get_netdev_idx(ldev, nh_dev);



			mlx5_lag_set_port_affinity(ldev, ++i);
@@ -134,10 +134,10 @@ static void mlx5_lag_fib_route_event(struct mlx5_lag *ldev, 
		return;



	/* Verify next hops are ports of the same hca */

	if (!(fi->fib_nh[0].nh_dev == ldev->pf[0].netdev &&

	      fi->fib_nh[1].nh_dev == ldev->pf[1].netdev) &&

	    !(fi->fib_nh[0].nh_dev == ldev->pf[1].netdev &&

	      fi->fib_nh[1].nh_dev == ldev->pf[0].netdev)) {

	if (!(fi->fib_nh[0].fib_nh_dev == ldev->pf[0].netdev &&

	      fi->fib_nh[1].fib_nh_dev == ldev->pf[1].netdev) &&

	    !(fi->fib_nh[0].fib_nh_dev == ldev->pf[1].netdev &&

	      fi->fib_nh[1].fib_nh_dev == ldev->pf[0].netdev)) {

		mlx5_core_warn(ldev->pf[0].dev, "Multipath offload require two ports of the same HCA\n");

		return;

	}
@@ -167,7 +167,7 @@ static void mlx5_lag_fib_nexthop_event(struct mlx5_lag *ldev, 


	/* nh added/removed */

	if (event == FIB_EVENT_NH_DEL) {

		int i = mlx5_lag_dev_get_netdev_idx(ldev, fib_nh->nh_dev);

		int i = mlx5_lag_dev_get_netdev_idx(ldev, fib_nh->fib_nh_dev);



		if (i >= 0) {

			i = (i + 1) % 2 + 1; /* peer port */

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

+11 −11
Original line number Diff line number Diff line
@@ -3610,7 +3610,7 @@ static bool mlxsw_sp_nexthop4_ipip_type(const struct mlxsw_sp *mlxsw_sp, 
					const struct fib_nh *fib_nh,

					enum mlxsw_sp_ipip_type *p_ipipt)

{

	struct net_device *dev = fib_nh->nh_dev;

	struct net_device *dev = fib_nh->fib_nh_dev;



	return dev &&

	       fib_nh->nh_parent->fib_type == RTN_UNICAST &&
@@ -3637,7 +3637,7 @@ static int mlxsw_sp_nexthop4_type_init(struct mlxsw_sp *mlxsw_sp, 
				       struct fib_nh *fib_nh)

{

	const struct mlxsw_sp_ipip_ops *ipip_ops;

	struct net_device *dev = fib_nh->nh_dev;

	struct net_device *dev = fib_nh->fib_nh_dev;

	struct mlxsw_sp_ipip_entry *ipip_entry;

	struct mlxsw_sp_rif *rif;

	int err;
@@ -3681,18 +3681,18 @@ static int mlxsw_sp_nexthop4_init(struct mlxsw_sp *mlxsw_sp, 
				  struct mlxsw_sp_nexthop *nh,

				  struct fib_nh *fib_nh)

{

	struct net_device *dev = fib_nh->nh_dev;

	struct net_device *dev = fib_nh->fib_nh_dev;

	struct in_device *in_dev;

	int err;



	nh->nh_grp = nh_grp;

	nh->key.fib_nh = fib_nh;

#ifdef CONFIG_IP_ROUTE_MULTIPATH

	nh->nh_weight = fib_nh->nh_weight;

	nh->nh_weight = fib_nh->fib_nh_weight;

#else

	nh->nh_weight = 1;

#endif

	memcpy(&nh->gw_addr, &fib_nh->nh_gw, sizeof(fib_nh->nh_gw));

	memcpy(&nh->gw_addr, &fib_nh->fib_nh_gw4, sizeof(fib_nh->fib_nh_gw4));

	err = mlxsw_sp_nexthop_insert(mlxsw_sp, nh);

	if (err)

		return err;
@@ -3705,7 +3705,7 @@ static int mlxsw_sp_nexthop4_init(struct mlxsw_sp *mlxsw_sp, 


	in_dev = __in_dev_get_rtnl(dev);

	if (in_dev && IN_DEV_IGNORE_ROUTES_WITH_LINKDOWN(in_dev) &&

	    fib_nh->nh_flags & RTNH_F_LINKDOWN)

	    fib_nh->fib_nh_flags & RTNH_F_LINKDOWN)

		return 0;



	err = mlxsw_sp_nexthop4_type_init(mlxsw_sp, nh, fib_nh);
@@ -3804,7 +3804,7 @@ static void mlxsw_sp_nexthop_rif_gone_sync(struct mlxsw_sp *mlxsw_sp, 
static bool mlxsw_sp_fi_is_gateway(const struct mlxsw_sp *mlxsw_sp,

				   const struct fib_info *fi)

{

	return fi->fib_nh->nh_scope == RT_SCOPE_LINK ||

	return fi->fib_nh->fib_nh_scope == RT_SCOPE_LINK ||

	       mlxsw_sp_nexthop4_ipip_type(mlxsw_sp, fi->fib_nh, NULL);

}
@@ -3966,7 +3966,7 @@ mlxsw_sp_fib4_entry_offload_set(struct mlxsw_sp_fib_entry *fib_entry) 
	    fib_entry->type == MLXSW_SP_FIB_ENTRY_TYPE_BLACKHOLE ||

	    fib_entry->type == MLXSW_SP_FIB_ENTRY_TYPE_IPIP_DECAP ||

	    fib_entry->type == MLXSW_SP_FIB_ENTRY_TYPE_NVE_DECAP) {

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

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

		return;

	}
@@ -3974,9 +3974,9 @@ mlxsw_sp_fib4_entry_offload_set(struct mlxsw_sp_fib_entry *fib_entry) 
		struct mlxsw_sp_nexthop *nh = &nh_grp->nexthops[i];



		if (nh->offloaded)

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

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

		else

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

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

	}

}
@@ -3992,7 +3992,7 @@ mlxsw_sp_fib4_entry_offload_unset(struct mlxsw_sp_fib_entry *fib_entry) 
	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;

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

	}

}

drivers/net/ethernet/rocker/rocker_ofdpa.c

+5 −5
Original line number Diff line number Diff line
@@ -2288,11 +2288,11 @@ static int ofdpa_port_fib_ipv4(struct ofdpa_port *ofdpa_port, __be32 dst, 


	nh = fi->fib_nh;

	nh_on_port = (fi->fib_dev == ofdpa_port->dev);

	has_gw = !!nh->nh_gw;

	has_gw = !!nh->fib_nh_gw4;



	if (has_gw && nh_on_port) {

		err = ofdpa_port_ipv4_nh(ofdpa_port, flags,

					 nh->nh_gw, &index);

					 nh->fib_nh_gw4, &index);

		if (err)

			return err;
@@ -2749,7 +2749,7 @@ static int ofdpa_fib4_add(struct rocker *rocker, 
				  fen_info->tb_id, 0);

	if (err)

		return err;

	fen_info->fi->fib_nh->nh_flags |= RTNH_F_OFFLOAD;

	fen_info->fi->fib_nh->fib_nh_flags |= RTNH_F_OFFLOAD;

	return 0;

}
@@ -2764,7 +2764,7 @@ static int ofdpa_fib4_del(struct rocker *rocker, 
	ofdpa_port = ofdpa_port_dev_lower_find(fen_info->fi->fib_dev, rocker);

	if (!ofdpa_port)

		return 0;

	fen_info->fi->fib_nh->nh_flags &= ~RTNH_F_OFFLOAD;

	fen_info->fi->fib_nh->fib_nh_flags &= ~RTNH_F_OFFLOAD;

	return ofdpa_port_fib_ipv4(ofdpa_port, htonl(fen_info->dst),

				   fen_info->dst_len, fen_info->fi,

				   fen_info->tb_id, OFDPA_OP_FLAG_REMOVE);
@@ -2791,7 +2791,7 @@ static void ofdpa_fib4_abort(struct rocker *rocker) 
						       rocker);

		if (!ofdpa_port)

			continue;

		flow_entry->fi->fib_nh->nh_flags &= ~RTNH_F_OFFLOAD;

		flow_entry->fi->fib_nh->fib_nh_flags &= ~RTNH_F_OFFLOAD;

		ofdpa_flow_tbl_del(ofdpa_port, OFDPA_OP_FLAG_REMOVE,

				   flow_entry);

	}

include/net/ip_fib.h

+12 −12
Original line number Diff line number Diff line
@@ -77,26 +77,26 @@ struct fnhe_hash_bucket { 
#define FNHE_RECLAIM_DEPTH	5



struct fib_nh {

	struct net_device	*nh_dev;

	struct net_device	*fib_nh_dev;

	struct hlist_node	nh_hash;

	struct fib_info		*nh_parent;

	unsigned int		nh_flags;

	unsigned char		nh_scope;

	unsigned int		fib_nh_flags;

	unsigned char		fib_nh_scope;

#ifdef CONFIG_IP_ROUTE_MULTIPATH

	int			nh_weight;

	atomic_t		nh_upper_bound;

	int			fib_nh_weight;

	atomic_t		fib_nh_upper_bound;

#endif

#ifdef CONFIG_IP_ROUTE_CLASSID

	__u32			nh_tclassid;

#endif

	int			nh_oif;

	__be32			nh_gw;

	int			fib_nh_oif;

	__be32			fib_nh_gw4;

	__be32			nh_saddr;

	int			nh_saddr_genid;

	struct rtable __rcu * __percpu *nh_pcpu_rth_output;

	struct rtable __rcu	*nh_rth_input;

	struct fnhe_hash_bucket	__rcu *nh_exceptions;

	struct lwtunnel_state	*nh_lwtstate;

	struct lwtunnel_state	*fib_nh_lws;

};



/*
@@ -125,7 +125,7 @@ struct fib_info { 
	int			fib_nhs;

	struct rcu_head		rcu;

	struct fib_nh		fib_nh[0];

#define fib_dev		fib_nh[0].nh_dev

#define fib_dev		fib_nh[0].fib_nh_dev

};
@@ -180,9 +180,9 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh); 
	  atomic_read(&(net)->ipv4.dev_addr_genid)) ?	\

	 FIB_RES_NH(res).nh_saddr :			\

	 fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))

#define FIB_RES_GW(res)			(FIB_RES_NH(res).nh_gw)

#define FIB_RES_DEV(res)		(FIB_RES_NH(res).nh_dev)

#define FIB_RES_OIF(res)		(FIB_RES_NH(res).nh_oif)

#define FIB_RES_GW(res)			(FIB_RES_NH(res).fib_nh_gw4)

#define FIB_RES_DEV(res)		(FIB_RES_NH(res).fib_nh_dev)

#define FIB_RES_OIF(res)		(FIB_RES_NH(res).fib_nh_oif)



#define FIB_RES_PREFSRC(net, res)	((res).fi->fib_prefsrc ? : \

					 FIB_RES_SADDR(net, res))

include/trace/events/fib.h

+5 −2
Original line number Diff line number Diff line
@@ -63,13 +63,16 @@ TRACE_EVENT(fib_table_lookup, 
		}



		if (nh) {

			struct net_device *dev;



			p32 = (__be32 *) __entry->saddr;

			*p32 = nh->nh_saddr;



			p32 = (__be32 *) __entry->gw;

			*p32 = nh->nh_gw;

			*p32 = nh->fib_nh_gw4;



			__assign_str(name, nh->nh_dev ? nh->nh_dev->name : "-");

			dev = nh->fib_nh_dev;

			__assign_str(name, dev ? dev->name : "-");

		} else {

			p32 = (__be32 *) __entry->saddr;

			*p32 = 0;