From: David Ahern <dsah...@gmail.com>
Export fib_nexthop_info and fib_add_nexthop for use by IPv6 code.
Remove rt6_nexthop_info and rt6_add_nexthop in favor of the IPv4
versions. Update fib_nexthop_info for IPv6 linkdown check and
RTA_GATEWAY for AF_INET6.
Signed-off-by: David Ahern <dsah...@gmail.com>
---
include/net/ip_fib.h | 5 ++++
net/ipv4/fib_semantics.c | 30 ++++++++++++++-----
net/ipv6/route.c | 78 +++++-------------------------------------------
3 files changed, 34 insertions(+), 79 deletions(-)
diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
index 9849c8901033..5b6f533eac92 100644
--- a/include/net/ip_fib.h
+++ b/include/net/ip_fib.h
@@ -495,4 +495,9 @@ u32 ip_mtu_from_fib_result(struct fib_result *res, __be32
daddr);
int ip_valid_fib_dump_req(struct net *net, const struct nlmsghdr *nlh,
struct fib_dump_filter *filter,
struct netlink_callback *cb);
+
+int fib_nexthop_info(struct sk_buff *skb, const struct fib_nh_common *nh,
+ unsigned int *flags, bool skip_oif, bool for_ipv4);
+int fib_add_nexthop(struct sk_buff *skb, const struct fib_nh_common *nh,
+ int nh_weight, bool for_ipv4);
#endif /* _NET_FIB_H */
diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
index 1efd6a88ccb5..efc487727d06 100644
--- a/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c
@@ -45,6 +45,7 @@
#include <net/nexthop.h>
#include <net/lwtunnel.h>
#include <net/fib_notifier.h>
+#include <net/addrconf.h>
#include "fib_lookup.h"
@@ -1323,8 +1324,8 @@ struct fib_info *fib_create_info(struct fib_config *cfg,
return ERR_PTR(err);
}
-static int fib_nexthop_info(struct sk_buff *skb, const struct fib_nh_common
*nh,
- unsigned int *flags, bool skip_oif)
+int fib_nexthop_info(struct sk_buff *skb, const struct fib_nh_common *nh,
+ unsigned int *flags, bool skip_oif, bool for_ipv4)
{
if (nh->nhc_flags & RTNH_F_DEAD)
*flags |= RTNH_F_DEAD;
@@ -1338,6 +1339,10 @@ static int fib_nexthop_info(struct sk_buff *skb, const
struct fib_nh_common *nh,
if (ip_ignore_linkdown(nh->nhc_dev))
*flags |= RTNH_F_DEAD;
break;
+ case AF_INET6:
+ if (ip6_ignore_linkdown(nh->nhc_dev))
+ *flags |= RTNH_F_DEAD;
+ break;
}
rcu_read_unlock();
}
@@ -1348,6 +1353,11 @@ static int fib_nexthop_info(struct sk_buff *skb, const
struct fib_nh_common *nh,
if (nla_put_in_addr(skb, RTA_GATEWAY, nh->nhc_gw.ipv4))
goto nla_put_failure;
break;
+ case AF_INET6:
+ if (nla_put_in6_addr(skb, RTA_GATEWAY,
+ &nh->nhc_gw.ipv6) < 0)
+ goto nla_put_failure;
+ break;
}
}
@@ -1368,10 +1378,11 @@ static int fib_nexthop_info(struct sk_buff *skb, const
struct fib_nh_common *nh,
nla_put_failure:
return -EMSGSIZE;
}
+EXPORT_SYMBOL_GPL(fib_nexthop_info);
-#ifdef CONFIG_IP_ROUTE_MULTIPATH
-static int fib_add_nexthop(struct sk_buff *skb, const struct fib_nh_common *nh,
- int nh_weight)
+#if IS_ENABLED(CONFIG_IP_ROUTE_MULTIPATH) || IS_ENABLED(CONFIG_IPV6)
+int fib_add_nexthop(struct sk_buff *skb, const struct fib_nh_common *nh,
+ int nh_weight, bool for_ipv4)
{
const struct net_device *dev = nh->nhc_dev;
struct rtnexthop *rtnh;
@@ -1384,7 +1395,7 @@ static int fib_add_nexthop(struct sk_buff *skb, const
struct fib_nh_common *nh,
rtnh->rtnh_hops = nh_weight - 1;
rtnh->rtnh_ifindex = dev ? dev->ifindex : 0;
- if (fib_nexthop_info(skb, nh, &flags, true) < 0)
+ if (fib_nexthop_info(skb, nh, &flags, true, for_ipv4) < 0)
goto nla_put_failure;
rtnh->rtnh_flags = flags;
@@ -1397,6 +1408,7 @@ static int fib_add_nexthop(struct sk_buff *skb, const
struct fib_nh_common *nh,
nla_put_failure:
return -EMSGSIZE;
}
+EXPORT_SYMBOL_GPL(fib_add_nexthop);
#endif
#ifdef CONFIG_IP_ROUTE_MULTIPATH
@@ -1409,7 +1421,8 @@ static int fib_add_multipath(struct sk_buff *skb, struct
fib_info *fi)
goto nla_put_failure;
for_nexthops(fi) {
- if (fib_add_nexthop(skb, &nh->nh_common, nh->fib_nh_weight) < 0)
+ if (fib_add_nexthop(skb, &nh->nh_common,
+ nh->fib_nh_weight, true) < 0)
goto nla_put_failure;
#ifdef CONFIG_IP_ROUTE_CLASSID
if (nh->nh_tclassid &&
@@ -1475,7 +1488,8 @@ int fib_dump_info(struct sk_buff *skb, u32 portid, u32
seq, int event,
struct fib_nh *nh = &fi->fib_nh[0];
unsigned int flags = 0;
- if (fib_nexthop_info(skb, &nh->nh_common, &flags, false) < 0)
+ if (fib_nexthop_info(skb, &nh->nh_common, &flags,
+ false, true) < 0)
goto nla_put_failure;
rtm->rtm_flags = flags;
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index c66b9ac37036..26e058485fd2 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -4624,73 +4624,6 @@ static size_t rt6_nlmsg_size(struct fib6_info *rt)
+ nexthop_len;
}
-static int rt6_nexthop_info(struct sk_buff *skb, const struct fib6_nh *fib6_nh,
- unsigned int *flags, bool skip_oif)
-{
- if (fib6_nh->fib_nh_flags & RTNH_F_DEAD)
- *flags |= RTNH_F_DEAD;
-
- if (fib6_nh->fib_nh_flags & RTNH_F_LINKDOWN) {
- *flags |= RTNH_F_LINKDOWN;
-
- rcu_read_lock();
- if (ip6_ignore_linkdown(fib6_nh->fib_nh_dev))
- *flags |= RTNH_F_DEAD;
- rcu_read_unlock();
- }
-
- if (fib6_nh->fib_nh_has_gw) {
- if (nla_put_in6_addr(skb, RTA_GATEWAY, &fib6_nh->fib_nh_gw6) <
0)
- goto nla_put_failure;
- }
-
- *flags |= (fib6_nh->fib_nh_flags & RTNH_F_ONLINK);
- if (fib6_nh->fib_nh_flags & RTNH_F_OFFLOAD)
- *flags |= RTNH_F_OFFLOAD;
-
- /* not needed for multipath encoding b/c it has a rtnexthop struct */
- if (!skip_oif && fib6_nh->fib_nh_dev &&
- nla_put_u32(skb, RTA_OIF, fib6_nh->fib_nh_dev->ifindex))
- goto nla_put_failure;
-
- if (fib6_nh->fib_nh_lws &&
- lwtunnel_fill_encap(skb, fib6_nh->fib_nh_lws) < 0)
- goto nla_put_failure;
-
- return 0;
-
-nla_put_failure:
- return -EMSGSIZE;
-}
-
-/* add multipath next hop */
-static int rt6_add_nexthop(struct sk_buff *skb, const struct fib6_nh *fib6_nh)
-{
- const struct net_device *dev = fib6_nh->fib_nh_dev;
- struct rtnexthop *rtnh;
- unsigned int flags = 0;
-
- rtnh = nla_reserve_nohdr(skb, sizeof(*rtnh));
- if (!rtnh)
- goto nla_put_failure;
-
- rtnh->rtnh_hops = fib6_nh->fib_nh_weight - 1;
- rtnh->rtnh_ifindex = dev ? dev->ifindex : 0;
-
- if (rt6_nexthop_info(skb, fib6_nh, &flags, true) < 0)
- goto nla_put_failure;
-
- rtnh->rtnh_flags = flags;
-
- /* length of rtnetlink header + attributes */
- rtnh->rtnh_len = nlmsg_get_pos(skb) - (void *)rtnh;
-
- 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,
@@ -4807,19 +4740,22 @@ static int rt6_fill_node(struct net *net, struct
sk_buff *skb,
if (!mp)
goto nla_put_failure;
- if (rt6_add_nexthop(skb, &rt->fib6_nh) < 0)
+ if (fib_add_nexthop(skb, &rt->fib6_nh.nh_common,
+ rt->fib6_nh.fib_nh_weight, false) < 0)
goto nla_put_failure;
list_for_each_entry_safe(sibling, next_sibling,
&rt->fib6_siblings, fib6_siblings) {
- if (rt6_add_nexthop(skb, &sibling->fib6_nh) < 0)
+ if (fib_add_nexthop(skb, &sibling->fib6_nh.nh_common,
+ sibling->fib6_nh.fib_nh_weight,
+ false) < 0)
goto nla_put_failure;
}
nla_nest_end(skb, mp);
} else {
- if (rt6_nexthop_info(skb, &rt->fib6_nh, &rtm->rtm_flags,
- false) < 0)
+ if (fib_nexthop_info(skb, &rt->fib6_nh.nh_common,
+ &rtm->rtm_flags, false, false) < 0)
goto nla_put_failure;
}
--
2.11.0
