net: More movement to fib_nh_common
Subsystems (6)
David Ahern
maintainerv2 cover net: More movement to fib_nh_common
From: David Ahern <[email protected]>
Second set of three with the end goal of enabling IPv6 gateways with IPv4 routes.
This set moves:
- the ipv4 tracepoint to take a fib_nh_common and updates it to handle a v6 gateway.
- consolidates route notifications to use the same fill functions for both ipv4 and ipv6
v2
- dropped patches moving cached routes and exception buckets to fib_nh_common. The goal is allowing a fib6_nh to be used with an IPv4 route. The hold up is the need for separate exception buckets - one for v6 routes and one for v4 routes. When all of the nexthop patches are in, adding a secondi exception bucket pushes IPv6 fib6_info allocations over 256 which means fib6_info allocations roll up to 512. Hence, deferring the patches until some data mining can be done to keep the allocations at 256.
David Ahern (5):
ipv4: Update fib_table_lookup tracepoint to take common nexthop
ipv4: Add fib_nh_common to fib_result
ipv4: Refactor nexthop attributes in fib_dump_info
ipv4: Change fib_nexthop_info and fib_add_nexthop to take
fib_nh_common
ipv6: Flip to fib_nexthop_info
include/net/ip_fib.h | 52 +++++------ include/trace/events/fib.h | 45 ++++++---- net/core/filter.c | 12 +-- net/ipv4/fib_frontend.c | 6 +- net/ipv4/fib_lookup.h | 1 + net/ipv4/fib_semantics.c | 220 ++++++++++++++++++++++++++++++++------------- net/ipv4/fib_trie.c | 13 +-- net/ipv4/route.c | 60 ++++++++----- net/ipv6/route.c | 78 ++-------------- 9 files changed, 273 insertions(+), 214 deletions(-)
Signature · 1 line
2.11.0
David Ahern
maintainerPATCH v2 1/5 ipv4: Update fib_table_lookup tracepoint to take common nexthop
From: David Ahern <[email protected]>
Update fib_table_lookup tracepoint to take a fib_nh_common struct and dump the v6 gateway address if the nexthop uses it.
--- include/trace/events/fib.h | 45 ++++++++++++++++++++++++++------------------- net/ipv4/fib_trie.c | 2 +- 2 files changed, 27 insertions(+), 20 deletions(-)
include/trace/events/fib.h +26 -19
@@ -13,9 +13,9 @@ TRACE_EVENT(fib_table_lookup, TP_PROTO(u32 tb_id, const struct flowi4 *flp, - const struct fib_nh *nh, int err), + const struct fib_nh_common *nhc, int err), - TP_ARGS(tb_id, flp, nh, err), + TP_ARGS(tb_id, flp, nhc, err), TP_STRUCT__entry( __field( u32, tb_id )
@@ -28,14 +28,17 @@ TRACE_EVENT(fib_table_lookup, __field( __u8, flags ) __array( __u8, src, 4 ) __array( __u8, dst, 4 ) - __array( __u8, gw, 4 ) - __array( __u8, saddr, 4 ) + __array( __u8, gw4, 4 ) + __array( __u8, gw6, 16 ) __field( u16, sport ) __field( u16, dport )__dynamic_array (char, name,IFNAMSIZ ) ),TP_fast_assign ( + struct in6_addr in6_zero = {}; +struct net_device *dev; +struct in6_addr *in6;__be32 *p32; __entry->tb_id = tb_id;
@@ -62,33 +65,37 @@ TRACE_EVENT(fib_table_lookup, __entry->dport =0 ; } -if (nh) { -struct net_device *dev; + dev = nhc ? nhc->nhc_dev :NULL ; +__assign_str (name, dev ? dev->name :"-" ); - p32 = (__be32 *) __entry->saddr; - *p32 = nh->nh_saddr; +if (nhc) { +if (nhc->nhc_family ==AF_INET ) { + p32 = (__be32 *) __entry->gw4; + *p32 = nhc->nhc_gw.ipv4; - p32 = (__be32 *) __entry->gw; - *p32 = nh->fib_nh_gw4; + in6 = (struct in6_addr *)__entry->gw6; + *in6 = in6_zero; + }else if (nhc->nhc_family ==AF_INET6 ) { + p32 = (__be32 *) __entry->gw4; + *p32 =0 ; - dev = nh->fib_nh_dev; -__assign_str (name, dev ? dev->name :"-" ); + in6 = (struct in6_addr *)__entry->gw6; + *in6 = nhc->nhc_gw.ipv6; + } }else { - p32 = (__be32 *) __entry->saddr; + p32 = (__be32 *) __entry->gw4; *p32 =0 ; - p32 = (__be32 *) __entry->gw; - *p32 =0 ; - -__assign_str (name,"-" ); + in6 = (struct in6_addr *)__entry->gw6; + *in6 = in6_zero; } ), -TP_printk ("table %u oif %d iif %d proto %u %pI4/%u -> %pI4/%u tos %d scope %d flags %x ==> dev %s gw %pI4 src %pI4 err %d" , +TP_printk ("table %u oif %d iif %d proto %u %pI4/%u -> %pI4/%u tos %d scope %d flags %x ==> dev %s gw %pI4/%pI6c err %d" , __entry->tb_id, __entry->oif, __entry->iif, __entry->proto, __entry->src, __entry->sport, __entry->dst, __entry->dport, __entry->tos, __entry->scope, __entry->flags, -__get_str (name), __entry->gw, __entry->saddr, __entry->err) +__get_str (name), __entry->gw4, __entry->gw6, __entry->err) );#endif /* _TRACE_FIB_H */
net/ipv4/fib_trie.c +1 -1
@@ -1498,7 +1498,7 @@ int fib_table_lookup(struct fib_table *tb, const struct flowi4 *flp,#ifdef CONFIG_IP_FIB_TRIE_STATS this_cpu_inc (stats->semantic_match_passed);#endif -trace_fib_table_lookup (tb->tb_id, flp, nh, err); +trace_fib_table_lookup (tb->tb_id, flp, &nh->nh_common, err);return err; }
Signature · 1 line
2.11.0
David Ahern
maintainerPATCH v2 2/5 ipv4: Add fib_nh_common to fib_result
In reply to David AhernFrom: David Ahern <[email protected]>
Most of the ipv4 code only needs data from fib_nh_common. Add fib_nh_common selection to fib_result and update users to use it.
Right now, fib_nh_common in fib_result will point to a nexthop within a fib_info. Later, fib_nh can point to data with a nexthop struct.
--- include/net/ip_fib.h | 47 +++++++++++++++++-------------------- net/core/filter.c | 12 +++++----- net/ipv4/fib_frontend.c | 6 ++--- net/ipv4/fib_lookup.h | 1 + net/ipv4/fib_semantics.c | 28 ++++++++++++++++++---- net/ipv4/fib_trie.c | 13 ++++++----- net/ipv4/route.c | 60 ++++++++++++++++++++++++++++++++---------------- 7 files changed, 102 insertions(+), 65 deletions(-)
include/net/ip_fib.h +21 -26
@@ -156,15 +156,16 @@ struct fib_rule;struct fib_table ;struct fib_result { -__be32 prefix; -unsigned char prefixlen; -unsigned char nh_sel; -unsigned char type; -unsigned char scope; -u32 tclassid; -struct fib_info *fi; -struct fib_table *table; -struct hlist_head *fa_head; +__be32 prefix; +unsigned char prefixlen; +unsigned char nh_sel; +unsigned char type; +unsigned char scope; +u32 tclassid; +struct fib_nh_common *nhc; +struct fib_info *fi; +struct fib_table *table; +struct hlist_head *fa_head; };struct fib_result_nl {
@@ -182,11 +183,10 @@ struct fib_result_nl {int err; }; -#ifdef CONFIG_IP_ROUTE_MULTIPATH -#define FIB_RES_NH (res) ((res).fi->fib_nh[(res).nh_sel]) -#else /* CONFIG_IP_ROUTE_MULTIPATH */ -#define FIB_RES_NH (res) ((res).fi->fib_nh[0]) -#endif /* CONFIG_IP_ROUTE_MULTIPATH */ +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
@@ -195,18 +195,11 @@ struct fib_result_nl {#endif __be32 fib_info_update_nh_saddr (struct net *net,struct fib_nh *nh); +__be32 fib_result_prefsrc (struct net *net,struct fib_result *res); -#define FIB_RES_SADDR (net, res) \ - ((FIB_RES_NH(res).nh_saddr_genid == \ - atomic_read(&(net)->ipv4.dev_addr_genid)) ? \ - FIB_RES_NH(res).nh_saddr : \ - fib_info_update_nh_saddr((net), &FIB_RES_NH(res))) -#define FIB_RES_GW (res) (FIB_RES_NH(res).fib_nh_gw4) -#define FIB_RES_DEV (res) (FIB_RES_NH(res).fib_nh_dev) -#define FIB_RES_OIF (res) (FIB_RES_NH(res).fib_nh_oif) - -#define FIB_RES_PREFSRC (net, res) ((res).fi->fib_prefsrc ? : \ - FIB_RES_SADDR(net, res)) +#define FIB_RES_NH (res) ((res).nhc) +#define FIB_RES_DEV (res) (FIB_RES_NH(res)->nhc_dev) +#define FIB_RES_OIF (res) (FIB_RES_NH(res)->nhc_oif)struct fib_entry_notifier_info {struct fib_notifier_info info;/* must be first */
@@ -453,10 +446,12 @@ struct fib_table *fib_trie_table(u32 id, struct fib_table *alias);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 =FIB_RES_NH (*res).nh_tclassid<<16 ; + *itag = nh->nh_tclassid <<16 ;#ifdef CONFIG_IP_MULTIPLE_TABLES rtag = res->tclassid;if (*itag ==0 )
net/core/filter.c +6 -6
@@ -4555,11 +4555,11 @@ static int bpf_fib_set_fwd_params(struct bpf_fib_lookup *params,static int bpf_ipv4_fib_lookup (struct net *net,struct bpf_fib_lookup *params,u32 flags,bool check_mtu) { +struct fib_nh_common *nhc;struct in_device *in_dev;struct neighbour *neigh;struct net_device *dev;struct fib_result res; -struct fib_nh *nh;struct flowi4 fl4;int err;u32 mtu;
@@ -4632,15 +4632,15 @@ static int bpf_ipv4_fib_lookup(struct net *net, struct bpf_fib_lookup *params,return BPF_FIB_LKUP_RET_FRAG_NEEDED ; } - nh = &res.fi->fib_nh[res.nh_sel]; + nhc = res.nhc;/* do not handle lwt encaps right now */ -if (nh->fib_nh_lws) +if (nhc->nhc_lwtstate)return BPF_FIB_LKUP_RET_UNSUPP_LWT ; - dev = nh->fib_nh_dev; -if (nh->fib_nh_gw4) - params->ipv4_dst = nh->fib_nh_gw4; + dev = nhc->nhc_dev; +if (nhc->nhc_has_gw) + params->ipv4_dst = nhc->nhc_gw.ipv4; params->rt_metric = res.fi->fib_priority;
net/ipv4/fib_frontend.c +3 -3
@@ -307,7 +307,7 @@ __be32 fib_compute_spec_dst(struct sk_buff *skb) .flowi4_mark = vmark ? skb->mark : 0, };if (!fib_lookup (net, &fl4, &res,0 )) -return FIB_RES_PREFSRC (net, res); +return fib_result_prefsrc (net, &res); }else { scope =RT_SCOPE_LINK ; }
@@ -390,7 +390,7 @@ static int __fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst, dev_match =fib_info_nh_uses_dev (res.fi, dev);if (dev_match) { - ret =FIB_RES_NH (res).fib_nh_scope >=RT_SCOPE_HOST ; + ret =FIB_RES_NH (res)->nhc_scope >=RT_SCOPE_HOST ;return ret; }if (no_addr)
@@ -402,7 +402,7 @@ static int __fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst, ret =0 ;if (fib_lookup (net, &fl4, &res,FIB_LOOKUP_IGNORE_LINKSTATE ) ==0 ) {if (res.type ==RTN_UNICAST ) - ret =FIB_RES_NH (res).fib_nh_scope >=RT_SCOPE_HOST ; + ret =FIB_RES_NH (res)->nhc_scope >=RT_SCOPE_HOST ; }return ret;
net/ipv4/fib_lookup.h +1 -0
@@ -45,6 +45,7 @@ static inline void fib_result_assign(struct fib_result *res, {/* we used to play games with refcounts, but we now use RCU */ res->fi = fi; + res->nhc =fib_info_nhc (fi,0 ); }struct fib_prop {
net/ipv4/fib_semantics.c +24 -4
@@ -1075,6 +1075,24 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)return nh->nh_saddr; } +__be32 fib_result_prefsrc (struct net *net,struct fib_result *res) +{ +struct fib_nh_common *nhc = res->nhc; +struct fib_nh *nh; + +if (res->fi->fib_prefsrc) +return res->fi->fib_prefsrc; + +if (unlikely (nhc->nhc_family !=AF_INET )) +return inet_select_addr (nhc->nhc_dev,0 , res->fi->fib_scope); + + nh = container_of(nhc, struct fib_nh, nh_common); +if (nh->nh_saddr_genid ==atomic_read (&net->ipv4.dev_addr_genid)) +return nh->nh_saddr; + +return fib_info_update_nh_saddr (net, nh); +} +static bool fib_valid_prefsrc (struct fib_config *cfg,__be32 fib_prefsrc) { if (cfg->fc_type != RTN_LOCAL || !cfg->fc_dst ||
@@ -1762,20 +1780,22 @@ void fib_select_multipath(struct fib_result *res, int hash)struct net *net = fi->fib_net;bool first = false; -for_nexthops (fi) { +change_nexthops (fi) {if (net->ipv4.sysctl_fib_multipath_use_neigh) { -if (!fib_good_nh (nh)) +if (!fib_good_nh (nexthop_nh))continue ;if (!first) { res->nh_sel = nhsel; + res->nhc = &nexthop_nh->nh_common; first = true; } } -if (hash >atomic_read (&nh->fib_nh_upper_bound)) +if (hash >atomic_read (&nexthop_nh->fib_nh_upper_bound))continue ; res->nh_sel = nhsel; + res->nhc = &nexthop_nh->nh_common;return ; }endfor_nexthops (fi); }
@@ -1802,5 +1822,5 @@ void fib_select_path(struct net *net, struct fib_result *res, check_saddr:if (!fl4->saddr) - fl4->saddr =FIB_RES_PREFSRC (net, *res); + fl4->saddr =fib_result_prefsrc (net, res); }
net/ipv4/fib_trie.c +7 -6
@@ -1470,17 +1470,17 @@ 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++) { -const struct fib_nh *nh = &fi->fib_nh[nhsel]; +struct fib_nh_common *nhc =fib_info_nhc (fi, nhsel); -if (nh->fib_nh_flags &RTNH_F_DEAD ) +if (nhc->nhc_flags &RTNH_F_DEAD )continue ; -if (ip_ignore_linkdown (nh->fib_nh_dev) && - nh->fib_nh_flags &RTNH_F_LINKDOWN && +if (ip_ignore_linkdown (nhc->nhc_dev) && + nhc->nhc_flags &RTNH_F_LINKDOWN && !(fib_flags &FIB_LOOKUP_IGNORE_LINKSTATE ))continue ;if (!(flp->flowi4_flags &FLOWI_FLAG_SKIP_NH_OIF )) {if (flp->flowi4_oif && - flp->flowi4_oif != nh->fib_nh_oif) + flp->flowi4_oif != nhc->nhc_oif)continue ; }
@@ -1490,6 +1490,7 @@ int fib_table_lookup(struct fib_table *tb, const struct flowi4 *flp, res->prefix =htonl (n->key); res->prefixlen =KEYLENGTH - fa->fa_slen; res->nh_sel = nhsel; + res->nhc = nhc; res->type = fa->fa_type; res->scope = fi->fib_scope; res->fi = fi;
@@ -1498,7 +1499,7 @@ int fib_table_lookup(struct fib_table *tb, const struct flowi4 *flp,#ifdef CONFIG_IP_FIB_TRIE_STATS this_cpu_inc (stats->semantic_match_passed);#endif -trace_fib_table_lookup (tb->tb_id, flp, &nh->nh_common, err); +trace_fib_table_lookup (tb->tb_id, flp, nhc, err);return err; }
net/ipv4/route.c +40 -20
167 lines not on this page · raw message
Signature · 1 line
2.11.0
Re: [PATCH v2 net-next 2/5] ipv4: Add fib_nh_common to fib_result
Quoted 29 lines · David Ahern
From: David Ahern <[email protected]>
Most of the ipv4 code only needs data from
fib_nh_common. Addfib_nh_commonselection tofib_resultand update users to use it.Right now,
fib_nh_commoninfib_resultwill point to a nexthop within afib_info. Later,fib_nhcan point to data with a nexthop struct.Signed-off-by David Ahern <[email protected]>--- include/net/ip_fib.h | 47 +++++++++++++++++-------------------- net/core/filter.c | 12 +++++----- net/ipv4/fib_frontend.c | 6 ++--- net/ipv4/fib_lookup.h | 1 + net/ipv4/fib_semantics.c | 28 ++++++++++++++++++---- net/ipv4/fib_trie.c | 13 ++++++----- net/ipv4/route.c | 60 ++++++++++++++++++++++++++++++++---------------- 7 files changed, 102 insertions(+), 65 deletions(-)include/net/ip_fib.h +0
-2@@ -156,15 +156,16 @@ struct fib_rule;struct fib_table ;struct fib_result { -__be32 prefix; -unsigned char prefixlen;
include/net/ip_fib.h struct fib_rule; · line 161
Quoted 10 lines
include/net/ip_fib.h +3
-7-unsigned char nh_sel; -unsigned char type; -unsigned char scope; -u32 tclassid; -struct fib_info *fi; -struct fib_table *table; -struct hlist_head *fa_head; +__be32 prefix; +unsigned char prefixlen; +unsigned char nh_sel;
Is nh_sel still needed?
Quoted 34 lines
include/net/ip_fib.h +12
-7+unsigned char type; +unsigned char scope; +u32 tclassid; +struct fib_nh_common *nhc; +struct fib_info *fi; +struct fib_table *table; +struct hlist_head *fa_head; };struct fib_result_nl {@@ -182,11 +183,10 @@ struct fib_result_nl {int err; }; -#ifdef CONFIG_IP_ROUTE_MULTIPATH -#define FIB_RES_NH (res) ((res).fi->fib_nh[(res).nh_sel]) -#else /* CONFIG_IP_ROUTE_MULTIPATH */ -#define FIB_RES_NH (res) ((res).fi->fib_nh[0]) -#endif /* CONFIG_IP_ROUTE_MULTIPATH */ +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@@ -195,18 +195,11 @@ struct fib_result_nl {#endif __be32 fib_info_update_nh_saddr (struct net *net,struct fib_nh *nh); +__be32 fib_result_prefsrc (struct net *net,struct fib_result *res); -#define FIB_RES_SADDR (net, res) \ - ((FIB_RES_NH(res).nh_saddr_genid == \
include/net/ip_fib.h struct fib_result_nl { · line 200
Quoted 10 lines
include/net/ip_fib.h +1
-9- atomic_read(&(net)->ipv4.dev_addr_genid)) ? \ - FIB_RES_NH(res).nh_saddr : \ - fib_info_update_nh_saddr((net), &FIB_RES_NH(res))) -#define FIB_RES_GW (res) (FIB_RES_NH(res).fib_nh_gw4) -#define FIB_RES_DEV (res) (FIB_RES_NH(res).fib_nh_dev) -#define FIB_RES_OIF (res) (FIB_RES_NH(res).fib_nh_oif) - -#define FIB_RES_PREFSRC (net, res) ((res).fi->fib_prefsrc ? : \ - FIB_RES_SADDR(net, res)) +#define FIB_RES_NH (res) ((res).nhc)
s/FIB_RES_NH/FIB_RES_NHC/ ?
Quoted 107 lines
include/net/ip_fib.h +5
-1+#define FIB_RES_DEV (res) (FIB_RES_NH(res)->nhc_dev) +#define FIB_RES_OIF (res) (FIB_RES_NH(res)->nhc_oif)struct fib_entry_notifier_info {struct fib_notifier_info info;/* must be first */ @@ -453,10 +446,12 @@ struct fib_table *fib_trie_table(u32 id, struct fib_table *alias);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 =FIB_RES_NH (*res).nh_tclassid<<16 ; + *itag = nh->nh_tclassid <<16 ;#ifdef CONFIG_IP_MULTIPLE_TABLES rtag = res->tclassid;if (*itag ==0 )net/core/filter.c +6
-6@@ -4555,11 +4555,11 @@ static int bpf_fib_set_fwd_params(struct bpf_fib_lookup *params,static int bpf_ipv4_fib_lookup (struct net *net,struct bpf_fib_lookup *params,u32 flags,bool check_mtu) { +struct fib_nh_common *nhc;struct in_device *in_dev;struct neighbour *neigh;struct net_device *dev;struct fib_result res; -struct fib_nh *nh;struct flowi4 fl4;int err;u32 mtu;@@ -4632,15 +4632,15 @@ static int bpf_ipv4_fib_lookup(struct net *net, struct bpf_fib_lookup *params,return BPF_FIB_LKUP_RET_FRAG_NEEDED ; } - nh = &res.fi->fib_nh[res.nh_sel]; + nhc = res.nhc;/* do not handle lwt encaps right now */ -if (nh->fib_nh_lws) +if (nhc->nhc_lwtstate)return BPF_FIB_LKUP_RET_UNSUPP_LWT ; - dev = nh->fib_nh_dev; -if (nh->fib_nh_gw4) - params->ipv4_dst = nh->fib_nh_gw4; + dev = nhc->nhc_dev; +if (nhc->nhc_has_gw) + params->ipv4_dst = nhc->nhc_gw.ipv4; params->rt_metric = res.fi->fib_priority;net/ipv4/fib_frontend.c +3
-3@@ -307,7 +307,7 @@ __be32 fib_compute_spec_dst(struct sk_buff *skb) .flowi4_mark = vmark ? skb->mark : 0, };if (!fib_lookup (net, &fl4, &res,0 )) -return FIB_RES_PREFSRC (net, res); +return fib_result_prefsrc (net, &res); }else { scope =RT_SCOPE_LINK ; }@@ -390,7 +390,7 @@ static int __fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst, dev_match =fib_info_nh_uses_dev (res.fi, dev);if (dev_match) { - ret =FIB_RES_NH (res).fib_nh_scope >=RT_SCOPE_HOST ; + ret =FIB_RES_NH (res)->nhc_scope >=RT_SCOPE_HOST ;return ret; }if (no_addr)@@ -402,7 +402,7 @@ static int __fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst, ret =0 ;if (fib_lookup (net, &fl4, &res,FIB_LOOKUP_IGNORE_LINKSTATE ) ==0 ) {if (res.type ==RTN_UNICAST ) - ret =FIB_RES_NH (res).fib_nh_scope >=RT_SCOPE_HOST ; + ret =FIB_RES_NH (res)->nhc_scope >=RT_SCOPE_HOST ; }return ret;net/ipv4/fib_lookup.h +1
-0@@ -45,6 +45,7 @@ static inline void fib_result_assign(struct fib_result *res, {/* we used to play games with refcounts, but we now use RCU */ res->fi = fi; + res->nhc =fib_info_nhc (fi,0 ); }struct fib_prop {net/ipv4/fib_semantics.c +0
-0@@ -1075,6 +1075,24 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)return nh->nh_saddr; }
net/ipv4/fib_semantics.c __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh) · line 1086
Quoted 10 lines
net/ipv4/fib_semantics.c +9
-0+__be32 fib_result_prefsrc (struct net *net,struct fib_result *res) +{ +struct fib_nh_common *nhc = res->nhc; +struct fib_nh *nh; + +if (res->fi->fib_prefsrc) +return res->fi->fib_prefsrc; + +if (unlikely (nhc->nhc_family !=AF_INET ))
Comparing with FIB_RES_PREFSRC, it is not immediately obvious why this test is needed. May be a comment or a commit log message?
Quoted 13 lines
net/ipv4/fib_semantics.c +9
-0+return inet_select_addr (nhc->nhc_dev,0 , res->fi->fib_scope); + + nh = container_of(nhc, struct fib_nh, nh_common); +if (nh->nh_saddr_genid ==atomic_read (&net->ipv4.dev_addr_genid)) +return nh->nh_saddr; + +return fib_info_update_nh_saddr (net, nh); +} +static bool fib_valid_prefsrc (struct fib_config *cfg,__be32 fib_prefsrc) { if (cfg->fc_type != RTN_LOCAL || !cfg->fc_dst ||
net/ipv4/fib_semantics.c void fib_select_multipath(struct fib_result *res, int hash) · line 1783
Quoted 5 lines
net/ipv4/fib_semantics.c +1
-1@@ -1762,20 +1780,22 @@ void fib_select_multipath(struct fib_result *res, int hash)struct net *net = fi->fib_net;bool first = false; -for_nexthops (fi) { +change_nexthops (fi) {
Is it mainly because of the 'const'?
Quoted 27 lines
net/ipv4/fib_semantics.c +5
-3if (net->ipv4.sysctl_fib_multipath_use_neigh) { -if (!fib_good_nh (nh)) +if (!fib_good_nh (nexthop_nh))continue ;if (!first) { res->nh_sel = nhsel; + res->nhc = &nexthop_nh->nh_common; first = true; } } -if (hash >atomic_read (&nh->fib_nh_upper_bound)) +if (hash >atomic_read (&nexthop_nh->fib_nh_upper_bound))continue ; res->nh_sel = nhsel; + res->nhc = &nexthop_nh->nh_common;return ; }endfor_nexthops (fi); }@@ -1802,5 +1822,5 @@ void fib_select_path(struct net *net, struct fib_result *res, check_saddr:if (!fl4->saddr) - fl4->saddr =FIB_RES_PREFSRC (net, *res); + fl4->saddr =fib_result_prefsrc (net, res); }
Re: [PATCH v2 net-next 2/5] ipv4: Add fib_nh_common to fib_result
Quoted 6 lines · Martin Lau
Quoted 6 lines
include/net/ip_fib.h +0
-0@@ -156,15 +156,16 @@ struct fib_rule;
Quoted 15 lines
Quoted 4 lines
include/net/ip_fib.h +0
-2struct fib_table ;struct fib_result { -__be32 prefix; -unsigned char prefixlen;include/net/ip_fib.h struct fib_rule; · line 161
Quoted 10 lines
include/net/ip_fib.h +3
-7-unsigned char nh_sel; -unsigned char type; -unsigned char scope; -u32 tclassid; -struct fib_info *fi; -struct fib_table *table; -struct hlist_head *fa_head; +__be32 prefix; +unsigned char prefixlen; +unsigned char nh_sel;Is
nh_selstill needed?
yes, for fib_result_nl API and nl_fib_lookup.
Quoted 8 lines
Quoted 8 lines
net/ipv4/fib_semantics.c +0
-0@@ -1075,6 +1075,24 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)return nh->nh_saddr; }
Quoted 11 lines
net/ipv4/fib_semantics.c __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh) · line 1086
Quoted 9 lines
net/ipv4/fib_semantics.c +9
-0+__be32 fib_result_prefsrc (struct net *net,struct fib_result *res) +{ +struct fib_nh_common *nhc = res->nhc; +struct fib_nh *nh; + +if (res->fi->fib_prefsrc) +return res->fi->fib_prefsrc; + +if (unlikely (nhc->nhc_family !=AF_INET ))Comparing with
FIB_RES_PREFSRC, it is not immediately obvious why this test is needed. May be a comment or a commit log message?
This branch is for the case of v6 with v4. I can remove from this patch and add later. Right now, nhc will only be from a fib_nh.
Quoted 17 lines
Quoted 17 lines
net/ipv4/fib_semantics.c +9
-0+return inet_select_addr (nhc->nhc_dev,0 , res->fi->fib_scope); + + nh = container_of(nhc, struct fib_nh, nh_common); +if (nh->nh_saddr_genid ==atomic_read (&net->ipv4.dev_addr_genid)) +return nh->nh_saddr; + +return fib_info_update_nh_saddr (net, nh); +} +static bool fib_valid_prefsrc (struct fib_config *cfg,__be32 fib_prefsrc) { if (cfg->fc_type != RTN_LOCAL || !cfg->fc_dst ||@@ -1762,20 +1780,22 @@ void fib_select_multipath(struct fib_result *res, int hash)struct net *net = fi->fib_net;bool first = false;
Quoted 3 lines
net/ipv4/fib_semantics.c void fib_select_multipath(struct fib_result *res, int hash) · line 1783
Quoted 2 lines
net/ipv4/fib_semantics.c +1
-1-for_nexthops (fi) { +change_nexthops (fi) {Is it mainly because of the 'const'?
yes.
David Ahern
maintainerPATCH v2 3/5 ipv4: Refactor nexthop attributes in fib_dump_info
In reply to David AhernFrom: David Ahern <[email protected]>
Similar to ipv6, move addition of nexthop attributes to dump message into helpers that are called for both single path and multipath routes. Align the new helpers to the IPv6 variant which most notably means computing the flags argument based on settings in nh_flags.
The RTA_FLOW argument is unique to IPv4, so it is appended after the new fib_nexthop_info helper. The intent of a later patch is to make both fib_nexthop_info and fib_add_nexthop usable for both IPv4 and IPv6. This patch is stepping stone in that direction.
--- net/ipv4/fib_semantics.c | 166 ++++++++++++++++++++++++++++++----------------- 1 file changed, 107 insertions(+), 59 deletions(-)
net/ipv4/fib_semantics.c +107 -59
@@ -1320,6 +1320,103 @@ 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 *nh, +unsigned int *flags,bool skip_oif) +{ +if (nh->fib_nh_flags &RTNH_F_DEAD ) + *flags |=RTNH_F_DEAD ; + +if (nh->fib_nh_flags &RTNH_F_LINKDOWN ) { + *flags |=RTNH_F_LINKDOWN ; + +rcu_read_lock (); +if (ip_ignore_linkdown (nh->fib_nh_dev)) + *flags |=RTNH_F_DEAD ; +rcu_read_unlock (); + } + +if (nh->fib_nh_gw4 && +nla_put_in_addr (skb,RTA_GATEWAY , nh->fib_nh_gw4)) + goto nla_put_failure; + + *flags |= (nh->fib_nh_flags &RTNH_F_ONLINK ); +if (nh->fib_nh_flags &RTNH_F_OFFLOAD ) + *flags |=RTNH_F_OFFLOAD ; + +if (!skip_oif && nh->fib_nh_dev && +nla_put_u32 (skb,RTA_OIF , nh->fib_nh_dev->ifindex)) + goto nla_put_failure; + +if (nh->fib_nh_lws && +lwtunnel_fill_encap (skb, nh->fib_nh_lws) <0 ) + goto nla_put_failure; + +return 0 ; + +nla_put_failure: +return -EMSGSIZE ; +} + +#ifdef CONFIG_IP_ROUTE_MULTIPATH +static int fib_add_nexthop (struct sk_buff *skb,const struct fib_nh *nh) +{ +const struct net_device *dev = 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 = nh->fib_nh_weight -1 ; + rtnh->rtnh_ifindex = dev ? dev->ifindex :0 ; + +if (fib_nexthop_info (skb, 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 fib_add_multipath (struct sk_buff *skb,struct fib_info *fi) +{ +struct nlattr *mp; + + mp =nla_nest_start (skb,RTA_MULTIPATH ); +if (!mp) + goto nla_put_failure; + +for_nexthops (fi) { +if (fib_add_nexthop (skb, nh) <0 ) + goto nla_put_failure; +#ifdef CONFIG_IP_ROUTE_CLASSID +if (nh->nh_tclassid && +nla_put_u32 (skb,RTA_FLOW , nh->nh_tclassid)) + goto nla_put_failure; +#endif + }endfor_nexthops (fi); + +nla_nest_end (skb, mp); + +return 0 ; + +nla_put_failure: +return -EMSGSIZE ; +} +#else +static int fib_add_multipath (struct sk_buff *skb,struct fib_info *fi) +{ +return 0 ; +} +#endif +int fib_dump_info (struct sk_buff *skb,u32 portid,u32 seq,int event,u32 tb_id,u8 type,__be32 dst,int dst_len,u8 tos,struct fib_info *fi,unsigned int flags)
@@ -1360,72 +1457,23 @@ int fib_dump_info(struct sk_buff *skb, u32 portid, u32 seq, int event, nla_put_in_addr(skb, RTA_PREFSRC, fi->fib_prefsrc)) goto nla_put_failure;if (fi->fib_nhs ==1 ) { -if (fi->fib_nh->fib_nh_gw4 && -nla_put_in_addr (skb,RTA_GATEWAY , fi->fib_nh->fib_nh_gw4)) - goto nla_put_failure; -if (fi->fib_nh->fib_nh_oif && -nla_put_u32 (skb,RTA_OIF , fi->fib_nh->fib_nh_oif)) +struct fib_nh *nh = &fi->fib_nh[0 ]; +unsigned int flags =0 ; + +if (fib_nexthop_info (skb, nh, &flags, false) <0 ) goto nla_put_failure; -if (fi->fib_nh->fib_nh_flags &RTNH_F_LINKDOWN ) { -rcu_read_lock (); -if (ip_ignore_linkdown (fi->fib_nh->fib_nh_dev)) - rtm->rtm_flags |=RTNH_F_DEAD ; -rcu_read_unlock (); - } -if (fi->fib_nh->fib_nh_flags &RTNH_F_OFFLOAD ) - rtm->rtm_flags |=RTNH_F_OFFLOAD ; + + rtm->rtm_flags = flags;#ifdef CONFIG_IP_ROUTE_CLASSID -if (fi->fib_nh[0 ].nh_tclassid && -nla_put_u32 (skb,RTA_FLOW , fi->fib_nh[0 ].nh_tclassid)) +if (nh->nh_tclassid && +nla_put_u32 (skb,RTA_FLOW , nh->nh_tclassid)) goto nla_put_failure;#endif -if (fi->fib_nh->fib_nh_lws && -lwtunnel_fill_encap (skb, fi->fib_nh->fib_nh_lws) <0 ) + }else { +if (fib_add_multipath (skb, fi) <0 ) goto nla_put_failure; } -#ifdef CONFIG_IP_ROUTE_MULTIPATH -if (fi->fib_nhs >1 ) { -struct rtnexthop *rtnh; -struct nlattr *mp; - - mp =nla_nest_start (skb,RTA_MULTIPATH ); -if (!mp) - goto nla_put_failure; -for_nexthops (fi) { - rtnh =nla_reserve_nohdr (skb,sizeof (*rtnh)); -if (!rtnh) - goto nla_put_failure; - - rtnh->rtnh_flags = nh->fib_nh_flags &0xFF ; -if (nh->fib_nh_flags &RTNH_F_LINKDOWN ) { -rcu_read_lock (); -if (ip_ignore_linkdown (nh->fib_nh_dev)) - rtnh->rtnh_flags |=RTNH_F_DEAD ; -rcu_read_unlock (); - } - rtnh->rtnh_hops = nh->fib_nh_weight -1 ; - rtnh->rtnh_ifindex = nh->fib_nh_oif; - -if (nh->fib_nh_gw4 && -nla_put_in_addr (skb,RTA_GATEWAY , nh->fib_nh_gw4)) - goto nla_put_failure; -#ifdef CONFIG_IP_ROUTE_CLASSID -if (nh->nh_tclassid && -nla_put_u32 (skb,RTA_FLOW , nh->nh_tclassid)) - goto nla_put_failure; -#endif -if (nh->fib_nh_lws && -lwtunnel_fill_encap (skb, nh->fib_nh_lws) <0 ) - goto nla_put_failure; - -/* length of rtnetlink header + attributes */ - rtnh->rtnh_len =nlmsg_get_pos (skb) - (void *) rtnh; - }endfor_nexthops (fi); - -nla_nest_end (skb, mp); - } -#endif nlmsg_end (skb, nlh);return 0 ;
Signature · 1 line
2.11.0
David Ahern
maintainerPATCH v2 4/5 ipv4: Change fib_nexthop_info and fib_add_nexthop to take fib_nh_common
In reply to David AhernFrom: David Ahern <[email protected]>
With the exception of the nexthop weight, the nexthop attributes used by fib_nexthop_info and fib_add_nexthop come from the fib_nh_common struct. Update both to use it and change fib_nexthop_info to check the family as needed.
nexthop weight comes from the common struct for existing use cases, but for nexthop groups the weight is outside of the fib_nh_common to allow the same nexthop definition to be used in multiple groups with different weights.
--- net/ipv4/fib_semantics.c | 50 ++++++++++++++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 19 deletions(-)
net/ipv4/fib_semantics.c +31 -19
@@ -1320,35 +1320,44 @@ 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 *nh, +static int fib_nexthop_info (struct sk_buff *skb,const struct fib_nh_common *nh,unsigned int *flags,bool skip_oif) { -if (nh->fib_nh_flags &RTNH_F_DEAD ) +if (nh->nhc_flags &RTNH_F_DEAD ) *flags |=RTNH_F_DEAD ; -if (nh->fib_nh_flags &RTNH_F_LINKDOWN ) { +if (nh->nhc_flags &RTNH_F_LINKDOWN ) { *flags |=RTNH_F_LINKDOWN ;rcu_read_lock (); -if (ip_ignore_linkdown (nh->fib_nh_dev)) - *flags |=RTNH_F_DEAD ; +switch (nh->nhc_family) { +case AF_INET : +if (ip_ignore_linkdown (nh->nhc_dev)) + *flags |=RTNH_F_DEAD ; +break ; + }rcu_read_unlock (); } -if (nh->fib_nh_gw4 && -nla_put_in_addr (skb,RTA_GATEWAY , nh->fib_nh_gw4)) - goto nla_put_failure; +if (nh->nhc_has_gw) { +switch (nh->nhc_family) { +case AF_INET : +if (nla_put_in_addr (skb,RTA_GATEWAY , nh->nhc_gw.ipv4)) + goto nla_put_failure; +break ; + } + } - *flags |= (nh->fib_nh_flags &RTNH_F_ONLINK ); -if (nh->fib_nh_flags &RTNH_F_OFFLOAD ) + *flags |= (nh->nhc_flags &RTNH_F_ONLINK ); +if (nh->nhc_flags &RTNH_F_OFFLOAD ) *flags |=RTNH_F_OFFLOAD ; -if (!skip_oif && nh->fib_nh_dev && -nla_put_u32 (skb,RTA_OIF , nh->fib_nh_dev->ifindex)) +if (!skip_oif && nh->nhc_dev && +nla_put_u32 (skb,RTA_OIF , nh->nhc_dev->ifindex)) goto nla_put_failure; -if (nh->fib_nh_lws && -lwtunnel_fill_encap (skb, nh->fib_nh_lws) <0 ) +if (nh->nhc_lwtstate && +lwtunnel_fill_encap (skb, nh->nhc_lwtstate) <0 ) goto nla_put_failure;return 0 ;
@@ -1358,9 +1367,10 @@ static int fib_nexthop_info(struct sk_buff *skb, const struct fib_nh *nh, }#ifdef CONFIG_IP_ROUTE_MULTIPATH -static int fib_add_nexthop (struct sk_buff *skb,const struct fib_nh *nh) +static int fib_add_nexthop (struct sk_buff *skb,const struct fib_nh_common *nh, +int nh_weight) { -const struct net_device *dev = nh->fib_nh_dev; +const struct net_device *dev = nh->nhc_dev;struct rtnexthop *rtnh;unsigned int flags =0 ;
@@ -1368,7 +1378,7 @@ static int fib_add_nexthop(struct sk_buff *skb, const struct fib_nh *nh)if (!rtnh) goto nla_put_failure; - rtnh->rtnh_hops = nh->fib_nh_weight -1 ; + rtnh->rtnh_hops = nh_weight -1 ; rtnh->rtnh_ifindex = dev ? dev->ifindex :0 ;if (fib_nexthop_info (skb, nh, &flags, true) <0 )
@@ -1384,7 +1394,9 @@ static int fib_add_nexthop(struct sk_buff *skb, const struct fib_nh *nh) nla_put_failure:return -EMSGSIZE ; } +#endif +#ifdef CONFIG_IP_ROUTE_MULTIPATH static int fib_add_multipath (struct sk_buff *skb,struct fib_info *fi) {struct nlattr *mp;
@@ -1394,7 +1406,7 @@ 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) <0 ) +if (fib_add_nexthop (skb, &nh->nh_common, nh->fib_nh_weight) <0 ) goto nla_put_failure;#ifdef CONFIG_IP_ROUTE_CLASSID if (nh->nh_tclassid &&
@@ -1460,7 +1472,7 @@ 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, &flags, false) <0 ) +if (fib_nexthop_info (skb, &nh->nh_common, &flags, false) <0 ) goto nla_put_failure; rtm->rtm_flags = flags;
Signature · 1 line
2.11.0
David Ahern
maintainerPATCH v2 5/5 ipv6: Flip to fib_nexthop_info
In reply to David AhernFrom: David Ahern <[email protected]>
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.
--- include/net/ip_fib.h | 5 ++++ net/ipv4/fib_semantics.c | 30 ++++++++++++++----- net/ipv6/route.c | 78 +++++------------------------------------------- 3 files changed, 34 insertions(+), 79 deletions(-)
include/net/ip_fib.h +5 -0
@@ -492,4 +492,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 */
net/ipv4/fib_semantics.c +22 -8
@@ -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"
@@ -1320,8 +1321,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 ;
@@ -1335,6 +1336,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 (); }
@@ -1345,6 +1350,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 ; } }
@@ -1365,10 +1375,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;
@@ -1381,7 +1392,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;
@@ -1394,6 +1405,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
@@ -1406,7 +1418,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 &&
@@ -1472,7 +1485,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;
net/ipv6/route.c +7 -71
99 lines not on this page · raw message
Signature · 1 line
2.11.0
Re: [PATCH v2 net-next 5/5] ipv6: Flip to fib_nexthop_info
Quoted 41 lines · David Ahern
From: David Ahern <[email protected]>
Export
fib_nexthop_infoandfib_add_nexthopfor use by IPv6 code. Removert6_nexthop_infoandrt6_add_nexthopin favor of the IPv4 versions. Updatefib_nexthop_infofor IPv6 linkdown check andRTA_GATEWAYforAF_INET6.Signed-off-by David Ahern <[email protected]>--- include/net/ip_fib.h | 5 ++++ net/ipv4/fib_semantics.c | 30 ++++++++++++++----- net/ipv6/route.c | 78 +++++------------------------------------------- 3 files changed, 34 insertions(+), 79 deletions(-)include/net/ip_fib.h +5
-0@@ -492,4 +492,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 */ net/ipv4/fib_semantics.c +1
-0@@ -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"
net/ipv4/fib_semantics.c struct fib_info *fib_create_info(struct fib_config *cfg, · line 1324
Quoted 6 lines
net/ipv4/fib_semantics.c +1
-2@@ -1320,8 +1321,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,
nh should be renamed to nhc in Patch 4?
net/ipv4/fib_semantics.c struct fib_info *fib_create_info(struct fib_config *cfg, · line 1325
Quoted 1 line
net/ipv4/fib_semantics.c +1
-0+ unsigned int *flags, bool skip_oif, bool for_ipv4)
I assume "bool for_ipv4" will be used in a later patch also, can it be removed from the current patch?
Quoted 26 lines
net/ipv4/fib_semantics.c +9
-0{if (nh->nhc_flags &RTNH_F_DEAD ) *flags |=RTNH_F_DEAD ;@@ -1335,6 +1336,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 (); }@@ -1345,6 +1350,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 ; } }
[ ... ]
Quoted 20 lines
net/ipv4/fib_semantics.c +0
-20-/* 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 */
net/ipv4/fib_semantics.c
Quoted 10 lines
net/ipv4/fib_semantics.c +0
-8- 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,
Off topic question question,
After "net/ipv6: Flip FIB entries to fib6_info" (which was a great step forward), any update on the followup in renaming "struct fib6_info *rt" to "struct fib6_info *f6i"?
Re: [PATCH v2 net-next 5/5] ipv6: Flip to fib_nexthop_info
Quoted 12 lines · Martin Lau
Quoted 12 lines
net/ipv4/fib_semantics.c +1
-0@@ -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"
Quoted 8 lines
net/ipv4/fib_semantics.c struct fib_info *fib_create_info(struct fib_config *cfg, · line 1324
Quoted 7 lines
net/ipv4/fib_semantics.c +1
-2@@ -1320,8 +1321,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,nh should be renamed to nhc in Patch 4?
for consistency it should. Will fix.
Quoted 4 lines
net/ipv4/fib_semantics.c struct fib_info *fib_create_info(struct fib_config *cfg, · line 1325
Quoted 2 lines
net/ipv4/fib_semantics.c +1
-0+ unsigned int *flags, bool skip_oif, bool for_ipv4)I assume "bool
for_ipv4" will be used in a later patch also, can it be removed from the current patch?
yes, will remove.
Quoted 62 lines
Quoted 27 lines
net/ipv4/fib_semantics.c +9
-0{if (nh->nhc_flags &RTNH_F_DEAD ) *flags |=RTNH_F_DEAD ;@@ -1335,6 +1336,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 (); }@@ -1345,6 +1350,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 ; } }[ ... ]
Quoted 20 lines
net/ipv4/fib_semantics.c +0
-20-/* 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 */ net/ipv4/fib_semantics.c
Quoted 10 lines
net/ipv4/fib_semantics.c +0
-8- 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,Off topic question question,
Quoted 4 lines
After "net/ipv6: Flip FIB entries to
fib6_info" (which was a great step forward), any update on the followup in renaming "structfib6_info*rt" to "structfib6_info*f6i"?
There are still places that use rt instead of f6i. I could do a sweep of the code. I have been trying to fix as I go whenever it makes sense - e.g., the name change does not distract from the goal of the patch.