Merge branch 'ipv6-Move-exceptions-to-fib6_nh-and-make-it-optional-in-a-fib6_info' (a80886e4) · Commits · e / devices / android_kernel_fairphone_FP5

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

+16 −15

Original line number	Original line	Diff line number	Diff line
	@@ -2886,7 +2886,7 @@ mlxsw_sp_nexthop6_group_cmp(const struct mlxsw_sp_nexthop_group *nh_grp,
	return false;		return false;

	list_for_each_entry(mlxsw_sp_rt6, &fib6_entry->rt6_list, list) {		list_for_each_entry(mlxsw_sp_rt6, &fib6_entry->rt6_list, list) {
	struct fib6_nh *fib6_nh = &mlxsw_sp_rt6->rt->fib6_nh;		struct fib6_nh *fib6_nh = mlxsw_sp_rt6->rt->fib6_nh;
	struct in6_addr *gw;		struct in6_addr *gw;
	int ifindex, weight;		int ifindex, weight;

	@@ -2958,7 +2958,7 @@ mlxsw_sp_nexthop6_group_hash(struct mlxsw_sp_fib6_entry *fib6_entry, u32 seed)
	struct net_device *dev;		struct net_device *dev;

	list_for_each_entry(mlxsw_sp_rt6, &fib6_entry->rt6_list, list) {		list_for_each_entry(mlxsw_sp_rt6, &fib6_entry->rt6_list, list) {
	dev = mlxsw_sp_rt6->rt->fib6_nh.fib_nh_dev;		dev = mlxsw_sp_rt6->rt->fib6_nh->fib_nh_dev;
	val ^= dev->ifindex;		val ^= dev->ifindex;
	}		}

	@@ -3960,9 +3960,9 @@ mlxsw_sp_rt6_nexthop(struct mlxsw_sp_nexthop_group *nh_grp,
	struct mlxsw_sp_nexthop *nh = &nh_grp->nexthops[i];		struct mlxsw_sp_nexthop *nh = &nh_grp->nexthops[i];
	struct fib6_info *rt = mlxsw_sp_rt6->rt;		struct fib6_info *rt = mlxsw_sp_rt6->rt;

	if (nh->rif && nh->rif->dev == rt->fib6_nh.fib_nh_dev &&		if (nh->rif && nh->rif->dev == rt->fib6_nh->fib_nh_dev &&
	ipv6_addr_equal((const struct in6_addr *) &nh->gw_addr,		ipv6_addr_equal((const struct in6_addr *) &nh->gw_addr,
	&rt->fib6_nh.fib_nh_gw6))		&rt->fib6_nh->fib_nh_gw6))
	return nh;		return nh;
	continue;		continue;
	}		}
	@@ -4022,13 +4022,13 @@ mlxsw_sp_fib6_entry_offload_set(struct mlxsw_sp_fib_entry *fib_entry)
	if (fib_entry->type == MLXSW_SP_FIB_ENTRY_TYPE_LOCAL \|\|		if (fib_entry->type == MLXSW_SP_FIB_ENTRY_TYPE_LOCAL \|\|
	fib_entry->type == MLXSW_SP_FIB_ENTRY_TYPE_BLACKHOLE) {		fib_entry->type == MLXSW_SP_FIB_ENTRY_TYPE_BLACKHOLE) {
	list_first_entry(&fib6_entry->rt6_list, struct mlxsw_sp_rt6,		list_first_entry(&fib6_entry->rt6_list, struct mlxsw_sp_rt6,
	list)->rt->fib6_nh.fib_nh_flags \|= RTNH_F_OFFLOAD;		list)->rt->fib6_nh->fib_nh_flags \|= RTNH_F_OFFLOAD;
	return;		return;
	}		}

	list_for_each_entry(mlxsw_sp_rt6, &fib6_entry->rt6_list, list) {		list_for_each_entry(mlxsw_sp_rt6, &fib6_entry->rt6_list, list) {
	struct mlxsw_sp_nexthop_group *nh_grp = fib_entry->nh_group;		struct mlxsw_sp_nexthop_group *nh_grp = fib_entry->nh_group;
	struct fib6_nh *fib6_nh = &mlxsw_sp_rt6->rt->fib6_nh;		struct fib6_nh *fib6_nh = mlxsw_sp_rt6->rt->fib6_nh;
	struct mlxsw_sp_nexthop *nh;		struct mlxsw_sp_nexthop *nh;

	nh = mlxsw_sp_rt6_nexthop(nh_grp, mlxsw_sp_rt6);		nh = mlxsw_sp_rt6_nexthop(nh_grp, mlxsw_sp_rt6);
	@@ -4050,7 +4050,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) {		list_for_each_entry(mlxsw_sp_rt6, &fib6_entry->rt6_list, list) {
	struct fib6_info *rt = mlxsw_sp_rt6->rt;		struct fib6_info *rt = mlxsw_sp_rt6->rt;

	rt->fib6_nh.fib_nh_flags &= ~RTNH_F_OFFLOAD;		rt->fib6_nh->fib_nh_flags &= ~RTNH_F_OFFLOAD;
	}		}
	}		}

	@@ -4928,7 +4928,8 @@ static void mlxsw_sp_rt6_destroy(struct mlxsw_sp_rt6 *mlxsw_sp_rt6)
	static bool mlxsw_sp_fib6_rt_can_mp(const struct fib6_info *rt)		static bool mlxsw_sp_fib6_rt_can_mp(const struct fib6_info *rt)
	{		{
	/* RTF_CACHE routes are ignored */		/* RTF_CACHE routes are ignored */
	return !(rt->fib6_flags & RTF_ADDRCONF) && rt->fib6_nh.fib_nh_gw_family;		return !(rt->fib6_flags & RTF_ADDRCONF) &&
			rt->fib6_nh->fib_nh_gw_family;
	}		}

	static struct fib6_info *		static struct fib6_info *
	@@ -4987,8 +4988,8 @@ static bool mlxsw_sp_nexthop6_ipip_type(const struct mlxsw_sp *mlxsw_sp,
	const struct fib6_info *rt,		const struct fib6_info *rt,
	enum mlxsw_sp_ipip_type *ret)		enum mlxsw_sp_ipip_type *ret)
	{		{
	return rt->fib6_nh.fib_nh_dev &&		return rt->fib6_nh->fib_nh_dev &&
	mlxsw_sp_netdev_ipip_type(mlxsw_sp, rt->fib6_nh.fib_nh_dev, ret);		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,		static int mlxsw_sp_nexthop6_type_init(struct mlxsw_sp *mlxsw_sp,
	@@ -4998,7 +4999,7 @@ static int mlxsw_sp_nexthop6_type_init(struct mlxsw_sp *mlxsw_sp,
	{		{
	const struct mlxsw_sp_ipip_ops *ipip_ops;		const struct mlxsw_sp_ipip_ops *ipip_ops;
	struct mlxsw_sp_ipip_entry *ipip_entry;		struct mlxsw_sp_ipip_entry *ipip_entry;
	struct net_device *dev = rt->fib6_nh.fib_nh_dev;		struct net_device *dev = rt->fib6_nh->fib_nh_dev;
	struct mlxsw_sp_rif *rif;		struct mlxsw_sp_rif *rif;
	int err;		int err;

	@@ -5041,11 +5042,11 @@ static int mlxsw_sp_nexthop6_init(struct mlxsw_sp *mlxsw_sp,
	struct mlxsw_sp_nexthop *nh,		struct mlxsw_sp_nexthop *nh,
	const struct fib6_info *rt)		const struct fib6_info *rt)
	{		{
	struct net_device *dev = rt->fib6_nh.fib_nh_dev;		struct net_device *dev = rt->fib6_nh->fib_nh_dev;

	nh->nh_grp = nh_grp;		nh->nh_grp = nh_grp;
	nh->nh_weight = rt->fib6_nh.fib_nh_weight;		nh->nh_weight = rt->fib6_nh->fib_nh_weight;
	memcpy(&nh->gw_addr, &rt->fib6_nh.fib_nh_gw6, sizeof(nh->gw_addr));		memcpy(&nh->gw_addr, &rt->fib6_nh->fib_nh_gw6, sizeof(nh->gw_addr));
	mlxsw_sp_nexthop_counter_alloc(mlxsw_sp, nh);		mlxsw_sp_nexthop_counter_alloc(mlxsw_sp, nh);

	list_add_tail(&nh->router_list_node, &mlxsw_sp->router->nexthop_list);		list_add_tail(&nh->router_list_node, &mlxsw_sp->router->nexthop_list);
	@@ -5068,7 +5069,7 @@ static void mlxsw_sp_nexthop6_fini(struct mlxsw_sp *mlxsw_sp,
	static bool mlxsw_sp_rt6_is_gateway(const struct mlxsw_sp *mlxsw_sp,		static bool mlxsw_sp_rt6_is_gateway(const struct mlxsw_sp *mlxsw_sp,
	const struct fib6_info *rt)		const struct fib6_info *rt)
	{		{
	return rt->fib6_nh.fib_nh_gw_family \|\|		return rt->fib6_nh->fib_nh_gw_family \|\|
	mlxsw_sp_nexthop6_ipip_type(mlxsw_sp, rt, NULL);		mlxsw_sp_nexthop6_ipip_type(mlxsw_sp, rt, NULL);
	}		}

include/net/ip6_fib.h

+8 −9

Original line number	Original line	Diff line number	Diff line
	@@ -131,6 +131,9 @@ struct fib6_nh {
	#ifdef CONFIG_IPV6_ROUTER_PREF		#ifdef CONFIG_IPV6_ROUTER_PREF
	unsigned long last_probe;		unsigned long last_probe;
	#endif		#endif

			struct rt6_info * __percpu *rt6i_pcpu;
			struct rt6_exception_bucket __rcu *rt6i_exception_bucket;
	};		};

	struct fib6_info {		struct fib6_info {
	@@ -156,22 +159,18 @@ struct fib6_info {
	struct rt6key fib6_src;		struct rt6key fib6_src;
	struct rt6key fib6_prefsrc;		struct rt6key fib6_prefsrc;

	struct rt6_info * __percpu *rt6i_pcpu;
	struct rt6_exception_bucket __rcu *rt6i_exception_bucket;

	u32 fib6_metric;		u32 fib6_metric;
	u8 fib6_protocol;		u8 fib6_protocol;
	u8 fib6_type;		u8 fib6_type;
	u8 exception_bucket_flushed:1,		u8 should_flush:1,
	should_flush:1,
	dst_nocount:1,		dst_nocount:1,
	dst_nopolicy:1,		dst_nopolicy:1,
	dst_host:1,		dst_host:1,
	fib6_destroying:1,		fib6_destroying:1,
	unused:2;		unused:3;

	struct fib6_nh fib6_nh;
	struct rcu_head rcu;		struct rcu_head rcu;
			struct fib6_nh fib6_nh[0];
	};		};

	struct rt6_info {		struct rt6_info {
	@@ -281,7 +280,7 @@ static inline void ip6_rt_put(struct rt6_info *rt)
	dst_release(&rt->dst);		dst_release(&rt->dst);
	}		}

	struct fib6_info *fib6_info_alloc(gfp_t gfp_flags);		struct fib6_info *fib6_info_alloc(gfp_t gfp_flags, bool with_fib6_nh);
	void fib6_info_destroy_rcu(struct rcu_head *head);		void fib6_info_destroy_rcu(struct rcu_head *head);

	static inline void fib6_info_hold(struct fib6_info *f6i)		static inline void fib6_info_hold(struct fib6_info *f6i)
	@@ -444,7 +443,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)		static inline struct net_device fib6_info_nh_dev(const struct fib6_info f6i)
	{		{
	return f6i->fib6_nh.fib_nh_dev;		return f6i->fib6_nh->fib_nh_dev;
	}		}

	int fib6_nh_init(struct net net, struct fib6_nh fib6_nh,		int fib6_nh_init(struct net net, struct fib6_nh fib6_nh,

include/net/ip6_route.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -70,7 +70,7 @@ static inline bool rt6_qualify_for_ecmp(const struct fib6_info *f6i)
	{		{
	/* the RTF_ADDRCONF flag filters out RA's */		/* the RTF_ADDRCONF flag filters out RA's */
	return !(f6i->fib6_flags & RTF_ADDRCONF) &&		return !(f6i->fib6_flags & RTF_ADDRCONF) &&
	f6i->fib6_nh.fib_nh_gw_family;		f6i->fib6_nh->fib_nh_gw_family;
	}		}

	void ip6_route_input(struct sk_buff *skb);		void ip6_route_input(struct sk_buff *skb);
	@@ -275,7 +275,7 @@ 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)		static inline bool rt6_duplicate_nexthop(struct fib6_info a, struct fib6_info b)
	{		{
	struct fib6_nh nha = &a->fib6_nh, nhb = &b->fib6_nh;		struct fib6_nh nha = a->fib6_nh, nhb = b->fib6_nh;

	return nha->fib_nh_dev == nhb->fib_nh_dev &&		return nha->fib_nh_dev == nhb->fib_nh_dev &&
	ipv6_addr_equal(&nha->fib_nh_gw6, &nhb->fib_nh_gw6) &&		ipv6_addr_equal(&nha->fib_nh_gw6, &nhb->fib_nh_gw6) &&

net/ipv6/addrconf.c

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -2421,9 +2421,9 @@ static struct fib6_info addrconf_get_prefix_route(const struct in6_addr pfx,
	goto out;		goto out;

	for_each_fib6_node_rt_rcu(fn) {		for_each_fib6_node_rt_rcu(fn) {
	if (rt->fib6_nh.fib_nh_dev->ifindex != dev->ifindex)		if (rt->fib6_nh->fib_nh_dev->ifindex != dev->ifindex)
	continue;		continue;
	if (no_gw && rt->fib6_nh.fib_nh_gw_family)		if (no_gw && rt->fib6_nh->fib_nh_gw_family)
	continue;		continue;
	if ((rt->fib6_flags & flags) != flags)		if ((rt->fib6_flags & flags) != flags)
	continue;		continue;
	@@ -6341,16 +6341,16 @@ void addrconf_disable_policy_idev(struct inet6_dev *idev, int val)
	list_for_each_entry(ifa, &idev->addr_list, if_list) {		list_for_each_entry(ifa, &idev->addr_list, if_list) {
	spin_lock(&ifa->lock);		spin_lock(&ifa->lock);
	if (ifa->rt) {		if (ifa->rt) {
	struct fib6_info *rt = ifa->rt;		struct fib6_nh *nh = ifa->rt->fib6_nh;
	int cpu;		int cpu;

	rcu_read_lock();		rcu_read_lock();
	ifa->rt->dst_nopolicy = val ? true : false;		ifa->rt->dst_nopolicy = val ? true : false;
	if (rt->rt6i_pcpu) {		if (nh->rt6i_pcpu) {
	for_each_possible_cpu(cpu) {		for_each_possible_cpu(cpu) {
	struct rt6_info **rtp;		struct rt6_info **rtp;

	rtp = per_cpu_ptr(rt->rt6i_pcpu, cpu);		rtp = per_cpu_ptr(nh->rt6i_pcpu, cpu);
	addrconf_set_nopolicy(*rtp, val);		addrconf_set_nopolicy(*rtp, val);
	}		}
	}		}

net/ipv6/ip6_fib.c

+39 −48

Original line number	Original line	Diff line number	Diff line
	@@ -147,19 +147,17 @@ static __be32 addr_bit_set(const void *token, int fn_bit)
	addr[fn_bit >> 5];		addr[fn_bit >> 5];
	}		}

	struct fib6_info *fib6_info_alloc(gfp_t gfp_flags)		struct fib6_info *fib6_info_alloc(gfp_t gfp_flags, bool with_fib6_nh)
	{		{
	struct fib6_info *f6i;		struct fib6_info *f6i;
			size_t sz = sizeof(*f6i);

	f6i = kzalloc(sizeof(*f6i), gfp_flags);		if (with_fib6_nh)
	if (!f6i)		sz += sizeof(struct fib6_nh);
	return NULL;

	f6i->rt6i_pcpu = alloc_percpu_gfp(struct rt6_info *, gfp_flags);		f6i = kzalloc(sz, gfp_flags);
	if (!f6i->rt6i_pcpu) {		if (!f6i)
	kfree(f6i);
	return NULL;		return NULL;
	}

	INIT_LIST_HEAD(&f6i->fib6_siblings);		INIT_LIST_HEAD(&f6i->fib6_siblings);
	refcount_set(&f6i->fib6_ref, 1);		refcount_set(&f6i->fib6_ref, 1);
	@@ -170,36 +168,11 @@ struct fib6_info *fib6_info_alloc(gfp_t gfp_flags)
	void fib6_info_destroy_rcu(struct rcu_head *head)		void fib6_info_destroy_rcu(struct rcu_head *head)
	{		{
	struct fib6_info *f6i = container_of(head, struct fib6_info, rcu);		struct fib6_info *f6i = container_of(head, struct fib6_info, rcu);
	struct rt6_exception_bucket *bucket;

	WARN_ON(f6i->fib6_node);		WARN_ON(f6i->fib6_node);

	bucket = rcu_dereference_protected(f6i->rt6i_exception_bucket, 1);		fib6_nh_release(f6i->fib6_nh);
	kfree(bucket);

	if (f6i->rt6i_pcpu) {
	int cpu;

	for_each_possible_cpu(cpu) {
	struct rt6_info **ppcpu_rt;
	struct rt6_info *pcpu_rt;

	ppcpu_rt = per_cpu_ptr(f6i->rt6i_pcpu, cpu);
	pcpu_rt = *ppcpu_rt;
	if (pcpu_rt) {
	dst_dev_put(&pcpu_rt->dst);
	dst_release(&pcpu_rt->dst);
	*ppcpu_rt = NULL;
	}
	}

	free_percpu(f6i->rt6i_pcpu);
	}

	fib6_nh_release(&f6i->fib6_nh);

	ip_fib_metrics_put(f6i->fib6_metrics);		ip_fib_metrics_put(f6i->fib6_metrics);

	kfree(f6i);		kfree(f6i);
	}		}
	EXPORT_SYMBOL_GPL(fib6_info_destroy_rcu);		EXPORT_SYMBOL_GPL(fib6_info_destroy_rcu);
	@@ -899,16 +872,14 @@ static struct fib6_node fib6_add_1(struct net net,
	return ln;		return ln;
	}		}

	static void fib6_drop_pcpu_from(struct fib6_info *f6i,		static void __fib6_drop_pcpu_from(struct fib6_nh *fib6_nh,
			const struct fib6_info *match,
	const struct fib6_table *table)		const struct fib6_table *table)
	{		{
	int cpu;		int cpu;

	/* Make sure rt6_make_pcpu_route() wont add other percpu routes		if (!fib6_nh->rt6i_pcpu)
	* while we are cleaning them here.		return;
	*/
	f6i->fib6_destroying = 1;
	mb(); /* paired with the cmpxchg() in rt6_make_pcpu_route() */

	/* release the reference to this fib entry from		/* release the reference to this fib entry from
	* all of its cached pcpu routes		* all of its cached pcpu routes
	@@ -917,9 +888,15 @@ static void fib6_drop_pcpu_from(struct fib6_info *f6i,
	struct rt6_info **ppcpu_rt;		struct rt6_info **ppcpu_rt;
	struct rt6_info *pcpu_rt;		struct rt6_info *pcpu_rt;

	ppcpu_rt = per_cpu_ptr(f6i->rt6i_pcpu, cpu);		ppcpu_rt = per_cpu_ptr(fib6_nh->rt6i_pcpu, cpu);
	pcpu_rt = *ppcpu_rt;		pcpu_rt = *ppcpu_rt;
	if (pcpu_rt) {
			/* only dropping the 'from' reference if the cached route
			* is using 'match'. The cached pcpu_rt->from only changes
			* from a fib6_info to NULL (ip6_dst_destroy); it can never
			* change from one fib6_info reference to another
			*/
			if (pcpu_rt && rcu_access_pointer(pcpu_rt->from) == match) {
	struct fib6_info *from;		struct fib6_info *from;

	from = xchg((__force struct fib6_info **)&pcpu_rt->from, NULL);		from = xchg((__force struct fib6_info **)&pcpu_rt->from, NULL);
	@@ -928,12 +905,26 @@ static void fib6_drop_pcpu_from(struct fib6_info *f6i,
	}		}
	}		}

			static void fib6_drop_pcpu_from(struct fib6_info *f6i,
			const struct fib6_table *table)
			{
			struct fib6_nh *fib6_nh;

			/* Make sure rt6_make_pcpu_route() wont add other percpu routes
			* while we are cleaning them here.
			*/
			f6i->fib6_destroying = 1;
			mb(); /* paired with the cmpxchg() in rt6_make_pcpu_route() */

			fib6_nh = f6i->fib6_nh;
			__fib6_drop_pcpu_from(fib6_nh, f6i, table);
			}

	static void fib6_purge_rt(struct fib6_info rt, struct fib6_node fn,		static void fib6_purge_rt(struct fib6_info rt, struct fib6_node fn,
	struct net *net)		struct net *net)
	{		{
	struct fib6_table *table = rt->fib6_table;		struct fib6_table *table = rt->fib6_table;

	if (rt->rt6i_pcpu)
	fib6_drop_pcpu_from(rt, table);		fib6_drop_pcpu_from(rt, table);

	if (refcount_read(&rt->fib6_ref) != 1) {		if (refcount_read(&rt->fib6_ref) != 1) {
	@@ -2314,14 +2305,14 @@ static int ipv6_route_seq_show(struct seq_file seq, void v)
	#else		#else
	seq_puts(seq, "00000000000000000000000000000000 00 ");		seq_puts(seq, "00000000000000000000000000000000 00 ");
	#endif		#endif
	if (rt->fib6_nh.fib_nh_gw_family) {		if (rt->fib6_nh->fib_nh_gw_family) {
	flags \|= RTF_GATEWAY;		flags \|= RTF_GATEWAY;
	seq_printf(seq, "%pi6", &rt->fib6_nh.fib_nh_gw6);		seq_printf(seq, "%pi6", &rt->fib6_nh->fib_nh_gw6);
	} else {		} else {
	seq_puts(seq, "00000000000000000000000000000000");		seq_puts(seq, "00000000000000000000000000000000");
	}		}

	dev = rt->fib6_nh.fib_nh_dev;		dev = rt->fib6_nh->fib_nh_dev;
	seq_printf(seq, " %08x %08x %08x %08x %8s\n",		seq_printf(seq, " %08x %08x %08x %08x %8s\n",
	rt->fib6_metric, refcount_read(&rt->fib6_ref), 0,		rt->fib6_metric, refcount_read(&rt->fib6_ref), 0,
	flags, dev ? dev->name : "");		flags, dev ? dev->name : "");