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

ipv6: Rename fib6_nh entries 



Rename fib6_nh entries that will be moved to a fib_nh_common struct.
Specifically, the device, gateway, flags, and lwtstate are common
with all nexthop definitions. In some places new temporary variables
are declared or local variables renamed to maintain line lengths.

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 b75ed8b1

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

+18 −16
Original line number Diff line number Diff line
@@ -2873,12 +2873,13 @@ mlxsw_sp_nexthop6_group_cmp(const struct mlxsw_sp_nexthop_group *nh_grp, 
		return false;



	list_for_each_entry(mlxsw_sp_rt6, &fib6_entry->rt6_list, list) {

		struct fib6_nh *fib6_nh = &mlxsw_sp_rt6->rt->fib6_nh;

		struct in6_addr *gw;

		int ifindex, weight;



		ifindex = mlxsw_sp_rt6->rt->fib6_nh.nh_dev->ifindex;

		weight = mlxsw_sp_rt6->rt->fib6_nh.nh_weight;

		gw = &mlxsw_sp_rt6->rt->fib6_nh.nh_gw;

		ifindex = fib6_nh->fib_nh_dev->ifindex;

		weight = fib6_nh->fib_nh_weight;

		gw = &fib6_nh->fib_nh_gw6;

		if (!mlxsw_sp_nexthop6_group_has_nexthop(nh_grp, gw, ifindex,

							 weight))

			return false;
@@ -2944,7 +2945,7 @@ mlxsw_sp_nexthop6_group_hash(struct mlxsw_sp_fib6_entry *fib6_entry, u32 seed) 
	struct net_device *dev;



	list_for_each_entry(mlxsw_sp_rt6, &fib6_entry->rt6_list, list) {

		dev = mlxsw_sp_rt6->rt->fib6_nh.nh_dev;

		dev = mlxsw_sp_rt6->rt->fib6_nh.fib_nh_dev;

		val ^= dev->ifindex;

	}
@@ -3946,9 +3947,9 @@ mlxsw_sp_rt6_nexthop(struct mlxsw_sp_nexthop_group *nh_grp, 
		struct mlxsw_sp_nexthop *nh = &nh_grp->nexthops[i];

		struct fib6_info *rt = mlxsw_sp_rt6->rt;



		if (nh->rif && nh->rif->dev == rt->fib6_nh.nh_dev &&

		if (nh->rif && nh->rif->dev == rt->fib6_nh.fib_nh_dev &&

		    ipv6_addr_equal((const struct in6_addr *) &nh->gw_addr,

				    &rt->fib6_nh.nh_gw))

				    &rt->fib6_nh.fib_nh_gw6))

			return nh;

		continue;

	}
@@ -4008,19 +4009,20 @@ mlxsw_sp_fib6_entry_offload_set(struct mlxsw_sp_fib_entry *fib_entry) 
	if (fib_entry->type == MLXSW_SP_FIB_ENTRY_TYPE_LOCAL ||

	    fib_entry->type == MLXSW_SP_FIB_ENTRY_TYPE_BLACKHOLE) {

		list_first_entry(&fib6_entry->rt6_list, struct mlxsw_sp_rt6,

				 list)->rt->fib6_nh.nh_flags |= RTNH_F_OFFLOAD;

				 list)->rt->fib6_nh.fib_nh_flags |= RTNH_F_OFFLOAD;

		return;

	}



	list_for_each_entry(mlxsw_sp_rt6, &fib6_entry->rt6_list, list) {

		struct mlxsw_sp_nexthop_group *nh_grp = fib_entry->nh_group;

		struct fib6_nh *fib6_nh = &mlxsw_sp_rt6->rt->fib6_nh;

		struct mlxsw_sp_nexthop *nh;



		nh = mlxsw_sp_rt6_nexthop(nh_grp, mlxsw_sp_rt6);

		if (nh && nh->offloaded)

			mlxsw_sp_rt6->rt->fib6_nh.nh_flags |= RTNH_F_OFFLOAD;

			fib6_nh->fib_nh_flags |= RTNH_F_OFFLOAD;

		else

			mlxsw_sp_rt6->rt->fib6_nh.nh_flags &= ~RTNH_F_OFFLOAD;

			fib6_nh->fib_nh_flags &= ~RTNH_F_OFFLOAD;

	}

}
@@ -4035,7 +4037,7 @@ mlxsw_sp_fib6_entry_offload_unset(struct mlxsw_sp_fib_entry *fib_entry) 
	list_for_each_entry(mlxsw_sp_rt6, &fib6_entry->rt6_list, list) {

		struct fib6_info *rt = mlxsw_sp_rt6->rt;



		rt->fib6_nh.nh_flags &= ~RTNH_F_OFFLOAD;

		rt->fib6_nh.fib_nh_flags &= ~RTNH_F_OFFLOAD;

	}

}
@@ -4972,8 +4974,8 @@ static bool mlxsw_sp_nexthop6_ipip_type(const struct mlxsw_sp *mlxsw_sp, 
					const struct fib6_info *rt,

					enum mlxsw_sp_ipip_type *ret)

{

	return rt->fib6_nh.nh_dev &&

	       mlxsw_sp_netdev_ipip_type(mlxsw_sp, rt->fib6_nh.nh_dev, ret);

	return rt->fib6_nh.fib_nh_dev &&

	       mlxsw_sp_netdev_ipip_type(mlxsw_sp, rt->fib6_nh.fib_nh_dev, ret);

}



static int mlxsw_sp_nexthop6_type_init(struct mlxsw_sp *mlxsw_sp,
@@ -4983,7 +4985,7 @@ static int mlxsw_sp_nexthop6_type_init(struct mlxsw_sp *mlxsw_sp, 
{

	const struct mlxsw_sp_ipip_ops *ipip_ops;

	struct mlxsw_sp_ipip_entry *ipip_entry;

	struct net_device *dev = rt->fib6_nh.nh_dev;

	struct net_device *dev = rt->fib6_nh.fib_nh_dev;

	struct mlxsw_sp_rif *rif;

	int err;
@@ -5026,11 +5028,11 @@ static int mlxsw_sp_nexthop6_init(struct mlxsw_sp *mlxsw_sp, 
				  struct mlxsw_sp_nexthop *nh,

				  const struct fib6_info *rt)

{

	struct net_device *dev = rt->fib6_nh.nh_dev;

	struct net_device *dev = rt->fib6_nh.fib_nh_dev;



	nh->nh_grp = nh_grp;

	nh->nh_weight = rt->fib6_nh.nh_weight;

	memcpy(&nh->gw_addr, &rt->fib6_nh.nh_gw, sizeof(nh->gw_addr));

	nh->nh_weight = rt->fib6_nh.fib_nh_weight;

	memcpy(&nh->gw_addr, &rt->fib6_nh.fib_nh_gw6, sizeof(nh->gw_addr));

	mlxsw_sp_nexthop_counter_alloc(mlxsw_sp, nh);



	list_add_tail(&nh->router_list_node, &mlxsw_sp->router->nexthop_list);

include/net/ip6_fib.h

+8 −8
Original line number Diff line number Diff line
@@ -125,14 +125,14 @@ struct rt6_exception { 
#define FIB6_MAX_DEPTH 5



struct fib6_nh {

	struct in6_addr		nh_gw;

	struct in6_addr		fib_nh_gw6;

	bool			fib_nh_has_gw;

	struct net_device	*nh_dev;

	struct lwtunnel_state	*nh_lwtstate;

	struct net_device	*fib_nh_dev;

	struct lwtunnel_state	*fib_nh_lws;



	unsigned int		nh_flags;

	atomic_t		nh_upper_bound;

	int			nh_weight;

	unsigned int		fib_nh_flags;

	atomic_t		fib_nh_upper_bound;

	int			fib_nh_weight;

};



struct fib6_info {
@@ -442,7 +442,7 @@ void rt6_get_prefsrc(const struct rt6_info *rt, struct in6_addr *addr) 


static inline struct net_device *fib6_info_nh_dev(const struct fib6_info *f6i)

{

	return f6i->fib6_nh.nh_dev;

	return f6i->fib6_nh.fib_nh_dev;

}



int fib6_nh_init(struct net *net, struct fib6_nh *fib6_nh,
@@ -453,7 +453,7 @@ void fib6_nh_release(struct fib6_nh *fib6_nh); 
static inline

struct lwtunnel_state *fib6_info_nh_lwt(const struct fib6_info *f6i)

{

	return f6i->fib6_nh.nh_lwtstate;

	return f6i->fib6_nh.fib_nh_lws;

}



void inet6_rt_notify(int event, struct fib6_info *rt, struct nl_info *info,

include/net/ip6_route.h

+5 −3
Original line number Diff line number Diff line
@@ -274,9 +274,11 @@ static inline struct in6_addr *rt6_nexthop(struct rt6_info *rt, 


static inline bool rt6_duplicate_nexthop(struct fib6_info *a, struct fib6_info *b)

{

	return a->fib6_nh.nh_dev == b->fib6_nh.nh_dev &&

	       ipv6_addr_equal(&a->fib6_nh.nh_gw, &b->fib6_nh.nh_gw) &&

	       !lwtunnel_cmp_encap(a->fib6_nh.nh_lwtstate, b->fib6_nh.nh_lwtstate);

	struct fib6_nh *nha = &a->fib6_nh, *nhb = &b->fib6_nh;



	return nha->fib_nh_dev == nhb->fib_nh_dev &&

	       ipv6_addr_equal(&nha->fib_nh_gw6, &nhb->fib_nh_gw6) &&

	       !lwtunnel_cmp_encap(nha->fib_nh_lws, nhb->fib_nh_lws);

}



static inline unsigned int ip6_dst_mtu_forward(const struct dst_entry *dst)

include/trace/events/fib6.h

+3 −3
Original line number Diff line number Diff line
@@ -62,8 +62,8 @@ TRACE_EVENT(fib6_table_lookup, 
			__entry->dport = 0;

		}



		if (f6i->fib6_nh.nh_dev) {

			__assign_str(name, f6i->fib6_nh.nh_dev);

		if (f6i->fib6_nh.fib_nh_dev) {

			__assign_str(name, f6i->fib6_nh.fib_nh_dev);

		} else {

			__assign_str(name, "-");

		}
@@ -75,7 +75,7 @@ TRACE_EVENT(fib6_table_lookup, 


		} else if (f6i) {

			in6 = (struct in6_addr *)__entry->gw;

			*in6 = f6i->fib6_nh.nh_gw;

			*in6 = f6i->fib6_nh.fib_nh_gw6;

		}

	),

net/core/filter.c

+3 −3
Original line number Diff line number Diff line
@@ -4748,13 +4748,13 @@ static int bpf_ipv6_fib_lookup(struct net *net, struct bpf_fib_lookup *params, 
			return BPF_FIB_LKUP_RET_FRAG_NEEDED;

	}



	if (f6i->fib6_nh.nh_lwtstate)

	if (f6i->fib6_nh.fib_nh_lws)

		return BPF_FIB_LKUP_RET_UNSUPP_LWT;



	if (f6i->fib6_nh.fib_nh_has_gw)

		*dst = f6i->fib6_nh.nh_gw;

		*dst = f6i->fib6_nh.fib_nh_gw6;



	dev = f6i->fib6_nh.nh_dev;

	dev = f6i->fib6_nh.fib_nh_dev;

	params->rt_metric = f6i->fib6_metric;



	/* xdp and cls_bpf programs are run in RCU-bh so rcu_read_lock_bh is

CRA Git | Maintained and supported by SUSTech CRA and CCSE