Skip to contentSkip to conversation

net: add struct nexthop to fib{6}_info

PATCH Superseded David Ahern 4 participants 28 messages Jun 3, 2019 – Jun 5, 2019

Subsystems (8)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

David Ahern

author maintainer
#0 lore raw

v2 cover net: add struct nexthop to fib{6}_info

From: David Ahern <[email protected]>

This sets adds 'struct nexthop' to fib_info and fib6_info. IPv4 already handles multiple fib_nh entries in a single fib_info, so the conversion to use a nexthop struct is fairly mechanical. IPv6 using a nexthop struct with a fib6_info impacts a lot of core logic which is built around the assumption of a single, builtin fib6_nh per fib6_info. To make this easier to review, this set adds nexthop to fib6_info and adds checks in most places fib6_info is used. The next set finishes the IPv6 conversion, walking through the places that need to consider all fib6_nh within a nexthop struct.

Offload drivers - mlx5, mlxsw and rocker - are changed to fail FIB entries using nexthop objects. That limitation can be removed once the drivers are updated to properly support separate nexthops.

This set starts by adding accessors for fib_nh and fib_nhs in a fib_info. This makes it easier to extract the number of nexthops in the fib entry and a specific fib_nh once the entry references a struct nexthop. Patch 2 converts more of IPv4 code to use fib_nh_common allowing a struct nexthop to use a fib6_nh with an IPv4 entry.

Patches 3 and 4 add 'struct nexthop' to fib{6}_info and update references to both take a different path when it is set. New exported functions are added to the nexthop code to validate a nexthop struct when configured for use with a fib entry. IPv4 is allowed to use a nexthop with either v4 or v6 entries. IPv6 is limited to v6 entries only. In both cases list_heads track the fib entries using a nexthop struct for fast correlation on events (e.g., device events or nexthop events like delete or replace).

The last 3 patches add hooks to drivers listening for FIB notificationas. All 3 of them reject the routes as unsupported, returning an error message to the user via extack. For mlxsw at least this is a stop gap measure until the driver is updated for proper support.

Functional tests for nexthops have already been committed. Those tests will be active after the next patch set which makes the code paths created by this set and the next one live.

Existing code paths moved to the else branch of 'if (f{6}i->nh)' checks are covered by existing tests under selftests/net.

v2
- no code changes from v1
- commit messages for first 4 patches updated

David Ahern (7):
ipv4: Use accessors for fib_info nexthop data
ipv4: Prepare for fib6_nh from a nexthop object
ipv4: Plumb support for nexthop object in a fib_info
ipv6: Plumb support for nexthop object in a fib6_info
mlxsw: Fail attempts to use routes with nexthop objects
mlx5: Fail attempts to use routes with nexthop objects
rocker: Fail attempts to use routes with nexthop objects

 drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c   |  33 ++-
 .../net/ethernet/mellanox/mlxsw/spectrum_router.c  |  33 ++-
 drivers/net/ethernet/rocker/rocker_main.c          |   4 +
 drivers/net/ethernet/rocker/rocker_ofdpa.c         |  25 +-
 include/net/ip6_fib.h                              |  11 +-
 include/net/ip6_route.h                            |  13 +-
 include/net/ip_fib.h                               |  25 +-
 include/net/nexthop.h                              | 113 +++++++++
 net/core/filter.c                                  |   3 +-
 net/ipv4/fib_frontend.c                            |  15 +-
 net/ipv4/fib_lookup.h                              |   1 +
 net/ipv4/fib_rules.c                               |   8 +-
 net/ipv4/fib_semantics.c                           | 257 ++++++++++++++-------
 net/ipv4/fib_trie.c                                |  38 ++-
 net/ipv4/nexthop.c                                 | 111 ++++++++-
 net/ipv4/route.c                                   |   5 +-
 net/ipv6/addrconf.c                                |   5 +
 net/ipv6/ip6_fib.c                                 |  22 +-
 net/ipv6/ndisc.c                                   |   3 +-
 net/ipv6/route.c                                   | 156 +++++++++++--
 20 files changed, 706 insertions(+), 175 deletions(-)
Signature · 1 line
2.11.0
author maintainer
#2 lore raw

PATCH v2 2/7 ipv4: Prepare for fib6_nh from a nexthop object

From: David Ahern <[email protected]>

Convert more IPv4 code to use fib_nh_common over fib_nh to enable routes to use a fib6_nh based nexthop. In the end, only code not using a nexthop object in a fib_info should directly access fib_nh in a fib_info without checking the famiy and going through fib_nh_common. Those functions will be marked when it is not directly evident.

---
 include/net/ip_fib.h     | 15 +++++++++----
 net/ipv4/fib_frontend.c  | 12 +++++------
 net/ipv4/fib_rules.c     |  4 ++--
 net/ipv4/fib_semantics.c | 55 +++++++++++++++++++++++++++++++++---------------
 net/ipv4/fib_trie.c      | 15 +++++++------
 net/ipv4/nexthop.c       |  3 ++-
 net/ipv4/route.c         |  2 +-
 7 files changed, 69 insertions(+), 37 deletions(-)
include/net/ip_fib.h +11 -4
index 42b1a806f6f5..7da8ea784029 100644
@@ -195,8 +195,8 @@ struct fib_result_nl {
 #define FIB_TABLE_HASHSZ 2
 #endif
 
-__be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh,
-				unsigned char scope);
+__be32 fib_info_update_nhc_saddr(struct net *net, struct fib_nh_common *nhc,
+				 unsigned char scope);
 __be32 fib_result_prefsrc(struct net *net, struct fib_result *res);
 
 #define FIB_RES_NHC(res)		((res).nhc)
@@ -455,11 +455,18 @@ static inline void fib_combine_itag(u32 *itag, const struct fib_result *res)
 {
 #ifdef CONFIG_IP_ROUTE_CLASSID
 	struct fib_nh_common *nhc = res->nhc;
-	struct fib_nh *nh = container_of(nhc, struct fib_nh, nh_common);
 #ifdef CONFIG_IP_MULTIPLE_TABLES
 	u32 rtag;
 #endif
-	*itag = nh->nh_tclassid << 16;
+	if (nhc->nhc_family == AF_INET) {
+		struct fib_nh *nh;
+
+		nh = container_of(nhc, struct fib_nh, nh_common);
+		*itag = nh->nh_tclassid << 16;
+	} else {
+		*itag = 0;
+	}
+
 #ifdef CONFIG_IP_MULTIPLE_TABLES
 	rtag = res->tclassid;
 	if (*itag == 0)
net/ipv4/fib_frontend.c +6 -6
index ab369959ce0b..8e49baa00d20 100644
@@ -235,9 +235,9 @@ static inline unsigned int __inet_dev_addr_type(struct net *net,
 	if (table) {
 		ret = RTN_UNICAST;
 		if (!fib_table_lookup(table, &fl4, &res, FIB_LOOKUP_NOREF)) {
-			struct fib_nh *nh = fib_info_nh(res.fi, 0);
+			struct fib_nh_common *nhc = fib_info_nhc(res.fi, 0);
 
-			if (!dev || dev == nh->fib_nh_dev)
+			if (!dev || dev == nhc->nhc_dev)
 				ret = res.type;
 		}
 	}
@@ -325,18 +325,18 @@ bool fib_info_nh_uses_dev(struct fib_info *fi, const struct net_device *dev)
 	int ret;
 
 	for (ret = 0; ret < fib_info_num_path(fi); ret++) {
-		const struct fib_nh *nh = fib_info_nh(fi, ret);
+		const struct fib_nh_common *nhc = fib_info_nhc(fi, ret);
 
-		if (nh->fib_nh_dev == dev) {
+		if (nhc->nhc_dev == dev) {
 			dev_match = true;
 			break;
-		} else if (l3mdev_master_ifindex_rcu(nh->fib_nh_dev) == dev->ifindex) {
+		} else if (l3mdev_master_ifindex_rcu(nhc->nhc_dev) == dev->ifindex) {
 			dev_match = true;
 			break;
 		}
 	}
 #else
-	if (fib_info_nh(fi, 0)->fib_nh_dev == dev)
+	if (fib_info_nhc(fi, 0)->nhc_dev == dev)
 		dev_match = true;
 #endif
 
net/ipv4/fib_rules.c +2 -2
index ab06fd73b343..88807c138df4 100644
@@ -147,9 +147,9 @@ static bool fib4_rule_suppress(struct fib_rule *rule, struct fib_lookup_arg *arg
 	struct net_device *dev = NULL;
 
 	if (result->fi) {
-		struct fib_nh *nh = fib_info_nh(result->fi, 0);
+		struct fib_nh_common *nhc = fib_info_nhc(result->fi, 0);
 
-		dev = nh->fib_nh_dev;
+		dev = nhc->nhc_dev;
 	}
 
 	/* do not accept result if the route does
net/ipv4/fib_semantics.c +38 -17

113 lines not on this page · raw message

net/ipv4/fib_trie.c +9 -6
index 5c8a4d21b8e0..d704d1606b8f 100644
@@ -2724,9 +2724,9 @@ static unsigned int fib_flag_trans(int type, __be32 mask, struct fib_info *fi)
 	if (type == RTN_UNREACHABLE || type == RTN_PROHIBIT)
 		flags = RTF_REJECT;
 	if (fi) {
-		const struct fib_nh *nh = fib_info_nh(fi, 0);
+		const struct fib_nh_common *nhc = fib_info_nhc(fi, 0);
 
-		if (nh->fib_nh_gw4)
+		if (nhc->nhc_gw.ipv4)
 			flags |= RTF_GATEWAY;
 	}
 	if (mask == htonl(0xFFFFFFFF))
@@ -2773,14 +2773,17 @@ static int fib_route_seq_show(struct seq_file *seq, void *v)
 		seq_setwidth(seq, 127);
 
 		if (fi) {
-			struct fib_nh *nh = fib_info_nh(fi, 0);
+			struct fib_nh_common *nhc = fib_info_nhc(fi, 0);
+			__be32 gw = 0;
+
+			if (nhc->nhc_gw_family == AF_INET)
+				gw = nhc->nhc_gw.ipv4;
 
 			seq_printf(seq,
 				   "%s\t%08X\t%08X\t%04X\t%d\t%u\t"
 				   "%d\t%08X\t%d\t%u\t%u",
-				   nh->fib_nh_dev ? nh->fib_nh_dev->name : "*",
-				   prefix,
-				   nh->fib_nh_gw4, flags, 0, 0,
+				   nhc->nhc_dev ? nhc->nhc_dev->name : "*",
+				   prefix, gw, flags, 0, 0,
 				   fi->fib_priority,
 				   mask,
 				   (fi->fib_advmss ?
net/ipv4/nexthop.c +2 -1
index 7a5a3d08fec3..aec4ecb145a0 100644
@@ -815,7 +815,8 @@ static int nh_create_ipv4(struct net *net, struct nexthop *nh,
 	err = fib_check_nh(net, fib_nh, tb_id, 0, extack);
 	if (!err) {
 		nh->nh_flags = fib_nh->fib_nh_flags;
-		fib_info_update_nh_saddr(net, fib_nh, fib_nh->fib_nh_scope);
+		fib_info_update_nhc_saddr(net, &fib_nh->nh_common,
+					  fib_nh->fib_nh_scope);
 	} else {
 		fib_nh_release(net, fib_nh);
 	}
net/ipv4/route.c +1 -1
index 05a6a8ecb574..4a1168451f3a 100644
@@ -1585,7 +1585,7 @@ static void rt_set_nexthop(struct rtable *rt, __be32 daddr,
 		ip_dst_init_metrics(&rt->dst, fi->fib_metrics);
 
 #ifdef CONFIG_IP_ROUTE_CLASSID
-		{
+		if (nhc->nhc_family == AF_INET) {
 			struct fib_nh *nh;
 
 			nh = container_of(nhc, struct fib_nh, nh_common);
Signature · 1 line
2.11.0
author maintainer
#26 lore raw

PATCH v2 6/7 mlx5: Fail attempts to use routes with nexthop objects

In reply to David Ahern

From: David Ahern <[email protected]>

Fail attempts to use nexthop objects with routes until support can be properly added.

---
 drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c +4 -0
index 2cbfaa8da7fc..e69766393990 100644
@@ -262,6 +262,10 @@ static int mlx5_lag_fib_event(struct notifier_block *nb,
 		fen_info = container_of(info, struct fib_entry_notifier_info,
 					info);
 		fi = fen_info->fi;
+		if (fi->nh) {
+			NL_SET_ERR_MSG_MOD(info->extack, "IPv4 route with nexthop objects is not supported");
+			return notifier_from_errno(-EINVAL);
+		}
 		fib_dev = fib_info_nh(fen_info->fi, 0)->fib_nh_dev;
 		if (fib_dev != ldev->pf[0].netdev &&
 		    fib_dev != ldev->pf[1].netdev) {
Signature · 1 line
2.11.0
author maintainer
#25 lore raw

PATCH v2 5/7 mlxsw: Fail attempts to use routes with nexthop objects

In reply to David Ahern

From: David Ahern <[email protected]>

Fail attempts to use nexthop objects with routes until support can be properly added.

---
 drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c +14 -0
index 4f781358aef1..23f17ea52061 100644
@@ -6122,6 +6122,20 @@ static int mlxsw_sp_router_fib_event(struct notifier_block *nb,
 				NL_SET_ERR_MSG_MOD(info->extack, "IPv6 gateway with IPv4 route is not supported");
 				return notifier_from_errno(-EINVAL);
 			}
+			if (fen_info->fi->nh) {
+				NL_SET_ERR_MSG_MOD(info->extack, "IPv4 route with nexthop objects is not supported");
+				return notifier_from_errno(-EINVAL);
+			}
+		} else if (info->family == AF_INET6) {
+			struct fib6_entry_notifier_info *fen6_info;
+
+			fen6_info = container_of(info,
+						 struct fib6_entry_notifier_info,
+						 info);
+			if (fen6_info->rt->nh) {
+				NL_SET_ERR_MSG_MOD(info->extack, "IPv6 route with nexthop objects is not supported");
+				return notifier_from_errno(-EINVAL);
+			}
 		}
 		break;
 	}
Signature · 1 line
2.11.0
author maintainer
#4 lore raw

PATCH v2 4/7 ipv6: Plumb support for nexthop object in a fib6_info

In reply to David Ahern

From: David Ahern <[email protected]>

Add struct nexthop and nh_list list_head to fib6_info. nh_list is the fib6_info side of the nexthop <-> fib_info relationship. Since a fib6_info referencing a nexthop object can not have 'sibling' entries (the old way of doing multipath routes), the nh_list is a union with fib6_siblings.

Add f6i_list list_head to 'struct nexthop' to track fib6_info entries using a nexthop instance. Update __remove_nexthop_fib to walk f6_list and delete fib entries using the nexthop.

Add a few nexthop helpers for use when a nexthop is added to fib6_info:
- nexthop_fib6_nh - return first fib6_nh in a nexthop object
- fib6_info_nh_dev moved to nexthop.h and updated to use nexthop_fib6_nh if the fib6_info references a nexthop object
- nexthop_path_fib6_result - similar to ipv4, select a path within a multipath nexthop object. If the nexthop is a blackhole, set fib6_result type to RTN_BLACKHOLE, and set the REJECT flag

Update the fib6_info references to check for nh and take a different path as needed:
- rt6_qualify_for_ecmp - if a fib entry uses a nexthop object it can NOT be coalesced with other fib entries into a multipath route
- rt6_duplicate_nexthop - use nexthop_cmp if either fib6_info references a nexthop
- addrconf (host routes), RA's and info entries (anything configured via ndisc) does not use nexthop objects
- fib6_info_destroy_rcu - put reference to nexthop object
- fib6_purge_rt - drop fib6_info from f6i_list
- fib6_select_path - update to use the new nexthop_path_fib6_result when fib entry uses a nexthop object
- rt6_device_match - update to catch use of nexthop object as a blackhole and set fib6_type and flags.
- ip6_pol_route - detect the REJECT flag getting set for blackhole nexthop and jump to ip6_create_rt_rcu
- ip6_route_info_create - don't add space for fib6_nh if fib entry is going to reference a nexthop object, take a reference to nexthop object, disallow use of source routing
- rt6_nlmsg_size - add space for RTA_NH_ID
- add rt6_fill_node_nexthop to add nexthop data on a dump

As with ipv4, most of the changes push existing code into the else branch of whether the fib entry uses a nexthop object.

Update the nexthop code to walk f6i_list on a nexthop deleted to remove fib entries referencing it.

---
 include/net/ip6_fib.h   |  11 ++--
 include/net/ip6_route.h |  13 +++-
 include/net/nexthop.h   |  50 ++++++++++++++++
 net/ipv4/nexthop.c      |  44 ++++++++++++++
 net/ipv6/addrconf.c     |   5 ++
 net/ipv6/ip6_fib.c      |  22 +++++--
 net/ipv6/ndisc.c        |   3 +-
 net/ipv6/route.c        | 156 +++++++++++++++++++++++++++++++++++++++++-------
 8 files changed, 268 insertions(+), 36 deletions(-)
include/net/ip6_fib.h +5 -6
index ebe5d65f97e0..1a8acd51b277 100644
@@ -146,7 +146,10 @@ struct fib6_info {
 	 * destination, but not the same gateway. nsiblings is just a cache
 	 * to speed up lookup.
 	 */
-	struct list_head		fib6_siblings;
+	union {
+		struct list_head	fib6_siblings;
+		struct list_head	nh_list;
+	};
 	unsigned int			fib6_nsiblings;
 
 	refcount_t			fib6_ref;
@@ -170,6 +173,7 @@ struct fib6_info {
 					unused:3;
 
 	struct rcu_head			rcu;
+	struct nexthop			*nh;
 	struct fib6_nh			fib6_nh[0];
 };
 
@@ -441,11 +445,6 @@ void rt6_get_prefsrc(const struct rt6_info *rt, struct in6_addr *addr)
 	rcu_read_unlock();
 }
 
-static inline struct net_device *fib6_info_nh_dev(const struct fib6_info *f6i)
-{
-	return f6i->fib6_nh->fib_nh_dev;
-}
-
 int fib6_nh_init(struct net *net, struct fib6_nh *fib6_nh,
 		 struct fib6_config *cfg, gfp_t gfp_flags,
 		 struct netlink_ext_ack *extack);
include/net/ip6_route.h +11 -2
index a6ce6ea856b9..7375a165fd98 100644
@@ -27,6 +27,7 @@ struct route_info {
 #include <linux/ip.h>
 #include <linux/ipv6.h>
 #include <linux/route.h>
+#include <net/nexthop.h>
 
 #define RT6_LOOKUP_F_IFACE		0x00000001
 #define RT6_LOOKUP_F_REACHABLE		0x00000002
@@ -66,10 +67,13 @@ static inline bool rt6_need_strict(const struct in6_addr *daddr)
 		(IPV6_ADDR_MULTICAST | IPV6_ADDR_LINKLOCAL | IPV6_ADDR_LOOPBACK);
 }
 
+/* fib entries using a nexthop object can not be coalesced into
+ * a multipath route
+ */
 static inline bool rt6_qualify_for_ecmp(const struct fib6_info *f6i)
 {
 	/* the RTF_ADDRCONF flag filters out RA's */
-	return !(f6i->fib6_flags & RTF_ADDRCONF) &&
+	return !(f6i->fib6_flags & RTF_ADDRCONF) && !f6i->nh &&
 		f6i->fib6_nh->fib_nh_gw_family;
 }
 
@@ -275,8 +279,13 @@ 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)
 {
-	struct fib6_nh *nha = a->fib6_nh, *nhb = b->fib6_nh;
+	struct fib6_nh *nha, *nhb;
+
+	if (a->nh || b->nh)
+		return nexthop_cmp(a->nh, b->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);
include/net/nexthop.h +50 -0

66 lines not on this page · raw message

net/ipv4/nexthop.c +44 -0

68 lines not on this page · raw message

net/ipv6/addrconf.c +5 -0
index 6b673d4f5ca9..7549e779335d 100644
@@ -2421,6 +2421,10 @@ static struct fib6_info *addrconf_get_prefix_route(const struct in6_addr *pfx,
 		goto out;
 
 	for_each_fib6_node_rt_rcu(fn) {
+		/* prefix routes only use builtin fib6_nh */
+		if (rt->nh)
+			continue;
+
 		if (rt->fib6_nh->fib_nh_dev->ifindex != dev->ifindex)
 			continue;
 		if (no_gw && rt->fib6_nh->fib_nh_gw_family)
@@ -6354,6 +6358,7 @@ void addrconf_disable_policy_idev(struct inet6_dev *idev, int val)
 	list_for_each_entry(ifa, &idev->addr_list, if_list) {
 		spin_lock(&ifa->lock);
 		if (ifa->rt) {
+			/* host routes only use builtin fib6_nh */
 			struct fib6_nh *nh = ifa->rt->fib6_nh;
 			int cpu;
 
net/ipv6/ip6_fib.c +18 -4
index cdfb8500ccae..02feda73a98e 100644
@@ -159,6 +159,7 @@ struct fib6_info *fib6_info_alloc(gfp_t gfp_flags, bool with_fib6_nh)
 	if (!f6i)
 		return NULL;
 
+	/* fib6_siblings is a union with nh_list, so this initializes both */
 	INIT_LIST_HEAD(&f6i->fib6_siblings);
 	refcount_set(&f6i->fib6_ref, 1);
 
@@ -171,7 +172,11 @@ void fib6_info_destroy_rcu(struct rcu_head *head)
 
 	WARN_ON(f6i->fib6_node);
 
-	fib6_nh_release(f6i->fib6_nh);
+	if (f6i->nh)
+		nexthop_put(f6i->nh);
+	else
+		fib6_nh_release(f6i->fib6_nh);
+
 	ip_fib_metrics_put(f6i->fib6_metrics);
 	kfree(f6i);
 }
@@ -927,6 +932,9 @@ static void fib6_purge_rt(struct fib6_info *rt, struct fib6_node *fn,
 
 	fib6_drop_pcpu_from(rt, table);
 
+	if (rt->nh && !list_empty(&rt->nh_list))
+		list_del_init(&rt->nh_list);
+
 	if (refcount_read(&rt->fib6_ref) != 1) {
 		/* This route is used as dummy address holder in some split
 		 * nodes. It is not leaked, but it still holds other resources,
@@ -1334,6 +1342,8 @@ int fib6_add(struct fib6_node *root, struct fib6_info *rt,
 
 	err = fib6_add_rt2node(fn, rt, info, extack);
 	if (!err) {
+		if (rt->nh)
+			list_add(&rt->nh_list, &rt->nh->f6i_list);
 		__fib6_update_sernum_upto_root(rt, sernum);
 		fib6_start_gc(info->nl_net, rt);
 	}
@@ -2295,9 +2305,13 @@ static int ipv6_route_seq_show(struct seq_file *seq, void *v)
 {
 	struct fib6_info *rt = v;
 	struct ipv6_route_iter *iter = seq->private;
+	struct fib6_nh *fib6_nh = rt->fib6_nh;
 	unsigned int flags = rt->fib6_flags;
 	const struct net_device *dev;
 
+	if (rt->nh)
+		fib6_nh = nexthop_fib6_nh(rt->nh);
+
 	seq_printf(seq, "%pi6 %02x ", &rt->fib6_dst.addr, rt->fib6_dst.plen);
 
 #ifdef CONFIG_IPV6_SUBTREES
@@ -2305,14 +2319,14 @@ static int ipv6_route_seq_show(struct seq_file *seq, void *v)
 #else
 	seq_puts(seq, "00000000000000000000000000000000 00 ");
 #endif
-	if (rt->fib6_nh->fib_nh_gw_family) {
+	if (fib6_nh->fib_nh_gw_family) {
 		flags |= RTF_GATEWAY;
-		seq_printf(seq, "%pi6", &rt->fib6_nh->fib_nh_gw6);
+		seq_printf(seq, "%pi6", &fib6_nh->fib_nh_gw6);
 	} else {
 		seq_puts(seq, "00000000000000000000000000000000");
 	}
 
-	dev = rt->fib6_nh->fib_nh_dev;
+	dev = fib6_nh->fib_nh_dev;
 	seq_printf(seq, " %08x %08x %08x %08x %8s\n",
 		   rt->fib6_metric, refcount_read(&rt->fib6_ref), 0,
 		   flags, dev ? dev->name : "");
net/ipv6/ndisc.c +1 -2
index f874dde1ee85..6e3c51109c83 100644
@@ -1289,9 +1289,8 @@ static void ndisc_router_discovery(struct sk_buff *skb)
 	    !in6_dev->cnf.accept_ra_rtr_pref)
 		pref = ICMPV6_ROUTER_PREF_MEDIUM;
 #endif
-
+	/* routes added from RAs do not use nexthop objects */
 	rt = rt6_get_dflt_router(net, &ipv6_hdr(skb)->saddr, skb->dev);
-
 	if (rt) {
 		neigh = ip6_neigh_lookup(&rt->fib6_nh->fib_nh_gw6,
 					 rt->fib6_nh->fib_nh_dev, NULL,
net/ipv6/route.c +134 -22

302 lines not on this page · raw message

Signature · 1 line
2.11.0
author maintainer
#1 lore raw

PATCH v2 1/7 ipv4: Use accessors for fib_info nexthop data

In reply to David Ahern

From: David Ahern <[email protected]>

Use helpers to access fib_nh and fib_nhs fields of a fib_info. Drop the fib_dev macro which is an alias for the first nexthop. Replacements:

  fi->fib_dev    --> fib_info_nh(fi, 0)->fib_nh_dev
  fi->fib_nh     --> fib_info_nh(fi, 0)
  fi->fib_nh[i]  --> fib_info_nh(fi, i)
  fi->fib_nhs    --> fib_info_num_path(fi)

where fib_info_nh(fi, i) returns fi->fib_nh[nhsel] and fib_info_num_path returns fi->fib_nhs.

Move the existing fib_info_nhc to nexthop.h and define the new ones there. A later patch adds a check if a fib_info uses a nexthop object, and defining the helpers in nexthop.h avoid circular header dependencies.

After this all remaining open coded references to fi->fib_nhs and fi->fib_nh are in:
- fib_create_info and helpers used to lookup an existing fib_info entry, and
- the netdev event functions fib_sync_down_dev and fib_sync_up.

The latter two will not be reused for nexthops, and the fib_create_info will be updated to handle a nexthop in a fib_info.

---
 drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c   | 29 ++++++----
 .../net/ethernet/mellanox/mlxsw/spectrum_router.c  | 19 ++++---
 drivers/net/ethernet/rocker/rocker_ofdpa.c         | 25 +++++---
 include/net/ip_fib.h                               |  6 --
 include/net/nexthop.h                              | 15 +++++
 net/core/filter.c                                  |  3 +-
 net/ipv4/fib_frontend.c                            | 11 ++--
 net/ipv4/fib_lookup.h                              |  1 +
 net/ipv4/fib_rules.c                               |  8 ++-
 net/ipv4/fib_semantics.c                           | 66 ++++++++++++----------
 net/ipv4/fib_trie.c                                | 26 +++++----
 net/ipv4/route.c                                   |  3 +-
 12 files changed, 132 insertions(+), 80 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c +19 -10
index 8212bfd05733..2cbfaa8da7fc 100644
@@ -2,6 +2,7 @@
 /* Copyright (c) 2019 Mellanox Technologies. */
 
 #include <linux/netdevice.h>
+#include <net/nexthop.h>
 #include "lag.h"
 #include "lag_mp.h"
 #include "mlx5_core.h"
@@ -110,6 +111,8 @@ static void mlx5_lag_fib_route_event(struct mlx5_lag *ldev,
 				     struct fib_info *fi)
 {
 	struct lag_mp *mp = &ldev->lag_mp;
+	struct fib_nh *fib_nh0, *fib_nh1;
+	unsigned int nhs;
 
 	/* Handle delete event */
 	if (event == FIB_EVENT_ENTRY_DEL) {
@@ -120,9 +123,11 @@ static void mlx5_lag_fib_route_event(struct mlx5_lag *ldev,
 	}
 
 	/* Handle add/replace event */
-	if (fi->fib_nhs == 1) {
+	nhs = fib_info_num_path(fi);
+	if (nhs == 1) {
 		if (__mlx5_lag_is_active(ldev)) {
-			struct net_device *nh_dev = fi->fib_nh[0].fib_nh_dev;
+			struct fib_nh *nh = fib_info_nh(fi, 0);
+			struct net_device *nh_dev = nh->fib_nh_dev;
 			int i = mlx5_lag_dev_get_netdev_idx(ldev, nh_dev);
 
 			mlx5_lag_set_port_affinity(ldev, ++i);
@@ -130,14 +135,16 @@ static void mlx5_lag_fib_route_event(struct mlx5_lag *ldev,
 		return;
 	}
 
-	if (fi->fib_nhs != 2)
+	if (nhs != 2)
 		return;
 
 	/* Verify next hops are ports of the same hca */
-	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)) {
+	fib_nh0 = fib_info_nh(fi, 0);
+	fib_nh1 = fib_info_nh(fi, 1);
+	if (!(fib_nh0->fib_nh_dev == ldev->pf[0].netdev &&
+	      fib_nh1->fib_nh_dev == ldev->pf[1].netdev) &&
+	    !(fib_nh0->fib_nh_dev == ldev->pf[1].netdev &&
+	      fib_nh1->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;
 	}
@@ -174,7 +181,7 @@ static void mlx5_lag_fib_nexthop_event(struct mlx5_lag *ldev,
 			mlx5_lag_set_port_affinity(ldev, i);
 		}
 	} else if (event == FIB_EVENT_NH_ADD &&
-		   fi->fib_nhs == 2) {
+		   fib_info_num_path(fi) == 2) {
 		mlx5_lag_set_port_affinity(ldev, 0);
 	}
 }
@@ -238,6 +245,7 @@ static int mlx5_lag_fib_event(struct notifier_block *nb,
 	struct mlx5_fib_event_work *fib_work;
 	struct fib_entry_notifier_info *fen_info;
 	struct fib_nh_notifier_info *fnh_info;
+	struct net_device *fib_dev;
 	struct fib_info *fi;
 
 	if (info->family != AF_INET)
@@ -254,8 +262,9 @@ static int mlx5_lag_fib_event(struct notifier_block *nb,
 		fen_info = container_of(info, struct fib_entry_notifier_info,
 					info);
 		fi = fen_info->fi;
-		if (fi->fib_dev != ldev->pf[0].netdev &&
-		    fi->fib_dev != ldev->pf[1].netdev) {
+		fib_dev = fib_info_nh(fen_info->fi, 0)->fib_nh_dev;
+		if (fib_dev != ldev->pf[0].netdev &&
+		    fib_dev != ldev->pf[1].netdev) {
 			return NOTIFY_DONE;
 		}
 		fib_work = mlx5_lag_init_fib_work(ldev, event);
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c +11 -8
index 0ec52be7cc33..4f781358aef1 100644
@@ -21,6 +21,7 @@
 #include <net/arp.h>
 #include <net/ip_fib.h>
 #include <net/ip6_fib.h>
+#include <net/nexthop.h>
 #include <net/fib_rules.h>
 #include <net/ip_tunnels.h>
 #include <net/l3mdev.h>
@@ -3816,23 +3817,25 @@ 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)
+				   struct fib_info *fi)
 {
-	return fi->fib_nh->fib_nh_scope == RT_SCOPE_LINK ||
-	       mlxsw_sp_nexthop4_ipip_type(mlxsw_sp, fi->fib_nh, NULL);
+	const struct fib_nh *nh = fib_info_nh(fi, 0);
+
+	return nh->fib_nh_scope == RT_SCOPE_LINK ||
+	       mlxsw_sp_nexthop4_ipip_type(mlxsw_sp, nh, NULL);
 }
 
 static struct mlxsw_sp_nexthop_group *
 mlxsw_sp_nexthop4_group_create(struct mlxsw_sp *mlxsw_sp, struct fib_info *fi)
 {
+	unsigned int nhs = fib_info_num_path(fi);
 	struct mlxsw_sp_nexthop_group *nh_grp;
 	struct mlxsw_sp_nexthop *nh;
 	struct fib_nh *fib_nh;
 	int i;
 	int err;
 
-	nh_grp = kzalloc(struct_size(nh_grp, nexthops, fi->fib_nhs),
-			 GFP_KERNEL);
+	nh_grp = kzalloc(struct_size(nh_grp, nexthops, nhs), GFP_KERNEL);
 	if (!nh_grp)
 		return ERR_PTR(-ENOMEM);
 	nh_grp->priv = fi;
@@ -3840,11 +3843,11 @@ mlxsw_sp_nexthop4_group_create(struct mlxsw_sp *mlxsw_sp, struct fib_info *fi)
 	nh_grp->neigh_tbl = &arp_tbl;
 
 	nh_grp->gateway = mlxsw_sp_fi_is_gateway(mlxsw_sp, fi);
-	nh_grp->count = fi->fib_nhs;
+	nh_grp->count = nhs;
 	fib_info_hold(fi);
 	for (i = 0; i < nh_grp->count; i++) {
 		nh = &nh_grp->nexthops[i];
-		fib_nh = &fi->fib_nh[i];
+		fib_nh = fib_info_nh(fi, i);
 		err = mlxsw_sp_nexthop4_init(mlxsw_sp, nh_grp, nh, fib_nh);
 		if (err)
 			goto err_nexthop4_init;
@@ -4282,9 +4285,9 @@ mlxsw_sp_fib4_entry_type_set(struct mlxsw_sp *mlxsw_sp,
 			     const struct fib_entry_notifier_info *fen_info,
 			     struct mlxsw_sp_fib_entry *fib_entry)
 {
+	struct net_device *dev = fib_info_nh(fen_info->fi, 0)->fib_nh_dev;
 	union mlxsw_sp_l3addr dip = { .addr4 = htonl(fen_info->dst) };
 	u32 tb_id = mlxsw_sp_fix_tb_id(fen_info->tb_id);
-	struct net_device *dev = fen_info->fi->fib_dev;
 	struct mlxsw_sp_ipip_entry *ipip_entry;
 	struct fib_info *fi = fen_info->fi;
 
drivers/net/ethernet/rocker/rocker_ofdpa.c +16 -9
index 30a49802fb51..47ed9d41047f 100644
@@ -22,6 +22,7 @@
 #include <net/neighbour.h>
 #include <net/switchdev.h>
 #include <net/ip_fib.h>
+#include <net/nexthop.h>
 #include <net/arp.h>
 
 #include "rocker.h"
@@ -2286,8 +2287,8 @@ static int ofdpa_port_fib_ipv4(struct ofdpa_port *ofdpa_port,  __be32 dst,
 
 	/* XXX support ECMP */
 
-	nh = fi->fib_nh;
-	nh_on_port = (fi->fib_dev == ofdpa_port->dev);
+	nh = fib_info_nh(fi, 0);
+	nh_on_port = (nh->fib_nh_dev == ofdpa_port->dev);
 	has_gw = !!nh->fib_nh_gw4;
 
 	if (has_gw && nh_on_port) {
@@ -2737,11 +2738,13 @@ static int ofdpa_fib4_add(struct rocker *rocker,
 {
 	struct ofdpa *ofdpa = rocker->wpriv;
 	struct ofdpa_port *ofdpa_port;
+	struct fib_nh *nh;
 	int err;
 
 	if (ofdpa->fib_aborted)
 		return 0;
-	ofdpa_port = ofdpa_port_dev_lower_find(fen_info->fi->fib_dev, rocker);
+	nh = fib_info_nh(fen_info->fi, 0);
+	ofdpa_port = ofdpa_port_dev_lower_find(nh->fib_nh_dev, rocker);
 	if (!ofdpa_port)
 		return 0;
 	err = ofdpa_port_fib_ipv4(ofdpa_port, htonl(fen_info->dst),
@@ -2749,7 +2752,7 @@ static int ofdpa_fib4_add(struct rocker *rocker,
 				  fen_info->tb_id, 0);
 	if (err)
 		return err;
-	fen_info->fi->fib_nh->fib_nh_flags |= RTNH_F_OFFLOAD;
+	nh->fib_nh_flags |= RTNH_F_OFFLOAD;
 	return 0;
 }
 
@@ -2758,13 +2761,15 @@ static int ofdpa_fib4_del(struct rocker *rocker,
 {
 	struct ofdpa *ofdpa = rocker->wpriv;
 	struct ofdpa_port *ofdpa_port;
+	struct fib_nh *nh;
 
 	if (ofdpa->fib_aborted)
 		return 0;
-	ofdpa_port = ofdpa_port_dev_lower_find(fen_info->fi->fib_dev, rocker);
+	nh = fib_info_nh(fen_info->fi, 0);
+	ofdpa_port = ofdpa_port_dev_lower_find(nh->fib_nh_dev, rocker);
 	if (!ofdpa_port)
 		return 0;
-	fen_info->fi->fib_nh->fib_nh_flags &= ~RTNH_F_OFFLOAD;
+	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);
@@ -2784,14 +2789,16 @@ static void ofdpa_fib4_abort(struct rocker *rocker)
 
 	spin_lock_irqsave(&ofdpa->flow_tbl_lock, flags);
 	hash_for_each_safe(ofdpa->flow_tbl, bkt, tmp, flow_entry, entry) {
+		struct fib_nh *nh;
+
 		if (flow_entry->key.tbl_id !=
 		    ROCKER_OF_DPA_TABLE_ID_UNICAST_ROUTING)
 			continue;
-		ofdpa_port = ofdpa_port_dev_lower_find(flow_entry->fi->fib_dev,
-						       rocker);
+		nh = fib_info_nh(flow_entry->fi, 0);
+		ofdpa_port = ofdpa_port_dev_lower_find(nh->fib_nh_dev, rocker);
 		if (!ofdpa_port)
 			continue;
-		flow_entry->fi->fib_nh->fib_nh_flags &= ~RTNH_F_OFFLOAD;
+		nh->fib_nh_flags &= ~RTNH_F_OFFLOAD;
 		ofdpa_flow_tbl_del(ofdpa_port, OFDPA_OP_FLAG_REMOVE,
 				   flow_entry);
 	}
include/net/ip_fib.h +0 -6
index 70ba0302c8c9..42b1a806f6f5 100644
@@ -153,7 +153,6 @@ struct fib_info {
 	bool			nh_updated;
 	struct rcu_head		rcu;
 	struct fib_nh		fib_nh[0];
-#define fib_dev		fib_nh[0].fib_nh_dev
 };
 
 
@@ -190,11 +189,6 @@ struct fib_result_nl {
 	int             err;
 };
 
-static inline struct fib_nh_common *fib_info_nhc(struct fib_info *fi, int nhsel)
-{
-	return &fi->fib_nh[nhsel].nh_common;
-}
-
 #ifdef CONFIG_IP_MULTIPLE_TABLES
 #define FIB_TABLE_HASHSZ 256
 #else
include/net/nexthop.h +15 -0
index 6e1b8f53624c..e501d77b82c8 100644
@@ -192,4 +192,19 @@ static inline bool nexthop_is_blackhole(const struct nexthop *nh)
 	nhi = rcu_dereference_rtnl(nh->nh_info);
 	return nhi->reject_nh;
 }
+
+static inline unsigned int fib_info_num_path(const struct fib_info *fi)
+{
+	return fi->fib_nhs;
+}
+
+static inline struct fib_nh_common *fib_info_nhc(struct fib_info *fi, int nhsel)
+{
+	return &fi->fib_nh[nhsel].nh_common;
+}
+
+static inline struct fib_nh *fib_info_nh(struct fib_info *fi, int nhsel)
+{
+	return &fi->fib_nh[nhsel];
+}
 #endif
net/core/filter.c +2 -1
index 55bfc941d17a..2ae72bbfa6d2 100644
@@ -66,6 +66,7 @@
 #include <net/inet_hashtables.h>
 #include <net/inet6_hashtables.h>
 #include <net/ip_fib.h>
+#include <net/nexthop.h>
 #include <net/flow.h>
 #include <net/arp.h>
 #include <net/ipv6.h>
@@ -4674,7 +4675,7 @@ static int bpf_ipv4_fib_lookup(struct net *net, struct bpf_fib_lookup *params,
 	if (res.type != RTN_UNICAST)
 		return BPF_FIB_LKUP_RET_NOT_FWDED;
 
-	if (res.fi->fib_nhs > 1)
+	if (fib_info_num_path(res.fi) > 1)
 		fib_select_path(net, &res, &fl4, NULL);
 
 	if (check_mtu) {
net/ipv4/fib_frontend.c +7 -4
index 76055c66326a..ab369959ce0b 100644
@@ -43,6 +43,7 @@
 #include <net/sock.h>
 #include <net/arp.h>
 #include <net/ip_fib.h>
+#include <net/nexthop.h>
 #include <net/rtnetlink.h>
 #include <net/xfrm.h>
 #include <net/l3mdev.h>
@@ -234,7 +235,9 @@ static inline unsigned int __inet_dev_addr_type(struct net *net,
 	if (table) {
 		ret = RTN_UNICAST;
 		if (!fib_table_lookup(table, &fl4, &res, FIB_LOOKUP_NOREF)) {
-			if (!dev || dev == res.fi->fib_dev)
+			struct fib_nh *nh = fib_info_nh(res.fi, 0);
+
+			if (!dev || dev == nh->fib_nh_dev)
 				ret = res.type;
 		}
 	}
@@ -321,8 +324,8 @@ bool fib_info_nh_uses_dev(struct fib_info *fi, const struct net_device *dev)
 #ifdef CONFIG_IP_ROUTE_MULTIPATH
 	int ret;
 
-	for (ret = 0; ret < fi->fib_nhs; ret++) {
-		struct fib_nh *nh = &fi->fib_nh[ret];
+	for (ret = 0; ret < fib_info_num_path(fi); ret++) {
+		const struct fib_nh *nh = fib_info_nh(fi, ret);
 
 		if (nh->fib_nh_dev == dev) {
 			dev_match = true;
@@ -333,7 +336,7 @@ bool fib_info_nh_uses_dev(struct fib_info *fi, const struct net_device *dev)
 		}
 	}
 #else
-	if (fi->fib_nh[0].fib_nh_dev == dev)
+	if (fib_info_nh(fi, 0)->fib_nh_dev == dev)
 		dev_match = true;
 #endif
 
net/ipv4/fib_lookup.h +1 -0
index 7945f0534db7..a68b5e21ec51 100644
@@ -5,6 +5,7 @@
 #include <linux/types.h>
 #include <linux/list.h>
 #include <net/ip_fib.h>
+#include <net/nexthop.h>
 
 struct fib_alias {
 	struct hlist_node	fa_list;
net/ipv4/fib_rules.c +6 -2
index cfec3af54c8d..ab06fd73b343 100644
@@ -31,6 +31,7 @@
 #include <net/route.h>
 #include <net/tcp.h>
 #include <net/ip_fib.h>
+#include <net/nexthop.h>
 #include <net/fib_rules.h>
 
 struct fib4_rule {
@@ -145,8 +146,11 @@ static bool fib4_rule_suppress(struct fib_rule *rule, struct fib_lookup_arg *arg
 	struct fib_result *result = (struct fib_result *) arg->result;
 	struct net_device *dev = NULL;
 
-	if (result->fi)
-		dev = result->fi->fib_dev;
+	if (result->fi) {
+		struct fib_nh *nh = fib_info_nh(result->fi, 0);
+
+		dev = nh->fib_nh_dev;
+	}
 
 	/* do not accept result if the route does
 	 * not meet the required prefix length
net/ipv4/fib_semantics.c +37 -29

209 lines not on this page · raw message

net/ipv4/fib_trie.c +16 -10
index b53ecef89d59..5c8a4d21b8e0 100644
@@ -1469,7 +1469,7 @@ int fib_table_lookup(struct fib_table *tb, const struct flowi4 *flp,
 		}
 		if (fi->fib_flags & RTNH_F_DEAD)
 			continue;
-		for (nhsel = 0; nhsel < fi->fib_nhs; nhsel++) {
+		for (nhsel = 0; nhsel < fib_info_num_path(fi); nhsel++) {
 			struct fib_nh_common *nhc = fib_info_nhc(fi, nhsel);
 
 			if (nhc->nhc_flags & RTNH_F_DEAD)
@@ -2717,14 +2717,18 @@ static void fib_route_seq_stop(struct seq_file *seq, void *v)
 	rcu_read_unlock();
 }
 
-static unsigned int fib_flag_trans(int type, __be32 mask, const struct fib_info *fi)
+static unsigned int fib_flag_trans(int type, __be32 mask, struct fib_info *fi)
 {
 	unsigned int flags = 0;
 
 	if (type == RTN_UNREACHABLE || type == RTN_PROHIBIT)
 		flags = RTF_REJECT;
-	if (fi && fi->fib_nh->fib_nh_gw4)
-		flags |= RTF_GATEWAY;
+	if (fi) {
+		const struct fib_nh *nh = fib_info_nh(fi, 0);
+
+		if (nh->fib_nh_gw4)
+			flags |= RTF_GATEWAY;
+	}
 	if (mask == htonl(0xFFFFFFFF))
 		flags |= RTF_HOST;
 	flags |= RTF_UP;
@@ -2755,7 +2759,7 @@ static int fib_route_seq_show(struct seq_file *seq, void *v)
 	prefix = htonl(l->key);
 
 	hlist_for_each_entry_rcu(fa, &l->leaf, fa_list) {
-		const struct fib_info *fi = fa->fa_info;
+		struct fib_info *fi = fa->fa_info;
 		__be32 mask = inet_make_mask(KEYLENGTH - fa->fa_slen);
 		unsigned int flags = fib_flag_trans(fa->fa_type, mask, fi);
 
@@ -2768,26 +2772,28 @@ static int fib_route_seq_show(struct seq_file *seq, void *v)
 
 		seq_setwidth(seq, 127);
 
-		if (fi)
+		if (fi) {
+			struct fib_nh *nh = fib_info_nh(fi, 0);
+
 			seq_printf(seq,
 				   "%s\t%08X\t%08X\t%04X\t%d\t%u\t"
 				   "%d\t%08X\t%d\t%u\t%u",
-				   fi->fib_dev ? fi->fib_dev->name : "*",
+				   nh->fib_nh_dev ? nh->fib_nh_dev->name : "*",
 				   prefix,
-				   fi->fib_nh->fib_nh_gw4, flags, 0, 0,
+				   nh->fib_nh_gw4, flags, 0, 0,
 				   fi->fib_priority,
 				   mask,
 				   (fi->fib_advmss ?
 				    fi->fib_advmss + 40 : 0),
 				   fi->fib_window,
 				   fi->fib_rtt >> 3);
-		else
+		} else {
 			seq_printf(seq,
 				   "*\t%08X\t%08X\t%04X\t%d\t%u\t"
 				   "%d\t%08X\t%d\t%u\t%u",
 				   prefix, 0, flags, 0, 0, 0,
 				   mask, 0, 0, 0);
-
+		}
 		seq_pad(seq, '\n');
 	}
 
net/ipv4/route.c +2 -1
index 11ddc276776e..05a6a8ecb574 100644
@@ -99,6 +99,7 @@
 #include <net/inetpeer.h>
 #include <net/sock.h>
 #include <net/ip_fib.h>
+#include <net/nexthop.h>
 #include <net/arp.h>
 #include <net/tcp.h>
 #include <net/icmp.h>
@@ -1950,7 +1951,7 @@ static int ip_mkroute_input(struct sk_buff *skb,
 			    struct flow_keys *hkeys)
 {
 #ifdef CONFIG_IP_ROUTE_MULTIPATH
-	if (res->fi && res->fi->fib_nhs > 1) {
+	if (res->fi && fib_info_num_path(res->fi) > 1) {
 		int h = fib_multipath_hash(res->fi->fib_net, NULL, skb, hkeys);
 
 		fib_select_multipath(res, h);
Signature · 1 line
2.11.0
author maintainer
#3 lore raw

PATCH v2 3/7 ipv4: Plumb support for nexthop object in a fib_info

In reply to David Ahern

From: David Ahern <[email protected]>

Add 'struct nexthop' and nh_list list_head to fib_info. nh_list is the fib_info side of the nexthop <-> fib_info relationship.

Add fi_list list_head to 'struct nexthop' to track fib_info entries using a nexthop instance. Add __remove_nexthop_fib and add it to __remove_nexthop to walk the new list_head and mark those fib entries as dead when the nexthop is deleted.

Add a few nexthop helpers for use when a nexthop is added to fib_info:
- nexthop_cmp to determine if 2 nexthops are the same
- nexthop_path_fib_result to select a path for a multipath 'struct nexthop'
- nexthop_fib_nhc to select a specific fib_nh_common within a multipath 'struct nexthop'

Update existing fib_info_nhc to use nexthop_fib_nhc if a fib_info uses a 'struct nexthop', and mark fib_info_nh as only used for the non-nexthop case.

Update the fib_info functions to check for fi->nh and take a different path as needed:
- free_fib_info_rcu - put the nexthop object reference
- fib_release_info - remove the fib_info from the nexthop's fi_list
- nh_comp - use nexthop_cmp when either fib_info references a nexthop object
- fib_info_hashfn - use the nexthop id for the hashing vs the oif of each fib_nh in a fib_info
- fib_nlmsg_size - add space for the RTA_NH_ID attribute
- fib_create_info - verify nexthop reference can be taken, verify nexthop spec is valid for fib entry, and add fib_info to fi_list for a nexthop
- fib_select_multipath - use the new nexthop_path_fib_result to select a path when nexthop objects are used
- fib_table_lookup - if the 'struct nexthop' is a blackhole nexthop, treat it the same as a fib entry using 'blackhole'

The bulk of the changes are in fib_semantics.c and most of that is moving the existing change_nexthops into an else branch.

Update the nexthop code to walk fi_list on a nexthop deleted to remove fib entries referencing it.

---
 include/net/ip_fib.h     |   4 ++
 include/net/nexthop.h    |  48 ++++++++++++++++
 net/ipv4/fib_semantics.c | 142 +++++++++++++++++++++++++++++++++++------------
 net/ipv4/fib_trie.c      |   7 +++
 net/ipv4/nexthop.c       |  64 +++++++++++++++++++++
 5 files changed, 229 insertions(+), 36 deletions(-)
include/net/ip_fib.h +4 -0
index 7da8ea784029..071d280de389 100644
@@ -129,9 +129,12 @@ struct fib_nh {
  * This structure contains data shared by many of routes.
  */
 
+struct nexthop;
+
 struct fib_info {
 	struct hlist_node	fib_hash;
 	struct hlist_node	fib_lhash;
+	struct list_head	nh_list;
 	struct net		*fib_net;
 	int			fib_treeref;
 	refcount_t		fib_clntref;
@@ -151,6 +154,7 @@ struct fib_info {
 	int			fib_nhs;
 	bool			fib_nh_is_v6;
 	bool			nh_updated;
+	struct nexthop		*nh;
 	struct rcu_head		rcu;
 	struct fib_nh		fib_nh[0];
 };
include/net/nexthop.h +48 -0

78 lines not on this page · raw message

net/ipv4/fib_semantics.c +106 -36

259 lines not on this page · raw message

net/ipv4/fib_trie.c +7 -0
index d704d1606b8f..716f2d66cb3f 100644
@@ -1461,6 +1461,7 @@ int fib_table_lookup(struct fib_table *tb, const struct flowi4 *flp,
 		fib_alias_accessed(fa);
 		err = fib_props[fa->fa_type].error;
 		if (unlikely(err < 0)) {
+out_reject:
 #ifdef CONFIG_IP_FIB_TRIE_STATS
 			this_cpu_inc(stats->semantic_match_passed);
 #endif
@@ -1469,6 +1470,12 @@ int fib_table_lookup(struct fib_table *tb, const struct flowi4 *flp,
 		}
 		if (fi->fib_flags & RTNH_F_DEAD)
 			continue;
+
+		if (unlikely(fi->nh && nexthop_is_blackhole(fi->nh))) {
+			err = fib_props[RTN_BLACKHOLE].error;
+			goto out_reject;
+		}
+
 		for (nhsel = 0; nhsel < fib_info_num_path(fi); nhsel++) {
 			struct fib_nh_common *nhc = fib_info_nhc(fi, nhsel);
 
net/ipv4/nexthop.c +64 -0

85 lines not on this page · raw message

Signature · 1 line
2.11.0
author maintainer
#27 lore raw

PATCH v2 7/7 rocker: Fail attempts to use routes with nexthop objects

In reply to David Ahern

From: David Ahern <[email protected]>

Fail attempts to use nexthop objects with routes until support can be properly added.

---
 drivers/net/ethernet/rocker/rocker_main.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/net/ethernet/rocker/rocker_main.c +4 -0
index 7ae6c124bfe9..45b3325c3a38 100644
@@ -2214,6 +2214,10 @@ static int rocker_router_fib_event(struct notifier_block *nb,
 				NL_SET_ERR_MSG_MOD(info->extack, "IPv6 gateway with IPv4 route is not supported");
 				return notifier_from_errno(-EINVAL);
 			}
+			if (fen_info->fi->nh) {
+				NL_SET_ERR_MSG_MOD(info->extack, "IPv4 route with nexthop objects is not supported");
+				return notifier_from_errno(-EINVAL);
+			}
 		}
 
 		memcpy(&fib_work->fen_info, ptr, sizeof(fib_work->fen_info));
Signature · 1 line
2.11.0
#5 lore raw

Re: [PATCH v2 net-next 4/7] ipv6: Plumb support for nexthop object in a fib6_info

In reply to David Ahern
Quoted 274 lines · David Ahern

From: David Ahern <[email protected]>

Add struct nexthop and nh_list list_head to fib6_info. nh_list is the fib6_info side of the nexthop <-> fib_info relationship. Since a fib6_info referencing a nexthop object can not have 'sibling' entries (the old way of doing multipath routes), the nh_list is a union with fib6_siblings.

Add f6i_list list_head to 'struct nexthop' to track fib6_info entries using a nexthop instance. Update __remove_nexthop_fib to walk f6_list and delete fib entries using the nexthop.

Add a few nexthop helpers for use when a nexthop is added to fib6_info:
- nexthop_fib6_nh - return first fib6_nh in a nexthop object
- fib6_info_nh_dev moved to nexthop.h and updated to use nexthop_fib6_nh if the fib6_info references a nexthop object
- nexthop_path_fib6_result - similar to ipv4, select a path within a multipath nexthop object. If the nexthop is a blackhole, set fib6_result type to RTN_BLACKHOLE, and set the REJECT flag

Update the fib6_info references to check for nh and take a different path as needed:
- rt6_qualify_for_ecmp - if a fib entry uses a nexthop object it can NOT be coalesced with other fib entries into a multipath route
- rt6_duplicate_nexthop - use nexthop_cmp if either fib6_info references a nexthop
- addrconf (host routes), RA's and info entries (anything configured via ndisc) does not use nexthop objects
- fib6_info_destroy_rcu - put reference to nexthop object
- fib6_purge_rt - drop fib6_info from f6i_list
- fib6_select_path - update to use the new nexthop_path_fib6_result when fib entry uses a nexthop object
- rt6_device_match - update to catch use of nexthop object as a blackhole and set fib6_type and flags.
- ip6_pol_route - detect the REJECT flag getting set for blackhole nexthop and jump to ip6_create_rt_rcu
- ip6_route_info_create - don't add space for fib6_nh if fib entry is going to reference a nexthop object, take a reference to nexthop object, disallow use of source routing
- rt6_nlmsg_size - add space for RTA_NH_ID
- add rt6_fill_node_nexthop to add nexthop data on a dump

As with ipv4, most of the changes push existing code into the else branch of whether the fib entry uses a nexthop object.

Update the nexthop code to walk f6i_list on a nexthop deleted to remove fib entries referencing it.

---
 include/net/ip6_fib.h   |  11 ++--
 include/net/ip6_route.h |  13 +++-
 include/net/nexthop.h   |  50 ++++++++++++++++
 net/ipv4/nexthop.c      |  44 ++++++++++++++
 net/ipv6/addrconf.c     |   5 ++
 net/ipv6/ip6_fib.c      |  22 +++++--
 net/ipv6/ndisc.c        |   3 +-
 net/ipv6/route.c        | 156 +++++++++++++++++++++++++++++++++++++++++-------
 8 files changed, 268 insertions(+), 36 deletions(-)
include/net/ip6_fib.h +5 -6
index ebe5d65f97e0..1a8acd51b277 100644
@@ -146,7 +146,10 @@ struct fib6_info {
         * destination, but not the same gateway. nsiblings is just a cache
         * to speed up lookup.
         */
-       struct list_head                fib6_siblings;
+       union {
+               struct list_head        fib6_siblings;
+               struct list_head        nh_list;
+       };
        unsigned int                    fib6_nsiblings;
 
        refcount_t                      fib6_ref;
@@ -170,6 +173,7 @@ struct fib6_info {
                                        unused:3;
 
        struct rcu_head                 rcu;
+       struct nexthop                  *nh;
        struct fib6_nh                  fib6_nh[0];
 };
 
@@ -441,11 +445,6 @@ void rt6_get_prefsrc(const struct rt6_info *rt, struct in6_addr *addr)
        rcu_read_unlock();
 }
 
-static inline struct net_device *fib6_info_nh_dev(const struct fib6_info *f6i)
-{
-       return f6i->fib6_nh->fib_nh_dev;
-}
-
 int fib6_nh_init(struct net *net, struct fib6_nh *fib6_nh,
                 struct fib6_config *cfg, gfp_t gfp_flags,
                 struct netlink_ext_ack *extack);
include/net/ip6_route.h +11 -2
index a6ce6ea856b9..7375a165fd98 100644
@@ -27,6 +27,7 @@ struct route_info {
 #include <linux/ip.h>
 #include <linux/ipv6.h>
 #include <linux/route.h>
+#include <net/nexthop.h>
 
 #define RT6_LOOKUP_F_IFACE             0x00000001
 #define RT6_LOOKUP_F_REACHABLE         0x00000002
@@ -66,10 +67,13 @@ static inline bool rt6_need_strict(const struct in6_addr *daddr)
                (IPV6_ADDR_MULTICAST | IPV6_ADDR_LINKLOCAL | IPV6_ADDR_LOOPBACK);
 }
 
+/* fib entries using a nexthop object can not be coalesced into
+ * a multipath route
+ */
 static inline bool rt6_qualify_for_ecmp(const struct fib6_info *f6i)
 {
        /* the RTF_ADDRCONF flag filters out RA's */
-       return !(f6i->fib6_flags & RTF_ADDRCONF) &&
+       return !(f6i->fib6_flags & RTF_ADDRCONF) && !f6i->nh &&
                f6i->fib6_nh->fib_nh_gw_family;
 }
 
@@ -275,8 +279,13 @@ 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)
 {
-       struct fib6_nh *nha = a->fib6_nh, *nhb = b->fib6_nh;
+       struct fib6_nh *nha, *nhb;
+
+       if (a->nh || b->nh)
+               return nexthop_cmp(a->nh, b->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);
include/net/nexthop.h +50 -0
index 2912a2d7a515..aff7b2410057 100644
@@ -10,6 +10,7 @@
 #define __LINUX_NEXTHOP_H
 
 #include <linux/netdevice.h>
+#include <linux/route.h>
 #include <linux/types.h>
 #include <net/ip_fib.h>
 #include <net/ip6_fib.h>
@@ -78,6 +79,7 @@ struct nh_group {
 struct nexthop {
        struct rb_node          rb_node;    /* entry on netns rbtree */
        struct list_head        fi_list;    /* v4 entries using nh */
+       struct list_head        f6i_list;   /* v6 entries using nh */
        struct list_head        grp_list;   /* nh group entries using this nh */
        struct net              *net;
 
@@ -255,4 +257,52 @@ static inline struct fib_nh *fib_info_nh(struct fib_info *fi, int nhsel)
 
        return &fi->fib_nh[nhsel];
 }
+
+/*
+ * IPv6 variants
+ */
+int fib6_check_nexthop(struct nexthop *nh, struct fib6_config *cfg,
+                      struct netlink_ext_ack *extack);
+
+static inline struct fib6_nh *nexthop_fib6_nh(struct nexthop *nh)
+{
+       struct nh_info *nhi;
+
+       if (nexthop_is_multipath(nh)) {
+               nh = nexthop_mpath_select(nh, 0);
+               if (!nh)
+                       return NULL;
+       }
+
+       nhi = rcu_dereference_rtnl(nh->nh_info);
+       if (nhi->family == AF_INET6)
+               return &nhi->fib6_nh;
+
+       return NULL;
+}
+
+static inline struct net_device *fib6_info_nh_dev(struct fib6_info *f6i)
+{
+       struct fib6_nh *fib6_nh;
+
+       fib6_nh = f6i->nh ? nexthop_fib6_nh(f6i->nh) : f6i->fib6_nh;
+       return fib6_nh->fib_nh_dev;
+}
+
+static inline void nexthop_path_fib6_result(struct fib6_result *res, int hash)
+{
+       struct nexthop *nh = res->f6i->nh;
+       struct nh_info *nhi;
+
+       nh = nexthop_select_path(nh, hash);
+
+       nhi = rcu_dereference_rtnl(nh->nh_info);
+       if (nhi->reject_nh) {
+               res->fib6_type = RTN_BLACKHOLE;
+               res->fib6_flags |= RTF_REJECT;
+               res->nh = nexthop_fib6_nh(nh);
+       } else {
+               res->nh = &nhi->fib6_nh;
+       }
+}
 #endif
net/ipv4/nexthop.c +37 -0
index 63cbb04f697f..5e48762b6b5f 100644
@@ -106,6 +106,7 @@ static struct nexthop *nexthop_alloc(void)
        nh = kzalloc(sizeof(struct nexthop), GFP_KERNEL);
        if (nh) {
                INIT_LIST_HEAD(&nh->fi_list);
+               INIT_LIST_HEAD(&nh->f6i_list);
                INIT_LIST_HEAD(&nh->grp_list);
        }
        return nh;
@@ -516,6 +517,41 @@ struct nexthop *nexthop_select_path(struct nexthop *nh, int hash)
 }
 EXPORT_SYMBOL_GPL(nexthop_select_path);
 
+int fib6_check_nexthop(struct nexthop *nh, struct fib6_config *cfg,
+                      struct netlink_ext_ack *extack)
+{
+       struct nh_info *nhi;
+
+       /* fib6_src is unique to a fib6_info and limits the ability to cache
+        * routes in fib6_nh within a nexthop that is potentially shared
+        * across multiple fib entries. If the config wants to use source
+        * routing it can not use nexthop objects. mlxsw also does not allow
+        * fib6_src on routes.
+        */
+       if (!ipv6_addr_any(&cfg->fc_src)) {
+               NL_SET_ERR_MSG(extack, "IPv6 routes using source address can not use nexthop objects");
+               return -EINVAL;
+       }
+
+       if (nh->is_group) {
+               struct nh_group *nhg;
+
+               nhg = rtnl_dereference(nh->nh_grp);
+               if (nhg->has_v4)
+                       goto no_v4_nh;
+       } else {
+               nhi = rtnl_dereference(nh->nh_info);
+               if (nhi->family == AF_INET)
+                       goto no_v4_nh;
+       }
+
+       return 0;
+no_v4_nh:
+       NL_SET_ERR_MSG(extack, "IPv6 routes can not use an IPv4 nexthop");
+       return -EINVAL;
+}
+EXPORT_SYMBOL_GPL(fib6_check_nexthop);
+
 static int nexthop_check_scope(struct nexthop *nh, u8 scope,
                               struct netlink_ext_ack *extack)
 {
@@ -658,6 +694,7 @@ static void remove_nexthop_group(struct nexthop *nh, struct nl_info *nlinfo)
 
 static void __remove_nexthop_fib(struct net *net, struct nexthop *nh)
 {
+       struct fib6_info *f6i, *tmp;
        bool do_flush = false;
        struct fib_info *fi;
 

net/ipv4/nexthop.c static void __remove_nexthop_fib(struct net *net, struct nexthop *nh) · line 711

Quoted 8 lines
net/ipv4/nexthop.c +5 -0
@@ -667,6 +704,13 @@ static void __remove_nexthop_fib(struct net *net, struct nexthop *nh)
        }
        if (do_flush)
                fib_flush(net);
+
+       /* ip6_del_rt removes the entry from this list hence the _safe */
+       list_for_each_entry_safe(f6i, tmp, &nh->f6i_list, nh_list) {
+               /* __ip6_del_rt does a release, so do a hold here */
+               fib6_info_hold(f6i);

Do we need fib6_info_hold_safe() here?

Quoted 125 lines
net/ipv4/nexthop.c +2 -0
+               ipv6_stub->ip6_del_rt(net, f6i);
+       }
 }
 
 static void __remove_nexthop(struct net *net, struct nexthop *nh,
net/ipv6/addrconf.c +5 -0
index 6b673d4f5ca9..7549e779335d 100644
@@ -2421,6 +2421,10 @@ static struct fib6_info *addrconf_get_prefix_route(const struct in6_addr *pfx,
                goto out;
 
        for_each_fib6_node_rt_rcu(fn) {
+               /* prefix routes only use builtin fib6_nh */
+               if (rt->nh)
+                       continue;
+
                if (rt->fib6_nh->fib_nh_dev->ifindex != dev->ifindex)
                        continue;
                if (no_gw && rt->fib6_nh->fib_nh_gw_family)
@@ -6354,6 +6358,7 @@ void addrconf_disable_policy_idev(struct inet6_dev *idev, int val)
        list_for_each_entry(ifa, &idev->addr_list, if_list) {
                spin_lock(&ifa->lock);
                if (ifa->rt) {
+                       /* host routes only use builtin fib6_nh */
                        struct fib6_nh *nh = ifa->rt->fib6_nh;
                        int cpu;
 
net/ipv6/ip6_fib.c +18 -4
index cdfb8500ccae..02feda73a98e 100644
@@ -159,6 +159,7 @@ struct fib6_info *fib6_info_alloc(gfp_t gfp_flags, bool with_fib6_nh)
        if (!f6i)
                return NULL;
 
+       /* fib6_siblings is a union with nh_list, so this initializes both */
        INIT_LIST_HEAD(&f6i->fib6_siblings);
        refcount_set(&f6i->fib6_ref, 1);
 
@@ -171,7 +172,11 @@ void fib6_info_destroy_rcu(struct rcu_head *head)
 
        WARN_ON(f6i->fib6_node);
 
-       fib6_nh_release(f6i->fib6_nh);
+       if (f6i->nh)
+               nexthop_put(f6i->nh);
+       else
+               fib6_nh_release(f6i->fib6_nh);
+
        ip_fib_metrics_put(f6i->fib6_metrics);
        kfree(f6i);
 }
@@ -927,6 +932,9 @@ static void fib6_purge_rt(struct fib6_info *rt, struct fib6_node *fn,
 
        fib6_drop_pcpu_from(rt, table);
 
+       if (rt->nh && !list_empty(&rt->nh_list))
+               list_del_init(&rt->nh_list);
+
        if (refcount_read(&rt->fib6_ref) != 1) {
                /* This route is used as dummy address holder in some split
                 * nodes. It is not leaked, but it still holds other resources,
@@ -1334,6 +1342,8 @@ int fib6_add(struct fib6_node *root, struct fib6_info *rt,
 
        err = fib6_add_rt2node(fn, rt, info, extack);
        if (!err) {
+               if (rt->nh)
+                       list_add(&rt->nh_list, &rt->nh->f6i_list);
                __fib6_update_sernum_upto_root(rt, sernum);
                fib6_start_gc(info->nl_net, rt);
        }
@@ -2295,9 +2305,13 @@ static int ipv6_route_seq_show(struct seq_file *seq, void *v)
 {
        struct fib6_info *rt = v;
        struct ipv6_route_iter *iter = seq->private;
+       struct fib6_nh *fib6_nh = rt->fib6_nh;
        unsigned int flags = rt->fib6_flags;
        const struct net_device *dev;
 
+       if (rt->nh)
+               fib6_nh = nexthop_fib6_nh(rt->nh);
+
        seq_printf(seq, "%pi6 %02x ", &rt->fib6_dst.addr, rt->fib6_dst.plen);
 
 #ifdef CONFIG_IPV6_SUBTREES
@@ -2305,14 +2319,14 @@ static int ipv6_route_seq_show(struct seq_file *seq, void *v)
 #else
        seq_puts(seq, "00000000000000000000000000000000 00 ");
 #endif
-       if (rt->fib6_nh->fib_nh_gw_family) {
+       if (fib6_nh->fib_nh_gw_family) {
                flags |= RTF_GATEWAY;
-               seq_printf(seq, "%pi6", &rt->fib6_nh->fib_nh_gw6);
+               seq_printf(seq, "%pi6", &fib6_nh->fib_nh_gw6);
        } else {
                seq_puts(seq, "00000000000000000000000000000000");
        }
 
-       dev = rt->fib6_nh->fib_nh_dev;
+       dev = fib6_nh->fib_nh_dev;
        seq_printf(seq, " %08x %08x %08x %08x %8s\n",
                   rt->fib6_metric, refcount_read(&rt->fib6_ref), 0,
                   flags, dev ? dev->name : "");
net/ipv6/ndisc.c +1 -2
index f874dde1ee85..6e3c51109c83 100644
@@ -1289,9 +1289,8 @@ static void ndisc_router_discovery(struct sk_buff *skb)
            !in6_dev->cnf.accept_ra_rtr_pref)
                pref = ICMPV6_ROUTER_PREF_MEDIUM;
 #endif
-
+       /* routes added from RAs do not use nexthop objects */
        rt = rt6_get_dflt_router(net, &ipv6_hdr(skb)->saddr, skb->dev);
-
        if (rt) {
                neigh = ip6_neigh_lookup(&rt->fib6_nh->fib_nh_gw6,
                                         rt->fib6_nh->fib_nh_dev, NULL,
net/ipv6/route.c +0 -0
index fada5a13bcb2..51cb5cb027ae 100644

net/ipv6/route.c void fib6_select_path(const struct net *net, struct fib6_result *res, · line 436

Quoted 6 lines
net/ipv6/route.c +1 -1
@@ -432,15 +432,21 @@ void fib6_select_path(const struct net *net, struct fib6_result *res,
        struct fib6_info *sibling, *next_sibling;
        struct fib6_info *match = res->f6i;
 
-       if (!match->fib6_nsiblings || have_oif_match)
+       if ((!match->fib6_nsiblings && !match->nh) || have_oif_match)
                goto out;

So you mentioned fib6_nsiblings and nexthop is mutually exclusive. Is it enforced from the configuration?

Quoted 84 lines
net/ipv6/route.c +30 -3
        /* We might have already computed the hash for ICMPv6 errors. In such
         * case it will always be non-zero. Otherwise now is the time to do it.
         */
-       if (!fl6->mp_hash)
+       if (!fl6->mp_hash &&
+           (!match->nh || nexthop_is_multipath(match->nh)))
                fl6->mp_hash = rt6_multipath_hash(net, fl6, skb, NULL);
 
+       if (unlikely(match->nh)) {
+               nexthop_path_fib6_result(res, fl6->mp_hash);
+               return;
+       }
+
        if (fl6->mp_hash <= atomic_read(&match->fib6_nh->fib_nh_upper_bound))
                goto out;
 
@@ -496,7 +502,13 @@ static void rt6_device_match(struct net *net, struct fib6_result *res,
        struct fib6_nh *nh;
 
        if (!oif && ipv6_addr_any(saddr)) {
-               nh = f6i->fib6_nh;
+               if (unlikely(f6i->nh)) {
+                       nh = nexthop_fib6_nh(f6i->nh);
+                       if (nexthop_is_blackhole(f6i->nh))
+                               goto out_blackhole;
+               } else {
+                       nh = f6i->fib6_nh;
+               }
                if (!(nh->fib_nh_flags & RTNH_F_DEAD))
                        goto out;
        }
@@ -515,7 +527,14 @@ static void rt6_device_match(struct net *net, struct fib6_result *res,
                goto out;
        }
 
-       nh = f6i->fib6_nh;
+       if (unlikely(f6i->nh)) {
+               nh = nexthop_fib6_nh(f6i->nh);
+               if (nexthop_is_blackhole(f6i->nh))
+                       goto out_blackhole;
+       } else {
+               nh = f6i->fib6_nh;
+       }
+
        if (nh->fib_nh_flags & RTNH_F_DEAD) {
                res->f6i = net->ipv6.fib6_null_entry;
                nh = res->f6i->fib6_nh;
@@ -524,6 +543,12 @@ static void rt6_device_match(struct net *net, struct fib6_result *res,
        res->nh = nh;
        res->fib6_type = res->f6i->fib6_type;
        res->fib6_flags = res->f6i->fib6_flags;
+       return;
+
+out_blackhole:
+       res->fib6_flags |= RTF_REJECT;
+       res->fib6_type = RTN_BLACKHOLE;
+       res->nh = nh;
 }
 
 #ifdef CONFIG_IPV6_ROUTER_PREF
@@ -1117,6 +1142,8 @@ static struct rt6_info *ip6_pol_route_lookup(struct net *net,
                rt = net->ipv6.ip6_null_entry;
                dst_hold(&rt->dst);
                goto out;
+       } else if (res.fib6_flags & RTF_REJECT) {
+               goto do_create;
 
        }
 
        fib6_select_path(net, &res, fl6, fl6->flowi6_oif,
net/ipv6/route.c +1 -0
@@ -1128,6 +1155,7 @@ static struct rt6_info *ip6_pol_route_lookup(struct net *net,
                if (ip6_hold_safe(net, &rt))
                        dst_use_noref(&rt->dst, jiffies);
        } else {
+do_create:
                rt = ip6_create_rt_rcu(&res);
        }
 
@@ -1982,6 +2010,14 @@ struct rt6_info *ip6_pol_route(struct net *net, struct fib6_table *table,
                rcu_read_unlock();
                dst_hold(&rt->dst);
                return rt;

net/ipv6/route.c struct rt6_info *ip6_pol_route(struct net *net, struct fib6_table *table, · line 2022

Quoted 10 lines
net/ipv6/route.c +8 -0
+       } else if (res.fib6_flags & RTF_REJECT) {
+               rt = ip6_create_rt_rcu(&res);
+               rcu_read_unlock();
+               if (!rt) {
+                       rt = net->ipv6.ip6_null_entry;
+                       dst_hold(&rt->dst);
+               }
+               return rt;
        }
 

Why do we need to call ip6_create_rt_rcu() to create a dst cache? Can we directly return ip6_null_entry here? This route is anyway meant to drop the packet. Same goes for the change in ip6_pol_route_lookup().

And for my education, how does this new nexthop logic interact with the pcpu_rt cache and the exception table? Those 2 are currently stored in struct fib6_nh. They are shared with fib6_siblings under the same fib6_info. Are they also shared with nexthop for the same fib6_info?
I don't see much changes around that area. So I assume they work as is?

Quoted 229 lines
net/ipv6/route.c +94 -19
        fib6_select_path(net, &res, fl6, oif, false, skb, strict);
@@ -3217,7 +3253,9 @@ static struct fib6_info *ip6_route_info_create(struct fib6_config *cfg,
 {
        struct net *net = cfg->fc_nlinfo.nl_net;
        struct fib6_info *rt = NULL;
+       struct nexthop *nh = NULL;
        struct fib6_table *table;
+       struct fib6_nh *fib6_nh;
        int err = -EINVAL;
        int addr_type;
 
@@ -3270,7 +3308,7 @@ static struct fib6_info *ip6_route_info_create(struct fib6_config *cfg,
                goto out;
 
        err = -ENOMEM;
-       rt = fib6_info_alloc(gfp_flags, true);
+       rt = fib6_info_alloc(gfp_flags, !nh);
        if (!rt)
                goto out;
 
@@ -3310,19 +3348,35 @@ static struct fib6_info *ip6_route_info_create(struct fib6_config *cfg,
        ipv6_addr_prefix(&rt->fib6_src.addr, &cfg->fc_src, cfg->fc_src_len);
        rt->fib6_src.plen = cfg->fc_src_len;
 #endif
-       err = fib6_nh_init(net, rt->fib6_nh, cfg, gfp_flags, extack);
-       if (err)
-               goto out;
+       if (nh) {
+               if (!nexthop_get(nh)) {
+                       NL_SET_ERR_MSG(extack, "Nexthop has been deleted");
+                       goto out;
+               }
+               if (rt->fib6_src.plen) {
+                       NL_SET_ERR_MSG(extack, "Nexthops can not be used wtih source routing");
+                       goto out;
+               }
+               rt->nh = nh;
+               fib6_nh = nexthop_fib6_nh(rt->nh);
+       } else {
+               err = fib6_nh_init(net, rt->fib6_nh, cfg, gfp_flags, extack);
+               if (err)
+                       goto out;
 
-       /* We cannot add true routes via loopback here,
-        * they would result in kernel looping; promote them to reject routes
-        */
-       addr_type = ipv6_addr_type(&cfg->fc_dst);
-       if (fib6_is_reject(cfg->fc_flags, rt->fib6_nh->fib_nh_dev, addr_type))
-               rt->fib6_flags = RTF_REJECT | RTF_NONEXTHOP;
+               fib6_nh = rt->fib6_nh;
+
+               /* We cannot add true routes via loopback here, they would
+                * result in kernel looping; promote them to reject routes
+                */
+               addr_type = ipv6_addr_type(&cfg->fc_dst);
+               if (fib6_is_reject(cfg->fc_flags, rt->fib6_nh->fib_nh_dev,
+                                  addr_type))
+                       rt->fib6_flags = RTF_REJECT | RTF_NONEXTHOP;
+       }
 
        if (!ipv6_addr_any(&cfg->fc_prefsrc)) {
-               struct net_device *dev = fib6_info_nh_dev(rt);
+               struct net_device *dev = fib6_nh->fib_nh_dev;
 
                if (!ipv6_chk_addr(net, &cfg->fc_prefsrc, dev, 0)) {
                        NL_SET_ERR_MSG(extack, "Invalid source address");
@@ -3678,6 +3732,9 @@ static struct fib6_info *rt6_get_route_info(struct net *net,
                goto out;
 
        for_each_fib6_node_rt_rcu(fn) {
+               /* these routes do not use nexthops */
+               if (rt->nh)
+                       continue;
                if (rt->fib6_nh->fib_nh_dev->ifindex != ifindex)
                        continue;
                if (!(rt->fib6_flags & RTF_ROUTEINFO) ||
@@ -3741,8 +3798,13 @@ struct fib6_info *rt6_get_dflt_router(struct net *net,
 
        rcu_read_lock();
        for_each_fib6_node_rt_rcu(&table->tb6_root) {
-               struct fib6_nh *nh = rt->fib6_nh;
+               struct fib6_nh *nh;
+
+               /* RA routes do not use nexthops */
+               if (rt->nh)
+                       continue;
 
+               nh = rt->fib6_nh;
                if (dev == nh->fib_nh_dev &&
                    ((rt->fib6_flags & (RTF_ADDRCONF | RTF_DEFAULT)) == (RTF_ADDRCONF | RTF_DEFAULT)) &&
                    ipv6_addr_equal(&nh->fib_nh_gw6, addr))
@@ -3993,7 +4055,8 @@ static int fib6_remove_prefsrc(struct fib6_info *rt, void *arg)
        struct net *net = ((struct arg_dev_net_ip *)arg)->net;
        struct in6_addr *addr = ((struct arg_dev_net_ip *)arg)->addr;
 
-       if (((void *)rt->fib6_nh->fib_nh_dev == dev || !dev) &&
+       if (!rt->nh &&
+           ((void *)rt->fib6_nh->fib_nh_dev == dev || !dev) &&
            rt != net->ipv6.fib6_null_entry &&
            ipv6_addr_equal(addr, &rt->fib6_prefsrc.addr)) {
                spin_lock_bh(&rt6_exception_lock);
@@ -4021,8 +4084,13 @@ void rt6_remove_prefsrc(struct inet6_ifaddr *ifp)
 static int fib6_clean_tohost(struct fib6_info *rt, void *arg)
 {
        struct in6_addr *gateway = (struct in6_addr *)arg;
-       struct fib6_nh *nh = rt->fib6_nh;
+       struct fib6_nh *nh;
 
+       /* RA routes do not use nexthops */
+       if (rt->nh)
+               return 0;
+
+       nh = rt->fib6_nh;
        if (((rt->fib6_flags & RTF_RA_ROUTER) == RTF_RA_ROUTER) &&
            nh->fib_nh_gw_family && ipv6_addr_equal(gateway, &nh->fib_nh_gw6))
                return -1;
@@ -4069,6 +4137,7 @@ static struct fib6_info *rt6_multipath_first_sibling(const struct fib6_info *rt)
        return NULL;
 }
 
+/* only called for fib entries with builtin fib6_nh */
 static bool rt6_is_dead(const struct fib6_info *rt)
 {
        if (rt->fib6_nh->fib_nh_flags & RTNH_F_DEAD ||
@@ -4147,7 +4216,7 @@ static int fib6_ifup(struct fib6_info *rt, void *p_arg)
        const struct arg_netdev_event *arg = p_arg;
        struct net *net = dev_net(arg->dev);
 
-       if (rt != net->ipv6.fib6_null_entry &&
+       if (rt != net->ipv6.fib6_null_entry && !rt->nh &&
            rt->fib6_nh->fib_nh_dev == arg->dev) {
                rt->fib6_nh->fib_nh_flags &= ~arg->nh_flags;
                fib6_update_sernum_upto_root(net, rt);
@@ -4172,6 +4241,7 @@ void rt6_sync_up(struct net_device *dev, unsigned char nh_flags)
        fib6_clean_all(dev_net(dev), fib6_ifup, &arg);
 }
 
+/* only called for fib entries with inline fib6_nh */
 static bool rt6_multipath_uses_dev(const struct fib6_info *rt,
                                   const struct net_device *dev)
 {
@@ -4232,7 +4302,7 @@ static int fib6_ifdown(struct fib6_info *rt, void *p_arg)
        const struct net_device *dev = arg->dev;
        struct net *net = dev_net(dev);
 
-       if (rt == net->ipv6.fib6_null_entry)
+       if (rt == net->ipv6.fib6_null_entry || rt->nh)
                return 0;
 
        switch (arg->event) {
@@ -4786,6 +4856,9 @@ static size_t rt6_nlmsg_size(struct fib6_info *rt)
 {
        int nexthop_len = 0;
 
+       if (rt->nh)
+               nexthop_len += nla_total_size(4); /* RTA_NH_ID */
+
        if (rt->fib6_nsiblings) {
                nexthop_len = nla_total_size(0)  /* RTA_MULTIPATH */
                            + NLA_ALIGN(sizeof(struct rtnexthop))
@@ -4812,6 +4885,35 @@ static size_t rt6_nlmsg_size(struct fib6_info *rt)
               + nexthop_len;
 }
 
+static int rt6_fill_node_nexthop(struct sk_buff *skb, struct nexthop *nh,
+                                unsigned char *flags)
+{
+       if (nexthop_is_multipath(nh)) {
+               struct nlattr *mp;
+
+               mp = nla_nest_start(skb, RTA_MULTIPATH);
+               if (!mp)
+                       goto nla_put_failure;
+
+               if (nexthop_mpath_fill_node(skb, nh))
+                       goto nla_put_failure;
+
+               nla_nest_end(skb, mp);
+       } else {
+               struct fib6_nh *fib6_nh;
+
+               fib6_nh = nexthop_fib6_nh(nh);
+               if (fib_nexthop_info(skb, &fib6_nh->nh_common,
+                                    flags, false) < 0)
+                       goto nla_put_failure;
+       }
+
+       return 0;
+
+nla_put_failure:
+       return -EMSGSIZE;
+}
+
 static int rt6_fill_node(struct net *net, struct sk_buff *skb,
                         struct fib6_info *rt, struct dst_entry *dst,
                         struct in6_addr *dest, struct in6_addr *src,
@@ -4821,6 +4923,7 @@ static int rt6_fill_node(struct net *net, struct sk_buff *skb,
        struct rt6_info *rt6 = (struct rt6_info *)dst;
        struct rt6key *rt6_dst, *rt6_src;
        u32 *pmetrics, table, rt6_flags;
+       unsigned char nh_flags = 0;
        struct nlmsghdr *nlh;
        struct rtmsg *rtm;
        long expires = 0;
@@ -4940,9 +5043,18 @@ static int rt6_fill_node(struct net *net, struct sk_buff *skb,
                }
 
                nla_nest_end(skb, mp);
-       } else {
-               unsigned char nh_flags = 0;
+       } else if (rt->nh) {
+               if (nla_put_u32(skb, RTA_NH_ID, rt->nh->id))
+                       goto nla_put_failure;
+
+               if (nexthop_is_blackhole(rt->nh))
+                       rtm->rtm_type = RTN_BLACKHOLE;
 
+               if (rt6_fill_node_nexthop(skb, rt->nh, &nh_flags) < 0)
+                       goto nla_put_failure;
+
+               rtm->rtm_flags |= nh_flags;
+       } else {
                if (fib_nexthop_info(skb, &rt->fib6_nh->nh_common,
                                     &nh_flags, false) < 0)
                        goto nla_put_failure;
--

2.11.0

#6 lore raw

Re: [PATCH v2 net-next 4/7] ipv6: Plumb support for nexthop object in a fib6_info

Quoted 11 lines · Wei Wang

net/ipv4/nexthop.c static void __remove_nexthop_fib(struct net *net, struct nexthop *nh) · line 711

Quoted 9 lines
net/ipv4/nexthop.c +5 -0
@@ -667,6 +704,13 @@ static void __remove_nexthop_fib(struct net *net, struct nexthop *nh)
        }
        if (do_flush)
                fib_flush(net);
+
+       /* ip6_del_rt removes the entry from this list hence the _safe */
+       list_for_each_entry_safe(f6i, tmp, &nh->f6i_list, nh_list) {
+               /* __ip6_del_rt does a release, so do a hold here */
+               fib6_info_hold(f6i);

Do we need fib6_info_hold_safe() here?

I do not think so.

If it is on the f6i_list, then fib6_purge_rt has not been called. fib6_purge_rt and this function are both called with rtnl held, so there is no race with the removal from the list.

#8 lore raw

Re: [PATCH v2 net-next 4/7] ipv6: Plumb support for nexthop object in a fib6_info

In reply to David Ahern
Quoted 37 lines · David Ahern
Quoted 8 lines · Wei Wang
Quoted 8 lines
net/ipv6/route.c +0 -0
index fada5a13bcb2..51cb5cb027ae 100644
@@ -432,15 +432,21 @@ void fib6_select_path(const struct net *net, struct fib6_result *res,
        struct fib6_info *sibling, *next_sibling;
        struct fib6_info *match = res->f6i;
 
Quoted 6 lines

net/ipv6/route.c void fib6_select_path(const struct net *net, struct fib6_result *res, · line 436

Quoted 3 lines
net/ipv6/route.c +1 -1
-       if (!match->fib6_nsiblings || have_oif_match)
+       if ((!match->fib6_nsiblings && !match->nh) || have_oif_match)
                goto out;

So you mentioned fib6_nsiblings and nexthop is mutually exclusive. Is it enforced from the configuration?

It is enforced by the patch that wires up RTA_NH_ID for IPv6.

Quoted 9 lines
Quoted 9 lines
net/ipv6/route.c +5 -0
@@ -1982,6 +2010,14 @@ struct rt6_info *ip6_pol_route(struct net *net, struct fib6_table *table,
                rcu_read_unlock();
                dst_hold(&rt->dst);
                return rt;
+       } else if (res.fib6_flags & RTF_REJECT) {
+               rt = ip6_create_rt_rcu(&res);
+               rcu_read_unlock();
+               if (!rt) {
+                       rt = net->ipv6.ip6_null_entry;
Quoted 8 lines

net/ipv6/route.c struct rt6_info *ip6_pol_route(struct net *net, struct fib6_table *table, · line 2022

Quoted 5 lines
net/ipv6/route.c +3 -0
+                       dst_hold(&rt->dst);
+               }
+               return rt;
        }
 

Why do we need to call ip6_create_rt_rcu() to create a dst cache? Can we directly return ip6_null_entry here? This route is anyway meant to drop the packet. Same goes for the change in ip6_pol_route_lookup().

Quoted 6 lines

This is to mimic what happens if you added a route like this:

   ip -6 ro add blackhole 2001:db8:99::/64

except now the blackhole target is contained in the nexthop spec.

Hmm... I am still a bit concerned with the ip6_create_rt_rcu() call. If we have a blackholed nexthop, the lookup code here always tries to create an rt cache entry for every lookup.
Maybe we could reuse the pcpu cache logic for this? So we only create new dst cache on the CPU if there is no cache created before.

Quoted 17 lines
Quoted 6 lines

And for my education, how does this new nexthop logic interact with the pcpu_rt cache and the exception table? Those 2 are currently stored in struct fib6_nh. They are shared with fib6_siblings under the same fib6_info. Are they also shared with nexthop for the same fib6_info?

With nexthop objects IPv6 can work very similar to IPv4. Multiple IPv4 fib entries (fib_alias) can reference the same fib_info where the fib_info contains an array of fib_nh and the cached routes and exceptions are stored in the fib_nh.

The one IPv6 attribute that breaks the model is source routing which is a function of the prefix. For that reason you can not use nexthop objects with fib entries using source routing. See the note in this patch in fib6_check_nexthop

Quoted 4 lines
Quoted 1 line

I don't see much changes around that area. So I assume they work as is?

Prior patch sets moved the pcpu and exception caches from fib6_info to fib6_nh.

Understood. Basically, for every nexthop object, it will have its own fib6_nh which contains pcpu_rt and exception table.
And we only use the built-in fib6_nh in struct fib6_info when nexthop is not used.
And if src addr routing is used, then nexthop object will not be used.

#7 lore raw

Re: [PATCH v2 net-next 4/7] ipv6: Plumb support for nexthop object in a fib6_info

In reply to Wei Wang
Quoted 8 lines · Wei Wang
Quoted 8 lines
net/ipv6/route.c +0 -0
index fada5a13bcb2..51cb5cb027ae 100644
@@ -432,15 +432,21 @@ void fib6_select_path(const struct net *net, struct fib6_result *res,
        struct fib6_info *sibling, *next_sibling;
        struct fib6_info *match = res->f6i;
 
Quoted 6 lines

net/ipv6/route.c void fib6_select_path(const struct net *net, struct fib6_result *res, · line 436

Quoted 3 lines
net/ipv6/route.c +1 -1
-       if (!match->fib6_nsiblings || have_oif_match)
+       if ((!match->fib6_nsiblings && !match->nh) || have_oif_match)
                goto out;

So you mentioned fib6_nsiblings and nexthop is mutually exclusive. Is it enforced from the configuration?

It is enforced by the patch that wires up RTA_NH_ID for IPv6.

Quoted 9 lines
Quoted 9 lines
net/ipv6/route.c +5 -0
@@ -1982,6 +2010,14 @@ struct rt6_info *ip6_pol_route(struct net *net, struct fib6_table *table,
                rcu_read_unlock();
                dst_hold(&rt->dst);
                return rt;
+       } else if (res.fib6_flags & RTF_REJECT) {
+               rt = ip6_create_rt_rcu(&res);
+               rcu_read_unlock();
+               if (!rt) {
+                       rt = net->ipv6.ip6_null_entry;
Quoted 8 lines

net/ipv6/route.c struct rt6_info *ip6_pol_route(struct net *net, struct fib6_table *table, · line 2022

Quoted 5 lines
net/ipv6/route.c +3 -0
+                       dst_hold(&rt->dst);
+               }
+               return rt;
        }
 

Why do we need to call ip6_create_rt_rcu() to create a dst cache? Can we directly return ip6_null_entry here? This route is anyway meant to drop the packet. Same goes for the change in ip6_pol_route_lookup().

This is to mimic what happens if you added a route like this:
ip -6 ro add blackhole 2001:db8:99::/64

except now the blackhole target is contained in the nexthop spec.

Quoted 6 lines

And for my education, how does this new nexthop logic interact with the pcpu_rt cache and the exception table? Those 2 are currently stored in struct fib6_nh. They are shared with fib6_siblings under the same fib6_info. Are they also shared with nexthop for the same fib6_info?

With nexthop objects IPv6 can work very similar to IPv4. Multiple IPv4 fib entries (fib_alias) can reference the same fib_info where the fib_info contains an array of fib_nh and the cached routes and exceptions are stored in the fib_nh.

The one IPv6 attribute that breaks the model is source routing which is a function of the prefix. For that reason you can not use nexthop objects with fib entries using source routing. See the note in this patch in fib6_check_nexthop

Quoted 1 line

I don't see much changes around that area. So I assume they work as is?

Prior patch sets moved the pcpu and exception caches from fib6_info to fib6_nh.

#9 lore raw

Re: [PATCH v2 net-next 4/7] ipv6: Plumb support for nexthop object in a fib6_info

In reply to Wei Wang
Quoted 5 lines · Wei Wang

Hmm... I am still a bit concerned with the ip6_create_rt_rcu() call. If we have a blackholed nexthop, the lookup code here always tries to create an rt cache entry for every lookup.
Maybe we could reuse the pcpu cache logic for this? So we only create new dst cache on the CPU if there is no cache created before.

I'll take a look.

Long term, I would like to see IPv6 separate FIB lookups from dst's - like IPv4 does. In that case reject routes would not use a dst_entry; rather the fib lookups return an error code.

#10 lore raw

Re: [PATCH v2 net-next 4/7] ipv6: Plumb support for nexthop object in a fib6_info

Quoted 8 lines · David Ahern
Quoted 5 lines · Wei Wang

Hmm... I am still a bit concerned with the ip6_create_rt_rcu() call. If we have a blackholed nexthop, the lookup code here always tries to create an rt cache entry for every lookup.
Maybe we could reuse the pcpu cache logic for this? So we only create new dst cache on the CPU if there is no cache created before.

Quoted 5 lines

I'll take a look.

Long term, I would like to see IPv6 separate FIB lookups from dst's - like IPv4 does. In that case reject routes would not use a dst_entry; rather the fib lookups return an error code.

Yes. Agree. That will be even better.

#11 lore raw

Re: [PATCH v2 net-next 4/7] ipv6: Plumb support for nexthop object in a fib6_info

Quoted 11 lines · Wei Wang
Quoted 10 lines · David Ahern
Quoted 5 lines · Wei Wang

Hmm... I am still a bit concerned with the ip6_create_rt_rcu() call. If we have a blackholed nexthop, the lookup code here always tries to create an rt cache entry for every lookup.
Maybe we could reuse the pcpu cache logic for this? So we only create new dst cache on the CPU if there is no cache created before.

I'll take a look.

BTW, I am only updating ip6_pol_route to use pcpu routes for blackhole nexthops.

ip6_pol_route_lookup will continue as is. That function does not use pcpu routes and will stay as is.

#12 lore raw

Re: [PATCH v2 net-next 4/7] ipv6: Plumb support for nexthop object in a fib6_info

Quoted 11 lines · David Ahern
Quoted 9 lines · Wei Wang
Quoted 8 lines · David Ahern
Quoted 5 lines · Wei Wang

Hmm... I am still a bit concerned with the ip6_create_rt_rcu() call. If we have a blackholed nexthop, the lookup code here always tries to create an rt cache entry for every lookup.
Maybe we could reuse the pcpu cache logic for this? So we only create new dst cache on the CPU if there is no cache created before.

Quoted 9 lines
Quoted 2 lines
Quoted 2 lines

I'll take a look.

BTW, I am only updating ip6_pol_route to use pcpu routes for blackhole nexthops.

ip6_pol_route_lookup will continue as is. That function does not use pcpu routes and will stay as is.

That sounds reasonable to me. ip6_pol_route() seems to be what we care about the most as all incoming/outgoing data path uses that. Thanks David.

#13 lore raw

Re: [PATCH v2 net-next 4/7] ipv6: Plumb support for nexthop object in a fib6_info

In reply to David Ahern
Quoted 10 lines · David Ahern
Quoted 9 lines · Wei Wang
Quoted 8 lines · David Ahern
Quoted 5 lines · Wei Wang

Hmm... I am still a bit concerned with the ip6_create_rt_rcu() call. If we have a blackholed nexthop, the lookup code here always tries to create an rt cache entry for every lookup.
Maybe we could reuse the pcpu cache logic for this? So we only create new dst cache on the CPU if there is no cache created before.

Quoted 9 lines
Quoted 2 lines
Quoted 2 lines

I'll take a look.

BTW, I am only updating ip6_pol_route to use pcpu routes for blackhole nexthops.

ip6_pol_route_lookup will continue as is. That function does not use pcpu routes and will stay as is.

I have concern on calling ip6_create_rt_rcu() in general which seems to trace back to this commit
dec9b0e295f6 ("net/ipv6: Add rt6_info create function for ip6_pol_route_lookup")

This rt is not tracked in pcpu_rt, rt6_uncached_list or exception bucket. In particular, how to react to NETDEV_UNREGISTER/DOWN like the rt6_uncached_list_flush_dev() does and calls dev_put()?

The existing callers seem to do dst_release() immediately without caching it, but still concerning.

#14 lore raw

Re: [PATCH v2 net-next 4/7] ipv6: Plumb support for nexthop object in a fib6_info

Quoted 10 lines · Martin Lau

I have concern on calling ip6_create_rt_rcu() in general which seems to trace back to this commit
dec9b0e295f6 ("net/ipv6: Add rt6_info create function for ip6_pol_route_lookup")

This rt is not tracked in pcpu_rt, rt6_uncached_list or exception bucket. In particular, how to react to NETDEV_UNREGISTER/DOWN like the rt6_uncached_list_flush_dev() does and calls dev_put()?

The existing callers seem to do dst_release() immediately without caching it, but still concerning.

those are the callers that don't care about the dst_entry, but are forced to deal with it. Removing the tie between fib lookups an dst_entry is again the right solution.

#15 lore raw

Re: [PATCH v2 net-next 4/7] ipv6: Plumb support for nexthop object in a fib6_info

Quoted 9 lines · David Ahern
Quoted 8 lines · Martin Lau

I have concern on calling ip6_create_rt_rcu() in general which seems to trace back to this commit
dec9b0e295f6 ("net/ipv6: Add rt6_info create function for ip6_pol_route_lookup")

This rt is not tracked in pcpu_rt, rt6_uncached_list or exception bucket. In particular, how to react to NETDEV_UNREGISTER/DOWN like the rt6_uncached_list_flush_dev() does and calls dev_put()?

Quoted 6 lines
Quoted 2 lines

The existing callers seem to do dst_release() immediately without caching it, but still concerning.

those are the callers that don't care about the dst_entry, but are forced to deal with it. Removing the tie between fib lookups an dst_entry is again the right solution.

Great to know that there will be a solution. It would be great if there is patch (or repo) to show how that may look like on those rt6_lookup() callers.

Before that,
although it seems fine now (__ip6_route_redirect() is
harder to confirm since rt is passed around but it
seems to be ok),
instead of risking for "unregister_netdevice: waiting for eth0 to become free" in case some future patch is caching this rt,
why pcpu_rt cannot be used in all occasions? and also
avoid re-creating the same rt.

#16 lore raw

Re: [PATCH v2 net-next 4/7] ipv6: Plumb support for nexthop object in a fib6_info

Quoted 13 lines · Martin Lau
Quoted 12 lines · David Ahern
Quoted 10 lines · Martin Lau

I have concern on calling ip6_create_rt_rcu() in general which seems to trace back to this commit
dec9b0e295f6 ("net/ipv6: Add rt6_info create function for ip6_pol_route_lookup")

This rt is not tracked in pcpu_rt, rt6_uncached_list or exception bucket. In particular, how to react to NETDEV_UNREGISTER/DOWN like the rt6_uncached_list_flush_dev() does and calls dev_put()?

The existing callers seem to do dst_release() immediately without caching it, but still concerning.

Quoted 6 lines
Quoted 3 lines

those are the callers that don't care about the dst_entry, but are forced to deal with it. Removing the tie between fib lookups an dst_entry is again the right solution.

Great to know that there will be a solution. It would be great if there is patch (or repo) to show how that may look like on those rt6_lookup() callers.

Not 'will be', 'there is' a solution now. Someone just needs to do the conversions and devise the tests for the impacted users.

#17 lore raw

Re: [PATCH v2 net-next 4/7] ipv6: Plumb support for nexthop object in a fib6_info

Quoted 17 lines · David Ahern
Quoted 16 lines · Martin Lau
Quoted 15 lines · David Ahern
Quoted 10 lines · Martin Lau

I have concern on calling ip6_create_rt_rcu() in general which seems to trace back to this commit
dec9b0e295f6 ("net/ipv6: Add rt6_info create function for ip6_pol_route_lookup")

This rt is not tracked in pcpu_rt, rt6_uncached_list or exception bucket. In particular, how to react to NETDEV_UNREGISTER/DOWN like the rt6_uncached_list_flush_dev() does and calls dev_put()?

The existing callers seem to do dst_release() immediately without caching it, but still concerning.

those are the callers that don't care about the dst_entry, but are forced to deal with it. Removing the tie between fib lookups an dst_entry is again the right solution.

Quoted 6 lines
Quoted 3 lines

Great to know that there will be a solution. It would be great if there is patch (or repo) to show how that may look like on those rt6_lookup() callers.

Not 'will be', 'there is' a solution now. Someone just needs to do the conversions and devise the tests for the impacted users.

I don't think everyone will convert to the new nexthop solution immediately.

How about ensuring the existing usage stays solid first?

Quoted 8 lines
Quoted 8 lines

Before that,
although it seems fine now (__ip6_route_redirect() is
harder to confirm since rt is passed around but it
seems to be ok),
instead of risking for "unregister_netdevice: waiting for eth0 to become free" in case some future patch is caching this rt,
why pcpu_rt cannot be used in all occasions? and also
avoid re-creating the same rt.

#18 lore raw

Re: [PATCH v2 net-next 4/7] ipv6: Plumb support for nexthop object in a fib6_info

Quoted 22 lines · Martin Lau
Quoted 21 lines · David Ahern
Quoted 19 lines · Martin Lau
Quoted 9 lines · David Ahern
Quoted 8 lines · Martin Lau

I have concern on calling ip6_create_rt_rcu() in general which seems to trace back to this commit
dec9b0e295f6 ("net/ipv6: Add rt6_info create function for ip6_pol_route_lookup")

This rt is not tracked in pcpu_rt, rt6_uncached_list or exception bucket. In particular, how to react to NETDEV_UNREGISTER/DOWN like the rt6_uncached_list_flush_dev() does and calls dev_put()?

Quoted 6 lines
Quoted 2 lines

The existing callers seem to do dst_release() immediately without caching it, but still concerning.

those are the callers that don't care about the dst_entry, but are forced to deal with it. Removing the tie between fib lookups an dst_entry is again the right solution.

Great to know that there will be a solution. It would be great if there is patch (or repo) to show how that may look like on those rt6_lookup() callers.

Quoted 6 lines
Quoted 2 lines

Not 'will be', 'there is' a solution now. Someone just needs to do the conversions and devise the tests for the impacted users.

I don't think everyone will convert to the new nexthop solution immediately.

How about ensuring the existing usage stays solid first?

Use of nexthop objects has nothing to do with separating fib lookups from dst_entries, but with the addition of fib6_result it Just Works.

Wei converted ipv6 to use exception caches instead of adding them to the FIB.

I converted ipv6 to use separate data structures for fib entries, added direct fib6 lookup functions and added fib6_result. See the net/core/filter.c.

The stage is set for converting users.

For example, ip6_nh_lookup_table does not care about the dst entry, only the fib entry. This converts it:

static int ip6_nh_lookup_table(struct net *net, struct fib6_config *cfg,
const struct in6_addr *gw_addr, u32 tbid, int flags, struct fib6_result *res)

{
        struct flowi6 fl6 = {
                .flowi6_oif = cfg->fc_ifindex,
                .daddr = *gw_addr,
                .saddr = cfg->fc_prefsrc,
        };
        struct fib6_table *table;
        struct rt6_info *rt;

        table = fib6_get_table(net, tbid);
        if (!table)
                return -EINVAL;

        if (!ipv6_addr_any(&cfg->fc_prefsrc))
                flags |= RT6_LOOKUP_F_HAS_SADDR;

        flags |= RT6_LOOKUP_F_IGNORE_LINKSTATE;

        fib6_table_lookup(net, table, cfg->fc_ifindex, fl6, res, flags);
        if (res.f6i == net->ipv6.fib6_null_entry)
                return -ENETUNREACH;

        fib6_select_path(net, &res, fl6, oif, false, NULL, flags);

        return 0;
}
#19 lore raw

Re: [PATCH v2 net-next 4/7] ipv6: Plumb support for nexthop object in a fib6_info

Quoted 67 lines · David Ahern
Quoted 22 lines · Martin Lau
Quoted 21 lines · David Ahern
Quoted 19 lines · Martin Lau
Quoted 9 lines · David Ahern
Quoted 8 lines · Martin Lau

I have concern on calling ip6_create_rt_rcu() in general which seems to trace back to this commit
dec9b0e295f6 ("net/ipv6: Add rt6_info create function for ip6_pol_route_lookup")

This rt is not tracked in pcpu_rt, rt6_uncached_list or exception bucket. In particular, how to react to NETDEV_UNREGISTER/DOWN like the rt6_uncached_list_flush_dev() does and calls dev_put()?

Quoted 6 lines
Quoted 2 lines

The existing callers seem to do dst_release() immediately without caching it, but still concerning.

those are the callers that don't care about the dst_entry, but are forced to deal with it. Removing the tie between fib lookups an dst_entry is again the right solution.

Great to know that there will be a solution. It would be great if there is patch (or repo) to show how that may look like on those rt6_lookup() callers.

Quoted 6 lines
Quoted 2 lines

Not 'will be', 'there is' a solution now. Someone just needs to do the conversions and devise the tests for the impacted users.

I don't think everyone will convert to the new nexthop solution immediately.

How about ensuring the existing usage stays solid first?

Use of nexthop objects has nothing to do with separating fib lookups from dst_entries, but with the addition of fib6_result it Just Works.

Wei converted ipv6 to use exception caches instead of adding them to the FIB.

I converted ipv6 to use separate data structures for fib entries, added direct fib6 lookup functions and added fib6_result. See the net/core/filter.c.

The stage is set for converting users.

For example, ip6_nh_lookup_table does not care about the dst entry, only the fib entry. This converts it:

static int ip6_nh_lookup_table(struct net *net, struct fib6_config *cfg,
const struct in6_addr *gw_addr, u32 tbid, int flags, struct fib6_result *res)

{
        struct flowi6 fl6 = {
                .flowi6_oif = cfg->fc_ifindex,
                .daddr = *gw_addr,
                .saddr = cfg->fc_prefsrc,
        };
        struct fib6_table *table;
        struct rt6_info *rt;

        table = fib6_get_table(net, tbid);
        if (!table)
                return -EINVAL;

        if (!ipv6_addr_any(&cfg->fc_prefsrc))
                flags |= RT6_LOOKUP_F_HAS_SADDR;

        flags |= RT6_LOOKUP_F_IGNORE_LINKSTATE;
Quoted 8 lines
        fib6_table_lookup(net, table, cfg->fc_ifindex, fl6, res, flags);
        if (res.f6i == net->ipv6.fib6_null_entry)
                return -ENETUNREACH;

        fib6_select_path(net, &res, fl6, oif, false, NULL, flags);

        return 0;
}

I do agree with Martin that ip6_create_rt_rcu() seems to be dangerous as the dst cache created by this func does not get tracked anywhere and it is up to the user to not cache it for too long.
But I think David, what you are suggesting is:
instead of trying to convert ip6_create_rt_rcu() to use the pcpu_dst logic, completely get rid of the calling to ip6_create_rt_rcu(), and directly return f6i in those cases to the caller. Is that correct?

#24 lore raw

Re: [PATCH v2 net-next 4/7] ipv6: Plumb support for nexthop object in a fib6_info

In reply to David Ahern
Quoted 66 lines · David Ahern
Quoted 22 lines · Martin Lau
Quoted 21 lines · David Ahern
Quoted 19 lines · Martin Lau
Quoted 9 lines · David Ahern
Quoted 8 lines · Martin Lau

I have concern on calling ip6_create_rt_rcu() in general which seems to trace back to this commit
dec9b0e295f6 ("net/ipv6: Add rt6_info create function for ip6_pol_route_lookup")

This rt is not tracked in pcpu_rt, rt6_uncached_list or exception bucket. In particular, how to react to NETDEV_UNREGISTER/DOWN like the rt6_uncached_list_flush_dev() does and calls dev_put()?

Quoted 6 lines
Quoted 2 lines

The existing callers seem to do dst_release() immediately without caching it, but still concerning.

those are the callers that don't care about the dst_entry, but are forced to deal with it. Removing the tie between fib lookups an dst_entry is again the right solution.

Great to know that there will be a solution. It would be great if there is patch (or repo) to show how that may look like on those rt6_lookup() callers.

Quoted 6 lines
Quoted 2 lines

Not 'will be', 'there is' a solution now. Someone just needs to do the conversions and devise the tests for the impacted users.

I don't think everyone will convert to the new nexthop solution immediately.

How about ensuring the existing usage stays solid first?

Use of nexthop objects has nothing to do with separating fib lookups from dst_entries, but with the addition of fib6_result it Just Works.

Wei converted ipv6 to use exception caches instead of adding them to the FIB.

I converted ipv6 to use separate data structures for fib entries, added direct fib6 lookup functions and added fib6_result. See the net/core/filter.c.

The stage is set for converting users.

For example, ip6_nh_lookup_table does not care about the dst entry, only the fib entry. This converts it:

static int ip6_nh_lookup_table(struct net *net, struct fib6_config *cfg,
const struct in6_addr *gw_addr, u32 tbid, int flags, struct fib6_result *res)

{
        struct flowi6 fl6 = {
                .flowi6_oif = cfg->fc_ifindex,
                .daddr = *gw_addr,
                .saddr = cfg->fc_prefsrc,
        };
        struct fib6_table *table;
        struct rt6_info *rt;

        table = fib6_get_table(net, tbid);
        if (!table)
                return -EINVAL;

        if (!ipv6_addr_any(&cfg->fc_prefsrc))
                flags |= RT6_LOOKUP_F_HAS_SADDR;

        flags |= RT6_LOOKUP_F_IGNORE_LINKSTATE;
Quoted 8 lines
        fib6_table_lookup(net, table, cfg->fc_ifindex, fl6, res, flags);
        if (res.f6i == net->ipv6.fib6_null_entry)
                return -ENETUNREACH;

        fib6_select_path(net, &res, fl6, oif, false, NULL, flags);

        return 0;
}

Thanks for the example. This patch/example is what I am looking for. These changes are still "will be" done.

AFAICT, there are more than 10 rt6_lookup() usages which may end up calling ip6_create_rt_rcu() and return an untracked rt.
It is very difficult to audit the future changes on them to ensure they will not cache them till the above suggested changes to be done or completely remove ip6_create_rt_rcu() for now.

#20 lore raw

Re: [PATCH v2 net-next 4/7] ipv6: Plumb support for nexthop object in a fib6_info

In reply to Wei Wang
Quoted 3 lines · Wei Wang

instead of trying to convert ip6_create_rt_rcu() to use the pcpu_dst logic, completely get rid of the calling to ip6_create_rt_rcu(), and directly return f6i in those cases to the caller. Is that correct?

yes

#21 lore raw

Re: [PATCH v2 net-next 4/7] ipv6: Plumb support for nexthop object in a fib6_info

In reply to Wei Wang
Quoted 72 lines · Wei Wang
Quoted 71 lines · David Ahern
Quoted 22 lines · Martin Lau
Quoted 21 lines · David Ahern
Quoted 19 lines · Martin Lau
Quoted 9 lines · David Ahern
Quoted 8 lines · Martin Lau

I have concern on calling ip6_create_rt_rcu() in general which seems to trace back to this commit
dec9b0e295f6 ("net/ipv6: Add rt6_info create function for ip6_pol_route_lookup")

This rt is not tracked in pcpu_rt, rt6_uncached_list or exception bucket. In particular, how to react to NETDEV_UNREGISTER/DOWN like the rt6_uncached_list_flush_dev() does and calls dev_put()?

Quoted 6 lines
Quoted 2 lines

The existing callers seem to do dst_release() immediately without caching it, but still concerning.

those are the callers that don't care about the dst_entry, but are forced to deal with it. Removing the tie between fib lookups an dst_entry is again the right solution.

Great to know that there will be a solution. It would be great if there is patch (or repo) to show how that may look like on those rt6_lookup() callers.

Quoted 6 lines
Quoted 2 lines

Not 'will be', 'there is' a solution now. Someone just needs to do the conversions and devise the tests for the impacted users.

I don't think everyone will convert to the new nexthop solution immediately.

How about ensuring the existing usage stays solid first?

Use of nexthop objects has nothing to do with separating fib lookups from dst_entries, but with the addition of fib6_result it Just Works.

Wei converted ipv6 to use exception caches instead of adding them to the FIB.

I converted ipv6 to use separate data structures for fib entries, added direct fib6 lookup functions and added fib6_result. See the net/core/filter.c.

The stage is set for converting users.

For example, ip6_nh_lookup_table does not care about the dst entry, only the fib entry. This converts it:

static int ip6_nh_lookup_table(struct net *net, struct fib6_config *cfg,
const struct in6_addr *gw_addr, u32 tbid, int flags, struct fib6_result *res)

{
        struct flowi6 fl6 = {
                .flowi6_oif = cfg->fc_ifindex,
                .daddr = *gw_addr,
                .saddr = cfg->fc_prefsrc,
        };
        struct fib6_table *table;
        struct rt6_info *rt;

        table = fib6_get_table(net, tbid);
        if (!table)
                return -EINVAL;

        if (!ipv6_addr_any(&cfg->fc_prefsrc))
                flags |= RT6_LOOKUP_F_HAS_SADDR;

        flags |= RT6_LOOKUP_F_IGNORE_LINKSTATE;

        fib6_table_lookup(net, table, cfg->fc_ifindex, fl6, res, flags);
        if (res.f6i == net->ipv6.fib6_null_entry)
                return -ENETUNREACH;
Quoted 8 lines
Quoted 4 lines
        fib6_select_path(net, &res, fl6, oif, false, NULL, flags);

        return 0;
}

I do agree with Martin that ip6_create_rt_rcu() seems to be dangerous as the dst cache created by this func does not get tracked anywhere and it is up to the user to not cache it for too long.

IMO, ip6_create_rt_rcu(), which returns untracked rt, was a mistake and removing it has been overdue. Tracking down the unregister dev bug is not easy.

Quoted 4 lines

But I think David, what you are suggesting is:
instead of trying to convert ip6_create_rt_rcu() to use the pcpu_dst logic, completely get rid of the calling to ip6_create_rt_rcu(), and directly return f6i in those cases to the caller. Is that correct?

I am fine with either of these two ways to remove ip6_create_rt_rcu(). Further depending on ip6_create_rt_rcu() in this patch even in ip6_pol_route_lookup() is arguably neither of these two ways...

#22 lore raw

Re: [PATCH v2 net-next 4/7] ipv6: Plumb support for nexthop object in a fib6_info

Quoted 3 lines · Martin Lau

IMO, ip6_create_rt_rcu(), which returns untracked rt, was a mistake and removing it has been overdue. Tracking down the unregister dev bug is not easy.

I must be missing something because I don't have the foggiest idea why you are barking up this tree.

If code calls a function that returns a dst_entry with a refcount taken, that code is responsible for releasing it. Using a pcpu cached dst versus a new one in no way tells you who took the dst and bumped the refcnt on the netdev. Either way the dst refcount is bumped. Tracking netdev refcnt is the only way to methodically figure it out.

What am I overlooking here?

#23 lore raw

Re: [PATCH v2 net-next 4/7] ipv6: Plumb support for nexthop object in a fib6_info

Quoted 10 lines · David Ahern
Quoted 3 lines · Martin Lau

IMO, ip6_create_rt_rcu(), which returns untracked rt, was a mistake and removing it has been overdue. Tracking down the unregister dev bug is not easy.

I must be missing something because I don't have the foggiest idea why you are barking up this tree.

If code calls a function that returns a dst_entry with a refcount taken, that code is responsible for releasing it.

The code is responsible but there is no control on when.
That code can cache it for a long time. May be re-look at the dev_put() in this recent bug fix to begin with?
f5b51fe804ec ("ipv6: route: purge exception on removal")

and also the current rt6_uncached_list + rt6_uncached_list_flush_dev()

Quoted 6 lines

Using a pcpu cached dst
versus a new one in no way tells you who took the dst and bumped the refcnt on the netdev. Either way the dst refcount is bumped. Tracking netdev refcnt is the only way to methodically figure it out.

What am I overlooking here?